diff --git a/contrib/tinyusdz/README.md b/contrib/tinyusdz/README.md
index 8fb5c3250..ca273544f 100644
--- a/contrib/tinyusdz/README.md
+++ b/contrib/tinyusdz/README.md
@@ -25,6 +25,13 @@ Removed folders:
 - [scripts](tinyusdz_repo%2Fscripts)
 - [tests](tinyusdz_repo%2Ftests)
 
+Removed folders in `src`:
+- [attic](tinyusdz_repo%2Fsrc%2Fattic)
+- [blender](tinyusdz_repo%2Fsrc%2Fblender)
+- [osd](tinyusdz_repo%2Fsrc%2Fosd)
+
+Removed unused `.cc` files in `src`, `external` etc
+
 Removed all files at root level except
 - [LICENSE](tinyusdz_repo%2FLICENSE)
 - [README.md](tinyusdz_repo%2FREADME.md)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/attic/attrib-parse.cc b/contrib/tinyusdz/tinyusdz_repo/src/attic/attrib-parse.cc
deleted file mode 100644
index 7ada77198..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/attic/attrib-parse.cc
+++ /dev/null
@@ -1,708 +0,0 @@
-
-#if 0  // TODO: Remove
-      if (type_name == "matrix4d") {
-        double m[4][4];
-        if (!ParseMatrix4d(m)) {
-          PushError("Failed to parse value with type `matrix4d`.\n");
-          return false;
-        }
-
-        std::cout << "matrix4d = \n";
-        std::cout << m[0][0] << ", " << m[0][1] << ", " << m[0][2] << ", "
-                  << m[0][3] << "\n";
-        std::cout << m[1][0] << ", " << m[1][1] << ", " << m[1][2] << ", "
-                  << m[1][3] << "\n";
-        std::cout << m[2][0] << ", " << m[2][1] << ", " << m[2][2] << ", "
-                  << m[2][3] << "\n";
-        std::cout << m[3][0] << ", " << m[3][1] << ", " << m[3][2] << ", "
-                  << m[3][3] << "\n";
-      } else if (type_name == "bool") {
-        if (array_qual) {
-          // Assume people only use array access to vector<bool>
-          std::vector<nonstd::optional<bool>> value;
-          if (!ParseBasicTypeArray(&value)) {
-            PushError(
-                "Failed to parse array of string literal for `uniform "
-                "bool[]`.\n");
-          }
-        } else {
-          nonstd::optional<bool> value;
-          if (!ReadBasicType(&value)) {
-            PushError("Failed to parse value for `uniform bool`.\n");
-          }
-          if (value) {
-            std::cout << "bool value = " << *value << "\n";
-          }
-        }
-      } else if (type_name == "token") {
-        if (array_qual) {
-          if (!uniform_qual) {
-            PushError("TODO: token[]\n");
-            return false;
-          }
-
-          std::vector<nonstd::optional<std::string>> value;
-          if (!ParseBasicTypeArray(&value)) {
-            PushError(
-                "Failed to parse array of string literal for `uniform "
-                "token[]`.\n");
-          }
-
-          Variable var;
-          Variable::Array arr;
-          for (size_t i = 0; i < value.size(); i++) {
-            Variable v;
-            if (value[i]) {
-              v.value = (*value[i]);
-            } else {
-              v.value = nonstd::monostate{};  // None
-            }
-            arr.values.push_back(v);
-          }
-
-          std::cout << "add token[] primattr: " << primattr_name << "\n";
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-        } else {
-          if (uniform_qual) {
-            std::cout << "uniform_qual\n";
-            std::string value;
-            if (!ReadStringLiteral(&value)) {
-              PushError(
-                  "Failed to parse string literal for `uniform token`.\n");
-            }
-            std::cout << "StringLiteral = " << value << "\n";
-          } else if (hasConnect(primattr_name)) {
-            std::cout << "hasConnect\n";
-            std::string value;  // TODO: Path
-            if (!ReadPathIdentifier(&value)) {
-              PushError("Failed to parse path identifier for `token`.\n");
-            }
-            std::cout << "Path identifier = " << value << "\n";
-
-          } else if (hasOutputs(primattr_name)) {
-            std::cout << "output\n";
-            // Output node.
-            // OK
-          } else {
-            std::cout << "??? " << primattr_name << "\n";
-            std::string value;
-            if (!ReadStringLiteral(&value)) {
-              PushError("Failed to parse string literal for `token`.\n");
-            }
-          }
-        }
-      } else if (type_name == "int") {
-        if (array_qual) {
-          std::vector<nonstd::optional<int>> value;
-          if (!ParseBasicTypeArray(&value)) {
-            PushError("Failed to parse int array.\n");
-          }
-        } else {
-          nonstd::optional<int> value;
-          if (!ReadBasicType(&value)) {
-            PushError("Failed to parse int value.\n");
-          }
-        }
-      }  else if (type_name == "double2") {
-        if (array_qual) {
-          std::vector<std::array<double, 2>> values;
-          if (!ParseTupleArray(&values)) {
-            PushError("Failed to parse double2 array.\n");
-          }
-          std::cout << "double2 = \n";
-          for (size_t i = 0; i < values.size(); i++) {
-            std::cout << "(" << values[i][0] << ", " << values[i][1] << ")\n";
-          }
-
-          Variable::Array arr;
-          for (size_t i = 0; i < values.size(); i++) {
-            Variable v;
-            v.value = values[i];
-            arr.values.push_back(v);
-          }
-
-          Variable var;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-        } else {
-          std::array<int, 2> value;
-          if (!ParseBasicTypeTuple<int, 2>(&value)) {
-            PushError("Failed to parse int2.\n");
-          }
-          std::cout << "int2 = (" << value[0] << ", " << value[1] << ")\n";
-
-          Variable var;
-          var.value = value;
-          var.custom = custom_qual;
-
-          (*props)[primattr_name] = var;
-        }
-
-      } else if (type_name == "float") {
-        if (array_qual) {
-          std::vector<nonstd::optional<float>> value;
-          if (!ParseBasicTypeArray(&value)) {
-            PushError("Failed to parse float array.\n");
-          }
-          std::cout << "float = \n";
-
-          Variable::Array arr;
-          for (size_t i = 0; i < value.size(); i++) {
-            Variable v;
-            if (value[i]) {
-              std::cout << *value[i] << "\n";
-              v.value = (*value[i]);
-            } else {
-              std::cout << "None\n";
-              v.value = nonstd::monostate{};
-            }
-            arr.values.push_back(v);
-          }
-          Variable var;
-          var.value = arr;
-          (*props)[primattr_name] = var;
-        } else if (hasConnect(primattr_name)) {
-          std::string value;  // TODO: Path
-          if (!ReadPathIdentifier(&value)) {
-            PushError("Failed to parse path identifier for `token`.\n");
-            return false;
-          }
-          std::cout << "Path identifier = " << value << "\n";
-        } else {
-          nonstd::optional<float> value;
-          if (!ReadBasicType(&value)) {
-            PushError("Failed to parse float.\n");
-          }
-          if (value) {
-            std::cout << "float = " << *value << "\n";
-          } else {
-            std::cout << "float = None\n";
-          }
-
-          Variable var;
-          if (value) {
-            var.value = (*value);
-          }
-
-          (*props)[primattr_name] = var;
-        }
-
-        // optional: interpolation parameter
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttrib meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-      } else if (type_name == "float2") {
-        if (array_qual) {
-          std::vector<std::array<float, 2>> value;
-          if (!ParseTupleArray(&value)) {
-            PushError("Failed to parse float2 array.\n");
-          }
-          std::cout << "float2 = \n";
-          for (size_t i = 0; i < value.size(); i++) {
-            std::cout << "(" << value[i][0] << ", " << value[i][1] << ")\n";
-          }
-        } else {
-          std::array<float, 2> value;
-          if (!ParseBasicTypeTuple<float, 2>(&value)) {
-            PushError("Failed to parse float2.\n");
-          }
-          std::cout << "float2 = (" << value[0] << ", " << value[1] << ")\n";
-        }
-
-        // optional: interpolation parameter
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-
-      } else if (type_name == "float3") {
-        if (array_qual) {
-          std::vector<std::array<float, 3>> value;
-          if (!ParseTupleArray(&value)) {
-            PushError("Failed to parse float3 array.\n");
-          }
-          std::cout << "float3 = \n";
-          for (size_t i = 0; i < value.size(); i++) {
-            std::cout << "(" << value[i][0] << ", " << value[i][1] << ", "
-                      << value[i][2] << ")\n";
-          }
-
-          Variable var;
-          var.value = value;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-        } else {
-          std::array<float, 3> value;
-          if (!ParseBasicTypeTuple<float, 3>(&value)) {
-            PushError("Failed to parse float3.\n");
-          }
-          std::cout << "float3 = (" << value[0] << ", " << value[1] << ", "
-                    << value[2] << ")\n";
-        }
-
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-      } else if (type_name == "float4") {
-        if (array_qual) {
-          std::vector<std::array<float, 4>> values;
-          if (!ParseTupleArray(&values)) {
-            PushError("Failed to parse float4 array.\n");
-          }
-          std::cout << "float4 = \n";
-          for (size_t i = 0; i < values.size(); i++) {
-            std::cout << "(" << values[i][0] << ", " << values[i][1] << ", "
-                      << values[i][2] << ", " << values[i][3] << ")\n";
-          }
-
-          Variable::Array arr;
-          for (size_t i = 0; i < values.size(); i++) {
-            Variable v;
-            v.value = values[i];
-            arr.values.push_back(v);
-          }
-
-          Variable var;
-          var.value = arr;
-          var.custom = custom_qual;
-
-          (*props)[primattr_name] = var;
-        } else {
-          std::array<float, 4> value;
-          if (!ParseBasicTypeTuple<float, 4>(&value)) {
-            PushError("Failed to parse float4.\n");
-          }
-          std::cout << "float4 = (" << value[0] << ", " << value[1] << ", "
-                    << value[2] << ", " << value[3] << ")\n";
-        }
-
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-      } else if (type_name == "double") {
-        if (array_qual) {
-          std::vector<nonstd::optional<double>> values;
-          if (!ParseBasicTypeArray(&values)) {
-            PushError("Failed to parse double array.\n");
-          }
-          std::cout << "double = \n";
-          for (size_t i = 0; i < values.size(); i++) {
-            if (values[i]) {
-              std::cout << *values[i] << "\n";
-            } else {
-              std::cout << "None\n";
-            }
-          }
-
-          Variable::Array arr;
-          for (size_t i = 0; i < values.size(); i++) {
-            Variable v;
-            if (values[i]) {
-              v.value = *values[i];
-            } else {
-              v.value = nonstd::monostate{};
-            }
-            arr.values.push_back(v);
-          }
-
-          Variable var;
-          var.value = arr;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-
-        } else if (hasConnect(primattr_name)) {
-          std::string value;  // TODO: Path
-          if (!ReadPathIdentifier(&value)) {
-            PushError("Failed to parse path identifier for `token`.\n");
-            return false;
-          }
-          std::cout << "Path identifier = " << value << "\n";
-        } else {
-          nonstd::optional<double> value;
-          if (!ReadBasicType(&value)) {
-            PushError("Failed to parse double.\n");
-          }
-          if (value) {
-            std::cout << "double = " << *value << "\n";
-
-            Variable var;
-            var.value = Value(*value);
-            var.custom = custom_qual;
-
-            (*props)[primattr_name] = var;
-          } else {
-            std::cout << "double = None\n";
-            // TODO: invalidate attr?
-          }
-        }
-
-        // optional: interpolation parameter
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-      } else if (type_name == "double2") {
-        if (array_qual) {
-          std::vector<std::array<double, 2>> values;
-          if (!ParseTupleArray(&values)) {
-            PushError("Failed to parse double2 array.\n");
-          }
-          std::cout << "double2 = \n";
-          for (size_t i = 0; i < values.size(); i++) {
-            std::cout << "(" << values[i][0] << ", " << values[i][1] << ")\n";
-          }
-
-          Variable::Array arr;
-          for (size_t i = 0; i < values.size(); i++) {
-            Variable v;
-            v.value = values[i];
-            arr.values.push_back(v);
-          }
-
-          Variable var;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-        } else {
-          std::array<double, 2> value;
-          if (!ParseBasicTypeTuple<double, 2>(&value)) {
-            PushError("Failed to parse double2.\n");
-          }
-          std::cout << "double2 = (" << value[0] << ", " << value[1] << ")\n";
-
-          Variable var;
-          var.value = value;
-          var.custom = custom_qual;
-
-          (*props)[primattr_name] = var;
-        }
-
-        // optional: interpolation parameter
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-
-      } else if (type_name == "double3") {
-        if (array_qual) {
-          std::vector<std::array<double, 3>> values;
-          if (!ParseTupleArray(&values)) {
-            PushError("Failed to parse double3 array.\n");
-          }
-          std::cout << "double3 = \n";
-          for (size_t i = 0; i < values.size(); i++) {
-            std::cout << "(" << values[i][0] << ", " << values[i][1] << ", "
-                      << values[i][2] << ")\n";
-          }
-
-          Variable::Array arr;
-          for (size_t i = 0; i < values.size(); i++) {
-            Variable v;
-            v.value = values[i];
-            arr.values.push_back(v);
-          }
-
-          Variable var;
-          var.value = arr;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-
-        } else {
-          std::array<double, 3> value;
-          if (!ParseBasicTypeTuple<double, 3>(&value)) {
-            PushError("Failed to parse double3.\n");
-          }
-          std::cout << "double3 = (" << value[0] << ", " << value[1] << ", "
-                    << value[2] << ")\n";
-
-          Variable var;
-          var.value = value;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-        }
-
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-
-      } else if (type_name == "double4") {
-        if (array_qual) {
-          std::vector<std::array<double, 4>> values;
-          if (!ParseTupleArray(&values)) {
-            PushError("Failed to parse double4 array.\n");
-          }
-          std::cout << "double4 = \n";
-          for (size_t i = 0; i < values.size(); i++) {
-            std::cout << "(" << values[i][0] << ", " << values[i][1] << ", "
-                      << values[i][2] << ", " << values[i][3] << ")\n";
-          }
-
-          Variable::Array arr;
-          for (size_t i = 0; i < values.size(); i++) {
-            Variable v;
-            v.value = values[i];
-            arr.values.push_back(v);
-          }
-
-          Variable var;
-          var.value = arr;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-        } else {
-          std::array<double, 4> value;
-          if (!ParseBasicTypeTuple<double, 4>(&value)) {
-            PushError("Failed to parse double4.\n");
-          }
-          std::cout << "double4 = (" << value[0] << ", " << value[1] << ", "
-                    << value[2] << ", " << value[3] << ")\n";
-
-          Variable var;
-          var.value = value;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-        }
-
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-
-      } else if (type_name == "color3f") {
-        if (array_qual) {
-          // TODO: connection
-          std::vector<std::array<float, 3>> value;
-          if (!ParseTupleArray(&value)) {
-            PushError("Failed to parse color3f array.\n");
-          }
-          std::cout << "color3f = \n";
-          for (size_t i = 0; i < value.size(); i++) {
-            std::cout << "(" << value[i][0] << ", " << value[i][1] << ", "
-                      << value[i][2] << ")\n";
-          }
-
-          Variable var;
-          var.value = value;  // float3 array is the first-class type
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-
-        } else if (hasConnect(primattr_name)) {
-          std::string value;  // TODO: Path
-          if (!ReadPathIdentifier(&value)) {
-            PushError("Failed to parse path identifier for `token`.\n");
-            return false;
-          }
-          std::cout << "Path identifier = " << value << "\n";
-        } else {
-          std::array<float, 3> value;
-          if (!ParseBasicTypeTuple<float, 3>(&value)) {
-            PushError("Failed to parse color3f.\n");
-          }
-          std::cout << "color3f = (" << value[0] << ", " << value[1] << ", "
-                    << value[2] << ")\n";
-        }
-
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-        if (meta.count("customData")) {
-          std::cout << "has customData\n";
-        }
-
-      } else if (type_name == "normal3f") {
-        if (array_qual) {
-          std::vector<std::array<float, 3>> value;
-          if (!ParseTupleArray(&value)) {
-            PushError("Failed to parse normal3f array.\n");
-          }
-          std::cout << "normal3f = \n";
-          for (size_t i = 0; i < value.size(); i++) {
-            std::cout << "(" << value[i][0] << ", " << value[i][1] << ", "
-                      << value[i][2] << ")\n";
-          }
-
-          Variable var;
-          var.value = value;  // float3 array is the first-class type
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-
-        } else if (hasConnect(primattr_name)) {
-          std::string value;  // TODO: Path
-          if (!ReadPathIdentifier(&value)) {
-            PushError("Failed to parse path identifier for `token`.\n");
-            return false;
-          }
-          std::cout << "Path identifier = " << value << "\n";
-        } else {
-          std::array<float, 3> value;
-          if (!ParseBasicTypeTuple<float, 3>(&value)) {
-            PushError("Failed to parse normal3f.\n");
-          }
-          std::cout << "normal3f = (" << value[0] << ", " << value[1] << ", "
-                    << value[2] << ")\n";
-
-          Variable var;
-          var.value = value;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-        }
-
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-
-      } else if (type_name == "point3f") {
-        if (array_qual) {
-          std::vector<std::array<float, 3>> value;
-          if (!ParseTupleArray(&value)) {
-            PushError("Failed to parse point3f array.\n");
-          }
-          std::cout << "point3f = \n";
-          for (size_t i = 0; i < value.size(); i++) {
-            std::cout << "(" << value[i][0] << ", " << value[i][1] << ", "
-                      << value[i][2] << ")\n";
-          }
-
-          Variable var;
-          var.value = value;  // float3 array is the first-class type
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-
-        } else {
-          std::array<float, 3> value;
-          if (!ParseBasicTypeTuple<float, 3>(&value)) {
-            PushError("Failed to parse point3f.\n");
-          }
-          std::cout << "point3f = (" << value[0] << ", " << value[1] << ", "
-                    << value[2] << ")\n";
-
-          Variable var;
-          var.value = value;
-          var.custom = custom_qual;
-          (*props)[primattr_name] = var;
-        }
-
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-
-      } else if (type_name == "texCoord2f") {
-        if (array_qual) {
-          std::vector<std::array<float, 2>> value;
-          if (!ParseTupleArray(&value)) {
-            PushError("Failed to parse texCoord2f array.\n");
-          }
-          std::cout << "texCoord2f = \n";
-          for (size_t i = 0; i < value.size(); i++) {
-            std::cout << "(" << value[i][0] << ", " << value[i][1] << ")\n";
-          }
-        } else {
-          std::array<float, 2> value;
-          if (!ParseBasicTypeTuple<float, 2>(&value)) {
-            PushError("Failed to parse texCoord2f.\n");
-          }
-          std::cout << "texCoord2f = (" << value[0] << ", " << value[1]
-                    << ")\n";
-        }
-
-        std::map<std::string, Variable> meta;
-        if (!ParseAttrMeta(&meta)) {
-          PushError("Failed to parse PrimAttr meta.");
-          return false;
-        }
-
-        if (meta.count("interpolation")) {
-          std::cout << "interpolation: "
-                    << nonstd::get<std::string>(meta.at("interpolation").value)
-                    << "\n";
-        }
-
-      } else if (type_name == "rel") {
-        Rel rel;
-        if (ParseRel(&rel)) {
-          PushError("Failed to parse rel.\n");
-        }
-
-        std::cout << "rel: " << rel.path << "\n";
-
-        // 'todos'
-
-      } else {
-        PushError("TODO: ParsePrimAttr: Implement value parser for type: " +
-                   type_name + "\n");
-        return false;
-      }
-#endif
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/attic/crate-reader.cc b/contrib/tinyusdz/tinyusdz_repo/src/attic/crate-reader.cc
deleted file mode 100644
index 5b61f5ef2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/attic/crate-reader.cc
+++ /dev/null
@@ -1,212 +0,0 @@
-#if 0
-bool CrateReader::ParseAttribute(const FieldValuePairVector &fvs,
-                                 PrimAttrib *attr,
-                                 const std::string &prop_name) {
-  bool success = false;
-
-  DCOUT("fvs.size = " << fvs.size());
-
-  bool has_connection{false};
-
-  Variability variability{Variability::Varying};
-  Interpolation interpolation{Interpolation::Invalid};
-
-  // Check if required field exists.
-  if (!HasFieldValuePair(fvs, kTypeName, kToken)) {
-    PUSH_ERROR(
-        "\"typeName\" field with `token` type must exist for Attribute data.");
-    return false;
-  }
-
-  if (!HasField(kDefault)) {
-    PUSH_ERROR("\"default\" field must exist for Attribute data.");
-    return false;
-  }
-
-  //
-  // Parse properties
-  //
-  for (const auto &fv : fvs) {
-    DCOUT("===  fvs.first " << fv.first
-                            << ", second: " << fv.second.type_name());
-    if ((fv.first == "typeName") && (fv.second.type_name() == "Token")) {
-      attr->set_type_name(fv.second.value<value::token>().str());
-      DCOUT("typeName: " << attr->type_name());
-    } else if (fv.first == "default") {
-      // Nothing to do at there. Process `default` in the later
-      continue;
-    } else if (fv.first == "targetPaths") {
-      // e.g. connection to Material.
-      const ListOp<Path> paths = fv.second.value<ListOp<Path>>();
-
-      DCOUT("ListOp<Path> = " << to_string(paths));
-      // Currently we only support single explicit path.
-      if ((paths.GetExplicitItems().size() == 1)) {
-        const Path &path = paths.GetExplicitItems()[0];
-        (void)path;
-
-        DCOUT("full path: " << path.full_path_name());
-        //DCOUT("local path: " << path.local_path_name());
-
-        primvar::PrimVar var;
-        var.set_scalar(path);
-        attr->set_var(std::move(var));
-
-        has_connection = true;
-
-      } else {
-        return false;
-      }
-    } else if (fv.first == "connectionPaths") {
-      // e.g. connection to texture file.
-      const ListOp<Path> paths = fv.second.value<ListOp<Path>>();
-
-      DCOUT("ListOp<Path> = " << to_string(paths));
-
-      // Currently we only support single explicit path.
-      if ((paths.GetExplicitItems().size() == 1)) {
-        const Path &path = paths.GetExplicitItems()[0];
-        (void)path;
-
-        DCOUT("full path: " << path.full_path_name());
-        //DCOUT("local path: " << path.local_path_name());
-
-        primvar::PrimVar var;
-        var.set_scalar(path);
-        attr->set_var(std::move(var));
-
-        has_connection = true;
-
-      } else {
-        return false;
-      }
-    } else if ((fv.first == "variablity") &&
-               (fv.second.type_name() == "Variability")) {
-      variability = fv.second.value<Variability>();
-    } else if ((fv.first == "interpolation") &&
-               (fv.second.type_name() == "Token")) {
-      interpolation =
-          InterpolationFromString(fv.second.value<value::token>().str());
-    } else {
-      DCOUT("TODO: name: " << fv.first
-                           << ", type: " << fv.second.type_name());
-    }
-  }
-
-  attr->variability = variability;
-  attr->meta.interpolation = interpolation;
-
-  //
-  // Decode value(stored in "default" field)
-  //
-  const auto fvRet = GetFieldValuePair(fvs, kDefault);
-  if (!fvRet) {
-    // This code path should not happen. Just in case.
-    PUSH_ERROR("`default` field not found.");
-    return false;
-  }
-  const auto fv = fvRet.value();
-
-  auto add1DArraySuffix = [](const std::string &a) -> std::string {
-    return a + "[]";
-  };
-
-  {
-    if (fv.first == "default") {
-      attr->name = prop_name;
-
-      DCOUT("fv.second.type_name = " << fv.second.type_name());
-
-#define PROC_SCALAR(__tyname, __ty)                             \
-  }                                                             \
-  else if (fv.second.type_name() == __tyname) {               \
-    auto ret = fv.second.get_value<__ty>();                     \
-    if (!ret) {                                                 \
-      PUSH_ERROR("Failed to decode " << __tyname << " value."); \
-      return false;                                             \
-    }                                                           \
-    primvar::PrimVar var; \
-    var.set_scalar(ret.value()); \
-    attr->set_var(std::move(var));                          \
-    success = true;
-
-#define PROC_ARRAY(__tyname, __ty)                                  \
-  }                                                                 \
-  else if (fv.second.type_name() == add1DArraySuffix(__tyname)) { \
-    auto ret = fv.second.get_value<std::vector<__ty>>();            \
-    if (!ret) {                                                     \
-      PUSH_ERROR("Failed to decode " << __tyname << "[] value.");   \
-      return false;                                                 \
-    }                                                               \
-    primvar::PrimVar var; \
-    var.set_scalar(ret.value()); \
-    attr->set_var(std::move(var));                          \
-    success = true;
-
-      if (0) {  // dummy
-        PROC_SCALAR(value::kFloat, float)
-        PROC_SCALAR(value::kBool, bool)
-        PROC_SCALAR(value::kInt, int)
-        PROC_SCALAR(value::kFloat2, value::float2)
-        PROC_SCALAR(value::kFloat3, value::float3)
-        PROC_SCALAR(value::kFloat4, value::float4)
-        PROC_SCALAR(value::kHalf2, value::half2)
-        PROC_SCALAR(value::kHalf3, value::half3)
-        PROC_SCALAR(value::kHalf4, value::half4)
-        PROC_SCALAR(value::kToken, value::token)
-        PROC_SCALAR(value::kAssetPath, value::AssetPath)
-
-        PROC_SCALAR(value::kMatrix2d, value::matrix2d)
-        PROC_SCALAR(value::kMatrix3d, value::matrix3d)
-        PROC_SCALAR(value::kMatrix4d, value::matrix4d)
-
-        // It seems `token[]` is defined as `TokenVector` in CrateData.
-        // We tret it as scalar
-        PROC_SCALAR("TokenVector", std::vector<value::token>)
-
-        // TODO(syoyo): Use constexpr concat
-        PROC_ARRAY(value::kInt, int32_t)
-        PROC_ARRAY(value::kUInt, uint32_t)
-        PROC_ARRAY(value::kFloat, float)
-        PROC_ARRAY(value::kFloat2, value::float2)
-        PROC_ARRAY(value::kFloat3, value::float3)
-        PROC_ARRAY(value::kFloat4, value::float4)
-        PROC_ARRAY(value::kToken, value::token)
-
-        PROC_ARRAY(value::kMatrix2d, value::matrix2d)
-        PROC_ARRAY(value::kMatrix3d, value::matrix3d)
-        PROC_ARRAY(value::kMatrix4d, value::matrix4d)
-
-        PROC_ARRAY(value::kPoint3h, value::point3h)
-        PROC_ARRAY(value::kPoint3f, value::point3f)
-        PROC_ARRAY(value::kPoint3d, value::point3d)
-
-        PROC_ARRAY(value::kVector3h, value::vector3h)
-        PROC_ARRAY(value::kVector3f, value::vector3f)
-        PROC_ARRAY(value::kVector3d, value::vector3d)
-
-        PROC_ARRAY(value::kNormal3h, value::normal3h)
-        PROC_ARRAY(value::kNormal3f, value::normal3f)
-        PROC_ARRAY(value::kNormal3d, value::normal3d)
-
-        // PROC_ARRAY("Vec2fArray", value::float2)
-        // PROC_ARRAY("Vec3fArray", value::float3)
-        // PROC_ARRAY("Vec4fArray", value::float4)
-        // PROC_ARRAY("IntArray", int)
-        // PROC_ARRAY(kTokenArray, value::token)
-
-      } else {
-        PUSH_ERROR("TODO: " + fv.second.type_name());
-      }
-    }
-  }
-
-  if (!success && has_connection) {
-    // Attribute has a connection(has a path and no `default` field)
-    success = true;
-  }
-
-  return success;
-}
-#endif
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/attic/parse-double.cc b/contrib/tinyusdz/tinyusdz_repo/src/attic/parse-double.cc
deleted file mode 100644
index 926eb6cf3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/attic/parse-double.cc
+++ /dev/null
@@ -1,158 +0,0 @@
-#if 0  // use `fast_float`
-// Tries to parse a floating point number located at s.
-//
-// s_end should be a location in the string where reading should absolutely
-// stop. For example at the end of the string, to prevent buffer overflows.
-//
-// Parses the following EBNF grammar:
-//   sign    = "+" | "-" ;
-//   END     = ? anything not in digit ?
-//   digit   = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
-//   integer = [sign] , digit , {digit} ;
-//   decimal = integer , ["." , integer] ;
-//   float   = ( decimal , END ) | ( decimal , ("E" | "e") , integer , END ) ;
-//
-//  Valid strings are for example:
-//   -0  +3.1417e+2  -0.0E-3  1.0324  -1.41   11e2
-//
-// If the parsing is a success, result is set to the parsed value and true
-// is returned.
-//
-// The function is greedy and will parse until any of the following happens:
-//  - a non-conforming character is encountered.
-//  - s_end is reached.
-//
-// The following situations triggers a failure:
-//  - s >= s_end.
-//  - parse failure.
-//
-static bool tryParseDouble(const char *s, const char *s_end, double *result) {
-  if (s >= s_end) {
-    return false;
-  }
-
-  double mantissa = 0.0;
-  // This exponent is base 2 rather than 10.
-  // However the exponent we parse is supposed to be one of ten,
-  // thus we must take care to convert the exponent/and or the
-  // mantissa to a * 2^E, where a is the mantissa and E is the
-  // exponent.
-  // To get the final double we will use ldexp, it requires the
-  // exponent to be in base 2.
-  int exponent = 0;
-
-  // NOTE: THESE MUST BE DECLARED HERE SINCE WE ARE NOT ALLOWED
-  // TO JUMP OVER DEFINITIONS.
-  char sign = '+';
-  char exp_sign = '+';
-  char const *curr = s;
-
-  // How many characters were read in a loop.
-  int read = 0;
-  // Tells whether a loop terminated due to reaching s_end.
-  bool end_not_reached = false;
-  bool leading_decimal_dots = false;
-
-  /*
-          BEGIN PARSING.
-  */
-
-  // Find out what sign we've got.
-  if (*curr == '+' || *curr == '-') {
-    sign = *curr;
-    curr++;
-    if ((curr != s_end) && (*curr == '.')) {
-      // accept. Somethig like `.7e+2`, `-.5234`
-      leading_decimal_dots = true;
-    }
-  } else if (is_digit(*curr)) { /* Pass through. */
-  } else if (*curr == '.') {
-    // accept. Somethig like `.7e+2`, `-.5234`
-    leading_decimal_dots = true;
-  } else {
-    goto fail;
-  }
-
-  // Read the integer part.
-  end_not_reached = (curr != s_end);
-  if (!leading_decimal_dots) {
-    while (end_not_reached && is_digit(*curr)) {
-      mantissa *= 10;
-      mantissa += static_cast<int>(*curr - 0x30);
-      curr++;
-      read++;
-      end_not_reached = (curr != s_end);
-    }
-
-    // We must make sure we actually got something.
-    if (read == 0) goto fail;
-  }
-
-  // We allow numbers of form "#", "###" etc.
-  if (!end_not_reached) goto assemble;
-
-  // Read the decimal part.
-  if (*curr == '.') {
-    curr++;
-    read = 1;
-    end_not_reached = (curr != s_end);
-    while (end_not_reached && is_digit(*curr)) {
-      static const double pow_lut[] = {
-          1.0, 0.1, 0.01, 0.001, 0.0001, 0.00001, 0.000001, 0.0000001,
-      };
-      const int lut_entries = sizeof pow_lut / sizeof pow_lut[0];
-
-      // NOTE: Don't use powf here, it will absolutely murder precision.
-      mantissa += static_cast<int>(*curr - 0x30) *
-                  (read < lut_entries ? pow_lut[read] : std::pow(10.0, -read));
-      read++;
-      curr++;
-      end_not_reached = (curr != s_end);
-    }
-  } else if (*curr == 'e' || *curr == 'E') {
-  } else {
-    goto assemble;
-  }
-
-  if (!end_not_reached) goto assemble;
-
-  // Read the exponent part.
-  if (*curr == 'e' || *curr == 'E') {
-    curr++;
-    // Figure out if a sign is present and if it is.
-    end_not_reached = (curr != s_end);
-    if (end_not_reached && (*curr == '+' || *curr == '-')) {
-      exp_sign = *curr;
-      curr++;
-    } else if (is_digit(*curr)) { /* Pass through. */
-    } else {
-      // Empty E is not allowed.
-      goto fail;
-    }
-
-    read = 0;
-    end_not_reached = (curr != s_end);
-    while (end_not_reached && is_digit(*curr)) {
-      if (exponent > std::numeric_limits<int>::max() / 10) {
-        // Integer overflow
-        goto fail;
-      }
-      exponent *= 10;
-      exponent += static_cast<int>(*curr - 0x30);
-      curr++;
-      read++;
-      end_not_reached = (curr != s_end);
-    }
-    exponent *= (exp_sign == '+' ? 1 : -1);
-    if (read == 0) goto fail;
-  }
-
-assemble:
-  *result = (sign == '+' ? 1 : -1) *
-            (exponent ? std::ldexp(mantissa * std::pow(5.0, exponent), exponent)
-                      : mantissa);
-  return true;
-fail:
-  return false;
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/attic/primvar.cc b/contrib/tinyusdz/tinyusdz_repo/src/attic/primvar.cc
deleted file mode 100644
index ee5f1dc51..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/attic/primvar.cc
+++ /dev/null
@@ -1,560 +0,0 @@
-#if 0
-base_value::~base_value() {}
-
-
-std::ostream &operator<<(std::ostream &os, const any_value &v) {
-  // Simple brute-force way..
-  // TODO: Use std::function or some template technique?
-
-#define BASETYPE_CASE_EXPR(__ty)                      \
-  case TypeTrait<__ty>::type_id: {                    \
-    os << *reinterpret_cast<const __ty *>(v.value()); \
-    break;                                            \
-  }
-
-#define ARRAY1DTYPE_CASE_EXPR(__ty)                                \
-  case TypeTrait<std::vector<__ty>>::type_id: {                    \
-    os << *reinterpret_cast<const std::vector<__ty> *>(v.value()); \
-    break;                                                         \
-  }
-
-#define ARRAY2DTYPE_CASE_EXPR(__ty)                                  \
-  case TypeTrait<std::vector<std::vector<__ty>>>::type_id: {         \
-    os << *reinterpret_cast<const std::vector<std::vector<__ty>> *>( \
-        v.value());                                                  \
-    break;                                                           \
-  }
-
-#define CASE_EXR_LIST(__FUNC) \
-  __FUNC(token)               \
-  __FUNC(std::string)         \
-  __FUNC(half)                \
-  __FUNC(half2)               \
-  __FUNC(half3)               \
-  __FUNC(half4)               \
-  __FUNC(int32_t)             \
-  __FUNC(uint32_t)            \
-  __FUNC(int2)                \
-  __FUNC(int3)                \
-  __FUNC(int4)                \
-  __FUNC(uint2)               \
-  __FUNC(uint3)               \
-  __FUNC(uint4)               \
-  __FUNC(int64_t)             \
-  __FUNC(uint64_t)            \
-  __FUNC(float)               \
-  __FUNC(float2)              \
-  __FUNC(float3)              \
-  __FUNC(float4)              \
-  __FUNC(double)              \
-  __FUNC(double2)             \
-  __FUNC(double3)             \
-  __FUNC(double4)             \
-  __FUNC(matrix2d)            \
-  __FUNC(matrix3d)            \
-  __FUNC(matrix4d)            \
-  __FUNC(quath)               \
-  __FUNC(quatf)               \
-  __FUNC(quatd)               \
-  __FUNC(normal3h)            \
-  __FUNC(normal3f)            \
-  __FUNC(normal3d)            \
-  __FUNC(vector3h)            \
-  __FUNC(vector3f)            \
-  __FUNC(vector3d)            \
-  __FUNC(point3h)             \
-  __FUNC(point3f)             \
-  __FUNC(point3d)             \
-  __FUNC(color3f)             \
-  __FUNC(color3d)             \
-  __FUNC(color4f)             \
-  __FUNC(color4d)
-
-  switch (v.type_id()) {
-    // no `bool` type for 1D and 2D array
-    BASETYPE_CASE_EXPR(bool)
-
-    // no std::vector<dict> and std::vector<std::vector<dict>>, ...
-    BASETYPE_CASE_EXPR(dict)
-
-    // base type
-    CASE_EXR_LIST(BASETYPE_CASE_EXPR)
-
-    // 1D array
-    CASE_EXR_LIST(ARRAY1DTYPE_CASE_EXPR)
-
-    // 2D array
-    CASE_EXR_LIST(ARRAY2DTYPE_CASE_EXPR)
-
-    // TODO: List-up all case and remove `default` clause.
-    default: {
-      os << "PPRINT: TODO: (type: " << v.type_name() << ") ";
-    }
-  }
-
-#undef BASETYPE_CASE_EXPR
-#undef ARRAY1DTYPE_CASE_EXPR
-#undef ARRAY2DTYPE_CASE_EXPR
-#undef CASE_EXPR_LIST
-
-  return os;
-}
-
-//std::ostream &operator<<(std::ostream &os, const Value &v) {
-//  os << v.get_raw();  // delegate to operator<<(os, any_value)
-//  return os;
-//}
-
-bool is_float(const any_value &v) {
-  if (v.underlying_type_name() == "float") {
-    return true;
-  }
-
-  return false;
-}
-
-bool is_double(const any_value &v) {
-  if (v.underlying_type_name() == "double") {
-    return true;
-  }
-
-  return false;
-}
-
-bool is_float(const Value &v) {
-  if (v.underlying_type_name() == "float") {
-    return true;
-  }
-
-  return false;
-}
-
-bool is_float2(const Value &v) {
-  if (v.underlying_type_name() == "float2") {
-    return true;
-  }
-
-  return false;
-}
-
-bool is_float3(const Value &v) {
-  if (v.underlying_type_name() == "float3") {
-    return true;
-  }
-
-  return false;
-}
-
-bool is_float4(const Value &v) {
-  if (v.underlying_type_name() == "float4") {
-    return true;
-  }
-
-  return false;
-}
-
-bool is_double(const Value &v) {
-  if (v.underlying_type_name() == "double") {
-    return true;
-  }
-
-  return false;
-}
-
-bool is_double2(const Value &v) {
-  if (v.underlying_type_name() == "double2") {
-    return true;
-  }
-
-  return false;
-}
-
-bool is_double3(const Value &v) {
-  if (v.underlying_type_name() == "double3") {
-    return true;
-  }
-
-  return false;
-}
-
-bool is_double4(const Value &v) {
-  if (v.underlying_type_name() == "double4") {
-    return true;
-  }
-
-  return false;
-}
-
-#if 0
-std::ostream &operator<<(std::ostream &os, const matrix2d &v) {
-  os << "(";
-  os << "(" << v.m[0][0] << ", " << v.m[0][1] << "), ";
-  os << "(" << v.m[1][0] << ", " << v.m[1][1] << ")";
-  os << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const matrix3d &v) {
-  os << "(";
-  os << "(" << v.m[0][0] << ", " << v.m[0][1] << ", " << v.m[0][2] << "), ";
-  os << "(" << v.m[1][0] << ", " << v.m[1][1] << ", " << v.m[1][2] << ")";
-  os << "(" << v.m[2][0] << ", " << v.m[2][1] << ", " << v.m[2][2] << ")";
-  os << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const matrix4d &v) {
-  os << "(";
-  os << "(" << v.m[0][0] << ", " << v.m[0][1] << ", " << v.m[0][2] << ", "
-     << v.m[0][3] << "), ";
-  os << "(" << v.m[1][0] << ", " << v.m[1][1] << ", " << v.m[1][2] << ", "
-     << v.m[1][3] << ")";
-  os << "(" << v.m[2][0] << ", " << v.m[2][1] << ", " << v.m[2][2] << ", "
-     << v.m[2][3] << ")";
-  os << "(" << v.m[3][0] << ", " << v.m[3][1] << ", " << v.m[3][2] << ", "
-     << v.m[3][3] << ")";
-  os << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const int2 &v) {
-  os << "(" << v[0] << ", " << v[1] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const int3 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const int4 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ", " << v[3] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const uint2 &v) {
-  os << "(" << v[0] << ", " << v[1] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const uint3 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const uint4 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ", " << v[3] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const half2 &v) {
-  os << "(" << v[0] << ", " << v[1] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const half3 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const half4 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ", " << v[3] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const float2 &v) {
-  os << "(" << v[0] << ", " << v[1] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const float3 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const float4 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ", " << v[3] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const double2 &v) {
-  os << "(" << v[0] << ", " << v[1] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const double3 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const double4 &v) {
-  os << "(" << v[0] << ", " << v[1] << ", " << v[2] << ", " << v[3] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const vector3h &v) {
-  os << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const vector3f &v) {
-  os << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const vector3d &v) {
-  os << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const normal3h &v) {
-  os << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const normal3f &v) {
-  os << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const normal3d &v) {
-  os << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const point3h &v) {
-  os << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const point3f &v) {
-  os << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const point3d &v) {
-  os << "(" << v.x << ", " << v.y << ", " << v.z << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const color3f &v) {
-  os << "(" << v.r << ", " << v.g << ", " << v.b << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const color3d &v) {
-  os << "(" << v.r << ", " << v.g << ", " << v.b << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const color4f &v) {
-  os << "(" << v.r << ", " << v.g << ", " << v.b << ", " << v.a << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const color4d &v) {
-  os << "(" << v.r << ", " << v.g << ", " << v.b << ", " << v.a << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const quath &v) {
-  os << "(" << v.real << ", " << v.imag[0] << ", " << v.imag[1] << ", "
-     << v.imag[2] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const quatf &v) {
-  os << "(" << v.real << ", " << v.imag[0] << ", " << v.imag[1] << ", "
-     << v.imag[2] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const quatd &v) {
-  os << "(" << v.real << ", " << v.imag[0] << ", " << v.imag[1] << ", "
-     << v.imag[2] << ")";
-  return os;
-}
-
-std::ostream &operator<<(std::ostream &os, const texcoord2f &v) {
-  os << "(" << v.s << ", " << v.t << ")";
-  return os;
-}
-#endif
-
-bool Reconstructor::reconstruct(AttribMap &amap) {
-  err_.clear();
-
-  staticstruct::Reader r;
-
-#define CONVERT_TYPE_SCALAR(__ty, __value)       \
-  case TypeTrait<__ty>::type_id: {               \
-    __ty *p = reinterpret_cast<__ty *>(__value); \
-    staticstruct::Handler<__ty> _h(p);           \
-    return _h.write(&handler);                   \
-  }
-
-#define CONVERT_TYPE_1D(__ty, __value)                                     \
-  case (TypeTrait<__ty>::type_id | TYPE_ID_1D_ARRAY_BIT): {                \
-    std::vector<__ty> *p = reinterpret_cast<std::vector<__ty> *>(__value); \
-    staticstruct::Handler<std::vector<__ty>> _h(p);                        \
-    return _h.write(&handler);                                             \
-  }
-
-#define CONVERT_TYPE_2D(__ty, __value)                               \
-  case (TypeTrait<__ty>::type_id | TYPE_ID_2D_ARRAY_BIT): {          \
-    std::vector<std::vector<__ty>> *p =                              \
-        reinterpret_cast<std::vector<std::vector<__ty>> *>(__value); \
-    staticstruct::Handler<std::vector<std::vector<__ty>>> _h(p);     \
-    return _h.write(&handler);                                       \
-  }
-
-#define CONVERT_TYPE_LIST(__FUNC) \
-  __FUNC(half, v)                 \
-  __FUNC(half2, v)                \
-  __FUNC(half3, v)                \
-  __FUNC(half4, v)                \
-  __FUNC(int32_t, v)              \
-  __FUNC(uint32_t, v)             \
-  __FUNC(int2, v)                 \
-  __FUNC(int3, v)                 \
-  __FUNC(int4, v)                 \
-  __FUNC(uint2, v)                \
-  __FUNC(uint3, v)                \
-  __FUNC(uint4, v)                \
-  __FUNC(int64_t, v)              \
-  __FUNC(uint64_t, v)             \
-  __FUNC(float, v)                \
-  __FUNC(float2, v)               \
-  __FUNC(float3, v)               \
-  __FUNC(float4, v)               \
-  __FUNC(double, v)               \
-  __FUNC(double2, v)              \
-  __FUNC(double3, v)              \
-  __FUNC(double4, v)              \
-  __FUNC(quath, v)                \
-  __FUNC(quatf, v)                \
-  __FUNC(quatd, v)                \
-  __FUNC(vector3h, v)             \
-  __FUNC(vector3f, v)             \
-  __FUNC(vector3d, v)             \
-  __FUNC(normal3h, v)             \
-  __FUNC(normal3f, v)             \
-  __FUNC(normal3d, v)             \
-  __FUNC(point3h, v)              \
-  __FUNC(point3f, v)              \
-  __FUNC(point3d, v)              \
-  __FUNC(color3f, v)              \
-  __FUNC(color3d, v)              \
-  __FUNC(color4f, v)              \
-  __FUNC(color4d, v)              \
-  __FUNC(matrix2d, v)             \
-  __FUNC(matrix3d, v)             \
-  __FUNC(matrix4d, v)
-
-  bool ret = r.ParseStruct(
-      &h,
-      [&amap](std::string key, uint32_t flags, uint32_t user_type_id,
-              staticstruct::BaseHandler &handler) -> bool {
-        std::cout << "key = " << key << ", count = " << amap.attribs.count(key)
-                  << "\n";
-
-        if (!amap.attribs.count(key)) {
-          if (flags & staticstruct::Flags::Optional) {
-            return true;
-          } else {
-            return false;
-          }
-        }
-
-        auto &value = amap.attribs[key];
-        if (amap.attribs[key].type_id() == user_type_id) {
-          void *v = value.value();
-
-          switch (user_type_id) {
-            CONVERT_TYPE_SCALAR(bool, v)
-
-            CONVERT_TYPE_LIST(CONVERT_TYPE_SCALAR)
-            CONVERT_TYPE_LIST(CONVERT_TYPE_1D)
-            CONVERT_TYPE_LIST(CONVERT_TYPE_2D)
-
-            default: {
-              std::cerr << "Unsupported type: " << GetTypeName(user_type_id)
-                        << "\n";
-              return false;
-            }
-          }
-        } else {
-          std::cerr << "type: " << amap.attribs[key].type_name() << "(a.k.a "
-                    << amap.attribs[key].underlying_type_name()
-                    << ") expected but got " << GetTypeName(user_type_id)
-                    << " for attribute \"" << key << "\"\n";
-          return false;
-        }
-      },
-      &err_);
-
-  return ret;
-
-#undef CONVERT_TYPE_SCALAR
-#undef CONVERT_TYPE_1D
-#undef CONVERT_TYPE_2D
-#undef CONVERT_TYPE_LIST
-}
-
-std::string GetTypeName(uint32_t tyid) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-  static std::map<uint32_t, std::string> m;
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-  if (m.empty()) {
-    // initialize
-    m[TYPE_ID_BOOL] = TypeTrait<bool>::type_name();
-    m[TYPE_ID_UCHAR] = TypeTrait<uint8_t>::type_name();
-    m[TYPE_ID_INT32] = TypeTrait<int32_t>::type_name();
-    m[TYPE_ID_UINT32] = TypeTrait<uint32_t>::type_name();
-    m[TYPE_ID_POINT3H] = TypeTrait<point3h>::type_name();
-    m[TYPE_ID_POINT3F] = TypeTrait<point3f>::type_name();
-    m[TYPE_ID_POINT3D] = TypeTrait<point3d>::type_name();
-    // TODO: ...
-
-    m[TYPE_ID_INT32 | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<int>>::type_name();
-    m[TYPE_ID_FLOAT | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<float>>::type_name();
-    m[TYPE_ID_FLOAT2 | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<float2>>::type_name();
-    m[TYPE_ID_FLOAT3 | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<float3>>::type_name();
-    m[TYPE_ID_FLOAT4 | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<float4>>::type_name();
-
-    m[TYPE_ID_POINT3H | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<point3h>>::type_name();
-    m[TYPE_ID_POINT3F | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<point3f>>::type_name();
-    m[TYPE_ID_POINT3D | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<point3d>>::type_name();
-
-    m[TYPE_ID_VECTOR3H | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<vector3h>>::type_name();
-    m[TYPE_ID_VECTOR3F | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<vector3f>>::type_name();
-    m[TYPE_ID_VECTOR3D | TYPE_ID_1D_ARRAY_BIT] =
-        TypeTrait<std::vector<vector3d>>::type_name();
-  }
-
-  if (!m.count(tyid)) {
-    return "(GetTypeName) [[Unknown or unsupported type_id: " +
-           std::to_string(tyid) + "]]";
-  }
-
-  return m.at(tyid);
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/attic/simple-type-reflection.cc b/contrib/tinyusdz/tinyusdz_repo/src/attic/simple-type-reflection.cc
deleted file mode 100644
index c3b448e00..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/attic/simple-type-reflection.cc
+++ /dev/null
@@ -1,339 +0,0 @@
-#include "simple-type-reflection.hh"
-
-namespace simple_type_reflection {
-
-Error* TypeMismatchError(std::string expected_type, std::string actual_type) {
-  return new Error(Error::TYPE_MISMATCH,
-                   "Type mismatch error: type `" + expected_type +
-                       "` expected but got type `" + actual_type + "`");
-}
-
-Error* RequiredFieldMissingError() {
-  return new Error(Error::TYPE_MISMATCH, "Required field(s) is missing: ");
-}
-
-Error* UnknownFieldError(std::string field_name) {
-  return new Error(Error::UNKNOWN_FIELD,
-                   "Unknown field with name: `" + field_name + "`");
-}
-
-Error* ArrayLengthMismatchError() {
-  return new Error(Error::ARRAY_LENGTH_MISMATCH, "Array length mismatch");
-}
-
-Error* ArrayElementError(size_t idx) {
-  return new Error(Error::ARRAY_ELEMENT,
-                   "Error at array element at index " + std::to_string(idx));
-}
-
-Error* ObjectMemberError(std::string key) {
-  return new Error(Error::OBJECT_MEMBER,
-                   "Error at object member with name `" + key + "`");
-}
-
-Error* DuplicateKeyError(std::string key) {
-  return new Error(Error::DUPLICATE_KEYS, "Duplicated key name `" + key + "`");
-}
-
-IHandler::~IHandler() {}
-
-BaseHandler::BaseHandler() {}
-BaseHandler::~BaseHandler() {}
-
-bool BaseHandler::set_out_of_range(const char* actual_type) {
-  the_error.reset(new Error(Error::NUMBER_OUT_OF_RANGE,
-                            "Number out-of-range: type `" + type_name() +
-                                "`, actual_type `" + actual_type + "`"));
-  return false;
-}
-
-bool BaseHandler::set_type_mismatch(const char* actual_type) {
-  the_error.reset(new Error(Error::TYPE_MISMATCH,
-                            "Type mismatch error: type `" + type_name() +
-                                "` expected but got type `" + actual_type +
-                                "`"));
-  return false;
-}
-
-ObjectHandler::ObjectHandler() {}
-
-ObjectHandler::~ObjectHandler() {}
-
-std::string ObjectHandler::type_name() const { return "object"; }
-
-bool ObjectHandler::precheck(const char* actual_type) {
-  if (depth <= 0) {
-    the_error.reset(TypeMismatchError(type_name(), actual_type));
-    return false;
-  }
-  if (current && current->handler && current->handler->is_parsed()) {
-    if (flags & Flags::AllowDuplicateKey) {
-      current->handler->prepare_for_reuse();
-    } else {
-      the_error.reset(DuplicateKeyError(current_name));
-      return false;
-    }
-  }
-  return true;
-}
-
-bool ObjectHandler::postcheck(bool success) {
-  if (!success) {
-    the_error.reset(ObjectMemberError(current_name));
-  }
-  return success;
-}
-
-void ObjectHandler::set_missing_required(const std::string& name) {
-  if (!the_error || the_error->error_type != Error::MISSING_REQUIRED)
-    the_error.reset(RequiredFieldMissingError());
-
-  // Add error message
-  the_error->error_msg += " " + name + ", ";
-}
-
-#define POSTCHECK(x) (!current || !(current->handler) || postcheck(x))
-
-bool ObjectHandler::Double(double value) {
-  if (!precheck("double")) return false;
-  return POSTCHECK(current->handler->Double(value));
-}
-
-bool ObjectHandler::Short(short value) {
-  if (!precheck("short")) return false;
-  return POSTCHECK(current->handler->Short(value));
-}
-
-bool ObjectHandler::Ushort(unsigned short value) {
-  if (!precheck("unsigned short")) return false;
-  return POSTCHECK(current->handler->Ushort(value));
-}
-
-bool ObjectHandler::Int(int value) {
-  if (!precheck("int")) return false;
-  return POSTCHECK(current->handler->Int(value));
-}
-
-bool ObjectHandler::Uint(unsigned value) {
-  if (!precheck("unsigned")) return false;
-  return POSTCHECK(current->handler->Uint(value));
-}
-
-bool ObjectHandler::Bool(bool value) {
-  if (!precheck("bool")) return false;
-  return POSTCHECK(current->handler->Bool(value));
-}
-
-bool ObjectHandler::Int64(std::int64_t value) {
-  if (!precheck("std::int64_t")) return false;
-  return POSTCHECK(current->handler->Int64(value));
-}
-
-bool ObjectHandler::Uint64(std::uint64_t value) {
-  if (!precheck("std::uint64_t")) return false;
-  return POSTCHECK(current->handler->Uint64(value));
-}
-
-bool ObjectHandler::Null() {
-  if (!precheck("null")) return false;
-  return POSTCHECK(current->handler->Null());
-}
-
-bool ObjectHandler::StartArray() {
-  if (!precheck("array")) return false;
-  return POSTCHECK(current->handler->StartArray());
-}
-
-bool ObjectHandler::EndArray(SizeType sz) {
-  if (!precheck("array")) return false;
-  return POSTCHECK(current->handler->EndArray(sz));
-}
-
-bool ObjectHandler::String(const char* str, SizeType sz, bool copy) {
-  if (!precheck("string")) return false;
-  return POSTCHECK(current->handler->String(str, sz, copy));
-}
-
-bool ObjectHandler::Key(const char* str, SizeType sz, bool copy) {
-  if (depth <= 0) {
-    the_error.reset(new Error(Error::CORRUPTED_DOM, "Corrupted DOM"));
-    return false;
-  }
-  if (depth == 1) {
-    current_name.assign(str, sz);
-    auto it = internals.find(current_name);
-    if (it == internals.end()) {
-      current = nullptr;
-      if ((flags & Flags::DisallowUnknownKey)) {
-        the_error.reset(UnknownFieldError(str));  // sz?
-        return false;
-      }
-    } else if (it->second.flags & Flags::IgnoreRead) {
-      current = nullptr;
-    } else {
-      current = &it->second;
-    }
-    return true;
-  } else {
-    return POSTCHECK(current->handler->Key(str, sz, copy));
-  }
-}
-
-bool ObjectHandler::StartObject() {
-  ++depth;
-  if (depth > 1) {
-    return POSTCHECK(current->handler->StartObject());
-  }
-  return true;
-}
-
-bool ObjectHandler::EndObject(SizeType sz) {
-  --depth;
-  if (depth > 0) {
-    return POSTCHECK(current->handler->EndObject(sz));
-  }
-  for (auto&& pair : internals) {
-    if (pair.second.handler && !(pair.second.flags & Flags::Optional) &&
-        !pair.second.handler->is_parsed()) {
-      set_missing_required(pair.first);
-    }
-  }
-  if (!the_error) {
-    this->parsed = true;
-    return true;
-  }
-  return false;
-}
-
-void ObjectHandler::reset() {
-  current = nullptr;
-  current_name.clear();
-  depth = 0;
-  for (auto&& pair : internals) {
-    if (pair.second.handler) pair.second.handler->prepare_for_reuse();
-  }
-}
-
-void ObjectHandler::add_handler(std::string&& name,
-                                ObjectHandler::FlaggedHandler&& fh) {
-  internals.emplace(std::move(name), std::move(fh));
-}
-
-// bool ObjectHandler::reap_error(ErrorStack& stack)
-//{
-//    if (!the_error)
-//        return false;
-//    stack.push(the_error.release());
-//    if (current && current->handler)
-//        current->handler->reap_error(stack);
-//    return true;
-//}
-
-bool ObjectHandler::write(IHandler* output) const {
-  SizeType count = 0;
-  if (!output->StartObject()) return false;
-
-  for (auto&& pair : internals) {
-    if (!pair.second.handler || (pair.second.flags & Flags::IgnoreWrite))
-      continue;
-    if (!output->Key(pair.first.data(),
-                     static_cast<simple_serialize::SizeType>(pair.first.size()),
-                     true))
-      return false;
-    if (!pair.second.handler->write(output)) return false;
-    ++count;
-  }
-  return output->EndObject(count);
-}
-
-// void ObjectHandler::generate_schema(Value& output, MemoryPoolAllocator&
-// alloc) const
-//{
-//    output.SetObject();
-//    output.AddMember(rapidjson::StringRef("type"),
-//    rapidjson::StringRef("object"), alloc);
-//
-//    Value properties(rapidjson::kObjectType);
-//    Value required(rapidjson::kArrayType);
-//    for (auto&& pair : internals)
-//    {
-//        Value schema;
-//        if (pair.second.handler)
-//            pair.second.handler->generate_schema(schema, alloc);
-//        else
-//            std::abort();
-//        Value key;
-//        key.SetString(pair.first.c_str(),
-//        static_cast<SizeType>(pair.first.size()), alloc);
-//        properties.AddMember(key, schema, alloc);
-//        if (!(pair.second.flags & Flags::Optional))
-//        {
-//            key.SetString(pair.first.c_str(),
-//            static_cast<SizeType>(pair.first.size()), alloc);
-//            required.PushBack(key, alloc);
-//        }
-//    }
-//    output.AddMember(rapidjson::StringRef("properties"), properties, alloc);
-//    if (!required.Empty())
-//    {
-//        output.AddMember(rapidjson::StringRef("required"), required, alloc);
-//    }
-//    output.AddMember(rapidjson::StringRef("additionalProperties"),
-//                     !(get_flags() & Flags::DisallowUnknownKey),
-//                     alloc);
-//}
-
-Handler<bool>::Handler(bool* value) : m_value(value) {}
-Handler<bool>::~Handler() {}
-Handler<short>::~Handler() {}
-Handler<unsigned short>::~Handler() {}
-Handler<int>::~Handler() {}
-Handler<unsigned>::~Handler() {}
-Handler<int64_t>::~Handler() {}
-Handler<uint64_t>::~Handler() {}
-Handler<float>::~Handler() {}
-Handler<double>::~Handler() {}
-Handler<char>::~Handler() {}
-Handler<std::string>::~Handler() {}
-
-bool Parse::SetValue(bool b, BaseHandler& handler) const {
-  return handler.Bool(b);
-}
-
-bool Parse::SetValue(short i, BaseHandler& handler) const {
-  return handler.Short(i);
-}
-
-bool Parse::SetValue(unsigned short i, BaseHandler& handler) const {
-  return handler.Ushort(i);
-}
-
-bool Parse::SetValue(int i, BaseHandler& handler) const {
-  return handler.Int(i);
-}
-
-bool Parse::SetValue(unsigned int i, BaseHandler& handler) const {
-  return handler.Uint(i);
-}
-
-bool Parse::SetValue(int64_t i, BaseHandler& handler) const {
-  return handler.Int64(i);
-}
-
-bool Parse::SetValue(uint64_t i, BaseHandler& handler) const {
-  return handler.Uint64(i);
-}
-
-bool Parse::SetValue(float f, BaseHandler& handler) const {
-  return handler.Double(double(f));
-}
-
-bool Parse::SetValue(double f, BaseHandler& handler) const {
-  return handler.Double(f);
-}
-
-bool Parse::SetValue(const std::string& s, BaseHandler& handler) const {
-  return handler.String(s.c_str(), s.size(), /* not used */ false);
-}
-
-}  // namespace simple_type_reflection
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/attic/simple-type-reflection.hh b/contrib/tinyusdz/tinyusdz_repo/src/attic/simple-type-reflection.hh
deleted file mode 100644
index 684de66df..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/attic/simple-type-reflection.hh
+++ /dev/null
@@ -1,1930 +0,0 @@
-//
-// Simple single-file static type reflection
-// library supporting frequently used STL containers. Code is based on
-// StaticJSON: https://github.com/netheril96/StaticJSON
-//
-// MIT license
-//
-// Copyright (c) 2014 Siyuan Ren (netheril96@gmail.com)
-//
-// Modification: Copyright (c) 2020-Present Syoyo Fujita
-//
-
-#pragma once
-
-#include <cmath>
-#include <limits>
-#include <memory>
-
-//
-// STL types
-//
-#include <array>
-#include <list>
-#include <map>
-#include <unordered_map>
-#include <vector>
-#include <string>
-
-// TODO: deque, tuple
-
-namespace simple_type_relection {
-
-// TODO:
-// [ ] EnumHandler
-// [ ] Better error report
-// [ ] std::optional type
-
-struct NonMobile {
-  NonMobile() {}
-  ~NonMobile() {}
-  NonMobile(const NonMobile&) = delete;
-  NonMobile(NonMobile&&) = delete;
-  NonMobile& operator=(const NonMobile&) = delete;
-  NonMobile& operator=(NonMobile&&) = delete;
-};
-
-typedef std::size_t SizeType;
-
-struct Error {
-  int error_type;
-  static const int SUCCESS = 0, OBJECT_MEMBER = 1, ARRAY_ELEMENT = 2,
-                   MISSING_REQUIRED = 3, TYPE_MISMATCH = 4,
-                   NUMBER_OUT_OF_RANGE = 5, ARRAY_LENGTH_MISMATCH = 6,
-                   UNKNOWN_FIELD = 7, DUPLICATE_KEYS = 8, CORRUPTED_DOM = 9,
-                   TOO_DEEP_RECURSION = 10, INVALID_ENUM = 11, CUSTOM = -1;
-
-  std::string error_msg;
-
-  Error(int ty, std::string msg) : error_type(ty), error_msg(msg) {}
-};
-
-Error* TypeMismatchError(std::string expected_type, std::string actual_type);
-Error* RequiredFieldMissingError();
-Error* UnknownFieldError(std::string field_name);
-Error* ArrayElementError(size_t n);
-Error* ArrayLengthMismatchError();
-Error* ObjectMemberError(std::string key);
-Error* DuplicateKeyError(std::string key);
-
-class IHandler {
- public:
-  IHandler() {}
-
-  virtual ~IHandler();
-
-  virtual bool Null() = 0;
-
-  virtual bool Bool(bool) = 0;
-
-  virtual bool Short(short) = 0;
-
-  virtual bool Ushort(unsigned short) = 0;
-
-  virtual bool Int(int) = 0;
-
-  virtual bool Uint(unsigned) = 0;
-
-  virtual bool Int64(std::int64_t) = 0;
-
-  virtual bool Uint64(std::uint64_t) = 0;
-
-  virtual bool Double(double) = 0;
-
-  virtual bool String(const char*, SizeType, bool) = 0;
-
-  virtual bool StartObject() = 0;
-
-  virtual bool Key(const char*, SizeType, bool) = 0;
-
-  virtual bool EndObject(SizeType) = 0;
-
-  virtual bool StartArray() = 0;
-
-  virtual bool EndArray(SizeType) = 0;
-
-  // virtual bool RawNumber(const char*, SizeType, bool);
-
-  virtual void prepare_for_reuse() = 0;
-};
-
-class BaseHandler : public IHandler
-//, private NonMobile
-{
-  friend class NullableHandler;
-
- protected:
-  std::unique_ptr<Error> the_error;
-  bool parsed = false;
-
- protected:
-  bool set_out_of_range(const char* actual_type);
-  bool set_type_mismatch(const char* actual_type);
-
-  virtual void reset() {}
-
- public:
-  BaseHandler();
-
-  virtual ~BaseHandler() override;
-
-  virtual std::string type_name() const = 0;
-
-  virtual bool Null() override { return set_type_mismatch("null"); }
-
-  virtual bool Bool(bool) override { return set_type_mismatch("bool"); }
-
-  virtual bool Short(short) override { return set_type_mismatch("short"); }
-
-  virtual bool Ushort(unsigned short) override {
-    return set_type_mismatch("ushort");
-  }
-
-  virtual bool Int(int) override { return set_type_mismatch("int"); }
-
-  virtual bool Uint(unsigned) override { return set_type_mismatch("unsigned"); }
-
-  virtual bool Int64(std::int64_t) override {
-    return set_type_mismatch("int64_t");
-  }
-
-  virtual bool Uint64(std::uint64_t) override {
-    return set_type_mismatch("uint64_t");
-  }
-
-  virtual bool Double(double) override { return set_type_mismatch("double"); }
-
-  virtual bool String(const char*, SizeType, bool) override {
-    return set_type_mismatch("string");
-  }
-
-  virtual bool StartObject() override { return set_type_mismatch("object"); }
-
-  virtual bool Key(const char*, SizeType, bool) override {
-    return set_type_mismatch("object");
-  }
-
-  virtual bool EndObject(SizeType) override {
-    return set_type_mismatch("object");
-  }
-
-  virtual bool StartArray() override { return set_type_mismatch("array"); }
-
-  virtual bool EndArray(SizeType) override {
-    return set_type_mismatch("array");
-  }
-
-  virtual bool has_error() const { return !the_error; }
-
-  bool is_parsed() const { return parsed; }
-
-  void prepare_for_reuse() override {
-    the_error.reset();
-    parsed = false;
-    reset();
-  }
-
-  virtual bool write(IHandler* output) const = 0;
-
-  // virtual void generate_schema(Value& output, MemoryPoolAllocator& alloc)
-  // const = 0;
-};
-
-struct Flags {
-  static const unsigned Default = 0x0, AllowDuplicateKey = 0x1, Optional = 0x2,
-                        IgnoreRead = 0x4, IgnoreWrite = 0x8,
-                        DisallowUnknownKey = 0x10;
-};
-
-// Forward declaration
-template <class T>
-class Handler;
-
-class ObjectHandler : public BaseHandler {
- protected:
-  struct FlaggedHandler {
-    std::unique_ptr<BaseHandler> handler;
-    unsigned flags;
-  };
-
- protected:
-  std::map<std::string, FlaggedHandler> internals;
-  FlaggedHandler* current = nullptr;
-  std::string current_name;
-  int depth = 0;
-  unsigned flags = Flags::Default;
-
- protected:
-  bool precheck(const char* type);
-  bool postcheck(bool success);
-  void set_missing_required(const std::string& name);
-  void add_handler(std::string&&, FlaggedHandler&&);
-  void reset() override;
-
- public:
-  ObjectHandler();
-
-  ~ObjectHandler() override;
-
-  std::string type_name() const override;
-
-  virtual bool Null() override;
-
-  virtual bool Bool(bool) override;
-
-  virtual bool Short(short) override;
-
-  virtual bool Ushort(unsigned short) override;
-
-  virtual bool Int(int) override;
-
-  virtual bool Uint(unsigned) override;
-
-  virtual bool Int64(std::int64_t) override;
-
-  virtual bool Uint64(std::uint64_t) override;
-
-  virtual bool Double(double) override;
-
-  virtual bool String(const char*, SizeType, bool) override;
-
-  virtual bool StartObject() override;
-
-  virtual bool Key(const char*, SizeType, bool) override;
-
-  virtual bool EndObject(SizeType) override;
-
-  virtual bool StartArray() override;
-
-  virtual bool EndArray(SizeType) override;
-
-  // virtual bool reap_error(ErrorStack&) override;
-
-  virtual bool write(IHandler* output) const override;
-
-  // virtual void generate_schema(Value& output, MemoryPoolAllocator& alloc)
-  // const override;
-
-  unsigned get_flags() const { return flags; }
-
-  void set_flags(unsigned f) { flags = f; }
-
-  template <class T>
-  void add_property(std::string name, T* pointer,
-                    unsigned flags_ = Flags::Default) {
-    FlaggedHandler fh;
-    fh.handler.reset(new Handler<T>(pointer));
-    fh.flags = flags_;
-    add_handler(std::move(name), std::move(fh));
-  }
-};
-
-template <class T>
-struct Converter {
-  typedef T shadow_type;
-
-  static std::string from_shadow(const shadow_type& shadow, T& value) {
-    (void)shadow;
-    (void)value;
-    return nullptr;
-  }
-
-  static void to_shadow(const T& value, shadow_type& shadow) {
-    (void)shadow;
-    (void)value;
-  }
-
-  static std::string type_name() { return "T"; }
-
-  static constexpr bool has_specialized_type_name = false;
-};
-
-template <class T>
-void init(T* t, ObjectHandler* h) {
-  t->simple_serialize_init(h);
-}
-
-template <class T>
-class ObjectTypeHandler : public ObjectHandler {
- public:
-  explicit ObjectTypeHandler(T* t) { init(t, this); }
-};
-
-template <class T>
-class ConversionHandler : public BaseHandler {
- private:
-  typedef typename Converter<T>::shadow_type shadow_type;
-  typedef Handler<shadow_type> internal_type;
-
- private:
-  shadow_type shadow;
-  internal_type internal;
-  T* m_value;
-
- protected:
-  bool postprocess(bool success) {
-    if (!success) {
-      return false;
-    }
-    if (!internal.is_parsed()) return true;
-    this->parsed = true;
-    auto err = Converter<T>::from_shadow(shadow, *m_value);
-    if (err) {
-      this->the_error.swap(err);
-      return false;
-    }
-    return true;
-  }
-
-  void reset() override {
-    shadow = shadow_type();
-    internal.prepare_for_reuse();
-  }
-
- public:
-  explicit ConversionHandler(T* t) : shadow(), internal(&shadow), m_value(t) {}
-
-  std::string type_name() const override {
-    // if (Converter<T>::has_specialized_type_name)
-    //  return Converter<T>::type_name();
-    return internal.type_name();
-  }
-
-  bool Null() override { return postprocess(internal.Null()); }
-
-  bool Bool(bool b) override { return postprocess(internal.Bool(b)); }
-
-  bool Short(short i) override { return postprocess(internal.Short(i)); }
-
-  bool Ushort(unsigned short u) override {
-    return postprocess(internal.Ushort(u));
-  }
-
-  bool Int(int i) override { return postprocess(internal.Int(i)); }
-
-  bool Uint(unsigned u) override { return postprocess(internal.Uint(u)); }
-
-  bool Int64(std::int64_t i) override { return postprocess(internal.Int64(i)); }
-
-  bool Uint64(std::uint64_t u) override {
-    return postprocess(internal.Uint64(u));
-  }
-
-  bool Double(double d) override { return postprocess(internal.Double(d)); }
-
-  bool String(const char* str, SizeType size, bool copy) override {
-    return postprocess(internal.String(str, size, copy));
-  }
-
-  bool StartObject() override { return postprocess(internal.StartObject()); }
-
-  bool Key(const char* str, SizeType size, bool copy) override {
-    return postprocess(internal.Key(str, size, copy));
-  }
-
-  bool EndObject(SizeType sz) override {
-    return postprocess(internal.EndObject(sz));
-  }
-
-  bool StartArray() override { return postprocess(internal.StartArray()); }
-
-  bool EndArray(SizeType sz) override {
-    return postprocess(internal.EndArray(sz));
-  }
-
-  bool has_error() const override {
-    return BaseHandler::has_error() || internal.has_error();
-  }
-
-  // bool reap_error(ErrorStack& errs) override
-  //{
-  //    return BaseHandler::reap_error(errs) || internal.reap_error(errs);
-  //}
-
-  virtual bool write(IHandler* output) const override {
-    Converter<T>::to_shadow(*m_value, const_cast<shadow_type&>(shadow));
-    return internal.write(output);
-  }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    return internal.generate_schema(output, alloc);
-  //}
-};
-
-namespace helper {
-template <class T, bool no_conversion>
-class DispatchHandler;
-template <class T>
-class DispatchHandler<T, true>
-    : public ::simple_serialize::ObjectTypeHandler<T> {
- public:
-  explicit DispatchHandler(T* t)
-      : ::simple_serialize::ObjectTypeHandler<T>(t) {}
-};
-
-template <class T>
-class DispatchHandler<T, false>
-    : public ::simple_serialize::ConversionHandler<T> {
- public:
-  explicit DispatchHandler(T* t)
-      : ::simple_serialize::ConversionHandler<T>(t) {}
-};
-}  // namespace helper
-
-template <class T>
-class Handler
-    : public helper::DispatchHandler<
-          T, std::is_same<typename Converter<T>::shadow_type, T>::value> {
- public:
-  typedef helper::DispatchHandler<
-      T, std::is_same<typename Converter<T>::shadow_type, T>::value>
-      base_type;
-  // explicit Handler(T* t) : base_type(t) {}
-  explicit Handler(T* t);
-};
-
-// ---- primitive types ----
-
-template <class IntType>
-class IntegerHandler : public BaseHandler {
-  static_assert(std::is_arithmetic<IntType>::value,
-                "Only arithmetic types are allowed");
-
- protected:
-  IntType* m_value;
-
-  template <class AnotherIntType>
-  static constexpr
-      typename std::enable_if<std::is_integral<AnotherIntType>::value,
-                              bool>::type
-      is_out_of_range(AnotherIntType a) {
-    typedef typename std::common_type<IntType, AnotherIntType>::type CommonType;
-    typedef typename std::numeric_limits<IntType> this_limits;
-    typedef typename std::numeric_limits<AnotherIntType> that_limits;
-
-    // The extra logic related to this_limits::min/max allows the compiler to
-    // short circuit this check at compile time. For instance, a `uint32_t`
-    // will NEVER be out of range for an `int64_t`
-    return (
-        (this_limits::is_signed == that_limits::is_signed)
-            ? ((CommonType(this_limits::min()) > CommonType(a) ||
-                CommonType(this_limits::max()) < CommonType(a)))
-            : (this_limits::is_signed)
-                  ? (CommonType(this_limits::max()) < CommonType(a))
-                  : (a < 0 || CommonType(a) > CommonType(this_limits::max())));
-  }
-
-  template <class FloatType>
-  static constexpr
-      typename std::enable_if<std::is_floating_point<FloatType>::value,
-                              bool>::type
-      is_out_of_range(FloatType f) {
-    // return static_cast<FloatType>(static_cast<IntType>(f)) != f;
-    return std::isfinite(f);
-  }
-
-  template <class ReceiveNumType>
-  bool receive(ReceiveNumType r, const char* actual_type) {
-    if (is_out_of_range(r)) return set_out_of_range(actual_type);
-    *m_value = static_cast<IntType>(r);
-    this->parsed = true;
-    return true;
-  }
-
- public:
-  explicit IntegerHandler(IntType* value) : m_value(value) {}
-
-  virtual bool Short(short i) override { return receive(i, "short"); }
-
-  virtual bool Ushort(unsigned short i) override {
-    return receive(i, "unsigned short");
-  }
-
-  virtual bool Int(int i) override { return receive(i, "int"); }
-
-  virtual bool Uint(unsigned i) override { return receive(i, "unsigned int"); }
-
-  virtual bool Int64(std::int64_t i) override {
-    return receive(i, "std::int64_t");
-  }
-
-  virtual bool Uint64(std::uint64_t i) override {
-    return receive(i, "std::uint64_t");
-  }
-
-  virtual bool Double(double d) override { return receive(d, "double"); }
-
-  virtual bool write(IHandler* output) const override {
-    if (std::numeric_limits<IntType>::is_signed) {
-      return output->Int64(int64_t(*m_value));
-    } else {
-      return output->Uint64(uint64_t(*m_value));
-    }
-  }
-
-  // virtual void generate_schema(Value& output, MemoryPoolAllocator& alloc)
-  // const override
-  //{
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("integer"), alloc); Value minimum, maximum; if
-  //    (std::numeric_limits<IntType>::is_signed)
-  //    {
-  //        minimum.SetInt64(std::numeric_limits<IntType>::min());
-  //        maximum.SetInt64(std::numeric_limits<IntType>::max());
-  //    }
-  //    else
-  //    {
-  //        minimum.SetUint64(std::numeric_limits<IntType>::min());
-  //        maximum.SetUint64(std::numeric_limits<IntType>::max());
-  //    }
-  //    output.AddMember(rapidjson::StringRef("minimum"), minimum, alloc);
-  //    output.AddMember(rapidjson::StringRef("maximum"), maximum, alloc);
-  //}
-};
-
-template <>
-class Handler<std::nullptr_t> : public BaseHandler {
- public:
-  explicit Handler(std::nullptr_t*);
-
-  bool Null() override {
-    this->parsed = true;
-    return true;
-  }
-
-  std::string type_name() const override { return "null"; }
-
-  bool write(IHandler* output) const override { return output->Null(); }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("null"), alloc);
-  //}
-};
-
-template <>
-class Handler<bool> : public BaseHandler {
- private:
-  bool* m_value;
-
- public:
-  explicit Handler(bool* value);
-  ~Handler() override;
-
-  bool Bool(bool v) override {
-    *m_value = v;
-    this->parsed = true;
-    return true;
-  }
-
-  std::string type_name() const override { return "bool"; }
-
-  bool write(IHandler* output) const override { return output->Bool(*m_value); }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("boolean"), alloc);
-  //}
-};
-
-template <>
-class Handler<short> : public IntegerHandler<short> {
- public:
-  explicit Handler(short* i) : IntegerHandler<short>(i) {}
-  ~Handler() override;
-
-  std::string type_name() const override { return "short"; }
-
-  bool write(IHandler* output) const override {
-    return output->Short(*m_value);
-  }
-};
-
-template <>
-class Handler<unsigned short> : public IntegerHandler<unsigned short> {
- public:
-  explicit Handler(unsigned short* i) : IntegerHandler<unsigned short>(i) {}
-  ~Handler() override;
-
-  std::string type_name() const override { return "unsigned short"; }
-
-  bool write(IHandler* output) const override {
-    return output->Ushort(*m_value);
-  }
-};
-
-template <>
-class Handler<int> : public IntegerHandler<int> {
- public:
-  explicit Handler(int* i) : IntegerHandler<int>(i) {}
-  ~Handler() override;
-
-  std::string type_name() const override { return "int"; }
-
-  bool write(IHandler* output) const override { return output->Int(*m_value); }
-};
-
-template <>
-class Handler<unsigned int> : public IntegerHandler<unsigned int> {
- public:
-  explicit Handler(unsigned* i) : IntegerHandler<unsigned>(i) {}
-  ~Handler() override;
-
-  std::string type_name() const override { return "unsigned int"; }
-
-  bool write(IHandler* output) const override { return output->Uint(*m_value); }
-};
-
-template <>
-class Handler<int64_t> : public IntegerHandler<int64_t> {
- public:
-  explicit Handler(int64_t* i) : IntegerHandler<int64_t>(i) {}
-  ~Handler() override;
-
-  std::string type_name() const override { return "int64"; }
-};
-
-template <>
-class Handler<uint64_t> : public IntegerHandler<uint64_t> {
- public:
-  explicit Handler(uint64_t* i) : IntegerHandler<uint64_t>(i) {}
-  ~Handler() override;
-
-  std::string type_name() const override { return "unsigned int64"; }
-};
-
-// char is an alias for bool to work around the stupid `std::vector<bool>`
-template <>
-class Handler<char> : public BaseHandler {
- private:
-  char* m_value;
-
- public:
-  explicit Handler(char* i) : m_value(i) {}
-  ~Handler() override;
-
-  std::string type_name() const override { return "bool"; }
-
-  bool Bool(bool v) override {
-    *this->m_value = v;
-    this->parsed = true;
-    return true;
-  }
-
-  bool write(IHandler* out) const override { return out->Bool(*m_value != 0); }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("boolean"), alloc);
-  //}
-};
-
-template <>
-class Handler<double> : public BaseHandler {
- private:
-  double* m_value;
-
- public:
-  explicit Handler(double* v) : m_value(v) {}
-  ~Handler() override;
-
-  bool Short(short i) override {
-    *m_value = i;
-    this->parsed = true;
-    return true;
-  }
-
-  bool Ushort(unsigned short i) override {
-    *m_value = i;
-    this->parsed = true;
-    return true;
-  }
-
-  bool Int(int i) override {
-    *m_value = i;
-    this->parsed = true;
-    return true;
-  }
-
-  bool Uint(unsigned i) override {
-    *m_value = i;
-    this->parsed = true;
-    return true;
-  }
-
-  bool Int64(std::int64_t i) override {
-    *m_value = static_cast<double>(i);
-    if (static_cast<decltype(i)>(*m_value) != i)
-      return set_out_of_range("std::int64_t");
-    this->parsed = true;
-    return true;
-  }
-
-  bool Uint64(std::uint64_t i) override {
-    *m_value = static_cast<double>(i);
-    if (static_cast<decltype(i)>(*m_value) != i)
-      return set_out_of_range("std::uint64_t");
-    this->parsed = true;
-    return true;
-  }
-
-  bool Double(double d) override {
-    *m_value = d;
-    this->parsed = true;
-    return true;
-  }
-
-  std::string type_name() const override { return "double"; }
-
-  bool write(IHandler* out) const override { return out->Double(*m_value); }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("number"), alloc);
-  //}
-};
-
-template <>
-class Handler<float> : public BaseHandler {
- private:
-  float* m_value;
-
- public:
-  explicit Handler(float* v) : m_value(v) {}
-  ~Handler() override;
-
-  bool Short(short i) override {
-    *m_value = i;
-    this->parsed = true;
-    return true;
-  }
-
-  bool Ushort(unsigned short i) override {
-    *m_value = i;
-    this->parsed = true;
-    return true;
-  }
-
-  bool Int(int i) override {
-    *m_value = static_cast<float>(i);
-    if (static_cast<decltype(i)>(*m_value) != i) return set_out_of_range("int");
-    this->parsed = true;
-    return true;
-  }
-
-  bool Uint(unsigned i) override {
-    *m_value = static_cast<float>(i);
-    if (static_cast<decltype(i)>(*m_value) != i)
-      return set_out_of_range("unsigned int");
-    this->parsed = true;
-    return true;
-  }
-
-  bool Int64(std::int64_t i) override {
-    *m_value = static_cast<float>(i);
-    if (static_cast<decltype(i)>(*m_value) != i)
-      return set_out_of_range("std::int64_t");
-    this->parsed = true;
-    return true;
-  }
-
-  bool Uint64(std::uint64_t i) override {
-    *m_value = static_cast<float>(i);
-    if (static_cast<decltype(i)>(*m_value) != i)
-      return set_out_of_range("std::uint64_t");
-    this->parsed = true;
-    return true;
-  }
-
-  bool Double(double d) override {
-    *m_value = static_cast<float>(d);
-    this->parsed = true;
-    return true;
-  }
-
-  std::string type_name() const override { return "float"; }
-
-  bool write(IHandler* out) const override {
-    return out->Double(double(*m_value));
-  }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("number"), alloc);
-  //}
-};
-
-template <>
-class Handler<std::string> : public BaseHandler {
- private:
-  std::string* m_value;
-
- public:
-  explicit Handler(std::string* v) : m_value(v) {}
-  ~Handler() override;
-
-  bool String(const char* str, SizeType length, bool) override {
-    m_value->assign(str, length);
-    this->parsed = true;
-    return true;
-  }
-
-  std::string type_name() const override { return "string"; }
-
-  bool write(IHandler* out) const override {
-    return out->String(m_value->data(), SizeType(m_value->size()), true);
-  }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("string"), alloc);
-  //}
-};
-
-//
-// STL types
-//
-
-template <class ArrayType>
-class ArrayHandler : public BaseHandler {
- public:
-  typedef typename ArrayType::value_type ElementType;
-
- protected:
-  ElementType element;
-  Handler<ElementType> internal;
-  ArrayType* m_value;
-  int depth = 0;
-
- protected:
-  void set_element_error() {
-    the_error.reset(ArrayElementError(m_value->size()));
-  }
-
-  bool precheck(const char* type) {
-    if (depth <= 0) {
-      the_error.reset(TypeMismatchError(type_name(), type));
-      return false;
-    }
-    return true;
-  }
-
-  bool postcheck(bool success) {
-    if (!success) {
-      set_element_error();
-      return false;
-    }
-    if (internal.is_parsed()) {
-      m_value->emplace_back(std::move(element));
-      element = ElementType();
-      internal.prepare_for_reuse();
-    }
-    return true;
-  }
-
-  void reset() override {
-    element = ElementType();
-    internal.prepare_for_reuse();
-    depth = 0;
-  }
-
- public:
-  explicit ArrayHandler(ArrayType* value)
-      : element(), internal(&element), m_value(value) {}
-
-  bool Null() override {
-    return precheck("null") && postcheck(internal.Null());
-  }
-
-  bool Bool(bool b) override {
-    return precheck("bool") && postcheck(internal.Bool(b));
-  }
-
-  bool Short(short i) override {
-    return precheck("short") && postcheck(internal.Short(i));
-  }
-
-  bool Ushort(unsigned short i) override {
-    return precheck("unsigned short") && postcheck(internal.Ushort(i));
-  }
-
-  bool Int(int i) override {
-    return precheck("int") && postcheck(internal.Int(i));
-  }
-
-  bool Uint(unsigned i) override {
-    return precheck("unsigned") && postcheck(internal.Uint(i));
-  }
-
-  bool Int64(std::int64_t i) override {
-    return precheck("int64_t") && postcheck(internal.Int64(i));
-  }
-
-  bool Uint64(std::uint64_t i) override {
-    return precheck("uint64_t") && postcheck(internal.Uint64(i));
-  }
-
-  bool Double(double d) override {
-    return precheck("double") && postcheck(internal.Double(d));
-  }
-
-  bool String(const char* str, SizeType length, bool copy) override {
-    return precheck("string") && postcheck(internal.String(str, length, copy));
-  }
-
-  bool Key(const char* str, SizeType length, bool copy) override {
-    return precheck("object") && postcheck(internal.Key(str, length, copy));
-  }
-
-  bool StartObject() override {
-    return precheck("object") && postcheck(internal.StartObject());
-  }
-
-  bool EndObject(SizeType length) override {
-    return precheck("object") && postcheck(internal.EndObject(length));
-  }
-
-  bool StartArray() override {
-    ++depth;
-    if (depth > 1)
-      return postcheck(internal.StartArray());
-    else
-      m_value->clear();
-    return true;
-  }
-
-  bool EndArray(SizeType length) override {
-    --depth;
-
-    // When depth >= 1, this event should be forwarded to the element
-    if (depth > 0) return postcheck(internal.EndArray(length));
-
-    this->parsed = true;
-    return true;
-  }
-
-  // bool reap_error(ErrorStack& stk) override
-  //{
-  //    if (!the_error)
-  //        return false;
-  //    stk.push(the_error.release());
-  //    internal.reap_error(stk);
-  //    return true;
-  //}
-
-  bool write(IHandler* output) const override {
-    if (!output->StartArray()) return false;
-    for (auto&& e : *m_value) {
-      Handler<ElementType> h(&e);
-      if (!h.write(output)) return false;
-    }
-    return output->EndArray(
-        static_cast<simple_serialize::SizeType>(m_value->size()));
-  }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("array"), alloc); Value items;
-  //    internal.generate_schema(items, alloc);
-  //    output.AddMember(rapidjson::StringRef("items"), items, alloc);
-  //}
-};
-
-template <class T>
-class Handler<std::vector<T>> : public ArrayHandler<std::vector<T>> {
- public:
-  explicit Handler(std::vector<T>* value)
-      : ArrayHandler<std::vector<T>>(value) {}
-
-  std::string type_name() const override {
-    return "std::vector<" + this->internal.type_name() + ">";
-  }
-};
-
-#if 0
-template <class T>
-class Handler<std::deque<T>> : public ArrayHandler<std::deque<T>>
-{
-public:
-    explicit Handler(std::deque<T>* value) : ArrayHandler<std::deque<T>>(value) {}
-
-    std::string type_name() const override
-    {
-        return "std::deque<" + this->internal.type_name() + ">";
-    }
-};
-#endif
-
-template <class T>
-class Handler<std::list<T>> : public ArrayHandler<std::list<T>> {
- public:
-  explicit Handler(std::list<T>* value) : ArrayHandler<std::list<T>>(value) {}
-
-  std::string type_name() const override {
-    return "std::list<" + this->internal.type_name() + ">";
-  }
-};
-
-template <class T, size_t N>
-class Handler<std::array<T, N>> : public BaseHandler {
- protected:
-  T element;
-  Handler<T> internal;
-  std::array<T, N>* m_value;
-  size_t count = 0;
-  int depth = 0;
-
- protected:
-  void set_element_error() { the_error.reset(ArrayElementError(count)); }
-
-  void set_length_error() { the_error.reset(ArrayLengthMismatchError()); }
-
-  bool precheck(const char* type) {
-    if (depth <= 0) {
-      the_error.reset(TypeMismatchError(type_name(), type));
-      return false;
-    }
-    return true;
-  }
-
-  bool postcheck(bool success) {
-    if (!success) {
-      set_element_error();
-      return false;
-    }
-    if (internal.is_parsed()) {
-      if (count >= N) {
-        set_length_error();
-        return false;
-      }
-      (*m_value)[count] = std::move(element);
-      ++count;
-      element = T();
-      internal.prepare_for_reuse();
-    }
-    return true;
-  }
-
-  void reset() override {
-    element = T();
-    internal.prepare_for_reuse();
-    depth = 0;
-    count = 0;
-  }
-
- public:
-  explicit Handler(std::array<T, N>* value)
-      : element(), internal(&element), m_value(value) {}
-
-  bool Null() override {
-    return precheck("null") && postcheck(internal.Null());
-  }
-
-  bool Bool(bool b) override {
-    return precheck("bool") && postcheck(internal.Bool(b));
-  }
-
-  bool Short(short i) override {
-    return precheck("short") && postcheck(internal.Short(i));
-  }
-
-  bool Ushort(unsigned short i) override {
-    return precheck("unsigned short") && postcheck(internal.Ushort(i));
-  }
-
-  bool Int(int i) override {
-    return precheck("int") && postcheck(internal.Int(i));
-  }
-
-  bool Uint(unsigned i) override {
-    return precheck("unsigned") && postcheck(internal.Uint(i));
-  }
-
-  bool Int64(std::int64_t i) override {
-    return precheck("int64_t") && postcheck(internal.Int64(i));
-  }
-
-  bool Uint64(std::uint64_t i) override {
-    return precheck("uint64_t") && postcheck(internal.Uint64(i));
-  }
-
-  bool Double(double d) override {
-    return precheck("double") && postcheck(internal.Double(d));
-  }
-
-  bool String(const char* str, SizeType length, bool copy) override {
-    return precheck("string") && postcheck(internal.String(str, length, copy));
-  }
-
-  bool Key(const char* str, SizeType length, bool copy) override {
-    return precheck("object") && postcheck(internal.Key(str, length, copy));
-  }
-
-  bool StartObject() override {
-    return precheck("object") && postcheck(internal.StartObject());
-  }
-
-  bool EndObject(SizeType length) override {
-    return precheck("object") && postcheck(internal.EndObject(length));
-  }
-
-  bool StartArray() override {
-    ++depth;
-    if (depth > 1) return postcheck(internal.StartArray());
-    return true;
-  }
-
-  bool EndArray(SizeType length) override {
-    --depth;
-
-    // When depth >= 1, this event should be forwarded to the element
-    if (depth > 0) return postcheck(internal.EndArray(length));
-    if (count != N) {
-      set_length_error();
-      return false;
-    }
-    this->parsed = true;
-    return true;
-  }
-
-  // bool reap_error(ErrorStack& stk) override
-  //{
-  //    if (!the_error)
-  //        return false;
-  //    stk.push(the_error.release());
-  //    internal.reap_error(stk);
-  //    return true;
-  //}
-
-  bool write(IHandler* output) const override {
-    if (!output->StartArray()) return false;
-    for (auto&& e : *m_value) {
-      Handler<T> h(&e);
-      if (!h.write(output)) return false;
-    }
-    return output->EndArray(
-        static_cast<simple_serialize::SizeType>(m_value->size()));
-  }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("array"), alloc); Value items;
-  //    internal.generate_schema(items, alloc);
-  //    output.AddMember(rapidjson::StringRef("items"), items, alloc);
-  //    output.AddMember(rapidjson::StringRef("minItems"),
-  //    static_cast<uint64_t>(N), alloc);
-  //    output.AddMember(rapidjson::StringRef("maxItems"),
-  //    static_cast<uint64_t>(N), alloc);
-  //}
-
-  std::string type_name() const override {
-    return "std::array<" + internal.type_name() + ", " + std::to_string(N) +
-           ">";
-  }
-};
-
-#if 0
-template <class PointerType>
-class PointerHandler : public BaseHandler
-{
-public:
-    typedef typename std::pointer_traits<PointerType>::element_type ElementType;
-
-protected:
-    mutable PointerType* m_value;
-    mutable std::unique_ptr<Handler<ElementType>> internal_handler;
-    int depth = 0;
-
-protected:
-    explicit PointerHandler(PointerType* value) : m_value(value) {}
-
-    void initialize()
-    {
-        if (!internal_handler)
-        {
-            m_value->reset(new ElementType());
-            internal_handler.reset(new Handler<ElementType>(m_value->get()));
-        }
-    }
-
-    void reset() override
-    {
-        depth = 0;
-        internal_handler.reset();
-        m_value->reset();
-    }
-
-    bool postcheck(bool success)
-    {
-        if (success)
-            this->parsed = internal_handler->is_parsed();
-        return success;
-    }
-
-public:
-    bool Null() override
-    {
-        if (depth == 0)
-        {
-            m_value->reset();
-            this->parsed = true;
-            return true;
-        }
-        else
-        {
-            initialize();
-            return postcheck(internal_handler->Null());
-        }
-    }
-
-    bool write(IHandler* out) const override
-    {
-        if (!m_value || !m_value->get())
-        {
-            return out->Null();
-        }
-        if (!internal_handler)
-        {
-            internal_handler.reset(new Handler<ElementType>(m_value->get()));
-        }
-        return internal_handler->write(out);
-    }
-
-    void generate_schema(Value& output, MemoryPoolAllocator& alloc) const override
-    {
-        const_cast<PointerHandler<PointerType>*>(this)->initialize();
-        output.SetObject();
-        Value anyOf(rapidjson::kArrayType);
-        Value nullDescriptor(rapidjson::kObjectType);
-        nullDescriptor.AddMember(rapidjson::StringRef("type"), rapidjson::StringRef("null"), alloc);
-        Value descriptor;
-        internal_handler->generate_schema(descriptor, alloc);
-        anyOf.PushBack(nullDescriptor, alloc);
-        anyOf.PushBack(descriptor, alloc);
-        output.AddMember(rapidjson::StringRef("anyOf"), anyOf, alloc);
-    }
-
-    bool Bool(bool b) override
-    {
-        initialize();
-        return postcheck(internal_handler->Bool(b));
-    }
-
-    bool Int(int i) override
-    {
-        initialize();
-        return postcheck(internal_handler->Int(i));
-    }
-
-    bool Uint(unsigned i) override
-    {
-        initialize();
-        return postcheck(internal_handler->Uint(i));
-    }
-
-    bool Int64(std::int64_t i) override
-    {
-        initialize();
-        return postcheck(internal_handler->Int64(i));
-    }
-
-    bool Uint64(std::uint64_t i) override
-    {
-        initialize();
-        return postcheck(internal_handler->Uint64(i));
-    }
-
-    bool Double(double i) override
-    {
-        initialize();
-        return postcheck(internal_handler->Double(i));
-    }
-
-    bool String(const char* str, SizeType len, bool copy) override
-    {
-        initialize();
-        return postcheck(internal_handler->String(str, len, copy));
-    }
-
-    bool Key(const char* str, SizeType len, bool copy) override
-    {
-        initialize();
-        return postcheck(internal_handler->Key(str, len, copy));
-    }
-
-    bool StartObject() override
-    {
-        initialize();
-        ++depth;
-        return internal_handler->StartObject();
-    }
-
-    bool EndObject(SizeType len) override
-    {
-        initialize();
-        --depth;
-        return postcheck(internal_handler->EndObject(len));
-    }
-
-    bool StartArray() override
-    {
-        initialize();
-        ++depth;
-        return postcheck(internal_handler->StartArray());
-    }
-
-    bool EndArray(SizeType len) override
-    {
-        initialize();
-        --depth;
-        return postcheck(internal_handler->EndArray(len));
-    }
-
-    bool has_error() const override { return internal_handler && internal_handler->has_error(); }
-
-    bool reap_error(ErrorStack& stk) override
-    {
-        return internal_handler && internal_handler->reap_error(stk);
-    }
-};
-
-template <class T, class Deleter>
-class Handler<std::unique_ptr<T, Deleter>> : public PointerHandler<std::unique_ptr<T, Deleter>>
-{
-public:
-    explicit Handler(std::unique_ptr<T, Deleter>* value)
-        : PointerHandler<std::unique_ptr<T, Deleter>>(value)
-    {
-    }
-
-    std::string type_name() const override
-    {
-        if (this->internal_handler)
-        {
-            return "std::unique_ptr<" + this->internal_handler->type_name() + ">";
-        }
-        return "std::unique_ptr";
-    }
-};
-
-template <class T>
-class Handler<std::shared_ptr<T>> : public PointerHandler<std::shared_ptr<T>>
-{
-public:
-    explicit Handler(std::shared_ptr<T>* value) : PointerHandler<std::shared_ptr<T>>(value) {}
-
-    std::string type_name() const override
-    {
-        if (this->internal_handler)
-        {
-            return "std::shared_ptr<" + this->internal_handler->type_name() + ">";
-        }
-        return "std::shared_ptr";
-    }
-};
-#endif
-
-template <class MapType>
-class MapHandler : public BaseHandler {
- protected:
-  typedef typename MapType::mapped_type ElementType;
-
- protected:
-  ElementType element;
-  Handler<ElementType> internal_handler;
-  MapType* m_value;
-  std::string current_key;
-  int depth = 0;
-
- protected:
-  void reset() override {
-    element = ElementType();
-    current_key.clear();
-    internal_handler.prepare_for_reuse();
-    depth = 0;
-  }
-
-  bool precheck(const char* type) {
-    if (depth <= 0) {
-      set_type_mismatch(type);
-      return false;
-    }
-    return true;
-  }
-
-  bool postcheck(bool success) {
-    if (!success) {
-      the_error.reset(ObjectMemberError(current_key));
-    } else {
-      if (internal_handler.is_parsed()) {
-        m_value->emplace(std::move(current_key), std::move(element));
-        element = ElementType();
-        internal_handler.prepare_for_reuse();
-      }
-    }
-    return success;
-  }
-
- public:
-  explicit MapHandler(MapType* value)
-      : element(), internal_handler(&element), m_value(value) {}
-
-  bool Null() override {
-    return precheck("null") && postcheck(internal_handler.Null());
-  }
-
-  bool Bool(bool b) override {
-    return precheck("bool") && postcheck(internal_handler.Bool(b));
-  }
-
-  bool Short(short i) override {
-    return precheck("short") && postcheck(internal_handler.Short(i));
-  }
-
-  bool Ushort(unsigned short i) override {
-    return precheck("unsigned short") && postcheck(internal_handler.Ushort(i));
-  }
-
-  bool Int(int i) override {
-    return precheck("int") && postcheck(internal_handler.Int(i));
-  }
-
-  bool Uint(unsigned i) override {
-    return precheck("unsigned") && postcheck(internal_handler.Uint(i));
-  }
-
-  bool Int64(std::int64_t i) override {
-    return precheck("int64_t") && postcheck(internal_handler.Int64(i));
-  }
-
-  bool Uint64(std::uint64_t i) override {
-    return precheck("uint64_t") && postcheck(internal_handler.Uint64(i));
-  }
-
-  bool Double(double d) override {
-    return precheck("double") && postcheck(internal_handler.Double(d));
-  }
-
-  bool String(const char* str, SizeType length, bool copy) override {
-    return precheck("string") &&
-           postcheck(internal_handler.String(str, length, copy));
-  }
-
-  bool Key(const char* str, SizeType length, bool copy) override {
-    if (depth > 1) return postcheck(internal_handler.Key(str, length, copy));
-
-    current_key.assign(str, length);
-    return true;
-  }
-
-  bool StartArray() override {
-    return precheck("array") && postcheck(internal_handler.StartArray());
-  }
-
-  bool EndArray(SizeType length) override {
-    return precheck("array") && postcheck(internal_handler.EndArray(length));
-  }
-
-  bool StartObject() override {
-    ++depth;
-    if (depth > 1)
-      return postcheck(internal_handler.StartObject());
-    else
-      m_value->clear();
-    return true;
-  }
-
-  bool EndObject(SizeType length) override {
-    --depth;
-    if (depth > 0) return postcheck(internal_handler.EndObject(length));
-    this->parsed = true;
-    return true;
-  }
-
-  // bool reap_error(ErrorStack& errs) override
-  //{
-  //    if (!this->the_error)
-  //        return false;
-
-  //    errs.push(this->the_error.release());
-  //    internal_handler.reap_error(errs);
-  //    return true;
-  //}
-
-  bool write(IHandler* out) const override {
-    if (!out->StartObject()) return false;
-    for (auto&& pair : *m_value) {
-      if (!out->Key(pair.first.data(), static_cast<SizeType>(pair.first.size()),
-                    true))
-        return false;
-      Handler<ElementType> h(&pair.second);
-      if (!h.write(out)) return false;
-    }
-    return out->EndObject(static_cast<SizeType>(m_value->size()));
-  }
-
-  // void generate_schema(Value& output, MemoryPoolAllocator& alloc) const
-  // override
-  //{
-  //    Value internal_schema;
-  //    internal_handler.generate_schema(internal_schema, alloc);
-  //    output.SetObject();
-  //    output.AddMember(rapidjson::StringRef("type"),
-  //    rapidjson::StringRef("object"), alloc);
-
-  //    Value empty_obj(rapidjson::kObjectType);
-  //    output.AddMember(rapidjson::StringRef("properties"), empty_obj, alloc);
-  //    output.AddMember(rapidjson::StringRef("additionalProperties"),
-  //    internal_schema, alloc);
-  //}
-};
-
-template <class T, class Hash, class Equal>
-class Handler<std::unordered_map<std::string, T, Hash, Equal>>
-    : public MapHandler<std::unordered_map<std::string, T, Hash, Equal>> {
- public:
-  explicit Handler(std::unordered_map<std::string, T, Hash, Equal>* value)
-      : MapHandler<std::unordered_map<std::string, T, Hash, Equal>>(value) {}
-
-  std::string type_name() const override {
-    return "std::unordered_map<std::string, " +
-           this->internal_handler.type_name() + ">";
-  }
-};
-
-template <class T, class Hash, class Equal>
-class Handler<std::map<std::string, T, Hash, Equal>>
-    : public MapHandler<std::map<std::string, T, Hash, Equal>> {
- public:
-  explicit Handler(std::map<std::string, T, Hash, Equal>* value)
-      : MapHandler<std::map<std::string, T, Hash, Equal>>(value) {}
-
-  std::string type_name() const override {
-    return "std::map<std::string, " + this->internal_handler.type_name() + ">";
-  }
-};
-
-template <class T, class Hash, class Equal>
-class Handler<std::unordered_multimap<std::string, T, Hash, Equal>>
-    : public MapHandler<std::unordered_multimap<std::string, T, Hash, Equal>> {
- public:
-  explicit Handler(std::unordered_multimap<std::string, T, Hash, Equal>* value)
-      : MapHandler<std::unordered_multimap<std::string, T, Hash, Equal>>(
-            value) {}
-
-  std::string type_name() const override {
-    return "std::unordered_mulitimap<std::string, " +
-           this->internal_handler.type_name() + ">";
-  }
-};
-
-template <class T, class Hash, class Equal>
-class Handler<std::multimap<std::string, T, Hash, Equal>>
-    : public MapHandler<std::multimap<std::string, T, Hash, Equal>> {
- public:
-  explicit Handler(std::multimap<std::string, T, Hash, Equal>* value)
-      : MapHandler<std::multimap<std::string, T, Hash, Equal>>(value) {}
-
-  std::string type_name() const override {
-    return "std::multimap<std::string, " + this->internal_handler.type_name() +
-           ">";
-  }
-};
-
-#if 0
-template <std::size_t N>
-class TupleHander : public BaseHandler
-{
-protected:
-    std::array<std::unique_ptr<BaseHandler>, N> handlers;
-    std::size_t index = 0;
-    int depth = 0;
-
-    bool postcheck(bool success)
-    {
-        if (!success)
-        {
-            the_error.reset(new error::ArrayElementError(index));
-            return false;
-        }
-        if (handlers[index]->is_parsed())
-        {
-            ++index;
-        }
-        return true;
-    }
-
-protected:
-    void reset() override
-    {
-        index = 0;
-        depth = 0;
-        for (auto&& h : handlers)
-            h->prepare_for_reuse();
-    }
-
-public:
-    bool Null() override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->Null());
-    }
-
-    bool Bool(bool b) override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->Bool(b));
-    }
-
-    bool Int(int i) override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->Int(i));
-    }
-
-    bool Uint(unsigned i) override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->Uint(i));
-    }
-
-    bool Int64(std::int64_t i) override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->Int64(i));
-    }
-
-    bool Uint64(std::uint64_t i) override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->Uint64(i));
-    }
-
-    bool Double(double d) override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->Double(d));
-    }
-
-    bool String(const char* str, SizeType length, bool copy) override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->String(str, length, copy));
-    }
-
-    bool Key(const char* str, SizeType length, bool copy) override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->Key(str, length, copy));
-    }
-
-    bool StartArray() override
-    {
-        if (++depth > 1)
-        {
-            if (index >= N)
-                return true;
-            return postcheck(handlers[index]->StartArray());
-        }
-        return true;
-    }
-
-    bool EndArray(SizeType length) override
-    {
-        if (--depth > 0)
-        {
-            if (index >= N)
-                return true;
-            return postcheck(handlers[index]->EndArray(length));
-        }
-        this->parsed = true;
-        return true;
-    }
-
-    bool StartObject() override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->StartObject());
-    }
-
-    bool EndObject(SizeType length) override
-    {
-        if (index >= N)
-            return true;
-        return postcheck(handlers[index]->EndObject(length));
-    }
-
-    bool reap_error(ErrorStack& errs) override
-    {
-        if (!this->the_error)
-            return false;
-
-        errs.push(this->the_error.release());
-        for (auto&& h : handlers)
-            h->reap_error(errs);
-        return true;
-    }
-
-    bool write(IHandler* out) const override
-    {
-        if (!out->StartArray())
-            return false;
-        for (auto&& h : handlers)
-        {
-            if (!h->write(out))
-                return false;
-        }
-        return out->EndArray(N);
-    }
-
-    //void generate_schema(Value& output, MemoryPoolAllocator& alloc) const override
-    //{
-    //    output.SetObject();
-    //    output.AddMember(rapidjson::StringRef("type"), rapidjson::StringRef("array"), alloc);
-    //    Value items(rapidjson::kArrayType);
-    //    for (auto&& h : handlers)
-    //    {
-    //        Value item;
-    //        h->generate_schema(item, alloc);
-    //        items.PushBack(item, alloc);
-    //    }
-    //    output.AddMember(rapidjson::StringRef("items"), items, alloc);
-    //}
-};
-
-namespace nonpublic
-{
-    template <std::size_t index, std::size_t N, typename Tuple>
-    struct TupleIniter
-    {
-        void operator()(std::unique_ptr<BaseHandler>* handlers, Tuple& t) const
-        {
-            handlers[index].reset(
-                new Handler<typename std::tuple_element<index, Tuple>::type>(&std::get<index>(t)));
-            TupleIniter<index + 1, N, Tuple>{}(handlers, t);
-        }
-    };
-
-    template <std::size_t N, typename Tuple>
-    struct TupleIniter<N, N, Tuple>
-    {
-        void operator()(std::unique_ptr<BaseHandler>* handlers, Tuple& t) const
-        {
-            (void)handlers;
-            (void)t;
-        }
-    };
-}
-
-template <typename... Ts>
-class Handler<std::tuple<Ts...>> : public TupleHander<std::tuple_size<std::tuple<Ts...>>::value>
-{
-private:
-    static const std::size_t N = std::tuple_size<std::tuple<Ts...>>::value;
-
-public:
-    explicit Handler(std::tuple<Ts...>* t)
-    {
-        nonpublic::TupleIniter<0, N, std::tuple<Ts...>> initer;
-        initer(this->handlers.data(), *t);
-    }
-
-    std::string type_name() const override
-    {
-        std::string str = "std::tuple<";
-        for (auto&& h : this->handlers)
-        {
-            str += h->type_name();
-            str += ", ";
-        }
-        str.pop_back();
-        str.pop_back();
-        str += '>';
-        return str;
-    }
-};
-#endif
-
-class Parse {
- public:
-  bool SetValue(bool, BaseHandler& handler) const;
-  bool SetValue(short, BaseHandler& handler) const;
-  bool SetValue(unsigned short, BaseHandler& handler) const;
-  bool SetValue(int, BaseHandler& handler) const;
-  bool SetValue(unsigned int, BaseHandler& handler) const;
-  bool SetValue(int64_t, BaseHandler& handler) const;
-  bool SetValue(uint64_t, BaseHandler& handler) const;
-  bool SetValue(float f, BaseHandler& handler) const;
-  bool SetValue(double f, BaseHandler& handler) const;
-  bool SetValue(char, BaseHandler& handler) const;
-  bool SetValue(const std::string& s, BaseHandler& handler) const;
-
-  template <typename T>
-  bool SetValue(const std::vector<T>& v, BaseHandler& handler) const {
-    if (!handler.StartArray()) {
-      return false;
-    }
-
-    for (size_t i = 0; i < v.size(); i++) {
-      if (!SetValue(v[i], handler)) {
-        return false;
-      }
-    }
-
-    return handler.EndArray(v.size());
-  }
-
-  template <typename T, size_t N>
-  bool SetValue(const std::array<T, N>& v, BaseHandler& handler) const {
-    if (!handler.StartArray()) {
-      return false;
-    }
-
-    for (size_t i = 0; i < N; i++) {
-      if (!SetValue(v[i], handler)) {
-        return false;
-      }
-    }
-
-    return handler.EndArray(v.size());
-  }
-
-  template <typename T>
-  bool SetValue(const std::map<std::string, T>& m, BaseHandler& handler) const {
-    if (!handler.StartObject()) {
-      return false;
-    }
-
-    for (auto item : m) {
-      if (!handler.Key(item.first.c_str(), item.first.size(),
-                       /* copy(not used) */ true)) {
-        return false;
-      }
-
-      if (!SetValue(item.second, handler)) {
-        return false;
-      }
-    }
-
-    return handler.EndObject(m.size());
-  }
-
-  template <class T, class Hash, class Equal>
-  bool SetValue(const std::unordered_map<std::string, T, Hash, Equal>& m,
-                BaseHandler& handler) const {
-    if (!handler.StartObject()) {
-      return false;
-    }
-
-    for (auto item : m) {
-      if (!handler.Key(item.first)) {
-        return false;
-      }
-
-      if (!SetValue(item.second, handler)) {
-        return false;
-      }
-    }
-
-    return handler.EndObject(m.size());
-  }
-};
-
-}  // namespace simple_type_relection
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/attic/staticstruct-reconstruct.cc b/contrib/tinyusdz/tinyusdz_repo/src/attic/staticstruct-reconstruct.cc
deleted file mode 100644
index 5a4e987cf..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/attic/staticstruct-reconstruct.cc
+++ /dev/null
@@ -1,449 +0,0 @@
-#if 0 // TODO: Remove
-/// Need to define in header file.
-namespace staticstruct {
-
-using namespace tinyusdz::value;
-
-// -- For Reconstructor
-
-template <>
-struct Converter<half> {
-  typedef uint16_t shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            half &value) {
-    value.value = shadow;
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const half &value, shadow_type &shadow) {
-    shadow = value.value;
-  }
-};
-
-template <>
-struct Converter<quath> {
-  typedef std::array<uint16_t, 4> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            quath &value) {
-    memcpy(&value.real, &shadow[0], sizeof(uint16_t) * 4);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const quath &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value.real, sizeof(uint16_t) * 4);
-  }
-};
-
-template <>
-struct Converter<quatf> {
-  typedef std::array<float, 4> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            quatf &value) {
-    memcpy(&value.real, &shadow[0], sizeof(float) * 4);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const quatf &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value.real, sizeof(float) * 4);
-  }
-};
-
-template <>
-struct Converter<quatd> {
-  typedef std::array<double, 4> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            quatd &value) {
-    memcpy(&value.real, &shadow[0], sizeof(double) * 4);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const quatd &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value.real, sizeof(double) * 4);
-  }
-};
-
-template <>
-struct Converter<matrix2f> {
-  typedef std::array<float, 4> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            matrix2f &value) {
-    memcpy(&value.m[0][0], &shadow[0], sizeof(float) * 4);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const matrix2f &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value.m[0][0], sizeof(float) * 4);
-  }
-};
-
-template <>
-struct Converter<matrix3f> {
-  typedef std::array<float, 9> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            matrix3f &value) {
-    memcpy(&value.m[0][0], &shadow[0], sizeof(float) * 9);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const matrix3f &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value.m[0][0], sizeof(float) * 9);
-  }
-};
-
-template <>
-struct Converter<matrix4f> {
-  typedef std::array<float, 16> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            matrix4f &value) {
-    memcpy(&value.m[0][0], &shadow[0], sizeof(float) * 16);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const matrix4f &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value.m[0][0], sizeof(float) * 16);
-  }
-};
-
-template <>
-struct Converter<matrix2d> {
-  typedef std::array<double, 4> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            matrix2d &value) {
-    memcpy(&value.m[0][0], &shadow[0], sizeof(double) * 4);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const matrix2d &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value.m[0][0], sizeof(double) * 4);
-  }
-};
-
-template <>
-struct Converter<matrix3d> {
-  typedef std::array<double, 9> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            matrix3d &value) {
-    memcpy(&value.m[0][0], &shadow[0], sizeof(double) * 9);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const matrix3d &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value.m[0][0], sizeof(double) * 9);
-  }
-};
-
-template <>
-struct Converter<matrix4d> {
-  typedef std::array<double, 16> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            matrix4d &value) {
-    memcpy(&value.m[0][0], &shadow[0], sizeof(double) * 16);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const matrix4d &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value.m[0][0], sizeof(double) * 16);
-  }
-};
-
-template <>
-struct Converter<vector3h> {
-  typedef std::array<uint16_t, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            vector3h &value) {
-    memcpy(&value, &shadow[0], sizeof(uint16_t) * 3);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const vector3h &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value, sizeof(uint16_t) * 3);
-  }
-};
-
-template <>
-struct Converter<vector3f> {
-  typedef std::array<float, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            vector3f &value) {
-    value.x = shadow[0];
-    value.y = shadow[1];
-    value.z = shadow[2];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const vector3f &value, shadow_type &shadow) {
-    shadow[0] = value.x;
-    shadow[1] = value.y;
-    shadow[2] = value.z;
-  }
-};
-
-template <>
-struct Converter<vector3d> {
-  typedef std::array<double, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            vector3d &value) {
-    value.x = shadow[0];
-    value.y = shadow[1];
-    value.z = shadow[2];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const vector3d &value, shadow_type &shadow) {
-    shadow[0] = value.x;
-    shadow[1] = value.y;
-    shadow[2] = value.z;
-  }
-};
-
-template <>
-struct Converter<normal3h> {
-  typedef std::array<uint16_t, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            normal3h &value) {
-    memcpy(&value, &shadow[0], sizeof(uint16_t) * 3);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const normal3h &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value, sizeof(uint16_t) * 3);
-  }
-};
-
-template <>
-struct Converter<normal3f> {
-  typedef std::array<float, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            normal3f &value) {
-    value.x = shadow[0];
-    value.y = shadow[1];
-    value.z = shadow[2];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const normal3f &value, shadow_type &shadow) {
-    shadow[0] = value.x;
-    shadow[1] = value.y;
-    shadow[2] = value.z;
-  }
-};
-
-template <>
-struct Converter<normal3d> {
-  typedef std::array<double, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            normal3d &value) {
-    value.x = shadow[0];
-    value.y = shadow[1];
-    value.z = shadow[2];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const normal3d &value, shadow_type &shadow) {
-    shadow[0] = value.x;
-    shadow[1] = value.y;
-    shadow[2] = value.z;
-  }
-};
-
-template <>
-struct Converter<point3h> {
-  typedef std::array<uint16_t, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            point3h &value) {
-    memcpy(&value, &shadow[0], sizeof(uint16_t) * 3);
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const point3h &value, shadow_type &shadow) {
-    memcpy(&shadow[0], &value, sizeof(uint16_t) * 3);
-  }
-};
-
-template <>
-struct Converter<point3f> {
-  typedef std::array<float, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            point3f &value) {
-    value.x = shadow[0];
-    value.y = shadow[1];
-    value.z = shadow[2];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const point3f &value, shadow_type &shadow) {
-    shadow[0] = value.x;
-    shadow[1] = value.y;
-    shadow[2] = value.z;
-  }
-};
-
-template <>
-struct Converter<point3d> {
-  typedef std::array<double, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            point3d &value) {
-    value.x = shadow[0];
-    value.y = shadow[1];
-    value.z = shadow[2];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const point3d &value, shadow_type &shadow) {
-    shadow[0] = value.x;
-    shadow[1] = value.y;
-    shadow[2] = value.z;
-  }
-};
-
-template <>
-struct Converter<color3f> {
-  typedef std::array<float, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            color3f &value) {
-    value.r = shadow[0];
-    value.g = shadow[1];
-    value.b = shadow[2];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const color3f &value, shadow_type &shadow) {
-    shadow[0] = value.r;
-    shadow[1] = value.g;
-    shadow[2] = value.b;
-  }
-};
-
-template <>
-struct Converter<color3d> {
-  typedef std::array<double, 3> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            color3d &value) {
-    value.r = shadow[0];
-    value.g = shadow[1];
-    value.b = shadow[2];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const color3d &value, shadow_type &shadow) {
-    shadow[0] = value.r;
-    shadow[1] = value.g;
-    shadow[2] = value.b;
-  }
-};
-
-template <>
-struct Converter<color4f> {
-  typedef std::array<float, 4> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            color4f &value) {
-    value.r = shadow[0];
-    value.g = shadow[1];
-    value.b = shadow[2];
-    value.a = shadow[3];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const color4f &value, shadow_type &shadow) {
-    shadow[0] = value.r;
-    shadow[1] = value.g;
-    shadow[2] = value.b;
-    shadow[3] = value.a;
-  }
-};
-
-template <>
-struct Converter<color4d> {
-  typedef std::array<double, 4> shadow_type;
-
-  static std::unique_ptr<Error> from_shadow(const shadow_type &shadow,
-                                            color4d &value) {
-    value.r = shadow[0];
-    value.g = shadow[1];
-    value.b = shadow[2];
-    value.a = shadow[2];
-
-    return nullptr;  // success
-  }
-
-  static void to_shadow(const color4d &value, shadow_type &shadow) {
-    shadow[0] = value.r;
-    shadow[1] = value.g;
-    shadow[2] = value.b;
-    shadow[3] = value.a;
-  }
-};
-
-}  // namespace staticstruct
-#endif
-
-#if 0 // TODO: Remove
-//
-// Concrete struct reconstruction from AttribMap
-//
-class Reconstructor {
- public:
-  Reconstructor() = default;
-
-  template <class T>
-  Reconstructor &property(std::string name, T *pointer,
-                     uint32_t flags = staticstruct::Flags::Default) {
-    h.add_property(name, pointer, flags, TypeTrait<T>::type_id);
-
-    return *this;
-  }
-
-  bool reconstruct(AttribMap &amap);
-
-  std::string get_error() const { return err_; }
-
- private:
-  staticstruct::ObjectHandler h;
-  std::string err_;
-};
-#endif
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/audio-loader.cc b/contrib/tinyusdz/tinyusdz_repo/src/audio-loader.cc
deleted file mode 100644
index 374b82294..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/audio-loader.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "nonstd/expected.hpp"
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-//#include "external/fpng.h"
-//#include "external/stb_audio.h"
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-#include "audio-loader.hh"
-
-namespace tinyusdz {
-namespace audio {
-
-namespace {
-
-}  // namespace
-
-nonstd::expected<audio::AudioResult, std::string> LoadAudioFromMemory(
-    const uint8_t *addr, size_t sz, const std::string &uri) {
-  audio::AudioResult ret;
-  std::string err;
-
-  (void)addr;
-  (void)sz;
-  (void)uri;
-
-  return nonstd::make_unexpected("TODO: LoadAudioFromMemory.\n");
-}
-
-}  // namespace audio
-}  // namespace tinyusdz
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/audio-loader.hh b/contrib/tinyusdz/tinyusdz_repo/src/audio-loader.hh
deleted file mode 100644
index 7ee36e77a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/audio-loader.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-// Simple audio loader
-// supported file format: WAV, MP3  
-#pragma once
-
-#include <cstddef>
-#include <string>
-#include <vector>
-
-#include "tinyusdz.hh"
-
-#include "nonstd/expected.hpp"
-
-namespace tinyusdz {
-namespace audio {
-
-struct AudioResult {
-  //Image image;
-  std::string warning;
-};
-
-///
-/// @param[in] filename Input filename(or URI)
-/// @return ImageResult or error message(std::string)
-///
-nonstd::expected<AudioResult, std::string> LoadAudioFromFile(const std::string &filename);
-
-///
-/// @param[in] addr Memory address
-/// @param[in] datasize Data size(in bytes)
-/// @param[in] uri Input URI(or filename) as a hint. This is used only in error message.
-/// @return ImageResult or error message(std::string)
-///
-nonstd::expected<AudioResult, std::string> LoadAudioFromMemory(const uint8_t *addr, const size_t datasize, const std::string &uri);
-
-} // namespace audio
-} // namespace tinyusdz
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/README.md b/contrib/tinyusdz/tinyusdz_repo/src/blender/README.md
deleted file mode 100644
index abbb87836..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## NOTE
-
-Since Blender app does not include Python header files(e.g. Python.h), we provide it as a local copy(to reduce compilation procedure). 
-
-
-python3.9 -> for blender 2.93 LTS
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/bindings.cc b/contrib/tinyusdz/tinyusdz_repo/src/blender/bindings.cc
deleted file mode 100644
index a0a1e3787..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/bindings.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <pybind11/numpy.h>
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
-namespace py = pybind11;
-
-using namespace pybind11::literals;  // to bring in the `_a` literal
-
-static double test_api() {
-  // TODO: Implement
-  return 4.14;
-}
-
-PYBIND11_MODULE(tinyusd_blender, m) {
-  m.doc() = "TinyUSD Python binding for Blender";
-
-  m.def("test_api", &test_api, "Test API");
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/Python-ast.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/Python-ast.h
deleted file mode 100644
index e7afa1e65..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/Python-ast.h
+++ /dev/null
@@ -1,697 +0,0 @@
-/* File automatically generated by Parser/asdl_c.py. */
-
-#ifndef Py_PYTHON_AST_H
-#define Py_PYTHON_AST_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-#include "asdl.h"
-
-#undef Yield   /* undefine macro conflicting with <winbase.h> */
-
-typedef struct _mod *mod_ty;
-
-typedef struct _stmt *stmt_ty;
-
-typedef struct _expr *expr_ty;
-
-typedef enum _expr_context { Load=1, Store=2, Del=3 } expr_context_ty;
-
-typedef enum _boolop { And=1, Or=2 } boolop_ty;
-
-typedef enum _operator { Add=1, Sub=2, Mult=3, MatMult=4, Div=5, Mod=6, Pow=7,
-                         LShift=8, RShift=9, BitOr=10, BitXor=11, BitAnd=12,
-                         FloorDiv=13 } operator_ty;
-
-typedef enum _unaryop { Invert=1, Not=2, UAdd=3, USub=4 } unaryop_ty;
-
-typedef enum _cmpop { Eq=1, NotEq=2, Lt=3, LtE=4, Gt=5, GtE=6, Is=7, IsNot=8,
-                      In=9, NotIn=10 } cmpop_ty;
-
-typedef struct _comprehension *comprehension_ty;
-
-typedef struct _excepthandler *excepthandler_ty;
-
-typedef struct _arguments *arguments_ty;
-
-typedef struct _arg *arg_ty;
-
-typedef struct _keyword *keyword_ty;
-
-typedef struct _alias *alias_ty;
-
-typedef struct _withitem *withitem_ty;
-
-typedef struct _type_ignore *type_ignore_ty;
-
-
-enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3,
-                 FunctionType_kind=4};
-struct _mod {
-    enum _mod_kind kind;
-    union {
-        struct {
-            asdl_seq *body;
-            asdl_seq *type_ignores;
-        } Module;
-
-        struct {
-            asdl_seq *body;
-        } Interactive;
-
-        struct {
-            expr_ty body;
-        } Expression;
-
-        struct {
-            asdl_seq *argtypes;
-            expr_ty returns;
-        } FunctionType;
-
-    } v;
-};
-
-enum _stmt_kind {FunctionDef_kind=1, AsyncFunctionDef_kind=2, ClassDef_kind=3,
-                  Return_kind=4, Delete_kind=5, Assign_kind=6,
-                  AugAssign_kind=7, AnnAssign_kind=8, For_kind=9,
-                  AsyncFor_kind=10, While_kind=11, If_kind=12, With_kind=13,
-                  AsyncWith_kind=14, Raise_kind=15, Try_kind=16,
-                  Assert_kind=17, Import_kind=18, ImportFrom_kind=19,
-                  Global_kind=20, Nonlocal_kind=21, Expr_kind=22, Pass_kind=23,
-                  Break_kind=24, Continue_kind=25};
-struct _stmt {
-    enum _stmt_kind kind;
-    union {
-        struct {
-            identifier name;
-            arguments_ty args;
-            asdl_seq *body;
-            asdl_seq *decorator_list;
-            expr_ty returns;
-            string type_comment;
-        } FunctionDef;
-
-        struct {
-            identifier name;
-            arguments_ty args;
-            asdl_seq *body;
-            asdl_seq *decorator_list;
-            expr_ty returns;
-            string type_comment;
-        } AsyncFunctionDef;
-
-        struct {
-            identifier name;
-            asdl_seq *bases;
-            asdl_seq *keywords;
-            asdl_seq *body;
-            asdl_seq *decorator_list;
-        } ClassDef;
-
-        struct {
-            expr_ty value;
-        } Return;
-
-        struct {
-            asdl_seq *targets;
-        } Delete;
-
-        struct {
-            asdl_seq *targets;
-            expr_ty value;
-            string type_comment;
-        } Assign;
-
-        struct {
-            expr_ty target;
-            operator_ty op;
-            expr_ty value;
-        } AugAssign;
-
-        struct {
-            expr_ty target;
-            expr_ty annotation;
-            expr_ty value;
-            int simple;
-        } AnnAssign;
-
-        struct {
-            expr_ty target;
-            expr_ty iter;
-            asdl_seq *body;
-            asdl_seq *orelse;
-            string type_comment;
-        } For;
-
-        struct {
-            expr_ty target;
-            expr_ty iter;
-            asdl_seq *body;
-            asdl_seq *orelse;
-            string type_comment;
-        } AsyncFor;
-
-        struct {
-            expr_ty test;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } While;
-
-        struct {
-            expr_ty test;
-            asdl_seq *body;
-            asdl_seq *orelse;
-        } If;
-
-        struct {
-            asdl_seq *items;
-            asdl_seq *body;
-            string type_comment;
-        } With;
-
-        struct {
-            asdl_seq *items;
-            asdl_seq *body;
-            string type_comment;
-        } AsyncWith;
-
-        struct {
-            expr_ty exc;
-            expr_ty cause;
-        } Raise;
-
-        struct {
-            asdl_seq *body;
-            asdl_seq *handlers;
-            asdl_seq *orelse;
-            asdl_seq *finalbody;
-        } Try;
-
-        struct {
-            expr_ty test;
-            expr_ty msg;
-        } Assert;
-
-        struct {
-            asdl_seq *names;
-        } Import;
-
-        struct {
-            identifier module;
-            asdl_seq *names;
-            int level;
-        } ImportFrom;
-
-        struct {
-            asdl_seq *names;
-        } Global;
-
-        struct {
-            asdl_seq *names;
-        } Nonlocal;
-
-        struct {
-            expr_ty value;
-        } Expr;
-
-    } v;
-    int lineno;
-    int col_offset;
-    int end_lineno;
-    int end_col_offset;
-};
-
-enum _expr_kind {BoolOp_kind=1, NamedExpr_kind=2, BinOp_kind=3, UnaryOp_kind=4,
-                  Lambda_kind=5, IfExp_kind=6, Dict_kind=7, Set_kind=8,
-                  ListComp_kind=9, SetComp_kind=10, DictComp_kind=11,
-                  GeneratorExp_kind=12, Await_kind=13, Yield_kind=14,
-                  YieldFrom_kind=15, Compare_kind=16, Call_kind=17,
-                  FormattedValue_kind=18, JoinedStr_kind=19, Constant_kind=20,
-                  Attribute_kind=21, Subscript_kind=22, Starred_kind=23,
-                  Name_kind=24, List_kind=25, Tuple_kind=26, Slice_kind=27};
-struct _expr {
-    enum _expr_kind kind;
-    union {
-        struct {
-            boolop_ty op;
-            asdl_seq *values;
-        } BoolOp;
-
-        struct {
-            expr_ty target;
-            expr_ty value;
-        } NamedExpr;
-
-        struct {
-            expr_ty left;
-            operator_ty op;
-            expr_ty right;
-        } BinOp;
-
-        struct {
-            unaryop_ty op;
-            expr_ty operand;
-        } UnaryOp;
-
-        struct {
-            arguments_ty args;
-            expr_ty body;
-        } Lambda;
-
-        struct {
-            expr_ty test;
-            expr_ty body;
-            expr_ty orelse;
-        } IfExp;
-
-        struct {
-            asdl_seq *keys;
-            asdl_seq *values;
-        } Dict;
-
-        struct {
-            asdl_seq *elts;
-        } Set;
-
-        struct {
-            expr_ty elt;
-            asdl_seq *generators;
-        } ListComp;
-
-        struct {
-            expr_ty elt;
-            asdl_seq *generators;
-        } SetComp;
-
-        struct {
-            expr_ty key;
-            expr_ty value;
-            asdl_seq *generators;
-        } DictComp;
-
-        struct {
-            expr_ty elt;
-            asdl_seq *generators;
-        } GeneratorExp;
-
-        struct {
-            expr_ty value;
-        } Await;
-
-        struct {
-            expr_ty value;
-        } Yield;
-
-        struct {
-            expr_ty value;
-        } YieldFrom;
-
-        struct {
-            expr_ty left;
-            asdl_int_seq *ops;
-            asdl_seq *comparators;
-        } Compare;
-
-        struct {
-            expr_ty func;
-            asdl_seq *args;
-            asdl_seq *keywords;
-        } Call;
-
-        struct {
-            expr_ty value;
-            int conversion;
-            expr_ty format_spec;
-        } FormattedValue;
-
-        struct {
-            asdl_seq *values;
-        } JoinedStr;
-
-        struct {
-            constant value;
-            string kind;
-        } Constant;
-
-        struct {
-            expr_ty value;
-            identifier attr;
-            expr_context_ty ctx;
-        } Attribute;
-
-        struct {
-            expr_ty value;
-            expr_ty slice;
-            expr_context_ty ctx;
-        } Subscript;
-
-        struct {
-            expr_ty value;
-            expr_context_ty ctx;
-        } Starred;
-
-        struct {
-            identifier id;
-            expr_context_ty ctx;
-        } Name;
-
-        struct {
-            asdl_seq *elts;
-            expr_context_ty ctx;
-        } List;
-
-        struct {
-            asdl_seq *elts;
-            expr_context_ty ctx;
-        } Tuple;
-
-        struct {
-            expr_ty lower;
-            expr_ty upper;
-            expr_ty step;
-        } Slice;
-
-    } v;
-    int lineno;
-    int col_offset;
-    int end_lineno;
-    int end_col_offset;
-};
-
-struct _comprehension {
-    expr_ty target;
-    expr_ty iter;
-    asdl_seq *ifs;
-    int is_async;
-};
-
-enum _excepthandler_kind {ExceptHandler_kind=1};
-struct _excepthandler {
-    enum _excepthandler_kind kind;
-    union {
-        struct {
-            expr_ty type;
-            identifier name;
-            asdl_seq *body;
-        } ExceptHandler;
-
-    } v;
-    int lineno;
-    int col_offset;
-    int end_lineno;
-    int end_col_offset;
-};
-
-struct _arguments {
-    asdl_seq *posonlyargs;
-    asdl_seq *args;
-    arg_ty vararg;
-    asdl_seq *kwonlyargs;
-    asdl_seq *kw_defaults;
-    arg_ty kwarg;
-    asdl_seq *defaults;
-};
-
-struct _arg {
-    identifier arg;
-    expr_ty annotation;
-    string type_comment;
-    int lineno;
-    int col_offset;
-    int end_lineno;
-    int end_col_offset;
-};
-
-struct _keyword {
-    identifier arg;
-    expr_ty value;
-    int lineno;
-    int col_offset;
-    int end_lineno;
-    int end_col_offset;
-};
-
-struct _alias {
-    identifier name;
-    identifier asname;
-};
-
-struct _withitem {
-    expr_ty context_expr;
-    expr_ty optional_vars;
-};
-
-enum _type_ignore_kind {TypeIgnore_kind=1};
-struct _type_ignore {
-    enum _type_ignore_kind kind;
-    union {
-        struct {
-            int lineno;
-            string tag;
-        } TypeIgnore;
-
-    } v;
-};
-
-
-// Note: these macros affect function definitions, not only call sites.
-#define Module(a0, a1, a2) _Py_Module(a0, a1, a2)
-mod_ty _Py_Module(asdl_seq * body, asdl_seq * type_ignores, PyArena *arena);
-#define Interactive(a0, a1) _Py_Interactive(a0, a1)
-mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena);
-#define Expression(a0, a1) _Py_Expression(a0, a1)
-mod_ty _Py_Expression(expr_ty body, PyArena *arena);
-#define FunctionType(a0, a1, a2) _Py_FunctionType(a0, a1, a2)
-mod_ty _Py_FunctionType(asdl_seq * argtypes, expr_ty returns, PyArena *arena);
-#define FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)
-stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body,
-                        asdl_seq * decorator_list, expr_ty returns, string
-                        type_comment, int lineno, int col_offset, int
-                        end_lineno, int end_col_offset, PyArena *arena);
-#define AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) _Py_AsyncFunctionDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)
-stmt_ty _Py_AsyncFunctionDef(identifier name, arguments_ty args, asdl_seq *
-                             body, asdl_seq * decorator_list, expr_ty returns,
-                             string type_comment, int lineno, int col_offset,
-                             int end_lineno, int end_col_offset, PyArena
-                             *arena);
-#define ClassDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)
-stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * keywords,
-                     asdl_seq * body, asdl_seq * decorator_list, int lineno,
-                     int col_offset, int end_lineno, int end_col_offset,
-                     PyArena *arena);
-#define Return(a0, a1, a2, a3, a4, a5) _Py_Return(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, int end_lineno,
-                   int end_col_offset, PyArena *arena);
-#define Delete(a0, a1, a2, a3, a4, a5) _Py_Delete(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_Delete(asdl_seq * targets, int lineno, int col_offset, int
-                   end_lineno, int end_col_offset, PyArena *arena);
-#define Assign(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Assign(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, string type_comment, int
-                   lineno, int col_offset, int end_lineno, int end_col_offset,
-                   PyArena *arena);
-#define AugAssign(a0, a1, a2, a3, a4, a5, a6, a7) _Py_AugAssign(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int
-                      lineno, int col_offset, int end_lineno, int
-                      end_col_offset, PyArena *arena);
-#define AnnAssign(a0, a1, a2, a3, a4, a5, a6, a7, a8) _Py_AnnAssign(a0, a1, a2, a3, a4, a5, a6, a7, a8)
-stmt_ty _Py_AnnAssign(expr_ty target, expr_ty annotation, expr_ty value, int
-                      simple, int lineno, int col_offset, int end_lineno, int
-                      end_col_offset, PyArena *arena);
-#define For(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9) _Py_For(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)
-stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
-                orelse, string type_comment, int lineno, int col_offset, int
-                end_lineno, int end_col_offset, PyArena *arena);
-#define AsyncFor(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9) _Py_AsyncFor(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)
-stmt_ty _Py_AsyncFor(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq *
-                     orelse, string type_comment, int lineno, int col_offset,
-                     int end_lineno, int end_col_offset, PyArena *arena);
-#define While(a0, a1, a2, a3, a4, a5, a6, a7) _Py_While(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
-                  int col_offset, int end_lineno, int end_col_offset, PyArena
-                  *arena);
-#define If(a0, a1, a2, a3, a4, a5, a6, a7) _Py_If(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno,
-               int col_offset, int end_lineno, int end_col_offset, PyArena
-               *arena);
-#define With(a0, a1, a2, a3, a4, a5, a6, a7) _Py_With(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_With(asdl_seq * items, asdl_seq * body, string type_comment, int
-                 lineno, int col_offset, int end_lineno, int end_col_offset,
-                 PyArena *arena);
-#define AsyncWith(a0, a1, a2, a3, a4, a5, a6, a7) _Py_AsyncWith(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_AsyncWith(asdl_seq * items, asdl_seq * body, string type_comment,
-                      int lineno, int col_offset, int end_lineno, int
-                      end_col_offset, PyArena *arena);
-#define Raise(a0, a1, a2, a3, a4, a5, a6) _Py_Raise(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_Raise(expr_ty exc, expr_ty cause, int lineno, int col_offset, int
-                  end_lineno, int end_col_offset, PyArena *arena);
-#define Try(a0, a1, a2, a3, a4, a5, a6, a7, a8) _Py_Try(a0, a1, a2, a3, a4, a5, a6, a7, a8)
-stmt_ty _Py_Try(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse,
-                asdl_seq * finalbody, int lineno, int col_offset, int
-                end_lineno, int end_col_offset, PyArena *arena);
-#define Assert(a0, a1, a2, a3, a4, a5, a6) _Py_Assert(a0, a1, a2, a3, a4, a5, a6)
-stmt_ty _Py_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, int
-                   end_lineno, int end_col_offset, PyArena *arena);
-#define Import(a0, a1, a2, a3, a4, a5) _Py_Import(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_Import(asdl_seq * names, int lineno, int col_offset, int
-                   end_lineno, int end_col_offset, PyArena *arena);
-#define ImportFrom(a0, a1, a2, a3, a4, a5, a6, a7) _Py_ImportFrom(a0, a1, a2, a3, a4, a5, a6, a7)
-stmt_ty _Py_ImportFrom(identifier module, asdl_seq * names, int level, int
-                       lineno, int col_offset, int end_lineno, int
-                       end_col_offset, PyArena *arena);
-#define Global(a0, a1, a2, a3, a4, a5) _Py_Global(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_Global(asdl_seq * names, int lineno, int col_offset, int
-                   end_lineno, int end_col_offset, PyArena *arena);
-#define Nonlocal(a0, a1, a2, a3, a4, a5) _Py_Nonlocal(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_Nonlocal(asdl_seq * names, int lineno, int col_offset, int
-                     end_lineno, int end_col_offset, PyArena *arena);
-#define Expr(a0, a1, a2, a3, a4, a5) _Py_Expr(a0, a1, a2, a3, a4, a5)
-stmt_ty _Py_Expr(expr_ty value, int lineno, int col_offset, int end_lineno, int
-                 end_col_offset, PyArena *arena);
-#define Pass(a0, a1, a2, a3, a4) _Py_Pass(a0, a1, a2, a3, a4)
-stmt_ty _Py_Pass(int lineno, int col_offset, int end_lineno, int
-                 end_col_offset, PyArena *arena);
-#define Break(a0, a1, a2, a3, a4) _Py_Break(a0, a1, a2, a3, a4)
-stmt_ty _Py_Break(int lineno, int col_offset, int end_lineno, int
-                  end_col_offset, PyArena *arena);
-#define Continue(a0, a1, a2, a3, a4) _Py_Continue(a0, a1, a2, a3, a4)
-stmt_ty _Py_Continue(int lineno, int col_offset, int end_lineno, int
-                     end_col_offset, PyArena *arena);
-#define BoolOp(a0, a1, a2, a3, a4, a5, a6) _Py_BoolOp(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset,
-                   int end_lineno, int end_col_offset, PyArena *arena);
-#define NamedExpr(a0, a1, a2, a3, a4, a5, a6) _Py_NamedExpr(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_NamedExpr(expr_ty target, expr_ty value, int lineno, int
-                      col_offset, int end_lineno, int end_col_offset, PyArena
-                      *arena);
-#define BinOp(a0, a1, a2, a3, a4, a5, a6, a7) _Py_BinOp(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int
-                  col_offset, int end_lineno, int end_col_offset, PyArena
-                  *arena);
-#define UnaryOp(a0, a1, a2, a3, a4, a5, a6) _Py_UnaryOp(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset,
-                    int end_lineno, int end_col_offset, PyArena *arena);
-#define Lambda(a0, a1, a2, a3, a4, a5, a6) _Py_Lambda(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset,
-                   int end_lineno, int end_col_offset, PyArena *arena);
-#define IfExp(a0, a1, a2, a3, a4, a5, a6, a7) _Py_IfExp(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int
-                  col_offset, int end_lineno, int end_col_offset, PyArena
-                  *arena);
-#define Dict(a0, a1, a2, a3, a4, a5, a6) _Py_Dict(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_Dict(asdl_seq * keys, asdl_seq * values, int lineno, int
-                 col_offset, int end_lineno, int end_col_offset, PyArena
-                 *arena);
-#define Set(a0, a1, a2, a3, a4, a5) _Py_Set(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Set(asdl_seq * elts, int lineno, int col_offset, int end_lineno,
-                int end_col_offset, PyArena *arena);
-#define ListComp(a0, a1, a2, a3, a4, a5, a6) _Py_ListComp(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_ListComp(expr_ty elt, asdl_seq * generators, int lineno, int
-                     col_offset, int end_lineno, int end_col_offset, PyArena
-                     *arena);
-#define SetComp(a0, a1, a2, a3, a4, a5, a6) _Py_SetComp(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_SetComp(expr_ty elt, asdl_seq * generators, int lineno, int
-                    col_offset, int end_lineno, int end_col_offset, PyArena
-                    *arena);
-#define DictComp(a0, a1, a2, a3, a4, a5, a6, a7) _Py_DictComp(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int
-                     lineno, int col_offset, int end_lineno, int
-                     end_col_offset, PyArena *arena);
-#define GeneratorExp(a0, a1, a2, a3, a4, a5, a6) _Py_GeneratorExp(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int
-                         col_offset, int end_lineno, int end_col_offset,
-                         PyArena *arena);
-#define Await(a0, a1, a2, a3, a4, a5) _Py_Await(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Await(expr_ty value, int lineno, int col_offset, int end_lineno,
-                  int end_col_offset, PyArena *arena);
-#define Yield(a0, a1, a2, a3, a4, a5) _Py_Yield(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_Yield(expr_ty value, int lineno, int col_offset, int end_lineno,
-                  int end_col_offset, PyArena *arena);
-#define YieldFrom(a0, a1, a2, a3, a4, a5) _Py_YieldFrom(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_YieldFrom(expr_ty value, int lineno, int col_offset, int
-                      end_lineno, int end_col_offset, PyArena *arena);
-#define Compare(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Compare(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators,
-                    int lineno, int col_offset, int end_lineno, int
-                    end_col_offset, PyArena *arena);
-#define Call(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Call(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, int
-                 lineno, int col_offset, int end_lineno, int end_col_offset,
-                 PyArena *arena);
-#define FormattedValue(a0, a1, a2, a3, a4, a5, a6, a7) _Py_FormattedValue(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_FormattedValue(expr_ty value, int conversion, expr_ty format_spec,
-                           int lineno, int col_offset, int end_lineno, int
-                           end_col_offset, PyArena *arena);
-#define JoinedStr(a0, a1, a2, a3, a4, a5) _Py_JoinedStr(a0, a1, a2, a3, a4, a5)
-expr_ty _Py_JoinedStr(asdl_seq * values, int lineno, int col_offset, int
-                      end_lineno, int end_col_offset, PyArena *arena);
-#define Constant(a0, a1, a2, a3, a4, a5, a6) _Py_Constant(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_Constant(constant value, string kind, int lineno, int col_offset,
-                     int end_lineno, int end_col_offset, PyArena *arena);
-#define Attribute(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Attribute(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int
-                      lineno, int col_offset, int end_lineno, int
-                      end_col_offset, PyArena *arena);
-#define Subscript(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Subscript(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_Subscript(expr_ty value, expr_ty slice, expr_context_ty ctx, int
-                      lineno, int col_offset, int end_lineno, int
-                      end_col_offset, PyArena *arena);
-#define Starred(a0, a1, a2, a3, a4, a5, a6) _Py_Starred(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_Starred(expr_ty value, expr_context_ty ctx, int lineno, int
-                    col_offset, int end_lineno, int end_col_offset, PyArena
-                    *arena);
-#define Name(a0, a1, a2, a3, a4, a5, a6) _Py_Name(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_Name(identifier id, expr_context_ty ctx, int lineno, int
-                 col_offset, int end_lineno, int end_col_offset, PyArena
-                 *arena);
-#define List(a0, a1, a2, a3, a4, a5, a6) _Py_List(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_List(asdl_seq * elts, expr_context_ty ctx, int lineno, int
-                 col_offset, int end_lineno, int end_col_offset, PyArena
-                 *arena);
-#define Tuple(a0, a1, a2, a3, a4, a5, a6) _Py_Tuple(a0, a1, a2, a3, a4, a5, a6)
-expr_ty _Py_Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int
-                  col_offset, int end_lineno, int end_col_offset, PyArena
-                  *arena);
-#define Slice(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Slice(a0, a1, a2, a3, a4, a5, a6, a7)
-expr_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, int lineno, int
-                  col_offset, int end_lineno, int end_col_offset, PyArena
-                  *arena);
-#define comprehension(a0, a1, a2, a3, a4) _Py_comprehension(a0, a1, a2, a3, a4)
-comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq *
-                                   ifs, int is_async, PyArena *arena);
-#define ExceptHandler(a0, a1, a2, a3, a4, a5, a6, a7) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5, a6, a7)
-excepthandler_ty _Py_ExceptHandler(expr_ty type, identifier name, asdl_seq *
-                                   body, int lineno, int col_offset, int
-                                   end_lineno, int end_col_offset, PyArena
-                                   *arena);
-#define arguments(a0, a1, a2, a3, a4, a5, a6, a7) _Py_arguments(a0, a1, a2, a3, a4, a5, a6, a7)
-arguments_ty _Py_arguments(asdl_seq * posonlyargs, asdl_seq * args, arg_ty
-                           vararg, asdl_seq * kwonlyargs, asdl_seq *
-                           kw_defaults, arg_ty kwarg, asdl_seq * defaults,
-                           PyArena *arena);
-#define arg(a0, a1, a2, a3, a4, a5, a6, a7) _Py_arg(a0, a1, a2, a3, a4, a5, a6, a7)
-arg_ty _Py_arg(identifier arg, expr_ty annotation, string type_comment, int
-               lineno, int col_offset, int end_lineno, int end_col_offset,
-               PyArena *arena);
-#define keyword(a0, a1, a2, a3, a4, a5, a6) _Py_keyword(a0, a1, a2, a3, a4, a5, a6)
-keyword_ty _Py_keyword(identifier arg, expr_ty value, int lineno, int
-                       col_offset, int end_lineno, int end_col_offset, PyArena
-                       *arena);
-#define alias(a0, a1, a2) _Py_alias(a0, a1, a2)
-alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena);
-#define withitem(a0, a1, a2) _Py_withitem(a0, a1, a2)
-withitem_ty _Py_withitem(expr_ty context_expr, expr_ty optional_vars, PyArena
-                         *arena);
-#define TypeIgnore(a0, a1, a2) _Py_TypeIgnore(a0, a1, a2)
-type_ignore_ty _Py_TypeIgnore(int lineno, string tag, PyArena *arena);
-
-PyObject* PyAST_mod2obj(mod_ty t);
-mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode);
-int PyAST_Check(PyObject* obj);
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYTHON_AST_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/Python.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/Python.h
deleted file mode 100644
index dcd0a57ac..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/Python.h
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef Py_PYTHON_H
-#define Py_PYTHON_H
-/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
-
-/* Include nearly all Python header files */
-
-#include "patchlevel.h"
-#include "pyconfig.h"
-#include "pymacconfig.h"
-
-#include <limits.h>
-
-#ifndef UCHAR_MAX
-#error "Something's broken.  UCHAR_MAX should be defined in limits.h."
-#endif
-
-#if UCHAR_MAX != 255
-#error "Python's source code assumes C's unsigned char is an 8-bit type."
-#endif
-
-#if defined(__sgi) && !defined(_SGI_MP_SOURCE)
-#define _SGI_MP_SOURCE
-#endif
-
-#include <stdio.h>
-#ifndef NULL
-#   error "Python.h requires that stdio.h define NULL."
-#endif
-
-#include <string.h>
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#include <stdlib.h>
-#ifndef MS_WINDOWS
-#include <unistd.h>
-#endif
-#ifdef HAVE_CRYPT_H
-#if defined(HAVE_CRYPT_R) && !defined(_GNU_SOURCE)
-/* Required for glibc to expose the crypt_r() function prototype. */
-#  define _GNU_SOURCE
-#  define _Py_GNU_SOURCE_FOR_CRYPT
-#endif
-#include <crypt.h>
-#ifdef _Py_GNU_SOURCE_FOR_CRYPT
-/* Don't leak the _GNU_SOURCE define to other headers. */
-#  undef _GNU_SOURCE
-#  undef _Py_GNU_SOURCE_FOR_CRYPT
-#endif
-#endif
-
-/* For size_t? */
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-/* CAUTION:  Build setups should ensure that NDEBUG is defined on the
- * compiler command line when building Python in release mode; else
- * assert() calls won't be removed.
- */
-#include <assert.h>
-
-#include "pyport.h"
-#include "pymacro.h"
-
-/* A convenient way for code to know if clang's memory sanitizer is enabled. */
-#if defined(__has_feature)
-#  if __has_feature(memory_sanitizer)
-#    if !defined(_Py_MEMORY_SANITIZER)
-#      define _Py_MEMORY_SANITIZER
-#    endif
-#  endif
-#endif
-
-/* Debug-mode build with pymalloc implies PYMALLOC_DEBUG.
- *  PYMALLOC_DEBUG is in error if pymalloc is not in use.
- */
-#if defined(Py_DEBUG) && defined(WITH_PYMALLOC) && !defined(PYMALLOC_DEBUG)
-#define PYMALLOC_DEBUG
-#endif
-#if defined(PYMALLOC_DEBUG) && !defined(WITH_PYMALLOC)
-#error "PYMALLOC_DEBUG requires WITH_PYMALLOC"
-#endif
-#include "pymath.h"
-#include "pytime.h"
-#include "pymem.h"
-
-#include "object.h"
-#include "objimpl.h"
-#include "typeslots.h"
-#include "pyhash.h"
-
-#include "pydebug.h"
-
-#include "bytearrayobject.h"
-#include "bytesobject.h"
-#include "unicodeobject.h"
-#include "longobject.h"
-#include "longintrepr.h"
-#include "boolobject.h"
-#include "floatobject.h"
-#include "complexobject.h"
-#include "rangeobject.h"
-#include "memoryobject.h"
-#include "tupleobject.h"
-#include "listobject.h"
-#include "dictobject.h"
-#include "odictobject.h"
-#include "enumobject.h"
-#include "setobject.h"
-#include "methodobject.h"
-#include "moduleobject.h"
-#include "funcobject.h"
-#include "classobject.h"
-#include "fileobject.h"
-#include "pycapsule.h"
-#include "code.h"
-#include "pyframe.h"
-#include "traceback.h"
-#include "sliceobject.h"
-#include "cellobject.h"
-#include "iterobject.h"
-#include "genobject.h"
-#include "descrobject.h"
-#include "genericaliasobject.h"
-#include "warnings.h"
-#include "weakrefobject.h"
-#include "structseq.h"
-#include "namespaceobject.h"
-#include "picklebufobject.h"
-
-#include "codecs.h"
-#include "pyerrors.h"
-
-#include "cpython/initconfig.h"
-#include "pythread.h"
-#include "pystate.h"
-#include "context.h"
-
-#include "pyarena.h"
-#include "modsupport.h"
-#include "compile.h"
-#include "pythonrun.h"
-#include "pylifecycle.h"
-#include "ceval.h"
-#include "sysmodule.h"
-#include "osmodule.h"
-#include "intrcheck.h"
-#include "import.h"
-
-#include "abstract.h"
-#include "bltinmodule.h"
-
-#include "eval.h"
-
-#include "pyctype.h"
-#include "pystrtod.h"
-#include "pystrcmp.h"
-#include "fileutils.h"
-#include "pyfpe.h"
-#include "tracemalloc.h"
-
-#endif /* !Py_PYTHON_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/abstract.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/abstract.h
deleted file mode 100644
index bb51c668a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/abstract.h
+++ /dev/null
@@ -1,850 +0,0 @@
-/* Abstract Object Interface (many thanks to Jim Fulton) */
-
-#ifndef Py_ABSTRACTOBJECT_H
-#define Py_ABSTRACTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === Object Protocol ================================================== */
-
-/* Implemented elsewhere:
-
-   int PyObject_Print(PyObject *o, FILE *fp, int flags);
-
-   Print an object 'o' on file 'fp'.  Returns -1 on error. The flags argument
-   is used to enable certain printing options. The only option currently
-   supported is Py_Print_RAW.
-
-   (What should be said about Py_Print_RAW?). */
-
-
-/* Implemented elsewhere:
-
-   int PyObject_HasAttrString(PyObject *o, const char *attr_name);
-
-   Returns 1 if object 'o' has the attribute attr_name, and 0 otherwise.
-
-   This is equivalent to the Python expression: hasattr(o,attr_name).
-
-   This function always succeeds. */
-
-
-/* Implemented elsewhere:
-
-   PyObject* PyObject_GetAttrString(PyObject *o, const char *attr_name);
-
-   Retrieve an attributed named attr_name form object o.
-   Returns the attribute value on success, or NULL on failure.
-
-   This is the equivalent of the Python expression: o.attr_name. */
-
-
-/* Implemented elsewhere:
-
-   int PyObject_HasAttr(PyObject *o, PyObject *attr_name);
-
-   Returns 1 if o has the attribute attr_name, and 0 otherwise.
-
-   This is equivalent to the Python expression: hasattr(o,attr_name).
-
-   This function always succeeds. */
-
-/* Implemented elsewhere:
-
-   PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name);
-
-   Retrieve an attributed named 'attr_name' form object 'o'.
-   Returns the attribute value on success, or NULL on failure.
-
-   This is the equivalent of the Python expression: o.attr_name. */
-
-
-/* Implemented elsewhere:
-
-   int PyObject_SetAttrString(PyObject *o, const char *attr_name, PyObject *v);
-
-   Set the value of the attribute named attr_name, for object 'o',
-   to the value 'v'. Raise an exception and return -1 on failure; return 0 on
-   success.
-
-   This is the equivalent of the Python statement o.attr_name=v. */
-
-
-/* Implemented elsewhere:
-
-   int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v);
-
-   Set the value of the attribute named attr_name, for object 'o', to the value
-   'v'. an exception and return -1 on failure; return 0 on success.
-
-   This is the equivalent of the Python statement o.attr_name=v. */
-
-/* Implemented as a macro:
-
-   int PyObject_DelAttrString(PyObject *o, const char *attr_name);
-
-   Delete attribute named attr_name, for object o. Returns
-   -1 on failure.
-
-   This is the equivalent of the Python statement: del o.attr_name. */
-#define PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A), NULL)
-
-
-/* Implemented as a macro:
-
-   int PyObject_DelAttr(PyObject *o, PyObject *attr_name);
-
-   Delete attribute named attr_name, for object o. Returns -1
-   on failure.  This is the equivalent of the Python
-   statement: del o.attr_name. */
-#define  PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A), NULL)
-
-
-/* Implemented elsewhere:
-
-   PyObject *PyObject_Repr(PyObject *o);
-
-   Compute the string representation of object 'o'.  Returns the
-   string representation on success, NULL on failure.
-
-   This is the equivalent of the Python expression: repr(o).
-
-   Called by the repr() built-in function. */
-
-
-/* Implemented elsewhere:
-
-   PyObject *PyObject_Str(PyObject *o);
-
-   Compute the string representation of object, o.  Returns the
-   string representation on success, NULL on failure.
-
-   This is the equivalent of the Python expression: str(o).
-
-   Called by the str() and print() built-in functions. */
-
-
-/* Declared elsewhere
-
-   PyAPI_FUNC(int) PyCallable_Check(PyObject *o);
-
-   Determine if the object, o, is callable.  Return 1 if the object is callable
-   and 0 otherwise.
-
-   This function always succeeds. */
-
-
-#ifdef PY_SSIZE_T_CLEAN
-#  define PyObject_CallFunction _PyObject_CallFunction_SizeT
-#  define PyObject_CallMethod _PyObject_CallMethod_SizeT
-#endif
-
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
-/* Call a callable Python object without any arguments */
-PyAPI_FUNC(PyObject *) PyObject_CallNoArgs(PyObject *func);
-#endif
-
-
-/* Call a callable Python object 'callable' with arguments given by the
-   tuple 'args' and keywords arguments given by the dictionary 'kwargs'.
-
-   'args' must not be NULL, use an empty tuple if no arguments are
-   needed. If no named arguments are needed, 'kwargs' can be NULL.
-
-   This is the equivalent of the Python expression:
-   callable(*args, **kwargs). */
-PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable,
-                                     PyObject *args, PyObject *kwargs);
-
-
-/* Call a callable Python object 'callable', with arguments given by the
-   tuple 'args'.  If no arguments are needed, then 'args' can be NULL.
-
-   Returns the result of the call on success, or NULL on failure.
-
-   This is the equivalent of the Python expression:
-   callable(*args). */
-PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable,
-                                           PyObject *args);
-
-/* Call a callable Python object, callable, with a variable number of C
-   arguments. The C arguments are described using a mkvalue-style format
-   string.
-
-   The format may be NULL, indicating that no arguments are provided.
-
-   Returns the result of the call on success, or NULL on failure.
-
-   This is the equivalent of the Python expression:
-   callable(arg1, arg2, ...). */
-PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable,
-                                             const char *format, ...);
-
-/* Call the method named 'name' of object 'obj' with a variable number of
-   C arguments.  The C arguments are described by a mkvalue format string.
-
-   The format can be NULL, indicating that no arguments are provided.
-
-   Returns the result of the call on success, or NULL on failure.
-
-   This is the equivalent of the Python expression:
-   obj.name(arg1, arg2, ...). */
-PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *obj,
-                                           const char *name,
-                                           const char *format, ...);
-
-PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable,
-                                                    const char *format,
-                                                    ...);
-
-PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *obj,
-                                                  const char *name,
-                                                  const char *format,
-                                                  ...);
-
-/* Call a callable Python object 'callable' with a variable number of C
-   arguments. The C arguments are provided as PyObject* values, terminated
-   by a NULL.
-
-   Returns the result of the call on success, or NULL on failure.
-
-   This is the equivalent of the Python expression:
-   callable(arg1, arg2, ...). */
-PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
-                                                    ...);
-
-/* Call the method named 'name' of object 'obj' with a variable number of
-   C arguments.  The C arguments are provided as PyObject* values, terminated
-   by NULL.
-
-   Returns the result of the call on success, or NULL on failure.
-
-   This is the equivalent of the Python expression: obj.name(*args). */
-
-PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(
-    PyObject *obj,
-    PyObject *name,
-    ...);
-
-
-/* Implemented elsewhere:
-
-   Py_hash_t PyObject_Hash(PyObject *o);
-
-   Compute and return the hash, hash_value, of an object, o.  On
-   failure, return -1.
-
-   This is the equivalent of the Python expression: hash(o). */
-
-
-/* Implemented elsewhere:
-
-   int PyObject_IsTrue(PyObject *o);
-
-   Returns 1 if the object, o, is considered to be true, 0 if o is
-   considered to be false and -1 on failure.
-
-   This is equivalent to the Python expression: not not o. */
-
-
-/* Implemented elsewhere:
-
-   int PyObject_Not(PyObject *o);
-
-   Returns 0 if the object, o, is considered to be true, 1 if o is
-   considered to be false and -1 on failure.
-
-   This is equivalent to the Python expression: not o. */
-
-
-/* Get the type of an object.
-
-   On success, returns a type object corresponding to the object type of object
-   'o'. On failure, returns NULL.
-
-   This is equivalent to the Python expression: type(o) */
-PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o);
-
-
-/* Return the size of object 'o'.  If the object 'o' provides both sequence and
-   mapping protocols, the sequence size is returned.
-
-   On error, -1 is returned.
-
-   This is the equivalent to the Python expression: len(o) */
-PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o);
-
-
-/* For DLL compatibility */
-#undef PyObject_Length
-PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o);
-#define PyObject_Length PyObject_Size
-
-/* Return element of 'o' corresponding to the object 'key'. Return NULL
-  on failure.
-
-  This is the equivalent of the Python expression: o[key] */
-PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key);
-
-
-/* Map the object 'key' to the value 'v' into 'o'.
-
-   Raise an exception and return -1 on failure; return 0 on success.
-
-   This is the equivalent of the Python statement: o[key]=v. */
-PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v);
-
-/* Remove the mapping for the string 'key' from the object 'o'.
-   Returns -1 on failure.
-
-   This is equivalent to the Python statement: del o[key]. */
-PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, const char *key);
-
-/* Delete the mapping for the object 'key' from the object 'o'.
-   Returns -1 on failure.
-
-   This is the equivalent of the Python statement: del o[key]. */
-PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key);
-
-
-/* === Old Buffer API ============================================ */
-
-/* FIXME:  usage of these should all be replaced in Python itself
-   but for backwards compatibility we will implement them.
-   Their usage without a corresponding "unlock" mechanism
-   may create issues (but they would already be there). */
-
-/* Takes an arbitrary object which must support the (character, single segment)
-   buffer interface and returns a pointer to a read-only memory location
-   useable as character based input for subsequent processing.
-
-   Return 0 on success.  buffer and buffer_len are only set in case no error
-   occurs. Otherwise, -1 is returned and an exception set. */
-Py_DEPRECATED(3.0)
-PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj,
-                                      const char **buffer,
-                                      Py_ssize_t *buffer_len);
-
-/* Checks whether an arbitrary object supports the (character, single segment)
-   buffer interface.
-
-   Returns 1 on success, 0 on failure. */
-Py_DEPRECATED(3.0) PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj);
-
-/* Same as PyObject_AsCharBuffer() except that this API expects (readable,
-   single segment) buffer interface and returns a pointer to a read-only memory
-   location which can contain arbitrary data.
-
-   0 is returned on success.  buffer and buffer_len are only set in case no
-   error occurs.  Otherwise, -1 is returned and an exception set. */
-Py_DEPRECATED(3.0)
-PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj,
-                                      const void **buffer,
-                                      Py_ssize_t *buffer_len);
-
-/* Takes an arbitrary object which must support the (writable, single segment)
-   buffer interface and returns a pointer to a writable memory location in
-   buffer of size 'buffer_len'.
-
-   Return 0 on success.  buffer and buffer_len are only set in case no error
-   occurs. Otherwise, -1 is returned and an exception set. */
-Py_DEPRECATED(3.0)
-PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj,
-                                       void **buffer,
-                                       Py_ssize_t *buffer_len);
-
-
-/* === New Buffer API ============================================ */
-
-/* Takes an arbitrary object and returns the result of calling
-   obj.__format__(format_spec). */
-PyAPI_FUNC(PyObject *) PyObject_Format(PyObject *obj,
-                                       PyObject *format_spec);
-
-
-/* ==== Iterators ================================================ */
-
-/* Takes an object and returns an iterator for it.
-   This is typically a new iterator but if the argument is an iterator, this
-   returns itself. */
-PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *);
-
-/* Returns 1 if the object 'obj' provides iterator protocols, and 0 otherwise.
-
-   This function always succeeds. */
-PyAPI_FUNC(int) PyIter_Check(PyObject *);
-
-/* Takes an iterator object and calls its tp_iternext slot,
-   returning the next value.
-
-   If the iterator is exhausted, this returns NULL without setting an
-   exception.
-
-   NULL with an exception means an error occurred. */
-PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *);
-
-
-/* === Number Protocol ================================================== */
-
-/* Returns 1 if the object 'o' provides numeric protocols, and 0 otherwise.
-
-   This function always succeeds. */
-PyAPI_FUNC(int) PyNumber_Check(PyObject *o);
-
-/* Returns the result of adding o1 and o2, or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 + o2. */
-PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2);
-
-/* Returns the result of subtracting o2 from o1, or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 - o2. */
-PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2);
-
-/* Returns the result of multiplying o1 and o2, or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 * o2. */
-PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* This is the equivalent of the Python expression: o1 @ o2. */
-PyAPI_FUNC(PyObject *) PyNumber_MatrixMultiply(PyObject *o1, PyObject *o2);
-#endif
-
-/* Returns the result of dividing o1 by o2 giving an integral result,
-   or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 // o2. */
-PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2);
-
-/* Returns the result of dividing o1 by o2 giving a float result, or NULL on
-   failure.
-
-   This is the equivalent of the Python expression: o1 / o2. */
-PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2);
-
-/* Returns the remainder of dividing o1 by o2, or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 % o2. */
-PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2);
-
-/* See the built-in function divmod.
-
-   Returns NULL on failure.
-
-   This is the equivalent of the Python expression: divmod(o1, o2). */
-PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2);
-
-/* See the built-in function pow. Returns NULL on failure.
-
-   This is the equivalent of the Python expression: pow(o1, o2, o3),
-   where o3 is optional. */
-PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2,
-                                      PyObject *o3);
-
-/* Returns the negation of o on success, or NULL on failure.
-
- This is the equivalent of the Python expression: -o. */
-PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o);
-
-/* Returns the positive of o on success, or NULL on failure.
-
-   This is the equivalent of the Python expression: +o. */
-PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o);
-
-/* Returns the absolute value of 'o', or NULL on failure.
-
-   This is the equivalent of the Python expression: abs(o). */
-PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o);
-
-/* Returns the bitwise negation of 'o' on success, or NULL on failure.
-
-   This is the equivalent of the Python expression: ~o. */
-PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o);
-
-/* Returns the result of left shifting o1 by o2 on success, or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 << o2. */
-PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2);
-
-/* Returns the result of right shifting o1 by o2 on success, or NULL on
-   failure.
-
-   This is the equivalent of the Python expression: o1 >> o2. */
-PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2);
-
-/* Returns the result of bitwise and of o1 and o2 on success, or NULL on
-   failure.
-
-   This is the equivalent of the Python expression: o1 & o2. */
-PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2);
-
-/* Returns the bitwise exclusive or of o1 by o2 on success, or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 ^ o2. */
-PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2);
-
-/* Returns the result of bitwise or on o1 and o2 on success, or NULL on
-   failure.
-
-   This is the equivalent of the Python expression: o1 | o2. */
-PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2);
-
-/* Returns 1 if obj is an index integer (has the nb_index slot of the
-   tp_as_number structure filled in), and 0 otherwise. */
-PyAPI_FUNC(int) PyIndex_Check(PyObject *);
-
-/* Returns the object 'o' converted to a Python int, or NULL with an exception
-   raised on failure. */
-PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o);
-
-/* Returns the object 'o' converted to Py_ssize_t by going through
-   PyNumber_Index() first.
-
-   If an overflow error occurs while converting the int to Py_ssize_t, then the
-   second argument 'exc' is the error-type to return.  If it is NULL, then the
-   overflow error is cleared and the value is clipped. */
-PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc);
-
-/* Returns the object 'o' converted to an integer object on success, or NULL
-   on failure.
-
-   This is the equivalent of the Python expression: int(o). */
-PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
-
-/* Returns the object 'o' converted to a float object on success, or NULL
-  on failure.
-
-  This is the equivalent of the Python expression: float(o). */
-PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o);
-
-
-/* --- In-place variants of (some of) the above number protocol functions -- */
-
-/* Returns the result of adding o2 to o1, possibly in-place, or NULL
-   on failure.
-
-   This is the equivalent of the Python expression: o1 += o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2);
-
-/* Returns the result of subtracting o2 from o1, possibly in-place or
-   NULL on failure.
-
-   This is the equivalent of the Python expression: o1 -= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2);
-
-/* Returns the result of multiplying o1 by o2, possibly in-place, or NULL on
-   failure.
-
-   This is the equivalent of the Python expression: o1 *= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* This is the equivalent of the Python expression: o1 @= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceMatrixMultiply(PyObject *o1, PyObject *o2);
-#endif
-
-/* Returns the result of dividing o1 by o2 giving an integral result, possibly
-   in-place, or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 /= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1,
-                                                   PyObject *o2);
-
-/* Returns the result of dividing o1 by o2 giving a float result, possibly
-   in-place, or null on failure.
-
-   This is the equivalent of the Python expression: o1 /= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1,
-                                                  PyObject *o2);
-
-/* Returns the remainder of dividing o1 by o2, possibly in-place, or NULL on
-   failure.
-
-   This is the equivalent of the Python expression: o1 %= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2);
-
-/* Returns the result of raising o1 to the power of o2, possibly in-place,
-   or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 **= o2,
-   or o1 = pow(o1, o2, o3) if o3 is present. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2,
-                                             PyObject *o3);
-
-/* Returns the result of left shifting o1 by o2, possibly in-place, or NULL
-   on failure.
-
-   This is the equivalent of the Python expression: o1 <<= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2);
-
-/* Returns the result of right shifting o1 by o2, possibly in-place or NULL
-   on failure.
-
-   This is the equivalent of the Python expression: o1 >>= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2);
-
-/* Returns the result of bitwise and of o1 and o2, possibly in-place, or NULL
-   on failure.
-
-   This is the equivalent of the Python expression: o1 &= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2);
-
-/* Returns the bitwise exclusive or of o1 by o2, possibly in-place, or NULL
-   on failure.
-
-   This is the equivalent of the Python expression: o1 ^= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2);
-
-/* Returns the result of bitwise or of o1 and o2, possibly in-place,
-   or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 |= o2. */
-PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2);
-
-/* Returns the integer n converted to a string with a base, with a base
-   marker of 0b, 0o or 0x prefixed if applicable.
-
-   If n is not an int object, it is converted with PyNumber_Index first. */
-PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base);
-
-
-/* === Sequence protocol ================================================ */
-
-/* Return 1 if the object provides sequence protocol, and zero
-   otherwise.
-
-   This function always succeeds. */
-PyAPI_FUNC(int) PySequence_Check(PyObject *o);
-
-/* Return the size of sequence object o, or -1 on failure. */
-PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o);
-
-/* For DLL compatibility */
-#undef PySequence_Length
-PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o);
-#define PySequence_Length PySequence_Size
-
-
-/* Return the concatenation of o1 and o2 on success, and NULL on failure.
-
-   This is the equivalent of the Python expression: o1 + o2. */
-PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2);
-
-/* Return the result of repeating sequence object 'o' 'count' times,
-  or NULL on failure.
-
-  This is the equivalent of the Python expression: o * count. */
-PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count);
-
-/* Return the ith element of o, or NULL on failure.
-
-   This is the equivalent of the Python expression: o[i]. */
-PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i);
-
-/* Return the slice of sequence object o between i1 and i2, or NULL on failure.
-
-   This is the equivalent of the Python expression: o[i1:i2]. */
-PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
-
-/* Assign object 'v' to the ith element of the sequence 'o'. Raise an exception
-   and return -1 on failure; return 0 on success.
-
-   This is the equivalent of the Python statement o[i] = v. */
-PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v);
-
-/* Delete the 'i'-th element of the sequence 'v'. Returns -1 on failure.
-
-   This is the equivalent of the Python statement: del o[i]. */
-PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i);
-
-/* Assign the sequence object 'v' to the slice in sequence object 'o',
-   from 'i1' to 'i2'. Returns -1 on failure.
-
-   This is the equivalent of the Python statement: o[i1:i2] = v. */
-PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2,
-                                    PyObject *v);
-
-/* Delete the slice in sequence object 'o' from 'i1' to 'i2'.
-   Returns -1 on failure.
-
-   This is the equivalent of the Python statement: del o[i1:i2]. */
-PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2);
-
-/* Returns the sequence 'o' as a tuple on success, and NULL on failure.
-
-   This is equivalent to the Python expression: tuple(o). */
-PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o);
-
-/* Returns the sequence 'o' as a list on success, and NULL on failure.
-   This is equivalent to the Python expression: list(o) */
-PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o);
-
-/* Return the sequence 'o' as a list, unless it's already a tuple or list.
-
-   Use PySequence_Fast_GET_ITEM to access the members of this list, and
-   PySequence_Fast_GET_SIZE to get its length.
-
-   Returns NULL on failure.  If the object does not support iteration, raises a
-   TypeError exception with 'm' as the message text. */
-PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
-
-/* Return the size of the sequence 'o', assuming that 'o' was returned by
-   PySequence_Fast and is not NULL. */
-#define PySequence_Fast_GET_SIZE(o) \
-    (PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o))
-
-/* Return the 'i'-th element of the sequence 'o', assuming that o was returned
-   by PySequence_Fast, and that i is within bounds. */
-#define PySequence_Fast_GET_ITEM(o, i)\
-     (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
-
-/* Return a pointer to the underlying item array for
-   an object returned by PySequence_Fast */
-#define PySequence_Fast_ITEMS(sf) \
-    (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \
-                      : ((PyTupleObject *)(sf))->ob_item)
-
-/* Return the number of occurrences on value on 'o', that is, return
-   the number of keys for which o[key] == value.
-
-   On failure, return -1.  This is equivalent to the Python expression:
-   o.count(value). */
-PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value);
-
-/* Return 1 if 'ob' is in the sequence 'seq'; 0 if 'ob' is not in the sequence
-   'seq'; -1 on error.
-
-   Use __contains__ if possible, else _PySequence_IterSearch(). */
-PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob);
-
-/* For DLL-level backwards compatibility */
-#undef PySequence_In
-/* Determine if the sequence 'o' contains 'value'. If an item in 'o' is equal
-   to 'value', return 1, otherwise return 0. On error, return -1.
-
-   This is equivalent to the Python expression: value in o. */
-PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value);
-
-/* For source-level backwards compatibility */
-#define PySequence_In PySequence_Contains
-
-
-/* Return the first index for which o[i] == value.
-   On error, return -1.
-
-   This is equivalent to the Python expression: o.index(value). */
-PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value);
-
-
-/* --- In-place versions of some of the above Sequence functions --- */
-
-/* Append sequence 'o2' to sequence 'o1', in-place when possible. Return the
-   resulting object, which could be 'o1', or NULL on failure.
-
-  This is the equivalent of the Python expression: o1 += o2. */
-PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2);
-
-/* Repeat sequence 'o' by 'count', in-place when possible. Return the resulting
-   object, which could be 'o', or NULL on failure.
-
-   This is the equivalent of the Python expression: o1 *= count.  */
-PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count);
-
-
-/* === Mapping protocol ================================================= */
-
-/* Return 1 if the object provides mapping protocol, and 0 otherwise.
-
-   This function always succeeds. */
-PyAPI_FUNC(int) PyMapping_Check(PyObject *o);
-
-/* Returns the number of keys in mapping object 'o' on success, and -1 on
-  failure. This is equivalent to the Python expression: len(o). */
-PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o);
-
-/* For DLL compatibility */
-#undef PyMapping_Length
-PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o);
-#define PyMapping_Length PyMapping_Size
-
-
-/* Implemented as a macro:
-
-   int PyMapping_DelItemString(PyObject *o, const char *key);
-
-   Remove the mapping for the string 'key' from the mapping 'o'. Returns -1 on
-   failure.
-
-   This is equivalent to the Python statement: del o[key]. */
-#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K))
-
-/* Implemented as a macro:
-
-   int PyMapping_DelItem(PyObject *o, PyObject *key);
-
-   Remove the mapping for the object 'key' from the mapping object 'o'.
-   Returns -1 on failure.
-
-   This is equivalent to the Python statement: del o[key]. */
-#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K))
-
-/* On success, return 1 if the mapping object 'o' has the key 'key',
-   and 0 otherwise.
-
-   This is equivalent to the Python expression: key in o.
-
-   This function always succeeds. */
-PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, const char *key);
-
-/* Return 1 if the mapping object has the key 'key', and 0 otherwise.
-
-   This is equivalent to the Python expression: key in o.
-
-   This function always succeeds. */
-PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key);
-
-/* On success, return a list or tuple of the keys in mapping object 'o'.
-   On failure, return NULL. */
-PyAPI_FUNC(PyObject *) PyMapping_Keys(PyObject *o);
-
-/* On success, return a list or tuple of the values in mapping object 'o'.
-   On failure, return NULL. */
-PyAPI_FUNC(PyObject *) PyMapping_Values(PyObject *o);
-
-/* On success, return a list or tuple of the items in mapping object 'o',
-   where each item is a tuple containing a key-value pair. On failure, return
-   NULL. */
-PyAPI_FUNC(PyObject *) PyMapping_Items(PyObject *o);
-
-/* Return element of 'o' corresponding to the string 'key' or NULL on failure.
-
-   This is the equivalent of the Python expression: o[key]. */
-PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o,
-                                               const char *key);
-
-/* Map the string 'key' to the value 'v' in the mapping 'o'.
-   Returns -1 on failure.
-
-   This is the equivalent of the Python statement: o[key]=v. */
-PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, const char *key,
-                                        PyObject *value);
-
-/* isinstance(object, typeorclass) */
-PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass);
-
-/* issubclass(object, typeorclass) */
-PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass);
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_ABSTRACTOBJECT_H
-#  include  "cpython/abstract.h"
-#  undef Py_CPYTHON_ABSTRACTOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* Py_ABSTRACTOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/asdl.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/asdl.h
deleted file mode 100644
index e962560bc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/asdl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_ASDL_H
-#define Py_ASDL_H
-
-typedef PyObject * identifier;
-typedef PyObject * string;
-typedef PyObject * object;
-typedef PyObject * constant;
-
-/* It would be nice if the code generated by asdl_c.py was completely
-   independent of Python, but it is a goal the requires too much work
-   at this stage.  So, for example, I'll represent identifiers as
-   interned Python strings.
-*/
-
-/* XXX A sequence should be typed so that its use can be typechecked. */
-
-typedef struct {
-    Py_ssize_t size;
-    void *elements[1];
-} asdl_seq;
-
-typedef struct {
-    Py_ssize_t size;
-    int elements[1];
-} asdl_int_seq;
-
-asdl_seq *_Py_asdl_seq_new(Py_ssize_t size, PyArena *arena);
-asdl_int_seq *_Py_asdl_int_seq_new(Py_ssize_t size, PyArena *arena);
-
-#define asdl_seq_GET(S, I) (S)->elements[(I)]
-#define asdl_seq_LEN(S) ((S) == NULL ? 0 : (S)->size)
-#ifdef Py_DEBUG
-#define asdl_seq_SET(S, I, V) \
-    do { \
-        Py_ssize_t _asdl_i = (I); \
-        assert((S) != NULL); \
-        assert(0 <= _asdl_i && _asdl_i < (S)->size); \
-        (S)->elements[_asdl_i] = (V); \
-    } while (0)
-#else
-#define asdl_seq_SET(S, I, V) (S)->elements[I] = (V)
-#endif
-
-#endif /* !Py_ASDL_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/ast.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/ast.h
deleted file mode 100644
index a8c52af78..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/ast.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_AST_H
-#define Py_AST_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "Python-ast.h"   /* mod_ty */
-#include "node.h"         /* node */
-
-PyAPI_FUNC(int) PyAST_Validate(mod_ty);
-PyAPI_FUNC(mod_ty) PyAST_FromNode(
-    const node *n,
-    PyCompilerFlags *flags,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyArena *arena);
-PyAPI_FUNC(mod_ty) PyAST_FromNodeObject(
-    const node *n,
-    PyCompilerFlags *flags,
-    PyObject *filename,
-    PyArena *arena);
-
-/* _PyAST_ExprAsUnicode is defined in ast_unparse.c */
-PyAPI_FUNC(PyObject *) _PyAST_ExprAsUnicode(expr_ty);
-
-/* Return the borrowed reference to the first literal string in the
-   sequence of statements or NULL if it doesn't start from a literal string.
-   Doesn't set exception. */
-PyAPI_FUNC(PyObject *) _PyAST_GetDocString(asdl_seq *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_AST_H */
-#endif /* !Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bitset.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bitset.h
deleted file mode 100644
index 6a2ac9787..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bitset.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#ifndef Py_BITSET_H
-#define Py_BITSET_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Bitset interface */
-
-#define BYTE            char
-typedef BYTE *bitset;
-
-#define testbit(ss, ibit) (((ss)[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0)
-
-#define BITSPERBYTE     (8*sizeof(BYTE))
-#define BIT2BYTE(ibit)  ((ibit) / BITSPERBYTE)
-#define BIT2SHIFT(ibit) ((ibit) % BITSPERBYTE)
-#define BIT2MASK(ibit)  (1 << BIT2SHIFT(ibit))
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BITSET_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bltinmodule.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bltinmodule.h
deleted file mode 100644
index 868c9e644..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bltinmodule.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef Py_BLTINMODULE_H
-#define Py_BLTINMODULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyFilter_Type;
-PyAPI_DATA(PyTypeObject) PyMap_Type;
-PyAPI_DATA(PyTypeObject) PyZip_Type;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BLTINMODULE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/boolobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/boolobject.h
deleted file mode 100644
index bb8044a2b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/boolobject.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Boolean object interface */
-
-#ifndef Py_BOOLOBJECT_H
-#define Py_BOOLOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-PyAPI_DATA(PyTypeObject) PyBool_Type;
-
-#define PyBool_Check(x) Py_IS_TYPE(x, &PyBool_Type)
-
-/* Py_False and Py_True are the only two bools in existence.
-Don't forget to apply Py_INCREF() when returning either!!! */
-
-/* Don't use these directly */
-PyAPI_DATA(struct _longobject) _Py_FalseStruct, _Py_TrueStruct;
-
-/* Use these macros */
-#define Py_False ((PyObject *) &_Py_FalseStruct)
-#define Py_True ((PyObject *) &_Py_TrueStruct)
-
-/* Macros for returning Py_True or Py_False, respectively */
-#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
-#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
-
-/* Function to return a bool from a C long */
-PyAPI_FUNC(PyObject *) PyBool_FromLong(long);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BOOLOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bytearrayobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bytearrayobject.h
deleted file mode 100644
index 9e95433f0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bytearrayobject.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ByteArray object interface */
-
-#ifndef Py_BYTEARRAYOBJECT_H
-#define Py_BYTEARRAYOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdarg.h>
-
-/* Type PyByteArrayObject represents a mutable array of bytes.
- * The Python API is that of a sequence;
- * the bytes are mapped to ints in [0, 256).
- * Bytes are not characters; they may be used to encode characters.
- * The only way to go between bytes and str/unicode is via encoding
- * and decoding.
- * For the convenience of C programmers, the bytes type is considered
- * to contain a char pointer, not an unsigned char pointer.
- */
-
-/* Type object */
-PyAPI_DATA(PyTypeObject) PyByteArray_Type;
-PyAPI_DATA(PyTypeObject) PyByteArrayIter_Type;
-
-/* Type check macros */
-#define PyByteArray_Check(self) PyObject_TypeCheck(self, &PyByteArray_Type)
-#define PyByteArray_CheckExact(self) Py_IS_TYPE(self, &PyByteArray_Type)
-
-/* Direct API functions */
-PyAPI_FUNC(PyObject *) PyByteArray_FromObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyByteArray_Concat(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyByteArray_FromStringAndSize(const char *, Py_ssize_t);
-PyAPI_FUNC(Py_ssize_t) PyByteArray_Size(PyObject *);
-PyAPI_FUNC(char *) PyByteArray_AsString(PyObject *);
-PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t);
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_BYTEARRAYOBJECT_H
-#  include  "cpython/bytearrayobject.h"
-#  undef Py_CPYTHON_BYTEARRAYOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BYTEARRAYOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bytesobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bytesobject.h
deleted file mode 100644
index 5062d8d12..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/bytesobject.h
+++ /dev/null
@@ -1,82 +0,0 @@
-
-/* Bytes (String) object interface */
-
-#ifndef Py_BYTESOBJECT_H
-#define Py_BYTESOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdarg.h>
-
-/*
-Type PyBytesObject represents a character string.  An extra zero byte is
-reserved at the end to ensure it is zero-terminated, but a size is
-present so strings with null bytes in them can be represented.  This
-is an immutable object type.
-
-There are functions to create new string objects, to test
-an object for string-ness, and to get the
-string value.  The latter function returns a null pointer
-if the object is not of the proper type.
-There is a variant that takes an explicit size as well as a
-variant that assumes a zero-terminated string.  Note that none of the
-functions should be applied to nil objects.
-*/
-
-/* Caching the hash (ob_shash) saves recalculation of a string's hash value.
-   This significantly speeds up dict lookups. */
-
-PyAPI_DATA(PyTypeObject) PyBytes_Type;
-PyAPI_DATA(PyTypeObject) PyBytesIter_Type;
-
-#define PyBytes_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_BYTES_SUBCLASS)
-#define PyBytes_CheckExact(op) Py_IS_TYPE(op, &PyBytes_Type)
-
-PyAPI_FUNC(PyObject *) PyBytes_FromStringAndSize(const char *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *);
-PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyBytes_FromFormatV(const char*, va_list)
-                                Py_GCC_ATTRIBUTE((format(printf, 1, 0)));
-PyAPI_FUNC(PyObject *) PyBytes_FromFormat(const char*, ...)
-                                Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *);
-PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);
-PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int);
-PyAPI_FUNC(void) PyBytes_Concat(PyObject **, PyObject *);
-PyAPI_FUNC(void) PyBytes_ConcatAndDel(PyObject **, PyObject *);
-PyAPI_FUNC(PyObject *) PyBytes_DecodeEscape(const char *, Py_ssize_t,
-                                            const char *, Py_ssize_t,
-                                            const char *);
-
-/* Provides access to the internal data buffer and size of a string
-   object or the default encoded version of a Unicode object. Passing
-   NULL as *len parameter will force the string buffer to be
-   0-terminated (passing a string with embedded NULL characters will
-   cause an exception).  */
-PyAPI_FUNC(int) PyBytes_AsStringAndSize(
-    PyObject *obj,      /* string or Unicode object */
-    char **s,           /* pointer to buffer variable */
-    Py_ssize_t *len     /* pointer to length variable or NULL
-                           (only possible for 0-terminated
-                           strings) */
-    );
-
-/* Flags used by string formatting */
-#define F_LJUST (1<<0)
-#define F_SIGN  (1<<1)
-#define F_BLANK (1<<2)
-#define F_ALT   (1<<3)
-#define F_ZERO  (1<<4)
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_BYTESOBJECT_H
-#  include  "cpython/bytesobject.h"
-#  undef Py_CPYTHON_BYTESOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_BYTESOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cellobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cellobject.h
deleted file mode 100644
index f12aa90a4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cellobject.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Cell object interface */
-#ifndef Py_LIMITED_API
-#ifndef Py_CELLOBJECT_H
-#define Py_CELLOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *ob_ref;       /* Content of the cell or NULL when empty */
-} PyCellObject;
-
-PyAPI_DATA(PyTypeObject) PyCell_Type;
-
-#define PyCell_Check(op) Py_IS_TYPE(op, &PyCell_Type)
-
-PyAPI_FUNC(PyObject *) PyCell_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyCell_Get(PyObject *);
-PyAPI_FUNC(int) PyCell_Set(PyObject *, PyObject *);
-
-#define PyCell_GET(op) (((PyCellObject *)(op))->ob_ref)
-#define PyCell_SET(op, v) (((PyCellObject *)(op))->ob_ref = v)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TUPLEOBJECT_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/ceval.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/ceval.h
deleted file mode 100644
index 0f372e204..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/ceval.h
+++ /dev/null
@@ -1,166 +0,0 @@
-#ifndef Py_CEVAL_H
-#define Py_CEVAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Interface to random parts in ceval.c */
-
-/* PyEval_CallObjectWithKeywords(), PyEval_CallObject(), PyEval_CallFunction
- * and PyEval_CallMethod are deprecated. Since they are officially part of the
- * stable ABI (PEP 384), they must be kept for backward compatibility.
- * PyObject_Call(), PyObject_CallFunction() and PyObject_CallMethod() are
- * recommended to call a callable object.
- */
-
-Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords(
-    PyObject *callable,
-    PyObject *args,
-    PyObject *kwargs);
-
-/* Deprecated since PyEval_CallObjectWithKeywords is deprecated */
-#define PyEval_CallObject(callable, arg) \
-    PyEval_CallObjectWithKeywords(callable, arg, (PyObject *)NULL)
-
-Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallFunction(
-    PyObject *callable, const char *format, ...);
-Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallMethod(
-    PyObject *obj, const char *name, const char *format, ...);
-
-PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void);
-PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void);
-PyAPI_FUNC(PyObject *) PyEval_GetLocals(void);
-PyAPI_FUNC(PyFrameObject *) PyEval_GetFrame(void);
-
-PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg);
-PyAPI_FUNC(int) Py_MakePendingCalls(void);
-
-/* Protection against deeply nested recursive calls
-
-   In Python 3.0, this protection has two levels:
-   * normal anti-recursion protection is triggered when the recursion level
-     exceeds the current recursion limit. It raises a RecursionError, and sets
-     the "overflowed" flag in the thread state structure. This flag
-     temporarily *disables* the normal protection; this allows cleanup code
-     to potentially outgrow the recursion limit while processing the
-     RecursionError.
-   * "last chance" anti-recursion protection is triggered when the recursion
-     level exceeds "current recursion limit + 50". By construction, this
-     protection can only be triggered when the "overflowed" flag is set. It
-     means the cleanup code has itself gone into an infinite loop, or the
-     RecursionError has been mistakingly ignored. When this protection is
-     triggered, the interpreter aborts with a Fatal Error.
-
-   In addition, the "overflowed" flag is automatically reset when the
-   recursion level drops below "current recursion limit - 50". This heuristic
-   is meant to ensure that the normal anti-recursion protection doesn't get
-   disabled too long.
-
-   Please note: this scheme has its own limitations. See:
-   http://mail.python.org/pipermail/python-dev/2008-August/082106.html
-   for some observations.
-*/
-PyAPI_FUNC(void) Py_SetRecursionLimit(int);
-PyAPI_FUNC(int) Py_GetRecursionLimit(void);
-
-PyAPI_FUNC(int) Py_EnterRecursiveCall(const char *where);
-PyAPI_FUNC(void) Py_LeaveRecursiveCall(void);
-
-#define Py_ALLOW_RECURSION \
-  do { unsigned char _old = PyThreadState_GET()->recursion_critical;\
-    PyThreadState_GET()->recursion_critical = 1;
-
-#define Py_END_ALLOW_RECURSION \
-    PyThreadState_GET()->recursion_critical = _old; \
-  } while(0);
-
-PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *);
-PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *);
-
-PyAPI_FUNC(PyObject *) PyEval_EvalFrame(PyFrameObject *);
-PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(PyFrameObject *f, int exc);
-
-/* Interface for threads.
-
-   A module that plans to do a blocking system call (or something else
-   that lasts a long time and doesn't touch Python data) can allow other
-   threads to run as follows:
-
-    ...preparations here...
-    Py_BEGIN_ALLOW_THREADS
-    ...blocking system call here...
-    Py_END_ALLOW_THREADS
-    ...interpret result here...
-
-   The Py_BEGIN_ALLOW_THREADS/Py_END_ALLOW_THREADS pair expands to a
-   {}-surrounded block.
-   To leave the block in the middle (e.g., with return), you must insert
-   a line containing Py_BLOCK_THREADS before the return, e.g.
-
-    if (...premature_exit...) {
-        Py_BLOCK_THREADS
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-   An alternative is:
-
-    Py_BLOCK_THREADS
-    if (...premature_exit...) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-    Py_UNBLOCK_THREADS
-
-   For convenience, that the value of 'errno' is restored across
-   Py_END_ALLOW_THREADS and Py_BLOCK_THREADS.
-
-   WARNING: NEVER NEST CALLS TO Py_BEGIN_ALLOW_THREADS AND
-   Py_END_ALLOW_THREADS!!!
-
-   Note that not yet all candidates have been converted to use this
-   mechanism!
-*/
-
-PyAPI_FUNC(PyThreadState *) PyEval_SaveThread(void);
-PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *);
-
-Py_DEPRECATED(3.9) PyAPI_FUNC(int) PyEval_ThreadsInitialized(void);
-Py_DEPRECATED(3.9) PyAPI_FUNC(void) PyEval_InitThreads(void);
-/* PyEval_AcquireLock() and PyEval_ReleaseLock() are part of stable ABI.
- * They will be removed from this header file in the future version.
- * But they will be remained in ABI until Python 4.0.
- */
-Py_DEPRECATED(3.2) PyAPI_FUNC(void) PyEval_AcquireLock(void);
-Py_DEPRECATED(3.2) PyAPI_FUNC(void) PyEval_ReleaseLock(void);
-PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate);
-PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate);
-
-#define Py_BEGIN_ALLOW_THREADS { \
-                        PyThreadState *_save; \
-                        _save = PyEval_SaveThread();
-#define Py_BLOCK_THREADS        PyEval_RestoreThread(_save);
-#define Py_UNBLOCK_THREADS      _save = PyEval_SaveThread();
-#define Py_END_ALLOW_THREADS    PyEval_RestoreThread(_save); \
-                 }
-
-/* Masks and values used by FORMAT_VALUE opcode. */
-#define FVC_MASK      0x3
-#define FVC_NONE      0x0
-#define FVC_STR       0x1
-#define FVC_REPR      0x2
-#define FVC_ASCII     0x3
-#define FVS_MASK      0x4
-#define FVS_HAVE_SPEC 0x4
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_CEVAL_H
-#  include  "cpython/ceval.h"
-#  undef Py_CPYTHON_CEVAL_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CEVAL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/classobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/classobject.h
deleted file mode 100644
index 1952f673b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/classobject.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Former class object interface -- now only bound methods are here  */
-
-/* Revealing some structures (not for general use) */
-
-#ifndef Py_LIMITED_API
-#ifndef Py_CLASSOBJECT_H
-#define Py_CLASSOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *im_func;   /* The callable object implementing the method */
-    PyObject *im_self;   /* The instance it is bound to */
-    PyObject *im_weakreflist; /* List of weak references */
-    vectorcallfunc vectorcall;
-} PyMethodObject;
-
-PyAPI_DATA(PyTypeObject) PyMethod_Type;
-
-#define PyMethod_Check(op) Py_IS_TYPE(op, &PyMethod_Type)
-
-PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *);
-
-PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *);
-PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *);
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyMethod_GET_FUNCTION(meth) \
-        (((PyMethodObject *)meth) -> im_func)
-#define PyMethod_GET_SELF(meth) \
-        (((PyMethodObject *)meth) -> im_self)
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *func;
-} PyInstanceMethodObject;
-
-PyAPI_DATA(PyTypeObject) PyInstanceMethod_Type;
-
-#define PyInstanceMethod_Check(op) Py_IS_TYPE(op, &PyInstanceMethod_Type)
-
-PyAPI_FUNC(PyObject *) PyInstanceMethod_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyInstanceMethod_Function(PyObject *);
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyInstanceMethod_GET_FUNCTION(meth) \
-        (((PyInstanceMethodObject *)meth) -> func)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CLASSOBJECT_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/code.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/code.h
deleted file mode 100644
index b9e23eb81..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/code.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Definitions for bytecode */
-
-#ifndef Py_CODE_H
-#define Py_CODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct PyCodeObject PyCodeObject;
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_CODE_H
-#  include  "cpython/code.h"
-#  undef Py_CPYTHON_CODE_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CODE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/codecs.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/codecs.h
deleted file mode 100644
index 3ad0f2b5a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/codecs.h
+++ /dev/null
@@ -1,240 +0,0 @@
-#ifndef Py_CODECREGISTRY_H
-#define Py_CODECREGISTRY_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------------------------------------------------------------
-
-   Python Codec Registry and support functions
-
-
-Written by Marc-Andre Lemburg (mal@lemburg.com).
-
-Copyright (c) Corporation for National Research Initiatives.
-
-   ------------------------------------------------------------------------ */
-
-/* Register a new codec search function.
-
-   As side effect, this tries to load the encodings package, if not
-   yet done, to make sure that it is always first in the list of
-   search functions.
-
-   The search_function's refcount is incremented by this function. */
-
-PyAPI_FUNC(int) PyCodec_Register(
-       PyObject *search_function
-       );
-
-/* Codec registry lookup API.
-
-   Looks up the given encoding and returns a CodecInfo object with
-   function attributes which implement the different aspects of
-   processing the encoding.
-
-   The encoding string is looked up converted to all lower-case
-   characters. This makes encodings looked up through this mechanism
-   effectively case-insensitive.
-
-   If no codec is found, a KeyError is set and NULL returned.
-
-   As side effect, this tries to load the encodings package, if not
-   yet done. This is part of the lazy load strategy for the encodings
-   package.
-
- */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyCodec_Lookup(
-       const char *encoding
-       );
-
-PyAPI_FUNC(int) _PyCodec_Forget(
-       const char *encoding
-       );
-#endif
-
-/* Codec registry encoding check API.
-
-   Returns 1/0 depending on whether there is a registered codec for
-   the given encoding.
-
-*/
-
-PyAPI_FUNC(int) PyCodec_KnownEncoding(
-       const char *encoding
-       );
-
-/* Generic codec based encoding API.
-
-   object is passed through the encoder function found for the given
-   encoding using the error handling method defined by errors. errors
-   may be NULL to use the default method defined for the codec.
-
-   Raises a LookupError in case no encoder can be found.
-
- */
-
-PyAPI_FUNC(PyObject *) PyCodec_Encode(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
-/* Generic codec based decoding API.
-
-   object is passed through the decoder function found for the given
-   encoding using the error handling method defined by errors. errors
-   may be NULL to use the default method defined for the codec.
-
-   Raises a LookupError in case no encoder can be found.
-
- */
-
-PyAPI_FUNC(PyObject *) PyCodec_Decode(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
-#ifndef Py_LIMITED_API
-/* Text codec specific encoding and decoding API.
-
-   Checks the encoding against a list of codecs which do not
-   implement a str<->bytes encoding before attempting the
-   operation.
-
-   Please note that these APIs are internal and should not
-   be used in Python C extensions.
-
-   XXX (ncoghlan): should we make these, or something like them, public
-   in Python 3.5+?
-
- */
-PyAPI_FUNC(PyObject *) _PyCodec_LookupTextEncoding(
-       const char *encoding,
-       const char *alternate_command
-       );
-
-PyAPI_FUNC(PyObject *) _PyCodec_EncodeText(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
-PyAPI_FUNC(PyObject *) _PyCodec_DecodeText(
-       PyObject *object,
-       const char *encoding,
-       const char *errors
-       );
-
-/* These two aren't actually text encoding specific, but _io.TextIOWrapper
- * is the only current API consumer.
- */
-PyAPI_FUNC(PyObject *) _PyCodecInfo_GetIncrementalDecoder(
-       PyObject *codec_info,
-       const char *errors
-       );
-
-PyAPI_FUNC(PyObject *) _PyCodecInfo_GetIncrementalEncoder(
-       PyObject *codec_info,
-       const char *errors
-       );
-#endif
-
-
-
-/* --- Codec Lookup APIs --------------------------------------------------
-
-   All APIs return a codec object with incremented refcount and are
-   based on _PyCodec_Lookup().  The same comments w/r to the encoding
-   name also apply to these APIs.
-
-*/
-
-/* Get an encoder function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_Encoder(
-       const char *encoding
-       );
-
-/* Get a decoder function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_Decoder(
-       const char *encoding
-       );
-
-/* Get an IncrementalEncoder object for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_IncrementalEncoder(
-       const char *encoding,
-       const char *errors
-       );
-
-/* Get an IncrementalDecoder object function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_IncrementalDecoder(
-       const char *encoding,
-       const char *errors
-       );
-
-/* Get a StreamReader factory function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_StreamReader(
-       const char *encoding,
-       PyObject *stream,
-       const char *errors
-       );
-
-/* Get a StreamWriter factory function for the given encoding. */
-
-PyAPI_FUNC(PyObject *) PyCodec_StreamWriter(
-       const char *encoding,
-       PyObject *stream,
-       const char *errors
-       );
-
-/* Unicode encoding error handling callback registry API */
-
-/* Register the error handling callback function error under the given
-   name. This function will be called by the codec when it encounters
-   unencodable characters/undecodable bytes and doesn't know the
-   callback name, when name is specified as the error parameter
-   in the call to the encode/decode function.
-   Return 0 on success, -1 on error */
-PyAPI_FUNC(int) PyCodec_RegisterError(const char *name, PyObject *error);
-
-/* Lookup the error handling callback function registered under the given
-   name. As a special case NULL can be passed, in which case
-   the error handling callback for "strict" will be returned. */
-PyAPI_FUNC(PyObject *) PyCodec_LookupError(const char *name);
-
-/* raise exc as an exception */
-PyAPI_FUNC(PyObject *) PyCodec_StrictErrors(PyObject *exc);
-
-/* ignore the unicode error, skipping the faulty input */
-PyAPI_FUNC(PyObject *) PyCodec_IgnoreErrors(PyObject *exc);
-
-/* replace the unicode encode error with ? or U+FFFD */
-PyAPI_FUNC(PyObject *) PyCodec_ReplaceErrors(PyObject *exc);
-
-/* replace the unicode encode error with XML character references */
-PyAPI_FUNC(PyObject *) PyCodec_XMLCharRefReplaceErrors(PyObject *exc);
-
-/* replace the unicode encode error with backslash escapes (\x, \u and \U) */
-PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* replace the unicode encode error with backslash escapes (\N, \x, \u and \U) */
-PyAPI_FUNC(PyObject *) PyCodec_NameReplaceErrors(PyObject *exc);
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(const char *) Py_hexdigits;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CODECREGISTRY_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/compile.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/compile.h
deleted file mode 100644
index 98adee3d1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/compile.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifndef Py_COMPILE_H
-#define Py_COMPILE_H
-
-#ifndef Py_LIMITED_API
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Public interface */
-struct _node; /* Declare the existence of this type */
-#ifndef Py_BUILD_CORE
-Py_DEPRECATED(3.9)
-#endif
-PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *);
-/* XXX (ncoghlan): Unprefixed type name in a public API! */
-
-#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
-                   CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \
-                   CO_FUTURE_UNICODE_LITERALS | CO_FUTURE_BARRY_AS_BDFL | \
-                   CO_FUTURE_GENERATOR_STOP | CO_FUTURE_ANNOTATIONS)
-#define PyCF_MASK_OBSOLETE (CO_NESTED)
-
-/* bpo-39562: CO_FUTURE_ and PyCF_ constants must be kept unique.
-   PyCF_ constants can use bits from 0x0100 to 0x10000.
-   CO_FUTURE_ constants use bits starting at 0x20000. */
-#define PyCF_SOURCE_IS_UTF8  0x0100
-#define PyCF_DONT_IMPLY_DEDENT 0x0200
-#define PyCF_ONLY_AST 0x0400
-#define PyCF_IGNORE_COOKIE 0x0800
-#define PyCF_TYPE_COMMENTS 0x1000
-#define PyCF_ALLOW_TOP_LEVEL_AWAIT 0x2000
-#define PyCF_COMPILE_MASK (PyCF_ONLY_AST | PyCF_ALLOW_TOP_LEVEL_AWAIT | \
-                           PyCF_TYPE_COMMENTS | PyCF_DONT_IMPLY_DEDENT)
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    int cf_flags;  /* bitmask of CO_xxx flags relevant to future */
-    int cf_feature_version;  /* minor Python version (PyCF_ONLY_AST) */
-} PyCompilerFlags;
-
-#define _PyCompilerFlags_INIT \
-    (PyCompilerFlags){.cf_flags = 0, .cf_feature_version = PY_MINOR_VERSION}
-#endif
-
-/* Future feature support */
-
-typedef struct {
-    int ff_features;      /* flags set by future statements */
-    int ff_lineno;        /* line number of last future statement */
-} PyFutureFeatures;
-
-#define FUTURE_NESTED_SCOPES "nested_scopes"
-#define FUTURE_GENERATORS "generators"
-#define FUTURE_DIVISION "division"
-#define FUTURE_ABSOLUTE_IMPORT "absolute_import"
-#define FUTURE_WITH_STATEMENT "with_statement"
-#define FUTURE_PRINT_FUNCTION "print_function"
-#define FUTURE_UNICODE_LITERALS "unicode_literals"
-#define FUTURE_BARRY_AS_BDFL "barry_as_FLUFL"
-#define FUTURE_GENERATOR_STOP "generator_stop"
-#define FUTURE_ANNOTATIONS "annotations"
-
-struct _mod; /* Declare the existence of this type */
-#define PyAST_Compile(mod, s, f, ar) PyAST_CompileEx(mod, s, f, -1, ar)
-PyAPI_FUNC(PyCodeObject *) PyAST_CompileEx(
-    struct _mod *mod,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyCompilerFlags *flags,
-    int optimize,
-    PyArena *arena);
-PyAPI_FUNC(PyCodeObject *) PyAST_CompileObject(
-    struct _mod *mod,
-    PyObject *filename,
-    PyCompilerFlags *flags,
-    int optimize,
-    PyArena *arena);
-PyAPI_FUNC(PyFutureFeatures *) PyFuture_FromAST(
-    struct _mod * mod,
-    const char *filename        /* decoded from the filesystem encoding */
-    );
-PyAPI_FUNC(PyFutureFeatures *) PyFuture_FromASTObject(
-    struct _mod * mod,
-    PyObject *filename
-    );
-
-/* _Py_Mangle is defined in compile.c */
-PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
-
-#define PY_INVALID_STACK_EFFECT INT_MAX
-PyAPI_FUNC(int) PyCompile_OpcodeStackEffect(int opcode, int oparg);
-PyAPI_FUNC(int) PyCompile_OpcodeStackEffectWithJump(int opcode, int oparg, int jump);
-
-typedef struct {
-    int optimize;
-    int ff_features;
-} _PyASTOptimizeState;
-
-PyAPI_FUNC(int) _PyAST_Optimize(struct _mod *, PyArena *arena, _PyASTOptimizeState *state);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_LIMITED_API */
-
-/* These definitions must match corresponding definitions in graminit.h. */
-#define Py_single_input 256
-#define Py_file_input 257
-#define Py_eval_input 258
-#define Py_func_type_input 345
-
-/* This doesn't need to match anything */
-#define Py_fstring_input 800
-
-#endif /* !Py_COMPILE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/complexobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/complexobject.h
deleted file mode 100644
index 9221f9c51..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/complexobject.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Complex number structure */
-
-#ifndef Py_COMPLEXOBJECT_H
-#define Py_COMPLEXOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    double real;
-    double imag;
-} Py_complex;
-
-/* Operations on complex numbers from complexmodule.c */
-
-PyAPI_FUNC(Py_complex) _Py_c_sum(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_diff(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_neg(Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_prod(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_quot(Py_complex, Py_complex);
-PyAPI_FUNC(Py_complex) _Py_c_pow(Py_complex, Py_complex);
-PyAPI_FUNC(double) _Py_c_abs(Py_complex);
-#endif
-
-/* Complex object interface */
-
-/*
-PyComplexObject represents a complex number with double-precision
-real and imaginary parts.
-*/
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_HEAD
-    Py_complex cval;
-} PyComplexObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PyComplex_Type;
-
-#define PyComplex_Check(op) PyObject_TypeCheck(op, &PyComplex_Type)
-#define PyComplex_CheckExact(op) Py_IS_TYPE(op, &PyComplex_Type)
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyComplex_FromCComplex(Py_complex);
-#endif
-PyAPI_FUNC(PyObject *) PyComplex_FromDoubles(double real, double imag);
-
-PyAPI_FUNC(double) PyComplex_RealAsDouble(PyObject *op);
-PyAPI_FUNC(double) PyComplex_ImagAsDouble(PyObject *op);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op);
-#endif
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyComplex_FormatAdvancedWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    PyObject *format_spec,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_COMPLEXOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/context.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/context.h
deleted file mode 100644
index 4e5007089..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/context.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef Py_CONTEXT_H
-#define Py_CONTEXT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-
-
-PyAPI_DATA(PyTypeObject) PyContext_Type;
-typedef struct _pycontextobject PyContext;
-
-PyAPI_DATA(PyTypeObject) PyContextVar_Type;
-typedef struct _pycontextvarobject PyContextVar;
-
-PyAPI_DATA(PyTypeObject) PyContextToken_Type;
-typedef struct _pycontexttokenobject PyContextToken;
-
-
-#define PyContext_CheckExact(o) Py_IS_TYPE(o, &PyContext_Type)
-#define PyContextVar_CheckExact(o) Py_IS_TYPE(o, &PyContextVar_Type)
-#define PyContextToken_CheckExact(o) Py_IS_TYPE(o, &PyContextToken_Type)
-
-
-PyAPI_FUNC(PyObject *) PyContext_New(void);
-PyAPI_FUNC(PyObject *) PyContext_Copy(PyObject *);
-PyAPI_FUNC(PyObject *) PyContext_CopyCurrent(void);
-
-PyAPI_FUNC(int) PyContext_Enter(PyObject *);
-PyAPI_FUNC(int) PyContext_Exit(PyObject *);
-
-
-/* Create a new context variable.
-
-   default_value can be NULL.
-*/
-PyAPI_FUNC(PyObject *) PyContextVar_New(
-    const char *name, PyObject *default_value);
-
-
-/* Get a value for the variable.
-
-   Returns -1 if an error occurred during lookup.
-
-   Returns 0 if value either was or was not found.
-
-   If value was found, *value will point to it.
-   If not, it will point to:
-
-   - default_value, if not NULL;
-   - the default value of "var", if not NULL;
-   - NULL.
-
-   '*value' will be a new ref, if not NULL.
-*/
-PyAPI_FUNC(int) PyContextVar_Get(
-    PyObject *var, PyObject *default_value, PyObject **value);
-
-
-/* Set a new value for the variable.
-   Returns NULL if an error occurs.
-*/
-PyAPI_FUNC(PyObject *) PyContextVar_Set(PyObject *var, PyObject *value);
-
-
-/* Reset a variable to its previous value.
-   Returns 0 on success, -1 on error.
-*/
-PyAPI_FUNC(int) PyContextVar_Reset(PyObject *var, PyObject *token);
-
-
-/* This method is exposed only for CPython tests. Don not use it. */
-PyAPI_FUNC(PyObject *) _PyContext_NewHamtForTests(void);
-
-
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CONTEXT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/abstract.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/abstract.h
deleted file mode 100644
index 0f1304d26..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/abstract.h
+++ /dev/null
@@ -1,384 +0,0 @@
-#ifndef Py_CPYTHON_ABSTRACTOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === Object Protocol ================================================== */
-
-#ifdef PY_SSIZE_T_CLEAN
-#  define _PyObject_CallMethodId _PyObject_CallMethodId_SizeT
-#endif
-
-/* Convert keyword arguments from the FASTCALL (stack: C array, kwnames: tuple)
-   format to a Python dictionary ("kwargs" dict).
-
-   The type of kwnames keys is not checked. The final function getting
-   arguments is responsible to check if all keys are strings, for example using
-   PyArg_ParseTupleAndKeywords() or PyArg_ValidateKeywordArguments().
-
-   Duplicate keys are merged using the last value. If duplicate keys must raise
-   an exception, the caller is responsible to implement an explicit keys on
-   kwnames. */
-PyAPI_FUNC(PyObject *) _PyStack_AsDict(
-    PyObject *const *values,
-    PyObject *kwnames);
-
-/* Suggested size (number of positional arguments) for arrays of PyObject*
-   allocated on a C stack to avoid allocating memory on the heap memory. Such
-   array is used to pass positional arguments to call functions of the
-   PyObject_Vectorcall() family.
-
-   The size is chosen to not abuse the C stack and so limit the risk of stack
-   overflow. The size is also chosen to allow using the small stack for most
-   function calls of the Python standard library. On 64-bit CPU, it allocates
-   40 bytes on the stack. */
-#define _PY_FASTCALL_SMALL_STACK 5
-
-PyAPI_FUNC(PyObject *) _Py_CheckFunctionResult(
-    PyThreadState *tstate,
-    PyObject *callable,
-    PyObject *result,
-    const char *where);
-
-/* === Vectorcall protocol (PEP 590) ============================= */
-
-/* Call callable using tp_call. Arguments are like PyObject_Vectorcall()
-   or PyObject_FastCallDict() (both forms are supported),
-   except that nargs is plainly the number of arguments without flags. */
-PyAPI_FUNC(PyObject *) _PyObject_MakeTpCall(
-    PyThreadState *tstate,
-    PyObject *callable,
-    PyObject *const *args, Py_ssize_t nargs,
-    PyObject *keywords);
-
-#define PY_VECTORCALL_ARGUMENTS_OFFSET ((size_t)1 << (8 * sizeof(size_t) - 1))
-
-static inline Py_ssize_t
-PyVectorcall_NARGS(size_t n)
-{
-    return n & ~PY_VECTORCALL_ARGUMENTS_OFFSET;
-}
-
-static inline vectorcallfunc
-PyVectorcall_Function(PyObject *callable)
-{
-    PyTypeObject *tp;
-    Py_ssize_t offset;
-    vectorcallfunc ptr;
-
-    assert(callable != NULL);
-    tp = Py_TYPE(callable);
-    if (!PyType_HasFeature(tp, Py_TPFLAGS_HAVE_VECTORCALL)) {
-        return NULL;
-    }
-    assert(PyCallable_Check(callable));
-    offset = tp->tp_vectorcall_offset;
-    assert(offset > 0);
-    memcpy(&ptr, (char *) callable + offset, sizeof(ptr));
-    return ptr;
-}
-
-/* Call the callable object 'callable' with the "vectorcall" calling
-   convention.
-
-   args is a C array for positional arguments.
-
-   nargsf is the number of positional arguments plus optionally the flag
-   PY_VECTORCALL_ARGUMENTS_OFFSET which means that the caller is allowed to
-   modify args[-1].
-
-   kwnames is a tuple of keyword names. The values of the keyword arguments
-   are stored in "args" after the positional arguments (note that the number
-   of keyword arguments does not change nargsf). kwnames can also be NULL if
-   there are no keyword arguments.
-
-   keywords must only contain strings and all keys must be unique.
-
-   Return the result on success. Raise an exception and return NULL on
-   error. */
-static inline PyObject *
-_PyObject_VectorcallTstate(PyThreadState *tstate, PyObject *callable,
-                           PyObject *const *args, size_t nargsf,
-                           PyObject *kwnames)
-{
-    vectorcallfunc func;
-    PyObject *res;
-
-    assert(kwnames == NULL || PyTuple_Check(kwnames));
-    assert(args != NULL || PyVectorcall_NARGS(nargsf) == 0);
-
-    func = PyVectorcall_Function(callable);
-    if (func == NULL) {
-        Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
-        return _PyObject_MakeTpCall(tstate, callable, args, nargs, kwnames);
-    }
-    res = func(callable, args, nargsf, kwnames);
-    return _Py_CheckFunctionResult(tstate, callable, res, NULL);
-}
-
-static inline PyObject *
-PyObject_Vectorcall(PyObject *callable, PyObject *const *args,
-                     size_t nargsf, PyObject *kwnames)
-{
-    PyThreadState *tstate = PyThreadState_GET();
-    return _PyObject_VectorcallTstate(tstate, callable,
-                                      args, nargsf, kwnames);
-}
-
-// Backwards compatibility aliases for API that was provisional in Python 3.8
-#define _PyObject_Vectorcall PyObject_Vectorcall
-#define _PyObject_VectorcallMethod PyObject_VectorcallMethod
-#define _PyObject_FastCallDict PyObject_VectorcallDict
-#define _PyVectorcall_Function PyVectorcall_Function
-#define _PyObject_CallOneArg PyObject_CallOneArg
-#define _PyObject_CallMethodNoArgs PyObject_CallMethodNoArgs
-#define _PyObject_CallMethodOneArg PyObject_CallMethodOneArg
-
-/* Same as PyObject_Vectorcall except that keyword arguments are passed as
-   dict, which may be NULL if there are no keyword arguments. */
-PyAPI_FUNC(PyObject *) PyObject_VectorcallDict(
-    PyObject *callable,
-    PyObject *const *args,
-    size_t nargsf,
-    PyObject *kwargs);
-
-/* Call "callable" (which must support vectorcall) with positional arguments
-   "tuple" and keyword arguments "dict". "dict" may also be NULL */
-PyAPI_FUNC(PyObject *) PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *dict);
-
-static inline PyObject *
-_PyObject_FastCallTstate(PyThreadState *tstate, PyObject *func, PyObject *const *args, Py_ssize_t nargs)
-{
-    return _PyObject_VectorcallTstate(tstate, func, args, (size_t)nargs, NULL);
-}
-
-/* Same as PyObject_Vectorcall except without keyword arguments */
-static inline PyObject *
-_PyObject_FastCall(PyObject *func, PyObject *const *args, Py_ssize_t nargs)
-{
-    PyThreadState *tstate = PyThreadState_GET();
-    return _PyObject_FastCallTstate(tstate, func, args, nargs);
-}
-
-/* Call a callable without any arguments
-   Private static inline function variant of public function
-   PyObject_CallNoArgs(). */
-static inline PyObject *
-_PyObject_CallNoArg(PyObject *func) {
-    PyThreadState *tstate = PyThreadState_GET();
-    return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL);
-}
-
-static inline PyObject *
-PyObject_CallOneArg(PyObject *func, PyObject *arg)
-{
-    PyObject *_args[2];
-    PyObject **args;
-    PyThreadState *tstate;
-    size_t nargsf;
-
-    assert(arg != NULL);
-    args = _args + 1;  // For PY_VECTORCALL_ARGUMENTS_OFFSET
-    args[0] = arg;
-    tstate = PyThreadState_GET();
-    nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET;
-    return _PyObject_VectorcallTstate(tstate, func, args, nargsf, NULL);
-}
-
-PyAPI_FUNC(PyObject *) PyObject_VectorcallMethod(
-    PyObject *name, PyObject *const *args,
-    size_t nargsf, PyObject *kwnames);
-
-static inline PyObject *
-PyObject_CallMethodNoArgs(PyObject *self, PyObject *name)
-{
-    return PyObject_VectorcallMethod(name, &self,
-           1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
-}
-
-static inline PyObject *
-PyObject_CallMethodOneArg(PyObject *self, PyObject *name, PyObject *arg)
-{
-    PyObject *args[2] = {self, arg};
-
-    assert(arg != NULL);
-    return PyObject_VectorcallMethod(name, args,
-           2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
-}
-
-/* Like PyObject_CallMethod(), but expect a _Py_Identifier*
-   as the method name. */
-PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *obj,
-                                              _Py_Identifier *name,
-                                              const char *format, ...);
-
-PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *obj,
-                                                    _Py_Identifier *name,
-                                                    const char *format,
-                                                    ...);
-
-PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(
-    PyObject *obj,
-    struct _Py_Identifier *name,
-    ...);
-
-static inline PyObject *
-_PyObject_VectorcallMethodId(
-    _Py_Identifier *name, PyObject *const *args,
-    size_t nargsf, PyObject *kwnames)
-{
-    PyObject *oname = _PyUnicode_FromId(name); /* borrowed */
-    if (!oname) {
-        return NULL;
-    }
-    return PyObject_VectorcallMethod(oname, args, nargsf, kwnames);
-}
-
-static inline PyObject *
-_PyObject_CallMethodIdNoArgs(PyObject *self, _Py_Identifier *name)
-{
-    return _PyObject_VectorcallMethodId(name, &self,
-           1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
-}
-
-static inline PyObject *
-_PyObject_CallMethodIdOneArg(PyObject *self, _Py_Identifier *name, PyObject *arg)
-{
-    PyObject *args[2] = {self, arg};
-
-    assert(arg != NULL);
-    return _PyObject_VectorcallMethodId(name, args,
-           2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
-}
-
-PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o);
-
-/* Guess the size of object 'o' using len(o) or o.__length_hint__().
-   If neither of those return a non-negative value, then return the default
-   value.  If one of the calls fails, this function returns -1. */
-PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t);
-
-/* === New Buffer API ============================================ */
-
-/* Return 1 if the getbuffer function is available, otherwise return 0. */
-PyAPI_FUNC(int) PyObject_CheckBuffer(PyObject *obj);
-
-/* This is a C-API version of the getbuffer function call.  It checks
-   to make sure object has the required function pointer and issues the
-   call.
-
-   Returns -1 and raises an error on failure and returns 0 on success. */
-PyAPI_FUNC(int) PyObject_GetBuffer(PyObject *obj, Py_buffer *view,
-                                   int flags);
-
-/* Get the memory area pointed to by the indices for the buffer given.
-   Note that view->ndim is the assumed size of indices. */
-PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices);
-
-/* Return the implied itemsize of the data-format area from a
-   struct-style description. */
-PyAPI_FUNC(Py_ssize_t) PyBuffer_SizeFromFormat(const char *format);
-
-/* Implementation in memoryobject.c */
-PyAPI_FUNC(int) PyBuffer_ToContiguous(void *buf, Py_buffer *view,
-                                      Py_ssize_t len, char order);
-
-PyAPI_FUNC(int) PyBuffer_FromContiguous(Py_buffer *view, void *buf,
-                                        Py_ssize_t len, char order);
-
-/* Copy len bytes of data from the contiguous chunk of memory
-   pointed to by buf into the buffer exported by obj.  Return
-   0 on success and return -1 and raise a PyBuffer_Error on
-   error (i.e. the object does not have a buffer interface or
-   it is not working).
-
-   If fort is 'F', then if the object is multi-dimensional,
-   then the data will be copied into the array in
-   Fortran-style (first dimension varies the fastest).  If
-   fort is 'C', then the data will be copied into the array
-   in C-style (last dimension varies the fastest).  If fort
-   is 'A', then it does not matter and the copy will be made
-   in whatever way is more efficient. */
-PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src);
-
-/* Copy the data from the src buffer to the buffer of destination. */
-PyAPI_FUNC(int) PyBuffer_IsContiguous(const Py_buffer *view, char fort);
-
-/*Fill the strides array with byte-strides of a contiguous
-  (Fortran-style if fort is 'F' or C-style otherwise)
-  array of the given shape with the given number of bytes
-  per element. */
-PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims,
-                                               Py_ssize_t *shape,
-                                               Py_ssize_t *strides,
-                                               int itemsize,
-                                               char fort);
-
-/* Fills in a buffer-info structure correctly for an exporter
-   that can only share a contiguous chunk of memory of
-   "unsigned bytes" of the given length.
-
-   Returns 0 on success and -1 (with raising an error) on error. */
-PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf,
-                                  Py_ssize_t len, int readonly,
-                                  int flags);
-
-/* Releases a Py_buffer obtained from getbuffer ParseTuple's "s*". */
-PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view);
-
-/* ==== Iterators ================================================ */
-
-#define PyIter_Check(obj) \
-    (Py_TYPE(obj)->tp_iternext != NULL && \
-     Py_TYPE(obj)->tp_iternext != &_PyObject_NextNotImplemented)
-
-/* === Sequence protocol ================================================ */
-
-/* Assume tp_as_sequence and sq_item exist and that 'i' does not
-   need to be corrected for a negative index. */
-#define PySequence_ITEM(o, i)\
-    ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) )
-
-#define PY_ITERSEARCH_COUNT    1
-#define PY_ITERSEARCH_INDEX    2
-#define PY_ITERSEARCH_CONTAINS 3
-
-/* Iterate over seq.
-
-   Result depends on the operation:
-
-   PY_ITERSEARCH_COUNT:  return # of times obj appears in seq; -1 if
-     error.
-   PY_ITERSEARCH_INDEX:  return 0-based index of first occurrence of
-     obj in seq; set ValueError and return -1 if none found;
-     also return -1 on error.
-   PY_ITERSEARCH_CONTAINS:  return 1 if obj in seq, else 0; -1 on
-     error. */
-PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq,
-                                              PyObject *obj, int operation);
-
-/* === Mapping protocol ================================================= */
-
-PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls);
-
-PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls);
-
-PyAPI_FUNC(char *const *) _PySequence_BytesToCharpArray(PyObject* self);
-
-PyAPI_FUNC(void) _Py_FreeCharPArray(char *const array[]);
-
-/* For internal use by buffer API functions */
-PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index,
-                                        const Py_ssize_t *shape);
-PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index,
-                                        const Py_ssize_t *shape);
-
-/* Convert Python int to Py_ssize_t. Do nothing if the argument is None. */
-PyAPI_FUNC(int) _Py_convert_optional_to_ssize_t(PyObject *, void *);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/bytearrayobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/bytearrayobject.h
deleted file mode 100644
index 569b0cd03..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/bytearrayobject.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef Py_CPYTHON_BYTEARRAYOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-/* Object layout */
-typedef struct {
-    PyObject_VAR_HEAD
-    Py_ssize_t ob_alloc;   /* How many bytes allocated in ob_bytes */
-    char *ob_bytes;        /* Physical backing buffer */
-    char *ob_start;        /* Logical start inside ob_bytes */
-    Py_ssize_t ob_exports; /* How many buffer exports */
-} PyByteArrayObject;
-
-/* Macros, trading safety for speed */
-#define PyByteArray_AS_STRING(self) \
-    (assert(PyByteArray_Check(self)), \
-     Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_start : _PyByteArray_empty_string)
-#define PyByteArray_GET_SIZE(self) (assert(PyByteArray_Check(self)), Py_SIZE(self))
-
-PyAPI_DATA(char) _PyByteArray_empty_string[];
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/bytesobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/bytesobject.h
deleted file mode 100644
index f284c5835..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/bytesobject.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef Py_CPYTHON_BYTESOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-typedef struct {
-    PyObject_VAR_HEAD
-    Py_hash_t ob_shash;
-    char ob_sval[1];
-
-    /* Invariants:
-     *     ob_sval contains space for 'ob_size+1' elements.
-     *     ob_sval[ob_size] == 0.
-     *     ob_shash is the hash of the string or -1 if not computed yet.
-     */
-} PyBytesObject;
-
-PyAPI_FUNC(int) _PyBytes_Resize(PyObject **, Py_ssize_t);
-PyAPI_FUNC(PyObject*) _PyBytes_FormatEx(
-    const char *format,
-    Py_ssize_t format_len,
-    PyObject *args,
-    int use_bytearray);
-PyAPI_FUNC(PyObject*) _PyBytes_FromHex(
-    PyObject *string,
-    int use_bytearray);
-
-/* Helper for PyBytes_DecodeEscape that detects invalid escape chars. */
-PyAPI_FUNC(PyObject *) _PyBytes_DecodeEscape(const char *, Py_ssize_t,
-                                             const char *, const char **);
-
-/* Macro, trading safety for speed */
-#define PyBytes_AS_STRING(op) (assert(PyBytes_Check(op)), \
-                                (((PyBytesObject *)(op))->ob_sval))
-#define PyBytes_GET_SIZE(op)  (assert(PyBytes_Check(op)),Py_SIZE(op))
-
-/* _PyBytes_Join(sep, x) is like sep.join(x).  sep must be PyBytesObject*,
-   x must be an iterable object. */
-PyAPI_FUNC(PyObject *) _PyBytes_Join(PyObject *sep, PyObject *x);
-
-
-/* The _PyBytesWriter structure is big: it contains an embedded "stack buffer".
-   A _PyBytesWriter variable must be declared at the end of variables in a
-   function to optimize the memory allocation on the stack. */
-typedef struct {
-    /* bytes, bytearray or NULL (when the small buffer is used) */
-    PyObject *buffer;
-
-    /* Number of allocated size. */
-    Py_ssize_t allocated;
-
-    /* Minimum number of allocated bytes,
-       incremented by _PyBytesWriter_Prepare() */
-    Py_ssize_t min_size;
-
-    /* If non-zero, use a bytearray instead of a bytes object for buffer. */
-    int use_bytearray;
-
-    /* If non-zero, overallocate the buffer (default: 0).
-       This flag must be zero if use_bytearray is non-zero. */
-    int overallocate;
-
-    /* Stack buffer */
-    int use_small_buffer;
-    char small_buffer[512];
-} _PyBytesWriter;
-
-/* Initialize a bytes writer
-
-   By default, the overallocation is disabled. Set the overallocate attribute
-   to control the allocation of the buffer. */
-PyAPI_FUNC(void) _PyBytesWriter_Init(_PyBytesWriter *writer);
-
-/* Get the buffer content and reset the writer.
-   Return a bytes object, or a bytearray object if use_bytearray is non-zero.
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(PyObject *) _PyBytesWriter_Finish(_PyBytesWriter *writer,
-    void *str);
-
-/* Deallocate memory of a writer (clear its internal buffer). */
-PyAPI_FUNC(void) _PyBytesWriter_Dealloc(_PyBytesWriter *writer);
-
-/* Allocate the buffer to write size bytes.
-   Return the pointer to the beginning of buffer data.
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(void*) _PyBytesWriter_Alloc(_PyBytesWriter *writer,
-    Py_ssize_t size);
-
-/* Ensure that the buffer is large enough to write *size* bytes.
-   Add size to the writer minimum size (min_size attribute).
-
-   str is the current pointer inside the buffer.
-   Return the updated current pointer inside the buffer.
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(void*) _PyBytesWriter_Prepare(_PyBytesWriter *writer,
-    void *str,
-    Py_ssize_t size);
-
-/* Resize the buffer to make it larger.
-   The new buffer may be larger than size bytes because of overallocation.
-   Return the updated current pointer inside the buffer.
-   Raise an exception and return NULL on error.
-
-   Note: size must be greater than the number of allocated bytes in the writer.
-
-   This function doesn't use the writer minimum size (min_size attribute).
-
-   See also _PyBytesWriter_Prepare().
-   */
-PyAPI_FUNC(void*) _PyBytesWriter_Resize(_PyBytesWriter *writer,
-    void *str,
-    Py_ssize_t size);
-
-/* Write bytes.
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(void*) _PyBytesWriter_WriteBytes(_PyBytesWriter *writer,
-    void *str,
-    const void *bytes,
-    Py_ssize_t size);
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/ceval.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/ceval.h
deleted file mode 100644
index e1922a677..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/ceval.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef Py_CPYTHON_CEVAL_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *);
-PyAPI_DATA(int) _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg);
-PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
-PyAPI_FUNC(int) _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg);
-PyAPI_FUNC(int) _PyEval_GetCoroutineOriginTrackingDepth(void);
-PyAPI_FUNC(int) _PyEval_SetAsyncGenFirstiter(PyObject *);
-PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFirstiter(void);
-PyAPI_FUNC(int) _PyEval_SetAsyncGenFinalizer(PyObject *);
-PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFinalizer(void);
-
-/* Helper to look up a builtin object */
-PyAPI_FUNC(PyObject *) _PyEval_GetBuiltinId(_Py_Identifier *);
-/* Look at the current frame's (if any) code's co_flags, and turn on
-   the corresponding compiler flags in cf->cf_flags.  Return 1 if any
-   flag was set, else return 0. */
-PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf);
-
-PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int exc);
-
-PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds);
-PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void);
-
-PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc);
-
-PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/code.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/code.h
deleted file mode 100644
index cda28ac6e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/code.h
+++ /dev/null
@@ -1,165 +0,0 @@
-#ifndef Py_CPYTHON_CODE_H
-#  error "this header file must not be included directly"
-#endif
-
-typedef uint16_t _Py_CODEUNIT;
-
-#ifdef WORDS_BIGENDIAN
-#  define _Py_OPCODE(word) ((word) >> 8)
-#  define _Py_OPARG(word) ((word) & 255)
-#else
-#  define _Py_OPCODE(word) ((word) & 255)
-#  define _Py_OPARG(word) ((word) >> 8)
-#endif
-
-typedef struct _PyOpcache _PyOpcache;
-
-/* Bytecode object */
-struct PyCodeObject {
-    PyObject_HEAD
-    int co_argcount;            /* #arguments, except *args */
-    int co_posonlyargcount;     /* #positional only arguments */
-    int co_kwonlyargcount;      /* #keyword only arguments */
-    int co_nlocals;             /* #local variables */
-    int co_stacksize;           /* #entries needed for evaluation stack */
-    int co_flags;               /* CO_..., see below */
-    int co_firstlineno;         /* first source line number */
-    PyObject *co_code;          /* instruction opcodes */
-    PyObject *co_consts;        /* list (constants used) */
-    PyObject *co_names;         /* list of strings (names used) */
-    PyObject *co_varnames;      /* tuple of strings (local variable names) */
-    PyObject *co_freevars;      /* tuple of strings (free variable names) */
-    PyObject *co_cellvars;      /* tuple of strings (cell variable names) */
-    /* The rest aren't used in either hash or comparisons, except for co_name,
-       used in both. This is done to preserve the name and line number
-       for tracebacks and debuggers; otherwise, constant de-duplication
-       would collapse identical functions/lambdas defined on different lines.
-    */
-    Py_ssize_t *co_cell2arg;    /* Maps cell vars which are arguments. */
-    PyObject *co_filename;      /* unicode (where it was loaded from) */
-    PyObject *co_name;          /* unicode (name, for reference) */
-    PyObject *co_lnotab;        /* string (encoding addr<->lineno mapping) See
-                                   Objects/lnotab_notes.txt for details. */
-    void *co_zombieframe;       /* for optimization only (see frameobject.c) */
-    PyObject *co_weakreflist;   /* to support weakrefs to code objects */
-    /* Scratch space for extra data relating to the code object.
-       Type is a void* to keep the format private in codeobject.c to force
-       people to go through the proper APIs. */
-    void *co_extra;
-
-    /* Per opcodes just-in-time cache
-     *
-     * To reduce cache size, we use indirect mapping from opcode index to
-     * cache object:
-     *   cache = co_opcache[co_opcache_map[next_instr - first_instr] - 1]
-     */
-
-    // co_opcache_map is indexed by (next_instr - first_instr).
-    //  * 0 means there is no cache for this opcode.
-    //  * n > 0 means there is cache in co_opcache[n-1].
-    unsigned char *co_opcache_map;
-    _PyOpcache *co_opcache;
-    int co_opcache_flag;  // used to determine when create a cache.
-    unsigned char co_opcache_size;  // length of co_opcache.
-};
-
-/* Masks for co_flags above */
-#define CO_OPTIMIZED    0x0001
-#define CO_NEWLOCALS    0x0002
-#define CO_VARARGS      0x0004
-#define CO_VARKEYWORDS  0x0008
-#define CO_NESTED       0x0010
-#define CO_GENERATOR    0x0020
-/* The CO_NOFREE flag is set if there are no free or cell variables.
-   This information is redundant, but it allows a single flag test
-   to determine whether there is any extra work to be done when the
-   call frame it setup.
-*/
-#define CO_NOFREE       0x0040
-
-/* The CO_COROUTINE flag is set for coroutine functions (defined with
-   ``async def`` keywords) */
-#define CO_COROUTINE            0x0080
-#define CO_ITERABLE_COROUTINE   0x0100
-#define CO_ASYNC_GENERATOR      0x0200
-
-/* bpo-39562: These constant values are changed in Python 3.9
-   to prevent collision with compiler flags. CO_FUTURE_ and PyCF_
-   constants must be kept unique. PyCF_ constants can use bits from
-   0x0100 to 0x10000. CO_FUTURE_ constants use bits starting at 0x20000. */
-#define CO_FUTURE_DIVISION      0x20000
-#define CO_FUTURE_ABSOLUTE_IMPORT 0x40000 /* do absolute imports by default */
-#define CO_FUTURE_WITH_STATEMENT  0x80000
-#define CO_FUTURE_PRINT_FUNCTION  0x100000
-#define CO_FUTURE_UNICODE_LITERALS 0x200000
-
-#define CO_FUTURE_BARRY_AS_BDFL  0x400000
-#define CO_FUTURE_GENERATOR_STOP  0x800000
-#define CO_FUTURE_ANNOTATIONS    0x1000000
-
-/* This value is found in the co_cell2arg array when the associated cell
-   variable does not correspond to an argument. */
-#define CO_CELL_NOT_AN_ARG (-1)
-
-/* This should be defined if a future statement modifies the syntax.
-   For example, when a keyword is added.
-*/
-#define PY_PARSER_REQUIRES_FUTURE_KEYWORD
-
-#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */
-
-PyAPI_DATA(PyTypeObject) PyCode_Type;
-
-#define PyCode_Check(op) Py_IS_TYPE(op, &PyCode_Type)
-#define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars))
-
-/* Public interface */
-PyAPI_FUNC(PyCodeObject *) PyCode_New(
-        int, int, int, int, int, PyObject *, PyObject *,
-        PyObject *, PyObject *, PyObject *, PyObject *,
-        PyObject *, PyObject *, int, PyObject *);
-
-PyAPI_FUNC(PyCodeObject *) PyCode_NewWithPosOnlyArgs(
-        int, int, int, int, int, int, PyObject *, PyObject *,
-        PyObject *, PyObject *, PyObject *, PyObject *,
-        PyObject *, PyObject *, int, PyObject *);
-        /* same as struct above */
-
-/* Creates a new empty code object with the specified source location. */
-PyAPI_FUNC(PyCodeObject *)
-PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno);
-
-/* Return the line number associated with the specified bytecode index
-   in this code object.  If you just need the line number of a frame,
-   use PyFrame_GetLineNumber() instead. */
-PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int);
-
-/* for internal use only */
-typedef struct _addr_pair {
-        int ap_lower;
-        int ap_upper;
-} PyAddrPair;
-
-/* Update *bounds to describe the first and one-past-the-last instructions in the
-   same line as lasti.  Return the number of that line.
-*/
-PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co,
-                                        int lasti, PyAddrPair *bounds);
-
-/* Create a comparable key used to compare constants taking in account the
- * object type. It is used to make sure types are not coerced (e.g., float and
- * complex) _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms
- *
- * Return (type(obj), obj, ...): a tuple with variable size (at least 2 items)
- * depending on the type and the value. The type is the first item to not
- * compare bytes and str which can raise a BytesWarning exception. */
-PyAPI_FUNC(PyObject*) _PyCode_ConstantKey(PyObject *obj);
-
-PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts,
-                                      PyObject *names, PyObject *lnotab);
-
-
-PyAPI_FUNC(int) _PyCode_GetExtra(PyObject *code, Py_ssize_t index,
-                                 void **extra);
-PyAPI_FUNC(int) _PyCode_SetExtra(PyObject *code, Py_ssize_t index,
-                                 void *extra);
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/dictobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/dictobject.h
deleted file mode 100644
index e33a0d156..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/dictobject.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef Py_CPYTHON_DICTOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _dictkeysobject PyDictKeysObject;
-
-/* The ma_values pointer is NULL for a combined table
- * or points to an array of PyObject* for a split table
- */
-typedef struct {
-    PyObject_HEAD
-
-    /* Number of items in the dictionary */
-    Py_ssize_t ma_used;
-
-    /* Dictionary version: globally unique, value change each time
-       the dictionary is modified */
-    uint64_t ma_version_tag;
-
-    PyDictKeysObject *ma_keys;
-
-    /* If ma_values is NULL, the table is "combined": keys and values
-       are stored in ma_keys.
-
-       If ma_values is not NULL, the table is splitted:
-       keys are stored in ma_keys and values are stored in ma_values */
-    PyObject **ma_values;
-} PyDictObject;
-
-PyAPI_FUNC(PyObject *) _PyDict_GetItem_KnownHash(PyObject *mp, PyObject *key,
-                                       Py_hash_t hash);
-PyAPI_FUNC(PyObject *) _PyDict_GetItemIdWithError(PyObject *dp,
-                                                  struct _Py_Identifier *key);
-PyAPI_FUNC(PyObject *) _PyDict_GetItemStringWithError(PyObject *, const char *);
-PyAPI_FUNC(PyObject *) PyDict_SetDefault(
-    PyObject *mp, PyObject *key, PyObject *defaultobj);
-PyAPI_FUNC(int) _PyDict_SetItem_KnownHash(PyObject *mp, PyObject *key,
-                                          PyObject *item, Py_hash_t hash);
-PyAPI_FUNC(int) _PyDict_DelItem_KnownHash(PyObject *mp, PyObject *key,
-                                          Py_hash_t hash);
-PyAPI_FUNC(int) _PyDict_DelItemIf(PyObject *mp, PyObject *key,
-                                  int (*predicate)(PyObject *value));
-PyDictKeysObject *_PyDict_NewKeysForClass(void);
-PyAPI_FUNC(PyObject *) PyObject_GenericGetDict(PyObject *, void *);
-PyAPI_FUNC(int) _PyDict_Next(
-    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, Py_hash_t *hash);
-
-/* Get the number of items of a dictionary. */
-#define PyDict_GET_SIZE(mp)  (assert(PyDict_Check(mp)),((PyDictObject *)mp)->ma_used)
-PyAPI_FUNC(int) _PyDict_Contains(PyObject *mp, PyObject *key, Py_hash_t hash);
-PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused);
-PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp);
-PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp);
-Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys);
-PyAPI_FUNC(Py_ssize_t) _PyDict_SizeOf(PyDictObject *);
-PyAPI_FUNC(PyObject *) _PyDict_Pop(PyObject *, PyObject *, PyObject *);
-PyObject *_PyDict_Pop_KnownHash(PyObject *, PyObject *, Py_hash_t, PyObject *);
-PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
-#define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL)
-
-/* Like PyDict_Merge, but override can be 0, 1 or 2.  If override is 0,
-   the first occurrence of a key wins, if override is 1, the last occurrence
-   of a key wins, if override is 2, a KeyError with conflicting key as
-   argument is raised.
-*/
-PyAPI_FUNC(int) _PyDict_MergeEx(PyObject *mp, PyObject *other, int override);
-PyAPI_FUNC(PyObject *) _PyDict_GetItemId(PyObject *dp, struct _Py_Identifier *key);
-PyAPI_FUNC(int) _PyDict_SetItemId(PyObject *dp, struct _Py_Identifier *key, PyObject *item);
-
-PyAPI_FUNC(int) _PyDict_DelItemId(PyObject *mp, struct _Py_Identifier *key);
-PyAPI_FUNC(void) _PyDict_DebugMallocStats(FILE *out);
-
-int _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, PyObject *name, PyObject *value);
-PyObject *_PyDict_LoadGlobal(PyDictObject *, PyDictObject *, PyObject *);
-
-/* _PyDictView */
-
-typedef struct {
-    PyObject_HEAD
-    PyDictObject *dv_dict;
-} _PyDictViewObject;
-
-PyAPI_FUNC(PyObject *) _PyDictView_New(PyObject *, PyTypeObject *);
-PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/fileobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/fileobject.h
deleted file mode 100644
index 3005ce1f0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/fileobject.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef Py_CPYTHON_FILEOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
-
-/* The std printer acts as a preliminary sys.stderr until the new io
-   infrastructure is in place. */
-PyAPI_FUNC(PyObject *) PyFile_NewStdPrinter(int);
-PyAPI_DATA(PyTypeObject) PyStdPrinter_Type;
-
-typedef PyObject * (*Py_OpenCodeHookFunction)(PyObject *, void *);
-
-PyAPI_FUNC(PyObject *) PyFile_OpenCode(const char *utf8path);
-PyAPI_FUNC(PyObject *) PyFile_OpenCodeObject(PyObject *path);
-PyAPI_FUNC(int) PyFile_SetOpenCodeHook(Py_OpenCodeHookFunction hook, void *userData);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/fileutils.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/fileutils.h
deleted file mode 100644
index e79d03e24..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/fileutils.h
+++ /dev/null
@@ -1,165 +0,0 @@
-#ifndef Py_CPYTHON_FILEUTILS_H
-#  error "this header file must not be included directly"
-#endif
-
-typedef enum {
-    _Py_ERROR_UNKNOWN=0,
-    _Py_ERROR_STRICT,
-    _Py_ERROR_SURROGATEESCAPE,
-    _Py_ERROR_REPLACE,
-    _Py_ERROR_IGNORE,
-    _Py_ERROR_BACKSLASHREPLACE,
-    _Py_ERROR_SURROGATEPASS,
-    _Py_ERROR_XMLCHARREFREPLACE,
-    _Py_ERROR_OTHER
-} _Py_error_handler;
-
-PyAPI_FUNC(_Py_error_handler) _Py_GetErrorHandler(const char *errors);
-
-PyAPI_FUNC(int) _Py_DecodeLocaleEx(
-    const char *arg,
-    wchar_t **wstr,
-    size_t *wlen,
-    const char **reason,
-    int current_locale,
-    _Py_error_handler errors);
-
-PyAPI_FUNC(int) _Py_EncodeLocaleEx(
-    const wchar_t *text,
-    char **str,
-    size_t *error_pos,
-    const char **reason,
-    int current_locale,
-    _Py_error_handler errors);
-
-
-PyAPI_FUNC(PyObject *) _Py_device_encoding(int);
-
-#if defined(MS_WINDOWS) || defined(__APPLE__)
-    /* On Windows, the count parameter of read() is an int (bpo-9015, bpo-9611).
-       On macOS 10.13, read() and write() with more than INT_MAX bytes
-       fail with EINVAL (bpo-24658). */
-#   define _PY_READ_MAX  INT_MAX
-#   define _PY_WRITE_MAX INT_MAX
-#else
-    /* write() should truncate the input to PY_SSIZE_T_MAX bytes,
-       but it's safer to do it ourself to have a portable behaviour */
-#   define _PY_READ_MAX  PY_SSIZE_T_MAX
-#   define _PY_WRITE_MAX PY_SSIZE_T_MAX
-#endif
-
-#ifdef MS_WINDOWS
-struct _Py_stat_struct {
-    unsigned long st_dev;
-    uint64_t st_ino;
-    unsigned short st_mode;
-    int st_nlink;
-    int st_uid;
-    int st_gid;
-    unsigned long st_rdev;
-    __int64 st_size;
-    time_t st_atime;
-    int st_atime_nsec;
-    time_t st_mtime;
-    int st_mtime_nsec;
-    time_t st_ctime;
-    int st_ctime_nsec;
-    unsigned long st_file_attributes;
-    unsigned long st_reparse_tag;
-};
-#else
-#  define _Py_stat_struct stat
-#endif
-
-PyAPI_FUNC(int) _Py_fstat(
-    int fd,
-    struct _Py_stat_struct *status);
-
-PyAPI_FUNC(int) _Py_fstat_noraise(
-    int fd,
-    struct _Py_stat_struct *status);
-
-PyAPI_FUNC(int) _Py_stat(
-    PyObject *path,
-    struct stat *status);
-
-PyAPI_FUNC(int) _Py_open(
-    const char *pathname,
-    int flags);
-
-PyAPI_FUNC(int) _Py_open_noraise(
-    const char *pathname,
-    int flags);
-
-PyAPI_FUNC(FILE *) _Py_wfopen(
-    const wchar_t *path,
-    const wchar_t *mode);
-
-PyAPI_FUNC(FILE*) _Py_fopen(
-    const char *pathname,
-    const char *mode);
-
-PyAPI_FUNC(FILE*) _Py_fopen_obj(
-    PyObject *path,
-    const char *mode);
-
-PyAPI_FUNC(Py_ssize_t) _Py_read(
-    int fd,
-    void *buf,
-    size_t count);
-
-PyAPI_FUNC(Py_ssize_t) _Py_write(
-    int fd,
-    const void *buf,
-    size_t count);
-
-PyAPI_FUNC(Py_ssize_t) _Py_write_noraise(
-    int fd,
-    const void *buf,
-    size_t count);
-
-#ifdef HAVE_READLINK
-PyAPI_FUNC(int) _Py_wreadlink(
-    const wchar_t *path,
-    wchar_t *buf,
-    /* Number of characters of 'buf' buffer
-       including the trailing NUL character */
-    size_t buflen);
-#endif
-
-#ifdef HAVE_REALPATH
-PyAPI_FUNC(wchar_t*) _Py_wrealpath(
-    const wchar_t *path,
-    wchar_t *resolved_path,
-    /* Number of characters of 'resolved_path' buffer
-       including the trailing NUL character */
-    size_t resolved_path_len);
-#endif
-
-#ifndef MS_WINDOWS
-PyAPI_FUNC(int) _Py_isabs(const wchar_t *path);
-#endif
-
-PyAPI_FUNC(int) _Py_abspath(const wchar_t *path, wchar_t **abspath_p);
-
-PyAPI_FUNC(wchar_t*) _Py_wgetcwd(
-    wchar_t *buf,
-    /* Number of characters of 'buf' buffer
-       including the trailing NUL character */
-    size_t buflen);
-
-PyAPI_FUNC(int) _Py_get_inheritable(int fd);
-
-PyAPI_FUNC(int) _Py_set_inheritable(int fd, int inheritable,
-                                    int *atomic_flag_works);
-
-PyAPI_FUNC(int) _Py_set_inheritable_async_safe(int fd, int inheritable,
-                                               int *atomic_flag_works);
-
-PyAPI_FUNC(int) _Py_dup(int fd);
-
-#ifndef MS_WINDOWS
-PyAPI_FUNC(int) _Py_get_blocking(int fd);
-
-PyAPI_FUNC(int) _Py_set_blocking(int fd, int blocking);
-#endif   /* !MS_WINDOWS */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/frameobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/frameobject.h
deleted file mode 100644
index 36a51baae..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/frameobject.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Frame object interface */
-
-#ifndef Py_CPYTHON_FRAMEOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    int b_type;                 /* what kind of block this is */
-    int b_handler;              /* where to jump to find handler */
-    int b_level;                /* value stack level to pop to */
-} PyTryBlock;
-
-struct _frame {
-    PyObject_VAR_HEAD
-    struct _frame *f_back;      /* previous frame, or NULL */
-    PyCodeObject *f_code;       /* code segment */
-    PyObject *f_builtins;       /* builtin symbol table (PyDictObject) */
-    PyObject *f_globals;        /* global symbol table (PyDictObject) */
-    PyObject *f_locals;         /* local symbol table (any mapping) */
-    PyObject **f_valuestack;    /* points after the last local */
-    /* Next free slot in f_valuestack.  Frame creation sets to f_valuestack.
-       Frame evaluation usually NULLs it, but a frame that yields sets it
-       to the current stack top. */
-    PyObject **f_stacktop;
-    PyObject *f_trace;          /* Trace function */
-    char f_trace_lines;         /* Emit per-line trace events? */
-    char f_trace_opcodes;       /* Emit per-opcode trace events? */
-
-    /* Borrowed reference to a generator, or NULL */
-    PyObject *f_gen;
-
-    int f_lasti;                /* Last instruction if called */
-    /* Call PyFrame_GetLineNumber() instead of reading this field
-       directly.  As of 2.3 f_lineno is only valid when tracing is
-       active (i.e. when f_trace is set).  At other times we use
-       PyCode_Addr2Line to calculate the line from the current
-       bytecode index. */
-    int f_lineno;               /* Current line number */
-    int f_iblock;               /* index in f_blockstack */
-    char f_executing;           /* whether the frame is still executing */
-    PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */
-    PyObject *f_localsplus[1];  /* locals+stack, dynamically sized */
-};
-
-
-/* Standard object interface */
-
-PyAPI_DATA(PyTypeObject) PyFrame_Type;
-
-#define PyFrame_Check(op) Py_IS_TYPE(op, &PyFrame_Type)
-
-PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *,
-                                        PyObject *, PyObject *);
-
-/* only internal use */
-PyFrameObject* _PyFrame_New_NoTrack(PyThreadState *, PyCodeObject *,
-                                    PyObject *, PyObject *);
-
-
-/* The rest of the interface is specific for frame objects */
-
-/* Block management functions */
-
-PyAPI_FUNC(void) PyFrame_BlockSetup(PyFrameObject *, int, int, int);
-PyAPI_FUNC(PyTryBlock *) PyFrame_BlockPop(PyFrameObject *);
-
-/* Conversions between "fast locals" and locals in dictionary */
-
-PyAPI_FUNC(void) PyFrame_LocalsToFast(PyFrameObject *, int);
-
-PyAPI_FUNC(int) PyFrame_FastToLocalsWithError(PyFrameObject *f);
-PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *);
-
-PyAPI_FUNC(void) _PyFrame_DebugMallocStats(FILE *out);
-
-PyAPI_FUNC(PyFrameObject *) PyFrame_GetBack(PyFrameObject *frame);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/import.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/import.h
deleted file mode 100644
index c1b47121f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/import.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef Py_CPYTHON_IMPORT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyMODINIT_FUNC PyInit__imp(void);
-
-PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *);
-
-PyAPI_FUNC(PyObject *) _PyImport_GetModuleId(struct _Py_Identifier *name);
-PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *module);
-PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject* module);
-
-PyAPI_FUNC(void) _PyImport_AcquireLock(void);
-PyAPI_FUNC(int) _PyImport_ReleaseLock(void);
-
-PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *);
-
-PyAPI_FUNC(int) _PyImport_FixupBuiltin(
-    PyObject *mod,
-    const char *name,            /* UTF-8 encoded string */
-    PyObject *modules
-    );
-PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *,
-                                               PyObject *, PyObject *);
-
-struct _inittab {
-    const char *name;           /* ASCII encoded string */
-    PyObject* (*initfunc)(void);
-};
-PyAPI_DATA(struct _inittab *) PyImport_Inittab;
-PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab);
-
-struct _frozen {
-    const char *name;                 /* ASCII encoded string */
-    const unsigned char *code;
-    int size;
-};
-
-/* Embedding apps may change this pointer to point to their favorite
-   collection of frozen modules: */
-
-PyAPI_DATA(const struct _frozen *) PyImport_FrozenModules;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/initconfig.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/initconfig.h
deleted file mode 100644
index 0a256d4b5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/initconfig.h
+++ /dev/null
@@ -1,462 +0,0 @@
-#ifndef Py_PYCORECONFIG_H
-#define Py_PYCORECONFIG_H
-#ifndef Py_LIMITED_API
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* --- PyStatus ----------------------------------------------- */
-
-typedef struct {
-    enum {
-        _PyStatus_TYPE_OK=0,
-        _PyStatus_TYPE_ERROR=1,
-        _PyStatus_TYPE_EXIT=2
-    } _type;
-    const char *func;
-    const char *err_msg;
-    int exitcode;
-} PyStatus;
-
-PyAPI_FUNC(PyStatus) PyStatus_Ok(void);
-PyAPI_FUNC(PyStatus) PyStatus_Error(const char *err_msg);
-PyAPI_FUNC(PyStatus) PyStatus_NoMemory(void);
-PyAPI_FUNC(PyStatus) PyStatus_Exit(int exitcode);
-PyAPI_FUNC(int) PyStatus_IsError(PyStatus err);
-PyAPI_FUNC(int) PyStatus_IsExit(PyStatus err);
-PyAPI_FUNC(int) PyStatus_Exception(PyStatus err);
-
-/* --- PyWideStringList ------------------------------------------------ */
-
-typedef struct {
-    /* If length is greater than zero, items must be non-NULL
-       and all items strings must be non-NULL */
-    Py_ssize_t length;
-    wchar_t **items;
-} PyWideStringList;
-
-PyAPI_FUNC(PyStatus) PyWideStringList_Append(PyWideStringList *list,
-    const wchar_t *item);
-PyAPI_FUNC(PyStatus) PyWideStringList_Insert(PyWideStringList *list,
-    Py_ssize_t index,
-    const wchar_t *item);
-
-
-/* --- PyPreConfig ----------------------------------------------- */
-
-typedef struct {
-    int _config_init;     /* _PyConfigInitEnum value */
-
-    /* Parse Py_PreInitializeFromBytesArgs() arguments?
-       See PyConfig.parse_argv */
-    int parse_argv;
-
-    /* If greater than 0, enable isolated mode: sys.path contains
-       neither the script's directory nor the user's site-packages directory.
-
-       Set to 1 by the -I command line option. If set to -1 (default), inherit
-       Py_IsolatedFlag value. */
-    int isolated;
-
-    /* If greater than 0: use environment variables.
-       Set to 0 by -E command line option. If set to -1 (default), it is
-       set to !Py_IgnoreEnvironmentFlag. */
-    int use_environment;
-
-    /* Set the LC_CTYPE locale to the user preferred locale? If equals to 0,
-       set coerce_c_locale and coerce_c_locale_warn to 0. */
-    int configure_locale;
-
-    /* Coerce the LC_CTYPE locale if it's equal to "C"? (PEP 538)
-
-       Set to 0 by PYTHONCOERCECLOCALE=0. Set to 1 by PYTHONCOERCECLOCALE=1.
-       Set to 2 if the user preferred LC_CTYPE locale is "C".
-
-       If it is equal to 1, LC_CTYPE locale is read to decide if it should be
-       coerced or not (ex: PYTHONCOERCECLOCALE=1). Internally, it is set to 2
-       if the LC_CTYPE locale must be coerced.
-
-       Disable by default (set to 0). Set it to -1 to let Python decide if it
-       should be enabled or not. */
-    int coerce_c_locale;
-
-    /* Emit a warning if the LC_CTYPE locale is coerced?
-
-       Set to 1 by PYTHONCOERCECLOCALE=warn.
-
-       Disable by default (set to 0). Set it to -1 to let Python decide if it
-       should be enabled or not. */
-    int coerce_c_locale_warn;
-
-#ifdef MS_WINDOWS
-    /* If greater than 1, use the "mbcs" encoding instead of the UTF-8
-       encoding for the filesystem encoding.
-
-       Set to 1 if the PYTHONLEGACYWINDOWSFSENCODING environment variable is
-       set to a non-empty string. If set to -1 (default), inherit
-       Py_LegacyWindowsFSEncodingFlag value.
-
-       See PEP 529 for more details. */
-    int legacy_windows_fs_encoding;
-#endif
-
-    /* Enable UTF-8 mode? (PEP 540)
-
-       Disabled by default (equals to 0).
-
-       Set to 1 by "-X utf8" and "-X utf8=1" command line options.
-       Set to 1 by PYTHONUTF8=1 environment variable.
-
-       Set to 0 by "-X utf8=0" and PYTHONUTF8=0.
-
-       If equals to -1, it is set to 1 if the LC_CTYPE locale is "C" or
-       "POSIX", otherwise it is set to 0. Inherit Py_UTF8Mode value value. */
-    int utf8_mode;
-
-    /* If non-zero, enable the Python Development Mode.
-
-       Set to 1 by the -X dev command line option. Set by the PYTHONDEVMODE
-       environment variable. */
-    int dev_mode;
-
-    /* Memory allocator: PYTHONMALLOC env var.
-       See PyMemAllocatorName for valid values. */
-    int allocator;
-} PyPreConfig;
-
-PyAPI_FUNC(void) PyPreConfig_InitPythonConfig(PyPreConfig *config);
-PyAPI_FUNC(void) PyPreConfig_InitIsolatedConfig(PyPreConfig *config);
-
-
-/* --- PyConfig ---------------------------------------------- */
-
-typedef struct {
-    int _config_init;     /* _PyConfigInitEnum value */
-
-    int isolated;         /* Isolated mode? see PyPreConfig.isolated */
-    int use_environment;  /* Use environment variables? see PyPreConfig.use_environment */
-    int dev_mode;         /* Python Development Mode? See PyPreConfig.dev_mode */
-
-    /* Install signal handlers? Yes by default. */
-    int install_signal_handlers;
-
-    int use_hash_seed;      /* PYTHONHASHSEED=x */
-    unsigned long hash_seed;
-
-    /* Enable faulthandler?
-       Set to 1 by -X faulthandler and PYTHONFAULTHANDLER. -1 means unset. */
-    int faulthandler;
-
-    /* Enable PEG parser?
-       1 by default, set to 0 by -X oldparser and PYTHONOLDPARSER */
-    int _use_peg_parser;
-
-    /* Enable tracemalloc?
-       Set by -X tracemalloc=N and PYTHONTRACEMALLOC. -1 means unset */
-    int tracemalloc;
-
-    int import_time;        /* PYTHONPROFILEIMPORTTIME, -X importtime */
-    int show_ref_count;     /* -X showrefcount */
-    int dump_refs;          /* PYTHONDUMPREFS */
-    int malloc_stats;       /* PYTHONMALLOCSTATS */
-
-    /* Python filesystem encoding and error handler:
-       sys.getfilesystemencoding() and sys.getfilesystemencodeerrors().
-
-       Default encoding and error handler:
-
-       * if Py_SetStandardStreamEncoding() has been called: they have the
-         highest priority;
-       * PYTHONIOENCODING environment variable;
-       * The UTF-8 Mode uses UTF-8/surrogateescape;
-       * If Python forces the usage of the ASCII encoding (ex: C locale
-         or POSIX locale on FreeBSD or HP-UX), use ASCII/surrogateescape;
-       * locale encoding: ANSI code page on Windows, UTF-8 on Android and
-         VxWorks, LC_CTYPE locale encoding on other platforms;
-       * On Windows, "surrogateescape" error handler;
-       * "surrogateescape" error handler if the LC_CTYPE locale is "C" or "POSIX";
-       * "surrogateescape" error handler if the LC_CTYPE locale has been coerced
-         (PEP 538);
-       * "strict" error handler.
-
-       Supported error handlers: "strict", "surrogateescape" and
-       "surrogatepass". The surrogatepass error handler is only supported
-       if Py_DecodeLocale() and Py_EncodeLocale() use directly the UTF-8 codec;
-       it's only used on Windows.
-
-       initfsencoding() updates the encoding to the Python codec name.
-       For example, "ANSI_X3.4-1968" is replaced with "ascii".
-
-       On Windows, sys._enablelegacywindowsfsencoding() sets the
-       encoding/errors to mbcs/replace at runtime.
-
-
-       See Py_FileSystemDefaultEncoding and Py_FileSystemDefaultEncodeErrors.
-       */
-    wchar_t *filesystem_encoding;
-    wchar_t *filesystem_errors;
-
-    wchar_t *pycache_prefix;  /* PYTHONPYCACHEPREFIX, -X pycache_prefix=PATH */
-    int parse_argv;           /* Parse argv command line arguments? */
-
-    /* Command line arguments (sys.argv).
-
-       Set parse_argv to 1 to parse argv as Python command line arguments
-       and then strip Python arguments from argv.
-
-       If argv is empty, an empty string is added to ensure that sys.argv
-       always exists and is never empty. */
-    PyWideStringList argv;
-
-    /* Program name:
-
-       - If Py_SetProgramName() was called, use its value.
-       - On macOS, use PYTHONEXECUTABLE environment variable if set.
-       - If WITH_NEXT_FRAMEWORK macro is defined, use __PYVENV_LAUNCHER__
-         environment variable is set.
-       - Use argv[0] if available and non-empty.
-       - Use "python" on Windows, or "python3 on other platforms. */
-    wchar_t *program_name;
-
-    PyWideStringList xoptions;     /* Command line -X options */
-
-    /* Warnings options: lowest to highest priority. warnings.filters
-       is built in the reverse order (highest to lowest priority). */
-    PyWideStringList warnoptions;
-
-    /* If equal to zero, disable the import of the module site and the
-       site-dependent manipulations of sys.path that it entails. Also disable
-       these manipulations if site is explicitly imported later (call
-       site.main() if you want them to be triggered).
-
-       Set to 0 by the -S command line option. If set to -1 (default), it is
-       set to !Py_NoSiteFlag. */
-    int site_import;
-
-    /* Bytes warnings:
-
-       * If equal to 1, issue a warning when comparing bytes or bytearray with
-         str or bytes with int.
-       * If equal or greater to 2, issue an error.
-
-       Incremented by the -b command line option. If set to -1 (default), inherit
-       Py_BytesWarningFlag value. */
-    int bytes_warning;
-
-    /* If greater than 0, enable inspect: when a script is passed as first
-       argument or the -c option is used, enter interactive mode after
-       executing the script or the command, even when sys.stdin does not appear
-       to be a terminal.
-
-       Incremented by the -i command line option. Set to 1 if the PYTHONINSPECT
-       environment variable is non-empty. If set to -1 (default), inherit
-       Py_InspectFlag value. */
-    int inspect;
-
-    /* If greater than 0: enable the interactive mode (REPL).
-
-       Incremented by the -i command line option. If set to -1 (default),
-       inherit Py_InteractiveFlag value. */
-    int interactive;
-
-    /* Optimization level.
-
-       Incremented by the -O command line option. Set by the PYTHONOPTIMIZE
-       environment variable. If set to -1 (default), inherit Py_OptimizeFlag
-       value. */
-    int optimization_level;
-
-    /* If greater than 0, enable the debug mode: turn on parser debugging
-       output (for expert only, depending on compilation options).
-
-       Incremented by the -d command line option. Set by the PYTHONDEBUG
-       environment variable. If set to -1 (default), inherit Py_DebugFlag
-       value. */
-    int parser_debug;
-
-    /* If equal to 0, Python won't try to write ``.pyc`` files on the
-       import of source modules.
-
-       Set to 0 by the -B command line option and the PYTHONDONTWRITEBYTECODE
-       environment variable. If set to -1 (default), it is set to
-       !Py_DontWriteBytecodeFlag. */
-    int write_bytecode;
-
-    /* If greater than 0, enable the verbose mode: print a message each time a
-       module is initialized, showing the place (filename or built-in module)
-       from which it is loaded.
-
-       If greater or equal to 2, print a message for each file that is checked
-       for when searching for a module. Also provides information on module
-       cleanup at exit.
-
-       Incremented by the -v option. Set by the PYTHONVERBOSE environment
-       variable. If set to -1 (default), inherit Py_VerboseFlag value. */
-    int verbose;
-
-    /* If greater than 0, enable the quiet mode: Don't display the copyright
-       and version messages even in interactive mode.
-
-       Incremented by the -q option. If set to -1 (default), inherit
-       Py_QuietFlag value. */
-    int quiet;
-
-   /* If greater than 0, don't add the user site-packages directory to
-      sys.path.
-
-      Set to 0 by the -s and -I command line options , and the PYTHONNOUSERSITE
-      environment variable. If set to -1 (default), it is set to
-      !Py_NoUserSiteDirectory. */
-    int user_site_directory;
-
-    /* If non-zero, configure C standard steams (stdio, stdout,
-       stderr):
-
-       - Set O_BINARY mode on Windows.
-       - If buffered_stdio is equal to zero, make streams unbuffered.
-         Otherwise, enable streams buffering if interactive is non-zero. */
-    int configure_c_stdio;
-
-    /* If equal to 0, enable unbuffered mode: force the stdout and stderr
-       streams to be unbuffered.
-
-       Set to 0 by the -u option. Set by the PYTHONUNBUFFERED environment
-       variable.
-       If set to -1 (default), it is set to !Py_UnbufferedStdioFlag. */
-    int buffered_stdio;
-
-    /* Encoding of sys.stdin, sys.stdout and sys.stderr.
-       Value set from PYTHONIOENCODING environment variable and
-       Py_SetStandardStreamEncoding() function.
-       See also 'stdio_errors' attribute. */
-    wchar_t *stdio_encoding;
-
-    /* Error handler of sys.stdin and sys.stdout.
-       Value set from PYTHONIOENCODING environment variable and
-       Py_SetStandardStreamEncoding() function.
-       See also 'stdio_encoding' attribute. */
-    wchar_t *stdio_errors;
-
-#ifdef MS_WINDOWS
-    /* If greater than zero, use io.FileIO instead of WindowsConsoleIO for sys
-       standard streams.
-
-       Set to 1 if the PYTHONLEGACYWINDOWSSTDIO environment variable is set to
-       a non-empty string. If set to -1 (default), inherit
-       Py_LegacyWindowsStdioFlag value.
-
-       See PEP 528 for more details. */
-    int legacy_windows_stdio;
-#endif
-
-    /* Value of the --check-hash-based-pycs command line option:
-
-       - "default" means the 'check_source' flag in hash-based pycs
-         determines invalidation
-       - "always" causes the interpreter to hash the source file for
-         invalidation regardless of value of 'check_source' bit
-       - "never" causes the interpreter to always assume hash-based pycs are
-         valid
-
-       The default value is "default".
-
-       See PEP 552 "Deterministic pycs" for more details. */
-    wchar_t *check_hash_pycs_mode;
-
-    /* --- Path configuration inputs ------------ */
-
-    /* If greater than 0, suppress _PyPathConfig_Calculate() warnings on Unix.
-       The parameter has no effect on Windows.
-
-       If set to -1 (default), inherit !Py_FrozenFlag value. */
-    int pathconfig_warnings;
-
-    wchar_t *pythonpath_env; /* PYTHONPATH environment variable */
-    wchar_t *home;          /* PYTHONHOME environment variable,
-                               see also Py_SetPythonHome(). */
-
-    /* --- Path configuration outputs ----------- */
-
-    int module_search_paths_set;  /* If non-zero, use module_search_paths */
-    PyWideStringList module_search_paths;  /* sys.path paths. Computed if
-                                       module_search_paths_set is equal
-                                       to zero. */
-
-    wchar_t *executable;        /* sys.executable */
-    wchar_t *base_executable;   /* sys._base_executable */
-    wchar_t *prefix;            /* sys.prefix */
-    wchar_t *base_prefix;       /* sys.base_prefix */
-    wchar_t *exec_prefix;       /* sys.exec_prefix */
-    wchar_t *base_exec_prefix;  /* sys.base_exec_prefix */
-    wchar_t *platlibdir;        /* sys.platlibdir */
-
-    /* --- Parameter only used by Py_Main() ---------- */
-
-    /* Skip the first line of the source ('run_filename' parameter), allowing use of non-Unix forms of
-       "#!cmd".  This is intended for a DOS specific hack only.
-
-       Set by the -x command line option. */
-    int skip_source_first_line;
-
-    wchar_t *run_command;   /* -c command line argument */
-    wchar_t *run_module;    /* -m command line argument */
-    wchar_t *run_filename;  /* Trailing command line argument without -c or -m */
-
-    /* --- Private fields ---------------------------- */
-
-    /* Install importlib? If set to 0, importlib is not initialized at all.
-       Needed by freeze_importlib. */
-    int _install_importlib;
-
-    /* If equal to 0, stop Python initialization before the "main" phase */
-    int _init_main;
-
-    /* If non-zero, disallow threads, subprocesses, and fork.
-       Default: 0. */
-    int _isolated_interpreter;
-
-    /* Original command line arguments. If _orig_argv is empty and _argv is
-       not equal to [''], PyConfig_Read() copies the configuration 'argv' list
-       into '_orig_argv' list before modifying 'argv' list (if parse_argv
-       is non-zero).
-
-       _PyConfig_Write() initializes Py_GetArgcArgv() to this list. */
-    PyWideStringList _orig_argv;
-} PyConfig;
-
-PyAPI_FUNC(void) PyConfig_InitPythonConfig(PyConfig *config);
-PyAPI_FUNC(void) PyConfig_InitIsolatedConfig(PyConfig *config);
-PyAPI_FUNC(void) PyConfig_Clear(PyConfig *);
-PyAPI_FUNC(PyStatus) PyConfig_SetString(
-    PyConfig *config,
-    wchar_t **config_str,
-    const wchar_t *str);
-PyAPI_FUNC(PyStatus) PyConfig_SetBytesString(
-    PyConfig *config,
-    wchar_t **config_str,
-    const char *str);
-PyAPI_FUNC(PyStatus) PyConfig_Read(PyConfig *config);
-PyAPI_FUNC(PyStatus) PyConfig_SetBytesArgv(
-    PyConfig *config,
-    Py_ssize_t argc,
-    char * const *argv);
-PyAPI_FUNC(PyStatus) PyConfig_SetArgv(PyConfig *config,
-    Py_ssize_t argc,
-    wchar_t * const *argv);
-PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config,
-    PyWideStringList *list,
-    Py_ssize_t length, wchar_t **items);
-
-
-/* --- Helper functions --------------------------------------- */
-
-/* Get the original command line arguments, before Python modified them.
-
-   See also PyConfig._orig_argv. */
-PyAPI_FUNC(void) Py_GetArgcArgv(int *argc, wchar_t ***argv);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LIMITED_API */
-#endif /* !Py_PYCORECONFIG_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/interpreteridobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/interpreteridobject.h
deleted file mode 100644
index 67ec58735..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/interpreteridobject.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef Py_CPYTHON_INTERPRETERIDOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Interpreter ID Object */
-
-PyAPI_DATA(PyTypeObject) _PyInterpreterID_Type;
-
-PyAPI_FUNC(PyObject *) _PyInterpreterID_New(int64_t);
-PyAPI_FUNC(PyObject *) _PyInterpreterState_GetIDObject(PyInterpreterState *);
-PyAPI_FUNC(PyInterpreterState *) _PyInterpreterID_LookUp(PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/listobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/listobject.h
deleted file mode 100644
index 74fe3301a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/listobject.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef Py_CPYTHON_LISTOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_VAR_HEAD
-    /* Vector of pointers to list elements.  list[0] is ob_item[0], etc. */
-    PyObject **ob_item;
-
-    /* ob_item contains space for 'allocated' elements.  The number
-     * currently in use is ob_size.
-     * Invariants:
-     *     0 <= ob_size <= allocated
-     *     len(list) == ob_size
-     *     ob_item == NULL implies ob_size == allocated == 0
-     * list.sort() temporarily sets allocated to -1 to detect mutations.
-     *
-     * Items must normally not be NULL, except during construction when
-     * the list is not yet visible outside the function that builds it.
-     */
-    Py_ssize_t allocated;
-} PyListObject;
-
-PyAPI_FUNC(PyObject *) _PyList_Extend(PyListObject *, PyObject *);
-PyAPI_FUNC(void) _PyList_DebugMallocStats(FILE *out);
-
-/* Macro, trading safety for speed */
-
-/* Cast argument to PyTupleObject* type. */
-#define _PyList_CAST(op) (assert(PyList_Check(op)), (PyListObject *)(op))
-
-#define PyList_GET_ITEM(op, i) (_PyList_CAST(op)->ob_item[i])
-#define PyList_SET_ITEM(op, i, v) (_PyList_CAST(op)->ob_item[i] = (v))
-#define PyList_GET_SIZE(op)    Py_SIZE(_PyList_CAST(op))
-#define _PyList_ITEMS(op)      (_PyList_CAST(op)->ob_item)
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/methodobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/methodobject.h
deleted file mode 100644
index 7ecbfe3b5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/methodobject.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef Py_CPYTHON_METHODOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-PyAPI_DATA(PyTypeObject) PyCMethod_Type;
-
-#define PyCMethod_CheckExact(op) Py_IS_TYPE(op, &PyCMethod_Type)
-#define PyCMethod_Check(op) PyObject_TypeCheck(op, &PyCMethod_Type)
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyCFunction_GET_FUNCTION(func) \
-        (((PyCFunctionObject *)func) -> m_ml -> ml_meth)
-#define PyCFunction_GET_SELF(func) \
-        (((PyCFunctionObject *)func) -> m_ml -> ml_flags & METH_STATIC ? \
-         NULL : ((PyCFunctionObject *)func) -> m_self)
-#define PyCFunction_GET_FLAGS(func) \
-        (((PyCFunctionObject *)func) -> m_ml -> ml_flags)
-#define PyCFunction_GET_CLASS(func) \
-    (((PyCFunctionObject *)func) -> m_ml -> ml_flags & METH_METHOD ? \
-         ((PyCMethodObject *)func) -> mm_class : NULL)
-
-typedef struct {
-    PyObject_HEAD
-    PyMethodDef *m_ml; /* Description of the C function to call */
-    PyObject    *m_self; /* Passed as 'self' arg to the C func, can be NULL */
-    PyObject    *m_module; /* The __module__ attribute, can be anything */
-    PyObject    *m_weakreflist; /* List of weak references */
-    vectorcallfunc vectorcall;
-} PyCFunctionObject;
-
-typedef struct {
-    PyCFunctionObject func;
-    PyTypeObject *mm_class; /* Class that defines this method */
-} PyCMethodObject;
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/object.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/object.h
deleted file mode 100644
index 444f832f5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/object.h
+++ /dev/null
@@ -1,554 +0,0 @@
-#ifndef Py_CPYTHON_OBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(void) _Py_NewReference(PyObject *op);
-
-#ifdef Py_TRACE_REFS
-/* Py_TRACE_REFS is such major surgery that we call external routines. */
-PyAPI_FUNC(void) _Py_ForgetReference(PyObject *);
-#endif
-
-/* Update the Python traceback of an object. This function must be called
-   when a memory block is reused from a free list. */
-PyAPI_FUNC(int) _PyTraceMalloc_NewReference(PyObject *op);
-
-#ifdef Py_REF_DEBUG
-PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void);
-#endif
-
-
-/********************* String Literals ****************************************/
-/* This structure helps managing static strings. The basic usage goes like this:
-   Instead of doing
-
-       r = PyObject_CallMethod(o, "foo", "args", ...);
-
-   do
-
-       _Py_IDENTIFIER(foo);
-       ...
-       r = _PyObject_CallMethodId(o, &PyId_foo, "args", ...);
-
-   PyId_foo is a static variable, either on block level or file level. On first
-   usage, the string "foo" is interned, and the structures are linked. On interpreter
-   shutdown, all strings are released.
-
-   Alternatively, _Py_static_string allows choosing the variable name.
-   _PyUnicode_FromId returns a borrowed reference to the interned string.
-   _PyObject_{Get,Set,Has}AttrId are __getattr__ versions using _Py_Identifier*.
-*/
-typedef struct _Py_Identifier {
-    struct _Py_Identifier *next;
-    const char* string;
-    PyObject *object;
-} _Py_Identifier;
-
-#define _Py_static_string_init(value) { .next = NULL, .string = value, .object = NULL }
-#define _Py_static_string(varname, value)  static _Py_Identifier varname = _Py_static_string_init(value)
-#define _Py_IDENTIFIER(varname) _Py_static_string(PyId_##varname, #varname)
-
-/* buffer interface */
-typedef struct bufferinfo {
-    void *buf;
-    PyObject *obj;        /* owned reference */
-    Py_ssize_t len;
-    Py_ssize_t itemsize;  /* This is Py_ssize_t so it can be
-                             pointed to by strides in simple case.*/
-    int readonly;
-    int ndim;
-    char *format;
-    Py_ssize_t *shape;
-    Py_ssize_t *strides;
-    Py_ssize_t *suboffsets;
-    void *internal;
-} Py_buffer;
-
-typedef int (*getbufferproc)(PyObject *, Py_buffer *, int);
-typedef void (*releasebufferproc)(PyObject *, Py_buffer *);
-
-typedef PyObject *(*vectorcallfunc)(PyObject *callable, PyObject *const *args,
-                                    size_t nargsf, PyObject *kwnames);
-
-/* Maximum number of dimensions */
-#define PyBUF_MAX_NDIM 64
-
-/* Flags for getting buffers */
-#define PyBUF_SIMPLE 0
-#define PyBUF_WRITABLE 0x0001
-/*  we used to include an E, backwards compatible alias  */
-#define PyBUF_WRITEABLE PyBUF_WRITABLE
-#define PyBUF_FORMAT 0x0004
-#define PyBUF_ND 0x0008
-#define PyBUF_STRIDES (0x0010 | PyBUF_ND)
-#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)
-#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)
-#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)
-#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
-
-#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE)
-#define PyBUF_CONTIG_RO (PyBUF_ND)
-
-#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE)
-#define PyBUF_STRIDED_RO (PyBUF_STRIDES)
-
-#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT)
-#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT)
-
-#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT)
-#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT)
-
-
-#define PyBUF_READ  0x100
-#define PyBUF_WRITE 0x200
-/* End buffer interface */
-
-
-typedef struct {
-    /* Number implementations must check *both*
-       arguments for proper type and implement the necessary conversions
-       in the slot functions themselves. */
-
-    binaryfunc nb_add;
-    binaryfunc nb_subtract;
-    binaryfunc nb_multiply;
-    binaryfunc nb_remainder;
-    binaryfunc nb_divmod;
-    ternaryfunc nb_power;
-    unaryfunc nb_negative;
-    unaryfunc nb_positive;
-    unaryfunc nb_absolute;
-    inquiry nb_bool;
-    unaryfunc nb_invert;
-    binaryfunc nb_lshift;
-    binaryfunc nb_rshift;
-    binaryfunc nb_and;
-    binaryfunc nb_xor;
-    binaryfunc nb_or;
-    unaryfunc nb_int;
-    void *nb_reserved;  /* the slot formerly known as nb_long */
-    unaryfunc nb_float;
-
-    binaryfunc nb_inplace_add;
-    binaryfunc nb_inplace_subtract;
-    binaryfunc nb_inplace_multiply;
-    binaryfunc nb_inplace_remainder;
-    ternaryfunc nb_inplace_power;
-    binaryfunc nb_inplace_lshift;
-    binaryfunc nb_inplace_rshift;
-    binaryfunc nb_inplace_and;
-    binaryfunc nb_inplace_xor;
-    binaryfunc nb_inplace_or;
-
-    binaryfunc nb_floor_divide;
-    binaryfunc nb_true_divide;
-    binaryfunc nb_inplace_floor_divide;
-    binaryfunc nb_inplace_true_divide;
-
-    unaryfunc nb_index;
-
-    binaryfunc nb_matrix_multiply;
-    binaryfunc nb_inplace_matrix_multiply;
-} PyNumberMethods;
-
-typedef struct {
-    lenfunc sq_length;
-    binaryfunc sq_concat;
-    ssizeargfunc sq_repeat;
-    ssizeargfunc sq_item;
-    void *was_sq_slice;
-    ssizeobjargproc sq_ass_item;
-    void *was_sq_ass_slice;
-    objobjproc sq_contains;
-
-    binaryfunc sq_inplace_concat;
-    ssizeargfunc sq_inplace_repeat;
-} PySequenceMethods;
-
-typedef struct {
-    lenfunc mp_length;
-    binaryfunc mp_subscript;
-    objobjargproc mp_ass_subscript;
-} PyMappingMethods;
-
-typedef struct {
-    unaryfunc am_await;
-    unaryfunc am_aiter;
-    unaryfunc am_anext;
-} PyAsyncMethods;
-
-typedef struct {
-     getbufferproc bf_getbuffer;
-     releasebufferproc bf_releasebuffer;
-} PyBufferProcs;
-
-/* Allow printfunc in the tp_vectorcall_offset slot for
- * backwards-compatibility */
-typedef Py_ssize_t printfunc;
-
-struct _typeobject {
-    PyObject_VAR_HEAD
-    const char *tp_name; /* For printing, in format "<module>.<name>" */
-    Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */
-
-    /* Methods to implement standard operations */
-
-    destructor tp_dealloc;
-    Py_ssize_t tp_vectorcall_offset;
-    getattrfunc tp_getattr;
-    setattrfunc tp_setattr;
-    PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2)
-                                    or tp_reserved (Python 3) */
-    reprfunc tp_repr;
-
-    /* Method suites for standard classes */
-
-    PyNumberMethods *tp_as_number;
-    PySequenceMethods *tp_as_sequence;
-    PyMappingMethods *tp_as_mapping;
-
-    /* More standard operations (here for binary compatibility) */
-
-    hashfunc tp_hash;
-    ternaryfunc tp_call;
-    reprfunc tp_str;
-    getattrofunc tp_getattro;
-    setattrofunc tp_setattro;
-
-    /* Functions to access object as input/output buffer */
-    PyBufferProcs *tp_as_buffer;
-
-    /* Flags to define presence of optional/expanded features */
-    unsigned long tp_flags;
-
-    const char *tp_doc; /* Documentation string */
-
-    /* Assigned meaning in release 2.0 */
-    /* call function for all accessible objects */
-    traverseproc tp_traverse;
-
-    /* delete references to contained objects */
-    inquiry tp_clear;
-
-    /* Assigned meaning in release 2.1 */
-    /* rich comparisons */
-    richcmpfunc tp_richcompare;
-
-    /* weak reference enabler */
-    Py_ssize_t tp_weaklistoffset;
-
-    /* Iterators */
-    getiterfunc tp_iter;
-    iternextfunc tp_iternext;
-
-    /* Attribute descriptor and subclassing stuff */
-    struct PyMethodDef *tp_methods;
-    struct PyMemberDef *tp_members;
-    struct PyGetSetDef *tp_getset;
-    struct _typeobject *tp_base;
-    PyObject *tp_dict;
-    descrgetfunc tp_descr_get;
-    descrsetfunc tp_descr_set;
-    Py_ssize_t tp_dictoffset;
-    initproc tp_init;
-    allocfunc tp_alloc;
-    newfunc tp_new;
-    freefunc tp_free; /* Low-level free-memory routine */
-    inquiry tp_is_gc; /* For PyObject_IS_GC */
-    PyObject *tp_bases;
-    PyObject *tp_mro; /* method resolution order */
-    PyObject *tp_cache;
-    PyObject *tp_subclasses;
-    PyObject *tp_weaklist;
-    destructor tp_del;
-
-    /* Type attribute cache version tag. Added in version 2.6 */
-    unsigned int tp_version_tag;
-
-    destructor tp_finalize;
-    vectorcallfunc tp_vectorcall;
-};
-
-/* The *real* layout of a type object when allocated on the heap */
-typedef struct _heaptypeobject {
-    /* Note: there's a dependency on the order of these members
-       in slotptr() in typeobject.c . */
-    PyTypeObject ht_type;
-    PyAsyncMethods as_async;
-    PyNumberMethods as_number;
-    PyMappingMethods as_mapping;
-    PySequenceMethods as_sequence; /* as_sequence comes after as_mapping,
-                                      so that the mapping wins when both
-                                      the mapping and the sequence define
-                                      a given operator (e.g. __getitem__).
-                                      see add_operators() in typeobject.c . */
-    PyBufferProcs as_buffer;
-    PyObject *ht_name, *ht_slots, *ht_qualname;
-    struct _dictkeysobject *ht_cached_keys;
-    PyObject *ht_module;
-    /* here are optional user slots, followed by the members. */
-} PyHeapTypeObject;
-
-/* access macro to the members which are floating "behind" the object */
-#define PyHeapType_GET_MEMBERS(etype) \
-    ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize))
-
-PyAPI_FUNC(const char *) _PyType_Name(PyTypeObject *);
-PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *);
-PyAPI_FUNC(PyObject *) _PyType_LookupId(PyTypeObject *, _Py_Identifier *);
-PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, _Py_Identifier *);
-PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *);
-PyAPI_FUNC(PyObject *) _PyType_GetDocFromInternalDoc(const char *, const char *);
-PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, const char *);
-
-struct _Py_Identifier;
-PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int);
-PyAPI_FUNC(void) _Py_BreakPoint(void);
-PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
-PyAPI_FUNC(int) _PyObject_IsFreed(PyObject *);
-
-PyAPI_FUNC(int) _PyObject_IsAbstract(PyObject *);
-PyAPI_FUNC(PyObject *) _PyObject_GetAttrId(PyObject *, struct _Py_Identifier *);
-PyAPI_FUNC(int) _PyObject_SetAttrId(PyObject *, struct _Py_Identifier *, PyObject *);
-PyAPI_FUNC(int) _PyObject_HasAttrId(PyObject *, struct _Py_Identifier *);
-/* Replacements of PyObject_GetAttr() and _PyObject_GetAttrId() which
-   don't raise AttributeError.
-
-   Return 1 and set *result != NULL if an attribute is found.
-   Return 0 and set *result == NULL if an attribute is not found;
-   an AttributeError is silenced.
-   Return -1 and set *result == NULL if an error other than AttributeError
-   is raised.
-*/
-PyAPI_FUNC(int) _PyObject_LookupAttr(PyObject *, PyObject *, PyObject **);
-PyAPI_FUNC(int) _PyObject_LookupAttrId(PyObject *, struct _Py_Identifier *, PyObject **);
-
-PyAPI_FUNC(int) _PyObject_GetMethod(PyObject *obj, PyObject *name, PyObject **method);
-
-PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *);
-PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *);
-PyAPI_FUNC(void) PyObject_CallFinalizer(PyObject *);
-PyAPI_FUNC(int) PyObject_CallFinalizerFromDealloc(PyObject *);
-
-/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes
-   dict as the last parameter. */
-PyAPI_FUNC(PyObject *)
-_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *, int);
-PyAPI_FUNC(int)
-_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *,
-                                 PyObject *, PyObject *);
-
-PyAPI_FUNC(PyObject *) _PyObject_FunctionStr(PyObject *);
-
-/* Safely decref `op` and set `op` to `op2`.
- *
- * As in case of Py_CLEAR "the obvious" code can be deadly:
- *
- *     Py_DECREF(op);
- *     op = op2;
- *
- * The safe way is:
- *
- *      Py_SETREF(op, op2);
- *
- * That arranges to set `op` to `op2` _before_ decref'ing, so that any code
- * triggered as a side-effect of `op` getting torn down no longer believes
- * `op` points to a valid object.
- *
- * Py_XSETREF is a variant of Py_SETREF that uses Py_XDECREF instead of
- * Py_DECREF.
- */
-
-#define Py_SETREF(op, op2)                      \
-    do {                                        \
-        PyObject *_py_tmp = _PyObject_CAST(op); \
-        (op) = (op2);                           \
-        Py_DECREF(_py_tmp);                     \
-    } while (0)
-
-#define Py_XSETREF(op, op2)                     \
-    do {                                        \
-        PyObject *_py_tmp = _PyObject_CAST(op); \
-        (op) = (op2);                           \
-        Py_XDECREF(_py_tmp);                    \
-    } while (0)
-
-
-PyAPI_DATA(PyTypeObject) _PyNone_Type;
-PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type;
-
-/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE.
- * Defined in object.c.
- */
-PyAPI_DATA(int) _Py_SwappedOp[];
-
-PyAPI_FUNC(void)
-_PyDebugAllocatorStats(FILE *out, const char *block_name, int num_blocks,
-                       size_t sizeof_block);
-PyAPI_FUNC(void)
-_PyObject_DebugTypeStats(FILE *out);
-
-/* Define a pair of assertion macros:
-   _PyObject_ASSERT_FROM(), _PyObject_ASSERT_WITH_MSG() and _PyObject_ASSERT().
-
-   These work like the regular C assert(), in that they will abort the
-   process with a message on stderr if the given condition fails to hold,
-   but compile away to nothing if NDEBUG is defined.
-
-   However, before aborting, Python will also try to call _PyObject_Dump() on
-   the given object.  This may be of use when investigating bugs in which a
-   particular object is corrupt (e.g. buggy a tp_visit method in an extension
-   module breaking the garbage collector), to help locate the broken objects.
-
-   The WITH_MSG variant allows you to supply an additional message that Python
-   will attempt to print to stderr, after the object dump. */
-#ifdef NDEBUG
-   /* No debugging: compile away the assertions: */
-#  define _PyObject_ASSERT_FROM(obj, expr, msg, filename, lineno, func) \
-    ((void)0)
-#else
-   /* With debugging: generate checks: */
-#  define _PyObject_ASSERT_FROM(obj, expr, msg, filename, lineno, func) \
-    ((expr) \
-      ? (void)(0) \
-      : _PyObject_AssertFailed((obj), Py_STRINGIFY(expr), \
-                               (msg), (filename), (lineno), (func)))
-#endif
-
-#define _PyObject_ASSERT_WITH_MSG(obj, expr, msg) \
-    _PyObject_ASSERT_FROM(obj, expr, msg, __FILE__, __LINE__, __func__)
-#define _PyObject_ASSERT(obj, expr) \
-    _PyObject_ASSERT_WITH_MSG(obj, expr, NULL)
-
-#define _PyObject_ASSERT_FAILED_MSG(obj, msg) \
-    _PyObject_AssertFailed((obj), NULL, (msg), __FILE__, __LINE__, __func__)
-
-/* Declare and define _PyObject_AssertFailed() even when NDEBUG is defined,
-   to avoid causing compiler/linker errors when building extensions without
-   NDEBUG against a Python built with NDEBUG defined.
-
-   msg, expr and function can be NULL. */
-PyAPI_FUNC(void) _Py_NO_RETURN _PyObject_AssertFailed(
-    PyObject *obj,
-    const char *expr,
-    const char *msg,
-    const char *file,
-    int line,
-    const char *function);
-
-/* Check if an object is consistent. For example, ensure that the reference
-   counter is greater than or equal to 1, and ensure that ob_type is not NULL.
-
-   Call _PyObject_AssertFailed() if the object is inconsistent.
-
-   If check_content is zero, only check header fields: reduce the overhead.
-
-   The function always return 1. The return value is just here to be able to
-   write:
-
-   assert(_PyObject_CheckConsistency(obj, 1)); */
-PyAPI_FUNC(int) _PyObject_CheckConsistency(
-    PyObject *op,
-    int check_content);
-
-
-/* Trashcan mechanism, thanks to Christian Tismer.
-
-When deallocating a container object, it's possible to trigger an unbounded
-chain of deallocations, as each Py_DECREF in turn drops the refcount on "the
-next" object in the chain to 0.  This can easily lead to stack overflows,
-especially in threads (which typically have less stack space to work with).
-
-A container object can avoid this by bracketing the body of its tp_dealloc
-function with a pair of macros:
-
-static void
-mytype_dealloc(mytype *p)
-{
-    ... declarations go here ...
-
-    PyObject_GC_UnTrack(p);        // must untrack first
-    Py_TRASHCAN_BEGIN(p, mytype_dealloc)
-    ... The body of the deallocator goes here, including all calls ...
-    ... to Py_DECREF on contained objects.                         ...
-    Py_TRASHCAN_END                // there should be no code after this
-}
-
-CAUTION:  Never return from the middle of the body!  If the body needs to
-"get out early", put a label immediately before the Py_TRASHCAN_END
-call, and goto it.  Else the call-depth counter (see below) will stay
-above 0 forever, and the trashcan will never get emptied.
-
-How it works:  The BEGIN macro increments a call-depth counter.  So long
-as this counter is small, the body of the deallocator is run directly without
-further ado.  But if the counter gets large, it instead adds p to a list of
-objects to be deallocated later, skips the body of the deallocator, and
-resumes execution after the END macro.  The tp_dealloc routine then returns
-without deallocating anything (and so unbounded call-stack depth is avoided).
-
-When the call stack finishes unwinding again, code generated by the END macro
-notices this, and calls another routine to deallocate all the objects that
-may have been added to the list of deferred deallocations.  In effect, a
-chain of N deallocations is broken into (N-1)/(PyTrash_UNWIND_LEVEL-1) pieces,
-with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL.
-
-Since the tp_dealloc of a subclass typically calls the tp_dealloc of the base
-class, we need to ensure that the trashcan is only triggered on the tp_dealloc
-of the actual class being deallocated. Otherwise we might end up with a
-partially-deallocated object. To check this, the tp_dealloc function must be
-passed as second argument to Py_TRASHCAN_BEGIN().
-*/
-
-/* This is the old private API, invoked by the macros before 3.2.4.
-   Kept for binary compatibility of extensions using the stable ABI. */
-PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
-PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
-
-/* This is the old private API, invoked by the macros before 3.9.
-   Kept for binary compatibility of extensions using the stable ABI. */
-PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*);
-PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
-
-/* Forward declarations for PyThreadState */
-struct _ts;
-
-/* Python 3.9 private API, invoked by the macros below. */
-PyAPI_FUNC(int) _PyTrash_begin(struct _ts *tstate, PyObject *op);
-PyAPI_FUNC(void) _PyTrash_end(struct _ts *tstate);
-
-#define PyTrash_UNWIND_LEVEL 50
-
-#define Py_TRASHCAN_BEGIN_CONDITION(op, cond) \
-    do { \
-        PyThreadState *_tstate = NULL; \
-        /* If "cond" is false, then _tstate remains NULL and the deallocator \
-         * is run normally without involving the trashcan */ \
-        if (cond) { \
-            _tstate = PyThreadState_GET(); \
-            if (_PyTrash_begin(_tstate, _PyObject_CAST(op))) { \
-                break; \
-            } \
-        }
-        /* The body of the deallocator is here. */
-#define Py_TRASHCAN_END \
-        if (_tstate) { \
-            _PyTrash_end(_tstate); \
-        } \
-    } while (0);
-
-#define Py_TRASHCAN_BEGIN(op, dealloc) \
-    Py_TRASHCAN_BEGIN_CONDITION(op, \
-        Py_TYPE(op)->tp_dealloc == (destructor)(dealloc))
-
-/* For backwards compatibility, these macros enable the trashcan
- * unconditionally */
-#define Py_TRASHCAN_SAFE_BEGIN(op) Py_TRASHCAN_BEGIN_CONDITION(op, 1)
-#define Py_TRASHCAN_SAFE_END(op) Py_TRASHCAN_END
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/objimpl.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/objimpl.h
deleted file mode 100644
index b835936db..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/objimpl.h
+++ /dev/null
@@ -1,145 +0,0 @@
-#ifndef Py_CPYTHON_OBJIMPL_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize )
-
-/* _PyObject_VAR_SIZE returns the number of bytes (as size_t) allocated for a
-   vrbl-size object with nitems items, exclusive of gc overhead (if any).  The
-   value is rounded up to the closest multiple of sizeof(void *), in order to
-   ensure that pointer fields at the end of the object are correctly aligned
-   for the platform (this is of special importance for subclasses of, e.g.,
-   str or int, so that pointers can be stored after the embedded data).
-
-   Note that there's no memory wastage in doing this, as malloc has to
-   return (at worst) pointer-aligned memory anyway.
-*/
-#if ((SIZEOF_VOID_P - 1) & SIZEOF_VOID_P) != 0
-#   error "_PyObject_VAR_SIZE requires SIZEOF_VOID_P be a power of 2"
-#endif
-
-#define _PyObject_VAR_SIZE(typeobj, nitems)     \
-    _Py_SIZE_ROUND_UP((typeobj)->tp_basicsize + \
-        (nitems)*(typeobj)->tp_itemsize,        \
-        SIZEOF_VOID_P)
-
-
-/* This example code implements an object constructor with a custom
-   allocator, where PyObject_New is inlined, and shows the important
-   distinction between two steps (at least):
-       1) the actual allocation of the object storage;
-       2) the initialization of the Python specific fields
-      in this storage with PyObject_{Init, InitVar}.
-
-   PyObject *
-   YourObject_New(...)
-   {
-       PyObject *op;
-
-       op = (PyObject *) Your_Allocator(_PyObject_SIZE(YourTypeStruct));
-       if (op == NULL)
-       return PyErr_NoMemory();
-
-       PyObject_Init(op, &YourTypeStruct);
-
-       op->ob_field = value;
-       ...
-       return op;
-   }
-
-   Note that in C++, the use of the new operator usually implies that
-   the 1st step is performed automatically for you, so in a C++ class
-   constructor you would start directly with PyObject_Init/InitVar. */
-
-
-/* Inline functions trading binary compatibility for speed:
-   PyObject_INIT() is the fast version of PyObject_Init(), and
-   PyObject_INIT_VAR() is the fast version of PyObject_InitVar().
-
-   These inline functions must not be called with op=NULL. */
-static inline PyObject*
-_PyObject_INIT(PyObject *op, PyTypeObject *typeobj)
-{
-    assert(op != NULL);
-    Py_SET_TYPE(op, typeobj);
-    if (PyType_GetFlags(typeobj) & Py_TPFLAGS_HEAPTYPE) {
-        Py_INCREF(typeobj);
-    }
-    _Py_NewReference(op);
-    return op;
-}
-
-#define PyObject_INIT(op, typeobj) \
-    _PyObject_INIT(_PyObject_CAST(op), (typeobj))
-
-static inline PyVarObject*
-_PyObject_INIT_VAR(PyVarObject *op, PyTypeObject *typeobj, Py_ssize_t size)
-{
-    assert(op != NULL);
-    Py_SET_SIZE(op, size);
-    PyObject_INIT((PyObject *)op, typeobj);
-    return op;
-}
-
-#define PyObject_INIT_VAR(op, typeobj, size) \
-    _PyObject_INIT_VAR(_PyVarObject_CAST(op), (typeobj), (size))
-
-
-/* This function returns the number of allocated memory blocks, regardless of size */
-PyAPI_FUNC(Py_ssize_t) _Py_GetAllocatedBlocks(void);
-
-/* Macros */
-#ifdef WITH_PYMALLOC
-PyAPI_FUNC(int) _PyObject_DebugMallocStats(FILE *out);
-#endif
-
-
-typedef struct {
-    /* user context passed as the first argument to the 2 functions */
-    void *ctx;
-
-    /* allocate an arena of size bytes */
-    void* (*alloc) (void *ctx, size_t size);
-
-    /* free an arena */
-    void (*free) (void *ctx, void *ptr, size_t size);
-} PyObjectArenaAllocator;
-
-/* Get the arena allocator. */
-PyAPI_FUNC(void) PyObject_GetArenaAllocator(PyObjectArenaAllocator *allocator);
-
-/* Set the arena allocator. */
-PyAPI_FUNC(void) PyObject_SetArenaAllocator(PyObjectArenaAllocator *allocator);
-
-
-PyAPI_FUNC(Py_ssize_t) _PyGC_CollectNoFail(void);
-PyAPI_FUNC(Py_ssize_t) _PyGC_CollectIfEnabled(void);
-
-
-/* Test if an object implements the garbage collector protocol */
-PyAPI_FUNC(int) PyObject_IS_GC(PyObject *obj);
-
-
-/* Code built with Py_BUILD_CORE must include pycore_gc.h instead which
-   defines a different _PyGC_FINALIZED() macro. */
-#ifndef Py_BUILD_CORE
-   // Kept for backward compatibility with Python 3.8
-#  define _PyGC_FINALIZED(o) PyObject_GC_IsFinalized(o)
-#endif
-
-PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t size);
-PyAPI_FUNC(PyObject *) _PyObject_GC_Calloc(size_t size);
-
-
-/* Test if a type supports weak references */
-#define PyType_SUPPORTS_WEAKREFS(t) ((t)->tp_weaklistoffset > 0)
-
-PyAPI_FUNC(PyObject **) PyObject_GET_WEAKREFS_LISTPTR(PyObject *op);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pyerrors.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pyerrors.h
deleted file mode 100644
index 9c87b5397..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pyerrors.h
+++ /dev/null
@@ -1,200 +0,0 @@
-#ifndef Py_CPYTHON_ERRORS_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Error objects */
-
-/* PyException_HEAD defines the initial segment of every exception class. */
-#define PyException_HEAD PyObject_HEAD PyObject *dict;\
-             PyObject *args; PyObject *traceback;\
-             PyObject *context; PyObject *cause;\
-             char suppress_context;
-
-typedef struct {
-    PyException_HEAD
-} PyBaseExceptionObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *msg;
-    PyObject *filename;
-    PyObject *lineno;
-    PyObject *offset;
-    PyObject *text;
-    PyObject *print_file_and_line;
-} PySyntaxErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *msg;
-    PyObject *name;
-    PyObject *path;
-} PyImportErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *encoding;
-    PyObject *object;
-    Py_ssize_t start;
-    Py_ssize_t end;
-    PyObject *reason;
-} PyUnicodeErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *code;
-} PySystemExitObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *myerrno;
-    PyObject *strerror;
-    PyObject *filename;
-    PyObject *filename2;
-#ifdef MS_WINDOWS
-    PyObject *winerror;
-#endif
-    Py_ssize_t written;   /* only for BlockingIOError, -1 otherwise */
-} PyOSErrorObject;
-
-typedef struct {
-    PyException_HEAD
-    PyObject *value;
-} PyStopIterationObject;
-
-/* Compatibility typedefs */
-typedef PyOSErrorObject PyEnvironmentErrorObject;
-#ifdef MS_WINDOWS
-typedef PyOSErrorObject PyWindowsErrorObject;
-#endif
-
-/* Error handling definitions */
-
-PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *);
-PyAPI_FUNC(_PyErr_StackItem*) _PyErr_GetTopmostException(PyThreadState *tstate);
-PyAPI_FUNC(void) _PyErr_GetExcInfo(PyThreadState *, PyObject **, PyObject **, PyObject **);
-
-/* Context manipulation (PEP 3134) */
-
-PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *);
-
-/* */
-
-#define PyExceptionClass_Name(x)  (((PyTypeObject*)(x))->tp_name)
-
-/* Convenience functions */
-
-#ifdef MS_WINDOWS
-Py_DEPRECATED(3.3)
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename(
-    PyObject *, const Py_UNICODE *);
-#endif /* MS_WINDOWS */
-
-/* Like PyErr_Format(), but saves current exception as __context__ and
-   __cause__.
- */
-PyAPI_FUNC(PyObject *) _PyErr_FormatFromCause(
-    PyObject *exception,
-    const char *format,   /* ASCII-encoded string  */
-    ...
-    );
-
-#ifdef MS_WINDOWS
-/* XXX redeclare to use WSTRING */
-Py_DEPRECATED(3.3)
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename(
-    int, const Py_UNICODE *);
-Py_DEPRECATED(3.3)
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename(
-    PyObject *,int, const Py_UNICODE *);
-#endif
-
-/* In exceptions.c */
-
-/* Helper that attempts to replace the current exception with one of the
- * same type but with a prefix added to the exception text. The resulting
- * exception description looks like:
- *
- *     prefix (exc_type: original_exc_str)
- *
- * Only some exceptions can be safely replaced. If the function determines
- * it isn't safe to perform the replacement, it will leave the original
- * unmodified exception in place.
- *
- * Returns a borrowed reference to the new exception (if any), NULL if the
- * existing exception was left in place.
- */
-PyAPI_FUNC(PyObject *) _PyErr_TrySetFromCause(
-    const char *prefix_format,   /* ASCII-encoded string  */
-    ...
-    );
-
-/* In signalmodule.c */
-
-int PySignal_SetWakeupFd(int fd);
-PyAPI_FUNC(int) _PyErr_CheckSignals(void);
-
-/* Support for adding program text to SyntaxErrors */
-
-PyAPI_FUNC(void) PyErr_SyntaxLocationObject(
-    PyObject *filename,
-    int lineno,
-    int col_offset);
-
-PyAPI_FUNC(PyObject *) PyErr_ProgramTextObject(
-    PyObject *filename,
-    int lineno);
-
-/* Create a UnicodeEncodeError object.
- *
- * TODO: This API will be removed in Python 3.11.
- */
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create(
-    const char *encoding,       /* UTF-8 encoded string */
-    const Py_UNICODE *object,
-    Py_ssize_t length,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-
-/* Create a UnicodeTranslateError object.
- *
- * TODO: This API will be removed in Python 3.11.
- */
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create(
-    const Py_UNICODE *object,
-    Py_ssize_t length,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) _PyUnicodeTranslateError_Create(
-    PyObject *object,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-
-PyAPI_FUNC(void) _PyErr_WriteUnraisableMsg(
-    const char *err_msg,
-    PyObject *obj);
-
-PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalErrorFunc(
-    const char *func,
-    const char *message);
-
-PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalErrorFormat(
-    const char *func,
-    const char *format,
-    ...);
-
-#define Py_FatalError(message) _Py_FatalErrorFunc(__func__, message)
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pylifecycle.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pylifecycle.h
deleted file mode 100644
index eb523b82e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pylifecycle.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef Py_CPYTHON_PYLIFECYCLE_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Only used by applications that embed the interpreter and need to
- * override the standard encoding determination mechanism
- */
-PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding,
-                                             const char *errors);
-
-/* PEP 432 Multi-phase initialization API (Private while provisional!) */
-
-PyAPI_FUNC(PyStatus) Py_PreInitialize(
-    const PyPreConfig *src_config);
-PyAPI_FUNC(PyStatus) Py_PreInitializeFromBytesArgs(
-    const PyPreConfig *src_config,
-    Py_ssize_t argc,
-    char **argv);
-PyAPI_FUNC(PyStatus) Py_PreInitializeFromArgs(
-    const PyPreConfig *src_config,
-    Py_ssize_t argc,
-    wchar_t **argv);
-
-PyAPI_FUNC(int) _Py_IsCoreInitialized(void);
-
-
-/* Initialization and finalization */
-
-PyAPI_FUNC(PyStatus) Py_InitializeFromConfig(
-    const PyConfig *config);
-PyAPI_FUNC(PyStatus) _Py_InitializeMain(void);
-
-PyAPI_FUNC(int) Py_RunMain(void);
-
-
-PyAPI_FUNC(void) _Py_NO_RETURN Py_ExitStatusException(PyStatus err);
-
-/* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level
- * exit functions.
- */
-PyAPI_FUNC(void) _Py_PyAtExit(void (*func)(PyObject *), PyObject *);
-
-/* Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. */
-PyAPI_FUNC(void) _Py_RestoreSignals(void);
-
-PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *);
-
-PyAPI_FUNC(void) _Py_SetProgramFullPath(const wchar_t *);
-
-PyAPI_FUNC(const char *) _Py_gitidentifier(void);
-PyAPI_FUNC(const char *) _Py_gitversion(void);
-
-PyAPI_FUNC(int) _Py_IsFinalizing(void);
-
-/* Random */
-PyAPI_FUNC(int) _PyOS_URandom(void *buffer, Py_ssize_t size);
-PyAPI_FUNC(int) _PyOS_URandomNonblock(void *buffer, Py_ssize_t size);
-
-/* Legacy locale support */
-PyAPI_FUNC(int) _Py_CoerceLegacyLocale(int warn);
-PyAPI_FUNC(int) _Py_LegacyLocaleDetected(int warn);
-PyAPI_FUNC(char *) _Py_SetLocaleFromEnv(int category);
-
-PyAPI_FUNC(PyThreadState *) _Py_NewInterpreter(int isolated_subinterpreter);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pymem.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pymem.h
deleted file mode 100644
index 79f063b12..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pymem.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef Py_CPYTHON_PYMEM_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(void *) PyMem_RawMalloc(size_t size);
-PyAPI_FUNC(void *) PyMem_RawCalloc(size_t nelem, size_t elsize);
-PyAPI_FUNC(void *) PyMem_RawRealloc(void *ptr, size_t new_size);
-PyAPI_FUNC(void) PyMem_RawFree(void *ptr);
-
-/* Try to get the allocators name set by _PyMem_SetupAllocators(). */
-PyAPI_FUNC(const char*) _PyMem_GetCurrentAllocatorName(void);
-
-PyAPI_FUNC(void *) PyMem_Calloc(size_t nelem, size_t elsize);
-
-/* strdup() using PyMem_RawMalloc() */
-PyAPI_FUNC(char *) _PyMem_RawStrdup(const char *str);
-
-/* strdup() using PyMem_Malloc() */
-PyAPI_FUNC(char *) _PyMem_Strdup(const char *str);
-
-/* wcsdup() using PyMem_RawMalloc() */
-PyAPI_FUNC(wchar_t*) _PyMem_RawWcsdup(const wchar_t *str);
-
-
-typedef enum {
-    /* PyMem_RawMalloc(), PyMem_RawRealloc() and PyMem_RawFree() */
-    PYMEM_DOMAIN_RAW,
-
-    /* PyMem_Malloc(), PyMem_Realloc() and PyMem_Free() */
-    PYMEM_DOMAIN_MEM,
-
-    /* PyObject_Malloc(), PyObject_Realloc() and PyObject_Free() */
-    PYMEM_DOMAIN_OBJ
-} PyMemAllocatorDomain;
-
-typedef enum {
-    PYMEM_ALLOCATOR_NOT_SET = 0,
-    PYMEM_ALLOCATOR_DEFAULT = 1,
-    PYMEM_ALLOCATOR_DEBUG = 2,
-    PYMEM_ALLOCATOR_MALLOC = 3,
-    PYMEM_ALLOCATOR_MALLOC_DEBUG = 4,
-#ifdef WITH_PYMALLOC
-    PYMEM_ALLOCATOR_PYMALLOC = 5,
-    PYMEM_ALLOCATOR_PYMALLOC_DEBUG = 6,
-#endif
-} PyMemAllocatorName;
-
-
-typedef struct {
-    /* user context passed as the first argument to the 4 functions */
-    void *ctx;
-
-    /* allocate a memory block */
-    void* (*malloc) (void *ctx, size_t size);
-
-    /* allocate a memory block initialized by zeros */
-    void* (*calloc) (void *ctx, size_t nelem, size_t elsize);
-
-    /* allocate or resize a memory block */
-    void* (*realloc) (void *ctx, void *ptr, size_t new_size);
-
-    /* release a memory block */
-    void (*free) (void *ctx, void *ptr);
-} PyMemAllocatorEx;
-
-/* Get the memory block allocator of the specified domain. */
-PyAPI_FUNC(void) PyMem_GetAllocator(PyMemAllocatorDomain domain,
-                                    PyMemAllocatorEx *allocator);
-
-/* Set the memory block allocator of the specified domain.
-
-   The new allocator must return a distinct non-NULL pointer when requesting
-   zero bytes.
-
-   For the PYMEM_DOMAIN_RAW domain, the allocator must be thread-safe: the GIL
-   is not held when the allocator is called.
-
-   If the new allocator is not a hook (don't call the previous allocator), the
-   PyMem_SetupDebugHooks() function must be called to reinstall the debug hooks
-   on top on the new allocator. */
-PyAPI_FUNC(void) PyMem_SetAllocator(PyMemAllocatorDomain domain,
-                                    PyMemAllocatorEx *allocator);
-
-/* Setup hooks to detect bugs in the following Python memory allocator
-   functions:
-
-   - PyMem_RawMalloc(), PyMem_RawRealloc(), PyMem_RawFree()
-   - PyMem_Malloc(), PyMem_Realloc(), PyMem_Free()
-   - PyObject_Malloc(), PyObject_Realloc() and PyObject_Free()
-
-   Newly allocated memory is filled with the byte 0xCB, freed memory is filled
-   with the byte 0xDB. Additional checks:
-
-   - detect API violations, ex: PyObject_Free() called on a buffer allocated
-     by PyMem_Malloc()
-   - detect write before the start of the buffer (buffer underflow)
-   - detect write after the end of the buffer (buffer overflow)
-
-   The function does nothing if Python is not compiled is debug mode. */
-PyAPI_FUNC(void) PyMem_SetupDebugHooks(void);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pystate.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pystate.h
deleted file mode 100644
index f292da1d3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/pystate.h
+++ /dev/null
@@ -1,263 +0,0 @@
-#ifndef Py_CPYTHON_PYSTATE_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "cpython/initconfig.h"
-
-PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *);
-PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int);
-
-PyAPI_FUNC(PyObject *) _PyInterpreterState_GetMainModule(PyInterpreterState *);
-
-/* State unique per thread */
-
-/* Py_tracefunc return -1 when raising an exception, or 0 for success. */
-typedef int (*Py_tracefunc)(PyObject *, PyFrameObject *, int, PyObject *);
-
-/* The following values are used for 'what' for tracefunc functions
- *
- * To add a new kind of trace event, also update "trace_init" in
- * Python/sysmodule.c to define the Python level event name
- */
-#define PyTrace_CALL 0
-#define PyTrace_EXCEPTION 1
-#define PyTrace_LINE 2
-#define PyTrace_RETURN 3
-#define PyTrace_C_CALL 4
-#define PyTrace_C_EXCEPTION 5
-#define PyTrace_C_RETURN 6
-#define PyTrace_OPCODE 7
-
-
-typedef struct _err_stackitem {
-    /* This struct represents an entry on the exception stack, which is a
-     * per-coroutine state. (Coroutine in the computer science sense,
-     * including the thread and generators).
-     * This ensures that the exception state is not impacted by "yields"
-     * from an except handler.
-     */
-    PyObject *exc_type, *exc_value, *exc_traceback;
-
-    struct _err_stackitem *previous_item;
-
-} _PyErr_StackItem;
-
-
-// The PyThreadState typedef is in Include/pystate.h.
-struct _ts {
-    /* See Python/ceval.c for comments explaining most fields */
-
-    struct _ts *prev;
-    struct _ts *next;
-    PyInterpreterState *interp;
-
-    /* Borrowed reference to the current frame (it can be NULL) */
-    PyFrameObject *frame;
-    int recursion_depth;
-    char overflowed; /* The stack has overflowed. Allow 50 more calls
-                        to handle the runtime error. */
-    char recursion_critical; /* The current calls must not cause
-                                a stack overflow. */
-    int stackcheck_counter;
-
-    /* 'tracing' keeps track of the execution depth when tracing/profiling.
-       This is to prevent the actual trace/profile code from being recorded in
-       the trace/profile. */
-    int tracing;
-    int use_tracing;
-
-    Py_tracefunc c_profilefunc;
-    Py_tracefunc c_tracefunc;
-    PyObject *c_profileobj;
-    PyObject *c_traceobj;
-
-    /* The exception currently being raised */
-    PyObject *curexc_type;
-    PyObject *curexc_value;
-    PyObject *curexc_traceback;
-
-    /* The exception currently being handled, if no coroutines/generators
-     * are present. Always last element on the stack referred to be exc_info.
-     */
-    _PyErr_StackItem exc_state;
-
-    /* Pointer to the top of the stack of the exceptions currently
-     * being handled */
-    _PyErr_StackItem *exc_info;
-
-    PyObject *dict;  /* Stores per-thread state */
-
-    int gilstate_counter;
-
-    PyObject *async_exc; /* Asynchronous exception to raise */
-    unsigned long thread_id; /* Thread id where this tstate was created */
-
-    int trash_delete_nesting;
-    PyObject *trash_delete_later;
-
-    /* Called when a thread state is deleted normally, but not when it
-     * is destroyed after fork().
-     * Pain:  to prevent rare but fatal shutdown errors (issue 18808),
-     * Thread.join() must wait for the join'ed thread's tstate to be unlinked
-     * from the tstate chain.  That happens at the end of a thread's life,
-     * in pystate.c.
-     * The obvious way doesn't quite work:  create a lock which the tstate
-     * unlinking code releases, and have Thread.join() wait to acquire that
-     * lock.  The problem is that we _are_ at the end of the thread's life:
-     * if the thread holds the last reference to the lock, decref'ing the
-     * lock will delete the lock, and that may trigger arbitrary Python code
-     * if there's a weakref, with a callback, to the lock.  But by this time
-     * _PyRuntime.gilstate.tstate_current is already NULL, so only the simplest
-     * of C code can be allowed to run (in particular it must not be possible to
-     * release the GIL).
-     * So instead of holding the lock directly, the tstate holds a weakref to
-     * the lock:  that's the value of on_delete_data below.  Decref'ing a
-     * weakref is harmless.
-     * on_delete points to _threadmodule.c's static release_sentinel() function.
-     * After the tstate is unlinked, release_sentinel is called with the
-     * weakref-to-lock (on_delete_data) argument, and release_sentinel releases
-     * the indirectly held lock.
-     */
-    void (*on_delete)(void *);
-    void *on_delete_data;
-
-    int coroutine_origin_tracking_depth;
-
-    PyObject *async_gen_firstiter;
-    PyObject *async_gen_finalizer;
-
-    PyObject *context;
-    uint64_t context_ver;
-
-    /* Unique thread state id. */
-    uint64_t id;
-
-    /* XXX signal handlers should also be here */
-
-};
-
-// Alias for backward compatibility with Python 3.8
-#define _PyInterpreterState_Get PyInterpreterState_Get
-
-PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
-
-/* Similar to PyThreadState_Get(), but don't issue a fatal error
- * if it is NULL. */
-PyAPI_FUNC(PyThreadState *) _PyThreadState_UncheckedGet(void);
-
-PyAPI_FUNC(PyObject *) _PyThreadState_GetDict(PyThreadState *tstate);
-
-/* PyGILState */
-
-/* Helper/diagnostic function - return 1 if the current thread
-   currently holds the GIL, 0 otherwise.
-
-   The function returns 1 if _PyGILState_check_enabled is non-zero. */
-PyAPI_FUNC(int) PyGILState_Check(void);
-
-/* Get the single PyInterpreterState used by this process' GILState
-   implementation.
-
-   This function doesn't check for error. Return NULL before _PyGILState_Init()
-   is called and after _PyGILState_Fini() is called.
-
-   See also _PyInterpreterState_Get() and _PyInterpreterState_GET(). */
-PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void);
-
-/* The implementation of sys._current_frames()  Returns a dict mapping
-   thread id to that thread's current frame.
-*/
-PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void);
-
-/* Routines for advanced debuggers, requested by David Beazley.
-   Don't use unless you know what you are doing! */
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Main(void);
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void);
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *);
-PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *);
-PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
-
-/* Frame evaluation API */
-
-typedef PyObject* (*_PyFrameEvalFunction)(PyThreadState *tstate, PyFrameObject *, int);
-
-PyAPI_FUNC(_PyFrameEvalFunction) _PyInterpreterState_GetEvalFrameFunc(
-    PyInterpreterState *interp);
-PyAPI_FUNC(void) _PyInterpreterState_SetEvalFrameFunc(
-    PyInterpreterState *interp,
-    _PyFrameEvalFunction eval_frame);
-
-PyAPI_FUNC(const PyConfig*) _PyInterpreterState_GetConfig(PyInterpreterState *interp);
-
-// Get the configuration of the currrent interpreter.
-// The caller must hold the GIL.
-PyAPI_FUNC(const PyConfig*) _Py_GetConfig(void);
-
-
-/* cross-interpreter data */
-
-struct _xid;
-
-// _PyCrossInterpreterData is similar to Py_buffer as an effectively
-// opaque struct that holds data outside the object machinery.  This
-// is necessary to pass safely between interpreters in the same process.
-typedef struct _xid {
-    // data is the cross-interpreter-safe derivation of a Python object
-    // (see _PyObject_GetCrossInterpreterData).  It will be NULL if the
-    // new_object func (below) encodes the data.
-    void *data;
-    // obj is the Python object from which the data was derived.  This
-    // is non-NULL only if the data remains bound to the object in some
-    // way, such that the object must be "released" (via a decref) when
-    // the data is released.  In that case the code that sets the field,
-    // likely a registered "crossinterpdatafunc", is responsible for
-    // ensuring it owns the reference (i.e. incref).
-    PyObject *obj;
-    // interp is the ID of the owning interpreter of the original
-    // object.  It corresponds to the active interpreter when
-    // _PyObject_GetCrossInterpreterData() was called.  This should only
-    // be set by the cross-interpreter machinery.
-    //
-    // We use the ID rather than the PyInterpreterState to avoid issues
-    // with deleted interpreters.  Note that IDs are never re-used, so
-    // each one will always correspond to a specific interpreter
-    // (whether still alive or not).
-    int64_t interp;
-    // new_object is a function that returns a new object in the current
-    // interpreter given the data.  The resulting object (a new
-    // reference) will be equivalent to the original object.  This field
-    // is required.
-    PyObject *(*new_object)(struct _xid *);
-    // free is called when the data is released.  If it is NULL then
-    // nothing will be done to free the data.  For some types this is
-    // okay (e.g. bytes) and for those types this field should be set
-    // to NULL.  However, for most the data was allocated just for
-    // cross-interpreter use, so it must be freed when
-    // _PyCrossInterpreterData_Release is called or the memory will
-    // leak.  In that case, at the very least this field should be set
-    // to PyMem_RawFree (the default if not explicitly set to NULL).
-    // The call will happen with the original interpreter activated.
-    void (*free)(void *);
-} _PyCrossInterpreterData;
-
-PyAPI_FUNC(int) _PyObject_GetCrossInterpreterData(PyObject *, _PyCrossInterpreterData *);
-PyAPI_FUNC(PyObject *) _PyCrossInterpreterData_NewObject(_PyCrossInterpreterData *);
-PyAPI_FUNC(void) _PyCrossInterpreterData_Release(_PyCrossInterpreterData *);
-
-PyAPI_FUNC(int) _PyObject_CheckCrossInterpreterData(PyObject *);
-
-/* cross-interpreter data registry */
-
-typedef int (*crossinterpdatafunc)(PyObject *, struct _xid *);
-
-PyAPI_FUNC(int) _PyCrossInterpreterData_RegisterClass(PyTypeObject *, crossinterpdatafunc);
-PyAPI_FUNC(crossinterpdatafunc) _PyCrossInterpreterData_Lookup(PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/sysmodule.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/sysmodule.h
deleted file mode 100644
index 1802b5b30..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/sysmodule.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef Py_CPYTHON_SYSMODULE_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key);
-PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *);
-
-PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *);
-
-typedef int(*Py_AuditHookFunction)(const char *, PyObject *, void *);
-
-PyAPI_FUNC(int) PySys_Audit(
-    const char *event,
-    const char *argFormat,
-    ...);
-PyAPI_FUNC(int) PySys_AddAuditHook(Py_AuditHookFunction, void*);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/traceback.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/traceback.h
deleted file mode 100644
index 837470c3b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/traceback.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef Py_CPYTHON_TRACEBACK_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _traceback {
-    PyObject_HEAD
-    struct _traceback *tb_next;
-    PyFrameObject *tb_frame;
-    int tb_lasti;
-    int tb_lineno;
-} PyTracebackObject;
-
-PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, PyObject *, int, int);
-PyAPI_FUNC(void) _PyTraceback_Add(const char *, const char *, int);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/tupleobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/tupleobject.h
deleted file mode 100644
index 1565f2a5c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/tupleobject.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef Py_CPYTHON_TUPLEOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    PyObject_VAR_HEAD
-    /* ob_item contains space for 'ob_size' elements.
-       Items must normally not be NULL, except during construction when
-       the tuple is not yet visible outside the function that builds it. */
-    PyObject *ob_item[1];
-} PyTupleObject;
-
-PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t);
-PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
-
-/* Macros trading safety for speed */
-
-/* Cast argument to PyTupleObject* type. */
-#define _PyTuple_CAST(op) (assert(PyTuple_Check(op)), (PyTupleObject *)(op))
-
-#define PyTuple_GET_SIZE(op)    Py_SIZE(_PyTuple_CAST(op))
-
-#define PyTuple_GET_ITEM(op, i) (_PyTuple_CAST(op)->ob_item[i])
-
-/* Macro, *only* to be used to fill in brand new tuples */
-#define PyTuple_SET_ITEM(op, i, v) (_PyTuple_CAST(op)->ob_item[i] = v)
-
-PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/unicodeobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/unicodeobject.h
deleted file mode 100644
index 17db79cff..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/cpython/unicodeobject.h
+++ /dev/null
@@ -1,1221 +0,0 @@
-#ifndef Py_CPYTHON_UNICODEOBJECT_H
-#  error "this header file must not be included directly"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Py_UNICODE was the native Unicode storage format (code unit) used by
-   Python and represents a single Unicode element in the Unicode type.
-   With PEP 393, Py_UNICODE is deprecated and replaced with a
-   typedef to wchar_t. */
-#define PY_UNICODE_TYPE wchar_t
-/* Py_DEPRECATED(3.3) */ typedef wchar_t Py_UNICODE;
-
-/* --- Internal Unicode Operations ---------------------------------------- */
-
-/* Since splitting on whitespace is an important use case, and
-   whitespace in most situations is solely ASCII whitespace, we
-   optimize for the common case by using a quick look-up table
-   _Py_ascii_whitespace (see below) with an inlined check.
-
- */
-#define Py_UNICODE_ISSPACE(ch) \
-    ((Py_UCS4)(ch) < 128U ? _Py_ascii_whitespace[(ch)] : _PyUnicode_IsWhitespace(ch))
-
-#define Py_UNICODE_ISLOWER(ch) _PyUnicode_IsLowercase(ch)
-#define Py_UNICODE_ISUPPER(ch) _PyUnicode_IsUppercase(ch)
-#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch)
-#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch)
-
-#define Py_UNICODE_TOLOWER(ch) _PyUnicode_ToLowercase(ch)
-#define Py_UNICODE_TOUPPER(ch) _PyUnicode_ToUppercase(ch)
-#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch)
-
-#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch)
-#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch)
-#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch)
-#define Py_UNICODE_ISPRINTABLE(ch) _PyUnicode_IsPrintable(ch)
-
-#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch)
-#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch)
-#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch)
-
-#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch)
-
-#define Py_UNICODE_ISALNUM(ch) \
-       (Py_UNICODE_ISALPHA(ch) || \
-    Py_UNICODE_ISDECIMAL(ch) || \
-    Py_UNICODE_ISDIGIT(ch) || \
-    Py_UNICODE_ISNUMERIC(ch))
-
-Py_DEPRECATED(3.3) static inline void
-Py_UNICODE_COPY(Py_UNICODE *target, const Py_UNICODE *source, Py_ssize_t length) {
-    memcpy(target, source, (size_t)(length) * sizeof(Py_UNICODE));
-}
-
-Py_DEPRECATED(3.3) static inline void
-Py_UNICODE_FILL(Py_UNICODE *target, Py_UNICODE value, Py_ssize_t length) {
-    Py_ssize_t i;
-    for (i = 0; i < length; i++) {
-        target[i] = value;
-    }
-}
-
-/* macros to work with surrogates */
-#define Py_UNICODE_IS_SURROGATE(ch) (0xD800 <= (ch) && (ch) <= 0xDFFF)
-#define Py_UNICODE_IS_HIGH_SURROGATE(ch) (0xD800 <= (ch) && (ch) <= 0xDBFF)
-#define Py_UNICODE_IS_LOW_SURROGATE(ch) (0xDC00 <= (ch) && (ch) <= 0xDFFF)
-/* Join two surrogate characters and return a single Py_UCS4 value. */
-#define Py_UNICODE_JOIN_SURROGATES(high, low)  \
-    (((((Py_UCS4)(high) & 0x03FF) << 10) |      \
-      ((Py_UCS4)(low) & 0x03FF)) + 0x10000)
-/* high surrogate = top 10 bits added to D800 */
-#define Py_UNICODE_HIGH_SURROGATE(ch) (0xD800 - (0x10000 >> 10) + ((ch) >> 10))
-/* low surrogate = bottom 10 bits added to DC00 */
-#define Py_UNICODE_LOW_SURROGATE(ch) (0xDC00 + ((ch) & 0x3FF))
-
-/* --- Unicode Type ------------------------------------------------------- */
-
-/* ASCII-only strings created through PyUnicode_New use the PyASCIIObject
-   structure. state.ascii and state.compact are set, and the data
-   immediately follow the structure. utf8_length and wstr_length can be found
-   in the length field; the utf8 pointer is equal to the data pointer. */
-typedef struct {
-    /* There are 4 forms of Unicode strings:
-
-       - compact ascii:
-
-         * structure = PyASCIIObject
-         * test: PyUnicode_IS_COMPACT_ASCII(op)
-         * kind = PyUnicode_1BYTE_KIND
-         * compact = 1
-         * ascii = 1
-         * ready = 1
-         * (length is the length of the utf8 and wstr strings)
-         * (data starts just after the structure)
-         * (since ASCII is decoded from UTF-8, the utf8 string are the data)
-
-       - compact:
-
-         * structure = PyCompactUnicodeObject
-         * test: PyUnicode_IS_COMPACT(op) && !PyUnicode_IS_ASCII(op)
-         * kind = PyUnicode_1BYTE_KIND, PyUnicode_2BYTE_KIND or
-           PyUnicode_4BYTE_KIND
-         * compact = 1
-         * ready = 1
-         * ascii = 0
-         * utf8 is not shared with data
-         * utf8_length = 0 if utf8 is NULL
-         * wstr is shared with data and wstr_length=length
-           if kind=PyUnicode_2BYTE_KIND and sizeof(wchar_t)=2
-           or if kind=PyUnicode_4BYTE_KIND and sizeof(wchar_t)=4
-         * wstr_length = 0 if wstr is NULL
-         * (data starts just after the structure)
-
-       - legacy string, not ready:
-
-         * structure = PyUnicodeObject
-         * test: kind == PyUnicode_WCHAR_KIND
-         * length = 0 (use wstr_length)
-         * hash = -1
-         * kind = PyUnicode_WCHAR_KIND
-         * compact = 0
-         * ascii = 0
-         * ready = 0
-         * interned = SSTATE_NOT_INTERNED
-         * wstr is not NULL
-         * data.any is NULL
-         * utf8 is NULL
-         * utf8_length = 0
-
-       - legacy string, ready:
-
-         * structure = PyUnicodeObject structure
-         * test: !PyUnicode_IS_COMPACT(op) && kind != PyUnicode_WCHAR_KIND
-         * kind = PyUnicode_1BYTE_KIND, PyUnicode_2BYTE_KIND or
-           PyUnicode_4BYTE_KIND
-         * compact = 0
-         * ready = 1
-         * data.any is not NULL
-         * utf8 is shared and utf8_length = length with data.any if ascii = 1
-         * utf8_length = 0 if utf8 is NULL
-         * wstr is shared with data.any and wstr_length = length
-           if kind=PyUnicode_2BYTE_KIND and sizeof(wchar_t)=2
-           or if kind=PyUnicode_4BYTE_KIND and sizeof(wchar_4)=4
-         * wstr_length = 0 if wstr is NULL
-
-       Compact strings use only one memory block (structure + characters),
-       whereas legacy strings use one block for the structure and one block
-       for characters.
-
-       Legacy strings are created by PyUnicode_FromUnicode() and
-       PyUnicode_FromStringAndSize(NULL, size) functions. They become ready
-       when PyUnicode_READY() is called.
-
-       See also _PyUnicode_CheckConsistency().
-    */
-    PyObject_HEAD
-    Py_ssize_t length;          /* Number of code points in the string */
-    Py_hash_t hash;             /* Hash value; -1 if not set */
-    struct {
-        /*
-           SSTATE_NOT_INTERNED (0)
-           SSTATE_INTERNED_MORTAL (1)
-           SSTATE_INTERNED_IMMORTAL (2)
-
-           If interned != SSTATE_NOT_INTERNED, the two references from the
-           dictionary to this object are *not* counted in ob_refcnt.
-         */
-        unsigned int interned:2;
-        /* Character size:
-
-           - PyUnicode_WCHAR_KIND (0):
-
-             * character type = wchar_t (16 or 32 bits, depending on the
-               platform)
-
-           - PyUnicode_1BYTE_KIND (1):
-
-             * character type = Py_UCS1 (8 bits, unsigned)
-             * all characters are in the range U+0000-U+00FF (latin1)
-             * if ascii is set, all characters are in the range U+0000-U+007F
-               (ASCII), otherwise at least one character is in the range
-               U+0080-U+00FF
-
-           - PyUnicode_2BYTE_KIND (2):
-
-             * character type = Py_UCS2 (16 bits, unsigned)
-             * all characters are in the range U+0000-U+FFFF (BMP)
-             * at least one character is in the range U+0100-U+FFFF
-
-           - PyUnicode_4BYTE_KIND (4):
-
-             * character type = Py_UCS4 (32 bits, unsigned)
-             * all characters are in the range U+0000-U+10FFFF
-             * at least one character is in the range U+10000-U+10FFFF
-         */
-        unsigned int kind:3;
-        /* Compact is with respect to the allocation scheme. Compact unicode
-           objects only require one memory block while non-compact objects use
-           one block for the PyUnicodeObject struct and another for its data
-           buffer. */
-        unsigned int compact:1;
-        /* The string only contains characters in the range U+0000-U+007F (ASCII)
-           and the kind is PyUnicode_1BYTE_KIND. If ascii is set and compact is
-           set, use the PyASCIIObject structure. */
-        unsigned int ascii:1;
-        /* The ready flag indicates whether the object layout is initialized
-           completely. This means that this is either a compact object, or
-           the data pointer is filled out. The bit is redundant, and helps
-           to minimize the test in PyUnicode_IS_READY(). */
-        unsigned int ready:1;
-        /* Padding to ensure that PyUnicode_DATA() is always aligned to
-           4 bytes (see issue #19537 on m68k). */
-        unsigned int :24;
-    } state;
-    wchar_t *wstr;              /* wchar_t representation (null-terminated) */
-} PyASCIIObject;
-
-/* Non-ASCII strings allocated through PyUnicode_New use the
-   PyCompactUnicodeObject structure. state.compact is set, and the data
-   immediately follow the structure. */
-typedef struct {
-    PyASCIIObject _base;
-    Py_ssize_t utf8_length;     /* Number of bytes in utf8, excluding the
-                                 * terminating \0. */
-    char *utf8;                 /* UTF-8 representation (null-terminated) */
-    Py_ssize_t wstr_length;     /* Number of code points in wstr, possible
-                                 * surrogates count as two code points. */
-} PyCompactUnicodeObject;
-
-/* Strings allocated through PyUnicode_FromUnicode(NULL, len) use the
-   PyUnicodeObject structure. The actual string data is initially in the wstr
-   block, and copied into the data block using _PyUnicode_Ready. */
-typedef struct {
-    PyCompactUnicodeObject _base;
-    union {
-        void *any;
-        Py_UCS1 *latin1;
-        Py_UCS2 *ucs2;
-        Py_UCS4 *ucs4;
-    } data;                     /* Canonical, smallest-form Unicode buffer */
-} PyUnicodeObject;
-
-PyAPI_FUNC(int) _PyUnicode_CheckConsistency(
-    PyObject *op,
-    int check_content);
-
-/* Fast access macros */
-
-/* Returns the deprecated Py_UNICODE representation's size in code units
-   (this includes surrogate pairs as 2 units).
-   If the Py_UNICODE representation is not available, it will be computed
-   on request.  Use PyUnicode_GET_LENGTH() for the length in code points. */
-
-/* Py_DEPRECATED(3.3) */
-#define PyUnicode_GET_SIZE(op)                       \
-    (assert(PyUnicode_Check(op)),                    \
-     (((PyASCIIObject *)(op))->wstr) ?               \
-      PyUnicode_WSTR_LENGTH(op) :                    \
-      ((void)PyUnicode_AsUnicode(_PyObject_CAST(op)),\
-       assert(((PyASCIIObject *)(op))->wstr),        \
-       PyUnicode_WSTR_LENGTH(op)))
-
-/* Py_DEPRECATED(3.3) */
-#define PyUnicode_GET_DATA_SIZE(op) \
-    (PyUnicode_GET_SIZE(op) * Py_UNICODE_SIZE)
-
-/* Alias for PyUnicode_AsUnicode().  This will create a wchar_t/Py_UNICODE
-   representation on demand.  Using this macro is very inefficient now,
-   try to port your code to use the new PyUnicode_*BYTE_DATA() macros or
-   use PyUnicode_WRITE() and PyUnicode_READ(). */
-
-/* Py_DEPRECATED(3.3) */
-#define PyUnicode_AS_UNICODE(op) \
-    (assert(PyUnicode_Check(op)), \
-     (((PyASCIIObject *)(op))->wstr) ? (((PyASCIIObject *)(op))->wstr) : \
-      PyUnicode_AsUnicode(_PyObject_CAST(op)))
-
-/* Py_DEPRECATED(3.3) */
-#define PyUnicode_AS_DATA(op) \
-    ((const char *)(PyUnicode_AS_UNICODE(op)))
-
-
-/* --- Flexible String Representation Helper Macros (PEP 393) -------------- */
-
-/* Values for PyASCIIObject.state: */
-
-/* Interning state. */
-#define SSTATE_NOT_INTERNED 0
-#define SSTATE_INTERNED_MORTAL 1
-#define SSTATE_INTERNED_IMMORTAL 2
-
-/* Return true if the string contains only ASCII characters, or 0 if not. The
-   string may be compact (PyUnicode_IS_COMPACT_ASCII) or not, but must be
-   ready. */
-#define PyUnicode_IS_ASCII(op)                   \
-    (assert(PyUnicode_Check(op)),                \
-     assert(PyUnicode_IS_READY(op)),             \
-     ((PyASCIIObject*)op)->state.ascii)
-
-/* Return true if the string is compact or 0 if not.
-   No type checks or Ready calls are performed. */
-#define PyUnicode_IS_COMPACT(op) \
-    (((PyASCIIObject*)(op))->state.compact)
-
-/* Return true if the string is a compact ASCII string (use PyASCIIObject
-   structure), or 0 if not.  No type checks or Ready calls are performed. */
-#define PyUnicode_IS_COMPACT_ASCII(op)                 \
-    (((PyASCIIObject*)op)->state.ascii && PyUnicode_IS_COMPACT(op))
-
-enum PyUnicode_Kind {
-/* String contains only wstr byte characters.  This is only possible
-   when the string was created with a legacy API and _PyUnicode_Ready()
-   has not been called yet.  */
-    PyUnicode_WCHAR_KIND = 0,
-/* Return values of the PyUnicode_KIND() macro: */
-    PyUnicode_1BYTE_KIND = 1,
-    PyUnicode_2BYTE_KIND = 2,
-    PyUnicode_4BYTE_KIND = 4
-};
-
-/* Return pointers to the canonical representation cast to unsigned char,
-   Py_UCS2, or Py_UCS4 for direct character access.
-   No checks are performed, use PyUnicode_KIND() before to ensure
-   these will work correctly. */
-
-#define PyUnicode_1BYTE_DATA(op) ((Py_UCS1*)PyUnicode_DATA(op))
-#define PyUnicode_2BYTE_DATA(op) ((Py_UCS2*)PyUnicode_DATA(op))
-#define PyUnicode_4BYTE_DATA(op) ((Py_UCS4*)PyUnicode_DATA(op))
-
-/* Return one of the PyUnicode_*_KIND values defined above. */
-#define PyUnicode_KIND(op) \
-    (assert(PyUnicode_Check(op)), \
-     assert(PyUnicode_IS_READY(op)),            \
-     ((PyASCIIObject *)(op))->state.kind)
-
-/* Return a void pointer to the raw unicode buffer. */
-#define _PyUnicode_COMPACT_DATA(op)                     \
-    (PyUnicode_IS_ASCII(op) ?                   \
-     ((void*)((PyASCIIObject*)(op) + 1)) :              \
-     ((void*)((PyCompactUnicodeObject*)(op) + 1)))
-
-#define _PyUnicode_NONCOMPACT_DATA(op)                  \
-    (assert(((PyUnicodeObject*)(op))->data.any),        \
-     ((((PyUnicodeObject *)(op))->data.any)))
-
-#define PyUnicode_DATA(op) \
-    (assert(PyUnicode_Check(op)), \
-     PyUnicode_IS_COMPACT(op) ? _PyUnicode_COMPACT_DATA(op) :   \
-     _PyUnicode_NONCOMPACT_DATA(op))
-
-/* In the access macros below, "kind" may be evaluated more than once.
-   All other macro parameters are evaluated exactly once, so it is safe
-   to put side effects into them (such as increasing the index). */
-
-/* Write into the canonical representation, this macro does not do any sanity
-   checks and is intended for usage in loops.  The caller should cache the
-   kind and data pointers obtained from other macro calls.
-   index is the index in the string (starts at 0) and value is the new
-   code point value which should be written to that location. */
-#define PyUnicode_WRITE(kind, data, index, value) \
-    do { \
-        switch ((kind)) { \
-        case PyUnicode_1BYTE_KIND: { \
-            ((Py_UCS1 *)(data))[(index)] = (Py_UCS1)(value); \
-            break; \
-        } \
-        case PyUnicode_2BYTE_KIND: { \
-            ((Py_UCS2 *)(data))[(index)] = (Py_UCS2)(value); \
-            break; \
-        } \
-        default: { \
-            assert((kind) == PyUnicode_4BYTE_KIND); \
-            ((Py_UCS4 *)(data))[(index)] = (Py_UCS4)(value); \
-        } \
-        } \
-    } while (0)
-
-/* Read a code point from the string's canonical representation.  No checks
-   or ready calls are performed. */
-#define PyUnicode_READ(kind, data, index) \
-    ((Py_UCS4) \
-    ((kind) == PyUnicode_1BYTE_KIND ? \
-        ((const Py_UCS1 *)(data))[(index)] : \
-        ((kind) == PyUnicode_2BYTE_KIND ? \
-            ((const Py_UCS2 *)(data))[(index)] : \
-            ((const Py_UCS4 *)(data))[(index)] \
-        ) \
-    ))
-
-/* PyUnicode_READ_CHAR() is less efficient than PyUnicode_READ() because it
-   calls PyUnicode_KIND() and might call it twice.  For single reads, use
-   PyUnicode_READ_CHAR, for multiple consecutive reads callers should
-   cache kind and use PyUnicode_READ instead. */
-#define PyUnicode_READ_CHAR(unicode, index) \
-    (assert(PyUnicode_Check(unicode)),          \
-     assert(PyUnicode_IS_READY(unicode)),       \
-     (Py_UCS4)                                  \
-        (PyUnicode_KIND((unicode)) == PyUnicode_1BYTE_KIND ? \
-            ((const Py_UCS1 *)(PyUnicode_DATA((unicode))))[(index)] : \
-            (PyUnicode_KIND((unicode)) == PyUnicode_2BYTE_KIND ? \
-                ((const Py_UCS2 *)(PyUnicode_DATA((unicode))))[(index)] : \
-                ((const Py_UCS4 *)(PyUnicode_DATA((unicode))))[(index)] \
-            ) \
-        ))
-
-/* Returns the length of the unicode string. The caller has to make sure that
-   the string has it's canonical representation set before calling
-   this macro.  Call PyUnicode_(FAST_)Ready to ensure that. */
-#define PyUnicode_GET_LENGTH(op)                \
-    (assert(PyUnicode_Check(op)),               \
-     assert(PyUnicode_IS_READY(op)),            \
-     ((PyASCIIObject *)(op))->length)
-
-
-/* Fast check to determine whether an object is ready. Equivalent to
-   PyUnicode_IS_COMPACT(op) || ((PyUnicodeObject*)(op))->data.any) */
-
-#define PyUnicode_IS_READY(op) (((PyASCIIObject*)op)->state.ready)
-
-/* PyUnicode_READY() does less work than _PyUnicode_Ready() in the best
-   case.  If the canonical representation is not yet set, it will still call
-   _PyUnicode_Ready().
-   Returns 0 on success and -1 on errors. */
-#define PyUnicode_READY(op)                        \
-    (assert(PyUnicode_Check(op)),                       \
-     (PyUnicode_IS_READY(op) ?                          \
-      0 : _PyUnicode_Ready(_PyObject_CAST(op))))
-
-/* Return a maximum character value which is suitable for creating another
-   string based on op.  This is always an approximation but more efficient
-   than iterating over the string. */
-#define PyUnicode_MAX_CHAR_VALUE(op) \
-    (assert(PyUnicode_IS_READY(op)),                                    \
-     (PyUnicode_IS_ASCII(op) ?                                          \
-      (0x7f) :                                                          \
-      (PyUnicode_KIND(op) == PyUnicode_1BYTE_KIND ?                     \
-       (0xffU) :                                                        \
-       (PyUnicode_KIND(op) == PyUnicode_2BYTE_KIND ?                    \
-        (0xffffU) :                                                     \
-        (0x10ffffU)))))
-
-Py_DEPRECATED(3.3)
-static inline Py_ssize_t _PyUnicode_get_wstr_length(PyObject *op) {
-    return PyUnicode_IS_COMPACT_ASCII(op) ?
-            ((PyASCIIObject*)op)->length :
-            ((PyCompactUnicodeObject*)op)->wstr_length;
-}
-#define PyUnicode_WSTR_LENGTH(op) _PyUnicode_get_wstr_length((PyObject*)op)
-
-/* === Public API ========================================================= */
-
-/* --- Plain Py_UNICODE --------------------------------------------------- */
-
-/* With PEP 393, this is the recommended way to allocate a new unicode object.
-   This function will allocate the object and its buffer in a single memory
-   block.  Objects created using this function are not resizable. */
-PyAPI_FUNC(PyObject*) PyUnicode_New(
-    Py_ssize_t size,            /* Number of code points in the new string */
-    Py_UCS4 maxchar             /* maximum code point value in the string */
-    );
-
-/* Initializes the canonical string representation from the deprecated
-   wstr/Py_UNICODE representation. This function is used to convert Unicode
-   objects which were created using the old API to the new flexible format
-   introduced with PEP 393.
-
-   Don't call this function directly, use the public PyUnicode_READY() macro
-   instead. */
-PyAPI_FUNC(int) _PyUnicode_Ready(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Get a copy of a Unicode string. */
-PyAPI_FUNC(PyObject*) _PyUnicode_Copy(
-    PyObject *unicode
-    );
-
-/* Copy character from one unicode object into another, this function performs
-   character conversion when necessary and falls back to memcpy() if possible.
-
-   Fail if to is too small (smaller than *how_many* or smaller than
-   len(from)-from_start), or if kind(from[from_start:from_start+how_many]) >
-   kind(to), or if *to* has more than 1 reference.
-
-   Return the number of written character, or return -1 and raise an exception
-   on error.
-
-   Pseudo-code:
-
-       how_many = min(how_many, len(from) - from_start)
-       to[to_start:to_start+how_many] = from[from_start:from_start+how_many]
-       return how_many
-
-   Note: The function doesn't write a terminating null character.
-   */
-PyAPI_FUNC(Py_ssize_t) PyUnicode_CopyCharacters(
-    PyObject *to,
-    Py_ssize_t to_start,
-    PyObject *from,
-    Py_ssize_t from_start,
-    Py_ssize_t how_many
-    );
-
-/* Unsafe version of PyUnicode_CopyCharacters(): don't check arguments and so
-   may crash if parameters are invalid (e.g. if the output string
-   is too short). */
-PyAPI_FUNC(void) _PyUnicode_FastCopyCharacters(
-    PyObject *to,
-    Py_ssize_t to_start,
-    PyObject *from,
-    Py_ssize_t from_start,
-    Py_ssize_t how_many
-    );
-
-/* Fill a string with a character: write fill_char into
-   unicode[start:start+length].
-
-   Fail if fill_char is bigger than the string maximum character, or if the
-   string has more than 1 reference.
-
-   Return the number of written character, or return -1 and raise an exception
-   on error. */
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Fill(
-    PyObject *unicode,
-    Py_ssize_t start,
-    Py_ssize_t length,
-    Py_UCS4 fill_char
-    );
-
-/* Unsafe version of PyUnicode_Fill(): don't check arguments and so may crash
-   if parameters are invalid (e.g. if length is longer than the string). */
-PyAPI_FUNC(void) _PyUnicode_FastFill(
-    PyObject *unicode,
-    Py_ssize_t start,
-    Py_ssize_t length,
-    Py_UCS4 fill_char
-    );
-
-/* Create a Unicode Object from the Py_UNICODE buffer u of the given
-   size.
-
-   u may be NULL which causes the contents to be undefined. It is the
-   user's responsibility to fill in the needed data afterwards. Note
-   that modifying the Unicode object contents after construction is
-   only allowed if u was set to NULL.
-
-   The buffer is copied into the new object. */
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode(
-    const Py_UNICODE *u,        /* Unicode buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-/* Create a new string from a buffer of Py_UCS1, Py_UCS2 or Py_UCS4 characters.
-   Scan the string to find the maximum character. */
-PyAPI_FUNC(PyObject*) PyUnicode_FromKindAndData(
-    int kind,
-    const void *buffer,
-    Py_ssize_t size);
-
-/* Create a new string from a buffer of ASCII characters.
-   WARNING: Don't check if the string contains any non-ASCII character. */
-PyAPI_FUNC(PyObject*) _PyUnicode_FromASCII(
-    const char *buffer,
-    Py_ssize_t size);
-
-/* Compute the maximum character of the substring unicode[start:end].
-   Return 127 for an empty string. */
-PyAPI_FUNC(Py_UCS4) _PyUnicode_FindMaxChar (
-    PyObject *unicode,
-    Py_ssize_t start,
-    Py_ssize_t end);
-
-/* Return a read-only pointer to the Unicode object's internal
-   Py_UNICODE buffer.
-   If the wchar_t/Py_UNICODE representation is not yet available, this
-   function will calculate it. */
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Similar to PyUnicode_AsUnicode(), but raises a ValueError if the string
-   contains null characters. */
-Py_DEPRECATED(3.3) PyAPI_FUNC(const Py_UNICODE *) _PyUnicode_AsUnicode(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Return a read-only pointer to the Unicode object's internal
-   Py_UNICODE buffer and save the length at size.
-   If the wchar_t/Py_UNICODE representation is not yet available, this
-   function will calculate it. */
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicodeAndSize(
-    PyObject *unicode,          /* Unicode object */
-    Py_ssize_t *size            /* location where to save the length */
-    );
-
-/* Get the maximum ordinal for a Unicode character. */
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE) PyUnicode_GetMax(void);
-
-
-/* --- _PyUnicodeWriter API ----------------------------------------------- */
-
-typedef struct {
-    PyObject *buffer;
-    void *data;
-    enum PyUnicode_Kind kind;
-    Py_UCS4 maxchar;
-    Py_ssize_t size;
-    Py_ssize_t pos;
-
-    /* minimum number of allocated characters (default: 0) */
-    Py_ssize_t min_length;
-
-    /* minimum character (default: 127, ASCII) */
-    Py_UCS4 min_char;
-
-    /* If non-zero, overallocate the buffer (default: 0). */
-    unsigned char overallocate;
-
-    /* If readonly is 1, buffer is a shared string (cannot be modified)
-       and size is set to 0. */
-    unsigned char readonly;
-} _PyUnicodeWriter ;
-
-/* Initialize a Unicode writer.
- *
- * By default, the minimum buffer size is 0 character and overallocation is
- * disabled. Set min_length, min_char and overallocate attributes to control
- * the allocation of the buffer. */
-PyAPI_FUNC(void)
-_PyUnicodeWriter_Init(_PyUnicodeWriter *writer);
-
-/* Prepare the buffer to write 'length' characters
-   with the specified maximum character.
-
-   Return 0 on success, raise an exception and return -1 on error. */
-#define _PyUnicodeWriter_Prepare(WRITER, LENGTH, MAXCHAR)             \
-    (((MAXCHAR) <= (WRITER)->maxchar                                  \
-      && (LENGTH) <= (WRITER)->size - (WRITER)->pos)                  \
-     ? 0                                                              \
-     : (((LENGTH) == 0)                                               \
-        ? 0                                                           \
-        : _PyUnicodeWriter_PrepareInternal((WRITER), (LENGTH), (MAXCHAR))))
-
-/* Don't call this function directly, use the _PyUnicodeWriter_Prepare() macro
-   instead. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer,
-                                 Py_ssize_t length, Py_UCS4 maxchar);
-
-/* Prepare the buffer to have at least the kind KIND.
-   For example, kind=PyUnicode_2BYTE_KIND ensures that the writer will
-   support characters in range U+000-U+FFFF.
-
-   Return 0 on success, raise an exception and return -1 on error. */
-#define _PyUnicodeWriter_PrepareKind(WRITER, KIND)                    \
-    (assert((KIND) != PyUnicode_WCHAR_KIND),                          \
-     (KIND) <= (WRITER)->kind                                         \
-     ? 0                                                              \
-     : _PyUnicodeWriter_PrepareKindInternal((WRITER), (KIND)))
-
-/* Don't call this function directly, use the _PyUnicodeWriter_PrepareKind()
-   macro instead. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_PrepareKindInternal(_PyUnicodeWriter *writer,
-                                     enum PyUnicode_Kind kind);
-
-/* Append a Unicode character.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteChar(_PyUnicodeWriter *writer,
-    Py_UCS4 ch
-    );
-
-/* Append a Unicode string.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteStr(_PyUnicodeWriter *writer,
-    PyObject *str               /* Unicode string */
-    );
-
-/* Append a substring of a Unicode string.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteSubstring(_PyUnicodeWriter *writer,
-    PyObject *str,              /* Unicode string */
-    Py_ssize_t start,
-    Py_ssize_t end
-    );
-
-/* Append an ASCII-encoded byte string.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteASCIIString(_PyUnicodeWriter *writer,
-    const char *str,           /* ASCII-encoded byte string */
-    Py_ssize_t len             /* number of bytes, or -1 if unknown */
-    );
-
-/* Append a latin1-encoded byte string.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int)
-_PyUnicodeWriter_WriteLatin1String(_PyUnicodeWriter *writer,
-    const char *str,           /* latin1-encoded byte string */
-    Py_ssize_t len             /* length in bytes */
-    );
-
-/* Get the value of the writer as a Unicode string. Clear the
-   buffer of the writer. Raise an exception and return NULL
-   on error. */
-PyAPI_FUNC(PyObject *)
-_PyUnicodeWriter_Finish(_PyUnicodeWriter *writer);
-
-/* Deallocate memory of a writer (clear its internal buffer). */
-PyAPI_FUNC(void)
-_PyUnicodeWriter_Dealloc(_PyUnicodeWriter *writer);
-
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(int) _PyUnicode_FormatAdvancedWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    PyObject *format_spec,
-    Py_ssize_t start,
-    Py_ssize_t end);
-
-/* --- Manage the default encoding ---------------------------------------- */
-
-/* Returns a pointer to the default encoding (UTF-8) of the
-   Unicode object unicode and the size of the encoded representation
-   in bytes stored in *size.
-
-   In case of an error, no *size is set.
-
-   This function caches the UTF-8 encoded string in the unicodeobject
-   and subsequent calls will return the same string.  The memory is released
-   when the unicodeobject is deallocated.
-
-   _PyUnicode_AsStringAndSize is a #define for PyUnicode_AsUTF8AndSize to
-   support the previous internal function with the same behaviour.
-*/
-
-PyAPI_FUNC(const char *) PyUnicode_AsUTF8AndSize(
-    PyObject *unicode,
-    Py_ssize_t *size);
-
-#define _PyUnicode_AsStringAndSize PyUnicode_AsUTF8AndSize
-
-/* Returns a pointer to the default encoding (UTF-8) of the
-   Unicode object unicode.
-
-   Like PyUnicode_AsUTF8AndSize(), this also caches the UTF-8 representation
-   in the unicodeobject.
-
-   _PyUnicode_AsString is a #define for PyUnicode_AsUTF8 to
-   support the previous internal function with the same behaviour.
-
-   Use of this API is DEPRECATED since no size information can be
-   extracted from the returned data.
-*/
-
-PyAPI_FUNC(const char *) PyUnicode_AsUTF8(PyObject *unicode);
-
-#define _PyUnicode_AsString PyUnicode_AsUTF8
-
-/* --- Generic Codecs ----------------------------------------------------- */
-
-/* Encodes a Py_UNICODE buffer of the given size and returns a
-   Python string object. */
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_Encode(
-    const Py_UNICODE *s,        /* Unicode char buffer */
-    Py_ssize_t size,            /* number of Py_UNICODE chars to encode */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* --- UTF-7 Codecs ------------------------------------------------------- */
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    int base64SetO,             /* Encode RFC2152 Set O characters in base64 */
-    int base64WhiteSpace,       /* Encode whitespace (sp, ht, nl, cr) in base64 */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF7(
-    PyObject *unicode,          /* Unicode object */
-    int base64SetO,             /* Encode RFC2152 Set O characters in base64 */
-    int base64WhiteSpace,       /* Encode whitespace (sp, ht, nl, cr) in base64 */
-    const char *errors          /* error handling */
-    );
-
-/* --- UTF-8 Codecs ------------------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) _PyUnicode_AsUTF8String(
-    PyObject *unicode,
-    const char *errors);
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-
-/* --- UTF-32 Codecs ------------------------------------------------------ */
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF32(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-
-PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF32(
-    PyObject *object,           /* Unicode object */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-
-/* --- UTF-16 Codecs ------------------------------------------------------ */
-
-/* Returns a Python string object holding the UTF-16 encoded value of
-   the Unicode data.
-
-   If byteorder is not 0, output is written according to the following
-   byte order:
-
-   byteorder == -1: little endian
-   byteorder == 0:  native byte order (writes a BOM mark)
-   byteorder == 1:  big endian
-
-   If byteorder is 0, the output string will always start with the
-   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is
-   prepended.
-
-   Note that Py_UNICODE data is being interpreted as UTF-16 reduced to
-   UCS-2. This trick makes it possible to add full UTF-16 capabilities
-   at a later point without compromising the APIs.
-
-*/
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-
-PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF16(
-    PyObject* unicode,          /* Unicode object */
-    const char *errors,         /* error handling */
-    int byteorder               /* byteorder to use 0=BOM+native;-1=LE,1=BE */
-    );
-
-/* --- Unicode-Escape Codecs ---------------------------------------------- */
-
-/* Helper for PyUnicode_DecodeUnicodeEscape that detects invalid escape
-   chars. */
-PyAPI_FUNC(PyObject*) _PyUnicode_DecodeUnicodeEscape(
-        const char *string,     /* Unicode-Escape encoded string */
-        Py_ssize_t length,      /* size of string */
-        const char *errors,     /* error handling */
-        const char **first_invalid_escape  /* on return, points to first
-                                              invalid escaped char in
-                                              string. */
-);
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length           /* Number of Py_UNICODE chars to encode */
-    );
-
-/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length           /* Number of Py_UNICODE chars to encode */
-    );
-
-/* --- Latin-1 Codecs ----------------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) _PyUnicode_AsLatin1String(
-    PyObject* unicode,
-    const char* errors);
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-
-/* --- ASCII Codecs ------------------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) _PyUnicode_AsASCIIString(
-    PyObject* unicode,
-    const char* errors);
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-
-/* --- Character Map Codecs ----------------------------------------------- */
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    PyObject *mapping,          /* encoding mapping */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) _PyUnicode_EncodeCharmap(
-    PyObject *unicode,          /* Unicode object */
-    PyObject *mapping,          /* encoding mapping */
-    const char *errors          /* error handling */
-    );
-
-/* Translate a Py_UNICODE buffer of the given length by applying a
-   character mapping table to it and return the resulting Unicode
-   object.
-
-   The mapping table must map Unicode ordinal integers to Unicode strings,
-   Unicode ordinal integers or None (causing deletion of the character).
-
-   Mapping tables may be dictionaries or sequences. Unmapped character
-   ordinals (ones which cause a LookupError) are left untouched and
-   are copied as-is.
-
-*/
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    PyObject *table,            /* Translate table */
-    const char *errors          /* error handling */
-    );
-
-/* --- MBCS codecs for Windows -------------------------------------------- */
-
-#ifdef MS_WINDOWS
-Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS(
-    const Py_UNICODE *data,     /* Unicode char buffer */
-    Py_ssize_t length,          /* number of Py_UNICODE chars to encode */
-    const char *errors          /* error handling */
-    );
-#endif
-
-/* --- Decimal Encoder ---------------------------------------------------- */
-
-/* Takes a Unicode string holding a decimal value and writes it into
-   an output buffer using standard ASCII digit codes.
-
-   The output buffer has to provide at least length+1 bytes of storage
-   area. The output string is 0-terminated.
-
-   The encoder converts whitespace to ' ', decimal characters to their
-   corresponding ASCII digit and all other Latin-1 characters except
-   \0 as-is. Characters outside this range (Unicode ordinals 1-256)
-   are treated as errors. This includes embedded NULL bytes.
-
-   Error handling is defined by the errors argument:
-
-      NULL or "strict": raise a ValueError
-      "ignore": ignore the wrong characters (these are not copied to the
-                output buffer)
-      "replace": replaces illegal characters with '?'
-
-   Returns 0 on success, -1 on failure.
-
-*/
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(int) PyUnicode_EncodeDecimal(
-    Py_UNICODE *s,              /* Unicode buffer */
-    Py_ssize_t length,          /* Number of Py_UNICODE chars to encode */
-    char *output,               /* Output buffer; must have size >= length */
-    const char *errors          /* error handling */
-    );
-
-/* Transforms code points that have decimal digit property to the
-   corresponding ASCII digit code points.
-
-   Returns a new Unicode string on success, NULL on failure.
-*/
-
-Py_DEPRECATED(3.3)
-PyAPI_FUNC(PyObject*) PyUnicode_TransformDecimalToASCII(
-    Py_UNICODE *s,              /* Unicode buffer */
-    Py_ssize_t length           /* Number of Py_UNICODE chars to transform */
-    );
-
-/* Coverts a Unicode object holding a decimal value to an ASCII string
-   for using in int, float and complex parsers.
-   Transforms code points that have decimal digit property to the
-   corresponding ASCII digit code points.  Transforms spaces to ASCII.
-   Transforms code points starting from the first non-ASCII code point that
-   is neither a decimal digit nor a space to the end into '?'. */
-
-PyAPI_FUNC(PyObject*) _PyUnicode_TransformDecimalAndSpaceToASCII(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* --- Methods & Slots ---------------------------------------------------- */
-
-PyAPI_FUNC(PyObject *) _PyUnicode_JoinArray(
-    PyObject *separator,
-    PyObject *const *items,
-    Py_ssize_t seqlen
-    );
-
-/* Test whether a unicode is equal to ASCII identifier.  Return 1 if true,
-   0 otherwise.  The right argument must be ASCII identifier.
-   Any error occurs inside will be cleared before return. */
-PyAPI_FUNC(int) _PyUnicode_EqualToASCIIId(
-    PyObject *left,             /* Left string */
-    _Py_Identifier *right       /* Right identifier */
-    );
-
-/* Test whether a unicode is equal to ASCII string.  Return 1 if true,
-   0 otherwise.  The right argument must be ASCII-encoded string.
-   Any error occurs inside will be cleared before return. */
-PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString(
-    PyObject *left,
-    const char *right           /* ASCII-encoded string */
-    );
-
-/* Externally visible for str.strip(unicode) */
-PyAPI_FUNC(PyObject *) _PyUnicode_XStrip(
-    PyObject *self,
-    int striptype,
-    PyObject *sepobj
-    );
-
-/* Using explicit passed-in values, insert the thousands grouping
-   into the string pointed to by buffer.  For the argument descriptions,
-   see Objects/stringlib/localeutil.h */
-PyAPI_FUNC(Py_ssize_t) _PyUnicode_InsertThousandsGrouping(
-    _PyUnicodeWriter *writer,
-    Py_ssize_t n_buffer,
-    PyObject *digits,
-    Py_ssize_t d_pos,
-    Py_ssize_t n_digits,
-    Py_ssize_t min_width,
-    const char *grouping,
-    PyObject *thousands_sep,
-    Py_UCS4 *maxchar);
-
-/* === Characters Type APIs =============================================== */
-
-/* Helper array used by Py_UNICODE_ISSPACE(). */
-
-PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[];
-
-/* These should not be used directly. Use the Py_UNICODE_IS* and
-   Py_UNICODE_TO* macros instead.
-
-   These APIs are implemented in Objects/unicodectype.c.
-
-*/
-
-PyAPI_FUNC(int) _PyUnicode_IsLowercase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsUppercase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsTitlecase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsXidStart(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsXidContinue(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsWhitespace(
-    const Py_UCS4 ch         /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsLinebreak(
-    const Py_UCS4 ch         /* Unicode character */
-    );
-
-/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(Py_UCS4) _PyUnicode_ToLowercase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(Py_UCS4) _PyUnicode_ToUppercase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UCS4) _PyUnicode_ToTitlecase(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToLowerFull(
-    Py_UCS4 ch,       /* Unicode character */
-    Py_UCS4 *res
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToTitleFull(
-    Py_UCS4 ch,       /* Unicode character */
-    Py_UCS4 *res
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToUpperFull(
-    Py_UCS4 ch,       /* Unicode character */
-    Py_UCS4 *res
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToFoldedFull(
-    Py_UCS4 ch,       /* Unicode character */
-    Py_UCS4 *res
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsCaseIgnorable(
-    Py_UCS4 ch         /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsCased(
-    Py_UCS4 ch         /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToDecimalDigit(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_ToDigit(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(double) _PyUnicode_ToNumeric(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsDecimalDigit(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsDigit(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsNumeric(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsPrintable(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-PyAPI_FUNC(int) _PyUnicode_IsAlpha(
-    Py_UCS4 ch       /* Unicode character */
-    );
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(size_t) Py_UNICODE_strlen(
-    const Py_UNICODE *u
-    );
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strcpy(
-    Py_UNICODE *s1,
-    const Py_UNICODE *s2);
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strcat(
-    Py_UNICODE *s1, const Py_UNICODE *s2);
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strncpy(
-    Py_UNICODE *s1,
-    const Py_UNICODE *s2,
-    size_t n);
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(int) Py_UNICODE_strcmp(
-    const Py_UNICODE *s1,
-    const Py_UNICODE *s2
-    );
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(int) Py_UNICODE_strncmp(
-    const Py_UNICODE *s1,
-    const Py_UNICODE *s2,
-    size_t n
-    );
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strchr(
-    const Py_UNICODE *s,
-    Py_UNICODE c
-    );
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) Py_UNICODE_strrchr(
-    const Py_UNICODE *s,
-    Py_UNICODE c
-    );
-
-PyAPI_FUNC(PyObject*) _PyUnicode_FormatLong(PyObject *, int, int, int);
-
-/* Create a copy of a unicode string ending with a nul character. Return NULL
-   and raise a MemoryError exception on memory allocation failure, otherwise
-   return a new allocated buffer (use PyMem_Free() to free the buffer). */
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy(
-    PyObject *unicode
-    );
-
-/* Return an interned Unicode object for an Identifier; may fail if there is no memory.*/
-PyAPI_FUNC(PyObject*) _PyUnicode_FromId(_Py_Identifier*);
-
-/* Fast equality check when the inputs are known to be exact unicode types
-   and where the hash values are equal (i.e. a very probable match) */
-PyAPI_FUNC(int) _PyUnicode_EQ(PyObject *, PyObject *);
-
-PyAPI_FUNC(Py_ssize_t) _PyUnicode_ScanIdentifier(PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/datetime.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/datetime.h
deleted file mode 100644
index 5d9f2558f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/datetime.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*  datetime.h
- */
-#ifndef Py_LIMITED_API
-#ifndef DATETIME_H
-#define DATETIME_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Fields are packed into successive bytes, each viewed as unsigned and
- * big-endian, unless otherwise noted:
- *
- * byte offset
- *  0           year     2 bytes, 1-9999
- *  2           month    1 byte, 1-12
- *  3           day      1 byte, 1-31
- *  4           hour     1 byte, 0-23
- *  5           minute   1 byte, 0-59
- *  6           second   1 byte, 0-59
- *  7           usecond  3 bytes, 0-999999
- * 10
- */
-
-/* # of bytes for year, month, and day. */
-#define _PyDateTime_DATE_DATASIZE 4
-
-/* # of bytes for hour, minute, second, and usecond. */
-#define _PyDateTime_TIME_DATASIZE 6
-
-/* # of bytes for year, month, day, hour, minute, second, and usecond. */
-#define _PyDateTime_DATETIME_DATASIZE 10
-
-
-typedef struct
-{
-    PyObject_HEAD
-    Py_hash_t hashcode;         /* -1 when unknown */
-    int days;                   /* -MAX_DELTA_DAYS <= days <= MAX_DELTA_DAYS */
-    int seconds;                /* 0 <= seconds < 24*3600 is invariant */
-    int microseconds;           /* 0 <= microseconds < 1000000 is invariant */
-} PyDateTime_Delta;
-
-typedef struct
-{
-    PyObject_HEAD               /* a pure abstract base class */
-} PyDateTime_TZInfo;
-
-
-/* The datetime and time types have hashcodes, and an optional tzinfo member,
- * present if and only if hastzinfo is true.
- */
-#define _PyTZINFO_HEAD          \
-    PyObject_HEAD               \
-    Py_hash_t hashcode;         \
-    char hastzinfo;             /* boolean flag */
-
-/* No _PyDateTime_BaseTZInfo is allocated; it's just to have something
- * convenient to cast to, when getting at the hastzinfo member of objects
- * starting with _PyTZINFO_HEAD.
- */
-typedef struct
-{
-    _PyTZINFO_HEAD
-} _PyDateTime_BaseTZInfo;
-
-/* All time objects are of PyDateTime_TimeType, but that can be allocated
- * in two ways, with or without a tzinfo member.  Without is the same as
- * tzinfo == None, but consumes less memory.  _PyDateTime_BaseTime is an
- * internal struct used to allocate the right amount of space for the
- * "without" case.
- */
-#define _PyDateTime_TIMEHEAD    \
-    _PyTZINFO_HEAD              \
-    unsigned char data[_PyDateTime_TIME_DATASIZE];
-
-typedef struct
-{
-    _PyDateTime_TIMEHEAD
-} _PyDateTime_BaseTime;         /* hastzinfo false */
-
-typedef struct
-{
-    _PyDateTime_TIMEHEAD
-    unsigned char fold;
-    PyObject *tzinfo;
-} PyDateTime_Time;              /* hastzinfo true */
-
-
-/* All datetime objects are of PyDateTime_DateTimeType, but that can be
- * allocated in two ways too, just like for time objects above.  In addition,
- * the plain date type is a base class for datetime, so it must also have
- * a hastzinfo member (although it's unused there).
- */
-typedef struct
-{
-    _PyTZINFO_HEAD
-    unsigned char data[_PyDateTime_DATE_DATASIZE];
-} PyDateTime_Date;
-
-#define _PyDateTime_DATETIMEHEAD        \
-    _PyTZINFO_HEAD                      \
-    unsigned char data[_PyDateTime_DATETIME_DATASIZE];
-
-typedef struct
-{
-    _PyDateTime_DATETIMEHEAD
-} _PyDateTime_BaseDateTime;     /* hastzinfo false */
-
-typedef struct
-{
-    _PyDateTime_DATETIMEHEAD
-    unsigned char fold;
-    PyObject *tzinfo;
-} PyDateTime_DateTime;          /* hastzinfo true */
-
-
-/* Apply for date and datetime instances. */
-#define PyDateTime_GET_YEAR(o)     ((((PyDateTime_Date*)o)->data[0] << 8) | \
-                     ((PyDateTime_Date*)o)->data[1])
-#define PyDateTime_GET_MONTH(o)    (((PyDateTime_Date*)o)->data[2])
-#define PyDateTime_GET_DAY(o)      (((PyDateTime_Date*)o)->data[3])
-
-#define PyDateTime_DATE_GET_HOUR(o)        (((PyDateTime_DateTime*)o)->data[4])
-#define PyDateTime_DATE_GET_MINUTE(o)      (((PyDateTime_DateTime*)o)->data[5])
-#define PyDateTime_DATE_GET_SECOND(o)      (((PyDateTime_DateTime*)o)->data[6])
-#define PyDateTime_DATE_GET_MICROSECOND(o)              \
-    ((((PyDateTime_DateTime*)o)->data[7] << 16) |       \
-     (((PyDateTime_DateTime*)o)->data[8] << 8)  |       \
-      ((PyDateTime_DateTime*)o)->data[9])
-#define PyDateTime_DATE_GET_FOLD(o)        (((PyDateTime_DateTime*)o)->fold)
-
-/* Apply for time instances. */
-#define PyDateTime_TIME_GET_HOUR(o)        (((PyDateTime_Time*)o)->data[0])
-#define PyDateTime_TIME_GET_MINUTE(o)      (((PyDateTime_Time*)o)->data[1])
-#define PyDateTime_TIME_GET_SECOND(o)      (((PyDateTime_Time*)o)->data[2])
-#define PyDateTime_TIME_GET_MICROSECOND(o)              \
-    ((((PyDateTime_Time*)o)->data[3] << 16) |           \
-     (((PyDateTime_Time*)o)->data[4] << 8)  |           \
-      ((PyDateTime_Time*)o)->data[5])
-#define PyDateTime_TIME_GET_FOLD(o)        (((PyDateTime_Time*)o)->fold)
-
-/* Apply for time delta instances */
-#define PyDateTime_DELTA_GET_DAYS(o)         (((PyDateTime_Delta*)o)->days)
-#define PyDateTime_DELTA_GET_SECONDS(o)      (((PyDateTime_Delta*)o)->seconds)
-#define PyDateTime_DELTA_GET_MICROSECONDS(o)            \
-    (((PyDateTime_Delta*)o)->microseconds)
-
-
-/* Define structure for C API. */
-typedef struct {
-    /* type objects */
-    PyTypeObject *DateType;
-    PyTypeObject *DateTimeType;
-    PyTypeObject *TimeType;
-    PyTypeObject *DeltaType;
-    PyTypeObject *TZInfoType;
-
-    /* singletons */
-    PyObject *TimeZone_UTC;
-
-    /* constructors */
-    PyObject *(*Date_FromDate)(int, int, int, PyTypeObject*);
-    PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int,
-        PyObject*, PyTypeObject*);
-    PyObject *(*Time_FromTime)(int, int, int, int, PyObject*, PyTypeObject*);
-    PyObject *(*Delta_FromDelta)(int, int, int, int, PyTypeObject*);
-    PyObject *(*TimeZone_FromTimeZone)(PyObject *offset, PyObject *name);
-
-    /* constructors for the DB API */
-    PyObject *(*DateTime_FromTimestamp)(PyObject*, PyObject*, PyObject*);
-    PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*);
-
-    /* PEP 495 constructors */
-    PyObject *(*DateTime_FromDateAndTimeAndFold)(int, int, int, int, int, int, int,
-        PyObject*, int, PyTypeObject*);
-    PyObject *(*Time_FromTimeAndFold)(int, int, int, int, PyObject*, int, PyTypeObject*);
-
-} PyDateTime_CAPI;
-
-#define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI"
-
-
-/* This block is only used as part of the public API and should not be
- * included in _datetimemodule.c, which does not use the C API capsule.
- * See bpo-35081 for more details.
- * */
-#ifndef _PY_DATETIME_IMPL
-/* Define global variable for the C API and a macro for setting it. */
-static PyDateTime_CAPI *PyDateTimeAPI = NULL;
-
-#define PyDateTime_IMPORT \
-    PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0)
-
-/* Macro for access to the UTC singleton */
-#define PyDateTime_TimeZone_UTC PyDateTimeAPI->TimeZone_UTC
-
-/* Macros for type checking when not building the Python core. */
-#define PyDate_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateType)
-#define PyDate_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->DateType)
-
-#define PyDateTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateTimeType)
-#define PyDateTime_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->DateTimeType)
-
-#define PyTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TimeType)
-#define PyTime_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->TimeType)
-
-#define PyDelta_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DeltaType)
-#define PyDelta_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->DeltaType)
-
-#define PyTZInfo_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TZInfoType)
-#define PyTZInfo_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->TZInfoType)
-
-
-/* Macros for accessing constructors in a simplified fashion. */
-#define PyDate_FromDate(year, month, day) \
-    PyDateTimeAPI->Date_FromDate(year, month, day, PyDateTimeAPI->DateType)
-
-#define PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, usec) \
-    PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, \
-        min, sec, usec, Py_None, PyDateTimeAPI->DateTimeType)
-
-#define PyDateTime_FromDateAndTimeAndFold(year, month, day, hour, min, sec, usec, fold) \
-    PyDateTimeAPI->DateTime_FromDateAndTimeAndFold(year, month, day, hour, \
-        min, sec, usec, Py_None, fold, PyDateTimeAPI->DateTimeType)
-
-#define PyTime_FromTime(hour, minute, second, usecond) \
-    PyDateTimeAPI->Time_FromTime(hour, minute, second, usecond, \
-        Py_None, PyDateTimeAPI->TimeType)
-
-#define PyTime_FromTimeAndFold(hour, minute, second, usecond, fold) \
-    PyDateTimeAPI->Time_FromTimeAndFold(hour, minute, second, usecond, \
-        Py_None, fold, PyDateTimeAPI->TimeType)
-
-#define PyDelta_FromDSU(days, seconds, useconds) \
-    PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \
-        PyDateTimeAPI->DeltaType)
-
-#define PyTimeZone_FromOffset(offset) \
-    PyDateTimeAPI->TimeZone_FromTimeZone(offset, NULL)
-
-#define PyTimeZone_FromOffsetAndName(offset, name) \
-    PyDateTimeAPI->TimeZone_FromTimeZone(offset, name)
-
-/* Macros supporting the DB API. */
-#define PyDateTime_FromTimestamp(args) \
-    PyDateTimeAPI->DateTime_FromTimestamp( \
-        (PyObject*) (PyDateTimeAPI->DateTimeType), args, NULL)
-
-#define PyDate_FromTimestamp(args) \
-    PyDateTimeAPI->Date_FromTimestamp( \
-        (PyObject*) (PyDateTimeAPI->DateType), args)
-
-#endif   /* !defined(_PY_DATETIME_IMPL) */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-#endif /* !Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/descrobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/descrobject.h
deleted file mode 100644
index ead269d1d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/descrobject.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Descriptors */
-#ifndef Py_DESCROBJECT_H
-#define Py_DESCROBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef PyObject *(*getter)(PyObject *, void *);
-typedef int (*setter)(PyObject *, PyObject *, void *);
-
-typedef struct PyGetSetDef {
-    const char *name;
-    getter get;
-    setter set;
-    const char *doc;
-    void *closure;
-} PyGetSetDef;
-
-#ifndef Py_LIMITED_API
-typedef PyObject *(*wrapperfunc)(PyObject *self, PyObject *args,
-                                 void *wrapped);
-
-typedef PyObject *(*wrapperfunc_kwds)(PyObject *self, PyObject *args,
-                                      void *wrapped, PyObject *kwds);
-
-struct wrapperbase {
-    const char *name;
-    int offset;
-    void *function;
-    wrapperfunc wrapper;
-    const char *doc;
-    int flags;
-    PyObject *name_strobj;
-};
-
-/* Flags for above struct */
-#define PyWrapperFlag_KEYWORDS 1 /* wrapper function takes keyword args */
-
-/* Various kinds of descriptor objects */
-
-typedef struct {
-    PyObject_HEAD
-    PyTypeObject *d_type;
-    PyObject *d_name;
-    PyObject *d_qualname;
-} PyDescrObject;
-
-#define PyDescr_COMMON PyDescrObject d_common
-
-#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type)
-#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name)
-
-typedef struct {
-    PyDescr_COMMON;
-    PyMethodDef *d_method;
-    vectorcallfunc vectorcall;
-} PyMethodDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    struct PyMemberDef *d_member;
-} PyMemberDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    PyGetSetDef *d_getset;
-} PyGetSetDescrObject;
-
-typedef struct {
-    PyDescr_COMMON;
-    struct wrapperbase *d_base;
-    void *d_wrapped; /* This can be any function pointer */
-} PyWrapperDescrObject;
-#endif /* Py_LIMITED_API */
-
-PyAPI_DATA(PyTypeObject) PyClassMethodDescr_Type;
-PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type;
-PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
-PyAPI_DATA(PyTypeObject) PyMethodDescr_Type;
-PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type;
-PyAPI_DATA(PyTypeObject) PyDictProxy_Type;
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyTypeObject) _PyMethodWrapper_Type;
-#endif /* Py_LIMITED_API */
-
-PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *);
-PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *);
-struct PyMemberDef; /* forward declaration for following prototype */
-PyAPI_FUNC(PyObject *) PyDescr_NewMember(PyTypeObject *,
-                                               struct PyMemberDef *);
-PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *,
-                                               struct PyGetSetDef *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *,
-                                                struct wrapperbase *, void *);
-#define PyDescr_IsData(d) (Py_TYPE(d)->tp_descr_set != NULL)
-#endif
-
-PyAPI_FUNC(PyObject *) PyDictProxy_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyWrapper_New(PyObject *, PyObject *);
-
-
-PyAPI_DATA(PyTypeObject) PyProperty_Type;
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_DESCROBJECT_H */
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/dictobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/dictobject.h
deleted file mode 100644
index c88b0aa0a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/dictobject.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef Py_DICTOBJECT_H
-#define Py_DICTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Dictionary object type -- mapping from hashable object to object */
-
-/* The distribution includes a separate file, Objects/dictnotes.txt,
-   describing explorations into dictionary design and optimization.
-   It covers typical dictionary use patterns, the parameters for
-   tuning dictionaries, and several ideas for possible optimizations.
-*/
-
-PyAPI_DATA(PyTypeObject) PyDict_Type;
-
-#define PyDict_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_DICT_SUBCLASS)
-#define PyDict_CheckExact(op) Py_IS_TYPE(op, &PyDict_Type)
-
-PyAPI_FUNC(PyObject *) PyDict_New(void);
-PyAPI_FUNC(PyObject *) PyDict_GetItem(PyObject *mp, PyObject *key);
-PyAPI_FUNC(PyObject *) PyDict_GetItemWithError(PyObject *mp, PyObject *key);
-PyAPI_FUNC(int) PyDict_SetItem(PyObject *mp, PyObject *key, PyObject *item);
-PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key);
-PyAPI_FUNC(void) PyDict_Clear(PyObject *mp);
-PyAPI_FUNC(int) PyDict_Next(
-    PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value);
-PyAPI_FUNC(PyObject *) PyDict_Keys(PyObject *mp);
-PyAPI_FUNC(PyObject *) PyDict_Values(PyObject *mp);
-PyAPI_FUNC(PyObject *) PyDict_Items(PyObject *mp);
-PyAPI_FUNC(Py_ssize_t) PyDict_Size(PyObject *mp);
-PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp);
-PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key);
-
-/* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */
-PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other);
-
-/* PyDict_Merge updates/merges from a mapping object (an object that
-   supports PyMapping_Keys() and PyObject_GetItem()).  If override is true,
-   the last occurrence of a key wins, else the first.  The Python
-   dict.update(other) is equivalent to PyDict_Merge(dict, other, 1).
-*/
-PyAPI_FUNC(int) PyDict_Merge(PyObject *mp,
-                             PyObject *other,
-                             int override);
-
-/* PyDict_MergeFromSeq2 updates/merges from an iterable object producing
-   iterable objects of length 2.  If override is true, the last occurrence
-   of a key wins, else the first.  The Python dict constructor dict(seq2)
-   is equivalent to dict={}; PyDict_MergeFromSeq(dict, seq2, 1).
-*/
-PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d,
-                                     PyObject *seq2,
-                                     int override);
-
-PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key);
-PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item);
-PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key);
-
-/* Dictionary (keys, values, items) views */
-
-PyAPI_DATA(PyTypeObject) PyDictKeys_Type;
-PyAPI_DATA(PyTypeObject) PyDictValues_Type;
-PyAPI_DATA(PyTypeObject) PyDictItems_Type;
-
-#define PyDictKeys_Check(op) PyObject_TypeCheck(op, &PyDictKeys_Type)
-#define PyDictValues_Check(op) PyObject_TypeCheck(op, &PyDictValues_Type)
-#define PyDictItems_Check(op) PyObject_TypeCheck(op, &PyDictItems_Type)
-/* This excludes Values, since they are not sets. */
-# define PyDictViewSet_Check(op) \
-    (PyDictKeys_Check(op) || PyDictItems_Check(op))
-
-/* Dictionary (key, value, items) iterators */
-
-PyAPI_DATA(PyTypeObject) PyDictIterKey_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterValue_Type;
-PyAPI_DATA(PyTypeObject) PyDictIterItem_Type;
-
-PyAPI_DATA(PyTypeObject) PyDictRevIterKey_Type;
-PyAPI_DATA(PyTypeObject) PyDictRevIterItem_Type;
-PyAPI_DATA(PyTypeObject) PyDictRevIterValue_Type;
-
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_DICTOBJECT_H
-#  include  "cpython/dictobject.h"
-#  undef Py_CPYTHON_DICTOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_DICTOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/dynamic_annotations.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/dynamic_annotations.h
deleted file mode 100644
index 0bd1a833c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/dynamic_annotations.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/* Copyright (c) 2008-2009, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ---
- * Author: Kostya Serebryany
- * Copied to CPython by Jeffrey Yasskin, with all macros renamed to
- * start with _Py_ to avoid colliding with users embedding Python, and
- * with deprecated macros removed.
- */
-
-/* This file defines dynamic annotations for use with dynamic analysis
-   tool such as valgrind, PIN, etc.
-
-   Dynamic annotation is a source code annotation that affects
-   the generated code (that is, the annotation is not a comment).
-   Each such annotation is attached to a particular
-   instruction and/or to a particular object (address) in the program.
-
-   The annotations that should be used by users are macros in all upper-case
-   (e.g., _Py_ANNOTATE_NEW_MEMORY).
-
-   Actual implementation of these macros may differ depending on the
-   dynamic analysis tool being used.
-
-   See http://code.google.com/p/data-race-test/  for more information.
-
-   This file supports the following dynamic analysis tools:
-   - None (DYNAMIC_ANNOTATIONS_ENABLED is not defined or zero).
-      Macros are defined empty.
-   - ThreadSanitizer, Helgrind, DRD (DYNAMIC_ANNOTATIONS_ENABLED is 1).
-      Macros are defined as calls to non-inlinable empty functions
-      that are intercepted by Valgrind. */
-
-#ifndef __DYNAMIC_ANNOTATIONS_H__
-#define __DYNAMIC_ANNOTATIONS_H__
-
-#ifndef DYNAMIC_ANNOTATIONS_ENABLED
-# define DYNAMIC_ANNOTATIONS_ENABLED 0
-#endif
-
-#if DYNAMIC_ANNOTATIONS_ENABLED != 0
-
-  /* -------------------------------------------------------------
-     Annotations useful when implementing condition variables such as CondVar,
-     using conditional critical sections (Await/LockWhen) and when constructing
-     user-defined synchronization mechanisms.
-
-     The annotations _Py_ANNOTATE_HAPPENS_BEFORE() and
-     _Py_ANNOTATE_HAPPENS_AFTER() can be used to define happens-before arcs in
-     user-defined synchronization mechanisms: the race detector will infer an
-     arc from the former to the latter when they share the same argument
-     pointer.
-
-     Example 1 (reference counting):
-
-     void Unref() {
-       _Py_ANNOTATE_HAPPENS_BEFORE(&refcount_);
-       if (AtomicDecrementByOne(&refcount_) == 0) {
-         _Py_ANNOTATE_HAPPENS_AFTER(&refcount_);
-         delete this;
-       }
-     }
-
-     Example 2 (message queue):
-
-     void MyQueue::Put(Type *e) {
-       MutexLock lock(&mu_);
-       _Py_ANNOTATE_HAPPENS_BEFORE(e);
-       PutElementIntoMyQueue(e);
-     }
-
-     Type *MyQueue::Get() {
-       MutexLock lock(&mu_);
-       Type *e = GetElementFromMyQueue();
-       _Py_ANNOTATE_HAPPENS_AFTER(e);
-       return e;
-     }
-
-     Note: when possible, please use the existing reference counting and message
-     queue implementations instead of inventing new ones. */
-
-  /* Report that wait on the condition variable at address "cv" has succeeded
-     and the lock at address "lock" is held. */
-#define _Py_ANNOTATE_CONDVAR_LOCK_WAIT(cv, lock) \
-    AnnotateCondVarWait(__FILE__, __LINE__, cv, lock)
-
-  /* Report that wait on the condition variable at "cv" has succeeded.  Variant
-     w/o lock. */
-#define _Py_ANNOTATE_CONDVAR_WAIT(cv) \
-    AnnotateCondVarWait(__FILE__, __LINE__, cv, NULL)
-
-  /* Report that we are about to signal on the condition variable at address
-     "cv". */
-#define _Py_ANNOTATE_CONDVAR_SIGNAL(cv) \
-    AnnotateCondVarSignal(__FILE__, __LINE__, cv)
-
-  /* Report that we are about to signal_all on the condition variable at "cv". */
-#define _Py_ANNOTATE_CONDVAR_SIGNAL_ALL(cv) \
-    AnnotateCondVarSignalAll(__FILE__, __LINE__, cv)
-
-  /* Annotations for user-defined synchronization mechanisms. */
-#define _Py_ANNOTATE_HAPPENS_BEFORE(obj) _Py_ANNOTATE_CONDVAR_SIGNAL(obj)
-#define _Py_ANNOTATE_HAPPENS_AFTER(obj)  _Py_ANNOTATE_CONDVAR_WAIT(obj)
-
-  /* Report that the bytes in the range [pointer, pointer+size) are about
-     to be published safely. The race checker will create a happens-before
-     arc from the call _Py_ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size) to
-     subsequent accesses to this memory.
-     Note: this annotation may not work properly if the race detector uses
-     sampling, i.e. does not observe all memory accesses.
-     */
-#define _Py_ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size) \
-    AnnotatePublishMemoryRange(__FILE__, __LINE__, pointer, size)
-
-  /* Instruct the tool to create a happens-before arc between mu->Unlock() and
-     mu->Lock(). This annotation may slow down the race detector and hide real
-     races. Normally it is used only when it would be difficult to annotate each
-     of the mutex's critical sections individually using the annotations above.
-     This annotation makes sense only for hybrid race detectors. For pure
-     happens-before detectors this is a no-op. For more details see
-     http://code.google.com/p/data-race-test/wiki/PureHappensBeforeVsHybrid . */
-#define _Py_ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(mu) \
-    AnnotateMutexIsUsedAsCondVar(__FILE__, __LINE__, mu)
-
-  /* -------------------------------------------------------------
-     Annotations useful when defining memory allocators, or when memory that
-     was protected in one way starts to be protected in another. */
-
-  /* Report that a new memory at "address" of size "size" has been allocated.
-     This might be used when the memory has been retrieved from a free list and
-     is about to be reused, or when the locking discipline for a variable
-     changes. */
-#define _Py_ANNOTATE_NEW_MEMORY(address, size) \
-    AnnotateNewMemory(__FILE__, __LINE__, address, size)
-
-  /* -------------------------------------------------------------
-     Annotations useful when defining FIFO queues that transfer data between
-     threads. */
-
-  /* Report that the producer-consumer queue (such as ProducerConsumerQueue) at
-     address "pcq" has been created.  The _Py_ANNOTATE_PCQ_* annotations should
-     be used only for FIFO queues.  For non-FIFO queues use
-     _Py_ANNOTATE_HAPPENS_BEFORE (for put) and _Py_ANNOTATE_HAPPENS_AFTER (for
-     get). */
-#define _Py_ANNOTATE_PCQ_CREATE(pcq) \
-    AnnotatePCQCreate(__FILE__, __LINE__, pcq)
-
-  /* Report that the queue at address "pcq" is about to be destroyed. */
-#define _Py_ANNOTATE_PCQ_DESTROY(pcq) \
-    AnnotatePCQDestroy(__FILE__, __LINE__, pcq)
-
-  /* Report that we are about to put an element into a FIFO queue at address
-     "pcq". */
-#define _Py_ANNOTATE_PCQ_PUT(pcq) \
-    AnnotatePCQPut(__FILE__, __LINE__, pcq)
-
-  /* Report that we've just got an element from a FIFO queue at address "pcq". */
-#define _Py_ANNOTATE_PCQ_GET(pcq) \
-    AnnotatePCQGet(__FILE__, __LINE__, pcq)
-
-  /* -------------------------------------------------------------
-     Annotations that suppress errors.  It is usually better to express the
-     program's synchronization using the other annotations, but these can
-     be used when all else fails. */
-
-  /* Report that we may have a benign race at "pointer", with size
-     "sizeof(*(pointer))". "pointer" must be a non-void* pointer.  Insert at the
-     point where "pointer" has been allocated, preferably close to the point
-     where the race happens.  See also _Py_ANNOTATE_BENIGN_RACE_STATIC. */
-#define _Py_ANNOTATE_BENIGN_RACE(pointer, description) \
-    AnnotateBenignRaceSized(__FILE__, __LINE__, pointer, \
-                            sizeof(*(pointer)), description)
-
-  /* Same as _Py_ANNOTATE_BENIGN_RACE(address, description), but applies to
-     the memory range [address, address+size). */
-#define _Py_ANNOTATE_BENIGN_RACE_SIZED(address, size, description) \
-    AnnotateBenignRaceSized(__FILE__, __LINE__, address, size, description)
-
-  /* Request the analysis tool to ignore all reads in the current thread
-     until _Py_ANNOTATE_IGNORE_READS_END is called.
-     Useful to ignore intentional racey reads, while still checking
-     other reads and all writes.
-     See also _Py_ANNOTATE_UNPROTECTED_READ. */
-#define _Py_ANNOTATE_IGNORE_READS_BEGIN() \
-    AnnotateIgnoreReadsBegin(__FILE__, __LINE__)
-
-  /* Stop ignoring reads. */
-#define _Py_ANNOTATE_IGNORE_READS_END() \
-    AnnotateIgnoreReadsEnd(__FILE__, __LINE__)
-
-  /* Similar to _Py_ANNOTATE_IGNORE_READS_BEGIN, but ignore writes. */
-#define _Py_ANNOTATE_IGNORE_WRITES_BEGIN() \
-    AnnotateIgnoreWritesBegin(__FILE__, __LINE__)
-
-  /* Stop ignoring writes. */
-#define _Py_ANNOTATE_IGNORE_WRITES_END() \
-    AnnotateIgnoreWritesEnd(__FILE__, __LINE__)
-
-  /* Start ignoring all memory accesses (reads and writes). */
-#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() \
-    do {\
-      _Py_ANNOTATE_IGNORE_READS_BEGIN();\
-      _Py_ANNOTATE_IGNORE_WRITES_BEGIN();\
-    }while(0)\
-
-  /* Stop ignoring all memory accesses. */
-#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_END() \
-    do {\
-      _Py_ANNOTATE_IGNORE_WRITES_END();\
-      _Py_ANNOTATE_IGNORE_READS_END();\
-    }while(0)\
-
-  /* Similar to _Py_ANNOTATE_IGNORE_READS_BEGIN, but ignore synchronization events:
-     RWLOCK* and CONDVAR*. */
-#define _Py_ANNOTATE_IGNORE_SYNC_BEGIN() \
-    AnnotateIgnoreSyncBegin(__FILE__, __LINE__)
-
-  /* Stop ignoring sync events. */
-#define _Py_ANNOTATE_IGNORE_SYNC_END() \
-    AnnotateIgnoreSyncEnd(__FILE__, __LINE__)
-
-
-  /* Enable (enable!=0) or disable (enable==0) race detection for all threads.
-     This annotation could be useful if you want to skip expensive race analysis
-     during some period of program execution, e.g. during initialization. */
-#define _Py_ANNOTATE_ENABLE_RACE_DETECTION(enable) \
-    AnnotateEnableRaceDetection(__FILE__, __LINE__, enable)
-
-  /* -------------------------------------------------------------
-     Annotations useful for debugging. */
-
-  /* Request to trace every access to "address". */
-#define _Py_ANNOTATE_TRACE_MEMORY(address) \
-    AnnotateTraceMemory(__FILE__, __LINE__, address)
-
-  /* Report the current thread name to a race detector. */
-#define _Py_ANNOTATE_THREAD_NAME(name) \
-    AnnotateThreadName(__FILE__, __LINE__, name)
-
-  /* -------------------------------------------------------------
-     Annotations useful when implementing locks.  They are not
-     normally needed by modules that merely use locks.
-     The "lock" argument is a pointer to the lock object. */
-
-  /* Report that a lock has been created at address "lock". */
-#define _Py_ANNOTATE_RWLOCK_CREATE(lock) \
-    AnnotateRWLockCreate(__FILE__, __LINE__, lock)
-
-  /* Report that the lock at address "lock" is about to be destroyed. */
-#define _Py_ANNOTATE_RWLOCK_DESTROY(lock) \
-    AnnotateRWLockDestroy(__FILE__, __LINE__, lock)
-
-  /* Report that the lock at address "lock" has been acquired.
-     is_w=1 for writer lock, is_w=0 for reader lock. */
-#define _Py_ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) \
-    AnnotateRWLockAcquired(__FILE__, __LINE__, lock, is_w)
-
-  /* Report that the lock at address "lock" is about to be released. */
-#define _Py_ANNOTATE_RWLOCK_RELEASED(lock, is_w) \
-    AnnotateRWLockReleased(__FILE__, __LINE__, lock, is_w)
-
-  /* -------------------------------------------------------------
-     Annotations useful when implementing barriers.  They are not
-     normally needed by modules that merely use barriers.
-     The "barrier" argument is a pointer to the barrier object. */
-
-  /* Report that the "barrier" has been initialized with initial "count".
-   If 'reinitialization_allowed' is true, initialization is allowed to happen
-   multiple times w/o calling barrier_destroy() */
-#define _Py_ANNOTATE_BARRIER_INIT(barrier, count, reinitialization_allowed) \
-    AnnotateBarrierInit(__FILE__, __LINE__, barrier, count, \
-                        reinitialization_allowed)
-
-  /* Report that we are about to enter barrier_wait("barrier"). */
-#define _Py_ANNOTATE_BARRIER_WAIT_BEFORE(barrier) \
-    AnnotateBarrierWaitBefore(__FILE__, __LINE__, barrier)
-
-  /* Report that we just exited barrier_wait("barrier"). */
-#define _Py_ANNOTATE_BARRIER_WAIT_AFTER(barrier) \
-    AnnotateBarrierWaitAfter(__FILE__, __LINE__, barrier)
-
-  /* Report that the "barrier" has been destroyed. */
-#define _Py_ANNOTATE_BARRIER_DESTROY(barrier) \
-    AnnotateBarrierDestroy(__FILE__, __LINE__, barrier)
-
-  /* -------------------------------------------------------------
-     Annotations useful for testing race detectors. */
-
-  /* Report that we expect a race on the variable at "address".
-     Use only in unit tests for a race detector. */
-#define _Py_ANNOTATE_EXPECT_RACE(address, description) \
-    AnnotateExpectRace(__FILE__, __LINE__, address, description)
-
-  /* A no-op. Insert where you like to test the interceptors. */
-#define _Py_ANNOTATE_NO_OP(arg) \
-    AnnotateNoOp(__FILE__, __LINE__, arg)
-
-  /* Force the race detector to flush its state. The actual effect depends on
-   * the implementation of the detector. */
-#define _Py_ANNOTATE_FLUSH_STATE() \
-    AnnotateFlushState(__FILE__, __LINE__)
-
-
-#else  /* DYNAMIC_ANNOTATIONS_ENABLED == 0 */
-
-#define _Py_ANNOTATE_RWLOCK_CREATE(lock) /* empty */
-#define _Py_ANNOTATE_RWLOCK_DESTROY(lock) /* empty */
-#define _Py_ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) /* empty */
-#define _Py_ANNOTATE_RWLOCK_RELEASED(lock, is_w) /* empty */
-#define _Py_ANNOTATE_BARRIER_INIT(barrier, count, reinitialization_allowed) /* */
-#define _Py_ANNOTATE_BARRIER_WAIT_BEFORE(barrier) /* empty */
-#define _Py_ANNOTATE_BARRIER_WAIT_AFTER(barrier) /* empty */
-#define _Py_ANNOTATE_BARRIER_DESTROY(barrier) /* empty */
-#define _Py_ANNOTATE_CONDVAR_LOCK_WAIT(cv, lock) /* empty */
-#define _Py_ANNOTATE_CONDVAR_WAIT(cv) /* empty */
-#define _Py_ANNOTATE_CONDVAR_SIGNAL(cv) /* empty */
-#define _Py_ANNOTATE_CONDVAR_SIGNAL_ALL(cv) /* empty */
-#define _Py_ANNOTATE_HAPPENS_BEFORE(obj) /* empty */
-#define _Py_ANNOTATE_HAPPENS_AFTER(obj) /* empty */
-#define _Py_ANNOTATE_PUBLISH_MEMORY_RANGE(address, size) /* empty */
-#define _Py_ANNOTATE_UNPUBLISH_MEMORY_RANGE(address, size)  /* empty */
-#define _Py_ANNOTATE_SWAP_MEMORY_RANGE(address, size)  /* empty */
-#define _Py_ANNOTATE_PCQ_CREATE(pcq) /* empty */
-#define _Py_ANNOTATE_PCQ_DESTROY(pcq) /* empty */
-#define _Py_ANNOTATE_PCQ_PUT(pcq) /* empty */
-#define _Py_ANNOTATE_PCQ_GET(pcq) /* empty */
-#define _Py_ANNOTATE_NEW_MEMORY(address, size) /* empty */
-#define _Py_ANNOTATE_EXPECT_RACE(address, description) /* empty */
-#define _Py_ANNOTATE_BENIGN_RACE(address, description) /* empty */
-#define _Py_ANNOTATE_BENIGN_RACE_SIZED(address, size, description) /* empty */
-#define _Py_ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(mu) /* empty */
-#define _Py_ANNOTATE_MUTEX_IS_USED_AS_CONDVAR(mu) /* empty */
-#define _Py_ANNOTATE_TRACE_MEMORY(arg) /* empty */
-#define _Py_ANNOTATE_THREAD_NAME(name) /* empty */
-#define _Py_ANNOTATE_IGNORE_READS_BEGIN() /* empty */
-#define _Py_ANNOTATE_IGNORE_READS_END() /* empty */
-#define _Py_ANNOTATE_IGNORE_WRITES_BEGIN() /* empty */
-#define _Py_ANNOTATE_IGNORE_WRITES_END() /* empty */
-#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() /* empty */
-#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_END() /* empty */
-#define _Py_ANNOTATE_IGNORE_SYNC_BEGIN() /* empty */
-#define _Py_ANNOTATE_IGNORE_SYNC_END() /* empty */
-#define _Py_ANNOTATE_ENABLE_RACE_DETECTION(enable) /* empty */
-#define _Py_ANNOTATE_NO_OP(arg) /* empty */
-#define _Py_ANNOTATE_FLUSH_STATE() /* empty */
-
-#endif  /* DYNAMIC_ANNOTATIONS_ENABLED */
-
-/* Use the macros above rather than using these functions directly. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-void AnnotateRWLockCreate(const char *file, int line,
-                          const volatile void *lock);
-void AnnotateRWLockDestroy(const char *file, int line,
-                           const volatile void *lock);
-void AnnotateRWLockAcquired(const char *file, int line,
-                            const volatile void *lock, long is_w);
-void AnnotateRWLockReleased(const char *file, int line,
-                            const volatile void *lock, long is_w);
-void AnnotateBarrierInit(const char *file, int line,
-                         const volatile void *barrier, long count,
-                         long reinitialization_allowed);
-void AnnotateBarrierWaitBefore(const char *file, int line,
-                               const volatile void *barrier);
-void AnnotateBarrierWaitAfter(const char *file, int line,
-                              const volatile void *barrier);
-void AnnotateBarrierDestroy(const char *file, int line,
-                            const volatile void *barrier);
-void AnnotateCondVarWait(const char *file, int line,
-                         const volatile void *cv,
-                         const volatile void *lock);
-void AnnotateCondVarSignal(const char *file, int line,
-                           const volatile void *cv);
-void AnnotateCondVarSignalAll(const char *file, int line,
-                              const volatile void *cv);
-void AnnotatePublishMemoryRange(const char *file, int line,
-                                const volatile void *address,
-                                long size);
-void AnnotateUnpublishMemoryRange(const char *file, int line,
-                                  const volatile void *address,
-                                  long size);
-void AnnotatePCQCreate(const char *file, int line,
-                       const volatile void *pcq);
-void AnnotatePCQDestroy(const char *file, int line,
-                        const volatile void *pcq);
-void AnnotatePCQPut(const char *file, int line,
-                    const volatile void *pcq);
-void AnnotatePCQGet(const char *file, int line,
-                    const volatile void *pcq);
-void AnnotateNewMemory(const char *file, int line,
-                       const volatile void *address,
-                       long size);
-void AnnotateExpectRace(const char *file, int line,
-                        const volatile void *address,
-                        const char *description);
-void AnnotateBenignRace(const char *file, int line,
-                        const volatile void *address,
-                        const char *description);
-void AnnotateBenignRaceSized(const char *file, int line,
-                        const volatile void *address,
-                        long size,
-                        const char *description);
-void AnnotateMutexIsUsedAsCondVar(const char *file, int line,
-                                  const volatile void *mu);
-void AnnotateTraceMemory(const char *file, int line,
-                         const volatile void *arg);
-void AnnotateThreadName(const char *file, int line,
-                        const char *name);
-void AnnotateIgnoreReadsBegin(const char *file, int line);
-void AnnotateIgnoreReadsEnd(const char *file, int line);
-void AnnotateIgnoreWritesBegin(const char *file, int line);
-void AnnotateIgnoreWritesEnd(const char *file, int line);
-void AnnotateEnableRaceDetection(const char *file, int line, int enable);
-void AnnotateNoOp(const char *file, int line,
-                  const volatile void *arg);
-void AnnotateFlushState(const char *file, int line);
-
-/* Return non-zero value if running under valgrind.
-
-  If "valgrind.h" is included into dynamic_annotations.c,
-  the regular valgrind mechanism will be used.
-  See http://valgrind.org/docs/manual/manual-core-adv.html about
-  RUNNING_ON_VALGRIND and other valgrind "client requests".
-  The file "valgrind.h" may be obtained by doing
-     svn co svn://svn.valgrind.org/valgrind/trunk/include
-
-  If for some reason you can't use "valgrind.h" or want to fake valgrind,
-  there are two ways to make this function return non-zero:
-    - Use environment variable: export RUNNING_ON_VALGRIND=1
-    - Make your tool intercept the function RunningOnValgrind() and
-      change its return value.
- */
-int RunningOnValgrind(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#if DYNAMIC_ANNOTATIONS_ENABLED != 0 && defined(__cplusplus)
-
-  /* _Py_ANNOTATE_UNPROTECTED_READ is the preferred way to annotate racey reads.
-
-     Instead of doing
-        _Py_ANNOTATE_IGNORE_READS_BEGIN();
-        ... = x;
-        _Py_ANNOTATE_IGNORE_READS_END();
-     one can use
-        ... = _Py_ANNOTATE_UNPROTECTED_READ(x); */
-  template <class T>
-  inline T _Py_ANNOTATE_UNPROTECTED_READ(const volatile T &x) {
-    _Py_ANNOTATE_IGNORE_READS_BEGIN();
-    T res = x;
-    _Py_ANNOTATE_IGNORE_READS_END();
-    return res;
-  }
-  /* Apply _Py_ANNOTATE_BENIGN_RACE_SIZED to a static variable. */
-#define _Py_ANNOTATE_BENIGN_RACE_STATIC(static_var, description)        \
-    namespace {                                                       \
-      class static_var ## _annotator {                                \
-       public:                                                        \
-        static_var ## _annotator() {                                  \
-          _Py_ANNOTATE_BENIGN_RACE_SIZED(&static_var,                     \
-                                      sizeof(static_var),             \
-            # static_var ": " description);                           \
-        }                                                             \
-      };                                                              \
-      static static_var ## _annotator the ## static_var ## _annotator;\
-    }
-#else /* DYNAMIC_ANNOTATIONS_ENABLED == 0 */
-
-#define _Py_ANNOTATE_UNPROTECTED_READ(x) (x)
-#define _Py_ANNOTATE_BENIGN_RACE_STATIC(static_var, description)  /* empty */
-
-#endif /* DYNAMIC_ANNOTATIONS_ENABLED */
-
-#endif  /* __DYNAMIC_ANNOTATIONS_H__ */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/enumobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/enumobject.h
deleted file mode 100644
index c14dbfc8c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/enumobject.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef Py_ENUMOBJECT_H
-#define Py_ENUMOBJECT_H
-
-/* Enumerate Object */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyEnum_Type;
-PyAPI_DATA(PyTypeObject) PyReversed_Type;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_ENUMOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/errcode.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/errcode.h
deleted file mode 100644
index 790518b8b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/errcode.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef Py_ERRCODE_H
-#define Py_ERRCODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Error codes passed around between file input, tokenizer, parser and
-   interpreter.  This is necessary so we can turn them into Python
-   exceptions at a higher level.  Note that some errors have a
-   slightly different meaning when passed from the tokenizer to the
-   parser than when passed from the parser to the interpreter; e.g.
-   the parser only returns E_EOF when it hits EOF immediately, and it
-   never returns E_OK. */
-
-#define E_OK            10      /* No error */
-#define E_EOF           11      /* End Of File */
-#define E_INTR          12      /* Interrupted */
-#define E_TOKEN         13      /* Bad token */
-#define E_SYNTAX        14      /* Syntax error */
-#define E_NOMEM         15      /* Ran out of memory */
-#define E_DONE          16      /* Parsing complete */
-#define E_ERROR         17      /* Execution error */
-#define E_TABSPACE      18      /* Inconsistent mixing of tabs and spaces */
-#define E_OVERFLOW      19      /* Node had too many children */
-#define E_TOODEEP       20      /* Too many indentation levels */
-#define E_DEDENT        21      /* No matching outer block for dedent */
-#define E_DECODE        22      /* Error in decoding into Unicode */
-#define E_EOFS          23      /* EOF in triple-quoted string */
-#define E_EOLS          24      /* EOL in single-quoted string */
-#define E_LINECONT      25      /* Unexpected characters after a line continuation */
-#define E_BADSINGLE     27      /* Ill-formed single statement input */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ERRCODE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/eval.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/eval.h
deleted file mode 100644
index 2c1c2d054..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/eval.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/* Interface to execute compiled code */
-
-#ifndef Py_EVAL_H
-#define Py_EVAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(PyObject *) PyEval_EvalCode(PyObject *, PyObject *, PyObject *);
-
-PyAPI_FUNC(PyObject *) PyEval_EvalCodeEx(PyObject *co,
-                                         PyObject *globals,
-                                         PyObject *locals,
-                                         PyObject *const *args, int argc,
-                                         PyObject *const *kwds, int kwdc,
-                                         PyObject *const *defs, int defc,
-                                         PyObject *kwdefs, PyObject *closure);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyEval_EvalCodeWithName(
-    PyObject *co,
-    PyObject *globals, PyObject *locals,
-    PyObject *const *args, Py_ssize_t argcount,
-    PyObject *const *kwnames, PyObject *const *kwargs,
-    Py_ssize_t kwcount, int kwstep,
-    PyObject *const *defs, Py_ssize_t defcount,
-    PyObject *kwdefs, PyObject *closure,
-    PyObject *name, PyObject *qualname);
-
-PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_EVAL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/exports.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/exports.h
deleted file mode 100644
index fc1a5c5ea..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/exports.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef Py_EXPORTS_H
-#define Py_EXPORTS_H
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-    #define Py_IMPORTED_SYMBOL __declspec(dllimport)
-    #define Py_EXPORTED_SYMBOL __declspec(dllexport)
-    #define Py_LOCAL_SYMBOL
-#else
-/*
- * If we only ever used gcc >= 5, we could use __has_attribute(visibility)
- * as a cross-platform way to determine if visibility is supported. However,
- * we may still need to support gcc >= 4, as some Ubuntu LTS and Centos versions
- * have 4 < gcc < 5.
- */
-    #ifndef __has_attribute
-      #define __has_attribute(x) 0  // Compatibility with non-clang compilers.
-    #endif
-    #if (defined(__GNUC__) && (__GNUC__ >= 4)) ||\
-        (defined(__clang__) && __has_attribute(visibility))
-        #define Py_IMPORTED_SYMBOL __attribute__ ((visibility ("default")))
-        #define Py_EXPORTED_SYMBOL __attribute__ ((visibility ("default")))
-        #define Py_LOCAL_SYMBOL  __attribute__ ((visibility ("hidden")))
-    #else
-        #define Py_IMPORTED_SYMBOL
-        #define Py_EXPORTED_SYMBOL
-        #define Py_LOCAL_SYMBOL
-    #endif
-#endif
-
-#endif /* Py_EXPORTS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/fileobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/fileobject.h
deleted file mode 100644
index 6ec2994aa..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/fileobject.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* File object interface (what's left of it -- see io.py) */
-
-#ifndef Py_FILEOBJECT_H
-#define Py_FILEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PY_STDIOTEXTMODE "b"
-
-PyAPI_FUNC(PyObject *) PyFile_FromFd(int, const char *, const char *, int,
-                                     const char *, const char *,
-                                     const char *, int);
-PyAPI_FUNC(PyObject *) PyFile_GetLine(PyObject *, int);
-PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int);
-PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *);
-PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *);
-
-/* The default encoding used by the platform file system APIs
-   If non-NULL, this is different than the default encoding for strings
-*/
-PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_DATA(const char *) Py_FileSystemDefaultEncodeErrors;
-#endif
-PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding;
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
-PyAPI_DATA(int) Py_UTF8Mode;
-#endif
-
-/* A routine to check if a file descriptor can be select()-ed. */
-#ifdef _MSC_VER
-    /* On Windows, any socket fd can be select()-ed, no matter how high */
-    #define _PyIsSelectable_fd(FD) (1)
-#else
-    #define _PyIsSelectable_fd(FD) ((unsigned int)(FD) < (unsigned int)FD_SETSIZE)
-#endif
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_FILEOBJECT_H
-#  include  "cpython/fileobject.h"
-#  undef Py_CPYTHON_FILEOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FILEOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/fileutils.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/fileutils.h
deleted file mode 100644
index 12bd071c4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/fileutils.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef Py_FILEUTILS_H
-#define Py_FILEUTILS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_FUNC(wchar_t *) Py_DecodeLocale(
-    const char *arg,
-    size_t *size);
-
-PyAPI_FUNC(char*) Py_EncodeLocale(
-    const wchar_t *text,
-    size_t *error_pos);
-
-PyAPI_FUNC(char*) _Py_EncodeLocaleRaw(
-    const wchar_t *text,
-    size_t *error_pos);
-#endif
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_FILEUTILS_H
-#  include  "cpython/fileutils.h"
-#  undef Py_CPYTHON_FILEUTILS_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FILEUTILS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/floatobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/floatobject.h
deleted file mode 100644
index e994aa8f2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/floatobject.h
+++ /dev/null
@@ -1,118 +0,0 @@
-
-/* Float object interface */
-
-/*
-PyFloatObject represents a (double precision) floating point number.
-*/
-
-#ifndef Py_FLOATOBJECT_H
-#define Py_FLOATOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_HEAD
-    double ob_fval;
-} PyFloatObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PyFloat_Type;
-
-#define PyFloat_Check(op) PyObject_TypeCheck(op, &PyFloat_Type)
-#define PyFloat_CheckExact(op) Py_IS_TYPE(op, &PyFloat_Type)
-
-#ifdef Py_NAN
-#define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN)
-#endif
-
-#define Py_RETURN_INF(sign) do                     \
-    if (copysign(1., sign) == 1.) {                \
-        return PyFloat_FromDouble(Py_HUGE_VAL);    \
-    } else {                        \
-        return PyFloat_FromDouble(-Py_HUGE_VAL);   \
-    } while(0)
-
-PyAPI_FUNC(double) PyFloat_GetMax(void);
-PyAPI_FUNC(double) PyFloat_GetMin(void);
-PyAPI_FUNC(PyObject *) PyFloat_GetInfo(void);
-
-/* Return Python float from string PyObject. */
-PyAPI_FUNC(PyObject *) PyFloat_FromString(PyObject*);
-
-/* Return Python float from C double. */
-PyAPI_FUNC(PyObject *) PyFloat_FromDouble(double);
-
-/* Extract C double from Python float.  The macro version trades safety for
-   speed. */
-PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *);
-#ifndef Py_LIMITED_API
-#define PyFloat_AS_DOUBLE(op) (((PyFloatObject *)(op))->ob_fval)
-#endif
-
-#ifndef Py_LIMITED_API
-/* _PyFloat_{Pack,Unpack}{4,8}
- *
- * The struct and pickle (at least) modules need an efficient platform-
- * independent way to store floating-point values as byte strings.
- * The Pack routines produce a string from a C double, and the Unpack
- * routines produce a C double from such a string.  The suffix (4 or 8)
- * specifies the number of bytes in the string.
- *
- * On platforms that appear to use (see _PyFloat_Init()) IEEE-754 formats
- * these functions work by copying bits.  On other platforms, the formats the
- * 4- byte format is identical to the IEEE-754 single precision format, and
- * the 8-byte format to the IEEE-754 double precision format, although the
- * packing of INFs and NaNs (if such things exist on the platform) isn't
- * handled correctly, and attempting to unpack a string containing an IEEE
- * INF or NaN will raise an exception.
- *
- * On non-IEEE platforms with more precision, or larger dynamic range, than
- * 754 supports, not all values can be packed; on non-IEEE platforms with less
- * precision, or smaller dynamic range, not all values can be unpacked.  What
- * happens in such cases is partly accidental (alas).
- */
-
-/* The pack routines write 2, 4 or 8 bytes, starting at p.  le is a bool
- * argument, true if you want the string in little-endian format (exponent
- * last, at p+1, p+3 or p+7), false if you want big-endian format (exponent
- * first, at p).
- * Return value:  0 if all is OK, -1 if error (and an exception is
- * set, most likely OverflowError).
- * There are two problems on non-IEEE platforms:
- * 1):  What this does is undefined if x is a NaN or infinity.
- * 2):  -0.0 and +0.0 produce the same string.
- */
-PyAPI_FUNC(int) _PyFloat_Pack2(double x, unsigned char *p, int le);
-PyAPI_FUNC(int) _PyFloat_Pack4(double x, unsigned char *p, int le);
-PyAPI_FUNC(int) _PyFloat_Pack8(double x, unsigned char *p, int le);
-
-/* The unpack routines read 2, 4 or 8 bytes, starting at p.  le is a bool
- * argument, true if the string is in little-endian format (exponent
- * last, at p+1, p+3 or p+7), false if big-endian (exponent first, at p).
- * Return value:  The unpacked double.  On error, this is -1.0 and
- * PyErr_Occurred() is true (and an exception is set, most likely
- * OverflowError).  Note that on a non-IEEE platform this will refuse
- * to unpack a string that represents a NaN or infinity.
- */
-PyAPI_FUNC(double) _PyFloat_Unpack2(const unsigned char *p, int le);
-PyAPI_FUNC(double) _PyFloat_Unpack4(const unsigned char *p, int le);
-PyAPI_FUNC(double) _PyFloat_Unpack8(const unsigned char *p, int le);
-
-PyAPI_FUNC(void) _PyFloat_DebugMallocStats(FILE* out);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(int) _PyFloat_FormatAdvancedWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    PyObject *format_spec,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif /* Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FLOATOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/frameobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/frameobject.h
deleted file mode 100644
index c118af120..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/frameobject.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Frame object interface */
-
-#ifndef Py_FRAMEOBJECT_H
-#define Py_FRAMEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "pyframe.h"
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_FRAMEOBJECT_H
-#  include  "cpython/frameobject.h"
-#  undef Py_CPYTHON_FRAMEOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FRAMEOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/funcobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/funcobject.h
deleted file mode 100644
index c5cc9d261..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/funcobject.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-/* Function object interface */
-#ifndef Py_LIMITED_API
-#ifndef Py_FUNCOBJECT_H
-#define Py_FUNCOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Function objects and code objects should not be confused with each other:
- *
- * Function objects are created by the execution of the 'def' statement.
- * They reference a code object in their __code__ attribute, which is a
- * purely syntactic object, i.e. nothing more than a compiled version of some
- * source code lines.  There is one code object per source code "fragment",
- * but each code object can be referenced by zero or many function objects
- * depending only on how many times the 'def' statement in the source was
- * executed so far.
- */
-
-typedef struct {
-    PyObject_HEAD
-    PyObject *func_code;        /* A code object, the __code__ attribute */
-    PyObject *func_globals;     /* A dictionary (other mappings won't do) */
-    PyObject *func_defaults;    /* NULL or a tuple */
-    PyObject *func_kwdefaults;  /* NULL or a dict */
-    PyObject *func_closure;     /* NULL or a tuple of cell objects */
-    PyObject *func_doc;         /* The __doc__ attribute, can be anything */
-    PyObject *func_name;        /* The __name__ attribute, a string object */
-    PyObject *func_dict;        /* The __dict__ attribute, a dict or NULL */
-    PyObject *func_weakreflist; /* List of weak references */
-    PyObject *func_module;      /* The __module__ attribute, can be anything */
-    PyObject *func_annotations; /* Annotations, a dict or NULL */
-    PyObject *func_qualname;    /* The qualified name */
-    vectorcallfunc vectorcall;
-
-    /* Invariant:
-     *     func_closure contains the bindings for func_code->co_freevars, so
-     *     PyTuple_Size(func_closure) == PyCode_GetNumFree(func_code)
-     *     (func_closure may be NULL if PyCode_GetNumFree(func_code) == 0).
-     */
-} PyFunctionObject;
-
-PyAPI_DATA(PyTypeObject) PyFunction_Type;
-
-#define PyFunction_Check(op) Py_IS_TYPE(op, &PyFunction_Type)
-
-PyAPI_FUNC(PyObject *) PyFunction_New(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_NewWithQualName(PyObject *, PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetCode(PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetGlobals(PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetModule(PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetDefaults(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetKwDefaults(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetKwDefaults(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetClosure(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyFunction_GetAnnotations(PyObject *);
-PyAPI_FUNC(int) PyFunction_SetAnnotations(PyObject *, PyObject *);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyFunction_Vectorcall(
-    PyObject *func,
-    PyObject *const *stack,
-    size_t nargsf,
-    PyObject *kwnames);
-#endif
-
-/* Macros for direct access to these values. Type checks are *not*
-   done, so use with care. */
-#define PyFunction_GET_CODE(func) \
-        (((PyFunctionObject *)func) -> func_code)
-#define PyFunction_GET_GLOBALS(func) \
-        (((PyFunctionObject *)func) -> func_globals)
-#define PyFunction_GET_MODULE(func) \
-        (((PyFunctionObject *)func) -> func_module)
-#define PyFunction_GET_DEFAULTS(func) \
-        (((PyFunctionObject *)func) -> func_defaults)
-#define PyFunction_GET_KW_DEFAULTS(func) \
-        (((PyFunctionObject *)func) -> func_kwdefaults)
-#define PyFunction_GET_CLOSURE(func) \
-        (((PyFunctionObject *)func) -> func_closure)
-#define PyFunction_GET_ANNOTATIONS(func) \
-        (((PyFunctionObject *)func) -> func_annotations)
-
-/* The classmethod and staticmethod types lives here, too */
-PyAPI_DATA(PyTypeObject) PyClassMethod_Type;
-PyAPI_DATA(PyTypeObject) PyStaticMethod_Type;
-
-PyAPI_FUNC(PyObject *) PyClassMethod_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyStaticMethod_New(PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_FUNCOBJECT_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/genericaliasobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/genericaliasobject.h
deleted file mode 100644
index cf002976b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/genericaliasobject.h
+++ /dev/null
@@ -1,14 +0,0 @@
-// Implementation of PEP 585: support list[int] etc.
-#ifndef Py_GENERICALIASOBJECT_H
-#define Py_GENERICALIASOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(PyObject *) Py_GenericAlias(PyObject *, PyObject *);
-PyAPI_DATA(PyTypeObject) Py_GenericAliasType;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_GENERICALIASOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/genobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/genobject.h
deleted file mode 100644
index 8ffd15646..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/genobject.h
+++ /dev/null
@@ -1,102 +0,0 @@
-
-/* Generator object interface */
-
-#ifndef Py_LIMITED_API
-#ifndef Py_GENOBJECT_H
-#define Py_GENOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "pystate.h"   /* _PyErr_StackItem */
-
-/* _PyGenObject_HEAD defines the initial segment of generator
-   and coroutine objects. */
-#define _PyGenObject_HEAD(prefix)                                           \
-    PyObject_HEAD                                                           \
-    /* Note: gi_frame can be NULL if the generator is "finished" */         \
-    PyFrameObject *prefix##_frame;                                          \
-    /* True if generator is being executed. */                              \
-    char prefix##_running;                                                  \
-    /* The code object backing the generator */                             \
-    PyObject *prefix##_code;                                                \
-    /* List of weak reference. */                                           \
-    PyObject *prefix##_weakreflist;                                         \
-    /* Name of the generator. */                                            \
-    PyObject *prefix##_name;                                                \
-    /* Qualified name of the generator. */                                  \
-    PyObject *prefix##_qualname;                                            \
-    _PyErr_StackItem prefix##_exc_state;
-
-typedef struct {
-    /* The gi_ prefix is intended to remind of generator-iterator. */
-    _PyGenObject_HEAD(gi)
-} PyGenObject;
-
-PyAPI_DATA(PyTypeObject) PyGen_Type;
-
-#define PyGen_Check(op) PyObject_TypeCheck(op, &PyGen_Type)
-#define PyGen_CheckExact(op) Py_IS_TYPE(op, &PyGen_Type)
-
-PyAPI_FUNC(PyObject *) PyGen_New(PyFrameObject *);
-PyAPI_FUNC(PyObject *) PyGen_NewWithQualName(PyFrameObject *,
-    PyObject *name, PyObject *qualname);
-PyAPI_FUNC(int) _PyGen_SetStopIterationValue(PyObject *);
-PyAPI_FUNC(int) _PyGen_FetchStopIterationValue(PyObject **);
-PyAPI_FUNC(PyObject *) _PyGen_Send(PyGenObject *, PyObject *);
-PyObject *_PyGen_yf(PyGenObject *);
-PyAPI_FUNC(void) _PyGen_Finalize(PyObject *self);
-
-#ifndef Py_LIMITED_API
-typedef struct {
-    _PyGenObject_HEAD(cr)
-    PyObject *cr_origin;
-} PyCoroObject;
-
-PyAPI_DATA(PyTypeObject) PyCoro_Type;
-PyAPI_DATA(PyTypeObject) _PyCoroWrapper_Type;
-
-#define PyCoro_CheckExact(op) Py_IS_TYPE(op, &PyCoro_Type)
-PyObject *_PyCoro_GetAwaitableIter(PyObject *o);
-PyAPI_FUNC(PyObject *) PyCoro_New(PyFrameObject *,
-    PyObject *name, PyObject *qualname);
-
-/* Asynchronous Generators */
-
-typedef struct {
-    _PyGenObject_HEAD(ag)
-    PyObject *ag_finalizer;
-
-    /* Flag is set to 1 when hooks set up by sys.set_asyncgen_hooks
-       were called on the generator, to avoid calling them more
-       than once. */
-    int ag_hooks_inited;
-
-    /* Flag is set to 1 when aclose() is called for the first time, or
-       when a StopAsyncIteration exception is raised. */
-    int ag_closed;
-
-    int ag_running_async;
-} PyAsyncGenObject;
-
-PyAPI_DATA(PyTypeObject) PyAsyncGen_Type;
-PyAPI_DATA(PyTypeObject) _PyAsyncGenASend_Type;
-PyAPI_DATA(PyTypeObject) _PyAsyncGenWrappedValue_Type;
-PyAPI_DATA(PyTypeObject) _PyAsyncGenAThrow_Type;
-
-PyAPI_FUNC(PyObject *) PyAsyncGen_New(PyFrameObject *,
-    PyObject *name, PyObject *qualname);
-
-#define PyAsyncGen_CheckExact(op) Py_IS_TYPE(op, &PyAsyncGen_Type)
-
-PyObject *_PyAsyncGenValueWrapperNew(PyObject *);
-
-#endif
-
-#undef _PyGenObject_HEAD
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_GENOBJECT_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/graminit.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/graminit.h
deleted file mode 100644
index d1027b7a7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/graminit.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Generated by Parser/pgen */
-
-#define single_input 256
-#define file_input 257
-#define eval_input 258
-#define decorator 259
-#define decorators 260
-#define decorated 261
-#define async_funcdef 262
-#define funcdef 263
-#define parameters 264
-#define typedargslist 265
-#define tfpdef 266
-#define varargslist 267
-#define vfpdef 268
-#define stmt 269
-#define simple_stmt 270
-#define small_stmt 271
-#define expr_stmt 272
-#define annassign 273
-#define testlist_star_expr 274
-#define augassign 275
-#define del_stmt 276
-#define pass_stmt 277
-#define flow_stmt 278
-#define break_stmt 279
-#define continue_stmt 280
-#define return_stmt 281
-#define yield_stmt 282
-#define raise_stmt 283
-#define import_stmt 284
-#define import_name 285
-#define import_from 286
-#define import_as_name 287
-#define dotted_as_name 288
-#define import_as_names 289
-#define dotted_as_names 290
-#define dotted_name 291
-#define global_stmt 292
-#define nonlocal_stmt 293
-#define assert_stmt 294
-#define compound_stmt 295
-#define async_stmt 296
-#define if_stmt 297
-#define while_stmt 298
-#define for_stmt 299
-#define try_stmt 300
-#define with_stmt 301
-#define with_item 302
-#define except_clause 303
-#define suite 304
-#define namedexpr_test 305
-#define test 306
-#define test_nocond 307
-#define lambdef 308
-#define lambdef_nocond 309
-#define or_test 310
-#define and_test 311
-#define not_test 312
-#define comparison 313
-#define comp_op 314
-#define star_expr 315
-#define expr 316
-#define xor_expr 317
-#define and_expr 318
-#define shift_expr 319
-#define arith_expr 320
-#define term 321
-#define factor 322
-#define power 323
-#define atom_expr 324
-#define atom 325
-#define testlist_comp 326
-#define trailer 327
-#define subscriptlist 328
-#define subscript 329
-#define sliceop 330
-#define exprlist 331
-#define testlist 332
-#define dictorsetmaker 333
-#define classdef 334
-#define arglist 335
-#define argument 336
-#define comp_iter 337
-#define sync_comp_for 338
-#define comp_for 339
-#define comp_if 340
-#define encoding_decl 341
-#define yield_expr 342
-#define yield_arg 343
-#define func_body_suite 344
-#define func_type_input 345
-#define func_type 346
-#define typelist 347
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/grammar.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/grammar.h
deleted file mode 100644
index 4b66b1e9b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/grammar.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-/* Grammar interface */
-
-#ifndef Py_GRAMMAR_H
-#define Py_GRAMMAR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "bitset.h" /* Sigh... */
-
-/* A label of an arc */
-
-typedef struct {
-    int          lb_type;
-    const char  *lb_str;
-} label;
-
-#define EMPTY 0         /* Label number 0 is by definition the empty label */
-
-/* A list of labels */
-
-typedef struct {
-    int          ll_nlabels;
-    const label *ll_label;
-} labellist;
-
-/* An arc from one state to another */
-
-typedef struct {
-    short       a_lbl;          /* Label of this arc */
-    short       a_arrow;        /* State where this arc goes to */
-} arc;
-
-/* A state in a DFA */
-
-typedef struct {
-    int          s_narcs;
-    const arc   *s_arc;         /* Array of arcs */
-
-    /* Optional accelerators */
-    int          s_lower;       /* Lowest label index */
-    int          s_upper;       /* Highest label index */
-    int         *s_accel;       /* Accelerator */
-    int          s_accept;      /* Nonzero for accepting state */
-} state;
-
-/* A DFA */
-
-typedef struct {
-    int          d_type;        /* Non-terminal this represents */
-    char        *d_name;        /* For printing */
-    int          d_nstates;
-    state       *d_state;       /* Array of states */
-    bitset       d_first;
-} dfa;
-
-/* A grammar */
-
-typedef struct {
-    int          g_ndfas;
-    const dfa   *g_dfa;         /* Array of DFAs */
-    const labellist g_ll;
-    int          g_start;       /* Start symbol of the grammar */
-    int          g_accel;       /* Set if accelerators present */
-} grammar;
-
-/* FUNCTIONS */
-const dfa *PyGrammar_FindDFA(grammar *g, int type);
-const char *PyGrammar_LabelRepr(label *lb);
-void PyGrammar_AddAccelerators(grammar *g);
-void PyGrammar_RemoveAccelerators(grammar *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_GRAMMAR_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/import.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/import.h
deleted file mode 100644
index aeef3efd0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/import.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Module definition and import interface */
-
-#ifndef Py_IMPORT_H
-#define Py_IMPORT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(long) PyImport_GetMagicNumber(void);
-PyAPI_FUNC(const char *) PyImport_GetMagicTag(void);
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(
-    const char *name,           /* UTF-8 encoded string */
-    PyObject *co
-    );
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx(
-    const char *name,           /* UTF-8 encoded string */
-    PyObject *co,
-    const char *pathname        /* decoded from the filesystem encoding */
-    );
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleWithPathnames(
-    const char *name,           /* UTF-8 encoded string */
-    PyObject *co,
-    const char *pathname,       /* decoded from the filesystem encoding */
-    const char *cpathname       /* decoded from the filesystem encoding */
-    );
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject(
-    PyObject *name,
-    PyObject *co,
-    PyObject *pathname,
-    PyObject *cpathname
-    );
-#endif
-PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
-PyAPI_FUNC(PyObject *) PyImport_GetModule(PyObject *name);
-#endif
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyImport_AddModuleObject(
-    PyObject *name
-    );
-#endif
-PyAPI_FUNC(PyObject *) PyImport_AddModule(
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) PyImport_ImportModule(
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(
-    const char *name,           /* UTF-8 encoded string */
-    PyObject *globals,
-    PyObject *locals,
-    PyObject *fromlist,
-    int level
-    );
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevelObject(
-    PyObject *name,
-    PyObject *globals,
-    PyObject *locals,
-    PyObject *fromlist,
-    int level
-    );
-#endif
-
-#define PyImport_ImportModuleEx(n, g, l, f) \
-    PyImport_ImportModuleLevel(n, g, l, f, 0)
-
-PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path);
-PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
-PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(int) PyImport_ImportFrozenModuleObject(
-    PyObject *name
-    );
-#endif
-PyAPI_FUNC(int) PyImport_ImportFrozenModule(
-    const char *name            /* UTF-8 encoded string */
-    );
-
-PyAPI_FUNC(int) PyImport_AppendInittab(
-    const char *name,           /* ASCII encoded string */
-    PyObject* (*initfunc)(void)
-    );
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_IMPORT_H
-#  include  "cpython/import.h"
-#  undef Py_CPYTHON_IMPORT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_IMPORT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pegen_interface.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pegen_interface.h
deleted file mode 100644
index ee4c77ec0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pegen_interface.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef Py_PEGENINTERFACE
-#define Py_PEGENINTERFACE
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "Python.h"
-#include "Python-ast.h"
-
-PyAPI_FUNC(mod_ty) PyPegen_ASTFromString(
-    const char *str,
-    const char *filename,
-    int mode,
-    PyCompilerFlags *flags,
-    PyArena *arena);
-PyAPI_FUNC(mod_ty) PyPegen_ASTFromStringObject(
-    const char *str,
-    PyObject* filename,
-    int mode,
-    PyCompilerFlags *flags,
-    PyArena *arena);
-PyAPI_FUNC(mod_ty) PyPegen_ASTFromFileObject(
-    FILE *fp,
-    PyObject *filename_ob,
-    int mode,
-    const char *enc,
-    const char *ps1,
-    const char *ps2,
-    PyCompilerFlags *flags,
-    int *errcode,
-    PyArena *arena);
-PyAPI_FUNC(mod_ty) PyPegen_ASTFromFilename(
-    const char *filename,
-    int mode,
-    PyCompilerFlags *flags,
-    PyArena *arena);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PEGENINTERFACE*/
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_abstract.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_abstract.h
deleted file mode 100644
index b791bf243..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_abstract.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef Py_INTERNAL_ABSTRACT_H
-#define Py_INTERNAL_ABSTRACT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-// Fast inlined version of PyIndex_Check()
-static inline int
-_PyIndex_Check(PyObject *obj)
-{
-    PyNumberMethods *tp_as_number = Py_TYPE(obj)->tp_as_number;
-    return (tp_as_number != NULL && tp_as_number->nb_index != NULL);
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_ABSTRACT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_accu.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_accu.h
deleted file mode 100644
index d346222e4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_accu.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_INTERNAL_ACCU_H
-#define Py_INTERNAL_ACCU_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*** This is a private API for use by the interpreter and the stdlib.
- *** Its definition may be changed or removed at any moment.
- ***/
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/*
- * A two-level accumulator of unicode objects that avoids both the overhead
- * of keeping a huge number of small separate objects, and the quadratic
- * behaviour of using a naive repeated concatenation scheme.
- */
-
-#undef small /* defined by some Windows headers */
-
-typedef struct {
-    PyObject *large;  /* A list of previously accumulated large strings */
-    PyObject *small;  /* Pending small strings */
-} _PyAccu;
-
-PyAPI_FUNC(int) _PyAccu_Init(_PyAccu *acc);
-PyAPI_FUNC(int) _PyAccu_Accumulate(_PyAccu *acc, PyObject *unicode);
-PyAPI_FUNC(PyObject *) _PyAccu_FinishAsList(_PyAccu *acc);
-PyAPI_FUNC(PyObject *) _PyAccu_Finish(_PyAccu *acc);
-PyAPI_FUNC(void) _PyAccu_Destroy(_PyAccu *acc);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_ACCU_H */
-#endif /* !Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_atomic.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_atomic.h
deleted file mode 100644
index 1d5c56216..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_atomic.h
+++ /dev/null
@@ -1,557 +0,0 @@
-#ifndef Py_ATOMIC_H
-#define Py_ATOMIC_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "dynamic_annotations.h"   /* _Py_ANNOTATE_MEMORY_ORDER */
-#include "pyconfig.h"
-
-#if defined(HAVE_STD_ATOMIC)
-#include <stdatomic.h>
-#endif
-
-
-#if defined(_MSC_VER)
-#include <intrin.h>
-#if defined(_M_IX86) || defined(_M_X64)
-#  include <immintrin.h>
-#endif
-#endif
-
-/* This is modeled after the atomics interface from C1x, according to
- * the draft at
- * http://www.open-std.org/JTC1/SC22/wg14/www/docs/n1425.pdf.
- * Operations and types are named the same except with a _Py_ prefix
- * and have the same semantics.
- *
- * Beware, the implementations here are deep magic.
- */
-
-#if defined(HAVE_STD_ATOMIC)
-
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed = memory_order_relaxed,
-    _Py_memory_order_acquire = memory_order_acquire,
-    _Py_memory_order_release = memory_order_release,
-    _Py_memory_order_acq_rel = memory_order_acq_rel,
-    _Py_memory_order_seq_cst = memory_order_seq_cst
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    atomic_uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    atomic_int _value;
-} _Py_atomic_int;
-
-#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \
-    atomic_signal_fence(ORDER)
-
-#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \
-    atomic_thread_fence(ORDER)
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    atomic_store_explicit(&((ATOMIC_VAL)->_value), NEW_VAL, ORDER)
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-    atomic_load_explicit(&((ATOMIC_VAL)->_value), ORDER)
-
-/* Use builtin atomic operations in GCC >= 4.7 */
-#elif defined(HAVE_BUILTIN_ATOMIC)
-
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed = __ATOMIC_RELAXED,
-    _Py_memory_order_acquire = __ATOMIC_ACQUIRE,
-    _Py_memory_order_release = __ATOMIC_RELEASE,
-    _Py_memory_order_acq_rel = __ATOMIC_ACQ_REL,
-    _Py_memory_order_seq_cst = __ATOMIC_SEQ_CST
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    int _value;
-} _Py_atomic_int;
-
-#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \
-    __atomic_signal_fence(ORDER)
-
-#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \
-    __atomic_thread_fence(ORDER)
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    (assert((ORDER) == __ATOMIC_RELAXED                       \
-            || (ORDER) == __ATOMIC_SEQ_CST                    \
-            || (ORDER) == __ATOMIC_RELEASE),                  \
-     __atomic_store_n(&((ATOMIC_VAL)->_value), NEW_VAL, ORDER))
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER)           \
-    (assert((ORDER) == __ATOMIC_RELAXED                       \
-            || (ORDER) == __ATOMIC_SEQ_CST                    \
-            || (ORDER) == __ATOMIC_ACQUIRE                    \
-            || (ORDER) == __ATOMIC_CONSUME),                  \
-     __atomic_load_n(&((ATOMIC_VAL)->_value), ORDER))
-
-/* Only support GCC (for expression statements) and x86 (for simple
- * atomic semantics) and MSVC x86/x64/ARM */
-#elif defined(__GNUC__) && (defined(__i386__) || defined(__amd64))
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed,
-    _Py_memory_order_acquire,
-    _Py_memory_order_release,
-    _Py_memory_order_acq_rel,
-    _Py_memory_order_seq_cst
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    int _value;
-} _Py_atomic_int;
-
-
-static __inline__ void
-_Py_atomic_signal_fence(_Py_memory_order order)
-{
-    if (order != _Py_memory_order_relaxed)
-        __asm__ volatile("":::"memory");
-}
-
-static __inline__ void
-_Py_atomic_thread_fence(_Py_memory_order order)
-{
-    if (order != _Py_memory_order_relaxed)
-        __asm__ volatile("mfence":::"memory");
-}
-
-/* Tell the race checker about this operation's effects. */
-static __inline__ void
-_Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
-{
-    (void)address;              /* shut up -Wunused-parameter */
-    switch(order) {
-    case _Py_memory_order_release:
-    case _Py_memory_order_acq_rel:
-    case _Py_memory_order_seq_cst:
-        _Py_ANNOTATE_HAPPENS_BEFORE(address);
-        break;
-    case _Py_memory_order_relaxed:
-    case _Py_memory_order_acquire:
-        break;
-    }
-    switch(order) {
-    case _Py_memory_order_acquire:
-    case _Py_memory_order_acq_rel:
-    case _Py_memory_order_seq_cst:
-        _Py_ANNOTATE_HAPPENS_AFTER(address);
-        break;
-    case _Py_memory_order_relaxed:
-    case _Py_memory_order_release:
-        break;
-    }
-}
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    __extension__ ({ \
-        __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \
-        __typeof__(atomic_val->_value) new_val = NEW_VAL;\
-        volatile __typeof__(new_val) *volatile_data = &atomic_val->_value; \
-        _Py_memory_order order = ORDER; \
-        _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \
-        \
-        /* Perform the operation. */ \
-        _Py_ANNOTATE_IGNORE_WRITES_BEGIN(); \
-        switch(order) { \
-        case _Py_memory_order_release: \
-            _Py_atomic_signal_fence(_Py_memory_order_release); \
-            /* fallthrough */ \
-        case _Py_memory_order_relaxed: \
-            *volatile_data = new_val; \
-            break; \
-        \
-        case _Py_memory_order_acquire: \
-        case _Py_memory_order_acq_rel: \
-        case _Py_memory_order_seq_cst: \
-            __asm__ volatile("xchg %0, %1" \
-                         : "+r"(new_val) \
-                         : "m"(atomic_val->_value) \
-                         : "memory"); \
-            break; \
-        } \
-        _Py_ANNOTATE_IGNORE_WRITES_END(); \
-    })
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-    __extension__ ({  \
-        __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \
-        __typeof__(atomic_val->_value) result; \
-        volatile __typeof__(result) *volatile_data = &atomic_val->_value; \
-        _Py_memory_order order = ORDER; \
-        _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \
-        \
-        /* Perform the operation. */ \
-        _Py_ANNOTATE_IGNORE_READS_BEGIN(); \
-        switch(order) { \
-        case _Py_memory_order_release: \
-        case _Py_memory_order_acq_rel: \
-        case _Py_memory_order_seq_cst: \
-            /* Loads on x86 are not releases by default, so need a */ \
-            /* thread fence. */ \
-            _Py_atomic_thread_fence(_Py_memory_order_release); \
-            break; \
-        default: \
-            /* No fence */ \
-            break; \
-        } \
-        result = *volatile_data; \
-        switch(order) { \
-        case _Py_memory_order_acquire: \
-        case _Py_memory_order_acq_rel: \
-        case _Py_memory_order_seq_cst: \
-            /* Loads on x86 are automatically acquire operations so */ \
-            /* can get by with just a compiler fence. */ \
-            _Py_atomic_signal_fence(_Py_memory_order_acquire); \
-            break; \
-        default: \
-            /* No fence */ \
-            break; \
-        } \
-        _Py_ANNOTATE_IGNORE_READS_END(); \
-        result; \
-    })
-
-#elif defined(_MSC_VER)
-/*  _Interlocked* functions provide a full memory barrier and are therefore
-    enough for acq_rel and seq_cst. If the HLE variants aren't available
-    in hardware they will fall back to a full memory barrier as well.
-
-    This might affect performance but likely only in some very specific and
-    hard to meassure scenario.
-*/
-#if defined(_M_IX86) || defined(_M_X64)
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed,
-    _Py_memory_order_acquire,
-    _Py_memory_order_release,
-    _Py_memory_order_acq_rel,
-    _Py_memory_order_seq_cst
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    volatile uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    volatile int _value;
-} _Py_atomic_int;
-
-
-#if defined(_M_X64)
-#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    switch (ORDER) { \
-    case _Py_memory_order_acquire: \
-      _InterlockedExchange64_HLEAcquire((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)(NEW_VAL)); \
-      break; \
-    case _Py_memory_order_release: \
-      _InterlockedExchange64_HLERelease((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)(NEW_VAL)); \
-      break; \
-    default: \
-      _InterlockedExchange64((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)(NEW_VAL)); \
-      break; \
-  }
-#else
-#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) ((void)0);
-#endif
-
-#define _Py_atomic_store_32bit(ATOMIC_VAL, NEW_VAL, ORDER) \
-  switch (ORDER) { \
-  case _Py_memory_order_acquire: \
-    _InterlockedExchange_HLEAcquire((volatile long*)&((ATOMIC_VAL)->_value), (int)(NEW_VAL)); \
-    break; \
-  case _Py_memory_order_release: \
-    _InterlockedExchange_HLERelease((volatile long*)&((ATOMIC_VAL)->_value), (int)(NEW_VAL)); \
-    break; \
-  default: \
-    _InterlockedExchange((volatile long*)&((ATOMIC_VAL)->_value), (int)(NEW_VAL)); \
-    break; \
-  }
-
-#if defined(_M_X64)
-/*  This has to be an intptr_t for now.
-    gil_created() uses -1 as a sentinel value, if this returns
-    a uintptr_t it will do an unsigned compare and crash
-*/
-inline intptr_t _Py_atomic_load_64bit_impl(volatile uintptr_t* value, int order) {
-    __int64 old;
-    switch (order) {
-    case _Py_memory_order_acquire:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange64_HLEAcquire((volatile __int64*)value, old, old) != old);
-      break;
-    }
-    case _Py_memory_order_release:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange64_HLERelease((volatile __int64*)value, old, old) != old);
-      break;
-    }
-    case _Py_memory_order_relaxed:
-      old = *value;
-      break;
-    default:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange64((volatile __int64*)value, old, old) != old);
-      break;
-    }
-    }
-    return old;
-}
-
-#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) \
-    _Py_atomic_load_64bit_impl((volatile uintptr_t*)&((ATOMIC_VAL)->_value), (ORDER))
-
-#else
-#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) ((ATOMIC_VAL)->_value)
-#endif
-
-inline int _Py_atomic_load_32bit_impl(volatile int* value, int order) {
-    long old;
-    switch (order) {
-    case _Py_memory_order_acquire:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange_HLEAcquire((volatile long*)value, old, old) != old);
-      break;
-    }
-    case _Py_memory_order_release:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange_HLERelease((volatile long*)value, old, old) != old);
-      break;
-    }
-    case _Py_memory_order_relaxed:
-      old = *value;
-      break;
-    default:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange((volatile long*)value, old, old) != old);
-      break;
-    }
-    }
-    return old;
-}
-
-#define _Py_atomic_load_32bit(ATOMIC_VAL, ORDER) \
-    _Py_atomic_load_32bit_impl((volatile int*)&((ATOMIC_VAL)->_value), (ORDER))
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-  if (sizeof((ATOMIC_VAL)->_value) == 8) { \
-    _Py_atomic_store_64bit((ATOMIC_VAL), NEW_VAL, ORDER) } else { \
-    _Py_atomic_store_32bit((ATOMIC_VAL), NEW_VAL, ORDER) }
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-  ( \
-    sizeof((ATOMIC_VAL)->_value) == 8 ? \
-    _Py_atomic_load_64bit((ATOMIC_VAL), ORDER) : \
-    _Py_atomic_load_32bit((ATOMIC_VAL), ORDER) \
-  )
-#elif defined(_M_ARM) || defined(_M_ARM64)
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed,
-    _Py_memory_order_acquire,
-    _Py_memory_order_release,
-    _Py_memory_order_acq_rel,
-    _Py_memory_order_seq_cst
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    volatile uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    volatile int _value;
-} _Py_atomic_int;
-
-
-#if defined(_M_ARM64)
-#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    switch (ORDER) { \
-    case _Py_memory_order_acquire: \
-      _InterlockedExchange64_acq((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)NEW_VAL); \
-      break; \
-    case _Py_memory_order_release: \
-      _InterlockedExchange64_rel((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)NEW_VAL); \
-      break; \
-    default: \
-      _InterlockedExchange64((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)NEW_VAL); \
-      break; \
-  }
-#else
-#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) ((void)0);
-#endif
-
-#define _Py_atomic_store_32bit(ATOMIC_VAL, NEW_VAL, ORDER) \
-  switch (ORDER) { \
-  case _Py_memory_order_acquire: \
-    _InterlockedExchange_acq((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \
-    break; \
-  case _Py_memory_order_release: \
-    _InterlockedExchange_rel((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \
-    break; \
-  default: \
-    _InterlockedExchange((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \
-    break; \
-  }
-
-#if defined(_M_ARM64)
-/*  This has to be an intptr_t for now.
-    gil_created() uses -1 as a sentinel value, if this returns
-    a uintptr_t it will do an unsigned compare and crash
-*/
-inline intptr_t _Py_atomic_load_64bit_impl(volatile uintptr_t* value, int order) {
-    uintptr_t old;
-    switch (order) {
-    case _Py_memory_order_acquire:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange64_acq(value, old, old) != old);
-      break;
-    }
-    case _Py_memory_order_release:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange64_rel(value, old, old) != old);
-      break;
-    }
-    case _Py_memory_order_relaxed:
-      old = *value;
-      break;
-    default:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange64(value, old, old) != old);
-      break;
-    }
-    }
-    return old;
-}
-
-#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) \
-    _Py_atomic_load_64bit_impl((volatile uintptr_t*)&((ATOMIC_VAL)->_value), (ORDER))
-
-#else
-#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) ((ATOMIC_VAL)->_value)
-#endif
-
-inline int _Py_atomic_load_32bit_impl(volatile int* value, int order) {
-    int old;
-    switch (order) {
-    case _Py_memory_order_acquire:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange_acq(value, old, old) != old);
-      break;
-    }
-    case _Py_memory_order_release:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange_rel(value, old, old) != old);
-      break;
-    }
-    case _Py_memory_order_relaxed:
-      old = *value;
-      break;
-    default:
-    {
-      do {
-        old = *value;
-      } while(_InterlockedCompareExchange(value, old, old) != old);
-      break;
-    }
-    }
-    return old;
-}
-
-#define _Py_atomic_load_32bit(ATOMIC_VAL, ORDER) \
-    _Py_atomic_load_32bit_impl((volatile int*)&((ATOMIC_VAL)->_value), (ORDER))
-
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-  if (sizeof((ATOMIC_VAL)->_value) == 8) { \
-    _Py_atomic_store_64bit((ATOMIC_VAL), (NEW_VAL), (ORDER)) } else { \
-    _Py_atomic_store_32bit((ATOMIC_VAL), (NEW_VAL), (ORDER)) }
-
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-  ( \
-    sizeof((ATOMIC_VAL)->_value) == 8 ? \
-    _Py_atomic_load_64bit((ATOMIC_VAL), (ORDER)) : \
-    _Py_atomic_load_32bit((ATOMIC_VAL), (ORDER)) \
-  )
-#endif
-#else  /* !gcc x86  !_msc_ver */
-typedef enum _Py_memory_order {
-    _Py_memory_order_relaxed,
-    _Py_memory_order_acquire,
-    _Py_memory_order_release,
-    _Py_memory_order_acq_rel,
-    _Py_memory_order_seq_cst
-} _Py_memory_order;
-
-typedef struct _Py_atomic_address {
-    uintptr_t _value;
-} _Py_atomic_address;
-
-typedef struct _Py_atomic_int {
-    int _value;
-} _Py_atomic_int;
-/* Fall back to other compilers and processors by assuming that simple
-   volatile accesses are atomic.  This is false, so people should port
-   this. */
-#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) ((void)0)
-#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) ((void)0)
-#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
-    ((ATOMIC_VAL)->_value = NEW_VAL)
-#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
-    ((ATOMIC_VAL)->_value)
-#endif
-
-/* Standardized shortcuts. */
-#define _Py_atomic_store(ATOMIC_VAL, NEW_VAL) \
-    _Py_atomic_store_explicit((ATOMIC_VAL), (NEW_VAL), _Py_memory_order_seq_cst)
-#define _Py_atomic_load(ATOMIC_VAL) \
-    _Py_atomic_load_explicit((ATOMIC_VAL), _Py_memory_order_seq_cst)
-
-/* Python-local extensions */
-
-#define _Py_atomic_store_relaxed(ATOMIC_VAL, NEW_VAL) \
-    _Py_atomic_store_explicit((ATOMIC_VAL), (NEW_VAL), _Py_memory_order_relaxed)
-#define _Py_atomic_load_relaxed(ATOMIC_VAL) \
-    _Py_atomic_load_explicit((ATOMIC_VAL), _Py_memory_order_relaxed)
-
-#ifdef __cplusplus
-}
-#endif
-#endif  /* Py_ATOMIC_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_bytes_methods.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_bytes_methods.h
deleted file mode 100644
index 11e8ab20e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_bytes_methods.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_BYTES_CTYPE_H
-#define Py_BYTES_CTYPE_H
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/*
- * The internal implementation behind PyBytes (bytes) and PyByteArray (bytearray)
- * methods of the given names, they operate on ASCII byte strings.
- */
-extern PyObject* _Py_bytes_isspace(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isalpha(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isalnum(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isascii(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isdigit(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_islower(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_isupper(const char *cptr, Py_ssize_t len);
-extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len);
-
-/* These store their len sized answer in the given preallocated *result arg. */
-extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len);
-extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len);
-extern void _Py_bytes_title(char *result, const char *s, Py_ssize_t len);
-extern void _Py_bytes_capitalize(char *result, const char *s, Py_ssize_t len);
-extern void _Py_bytes_swapcase(char *result, const char *s, Py_ssize_t len);
-
-extern PyObject *_Py_bytes_find(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_index(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_rfind(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_rindex(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_count(const char *str, Py_ssize_t len, PyObject *args);
-extern int _Py_bytes_contains(const char *str, Py_ssize_t len, PyObject *arg);
-extern PyObject *_Py_bytes_startswith(const char *str, Py_ssize_t len, PyObject *args);
-extern PyObject *_Py_bytes_endswith(const char *str, Py_ssize_t len, PyObject *args);
-
-/* The maketrans() static method. */
-extern PyObject* _Py_bytes_maketrans(Py_buffer *frm, Py_buffer *to);
-
-/* Shared __doc__ strings. */
-extern const char _Py_isspace__doc__[];
-extern const char _Py_isalpha__doc__[];
-extern const char _Py_isalnum__doc__[];
-extern const char _Py_isascii__doc__[];
-extern const char _Py_isdigit__doc__[];
-extern const char _Py_islower__doc__[];
-extern const char _Py_isupper__doc__[];
-extern const char _Py_istitle__doc__[];
-extern const char _Py_lower__doc__[];
-extern const char _Py_upper__doc__[];
-extern const char _Py_title__doc__[];
-extern const char _Py_capitalize__doc__[];
-extern const char _Py_swapcase__doc__[];
-extern const char _Py_count__doc__[];
-extern const char _Py_find__doc__[];
-extern const char _Py_index__doc__[];
-extern const char _Py_rfind__doc__[];
-extern const char _Py_rindex__doc__[];
-extern const char _Py_startswith__doc__[];
-extern const char _Py_endswith__doc__[];
-extern const char _Py_maketrans__doc__[];
-extern const char _Py_expandtabs__doc__[];
-extern const char _Py_ljust__doc__[];
-extern const char _Py_rjust__doc__[];
-extern const char _Py_center__doc__[];
-extern const char _Py_zfill__doc__[];
-
-/* this is needed because some docs are shared from the .o, not static */
-#define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str)
-
-#endif /* !Py_BYTES_CTYPE_H */
-#endif /* !Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_byteswap.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_byteswap.h
deleted file mode 100644
index 2b20fc6c7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_byteswap.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Bytes swap functions, reverse order of bytes:
-
-   - _Py_bswap16(uint16_t)
-   - _Py_bswap32(uint32_t)
-   - _Py_bswap64(uint64_t)
-*/
-
-#ifndef Py_INTERNAL_BSWAP_H
-#define Py_INTERNAL_BSWAP_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#if defined(__GNUC__) \
-      && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 8))
-   /* __builtin_bswap16() is available since GCC 4.8,
-      __builtin_bswap32() is available since GCC 4.3,
-      __builtin_bswap64() is available since GCC 4.3. */
-#  define _PY_HAVE_BUILTIN_BSWAP
-#endif
-
-#ifdef _MSC_VER
-   /* Get _byteswap_ushort(), _byteswap_ulong(), _byteswap_uint64() */
-#  include <intrin.h>
-#endif
-
-static inline uint16_t
-_Py_bswap16(uint16_t word)
-{
-#if defined(_PY_HAVE_BUILTIN_BSWAP) || _Py__has_builtin(__builtin_bswap16)
-    return __builtin_bswap16(word);
-#elif defined(_MSC_VER)
-    Py_BUILD_ASSERT(sizeof(word) == sizeof(unsigned short));
-    return _byteswap_ushort(word);
-#else
-    // Portable implementation which doesn't rely on circular bit shift
-    return ( ((word & UINT16_C(0x00FF)) << 8)
-           | ((word & UINT16_C(0xFF00)) >> 8));
-#endif
-}
-
-static inline uint32_t
-_Py_bswap32(uint32_t word)
-{
-#if defined(_PY_HAVE_BUILTIN_BSWAP) || _Py__has_builtin(__builtin_bswap32)
-    return __builtin_bswap32(word);
-#elif defined(_MSC_VER)
-    Py_BUILD_ASSERT(sizeof(word) == sizeof(unsigned long));
-    return _byteswap_ulong(word);
-#else
-    // Portable implementation which doesn't rely on circular bit shift
-    return ( ((word & UINT32_C(0x000000FF)) << 24)
-           | ((word & UINT32_C(0x0000FF00)) <<  8)
-           | ((word & UINT32_C(0x00FF0000)) >>  8)
-           | ((word & UINT32_C(0xFF000000)) >> 24));
-#endif
-}
-
-static inline uint64_t
-_Py_bswap64(uint64_t word)
-{
-#if defined(_PY_HAVE_BUILTIN_BSWAP) || _Py__has_builtin(__builtin_bswap64)
-    return __builtin_bswap64(word);
-#elif defined(_MSC_VER)
-    return _byteswap_uint64(word);
-#else
-    // Portable implementation which doesn't rely on circular bit shift
-    return ( ((word & UINT64_C(0x00000000000000FF)) << 56)
-           | ((word & UINT64_C(0x000000000000FF00)) << 40)
-           | ((word & UINT64_C(0x0000000000FF0000)) << 24)
-           | ((word & UINT64_C(0x00000000FF000000)) <<  8)
-           | ((word & UINT64_C(0x000000FF00000000)) >>  8)
-           | ((word & UINT64_C(0x0000FF0000000000)) >> 24)
-           | ((word & UINT64_C(0x00FF000000000000)) >> 40)
-           | ((word & UINT64_C(0xFF00000000000000)) >> 56));
-#endif
-}
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_BSWAP_H */
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_call.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_call.h
deleted file mode 100644
index f7d856a54..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_call.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef Py_INTERNAL_CALL_H
-#define Py_INTERNAL_CALL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(
-    PyThreadState *tstate,
-    PyObject *callable,
-    PyObject *obj,
-    PyObject *args,
-    PyObject *kwargs);
-
-PyAPI_FUNC(PyObject *) _PyObject_FastCallDictTstate(
-    PyThreadState *tstate,
-    PyObject *callable,
-    PyObject *const *args,
-    size_t nargsf,
-    PyObject *kwargs);
-
-PyAPI_FUNC(PyObject *) _PyObject_Call(
-    PyThreadState *tstate,
-    PyObject *callable,
-    PyObject *args,
-    PyObject *kwargs);
-
-static inline PyObject *
-_PyObject_CallNoArgTstate(PyThreadState *tstate, PyObject *func) {
-    return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL);
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_CALL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_ceval.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_ceval.h
deleted file mode 100644
index 18c8f027a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_ceval.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#ifndef Py_INTERNAL_CEVAL_H
-#define Py_INTERNAL_CEVAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/* Forward declarations */
-struct pyruntimestate;
-struct _ceval_runtime_state;
-
-#include "pycore_interp.h"   /* PyInterpreterState.eval_frame */
-
-extern void _Py_FinishPendingCalls(PyThreadState *tstate);
-extern void _PyEval_InitRuntimeState(struct _ceval_runtime_state *);
-extern int _PyEval_InitState(struct _ceval_state *ceval);
-extern void _PyEval_FiniState(struct _ceval_state *ceval);
-PyAPI_FUNC(void) _PyEval_SignalReceived(PyInterpreterState *interp);
-PyAPI_FUNC(int) _PyEval_AddPendingCall(
-    PyInterpreterState *interp,
-    int (*func)(void *),
-    void *arg);
-PyAPI_FUNC(void) _PyEval_SignalAsyncExc(PyThreadState *tstate);
-#ifdef HAVE_FORK
-extern void _PyEval_ReInitThreads(struct pyruntimestate *runtime);
-#endif
-PyAPI_FUNC(void) _PyEval_SetCoroutineOriginTrackingDepth(
-    PyThreadState *tstate,
-    int new_depth);
-
-/* Private function */
-void _PyEval_Fini(void);
-
-static inline PyObject*
-_PyEval_EvalFrame(PyThreadState *tstate, PyFrameObject *f, int throwflag)
-{
-    return tstate->interp->eval_frame(tstate, f, throwflag);
-}
-
-extern PyObject *_PyEval_EvalCode(
-    PyThreadState *tstate,
-    PyObject *_co, PyObject *globals, PyObject *locals,
-    PyObject *const *args, Py_ssize_t argcount,
-    PyObject *const *kwnames, PyObject *const *kwargs,
-    Py_ssize_t kwcount, int kwstep,
-    PyObject *const *defs, Py_ssize_t defcount,
-    PyObject *kwdefs, PyObject *closure,
-    PyObject *name, PyObject *qualname);
-
-extern int _PyEval_ThreadsInitialized(struct pyruntimestate *runtime);
-extern PyStatus _PyEval_InitGIL(PyThreadState *tstate);
-extern void _PyEval_FiniGIL(PyThreadState *tstate);
-
-extern void _PyEval_ReleaseLock(PyThreadState *tstate);
-
-
-/* --- _Py_EnterRecursiveCall() ----------------------------------------- */
-
-PyAPI_DATA(int) _Py_CheckRecursionLimit;
-
-#ifdef USE_STACKCHECK
-/* With USE_STACKCHECK macro defined, trigger stack checks in
-   _Py_CheckRecursiveCall() on every 64th call to Py_EnterRecursiveCall. */
-static inline int _Py_MakeRecCheck(PyThreadState *tstate)  {
-    return (++tstate->recursion_depth > tstate->interp->ceval.recursion_limit
-            || ++tstate->stackcheck_counter > 64);
-}
-#else
-static inline int _Py_MakeRecCheck(PyThreadState *tstate) {
-    return (++tstate->recursion_depth > tstate->interp->ceval.recursion_limit);
-}
-#endif
-
-PyAPI_FUNC(int) _Py_CheckRecursiveCall(
-    PyThreadState *tstate,
-    const char *where);
-
-static inline int _Py_EnterRecursiveCall(PyThreadState *tstate,
-                                         const char *where) {
-    return (_Py_MakeRecCheck(tstate) && _Py_CheckRecursiveCall(tstate, where));
-}
-
-static inline int _Py_EnterRecursiveCall_inline(const char *where) {
-    PyThreadState *tstate = PyThreadState_GET();
-    return _Py_EnterRecursiveCall(tstate, where);
-}
-
-#define Py_EnterRecursiveCall(where) _Py_EnterRecursiveCall_inline(where)
-
-/* Compute the "lower-water mark" for a recursion limit. When
- * Py_LeaveRecursiveCall() is called with a recursion depth below this mark,
- * the overflowed flag is reset to 0. */
-static inline int _Py_RecursionLimitLowerWaterMark(int limit) {
-    if (limit > 200) {
-        return (limit - 50);
-    }
-    else {
-        return (3 * (limit >> 2));
-    }
-}
-
-static inline void _Py_LeaveRecursiveCall(PyThreadState *tstate)  {
-    tstate->recursion_depth--;
-    int limit = tstate->interp->ceval.recursion_limit;
-    if (tstate->recursion_depth < _Py_RecursionLimitLowerWaterMark(limit)) {
-        tstate->overflowed = 0;
-    }
-}
-
-static inline void _Py_LeaveRecursiveCall_inline(void)  {
-    PyThreadState *tstate = PyThreadState_GET();
-    _Py_LeaveRecursiveCall(tstate);
-}
-
-#define Py_LeaveRecursiveCall() _Py_LeaveRecursiveCall_inline()
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_CEVAL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_code.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_code.h
deleted file mode 100644
index 88956f109..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_code.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef Py_INTERNAL_CODE_H
-#define Py_INTERNAL_CODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
- 
-typedef struct {
-    PyObject *ptr;  /* Cached pointer (borrowed reference) */
-    uint64_t globals_ver;  /* ma_version of global dict */
-    uint64_t builtins_ver; /* ma_version of builtin dict */
-} _PyOpcache_LoadGlobal;
-
-struct _PyOpcache {
-    union {
-        _PyOpcache_LoadGlobal lg;
-    } u;
-    char optimized;
-};
-
-/* Private API */
-int _PyCode_InitOpcache(PyCodeObject *co);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_CODE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_condvar.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_condvar.h
deleted file mode 100644
index 8b89d7095..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_condvar.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef Py_INTERNAL_CONDVAR_H
-#define Py_INTERNAL_CONDVAR_H
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#ifndef _POSIX_THREADS
-/* This means pthreads are not implemented in libc headers, hence the macro
-   not present in unistd.h. But they still can be implemented as an external
-   library (e.g. gnu pth in pthread emulation) */
-# ifdef HAVE_PTHREAD_H
-#  include <pthread.h> /* _POSIX_THREADS */
-# endif
-#endif
-
-#ifdef _POSIX_THREADS
-/*
- * POSIX support
- */
-#define Py_HAVE_CONDVAR
-
-#include <pthread.h>
-
-#define PyMUTEX_T pthread_mutex_t
-#define PyCOND_T pthread_cond_t
-
-#elif defined(NT_THREADS)
-/*
- * Windows (XP, 2003 server and later, as well as (hopefully) CE) support
- *
- * Emulated condition variables ones that work with XP and later, plus
- * example native support on VISTA and onwards.
- */
-#define Py_HAVE_CONDVAR
-
-/* include windows if it hasn't been done before */
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-/* options */
-/* non-emulated condition variables are provided for those that want
- * to target Windows Vista.  Modify this macro to enable them.
- */
-#ifndef _PY_EMULATED_WIN_CV
-#define _PY_EMULATED_WIN_CV 1  /* use emulated condition variables */
-#endif
-
-/* fall back to emulation if not targeting Vista */
-#if !defined NTDDI_VISTA || NTDDI_VERSION < NTDDI_VISTA
-#undef _PY_EMULATED_WIN_CV
-#define _PY_EMULATED_WIN_CV 1
-#endif
-
-#if _PY_EMULATED_WIN_CV
-
-typedef CRITICAL_SECTION PyMUTEX_T;
-
-/* The ConditionVariable object.  From XP onwards it is easily emulated
-   with a Semaphore.
-   Semaphores are available on Windows XP (2003 server) and later.
-   We use a Semaphore rather than an auto-reset event, because although
-   an auto-resent event might appear to solve the lost-wakeup bug (race
-   condition between releasing the outer lock and waiting) because it
-   maintains state even though a wait hasn't happened, there is still
-   a lost wakeup problem if more than one thread are interrupted in the
-   critical place.  A semaphore solves that, because its state is
-   counted, not Boolean.
-   Because it is ok to signal a condition variable with no one
-   waiting, we need to keep track of the number of
-   waiting threads.  Otherwise, the semaphore's state could rise
-   without bound.  This also helps reduce the number of "spurious wakeups"
-   that would otherwise happen.
- */
-
-typedef struct _PyCOND_T
-{
-    HANDLE sem;
-    int waiting; /* to allow PyCOND_SIGNAL to be a no-op */
-} PyCOND_T;
-
-#else /* !_PY_EMULATED_WIN_CV */
-
-/* Use native Win7 primitives if build target is Win7 or higher */
-
-/* SRWLOCK is faster and better than CriticalSection */
-typedef SRWLOCK PyMUTEX_T;
-
-typedef CONDITION_VARIABLE  PyCOND_T;
-
-#endif /* _PY_EMULATED_WIN_CV */
-
-#endif /* _POSIX_THREADS, NT_THREADS */
-
-#endif /* Py_INTERNAL_CONDVAR_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_context.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_context.h
deleted file mode 100644
index f665ad5c1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_context.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef Py_INTERNAL_CONTEXT_H
-#define Py_INTERNAL_CONTEXT_H
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "pycore_hamt.h"   /* PyHamtObject */
-
-struct _pycontextobject {
-    PyObject_HEAD
-    PyContext *ctx_prev;
-    PyHamtObject *ctx_vars;
-    PyObject *ctx_weakreflist;
-    int ctx_entered;
-};
-
-
-struct _pycontextvarobject {
-    PyObject_HEAD
-    PyObject *var_name;
-    PyObject *var_default;
-    PyObject *var_cached;
-    uint64_t var_cached_tsid;
-    uint64_t var_cached_tsver;
-    Py_hash_t var_hash;
-};
-
-
-struct _pycontexttokenobject {
-    PyObject_HEAD
-    PyContext *tok_ctx;
-    PyContextVar *tok_var;
-    PyObject *tok_oldval;
-    int tok_used;
-};
-
-
-int _PyContext_Init(void);
-void _PyContext_Fini(void);
-
-#endif /* !Py_INTERNAL_CONTEXT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_dtoa.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_dtoa.h
deleted file mode 100644
index 3faf8cf6b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_dtoa.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef PY_NO_SHORT_FLOAT_REPR
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/* These functions are used by modules compiled as C extension like math:
-   they must be exported. */
-
-PyAPI_FUNC(double) _Py_dg_strtod(const char *str, char **ptr);
-PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits,
-                        int *decpt, int *sign, char **rve);
-PyAPI_FUNC(void) _Py_dg_freedtoa(char *s);
-PyAPI_FUNC(double) _Py_dg_stdnan(int sign);
-PyAPI_FUNC(double) _Py_dg_infinity(int sign);
-
-#ifdef __cplusplus
-}
-#endif
-#endif   /* !PY_NO_SHORT_FLOAT_REPR */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_fileutils.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_fileutils.h
deleted file mode 100644
index bbee58617..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_fileutils.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef Py_INTERNAL_FILEUTILS_H
-#define Py_INTERNAL_FILEUTILS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "Py_BUILD_CORE must be defined to include this header"
-#endif
-
-#include <locale.h>   /* struct lconv */
-
-PyAPI_DATA(int) _Py_HasFileSystemDefaultEncodeErrors;
-
-PyAPI_FUNC(int) _Py_DecodeUTF8Ex(
-    const char *arg,
-    Py_ssize_t arglen,
-    wchar_t **wstr,
-    size_t *wlen,
-    const char **reason,
-    _Py_error_handler errors);
-
-PyAPI_FUNC(int) _Py_EncodeUTF8Ex(
-    const wchar_t *text,
-    char **str,
-    size_t *error_pos,
-    const char **reason,
-    int raw_malloc,
-    _Py_error_handler errors);
-
-PyAPI_FUNC(wchar_t*) _Py_DecodeUTF8_surrogateescape(
-    const char *arg,
-    Py_ssize_t arglen,
-    size_t *wlen);
-
-PyAPI_FUNC(int) _Py_GetForceASCII(void);
-
-/* Reset "force ASCII" mode (if it was initialized).
-
-   This function should be called when Python changes the LC_CTYPE locale,
-   so the "force ASCII" mode can be detected again on the new locale
-   encoding. */
-PyAPI_FUNC(void) _Py_ResetForceASCII(void);
-
-
-PyAPI_FUNC(int) _Py_GetLocaleconvNumeric(
-    struct lconv *lc,
-    PyObject **decimal_point,
-    PyObject **thousands_sep);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_FILEUTILS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_gc.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_gc.h
deleted file mode 100644
index 0511eea77..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_gc.h
+++ /dev/null
@@ -1,179 +0,0 @@
-#ifndef Py_INTERNAL_GC_H
-#define Py_INTERNAL_GC_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/* GC information is stored BEFORE the object structure. */
-typedef struct {
-    // Pointer to next object in the list.
-    // 0 means the object is not tracked
-    uintptr_t _gc_next;
-
-    // Pointer to previous object in the list.
-    // Lowest two bits are used for flags documented later.
-    uintptr_t _gc_prev;
-} PyGC_Head;
-
-#define _Py_AS_GC(o) ((PyGC_Head *)(o)-1)
-
-/* True if the object is currently tracked by the GC. */
-#define _PyObject_GC_IS_TRACKED(o) (_Py_AS_GC(o)->_gc_next != 0)
-
-/* True if the object may be tracked by the GC in the future, or already is.
-   This can be useful to implement some optimizations. */
-#define _PyObject_GC_MAY_BE_TRACKED(obj) \
-    (PyObject_IS_GC(obj) && \
-        (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj)))
-
-
-/* Bit flags for _gc_prev */
-/* Bit 0 is set when tp_finalize is called */
-#define _PyGC_PREV_MASK_FINALIZED  (1)
-/* Bit 1 is set when the object is in generation which is GCed currently. */
-#define _PyGC_PREV_MASK_COLLECTING (2)
-/* The (N-2) most significant bits contain the real address. */
-#define _PyGC_PREV_SHIFT           (2)
-#define _PyGC_PREV_MASK            (((uintptr_t) -1) << _PyGC_PREV_SHIFT)
-
-// Lowest bit of _gc_next is used for flags only in GC.
-// But it is always 0 for normal code.
-#define _PyGCHead_NEXT(g)        ((PyGC_Head*)(g)->_gc_next)
-#define _PyGCHead_SET_NEXT(g, p) ((g)->_gc_next = (uintptr_t)(p))
-
-// Lowest two bits of _gc_prev is used for _PyGC_PREV_MASK_* flags.
-#define _PyGCHead_PREV(g) ((PyGC_Head*)((g)->_gc_prev & _PyGC_PREV_MASK))
-#define _PyGCHead_SET_PREV(g, p) do { \
-    assert(((uintptr_t)p & ~_PyGC_PREV_MASK) == 0); \
-    (g)->_gc_prev = ((g)->_gc_prev & ~_PyGC_PREV_MASK) \
-        | ((uintptr_t)(p)); \
-    } while (0)
-
-#define _PyGCHead_FINALIZED(g) \
-    (((g)->_gc_prev & _PyGC_PREV_MASK_FINALIZED) != 0)
-#define _PyGCHead_SET_FINALIZED(g) \
-    ((g)->_gc_prev |= _PyGC_PREV_MASK_FINALIZED)
-
-#define _PyGC_FINALIZED(o) \
-    _PyGCHead_FINALIZED(_Py_AS_GC(o))
-#define _PyGC_SET_FINALIZED(o) \
-    _PyGCHead_SET_FINALIZED(_Py_AS_GC(o))
-
-
-/* GC runtime state */
-
-/* If we change this, we need to change the default value in the
-   signature of gc.collect. */
-#define NUM_GENERATIONS 3
-/*
-   NOTE: about untracking of mutable objects.
-
-   Certain types of container cannot participate in a reference cycle, and
-   so do not need to be tracked by the garbage collector. Untracking these
-   objects reduces the cost of garbage collections. However, determining
-   which objects may be untracked is not free, and the costs must be
-   weighed against the benefits for garbage collection.
-
-   There are two possible strategies for when to untrack a container:
-
-   i) When the container is created.
-   ii) When the container is examined by the garbage collector.
-
-   Tuples containing only immutable objects (integers, strings etc, and
-   recursively, tuples of immutable objects) do not need to be tracked.
-   The interpreter creates a large number of tuples, many of which will
-   not survive until garbage collection. It is therefore not worthwhile
-   to untrack eligible tuples at creation time.
-
-   Instead, all tuples except the empty tuple are tracked when created.
-   During garbage collection it is determined whether any surviving tuples
-   can be untracked. A tuple can be untracked if all of its contents are
-   already not tracked. Tuples are examined for untracking in all garbage
-   collection cycles. It may take more than one cycle to untrack a tuple.
-
-   Dictionaries containing only immutable objects also do not need to be
-   tracked. Dictionaries are untracked when created. If a tracked item is
-   inserted into a dictionary (either as a key or value), the dictionary
-   becomes tracked. During a full garbage collection (all generations),
-   the collector will untrack any dictionaries whose contents are not
-   tracked.
-
-   The module provides the python function is_tracked(obj), which returns
-   the CURRENT tracking status of the object. Subsequent garbage
-   collections may change the tracking status of the object.
-
-   Untracking of certain containers was introduced in issue #4688, and
-   the algorithm was refined in response to issue #14775.
-*/
-
-struct gc_generation {
-    PyGC_Head head;
-    int threshold; /* collection threshold */
-    int count; /* count of allocations or collections of younger
-                  generations */
-};
-
-/* Running stats per generation */
-struct gc_generation_stats {
-    /* total number of collections */
-    Py_ssize_t collections;
-    /* total number of collected objects */
-    Py_ssize_t collected;
-    /* total number of uncollectable objects (put into gc.garbage) */
-    Py_ssize_t uncollectable;
-};
-
-struct _gc_runtime_state {
-    /* List of objects that still need to be cleaned up, singly linked
-     * via their gc headers' gc_prev pointers.  */
-    PyObject *trash_delete_later;
-    /* Current call-stack depth of tp_dealloc calls. */
-    int trash_delete_nesting;
-
-    int enabled;
-    int debug;
-    /* linked lists of container objects */
-    struct gc_generation generations[NUM_GENERATIONS];
-    PyGC_Head *generation0;
-    /* a permanent generation which won't be collected */
-    struct gc_generation permanent_generation;
-    struct gc_generation_stats generation_stats[NUM_GENERATIONS];
-    /* true if we are currently running the collector */
-    int collecting;
-    /* list of uncollectable objects */
-    PyObject *garbage;
-    /* a list of callbacks to be invoked when collection is performed */
-    PyObject *callbacks;
-    /* This is the number of objects that survived the last full
-       collection. It approximates the number of long lived objects
-       tracked by the GC.
-
-       (by "full collection", we mean a collection of the oldest
-       generation). */
-    Py_ssize_t long_lived_total;
-    /* This is the number of objects that survived all "non-full"
-       collections, and are awaiting to undergo a full collection for
-       the first time. */
-    Py_ssize_t long_lived_pending;
-};
-
-PyAPI_FUNC(void) _PyGC_InitState(struct _gc_runtime_state *);
-
-
-// Functions to clear types free lists
-extern void _PyFrame_ClearFreeList(void);
-extern void _PyTuple_ClearFreeList(void);
-extern void _PyFloat_ClearFreeList(void);
-extern void _PyList_ClearFreeList(void);
-extern void _PyDict_ClearFreeList(void);
-extern void _PyAsyncGen_ClearFreeLists(void);
-extern void _PyContext_ClearFreeList(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_GC_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_getopt.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_getopt.h
deleted file mode 100644
index 7f0dd13ae..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_getopt.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef Py_INTERNAL_PYGETOPT_H
-#define Py_INTERNAL_PYGETOPT_H
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-extern int _PyOS_opterr;
-extern Py_ssize_t _PyOS_optind;
-extern const wchar_t *_PyOS_optarg;
-
-extern void _PyOS_ResetGetOpt(void);
-
-typedef struct {
-    const wchar_t *name;
-    int has_arg;
-    int val;
-} _PyOS_LongOption;
-
-extern int _PyOS_GetOpt(Py_ssize_t argc, wchar_t * const *argv, int *longindex);
-
-#endif /* !Py_INTERNAL_PYGETOPT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_gil.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_gil.h
deleted file mode 100644
index 8ebad37b6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_gil.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef Py_INTERNAL_GIL_H
-#define Py_INTERNAL_GIL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "pycore_atomic.h"    /* _Py_atomic_address */
-#include "pycore_condvar.h"   /* PyCOND_T */
-
-#ifndef Py_HAVE_CONDVAR
-#  error You need either a POSIX-compatible or a Windows system!
-#endif
-
-/* Enable if you want to force the switching of threads at least
-   every `interval`. */
-#undef FORCE_SWITCHING
-#define FORCE_SWITCHING
-
-struct _gil_runtime_state {
-    /* microseconds (the Python API uses seconds, though) */
-    unsigned long interval;
-    /* Last PyThreadState holding / having held the GIL. This helps us
-       know whether anyone else was scheduled after we dropped the GIL. */
-    _Py_atomic_address last_holder;
-    /* Whether the GIL is already taken (-1 if uninitialized). This is
-       atomic because it can be read without any lock taken in ceval.c. */
-    _Py_atomic_int locked;
-    /* Number of GIL switches since the beginning. */
-    unsigned long switch_number;
-    /* This condition variable allows one or several threads to wait
-       until the GIL is released. In addition, the mutex also protects
-       the above variables. */
-    PyCOND_T cond;
-    PyMUTEX_T mutex;
-#ifdef FORCE_SWITCHING
-    /* This condition variable helps the GIL-releasing thread wait for
-       a GIL-awaiting thread to be scheduled and take the GIL. */
-    PyCOND_T switch_cond;
-    PyMUTEX_T switch_mutex;
-#endif
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_GIL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_hamt.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_hamt.h
deleted file mode 100644
index aaf655909..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_hamt.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifndef Py_INTERNAL_HAMT_H
-#define Py_INTERNAL_HAMT_H
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#define _Py_HAMT_MAX_TREE_DEPTH 7
-
-
-#define PyHamt_Check(o) Py_IS_TYPE(o, &_PyHamt_Type)
-
-
-/* Abstract tree node. */
-typedef struct {
-    PyObject_HEAD
-} PyHamtNode;
-
-
-/* An HAMT immutable mapping collection. */
-typedef struct {
-    PyObject_HEAD
-    PyHamtNode *h_root;
-    PyObject *h_weakreflist;
-    Py_ssize_t h_count;
-} PyHamtObject;
-
-
-/* A struct to hold the state of depth-first traverse of the tree.
-
-   HAMT is an immutable collection.  Iterators will hold a strong reference
-   to it, and every node in the HAMT has strong references to its children.
-
-   So for iterators, we can implement zero allocations and zero reference
-   inc/dec depth-first iteration.
-
-   - i_nodes: an array of seven pointers to tree nodes
-   - i_level: the current node in i_nodes
-   - i_pos: an array of positions within nodes in i_nodes.
-*/
-typedef struct {
-    PyHamtNode *i_nodes[_Py_HAMT_MAX_TREE_DEPTH];
-    Py_ssize_t i_pos[_Py_HAMT_MAX_TREE_DEPTH];
-    int8_t i_level;
-} PyHamtIteratorState;
-
-
-/* Base iterator object.
-
-   Contains the iteration state, a pointer to the HAMT tree,
-   and a pointer to the 'yield function'.  The latter is a simple
-   function that returns a key/value tuple for the 'Items' iterator,
-   just a key for the 'Keys' iterator, and a value for the 'Values'
-   iterator.
-*/
-typedef struct {
-    PyObject_HEAD
-    PyHamtObject *hi_obj;
-    PyHamtIteratorState hi_iter;
-    binaryfunc hi_yield;
-} PyHamtIterator;
-
-
-PyAPI_DATA(PyTypeObject) _PyHamt_Type;
-PyAPI_DATA(PyTypeObject) _PyHamt_ArrayNode_Type;
-PyAPI_DATA(PyTypeObject) _PyHamt_BitmapNode_Type;
-PyAPI_DATA(PyTypeObject) _PyHamt_CollisionNode_Type;
-PyAPI_DATA(PyTypeObject) _PyHamtKeys_Type;
-PyAPI_DATA(PyTypeObject) _PyHamtValues_Type;
-PyAPI_DATA(PyTypeObject) _PyHamtItems_Type;
-
-
-/* Create a new HAMT immutable mapping. */
-PyHamtObject * _PyHamt_New(void);
-
-/* Return a new collection based on "o", but with an additional
-   key/val pair. */
-PyHamtObject * _PyHamt_Assoc(PyHamtObject *o, PyObject *key, PyObject *val);
-
-/* Return a new collection based on "o", but without "key". */
-PyHamtObject * _PyHamt_Without(PyHamtObject *o, PyObject *key);
-
-/* Find "key" in the "o" collection.
-
-   Return:
-   - -1: An error occurred.
-   - 0: "key" wasn't found in "o".
-   - 1: "key" is in "o"; "*val" is set to its value (a borrowed ref).
-*/
-int _PyHamt_Find(PyHamtObject *o, PyObject *key, PyObject **val);
-
-/* Check if "v" is equal to "w".
-
-   Return:
-   - 0: v != w
-   - 1: v == w
-   - -1: An error occurred.
-*/
-int _PyHamt_Eq(PyHamtObject *v, PyHamtObject *w);
-
-/* Return the size of "o"; equivalent of "len(o)". */
-Py_ssize_t _PyHamt_Len(PyHamtObject *o);
-
-/* Return a Keys iterator over "o". */
-PyObject * _PyHamt_NewIterKeys(PyHamtObject *o);
-
-/* Return a Values iterator over "o". */
-PyObject * _PyHamt_NewIterValues(PyHamtObject *o);
-
-/* Return a Items iterator over "o". */
-PyObject * _PyHamt_NewIterItems(PyHamtObject *o);
-
-int _PyHamt_Init(void);
-void _PyHamt_Fini(void);
-
-#endif /* !Py_INTERNAL_HAMT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_hashtable.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_hashtable.h
deleted file mode 100644
index 18757abc2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_hashtable.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef Py_INTERNAL_HASHTABLE_H
-#define Py_INTERNAL_HASHTABLE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/* Single linked list */
-
-typedef struct _Py_slist_item_s {
-    struct _Py_slist_item_s *next;
-} _Py_slist_item_t;
-
-typedef struct {
-    _Py_slist_item_t *head;
-} _Py_slist_t;
-
-#define _Py_SLIST_ITEM_NEXT(ITEM) (((_Py_slist_item_t *)ITEM)->next)
-
-#define _Py_SLIST_HEAD(SLIST) (((_Py_slist_t *)SLIST)->head)
-
-
-/* _Py_hashtable: table entry */
-
-typedef struct {
-    /* used by _Py_hashtable_t.buckets to link entries */
-    _Py_slist_item_t _Py_slist_item;
-
-    Py_uhash_t key_hash;
-    void *key;
-    void *value;
-} _Py_hashtable_entry_t;
-
-
-/* _Py_hashtable: prototypes */
-
-/* Forward declaration */
-struct _Py_hashtable_t;
-typedef struct _Py_hashtable_t _Py_hashtable_t;
-
-typedef Py_uhash_t (*_Py_hashtable_hash_func) (const void *key);
-typedef int (*_Py_hashtable_compare_func) (const void *key1, const void *key2);
-typedef void (*_Py_hashtable_destroy_func) (void *key);
-typedef _Py_hashtable_entry_t* (*_Py_hashtable_get_entry_func)(_Py_hashtable_t *ht,
-                                                               const void *key);
-
-typedef struct {
-    // Allocate a memory block
-    void* (*malloc) (size_t size);
-
-    // Release a memory block
-    void (*free) (void *ptr);
-} _Py_hashtable_allocator_t;
-
-
-/* _Py_hashtable: table */
-struct _Py_hashtable_t {
-    size_t nentries; // Total number of entries in the table
-    size_t nbuckets;
-    _Py_slist_t *buckets;
-
-    _Py_hashtable_get_entry_func get_entry_func;
-    _Py_hashtable_hash_func hash_func;
-    _Py_hashtable_compare_func compare_func;
-    _Py_hashtable_destroy_func key_destroy_func;
-    _Py_hashtable_destroy_func value_destroy_func;
-    _Py_hashtable_allocator_t alloc;
-};
-
-/* Hash a pointer (void*) */
-PyAPI_FUNC(Py_uhash_t) _Py_hashtable_hash_ptr(const void *key);
-
-/* Comparison using memcmp() */
-PyAPI_FUNC(int) _Py_hashtable_compare_direct(
-    const void *key1,
-    const void *key2);
-
-PyAPI_FUNC(_Py_hashtable_t *) _Py_hashtable_new(
-    _Py_hashtable_hash_func hash_func,
-    _Py_hashtable_compare_func compare_func);
-
-PyAPI_FUNC(_Py_hashtable_t *) _Py_hashtable_new_full(
-    _Py_hashtable_hash_func hash_func,
-    _Py_hashtable_compare_func compare_func,
-    _Py_hashtable_destroy_func key_destroy_func,
-    _Py_hashtable_destroy_func value_destroy_func,
-    _Py_hashtable_allocator_t *allocator);
-
-PyAPI_FUNC(void) _Py_hashtable_destroy(_Py_hashtable_t *ht);
-
-PyAPI_FUNC(void) _Py_hashtable_clear(_Py_hashtable_t *ht);
-
-typedef int (*_Py_hashtable_foreach_func) (_Py_hashtable_t *ht,
-                                           const void *key, const void *value,
-                                           void *user_data);
-
-/* Call func() on each entry of the hashtable.
-   Iteration stops if func() result is non-zero, in this case it's the result
-   of the call. Otherwise, the function returns 0. */
-PyAPI_FUNC(int) _Py_hashtable_foreach(
-    _Py_hashtable_t *ht,
-    _Py_hashtable_foreach_func func,
-    void *user_data);
-
-PyAPI_FUNC(size_t) _Py_hashtable_size(const _Py_hashtable_t *ht);
-
-/* Add a new entry to the hash. The key must not be present in the hash table.
-   Return 0 on success, -1 on memory error. */
-PyAPI_FUNC(int) _Py_hashtable_set(
-    _Py_hashtable_t *ht,
-    const void *key,
-    void *value);
-
-
-/* Get an entry.
-   Return NULL if the key does not exist. */
-static inline _Py_hashtable_entry_t *
-_Py_hashtable_get_entry(_Py_hashtable_t *ht, const void *key)
-{
-    return ht->get_entry_func(ht, key);
-}
-
-
-/* Get value from an entry.
-   Return NULL if the entry is not found.
-
-   Use _Py_hashtable_get_entry() to distinguish entry value equal to NULL
-   and entry not found. */
-PyAPI_FUNC(void*) _Py_hashtable_get(_Py_hashtable_t *ht, const void *key);
-
-
-/* Remove a key and its associated value without calling key and value destroy
-   functions.
-
-   Return the removed value if the key was found.
-   Return NULL if the key was not found. */
-PyAPI_FUNC(void*) _Py_hashtable_steal(
-    _Py_hashtable_t *ht,
-    const void *key);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif   /* !Py_INTERNAL_HASHTABLE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_import.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_import.h
deleted file mode 100644
index b011ea442..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_import.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_INTERNAL_IMPORT_H
-#define Py_INTERNAL_IMPORT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin(
-    PyThreadState *tstate,
-    const char *name             /* UTF-8 encoded string */
-    );
-
-#ifdef HAVE_FORK
-extern void _PyImport_ReInitLock(void);
-#endif
-extern void _PyImport_Cleanup(PyThreadState *tstate);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_IMPORT_H */
-#endif /* !Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_initconfig.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_initconfig.h
deleted file mode 100644
index 457a00586..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_initconfig.h
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifndef Py_INTERNAL_CORECONFIG_H
-#define Py_INTERNAL_CORECONFIG_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/* Forward declaration */
-struct pyruntimestate;
-
-/* --- PyStatus ----------------------------------------------- */
-
-/* Almost all errors causing Python initialization to fail */
-#ifdef _MSC_VER
-   /* Visual Studio 2015 doesn't implement C99 __func__ in C */
-#  define _PyStatus_GET_FUNC() __FUNCTION__
-#else
-#  define _PyStatus_GET_FUNC() __func__
-#endif
-
-#define _PyStatus_OK() \
-    (PyStatus){._type = _PyStatus_TYPE_OK,}
-    /* other fields are set to 0 */
-#define _PyStatus_ERR(ERR_MSG) \
-    (PyStatus){ \
-        ._type = _PyStatus_TYPE_ERROR, \
-        .func = _PyStatus_GET_FUNC(), \
-        .err_msg = (ERR_MSG)}
-        /* other fields are set to 0 */
-#define _PyStatus_NO_MEMORY() _PyStatus_ERR("memory allocation failed")
-#define _PyStatus_EXIT(EXITCODE) \
-    (PyStatus){ \
-        ._type = _PyStatus_TYPE_EXIT, \
-        .exitcode = (EXITCODE)}
-#define _PyStatus_IS_ERROR(err) \
-    (err._type == _PyStatus_TYPE_ERROR)
-#define _PyStatus_IS_EXIT(err) \
-    (err._type == _PyStatus_TYPE_EXIT)
-#define _PyStatus_EXCEPTION(err) \
-    (err._type != _PyStatus_TYPE_OK)
-#define _PyStatus_UPDATE_FUNC(err) \
-    do { err.func = _PyStatus_GET_FUNC(); } while (0)
-
-/* --- PyWideStringList ------------------------------------------------ */
-
-#define _PyWideStringList_INIT (PyWideStringList){.length = 0, .items = NULL}
-
-#ifndef NDEBUG
-PyAPI_FUNC(int) _PyWideStringList_CheckConsistency(const PyWideStringList *list);
-#endif
-PyAPI_FUNC(void) _PyWideStringList_Clear(PyWideStringList *list);
-PyAPI_FUNC(int) _PyWideStringList_Copy(PyWideStringList *list,
-    const PyWideStringList *list2);
-PyAPI_FUNC(PyStatus) _PyWideStringList_Extend(PyWideStringList *list,
-    const PyWideStringList *list2);
-PyAPI_FUNC(PyObject*) _PyWideStringList_AsList(const PyWideStringList *list);
-
-
-/* --- _PyArgv ---------------------------------------------------- */
-
-typedef struct _PyArgv {
-    Py_ssize_t argc;
-    int use_bytes_argv;
-    char * const *bytes_argv;
-    wchar_t * const *wchar_argv;
-} _PyArgv;
-
-PyAPI_FUNC(PyStatus) _PyArgv_AsWstrList(const _PyArgv *args,
-    PyWideStringList *list);
-
-
-/* --- Helper functions ------------------------------------------- */
-
-PyAPI_FUNC(int) _Py_str_to_int(
-    const char *str,
-    int *result);
-PyAPI_FUNC(const wchar_t*) _Py_get_xoption(
-    const PyWideStringList *xoptions,
-    const wchar_t *name);
-PyAPI_FUNC(const char*) _Py_GetEnv(
-    int use_environment,
-    const char *name);
-PyAPI_FUNC(void) _Py_get_env_flag(
-    int use_environment,
-    int *flag,
-    const char *name);
-
-/* Py_GetArgcArgv() helper */
-PyAPI_FUNC(void) _Py_ClearArgcArgv(void);
-
-
-/* --- _PyPreCmdline ------------------------------------------------- */
-
-typedef struct {
-    PyWideStringList argv;
-    PyWideStringList xoptions;     /* "-X value" option */
-    int isolated;             /* -I option */
-    int use_environment;      /* -E option */
-    int dev_mode;             /* -X dev and PYTHONDEVMODE */
-} _PyPreCmdline;
-
-#define _PyPreCmdline_INIT \
-    (_PyPreCmdline){ \
-        .use_environment = -1, \
-        .isolated = -1, \
-        .dev_mode = -1}
-/* Note: _PyPreCmdline_INIT sets other fields to 0/NULL */
-
-extern void _PyPreCmdline_Clear(_PyPreCmdline *cmdline);
-extern PyStatus _PyPreCmdline_SetArgv(_PyPreCmdline *cmdline,
-    const _PyArgv *args);
-extern PyStatus _PyPreCmdline_SetConfig(
-    const _PyPreCmdline *cmdline,
-    PyConfig *config);
-extern PyStatus _PyPreCmdline_Read(_PyPreCmdline *cmdline,
-    const PyPreConfig *preconfig);
-
-
-/* --- PyPreConfig ----------------------------------------------- */
-
-PyAPI_FUNC(void) _PyPreConfig_InitCompatConfig(PyPreConfig *preconfig);
-extern void _PyPreConfig_InitFromConfig(
-    PyPreConfig *preconfig,
-    const PyConfig *config);
-extern PyStatus _PyPreConfig_InitFromPreConfig(
-    PyPreConfig *preconfig,
-    const PyPreConfig *config2);
-extern PyObject* _PyPreConfig_AsDict(const PyPreConfig *preconfig);
-extern void _PyPreConfig_GetConfig(PyPreConfig *preconfig,
-    const PyConfig *config);
-extern PyStatus _PyPreConfig_Read(PyPreConfig *preconfig,
-    const _PyArgv *args);
-extern PyStatus _PyPreConfig_Write(const PyPreConfig *preconfig);
-
-
-/* --- PyConfig ---------------------------------------------- */
-
-typedef enum {
-    /* Py_Initialize() API: backward compatibility with Python 3.6 and 3.7 */
-    _PyConfig_INIT_COMPAT = 1,
-    _PyConfig_INIT_PYTHON = 2,
-    _PyConfig_INIT_ISOLATED = 3
-} _PyConfigInitEnum;
-
-PyAPI_FUNC(void) _PyConfig_InitCompatConfig(PyConfig *config);
-extern PyStatus _PyConfig_Copy(
-    PyConfig *config,
-    const PyConfig *config2);
-extern PyStatus _PyConfig_InitPathConfig(PyConfig *config);
-extern PyStatus _PyConfig_Write(const PyConfig *config,
-    struct pyruntimestate *runtime);
-extern PyStatus _PyConfig_SetPyArgv(
-    PyConfig *config,
-    const _PyArgv *args);
-
-
-/* --- Function used for testing ---------------------------------- */
-
-PyAPI_FUNC(PyObject*) _Py_GetConfigsAsDict(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_CORECONFIG_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_interp.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_interp.h
deleted file mode 100644
index 551ad833b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_interp.h
+++ /dev/null
@@ -1,192 +0,0 @@
-#ifndef Py_INTERNAL_INTERP_H
-#define Py_INTERNAL_INTERP_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "pycore_atomic.h"    /* _Py_atomic_address */
-#include "pycore_gil.h"       /* struct _gil_runtime_state  */
-#include "pycore_gc.h"        /* struct _gc_runtime_state */
-#include "pycore_warnings.h"  /* struct _warnings_runtime_state */
-
-/* ceval state */
-
-struct _pending_calls {
-    PyThread_type_lock lock;
-    /* Request for running pending calls. */
-    _Py_atomic_int calls_to_do;
-    /* Request for looking at the `async_exc` field of the current
-       thread state.
-       Guarded by the GIL. */
-    int async_exc;
-#define NPENDINGCALLS 32
-    struct {
-        int (*func)(void *);
-        void *arg;
-    } calls[NPENDINGCALLS];
-    int first;
-    int last;
-};
-
-struct _ceval_state {
-    int recursion_limit;
-    /* Records whether tracing is on for any thread.  Counts the number
-       of threads for which tstate->c_tracefunc is non-NULL, so if the
-       value is 0, we know we don't have to check this thread's
-       c_tracefunc.  This speeds up the if statement in
-       _PyEval_EvalFrameDefault() after fast_next_opcode. */
-    int tracing_possible;
-    /* This single variable consolidates all requests to break out of
-       the fast path in the eval loop. */
-    _Py_atomic_int eval_breaker;
-    /* Request for dropping the GIL */
-    _Py_atomic_int gil_drop_request;
-    struct _pending_calls pending;
-};
-
-/* fs_codec.encoding is initialized to NULL.
-   Later, it is set to a non-NULL string by _PyUnicode_InitEncodings(). */
-struct _Py_unicode_fs_codec {
-    char *encoding;   // Filesystem encoding (encoded to UTF-8)
-    int utf8;         // encoding=="utf-8"?
-    char *errors;     // Filesystem errors (encoded to UTF-8)
-    _Py_error_handler error_handler;
-};
-
-struct _Py_unicode_state {
-    struct _Py_unicode_fs_codec fs_codec;
-};
-
-
-/* interpreter state */
-
-#define _PY_NSMALLPOSINTS           257
-#define _PY_NSMALLNEGINTS           5
-
-// The PyInterpreterState typedef is in Include/pystate.h.
-struct _is {
-
-    struct _is *next;
-    struct _ts *tstate_head;
-
-    /* Reference to the _PyRuntime global variable. This field exists
-       to not have to pass runtime in addition to tstate to a function.
-       Get runtime from tstate: tstate->interp->runtime. */
-    struct pyruntimestate *runtime;
-
-    int64_t id;
-    int64_t id_refcount;
-    int requires_idref;
-    PyThread_type_lock id_mutex;
-
-    int finalizing;
-
-    struct _ceval_state ceval;
-    struct _gc_runtime_state gc;
-
-    PyObject *modules;
-    PyObject *modules_by_index;
-    PyObject *sysdict;
-    PyObject *builtins;
-    PyObject *importlib;
-
-    /* Used in Modules/_threadmodule.c. */
-    long num_threads;
-    /* Support for runtime thread stack size tuning.
-       A value of 0 means using the platform's default stack size
-       or the size specified by the THREAD_STACK_SIZE macro. */
-    /* Used in Python/thread.c. */
-    size_t pythread_stacksize;
-
-    PyObject *codec_search_path;
-    PyObject *codec_search_cache;
-    PyObject *codec_error_registry;
-    int codecs_initialized;
-
-    struct _Py_unicode_state unicode;
-
-    PyConfig config;
-#ifdef HAVE_DLOPEN
-    int dlopenflags;
-#endif
-
-    PyObject *dict;  /* Stores per-interpreter state */
-
-    PyObject *builtins_copy;
-    PyObject *import_func;
-    /* Initialized to PyEval_EvalFrameDefault(). */
-    _PyFrameEvalFunction eval_frame;
-
-    Py_ssize_t co_extra_user_count;
-    freefunc co_extra_freefuncs[MAX_CO_EXTRA_USERS];
-
-#ifdef HAVE_FORK
-    PyObject *before_forkers;
-    PyObject *after_forkers_parent;
-    PyObject *after_forkers_child;
-#endif
-    /* AtExit module */
-    void (*pyexitfunc)(PyObject *);
-    PyObject *pyexitmodule;
-
-    uint64_t tstate_next_unique_id;
-
-    struct _warnings_runtime_state warnings;
-
-    PyObject *audit_hooks;
-
-    struct {
-        struct {
-            int level;
-            int atbol;
-        } listnode;
-    } parser;
-
-#if _PY_NSMALLNEGINTS + _PY_NSMALLPOSINTS > 0
-    /* Small integers are preallocated in this array so that they
-       can be shared.
-       The integers that are preallocated are those in the range
-       -_PY_NSMALLNEGINTS (inclusive) to _PY_NSMALLPOSINTS (not inclusive).
-    */
-    PyLongObject* small_ints[_PY_NSMALLNEGINTS + _PY_NSMALLPOSINTS];
-#endif
-};
-
-/* Used by _PyImport_Cleanup() */
-extern void _PyInterpreterState_ClearModules(PyInterpreterState *interp);
-
-extern PyStatus _PyInterpreterState_SetConfig(
-    PyInterpreterState *interp,
-    const PyConfig *config);
-
-
-
-/* cross-interpreter data registry */
-
-/* For now we use a global registry of shareable classes.  An
-   alternative would be to add a tp_* slot for a class's
-   crossinterpdatafunc. It would be simpler and more efficient. */
-
-struct _xidregitem;
-
-struct _xidregitem {
-    PyTypeObject *cls;
-    crossinterpdatafunc getdata;
-    struct _xidregitem *next;
-};
-
-PyAPI_FUNC(struct _is*) _PyInterpreterState_LookUpID(int64_t);
-
-PyAPI_FUNC(int) _PyInterpreterState_IDInitref(struct _is *);
-PyAPI_FUNC(void) _PyInterpreterState_IDIncref(struct _is *);
-PyAPI_FUNC(void) _PyInterpreterState_IDDecref(struct _is *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_INTERP_H */
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_object.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_object.h
deleted file mode 100644
index 32e86d06d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_object.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef Py_INTERNAL_OBJECT_H
-#define Py_INTERNAL_OBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "pycore_gc.h"         // _PyObject_GC_IS_TRACKED()
-#include "pycore_interp.h"     // PyInterpreterState.gc
-#include "pycore_pystate.h"    // _PyThreadState_GET()
-
-PyAPI_FUNC(int) _PyType_CheckConsistency(PyTypeObject *type);
-PyAPI_FUNC(int) _PyDict_CheckConsistency(PyObject *mp, int check_content);
-
-/* Tell the GC to track this object.
- *
- * NB: While the object is tracked by the collector, it must be safe to call the
- * ob_traverse method.
- *
- * Internal note: interp->gc.generation0->_gc_prev doesn't have any bit flags
- * because it's not object header.  So we don't use _PyGCHead_PREV() and
- * _PyGCHead_SET_PREV() for it to avoid unnecessary bitwise operations.
- *
- * The PyObject_GC_Track() function is the public version of this macro.
- */
-static inline void _PyObject_GC_TRACK_impl(const char *filename, int lineno,
-                                           PyObject *op)
-{
-    _PyObject_ASSERT_FROM(op, !_PyObject_GC_IS_TRACKED(op),
-                          "object already tracked by the garbage collector",
-                          filename, lineno, "_PyObject_GC_TRACK");
-
-    PyGC_Head *gc = _Py_AS_GC(op);
-    _PyObject_ASSERT_FROM(op,
-                          (gc->_gc_prev & _PyGC_PREV_MASK_COLLECTING) == 0,
-                          "object is in generation which is garbage collected",
-                          filename, lineno, "_PyObject_GC_TRACK");
-
-    PyThreadState *tstate = _PyThreadState_GET();
-    PyGC_Head *generation0 = tstate->interp->gc.generation0;
-    PyGC_Head *last = (PyGC_Head*)(generation0->_gc_prev);
-    _PyGCHead_SET_NEXT(last, gc);
-    _PyGCHead_SET_PREV(gc, last);
-    _PyGCHead_SET_NEXT(gc, generation0);
-    generation0->_gc_prev = (uintptr_t)gc;
-}
-
-#define _PyObject_GC_TRACK(op) \
-    _PyObject_GC_TRACK_impl(__FILE__, __LINE__, _PyObject_CAST(op))
-
-/* Tell the GC to stop tracking this object.
- *
- * Internal note: This may be called while GC. So _PyGC_PREV_MASK_COLLECTING
- * must be cleared. But _PyGC_PREV_MASK_FINALIZED bit is kept.
- *
- * The object must be tracked by the GC.
- *
- * The PyObject_GC_UnTrack() function is the public version of this macro.
- */
-static inline void _PyObject_GC_UNTRACK_impl(const char *filename, int lineno,
-                                             PyObject *op)
-{
-    _PyObject_ASSERT_FROM(op, _PyObject_GC_IS_TRACKED(op),
-                          "object not tracked by the garbage collector",
-                          filename, lineno, "_PyObject_GC_UNTRACK");
-
-    PyGC_Head *gc = _Py_AS_GC(op);
-    PyGC_Head *prev = _PyGCHead_PREV(gc);
-    PyGC_Head *next = _PyGCHead_NEXT(gc);
-    _PyGCHead_SET_NEXT(prev, next);
-    _PyGCHead_SET_PREV(next, prev);
-    gc->_gc_next = 0;
-    gc->_gc_prev &= _PyGC_PREV_MASK_FINALIZED;
-}
-
-#define _PyObject_GC_UNTRACK(op) \
-    _PyObject_GC_UNTRACK_impl(__FILE__, __LINE__, _PyObject_CAST(op))
-
-#ifdef Py_REF_DEBUG
-extern void _PyDebug_PrintTotalRefs(void);
-#endif
-
-#ifdef Py_TRACE_REFS
-extern void _Py_AddToAllObjects(PyObject *op, int force);
-extern void _Py_PrintReferences(FILE *);
-extern void _Py_PrintReferenceAddresses(FILE *);
-#endif
-
-static inline PyObject **
-_PyObject_GET_WEAKREFS_LISTPTR(PyObject *op)
-{
-    Py_ssize_t offset = Py_TYPE(op)->tp_weaklistoffset;
-    return (PyObject **)((char *)op + offset);
-}
-
-// Fast inlined version of PyType_HasFeature()
-static inline int
-_PyType_HasFeature(PyTypeObject *type, unsigned long feature) {
-    return ((type->tp_flags & feature) != 0);
-}
-
-// Fast inlined version of PyObject_IS_GC()
-static inline int
-_PyObject_IS_GC(PyObject *obj)
-{
-    return (PyType_IS_GC(Py_TYPE(obj))
-            && (Py_TYPE(obj)->tp_is_gc == NULL
-                || Py_TYPE(obj)->tp_is_gc(obj)));
-}
-
-// Fast inlined version of PyType_IS_GC()
-#define _PyType_IS_GC(t) _PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_OBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pathconfig.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pathconfig.h
deleted file mode 100644
index 42d61b1ca..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pathconfig.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef Py_INTERNAL_PATHCONFIG_H
-#define Py_INTERNAL_PATHCONFIG_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-typedef struct _PyPathConfig {
-    /* Full path to the Python program */
-    wchar_t *program_full_path;
-    wchar_t *prefix;
-    wchar_t *exec_prefix;
-    /* Set by Py_SetPath(), or computed by _PyConfig_InitPathConfig() */
-    wchar_t *module_search_path;
-    /* Python program name */
-    wchar_t *program_name;
-    /* Set by Py_SetPythonHome() or PYTHONHOME environment variable */
-    wchar_t *home;
-#ifdef MS_WINDOWS
-    /* isolated and site_import are used to set Py_IsolatedFlag and
-       Py_NoSiteFlag flags on Windows in read_pth_file(). These fields
-       are ignored when their value are equal to -1 (unset). */
-    int isolated;
-    int site_import;
-    /* Set when a venv is detected */
-    wchar_t *base_executable;
-#endif
-} _PyPathConfig;
-
-#ifdef MS_WINDOWS
-#  define _PyPathConfig_INIT \
-      {.module_search_path = NULL, \
-       .isolated = -1, \
-       .site_import = -1}
-#else
-#  define _PyPathConfig_INIT \
-      {.module_search_path = NULL}
-#endif
-/* Note: _PyPathConfig_INIT sets other fields to 0/NULL */
-
-PyAPI_DATA(_PyPathConfig) _Py_path_config;
-#ifdef MS_WINDOWS
-PyAPI_DATA(wchar_t*) _Py_dll_path;
-#endif
-
-extern void _PyPathConfig_ClearGlobal(void);
-
-extern PyStatus _PyPathConfig_Calculate(
-    _PyPathConfig *pathconfig,
-    const PyConfig *config);
-extern int _PyPathConfig_ComputeSysPath0(
-    const PyWideStringList *argv,
-    PyObject **path0);
-extern PyStatus _Py_FindEnvConfigValue(
-    FILE *env_file,
-    const wchar_t *key,
-    wchar_t **value_p);
-
-#ifdef MS_WINDOWS
-extern wchar_t* _Py_GetDLLPath(void);
-#endif
-
-extern PyStatus _PyConfig_WritePathConfig(const PyConfig *config);
-extern void _Py_DumpPathConfig(PyThreadState *tstate);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_PATHCONFIG_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pyerrors.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pyerrors.h
deleted file mode 100644
index 2cf1160af..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pyerrors.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef Py_INTERNAL_PYERRORS_H
-#define Py_INTERNAL_PYERRORS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-static inline PyObject* _PyErr_Occurred(PyThreadState *tstate)
-{
-    assert(tstate != NULL);
-    return tstate->curexc_type;
-}
-
-static inline void _PyErr_ClearExcState(_PyErr_StackItem *exc_state)
-{
-    PyObject *t, *v, *tb;
-    t = exc_state->exc_type;
-    v = exc_state->exc_value;
-    tb = exc_state->exc_traceback;
-    exc_state->exc_type = NULL;
-    exc_state->exc_value = NULL;
-    exc_state->exc_traceback = NULL;
-    Py_XDECREF(t);
-    Py_XDECREF(v);
-    Py_XDECREF(tb);
-}
-
-
-PyAPI_FUNC(void) _PyErr_Fetch(
-    PyThreadState *tstate,
-    PyObject **type,
-    PyObject **value,
-    PyObject **traceback);
-
-PyAPI_FUNC(int) _PyErr_ExceptionMatches(
-    PyThreadState *tstate,
-    PyObject *exc);
-
-PyAPI_FUNC(void) _PyErr_Restore(
-    PyThreadState *tstate,
-    PyObject *type,
-    PyObject *value,
-    PyObject *traceback);
-
-PyAPI_FUNC(void) _PyErr_SetObject(
-    PyThreadState *tstate,
-    PyObject *type,
-    PyObject *value);
-
-PyAPI_FUNC(void) _PyErr_ChainStackItem(
-    _PyErr_StackItem *exc_info);
-
-PyAPI_FUNC(void) _PyErr_Clear(PyThreadState *tstate);
-
-PyAPI_FUNC(void) _PyErr_SetNone(PyThreadState *tstate, PyObject *exception);
-
-PyAPI_FUNC(PyObject *) _PyErr_NoMemory(PyThreadState *tstate);
-
-PyAPI_FUNC(void) _PyErr_SetString(
-    PyThreadState *tstate,
-    PyObject *exception,
-    const char *string);
-
-PyAPI_FUNC(PyObject *) _PyErr_Format(
-    PyThreadState *tstate,
-    PyObject *exception,
-    const char *format,
-    ...);
-
-PyAPI_FUNC(void) _PyErr_NormalizeException(
-    PyThreadState *tstate,
-    PyObject **exc,
-    PyObject **val,
-    PyObject **tb);
-
-PyAPI_FUNC(PyObject *) _PyErr_FormatFromCauseTstate(
-    PyThreadState *tstate,
-    PyObject *exception,
-    const char *format,
-    ...);
-
-PyAPI_FUNC(int) _PyErr_CheckSignalsTstate(PyThreadState *tstate);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_PYERRORS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pyhash.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pyhash.h
deleted file mode 100644
index a229f8d8b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pyhash.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef Py_INTERNAL_HASH_H
-#define Py_INTERNAL_HASH_H
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-uint64_t _Py_KeyedHash(uint64_t, const char *, Py_ssize_t);
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pylifecycle.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pylifecycle.h
deleted file mode 100644
index 50ab645fc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pylifecycle.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifndef Py_INTERNAL_LIFECYCLE_H
-#define Py_INTERNAL_LIFECYCLE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/* Forward declarations */
-struct _PyArgv;
-struct pyruntimestate;
-
-/* True if the main interpreter thread exited due to an unhandled
- * KeyboardInterrupt exception, suggesting the user pressed ^C. */
-PyAPI_DATA(int) _Py_UnhandledKeyboardInterrupt;
-
-extern int _Py_SetFileSystemEncoding(
-    const char *encoding,
-    const char *errors);
-extern void _Py_ClearFileSystemEncoding(void);
-extern PyStatus _PyUnicode_InitEncodings(PyThreadState *tstate);
-#ifdef MS_WINDOWS
-extern int _PyUnicode_EnableLegacyWindowsFSEncoding(void);
-#endif
-
-PyAPI_FUNC(void) _Py_ClearStandardStreamEncoding(void);
-
-PyAPI_FUNC(int) _Py_IsLocaleCoercionTarget(const char *ctype_loc);
-
-/* Various one-time initializers */
-
-extern PyStatus _PyUnicode_Init(void);
-extern int _PyStructSequence_Init(void);
-extern int _PyLong_Init(PyThreadState *tstate);
-extern PyStatus _PyFaulthandler_Init(int enable);
-extern int _PyTraceMalloc_Init(int enable);
-extern PyObject * _PyBuiltin_Init(PyThreadState *tstate);
-extern PyStatus _PySys_Create(
-    PyThreadState *tstate,
-    PyObject **sysmod_p);
-extern PyStatus _PySys_ReadPreinitWarnOptions(PyWideStringList *options);
-extern PyStatus _PySys_ReadPreinitXOptions(PyConfig *config);
-extern int _PySys_InitMain(PyThreadState *tstate);
-extern PyStatus _PyExc_Init(void);
-extern PyStatus _PyErr_Init(void);
-extern PyStatus _PyBuiltins_AddExceptions(PyObject * bltinmod);
-extern PyStatus _PyImportHooks_Init(PyThreadState *tstate);
-extern int _PyFloat_Init(void);
-extern PyStatus _Py_HashRandomization_Init(const PyConfig *);
-
-extern PyStatus _PyTypes_Init(void);
-extern PyStatus _PyTypes_InitSlotDefs(void);
-extern PyStatus _PyImportZip_Init(PyThreadState *tstate);
-extern PyStatus _PyGC_Init(PyThreadState *tstate);
-
-
-/* Various internal finalizers */
-
-extern void _PyFrame_Fini(void);
-extern void _PyDict_Fini(void);
-extern void _PyTuple_Fini(void);
-extern void _PyList_Fini(void);
-extern void _PySet_Fini(void);
-extern void _PyBytes_Fini(void);
-extern void _PyFloat_Fini(void);
-extern void _PySlice_Fini(void);
-extern void _PyAsyncGen_Fini(void);
-
-extern int _PySignal_Init(int install_signal_handlers);
-extern void PyOS_FiniInterrupts(void);
-
-extern void _PyExc_Fini(void);
-extern void _PyImport_Fini(void);
-extern void _PyImport_Fini2(void);
-extern void _PyGC_Fini(PyThreadState *tstate);
-extern void _PyType_Fini(void);
-extern void _Py_HashRandomization_Fini(void);
-extern void _PyUnicode_Fini(PyThreadState *tstate);
-extern void _PyLong_Fini(PyThreadState *tstate);
-extern void _PyFaulthandler_Fini(void);
-extern void _PyHash_Fini(void);
-extern void _PyTraceMalloc_Fini(void);
-extern void _PyWarnings_Fini(PyInterpreterState *interp);
-extern void _PyAST_Fini(void);
-
-extern PyStatus _PyGILState_Init(PyThreadState *tstate);
-extern void _PyGILState_Fini(PyThreadState *tstate);
-
-PyAPI_FUNC(void) _PyGC_DumpShutdownStats(PyThreadState *tstate);
-
-PyAPI_FUNC(PyStatus) _Py_PreInitializeFromPyArgv(
-    const PyPreConfig *src_config,
-    const struct _PyArgv *args);
-PyAPI_FUNC(PyStatus) _Py_PreInitializeFromConfig(
-    const PyConfig *config,
-    const struct _PyArgv *args);
-
-
-PyAPI_FUNC(int) _Py_HandleSystemExit(int *exitcode_p);
-
-PyAPI_FUNC(PyObject*) _PyErr_WriteUnraisableDefaultHook(PyObject *unraisable);
-
-PyAPI_FUNC(void) _PyErr_Print(PyThreadState *tstate);
-PyAPI_FUNC(void) _PyErr_Display(PyObject *file, PyObject *exception,
-                                PyObject *value, PyObject *tb);
-
-PyAPI_FUNC(void) _PyThreadState_DeleteCurrent(PyThreadState *tstate);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_LIFECYCLE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pymem.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pymem.h
deleted file mode 100644
index 3d925e225..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pymem.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef Py_INTERNAL_PYMEM_H
-#define Py_INTERNAL_PYMEM_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "pymem.h"      // PyMemAllocatorName
-
-
-/* Set the memory allocator of the specified domain to the default.
-   Save the old allocator into *old_alloc if it's non-NULL.
-   Return on success, or return -1 if the domain is unknown. */
-PyAPI_FUNC(int) _PyMem_SetDefaultAllocator(
-    PyMemAllocatorDomain domain,
-    PyMemAllocatorEx *old_alloc);
-
-/* Special bytes broadcast into debug memory blocks at appropriate times.
-   Strings of these are unlikely to be valid addresses, floats, ints or
-   7-bit ASCII.
-
-   - PYMEM_CLEANBYTE: clean (newly allocated) memory
-   - PYMEM_DEADBYTE dead (newly freed) memory
-   - PYMEM_FORBIDDENBYTE: untouchable bytes at each end of a block
-
-   Byte patterns 0xCB, 0xDB and 0xFB have been replaced with 0xCD, 0xDD and
-   0xFD to use the same values than Windows CRT debug malloc() and free().
-   If modified, _PyMem_IsPtrFreed() should be updated as well. */
-#define PYMEM_CLEANBYTE      0xCD
-#define PYMEM_DEADBYTE       0xDD
-#define PYMEM_FORBIDDENBYTE  0xFD
-
-/* Heuristic checking if a pointer value is newly allocated
-   (uninitialized), newly freed or NULL (is equal to zero).
-
-   The pointer is not dereferenced, only the pointer value is checked.
-
-   The heuristic relies on the debug hooks on Python memory allocators which
-   fills newly allocated memory with CLEANBYTE (0xCD) and newly freed memory
-   with DEADBYTE (0xDD). Detect also "untouchable bytes" marked
-   with FORBIDDENBYTE (0xFD). */
-static inline int _PyMem_IsPtrFreed(void *ptr)
-{
-    uintptr_t value = (uintptr_t)ptr;
-#if SIZEOF_VOID_P == 8
-    return (value == 0
-            || value == (uintptr_t)0xCDCDCDCDCDCDCDCD
-            || value == (uintptr_t)0xDDDDDDDDDDDDDDDD
-            || value == (uintptr_t)0xFDFDFDFDFDFDFDFD);
-#elif SIZEOF_VOID_P == 4
-    return (value == 0
-            || value == (uintptr_t)0xCDCDCDCD
-            || value == (uintptr_t)0xDDDDDDDD
-            || value == (uintptr_t)0xFDFDFDFD);
-#else
-#  error "unknown pointer size"
-#endif
-}
-
-PyAPI_FUNC(int) _PyMem_GetAllocatorName(
-    const char *name,
-    PyMemAllocatorName *allocator);
-
-/* Configure the Python memory allocators.
-   Pass PYMEM_ALLOCATOR_DEFAULT to use default allocators.
-   PYMEM_ALLOCATOR_NOT_SET does nothing. */
-PyAPI_FUNC(int) _PyMem_SetupAllocators(PyMemAllocatorName allocator);
-
-/* bpo-35053: Expose _Py_tracemalloc_config for _Py_NewReference()
-   which access directly _Py_tracemalloc_config.tracing for best
-   performances. */
-struct _PyTraceMalloc_Config {
-    /* Module initialized?
-       Variable protected by the GIL */
-    enum {
-        TRACEMALLOC_NOT_INITIALIZED,
-        TRACEMALLOC_INITIALIZED,
-        TRACEMALLOC_FINALIZED
-    } initialized;
-
-    /* Is tracemalloc tracing memory allocations?
-       Variable protected by the GIL */
-    int tracing;
-
-    /* limit of the number of frames in a traceback, 1 by default.
-       Variable protected by the GIL. */
-    int max_nframe;
-};
-
-#define _PyTraceMalloc_Config_INIT \
-    {.initialized = TRACEMALLOC_NOT_INITIALIZED, \
-     .tracing = 0, \
-     .max_nframe = 1}
-
-PyAPI_DATA(struct _PyTraceMalloc_Config) _Py_tracemalloc_config;
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_PYMEM_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pystate.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pystate.h
deleted file mode 100644
index 835d6e029..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_pystate.h
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef Py_INTERNAL_PYSTATE_H
-#define Py_INTERNAL_PYSTATE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "pycore_runtime.h"   /* PyRuntimeState */
-
-
-/* Check if the current thread is the main thread.
-   Use _Py_IsMainInterpreter() to check if it's the main interpreter. */
-static inline int
-_Py_IsMainThread(void)
-{
-    unsigned long thread = PyThread_get_thread_ident();
-    return (thread == _PyRuntime.main_thread);
-}
-
-
-static inline int
-_Py_IsMainInterpreter(PyThreadState* tstate)
-{
-    /* Use directly _PyRuntime rather than tstate->interp->runtime, since
-       this function is used in performance critical code path (ceval) */
-    return (tstate->interp == _PyRuntime.interpreters.main);
-}
-
-
-/* Only handle signals on the main thread of the main interpreter. */
-static inline int
-_Py_ThreadCanHandleSignals(PyInterpreterState *interp)
-{
-    return (_Py_IsMainThread() && interp == _PyRuntime.interpreters.main);
-}
-
-
-/* Only execute pending calls on the main thread. */
-static inline int
-_Py_ThreadCanHandlePendingCalls(void)
-{
-    return _Py_IsMainThread();
-}
-
-
-/* Variable and macro for in-line access to current thread
-   and interpreter state */
-
-static inline PyThreadState*
-_PyRuntimeState_GetThreadState(_PyRuntimeState *runtime)
-{
-    return (PyThreadState*)_Py_atomic_load_relaxed(&runtime->gilstate.tstate_current);
-}
-
-/* Get the current Python thread state.
-
-   Efficient macro reading directly the 'gilstate.tstate_current' atomic
-   variable. The macro is unsafe: it does not check for error and it can
-   return NULL.
-
-   The caller must hold the GIL.
-
-   See also PyThreadState_Get() and PyThreadState_GET(). */
-static inline PyThreadState*
-_PyThreadState_GET(void)
-{
-    return _PyRuntimeState_GetThreadState(&_PyRuntime);
-}
-
-/* Redefine PyThreadState_GET() as an alias to _PyThreadState_GET() */
-#undef PyThreadState_GET
-#define PyThreadState_GET() _PyThreadState_GET()
-
-PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalError_TstateNULL(const char *func);
-
-static inline void
-_Py_EnsureFuncTstateNotNULL(const char *func, PyThreadState *tstate)
-{
-    if (tstate == NULL) {
-        _Py_FatalError_TstateNULL(func);
-    }
-}
-
-// Call Py_FatalError() if tstate is NULL
-#define _Py_EnsureTstateNotNULL(tstate) \
-    _Py_EnsureFuncTstateNotNULL(__func__, tstate)
-
-
-/* Get the current interpreter state.
-
-   The macro is unsafe: it does not check for error and it can return NULL.
-
-   The caller must hold the GIL.
-
-   See also _PyInterpreterState_Get()
-   and _PyGILState_GetInterpreterStateUnsafe(). */
-static inline PyInterpreterState* _PyInterpreterState_GET(void) {
-    PyThreadState *tstate = _PyThreadState_GET();
-#ifdef Py_DEBUG
-    _Py_EnsureTstateNotNULL(tstate);
-#endif
-    return tstate->interp;
-}
-
-
-/* Other */
-
-PyAPI_FUNC(void) _PyThreadState_Init(
-    PyThreadState *tstate);
-PyAPI_FUNC(void) _PyThreadState_DeleteExcept(
-    _PyRuntimeState *runtime,
-    PyThreadState *tstate);
-
-PyAPI_FUNC(PyThreadState *) _PyThreadState_Swap(
-    struct _gilstate_runtime_state *gilstate,
-    PyThreadState *newts);
-
-PyAPI_FUNC(PyStatus) _PyInterpreterState_Enable(_PyRuntimeState *runtime);
-PyAPI_FUNC(void) _PyInterpreterState_DeleteExceptMain(_PyRuntimeState *runtime);
-
-PyAPI_FUNC(void) _PyGILState_Reinit(_PyRuntimeState *runtime);
-
-
-PyAPI_FUNC(int) _PyState_AddModule(
-    PyThreadState *tstate,
-    PyObject* module,
-    struct PyModuleDef* def);
-
-
-PyAPI_FUNC(int) _PyOS_InterruptOccurred(PyThreadState *tstate);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_PYSTATE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_runtime.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_runtime.h
deleted file mode 100644
index 34eb492b9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_runtime.h
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef Py_INTERNAL_RUNTIME_H
-#define Py_INTERNAL_RUNTIME_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "pycore_atomic.h"    /* _Py_atomic_address */
-#include "pycore_gil.h"       // struct _gil_runtime_state
-
-/* ceval state */
-
-struct _ceval_runtime_state {
-    /* Request for checking signals. It is shared by all interpreters (see
-       bpo-40513). Any thread of any interpreter can receive a signal, but only
-       the main thread of the main interpreter can handle signals: see
-       _Py_ThreadCanHandleSignals(). */
-    _Py_atomic_int signals_pending;
-    struct _gil_runtime_state gil;
-};
-
-/* GIL state */
-
-struct _gilstate_runtime_state {
-    /* bpo-26558: Flag to disable PyGILState_Check().
-       If set to non-zero, PyGILState_Check() always return 1. */
-    int check_enabled;
-    /* Assuming the current thread holds the GIL, this is the
-       PyThreadState for the current thread. */
-    _Py_atomic_address tstate_current;
-    /* The single PyInterpreterState used by this process'
-       GILState implementation
-    */
-    /* TODO: Given interp_main, it may be possible to kill this ref */
-    PyInterpreterState *autoInterpreterState;
-    Py_tss_t autoTSSkey;
-};
-
-/* Runtime audit hook state */
-
-typedef struct _Py_AuditHookEntry {
-    struct _Py_AuditHookEntry *next;
-    Py_AuditHookFunction hookCFunction;
-    void *userData;
-} _Py_AuditHookEntry;
-
-/* Full Python runtime state */
-
-typedef struct pyruntimestate {
-    /* Is running Py_PreInitialize()? */
-    int preinitializing;
-
-    /* Is Python preinitialized? Set to 1 by Py_PreInitialize() */
-    int preinitialized;
-
-    /* Is Python core initialized? Set to 1 by _Py_InitializeCore() */
-    int core_initialized;
-
-    /* Is Python fully initialized? Set to 1 by Py_Initialize() */
-    int initialized;
-
-    /* Set by Py_FinalizeEx(). Only reset to NULL if Py_Initialize()
-       is called again.
-
-       Use _PyRuntimeState_GetFinalizing() and _PyRuntimeState_SetFinalizing()
-       to access it, don't access it directly. */
-    _Py_atomic_address _finalizing;
-
-    struct pyinterpreters {
-        PyThread_type_lock mutex;
-        PyInterpreterState *head;
-        PyInterpreterState *main;
-        /* _next_interp_id is an auto-numbered sequence of small
-           integers.  It gets initialized in _PyInterpreterState_Init(),
-           which is called in Py_Initialize(), and used in
-           PyInterpreterState_New().  A negative interpreter ID
-           indicates an error occurred.  The main interpreter will
-           always have an ID of 0.  Overflow results in a RuntimeError.
-           If that becomes a problem later then we can adjust, e.g. by
-           using a Python int. */
-        int64_t next_id;
-    } interpreters;
-    // XXX Remove this field once we have a tp_* slot.
-    struct _xidregistry {
-        PyThread_type_lock mutex;
-        struct _xidregitem *head;
-    } xidregistry;
-
-    unsigned long main_thread;
-
-#define NEXITFUNCS 32
-    void (*exitfuncs[NEXITFUNCS])(void);
-    int nexitfuncs;
-
-    struct _ceval_runtime_state ceval;
-    struct _gilstate_runtime_state gilstate;
-
-    PyPreConfig preconfig;
-
-    Py_OpenCodeHookFunction open_code_hook;
-    void *open_code_userdata;
-    _Py_AuditHookEntry *audit_hook_head;
-
-    // XXX Consolidate globals found via the check-c-globals script.
-} _PyRuntimeState;
-
-#define _PyRuntimeState_INIT \
-    {.preinitialized = 0, .core_initialized = 0, .initialized = 0}
-/* Note: _PyRuntimeState_INIT sets other fields to 0/NULL */
-
-
-PyAPI_DATA(_PyRuntimeState) _PyRuntime;
-
-PyAPI_FUNC(PyStatus) _PyRuntimeState_Init(_PyRuntimeState *runtime);
-PyAPI_FUNC(void) _PyRuntimeState_Fini(_PyRuntimeState *runtime);
-
-#ifdef HAVE_FORK
-PyAPI_FUNC(void) _PyRuntimeState_ReInitThreads(_PyRuntimeState *runtime);
-#endif
-
-/* Initialize _PyRuntimeState.
-   Return NULL on success, or return an error message on failure. */
-PyAPI_FUNC(PyStatus) _PyRuntime_Initialize(void);
-
-PyAPI_FUNC(void) _PyRuntime_Finalize(void);
-
-
-static inline PyThreadState*
-_PyRuntimeState_GetFinalizing(_PyRuntimeState *runtime) {
-    return (PyThreadState*)_Py_atomic_load_relaxed(&runtime->_finalizing);
-}
-
-static inline void
-_PyRuntimeState_SetFinalizing(_PyRuntimeState *runtime, PyThreadState *tstate) {
-    _Py_atomic_store_relaxed(&runtime->_finalizing, (uintptr_t)tstate);
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_RUNTIME_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_sysmodule.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_sysmodule.h
deleted file mode 100644
index 738a7746a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_sysmodule.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef Py_INTERNAL_SYSMODULE_H
-#define Py_INTERNAL_SYSMODULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-PyAPI_FUNC(int) _PySys_Audit(
-    PyThreadState *tstate,
-    const char *event,
-    const char *argFormat,
-    ...);
-
-/* We want minimal exposure of this function, so use extern rather than
-   PyAPI_FUNC() to not export the symbol. */
-extern void _PySys_ClearAuditHooks(PyThreadState *tstate);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_SYSMODULE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_traceback.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_traceback.h
deleted file mode 100644
index 1f092411a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_traceback.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef Py_INTERNAL_TRACEBACK_H
-#define Py_INTERNAL_TRACEBACK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/* Forward declaration */
-struct _is;
-
-/* Write the Python traceback into the file 'fd'. For example:
-
-       Traceback (most recent call first):
-         File "xxx", line xxx in <xxx>
-         File "xxx", line xxx in <xxx>
-         ...
-         File "xxx", line xxx in <xxx>
-
-   This function is written for debug purpose only, to dump the traceback in
-   the worst case: after a segmentation fault, at fatal error, etc. That's why,
-   it is very limited. Strings are truncated to 100 characters and encoded to
-   ASCII with backslashreplace. It doesn't write the source code, only the
-   function name, filename and line number of each frame. Write only the first
-   100 frames: if the traceback is truncated, write the line " ...".
-
-   This function is signal safe. */
-
-PyAPI_FUNC(void) _Py_DumpTraceback(
-    int fd,
-    PyThreadState *tstate);
-
-/* Write the traceback of all threads into the file 'fd'. current_thread can be
-   NULL.
-
-   Return NULL on success, or an error message on error.
-
-   This function is written for debug purpose only. It calls
-   _Py_DumpTraceback() for each thread, and so has the same limitations. It
-   only write the traceback of the first 100 threads: write "..." if there are
-   more threads.
-
-   If current_tstate is NULL, the function tries to get the Python thread state
-   of the current thread. It is not an error if the function is unable to get
-   the current Python thread state.
-
-   If interp is NULL, the function tries to get the interpreter state from
-   the current Python thread state, or from
-   _PyGILState_GetInterpreterStateUnsafe() in last resort.
-
-   It is better to pass NULL to interp and current_tstate, the function tries
-   different options to retrieve these informations.
-
-   This function is signal safe. */
-
-PyAPI_FUNC(const char*) _Py_DumpTracebackThreads(
-    int fd,
-    struct _is *interp,
-    PyThreadState *current_tstate);
-
-/* Write a Unicode object into the file descriptor fd. Encode the string to
-   ASCII using the backslashreplace error handler.
-
-   Do nothing if text is not a Unicode object. The function accepts Unicode
-   string which is not ready (PyUnicode_WCHAR_KIND).
-
-   This function is signal safe. */
-PyAPI_FUNC(void) _Py_DumpASCII(int fd, PyObject *text);
-
-/* Format an integer as decimal into the file descriptor fd.
-
-   This function is signal safe. */
-PyAPI_FUNC(void) _Py_DumpDecimal(
-    int fd,
-    unsigned long value);
-
-/* Format an integer as hexadecimal into the file descriptor fd with at least
-   width digits.
-
-   The maximum width is sizeof(unsigned long)*2 digits.
-
-   This function is signal safe. */
-PyAPI_FUNC(void) _Py_DumpHexadecimal(
-    int fd,
-    unsigned long value,
-    Py_ssize_t width);
-
-PyAPI_FUNC(PyObject*) _PyTraceBack_FromFrame(
-    PyObject *tb_next,
-    PyFrameObject *frame);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_TRACEBACK_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_tupleobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_tupleobject.h
deleted file mode 100644
index f95f16c0e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_tupleobject.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef Py_INTERNAL_TUPLEOBJECT_H
-#define Py_INTERNAL_TUPLEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-#include "tupleobject.h"   /* _PyTuple_CAST() */
-
-#define _PyTuple_ITEMS(op) (_PyTuple_CAST(op)->ob_item)
-PyAPI_FUNC(PyObject *) _PyTuple_FromArray(PyObject *const *, Py_ssize_t);
-
-#ifdef __cplusplus
-}
-#endif
-#endif   /* !Py_INTERNAL_TUPLEOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_warnings.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_warnings.h
deleted file mode 100644
index cafe305ed..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/internal/pycore_warnings.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef Py_INTERNAL_WARNINGS_H
-#define Py_INTERNAL_WARNINGS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-struct _warnings_runtime_state {
-    /* Both 'filters' and 'onceregistry' can be set in warnings.py;
-       get_warnings_attr() will reset these variables accordingly. */
-    PyObject *filters;  /* List */
-    PyObject *once_registry;  /* Dict */
-    PyObject *default_action; /* String */
-    long filters_version;
-};
-
-extern PyStatus _PyWarnings_InitState(PyThreadState *tstate);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_WARNINGS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/interpreteridobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/interpreteridobject.h
deleted file mode 100644
index e744fcdc9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/interpreteridobject.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef Py_INTERPRETERIDOBJECT_H
-#define Py_INTERPRETERIDOBJECT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_INTERPRETERIDOBJECT_H
-#  include  "cpython/interpreteridobject.h"
-#  undef Py_CPYTHON_INTERPRETERIDOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERPRETERIDOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/intrcheck.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/intrcheck.h
deleted file mode 100644
index e5bf5a834..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/intrcheck.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef Py_INTRCHECK_H
-#define Py_INTRCHECK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(int) PyOS_InterruptOccurred(void);
-PyAPI_FUNC(void) PyOS_InitInterrupts(void);
-#ifdef HAVE_FORK
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
-PyAPI_FUNC(void) PyOS_BeforeFork(void);
-PyAPI_FUNC(void) PyOS_AfterFork_Parent(void);
-PyAPI_FUNC(void) PyOS_AfterFork_Child(void);
-#endif
-#endif
-/* Deprecated, please use PyOS_AfterFork_Child() instead */
-Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyOS_AfterFork(void);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyOS_IsMainThread(void);
-PyAPI_FUNC(void) _PySignal_AfterFork(void);
-
-#ifdef MS_WINDOWS
-/* windows.h is not included by Python.h so use void* instead of HANDLE */
-PyAPI_FUNC(void*) _PyOS_SigintEvent(void);
-#endif
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTRCHECK_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/iterobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/iterobject.h
deleted file mode 100644
index 51139bf18..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/iterobject.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef Py_ITEROBJECT_H
-#define Py_ITEROBJECT_H
-/* Iterators (the basic kind, over a sequence) */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PySeqIter_Type;
-PyAPI_DATA(PyTypeObject) PyCallIter_Type;
-
-#define PySeqIter_Check(op) Py_IS_TYPE(op, &PySeqIter_Type)
-
-PyAPI_FUNC(PyObject *) PySeqIter_New(PyObject *);
-
-
-#define PyCallIter_Check(op) Py_IS_TYPE(op, &PyCallIter_Type)
-
-PyAPI_FUNC(PyObject *) PyCallIter_New(PyObject *, PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ITEROBJECT_H */
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/listobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/listobject.h
deleted file mode 100644
index 2a8a25525..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/listobject.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* List object interface
-
-   Another generally useful object type is a list of object pointers.
-   This is a mutable type: the list items can be changed, and items can be
-   added or removed. Out-of-range indices or non-list objects are ignored.
-
-   WARNING: PyList_SetItem does not increment the new item's reference count,
-   but does decrement the reference count of the item it replaces, if not nil.
-   It does *decrement* the reference count if it is *not* inserted in the list.
-   Similarly, PyList_GetItem does not increment the returned item's reference
-   count.
-*/
-
-#ifndef Py_LISTOBJECT_H
-#define Py_LISTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyList_Type;
-PyAPI_DATA(PyTypeObject) PyListIter_Type;
-PyAPI_DATA(PyTypeObject) PyListRevIter_Type;
-
-#define PyList_Check(op) \
-    PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS)
-#define PyList_CheckExact(op) Py_IS_TYPE(op, &PyList_Type)
-
-PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size);
-PyAPI_FUNC(Py_ssize_t) PyList_Size(PyObject *);
-
-PyAPI_FUNC(PyObject *) PyList_GetItem(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyList_SetItem(PyObject *, Py_ssize_t, PyObject *);
-PyAPI_FUNC(int) PyList_Insert(PyObject *, Py_ssize_t, PyObject *);
-PyAPI_FUNC(int) PyList_Append(PyObject *, PyObject *);
-
-PyAPI_FUNC(PyObject *) PyList_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t);
-PyAPI_FUNC(int) PyList_SetSlice(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *);
-
-PyAPI_FUNC(int) PyList_Sort(PyObject *);
-PyAPI_FUNC(int) PyList_Reverse(PyObject *);
-PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *);
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_LISTOBJECT_H
-#  include  "cpython/listobject.h"
-#  undef Py_CPYTHON_LISTOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LISTOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/longintrepr.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/longintrepr.h
deleted file mode 100644
index ff4155f96..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/longintrepr.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_LONGINTREPR_H
-#define Py_LONGINTREPR_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* This is published for the benefit of "friends" marshal.c and _decimal.c. */
-
-/* Parameters of the integer representation.  There are two different
-   sets of parameters: one set for 30-bit digits, stored in an unsigned 32-bit
-   integer type, and one set for 15-bit digits with each digit stored in an
-   unsigned short.  The value of PYLONG_BITS_IN_DIGIT, defined either at
-   configure time or in pyport.h, is used to decide which digit size to use.
-
-   Type 'digit' should be able to hold 2*PyLong_BASE-1, and type 'twodigits'
-   should be an unsigned integer type able to hold all integers up to
-   PyLong_BASE*PyLong_BASE-1.  x_sub assumes that 'digit' is an unsigned type,
-   and that overflow is handled by taking the result modulo 2**N for some N >
-   PyLong_SHIFT.  The majority of the code doesn't care about the precise
-   value of PyLong_SHIFT, but there are some notable exceptions:
-
-   - long_pow() requires that PyLong_SHIFT be divisible by 5
-
-   - PyLong_{As,From}ByteArray require that PyLong_SHIFT be at least 8
-
-   - long_hash() requires that PyLong_SHIFT is *strictly* less than the number
-     of bits in an unsigned long, as do the PyLong <-> long (or unsigned long)
-     conversion functions
-
-   - the Python int <-> size_t/Py_ssize_t conversion functions expect that
-     PyLong_SHIFT is strictly less than the number of bits in a size_t
-
-   - the marshal code currently expects that PyLong_SHIFT is a multiple of 15
-
-   - NSMALLNEGINTS and NSMALLPOSINTS should be small enough to fit in a single
-     digit; with the current values this forces PyLong_SHIFT >= 9
-
-  The values 15 and 30 should fit all of the above requirements, on any
-  platform.
-*/
-
-#if PYLONG_BITS_IN_DIGIT == 30
-typedef uint32_t digit;
-typedef int32_t sdigit; /* signed variant of digit */
-typedef uint64_t twodigits;
-typedef int64_t stwodigits; /* signed variant of twodigits */
-#define PyLong_SHIFT    30
-#define _PyLong_DECIMAL_SHIFT   9 /* max(e such that 10**e fits in a digit) */
-#define _PyLong_DECIMAL_BASE    ((digit)1000000000) /* 10 ** DECIMAL_SHIFT */
-#elif PYLONG_BITS_IN_DIGIT == 15
-typedef unsigned short digit;
-typedef short sdigit; /* signed variant of digit */
-typedef unsigned long twodigits;
-typedef long stwodigits; /* signed variant of twodigits */
-#define PyLong_SHIFT    15
-#define _PyLong_DECIMAL_SHIFT   4 /* max(e such that 10**e fits in a digit) */
-#define _PyLong_DECIMAL_BASE    ((digit)10000) /* 10 ** DECIMAL_SHIFT */
-#else
-#error "PYLONG_BITS_IN_DIGIT should be 15 or 30"
-#endif
-#define PyLong_BASE     ((digit)1 << PyLong_SHIFT)
-#define PyLong_MASK     ((digit)(PyLong_BASE - 1))
-
-#if PyLong_SHIFT % 5 != 0
-#error "longobject.c requires that PyLong_SHIFT be divisible by 5"
-#endif
-
-/* Long integer representation.
-   The absolute value of a number is equal to
-        SUM(for i=0 through abs(ob_size)-1) ob_digit[i] * 2**(SHIFT*i)
-   Negative numbers are represented with ob_size < 0;
-   zero is represented by ob_size == 0.
-   In a normalized number, ob_digit[abs(ob_size)-1] (the most significant
-   digit) is never zero.  Also, in all cases, for all valid i,
-        0 <= ob_digit[i] <= MASK.
-   The allocation function takes care of allocating extra memory
-   so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available.
-
-   CAUTION:  Generic code manipulating subtypes of PyVarObject has to
-   aware that ints abuse  ob_size's sign bit.
-*/
-
-struct _longobject {
-    PyObject_VAR_HEAD
-    digit ob_digit[1];
-};
-
-PyAPI_FUNC(PyLongObject *) _PyLong_New(Py_ssize_t);
-
-/* Return a copy of src. */
-PyAPI_FUNC(PyObject *) _PyLong_Copy(PyLongObject *src);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LONGINTREPR_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/longobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/longobject.h
deleted file mode 100644
index 1b288099d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/longobject.h
+++ /dev/null
@@ -1,242 +0,0 @@
-#ifndef Py_LONGOBJECT_H
-#define Py_LONGOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Long (arbitrary precision) integer object interface */
-
-typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */
-
-PyAPI_DATA(PyTypeObject) PyLong_Type;
-
-#define PyLong_Check(op) \
-        PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LONG_SUBCLASS)
-#define PyLong_CheckExact(op) Py_IS_TYPE(op, &PyLong_Type)
-
-PyAPI_FUNC(PyObject *) PyLong_FromLong(long);
-PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLong(unsigned long);
-PyAPI_FUNC(PyObject *) PyLong_FromSize_t(size_t);
-PyAPI_FUNC(PyObject *) PyLong_FromSsize_t(Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyLong_FromDouble(double);
-PyAPI_FUNC(long) PyLong_AsLong(PyObject *);
-PyAPI_FUNC(long) PyLong_AsLongAndOverflow(PyObject *, int *);
-PyAPI_FUNC(Py_ssize_t) PyLong_AsSsize_t(PyObject *);
-PyAPI_FUNC(size_t) PyLong_AsSize_t(PyObject *);
-PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLong(PyObject *);
-PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLongMask(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyLong_AsInt(PyObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyLong_GetInfo(void);
-
-/* It may be useful in the future. I've added it in the PyInt -> PyLong
-   cleanup to keep the extra information. [CH] */
-#define PyLong_AS_LONG(op) PyLong_AsLong(op)
-
-/* Issue #1983: pid_t can be longer than a C long on some systems */
-#if !defined(SIZEOF_PID_T) || SIZEOF_PID_T == SIZEOF_INT
-#define _Py_PARSE_PID "i"
-#define PyLong_FromPid PyLong_FromLong
-#define PyLong_AsPid PyLong_AsLong
-#elif SIZEOF_PID_T == SIZEOF_LONG
-#define _Py_PARSE_PID "l"
-#define PyLong_FromPid PyLong_FromLong
-#define PyLong_AsPid PyLong_AsLong
-#elif defined(SIZEOF_LONG_LONG) && SIZEOF_PID_T == SIZEOF_LONG_LONG
-#define _Py_PARSE_PID "L"
-#define PyLong_FromPid PyLong_FromLongLong
-#define PyLong_AsPid PyLong_AsLongLong
-#else
-#error "sizeof(pid_t) is neither sizeof(int), sizeof(long) or sizeof(long long)"
-#endif /* SIZEOF_PID_T */
-
-#if SIZEOF_VOID_P == SIZEOF_INT
-#  define _Py_PARSE_INTPTR "i"
-#  define _Py_PARSE_UINTPTR "I"
-#elif SIZEOF_VOID_P == SIZEOF_LONG
-#  define _Py_PARSE_INTPTR "l"
-#  define _Py_PARSE_UINTPTR "k"
-#elif defined(SIZEOF_LONG_LONG) && SIZEOF_VOID_P == SIZEOF_LONG_LONG
-#  define _Py_PARSE_INTPTR "L"
-#  define _Py_PARSE_UINTPTR "K"
-#else
-#  error "void* different in size from int, long and long long"
-#endif /* SIZEOF_VOID_P */
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyLong_UnsignedShort_Converter(PyObject *, void *);
-PyAPI_FUNC(int) _PyLong_UnsignedInt_Converter(PyObject *, void *);
-PyAPI_FUNC(int) _PyLong_UnsignedLong_Converter(PyObject *, void *);
-PyAPI_FUNC(int) _PyLong_UnsignedLongLong_Converter(PyObject *, void *);
-PyAPI_FUNC(int) _PyLong_Size_t_Converter(PyObject *, void *);
-#endif
-
-/* Used by Python/mystrtoul.c, _PyBytes_FromHex(),
-   _PyBytes_DecodeEscape(), etc. */
-#ifndef Py_LIMITED_API
-PyAPI_DATA(unsigned char) _PyLong_DigitValue[256];
-#endif
-
-/* _PyLong_Frexp returns a double x and an exponent e such that the
-   true value is approximately equal to x * 2**e.  e is >= 0.  x is
-   0.0 if and only if the input is 0 (in which case, e and x are both
-   zeroes); otherwise, 0.5 <= abs(x) < 1.0.  On overflow, which is
-   possible if the number of bits doesn't fit into a Py_ssize_t, sets
-   OverflowError and returns -1.0 for x, 0 for e. */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(double) _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e);
-#endif
-
-PyAPI_FUNC(double) PyLong_AsDouble(PyObject *);
-PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *);
-PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *);
-
-PyAPI_FUNC(PyObject *) PyLong_FromLongLong(long long);
-PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned long long);
-PyAPI_FUNC(long long) PyLong_AsLongLong(PyObject *);
-PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLong(PyObject *);
-PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLongMask(PyObject *);
-PyAPI_FUNC(long long) PyLong_AsLongLongAndOverflow(PyObject *, int *);
-
-PyAPI_FUNC(PyObject *) PyLong_FromString(const char *, char **, int);
-#ifndef Py_LIMITED_API
-Py_DEPRECATED(3.3)
-PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int);
-PyAPI_FUNC(PyObject *) PyLong_FromUnicodeObject(PyObject *u, int base);
-PyAPI_FUNC(PyObject *) _PyLong_FromBytes(const char *, Py_ssize_t, int);
-#endif
-
-#ifndef Py_LIMITED_API
-/* _PyLong_Sign.  Return 0 if v is 0, -1 if v < 0, +1 if v > 0.
-   v must not be NULL, and must be a normalized long.
-   There are no error cases.
-*/
-PyAPI_FUNC(int) _PyLong_Sign(PyObject *v);
-
-
-/* _PyLong_NumBits.  Return the number of bits needed to represent the
-   absolute value of a long.  For example, this returns 1 for 1 and -1, 2
-   for 2 and -2, and 2 for 3 and -3.  It returns 0 for 0.
-   v must not be NULL, and must be a normalized long.
-   (size_t)-1 is returned and OverflowError set if the true result doesn't
-   fit in a size_t.
-*/
-PyAPI_FUNC(size_t) _PyLong_NumBits(PyObject *v);
-
-/* _PyLong_DivmodNear.  Given integers a and b, compute the nearest
-   integer q to the exact quotient a / b, rounding to the nearest even integer
-   in the case of a tie.  Return (q, r), where r = a - q*b.  The remainder r
-   will satisfy abs(r) <= abs(b)/2, with equality possible only if q is
-   even.
-*/
-PyAPI_FUNC(PyObject *) _PyLong_DivmodNear(PyObject *, PyObject *);
-
-/* _PyLong_FromByteArray:  View the n unsigned bytes as a binary integer in
-   base 256, and return a Python int with the same numeric value.
-   If n is 0, the integer is 0.  Else:
-   If little_endian is 1/true, bytes[n-1] is the MSB and bytes[0] the LSB;
-   else (little_endian is 0/false) bytes[0] is the MSB and bytes[n-1] the
-   LSB.
-   If is_signed is 0/false, view the bytes as a non-negative integer.
-   If is_signed is 1/true, view the bytes as a 2's-complement integer,
-   non-negative if bit 0x80 of the MSB is clear, negative if set.
-   Error returns:
-   + Return NULL with the appropriate exception set if there's not
-     enough memory to create the Python int.
-*/
-PyAPI_FUNC(PyObject *) _PyLong_FromByteArray(
-    const unsigned char* bytes, size_t n,
-    int little_endian, int is_signed);
-
-/* _PyLong_AsByteArray: Convert the least-significant 8*n bits of long
-   v to a base-256 integer, stored in array bytes.  Normally return 0,
-   return -1 on error.
-   If little_endian is 1/true, store the MSB at bytes[n-1] and the LSB at
-   bytes[0]; else (little_endian is 0/false) store the MSB at bytes[0] and
-   the LSB at bytes[n-1].
-   If is_signed is 0/false, it's an error if v < 0; else (v >= 0) n bytes
-   are filled and there's nothing special about bit 0x80 of the MSB.
-   If is_signed is 1/true, bytes is filled with the 2's-complement
-   representation of v's value.  Bit 0x80 of the MSB is the sign bit.
-   Error returns (-1):
-   + is_signed is 0 and v < 0.  TypeError is set in this case, and bytes
-     isn't altered.
-   + n isn't big enough to hold the full mathematical value of v.  For
-     example, if is_signed is 0 and there are more digits in the v than
-     fit in n; or if is_signed is 1, v < 0, and n is just 1 bit shy of
-     being large enough to hold a sign bit.  OverflowError is set in this
-     case, but bytes holds the least-significant n bytes of the true value.
-*/
-PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v,
-    unsigned char* bytes, size_t n,
-    int little_endian, int is_signed);
-
-/* _PyLong_FromNbInt: Convert the given object to a PyLongObject
-   using the nb_int slot, if available.  Raise TypeError if either the
-   nb_int slot is not available or the result of the call to nb_int
-   returns something not of type int.
-*/
-PyAPI_FUNC(PyObject *) _PyLong_FromNbInt(PyObject *);
-
-/* Convert the given object to a PyLongObject using the nb_index or
-   nb_int slots, if available (the latter is deprecated).
-   Raise TypeError if either nb_index and nb_int slots are not
-   available or the result of the call to nb_index or nb_int
-   returns something not of type int.
-   Should be replaced with PyNumber_Index after the end of the
-   deprecation period.
-*/
-PyAPI_FUNC(PyObject *) _PyLong_FromNbIndexOrNbInt(PyObject *);
-
-/* _PyLong_Format: Convert the long to a string object with given base,
-   appending a base prefix of 0[box] if base is 2, 8 or 16. */
-PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *obj, int base);
-
-PyAPI_FUNC(int) _PyLong_FormatWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    int base,
-    int alternate);
-
-PyAPI_FUNC(char*) _PyLong_FormatBytesWriter(
-    _PyBytesWriter *writer,
-    char *str,
-    PyObject *obj,
-    int base,
-    int alternate);
-
-/* Format the object based on the format_spec, as defined in PEP 3101
-   (Advanced String Formatting). */
-PyAPI_FUNC(int) _PyLong_FormatAdvancedWriter(
-    _PyUnicodeWriter *writer,
-    PyObject *obj,
-    PyObject *format_spec,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif /* Py_LIMITED_API */
-
-/* These aren't really part of the int object, but they're handy. The
-   functions are in Python/mystrtoul.c.
- */
-PyAPI_FUNC(unsigned long) PyOS_strtoul(const char *, char **, int);
-PyAPI_FUNC(long) PyOS_strtol(const char *, char **, int);
-
-#ifndef Py_LIMITED_API
-/* For use by the gcd function in mathmodule.c */
-PyAPI_FUNC(PyObject *) _PyLong_GCD(PyObject *, PyObject *);
-#endif /* !Py_LIMITED_API */
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyObject *) _PyLong_Zero;
-PyAPI_DATA(PyObject *) _PyLong_One;
-
-PyAPI_FUNC(PyObject *) _PyLong_Rshift(PyObject *, size_t);
-PyAPI_FUNC(PyObject *) _PyLong_Lshift(PyObject *, size_t);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_LONGOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/marshal.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/marshal.h
deleted file mode 100644
index 09d9337e5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/marshal.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-/* Interface for marshal.c */
-
-#ifndef Py_MARSHAL_H
-#define Py_MARSHAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define Py_MARSHAL_VERSION 4
-
-PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *, int);
-PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *, int);
-PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *, int);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *);
-PyAPI_FUNC(int) PyMarshal_ReadShortFromFile(FILE *);
-PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromFile(FILE *);
-PyAPI_FUNC(PyObject *) PyMarshal_ReadLastObjectFromFile(FILE *);
-#endif
-PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(const char *,
-                                                      Py_ssize_t);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MARSHAL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/memoryobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/memoryobject.h
deleted file mode 100644
index 306028f4b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/memoryobject.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Memory view object. In Python this is available as "memoryview". */
-
-#ifndef Py_MEMORYOBJECT_H
-#define Py_MEMORYOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyTypeObject) _PyManagedBuffer_Type;
-#endif
-PyAPI_DATA(PyTypeObject) PyMemoryView_Type;
-
-#define PyMemoryView_Check(op) Py_IS_TYPE(op, &PyMemoryView_Type)
-
-#ifndef Py_LIMITED_API
-/* Get a pointer to the memoryview's private copy of the exporter's buffer. */
-#define PyMemoryView_GET_BUFFER(op) (&((PyMemoryViewObject *)(op))->view)
-/* Get a pointer to the exporting object (this may be NULL!). */
-#define PyMemoryView_GET_BASE(op) (((PyMemoryViewObject *)(op))->view.obj)
-#endif
-
-PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyMemoryView_FromMemory(char *mem, Py_ssize_t size,
-                                               int flags);
-#endif
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info);
-#endif
-PyAPI_FUNC(PyObject *) PyMemoryView_GetContiguous(PyObject *base,
-                                                  int buffertype,
-                                                  char order);
-
-
-/* The structs are declared here so that macros can work, but they shouldn't
-   be considered public. Don't access their fields directly, use the macros
-   and functions instead! */
-#ifndef Py_LIMITED_API
-#define _Py_MANAGED_BUFFER_RELEASED    0x001  /* access to exporter blocked */
-#define _Py_MANAGED_BUFFER_FREE_FORMAT 0x002  /* free format */
-typedef struct {
-    PyObject_HEAD
-    int flags;          /* state flags */
-    Py_ssize_t exports; /* number of direct memoryview exports */
-    Py_buffer master; /* snapshot buffer obtained from the original exporter */
-} _PyManagedBufferObject;
-
-
-/* memoryview state flags */
-#define _Py_MEMORYVIEW_RELEASED    0x001  /* access to master buffer blocked */
-#define _Py_MEMORYVIEW_C           0x002  /* C-contiguous layout */
-#define _Py_MEMORYVIEW_FORTRAN     0x004  /* Fortran contiguous layout */
-#define _Py_MEMORYVIEW_SCALAR      0x008  /* scalar: ndim = 0 */
-#define _Py_MEMORYVIEW_PIL         0x010  /* PIL-style layout */
-
-typedef struct {
-    PyObject_VAR_HEAD
-    _PyManagedBufferObject *mbuf; /* managed buffer */
-    Py_hash_t hash;               /* hash value for read-only views */
-    int flags;                    /* state flags */
-    Py_ssize_t exports;           /* number of buffer re-exports */
-    Py_buffer view;               /* private copy of the exporter's view */
-    PyObject *weakreflist;
-    Py_ssize_t ob_array[1];       /* shape, strides, suboffsets */
-} PyMemoryViewObject;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MEMORYOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/methodobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/methodobject.h
deleted file mode 100644
index 12e049b40..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/methodobject.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-/* Method object interface */
-
-#ifndef Py_METHODOBJECT_H
-#define Py_METHODOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is about the type 'builtin_function_or_method',
-   not Python methods in user-defined classes.  See classobject.h
-   for the latter. */
-
-PyAPI_DATA(PyTypeObject) PyCFunction_Type;
-
-#define PyCFunction_CheckExact(op) Py_IS_TYPE(op, &PyCFunction_Type)
-#define PyCFunction_Check(op) PyObject_TypeCheck(op, &PyCFunction_Type)
-
-typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
-typedef PyObject *(*_PyCFunctionFast) (PyObject *, PyObject *const *, Py_ssize_t);
-typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *,
-                                             PyObject *);
-typedef PyObject *(*_PyCFunctionFastWithKeywords) (PyObject *,
-                                                   PyObject *const *, Py_ssize_t,
-                                                   PyObject *);
-typedef PyObject *(*PyCMethod)(PyObject *, PyTypeObject *, PyObject *const *,
-                               size_t, PyObject *);
-
-PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *);
-PyAPI_FUNC(PyObject *) PyCFunction_GetSelf(PyObject *);
-PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *);
-
-Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *);
-
-struct PyMethodDef {
-    const char  *ml_name;   /* The name of the built-in function/method */
-    PyCFunction ml_meth;    /* The C function that implements it */
-    int         ml_flags;   /* Combination of METH_xxx flags, which mostly
-                               describe the args expected by the C func */
-    const char  *ml_doc;    /* The __doc__ attribute, or NULL */
-};
-typedef struct PyMethodDef PyMethodDef;
-
-#define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL)
-PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *,
-                                         PyObject *);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
-#define PyCFunction_NewEx(ML, SELF, MOD) PyCMethod_New((ML), (SELF), (MOD), NULL)
-PyAPI_FUNC(PyObject *) PyCMethod_New(PyMethodDef *, PyObject *,
-                                     PyObject *, PyTypeObject *);
-#endif
-
-
-/* Flag passed to newmethodobject */
-/* #define METH_OLDARGS  0x0000   -- unsupported now */
-#define METH_VARARGS  0x0001
-#define METH_KEYWORDS 0x0002
-/* METH_NOARGS and METH_O must not be combined with the flags above. */
-#define METH_NOARGS   0x0004
-#define METH_O        0x0008
-
-/* METH_CLASS and METH_STATIC are a little different; these control
-   the construction of methods for a class.  These cannot be used for
-   functions in modules. */
-#define METH_CLASS    0x0010
-#define METH_STATIC   0x0020
-
-/* METH_COEXIST allows a method to be entered even though a slot has
-   already filled the entry.  When defined, the flag allows a separate
-   method, "__contains__" for example, to coexist with a defined
-   slot like sq_contains. */
-
-#define METH_COEXIST   0x0040
-
-#ifndef Py_LIMITED_API
-#define METH_FASTCALL  0x0080
-#endif
-
-/* This bit is preserved for Stackless Python */
-#ifdef STACKLESS
-#define METH_STACKLESS 0x0100
-#else
-#define METH_STACKLESS 0x0000
-#endif
-
-/* METH_METHOD means the function stores an
- * additional reference to the class that defines it;
- * both self and class are passed to it.
- * It uses PyCMethodObject instead of PyCFunctionObject.
- * May not be combined with METH_NOARGS, METH_O, METH_CLASS or METH_STATIC.
- */
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
-#define METH_METHOD 0x0200
-#endif
-
-
-#ifndef Py_LIMITED_API
-
-#define Py_CPYTHON_METHODOBJECT_H
-#include  "cpython/methodobject.h"
-#undef Py_CPYTHON_METHODOBJECT_H
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_METHODOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/modsupport.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/modsupport.h
deleted file mode 100644
index 4c4aab65b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/modsupport.h
+++ /dev/null
@@ -1,255 +0,0 @@
-
-#ifndef Py_MODSUPPORT_H
-#define Py_MODSUPPORT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Module support interface */
-
-#include <stdarg.h>
-
-/* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier
-   to mean Py_ssize_t */
-#ifdef PY_SSIZE_T_CLEAN
-#define PyArg_Parse                     _PyArg_Parse_SizeT
-#define PyArg_ParseTuple                _PyArg_ParseTuple_SizeT
-#define PyArg_ParseTupleAndKeywords     _PyArg_ParseTupleAndKeywords_SizeT
-#define PyArg_VaParse                   _PyArg_VaParse_SizeT
-#define PyArg_VaParseTupleAndKeywords   _PyArg_VaParseTupleAndKeywords_SizeT
-#define Py_BuildValue                   _Py_BuildValue_SizeT
-#define Py_VaBuildValue                 _Py_VaBuildValue_SizeT
-#ifndef Py_LIMITED_API
-#define _Py_VaBuildStack                _Py_VaBuildStack_SizeT
-#endif
-#else
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list);
-PyAPI_FUNC(PyObject **) _Py_VaBuildStack_SizeT(
-    PyObject **small_stack,
-    Py_ssize_t small_stack_len,
-    const char *format,
-    va_list va,
-    Py_ssize_t *p_nargs);
-#endif /* !Py_LIMITED_API */
-#endif
-
-/* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */
-#if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...);
-PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
-                                                  const char *, char **, ...);
-PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list);
-PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *,
-                                                  const char *, char **, va_list);
-#endif
-PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *);
-PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...);
-PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...);
-PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
-
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) _PyArg_UnpackStack(
-    PyObject *const *args,
-    Py_ssize_t nargs,
-    const char *name,
-    Py_ssize_t min,
-    Py_ssize_t max,
-    ...);
-
-PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs);
-PyAPI_FUNC(int) _PyArg_NoKwnames(const char *funcname, PyObject *kwnames);
-PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args);
-#define _PyArg_NoKeywords(funcname, kwargs) \
-    ((kwargs) == NULL || _PyArg_NoKeywords((funcname), (kwargs)))
-#define _PyArg_NoKwnames(funcname, kwnames) \
-    ((kwnames) == NULL || _PyArg_NoKwnames((funcname), (kwnames)))
-#define _PyArg_NoPositional(funcname, args) \
-    ((args) == NULL || _PyArg_NoPositional((funcname), (args)))
-
-PyAPI_FUNC(void) _PyArg_BadArgument(const char *, const char *, const char *, PyObject *);
-PyAPI_FUNC(int) _PyArg_CheckPositional(const char *, Py_ssize_t,
-                                       Py_ssize_t, Py_ssize_t);
-#define _PyArg_CheckPositional(funcname, nargs, min, max) \
-    (((min) <= (nargs) && (nargs) <= (max)) \
-     || _PyArg_CheckPositional((funcname), (nargs), (min), (max)))
-
-#endif
-
-PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject **) _Py_VaBuildStack(
-    PyObject **small_stack,
-    Py_ssize_t small_stack_len,
-    const char *format,
-    va_list va,
-    Py_ssize_t *p_nargs);
-#endif
-
-#ifndef Py_LIMITED_API
-typedef struct _PyArg_Parser {
-    const char *format;
-    const char * const *keywords;
-    const char *fname;
-    const char *custom_msg;
-    int pos;            /* number of positional-only arguments */
-    int min;            /* minimal number of arguments */
-    int max;            /* maximal number of positional arguments */
-    PyObject *kwtuple;  /* tuple of keyword parameter names */
-    struct _PyArg_Parser *next;
-} _PyArg_Parser;
-#ifdef PY_SSIZE_T_CLEAN
-#define _PyArg_ParseTupleAndKeywordsFast  _PyArg_ParseTupleAndKeywordsFast_SizeT
-#define _PyArg_ParseStack  _PyArg_ParseStack_SizeT
-#define _PyArg_ParseStackAndKeywords  _PyArg_ParseStackAndKeywords_SizeT
-#define _PyArg_VaParseTupleAndKeywordsFast  _PyArg_VaParseTupleAndKeywordsFast_SizeT
-#endif
-PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywordsFast(PyObject *, PyObject *,
-                                                 struct _PyArg_Parser *, ...);
-PyAPI_FUNC(int) _PyArg_ParseStack(
-    PyObject *const *args,
-    Py_ssize_t nargs,
-    const char *format,
-    ...);
-PyAPI_FUNC(int) _PyArg_ParseStackAndKeywords(
-    PyObject *const *args,
-    Py_ssize_t nargs,
-    PyObject *kwnames,
-    struct _PyArg_Parser *,
-    ...);
-PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywordsFast(PyObject *, PyObject *,
-                                                   struct _PyArg_Parser *, va_list);
-PyAPI_FUNC(PyObject * const *) _PyArg_UnpackKeywords(
-        PyObject *const *args, Py_ssize_t nargs,
-        PyObject *kwargs, PyObject *kwnames,
-        struct _PyArg_Parser *parser,
-        int minpos, int maxpos, int minkw,
-        PyObject **buf);
-#define _PyArg_UnpackKeywords(args, nargs, kwargs, kwnames, parser, minpos, maxpos, minkw, buf) \
-    (((minkw) == 0 && (kwargs) == NULL && (kwnames) == NULL && \
-      (minpos) <= (nargs) && (nargs) <= (maxpos) && args != NULL) ? (args) : \
-     _PyArg_UnpackKeywords((args), (nargs), (kwargs), (kwnames), (parser), \
-                           (minpos), (maxpos), (minkw), (buf)))
-
-void _PyArg_Fini(void);
-#endif   /* Py_LIMITED_API */
-
-PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *);
-PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
-PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
-/* New in 3.9 */
-PyAPI_FUNC(int) PyModule_AddType(PyObject *module, PyTypeObject *type);
-#endif /* Py_LIMITED_API */
-#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
-#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c)
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-PyAPI_FUNC(int) PyModule_SetDocString(PyObject *, const char *);
-PyAPI_FUNC(int) PyModule_AddFunctions(PyObject *, PyMethodDef *);
-PyAPI_FUNC(int) PyModule_ExecDef(PyObject *module, PyModuleDef *def);
-#endif
-
-#define Py_CLEANUP_SUPPORTED 0x20000
-
-#define PYTHON_API_VERSION 1013
-#define PYTHON_API_STRING "1013"
-/* The API version is maintained (independently from the Python version)
-   so we can detect mismatches between the interpreter and dynamically
-   loaded modules.  These are diagnosed by an error message but
-   the module is still loaded (because the mismatch can only be tested
-   after loading the module).  The error message is intended to
-   explain the core dump a few seconds later.
-
-   The symbol PYTHON_API_STRING defines the same value as a string
-   literal.  *** PLEASE MAKE SURE THE DEFINITIONS MATCH. ***
-
-   Please add a line or two to the top of this log for each API
-   version change:
-
-   22-Feb-2006  MvL     1013    PEP 353 - long indices for sequence lengths
-
-   19-Aug-2002  GvR     1012    Changes to string object struct for
-                                interning changes, saving 3 bytes.
-
-   17-Jul-2001  GvR     1011    Descr-branch, just to be on the safe side
-
-   25-Jan-2001  FLD     1010    Parameters added to PyCode_New() and
-                                PyFrame_New(); Python 2.1a2
-
-   14-Mar-2000  GvR     1009    Unicode API added
-
-   3-Jan-1999   GvR     1007    Decided to change back!  (Don't reuse 1008!)
-
-   3-Dec-1998   GvR     1008    Python 1.5.2b1
-
-   18-Jan-1997  GvR     1007    string interning and other speedups
-
-   11-Oct-1996  GvR     renamed Py_Ellipses to Py_Ellipsis :-(
-
-   30-Jul-1996  GvR     Slice and ellipses syntax added
-
-   23-Jul-1996  GvR     For 1.4 -- better safe than sorry this time :-)
-
-   7-Nov-1995   GvR     Keyword arguments (should've been done at 1.3 :-( )
-
-   10-Jan-1995  GvR     Renamed globals to new naming scheme
-
-   9-Jan-1995   GvR     Initial version (incompatible with older API)
-*/
-
-/* The PYTHON_ABI_VERSION is introduced in PEP 384. For the lifetime of
-   Python 3, it will stay at the value of 3; changes to the limited API
-   must be performed in a strictly backwards-compatible manner. */
-#define PYTHON_ABI_VERSION 3
-#define PYTHON_ABI_STRING "3"
-
-#ifdef Py_TRACE_REFS
- /* When we are tracing reference counts, rename module creation functions so
-    modules compiled with incompatible settings will generate a
-    link-time error. */
- #define PyModule_Create2 PyModule_Create2TraceRefs
- #define PyModule_FromDefAndSpec2 PyModule_FromDefAndSpec2TraceRefs
-#endif
-
-PyAPI_FUNC(PyObject *) PyModule_Create2(struct PyModuleDef*,
-                                     int apiver);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyModule_CreateInitialized(struct PyModuleDef*,
-                                                   int apiver);
-#endif
-
-#ifdef Py_LIMITED_API
-#define PyModule_Create(module) \
-        PyModule_Create2(module, PYTHON_ABI_VERSION)
-#else
-#define PyModule_Create(module) \
-        PyModule_Create2(module, PYTHON_API_VERSION)
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-PyAPI_FUNC(PyObject *) PyModule_FromDefAndSpec2(PyModuleDef *def,
-                                                PyObject *spec,
-                                                int module_api_version);
-
-#ifdef Py_LIMITED_API
-#define PyModule_FromDefAndSpec(module, spec) \
-    PyModule_FromDefAndSpec2(module, spec, PYTHON_ABI_VERSION)
-#else
-#define PyModule_FromDefAndSpec(module, spec) \
-    PyModule_FromDefAndSpec2(module, spec, PYTHON_API_VERSION)
-#endif /* Py_LIMITED_API */
-#endif /* New in 3.5 */
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(const char *) _Py_PackageContext;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MODSUPPORT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/moduleobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/moduleobject.h
deleted file mode 100644
index cf9ad40c0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/moduleobject.h
+++ /dev/null
@@ -1,90 +0,0 @@
-
-/* Module object interface */
-
-#ifndef Py_MODULEOBJECT_H
-#define Py_MODULEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyModule_Type;
-
-#define PyModule_Check(op) PyObject_TypeCheck(op, &PyModule_Type)
-#define PyModule_CheckExact(op) Py_IS_TYPE(op, &PyModule_Type)
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyModule_NewObject(
-    PyObject *name
-    );
-#endif
-PyAPI_FUNC(PyObject *) PyModule_New(
-    const char *name            /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(PyObject *) PyModule_GetDict(PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyModule_GetNameObject(PyObject *);
-#endif
-PyAPI_FUNC(const char *) PyModule_GetName(PyObject *);
-Py_DEPRECATED(3.2) PyAPI_FUNC(const char *) PyModule_GetFilename(PyObject *);
-PyAPI_FUNC(PyObject *) PyModule_GetFilenameObject(PyObject *);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyModule_Clear(PyObject *);
-PyAPI_FUNC(void) _PyModule_ClearDict(PyObject *);
-PyAPI_FUNC(int) _PyModuleSpec_IsInitializing(PyObject *);
-#endif
-PyAPI_FUNC(struct PyModuleDef*) PyModule_GetDef(PyObject*);
-PyAPI_FUNC(void*) PyModule_GetState(PyObject*);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-PyAPI_FUNC(PyObject *) PyModuleDef_Init(struct PyModuleDef*);
-PyAPI_DATA(PyTypeObject) PyModuleDef_Type;
-#endif
-
-typedef struct PyModuleDef_Base {
-  PyObject_HEAD
-  PyObject* (*m_init)(void);
-  Py_ssize_t m_index;
-  PyObject* m_copy;
-} PyModuleDef_Base;
-
-#define PyModuleDef_HEAD_INIT { \
-    PyObject_HEAD_INIT(NULL)    \
-    NULL, /* m_init */          \
-    0,    /* m_index */         \
-    NULL, /* m_copy */          \
-  }
-
-struct PyModuleDef_Slot;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-typedef struct PyModuleDef_Slot{
-    int slot;
-    void *value;
-} PyModuleDef_Slot;
-
-#define Py_mod_create 1
-#define Py_mod_exec 2
-
-#ifndef Py_LIMITED_API
-#define _Py_mod_LAST_SLOT 2
-#endif
-
-#endif /* New in 3.5 */
-
-typedef struct PyModuleDef{
-  PyModuleDef_Base m_base;
-  const char* m_name;
-  const char* m_doc;
-  Py_ssize_t m_size;
-  PyMethodDef *m_methods;
-  struct PyModuleDef_Slot* m_slots;
-  traverseproc m_traverse;
-  inquiry m_clear;
-  freefunc m_free;
-} PyModuleDef;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_MODULEOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/namespaceobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/namespaceobject.h
deleted file mode 100644
index 0c8d95c0f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/namespaceobject.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/* simple namespace object interface */
-
-#ifndef NAMESPACEOBJECT_H
-#define NAMESPACEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyTypeObject) _PyNamespace_Type;
-
-PyAPI_FUNC(PyObject *) _PyNamespace_New(PyObject *kwds);
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !NAMESPACEOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/node.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/node.h
deleted file mode 100644
index ca24f2890..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/node.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/* Parse tree node interface */
-
-#ifndef Py_NODE_H
-#define Py_NODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _node {
-    short               n_type;
-    char                *n_str;
-    int                 n_lineno;
-    int                 n_col_offset;
-    int                 n_nchildren;
-    struct _node        *n_child;
-    int                 n_end_lineno;
-    int                 n_end_col_offset;
-} node;
-
-PyAPI_FUNC(node *) PyNode_New(int type);
-PyAPI_FUNC(int) PyNode_AddChild(node *n, int type,
-                                char *str, int lineno, int col_offset,
-                                int end_lineno, int end_col_offset);
-PyAPI_FUNC(void) PyNode_Free(node *n);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
-#endif
-
-/* Node access functions */
-#define NCH(n)          ((n)->n_nchildren)
-
-#define CHILD(n, i)     (&(n)->n_child[i])
-#define TYPE(n)         ((n)->n_type)
-#define STR(n)          ((n)->n_str)
-#define LINENO(n)       ((n)->n_lineno)
-
-/* Assert that the type of a node is what we expect */
-#define REQ(n, type) assert(TYPE(n) == (type))
-
-PyAPI_FUNC(void) PyNode_ListTree(node *);
-void _PyNode_FinalizeEndPos(node *n);  // helper also used in parsetok.c
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_NODE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/object.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/object.h
deleted file mode 100644
index 9c1a7f479..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/object.h
+++ /dev/null
@@ -1,648 +0,0 @@
-#ifndef Py_OBJECT_H
-#define Py_OBJECT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Object and type object interface */
-
-/*
-Objects are structures allocated on the heap.  Special rules apply to
-the use of objects to ensure they are properly garbage-collected.
-Objects are never allocated statically or on the stack; they must be
-accessed through special macros and functions only.  (Type objects are
-exceptions to the first rule; the standard types are represented by
-statically initialized type objects, although work on type/class unification
-for Python 2.2 made it possible to have heap-allocated type objects too).
-
-An object has a 'reference count' that is increased or decreased when a
-pointer to the object is copied or deleted; when the reference count
-reaches zero there are no references to the object left and it can be
-removed from the heap.
-
-An object has a 'type' that determines what it represents and what kind
-of data it contains.  An object's type is fixed when it is created.
-Types themselves are represented as objects; an object contains a
-pointer to the corresponding type object.  The type itself has a type
-pointer pointing to the object representing the type 'type', which
-contains a pointer to itself!.
-
-Objects do not float around in memory; once allocated an object keeps
-the same size and address.  Objects that must hold variable-size data
-can contain pointers to variable-size parts of the object.  Not all
-objects of the same type have the same size; but the size cannot change
-after allocation.  (These restrictions are made so a reference to an
-object can be simply a pointer -- moving an object would require
-updating all the pointers, and changing an object's size would require
-moving it if there was another object right next to it.)
-
-Objects are always accessed through pointers of the type 'PyObject *'.
-The type 'PyObject' is a structure that only contains the reference count
-and the type pointer.  The actual memory allocated for an object
-contains other data that can only be accessed after casting the pointer
-to a pointer to a longer structure type.  This longer type must start
-with the reference count and type fields; the macro PyObject_HEAD should be
-used for this (to accommodate for future changes).  The implementation
-of a particular object type can cast the object pointer to the proper
-type and back.
-
-A standard interface exists for objects that contain an array of items
-whose size is determined when the object is allocated.
-*/
-
-/* Py_DEBUG implies Py_REF_DEBUG. */
-#if defined(Py_DEBUG) && !defined(Py_REF_DEBUG)
-#define Py_REF_DEBUG
-#endif
-
-#if defined(Py_LIMITED_API) && defined(Py_REF_DEBUG)
-#error Py_LIMITED_API is incompatible with Py_DEBUG, Py_TRACE_REFS, and Py_REF_DEBUG
-#endif
-
-/* PyTypeObject structure is defined in cpython/object.h.
-   In Py_LIMITED_API, PyTypeObject is an opaque structure. */
-typedef struct _typeobject PyTypeObject;
-
-#ifdef Py_TRACE_REFS
-/* Define pointers to support a doubly-linked list of all live heap objects. */
-#define _PyObject_HEAD_EXTRA            \
-    struct _object *_ob_next;           \
-    struct _object *_ob_prev;
-
-#define _PyObject_EXTRA_INIT 0, 0,
-
-#else
-#define _PyObject_HEAD_EXTRA
-#define _PyObject_EXTRA_INIT
-#endif
-
-/* PyObject_HEAD defines the initial segment of every PyObject. */
-#define PyObject_HEAD                   PyObject ob_base;
-
-#define PyObject_HEAD_INIT(type)        \
-    { _PyObject_EXTRA_INIT              \
-    1, type },
-
-#define PyVarObject_HEAD_INIT(type, size)       \
-    { PyObject_HEAD_INIT(type) size },
-
-/* PyObject_VAR_HEAD defines the initial segment of all variable-size
- * container objects.  These end with a declaration of an array with 1
- * element, but enough space is malloc'ed so that the array actually
- * has room for ob_size elements.  Note that ob_size is an element count,
- * not necessarily a byte count.
- */
-#define PyObject_VAR_HEAD      PyVarObject ob_base;
-#define Py_INVALID_SIZE (Py_ssize_t)-1
-
-/* Nothing is actually declared to be a PyObject, but every pointer to
- * a Python object can be cast to a PyObject*.  This is inheritance built
- * by hand.  Similarly every pointer to a variable-size Python object can,
- * in addition, be cast to PyVarObject*.
- */
-typedef struct _object {
-    _PyObject_HEAD_EXTRA
-    Py_ssize_t ob_refcnt;
-    PyTypeObject *ob_type;
-} PyObject;
-
-/* Cast argument to PyObject* type. */
-#define _PyObject_CAST(op) ((PyObject*)(op))
-#define _PyObject_CAST_CONST(op) ((const PyObject*)(op))
-
-typedef struct {
-    PyObject ob_base;
-    Py_ssize_t ob_size; /* Number of items in variable part */
-} PyVarObject;
-
-/* Cast argument to PyVarObject* type. */
-#define _PyVarObject_CAST(op) ((PyVarObject*)(op))
-
-#define Py_REFCNT(ob)           (_PyObject_CAST(ob)->ob_refcnt)
-#define Py_TYPE(ob)             (_PyObject_CAST(ob)->ob_type)
-#define Py_SIZE(ob)             (_PyVarObject_CAST(ob)->ob_size)
-
-static inline int _Py_IS_TYPE(const PyObject *ob, const PyTypeObject *type) {
-    return ob->ob_type == type;
-}
-#define Py_IS_TYPE(ob, type) _Py_IS_TYPE(_PyObject_CAST_CONST(ob), type)
-
-static inline void _Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt) {
-    ob->ob_refcnt = refcnt;
-}
-#define Py_SET_REFCNT(ob, refcnt) _Py_SET_REFCNT(_PyObject_CAST(ob), refcnt)
-
-static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type) {
-    ob->ob_type = type;
-}
-#define Py_SET_TYPE(ob, type) _Py_SET_TYPE(_PyObject_CAST(ob), type)
-
-static inline void _Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size) {
-    ob->ob_size = size;
-}
-#define Py_SET_SIZE(ob, size) _Py_SET_SIZE(_PyVarObject_CAST(ob), size)
-
-
-/*
-Type objects contain a string containing the type name (to help somewhat
-in debugging), the allocation parameters (see PyObject_New() and
-PyObject_NewVar()),
-and methods for accessing objects of the type.  Methods are optional, a
-nil pointer meaning that particular kind of access is not available for
-this type.  The Py_DECREF() macro uses the tp_dealloc method without
-checking for a nil pointer; it should always be implemented except if
-the implementation can guarantee that the reference count will never
-reach zero (e.g., for statically allocated type objects).
-
-NB: the methods for certain type groups are now contained in separate
-method blocks.
-*/
-
-typedef PyObject * (*unaryfunc)(PyObject *);
-typedef PyObject * (*binaryfunc)(PyObject *, PyObject *);
-typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *);
-typedef int (*inquiry)(PyObject *);
-typedef Py_ssize_t (*lenfunc)(PyObject *);
-typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t);
-typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
-typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *);
-typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *);
-typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *);
-
-typedef int (*objobjproc)(PyObject *, PyObject *);
-typedef int (*visitproc)(PyObject *, void *);
-typedef int (*traverseproc)(PyObject *, visitproc, void *);
-
-
-typedef void (*freefunc)(void *);
-typedef void (*destructor)(PyObject *);
-typedef PyObject *(*getattrfunc)(PyObject *, char *);
-typedef PyObject *(*getattrofunc)(PyObject *, PyObject *);
-typedef int (*setattrfunc)(PyObject *, char *, PyObject *);
-typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *);
-typedef PyObject *(*reprfunc)(PyObject *);
-typedef Py_hash_t (*hashfunc)(PyObject *);
-typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int);
-typedef PyObject *(*getiterfunc) (PyObject *);
-typedef PyObject *(*iternextfunc) (PyObject *);
-typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *);
-typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *);
-typedef int (*initproc)(PyObject *, PyObject *, PyObject *);
-typedef PyObject *(*newfunc)(PyTypeObject *, PyObject *, PyObject *);
-typedef PyObject *(*allocfunc)(PyTypeObject *, Py_ssize_t);
-
-typedef struct{
-    int slot;    /* slot id, see below */
-    void *pfunc; /* function pointer */
-} PyType_Slot;
-
-typedef struct{
-    const char* name;
-    int basicsize;
-    int itemsize;
-    unsigned int flags;
-    PyType_Slot *slots; /* terminated by slot==0. */
-} PyType_Spec;
-
-PyAPI_FUNC(PyObject*) PyType_FromSpec(PyType_Spec*);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyType_FromSpecWithBases(PyType_Spec*, PyObject*);
-#endif
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
-PyAPI_FUNC(void*) PyType_GetSlot(PyTypeObject*, int);
-#endif
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
-PyAPI_FUNC(PyObject*) PyType_FromModuleAndSpec(PyObject *, PyType_Spec *, PyObject *);
-PyAPI_FUNC(PyObject *) PyType_GetModule(struct _typeobject *);
-PyAPI_FUNC(void *) PyType_GetModuleState(struct _typeobject *);
-#endif
-
-/* Generic type check */
-PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *);
-#define PyObject_TypeCheck(ob, tp) \
-    (Py_IS_TYPE(ob, tp) || PyType_IsSubtype(Py_TYPE(ob), (tp)))
-
-PyAPI_DATA(PyTypeObject) PyType_Type; /* built-in 'type' */
-PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */
-PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */
-
-PyAPI_FUNC(unsigned long) PyType_GetFlags(PyTypeObject*);
-
-PyAPI_FUNC(int) PyType_Ready(PyTypeObject *);
-PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *,
-                                               PyObject *, PyObject *);
-PyAPI_FUNC(unsigned int) PyType_ClearCache(void);
-PyAPI_FUNC(void) PyType_Modified(PyTypeObject *);
-
-/* Generic operations on objects */
-PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_ASCII(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_Bytes(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
-PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int);
-PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *);
-PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *);
-PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *);
-PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *);
-PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *);
-PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *);
-PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *);
-PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *, PyObject *, PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(int) PyObject_GenericSetDict(PyObject *, PyObject *, void *);
-#endif
-PyAPI_FUNC(Py_hash_t) PyObject_Hash(PyObject *);
-PyAPI_FUNC(Py_hash_t) PyObject_HashNotImplemented(PyObject *);
-PyAPI_FUNC(int) PyObject_IsTrue(PyObject *);
-PyAPI_FUNC(int) PyObject_Not(PyObject *);
-PyAPI_FUNC(int) PyCallable_Check(PyObject *);
-PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *);
-
-/* PyObject_Dir(obj) acts like Python builtins.dir(obj), returning a
-   list of strings.  PyObject_Dir(NULL) is like builtins.dir(),
-   returning the names of the current locals.  In this case, if there are
-   no current locals, NULL is returned, and PyErr_Occurred() is false.
-*/
-PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *);
-
-
-/* Helpers for printing recursive container types */
-PyAPI_FUNC(int) Py_ReprEnter(PyObject *);
-PyAPI_FUNC(void) Py_ReprLeave(PyObject *);
-
-/* Flag bits for printing: */
-#define Py_PRINT_RAW    1       /* No string quotes etc. */
-
-/*
-Type flags (tp_flags)
-
-These flags are used to change expected features and behavior for a
-particular type.
-
-Arbitration of the flag bit positions will need to be coordinated among
-all extension writers who publicly release their extensions (this will
-be fewer than you might expect!).
-
-Most flags were removed as of Python 3.0 to make room for new flags.  (Some
-flags are not for backwards compatibility but to indicate the presence of an
-optional feature; these flags remain of course.)
-
-Type definitions should use Py_TPFLAGS_DEFAULT for their tp_flags value.
-
-Code can use PyType_HasFeature(type_ob, flag_value) to test whether the
-given type object has a specified feature.
-*/
-
-/* Set if the type object is dynamically allocated */
-#define Py_TPFLAGS_HEAPTYPE (1UL << 9)
-
-/* Set if the type allows subclassing */
-#define Py_TPFLAGS_BASETYPE (1UL << 10)
-
-/* Set if the type implements the vectorcall protocol (PEP 590) */
-#ifndef Py_LIMITED_API
-#define Py_TPFLAGS_HAVE_VECTORCALL (1UL << 11)
-// Backwards compatibility alias for API that was provisional in Python 3.8
-#define _Py_TPFLAGS_HAVE_VECTORCALL Py_TPFLAGS_HAVE_VECTORCALL
-#endif
-
-/* Set if the type is 'ready' -- fully initialized */
-#define Py_TPFLAGS_READY (1UL << 12)
-
-/* Set while the type is being 'readied', to prevent recursive ready calls */
-#define Py_TPFLAGS_READYING (1UL << 13)
-
-/* Objects support garbage collection (see objimpl.h) */
-#define Py_TPFLAGS_HAVE_GC (1UL << 14)
-
-/* These two bits are preserved for Stackless Python, next after this is 17 */
-#ifdef STACKLESS
-#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3UL << 15)
-#else
-#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0
-#endif
-
-/* Objects behave like an unbound method */
-#define Py_TPFLAGS_METHOD_DESCRIPTOR (1UL << 17)
-
-/* Objects support type attribute cache */
-#define Py_TPFLAGS_HAVE_VERSION_TAG   (1UL << 18)
-#define Py_TPFLAGS_VALID_VERSION_TAG  (1UL << 19)
-
-/* Type is abstract and cannot be instantiated */
-#define Py_TPFLAGS_IS_ABSTRACT (1UL << 20)
-
-/* These flags are used to determine if a type is a subclass. */
-#define Py_TPFLAGS_LONG_SUBCLASS        (1UL << 24)
-#define Py_TPFLAGS_LIST_SUBCLASS        (1UL << 25)
-#define Py_TPFLAGS_TUPLE_SUBCLASS       (1UL << 26)
-#define Py_TPFLAGS_BYTES_SUBCLASS       (1UL << 27)
-#define Py_TPFLAGS_UNICODE_SUBCLASS     (1UL << 28)
-#define Py_TPFLAGS_DICT_SUBCLASS        (1UL << 29)
-#define Py_TPFLAGS_BASE_EXC_SUBCLASS    (1UL << 30)
-#define Py_TPFLAGS_TYPE_SUBCLASS        (1UL << 31)
-
-#define Py_TPFLAGS_DEFAULT  ( \
-                 Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | \
-                 Py_TPFLAGS_HAVE_VERSION_TAG | \
-                0)
-
-/* NOTE: The following flags reuse lower bits (removed as part of the
- * Python 3.0 transition). */
-
-/* The following flag is kept for compatibility. Starting with 3.8,
- * binary compatibility of C extensions across feature releases of
- * Python is not supported anymore, except when using the stable ABI.
- */
-
-/* Type structure has tp_finalize member (3.4) */
-#define Py_TPFLAGS_HAVE_FINALIZE (1UL << 0)
-
-
-/*
-The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement
-reference counts.  Py_DECREF calls the object's deallocator function when
-the refcount falls to 0; for
-objects that don't contain references to other objects or heap memory
-this can be the standard function free().  Both macros can be used
-wherever a void expression is allowed.  The argument must not be a
-NULL pointer.  If it may be NULL, use Py_XINCREF/Py_XDECREF instead.
-The macro _Py_NewReference(op) initialize reference counts to 1, and
-in special builds (Py_REF_DEBUG, Py_TRACE_REFS) performs additional
-bookkeeping appropriate to the special build.
-
-We assume that the reference count field can never overflow; this can
-be proven when the size of the field is the same as the pointer size, so
-we ignore the possibility.  Provided a C int is at least 32 bits (which
-is implicitly assumed in many parts of this code), that's enough for
-about 2**31 references to an object.
-
-XXX The following became out of date in Python 2.2, but I'm not sure
-XXX what the full truth is now.  Certainly, heap-allocated type objects
-XXX can and should be deallocated.
-Type objects should never be deallocated; the type pointer in an object
-is not considered to be a reference to the type object, to save
-complications in the deallocation function.  (This is actually a
-decision that's up to the implementer of each new type so if you want,
-you can count such references to the type object.)
-*/
-
-#ifdef Py_REF_DEBUG
-PyAPI_DATA(Py_ssize_t) _Py_RefTotal;
-PyAPI_FUNC(void) _Py_NegativeRefcount(const char *filename, int lineno,
-                                      PyObject *op);
-#endif /* Py_REF_DEBUG */
-
-PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
-
-static inline void _Py_INCREF(PyObject *op)
-{
-#ifdef Py_REF_DEBUG
-    _Py_RefTotal++;
-#endif
-    op->ob_refcnt++;
-}
-
-#define Py_INCREF(op) _Py_INCREF(_PyObject_CAST(op))
-
-static inline void _Py_DECREF(
-#ifdef Py_REF_DEBUG
-    const char *filename, int lineno,
-#endif
-    PyObject *op)
-{
-#ifdef Py_REF_DEBUG
-    _Py_RefTotal--;
-#endif
-    if (--op->ob_refcnt != 0) {
-#ifdef Py_REF_DEBUG
-        if (op->ob_refcnt < 0) {
-            _Py_NegativeRefcount(filename, lineno, op);
-        }
-#endif
-    }
-    else {
-        _Py_Dealloc(op);
-    }
-}
-
-#ifdef Py_REF_DEBUG
-#  define Py_DECREF(op) _Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op))
-#else
-#  define Py_DECREF(op) _Py_DECREF(_PyObject_CAST(op))
-#endif
-
-
-/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
- * and tp_dealloc implementations.
- *
- * Note that "the obvious" code can be deadly:
- *
- *     Py_XDECREF(op);
- *     op = NULL;
- *
- * Typically, `op` is something like self->containee, and `self` is done
- * using its `containee` member.  In the code sequence above, suppose
- * `containee` is non-NULL with a refcount of 1.  Its refcount falls to
- * 0 on the first line, which can trigger an arbitrary amount of code,
- * possibly including finalizers (like __del__ methods or weakref callbacks)
- * coded in Python, which in turn can release the GIL and allow other threads
- * to run, etc.  Such code may even invoke methods of `self` again, or cause
- * cyclic gc to trigger, but-- oops! --self->containee still points to the
- * object being torn down, and it may be in an insane state while being torn
- * down.  This has in fact been a rich historic source of miserable (rare &
- * hard-to-diagnose) segfaulting (and other) bugs.
- *
- * The safe way is:
- *
- *      Py_CLEAR(op);
- *
- * That arranges to set `op` to NULL _before_ decref'ing, so that any code
- * triggered as a side-effect of `op` getting torn down no longer believes
- * `op` points to a valid object.
- *
- * There are cases where it's safe to use the naive code, but they're brittle.
- * For example, if `op` points to a Python integer, you know that destroying
- * one of those can't cause problems -- but in part that relies on that
- * Python integers aren't currently weakly referencable.  Best practice is
- * to use Py_CLEAR() even if you can't think of a reason for why you need to.
- */
-#define Py_CLEAR(op)                            \
-    do {                                        \
-        PyObject *_py_tmp = _PyObject_CAST(op); \
-        if (_py_tmp != NULL) {                  \
-            (op) = NULL;                        \
-            Py_DECREF(_py_tmp);                 \
-        }                                       \
-    } while (0)
-
-/* Function to use in case the object pointer can be NULL: */
-static inline void _Py_XINCREF(PyObject *op)
-{
-    if (op != NULL) {
-        Py_INCREF(op);
-    }
-}
-
-#define Py_XINCREF(op) _Py_XINCREF(_PyObject_CAST(op))
-
-static inline void _Py_XDECREF(PyObject *op)
-{
-    if (op != NULL) {
-        Py_DECREF(op);
-    }
-}
-
-#define Py_XDECREF(op) _Py_XDECREF(_PyObject_CAST(op))
-
-/*
-These are provided as conveniences to Python runtime embedders, so that
-they can have object code that is not dependent on Python compilation flags.
-*/
-PyAPI_FUNC(void) Py_IncRef(PyObject *);
-PyAPI_FUNC(void) Py_DecRef(PyObject *);
-
-/*
-_Py_NoneStruct is an object of undefined type which can be used in contexts
-where NULL (nil) is not suitable (since NULL often means 'error').
-
-Don't forget to apply Py_INCREF() when returning this value!!!
-*/
-PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */
-#define Py_None (&_Py_NoneStruct)
-
-/* Macro for returning Py_None from a function */
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-
-/*
-Py_NotImplemented is a singleton used to signal that an operation is
-not implemented for a given type combination.
-*/
-PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */
-#define Py_NotImplemented (&_Py_NotImplementedStruct)
-
-/* Macro for returning Py_NotImplemented from a function */
-#define Py_RETURN_NOTIMPLEMENTED \
-    return Py_INCREF(Py_NotImplemented), Py_NotImplemented
-
-/* Rich comparison opcodes */
-#define Py_LT 0
-#define Py_LE 1
-#define Py_EQ 2
-#define Py_NE 3
-#define Py_GT 4
-#define Py_GE 5
-
-/*
- * Macro for implementing rich comparisons
- *
- * Needs to be a macro because any C-comparable type can be used.
- */
-#define Py_RETURN_RICHCOMPARE(val1, val2, op)                               \
-    do {                                                                    \
-        switch (op) {                                                       \
-        case Py_EQ: if ((val1) == (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;  \
-        case Py_NE: if ((val1) != (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;  \
-        case Py_LT: if ((val1) < (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;   \
-        case Py_GT: if ((val1) > (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;   \
-        case Py_LE: if ((val1) <= (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;  \
-        case Py_GE: if ((val1) >= (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE;  \
-        default:                                                            \
-            Py_UNREACHABLE();                                               \
-        }                                                                   \
-    } while (0)
-
-
-/*
-More conventions
-================
-
-Argument Checking
------------------
-
-Functions that take objects as arguments normally don't check for nil
-arguments, but they do check the type of the argument, and return an
-error if the function doesn't apply to the type.
-
-Failure Modes
--------------
-
-Functions may fail for a variety of reasons, including running out of
-memory.  This is communicated to the caller in two ways: an error string
-is set (see errors.h), and the function result differs: functions that
-normally return a pointer return NULL for failure, functions returning
-an integer return -1 (which could be a legal return value too!), and
-other functions return 0 for success and -1 for failure.
-Callers should always check for errors before using the result.  If
-an error was set, the caller must either explicitly clear it, or pass
-the error on to its caller.
-
-Reference Counts
-----------------
-
-It takes a while to get used to the proper usage of reference counts.
-
-Functions that create an object set the reference count to 1; such new
-objects must be stored somewhere or destroyed again with Py_DECREF().
-Some functions that 'store' objects, such as PyTuple_SetItem() and
-PyList_SetItem(),
-don't increment the reference count of the object, since the most
-frequent use is to store a fresh object.  Functions that 'retrieve'
-objects, such as PyTuple_GetItem() and PyDict_GetItemString(), also
-don't increment
-the reference count, since most frequently the object is only looked at
-quickly.  Thus, to retrieve an object and store it again, the caller
-must call Py_INCREF() explicitly.
-
-NOTE: functions that 'consume' a reference count, like
-PyList_SetItem(), consume the reference even if the object wasn't
-successfully stored, to simplify error handling.
-
-It seems attractive to make other functions that take an object as
-argument consume a reference count; however, this may quickly get
-confusing (even the current practice is already confusing).  Consider
-it carefully, it may save lots of calls to Py_INCREF() and Py_DECREF() at
-times.
-*/
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_OBJECT_H
-#  include  "cpython/object.h"
-#  undef Py_CPYTHON_OBJECT_H
-#endif
-
-
-static inline int
-PyType_HasFeature(PyTypeObject *type, unsigned long feature)
-{
-    unsigned long flags;
-#ifdef Py_LIMITED_API
-    // PyTypeObject is opaque in the limited C API
-    flags = PyType_GetFlags(type);
-#else
-    flags = type->tp_flags;
-#endif
-    return ((flags & feature) != 0);
-}
-
-#define PyType_FastSubclass(type, flag) PyType_HasFeature(type, flag)
-
-static inline int _PyType_Check(PyObject *op) {
-    return PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS);
-}
-#define PyType_Check(op) _PyType_Check(_PyObject_CAST(op))
-
-static inline int _PyType_CheckExact(PyObject *op) {
-    return Py_IS_TYPE(op, &PyType_Type);
-}
-#define PyType_CheckExact(op) _PyType_CheckExact(_PyObject_CAST(op))
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/objimpl.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/objimpl.h
deleted file mode 100644
index 030d7eee2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/objimpl.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* The PyObject_ memory family:  high-level object memory interfaces.
-   See pymem.h for the low-level PyMem_ family.
-*/
-
-#ifndef Py_OBJIMPL_H
-#define Py_OBJIMPL_H
-
-#include "pymem.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* BEWARE:
-
-   Each interface exports both functions and macros.  Extension modules should
-   use the functions, to ensure binary compatibility across Python versions.
-   Because the Python implementation is free to change internal details, and
-   the macros may (or may not) expose details for speed, if you do use the
-   macros you must recompile your extensions with each Python release.
-
-   Never mix calls to PyObject_ memory functions with calls to the platform
-   malloc/realloc/ calloc/free, or with calls to PyMem_.
-*/
-
-/*
-Functions and macros for modules that implement new object types.
-
- - PyObject_New(type, typeobj) allocates memory for a new object of the given
-   type, and initializes part of it.  'type' must be the C structure type used
-   to represent the object, and 'typeobj' the address of the corresponding
-   type object.  Reference count and type pointer are filled in; the rest of
-   the bytes of the object are *undefined*!  The resulting expression type is
-   'type *'.  The size of the object is determined by the tp_basicsize field
-   of the type object.
-
- - PyObject_NewVar(type, typeobj, n) is similar but allocates a variable-size
-   object with room for n items.  In addition to the refcount and type pointer
-   fields, this also fills in the ob_size field.
-
- - PyObject_Del(op) releases the memory allocated for an object.  It does not
-   run a destructor -- it only frees the memory.  PyObject_Free is identical.
-
- - PyObject_Init(op, typeobj) and PyObject_InitVar(op, typeobj, n) don't
-   allocate memory.  Instead of a 'type' parameter, they take a pointer to a
-   new object (allocated by an arbitrary allocator), and initialize its object
-   header fields.
-
-Note that objects created with PyObject_{New, NewVar} are allocated using the
-specialized Python allocator (implemented in obmalloc.c), if WITH_PYMALLOC is
-enabled.  In addition, a special debugging allocator is used if PYMALLOC_DEBUG
-is also #defined.
-
-In case a specific form of memory management is needed (for example, if you
-must use the platform malloc heap(s), or shared memory, or C++ local storage or
-operator new), you must first allocate the object with your custom allocator,
-then pass its pointer to PyObject_{Init, InitVar} for filling in its Python-
-specific fields:  reference count, type pointer, possibly others.  You should
-be aware that Python has no control over these objects because they don't
-cooperate with the Python memory manager.  Such objects may not be eligible
-for automatic garbage collection and you have to make sure that they are
-released accordingly whenever their destructor gets called (cf. the specific
-form of memory management you're using).
-
-Unless you have specific memory management requirements, use
-PyObject_{New, NewVar, Del}.
-*/
-
-/*
- * Raw object memory interface
- * ===========================
- */
-
-/* Functions to call the same malloc/realloc/free as used by Python's
-   object allocator.  If WITH_PYMALLOC is enabled, these may differ from
-   the platform malloc/realloc/free.  The Python object allocator is
-   designed for fast, cache-conscious allocation of many "small" objects,
-   and with low hidden memory overhead.
-
-   PyObject_Malloc(0) returns a unique non-NULL pointer if possible.
-
-   PyObject_Realloc(NULL, n) acts like PyObject_Malloc(n).
-   PyObject_Realloc(p != NULL, 0) does not return  NULL, or free the memory
-   at p.
-
-   Returned pointers must be checked for NULL explicitly; no action is
-   performed on failure other than to return NULL (no warning it printed, no
-   exception is set, etc).
-
-   For allocating objects, use PyObject_{New, NewVar} instead whenever
-   possible.  The PyObject_{Malloc, Realloc, Free} family is exposed
-   so that you can exploit Python's small-block allocator for non-object
-   uses.  If you must use these routines to allocate object memory, make sure
-   the object gets initialized via PyObject_{Init, InitVar} after obtaining
-   the raw memory.
-*/
-PyAPI_FUNC(void *) PyObject_Malloc(size_t size);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_FUNC(void *) PyObject_Calloc(size_t nelem, size_t elsize);
-#endif
-PyAPI_FUNC(void *) PyObject_Realloc(void *ptr, size_t new_size);
-PyAPI_FUNC(void) PyObject_Free(void *ptr);
-
-
-/* Macros */
-#define PyObject_MALLOC         PyObject_Malloc
-#define PyObject_REALLOC        PyObject_Realloc
-#define PyObject_FREE           PyObject_Free
-#define PyObject_Del            PyObject_Free
-#define PyObject_DEL            PyObject_Free
-
-
-/*
- * Generic object allocator interface
- * ==================================
- */
-
-/* Functions */
-PyAPI_FUNC(PyObject *) PyObject_Init(PyObject *, PyTypeObject *);
-PyAPI_FUNC(PyVarObject *) PyObject_InitVar(PyVarObject *,
-                                                 PyTypeObject *, Py_ssize_t);
-PyAPI_FUNC(PyObject *) _PyObject_New(PyTypeObject *);
-PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t);
-
-#define PyObject_New(type, typeobj) ((type *)_PyObject_New(typeobj))
-
-// Alias to PyObject_New(). In Python 3.8, PyObject_NEW() called directly
-// PyObject_MALLOC() with _PyObject_SIZE().
-#define PyObject_NEW(type, typeobj) PyObject_New(type, typeobj)
-
-#define PyObject_NewVar(type, typeobj, n) \
-                ( (type *) _PyObject_NewVar((typeobj), (n)) )
-
-// Alias to PyObject_New(). In Python 3.8, PyObject_NEW() called directly
-// PyObject_MALLOC() with _PyObject_VAR_SIZE().
-#define PyObject_NEW_VAR(type, typeobj, n) PyObject_NewVar(type, typeobj, n)
-
-
-#ifdef Py_LIMITED_API
-/* Define PyObject_INIT() and PyObject_INIT_VAR() as aliases to PyObject_Init()
-   and PyObject_InitVar() in the limited C API for compatibility with the
-   CPython C API. */
-#  define PyObject_INIT(op, typeobj) \
-        PyObject_Init(_PyObject_CAST(op), (typeobj))
-#  define PyObject_INIT_VAR(op, typeobj, size) \
-        PyObject_InitVar(_PyVarObject_CAST(op), (typeobj), (size))
-#else
-/* PyObject_INIT() and PyObject_INIT_VAR() are defined in cpython/objimpl.h */
-#endif
-
-
-/*
- * Garbage Collection Support
- * ==========================
- */
-
-/* C equivalent of gc.collect() which ignores the state of gc.enabled. */
-PyAPI_FUNC(Py_ssize_t) PyGC_Collect(void);
-
-/* Test if a type has a GC head */
-#define PyType_IS_GC(t) PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC)
-
-PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t);
-#define PyObject_GC_Resize(type, op, n) \
-                ( (type *) _PyObject_GC_Resize(_PyVarObject_CAST(op), (n)) )
-
-
-
-PyAPI_FUNC(PyObject *) _PyObject_GC_New(PyTypeObject *);
-PyAPI_FUNC(PyVarObject *) _PyObject_GC_NewVar(PyTypeObject *, Py_ssize_t);
-
-/* Tell the GC to track this object.
- *
- * See also private _PyObject_GC_TRACK() macro. */
-PyAPI_FUNC(void) PyObject_GC_Track(void *);
-
-/* Tell the GC to stop tracking this object.
- *
- * See also private _PyObject_GC_UNTRACK() macro. */
-PyAPI_FUNC(void) PyObject_GC_UnTrack(void *);
-
-PyAPI_FUNC(void) PyObject_GC_Del(void *);
-
-#define PyObject_GC_New(type, typeobj) \
-                ( (type *) _PyObject_GC_New(typeobj) )
-#define PyObject_GC_NewVar(type, typeobj, n) \
-                ( (type *) _PyObject_GC_NewVar((typeobj), (n)) )
-
-PyAPI_FUNC(int) PyObject_GC_IsTracked(PyObject *);
-PyAPI_FUNC(int) PyObject_GC_IsFinalized(PyObject *);
-
-/* Utility macro to help write tp_traverse functions.
- * To use this macro, the tp_traverse function must name its arguments
- * "visit" and "arg".  This is intended to keep tp_traverse functions
- * looking as much alike as possible.
- */
-#define Py_VISIT(op)                                                    \
-    do {                                                                \
-        if (op) {                                                       \
-            int vret = visit(_PyObject_CAST(op), arg);                  \
-            if (vret)                                                   \
-                return vret;                                            \
-        }                                                               \
-    } while (0)
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_OBJIMPL_H
-#  include  "cpython/objimpl.h"
-#  undef Py_CPYTHON_OBJIMPL_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OBJIMPL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/odictobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/odictobject.h
deleted file mode 100644
index e07041301..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/odictobject.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef Py_ODICTOBJECT_H
-#define Py_ODICTOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* OrderedDict */
-/* This API is optional and mostly redundant. */
-
-#ifndef Py_LIMITED_API
-
-typedef struct _odictobject PyODictObject;
-
-PyAPI_DATA(PyTypeObject) PyODict_Type;
-PyAPI_DATA(PyTypeObject) PyODictIter_Type;
-PyAPI_DATA(PyTypeObject) PyODictKeys_Type;
-PyAPI_DATA(PyTypeObject) PyODictItems_Type;
-PyAPI_DATA(PyTypeObject) PyODictValues_Type;
-
-#define PyODict_Check(op) PyObject_TypeCheck(op, &PyODict_Type)
-#define PyODict_CheckExact(op) Py_IS_TYPE(op, &PyODict_Type)
-#define PyODict_SIZE(op) PyDict_GET_SIZE((op))
-
-PyAPI_FUNC(PyObject *) PyODict_New(void);
-PyAPI_FUNC(int) PyODict_SetItem(PyObject *od, PyObject *key, PyObject *item);
-PyAPI_FUNC(int) PyODict_DelItem(PyObject *od, PyObject *key);
-
-/* wrappers around PyDict* functions */
-#define PyODict_GetItem(od, key) PyDict_GetItem(_PyObject_CAST(od), key)
-#define PyODict_GetItemWithError(od, key) \
-    PyDict_GetItemWithError(_PyObject_CAST(od), key)
-#define PyODict_Contains(od, key) PyDict_Contains(_PyObject_CAST(od), key)
-#define PyODict_Size(od) PyDict_Size(_PyObject_CAST(od))
-#define PyODict_GetItemString(od, key) \
-    PyDict_GetItemString(_PyObject_CAST(od), key)
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ODICTOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/opcode.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/opcode.h
deleted file mode 100644
index 19944fac0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/opcode.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Auto-generated by Tools/scripts/generate_opcode_h.py from Lib/opcode.py */
-#ifndef Py_OPCODE_H
-#define Py_OPCODE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-    /* Instruction opcodes for compiled code */
-#define POP_TOP                   1
-#define ROT_TWO                   2
-#define ROT_THREE                 3
-#define DUP_TOP                   4
-#define DUP_TOP_TWO               5
-#define ROT_FOUR                  6
-#define NOP                       9
-#define UNARY_POSITIVE           10
-#define UNARY_NEGATIVE           11
-#define UNARY_NOT                12
-#define UNARY_INVERT             15
-#define BINARY_MATRIX_MULTIPLY   16
-#define INPLACE_MATRIX_MULTIPLY  17
-#define BINARY_POWER             19
-#define BINARY_MULTIPLY          20
-#define BINARY_MODULO            22
-#define BINARY_ADD               23
-#define BINARY_SUBTRACT          24
-#define BINARY_SUBSCR            25
-#define BINARY_FLOOR_DIVIDE      26
-#define BINARY_TRUE_DIVIDE       27
-#define INPLACE_FLOOR_DIVIDE     28
-#define INPLACE_TRUE_DIVIDE      29
-#define RERAISE                  48
-#define WITH_EXCEPT_START        49
-#define GET_AITER                50
-#define GET_ANEXT                51
-#define BEFORE_ASYNC_WITH        52
-#define END_ASYNC_FOR            54
-#define INPLACE_ADD              55
-#define INPLACE_SUBTRACT         56
-#define INPLACE_MULTIPLY         57
-#define INPLACE_MODULO           59
-#define STORE_SUBSCR             60
-#define DELETE_SUBSCR            61
-#define BINARY_LSHIFT            62
-#define BINARY_RSHIFT            63
-#define BINARY_AND               64
-#define BINARY_XOR               65
-#define BINARY_OR                66
-#define INPLACE_POWER            67
-#define GET_ITER                 68
-#define GET_YIELD_FROM_ITER      69
-#define PRINT_EXPR               70
-#define LOAD_BUILD_CLASS         71
-#define YIELD_FROM               72
-#define GET_AWAITABLE            73
-#define LOAD_ASSERTION_ERROR     74
-#define INPLACE_LSHIFT           75
-#define INPLACE_RSHIFT           76
-#define INPLACE_AND              77
-#define INPLACE_XOR              78
-#define INPLACE_OR               79
-#define LIST_TO_TUPLE            82
-#define RETURN_VALUE             83
-#define IMPORT_STAR              84
-#define SETUP_ANNOTATIONS        85
-#define YIELD_VALUE              86
-#define POP_BLOCK                87
-#define POP_EXCEPT               89
-#define HAVE_ARGUMENT            90
-#define STORE_NAME               90
-#define DELETE_NAME              91
-#define UNPACK_SEQUENCE          92
-#define FOR_ITER                 93
-#define UNPACK_EX                94
-#define STORE_ATTR               95
-#define DELETE_ATTR              96
-#define STORE_GLOBAL             97
-#define DELETE_GLOBAL            98
-#define LOAD_CONST              100
-#define LOAD_NAME               101
-#define BUILD_TUPLE             102
-#define BUILD_LIST              103
-#define BUILD_SET               104
-#define BUILD_MAP               105
-#define LOAD_ATTR               106
-#define COMPARE_OP              107
-#define IMPORT_NAME             108
-#define IMPORT_FROM             109
-#define JUMP_FORWARD            110
-#define JUMP_IF_FALSE_OR_POP    111
-#define JUMP_IF_TRUE_OR_POP     112
-#define JUMP_ABSOLUTE           113
-#define POP_JUMP_IF_FALSE       114
-#define POP_JUMP_IF_TRUE        115
-#define LOAD_GLOBAL             116
-#define IS_OP                   117
-#define CONTAINS_OP             118
-#define JUMP_IF_NOT_EXC_MATCH   121
-#define SETUP_FINALLY           122
-#define LOAD_FAST               124
-#define STORE_FAST              125
-#define DELETE_FAST             126
-#define RAISE_VARARGS           130
-#define CALL_FUNCTION           131
-#define MAKE_FUNCTION           132
-#define BUILD_SLICE             133
-#define LOAD_CLOSURE            135
-#define LOAD_DEREF              136
-#define STORE_DEREF             137
-#define DELETE_DEREF            138
-#define CALL_FUNCTION_KW        141
-#define CALL_FUNCTION_EX        142
-#define SETUP_WITH              143
-#define EXTENDED_ARG            144
-#define LIST_APPEND             145
-#define SET_ADD                 146
-#define MAP_ADD                 147
-#define LOAD_CLASSDEREF         148
-#define SETUP_ASYNC_WITH        154
-#define FORMAT_VALUE            155
-#define BUILD_CONST_KEY_MAP     156
-#define BUILD_STRING            157
-#define LOAD_METHOD             160
-#define CALL_METHOD             161
-#define LIST_EXTEND             162
-#define SET_UPDATE              163
-#define DICT_MERGE              164
-#define DICT_UPDATE             165
-
-/* EXCEPT_HANDLER is a special, implicit block type which is created when
-   entering an except handler. It is not an opcode but we define it here
-   as we want it to be available to both frameobject.c and ceval.c, while
-   remaining private.*/
-#define EXCEPT_HANDLER 257
-
-#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OPCODE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/osdefs.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/osdefs.h
deleted file mode 100644
index 3243944a1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/osdefs.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef Py_OSDEFS_H
-#define Py_OSDEFS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Operating system dependencies */
-
-#ifdef MS_WINDOWS
-#define SEP L'\\'
-#define ALTSEP L'/'
-#define MAXPATHLEN 256
-#define DELIM L';'
-#endif
-
-#ifdef __VXWORKS__
-#define DELIM L';'
-#endif
-
-/* Filename separator */
-#ifndef SEP
-#define SEP L'/'
-#endif
-
-/* Max pathname length */
-#ifdef __hpux
-#include <sys/param.h>
-#include <limits.h>
-#ifndef PATH_MAX
-#define PATH_MAX MAXPATHLEN
-#endif
-#endif
-
-#ifndef MAXPATHLEN
-#if defined(PATH_MAX) && PATH_MAX > 1024
-#define MAXPATHLEN PATH_MAX
-#else
-#define MAXPATHLEN 1024
-#endif
-#endif
-
-/* Search path entry delimiter */
-#ifndef DELIM
-#define DELIM L':'
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OSDEFS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/osmodule.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/osmodule.h
deleted file mode 100644
index 9095c2fdd..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/osmodule.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/* os module interface */
-
-#ifndef Py_OSMODULE_H
-#define Py_OSMODULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_FUNC(PyObject *) PyOS_FSPath(PyObject *path);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_OSMODULE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/parsetok.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/parsetok.h
deleted file mode 100644
index 935d733e9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/parsetok.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Parser-tokenizer link interface */
-
-#ifndef Py_LIMITED_API
-#ifndef Py_PARSETOK_H
-#define Py_PARSETOK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "grammar.h"      /* grammar */
-#include "node.h"         /* node */
-
-typedef struct {
-    int error;
-    PyObject *filename;
-    int lineno;
-    int offset;
-    char *text;                 /* UTF-8-encoded string */
-    int token;
-    int expected;
-} perrdetail;
-
-#if 0
-#define PyPARSE_YIELD_IS_KEYWORD        0x0001
-#endif
-
-#define PyPARSE_DONT_IMPLY_DEDENT       0x0002
-
-#if 0
-#define PyPARSE_WITH_IS_KEYWORD         0x0003
-#define PyPARSE_PRINT_IS_FUNCTION       0x0004
-#define PyPARSE_UNICODE_LITERALS        0x0008
-#endif
-
-#define PyPARSE_IGNORE_COOKIE 0x0010
-#define PyPARSE_BARRY_AS_BDFL 0x0020
-#define PyPARSE_TYPE_COMMENTS 0x0040
-#define PyPARSE_ASYNC_HACKS   0x0080
-
-PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int,
-                                              perrdetail *);
-PyAPI_FUNC(node *) PyParser_ParseFile (FILE *, const char *, grammar *, int,
-                                             const char *, const char *,
-                                             perrdetail *);
-
-PyAPI_FUNC(node *) PyParser_ParseStringFlags(const char *, grammar *, int,
-                                              perrdetail *, int);
-PyAPI_FUNC(node *) PyParser_ParseFileFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    const char *enc,
-    grammar *g,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    perrdetail *err_ret,
-    int flags);
-PyAPI_FUNC(node *) PyParser_ParseFileFlagsEx(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    const char *enc,
-    grammar *g,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    perrdetail *err_ret,
-    int *flags);
-PyAPI_FUNC(node *) PyParser_ParseFileObject(
-    FILE *fp,
-    PyObject *filename,
-    const char *enc,
-    grammar *g,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    perrdetail *err_ret,
-    int *flags);
-
-PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(
-    const char *s,
-    const char *filename,       /* decoded from the filesystem encoding */
-    grammar *g,
-    int start,
-    perrdetail *err_ret,
-    int flags);
-PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilenameEx(
-    const char *s,
-    const char *filename,       /* decoded from the filesystem encoding */
-    grammar *g,
-    int start,
-    perrdetail *err_ret,
-    int *flags);
-PyAPI_FUNC(node *) PyParser_ParseStringObject(
-    const char *s,
-    PyObject *filename,
-    grammar *g,
-    int start,
-    perrdetail *err_ret,
-    int *flags);
-
-/* Note that the following functions are defined in pythonrun.c,
-   not in parsetok.c */
-PyAPI_FUNC(void) PyParser_SetError(perrdetail *);
-PyAPI_FUNC(void) PyParser_ClearError(perrdetail *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PARSETOK_H */
-#endif /* !Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/patchlevel.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/patchlevel.h
deleted file mode 100644
index a23b2f15f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/patchlevel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/* Python version identification scheme.
-
-   When the major or minor version changes, the VERSION variable in
-   configure.ac must also be changed.
-
-   There is also (independent) API version information in modsupport.h.
-*/
-
-/* Values for PY_RELEASE_LEVEL */
-#define PY_RELEASE_LEVEL_ALPHA  0xA
-#define PY_RELEASE_LEVEL_BETA   0xB
-#define PY_RELEASE_LEVEL_GAMMA  0xC     /* For release candidates */
-#define PY_RELEASE_LEVEL_FINAL  0xF     /* Serial should be 0 here */
-                                        /* Higher for patch releases */
-
-/* Version parsed out into numeric values */
-/*--start constants--*/
-#define PY_MAJOR_VERSION        3
-#define PY_MINOR_VERSION        9
-#define PY_MICRO_VERSION        2
-#define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_FINAL
-#define PY_RELEASE_SERIAL       0
-
-/* Version as a string */
-#define PY_VERSION              "3.9.2"
-/*--end constants--*/
-
-/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
-   Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
-#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \
-                        (PY_MINOR_VERSION << 16) | \
-                        (PY_MICRO_VERSION <<  8) | \
-                        (PY_RELEASE_LEVEL <<  4) | \
-                        (PY_RELEASE_SERIAL << 0))
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/picklebufobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/picklebufobject.h
deleted file mode 100644
index 0df2561dc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/picklebufobject.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* PickleBuffer object. This is built-in for ease of use from third-party
- * C extensions.
- */
-
-#ifndef Py_PICKLEBUFOBJECT_H
-#define Py_PICKLEBUFOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-
-PyAPI_DATA(PyTypeObject) PyPickleBuffer_Type;
-
-#define PyPickleBuffer_Check(op) Py_IS_TYPE(op, &PyPickleBuffer_Type)
-
-/* Create a PickleBuffer redirecting to the given buffer-enabled object */
-PyAPI_FUNC(PyObject *) PyPickleBuffer_FromObject(PyObject *);
-/* Get the PickleBuffer's underlying view to the original object
- * (NULL if released)
- */
-PyAPI_FUNC(const Py_buffer *) PyPickleBuffer_GetBuffer(PyObject *);
-/* Release the PickleBuffer.  Returns 0 on success, -1 on error. */
-PyAPI_FUNC(int) PyPickleBuffer_Release(PyObject *);
-
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PICKLEBUFOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/py_curses.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/py_curses.h
deleted file mode 100644
index b70252d9d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/py_curses.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-#ifndef Py_CURSES_H
-#define Py_CURSES_H
-
-#ifdef __APPLE__
-/*
-** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards
-** against multiple definition of wchar_t.
-*/
-#ifdef _BSD_WCHAR_T_DEFINED_
-#define _WCHAR_T
-#endif
-#endif /* __APPLE__ */
-
-/* On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
-   against multiple definition of wchar_t and wint_t. */
-#if defined(__FreeBSD__) && defined(_XOPEN_SOURCE_EXTENDED)
-# ifndef __wchar_t
-#   define __wchar_t
-# endif
-# ifndef __wint_t
-#   define __wint_t
-# endif
-#endif
-
-#if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS)
-/* The following definition is necessary for ncurses 5.7; without it,
-   some of [n]curses.h set NCURSES_OPAQUE to 1, and then Python
-   can't get at the WINDOW flags field. */
-#define NCURSES_OPAQUE 0
-#endif
-
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#include <curses.h>
-#endif
-
-#ifdef HAVE_NCURSES_H
-/* configure was checking <curses.h>, but we will
-   use <ncurses.h>, which has some or all these features. */
-#if !defined(WINDOW_HAS_FLAGS) && !(NCURSES_OPAQUE+0)
-#define WINDOW_HAS_FLAGS 1
-#endif
-#if !defined(HAVE_CURSES_IS_PAD) && NCURSES_VERSION_PATCH+0 >= 20090906
-#define HAVE_CURSES_IS_PAD 1
-#endif
-#ifndef MVWDELCH_IS_EXPRESSION
-#define MVWDELCH_IS_EXPRESSION 1
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define PyCurses_API_pointers 4
-
-/* Type declarations */
-
-typedef struct {
-    PyObject_HEAD
-    WINDOW *win;
-    char *encoding;
-} PyCursesWindowObject;
-
-#define PyCursesWindow_Check(v) Py_IS_TYPE(v, &PyCursesWindow_Type)
-
-#define PyCurses_CAPSULE_NAME "_curses._C_API"
-
-
-#ifdef CURSES_MODULE
-/* This section is used when compiling _cursesmodule.c */
-
-#else
-/* This section is used in modules that use the _cursesmodule API */
-
-static void **PyCurses_API;
-
-#define PyCursesWindow_Type (*(PyTypeObject *) PyCurses_API[0])
-#define PyCursesSetupTermCalled  {if (! ((int (*)(void))PyCurses_API[1]) () ) return NULL;}
-#define PyCursesInitialised      {if (! ((int (*)(void))PyCurses_API[2]) () ) return NULL;}
-#define PyCursesInitialisedColor {if (! ((int (*)(void))PyCurses_API[3]) () ) return NULL;}
-
-#define import_curses() \
-    PyCurses_API = (void **)PyCapsule_Import(PyCurses_CAPSULE_NAME, 1);
-
-#endif
-
-/* general error messages */
-static const char catchall_ERR[]  = "curses function returned ERR";
-static const char catchall_NULL[] = "curses function returned NULL";
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !defined(Py_CURSES_H) */
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyarena.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyarena.h
deleted file mode 100644
index db3ad0188..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyarena.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* An arena-like memory interface for the compiler.
- */
-
-#ifndef Py_LIMITED_API
-#ifndef Py_PYARENA_H
-#define Py_PYARENA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  typedef struct _arena PyArena;
-
-  /* PyArena_New() and PyArena_Free() create a new arena and free it,
-     respectively.  Once an arena has been created, it can be used
-     to allocate memory via PyArena_Malloc().  Pointers to PyObject can
-     also be registered with the arena via PyArena_AddPyObject(), and the
-     arena will ensure that the PyObjects stay alive at least until
-     PyArena_Free() is called.  When an arena is freed, all the memory it
-     allocated is freed, the arena releases internal references to registered
-     PyObject*, and none of its pointers are valid.
-     XXX (tim) What does "none of its pointers are valid" mean?  Does it
-     XXX mean that pointers previously obtained via PyArena_Malloc() are
-     XXX no longer valid?  (That's clearly true, but not sure that's what
-     XXX the text is trying to say.)
-
-     PyArena_New() returns an arena pointer.  On error, it
-     returns a negative number and sets an exception.
-     XXX (tim):  Not true.  On error, PyArena_New() actually returns NULL,
-     XXX and looks like it may or may not set an exception (e.g., if the
-     XXX internal PyList_New(0) returns NULL, PyArena_New() passes that on
-     XXX and an exception is set; OTOH, if the internal
-     XXX block_new(DEFAULT_BLOCK_SIZE) returns NULL, that's passed on but
-     XXX an exception is not set in that case).
-  */
-  PyAPI_FUNC(PyArena *) PyArena_New(void);
-  PyAPI_FUNC(void) PyArena_Free(PyArena *);
-
-  /* Mostly like malloc(), return the address of a block of memory spanning
-   * `size` bytes, or return NULL (without setting an exception) if enough
-   * new memory can't be obtained.  Unlike malloc(0), PyArena_Malloc() with
-   * size=0 does not guarantee to return a unique pointer (the pointer
-   * returned may equal one or more other pointers obtained from
-   * PyArena_Malloc()).
-   * Note that pointers obtained via PyArena_Malloc() must never be passed to
-   * the system free() or realloc(), or to any of Python's similar memory-
-   * management functions.  PyArena_Malloc()-obtained pointers remain valid
-   * until PyArena_Free(ar) is called, at which point all pointers obtained
-   * from the arena `ar` become invalid simultaneously.
-   */
-  PyAPI_FUNC(void *) PyArena_Malloc(PyArena *, size_t size);
-
-  /* This routine isn't a proper arena allocation routine.  It takes
-   * a PyObject* and records it so that it can be DECREFed when the
-   * arena is freed.
-   */
-  PyAPI_FUNC(int) PyArena_AddPyObject(PyArena *, PyObject *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYARENA_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pycapsule.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pycapsule.h
deleted file mode 100644
index fb5d503fe..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pycapsule.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/* Capsule objects let you wrap a C "void *" pointer in a Python
-   object.  They're a way of passing data through the Python interpreter
-   without creating your own custom type.
-
-   Capsules are used for communication between extension modules.
-   They provide a way for an extension module to export a C interface
-   to other extension modules, so that extension modules can use the
-   Python import mechanism to link to one another.
-
-   For more information, please see "c-api/capsule.html" in the
-   documentation.
-*/
-
-#ifndef Py_CAPSULE_H
-#define Py_CAPSULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(PyTypeObject) PyCapsule_Type;
-
-typedef void (*PyCapsule_Destructor)(PyObject *);
-
-#define PyCapsule_CheckExact(op) Py_IS_TYPE(op, &PyCapsule_Type)
-
-
-PyAPI_FUNC(PyObject *) PyCapsule_New(
-    void *pointer,
-    const char *name,
-    PyCapsule_Destructor destructor);
-
-PyAPI_FUNC(void *) PyCapsule_GetPointer(PyObject *capsule, const char *name);
-
-PyAPI_FUNC(PyCapsule_Destructor) PyCapsule_GetDestructor(PyObject *capsule);
-
-PyAPI_FUNC(const char *) PyCapsule_GetName(PyObject *capsule);
-
-PyAPI_FUNC(void *) PyCapsule_GetContext(PyObject *capsule);
-
-PyAPI_FUNC(int) PyCapsule_IsValid(PyObject *capsule, const char *name);
-
-PyAPI_FUNC(int) PyCapsule_SetPointer(PyObject *capsule, void *pointer);
-
-PyAPI_FUNC(int) PyCapsule_SetDestructor(PyObject *capsule, PyCapsule_Destructor destructor);
-
-PyAPI_FUNC(int) PyCapsule_SetName(PyObject *capsule, const char *name);
-
-PyAPI_FUNC(int) PyCapsule_SetContext(PyObject *capsule, void *context);
-
-PyAPI_FUNC(void *) PyCapsule_Import(
-    const char *name,           /* UTF-8 encoded string */
-    int no_block);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_CAPSULE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyctype.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyctype.h
deleted file mode 100644
index 6bce63eeb..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyctype.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef PYCTYPE_H
-#define PYCTYPE_H
-
-#define PY_CTF_LOWER  0x01
-#define PY_CTF_UPPER  0x02
-#define PY_CTF_ALPHA  (PY_CTF_LOWER|PY_CTF_UPPER)
-#define PY_CTF_DIGIT  0x04
-#define PY_CTF_ALNUM  (PY_CTF_ALPHA|PY_CTF_DIGIT)
-#define PY_CTF_SPACE  0x08
-#define PY_CTF_XDIGIT 0x10
-
-PyAPI_DATA(const unsigned int) _Py_ctype_table[256];
-
-/* Unlike their C counterparts, the following macros are not meant to
- * handle an int with any of the values [EOF, 0-UCHAR_MAX]. The argument
- * must be a signed/unsigned char. */
-#define Py_ISLOWER(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_LOWER)
-#define Py_ISUPPER(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_UPPER)
-#define Py_ISALPHA(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALPHA)
-#define Py_ISDIGIT(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_DIGIT)
-#define Py_ISXDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_XDIGIT)
-#define Py_ISALNUM(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALNUM)
-#define Py_ISSPACE(c)  (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_SPACE)
-
-PyAPI_DATA(const unsigned char) _Py_ctype_tolower[256];
-PyAPI_DATA(const unsigned char) _Py_ctype_toupper[256];
-
-#define Py_TOLOWER(c) (_Py_ctype_tolower[Py_CHARMASK(c)])
-#define Py_TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)])
-
-#endif /* !PYCTYPE_H */
-#endif /* !Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pydebug.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pydebug.h
deleted file mode 100644
index 78bcb118b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pydebug.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_PYDEBUG_H
-#define Py_PYDEBUG_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_DATA(int) Py_DebugFlag;
-PyAPI_DATA(int) Py_VerboseFlag;
-PyAPI_DATA(int) Py_QuietFlag;
-PyAPI_DATA(int) Py_InteractiveFlag;
-PyAPI_DATA(int) Py_InspectFlag;
-PyAPI_DATA(int) Py_OptimizeFlag;
-PyAPI_DATA(int) Py_NoSiteFlag;
-PyAPI_DATA(int) Py_BytesWarningFlag;
-PyAPI_DATA(int) Py_FrozenFlag;
-PyAPI_DATA(int) Py_IgnoreEnvironmentFlag;
-PyAPI_DATA(int) Py_DontWriteBytecodeFlag;
-PyAPI_DATA(int) Py_NoUserSiteDirectory;
-PyAPI_DATA(int) Py_UnbufferedStdioFlag;
-PyAPI_DATA(int) Py_HashRandomizationFlag;
-PyAPI_DATA(int) Py_IsolatedFlag;
-
-#ifdef MS_WINDOWS
-PyAPI_DATA(int) Py_LegacyWindowsFSEncodingFlag;
-PyAPI_DATA(int) Py_LegacyWindowsStdioFlag;
-#endif
-
-/* this is a wrapper around getenv() that pays attention to
-   Py_IgnoreEnvironmentFlag.  It should be used for getting variables like
-   PYTHONPATH and PYTHONHOME from the environment */
-#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s))
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYDEBUG_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pydtrace.d b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pydtrace.d
deleted file mode 100644
index 5e6a626b0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pydtrace.d
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Python DTrace provider */
-
-provider python {
-    probe function__entry(const char *, const char *, int);
-    probe function__return(const char *, const char *, int);
-    probe instance__new__start(const char *, const char *);
-    probe instance__new__done(const char *, const char *);
-    probe instance__delete__start(const char *, const char *);
-    probe instance__delete__done(const char *, const char *);
-    probe line(const char *, const char *, int);
-    probe gc__start(int);
-    probe gc__done(long);
-    probe import__find__load__start(const char *);
-    probe import__find__load__done(const char *, int);
-    probe audit(const char *, void *);
-};
-
-#pragma D attributes Evolving/Evolving/Common provider python provider
-#pragma D attributes Evolving/Evolving/Common provider python module
-#pragma D attributes Evolving/Evolving/Common provider python function
-#pragma D attributes Evolving/Evolving/Common provider python name
-#pragma D attributes Evolving/Evolving/Common provider python args
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pydtrace.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pydtrace.h
deleted file mode 100644
index 75f8e7f70..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pydtrace.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Static DTrace probes interface */
-
-#ifndef Py_DTRACE_H
-#define Py_DTRACE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef WITH_DTRACE
-
-#include "pydtrace_probes.h"
-
-/* pydtrace_probes.h, on systems with DTrace, is auto-generated to include
-   `PyDTrace_{PROBE}` and `PyDTrace_{PROBE}_ENABLED()` macros for every probe
-   defined in pydtrace_provider.d.
-
-   Calling these functions must be guarded by a `PyDTrace_{PROBE}_ENABLED()`
-   check to minimize performance impact when probing is off. For example:
-
-       if (PyDTrace_FUNCTION_ENTRY_ENABLED())
-           PyDTrace_FUNCTION_ENTRY(f);
-*/
-
-#else
-
-/* Without DTrace, compile to nothing. */
-
-static inline void PyDTrace_LINE(const char *arg0, const char *arg1, int arg2) {}
-static inline void PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2)  {}
-static inline void PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2) {}
-static inline void PyDTrace_GC_START(int arg0) {}
-static inline void PyDTrace_GC_DONE(Py_ssize_t arg0) {}
-static inline void PyDTrace_INSTANCE_NEW_START(int arg0) {}
-static inline void PyDTrace_INSTANCE_NEW_DONE(int arg0) {}
-static inline void PyDTrace_INSTANCE_DELETE_START(int arg0) {}
-static inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0) {}
-static inline void PyDTrace_IMPORT_FIND_LOAD_START(const char *arg0) {}
-static inline void PyDTrace_IMPORT_FIND_LOAD_DONE(const char *arg0, int arg1) {}
-static inline void PyDTrace_AUDIT(const char *arg0, void *arg1) {}
-
-static inline int PyDTrace_LINE_ENABLED(void) { return 0; }
-static inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; }
-static inline int PyDTrace_FUNCTION_RETURN_ENABLED(void) { return 0; }
-static inline int PyDTrace_GC_START_ENABLED(void) { return 0; }
-static inline int PyDTrace_GC_DONE_ENABLED(void) { return 0; }
-static inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; }
-static inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; }
-static inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; }
-static inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; }
-static inline int PyDTrace_IMPORT_FIND_LOAD_START_ENABLED(void) { return 0; }
-static inline int PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED(void) { return 0; }
-static inline int PyDTrace_AUDIT_ENABLED(void) { return 0; }
-
-#endif /* !WITH_DTRACE */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_DTRACE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyerrors.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyerrors.h
deleted file mode 100644
index 979a26ba6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyerrors.h
+++ /dev/null
@@ -1,326 +0,0 @@
-#ifndef Py_ERRORS_H
-#define Py_ERRORS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdarg.h>               // va_list
-
-/* Error handling definitions */
-
-PyAPI_FUNC(void) PyErr_SetNone(PyObject *);
-PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *);
-PyAPI_FUNC(void) PyErr_SetString(
-    PyObject *exception,
-    const char *string   /* decoded from utf-8 */
-    );
-PyAPI_FUNC(PyObject *) PyErr_Occurred(void);
-PyAPI_FUNC(void) PyErr_Clear(void);
-PyAPI_FUNC(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **);
-PyAPI_FUNC(void) PyErr_Restore(PyObject *, PyObject *, PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(void) PyErr_GetExcInfo(PyObject **, PyObject **, PyObject **);
-PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject *, PyObject *, PyObject *);
-#endif
-
-/* Defined in Python/pylifecycle.c
-
-   The Py_FatalError() function is replaced with a macro which logs
-   automatically the name of the current function, unless the Py_LIMITED_API
-   macro is defined. */
-PyAPI_FUNC(void) _Py_NO_RETURN Py_FatalError(const char *message);
-
-#if defined(Py_DEBUG) || defined(Py_LIMITED_API)
-#define _PyErr_OCCURRED() PyErr_Occurred()
-#else
-#define _PyErr_OCCURRED() (PyThreadState_GET()->curexc_type)
-#endif
-
-/* Error testing and normalization */
-PyAPI_FUNC(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *);
-PyAPI_FUNC(int) PyErr_ExceptionMatches(PyObject *);
-PyAPI_FUNC(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**);
-
-/* Traceback manipulation (PEP 3134) */
-PyAPI_FUNC(int) PyException_SetTraceback(PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyException_GetTraceback(PyObject *);
-
-/* Cause manipulation (PEP 3134) */
-PyAPI_FUNC(PyObject *) PyException_GetCause(PyObject *);
-PyAPI_FUNC(void) PyException_SetCause(PyObject *, PyObject *);
-
-/* Context manipulation (PEP 3134) */
-PyAPI_FUNC(PyObject *) PyException_GetContext(PyObject *);
-PyAPI_FUNC(void) PyException_SetContext(PyObject *, PyObject *);
-
-/* */
-
-#define PyExceptionClass_Check(x)                                       \
-    (PyType_Check((x)) &&                                               \
-     PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS))
-
-#define PyExceptionInstance_Check(x)                    \
-    PyType_FastSubclass(Py_TYPE(x), Py_TPFLAGS_BASE_EXC_SUBCLASS)
-
-PyAPI_FUNC(const char *) PyExceptionClass_Name(PyObject *);
-
-#define PyExceptionInstance_Class(x) ((PyObject*)Py_TYPE(x))
-
-
-/* Predefined exceptions */
-
-PyAPI_DATA(PyObject *) PyExc_BaseException;
-PyAPI_DATA(PyObject *) PyExc_Exception;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_DATA(PyObject *) PyExc_StopAsyncIteration;
-#endif
-PyAPI_DATA(PyObject *) PyExc_StopIteration;
-PyAPI_DATA(PyObject *) PyExc_GeneratorExit;
-PyAPI_DATA(PyObject *) PyExc_ArithmeticError;
-PyAPI_DATA(PyObject *) PyExc_LookupError;
-
-PyAPI_DATA(PyObject *) PyExc_AssertionError;
-PyAPI_DATA(PyObject *) PyExc_AttributeError;
-PyAPI_DATA(PyObject *) PyExc_BufferError;
-PyAPI_DATA(PyObject *) PyExc_EOFError;
-PyAPI_DATA(PyObject *) PyExc_FloatingPointError;
-PyAPI_DATA(PyObject *) PyExc_OSError;
-PyAPI_DATA(PyObject *) PyExc_ImportError;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_DATA(PyObject *) PyExc_ModuleNotFoundError;
-#endif
-PyAPI_DATA(PyObject *) PyExc_IndexError;
-PyAPI_DATA(PyObject *) PyExc_KeyError;
-PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt;
-PyAPI_DATA(PyObject *) PyExc_MemoryError;
-PyAPI_DATA(PyObject *) PyExc_NameError;
-PyAPI_DATA(PyObject *) PyExc_OverflowError;
-PyAPI_DATA(PyObject *) PyExc_RuntimeError;
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_DATA(PyObject *) PyExc_RecursionError;
-#endif
-PyAPI_DATA(PyObject *) PyExc_NotImplementedError;
-PyAPI_DATA(PyObject *) PyExc_SyntaxError;
-PyAPI_DATA(PyObject *) PyExc_IndentationError;
-PyAPI_DATA(PyObject *) PyExc_TabError;
-PyAPI_DATA(PyObject *) PyExc_ReferenceError;
-PyAPI_DATA(PyObject *) PyExc_SystemError;
-PyAPI_DATA(PyObject *) PyExc_SystemExit;
-PyAPI_DATA(PyObject *) PyExc_TypeError;
-PyAPI_DATA(PyObject *) PyExc_UnboundLocalError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeEncodeError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeDecodeError;
-PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError;
-PyAPI_DATA(PyObject *) PyExc_ValueError;
-PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError;
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_DATA(PyObject *) PyExc_BlockingIOError;
-PyAPI_DATA(PyObject *) PyExc_BrokenPipeError;
-PyAPI_DATA(PyObject *) PyExc_ChildProcessError;
-PyAPI_DATA(PyObject *) PyExc_ConnectionError;
-PyAPI_DATA(PyObject *) PyExc_ConnectionAbortedError;
-PyAPI_DATA(PyObject *) PyExc_ConnectionRefusedError;
-PyAPI_DATA(PyObject *) PyExc_ConnectionResetError;
-PyAPI_DATA(PyObject *) PyExc_FileExistsError;
-PyAPI_DATA(PyObject *) PyExc_FileNotFoundError;
-PyAPI_DATA(PyObject *) PyExc_InterruptedError;
-PyAPI_DATA(PyObject *) PyExc_IsADirectoryError;
-PyAPI_DATA(PyObject *) PyExc_NotADirectoryError;
-PyAPI_DATA(PyObject *) PyExc_PermissionError;
-PyAPI_DATA(PyObject *) PyExc_ProcessLookupError;
-PyAPI_DATA(PyObject *) PyExc_TimeoutError;
-#endif
-
-
-/* Compatibility aliases */
-PyAPI_DATA(PyObject *) PyExc_EnvironmentError;
-PyAPI_DATA(PyObject *) PyExc_IOError;
-#ifdef MS_WINDOWS
-PyAPI_DATA(PyObject *) PyExc_WindowsError;
-#endif
-
-/* Predefined warning categories */
-PyAPI_DATA(PyObject *) PyExc_Warning;
-PyAPI_DATA(PyObject *) PyExc_UserWarning;
-PyAPI_DATA(PyObject *) PyExc_DeprecationWarning;
-PyAPI_DATA(PyObject *) PyExc_PendingDeprecationWarning;
-PyAPI_DATA(PyObject *) PyExc_SyntaxWarning;
-PyAPI_DATA(PyObject *) PyExc_RuntimeWarning;
-PyAPI_DATA(PyObject *) PyExc_FutureWarning;
-PyAPI_DATA(PyObject *) PyExc_ImportWarning;
-PyAPI_DATA(PyObject *) PyExc_UnicodeWarning;
-PyAPI_DATA(PyObject *) PyExc_BytesWarning;
-PyAPI_DATA(PyObject *) PyExc_ResourceWarning;
-
-
-/* Convenience functions */
-
-PyAPI_FUNC(int) PyErr_BadArgument(void);
-PyAPI_FUNC(PyObject *) PyErr_NoMemory(void);
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject(
-    PyObject *, PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObjects(
-    PyObject *, PyObject *, PyObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(
-    PyObject *exc,
-    const char *filename   /* decoded from the filesystem encoding */
-    );
-
-PyAPI_FUNC(PyObject *) PyErr_Format(
-    PyObject *exception,
-    const char *format,   /* ASCII-encoded string  */
-    ...
-    );
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-PyAPI_FUNC(PyObject *) PyErr_FormatV(
-    PyObject *exception,
-    const char *format,
-    va_list vargs);
-#endif
-
-#ifdef MS_WINDOWS
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename(
-    int ierr,
-    const char *filename        /* decoded from the filesystem encoding */
-    );
-PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int);
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject(
-    PyObject *,int, PyObject *);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObjects(
-    PyObject *,int, PyObject *, PyObject *);
-#endif
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename(
-    PyObject *exc,
-    int ierr,
-    const char *filename        /* decoded from the filesystem encoding */
-    );
-PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
-#endif /* MS_WINDOWS */
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_FUNC(PyObject *) PyErr_SetImportErrorSubclass(PyObject *, PyObject *,
-    PyObject *, PyObject *);
-#endif
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject *) PyErr_SetImportError(PyObject *, PyObject *,
-    PyObject *);
-#endif
-
-/* Export the old function so that the existing API remains available: */
-PyAPI_FUNC(void) PyErr_BadInternalCall(void);
-PyAPI_FUNC(void) _PyErr_BadInternalCall(const char *filename, int lineno);
-/* Mask the old API with a call to the new API for code compiled under
-   Python 2.0: */
-#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__)
-
-/* Function to create a new exception */
-PyAPI_FUNC(PyObject *) PyErr_NewException(
-    const char *name, PyObject *base, PyObject *dict);
-PyAPI_FUNC(PyObject *) PyErr_NewExceptionWithDoc(
-    const char *name, const char *doc, PyObject *base, PyObject *dict);
-PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *);
-
-
-/* In signalmodule.c */
-PyAPI_FUNC(int) PyErr_CheckSignals(void);
-PyAPI_FUNC(void) PyErr_SetInterrupt(void);
-
-/* Support for adding program text to SyntaxErrors */
-PyAPI_FUNC(void) PyErr_SyntaxLocation(
-    const char *filename,       /* decoded from the filesystem encoding */
-    int lineno);
-PyAPI_FUNC(void) PyErr_SyntaxLocationEx(
-    const char *filename,       /* decoded from the filesystem encoding */
-    int lineno,
-    int col_offset);
-PyAPI_FUNC(PyObject *) PyErr_ProgramText(
-    const char *filename,       /* decoded from the filesystem encoding */
-    int lineno);
-
-/* The following functions are used to create and modify unicode
-   exceptions from C */
-
-/* create a UnicodeDecodeError object */
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create(
-    const char *encoding,       /* UTF-8 encoded string */
-    const char *object,
-    Py_ssize_t length,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    const char *reason          /* UTF-8 encoded string */
-    );
-
-/* get the encoding attribute */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetEncoding(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetEncoding(PyObject *);
-
-/* get the object attribute */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetObject(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetObject(PyObject *);
-
-/* get the value of the start attribute (the int * may not be NULL)
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_GetStart(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeDecodeError_GetStart(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeTranslateError_GetStart(PyObject *, Py_ssize_t *);
-
-/* assign a new value to the start attribute
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_SetStart(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeDecodeError_SetStart(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeTranslateError_SetStart(PyObject *, Py_ssize_t);
-
-/* get the value of the end attribute (the int *may not be NULL)
- return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_GetEnd(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeDecodeError_GetEnd(PyObject *, Py_ssize_t *);
-PyAPI_FUNC(int) PyUnicodeTranslateError_GetEnd(PyObject *, Py_ssize_t *);
-
-/* assign a new value to the end attribute
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_SetEnd(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeDecodeError_SetEnd(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyUnicodeTranslateError_SetEnd(PyObject *, Py_ssize_t);
-
-/* get the value of the reason attribute */
-PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetReason(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetReason(PyObject *);
-PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetReason(PyObject *);
-
-/* assign a new value to the reason attribute
-   return 0 on success, -1 on failure */
-PyAPI_FUNC(int) PyUnicodeEncodeError_SetReason(
-    PyObject *exc,
-    const char *reason          /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason(
-    PyObject *exc,
-    const char *reason          /* UTF-8 encoded string */
-    );
-PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason(
-    PyObject *exc,
-    const char *reason          /* UTF-8 encoded string */
-    );
-
-PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char  *format, ...)
-                        Py_GCC_ATTRIBUTE((format(printf, 3, 4)));
-PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char  *format, va_list va)
-                        Py_GCC_ATTRIBUTE((format(printf, 3, 0)));
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_ERRORS_H
-#  include  "cpython/pyerrors.h"
-#  undef Py_CPYTHON_ERRORS_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_ERRORS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyexpat.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyexpat.h
deleted file mode 100644
index 07020b5dc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyexpat.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Stuff to export relevant 'expat' entry points from pyexpat to other
- * parser modules, such as cElementTree. */
-
-/* note: you must import expat.h before importing this module! */
-
-#define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.1"
-#define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI"
-
-struct PyExpat_CAPI
-{
-    char* magic; /* set to PyExpat_CAPI_MAGIC */
-    int size; /* set to sizeof(struct PyExpat_CAPI) */
-    int MAJOR_VERSION;
-    int MINOR_VERSION;
-    int MICRO_VERSION;
-    /* pointers to selected expat functions.  add new functions at
-       the end, if needed */
-    const XML_LChar * (*ErrorString)(enum XML_Error code);
-    enum XML_Error (*GetErrorCode)(XML_Parser parser);
-    XML_Size (*GetErrorColumnNumber)(XML_Parser parser);
-    XML_Size (*GetErrorLineNumber)(XML_Parser parser);
-    enum XML_Status (*Parse)(
-        XML_Parser parser, const char *s, int len, int isFinal);
-    XML_Parser (*ParserCreate_MM)(
-        const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite,
-        const XML_Char *namespaceSeparator);
-    void (*ParserFree)(XML_Parser parser);
-    void (*SetCharacterDataHandler)(
-        XML_Parser parser, XML_CharacterDataHandler handler);
-    void (*SetCommentHandler)(
-        XML_Parser parser, XML_CommentHandler handler);
-    void (*SetDefaultHandlerExpand)(
-        XML_Parser parser, XML_DefaultHandler handler);
-    void (*SetElementHandler)(
-        XML_Parser parser, XML_StartElementHandler start,
-        XML_EndElementHandler end);
-    void (*SetNamespaceDeclHandler)(
-        XML_Parser parser, XML_StartNamespaceDeclHandler start,
-        XML_EndNamespaceDeclHandler end);
-    void (*SetProcessingInstructionHandler)(
-        XML_Parser parser, XML_ProcessingInstructionHandler handler);
-    void (*SetUnknownEncodingHandler)(
-        XML_Parser parser, XML_UnknownEncodingHandler handler,
-        void *encodingHandlerData);
-    void (*SetUserData)(XML_Parser parser, void *userData);
-    void (*SetStartDoctypeDeclHandler)(XML_Parser parser,
-                                       XML_StartDoctypeDeclHandler start);
-    enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding);
-    int (*DefaultUnknownEncodingHandler)(
-        void *encodingHandlerData, const XML_Char *name, XML_Encoding *info);
-    /* might be none for expat < 2.1.0 */
-    int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt);
-    /* always add new stuff to the end! */
-};
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyfpe.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyfpe.h
deleted file mode 100644
index cc2def63a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyfpe.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef Py_PYFPE_H
-#define Py_PYFPE_H
-/* Header excluded from the stable API */
-#ifndef Py_LIMITED_API
-
-/* These macros used to do something when Python was built with --with-fpectl,
- * but support for that was dropped in 3.7. We continue to define them though,
- * to avoid breaking API users.
- */
-
-#define PyFPE_START_PROTECT(err_string, leave_stmt)
-#define PyFPE_END_PROTECT(v)
-
-#endif /* !defined(Py_LIMITED_API) */
-#endif /* !Py_PYFPE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyframe.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyframe.h
deleted file mode 100644
index 381622420..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyframe.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Limited C API of PyFrame API
- *
- * Include "frameobject.h" to get the PyFrameObject structure.
- */
-
-#ifndef Py_PYFRAME_H
-#define Py_PYFRAME_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _frame PyFrameObject;
-
-/* Return the line of code the frame is currently executing. */
-PyAPI_FUNC(int) PyFrame_GetLineNumber(PyFrameObject *);
-
-PyAPI_FUNC(PyCodeObject *) PyFrame_GetCode(PyFrameObject *frame);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYFRAME_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyhash.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyhash.h
deleted file mode 100644
index 4437b8703..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyhash.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#ifndef Py_HASH_H
-
-#define Py_HASH_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Helpers for hash functions */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_hash_t) _Py_HashDouble(double);
-PyAPI_FUNC(Py_hash_t) _Py_HashPointer(const void*);
-// Similar to _Py_HashPointer(), but don't replace -1 with -2
-PyAPI_FUNC(Py_hash_t) _Py_HashPointerRaw(const void*);
-PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void*, Py_ssize_t);
-#endif
-
-/* Prime multiplier used in string and various other hashes. */
-#define _PyHASH_MULTIPLIER 1000003UL  /* 0xf4243 */
-
-/* Parameters used for the numeric hash implementation.  See notes for
-   _Py_HashDouble in Python/pyhash.c.  Numeric hashes are based on
-   reduction modulo the prime 2**_PyHASH_BITS - 1. */
-
-#if SIZEOF_VOID_P >= 8
-#  define _PyHASH_BITS 61
-#else
-#  define _PyHASH_BITS 31
-#endif
-
-#define _PyHASH_MODULUS (((size_t)1 << _PyHASH_BITS) - 1)
-#define _PyHASH_INF 314159
-#define _PyHASH_NAN 0
-#define _PyHASH_IMAG _PyHASH_MULTIPLIER
-
-
-/* hash secret
- *
- * memory layout on 64 bit systems
- *   cccccccc cccccccc cccccccc  uc -- unsigned char[24]
- *   pppppppp ssssssss ........  fnv -- two Py_hash_t
- *   k0k0k0k0 k1k1k1k1 ........  siphash -- two uint64_t
- *   ........ ........ ssssssss  djbx33a -- 16 bytes padding + one Py_hash_t
- *   ........ ........ eeeeeeee  pyexpat XML hash salt
- *
- * memory layout on 32 bit systems
- *   cccccccc cccccccc cccccccc  uc
- *   ppppssss ........ ........  fnv -- two Py_hash_t
- *   k0k0k0k0 k1k1k1k1 ........  siphash -- two uint64_t (*)
- *   ........ ........ ssss....  djbx33a -- 16 bytes padding + one Py_hash_t
- *   ........ ........ eeee....  pyexpat XML hash salt
- *
- * (*) The siphash member may not be available on 32 bit platforms without
- *     an unsigned int64 data type.
- */
-#ifndef Py_LIMITED_API
-typedef union {
-    /* ensure 24 bytes */
-    unsigned char uc[24];
-    /* two Py_hash_t for FNV */
-    struct {
-        Py_hash_t prefix;
-        Py_hash_t suffix;
-    } fnv;
-    /* two uint64 for SipHash24 */
-    struct {
-        uint64_t k0;
-        uint64_t k1;
-    } siphash;
-    /* a different (!) Py_hash_t for small string optimization */
-    struct {
-        unsigned char padding[16];
-        Py_hash_t suffix;
-    } djbx33a;
-    struct {
-        unsigned char padding[16];
-        Py_hash_t hashsalt;
-    } expat;
-} _Py_HashSecret_t;
-PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret;
-#endif
-
-#ifdef Py_DEBUG
-PyAPI_DATA(int) _Py_HashSecret_Initialized;
-#endif
-
-
-/* hash function definition */
-#ifndef Py_LIMITED_API
-typedef struct {
-    Py_hash_t (*const hash)(const void *, Py_ssize_t);
-    const char *name;
-    const int hash_bits;
-    const int seed_bits;
-} PyHash_FuncDef;
-
-PyAPI_FUNC(PyHash_FuncDef*) PyHash_GetFuncDef(void);
-#endif
-
-
-/* cutoff for small string DJBX33A optimization in range [1, cutoff).
- *
- * About 50% of the strings in a typical Python application are smaller than
- * 6 to 7 chars. However DJBX33A is vulnerable to hash collision attacks.
- * NEVER use DJBX33A for long strings!
- *
- * A Py_HASH_CUTOFF of 0 disables small string optimization. 32 bit platforms
- * should use a smaller cutoff because it is easier to create colliding
- * strings. A cutoff of 7 on 64bit platforms and 5 on 32bit platforms should
- * provide a decent safety margin.
- */
-#ifndef Py_HASH_CUTOFF
-#  define Py_HASH_CUTOFF 0
-#elif (Py_HASH_CUTOFF > 7 || Py_HASH_CUTOFF < 0)
-#  error Py_HASH_CUTOFF must in range 0...7.
-#endif /* Py_HASH_CUTOFF */
-
-
-/* hash algorithm selection
- *
- * The values for Py_HASH_SIPHASH24 and Py_HASH_FNV are hard-coded in the
- * configure script.
- *
- * - FNV is available on all platforms and architectures.
- * - SIPHASH24 only works on platforms that don't require aligned memory for integers.
- * - With EXTERNAL embedders can provide an alternative implementation with::
- *
- *     PyHash_FuncDef PyHash_Func = {...};
- *
- * XXX: Figure out __declspec() for extern PyHash_FuncDef.
- */
-#define Py_HASH_EXTERNAL 0
-#define Py_HASH_SIPHASH24 1
-#define Py_HASH_FNV 2
-
-#ifndef Py_HASH_ALGORITHM
-#  ifndef HAVE_ALIGNED_REQUIRED
-#    define Py_HASH_ALGORITHM Py_HASH_SIPHASH24
-#  else
-#    define Py_HASH_ALGORITHM Py_HASH_FNV
-#  endif /* uint64_t && uint32_t && aligned */
-#endif /* Py_HASH_ALGORITHM */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_HASH_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pylifecycle.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pylifecycle.h
deleted file mode 100644
index 783fcb455..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pylifecycle.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-/* Interfaces to configure, query, create & destroy the Python runtime */
-
-#ifndef Py_PYLIFECYCLE_H
-#define Py_PYLIFECYCLE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Initialization and finalization */
-PyAPI_FUNC(void) Py_Initialize(void);
-PyAPI_FUNC(void) Py_InitializeEx(int);
-PyAPI_FUNC(void) Py_Finalize(void);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_FUNC(int) Py_FinalizeEx(void);
-#endif
-PyAPI_FUNC(int) Py_IsInitialized(void);
-
-/* Subinterpreter support */
-PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void);
-PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *);
-
-
-/* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level
- * exit functions.
- */
-PyAPI_FUNC(int) Py_AtExit(void (*func)(void));
-
-PyAPI_FUNC(void) _Py_NO_RETURN Py_Exit(int);
-
-/* Bootstrap __main__ (defined in Modules/main.c) */
-PyAPI_FUNC(int) Py_Main(int argc, wchar_t **argv);
-
-PyAPI_FUNC(int) Py_FrozenMain(int argc, char **argv);
-
-PyAPI_FUNC(int) Py_BytesMain(int argc, char **argv);
-
-/* In pathconfig.c */
-PyAPI_FUNC(void) Py_SetProgramName(const wchar_t *);
-PyAPI_FUNC(wchar_t *) Py_GetProgramName(void);
-
-PyAPI_FUNC(void) Py_SetPythonHome(const wchar_t *);
-PyAPI_FUNC(wchar_t *) Py_GetPythonHome(void);
-
-PyAPI_FUNC(wchar_t *) Py_GetProgramFullPath(void);
-
-PyAPI_FUNC(wchar_t *) Py_GetPrefix(void);
-PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void);
-PyAPI_FUNC(wchar_t *) Py_GetPath(void);
-PyAPI_FUNC(void)      Py_SetPath(const wchar_t *);
-#ifdef MS_WINDOWS
-int _Py_CheckPython3(void);
-#endif
-
-/* In their own files */
-PyAPI_FUNC(const char *) Py_GetVersion(void);
-PyAPI_FUNC(const char *) Py_GetPlatform(void);
-PyAPI_FUNC(const char *) Py_GetCopyright(void);
-PyAPI_FUNC(const char *) Py_GetCompiler(void);
-PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-
-/* Signals */
-typedef void (*PyOS_sighandler_t)(int);
-PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int);
-PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t);
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_PYLIFECYCLE_H
-#  include  "cpython/pylifecycle.h"
-#  undef Py_CPYTHON_PYLIFECYCLE_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYLIFECYCLE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymacconfig.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymacconfig.h
deleted file mode 100644
index 9dde11bd5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymacconfig.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef PYMACCONFIG_H
-#define PYMACCONFIG_H
-     /*
-      * This file moves some of the autoconf magic to compile-time
-      * when building on MacOSX. This is needed for building 4-way
-      * universal binaries and for 64-bit universal binaries because
-      * the values redefined below aren't configure-time constant but
-      * only compile-time constant in these scenarios.
-      */
-
-#if defined(__APPLE__)
-
-# undef SIZEOF_LONG
-# undef SIZEOF_PTHREAD_T
-# undef SIZEOF_SIZE_T
-# undef SIZEOF_TIME_T
-# undef SIZEOF_VOID_P
-# undef SIZEOF__BOOL
-# undef SIZEOF_UINTPTR_T
-# undef SIZEOF_PTHREAD_T
-# undef WORDS_BIGENDIAN
-# undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
-# undef DOUBLE_IS_BIG_ENDIAN_IEEE754
-# undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754
-# undef HAVE_GCC_ASM_FOR_X87
-
-#    undef VA_LIST_IS_ARRAY
-#    if defined(__LP64__) && defined(__x86_64__)
-#        define VA_LIST_IS_ARRAY 1
-#    endif
-
-#    undef HAVE_LARGEFILE_SUPPORT
-#    ifndef __LP64__
-#         define HAVE_LARGEFILE_SUPPORT 1
-#    endif
-
-#    undef SIZEOF_LONG
-#    ifdef __LP64__
-#        define SIZEOF__BOOL            1
-#        define SIZEOF__BOOL            1
-#        define SIZEOF_LONG             8
-#        define SIZEOF_PTHREAD_T        8
-#        define SIZEOF_SIZE_T           8
-#        define SIZEOF_TIME_T           8
-#        define SIZEOF_VOID_P           8
-#        define SIZEOF_UINTPTR_T        8
-#        define SIZEOF_PTHREAD_T        8
-#    else
-#        ifdef __ppc__
-#           define SIZEOF__BOOL         4
-#        else
-#           define SIZEOF__BOOL         1
-#        endif
-#        define SIZEOF_LONG             4
-#        define SIZEOF_PTHREAD_T        4
-#        define SIZEOF_SIZE_T           4
-#        define SIZEOF_TIME_T           4
-#        define SIZEOF_VOID_P           4
-#        define SIZEOF_UINTPTR_T        4
-#        define SIZEOF_PTHREAD_T        4
-#    endif
-
-#    if defined(__LP64__)
-     /* MacOSX 10.4 (the first release to support 64-bit code
-      * at all) only supports 64-bit in the UNIX layer.
-      * Therefore suppress the toolbox-glue in 64-bit mode.
-      */
-
-    /* In 64-bit mode setpgrp always has no arguments, in 32-bit
-     * mode that depends on the compilation environment
-     */
-#       undef SETPGRP_HAVE_ARG
-
-#    endif
-
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN 1
-#define DOUBLE_IS_BIG_ENDIAN_IEEE754
-#else
-#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754
-#endif /* __BIG_ENDIAN */
-
-#ifdef __i386__
-# define HAVE_GCC_ASM_FOR_X87
-#endif
-
-    /*
-     * The definition in pyconfig.h is only valid on the OS release
-     * where configure ran on and not necessarily for all systems where
-     * the executable can be used on.
-     *
-     * Specifically: OSX 10.4 has limited supported for '%zd', while
-     * 10.5 has full support for '%zd'. A binary built on 10.5 won't
-     * work properly on 10.4 unless we suppress the definition
-     * of PY_FORMAT_SIZE_T
-     */
-#undef  PY_FORMAT_SIZE_T
-
-
-#endif /* defined(_APPLE__) */
-
-#endif /* PYMACCONFIG_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymacro.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymacro.h
deleted file mode 100644
index 202b936d9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymacro.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#ifndef Py_PYMACRO_H
-#define Py_PYMACRO_H
-
-/* Minimum value between x and y */
-#define Py_MIN(x, y) (((x) > (y)) ? (y) : (x))
-
-/* Maximum value between x and y */
-#define Py_MAX(x, y) (((x) > (y)) ? (x) : (y))
-
-/* Absolute value of the number x */
-#define Py_ABS(x) ((x) < 0 ? -(x) : (x))
-
-#define _Py_XSTRINGIFY(x) #x
-
-/* Convert the argument to a string. For example, Py_STRINGIFY(123) is replaced
-   with "123" by the preprocessor. Defines are also replaced by their value.
-   For example Py_STRINGIFY(__LINE__) is replaced by the line number, not
-   by "__LINE__". */
-#define Py_STRINGIFY(x) _Py_XSTRINGIFY(x)
-
-/* Get the size of a structure member in bytes */
-#define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member)
-
-/* Argument must be a char or an int in [-128, 127] or [0, 255]. */
-#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff))
-
-/* Assert a build-time dependency, as an expression.
-
-   Your compile will fail if the condition isn't true, or can't be evaluated
-   by the compiler. This can be used in an expression: its value is 0.
-
-   Example:
-
-   #define foo_to_char(foo)  \
-       ((char *)(foo)        \
-        + Py_BUILD_ASSERT_EXPR(offsetof(struct foo, string) == 0))
-
-   Written by Rusty Russell, public domain, http://ccodearchive.net/ */
-#define Py_BUILD_ASSERT_EXPR(cond) \
-    (sizeof(char [1 - 2*!(cond)]) - 1)
-
-#define Py_BUILD_ASSERT(cond)  do {         \
-        (void)Py_BUILD_ASSERT_EXPR(cond);   \
-    } while(0)
-
-/* Get the number of elements in a visible array
-
-   This does not work on pointers, or arrays declared as [], or function
-   parameters. With correct compiler support, such usage will cause a build
-   error (see Py_BUILD_ASSERT_EXPR).
-
-   Written by Rusty Russell, public domain, http://ccodearchive.net/
-
-   Requires at GCC 3.1+ */
-#if (defined(__GNUC__) && !defined(__STRICT_ANSI__) && \
-    (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)) || (__GNUC__ >= 4)))
-/* Two gcc extensions.
-   &a[0] degrades to a pointer: a different type from an array */
-#define Py_ARRAY_LENGTH(array) \
-    (sizeof(array) / sizeof((array)[0]) \
-     + Py_BUILD_ASSERT_EXPR(!__builtin_types_compatible_p(typeof(array), \
-                                                          typeof(&(array)[0]))))
-#else
-#define Py_ARRAY_LENGTH(array) \
-    (sizeof(array) / sizeof((array)[0]))
-#endif
-
-
-/* Define macros for inline documentation. */
-#define PyDoc_VAR(name) static const char name[]
-#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str)
-#ifdef WITH_DOC_STRINGS
-#define PyDoc_STR(str) str
-#else
-#define PyDoc_STR(str) ""
-#endif
-
-/* Below "a" is a power of 2. */
-/* Round down size "n" to be a multiple of "a". */
-#define _Py_SIZE_ROUND_DOWN(n, a) ((size_t)(n) & ~(size_t)((a) - 1))
-/* Round up size "n" to be a multiple of "a". */
-#define _Py_SIZE_ROUND_UP(n, a) (((size_t)(n) + \
-        (size_t)((a) - 1)) & ~(size_t)((a) - 1))
-/* Round pointer "p" down to the closest "a"-aligned address <= "p". */
-#define _Py_ALIGN_DOWN(p, a) ((void *)((uintptr_t)(p) & ~(uintptr_t)((a) - 1)))
-/* Round pointer "p" up to the closest "a"-aligned address >= "p". */
-#define _Py_ALIGN_UP(p, a) ((void *)(((uintptr_t)(p) + \
-        (uintptr_t)((a) - 1)) & ~(uintptr_t)((a) - 1)))
-/* Check if pointer "p" is aligned to "a"-bytes boundary. */
-#define _Py_IS_ALIGNED(p, a) (!((uintptr_t)(p) & (uintptr_t)((a) - 1)))
-
-/* Use this for unused arguments in a function definition to silence compiler
- * warnings. Example:
- *
- * int func(int a, int Py_UNUSED(b)) { return a; }
- */
-#if defined(__GNUC__) || defined(__clang__)
-#  define Py_UNUSED(name) _unused_ ## name __attribute__((unused))
-#else
-#  define Py_UNUSED(name) _unused_ ## name
-#endif
-
-#if defined(RANDALL_WAS_HERE)
-#  define Py_UNREACHABLE() \
-    Py_FatalError( \
-        "If you're seeing this, the code is in what I thought was\n" \
-        "an unreachable state.\n\n" \
-        "I could give you advice for what to do, but honestly, why\n" \
-        "should you trust me?  I clearly screwed this up.  I'm writing\n" \
-        "a message that should never appear, yet I know it will\n" \
-        "probably appear someday.\n\n" \
-        "On a deep level, I know I'm not up to this task.\n" \
-        "I'm so sorry.\n" \
-        "https://xkcd.com/2200")
-#elif defined(Py_DEBUG)
-#  define Py_UNREACHABLE() \
-    Py_FatalError( \
-        "We've reached an unreachable state. Anything is possible.\n" \
-        "The limits were in our heads all along. Follow your dreams.\n" \
-        "https://xkcd.com/2200")
-#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
-#  define Py_UNREACHABLE() __builtin_unreachable()
-#elif defined(__clang__) || defined(__INTEL_COMPILER)
-#  define Py_UNREACHABLE() __builtin_unreachable()
-#elif defined(_MSC_VER)
-#  define Py_UNREACHABLE() __assume(0)
-#else
-#  define Py_UNREACHABLE() \
-    Py_FatalError("Unreachable C code path reached")
-#endif
-
-#endif /* Py_PYMACRO_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymath.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymath.h
deleted file mode 100644
index 63ca97278..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymath.h
+++ /dev/null
@@ -1,238 +0,0 @@
-#ifndef Py_PYMATH_H
-#define Py_PYMATH_H
-
-#include "pyconfig.h" /* include for defines */
-
-/**************************************************************************
-Symbols and macros to supply platform-independent interfaces to mathematical
-functions and constants
-**************************************************************************/
-
-/* Python provides implementations for copysign, round and hypot in
- * Python/pymath.c just in case your math library doesn't provide the
- * functions.
- *
- *Note: PC/pyconfig.h defines copysign as _copysign
- */
-#ifndef HAVE_COPYSIGN
-extern double copysign(double, double);
-#endif
-
-#ifndef HAVE_ROUND
-extern double round(double);
-#endif
-
-#ifndef HAVE_HYPOT
-extern double hypot(double, double);
-#endif
-
-/* extra declarations */
-#ifndef _MSC_VER
-#ifndef __STDC__
-extern double fmod (double, double);
-extern double frexp (double, int *);
-extern double ldexp (double, int);
-extern double modf (double, double *);
-extern double pow(double, double);
-#endif /* __STDC__ */
-#endif /* _MSC_VER */
-
-/* High precision definition of pi and e (Euler)
- * The values are taken from libc6's math.h.
- */
-#ifndef Py_MATH_PIl
-#define Py_MATH_PIl 3.1415926535897932384626433832795029L
-#endif
-#ifndef Py_MATH_PI
-#define Py_MATH_PI 3.14159265358979323846
-#endif
-
-#ifndef Py_MATH_El
-#define Py_MATH_El 2.7182818284590452353602874713526625L
-#endif
-
-#ifndef Py_MATH_E
-#define Py_MATH_E 2.7182818284590452354
-#endif
-
-/* Tau (2pi) to 40 digits, taken from tauday.com/tau-digits. */
-#ifndef Py_MATH_TAU
-#define Py_MATH_TAU 6.2831853071795864769252867665590057683943L
-#endif
-
-
-/* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU
-   register and into a 64-bit memory location, rounding from extended
-   precision to double precision in the process.  On other platforms it does
-   nothing. */
-
-/* we take double rounding as evidence of x87 usage */
-#ifndef Py_LIMITED_API
-#ifndef Py_FORCE_DOUBLE
-#  ifdef X87_DOUBLE_ROUNDING
-PyAPI_FUNC(double) _Py_force_double(double);
-#    define Py_FORCE_DOUBLE(X) (_Py_force_double(X))
-#  else
-#    define Py_FORCE_DOUBLE(X) (X)
-#  endif
-#endif
-#endif
-
-#ifndef Py_LIMITED_API
-#ifdef HAVE_GCC_ASM_FOR_X87
-PyAPI_FUNC(unsigned short) _Py_get_387controlword(void);
-PyAPI_FUNC(void) _Py_set_387controlword(unsigned short);
-#endif
-#endif
-
-/* Py_IS_NAN(X)
- * Return 1 if float or double arg is a NaN, else 0.
- * Caution:
- *     X is evaluated more than once.
- *     This may not work on all platforms.  Each platform has *some*
- *     way to spell this, though -- override in pyconfig.h if you have
- *     a platform where it doesn't work.
- * Note: PC/pyconfig.h defines Py_IS_NAN as _isnan
- */
-#ifndef Py_IS_NAN
-#if defined HAVE_DECL_ISNAN && HAVE_DECL_ISNAN == 1
-#define Py_IS_NAN(X) isnan(X)
-#else
-#define Py_IS_NAN(X) ((X) != (X))
-#endif
-#endif
-
-/* Py_IS_INFINITY(X)
- * Return 1 if float or double arg is an infinity, else 0.
- * Caution:
- *    X is evaluated more than once.
- *    This implementation may set the underflow flag if |X| is very small;
- *    it really can't be implemented correctly (& easily) before C99.
- *    Override in pyconfig.h if you have a better spelling on your platform.
- *  Py_FORCE_DOUBLE is used to avoid getting false negatives from a
- *    non-infinite value v sitting in an 80-bit x87 register such that
- *    v becomes infinite when spilled from the register to 64-bit memory.
- * Note: PC/pyconfig.h defines Py_IS_INFINITY as _isinf
- */
-#ifndef Py_IS_INFINITY
-#  if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1
-#    define Py_IS_INFINITY(X) isinf(X)
-#  else
-#    define Py_IS_INFINITY(X) ((X) &&                                   \
-                               (Py_FORCE_DOUBLE(X)*0.5 == Py_FORCE_DOUBLE(X)))
-#  endif
-#endif
-
-/* Py_IS_FINITE(X)
- * Return 1 if float or double arg is neither infinite nor NAN, else 0.
- * Some compilers (e.g. VisualStudio) have intrinsics for this, so a special
- * macro for this particular test is useful
- * Note: PC/pyconfig.h defines Py_IS_FINITE as _finite
- */
-#ifndef Py_IS_FINITE
-#if defined HAVE_DECL_ISFINITE && HAVE_DECL_ISFINITE == 1
-#define Py_IS_FINITE(X) isfinite(X)
-#elif defined HAVE_FINITE
-#define Py_IS_FINITE(X) finite(X)
-#else
-#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X))
-#endif
-#endif
-
-/* HUGE_VAL is supposed to expand to a positive double infinity.  Python
- * uses Py_HUGE_VAL instead because some platforms are broken in this
- * respect.  We used to embed code in pyport.h to try to worm around that,
- * but different platforms are broken in conflicting ways.  If you're on
- * a platform where HUGE_VAL is defined incorrectly, fiddle your Python
- * config to #define Py_HUGE_VAL to something that works on your platform.
- */
-#ifndef Py_HUGE_VAL
-#define Py_HUGE_VAL HUGE_VAL
-#endif
-
-/* Py_NAN
- * A value that evaluates to a NaN. On IEEE 754 platforms INF*0 or
- * INF/INF works. Define Py_NO_NAN in pyconfig.h if your platform
- * doesn't support NaNs.
- */
-#if !defined(Py_NAN) && !defined(Py_NO_NAN)
-#if !defined(__INTEL_COMPILER)
-    #define Py_NAN (Py_HUGE_VAL * 0.)
-#else /* __INTEL_COMPILER */
-    #if defined(ICC_NAN_STRICT)
-        #pragma float_control(push)
-        #pragma float_control(precise, on)
-        #pragma float_control(except,  on)
-        #if defined(_MSC_VER)
-            __declspec(noinline)
-        #else /* Linux */
-            __attribute__((noinline))
-        #endif /* _MSC_VER */
-        static double __icc_nan()
-        {
-            return sqrt(-1.0);
-        }
-        #pragma float_control (pop)
-        #define Py_NAN __icc_nan()
-    #else /* ICC_NAN_RELAXED as default for Intel Compiler */
-        static const union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f};
-        #define Py_NAN (__nan_store.__icc_nan)
-    #endif /* ICC_NAN_STRICT */
-#endif /* __INTEL_COMPILER */
-#endif
-
-/* Py_OVERFLOWED(X)
- * Return 1 iff a libm function overflowed.  Set errno to 0 before calling
- * a libm function, and invoke this macro after, passing the function
- * result.
- * Caution:
- *    This isn't reliable.  C99 no longer requires libm to set errno under
- *        any exceptional condition, but does require +- HUGE_VAL return
- *        values on overflow.  A 754 box *probably* maps HUGE_VAL to a
- *        double infinity, and we're cool if that's so, unless the input
- *        was an infinity and an infinity is the expected result.  A C89
- *        system sets errno to ERANGE, so we check for that too.  We're
- *        out of luck if a C99 754 box doesn't map HUGE_VAL to +Inf, or
- *        if the returned result is a NaN, or if a C89 box returns HUGE_VAL
- *        in non-overflow cases.
- *    X is evaluated more than once.
- * Some platforms have better way to spell this, so expect some #ifdef'ery.
- *
- * OpenBSD uses 'isinf()' because a compiler bug on that platform causes
- * the longer macro version to be mis-compiled. This isn't optimal, and
- * should be removed once a newer compiler is available on that platform.
- * The system that had the failure was running OpenBSD 3.2 on Intel, with
- * gcc 2.95.3.
- *
- * According to Tim's checkin, the FreeBSD systems use isinf() to work
- * around a FPE bug on that platform.
- */
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-#define Py_OVERFLOWED(X) isinf(X)
-#else
-#define Py_OVERFLOWED(X) ((X) != 0.0 && (errno == ERANGE ||    \
-                                         (X) == Py_HUGE_VAL || \
-                                         (X) == -Py_HUGE_VAL))
-#endif
-
-/* Return whether integral type *type* is signed or not. */
-#define _Py_IntegralTypeSigned(type) ((type)(-1) < 0)
-/* Return the maximum value of integral type *type*. */
-#define _Py_IntegralTypeMax(type) ((_Py_IntegralTypeSigned(type)) ? (((((type)1 << (sizeof(type)*CHAR_BIT - 2)) - 1) << 1) + 1) : ~(type)0)
-/* Return the minimum value of integral type *type*. */
-#define _Py_IntegralTypeMin(type) ((_Py_IntegralTypeSigned(type)) ? -_Py_IntegralTypeMax(type) - 1 : 0)
-/* Check whether *v* is in the range of integral type *type*. This is most
- * useful if *v* is floating-point, since demoting a floating-point *v* to an
- * integral type that cannot represent *v*'s integral part is undefined
- * behavior. */
-#define _Py_InIntegralTypeRange(type, v) (_Py_IntegralTypeMin(type) <= v && v <= _Py_IntegralTypeMax(type))
-
-/* Return the smallest integer k such that n < 2**k, or 0 if n == 0.
- * Equivalent to floor(log2(x))+1.  Also equivalent to: bitwidth_of_type -
- * count_leading_zero_bits(x)
- */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(unsigned int) _Py_bit_length(unsigned long d);
-#endif
-
-#endif /* Py_PYMATH_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymem.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymem.h
deleted file mode 100644
index 607feb948..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pymem.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* The PyMem_ family:  low-level memory allocation interfaces.
-   See objimpl.h for the PyObject_ memory family.
-*/
-
-#ifndef Py_PYMEM_H
-#define Py_PYMEM_H
-
-#include "pyport.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* BEWARE:
-
-   Each interface exports both functions and macros.  Extension modules should
-   use the functions, to ensure binary compatibility across Python versions.
-   Because the Python implementation is free to change internal details, and
-   the macros may (or may not) expose details for speed, if you do use the
-   macros you must recompile your extensions with each Python release.
-
-   Never mix calls to PyMem_ with calls to the platform malloc/realloc/
-   calloc/free.  For example, on Windows different DLLs may end up using
-   different heaps, and if you use PyMem_Malloc you'll get the memory from the
-   heap used by the Python DLL; it could be a disaster if you free()'ed that
-   directly in your own extension.  Using PyMem_Free instead ensures Python
-   can return the memory to the proper heap.  As another example, in
-   PYMALLOC_DEBUG mode, Python wraps all calls to all PyMem_ and PyObject_
-   memory functions in special debugging wrappers that add additional
-   debugging info to dynamic memory blocks.  The system routines have no idea
-   what to do with that stuff, and the Python wrappers have no idea what to do
-   with raw blocks obtained directly by the system routines then.
-
-   The GIL must be held when using these APIs.
-*/
-
-/*
- * Raw memory interface
- * ====================
- */
-
-/* Functions
-
-   Functions supplying platform-independent semantics for malloc/realloc/
-   free.  These functions make sure that allocating 0 bytes returns a distinct
-   non-NULL pointer (whenever possible -- if we're flat out of memory, NULL
-   may be returned), even if the platform malloc and realloc don't.
-   Returned pointers must be checked for NULL explicitly.  No action is
-   performed on failure (no exception is set, no warning is printed, etc).
-*/
-
-PyAPI_FUNC(void *) PyMem_Malloc(size_t size);
-PyAPI_FUNC(void *) PyMem_Realloc(void *ptr, size_t new_size);
-PyAPI_FUNC(void) PyMem_Free(void *ptr);
-
-/* Macros. */
-
-/* PyMem_MALLOC(0) means malloc(1). Some systems would return NULL
-   for malloc(0), which would be treated as an error. Some platforms
-   would return a pointer with no memory behind it, which would break
-   pymalloc. To solve these problems, allocate an extra byte. */
-/* Returns NULL to indicate error if a negative size or size larger than
-   Py_ssize_t can represent is supplied.  Helps prevents security holes. */
-#define PyMem_MALLOC(n)         PyMem_Malloc(n)
-#define PyMem_REALLOC(p, n)     PyMem_Realloc(p, n)
-#define PyMem_FREE(p)           PyMem_Free(p)
-
-/*
- * Type-oriented memory interface
- * ==============================
- *
- * Allocate memory for n objects of the given type.  Returns a new pointer
- * or NULL if the request was too large or memory allocation failed.  Use
- * these macros rather than doing the multiplication yourself so that proper
- * overflow checking is always done.
- */
-
-#define PyMem_New(type, n) \
-  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :      \
-        ( (type *) PyMem_Malloc((n) * sizeof(type)) ) )
-#define PyMem_NEW(type, n) \
-  ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :      \
-        ( (type *) PyMem_MALLOC((n) * sizeof(type)) ) )
-
-/*
- * The value of (p) is always clobbered by this macro regardless of success.
- * The caller MUST check if (p) is NULL afterwards and deal with the memory
- * error if so.  This means the original value of (p) MUST be saved for the
- * caller's memory error handler to not lose track of it.
- */
-#define PyMem_Resize(p, type, n) \
-  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :        \
-        (type *) PyMem_Realloc((p), (n) * sizeof(type)) )
-#define PyMem_RESIZE(p, type, n) \
-  ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL :        \
-        (type *) PyMem_REALLOC((p), (n) * sizeof(type)) )
-
-/* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used
- * anymore.  They're just confusing aliases for PyMem_{Free,FREE} now.
- */
-#define PyMem_Del               PyMem_Free
-#define PyMem_DEL               PyMem_FREE
-
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_PYMEM_H
-#  include  "cpython/pymem.h"
-#  undef Py_CPYTHON_PYMEM_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYMEM_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyport.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyport.h
deleted file mode 100644
index 4bd4eb475..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pyport.h
+++ /dev/null
@@ -1,878 +0,0 @@
-#ifndef Py_PYPORT_H
-#define Py_PYPORT_H
-
-#include "pyconfig.h" /* include for defines */
-
-#include <inttypes.h>
-
-
-/* Defines to build Python and its standard library:
- *
- * - Py_BUILD_CORE: Build Python core. Give access to Python internals, but
- *   should not be used by third-party modules.
- * - Py_BUILD_CORE_BUILTIN: Build a Python stdlib module as a built-in module.
- * - Py_BUILD_CORE_MODULE: Build a Python stdlib module as a dynamic library.
- *
- * Py_BUILD_CORE_BUILTIN and Py_BUILD_CORE_MODULE imply Py_BUILD_CORE.
- *
- * On Windows, Py_BUILD_CORE_MODULE exports "PyInit_xxx" symbol, whereas
- * Py_BUILD_CORE_BUILTIN does not.
- */
-#if defined(Py_BUILD_CORE_BUILTIN) && !defined(Py_BUILD_CORE)
-#  define Py_BUILD_CORE
-#endif
-#if defined(Py_BUILD_CORE_MODULE) && !defined(Py_BUILD_CORE)
-#  define Py_BUILD_CORE
-#endif
-
-
-/**************************************************************************
-Symbols and macros to supply platform-independent interfaces to basic
-C language & library operations whose spellings vary across platforms.
-
-Please try to make documentation here as clear as possible:  by definition,
-the stuff here is trying to illuminate C's darkest corners.
-
-Config #defines referenced here:
-
-SIGNED_RIGHT_SHIFT_ZERO_FILLS
-Meaning:  To be defined iff i>>j does not extend the sign bit when i is a
-          signed integral type and i < 0.
-Used in:  Py_ARITHMETIC_RIGHT_SHIFT
-
-Py_DEBUG
-Meaning:  Extra checks compiled in for debug mode.
-Used in:  Py_SAFE_DOWNCAST
-
-**************************************************************************/
-
-/* typedefs for some C9X-defined synonyms for integral types.
- *
- * The names in Python are exactly the same as the C9X names, except with a
- * Py_ prefix.  Until C9X is universally implemented, this is the only way
- * to ensure that Python gets reliable names that don't conflict with names
- * in non-Python code that are playing their own tricks to define the C9X
- * names.
- *
- * NOTE: don't go nuts here!  Python has no use for *most* of the C9X
- * integral synonyms.  Only define the ones we actually need.
- */
-
-/* long long is required. Ensure HAVE_LONG_LONG is defined for compatibility. */
-#ifndef HAVE_LONG_LONG
-#define HAVE_LONG_LONG 1
-#endif
-#ifndef PY_LONG_LONG
-#define PY_LONG_LONG long long
-/* If LLONG_MAX is defined in limits.h, use that. */
-#define PY_LLONG_MIN LLONG_MIN
-#define PY_LLONG_MAX LLONG_MAX
-#define PY_ULLONG_MAX ULLONG_MAX
-#endif
-
-#define PY_UINT32_T uint32_t
-#define PY_UINT64_T uint64_t
-
-/* Signed variants of the above */
-#define PY_INT32_T int32_t
-#define PY_INT64_T int64_t
-
-/* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all
-   the necessary integer types are available, and we're on a 64-bit platform
-   (as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */
-
-#ifndef PYLONG_BITS_IN_DIGIT
-#if SIZEOF_VOID_P >= 8
-#define PYLONG_BITS_IN_DIGIT 30
-#else
-#define PYLONG_BITS_IN_DIGIT 15
-#endif
-#endif
-
-/* uintptr_t is the C9X name for an unsigned integral type such that a
- * legitimate void* can be cast to uintptr_t and then back to void* again
- * without loss of information.  Similarly for intptr_t, wrt a signed
- * integral type.
- */
-typedef uintptr_t       Py_uintptr_t;
-typedef intptr_t        Py_intptr_t;
-
-/* Py_ssize_t is a signed integral type such that sizeof(Py_ssize_t) ==
- * sizeof(size_t).  C99 doesn't define such a thing directly (size_t is an
- * unsigned integral type).  See PEP 353 for details.
- */
-#ifdef HAVE_SSIZE_T
-typedef ssize_t         Py_ssize_t;
-#elif SIZEOF_VOID_P == SIZEOF_SIZE_T
-typedef Py_intptr_t     Py_ssize_t;
-#else
-#   error "Python needs a typedef for Py_ssize_t in pyport.h."
-#endif
-
-/* Py_hash_t is the same size as a pointer. */
-#define SIZEOF_PY_HASH_T SIZEOF_SIZE_T
-typedef Py_ssize_t Py_hash_t;
-/* Py_uhash_t is the unsigned equivalent needed to calculate numeric hash. */
-#define SIZEOF_PY_UHASH_T SIZEOF_SIZE_T
-typedef size_t Py_uhash_t;
-
-/* Only used for compatibility with code that may not be PY_SSIZE_T_CLEAN. */
-#ifdef PY_SSIZE_T_CLEAN
-typedef Py_ssize_t Py_ssize_clean_t;
-#else
-typedef int Py_ssize_clean_t;
-#endif
-
-/* Largest possible value of size_t. */
-#define PY_SIZE_MAX SIZE_MAX
-
-/* Largest positive value of type Py_ssize_t. */
-#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1))
-/* Smallest negative value of type Py_ssize_t. */
-#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1)
-
-/* PY_FORMAT_SIZE_T is a platform-specific modifier for use in a printf
- * format to convert an argument with the width of a size_t or Py_ssize_t.
- * C99 introduced "z" for this purpose, but old MSVCs had not supported it.
- * Since MSVC supports "z" since (at least) 2015, we can just use "z"
- * for new code.
- *
- * These "high level" Python format functions interpret "z" correctly on
- * all platforms (Python interprets the format string itself, and does whatever
- * the platform C requires to convert a size_t/Py_ssize_t argument):
- *
- *     PyBytes_FromFormat
- *     PyErr_Format
- *     PyBytes_FromFormatV
- *     PyUnicode_FromFormatV
- *
- * Lower-level uses require that you interpolate the correct format modifier
- * yourself (e.g., calling printf, fprintf, sprintf, PyOS_snprintf); for
- * example,
- *
- *     Py_ssize_t index;
- *     fprintf(stderr, "index %" PY_FORMAT_SIZE_T "d sucks\n", index);
- *
- * That will expand to %zd or to something else correct for a Py_ssize_t on
- * the platform.
- */
-#ifndef PY_FORMAT_SIZE_T
-#   define PY_FORMAT_SIZE_T "z"
-#endif
-
-/* Py_LOCAL can be used instead of static to get the fastest possible calling
- * convention for functions that are local to a given module.
- *
- * Py_LOCAL_INLINE does the same thing, and also explicitly requests inlining,
- * for platforms that support that.
- *
- * If PY_LOCAL_AGGRESSIVE is defined before python.h is included, more
- * "aggressive" inlining/optimization is enabled for the entire module.  This
- * may lead to code bloat, and may slow things down for those reasons.  It may
- * also lead to errors, if the code relies on pointer aliasing.  Use with
- * care.
- *
- * NOTE: You can only use this for functions that are entirely local to a
- * module; functions that are exported via method tables, callbacks, etc,
- * should keep using static.
- */
-
-#if defined(_MSC_VER)
-#  if defined(PY_LOCAL_AGGRESSIVE)
-   /* enable more aggressive optimization for visual studio */
-#  pragma optimize("agtw", on)
-#endif
-   /* ignore warnings if the compiler decides not to inline a function */
-#  pragma warning(disable: 4710)
-   /* fastest possible local call under MSVC */
-#  define Py_LOCAL(type) static type __fastcall
-#  define Py_LOCAL_INLINE(type) static __inline type __fastcall
-#else
-#  define Py_LOCAL(type) static type
-#  define Py_LOCAL_INLINE(type) static inline type
-#endif
-
-/* Py_MEMCPY is kept for backwards compatibility,
- * see https://bugs.python.org/issue28126 */
-#define Py_MEMCPY memcpy
-
-#include <stdlib.h>
-
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>  /* needed for 'finite' declaration on some platforms */
-#endif
-
-#include <math.h> /* Moved here from the math section, before extern "C" */
-
-/********************************************
- * WRAPPER FOR <time.h> and/or <sys/time.h> *
- ********************************************/
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else /* !TIME_WITH_SYS_TIME */
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else /* !HAVE_SYS_TIME_H */
-#include <time.h>
-#endif /* !HAVE_SYS_TIME_H */
-#endif /* !TIME_WITH_SYS_TIME */
-
-
-/******************************
- * WRAPPER FOR <sys/select.h> *
- ******************************/
-
-/* NB caller must include <sys/types.h> */
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif /* !HAVE_SYS_SELECT_H */
-
-/*******************************
- * stat() and fstat() fiddling *
- *******************************/
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#elif defined(HAVE_STAT_H)
-#include <stat.h>
-#endif
-
-#ifndef S_IFMT
-/* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */
-#define S_IFMT 0170000
-#endif
-
-#ifndef S_IFLNK
-/* Windows doesn't define S_IFLNK but posixmodule.c maps
- * IO_REPARSE_TAG_SYMLINK to S_IFLNK */
-#  define S_IFLNK 0120000
-#endif
-
-#ifndef S_ISREG
-#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG)
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR)
-#endif
-
-#ifndef S_ISCHR
-#define S_ISCHR(x) (((x) & S_IFMT) == S_IFCHR)
-#endif
-
-#ifdef __cplusplus
-/* Move this down here since some C++ #include's don't like to be included
-   inside an extern "C" */
-extern "C" {
-#endif
-
-
-/* Py_ARITHMETIC_RIGHT_SHIFT
- * C doesn't define whether a right-shift of a signed integer sign-extends
- * or zero-fills.  Here a macro to force sign extension:
- * Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J)
- *    Return I >> J, forcing sign extension.  Arithmetically, return the
- *    floor of I/2**J.
- * Requirements:
- *    I should have signed integer type.  In the terminology of C99, this can
- *    be either one of the five standard signed integer types (signed char,
- *    short, int, long, long long) or an extended signed integer type.
- *    J is an integer >= 0 and strictly less than the number of bits in the
- *    type of I (because C doesn't define what happens for J outside that
- *    range either).
- *    TYPE used to specify the type of I, but is now ignored.  It's been left
- *    in for backwards compatibility with versions <= 2.6 or 3.0.
- * Caution:
- *    I may be evaluated more than once.
- */
-#ifdef SIGNED_RIGHT_SHIFT_ZERO_FILLS
-#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) \
-    ((I) < 0 ? -1-((-1-(I)) >> (J)) : (I) >> (J))
-#else
-#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) ((I) >> (J))
-#endif
-
-/* Py_FORCE_EXPANSION(X)
- * "Simply" returns its argument.  However, macro expansions within the
- * argument are evaluated.  This unfortunate trickery is needed to get
- * token-pasting to work as desired in some cases.
- */
-#define Py_FORCE_EXPANSION(X) X
-
-/* Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW)
- * Cast VALUE to type NARROW from type WIDE.  In Py_DEBUG mode, this
- * assert-fails if any information is lost.
- * Caution:
- *    VALUE may be evaluated more than once.
- */
-#ifdef Py_DEBUG
-#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) \
-    (assert((WIDE)(NARROW)(VALUE) == (VALUE)), (NARROW)(VALUE))
-#else
-#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) (NARROW)(VALUE)
-#endif
-
-/* Py_SET_ERRNO_ON_MATH_ERROR(x)
- * If a libm function did not set errno, but it looks like the result
- * overflowed or not-a-number, set errno to ERANGE or EDOM.  Set errno
- * to 0 before calling a libm function, and invoke this macro after,
- * passing the function result.
- * Caution:
- *    This isn't reliable.  See Py_OVERFLOWED comments.
- *    X is evaluated more than once.
- */
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__hpux) && defined(__ia64))
-#define _Py_SET_EDOM_FOR_NAN(X) if (isnan(X)) errno = EDOM;
-#else
-#define _Py_SET_EDOM_FOR_NAN(X) ;
-#endif
-#define Py_SET_ERRNO_ON_MATH_ERROR(X) \
-    do { \
-        if (errno == 0) { \
-            if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \
-                errno = ERANGE; \
-            else _Py_SET_EDOM_FOR_NAN(X) \
-        } \
-    } while(0)
-
-/* Py_SET_ERANGE_IF_OVERFLOW(x)
- * An alias of Py_SET_ERRNO_ON_MATH_ERROR for backward-compatibility.
- */
-#define Py_SET_ERANGE_IF_OVERFLOW(X) Py_SET_ERRNO_ON_MATH_ERROR(X)
-
-/* Py_ADJUST_ERANGE1(x)
- * Py_ADJUST_ERANGE2(x, y)
- * Set errno to 0 before calling a libm function, and invoke one of these
- * macros after, passing the function result(s) (Py_ADJUST_ERANGE2 is useful
- * for functions returning complex results).  This makes two kinds of
- * adjustments to errno:  (A) If it looks like the platform libm set
- * errno=ERANGE due to underflow, clear errno. (B) If it looks like the
- * platform libm overflowed but didn't set errno, force errno to ERANGE.  In
- * effect, we're trying to force a useful implementation of C89 errno
- * behavior.
- * Caution:
- *    This isn't reliable.  See Py_OVERFLOWED comments.
- *    X and Y may be evaluated more than once.
- */
-#define Py_ADJUST_ERANGE1(X)                                            \
-    do {                                                                \
-        if (errno == 0) {                                               \
-            if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL)              \
-                errno = ERANGE;                                         \
-        }                                                               \
-        else if (errno == ERANGE && (X) == 0.0)                         \
-            errno = 0;                                                  \
-    } while(0)
-
-#define Py_ADJUST_ERANGE2(X, Y)                                         \
-    do {                                                                \
-        if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL ||                \
-            (Y) == Py_HUGE_VAL || (Y) == -Py_HUGE_VAL) {                \
-                        if (errno == 0)                                 \
-                                errno = ERANGE;                         \
-        }                                                               \
-        else if (errno == ERANGE)                                       \
-            errno = 0;                                                  \
-    } while(0)
-
-/*  The functions _Py_dg_strtod and _Py_dg_dtoa in Python/dtoa.c (which are
- *  required to support the short float repr introduced in Python 3.1) require
- *  that the floating-point unit that's being used for arithmetic operations
- *  on C doubles is set to use 53-bit precision.  It also requires that the
- *  FPU rounding mode is round-half-to-even, but that's less often an issue.
- *
- *  If your FPU isn't already set to 53-bit precision/round-half-to-even, and
- *  you want to make use of _Py_dg_strtod and _Py_dg_dtoa, then you should
- *
- *     #define HAVE_PY_SET_53BIT_PRECISION 1
- *
- *  and also give appropriate definitions for the following three macros:
- *
- *    _PY_SET_53BIT_PRECISION_START : store original FPU settings, and
- *        set FPU to 53-bit precision/round-half-to-even
- *    _PY_SET_53BIT_PRECISION_END : restore original FPU settings
- *    _PY_SET_53BIT_PRECISION_HEADER : any variable declarations needed to
- *        use the two macros above.
- *
- * The macros are designed to be used within a single C function: see
- * Python/pystrtod.c for an example of their use.
- */
-
-/* get and set x87 control word for gcc/x86 */
-#ifdef HAVE_GCC_ASM_FOR_X87
-#define HAVE_PY_SET_53BIT_PRECISION 1
-/* _Py_get/set_387controlword functions are defined in Python/pymath.c */
-#define _Py_SET_53BIT_PRECISION_HEADER                          \
-    unsigned short old_387controlword, new_387controlword
-#define _Py_SET_53BIT_PRECISION_START                                   \
-    do {                                                                \
-        old_387controlword = _Py_get_387controlword();                  \
-        new_387controlword = (old_387controlword & ~0x0f00) | 0x0200; \
-        if (new_387controlword != old_387controlword)                   \
-            _Py_set_387controlword(new_387controlword);                 \
-    } while (0)
-#define _Py_SET_53BIT_PRECISION_END                             \
-    if (new_387controlword != old_387controlword)               \
-        _Py_set_387controlword(old_387controlword)
-#endif
-
-/* get and set x87 control word for VisualStudio/x86 */
-#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_M_ARM) /* x87 not supported in 64-bit or ARM */
-#define HAVE_PY_SET_53BIT_PRECISION 1
-#define _Py_SET_53BIT_PRECISION_HEADER \
-    unsigned int old_387controlword, new_387controlword, out_387controlword
-/* We use the __control87_2 function to set only the x87 control word.
-   The SSE control word is unaffected. */
-#define _Py_SET_53BIT_PRECISION_START                                   \
-    do {                                                                \
-        __control87_2(0, 0, &old_387controlword, NULL);                 \
-        new_387controlword =                                            \
-          (old_387controlword & ~(_MCW_PC | _MCW_RC)) | (_PC_53 | _RC_NEAR); \
-        if (new_387controlword != old_387controlword)                   \
-            __control87_2(new_387controlword, _MCW_PC | _MCW_RC,        \
-                          &out_387controlword, NULL);                   \
-    } while (0)
-#define _Py_SET_53BIT_PRECISION_END                                     \
-    do {                                                                \
-        if (new_387controlword != old_387controlword)                   \
-            __control87_2(old_387controlword, _MCW_PC | _MCW_RC,        \
-                          &out_387controlword, NULL);                   \
-    } while (0)
-#endif
-
-#ifdef HAVE_GCC_ASM_FOR_MC68881
-#define HAVE_PY_SET_53BIT_PRECISION 1
-#define _Py_SET_53BIT_PRECISION_HEADER \
-  unsigned int old_fpcr, new_fpcr
-#define _Py_SET_53BIT_PRECISION_START                                   \
-  do {                                                                  \
-    __asm__ ("fmove.l %%fpcr,%0" : "=g" (old_fpcr));                    \
-    /* Set double precision / round to nearest.  */                     \
-    new_fpcr = (old_fpcr & ~0xf0) | 0x80;                               \
-    if (new_fpcr != old_fpcr)                                           \
-      __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (new_fpcr));        \
-  } while (0)
-#define _Py_SET_53BIT_PRECISION_END                                     \
-  do {                                                                  \
-    if (new_fpcr != old_fpcr)                                           \
-      __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (old_fpcr));        \
-  } while (0)
-#endif
-
-/* default definitions are empty */
-#ifndef HAVE_PY_SET_53BIT_PRECISION
-#define _Py_SET_53BIT_PRECISION_HEADER
-#define _Py_SET_53BIT_PRECISION_START
-#define _Py_SET_53BIT_PRECISION_END
-#endif
-
-/* If we can't guarantee 53-bit precision, don't use the code
-   in Python/dtoa.c, but fall back to standard code.  This
-   means that repr of a float will be long (17 sig digits).
-
-   Realistically, there are two things that could go wrong:
-
-   (1) doubles aren't IEEE 754 doubles, or
-   (2) we're on x86 with the rounding precision set to 64-bits
-       (extended precision), and we don't know how to change
-       the rounding precision.
- */
-
-#if !defined(DOUBLE_IS_LITTLE_ENDIAN_IEEE754) && \
-    !defined(DOUBLE_IS_BIG_ENDIAN_IEEE754) && \
-    !defined(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754)
-#define PY_NO_SHORT_FLOAT_REPR
-#endif
-
-/* double rounding is symptomatic of use of extended precision on x86.  If
-   we're seeing double rounding, and we don't have any mechanism available for
-   changing the FPU rounding precision, then don't use Python/dtoa.c. */
-#if defined(X87_DOUBLE_ROUNDING) && !defined(HAVE_PY_SET_53BIT_PRECISION)
-#define PY_NO_SHORT_FLOAT_REPR
-#endif
-
-
-/* Py_DEPRECATED(version)
- * Declare a variable, type, or function deprecated.
- * The macro must be placed before the declaration.
- * Usage:
- *    Py_DEPRECATED(3.3) extern int old_var;
- *    Py_DEPRECATED(3.4) typedef int T1;
- *    Py_DEPRECATED(3.8) PyAPI_FUNC(int) Py_OldFunction(void);
- */
-#if defined(__GNUC__) \
-    && ((__GNUC__ >= 4) || (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
-#define Py_DEPRECATED(VERSION_UNUSED) __attribute__((__deprecated__))
-#elif defined(_MSC_VER)
-#define Py_DEPRECATED(VERSION) __declspec(deprecated( \
-                                          "deprecated in " #VERSION))
-#else
-#define Py_DEPRECATED(VERSION_UNUSED)
-#endif
-
-#if defined(__clang__)
-#define _Py_COMP_DIAG_PUSH _Pragma("clang diagnostic push")
-#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
-#define _Py_COMP_DIAG_POP _Pragma("clang diagnostic pop")
-#elif defined(__GNUC__) \
-    && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
-#define _Py_COMP_DIAG_PUSH _Pragma("GCC diagnostic push")
-#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
-    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#define _Py_COMP_DIAG_POP _Pragma("GCC diagnostic pop")
-#elif defined(_MSC_VER)
-#define _Py_COMP_DIAG_PUSH __pragma(warning(push))
-#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS __pragma(warning(disable: 4996))
-#define _Py_COMP_DIAG_POP __pragma(warning(pop))
-#else
-#define _Py_COMP_DIAG_PUSH
-#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS
-#define _Py_COMP_DIAG_POP
-#endif
-
-/* _Py_HOT_FUNCTION
- * The hot attribute on a function is used to inform the compiler that the
- * function is a hot spot of the compiled program. The function is optimized
- * more aggressively and on many target it is placed into special subsection of
- * the text section so all hot functions appears close together improving
- * locality.
- *
- * Usage:
- *    int _Py_HOT_FUNCTION x(void) { return 3; }
- *
- * Issue #28618: This attribute must not be abused, otherwise it can have a
- * negative effect on performance. Only the functions were Python spend most of
- * its time must use it. Use a profiler when running performance benchmark
- * suite to find these functions.
- */
-#if defined(__GNUC__) \
-    && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
-#define _Py_HOT_FUNCTION __attribute__((hot))
-#else
-#define _Py_HOT_FUNCTION
-#endif
-
-/* _Py_NO_INLINE
- * Disable inlining on a function. For example, it helps to reduce the C stack
- * consumption.
- *
- * Usage:
- *    int _Py_NO_INLINE x(void) { return 3; }
- */
-#if defined(_MSC_VER)
-#  define _Py_NO_INLINE __declspec(noinline)
-#elif defined(__GNUC__) || defined(__clang__)
-#  define _Py_NO_INLINE __attribute__ ((noinline))
-#else
-#  define _Py_NO_INLINE
-#endif
-
-/**************************************************************************
-Prototypes that are missing from the standard include files on some systems
-(and possibly only some versions of such systems.)
-
-Please be conservative with adding new ones, document them and enclose them
-in platform-specific #ifdefs.
-**************************************************************************/
-
-#ifdef SOLARIS
-/* Unchecked */
-extern int gethostname(char *, int);
-#endif
-
-#ifdef HAVE__GETPTY
-#include <sys/types.h>          /* we need to import mode_t */
-extern char * _getpty(int *, int, mode_t, int);
-#endif
-
-/* On QNX 6, struct termio must be declared by including sys/termio.h
-   if TCGETA, TCSETA, TCSETAW, or TCSETAF are used.  sys/termio.h must
-   be included before termios.h or it will generate an error. */
-#if defined(HAVE_SYS_TERMIO_H) && !defined(__hpux)
-#include <sys/termio.h>
-#endif
-
-
-/* On 4.4BSD-descendants, ctype functions serves the whole range of
- * wchar_t character set rather than single byte code points only.
- * This characteristic can break some operations of string object
- * including str.upper() and str.split() on UTF-8 locales.  This
- * workaround was provided by Tim Robbins of FreeBSD project.
- */
-
-#if defined(__APPLE__)
-#  define _PY_PORT_CTYPE_UTF8_ISSUE
-#endif
-
-#ifdef _PY_PORT_CTYPE_UTF8_ISSUE
-#ifndef __cplusplus
-   /* The workaround below is unsafe in C++ because
-    * the <locale> defines these symbols as real functions,
-    * with a slightly different signature.
-    * See issue #10910
-    */
-#include <ctype.h>
-#include <wctype.h>
-#undef isalnum
-#define isalnum(c) iswalnum(btowc(c))
-#undef isalpha
-#define isalpha(c) iswalpha(btowc(c))
-#undef islower
-#define islower(c) iswlower(btowc(c))
-#undef isspace
-#define isspace(c) iswspace(btowc(c))
-#undef isupper
-#define isupper(c) iswupper(btowc(c))
-#undef tolower
-#define tolower(c) towlower(btowc(c))
-#undef toupper
-#define toupper(c) towupper(btowc(c))
-#endif
-#endif
-
-
-/* Declarations for symbol visibility.
-
-  PyAPI_FUNC(type): Declares a public Python API function and return type
-  PyAPI_DATA(type): Declares public Python data and its type
-  PyMODINIT_FUNC:   A Python module init function.  If these functions are
-                    inside the Python core, they are private to the core.
-                    If in an extension module, it may be declared with
-                    external linkage depending on the platform.
-
-  As a number of platforms support/require "__declspec(dllimport/dllexport)",
-  we support a HAVE_DECLSPEC_DLL macro to save duplication.
-*/
-
-/*
-  All windows ports, except cygwin, are handled in PC/pyconfig.h.
-
-  Cygwin is the only other autoconf platform requiring special
-  linkage handling and it uses __declspec().
-*/
-#if defined(__CYGWIN__)
-#       define HAVE_DECLSPEC_DLL
-#endif
-
-#include "exports.h"
-
-/* only get special linkage if built as shared or platform is Cygwin */
-#if defined(Py_ENABLE_SHARED) || defined(__CYGWIN__)
-#       if defined(HAVE_DECLSPEC_DLL)
-#               if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
-#                       define PyAPI_FUNC(RTYPE) Py_EXPORTED_SYMBOL RTYPE
-#                       define PyAPI_DATA(RTYPE) extern Py_EXPORTED_SYMBOL RTYPE
-        /* module init functions inside the core need no external linkage */
-        /* except for Cygwin to handle embedding */
-#                       if defined(__CYGWIN__)
-#                               define PyMODINIT_FUNC Py_EXPORTED_SYMBOL PyObject*
-#                       else /* __CYGWIN__ */
-#                               define PyMODINIT_FUNC PyObject*
-#                       endif /* __CYGWIN__ */
-#               else /* Py_BUILD_CORE */
-        /* Building an extension module, or an embedded situation */
-        /* public Python functions and data are imported */
-        /* Under Cygwin, auto-import functions to prevent compilation */
-        /* failures similar to those described at the bottom of 4.1: */
-        /* http://docs.python.org/extending/windows.html#a-cookbook-approach */
-#                       if !defined(__CYGWIN__)
-#                               define PyAPI_FUNC(RTYPE) Py_IMPORTED_SYMBOL RTYPE
-#                       endif /* !__CYGWIN__ */
-#                       define PyAPI_DATA(RTYPE) extern Py_IMPORTED_SYMBOL RTYPE
-        /* module init functions outside the core must be exported */
-#                       if defined(__cplusplus)
-#                               define PyMODINIT_FUNC extern "C" Py_EXPORTED_SYMBOL PyObject*
-#                       else /* __cplusplus */
-#                               define PyMODINIT_FUNC Py_EXPORTED_SYMBOL PyObject*
-#                       endif /* __cplusplus */
-#               endif /* Py_BUILD_CORE */
-#       endif /* HAVE_DECLSPEC_DLL */
-#endif /* Py_ENABLE_SHARED */
-
-/* If no external linkage macros defined by now, create defaults */
-#ifndef PyAPI_FUNC
-#       define PyAPI_FUNC(RTYPE) Py_EXPORTED_SYMBOL RTYPE
-#endif
-#ifndef PyAPI_DATA
-#       define PyAPI_DATA(RTYPE) extern Py_EXPORTED_SYMBOL RTYPE
-#endif
-#ifndef PyMODINIT_FUNC
-#       if defined(__cplusplus)
-#               define PyMODINIT_FUNC extern "C" Py_EXPORTED_SYMBOL PyObject*
-#       else /* __cplusplus */
-#               define PyMODINIT_FUNC Py_EXPORTED_SYMBOL PyObject*
-#       endif /* __cplusplus */
-#endif
-
-/* limits.h constants that may be missing */
-
-#ifndef INT_MAX
-#define INT_MAX 2147483647
-#endif
-
-#ifndef LONG_MAX
-#if SIZEOF_LONG == 4
-#define LONG_MAX 0X7FFFFFFFL
-#elif SIZEOF_LONG == 8
-#define LONG_MAX 0X7FFFFFFFFFFFFFFFL
-#else
-#error "could not set LONG_MAX in pyport.h"
-#endif
-#endif
-
-#ifndef LONG_MIN
-#define LONG_MIN (-LONG_MAX-1)
-#endif
-
-#ifndef LONG_BIT
-#define LONG_BIT (8 * SIZEOF_LONG)
-#endif
-
-#if LONG_BIT != 8 * SIZEOF_LONG
-/* 04-Oct-2000 LONG_BIT is apparently (mis)defined as 64 on some recent
- * 32-bit platforms using gcc.  We try to catch that here at compile-time
- * rather than waiting for integer multiplication to trigger bogus
- * overflows.
- */
-#error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/*
- * Hide GCC attributes from compilers that don't support them.
- */
-#if (!defined(__GNUC__) || __GNUC__ < 2 || \
-     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) )
-#define Py_GCC_ATTRIBUTE(x)
-#else
-#define Py_GCC_ATTRIBUTE(x) __attribute__(x)
-#endif
-
-/*
- * Specify alignment on compilers that support it.
- */
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define Py_ALIGNED(x) __attribute__((aligned(x)))
-#else
-#define Py_ALIGNED(x)
-#endif
-
-/* Eliminate end-of-loop code not reached warnings from SunPro C
- * when using do{...}while(0) macros
- */
-#ifdef __SUNPRO_C
-#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED)
-#endif
-
-#ifndef Py_LL
-#define Py_LL(x) x##LL
-#endif
-
-#ifndef Py_ULL
-#define Py_ULL(x) Py_LL(x##U)
-#endif
-
-#define Py_VA_COPY va_copy
-
-/*
- * Convenient macros to deal with endianness of the platform. WORDS_BIGENDIAN is
- * detected by configure and defined in pyconfig.h. The code in pyconfig.h
- * also takes care of Apple's universal builds.
- */
-
-#ifdef WORDS_BIGENDIAN
-#  define PY_BIG_ENDIAN 1
-#  define PY_LITTLE_ENDIAN 0
-#else
-#  define PY_BIG_ENDIAN 0
-#  define PY_LITTLE_ENDIAN 1
-#endif
-
-#ifdef Py_BUILD_CORE
-/*
- * Macros to protect CRT calls against instant termination when passed an
- * invalid parameter (issue23524).
- */
-#if defined _MSC_VER && _MSC_VER >= 1900
-
-extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
-#define _Py_BEGIN_SUPPRESS_IPH { _invalid_parameter_handler _Py_old_handler = \
-    _set_thread_local_invalid_parameter_handler(_Py_silent_invalid_parameter_handler);
-#define _Py_END_SUPPRESS_IPH _set_thread_local_invalid_parameter_handler(_Py_old_handler); }
-
-#else
-
-#define _Py_BEGIN_SUPPRESS_IPH
-#define _Py_END_SUPPRESS_IPH
-
-#endif /* _MSC_VER >= 1900 */
-#endif /* Py_BUILD_CORE */
-
-#ifdef __ANDROID__
-   /* The Android langinfo.h header is not used. */
-#  undef HAVE_LANGINFO_H
-#  undef CODESET
-#endif
-
-/* Maximum value of the Windows DWORD type */
-#define PY_DWORD_MAX 4294967295U
-
-/* This macro used to tell whether Python was built with multithreading
- * enabled.  Now multithreading is always enabled, but keep the macro
- * for compatibility.
- */
-#ifndef WITH_THREAD
-#  define WITH_THREAD
-#endif
-
-/* Check that ALT_SOABI is consistent with Py_TRACE_REFS:
-   ./configure --with-trace-refs should must be used to define Py_TRACE_REFS */
-#if defined(ALT_SOABI) && defined(Py_TRACE_REFS)
-#  error "Py_TRACE_REFS ABI is not compatible with release and debug ABI"
-#endif
-
-#if defined(__ANDROID__) || defined(__VXWORKS__)
-   /* Ignore the locale encoding: force UTF-8 */
-#  define _Py_FORCE_UTF8_LOCALE
-#endif
-
-#if defined(_Py_FORCE_UTF8_LOCALE) || defined(__APPLE__)
-   /* Use UTF-8 as filesystem encoding */
-#  define _Py_FORCE_UTF8_FS_ENCODING
-#endif
-
-/* Mark a function which cannot return. Example:
-   PyAPI_FUNC(void) _Py_NO_RETURN PyThread_exit_thread(void);
-
-   XLC support is intentionally omitted due to bpo-40244 */
-#if defined(__clang__) || \
-    (defined(__GNUC__) && \
-     ((__GNUC__ >= 3) || \
-      (__GNUC__ == 2) && (__GNUC_MINOR__ >= 5)))
-#  define _Py_NO_RETURN __attribute__((__noreturn__))
-#elif defined(_MSC_VER)
-#  define _Py_NO_RETURN __declspec(noreturn)
-#else
-#  define _Py_NO_RETURN
-#endif
-
-
-// Preprocessor check for a builtin preprocessor function. Always return 0
-// if __has_builtin() macro is not defined.
-//
-// __has_builtin() is available on clang and GCC 10.
-#ifdef __has_builtin
-#  define _Py__has_builtin(x) __has_builtin(x)
-#else
-#  define _Py__has_builtin(x) 0
-#endif
-
-
-#endif /* Py_PYPORT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystate.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystate.h
deleted file mode 100644
index bae440778..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystate.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Thread and interpreter state structures and their interfaces */
-
-
-#ifndef Py_PYSTATE_H
-#define Py_PYSTATE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This limitation is for performance and simplicity. If needed it can be
-removed (with effort). */
-#define MAX_CO_EXTRA_USERS 255
-
-/* Forward declarations for PyFrameObject, PyThreadState
-   and PyInterpreterState */
-struct _ts;
-struct _is;
-
-/* struct _ts is defined in cpython/pystate.h */
-typedef struct _ts PyThreadState;
-/* struct _is is defined in internal/pycore_interp.h */
-typedef struct _is PyInterpreterState;
-
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void);
-PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *);
-PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
-/* New in 3.9 */
-/* Get the current interpreter state.
-
-   Issue a fatal error if there no current Python thread state or no current
-   interpreter. It cannot return NULL.
-
-   The caller must hold the GIL. */
-PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Get(void);
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03080000
-/* New in 3.8 */
-PyAPI_FUNC(PyObject *) PyInterpreterState_GetDict(PyInterpreterState *);
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
-/* New in 3.7 */
-PyAPI_FUNC(int64_t) PyInterpreterState_GetID(PyInterpreterState *);
-#endif
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-
-/* State unique per thread */
-
-/* New in 3.3 */
-PyAPI_FUNC(int) PyState_AddModule(PyObject*, struct PyModuleDef*);
-PyAPI_FUNC(int) PyState_RemoveModule(struct PyModuleDef*);
-#endif
-PyAPI_FUNC(PyObject*) PyState_FindModule(struct PyModuleDef*);
-
-PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *);
-PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *);
-PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
-
-/* Get the current thread state.
-
-   When the current thread state is NULL, this issues a fatal error (so that
-   the caller needn't check for NULL).
-
-   The caller must hold the GIL.
-
-   See also PyThreadState_GET() and _PyThreadState_GET(). */
-PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
-
-/* Get the current Python thread state.
-
-   Macro using PyThreadState_Get() or _PyThreadState_GET() depending if
-   pycore_pystate.h is included or not (this header redefines the macro).
-
-   If PyThreadState_Get() is used, issue a fatal error if the current thread
-   state is NULL.
-
-   See also PyThreadState_Get() and _PyThreadState_GET(). */
-#define PyThreadState_GET() PyThreadState_Get()
-
-PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *);
-PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void);
-PyAPI_FUNC(int) PyThreadState_SetAsyncExc(unsigned long, PyObject *);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
-/* New in 3.9 */
-PyAPI_FUNC(PyInterpreterState*) PyThreadState_GetInterpreter(PyThreadState *tstate);
-PyAPI_FUNC(PyFrameObject*) PyThreadState_GetFrame(PyThreadState *tstate);
-PyAPI_FUNC(uint64_t) PyThreadState_GetID(PyThreadState *tstate);
-#endif
-
-typedef
-    enum {PyGILState_LOCKED, PyGILState_UNLOCKED}
-        PyGILState_STATE;
-
-
-/* Ensure that the current thread is ready to call the Python
-   C API, regardless of the current state of Python, or of its
-   thread lock.  This may be called as many times as desired
-   by a thread so long as each call is matched with a call to
-   PyGILState_Release().  In general, other thread-state APIs may
-   be used between _Ensure() and _Release() calls, so long as the
-   thread-state is restored to its previous state before the Release().
-   For example, normal use of the Py_BEGIN_ALLOW_THREADS/
-   Py_END_ALLOW_THREADS macros are acceptable.
-
-   The return value is an opaque "handle" to the thread state when
-   PyGILState_Ensure() was called, and must be passed to
-   PyGILState_Release() to ensure Python is left in the same state. Even
-   though recursive calls are allowed, these handles can *not* be shared -
-   each unique call to PyGILState_Ensure must save the handle for its
-   call to PyGILState_Release.
-
-   When the function returns, the current thread will hold the GIL.
-
-   Failure is a fatal error.
-*/
-PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure(void);
-
-/* Release any resources previously acquired.  After this call, Python's
-   state will be the same as it was prior to the corresponding
-   PyGILState_Ensure() call (but generally this state will be unknown to
-   the caller, hence the use of the GILState API.)
-
-   Every call to PyGILState_Ensure must be matched by a call to
-   PyGILState_Release on the same thread.
-*/
-PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE);
-
-/* Helper/diagnostic function - get the current thread state for
-   this thread.  May return NULL if no GILState API has been used
-   on the current thread.  Note that the main thread always has such a
-   thread-state, even if no auto-thread-state call has been made
-   on the main thread.
-*/
-PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void);
-
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_PYSTATE_H
-#  include  "cpython/pystate.h"
-#  undef Py_CPYTHON_PYSTATE_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYSTATE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystrcmp.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystrcmp.h
deleted file mode 100644
index edb12397e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystrcmp.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef Py_STRCMP_H
-#define Py_STRCMP_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t);
-PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *);
-
-#ifdef MS_WINDOWS
-#define PyOS_strnicmp strnicmp
-#define PyOS_stricmp stricmp
-#else
-#define PyOS_strnicmp PyOS_mystrnicmp
-#define PyOS_stricmp PyOS_mystricmp
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_STRCMP_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystrhex.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystrhex.h
deleted file mode 100644
index a4f36305b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystrhex.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef Py_STRHEX_H
-#define Py_STRHEX_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-/* Returns a str() containing the hex representation of argbuf. */
-PyAPI_FUNC(PyObject*) _Py_strhex(const char* argbuf, const Py_ssize_t arglen);
-/* Returns a bytes() containing the ASCII hex representation of argbuf. */
-PyAPI_FUNC(PyObject*) _Py_strhex_bytes(const char* argbuf, const Py_ssize_t arglen);
-/* These variants include support for a separator between every N bytes: */
-PyAPI_FUNC(PyObject*) _Py_strhex_with_sep(const char* argbuf, const Py_ssize_t arglen, const PyObject* sep, const int bytes_per_group);
-PyAPI_FUNC(PyObject*) _Py_strhex_bytes_with_sep(const char* argbuf, const Py_ssize_t arglen, const PyObject* sep, const int bytes_per_group);
-#endif /* !Py_LIMITED_API */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_STRHEX_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystrtod.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystrtod.h
deleted file mode 100644
index c1e84de6f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pystrtod.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef Py_STRTOD_H
-#define Py_STRTOD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-PyAPI_FUNC(double) PyOS_string_to_double(const char *str,
-                                         char **endptr,
-                                         PyObject *overflow_exception);
-
-/* The caller is responsible for calling PyMem_Free to free the buffer
-   that's is returned. */
-PyAPI_FUNC(char *) PyOS_double_to_string(double val,
-                                         char format_code,
-                                         int precision,
-                                         int flags,
-                                         int *type);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _Py_string_to_number_with_underscores(
-    const char *str, Py_ssize_t len, const char *what, PyObject *obj, void *arg,
-    PyObject *(*innerfunc)(const char *, Py_ssize_t, void *));
-
-PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr);
-#endif
-
-
-/* PyOS_double_to_string's "flags" parameter can be set to 0 or more of: */
-#define Py_DTSF_SIGN      0x01 /* always add the sign */
-#define Py_DTSF_ADD_DOT_0 0x02 /* if the result is an integer add ".0" */
-#define Py_DTSF_ALT       0x04 /* "alternate" formatting. it's format_code
-                                  specific */
-
-/* PyOS_double_to_string's "type", if non-NULL, will be set to one of: */
-#define Py_DTST_FINITE 0
-#define Py_DTST_INFINITE 1
-#define Py_DTST_NAN 2
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_STRTOD_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pythonrun.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pythonrun.h
deleted file mode 100644
index 575290724..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pythonrun.h
+++ /dev/null
@@ -1,217 +0,0 @@
-
-/* Interfaces to parse and execute pieces of python code */
-
-#ifndef Py_PYTHONRUN_H
-#define Py_PYTHONRUN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_AnyFileExFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int closeit,
-    PyCompilerFlags *flags);
-PyAPI_FUNC(int) PyRun_SimpleFileExFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int closeit,
-    PyCompilerFlags *flags);
-PyAPI_FUNC(int) PyRun_InteractiveOneFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyCompilerFlags *flags);
-PyAPI_FUNC(int) PyRun_InteractiveOneObject(
-    FILE *fp,
-    PyObject *filename,
-    PyCompilerFlags *flags);
-PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyCompilerFlags *flags);
-
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(
-    const char *s,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int start,
-    PyCompilerFlags *flags,
-    PyArena *arena);
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromStringObject(
-    const char *s,
-    PyObject *filename,
-    int start,
-    PyCompilerFlags *flags,
-    PyArena *arena);
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    const char* enc,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    PyCompilerFlags *flags,
-    int *errcode,
-    PyArena *arena);
-PyAPI_FUNC(struct _mod *) PyParser_ASTFromFileObject(
-    FILE *fp,
-    PyObject *filename,
-    const char* enc,
-    int start,
-    const char *ps1,
-    const char *ps2,
-    PyCompilerFlags *flags,
-    int *errcode,
-    PyArena *arena);
-#endif
-
-#ifndef PyParser_SimpleParseString
-#define PyParser_SimpleParseString(S, B) \
-    PyParser_SimpleParseStringFlags(S, B, 0)
-#define PyParser_SimpleParseFile(FP, S, B) \
-    PyParser_SimpleParseFileFlags(FP, S, B, 0)
-#endif
-
-#ifndef Py_BUILD_CORE
-Py_DEPRECATED(3.9)
-#endif
-PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int, int);
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-#ifndef Py_BUILD_CORE
-Py_DEPRECATED(3.9)
-#endif
-PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlagsFilename(const char *,
-                                                                   const char *,
-                                                                   int, int);
-#endif
-#ifndef Py_BUILD_CORE
-Py_DEPRECATED(3.9)
-#endif
-PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *, int, int);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *,
-                                         PyObject *, PyCompilerFlags *);
-
-PyAPI_FUNC(PyObject *) PyRun_FileExFlags(
-    FILE *fp,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int start,
-    PyObject *globals,
-    PyObject *locals,
-    int closeit,
-    PyCompilerFlags *flags);
-#endif
-
-#ifdef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) Py_CompileString(const char *, const char *, int);
-#else
-#define Py_CompileString(str, p, s) Py_CompileStringExFlags(str, p, s, NULL, -1)
-#define Py_CompileStringFlags(str, p, s, f) Py_CompileStringExFlags(str, p, s, f, -1)
-PyAPI_FUNC(PyObject *) Py_CompileStringExFlags(
-    const char *str,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int start,
-    PyCompilerFlags *flags,
-    int optimize);
-PyAPI_FUNC(PyObject *) Py_CompileStringObject(
-    const char *str,
-    PyObject *filename, int start,
-    PyCompilerFlags *flags,
-    int optimize);
-#endif
-PyAPI_FUNC(struct symtable *) Py_SymtableString(
-    const char *str,
-    const char *filename,       /* decoded from the filesystem encoding */
-    int start);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(const char *) _Py_SourceAsString(
-    PyObject *cmd,
-    const char *funcname,
-    const char *what,
-    PyCompilerFlags *cf,
-    PyObject **cmd_copy);
-
-PyAPI_FUNC(struct symtable *) Py_SymtableStringObject(
-    const char *str,
-    PyObject *filename,
-    int start);
-
-PyAPI_FUNC(struct symtable *) _Py_SymtableStringObjectFlags(
-    const char *str,
-    PyObject *filename,
-    int start,
-    PyCompilerFlags *flags);
-#endif
-
-PyAPI_FUNC(void) PyErr_Print(void);
-PyAPI_FUNC(void) PyErr_PrintEx(int);
-PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *);
-
-#ifndef Py_LIMITED_API
-/* A function flavor is also exported by libpython. It is required when
-    libpython is accessed directly rather than using header files which defines
-    macros below. On Windows, for example, PyAPI_FUNC() uses dllexport to
-    export functions in pythonXX.dll. */
-PyAPI_FUNC(PyObject *) PyRun_String(const char *str, int s, PyObject *g, PyObject *l);
-PyAPI_FUNC(int) PyRun_AnyFile(FILE *fp, const char *name);
-PyAPI_FUNC(int) PyRun_AnyFileEx(FILE *fp, const char *name, int closeit);
-PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
-PyAPI_FUNC(int) PyRun_SimpleString(const char *s);
-PyAPI_FUNC(int) PyRun_SimpleFile(FILE *f, const char *p);
-PyAPI_FUNC(int) PyRun_SimpleFileEx(FILE *f, const char *p, int c);
-PyAPI_FUNC(int) PyRun_InteractiveOne(FILE *f, const char *p);
-PyAPI_FUNC(int) PyRun_InteractiveLoop(FILE *f, const char *p);
-PyAPI_FUNC(PyObject *) PyRun_File(FILE *fp, const char *p, int s, PyObject *g, PyObject *l);
-PyAPI_FUNC(PyObject *) PyRun_FileEx(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, int c);
-PyAPI_FUNC(PyObject *) PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, PyCompilerFlags *flags);
-
-/* Use macros for a bunch of old variants */
-#define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL)
-#define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL)
-#define PyRun_AnyFileEx(fp, name, closeit) \
-    PyRun_AnyFileExFlags(fp, name, closeit, NULL)
-#define PyRun_AnyFileFlags(fp, name, flags) \
-    PyRun_AnyFileExFlags(fp, name, 0, flags)
-#define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL)
-#define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL)
-#define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL)
-#define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL)
-#define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL)
-#define PyRun_File(fp, p, s, g, l) \
-    PyRun_FileExFlags(fp, p, s, g, l, 0, NULL)
-#define PyRun_FileEx(fp, p, s, g, l, c) \
-    PyRun_FileExFlags(fp, p, s, g, l, c, NULL)
-#define PyRun_FileFlags(fp, p, s, g, l, flags) \
-    PyRun_FileExFlags(fp, p, s, g, l, 0, flags)
-#endif
-
-/* Stuff with no proper home (yet) */
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, const char *);
-#endif
-PyAPI_DATA(int) (*PyOS_InputHook)(void);
-PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, const char *);
-#ifndef Py_LIMITED_API
-PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState;
-#endif
-
-/* Stack size, in "pointers" (so we get extra safety margins
-   on 64-bit platforms).  On a 32-bit platform, this translates
-   to an 8k margin. */
-#define PYOS_STACK_MARGIN 2048
-
-#if defined(WIN32) && !defined(MS_WIN64) && !defined(_M_ARM) && defined(_MSC_VER) && _MSC_VER >= 1300
-/* Enable stack checking under Microsoft C */
-#define USE_STACKCHECK
-#endif
-
-#ifdef USE_STACKCHECK
-/* Check that we aren't overflowing our stack */
-PyAPI_FUNC(int) PyOS_CheckStack(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_PYTHONRUN_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pythread.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pythread.h
deleted file mode 100644
index bb9d86412..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pythread.h
+++ /dev/null
@@ -1,169 +0,0 @@
-
-#ifndef Py_PYTHREAD_H
-#define Py_PYTHREAD_H
-
-typedef void *PyThread_type_lock;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Return status codes for Python lock acquisition.  Chosen for maximum
- * backwards compatibility, ie failure -> 0, success -> 1.  */
-typedef enum PyLockStatus {
-    PY_LOCK_FAILURE = 0,
-    PY_LOCK_ACQUIRED = 1,
-    PY_LOCK_INTR
-} PyLockStatus;
-
-#ifndef Py_LIMITED_API
-#define PYTHREAD_INVALID_THREAD_ID ((unsigned long)-1)
-#endif
-
-PyAPI_FUNC(void) PyThread_init_thread(void);
-PyAPI_FUNC(unsigned long) PyThread_start_new_thread(void (*)(void *), void *);
-PyAPI_FUNC(void) _Py_NO_RETURN PyThread_exit_thread(void);
-PyAPI_FUNC(unsigned long) PyThread_get_thread_ident(void);
-
-#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(_WIN32) || defined(_AIX)
-#define PY_HAVE_THREAD_NATIVE_ID
-PyAPI_FUNC(unsigned long) PyThread_get_thread_native_id(void);
-#endif
-
-PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void);
-PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock);
-PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int);
-#define WAIT_LOCK       1
-#define NOWAIT_LOCK     0
-
-#ifndef Py_LIMITED_API
-#ifdef HAVE_FORK
-/* Private function to reinitialize a lock at fork in the child process.
-   Reset the lock to the unlocked state.
-   Return 0 on success, return -1 on error. */
-PyAPI_FUNC(int) _PyThread_at_fork_reinit(PyThread_type_lock *lock);
-#endif  /* HAVE_FORK */
-#endif  /* !Py_LIMITED_API */
-
-/* PY_TIMEOUT_T is the integral type used to specify timeouts when waiting
-   on a lock (see PyThread_acquire_lock_timed() below).
-   PY_TIMEOUT_MAX is the highest usable value (in microseconds) of that
-   type, and depends on the system threading API.
-
-   NOTE: this isn't the same value as `_thread.TIMEOUT_MAX`.  The _thread
-   module exposes a higher-level API, with timeouts expressed in seconds
-   and floating-point numbers allowed.
-*/
-#define PY_TIMEOUT_T long long
-
-#if defined(_POSIX_THREADS)
-   /* PyThread_acquire_lock_timed() uses _PyTime_FromNanoseconds(us * 1000),
-      convert microseconds to nanoseconds. */
-#  define PY_TIMEOUT_MAX (LLONG_MAX / 1000)
-#elif defined (NT_THREADS)
-   /* In the NT API, the timeout is a DWORD and is expressed in milliseconds */
-#  if 0xFFFFFFFFLL * 1000 < LLONG_MAX
-#    define PY_TIMEOUT_MAX (0xFFFFFFFFLL * 1000)
-#  else
-#    define PY_TIMEOUT_MAX LLONG_MAX
-#  endif
-#else
-#  define PY_TIMEOUT_MAX LLONG_MAX
-#endif
-
-
-/* If microseconds == 0, the call is non-blocking: it returns immediately
-   even when the lock can't be acquired.
-   If microseconds > 0, the call waits up to the specified duration.
-   If microseconds < 0, the call waits until success (or abnormal failure)
-
-   microseconds must be less than PY_TIMEOUT_MAX. Behaviour otherwise is
-   undefined.
-
-   If intr_flag is true and the acquire is interrupted by a signal, then the
-   call will return PY_LOCK_INTR.  The caller may reattempt to acquire the
-   lock.
-*/
-PyAPI_FUNC(PyLockStatus) PyThread_acquire_lock_timed(PyThread_type_lock,
-                                                     PY_TIMEOUT_T microseconds,
-                                                     int intr_flag);
-
-PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock);
-
-PyAPI_FUNC(size_t) PyThread_get_stacksize(void);
-PyAPI_FUNC(int) PyThread_set_stacksize(size_t);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyThread_GetInfo(void);
-#endif
-
-
-/* Thread Local Storage (TLS) API
-   TLS API is DEPRECATED.  Use Thread Specific Storage (TSS) API.
-
-   The existing TLS API has used int to represent TLS keys across all
-   platforms, but it is not POSIX-compliant.  Therefore, the new TSS API uses
-   opaque data type to represent TSS keys to be compatible (see PEP 539).
-*/
-Py_DEPRECATED(3.7) PyAPI_FUNC(int) PyThread_create_key(void);
-Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyThread_delete_key(int key);
-Py_DEPRECATED(3.7) PyAPI_FUNC(int) PyThread_set_key_value(int key,
-                                                          void *value);
-Py_DEPRECATED(3.7) PyAPI_FUNC(void *) PyThread_get_key_value(int key);
-Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyThread_delete_key_value(int key);
-
-/* Cleanup after a fork */
-Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyThread_ReInitTLS(void);
-
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
-/* New in 3.7 */
-/* Thread Specific Storage (TSS) API */
-
-typedef struct _Py_tss_t Py_tss_t;  /* opaque */
-
-#ifndef Py_LIMITED_API
-#if defined(_POSIX_THREADS)
-    /* Darwin needs pthread.h to know type name the pthread_key_t. */
-#   include <pthread.h>
-#   define NATIVE_TSS_KEY_T     pthread_key_t
-#elif defined(NT_THREADS)
-    /* In Windows, native TSS key type is DWORD,
-       but hardcode the unsigned long to avoid errors for include directive.
-    */
-#   define NATIVE_TSS_KEY_T     unsigned long
-#else
-#   error "Require native threads. See https://bugs.python.org/issue31370"
-#endif
-
-/* When Py_LIMITED_API is not defined, the type layout of Py_tss_t is
-   exposed to allow static allocation in the API clients.  Even in this case,
-   you must handle TSS keys through API functions due to compatibility.
-*/
-struct _Py_tss_t {
-    int _is_initialized;
-    NATIVE_TSS_KEY_T _key;
-};
-
-#undef NATIVE_TSS_KEY_T
-
-/* When static allocation, you must initialize with Py_tss_NEEDS_INIT. */
-#define Py_tss_NEEDS_INIT   {0}
-#endif  /* !Py_LIMITED_API */
-
-PyAPI_FUNC(Py_tss_t *) PyThread_tss_alloc(void);
-PyAPI_FUNC(void) PyThread_tss_free(Py_tss_t *key);
-
-/* The parameter key must not be NULL. */
-PyAPI_FUNC(int) PyThread_tss_is_created(Py_tss_t *key);
-PyAPI_FUNC(int) PyThread_tss_create(Py_tss_t *key);
-PyAPI_FUNC(void) PyThread_tss_delete(Py_tss_t *key);
-PyAPI_FUNC(int) PyThread_tss_set(Py_tss_t *key, void *value);
-PyAPI_FUNC(void *) PyThread_tss_get(Py_tss_t *key);
-#endif  /* New in 3.7 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !Py_PYTHREAD_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pytime.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pytime.h
deleted file mode 100644
index bdda1da2e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/pytime.h
+++ /dev/null
@@ -1,246 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_PYTIME_H
-#define Py_PYTIME_H
-
-#include "pyconfig.h" /* include for defines */
-#include "object.h"
-
-/**************************************************************************
-Symbols and macros to supply platform-independent interfaces to time related
-functions and constants
-**************************************************************************/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* _PyTime_t: Python timestamp with subsecond precision. It can be used to
-   store a duration, and so indirectly a date (related to another date, like
-   UNIX epoch). */
-typedef int64_t _PyTime_t;
-#define _PyTime_MIN INT64_MIN
-#define _PyTime_MAX INT64_MAX
-
-typedef enum {
-    /* Round towards minus infinity (-inf).
-       For example, used to read a clock. */
-    _PyTime_ROUND_FLOOR=0,
-    /* Round towards infinity (+inf).
-       For example, used for timeout to wait "at least" N seconds. */
-    _PyTime_ROUND_CEILING=1,
-    /* Round to nearest with ties going to nearest even integer.
-       For example, used to round from a Python float. */
-    _PyTime_ROUND_HALF_EVEN=2,
-    /* Round away from zero
-       For example, used for timeout. _PyTime_ROUND_CEILING rounds
-       -1e-9 to 0 milliseconds which causes bpo-31786 issue.
-       _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps
-       the timeout sign as expected. select.poll(timeout) must block
-       for negative values." */
-    _PyTime_ROUND_UP=3,
-    /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be
-       used for timeouts. */
-    _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP
-} _PyTime_round_t;
-
-
-/* Convert a time_t to a PyLong. */
-PyAPI_FUNC(PyObject *) _PyLong_FromTime_t(
-    time_t sec);
-
-/* Convert a PyLong to a time_t. */
-PyAPI_FUNC(time_t) _PyLong_AsTime_t(
-    PyObject *obj);
-
-/* Convert a number of seconds, int or float, to time_t. */
-PyAPI_FUNC(int) _PyTime_ObjectToTime_t(
-    PyObject *obj,
-    time_t *sec,
-    _PyTime_round_t);
-
-/* Convert a number of seconds, int or float, to a timeval structure.
-   usec is in the range [0; 999999] and rounded towards zero.
-   For example, -1.2 is converted to (-2, 800000). */
-PyAPI_FUNC(int) _PyTime_ObjectToTimeval(
-    PyObject *obj,
-    time_t *sec,
-    long *usec,
-    _PyTime_round_t);
-
-/* Convert a number of seconds, int or float, to a timespec structure.
-   nsec is in the range [0; 999999999] and rounded towards zero.
-   For example, -1.2 is converted to (-2, 800000000). */
-PyAPI_FUNC(int) _PyTime_ObjectToTimespec(
-    PyObject *obj,
-    time_t *sec,
-    long *nsec,
-    _PyTime_round_t);
-
-
-/* Create a timestamp from a number of seconds. */
-PyAPI_FUNC(_PyTime_t) _PyTime_FromSeconds(int seconds);
-
-/* Macro to create a timestamp from a number of seconds, no integer overflow.
-   Only use the macro for small values, prefer _PyTime_FromSeconds(). */
-#define _PYTIME_FROMSECONDS(seconds) \
-            ((_PyTime_t)(seconds) * (1000 * 1000 * 1000))
-
-/* Create a timestamp from a number of nanoseconds. */
-PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(_PyTime_t ns);
-
-/* Create a timestamp from nanoseconds (Python int). */
-PyAPI_FUNC(int) _PyTime_FromNanosecondsObject(_PyTime_t *t,
-    PyObject *obj);
-
-/* Convert a number of seconds (Python float or int) to a timetamp.
-   Raise an exception and return -1 on error, return 0 on success. */
-PyAPI_FUNC(int) _PyTime_FromSecondsObject(_PyTime_t *t,
-    PyObject *obj,
-    _PyTime_round_t round);
-
-/* Convert a number of milliseconds (Python float or int, 10^-3) to a timetamp.
-   Raise an exception and return -1 on error, return 0 on success. */
-PyAPI_FUNC(int) _PyTime_FromMillisecondsObject(_PyTime_t *t,
-    PyObject *obj,
-    _PyTime_round_t round);
-
-/* Convert a timestamp to a number of seconds as a C double. */
-PyAPI_FUNC(double) _PyTime_AsSecondsDouble(_PyTime_t t);
-
-/* Convert timestamp to a number of milliseconds (10^-3 seconds). */
-PyAPI_FUNC(_PyTime_t) _PyTime_AsMilliseconds(_PyTime_t t,
-    _PyTime_round_t round);
-
-/* Convert timestamp to a number of microseconds (10^-6 seconds). */
-PyAPI_FUNC(_PyTime_t) _PyTime_AsMicroseconds(_PyTime_t t,
-    _PyTime_round_t round);
-
-/* Convert timestamp to a number of nanoseconds (10^-9 seconds) as a Python int
-   object. */
-PyAPI_FUNC(PyObject *) _PyTime_AsNanosecondsObject(_PyTime_t t);
-
-/* Create a timestamp from a timeval structure.
-   Raise an exception and return -1 on overflow, return 0 on success. */
-PyAPI_FUNC(int) _PyTime_FromTimeval(_PyTime_t *tp, struct timeval *tv);
-
-/* Convert a timestamp to a timeval structure (microsecond resolution).
-   tv_usec is always positive.
-   Raise an exception and return -1 if the conversion overflowed,
-   return 0 on success. */
-PyAPI_FUNC(int) _PyTime_AsTimeval(_PyTime_t t,
-    struct timeval *tv,
-    _PyTime_round_t round);
-
-/* Similar to _PyTime_AsTimeval(), but don't raise an exception on error. */
-PyAPI_FUNC(int) _PyTime_AsTimeval_noraise(_PyTime_t t,
-    struct timeval *tv,
-    _PyTime_round_t round);
-
-/* Convert a timestamp to a number of seconds (secs) and microseconds (us).
-   us is always positive. This function is similar to _PyTime_AsTimeval()
-   except that secs is always a time_t type, whereas the timeval structure
-   uses a C long for tv_sec on Windows.
-   Raise an exception and return -1 if the conversion overflowed,
-   return 0 on success. */
-PyAPI_FUNC(int) _PyTime_AsTimevalTime_t(
-    _PyTime_t t,
-    time_t *secs,
-    int *us,
-    _PyTime_round_t round);
-
-#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_KQUEUE)
-/* Create a timestamp from a timespec structure.
-   Raise an exception and return -1 on overflow, return 0 on success. */
-PyAPI_FUNC(int) _PyTime_FromTimespec(_PyTime_t *tp, struct timespec *ts);
-
-/* Convert a timestamp to a timespec structure (nanosecond resolution).
-   tv_nsec is always positive.
-   Raise an exception and return -1 on error, return 0 on success. */
-PyAPI_FUNC(int) _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts);
-#endif
-
-/* Compute ticks * mul / div.
-   The caller must ensure that ((div - 1) * mul) cannot overflow. */
-PyAPI_FUNC(_PyTime_t) _PyTime_MulDiv(_PyTime_t ticks,
-    _PyTime_t mul,
-    _PyTime_t div);
-
-/* Get the current time from the system clock.
-
-   The function cannot fail. _PyTime_Init() ensures that the system clock
-   works. */
-PyAPI_FUNC(_PyTime_t) _PyTime_GetSystemClock(void);
-
-/* Get the time of a monotonic clock, i.e. a clock that cannot go backwards.
-   The clock is not affected by system clock updates. The reference point of
-   the returned value is undefined, so that only the difference between the
-   results of consecutive calls is valid.
-
-   The function cannot fail. _PyTime_Init() ensures that a monotonic clock
-   is available and works. */
-PyAPI_FUNC(_PyTime_t) _PyTime_GetMonotonicClock(void);
-
-
-/* Structure used by time.get_clock_info() */
-typedef struct {
-    const char *implementation;
-    int monotonic;
-    int adjustable;
-    double resolution;
-} _Py_clock_info_t;
-
-/* Get the current time from the system clock.
- * Fill clock information if info is not NULL.
- * Raise an exception and return -1 on error, return 0 on success.
- */
-PyAPI_FUNC(int) _PyTime_GetSystemClockWithInfo(
-    _PyTime_t *t,
-    _Py_clock_info_t *info);
-
-/* Get the time of a monotonic clock, i.e. a clock that cannot go backwards.
-   The clock is not affected by system clock updates. The reference point of
-   the returned value is undefined, so that only the difference between the
-   results of consecutive calls is valid.
-
-   Fill info (if set) with information of the function used to get the time.
-
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_GetMonotonicClockWithInfo(
-    _PyTime_t *t,
-    _Py_clock_info_t *info);
-
-
-/* Initialize time.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_Init(void);
-
-/* Converts a timestamp to the Gregorian time, using the local time zone.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_localtime(time_t t, struct tm *tm);
-
-/* Converts a timestamp to the Gregorian time, assuming UTC.
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_gmtime(time_t t, struct tm *tm);
-
-/* Get the performance counter: clock with the highest available resolution to
-   measure a short duration.
-
-   The function cannot fail. _PyTime_Init() ensures that the system clock
-   works. */
-PyAPI_FUNC(_PyTime_t) _PyTime_GetPerfCounter(void);
-
-/* Get the performance counter: clock with the highest available resolution to
-   measure a short duration.
-
-   Fill info (if set) with information of the function used to get the time.
-
-   Return 0 on success, raise an exception and return -1 on error. */
-PyAPI_FUNC(int) _PyTime_GetPerfCounterWithInfo(
-    _PyTime_t *t,
-    _Py_clock_info_t *info);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* Py_PYTIME_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/rangeobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/rangeobject.h
deleted file mode 100644
index d6af8473f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/rangeobject.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/* Range object interface */
-
-#ifndef Py_RANGEOBJECT_H
-#define Py_RANGEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-A range object represents an integer range.  This is an immutable object;
-a range cannot change its value after creation.
-
-Range objects behave like the corresponding tuple objects except that
-they are represented by a start, stop, and step datamembers.
-*/
-
-PyAPI_DATA(PyTypeObject) PyRange_Type;
-PyAPI_DATA(PyTypeObject) PyRangeIter_Type;
-PyAPI_DATA(PyTypeObject) PyLongRangeIter_Type;
-
-#define PyRange_Check(op) Py_IS_TYPE(op, &PyRange_Type)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_RANGEOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/setobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/setobject.h
deleted file mode 100644
index 119619ebe..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/setobject.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Set object interface */
-
-#ifndef Py_SETOBJECT_H
-#define Py_SETOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-
-/* There are three kinds of entries in the table:
-
-1. Unused:  key == NULL and hash == 0
-2. Dummy:   key == dummy and hash == -1
-3. Active:  key != NULL and key != dummy and hash != -1
-
-The hash field of Unused slots is always zero.
-
-The hash field of Dummy slots are set to -1
-meaning that dummy entries can be detected by
-either entry->key==dummy or by entry->hash==-1.
-*/
-
-#define PySet_MINSIZE 8
-
-typedef struct {
-    PyObject *key;
-    Py_hash_t hash;             /* Cached hash code of the key */
-} setentry;
-
-/* The SetObject data structure is shared by set and frozenset objects.
-
-Invariant for sets:
- - hash is -1
-
-Invariants for frozensets:
- - data is immutable.
- - hash is the hash of the frozenset or -1 if not computed yet.
-
-*/
-
-typedef struct {
-    PyObject_HEAD
-
-    Py_ssize_t fill;            /* Number active and dummy entries*/
-    Py_ssize_t used;            /* Number active entries */
-
-    /* The table contains mask + 1 slots, and that's a power of 2.
-     * We store the mask instead of the size because the mask is more
-     * frequently needed.
-     */
-    Py_ssize_t mask;
-
-    /* The table points to a fixed-size smalltable for small tables
-     * or to additional malloc'ed memory for bigger tables.
-     * The table pointer is never NULL which saves us from repeated
-     * runtime null-tests.
-     */
-    setentry *table;
-    Py_hash_t hash;             /* Only used by frozenset objects */
-    Py_ssize_t finger;          /* Search finger for pop() */
-
-    setentry smalltable[PySet_MINSIZE];
-    PyObject *weakreflist;      /* List of weak references */
-} PySetObject;
-
-#define PySet_GET_SIZE(so) (assert(PyAnySet_Check(so)),(((PySetObject *)(so))->used))
-
-PyAPI_DATA(PyObject *) _PySet_Dummy;
-
-PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, Py_hash_t *hash);
-PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable);
-
-#endif /* Section excluded by Py_LIMITED_API */
-
-PyAPI_DATA(PyTypeObject) PySet_Type;
-PyAPI_DATA(PyTypeObject) PyFrozenSet_Type;
-PyAPI_DATA(PyTypeObject) PySetIter_Type;
-
-PyAPI_FUNC(PyObject *) PySet_New(PyObject *);
-PyAPI_FUNC(PyObject *) PyFrozenSet_New(PyObject *);
-
-PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key);
-PyAPI_FUNC(int) PySet_Clear(PyObject *set);
-PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key);
-PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key);
-PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set);
-PyAPI_FUNC(Py_ssize_t) PySet_Size(PyObject *anyset);
-
-#define PyFrozenSet_CheckExact(ob) Py_IS_TYPE(ob, &PyFrozenSet_Type)
-#define PyAnySet_CheckExact(ob) \
-    (Py_IS_TYPE(ob, &PySet_Type) || Py_IS_TYPE(ob, &PyFrozenSet_Type))
-#define PyAnySet_Check(ob) \
-    (Py_IS_TYPE(ob, &PySet_Type) || Py_IS_TYPE(ob, &PyFrozenSet_Type) || \
-      PyType_IsSubtype(Py_TYPE(ob), &PySet_Type) || \
-      PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type))
-#define PySet_Check(ob) \
-    (Py_IS_TYPE(ob, &PySet_Type) || \
-    PyType_IsSubtype(Py_TYPE(ob), &PySet_Type))
-#define   PyFrozenSet_Check(ob) \
-    (Py_IS_TYPE(ob, &PyFrozenSet_Type) || \
-      PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type))
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SETOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/sliceobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/sliceobject.h
deleted file mode 100644
index 2c889508b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/sliceobject.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef Py_SLICEOBJECT_H
-#define Py_SLICEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The unique ellipsis object "..." */
-
-PyAPI_DATA(PyObject) _Py_EllipsisObject; /* Don't use this directly */
-
-#define Py_Ellipsis (&_Py_EllipsisObject)
-
-/* Slice object interface */
-
-/*
-
-A slice object containing start, stop, and step data members (the
-names are from range).  After much talk with Guido, it was decided to
-let these be any arbitrary python type.  Py_None stands for omitted values.
-*/
-#ifndef Py_LIMITED_API
-typedef struct {
-    PyObject_HEAD
-    PyObject *start, *stop, *step;      /* not NULL */
-} PySliceObject;
-#endif
-
-PyAPI_DATA(PyTypeObject) PySlice_Type;
-PyAPI_DATA(PyTypeObject) PyEllipsis_Type;
-
-#define PySlice_Check(op) Py_IS_TYPE(op, &PySlice_Type)
-
-PyAPI_FUNC(PyObject *) PySlice_New(PyObject* start, PyObject* stop,
-                                  PyObject* step);
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PySlice_FromIndices(Py_ssize_t start, Py_ssize_t stop);
-PyAPI_FUNC(int) _PySlice_GetLongIndices(PySliceObject *self, PyObject *length,
-                                 PyObject **start_ptr, PyObject **stop_ptr,
-                                 PyObject **step_ptr);
-#endif
-PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length,
-                                  Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
-Py_DEPRECATED(3.7)
-PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length,
-                                     Py_ssize_t *start, Py_ssize_t *stop,
-                                     Py_ssize_t *step,
-                                     Py_ssize_t *slicelength);
-
-#if !defined(Py_LIMITED_API) || (Py_LIMITED_API+0 >= 0x03050400 && Py_LIMITED_API+0 < 0x03060000) || Py_LIMITED_API+0 >= 0x03060100
-#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) (  \
-    PySlice_Unpack((slice), (start), (stop), (step)) < 0 ?                  \
-    ((*(slicelen) = 0), -1) :                                               \
-    ((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), \
-     0))
-PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice,
-                               Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);
-PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length,
-                                             Py_ssize_t *start, Py_ssize_t *stop,
-                                             Py_ssize_t step);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SLICEOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/structmember.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/structmember.h
deleted file mode 100644
index b54f7081f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/structmember.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef Py_STRUCTMEMBER_H
-#define Py_STRUCTMEMBER_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Interface to map C struct members to Python object attributes */
-
-#include <stddef.h> /* For offsetof */
-
-/* An array of PyMemberDef structures defines the name, type and offset
-   of selected members of a C structure.  These can be read by
-   PyMember_GetOne() and set by PyMember_SetOne() (except if their READONLY
-   flag is set).  The array must be terminated with an entry whose name
-   pointer is NULL. */
-
-typedef struct PyMemberDef {
-    const char *name;
-    int type;
-    Py_ssize_t offset;
-    int flags;
-    const char *doc;
-} PyMemberDef;
-
-/* Types */
-#define T_SHORT     0
-#define T_INT       1
-#define T_LONG      2
-#define T_FLOAT     3
-#define T_DOUBLE    4
-#define T_STRING    5
-#define T_OBJECT    6
-/* XXX the ordering here is weird for binary compatibility */
-#define T_CHAR      7   /* 1-character string */
-#define T_BYTE      8   /* 8-bit signed int */
-/* unsigned variants: */
-#define T_UBYTE     9
-#define T_USHORT    10
-#define T_UINT      11
-#define T_ULONG     12
-
-/* Added by Jack: strings contained in the structure */
-#define T_STRING_INPLACE    13
-
-/* Added by Lillo: bools contained in the structure (assumed char) */
-#define T_BOOL      14
-
-#define T_OBJECT_EX 16  /* Like T_OBJECT, but raises AttributeError
-                           when the value is NULL, instead of
-                           converting to None. */
-#define T_LONGLONG      17
-#define T_ULONGLONG     18
-
-#define T_PYSSIZET      19      /* Py_ssize_t */
-#define T_NONE          20      /* Value is always None */
-
-
-/* Flags */
-#define READONLY            1
-#define READ_RESTRICTED     2
-#define PY_WRITE_RESTRICTED 4
-#define RESTRICTED          (READ_RESTRICTED | PY_WRITE_RESTRICTED)
-
-
-/* Current API, use this */
-PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *);
-PyAPI_FUNC(int) PyMember_SetOne(char *, struct PyMemberDef *, PyObject *);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_STRUCTMEMBER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/structseq.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/structseq.h
deleted file mode 100644
index 8f51c8916..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/structseq.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
-/* Named tuple object interface */
-
-#ifndef Py_STRUCTSEQ_H
-#define Py_STRUCTSEQ_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct PyStructSequence_Field {
-    const char *name;
-    const char *doc;
-} PyStructSequence_Field;
-
-typedef struct PyStructSequence_Desc {
-    const char *name;
-    const char *doc;
-    struct PyStructSequence_Field *fields;
-    int n_in_sequence;
-} PyStructSequence_Desc;
-
-extern const char * const PyStructSequence_UnnamedField;
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(void) PyStructSequence_InitType(PyTypeObject *type,
-                                           PyStructSequence_Desc *desc);
-PyAPI_FUNC(int) PyStructSequence_InitType2(PyTypeObject *type,
-                                           PyStructSequence_Desc *desc);
-#endif
-PyAPI_FUNC(PyTypeObject*) PyStructSequence_NewType(PyStructSequence_Desc *desc);
-
-PyAPI_FUNC(PyObject *) PyStructSequence_New(PyTypeObject* type);
-
-#ifndef Py_LIMITED_API
-typedef PyTupleObject PyStructSequence;
-
-/* Macro, *only* to be used to fill in brand new objects */
-#define PyStructSequence_SET_ITEM(op, i, v) PyTuple_SET_ITEM(op, i, v)
-
-#define PyStructSequence_GET_ITEM(op, i) PyTuple_GET_ITEM(op, i)
-#endif
-
-PyAPI_FUNC(void) PyStructSequence_SetItem(PyObject*, Py_ssize_t, PyObject*);
-PyAPI_FUNC(PyObject*) PyStructSequence_GetItem(PyObject*, Py_ssize_t);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_STRUCTSEQ_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/symtable.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/symtable.h
deleted file mode 100644
index abd19a792..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/symtable.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_SYMTABLE_H
-#define Py_SYMTABLE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "Python-ast.h"   /* mod_ty */
-
-/* XXX(ncoghlan): This is a weird mix of public names and interpreter internal
- *                names.
- */
-
-typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock }
-    _Py_block_ty;
-
-struct _symtable_entry;
-
-struct symtable {
-    PyObject *st_filename;          /* name of file being compiled,
-                                       decoded from the filesystem encoding */
-    struct _symtable_entry *st_cur; /* current symbol table entry */
-    struct _symtable_entry *st_top; /* symbol table entry for module */
-    PyObject *st_blocks;            /* dict: map AST node addresses
-                                     *       to symbol table entries */
-    PyObject *st_stack;             /* list: stack of namespace info */
-    PyObject *st_global;            /* borrowed ref to st_top->ste_symbols */
-    int st_nblocks;                 /* number of blocks used. kept for
-                                       consistency with the corresponding
-                                       compiler structure */
-    PyObject *st_private;           /* name of current class or NULL */
-    PyFutureFeatures *st_future;    /* module's future features that affect
-                                       the symbol table */
-    int recursion_depth;            /* current recursion depth */
-    int recursion_limit;            /* recursion limit */
-};
-
-typedef struct _symtable_entry {
-    PyObject_HEAD
-    PyObject *ste_id;        /* int: key in ste_table->st_blocks */
-    PyObject *ste_symbols;   /* dict: variable names to flags */
-    PyObject *ste_name;      /* string: name of current block */
-    PyObject *ste_varnames;  /* list of function parameters */
-    PyObject *ste_children;  /* list of child blocks */
-    PyObject *ste_directives;/* locations of global and nonlocal statements */
-    _Py_block_ty ste_type;   /* module, class, or function */
-    int ste_nested;      /* true if block is nested */
-    unsigned ste_free : 1;        /* true if block has free variables */
-    unsigned ste_child_free : 1;  /* true if a child block has free vars,
-                                     including free refs to globals */
-    unsigned ste_generator : 1;   /* true if namespace is a generator */
-    unsigned ste_coroutine : 1;   /* true if namespace is a coroutine */
-    unsigned ste_comprehension : 1; /* true if namespace is a list comprehension */
-    unsigned ste_varargs : 1;     /* true if block has varargs */
-    unsigned ste_varkeywords : 1; /* true if block has varkeywords */
-    unsigned ste_returns_value : 1;  /* true if namespace uses return with
-                                        an argument */
-    unsigned ste_needs_class_closure : 1; /* for class scopes, true if a
-                                             closure over __class__
-                                             should be created */
-    unsigned ste_comp_iter_target : 1; /* true if visiting comprehension target */
-    int ste_comp_iter_expr; /* non-zero if visiting a comprehension range expression */
-    int ste_lineno;          /* first line of block */
-    int ste_col_offset;      /* offset of first line of block */
-    int ste_opt_lineno;      /* lineno of last exec or import * */
-    int ste_opt_col_offset;  /* offset of last exec or import * */
-    struct symtable *ste_table;
-} PySTEntryObject;
-
-PyAPI_DATA(PyTypeObject) PySTEntry_Type;
-
-#define PySTEntry_Check(op) Py_IS_TYPE(op, &PySTEntry_Type)
-
-PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *);
-
-PyAPI_FUNC(struct symtable *) PySymtable_Build(
-    mod_ty mod,
-    const char *filename,       /* decoded from the filesystem encoding */
-    PyFutureFeatures *future);
-PyAPI_FUNC(struct symtable *) PySymtable_BuildObject(
-    mod_ty mod,
-    PyObject *filename,
-    PyFutureFeatures *future);
-PyAPI_FUNC(PySTEntryObject *) PySymtable_Lookup(struct symtable *, void *);
-
-PyAPI_FUNC(void) PySymtable_Free(struct symtable *);
-
-/* Flags for def-use information */
-
-#define DEF_GLOBAL 1           /* global stmt */
-#define DEF_LOCAL 2            /* assignment in code block */
-#define DEF_PARAM 2<<1         /* formal parameter */
-#define DEF_NONLOCAL 2<<2      /* nonlocal stmt */
-#define USE 2<<3               /* name is used */
-#define DEF_FREE 2<<4          /* name used but not defined in nested block */
-#define DEF_FREE_CLASS 2<<5    /* free variable from class's method */
-#define DEF_IMPORT 2<<6        /* assignment occurred via import */
-#define DEF_ANNOT 2<<7         /* this name is annotated */
-#define DEF_COMP_ITER 2<<8     /* this name is a comprehension iteration variable */
-
-#define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT)
-
-/* GLOBAL_EXPLICIT and GLOBAL_IMPLICIT are used internally by the symbol
-   table.  GLOBAL is returned from PyST_GetScope() for either of them.
-   It is stored in ste_symbols at bits 12-15.
-*/
-#define SCOPE_OFFSET 11
-#define SCOPE_MASK (DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL)
-
-#define LOCAL 1
-#define GLOBAL_EXPLICIT 2
-#define GLOBAL_IMPLICIT 3
-#define FREE 4
-#define CELL 5
-
-#define GENERATOR 1
-#define GENERATOR_EXPRESSION 2
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SYMTABLE_H */
-#endif /* !Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/sysmodule.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/sysmodule.h
deleted file mode 100644
index 670e5d283..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/sysmodule.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* System module interface */
-
-#ifndef Py_SYSMODULE_H
-#define Py_SYSMODULE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-PyAPI_FUNC(PyObject *) PySys_GetObject(const char *);
-PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *);
-
-PyAPI_FUNC(void) PySys_SetArgv(int, wchar_t **);
-PyAPI_FUNC(void) PySys_SetArgvEx(int, wchar_t **, int);
-PyAPI_FUNC(void) PySys_SetPath(const wchar_t *);
-
-PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...)
-                 Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...)
-                 Py_GCC_ATTRIBUTE((format(printf, 1, 2)));
-PyAPI_FUNC(void) PySys_FormatStdout(const char *format, ...);
-PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...);
-
-PyAPI_FUNC(void) PySys_ResetWarnOptions(void);
-PyAPI_FUNC(void) PySys_AddWarnOption(const wchar_t *);
-PyAPI_FUNC(void) PySys_AddWarnOptionUnicode(PyObject *);
-PyAPI_FUNC(int) PySys_HasWarnOptions(void);
-
-PyAPI_FUNC(void) PySys_AddXOption(const wchar_t *);
-PyAPI_FUNC(PyObject *) PySys_GetXOptions(void);
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_SYSMODULE_H
-#  include  "cpython/sysmodule.h"
-#  undef Py_CPYTHON_SYSMODULE_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_SYSMODULE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/token.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/token.h
deleted file mode 100644
index 9b8a3aae0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/token.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Auto-generated by Tools/scripts/generate_token.py */
-
-/* Token types */
-#ifndef Py_LIMITED_API
-#ifndef Py_TOKEN_H
-#define Py_TOKEN_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef TILDE   /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */
-
-#define ENDMARKER       0
-#define NAME            1
-#define NUMBER          2
-#define STRING          3
-#define NEWLINE         4
-#define INDENT          5
-#define DEDENT          6
-#define LPAR            7
-#define RPAR            8
-#define LSQB            9
-#define RSQB            10
-#define COLON           11
-#define COMMA           12
-#define SEMI            13
-#define PLUS            14
-#define MINUS           15
-#define STAR            16
-#define SLASH           17
-#define VBAR            18
-#define AMPER           19
-#define LESS            20
-#define GREATER         21
-#define EQUAL           22
-#define DOT             23
-#define PERCENT         24
-#define LBRACE          25
-#define RBRACE          26
-#define EQEQUAL         27
-#define NOTEQUAL        28
-#define LESSEQUAL       29
-#define GREATEREQUAL    30
-#define TILDE           31
-#define CIRCUMFLEX      32
-#define LEFTSHIFT       33
-#define RIGHTSHIFT      34
-#define DOUBLESTAR      35
-#define PLUSEQUAL       36
-#define MINEQUAL        37
-#define STAREQUAL       38
-#define SLASHEQUAL      39
-#define PERCENTEQUAL    40
-#define AMPEREQUAL      41
-#define VBAREQUAL       42
-#define CIRCUMFLEXEQUAL 43
-#define LEFTSHIFTEQUAL  44
-#define RIGHTSHIFTEQUAL 45
-#define DOUBLESTAREQUAL 46
-#define DOUBLESLASH     47
-#define DOUBLESLASHEQUAL 48
-#define AT              49
-#define ATEQUAL         50
-#define RARROW          51
-#define ELLIPSIS        52
-#define COLONEQUAL      53
-#define OP              54
-#define AWAIT           55
-#define ASYNC           56
-#define TYPE_IGNORE     57
-#define TYPE_COMMENT    58
-#define ERRORTOKEN      59
-#define N_TOKENS        63
-#define NT_OFFSET       256
-
-/* Special definitions for cooperation with parser */
-
-#define ISTERMINAL(x)           ((x) < NT_OFFSET)
-#define ISNONTERMINAL(x)        ((x) >= NT_OFFSET)
-#define ISEOF(x)                ((x) == ENDMARKER)
-#define ISWHITESPACE(x)         ((x) == ENDMARKER || \
-                                 (x) == NEWLINE   || \
-                                 (x) == INDENT    || \
-                                 (x) == DEDENT)
-
-
-PyAPI_DATA(const char * const) _PyParser_TokenNames[]; /* Token names */
-PyAPI_FUNC(int) PyToken_OneChar(int);
-PyAPI_FUNC(int) PyToken_TwoChars(int, int);
-PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TOKEN_H */
-#endif /* Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/traceback.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/traceback.h
deleted file mode 100644
index 781e5a6ee..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/traceback.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef Py_TRACEBACK_H
-#define Py_TRACEBACK_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Traceback interface */
-
-PyAPI_FUNC(int) PyTraceBack_Here(PyFrameObject *);
-PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *);
-
-/* Reveal traceback type so we can typecheck traceback objects */
-PyAPI_DATA(PyTypeObject) PyTraceBack_Type;
-#define PyTraceBack_Check(v) Py_IS_TYPE(v, &PyTraceBack_Type)
-
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_TRACEBACK_H
-#  include  "cpython/traceback.h"
-#  undef Py_CPYTHON_TRACEBACK_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TRACEBACK_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/tracemalloc.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/tracemalloc.h
deleted file mode 100644
index bd14217c1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/tracemalloc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef Py_TRACEMALLOC_H
-#define Py_TRACEMALLOC_H
-
-#ifndef Py_LIMITED_API
-/* Track an allocated memory block in the tracemalloc module.
-   Return 0 on success, return -1 on error (failed to allocate memory to store
-   the trace).
-
-   Return -2 if tracemalloc is disabled.
-
-   If memory block is already tracked, update the existing trace. */
-PyAPI_FUNC(int) PyTraceMalloc_Track(
-    unsigned int domain,
-    uintptr_t ptr,
-    size_t size);
-
-/* Untrack an allocated memory block in the tracemalloc module.
-   Do nothing if the block was not tracked.
-
-   Return -2 if tracemalloc is disabled, otherwise return 0. */
-PyAPI_FUNC(int) PyTraceMalloc_Untrack(
-    unsigned int domain,
-    uintptr_t ptr);
-
-/* Get the traceback where a memory block was allocated.
-
-   Return a tuple of (filename: str, lineno: int) tuples.
-
-   Return None if the tracemalloc module is disabled or if the memory block
-   is not tracked by tracemalloc.
-
-   Raise an exception and return NULL on error. */
-PyAPI_FUNC(PyObject*) _PyTraceMalloc_GetTraceback(
-    unsigned int domain,
-    uintptr_t ptr);
-#endif
-
-#endif /* !Py_TRACEMALLOC_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/tupleobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/tupleobject.h
deleted file mode 100644
index e796a3201..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/tupleobject.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Tuple object interface */
-
-#ifndef Py_TUPLEOBJECT_H
-#define Py_TUPLEOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-Another generally useful object type is a tuple of object pointers.
-For Python, this is an immutable type.  C code can change the tuple items
-(but not their number), and even use tuples as general-purpose arrays of
-object references, but in general only brand new tuples should be mutated,
-not ones that might already have been exposed to Python code.
-
-*** WARNING *** PyTuple_SetItem does not increment the new item's reference
-count, but does decrement the reference count of the item it replaces,
-if not nil.  It does *decrement* the reference count if it is *not*
-inserted in the tuple.  Similarly, PyTuple_GetItem does not increment the
-returned item's reference count.
-*/
-
-PyAPI_DATA(PyTypeObject) PyTuple_Type;
-PyAPI_DATA(PyTypeObject) PyTupleIter_Type;
-
-#define PyTuple_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TUPLE_SUBCLASS)
-#define PyTuple_CheckExact(op) Py_IS_TYPE(op, &PyTuple_Type)
-
-PyAPI_FUNC(PyObject *) PyTuple_New(Py_ssize_t size);
-PyAPI_FUNC(Py_ssize_t) PyTuple_Size(PyObject *);
-PyAPI_FUNC(PyObject *) PyTuple_GetItem(PyObject *, Py_ssize_t);
-PyAPI_FUNC(int) PyTuple_SetItem(PyObject *, Py_ssize_t, PyObject *);
-PyAPI_FUNC(PyObject *) PyTuple_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t);
-PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...);
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_TUPLEOBJECT_H
-#  include  "cpython/tupleobject.h"
-#  undef Py_CPYTHON_TUPLEOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_TUPLEOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/typeslots.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/typeslots.h
deleted file mode 100644
index 64f6fff51..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/typeslots.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Do not renumber the file; these numbers are part of the stable ABI. */
-#if defined(Py_LIMITED_API)
-/* Disabled, see #10181 */
-#undef Py_bf_getbuffer
-#undef Py_bf_releasebuffer
-#else
-#define Py_bf_getbuffer 1
-#define Py_bf_releasebuffer 2
-#endif
-#define Py_mp_ass_subscript 3
-#define Py_mp_length 4
-#define Py_mp_subscript 5
-#define Py_nb_absolute 6
-#define Py_nb_add 7
-#define Py_nb_and 8
-#define Py_nb_bool 9
-#define Py_nb_divmod 10
-#define Py_nb_float 11
-#define Py_nb_floor_divide 12
-#define Py_nb_index 13
-#define Py_nb_inplace_add 14
-#define Py_nb_inplace_and 15
-#define Py_nb_inplace_floor_divide 16
-#define Py_nb_inplace_lshift 17
-#define Py_nb_inplace_multiply 18
-#define Py_nb_inplace_or 19
-#define Py_nb_inplace_power 20
-#define Py_nb_inplace_remainder 21
-#define Py_nb_inplace_rshift 22
-#define Py_nb_inplace_subtract 23
-#define Py_nb_inplace_true_divide 24
-#define Py_nb_inplace_xor 25
-#define Py_nb_int 26
-#define Py_nb_invert 27
-#define Py_nb_lshift 28
-#define Py_nb_multiply 29
-#define Py_nb_negative 30
-#define Py_nb_or 31
-#define Py_nb_positive 32
-#define Py_nb_power 33
-#define Py_nb_remainder 34
-#define Py_nb_rshift 35
-#define Py_nb_subtract 36
-#define Py_nb_true_divide 37
-#define Py_nb_xor 38
-#define Py_sq_ass_item 39
-#define Py_sq_concat 40
-#define Py_sq_contains 41
-#define Py_sq_inplace_concat 42
-#define Py_sq_inplace_repeat 43
-#define Py_sq_item 44
-#define Py_sq_length 45
-#define Py_sq_repeat 46
-#define Py_tp_alloc 47
-#define Py_tp_base 48
-#define Py_tp_bases 49
-#define Py_tp_call 50
-#define Py_tp_clear 51
-#define Py_tp_dealloc 52
-#define Py_tp_del 53
-#define Py_tp_descr_get 54
-#define Py_tp_descr_set 55
-#define Py_tp_doc 56
-#define Py_tp_getattr 57
-#define Py_tp_getattro 58
-#define Py_tp_hash 59
-#define Py_tp_init 60
-#define Py_tp_is_gc 61
-#define Py_tp_iter 62
-#define Py_tp_iternext 63
-#define Py_tp_methods 64
-#define Py_tp_new 65
-#define Py_tp_repr 66
-#define Py_tp_richcompare 67
-#define Py_tp_setattr 68
-#define Py_tp_setattro 69
-#define Py_tp_str 70
-#define Py_tp_traverse 71
-#define Py_tp_members 72
-#define Py_tp_getset 73
-#define Py_tp_free 74
-#define Py_nb_matrix_multiply 75
-#define Py_nb_inplace_matrix_multiply 76
-#define Py_am_await 77
-#define Py_am_aiter 78
-#define Py_am_anext 79
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
-/* New in 3.5 */
-#define Py_tp_finalize 80
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/ucnhash.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/ucnhash.h
deleted file mode 100644
index 45362e997..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/ucnhash.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Unicode name database interface */
-#ifndef Py_LIMITED_API
-#ifndef Py_UCNHASH_H
-#define Py_UCNHASH_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* revised ucnhash CAPI interface (exported through a "wrapper") */
-
-#define PyUnicodeData_CAPSULE_NAME "unicodedata.ucnhash_CAPI"
-
-typedef struct {
-
-    /* Size of this struct */
-    int size;
-
-    /* Get name for a given character code.  Returns non-zero if
-       success, zero if not.  Does not set Python exceptions.
-       If self is NULL, data come from the default version of the database.
-       If it is not NULL, it should be a unicodedata.ucd_X_Y_Z object */
-    int (*getname)(PyObject *self, Py_UCS4 code, char* buffer, int buflen,
-                   int with_alias_and_seq);
-
-    /* Get character code for a given name.  Same error handling
-       as for getname. */
-    int (*getcode)(PyObject *self, const char* name, int namelen, Py_UCS4* code,
-                   int with_named_seq);
-
-} _PyUnicode_Name_CAPI;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_UCNHASH_H */
-#endif /* !Py_LIMITED_API */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/unicodeobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/unicodeobject.h
deleted file mode 100644
index 500ce242e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/unicodeobject.h
+++ /dev/null
@@ -1,1033 +0,0 @@
-#ifndef Py_UNICODEOBJECT_H
-#define Py_UNICODEOBJECT_H
-
-#include <stdarg.h>
-
-/*
-
-Unicode implementation based on original code by Fredrik Lundh,
-modified by Marc-Andre Lemburg (mal@lemburg.com) according to the
-Unicode Integration Proposal. (See
-http://www.egenix.com/files/python/unicode-proposal.txt).
-
-Copyright (c) Corporation for National Research Initiatives.
-
-
- Original header:
- --------------------------------------------------------------------
-
- * Yet another Unicode string type for Python.  This type supports the
- * 16-bit Basic Multilingual Plane (BMP) only.
- *
- * Written by Fredrik Lundh, January 1999.
- *
- * Copyright (c) 1999 by Secret Labs AB.
- * Copyright (c) 1999 by Fredrik Lundh.
- *
- * fredrik@pythonware.com
- * http://www.pythonware.com
- *
- * --------------------------------------------------------------------
- * This Unicode String Type is
- *
- * Copyright (c) 1999 by Secret Labs AB
- * Copyright (c) 1999 by Fredrik Lundh
- *
- * By obtaining, using, and/or copying this software and/or its
- * associated documentation, you agree that you have read, understood,
- * and will comply with the following terms and conditions:
- *
- * Permission to use, copy, modify, and distribute this software and its
- * associated documentation for any purpose and without fee is hereby
- * granted, provided that the above copyright notice appears in all
- * copies, and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Secret Labs
- * AB or the author not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission.
- *
- * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * -------------------------------------------------------------------- */
-
-#include <ctype.h>
-
-/* === Internal API ======================================================= */
-
-/* --- Internal Unicode Format -------------------------------------------- */
-
-/* Python 3.x requires unicode */
-#define Py_USING_UNICODE
-
-#ifndef SIZEOF_WCHAR_T
-#error Must define SIZEOF_WCHAR_T
-#endif
-
-#define Py_UNICODE_SIZE SIZEOF_WCHAR_T
-
-/* If wchar_t can be used for UCS-4 storage, set Py_UNICODE_WIDE.
-   Otherwise, Unicode strings are stored as UCS-2 (with limited support
-   for UTF-16) */
-
-#if Py_UNICODE_SIZE >= 4
-#define Py_UNICODE_WIDE
-#endif
-
-/* Set these flags if the platform has "wchar.h" and the
-   wchar_t type is a 16-bit unsigned type */
-/* #define HAVE_WCHAR_H */
-/* #define HAVE_USABLE_WCHAR_T */
-
-/* If the compiler provides a wchar_t type we try to support it
-   through the interface functions PyUnicode_FromWideChar(),
-   PyUnicode_AsWideChar() and PyUnicode_AsWideCharString(). */
-
-#ifdef HAVE_USABLE_WCHAR_T
-# ifndef HAVE_WCHAR_H
-#  define HAVE_WCHAR_H
-# endif
-#endif
-
-#ifdef HAVE_WCHAR_H
-#  include <wchar.h>
-#endif
-
-/* Py_UCS4 and Py_UCS2 are typedefs for the respective
-   unicode representations. */
-typedef uint32_t Py_UCS4;
-typedef uint16_t Py_UCS2;
-typedef uint8_t Py_UCS1;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-PyAPI_DATA(PyTypeObject) PyUnicode_Type;
-PyAPI_DATA(PyTypeObject) PyUnicodeIter_Type;
-
-#define PyUnicode_Check(op) \
-                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_UNICODE_SUBCLASS)
-#define PyUnicode_CheckExact(op) Py_IS_TYPE(op, &PyUnicode_Type)
-
-/* --- Constants ---------------------------------------------------------- */
-
-/* This Unicode character will be used as replacement character during
-   decoding if the errors argument is set to "replace". Note: the
-   Unicode character U+FFFD is the official REPLACEMENT CHARACTER in
-   Unicode 3.0. */
-
-#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UCS4) 0xFFFD)
-
-/* === Public API ========================================================= */
-
-/* Similar to PyUnicode_FromUnicode(), but u points to UTF-8 encoded bytes */
-PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize(
-    const char *u,             /* UTF-8 encoded string */
-    Py_ssize_t size            /* size of buffer */
-    );
-
-/* Similar to PyUnicode_FromUnicode(), but u points to null-terminated
-   UTF-8 encoded bytes.  The size is determined with strlen(). */
-PyAPI_FUNC(PyObject*) PyUnicode_FromString(
-    const char *u              /* UTF-8 encoded string */
-    );
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyUnicode_Substring(
-    PyObject *str,
-    Py_ssize_t start,
-    Py_ssize_t end);
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Copy the string into a UCS4 buffer including the null character if copy_null
-   is set. Return NULL and raise an exception on error. Raise a SystemError if
-   the buffer is smaller than the string. Return buffer on success.
-
-   buflen is the length of the buffer in (Py_UCS4) characters. */
-PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4(
-    PyObject *unicode,
-    Py_UCS4* buffer,
-    Py_ssize_t buflen,
-    int copy_null);
-
-/* Copy the string into a UCS4 buffer. A new buffer is allocated using
- * PyMem_Malloc; if this fails, NULL is returned with a memory error
-   exception set. */
-PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4Copy(PyObject *unicode);
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Get the length of the Unicode object. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_GetLength(
-    PyObject *unicode
-);
-#endif
-
-/* Get the number of Py_UNICODE units in the
-   string representation. */
-
-Py_DEPRECATED(3.3) PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Read a character from the string. */
-
-PyAPI_FUNC(Py_UCS4) PyUnicode_ReadChar(
-    PyObject *unicode,
-    Py_ssize_t index
-    );
-
-/* Write a character to the string. The string must have been created through
-   PyUnicode_New, must not be shared, and must not have been hashed yet.
-
-   Return 0 on success, -1 on error. */
-
-PyAPI_FUNC(int) PyUnicode_WriteChar(
-    PyObject *unicode,
-    Py_ssize_t index,
-    Py_UCS4 character
-    );
-#endif
-
-/* Resize a Unicode object. The length is the number of characters, except
-   if the kind of the string is PyUnicode_WCHAR_KIND: in this case, the length
-   is the number of Py_UNICODE characters.
-
-   *unicode is modified to point to the new (resized) object and 0
-   returned on success.
-
-   Try to resize the string in place (which is usually faster than allocating
-   a new string and copy characters), or create a new string.
-
-   Error handling is implemented as follows: an exception is set, -1
-   is returned and *unicode left untouched.
-
-   WARNING: The function doesn't check string content, the result may not be a
-            string in canonical representation. */
-
-PyAPI_FUNC(int) PyUnicode_Resize(
-    PyObject **unicode,         /* Pointer to the Unicode object */
-    Py_ssize_t length           /* New length */
-    );
-
-/* Decode obj to a Unicode object.
-
-   bytes, bytearray and other bytes-like objects are decoded according to the
-   given encoding and error handler. The encoding and error handler can be
-   NULL to have the interface use UTF-8 and "strict".
-
-   All other objects (including Unicode objects) raise an exception.
-
-   The API returns NULL in case of an error. The caller is responsible
-   for decref'ing the returned objects.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject(
-    PyObject *obj,              /* Object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Copy an instance of a Unicode subtype to a new true Unicode object if
-   necessary. If obj is already a true Unicode object (not a subtype), return
-   the reference with *incremented* refcount.
-
-   The API returns NULL in case of an error. The caller is responsible
-   for decref'ing the returned objects.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromObject(
-    PyObject *obj      /* Object */
-    );
-
-PyAPI_FUNC(PyObject *) PyUnicode_FromFormatV(
-    const char *format,   /* ASCII-encoded string  */
-    va_list vargs
-    );
-PyAPI_FUNC(PyObject *) PyUnicode_FromFormat(
-    const char *format,   /* ASCII-encoded string  */
-    ...
-    );
-
-PyAPI_FUNC(void) PyUnicode_InternInPlace(PyObject **);
-PyAPI_FUNC(void) PyUnicode_InternImmortal(PyObject **);
-PyAPI_FUNC(PyObject *) PyUnicode_InternFromString(
-    const char *u              /* UTF-8 encoded string */
-    );
-
-/* Use only if you know it's a string */
-#define PyUnicode_CHECK_INTERNED(op) \
-    (((PyASCIIObject *)(op))->state.interned)
-
-/* --- wchar_t support for platforms which support it --------------------- */
-
-#ifdef HAVE_WCHAR_H
-
-/* Create a Unicode Object from the wchar_t buffer w of the given
-   size.
-
-   The buffer is copied into the new object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar(
-    const wchar_t *w,           /* wchar_t buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-/* Copies the Unicode Object contents into the wchar_t buffer w.  At
-   most size wchar_t characters are copied.
-
-   Note that the resulting wchar_t string may or may not be
-   0-terminated.  It is the responsibility of the caller to make sure
-   that the wchar_t string is 0-terminated in case this is required by
-   the application.
-
-   Returns the number of wchar_t characters copied (excluding a
-   possibly trailing 0-termination character) or -1 in case of an
-   error. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar(
-    PyObject *unicode,          /* Unicode object */
-    wchar_t *w,                 /* wchar_t buffer */
-    Py_ssize_t size             /* size of buffer */
-    );
-
-/* Convert the Unicode object to a wide character string. The output string
-   always ends with a nul character. If size is not NULL, write the number of
-   wide characters (excluding the null character) into *size.
-
-   Returns a buffer allocated by PyMem_Malloc() (use PyMem_Free() to free it)
-   on success. On error, returns NULL, *size is undefined and raises a
-   MemoryError. */
-
-PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString(
-    PyObject *unicode,          /* Unicode object */
-    Py_ssize_t *size            /* number of characters of the result */
-    );
-
-#endif
-
-/* --- Unicode ordinals --------------------------------------------------- */
-
-/* Create a Unicode Object from the given Unicode code point ordinal.
-
-   The ordinal must be in range(0x110000). A ValueError is
-   raised in case it is not.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal);
-
-/* === Builtin Codecs =====================================================
-
-   Many of these APIs take two arguments encoding and errors. These
-   parameters encoding and errors have the same semantics as the ones
-   of the builtin str() API.
-
-   Setting encoding to NULL causes the default encoding (UTF-8) to be used.
-
-   Error handling is set by errors which may also be set to NULL
-   meaning to use the default handling defined for the codec. Default
-   error handling for all builtin codecs is "strict" (ValueErrors are
-   raised).
-
-   The codecs all use a similar interface. Only deviation from the
-   generic ones are documented.
-
-*/
-
-/* --- Manage the default encoding ---------------------------------------- */
-
-/* Returns "utf-8".  */
-PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void);
-
-/* --- Generic Codecs ----------------------------------------------------- */
-
-/* Create a Unicode object by decoding the encoded string s of the
-   given size. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Decode(
-    const char *s,              /* encoded string */
-    Py_ssize_t size,            /* size of buffer */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Decode a Unicode object unicode and return the result as Python
-   object.
-
-   This API is DEPRECATED. The only supported standard encoding is rot13.
-   Use PyCodec_Decode() to decode with rot13 and non-standard codecs
-   that decode from str. */
-
-Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Decode a Unicode object unicode and return the result as Unicode
-   object.
-
-   This API is DEPRECATED. The only supported standard encoding is rot13.
-   Use PyCodec_Decode() to decode with rot13 and non-standard codecs
-   that decode from str to str. */
-
-Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a Unicode object and returns the result as Python
-   object.
-
-   This API is DEPRECATED.  It is superseded by PyUnicode_AsEncodedString()
-   since all standard encodings (except rot13) encode str to bytes.
-   Use PyCodec_Encode() for encoding with rot13 and non-standard codecs
-   that encode form str to non-bytes. */
-
-Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a Unicode object and returns the result as Python string
-   object. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a Unicode object and returns the result as Unicode
-   object.
-
-   This API is DEPRECATED.  The only supported standard encodings is rot13.
-   Use PyCodec_Encode() to encode with rot13 and non-standard codecs
-   that encode from str to str. */
-
-Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedUnicode(
-    PyObject *unicode,          /* Unicode object */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Build an encoding map. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap(
-    PyObject* string            /* 256 character map */
-   );
-
-/* --- UTF-7 Codecs ------------------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7(
-    const char *string,         /* UTF-7 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful(
-    const char *string,         /* UTF-7 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-/* --- UTF-8 Codecs ------------------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8(
-    const char *string,         /* UTF-8 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful(
-    const char *string,         /* UTF-8 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* --- UTF-32 Codecs ------------------------------------------------------ */
-
-/* Decodes length bytes from a UTF-32 encoded buffer string and returns
-   the corresponding Unicode object.
-
-   errors (if non-NULL) defines the error handling. It defaults
-   to "strict".
-
-   If byteorder is non-NULL, the decoder starts decoding using the
-   given byte order:
-
-    *byteorder == -1: little endian
-    *byteorder == 0:  native order
-    *byteorder == 1:  big endian
-
-   In native mode, the first four bytes of the stream are checked for a
-   BOM mark. If found, the BOM mark is analysed, the byte order
-   adjusted and the BOM skipped.  In the other modes, no BOM mark
-   interpretation is done. After completion, *byteorder is set to the
-   current byte order at the end of input data.
-
-   If byteorder is NULL, the codec starts in native order mode.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32(
-    const char *string,         /* UTF-32 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder              /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32Stateful(
-    const char *string,         /* UTF-32 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder,             /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-/* Returns a Python string using the UTF-32 encoding in native byte
-   order. The string always starts with a BOM mark.  */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF32String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* Returns a Python string object holding the UTF-32 encoded value of
-   the Unicode data.
-
-   If byteorder is not 0, output is written according to the following
-   byte order:
-
-   byteorder == -1: little endian
-   byteorder == 0:  native byte order (writes a BOM mark)
-   byteorder == 1:  big endian
-
-   If byteorder is 0, the output string will always start with the
-   Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is
-   prepended.
-
-*/
-
-/* --- UTF-16 Codecs ------------------------------------------------------ */
-
-/* Decodes length bytes from a UTF-16 encoded buffer string and returns
-   the corresponding Unicode object.
-
-   errors (if non-NULL) defines the error handling. It defaults
-   to "strict".
-
-   If byteorder is non-NULL, the decoder starts decoding using the
-   given byte order:
-
-    *byteorder == -1: little endian
-    *byteorder == 0:  native order
-    *byteorder == 1:  big endian
-
-   In native mode, the first two bytes of the stream are checked for a
-   BOM mark. If found, the BOM mark is analysed, the byte order
-   adjusted and the BOM skipped.  In the other modes, no BOM mark
-   interpretation is done. After completion, *byteorder is set to the
-   current byte order at the end of input data.
-
-   If byteorder is NULL, the codec starts in native order mode.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16(
-    const char *string,         /* UTF-16 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder              /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful(
-    const char *string,         /* UTF-16 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    int *byteorder,             /* pointer to byteorder to use
-                                   0=native;-1=LE,1=BE; updated on
-                                   exit */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-/* Returns a Python string using the UTF-16 encoding in native byte
-   order. The string always starts with a BOM mark.  */
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* --- Unicode-Escape Codecs ---------------------------------------------- */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape(
-    const char *string,         /* Unicode-Escape encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape(
-    const char *string,         /* Raw-Unicode-Escape encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* --- Latin-1 Codecs -----------------------------------------------------
-
-   Note: Latin-1 corresponds to the first 256 Unicode ordinals. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1(
-    const char *string,         /* Latin-1 encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* --- ASCII Codecs -------------------------------------------------------
-
-   Only 7-bit ASCII data is excepted. All other codes generate errors.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII(
-    const char *string,         /* ASCII encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-/* --- Character Map Codecs -----------------------------------------------
-
-   This codec uses mappings to encode and decode characters.
-
-   Decoding mappings must map byte ordinals (integers in the range from 0 to
-   255) to Unicode strings, integers (which are then interpreted as Unicode
-   ordinals) or None.  Unmapped data bytes (ones which cause a LookupError)
-   as well as mapped to None, 0xFFFE or '\ufffe' are treated as "undefined
-   mapping" and cause an error.
-
-   Encoding mappings must map Unicode ordinal integers to bytes objects,
-   integers in the range from 0 to 255 or None.  Unmapped character
-   ordinals (ones which cause a LookupError) as well as mapped to
-   None are treated as "undefined mapping" and cause an error.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap(
-    const char *string,         /* Encoded string */
-    Py_ssize_t length,          /* size of string */
-    PyObject *mapping,          /* decoding mapping */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString(
-    PyObject *unicode,          /* Unicode object */
-    PyObject *mapping           /* encoding mapping */
-    );
-
-/* --- MBCS codecs for Windows -------------------------------------------- */
-
-#ifdef MS_WINDOWS
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS(
-    const char *string,         /* MBCS encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors          /* error handling */
-    );
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful(
-    const char *string,         /* MBCS encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeCodePageStateful(
-    int code_page,              /* code page number */
-    const char *string,         /* encoded string */
-    Py_ssize_t length,          /* size of string */
-    const char *errors,         /* error handling */
-    Py_ssize_t *consumed        /* bytes consumed */
-    );
-#endif
-
-PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString(
-    PyObject *unicode           /* Unicode object */
-    );
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeCodePage(
-    int code_page,              /* code page number */
-    PyObject *unicode,          /* Unicode object */
-    const char *errors          /* error handling */
-    );
-#endif
-
-#endif /* MS_WINDOWS */
-
-/* --- Locale encoding --------------------------------------------------- */
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Decode a string from the current locale encoding. The decoder is strict if
-   *surrogateescape* is equal to zero, otherwise it uses the 'surrogateescape'
-   error handler (PEP 383) to escape undecodable bytes. If a byte sequence can
-   be decoded as a surrogate character and *surrogateescape* is not equal to
-   zero, the byte sequence is escaped using the 'surrogateescape' error handler
-   instead of being decoded. *str* must end with a null character but cannot
-   contain embedded null characters. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocaleAndSize(
-    const char *str,
-    Py_ssize_t len,
-    const char *errors);
-
-/* Similar to PyUnicode_DecodeLocaleAndSize(), but compute the string
-   length using strlen(). */
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocale(
-    const char *str,
-    const char *errors);
-
-/* Encode a Unicode object to the current locale encoding. The encoder is
-   strict is *surrogateescape* is equal to zero, otherwise the
-   "surrogateescape" error handler is used. Return a bytes object. The string
-   cannot contain embedded null characters. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeLocale(
-    PyObject *unicode,
-    const char *errors
-    );
-#endif
-
-/* --- File system encoding ---------------------------------------------- */
-
-/* ParseTuple converter: encode str objects to bytes using
-   PyUnicode_EncodeFSDefault(); bytes objects are output as-is. */
-
-PyAPI_FUNC(int) PyUnicode_FSConverter(PyObject*, void*);
-
-/* ParseTuple converter: decode bytes objects to unicode using
-   PyUnicode_DecodeFSDefaultAndSize(); str objects are output as-is. */
-
-PyAPI_FUNC(int) PyUnicode_FSDecoder(PyObject*, void*);
-
-/* Decode a null-terminated string using Py_FileSystemDefaultEncoding
-   and the "surrogateescape" error handler.
-
-   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
-   encoding.
-
-   Use PyUnicode_DecodeFSDefaultAndSize() if the string length is known.
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefault(
-    const char *s               /* encoded string */
-    );
-
-/* Decode a string using Py_FileSystemDefaultEncoding
-   and the "surrogateescape" error handler.
-
-   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
-   encoding.
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize(
-    const char *s,               /* encoded string */
-    Py_ssize_t size              /* size */
-    );
-
-/* Encode a Unicode object to Py_FileSystemDefaultEncoding with the
-   "surrogateescape" error handler, and return bytes.
-
-   If Py_FileSystemDefaultEncoding is not set, fall back to the locale
-   encoding.
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_EncodeFSDefault(
-    PyObject *unicode
-    );
-
-/* --- Methods & Slots ----------------------------------------------------
-
-   These are capable of handling Unicode objects and strings on input
-   (we refer to them as strings in the descriptions) and return
-   Unicode objects or integers as appropriate. */
-
-/* Concat two strings giving a new Unicode string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Concat(
-    PyObject *left,             /* Left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Concat two strings and put the result in *pleft
-   (sets *pleft to NULL on error) */
-
-PyAPI_FUNC(void) PyUnicode_Append(
-    PyObject **pleft,           /* Pointer to left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Concat two strings, put the result in *pleft and drop the right object
-   (sets *pleft to NULL on error) */
-
-PyAPI_FUNC(void) PyUnicode_AppendAndDel(
-    PyObject **pleft,           /* Pointer to left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Split a string giving a list of Unicode strings.
-
-   If sep is NULL, splitting will be done at all whitespace
-   substrings. Otherwise, splits occur at the given separator.
-
-   At most maxsplit splits will be done. If negative, no limit is set.
-
-   Separators are not included in the resulting list.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_Split(
-    PyObject *s,                /* String to split */
-    PyObject *sep,              /* String separator */
-    Py_ssize_t maxsplit         /* Maxsplit count */
-    );
-
-/* Dito, but split at line breaks.
-
-   CRLF is considered to be one line break. Line breaks are not
-   included in the resulting list. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Splitlines(
-    PyObject *s,                /* String to split */
-    int keepends                /* If true, line end markers are included */
-    );
-
-/* Partition a string using a given separator. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Partition(
-    PyObject *s,                /* String to partition */
-    PyObject *sep               /* String separator */
-    );
-
-/* Partition a string using a given separator, searching from the end of the
-   string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_RPartition(
-    PyObject *s,                /* String to partition */
-    PyObject *sep               /* String separator */
-    );
-
-/* Split a string giving a list of Unicode strings.
-
-   If sep is NULL, splitting will be done at all whitespace
-   substrings. Otherwise, splits occur at the given separator.
-
-   At most maxsplit splits will be done. But unlike PyUnicode_Split
-   PyUnicode_RSplit splits from the end of the string. If negative,
-   no limit is set.
-
-   Separators are not included in the resulting list.
-
-*/
-
-PyAPI_FUNC(PyObject*) PyUnicode_RSplit(
-    PyObject *s,                /* String to split */
-    PyObject *sep,              /* String separator */
-    Py_ssize_t maxsplit         /* Maxsplit count */
-    );
-
-/* Translate a string by applying a character mapping table to it and
-   return the resulting Unicode object.
-
-   The mapping table must map Unicode ordinal integers to Unicode strings,
-   Unicode ordinal integers or None (causing deletion of the character).
-
-   Mapping tables may be dictionaries or sequences. Unmapped character
-   ordinals (ones which cause a LookupError) are left untouched and
-   are copied as-is.
-
-*/
-
-PyAPI_FUNC(PyObject *) PyUnicode_Translate(
-    PyObject *str,              /* String */
-    PyObject *table,            /* Translate table */
-    const char *errors          /* error handling */
-    );
-
-/* Join a sequence of strings using the given separator and return
-   the resulting Unicode string. */
-
-PyAPI_FUNC(PyObject*) PyUnicode_Join(
-    PyObject *separator,        /* Separator string */
-    PyObject *seq               /* Sequence object */
-    );
-
-/* Return 1 if substr matches str[start:end] at the given tail end, 0
-   otherwise. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Prefix or Suffix string */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end,             /* Stop index */
-    int direction               /* Tail end: -1 prefix, +1 suffix */
-    );
-
-/* Return the first position of substr in str[start:end] using the
-   given search direction or -1 if not found. -2 is returned in case
-   an error occurred and an exception is set. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Find(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to find */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end,             /* Stop index */
-    int direction               /* Find direction: +1 forward, -1 backward */
-    );
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
-/* Like PyUnicode_Find, but search for single character only. */
-PyAPI_FUNC(Py_ssize_t) PyUnicode_FindChar(
-    PyObject *str,
-    Py_UCS4 ch,
-    Py_ssize_t start,
-    Py_ssize_t end,
-    int direction
-    );
-#endif
-
-/* Count the number of occurrences of substr in str[start:end]. */
-
-PyAPI_FUNC(Py_ssize_t) PyUnicode_Count(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to count */
-    Py_ssize_t start,           /* Start index */
-    Py_ssize_t end              /* Stop index */
-    );
-
-/* Replace at most maxcount occurrences of substr in str with replstr
-   and return the resulting Unicode object. */
-
-PyAPI_FUNC(PyObject *) PyUnicode_Replace(
-    PyObject *str,              /* String */
-    PyObject *substr,           /* Substring to find */
-    PyObject *replstr,          /* Substring to replace */
-    Py_ssize_t maxcount         /* Max. number of replacements to apply;
-                                   -1 = all */
-    );
-
-/* Compare two strings and return -1, 0, 1 for less than, equal,
-   greater than resp.
-   Raise an exception and return -1 on error. */
-
-PyAPI_FUNC(int) PyUnicode_Compare(
-    PyObject *left,             /* Left string */
-    PyObject *right             /* Right string */
-    );
-
-/* Compare a Unicode object with C string and return -1, 0, 1 for less than,
-   equal, and greater than, respectively.  It is best to pass only
-   ASCII-encoded strings, but the function interprets the input string as
-   ISO-8859-1 if it contains non-ASCII characters.
-   This function does not raise exceptions. */
-
-PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString(
-    PyObject *left,
-    const char *right           /* ASCII-encoded string */
-    );
-
-/* Rich compare two strings and return one of the following:
-
-   - NULL in case an exception was raised
-   - Py_True or Py_False for successful comparisons
-   - Py_NotImplemented in case the type combination is unknown
-
-   Possible values for op:
-
-     Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE
-
-*/
-
-PyAPI_FUNC(PyObject *) PyUnicode_RichCompare(
-    PyObject *left,             /* Left string */
-    PyObject *right,            /* Right string */
-    int op                      /* Operation: Py_EQ, Py_NE, Py_GT, etc. */
-    );
-
-/* Apply an argument tuple or dictionary to a format string and return
-   the resulting Unicode string. */
-
-PyAPI_FUNC(PyObject *) PyUnicode_Format(
-    PyObject *format,           /* Format string */
-    PyObject *args              /* Argument tuple or dictionary */
-    );
-
-/* Checks whether element is contained in container and return 1/0
-   accordingly.
-
-   element has to coerce to a one element Unicode string. -1 is
-   returned in case of an error. */
-
-PyAPI_FUNC(int) PyUnicode_Contains(
-    PyObject *container,        /* Container string */
-    PyObject *element           /* Element string */
-    );
-
-/* Checks whether argument is a valid identifier. */
-
-PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s);
-
-/* === Characters Type APIs =============================================== */
-
-#ifndef Py_LIMITED_API
-#  define Py_CPYTHON_UNICODEOBJECT_H
-#  include  "cpython/unicodeobject.h"
-#  undef Py_CPYTHON_UNICODEOBJECT_H
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_UNICODEOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/warnings.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/warnings.h
deleted file mode 100644
index a675bb5df..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/warnings.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef Py_WARNINGS_H
-#define Py_WARNINGS_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) _PyWarnings_Init(void);
-#endif
-
-PyAPI_FUNC(int) PyErr_WarnEx(
-    PyObject *category,
-    const char *message,        /* UTF-8 encoded string */
-    Py_ssize_t stack_level);
-PyAPI_FUNC(int) PyErr_WarnFormat(
-    PyObject *category,
-    Py_ssize_t stack_level,
-    const char *format,         /* ASCII-encoded string  */
-    ...);
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-/* Emit a ResourceWarning warning */
-PyAPI_FUNC(int) PyErr_ResourceWarning(
-    PyObject *source,
-    Py_ssize_t stack_level,
-    const char *format,         /* ASCII-encoded string  */
-    ...);
-#endif
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int) PyErr_WarnExplicitObject(
-    PyObject *category,
-    PyObject *message,
-    PyObject *filename,
-    int lineno,
-    PyObject *module,
-    PyObject *registry);
-#endif
-PyAPI_FUNC(int) PyErr_WarnExplicit(
-    PyObject *category,
-    const char *message,        /* UTF-8 encoded string */
-    const char *filename,       /* decoded from the filesystem encoding */
-    int lineno,
-    const char *module,         /* UTF-8 encoded string */
-    PyObject *registry);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(int)
-PyErr_WarnExplicitFormat(PyObject *category,
-                         const char *filename, int lineno,
-                         const char *module, PyObject *registry,
-                         const char *format, ...);
-#endif
-
-/* DEPRECATED: Use PyErr_WarnEx() instead. */
-#ifndef Py_LIMITED_API
-#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1)
-#endif
-
-#ifndef Py_LIMITED_API
-void _PyErr_WarnUnawaitedCoroutine(PyObject *coro);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_WARNINGS_H */
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/weakrefobject.h b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/weakrefobject.h
deleted file mode 100644
index ac4b4821c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/Include/weakrefobject.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Weak references objects for Python. */
-
-#ifndef Py_WEAKREFOBJECT_H
-#define Py_WEAKREFOBJECT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-typedef struct _PyWeakReference PyWeakReference;
-
-/* PyWeakReference is the base struct for the Python ReferenceType, ProxyType,
- * and CallableProxyType.
- */
-#ifndef Py_LIMITED_API
-struct _PyWeakReference {
-    PyObject_HEAD
-
-    /* The object to which this is a weak reference, or Py_None if none.
-     * Note that this is a stealth reference:  wr_object's refcount is
-     * not incremented to reflect this pointer.
-     */
-    PyObject *wr_object;
-
-    /* A callable to invoke when wr_object dies, or NULL if none. */
-    PyObject *wr_callback;
-
-    /* A cache for wr_object's hash code.  As usual for hashes, this is -1
-     * if the hash code isn't known yet.
-     */
-    Py_hash_t hash;
-
-    /* If wr_object is weakly referenced, wr_object has a doubly-linked NULL-
-     * terminated list of weak references to it.  These are the list pointers.
-     * If wr_object goes away, wr_object is set to Py_None, and these pointers
-     * have no meaning then.
-     */
-    PyWeakReference *wr_prev;
-    PyWeakReference *wr_next;
-};
-#endif
-
-PyAPI_DATA(PyTypeObject) _PyWeakref_RefType;
-PyAPI_DATA(PyTypeObject) _PyWeakref_ProxyType;
-PyAPI_DATA(PyTypeObject) _PyWeakref_CallableProxyType;
-
-#define PyWeakref_CheckRef(op) PyObject_TypeCheck(op, &_PyWeakref_RefType)
-#define PyWeakref_CheckRefExact(op) \
-        Py_IS_TYPE(op, &_PyWeakref_RefType)
-#define PyWeakref_CheckProxy(op) \
-        (Py_IS_TYPE(op, &_PyWeakref_ProxyType) || \
-         Py_IS_TYPE(op, &_PyWeakref_CallableProxyType))
-
-#define PyWeakref_Check(op) \
-        (PyWeakref_CheckRef(op) || PyWeakref_CheckProxy(op))
-
-
-PyAPI_FUNC(PyObject *) PyWeakref_NewRef(PyObject *ob,
-                                              PyObject *callback);
-PyAPI_FUNC(PyObject *) PyWeakref_NewProxy(PyObject *ob,
-                                                PyObject *callback);
-PyAPI_FUNC(PyObject *) PyWeakref_GetObject(PyObject *ref);
-
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(Py_ssize_t) _PyWeakref_GetWeakrefCount(PyWeakReference *head);
-
-PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self);
-#endif
-
-/* Explanation for the Py_REFCNT() check: when a weakref's target is part
-   of a long chain of deallocations which triggers the trashcan mechanism,
-   clearing the weakrefs can be delayed long after the target's refcount
-   has dropped to zero.  In the meantime, code accessing the weakref will
-   be able to "see" the target object even though it is supposed to be
-   unreachable.  See issue #16602. */
-
-#define PyWeakref_GET_OBJECT(ref)                           \
-    (Py_REFCNT(((PyWeakReference *)(ref))->wr_object) > 0   \
-     ? ((PyWeakReference *)(ref))->wr_object                \
-     : Py_None)
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_WEAKREFOBJECT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/LICENSE
deleted file mode 100644
index 473861da1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/python3.9/LICENSE
+++ /dev/null
@@ -1,279 +0,0 @@
-A. HISTORY OF THE SOFTWARE
-==========================
-
-Python was created in the early 1990s by Guido van Rossum at Stichting
-Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
-as a successor of a language called ABC.  Guido remains Python's
-principal author, although it includes many contributions from others.
-
-In 1995, Guido continued his work on Python at the Corporation for
-National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
-in Reston, Virginia where he released several versions of the
-software.
-
-In May 2000, Guido and the Python core development team moved to
-BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
-year, the PythonLabs team moved to Digital Creations, which became
-Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
-https://www.python.org/psf/) was formed, a non-profit organization
-created specifically to own Python-related Intellectual Property.
-Zope Corporation was a sponsoring member of the PSF.
-
-All Python releases are Open Source (see http://www.opensource.org for
-the Open Source Definition).  Historically, most, but not all, Python
-releases have also been GPL-compatible; the table below summarizes
-the various releases.
-
-    Release         Derived     Year        Owner       GPL-
-                    from                                compatible? (1)
-
-    0.9.0 thru 1.2              1991-1995   CWI         yes
-    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
-    1.6             1.5.2       2000        CNRI        no
-    2.0             1.6         2000        BeOpen.com  no
-    1.6.1           1.6         2001        CNRI        yes (2)
-    2.1             2.0+1.6.1   2001        PSF         no
-    2.0.1           2.0+1.6.1   2001        PSF         yes
-    2.1.1           2.1+2.0.1   2001        PSF         yes
-    2.1.2           2.1.1       2002        PSF         yes
-    2.1.3           2.1.2       2002        PSF         yes
-    2.2 and above   2.1.1       2001-now    PSF         yes
-
-Footnotes:
-
-(1) GPL-compatible doesn't mean that we're distributing Python under
-    the GPL.  All Python licenses, unlike the GPL, let you distribute
-    a modified version without making your changes open source.  The
-    GPL-compatible licenses make it possible to combine Python with
-    other software that is released under the GPL; the others don't.
-
-(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
-    because its license has a choice of law clause.  According to
-    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
-    is "not incompatible" with the GPL.
-
-Thanks to the many outside volunteers who have worked under Guido's
-direction to make these releases possible.
-
-
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
-===============================================================
-
-Python software and documentation are licensed under the
-Python Software Foundation License Version 2.
-
-Starting with Python 3.8.6, examples, recipes, and other code in
-the documentation are dual licensed under the PSF License Version 2
-and the Zero-Clause BSD license.
-
-Some software incorporated into Python is under different licenses.
-The licenses are listed with code falling under that license.
-
-
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF hereby
-grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
-analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python alone or in any derivative version,
-provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Python Software Foundation;
-All Rights Reserved" are retained in Python alone or in any derivative version
-prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee.  This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
--------------------------------------------
-
-BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
-
-1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
-office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
-Individual or Organization ("Licensee") accessing and otherwise using
-this software in source or binary form and its associated
-documentation ("the Software").
-
-2. Subject to the terms and conditions of this BeOpen Python License
-Agreement, BeOpen hereby grants Licensee a non-exclusive,
-royalty-free, world-wide license to reproduce, analyze, test, perform
-and/or display publicly, prepare derivative works, distribute, and
-otherwise use the Software alone or in any derivative version,
-provided, however, that the BeOpen Python License is retained in the
-Software, alone or in any derivative version prepared by Licensee.
-
-3. BeOpen is making the Software available to Licensee on an "AS IS"
-basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-5. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-6. This License Agreement shall be governed by and interpreted in all
-respects by the law of the State of California, excluding conflict of
-law provisions.  Nothing in this License Agreement shall be deemed to
-create any relationship of agency, partnership, or joint venture
-between BeOpen and Licensee.  This License Agreement does not grant
-permission to use BeOpen trademarks or trade names in a trademark
-sense to endorse or promote products or services of Licensee, or any
-third party.  As an exception, the "BeOpen Python" logos available at
-http://www.pythonlabs.com/logos.html may be used according to the
-permissions granted on that web page.
-
-7. By copying, installing or otherwise using the software, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
----------------------------------------
-
-1. This LICENSE AGREEMENT is between the Corporation for National
-Research Initiatives, having an office at 1895 Preston White Drive,
-Reston, VA 20191 ("CNRI"), and the Individual or Organization
-("Licensee") accessing and otherwise using Python 1.6.1 software in
-source or binary form and its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, CNRI
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python 1.6.1
-alone or in any derivative version, provided, however, that CNRI's
-License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
-1995-2001 Corporation for National Research Initiatives; All Rights
-Reserved" are retained in Python 1.6.1 alone or in any derivative
-version prepared by Licensee.  Alternately, in lieu of CNRI's License
-Agreement, Licensee may substitute the following text (omitting the
-quotes): "Python 1.6.1 is made available subject to the terms and
-conditions in CNRI's License Agreement.  This Agreement together with
-Python 1.6.1 may be located on the Internet using the following
-unique, persistent identifier (known as a handle): 1895.22/1013.  This
-Agreement may also be obtained from a proxy server on the Internet
-using the following URL: http://hdl.handle.net/1895.22/1013".
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python 1.6.1 or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python 1.6.1.
-
-4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
-basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. This License Agreement shall be governed by the federal
-intellectual property law of the United States, including without
-limitation the federal copyright law, and, to the extent such
-U.S. federal law does not apply, by the law of the Commonwealth of
-Virginia, excluding Virginia's conflict of law provisions.
-Notwithstanding the foregoing, with regard to derivative works based
-on Python 1.6.1 that incorporate non-separable material that was
-previously distributed under the GNU General Public License (GPL), the
-law of the Commonwealth of Virginia shall govern this License
-Agreement only as to issues arising under or with respect to
-Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
-License Agreement shall be deemed to create any relationship of
-agency, partnership, or joint venture between CNRI and Licensee.  This
-License Agreement does not grant permission to use CNRI trademarks or
-trade name in a trademark sense to endorse or promote products or
-services of Licensee, or any third party.
-
-8. By clicking on the "ACCEPT" button where indicated, or by copying,
-installing or otherwise using Python 1.6.1, Licensee agrees to be
-bound by the terms and conditions of this License Agreement.
-
-        ACCEPT
-
-
-CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
---------------------------------------------------
-
-Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
-The Netherlands.  All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION
-----------------------------------------------------------------------
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/blender/sandbox/meshbuild.py b/contrib/tinyusdz/tinyusdz_repo/src/blender/sandbox/meshbuild.py
deleted file mode 100644
index 385e006a9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/blender/sandbox/meshbuild.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# https://stackoverflow.com/questions/68297161/creating-a-blender-mesh-directly-from-numpy-data
-import bpy
-import numpy
-
-# the numpy array must be in this form
-vertices = numpy.array([
-                        1, 1, 1,       # vertex 0
-                        -1, 1, -1,     # vertex 1
-                        -1, -1, 1,     # vertex 2
-                        1, -1, -1      # vertex 3
-                        ], dtype=numpy.float32)
-
-# vertices for each polygon
-vertex_index = numpy.array([
-                            0, 1, 2,   #  first polygon starting at 0
-                            0, 2, 3,   # second polygon starting at 3
-                            0, 3, 1,   #  third polygon starting at 6
-                            2, 1, 3    #  forth polygon starting at 9
-                            ], dtype=numpy.int32)
-
-
-# every polygon start at a specific index in vertex_index array
-loop_start = numpy.array([
-                          0, # polygon start at 0 --> 0, 1, 2
-                          3, # polygon start at 3 --> 0, 2, 3
-                          6, # polygon start at 6 --> 0, 3, 1
-                          9  # polygon start at 9 --> 2, 1, 3
-                          ], dtype=numpy.int32)
-                          
-# lenght of the loop
-num_loops = loop_start.shape[0]
-
-
-# Length of each polygon in number of vertices
-loop_total = numpy.array([3,3,3,3], dtype=numpy.int32)
-
-# Create mesh object based on the arrays above
-mesh = bpy.data.meshes.new(name='created mesh')
-
-# Number of vertices in vertices array (12 // 3)
-num_vertices = vertices.shape[0] // 3
-
-# add the amount of vertices, in this case 4.
-mesh.vertices.add(num_vertices)
-
-# use the vertices numpy array
-mesh.vertices.foreach_set("co", vertices)
-
-# total indexes in vertex_index
-num_vertex_indices = vertex_index.shape[0]
-
-# add the amount of the vertex_index array, in this case 12
-mesh.loops.add(num_vertex_indices)
-
-# set the vertx_index
-mesh.loops.foreach_set("vertex_index", vertex_index)
-
-# add the length of loop_start array
-mesh.polygons.add(num_loops)
-
-# generate the polygons
-mesh.polygons.foreach_set("loop_start", loop_start)
-mesh.polygons.foreach_set("loop_total", loop_total)
-
-# validate your mesh
-mesh.update()
-mesh.validate()
-
-# create the object with the mesh just created
-obj = bpy.data.objects.new('created object', mesh)
-
-# add the Oject to the scene
-scene = bpy.context.scene
-scene.collection.objects.link(obj)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/c-tinyusd.cc b/contrib/tinyusdz/tinyusdz_repo/src/c-tinyusd.cc
deleted file mode 100644
index de564f1d4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/c-tinyusd.cc
+++ /dev/null
@@ -1,2188 +0,0 @@
-// SPDX-License-Identifier: Apache 2.0
-// Copyright 2022-Present Light Transport Entertainment Inc.
-
-#include "c-tinyusd.h"
-
-#include "tinyusdz.hh"
-#include "tydra/scene-access.hh"
-#include "usdLux.hh"
-#include "prim-pprint.hh"
-#include "value-pprint.hh"
-#include "common-macros.inc"
-#include "str-util.hh"
-#include "value-types.hh"
-
-// TODO:
-// - [ ] Implement our own `strlen`
-
-CTinyUSDValueType c_tinyusd_value_type(const CTinyUSDValue *value) {
-  if (!value) {
-    return C_TINYUSD_VALUE_UNKNOWN;
-  }
-
-  const tinyusdz::value::Value *pv = reinterpret_cast<const tinyusdz::value::Value *>(value);
-  uint32_t tyid = pv->type_id();
-
-  bool is_array = false;
-  if (tyid & tinyusdz::value::TYPE_ID_1D_ARRAY_BIT) {
-    is_array = true;
-    // turn of array bit
-    tyid = tyid & (~tinyusdz::value::TYPE_ID_1D_ARRAY_BIT);
-  }
-
-  using namespace tinyusdz::value;
-
-  uint32_t basety = C_TINYUSD_VALUE_UNKNOWN;
-
-  switch (tyid) {
-    case TYPE_ID_BOOL: {
-      basety = C_TINYUSD_VALUE_BOOL;
-      break;
-    }
-    case TYPE_ID_INT32: {
-      basety = C_TINYUSD_VALUE_INT;
-      break;
-    }
-    case TYPE_ID_INT2: {
-      basety = C_TINYUSD_VALUE_INT2;
-      break;
-    }
-    case TYPE_ID_INT3: {
-      basety = C_TINYUSD_VALUE_INT3;
-      break;
-    }
-    case TYPE_ID_INT4: {
-      basety = C_TINYUSD_VALUE_INT4;
-      break;
-    }
-    case TYPE_ID_UINT32: {
-      basety = C_TINYUSD_VALUE_UINT;
-      break;
-    }
-    case TYPE_ID_UINT2: {
-      basety = C_TINYUSD_VALUE_UINT2;
-      break;
-    }
-    case TYPE_ID_UINT3: {
-      basety = C_TINYUSD_VALUE_UINT3;
-      break;
-    }
-    case TYPE_ID_UINT4: {
-      basety = C_TINYUSD_VALUE_UINT4;
-      break;
-    }
-    case TYPE_ID_CUSTOMDATA: {
-      basety = C_TINYUSD_VALUE_DICTIONARY;
-      break;
-    }
-    // TODO
-    default: {
-      break;
-    }
-  }
-
-  if (is_array) {
-    return static_cast<CTinyUSDValueType>(basety | C_TINYUSD_VALUE_1D_BIT);
-  } else {
-    return static_cast<CTinyUSDValueType>(basety);
-  }
-}
-
-const char *c_tinyusd_value_type_name(CTinyUSDValueType value_type) {
-  // 32 should be enough length to support all C_TINYUSD_VALUE_* type name +
-  // '[]'
-  static thread_local char buf[32];
-
-  bool is_array = value_type & C_TINYUSD_VALUE_1D_BIT;
-
-  // drop array bit.
-  uint32_t basety = value_type & (~C_TINYUSD_VALUE_1D_BIT);
-
-  const char *tyname = "[invalid]";
-
-  switch (static_cast<CTinyUSDValueType>(basety)) {
-    case C_TINYUSD_VALUE_UNKNOWN: {
-      break;
-    }
-    case C_TINYUSD_VALUE_BOOL: {
-      tyname = "bool";
-      break;
-    }
-    case C_TINYUSD_VALUE_TOKEN: {
-      tyname = "token";
-      break;
-    }
-    case C_TINYUSD_VALUE_TOKEN_VECTOR: {
-      tyname = "token[]";
-      is_array = false;
-      break;
-    }
-    case C_TINYUSD_VALUE_STRING: {
-      tyname = "string";
-      break;
-    }
-    case C_TINYUSD_VALUE_STRING_VECTOR: {
-      tyname = "string[]";
-      is_array = false;
-      break;
-    }
-    case C_TINYUSD_VALUE_HALF: {
-      tyname = "half";
-      break;
-    }
-    case C_TINYUSD_VALUE_HALF2: {
-      tyname = "half2";
-      break;
-    }
-    case C_TINYUSD_VALUE_HALF3: {
-      tyname = "half3";
-      break;
-    }
-    case C_TINYUSD_VALUE_HALF4: {
-      tyname = "half4";
-      break;
-    }
-    case C_TINYUSD_VALUE_INT: {
-      tyname = "int";
-      break;
-    }
-    case C_TINYUSD_VALUE_INT2: {
-      tyname = "int2";
-      break;
-    }
-    case C_TINYUSD_VALUE_INT3: {
-      tyname = "int3";
-      break;
-    }
-    case C_TINYUSD_VALUE_INT4: {
-      tyname = "int4";
-      break;
-    }
-    case C_TINYUSD_VALUE_UINT: {
-      tyname = "uint";
-      break;
-    }
-    case C_TINYUSD_VALUE_UINT2: {
-      tyname = "uint2";
-      break;
-    }
-    case C_TINYUSD_VALUE_UINT3: {
-      tyname = "uint3";
-      break;
-    }
-    case C_TINYUSD_VALUE_UINT4: {
-      tyname = "uint4";
-      break;
-    }
-    case C_TINYUSD_VALUE_INT64: {
-      tyname = "int64";
-      break;
-    }
-    case C_TINYUSD_VALUE_UINT64: {
-      tyname = "uint64";
-      break;
-    }
-    case C_TINYUSD_VALUE_FLOAT: {
-      tyname = "float";
-      break;
-    }
-    case C_TINYUSD_VALUE_FLOAT2: {
-      tyname = "float2";
-      break;
-    }
-    case C_TINYUSD_VALUE_FLOAT3: {
-      tyname = "float3";
-      break;
-    }
-    case C_TINYUSD_VALUE_FLOAT4: {
-      tyname = "float4";
-      break;
-    }
-    case C_TINYUSD_VALUE_DOUBLE: {
-      tyname = "double";
-      break;
-    }
-    case C_TINYUSD_VALUE_DOUBLE2: {
-      tyname = "double2";
-      break;
-    }
-    case C_TINYUSD_VALUE_DOUBLE3: {
-      tyname = "double3";
-      break;
-    }
-    case C_TINYUSD_VALUE_DOUBLE4: {
-      tyname = "double4";
-      break;
-    }
-    case C_TINYUSD_VALUE_QUATH: {
-      tyname = "quath";
-      break;
-    }
-    case C_TINYUSD_VALUE_QUATF: {
-      tyname = "quatf";
-      break;
-    }
-    case C_TINYUSD_VALUE_QUATD: {
-      tyname = "quatd";
-      break;
-    }
-    case C_TINYUSD_VALUE_NORMAL3H: {
-      tyname = "normal3h";
-      break;
-    }
-    case C_TINYUSD_VALUE_NORMAL3F: {
-      tyname = "normal3f";
-      break;
-    }
-    case C_TINYUSD_VALUE_NORMAL3D: {
-      tyname = "normal3d";
-      break;
-    }
-    case C_TINYUSD_VALUE_VECTOR3H: {
-      tyname = "vector3h";
-      break;
-    }
-    case C_TINYUSD_VALUE_VECTOR3F: {
-      tyname = "vector3f";
-      break;
-    }
-    case C_TINYUSD_VALUE_VECTOR3D: {
-      tyname = "vector3d";
-      break;
-    }
-    case C_TINYUSD_VALUE_POINT3H: {
-      tyname = "point3h";
-      break;
-    }
-    case C_TINYUSD_VALUE_POINT3F: {
-      tyname = "point3f";
-      break;
-    }
-    case C_TINYUSD_VALUE_POINT3D: {
-      tyname = "point3d";
-      break;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2H: {
-      tyname = "texCoord2h";
-      break;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2F: {
-      tyname = "texCoord2f";
-      break;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2D: {
-      tyname = "texCoord2d";
-      break;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3H: {
-      tyname = "texCoord3h";
-      break;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3F: {
-      tyname = "texCoord3f";
-      break;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3D: {
-      tyname = "texCoord3d";
-      break;
-    }
-    case C_TINYUSD_VALUE_COLOR3H: {
-      tyname = "color3h";
-      break;
-    }
-    case C_TINYUSD_VALUE_COLOR3F: {
-      tyname = "color3f";
-      break;
-    }
-    case C_TINYUSD_VALUE_COLOR3D: {
-      tyname = "color3d";
-      break;
-    }
-    case C_TINYUSD_VALUE_COLOR4H: {
-      tyname = "color4h";
-      break;
-    }
-    case C_TINYUSD_VALUE_COLOR4F: {
-      tyname = "color4f";
-      break;
-    }
-    case C_TINYUSD_VALUE_COLOR4D: {
-      tyname = "color4d";
-      break;
-    }
-    case C_TINYUSD_VALUE_MATRIX2D: {
-      tyname = "matrix2d";
-      break;
-    }
-    case C_TINYUSD_VALUE_MATRIX3D: {
-      tyname = "matrix2d";
-      break;
-    }
-    case C_TINYUSD_VALUE_MATRIX4D: {
-      tyname = "matrix2d";
-      break;
-    }
-    case C_TINYUSD_VALUE_FRAME4D: {
-      tyname = "frame4d";
-      break;
-    }
-    case C_TINYUSD_VALUE_DICTIONARY: {
-      tyname = "dictionary";
-      break;
-    }
-    case C_TINYUSD_VALUE_END: {
-      tyname = "[invalid]";
-      break;
-    }  // invalid
-       // default: { return 0; }
-  }
-
-  uint32_t sz = static_cast<uint32_t>(strlen(tyname));
-
-  if (sz > 31) {
-    // Just in case: this should not happen though.
-    sz = 31;
-  }
-
-  strncpy(buf, tyname, sz);
-
-  if (is_array) {
-    if (sz > 29) {
-      // Just in case: this should not happen though.
-      sz = 29;
-    }
-
-    buf[sz] = '[';
-    buf[sz + 1] = ']';
-    buf[sz + 2] = '\0';
-  } else {
-    buf[sz] = '\0';
-  }
-
-  return buf;
-}
-
-uint32_t c_tinyusd_value_type_components(CTinyUSDValueType value_type) {
-  // drop array bit.
-  uint32_t basety = value_type & (~C_TINYUSD_VALUE_1D_BIT);
-
-  switch (static_cast<CTinyUSDValueType>(basety)) {
-    case C_TINYUSD_VALUE_UNKNOWN: {
-      return 0; // invalid
-    }
-    case C_TINYUSD_VALUE_BOOL: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_TOKEN: {
-      return 0;
-    }  // invalid
-    case C_TINYUSD_VALUE_TOKEN_VECTOR: {
-      return 0;
-    }  // invalid
-    case C_TINYUSD_VALUE_STRING: {
-      return 0;
-    }  // invalid
-    case C_TINYUSD_VALUE_STRING_VECTOR: {
-      return 0;
-    }  // invalid
-    case C_TINYUSD_VALUE_HALF: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_HALF2: {
-      return 2;
-    }
-    case C_TINYUSD_VALUE_HALF3: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_HALF4: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_INT: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_INT2: {
-      return 2;
-    }
-    case C_TINYUSD_VALUE_INT3: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_INT4: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_UINT: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_UINT2: {
-      return 2;
-    }
-    case C_TINYUSD_VALUE_UINT3: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_UINT4: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_INT64: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_UINT64: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_FLOAT: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_FLOAT2: {
-      return 2;
-    }
-    case C_TINYUSD_VALUE_FLOAT3: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_FLOAT4: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_DOUBLE: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_DOUBLE2: {
-      return 2;
-    }
-    case C_TINYUSD_VALUE_DOUBLE3: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_DOUBLE4: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_QUATH: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_QUATF: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_QUATD: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_NORMAL3H: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_NORMAL3F: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_NORMAL3D: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_VECTOR3H: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_VECTOR3F: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_VECTOR3D: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_POINT3H: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_POINT3F: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_POINT3D: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2H: {
-      return 2;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2F: {
-      return 2;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2D: {
-      return 2;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3H: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3F: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3D: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_COLOR3H: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_COLOR3F: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_COLOR3D: {
-      return 3;
-    }
-    case C_TINYUSD_VALUE_COLOR4H: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_COLOR4F: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_COLOR4D: {
-      return 4;
-    }
-    case C_TINYUSD_VALUE_MATRIX2D: {
-      return 2 * 2;
-    }
-    case C_TINYUSD_VALUE_MATRIX3D: {
-      return 3 * 3;
-    }
-    case C_TINYUSD_VALUE_MATRIX4D: {
-      return 4 * 4;
-    }
-    case C_TINYUSD_VALUE_FRAME4D: {
-      return 4 * 4;
-    }
-    case C_TINYUSD_VALUE_DICTIONARY: {
-      return 0;
-    }
-    case C_TINYUSD_VALUE_END: {
-      return 0;
-    }  // invalid
-       // default: { return 0; }
-  }
-
-  return 0;
-}
-
-uint32_t c_tinyusd_value_type_is_numeric(CTinyUSDValueType value_type) {
-  // drop array bit.
-  uint32_t basety = value_type & (~C_TINYUSD_VALUE_1D_BIT);
-
-  switch (static_cast<CTinyUSDValueType>(basety)) {
-    case C_TINYUSD_VALUE_UNKNOWN: {
-      return 0;
-    }
-    case C_TINYUSD_VALUE_BOOL: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_TOKEN: {
-      return 0;
-    }
-    case C_TINYUSD_VALUE_TOKEN_VECTOR: {
-      return 0;
-    }
-    case C_TINYUSD_VALUE_STRING: {
-      return 0;
-    }
-    case C_TINYUSD_VALUE_STRING_VECTOR: {
-      return 0;
-    }
-    case C_TINYUSD_VALUE_HALF: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_HALF2: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_HALF3: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_HALF4: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_INT: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_INT2: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_INT3: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_INT4: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_UINT: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_UINT2: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_UINT3: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_UINT4: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_INT64: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_UINT64: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_FLOAT: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_FLOAT2: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_FLOAT3: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_FLOAT4: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_DOUBLE: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_DOUBLE2: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_DOUBLE3: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_DOUBLE4: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_QUATH: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_QUATF: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_QUATD: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_NORMAL3H: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_NORMAL3F: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_NORMAL3D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_VECTOR3H: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_VECTOR3F: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_VECTOR3D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_POINT3H: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_POINT3F: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_POINT3D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2H: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2F: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3H: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3F: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_COLOR3H: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_COLOR3F: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_COLOR3D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_COLOR4H: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_COLOR4F: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_COLOR4D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_MATRIX2D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_MATRIX3D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_MATRIX4D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_FRAME4D: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_DICTIONARY: {
-      return 0;
-    }
-    case C_TINYUSD_VALUE_END: {
-      return 0;
-    }  // invalid
-       // default: { return 0; }
-  }
-
-  return 0;
-}
-
-uint32_t c_tinyusd_value_type_sizeof(CTinyUSDValueType value_type) {
-  // drop array bit.
-  uint32_t basety = value_type & (~C_TINYUSD_VALUE_1D_BIT);
-
-  switch (static_cast<CTinyUSDValueType>(basety)) {
-    case C_TINYUSD_VALUE_UNKNOWN: {
-      return 0;
-    }
-    case C_TINYUSD_VALUE_BOOL: {
-      return 1;
-    }
-    case C_TINYUSD_VALUE_TOKEN: {
-      return 0;
-    }  // invalid
-    case C_TINYUSD_VALUE_TOKEN_VECTOR: {
-      return 0;
-    }  // invalid
-    case C_TINYUSD_VALUE_STRING: {
-      return 0;
-    }  // invalid
-    case C_TINYUSD_VALUE_STRING_VECTOR: {
-      return 0;
-    }  // invalid
-    case C_TINYUSD_VALUE_HALF: {
-      return sizeof(uint16_t);
-    }
-    case C_TINYUSD_VALUE_HALF2: {
-      return sizeof(uint16_t) * 2;
-    }
-    case C_TINYUSD_VALUE_HALF3: {
-      return sizeof(uint16_t) * 3;
-    }
-    case C_TINYUSD_VALUE_HALF4: {
-      return sizeof(uint16_t) * 4;
-    }
-    case C_TINYUSD_VALUE_INT: {
-      return sizeof(int);
-    }
-    case C_TINYUSD_VALUE_INT2: {
-      return sizeof(int) * 2;
-    }
-    case C_TINYUSD_VALUE_INT3: {
-      return sizeof(int) * 3;
-    }
-    case C_TINYUSD_VALUE_INT4: {
-      return sizeof(int) * 4;
-    }
-    case C_TINYUSD_VALUE_UINT: {
-      return sizeof(uint32_t);
-    }
-    case C_TINYUSD_VALUE_UINT2: {
-      return sizeof(uint32_t) * 2;
-    }
-    case C_TINYUSD_VALUE_UINT3: {
-      return sizeof(uint32_t) * 3;
-    }
-    case C_TINYUSD_VALUE_UINT4: {
-      return sizeof(uint32_t) * 4;
-    }
-    case C_TINYUSD_VALUE_INT64: {
-      return sizeof(int64_t);
-    }
-    case C_TINYUSD_VALUE_UINT64: {
-      return sizeof(uint64_t);
-    }
-    case C_TINYUSD_VALUE_FLOAT: {
-      return sizeof(float);
-    }
-    case C_TINYUSD_VALUE_FLOAT2: {
-      return sizeof(float) * 2;
-    }
-    case C_TINYUSD_VALUE_FLOAT3: {
-      return sizeof(float) * 3;
-    }
-    case C_TINYUSD_VALUE_FLOAT4: {
-      return sizeof(float) * 4;
-    }
-    case C_TINYUSD_VALUE_DOUBLE: {
-      return sizeof(double);
-    }
-    case C_TINYUSD_VALUE_DOUBLE2: {
-      return sizeof(double) * 2;
-    }
-    case C_TINYUSD_VALUE_DOUBLE3: {
-      return sizeof(double) * 3;
-    }
-    case C_TINYUSD_VALUE_DOUBLE4: {
-      return sizeof(double) * 4;
-    }
-    case C_TINYUSD_VALUE_QUATH: {
-      return sizeof(uint16_t) * 4;
-    }
-    case C_TINYUSD_VALUE_QUATF: {
-      return sizeof(float) * 4;
-    }
-    case C_TINYUSD_VALUE_QUATD: {
-      return sizeof(double) * 4;
-    }
-    case C_TINYUSD_VALUE_NORMAL3H: {
-      return sizeof(uint16_t) * 3;
-    }
-    case C_TINYUSD_VALUE_NORMAL3F: {
-      return sizeof(float) * 3;
-    }
-    case C_TINYUSD_VALUE_NORMAL3D: {
-      return sizeof(double) * 3;
-    }
-    case C_TINYUSD_VALUE_VECTOR3H: {
-      return sizeof(uint16_t) * 3;
-    }
-    case C_TINYUSD_VALUE_VECTOR3F: {
-      return sizeof(float) * 3;
-    }
-    case C_TINYUSD_VALUE_VECTOR3D: {
-      return sizeof(double) * 3;
-    }
-    case C_TINYUSD_VALUE_POINT3H: {
-      return sizeof(uint16_t) * 3;
-    }
-    case C_TINYUSD_VALUE_POINT3F: {
-      return sizeof(float) * 3;
-    }
-    case C_TINYUSD_VALUE_POINT3D: {
-      return sizeof(double) * 3;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2H: {
-      return sizeof(uint16_t) * 2;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2F: {
-      return sizeof(float) * 2;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD2D: {
-      return sizeof(double) * 2;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3H: {
-      return sizeof(uint16_t) * 3;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3F: {
-      return sizeof(float) * 3;
-    }
-    case C_TINYUSD_VALUE_TEXCOORD3D: {
-      return sizeof(double) * 3;
-    }
-    case C_TINYUSD_VALUE_COLOR3H: {
-      return sizeof(uint16_t) * 3;
-    }
-    case C_TINYUSD_VALUE_COLOR3F: {
-      return sizeof(float) * 3;
-    }
-    case C_TINYUSD_VALUE_COLOR3D: {
-      return sizeof(double) * 3;
-    }
-    case C_TINYUSD_VALUE_COLOR4H: {
-      return sizeof(uint16_t) * 4;
-    }
-    case C_TINYUSD_VALUE_COLOR4F: {
-      return sizeof(float) * 4;
-    }
-    case C_TINYUSD_VALUE_COLOR4D: {
-      return sizeof(double) * 4;
-    }
-    case C_TINYUSD_VALUE_MATRIX2D: {
-      return sizeof(double) * 2 * 2;
-    }
-    case C_TINYUSD_VALUE_MATRIX3D: {
-      return sizeof(double) * 3 * 3;
-    }
-    case C_TINYUSD_VALUE_MATRIX4D: {
-      return sizeof(double) * 4 * 4;
-    }
-    case C_TINYUSD_VALUE_FRAME4D: {
-      return sizeof(double) * 4 * 4;
-    }
-    case C_TINYUSD_VALUE_DICTIONARY: {
-      return 0;
-    }
-    case C_TINYUSD_VALUE_END: {
-      return 0;
-    }  // invalid
-       // default: { return 0; }
-  }
-
-  return 0;
-}
-
-CTinyUSDFormat c_tinyusd_detect_format(const char *filename) {
-  if (tinyusdz::IsUSDA(filename)) {
-    return C_TINYUSD_FORMAT_USDA;
-  }
-
-  if (tinyusdz::IsUSDC(filename)) {
-    return C_TINYUSD_FORMAT_USDC;
-  }
-
-  if (tinyusdz::IsUSDZ(filename)) {
-    return C_TINYUSD_FORMAT_USDZ;
-  }
-
-  return C_TINYUSD_FORMAT_UNKNOWN;
-}
-
-const char *c_tinyusd_prim_type_name(CTinyUSDPrimType prim_type) {
-  // 32 should be enough length to support all C_TINYUSD_PRIM_*** type
-  static thread_local char buf[32];
-
-  const char *tyname = "";
-
-  switch (prim_type) {
-    case C_TINYUSD_PRIM_UNKNOWN: {
-      return nullptr;
-    }
-    case C_TINYUSD_PRIM_MODEL: {
-      // empty string for Model
-      tyname = "";
-      break;
-    }
-    case C_TINYUSD_PRIM_SCOPE: {
-      tyname = "Scope";
-      break;
-    }  // empty string for Model
-    case C_TINYUSD_PRIM_XFORM: {
-      tyname = tinyusdz::kGeomXform;
-      break;
-    }
-    case C_TINYUSD_PRIM_MESH: {
-      tyname = tinyusdz::kGeomMesh;
-      break;
-    }
-    case C_TINYUSD_PRIM_GEOMSUBSET: {
-      tyname = tinyusdz::kGeomSubset;
-      break;
-    }
-    case C_TINYUSD_PRIM_MATERIAL: {
-      tyname = tinyusdz::kMaterial;
-      break;
-    }
-    case C_TINYUSD_PRIM_SHADER: {
-      tyname = tinyusdz::kShader;
-      break;
-    }
-    case C_TINYUSD_PRIM_CAMERA: {
-      tyname = tinyusdz::kGeomCamera;
-      break;
-    }
-    case C_TINYUSD_PRIM_SPHERE_LIGHT: {
-      tyname = tinyusdz::kSphereLight;
-      break;
-    }
-    case C_TINYUSD_PRIM_DISTANT_LIGHT: {
-      tyname = tinyusdz::kDistantLight;
-      break;
-    }
-    case C_TINYUSD_PRIM_RECT_LIGHT: {
-      tyname = tinyusdz::kRectLight;
-      break;
-    }
-    case C_TINYUSD_PRIM_END: {
-      return nullptr;
-    }
-  }
-
-  size_t sz = strlen(tyname);
-  if (sz > 31) {
-    // Just in case: this should not happen though.
-    sz = 31;
-  }
-  strncpy(buf, tyname, sz);
-  buf[sz] = '\0';
-
-  return buf;
-}
-
-CTinyUSDPrimType c_tinyusd_prim_type_from_string(const char *c_type_name) {
-  std::string type_name(c_type_name);
-
-  if (type_name == "Model") {
-    return C_TINYUSD_PRIM_MODEL;
-  } else if (type_name == "Scope") {
-    return C_TINYUSD_PRIM_SCOPE;
-  } else if (type_name == tinyusdz::kGeomXform) {
-    return C_TINYUSD_PRIM_XFORM;
-  } else if (type_name == tinyusdz::kGeomMesh) {
-    return C_TINYUSD_PRIM_MESH;
-  } else if (type_name == tinyusdz::kGeomSubset) {
-    return C_TINYUSD_PRIM_GEOMSUBSET;
-  } else if (type_name == tinyusdz::kGeomCamera) {
-    return C_TINYUSD_PRIM_CAMERA;
-  } else if (type_name == tinyusdz::kMaterial) {
-    return C_TINYUSD_PRIM_MATERIAL;
-  } else if (type_name == tinyusdz::kShader) {
-    return C_TINYUSD_PRIM_SHADER;
-  } else if (type_name == tinyusdz::kSphereLight) {
-    return C_TINYUSD_PRIM_SPHERE_LIGHT;
-  } else if (type_name == tinyusdz::kDistantLight) {
-    return C_TINYUSD_PRIM_DISTANT_LIGHT;
-  } else if (type_name == tinyusdz::kRectLight) {
-    return C_TINYUSD_PRIM_RECT_LIGHT;
-  } else {
-    return C_TINYUSD_PRIM_UNKNOWN;
-  }
-}
-
-const char *c_tinyusd_prim_element_name(
-    const CTinyUSDPrim *prim) {
-
-  if (!prim) {
-    return nullptr;
-  }
-
-  const tinyusdz::Prim *p = reinterpret_cast<const tinyusdz::Prim *>(prim);
-  return p->element_name().c_str();
-}
-
-int c_tinyusd_prim_append_child(CTinyUSDPrim *prim, CTinyUSDPrim *child_prim) {
-  std::cout << "C: Append child: " << prim << "," << child_prim << "\n";
-  DCOUT("DCOUT: Append child: " << prim << ", " << child_prim);
-
-  if (!prim) {
-    DCOUT("`prim` is nullptr.");
-    return 0;
-  }
-
-  if (!child_prim) {
-    DCOUT("`child_prim` is nullptr.");
-    return 0;
-  }
-
-  tinyusdz::Prim *pprim = reinterpret_cast<tinyusdz::Prim *>(prim);
-  tinyusdz::Prim *pchild = reinterpret_cast<tinyusdz::Prim *>(child_prim);
-
-  pprim->children().emplace_back(*pchild);
-
-  return 1;
-}
-
-int c_tinyusd_prim_append_child_move(CTinyUSDPrim *prim, CTinyUSDPrim *child_prim) {
-  if (!prim) {
-    return 0;
-  }
-
-  if (!child_prim) {
-    return 0;
-  }
-
-  tinyusdz::Prim *pprim = reinterpret_cast<tinyusdz::Prim *>(prim);
-  tinyusdz::Prim *pchild = reinterpret_cast<tinyusdz::Prim *>(child_prim);
-
-  pprim->children().emplace_back(std::move(*pchild));
-
-  return 1;
-}
-
-uint64_t c_tinyusd_prim_num_children(const CTinyUSDPrim *prim) {
-  if (!prim) {
-    return 0;
-  }
-
-  const tinyusdz::Prim *pprim = reinterpret_cast<const tinyusdz::Prim *>(prim);
-  return pprim->children().size();
-}
-
-const char *c_tinyusd_prim_type(const CTinyUSDPrim *prim) {
-  if (!prim) {
-    return nullptr;
-  }
-
-  const tinyusdz::Prim *pprim = reinterpret_cast<const tinyusdz::Prim *>(prim);
-
-  return pprim->prim_type_name().c_str();
-}
-
-
-int c_tinyusd_prim_get_child(const CTinyUSDPrim *prim,
-                                              uint64_t child_index,
-                                              const CTinyUSDPrim ** child_prim) {
-  if (!prim) {
-    return 0;
-  }
-
-  const tinyusdz::Prim *pprim = reinterpret_cast<const tinyusdz::Prim *>(prim);
-  if (child_index >= pprim->children().size()) {
-    return 0;
-  }
-
-  const tinyusdz::Prim *pchild = &pprim->children()[size_t(child_index)];
-
-  (*child_prim) = reinterpret_cast<const CTinyUSDPrim *>(pchild);
-
-  return 1;
-}
-
-int c_tinyusd_prim_del_child(CTinyUSDPrim *prim, uint64_t child_idx) {
-  if (!prim) {
-    return 0;
-  }
-
-  tinyusdz::Prim *pprim = reinterpret_cast<tinyusdz::Prim *>(prim);
-  if (child_idx >= pprim->children().size()) {
-    return 0;
-  }
-
-  pprim->children().erase(pprim->children().begin() + ptrdiff_t(child_idx));
-
-  return 1;
-}
-
-c_tinyusd_token_t *c_tinyusd_token_new(const char *str) {
-  if (!str) {
-    return nullptr;
-  }
-
-  auto *value = new tinyusdz::value::token(str);
-
-  return reinterpret_cast<c_tinyusd_token_t *>(value);
-}
-
-c_tinyusd_token_t *c_tinyusd_token_dup(const c_tinyusd_token_t *_tok) {
-
-  if (!_tok) {
-    return nullptr;
-  }
-
-  auto *tok = reinterpret_cast<const tinyusdz::value::token *>(_tok);
-
-  auto *value = new tinyusdz::value::token(tok->str());
-
-  return reinterpret_cast<c_tinyusd_token_t *>(value);
-}
-
-int c_tinyusd_token_free(c_tinyusd_token_t *tok) {
-  if (!tok) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<tinyusdz::value::token *>(tok);
-  delete p;
-
-  return 1;  // ok
-}
-
-const char *c_tinyusd_token_str(const c_tinyusd_token_t *tok) {
-  if (!tok) {
-    return nullptr;
-  }
-
-  auto *p = reinterpret_cast<const tinyusdz::value::token *>(tok);
-  return p->str().c_str();
-}
-
-size_t c_tinyusd_token_size(const c_tinyusd_token_t *tok) {
-  if (!tok) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<const tinyusdz::value::token *>(tok);
-
-  return p->str().size();
-}
-
-c_tinyusd_token_vector_t *c_tinyusd_token_vector_new_empty() {
-
-  auto *value = new std::vector<tinyusdz::value::token>();
-  return reinterpret_cast<c_tinyusd_token_vector_t *>(value);
-}
-
-c_tinyusd_token_vector_t *c_tinyusd_token_vector_new(const size_t n, const char **strs) {
-
-  if (strs) {
-    for (size_t i = 0; i < n; i++) {
-      if (!strs[i]) {
-        return nullptr;
-      }
-    }
-
-    auto *value = new std::vector<tinyusdz::value::token>(n);
-    for (size_t i = 0; i < n; i++) {
-      value->at(i) = tinyusdz::value::token(strs[i]);
-    }
-    return reinterpret_cast<c_tinyusd_token_vector_t *>(value);
-  } else {
-    auto *value = new std::vector<tinyusdz::value::token>(n);
-    return reinterpret_cast<c_tinyusd_token_vector_t *>(value);
-  }
-}
-
-size_t c_tinyusd_token_vector_size(const c_tinyusd_token_vector_t *sv) {
-  if (!sv) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<const std::vector<tinyusdz::value::token> *>(sv);
-
-  return p->size();
-}
-
-int c_tinyusd_token_vector_clear(c_tinyusd_token_vector_t *sv) {
-  if (!sv) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<std::vector<tinyusdz::value::token> *>(sv);
-  p->clear();
-
-  return 1;
-}
-
-int c_tinyusd_token_vector_resize(c_tinyusd_token_vector_t *sv, const size_t n) {
-  if (!sv) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<std::vector<tinyusdz::value::token> *>(sv);
-
-  p->resize(n);
-
-  return 1;
-}
-
-int c_tinyusd_token_vector_replace(c_tinyusd_token_vector_t *sv, const size_t idx, const char *str) {
-  if (!sv) {
-    return 0;
-  }
-
-  if (!str) {
-    return 0;
-  }
-
-  std::vector<tinyusdz::value::token> *pv = reinterpret_cast<std::vector<tinyusdz::value::token> *>(sv);
-  if (idx >= pv->size()) {
-    return 0;
-  }
-
-  pv->at(idx) = tinyusdz::value::token(str);
-
-  return 1;  // ok
-}
-
-int c_tinyusd_token_vector_free(c_tinyusd_token_vector_t *sv) {
-  if (!sv) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<std::vector<tinyusdz::value::token> *>(sv);
-  delete p;
-
-  return 1;  // ok
-}
-
-const char *c_tinyusd_token_vector_str(const c_tinyusd_token_vector_t *sv, const size_t idx) {
-  if (!sv) {
-    return nullptr;
-  }
-
-  auto *p = reinterpret_cast<const std::vector<tinyusdz::value::token> *>(sv);
-  if (idx >= p->size()) {
-    return nullptr;
-  }
-
-  return p->at(idx).str().c_str();
-}
-
-c_tinyusd_string_t *c_tinyusd_string_new_empty() {
-
-  auto *value = new std::string();
-
-  return reinterpret_cast<c_tinyusd_string_t *>(value);
-}
-
-c_tinyusd_string_t *c_tinyusd_string_new(const char *str) {
-
-  if (str) {
-    auto *value = new std::string(str);
-    return reinterpret_cast<c_tinyusd_string_t *>(value);
-  } else {
-    auto *value = new std::string();
-    return reinterpret_cast<c_tinyusd_string_t *>(value);
-  }
-}
-
-size_t c_tinyusd_string_size(const c_tinyusd_string_t *s) {
-  if (!s) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<const std::string *>(s);
-
-  return p->size();
-}
-
-int c_tinyusd_string_replace(c_tinyusd_string_t *s, const char *str) {
-  if (!s) {
-    return 0;
-  }
-
-  if (!str) {
-    return 0;
-  }
-
-  std::string *p = reinterpret_cast<std::string *>(s);
-  (*p) = std::string(str);
-
-  return 1;  // ok
-}
-
-int c_tinyusd_string_free(c_tinyusd_string_t *s) {
-  if (!s) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<std::string *>(s);
-  delete p;
-
-  return 1;  // ok
-}
-
-const char *c_tinyusd_string_str(const c_tinyusd_string_t *s) {
-  if (!s) {
-    return nullptr;
-  }
-
-  auto *p = reinterpret_cast<const std::string *>(s);
-  return p->c_str();
-}
-
-int c_tinyusd_string_vector_new_empty(c_tinyusd_string_vector *sv, const size_t n) {
-  if (!sv) {
-    return 0;
-  }
-
-  auto *value = new std::vector<std::string>(n);
-  sv->data = reinterpret_cast<void *>(value);
-
-  return 1;  // ok
-}
-
-int c_tinyusd_string_vector_new(c_tinyusd_string_vector *sv, const size_t n, const char **strs) {
-  if (!sv) {
-    return 0;
-  }
-
-  if (strs) {
-    auto *value = new std::vector<std::string>(n);
-    for (size_t i = 0; i < n; i++) {
-      value->at(i) = std::string(strs[i]);
-    }
-    sv->data = reinterpret_cast<void *>(value);
-  } else {
-    auto *value = new std::vector<std::string>(n);
-    sv->data = reinterpret_cast<void *>(value);
-  }
-
-  return 1;  // ok
-}
-
-size_t c_tinyusd_string_vector_size(const c_tinyusd_string_vector *sv) {
-  if (!sv) {
-    return 0;
-  }
-
-  if (!sv->data) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<const std::vector<std::string> *>(sv->data);
-
-  return p->size();
-}
-
-int c_tinyusd_string_vector_clear(c_tinyusd_string_vector *sv) {
-  if (!sv) {
-    return 0;
-  }
-
-  if (!sv->data) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<std::vector<std::string> *>(sv->data);
-  p->clear();
-
-  return 1;
-}
-
-int c_tinyusd_string_vector_resize(c_tinyusd_string_vector *sv, const size_t n) {
-  if (!sv) {
-    return 0;
-  }
-
-  if (!sv->data) {
-    return 0;
-  }
-
-  auto *p = reinterpret_cast<std::vector<std::string> *>(sv->data);
-
-  p->resize(n);
-
-  return 1;
-}
-
-int c_tinyusd_string_vector_replace(c_tinyusd_string_vector *sv, const size_t idx, const char *str) {
-  if (!sv) {
-    return 0;
-  }
-
-  if (!sv->data) {
-    return 0;
-  }
-
-  if (!str) {
-    return 0;
-  }
-
-  std::vector<std::string> *pv = reinterpret_cast<std::vector<std::string> *>(sv->data);
-  if (idx >= pv->size()) {
-    return 0;
-  }
-
-  pv->at(idx) = std::string(str);
-
-  return 1;  // ok
-}
-
-int c_tinyusd_string_vector_free(c_tinyusd_string_vector *sv) {
-  if (!sv) {
-    return 0;
-  }
-
-  if (sv->data) {
-    auto *p = reinterpret_cast<std::vector<std::string> *>(sv->data);
-    delete p;
-    sv->data = nullptr;
-  }
-
-  return 1;  // ok
-}
-
-const char *c_tinyusd_string_vector_str(const c_tinyusd_string_vector *sv, const size_t idx) {
-  if (!sv) {
-    return nullptr;
-  }
-
-  if (sv->data) {
-    auto *p = reinterpret_cast<const std::vector<std::string> *>(sv->data);
-    if (idx >= p->size()) {
-      return nullptr;
-    }
-
-    return p->at(idx).c_str();
-  }
-
-  return nullptr;
-}
-
-
-#if 0
-int c_tinyusd_buffer_new(CTinyUSDBuffer *buf, CTinyUSDValueType value_type) {
-  if (!buf) {
-    return 0;
-  }
-
-  uint32_t sz = c_tinyusd_value_type_sizeof(value_type);
-  if (sz == 0) {
-    return 0;
-  }
-
-  buf->value_type = value_type;
-  buf->ndim = 0;
-
-  //uint8_t *m = new uint8_t[sz];
-  //buf->data = reinterpret_cast<void *>(m);
-  tinyusdz::value::Value *vp = new tinyusdz::value::Value(); // new `null` Value at the moment
-  buf->data = reinterpret_cast<void *>(vp);
-
-  return 1;  // ok
-}
-
-int c_tinyusd_buffer_new_and_copy_token(CTinyUSDBuffer *buf, const c_tinyusd_token_t *tok) {
-  if (!buf) {
-    return 0;
-  }
-
-  if (!tok) {
-    return 0;
-  }
-
-  size_t sz = c_tinyusd_token_size(tok);
-
-  buf->value_type = C_TINYUSD_VALUE_TOKEN;
-  buf->ndim = 0;
-
-  if (sz == 0) {
-    // Allow null string
-    buf->data = nullptr;
-  } else {
-
-    const char *str = c_tinyusd_token_str(tok);
-    if (strlen(str) != sz) {
-      // ???
-      return false;
-    }
-
-    if (str) {
-      uint8_t *m = new uint8_t[sz];
-
-      memcpy(m, str, sz);
-      buf->data = reinterpret_cast<void *>(m);
-    } else {
-      // ???
-      return 0;
-    }
-  }
-
-  return 1;  // ok
-}
-
-int c_tinyusd_buffer_new_and_copy_string(CTinyUSDBuffer *buf, const c_tinyusd_string_t *str) {
-  if (!buf) {
-    return 0;
-  }
-
-  if (!str) {
-    return 0;
-  }
-
-  size_t sz = c_tinyusd_string_size(str);
-
-  buf->value_type = C_TINYUSD_VALUE_STRING;
-  buf->ndim = 0;
-
-  if (sz == 0) {
-    // Allow null string
-    buf->data = nullptr;
-  } else {
-
-    const char *s = c_tinyusd_string_str(str);
-    if (strlen(s) != sz) {
-      // ???
-      return false;
-    }
-
-    if (s) {
-      uint8_t *m = new uint8_t[sz];
-
-      memcpy(m, s, sz);
-      buf->data = reinterpret_cast<void *>(m);
-    } else {
-      // ???
-      return 0;
-    }
-  }
-
-  return 1;  // ok
-}
-
-int c_tinyusd_buffer_new_array(CTinyUSDBuffer *buf,
-                               CTinyUSDValueType value_type, uint64_t n) {
-  if (!buf) {
-    return 0;
-  }
-
-  uint32_t sz = c_tinyusd_value_type_sizeof(value_type);
-  if (sz == 0) {
-    return 0;
-  }
-
-  buf->value_type = value_type;
-  buf->ndim = 1;
-  buf->shape[0] = n;
-
-  if (n == 0) {
-    // empty array
-    buf->data = nullptr;
-  } else {
-    uint8_t *m = new uint8_t[n * sz];
-    buf->data = reinterpret_cast<void *>(m);
-  }
-
-  return 1;  // ok
-}
-
-int c_tinyusd_buffer_free(CTinyUSDBuffer *buf) {
-  if (!buf) {
-    return 0;
-  }
-
-  if (!buf->data) {
-    return 0;
-  }
-
-  uint8_t *p = reinterpret_cast<uint8_t *>(buf->data);
-  delete[] p;
-
-  buf->data = nullptr;
-
-  return 1;
-}
-#endif
-
-int c_tinyusd_is_usda_file(const char *filename) {
-  if (tinyusdz::IsUSDA(filename)) {
-    return 1;
-  }
-  return 0;
-}
-
-int c_tinyusd_is_usdc_file(const char *filename) {
-  if (tinyusdz::IsUSDC(filename)) {
-    return 1;
-  }
-  return 0;
-}
-
-int c_tinyusd_is_usdz_file(const char *filename) {
-  if (tinyusdz::IsUSDZ(filename)) {
-    return 1;
-  }
-  return 0;
-}
-
-int c_tinyusd_is_usd_file(const char *filename) {
-  if (tinyusdz::IsUSD(filename)) {
-    return 1;
-  }
-  return 0;
-}
-
-int c_tinyusd_load_usd_from_file(const char *filename, CTinyUSDStage *stage,
-                                 c_tinyusd_string_t *warn,
-                                 c_tinyusd_string_t *err) {
-  // tinyusdz::Stage *p = new tinyusdz::Stage();
-
-  if (!stage) {
-    if (err) {
-      c_tinyusd_string_replace(err, "`stage` argument is null.\n");
-    }
-    return 0;
-  }
-
-  std::string _warn;
-  std::string _err;
-
-  bool ret = tinyusdz::LoadUSDFromFile(
-      filename, reinterpret_cast<tinyusdz::Stage *>(stage), &_warn,
-      &_err);
-
-  if (_warn.size() && warn) {
-    c_tinyusd_string_replace(warn, _warn.c_str());
-  }
-
-  if (!ret) {
-    if (err) {
-      c_tinyusd_string_replace(err, _err.c_str());
-    }
-
-    return 0;
-  }
-
-  return 1;
-}
-
-int c_tinyusd_load_usda_from_file(const char *filename, CTinyUSDStage *stage,
-                                 c_tinyusd_string_t *warn,
-                                 c_tinyusd_string_t *err) {
-  // tinyusdz::Stage *p = new tinyusdz::Stage();
-
-  if (!stage) {
-    if (err) {
-      c_tinyusd_string_replace(err, "`stage` argument is null.\n");
-    }
-    return 0;
-  }
-
-  std::string _warn;
-  std::string _err;
-
-  bool ret = tinyusdz::LoadUSDAFromFile(
-      filename, reinterpret_cast<tinyusdz::Stage *>(stage), &_warn,
-      &_err);
-
-  if (_warn.size() && warn) {
-    c_tinyusd_string_replace(warn, _warn.c_str());
-  }
-
-  if (!ret) {
-    if (err) {
-      c_tinyusd_string_replace(err, _err.c_str());
-    }
-
-    return 0;
-  }
-
-  return 1;
-}
-
-int c_tinyusd_load_usdc_from_file(const char *filename, CTinyUSDStage *stage,
-                                 c_tinyusd_string_t *warn,
-                                 c_tinyusd_string_t *err) {
-  // tinyusdz::Stage *p = new tinyusdz::Stage();
-
-  if (!stage) {
-    if (err) {
-      c_tinyusd_string_replace(err, "`stage` argument is null.\n");
-    }
-    return 0;
-  }
-
-  std::string _warn;
-  std::string _err;
-
-  bool ret = tinyusdz::LoadUSDCFromFile(
-      filename, reinterpret_cast<tinyusdz::Stage *>(stage), &_warn,
-      &_err);
-
-  if (_warn.size() && warn) {
-    c_tinyusd_string_replace(warn, _warn.c_str());
-  }
-
-  if (!ret) {
-    if (err) {
-      c_tinyusd_string_replace(err, _err.c_str());
-    }
-
-    return 0;
-  }
-
-  return 1;
-}
-
-int c_tinyusd_load_usdz_from_file(const char *filename, CTinyUSDStage *stage,
-                                 c_tinyusd_string_t *warn,
-                                 c_tinyusd_string_t *err) {
-  // tinyusdz::Stage *p = new tinyusdz::Stage();
-
-  if (!stage) {
-    if (err) {
-      c_tinyusd_string_replace(err, "`stage` argument is null.\n");
-    }
-    return 0;
-  }
-
-  std::string _warn;
-  std::string _err;
-
-  bool ret = tinyusdz::LoadUSDZFromFile(
-      filename, reinterpret_cast<tinyusdz::Stage *>(stage), &_warn,
-      &_err);
-
-  if (_warn.size() && warn) {
-    c_tinyusd_string_replace(warn, _warn.c_str());
-  }
-
-  if (!ret) {
-    if (err) {
-      c_tinyusd_string_replace(err, _err.c_str());
-    }
-
-    return 0;
-  }
-
-  return 1;
-}
-
-namespace {
-
-using namespace tinyusdz;
-
-bool CVisitPrimFunction(const Path &abs_path, const Prim &prim,
-                        const int32_t tree_depth, void *userdata,
-                        std::string *err) {
-  (void)tree_depth;
-
-  if (!userdata) {
-    if (err) {
-      (*err) += "`userdata` is nullptr.\n";
-    }
-    return false;
-  }
-
-  CTinyUSDPrim *pprim = reinterpret_cast<CTinyUSDPrim *>(const_cast<Prim *>(&prim));
-
-  CTinyUSDPath *ppath = reinterpret_cast<CTinyUSDPath *>(const_cast<Path *>(&abs_path));
-
-  CTinyUSDTraversalFunction callback_fun =
-      reinterpret_cast<CTinyUSDTraversalFunction>(userdata);
-
-  int ret = callback_fun(pprim, ppath);
-
-  if (ret) {
-    return true;
-  }
-
-  return false;
-}
-
-}  // namespace
-
-CTinyUSDPrim *c_tinyusd_prim_new(const char *_prim_type, c_tinyusd_string_t *err) {
-
-  if (!_prim_type) {
-    if (err) {
-      c_tinyusd_string_replace(err, "prim_type is nullptr.");
-    }
-    return nullptr;
-  }
-
-  std::string prim_type_name = std::string(_prim_type);
-  if (!tinyusdz::isValidIdentifier(prim_type_name)) {
-    if (err) {
-      c_tinyusd_string_replace(err, "prim_type contains invalid character.");
-    }
-    return nullptr;
-  }
-
-  bool non_builtin_prim_type{false};
-
-  CTinyUSDPrimType prim_type = c_tinyusd_prim_type_from_string(_prim_type);
-  if (prim_type == C_TINYUSD_PRIM_UNKNOWN) {
-    // Use `Model`
-    prim_type = C_TINYUSD_PRIM_MODEL;
-    non_builtin_prim_type = true;
-  }
-
-  Prim *p{nullptr};
-
-  if (non_builtin_prim_type) {
-    Model model;
-    model.prim_type_name = std::string(_prim_type);
-    p = new Prim(model);
-  } else {
-
-#define NEW_PRIM(__cty, __ty) \
-    if (prim_type == __cty) {   \
-      __ty content;             \
-      p = new Prim(content);    \
-    } else
-
-    NEW_PRIM(C_TINYUSD_PRIM_XFORM, Xform)
-    NEW_PRIM(C_TINYUSD_PRIM_SCOPE, Scope)
-    NEW_PRIM(C_TINYUSD_PRIM_MESH, GeomMesh)
-    NEW_PRIM(C_TINYUSD_PRIM_GEOMSUBSET, GeomSubset)
-    NEW_PRIM(C_TINYUSD_PRIM_MATERIAL, Material)
-    NEW_PRIM(C_TINYUSD_PRIM_SHADER, Shader)
-    // TODO: More types.
-    {
-      if (err) {
-        std::string msg = "Unknown or unsupported type: " + std::string(_prim_type) + "\n";
-        c_tinyusd_string_replace(err, msg.c_str());
-      }
-
-      // Unknown or unsupported type.
-      DCOUT("Unknown or unsupported type: " << _prim_type);
-      return nullptr;
-    }
-  }
-
-#undef NEW_PRIM
-
-  return reinterpret_cast<CTinyUSDPrim*>(p);
-}
-
-CTinyUSDPrim *c_tinyusd_prim_new_builtin(CTinyUSDPrimType prim_type) {
-
-  const char *prim_type_name = c_tinyusd_prim_type_name(prim_type);
-  if (!prim_type_name) {
-    return nullptr;
-  }
-
-  return c_tinyusd_prim_new(prim_type_name, nullptr);
-}
-
-int c_tinyusd_prim_free(CTinyUSDPrim *prim) {
-  if (!prim) {
-    return 0;
-  }
-
-  Prim *p = reinterpret_cast<Prim *>(prim);
-  delete p;
-
-  return 1;
-}
-
-int c_tinyusd_prim_to_string(const CTinyUSDPrim *prim, c_tinyusd_string_t *str) {
-  if (!prim) {
-    return 0;
-  }
-
-  if (!str) {
-    return 0;
-  }
-
-  const Prim *p = reinterpret_cast<const Prim *>(prim);
-
-  std::string s = tinyusdz::to_string(*p);
-
-  if (!c_tinyusd_string_replace(str, s.c_str())) {
-    return 0;
-  }
-
-  return 1;
-}
-
-CTinyUSDStage *c_tinyusd_stage_new() {
-
-  auto *buf = new tinyusdz::Stage();
-  return reinterpret_cast<CTinyUSDStage*>(buf);
-}
-
-int c_tinyusd_stage_to_string(const CTinyUSDStage *stage,
-                              c_tinyusd_string_t *str) {
-  if (!stage) {
-    return 0;
-  }
-
-  if (!str) {
-    return 0;
-  }
-
-  const auto *p = reinterpret_cast<const tinyusdz::Stage *>(stage);
-  std::string s = p->ExportToString();
-
-  return c_tinyusd_string_replace(str, s.c_str());
-}
-
-int c_tinyusd_stage_free(CTinyUSDStage *stage) {
-  if (!stage) {
-    return 0;
-  }
-
-  tinyusdz::Stage *ptr = reinterpret_cast<tinyusdz::Stage *>(stage);
-  delete ptr;
-
-  return 1;
-}
-
-int c_tinyusd_stage_traverse(const CTinyUSDStage *_stage,
-                             CTinyUSDTraversalFunction callback_fun,
-                             c_tinyusd_string_t *_err) {
-  if (!_stage) {
-    if (_err) {
-      c_tinyusd_string_replace(_err, "`stage` argument is null.\n");
-    }
-    return 0;
-  }
-
-  const tinyusdz::Stage *pstage =
-      reinterpret_cast<const tinyusdz::Stage *>(_stage);
-
-  DCOUT("visit prims\n");
-
-  std::string err;
-  if (!tinyusdz::tydra::VisitPrims(*pstage, CVisitPrimFunction,
-                                   reinterpret_cast<void *>(callback_fun),
-                                   &err)) {
-    if (_err) {
-      c_tinyusd_string_replace(_err, err.c_str());
-    }
-  }
-
-  return 1;
-}
-
-CTinyUSDValue *c_tinyusd_value_new_null() {
-
-  auto *pv = new tinyusdz::value::Value(nullptr);
-
-  return reinterpret_cast<CTinyUSDValue *>(pv);
-}
-
-int c_tinyusd_value_is_type(const CTinyUSDValue *_value, CTinyUSDValueType value_type) {
-
-  if (!_value) {
-    return 0;
-  }
-
-  const tinyusdz::value::Value *value = reinterpret_cast<const tinyusdz::value::Value *>(_value);
-  const char *ctyname = c_tinyusd_value_type_name(value_type);
-
-  if (value->type_name() == std::string(ctyname)) {
-    return 1;
-  }
-
-  return 0;
-}
-
-int c_tinyusd_value_free(CTinyUSDValue *aval) {
-  if (!aval) {
-    return 0;
-  }
-
-  tinyusdz::value::Value *vp = reinterpret_cast<tinyusdz::value::Value *>(aval);
-  delete vp;
-
-  return 1;
-}
-
-CTinyUSDValue *c_tinyusd_value_new_token(const c_tinyusd_token_t *tok) {
-  if (!tok) {
-    return nullptr;
-  }
-
-  auto *pv = reinterpret_cast<const tinyusdz::value::token *>(tok);
-
-  // copies.
-  tinyusdz::value::Value *vp = new tinyusdz::value::Value(*pv);
-
-  return reinterpret_cast<CTinyUSDValue *>(vp);
-}
-
-CTinyUSDValue *c_tinyusd_value_new_string(const c_tinyusd_string_t *str) {
-  if (!str) {
-    return nullptr;
-  }
-
-  auto *pv = reinterpret_cast<const std::string *>(str);
-
-  // copies.
-  tinyusdz::value::Value *vp = new tinyusdz::value::Value(*pv);
-
-  return reinterpret_cast<CTinyUSDValue *>(vp);
-}
-
-#define ATTRIB_VALUE_NEW_IMPL(__tyname, __cppty, __cty, __tyenum) \
-CTinyUSDValue *c_tinyusd_value_new_##__tyname(__cty val) { \
-  (void)__tyenum; \
-  /* ensure C++ and C types has same size. */ \
-  static_assert(sizeof(__cppty) == sizeof(__cty), ""); \
-  __cppty cppval; \
-  memcpy(&cppval, &val, sizeof(__cppty)); \
-  tinyusdz::value::Value *vp = new tinyusdz::value::Value(cppval); \
-  return reinterpret_cast<CTinyUSDValue *>(vp); \
-}
-
-ATTRIB_VALUE_NEW_IMPL(int, int, int, C_TINYUSD_VALUE_INT)
-ATTRIB_VALUE_NEW_IMPL(int2, value::int2, c_tinyusd_int2_t, C_TINYUSD_VALUE_INT2)
-ATTRIB_VALUE_NEW_IMPL(int3, value::int3, c_tinyusd_int3_t, C_TINYUSD_VALUE_INT3)
-ATTRIB_VALUE_NEW_IMPL(int4, value::int4, c_tinyusd_int4_t, C_TINYUSD_VALUE_INT4)
-
-ATTRIB_VALUE_NEW_IMPL(float, float, float, C_TINYUSD_VALUE_FLOAT)
-ATTRIB_VALUE_NEW_IMPL(float2, value::float2, c_tinyusd_float2_t, C_TINYUSD_VALUE_FLOAT2)
-ATTRIB_VALUE_NEW_IMPL(float3, value::float3, c_tinyusd_float3_t, C_TINYUSD_VALUE_FLOAT3)
-ATTRIB_VALUE_NEW_IMPL(float4, value::float4, c_tinyusd_float4_t, C_TINYUSD_VALUE_FLOAT4)
-
-#undef ATTRIB_VALUE_NEW_IMPL
-
-#define ATTRIB_VALUE_NEW_ARRAY_IMPL(__tyname, __cppty, __cty, __tyenum) \
-CTinyUSDValue *c_tinyusd_value_new_array_##__tyname(uint64_t n, const __cty *vals) { \
-  (void)__tyenum; \
-  /* ensure C++ and C types has same size. */ \
-  static_assert(sizeof(__cppty) == sizeof(__cty), ""); \
-  std::vector<__cppty> cppvalarray; \
-  cppvalarray.resize(size_t(n)); \
-  memcpy(cppvalarray.data(), &vals, sizeof(__cppty) * size_t(n)); \
-  tinyusdz::value::Value *vp = new tinyusdz::value::Value(std::move(cppvalarray)); \
-  return reinterpret_cast<CTinyUSDValue *>(vp); \
-}
-
-ATTRIB_VALUE_NEW_ARRAY_IMPL(int, int, int, C_TINYUSD_VALUE_INT)
-ATTRIB_VALUE_NEW_ARRAY_IMPL(int2, value::int2, c_tinyusd_int2_t, C_TINYUSD_VALUE_INT2)
-ATTRIB_VALUE_NEW_ARRAY_IMPL(int3, value::int3, c_tinyusd_int3_t, C_TINYUSD_VALUE_INT3)
-ATTRIB_VALUE_NEW_ARRAY_IMPL(int4, value::int4, c_tinyusd_int4_t, C_TINYUSD_VALUE_INT4)
-
-ATTRIB_VALUE_NEW_ARRAY_IMPL(float, float, float, C_TINYUSD_VALUE_FLOAT)
-ATTRIB_VALUE_NEW_ARRAY_IMPL(float2, value::float2, c_tinyusd_float2_t, C_TINYUSD_VALUE_FLOAT2)
-ATTRIB_VALUE_NEW_ARRAY_IMPL(float3, value::float3, c_tinyusd_float3_t, C_TINYUSD_VALUE_FLOAT3)
-ATTRIB_VALUE_NEW_ARRAY_IMPL(float4, value::float4, c_tinyusd_float4_t, C_TINYUSD_VALUE_FLOAT4)
-
-#undef ATTRIB_VALUE_NEW_ARRAY_IMPL
-
-#define ATTRIB_VALUE_AS_IMPL(__tyname, __cppty, __cty) \
-int c_tinyusd_value_as_##__tyname(const CTinyUSDValue *_value, __cty *val) { \
-  /* ensure C++ and C types has same size. */ \
-  static_assert(sizeof(__cppty) == sizeof(__cty), ""); \
-  if (!_value) { return 0; } \
-  const tinyusdz::value::Value *vp = reinterpret_cast<const tinyusdz::value::Value *>(_value); \
-  if (auto pv = vp->as<__cppty>()) { \
-    memcpy(val, pv, sizeof(__cppty)); \
-    return 1; \
-  } \
-  return 0; \
-}
-
-ATTRIB_VALUE_AS_IMPL(int, int, int);
-ATTRIB_VALUE_AS_IMPL(int2, value::int2, c_tinyusd_int2_t);
-ATTRIB_VALUE_AS_IMPL(int3, value::int3, c_tinyusd_int3_t);
-ATTRIB_VALUE_AS_IMPL(int4, value::int4, c_tinyusd_int4_t);
-
-ATTRIB_VALUE_AS_IMPL(float, float, float);
-ATTRIB_VALUE_AS_IMPL(float2, value::float2, c_tinyusd_float2_t);
-ATTRIB_VALUE_AS_IMPL(float3, value::float3, c_tinyusd_float3_t);
-ATTRIB_VALUE_AS_IMPL(float4, value::float4, c_tinyusd_float4_t);
-
-
-int c_tinyusd_value_to_string(const CTinyUSDValue *aval, c_tinyusd_string_t *str) {
-  if (!aval) {
-    return 0;
-  }
-
-  if (!str) {
-    return 0;
-  }
-
-  const tinyusdz::value::Value *cp = reinterpret_cast<const tinyusdz::value::Value *>(aval);
-
-  std::string s = tinyusdz::value::pprint_value(*cp, /* indent */0, /* closing_brace */false);
-
-  if (!c_tinyusd_string_replace(str, s.c_str())) {
-    return 0;
-  }
-
-  return 1;
-}
-
-int c_tinyusd_prim_get_property_names(const CTinyUSDPrim *prim, c_tinyusd_token_vector_t *prop_names_out) {
-  if (!prim) {
-    return 0;
-  }
-
-  if (!prop_names_out) {
-    return 0;
-  }
-
-  const Prim *p = reinterpret_cast<const Prim *>(prim);
-  std::vector<std::string> ps;
-  std::string err;
-  if (!tydra::GetPropertyNames(*p, &ps, &err)) {
-    // err is suppressed.
-    return 0;
-  }
-
-  if (!c_tinyusd_token_vector_resize(prop_names_out, ps.size())) {
-    return 0;
-  }
-
-  for (size_t i = 0; i < ps.size(); i++) {
-    const std::string &s = ps[i];
-
-    if (!c_tinyusd_token_vector_replace(prop_names_out, i, s.c_str())) {
-      return 0;
-    }
-  }
-
-  return 1;
-}
-
-static_assert(sizeof(c_tinyusd_int2_t) == sizeof(float) * 2, "");
-static_assert(sizeof(c_tinyusd_int3_t) == sizeof(float) * 3, "");
-static_assert(sizeof(c_tinyusd_int4_t) == sizeof(float) * 4, "");
-static_assert(sizeof(c_tinyusd_half2_t) == sizeof(uint16_t) * 2, "");
-static_assert(sizeof(c_tinyusd_half3_t) == sizeof(uint16_t) * 3, "");
-static_assert(sizeof(c_tinyusd_half4_t) == sizeof(uint16_t) * 4, "");
-static_assert(sizeof(c_tinyusd_quath_t) == sizeof(uint16_t) * 4, "");
-static_assert(sizeof(c_tinyusd_quatf_t) == sizeof(float) * 4, "");
-static_assert(sizeof(c_tinyusd_quatd_t) == sizeof(double) * 4, "");
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/c-tinyusd.h b/contrib/tinyusdz/tinyusdz_repo/src/c-tinyusd.h
deleted file mode 100644
index 19b9dc738..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/c-tinyusd.h
+++ /dev/null
@@ -1,988 +0,0 @@
-/* SPDX-License-Identifier: Apache 2.0
-
- C API(C11) for TinyUSDZ
- This C API is primarily for bindings for other languages.
- Various features/manipulations are missing and not intended to use C API
- solely(at the moment).
-
- NOTE: Use `c_tinyusd` or `CTinyUSD` prefix(`z` is missing) in C API.
-*/
-#ifndef C_TINYUSD_H
-#define C_TINYUSD_H
-
-/*#include <assert.h>*/
-#include <stdint.h>
-#include <wchar.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-
-   Common API design direction.
-
-
-   - Frequently used type uses lower snake case(e.g. `c_tinyusd_string_t`)
-   - For most of API, Return type is int(bool). 0 = failre, 1 = success.
-   - For `***_new` API, return type is a pointer of new'ed object.
-     - Use corresponding `***_free` to free a object.
-   - Argument order: object(in or inout), ins, inouts, then outs
-
-   Example
-
-   ```
-   c_tinyusd_string_t *s = c_tinyusd_string_new_empty();
-   if (!s) {
-     // err...
-   }
-   ...
-   c_tinyusd_string_free(&s);
-   ```
-
-   ```
-   CTinyUSDStage *pstage = c_tinyusd_stage_new();
-   c_tinyusd_string_t *pwarn = c_tinyusd_string_new_empty();
-   c_tinyusd_string_t *perr = c_tinyusd_string_new_empty();
-
-   For losd API, pass memory allocated Stage object and string objects to args.
-
-   int ret = c_tinyusd_load_usd_from_file("input.usd", pstage, pwarn, perr);
-
-   c_tinyusd_stage_free(pstage);
-   ```
-
-*/
-
-/*
- * TODO:
- *  - Provide dedicated string type for UTF-8 string?
- */
-
-/*
- *  TODO: Use same export macro logic with C++ API?
- */
-#if !defined(TINYUSDZ_EXPORT)
-
-#if defined(TINYUSDZ_SHARED_LIBRARY)
-
-#if defined(_MSC_VER)
-
-#if defined(TINYUSDZ_COMPILE_LIBRARY)
-#define C_TINYUSD_EXPORT __declspec(dllexport)
-#else
-#define C_TINYUSD_EXPORT __declspec(dllimport)
-#endif
-
-#else /* !_MSC_VER */
-
-#if defined(TINYUSDZ_COMPILE_LIBRARY)
-/* Assume non-msvc */
-#define C_TINYUSD_EXPORT __attribute__((visibility("default")))
-#else
-#define C_TINYUSD_EXPORT __declspec(dllimport)
-#endif
-
-#endif /* _MSC_VER */
-
-#else /* !TINYUSDZ_SHARED_LIBRARY */
-
-#define C_TINYUSD_EXPORT
-
-#endif /* TINYUSDZ_SHARED_LIBRARY */
-#endif /* TINYUSDZ_EXPORT */
-
-C_TINYUSD_EXPORT void *c_tinyusd_malloc(size_t nbytes);
-
-/* Returns 0 when failed. */
-C_TINYUSD_EXPORT int c_tinyusd_free(void *ptr);
-
-/*
-   NOTE: Current(2023.03) USD spec does not support 2D or multi-dim array,
-   so set max_dim to 1.
- */
-#define C_TINYUSD_MAX_DIM (1)
-
-typedef enum {
-  C_TINYUSD_FORMAT_UNKNOWN,
-  C_TINYUSD_FORMAT_AUTO,  // auto detect based on file extension.
-  C_TINYUSD_FORMAT_USDA,
-  C_TINYUSD_FORMAT_USDC,
-  C_TINYUSD_FORMAT_USDZ
-} CTinyUSDFormat;
-
-typedef enum {
-  C_TINYUSD_AXIS_UNKNOWN,
-  C_TINYUSD_AXIS_X,
-  C_TINYUSD_AXIS_Y,
-  C_TINYUSD_AXIS_Z,
-} CTinyUSDAxis;
-
-/*
-   NOTE: Use dedicated enum value for token[] and string[]
-   (therse use C struct `c_tinyusd_token_vector` and `c_tinyusd_string_vector`
-   respectively)
-
-   Use C_TINYUSD_VALUE_1D_BIT for other numerical value type to represent 1D
-   array.
-*/
-typedef enum {
-  C_TINYUSD_VALUE_UNKNOWN,
-  C_TINYUSD_VALUE_TOKEN,
-  C_TINYUSD_VALUE_TOKEN_VECTOR, /* token[] */
-  C_TINYUSD_VALUE_STRING,
-  C_TINYUSD_VALUE_STRING_VECTOR, /* string[] */
-  C_TINYUSD_VALUE_BOOL,
-  C_TINYUSD_VALUE_HALF,
-  C_TINYUSD_VALUE_HALF2,
-  C_TINYUSD_VALUE_HALF3,
-  C_TINYUSD_VALUE_HALF4,
-  C_TINYUSD_VALUE_INT,
-  C_TINYUSD_VALUE_INT2,
-  C_TINYUSD_VALUE_INT3,
-  C_TINYUSD_VALUE_INT4,
-  C_TINYUSD_VALUE_UINT,
-  C_TINYUSD_VALUE_UINT2,
-  C_TINYUSD_VALUE_UINT3,
-  C_TINYUSD_VALUE_UINT4,
-  C_TINYUSD_VALUE_INT64,
-  C_TINYUSD_VALUE_UINT64,
-  C_TINYUSD_VALUE_FLOAT,
-  C_TINYUSD_VALUE_FLOAT2,
-  C_TINYUSD_VALUE_FLOAT3,
-  C_TINYUSD_VALUE_FLOAT4,
-  C_TINYUSD_VALUE_DOUBLE,
-  C_TINYUSD_VALUE_DOUBLE2,
-  C_TINYUSD_VALUE_DOUBLE3,
-  C_TINYUSD_VALUE_DOUBLE4,
-  C_TINYUSD_VALUE_QUATH,
-  C_TINYUSD_VALUE_QUATF,
-  C_TINYUSD_VALUE_QUATD,
-  C_TINYUSD_VALUE_COLOR3H,
-  C_TINYUSD_VALUE_COLOR3F,
-  C_TINYUSD_VALUE_COLOR3D,
-  C_TINYUSD_VALUE_COLOR4H,
-  C_TINYUSD_VALUE_COLOR4F,
-  C_TINYUSD_VALUE_COLOR4D,
-  C_TINYUSD_VALUE_TEXCOORD2H,
-  C_TINYUSD_VALUE_TEXCOORD2F,
-  C_TINYUSD_VALUE_TEXCOORD2D,
-  C_TINYUSD_VALUE_TEXCOORD3H,
-  C_TINYUSD_VALUE_TEXCOORD3F,
-  C_TINYUSD_VALUE_TEXCOORD3D,
-  C_TINYUSD_VALUE_NORMAL3H,
-  C_TINYUSD_VALUE_NORMAL3F,
-  C_TINYUSD_VALUE_NORMAL3D,
-  C_TINYUSD_VALUE_VECTOR3H,
-  C_TINYUSD_VALUE_VECTOR3F,
-  C_TINYUSD_VALUE_VECTOR3D,
-  C_TINYUSD_VALUE_POINT3H,
-  C_TINYUSD_VALUE_POINT3F,
-  C_TINYUSD_VALUE_POINT3D,
-  C_TINYUSD_VALUE_MATRIX2D,
-  C_TINYUSD_VALUE_MATRIX3D,
-  C_TINYUSD_VALUE_MATRIX4D,
-  C_TINYUSD_VALUE_FRAME4D,
-  C_TINYUSD_VALUE_DICTIONARY, /* tinyusdz::value::CustomData. VtDictionary equivalent in pxrUSD */
-  C_TINYUSD_VALUE_END, /* terminator */
-} CTinyUSDValueType;
-
-/* assume the number of value types is less than 1024. */
-#define C_TINYUSD_VALUE_1D_BIT (1 << 10)
-
-/* NOTE: No `Geom` prefix to usdGeom prims in C API. */
-typedef enum {
-  C_TINYUSD_PRIM_UNKNOWN,
-  C_TINYUSD_PRIM_MODEL,
-  C_TINYUSD_PRIM_SCOPE,
-  C_TINYUSD_PRIM_XFORM,
-  C_TINYUSD_PRIM_MESH,
-  C_TINYUSD_PRIM_GEOMSUBSET,
-  C_TINYUSD_PRIM_MATERIAL,
-  C_TINYUSD_PRIM_SHADER,
-  C_TINYUSD_PRIM_CAMERA,
-  C_TINYUSD_PRIM_SPHERE_LIGHT,
-  C_TINYUSD_PRIM_DISTANT_LIGHT,
-  C_TINYUSD_PRIM_RECT_LIGHT,
-  /* TODO: Add more prim types... */
-  C_TINYUSD_PRIM_END,
-} CTinyUSDPrimType;
-
-/*
- * Use lower snake case for string/token and value types.
- */
-
-typedef uint16_t c_tinyusd_half_t;
-
-/*
-   Assume struct elements will be tightly packed in C11.
-   TODO: Ensure struct elements are tightly packed.
- */
-typedef struct {
-  int x;
-  int y;
-} c_tinyusd_int2_t;
-
-typedef struct {
-  int x;
-  int y;
-  int z;
-} c_tinyusd_int3_t;
-
-typedef struct {
-  int x;
-  int y;
-  int z;
-  int w;
-} c_tinyusd_int4_t;
-
-typedef struct {
-  uint32_t x;
-  uint32_t y;
-} c_tinyusd_uint2_t;
-
-typedef struct {
-  uint32_t x;
-  uint32_t y;
-  uint32_t z;
-} c_tinyusd_uint3_t;
-
-typedef struct {
-  uint32_t x;
-  uint32_t y;
-  uint32_t z;
-  uint32_t w;
-} c_tinyusd_uint4_t;
-
-typedef struct {
-  c_tinyusd_half_t x;
-  c_tinyusd_half_t y;
-} c_tinyusd_half2_t;
-
-typedef struct {
-  c_tinyusd_half_t x;
-  c_tinyusd_half_t y;
-  c_tinyusd_half_t z;
-} c_tinyusd_half3_t;
-
-typedef struct {
-  c_tinyusd_half_t x;
-  c_tinyusd_half_t y;
-  c_tinyusd_half_t z;
-  c_tinyusd_half_t w;
-} c_tinyusd_half4_t;
-
-typedef struct {
-  float x;
-  float y;
-} c_tinyusd_float2_t;
-
-typedef struct {
-  float x;
-  float y;
-  float z;
-} c_tinyusd_float3_t;
-
-typedef struct {
-  float x;
-  float y;
-  float z;
-  float w;
-} c_tinyusd_float4_t;
-
-typedef struct {
-  double x;
-  double y;
-} c_tinyusd_double2_t;
-
-typedef struct {
-  double x;
-  double y;
-  double z;
-} c_tinyusd_double3_t;
-
-typedef struct {
-  double x;
-  double y;
-  double z;
-  double w;
-} c_tinyusd_double4_t;
-
-typedef struct {
-  double m[4];
-} c_tinyusd_matrix2d_t;
-
-typedef struct {
-  double m[9];
-} c_tinyusd_matrix3d_t;
-
-typedef struct {
-  double m[16];
-} c_tinyusd_matrix4d_t;
-
-typedef struct {
-  c_tinyusd_half_t imag[3];
-  c_tinyusd_half_t real;
-} c_tinyusd_quath_t;
-
-typedef struct {
-  float imag[3];
-  float real;
-} c_tinyusd_quatf_t;
-
-typedef struct {
-  double imag[3];
-  double real;
-} c_tinyusd_quatd_t;
-
-typedef c_tinyusd_half3_t c_tinyusd_color3h_t;
-typedef c_tinyusd_float3_t c_tinyusd_color3f_t;
-typedef c_tinyusd_double3_t c_tinyusd_color3d_t;
-
-typedef c_tinyusd_half4_t c_tinyusd_color4h_t;
-typedef c_tinyusd_float4_t c_tinyusd_color4f_t;
-typedef c_tinyusd_double4_t c_tinyusd_color4d_t;
-
-typedef c_tinyusd_half3_t c_tinyusd_point3h_t;
-typedef c_tinyusd_float3_t c_tinyusd_point3f_t;
-typedef c_tinyusd_double3_t c_tinyusd_point3d_t;
-
-typedef c_tinyusd_half3_t c_tinyusd_normal3h_t;
-typedef c_tinyusd_float3_t c_tinyusd_normal3f_t;
-typedef c_tinyusd_double3_t c_tinyusd_normal3d_t;
-
-typedef c_tinyusd_half3_t c_tinyusd_vector3h_t;
-typedef c_tinyusd_float3_t c_tinyusd_vector3f_t;
-typedef c_tinyusd_double3_t c_tinyusd_vector3d_t;
-
-typedef c_tinyusd_matrix4d_t c_tinyusd_frame4d_t;
-
-typedef c_tinyusd_half2_t c_tinyusd_texcoord2h_t;
-typedef c_tinyusd_float2_t c_tinyusd_texcoord2f_t;
-typedef c_tinyusd_double2_t c_tinyusd_texcoord2d_t;
-
-typedef c_tinyusd_half3_t c_tinyusd_texcoord3h_t;
-typedef c_tinyusd_float3_t c_tinyusd_texcoord3f_t;
-typedef c_tinyusd_double3_t c_tinyusd_texcoord3d_t;
-
-typedef struct c_tinyusd_token_t c_tinyusd_token_t;
-
-C_TINYUSD_EXPORT c_tinyusd_token_t *c_tinyusd_token_new(const char *str);
-
-/* Duplicate token object. Return null when failed. */
-C_TINYUSD_EXPORT c_tinyusd_token_t *c_tinyusd_token_dup(
-    const c_tinyusd_token_t *tok);
-
-/* Length of token string. equivalent to std::string::size. */
-C_TINYUSD_EXPORT size_t c_tinyusd_token_size(const c_tinyusd_token_t *tok);
-
-/*
-   Get C char from a token.
-   Returned char pointer is valid until `c_tinyusd_token` instance is free'ed.
- */
-C_TINYUSD_EXPORT const char *c_tinyusd_token_str(const c_tinyusd_token_t *tok);
-
-/*
-   Free token
-   Return 0 when failed to free.
- */
-C_TINYUSD_EXPORT int c_tinyusd_token_free(c_tinyusd_token_t *tok);
-
-/*   opaque pointer to `std::vector<tinyusd::value::token>`. */
-typedef struct c_tinyusd_token_vector_t c_tinyusd_token_vector_t;
-
-/*  New token vector(array) with size zero(empty) */
-
-C_TINYUSD_EXPORT c_tinyusd_token_vector_t *c_tinyusd_token_vector_new_empty();
-
-/*  New token vector(array) with given size `n` */
-
-C_TINYUSD_EXPORT c_tinyusd_token_vector_t *c_tinyusd_token_vector_new(
-    const size_t n, const char **toks);
-C_TINYUSD_EXPORT int c_tinyusd_token_vector_free(c_tinyusd_token_vector_t *sv);
-
-/*
-   Returns number of elements.
-   0 when empty or `tv` is invalid.
- */
-C_TINYUSD_EXPORT size_t
-c_tinyusd_token_vector_size(const c_tinyusd_token_vector_t *sv);
-
-C_TINYUSD_EXPORT int c_tinyusd_token_vector_clear(c_tinyusd_token_vector_t *sv);
-C_TINYUSD_EXPORT int c_tinyusd_token_vector_resize(c_tinyusd_token_vector_t *sv,
-                                                   const size_t n);
-
-/*
-   Return const string pointer for given index.
-   Returns nullptr when index is out-of-range.
-*/
-C_TINYUSD_EXPORT const char *c_tinyusd_token_vector_str(
-    const c_tinyusd_token_vector_t *sv, const size_t idx);
-
-/*
-   Replace `index`th token.
-   Returns 0 when `sv` is invalid or `index` is out-of-range.
- */
-C_TINYUSD_EXPORT int c_tinyusd_token_vector_replace(
-    c_tinyusd_token_vector_t *sv, const size_t idx, const char *str);
-
-/* opaque pointer to `std::string`.*/
-typedef struct c_tinyusd_string_t c_tinyusd_string_t;
-
-C_TINYUSD_EXPORT c_tinyusd_string_t *c_tinyusd_string_new_empty();
-
-C_TINYUSD_EXPORT c_tinyusd_string_t *c_tinyusd_string_new(const char *str);
-
-/* Length of string. equivalent to std::string::size. */
-C_TINYUSD_EXPORT size_t c_tinyusd_string_size(const c_tinyusd_string_t *s);
-
-/* Replace existing string with given `str`.
- * `c_tinyusd_string` object must be new'ed beforehand.
- * Return 0 when failed to set.
- */
-C_TINYUSD_EXPORT int c_tinyusd_string_replace(c_tinyusd_string_t *s,
-                                              const char *str);
-
-/* Get C char(`std::string::c_str()`)
- * Returned char pointer is valid until `c_tinyusd_string` instance is free'ed.
- */
-C_TINYUSD_EXPORT const char *c_tinyusd_string_str(const c_tinyusd_string_t *s);
-
-C_TINYUSD_EXPORT int c_tinyusd_string_free(c_tinyusd_string_t *s);
-
-typedef struct {
-  void *data;  // opaque pointer to `std::vector<std::string>`.
-} c_tinyusd_string_vector;
-
-/*   New string vector(array) with given size `n` */
-C_TINYUSD_EXPORT int c_tinyusd_string_vector_new_empty(
-    c_tinyusd_string_vector *sv, const size_t n);
-
-C_TINYUSD_EXPORT int c_tinyusd_string_vector_new(c_tinyusd_string_vector *sv,
-                                                 const size_t n,
-                                                 const char **strs);
-
-/*
-   Returns number of elements.
-   0 when empty or `sv` is invalid.
- */
-C_TINYUSD_EXPORT size_t
-c_tinyusd_string_vector_size(const c_tinyusd_string_vector *sv);
-
-C_TINYUSD_EXPORT int c_tinyusd_string_vector_clear(c_tinyusd_string_vector *sv);
-C_TINYUSD_EXPORT int c_tinyusd_string_vector_resize(c_tinyusd_string_vector *sv,
-                                                    const size_t n);
-
-/*
-   Return const string pointer for given index.
-   Returns nullptr when index is out-of-range.
- */
-C_TINYUSD_EXPORT const char *c_tinyusd_string_vector_str(
-    const c_tinyusd_string_vector *sv, const size_t idx);
-
-/*
-   Replace `index`th string.
-   Returns 0 when `sv` is invalid or `index` is out-of-range.
- */
-C_TINYUSD_EXPORT int c_tinyusd_string_vector_replace(
-    c_tinyusd_string_vector *sv, const size_t idx, const char *str);
-
-C_TINYUSD_EXPORT int c_tinyusd_string_vector_free(c_tinyusd_string_vector *sv);
-
-/*
-   Return the name of Prim type(e.g. "Xform", "Mesh", ...).
-   Return NULL for unsupported/unknown Prim type.
-   Returned char pointer is valid until Prim is modified or deleted.
- */
-C_TINYUSD_EXPORT const char *c_tinyusd_prim_type_name(
-    CTinyUSDPrimType prim_type);
-
-/*
-   Return Builtin PrimType from a string.
-   Returns C_TINYUSD_PRIM_UNKNOWN for invalid or unknown/unsupported Prim type
- */
-CTinyUSDPrimType c_tinyusd_prim_type_from_string(const char *prim_type);
-
-/*
-   Returns name of ValueType.
-   The pointer points to static Thread-local storage(so thread-safe), thus no
-   need to free it.
- */
-C_TINYUSD_EXPORT const char *c_tinyusd_value_type_name(
-    CTinyUSDValueType value_type);
-
-/*
-   Return 1: Value type is numeric type(float3, int, ...). 0 otherwise(e.g. token, dictionary, ...)
- */
-C_TINYUSD_EXPORT uint32_t c_tinyusd_value_type_is_numeric(CTinyUSDValueType value_type);
-
-/*
-   Returns sizeof(value_type);
-   For non-numeric value type(e.g. STRING, TOKEN) and invalid enum value, it
-   returns 0. NOTE: Returns 1 for bool type.
- */
-C_TINYUSD_EXPORT uint32_t c_tinyusd_value_type_sizeof(CTinyUSDValueType value_type);
-
-/*
-   Returns the number of components of given value_type;
-   For example, 3 for C_TINYUSD_VALUE_POINT3F.
-   For non-numeric value type(e.g. STRING, TOKEN), it returns 0.
-   For scalar type, it returns 1.
- */
-C_TINYUSD_EXPORT uint32_t
-c_tinyusd_value_type_components(CTinyUSDValueType value_type);
-
-/*  opaque pointer to tinyusdz::value::Value */
-typedef struct CTinyUSDValue CTinyUSDValue;
-
-/* Return value type enum.
-   Returns C_TINYUSD_VALUE_UNKNOWN when `value` is nullptr or invalid.
- */
-C_TINYUSD_EXPORT CTinyUSDValueType c_tinyusd_value_type(const CTinyUSDValue *value);
-
-/*
-  New Value with null(empty) value.
- */
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_null();
-
-C_TINYUSD_EXPORT int c_tinyusd_value_free(CTinyUSDValue *val);
-
-/*
-   Get string representation of Value content(pprint).
-
-   Return 0 upon error.
-*/
-C_TINYUSD_EXPORT int c_tinyusd_value_to_string(const CTinyUSDValue *val,
-                                               c_tinyusd_string_t *str);
-
-/* Free Value.
-   Internally calls `c_tinyusd_buffer_free` to free buffer associated with this
-   Value.
- */
-C_TINYUSD_EXPORT int c_tinyusd_value_free(CTinyUSDValue *val);
-
-/*
-   New Value with token type.
-   NOTE: token data are copied. So it is safe to free token after calling this
-   function.
-*/
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_token(
-    const c_tinyusd_token_t *val);
-
-/*
-   New Value with string type.
-   NOTE: string data are copied. So it is safe to free string after calling this
-   function.
- */
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_string(
-    const c_tinyusd_string_t *val);
-
-/*
-   New Value with specific type.
-   NOTE: Datas are copied.
-   Returns 1 upon success, 0 failed.
- */
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_int(int val);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_int2(c_tinyusd_int2_t val);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_int3(c_tinyusd_int3_t val);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_int4(c_tinyusd_int4_t val);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_float(float val);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_float2(
-    c_tinyusd_float2_t val);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_float3(
-    c_tinyusd_float3_t val);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_float4(
-    c_tinyusd_float4_t val);
-/*   TODO: List up other types... */
-
-/* Check if the content of Value is the type of `value_type` */
-C_TINYUSD_EXPORT int c_tinyusd_value_is_type(const CTinyUSDValue *value, CTinyUSDValueType value_type);
-
-/*
-   Get the actual value in CTinyUSDValue by specifying the type.
-   NOTE: Datas are copied.
-   Returns 1 upon success, 0 failed(e.g. Value is invalid, type mismatch).
- */
-C_TINYUSD_EXPORT int c_tinyusd_value_as_int(const CTinyUSDValue *value, int *val);
-C_TINYUSD_EXPORT int c_tinyusd_value_as_int2(const CTinyUSDValue *value, c_tinyusd_int2_t *val);
-C_TINYUSD_EXPORT int c_tinyusd_value_as_int3(const CTinyUSDValue *value, c_tinyusd_int3_t *val);
-C_TINYUSD_EXPORT int c_tinyusd_value_as_int4(const CTinyUSDValue *value, c_tinyusd_int4_t *val);
-
-C_TINYUSD_EXPORT int c_tinyusd_value_as_float(const CTinyUSDValue *value, float *val);
-C_TINYUSD_EXPORT int c_tinyusd_value_as_float2(const CTinyUSDValue *value, c_tinyusd_float2_t *val);
-C_TINYUSD_EXPORT int c_tinyusd_value_as_float3(const CTinyUSDValue *value, c_tinyusd_float3_t *val);
-C_TINYUSD_EXPORT int c_tinyusd_value_as_float4(const CTinyUSDValue *value, c_tinyusd_float4_t *val);
-
-
-/*   TODO: List up other types... */
-
-
-/*
-   New Value with 1D array ofspecific type.
-   NOTE: Array data is copied.
- */
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_array_int(uint64_t n,
-                                                              const int *vals);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_array_int2(
-    uint64_t n, const c_tinyusd_int2_t *vals);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_array_int3(
-    uint64_t n, const c_tinyusd_int3_t *vals);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_array_int4(
-    uint64_t n, const c_tinyusd_int4_t *vals);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_array_float(uint64_t n,
-                                                                const float *vals);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_array_float2(
-    uint64_t n, const c_tinyusd_float2_t *vals);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_array_float3(
-    uint64_t n, const c_tinyusd_float3_t *vals);
-C_TINYUSD_EXPORT CTinyUSDValue *c_tinyusd_value_new_array_float4(
-    uint64_t n, const c_tinyusd_float4_t *vals);
-/*   TODO: List up other types... */
-
-/* opaque pointer to tinyusdz::Path */
-typedef struct CTinyUSDPath CTinyUSDPath;
-
-/* opaque pointer to tinyusdz::Property */
-typedef struct CTinyUSDProperty CTinyUSDProperty;
-
-/* opaque pointer to tinyusdz::Relationship */
-typedef struct CTinyUSDRelationship CTinyUSDRelationship;
-
-CTinyUSDRelationship *c_tinyusd_relationsip_new(uint32_t n,
-                                                const char **targetPaths);
-
-C_TINYUSD_EXPORT int c_tinyusd_relationsip_free(CTinyUSDRelationship *rel);
-
-C_TINYUSD_EXPORT int c_tinyusd_relationsip_is_blocked(
-    const CTinyUSDRelationship *rel);
-
-/* Returns 0 = declaration only(e.g. `rel myrel`) */
-C_TINYUSD_EXPORT uint32_t
-c_tinyusd_relationsip_num_targetPaths(const CTinyUSDRelationship *rel);
-
-/*
-   Get i'th targetPath
-   Returned `targetPath` is just a reference, so no need to free it.
- */
-C_TINYUSD_EXPORT int c_tinyusd_relationsip_get_targetPath(
-    const CTinyUSDRelationship *rel, uint32_t i, CTinyUSDPath *targetPath);
-
-/*   opaque pointer to tinyusdz::Attribute */
-typedef struct CTinyUSDAttribute CTinyUSDAttribute;
-
-C_TINYUSD_EXPORT int c_tinyusd_attribute_connection_set(
-    CTinyUSDAttribute *attr, const CTinyUSDPath *connectionPath);
-
-C_TINYUSD_EXPORT int c_tinyusd_attribute_connections_set(
-    CTinyUSDAttribute *attr, uint32_t n, const CTinyUSDPath *connectionPaths);
-
-C_TINYUSD_EXPORT int c_tinyusd_attribute_meta_set(
-    CTinyUSDAttribute *attr, const char *meta_name, const CTinyUSDValue *value);
-
-/*
-   Get metadata value.
-   Returns 0 when `attr` is nullptr.
-   Returns -1 when requested metadata is not authored.
-   `value` is just a pointer so no need to free it(the pointer is valid until `attr` is modified/deleted)
- */
-C_TINYUSD_EXPORT int c_tinyusd_attribute_meta_get(
-    CTinyUSDAttribute *attr, const char *meta_name, const CTinyUSDValue **value);
-
-
-#if 0
-   Get i'th targetPaths
-C_TINYUSD_EXPORT int c_tinyusd_attribute_connection_get(CTinyUSDAttribute *attr, uint32_t n, const CTinyUSDPath *connectionPaths);
-#endif
-
-C_TINYUSD_EXPORT int c_tinyusd_property_new(CTinyUSDProperty *prop);
-C_TINYUSD_EXPORT int c_tinyusd_property_new_attribute(
-    CTinyUSDProperty *prop, const CTinyUSDAttribute *attr);
-C_TINYUSD_EXPORT int c_tinyusd_property_new_relationship(
-    CTinyUSDProperty *prop, const CTinyUSDRelationship *rel);
-C_TINYUSD_EXPORT int c_tinyusd_property_free(CTinyUSDProperty *prop);
-
-C_TINYUSD_EXPORT int c_tinyusd_property_set_attribute(
-    CTinyUSDProperty *prop, const CTinyUSDAttribute *attr);
-C_TINYUSD_EXPORT int c_tinyusd_property_set_relationship(
-    CTinyUSDProperty *prop, const CTinyUSDRelationship *rel);
-
-C_TINYUSD_EXPORT int c_tinyusd_property_is_attribute(const CTinyUSDProperty *prop);
-C_TINYUSD_EXPORT int c_tinyusd_property_is_attribute_connection(
-    const CTinyUSDProperty *prop);
-C_TINYUSD_EXPORT int c_tinyusd_property_is_relationship(const CTinyUSDProperty *prop);
-
-C_TINYUSD_EXPORT int c_tinyusd_property_is_custom(const CTinyUSDProperty *prop);
-C_TINYUSD_EXPORT int c_tinyusd_property_is_varying(const CTinyUSDProperty *prop);
-
-typedef struct CTinyUSDPrim CTinyUSDPrim;
-
-/*
-   Create Prim with name.
-   Will create a builtin Prim when `prim_type` is a builtin Prim name(e.g.
-   "Xform")
-   Otherwise create a Model Prim(Generic Prim).
-   Return nullptr when `prim_type` is null or `prim_type` contains invalid
-   character (A character which cannot be used for Prim type name(e.g. '%') and
-   fills `err` with error message.
-   (App need to free `err` after using it.)
- */
-CTinyUSDPrim *c_tinyusd_prim_new(const char *prim_type,
-                                 c_tinyusd_string_t *err);
-
-/* Create Prim with builtin Prim type.
-   Returns nullptr when invalid `prim_type` enum value is provided.
- */
-
-CTinyUSDPrim *c_tinyusd_prim_new_builtin(CTinyUSDPrimType prim_type);
-
-C_TINYUSD_EXPORT int c_tinyusd_prim_to_string(const CTinyUSDPrim *prim,
-                                              c_tinyusd_string_t *str);
-
-C_TINYUSD_EXPORT int c_tinyusd_prim_free(CTinyUSDPrim *prim);
-
-/* Prim type as a const char pointer.
-   Returns nullptr when `prim` is invalid */
-C_TINYUSD_EXPORT const char *c_tinyusd_prim_type(const CTinyUSDPrim *prim);
-
-/*
-   Return the element name of Prim(e.g. "root", "pbr", "xform0").
-   Return NULL when input `prim` is invalid.
-   Returned char pointer is valid until Prim is modified or deleted.
- */
-C_TINYUSD_EXPORT const char *c_tinyusd_prim_element_name(
-    const CTinyUSDPrim *prim);
-
-
-/*
-   Get list of property names as token array.
-
-   @param[in] prim Prim
-   @param[out] prop_names Property names. Please initialize this instance using
-   `c_tinyusd_token_vector_new` beforehand.
-
-   @return 1 upon success(even when len(property names) == 0). 0 failure.
- */
-C_TINYUSD_EXPORT int c_tinyusd_prim_get_property_names(
-    const CTinyUSDPrim *prim, c_tinyusd_token_vector_t *prop_names_out);
-
-/*
-   Get Prim's property. Returns 0 when property `prop_name` does not exist in
-   the Prim. `prop` just holds pointer to corresponding C++ Property instance,
-   so no free operation required.
- */
-C_TINYUSD_EXPORT int c_tinyusd_prim_property_get(const CTinyUSDPrim *prim,
-                                                 const char *prop_name,
-                                                 CTinyUSDProperty *prop);
-
-/*
-   Add property to the Prim.
-   It copies the content of `prop`, so please free `prop` after this add
-   operation. Returns 0 when the operation failed(`err` will be returned. Please
-   free `err` after using it)
- */
-C_TINYUSD_EXPORT int c_tinyusd_prim_property_add(CTinyUSDPrim *prim,
-                                                 const char *prop_name,
-                                                 const CTinyUSDProperty *prop,
-                                                 c_tinyusd_string_t *err);
-
-/*
-   Delete a property in the Prim.
-   Returns 0 when `prop_name` does not exist in the prim.
- */
-C_TINYUSD_EXPORT int c_tinyusd_prim_property_del(CTinyUSDPrim *prim,
-                                                 const char *prop_name);
-
-/*
-   Set Prim metadatum.
-   Return 0 when Value type mismatch for builtin metadata.
- */
-C_TINYUSD_EXPORT int c_tinyusd_prim_meta_set(CTinyUSDPrim *prim,
-                                             const char *meta_name,
-                                             const CTinyUSDValue *value);
-
-/*
-   Get Prim metadatum.
-   Return 0 when requested metadatum is not authord or invalid.
-   Returned `value` is just a pointer, so no need to free it(and the pointer is valid unless `prim` is modified/deleted.
- */
-C_TINYUSD_EXPORT int c_tinyusd_prim_meta_get(CTinyUSDPrim *prim,
-                                             const char *meta_name,
-                                             const CTinyUSDValue **value);
-
-/*
-   Check if requested metadatum is authored.
-   Return 1: authored. 0 not authored.
- */
-C_TINYUSD_EXPORT int c_tinyusd_prim_meta_authored(CTinyUSDPrim *prim,
-                                             const char *meta_name);
-
-/*
-   Append Prim to `prim`'s children. child Prim object is *COPIED*.
-   So need to free child Prim after the append_child operation.
- */
-
-C_TINYUSD_EXPORT int c_tinyusd_prim_append_child(CTinyUSDPrim *prim,
-                                                 CTinyUSDPrim *child);
-
-/*
-   Append Prim to `prim`'s children. child Prim object is moved(in C++ meaning).
-   So no need to free child Prim(and `child` pointer is invalid after calling
-   this function. Usefull if a Prim is a large object(e.g. GeomMesh with 100M
-   vertices)
- */
-C_TINYUSD_EXPORT int c_tinyusd_prim_append_child_move(CTinyUSDPrim *prim,
-                                                      CTinyUSDPrim *child);
-
-/*
-   Delete child at `child_index` position from a Prim.
-   Return 0 when `child_index` is out-of-range.
- */
-C_TINYUSD_EXPORT int c_tinyusd_prim_del_child(CTinyUSDPrim *prim,
-                                              uint64_t child_index);
-
-/*
-   Return the number of child Prims in this Prim.
-
-   Return 0 when `prim` is invalid or nullptr.
-*/
-C_TINYUSD_EXPORT uint64_t c_tinyusd_prim_num_children(const CTinyUSDPrim *prim);
-
-/*
-   Get a child Prim of specified child_index.
-
-   Child's conent is just a pointer, so please do not call Prim
-   deleter(`c_tinyusd_prim_free`) to it. (Please use `c_tinyusd_prim_del_child`
-   if you want to remove a child Prim)
-
-   Also the content(pointer) is valid unless the `prim`'s children is
-   preserved(i.e., child is not deleted/added)
-
-   Return 0 when `child_index` is out-of-range.
-*/
-C_TINYUSD_EXPORT int c_tinyusd_prim_get_child(const CTinyUSDPrim *prim,
-                                              uint64_t child_index,
-                                              const CTinyUSDPrim **child_prim);
-
-/* opaque pointer to tinyusd::Stage */
-typedef struct CTinyUSDStage CTinyUSDStage;
-
-C_TINYUSD_EXPORT CTinyUSDStage *c_tinyusd_stage_new();
-C_TINYUSD_EXPORT int c_tinyusd_stage_to_string(const CTinyUSDStage *stage,
-                                               c_tinyusd_string_t *str);
-C_TINYUSD_EXPORT int c_tinyusd_stage_free(CTinyUSDStage *stage);
-
-/*
-   Callback function for Stage's root Prim traversal.
-   Return 1 for success, Return 0 to stop traversal futher.
- */
-typedef int (*CTinyUSDTraversalFunction)(const CTinyUSDPrim *prim,
-                                         const CTinyUSDPath *path);
-
-/*
-   Traverse root Prims in the Stage and invoke callback function for each Prim.
-
-   @param[in] stage Stage.
-   @param[in] callbacl_fun Callback function.
-   @param[out] err Optional. error message.
-
-   @return 1 upon success. 0 when failed(and `err` will be set).
-
-   When providing `err`, it must be created with `c_tinyusd_string_new` before
-   calling this `c_tinyusd_stage_traverse` function, and an App must free it by
-   calling `c_tinyusd_string_free` after using it.
- */
-C_TINYUSD_EXPORT int c_tinyusd_stage_traverse(
-    const CTinyUSDStage *stage, CTinyUSDTraversalFunction callback_fun,
-    c_tinyusd_string_t *err);
-
-/*
-   Detect file format of input file.
- */
-CTinyUSDFormat c_tinyusd_detect_format(const char *filename);
-
-C_TINYUSD_EXPORT int c_tinyusd_is_usd_file(const char *filename);
-C_TINYUSD_EXPORT int c_tinyusd_is_usda_file(const char *filename);
-C_TINYUSD_EXPORT int c_tinyusd_is_usdc_file(const char *filename);
-C_TINYUSD_EXPORT int c_tinyusd_is_usdz_file(const char *filename);
-
-/*
- * wide char version. especially for Windows UTF-16 filename.
- */
-CTinyUSDFormat c_tinyusd_detect_format_w(const wchar_t *filename);
-
-C_TINYUSD_EXPORT int c_tinyusd_is_usd_file_w(const wchar_t *filename);
-C_TINYUSD_EXPORT int c_tinyusd_is_usda_file_w(const wchar_t *filename);
-C_TINYUSD_EXPORT int c_tinyusd_is_usdc_file_w(const wchar_t *filename);
-C_TINYUSD_EXPORT int c_tinyusd_is_usdz_file_w(const wchar_t *filename);
-
-C_TINYUSD_EXPORT int c_tinyusd_is_usd_memory(const uint8_t *addr,
-                                             const size_t nbytes);
-C_TINYUSD_EXPORT int c_tinyusd_is_usda_memory(const uint8_t *addr,
-                                              const size_t nbytes);
-C_TINYUSD_EXPORT int c_tinyusd_is_usdc_memory(const uint8_t *addr,
-                                              const size_t nbytes);
-C_TINYUSD_EXPORT int c_tinyusd_is_usdz_memory(const uint8_t *addr,
-                                              const size_t nbytes);
-
-/*
- * Return 1 upon success. 0 when failed.
- */
-C_TINYUSD_EXPORT int c_tinyusd_load_usd_from_file(const char *filename,
-                                                  CTinyUSDStage *stage,
-                                                  c_tinyusd_string_t *warn,
-                                                  c_tinyusd_string_t *err);
-C_TINYUSD_EXPORT int c_tinyusd_load_usda_from_file(const char *filename,
-                                                   CTinyUSDStage *stage,
-                                                   c_tinyusd_string_t *warn,
-                                                   c_tinyusd_string_t *err);
-C_TINYUSD_EXPORT int c_tinyusd_load_usdc_from_file(const char *filename,
-                                                   CTinyUSDStage *stage,
-                                                   c_tinyusd_string_t *warn,
-                                                   c_tinyusd_string_t *err);
-C_TINYUSD_EXPORT int c_tinyusd_load_usdz_from_file(const char *filename,
-                                                   CTinyUSDStage *stage,
-                                                   c_tinyusd_string_t *warn,
-                                                   c_tinyusd_string_t *err);
-
-/*
- * wide char version. especially for Windows UTF-16 filename.
- */
-C_TINYUSD_EXPORT int c_tinyusd_load_usd_from_file_w(const wchar_t *filename,
-                                                    CTinyUSDStage *stage,
-                                                    c_tinyusd_string_t *warn,
-                                                    c_tinyusd_string_t *err);
-C_TINYUSD_EXPORT int c_tinyusd_load_usda_from_file_w(const wchar_t *filename,
-                                                     CTinyUSDStage *stage,
-                                                     c_tinyusd_string_t *warn,
-                                                     c_tinyusd_string_t *err);
-C_TINYUSD_EXPORT int c_tinyusd_load_usdc_from_file_w(const wchar_t *filename,
-                                                     CTinyUSDStage *stage,
-                                                     c_tinyusd_string_t *warn,
-                                                     c_tinyusd_string_t *err);
-C_TINYUSD_EXPORT int c_tinyusd_load_usdz_from_file_w(const wchar_t *filename,
-                                                     CTinyUSDStage *stage,
-                                                     c_tinyusd_string_t *warn,
-                                                     c_tinyusd_string_t *err);
-
-C_TINYUSD_EXPORT int c_tinyusd_load_usd_from_memory(const uint8_t *addr,
-                                                    const size_t nbytes,
-                                                    c_tinyusd_string_t *warn,
-                                                    c_tinyusd_string_t *err);
-C_TINYUSD_EXPORT int c_tinyusd_load_usda_from_memory(const uint8_t *addr,
-                                                     const size_t nbytes,
-                                                     c_tinyusd_string_t *warn,
-                                                     c_tinyusd_string_t *err);
-C_TINYUSD_EXPORT int c_tinyusd_load_usdc_from_memory(const uint8_t *addr,
-                                                     const size_t nbytes,
-                                                     c_tinyusd_string_t *warn,
-                                                     c_tinyusd_string_t *err);
-C_TINYUSD_EXPORT int c_tinyusd_load_usdz_from_memory(const uint8_t *addr,
-                                                     const size_t nbytes,
-                                                     c_tinyusd_string_t *warn,
-                                                     c_tinyusd_string_t *err);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // C_TINYUSD_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/crate-writer.cc b/contrib/tinyusdz/tinyusdz_repo/src/crate-writer.cc
deleted file mode 100644
index d749dea4c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/crate-writer.cc
+++ /dev/null
@@ -1,298 +0,0 @@
-#include <limits>
-#include <cstdint>
-#include <cstring>
-
-#include "crate-writer.hh"
-#include "value-types.hh"
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-// TODO: Use std:: version for C++17
-#include "nonstd/optional.hpp"
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-namespace tinyusdz {
-namespace crate {
-
-namespace {
-
-struct FltBit {
-  union {
-    float f;
-    uint32_t i;
-  };
-};
-
-struct DblBit {
-  union {
-    double f;
-    uint64_t i;
-  };
-};
-
-template<typename T>
-bool Compare(const T &lhs, const T &rhs) {
-  return lhs == rhs;
-}
- 
-// Use bitfield comparison for floating-point value,
-// This may give slightly different result compared to pxrUSD implementation
-// (which uses `==` for floating point comparison)
-template<>
-bool Compare(const double &lhs, const double &rhs) {
-  DblBit a; a.f = lhs;
-  DblBit b; b.f = rhs;
-
-  return (a.i == b.i);
-}
-
-template<>
-bool Compare(const float &lhs, const float &rhs) {
-  FltBit a; a.f = lhs;
-  FltBit b; b.f = rhs;
-
-  return (a.i == b.i);
-}
-
-} // namespace
-
-// IsExactlyRepresented in pxrUSD.
-template<typename Tfrom, typename Tto>
-nonstd::optional<Tto> TryExactlyRepresentable(const Tfrom &from) {
-  // NOTE: pxrUSD uses lowest() for minval, not min()
-  Tfrom minval = static_cast<Tfrom>(std::numeric_limits<Tto>::lowest());
-  Tfrom maxval = static_cast<Tfrom>(std::numeric_limits<Tto>::max());
-
-  if (from < minval) {
-    return nonstd::nullopt;
-  }
-
-  if (from > maxval) {
-    return nonstd::nullopt;
-  }
-
-  // Identity check.
-  Tto vt = static_cast<Tto>(from);
-  if (Compare(static_cast<Tfrom>(vt), from)) {
-    return vt;
-  }
-
-  return nonstd::nullopt;
-}
-
-// NOTE `Inline` payload is 6bytes.
-//
-// - Inlineable value
-//   - double as float format
-//   - (u)int64 as (u)int32
-//   - vector as int8 x N (n = 2, 3 or 4)
-//   - Diagonal matrix as int8 x N  (n = 2, 3 or 4)
-//   - empty dictionary
-
-inline nonstd::optional<uint32_t> TryEncodeInline(double v) {
-  uint32_t dst;
-
-  nonstd::optional<float> f = TryExactlyRepresentable<double, float>(v);
-
-  if (f) {
-    memcpy(&dst, &f.value(), sizeof(float));
-    return dst;
-  }
-
-  return nonstd::nullopt;
-}
-
-inline nonstd::optional<uint32_t> TryEncodeInline(uint64_t v) {
-  uint32_t dst;
-
-  nonstd::optional<uint32_t> f = TryExactlyRepresentable<uint64_t, uint32_t>(v);
-
-  if (f) {
-    dst = f.value();
-    return dst;
-  }
-
-  return nonstd::nullopt;
-}
-
-inline nonstd::optional<uint32_t> TryEncodeInline(int64_t v) {
-  uint32_t dst;
-
-  nonstd::optional<int32_t> f = TryExactlyRepresentable<int64_t, int32_t>(v);
-
-  if (f) {
-    memcpy(&dst, &f.value(), sizeof(int32_t));
-    return dst;
-  }
-
-  return nonstd::nullopt;
-}
-
-inline nonstd::optional<uint32_t> TryEncodeInline(value::vector3f v) {
-  uint32_t dst;
-
-  // Check if each component of the vector can be represented by int8.
-  std::array<int8_t, 3> ivec;
-  for (size_t i = 0; i < 3; i++) {
-    if (auto f = TryExactlyRepresentable<float, int8_t>(v[i])) {
-      ivec[i] = f.value();
-    } else {
-      return nonstd::nullopt;
-    }
-  }
-
-  memcpy(&dst, &ivec[0], sizeof(ivec));
-  return dst;
-}
-
-inline nonstd::optional<uint32_t> TryEncodeInline(value::vector3d v) {
-  uint32_t dst;
-
-  // Check if each component of the vector can be represented by int8.
-  std::array<int8_t, 3> ivec;
-  for (size_t i = 0; i < 3; i++) {
-    if (auto f = TryExactlyRepresentable<double, int8_t>(v[i])) {
-      ivec[i] = f.value();
-    } else {
-      return nonstd::nullopt;
-    }
-  }
-
-  memcpy(&dst, &ivec[0], sizeof(ivec));
-  return dst;
-}
-
-inline nonstd::optional<uint32_t> TryEncodeInline(value::color4f v) {
-  uint32_t dst;
-
-  // Check if each component of the vector can be represented by int8.
-  std::array<int8_t, 4> ivec;
-  for (size_t i = 0; i < 4; i++) {
-    if (auto f = TryExactlyRepresentable<float, int8_t>(v[i])) {
-      ivec[i] = f.value();
-    } else {
-      return nonstd::nullopt;
-    }
-  }
-
-  memcpy(&dst, &ivec[0], sizeof(ivec));
-  return dst;
-}
-
-inline nonstd::optional<uint32_t> TryEncodeInline(value::color4d v) {
-  uint32_t dst;
-
-  // Check if each component of the vector can be represented by int8.
-  std::array<int8_t, 4> ivec;
-  for (size_t i = 0; i < 4; i++) {
-    if (auto f = TryExactlyRepresentable<double, int8_t>(v[i])) {
-      ivec[i] = f.value();
-    } else {
-      return nonstd::nullopt;
-    }
-  }
-
-  memcpy(&dst, &ivec[0], sizeof(ivec));
-  return dst;
-}
-
-//
-// TODO: Implement more TryEncodeInline for scalar value types
-//
-
-inline nonstd::optional<uint32_t> TryEncodeInline(value::matrix2d v) {
-  uint32_t dst;
-
-  // Check if a matrix is a diagonal matrix and its diagonal component can be represented by int8.
-  std::array<int8_t, 2> diag;
-  for (size_t i = 0; i < 2; i++) {
-    for (size_t j = 0; j < 2; j++) {
-      if (i == j) {
-        // diag
-        if (auto f = TryExactlyRepresentable<double, int8_t>(v.m[i][j])) {
-          diag[i] = f.value();
-        } else {
-          return nonstd::nullopt;
-        }
-      } else {
-        if (!Compare(v.m[i][j], 0.0)) {
-          return nonstd::nullopt;
-        }
-      }
-    }
-  }
-
-  memcpy(&dst, &diag[0], sizeof(diag));
-  return dst;
-}
-
-inline nonstd::optional<uint32_t> TryEncodeInline(value::matrix3d v) {
-  uint32_t dst;
-
-  // Check if a matrix is a diagonal matrix and its diagonal component can be represented by int8.
-  std::array<int8_t, 3> diag;
-  for (size_t i = 0; i < 3; i++) {
-    for (size_t j = 0; j < 3; j++) {
-      if (i == j) {
-        // diag
-        if (auto f = TryExactlyRepresentable<double, int8_t>(v.m[i][j])) {
-          diag[i] = f.value();
-        } else {
-          return nonstd::nullopt;
-        }
-      } else {
-        if (!Compare(v.m[i][j], 0.0)) {
-          return nonstd::nullopt;
-        }
-      }
-    }
-  }
-
-  memcpy(&dst, &diag[0], sizeof(diag));
-  return dst;
-}
-
-inline nonstd::optional<uint32_t> TryEncodeInline(value::matrix4d v) {
-  uint32_t dst;
-
-  // Check if a matrix is a diagonal matrix and its diagonal component can be represented by int8.
-  std::array<int8_t, 4> diag;
-  for (size_t i = 0; i < 4; i++) {
-    for (size_t j = 0; j < 4; j++) {
-      if (i == j) {
-        // diag
-        if (auto f = TryExactlyRepresentable<double, int8_t>(v.m[i][j])) {
-          diag[i] = f.value();
-        } else {
-          return nonstd::nullopt;
-        }
-      } else {
-        if (!Compare(v.m[i][j], 0.0)) {
-          return nonstd::nullopt;
-        }
-      }
-    }
-  }
-
-  memcpy(&dst, &diag[0], sizeof(diag));
-  return dst;
-}
-
-inline nonstd::optional<uint32_t> TryEncodeInline(value::dict v) {
-  uint32_t dst{0};
-
-  if (v.empty()) {
-    return dst;
-  }
-
-  return nonstd::nullopt;
-}
-
-} // namespace crate 
-} // namespace tinyusdz
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/crate-writer.hh b/contrib/tinyusdz/tinyusdz_repo/src/crate-writer.hh
deleted file mode 100644
index f720ab060..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/crate-writer.hh
+++ /dev/null
@@ -1,14 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright 2022 - Present, Syoyo Fujita.
-//
-// Crate(binary) writer
-//
-#pragma once
-
-namespace tinyusdz {
-namespace crate {
-
-
-} // namespace crate
-} // namespace tinyusdz
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/LICENSE.miniz b/contrib/tinyusdz/tinyusdz_repo/src/external/LICENSE.miniz
deleted file mode 100644
index b6ff45a30..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/LICENSE.miniz
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright 2013-2014 RAD Game Tools and Valve Software
-Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/LICENSE.ogt_vox.md b/contrib/tinyusdz/tinyusdz_repo/src/external/LICENSE.ogt_vox.md
deleted file mode 100644
index eadf7208f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/LICENSE.ogt_vox.md
+++ /dev/null
@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Justin Paver
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/LICENSE
deleted file mode 100644
index 45cc0d228..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Mikulas Florek
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/README.md b/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/README.md
deleted file mode 100644
index cd23aed43..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-[![Discord Chat](https://img.shields.io/discord/480318777943392266.svg)](https://discord.gg/RgFybs6) 
-[![License](http://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org)
-
-# OpenFBX
-
-Lightweight open source FBX importer. Used in [Lumix Engine](https://github.com/nem0/lumixengine) and [Flax Engine](https://flaxengine.com/). It's an *almost* full-featured importer. It can load geometry (with uvs, normals, tangents, colors), skeletons, animations, blend shapes, materials and textures.
-
-[UFBX](https://github.com/bqqbarbhg/ufbx) is similar project in C.
-
-## Use the library in your own project
-
-Note: It's recommended to be familiar with fbx format to use this library, you can read about it more [here](http://help.autodesk.com/view/FBX/2017/ENU/?guid=__files_GUID_F194000D_5AD4_49C1_86CC_5DAC2CE64E97_htm).
-
-1. add files from src to your project
-2. use
-
-See [demo](https://github.com/nem0/OpenFBX/blob/master/demo/main.cpp#L203) as an example how to use the library.
-See [Lumix Engine](https://github.com/nem0/LumixEngine/blob/master/src/renderer/editor/fbx_importer.cpp) as more advanced use case.
-
-Alternatively, CMake support is provided by community but it's not supported by me - @nem0.
-
-## Compile demo project
-
-1. download source code
-2. execute [projects/genie_vs19.bat](https://github.com/nem0/OpenFBX/blob/master/projects/genie_vs19.bat)
-3. open projects/tmp/vs2019/OpenFBX.sln in Visual Studio 2019
-4. compile and run
-
-Demo is windows only. Library is multiplatform.
-
-![ofbx](https://user-images.githubusercontent.com/153526/27876079-eea3c872-61b5-11e7-9fce-3a7c558fb0d2.png)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/src/ofbx.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/src/ofbx.cpp
deleted file mode 100644
index fd7ca568e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/src/ofbx.cpp
+++ /dev/null
@@ -1,3641 +0,0 @@
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-#include "ofbx.h"
-// include <tinyusdz>/src/external/miniz.h
-#include "external/miniz.h"
-#include <cassert>
-#include <math.h>
-#include <ctype.h>
-#include <memory>
-#include <numeric>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-
-namespace ofbx
-{
-
-
-struct Allocator {
-	struct Page {
-		struct {
-			Page* next = nullptr;
-			u32 offset = 0;
-		} header;
-		u8 data[4096 * 1024 - 12];
-	};
-	Page* first = nullptr;
-
-	~Allocator() {
-		Page* p = first;
-		while (p) {
-			Page* n = p->header.next;
-			delete p;
-			p = n;
-		}
-	}
-
-	template <typename T, typename... Args> T* allocate(Args&&... args)
-	{
-		assert(sizeof(T) <= sizeof(first->data));
-		if (!first) {
-			first = new Page;
-		}
-		Page* p = first;
-		if (p->header.offset % alignof(T) != 0) {
-			p->header.offset += alignof(T) - p->header.offset % alignof(T);
-		}
-
-		if (p->header.offset + sizeof(T) > sizeof(p->data)) {
-			p = new Page;
-			p->header.next = first;
-			first = p;
-		}
-		T* res = new (p->data + p->header.offset) T(args...);
-		p->header.offset += sizeof(T);
-		return res;
-	}
-
-	// store temporary data, can be reused
-	std::vector<float> tmp;
-	std::vector<int> int_tmp;
-	std::vector<Vec3> vec3_tmp;
-	std::vector<double> double_tmp;
-	std::vector<Vec3> vec3_tmp2;
-};
-
-
-struct Temporaries {
-	std::vector<float> f;
-	std::vector<int> i;
-	std::vector<Vec2> v2;
-	std::vector<Vec3> v3;
-	std::vector<Vec4> v4;
-};
-
-
-struct Video
-{
-	DataView filename;
-	DataView content;
-	DataView media;
-};
-
-
-struct Error
-{
-	Error() {}
-	Error(const char* msg) { s_message = msg; }
-
-	static const char* s_message;
-};
-
-
-const char* Error::s_message = "";
-
-
-template <typename T> struct OptionalError
-{
-	OptionalError(Error error)
-		: is_error(true)
-	{
-	}
-
-
-	OptionalError(T _value)
-		: value(_value)
-		, is_error(false)
-	{
-	}
-
-
-	T getValue() const
-	{
-#ifdef _DEBUG
-		assert(error_checked);
-#endif
-		return value;
-	}
-
-
-	bool isError()
-	{
-#ifdef _DEBUG
-		error_checked = true;
-#endif
-		return is_error;
-	}
-
-
-private:
-	T value;
-	bool is_error;
-#ifdef _DEBUG
-	bool error_checked = false;
-#endif
-};
-
-
-#pragma pack(1)
-struct Header
-{
-	u8 magic[21];
-	u8 reserved[2];
-	u32 version;
-};
-#pragma pack()
-
-
-struct Cursor
-{
-	const u8* current;
-	const u8* begin;
-	const u8* end;
-};
-
-
-static void setTranslation(const Vec3& t, Matrix* mtx)
-{
-	mtx->m[12] = t.x;
-	mtx->m[13] = t.y;
-	mtx->m[14] = t.z;
-}
-
-
-static Vec3 operator-(const Vec3& v)
-{
-	return {-v.x, -v.y, -v.z};
-}
-
-
-static Matrix operator*(const Matrix& lhs, const Matrix& rhs)
-{
-	Matrix res;
-	for (int j = 0; j < 4; ++j)
-	{
-		for (int i = 0; i < 4; ++i)
-		{
-			double tmp = 0;
-			for (int k = 0; k < 4; ++k)
-			{
-				tmp += lhs.m[i + k * 4] * rhs.m[k + j * 4];
-			}
-			res.m[i + j * 4] = tmp;
-		}
-	}
-	return res;
-}
-
-
-static Matrix makeIdentity()
-{
-	return {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1};
-}
-
-
-static Matrix rotationX(double angle)
-{
-	Matrix m = makeIdentity();
-	double c = cos(angle);
-	double s = sin(angle);
-
-	m.m[5] = m.m[10] = c;
-	m.m[9] = -s;
-	m.m[6] = s;
-
-	return m;
-}
-
-
-static Matrix rotationY(double angle)
-{
-	Matrix m = makeIdentity();
-	double c = cos(angle);
-	double s = sin(angle);
-
-	m.m[0] = m.m[10] = c;
-	m.m[8] = s;
-	m.m[2] = -s;
-
-	return m;
-}
-
-
-static Matrix rotationZ(double angle)
-{
-	Matrix m = makeIdentity();
-	double c = cos(angle);
-	double s = sin(angle);
-
-	m.m[0] = m.m[5] = c;
-	m.m[4] = -s;
-	m.m[1] = s;
-
-	return m;
-}
-
-
-static Matrix getRotationMatrix(const Vec3& euler, RotationOrder order)
-{
-	const double TO_RAD = 3.1415926535897932384626433832795028 / 180.0;
-	Matrix rx = rotationX(euler.x * TO_RAD);
-	Matrix ry = rotationY(euler.y * TO_RAD);
-	Matrix rz = rotationZ(euler.z * TO_RAD);
-	switch (order)
-	{
-		default:
-		case RotationOrder::EULER_XYZ: return rz * ry * rx;
-		case RotationOrder::EULER_XZY: return ry * rz * rx;
-		case RotationOrder::EULER_YXZ: return rz * rx * ry;
-		case RotationOrder::EULER_YZX: return rx * rz * ry;
-		case RotationOrder::EULER_ZXY: return ry * rx * rz;
-		case RotationOrder::EULER_ZYX: return rx * ry * rz;
-		case RotationOrder::SPHERIC_XYZ: assert(false); Error::s_message = "Unsupported rotation order."; return rx * ry * rz;
-	}
-}
-
-
-double fbxTimeToSeconds(i64 value)
-{
-	return double(value) / 46186158000L;
-}
-
-
-i64 secondsToFbxTime(double value)
-{
-	return i64(value * 46186158000L);
-}
-
-
-static Vec3 operator*(const Vec3& v, float f)
-{
-	return {v.x * f, v.y * f, v.z * f};
-}
-
-
-static Vec3 operator+(const Vec3& a, const Vec3& b)
-{
-	return {a.x + b.x, a.y + b.y, a.z + b.z};
-}
-
-
-template <int SIZE> static bool copyString(char (&destination)[SIZE], const char* source)
-{
-	const char* src = source;
-	char* dest = destination;
-	int length = SIZE;
-	if (!src) return false;
-
-	while (*src && length > 1)
-	{
-		*dest = *src;
-		--length;
-		++dest;
-		++src;
-	}
-	*dest = 0;
-	return *src == '\0';
-}
-
-
-u64 DataView::toU64() const
-{
-	if (is_binary)
-	{
-		assert(end - begin == sizeof(u64));
-		u64 result;
-		memcpy(&result, begin, sizeof(u64));
-		return result;
-	}
-	static_assert(sizeof(unsigned long long) >= sizeof(u64), "can't use strtoull");
-	return strtoull((const char*)begin, nullptr, 10);
-}
-
-
-i64 DataView::toI64() const
-{
-	if (is_binary)
-	{
-		assert(end - begin == sizeof(i64));
-		i64 result;
-		memcpy(&result, begin, sizeof(i64));
-		return result;
-	}
-	static_assert(sizeof(long long) >= sizeof(i64), "can't use atoll");
-	return atoll((const char*)begin);
-}
-
-
-int DataView::toInt() const
-{
-	if (is_binary)
-	{
-		assert(end - begin == sizeof(int));
-		int result;
-		memcpy(&result, begin, sizeof(int));
-		return result;
-	}
-	return atoi((const char*)begin);
-}
-
-
-u32 DataView::toU32() const
-{
-	if (is_binary)
-	{
-		assert(end - begin == sizeof(u32));
-		u32 result;
-		memcpy(&result, begin, sizeof(u32));
-		return result;
-	}
-	return (u32)atoll((const char*)begin);
-}
-
-
-double DataView::toDouble() const
-{
-	if (is_binary)
-	{
-		assert(end - begin == sizeof(double));
-		double result;
-		memcpy(&result, begin, sizeof(double));
-		return result;
-	}
-	return atof((const char*)begin);
-}
-
-
-float DataView::toFloat() const
-{
-	if (is_binary)
-	{
-		assert(end - begin == sizeof(float));
-		float result;
-		memcpy(&result, begin, sizeof(float));
-		return result;
-	}
-	return (float)atof((const char*)begin);
-}
-
-
-bool DataView::operator==(const char* rhs) const
-{
-	const char* c = rhs;
-	const char* c2 = (const char*)begin;
-	while (*c && c2 != (const char*)end)
-	{
-		if (*c != *c2) return false;
-		++c;
-		++c2;
-	}
-	return c2 == (const char*)end && *c == '\0';
-}
-
-
-struct Property;
-template <typename T> static bool parseArrayRaw(const Property& property, T* out, int max_size);
-template <typename T> static bool parseBinaryArray(const Property& property, std::vector<T>* out);
-static bool parseDouble(Property& property, double* out);
-
-
-struct Property : IElementProperty
-{
-	Type getType() const override { return (Type)type; }
-	IElementProperty* getNext() const override { return next; }
-	DataView getValue() const override { return value; }
-	int getCount() const override
-	{
-		assert(type == ARRAY_DOUBLE || type == ARRAY_INT || type == ARRAY_FLOAT || type == ARRAY_LONG);
-		if (value.is_binary)
-		{
-			int i;
-			memcpy(&i, value.begin, sizeof(i));
-			return i;
-		}
-		return count;
-	}
-
-	bool getValues(double* values, int max_size) const override { return parseArrayRaw(*this, values, max_size); }
-
-	bool getValues(float* values, int max_size) const override { return parseArrayRaw(*this, values, max_size); }
-
-	bool getValues(u64* values, int max_size) const override { return parseArrayRaw(*this, values, max_size); }
-
-	bool getValues(i64* values, int max_size) const override { return parseArrayRaw(*this, values, max_size); }
-
-	bool getValues(int* values, int max_size) const override { return parseArrayRaw(*this, values, max_size); }
-
-	int count = 0;
-	u8 type = INTEGER;
-	DataView value;
-	Property* next = nullptr;
-};
-
-
-struct Element : IElement
-{
-	IElement* getFirstChild() const override { return child; }
-	IElement* getSibling() const override { return sibling; }
-	DataView getID() const override { return id; }
-	IElementProperty* getFirstProperty() const override { return first_property; }
-	IElementProperty* getProperty(int idx) const
-	{
-		IElementProperty* prop = first_property;
-		for (int i = 0; i < idx; ++i)
-		{
-			if (prop == nullptr) return nullptr;
-			prop = prop->getNext();
-		}
-		return prop;
-	}
-
-	DataView id;
-	Element* child = nullptr;
-	Element* sibling = nullptr;
-	Property* first_property = nullptr;
-};
-
-
-static const Element* findChild(const Element& element, const char* id)
-{
-	Element* const* iter = &element.child;
-	while (*iter)
-	{
-		if ((*iter)->id == id) return *iter;
-		iter = &(*iter)->sibling;
-	}
-	return nullptr;
-}
-
-
-static IElement* resolveProperty(const Object& obj, const char* name)
-{
-	const Element* props = findChild((const Element&)obj.element, "Properties70");
-	if (!props) return nullptr;
-
-	Element* prop = props->child;
-	while (prop)
-	{
-		if (prop->first_property && prop->first_property->value == name)
-		{
-			return prop;
-		}
-		prop = prop->sibling;
-	}
-	return nullptr;
-}
-
-
-static int resolveEnumProperty(const Object& object, const char* name, int default_value)
-{
-	Element* element = (Element*)resolveProperty(object, name);
-	if (!element) return default_value;
-	Property* x = (Property*)element->getProperty(4);
-	if (!x) return default_value;
-
-	return x->value.toInt();
-}
-
-
-static Vec3 resolveVec3Property(const Object& object, const char* name, const Vec3& default_value)
-{
-	Element* element = (Element*)resolveProperty(object, name);
-	if (!element) return default_value;
-	Property* x = (Property*)element->getProperty(4);
-	if (!x || !x->next || !x->next->next) return default_value;
-
-	return {x->value.toDouble(), x->next->value.toDouble(), x->next->next->value.toDouble()};
-}
-
-
-Object::Object(const Scene& _scene, const IElement& _element)
-	: scene(_scene)
-	, element(_element)
-	, is_node(false)
-	, node_attribute(nullptr)
-{
-	auto& e = (Element&)_element;
-	if (e.first_property && e.first_property->next)
-	{
-		e.first_property->next->value.toString(name);
-	}
-	else
-	{
-		name[0] = '\0';
-	}
-}
-
-
-static bool decompress(const u8* in, size_t in_size, u8* out, size_t out_size)
-{
-	mz_stream stream = {};
-	mz_inflateInit(&stream);
-
-	stream.avail_in = (int)in_size;
-	stream.next_in = in;
-	stream.avail_out = (int)out_size;
-	stream.next_out = out;
-
-	int status = mz_inflate(&stream, Z_SYNC_FLUSH);
-
-	if (status != Z_STREAM_END) return false;
-
-	return mz_inflateEnd(&stream) == Z_OK;
-}
-
-
-template <typename T> static OptionalError<T> read(Cursor* cursor)
-{
-	if (cursor->current + sizeof(T) > cursor->end) return Error("Reading past the end");
-	T value = *(const T*)cursor->current;
-	cursor->current += sizeof(T);
-	return value;
-}
-
-
-static OptionalError<DataView> readShortString(Cursor* cursor)
-{
-	DataView value;
-	OptionalError<u8> length = read<u8>(cursor);
-	if (length.isError()) return Error();
-
-	if (cursor->current + length.getValue() > cursor->end) return Error("Reading past the end");
-	value.begin = cursor->current;
-	cursor->current += length.getValue();
-
-	value.end = cursor->current;
-
-	return value;
-}
-
-
-static OptionalError<DataView> readLongString(Cursor* cursor)
-{
-	DataView value;
-	OptionalError<u32> length = read<u32>(cursor);
-	if (length.isError()) return Error();
-
-	if (cursor->current + length.getValue() > cursor->end) return Error("Reading past the end");
-	value.begin = cursor->current;
-	cursor->current += length.getValue();
-
-	value.end = cursor->current;
-
-	return value;
-}
-
-
-static OptionalError<Property*> readProperty(Cursor* cursor, Allocator& allocator)
-{
-	if (cursor->current == cursor->end) return Error("Reading past the end");
-
-	Property* prop = allocator.allocate<Property>();
-	prop->next = nullptr;
-	prop->type = *cursor->current;
-	++cursor->current;
-	prop->value.begin = cursor->current;
-
-	switch (prop->type)
-	{
-		case 'S':
-		{
-			OptionalError<DataView> val = readLongString(cursor);
-			if (val.isError()) return Error();
-			prop->value = val.getValue();
-			break;
-		}
-		case 'Y': cursor->current += 2; break;
-		case 'C': cursor->current += 1; break;
-		case 'I': cursor->current += 4; break;
-		case 'F': cursor->current += 4; break;
-		case 'D': cursor->current += 8; break;
-		case 'L': cursor->current += 8; break;
-		case 'R':
-		{
-			OptionalError<u32> len = read<u32>(cursor);
-			if (len.isError()) return Error();
-			if (cursor->current + len.getValue() > cursor->end) return Error("Reading past the end");
-			cursor->current += len.getValue();
-			break;
-		}
-		case 'b':
-		case 'f':
-		case 'd':
-		case 'l':
-		case 'i':
-		{
-			OptionalError<u32> length = read<u32>(cursor);
-			OptionalError<u32> encoding = read<u32>(cursor);
-			OptionalError<u32> comp_len = read<u32>(cursor);
-			if (length.isError() || encoding.isError() || comp_len.isError()) return Error();
-			if (cursor->current + comp_len.getValue() > cursor->end) return Error("Reading past the end");
-			cursor->current += comp_len.getValue();
-			break;
-		}
-		default: return Error("Unknown property type");
-	}
-	prop->value.end = cursor->current;
-	return prop;
-}
-
-
-static OptionalError<u64> readElementOffset(Cursor* cursor, u16 version)
-{
-	if (version >= 7500)
-	{
-		OptionalError<u64> tmp = read<u64>(cursor);
-		if (tmp.isError()) return Error();
-		return tmp.getValue();
-	}
-
-	OptionalError<u32> tmp = read<u32>(cursor);
-	if (tmp.isError()) return Error();
-	return tmp.getValue();
-}
-
-
-static OptionalError<Element*> readElement(Cursor* cursor, u32 version, Allocator& allocator)
-{
-	OptionalError<u64> end_offset = readElementOffset(cursor, version);
-	if (end_offset.isError()) return Error();
-	if (end_offset.getValue() == 0) return nullptr;
-
-	OptionalError<u64> prop_count = readElementOffset(cursor, version);
-	OptionalError<u64> prop_length = readElementOffset(cursor, version);
-	if (prop_count.isError() || prop_length.isError()) return Error();
-
-	OptionalError<DataView> id = readShortString(cursor);
-	if (id.isError()) return Error();
-
-	Element* element = allocator.allocate<Element>();
-	element->first_property = nullptr;
-	element->id = id.getValue();
-
-	element->child = nullptr;
-	element->sibling = nullptr;
-
-	Property** prop_link = &element->first_property;
-	for (u32 i = 0; i < prop_count.getValue(); ++i)
-	{
-		OptionalError<Property*> prop = readProperty(cursor, allocator);
-		if (prop.isError())
-		{
-			return Error();
-		}
-
-		*prop_link = prop.getValue();
-		prop_link = &(*prop_link)->next;
-	}
-
-	if (cursor->current - cursor->begin >= (ptrdiff_t)end_offset.getValue()) return element;
-
-	int BLOCK_SENTINEL_LENGTH = version >= 7500 ? 25 : 13;
-
-	Element** link = &element->child;
-	while (cursor->current - cursor->begin < ((ptrdiff_t)end_offset.getValue() - BLOCK_SENTINEL_LENGTH))
-	{
-		OptionalError<Element*> child = readElement(cursor, version, allocator);
-		if (child.isError())
-		{
-			return Error();
-		}
-
-		*link = child.getValue();
-        if (child.getValue() == 0) break;
-		link = &(*link)->sibling;
-	}
-
-	if (cursor->current + BLOCK_SENTINEL_LENGTH > cursor->end)
-	{
-		return Error("Reading past the end");
-	}
-
-	cursor->current += BLOCK_SENTINEL_LENGTH;
-	return element;
-}
-
-
-static bool isEndLine(const Cursor& cursor)
-{
-	return *cursor.current == '\n' || *cursor.current == '\r' && cursor.current + 1 < cursor.end && *(cursor.current + 1) != '\n';
-}
-
-
-static void skipInsignificantWhitespaces(Cursor* cursor)
-{
-	while (cursor->current < cursor->end && isspace(*cursor->current) && !isEndLine(*cursor))
-	{
-		++cursor->current;
-	}
-}
-
-
-static void skipLine(Cursor* cursor)
-{
-	while (cursor->current < cursor->end && !isEndLine(*cursor))
-	{
-		++cursor->current;
-	}
-	if (cursor->current < cursor->end) ++cursor->current;
-	skipInsignificantWhitespaces(cursor);
-}
-
-
-static void skipWhitespaces(Cursor* cursor)
-{
-	while (cursor->current < cursor->end && isspace(*cursor->current))
-	{
-		++cursor->current;
-	}
-	while (cursor->current < cursor->end && *cursor->current == ';') skipLine(cursor);
-}
-
-
-static bool isTextTokenChar(char c)
-{
-	return isalnum(c) || c == '_' || c == '-';
-}
-
-
-static DataView readTextToken(Cursor* cursor)
-{
-	DataView ret;
-	ret.begin = cursor->current;
-	while (cursor->current < cursor->end && isTextTokenChar(*cursor->current))
-	{
-		++cursor->current;
-	}
-	ret.end = cursor->current;
-	return ret;
-}
-
-
-static OptionalError<Property*> readTextProperty(Cursor* cursor, Allocator& allocator)
-{
-	Property* prop = allocator.allocate<Property>();
-	prop->value.is_binary = false;
-	prop->next = nullptr;
-	if (*cursor->current == '"')
-	{
-		prop->type = 'S';
-		++cursor->current;
-		prop->value.begin = cursor->current;
-		while (cursor->current < cursor->end && *cursor->current != '"')
-		{
-			++cursor->current;
-		}
-		prop->value.end = cursor->current;
-		if (cursor->current < cursor->end) ++cursor->current; // skip '"'
-		return prop;
-	}
-
-	if (isdigit(*cursor->current) || *cursor->current == '-')
-	{
-		prop->type = 'L';
-		prop->value.begin = cursor->current;
-		if (*cursor->current == '-') ++cursor->current;
-		while (cursor->current < cursor->end && isdigit(*cursor->current))
-		{
-			++cursor->current;
-		}
-		prop->value.end = cursor->current;
-
-		if (cursor->current < cursor->end && *cursor->current == '.')
-		{
-			prop->type = 'D';
-			++cursor->current;
-			while (cursor->current < cursor->end && isdigit(*cursor->current))
-			{
-				++cursor->current;
-			}
-			if (cursor->current < cursor->end && (*cursor->current == 'e' || *cursor->current == 'E'))
-			{
-				// 10.5e-013
-				++cursor->current;
-				if (cursor->current < cursor->end && *cursor->current == '-') ++cursor->current;
-				while (cursor->current < cursor->end && isdigit(*cursor->current)) ++cursor->current;
-			}
-
-
-			prop->value.end = cursor->current;
-		}
-		return prop;
-	}
-
-	if (*cursor->current == 'T' || *cursor->current == 'Y' || *cursor->current == 'W' || *cursor->current == 'C')
-	{
-		// WTF is this
-		prop->type = *cursor->current;
-		prop->value.begin = cursor->current;
-		++cursor->current;
-		prop->value.end = cursor->current;
-		return prop;
-	}
-
-	if (*cursor->current == '*')
-	{
-		prop->type = 'l';
-		++cursor->current;
-		// Vertices: *10740 { a: 14.2760353088379,... }
-		while (cursor->current < cursor->end && *cursor->current != ':')
-		{
-			++cursor->current;
-		}
-		if (cursor->current < cursor->end) ++cursor->current; // skip ':'
-		skipInsignificantWhitespaces(cursor);
-		prop->value.begin = cursor->current;
-		prop->count = 0;
-		bool is_any = false;
-		while (cursor->current < cursor->end && *cursor->current != '}')
-		{
-			if (*cursor->current == ',')
-			{
-				if (is_any) ++prop->count;
-				is_any = false;
-			}
-			else if (!isspace(*cursor->current) && !isEndLine(*cursor))
-				is_any = true;
-			if (*cursor->current == '.') prop->type = 'd';
-			++cursor->current;
-		}
-		if (is_any) ++prop->count;
-		prop->value.end = cursor->current;
-		if (cursor->current < cursor->end) ++cursor->current; // skip '}'
-		return prop;
-	}
-
-	assert(false);
-	return Error("TODO");
-}
-
-
-static OptionalError<Element*> readTextElement(Cursor* cursor, Allocator& allocator)
-{
-	DataView id = readTextToken(cursor);
-	if (cursor->current == cursor->end) return Error("Unexpected end of file");
-	if (*cursor->current != ':') return Error("Unexpected character");
-	++cursor->current;
-
-	skipInsignificantWhitespaces(cursor);
-	if (cursor->current == cursor->end) return Error("Unexpected end of file");
-
-	Element* element = allocator.allocate<Element>();
-	element->id = id;
-
-	Property** prop_link = &element->first_property;
-	while (cursor->current < cursor->end && !isEndLine(*cursor) && *cursor->current != '{')
-	{
-		OptionalError<Property*> prop = readTextProperty(cursor, allocator);
-		if (prop.isError())
-		{
-			return Error();
-		}
-		if (cursor->current < cursor->end && *cursor->current == ',')
-		{
-			++cursor->current;
-			skipWhitespaces(cursor);
-		}
-		skipInsignificantWhitespaces(cursor);
-
-		*prop_link = prop.getValue();
-		prop_link = &(*prop_link)->next;
-	}
-
-	Element** link = &element->child;
-	if (*cursor->current == '{')
-	{
-		++cursor->current;
-		skipWhitespaces(cursor);
-		while (cursor->current < cursor->end && *cursor->current != '}')
-		{
-			OptionalError<Element*> child = readTextElement(cursor, allocator);
-			if (child.isError())
-			{
-				return Error();
-			}
-			skipWhitespaces(cursor);
-
-			*link = child.getValue();
-			link = &(*link)->sibling;
-		}
-		if (cursor->current < cursor->end) ++cursor->current; // skip '}'
-	}
-	return element;
-}
-
-
-static OptionalError<Element*> tokenizeText(const u8* data, size_t size, Allocator& allocator)
-{
-	Cursor cursor;
-	cursor.begin = data;
-	cursor.current = data;
-	cursor.end = data + size;
-
-	Element* root = allocator.allocate<Element>();
-	root->first_property = nullptr;
-	root->id.begin = nullptr;
-	root->id.end = nullptr;
-	root->child = nullptr;
-	root->sibling = nullptr;
-
-	Element** element = &root->child;
-	while (cursor.current < cursor.end)
-	{
-		if (*cursor.current == ';' || *cursor.current == '\r' || *cursor.current == '\n')
-		{
-			skipLine(&cursor);
-		}
-		else
-		{
-			OptionalError<Element*> child = readTextElement(&cursor, allocator);
-			if (child.isError())
-			{
-				return Error();
-			}
-			*element = child.getValue();
-			if (!*element) return root;
-			element = &(*element)->sibling;
-		}
-	}
-
-	return root;
-}
-
-
-static OptionalError<Element*> tokenize(const u8* data, size_t size, u32& version, Allocator& allocator)
-{
-	Cursor cursor;
-	cursor.begin = data;
-	cursor.current = data;
-	cursor.end = data + size;
-
-	const Header* header = (const Header*)cursor.current;
-	cursor.current += sizeof(*header);
-	version = header->version;
-
-	Element* root = allocator.allocate<Element>();
-	root->first_property = nullptr;
-	root->id.begin = nullptr;
-	root->id.end = nullptr;
-	root->child = nullptr;
-	root->sibling = nullptr;
-
-	Element** element = &root->child;
-	for (;;)
-	{
-		OptionalError<Element*> child = readElement(&cursor, header->version, allocator);
-		if (child.isError()) {
-			return Error();
-		}
-		*element = child.getValue();
-		if (!*element) return root;
-		element = &(*element)->sibling;
-	}
-}
-
-
-static void parseTemplates(const Element& root)
-{
-	const Element* defs = findChild(root, "Definitions");
-	if (!defs) return;
-
-	std::unordered_map<std::string, Element*> templates;
-	Element* def = defs->child;
-	while (def)
-	{
-		if (def->id == "ObjectType")
-		{
-			Element* subdef = def->child;
-			while (subdef)
-			{
-				if (subdef->id == "PropertyTemplate")
-				{
-					DataView prop1 = def->first_property->value;
-					DataView prop2 = subdef->first_property->value;
-					std::string key((const char*)prop1.begin, prop1.end - prop1.begin);
-					key += std::string((const char*)prop1.begin, prop1.end - prop1.begin);
-					templates[key] = subdef;
-				}
-				subdef = subdef->sibling;
-			}
-		}
-		def = def->sibling;
-	}
-	// TODO
-}
-
-
-struct Scene;
-
-
-Mesh::Mesh(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct MeshImpl : Mesh
-{
-	MeshImpl(const Scene& _scene, const IElement& _element)
-		: Mesh(_scene, _element)
-	{
-		is_node = true;
-	}
-
-
-	Matrix getGeometricMatrix() const override
-	{
-		Vec3 translation = resolveVec3Property(*this, "GeometricTranslation", {0, 0, 0});
-		Vec3 rotation = resolveVec3Property(*this, "GeometricRotation", {0, 0, 0});
-		Vec3 scale = resolveVec3Property(*this, "GeometricScaling", {1, 1, 1});
-
-		Matrix scale_mtx = makeIdentity();
-		scale_mtx.m[0] = (float)scale.x;
-		scale_mtx.m[5] = (float)scale.y;
-		scale_mtx.m[10] = (float)scale.z;
-		Matrix mtx = getRotationMatrix(rotation, RotationOrder::EULER_XYZ);
-		setTranslation(translation, &mtx);
-
-		return scale_mtx * mtx;
-	}
-
-
-	Type getType() const override { return Type::MESH; }
-
-
-	const Pose* getPose() const override { return pose; }
-	const Geometry* getGeometry() const override { return geometry; }
-	const Material* getMaterial(int index) const override { return materials[index]; }
-	int getMaterialCount() const override { return (int)materials.size(); }
-
-
-	const Pose* pose = nullptr;
-	const Geometry* geometry = nullptr;
-	std::vector<const Material*> materials;
-};
-
-
-Material::Material(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct MaterialImpl : Material
-{
-	MaterialImpl(const Scene& _scene, const IElement& _element)
-		: Material(_scene, _element)
-	{
-		for (const Texture*& tex : textures) tex = nullptr;
-	}
-
-	Type getType() const override { return Type::MATERIAL; }
-
-	const Texture* getTexture(Texture::TextureType type) const override { return textures[type]; }
-	Color getDiffuseColor() const override { return diffuse_color; }
-	Color getSpecularColor() const override { return specular_color; }
-    Color getReflectionColor() const override { return reflection_color; };
-    Color getAmbientColor() const override { return ambient_color; };
-    Color getEmissiveColor() const override { return emissive_color; };
-
-    double getDiffuseFactor() const override { return diffuse_factor; };
-    double getSpecularFactor() const override { return specular_factor; };
-    double getReflectionFactor() const override { return reflection_factor; };
-    double getShininess() const override { return shininess; };
-    double getShininessExponent() const override { return shininess_exponent; };
-    double getAmbientFactor() const override { return ambient_factor; };
-    double getBumpFactor() const override { return bump_factor; };
-    double getEmissiveFactor() const override { return emissive_factor; };
-
-	const Texture* textures[Texture::TextureType::COUNT];
-	Color diffuse_color;
-	Color specular_color;
-    Color reflection_color;
-    Color ambient_color;
-    Color emissive_color;
-
-    double diffuse_factor;
-    double specular_factor;
-    double reflection_factor;
-    double shininess;
-    double shininess_exponent;
-    double ambient_factor;
-    double bump_factor;
-    double emissive_factor;
- };
-
-
-struct LimbNodeImpl : Object
-{
-	LimbNodeImpl(const Scene& _scene, const IElement& _element)
-		: Object(_scene, _element)
-	{
-		is_node = true;
-	}
-	Type getType() const override { return Type::LIMB_NODE; }
-};
-
-
-struct NullImpl : Object
-{
-	NullImpl(const Scene& _scene, const IElement& _element)
-		: Object(_scene, _element)
-	{
-		is_node = true;
-	}
-	Type getType() const override { return Type::NULL_NODE; }
-};
-
-
-NodeAttribute::NodeAttribute(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct NodeAttributeImpl : NodeAttribute
-{
-	NodeAttributeImpl(const Scene& _scene, const IElement& _element)
-		: NodeAttribute(_scene, _element)
-	{
-	}
-	Type getType() const override { return Type::NODE_ATTRIBUTE; }
-	DataView getAttributeType() const override { return attribute_type; }
-
-
-	DataView attribute_type;
-};
-
-
-Geometry::Geometry(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct GeometryImpl : Geometry
-{
-	enum VertexDataMapping
-	{
-		BY_POLYGON_VERTEX,
-		BY_POLYGON,
-		BY_VERTEX
-	};
-
-	struct NewVertex
-	{
-		~NewVertex() { delete next; }
-
-		int index = -1;
-		NewVertex* next = nullptr;
-	};
-
-	std::vector<Vec3> vertices;
-	std::vector<Vec3> normals;
-	std::vector<Vec2> uvs[s_uvs_max];
-	std::vector<Vec4> colors;
-	std::vector<Vec3> tangents;
-	std::vector<int> materials;
-
-	const Skin* skin = nullptr;
-	const BlendShape* blendShape = nullptr;
-
-	std::vector<int> indices;
-	std::vector<int> to_old_vertices;
-	std::vector<NewVertex> to_new_vertices;
-
-	GeometryImpl(const Scene& _scene, const IElement& _element)
-		: Geometry(_scene, _element)
-	{
-	}
-
-
-	Type getType() const override { return Type::GEOMETRY; }
-	int getVertexCount() const override { return (int)vertices.size(); }
-	const int* getFaceIndices() const override { return indices.empty() ? nullptr : &indices[0]; }
-	int getIndexCount() const override { return (int)indices.size(); }
-	const Vec3* getVertices() const override { return &vertices[0]; }
-	const Vec3* getNormals() const override { return normals.empty() ? nullptr : &normals[0]; }
-	const Vec2* getUVs(int index = 0) const override { return index < 0 || index >= s_uvs_max || uvs[index].empty() ? nullptr : &uvs[index][0]; }
-	const Vec4* getColors() const override { return colors.empty() ? nullptr : &colors[0]; }
-	const Vec3* getTangents() const override { return tangents.empty() ? nullptr : &tangents[0]; }
-	const Skin* getSkin() const override { return skin; }
-	const BlendShape* getBlendShape() const override { return blendShape; }
-	const int* getMaterials() const override { return materials.empty() ? nullptr : &materials[0]; }
-};
-
-
-Shape::Shape(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct ShapeImpl : Shape
-{
-	std::vector<Vec3> vertices;
-	std::vector<Vec3> normals;
-
-	ShapeImpl(const Scene& _scene, const IElement& _element)
-		: Shape(_scene, _element)
-	{
-	}
-
-
-	bool postprocess(GeometryImpl* geom, Allocator& allocator);
-
-
-	Type getType() const override { return Type::SHAPE; }
-	int getVertexCount() const override { return (int)vertices.size(); }
-	const Vec3* getVertices() const override { return &vertices[0]; }
-	const Vec3* getNormals() const override { return normals.empty() ? nullptr : &normals[0]; }
-};
-
-
-Cluster::Cluster(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct ClusterImpl : Cluster
-{
-	ClusterImpl(const Scene& _scene, const IElement& _element)
-		: Cluster(_scene, _element)
-	{
-	}
-
-	const int* getIndices() const override { return &indices[0]; }
-	int getIndicesCount() const override { return (int)indices.size(); }
-	const double* getWeights() const override { return &weights[0]; }
-	int getWeightsCount() const override { return (int)weights.size(); }
-	Matrix getTransformMatrix() const override { return transform_matrix; }
-	Matrix getTransformLinkMatrix() const override { return transform_link_matrix; }
-	Object* getLink() const override { return link; }
-
-
-	bool postprocess(Allocator& allocator)
-	{
-		assert(skin);
-
-		GeometryImpl* geom = (GeometryImpl*)skin->resolveObjectLinkReverse(Object::Type::GEOMETRY);
-		if (!geom) return false;
-
-		allocator.int_tmp.clear(); // old indices
-		const Element* indexes = findChild((const Element&)element, "Indexes");
-		if (indexes && indexes->first_property)
-		{
-			if (!parseBinaryArray(*indexes->first_property, &allocator.int_tmp)) return false;
-		}
-
-		allocator.double_tmp.clear(); // old weights
-		const Element* weights_el = findChild((const Element&)element, "Weights");
-		if (weights_el && weights_el->first_property)
-		{
-			if (!parseBinaryArray(*weights_el->first_property, &allocator.double_tmp)) return false;
-		}
-
-		if (allocator.int_tmp.size() != allocator.double_tmp.size()) return false;
-
-		indices.reserve(allocator.int_tmp.size());
-		weights.reserve(allocator.int_tmp.size());
-		int* ir = allocator.int_tmp.empty() ? nullptr : &allocator.int_tmp[0];
-		double* wr = allocator.double_tmp.empty() ? nullptr : &allocator.double_tmp[0];
-		for (int i = 0, c = (int)allocator.int_tmp.size(); i < c; ++i)
-		{
-			int old_idx = ir[i];
-			double w = wr[i];
-			GeometryImpl::NewVertex* n = &geom->to_new_vertices[old_idx];
-			if (n->index == -1) continue; // skip vertices which aren't indexed.
-			while (n)
-			{
-				indices.push_back(n->index);
-				weights.push_back(w);
-				n = n->next;
-			}
-		}
-
-		return true;
-	}
-
-
-	Object* link = nullptr;
-	Skin* skin = nullptr;
-	std::vector<int> indices;
-	std::vector<double> weights;
-	Matrix transform_matrix;
-	Matrix transform_link_matrix;
-	Type getType() const override { return Type::CLUSTER; }
-};
-
-
-AnimationStack::AnimationStack(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-AnimationLayer::AnimationLayer(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-AnimationCurve::AnimationCurve(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-AnimationCurveNode::AnimationCurveNode(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct AnimationStackImpl : AnimationStack
-{
-	AnimationStackImpl(const Scene& _scene, const IElement& _element)
-		: AnimationStack(_scene, _element)
-	{
-	}
-
-
-	const AnimationLayer* getLayer(int index) const override
-	{
-		return resolveObjectLink<AnimationLayer>(index);
-	}
-
-
-	Type getType() const override { return Type::ANIMATION_STACK; }
-};
-
-
-struct AnimationCurveImpl : AnimationCurve
-{
-	AnimationCurveImpl(const Scene& _scene, const IElement& _element)
-		: AnimationCurve(_scene, _element)
-	{
-	}
-
-	int getKeyCount() const override { return (int)times.size(); }
-	const i64* getKeyTime() const override { return &times[0]; }
-	const float* getKeyValue() const override { return &values[0]; }
-
-	std::vector<i64> times;
-	std::vector<float> values;
-	Type getType() const override { return Type::ANIMATION_CURVE; }
-};
-
-
-Skin::Skin(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct SkinImpl : Skin
-{
-	SkinImpl(const Scene& _scene, const IElement& _element)
-		: Skin(_scene, _element)
-	{
-	}
-
-	int getClusterCount() const override { return (int)clusters.size(); }
-	const Cluster* getCluster(int idx) const override { return clusters[idx]; }
-
-	Type getType() const override { return Type::SKIN; }
-
-	std::vector<Cluster*> clusters;
-};
-
-
-BlendShapeChannel::BlendShapeChannel(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct BlendShapeChannelImpl : BlendShapeChannel
-{
-	BlendShapeChannelImpl(const Scene& _scene, const IElement& _element)
-		: BlendShapeChannel(_scene, _element)
-	{
-	}
-
-	double getDeformPercent() const override { return deformPercent; }
-	int getShapeCount() const override { return (int)shapes.size(); }
-	const Shape* getShape(int idx) const override { return shapes[idx]; }
-
-	Type getType() const override { return Type::BLEND_SHAPE_CHANNEL; }
-
-	bool postprocess(Allocator& allocator)
-	{
-		assert(blendShape);
-
-		GeometryImpl* geom = (GeometryImpl*)blendShape->resolveObjectLinkReverse(Object::Type::GEOMETRY);
-		if (!geom) return false;
-
-		const Element* deform_percent_el = findChild((const Element&)element, "DeformPercent");
-		if (deform_percent_el && deform_percent_el->first_property)
-		{
-			if (!parseDouble(*deform_percent_el->first_property, &deformPercent)) return false;
-		}
-
-		const Element* full_weights_el = findChild((const Element&)element, "FullWeights");
-		if (full_weights_el && full_weights_el->first_property)
-		{
-			if (!parseBinaryArray(*full_weights_el->first_property, &fullWeights)) return false;
-		}
-
-		for (int i = 0; i < (int)shapes.size(); i++)
-		{
-			auto shape = (ShapeImpl*)shapes[i];
-			if (!shape->postprocess(geom, allocator)) return false;
-		}
-
-		return true;
-	}
-
-
-	BlendShape* blendShape = nullptr;
-	double deformPercent = 0;
-	std::vector<double> fullWeights;
-	std::vector<Shape*> shapes;
-};
-
-
-BlendShape::BlendShape(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct BlendShapeImpl : BlendShape
-{
-	BlendShapeImpl(const Scene& _scene, const IElement& _element)
-		: BlendShape(_scene, _element)
-	{
-	}
-
-	int getBlendShapeChannelCount() const override { return (int)blendShapeChannels.size(); }
-	const BlendShapeChannel* getBlendShapeChannel(int idx) const override { return blendShapeChannels[idx]; }
-
-	Type getType() const override { return Type::BLEND_SHAPE; }
-
-	std::vector<BlendShapeChannel*> blendShapeChannels;
-};
-
-
-Texture::Texture(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-Pose::Pose(const Scene& _scene, const IElement& _element)
-	: Object(_scene, _element)
-{
-}
-
-
-struct PoseImpl : Pose
-{
-	PoseImpl(const Scene& _scene, const IElement& _element)
-		: Pose(_scene, _element)
-	{
-	}
-
-	bool postprocess(Scene* scene);
-
-
-	Matrix getMatrix() const override { return matrix; }
-	const Object* getNode() const override { return node; }
-
-	Type getType() const override { return Type::POSE; }
-
-	Matrix matrix;
-	Object* node = nullptr;
-	DataView node_id;
-};
-
-
-struct TextureImpl : Texture
-{
-	TextureImpl(const Scene& _scene, const IElement& _element)
-		: Texture(_scene, _element)
-	{
-	}
-
-	DataView getRelativeFileName() const override { return relative_filename; }
-	DataView getFileName() const override { return filename; }
-	DataView getEmbeddedData() const override;
-
-	DataView media;
-	DataView filename;
-	DataView relative_filename;
-	Type getType() const override { return Type::TEXTURE; }
-};
-
-
-struct Root : Object
-{
-	Root(const Scene& _scene, const IElement& _element)
-		: Object(_scene, _element)
-	{
-		copyString(name, "RootNode");
-		is_node = true;
-	}
-	Type getType() const override { return Type::ROOT; }
-};
-
-
-struct Scene : IScene
-{
-	struct Connection
-	{
-		enum Type
-		{
-			OBJECT_OBJECT,
-			OBJECT_PROPERTY
-		};
-
-		Type type = OBJECT_OBJECT;
-		u64 from = 0;
-		u64 to = 0;
-		DataView property;
-	};
-
-	struct ObjectPair
-	{
-		const Element* element;
-		Object* object;
-	};
-
-
-	int getAnimationStackCount() const override { return (int)m_animation_stacks.size(); }
-	int getGeometryCount() const override { return (int)m_geometries.size(); }
-	int getMeshCount() const override { return (int)m_meshes.size(); }
-	float getSceneFrameRate() const override { return m_scene_frame_rate; }
-	const GlobalSettings* getGlobalSettings() const override { return &m_settings; }
-
-	const Object* const* getAllObjects() const override { return m_all_objects.empty() ? nullptr : &m_all_objects[0]; }
-
-
-	int getAllObjectCount() const override { return (int)m_all_objects.size(); }
-
-	int getEmbeddedDataCount() const override {
-		return (int)m_videos.size();
-	}
-
-	DataView getEmbeddedData(int index) const override {
-		return m_videos[index].content;
-	}
-
-	DataView getEmbeddedFilename(int index) const override {
-		return m_videos[index].filename;
-	}
-
-	const AnimationStack* getAnimationStack(int index) const override
-	{
-		assert(index >= 0);
-		assert(index < m_animation_stacks.size());
-		return m_animation_stacks[index];
-	}
-
-
-	const Mesh* getMesh(int index) const override
-	{
-		assert(index >= 0);
-		assert(index < m_meshes.size());
-		return m_meshes[index];
-	}
-
-
-	const Geometry* getGeometry(int index) const override
-	{
-		assert(index >= 0);
-		assert(index < m_geometries.size());
-		return m_geometries[index];
-	}
-
-
-	const TakeInfo* getTakeInfo(const char* name) const override
-	{
-		for (const TakeInfo& info : m_take_infos)
-		{
-			if (info.name == name) return &info;
-		}
-		return nullptr;
-	}
-
-
-	const IElement* getRootElement() const override { return m_root_element; }
-	const Object* getRoot() const override { return m_root; }
-
-
-	void destroy() override { delete this; }
-
-
-	~Scene() override {
-		for(auto ptr : m_all_objects)
-			ptr->~Object();
-	}
-
-
-	Element* m_root_element = nullptr;
-	Root* m_root = nullptr;
-	float m_scene_frame_rate = -1;
-	GlobalSettings m_settings;
-	std::unordered_map<u64, ObjectPair> m_object_map;
-	std::vector<Object*> m_all_objects;
-	std::vector<Mesh*> m_meshes;
-	std::vector<Geometry*> m_geometries;
-	std::vector<AnimationStack*> m_animation_stacks;
-	std::vector<Connection> m_connections;
-	std::vector<u8> m_data;
-	std::vector<TakeInfo> m_take_infos;
-	std::vector<Video> m_videos;
-	Allocator m_allocator;
-};
-
-
-DataView TextureImpl::getEmbeddedData() const {
-	if (!media.begin) return media;
-	for (const Video& v : scene.m_videos) {
-		if (v.media.end - v.media.begin != media.end - media.begin) continue;
-		const size_t len = v.media.end - v.media.begin;
-		if (memcmp(v.media.begin, media.begin, len) != 0) continue;
-
-		return v.content;
-	}
-	return {};
-}
-
-
-bool PoseImpl::postprocess(Scene* scene)
-{
-	node = scene->m_object_map[node_id.toU64()].object;
-	if (node && node->getType() == Object::Type::MESH) {
-		static_cast<MeshImpl*>(node)->pose = this;
-	}
-	return true;
-}
-
-
-struct AnimationCurveNodeImpl : AnimationCurveNode
-{
-	AnimationCurveNodeImpl(const Scene& _scene, const IElement& _element)
-		: AnimationCurveNode(_scene, _element)
-	{
-		default_values[0] = default_values[1] = default_values[2] =  0;
-		Element* dx = static_cast<Element*>(resolveProperty(*this, "d|X"));
-		Element* dy = static_cast<Element*>(resolveProperty(*this, "d|Y"));
-		Element* dz = static_cast<Element*>(resolveProperty(*this, "d|Z"));
-
-		if (dx) {
-			Property* x = (Property*)dx->getProperty(4);
-			if (x) default_values[0] = (float)x->value.toDouble();
-		}
-		if (dy) {
-			Property* y = (Property*)dy->getProperty(4);
-			if (y) default_values[1] = (float)y->value.toDouble();
-		}
-		if (dz) {
-			Property* z = (Property*)dz->getProperty(4);
-			if (z) default_values[2] = (float)z->value.toDouble();
-		}
-	}
-
-
-	const Object* getBone() const override
-	{
-		return bone;
-	}
-
-
-	const AnimationCurve* getCurve(int idx) const override {
-		assert(idx >= 0 && idx < 3);
-		return curves[idx].curve;
-	}
-
-
-	Vec3 getNodeLocalTransform(double time) const override
-	{
-		i64 fbx_time = secondsToFbxTime(time);
-
-		auto getCoord = [&](const Curve& curve, i64 fbx_time, int idx) {
-			if (!curve.curve) return default_values[idx];
-
-			const i64* times = curve.curve->getKeyTime();
-			const float* values = curve.curve->getKeyValue();
-			int count = curve.curve->getKeyCount();
-
-			if (fbx_time < times[0]) fbx_time = times[0];
-			if (fbx_time > times[count - 1]) fbx_time = times[count - 1];
-			for (int i = 1; i < count; ++i)
-			{
-				if (times[i] >= fbx_time)
-				{
-					float t = float(double(fbx_time - times[i - 1]) / double(times[i] - times[i - 1]));
-					return values[i - 1] * (1 - t) + values[i] * t;
-				}
-			}
-			return values[0];
-		};
-
-		return {getCoord(curves[0], fbx_time, 0), getCoord(curves[1], fbx_time, 1), getCoord(curves[2], fbx_time, 2)};
-	}
-
-
-	struct Curve
-	{
-		const AnimationCurve* curve = nullptr;
-		const Scene::Connection* connection = nullptr;
-	};
-
-
-	Curve curves[3];
-	Object* bone = nullptr;
-	DataView bone_link_property;
-	Type getType() const override { return Type::ANIMATION_CURVE_NODE; }
-	float default_values[3];
-	enum Mode
-	{
-		TRANSLATION,
-		ROTATION,
-		SCALE
-	} mode = TRANSLATION;
-};
-
-
-struct AnimationLayerImpl : AnimationLayer
-{
-	AnimationLayerImpl(const Scene& _scene, const IElement& _element)
-		: AnimationLayer(_scene, _element)
-	{
-	}
-
-
-	Type getType() const override { return Type::ANIMATION_LAYER; }
-
-
-	const AnimationCurveNode* getCurveNode(int index) const override
-	{
-		if (index >= (int)curve_nodes.size() || index < 0) return nullptr;
-		return curve_nodes[index];
-	}
-
-
-	const AnimationCurveNode* getCurveNode(const Object& bone, const char* prop) const override
-	{
-		for (const AnimationCurveNodeImpl* node : curve_nodes)
-		{
-			if (node->bone_link_property == prop && node->bone == &bone) return node;
-		}
-		return nullptr;
-	}
-
-
-	std::vector<AnimationCurveNodeImpl*> curve_nodes;
-};
-
-void parseVideo(Scene& scene, const Element& element, Allocator& allocator)
-{
-	if (!element.first_property) return;
-	if (!element.first_property->next) return;
-	if (element.first_property->next->getType() != IElementProperty::STRING) return;
-
-	const Element* content_element = findChild(element, "Content");
-
-	if (!content_element) return;
-	if (!content_element->first_property) return;
-	if (content_element->first_property->getType() != IElementProperty::BINARY) return;
-
-	const Element* filename_element = findChild(element, "Filename");
-	if (!filename_element) return;
-	if (!filename_element->first_property) return;
-	if (filename_element->first_property->getType() != IElementProperty::STRING) return;
-
-	Video video;
-	video.content = content_element->first_property->value;
-	video.filename = filename_element->first_property->value;
-	video.media = element.first_property->next->value;
-	scene.m_videos.push_back(video);
-}
-
-struct OptionalError<Object*> parseTexture(const Scene& scene, const Element& element, Allocator& allocator)
-{
-	TextureImpl* texture = allocator.allocate<TextureImpl>(scene, element);
-	const Element* texture_filename = findChild(element, "FileName");
-	if (texture_filename && texture_filename->first_property)
-	{
-		texture->filename = texture_filename->first_property->value;
-	}
-
-	const Element* media = findChild(element, "Media");
-	if (media && media->first_property)
-	{
-		texture->media = media->first_property->value;
-	}
-
-	const Element* texture_relative_filename = findChild(element, "RelativeFilename");
-	if (texture_relative_filename && texture_relative_filename->first_property)
-	{
-		texture->relative_filename = texture_relative_filename->first_property->value;
-	}
-	return texture;
-}
-
-
-struct OptionalError<Object*> parsePose(const Scene& scene, const Element& element, Allocator& allocator)
-{
-	PoseImpl* pose = allocator.allocate<PoseImpl>(scene, element);
-	const Element* pose_node = findChild(element, "PoseNode");
-	if (pose_node) {
-		const Element* node = findChild(*pose_node, "Node");
-		const Element* matrix = findChild(*pose_node, "Matrix");
-
-		if (matrix->first_property) {
-			parseArrayRaw(*matrix->first_property, &pose->matrix, sizeof(pose->matrix));
-		}
-		pose->node_id = node->first_property->value;
-	}
-	return pose;
-}
-
-
-template <typename T>
-static OptionalError<Object*> parse(const Scene& scene, const Element& element, Allocator& allocator)
-{
-	T* obj = allocator.allocate<T>(scene, element);
-	return obj;
-}
-
-
-static OptionalError<Object*> parseCluster(const Scene& scene, const Element& element, Allocator& allocator)
-{
-	ClusterImpl* obj = allocator.allocate<ClusterImpl>(scene, element);
-
-	const Element* transform_link = findChild(element, "TransformLink");
-	if (transform_link && transform_link->first_property)
-	{
-		if (!parseArrayRaw(
-				*transform_link->first_property, &obj->transform_link_matrix, sizeof(obj->transform_link_matrix)))
-		{
-			return Error("Failed to parse TransformLink");
-		}
-	}
-	const Element* transform = findChild(element, "Transform");
-	if (transform && transform->first_property)
-	{
-		if (!parseArrayRaw(*transform->first_property, &obj->transform_matrix, sizeof(obj->transform_matrix)))
-		{
-			return Error("Failed to parse Transform");
-		}
-	}
-
-	return obj;
-}
-
-
-static OptionalError<Object*> parseNodeAttribute(const Scene& scene, const Element& element, Allocator& allocator)
-{
-	NodeAttributeImpl* obj = allocator.allocate<NodeAttributeImpl>(scene, element);
-	const Element* type_flags = findChild(element, "TypeFlags");
-	if (type_flags && type_flags->first_property)
-	{
-		obj->attribute_type = type_flags->first_property->value;
-	}
-	return obj;
-}
-
-
-static OptionalError<Object*> parseLimbNode(const Scene& scene, const Element& element, Allocator& allocator)
-{
-	if (!element.first_property
-		|| !element.first_property->next
-		|| !element.first_property->next->next
-		|| element.first_property->next->next->value != "LimbNode")
-	{
-		return Error("Invalid limb node");
-	}
-
-	LimbNodeImpl* obj = allocator.allocate<LimbNodeImpl>(scene, element);
-	return obj;
-}
-
-
-static OptionalError<Object*> parseMesh(const Scene& scene, const Element& element, Allocator& allocator)
-{
-	if (!element.first_property
-		|| !element.first_property->next
-		|| !element.first_property->next->next
-		|| element.first_property->next->next->value != "Mesh")
-	{
-		return Error("Invalid mesh");
-	}
-
-	return allocator.allocate<MeshImpl>(scene, element);
-}
-
-
-static OptionalError<Object*> parseMaterial(const Scene& scene, const Element& element, Allocator& allocator)
-{
-	MaterialImpl* material = allocator.allocate<MaterialImpl>(scene, element);
-	const Element* prop = findChild(element, "Properties70");
-	material->diffuse_color = {1, 1, 1};
-	if (prop) prop = prop->child;
-	while (prop)
-	{
-		if (prop->id == "P" && prop->first_property)
-		{
-			if (prop->first_property->value == "DiffuseColor")
-			{
-				material->diffuse_color.r = (float)prop->getProperty(4)->getValue().toDouble();
-				material->diffuse_color.g = (float)prop->getProperty(5)->getValue().toDouble();
-				material->diffuse_color.b = (float)prop->getProperty(6)->getValue().toDouble();
-			}
-			else if (prop->first_property->value == "SpecularColor")
-			{
-				material->specular_color.r = (float)prop->getProperty(4)->getValue().toDouble();
-				material->specular_color.g = (float)prop->getProperty(5)->getValue().toDouble();
-				material->specular_color.b = (float)prop->getProperty(6)->getValue().toDouble();
-			}
-            else if (prop->first_property->value == "Shininess")
-            {
-                material->shininess = (float)prop->getProperty(4)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "ShininessExponent")
-            {
-                material->shininess_exponent = (float)prop->getProperty(4)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "ReflectionColor")
-            {
-                material->reflection_color.r = (float)prop->getProperty(4)->getValue().toDouble();
-                material->reflection_color.g = (float)prop->getProperty(5)->getValue().toDouble();
-                material->reflection_color.b = (float)prop->getProperty(6)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "AmbientColor")
-            {
-                material->ambient_color.r = (float)prop->getProperty(4)->getValue().toDouble();
-                material->ambient_color.g = (float)prop->getProperty(5)->getValue().toDouble();
-                material->ambient_color.b = (float)prop->getProperty(6)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "EmissiveColor")
-            {
-                material->emissive_color.r = (float)prop->getProperty(4)->getValue().toDouble();
-                material->emissive_color.g = (float)prop->getProperty(5)->getValue().toDouble();
-                material->emissive_color.b = (float)prop->getProperty(6)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "ReflectionFactor")
-            {
-                material->reflection_factor = (float)prop->getProperty(4)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "BumpFactor")
-            {
-                material->bump_factor = (float)prop->getProperty(4)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "AmbientFactor")
-            {
-                material->ambient_factor = (float)prop->getProperty(4)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "DiffuseFactor")
-            {
-                material->diffuse_factor = (float)prop->getProperty(4)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "SpecularFactor")
-            {
-                material->specular_factor = (float)prop->getProperty(4)->getValue().toDouble();
-            }
-            else if (prop->first_property->value == "EmissiveFactor")
-            {
-                material->emissive_factor = (float)prop->getProperty(4)->getValue().toDouble();
-            }
-		}
-		prop = prop->sibling;
-	}
-	return material;
-}
-
-
-template <typename T> static bool parseTextArrayRaw(const Property& property, T* out, int max_size);
-
-template <typename T> static bool parseArrayRaw(const Property& property, T* out, int max_size)
-{
-	if (property.value.is_binary)
-	{
-		assert(out);
-
-		int elem_size = 1;
-		switch (property.type)
-		{
-			case 'l': elem_size = 8; break;
-			case 'd': elem_size = 8; break;
-			case 'f': elem_size = 4; break;
-			case 'i': elem_size = 4; break;
-			default: return false;
-		}
-
-		const u8* data = property.value.begin + sizeof(u32) * 3;
-		if (data > property.value.end) return false;
-
-		u32 count = property.getCount();
-		u32 enc = *(const u32*)(property.value.begin + 4);
-		u32 len = *(const u32*)(property.value.begin + 8);
-
-		if (enc == 0)
-		{
-			if ((int)len > max_size) return false;
-			if (data + len > property.value.end) return false;
-			memcpy(out, data, len);
-			return true;
-		}
-		else if (enc == 1)
-		{
-			if (int(elem_size * count) > max_size) return false;
-			return decompress(data, len, (u8*)out, elem_size * count);
-		}
-
-		return false;
-	}
-
-	return parseTextArrayRaw(property, out, max_size);
-}
-
-
-template <typename T> const char* fromString(const char* str, const char* end, T* val);
-template <> const char* fromString<int>(const char* str, const char* end, int* val)
-{
-	*val = atoi(str);
-	const char* iter = str;
-	while (iter < end && *iter != ',') ++iter;
-	if (iter < end) ++iter; // skip ','
-	return (const char*)iter;
-}
-
-
-template <> const char* fromString<u64>(const char* str, const char* end, u64* val)
-{
-	*val = strtoull(str, nullptr, 10);
-	const char* iter = str;
-	while (iter < end && *iter != ',') ++iter;
-	if (iter < end) ++iter; // skip ','
-	return (const char*)iter;
-}
-
-
-template <> const char* fromString<i64>(const char* str, const char* end, i64* val)
-{
-	*val = atoll(str);
-	const char* iter = str;
-	while (iter < end && *iter != ',') ++iter;
-	if (iter < end) ++iter; // skip ','
-	return (const char*)iter;
-}
-
-
-template <> const char* fromString<double>(const char* str, const char* end, double* val)
-{
-	*val = atof(str);
-	const char* iter = str;
-	while (iter < end && *iter != ',') ++iter;
-	if (iter < end) ++iter; // skip ','
-	return (const char*)iter;
-}
-
-
-template <> const char* fromString<float>(const char* str, const char* end, float* val)
-{
-	*val = (float)atof(str);
-	const char* iter = str;
-	while (iter < end && *iter != ',') ++iter;
-	if (iter < end) ++iter; // skip ','
-	return (const char*)iter;
-}
-
-
-const char* fromString(const char* str, const char* end, double* val, int count)
-{
-	const char* iter = str;
-	for (int i = 0; i < count; ++i)
-	{
-		*val = atof(iter);
-		++val;
-		while (iter < end && *iter != ',') ++iter;
-		if (iter < end) ++iter; // skip ','
-
-		if (iter == end) return iter;
-	}
-	return (const char*)iter;
-}
-
-
-template <> const char* fromString<Vec2>(const char* str, const char* end, Vec2* val)
-{
-	return fromString(str, end, &val->x, 2);
-}
-
-
-template <> const char* fromString<Vec3>(const char* str, const char* end, Vec3* val)
-{
-	return fromString(str, end, &val->x, 3);
-}
-
-
-template <> const char* fromString<Vec4>(const char* str, const char* end, Vec4* val)
-{
-	return fromString(str, end, &val->x, 4);
-}
-
-
-template <> const char* fromString<Matrix>(const char* str, const char* end, Matrix* val)
-{
-	return fromString(str, end, &val->m[0], 16);
-}
-
-
-template <typename T> static void parseTextArray(const Property& property, std::vector<T>* out)
-{
-	out->clear();
-	const u8* iter = property.value.begin;
-	while (iter < property.value.end)
-	{
-		T val;
-		iter = (const u8*)fromString<T>((const char*)iter, (const char*)property.value.end, &val);
-		out->push_back(val);
-	}
-}
-
-
-template <typename T> static bool parseTextArrayRaw(const Property& property, T* out_raw, int max_size)
-{
-	const u8* iter = property.value.begin;
-
-	T* out = out_raw;
-	while (iter < property.value.end)
-	{
-		iter = (const u8*)fromString<T>((const char*)iter, (const char*)property.value.end, out);
-		++out;
-		if (out - out_raw == max_size / sizeof(T)) return true;
-	}
-	return out - out_raw == max_size / sizeof(T);
-}
-
-
-template <typename T> static bool parseBinaryArray(const Property& property, std::vector<T>* out)
-{
-	assert(out);
-	if (property.value.is_binary)
-	{
-		u32 count = property.getCount();
-		int elem_size = 1;
-		switch (property.type)
-		{
-			case 'd': elem_size = 8; break;
-			case 'f': elem_size = 4; break;
-			case 'i': elem_size = 4; break;
-			default: return false;
-		}
-		int elem_count = sizeof(T) / elem_size;
-		out->resize(count / elem_count);
-
-		if (count == 0) return true;
-		return parseArrayRaw(property, &(*out)[0], int(sizeof((*out)[0]) * out->size()));
-	}
-	else
-	{
-		parseTextArray(property, out);
-		return true;
-	}
-}
-
-
-template <typename T> static bool parseDoubleVecData(Property& property, std::vector<T>* out_vec, std::vector<float>* tmp)
-{
-	assert(out_vec);
-	if (!property.value.is_binary)
-	{
-		parseTextArray(property, out_vec);
-		return true;
-	}
-
-	if (property.type == 'd')
-	{
-		return parseBinaryArray(property, out_vec);
-	}
-
-	assert(property.type == 'f');
-	assert(sizeof((*out_vec)[0].x) == sizeof(double));
-	tmp->clear();
-	if (!parseBinaryArray(property, tmp)) return false;
-	int elem_count = sizeof((*out_vec)[0]) / sizeof((*out_vec)[0].x);
-	out_vec->resize(tmp->size() / elem_count);
-	double* out = &(*out_vec)[0].x;
-	for (int i = 0, c = (int)tmp->size(); i < c; ++i)
-	{
-		out[i] = (*tmp)[i];
-	}
-	return true;
-}
-
-
-static bool parseDouble(Property& property, double* out)
-{
-	assert(out);
-    if (property.value.is_binary)
-	{
-		int elem_size = 1;
-		switch (property.type)
-		{
-			case 'D': elem_size = 8; break;
-			case 'F': elem_size = 4; break;
-			default: return false;
-		}
-		const u8* data = property.value.begin;
-		if (data > property.value.end) return false;
-		memcpy(out, data, elem_size);
-		return true;
-	}
-    else
-    {
-        fromString<double>((const char*)property.value.begin, (const char*)property.value.end, out);
-        return true;
-    }
-}
-
-
-template <typename T>
-static bool parseVertexData(const Element& element,
-	const char* name,
-	const char* index_name,
-	std::vector<T>* out,
-	std::vector<int>* out_indices,
-	GeometryImpl::VertexDataMapping* mapping,
-	std::vector<float>* tmp)
-{
-	assert(out);
-	assert(mapping);
-	const Element* data_element = findChild(element, name);
-	if (!data_element || !data_element->first_property) return false;
-
-	const Element* mapping_element = findChild(element, "MappingInformationType");
-	const Element* reference_element = findChild(element, "ReferenceInformationType");
-	out_indices->clear();
-	if (mapping_element && mapping_element->first_property)
-	{
-		if (mapping_element->first_property->value == "ByPolygonVertex")
-		{
-			*mapping = GeometryImpl::BY_POLYGON_VERTEX;
-		}
-		else if (mapping_element->first_property->value == "ByPolygon")
-		{
-			*mapping = GeometryImpl::BY_POLYGON;
-		}
-		else if (mapping_element->first_property->value == "ByVertice" ||
-				 mapping_element->first_property->value == "ByVertex")
-		{
-			*mapping = GeometryImpl::BY_VERTEX;
-		}
-		else
-		{
-			return false;
-		}
-	}
-	if (reference_element && reference_element->first_property)
-	{
-		if (reference_element->first_property->value == "IndexToDirect")
-		{
-			const Element* indices_element = findChild(element, index_name);
-			if (indices_element && indices_element->first_property)
-			{
-				if (!parseBinaryArray(*indices_element->first_property, out_indices)) return false;
-			}
-		}
-		else if (reference_element->first_property->value != "Direct")
-		{
-			return false;
-		}
-	}
-	return parseDoubleVecData(*data_element->first_property, out, tmp);
-}
-
-
-static int decodeIndex(int idx)
-{
-	return (idx < 0) ? (-idx - 1) : idx;
-}
-
-
-static int codeIndex(int idx, bool last)
-{
-	return last ? (-idx - 1) : idx;
-}
-
-
-template <typename T>
-static void splat(std::vector<T>* out,
-	GeometryImpl::VertexDataMapping mapping,
-	const std::vector<T>& data,
-	const std::vector<int>& indices,
-	const std::vector<int>& original_indices)
-{
-	assert(out);
-	assert(!data.empty());
-
-	if (mapping == GeometryImpl::BY_POLYGON_VERTEX)
-	{
-		if (indices.empty())
-		{
-			out->resize(data.size());
-			memcpy(&(*out)[0], &data[0], sizeof(data[0]) * data.size());
-		}
-		else
-		{
-			out->resize(indices.size());
-			int data_size = (int)data.size();
-			for (int i = 0, c = (int)indices.size(); i < c; ++i)
-			{
-				int index = indices[i];
-
-				if ((index < data_size) && (index >= 0))
-					(*out)[i] = data[index];
-				else
-					(*out)[i] = T();
-			}
-		}
-	}
-	else if (mapping == GeometryImpl::BY_VERTEX)
-	{
-		//  v0  v1 ...
-		// uv0 uv1 ...
-		assert(indices.empty());
-
-		out->resize(original_indices.size());
-
-		int data_size = (int)data.size();
-		for (int i = 0, c = (int)original_indices.size(); i < c; ++i)
-		{
-			int idx = decodeIndex(original_indices[i]);
-			if ((idx < data_size) && (idx >= 0)) //-V560
-				(*out)[i] = data[idx];
-			else
-				(*out)[i] = T();
-		}
-	}
-	else
-	{
-		assert(false);
-	}
-}
-
-
-template <typename T> static void remap(std::vector<T>* out, const std::vector<int>& map)
-{
-	if (out->empty()) return;
-
-	std::vector<T> old;
-	old.swap(*out);
-	int old_size = (int)old.size();
-	for (int i = 0, c = (int)map.size(); i < c; ++i)
-	{
-		out->push_back(map[i] < old_size ? old[map[i]] : T());
-	}
-}
-
-
-static OptionalError<Object*> parseAnimationCurve(const Scene& scene, const Element& element, Allocator& allocator)
-{
-	AnimationCurveImpl* curve = allocator.allocate<AnimationCurveImpl>(scene, element);
-
-	const Element* times = findChild(element, "KeyTime");
-	const Element* values = findChild(element, "KeyValueFloat");
-
-	if (times && times->first_property)
-	{
-		curve->times.resize(times->first_property->getCount());
-		if (!times->first_property->getValues(&curve->times[0], (int)curve->times.size() * sizeof(curve->times[0])))
-		{
-			return Error("Invalid animation curve");
-		}
-	}
-
-	if (values && values->first_property)
-	{
-		curve->values.resize(values->first_property->getCount());
-		if (!values->first_property->getValues(&curve->values[0], (int)curve->values.size() * sizeof(curve->values[0])))
-		{
-			return Error("Invalid animation curve");
-		}
-	}
-
-	if (curve->times.size() != curve->values.size()) return Error("Invalid animation curve");
-
-	return curve;
-}
-
-
-static int getTriCountFromPoly(const std::vector<int>& indices, int* idx)
-{
-	int count = 1;
-	while (indices[*idx + 1 + count] >= 0)
-	{
-		++count;
-	}
-
-	*idx = *idx + 2 + count;
-	return count;
-}
-
-
-static void add(GeometryImpl::NewVertex& vtx, int index)
-{
-	if (vtx.index == -1)
-	{
-		vtx.index = index;
-	}
-	else if (vtx.next)
-	{
-		add(*vtx.next, index);
-	}
-	else
-	{
-		vtx.next = new GeometryImpl::NewVertex;
-		vtx.next->index = index;
-	}
-}
-
-
-static void triangulate(
-	const std::vector<int>& old_indices,
-	std::vector<int>* to_old_vertices,
-	std::vector<int>* to_old_indices)
-{
-	assert(to_old_vertices);
-	assert(to_old_indices);
-
-	auto getIdx = [&old_indices](int i) -> int {
-		int idx = old_indices[i];
-		return decodeIndex(idx);
-	};
-
-	int in_polygon_idx = 0;
-	for (int i = 0; i < (int)old_indices.size(); ++i)
-	{
-		int idx = getIdx(i);
-		if (in_polygon_idx <= 2) //-V1051
-		{
-			to_old_vertices->push_back(idx);
-			to_old_indices->push_back(i);
-		}
-		else
-		{
-			to_old_vertices->push_back(old_indices[i - in_polygon_idx]);
-			to_old_indices->push_back(i - in_polygon_idx);
-			to_old_vertices->push_back(old_indices[i - 1]);
-			to_old_indices->push_back(i - 1);
-			to_old_vertices->push_back(idx);
-			to_old_indices->push_back(i);
-		}
-		++in_polygon_idx;
-		if (old_indices[i] < 0)
-		{
-			in_polygon_idx = 0;
-		}
-	}
-}
-
-
-static void buildGeometryVertexData(
-	GeometryImpl* geom,
-	const std::vector<Vec3>& vertices,
-	const std::vector<int>& original_indices,
-	std::vector<int>& to_old_indices,
-	bool triangulationEnabled)
-{
-	if (triangulationEnabled) {
-		triangulate(original_indices, &geom->to_old_vertices, &to_old_indices);
-		geom->vertices.resize(geom->to_old_vertices.size());
-		geom->indices.resize(geom->vertices.size());
-		for (int i = 0, c = (int)geom->to_old_vertices.size(); i < c; ++i)
-		{
-			geom->vertices[i] = vertices[geom->to_old_vertices[i]];
-			geom->indices[i] = codeIndex(i, i % 3 == 2);
-		}
-	} else {
-		geom->vertices = vertices;
-		geom->to_old_vertices.resize(original_indices.size());
-		for (size_t i = 0; i < original_indices.size(); ++i) {
-			geom->to_old_vertices[i] = decodeIndex(original_indices[i]);
-		}
-		geom->indices = original_indices;
-		to_old_indices.resize(original_indices.size());
-		iota(to_old_indices.begin(), to_old_indices.end(), 0);
-	}
-
-	geom->to_new_vertices.resize(vertices.size()); // some vertices can be unused, so this isn't necessarily the same size as to_old_vertices.
-	const int* to_old_vertices = geom->to_old_vertices.empty() ? nullptr : &geom->to_old_vertices[0];
-	for (int i = 0, c = (int)geom->to_old_vertices.size(); i < c; ++i)
-	{
-		int old = to_old_vertices[i];
-		add(geom->to_new_vertices[old], i);
-	}
-}
-
-
-static OptionalError<Object*> parseGeometryMaterials(
-	GeometryImpl* geom,
-	const Element& element,
-	const std::vector<int>& original_indices)
-{
-	const Element* layer_material_element = findChild(element, "LayerElementMaterial");
-	if (layer_material_element)
-	{
-		const Element* mapping_element = findChild(*layer_material_element, "MappingInformationType");
-		const Element* reference_element = findChild(*layer_material_element, "ReferenceInformationType");
-
-		if (!mapping_element || !reference_element) return Error("Invalid LayerElementMaterial");
-
-		if (mapping_element->first_property->value == "ByPolygon" &&
-			reference_element->first_property->value == "IndexToDirect")
-		{
-			geom->materials.reserve(geom->vertices.size() / 3);
-			for (int& i : geom->materials) i = -1;
-
-			const Element* indices_element = findChild(*layer_material_element, "Materials");
-			if (!indices_element || !indices_element->first_property) return Error("Invalid LayerElementMaterial");
-
-			std::vector<int> int_tmp;
-			if (!parseBinaryArray(*indices_element->first_property, &int_tmp)) return Error("Failed to parse material indices");
-
-			int tmp_i = 0;
-			for (int poly = 0, c = (int)int_tmp.size(); poly < c; ++poly)
-			{
-				int tri_count = getTriCountFromPoly(original_indices, &tmp_i);
-				for (int i = 0; i < tri_count; ++i) {
-					geom->materials.push_back(int_tmp[poly]);
-				}
-			}
-		}
-		else
-		{
-			if (mapping_element->first_property->value != "AllSame") return Error("Mapping not supported");
-		}
-	}
-	return {nullptr};
-}
-
-
-static OptionalError<Object*> parseGeometryUVs(
-	GeometryImpl* geom,
-	const Element& element,
-	const std::vector<int>& original_indices,
-	const std::vector<int>& to_old_indices,
-	Temporaries* tmp)
-{
-	const Element* layer_uv_element = findChild(element, "LayerElementUV");
-	while (layer_uv_element)
-	{
-		const int uv_index =
-			layer_uv_element->first_property ? layer_uv_element->first_property->getValue().toInt() : 0;
-		if (uv_index >= 0 && uv_index < Geometry::s_uvs_max)
-		{
-			std::vector<Vec2>& uvs = geom->uvs[uv_index];
-
-			tmp->v2.clear();
-			tmp->i.clear();
-			GeometryImpl::VertexDataMapping mapping;
-			if (!parseVertexData(*layer_uv_element, "UV", "UVIndex", &tmp->v2, &tmp->i, &mapping, &tmp->f))
-				return Error("Invalid UVs");
-			if (!tmp->v2.empty() && (tmp->i.empty() || tmp->i[0] != -1))
-			{
-				uvs.resize(tmp->i.empty() ? tmp->v2.size() : tmp->i.size());
-				splat(&uvs, mapping, tmp->v2, tmp->i, original_indices);
-				remap(&uvs, to_old_indices);
-			}
-		}
-
-		do
-		{
-			layer_uv_element = layer_uv_element->sibling;
-		} while (layer_uv_element && layer_uv_element->id != "LayerElementUV");
-	}
-	return {nullptr};
-}
-
-
-static OptionalError<Object*> parseGeometryTangents(
-	GeometryImpl* geom,
-	const Element& element,
-	const std::vector<int>& original_indices,
-	const std::vector<int>& to_old_indices,
-	Temporaries* tmp)
-{
-	const Element* layer_tangent_element = findChild(element, "LayerElementTangents");
-	if (!layer_tangent_element ) {
-		layer_tangent_element = findChild(element, "LayerElementTangent");
-	}
-	if (layer_tangent_element)
-	{
-		GeometryImpl::VertexDataMapping mapping;
-		if (findChild(*layer_tangent_element, "Tangents"))
-		{
-			if (!parseVertexData(*layer_tangent_element, "Tangents", "TangentsIndex", &tmp->v3, &tmp->i, &mapping, &tmp->f))
-				return Error("Invalid tangets");
-		}
-		else
-		{
-			if (!parseVertexData(*layer_tangent_element, "Tangent", "TangentIndex", &tmp->v3, &tmp->i, &mapping, &tmp->f))
-				return Error("Invalid tangets");
-		}
-		if (!tmp->v3.empty())
-		{
-			splat(&geom->tangents, mapping, tmp->v3, tmp->i, original_indices);
-			remap(&geom->tangents, to_old_indices);
-		}
-	}
-	return {nullptr};
-}
-
-
-static OptionalError<Object*> parseGeometryColors(
-	GeometryImpl* geom,
-	const Element& element,
-	const std::vector<int>& original_indices,
-	const std::vector<int>& to_old_indices,
-	Temporaries* tmp)
-{
-	const Element* layer_color_element = findChild(element, "LayerElementColor");
-	if (layer_color_element)
-	{
-		GeometryImpl::VertexDataMapping mapping;
-		if (!parseVertexData(*layer_color_element, "Colors", "ColorIndex", &tmp->v4, &tmp->i, &mapping, &tmp->f))
-			return Error("Invalid colors");
-		if (!tmp->v4.empty())
-		{
-			splat(&geom->colors, mapping, tmp->v4, tmp->i, original_indices);
-			remap(&geom->colors, to_old_indices);
-		}
-	}
-	return {nullptr};
-}
-
-
-static OptionalError<Object*> parseGeometryNormals(
-	GeometryImpl* geom,
-	const Element& element,
-	const std::vector<int>& original_indices,
-	const std::vector<int>& to_old_indices,
-	Temporaries* tmp)
-{
-	const Element* layer_normal_element = findChild(element, "LayerElementNormal");
-	if (layer_normal_element)
-	{
-		GeometryImpl::VertexDataMapping mapping;
-		if (!parseVertexData(*layer_normal_element, "Normals", "NormalsIndex", &tmp->v3, &tmp->i, &mapping, &tmp->f))
-			return Error("Invalid normals");
-		if (!tmp->v3.empty())
-		{
-			splat(&geom->normals, mapping, tmp->v3, tmp->i, original_indices);
-			remap(&geom->normals, to_old_indices);
-		}
-	}
-	return {nullptr};
-}
-
-
-static OptionalError<Object*> parseGeometry(const Element& element, bool triangulate, GeometryImpl* geom)
-{
-	assert(element.first_property);
-
-	const Element* vertices_element = findChild(element, "Vertices");
-	if (!vertices_element || !vertices_element->first_property)
-	{
-		return geom;
-	}
-
-	const Element* polys_element = findChild(element, "PolygonVertexIndex");
-	if (!polys_element || !polys_element->first_property) return Error("Indices missing");
-
-	std::vector<Vec3> vertices;
-	std::vector<int> original_indices;
-	std::vector<int> to_old_indices;
-	Temporaries tmp;
-	if (!parseDoubleVecData(*vertices_element->first_property, &vertices, &tmp.f)) return Error("Failed to parse vertices");
-	if (!parseBinaryArray(*polys_element->first_property, &original_indices)) return Error("Failed to parse indices");
-
-	buildGeometryVertexData(geom, vertices, original_indices, to_old_indices, triangulate);
-
-	OptionalError<Object*> materialParsingError = parseGeometryMaterials(geom, element, original_indices);
-	if (materialParsingError.isError()) return materialParsingError;
-
-	OptionalError<Object*> uvParsingError = parseGeometryUVs(geom, element, original_indices, to_old_indices, &tmp);
-	if (uvParsingError.isError()) return uvParsingError;
-
-	OptionalError<Object*> tangentsParsingError = parseGeometryTangents(geom, element, original_indices, to_old_indices, &tmp);
-	if (tangentsParsingError.isError()) return tangentsParsingError;
-
-	OptionalError<Object*> colorsParsingError = parseGeometryColors(geom, element, original_indices, to_old_indices, &tmp);
-	if (colorsParsingError.isError()) return colorsParsingError;
-
-	OptionalError<Object*> normalsParsingError = parseGeometryNormals(geom, element, original_indices, to_old_indices, &tmp);
-	if (normalsParsingError.isError()) return normalsParsingError;
-
-	return geom;
-}
-
-
-bool ShapeImpl::postprocess(GeometryImpl* geom, Allocator& allocator)
-{
-	assert(geom);
-
-	const Element* vertices_element = findChild((const Element&)element, "Vertices");
-	const Element* normals_element = findChild((const Element&)element, "Normals");
-	const Element* indexes_element = findChild((const Element&)element, "Indexes");
-	if (!vertices_element || !vertices_element->first_property ||
-		!indexes_element || !indexes_element->first_property)
-	{
-		return false;
-	}
-
-	allocator.vec3_tmp.clear(); // old vertices
-	allocator.vec3_tmp2.clear(); // old normals
-	allocator.int_tmp.clear(); // old indices
-	if (!parseDoubleVecData(*vertices_element->first_property, &allocator.vec3_tmp, &allocator.tmp)) return true;
-	if (!parseDoubleVecData(*normals_element->first_property, &allocator.vec3_tmp2, &allocator.tmp)) return true;
-	if (!parseBinaryArray(*indexes_element->first_property, &allocator.int_tmp)) return true;
-
-	if (allocator.vec3_tmp.size() != allocator.int_tmp.size() || allocator.vec3_tmp2.size() != allocator.int_tmp.size()) return false;
-
-	vertices = geom->vertices;
-	normals = geom->normals;
-
-	Vec3* vr = &allocator.vec3_tmp[0];
-	Vec3* nr = &allocator.vec3_tmp2[0];
-	int* ir = &allocator.int_tmp[0];
-	for (int i = 0, c = (int)allocator.int_tmp.size(); i < c; ++i)
-	{
-		int old_idx = ir[i];
-		GeometryImpl::NewVertex* n = &geom->to_new_vertices[old_idx];
-		if (n->index == -1) continue; // skip vertices which aren't indexed.
-		while (n)
-		{
-			vertices[n->index] = vertices[n->index] + vr[i];
-			normals[n->index] = normals[n->index] + nr[i];
-			n = n->next;
-		}
-	}
-
-	return true;
-}
-
-
-static bool isString(const Property* prop)
-{
-	if (!prop) return false;
-	return prop->getType() == Property::STRING;
-}
-
-
-static bool isLong(const Property* prop)
-{
-	if (!prop) return false;
-	return prop->getType() == Property::LONG;
-}
-
-
-static bool parseConnections(const Element& root, Scene* scene)
-{
-	assert(scene);
-
-	const Element* connections = findChild(root, "Connections");
-	if (!connections) return true;
-
-	scene->m_connections.reserve(1024);
-	const Element* connection = connections->child;
-	while (connection)
-	{
-		if (!isString(connection->first_property)
-			|| !isLong(connection->first_property->next)
-			|| !isLong(connection->first_property->next->next))
-		{
-			Error::s_message = "Invalid connection";
-			return false;
-		}
-
-		Scene::Connection c;
-		c.from = connection->first_property->next->value.toU64();
-		c.to = connection->first_property->next->next->value.toU64();
-		if (connection->first_property->value == "OO")
-		{
-			c.type = Scene::Connection::OBJECT_OBJECT;
-		}
-		else if (connection->first_property->value == "OP")
-		{
-			c.type = Scene::Connection::OBJECT_PROPERTY;
-			if (!connection->first_property->next->next->next)
-			{
-				Error::s_message = "Invalid connection";
-				return false;
-			}
-			c.property = connection->first_property->next->next->next->value;
-		}
-		else
-		{
-			assert(false);
-			Error::s_message = "Not supported";
-			return false;
-		}
-		scene->m_connections.push_back(c);
-
-		connection = connection->sibling;
-	}
-	return true;
-}
-
-
-static bool parseTakes(Scene* scene)
-{
-	const Element* takes = findChild((const Element&)*scene->getRootElement(), "Takes");
-	if (!takes) return true;
-
-	const Element* object = takes->child;
-	while (object)
-	{
-		if (object->id == "Take")
-		{
-			if (!isString(object->first_property))
-			{
-				Error::s_message = "Invalid name in take";
-				return false;
-			}
-
-			TakeInfo take;
-			take.name = object->first_property->value;
-			const Element* filename = findChild(*object, "FileName");
-			if (filename)
-			{
-				if (!isString(filename->first_property))
-				{
-					Error::s_message = "Invalid filename in take";
-					return false;
-				}
-				take.filename = filename->first_property->value;
-			}
-			const Element* local_time = findChild(*object, "LocalTime");
-			if (local_time)
-			{
-				if (!isLong(local_time->first_property) || !isLong(local_time->first_property->next))
-				{
-					Error::s_message = "Invalid local time in take";
-					return false;
-				}
-
-				take.local_time_from = fbxTimeToSeconds(local_time->first_property->value.toI64());
-				take.local_time_to = fbxTimeToSeconds(local_time->first_property->next->value.toI64());
-			}
-			const Element* reference_time = findChild(*object, "ReferenceTime");
-			if (reference_time)
-			{
-				if (!isLong(reference_time->first_property) || !isLong(reference_time->first_property->next))
-				{
-					Error::s_message = "Invalid reference time in take";
-					return false;
-				}
-
-				take.reference_time_from = fbxTimeToSeconds(reference_time->first_property->value.toI64());
-				take.reference_time_to = fbxTimeToSeconds(reference_time->first_property->next->value.toI64());
-			}
-
-			scene->m_take_infos.push_back(take);
-		}
-
-		object = object->sibling;
-	}
-
-	return true;
-}
-
-
-static float getFramerateFromTimeMode(FrameRate time_mode, float custom_frame_rate)
-{
-	switch (time_mode)
-	{
-		case FrameRate_DEFAULT: return 14;
-		case FrameRate_120: return 120;
-		case FrameRate_100: return 100;
-		case FrameRate_60: return 60;
-		case FrameRate_50: return 50;
-		case FrameRate_48: return 48;
-		case FrameRate_30: return 30;
-		case FrameRate_30_DROP: return 30;
-		case FrameRate_NTSC_DROP_FRAME: return 29.9700262f;
-		case FrameRate_NTSC_FULL_FRAME: return 29.9700262f;
-		case FrameRate_PAL: return 25;
-		case FrameRate_CINEMA: return 24;
-		case FrameRate_1000: return 1000;
-		case FrameRate_CINEMA_ND: return 23.976f;
-		case FrameRate_CUSTOM: return custom_frame_rate;
-	}
-	return -1;
-}
-
-
-static void parseGlobalSettings(const Element& root, Scene* scene)
-{
-	const Element* settings = findChild(root, "GlobalSettings");
-	if (!settings) return;
-
-	const Element* props70 = findChild(*settings, "Properties70");
-	if (!props70) return;
-
-	for (Element* node = props70->child; node; node = node->sibling) {
-		if (!node->first_property) continue;
-
-		#define get_property(name, field, type, getter) if(node->first_property->value == name) \
-		{ \
-			IElementProperty* prop = node->getProperty(4); \
-			if (prop) \
-			{ \
-				DataView value = prop->getValue(); \
-				scene->m_settings.field = (type)value.getter(); \
-			} \
-		}
-
-		#define get_time_property(name, field, type, getter) if(node->first_property->value == name) \
-		{ \
-			IElementProperty* prop = node->getProperty(4); \
-			if (prop) \
-			{ \
-				DataView value = prop->getValue(); \
-				scene->m_settings.field = fbxTimeToSeconds((type)value.getter()); \
-			} \
-		}
-
-		get_property("UpAxis", UpAxis, UpVector, toInt);
-		get_property("UpAxisSign", UpAxisSign, int, toInt);
-		get_property("FrontAxis", FrontAxis, int, toInt);
-		get_property("FrontAxisSign", FrontAxisSign, int, toInt);
-		get_property("CoordAxis", CoordAxis, CoordSystem, toInt);
-		get_property("CoordAxisSign", CoordAxisSign, int, toInt);
-		get_property("OriginalUpAxis", OriginalUpAxis, int, toInt);
-		get_property("OriginalUpAxisSign", OriginalUpAxisSign, int, toInt);
-		get_property("UnitScaleFactor", UnitScaleFactor, float, toDouble);
-		get_property("OriginalUnitScaleFactor", OriginalUnitScaleFactor, float, toDouble);
-		get_time_property("TimeSpanStart", TimeSpanStart, u64, toU64);
-		get_time_property("TimeSpanStop", TimeSpanStop, u64, toU64);
-		get_property("TimeMode", TimeMode, FrameRate, toInt);
-		get_property("CustomFrameRate", CustomFrameRate, float, toDouble);
-
-		#undef get_property
-		#undef get_time_property
-
-		scene->m_scene_frame_rate = getFramerateFromTimeMode(scene->m_settings.TimeMode, scene->m_settings.CustomFrameRate);
-	}
-}
-
-
-struct ParseGeometryJob {
-	const Element* element;
-	bool triangulate;
-	GeometryImpl* geom;
-	u64 id;
-	bool is_error;
-};
-
-void sync_job_processor(JobFunction fn, void*, void* data, u32 size, u32 count) {
-	u8* ptr = (u8*)data;
-	for(u32 i = 0; i < count; ++i) {
-		fn(ptr);
-		ptr += size;
-	}
-}
-
-static bool parseObjects(const Element& root, Scene* scene, u64 flags, Allocator& allocator, JobProcessor job_processor, void* job_user_ptr)
-{
-	if (!job_processor) job_processor = &sync_job_processor;
-	const bool triangulate = (flags & (u64)LoadFlags::TRIANGULATE) != 0;
-	const bool ignore_geometry = (flags & (u64)LoadFlags::IGNORE_GEOMETRY) != 0;
-	const bool ignore_blend_shapes = (flags & (u64)LoadFlags::IGNORE_BLEND_SHAPES) != 0;
-	const Element* objs = findChild(root, "Objects");
-	if (!objs) return true;
-
-	scene->m_root = allocator.allocate<Root>(*scene, root);
-	scene->m_root->id = 0;
-	scene->m_object_map[0] = {&root, scene->m_root};
-
-	const Element* object = objs->child;
-	while (object)
-	{
-		if (!isLong(object->first_property))
-		{
-			Error::s_message = "Invalid";
-			return false;
-		}
-
-		u64 id = object->first_property->value.toU64();
-		scene->m_object_map[id] = {object, nullptr};
-		object = object->sibling;
-	}
-
-	std::vector<ParseGeometryJob> parse_geom_jobs;
-	for (auto iter : scene->m_object_map)
-	{
-		OptionalError<Object*> obj = nullptr;
-
-		if (iter.second.object == scene->m_root) continue;
-
-		if (iter.second.element->id == "Geometry")
-		{
-			Property* last_prop = iter.second.element->first_property;
-			while (last_prop->next) last_prop = last_prop->next;
-			if (last_prop && last_prop->value == "Mesh" && !ignore_geometry)
-			{
-				GeometryImpl* geom = allocator.allocate<GeometryImpl>(*scene, *iter.second.element);
-				scene->m_geometries.push_back(geom);
-				ParseGeometryJob job {iter.second.element, triangulate, geom, iter.first, false};
-				parse_geom_jobs.push_back(job);
-				continue;
-			}
-			if (last_prop && last_prop->value == "Shape" && !ignore_geometry)
-			{
-				obj = allocator.allocate<ShapeImpl>(*scene, *iter.second.element);
-			}
-		}
-		else if (iter.second.element->id == "Material")
-		{
-			obj = parseMaterial(*scene, *iter.second.element, allocator);
-		}
-		else if (iter.second.element->id == "AnimationStack")
-		{
-			obj = parse<AnimationStackImpl>(*scene, *iter.second.element, allocator);
-			if (!obj.isError())
-			{
-				AnimationStackImpl* stack = (AnimationStackImpl*)obj.getValue();
-				scene->m_animation_stacks.push_back(stack);
-			}
-		}
-		else if (iter.second.element->id == "AnimationLayer")
-		{
-			obj = parse<AnimationLayerImpl>(*scene, *iter.second.element, allocator);
-		}
-		else if (iter.second.element->id == "AnimationCurve")
-		{
-			obj = parseAnimationCurve(*scene, *iter.second.element, allocator);
-		}
-		else if (iter.second.element->id == "AnimationCurveNode")
-		{
-			obj = parse<AnimationCurveNodeImpl>(*scene, *iter.second.element, allocator);
-		}
-		else if (iter.second.element->id == "Deformer")
-		{
-			IElementProperty* class_prop = iter.second.element->getProperty(2);
-
-			if (class_prop)
-			{
-				if (class_prop->getValue() == "Cluster")
-					obj = parseCluster(*scene, *iter.second.element, allocator);
-				else if (class_prop->getValue() == "Skin")
-					obj = parse<SkinImpl>(*scene, *iter.second.element, allocator);
-				else if (class_prop->getValue() == "BlendShape" && !ignore_blend_shapes)
-					obj = parse<BlendShapeImpl>(*scene, *iter.second.element, allocator);
-				else if (class_prop->getValue() == "BlendShapeChannel" && !ignore_blend_shapes)
-					obj = parse<BlendShapeChannelImpl>(*scene, *iter.second.element, allocator);
-			}
-		}
-		else if (iter.second.element->id == "NodeAttribute")
-		{
-			obj = parseNodeAttribute(*scene, *iter.second.element, allocator);
-		}
-		else if (iter.second.element->id == "Model")
-		{
-			IElementProperty* class_prop = iter.second.element->getProperty(2);
-
-			if (class_prop)
-			{
-				if (class_prop->getValue() == "Mesh")
-				{
-					obj = parseMesh(*scene, *iter.second.element, allocator);
-					if (!obj.isError())
-					{
-						Mesh* mesh = (Mesh*)obj.getValue();
-						scene->m_meshes.push_back(mesh);
-						obj = mesh;
-					}
-				}
-				else if (class_prop->getValue() == "LimbNode")
-					obj = parseLimbNode(*scene, *iter.second.element, allocator);
-				else
-					obj = parse<NullImpl>(*scene, *iter.second.element, allocator);
-			}
-		}
-		else if (iter.second.element->id == "Texture")
-		{
-			obj = parseTexture(*scene, *iter.second.element, allocator);
-		}
-		else if (iter.second.element->id == "Video")
-		{
-			parseVideo(*scene, *iter.second.element, allocator);
-		}
-		else if (iter.second.element->id == "Pose")
-		{
-			obj = parsePose(*scene, *iter.second.element, allocator);
-		}
-
-		if (obj.isError()) return false;
-
-		scene->m_object_map[iter.first].object = obj.getValue();
-		if (obj.getValue())
-		{
-			scene->m_all_objects.push_back(obj.getValue());
-			obj.getValue()->id = iter.first;
-		}
-	}
-
-	if (!parse_geom_jobs.empty()) {
-		(*job_processor)([](void* ptr){
-			ParseGeometryJob* job = (ParseGeometryJob*)ptr;
-			job->is_error = parseGeometry(*job->element, job->triangulate, job->geom).isError();
-		}, job_user_ptr, &parse_geom_jobs[0], (u32)sizeof(parse_geom_jobs[0]), (u32)parse_geom_jobs.size());
-	}
-
-	for (const ParseGeometryJob& job : parse_geom_jobs) {
-		if (job.is_error) return false;
-		scene->m_object_map[job.id].object = job.geom;
-		if (job.geom) {
-			scene->m_all_objects.push_back(job.geom);
-			job.geom->id = job.id;
-		}
-	}
-
-	for (const Scene::Connection& con : scene->m_connections)
-	{
-		Object* parent = scene->m_object_map[con.to].object;
-		Object* child = scene->m_object_map[con.from].object;
-		if (!child) continue;
-		if (!parent) continue;
-
-		switch (child->getType())
-		{
-			case Object::Type::NODE_ATTRIBUTE:
-				if (parent->node_attribute)
-				{
-					Error::s_message = "Invalid node attribute";
-					return false;
-				}
-				parent->node_attribute = (NodeAttribute*)child;
-				break;
-			case Object::Type::ANIMATION_CURVE_NODE:
-				if (parent->isNode())
-				{
-					AnimationCurveNodeImpl* node = (AnimationCurveNodeImpl*)child;
-					node->bone = parent;
-					node->bone_link_property = con.property;
-				}
-				break;
-		}
-
-		switch (parent->getType())
-		{
-			case Object::Type::MESH:
-			{
-				MeshImpl* mesh = (MeshImpl*)parent;
-				switch (child->getType())
-				{
-					case Object::Type::GEOMETRY:
-						if (mesh->geometry)
-						{
-							Error::s_message = "Invalid mesh";
-							return false;
-						}
-						mesh->geometry = (Geometry*)child;
-						break;
-					case Object::Type::MATERIAL: mesh->materials.push_back((Material*)child); break;
-				}
-				break;
-			}
-			case Object::Type::SKIN:
-			{
-				SkinImpl* skin = (SkinImpl*)parent;
-				if (child->getType() == Object::Type::CLUSTER)
-				{
-					ClusterImpl* cluster = (ClusterImpl*)child;
-					skin->clusters.push_back(cluster);
-					if (cluster->skin)
-					{
-						Error::s_message = "Invalid cluster";
-						return false;
-					}
-					cluster->skin = skin;
-				}
-				break;
-			}
-			case Object::Type::BLEND_SHAPE:
-			{
-				BlendShapeImpl* blendShape = (BlendShapeImpl*)parent;
-				if (child->getType() == Object::Type::BLEND_SHAPE_CHANNEL)
-				{
-					BlendShapeChannelImpl* blendShapeChannel = (BlendShapeChannelImpl*)child;
-					blendShape->blendShapeChannels.push_back(blendShapeChannel);
-					if (blendShapeChannel->blendShape)
-					{
-						Error::s_message = "Invalid blend shape";
-						return false;
-					}
-					blendShapeChannel->blendShape = blendShape;
-				}
-				break;
-			}
-			case Object::Type::BLEND_SHAPE_CHANNEL:
-			{
-				BlendShapeChannelImpl* blendShapeChannel = (BlendShapeChannelImpl*)parent;
-				if (child->getType() == Object::Type::SHAPE)
-				{
-					ShapeImpl* shape = (ShapeImpl*)child;
-					blendShapeChannel->shapes.push_back(shape);
-				}
-				break;
-			}
-			case Object::Type::MATERIAL:
-			{
-				MaterialImpl* mat = (MaterialImpl*)parent;
-				if (child->getType() == Object::Type::TEXTURE)
-				{
-					Texture::TextureType type = Texture::COUNT;
-					if (con.property == "NormalMap")
-						type = Texture::NORMAL;
-					else if (con.property == "DiffuseColor")
-						type = Texture::DIFFUSE;
-					else if (con.property == "SpecularColor")
-						type = Texture::SPECULAR;
-                    else if (con.property == "ShininessExponent")
-                        type = Texture::SHININESS;
-                    else if (con.property == "EmissiveColor")
-                        type = Texture::EMISSIVE;
-                    else if (con.property == "AmbientColor")
-                        type = Texture::AMBIENT;
-                    else if (con.property == "ReflectionFactor")
-                        type = Texture::REFLECTION;
-					if (type == Texture::COUNT) break;
-
-					if (mat->textures[type])
-					{
-						break; // This may happen for some models (eg. 2 normal maps in use)
-					}
-
-					mat->textures[type] = (Texture*)child;
-				}
-				break;
-			}
-			case Object::Type::GEOMETRY:
-			{
-				GeometryImpl* geom = (GeometryImpl*)parent;
-				if (child->getType() == Object::Type::SKIN)
-					geom->skin = (Skin*)child;
-				else if (child->getType() == Object::Type::BLEND_SHAPE)
-					geom->blendShape = (BlendShape*)child;
-				break;
-			}
-			case Object::Type::CLUSTER:
-			{
-				ClusterImpl* cluster = (ClusterImpl*)parent;
-				if (child->getType() == Object::Type::LIMB_NODE || child->getType() == Object::Type::MESH || child->getType() == Object::Type::NULL_NODE)
-				{
-					if (cluster->link && cluster->link != child)
-					{
-						Error::s_message = "Invalid cluster";
-						return false;
-					}
-
-					cluster->link = child;
-				}
-				break;
-			}
-			case Object::Type::ANIMATION_LAYER:
-			{
-				if (child->getType() == Object::Type::ANIMATION_CURVE_NODE)
-				{
-					((AnimationLayerImpl*)parent)->curve_nodes.push_back((AnimationCurveNodeImpl*)child);
-				}
-			}
-			break;
-			case Object::Type::ANIMATION_CURVE_NODE:
-			{
-				AnimationCurveNodeImpl* node = (AnimationCurveNodeImpl*)parent;
-				if (child->getType() == Object::Type::ANIMATION_CURVE)
-				{
-					char tmp[32];
-					con.property.toString(tmp);
-					if (strcmp(tmp, "d|X") == 0)
-					{
-						node->curves[0].connection = &con;
-						node->curves[0].curve = (AnimationCurve*)child;
-					}
-					else if (strcmp(tmp, "d|Y") == 0)
-					{
-						node->curves[1].connection = &con;
-						node->curves[1].curve = (AnimationCurve*)child;
-					}
-					else if (strcmp(tmp, "d|Z") == 0)
-					{
-						node->curves[2].connection = &con;
-						node->curves[2].curve = (AnimationCurve*)child;
-					}
-				}
-				break;
-			}
-		}
-	}
-
-	if (!ignore_geometry) {
-		for (auto iter : scene->m_object_map)
-		{
-			Object* obj = iter.second.object;
-			if (!obj) continue;
-			switch (obj->getType()) {
-				case Object::Type::CLUSTER:
-					if (!((ClusterImpl*)iter.second.object)->postprocess(scene->m_allocator)) {
-						Error::s_message = "Failed to postprocess cluster";
-						return false;
-					}
-					break;
-				case Object::Type::BLEND_SHAPE_CHANNEL:
-					if (!((BlendShapeChannelImpl*)iter.second.object)->postprocess(scene->m_allocator)) {
-						Error::s_message = "Failed to postprocess blend shape channel";
-						return false;
-					}
-					break;
-				case Object::Type::POSE:
-					if (!((PoseImpl*)iter.second.object)->postprocess(scene)) {
-						Error::s_message = "Failed to postprocess pose";
-						return false;
-					}
-					break;
-			}
-		}
-	}
-
-	return true;
-}
-
-
-RotationOrder Object::getRotationOrder() const
-{
-	// This assumes that the default rotation order is EULER_XYZ.
-	return (RotationOrder) resolveEnumProperty(*this, "RotationOrder", (int) RotationOrder::EULER_XYZ);
-}
-
-
-Vec3 Object::getRotationOffset() const
-{
-	return resolveVec3Property(*this, "RotationOffset", {0, 0, 0});
-}
-
-
-Vec3 Object::getRotationPivot() const
-{
-	return resolveVec3Property(*this, "RotationPivot", {0, 0, 0});
-}
-
-
-Vec3 Object::getPostRotation() const
-{
-	return resolveVec3Property(*this, "PostRotation", {0, 0, 0});
-}
-
-
-Vec3 Object::getScalingOffset() const
-{
-	return resolveVec3Property(*this, "ScalingOffset", {0, 0, 0});
-}
-
-
-Vec3 Object::getScalingPivot() const
-{
-	return resolveVec3Property(*this, "ScalingPivot", {0, 0, 0});
-}
-
-
-Matrix Object::evalLocal(const Vec3& translation, const Vec3& rotation) const
-{
-	return evalLocal(translation, rotation, getLocalScaling());
-}
-
-
-Matrix Object::evalLocal(const Vec3& translation, const Vec3& rotation, const Vec3& scaling) const
-{
-	Vec3 rotation_pivot = getRotationPivot();
-	Vec3 scaling_pivot = getScalingPivot();
-	RotationOrder rotation_order = getRotationOrder();
-
-	Matrix s = makeIdentity();
-	s.m[0] = scaling.x;
-	s.m[5] = scaling.y;
-	s.m[10] = scaling.z;
-
-	Matrix t = makeIdentity();
-	setTranslation(translation, &t);
-
-	Matrix r = getRotationMatrix(rotation, rotation_order);
-	Matrix r_pre = getRotationMatrix(getPreRotation(), RotationOrder::EULER_XYZ);
-	Matrix r_post_inv = getRotationMatrix(-getPostRotation(), RotationOrder::EULER_ZYX);
-
-	Matrix r_off = makeIdentity();
-	setTranslation(getRotationOffset(), &r_off);
-
-	Matrix r_p = makeIdentity();
-	setTranslation(rotation_pivot, &r_p);
-
-	Matrix r_p_inv = makeIdentity();
-	setTranslation(-rotation_pivot, &r_p_inv);
-
-	Matrix s_off = makeIdentity();
-	setTranslation(getScalingOffset(), &s_off);
-
-	Matrix s_p = makeIdentity();
-	setTranslation(scaling_pivot, &s_p);
-
-	Matrix s_p_inv = makeIdentity();
-	setTranslation(-scaling_pivot, &s_p_inv);
-
-	// http://help.autodesk.com/view/FBX/2017/ENU/?guid=__files_GUID_10CDD63C_79C1_4F2D_BB28_AD2BE65A02ED_htm
-	return t * r_off * r_p * r_pre * r * r_post_inv * r_p_inv * s_off * s_p * s * s_p_inv;
-}
-
-
-Vec3 Object::getLocalTranslation() const
-{
-	return resolveVec3Property(*this, "Lcl Translation", {0, 0, 0});
-}
-
-
-Vec3 Object::getPreRotation() const
-{
-	return resolveVec3Property(*this, "PreRotation", {0, 0, 0});
-}
-
-
-Vec3 Object::getLocalRotation() const
-{
-	return resolveVec3Property(*this, "Lcl Rotation", {0, 0, 0});
-}
-
-
-Vec3 Object::getLocalScaling() const
-{
-	return resolveVec3Property(*this, "Lcl Scaling", {1, 1, 1});
-}
-
-
-Matrix Object::getGlobalTransform() const
-{
-	const Object* parent = getParent();
-	if (!parent) return evalLocal(getLocalTranslation(), getLocalRotation());
-
-	return parent->getGlobalTransform() * evalLocal(getLocalTranslation(), getLocalRotation());
-}
-
-
-Matrix Object::getLocalTransform() const
-{
-	return evalLocal(getLocalTranslation(), getLocalRotation(), getLocalScaling());
-}
-
-
-Object* Object::resolveObjectLinkReverse(Object::Type type) const
-{
-	u64 id = element.getFirstProperty() ? element.getFirstProperty()->getValue().toU64() : 0;
-	for (auto& connection : scene.m_connections)
-	{
-		if (connection.from == id && connection.to != 0)
-		{
-			const Scene::ObjectPair& pair = scene.m_object_map.find(connection.to)->second;
-			Object* obj = pair.object;
-			if (obj && obj->getType() == type) return obj;
-		}
-	}
-	return nullptr;
-}
-
-
-const IScene& Object::getScene() const
-{
-	return scene;
-}
-
-
-Object* Object::resolveObjectLink(int idx) const
-{
-	u64 id = element.getFirstProperty() ? element.getFirstProperty()->getValue().toU64() : 0;
-	for (auto& connection : scene.m_connections)
-	{
-		if (connection.to == id && connection.from != 0)
-		{
-			Object* obj = scene.m_object_map.find(connection.from)->second.object;
-			if (obj)
-			{
-				if (idx == 0) return obj;
-				--idx;
-			}
-		}
-	}
-	return nullptr;
-}
-
-
-Object* Object::resolveObjectLink(Object::Type type, const char* property, int idx) const
-{
-	u64 id = element.getFirstProperty() ? element.getFirstProperty()->getValue().toU64() : 0;
-	for (auto& connection : scene.m_connections)
-	{
-		if (connection.to == id && connection.from != 0)
-		{
-			Object* obj = scene.m_object_map.find(connection.from)->second.object;
-			if (obj && obj->getType() == type)
-			{
-				if (property == nullptr || connection.property == property)
-				{
-					if (idx == 0) return obj;
-					--idx;
-				}
-			}
-		}
-	}
-	return nullptr;
-}
-
-
-Object* Object::getParent() const
-{
-	Object* parent = nullptr;
-	for (auto& connection : scene.m_connections)
-	{
-		if (connection.from == id)
-		{
-			Object* obj = scene.m_object_map.find(connection.to)->second.object;
-			if (obj && obj->is_node && obj != this)
-			{
-				assert(parent == nullptr);
-				parent = obj;
-			}
-		}
-	}
-	return parent;
-}
-
-
-IScene* load(const u8* data, int size, u64 flags, JobProcessor job_processor, void* job_user_ptr)
-{
-	std::unique_ptr<Scene> scene(new Scene());
-	scene->m_data.resize(size);
-	memcpy(&scene->m_data[0], data, size);
-	u32 version;
-
-	const bool is_binary = size >= 18 && strncmp((const char*)data, "Kaydara FBX Binary", 18) == 0;
-	OptionalError<Element*> root(nullptr);
-	if (is_binary) {
-		root = tokenize(&scene->m_data[0], size, version, scene->m_allocator);
-		if (version < 6200)
-		{
-			Error::s_message = "Unsupported FBX file format version. Minimum supported version is 6.2";
-			return nullptr;
-		}
-		if (root.isError())
-		{
-			Error::s_message = "";
-			if (root.isError()) return nullptr;
-		}
-	}
-	else {
-		root = tokenizeText(&scene->m_data[0], size, scene->m_allocator);
-		if (root.isError()) return nullptr;
-	}
-
-	scene->m_root_element = root.getValue();
-	assert(scene->m_root_element);
-
-	// if (parseTemplates(*root.getValue()).isError()) return nullptr;
-	if (!parseConnections(*root.getValue(), scene.get())) return nullptr;
-	if (!parseTakes(scene.get())) return nullptr;
-	if (!parseObjects(*root.getValue(), scene.get(), flags, scene->m_allocator, job_processor, job_user_ptr)) return nullptr;
-	parseGlobalSettings(*root.getValue(), scene.get());
-
-	return scene.release();
-}
-
-
-const char* getError()
-{
-	return Error::s_message;
-}
-
-
-} // namespace ofbx
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/src/ofbx.h b/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/src/ofbx.h
deleted file mode 100644
index abc1bc104..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/OpenFBX/src/ofbx.h
+++ /dev/null
@@ -1,547 +0,0 @@
-#pragma once
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-
-namespace ofbx
-{
-
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-#ifdef _WIN32
-	typedef long long i64;
-	typedef unsigned long long u64;
-#else
-	typedef long i64;
-	typedef unsigned long u64;
-#endif
-
-static_assert(sizeof(u8) == 1, "u8 is not 1 byte");
-static_assert(sizeof(u32) == 4, "u32 is not 4 bytes");
-static_assert(sizeof(u64) == 8, "u64 is not 8 bytes");
-static_assert(sizeof(i64) == 8, "i64 is not 8 bytes");
-
-
-using JobFunction = void (*)(void*);
-using JobProcessor = void (*)(JobFunction, void*, void*, u32, u32);
-
-enum class LoadFlags : u64 {
-	TRIANGULATE = 1 << 0,
-	IGNORE_GEOMETRY = 1 << 1,
-	IGNORE_BLEND_SHAPES = 1 << 2,
-};
-
-
-struct Vec2
-{
-	double x, y;
-};
-
-
-struct Vec3
-{
-	double x, y, z;
-};
-
-
-struct Vec4
-{
-	double x, y, z, w;
-};
-
-
-struct Matrix
-{
-	double m[16]; // last 4 are translation
-};
-
-
-struct Quat
-{
-	double x, y, z, w;
-};
-
-
-struct Color
-{
-	float r, g, b;
-};
-
-
-struct DataView
-{
-	const u8* begin = nullptr;
-	const u8* end = nullptr;
-	bool is_binary = true;
-
-	bool operator!=(const char* rhs) const { return !(*this == rhs); }
-	bool operator==(const char* rhs) const;
-
-	u64 toU64() const;
-	i64 toI64() const;
-	int toInt() const;
-	u32 toU32() const;
-	double toDouble() const;
-	float toFloat() const;
-
-	template <int N>
-	void toString(char(&out)[N]) const
-	{
-		char* cout = out;
-		const u8* cin = begin;
-		while (cin != end && cout - out < N - 1)
-		{
-			*cout = (char)*cin;
-			++cin;
-			++cout;
-		}
-		*cout = '\0';
-	}
-};
-
-
-struct IElementProperty
-{
-	enum Type : unsigned char
-	{
-		LONG = 'L',
-		INTEGER = 'I',
-		STRING = 'S',
-		FLOAT = 'F',
-		DOUBLE = 'D',
-		ARRAY_DOUBLE = 'd',
-		ARRAY_INT = 'i',
-		ARRAY_LONG = 'l',
-		ARRAY_FLOAT = 'f',
-		BINARY = 'R'
-	};
-	virtual ~IElementProperty() {}
-	virtual Type getType() const = 0;
-	virtual IElementProperty* getNext() const = 0;
-	virtual DataView getValue() const = 0;
-	virtual int getCount() const = 0;
-	virtual bool getValues(double* values, int max_size) const = 0;
-	virtual bool getValues(int* values, int max_size) const = 0;
-	virtual bool getValues(float* values, int max_size) const = 0;
-	virtual bool getValues(u64* values, int max_size) const = 0;
-	virtual bool getValues(i64* values, int max_size) const = 0;
-};
-
-
-struct IElement
-{
-    virtual ~IElement() = default;
-	virtual IElement* getFirstChild() const = 0;
-	virtual IElement* getSibling() const = 0;
-	virtual DataView getID() const = 0;
-	virtual IElementProperty* getFirstProperty() const = 0;
-};
-
-
-enum class RotationOrder
-{
-	EULER_XYZ,
-	EULER_XZY,
-	EULER_YZX,
-	EULER_YXZ,
-	EULER_ZXY,
-	EULER_ZYX,
-	SPHERIC_XYZ // Currently unsupported. Treated as EULER_XYZ.
-};
-
-
-struct AnimationCurveNode;
-struct AnimationLayer;
-struct Scene;
-struct IScene;
-
-
-struct Object
-{
-	enum class Type
-	{
-		ROOT,
-		GEOMETRY,
-		SHAPE,
-		MATERIAL,
-		MESH,
-		TEXTURE,
-		LIMB_NODE,
-		NULL_NODE,
-		NODE_ATTRIBUTE,
-		CLUSTER,
-		SKIN,
-		BLEND_SHAPE,
-		BLEND_SHAPE_CHANNEL,
-		ANIMATION_STACK,
-		ANIMATION_LAYER,
-		ANIMATION_CURVE,
-		ANIMATION_CURVE_NODE,
-		POSE
-	};
-
-	Object(const Scene& _scene, const IElement& _element);
-
-	virtual ~Object() {}
-	virtual Type getType() const = 0;
-
-	const IScene& getScene() const;
-	Object* resolveObjectLink(int idx) const;
-	Object* resolveObjectLink(Type type, const char* property, int idx) const;
-	Object* resolveObjectLinkReverse(Type type) const;
-	Object* getParent() const;
-
-	RotationOrder getRotationOrder() const;
-	Vec3 getRotationOffset() const;
-	Vec3 getRotationPivot() const;
-	Vec3 getPostRotation() const;
-	Vec3 getScalingOffset() const;
-	Vec3 getScalingPivot() const;
-	Vec3 getPreRotation() const;
-	Vec3 getLocalTranslation() const;
-	Vec3 getLocalRotation() const;
-	Vec3 getLocalScaling() const;
-	Matrix getGlobalTransform() const;
-	Matrix getLocalTransform() const;
-	Matrix evalLocal(const Vec3& translation, const Vec3& rotation) const;
-	Matrix evalLocal(const Vec3& translation, const Vec3& rotation, const Vec3& scaling) const;
-	bool isNode() const { return is_node; }
-
-
-	template <typename T> T* resolveObjectLink(int idx) const
-	{
-		return static_cast<T*>(resolveObjectLink(T::s_type, nullptr, idx));
-	}
-
-	u64 id;
-	char name[128];
-	const IElement& element;
-	const Object* node_attribute;
-
-protected:
-	bool is_node;
-	const Scene& scene;
-};
-
-
-struct Pose : Object {
-	static const Type s_type = Type::POSE;
-	Pose(const Scene& _scene, const IElement& _element);
-
-	virtual Matrix getMatrix() const = 0;
-	virtual const Object* getNode() const = 0;
-};
-
-
-struct Texture : Object
-{
-	enum TextureType
-	{
-		DIFFUSE,
-		NORMAL,
-		SPECULAR,
-        SHININESS,
-        AMBIENT,
-        EMISSIVE,
-        REFLECTION,
-		COUNT
-	};
-
-	static const Type s_type = Type::TEXTURE;
-
-	Texture(const Scene& _scene, const IElement& _element);
-	virtual DataView getFileName() const = 0;
-	virtual DataView getRelativeFileName() const = 0;
-	virtual DataView getEmbeddedData() const = 0;
-};
-
-
-struct Material : Object
-{
-	static const Type s_type = Type::MATERIAL;
-
-	Material(const Scene& _scene, const IElement& _element);
-
-	virtual Color getDiffuseColor() const = 0;
-	virtual Color getSpecularColor() const = 0;
-    virtual Color getReflectionColor() const = 0;
-    virtual Color getAmbientColor() const = 0;
-    virtual Color getEmissiveColor() const = 0;
-
-    virtual double getDiffuseFactor() const = 0;
-    virtual double getSpecularFactor() const = 0;
-    virtual double getReflectionFactor() const = 0;
-    virtual double getShininess() const = 0;
-    virtual double getShininessExponent() const = 0;
-    virtual double getAmbientFactor() const = 0;
-    virtual double getBumpFactor() const = 0;
-    virtual double getEmissiveFactor() const = 0;
-
-	virtual const Texture* getTexture(Texture::TextureType type) const = 0;
-};
-
-
-struct Cluster : Object
-{
-	static const Type s_type = Type::CLUSTER;
-
-	Cluster(const Scene& _scene, const IElement& _element);
-
-	virtual const int* getIndices() const = 0;
-	virtual int getIndicesCount() const = 0;
-	virtual const double* getWeights() const = 0;
-	virtual int getWeightsCount() const = 0;
-	virtual Matrix getTransformMatrix() const = 0;
-	virtual Matrix getTransformLinkMatrix() const = 0;
-	virtual const Object* getLink() const = 0;
-};
-
-
-struct Skin : Object
-{
-	static const Type s_type = Type::SKIN;
-
-	Skin(const Scene& _scene, const IElement& _element);
-
-	virtual int getClusterCount() const = 0;
-	virtual const Cluster* getCluster(int idx) const = 0;
-};
-
-
-struct BlendShapeChannel : Object
-{
-	static const Type s_type = Type::BLEND_SHAPE_CHANNEL;
-
-	BlendShapeChannel(const Scene& _scene, const IElement& _element);
-
-	virtual double getDeformPercent() const = 0;
-	virtual int getShapeCount() const = 0;
-	virtual const struct Shape* getShape(int idx) const = 0;
-};
-
-
-struct BlendShape : Object
-{
-	static const Type s_type = Type::BLEND_SHAPE;
-
-	BlendShape(const Scene& _scene, const IElement& _element);
-
-	virtual int getBlendShapeChannelCount() const = 0;
-	virtual const BlendShapeChannel* getBlendShapeChannel(int idx) const = 0;
-};
-
-
-struct NodeAttribute : Object
-{
-	static const Type s_type = Type::NODE_ATTRIBUTE;
-
-	NodeAttribute(const Scene& _scene, const IElement& _element);
-
-	virtual DataView getAttributeType() const = 0;
-};
-
-
-struct Geometry : Object
-{
-	static const Type s_type = Type::GEOMETRY;
-	static const int s_uvs_max = 4;
-
-	Geometry(const Scene& _scene, const IElement& _element);
-
-	virtual const Vec3* getVertices() const = 0;
-	virtual int getVertexCount() const = 0;
-
-	virtual const int* getFaceIndices() const = 0;
-	virtual int getIndexCount() const = 0;
-
-	virtual const Vec3* getNormals() const = 0;
-	virtual const Vec2* getUVs(int index = 0) const = 0;
-	virtual const Vec4* getColors() const = 0;
-	virtual const Vec3* getTangents() const = 0;
-	virtual const Skin* getSkin() const = 0;
-	virtual const BlendShape* getBlendShape() const = 0;
-	virtual const int* getMaterials() const = 0;
-};
-
-
-struct Shape : Object
-{
-	static const Type s_type = Type::SHAPE;
-
-	Shape(const Scene& _scene, const IElement& _element);
-
-	virtual const Vec3* getVertices() const = 0;
-	virtual int getVertexCount() const = 0;
-
-	virtual const Vec3* getNormals() const = 0;
-};
-
-
-struct Mesh : Object
-{
-	static const Type s_type = Type::MESH;
-
-	Mesh(const Scene& _scene, const IElement& _element);
-
-	virtual const Pose* getPose() const = 0;
-	virtual const Geometry* getGeometry() const = 0;
-	virtual Matrix getGeometricMatrix() const = 0;
-	virtual const Material* getMaterial(int idx) const = 0;
-	virtual int getMaterialCount() const = 0;
-};
-
-
-struct AnimationStack : Object
-{
-	static const Type s_type = Type::ANIMATION_STACK;
-
-	AnimationStack(const Scene& _scene, const IElement& _element);
-	virtual const AnimationLayer* getLayer(int index) const = 0;
-};
-
-
-struct AnimationLayer : Object
-{
-	static const Type s_type = Type::ANIMATION_LAYER;
-
-	AnimationLayer(const Scene& _scene, const IElement& _element);
-
-	virtual const AnimationCurveNode* getCurveNode(int index) const = 0;
-	virtual const AnimationCurveNode* getCurveNode(const Object& bone, const char* property) const = 0;
-};
-
-
-struct AnimationCurve : Object
-{
-	static const Type s_type = Type::ANIMATION_CURVE;
-
-	AnimationCurve(const Scene& _scene, const IElement& _element);
-
-	virtual int getKeyCount() const = 0;
-	virtual const i64* getKeyTime() const = 0;
-	virtual const float* getKeyValue() const = 0;
-};
-
-
-struct AnimationCurveNode : Object
-{
-	static const Type s_type = Type::ANIMATION_CURVE_NODE;
-
-	AnimationCurveNode(const Scene& _scene, const IElement& _element);
-
-	virtual const AnimationCurve* getCurve(int idx) const = 0;
-	virtual Vec3 getNodeLocalTransform(double time) const = 0;
-	virtual const Object* getBone() const = 0;
-};
-
-
-struct TakeInfo
-{
-	DataView name;
-	DataView filename;
-	double local_time_from;
-	double local_time_to;
-	double reference_time_from;
-	double reference_time_to;
-};
-
-
-// Specifies which canonical axis represents up in the system (typically Y or Z).
-enum UpVector
-{
-	UpVector_AxisX = 0,
-	UpVector_AxisY = 1,
-	UpVector_AxisZ = 2
-};
-
-
-// Specifies the third vector of the system.
-enum CoordSystem
-{
-	CoordSystem_RightHanded = 0,
-	CoordSystem_LeftHanded = 1
-};
-
-
-// http://docs.autodesk.com/FBX/2014/ENU/FBX-SDK-Documentation/index.html?url=cpp_ref/class_fbx_time.html,topicNumber=cpp_ref_class_fbx_time_html29087af6-8c2c-4e9d-aede-7dc5a1c2436c,hash=a837590fd5310ff5df56ffcf7c394787e
-enum FrameRate
-{
-	FrameRate_DEFAULT = 0,
-	FrameRate_120 = 1,
-	FrameRate_100 = 2,
-	FrameRate_60 = 3,
-	FrameRate_50 = 4,
-	FrameRate_48 = 5,
-	FrameRate_30 = 6,
-	FrameRate_30_DROP = 7,
-	FrameRate_NTSC_DROP_FRAME = 8,
-	FrameRate_NTSC_FULL_FRAME = 9,
-	FrameRate_PAL = 10,
-	FrameRate_CINEMA = 11,
-	FrameRate_1000 = 12,
-	FrameRate_CINEMA_ND = 13,
-	FrameRate_CUSTOM = 14,
-};
-
-
-struct GlobalSettings
-{
-	UpVector UpAxis = UpVector_AxisX;
-	int UpAxisSign = 1;
-	// this seems to be 1-2 in Autodesk (odd/even parity), and 0-2 in Blender (axis as in UpAxis)
-	// I recommend to ignore FrontAxis and use just UpVector
-	int FrontAxis = 1;
-	int FrontAxisSign = 1;
-	CoordSystem CoordAxis = CoordSystem_RightHanded;
-	int CoordAxisSign = 1;
-	int OriginalUpAxis = 0;
-	int OriginalUpAxisSign = 1;
-	float UnitScaleFactor = 1;
-	float OriginalUnitScaleFactor = 1;
-	double TimeSpanStart = 0L;
-	double TimeSpanStop = 0L;
-	FrameRate TimeMode = FrameRate_DEFAULT;
-	float CustomFrameRate = -1.0f;
-};
-
-
-struct IScene
-{
-	virtual void destroy() = 0;
-	virtual const IElement* getRootElement() const = 0;
-	virtual const Object* getRoot() const = 0;
-	virtual const TakeInfo* getTakeInfo(const char* name) const = 0;
-	virtual int getGeometryCount() const = 0;
-	virtual int getMeshCount() const = 0;
-	virtual float getSceneFrameRate() const = 0;
-	virtual const GlobalSettings* getGlobalSettings() const = 0;
-	virtual const Mesh* getMesh(int index) const = 0;
-	virtual const Geometry* getGeometry(int index) const = 0;
-	virtual int getAnimationStackCount() const = 0;
-	virtual const AnimationStack* getAnimationStack(int index) const = 0;
-	virtual const Object* const* getAllObjects() const = 0;
-	virtual int getAllObjectCount() const = 0;
-	virtual int getEmbeddedDataCount() const = 0;
-	virtual DataView getEmbeddedData(int index) const = 0;
-	virtual DataView getEmbeddedFilename(int index) const = 0;
-
-protected:
-	virtual ~IScene() {}
-};
-
-
-IScene* load(const u8* data, int size, u64 flags, JobProcessor job_processor = nullptr, void* job_user_ptr = nullptr);
-const char* getError();
-double fbxTimeToSeconds(i64 value);
-i64 secondsToFbxTime(double value);
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-} // namespace ofbx
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/README.fpng.md b/contrib/tinyusdz/tinyusdz_repo/src/external/README.fpng.md
deleted file mode 100644
index 93f7e7d98..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/README.fpng.md
+++ /dev/null
@@ -1,183 +0,0 @@
-# fpng
-fpng is a very fast C++ .PNG image reader/writer for 24/32bpp images. It's a [single source file](src/fpng.h) with no dependencies on any other library. fpng.cpp was written to see just how fast you can write .PNG's without sacrificing too much compression. The files written by fpng conform to the [PNG standard](https://www.w3.org/TR/PNG/), are readable using any PNG decoder, and load or validate successfully using libpng, wuffs, lodepng, stb_image, and [pngcheck](http://www.libpng.org/pub/png/apps/pngcheck.html). PNG files written using fpng can also be read using fpng significantly faster than other PNG libraries, due to its explicit use of [Length-Limited Prefix Codes](https://create.stephan-brumme.com/length-limited-prefix-codes/) and an [optimized decoder](https://fastcompression.blogspot.com/2015/10/huffman-revisited-part-4-multi-bytes.html) that exploits the properties of these codes.
-
-fpng.cpp compression compared to stb_image_write.h: 12-19x faster with roughly 5-11% avg. smaller files. 
-
-fpng.cpp decompression compared to stb_image.h: 2.5-3x faster (on fpng compressed PNG's)
-
-fpng.cpp compared to libpng: ~23x faster compression, 2.5-3x faster decompression (on fpng compressed PNG's)
-
-fpng.cpp compared to Wuffs decompression: roughly 10% faster decompression (on fpng compressed PNG's - note Wuffs decompression is in general *extremely* fast)
-
-Here's an example image encoded by fpng (a downsampled version of "bridge" from [here](http://imagecompression.info/test_images/)):
-![fpng encoded "bridge" image](https://github.com/richgel999/fpng/blob/main/example.png)
-
-A real-world benchmark using an assortment of 303 24/32bpp test images used for GPU texture compression benchmarks (mps="megapixels/second", sorted by compression rate):
-
-```
-                 comp_size  avg_comp_mps  avg_decomp_mps
-fpng_1_pass:     293.10 MB  110.16 mps    162.01 mps
-qoi:             300.84 MB  83.90 mps     138.18 mps
-fpng_2_pass:     275.73 MB  68.32 mps     165.73 mps
-lodepng:         220.40 MB  6.21 mps      27.66 mps
-stb_image:       311.41 MB  5.76 mps      50.00 mps
-```
-
-A real-world benchmark using the 184 QOI test images (note 182 of the qoi test images don't have alpha channels, so this is almost entirely a 24bpp test):
-
-```
-                 comp_size  avg_comp_mps  avg_decomp_mps
-fpng_1_pass:     392.45 MB  115.17 mps    161.92 mps
-qoi:             359.55 MB  88.22 mps     156.24 mps
-fpng_2_pass:     374.76 MB  71.29 mps     164.12 mps
-stb_image:       425.64 MB  5.71 mps      52.18 mps
-lodepng:         300.14 MB  5.20 mps      29.63 mps
-```
-
-An artificial benchmark using the 184 QOI test images, but with the green channel swizzled into alpha and all images compressed as 32bpp (to easily create a correlated alpha channel, common in video game textures):
-
-```
-                 comp_size  avg_comp_mps  avg_decomp_mps
-qoi:             697.20 MB  154.43 mps    160.30 mps
-fpng_1_pass:     540.61 MB  93.10 mps     128.43 mps
-fpng_2_pass:     487.99 MB  59.12 mps     136.46 mps
-stb_image:       486.44 MB  4.63 mps      46.25 mps
-lodepng:         352.10 MB  4.25 mps      28.84 mps
-```
-
-A well-behaved lossless compressor should output files roughly up to 1/3rd larger in this test. QOI's compressed output files are 1.94x larger vs. the 24bpp variants (697.20MB vs. 359.55MB), which is significantly more expansion than I would expect.
-
-Benchmarks were made using the included fpng_test tool to generate .CSV files, MSVC 2019, on a Xeon E5-2690 3.00 GHz. The above benchmarks were made before SSE adler32/crc32 functions were added to the encoder. With 24bpp images and MSVC2022 the encoder is now around 15% faster.
-
-## Building
-
-To build, compile from the included .SLN with Visual Studio 2019/2022 or use cmake to generate a .SLN file. For Linux/OSX, use
-
-```
-  cmake -DSSE=1 .
-  make
-```
-
-Remove "-DSSE=1" on non-x86/x64 systems. The test executable will be in the "bin" or "bin_osx" subdirectory.
-
-Tested with MSVC 2022/2019/gcc 7.5.0/clang 6.0. I have only tested fpng.cpp on little endian systems. The code is there for big endian, and it should work, but it needs testing.
-
-## Testing
-
-From the "bin" directory, run "fpng_test.exe" or "./fpng_test" like this:
-
-```fpng_test.exe <image_filename.png>```
-
-For two pass compression (slower compression, usually faster decompression, smaller average file size):
-
-```fpng_test.exe -s <image_filename.png>```
-
-To generate .CSV output only:
-
-```fpng_test.exe -c <image_filename.png>```
-
-There will be several output files written to the current directory: stbi.png, lodepng.png, qoi.qoi, and fpng.png. Statistics or .CSV data will be printed to stdout, and errors to stderr.
-
-The test app decompresses fpng's output using lodepng, stb_image, and the fpng decoder to validate the compressed data. The compressed output has also been validated using [pngcheck](http://www.libpng.org/pub/png/apps/pngcheck.html).
-
-## Using fpng 
-
-To use fpng.cpp in other programs, copy fpng.cpp/.h into your project. Alternatively, `#include "fpng.cpp"` and `#include "fpng.h"` in one place, and then `#include "fpng.h"` everywhere else. 
-
-There are a few optional compile-time defines you can use to configure fpng, particularly `FPNG_NO_SSE`. With gcc/clang on x86/x64, to get SSE you must compile with "-msse4.1 -mpclmul". Also, the code has only been tested with `-fno-strict-aliasing` (same as the Linux kernel, and MSVC's default). See the top of fpng.cpp for a list of the optional defines.
-
-### Initialization
-
-**Call `fpng::fpng_init()` once before using fpng** so it can detect if the CPU supports SSE 4.1+pclmul (for fast CRC-32 and Adler32). Otherwise, it'll always use the slower scalar fallbacks.
-
-### Encoding
-
-Call one of these C-style functions in the "fpng" namespace:
-
-```
-namespace fpng {
-  bool fpng_encode_image_to_memory(const void* pImage, uint32_t w, uint32_t h, uint32_t num_chans, std::vector<uint8_t>& out_buf, uint32_t flags = 0);
-  bool fpng_encode_image_to_file(const char* pFilename, const void* pImage, uint32_t w, uint32_t h, uint32_t num_chans, uint32_t flags = 0);
-}
-```
-
-`num_chans` must be 3 or 4. There must be ```w*3*h``` or ```w*4*h``` bytes pointed to by ```pImage```. The image row pitch is always ```w*3``` or ```w*4``` bytes. There is no automatic determination if the image actually uses an alpha channel, so if you call it with 4 you will always get a 32bpp .PNG file.
-
-### Decoding
-
-**The included fast decoder will only decode PNG files created by fpng.** However, it has a full PNG chunk parser, and when it detects PNG files not written by fpng it returns the error code `FPNG_DECODE_NOT_FPNG` so you can fall back to a general purpose PNG reader. Also, the decompressor validates the compressed data during decompression and will immediately stop and return `FPNG_DECODE_NOT_FPNG` whenever any of the fpng constraints (implied by the fdEC marker's presence) are violated. You can use ```fpng_get_info()``` to quickly detect if a PNG file can be decoded using fpng.
-
-```
-namespace fpng {
-  int fpng_get_info(const void* pImage, uint32_t image_size, uint32_t& width, uint32_t& height, uint32_t& channels_in_file);
-  int fpng_decode_memory(const void* pImage, uint32_t image_size, std::vector<uint8_t>& out, uint32_t& width, uint32_t& height, uint32_t& channels_in_file, uint32_t desired_channels);
-  int fpng_decode_file(const char* pFilename, std::vector<uint8_t>& out, uint32_t& width, uint32_t& height, uint32_t& channels_in_file, uint32_t desired_channels);
-}
-```
-
-`pImage` and `image_size` point to the PNG file data.
-
-`width`, `height`, `channels_in_file` will be set to the image's dimensions and number of channels, which will always be 3 or 4.
-
-`desired_channels` must be 3 or 4. If the input PNG file is 32bpp and you request 24bpp, the alpha channel will be discarded. If the input is 24bpp and you request 32bpp, the alpha channel will be set to 0xFF.
-
-The return code will be `fpng::FPNG_DECODE_SUCCESS` on success, `fpng::FPNG_DECODE_NOT_FPNG` if the PNG file should be decoded with a general purpose decoder, or one of the other error values.
-
-### Utility Functions
-
-For convenience some of the lib's internal functionality is exposed through these API's:
-
-```
-namespace fpng {
-  bool fpng_cpu_supports_sse41();
-  uint32_t fpng_crc32(const void* pData, size_t size, uint32_t prev_crc32 = FPNG_CRC32_INIT);
-  uint32_t fpng_adler32(const void* pData, size_t size, uint32_t adler = FPNG_ADLER32_INIT);
-}
-```
-
-## Notes
-
-This version of FPNG always uses PNG filter #2 and is limited to only RLE matches (i.e. LZ matches with a match distance of either 3 or 4). It's around 5% weaker than the original release, which used LZRW1 parsing. (I'll eventually add back in the original parser as an option, but doing that will add more code/complexity to the project.)
-
-Importantly, the fpng decoder can explictly/purposely only decode PNG files written by fpng, otherwise it returns fpng::FPNG_DECODE_NOT_FPNG (so you can fall back to a general purpose PNG decoder).
-
-fpng's compressor places a special private ancillary chunk in its output files, which other PNG decompressors will ignore. The decompressor uses this chunk to determine if the file was written by fpng (enabling fast decompression). This chunk's definition is [here](https://github.com/richgel999/fpng/wiki/fdEC-PNG-chunk-definition).
-
-In single pass mode (the default), fpng uses a set of precomputed Deflate dynamic Huffman tables. Here's [how to use the fpng_test tool to compute custom tables](https://github.com/richgel999/fpng/wiki/How-to-train-new-Huffman-tables-for-custom-content). 
-
-Earlier versions of fpng (before 1.0.5) wrote valid PNG's that wuffs wouldn't accept. As far as I can tell this is a [bug in wuffs](https://github.com/google/wuffs/issues/66). I've added a workaround to fpng's encoder and re-trained its single pass Huffman tables, and I've also added the wuffs decoder to the png_test app.
-
-lodepng v20210627 fetched 12/18/2021
-
-stb_image_write.h v1.16 fetched 12/18/2021
-
-qoi.h fetched 12/18/2021
-
-## Low-level description
-
-fpng's compressor uses a custom pixel-wise Deflate compressor which was optimized for simplicity over high ratios. The "parser" only supports RLE matches using a match distance of 3/4 bytes, all literals (except the PNG filter bytes) are output in groups of 3 or 4, all matches are multiples of 3/4 bytes, and it only utilizes a single dynamic Huffman block within a single PNG IDAT chunk. It utilizes 64-bit registers and exploits unaligned little endian reads/writes. (On big endian CPU's it'll use 32/64bpp byteswaps.)  
-
-There are two compressor variants in this release: a faster single pass compressor that utilizes a set of precomputed Huffman tables, or a slightly better two pass compressor that results in smaller files (enabled by passing FPNG_ENCODE_SLOWER flag to the compressor). fpng will fall back to using uncompressed Deflate blocks if the image fails to compress.
-
-The fast decompressor included in fpng.cpp can explictly only handle PNG files created by fpng. To detect these files, it looks for a PNG private ancillary chunk named "fdEC", which other readers will ignore because it's not marked as a "critical" PNG chunk. If this chunk isn't found, or the file doesn't conform to fpng's single IDAT and zlib constraints, the decompressor returns FPNG_DECODE_NOT_FPNG. The decompressor itself has numerous checks to ensure the PNG file was written by fpng (i.e. even if the fdEC chunk is present we don't blindly assume the Deflate data follows the right constraints).
-
-The decompressor's memory usage is low relative to other PNG decompressors, because it doesn't need to make any temporary allocations to hold the decompressed zlib data. (This is one side benefit of always using LZ matches with a distance of only 3 or 4 bytes.) The only large allocation is the one used to hold the output image buffer, which it directly decompresses into. This property is useful on memory-constrained embedded platforms. It's possible for a fpng decompressor to only need to hold 2 scanlines in memory.
-
-Passes over the input image and dynamic allocations are minimized, although it does use ```std::vector``` internally. The first scanline always uses filter #0, and the rest use filter #2 (previous scanline). It uses the fast "slice by 4" CRC-32 algorithm described by Brumme [here](https://create.stephan-brumme.com/crc32/). The original high-level PNG function (that code that writes the headers) was written by [Alex Evans](https://gist.github.com/908299).
-
-
-## Fuzzing
-
-fpng's encoder and decoder has been fuzzed to check for failures or crashes with random/corrupted input images and random image dimensions. The -e and -E options are used for this sort of fuzzing.
-
-The fpng decoder's parser has been fuzzed to check for crashes with [zzuf](http://caca.zoy.org/wiki/zzuf). For more efficient decoder fuzzing (and more coverage), set `FPNG_DISABLE_DECODE_CRC32_CHECKS` to 1 in fpng.cpp before fuzzing. The -f option is used for fuzzing, like this:
-
-```
-zzuf -s 1:1000000 ./fpng_test -f fpng.png
-```
-
-## License for fpng.cpp/.h
-
-See the [unlicense](https://unlicense.org/) 
-
-At least in the US, no license is necessary, as this code is not Intellectual Property, and not copyrighted. It has been explictly and purposely placed into the Public Domain.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/ALACMagicCookieDescription.txt b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/ALACMagicCookieDescription.txt
deleted file mode 100644
index c15550bab..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/ALACMagicCookieDescription.txt
+++ /dev/null
@@ -1,241 +0,0 @@
-__________________________________________________________________________________________________________________________________
-__________________________________________________________________________________________________________________________________
-Apple Lossless Format "Magic Cookie" Description
-__________________________________________________________________________________________________________________________________
-__________________________________________________________________________________________________________________________________
-
-Many encoded formats for audio require additional, codec specific configuration information in order to operate successfully.
-This codec specific information is often called a 'magic cookie'. The Apple Lossless codec's 'magic cookie' contains the 
-ALACSpecificConfig and optional ALACChannelLayoutInfo (both described below).
-
-The 'magic cookie' must accompany the bitstream when stored in any file container (M4A/MP4, CAF) so that it may be provided to the 
-decoder when decoding the bitstream. From the caller's perspective, the 'magic cookie' is opaque and should be stored in the file 
-and presented to the decoder exactly as it is vended from the encoder (and consequently stored in the file). 
-
-The ALAC 'magic cookie' as stored in a file has all fields described in big-endian order (regardless of file format).
-
-The layout of the 'magic cookie' is as follows:
-
-
----------------- ALAC Specific Info (24 bytes) (mandatory) ---------------------------
-(ALACSpecificConfig)		Decoder Info
-	
----------------- Channel Layout Info (24 bytes) (optional) ----------------------------
-(ALAC Channel Layout Info)	Channel Layout Info
-
-
-If the channel layout is absent from the cookie, then the following assumptions are made:
-1 channel - mono
-2 channels - stereo in left, right order
-> 2 channels - no specific channel designation or role.
-
-
-__________________________________________________________________________________________________________________________________
-* ALAC Specific Info (24 bytes) (mandatory)
-__________________________________________________________________________________________________________________________________
-
-The Apple Lossless codec stores specific information about the encoded stream in the ALACSpecificConfig. This
-info is vended by the encoder and is used to setup the decoder for a given encoded bitstream. 
-
-When read from and written to a file, the fields of this struct must be in big-endian order. 
-When vended by the encoder (and received by the decoder) the struct values will be in big-endian order.
-
-/*
-    struct	ALACSpecificConfig (defined in ALACAudioTypes.h)
-    abstract   	This struct is used to describe codec provided information about the encoded Apple Lossless bitstream. 
-		It must accompany the encoded stream in the containing audio file and be provided to the decoder.
-
-    field      	frameLength 		uint32_t	indicating the frames per packet when no explicit frames per packet setting is 
-							present in the packet header. The encoder frames per packet can be explicitly set 
-							but for maximum compatibility, the default encoder setting of 4096 should be used.
-
-    field      	compatibleVersion 	uint8_t 	indicating compatible version, 
-							value must be set to 0
-
-    field      	bitDepth 		uint8_t 	describes the bit depth of the source PCM data (maximum value = 32)
-
-    field      	pb 			uint8_t 	currently unused tuning parameter. 
-						 	value should be set to 40
-
-    field      	mb 			uint8_t 	currently unused tuning parameter. 
-						 	value should be set to 10
-
-    field      	kb			uint8_t 	currently unused tuning parameter. 
-						 	value should be set to 14
-
-    field      	numChannels 		uint8_t 	describes the channel count (1 = mono, 2 = stereo, etc...)
-							when channel layout info is not provided in the 'magic cookie', a channel count > 2
-							describes a set of discreet channels with no specific ordering
-
-    field      	maxRun			uint16_t 	currently unused. 
-   						  	value should be set to 255
-
-    field      	maxFrameBytes 		uint32_t 	the maximum size of an Apple Lossless packet within the encoded stream. 
-						  	value of 0 indicates unknown
-
-    field      	avgBitRate 		uint32_t 	the average bit rate in bits per second of the Apple Lossless stream. 
-						  	value of 0 indicates unknown
-
-    field      	sampleRate 		uint32_t 	sample rate of the encoded stream
- */
-
-typedef struct ALACSpecificConfig
-{
-	uint32_t	frameLength;
-	uint8_t		compatibleVersion;
-	uint8_t		bitDepth;
-	uint8_t		pb;
-	uint8_t		mb;
-	uint8_t		kb;
-	uint8_t		numChannels;
-	uint16_t	maxRun;
-	uint32_t	maxFrameBytes;
-	uint32_t	avgBitRate;
-	uint32_t	sampleRate;
-
-} ALACSpecificConfig;
-		
-
-__________________________________________________________________________________________________________________________________
-Channel Layout Info (24 bytes) (optional)
-__________________________________________________________________________________________________________________________________
-
-The Apple Lossless codec can support a specific set of channel layouts. When channel information is vended 
-by the encoder (in the 'magic cookie'), it is formatted in the the ALACChannelLayoutInfo.
-
-When read from and written to a file, the fields of this struct must be in big-endian order. 
-When vended by the encoder (and received by the decoder) the struct values will be in big-endian order.
-
-/*
-    struct	ALACChannelLayoutInfo (defined in ALACAudioTypes.h)
-    abstract	This struct is used to specify particular channel orderings or configurations.
-		It is an optional portion of the 'magic cookie', being required to describe specific channel layouts (see below)
-		of more than 2 channels. 
-
-    field      	channelLayoutInfoSize 	uint32_t 	indicates the size of the channel layout data
-							value should be set to 24
-
-    field      	channelLayoutInfoID 	uint32_t 	identifier indicating that channel layout info is present 
-							value = 'chan'
-
-    field      	versionFlags 		uint32_t 	version flags
-						 	value should be set to 0
-
-    field	channelLayoutTag	uint32_t	channel layout type
-							from defined list in ALACAudioTypes.h (see below)
-
-    field      	reserved1 		uint32_t 	currently unused field
-						 	value should be set to 0
-
-    field      	reserved2 		uint32_t	currently unused field 
-						 	value should be set to 0
-*/
-
-typedef struct ALACChannelLayoutInfo
-{
-	uint32_t	channelLayoutInfoSize;
-	uint32_t	channelLayoutInfoID;
-	uint32_t	versionFlags;
-	uint32_t	channelLayoutTag;	
-	uint32_t	reserved1;	
-	uint32_t	reserved2;	
-} ALACChannelLayoutInfo;
-
-
-* Channel Layout Tags
-
-These constants will be used to describe the bitstream's channel layout. (defined in ALACAudioTypes.h)
-
-enum
-{
-   kALACChannelLayoutTag_Mono         	= (100<<16) | 1,    	// C
-   kALACChannelLayoutTag_Stereo       	= (101<<16) | 2,	// L R
-   kALACChannelLayoutTag_MPEG_3_0_B   	= (113<<16) | 3,	// C L R
-   kALACChannelLayoutTag_MPEG_4_0_B   	= (116<<16) | 4,	// C L R Cs
-   kALACChannelLayoutTag_MPEG_5_0_D	= (120<<16) | 5,    	// C L R Ls Rs
-   kALACChannelLayoutTag_MPEG_5_1_D   	= (124<<16) | 6,	// C L R Ls Rs LFE
-   kALACChannelLayoutTag_AAC_6_1      	= (142<<16) | 7,	// C L R Ls Rs Cs LFE
-   kALACChannelLayoutTag_MPEG_7_1_B	= (127<<16) | 8    	// C Lc Rc L R Ls Rs LFE    (doc: IS-13818-7 MPEG2-AAC)
-};
-
-
-__________________________________________________________________________________________________________________________________
-__________________________________________________________________________________________________________________________________
-* Storing Apple Lossless Magic Cookie in Audio Files
-__________________________________________________________________________________________________________________________________
-__________________________________________________________________________________________________________________________________
-
-The Apple Lossless Magic Cookie is treated as opaque by file parsing code.  The 'magic cookie' vended by the encoder 
-is placed without modification into the audio file and the read from that file and passed (unmodified) to the decoder.
-
-__________________________________________________________________________________________________________________________________
-* CAF File
-
-In a CAF file (Core Audio File), the 'magic cookie' is stored in CAF's Magic Cookie chunk ('kuki').
-
-__________________________________________________________________________________________________________________________________
-* MP4/M4A File
-
-In an MP4/M4A file, the 'magic cookie' is encapsulated in the AudioSample entry of a Sound Description box ('stsd').  
-An ISO style full box header to describe the ALACSpecificConfig portion is appended to the AudioSampleEntry, followed by the 
-'magic cookie' as it is vended by the encoder. 
-
-(All fields are stored in big-endian order: see ISO/IEC 14496-12 for a full description of the SoundDescription and AudioSampleEntry boxes, etc.)
-
----------------- SoundDescriptionBox (FullBox) ----------------------------
-
-		SampleEntrySize		 	// = sizeof(SoundDescriptionBox)(16) + sizeof (AudioSampleEntry)(AudioSampleEntry.SampleEntrySize)
-		SampleEntryType			// = 'stsd'
-		VersionFlags 			// = 0
-		EntryCount			// = 1
-
----------------- Audio Sample Entry (REQUIRED) -----------------------------
-
-		SampleEntrySize 		// sizeof(AudioSampleEntry)(36) + sizeof(full ISO box header)(12) + sizeof(Apple Lossless Magic Cookie)
-		SampleEntryType			// = 'alac', specifies that the AudioSampleEntry describes an Apple Lossless bitstream
-		mReserved[6]			// = 0
-		dref index			// = 1
-		reserved[2]			// = 0
-		channel count			// = number of channels as a uint_16 value
-		sample size			// = source pcm bitdepth (example = 16bit source pcm)
-		predefined			// = 0
-		reserved			// = 0
-		sample rate			// sample rate as a uint_32 value
-
-     Appended to AudioSampleEntry:
-
-		ALAC Specific Info Size		// uint_32 value, = 36 (12 + sizeof(ALACSpecificConfig))
-		ALAC Specific Info ID		// uint_32 value, = 'alac', format ID which matches the Audio Sample Entry SampleEntryType field
-		Version Flags			// uint_32 value, = 0		
-
-		Apple Lossless Magic Cookie	// 'magic cookie' vended from ALAC encoder (24 or 48 Bytes)
-
-__________________________________________________________________________________________________________________________________
-__________________________________________________________________________________________________________________________________
-* Compatibility
-__________________________________________________________________________________________________________________________________
-__________________________________________________________________________________________________________________________________
-
-Previous versions of the Apple Lossless encoder vended a different 'magic cookie'. To ensure compatibility, the Apple Lossless decoder 
-must be prepared to parse a 'magic cookie' in the format described below. Note that the 'magic cookie' defined above is 
-encapsulated in the following method and can be extracted as a contiguous set of bytes.
-
-
----------------- Format Atom (12 bytes) --------------------------------
-(uint_32)		Format Atom Size		// = 12
-(uint_32)		Channel Layout Info ID		// = 'frma'	
-(uint_32)		Format Type			// = 'alac'	
-	
----------------- ALAC Specific Info (36 bytes) (required) --------------
-(uint_32)		ALAC Specific Info Size		// = 36 (12 + sizeof(ALACSpecificConfig))
-(uint_32)		ALAC Specific Info ID		// = 'alac', format ID which matches the Audio Sample Entry SampleEntryType field
-(uint_32)		Version Flags			// = 0		
-
-	[ Apple Lossless Magic Cookie (see above) ]
-
----------------- Terminator Atom (8 bytes) -----------------------------
-(uint_32)		Channel Layout Info Size	// = 8	
-(uint_32)		Channel Layout Info ID		// = 0	
-
-
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/LICENSE
deleted file mode 100644
index c9500ba9e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/LICENSE
+++ /dev/null
@@ -1,53 +0,0 @@
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/ReadMe.txt b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/ReadMe.txt
deleted file mode 100644
index 375255c1d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/ReadMe.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-The Apple Lossless Format
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-Apple Lossless supports the following features. Not all of these are implemented in alacconvert, though they are in the codec code provided.
-
-1. Bit depths 16, 20, 24 and 32 bits.
-2. Any arbitrary integer sample rate from 1 to 384,000 Hz. In theory rates up to 4,294,967,295 (2^32 - 1) Hz could be supported.
-3. From one to eight channels are supported. Channel orders for the supported formats are described as:
-	Num Chan	Order
-	1 		mono
-	2 		stereo (Left, Right)
-	3 		MPEG 3.0 B (Center, Left, Right)
-	4 		MPEG 4.0 B (Center, Left, Right, Center Surround)
-	5 		MPEG 5.0 D (Center, Left, Right, Left Surround, Right Surround)
-	6 		MPEG 5.1 D (Center, Left, Right, Left Surround, Right Surround, Low Frequency Effects)
-	7 		Apple AAC 6.1 (Center, Left, Right, Left Surround, Right Surround, Center Surround, Low Frequency Effects)
-	8 		MPEG 7.1 B (Center, Left Center, Right Center, Left, Right, Left Surround, Right Surround,  Low Frequency Effects)
-4. Packet size defaults to 4096 sample frames of audio per packet. Other packet sizes are certainly possible. However, non-default packet sizes are not guaranteed to work properly on all hardware devices that support Apple Lossless. Packets above 16,384 sample frames are not supported.
-
-
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-This package contains the sources for the Apple Lossless (ALAC) encoder and decoder.
-
-The "codec" directory contains all the sources necessary for a functioning codec. Also includes is a makefile that will build libalac.a on a UNIX/Linux machine.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ALACconvert
-
-The convert-utility directory contains sources to build alacconvert which is a simple utility that demonstrates how to use the included ALAC encoder and decoder.
-
-alacconvert supports the following formats:
-
-1. 16- or 24-bit mono or stereo .wav files where the data is little endian integer. Extended WAVE format chunks are not handled.
-2. 16- or 24-bit mono or stereo .caf (Core Audio Format) files as well as certain multi-channel configurations where the data is big or little endian integer. It does no channel order manipulation.
-3. ALAC .caf files.
-
-Three project are provided to build a command line utility called alacconvert that converts cpm data to ALAC or vice versa. A Mac OS X Xcode project, A Windows Visual Studio project, and a generic UNIX/Linux make file.
-
-Note: When building on Windows, if you are using a version of Visual Studio before Visual Studio 2010, <stdint.h> is not installed. You will need to acquire this file on your own. It can be put in the same directory as the project.
-
-
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACAudioTypes.h b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACAudioTypes.h
deleted file mode 100644
index f30e3342a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACAudioTypes.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		ALACAudioTypes.h
-*/
-
-#ifndef ALACAUDIOTYPES_H
-#define ALACAUDIOTYPES_H
-
-#if PRAGMA_ONCE
-#pragma once
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if PRAGMA_STRUCT_ALIGN
-    #pragma options align=mac68k
-#elif PRAGMA_STRUCT_PACKPUSH
-    #pragma pack(push, 2)
-#elif PRAGMA_STRUCT_PACK
-    #pragma pack(2)
-#endif
-
-#include <stdint.h>
-
-#if defined(__ppc__)
-#define TARGET_RT_BIG_ENDIAN 1
-#elif defined(__ppc64__)
-#define TARGET_RT_BIG_ENDIAN 1
-#endif
-
-#define kChannelAtomSize 12
-    
-enum 
-{
-    kALAC_UnimplementedError   = -4,
-    kALAC_FileNotFoundError    = -43,
-    kALAC_ParamError           = -50,
-    kALAC_MemFullError         = -108
-};
-
-enum
-{
-    kALACFormatAppleLossless = 'alac',
-    kALACFormatLinearPCM = 'lpcm'
-};
-
-enum
-{
-    kALACMaxChannels	= 8,
-    kALACMaxEscapeHeaderBytes = 8,
-    kALACMaxSearches	= 16,
-    kALACMaxCoefs		= 16,
-    kALACDefaultFramesPerPacket = 4096
-};
-
-typedef uint32_t ALACChannelLayoutTag;
-
-enum
-{
-    kALACFormatFlagIsFloat                     = (1 << 0),     // 0x1
-    kALACFormatFlagIsBigEndian                 = (1 << 1),     // 0x2
-    kALACFormatFlagIsSignedInteger             = (1 << 2),     // 0x4
-    kALACFormatFlagIsPacked                    = (1 << 3),     // 0x8
-    kALACFormatFlagIsAlignedHigh               = (1 << 4),     // 0x10
-};
-
-enum
-{
-#if TARGET_RT_BIG_ENDIAN
-    kALACFormatFlagsNativeEndian       = kALACFormatFlagIsBigEndian
-#else
-    kALACFormatFlagsNativeEndian       = 0
-#endif
-};
-
-// this is required to be an IEEE 64bit float
-typedef double alac_float64_t;
-
-// These are the Channel Layout Tags used in the Channel Layout Info portion of the ALAC magic cookie
-enum
-{
-    kALACChannelLayoutTag_Mono          = (100<<16) | 1,    // C
-    kALACChannelLayoutTag_Stereo        = (101<<16) | 2,	// L R
-    kALACChannelLayoutTag_MPEG_3_0_B    = (113<<16) | 3,	// C L R
-    kALACChannelLayoutTag_MPEG_4_0_B    = (116<<16) | 4,	// C L R Cs
-    kALACChannelLayoutTag_MPEG_5_0_D    = (120<<16) | 5,    // C L R Ls Rs
-    kALACChannelLayoutTag_MPEG_5_1_D    = (124<<16) | 6,	// C L R Ls Rs LFE
-    kALACChannelLayoutTag_AAC_6_1       = (142<<16) | 7,	// C L R Ls Rs Cs LFE
-    kALACChannelLayoutTag_MPEG_7_1_B	= (127<<16) | 8     // C Lc Rc L R Ls Rs LFE    (doc: IS-13818-7 MPEG2-AAC)
-};
-
-// ALAC currently only utilizes these channels layouts. There is a one for one correspondance between a
-// given number of channels and one of these layout tags
-static const ALACChannelLayoutTag	ALACChannelLayoutTags[kALACMaxChannels] =
-{
-    kALACChannelLayoutTag_Mono,         // C
-    kALACChannelLayoutTag_Stereo,		// L R
-    kALACChannelLayoutTag_MPEG_3_0_B,	// C L R
-    kALACChannelLayoutTag_MPEG_4_0_B,	// C L R Cs
-    kALACChannelLayoutTag_MPEG_5_0_D,	// C L R Ls Rs
-    kALACChannelLayoutTag_MPEG_5_1_D,	// C L R Ls Rs LFE
-    kALACChannelLayoutTag_AAC_6_1,		// C L R Ls Rs Cs LFE
-    kALACChannelLayoutTag_MPEG_7_1_B	// C Lc Rc L R Ls Rs LFE    (doc: IS-13818-7 MPEG2-AAC)
-};
-
-// AudioChannelLayout from CoreAudioTypes.h. We never need the AudioChannelDescription so we remove it
-struct ALACAudioChannelLayout
-{
-    ALACChannelLayoutTag          mChannelLayoutTag;
-    uint32_t                      mChannelBitmap;
-    uint32_t                      mNumberChannelDescriptions;
-};
-typedef struct ALACAudioChannelLayout ALACAudioChannelLayout;
-
-struct AudioFormatDescription
-{
-    alac_float64_t mSampleRate;
-    uint32_t  mFormatID;
-    uint32_t  mFormatFlags;
-    uint32_t  mBytesPerPacket;
-    uint32_t  mFramesPerPacket;
-    uint32_t  mBytesPerFrame;
-    uint32_t  mChannelsPerFrame;
-    uint32_t  mBitsPerChannel;
-    uint32_t  mReserved;
-};
-typedef struct AudioFormatDescription  AudioFormatDescription;
-
-/* Lossless Definitions */
-
-enum
-{
-	kALACCodecFormat		= 'alac',
-	kALACVersion			= 0,
-	kALACCompatibleVersion	= kALACVersion,
-	kALACDefaultFrameSize	= 4096
-};
-
-// note: this struct is wrapped in an 'alac' atom in the sample description extension area
-// note: in QT movies, it will be further wrapped in a 'wave' atom surrounded by 'frma' and 'term' atoms
-typedef struct ALACSpecificConfig
-{
-	uint32_t				frameLength;
-	uint8_t					compatibleVersion;
-	uint8_t					bitDepth;							// max 32
-	uint8_t					pb;									// 0 <= pb <= 255
-	uint8_t					mb;
-	uint8_t					kb;
-	uint8_t					numChannels;
-	uint16_t				maxRun;
-	uint32_t				maxFrameBytes;
-	uint32_t				avgBitRate;
-	uint32_t				sampleRate;
-
-} ALACSpecificConfig;
-
-
-// The AudioChannelLayout atom type is not exposed yet so define it here
-enum
-{
-	AudioChannelLayoutAID = 'chan'
-};
-
-#if PRAGMA_STRUCT_ALIGN
-    #pragma options align=reset
-#elif PRAGMA_STRUCT_PACKPUSH
-    #pragma pack(pop)
-#elif PRAGMA_STRUCT_PACK
-    #pragma pack()
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* ALACAUDIOTYPES_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACBitUtilities.c b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACBitUtilities.c
deleted file mode 100644
index 941488976..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACBitUtilities.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*=============================================================================
-    File:		ALACBitUtilities.c
-
-	$NoKeywords: $
-=============================================================================*/
-
-#include <stdio.h>
-#include "ALACBitUtilities.h"
-
-// BitBufferInit
-//
-void BitBufferInit( BitBuffer * bits, uint8_t * buffer, uint32_t byteSize )
-{
-	bits->cur		= buffer;
-	bits->end		= bits->cur + byteSize;
-	bits->bitIndex	= 0;
-	bits->byteSize	= byteSize;
-}
-
-// BitBufferRead
-//
-uint32_t BitBufferRead( BitBuffer * bits, uint8_t numBits )
-{
-	uint32_t		returnBits;
-	
-	//Assert( numBits <= 16 );
-
-	returnBits = ((uint32_t)bits->cur[0] << 16) | ((uint32_t)bits->cur[1] << 8) | ((uint32_t)bits->cur[2]);
-	returnBits = returnBits << bits->bitIndex;
-	returnBits &= 0x00FFFFFF;
-	
-	bits->bitIndex += numBits;
-	
-	returnBits = returnBits >> (24 - numBits);
-	
-	bits->cur		+= (bits->bitIndex >> 3);
-	bits->bitIndex	&= 7;
-	
-	//Assert( bits->cur <= bits->end );
-	
-	return returnBits;
-}
-
-// BitBufferReadSmall
-//
-// Reads up to 8 bits
-uint8_t BitBufferReadSmall( BitBuffer * bits, uint8_t numBits )
-{
-	uint16_t		returnBits;
-	
-	//Assert( numBits <= 8 );
-	
-	returnBits = (bits->cur[0] << 8) | bits->cur[1];
-	returnBits = returnBits << bits->bitIndex;
-	
-	bits->bitIndex += numBits;
-	
-	returnBits = returnBits >> (16 - numBits);
-	
-	bits->cur		+= (bits->bitIndex >> 3);
-	bits->bitIndex	&= 7;
-	
-	//Assert( bits->cur <= bits->end );
-	
-	return (uint8_t)returnBits;
-}
-
-// BitBufferReadOne
-//
-// Reads one byte
-uint8_t BitBufferReadOne( BitBuffer * bits )
-{
-	uint8_t		returnBits;
-
-	returnBits = (bits->cur[0] >> (7 - bits->bitIndex)) & 1;
-
-	bits->bitIndex++;
-	
-	bits->cur		+= (bits->bitIndex >> 3);
-	bits->bitIndex	&= 7;
-	
-	//Assert( bits->cur <= bits->end );
-	
-	return returnBits;
-}
-
-// BitBufferPeek
-//
-uint32_t BitBufferPeek( BitBuffer * bits, uint8_t numBits )
-{
-	return ((((((uint32_t) bits->cur[0] << 16) | ((uint32_t) bits->cur[1] << 8) |
-			((uint32_t) bits->cur[2])) << bits->bitIndex) & 0x00FFFFFF) >> (24 - numBits));
-}
-
-// BitBufferPeekOne
-//
-uint32_t BitBufferPeekOne( BitBuffer * bits )
-{
-	return ((bits->cur[0] >> (7 - bits->bitIndex)) & 1);
-}
-
-// BitBufferUnpackBERSize
-//
-uint32_t BitBufferUnpackBERSize( BitBuffer * bits )
-{
-	uint32_t		size;
-	uint8_t		tmp;
-	
-	for ( size = 0, tmp = 0x80u; tmp &= 0x80u; size = (size << 7u) | (tmp & 0x7fu) )
-		tmp = (uint8_t) BitBufferReadSmall( bits, 8 );
-	
-	return size;
-}
-
-// BitBufferGetPosition
-//
-uint32_t BitBufferGetPosition( BitBuffer * bits )
-{
-	uint8_t *		begin;
-	
-	begin = bits->end - bits->byteSize;
-	
-	return ((uint32_t)(bits->cur - begin) * 8) + bits->bitIndex;
-}
-
-// BitBufferByteAlign
-//
-void BitBufferByteAlign( BitBuffer * bits, int32_t addZeros )
-{
-	// align bit buffer to next byte boundary, writing zeros if requested
-	if ( bits->bitIndex == 0 )
-		return;
-
-	if ( addZeros )
-		BitBufferWrite( bits, 0, 8 - bits->bitIndex );
-	else	
-		BitBufferAdvance( bits, 8 - bits->bitIndex );	
-}
-
-// BitBufferAdvance
-//
-void BitBufferAdvance( BitBuffer * bits, uint32_t numBits )
-{
-	if ( numBits )
-	{
-		bits->bitIndex += numBits;
-		bits->cur += (bits->bitIndex >> 3);
-		bits->bitIndex &= 7;
-	}
-}
-
-// BitBufferRewind
-//
-void BitBufferRewind( BitBuffer * bits, uint32_t numBits )
-{
-	uint32_t	numBytes;
-	
-	if ( numBits == 0 )
-		return;
-	
-	if ( bits->bitIndex >= numBits )
-	{
-		bits->bitIndex -= numBits;
-		return;
-	}
-	
-	numBits -= bits->bitIndex;
-	bits->bitIndex = 0;
-
-	numBytes	= numBits / 8;
-	numBits		= numBits % 8;
-	
-	bits->cur -= numBytes;
-	
-	if ( numBits > 0 )
-	{
-		bits->bitIndex = 8 - numBits;
-		bits->cur--;
-	}
-	
-	if ( bits->cur < (bits->end - bits->byteSize) )
-	{
-		//DebugCMsg("BitBufferRewind: Rewound too far.");
-
-		bits->cur		= (bits->end - bits->byteSize);
-		bits->bitIndex	= 0;
-	}
-}
-
-// BitBufferWrite
-//
-void BitBufferWrite( BitBuffer * bits, uint32_t bitValues, uint32_t numBits )
-{
-	uint32_t				invBitIndex;
-	
-	RequireAction( bits != nil, return; );
-	RequireActionSilent( numBits > 0, return; );
-
-	invBitIndex = 8 - bits->bitIndex;
-
-	while ( numBits > 0 )
-	{
-		uint32_t		tmp;
-		uint8_t		shift;
-		uint8_t		mask;
-		uint32_t		curNum;
-
-		curNum = MIN( invBitIndex, numBits );
-
-		tmp = bitValues >> (numBits - curNum);
-
-		shift  = (uint8_t)(invBitIndex - curNum);
-		mask   = 0xffu >> (8 - curNum);		// must be done in two steps to avoid compiler sequencing ambiguity
-		mask <<= shift;
-
-		bits->cur[0] = (bits->cur[0] & ~mask) | (((uint8_t) tmp << shift)  & mask);
-		numBits -= curNum;
-
-		// increment to next byte if need be
-		invBitIndex -= curNum;
-		if ( invBitIndex == 0 )
-		{
-			invBitIndex = 8;
-			bits->cur++;
-		}
-	}
-
-	bits->bitIndex = 8 - invBitIndex;
-}
-
-void	BitBufferReset( BitBuffer * bits )
-//void BitBufferInit( BitBuffer * bits, uint8_t * buffer, uint32_t byteSize )
-{
-	bits->cur		= bits->end - bits->byteSize;
-    bits->bitIndex	= 0;
-}
-
-#if PRAGMA_MARK
-#pragma mark -
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACBitUtilities.h b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACBitUtilities.h
deleted file mode 100644
index 97e9ebe70..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACBitUtilities.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*=============================================================================
-    File:		ALACBitUtilities.h
-	
-	$NoKeywords: $
-=============================================================================*/
-
-#ifndef __ALACBITUTILITIES_H
-#define __ALACBITUTILITIES_H
-
-#include <stdint.h>
-
-#ifndef MIN
-#define MIN(x, y) 			( (x)<(y) ?(x) :(y) )
-#endif //MIN
-#ifndef MAX
-#define MAX(x, y) 			( (x)>(y) ?(x): (y) )
-#endif //MAX
-
-#ifndef nil
-#define nil NULL
-#endif
-
-#define RequireAction(condition, action)			if (!(condition)) { action }
-#define RequireActionSilent(condition, action)			if (!(condition)) { action }
-#define RequireNoErr(condition, action)			if ((condition)) { action }
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum
-{
-    ALAC_noErr = 0
-};
-    
-
-typedef enum
-{
-    
-    ID_SCE = 0,						/* Single Channel Element   */
-    ID_CPE = 1,						/* Channel Pair Element     */
-    ID_CCE = 2,						/* Coupling Channel Element */
-    ID_LFE = 3,						/* LFE Channel Element      */
-    ID_DSE = 4,						/* not yet supported        */
-    ID_PCE = 5,
-    ID_FIL = 6,
-    ID_END = 7
-} ELEMENT_TYPE;
-
-// types
-typedef struct BitBuffer
-{
-	uint8_t *		cur;
-	uint8_t *		end;
-	uint32_t		bitIndex;
-	uint32_t		byteSize;
-	
-} BitBuffer;
-
-/*
-	BitBuffer routines
-	- these routines take a fixed size buffer and read/write to it
-	- bounds checking must be done by the client
-*/
-void	BitBufferInit( BitBuffer * bits, uint8_t * buffer, uint32_t byteSize );
-uint32_t	BitBufferRead( BitBuffer * bits, uint8_t numBits );   // note: cannot read more than 16 bits at a time
-uint8_t	BitBufferReadSmall( BitBuffer * bits, uint8_t numBits );
-uint8_t	BitBufferReadOne( BitBuffer * bits );
-uint32_t	BitBufferPeek( BitBuffer * bits, uint8_t numBits );   // note: cannot read more than 16 bits at a time
-uint32_t	BitBufferPeekOne( BitBuffer * bits );
-uint32_t	BitBufferUnpackBERSize( BitBuffer * bits );
-uint32_t	BitBufferGetPosition( BitBuffer * bits );
-void	BitBufferByteAlign( BitBuffer * bits, int32_t addZeros );
-void	BitBufferAdvance( BitBuffer * bits, uint32_t numBits );
-void	BitBufferRewind( BitBuffer * bits, uint32_t numBits );
-void	BitBufferWrite( BitBuffer * bits, uint32_t value, uint32_t numBits );
-void	BitBufferReset( BitBuffer * bits);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* __BITUTILITIES_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACDecoder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACDecoder.cpp
deleted file mode 100644
index 010d8fce3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACDecoder.cpp
+++ /dev/null
@@ -1,730 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		ALACDecoder.cpp
-*/
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "ALACDecoder.h"
-
-#include "dplib.h"
-#include "aglib.h"
-#include "matrixlib.h"
-
-#include "ALACBitUtilities.h"
-#include "EndianPortable.h"
-
-// constants/data
-//const uint32_t kMaxBitDepth = 32;			// max allowed bit depth is 32
-
-
-// prototypes
-static void Zero16( int16_t * buffer, uint32_t numItems, uint32_t stride );
-static void Zero24( uint8_t * buffer, uint32_t numItems, uint32_t stride );
-static void Zero32( int32_t * buffer, uint32_t numItems, uint32_t stride );
-
-/*
-	Constructor
-*/
-ALACDecoder::ALACDecoder() :
-	mMixBufferU( nil ),
-	mMixBufferV( nil ),
-	mPredictor( nil ),
-	mShiftBuffer( nil )
-{
-	memset( &mConfig, 0, sizeof(mConfig) );
-}
-
-/*
-	Destructor
-*/
-ALACDecoder::~ALACDecoder()
-{
-	// delete the matrix mixing buffers
-	if ( mMixBufferU )
-    {
-		free(mMixBufferU);
-        mMixBufferU = NULL;
-    }
-	if ( mMixBufferV )
-    {
-		free(mMixBufferV);
-        mMixBufferV = NULL;
-    }
-	
-	// delete the dynamic predictor's "corrector" buffer
-	// - note: mShiftBuffer shares memory with this buffer
-	if ( mPredictor )
-    {
-		free(mPredictor);
-        mPredictor = NULL;
-    }
-}
-
-/*
-	Init()
-	- initialize the decoder with the given configuration
-*/
-int32_t ALACDecoder::Init( void * inMagicCookie, uint32_t inMagicCookieSize )
-{
-	int32_t		status = ALAC_noErr;
-    ALACSpecificConfig theConfig;
-    uint8_t * theActualCookie = (uint8_t *)inMagicCookie;
-    uint32_t theCookieBytesRemaining = inMagicCookieSize;
-
-    // For historical reasons the decoder needs to be resilient to magic cookies vended by older encoders.
-    // As specified in the ALACMagicCookieDescription.txt document, there may be additional data encapsulating 
-    // the ALACSpecificConfig. This would consist of format ('frma') and 'alac' atoms which precede the
-    // ALACSpecificConfig. 
-    // See ALACMagicCookieDescription.txt for additional documentation concerning the 'magic cookie'
-    
-    // skip format ('frma') atom if present
-    if (theActualCookie[4] == 'f' && theActualCookie[5] == 'r' && theActualCookie[6] == 'm' && theActualCookie[7] == 'a')
-    {
-        theActualCookie += 12;
-        theCookieBytesRemaining -= 12;
-    }
-    
-    // skip 'alac' atom header if present
-    if (theActualCookie[4] == 'a' && theActualCookie[5] == 'l' && theActualCookie[6] == 'a' && theActualCookie[7] == 'c')
-    {
-        theActualCookie += 12;
-        theCookieBytesRemaining -= 12;
-    }
-
-    // read the ALACSpecificConfig
-    if (theCookieBytesRemaining >= sizeof(ALACSpecificConfig))
-    {
-        theConfig.frameLength = Swap32BtoN(((ALACSpecificConfig *)theActualCookie)->frameLength);
-        theConfig.compatibleVersion = ((ALACSpecificConfig *)theActualCookie)->compatibleVersion;
-        theConfig.bitDepth = ((ALACSpecificConfig *)theActualCookie)->bitDepth;
-        theConfig.pb = ((ALACSpecificConfig *)theActualCookie)->pb;
-        theConfig.mb = ((ALACSpecificConfig *)theActualCookie)->mb;
-        theConfig.kb = ((ALACSpecificConfig *)theActualCookie)->kb;
-        theConfig.numChannels = ((ALACSpecificConfig *)theActualCookie)->numChannels;
-        theConfig.maxRun = Swap16BtoN(((ALACSpecificConfig *)theActualCookie)->maxRun);
-        theConfig.maxFrameBytes = Swap32BtoN(((ALACSpecificConfig *)theActualCookie)->maxFrameBytes);
-        theConfig.avgBitRate = Swap32BtoN(((ALACSpecificConfig *)theActualCookie)->avgBitRate);
-        theConfig.sampleRate = Swap32BtoN(((ALACSpecificConfig *)theActualCookie)->sampleRate);
-
-        mConfig = theConfig;
-        
-        RequireAction( mConfig.compatibleVersion <= kALACVersion, return kALAC_ParamError; );
-
-        // allocate mix buffers
-        mMixBufferU = (int32_t *) calloc( mConfig.frameLength * sizeof(int32_t), 1 );
-        mMixBufferV = (int32_t *) calloc( mConfig.frameLength * sizeof(int32_t), 1 );
-
-        // allocate dynamic predictor buffer
-        mPredictor = (int32_t *) calloc( mConfig.frameLength * sizeof(int32_t), 1 );
-
-        // "shift off" buffer shares memory with predictor buffer
-        mShiftBuffer = (uint16_t *) mPredictor;
-        
-        RequireAction( (mMixBufferU != nil) && (mMixBufferV != nil) && (mPredictor != nil),
-                        status = kALAC_MemFullError; goto Exit; );
-     }
-    else
-    {
-        status = kALAC_ParamError;
-    }
-
-    // skip to Channel Layout Info
-    // theActualCookie += sizeof(ALACSpecificConfig);
-    
-    // Currently, the Channel Layout Info portion of the magic cookie (as defined in the 
-    // ALACMagicCookieDescription.txt document) is unused by the decoder. 
-    
-Exit:
-	return status;
-}
-
-/*
-	Decode()
-	- the decoded samples are interleaved into the output buffer in the order they arrive in
-	  the bitstream
-*/
-int32_t ALACDecoder::Decode( BitBuffer * bits, uint8_t * sampleBuffer, uint32_t numSamples, uint32_t numChannels, uint32_t * outNumSamples )
-{
-	BitBuffer			shiftBits;
-	uint32_t            bits1, bits2;
-	uint8_t				tag;
-	uint8_t				elementInstanceTag;
-	AGParamRec			agParams;
-	uint32_t				channelIndex;
-	int16_t				coefsU[32];		// max possible size is 32 although NUMCOEPAIRS is the current limit
-	int16_t				coefsV[32];
-	uint8_t				numU, numV;
-	uint8_t				mixBits;
-	int8_t				mixRes;
-	uint16_t			unusedHeader;
-	uint8_t				escapeFlag;
-	uint32_t			chanBits;
-	uint8_t				bytesShifted;
-	uint32_t			shift;
-	uint8_t				modeU, modeV;
-	uint32_t			denShiftU, denShiftV;
-	uint16_t			pbFactorU, pbFactorV;
-	uint16_t			pb;
-	//int16_t *			samples;
-	int16_t *			out16;
-	uint8_t *			out20;
-	uint8_t *			out24;
-	int32_t *			out32;
-	uint8_t				headerByte;
-	uint8_t				partialFrame;
-	uint32_t			extraBits;
-	int32_t				val;
-	uint32_t			i, j;
-	int32_t             status;
-	
-	RequireAction( (bits != nil) && (sampleBuffer != nil) && (outNumSamples != nil), return kALAC_ParamError; );
-	RequireAction( numChannels > 0, return kALAC_ParamError; );
-
-	mActiveElements = 0;
-	channelIndex	= 0;
-	
-	//samples = (int16_t *) sampleBuffer;
-
-	status = ALAC_noErr;
-	*outNumSamples = numSamples;
-
-	while ( status == ALAC_noErr )
-	{
-		// bail if we ran off the end of the buffer
-    	RequireAction( bits->cur < bits->end, status = kALAC_ParamError; goto Exit; );
-
-		// copy global decode params for this element
-		pb = mConfig.pb;
-
-		// read element tag
-		tag = BitBufferReadSmall( bits, 3 );
-		switch ( tag )
-		{
-			case ID_SCE:
-			case ID_LFE:
-			{
-				// mono/LFE channel
-				elementInstanceTag = BitBufferReadSmall( bits, 4 );
-				mActiveElements |= (1u << elementInstanceTag);
-
-				// read the 12 unused header bits
-				unusedHeader = (uint16_t) BitBufferRead( bits, 12 );
-				RequireAction( unusedHeader == 0, status = kALAC_ParamError; goto Exit; );
-
-				// read the 1-bit "partial frame" flag, 2-bit "shift-off" flag & 1-bit "escape" flag
-				headerByte = (uint8_t) BitBufferRead( bits, 4 );
-				
-				partialFrame = headerByte >> 3;
-				
-				bytesShifted = (headerByte >> 1) & 0x3u;
-				RequireAction( bytesShifted != 3, status = kALAC_ParamError; goto Exit; );
-
-				shift = bytesShifted * 8;
-
-				escapeFlag = headerByte & 0x1;
-
-				chanBits = mConfig.bitDepth - (bytesShifted * 8);
-				
-				// check for partial frame to override requested numSamples
-				if ( partialFrame != 0 )
-				{
-					numSamples  = BitBufferRead( bits, 16 ) << 16;
-					numSamples |= BitBufferRead( bits, 16 );
-				}
-
-				if ( escapeFlag == 0 )
-				{
-					// compressed frame, read rest of parameters
-					mixBits	= (uint8_t) BitBufferRead( bits, 8 );
-					mixRes	= (int8_t) BitBufferRead( bits, 8 );
-					//Assert( (mixBits == 0) && (mixRes == 0) );		// no mixing for mono
-
-					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
-					modeU		= headerByte >> 4;
-					denShiftU	= headerByte & 0xfu;
-					
-					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
-					pbFactorU	= headerByte >> 5;
-					numU		= headerByte & 0x1fu;
-
-					for ( i = 0; i < numU; i++ )
-						coefsU[i] = (int16_t) BitBufferRead( bits, 16 );
-					
-					// if shift active, skip the the shift buffer but remember where it starts
-					if ( bytesShifted != 0 )
-					{
-						shiftBits = *bits;
-						BitBufferAdvance( bits, (bytesShifted * 8) * numSamples ); 
-					}
-
-					// decompress
-					set_ag_params( &agParams, mConfig.mb, (pb * pbFactorU) / 4, mConfig.kb, numSamples, numSamples, mConfig.maxRun );
-					status = dyn_decomp( &agParams, bits, mPredictor, numSamples, chanBits, &bits1 );
-					RequireNoErr( status, goto Exit; );
-
-					if ( modeU == 0 )
-					{
-						unpc_block( mPredictor, mMixBufferU, numSamples, &coefsU[0], numU, chanBits, denShiftU );
-					}
-					else
-					{
-						// the special "numActive == 31" mode can be done in-place
-						unpc_block( mPredictor, mPredictor, numSamples, nil, 31, chanBits, 0 );
-						unpc_block( mPredictor, mMixBufferU, numSamples, &coefsU[0], numU, chanBits, denShiftU );
-					}
-				}
-				else
-				{
-					//Assert( bytesShifted == 0 );
-
-					// uncompressed frame, copy data into the mix buffer to use common output code
-					shift = 32 - chanBits;
-					if ( chanBits <= 16 )
-					{
-						for ( i = 0; i < numSamples; i++ )
-						{
-							val = (int32_t) BitBufferRead( bits, (uint8_t) chanBits );
-							val = (val << shift) >> shift;
-							mMixBufferU[i] = val;
-						}
-					}
-					else
-					{
-						// BitBufferRead() can't read more than 16 bits at a time so break up the reads
-						extraBits = chanBits - 16;
-						for ( i = 0; i < numSamples; i++ )
-						{
-							val = (int32_t) BitBufferRead( bits, 16 );
-							val = (val << 16) >> shift;
-							mMixBufferU[i] = val | BitBufferRead( bits, (uint8_t) extraBits );
-						}
-					}
-
-					mixBits = mixRes = 0;
-					bits1 = chanBits * numSamples;
-					bytesShifted = 0;
-				}
-
-				// now read the shifted values into the shift buffer
-				if ( bytesShifted != 0 )
-				{
-					shift = bytesShifted * 8;
-					//Assert( shift <= 16 );
-
-					for ( i = 0; i < numSamples; i++ )
-						mShiftBuffer[i] = (uint16_t) BitBufferRead( &shiftBits, (uint8_t) shift );
-				}
-
-				// convert 32-bit integers into output buffer
-				switch ( mConfig.bitDepth )
-				{
-					case 16:
-						out16 = &((int16_t *)sampleBuffer)[channelIndex];
-						for ( i = 0, j = 0; i < numSamples; i++, j += numChannels )
-							out16[j] = (int16_t) mMixBufferU[i];
-						break;
-					case 20:
-						out20 = (uint8_t *)sampleBuffer + (channelIndex * 3);
-						copyPredictorTo20( mMixBufferU, out20, numChannels, numSamples );
-						break;
-					case 24:
-						out24 = (uint8_t *)sampleBuffer + (channelIndex * 3);
-						if ( bytesShifted != 0 )
-							copyPredictorTo24Shift( mMixBufferU, mShiftBuffer, out24, numChannels, numSamples, bytesShifted );
-						else
-							copyPredictorTo24( mMixBufferU, out24, numChannels, numSamples );							
-						break;
-					case 32:
-						out32 = &((int32_t *)sampleBuffer)[channelIndex];
-						if ( bytesShifted != 0 )
-							copyPredictorTo32Shift( mMixBufferU, mShiftBuffer, out32, numChannels, numSamples, bytesShifted );
-						else
-							copyPredictorTo32( mMixBufferU, out32, numChannels, numSamples);
-						break;
-				}
-
-				channelIndex += 1;
-				*outNumSamples = numSamples;
-				break;
-			}
-
-			case ID_CPE:
-			{
-				// if decoding this pair would take us over the max channels limit, bail
-				if ( (channelIndex + 2) > numChannels )
-					goto NoMoreChannels;
-
-				// stereo channel pair
-				elementInstanceTag = BitBufferReadSmall( bits, 4 );
-				mActiveElements |= (1u << elementInstanceTag);
-
-				// read the 12 unused header bits
-				unusedHeader = (uint16_t) BitBufferRead( bits, 12 );
-				RequireAction( unusedHeader == 0, status = kALAC_ParamError; goto Exit; );
-
-				// read the 1-bit "partial frame" flag, 2-bit "shift-off" flag & 1-bit "escape" flag
-				headerByte = (uint8_t) BitBufferRead( bits, 4 );
-				
-				partialFrame = headerByte >> 3;
-				
-				bytesShifted = (headerByte >> 1) & 0x3u;
-				RequireAction( bytesShifted != 3, status = kALAC_ParamError; goto Exit; );
-
-				shift = bytesShifted * 8;
-
-				escapeFlag = headerByte & 0x1;
-
-				chanBits = mConfig.bitDepth - (bytesShifted * 8) + 1;
-				
-				// check for partial frame length to override requested numSamples
-				if ( partialFrame != 0 )
-				{
-					numSamples  = BitBufferRead( bits, 16 ) << 16;
-					numSamples |= BitBufferRead( bits, 16 );
-				}
-
-				if ( escapeFlag == 0 )
-				{
-					// compressed frame, read rest of parameters
-					mixBits		= (uint8_t) BitBufferRead( bits, 8 );
-					mixRes		= (int8_t) BitBufferRead( bits, 8 );
-
-					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
-					modeU		= headerByte >> 4;
-					denShiftU	= headerByte & 0xfu;
-					
-					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
-					pbFactorU	= headerByte >> 5;
-					numU		= headerByte & 0x1fu;
-					for ( i = 0; i < numU; i++ )
-						coefsU[i] = (int16_t) BitBufferRead( bits, 16 );
-
-					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
-					modeV		= headerByte >> 4;
-					denShiftV	= headerByte & 0xfu;
-					
-					headerByte	= (uint8_t) BitBufferRead( bits, 8 );
-					pbFactorV	= headerByte >> 5;
-					numV		= headerByte & 0x1fu;
-					for ( i = 0; i < numV; i++ )
-						coefsV[i] = (int16_t) BitBufferRead( bits, 16 );
-
-					// if shift active, skip the interleaved shifted values but remember where they start
-					if ( bytesShifted != 0 )
-					{
-						shiftBits = *bits;
-						BitBufferAdvance( bits, (bytesShifted * 8) * 2 * numSamples );
-					}
-
-					// decompress and run predictor for "left" channel
-					set_ag_params( &agParams, mConfig.mb, (pb * pbFactorU) / 4, mConfig.kb, numSamples, numSamples, mConfig.maxRun );
-					status = dyn_decomp( &agParams, bits, mPredictor, numSamples, chanBits, &bits1 );
-					RequireNoErr( status, goto Exit; );
-
-					if ( modeU == 0 )
-					{
-						unpc_block( mPredictor, mMixBufferU, numSamples, &coefsU[0], numU, chanBits, denShiftU );
-					}
-					else
-					{
-						// the special "numActive == 31" mode can be done in-place
-						unpc_block( mPredictor, mPredictor, numSamples, nil, 31, chanBits, 0 );
-						unpc_block( mPredictor, mMixBufferU, numSamples, &coefsU[0], numU, chanBits, denShiftU );
-					}
-
-					// decompress and run predictor for "right" channel
-					set_ag_params( &agParams, mConfig.mb, (pb * pbFactorV) / 4, mConfig.kb, numSamples, numSamples, mConfig.maxRun );
-					status = dyn_decomp( &agParams, bits, mPredictor, numSamples, chanBits, &bits2 );
-					RequireNoErr( status, goto Exit; );
-
-					if ( modeV == 0 )
-					{
-						unpc_block( mPredictor, mMixBufferV, numSamples, &coefsV[0], numV, chanBits, denShiftV );
-					}
-					else
-					{
-						// the special "numActive == 31" mode can be done in-place
-						unpc_block( mPredictor, mPredictor, numSamples, nil, 31, chanBits, 0 );
-						unpc_block( mPredictor, mMixBufferV, numSamples, &coefsV[0], numV, chanBits, denShiftV );
-					}
-				}
-				else
-				{
-					//Assert( bytesShifted == 0 );
-
-					// uncompressed frame, copy data into the mix buffers to use common output code
-					chanBits = mConfig.bitDepth;
-					shift = 32 - chanBits;
-					if ( chanBits <= 16 )
-					{
-						for ( i = 0; i < numSamples; i++ )
-						{
-							val = (int32_t) BitBufferRead( bits, (uint8_t) chanBits );
-							val = (val << shift) >> shift;
-							mMixBufferU[i] = val;
-
-							val = (int32_t) BitBufferRead( bits, (uint8_t) chanBits );
-							val = (val << shift) >> shift;
-							mMixBufferV[i] = val;
-						}
-					}
-					else
-					{
-						// BitBufferRead() can't read more than 16 bits at a time so break up the reads
-						extraBits = chanBits - 16;
-						for ( i = 0; i < numSamples; i++ )
-						{
-							val = (int32_t) BitBufferRead( bits, 16 );
-							val = (val << 16) >> shift;
-							mMixBufferU[i] = val | BitBufferRead( bits, (uint8_t)extraBits );
-
-							val = (int32_t) BitBufferRead( bits, 16 );
-							val = (val << 16) >> shift;
-							mMixBufferV[i] = val | BitBufferRead( bits, (uint8_t)extraBits );
-						}
-					}
-
-					bits1 = chanBits * numSamples;
-					bits2 = chanBits * numSamples;
-					mixBits = mixRes = 0;
-					bytesShifted = 0;
-				}
-
-				// now read the shifted values into the shift buffer
-				if ( bytesShifted != 0 )
-				{
-					shift = bytesShifted * 8;
-					//Assert( shift <= 16 );
-
-					for ( i = 0; i < (numSamples * 2); i += 2 )
-					{
-						mShiftBuffer[i + 0] = (uint16_t) BitBufferRead( &shiftBits, (uint8_t) shift );
-						mShiftBuffer[i + 1] = (uint16_t) BitBufferRead( &shiftBits, (uint8_t) shift );
-					}
-				}
-
-				// un-mix the data and convert to output format
-				// - note that mixRes = 0 means just interleave so we use that path for uncompressed frames
-				switch ( mConfig.bitDepth )
-				{
-					case 16:
-						out16 = &((int16_t *)sampleBuffer)[channelIndex];
-						unmix16( mMixBufferU, mMixBufferV, out16, numChannels, numSamples, mixBits, mixRes );
-						break;
-					case 20:
-						out20 = (uint8_t *)sampleBuffer + (channelIndex * 3);
-						unmix20( mMixBufferU, mMixBufferV, out20, numChannels, numSamples, mixBits, mixRes );
-						break;
-					case 24:
-						out24 = (uint8_t *)sampleBuffer + (channelIndex * 3);
-						unmix24( mMixBufferU, mMixBufferV, out24, numChannels, numSamples,
-									mixBits, mixRes, mShiftBuffer, bytesShifted );
-						break;
-					case 32:
-						out32 = &((int32_t *)sampleBuffer)[channelIndex];
-						unmix32( mMixBufferU, mMixBufferV, out32, numChannels, numSamples,
-									mixBits, mixRes, mShiftBuffer, bytesShifted );
-						break;
-				}
-
-				channelIndex += 2;
-				*outNumSamples = numSamples;
-				break;
-			}
-
-			case ID_CCE:
-			case ID_PCE:
-			{
-				// unsupported element, bail
-				//AssertNoErr( tag );
-				status = kALAC_ParamError;
-				break;
-			}
-
-			case ID_DSE:
-			{
-				// data stream element -- parse but ignore
-				status = this->DataStreamElement( bits );
-				break;
-			}
-			
-			case ID_FIL:
-			{
-				// fill element -- parse but ignore
-				status = this->FillElement( bits );
-				break;
-			}
-
-			case ID_END:
-			{
-				// frame end, all done so byte align the frame and check for overruns
-				BitBufferByteAlign( bits, false );
-				//Assert( bits->cur == bits->end );
-				goto Exit;
-			}
-		}
-
-#if ! DEBUG
-		// if we've decoded all of our channels, bail (but not in debug b/c we want to know if we're seeing bad bits)
-		// - this also protects us if the config does not match the bitstream or crap data bits follow the audio bits
-		if ( channelIndex >= numChannels )
-			break;
-#endif
-	}
-
-NoMoreChannels:
-
-	// if we get here and haven't decoded all of the requested channels, fill the remaining channels with zeros
-	for ( ; channelIndex < numChannels; channelIndex++ )
-	{
-		switch ( mConfig.bitDepth )
-		{
-			case 16:
-			{
-				int16_t *	fill16 = &((int16_t *)sampleBuffer)[channelIndex];
-				Zero16( fill16, numSamples, numChannels );
-				break;
-			}
-			case 24:
-			{
-				uint8_t *	fill24 = (uint8_t *)sampleBuffer + (channelIndex * 3);
-				Zero24( fill24, numSamples, numChannels );
-				break;
-			}
-			case 32:
-			{
-				int32_t *	fill32 = &((int32_t *)sampleBuffer)[channelIndex];
-				Zero32( fill32, numSamples, numChannels );
-				break;
-			}
-		}
-	}
-
-Exit:
-	return status;
-}
-
-#if PRAGMA_MARK
-#pragma mark -
-#endif
-
-/*
-	FillElement()
-	- they're just filler so we don't need 'em
-*/
-int32_t ALACDecoder::FillElement( BitBuffer * bits )
-{
-	int16_t		count;
-	
-	// 4-bit count or (4-bit + 8-bit count) if 4-bit count == 15
-	// - plus this weird -1 thing I still don't fully understand
-	count = BitBufferReadSmall( bits, 4 );
-	if ( count == 15 )
-		count += (int16_t) BitBufferReadSmall( bits, 8 ) - 1;
-
-	BitBufferAdvance( bits, count * 8 );
-
-	RequireAction( bits->cur <= bits->end, return kALAC_ParamError; );
-
-	return ALAC_noErr;	
-}
-
-/*
-	DataStreamElement()
-	- we don't care about data stream elements so just skip them
-*/
-int32_t ALACDecoder::DataStreamElement( BitBuffer * bits )
-{
-	//uint8_t		element_instance_tag;
-	int32_t		data_byte_align_flag;
-	uint16_t		count;
-	
-	// the tag associates this data stream element with a given audio element
-	//element_instance_tag = BitBufferReadSmall( bits, 4 );
-	
-	data_byte_align_flag = BitBufferReadOne( bits );
-
-	// 8-bit count or (8-bit + 8-bit count) if 8-bit count == 255
-	count = BitBufferReadSmall( bits, 8 );
-	if ( count == 255 )
-		count += BitBufferReadSmall( bits, 8 );
-
-	// the align flag means the bitstream should be byte-aligned before reading the following data bytes
-	if ( data_byte_align_flag )
-		BitBufferByteAlign( bits, false );
-
-	// skip the data bytes
-	BitBufferAdvance( bits, count * 8 );
-
-	RequireAction( bits->cur <= bits->end, return kALAC_ParamError; );
-
-	return ALAC_noErr;
-}
-
-/*
-	ZeroN()
-	- helper routines to clear out output channel buffers when decoding fewer channels than requested
-*/
-static void Zero16( int16_t * buffer, uint32_t numItems, uint32_t stride )
-{
-	if ( stride == 1 )
-	{
-		memset( buffer, 0, numItems * sizeof(int16_t) );
-	}
-	else
-	{
-		for ( uint32_t index = 0; index < (numItems * stride); index += stride )
-			buffer[index] = 0;
-	}
-}
-
-static void Zero24( uint8_t * buffer, uint32_t numItems, uint32_t stride )
-{
-	if ( stride == 1 )
-	{
-		memset( buffer, 0, numItems * 3 );
-	}
-	else
-	{
-		for ( uint32_t index = 0; index < (numItems * stride * 3); index += (stride * 3) )
-		{
-			buffer[index + 0] = 0;
-			buffer[index + 1] = 0;
-			buffer[index + 2] = 0;
-		}
-	}
-}
-
-static void Zero32( int32_t * buffer, uint32_t numItems, uint32_t stride )
-{
-	if ( stride == 1 )
-	{
-		memset( buffer, 0, numItems * sizeof(int32_t) );
-	}
-	else
-	{
-		for ( uint32_t index = 0; index < (numItems * stride); index += stride )
-			buffer[index] = 0;
-	}
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACDecoder.h b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACDecoder.h
deleted file mode 100644
index 7802eab03..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACDecoder.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		ALACDecoder.h
-*/
-
-#ifndef _ALACDECODER_H
-#define _ALACDECODER_H
-
-#if PRAGMA_ONCE
-#pragma once
-#endif
-
-#include <stdint.h>
-
-#include "ALACAudioTypes.h"
-
-struct BitBuffer;
-
-class ALACDecoder
-{
-	public:
-		ALACDecoder();
-		~ALACDecoder();
-
-		int32_t	Init( void * inMagicCookie, uint32_t inMagicCookieSize );
-		int32_t	Decode( struct BitBuffer * bits, uint8_t * sampleBuffer, uint32_t numSamples, uint32_t numChannels, uint32_t * outNumSamples );
-
-	public:
-		// decoding parameters (public for use in the analyzer)
-		ALACSpecificConfig		mConfig;
-
-	protected:
-		int32_t	FillElement( struct BitBuffer * bits );
-		int32_t	DataStreamElement( struct BitBuffer * bits );
-
-		uint16_t					mActiveElements;
-
-		// decoding buffers
-		int32_t *				mMixBufferU;
-		int32_t *				mMixBufferV;
-		int32_t *				mPredictor;
-		uint16_t *				mShiftBuffer;	// note: this points to mPredictor's memory but different
-												//		 variable for clarity and type difference
-};
-
-#endif	/* _ALACDECODER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACEncoder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACEncoder.cpp
deleted file mode 100644
index 3de06ad7c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACEncoder.cpp
+++ /dev/null
@@ -1,1425 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		ALACEncoder.cpp
-*/
-
-// build stuff
-#define VERBOSE_DEBUG		0
-
-// headers
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "ALACEncoder.h"
-
-#include "aglib.h"
-#include "dplib.h"
-#include "matrixlib.h"
-
-#include "ALACBitUtilities.h"
-#include "ALACAudioTypes.h"
-#include "EndianPortable.h"
-
-// Note: in C you can't typecast to a 2-dimensional array pointer but that's what we need when
-// picking which coefs to use so we declare this typedef b/c we *can* typecast to this type
-typedef int16_t (*SearchCoefs)[kALACMaxCoefs];
-
-// defines/constants
-//const uint32_t kALACEncoderMagic	= 'dpge';
-const uint32_t kMaxSampleSize		= 32;			// max allowed bit width is 32
-const uint32_t kDefaultMixBits	= 2;
-const uint32_t kDefaultMixRes		= 0;
-const uint32_t kMaxRes			= 4;
-const uint32_t kDefaultNumUV		= 8;
-const uint32_t kMinUV				= 4;
-const uint32_t kMaxUV				= 8;
-
-// static functions
-#if VERBOSE_DEBUG
-static void AddFiller( BitBuffer * bits, int32_t numBytes );
-#endif
-
-
-/*
-	Map Format: 3-bit field per channel which is the same as the "element tag" that should be placed
-				at the beginning of the frame for that channel.  Indicates whether SCE, CPE, or LFE.
-				Each particular field is accessed via the current channel index.  Note that the channel
-				index increments by two for channel pairs.
-				
-	For example:
-	
-			C L R 3-channel input		= (ID_CPE << 3) | (ID_SCE)
-				index 0 value = (map & (0x7ul << (0 * 3))) >> (0 * 3)
-				index 1 value = (map & (0x7ul << (1 * 3))) >> (1 * 3)
-
-			C L R Ls Rs LFE 5.1-channel input = (ID_LFE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE)
-				index 0 value = (map & (0x7ul << (0 * 3))) >> (0 * 3)
-				index 1 value = (map & (0x7ul << (1 * 3))) >> (1 * 3)
-				index 3 value = (map & (0x7ul << (3 * 3))) >> (3 * 3)
-				index 5 value = (map & (0x7ul << (5 * 3))) >> (5 * 3)
-				index 7 value = (map & (0x7ul << (7 * 3))) >> (7 * 3)
-*/
-static const uint32_t	sChannelMaps[kALACMaxChannels] =
-{
-	ID_SCE,
-	ID_CPE,
-	(ID_CPE << 3) | (ID_SCE),
-	(ID_SCE << 9) | (ID_CPE << 3) | (ID_SCE),
-	(ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE),
-	(ID_SCE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE),
-	(ID_SCE << 18) | (ID_SCE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE),
-	(ID_SCE << 21) | (ID_CPE << 15) | (ID_CPE << 9) | (ID_CPE << 3) | (ID_SCE)
-};
-
-//static const uint32_t sSupportediPodSampleRates[] =
-//{
-//	8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
-//};
-
-/*
-	Constructor
-*/
-ALACEncoder::ALACEncoder() :
-	mBitDepth( 0 ),
-    mFastMode( 0 ),
-	mMixBufferU( nil ),
-	mMixBufferV( nil ),
-	mPredictorU( nil ),
-	mPredictorV( nil ),
-	mShiftBufferUV( nil ),
-	mWorkBuffer( nil ),
-
-
-	mTotalBytesGenerated( 0 ),
-	mAvgBitRate( 0 ),
-	mMaxFrameBytes( 0 )
-{
-	// overrides
-	mFrameSize = kALACDefaultFrameSize;
-}
-
-/*
-	Destructor
-*/
-ALACEncoder::~ALACEncoder()
-{
-	// delete the matrix mixing buffers
-	if ( mMixBufferU )
-    {
-		free(mMixBufferU);
-        mMixBufferU = NULL;
-    }
-	if ( mMixBufferV )
-    {
-		free(mMixBufferV);
-        mMixBufferV = NULL;
-    }
-	
-	// delete the dynamic predictor's "corrector" buffers
-	if ( mPredictorU )
-    {
-		free(mPredictorU);
-        mPredictorU = NULL;
-    }
-	if ( mPredictorV )
-    {
-		free(mPredictorV);
-        mPredictorV = NULL;
-    }
-
-	// delete the unused byte shift buffer
-	if ( mShiftBufferUV )
-    {
-		free(mShiftBufferUV);
-        mShiftBufferUV = NULL;
-    }
-
-	// delete the work buffer
-	if ( mWorkBuffer )
-    {
-		free(mWorkBuffer);
-        mWorkBuffer = NULL;
-    }	
-}
-
-#if PRAGMA_MARK
-#pragma mark -
-#endif
-
-/*
-	HEADER SPECIFICATION  
-
-        For every segment we adopt the following header:
-        
-			1 byte reserved			(always 0)
-			1 byte flags			(see below)
-			[4 byte frame length]	(optional, see below)
-			     ---Next, the per-segment ALAC parameters---
-			1 byte mixBits			(middle-side parameter)
-			1 byte mixRes			(middle-side parameter, interpreted as signed char)
-
-			1 byte shiftU			(4 bits modeU, 4 bits denShiftU)
-			1 byte filterU			(3 bits pbFactorU, 5 bits numU)
-			(numU) shorts			(signed DP coefficients for V channel)
-			     ---Next, 2nd-channel ALAC parameters in case of stereo mode---
-			1 byte shiftV			(4 bits modeV, 4 bits denShiftV)
-			1 byte filterV			(3 bits pbFactorV, 5 bits numV)
-			(numV) shorts			(signed DP coefficients for V channel)
-			     ---After this come the shift-off bytes for (>= 24)-bit data (n-byte shift) if indicated---
-			     ---Then comes the AG-compressor bitstream---
-
-
-        FLAGS
-        -----
-
-		The presence of certain flag bits changes the header format such that the parameters might
-		not even be sent.  The currently defined flags format is:
-
-			0000psse
-			
-			where		0 	= reserved, must be 0
-						p	= 1-bit field "partial frame" flag indicating 32-bit frame length follows this byte
-						ss	= 2-bit field indicating "number of shift-off bytes ignored by compression"
-						e	= 1-bit field indicating "escape"
-
-		The "partial frame" flag means that the following segment is not equal to the frame length specified
-		in the out-of-band decoder configuration.  This allows the decoder to deal with end-of-file partial
-		segments without incurring the 32-bit overhead for each segment.
-
-		The "shift-off" field indicates the number of bytes at the bottom of the word that were passed through
-		uncompressed.  The reason for this is that the entropy inherent in the LS bytes of >= 24-bit words
-		quite often means that the frame would have to be "escaped" b/c the compressed size would be >= the
-		uncompressed size.  However, by shifting the input values down and running the remaining bits through
-		the normal compression algorithm, a net win can be achieved.  If this field is non-zero, it means that
-		the shifted-off bytes follow after the parameter section of the header and before the compressed
-		bitstream.  Note that doing this also allows us to use matrixing on 32-bit inputs after one or more
-		bytes are shifted off the bottom which helps the eventual compression ratio.  For stereo channels,
-		the shifted off bytes are interleaved.
-
-        The "escape" flag means that this segment was not compressed b/c the compressed size would be
-        >= uncompressed size.  In that case, the audio data was passed through uncompressed after the header.
-        The other header parameter bytes will not be sent.
-        
-
-		PARAMETERS
-		----------
-
-		If the segment is not a partial or escape segment, the total header size (in bytes) is given exactly by:
-
-			4 + (2 + 2 * numU)                   (mono mode)
-			4 + (2 + 2 * numV) + (2 + 2 * numV)  (stereo mode)
-
-        where the ALAC filter-lengths numU, numV are bounded by a
-        constant (in the current source, numU, numV <= NUMCOEPAIRS), and
-        this forces an absolute upper bound on header size.
-
-        Each segment-decode process loads up these bytes from the front of the
-        local stream, in the above order, then follows with the entropy-encoded
-        bits for the given segment.
-
-        To generalize middle-side, there are various mixing modes including middle-side, each lossless,
-        as embodied in the mix() and unmix() functions.  These functions exploit a generalized middle-side
-        transformation:
-
-        u := [(rL + (m-r)R)/m];
-        v := L - R;
-
-        where [ ] denotes integer floor.  The (lossless) inverse is
-
-        L = u + v - [rV/m];
-        R = L - v;
-
-        In the segment header, m and r are encoded in mixBits and mixRes.
-        Classical "middle-side" is obtained with m = 2, r = 1, but now
-        we have more generalized mixes.
-
-        NOTES
-        -----
-        The relevance of the ALAC coefficients is explained in detail
-        in patent documents.
-*/
-
-/*
-	EncodeStereo()
-	- encode a channel pair
-*/
-int32_t ALACEncoder::EncodeStereo( BitBuffer * bitstream, void * inputBuffer, uint32_t stride, uint32_t channelIndex, uint32_t numSamples )
-{
-	BitBuffer		workBits;
-	BitBuffer		startBits = *bitstream;			// squirrel away copy of current state in case we need to go back and do an escape packet
-	AGParamRec		agParams;
-	uint32_t          bits1, bits2;
-	uint32_t			dilate;
-	int32_t			mixBits, mixRes, maxRes;
-	uint32_t			minBits, minBits1, minBits2;
-	uint32_t			numU, numV;
-	uint32_t			mode;
-	uint32_t			pbFactor;
-	uint32_t			chanBits;
-	//uint32_t			denShift;
-	uint8_t			bytesShifted;
-	SearchCoefs		coefsU;
-	SearchCoefs		coefsV;
-	uint32_t			index;
-	uint8_t			partialFrame;
-	uint32_t			escapeBits;
-	bool			doEscape;
-	int32_t		status = ALAC_noErr;
-
-	// make sure we handle this bit-depth before we get going
-	RequireAction( (mBitDepth == 16) || (mBitDepth == 20) || (mBitDepth == 24) || (mBitDepth == 32), return kALAC_ParamError; );
-
-	// reload coefs pointers for this channel pair
-	// - note that, while you might think they should be re-initialized per block, retaining state across blocks
-	//	 actually results in better overall compression
-	// - strangely, re-using the same coefs for the different passes of the "mixRes" search loop instead of using
-	//	 different coefs for the different passes of "mixRes" results in even better compression
-	coefsU = (SearchCoefs) mCoefsU[channelIndex];
-	coefsV = (SearchCoefs) mCoefsV[channelIndex];
-
-	// matrix encoding adds an extra bit but 32-bit inputs cannot be matrixed b/c 33 is too many
-	// so enable 16-bit "shift off" and encode in 17-bit mode
-	// - in addition, 24-bit mode really improves with one byte shifted off
-	if ( mBitDepth == 32 )
-		bytesShifted = 2;
-	else if ( mBitDepth >= 24 )
-		bytesShifted = 1;
-	else
-		bytesShifted = 0;
-
-	chanBits = mBitDepth - (bytesShifted * 8) + 1;
-	
-	// flag whether or not this is a partial frame
-	partialFrame = (numSamples == mFrameSize) ? 0 : 1;
-
-	// brute-force encode optimization loop
-	// - run over variations of the encoding params to find the best choice
-	mixBits		= kDefaultMixBits;
-	maxRes		= kMaxRes;
-	numU = numV = kDefaultNumUV;
-	//denShift	= DENSHIFT_DEFAULT;
-	mode		= 0;
-	pbFactor	= 4;
-	dilate		= 8;
-
-	minBits	= minBits1 = minBits2 = 1ul << 31;
-	
-    int32_t		bestRes = mLastMixRes[channelIndex];
-
-    for ( mixRes = 0; mixRes <= maxRes; mixRes++ )
-    {
-        // mix the stereo inputs
-        switch ( mBitDepth )
-        {
-            case 16:
-                mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes );
-                break;
-            case 20:
-                mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate, mixBits, mixRes );
-                break;
-            case 24:
-                // includes extraction of shifted-off bytes
-                mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate,
-                        mixBits, mixRes, mShiftBufferUV, bytesShifted );
-                break;
-            case 32:
-                // includes extraction of shifted-off bytes
-                mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples/dilate,
-                        mixBits, mixRes, mShiftBufferUV, bytesShifted );
-                break;
-        }
-
-        BitBufferInit( &workBits, mWorkBuffer, mMaxOutputBytes );
-        
-        // run the dynamic predictors
-        pc_block( mMixBufferU, mPredictorU, numSamples/dilate, coefsU[numU - 1], numU, chanBits, DENSHIFT_DEFAULT );
-        pc_block( mMixBufferV, mPredictorV, numSamples/dilate, coefsV[numV - 1], numV, chanBits, DENSHIFT_DEFAULT );
-
-        // run the lossless compressor on each channel
-        set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
-        status = dyn_comp( &agParams, mPredictorU, &workBits, numSamples/dilate, chanBits, &bits1 );
-        RequireNoErr( status, goto Exit; );
-
-        set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
-        status = dyn_comp( &agParams, mPredictorV, &workBits, numSamples/dilate, chanBits, &bits2 );
-        RequireNoErr( status, goto Exit; );
-
-        // look for best match
-        if ( (bits1 + bits2) < minBits1 )
-        {
-            minBits1 = bits1 + bits2;
-            bestRes = mixRes;
-        }
-    }
-    
-    mLastMixRes[channelIndex] = (int16_t)bestRes;
-
-	// mix the stereo inputs with the current best mixRes
-	mixRes = mLastMixRes[channelIndex];
-	switch ( mBitDepth )
-	{
-		case 16:
-			mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes );
-			break;
-		case 20:
-			mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes );
-			break;
-		case 24:
-			// also extracts the shifted off bytes into the shift buffers
-			mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples,
-					mixBits, mixRes, mShiftBufferUV, bytesShifted );
-			break;
-		case 32:
-			// also extracts the shifted off bytes into the shift buffers
-			mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples,
-					mixBits, mixRes, mShiftBufferUV, bytesShifted );
-			break;
-	}
-
-	// now it's time for the predictor coefficient search loop
-	numU = numV = kMinUV;
-	minBits1 = minBits2 = 1ul << 31;
-
-	for ( uint32_t numUV = kMinUV; numUV <= kMaxUV; numUV += 4 )
-	{
-		BitBufferInit( &workBits, mWorkBuffer, mMaxOutputBytes );		
-
-		dilate = 32;
-
-		// run the predictor over the same data multiple times to help it converge
-		for ( uint32_t converge = 0; converge < 8; converge++ )
-		{
-		    pc_block( mMixBufferU, mPredictorU, numSamples/dilate, coefsU[numUV-1], numUV, chanBits, DENSHIFT_DEFAULT );
-		    pc_block( mMixBufferV, mPredictorV, numSamples/dilate, coefsV[numUV-1], numUV, chanBits, DENSHIFT_DEFAULT );
-		}
-
-		dilate = 8;
-
-		set_ag_params( &agParams, MB0, (pbFactor * PB0)/4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
-		status = dyn_comp( &agParams, mPredictorU, &workBits, numSamples/dilate, chanBits, &bits1 );
-
-		if ( (bits1 * dilate + 16 * numUV) < minBits1 )
-		{
-			minBits1 = bits1 * dilate + 16 * numUV;
-			numU = numUV;
-		}
-
-		set_ag_params( &agParams, MB0, (pbFactor * PB0)/4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
-		status = dyn_comp( &agParams, mPredictorV, &workBits, numSamples/dilate, chanBits, &bits2 );
-
-		if ( (bits2 * dilate + 16 * numUV) < minBits2 )
-		{
-			minBits2 = bits2 * dilate + 16 * numUV;
-			numV = numUV;
-		}
-	}
-
-	// test for escape hatch if best calculated compressed size turns out to be more than the input size
-	minBits = minBits1 + minBits2 + (8 /* mixRes/maxRes/etc. */ * 8) + ((partialFrame == true) ? 32 : 0);
-	if ( bytesShifted != 0 )
-		minBits += (numSamples * (bytesShifted * 8) * 2);
-
-	escapeBits = (numSamples * mBitDepth * 2) + ((partialFrame == true) ? 32 : 0) + (2 * 8);	/* 2 common header bytes */
-
-	doEscape = (minBits >= escapeBits) ? true : false;
-
-	if ( doEscape == false )
-	{
-		// write bitstream header and coefs
-		BitBufferWrite( bitstream, 0, 12 );
-		BitBufferWrite( bitstream, (partialFrame << 3) | (bytesShifted << 1), 4 );
-		if ( partialFrame )
-			BitBufferWrite( bitstream, numSamples, 32 );
-		BitBufferWrite( bitstream, mixBits, 8 );
-		BitBufferWrite( bitstream, mixRes, 8 );
-		
-		//Assert( (mode < 16) && (DENSHIFT_DEFAULT < 16) );
-		//Assert( (pbFactor < 8) && (numU < 32) );
-		//Assert( (pbFactor < 8) && (numV < 32) );
-
-		BitBufferWrite( bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8 );
-		BitBufferWrite( bitstream, (pbFactor << 5) | numU, 8 );
-		for ( index = 0; index < numU; index++ )
-			BitBufferWrite( bitstream, coefsU[numU - 1][index], 16 );
-
-		BitBufferWrite( bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8 );
-		BitBufferWrite( bitstream, (pbFactor << 5) | numV, 8 );
-		for ( index = 0; index < numV; index++ )
-			BitBufferWrite( bitstream, coefsV[numV - 1][index], 16 );
-
-		// if shift active, write the interleaved shift buffers
-		if ( bytesShifted != 0 )
-		{
-			uint32_t		bitShift = bytesShifted * 8;
-
-			//Assert( bitShift <= 16 );
-
-			for ( index = 0; index < (numSamples * 2); index += 2 )
-			{
-				uint32_t			shiftedVal;
-				
-				shiftedVal = ((uint32_t)mShiftBufferUV[index + 0] << bitShift) | (uint32_t)mShiftBufferUV[index + 1];
-				BitBufferWrite( bitstream, shiftedVal, bitShift * 2 );
-			}
-		}
-
-		// run the dynamic predictor and lossless compression for the "left" channel
-		// - note: to avoid allocating more buffers, we're mixing and matching between the available buffers instead
-		//		   of only using "U" buffers for the U-channel and "V" buffers for the V-channel
-		if ( mode == 0 )
-		{
-			pc_block( mMixBufferU, mPredictorU, numSamples, coefsU[numU - 1], numU, chanBits, DENSHIFT_DEFAULT );
-		}
-		else
-		{
-			pc_block( mMixBufferU, mPredictorV, numSamples, coefsU[numU - 1], numU, chanBits, DENSHIFT_DEFAULT );
-			pc_block( mPredictorV, mPredictorU, numSamples, nil, 31, chanBits, 0 );
-		}
-
-		set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT );
-		status = dyn_comp( &agParams, mPredictorU, bitstream, numSamples, chanBits, &bits1 );
-		RequireNoErr( status, goto Exit; );
-
-		// run the dynamic predictor and lossless compression for the "right" channel
-		if ( mode == 0 )
-		{
-			pc_block( mMixBufferV, mPredictorV, numSamples, coefsV[numV - 1], numV, chanBits, DENSHIFT_DEFAULT );
-		}
-		else
-		{
-			pc_block( mMixBufferV, mPredictorU, numSamples, coefsV[numV - 1], numV, chanBits, DENSHIFT_DEFAULT );
-			pc_block( mPredictorU, mPredictorV, numSamples, nil, 31, chanBits, 0 );
-		}
-
-		set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT );
-		status = dyn_comp( &agParams, mPredictorV, bitstream, numSamples, chanBits, &bits2 );
-		RequireNoErr( status, goto Exit; );
-
-		/*	if we happened to create a compressed packet that was actually bigger than an escape packet would be,
-			chuck it and do an escape packet
-		*/
-		minBits = BitBufferGetPosition( bitstream ) - BitBufferGetPosition( &startBits );
-		if ( minBits >= escapeBits )
-		{
-			*bitstream = startBits;		// reset bitstream state
-			doEscape = true;
-			printf( "compressed frame too big: %u vs. %u \n", minBits, escapeBits );
-		}
-	}
-
-	if ( doEscape == true )
-	{
-		/* escape */
-		status = this->EncodeStereoEscape( bitstream, inputBuffer, stride, numSamples );
-
-#if VERBOSE_DEBUG		
-		DebugMsg( "escape!: %lu vs %lu", minBits, escapeBits );
-#endif
-	}
-	
-Exit:
-	return status;
-}
-
-/*
-	EncodeStereoFast()
-	- encode a channel pair without the search loop for maximum possible speed
-*/
-int32_t ALACEncoder::EncodeStereoFast( BitBuffer * bitstream, void * inputBuffer, uint32_t stride, uint32_t channelIndex, uint32_t numSamples )
-{
-	BitBuffer		startBits = *bitstream;			// squirrel away current bit position in case we decide to use escape hatch
-	AGParamRec		agParams;
-	uint32_t	bits1, bits2;
-	int32_t			mixBits, mixRes;
-	uint32_t			minBits, minBits1, minBits2;
-	uint32_t			numU, numV;
-	uint32_t			mode;
-	uint32_t			pbFactor;
-	uint32_t			chanBits;
-	//uint32_t			denShift;
-	uint8_t			bytesShifted;
-	SearchCoefs		coefsU;
-	SearchCoefs		coefsV;
-	uint32_t			index;
-	uint8_t			partialFrame;
-	uint32_t			escapeBits;
-	bool			doEscape;	
-	int32_t		status;
-
-	// make sure we handle this bit-depth before we get going
-	RequireAction( (mBitDepth == 16) || (mBitDepth == 20) || (mBitDepth == 24) || (mBitDepth == 32), return kALAC_ParamError; );
-
-	// reload coefs pointers for this channel pair
-	// - note that, while you might think they should be re-initialized per block, retaining state across blocks
-	//	 actually results in better overall compression
-	// - strangely, re-using the same coefs for the different passes of the "mixRes" search loop instead of using
-	//	 different coefs for the different passes of "mixRes" results in even better compression
-	coefsU = (SearchCoefs) mCoefsU[channelIndex];
-	coefsV = (SearchCoefs) mCoefsV[channelIndex];
-
-	// matrix encoding adds an extra bit but 32-bit inputs cannot be matrixed b/c 33 is too many
-	// so enable 16-bit "shift off" and encode in 17-bit mode
-	// - in addition, 24-bit mode really improves with one byte shifted off
-	if ( mBitDepth == 32 )
-		bytesShifted = 2;
-	else if ( mBitDepth >= 24 )
-		bytesShifted = 1;
-	else
-		bytesShifted = 0;
-
-	chanBits = mBitDepth - (bytesShifted * 8) + 1;
-	
-	// flag whether or not this is a partial frame
-	partialFrame = (numSamples == mFrameSize) ? 0 : 1;
-
-	// set up default encoding parameters for "fast" mode
-	mixBits		= kDefaultMixBits;
-	mixRes		= kDefaultMixRes;
-	numU = numV = kDefaultNumUV;
-	//denShift	= DENSHIFT_DEFAULT;
-	mode		= 0;
-	pbFactor	= 4;
-
-	minBits	= minBits1 = minBits2 = 1ul << 31;
-	
-	// mix the stereo inputs with default mixBits/mixRes
-	switch ( mBitDepth )
-	{
-		case 16:
-			mix16( (int16_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes );
-			break;
-		case 20:
-			mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, mixBits, mixRes );
-			break;
-		case 24:
-			// also extracts the shifted off bytes into the shift buffers
-			mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples,
-					mixBits, mixRes, mShiftBufferUV, bytesShifted );
-			break;
-		case 32:
-			// also extracts the shifted off bytes into the shift buffers
-			mix32( (int32_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples,
-					mixBits, mixRes, mShiftBufferUV, bytesShifted );
-			break;
-	}
-
-	/* speculatively write the bitstream assuming the compressed version will be smaller */
-
-	// write bitstream header and coefs
-	BitBufferWrite( bitstream, 0, 12 );
-	BitBufferWrite( bitstream, (partialFrame << 3) | (bytesShifted << 1), 4 );
-	if ( partialFrame )
-		BitBufferWrite( bitstream, numSamples, 32 );
-	BitBufferWrite( bitstream, mixBits, 8 );
-	BitBufferWrite( bitstream, mixRes, 8 );
-	
-	//Assert( (mode < 16) && (DENSHIFT_DEFAULT < 16) );
-	//Assert( (pbFactor < 8) && (numU < 32) );
-	//Assert( (pbFactor < 8) && (numV < 32) );
-
-	BitBufferWrite( bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8 );
-	BitBufferWrite( bitstream, (pbFactor << 5) | numU, 8 );
-	for ( index = 0; index < numU; index++ )
-		BitBufferWrite( bitstream, coefsU[numU - 1][index], 16 );
-
-	BitBufferWrite( bitstream, (mode << 4) | DENSHIFT_DEFAULT, 8 );
-	BitBufferWrite( bitstream, (pbFactor << 5) | numV, 8 );
-	for ( index = 0; index < numV; index++ )
-		BitBufferWrite( bitstream, coefsV[numV - 1][index], 16 );
-
-	// if shift active, write the interleaved shift buffers
-	if ( bytesShifted != 0 )
-	{
-		uint32_t		bitShift = bytesShifted * 8;
-
-		//Assert( bitShift <= 16 );
-
-		for ( index = 0; index < (numSamples * 2); index += 2 )
-		{
-			uint32_t			shiftedVal;
-			
-			shiftedVal = ((uint32_t)mShiftBufferUV[index + 0] << bitShift) | (uint32_t)mShiftBufferUV[index + 1];
-			BitBufferWrite( bitstream, shiftedVal, bitShift * 2 );
-		}
-	}
-
-	// run the dynamic predictor and lossless compression for the "left" channel
-	// - note: we always use mode 0 in the "fast" path so we don't need the code for mode != 0
-	pc_block( mMixBufferU, mPredictorU, numSamples, coefsU[numU - 1], numU, chanBits, DENSHIFT_DEFAULT );
-
-	set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT );
-	status = dyn_comp( &agParams, mPredictorU, bitstream, numSamples, chanBits, &bits1 );
-	RequireNoErr( status, goto Exit; );
-
-	// run the dynamic predictor and lossless compression for the "right" channel
-	pc_block( mMixBufferV, mPredictorV, numSamples, coefsV[numV - 1], numV, chanBits, DENSHIFT_DEFAULT );
-
-	set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples, numSamples, MAX_RUN_DEFAULT );
-	status = dyn_comp( &agParams, mPredictorV, bitstream, numSamples, chanBits, &bits2 );
-	RequireNoErr( status, goto Exit; );
-
-	// do bit requirement calculations
-	minBits1 = bits1 + (numU * sizeof(int16_t) * 8);
-	minBits2 = bits2 + (numV * sizeof(int16_t) * 8);
-
-	// test for escape hatch if best calculated compressed size turns out to be more than the input size
-	minBits = minBits1 + minBits2 + (8 /* mixRes/maxRes/etc. */ * 8) + ((partialFrame == true) ? 32 : 0);
-	if ( bytesShifted != 0 )
-		minBits += (numSamples * (bytesShifted * 8) * 2);
-
-	escapeBits = (numSamples * mBitDepth * 2) + ((partialFrame == true) ? 32 : 0) + (2 * 8);	/* 2 common header bytes */
-
-	doEscape = (minBits >= escapeBits) ? true : false;
-
-	if ( doEscape == false )
-	{
-		/*	if we happened to create a compressed packet that was actually bigger than an escape packet would be,
-			chuck it and do an escape packet
-		*/
-		minBits = BitBufferGetPosition( bitstream ) - BitBufferGetPosition( &startBits );
-		if ( minBits >= escapeBits )
-		{
-			doEscape = true;
-			printf( "compressed frame too big: %u vs. %u\n", minBits, escapeBits );
-		}
-
-	}
-
-	if ( doEscape == true )
-	{
-		/* escape */
-
-		// reset bitstream position since we speculatively wrote the compressed version
-		*bitstream = startBits;
-
-		// write escape frame
-		status = this->EncodeStereoEscape( bitstream, inputBuffer, stride, numSamples );
-
-#if VERBOSE_DEBUG		
-		DebugMsg( "escape!: %u vs %u", minBits, (numSamples * mBitDepth * 2) );
-#endif
-	}
-	
-Exit:
-	return status;
-}
-
-/*
-	EncodeStereoEscape()
-	- encode stereo escape frame
-*/
-int32_t ALACEncoder::EncodeStereoEscape( BitBuffer * bitstream, void * inputBuffer, uint32_t stride, uint32_t numSamples )
-{
-	int16_t *		input16;
-	int32_t *		input32;
-	uint8_t			partialFrame;
-	uint32_t			index;
-
-	// flag whether or not this is a partial frame
-	partialFrame = (numSamples == mFrameSize) ? 0 : 1;
-
-	// write bitstream header
-	BitBufferWrite( bitstream, 0, 12 );
-	BitBufferWrite( bitstream, (partialFrame << 3) | 1, 4 );	// LSB = 1 means "frame not compressed"
-	if ( partialFrame )
-		BitBufferWrite( bitstream, numSamples, 32 );
-
-	// just copy the input data to the output buffer
-	switch ( mBitDepth )
-	{
-		case 16:
-			input16 = (int16_t *) inputBuffer;
-			
-			for ( index = 0; index < (numSamples * stride); index += stride )
-			{
-				BitBufferWrite( bitstream, input16[index + 0], 16 );
-				BitBufferWrite( bitstream, input16[index + 1], 16 );
-			}
-			break;
-		case 20:
-			// mix20() with mixres param = 0 means de-interleave so use it to simplify things
-			mix20( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0 );
-			for ( index = 0; index < numSamples; index++ )
-			{
-				BitBufferWrite( bitstream, mMixBufferU[index], 20 );
-				BitBufferWrite( bitstream, mMixBufferV[index], 20 );
-			}				
-			break;
-		case 24:
-			// mix24() with mixres param = 0 means de-interleave so use it to simplify things
-			mix24( (uint8_t *) inputBuffer, stride, mMixBufferU, mMixBufferV, numSamples, 0, 0, mShiftBufferUV, 0 );
-			for ( index = 0; index < numSamples; index++ )
-			{
-				BitBufferWrite( bitstream, mMixBufferU[index], 24 );
-				BitBufferWrite( bitstream, mMixBufferV[index], 24 );
-			}				
-			break;
-		case 32:
-			input32 = (int32_t *) inputBuffer;
-
-			for ( index = 0; index < (numSamples * stride); index += stride )
-			{
-				BitBufferWrite( bitstream, input32[index + 0], 32 );
-				BitBufferWrite( bitstream, input32[index + 1], 32 );
-			}				
-			break;
-	}
-	
-	return ALAC_noErr;
-}
-
-/*
-	EncodeMono()
-	- encode a mono input buffer
-*/
-int32_t ALACEncoder::EncodeMono( BitBuffer * bitstream, void * inputBuffer, uint32_t stride, uint32_t channelIndex, uint32_t numSamples )
-{
-	BitBuffer		startBits = *bitstream;			// squirrel away copy of current state in case we need to go back and do an escape packet
-	AGParamRec		agParams;
-	uint32_t	bits1;
-	uint32_t			numU;
-	SearchCoefs		coefsU;
-	uint32_t			dilate;
-	uint32_t			minBits, bestU;
-	uint32_t			minU, maxU;
-	uint32_t			index, index2;
-	uint8_t			bytesShifted;
-	uint32_t			shift;
-	uint32_t			mask;
-	uint32_t			chanBits;
-	uint8_t			pbFactor;
-	uint8_t			partialFrame;
-	int16_t *		input16;
-	int32_t *		input32;
-	uint32_t			escapeBits;
-	bool			doEscape;
-	int32_t		status;
-
-	// make sure we handle this bit-depth before we get going
-	RequireAction( (mBitDepth == 16) || (mBitDepth == 20) || (mBitDepth == 24) || (mBitDepth == 32), return kALAC_ParamError; );
-
-	status = ALAC_noErr;
-	
-	// reload coefs array from previous frame
-	coefsU = (SearchCoefs) mCoefsU[channelIndex];
-
-	// pick bit depth for actual encoding
-	// - we lop off the lower byte(s) for 24-/32-bit encodings
-	if ( mBitDepth == 32 )
-		bytesShifted = 2;
-	else if ( mBitDepth >= 24 )
-		bytesShifted = 1;
-	else
-		bytesShifted = 0;
-
-	shift = bytesShifted * 8;
-	mask = (1ul << shift) - 1;
-	chanBits = mBitDepth - (bytesShifted * 8);
-
-	// flag whether or not this is a partial frame
-	partialFrame = (numSamples == mFrameSize) ? 0 : 1;
-
-	// convert N-bit data to 32-bit for predictor
-	switch ( mBitDepth )
-	{
-		case 16:
-		{
-			// convert 16-bit data to 32-bit for predictor
-			input16 = (int16_t *) inputBuffer;
-			for ( index = 0, index2 = 0; index < numSamples; index++, index2 += stride )
-				mMixBufferU[index] = (int32_t) input16[index2];
-			break;
-		}
-		case 20:
-			// convert 20-bit data to 32-bit for predictor
-			copy20ToPredictor( (uint8_t *) inputBuffer, stride, mMixBufferU, numSamples );
-			break;
-		case 24:
-			// convert 24-bit data to 32-bit for the predictor and extract the shifted off byte(s)
-			copy24ToPredictor( (uint8_t *) inputBuffer, stride, mMixBufferU, numSamples );
-			for ( index = 0; index < numSamples; index++ )
-			{
-				mShiftBufferUV[index] = (uint16_t)(mMixBufferU[index] & mask);
-				mMixBufferU[index] >>= shift;
-			}
-			break;
-		case 32:
-		{
-			// just copy the 32-bit input data for the predictor and extract the shifted off byte(s)
-			input32 = (int32_t *) inputBuffer;
-
-			for ( index = 0, index2 = 0; index < numSamples; index++, index2 += stride )
-			{
-				int32_t			val = input32[index2];
-				
-				mShiftBufferUV[index] = (uint16_t)(val & mask);
-				mMixBufferU[index] = val >> shift;
-			}
-			break;
-		}
-	}
-
-	// brute-force encode optimization loop (implied "encode depth" of 0 if comparing to cmd line tool)
-	// - run over variations of the encoding params to find the best choice
-	minU		= 4;
-	maxU		= 8;
-	minBits		= 1ul << 31;
-	pbFactor	= 4;
-	
-	minBits	= 1ul << 31;
-	bestU	= minU;
-
-	for ( numU = minU; numU <= maxU; numU += 4 )
-	{
-		BitBuffer		workBits;
-		uint32_t			numBits;
-
-		BitBufferInit( &workBits, mWorkBuffer, mMaxOutputBytes );
-	
-		dilate = 32;
-		for ( uint32_t converge = 0; converge < 7; converge++ )	
-			pc_block( mMixBufferU, mPredictorU, numSamples/dilate, coefsU[numU-1], numU, chanBits, DENSHIFT_DEFAULT );
-
-		dilate = 8;
-		pc_block( mMixBufferU, mPredictorU, numSamples/dilate, coefsU[numU-1], numU, chanBits, DENSHIFT_DEFAULT );
-
-		set_ag_params( &agParams, MB0, (pbFactor * PB0) / 4, KB0, numSamples/dilate, numSamples/dilate, MAX_RUN_DEFAULT );
-		status = dyn_comp( &agParams, mPredictorU, &workBits, numSamples/dilate, chanBits, &bits1 );
-		RequireNoErr( status, goto Exit; );
-
-		numBits = (dilate * bits1) + (16 * numU);
-		if ( numBits < minBits )
-		{
-			bestU	= numU;
-			minBits = numBits;
-		}
-	}             
-
-	// test for escape hatch if best calculated compressed size turns out to be more than the input size
-	// - first, add bits for the header bytes mixRes/maxRes/shiftU/filterU
-	minBits += (4 /* mixRes/maxRes/etc. */ * 8) + ((partialFrame == true) ? 32 : 0);
-	if ( bytesShifted != 0 )
-		minBits += (numSamples * (bytesShifted * 8));
-
-	escapeBits = (numSamples * mBitDepth) + ((partialFrame == true) ? 32 : 0) + (2 * 8);	/* 2 common header bytes */
-
-	doEscape = (minBits >= escapeBits) ? true : false;
-
-	if ( doEscape == false )
-	{
-		// write bitstream header
-		BitBufferWrite( bitstream, 0, 12 );
-		BitBufferWrite( bitstream, (partialFrame << 3) | (bytesShifted << 1), 4 );
-		if ( partialFrame )
-			BitBufferWrite( bitstream, numSamples, 32 );
-		BitBufferWrite( bitstream, 0, 16 );								// mixBits = mixRes = 0
-		
-		// write the params and predictor coefs
-		numU = bestU;
-		BitBufferWrite( bitstream, (0 << 4) | DENSHIFT_DEFAULT, 8 );	// modeU = 0
-		BitBufferWrite( bitstream, (pbFactor << 5) | numU, 8 );
-		for ( index = 0; index < numU; index++ )
-			BitBufferWrite( bitstream, coefsU[numU-1][index], 16 );
-
-		// if shift active, write the interleaved shift buffers
-		if ( bytesShifted != 0 )
-		{
-			for ( index = 0; index < numSamples; index++ )
-				BitBufferWrite( bitstream, mShiftBufferUV[index], shift );
-		}
-
-		// run the dynamic predictor with the best result
-		pc_block( mMixBufferU, mPredictorU, numSamples, coefsU[numU-1], numU, chanBits, DENSHIFT_DEFAULT );
-
-		// do lossless compression
-		set_standard_ag_params( &agParams, numSamples, numSamples );
-		status = dyn_comp( &agParams, mPredictorU, bitstream, numSamples, chanBits, &bits1 );
-		//AssertNoErr( status );
-
-
-		/*	if we happened to create a compressed packet that was actually bigger than an escape packet would be,
-			chuck it and do an escape packet
-		*/
-		minBits = BitBufferGetPosition( bitstream ) - BitBufferGetPosition( &startBits );
-		if ( minBits >= escapeBits )
-		{
-			*bitstream = startBits;		// reset bitstream state
-			doEscape = true;
-			printf( "compressed frame too big: %u vs. %u\n", minBits, escapeBits );
-		}
-	}
-
-	if ( doEscape == true )
-	{
-		// write bitstream header and coefs
-		BitBufferWrite( bitstream, 0, 12 );
-		BitBufferWrite( bitstream, (partialFrame << 3) | 1, 4 );	// LSB = 1 means "frame not compressed"
-		if ( partialFrame )
-			BitBufferWrite( bitstream, numSamples, 32 );
-
-		// just copy the input data to the output buffer
-		switch ( mBitDepth )
-		{
-			case 16:
-				input16 = (int16_t *) inputBuffer;
-				for ( index = 0; index < (numSamples * stride); index += stride )
-					BitBufferWrite( bitstream, input16[index], 16 );
-				break;
-			case 20:
-				// convert 20-bit data to 32-bit for simplicity
-				copy20ToPredictor( (uint8_t *) inputBuffer, stride, mMixBufferU, numSamples );
-				for ( index = 0; index < numSamples; index++ )
-					BitBufferWrite( bitstream, mMixBufferU[index], 20 );
-				break;
-			case 24:
-				// convert 24-bit data to 32-bit for simplicity
-				copy24ToPredictor( (uint8_t *) inputBuffer, stride, mMixBufferU, numSamples );
-				for ( index = 0; index < numSamples; index++ )
-					BitBufferWrite( bitstream, mMixBufferU[index], 24 );
-				break;
-			case 32:
-				input32 = (int32_t *) inputBuffer;
-				for ( index = 0; index < (numSamples * stride); index += stride )
-					BitBufferWrite( bitstream, input32[index], 32 );
-				break;
-		}
-#if VERBOSE_DEBUG		
-		DebugMsg( "escape!: %lu vs %lu", minBits, (numSamples * mBitDepth) );
-#endif
-	}
-
-Exit:
-	return status;
-}
-
-#if PRAGMA_MARK
-#pragma mark -
-#endif
-
-/*
-	Encode()
-	- encode the next block of samples
-*/
-int32_t ALACEncoder::Encode(AudioFormatDescription theInputFormat, AudioFormatDescription theOutputFormat,
-                             unsigned char * theReadBuffer, unsigned char * theWriteBuffer, int32_t * ioNumBytes)
-{
-	uint32_t				numFrames;
-	uint32_t				outputSize;
-	BitBuffer			bitstream;
-	int32_t			status;
-
-	numFrames = *ioNumBytes/theInputFormat.mBytesPerPacket;
-
-	// create a bit buffer structure pointing to our output buffer
-	BitBufferInit( &bitstream, theWriteBuffer, mMaxOutputBytes );
-
-	if ( theInputFormat.mChannelsPerFrame == 2 )
-	{
-		// add 3-bit frame start tag ID_CPE = channel pair & 4-bit element instance tag = 0
-		BitBufferWrite( &bitstream, ID_CPE, 3 );
-		BitBufferWrite( &bitstream, 0, 4 );
-
-		// encode stereo input buffer
-		if ( mFastMode == false )
-			status = this->EncodeStereo( &bitstream, theReadBuffer, 2, 0, numFrames );
-		else
-			status = this->EncodeStereoFast( &bitstream, theReadBuffer, 2, 0, numFrames );
-		RequireNoErr( status, goto Exit; );
-	}
-	else if ( theInputFormat.mChannelsPerFrame == 1 )
-	{
-		// add 3-bit frame start tag ID_SCE = mono channel & 4-bit element instance tag = 0
-		BitBufferWrite( &bitstream, ID_SCE, 3 );
-		BitBufferWrite( &bitstream, 0, 4 );
-
-		// encode mono input buffer
-		status = this->EncodeMono( &bitstream, theReadBuffer, 1, 0, numFrames );
-		RequireNoErr( status, goto Exit; );
-	}
-	else
-	{
-		char *					inputBuffer;
-		uint32_t				tag;
-		uint32_t				channelIndex;
-		uint32_t				inputIncrement;
-		uint8_t				stereoElementTag;
-		uint8_t				monoElementTag;
-		uint8_t				lfeElementTag;
-		
-		inputBuffer		= (char *) theReadBuffer;
-		inputIncrement	= ((mBitDepth + 7) / 8);
-		
-		stereoElementTag	= 0;
-		monoElementTag		= 0;
-		lfeElementTag		= 0;
-
-		for ( channelIndex = 0; channelIndex < theInputFormat.mChannelsPerFrame; )
-		{
-			tag = (sChannelMaps[theInputFormat.mChannelsPerFrame - 1] & (0x7ul << (channelIndex * 3))) >> (channelIndex * 3);
-	
-			BitBufferWrite( &bitstream, tag, 3 );
-			switch ( tag )
-			{
-				case ID_SCE:
-					// mono
-					BitBufferWrite( &bitstream, monoElementTag, 4 );
-
-					status = this->EncodeMono( &bitstream, inputBuffer, theInputFormat.mChannelsPerFrame, channelIndex, numFrames );
-					
-					inputBuffer += inputIncrement;
-					channelIndex++;
-					monoElementTag++;
-					break;
-
-				case ID_CPE:
-					// stereo
-					BitBufferWrite( &bitstream, stereoElementTag, 4 );
-
-					status = this->EncodeStereo( &bitstream, inputBuffer, theInputFormat.mChannelsPerFrame, channelIndex, numFrames );
-
-					inputBuffer += (inputIncrement * 2);
-					channelIndex += 2;
-					stereoElementTag++;
-					break;
-
-				case ID_LFE:
-					// LFE channel (subwoofer)
-					BitBufferWrite( &bitstream, lfeElementTag, 4 );
-
-					status = this->EncodeMono( &bitstream, inputBuffer, theInputFormat.mChannelsPerFrame, channelIndex, numFrames );
-
-					inputBuffer += inputIncrement;
-					channelIndex++;
-					lfeElementTag++;
-					break;
-
-				default:
-					printf( "That ain't right! (%u)\n", tag );
-					status = kALAC_ParamError;
-					goto Exit;
-			}
-
-			RequireNoErr( status, goto Exit; );
-		}
-	}
-
-#if VERBOSE_DEBUG
-{
-	// if there is room left in the output buffer, add some random fill data to test decoder
-	int32_t			bitsLeft;
-	int32_t			bytesLeft;
-	
-	bitsLeft = BitBufferGetPosition( &bitstream ) - 3;	// - 3 for ID_END tag
-	bytesLeft = bitstream.byteSize - ((bitsLeft + 7) / 8);
-	
-	if ( (bytesLeft > 20) && ((bytesLeft & 0x4u) != 0) )
-		AddFiller( &bitstream, bytesLeft );
-}
-#endif
-
-	// add 3-bit frame end tag: ID_END
-	BitBufferWrite( &bitstream, ID_END, 3 );
-
-	// byte-align the output data
-	BitBufferByteAlign( &bitstream, true );
-
-	outputSize = BitBufferGetPosition( &bitstream ) / 8;
-	//Assert( outputSize <= mMaxOutputBytes );
-
-
-	// all good, let iTunes know what happened and remember the total number of input sample frames
-	*ioNumBytes = outputSize;
-	//mEncodedFrames		   	   += encodeMsg->numInputSamples;
-
-	// gather encoding stats
-	mTotalBytesGenerated += outputSize;
-	mMaxFrameBytes = MAX( mMaxFrameBytes, outputSize );
-
-	status = ALAC_noErr;
-
-Exit:
-	return status;
-}
-
-/*
-	Finish()
-	- drain out any leftover samples
-*/
-
-int32_t ALACEncoder::Finish()
-{
-/*	// finalize bit rate statistics
-	if ( mSampleSize.numEntries != 0 )
-		mAvgBitRate = (uint32_t)( (((float)mTotalBytesGenerated * 8.0f) / (float)mSampleSize.numEntries) * ((float)mSampleRate / (float)mFrameSize) );
-	else
-		mAvgBitRate = 0;
-*/
-	return ALAC_noErr;
-}
-
-#if PRAGMA_MARK
-#pragma mark -
-#endif
-
-/*
-	GetConfig()
-*/
-void ALACEncoder::GetConfig( ALACSpecificConfig & config )
-{
-	config.frameLength			= Swap32NtoB(mFrameSize);
-	config.compatibleVersion	= (uint8_t) kALACCompatibleVersion;
-	config.bitDepth				= (uint8_t) mBitDepth;
-	config.pb					= (uint8_t) PB0;
-	config.kb					= (uint8_t) KB0;
-	config.mb					= (uint8_t) MB0;
-	config.numChannels			= (uint8_t) mNumChannels;
-	config.maxRun				= Swap16NtoB((uint16_t) MAX_RUN_DEFAULT);
-	config.maxFrameBytes		= Swap32NtoB(mMaxFrameBytes);
-	config.avgBitRate			= Swap32NtoB(mAvgBitRate);
-	config.sampleRate			= Swap32NtoB(mOutputSampleRate);
-}
-
-uint32_t ALACEncoder::GetMagicCookieSize(uint32_t inNumChannels)
-{
-    if (inNumChannels > 2)
-    {
-        return sizeof(ALACSpecificConfig) + kChannelAtomSize + sizeof(ALACAudioChannelLayout);
-    }
-    else
-    {
-        return sizeof(ALACSpecificConfig);
-    }
-}
-
-void ALACEncoder::GetMagicCookie(void * outCookie, uint32_t * ioSize)
-{
-    ALACSpecificConfig theConfig = {0};
-    ALACAudioChannelLayout theChannelLayout = {0};
-    uint8_t theChannelAtom[kChannelAtomSize] = {0, 0, 0, 0, 'c', 'h', 'a', 'n', 0, 0, 0, 0};
-    uint32_t theCookieSize = sizeof(ALACSpecificConfig);
-    uint8_t * theCookiePointer = (uint8_t *)outCookie;
-    
-    GetConfig(theConfig);
-    if (theConfig.numChannels > 2)
-    {
-        theChannelLayout.mChannelLayoutTag = ALACChannelLayoutTags[theConfig.numChannels - 1];
-        theCookieSize += (sizeof(ALACAudioChannelLayout) + kChannelAtomSize);
-    }
-     if (*ioSize >= theCookieSize)
-    {
-        memcpy(theCookiePointer, &theConfig, sizeof(ALACSpecificConfig));
-        theChannelAtom[3] = (sizeof(ALACAudioChannelLayout) + kChannelAtomSize);
-        if (theConfig.numChannels > 2)
-        {
-            theCookiePointer += sizeof(ALACSpecificConfig);
-            memcpy(theCookiePointer, theChannelAtom, kChannelAtomSize);
-            theCookiePointer += kChannelAtomSize;
-            memcpy(theCookiePointer, &theChannelLayout, sizeof(ALACAudioChannelLayout));
-        }
-        *ioSize = theCookieSize;
-    }
-    else
-    {
-        *ioSize = 0; // no incomplete cookies
-    }
-}
-
-/*
-	InitializeEncoder()
-	- initialize the encoder component with the current config
-*/
-int32_t ALACEncoder::InitializeEncoder(AudioFormatDescription theOutputFormat)
-{
-	int32_t			status;
-    
-    mOutputSampleRate = theOutputFormat.mSampleRate;
-    mNumChannels = theOutputFormat.mChannelsPerFrame;
-    switch(theOutputFormat.mFormatFlags)
-    {
-        case 1:
-            mBitDepth = 16;
-            break;
-        case 2:
-            mBitDepth = 20;
-            break;
-        case 3:
-            mBitDepth = 24;
-            break;
-        case 4:
-            mBitDepth = 32;
-            break;
-        default:
-            break;
-    }
-
-	// set up default encoding parameters and state
-	// - note: mFrameSize is set in the constructor or via SetFrameSize() which must be called before this routine
-	for ( uint32_t index = 0; index < kALACMaxChannels; index++ )
-		mLastMixRes[index] = kDefaultMixRes;
-
-	// the maximum output frame size can be no bigger than (samplesPerBlock * numChannels * ((10 + sampleSize)/8) + 1)
-	// but note that this can be bigger than the input size!
-	// - since we don't yet know what our input format will be, use our max allowed sample size in the calculation
-	mMaxOutputBytes = mFrameSize * mNumChannels * ((10 + kMaxSampleSize) / 8)  + 1;
-
-	// allocate mix buffers
-	mMixBufferU = (int32_t *) calloc( mFrameSize * sizeof(int32_t), 1 );
-	mMixBufferV = (int32_t *) calloc( mFrameSize * sizeof(int32_t), 1 );
-
-	// allocate dynamic predictor buffers
-	mPredictorU = (int32_t *) calloc( mFrameSize * sizeof(int32_t), 1 );
-	mPredictorV = (int32_t *) calloc( mFrameSize * sizeof(int32_t), 1 );
-	
-	// allocate combined shift buffer
-	mShiftBufferUV = (uint16_t *) calloc( mFrameSize * 2 * sizeof(uint16_t),1 );
-	
-	// allocate work buffer for search loop
-	mWorkBuffer = (uint8_t *) calloc( mMaxOutputBytes, 1 );
-
-	RequireAction( (mMixBufferU != nil) && (mMixBufferV != nil) &&
-					(mPredictorU != nil) && (mPredictorV != nil) &&
-					(mShiftBufferUV != nil) && (mWorkBuffer != nil ),
-					status = kALAC_MemFullError; goto Exit; );
-
-	status = ALAC_noErr;
-
-
-	// initialize coefs arrays once b/c retaining state across blocks actually improves the encode ratio
-	for ( int32_t channel = 0; channel < (int32_t)mNumChannels; channel++ )
-	{
-		for ( int32_t search = 0; search < kALACMaxSearches; search++ )
-		{
-			init_coefs( mCoefsU[channel][search], DENSHIFT_DEFAULT, kALACMaxCoefs );
-			init_coefs( mCoefsV[channel][search], DENSHIFT_DEFAULT, kALACMaxCoefs );
-		}
-	}
-
-Exit:
-	return status;
-}
-
-/*
-	GetSourceFormat()
-	- given the input format, return one of our supported formats
-*/
-void ALACEncoder::GetSourceFormat( const AudioFormatDescription * source, AudioFormatDescription * output )
-{
-	// default is 16-bit native endian
-	// - note: for float input we assume that's coming from one of our decoders (mp3, aac) so it only makes sense
-	//		   to encode to 16-bit since the source was lossy in the first place
-	// - note: if not a supported bit depth, find the closest supported bit depth to the input one
-	if ( (source->mFormatID != kALACFormatLinearPCM) || ((source->mFormatFlags & kALACFormatFlagIsFloat) != 0) ||
-		( source->mBitsPerChannel <= 16 ) )
-		mBitDepth = 16;
-	else if ( source->mBitsPerChannel <= 20 )
-		mBitDepth = 20;
-	else if ( source->mBitsPerChannel <= 24 )
-		mBitDepth = 24;
-	else
-		mBitDepth = 32;
-		
-	// we support 16/20/24/32-bit integer data at any sample rate and our target number of channels
-	// and sample rate were specified when we were configured
-	/*
-    MakeUncompressedAudioFormat( mNumChannels, (float) mOutputSampleRate, mBitDepth, kAudioFormatFlagsNativeIntegerPacked, output );
-     */
-}
-
-
-
-#if VERBOSE_DEBUG
-
-#if PRAGMA_MARK
-#pragma mark -
-#endif
-
-/*
-	AddFiller()
-	- add fill and data stream elements to the bitstream to test the decoder
-*/
-static void AddFiller( BitBuffer * bits, int32_t numBytes )
-{
-	uint8_t		tag;
-	uint32_t		index;
-
-	// out of lameness, subtract 6 bytes to deal with header + alignment as required for fill/data elements
-	numBytes -= 6;
-	if ( numBytes <= 0 )
-		return;
-	
-	// randomly pick Fill or Data Stream Element based on numBytes requested
-	tag = (numBytes & 0x8) ? ID_FIL : ID_DSE;
-
-	BitBufferWrite( bits, tag, 3 );
-	if ( tag == ID_FIL )
-	{
-		// can't write more than 269 bytes in a fill element
-		numBytes = (numBytes > 269) ? 269 : numBytes;
-
-		// fill element = 4-bit size unless >= 15 then 4-bit size + 8-bit extension size
-		if ( numBytes >= 15 )
-		{
-			uint16_t			extensionSize;
-
-			BitBufferWrite( bits, 15, 4 );
-
-			// 8-bit extension count field is "extra + 1" which is weird but I didn't define the syntax
-			// - otherwise, there's no way to represent 15
-			// - for example, to really mean 15 bytes you must encode extensionSize = 1
-			// - why it's not like data stream elements I have no idea
-			extensionSize = (numBytes - 15) + 1;
-			Assert( extensionSize <= 255 );
-			BitBufferWrite( bits, extensionSize, 8 );
-		}
-		else
-			BitBufferWrite( bits, numBytes, 4 );
-
-		BitBufferWrite( bits, 0x10, 8 );		// extension_type = FILL_DATA = b0001 or'ed with fill_nibble = b0000
-		for ( index = 0; index < (numBytes - 1); index++ )
-			BitBufferWrite( bits, 0xa5, 8 );	// fill_byte = b10100101 = 0xa5
-	}
-	else
-	{
-		// can't write more than 510 bytes in a data stream element
-		numBytes = (numBytes > 510) ? 510 : numBytes;
-
-		BitBufferWrite( bits, 0, 4 );			// element instance tag
-		BitBufferWrite( bits, 1, 1 );			// byte-align flag = true
-
-		// data stream element = 8-bit size unless >= 255 then 8-bit size + 8-bit size
-		if ( numBytes >= 255 )
-		{
-			BitBufferWrite( bits, 255, 8 );
-			BitBufferWrite( bits, numBytes - 255, 8 );
-		}
-		else
-			BitBufferWrite( bits, numBytes, 8 );
-		
-		BitBufferByteAlign( bits, true );		// byte-align with zeros
-
-		for ( index = 0; index < numBytes; index++ )
-			BitBufferWrite( bits, 0x5a, 8 );
-	}
-}
-
-#endif	/* VERBOSE_DEBUG */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACEncoder.h b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACEncoder.h
deleted file mode 100644
index 0e6c68904..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ALACEncoder.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		ALACEncoder.h
-*/
-
-#pragma once
-
-#include <stdint.h>
-
-#include "ALACAudioTypes.h"
-
-
-struct BitBuffer;
-
-class ALACEncoder
-{
-	public:
-		ALACEncoder();
-		virtual ~ALACEncoder();
-
-		virtual int32_t	Encode(AudioFormatDescription theInputFormat, AudioFormatDescription theOutputFormat,
-                                   unsigned char * theReadBuffer, unsigned char * theWriteBuffer, int32_t * ioNumBytes);
-		virtual int32_t	Finish( );
-
-		void				SetFastMode( bool fast ) { mFastMode = fast; };
-
-		// this must be called *before* InitializeEncoder()
-		void				SetFrameSize( uint32_t frameSize ) { mFrameSize = frameSize; };
-
-		void				GetConfig( ALACSpecificConfig & config );
-        uint32_t            GetMagicCookieSize(uint32_t inNumChannels);
-        void				GetMagicCookie( void * config, uint32_t * ioSize ); 
-
-        virtual int32_t	InitializeEncoder(AudioFormatDescription theOutputFormat);
-
-    protected:
-		virtual void		GetSourceFormat( const AudioFormatDescription * source, AudioFormatDescription * output );
-		
-		int32_t			EncodeStereo( struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples );
-		int32_t			EncodeStereoFast( struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples );
-		int32_t			EncodeStereoEscape( struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t numSamples );
-		int32_t			EncodeMono( struct BitBuffer * bitstream, void * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples );
-
-
-		// ALAC encoder parameters
-		int16_t					mBitDepth;
-		bool					mFastMode;
-
-		// encoding state
-		int16_t					mLastMixRes[kALACMaxChannels];
-
-		// encoding buffers
-		int32_t *				mMixBufferU;
-		int32_t *				mMixBufferV;
-		int32_t *				mPredictorU;
-		int32_t *				mPredictorV;
-		uint16_t *				mShiftBufferUV;
-		
-		uint8_t *					mWorkBuffer;
-
-		// per-channel coefficients buffers
-		int16_t					mCoefsU[kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs];
-		int16_t					mCoefsV[kALACMaxChannels][kALACMaxSearches][kALACMaxCoefs];
-
-		// encoding statistics
-		uint32_t					mTotalBytesGenerated;
-		uint32_t					mAvgBitRate;
-		uint32_t					mMaxFrameBytes;
-        uint32_t                  mFrameSize;
-        uint32_t                  mMaxOutputBytes;
-        uint32_t                  mNumChannels;
-        uint32_t                  mOutputSampleRate;		
-};
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/EndianPortable.c b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/EndianPortable.c
deleted file mode 100644
index 5a7d5b89b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/EndianPortable.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-//
-//  EndianPortable.c
-//
-//  Copyright 2011 Apple Inc. All rights reserved.
-//
-
-#include <stdio.h>
-#include "EndianPortable.h"
-
-#define BSWAP16(x) (((x << 8) | ((x >> 8) & 0x00ff)))
-#define BSWAP32(x) (((x << 24) | ((x << 8) & 0x00ff0000) | ((x >> 8) & 0x0000ff00) | ((x >> 24) & 0x000000ff)))
-#define BSWAP64(x) ((((int64_t)x << 56) | (((int64_t)x << 40) & 0x00ff000000000000LL) | \
-                    (((int64_t)x << 24) & 0x0000ff0000000000LL) | (((int64_t)x << 8) & 0x000000ff00000000LL) | \
-                    (((int64_t)x >> 8) & 0x00000000ff000000LL) | (((int64_t)x >> 24) & 0x0000000000ff0000LL) | \
-                    (((int64_t)x >> 40) & 0x000000000000ff00LL) | (((int64_t)x >> 56) & 0x00000000000000ffLL)))
-
-#if defined(__i386__)
-#define TARGET_RT_LITTLE_ENDIAN 1
-#elif defined(__x86_64__)
-#define TARGET_RT_LITTLE_ENDIAN 1
-#elif defined (TARGET_OS_WIN32)
-#define TARGET_RT_LITTLE_ENDIAN 1
-#endif
-
-uint16_t Swap16NtoB(uint16_t inUInt16)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-    return BSWAP16(inUInt16);
-#else
-    return inUInt16;
-#endif
-}
-
-uint16_t Swap16BtoN(uint16_t inUInt16)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-    return BSWAP16(inUInt16);
-#else
-    return inUInt16;
-#endif
-}
-
-uint32_t Swap32NtoB(uint32_t inUInt32)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-    return BSWAP32(inUInt32);
-#else
-    return inUInt32;
-#endif
-}
-
-uint32_t Swap32BtoN(uint32_t inUInt32)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-    return BSWAP32(inUInt32);
-#else
-    return inUInt32;
-#endif
-}
-
-uint64_t Swap64BtoN(uint64_t inUInt64)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-    return BSWAP64(inUInt64);
-#else
-    return inUInt64;
-#endif
-}
-
-uint64_t Swap64NtoB(uint64_t inUInt64)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-    return BSWAP64(inUInt64);
-#else
-    return inUInt64;
-#endif
-}
-
-float SwapFloat32BtoN(float in)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-	union {
-		float f;
-		int32_t i;
-	} x;
-	x.f = in;	
-	x.i = BSWAP32(x.i);
-	return x.f;
-#else
-	return in;
-#endif
-}
-
-float SwapFloat32NtoB(float in)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-	union {
-		float f;
-		int32_t i;
-	} x;
-	x.f = in;	
-	x.i = BSWAP32(x.i);
-	return x.f;
-#else
-	return in;
-#endif
-}
-
-double SwapFloat64BtoN(double in)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-	union {
-		double f;
-		int64_t i;
-	} x;
-	x.f = in;	
-	x.i = BSWAP64(x.i);
-	return x.f;
-#else
-	return in;
-#endif
-}
-
-double SwapFloat64NtoB(double in)
-{
-#if TARGET_RT_LITTLE_ENDIAN
-	union {
-		double f;
-		int64_t i;
-	} x;
-	x.f = in;	
-	x.i = BSWAP64(x.i);
-	return x.f;
-#else
-	return in;
-#endif
-}
-
-void Swap16(uint16_t * inUInt16)
-{
-	*inUInt16 = BSWAP16(*inUInt16);
-}
-
-void Swap24(uint8_t * inUInt24)
-{
-	uint8_t tempVal = inUInt24[0];
-	inUInt24[0] = inUInt24[2];
-	inUInt24[2] = tempVal;
-}
-
-void Swap32(uint32_t * inUInt32)
-{
-	*inUInt32 = BSWAP32(*inUInt32);
-}
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/EndianPortable.h b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/EndianPortable.h
deleted file mode 100644
index f7f50a797..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/EndianPortable.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-//
-//  EndianPortable.h
-//
-//  Copyright 2011 Apple Inc. All rights reserved.
-//
-
-#ifndef _EndianPortable_h
-#define _EndianPortable_h
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-uint16_t Swap16NtoB(uint16_t inUInt16);
-uint16_t Swap16BtoN(uint16_t inUInt16);
-
-uint32_t Swap32NtoB(uint32_t inUInt32);
-uint32_t Swap32BtoN(uint32_t inUInt32);
-
-uint64_t Swap64BtoN(uint64_t inUInt64);
-uint64_t Swap64NtoB(uint64_t inUInt64);
-
-float SwapFloat32BtoN(float in);
-float SwapFloat32NtoB(float in);
-
-double SwapFloat64BtoN(double in);
-double SwapFloat64NtoB(double in);
-
-void Swap16(uint16_t * inUInt16);
-void Swap24(uint8_t * inUInt24);
-void Swap32(uint32_t * inUInt32);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ag_dec.c b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ag_dec.c
deleted file mode 100644
index 2214c9414..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ag_dec.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		ag_dec.c
-	
-	Contains:   Adaptive Golomb decode routines.
-
-	Copyright:	(c) 2001-2011 Apple, Inc.
-*/
-
-#include "aglib.h"
-#include "ALACBitUtilities.h"
-#include "ALACAudioTypes.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if __GNUC__ && TARGET_OS_MAC
-	#if __POWERPC__
-		#include <ppc_intrinsics.h>
-	#else
-		#include <libkern/OSByteOrder.h>
-	#endif
-#endif
-
-#define CODE_TO_LONG_MAXBITS	32
-#define N_MAX_MEAN_CLAMP		0xffff
-#define N_MEAN_CLAMP_VAL		0xffff
-#define REPORT_VAL  40
-
-#if __GNUC__
-#define ALWAYS_INLINE		__attribute__((always_inline))
-#else
-#define ALWAYS_INLINE
-#endif
-
-/*	And on the subject of the CodeWarrior x86 compiler and inlining, I reworked a lot of this
-	to help the compiler out.   In many cases this required manual inlining or a macro.  Sorry
-	if it is ugly but the performance gains are well worth it.
-	- WSK 5/19/04
-*/
-
-void set_standard_ag_params(AGParamRecPtr params, uint32_t fullwidth, uint32_t sectorwidth)
-{
-	/* Use
-		fullwidth = sectorwidth = numOfSamples, for analog 1-dimensional type-short data,
-		but use
-		fullwidth = full image width, sectorwidth = sector (patch) width
-		for such as image (2-dim.) data.
-	*/
-	set_ag_params( params, MB0, PB0, KB0, fullwidth, sectorwidth, MAX_RUN_DEFAULT );
-}
-
-void set_ag_params(AGParamRecPtr params, uint32_t m, uint32_t p, uint32_t k, uint32_t f, uint32_t s, uint32_t maxrun)
-{
-	params->mb = params->mb0 = m;
-	params->pb = p;
-	params->kb = k;
-	params->wb = (1u<<params->kb)-1;
-	params->qb = QB-params->pb; 
-	params->fw = f;
-	params->sw = s;
-	params->maxrun = maxrun;
-}
-
-#if PRAGMA_MARK
-#pragma mark -
-#endif
-
-
-// note: implementing this with some kind of "count leading zeros" assembly is a big performance win
-static inline int32_t lead( int32_t m )
-{
-	long j;
-	unsigned long c = (1ul << 31);
-
-	for(j=0; j < 32; j++)
-	{
-		if((c & m) != 0)
-			break;
-		c >>= 1;
-	}
-	return (j);
-}
-
-#define arithmin(a, b) ((a) < (b) ? (a) : (b))
-
-static inline int32_t ALWAYS_INLINE lg3a( int32_t x)
-{
-    int32_t result;
-
-    x += 3;
-    result = lead(x);
-
-    return 31 - result;
-}
-
-static inline uint32_t ALWAYS_INLINE read32bit( uint8_t * buffer )
-{
-	// embedded CPUs typically can't read unaligned 32-bit words so just read the bytes
-	uint32_t		value;
-	
-	value = ((uint32_t)buffer[0] << 24) | ((uint32_t)buffer[1] << 16) |
-			 ((uint32_t)buffer[2] << 8) | (uint32_t)buffer[3];
-	return value;
-
-}
-
-#if PRAGMA_MARK
-#pragma mark -
-#endif
-
-#define get_next_fromlong(inlong, suff)		((inlong) >> (32 - (suff)))
-
-
-static inline uint32_t ALWAYS_INLINE
-getstreambits( uint8_t *in, int32_t bitoffset, int32_t numbits )
-{
-	uint32_t	load1, load2;
-	uint32_t	byteoffset = bitoffset / 8;
-	uint32_t	result;
-	
-	//Assert( numbits <= 32 );
-
-	load1 = read32bit( in + byteoffset );
-
-	if ( (numbits + (bitoffset & 0x7)) > 32)
-	{
-		int32_t load2shift;
-
-		result = load1 << (bitoffset & 0x7);
-		load2 = (uint32_t) in[byteoffset+4];
-		load2shift = (8-(numbits + (bitoffset & 0x7)-32));
-		load2 >>= load2shift;
-		result >>= (32-numbits);
-		result |= load2;		
-	}
-	else
-	{
-		result = load1 >> (32-numbits-(bitoffset & 7));
-	}
-
-	// a shift of >= "the number of bits in the type of the value being shifted" results in undefined
-	// behavior so don't try to shift by 32
-	if ( numbits != (sizeof(result) * 8) )
-		result &= ~(0xfffffffful << numbits);
-	
-	return result;
-}
-
-
-static inline int32_t dyn_get(unsigned char *in, uint32_t *bitPos, uint32_t m, uint32_t k)
-{
-    uint32_t	tempbits = *bitPos;
-    uint32_t		result;
-    uint32_t		pre = 0, v;
-    uint32_t		streamlong;
-
-	streamlong = read32bit( in + (tempbits >> 3) );
-    streamlong <<= (tempbits & 7);
-
-    /* find the number of bits in the prefix */ 
-    {
-        uint32_t	notI = ~streamlong;
-    	pre = lead( notI);
-    }
-
-    if(pre >= MAX_PREFIX_16)
-    {
-        pre = MAX_PREFIX_16;
-        tempbits += pre;
-        streamlong <<= pre;
-        result = get_next_fromlong(streamlong,MAX_DATATYPE_BITS_16);
-        tempbits += MAX_DATATYPE_BITS_16;
-
-    }
-    else
-    {
-        // all of the bits must fit within the long we have loaded
-        //Assert(pre+1+k <= 32);
-
-        tempbits += pre;
-        tempbits += 1;
-        streamlong <<= pre+1;
-        v = get_next_fromlong(streamlong, k);
-        tempbits += k;
-    
-        result = pre*m + v-1;
-
-        if(v<2) {
-            result -= (v-1);
-            tempbits -= 1;
-        }
-    }
-
-    *bitPos = tempbits;
-    return result;
-}
-
-
-static inline int32_t dyn_get_32bit( uint8_t * in, uint32_t * bitPos, int32_t m, int32_t k, int32_t maxbits )
-{
-	uint32_t	tempbits = *bitPos;
-	uint32_t		v;
-	uint32_t		streamlong;
-	uint32_t		result;
-	
-	streamlong = read32bit( in + (tempbits >> 3) );
-	streamlong <<= (tempbits & 7);
-
-	/* find the number of bits in the prefix */ 
-	{
-		uint32_t notI = ~streamlong;
-		result = lead( notI);
-	}
-	
-	if(result >= MAX_PREFIX_32)
-	{
-		result = getstreambits(in, tempbits+MAX_PREFIX_32, maxbits);
-		tempbits += MAX_PREFIX_32 + maxbits;
-	}
-	else
-	{		
-		/* all of the bits must fit within the long we have loaded*/
-		//Assert(k<=14);
-		//Assert(result<MAX_PREFIX_32);
-		//Assert(result+1+k <= 32);
-		
-		tempbits += result;
-		tempbits += 1;
-		
-		if (k != 1)
-		{
-			streamlong <<= result+1;
-			v = get_next_fromlong(streamlong, k);
-			tempbits += k;
-			tempbits -= 1;
-			result = result*m;
-			
-			if(v>=2)
-			{
-				result += (v-1);
-				tempbits += 1;
-			}
-		}
-	}
-
-	*bitPos = tempbits;
-
-	return result;
-}
-
-int32_t dyn_decomp( AGParamRecPtr params, BitBuffer * bitstream, int32_t * pc, int32_t numSamples, int32_t maxSize, uint32_t * outNumBits )
-{
-    uint8_t 		*in;
-    int32_t			*outPtr = pc;
-    uint32_t 	bitPos, startPos, maxPos;
-    uint32_t		j, m, k, n, c, mz;
-    int32_t			del, zmode;
-    uint32_t 	mb;
-    uint32_t	pb_local = params->pb;
-    uint32_t	kb_local = params->kb;
-    uint32_t	wb_local = params->wb;
-    int32_t				status;
-
-	RequireAction( (bitstream != nil) && (pc != nil) && (outNumBits != nil), return kALAC_ParamError; );
-	*outNumBits = 0;
-
-	in = bitstream->cur;
-	startPos = bitstream->bitIndex;
-	maxPos = bitstream->byteSize * 8;
-	bitPos = startPos;
-
-    mb = params->mb0;
-    zmode = 0;
-
-    c = 0;
-	status = ALAC_noErr;
-
-    while (c < numSamples)
-    {
-		// bail if we've run off the end of the buffer
-    	RequireAction( bitPos < maxPos, status = kALAC_ParamError; goto Exit; );
-
-        m = (mb)>>QBSHIFT;
-        k = lg3a(m);
-
-        k = arithmin(k, kb_local);
-        m = (1<<k)-1;
-        
-		n = dyn_get_32bit( in, &bitPos, m, k, maxSize );
-
-        // least significant bit is sign bit
-        {
-        	uint32_t	ndecode = n + zmode;
-            int32_t		multiplier = (- (ndecode&1));
-
-            multiplier |= 1;
-            del = ((ndecode+1) >> 1) * (multiplier);
-        }
-
-        *outPtr++ = del;
-
-        c++;
-
-        mb = pb_local*(n+zmode) + mb - ((pb_local*mb)>>QBSHIFT);
-
-		// update mean tracking
-		if (n > N_MAX_MEAN_CLAMP)
-			mb = N_MEAN_CLAMP_VAL;
-
-        zmode = 0;
-
-        if (((mb << MMULSHIFT) < QB) && (c < numSamples))
-        {
-            zmode = 1;
-            k = lead(mb) - BITOFF+((mb+MOFF)>>MDENSHIFT);
-            mz = ((1<<k)-1) & wb_local;
-
-            n = dyn_get(in, &bitPos, mz, k);
-
-            RequireAction(c+n <= numSamples, status = kALAC_ParamError; goto Exit; );
-
-            for(j=0; j < n; j++)
-            {
-                *outPtr++ = 0;
-                ++c;                    
-            }
-
-            if(n >= 65535)
-            	zmode = 0;
-
-            mb = 0;
-        }
-    }
-
-Exit:
-	*outNumBits = (bitPos - startPos);
-	BitBufferAdvance( bitstream, *outNumBits );
-	RequireAction( bitstream->cur <= bitstream->end, status = kALAC_ParamError; );
-
-    return status;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ag_enc.c b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ag_enc.c
deleted file mode 100644
index 2dfe99961..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/ag_enc.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		ag_enc.c
-	
-	Contains:   Adaptive Golomb encode routines.
-
-	Copyright:	(c) 2001-2011 Apple, Inc.
-*/
-
-#include "aglib.h"
-#include "ALACBitUtilities.h"
-#include "EndianPortable.h"
-#include "ALACAudioTypes.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if __GNUC__ && TARGET_OS_MAC
-	#if __POWERPC__
-		#include <ppc_intrinsics.h>
-	#else
-		#include <libkern/OSByteOrder.h>
-	#endif
-#endif
-
-#define CODE_TO_LONG_MAXBITS	32
-#define N_MAX_MEAN_CLAMP		0xffff
-#define N_MEAN_CLAMP_VAL		0xffff
-#define REPORT_VAL  40
-
-#if __GNUC__
-#define ALWAYS_INLINE		__attribute__((always_inline))
-#else
-#define ALWAYS_INLINE
-#endif
-
-
-/*	And on the subject of the CodeWarrior x86 compiler and inlining, I reworked a lot of this
-	to help the compiler out.   In many cases this required manual inlining or a macro.  Sorry
-	if it is ugly but the performance gains are well worth it.
-	- WSK 5/19/04
-*/
-
-// note: implementing this with some kind of "count leading zeros" assembly is a big performance win
-static inline int32_t lead( int32_t m )
-{
-	long j;
-	unsigned long c = (1ul << 31);
-
-	for(j=0; j < 32; j++)
-	{
-		if((c & m) != 0)
-			break;
-		c >>= 1;
-	}
-	return (j);
-}
-
-#define arithmin(a, b) ((a) < (b) ? (a) : (b))
-
-static inline int32_t ALWAYS_INLINE lg3a( int32_t x)
-{
-    int32_t result;
-
-    x += 3;
-    result = lead(x);
-
-    return 31 - result;
-}
-
-static inline int32_t ALWAYS_INLINE abs_func( int32_t a )
-{
-	// note: the CW PPC intrinsic __abs() turns into these instructions so no need to try and use it
-	int32_t isneg  = a >> 31;
-	int32_t xorval = a ^ isneg;
-	int32_t result = xorval-isneg;
-	
-	return result;	
-}
-
-static inline uint32_t ALWAYS_INLINE read32bit( uint8_t * buffer )
-{
-	// embedded CPUs typically can't read unaligned 32-bit words so just read the bytes
-	uint32_t		value;
-	
-	value = ((uint32_t)buffer[0] << 24) | ((uint32_t)buffer[1] << 16) |
-			 ((uint32_t)buffer[2] << 8) | (uint32_t)buffer[3];
-	return value;
-}
-
-#if PRAGMA_MARK
-#pragma mark -
-#endif
-
-static inline int32_t dyn_code(int32_t m, int32_t k, int32_t n, uint32_t *outNumBits)
-{
-	uint32_t 	div, mod, de;
-	uint32_t	numBits;
-	uint32_t	value;
-
-	//Assert( n >= 0 );
-
-	div = n/m;
-
-	if(div >= MAX_PREFIX_16)
-	{
-		numBits = MAX_PREFIX_16 + MAX_DATATYPE_BITS_16;
-		value = (((1<<MAX_PREFIX_16)-1)<<MAX_DATATYPE_BITS_16) + n;
-	}
-	else
-	{
-		mod = n%m;
-		de = (mod == 0);
-		numBits = div + k + 1 - de;
-		value = (((1<<div)-1)<<(numBits-div)) + mod + 1 - de;
-
-		// if coding this way is bigger than doing escape, then do escape
-		if (numBits > MAX_PREFIX_16 + MAX_DATATYPE_BITS_16)
-		{
-		    numBits = MAX_PREFIX_16 + MAX_DATATYPE_BITS_16;
-		    value = (((1<<MAX_PREFIX_16)-1)<<MAX_DATATYPE_BITS_16) + n;            
-		}
-	}
-	
-	*outNumBits = numBits;
-
-	return (int32_t) value;
-}
-
-
-static inline int32_t dyn_code_32bit(int32_t maxbits, uint32_t m, uint32_t k, uint32_t n, uint32_t *outNumBits, uint32_t *outValue, uint32_t *overflow, uint32_t *overflowbits)
-{
-	uint32_t 	div, mod, de;
-	uint32_t	numBits;
-	uint32_t	value;
-	int32_t			didOverflow = 0;
-
-	div = n/m;
-
-	if (div < MAX_PREFIX_32)
-	{
-		mod = n - (m * div);
-
-		de = (mod == 0);
-		numBits = div + k + 1 - de;
-		value = (((1<<div)-1)<<(numBits-div)) + mod + 1 - de;		
-		if (numBits > 25)
-			goto codeasescape;
-	}
-	else
-	{
-codeasescape:
-		numBits = MAX_PREFIX_32;
-		value = (((1<<MAX_PREFIX_32)-1));
-		*overflow = n;
-		*overflowbits = maxbits;
-		didOverflow = 1;
-	}
-	
-	*outNumBits = numBits;
-	*outValue = value;
-
-	return didOverflow;
-}
-
-
-static inline void ALWAYS_INLINE dyn_jam_noDeref(unsigned char *out, uint32_t bitPos, uint32_t numBits, uint32_t value)
-{
-	uint32_t	*i = (uint32_t *)(out + (bitPos >> 3));
-	uint32_t	mask;
-	uint32_t	curr;
-	uint32_t	shift;
-
-	//Assert( numBits <= 32 );
-
-	curr = *i;
-	curr = Swap32NtoB( curr );
-
-	shift = 32 - (bitPos & 7) - numBits;
-
-	mask = ~0u >> (32 - numBits);		// mask must be created in two steps to avoid compiler sequencing ambiguity
-	mask <<= shift;
-
-	value  = (value << shift) & mask;
-	value |= curr & ~mask;
-	
-	*i = Swap32BtoN( value );
-}
-
-
-static inline void ALWAYS_INLINE dyn_jam_noDeref_large(unsigned char *out, uint32_t bitPos, uint32_t numBits, uint32_t value)
-{
-	uint32_t *	i = (uint32_t *)(out + (bitPos>>3));
-	uint32_t	w;
-	uint32_t	curr;
-	uint32_t	mask;
-	int32_t			shiftvalue = (32 - (bitPos&7) - numBits);
-	
-	//Assert(numBits <= 32);
-
-	curr = *i;
-	curr = Swap32NtoB( curr );
-
-	if (shiftvalue < 0)
-	{
-		uint8_t 	tailbyte;
-		uint8_t 	*tailptr;
-
-		w = value >> -shiftvalue;
-		mask = ~0u >> -shiftvalue;
-		w |= (curr & ~mask);
-
-		tailptr = ((uint8_t *)i) + 4;
-		tailbyte = (value << ((8+shiftvalue))) & 0xff;
-		*tailptr = (uint8_t)tailbyte;
-	}
-	else
-	{
-		mask = ~0u >> (32 - numBits);
-		mask <<= shiftvalue;			// mask must be created in two steps to avoid compiler sequencing ambiguity
-
-		w  = (value << shiftvalue) & mask;
-		w |= curr & ~mask;
-	}
-	
-	*i = Swap32BtoN( w );
-}
-
-
-int32_t dyn_comp( AGParamRecPtr params, int32_t * pc, BitBuffer * bitstream, int32_t numSamples, int32_t bitSize, uint32_t * outNumBits )
-{
-    unsigned char *		out;
-    uint32_t		bitPos, startPos;
-    uint32_t			m, k, n, c, mz, nz;
-    uint32_t		numBits;
-    uint32_t			value;
-    int32_t				del, zmode;
-	uint32_t		overflow, overflowbits;
-    int32_t					status;
-
-    // shadow the variables in params so there's not the dereferencing overhead
-    uint32_t		mb, pb, kb, wb;
-    int32_t					rowPos = 0;
-    int32_t					rowSize = params->sw;
-    int32_t					rowJump = (params->fw) - rowSize;
-    int32_t *			inPtr = pc;
-
-	*outNumBits = 0;
-	RequireAction( (bitSize >= 1) && (bitSize <= 32), return kALAC_ParamError; );
-
-	out = bitstream->cur;
-	startPos = bitstream->bitIndex;
-    bitPos = startPos;
-
-    mb = params->mb = params->mb0;
-    pb = params->pb;
-    kb = params->kb;
-    wb = params->wb;
-    zmode = 0;
-
-    c=0;
-	status = ALAC_noErr;
-
-    while (c < numSamples)
-    {
-        m  = mb >> QBSHIFT;
-        k = lg3a(m);
-        if ( k > kb)
-        {
-        	k = kb;
-        }
-        m = (1<<k)-1;
-
-        del = *inPtr++;
-        rowPos++;
-
-        n = (abs_func(del) << 1) - ((del >> 31) & 1) - zmode;
-		//Assert( 32-lead(n) <= bitSize );
-
-		if ( dyn_code_32bit(bitSize, m, k, n, &numBits, &value, &overflow, &overflowbits) )
-		{
-			dyn_jam_noDeref(out, bitPos, numBits, value);
-			bitPos += numBits;			
-			dyn_jam_noDeref_large(out, bitPos, overflowbits, overflow);			
-			bitPos += overflowbits;
-		}
-		else
-		{
-			dyn_jam_noDeref(out, bitPos, numBits, value);
-			bitPos += numBits;
-		}
-      
-        c++;
-        if ( rowPos >= rowSize)
-        {
-        	rowPos = 0;
-        	inPtr += rowJump;
-        }
-
-        mb = pb * (n + zmode) + mb - ((pb *mb)>>QBSHIFT);
-
-		// update mean tracking if it's overflowed
-		if (n > N_MAX_MEAN_CLAMP)
-			mb = N_MEAN_CLAMP_VAL;
-
-        zmode = 0;
-
-        RequireAction(c <= numSamples, status = kALAC_ParamError; goto Exit; );
-
-        if (((mb << MMULSHIFT) < QB) && (c < numSamples))
-        {
-            zmode = 1;
-            nz = 0;
-
-            while(c<numSamples && *inPtr == 0)
-            {
-            	/* Take care of wrap-around globals. */
-                ++inPtr;
-                ++nz;
-                ++c;
-                if ( ++rowPos >= rowSize)
-                {
-                	rowPos = 0;
-                	inPtr += rowJump;
-                }
-
-                if(nz >= 65535)
-                {
-                	zmode = 0;
-                	break;
-                }
-            }
-
-            k = lead(mb) - BITOFF+((mb+MOFF)>>MDENSHIFT);
-            mz = ((1<<k)-1) & wb;
-
-            value = dyn_code(mz, k, nz, &numBits);
-            dyn_jam_noDeref(out, bitPos, numBits, value);
-            bitPos += numBits;
-
-            mb = 0;
-        }
-    }
-
-    *outNumBits = (bitPos - startPos);
-	BitBufferAdvance( bitstream, *outNumBits );
-
-Exit:
-	return status;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/aglib.h b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/aglib.h
deleted file mode 100644
index dc4ff8f2d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/aglib.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		aglib.h
-	
-	Copyright:	(C) 2001-2011 Apple, Inc.
-*/
-
-#ifndef AGLIB_H
-#define AGLIB_H
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define QBSHIFT 9
-#define QB (1<<QBSHIFT)
-#define PB0 40
-#define MB0 10
-#define KB0 14
-#define MAX_RUN_DEFAULT 255
-
-#define MMULSHIFT 2
-#define MDENSHIFT (QBSHIFT - MMULSHIFT - 1)
-#define MOFF ((1<<(MDENSHIFT-2)))
-
-#define BITOFF 24
-
-/* Max. prefix of 1's. */
-#define MAX_PREFIX_16			9
-#define MAX_PREFIX_TOLONG_16	15
-#define MAX_PREFIX_32			9
-
-/* Max. bits in 16-bit data type */
-#define MAX_DATATYPE_BITS_16	16
-
-typedef struct AGParamRec
-{
-    uint32_t mb, mb0, pb, kb, wb, qb;
-    uint32_t fw, sw;
-
-    uint32_t maxrun;
-
-    // fw = 1, sw = 1;
-
-} AGParamRec, *AGParamRecPtr;
-
-struct BitBuffer;
-
-void	set_standard_ag_params(AGParamRecPtr params, uint32_t fullwidth, uint32_t sectorwidth);
-void	set_ag_params(AGParamRecPtr params, uint32_t m, uint32_t p, uint32_t k, uint32_t f, uint32_t s, uint32_t maxrun);
-
-int32_t		dyn_comp(AGParamRecPtr params, int32_t * pc, struct BitBuffer * bitstream, int32_t numSamples, int32_t bitSize, uint32_t * outNumBits);
-int32_t		dyn_decomp(AGParamRecPtr params, struct BitBuffer * bitstream, int32_t * pc, int32_t numSamples, int32_t maxSize, uint32_t * outNumBits);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //#ifndef AGLIB_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/dp_dec.c b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/dp_dec.c
deleted file mode 100644
index d1530256b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/dp_dec.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		dp_dec.c
-
-	Contains:	Dynamic Predictor decode routines
-
-	Copyright:	(c) 2001-2011 Apple, Inc.
-*/
-
-
-#include "dplib.h"
-#include <string.h>
-
-#if __GNUC__
-#define ALWAYS_INLINE		__attribute__((always_inline))
-#else
-#define ALWAYS_INLINE
-#endif
-
-#if TARGET_CPU_PPC && (__MWERKS__ >= 0x3200)
-// align loops to a 16 byte boundary to make the G5 happy
-#pragma function_align 16
-#define LOOP_ALIGN			asm { align 16 }
-#else
-#define LOOP_ALIGN
-#endif
-
-static inline int32_t ALWAYS_INLINE sign_of_int( int32_t i )
-{
-    int32_t negishift;
-	
-    negishift = ((uint32_t)-i) >> 31;
-    return negishift | (i >> 31);
-}
-
-void unpc_block( int32_t * pc1, int32_t * out, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift )
-{
-	register int16_t	a0, a1, a2, a3;
-	register int32_t	b0, b1, b2, b3;
-	int32_t					j, k, lim;
-	int32_t				sum1, sg, sgn, top, dd;
-	int32_t *			pout;
-	int32_t				del, del0;
-	uint32_t			chanshift = 32 - chanbits;
-	int32_t				denhalf = 1<<(denshift-1);
-
-	out[0] = pc1[0];
-	if ( numactive == 0 )
-	{
-		// just copy if numactive == 0 (but don't bother if in/out pointers the same)
-		if ( (num > 1)  && (pc1 != out) )
-			memcpy( &out[1], &pc1[1], (num - 1) * sizeof(int32_t) );
-		return;
-	}
-	if ( numactive == 31 )
-	{
-		// short-circuit if numactive == 31
-		int32_t		prev;
-		
-		/*	this code is written such that the in/out buffers can be the same
-			to conserve buffer space on embedded devices like the iPod
-			
-			(original code)
-			for ( j = 1; j < num; j++ )
-				del = pc1[j] + out[j-1];
-				out[j] = (del << chanshift) >> chanshift;
-		*/
-		prev = out[0];
-		for ( j = 1; j < num; j++ )
-		{
-			del = pc1[j] + prev;
-			prev = (del << chanshift) >> chanshift;
-			out[j] = prev;
-		}
-		return;
-	}
-
-	for ( j = 1; j <= numactive; j++ )
-	{
-		del = pc1[j] + out[j-1];
-		out[j] = (del << chanshift) >> chanshift;
-	}
-
-	lim = numactive + 1;
-
-	if ( numactive == 4 )
-	{
-		// optimization for numactive == 4
-		register int16_t	a0, a1, a2, a3;
-		register int32_t	b0, b1, b2, b3;
-
-		a0 = coefs[0];
-		a1 = coefs[1];
-		a2 = coefs[2];
-		a3 = coefs[3];
-
-		for ( j = lim; j < num; j++ )
-		{
-			LOOP_ALIGN
-
-			top = out[j - lim];
-			pout = out + j - 1;
-
-			b0 = top - pout[0];
-			b1 = top - pout[-1];
-			b2 = top - pout[-2];
-			b3 = top - pout[-3];
-
-			sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3) >> denshift;
-
-			del = pc1[j];
-			del0 = del;
-			sg = sign_of_int(del);
-			del += top + sum1;
-
-			out[j] = (del << chanshift) >> chanshift;
-
-			if ( sg > 0 )
-			{
-				sgn = sign_of_int( b3 );
-				a3 -= sgn;
-				del0 -= (4 - 3) * ((sgn * b3) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b2 );
-				a2 -= sgn;
-				del0 -= (4 - 2) * ((sgn * b2) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b1 );
-				a1 -= sgn;
-				del0 -= (4 - 1) * ((sgn * b1) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-
-				a0 -= sign_of_int( b0 );
-			}
-			else if ( sg < 0 )
-			{
-				// note: to avoid unnecessary negations, we flip the value of "sgn"
-				sgn = -sign_of_int( b3 );
-				a3 -= sgn;
-				del0 -= (4 - 3) * ((sgn * b3) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b2 );
-				a2 -= sgn;
-				del0 -= (4 - 2) * ((sgn * b2) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b1 );
-				a1 -= sgn;
-				del0 -= (4 - 1) * ((sgn * b1) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-
-				a0 += sign_of_int( b0 );
-			}
-		}
-
-		coefs[0] = a0;
-		coefs[1] = a1;
-		coefs[2] = a2;
-		coefs[3] = a3;
-	}
-	else if ( numactive == 8 )
-	{
-		register int16_t	a4, a5, a6, a7;
-		register int32_t	b4, b5, b6, b7;
-
-		// optimization for numactive == 8
-		a0 = coefs[0];
-		a1 = coefs[1];
-		a2 = coefs[2];
-		a3 = coefs[3];
-		a4 = coefs[4];
-		a5 = coefs[5];
-		a6 = coefs[6];
-		a7 = coefs[7];
-
-		for ( j = lim; j < num; j++ )
-		{
-			LOOP_ALIGN
-
-			top = out[j - lim];
-			pout = out + j - 1;
-
-			b0 = top - (*pout--);
-			b1 = top - (*pout--);
-			b2 = top - (*pout--);
-			b3 = top - (*pout--);
-			b4 = top - (*pout--);
-			b5 = top - (*pout--);
-			b6 = top - (*pout--);
-			b7 = top - (*pout);
-			pout += 8;
-
-			sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3
-					- a4 * b4 - a5 * b5 - a6 * b6 - a7 * b7) >> denshift;
-
-			del = pc1[j];
-			del0 = del;
-			sg = sign_of_int(del);
-			del += top + sum1;
-
-			out[j] = (del << chanshift) >> chanshift;
-
-			if ( sg > 0 )
-			{
-				sgn = sign_of_int( b7 );
-				a7 -= sgn;
-				del0 -= 1 * ((sgn * b7) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b6 );
-				a6 -= sgn;
-				del0 -= 2 * ((sgn * b6) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b5 );
-				a5 -= sgn;
-				del0 -= 3 * ((sgn * b5) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-
-				sgn = sign_of_int( b4 );
-				a4 -= sgn;
-				del0 -= 4 * ((sgn * b4) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b3 );
-				a3 -= sgn;
-				del0 -= 5 * ((sgn * b3) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b2 );
-				a2 -= sgn;
-				del0 -= 6 * ((sgn * b2) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b1 );
-				a1 -= sgn;
-				del0 -= 7 * ((sgn * b1) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-
-				a0 -= sign_of_int( b0 );
-			}
-			else if ( sg < 0 )
-			{
-				// note: to avoid unnecessary negations, we flip the value of "sgn"
-				sgn = -sign_of_int( b7 );
-				a7 -= sgn;
-				del0 -= 1 * ((sgn * b7) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b6 );
-				a6 -= sgn;
-				del0 -= 2 * ((sgn * b6) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b5 );
-				a5 -= sgn;
-				del0 -= 3 * ((sgn * b5) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-
-				sgn = -sign_of_int( b4 );
-				a4 -= sgn;
-				del0 -= 4 * ((sgn * b4) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b3 );
-				a3 -= sgn;
-				del0 -= 5 * ((sgn * b3) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b2 );
-				a2 -= sgn;
-				del0 -= 6 * ((sgn * b2) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b1 );
-				a1 -= sgn;
-				del0 -= 7 * ((sgn * b1) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-
-				a0 += sign_of_int( b0 );
-			}
-		}
-
-		coefs[0] = a0;
-		coefs[1] = a1;
-		coefs[2] = a2;
-		coefs[3] = a3;
-		coefs[4] = a4;
-		coefs[5] = a5;
-		coefs[6] = a6;
-		coefs[7] = a7;
-	}
-	else
-	{
-		// general case
-		for ( j = lim; j < num; j++ )
-		{
-			LOOP_ALIGN
-
-			sum1 = 0;
-			pout = out + j - 1;
-			top = out[j-lim];
-
-			for ( k = 0; k < numactive; k++ )
-				sum1 += coefs[k] * (pout[-k] - top);
-
-			del = pc1[j];
-			del0 = del;
-			sg = sign_of_int( del );
-			del += top + ((sum1 + denhalf) >> denshift);
-			out[j] = (del << chanshift) >> chanshift;
-
-			if ( sg > 0 )
-			{
-				for ( k = (numactive - 1); k >= 0; k-- )
-				{
-					dd = top - pout[-k];
-					sgn = sign_of_int( dd );
-					coefs[k] -= sgn;
-					del0 -= (numactive - k) * ((sgn * dd) >> denshift);
-					if ( del0 <= 0 )
-						break;
-				}
-			}
-			else if ( sg < 0 )
-			{
-				for ( k = (numactive - 1); k >= 0; k-- )
-				{
-					dd = top - pout[-k];
-					sgn = sign_of_int( dd );
-					coefs[k] += sgn;
-					del0 -= (numactive - k) * ((-sgn * dd) >> denshift);
-					if ( del0 >= 0 )
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/dp_enc.c b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/dp_enc.c
deleted file mode 100644
index 869104c7e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/dp_enc.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		dp_enc.c
-
-	Contains:	Dynamic Predictor encode routines
-
-	Copyright:	(c) 2001-2011 Apple, Inc.
-*/
-
-#include "dplib.h"
-#include <string.h>
-
-#if __GNUC__
-#define ALWAYS_INLINE		__attribute__((always_inline))
-#else
-#define ALWAYS_INLINE
-#endif
-
-#if TARGET_CPU_PPC && (__MWERKS__ >= 0x3200)
-// align loops to a 16 byte boundary to make the G5 happy
-#pragma function_align 16
-#define LOOP_ALIGN			asm { align 16 }
-#else
-#define LOOP_ALIGN
-#endif
-
-void init_coefs( int16_t * coefs, uint32_t denshift, int32_t numPairs )
-{
-	int32_t		k;
-	int32_t		den = 1 << denshift;
-
-	coefs[0] = (AINIT * den) >> 4;
-	coefs[1] = (BINIT * den) >> 4;
-	coefs[2] = (CINIT * den) >> 4;
-	for ( k = 3; k < numPairs; k++ )
-		coefs[k]  = 0;
-}
-
-void copy_coefs( int16_t * srcCoefs, int16_t * dstCoefs, int32_t numPairs )
-{
-	int32_t k;
-
-	for ( k = 0; k < numPairs; k++ )
-		dstCoefs[k] = srcCoefs[k];
-}
-
-static inline int32_t ALWAYS_INLINE sign_of_int( int32_t i )
-{
-    int32_t negishift;
-	
-    negishift = ((uint32_t)-i) >> 31;
-    return negishift | (i >> 31);
-}
-
-void pc_block( int32_t * in, int32_t * pc1, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift )
-{
-	register int16_t	a0, a1, a2, a3;
-	register int32_t	b0, b1, b2, b3;
-	int32_t					j, k, lim;
-	int32_t *			pin;
-	int32_t				sum1, dd;
-	int32_t				sg, sgn;
-	int32_t				top;
-	int32_t				del, del0;
-	uint32_t			chanshift = 32 - chanbits;
-	int32_t				denhalf = 1 << (denshift - 1);
-
-	pc1[0] = in[0];
-	if ( numactive == 0 )
-	{
-		// just copy if numactive == 0 (but don't bother if in/out pointers the same)
-		if ( (num > 1) && (in != pc1) )
-			memcpy( &pc1[1], &in[1], (num - 1) * sizeof(int32_t) );
-		return;
-	}
-	if ( numactive == 31 )
-	{
-		// short-circuit if numactive == 31
-		for( j = 1; j < num; j++ )
-		{
-			del = in[j] - in[j-1];
-			pc1[j] = (del << chanshift) >> chanshift;
-		}
-		return;
-	}
-	
-	for ( j = 1; j <= numactive; j++ )
-	{
-		del = in[j] - in[j-1];
-		pc1[j] = (del << chanshift) >> chanshift;
-	}
-
-	lim = numactive + 1;
-
-	if ( numactive == 4 )
-	{
-		// optimization for numactive == 4
-		a0 = coefs[0];
-		a1 = coefs[1];
-		a2 = coefs[2];
-		a3 = coefs[3];
-
-		for ( j = lim; j < num; j++ )
-		{
-			LOOP_ALIGN
-
-			top = in[j - lim];
-			pin = in + j - 1;
-
-			b0 = top - pin[0];
-			b1 = top - pin[-1];
-			b2 = top - pin[-2];
-			b3 = top - pin[-3];
-
-			sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3) >> denshift;
-
-			del = in[j] - top - sum1;
-			del = (del << chanshift) >> chanshift;
-			pc1[j] = del;	     
-			del0 = del;
-
-			sg = sign_of_int(del);
-			if ( sg > 0 )
-			{
-				sgn = sign_of_int( b3 );
-				a3 -= sgn;
-				del0 -= (4 - 3) * ((sgn * b3) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b2 );
-				a2 -= sgn;
-				del0 -= (4 - 2) * ((sgn * b2) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b1 );
-				a1 -= sgn;
-				del0 -= (4 - 1) * ((sgn * b1) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-
-				a0 -= sign_of_int( b0 );
-			}
-			else if ( sg < 0 )
-			{
-				// note: to avoid unnecessary negations, we flip the value of "sgn"
-				sgn = -sign_of_int( b3 );
-				a3 -= sgn;
-				del0 -= (4 - 3) * ((sgn * b3) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b2 );
-				a2 -= sgn;
-				del0 -= (4 - 2) * ((sgn * b2) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b1 );
-				a1 -= sgn;
-				del0 -= (4 - 1) * ((sgn * b1) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-
-				a0 += sign_of_int( b0 );
-			}
-		}
-
-		coefs[0] = a0;
-		coefs[1] = a1;
-		coefs[2] = a2;
-		coefs[3] = a3;
-	}
-	else if ( numactive == 8 )
-	{
-		// optimization for numactive == 8
-		register int16_t	a4, a5, a6, a7;
-		register int32_t	b4, b5, b6, b7;
-
-		a0 = coefs[0];
-		a1 = coefs[1];
-		a2 = coefs[2];
-		a3 = coefs[3];
-		a4 = coefs[4];
-		a5 = coefs[5];
-		a6 = coefs[6];
-		a7 = coefs[7];
-
-		for ( j = lim; j < num; j++ )
-		{
-			LOOP_ALIGN
-
-			top = in[j - lim];
-			pin = in + j - 1;
-
-			b0 = top - (*pin--);
-			b1 = top - (*pin--);
-			b2 = top - (*pin--);
-			b3 = top - (*pin--);
-			b4 = top - (*pin--);
-			b5 = top - (*pin--);
-			b6 = top - (*pin--);
-			b7 = top - (*pin);
-			pin += 8;
-
-			sum1 = (denhalf - a0 * b0 - a1 * b1 - a2 * b2 - a3 * b3
-					- a4 * b4 - a5 * b5 - a6 * b6 - a7 * b7) >> denshift;
-
-			del = in[j] - top - sum1;
-			del = (del << chanshift) >> chanshift;
-			pc1[j] = del;	     
-			del0 = del;
-
-			sg = sign_of_int(del);
-			if ( sg > 0 )
-			{
-				sgn = sign_of_int( b7 );
-				a7 -= sgn;
-				del0 -= 1 * ((sgn * b7) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b6 );
-				a6 -= sgn;
-				del0 -= 2 * ((sgn * b6) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b5 );
-				a5 -= sgn;
-				del0 -= 3 * ((sgn * b5) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-
-				sgn = sign_of_int( b4 );
-				a4 -= sgn;
-				del0 -= 4 * ((sgn * b4) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b3 );
-				a3 -= sgn;
-				del0 -= 5 * ((sgn * b3) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b2 );
-				a2 -= sgn;
-				del0 -= 6 * ((sgn * b2) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-				
-				sgn = sign_of_int( b1 );
-				a1 -= sgn;
-				del0 -= 7 * ((sgn * b1) >> denshift);
-				if ( del0 <= 0 )
-					continue;
-
-				a0 -= sign_of_int( b0 );
-			}
-			else if ( sg < 0 )
-			{
-				// note: to avoid unnecessary negations, we flip the value of "sgn"
-				sgn = -sign_of_int( b7 );
-				a7 -= sgn;
-				del0 -= 1 * ((sgn * b7) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b6 );
-				a6 -= sgn;
-				del0 -= 2 * ((sgn * b6) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b5 );
-				a5 -= sgn;
-				del0 -= 3 * ((sgn * b5) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-
-				sgn = -sign_of_int( b4 );
-				a4 -= sgn;
-				del0 -= 4 * ((sgn * b4) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b3 );
-				a3 -= sgn;
-				del0 -= 5 * ((sgn * b3) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b2 );
-				a2 -= sgn;
-				del0 -= 6 * ((sgn * b2) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-				
-				sgn = -sign_of_int( b1 );
-				a1 -= sgn;
-				del0 -= 7 * ((sgn * b1) >> denshift);
-				if ( del0 >= 0 )
-					continue;
-
-				a0 += sign_of_int( b0 );
-			}
-		}
-
-		coefs[0] = a0;
-		coefs[1] = a1;
-		coefs[2] = a2;
-		coefs[3] = a3;
-		coefs[4] = a4;
-		coefs[5] = a5;
-		coefs[6] = a6;
-		coefs[7] = a7;
-	}
-	else
-	{
-//pc_block_general:
-		// general case
-		for ( j = lim; j < num; j++ )
-		{
-			LOOP_ALIGN
-
-			top = in[j - lim];
-			pin = in + j - 1;
-
-			sum1 = 0;
-			for ( k = 0; k < numactive; k++ )
-				sum1 -= coefs[k] * (top - pin[-k]);
-		
-			del = in[j] - top - ((sum1 + denhalf) >> denshift);
-			del = (del << chanshift) >> chanshift;
-			pc1[j] = del;
-			del0 = del;
-
-			sg = sign_of_int( del );
-			if ( sg > 0 )
-			{
-				for ( k = (numactive - 1); k >= 0; k-- )
-				{
-					dd = top - pin[-k];
-					sgn = sign_of_int( dd );
-					coefs[k] -= sgn;
-					del0 -= (numactive - k) * ((sgn * dd) >> denshift);
-					if ( del0 <= 0 )
-						break;
-				}
-			}
-			else if ( sg < 0 )
-			{
-				for ( k = (numactive - 1); k >= 0; k-- )
-				{
-					dd = top - pin[-k];
-					sgn = sign_of_int( dd );
-					coefs[k] += sgn;
-					del0 -= (numactive - k) * ((-sgn * dd) >> denshift);
-					if ( del0 >= 0 )
-						break;
-				}
-			}
-		}
-	}
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/dplib.h b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/dplib.h
deleted file mode 100644
index 9a1ea5b28..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/dplib.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		dplib.h
-	
-	Contains:	Dynamic Predictor routines
-
-	Copyright:	Copyright (C) 2001-2011 Apple, Inc.
-*/
-
-#ifndef __DPLIB_H__
-#define __DPLIB_H__
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// defines
-
-#define DENSHIFT_MAX  15
-#define DENSHIFT_DEFAULT 9
-#define AINIT 38
-#define BINIT (-29)
-#define CINIT (-2)
-#define NUMCOEPAIRS 16
-
-// prototypes
-
-void init_coefs( int16_t * coefs, uint32_t denshift, int32_t numPairs );
-void copy_coefs( int16_t * srcCoefs, int16_t * dstCoefs, int32_t numPairs );
-
-// NOTE: these routines read at least "numactive" samples so the i/o buffers must be at least that big
-
-void pc_block( int32_t * in, int32_t * pc, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift );
-void unpc_block( int32_t * pc, int32_t * out, int32_t num, int16_t * coefs, int32_t numactive, uint32_t chanbits, uint32_t denshift );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* __DPLIB_H__ */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/matrix_dec.c b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/matrix_dec.c
deleted file mode 100644
index b1889b92b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/matrix_dec.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		matrix_dec.c
-	
-	Contains:	ALAC mixing/matrixing decode routines.
-
-	Copyright:	(c) 2004-2011 Apple, Inc.
-*/
-
-#include "matrixlib.h"
-#include "ALACAudioTypes.h"
-
-// up to 24-bit "offset" macros for the individual bytes of a 20/24-bit word
-#if TARGET_RT_BIG_ENDIAN
-	#define LBYTE	2
-	#define MBYTE	1
-	#define HBYTE	0
-#else
-	#define LBYTE	0
-	#define MBYTE	1
-	#define HBYTE	2
-#endif
-
-/*
-    There is no plain middle-side option; instead there are various mixing
-    modes including middle-side, each lossless, as embodied in the mix()
-    and unmix() functions.  These functions exploit a generalized middle-side
-    transformation:
-    
-    u := [(rL + (m-r)R)/m];
-    v := L - R;
-    
-    where [ ] denotes integer floor.  The (lossless) inverse is
-    
-    L = u + v - [rV/m];
-    R = L - v;
-*/
-
-// 16-bit routines
-
-void unmix16( int32_t * u, int32_t * v, int16_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres )
-{
-	int16_t *	op = out;
-	int32_t 		j;
-
-	if ( mixres != 0 )
-	{
-		/* matrixed stereo */
-		for ( j = 0; j < numSamples; j++ )
-		{
-			int32_t		l, r;
-
-			l = u[j] + v[j] - ((mixres * v[j]) >> mixbits);
-			r = l - v[j];
-
-			op[0] = (int16_t) l;
-			op[1] = (int16_t) r;
-			op += stride;
-		} 
-	}
-	else
-	{
-		/* Conventional separated stereo. */
-		for ( j = 0; j < numSamples; j++ )
-		{
-			op[0] = (int16_t) u[j];
-			op[1] = (int16_t) v[j];
-			op += stride;
-		}
-	}
-}
-
-// 20-bit routines
-// - the 20 bits of data are left-justified in 3 bytes of storage but right-aligned for input/output predictor buffers
-
-void unmix20( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres )
-{
-	uint8_t *	op = out;
-	int32_t 		j;
-
-	if ( mixres != 0 )
-	{
-		/* matrixed stereo */
-		for ( j = 0; j < numSamples; j++ )
-		{
-			int32_t		l, r;
-
-			l = u[j] + v[j] - ((mixres * v[j]) >> mixbits);
-			r = l - v[j];
-
-			l <<= 4;
-			r <<= 4;
-
-			op[HBYTE] = (uint8_t)((l >> 16) & 0xffu);
-			op[MBYTE] = (uint8_t)((l >>  8) & 0xffu);
-			op[LBYTE] = (uint8_t)((l >>  0) & 0xffu);
-			op += 3;
-
-			op[HBYTE] = (uint8_t)((r >> 16) & 0xffu);
-			op[MBYTE] = (uint8_t)((r >>  8) & 0xffu);
-			op[LBYTE] = (uint8_t)((r >>  0) & 0xffu);
-
-			op += (stride - 1) * 3;
-		}
-	}
-	else 
-	{
-		/* Conventional separated stereo. */
-		for ( j = 0; j < numSamples; j++ )
-		{
-			int32_t		val;
-
-			val = u[j] << 4;
-			op[HBYTE] = (uint8_t)((val >> 16) & 0xffu);
-			op[MBYTE] = (uint8_t)((val >>  8) & 0xffu);
-			op[LBYTE] = (uint8_t)((val >>  0) & 0xffu);
-			op += 3;
-
-			val = v[j] << 4;
-			op[HBYTE] = (uint8_t)((val >> 16) & 0xffu);
-			op[MBYTE] = (uint8_t)((val >>  8) & 0xffu);
-			op[LBYTE] = (uint8_t)((val >>  0) & 0xffu);
-
-			op += (stride - 1) * 3;
-		}
-	}
-}
-
-// 24-bit routines
-// - the 24 bits of data are right-justified in the input/output predictor buffers
-
-void unmix24( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t numSamples,
-				int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted )
-{
-	uint8_t *	op = out;
-	int32_t			shift = bytesShifted * 8;
-	int32_t		l, r;
-	int32_t 		j, k;
-
-	if ( mixres != 0 )
-	{
-		/* matrixed stereo */
-		if ( bytesShifted != 0 )
-		{
-			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
-			{
-				l = u[j] + v[j] - ((mixres * v[j]) >> mixbits);
-				r = l - v[j];
-
-				l = (l << shift) | (uint32_t) shiftUV[k + 0];
-				r = (r << shift) | (uint32_t) shiftUV[k + 1];
-
-				op[HBYTE] = (uint8_t)((l >> 16) & 0xffu);
-				op[MBYTE] = (uint8_t)((l >>  8) & 0xffu);
-				op[LBYTE] = (uint8_t)((l >>  0) & 0xffu);
-				op += 3;
-
-				op[HBYTE] = (uint8_t)((r >> 16) & 0xffu);
-				op[MBYTE] = (uint8_t)((r >>  8) & 0xffu);
-				op[LBYTE] = (uint8_t)((r >>  0) & 0xffu);
-
-				op += (stride - 1) * 3;
-			}
-		}
-		else
-		{
-			for ( j = 0; j < numSamples; j++ )
-			{
-				l = u[j] + v[j] - ((mixres * v[j]) >> mixbits);
-				r = l - v[j];
-
-				op[HBYTE] = (uint8_t)((l >> 16) & 0xffu);
-				op[MBYTE] = (uint8_t)((l >>  8) & 0xffu);
-				op[LBYTE] = (uint8_t)((l >>  0) & 0xffu);
-				op += 3;
-
-				op[HBYTE] = (uint8_t)((r >> 16) & 0xffu);
-				op[MBYTE] = (uint8_t)((r >>  8) & 0xffu);
-				op[LBYTE] = (uint8_t)((r >>  0) & 0xffu);
-
-				op += (stride - 1) * 3;
-			}
-		}
-	}
-	else 
-	{
-		/* Conventional separated stereo. */
-		if ( bytesShifted != 0 )
-		{
-			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
-			{
-				l = u[j];
-				r = v[j];
-
-				l = (l << shift) | (uint32_t) shiftUV[k + 0];
-				r = (r << shift) | (uint32_t) shiftUV[k + 1];
-
-				op[HBYTE] = (uint8_t)((l >> 16) & 0xffu);
-				op[MBYTE] = (uint8_t)((l >>  8) & 0xffu);
-				op[LBYTE] = (uint8_t)((l >>  0) & 0xffu);
-				op += 3;
-
-				op[HBYTE] = (uint8_t)((r >> 16) & 0xffu);
-				op[MBYTE] = (uint8_t)((r >>  8) & 0xffu);
-				op[LBYTE] = (uint8_t)((r >>  0) & 0xffu);
-
-				op += (stride - 1) * 3;
-			}
-		}
-		else
-		{
-			for ( j = 0; j < numSamples; j++ )
-			{
-				int32_t		val;
-
-				val = u[j];
-				op[HBYTE] = (uint8_t)((val >> 16) & 0xffu);
-				op[MBYTE] = (uint8_t)((val >>  8) & 0xffu);
-				op[LBYTE] = (uint8_t)((val >>  0) & 0xffu);
-				op += 3;
-
-				val = v[j];
-				op[HBYTE] = (uint8_t)((val >> 16) & 0xffu);
-				op[MBYTE] = (uint8_t)((val >>  8) & 0xffu);
-				op[LBYTE] = (uint8_t)((val >>  0) & 0xffu);
-
-				op += (stride - 1) * 3;
-			}
-		}
-	}
-}
-
-// 32-bit routines
-// - note that these really expect the internal data width to be < 32 but the arrays are 32-bit
-// - otherwise, the calculations might overflow into the 33rd bit and be lost
-// - therefore, these routines deal with the specified "unused lower" bytes in the "shift" buffers
-
-void unmix32( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples,
-				int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted )
-{
-	int32_t *	op = out;
-	int32_t			shift = bytesShifted * 8;
-	int32_t		l, r;
-	int32_t 		j, k;
-
-	if ( mixres != 0 )
-	{
-		//Assert( bytesShifted != 0 );
-
-		/* matrixed stereo with shift */
-		for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
-		{
-			int32_t		lt, rt;
-
-			lt = u[j];
-			rt = v[j];
-			
-			l = lt + rt - ((mixres * rt) >> mixbits);
-			r = l - rt;
-
-			op[0] = (l << shift) | (uint32_t) shiftUV[k + 0];
-			op[1] = (r << shift) | (uint32_t) shiftUV[k + 1];
-			op += stride;
-		} 
-	}
-	else
-	{
-		if ( bytesShifted == 0 )
-		{
-			/* interleaving w/o shift */
-			for ( j = 0; j < numSamples; j++ )
-			{
-				op[0] = u[j];
-				op[1] = v[j];
-				op += stride;
-			}
-		}
-		else
-		{
-			/* interleaving with shift */
-			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
-			{
-				op[0] = (u[j] << shift) | (uint32_t) shiftUV[k + 0];
-				op[1] = (v[j] << shift) | (uint32_t) shiftUV[k + 1];
-				op += stride;
-			}
-		}
-	}
-}
-
-// 20/24-bit <-> 32-bit helper routines (not really matrixing but convenient to put here)
-
-void copyPredictorTo24( int32_t * in, uint8_t * out, uint32_t stride, int32_t numSamples )
-{
-	uint8_t *	op = out;
-	int32_t			j;
-
-	for ( j = 0; j < numSamples; j++ )
-	{
-		int32_t		val = in[j];
-
-		op[HBYTE] = (uint8_t)((val >> 16) & 0xffu);
-		op[MBYTE] = (uint8_t)((val >>  8) & 0xffu);
-		op[LBYTE] = (uint8_t)((val >>  0) & 0xffu);
-		op += (stride * 3);
-	}
-}
-
-void copyPredictorTo24Shift( int32_t * in, uint16_t * shift, uint8_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted )
-{
-	uint8_t *	op = out;
-	int32_t			shiftVal = bytesShifted * 8;
-	int32_t			j;
-
-	//Assert( bytesShifted != 0 );
-
-	for ( j = 0; j < numSamples; j++ )
-	{
-		int32_t		val = in[j];
-
-		val = (val << shiftVal) | (uint32_t) shift[j];
-
-		op[HBYTE] = (uint8_t)((val >> 16) & 0xffu);
-		op[MBYTE] = (uint8_t)((val >>  8) & 0xffu);
-		op[LBYTE] = (uint8_t)((val >>  0) & 0xffu);
-		op += (stride * 3);
-	}
-}
-
-void copyPredictorTo20( int32_t * in, uint8_t * out, uint32_t stride, int32_t numSamples )
-{
-	uint8_t *	op = out;
-	int32_t			j;
-
-	// 32-bit predictor values are right-aligned but 20-bit output values should be left-aligned
-	// in the 24-bit output buffer
-	for ( j = 0; j < numSamples; j++ )
-	{
-		int32_t		val = in[j];
-
-		op[HBYTE] = (uint8_t)((val >> 12) & 0xffu);
-		op[MBYTE] = (uint8_t)((val >>  4) & 0xffu);
-		op[LBYTE] = (uint8_t)((val <<  4) & 0xffu);
-		op += (stride * 3);
-	}
-}
-
-void copyPredictorTo32( int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples )
-{
-	int32_t			i, j;
-
-	// this is only a subroutine to abstract the "iPod can only output 16-bit data" problem
-	for ( i = 0, j = 0; i < numSamples; i++, j += stride )
-		out[j] = in[i];
-}
-
-void copyPredictorTo32Shift( int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted )
-{
-	int32_t *		op = out;
-	uint32_t		shiftVal = bytesShifted * 8;
-	int32_t				j;
-
-	//Assert( bytesShifted != 0 );
-
-	// this is only a subroutine to abstract the "iPod can only output 16-bit data" problem
-	for ( j = 0; j < numSamples; j++ )
-	{
-		op[0] = (in[j] << shiftVal) | (uint32_t) shift[j];
-		op += stride;
-	}
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/matrix_enc.c b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/matrix_enc.c
deleted file mode 100644
index e19433059..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/matrix_enc.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		matrix_enc.c
-	
-	Contains:	ALAC mixing/matrixing encode routines.
-
-	Copyright:	(c) 2004-2011 Apple, Inc.
-*/
-
-#include "matrixlib.h"
-#include "ALACAudioTypes.h"
-
-// up to 24-bit "offset" macros for the individual bytes of a 20/24-bit word
-#if TARGET_RT_BIG_ENDIAN
-	#define LBYTE	2
-	#define MBYTE	1
-	#define HBYTE	0
-#else
-	#define LBYTE	0
-	#define MBYTE	1
-	#define HBYTE	2
-#endif
-
-/*
-    There is no plain middle-side option; instead there are various mixing
-    modes including middle-side, each lossless, as embodied in the mix()
-    and unmix() functions.  These functions exploit a generalized middle-side
-    transformation:
-    
-    u := [(rL + (m-r)R)/m];
-    v := L - R;
-    
-    where [ ] denotes integer floor.  The (lossless) inverse is
-    
-    L = u + v - [rV/m];
-    R = L - v;
-*/
-
-// 16-bit routines
-
-void mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres )
-{
-	int16_t	*	ip = in;
-	int32_t			j;
-
-	if ( mixres != 0 )
-	{
-		int32_t		mod = 1 << mixbits;
-		int32_t		m2;
-
-		/* matrixed stereo */
-		m2 = mod - mixres;
-		for ( j = 0; j < numSamples; j++ )
-		{
-			int32_t		l, r;
-
-			l = (int32_t) ip[0];
-			r = (int32_t) ip[1];
-			ip += stride;
-			u[j] = (mixres * l + m2 * r) >> mixbits;
-			v[j] = l - r;
-		}
-	}
-	else
-	{
-		/* Conventional separated stereo. */
-		for ( j = 0; j < numSamples; j++ )
-		{
-			u[j] = (int32_t) ip[0];
-			v[j] = (int32_t) ip[1];
-			ip += stride;
-		}
-	}
-}
-
-// 20-bit routines
-// - the 20 bits of data are left-justified in 3 bytes of storage but right-aligned for input/output predictor buffers
-
-void mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres )
-{
-	int32_t		l, r;
-	uint8_t *	ip = in;
-	int32_t			j;
-
-	if ( mixres != 0 )
-	{
-		/* matrixed stereo */
-		int32_t		mod = 1 << mixbits;
-		int32_t		m2 = mod - mixres;
-
-		for ( j = 0; j < numSamples; j++ )
-		{
-			l = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-			l = (l << 8) >> 12;
-			ip += 3;
-
-			r = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-			r = (r << 8) >> 12;
-			ip += (stride - 1) * 3;
-
-			u[j] = (mixres * l + m2 * r) >> mixbits;
-			v[j] = l - r;
-		} 
-	}
-	else
-	{
-		/* Conventional separated stereo. */
-		for ( j = 0; j < numSamples; j++ )
-		{
-			l = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-			u[j] = (l << 8) >> 12;
-			ip += 3;
-
-			r = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-			v[j] = (r << 8) >> 12;
-			ip += (stride - 1) * 3;
-		}
-	}
-}
-
-// 24-bit routines
-// - the 24 bits of data are right-justified in the input/output predictor buffers
-
-void mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples,
-			int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted )
-{	
-	int32_t		l, r;
-	uint8_t *	ip = in;
-	int32_t			shift = bytesShifted * 8;
-	uint32_t	mask  = (1ul << shift) - 1;
-	int32_t			j, k;
-
-	if ( mixres != 0 )
-	{
-		/* matrixed stereo */
-		int32_t		mod = 1 << mixbits;
-		int32_t		m2 = mod - mixres;
-
-		if ( bytesShifted != 0 )
-		{
-			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
-			{
-				l = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-				l = (l << 8) >> 8;
-				ip += 3;
-
-				r = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-				r = (r << 8) >> 8;
-				ip += (stride - 1) * 3;
-
-				shiftUV[k + 0] = (uint16_t)(l & mask);
-				shiftUV[k + 1] = (uint16_t)(r & mask);
-				
-				l >>= shift;
-				r >>= shift;
-
-				u[j] = (mixres * l + m2 * r) >> mixbits;
-				v[j] = l - r;
-			}
-		}
-		else
-		{
-			for ( j = 0; j < numSamples; j++ )
-			{
-				l = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-				l = (l << 8) >> 8;
-				ip += 3;
-
-				r = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-				r = (r << 8) >> 8;
-				ip += (stride - 1) * 3;
-
-				u[j] = (mixres * l + m2 * r) >> mixbits;
-				v[j] = l - r;
-			}
-		}
-	}
-	else
-	{
-		/* Conventional separated stereo. */
-		if ( bytesShifted != 0 )
-		{
-			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
-			{
-				l = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-				l = (l << 8) >> 8;
-				ip += 3;
-
-				r = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-				r = (r << 8) >> 8;
-				ip += (stride - 1) * 3;
-
-				shiftUV[k + 0] = (uint16_t)(l & mask);
-				shiftUV[k + 1] = (uint16_t)(r & mask);
-				
-				l >>= shift;
-				r >>= shift;
-
-				u[j] = l;
-				v[j] = r;
-			}
-		}
-		else
-		{
-			for ( j = 0; j < numSamples; j++ )
-			{
-				l = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-				u[j] = (l << 8) >> 8;
-				ip += 3;
-
-				r = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-				v[j] = (r << 8) >> 8;
-				ip += (stride - 1) * 3;
-			}
-		}
-	}
-}
-
-// 32-bit routines
-// - note that these really expect the internal data width to be < 32 but the arrays are 32-bit
-// - otherwise, the calculations might overflow into the 33rd bit and be lost
-// - therefore, these routines deal with the specified "unused lower" bytes in the "shift" buffers
-
-void mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples,
-			int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted )
-{
-	int32_t	*	ip = in;
-	int32_t			shift = bytesShifted * 8;
-	uint32_t	mask  = (1ul << shift) - 1;
-	int32_t		l, r;
-	int32_t			j, k;
-
-	if ( mixres != 0 )
-	{
-		int32_t		mod = 1 << mixbits;
-		int32_t		m2;
-
-		//Assert( bytesShifted != 0 );
-
-		/* matrixed stereo with shift */
-		m2 = mod - mixres;
-		for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
-		{
-			l = ip[0];
-			r = ip[1];
-			ip += stride;
-
-			shiftUV[k + 0] = (uint16_t)(l & mask);
-			shiftUV[k + 1] = (uint16_t)(r & mask);
-			
-			l >>= shift;
-			r >>= shift;
-
-			u[j] = (mixres * l + m2 * r) >> mixbits;
-			v[j] = l - r;
-		}
-	}
-	else
-	{
-		if ( bytesShifted == 0 )
-		{
-			/* de-interleaving w/o shift */
-			for ( j = 0; j < numSamples; j++ )
-			{
-				u[j] = ip[0];
-				v[j] = ip[1];
-				ip += stride;
-			}
-		}
-		else
-		{
-			/* de-interleaving with shift */
-			for ( j = 0, k = 0; j < numSamples; j++, k += 2 )
-			{
-				l = ip[0];
-				r = ip[1];
-				ip += stride;
-
-				shiftUV[k + 0] = (uint16_t)(l & mask);
-				shiftUV[k + 1] = (uint16_t)(r & mask);
-				
-				l >>= shift;
-				r >>= shift;
-
-				u[j] = l;
-				v[j] = r;
-			}
-		}
-	}
-}
-
-// 20/24-bit <-> 32-bit helper routines (not really matrixing but convenient to put here)
-
-void copy20ToPredictor( uint8_t * in, uint32_t stride, int32_t * out, int32_t numSamples )
-{
-	uint8_t *	ip = in;
-	int32_t			j;
-
-	for ( j = 0; j < numSamples; j++ )
-	{
-		int32_t			val;
-
-		// 20-bit values are left-aligned in the 24-bit input buffer but right-aligned in the 32-bit output buffer
-		val = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-		out[j] = (val << 8) >> 12;
-		ip += stride * 3;
-	}
-}
-
-void copy24ToPredictor( uint8_t * in, uint32_t stride, int32_t * out, int32_t numSamples )
-{
-	uint8_t *	ip = in;
-	int32_t			j;
-
-	for ( j = 0; j < numSamples; j++ )
-	{
-		int32_t			val;
-
-		val = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
-		out[j] = (val << 8) >> 8;
-		ip += stride * 3;
-	}
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/matrixlib.h b/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/matrixlib.h
deleted file mode 100644
index 0a4f37187..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/alac/codec/matrixlib.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2011 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-/*
-	File:		matrixlib.h
-	
-	Contains:	ALAC mixing/matrixing routines to/from 32-bit predictor buffers.
-
-	Copyright:	Copyright (C) 2004 to 2011 Apple, Inc.
-*/
-
-#ifndef __MATRIXLIB_H
-#define __MATRIXLIB_H
-
-#pragma once
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// 16-bit routines
-void	mix16( int16_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres );
-void	unmix16( int32_t * u, int32_t * v, int16_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres );
-
-// 20-bit routines
-void	mix20( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples, int32_t mixbits, int32_t mixres );
-void	unmix20( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t numSamples, int32_t mixbits, int32_t mixres );
-
-// 24-bit routines
-// - 24-bit data sometimes compresses better by shifting off the bottom byte so these routines deal with
-//	 the specified "unused lower bytes" in the combined "shift" buffer
-void	mix24( uint8_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples,
-				int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted );
-void	unmix24( int32_t * u, int32_t * v, uint8_t * out, uint32_t stride, int32_t numSamples,
-				 int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted );
-
-// 32-bit routines
-// - note that these really expect the internal data width to be < 32-bit but the arrays are 32-bit
-// - otherwise, the calculations might overflow into the 33rd bit and be lost
-// - therefore, these routines deal with the specified "unused lower" bytes in the combined "shift" buffer
-void	mix32( int32_t * in, uint32_t stride, int32_t * u, int32_t * v, int32_t numSamples,
-				int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted );
-void	unmix32( int32_t * u, int32_t * v, int32_t * out, uint32_t stride, int32_t numSamples,
-				 int32_t mixbits, int32_t mixres, uint16_t * shiftUV, int32_t bytesShifted );
-
-// 20/24/32-bit <-> 32-bit helper routines (not really matrixing but convenient to put here)
-void	copy20ToPredictor( uint8_t * in, uint32_t stride, int32_t * out, int32_t numSamples );
-void	copy24ToPredictor( uint8_t * in, uint32_t stride, int32_t * out, int32_t numSamples );
-
-void	copyPredictorTo24( int32_t * in, uint8_t * out, uint32_t stride, int32_t numSamples );
-void	copyPredictorTo24Shift( int32_t * in, uint16_t * shift, uint8_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted );
-void	copyPredictorTo20( int32_t * in, uint8_t * out, uint32_t stride, int32_t numSamples );
-
-void	copyPredictorTo32( int32_t * in, int32_t * out, uint32_t stride, int32_t numSamples );
-void	copyPredictorTo32Shift( int32_t * in, uint16_t * shift, int32_t * out, uint32_t stride, int32_t numSamples, int32_t bytesShifted );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* __MATRIXLIB_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/dr_mp3.h b/contrib/tinyusdz/tinyusdz_repo/src/external/dr_mp3.h
deleted file mode 100644
index 59876c877..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/dr_mp3.h
+++ /dev/null
@@ -1,4803 +0,0 @@
-/*
-MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
-dr_mp3 - v0.6.34 - 2022-09-17
-
-David Reid - mackron@gmail.com
-
-GitHub: https://github.com/mackron/dr_libs
-
-Based on minimp3 (https://github.com/lieff/minimp3) which is where the real work was done. See the bottom of this file for differences between minimp3 and dr_mp3.
-*/
-
-/*
-RELEASE NOTES - VERSION 0.6
-===========================
-Version 0.6 includes breaking changes with the configuration of decoders. The ability to customize the number of output channels and the sample rate has been
-removed. You must now use the channel count and sample rate reported by the MP3 stream itself, and all channel and sample rate conversion must be done
-yourself.
-
-
-Changes to Initialization
--------------------------
-Previously, `drmp3_init()`, etc. took a pointer to a `drmp3_config` object that allowed you to customize the output channels and sample rate. This has been
-removed. If you need the old behaviour you will need to convert the data yourself or just not upgrade. The following APIs have changed.
-
-    `drmp3_init()`
-    `drmp3_init_memory()`
-    `drmp3_init_file()`
-
-
-Miscellaneous Changes
----------------------
-Support for loading a file from a `wchar_t` string has been added via the `drmp3_init_file_w()` API.
-*/
-
-/*
-Introducation
-=============
-dr_mp3 is a single file library. To use it, do something like the following in one .c file.
-
-    ```c
-    #define DR_MP3_IMPLEMENTATION
-    #include "dr_mp3.h"
-    ```
-
-You can then #include this file in other parts of the program as you would with any other header file. To decode audio data, do something like the following:
-
-    ```c
-    drmp3 mp3;
-    if (!drmp3_init_file(&mp3, "MySong.mp3", NULL)) {
-        // Failed to open file
-    }
-
-    ...
-
-    drmp3_uint64 framesRead = drmp3_read_pcm_frames_f32(pMP3, framesToRead, pFrames);
-    ```
-
-The drmp3 object is transparent so you can get access to the channel count and sample rate like so:
-
-    ```
-    drmp3_uint32 channels = mp3.channels;
-    drmp3_uint32 sampleRate = mp3.sampleRate;
-    ```
-
-The example above initializes a decoder from a file, but you can also initialize it from a block of memory and read and seek callbacks with
-`drmp3_init_memory()` and `drmp3_init()` respectively.
-
-You do not need to do any annoying memory management when reading PCM frames - this is all managed internally. You can request any number of PCM frames in each
-call to `drmp3_read_pcm_frames_f32()` and it will return as many PCM frames as it can, up to the requested amount.
-
-You can also decode an entire file in one go with `drmp3_open_and_read_pcm_frames_f32()`, `drmp3_open_memory_and_read_pcm_frames_f32()` and
-`drmp3_open_file_and_read_pcm_frames_f32()`.
-
-
-Build Options
-=============
-#define these options before including this file.
-
-#define DR_MP3_NO_STDIO
-  Disable drmp3_init_file(), etc.
-
-#define DR_MP3_NO_SIMD
-  Disable SIMD optimizations.
-*/
-
-#ifndef dr_mp3_h
-#define dr_mp3_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DRMP3_STRINGIFY(x)      #x
-#define DRMP3_XSTRINGIFY(x)     DRMP3_STRINGIFY(x)
-
-#define DRMP3_VERSION_MAJOR     0
-#define DRMP3_VERSION_MINOR     6
-#define DRMP3_VERSION_REVISION  34
-#define DRMP3_VERSION_STRING    DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION)
-
-#include <stddef.h> /* For size_t. */
-
-/* Sized types. */
-typedef   signed char           drmp3_int8;
-typedef unsigned char           drmp3_uint8;
-typedef   signed short          drmp3_int16;
-typedef unsigned short          drmp3_uint16;
-typedef   signed int            drmp3_int32;
-typedef unsigned int            drmp3_uint32;
-#if defined(_MSC_VER) && !defined(__clang__)
-    typedef   signed __int64    drmp3_int64;
-    typedef unsigned __int64    drmp3_uint64;
-#else
-    #if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
-        #pragma GCC diagnostic push
-        #pragma GCC diagnostic ignored "-Wlong-long"
-        #if defined(__clang__)
-            #pragma GCC diagnostic ignored "-Wc++11-long-long"
-        #endif
-    #endif
-    typedef   signed long long  drmp3_int64;
-    typedef unsigned long long  drmp3_uint64;
-    #if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
-        #pragma GCC diagnostic pop
-    #endif
-#endif
-#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(_M_ARM64) || defined(__powerpc64__)
-    typedef drmp3_uint64        drmp3_uintptr;
-#else
-    typedef drmp3_uint32        drmp3_uintptr;
-#endif
-typedef drmp3_uint8             drmp3_bool8;
-typedef drmp3_uint32            drmp3_bool32;
-#define DRMP3_TRUE              1
-#define DRMP3_FALSE             0
-
-#if !defined(DRMP3_API)
-    #if defined(DRMP3_DLL)
-        #if defined(_WIN32)
-            #define DRMP3_DLL_IMPORT  __declspec(dllimport)
-            #define DRMP3_DLL_EXPORT  __declspec(dllexport)
-            #define DRMP3_DLL_PRIVATE static
-        #else
-            #if defined(__GNUC__) && __GNUC__ >= 4
-                #define DRMP3_DLL_IMPORT  __attribute__((visibility("default")))
-                #define DRMP3_DLL_EXPORT  __attribute__((visibility("default")))
-                #define DRMP3_DLL_PRIVATE __attribute__((visibility("hidden")))
-            #else
-                #define DRMP3_DLL_IMPORT
-                #define DRMP3_DLL_EXPORT
-                #define DRMP3_DLL_PRIVATE static
-            #endif
-        #endif
-
-        #if defined(DR_MP3_IMPLEMENTATION) || defined(DRMP3_IMPLEMENTATION)
-            #define DRMP3_API  DRMP3_DLL_EXPORT
-        #else
-            #define DRMP3_API  DRMP3_DLL_IMPORT
-        #endif
-        #define DRMP3_PRIVATE DRMP3_DLL_PRIVATE
-    #else
-        #define DRMP3_API extern
-        #define DRMP3_PRIVATE static
-    #endif
-#endif
-
-typedef drmp3_int32 drmp3_result;
-#define DRMP3_SUCCESS                        0
-#define DRMP3_ERROR                         -1   /* A generic error. */
-#define DRMP3_INVALID_ARGS                  -2
-#define DRMP3_INVALID_OPERATION             -3
-#define DRMP3_OUT_OF_MEMORY                 -4
-#define DRMP3_OUT_OF_RANGE                  -5
-#define DRMP3_ACCESS_DENIED                 -6
-#define DRMP3_DOES_NOT_EXIST                -7
-#define DRMP3_ALREADY_EXISTS                -8
-#define DRMP3_TOO_MANY_OPEN_FILES           -9
-#define DRMP3_INVALID_FILE                  -10
-#define DRMP3_TOO_BIG                       -11
-#define DRMP3_PATH_TOO_LONG                 -12
-#define DRMP3_NAME_TOO_LONG                 -13
-#define DRMP3_NOT_DIRECTORY                 -14
-#define DRMP3_IS_DIRECTORY                  -15
-#define DRMP3_DIRECTORY_NOT_EMPTY           -16
-#define DRMP3_END_OF_FILE                   -17
-#define DRMP3_NO_SPACE                      -18
-#define DRMP3_BUSY                          -19
-#define DRMP3_IO_ERROR                      -20
-#define DRMP3_INTERRUPT                     -21
-#define DRMP3_UNAVAILABLE                   -22
-#define DRMP3_ALREADY_IN_USE                -23
-#define DRMP3_BAD_ADDRESS                   -24
-#define DRMP3_BAD_SEEK                      -25
-#define DRMP3_BAD_PIPE                      -26
-#define DRMP3_DEADLOCK                      -27
-#define DRMP3_TOO_MANY_LINKS                -28
-#define DRMP3_NOT_IMPLEMENTED               -29
-#define DRMP3_NO_MESSAGE                    -30
-#define DRMP3_BAD_MESSAGE                   -31
-#define DRMP3_NO_DATA_AVAILABLE             -32
-#define DRMP3_INVALID_DATA                  -33
-#define DRMP3_TIMEOUT                       -34
-#define DRMP3_NO_NETWORK                    -35
-#define DRMP3_NOT_UNIQUE                    -36
-#define DRMP3_NOT_SOCKET                    -37
-#define DRMP3_NO_ADDRESS                    -38
-#define DRMP3_BAD_PROTOCOL                  -39
-#define DRMP3_PROTOCOL_UNAVAILABLE          -40
-#define DRMP3_PROTOCOL_NOT_SUPPORTED        -41
-#define DRMP3_PROTOCOL_FAMILY_NOT_SUPPORTED -42
-#define DRMP3_ADDRESS_FAMILY_NOT_SUPPORTED  -43
-#define DRMP3_SOCKET_NOT_SUPPORTED          -44
-#define DRMP3_CONNECTION_RESET              -45
-#define DRMP3_ALREADY_CONNECTED             -46
-#define DRMP3_NOT_CONNECTED                 -47
-#define DRMP3_CONNECTION_REFUSED            -48
-#define DRMP3_NO_HOST                       -49
-#define DRMP3_IN_PROGRESS                   -50
-#define DRMP3_CANCELLED                     -51
-#define DRMP3_MEMORY_ALREADY_MAPPED         -52
-#define DRMP3_AT_END                        -53
-
-
-#define DRMP3_MAX_PCM_FRAMES_PER_MP3_FRAME  1152
-#define DRMP3_MAX_SAMPLES_PER_FRAME         (DRMP3_MAX_PCM_FRAMES_PER_MP3_FRAME*2)
-
-#ifdef _MSC_VER
-    #define DRMP3_INLINE __forceinline
-#elif defined(__GNUC__)
-    /*
-    I've had a bug report where GCC is emitting warnings about functions possibly not being inlineable. This warning happens when
-    the __attribute__((always_inline)) attribute is defined without an "inline" statement. I think therefore there must be some
-    case where "__inline__" is not always defined, thus the compiler emitting these warnings. When using -std=c89 or -ansi on the
-    command line, we cannot use the "inline" keyword and instead need to use "__inline__". In an attempt to work around this issue
-    I am using "__inline__" only when we're compiling in strict ANSI mode.
-    */
-    #if defined(__STRICT_ANSI__)
-        #define DRMP3_GNUC_INLINE_HINT __inline__
-    #else
-        #define DRMP3_GNUC_INLINE_HINT inline
-    #endif
-
-    #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)) || defined(__clang__)
-        #define DRMP3_INLINE DRMP3_GNUC_INLINE_HINT __attribute__((always_inline))
-    #else
-        #define DRMP3_INLINE DRMP3_GNUC_INLINE_HINT
-    #endif
-#elif defined(__WATCOMC__)
-    #define DRMP3_INLINE __inline
-#else
-    #define DRMP3_INLINE
-#endif
-
-
-DRMP3_API void drmp3_version(drmp3_uint32* pMajor, drmp3_uint32* pMinor, drmp3_uint32* pRevision);
-DRMP3_API const char* drmp3_version_string(void);
-
-
-/*
-Low Level Push API
-==================
-*/
-typedef struct
-{
-    int frame_bytes, channels, hz, layer, bitrate_kbps;
-} drmp3dec_frame_info;
-
-typedef struct
-{
-    float mdct_overlap[2][9*32], qmf_state[15*2*32];
-    int reserv, free_format_bytes;
-    drmp3_uint8 header[4], reserv_buf[511];
-} drmp3dec;
-
-/* Initializes a low level decoder. */
-DRMP3_API void drmp3dec_init(drmp3dec *dec);
-
-/* Reads a frame from a low level decoder. */
-DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int mp3_bytes, void *pcm, drmp3dec_frame_info *info);
-
-/* Helper for converting between f32 and s16. */
-DRMP3_API void drmp3dec_f32_to_s16(const float *in, drmp3_int16 *out, size_t num_samples);
-
-
-
-/*
-Main API (Pull API)
-===================
-*/
-typedef enum
-{
-    drmp3_seek_origin_start,
-    drmp3_seek_origin_current
-} drmp3_seek_origin;
-
-typedef struct
-{
-    drmp3_uint64 seekPosInBytes;        /* Points to the first byte of an MP3 frame. */
-    drmp3_uint64 pcmFrameIndex;         /* The index of the PCM frame this seek point targets. */
-    drmp3_uint16 mp3FramesToDiscard;    /* The number of whole MP3 frames to be discarded before pcmFramesToDiscard. */
-    drmp3_uint16 pcmFramesToDiscard;    /* The number of leading samples to read and discard. These are discarded after mp3FramesToDiscard. */
-} drmp3_seek_point;
-
-/*
-Callback for when data is read. Return value is the number of bytes actually read.
-
-pUserData   [in]  The user data that was passed to drmp3_init(), drmp3_open() and family.
-pBufferOut  [out] The output buffer.
-bytesToRead [in]  The number of bytes to read.
-
-Returns the number of bytes actually read.
-
-A return value of less than bytesToRead indicates the end of the stream. Do _not_ return from this callback until
-either the entire bytesToRead is filled or you have reached the end of the stream.
-*/
-typedef size_t (* drmp3_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead);
-
-/*
-Callback for when data needs to be seeked.
-
-pUserData [in] The user data that was passed to drmp3_init(), drmp3_open() and family.
-offset    [in] The number of bytes to move, relative to the origin. Will never be negative.
-origin    [in] The origin of the seek - the current position or the start of the stream.
-
-Returns whether or not the seek was successful.
-
-Whether or not it is relative to the beginning or current position is determined by the "origin" parameter which
-will be either drmp3_seek_origin_start or drmp3_seek_origin_current.
-*/
-typedef drmp3_bool32 (* drmp3_seek_proc)(void* pUserData, int offset, drmp3_seek_origin origin);
-
-typedef struct
-{
-    void* pUserData;
-    void* (* onMalloc)(size_t sz, void* pUserData);
-    void* (* onRealloc)(void* p, size_t sz, void* pUserData);
-    void  (* onFree)(void* p, void* pUserData);
-} drmp3_allocation_callbacks;
-
-typedef struct
-{
-    drmp3_uint32 channels;
-    drmp3_uint32 sampleRate;
-} drmp3_config;
-
-typedef struct
-{
-    drmp3dec decoder;
-    drmp3_uint32 channels;
-    drmp3_uint32 sampleRate;
-    drmp3_read_proc onRead;
-    drmp3_seek_proc onSeek;
-    void* pUserData;
-    drmp3_allocation_callbacks allocationCallbacks;
-    drmp3_uint32 mp3FrameChannels;      /* The number of channels in the currently loaded MP3 frame. Internal use only. */
-    drmp3_uint32 mp3FrameSampleRate;    /* The sample rate of the currently loaded MP3 frame. Internal use only. */
-    drmp3_uint32 pcmFramesConsumedInMP3Frame;
-    drmp3_uint32 pcmFramesRemainingInMP3Frame;
-    drmp3_uint8 pcmFrames[sizeof(float)*DRMP3_MAX_SAMPLES_PER_FRAME];  /* <-- Multipled by sizeof(float) to ensure there's enough room for DR_MP3_FLOAT_OUTPUT. */
-    drmp3_uint64 currentPCMFrame;       /* The current PCM frame, globally, based on the output sample rate. Mainly used for seeking. */
-    drmp3_uint64 streamCursor;          /* The current byte the decoder is sitting on in the raw stream. */
-    drmp3_seek_point* pSeekPoints;      /* NULL by default. Set with drmp3_bind_seek_table(). Memory is owned by the client. dr_mp3 will never attempt to free this pointer. */
-    drmp3_uint32 seekPointCount;        /* The number of items in pSeekPoints. When set to 0 assumes to no seek table. Defaults to zero. */
-    size_t dataSize;
-    size_t dataCapacity;
-    size_t dataConsumed;
-    drmp3_uint8* pData;
-    drmp3_bool32 atEnd : 1;
-    struct
-    {
-        const drmp3_uint8* pData;
-        size_t dataSize;
-        size_t currentReadPos;
-    } memory;   /* Only used for decoders that were opened against a block of memory. */
-} drmp3;
-
-/*
-Initializes an MP3 decoder.
-
-onRead    [in]           The function to call when data needs to be read from the client.
-onSeek    [in]           The function to call when the read position of the client data needs to move.
-pUserData [in, optional] A pointer to application defined data that will be passed to onRead and onSeek.
-
-Returns true if successful; false otherwise.
-
-Close the loader with drmp3_uninit().
-
-See also: drmp3_init_file(), drmp3_init_memory(), drmp3_uninit()
-*/
-DRMP3_API drmp3_bool32 drmp3_init(drmp3* pMP3, drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, const drmp3_allocation_callbacks* pAllocationCallbacks);
-
-/*
-Initializes an MP3 decoder from a block of memory.
-
-This does not create a copy of the data. It is up to the application to ensure the buffer remains valid for
-the lifetime of the drmp3 object.
-
-The buffer should contain the contents of the entire MP3 file.
-*/
-DRMP3_API drmp3_bool32 drmp3_init_memory(drmp3* pMP3, const void* pData, size_t dataSize, const drmp3_allocation_callbacks* pAllocationCallbacks);
-
-#ifndef DR_MP3_NO_STDIO
-/*
-Initializes an MP3 decoder from a file.
-
-This holds the internal FILE object until drmp3_uninit() is called. Keep this in mind if you're caching drmp3
-objects because the operating system may restrict the number of file handles an application can have open at
-any given time.
-*/
-DRMP3_API drmp3_bool32 drmp3_init_file(drmp3* pMP3, const char* pFilePath, const drmp3_allocation_callbacks* pAllocationCallbacks);
-DRMP3_API drmp3_bool32 drmp3_init_file_w(drmp3* pMP3, const wchar_t* pFilePath, const drmp3_allocation_callbacks* pAllocationCallbacks);
-#endif
-
-/*
-Uninitializes an MP3 decoder.
-*/
-DRMP3_API void drmp3_uninit(drmp3* pMP3);
-
-/*
-Reads PCM frames as interleaved 32-bit IEEE floating point PCM.
-
-Note that framesToRead specifies the number of PCM frames to read, _not_ the number of MP3 frames.
-*/
-DRMP3_API drmp3_uint64 drmp3_read_pcm_frames_f32(drmp3* pMP3, drmp3_uint64 framesToRead, float* pBufferOut);
-
-/*
-Reads PCM frames as interleaved signed 16-bit integer PCM.
-
-Note that framesToRead specifies the number of PCM frames to read, _not_ the number of MP3 frames.
-*/
-DRMP3_API drmp3_uint64 drmp3_read_pcm_frames_s16(drmp3* pMP3, drmp3_uint64 framesToRead, drmp3_int16* pBufferOut);
-
-/*
-Seeks to a specific frame.
-
-Note that this is _not_ an MP3 frame, but rather a PCM frame.
-*/
-DRMP3_API drmp3_bool32 drmp3_seek_to_pcm_frame(drmp3* pMP3, drmp3_uint64 frameIndex);
-
-/*
-Calculates the total number of PCM frames in the MP3 stream. Cannot be used for infinite streams such as internet
-radio. Runs in linear time. Returns 0 on error.
-*/
-DRMP3_API drmp3_uint64 drmp3_get_pcm_frame_count(drmp3* pMP3);
-
-/*
-Calculates the total number of MP3 frames in the MP3 stream. Cannot be used for infinite streams such as internet
-radio. Runs in linear time. Returns 0 on error.
-*/
-DRMP3_API drmp3_uint64 drmp3_get_mp3_frame_count(drmp3* pMP3);
-
-/*
-Calculates the total number of MP3 and PCM frames in the MP3 stream. Cannot be used for infinite streams such as internet
-radio. Runs in linear time. Returns 0 on error.
-
-This is equivalent to calling drmp3_get_mp3_frame_count() and drmp3_get_pcm_frame_count() except that it's more efficient.
-*/
-DRMP3_API drmp3_bool32 drmp3_get_mp3_and_pcm_frame_count(drmp3* pMP3, drmp3_uint64* pMP3FrameCount, drmp3_uint64* pPCMFrameCount);
-
-/*
-Calculates the seekpoints based on PCM frames. This is slow.
-
-pSeekpoint count is a pointer to a uint32 containing the seekpoint count. On input it contains the desired count.
-On output it contains the actual count. The reason for this design is that the client may request too many
-seekpoints, in which case dr_mp3 will return a corrected count.
-
-Note that seektable seeking is not quite sample exact when the MP3 stream contains inconsistent sample rates.
-*/
-DRMP3_API drmp3_bool32 drmp3_calculate_seek_points(drmp3* pMP3, drmp3_uint32* pSeekPointCount, drmp3_seek_point* pSeekPoints);
-
-/*
-Binds a seek table to the decoder.
-
-This does _not_ make a copy of pSeekPoints - it only references it. It is up to the application to ensure this
-remains valid while it is bound to the decoder.
-
-Use drmp3_calculate_seek_points() to calculate the seek points.
-*/
-DRMP3_API drmp3_bool32 drmp3_bind_seek_table(drmp3* pMP3, drmp3_uint32 seekPointCount, drmp3_seek_point* pSeekPoints);
-
-
-/*
-Opens an decodes an entire MP3 stream as a single operation.
-
-On output pConfig will receive the channel count and sample rate of the stream.
-
-Free the returned pointer with drmp3_free().
-*/
-DRMP3_API float* drmp3_open_and_read_pcm_frames_f32(drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks);
-DRMP3_API drmp3_int16* drmp3_open_and_read_pcm_frames_s16(drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks);
-
-DRMP3_API float* drmp3_open_memory_and_read_pcm_frames_f32(const void* pData, size_t dataSize, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks);
-DRMP3_API drmp3_int16* drmp3_open_memory_and_read_pcm_frames_s16(const void* pData, size_t dataSize, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks);
-
-#ifndef DR_MP3_NO_STDIO
-DRMP3_API float* drmp3_open_file_and_read_pcm_frames_f32(const char* filePath, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks);
-DRMP3_API drmp3_int16* drmp3_open_file_and_read_pcm_frames_s16(const char* filePath, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks);
-#endif
-
-/*
-Allocates a block of memory on the heap.
-*/
-DRMP3_API void* drmp3_malloc(size_t sz, const drmp3_allocation_callbacks* pAllocationCallbacks);
-
-/*
-Frees any memory that was allocated by a public drmp3 API.
-*/
-DRMP3_API void drmp3_free(void* p, const drmp3_allocation_callbacks* pAllocationCallbacks);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  /* dr_mp3_h */
-
-
-/************************************************************************************************************************************************************
- ************************************************************************************************************************************************************
-
- IMPLEMENTATION
-
- ************************************************************************************************************************************************************
- ************************************************************************************************************************************************************/
-#if defined(DR_MP3_IMPLEMENTATION) || defined(DRMP3_IMPLEMENTATION)
-#ifndef dr_mp3_c
-#define dr_mp3_c
-
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h> /* For INT_MAX */
-
-DRMP3_API void drmp3_version(drmp3_uint32* pMajor, drmp3_uint32* pMinor, drmp3_uint32* pRevision)
-{
-    if (pMajor) {
-        *pMajor = DRMP3_VERSION_MAJOR;
-    }
-
-    if (pMinor) {
-        *pMinor = DRMP3_VERSION_MINOR;
-    }
-
-    if (pRevision) {
-        *pRevision = DRMP3_VERSION_REVISION;
-    }
-}
-
-DRMP3_API const char* drmp3_version_string(void)
-{
-    return DRMP3_VERSION_STRING;
-}
-
-/* Disable SIMD when compiling with TCC for now. */
-#if defined(__TINYC__)
-#define DR_MP3_NO_SIMD
-#endif
-
-#define DRMP3_OFFSET_PTR(p, offset) ((void*)((drmp3_uint8*)(p) + (offset)))
-
-#define DRMP3_MAX_FREE_FORMAT_FRAME_SIZE  2304    /* more than ISO spec's */
-#ifndef DRMP3_MAX_FRAME_SYNC_MATCHES
-#define DRMP3_MAX_FRAME_SYNC_MATCHES      10
-#endif
-
-#define DRMP3_MAX_L3_FRAME_PAYLOAD_BYTES  DRMP3_MAX_FREE_FORMAT_FRAME_SIZE /* MUST be >= 320000/8/32000*1152 = 1440 */
-
-#define DRMP3_MAX_BITRESERVOIR_BYTES      511
-#define DRMP3_SHORT_BLOCK_TYPE            2
-#define DRMP3_STOP_BLOCK_TYPE             3
-#define DRMP3_MODE_MONO                   3
-#define DRMP3_MODE_JOINT_STEREO           1
-#define DRMP3_HDR_SIZE                    4
-#define DRMP3_HDR_IS_MONO(h)              (((h[3]) & 0xC0) == 0xC0)
-#define DRMP3_HDR_IS_MS_STEREO(h)         (((h[3]) & 0xE0) == 0x60)
-#define DRMP3_HDR_IS_FREE_FORMAT(h)       (((h[2]) & 0xF0) == 0)
-#define DRMP3_HDR_IS_CRC(h)               (!((h[1]) & 1))
-#define DRMP3_HDR_TEST_PADDING(h)         ((h[2]) & 0x2)
-#define DRMP3_HDR_TEST_MPEG1(h)           ((h[1]) & 0x8)
-#define DRMP3_HDR_TEST_NOT_MPEG25(h)      ((h[1]) & 0x10)
-#define DRMP3_HDR_TEST_I_STEREO(h)        ((h[3]) & 0x10)
-#define DRMP3_HDR_TEST_MS_STEREO(h)       ((h[3]) & 0x20)
-#define DRMP3_HDR_GET_STEREO_MODE(h)      (((h[3]) >> 6) & 3)
-#define DRMP3_HDR_GET_STEREO_MODE_EXT(h)  (((h[3]) >> 4) & 3)
-#define DRMP3_HDR_GET_LAYER(h)            (((h[1]) >> 1) & 3)
-#define DRMP3_HDR_GET_BITRATE(h)          ((h[2]) >> 4)
-#define DRMP3_HDR_GET_SAMPLE_RATE(h)      (((h[2]) >> 2) & 3)
-#define DRMP3_HDR_GET_MY_SAMPLE_RATE(h)   (DRMP3_HDR_GET_SAMPLE_RATE(h) + (((h[1] >> 3) & 1) + ((h[1] >> 4) & 1))*3)
-#define DRMP3_HDR_IS_FRAME_576(h)         ((h[1] & 14) == 2)
-#define DRMP3_HDR_IS_LAYER_1(h)           ((h[1] & 6) == 6)
-
-#define DRMP3_BITS_DEQUANTIZER_OUT        -1
-#define DRMP3_MAX_SCF                     (255 + DRMP3_BITS_DEQUANTIZER_OUT*4 - 210)
-#define DRMP3_MAX_SCFI                    ((DRMP3_MAX_SCF + 3) & ~3)
-
-#define DRMP3_MIN(a, b)           ((a) > (b) ? (b) : (a))
-#define DRMP3_MAX(a, b)           ((a) < (b) ? (b) : (a))
-
-#if !defined(DR_MP3_NO_SIMD)
-
-#if !defined(DR_MP3_ONLY_SIMD) && (defined(_M_X64) || defined(__x86_64__) || defined(__aarch64__) || defined(_M_ARM64))
-/* x64 always have SSE2, arm64 always have neon, no need for generic code */
-#define DR_MP3_ONLY_SIMD
-#endif
-
-#if ((defined(_MSC_VER) && _MSC_VER >= 1400) && defined(_M_X64)) || ((defined(__i386) || defined(_M_IX86) || defined(__i386__) || defined(__x86_64__)) && ((defined(_M_IX86_FP) && _M_IX86_FP == 2) || defined(__SSE2__)))
-#if defined(_MSC_VER)
-#include <intrin.h>
-#endif
-#include <emmintrin.h>
-#define DRMP3_HAVE_SSE 1
-#define DRMP3_HAVE_SIMD 1
-#define DRMP3_VSTORE _mm_storeu_ps
-#define DRMP3_VLD _mm_loadu_ps
-#define DRMP3_VSET _mm_set1_ps
-#define DRMP3_VADD _mm_add_ps
-#define DRMP3_VSUB _mm_sub_ps
-#define DRMP3_VMUL _mm_mul_ps
-#define DRMP3_VMAC(a, x, y) _mm_add_ps(a, _mm_mul_ps(x, y))
-#define DRMP3_VMSB(a, x, y) _mm_sub_ps(a, _mm_mul_ps(x, y))
-#define DRMP3_VMUL_S(x, s)  _mm_mul_ps(x, _mm_set1_ps(s))
-#define DRMP3_VREV(x) _mm_shuffle_ps(x, x, _MM_SHUFFLE(0, 1, 2, 3))
-typedef __m128 drmp3_f4;
-#if defined(_MSC_VER) || defined(DR_MP3_ONLY_SIMD)
-#define drmp3_cpuid __cpuid
-#else
-static __inline__ __attribute__((always_inline)) void drmp3_cpuid(int CPUInfo[], const int InfoType)
-{
-#if defined(__PIC__)
-    __asm__ __volatile__(
-#if defined(__x86_64__)
-        "push %%rbx\n"
-        "cpuid\n"
-        "xchgl %%ebx, %1\n"
-        "pop  %%rbx\n"
-#else
-        "xchgl %%ebx, %1\n"
-        "cpuid\n"
-        "xchgl %%ebx, %1\n"
-#endif
-        : "=a" (CPUInfo[0]), "=r" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3])
-        : "a" (InfoType));
-#else
-    __asm__ __volatile__(
-        "cpuid"
-        : "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3])
-        : "a" (InfoType));
-#endif
-}
-#endif
-static int drmp3_have_simd(void)
-{
-#ifdef DR_MP3_ONLY_SIMD
-    return 1;
-#else
-    static int g_have_simd;
-    int CPUInfo[4];
-#ifdef MINIMP3_TEST
-    static int g_counter;
-    if (g_counter++ > 100)
-        return 0;
-#endif
-    if (g_have_simd)
-        goto end;
-    drmp3_cpuid(CPUInfo, 0);
-    if (CPUInfo[0] > 0)
-    {
-        drmp3_cpuid(CPUInfo, 1);
-        g_have_simd = (CPUInfo[3] & (1 << 26)) + 1; /* SSE2 */
-        return g_have_simd - 1;
-    }
-
-end:
-    return g_have_simd - 1;
-#endif
-}
-#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64)
-#include <arm_neon.h>
-#define DRMP3_HAVE_SSE 0
-#define DRMP3_HAVE_SIMD 1
-#define DRMP3_VSTORE vst1q_f32
-#define DRMP3_VLD vld1q_f32
-#define DRMP3_VSET vmovq_n_f32
-#define DRMP3_VADD vaddq_f32
-#define DRMP3_VSUB vsubq_f32
-#define DRMP3_VMUL vmulq_f32
-#define DRMP3_VMAC(a, x, y) vmlaq_f32(a, x, y)
-#define DRMP3_VMSB(a, x, y) vmlsq_f32(a, x, y)
-#define DRMP3_VMUL_S(x, s)  vmulq_f32(x, vmovq_n_f32(s))
-#define DRMP3_VREV(x) vcombine_f32(vget_high_f32(vrev64q_f32(x)), vget_low_f32(vrev64q_f32(x)))
-typedef float32x4_t drmp3_f4;
-static int drmp3_have_simd(void)
-{   /* TODO: detect neon for !DR_MP3_ONLY_SIMD */
-    return 1;
-}
-#else
-#define DRMP3_HAVE_SSE 0
-#define DRMP3_HAVE_SIMD 0
-#ifdef DR_MP3_ONLY_SIMD
-#error DR_MP3_ONLY_SIMD used, but SSE/NEON not enabled
-#endif
-#endif
-
-#else
-
-#define DRMP3_HAVE_SIMD 0
-
-#endif
-
-#if defined(__ARM_ARCH) && (__ARM_ARCH >= 6) && !defined(__aarch64__) && !defined(_M_ARM64)
-#define DRMP3_HAVE_ARMV6 1
-static __inline__ __attribute__((always_inline)) drmp3_int32 drmp3_clip_int16_arm(drmp3_int32 a)
-{
-    drmp3_int32 x = 0;
-    __asm__ ("ssat %0, #16, %1" : "=r"(x) : "r"(a));
-    return x;
-}
-#else
-#define DRMP3_HAVE_ARMV6 0
-#endif
-
-
-/* Standard library stuff. */
-#ifndef DRMP3_ASSERT
-#include <assert.h>
-#define DRMP3_ASSERT(expression) assert(expression)
-#endif
-#ifndef DRMP3_COPY_MEMORY
-#define DRMP3_COPY_MEMORY(dst, src, sz) memcpy((dst), (src), (sz))
-#endif
-#ifndef DRMP3_MOVE_MEMORY
-#define DRMP3_MOVE_MEMORY(dst, src, sz) memmove((dst), (src), (sz))
-#endif
-#ifndef DRMP3_ZERO_MEMORY
-#define DRMP3_ZERO_MEMORY(p, sz) memset((p), 0, (sz))
-#endif
-#define DRMP3_ZERO_OBJECT(p) DRMP3_ZERO_MEMORY((p), sizeof(*(p)))
-#ifndef DRMP3_MALLOC
-#define DRMP3_MALLOC(sz) malloc((sz))
-#endif
-#ifndef DRMP3_REALLOC
-#define DRMP3_REALLOC(p, sz) realloc((p), (sz))
-#endif
-#ifndef DRMP3_FREE
-#define DRMP3_FREE(p) free((p))
-#endif
-
-typedef struct
-{
-    const drmp3_uint8 *buf;
-    int pos, limit;
-} drmp3_bs;
-
-typedef struct
-{
-    float scf[3*64];
-    drmp3_uint8 total_bands, stereo_bands, bitalloc[64], scfcod[64];
-} drmp3_L12_scale_info;
-
-typedef struct
-{
-    drmp3_uint8 tab_offset, code_tab_width, band_count;
-} drmp3_L12_subband_alloc;
-
-typedef struct
-{
-    const drmp3_uint8 *sfbtab;
-    drmp3_uint16 part_23_length, big_values, scalefac_compress;
-    drmp3_uint8 global_gain, block_type, mixed_block_flag, n_long_sfb, n_short_sfb;
-    drmp3_uint8 table_select[3], region_count[3], subblock_gain[3];
-    drmp3_uint8 preflag, scalefac_scale, count1_table, scfsi;
-} drmp3_L3_gr_info;
-
-typedef struct
-{
-    drmp3_bs bs;
-    drmp3_uint8 maindata[DRMP3_MAX_BITRESERVOIR_BYTES + DRMP3_MAX_L3_FRAME_PAYLOAD_BYTES];
-    drmp3_L3_gr_info gr_info[4];
-    float grbuf[2][576], scf[40], syn[18 + 15][2*32];
-    drmp3_uint8 ist_pos[2][39];
-} drmp3dec_scratch;
-
-static void drmp3_bs_init(drmp3_bs *bs, const drmp3_uint8 *data, int bytes)
-{
-    bs->buf   = data;
-    bs->pos   = 0;
-    bs->limit = bytes*8;
-}
-
-static drmp3_uint32 drmp3_bs_get_bits(drmp3_bs *bs, int n)
-{
-    drmp3_uint32 next, cache = 0, s = bs->pos & 7;
-    int shl = n + s;
-    const drmp3_uint8 *p = bs->buf + (bs->pos >> 3);
-    if ((bs->pos += n) > bs->limit)
-        return 0;
-    next = *p++ & (255 >> s);
-    while ((shl -= 8) > 0)
-    {
-        cache |= next << shl;
-        next = *p++;
-    }
-    return cache | (next >> -shl);
-}
-
-static int drmp3_hdr_valid(const drmp3_uint8 *h)
-{
-    return h[0] == 0xff &&
-        ((h[1] & 0xF0) == 0xf0 || (h[1] & 0xFE) == 0xe2) &&
-        (DRMP3_HDR_GET_LAYER(h) != 0) &&
-        (DRMP3_HDR_GET_BITRATE(h) != 15) &&
-        (DRMP3_HDR_GET_SAMPLE_RATE(h) != 3);
-}
-
-static int drmp3_hdr_compare(const drmp3_uint8 *h1, const drmp3_uint8 *h2)
-{
-    return drmp3_hdr_valid(h2) &&
-        ((h1[1] ^ h2[1]) & 0xFE) == 0 &&
-        ((h1[2] ^ h2[2]) & 0x0C) == 0 &&
-        !(DRMP3_HDR_IS_FREE_FORMAT(h1) ^ DRMP3_HDR_IS_FREE_FORMAT(h2));
-}
-
-static unsigned drmp3_hdr_bitrate_kbps(const drmp3_uint8 *h)
-{
-    static const drmp3_uint8 halfrate[2][3][15] = {
-        { { 0,4,8,12,16,20,24,28,32,40,48,56,64,72,80 }, { 0,4,8,12,16,20,24,28,32,40,48,56,64,72,80 }, { 0,16,24,28,32,40,48,56,64,72,80,88,96,112,128 } },
-        { { 0,16,20,24,28,32,40,48,56,64,80,96,112,128,160 }, { 0,16,24,28,32,40,48,56,64,80,96,112,128,160,192 }, { 0,16,32,48,64,80,96,112,128,144,160,176,192,208,224 } },
-    };
-    return 2*halfrate[!!DRMP3_HDR_TEST_MPEG1(h)][DRMP3_HDR_GET_LAYER(h) - 1][DRMP3_HDR_GET_BITRATE(h)];
-}
-
-static unsigned drmp3_hdr_sample_rate_hz(const drmp3_uint8 *h)
-{
-    static const unsigned g_hz[3] = { 44100, 48000, 32000 };
-    return g_hz[DRMP3_HDR_GET_SAMPLE_RATE(h)] >> (int)!DRMP3_HDR_TEST_MPEG1(h) >> (int)!DRMP3_HDR_TEST_NOT_MPEG25(h);
-}
-
-static unsigned drmp3_hdr_frame_samples(const drmp3_uint8 *h)
-{
-    return DRMP3_HDR_IS_LAYER_1(h) ? 384 : (1152 >> (int)DRMP3_HDR_IS_FRAME_576(h));
-}
-
-static int drmp3_hdr_frame_bytes(const drmp3_uint8 *h, int free_format_size)
-{
-    int frame_bytes = drmp3_hdr_frame_samples(h)*drmp3_hdr_bitrate_kbps(h)*125/drmp3_hdr_sample_rate_hz(h);
-    if (DRMP3_HDR_IS_LAYER_1(h))
-    {
-        frame_bytes &= ~3; /* slot align */
-    }
-    return frame_bytes ? frame_bytes : free_format_size;
-}
-
-static int drmp3_hdr_padding(const drmp3_uint8 *h)
-{
-    return DRMP3_HDR_TEST_PADDING(h) ? (DRMP3_HDR_IS_LAYER_1(h) ? 4 : 1) : 0;
-}
-
-#ifndef DR_MP3_ONLY_MP3
-static const drmp3_L12_subband_alloc *drmp3_L12_subband_alloc_table(const drmp3_uint8 *hdr, drmp3_L12_scale_info *sci)
-{
-    const drmp3_L12_subband_alloc *alloc;
-    int mode = DRMP3_HDR_GET_STEREO_MODE(hdr);
-    int nbands, stereo_bands = (mode == DRMP3_MODE_MONO) ? 0 : (mode == DRMP3_MODE_JOINT_STEREO) ? (DRMP3_HDR_GET_STEREO_MODE_EXT(hdr) << 2) + 4 : 32;
-
-    if (DRMP3_HDR_IS_LAYER_1(hdr))
-    {
-        static const drmp3_L12_subband_alloc g_alloc_L1[] = { { 76, 4, 32 } };
-        alloc = g_alloc_L1;
-        nbands = 32;
-    } else if (!DRMP3_HDR_TEST_MPEG1(hdr))
-    {
-        static const drmp3_L12_subband_alloc g_alloc_L2M2[] = { { 60, 4, 4 }, { 44, 3, 7 }, { 44, 2, 19 } };
-        alloc = g_alloc_L2M2;
-        nbands = 30;
-    } else
-    {
-        static const drmp3_L12_subband_alloc g_alloc_L2M1[] = { { 0, 4, 3 }, { 16, 4, 8 }, { 32, 3, 12 }, { 40, 2, 7 } };
-        int sample_rate_idx = DRMP3_HDR_GET_SAMPLE_RATE(hdr);
-        unsigned kbps = drmp3_hdr_bitrate_kbps(hdr) >> (int)(mode != DRMP3_MODE_MONO);
-        if (!kbps) /* free-format */
-        {
-            kbps = 192;
-        }
-
-        alloc = g_alloc_L2M1;
-        nbands = 27;
-        if (kbps < 56)
-        {
-            static const drmp3_L12_subband_alloc g_alloc_L2M1_lowrate[] = { { 44, 4, 2 }, { 44, 3, 10 } };
-            alloc = g_alloc_L2M1_lowrate;
-            nbands = sample_rate_idx == 2 ? 12 : 8;
-        } else if (kbps >= 96 && sample_rate_idx != 1)
-        {
-            nbands = 30;
-        }
-    }
-
-    sci->total_bands = (drmp3_uint8)nbands;
-    sci->stereo_bands = (drmp3_uint8)DRMP3_MIN(stereo_bands, nbands);
-
-    return alloc;
-}
-
-static void drmp3_L12_read_scalefactors(drmp3_bs *bs, drmp3_uint8 *pba, drmp3_uint8 *scfcod, int bands, float *scf)
-{
-    static const float g_deq_L12[18*3] = {
-#define DRMP3_DQ(x) 9.53674316e-07f/x, 7.56931807e-07f/x, 6.00777173e-07f/x
-        DRMP3_DQ(3),DRMP3_DQ(7),DRMP3_DQ(15),DRMP3_DQ(31),DRMP3_DQ(63),DRMP3_DQ(127),DRMP3_DQ(255),DRMP3_DQ(511),DRMP3_DQ(1023),DRMP3_DQ(2047),DRMP3_DQ(4095),DRMP3_DQ(8191),DRMP3_DQ(16383),DRMP3_DQ(32767),DRMP3_DQ(65535),DRMP3_DQ(3),DRMP3_DQ(5),DRMP3_DQ(9)
-    };
-    int i, m;
-    for (i = 0; i < bands; i++)
-    {
-        float s = 0;
-        int ba = *pba++;
-        int mask = ba ? 4 + ((19 >> scfcod[i]) & 3) : 0;
-        for (m = 4; m; m >>= 1)
-        {
-            if (mask & m)
-            {
-                int b = drmp3_bs_get_bits(bs, 6);
-                s = g_deq_L12[ba*3 - 6 + b % 3]*(int)(1 << 21 >> b/3);
-            }
-            *scf++ = s;
-        }
-    }
-}
-
-static void drmp3_L12_read_scale_info(const drmp3_uint8 *hdr, drmp3_bs *bs, drmp3_L12_scale_info *sci)
-{
-    static const drmp3_uint8 g_bitalloc_code_tab[] = {
-        0,17, 3, 4, 5,6,7, 8,9,10,11,12,13,14,15,16,
-        0,17,18, 3,19,4,5, 6,7, 8, 9,10,11,12,13,16,
-        0,17,18, 3,19,4,5,16,
-        0,17,18,16,
-        0,17,18,19, 4,5,6, 7,8, 9,10,11,12,13,14,15,
-        0,17,18, 3,19,4,5, 6,7, 8, 9,10,11,12,13,14,
-        0, 2, 3, 4, 5,6,7, 8,9,10,11,12,13,14,15,16
-    };
-    const drmp3_L12_subband_alloc *subband_alloc = drmp3_L12_subband_alloc_table(hdr, sci);
-
-    int i, k = 0, ba_bits = 0;
-    const drmp3_uint8 *ba_code_tab = g_bitalloc_code_tab;
-
-    for (i = 0; i < sci->total_bands; i++)
-    {
-        drmp3_uint8 ba;
-        if (i == k)
-        {
-            k += subband_alloc->band_count;
-            ba_bits = subband_alloc->code_tab_width;
-            ba_code_tab = g_bitalloc_code_tab + subband_alloc->tab_offset;
-            subband_alloc++;
-        }
-        ba = ba_code_tab[drmp3_bs_get_bits(bs, ba_bits)];
-        sci->bitalloc[2*i] = ba;
-        if (i < sci->stereo_bands)
-        {
-            ba = ba_code_tab[drmp3_bs_get_bits(bs, ba_bits)];
-        }
-        sci->bitalloc[2*i + 1] = sci->stereo_bands ? ba : 0;
-    }
-
-    for (i = 0; i < 2*sci->total_bands; i++)
-    {
-        sci->scfcod[i] = (drmp3_uint8)(sci->bitalloc[i] ? DRMP3_HDR_IS_LAYER_1(hdr) ? 2 : drmp3_bs_get_bits(bs, 2) : 6);
-    }
-
-    drmp3_L12_read_scalefactors(bs, sci->bitalloc, sci->scfcod, sci->total_bands*2, sci->scf);
-
-    for (i = sci->stereo_bands; i < sci->total_bands; i++)
-    {
-        sci->bitalloc[2*i + 1] = 0;
-    }
-}
-
-static int drmp3_L12_dequantize_granule(float *grbuf, drmp3_bs *bs, drmp3_L12_scale_info *sci, int group_size)
-{
-    int i, j, k, choff = 576;
-    for (j = 0; j < 4; j++)
-    {
-        float *dst = grbuf + group_size*j;
-        for (i = 0; i < 2*sci->total_bands; i++)
-        {
-            int ba = sci->bitalloc[i];
-            if (ba != 0)
-            {
-                if (ba < 17)
-                {
-                    int half = (1 << (ba - 1)) - 1;
-                    for (k = 0; k < group_size; k++)
-                    {
-                        dst[k] = (float)((int)drmp3_bs_get_bits(bs, ba) - half);
-                    }
-                } else
-                {
-                    unsigned mod = (2 << (ba - 17)) + 1;    /* 3, 5, 9 */
-                    unsigned code = drmp3_bs_get_bits(bs, mod + 2 - (mod >> 3));  /* 5, 7, 10 */
-                    for (k = 0; k < group_size; k++, code /= mod)
-                    {
-                        dst[k] = (float)((int)(code % mod - mod/2));
-                    }
-                }
-            }
-            dst += choff;
-            choff = 18 - choff;
-        }
-    }
-    return group_size*4;
-}
-
-static void drmp3_L12_apply_scf_384(drmp3_L12_scale_info *sci, const float *scf, float *dst)
-{
-    int i, k;
-    DRMP3_COPY_MEMORY(dst + 576 + sci->stereo_bands*18, dst + sci->stereo_bands*18, (sci->total_bands - sci->stereo_bands)*18*sizeof(float));
-    for (i = 0; i < sci->total_bands; i++, dst += 18, scf += 6)
-    {
-        for (k = 0; k < 12; k++)
-        {
-            dst[k + 0]   *= scf[0];
-            dst[k + 576] *= scf[3];
-        }
-    }
-}
-#endif
-
-static int drmp3_L3_read_side_info(drmp3_bs *bs, drmp3_L3_gr_info *gr, const drmp3_uint8 *hdr)
-{
-    static const drmp3_uint8 g_scf_long[8][23] = {
-        { 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 },
-        { 12,12,12,12,12,12,16,20,24,28,32,40,48,56,64,76,90,2,2,2,2,2,0 },
-        { 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 },
-        { 6,6,6,6,6,6,8,10,12,14,16,18,22,26,32,38,46,54,62,70,76,36,0 },
-        { 6,6,6,6,6,6,8,10,12,14,16,20,24,28,32,38,46,52,60,68,58,54,0 },
-        { 4,4,4,4,4,4,6,6,8,8,10,12,16,20,24,28,34,42,50,54,76,158,0 },
-        { 4,4,4,4,4,4,6,6,6,8,10,12,16,18,22,28,34,40,46,54,54,192,0 },
-        { 4,4,4,4,4,4,6,6,8,10,12,16,20,24,30,38,46,56,68,84,102,26,0 }
-    };
-    static const drmp3_uint8 g_scf_short[8][40] = {
-        { 4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 },
-        { 8,8,8,8,8,8,8,8,8,12,12,12,16,16,16,20,20,20,24,24,24,28,28,28,36,36,36,2,2,2,2,2,2,2,2,2,26,26,26,0 },
-        { 4,4,4,4,4,4,4,4,4,6,6,6,6,6,6,8,8,8,10,10,10,14,14,14,18,18,18,26,26,26,32,32,32,42,42,42,18,18,18,0 },
-        { 4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,32,32,32,44,44,44,12,12,12,0 },
-        { 4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 },
-        { 4,4,4,4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,22,22,22,30,30,30,56,56,56,0 },
-        { 4,4,4,4,4,4,4,4,4,4,4,4,6,6,6,6,6,6,10,10,10,12,12,12,14,14,14,16,16,16,20,20,20,26,26,26,66,66,66,0 },
-        { 4,4,4,4,4,4,4,4,4,4,4,4,6,6,6,8,8,8,12,12,12,16,16,16,20,20,20,26,26,26,34,34,34,42,42,42,12,12,12,0 }
-    };
-    static const drmp3_uint8 g_scf_mixed[8][40] = {
-        { 6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 },
-        { 12,12,12,4,4,4,8,8,8,12,12,12,16,16,16,20,20,20,24,24,24,28,28,28,36,36,36,2,2,2,2,2,2,2,2,2,26,26,26,0 },
-        { 6,6,6,6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,14,14,14,18,18,18,26,26,26,32,32,32,42,42,42,18,18,18,0 },
-        { 6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,32,32,32,44,44,44,12,12,12,0 },
-        { 6,6,6,6,6,6,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,24,24,24,30,30,30,40,40,40,18,18,18,0 },
-        { 4,4,4,4,4,4,6,6,4,4,4,6,6,6,8,8,8,10,10,10,12,12,12,14,14,14,18,18,18,22,22,22,30,30,30,56,56,56,0 },
-        { 4,4,4,4,4,4,6,6,4,4,4,6,6,6,6,6,6,10,10,10,12,12,12,14,14,14,16,16,16,20,20,20,26,26,26,66,66,66,0 },
-        { 4,4,4,4,4,4,6,6,4,4,4,6,6,6,8,8,8,12,12,12,16,16,16,20,20,20,26,26,26,34,34,34,42,42,42,12,12,12,0 }
-    };
-
-    unsigned tables, scfsi = 0;
-    int main_data_begin, part_23_sum = 0;
-    int gr_count = DRMP3_HDR_IS_MONO(hdr) ? 1 : 2;
-    int sr_idx = DRMP3_HDR_GET_MY_SAMPLE_RATE(hdr); sr_idx -= (sr_idx != 0);
-
-    if (DRMP3_HDR_TEST_MPEG1(hdr))
-    {
-        gr_count *= 2;
-        main_data_begin = drmp3_bs_get_bits(bs, 9);
-        scfsi = drmp3_bs_get_bits(bs, 7 + gr_count);
-    } else
-    {
-        main_data_begin = drmp3_bs_get_bits(bs, 8 + gr_count) >> gr_count;
-    }
-
-    do
-    {
-        if (DRMP3_HDR_IS_MONO(hdr))
-        {
-            scfsi <<= 4;
-        }
-        gr->part_23_length = (drmp3_uint16)drmp3_bs_get_bits(bs, 12);
-        part_23_sum += gr->part_23_length;
-        gr->big_values = (drmp3_uint16)drmp3_bs_get_bits(bs,  9);
-        if (gr->big_values > 288)
-        {
-            return -1;
-        }
-        gr->global_gain = (drmp3_uint8)drmp3_bs_get_bits(bs, 8);
-        gr->scalefac_compress = (drmp3_uint16)drmp3_bs_get_bits(bs, DRMP3_HDR_TEST_MPEG1(hdr) ? 4 : 9);
-        gr->sfbtab = g_scf_long[sr_idx];
-        gr->n_long_sfb  = 22;
-        gr->n_short_sfb = 0;
-        if (drmp3_bs_get_bits(bs, 1))
-        {
-            gr->block_type = (drmp3_uint8)drmp3_bs_get_bits(bs, 2);
-            if (!gr->block_type)
-            {
-                return -1;
-            }
-            gr->mixed_block_flag = (drmp3_uint8)drmp3_bs_get_bits(bs, 1);
-            gr->region_count[0] = 7;
-            gr->region_count[1] = 255;
-            if (gr->block_type == DRMP3_SHORT_BLOCK_TYPE)
-            {
-                scfsi &= 0x0F0F;
-                if (!gr->mixed_block_flag)
-                {
-                    gr->region_count[0] = 8;
-                    gr->sfbtab = g_scf_short[sr_idx];
-                    gr->n_long_sfb = 0;
-                    gr->n_short_sfb = 39;
-                } else
-                {
-                    gr->sfbtab = g_scf_mixed[sr_idx];
-                    gr->n_long_sfb = DRMP3_HDR_TEST_MPEG1(hdr) ? 8 : 6;
-                    gr->n_short_sfb = 30;
-                }
-            }
-            tables = drmp3_bs_get_bits(bs, 10);
-            tables <<= 5;
-            gr->subblock_gain[0] = (drmp3_uint8)drmp3_bs_get_bits(bs, 3);
-            gr->subblock_gain[1] = (drmp3_uint8)drmp3_bs_get_bits(bs, 3);
-            gr->subblock_gain[2] = (drmp3_uint8)drmp3_bs_get_bits(bs, 3);
-        } else
-        {
-            gr->block_type = 0;
-            gr->mixed_block_flag = 0;
-            tables = drmp3_bs_get_bits(bs, 15);
-            gr->region_count[0] = (drmp3_uint8)drmp3_bs_get_bits(bs, 4);
-            gr->region_count[1] = (drmp3_uint8)drmp3_bs_get_bits(bs, 3);
-            gr->region_count[2] = 255;
-        }
-        gr->table_select[0] = (drmp3_uint8)(tables >> 10);
-        gr->table_select[1] = (drmp3_uint8)((tables >> 5) & 31);
-        gr->table_select[2] = (drmp3_uint8)((tables) & 31);
-        gr->preflag = (drmp3_uint8)(DRMP3_HDR_TEST_MPEG1(hdr) ? drmp3_bs_get_bits(bs, 1) : (gr->scalefac_compress >= 500));
-        gr->scalefac_scale = (drmp3_uint8)drmp3_bs_get_bits(bs, 1);
-        gr->count1_table = (drmp3_uint8)drmp3_bs_get_bits(bs, 1);
-        gr->scfsi = (drmp3_uint8)((scfsi >> 12) & 15);
-        scfsi <<= 4;
-        gr++;
-    } while(--gr_count);
-
-    if (part_23_sum + bs->pos > bs->limit + main_data_begin*8)
-    {
-        return -1;
-    }
-
-    return main_data_begin;
-}
-
-static void drmp3_L3_read_scalefactors(drmp3_uint8 *scf, drmp3_uint8 *ist_pos, const drmp3_uint8 *scf_size, const drmp3_uint8 *scf_count, drmp3_bs *bitbuf, int scfsi)
-{
-    int i, k;
-    for (i = 0; i < 4 && scf_count[i]; i++, scfsi *= 2)
-    {
-        int cnt = scf_count[i];
-        if (scfsi & 8)
-        {
-            DRMP3_COPY_MEMORY(scf, ist_pos, cnt);
-        } else
-        {
-            int bits = scf_size[i];
-            if (!bits)
-            {
-                DRMP3_ZERO_MEMORY(scf, cnt);
-                DRMP3_ZERO_MEMORY(ist_pos, cnt);
-            } else
-            {
-                int max_scf = (scfsi < 0) ? (1 << bits) - 1 : -1;
-                for (k = 0; k < cnt; k++)
-                {
-                    int s = drmp3_bs_get_bits(bitbuf, bits);
-                    ist_pos[k] = (drmp3_uint8)(s == max_scf ? -1 : s);
-                    scf[k] = (drmp3_uint8)s;
-                }
-            }
-        }
-        ist_pos += cnt;
-        scf += cnt;
-    }
-    scf[0] = scf[1] = scf[2] = 0;
-}
-
-static float drmp3_L3_ldexp_q2(float y, int exp_q2)
-{
-    static const float g_expfrac[4] = { 9.31322575e-10f,7.83145814e-10f,6.58544508e-10f,5.53767716e-10f };
-    int e;
-    do
-    {
-        e = DRMP3_MIN(30*4, exp_q2);
-        y *= g_expfrac[e & 3]*(1 << 30 >> (e >> 2));
-    } while ((exp_q2 -= e) > 0);
-    return y;
-}
-
-static void drmp3_L3_decode_scalefactors(const drmp3_uint8 *hdr, drmp3_uint8 *ist_pos, drmp3_bs *bs, const drmp3_L3_gr_info *gr, float *scf, int ch)
-{
-    static const drmp3_uint8 g_scf_partitions[3][28] = {
-        { 6,5,5, 5,6,5,5,5,6,5, 7,3,11,10,0,0, 7, 7, 7,0, 6, 6,6,3, 8, 8,5,0 },
-        { 8,9,6,12,6,9,9,9,6,9,12,6,15,18,0,0, 6,15,12,0, 6,12,9,6, 6,18,9,0 },
-        { 9,9,6,12,9,9,9,9,9,9,12,6,18,18,0,0,12,12,12,0,12, 9,9,6,15,12,9,0 }
-    };
-    const drmp3_uint8 *scf_partition = g_scf_partitions[!!gr->n_short_sfb + !gr->n_long_sfb];
-    drmp3_uint8 scf_size[4], iscf[40];
-    int i, scf_shift = gr->scalefac_scale + 1, gain_exp, scfsi = gr->scfsi;
-    float gain;
-
-    if (DRMP3_HDR_TEST_MPEG1(hdr))
-    {
-        static const drmp3_uint8 g_scfc_decode[16] = { 0,1,2,3, 12,5,6,7, 9,10,11,13, 14,15,18,19 };
-        int part = g_scfc_decode[gr->scalefac_compress];
-        scf_size[1] = scf_size[0] = (drmp3_uint8)(part >> 2);
-        scf_size[3] = scf_size[2] = (drmp3_uint8)(part & 3);
-    } else
-    {
-        static const drmp3_uint8 g_mod[6*4] = { 5,5,4,4,5,5,4,1,4,3,1,1,5,6,6,1,4,4,4,1,4,3,1,1 };
-        int k, modprod, sfc, ist = DRMP3_HDR_TEST_I_STEREO(hdr) && ch;
-        sfc = gr->scalefac_compress >> ist;
-        for (k = ist*3*4; sfc >= 0; sfc -= modprod, k += 4)
-        {
-            for (modprod = 1, i = 3; i >= 0; i--)
-            {
-                scf_size[i] = (drmp3_uint8)(sfc / modprod % g_mod[k + i]);
-                modprod *= g_mod[k + i];
-            }
-        }
-        scf_partition += k;
-        scfsi = -16;
-    }
-    drmp3_L3_read_scalefactors(iscf, ist_pos, scf_size, scf_partition, bs, scfsi);
-
-    if (gr->n_short_sfb)
-    {
-        int sh = 3 - scf_shift;
-        for (i = 0; i < gr->n_short_sfb; i += 3)
-        {
-            iscf[gr->n_long_sfb + i + 0] = (drmp3_uint8)(iscf[gr->n_long_sfb + i + 0] + (gr->subblock_gain[0] << sh));
-            iscf[gr->n_long_sfb + i + 1] = (drmp3_uint8)(iscf[gr->n_long_sfb + i + 1] + (gr->subblock_gain[1] << sh));
-            iscf[gr->n_long_sfb + i + 2] = (drmp3_uint8)(iscf[gr->n_long_sfb + i + 2] + (gr->subblock_gain[2] << sh));
-        }
-    } else if (gr->preflag)
-    {
-        static const drmp3_uint8 g_preamp[10] = { 1,1,1,1,2,2,3,3,3,2 };
-        for (i = 0; i < 10; i++)
-        {
-            iscf[11 + i] = (drmp3_uint8)(iscf[11 + i] + g_preamp[i]);
-        }
-    }
-
-    gain_exp = gr->global_gain + DRMP3_BITS_DEQUANTIZER_OUT*4 - 210 - (DRMP3_HDR_IS_MS_STEREO(hdr) ? 2 : 0);
-    gain = drmp3_L3_ldexp_q2(1 << (DRMP3_MAX_SCFI/4),  DRMP3_MAX_SCFI - gain_exp);
-    for (i = 0; i < (int)(gr->n_long_sfb + gr->n_short_sfb); i++)
-    {
-        scf[i] = drmp3_L3_ldexp_q2(gain, iscf[i] << scf_shift);
-    }
-}
-
-static const float g_drmp3_pow43[129 + 16] = {
-    0,-1,-2.519842f,-4.326749f,-6.349604f,-8.549880f,-10.902724f,-13.390518f,-16.000000f,-18.720754f,-21.544347f,-24.463781f,-27.473142f,-30.567351f,-33.741992f,-36.993181f,
-    0,1,2.519842f,4.326749f,6.349604f,8.549880f,10.902724f,13.390518f,16.000000f,18.720754f,21.544347f,24.463781f,27.473142f,30.567351f,33.741992f,36.993181f,40.317474f,43.711787f,47.173345f,50.699631f,54.288352f,57.937408f,61.644865f,65.408941f,69.227979f,73.100443f,77.024898f,81.000000f,85.024491f,89.097188f,93.216975f,97.382800f,101.593667f,105.848633f,110.146801f,114.487321f,118.869381f,123.292209f,127.755065f,132.257246f,136.798076f,141.376907f,145.993119f,150.646117f,155.335327f,160.060199f,164.820202f,169.614826f,174.443577f,179.305980f,184.201575f,189.129918f,194.090580f,199.083145f,204.107210f,209.162385f,214.248292f,219.364564f,224.510845f,229.686789f,234.892058f,240.126328f,245.389280f,250.680604f,256.000000f,261.347174f,266.721841f,272.123723f,277.552547f,283.008049f,288.489971f,293.998060f,299.532071f,305.091761f,310.676898f,316.287249f,321.922592f,327.582707f,333.267377f,338.976394f,344.709550f,350.466646f,356.247482f,362.051866f,367.879608f,373.730522f,379.604427f,385.501143f,391.420496f,397.362314f,403.326427f,409.312672f,415.320884f,421.350905f,427.402579f,433.475750f,439.570269f,445.685987f,451.822757f,457.980436f,464.158883f,470.357960f,476.577530f,482.817459f,489.077615f,495.357868f,501.658090f,507.978156f,514.317941f,520.677324f,527.056184f,533.454404f,539.871867f,546.308458f,552.764065f,559.238575f,565.731879f,572.243870f,578.774440f,585.323483f,591.890898f,598.476581f,605.080431f,611.702349f,618.342238f,625.000000f,631.675540f,638.368763f,645.079578f
-};
-
-static float drmp3_L3_pow_43(int x)
-{
-    float frac;
-    int sign, mult = 256;
-
-    if (x < 129)
-    {
-        return g_drmp3_pow43[16 + x];
-    }
-
-    if (x < 1024)
-    {
-        mult = 16;
-        x <<= 3;
-    }
-
-    sign = 2*x & 64;
-    frac = (float)((x & 63) - sign) / ((x & ~63) + sign);
-    return g_drmp3_pow43[16 + ((x + sign) >> 6)]*(1.f + frac*((4.f/3) + frac*(2.f/9)))*mult;
-}
-
-static void drmp3_L3_huffman(float *dst, drmp3_bs *bs, const drmp3_L3_gr_info *gr_info, const float *scf, int layer3gr_limit)
-{
-    static const drmp3_int16 tabs[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        785,785,785,785,784,784,784,784,513,513,513,513,513,513,513,513,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,
-        -255,1313,1298,1282,785,785,785,785,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,290,288,
-        -255,1313,1298,1282,769,769,769,769,529,529,529,529,529,529,529,529,528,528,528,528,528,528,528,528,512,512,512,512,512,512,512,512,290,288,
-        -253,-318,-351,-367,785,785,785,785,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,819,818,547,547,275,275,275,275,561,560,515,546,289,274,288,258,
-        -254,-287,1329,1299,1314,1312,1057,1057,1042,1042,1026,1026,784,784,784,784,529,529,529,529,529,529,529,529,769,769,769,769,768,768,768,768,563,560,306,306,291,259,
-        -252,-413,-477,-542,1298,-575,1041,1041,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-383,-399,1107,1092,1106,1061,849,849,789,789,1104,1091,773,773,1076,1075,341,340,325,309,834,804,577,577,532,532,516,516,832,818,803,816,561,561,531,531,515,546,289,289,288,258,
-        -252,-429,-493,-559,1057,1057,1042,1042,529,529,529,529,529,529,529,529,784,784,784,784,769,769,769,769,512,512,512,512,512,512,512,512,-382,1077,-415,1106,1061,1104,849,849,789,789,1091,1076,1029,1075,834,834,597,581,340,340,339,324,804,833,532,532,832,772,818,803,817,787,816,771,290,290,290,290,288,258,
-        -253,-349,-414,-447,-463,1329,1299,-479,1314,1312,1057,1057,1042,1042,1026,1026,785,785,785,785,784,784,784,784,769,769,769,769,768,768,768,768,-319,851,821,-335,836,850,805,849,341,340,325,336,533,533,579,579,564,564,773,832,578,548,563,516,321,276,306,291,304,259,
-        -251,-572,-733,-830,-863,-879,1041,1041,784,784,784,784,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-511,-527,-543,1396,1351,1381,1366,1395,1335,1380,-559,1334,1138,1138,1063,1063,1350,1392,1031,1031,1062,1062,1364,1363,1120,1120,1333,1348,881,881,881,881,375,374,359,373,343,358,341,325,791,791,1123,1122,-703,1105,1045,-719,865,865,790,790,774,774,1104,1029,338,293,323,308,-799,-815,833,788,772,818,803,816,322,292,307,320,561,531,515,546,289,274,288,258,
-        -251,-525,-605,-685,-765,-831,-846,1298,1057,1057,1312,1282,785,785,785,785,784,784,784,784,769,769,769,769,512,512,512,512,512,512,512,512,1399,1398,1383,1367,1382,1396,1351,-511,1381,1366,1139,1139,1079,1079,1124,1124,1364,1349,1363,1333,882,882,882,882,807,807,807,807,1094,1094,1136,1136,373,341,535,535,881,775,867,822,774,-591,324,338,-671,849,550,550,866,864,609,609,293,336,534,534,789,835,773,-751,834,804,308,307,833,788,832,772,562,562,547,547,305,275,560,515,290,290,
-        -252,-397,-477,-557,-622,-653,-719,-735,-750,1329,1299,1314,1057,1057,1042,1042,1312,1282,1024,1024,785,785,785,785,784,784,784,784,769,769,769,769,-383,1127,1141,1111,1126,1140,1095,1110,869,869,883,883,1079,1109,882,882,375,374,807,868,838,881,791,-463,867,822,368,263,852,837,836,-543,610,610,550,550,352,336,534,534,865,774,851,821,850,805,593,533,579,564,773,832,578,578,548,548,577,577,307,276,306,291,516,560,259,259,
-        -250,-2107,-2507,-2764,-2909,-2974,-3007,-3023,1041,1041,1040,1040,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-767,-1052,-1213,-1277,-1358,-1405,-1469,-1535,-1550,-1582,-1614,-1647,-1662,-1694,-1726,-1759,-1774,-1807,-1822,-1854,-1886,1565,-1919,-1935,-1951,-1967,1731,1730,1580,1717,-1983,1729,1564,-1999,1548,-2015,-2031,1715,1595,-2047,1714,-2063,1610,-2079,1609,-2095,1323,1323,1457,1457,1307,1307,1712,1547,1641,1700,1699,1594,1685,1625,1442,1442,1322,1322,-780,-973,-910,1279,1278,1277,1262,1276,1261,1275,1215,1260,1229,-959,974,974,989,989,-943,735,478,478,495,463,506,414,-1039,1003,958,1017,927,942,987,957,431,476,1272,1167,1228,-1183,1256,-1199,895,895,941,941,1242,1227,1212,1135,1014,1014,490,489,503,487,910,1013,985,925,863,894,970,955,1012,847,-1343,831,755,755,984,909,428,366,754,559,-1391,752,486,457,924,997,698,698,983,893,740,740,908,877,739,739,667,667,953,938,497,287,271,271,683,606,590,712,726,574,302,302,738,736,481,286,526,725,605,711,636,724,696,651,589,681,666,710,364,467,573,695,466,466,301,465,379,379,709,604,665,679,316,316,634,633,436,436,464,269,424,394,452,332,438,363,347,408,393,448,331,422,362,407,392,421,346,406,391,376,375,359,1441,1306,-2367,1290,-2383,1337,-2399,-2415,1426,1321,-2431,1411,1336,-2447,-2463,-2479,1169,1169,1049,1049,1424,1289,1412,1352,1319,-2495,1154,1154,1064,1064,1153,1153,416,390,360,404,403,389,344,374,373,343,358,372,327,357,342,311,356,326,1395,1394,1137,1137,1047,1047,1365,1392,1287,1379,1334,1364,1349,1378,1318,1363,792,792,792,792,1152,1152,1032,1032,1121,1121,1046,1046,1120,1120,1030,1030,-2895,1106,1061,1104,849,849,789,789,1091,1076,1029,1090,1060,1075,833,833,309,324,532,532,832,772,818,803,561,561,531,560,515,546,289,274,288,258,
-        -250,-1179,-1579,-1836,-1996,-2124,-2253,-2333,-2413,-2477,-2542,-2574,-2607,-2622,-2655,1314,1313,1298,1312,1282,785,785,785,785,1040,1040,1025,1025,768,768,768,768,-766,-798,-830,-862,-895,-911,-927,-943,-959,-975,-991,-1007,-1023,-1039,-1055,-1070,1724,1647,-1103,-1119,1631,1767,1662,1738,1708,1723,-1135,1780,1615,1779,1599,1677,1646,1778,1583,-1151,1777,1567,1737,1692,1765,1722,1707,1630,1751,1661,1764,1614,1736,1676,1763,1750,1645,1598,1721,1691,1762,1706,1582,1761,1566,-1167,1749,1629,767,766,751,765,494,494,735,764,719,749,734,763,447,447,748,718,477,506,431,491,446,476,461,505,415,430,475,445,504,399,460,489,414,503,383,474,429,459,502,502,746,752,488,398,501,473,413,472,486,271,480,270,-1439,-1455,1357,-1471,-1487,-1503,1341,1325,-1519,1489,1463,1403,1309,-1535,1372,1448,1418,1476,1356,1462,1387,-1551,1475,1340,1447,1402,1386,-1567,1068,1068,1474,1461,455,380,468,440,395,425,410,454,364,467,466,464,453,269,409,448,268,432,1371,1473,1432,1417,1308,1460,1355,1446,1459,1431,1083,1083,1401,1416,1458,1445,1067,1067,1370,1457,1051,1051,1291,1430,1385,1444,1354,1415,1400,1443,1082,1082,1173,1113,1186,1066,1185,1050,-1967,1158,1128,1172,1097,1171,1081,-1983,1157,1112,416,266,375,400,1170,1142,1127,1065,793,793,1169,1033,1156,1096,1141,1111,1155,1080,1126,1140,898,898,808,808,897,897,792,792,1095,1152,1032,1125,1110,1139,1079,1124,882,807,838,881,853,791,-2319,867,368,263,822,852,837,866,806,865,-2399,851,352,262,534,534,821,836,594,594,549,549,593,593,533,533,848,773,579,579,564,578,548,563,276,276,577,576,306,291,516,560,305,305,275,259,
-        -251,-892,-2058,-2620,-2828,-2957,-3023,-3039,1041,1041,1040,1040,769,769,769,769,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,-511,-527,-543,-559,1530,-575,-591,1528,1527,1407,1526,1391,1023,1023,1023,1023,1525,1375,1268,1268,1103,1103,1087,1087,1039,1039,1523,-604,815,815,815,815,510,495,509,479,508,463,507,447,431,505,415,399,-734,-782,1262,-815,1259,1244,-831,1258,1228,-847,-863,1196,-879,1253,987,987,748,-767,493,493,462,477,414,414,686,669,478,446,461,445,474,429,487,458,412,471,1266,1264,1009,1009,799,799,-1019,-1276,-1452,-1581,-1677,-1757,-1821,-1886,-1933,-1997,1257,1257,1483,1468,1512,1422,1497,1406,1467,1496,1421,1510,1134,1134,1225,1225,1466,1451,1374,1405,1252,1252,1358,1480,1164,1164,1251,1251,1238,1238,1389,1465,-1407,1054,1101,-1423,1207,-1439,830,830,1248,1038,1237,1117,1223,1148,1236,1208,411,426,395,410,379,269,1193,1222,1132,1235,1221,1116,976,976,1192,1162,1177,1220,1131,1191,963,963,-1647,961,780,-1663,558,558,994,993,437,408,393,407,829,978,813,797,947,-1743,721,721,377,392,844,950,828,890,706,706,812,859,796,960,948,843,934,874,571,571,-1919,690,555,689,421,346,539,539,944,779,918,873,932,842,903,888,570,570,931,917,674,674,-2575,1562,-2591,1609,-2607,1654,1322,1322,1441,1441,1696,1546,1683,1593,1669,1624,1426,1426,1321,1321,1639,1680,1425,1425,1305,1305,1545,1668,1608,1623,1667,1592,1638,1666,1320,1320,1652,1607,1409,1409,1304,1304,1288,1288,1664,1637,1395,1395,1335,1335,1622,1636,1394,1394,1319,1319,1606,1621,1392,1392,1137,1137,1137,1137,345,390,360,375,404,373,1047,-2751,-2767,-2783,1062,1121,1046,-2799,1077,-2815,1106,1061,789,789,1105,1104,263,355,310,340,325,354,352,262,339,324,1091,1076,1029,1090,1060,1075,833,833,788,788,1088,1028,818,818,803,803,561,561,531,531,816,771,546,546,289,274,288,258,
-        -253,-317,-381,-446,-478,-509,1279,1279,-811,-1179,-1451,-1756,-1900,-2028,-2189,-2253,-2333,-2414,-2445,-2511,-2526,1313,1298,-2559,1041,1041,1040,1040,1025,1025,1024,1024,1022,1007,1021,991,1020,975,1019,959,687,687,1018,1017,671,671,655,655,1016,1015,639,639,758,758,623,623,757,607,756,591,755,575,754,559,543,543,1009,783,-575,-621,-685,-749,496,-590,750,749,734,748,974,989,1003,958,988,973,1002,942,987,957,972,1001,926,986,941,971,956,1000,910,985,925,999,894,970,-1071,-1087,-1102,1390,-1135,1436,1509,1451,1374,-1151,1405,1358,1480,1420,-1167,1507,1494,1389,1342,1465,1435,1450,1326,1505,1310,1493,1373,1479,1404,1492,1464,1419,428,443,472,397,736,526,464,464,486,457,442,471,484,482,1357,1449,1434,1478,1388,1491,1341,1490,1325,1489,1463,1403,1309,1477,1372,1448,1418,1433,1476,1356,1462,1387,-1439,1475,1340,1447,1402,1474,1324,1461,1371,1473,269,448,1432,1417,1308,1460,-1711,1459,-1727,1441,1099,1099,1446,1386,1431,1401,-1743,1289,1083,1083,1160,1160,1458,1445,1067,1067,1370,1457,1307,1430,1129,1129,1098,1098,268,432,267,416,266,400,-1887,1144,1187,1082,1173,1113,1186,1066,1050,1158,1128,1143,1172,1097,1171,1081,420,391,1157,1112,1170,1142,1127,1065,1169,1049,1156,1096,1141,1111,1155,1080,1126,1154,1064,1153,1140,1095,1048,-2159,1125,1110,1137,-2175,823,823,1139,1138,807,807,384,264,368,263,868,838,853,791,867,822,852,837,866,806,865,790,-2319,851,821,836,352,262,850,805,849,-2399,533,533,835,820,336,261,578,548,563,577,532,532,832,772,562,562,547,547,305,275,560,515,290,290,288,258 };
-    static const drmp3_uint8 tab32[] = { 130,162,193,209,44,28,76,140,9,9,9,9,9,9,9,9,190,254,222,238,126,94,157,157,109,61,173,205};
-    static const drmp3_uint8 tab33[] = { 252,236,220,204,188,172,156,140,124,108,92,76,60,44,28,12 };
-    static const drmp3_int16 tabindex[2*16] = { 0,32,64,98,0,132,180,218,292,364,426,538,648,746,0,1126,1460,1460,1460,1460,1460,1460,1460,1460,1842,1842,1842,1842,1842,1842,1842,1842 };
-    static const drmp3_uint8 g_linbits[] =  { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,6,8,10,13,4,5,6,7,8,9,11,13 };
-
-#define DRMP3_PEEK_BITS(n)    (bs_cache >> (32 - (n)))
-#define DRMP3_FLUSH_BITS(n)   { bs_cache <<= (n); bs_sh += (n); }
-#define DRMP3_CHECK_BITS      while (bs_sh >= 0) { bs_cache |= (drmp3_uint32)*bs_next_ptr++ << bs_sh; bs_sh -= 8; }
-#define DRMP3_BSPOS           ((bs_next_ptr - bs->buf)*8 - 24 + bs_sh)
-
-    float one = 0.0f;
-    int ireg = 0, big_val_cnt = gr_info->big_values;
-    const drmp3_uint8 *sfb = gr_info->sfbtab;
-    const drmp3_uint8 *bs_next_ptr = bs->buf + bs->pos/8;
-    drmp3_uint32 bs_cache = (((bs_next_ptr[0]*256u + bs_next_ptr[1])*256u + bs_next_ptr[2])*256u + bs_next_ptr[3]) << (bs->pos & 7);
-    int pairs_to_decode, np, bs_sh = (bs->pos & 7) - 8;
-    bs_next_ptr += 4;
-
-    while (big_val_cnt > 0)
-    {
-        int tab_num = gr_info->table_select[ireg];
-        int sfb_cnt = gr_info->region_count[ireg++];
-        const drmp3_int16 *codebook = tabs + tabindex[tab_num];
-        int linbits = g_linbits[tab_num];
-        if (linbits)
-        {
-            do
-            {
-                np = *sfb++ / 2;
-                pairs_to_decode = DRMP3_MIN(big_val_cnt, np);
-                one = *scf++;
-                do
-                {
-                    int j, w = 5;
-                    int leaf = codebook[DRMP3_PEEK_BITS(w)];
-                    while (leaf < 0)
-                    {
-                        DRMP3_FLUSH_BITS(w);
-                        w = leaf & 7;
-                        leaf = codebook[DRMP3_PEEK_BITS(w) - (leaf >> 3)];
-                    }
-                    DRMP3_FLUSH_BITS(leaf >> 8);
-
-                    for (j = 0; j < 2; j++, dst++, leaf >>= 4)
-                    {
-                        int lsb = leaf & 0x0F;
-                        if (lsb == 15)
-                        {
-                            lsb += DRMP3_PEEK_BITS(linbits);
-                            DRMP3_FLUSH_BITS(linbits);
-                            DRMP3_CHECK_BITS;
-                            *dst = one*drmp3_L3_pow_43(lsb)*((drmp3_int32)bs_cache < 0 ? -1: 1);
-                        } else
-                        {
-                            *dst = g_drmp3_pow43[16 + lsb - 16*(bs_cache >> 31)]*one;
-                        }
-                        DRMP3_FLUSH_BITS(lsb ? 1 : 0);
-                    }
-                    DRMP3_CHECK_BITS;
-                } while (--pairs_to_decode);
-            } while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0);
-        } else
-        {
-            do
-            {
-                np = *sfb++ / 2;
-                pairs_to_decode = DRMP3_MIN(big_val_cnt, np);
-                one = *scf++;
-                do
-                {
-                    int j, w = 5;
-                    int leaf = codebook[DRMP3_PEEK_BITS(w)];
-                    while (leaf < 0)
-                    {
-                        DRMP3_FLUSH_BITS(w);
-                        w = leaf & 7;
-                        leaf = codebook[DRMP3_PEEK_BITS(w) - (leaf >> 3)];
-                    }
-                    DRMP3_FLUSH_BITS(leaf >> 8);
-
-                    for (j = 0; j < 2; j++, dst++, leaf >>= 4)
-                    {
-                        int lsb = leaf & 0x0F;
-                        *dst = g_drmp3_pow43[16 + lsb - 16*(bs_cache >> 31)]*one;
-                        DRMP3_FLUSH_BITS(lsb ? 1 : 0);
-                    }
-                    DRMP3_CHECK_BITS;
-                } while (--pairs_to_decode);
-            } while ((big_val_cnt -= np) > 0 && --sfb_cnt >= 0);
-        }
-    }
-
-    for (np = 1 - big_val_cnt;; dst += 4)
-    {
-        const drmp3_uint8 *codebook_count1 = (gr_info->count1_table) ? tab33 : tab32;
-        int leaf = codebook_count1[DRMP3_PEEK_BITS(4)];
-        if (!(leaf & 8))
-        {
-            leaf = codebook_count1[(leaf >> 3) + (bs_cache << 4 >> (32 - (leaf & 3)))];
-        }
-        DRMP3_FLUSH_BITS(leaf & 7);
-        if (DRMP3_BSPOS > layer3gr_limit)
-        {
-            break;
-        }
-#define DRMP3_RELOAD_SCALEFACTOR  if (!--np) { np = *sfb++/2; if (!np) break; one = *scf++; }
-#define DRMP3_DEQ_COUNT1(s) if (leaf & (128 >> s)) { dst[s] = ((drmp3_int32)bs_cache < 0) ? -one : one; DRMP3_FLUSH_BITS(1) }
-        DRMP3_RELOAD_SCALEFACTOR;
-        DRMP3_DEQ_COUNT1(0);
-        DRMP3_DEQ_COUNT1(1);
-        DRMP3_RELOAD_SCALEFACTOR;
-        DRMP3_DEQ_COUNT1(2);
-        DRMP3_DEQ_COUNT1(3);
-        DRMP3_CHECK_BITS;
-    }
-
-    bs->pos = layer3gr_limit;
-}
-
-static void drmp3_L3_midside_stereo(float *left, int n)
-{
-    int i = 0;
-    float *right = left + 576;
-#if DRMP3_HAVE_SIMD
-    if (drmp3_have_simd())
-    {
-        for (; i < n - 3; i += 4)
-        {
-            drmp3_f4 vl = DRMP3_VLD(left + i);
-            drmp3_f4 vr = DRMP3_VLD(right + i);
-            DRMP3_VSTORE(left + i, DRMP3_VADD(vl, vr));
-            DRMP3_VSTORE(right + i, DRMP3_VSUB(vl, vr));
-        }
-#ifdef __GNUC__
-        /* Workaround for spurious -Waggressive-loop-optimizations warning from gcc.
-         * For more info see: https://github.com/lieff/minimp3/issues/88
-         */
-        if (__builtin_constant_p(n % 4 == 0) && n % 4 == 0)
-            return;
-#endif
-    }
-#endif
-    for (; i < n; i++)
-    {
-        float a = left[i];
-        float b = right[i];
-        left[i] = a + b;
-        right[i] = a - b;
-    }
-}
-
-static void drmp3_L3_intensity_stereo_band(float *left, int n, float kl, float kr)
-{
-    int i;
-    for (i = 0; i < n; i++)
-    {
-        left[i + 576] = left[i]*kr;
-        left[i] = left[i]*kl;
-    }
-}
-
-static void drmp3_L3_stereo_top_band(const float *right, const drmp3_uint8 *sfb, int nbands, int max_band[3])
-{
-    int i, k;
-
-    max_band[0] = max_band[1] = max_band[2] = -1;
-
-    for (i = 0; i < nbands; i++)
-    {
-        for (k = 0; k < sfb[i]; k += 2)
-        {
-            if (right[k] != 0 || right[k + 1] != 0)
-            {
-                max_band[i % 3] = i;
-                break;
-            }
-        }
-        right += sfb[i];
-    }
-}
-
-static void drmp3_L3_stereo_process(float *left, const drmp3_uint8 *ist_pos, const drmp3_uint8 *sfb, const drmp3_uint8 *hdr, int max_band[3], int mpeg2_sh)
-{
-    static const float g_pan[7*2] = { 0,1,0.21132487f,0.78867513f,0.36602540f,0.63397460f,0.5f,0.5f,0.63397460f,0.36602540f,0.78867513f,0.21132487f,1,0 };
-    unsigned i, max_pos = DRMP3_HDR_TEST_MPEG1(hdr) ? 7 : 64;
-
-    for (i = 0; sfb[i]; i++)
-    {
-        unsigned ipos = ist_pos[i];
-        if ((int)i > max_band[i % 3] && ipos < max_pos)
-        {
-            float kl, kr, s = DRMP3_HDR_TEST_MS_STEREO(hdr) ? 1.41421356f : 1;
-            if (DRMP3_HDR_TEST_MPEG1(hdr))
-            {
-                kl = g_pan[2*ipos];
-                kr = g_pan[2*ipos + 1];
-            } else
-            {
-                kl = 1;
-                kr = drmp3_L3_ldexp_q2(1, (ipos + 1) >> 1 << mpeg2_sh);
-                if (ipos & 1)
-                {
-                    kl = kr;
-                    kr = 1;
-                }
-            }
-            drmp3_L3_intensity_stereo_band(left, sfb[i], kl*s, kr*s);
-        } else if (DRMP3_HDR_TEST_MS_STEREO(hdr))
-        {
-            drmp3_L3_midside_stereo(left, sfb[i]);
-        }
-        left += sfb[i];
-    }
-}
-
-static void drmp3_L3_intensity_stereo(float *left, drmp3_uint8 *ist_pos, const drmp3_L3_gr_info *gr, const drmp3_uint8 *hdr)
-{
-    int max_band[3], n_sfb = gr->n_long_sfb + gr->n_short_sfb;
-    int i, max_blocks = gr->n_short_sfb ? 3 : 1;
-
-    drmp3_L3_stereo_top_band(left + 576, gr->sfbtab, n_sfb, max_band);
-    if (gr->n_long_sfb)
-    {
-        max_band[0] = max_band[1] = max_band[2] = DRMP3_MAX(DRMP3_MAX(max_band[0], max_band[1]), max_band[2]);
-    }
-    for (i = 0; i < max_blocks; i++)
-    {
-        int default_pos = DRMP3_HDR_TEST_MPEG1(hdr) ? 3 : 0;
-        int itop = n_sfb - max_blocks + i;
-        int prev = itop - max_blocks;
-        ist_pos[itop] = (drmp3_uint8)(max_band[i] >= prev ? default_pos : ist_pos[prev]);
-    }
-    drmp3_L3_stereo_process(left, ist_pos, gr->sfbtab, hdr, max_band, gr[1].scalefac_compress & 1);
-}
-
-static void drmp3_L3_reorder(float *grbuf, float *scratch, const drmp3_uint8 *sfb)
-{
-    int i, len;
-    float *src = grbuf, *dst = scratch;
-
-    for (;0 != (len = *sfb); sfb += 3, src += 2*len)
-    {
-        for (i = 0; i < len; i++, src++)
-        {
-            *dst++ = src[0*len];
-            *dst++ = src[1*len];
-            *dst++ = src[2*len];
-        }
-    }
-    DRMP3_COPY_MEMORY(grbuf, scratch, (dst - scratch)*sizeof(float));
-}
-
-static void drmp3_L3_antialias(float *grbuf, int nbands)
-{
-    static const float g_aa[2][8] = {
-        {0.85749293f,0.88174200f,0.94962865f,0.98331459f,0.99551782f,0.99916056f,0.99989920f,0.99999316f},
-        {0.51449576f,0.47173197f,0.31337745f,0.18191320f,0.09457419f,0.04096558f,0.01419856f,0.00369997f}
-    };
-
-    for (; nbands > 0; nbands--, grbuf += 18)
-    {
-        int i = 0;
-#if DRMP3_HAVE_SIMD
-        if (drmp3_have_simd()) for (; i < 8; i += 4)
-        {
-            drmp3_f4 vu = DRMP3_VLD(grbuf + 18 + i);
-            drmp3_f4 vd = DRMP3_VLD(grbuf + 14 - i);
-            drmp3_f4 vc0 = DRMP3_VLD(g_aa[0] + i);
-            drmp3_f4 vc1 = DRMP3_VLD(g_aa[1] + i);
-            vd = DRMP3_VREV(vd);
-            DRMP3_VSTORE(grbuf + 18 + i, DRMP3_VSUB(DRMP3_VMUL(vu, vc0), DRMP3_VMUL(vd, vc1)));
-            vd = DRMP3_VADD(DRMP3_VMUL(vu, vc1), DRMP3_VMUL(vd, vc0));
-            DRMP3_VSTORE(grbuf + 14 - i, DRMP3_VREV(vd));
-        }
-#endif
-#ifndef DR_MP3_ONLY_SIMD
-        for(; i < 8; i++)
-        {
-            float u = grbuf[18 + i];
-            float d = grbuf[17 - i];
-            grbuf[18 + i] = u*g_aa[0][i] - d*g_aa[1][i];
-            grbuf[17 - i] = u*g_aa[1][i] + d*g_aa[0][i];
-        }
-#endif
-    }
-}
-
-static void drmp3_L3_dct3_9(float *y)
-{
-    float s0, s1, s2, s3, s4, s5, s6, s7, s8, t0, t2, t4;
-
-    s0 = y[0]; s2 = y[2]; s4 = y[4]; s6 = y[6]; s8 = y[8];
-    t0 = s0 + s6*0.5f;
-    s0 -= s6;
-    t4 = (s4 + s2)*0.93969262f;
-    t2 = (s8 + s2)*0.76604444f;
-    s6 = (s4 - s8)*0.17364818f;
-    s4 += s8 - s2;
-
-    s2 = s0 - s4*0.5f;
-    y[4] = s4 + s0;
-    s8 = t0 - t2 + s6;
-    s0 = t0 - t4 + t2;
-    s4 = t0 + t4 - s6;
-
-    s1 = y[1]; s3 = y[3]; s5 = y[5]; s7 = y[7];
-
-    s3 *= 0.86602540f;
-    t0 = (s5 + s1)*0.98480775f;
-    t4 = (s5 - s7)*0.34202014f;
-    t2 = (s1 + s7)*0.64278761f;
-    s1 = (s1 - s5 - s7)*0.86602540f;
-
-    s5 = t0 - s3 - t2;
-    s7 = t4 - s3 - t0;
-    s3 = t4 + s3 - t2;
-
-    y[0] = s4 - s7;
-    y[1] = s2 + s1;
-    y[2] = s0 - s3;
-    y[3] = s8 + s5;
-    y[5] = s8 - s5;
-    y[6] = s0 + s3;
-    y[7] = s2 - s1;
-    y[8] = s4 + s7;
-}
-
-static void drmp3_L3_imdct36(float *grbuf, float *overlap, const float *window, int nbands)
-{
-    int i, j;
-    static const float g_twid9[18] = {
-        0.73727734f,0.79335334f,0.84339145f,0.88701083f,0.92387953f,0.95371695f,0.97629601f,0.99144486f,0.99904822f,0.67559021f,0.60876143f,0.53729961f,0.46174861f,0.38268343f,0.30070580f,0.21643961f,0.13052619f,0.04361938f
-    };
-
-    for (j = 0; j < nbands; j++, grbuf += 18, overlap += 9)
-    {
-        float co[9], si[9];
-        co[0] = -grbuf[0];
-        si[0] = grbuf[17];
-        for (i = 0; i < 4; i++)
-        {
-            si[8 - 2*i] =   grbuf[4*i + 1] - grbuf[4*i + 2];
-            co[1 + 2*i] =   grbuf[4*i + 1] + grbuf[4*i + 2];
-            si[7 - 2*i] =   grbuf[4*i + 4] - grbuf[4*i + 3];
-            co[2 + 2*i] = -(grbuf[4*i + 3] + grbuf[4*i + 4]);
-        }
-        drmp3_L3_dct3_9(co);
-        drmp3_L3_dct3_9(si);
-
-        si[1] = -si[1];
-        si[3] = -si[3];
-        si[5] = -si[5];
-        si[7] = -si[7];
-
-        i = 0;
-
-#if DRMP3_HAVE_SIMD
-        if (drmp3_have_simd()) for (; i < 8; i += 4)
-        {
-            drmp3_f4 vovl = DRMP3_VLD(overlap + i);
-            drmp3_f4 vc = DRMP3_VLD(co + i);
-            drmp3_f4 vs = DRMP3_VLD(si + i);
-            drmp3_f4 vr0 = DRMP3_VLD(g_twid9 + i);
-            drmp3_f4 vr1 = DRMP3_VLD(g_twid9 + 9 + i);
-            drmp3_f4 vw0 = DRMP3_VLD(window + i);
-            drmp3_f4 vw1 = DRMP3_VLD(window + 9 + i);
-            drmp3_f4 vsum = DRMP3_VADD(DRMP3_VMUL(vc, vr1), DRMP3_VMUL(vs, vr0));
-            DRMP3_VSTORE(overlap + i, DRMP3_VSUB(DRMP3_VMUL(vc, vr0), DRMP3_VMUL(vs, vr1)));
-            DRMP3_VSTORE(grbuf + i, DRMP3_VSUB(DRMP3_VMUL(vovl, vw0), DRMP3_VMUL(vsum, vw1)));
-            vsum = DRMP3_VADD(DRMP3_VMUL(vovl, vw1), DRMP3_VMUL(vsum, vw0));
-            DRMP3_VSTORE(grbuf + 14 - i, DRMP3_VREV(vsum));
-        }
-#endif
-        for (; i < 9; i++)
-        {
-            float ovl  = overlap[i];
-            float sum  = co[i]*g_twid9[9 + i] + si[i]*g_twid9[0 + i];
-            overlap[i] = co[i]*g_twid9[0 + i] - si[i]*g_twid9[9 + i];
-            grbuf[i]      = ovl*window[0 + i] - sum*window[9 + i];
-            grbuf[17 - i] = ovl*window[9 + i] + sum*window[0 + i];
-        }
-    }
-}
-
-static void drmp3_L3_idct3(float x0, float x1, float x2, float *dst)
-{
-    float m1 = x1*0.86602540f;
-    float a1 = x0 - x2*0.5f;
-    dst[1] = x0 + x2;
-    dst[0] = a1 + m1;
-    dst[2] = a1 - m1;
-}
-
-static void drmp3_L3_imdct12(float *x, float *dst, float *overlap)
-{
-    static const float g_twid3[6] = { 0.79335334f,0.92387953f,0.99144486f, 0.60876143f,0.38268343f,0.13052619f };
-    float co[3], si[3];
-    int i;
-
-    drmp3_L3_idct3(-x[0], x[6] + x[3], x[12] + x[9], co);
-    drmp3_L3_idct3(x[15], x[12] - x[9], x[6] - x[3], si);
-    si[1] = -si[1];
-
-    for (i = 0; i < 3; i++)
-    {
-        float ovl  = overlap[i];
-        float sum  = co[i]*g_twid3[3 + i] + si[i]*g_twid3[0 + i];
-        overlap[i] = co[i]*g_twid3[0 + i] - si[i]*g_twid3[3 + i];
-        dst[i]     = ovl*g_twid3[2 - i] - sum*g_twid3[5 - i];
-        dst[5 - i] = ovl*g_twid3[5 - i] + sum*g_twid3[2 - i];
-    }
-}
-
-static void drmp3_L3_imdct_short(float *grbuf, float *overlap, int nbands)
-{
-    for (;nbands > 0; nbands--, overlap += 9, grbuf += 18)
-    {
-        float tmp[18];
-        DRMP3_COPY_MEMORY(tmp, grbuf, sizeof(tmp));
-        DRMP3_COPY_MEMORY(grbuf, overlap, 6*sizeof(float));
-        drmp3_L3_imdct12(tmp, grbuf + 6, overlap + 6);
-        drmp3_L3_imdct12(tmp + 1, grbuf + 12, overlap + 6);
-        drmp3_L3_imdct12(tmp + 2, overlap, overlap + 6);
-    }
-}
-
-static void drmp3_L3_change_sign(float *grbuf)
-{
-    int b, i;
-    for (b = 0, grbuf += 18; b < 32; b += 2, grbuf += 36)
-        for (i = 1; i < 18; i += 2)
-            grbuf[i] = -grbuf[i];
-}
-
-static void drmp3_L3_imdct_gr(float *grbuf, float *overlap, unsigned block_type, unsigned n_long_bands)
-{
-    static const float g_mdct_window[2][18] = {
-        { 0.99904822f,0.99144486f,0.97629601f,0.95371695f,0.92387953f,0.88701083f,0.84339145f,0.79335334f,0.73727734f,0.04361938f,0.13052619f,0.21643961f,0.30070580f,0.38268343f,0.46174861f,0.53729961f,0.60876143f,0.67559021f },
-        { 1,1,1,1,1,1,0.99144486f,0.92387953f,0.79335334f,0,0,0,0,0,0,0.13052619f,0.38268343f,0.60876143f }
-    };
-    if (n_long_bands)
-    {
-        drmp3_L3_imdct36(grbuf, overlap, g_mdct_window[0], n_long_bands);
-        grbuf += 18*n_long_bands;
-        overlap += 9*n_long_bands;
-    }
-    if (block_type == DRMP3_SHORT_BLOCK_TYPE)
-        drmp3_L3_imdct_short(grbuf, overlap, 32 - n_long_bands);
-    else
-        drmp3_L3_imdct36(grbuf, overlap, g_mdct_window[block_type == DRMP3_STOP_BLOCK_TYPE], 32 - n_long_bands);
-}
-
-static void drmp3_L3_save_reservoir(drmp3dec *h, drmp3dec_scratch *s)
-{
-    int pos = (s->bs.pos + 7)/8u;
-    int remains = s->bs.limit/8u - pos;
-    if (remains > DRMP3_MAX_BITRESERVOIR_BYTES)
-    {
-        pos += remains - DRMP3_MAX_BITRESERVOIR_BYTES;
-        remains = DRMP3_MAX_BITRESERVOIR_BYTES;
-    }
-    if (remains > 0)
-    {
-        DRMP3_MOVE_MEMORY(h->reserv_buf, s->maindata + pos, remains);
-    }
-    h->reserv = remains;
-}
-
-static int drmp3_L3_restore_reservoir(drmp3dec *h, drmp3_bs *bs, drmp3dec_scratch *s, int main_data_begin)
-{
-    int frame_bytes = (bs->limit - bs->pos)/8;
-    int bytes_have = DRMP3_MIN(h->reserv, main_data_begin);
-    DRMP3_COPY_MEMORY(s->maindata, h->reserv_buf + DRMP3_MAX(0, h->reserv - main_data_begin), DRMP3_MIN(h->reserv, main_data_begin));
-    DRMP3_COPY_MEMORY(s->maindata + bytes_have, bs->buf + bs->pos/8, frame_bytes);
-    drmp3_bs_init(&s->bs, s->maindata, bytes_have + frame_bytes);
-    return h->reserv >= main_data_begin;
-}
-
-static void drmp3_L3_decode(drmp3dec *h, drmp3dec_scratch *s, drmp3_L3_gr_info *gr_info, int nch)
-{
-    int ch;
-
-    for (ch = 0; ch < nch; ch++)
-    {
-        int layer3gr_limit = s->bs.pos + gr_info[ch].part_23_length;
-        drmp3_L3_decode_scalefactors(h->header, s->ist_pos[ch], &s->bs, gr_info + ch, s->scf, ch);
-        drmp3_L3_huffman(s->grbuf[ch], &s->bs, gr_info + ch, s->scf, layer3gr_limit);
-    }
-
-    if (DRMP3_HDR_TEST_I_STEREO(h->header))
-    {
-        drmp3_L3_intensity_stereo(s->grbuf[0], s->ist_pos[1], gr_info, h->header);
-    } else if (DRMP3_HDR_IS_MS_STEREO(h->header))
-    {
-        drmp3_L3_midside_stereo(s->grbuf[0], 576);
-    }
-
-    for (ch = 0; ch < nch; ch++, gr_info++)
-    {
-        int aa_bands = 31;
-        int n_long_bands = (gr_info->mixed_block_flag ? 2 : 0) << (int)(DRMP3_HDR_GET_MY_SAMPLE_RATE(h->header) == 2);
-
-        if (gr_info->n_short_sfb)
-        {
-            aa_bands = n_long_bands - 1;
-            drmp3_L3_reorder(s->grbuf[ch] + n_long_bands*18, s->syn[0], gr_info->sfbtab + gr_info->n_long_sfb);
-        }
-
-        drmp3_L3_antialias(s->grbuf[ch], aa_bands);
-        drmp3_L3_imdct_gr(s->grbuf[ch], h->mdct_overlap[ch], gr_info->block_type, n_long_bands);
-        drmp3_L3_change_sign(s->grbuf[ch]);
-    }
-}
-
-static void drmp3d_DCT_II(float *grbuf, int n)
-{
-    static const float g_sec[24] = {
-        10.19000816f,0.50060302f,0.50241929f,3.40760851f,0.50547093f,0.52249861f,2.05778098f,0.51544732f,0.56694406f,1.48416460f,0.53104258f,0.64682180f,1.16943991f,0.55310392f,0.78815460f,0.97256821f,0.58293498f,1.06067765f,0.83934963f,0.62250412f,1.72244716f,0.74453628f,0.67480832f,5.10114861f
-    };
-    int i, k = 0;
-#if DRMP3_HAVE_SIMD
-    if (drmp3_have_simd()) for (; k < n; k += 4)
-    {
-        drmp3_f4 t[4][8], *x;
-        float *y = grbuf + k;
-
-        for (x = t[0], i = 0; i < 8; i++, x++)
-        {
-            drmp3_f4 x0 = DRMP3_VLD(&y[i*18]);
-            drmp3_f4 x1 = DRMP3_VLD(&y[(15 - i)*18]);
-            drmp3_f4 x2 = DRMP3_VLD(&y[(16 + i)*18]);
-            drmp3_f4 x3 = DRMP3_VLD(&y[(31 - i)*18]);
-            drmp3_f4 t0 = DRMP3_VADD(x0, x3);
-            drmp3_f4 t1 = DRMP3_VADD(x1, x2);
-            drmp3_f4 t2 = DRMP3_VMUL_S(DRMP3_VSUB(x1, x2), g_sec[3*i + 0]);
-            drmp3_f4 t3 = DRMP3_VMUL_S(DRMP3_VSUB(x0, x3), g_sec[3*i + 1]);
-            x[0] = DRMP3_VADD(t0, t1);
-            x[8] = DRMP3_VMUL_S(DRMP3_VSUB(t0, t1), g_sec[3*i + 2]);
-            x[16] = DRMP3_VADD(t3, t2);
-            x[24] = DRMP3_VMUL_S(DRMP3_VSUB(t3, t2), g_sec[3*i + 2]);
-        }
-        for (x = t[0], i = 0; i < 4; i++, x += 8)
-        {
-            drmp3_f4 x0 = x[0], x1 = x[1], x2 = x[2], x3 = x[3], x4 = x[4], x5 = x[5], x6 = x[6], x7 = x[7], xt;
-            xt = DRMP3_VSUB(x0, x7); x0 = DRMP3_VADD(x0, x7);
-            x7 = DRMP3_VSUB(x1, x6); x1 = DRMP3_VADD(x1, x6);
-            x6 = DRMP3_VSUB(x2, x5); x2 = DRMP3_VADD(x2, x5);
-            x5 = DRMP3_VSUB(x3, x4); x3 = DRMP3_VADD(x3, x4);
-            x4 = DRMP3_VSUB(x0, x3); x0 = DRMP3_VADD(x0, x3);
-            x3 = DRMP3_VSUB(x1, x2); x1 = DRMP3_VADD(x1, x2);
-            x[0] = DRMP3_VADD(x0, x1);
-            x[4] = DRMP3_VMUL_S(DRMP3_VSUB(x0, x1), 0.70710677f);
-            x5 = DRMP3_VADD(x5, x6);
-            x6 = DRMP3_VMUL_S(DRMP3_VADD(x6, x7), 0.70710677f);
-            x7 = DRMP3_VADD(x7, xt);
-            x3 = DRMP3_VMUL_S(DRMP3_VADD(x3, x4), 0.70710677f);
-            x5 = DRMP3_VSUB(x5, DRMP3_VMUL_S(x7, 0.198912367f)); /* rotate by PI/8 */
-            x7 = DRMP3_VADD(x7, DRMP3_VMUL_S(x5, 0.382683432f));
-            x5 = DRMP3_VSUB(x5, DRMP3_VMUL_S(x7, 0.198912367f));
-            x0 = DRMP3_VSUB(xt, x6); xt = DRMP3_VADD(xt, x6);
-            x[1] = DRMP3_VMUL_S(DRMP3_VADD(xt, x7), 0.50979561f);
-            x[2] = DRMP3_VMUL_S(DRMP3_VADD(x4, x3), 0.54119611f);
-            x[3] = DRMP3_VMUL_S(DRMP3_VSUB(x0, x5), 0.60134488f);
-            x[5] = DRMP3_VMUL_S(DRMP3_VADD(x0, x5), 0.89997619f);
-            x[6] = DRMP3_VMUL_S(DRMP3_VSUB(x4, x3), 1.30656302f);
-            x[7] = DRMP3_VMUL_S(DRMP3_VSUB(xt, x7), 2.56291556f);
-        }
-
-        if (k > n - 3)
-        {
-#if DRMP3_HAVE_SSE
-#define DRMP3_VSAVE2(i, v) _mm_storel_pi((__m64 *)(void*)&y[i*18], v)
-#else
-#define DRMP3_VSAVE2(i, v) vst1_f32((float32_t *)&y[(i)*18],  vget_low_f32(v))
-#endif
-            for (i = 0; i < 7; i++, y += 4*18)
-            {
-                drmp3_f4 s = DRMP3_VADD(t[3][i], t[3][i + 1]);
-                DRMP3_VSAVE2(0, t[0][i]);
-                DRMP3_VSAVE2(1, DRMP3_VADD(t[2][i], s));
-                DRMP3_VSAVE2(2, DRMP3_VADD(t[1][i], t[1][i + 1]));
-                DRMP3_VSAVE2(3, DRMP3_VADD(t[2][1 + i], s));
-            }
-            DRMP3_VSAVE2(0, t[0][7]);
-            DRMP3_VSAVE2(1, DRMP3_VADD(t[2][7], t[3][7]));
-            DRMP3_VSAVE2(2, t[1][7]);
-            DRMP3_VSAVE2(3, t[3][7]);
-        } else
-        {
-#define DRMP3_VSAVE4(i, v) DRMP3_VSTORE(&y[(i)*18], v)
-            for (i = 0; i < 7; i++, y += 4*18)
-            {
-                drmp3_f4 s = DRMP3_VADD(t[3][i], t[3][i + 1]);
-                DRMP3_VSAVE4(0, t[0][i]);
-                DRMP3_VSAVE4(1, DRMP3_VADD(t[2][i], s));
-                DRMP3_VSAVE4(2, DRMP3_VADD(t[1][i], t[1][i + 1]));
-                DRMP3_VSAVE4(3, DRMP3_VADD(t[2][1 + i], s));
-            }
-            DRMP3_VSAVE4(0, t[0][7]);
-            DRMP3_VSAVE4(1, DRMP3_VADD(t[2][7], t[3][7]));
-            DRMP3_VSAVE4(2, t[1][7]);
-            DRMP3_VSAVE4(3, t[3][7]);
-        }
-    } else
-#endif
-#ifdef DR_MP3_ONLY_SIMD
-    {} /* for HAVE_SIMD=1, MINIMP3_ONLY_SIMD=1 case we do not need non-intrinsic "else" branch */
-#else
-    for (; k < n; k++)
-    {
-        float t[4][8], *x, *y = grbuf + k;
-
-        for (x = t[0], i = 0; i < 8; i++, x++)
-        {
-            float x0 = y[i*18];
-            float x1 = y[(15 - i)*18];
-            float x2 = y[(16 + i)*18];
-            float x3 = y[(31 - i)*18];
-            float t0 = x0 + x3;
-            float t1 = x1 + x2;
-            float t2 = (x1 - x2)*g_sec[3*i + 0];
-            float t3 = (x0 - x3)*g_sec[3*i + 1];
-            x[0] = t0 + t1;
-            x[8] = (t0 - t1)*g_sec[3*i + 2];
-            x[16] = t3 + t2;
-            x[24] = (t3 - t2)*g_sec[3*i + 2];
-        }
-        for (x = t[0], i = 0; i < 4; i++, x += 8)
-        {
-            float x0 = x[0], x1 = x[1], x2 = x[2], x3 = x[3], x4 = x[4], x5 = x[5], x6 = x[6], x7 = x[7], xt;
-            xt = x0 - x7; x0 += x7;
-            x7 = x1 - x6; x1 += x6;
-            x6 = x2 - x5; x2 += x5;
-            x5 = x3 - x4; x3 += x4;
-            x4 = x0 - x3; x0 += x3;
-            x3 = x1 - x2; x1 += x2;
-            x[0] = x0 + x1;
-            x[4] = (x0 - x1)*0.70710677f;
-            x5 =  x5 + x6;
-            x6 = (x6 + x7)*0.70710677f;
-            x7 =  x7 + xt;
-            x3 = (x3 + x4)*0.70710677f;
-            x5 -= x7*0.198912367f;  /* rotate by PI/8 */
-            x7 += x5*0.382683432f;
-            x5 -= x7*0.198912367f;
-            x0 = xt - x6; xt += x6;
-            x[1] = (xt + x7)*0.50979561f;
-            x[2] = (x4 + x3)*0.54119611f;
-            x[3] = (x0 - x5)*0.60134488f;
-            x[5] = (x0 + x5)*0.89997619f;
-            x[6] = (x4 - x3)*1.30656302f;
-            x[7] = (xt - x7)*2.56291556f;
-
-        }
-        for (i = 0; i < 7; i++, y += 4*18)
-        {
-            y[0*18] = t[0][i];
-            y[1*18] = t[2][i] + t[3][i] + t[3][i + 1];
-            y[2*18] = t[1][i] + t[1][i + 1];
-            y[3*18] = t[2][i + 1] + t[3][i] + t[3][i + 1];
-        }
-        y[0*18] = t[0][7];
-        y[1*18] = t[2][7] + t[3][7];
-        y[2*18] = t[1][7];
-        y[3*18] = t[3][7];
-    }
-#endif
-}
-
-#ifndef DR_MP3_FLOAT_OUTPUT
-typedef drmp3_int16 drmp3d_sample_t;
-
-static drmp3_int16 drmp3d_scale_pcm(float sample)
-{
-    drmp3_int16 s;
-#if DRMP3_HAVE_ARMV6
-    drmp3_int32 s32 = (drmp3_int32)(sample + .5f);
-    s32 -= (s32 < 0);
-    s = (drmp3_int16)drmp3_clip_int16_arm(s32);
-#else
-    if (sample >=  32766.5) return (drmp3_int16) 32767;
-    if (sample <= -32767.5) return (drmp3_int16)-32768;
-    s = (drmp3_int16)(sample + .5f);
-    s -= (s < 0);   /* away from zero, to be compliant */
-#endif
-    return s;
-}
-#else
-typedef float drmp3d_sample_t;
-
-static float drmp3d_scale_pcm(float sample)
-{
-    return sample*(1.f/32768.f);
-}
-#endif
-
-static void drmp3d_synth_pair(drmp3d_sample_t *pcm, int nch, const float *z)
-{
-    float a;
-    a  = (z[14*64] - z[    0]) * 29;
-    a += (z[ 1*64] + z[13*64]) * 213;
-    a += (z[12*64] - z[ 2*64]) * 459;
-    a += (z[ 3*64] + z[11*64]) * 2037;
-    a += (z[10*64] - z[ 4*64]) * 5153;
-    a += (z[ 5*64] + z[ 9*64]) * 6574;
-    a += (z[ 8*64] - z[ 6*64]) * 37489;
-    a +=  z[ 7*64]             * 75038;
-    pcm[0] = drmp3d_scale_pcm(a);
-
-    z += 2;
-    a  = z[14*64] * 104;
-    a += z[12*64] * 1567;
-    a += z[10*64] * 9727;
-    a += z[ 8*64] * 64019;
-    a += z[ 6*64] * -9975;
-    a += z[ 4*64] * -45;
-    a += z[ 2*64] * 146;
-    a += z[ 0*64] * -5;
-    pcm[16*nch] = drmp3d_scale_pcm(a);
-}
-
-static void drmp3d_synth(float *xl, drmp3d_sample_t *dstl, int nch, float *lins)
-{
-    int i;
-    float *xr = xl + 576*(nch - 1);
-    drmp3d_sample_t *dstr = dstl + (nch - 1);
-
-    static const float g_win[] = {
-        -1,26,-31,208,218,401,-519,2063,2000,4788,-5517,7134,5959,35640,-39336,74992,
-        -1,24,-35,202,222,347,-581,2080,1952,4425,-5879,7640,5288,33791,-41176,74856,
-        -1,21,-38,196,225,294,-645,2087,1893,4063,-6237,8092,4561,31947,-43006,74630,
-        -1,19,-41,190,227,244,-711,2085,1822,3705,-6589,8492,3776,30112,-44821,74313,
-        -1,17,-45,183,228,197,-779,2075,1739,3351,-6935,8840,2935,28289,-46617,73908,
-        -1,16,-49,176,228,153,-848,2057,1644,3004,-7271,9139,2037,26482,-48390,73415,
-        -2,14,-53,169,227,111,-919,2032,1535,2663,-7597,9389,1082,24694,-50137,72835,
-        -2,13,-58,161,224,72,-991,2001,1414,2330,-7910,9592,70,22929,-51853,72169,
-        -2,11,-63,154,221,36,-1064,1962,1280,2006,-8209,9750,-998,21189,-53534,71420,
-        -2,10,-68,147,215,2,-1137,1919,1131,1692,-8491,9863,-2122,19478,-55178,70590,
-        -3,9,-73,139,208,-29,-1210,1870,970,1388,-8755,9935,-3300,17799,-56778,69679,
-        -3,8,-79,132,200,-57,-1283,1817,794,1095,-8998,9966,-4533,16155,-58333,68692,
-        -4,7,-85,125,189,-83,-1356,1759,605,814,-9219,9959,-5818,14548,-59838,67629,
-        -4,7,-91,117,177,-106,-1428,1698,402,545,-9416,9916,-7154,12980,-61289,66494,
-        -5,6,-97,111,163,-127,-1498,1634,185,288,-9585,9838,-8540,11455,-62684,65290
-    };
-    float *zlin = lins + 15*64;
-    const float *w = g_win;
-
-    zlin[4*15]     = xl[18*16];
-    zlin[4*15 + 1] = xr[18*16];
-    zlin[4*15 + 2] = xl[0];
-    zlin[4*15 + 3] = xr[0];
-
-    zlin[4*31]     = xl[1 + 18*16];
-    zlin[4*31 + 1] = xr[1 + 18*16];
-    zlin[4*31 + 2] = xl[1];
-    zlin[4*31 + 3] = xr[1];
-
-    drmp3d_synth_pair(dstr, nch, lins + 4*15 + 1);
-    drmp3d_synth_pair(dstr + 32*nch, nch, lins + 4*15 + 64 + 1);
-    drmp3d_synth_pair(dstl, nch, lins + 4*15);
-    drmp3d_synth_pair(dstl + 32*nch, nch, lins + 4*15 + 64);
-
-#if DRMP3_HAVE_SIMD
-    if (drmp3_have_simd()) for (i = 14; i >= 0; i--)
-    {
-#define DRMP3_VLOAD(k) drmp3_f4 w0 = DRMP3_VSET(*w++); drmp3_f4 w1 = DRMP3_VSET(*w++); drmp3_f4 vz = DRMP3_VLD(&zlin[4*i - 64*k]); drmp3_f4 vy = DRMP3_VLD(&zlin[4*i - 64*(15 - k)]);
-#define DRMP3_V0(k) { DRMP3_VLOAD(k) b =               DRMP3_VADD(DRMP3_VMUL(vz, w1), DRMP3_VMUL(vy, w0)) ; a =               DRMP3_VSUB(DRMP3_VMUL(vz, w0), DRMP3_VMUL(vy, w1));  }
-#define DRMP3_V1(k) { DRMP3_VLOAD(k) b = DRMP3_VADD(b, DRMP3_VADD(DRMP3_VMUL(vz, w1), DRMP3_VMUL(vy, w0))); a = DRMP3_VADD(a, DRMP3_VSUB(DRMP3_VMUL(vz, w0), DRMP3_VMUL(vy, w1))); }
-#define DRMP3_V2(k) { DRMP3_VLOAD(k) b = DRMP3_VADD(b, DRMP3_VADD(DRMP3_VMUL(vz, w1), DRMP3_VMUL(vy, w0))); a = DRMP3_VADD(a, DRMP3_VSUB(DRMP3_VMUL(vy, w1), DRMP3_VMUL(vz, w0))); }
-        drmp3_f4 a, b;
-        zlin[4*i]     = xl[18*(31 - i)];
-        zlin[4*i + 1] = xr[18*(31 - i)];
-        zlin[4*i + 2] = xl[1 + 18*(31 - i)];
-        zlin[4*i + 3] = xr[1 + 18*(31 - i)];
-        zlin[4*i + 64] = xl[1 + 18*(1 + i)];
-        zlin[4*i + 64 + 1] = xr[1 + 18*(1 + i)];
-        zlin[4*i - 64 + 2] = xl[18*(1 + i)];
-        zlin[4*i - 64 + 3] = xr[18*(1 + i)];
-
-        DRMP3_V0(0) DRMP3_V2(1) DRMP3_V1(2) DRMP3_V2(3) DRMP3_V1(4) DRMP3_V2(5) DRMP3_V1(6) DRMP3_V2(7)
-
-        {
-#ifndef DR_MP3_FLOAT_OUTPUT
-#if DRMP3_HAVE_SSE
-            static const drmp3_f4 g_max = { 32767.0f, 32767.0f, 32767.0f, 32767.0f };
-            static const drmp3_f4 g_min = { -32768.0f, -32768.0f, -32768.0f, -32768.0f };
-            __m128i pcm8 = _mm_packs_epi32(_mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(a, g_max), g_min)),
-                                           _mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(b, g_max), g_min)));
-            dstr[(15 - i)*nch] = (drmp3_int16)_mm_extract_epi16(pcm8, 1);
-            dstr[(17 + i)*nch] = (drmp3_int16)_mm_extract_epi16(pcm8, 5);
-            dstl[(15 - i)*nch] = (drmp3_int16)_mm_extract_epi16(pcm8, 0);
-            dstl[(17 + i)*nch] = (drmp3_int16)_mm_extract_epi16(pcm8, 4);
-            dstr[(47 - i)*nch] = (drmp3_int16)_mm_extract_epi16(pcm8, 3);
-            dstr[(49 + i)*nch] = (drmp3_int16)_mm_extract_epi16(pcm8, 7);
-            dstl[(47 - i)*nch] = (drmp3_int16)_mm_extract_epi16(pcm8, 2);
-            dstl[(49 + i)*nch] = (drmp3_int16)_mm_extract_epi16(pcm8, 6);
-#else
-            int16x4_t pcma, pcmb;
-            a = DRMP3_VADD(a, DRMP3_VSET(0.5f));
-            b = DRMP3_VADD(b, DRMP3_VSET(0.5f));
-            pcma = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(a), vreinterpretq_s32_u32(vcltq_f32(a, DRMP3_VSET(0)))));
-            pcmb = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(b), vreinterpretq_s32_u32(vcltq_f32(b, DRMP3_VSET(0)))));
-            vst1_lane_s16(dstr + (15 - i)*nch, pcma, 1);
-            vst1_lane_s16(dstr + (17 + i)*nch, pcmb, 1);
-            vst1_lane_s16(dstl + (15 - i)*nch, pcma, 0);
-            vst1_lane_s16(dstl + (17 + i)*nch, pcmb, 0);
-            vst1_lane_s16(dstr + (47 - i)*nch, pcma, 3);
-            vst1_lane_s16(dstr + (49 + i)*nch, pcmb, 3);
-            vst1_lane_s16(dstl + (47 - i)*nch, pcma, 2);
-            vst1_lane_s16(dstl + (49 + i)*nch, pcmb, 2);
-#endif
-#else
-        #if DRMP3_HAVE_SSE
-            static const drmp3_f4 g_scale = { 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f };
-        #else
-            const drmp3_f4 g_scale = vdupq_n_f32(1.0f/32768.0f);
-        #endif
-            a = DRMP3_VMUL(a, g_scale);
-            b = DRMP3_VMUL(b, g_scale);
-#if DRMP3_HAVE_SSE
-            _mm_store_ss(dstr + (15 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(1, 1, 1, 1)));
-            _mm_store_ss(dstr + (17 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(1, 1, 1, 1)));
-            _mm_store_ss(dstl + (15 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(0, 0, 0, 0)));
-            _mm_store_ss(dstl + (17 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(0, 0, 0, 0)));
-            _mm_store_ss(dstr + (47 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(3, 3, 3, 3)));
-            _mm_store_ss(dstr + (49 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(3, 3, 3, 3)));
-            _mm_store_ss(dstl + (47 - i)*nch, _mm_shuffle_ps(a, a, _MM_SHUFFLE(2, 2, 2, 2)));
-            _mm_store_ss(dstl + (49 + i)*nch, _mm_shuffle_ps(b, b, _MM_SHUFFLE(2, 2, 2, 2)));
-#else
-            vst1q_lane_f32(dstr + (15 - i)*nch, a, 1);
-            vst1q_lane_f32(dstr + (17 + i)*nch, b, 1);
-            vst1q_lane_f32(dstl + (15 - i)*nch, a, 0);
-            vst1q_lane_f32(dstl + (17 + i)*nch, b, 0);
-            vst1q_lane_f32(dstr + (47 - i)*nch, a, 3);
-            vst1q_lane_f32(dstr + (49 + i)*nch, b, 3);
-            vst1q_lane_f32(dstl + (47 - i)*nch, a, 2);
-            vst1q_lane_f32(dstl + (49 + i)*nch, b, 2);
-#endif
-#endif /* DR_MP3_FLOAT_OUTPUT */
-        }
-    } else
-#endif
-#ifdef DR_MP3_ONLY_SIMD
-    {} /* for HAVE_SIMD=1, MINIMP3_ONLY_SIMD=1 case we do not need non-intrinsic "else" branch */
-#else
-    for (i = 14; i >= 0; i--)
-    {
-#define DRMP3_LOAD(k) float w0 = *w++; float w1 = *w++; float *vz = &zlin[4*i - k*64]; float *vy = &zlin[4*i - (15 - k)*64];
-#define DRMP3_S0(k) { int j; DRMP3_LOAD(k); for (j = 0; j < 4; j++) b[j]  = vz[j]*w1 + vy[j]*w0, a[j]  = vz[j]*w0 - vy[j]*w1; }
-#define DRMP3_S1(k) { int j; DRMP3_LOAD(k); for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vz[j]*w0 - vy[j]*w1; }
-#define DRMP3_S2(k) { int j; DRMP3_LOAD(k); for (j = 0; j < 4; j++) b[j] += vz[j]*w1 + vy[j]*w0, a[j] += vy[j]*w1 - vz[j]*w0; }
-        float a[4], b[4];
-
-        zlin[4*i]     = xl[18*(31 - i)];
-        zlin[4*i + 1] = xr[18*(31 - i)];
-        zlin[4*i + 2] = xl[1 + 18*(31 - i)];
-        zlin[4*i + 3] = xr[1 + 18*(31 - i)];
-        zlin[4*(i + 16)]   = xl[1 + 18*(1 + i)];
-        zlin[4*(i + 16) + 1] = xr[1 + 18*(1 + i)];
-        zlin[4*(i - 16) + 2] = xl[18*(1 + i)];
-        zlin[4*(i - 16) + 3] = xr[18*(1 + i)];
-
-        DRMP3_S0(0) DRMP3_S2(1) DRMP3_S1(2) DRMP3_S2(3) DRMP3_S1(4) DRMP3_S2(5) DRMP3_S1(6) DRMP3_S2(7)
-
-        dstr[(15 - i)*nch] = drmp3d_scale_pcm(a[1]);
-        dstr[(17 + i)*nch] = drmp3d_scale_pcm(b[1]);
-        dstl[(15 - i)*nch] = drmp3d_scale_pcm(a[0]);
-        dstl[(17 + i)*nch] = drmp3d_scale_pcm(b[0]);
-        dstr[(47 - i)*nch] = drmp3d_scale_pcm(a[3]);
-        dstr[(49 + i)*nch] = drmp3d_scale_pcm(b[3]);
-        dstl[(47 - i)*nch] = drmp3d_scale_pcm(a[2]);
-        dstl[(49 + i)*nch] = drmp3d_scale_pcm(b[2]);
-    }
-#endif
-}
-
-static void drmp3d_synth_granule(float *qmf_state, float *grbuf, int nbands, int nch, drmp3d_sample_t *pcm, float *lins)
-{
-    int i;
-    for (i = 0; i < nch; i++)
-    {
-        drmp3d_DCT_II(grbuf + 576*i, nbands);
-    }
-
-    DRMP3_COPY_MEMORY(lins, qmf_state, sizeof(float)*15*64);
-
-    for (i = 0; i < nbands; i += 2)
-    {
-        drmp3d_synth(grbuf + i, pcm + 32*nch*i, nch, lins + i*64);
-    }
-#ifndef DR_MP3_NONSTANDARD_BUT_LOGICAL
-    if (nch == 1)
-    {
-        for (i = 0; i < 15*64; i += 2)
-        {
-            qmf_state[i] = lins[nbands*64 + i];
-        }
-    } else
-#endif
-    {
-        DRMP3_COPY_MEMORY(qmf_state, lins + nbands*64, sizeof(float)*15*64);
-    }
-}
-
-static int drmp3d_match_frame(const drmp3_uint8 *hdr, int mp3_bytes, int frame_bytes)
-{
-    int i, nmatch;
-    for (i = 0, nmatch = 0; nmatch < DRMP3_MAX_FRAME_SYNC_MATCHES; nmatch++)
-    {
-        i += drmp3_hdr_frame_bytes(hdr + i, frame_bytes) + drmp3_hdr_padding(hdr + i);
-        if (i + DRMP3_HDR_SIZE > mp3_bytes)
-            return nmatch > 0;
-        if (!drmp3_hdr_compare(hdr, hdr + i))
-            return 0;
-    }
-    return 1;
-}
-
-static int drmp3d_find_frame(const drmp3_uint8 *mp3, int mp3_bytes, int *free_format_bytes, int *ptr_frame_bytes)
-{
-    int i, k;
-    for (i = 0; i < mp3_bytes - DRMP3_HDR_SIZE; i++, mp3++)
-    {
-        if (drmp3_hdr_valid(mp3))
-        {
-            int frame_bytes = drmp3_hdr_frame_bytes(mp3, *free_format_bytes);
-            int frame_and_padding = frame_bytes + drmp3_hdr_padding(mp3);
-
-            for (k = DRMP3_HDR_SIZE; !frame_bytes && k < DRMP3_MAX_FREE_FORMAT_FRAME_SIZE && i + 2*k < mp3_bytes - DRMP3_HDR_SIZE; k++)
-            {
-                if (drmp3_hdr_compare(mp3, mp3 + k))
-                {
-                    int fb = k - drmp3_hdr_padding(mp3);
-                    int nextfb = fb + drmp3_hdr_padding(mp3 + k);
-                    if (i + k + nextfb + DRMP3_HDR_SIZE > mp3_bytes || !drmp3_hdr_compare(mp3, mp3 + k + nextfb))
-                        continue;
-                    frame_and_padding = k;
-                    frame_bytes = fb;
-                    *free_format_bytes = fb;
-                }
-            }
-
-            if ((frame_bytes && i + frame_and_padding <= mp3_bytes &&
-                drmp3d_match_frame(mp3, mp3_bytes - i, frame_bytes)) ||
-                (!i && frame_and_padding == mp3_bytes))
-            {
-                *ptr_frame_bytes = frame_and_padding;
-                return i;
-            }
-            *free_format_bytes = 0;
-        }
-    }
-    *ptr_frame_bytes = 0;
-    return mp3_bytes;
-}
-
-DRMP3_API void drmp3dec_init(drmp3dec *dec)
-{
-    dec->header[0] = 0;
-}
-
-DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int mp3_bytes, void *pcm, drmp3dec_frame_info *info)
-{
-    int i = 0, igr, frame_size = 0, success = 1;
-    const drmp3_uint8 *hdr;
-    drmp3_bs bs_frame[1];
-    drmp3dec_scratch scratch;
-
-    if (mp3_bytes > 4 && dec->header[0] == 0xff && drmp3_hdr_compare(dec->header, mp3))
-    {
-        frame_size = drmp3_hdr_frame_bytes(mp3, dec->free_format_bytes) + drmp3_hdr_padding(mp3);
-        if (frame_size != mp3_bytes && (frame_size + DRMP3_HDR_SIZE > mp3_bytes || !drmp3_hdr_compare(mp3, mp3 + frame_size)))
-        {
-            frame_size = 0;
-        }
-    }
-    if (!frame_size)
-    {
-        DRMP3_ZERO_MEMORY(dec, sizeof(drmp3dec));
-        i = drmp3d_find_frame(mp3, mp3_bytes, &dec->free_format_bytes, &frame_size);
-        if (!frame_size || i + frame_size > mp3_bytes)
-        {
-            info->frame_bytes = i;
-            return 0;
-        }
-    }
-
-    hdr = mp3 + i;
-    DRMP3_COPY_MEMORY(dec->header, hdr, DRMP3_HDR_SIZE);
-    info->frame_bytes = i + frame_size;
-    info->channels = DRMP3_HDR_IS_MONO(hdr) ? 1 : 2;
-    info->hz = drmp3_hdr_sample_rate_hz(hdr);
-    info->layer = 4 - DRMP3_HDR_GET_LAYER(hdr);
-    info->bitrate_kbps = drmp3_hdr_bitrate_kbps(hdr);
-
-    drmp3_bs_init(bs_frame, hdr + DRMP3_HDR_SIZE, frame_size - DRMP3_HDR_SIZE);
-    if (DRMP3_HDR_IS_CRC(hdr))
-    {
-        drmp3_bs_get_bits(bs_frame, 16);
-    }
-
-    if (info->layer == 3)
-    {
-        int main_data_begin = drmp3_L3_read_side_info(bs_frame, scratch.gr_info, hdr);
-        if (main_data_begin < 0 || bs_frame->pos > bs_frame->limit)
-        {
-            drmp3dec_init(dec);
-            return 0;
-        }
-        success = drmp3_L3_restore_reservoir(dec, bs_frame, &scratch, main_data_begin);
-        if (success && pcm != NULL)
-        {
-            for (igr = 0; igr < (DRMP3_HDR_TEST_MPEG1(hdr) ? 2 : 1); igr++, pcm = DRMP3_OFFSET_PTR(pcm, sizeof(drmp3d_sample_t)*576*info->channels))
-            {
-                DRMP3_ZERO_MEMORY(scratch.grbuf[0], 576*2*sizeof(float));
-                drmp3_L3_decode(dec, &scratch, scratch.gr_info + igr*info->channels, info->channels);
-                drmp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 18, info->channels, (drmp3d_sample_t*)pcm, scratch.syn[0]);
-            }
-        }
-        drmp3_L3_save_reservoir(dec, &scratch);
-    } else
-    {
-#ifdef DR_MP3_ONLY_MP3
-        return 0;
-#else
-        drmp3_L12_scale_info sci[1];
-
-        if (pcm == NULL) {
-            return drmp3_hdr_frame_samples(hdr);
-        }
-
-        drmp3_L12_read_scale_info(hdr, bs_frame, sci);
-
-        DRMP3_ZERO_MEMORY(scratch.grbuf[0], 576*2*sizeof(float));
-        for (i = 0, igr = 0; igr < 3; igr++)
-        {
-            if (12 == (i += drmp3_L12_dequantize_granule(scratch.grbuf[0] + i, bs_frame, sci, info->layer | 1)))
-            {
-                i = 0;
-                drmp3_L12_apply_scf_384(sci, sci->scf + igr, scratch.grbuf[0]);
-                drmp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 12, info->channels, (drmp3d_sample_t*)pcm, scratch.syn[0]);
-                DRMP3_ZERO_MEMORY(scratch.grbuf[0], 576*2*sizeof(float));
-                pcm = DRMP3_OFFSET_PTR(pcm, sizeof(drmp3d_sample_t)*384*info->channels);
-            }
-            if (bs_frame->pos > bs_frame->limit)
-            {
-                drmp3dec_init(dec);
-                return 0;
-            }
-        }
-#endif
-    }
-
-    return success*drmp3_hdr_frame_samples(dec->header);
-}
-
-DRMP3_API void drmp3dec_f32_to_s16(const float *in, drmp3_int16 *out, size_t num_samples)
-{
-    size_t i = 0;
-#if DRMP3_HAVE_SIMD
-    size_t aligned_count = num_samples & ~7;
-    for(; i < aligned_count; i+=8)
-    {
-        drmp3_f4 scale = DRMP3_VSET(32768.0f);
-        drmp3_f4 a = DRMP3_VMUL(DRMP3_VLD(&in[i  ]), scale);
-        drmp3_f4 b = DRMP3_VMUL(DRMP3_VLD(&in[i+4]), scale);
-#if DRMP3_HAVE_SSE
-        drmp3_f4 s16max = DRMP3_VSET( 32767.0f);
-        drmp3_f4 s16min = DRMP3_VSET(-32768.0f);
-        __m128i pcm8 = _mm_packs_epi32(_mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(a, s16max), s16min)),
-                                        _mm_cvtps_epi32(_mm_max_ps(_mm_min_ps(b, s16max), s16min)));
-        out[i  ] = (drmp3_int16)_mm_extract_epi16(pcm8, 0);
-        out[i+1] = (drmp3_int16)_mm_extract_epi16(pcm8, 1);
-        out[i+2] = (drmp3_int16)_mm_extract_epi16(pcm8, 2);
-        out[i+3] = (drmp3_int16)_mm_extract_epi16(pcm8, 3);
-        out[i+4] = (drmp3_int16)_mm_extract_epi16(pcm8, 4);
-        out[i+5] = (drmp3_int16)_mm_extract_epi16(pcm8, 5);
-        out[i+6] = (drmp3_int16)_mm_extract_epi16(pcm8, 6);
-        out[i+7] = (drmp3_int16)_mm_extract_epi16(pcm8, 7);
-#else
-        int16x4_t pcma, pcmb;
-        a = DRMP3_VADD(a, DRMP3_VSET(0.5f));
-        b = DRMP3_VADD(b, DRMP3_VSET(0.5f));
-        pcma = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(a), vreinterpretq_s32_u32(vcltq_f32(a, DRMP3_VSET(0)))));
-        pcmb = vqmovn_s32(vqaddq_s32(vcvtq_s32_f32(b), vreinterpretq_s32_u32(vcltq_f32(b, DRMP3_VSET(0)))));
-        vst1_lane_s16(out+i  , pcma, 0);
-        vst1_lane_s16(out+i+1, pcma, 1);
-        vst1_lane_s16(out+i+2, pcma, 2);
-        vst1_lane_s16(out+i+3, pcma, 3);
-        vst1_lane_s16(out+i+4, pcmb, 0);
-        vst1_lane_s16(out+i+5, pcmb, 1);
-        vst1_lane_s16(out+i+6, pcmb, 2);
-        vst1_lane_s16(out+i+7, pcmb, 3);
-#endif
-    }
-#endif
-    for(; i < num_samples; i++)
-    {
-        float sample = in[i] * 32768.0f;
-        if (sample >=  32766.5)
-            out[i] = (drmp3_int16) 32767;
-        else if (sample <= -32767.5)
-            out[i] = (drmp3_int16)-32768;
-        else
-        {
-            short s = (drmp3_int16)(sample + .5f);
-            s -= (s < 0);   /* away from zero, to be compliant */
-            out[i] = s;
-        }
-    }
-}
-
-
-
-/************************************************************************************************************************************************************
-
- Main Public API
-
- ************************************************************************************************************************************************************/
-#if defined(SIZE_MAX)
-    #define DRMP3_SIZE_MAX  SIZE_MAX
-#else
-    #if defined(_WIN64) || defined(_LP64) || defined(__LP64__)
-        #define DRMP3_SIZE_MAX  ((drmp3_uint64)0xFFFFFFFFFFFFFFFF)
-    #else
-        #define DRMP3_SIZE_MAX  0xFFFFFFFF
-    #endif
-#endif
-
-/* Options. */
-#ifndef DRMP3_SEEK_LEADING_MP3_FRAMES
-#define DRMP3_SEEK_LEADING_MP3_FRAMES   2
-#endif
-
-#define DRMP3_MIN_DATA_CHUNK_SIZE   16384
-
-/* The size in bytes of each chunk of data to read from the MP3 stream. minimp3 recommends at least 16K, but in an attempt to reduce data movement I'm making this slightly larger. */
-#ifndef DRMP3_DATA_CHUNK_SIZE
-#define DRMP3_DATA_CHUNK_SIZE  (DRMP3_MIN_DATA_CHUNK_SIZE*4)
-#endif
-
-
-#define DRMP3_COUNTOF(x)        (sizeof(x) / sizeof(x[0]))
-#define DRMP3_CLAMP(x, lo, hi)  (DRMP3_MAX(lo, DRMP3_MIN(x, hi)))
-
-#ifndef DRMP3_PI_D
-#define DRMP3_PI_D    3.14159265358979323846264
-#endif
-
-#define DRMP3_DEFAULT_RESAMPLER_LPF_ORDER   2
-
-static DRMP3_INLINE float drmp3_mix_f32(float x, float y, float a)
-{
-    return x*(1-a) + y*a;
-}
-static DRMP3_INLINE float drmp3_mix_f32_fast(float x, float y, float a)
-{
-    float r0 = (y - x);
-    float r1 = r0*a;
-    return x + r1;
-    /*return x + (y - x)*a;*/
-}
-
-
-/*
-Greatest common factor using Euclid's algorithm iteratively.
-*/
-static DRMP3_INLINE drmp3_uint32 drmp3_gcf_u32(drmp3_uint32 a, drmp3_uint32 b)
-{
-    for (;;) {
-        if (b == 0) {
-            break;
-        } else {
-            drmp3_uint32 t = a;
-            a = b;
-            b = t % a;
-        }
-    }
-
-    return a;
-}
-
-
-static void* drmp3__malloc_default(size_t sz, void* pUserData)
-{
-    (void)pUserData;
-    return DRMP3_MALLOC(sz);
-}
-
-static void* drmp3__realloc_default(void* p, size_t sz, void* pUserData)
-{
-    (void)pUserData;
-    return DRMP3_REALLOC(p, sz);
-}
-
-static void drmp3__free_default(void* p, void* pUserData)
-{
-    (void)pUserData;
-    DRMP3_FREE(p);
-}
-
-
-static void* drmp3__malloc_from_callbacks(size_t sz, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pAllocationCallbacks == NULL) {
-        return NULL;
-    }
-
-    if (pAllocationCallbacks->onMalloc != NULL) {
-        return pAllocationCallbacks->onMalloc(sz, pAllocationCallbacks->pUserData);
-    }
-
-    /* Try using realloc(). */
-    if (pAllocationCallbacks->onRealloc != NULL) {
-        return pAllocationCallbacks->onRealloc(NULL, sz, pAllocationCallbacks->pUserData);
-    }
-
-    return NULL;
-}
-
-static void* drmp3__realloc_from_callbacks(void* p, size_t szNew, size_t szOld, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pAllocationCallbacks == NULL) {
-        return NULL;
-    }
-
-    if (pAllocationCallbacks->onRealloc != NULL) {
-        return pAllocationCallbacks->onRealloc(p, szNew, pAllocationCallbacks->pUserData);
-    }
-
-    /* Try emulating realloc() in terms of malloc()/free(). */
-    if (pAllocationCallbacks->onMalloc != NULL && pAllocationCallbacks->onFree != NULL) {
-        void* p2;
-
-        p2 = pAllocationCallbacks->onMalloc(szNew, pAllocationCallbacks->pUserData);
-        if (p2 == NULL) {
-            return NULL;
-        }
-
-        if (p != NULL) {
-            DRMP3_COPY_MEMORY(p2, p, szOld);
-            pAllocationCallbacks->onFree(p, pAllocationCallbacks->pUserData);
-        }
-
-        return p2;
-    }
-
-    return NULL;
-}
-
-static void drmp3__free_from_callbacks(void* p, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    if (p == NULL || pAllocationCallbacks == NULL) {
-        return;
-    }
-
-    if (pAllocationCallbacks->onFree != NULL) {
-        pAllocationCallbacks->onFree(p, pAllocationCallbacks->pUserData);
-    }
-}
-
-
-static drmp3_allocation_callbacks drmp3_copy_allocation_callbacks_or_defaults(const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pAllocationCallbacks != NULL) {
-        /* Copy. */
-        return *pAllocationCallbacks;
-    } else {
-        /* Defaults. */
-        drmp3_allocation_callbacks allocationCallbacks;
-        allocationCallbacks.pUserData = NULL;
-        allocationCallbacks.onMalloc  = drmp3__malloc_default;
-        allocationCallbacks.onRealloc = drmp3__realloc_default;
-        allocationCallbacks.onFree    = drmp3__free_default;
-        return allocationCallbacks;
-    }
-}
-
-
-
-static size_t drmp3__on_read(drmp3* pMP3, void* pBufferOut, size_t bytesToRead)
-{
-    size_t bytesRead = pMP3->onRead(pMP3->pUserData, pBufferOut, bytesToRead);
-    pMP3->streamCursor += bytesRead;
-    return bytesRead;
-}
-
-static drmp3_bool32 drmp3__on_seek(drmp3* pMP3, int offset, drmp3_seek_origin origin)
-{
-    DRMP3_ASSERT(offset >= 0);
-
-    if (!pMP3->onSeek(pMP3->pUserData, offset, origin)) {
-        return DRMP3_FALSE;
-    }
-
-    if (origin == drmp3_seek_origin_start) {
-        pMP3->streamCursor = (drmp3_uint64)offset;
-    } else {
-        pMP3->streamCursor += offset;
-    }
-
-    return DRMP3_TRUE;
-}
-
-static drmp3_bool32 drmp3__on_seek_64(drmp3* pMP3, drmp3_uint64 offset, drmp3_seek_origin origin)
-{
-    if (offset <= 0x7FFFFFFF) {
-        return drmp3__on_seek(pMP3, (int)offset, origin);
-    }
-
-
-    /* Getting here "offset" is too large for a 32-bit integer. We just keep seeking forward until we hit the offset. */
-    if (!drmp3__on_seek(pMP3, 0x7FFFFFFF, drmp3_seek_origin_start)) {
-        return DRMP3_FALSE;
-    }
-
-    offset -= 0x7FFFFFFF;
-    while (offset > 0) {
-        if (offset <= 0x7FFFFFFF) {
-            if (!drmp3__on_seek(pMP3, (int)offset, drmp3_seek_origin_current)) {
-                return DRMP3_FALSE;
-            }
-            offset = 0;
-        } else {
-            if (!drmp3__on_seek(pMP3, 0x7FFFFFFF, drmp3_seek_origin_current)) {
-                return DRMP3_FALSE;
-            }
-            offset -= 0x7FFFFFFF;
-        }
-    }
-
-    return DRMP3_TRUE;
-}
-
-
-static drmp3_uint32 drmp3_decode_next_frame_ex__callbacks(drmp3* pMP3, drmp3d_sample_t* pPCMFrames)
-{
-    drmp3_uint32 pcmFramesRead = 0;
-
-    DRMP3_ASSERT(pMP3 != NULL);
-    DRMP3_ASSERT(pMP3->onRead != NULL);
-
-    if (pMP3->atEnd) {
-        return 0;
-    }
-
-    for (;;) {
-        drmp3dec_frame_info info;
-
-        /* minimp3 recommends doing data submission in chunks of at least 16K. If we don't have at least 16K bytes available, get more. */
-        if (pMP3->dataSize < DRMP3_MIN_DATA_CHUNK_SIZE) {
-            size_t bytesRead;
-
-            /* First we need to move the data down. */
-            if (pMP3->pData != NULL) {
-                DRMP3_MOVE_MEMORY(pMP3->pData, pMP3->pData + pMP3->dataConsumed, pMP3->dataSize);
-            }
-
-            pMP3->dataConsumed = 0;
-
-            if (pMP3->dataCapacity < DRMP3_DATA_CHUNK_SIZE) {
-                drmp3_uint8* pNewData;
-                size_t newDataCap;
-
-                newDataCap = DRMP3_DATA_CHUNK_SIZE;
-
-                pNewData = (drmp3_uint8*)drmp3__realloc_from_callbacks(pMP3->pData, newDataCap, pMP3->dataCapacity, &pMP3->allocationCallbacks);
-                if (pNewData == NULL) {
-                    return 0; /* Out of memory. */
-                }
-
-                pMP3->pData = pNewData;
-                pMP3->dataCapacity = newDataCap;
-            }
-
-            bytesRead = drmp3__on_read(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize));
-            if (bytesRead == 0) {
-                if (pMP3->dataSize == 0) {
-                    pMP3->atEnd = DRMP3_TRUE;
-                    return 0; /* No data. */
-                }
-            }
-
-            pMP3->dataSize += bytesRead;
-        }
-
-        if (pMP3->dataSize > INT_MAX) {
-            pMP3->atEnd = DRMP3_TRUE;
-            return 0; /* File too big. */
-        }
-
-        DRMP3_ASSERT(pMP3->pData != NULL);
-        DRMP3_ASSERT(pMP3->dataCapacity > 0);
-
-        pcmFramesRead = drmp3dec_decode_frame(&pMP3->decoder, pMP3->pData + pMP3->dataConsumed, (int)pMP3->dataSize, pPCMFrames, &info);    /* <-- Safe size_t -> int conversion thanks to the check above. */
-
-        /* Consume the data. */
-        if (info.frame_bytes > 0) {
-            pMP3->dataConsumed += (size_t)info.frame_bytes;
-            pMP3->dataSize     -= (size_t)info.frame_bytes;
-        }
-
-        /* pcmFramesRead will be equal to 0 if decoding failed. If it is zero and info.frame_bytes > 0 then we have successfully decoded the frame. */
-        if (pcmFramesRead > 0) {
-            pcmFramesRead = drmp3_hdr_frame_samples(pMP3->decoder.header);
-            pMP3->pcmFramesConsumedInMP3Frame = 0;
-            pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead;
-            pMP3->mp3FrameChannels = info.channels;
-            pMP3->mp3FrameSampleRate = info.hz;
-            break;
-        } else if (info.frame_bytes == 0) {
-            /* Need more data. minimp3 recommends doing data submission in 16K chunks. */
-            size_t bytesRead;
-
-            /* First we need to move the data down. */
-            DRMP3_MOVE_MEMORY(pMP3->pData, pMP3->pData + pMP3->dataConsumed, pMP3->dataSize);
-            pMP3->dataConsumed = 0;
-
-            if (pMP3->dataCapacity == pMP3->dataSize) {
-                /* No room. Expand. */
-                drmp3_uint8* pNewData;
-                size_t newDataCap;
-
-                newDataCap = pMP3->dataCapacity + DRMP3_DATA_CHUNK_SIZE;
-
-                pNewData = (drmp3_uint8*)drmp3__realloc_from_callbacks(pMP3->pData, newDataCap, pMP3->dataCapacity, &pMP3->allocationCallbacks);
-                if (pNewData == NULL) {
-                    return 0; /* Out of memory. */
-                }
-
-                pMP3->pData = pNewData;
-                pMP3->dataCapacity = newDataCap;
-            }
-
-            /* Fill in a chunk. */
-            bytesRead = drmp3__on_read(pMP3, pMP3->pData + pMP3->dataSize, (pMP3->dataCapacity - pMP3->dataSize));
-            if (bytesRead == 0) {
-                pMP3->atEnd = DRMP3_TRUE;
-                return 0; /* Error reading more data. */
-            }
-
-            pMP3->dataSize += bytesRead;
-        }
-    };
-
-    return pcmFramesRead;
-}
-
-static drmp3_uint32 drmp3_decode_next_frame_ex__memory(drmp3* pMP3, drmp3d_sample_t* pPCMFrames)
-{
-    drmp3_uint32 pcmFramesRead = 0;
-    drmp3dec_frame_info info;
-
-    DRMP3_ASSERT(pMP3 != NULL);
-    DRMP3_ASSERT(pMP3->memory.pData != NULL);
-
-    if (pMP3->atEnd) {
-        return 0;
-    }
-
-    for (;;) {
-        pcmFramesRead = drmp3dec_decode_frame(&pMP3->decoder, pMP3->memory.pData + pMP3->memory.currentReadPos, (int)(pMP3->memory.dataSize - pMP3->memory.currentReadPos), pPCMFrames, &info);
-        if (pcmFramesRead > 0) {
-            pcmFramesRead = drmp3_hdr_frame_samples(pMP3->decoder.header);
-            pMP3->pcmFramesConsumedInMP3Frame  = 0;
-            pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead;
-            pMP3->mp3FrameChannels             = info.channels;
-            pMP3->mp3FrameSampleRate           = info.hz;
-            break;
-        } else if (info.frame_bytes > 0) {
-            /* No frames were read, but it looks like we skipped past one. Read the next MP3 frame. */
-            pMP3->memory.currentReadPos += (size_t)info.frame_bytes;
-        } else {
-            /* Nothing at all was read. Abort. */
-            break;
-        }
-    }
-
-    /* Consume the data. */
-    pMP3->memory.currentReadPos += (size_t)info.frame_bytes;
-
-    return pcmFramesRead;
-}
-
-static drmp3_uint32 drmp3_decode_next_frame_ex(drmp3* pMP3, drmp3d_sample_t* pPCMFrames)
-{
-    if (pMP3->memory.pData != NULL && pMP3->memory.dataSize > 0) {
-        return drmp3_decode_next_frame_ex__memory(pMP3, pPCMFrames);
-    } else {
-        return drmp3_decode_next_frame_ex__callbacks(pMP3, pPCMFrames);
-    }
-}
-
-static drmp3_uint32 drmp3_decode_next_frame(drmp3* pMP3)
-{
-    DRMP3_ASSERT(pMP3 != NULL);
-    return drmp3_decode_next_frame_ex(pMP3, (drmp3d_sample_t*)pMP3->pcmFrames);
-}
-
-#if 0
-static drmp3_uint32 drmp3_seek_next_frame(drmp3* pMP3)
-{
-    drmp3_uint32 pcmFrameCount;
-
-    DRMP3_ASSERT(pMP3 != NULL);
-
-    pcmFrameCount = drmp3_decode_next_frame_ex(pMP3, NULL);
-    if (pcmFrameCount == 0) {
-        return 0;
-    }
-
-    /* We have essentially just skipped past the frame, so just set the remaining samples to 0. */
-    pMP3->currentPCMFrame             += pcmFrameCount;
-    pMP3->pcmFramesConsumedInMP3Frame  = pcmFrameCount;
-    pMP3->pcmFramesRemainingInMP3Frame = 0;
-
-    return pcmFrameCount;
-}
-#endif
-
-static drmp3_bool32 drmp3_init_internal(drmp3* pMP3, drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    DRMP3_ASSERT(pMP3 != NULL);
-    DRMP3_ASSERT(onRead != NULL);
-
-    /* This function assumes the output object has already been reset to 0. Do not do that here, otherwise things will break. */
-    drmp3dec_init(&pMP3->decoder);
-
-    pMP3->onRead = onRead;
-    pMP3->onSeek = onSeek;
-    pMP3->pUserData = pUserData;
-    pMP3->allocationCallbacks = drmp3_copy_allocation_callbacks_or_defaults(pAllocationCallbacks);
-
-    if (pMP3->allocationCallbacks.onFree == NULL || (pMP3->allocationCallbacks.onMalloc == NULL && pMP3->allocationCallbacks.onRealloc == NULL)) {
-        return DRMP3_FALSE;    /* Invalid allocation callbacks. */
-    }
-
-    /* Decode the first frame to confirm that it is indeed a valid MP3 stream. */
-    if (drmp3_decode_next_frame(pMP3) == 0) {
-        drmp3__free_from_callbacks(pMP3->pData, &pMP3->allocationCallbacks);    /* The call above may have allocated memory. Need to make sure it's freed before aborting. */
-        return DRMP3_FALSE; /* Not a valid MP3 stream. */
-    }
-
-    pMP3->channels   = pMP3->mp3FrameChannels;
-    pMP3->sampleRate = pMP3->mp3FrameSampleRate;
-
-    return DRMP3_TRUE;
-}
-
-DRMP3_API drmp3_bool32 drmp3_init(drmp3* pMP3, drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pMP3 == NULL || onRead == NULL) {
-        return DRMP3_FALSE;
-    }
-
-    DRMP3_ZERO_OBJECT(pMP3);
-    return drmp3_init_internal(pMP3, onRead, onSeek, pUserData, pAllocationCallbacks);
-}
-
-
-static size_t drmp3__on_read_memory(void* pUserData, void* pBufferOut, size_t bytesToRead)
-{
-    drmp3* pMP3 = (drmp3*)pUserData;
-    size_t bytesRemaining;
-
-    DRMP3_ASSERT(pMP3 != NULL);
-    DRMP3_ASSERT(pMP3->memory.dataSize >= pMP3->memory.currentReadPos);
-
-    bytesRemaining = pMP3->memory.dataSize - pMP3->memory.currentReadPos;
-    if (bytesToRead > bytesRemaining) {
-        bytesToRead = bytesRemaining;
-    }
-
-    if (bytesToRead > 0) {
-        DRMP3_COPY_MEMORY(pBufferOut, pMP3->memory.pData + pMP3->memory.currentReadPos, bytesToRead);
-        pMP3->memory.currentReadPos += bytesToRead;
-    }
-
-    return bytesToRead;
-}
-
-static drmp3_bool32 drmp3__on_seek_memory(void* pUserData, int byteOffset, drmp3_seek_origin origin)
-{
-    drmp3* pMP3 = (drmp3*)pUserData;
-
-    DRMP3_ASSERT(pMP3 != NULL);
-
-    if (origin == drmp3_seek_origin_current) {
-        if (byteOffset > 0) {
-            if (pMP3->memory.currentReadPos + byteOffset > pMP3->memory.dataSize) {
-                byteOffset = (int)(pMP3->memory.dataSize - pMP3->memory.currentReadPos);  /* Trying to seek too far forward. */
-            }
-        } else {
-            if (pMP3->memory.currentReadPos < (size_t)-byteOffset) {
-                byteOffset = -(int)pMP3->memory.currentReadPos;  /* Trying to seek too far backwards. */
-            }
-        }
-
-        /* This will never underflow thanks to the clamps above. */
-        pMP3->memory.currentReadPos += byteOffset;
-    } else {
-        if ((drmp3_uint32)byteOffset <= pMP3->memory.dataSize) {
-            pMP3->memory.currentReadPos = byteOffset;
-        } else {
-            pMP3->memory.currentReadPos = pMP3->memory.dataSize;  /* Trying to seek too far forward. */
-        }
-    }
-
-    return DRMP3_TRUE;
-}
-
-DRMP3_API drmp3_bool32 drmp3_init_memory(drmp3* pMP3, const void* pData, size_t dataSize, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pMP3 == NULL) {
-        return DRMP3_FALSE;
-    }
-
-    DRMP3_ZERO_OBJECT(pMP3);
-
-    if (pData == NULL || dataSize == 0) {
-        return DRMP3_FALSE;
-    }
-
-    pMP3->memory.pData = (const drmp3_uint8*)pData;
-    pMP3->memory.dataSize = dataSize;
-    pMP3->memory.currentReadPos = 0;
-
-    return drmp3_init_internal(pMP3, drmp3__on_read_memory, drmp3__on_seek_memory, pMP3, pAllocationCallbacks);
-}
-
-
-#ifndef DR_MP3_NO_STDIO
-#include <stdio.h>
-#include <wchar.h>      /* For wcslen(), wcsrtombs() */
-
-/* drmp3_result_from_errno() is only used inside DR_MP3_NO_STDIO for now. Move this out if it's ever used elsewhere. */
-#include <errno.h>
-static drmp3_result drmp3_result_from_errno(int e)
-{
-    switch (e)
-    {
-        case 0: return DRMP3_SUCCESS;
-    #ifdef EPERM
-        case EPERM: return DRMP3_INVALID_OPERATION;
-    #endif
-    #ifdef ENOENT
-        case ENOENT: return DRMP3_DOES_NOT_EXIST;
-    #endif
-    #ifdef ESRCH
-        case ESRCH: return DRMP3_DOES_NOT_EXIST;
-    #endif
-    #ifdef EINTR
-        case EINTR: return DRMP3_INTERRUPT;
-    #endif
-    #ifdef EIO
-        case EIO: return DRMP3_IO_ERROR;
-    #endif
-    #ifdef ENXIO
-        case ENXIO: return DRMP3_DOES_NOT_EXIST;
-    #endif
-    #ifdef E2BIG
-        case E2BIG: return DRMP3_INVALID_ARGS;
-    #endif
-    #ifdef ENOEXEC
-        case ENOEXEC: return DRMP3_INVALID_FILE;
-    #endif
-    #ifdef EBADF
-        case EBADF: return DRMP3_INVALID_FILE;
-    #endif
-    #ifdef ECHILD
-        case ECHILD: return DRMP3_ERROR;
-    #endif
-    #ifdef EAGAIN
-        case EAGAIN: return DRMP3_UNAVAILABLE;
-    #endif
-    #ifdef ENOMEM
-        case ENOMEM: return DRMP3_OUT_OF_MEMORY;
-    #endif
-    #ifdef EACCES
-        case EACCES: return DRMP3_ACCESS_DENIED;
-    #endif
-    #ifdef EFAULT
-        case EFAULT: return DRMP3_BAD_ADDRESS;
-    #endif
-    #ifdef ENOTBLK
-        case ENOTBLK: return DRMP3_ERROR;
-    #endif
-    #ifdef EBUSY
-        case EBUSY: return DRMP3_BUSY;
-    #endif
-    #ifdef EEXIST
-        case EEXIST: return DRMP3_ALREADY_EXISTS;
-    #endif
-    #ifdef EXDEV
-        case EXDEV: return DRMP3_ERROR;
-    #endif
-    #ifdef ENODEV
-        case ENODEV: return DRMP3_DOES_NOT_EXIST;
-    #endif
-    #ifdef ENOTDIR
-        case ENOTDIR: return DRMP3_NOT_DIRECTORY;
-    #endif
-    #ifdef EISDIR
-        case EISDIR: return DRMP3_IS_DIRECTORY;
-    #endif
-    #ifdef EINVAL
-        case EINVAL: return DRMP3_INVALID_ARGS;
-    #endif
-    #ifdef ENFILE
-        case ENFILE: return DRMP3_TOO_MANY_OPEN_FILES;
-    #endif
-    #ifdef EMFILE
-        case EMFILE: return DRMP3_TOO_MANY_OPEN_FILES;
-    #endif
-    #ifdef ENOTTY
-        case ENOTTY: return DRMP3_INVALID_OPERATION;
-    #endif
-    #ifdef ETXTBSY
-        case ETXTBSY: return DRMP3_BUSY;
-    #endif
-    #ifdef EFBIG
-        case EFBIG: return DRMP3_TOO_BIG;
-    #endif
-    #ifdef ENOSPC
-        case ENOSPC: return DRMP3_NO_SPACE;
-    #endif
-    #ifdef ESPIPE
-        case ESPIPE: return DRMP3_BAD_SEEK;
-    #endif
-    #ifdef EROFS
-        case EROFS: return DRMP3_ACCESS_DENIED;
-    #endif
-    #ifdef EMLINK
-        case EMLINK: return DRMP3_TOO_MANY_LINKS;
-    #endif
-    #ifdef EPIPE
-        case EPIPE: return DRMP3_BAD_PIPE;
-    #endif
-    #ifdef EDOM
-        case EDOM: return DRMP3_OUT_OF_RANGE;
-    #endif
-    #ifdef ERANGE
-        case ERANGE: return DRMP3_OUT_OF_RANGE;
-    #endif
-    #ifdef EDEADLK
-        case EDEADLK: return DRMP3_DEADLOCK;
-    #endif
-    #ifdef ENAMETOOLONG
-        case ENAMETOOLONG: return DRMP3_PATH_TOO_LONG;
-    #endif
-    #ifdef ENOLCK
-        case ENOLCK: return DRMP3_ERROR;
-    #endif
-    #ifdef ENOSYS
-        case ENOSYS: return DRMP3_NOT_IMPLEMENTED;
-    #endif
-    #ifdef ENOTEMPTY
-        case ENOTEMPTY: return DRMP3_DIRECTORY_NOT_EMPTY;
-    #endif
-    #ifdef ELOOP
-        case ELOOP: return DRMP3_TOO_MANY_LINKS;
-    #endif
-    #ifdef ENOMSG
-        case ENOMSG: return DRMP3_NO_MESSAGE;
-    #endif
-    #ifdef EIDRM
-        case EIDRM: return DRMP3_ERROR;
-    #endif
-    #ifdef ECHRNG
-        case ECHRNG: return DRMP3_ERROR;
-    #endif
-    #ifdef EL2NSYNC
-        case EL2NSYNC: return DRMP3_ERROR;
-    #endif
-    #ifdef EL3HLT
-        case EL3HLT: return DRMP3_ERROR;
-    #endif
-    #ifdef EL3RST
-        case EL3RST: return DRMP3_ERROR;
-    #endif
-    #ifdef ELNRNG
-        case ELNRNG: return DRMP3_OUT_OF_RANGE;
-    #endif
-    #ifdef EUNATCH
-        case EUNATCH: return DRMP3_ERROR;
-    #endif
-    #ifdef ENOCSI
-        case ENOCSI: return DRMP3_ERROR;
-    #endif
-    #ifdef EL2HLT
-        case EL2HLT: return DRMP3_ERROR;
-    #endif
-    #ifdef EBADE
-        case EBADE: return DRMP3_ERROR;
-    #endif
-    #ifdef EBADR
-        case EBADR: return DRMP3_ERROR;
-    #endif
-    #ifdef EXFULL
-        case EXFULL: return DRMP3_ERROR;
-    #endif
-    #ifdef ENOANO
-        case ENOANO: return DRMP3_ERROR;
-    #endif
-    #ifdef EBADRQC
-        case EBADRQC: return DRMP3_ERROR;
-    #endif
-    #ifdef EBADSLT
-        case EBADSLT: return DRMP3_ERROR;
-    #endif
-    #ifdef EBFONT
-        case EBFONT: return DRMP3_INVALID_FILE;
-    #endif
-    #ifdef ENOSTR
-        case ENOSTR: return DRMP3_ERROR;
-    #endif
-    #ifdef ENODATA
-        case ENODATA: return DRMP3_NO_DATA_AVAILABLE;
-    #endif
-    #ifdef ETIME
-        case ETIME: return DRMP3_TIMEOUT;
-    #endif
-    #ifdef ENOSR
-        case ENOSR: return DRMP3_NO_DATA_AVAILABLE;
-    #endif
-    #ifdef ENONET
-        case ENONET: return DRMP3_NO_NETWORK;
-    #endif
-    #ifdef ENOPKG
-        case ENOPKG: return DRMP3_ERROR;
-    #endif
-    #ifdef EREMOTE
-        case EREMOTE: return DRMP3_ERROR;
-    #endif
-    #ifdef ENOLINK
-        case ENOLINK: return DRMP3_ERROR;
-    #endif
-    #ifdef EADV
-        case EADV: return DRMP3_ERROR;
-    #endif
-    #ifdef ESRMNT
-        case ESRMNT: return DRMP3_ERROR;
-    #endif
-    #ifdef ECOMM
-        case ECOMM: return DRMP3_ERROR;
-    #endif
-    #ifdef EPROTO
-        case EPROTO: return DRMP3_ERROR;
-    #endif
-    #ifdef EMULTIHOP
-        case EMULTIHOP: return DRMP3_ERROR;
-    #endif
-    #ifdef EDOTDOT
-        case EDOTDOT: return DRMP3_ERROR;
-    #endif
-    #ifdef EBADMSG
-        case EBADMSG: return DRMP3_BAD_MESSAGE;
-    #endif
-    #ifdef EOVERFLOW
-        case EOVERFLOW: return DRMP3_TOO_BIG;
-    #endif
-    #ifdef ENOTUNIQ
-        case ENOTUNIQ: return DRMP3_NOT_UNIQUE;
-    #endif
-    #ifdef EBADFD
-        case EBADFD: return DRMP3_ERROR;
-    #endif
-    #ifdef EREMCHG
-        case EREMCHG: return DRMP3_ERROR;
-    #endif
-    #ifdef ELIBACC
-        case ELIBACC: return DRMP3_ACCESS_DENIED;
-    #endif
-    #ifdef ELIBBAD
-        case ELIBBAD: return DRMP3_INVALID_FILE;
-    #endif
-    #ifdef ELIBSCN
-        case ELIBSCN: return DRMP3_INVALID_FILE;
-    #endif
-    #ifdef ELIBMAX
-        case ELIBMAX: return DRMP3_ERROR;
-    #endif
-    #ifdef ELIBEXEC
-        case ELIBEXEC: return DRMP3_ERROR;
-    #endif
-    #ifdef EILSEQ
-        case EILSEQ: return DRMP3_INVALID_DATA;
-    #endif
-    #ifdef ERESTART
-        case ERESTART: return DRMP3_ERROR;
-    #endif
-    #ifdef ESTRPIPE
-        case ESTRPIPE: return DRMP3_ERROR;
-    #endif
-    #ifdef EUSERS
-        case EUSERS: return DRMP3_ERROR;
-    #endif
-    #ifdef ENOTSOCK
-        case ENOTSOCK: return DRMP3_NOT_SOCKET;
-    #endif
-    #ifdef EDESTADDRREQ
-        case EDESTADDRREQ: return DRMP3_NO_ADDRESS;
-    #endif
-    #ifdef EMSGSIZE
-        case EMSGSIZE: return DRMP3_TOO_BIG;
-    #endif
-    #ifdef EPROTOTYPE
-        case EPROTOTYPE: return DRMP3_BAD_PROTOCOL;
-    #endif
-    #ifdef ENOPROTOOPT
-        case ENOPROTOOPT: return DRMP3_PROTOCOL_UNAVAILABLE;
-    #endif
-    #ifdef EPROTONOSUPPORT
-        case EPROTONOSUPPORT: return DRMP3_PROTOCOL_NOT_SUPPORTED;
-    #endif
-    #ifdef ESOCKTNOSUPPORT
-        case ESOCKTNOSUPPORT: return DRMP3_SOCKET_NOT_SUPPORTED;
-    #endif
-    #ifdef EOPNOTSUPP
-        case EOPNOTSUPP: return DRMP3_INVALID_OPERATION;
-    #endif
-    #ifdef EPFNOSUPPORT
-        case EPFNOSUPPORT: return DRMP3_PROTOCOL_FAMILY_NOT_SUPPORTED;
-    #endif
-    #ifdef EAFNOSUPPORT
-        case EAFNOSUPPORT: return DRMP3_ADDRESS_FAMILY_NOT_SUPPORTED;
-    #endif
-    #ifdef EADDRINUSE
-        case EADDRINUSE: return DRMP3_ALREADY_IN_USE;
-    #endif
-    #ifdef EADDRNOTAVAIL
-        case EADDRNOTAVAIL: return DRMP3_ERROR;
-    #endif
-    #ifdef ENETDOWN
-        case ENETDOWN: return DRMP3_NO_NETWORK;
-    #endif
-    #ifdef ENETUNREACH
-        case ENETUNREACH: return DRMP3_NO_NETWORK;
-    #endif
-    #ifdef ENETRESET
-        case ENETRESET: return DRMP3_NO_NETWORK;
-    #endif
-    #ifdef ECONNABORTED
-        case ECONNABORTED: return DRMP3_NO_NETWORK;
-    #endif
-    #ifdef ECONNRESET
-        case ECONNRESET: return DRMP3_CONNECTION_RESET;
-    #endif
-    #ifdef ENOBUFS
-        case ENOBUFS: return DRMP3_NO_SPACE;
-    #endif
-    #ifdef EISCONN
-        case EISCONN: return DRMP3_ALREADY_CONNECTED;
-    #endif
-    #ifdef ENOTCONN
-        case ENOTCONN: return DRMP3_NOT_CONNECTED;
-    #endif
-    #ifdef ESHUTDOWN
-        case ESHUTDOWN: return DRMP3_ERROR;
-    #endif
-    #ifdef ETOOMANYREFS
-        case ETOOMANYREFS: return DRMP3_ERROR;
-    #endif
-    #ifdef ETIMEDOUT
-        case ETIMEDOUT: return DRMP3_TIMEOUT;
-    #endif
-    #ifdef ECONNREFUSED
-        case ECONNREFUSED: return DRMP3_CONNECTION_REFUSED;
-    #endif
-    #ifdef EHOSTDOWN
-        case EHOSTDOWN: return DRMP3_NO_HOST;
-    #endif
-    #ifdef EHOSTUNREACH
-        case EHOSTUNREACH: return DRMP3_NO_HOST;
-    #endif
-    #ifdef EALREADY
-        case EALREADY: return DRMP3_IN_PROGRESS;
-    #endif
-    #ifdef EINPROGRESS
-        case EINPROGRESS: return DRMP3_IN_PROGRESS;
-    #endif
-    #ifdef ESTALE
-        case ESTALE: return DRMP3_INVALID_FILE;
-    #endif
-    #ifdef EUCLEAN
-        case EUCLEAN: return DRMP3_ERROR;
-    #endif
-    #ifdef ENOTNAM
-        case ENOTNAM: return DRMP3_ERROR;
-    #endif
-    #ifdef ENAVAIL
-        case ENAVAIL: return DRMP3_ERROR;
-    #endif
-    #ifdef EISNAM
-        case EISNAM: return DRMP3_ERROR;
-    #endif
-    #ifdef EREMOTEIO
-        case EREMOTEIO: return DRMP3_IO_ERROR;
-    #endif
-    #ifdef EDQUOT
-        case EDQUOT: return DRMP3_NO_SPACE;
-    #endif
-    #ifdef ENOMEDIUM
-        case ENOMEDIUM: return DRMP3_DOES_NOT_EXIST;
-    #endif
-    #ifdef EMEDIUMTYPE
-        case EMEDIUMTYPE: return DRMP3_ERROR;
-    #endif
-    #ifdef ECANCELED
-        case ECANCELED: return DRMP3_CANCELLED;
-    #endif
-    #ifdef ENOKEY
-        case ENOKEY: return DRMP3_ERROR;
-    #endif
-    #ifdef EKEYEXPIRED
-        case EKEYEXPIRED: return DRMP3_ERROR;
-    #endif
-    #ifdef EKEYREVOKED
-        case EKEYREVOKED: return DRMP3_ERROR;
-    #endif
-    #ifdef EKEYREJECTED
-        case EKEYREJECTED: return DRMP3_ERROR;
-    #endif
-    #ifdef EOWNERDEAD
-        case EOWNERDEAD: return DRMP3_ERROR;
-    #endif
-    #ifdef ENOTRECOVERABLE
-        case ENOTRECOVERABLE: return DRMP3_ERROR;
-    #endif
-    #ifdef ERFKILL
-        case ERFKILL: return DRMP3_ERROR;
-    #endif
-    #ifdef EHWPOISON
-        case EHWPOISON: return DRMP3_ERROR;
-    #endif
-        default: return DRMP3_ERROR;
-    }
-}
-
-static drmp3_result drmp3_fopen(FILE** ppFile, const char* pFilePath, const char* pOpenMode)
-{
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-    errno_t err;
-#endif
-
-    if (ppFile != NULL) {
-        *ppFile = NULL;  /* Safety. */
-    }
-
-    if (pFilePath == NULL || pOpenMode == NULL || ppFile == NULL) {
-        return DRMP3_INVALID_ARGS;
-    }
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-    err = fopen_s(ppFile, pFilePath, pOpenMode);
-    if (err != 0) {
-        return drmp3_result_from_errno(err);
-    }
-#else
-#if defined(_WIN32) || defined(__APPLE__)
-    *ppFile = fopen(pFilePath, pOpenMode);
-#else
-    #if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(_LARGEFILE64_SOURCE)
-        *ppFile = fopen64(pFilePath, pOpenMode);
-    #else
-        *ppFile = fopen(pFilePath, pOpenMode);
-    #endif
-#endif
-    if (*ppFile == NULL) {
-        drmp3_result result = drmp3_result_from_errno(errno);
-        if (result == DRMP3_SUCCESS) {
-            result = DRMP3_ERROR;   /* Just a safety check to make sure we never ever return success when pFile == NULL. */
-        }
-
-        return result;
-    }
-#endif
-
-    return DRMP3_SUCCESS;
-}
-
-/*
-_wfopen() isn't always available in all compilation environments.
-
-    * Windows only.
-    * MSVC seems to support it universally as far back as VC6 from what I can tell (haven't checked further back).
-    * MinGW-64 (both 32- and 64-bit) seems to support it.
-    * MinGW wraps it in !defined(__STRICT_ANSI__).
-    * OpenWatcom wraps it in !defined(_NO_EXT_KEYS).
-
-This can be reviewed as compatibility issues arise. The preference is to use _wfopen_s() and _wfopen() as opposed to the wcsrtombs()
-fallback, so if you notice your compiler not detecting this properly I'm happy to look at adding support.
-*/
-#if defined(_WIN32)
-    #if defined(_MSC_VER) || defined(__MINGW64__) || (!defined(__STRICT_ANSI__) && !defined(_NO_EXT_KEYS))
-        #define DRMP3_HAS_WFOPEN
-    #endif
-#endif
-
-static drmp3_result drmp3_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_t* pOpenMode, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    if (ppFile != NULL) {
-        *ppFile = NULL;  /* Safety. */
-    }
-
-    if (pFilePath == NULL || pOpenMode == NULL || ppFile == NULL) {
-        return DRMP3_INVALID_ARGS;
-    }
-
-#if defined(DRMP3_HAS_WFOPEN)
-    {
-        /* Use _wfopen() on Windows. */
-    #if defined(_MSC_VER) && _MSC_VER >= 1400
-        errno_t err = _wfopen_s(ppFile, pFilePath, pOpenMode);
-        if (err != 0) {
-            return drmp3_result_from_errno(err);
-        }
-    #else
-        *ppFile = _wfopen(pFilePath, pOpenMode);
-        if (*ppFile == NULL) {
-            return drmp3_result_from_errno(errno);
-        }
-    #endif
-        (void)pAllocationCallbacks;
-    }
-#else
-    /*
-    Use fopen() on anything other than Windows. Requires a conversion. This is annoying because
-	fopen() is locale specific. The only real way I can think of to do this is with wcsrtombs(). Note
-	that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for
-    maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler
-	error I'll look into improving compatibility.
-    */
-
-	/*
-	Some compilers don't support wchar_t or wcsrtombs() which we're using below. In this case we just
-	need to abort with an error. If you encounter a compiler lacking such support, add it to this list
-	and submit a bug report and it'll be added to the library upstream.
-	*/
-	#if defined(__DJGPP__)
-	{
-		/* Nothing to do here. This will fall through to the error check below. */
-	}
-	#else
-    {
-        mbstate_t mbs;
-        size_t lenMB;
-        const wchar_t* pFilePathTemp = pFilePath;
-        char* pFilePathMB = NULL;
-        char pOpenModeMB[32] = {0};
-
-        /* Get the length first. */
-        DRMP3_ZERO_OBJECT(&mbs);
-        lenMB = wcsrtombs(NULL, &pFilePathTemp, 0, &mbs);
-        if (lenMB == (size_t)-1) {
-            return drmp3_result_from_errno(errno);
-        }
-
-        pFilePathMB = (char*)drmp3__malloc_from_callbacks(lenMB + 1, pAllocationCallbacks);
-        if (pFilePathMB == NULL) {
-            return DRMP3_OUT_OF_MEMORY;
-        }
-
-        pFilePathTemp = pFilePath;
-        DRMP3_ZERO_OBJECT(&mbs);
-        wcsrtombs(pFilePathMB, &pFilePathTemp, lenMB + 1, &mbs);
-
-        /* The open mode should always consist of ASCII characters so we should be able to do a trivial conversion. */
-        {
-            size_t i = 0;
-            for (;;) {
-                if (pOpenMode[i] == 0) {
-                    pOpenModeMB[i] = '\0';
-                    break;
-                }
-
-                pOpenModeMB[i] = (char)pOpenMode[i];
-                i += 1;
-            }
-        }
-
-        *ppFile = fopen(pFilePathMB, pOpenModeMB);
-
-        drmp3__free_from_callbacks(pFilePathMB, pAllocationCallbacks);
-    }
-	#endif
-
-    if (*ppFile == NULL) {
-        return DRMP3_ERROR;
-    }
-#endif
-
-    return DRMP3_SUCCESS;
-}
-
-
-
-static size_t drmp3__on_read_stdio(void* pUserData, void* pBufferOut, size_t bytesToRead)
-{
-    return fread(pBufferOut, 1, bytesToRead, (FILE*)pUserData);
-}
-
-static drmp3_bool32 drmp3__on_seek_stdio(void* pUserData, int offset, drmp3_seek_origin origin)
-{
-    return fseek((FILE*)pUserData, offset, (origin == drmp3_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0;
-}
-
-DRMP3_API drmp3_bool32 drmp3_init_file(drmp3* pMP3, const char* pFilePath, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    drmp3_bool32 result;
-    FILE* pFile;
-
-    if (drmp3_fopen(&pFile, pFilePath, "rb") != DRMP3_SUCCESS) {
-        return DRMP3_FALSE;
-    }
-
-    result = drmp3_init(pMP3, drmp3__on_read_stdio, drmp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks);
-    if (result != DRMP3_TRUE) {
-        fclose(pFile);
-        return result;
-    }
-
-    return DRMP3_TRUE;
-}
-
-DRMP3_API drmp3_bool32 drmp3_init_file_w(drmp3* pMP3, const wchar_t* pFilePath, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    drmp3_bool32 result;
-    FILE* pFile;
-
-    if (drmp3_wfopen(&pFile, pFilePath, L"rb", pAllocationCallbacks) != DRMP3_SUCCESS) {
-        return DRMP3_FALSE;
-    }
-
-    result = drmp3_init(pMP3, drmp3__on_read_stdio, drmp3__on_seek_stdio, (void*)pFile, pAllocationCallbacks);
-    if (result != DRMP3_TRUE) {
-        fclose(pFile);
-        return result;
-    }
-
-    return DRMP3_TRUE;
-}
-#endif
-
-DRMP3_API void drmp3_uninit(drmp3* pMP3)
-{
-    if (pMP3 == NULL) {
-        return;
-    }
-    
-#ifndef DR_MP3_NO_STDIO
-    if (pMP3->onRead == drmp3__on_read_stdio) {
-        FILE* pFile = (FILE*)pMP3->pUserData;
-        if (pFile != NULL) {
-            fclose(pFile);
-            pMP3->pUserData = NULL; /* Make sure the file handle is cleared to NULL to we don't attempt to close it a second time. */
-        }
-    }
-#endif
-
-    drmp3__free_from_callbacks(pMP3->pData, &pMP3->allocationCallbacks);
-}
-
-#if defined(DR_MP3_FLOAT_OUTPUT)
-static void drmp3_f32_to_s16(drmp3_int16* dst, const float* src, drmp3_uint64 sampleCount)
-{
-    drmp3_uint64 i;
-    drmp3_uint64 i4;
-    drmp3_uint64 sampleCount4;
-
-    /* Unrolled. */
-    i = 0;
-    sampleCount4 = sampleCount >> 2;
-    for (i4 = 0; i4 < sampleCount4; i4 += 1) {
-        float x0 = src[i+0];
-        float x1 = src[i+1];
-        float x2 = src[i+2];
-        float x3 = src[i+3];
-
-        x0 = ((x0 < -1) ? -1 : ((x0 > 1) ? 1 : x0));
-        x1 = ((x1 < -1) ? -1 : ((x1 > 1) ? 1 : x1));
-        x2 = ((x2 < -1) ? -1 : ((x2 > 1) ? 1 : x2));
-        x3 = ((x3 < -1) ? -1 : ((x3 > 1) ? 1 : x3));
-
-        x0 = x0 * 32767.0f;
-        x1 = x1 * 32767.0f;
-        x2 = x2 * 32767.0f;
-        x3 = x3 * 32767.0f;
-
-        dst[i+0] = (drmp3_int16)x0;
-        dst[i+1] = (drmp3_int16)x1;
-        dst[i+2] = (drmp3_int16)x2;
-        dst[i+3] = (drmp3_int16)x3;
-
-        i += 4;
-    }
-
-    /* Leftover. */
-    for (; i < sampleCount; i += 1) {
-        float x = src[i];
-        x = ((x < -1) ? -1 : ((x > 1) ? 1 : x));    /* clip */
-        x = x * 32767.0f;                           /* -1..1 to -32767..32767 */
-
-        dst[i] = (drmp3_int16)x;
-    }
-}
-#endif
-
-#if !defined(DR_MP3_FLOAT_OUTPUT)
-static void drmp3_s16_to_f32(float* dst, const drmp3_int16* src, drmp3_uint64 sampleCount)
-{
-    drmp3_uint64 i;
-    for (i = 0; i < sampleCount; i += 1) {
-        float x = (float)src[i];
-        x = x * 0.000030517578125f;         /* -32768..32767 to -1..0.999969482421875 */
-        dst[i] = x;
-    }
-}
-#endif
-
-
-static drmp3_uint64 drmp3_read_pcm_frames_raw(drmp3* pMP3, drmp3_uint64 framesToRead, void* pBufferOut)
-{
-    drmp3_uint64 totalFramesRead = 0;
-
-    DRMP3_ASSERT(pMP3 != NULL);
-    DRMP3_ASSERT(pMP3->onRead != NULL);
-
-    while (framesToRead > 0) {
-        drmp3_uint32 framesToConsume = (drmp3_uint32)DRMP3_MIN(pMP3->pcmFramesRemainingInMP3Frame, framesToRead);
-        if (pBufferOut != NULL) {
-        #if defined(DR_MP3_FLOAT_OUTPUT)
-            /* f32 */
-            float* pFramesOutF32 = (float*)DRMP3_OFFSET_PTR(pBufferOut,          sizeof(float) * totalFramesRead                   * pMP3->channels);
-            float* pFramesInF32  = (float*)DRMP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(float) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels);
-            DRMP3_COPY_MEMORY(pFramesOutF32, pFramesInF32, sizeof(float) * framesToConsume * pMP3->channels);
-        #else
-            /* s16 */
-            drmp3_int16* pFramesOutS16 = (drmp3_int16*)DRMP3_OFFSET_PTR(pBufferOut,          sizeof(drmp3_int16) * totalFramesRead                   * pMP3->channels);
-            drmp3_int16* pFramesInS16  = (drmp3_int16*)DRMP3_OFFSET_PTR(&pMP3->pcmFrames[0], sizeof(drmp3_int16) * pMP3->pcmFramesConsumedInMP3Frame * pMP3->mp3FrameChannels);
-            DRMP3_COPY_MEMORY(pFramesOutS16, pFramesInS16, sizeof(drmp3_int16) * framesToConsume * pMP3->channels);
-        #endif
-        }
-
-        pMP3->currentPCMFrame              += framesToConsume;
-        pMP3->pcmFramesConsumedInMP3Frame  += framesToConsume;
-        pMP3->pcmFramesRemainingInMP3Frame -= framesToConsume;
-        totalFramesRead                    += framesToConsume;
-        framesToRead                       -= framesToConsume;
-
-        if (framesToRead == 0) {
-            break;
-        }
-
-        DRMP3_ASSERT(pMP3->pcmFramesRemainingInMP3Frame == 0);
-
-        /*
-        At this point we have exhausted our in-memory buffer so we need to re-fill. Note that the sample rate may have changed
-        at this point which means we'll also need to update our sample rate conversion pipeline.
-        */
-        if (drmp3_decode_next_frame(pMP3) == 0) {
-            break;
-        }
-    }
-
-    return totalFramesRead;
-}
-
-
-DRMP3_API drmp3_uint64 drmp3_read_pcm_frames_f32(drmp3* pMP3, drmp3_uint64 framesToRead, float* pBufferOut)
-{
-    if (pMP3 == NULL || pMP3->onRead == NULL) {
-        return 0;
-    }
-
-#if defined(DR_MP3_FLOAT_OUTPUT)
-    /* Fast path. No conversion required. */
-    return drmp3_read_pcm_frames_raw(pMP3, framesToRead, pBufferOut);
-#else
-    /* Slow path. Convert from s16 to f32. */
-    {
-        drmp3_int16 pTempS16[8192];
-        drmp3_uint64 totalPCMFramesRead = 0;
-
-        while (totalPCMFramesRead < framesToRead) {
-            drmp3_uint64 framesJustRead;
-            drmp3_uint64 framesRemaining = framesToRead - totalPCMFramesRead;
-            drmp3_uint64 framesToReadNow = DRMP3_COUNTOF(pTempS16) / pMP3->channels;
-            if (framesToReadNow > framesRemaining) {
-                framesToReadNow = framesRemaining;
-            }
-
-            framesJustRead = drmp3_read_pcm_frames_raw(pMP3, framesToReadNow, pTempS16);
-            if (framesJustRead == 0) {
-                break;
-            }
-
-            drmp3_s16_to_f32((float*)DRMP3_OFFSET_PTR(pBufferOut, sizeof(float) * totalPCMFramesRead * pMP3->channels), pTempS16, framesJustRead * pMP3->channels);
-            totalPCMFramesRead += framesJustRead;
-        }
-
-        return totalPCMFramesRead;
-    }
-#endif
-}
-
-DRMP3_API drmp3_uint64 drmp3_read_pcm_frames_s16(drmp3* pMP3, drmp3_uint64 framesToRead, drmp3_int16* pBufferOut)
-{
-    if (pMP3 == NULL || pMP3->onRead == NULL) {
-        return 0;
-    }
-
-#if !defined(DR_MP3_FLOAT_OUTPUT)
-    /* Fast path. No conversion required. */
-    return drmp3_read_pcm_frames_raw(pMP3, framesToRead, pBufferOut);
-#else
-    /* Slow path. Convert from f32 to s16. */
-    {
-        float pTempF32[4096];
-        drmp3_uint64 totalPCMFramesRead = 0;
-
-        while (totalPCMFramesRead < framesToRead) {
-            drmp3_uint64 framesJustRead;
-            drmp3_uint64 framesRemaining = framesToRead - totalPCMFramesRead;
-            drmp3_uint64 framesToReadNow = DRMP3_COUNTOF(pTempF32) / pMP3->channels;
-            if (framesToReadNow > framesRemaining) {
-                framesToReadNow = framesRemaining;
-            }
-
-            framesJustRead = drmp3_read_pcm_frames_raw(pMP3, framesToReadNow, pTempF32);
-            if (framesJustRead == 0) {
-                break;
-            }
-
-            drmp3_f32_to_s16((drmp3_int16*)DRMP3_OFFSET_PTR(pBufferOut, sizeof(drmp3_int16) * totalPCMFramesRead * pMP3->channels), pTempF32, framesJustRead * pMP3->channels);
-            totalPCMFramesRead += framesJustRead;
-        }
-
-        return totalPCMFramesRead;
-    }
-#endif
-}
-
-static void drmp3_reset(drmp3* pMP3)
-{
-    DRMP3_ASSERT(pMP3 != NULL);
-
-    pMP3->pcmFramesConsumedInMP3Frame = 0;
-    pMP3->pcmFramesRemainingInMP3Frame = 0;
-    pMP3->currentPCMFrame = 0;
-    pMP3->dataSize = 0;
-    pMP3->atEnd = DRMP3_FALSE;
-    drmp3dec_init(&pMP3->decoder);
-}
-
-static drmp3_bool32 drmp3_seek_to_start_of_stream(drmp3* pMP3)
-{
-    DRMP3_ASSERT(pMP3 != NULL);
-    DRMP3_ASSERT(pMP3->onSeek != NULL);
-
-    /* Seek to the start of the stream to begin with. */
-    if (!drmp3__on_seek(pMP3, 0, drmp3_seek_origin_start)) {
-        return DRMP3_FALSE;
-    }
-
-    /* Clear any cached data. */
-    drmp3_reset(pMP3);
-    return DRMP3_TRUE;
-}
-
-
-static drmp3_bool32 drmp3_seek_forward_by_pcm_frames__brute_force(drmp3* pMP3, drmp3_uint64 frameOffset)
-{
-    drmp3_uint64 framesRead;
-
-    /*
-    Just using a dumb read-and-discard for now. What would be nice is to parse only the header of the MP3 frame, and then skip over leading
-    frames without spending the time doing a full decode. I cannot see an easy way to do this in minimp3, however, so it may involve some
-    kind of manual processing.
-    */
-#if defined(DR_MP3_FLOAT_OUTPUT)
-    framesRead = drmp3_read_pcm_frames_f32(pMP3, frameOffset, NULL);
-#else
-    framesRead = drmp3_read_pcm_frames_s16(pMP3, frameOffset, NULL);
-#endif
-    if (framesRead != frameOffset) {
-        return DRMP3_FALSE;
-    }
-
-    return DRMP3_TRUE;
-}
-
-static drmp3_bool32 drmp3_seek_to_pcm_frame__brute_force(drmp3* pMP3, drmp3_uint64 frameIndex)
-{
-    DRMP3_ASSERT(pMP3 != NULL);
-
-    if (frameIndex == pMP3->currentPCMFrame) {
-        return DRMP3_TRUE;
-    }
-
-    /*
-    If we're moving foward we just read from where we're at. Otherwise we need to move back to the start of
-    the stream and read from the beginning.
-    */
-    if (frameIndex < pMP3->currentPCMFrame) {
-        /* Moving backward. Move to the start of the stream and then move forward. */
-        if (!drmp3_seek_to_start_of_stream(pMP3)) {
-            return DRMP3_FALSE;
-        }
-    }
-
-    DRMP3_ASSERT(frameIndex >= pMP3->currentPCMFrame);
-    return drmp3_seek_forward_by_pcm_frames__brute_force(pMP3, (frameIndex - pMP3->currentPCMFrame));
-}
-
-static drmp3_bool32 drmp3_find_closest_seek_point(drmp3* pMP3, drmp3_uint64 frameIndex, drmp3_uint32* pSeekPointIndex)
-{
-    drmp3_uint32 iSeekPoint;
-
-    DRMP3_ASSERT(pSeekPointIndex != NULL);
-
-    *pSeekPointIndex = 0;
-
-    if (frameIndex < pMP3->pSeekPoints[0].pcmFrameIndex) {
-        return DRMP3_FALSE;
-    }
-
-    /* Linear search for simplicity to begin with while I'm getting this thing working. Once it's all working change this to a binary search. */
-    for (iSeekPoint = 0; iSeekPoint < pMP3->seekPointCount; ++iSeekPoint) {
-        if (pMP3->pSeekPoints[iSeekPoint].pcmFrameIndex > frameIndex) {
-            break;  /* Found it. */
-        }
-
-        *pSeekPointIndex = iSeekPoint;
-    }
-
-    return DRMP3_TRUE;
-}
-
-static drmp3_bool32 drmp3_seek_to_pcm_frame__seek_table(drmp3* pMP3, drmp3_uint64 frameIndex)
-{
-    drmp3_seek_point seekPoint;
-    drmp3_uint32 priorSeekPointIndex;
-    drmp3_uint16 iMP3Frame;
-    drmp3_uint64 leftoverFrames;
-
-    DRMP3_ASSERT(pMP3 != NULL);
-    DRMP3_ASSERT(pMP3->pSeekPoints != NULL);
-    DRMP3_ASSERT(pMP3->seekPointCount > 0);
-
-    /* If there is no prior seekpoint it means the target PCM frame comes before the first seek point. Just assume a seekpoint at the start of the file in this case. */
-    if (drmp3_find_closest_seek_point(pMP3, frameIndex, &priorSeekPointIndex)) {
-        seekPoint = pMP3->pSeekPoints[priorSeekPointIndex];
-    } else {
-        seekPoint.seekPosInBytes     = 0;
-        seekPoint.pcmFrameIndex      = 0;
-        seekPoint.mp3FramesToDiscard = 0;
-        seekPoint.pcmFramesToDiscard = 0;
-    }
-
-    /* First thing to do is seek to the first byte of the relevant MP3 frame. */
-    if (!drmp3__on_seek_64(pMP3, seekPoint.seekPosInBytes, drmp3_seek_origin_start)) {
-        return DRMP3_FALSE; /* Failed to seek. */
-    }
-
-    /* Clear any cached data. */
-    drmp3_reset(pMP3);
-
-    /* Whole MP3 frames need to be discarded first. */
-    for (iMP3Frame = 0; iMP3Frame < seekPoint.mp3FramesToDiscard; ++iMP3Frame) {
-        drmp3_uint32 pcmFramesRead;
-        drmp3d_sample_t* pPCMFrames;
-
-        /* Pass in non-null for the last frame because we want to ensure the sample rate converter is preloaded correctly. */
-        pPCMFrames = NULL;
-        if (iMP3Frame == seekPoint.mp3FramesToDiscard-1) {
-            pPCMFrames = (drmp3d_sample_t*)pMP3->pcmFrames;
-        }
-
-        /* We first need to decode the next frame. */
-        pcmFramesRead = drmp3_decode_next_frame_ex(pMP3, pPCMFrames);
-        if (pcmFramesRead == 0) {
-            return DRMP3_FALSE;
-        }
-    }
-
-    /* We seeked to an MP3 frame in the raw stream so we need to make sure the current PCM frame is set correctly. */
-    pMP3->currentPCMFrame = seekPoint.pcmFrameIndex - seekPoint.pcmFramesToDiscard;
-
-    /*
-    Now at this point we can follow the same process as the brute force technique where we just skip over unnecessary MP3 frames and then
-    read-and-discard at least 2 whole MP3 frames.
-    */
-    leftoverFrames = frameIndex - pMP3->currentPCMFrame;
-    return drmp3_seek_forward_by_pcm_frames__brute_force(pMP3, leftoverFrames);
-}
-
-DRMP3_API drmp3_bool32 drmp3_seek_to_pcm_frame(drmp3* pMP3, drmp3_uint64 frameIndex)
-{
-    if (pMP3 == NULL || pMP3->onSeek == NULL) {
-        return DRMP3_FALSE;
-    }
-
-    if (frameIndex == 0) {
-        return drmp3_seek_to_start_of_stream(pMP3);
-    }
-
-    /* Use the seek table if we have one. */
-    if (pMP3->pSeekPoints != NULL && pMP3->seekPointCount > 0) {
-        return drmp3_seek_to_pcm_frame__seek_table(pMP3, frameIndex);
-    } else {
-        return drmp3_seek_to_pcm_frame__brute_force(pMP3, frameIndex);
-    }
-}
-
-DRMP3_API drmp3_bool32 drmp3_get_mp3_and_pcm_frame_count(drmp3* pMP3, drmp3_uint64* pMP3FrameCount, drmp3_uint64* pPCMFrameCount)
-{
-    drmp3_uint64 currentPCMFrame;
-    drmp3_uint64 totalPCMFrameCount;
-    drmp3_uint64 totalMP3FrameCount;
-
-    if (pMP3 == NULL) {
-        return DRMP3_FALSE;
-    }
-
-    /*
-    The way this works is we move back to the start of the stream, iterate over each MP3 frame and calculate the frame count based
-    on our output sample rate, the seek back to the PCM frame we were sitting on before calling this function.
-    */
-
-    /* The stream must support seeking for this to work. */
-    if (pMP3->onSeek == NULL) {
-        return DRMP3_FALSE;
-    }
-
-    /* We'll need to seek back to where we were, so grab the PCM frame we're currently sitting on so we can restore later. */
-    currentPCMFrame = pMP3->currentPCMFrame;
-    
-    if (!drmp3_seek_to_start_of_stream(pMP3)) {
-        return DRMP3_FALSE;
-    }
-
-    totalPCMFrameCount = 0;
-    totalMP3FrameCount = 0;
-
-    for (;;) {
-        drmp3_uint32 pcmFramesInCurrentMP3Frame;
-
-        pcmFramesInCurrentMP3Frame = drmp3_decode_next_frame_ex(pMP3, NULL);
-        if (pcmFramesInCurrentMP3Frame == 0) {
-            break;
-        }
-
-        totalPCMFrameCount += pcmFramesInCurrentMP3Frame;
-        totalMP3FrameCount += 1;
-    }
-
-    /* Finally, we need to seek back to where we were. */
-    if (!drmp3_seek_to_start_of_stream(pMP3)) {
-        return DRMP3_FALSE;
-    }
-
-    if (!drmp3_seek_to_pcm_frame(pMP3, currentPCMFrame)) {
-        return DRMP3_FALSE;
-    }
-
-    if (pMP3FrameCount != NULL) {
-        *pMP3FrameCount = totalMP3FrameCount;
-    }
-    if (pPCMFrameCount != NULL) {
-        *pPCMFrameCount = totalPCMFrameCount;
-    }
-
-    return DRMP3_TRUE;
-}
-
-DRMP3_API drmp3_uint64 drmp3_get_pcm_frame_count(drmp3* pMP3)
-{
-    drmp3_uint64 totalPCMFrameCount;
-    if (!drmp3_get_mp3_and_pcm_frame_count(pMP3, NULL, &totalPCMFrameCount)) {
-        return 0;
-    }
-
-    return totalPCMFrameCount;
-}
-
-DRMP3_API drmp3_uint64 drmp3_get_mp3_frame_count(drmp3* pMP3)
-{
-    drmp3_uint64 totalMP3FrameCount;
-    if (!drmp3_get_mp3_and_pcm_frame_count(pMP3, &totalMP3FrameCount, NULL)) {
-        return 0;
-    }
-
-    return totalMP3FrameCount;
-}
-
-static void drmp3__accumulate_running_pcm_frame_count(drmp3* pMP3, drmp3_uint32 pcmFrameCountIn, drmp3_uint64* pRunningPCMFrameCount, float* pRunningPCMFrameCountFractionalPart)
-{
-    float srcRatio;
-    float pcmFrameCountOutF;
-    drmp3_uint32 pcmFrameCountOut;
-
-    srcRatio = (float)pMP3->mp3FrameSampleRate / (float)pMP3->sampleRate;
-    DRMP3_ASSERT(srcRatio > 0);
-
-    pcmFrameCountOutF = *pRunningPCMFrameCountFractionalPart + (pcmFrameCountIn / srcRatio);
-    pcmFrameCountOut  = (drmp3_uint32)pcmFrameCountOutF;
-    *pRunningPCMFrameCountFractionalPart = pcmFrameCountOutF - pcmFrameCountOut;
-    *pRunningPCMFrameCount += pcmFrameCountOut;
-}
-
-typedef struct
-{
-    drmp3_uint64 bytePos;
-    drmp3_uint64 pcmFrameIndex; /* <-- After sample rate conversion. */
-} drmp3__seeking_mp3_frame_info;
-
-DRMP3_API drmp3_bool32 drmp3_calculate_seek_points(drmp3* pMP3, drmp3_uint32* pSeekPointCount, drmp3_seek_point* pSeekPoints)
-{
-    drmp3_uint32 seekPointCount;
-    drmp3_uint64 currentPCMFrame;
-    drmp3_uint64 totalMP3FrameCount;
-    drmp3_uint64 totalPCMFrameCount;
-
-    if (pMP3 == NULL || pSeekPointCount == NULL || pSeekPoints == NULL) {
-        return DRMP3_FALSE; /* Invalid args. */
-    }
-
-    seekPointCount = *pSeekPointCount;
-    if (seekPointCount == 0) {
-        return DRMP3_FALSE;  /* The client has requested no seek points. Consider this to be invalid arguments since the client has probably not intended this. */
-    }
-
-    /* We'll need to seek back to the current sample after calculating the seekpoints so we need to go ahead and grab the current location at the top. */
-    currentPCMFrame = pMP3->currentPCMFrame;
-    
-    /* We never do more than the total number of MP3 frames and we limit it to 32-bits. */
-    if (!drmp3_get_mp3_and_pcm_frame_count(pMP3, &totalMP3FrameCount, &totalPCMFrameCount)) {
-        return DRMP3_FALSE;
-    }
-
-    /* If there's less than DRMP3_SEEK_LEADING_MP3_FRAMES+1 frames we just report 1 seek point which will be the very start of the stream. */
-    if (totalMP3FrameCount < DRMP3_SEEK_LEADING_MP3_FRAMES+1) {
-        seekPointCount = 1;
-        pSeekPoints[0].seekPosInBytes     = 0;
-        pSeekPoints[0].pcmFrameIndex      = 0;
-        pSeekPoints[0].mp3FramesToDiscard = 0;
-        pSeekPoints[0].pcmFramesToDiscard = 0;
-    } else {
-        drmp3_uint64 pcmFramesBetweenSeekPoints;
-        drmp3__seeking_mp3_frame_info mp3FrameInfo[DRMP3_SEEK_LEADING_MP3_FRAMES+1];
-        drmp3_uint64 runningPCMFrameCount = 0;
-        float runningPCMFrameCountFractionalPart = 0;
-        drmp3_uint64 nextTargetPCMFrame;
-        drmp3_uint32 iMP3Frame;
-        drmp3_uint32 iSeekPoint;
-
-        if (seekPointCount > totalMP3FrameCount-1) {
-            seekPointCount = (drmp3_uint32)totalMP3FrameCount-1;
-        }
-
-        pcmFramesBetweenSeekPoints = totalPCMFrameCount / (seekPointCount+1);
-
-        /*
-        Here is where we actually calculate the seek points. We need to start by moving the start of the stream. We then enumerate over each
-        MP3 frame.
-        */
-        if (!drmp3_seek_to_start_of_stream(pMP3)) {
-            return DRMP3_FALSE;
-        }
-
-        /*
-        We need to cache the byte positions of the previous MP3 frames. As a new MP3 frame is iterated, we cycle the byte positions in this
-        array. The value in the first item in this array is the byte position that will be reported in the next seek point.
-        */
-
-        /* We need to initialize the array of MP3 byte positions for the leading MP3 frames. */
-        for (iMP3Frame = 0; iMP3Frame < DRMP3_SEEK_LEADING_MP3_FRAMES+1; ++iMP3Frame) {
-            drmp3_uint32 pcmFramesInCurrentMP3FrameIn;
-
-            /* The byte position of the next frame will be the stream's cursor position, minus whatever is sitting in the buffer. */
-            DRMP3_ASSERT(pMP3->streamCursor >= pMP3->dataSize);
-            mp3FrameInfo[iMP3Frame].bytePos       = pMP3->streamCursor - pMP3->dataSize;
-            mp3FrameInfo[iMP3Frame].pcmFrameIndex = runningPCMFrameCount;
-
-            /* We need to get information about this frame so we can know how many samples it contained. */
-            pcmFramesInCurrentMP3FrameIn = drmp3_decode_next_frame_ex(pMP3, NULL);
-            if (pcmFramesInCurrentMP3FrameIn == 0) {
-                return DRMP3_FALSE; /* This should never happen. */
-            }
-
-            drmp3__accumulate_running_pcm_frame_count(pMP3, pcmFramesInCurrentMP3FrameIn, &runningPCMFrameCount, &runningPCMFrameCountFractionalPart);
-        }
-
-        /*
-        At this point we will have extracted the byte positions of the leading MP3 frames. We can now start iterating over each seek point and
-        calculate them.
-        */
-        nextTargetPCMFrame = 0;
-        for (iSeekPoint = 0; iSeekPoint < seekPointCount; ++iSeekPoint) {
-            nextTargetPCMFrame += pcmFramesBetweenSeekPoints;
-
-            for (;;) {
-                if (nextTargetPCMFrame < runningPCMFrameCount) {
-                    /* The next seek point is in the current MP3 frame. */
-                    pSeekPoints[iSeekPoint].seekPosInBytes     = mp3FrameInfo[0].bytePos;
-                    pSeekPoints[iSeekPoint].pcmFrameIndex      = nextTargetPCMFrame;
-                    pSeekPoints[iSeekPoint].mp3FramesToDiscard = DRMP3_SEEK_LEADING_MP3_FRAMES;
-                    pSeekPoints[iSeekPoint].pcmFramesToDiscard = (drmp3_uint16)(nextTargetPCMFrame - mp3FrameInfo[DRMP3_SEEK_LEADING_MP3_FRAMES-1].pcmFrameIndex);
-                    break;
-                } else {
-                    size_t i;
-                    drmp3_uint32 pcmFramesInCurrentMP3FrameIn;
-
-                    /*
-                    The next seek point is not in the current MP3 frame, so continue on to the next one. The first thing to do is cycle the cached
-                    MP3 frame info.
-                    */
-                    for (i = 0; i < DRMP3_COUNTOF(mp3FrameInfo)-1; ++i) {
-                        mp3FrameInfo[i] = mp3FrameInfo[i+1];
-                    }
-
-                    /* Cache previous MP3 frame info. */
-                    mp3FrameInfo[DRMP3_COUNTOF(mp3FrameInfo)-1].bytePos       = pMP3->streamCursor - pMP3->dataSize;
-                    mp3FrameInfo[DRMP3_COUNTOF(mp3FrameInfo)-1].pcmFrameIndex = runningPCMFrameCount;
-
-                    /*
-                    Go to the next MP3 frame. This shouldn't ever fail, but just in case it does we just set the seek point and break. If it happens, it
-                    should only ever do it for the last seek point.
-                    */
-                    pcmFramesInCurrentMP3FrameIn = drmp3_decode_next_frame_ex(pMP3, NULL);
-                    if (pcmFramesInCurrentMP3FrameIn == 0) {
-                        pSeekPoints[iSeekPoint].seekPosInBytes     = mp3FrameInfo[0].bytePos;
-                        pSeekPoints[iSeekPoint].pcmFrameIndex      = nextTargetPCMFrame;
-                        pSeekPoints[iSeekPoint].mp3FramesToDiscard = DRMP3_SEEK_LEADING_MP3_FRAMES;
-                        pSeekPoints[iSeekPoint].pcmFramesToDiscard = (drmp3_uint16)(nextTargetPCMFrame - mp3FrameInfo[DRMP3_SEEK_LEADING_MP3_FRAMES-1].pcmFrameIndex);
-                        break;
-                    }
-
-                    drmp3__accumulate_running_pcm_frame_count(pMP3, pcmFramesInCurrentMP3FrameIn, &runningPCMFrameCount, &runningPCMFrameCountFractionalPart);
-                }
-            }
-        }
-
-        /* Finally, we need to seek back to where we were. */
-        if (!drmp3_seek_to_start_of_stream(pMP3)) {
-            return DRMP3_FALSE;
-        }
-        if (!drmp3_seek_to_pcm_frame(pMP3, currentPCMFrame)) {
-            return DRMP3_FALSE;
-        }
-    }
-
-    *pSeekPointCount = seekPointCount;
-    return DRMP3_TRUE;
-}
-
-DRMP3_API drmp3_bool32 drmp3_bind_seek_table(drmp3* pMP3, drmp3_uint32 seekPointCount, drmp3_seek_point* pSeekPoints)
-{
-    if (pMP3 == NULL) {
-        return DRMP3_FALSE;
-    }
-
-    if (seekPointCount == 0 || pSeekPoints == NULL) {
-        /* Unbinding. */
-        pMP3->seekPointCount = 0;
-        pMP3->pSeekPoints = NULL;
-    } else {
-        /* Binding. */
-        pMP3->seekPointCount = seekPointCount;
-        pMP3->pSeekPoints = pSeekPoints;
-    }
-
-    return DRMP3_TRUE;
-}
-
-
-static float* drmp3__full_read_and_close_f32(drmp3* pMP3, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount)
-{
-    drmp3_uint64 totalFramesRead = 0;
-    drmp3_uint64 framesCapacity = 0;
-    float* pFrames = NULL;
-    float temp[4096];
-
-    DRMP3_ASSERT(pMP3 != NULL);
-
-    for (;;) {
-        drmp3_uint64 framesToReadRightNow = DRMP3_COUNTOF(temp) / pMP3->channels;
-        drmp3_uint64 framesJustRead = drmp3_read_pcm_frames_f32(pMP3, framesToReadRightNow, temp);
-        if (framesJustRead == 0) {
-            break;
-        }
-
-        /* Reallocate the output buffer if there's not enough room. */
-        if (framesCapacity < totalFramesRead + framesJustRead) {
-            drmp3_uint64 oldFramesBufferSize;
-            drmp3_uint64 newFramesBufferSize;
-            drmp3_uint64 newFramesCap;
-            float* pNewFrames;
-
-            newFramesCap = framesCapacity * 2;
-            if (newFramesCap < totalFramesRead + framesJustRead) {
-                newFramesCap = totalFramesRead + framesJustRead;
-            }
-
-            oldFramesBufferSize = framesCapacity * pMP3->channels * sizeof(float);
-            newFramesBufferSize = newFramesCap   * pMP3->channels * sizeof(float);
-            if (newFramesBufferSize > (drmp3_uint64)DRMP3_SIZE_MAX) {
-                break;
-            }
-
-            pNewFrames = (float*)drmp3__realloc_from_callbacks(pFrames, (size_t)newFramesBufferSize, (size_t)oldFramesBufferSize, &pMP3->allocationCallbacks);
-            if (pNewFrames == NULL) {
-                drmp3__free_from_callbacks(pFrames, &pMP3->allocationCallbacks);
-                break;
-            }
-
-            pFrames = pNewFrames;
-            framesCapacity = newFramesCap;
-        }
-
-        DRMP3_COPY_MEMORY(pFrames + totalFramesRead*pMP3->channels, temp, (size_t)(framesJustRead*pMP3->channels*sizeof(float)));
-        totalFramesRead += framesJustRead;
-
-        /* If the number of frames we asked for is less that what we actually read it means we've reached the end. */
-        if (framesJustRead != framesToReadRightNow) {
-            break;
-        }
-    }
-
-    if (pConfig != NULL) {
-        pConfig->channels   = pMP3->channels;
-        pConfig->sampleRate = pMP3->sampleRate;
-    }
-
-    drmp3_uninit(pMP3);
-
-    if (pTotalFrameCount) {
-        *pTotalFrameCount = totalFramesRead;
-    }
-
-    return pFrames;
-}
-
-static drmp3_int16* drmp3__full_read_and_close_s16(drmp3* pMP3, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount)
-{
-    drmp3_uint64 totalFramesRead = 0;
-    drmp3_uint64 framesCapacity = 0;
-    drmp3_int16* pFrames = NULL;
-    drmp3_int16 temp[4096];
-
-    DRMP3_ASSERT(pMP3 != NULL);
-
-    for (;;) {
-        drmp3_uint64 framesToReadRightNow = DRMP3_COUNTOF(temp) / pMP3->channels;
-        drmp3_uint64 framesJustRead = drmp3_read_pcm_frames_s16(pMP3, framesToReadRightNow, temp);
-        if (framesJustRead == 0) {
-            break;
-        }
-
-        /* Reallocate the output buffer if there's not enough room. */
-        if (framesCapacity < totalFramesRead + framesJustRead) {
-            drmp3_uint64 newFramesBufferSize;
-            drmp3_uint64 oldFramesBufferSize;
-            drmp3_uint64 newFramesCap;
-            drmp3_int16* pNewFrames;
-
-            newFramesCap = framesCapacity * 2;
-            if (newFramesCap < totalFramesRead + framesJustRead) {
-                newFramesCap = totalFramesRead + framesJustRead;
-            }
-
-            oldFramesBufferSize = framesCapacity * pMP3->channels * sizeof(drmp3_int16);
-            newFramesBufferSize = newFramesCap   * pMP3->channels * sizeof(drmp3_int16);
-            if (newFramesBufferSize > (drmp3_uint64)DRMP3_SIZE_MAX) {
-                break;
-            }
-
-            pNewFrames = (drmp3_int16*)drmp3__realloc_from_callbacks(pFrames, (size_t)newFramesBufferSize, (size_t)oldFramesBufferSize, &pMP3->allocationCallbacks);
-            if (pNewFrames == NULL) {
-                drmp3__free_from_callbacks(pFrames, &pMP3->allocationCallbacks);
-                break;
-            }
-
-            pFrames = pNewFrames;
-            framesCapacity = newFramesCap;
-        }
-
-        DRMP3_COPY_MEMORY(pFrames + totalFramesRead*pMP3->channels, temp, (size_t)(framesJustRead*pMP3->channels*sizeof(drmp3_int16)));
-        totalFramesRead += framesJustRead;
-
-        /* If the number of frames we asked for is less that what we actually read it means we've reached the end. */
-        if (framesJustRead != framesToReadRightNow) {
-            break;
-        }
-    }
-
-    if (pConfig != NULL) {
-        pConfig->channels   = pMP3->channels;
-        pConfig->sampleRate = pMP3->sampleRate;
-    }
-
-    drmp3_uninit(pMP3);
-
-    if (pTotalFrameCount) {
-        *pTotalFrameCount = totalFramesRead;
-    }
-
-    return pFrames;
-}
-
-
-DRMP3_API float* drmp3_open_and_read_pcm_frames_f32(drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    drmp3 mp3;
-    if (!drmp3_init(&mp3, onRead, onSeek, pUserData, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drmp3__full_read_and_close_f32(&mp3, pConfig, pTotalFrameCount);
-}
-
-DRMP3_API drmp3_int16* drmp3_open_and_read_pcm_frames_s16(drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    drmp3 mp3;
-    if (!drmp3_init(&mp3, onRead, onSeek, pUserData, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drmp3__full_read_and_close_s16(&mp3, pConfig, pTotalFrameCount);
-}
-
-
-DRMP3_API float* drmp3_open_memory_and_read_pcm_frames_f32(const void* pData, size_t dataSize, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    drmp3 mp3;
-    if (!drmp3_init_memory(&mp3, pData, dataSize, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drmp3__full_read_and_close_f32(&mp3, pConfig, pTotalFrameCount);
-}
-
-DRMP3_API drmp3_int16* drmp3_open_memory_and_read_pcm_frames_s16(const void* pData, size_t dataSize, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    drmp3 mp3;
-    if (!drmp3_init_memory(&mp3, pData, dataSize, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drmp3__full_read_and_close_s16(&mp3, pConfig, pTotalFrameCount);
-}
-
-
-#ifndef DR_MP3_NO_STDIO
-DRMP3_API float* drmp3_open_file_and_read_pcm_frames_f32(const char* filePath, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    drmp3 mp3;
-    if (!drmp3_init_file(&mp3, filePath, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drmp3__full_read_and_close_f32(&mp3, pConfig, pTotalFrameCount);
-}
-
-DRMP3_API drmp3_int16* drmp3_open_file_and_read_pcm_frames_s16(const char* filePath, drmp3_config* pConfig, drmp3_uint64* pTotalFrameCount, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    drmp3 mp3;
-    if (!drmp3_init_file(&mp3, filePath, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drmp3__full_read_and_close_s16(&mp3, pConfig, pTotalFrameCount);
-}
-#endif
-
-DRMP3_API void* drmp3_malloc(size_t sz, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pAllocationCallbacks != NULL) {
-        return drmp3__malloc_from_callbacks(sz, pAllocationCallbacks);
-    } else {
-        return drmp3__malloc_default(sz, NULL);
-    }
-}
-
-DRMP3_API void drmp3_free(void* p, const drmp3_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pAllocationCallbacks != NULL) {
-        drmp3__free_from_callbacks(p, pAllocationCallbacks);
-    } else {
-        drmp3__free_default(p, NULL);
-    }
-}
-
-#endif  /* dr_mp3_c */
-#endif  /*DR_MP3_IMPLEMENTATION*/
-
-/*
-DIFFERENCES BETWEEN minimp3 AND dr_mp3
-======================================
-- First, keep in mind that minimp3 (https://github.com/lieff/minimp3) is where all the real work was done. All of the
-  code relating to the actual decoding remains mostly unmodified, apart from some namespacing changes.
-- dr_mp3 adds a pulling style API which allows you to deliver raw data via callbacks. So, rather than pushing data
-  to the decoder, the decoder _pulls_ data from your callbacks.
-- In addition to callbacks, a decoder can be initialized from a block of memory and a file.
-- The dr_mp3 pull API reads PCM frames rather than whole MP3 frames.
-- dr_mp3 adds convenience APIs for opening and decoding entire files in one go.
-- dr_mp3 is fully namespaced, including the implementation section, which is more suitable when compiling projects
-  as a single translation unit (aka unity builds). At the time of writing this, a unity build is not possible when
-  using minimp3 in conjunction with stb_vorbis. dr_mp3 addresses this.
-*/
-
-/*
-RELEASE NOTES - v0.5.0
-=======================
-Version 0.5.0 has breaking API changes.
-
-Improved Client-Defined Memory Allocation
------------------------------------------
-The main change with this release is the addition of a more flexible way of implementing custom memory allocation routines. The
-existing system of DRMP3_MALLOC, DRMP3_REALLOC and DRMP3_FREE are still in place and will be used by default when no custom
-allocation callbacks are specified.
-
-To use the new system, you pass in a pointer to a drmp3_allocation_callbacks object to drmp3_init() and family, like this:
-
-    void* my_malloc(size_t sz, void* pUserData)
-    {
-        return malloc(sz);
-    }
-    void* my_realloc(void* p, size_t sz, void* pUserData)
-    {
-        return realloc(p, sz);
-    }
-    void my_free(void* p, void* pUserData)
-    {
-        free(p);
-    }
-
-    ...
-
-    drmp3_allocation_callbacks allocationCallbacks;
-    allocationCallbacks.pUserData = &myData;
-    allocationCallbacks.onMalloc  = my_malloc;
-    allocationCallbacks.onRealloc = my_realloc;
-    allocationCallbacks.onFree    = my_free;
-    drmp3_init_file(&mp3, "my_file.mp3", NULL, &allocationCallbacks);
-
-The advantage of this new system is that it allows you to specify user data which will be passed in to the allocation routines.
-
-Passing in null for the allocation callbacks object will cause dr_mp3 to use defaults which is the same as DRMP3_MALLOC,
-DRMP3_REALLOC and DRMP3_FREE and the equivalent of how it worked in previous versions.
-
-Every API that opens a drmp3 object now takes this extra parameter. These include the following:
-
-    drmp3_init()
-    drmp3_init_file()
-    drmp3_init_memory()
-    drmp3_open_and_read_pcm_frames_f32()
-    drmp3_open_and_read_pcm_frames_s16()
-    drmp3_open_memory_and_read_pcm_frames_f32()
-    drmp3_open_memory_and_read_pcm_frames_s16()
-    drmp3_open_file_and_read_pcm_frames_f32()
-    drmp3_open_file_and_read_pcm_frames_s16()
-
-Renamed APIs
-------------
-The following APIs have been renamed for consistency with other dr_* libraries and to make it clear that they return PCM frame
-counts rather than sample counts.
-
-    drmp3_open_and_read_f32()        -> drmp3_open_and_read_pcm_frames_f32()
-    drmp3_open_and_read_s16()        -> drmp3_open_and_read_pcm_frames_s16()
-    drmp3_open_memory_and_read_f32() -> drmp3_open_memory_and_read_pcm_frames_f32()
-    drmp3_open_memory_and_read_s16() -> drmp3_open_memory_and_read_pcm_frames_s16()
-    drmp3_open_file_and_read_f32()   -> drmp3_open_file_and_read_pcm_frames_f32()
-    drmp3_open_file_and_read_s16()   -> drmp3_open_file_and_read_pcm_frames_s16()
-*/
-
-/*
-REVISION HISTORY
-================
-v0.6.34 - 2022-09-17
-  - Fix compilation with DJGPP.
-  - Fix compilation when compiling with x86 with no SSE2.
-  - Remove an unnecessary variable from the drmp3 structure.
-
-v0.6.33 - 2022-04-10
-  - Fix compilation error with the MSVC ARM64 build.
-  - Fix compilation error on older versions of GCC.
-  - Remove some unused functions.
-
-v0.6.32 - 2021-12-11
-  - Fix a warning with Clang.
-
-v0.6.31 - 2021-08-22
-  - Fix a bug when loading from memory.
-
-v0.6.30 - 2021-08-16
-  - Silence some warnings.
-  - Replace memory operations with DRMP3_* macros.
-
-v0.6.29 - 2021-08-08
-  - Bring up to date with minimp3.
-
-v0.6.28 - 2021-07-31
-  - Fix platform detection for ARM64.
-  - Fix a compilation error with C89.
-
-v0.6.27 - 2021-02-21
-  - Fix a warning due to referencing _MSC_VER when it is undefined.
-
-v0.6.26 - 2021-01-31
-  - Bring up to date with minimp3.
-
-v0.6.25 - 2020-12-26
-  - Remove DRMP3_DEFAULT_CHANNELS and DRMP3_DEFAULT_SAMPLE_RATE which are leftovers from some removed APIs.
-
-v0.6.24 - 2020-12-07
-  - Fix a typo in version date for 0.6.23.
-
-v0.6.23 - 2020-12-03
-  - Fix an error where a file can be closed twice when initialization of the decoder fails.
-
-v0.6.22 - 2020-12-02
-  - Fix an error where it's possible for a file handle to be left open when initialization of the decoder fails.
-
-v0.6.21 - 2020-11-28
-  - Bring up to date with minimp3.
-
-v0.6.20 - 2020-11-21
-  - Fix compilation with OpenWatcom.
-
-v0.6.19 - 2020-11-13
-  - Minor code clean up.
-
-v0.6.18 - 2020-11-01
-  - Improve compiler support for older versions of GCC.
-
-v0.6.17 - 2020-09-28
-  - Bring up to date with minimp3.
-
-v0.6.16 - 2020-08-02
-  - Simplify sized types.
-
-v0.6.15 - 2020-07-25
-  - Fix a compilation warning.
-
-v0.6.14 - 2020-07-23
-  - Fix undefined behaviour with memmove().
-
-v0.6.13 - 2020-07-06
-  - Fix a bug when converting from s16 to f32 in drmp3_read_pcm_frames_f32().
-
-v0.6.12 - 2020-06-23
-  - Add include guard for the implementation section.
-
-v0.6.11 - 2020-05-26
-  - Fix use of uninitialized variable error.
-
-v0.6.10 - 2020-05-16
-  - Add compile-time and run-time version querying.
-    - DRMP3_VERSION_MINOR
-    - DRMP3_VERSION_MAJOR
-    - DRMP3_VERSION_REVISION
-    - DRMP3_VERSION_STRING
-    - drmp3_version()
-    - drmp3_version_string()
-
-v0.6.9 - 2020-04-30
-  - Change the `pcm` parameter of drmp3dec_decode_frame() to a `const drmp3_uint8*` for consistency with internal APIs.
-
-v0.6.8 - 2020-04-26
-  - Optimizations to decoding when initializing from memory.
-
-v0.6.7 - 2020-04-25
-  - Fix a compilation error with DR_MP3_NO_STDIO
-  - Optimization to decoding by reducing some data movement.
-
-v0.6.6 - 2020-04-23
-  - Fix a minor bug with the running PCM frame counter.
-
-v0.6.5 - 2020-04-19
-  - Fix compilation error on ARM builds.
-
-v0.6.4 - 2020-04-19
-  - Bring up to date with changes to minimp3.
-
-v0.6.3 - 2020-04-13
-  - Fix some pedantic warnings.
-
-v0.6.2 - 2020-04-10
-  - Fix a crash in drmp3_open_*_and_read_pcm_frames_*() if the output config object is NULL.
-
-v0.6.1 - 2020-04-05
-  - Fix warnings.
-
-v0.6.0 - 2020-04-04
-  - API CHANGE: Remove the pConfig parameter from the following APIs:
-    - drmp3_init()
-    - drmp3_init_memory()
-    - drmp3_init_file()
-  - Add drmp3_init_file_w() for opening a file from a wchar_t encoded path.
-
-v0.5.6 - 2020-02-12
-  - Bring up to date with minimp3.
-
-v0.5.5 - 2020-01-29
-  - Fix a memory allocation bug in high level s16 decoding APIs.
-
-v0.5.4 - 2019-12-02
-  - Fix a possible null pointer dereference when using custom memory allocators for realloc().
-
-v0.5.3 - 2019-11-14
-  - Fix typos in documentation.
-
-v0.5.2 - 2019-11-02
-  - Bring up to date with minimp3.
-
-v0.5.1 - 2019-10-08
-  - Fix a warning with GCC.
-
-v0.5.0 - 2019-10-07
-  - API CHANGE: Add support for user defined memory allocation routines. This system allows the program to specify their own memory allocation
-    routines with a user data pointer for client-specific contextual data. This adds an extra parameter to the end of the following APIs:
-    - drmp3_init()
-    - drmp3_init_file()
-    - drmp3_init_memory()
-    - drmp3_open_and_read_pcm_frames_f32()
-    - drmp3_open_and_read_pcm_frames_s16()
-    - drmp3_open_memory_and_read_pcm_frames_f32()
-    - drmp3_open_memory_and_read_pcm_frames_s16()
-    - drmp3_open_file_and_read_pcm_frames_f32()
-    - drmp3_open_file_and_read_pcm_frames_s16()
-  - API CHANGE: Renamed the following APIs:
-    - drmp3_open_and_read_f32()        -> drmp3_open_and_read_pcm_frames_f32()
-    - drmp3_open_and_read_s16()        -> drmp3_open_and_read_pcm_frames_s16()
-    - drmp3_open_memory_and_read_f32() -> drmp3_open_memory_and_read_pcm_frames_f32()
-    - drmp3_open_memory_and_read_s16() -> drmp3_open_memory_and_read_pcm_frames_s16()
-    - drmp3_open_file_and_read_f32()   -> drmp3_open_file_and_read_pcm_frames_f32()
-    - drmp3_open_file_and_read_s16()   -> drmp3_open_file_and_read_pcm_frames_s16()
-
-v0.4.7 - 2019-07-28
-  - Fix a compiler error.
-
-v0.4.6 - 2019-06-14
-  - Fix a compiler error.
-
-v0.4.5 - 2019-06-06
-  - Bring up to date with minimp3.
-
-v0.4.4 - 2019-05-06
-  - Fixes to the VC6 build.
-
-v0.4.3 - 2019-05-05
-  - Use the channel count and/or sample rate of the first MP3 frame instead of DRMP3_DEFAULT_CHANNELS and
-    DRMP3_DEFAULT_SAMPLE_RATE when they are set to 0. To use the old behaviour, just set the relevant property to
-    DRMP3_DEFAULT_CHANNELS or DRMP3_DEFAULT_SAMPLE_RATE.
-  - Add s16 reading APIs
-    - drmp3_read_pcm_frames_s16
-    - drmp3_open_memory_and_read_pcm_frames_s16
-    - drmp3_open_and_read_pcm_frames_s16
-    - drmp3_open_file_and_read_pcm_frames_s16
-  - Add drmp3_get_mp3_and_pcm_frame_count() to the public header section.
-  - Add support for C89.
-  - Change license to choice of public domain or MIT-0.
-
-v0.4.2 - 2019-02-21
-  - Fix a warning.
-
-v0.4.1 - 2018-12-30
-  - Fix a warning.
-
-v0.4.0 - 2018-12-16
-  - API CHANGE: Rename some APIs:
-    - drmp3_read_f32 -> to drmp3_read_pcm_frames_f32
-    - drmp3_seek_to_frame -> drmp3_seek_to_pcm_frame
-    - drmp3_open_and_decode_f32 -> drmp3_open_and_read_pcm_frames_f32
-    - drmp3_open_and_decode_memory_f32 -> drmp3_open_memory_and_read_pcm_frames_f32
-    - drmp3_open_and_decode_file_f32 -> drmp3_open_file_and_read_pcm_frames_f32
-  - Add drmp3_get_pcm_frame_count().
-  - Add drmp3_get_mp3_frame_count().
-  - Improve seeking performance.
-
-v0.3.2 - 2018-09-11
-  - Fix a couple of memory leaks.
-  - Bring up to date with minimp3.
-
-v0.3.1 - 2018-08-25
-  - Fix C++ build.
-
-v0.3.0 - 2018-08-25
-  - Bring up to date with minimp3. This has a minor API change: the "pcm" parameter of drmp3dec_decode_frame() has
-    been changed from short* to void* because it can now output both s16 and f32 samples, depending on whether or
-    not the DR_MP3_FLOAT_OUTPUT option is set.
-
-v0.2.11 - 2018-08-08
-  - Fix a bug where the last part of a file is not read.
-
-v0.2.10 - 2018-08-07
-  - Improve 64-bit detection.
-
-v0.2.9 - 2018-08-05
-  - Fix C++ build on older versions of GCC.
-  - Bring up to date with minimp3.
-
-v0.2.8 - 2018-08-02
-  - Fix compilation errors with older versions of GCC.
-
-v0.2.7 - 2018-07-13
-  - Bring up to date with minimp3.
-
-v0.2.6 - 2018-07-12
-  - Bring up to date with minimp3.
-
-v0.2.5 - 2018-06-22
-  - Bring up to date with minimp3.
-
-v0.2.4 - 2018-05-12
-  - Bring up to date with minimp3.
-
-v0.2.3 - 2018-04-29
-  - Fix TCC build.
-
-v0.2.2 - 2018-04-28
-  - Fix bug when opening a decoder from memory.
-
-v0.2.1 - 2018-04-27
-  - Efficiency improvements when the decoder reaches the end of the stream.
-
-v0.2 - 2018-04-21
-  - Bring up to date with minimp3.
-  - Start using major.minor.revision versioning.
-
-v0.1d - 2018-03-30
-  - Bring up to date with minimp3.
-
-v0.1c - 2018-03-11
-  - Fix C++ build error.
-
-v0.1b - 2018-03-07
-  - Bring up to date with minimp3.
-
-v0.1a - 2018-02-28
-  - Fix compilation error on GCC/Clang.
-  - Fix some warnings.
-
-v0.1 - 2018-02-xx
-  - Initial versioned release.
-*/
-
-/*
-This software is available as a choice of the following licenses. Choose
-whichever you prefer.
-
-===============================================================================
-ALTERNATIVE 1 - Public Domain (www.unlicense.org)
-===============================================================================
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-
-===============================================================================
-ALTERNATIVE 2 - MIT No Attribution
-===============================================================================
-Copyright 2020 David Reid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/*
-    https://github.com/lieff/minimp3
-    To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide.
-    This software is distributed without any warranty.
-    See <http://creativecommons.org/publicdomain/zero/1.0/>.
-*/
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/dr_wav.h b/contrib/tinyusdz/tinyusdz_repo/src/external/dr_wav.h
deleted file mode 100644
index 2f885a04c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/dr_wav.h
+++ /dev/null
@@ -1,8350 +0,0 @@
-/*
-WAV audio loader and writer. Choice of public domain or MIT-0. See license statements at the end of this file.
-dr_wav - v0.13.7 - 2022-09-17
-
-David Reid - mackron@gmail.com
-
-GitHub: https://github.com/mackron/dr_libs
-*/
-
-/*
-Introduction
-============
-This is a single file library. To use it, do something like the following in one .c file.
-
-    ```c
-    #define DR_WAV_IMPLEMENTATION
-    #include "dr_wav.h"
-    ```
-
-You can then #include this file in other parts of the program as you would with any other header file. Do something like the following to read audio data:
-
-    ```c
-    drwav wav;
-    if (!drwav_init_file(&wav, "my_song.wav", NULL)) {
-        // Error opening WAV file.
-    }
-
-    drwav_int32* pDecodedInterleavedPCMFrames = malloc(wav.totalPCMFrameCount * wav.channels * sizeof(drwav_int32));
-    size_t numberOfSamplesActuallyDecoded = drwav_read_pcm_frames_s32(&wav, wav.totalPCMFrameCount, pDecodedInterleavedPCMFrames);
-
-    ...
-
-    drwav_uninit(&wav);
-    ```
-
-If you just want to quickly open and read the audio data in a single operation you can do something like this:
-
-    ```c
-    unsigned int channels;
-    unsigned int sampleRate;
-    drwav_uint64 totalPCMFrameCount;
-    float* pSampleData = drwav_open_file_and_read_pcm_frames_f32("my_song.wav", &channels, &sampleRate, &totalPCMFrameCount, NULL);
-    if (pSampleData == NULL) {
-        // Error opening and reading WAV file.
-    }
-
-    ...
-
-    drwav_free(pSampleData, NULL);
-    ```
-
-The examples above use versions of the API that convert the audio data to a consistent format (32-bit signed PCM, in this case), but you can still output the
-audio data in its internal format (see notes below for supported formats):
-
-    ```c
-    size_t framesRead = drwav_read_pcm_frames(&wav, wav.totalPCMFrameCount, pDecodedInterleavedPCMFrames);
-    ```
-
-You can also read the raw bytes of audio data, which could be useful if dr_wav does not have native support for a particular data format:
-
-    ```c
-    size_t bytesRead = drwav_read_raw(&wav, bytesToRead, pRawDataBuffer);
-    ```
-
-dr_wav can also be used to output WAV files. This does not currently support compressed formats. To use this, look at `drwav_init_write()`,
-`drwav_init_file_write()`, etc. Use `drwav_write_pcm_frames()` to write samples, or `drwav_write_raw()` to write raw data in the "data" chunk.
-
-    ```c
-    drwav_data_format format;
-    format.container = drwav_container_riff;     // <-- drwav_container_riff = normal WAV files, drwav_container_w64 = Sony Wave64.
-    format.format = DR_WAVE_FORMAT_PCM;          // <-- Any of the DR_WAVE_FORMAT_* codes.
-    format.channels = 2;
-    format.sampleRate = 44100;
-    format.bitsPerSample = 16;
-    drwav_init_file_write(&wav, "data/recording.wav", &format, NULL);
-
-    ...
-
-    drwav_uint64 framesWritten = drwav_write_pcm_frames(pWav, frameCount, pSamples);
-    ```
-
-dr_wav has seamless support the Sony Wave64 format. The decoder will automatically detect it and it should Just Work without any manual intervention.
-
-
-Build Options
-=============
-#define these options before including this file.
-
-#define DR_WAV_NO_CONVERSION_API
-  Disables conversion APIs such as `drwav_read_pcm_frames_f32()` and `drwav_s16_to_f32()`.
-
-#define DR_WAV_NO_STDIO
-  Disables APIs that initialize a decoder from a file such as `drwav_init_file()`, `drwav_init_file_write()`, etc.
-
-#define DR_WAV_NO_WCHAR
-  Disables all functions ending with `_w`. Use this if your compiler does not provide wchar.h. Not required if DR_WAV_NO_STDIO is also defined.
-
-
-
-Notes
-=====
-- Samples are always interleaved.
-- The default read function does not do any data conversion. Use `drwav_read_pcm_frames_f32()`, `drwav_read_pcm_frames_s32()` and `drwav_read_pcm_frames_s16()`
-  to read and convert audio data to 32-bit floating point, signed 32-bit integer and signed 16-bit integer samples respectively. Tested and supported internal
-  formats include the following:
-  - Unsigned 8-bit PCM
-  - Signed 12-bit PCM
-  - Signed 16-bit PCM
-  - Signed 24-bit PCM
-  - Signed 32-bit PCM
-  - IEEE 32-bit floating point
-  - IEEE 64-bit floating point
-  - A-law and u-law
-  - Microsoft ADPCM
-  - IMA ADPCM (DVI, format code 0x11)
-- dr_wav will try to read the WAV file as best it can, even if it's not strictly conformant to the WAV format.
-*/
-
-#ifndef dr_wav_h
-#define dr_wav_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DRWAV_STRINGIFY(x)      #x
-#define DRWAV_XSTRINGIFY(x)     DRWAV_STRINGIFY(x)
-
-#define DRWAV_VERSION_MAJOR     0
-#define DRWAV_VERSION_MINOR     13
-#define DRWAV_VERSION_REVISION  7
-#define DRWAV_VERSION_STRING    DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION)
-
-#include <stddef.h> /* For size_t. */
-
-/* Sized types. */
-typedef   signed char           drwav_int8;
-typedef unsigned char           drwav_uint8;
-typedef   signed short          drwav_int16;
-typedef unsigned short          drwav_uint16;
-typedef   signed int            drwav_int32;
-typedef unsigned int            drwav_uint32;
-#if defined(_MSC_VER) && !defined(__clang__)
-    typedef   signed __int64    drwav_int64;
-    typedef unsigned __int64    drwav_uint64;
-#else
-    #if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
-        #pragma GCC diagnostic push
-        #pragma GCC diagnostic ignored "-Wlong-long"
-        #if defined(__clang__)
-            #pragma GCC diagnostic ignored "-Wc++11-long-long"
-        #endif
-    #endif
-    typedef   signed long long  drwav_int64;
-    typedef unsigned long long  drwav_uint64;
-    #if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
-        #pragma GCC diagnostic pop
-    #endif
-#endif
-#if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(_M_ARM64) || defined(__powerpc64__)
-    typedef drwav_uint64        drwav_uintptr;
-#else
-    typedef drwav_uint32        drwav_uintptr;
-#endif
-typedef drwav_uint8             drwav_bool8;
-typedef drwav_uint32            drwav_bool32;
-#define DRWAV_TRUE              1
-#define DRWAV_FALSE             0
-
-#if !defined(DRWAV_API)
-    #if defined(DRWAV_DLL)
-        #if defined(_WIN32)
-            #define DRWAV_DLL_IMPORT  __declspec(dllimport)
-            #define DRWAV_DLL_EXPORT  __declspec(dllexport)
-            #define DRWAV_DLL_PRIVATE static
-        #else
-            #if defined(__GNUC__) && __GNUC__ >= 4
-                #define DRWAV_DLL_IMPORT  __attribute__((visibility("default")))
-                #define DRWAV_DLL_EXPORT  __attribute__((visibility("default")))
-                #define DRWAV_DLL_PRIVATE __attribute__((visibility("hidden")))
-            #else
-                #define DRWAV_DLL_IMPORT
-                #define DRWAV_DLL_EXPORT
-                #define DRWAV_DLL_PRIVATE static
-            #endif
-        #endif
-
-        #if defined(DR_WAV_IMPLEMENTATION) || defined(DRWAV_IMPLEMENTATION)
-            #define DRWAV_API  DRWAV_DLL_EXPORT
-        #else
-            #define DRWAV_API  DRWAV_DLL_IMPORT
-        #endif
-        #define DRWAV_PRIVATE DRWAV_DLL_PRIVATE
-    #else
-        #define DRWAV_API extern
-        #define DRWAV_PRIVATE static
-    #endif
-#endif
-
-typedef drwav_int32 drwav_result;
-#define DRWAV_SUCCESS                        0
-#define DRWAV_ERROR                         -1   /* A generic error. */
-#define DRWAV_INVALID_ARGS                  -2
-#define DRWAV_INVALID_OPERATION             -3
-#define DRWAV_OUT_OF_MEMORY                 -4
-#define DRWAV_OUT_OF_RANGE                  -5
-#define DRWAV_ACCESS_DENIED                 -6
-#define DRWAV_DOES_NOT_EXIST                -7
-#define DRWAV_ALREADY_EXISTS                -8
-#define DRWAV_TOO_MANY_OPEN_FILES           -9
-#define DRWAV_INVALID_FILE                  -10
-#define DRWAV_TOO_BIG                       -11
-#define DRWAV_PATH_TOO_LONG                 -12
-#define DRWAV_NAME_TOO_LONG                 -13
-#define DRWAV_NOT_DIRECTORY                 -14
-#define DRWAV_IS_DIRECTORY                  -15
-#define DRWAV_DIRECTORY_NOT_EMPTY           -16
-#define DRWAV_END_OF_FILE                   -17
-#define DRWAV_NO_SPACE                      -18
-#define DRWAV_BUSY                          -19
-#define DRWAV_IO_ERROR                      -20
-#define DRWAV_INTERRUPT                     -21
-#define DRWAV_UNAVAILABLE                   -22
-#define DRWAV_ALREADY_IN_USE                -23
-#define DRWAV_BAD_ADDRESS                   -24
-#define DRWAV_BAD_SEEK                      -25
-#define DRWAV_BAD_PIPE                      -26
-#define DRWAV_DEADLOCK                      -27
-#define DRWAV_TOO_MANY_LINKS                -28
-#define DRWAV_NOT_IMPLEMENTED               -29
-#define DRWAV_NO_MESSAGE                    -30
-#define DRWAV_BAD_MESSAGE                   -31
-#define DRWAV_NO_DATA_AVAILABLE             -32
-#define DRWAV_INVALID_DATA                  -33
-#define DRWAV_TIMEOUT                       -34
-#define DRWAV_NO_NETWORK                    -35
-#define DRWAV_NOT_UNIQUE                    -36
-#define DRWAV_NOT_SOCKET                    -37
-#define DRWAV_NO_ADDRESS                    -38
-#define DRWAV_BAD_PROTOCOL                  -39
-#define DRWAV_PROTOCOL_UNAVAILABLE          -40
-#define DRWAV_PROTOCOL_NOT_SUPPORTED        -41
-#define DRWAV_PROTOCOL_FAMILY_NOT_SUPPORTED -42
-#define DRWAV_ADDRESS_FAMILY_NOT_SUPPORTED  -43
-#define DRWAV_SOCKET_NOT_SUPPORTED          -44
-#define DRWAV_CONNECTION_RESET              -45
-#define DRWAV_ALREADY_CONNECTED             -46
-#define DRWAV_NOT_CONNECTED                 -47
-#define DRWAV_CONNECTION_REFUSED            -48
-#define DRWAV_NO_HOST                       -49
-#define DRWAV_IN_PROGRESS                   -50
-#define DRWAV_CANCELLED                     -51
-#define DRWAV_MEMORY_ALREADY_MAPPED         -52
-#define DRWAV_AT_END                        -53
-
-/* Common data formats. */
-#define DR_WAVE_FORMAT_PCM          0x1
-#define DR_WAVE_FORMAT_ADPCM        0x2
-#define DR_WAVE_FORMAT_IEEE_FLOAT   0x3
-#define DR_WAVE_FORMAT_ALAW         0x6
-#define DR_WAVE_FORMAT_MULAW        0x7
-#define DR_WAVE_FORMAT_DVI_ADPCM    0x11
-#define DR_WAVE_FORMAT_EXTENSIBLE   0xFFFE
-
-/* Flags to pass into drwav_init_ex(), etc. */
-#define DRWAV_SEQUENTIAL            0x00000001
-
-DRWAV_API void drwav_version(drwav_uint32* pMajor, drwav_uint32* pMinor, drwav_uint32* pRevision);
-DRWAV_API const char* drwav_version_string(void);
-
-typedef enum
-{
-    drwav_seek_origin_start,
-    drwav_seek_origin_current
-} drwav_seek_origin;
-
-typedef enum
-{
-    drwav_container_riff,
-    drwav_container_w64,
-    drwav_container_rf64
-} drwav_container;
-
-typedef struct
-{
-    union
-    {
-        drwav_uint8 fourcc[4];
-        drwav_uint8 guid[16];
-    } id;
-
-    /* The size in bytes of the chunk. */
-    drwav_uint64 sizeInBytes;
-
-    /*
-    RIFF = 2 byte alignment.
-    W64  = 8 byte alignment.
-    */
-    unsigned int paddingSize;
-} drwav_chunk_header;
-
-typedef struct
-{
-    /*
-    The format tag exactly as specified in the wave file's "fmt" chunk. This can be used by applications
-    that require support for data formats not natively supported by dr_wav.
-    */
-    drwav_uint16 formatTag;
-
-    /* The number of channels making up the audio data. When this is set to 1 it is mono, 2 is stereo, etc. */
-    drwav_uint16 channels;
-
-    /* The sample rate. Usually set to something like 44100. */
-    drwav_uint32 sampleRate;
-
-    /* Average bytes per second. You probably don't need this, but it's left here for informational purposes. */
-    drwav_uint32 avgBytesPerSec;
-
-    /* Block align. This is equal to the number of channels * bytes per sample. */
-    drwav_uint16 blockAlign;
-
-    /* Bits per sample. */
-    drwav_uint16 bitsPerSample;
-
-    /* The size of the extended data. Only used internally for validation, but left here for informational purposes. */
-    drwav_uint16 extendedSize;
-
-    /*
-    The number of valid bits per sample. When <formatTag> is equal to WAVE_FORMAT_EXTENSIBLE, <bitsPerSample>
-    is always rounded up to the nearest multiple of 8. This variable contains information about exactly how
-    many bits are valid per sample. Mainly used for informational purposes.
-    */
-    drwav_uint16 validBitsPerSample;
-
-    /* The channel mask. Not used at the moment. */
-    drwav_uint32 channelMask;
-
-    /* The sub-format, exactly as specified by the wave file. */
-    drwav_uint8 subFormat[16];
-} drwav_fmt;
-
-DRWAV_API drwav_uint16 drwav_fmt_get_format(const drwav_fmt* pFMT);
-
-
-/*
-Callback for when data is read. Return value is the number of bytes actually read.
-
-pUserData   [in]  The user data that was passed to drwav_init() and family.
-pBufferOut  [out] The output buffer.
-bytesToRead [in]  The number of bytes to read.
-
-Returns the number of bytes actually read.
-
-A return value of less than bytesToRead indicates the end of the stream. Do _not_ return from this callback until
-either the entire bytesToRead is filled or you have reached the end of the stream.
-*/
-typedef size_t (* drwav_read_proc)(void* pUserData, void* pBufferOut, size_t bytesToRead);
-
-/*
-Callback for when data is written. Returns value is the number of bytes actually written.
-
-pUserData    [in]  The user data that was passed to drwav_init_write() and family.
-pData        [out] A pointer to the data to write.
-bytesToWrite [in]  The number of bytes to write.
-
-Returns the number of bytes actually written.
-
-If the return value differs from bytesToWrite, it indicates an error.
-*/
-typedef size_t (* drwav_write_proc)(void* pUserData, const void* pData, size_t bytesToWrite);
-
-/*
-Callback for when data needs to be seeked.
-
-pUserData [in] The user data that was passed to drwav_init() and family.
-offset    [in] The number of bytes to move, relative to the origin. Will never be negative.
-origin    [in] The origin of the seek - the current position or the start of the stream.
-
-Returns whether or not the seek was successful.
-
-Whether or not it is relative to the beginning or current position is determined by the "origin" parameter which will be either drwav_seek_origin_start or
-drwav_seek_origin_current.
-*/
-typedef drwav_bool32 (* drwav_seek_proc)(void* pUserData, int offset, drwav_seek_origin origin);
-
-/*
-Callback for when drwav_init_ex() finds a chunk.
-
-pChunkUserData    [in] The user data that was passed to the pChunkUserData parameter of drwav_init_ex() and family.
-onRead            [in] A pointer to the function to call when reading.
-onSeek            [in] A pointer to the function to call when seeking.
-pReadSeekUserData [in] The user data that was passed to the pReadSeekUserData parameter of drwav_init_ex() and family.
-pChunkHeader      [in] A pointer to an object containing basic header information about the chunk. Use this to identify the chunk.
-container         [in] Whether or not the WAV file is a RIFF or Wave64 container. If you're unsure of the difference, assume RIFF.
-pFMT              [in] A pointer to the object containing the contents of the "fmt" chunk.
-
-Returns the number of bytes read + seeked.
-
-To read data from the chunk, call onRead(), passing in pReadSeekUserData as the first parameter. Do the same for seeking with onSeek(). The return value must
-be the total number of bytes you have read _plus_ seeked.
-
-Use the `container` argument to discriminate the fields in `pChunkHeader->id`. If the container is `drwav_container_riff` or `drwav_container_rf64` you should
-use `id.fourcc`, otherwise you should use `id.guid`.
-
-The `pFMT` parameter can be used to determine the data format of the wave file. Use `drwav_fmt_get_format()` to get the sample format, which will be one of the
-`DR_WAVE_FORMAT_*` identifiers.
-
-The read pointer will be sitting on the first byte after the chunk's header. You must not attempt to read beyond the boundary of the chunk.
-*/
-typedef drwav_uint64 (* drwav_chunk_proc)(void* pChunkUserData, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pReadSeekUserData, const drwav_chunk_header* pChunkHeader, drwav_container container, const drwav_fmt* pFMT);
-
-typedef struct
-{
-    void* pUserData;
-    void* (* onMalloc)(size_t sz, void* pUserData);
-    void* (* onRealloc)(void* p, size_t sz, void* pUserData);
-    void  (* onFree)(void* p, void* pUserData);
-} drwav_allocation_callbacks;
-
-/* Structure for internal use. Only used for loaders opened with drwav_init_memory(). */
-typedef struct
-{
-    const drwav_uint8* data;
-    size_t dataSize;
-    size_t currentReadPos;
-} drwav__memory_stream;
-
-/* Structure for internal use. Only used for writers opened with drwav_init_memory_write(). */
-typedef struct
-{
-    void** ppData;
-    size_t* pDataSize;
-    size_t dataSize;
-    size_t dataCapacity;
-    size_t currentWritePos;
-} drwav__memory_stream_write;
-
-typedef struct
-{
-    drwav_container container;  /* RIFF, W64. */
-    drwav_uint32 format;        /* DR_WAVE_FORMAT_* */
-    drwav_uint32 channels;
-    drwav_uint32 sampleRate;
-    drwav_uint32 bitsPerSample;
-} drwav_data_format;
-
-typedef enum
-{
-    drwav_metadata_type_none                        = 0,
-
-    /*
-    Unknown simply means a chunk that drwav does not handle specifically. You can still ask to
-    receive these chunks as metadata objects. It is then up to you to interpret the chunk's data.
-    You can also write unknown metadata to a wav file. Be careful writing unknown chunks if you
-    have also edited the audio data. The unknown chunks could represent offsets/sizes that no
-    longer correctly correspond to the audio data.
-    */
-    drwav_metadata_type_unknown                     = 1 << 0,
-
-    /* Only 1 of each of these metadata items are allowed in a wav file. */
-    drwav_metadata_type_smpl                        = 1 << 1,
-    drwav_metadata_type_inst                        = 1 << 2,
-    drwav_metadata_type_cue                         = 1 << 3,
-    drwav_metadata_type_acid                        = 1 << 4,
-    drwav_metadata_type_bext                        = 1 << 5,
-
-    /*
-    Wav files often have a LIST chunk. This is a chunk that contains a set of subchunks. For this
-    higher-level metadata API, we don't make a distinction between a regular chunk and a LIST
-    subchunk. Instead, they are all just 'metadata' items.
-
-    There can be multiple of these metadata items in a wav file.
-    */
-    drwav_metadata_type_list_label                  = 1 << 6,
-    drwav_metadata_type_list_note                   = 1 << 7,
-    drwav_metadata_type_list_labelled_cue_region    = 1 << 8,
-
-    drwav_metadata_type_list_info_software          = 1 << 9,
-    drwav_metadata_type_list_info_copyright         = 1 << 10,
-    drwav_metadata_type_list_info_title             = 1 << 11,
-    drwav_metadata_type_list_info_artist            = 1 << 12,
-    drwav_metadata_type_list_info_comment           = 1 << 13,
-    drwav_metadata_type_list_info_date              = 1 << 14,
-    drwav_metadata_type_list_info_genre             = 1 << 15,
-    drwav_metadata_type_list_info_album             = 1 << 16,
-    drwav_metadata_type_list_info_tracknumber       = 1 << 17,
-
-    /* Other type constants for convenience. */
-    drwav_metadata_type_list_all_info_strings       = drwav_metadata_type_list_info_software
-                                                    | drwav_metadata_type_list_info_copyright
-                                                    | drwav_metadata_type_list_info_title
-                                                    | drwav_metadata_type_list_info_artist
-                                                    | drwav_metadata_type_list_info_comment
-                                                    | drwav_metadata_type_list_info_date
-                                                    | drwav_metadata_type_list_info_genre
-                                                    | drwav_metadata_type_list_info_album
-                                                    | drwav_metadata_type_list_info_tracknumber,
-
-    drwav_metadata_type_list_all_adtl               = drwav_metadata_type_list_label
-                                                    | drwav_metadata_type_list_note
-                                                    | drwav_metadata_type_list_labelled_cue_region,
-
-    drwav_metadata_type_all                         = -2,   /*0xFFFFFFFF & ~drwav_metadata_type_unknown,*/
-    drwav_metadata_type_all_including_unknown       = -1    /*0xFFFFFFFF,*/
-} drwav_metadata_type;
-
-/*
-Sampler Metadata
-
-The sampler chunk contains information about how a sound should be played in the context of a whole
-audio production, and when used in a sampler. See https://en.wikipedia.org/wiki/Sample-based_synthesis.
-*/
-typedef enum
-{
-    drwav_smpl_loop_type_forward  = 0,
-    drwav_smpl_loop_type_pingpong = 1,
-    drwav_smpl_loop_type_backward = 2
-} drwav_smpl_loop_type;
-
-typedef struct
-{
-    /* The ID of the associated cue point, see drwav_cue and drwav_cue_point. As with all cue point IDs, this can correspond to a label chunk to give this loop a name, see drwav_list_label_or_note. */
-    drwav_uint32 cuePointId;
-
-    /* See drwav_smpl_loop_type. */
-    drwav_uint32 type;
-
-    /* The byte offset of the first sample to be played in the loop. */
-    drwav_uint32 firstSampleByteOffset;
-
-    /* The byte offset into the audio data of the last sample to be played in the loop. */
-    drwav_uint32 lastSampleByteOffset;
-
-    /* A value to represent that playback should occur at a point between samples. This value ranges from 0 to UINT32_MAX. Where a value of 0 means no fraction, and a value of (UINT32_MAX / 2) would mean half a sample. */
-    drwav_uint32 sampleFraction;
-
-    /* Number of times to play the loop. 0 means loop infinitely. */
-    drwav_uint32 playCount;
-} drwav_smpl_loop;
-
-typedef struct
-{
-    /* IDs for a particular MIDI manufacturer. 0 if not used. */
-    drwav_uint32 manufacturerId;
-    drwav_uint32 productId;
-
-    /* The period of 1 sample in nanoseconds. */
-    drwav_uint32 samplePeriodNanoseconds;
-
-    /* The MIDI root note of this file. 0 to 127. */
-    drwav_uint32 midiUnityNote;
-
-    /* The fraction of a semitone up from the given MIDI note. This is a value from 0 to UINT32_MAX, where 0 means no change and (UINT32_MAX / 2) is half a semitone (AKA 50 cents). */
-    drwav_uint32 midiPitchFraction;
-
-    /* Data relating to SMPTE standards which are used for syncing audio and video. 0 if not used. */
-    drwav_uint32 smpteFormat;
-    drwav_uint32 smpteOffset;
-
-    /* drwav_smpl_loop loops. */
-    drwav_uint32 sampleLoopCount;
-
-    /* Optional sampler-specific data. */
-    drwav_uint32 samplerSpecificDataSizeInBytes;
-
-    drwav_smpl_loop* pLoops;
-    drwav_uint8* pSamplerSpecificData;
-} drwav_smpl;
-
-/*
-Instrument Metadata
-
-The inst metadata contains data about how a sound should be played as part of an instrument. This
-commonly read by samplers. See https://en.wikipedia.org/wiki/Sample-based_synthesis.
-*/
-typedef struct
-{
-    drwav_int8 midiUnityNote;   /* The root note of the audio as a MIDI note number. 0 to 127. */
-    drwav_int8 fineTuneCents;   /* -50 to +50 */
-    drwav_int8 gainDecibels;    /* -64 to +64 */
-    drwav_int8 lowNote;         /* 0 to 127 */
-    drwav_int8 highNote;        /* 0 to 127 */
-    drwav_int8 lowVelocity;     /* 1 to 127 */
-    drwav_int8 highVelocity;    /* 1 to 127 */
-} drwav_inst;
-
-/*
-Cue Metadata
-
-Cue points are markers at specific points in the audio. They often come with an associated piece of
-drwav_list_label_or_note metadata which contains the text for the marker.
-*/
-typedef struct
-{
-    /* Unique identification value. */
-    drwav_uint32 id;
-
-    /* Set to 0. This is only relevant if there is a 'playlist' chunk - which is not supported by dr_wav. */
-    drwav_uint32 playOrderPosition;
-
-    /* Should always be "data". This represents the fourcc value of the chunk that this cue point corresponds to. dr_wav only supports a single data chunk so this should always be "data". */
-    drwav_uint8 dataChunkId[4];
-
-    /* Set to 0. This is only relevant if there is a wave list chunk. dr_wav, like lots of readers/writers, do not support this. */
-    drwav_uint32 chunkStart;
-
-    /* Set to 0 for uncompressed formats. Else the last byte in compressed wave data where decompression can begin to find the value of the corresponding sample value. */
-    drwav_uint32 blockStart;
-
-    /* For uncompressed formats this is the byte offset of the cue point into the audio data. For compressed formats this is relative to the block specified with blockStart. */
-    drwav_uint32 sampleByteOffset;
-} drwav_cue_point;
-
-typedef struct
-{
-    drwav_uint32 cuePointCount;
-    drwav_cue_point *pCuePoints;
-} drwav_cue;
-
-/*
-Acid Metadata
-
-This chunk contains some information about the time signature and the tempo of the audio.
-*/
-typedef enum
-{
-    drwav_acid_flag_one_shot      = 1,  /* If this is not set, then it is a loop instead of a one-shot. */
-    drwav_acid_flag_root_note_set = 2,
-    drwav_acid_flag_stretch       = 4,
-    drwav_acid_flag_disk_based    = 8,
-    drwav_acid_flag_acidizer      = 16  /* Not sure what this means. */
-} drwav_acid_flag;
-
-typedef struct
-{
-    /* A bit-field, see drwav_acid_flag. */
-    drwav_uint32 flags;
-
-    /* Valid if flags contains drwav_acid_flag_root_note_set. It represents the MIDI root note the file - a value from 0 to 127. */
-    drwav_uint16 midiUnityNote;
-
-    /* Reserved values that should probably be ignored. reserved1 seems to often be 128 and reserved2 is 0. */
-    drwav_uint16 reserved1;
-    float reserved2;
-
-    /* Number of beats. */
-    drwav_uint32 numBeats;
-
-    /* The time signature of the audio. */
-    drwav_uint16 meterDenominator;
-    drwav_uint16 meterNumerator;
-
-    /* Beats per minute of the track. Setting a value of 0 suggests that there is no tempo. */
-    float tempo;
-} drwav_acid;
-
-/*
-Cue Label or Note metadata
-
-These are 2 different types of metadata, but they have the exact same format. Labels tend to be the
-more common and represent a short name for a cue point. Notes might be used to represent a longer
-comment.
-*/
-typedef struct
-{
-    /* The ID of a cue point that this label or note corresponds to. */
-    drwav_uint32 cuePointId;
-
-    /* Size of the string not including any null terminator. */
-    drwav_uint32 stringLength;
-
-    /* The string. The *init_with_metadata functions null terminate this for convenience. */
-    char* pString;
-} drwav_list_label_or_note;
-
-/*
-BEXT metadata, also known as Broadcast Wave Format (BWF)
-
-This metadata adds some extra description to an audio file. You must check the version field to
-determine if the UMID or the loudness fields are valid.
-*/
-typedef struct
-{
-    /*
-    These top 3 fields, and the umid field are actually defined in the standard as a statically
-    sized buffers. In order to reduce the size of this struct (and therefore the union in the
-    metadata struct), we instead store these as pointers.
-    */
-    char* pDescription;                 /* Can be NULL or a null-terminated string, must be <= 256 characters. */
-    char* pOriginatorName;              /* Can be NULL or a null-terminated string, must be <= 32 characters. */
-    char* pOriginatorReference;         /* Can be NULL or a null-terminated string, must be <= 32 characters. */
-    char  pOriginationDate[10];         /* ASCII "yyyy:mm:dd". */
-    char  pOriginationTime[8];          /* ASCII "hh:mm:ss". */
-    drwav_uint64 timeReference;         /* First sample count since midnight. */
-    drwav_uint16 version;               /* Version of the BWF, check this to see if the fields below are valid. */
-
-    /*
-    Unrestricted ASCII characters containing a collection of strings terminated by CR/LF. Each
-    string shall contain a description of a coding process applied to the audio data.
-    */
-    char* pCodingHistory;
-    drwav_uint32 codingHistorySize;
-
-    /* Fields below this point are only valid if the version is 1 or above. */
-    drwav_uint8* pUMID;                  /* Exactly 64 bytes of SMPTE UMID */
-
-    /* Fields below this point are only valid if the version is 2 or above. */
-    drwav_uint16 loudnessValue;         /* Integrated Loudness Value of the file in LUFS (multiplied by 100). */
-    drwav_uint16 loudnessRange;         /* Loudness Range of the file in LU (multiplied by 100). */
-    drwav_uint16 maxTruePeakLevel;      /* Maximum True Peak Level of the file expressed as dBTP (multiplied by 100). */
-    drwav_uint16 maxMomentaryLoudness;  /* Highest value of the Momentary Loudness Level of the file in LUFS (multiplied by 100). */
-    drwav_uint16 maxShortTermLoudness;  /* Highest value of the Short-Term Loudness Level of the file in LUFS (multiplied by 100). */
-} drwav_bext;
-
-/*
-Info Text Metadata
-
-There a many different types of information text that can be saved in this format. This is where
-things like the album name, the artists, the year it was produced, etc are saved. See
-drwav_metadata_type for the full list of types that dr_wav supports.
-*/
-typedef struct
-{
-    /* Size of the string not including any null terminator. */
-    drwav_uint32 stringLength;
-
-    /* The string. The *init_with_metadata functions null terminate this for convenience. */
-    char* pString;
-} drwav_list_info_text;
-
-/*
-Labelled Cue Region Metadata
-
-The labelled cue region metadata is used to associate some region of audio with text. The region
-starts at a cue point, and extends for the given number of samples.
-*/
-typedef struct
-{
-    /* The ID of a cue point that this object corresponds to. */
-    drwav_uint32 cuePointId;
-
-    /* The number of samples from the cue point forwards that should be considered this region */
-    drwav_uint32 sampleLength;
-
-    /* Four characters used to say what the purpose of this region is. */
-    drwav_uint8 purposeId[4];
-
-    /* Unsure of the exact meanings of these. It appears to be acceptable to set them all to 0. */
-    drwav_uint16 country;
-    drwav_uint16 language;
-    drwav_uint16 dialect;
-    drwav_uint16 codePage;
-
-    /* Size of the string not including any null terminator. */
-    drwav_uint32 stringLength;
-
-    /* The string. The *init_with_metadata functions null terminate this for convenience. */
-    char* pString;
-} drwav_list_labelled_cue_region;
-
-/*
-Unknown Metadata
-
-This chunk just represents a type of chunk that dr_wav does not understand.
-
-Unknown metadata has a location attached to it. This is because wav files can have a LIST chunk
-that contains subchunks. These LIST chunks can be one of two types. An adtl list, or an INFO
-list. This enum is used to specify the location of a chunk that dr_wav currently doesn't support.
-*/
-typedef enum
-{
-    drwav_metadata_location_invalid,
-    drwav_metadata_location_top_level,
-    drwav_metadata_location_inside_info_list,
-    drwav_metadata_location_inside_adtl_list
-} drwav_metadata_location;
-
-typedef struct
-{
-    drwav_uint8 id[4];
-    drwav_metadata_location chunkLocation;
-    drwav_uint32 dataSizeInBytes;
-    drwav_uint8* pData;
-} drwav_unknown_metadata;
-
-/*
-Metadata is saved as a union of all the supported types.
-*/
-typedef struct
-{
-    /* Determines which item in the union is valid. */
-    drwav_metadata_type type;
-
-    union
-    {
-        drwav_cue cue;
-        drwav_smpl smpl;
-        drwav_acid acid;
-        drwav_inst inst;
-        drwav_bext bext;
-        drwav_list_label_or_note labelOrNote;   /* List label or list note. */
-        drwav_list_labelled_cue_region labelledCueRegion;
-        drwav_list_info_text infoText;          /* Any of the list info types. */
-        drwav_unknown_metadata unknown;
-    } data;
-} drwav_metadata;
-
-typedef struct
-{
-    /* A pointer to the function to call when more data is needed. */
-    drwav_read_proc onRead;
-
-    /* A pointer to the function to call when data needs to be written. Only used when the drwav object is opened in write mode. */
-    drwav_write_proc onWrite;
-
-    /* A pointer to the function to call when the wav file needs to be seeked. */
-    drwav_seek_proc onSeek;
-
-    /* The user data to pass to callbacks. */
-    void* pUserData;
-
-    /* Allocation callbacks. */
-    drwav_allocation_callbacks allocationCallbacks;
-
-
-    /* Whether or not the WAV file is formatted as a standard RIFF file or W64. */
-    drwav_container container;
-
-
-    /* Structure containing format information exactly as specified by the wav file. */
-    drwav_fmt fmt;
-
-    /* The sample rate. Will be set to something like 44100. */
-    drwav_uint32 sampleRate;
-
-    /* The number of channels. This will be set to 1 for monaural streams, 2 for stereo, etc. */
-    drwav_uint16 channels;
-
-    /* The bits per sample. Will be set to something like 16, 24, etc. */
-    drwav_uint16 bitsPerSample;
-
-    /* Equal to fmt.formatTag, or the value specified by fmt.subFormat if fmt.formatTag is equal to 65534 (WAVE_FORMAT_EXTENSIBLE). */
-    drwav_uint16 translatedFormatTag;
-
-    /* The total number of PCM frames making up the audio data. */
-    drwav_uint64 totalPCMFrameCount;
-
-
-    /* The size in bytes of the data chunk. */
-    drwav_uint64 dataChunkDataSize;
-
-    /* The position in the stream of the first data byte of the data chunk. This is used for seeking. */
-    drwav_uint64 dataChunkDataPos;
-
-    /* The number of bytes remaining in the data chunk. */
-    drwav_uint64 bytesRemaining;
-
-    /* The current read position in PCM frames. */
-    drwav_uint64 readCursorInPCMFrames;
-
-
-    /*
-    Only used in sequential write mode. Keeps track of the desired size of the "data" chunk at the point of initialization time. Always
-    set to 0 for non-sequential writes and when the drwav object is opened in read mode. Used for validation.
-    */
-    drwav_uint64 dataChunkDataSizeTargetWrite;
-
-    /* Keeps track of whether or not the wav writer was initialized in sequential mode. */
-    drwav_bool32 isSequentialWrite;
-
-
-    /* A bit-field of drwav_metadata_type values, only bits set in this variable are parsed and saved */
-    drwav_metadata_type allowedMetadataTypes;
-
-    /* A array of metadata. This is valid after the *init_with_metadata call returns. It will be valid until drwav_uninit() is called. You can take ownership of this data with drwav_take_ownership_of_metadata(). */
-    drwav_metadata* pMetadata;
-    drwav_uint32 metadataCount;
-
-
-    /* A hack to avoid a DRWAV_MALLOC() when opening a decoder with drwav_init_memory(). */
-    drwav__memory_stream memoryStream;
-    drwav__memory_stream_write memoryStreamWrite;
-
-
-    /* Microsoft ADPCM specific data. */
-    struct
-    {
-        drwav_uint32 bytesRemainingInBlock;
-        drwav_uint16 predictor[2];
-        drwav_int32  delta[2];
-        drwav_int32  cachedFrames[4];  /* Samples are stored in this cache during decoding. */
-        drwav_uint32 cachedFrameCount;
-        drwav_int32  prevFrames[2][2]; /* The previous 2 samples for each channel (2 channels at most). */
-    } msadpcm;
-
-    /* IMA ADPCM specific data. */
-    struct
-    {
-        drwav_uint32 bytesRemainingInBlock;
-        drwav_int32  predictor[2];
-        drwav_int32  stepIndex[2];
-        drwav_int32  cachedFrames[16]; /* Samples are stored in this cache during decoding. */
-        drwav_uint32 cachedFrameCount;
-    } ima;
-} drwav;
-
-
-/*
-Initializes a pre-allocated drwav object for reading.
-
-pWav                         [out]          A pointer to the drwav object being initialized.
-onRead                       [in]           The function to call when data needs to be read from the client.
-onSeek                       [in]           The function to call when the read position of the client data needs to move.
-onChunk                      [in, optional] The function to call when a chunk is enumerated at initialized time.
-pUserData, pReadSeekUserData [in, optional] A pointer to application defined data that will be passed to onRead and onSeek.
-pChunkUserData               [in, optional] A pointer to application defined data that will be passed to onChunk.
-flags                        [in, optional] A set of flags for controlling how things are loaded.
-
-Returns true if successful; false otherwise.
-
-Close the loader with drwav_uninit().
-
-This is the lowest level function for initializing a WAV file. You can also use drwav_init_file() and drwav_init_memory()
-to open the stream from a file or from a block of memory respectively.
-
-Possible values for flags:
-  DRWAV_SEQUENTIAL: Never perform a backwards seek while loading. This disables the chunk callback and will cause this function
-                    to return as soon as the data chunk is found. Any chunks after the data chunk will be ignored.
-
-drwav_init() is equivalent to "drwav_init_ex(pWav, onRead, onSeek, NULL, pUserData, NULL, 0);".
-
-The onChunk callback is not called for the WAVE or FMT chunks. The contents of the FMT chunk can be read from pWav->fmt
-after the function returns.
-
-See also: drwav_init_file(), drwav_init_memory(), drwav_uninit()
-*/
-DRWAV_API drwav_bool32 drwav_init(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_ex(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, drwav_chunk_proc onChunk, void* pReadSeekUserData, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_with_metadata(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks);
-
-/*
-Initializes a pre-allocated drwav object for writing.
-
-onWrite               [in]           The function to call when data needs to be written.
-onSeek                [in]           The function to call when the write position needs to move.
-pUserData             [in, optional] A pointer to application defined data that will be passed to onWrite and onSeek.
-metadata, numMetadata [in, optional] An array of metadata objects that should be written to the file. The array is not edited. You are responsible for this metadata memory and it must maintain valid until drwav_uninit() is called.
-
-Returns true if successful; false otherwise.
-
-Close the writer with drwav_uninit().
-
-This is the lowest level function for initializing a WAV file. You can also use drwav_init_file_write() and drwav_init_memory_write()
-to open the stream from a file or from a block of memory respectively.
-
-If the total sample count is known, you can use drwav_init_write_sequential(). This avoids the need for dr_wav to perform
-a post-processing step for storing the total sample count and the size of the data chunk which requires a backwards seek.
-
-See also: drwav_init_file_write(), drwav_init_memory_write(), drwav_uninit()
-*/
-DRWAV_API drwav_bool32 drwav_init_write(drwav* pWav, const drwav_data_format* pFormat, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_write_sequential(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_write_proc onWrite, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_write_sequential_pcm_frames(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalPCMFrameCount, drwav_write_proc onWrite, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_write_with_metadata(drwav* pWav, const drwav_data_format* pFormat, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks, drwav_metadata* pMetadata, drwav_uint32 metadataCount);
-
-/*
-Utility function to determine the target size of the entire data to be written (including all headers and chunks).
-
-Returns the target size in bytes.
-
-The metadata argument can be NULL meaning no metadata exists.
-
-Useful if the application needs to know the size to allocate.
-
-Only writing to the RIFF chunk and one data chunk is currently supported.
-
-See also: drwav_init_write(), drwav_init_file_write(), drwav_init_memory_write()
-*/
-DRWAV_API drwav_uint64 drwav_target_write_size_bytes(const drwav_data_format* pFormat, drwav_uint64 totalFrameCount, drwav_metadata* pMetadata, drwav_uint32 metadataCount);
-
-/*
-Take ownership of the metadata objects that were allocated via one of the init_with_metadata() function calls. The init_with_metdata functions perform a single heap allocation for this metadata.
-
-Useful if you want the data to persist beyond the lifetime of the drwav object.
-
-You must free the data returned from this function using drwav_free().
-*/
-DRWAV_API drwav_metadata* drwav_take_ownership_of_metadata(drwav* pWav);
-
-/*
-Uninitializes the given drwav object.
-
-Use this only for objects initialized with drwav_init*() functions (drwav_init(), drwav_init_ex(), drwav_init_write(), drwav_init_write_sequential()).
-*/
-DRWAV_API drwav_result drwav_uninit(drwav* pWav);
-
-
-/*
-Reads raw audio data.
-
-This is the lowest level function for reading audio data. It simply reads the given number of
-bytes of the raw internal sample data.
-
-Consider using drwav_read_pcm_frames_s16(), drwav_read_pcm_frames_s32() or drwav_read_pcm_frames_f32() for
-reading sample data in a consistent format.
-
-pBufferOut can be NULL in which case a seek will be performed.
-
-Returns the number of bytes actually read.
-*/
-DRWAV_API size_t drwav_read_raw(drwav* pWav, size_t bytesToRead, void* pBufferOut);
-
-/*
-Reads up to the specified number of PCM frames from the WAV file.
-
-The output data will be in the file's internal format, converted to native-endian byte order. Use
-drwav_read_pcm_frames_s16/f32/s32() to read data in a specific format.
-
-If the return value is less than <framesToRead> it means the end of the file has been reached or
-you have requested more PCM frames than can possibly fit in the output buffer.
-
-This function will only work when sample data is of a fixed size and uncompressed. If you are
-using a compressed format consider using drwav_read_raw() or drwav_read_pcm_frames_s16/s32/f32().
-
-pBufferOut can be NULL in which case a seek will be performed.
-*/
-DRWAV_API drwav_uint64 drwav_read_pcm_frames(drwav* pWav, drwav_uint64 framesToRead, void* pBufferOut);
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_le(drwav* pWav, drwav_uint64 framesToRead, void* pBufferOut);
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_be(drwav* pWav, drwav_uint64 framesToRead, void* pBufferOut);
-
-/*
-Seeks to the given PCM frame.
-
-Returns true if successful; false otherwise.
-*/
-DRWAV_API drwav_bool32 drwav_seek_to_pcm_frame(drwav* pWav, drwav_uint64 targetFrameIndex);
-
-/*
-Retrieves the current read position in pcm frames.
-*/
-DRWAV_API drwav_result drwav_get_cursor_in_pcm_frames(drwav* pWav, drwav_uint64* pCursor);
-
-/*
-Retrieves the length of the file.
-*/
-DRWAV_API drwav_result drwav_get_length_in_pcm_frames(drwav* pWav, drwav_uint64* pLength);
-
-
-/*
-Writes raw audio data.
-
-Returns the number of bytes actually written. If this differs from bytesToWrite, it indicates an error.
-*/
-DRWAV_API size_t drwav_write_raw(drwav* pWav, size_t bytesToWrite, const void* pData);
-
-/*
-Writes PCM frames.
-
-Returns the number of PCM frames written.
-
-Input samples need to be in native-endian byte order. On big-endian architectures the input data will be converted to
-little-endian. Use drwav_write_raw() to write raw audio data without performing any conversion.
-*/
-DRWAV_API drwav_uint64 drwav_write_pcm_frames(drwav* pWav, drwav_uint64 framesToWrite, const void* pData);
-DRWAV_API drwav_uint64 drwav_write_pcm_frames_le(drwav* pWav, drwav_uint64 framesToWrite, const void* pData);
-DRWAV_API drwav_uint64 drwav_write_pcm_frames_be(drwav* pWav, drwav_uint64 framesToWrite, const void* pData);
-
-/* Conversion Utilities */
-#ifndef DR_WAV_NO_CONVERSION_API
-
-/*
-Reads a chunk of audio data and converts it to signed 16-bit PCM samples.
-
-pBufferOut can be NULL in which case a seek will be performed.
-
-Returns the number of PCM frames actually read.
-
-If the return value is less than <framesToRead> it means the end of the file has been reached.
-*/
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s16(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut);
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s16le(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut);
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s16be(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut);
-
-/* Low-level function for converting unsigned 8-bit PCM samples to signed 16-bit PCM samples. */
-DRWAV_API void drwav_u8_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-/* Low-level function for converting signed 24-bit PCM samples to signed 16-bit PCM samples. */
-DRWAV_API void drwav_s24_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-/* Low-level function for converting signed 32-bit PCM samples to signed 16-bit PCM samples. */
-DRWAV_API void drwav_s32_to_s16(drwav_int16* pOut, const drwav_int32* pIn, size_t sampleCount);
-
-/* Low-level function for converting IEEE 32-bit floating point samples to signed 16-bit PCM samples. */
-DRWAV_API void drwav_f32_to_s16(drwav_int16* pOut, const float* pIn, size_t sampleCount);
-
-/* Low-level function for converting IEEE 64-bit floating point samples to signed 16-bit PCM samples. */
-DRWAV_API void drwav_f64_to_s16(drwav_int16* pOut, const double* pIn, size_t sampleCount);
-
-/* Low-level function for converting A-law samples to signed 16-bit PCM samples. */
-DRWAV_API void drwav_alaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-/* Low-level function for converting u-law samples to signed 16-bit PCM samples. */
-DRWAV_API void drwav_mulaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-
-/*
-Reads a chunk of audio data and converts it to IEEE 32-bit floating point samples.
-
-pBufferOut can be NULL in which case a seek will be performed.
-
-Returns the number of PCM frames actually read.
-
-If the return value is less than <framesToRead> it means the end of the file has been reached.
-*/
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_f32(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut);
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_f32le(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut);
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_f32be(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut);
-
-/* Low-level function for converting unsigned 8-bit PCM samples to IEEE 32-bit floating point samples. */
-DRWAV_API void drwav_u8_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-/* Low-level function for converting signed 16-bit PCM samples to IEEE 32-bit floating point samples. */
-DRWAV_API void drwav_s16_to_f32(float* pOut, const drwav_int16* pIn, size_t sampleCount);
-
-/* Low-level function for converting signed 24-bit PCM samples to IEEE 32-bit floating point samples. */
-DRWAV_API void drwav_s24_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-/* Low-level function for converting signed 32-bit PCM samples to IEEE 32-bit floating point samples. */
-DRWAV_API void drwav_s32_to_f32(float* pOut, const drwav_int32* pIn, size_t sampleCount);
-
-/* Low-level function for converting IEEE 64-bit floating point samples to IEEE 32-bit floating point samples. */
-DRWAV_API void drwav_f64_to_f32(float* pOut, const double* pIn, size_t sampleCount);
-
-/* Low-level function for converting A-law samples to IEEE 32-bit floating point samples. */
-DRWAV_API void drwav_alaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-/* Low-level function for converting u-law samples to IEEE 32-bit floating point samples. */
-DRWAV_API void drwav_mulaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-
-/*
-Reads a chunk of audio data and converts it to signed 32-bit PCM samples.
-
-pBufferOut can be NULL in which case a seek will be performed.
-
-Returns the number of PCM frames actually read.
-
-If the return value is less than <framesToRead> it means the end of the file has been reached.
-*/
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s32(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut);
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s32le(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut);
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s32be(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut);
-
-/* Low-level function for converting unsigned 8-bit PCM samples to signed 32-bit PCM samples. */
-DRWAV_API void drwav_u8_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-/* Low-level function for converting signed 16-bit PCM samples to signed 32-bit PCM samples. */
-DRWAV_API void drwav_s16_to_s32(drwav_int32* pOut, const drwav_int16* pIn, size_t sampleCount);
-
-/* Low-level function for converting signed 24-bit PCM samples to signed 32-bit PCM samples. */
-DRWAV_API void drwav_s24_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-/* Low-level function for converting IEEE 32-bit floating point samples to signed 32-bit PCM samples. */
-DRWAV_API void drwav_f32_to_s32(drwav_int32* pOut, const float* pIn, size_t sampleCount);
-
-/* Low-level function for converting IEEE 64-bit floating point samples to signed 32-bit PCM samples. */
-DRWAV_API void drwav_f64_to_s32(drwav_int32* pOut, const double* pIn, size_t sampleCount);
-
-/* Low-level function for converting A-law samples to signed 32-bit PCM samples. */
-DRWAV_API void drwav_alaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-/* Low-level function for converting u-law samples to signed 32-bit PCM samples. */
-DRWAV_API void drwav_mulaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount);
-
-#endif  /* DR_WAV_NO_CONVERSION_API */
-
-
-/* High-Level Convenience Helpers */
-
-#ifndef DR_WAV_NO_STDIO
-/*
-Helper for initializing a wave file for reading using stdio.
-
-This holds the internal FILE object until drwav_uninit() is called. Keep this in mind if you're caching drwav
-objects because the operating system may restrict the number of file handles an application can have open at
-any given time.
-*/
-DRWAV_API drwav_bool32 drwav_init_file(drwav* pWav, const char* filename, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_ex(drwav* pWav, const char* filename, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_w(drwav* pWav, const wchar_t* filename, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_ex_w(drwav* pWav, const wchar_t* filename, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_with_metadata(drwav* pWav, const char* filename, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_with_metadata_w(drwav* pWav, const wchar_t* filename, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks);
-
-
-/*
-Helper for initializing a wave file for writing using stdio.
-
-This holds the internal FILE object until drwav_uninit() is called. Keep this in mind if you're caching drwav
-objects because the operating system may restrict the number of file handles an application can have open at
-any given time.
-*/
-DRWAV_API drwav_bool32 drwav_init_file_write(drwav* pWav, const char* filename, const drwav_data_format* pFormat, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_write_sequential(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_write_sequential_pcm_frames(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalPCMFrameCount, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_write_w(drwav* pWav, const wchar_t* filename, const drwav_data_format* pFormat, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_write_sequential_w(drwav* pWav, const wchar_t* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_file_write_sequential_pcm_frames_w(drwav* pWav, const wchar_t* filename, const drwav_data_format* pFormat, drwav_uint64 totalPCMFrameCount, const drwav_allocation_callbacks* pAllocationCallbacks);
-#endif  /* DR_WAV_NO_STDIO */
-
-/*
-Helper for initializing a loader from a pre-allocated memory buffer.
-
-This does not create a copy of the data. It is up to the application to ensure the buffer remains valid for
-the lifetime of the drwav object.
-
-The buffer should contain the contents of the entire wave file, not just the sample data.
-*/
-DRWAV_API drwav_bool32 drwav_init_memory(drwav* pWav, const void* data, size_t dataSize, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_memory_ex(drwav* pWav, const void* data, size_t dataSize, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_memory_with_metadata(drwav* pWav, const void* data, size_t dataSize, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks);
-
-/*
-Helper for initializing a writer which outputs data to a memory buffer.
-
-dr_wav will manage the memory allocations, however it is up to the caller to free the data with drwav_free().
-
-The buffer will remain allocated even after drwav_uninit() is called. The buffer should not be considered valid
-until after drwav_uninit() has been called.
-*/
-DRWAV_API drwav_bool32 drwav_init_memory_write(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_memory_write_sequential(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_bool32 drwav_init_memory_write_sequential_pcm_frames(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalPCMFrameCount, const drwav_allocation_callbacks* pAllocationCallbacks);
-
-
-#ifndef DR_WAV_NO_CONVERSION_API
-/*
-Opens and reads an entire wav file in a single operation.
-
-The return value is a heap-allocated buffer containing the audio data. Use drwav_free() to free the buffer.
-*/
-DRWAV_API drwav_int16* drwav_open_and_read_pcm_frames_s16(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API float* drwav_open_and_read_pcm_frames_f32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_int32* drwav_open_and_read_pcm_frames_s32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-#ifndef DR_WAV_NO_STDIO
-/*
-Opens and decodes an entire wav file in a single operation.
-
-The return value is a heap-allocated buffer containing the audio data. Use drwav_free() to free the buffer.
-*/
-DRWAV_API drwav_int16* drwav_open_file_and_read_pcm_frames_s16(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API float* drwav_open_file_and_read_pcm_frames_f32(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_int32* drwav_open_file_and_read_pcm_frames_s32(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_int16* drwav_open_file_and_read_pcm_frames_s16_w(const wchar_t* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API float* drwav_open_file_and_read_pcm_frames_f32_w(const wchar_t* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_int32* drwav_open_file_and_read_pcm_frames_s32_w(const wchar_t* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-#endif
-/*
-Opens and decodes an entire wav file from a block of memory in a single operation.
-
-The return value is a heap-allocated buffer containing the audio data. Use drwav_free() to free the buffer.
-*/
-DRWAV_API drwav_int16* drwav_open_memory_and_read_pcm_frames_s16(const void* data, size_t dataSize, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API float* drwav_open_memory_and_read_pcm_frames_f32(const void* data, size_t dataSize, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-DRWAV_API drwav_int32* drwav_open_memory_and_read_pcm_frames_s32(const void* data, size_t dataSize, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks);
-#endif
-
-/* Frees data that was allocated internally by dr_wav. */
-DRWAV_API void drwav_free(void* p, const drwav_allocation_callbacks* pAllocationCallbacks);
-
-/* Converts bytes from a wav stream to a sized type of native endian. */
-DRWAV_API drwav_uint16 drwav_bytes_to_u16(const drwav_uint8* data);
-DRWAV_API drwav_int16 drwav_bytes_to_s16(const drwav_uint8* data);
-DRWAV_API drwav_uint32 drwav_bytes_to_u32(const drwav_uint8* data);
-DRWAV_API drwav_int32 drwav_bytes_to_s32(const drwav_uint8* data);
-DRWAV_API drwav_uint64 drwav_bytes_to_u64(const drwav_uint8* data);
-DRWAV_API drwav_int64 drwav_bytes_to_s64(const drwav_uint8* data);
-DRWAV_API float drwav_bytes_to_f32(const drwav_uint8* data);
-
-/* Compares a GUID for the purpose of checking the type of a Wave64 chunk. */
-DRWAV_API drwav_bool32 drwav_guid_equal(const drwav_uint8 a[16], const drwav_uint8 b[16]);
-
-/* Compares a four-character-code for the purpose of checking the type of a RIFF chunk. */
-DRWAV_API drwav_bool32 drwav_fourcc_equal(const drwav_uint8* a, const char* b);
-
-#ifdef __cplusplus
-}
-#endif
-#endif  /* dr_wav_h */
-
-
-/************************************************************************************************************************************************************
- ************************************************************************************************************************************************************
-
- IMPLEMENTATION
-
- ************************************************************************************************************************************************************
- ************************************************************************************************************************************************************/
-#if defined(DR_WAV_IMPLEMENTATION) || defined(DRWAV_IMPLEMENTATION)
-#ifndef dr_wav_c
-#define dr_wav_c
-
-#ifdef __MRC__
-/* MrC currently doesn't compile dr_wav correctly with any optimizations enabled. */
-#pragma options opt off
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h> /* For INT_MAX */
-
-#ifndef DR_WAV_NO_STDIO
-#include <stdio.h>
-#ifndef DR_WAV_NO_WCHAR
-#include <wchar.h>
-#endif
-#endif
-
-/* Standard library stuff. */
-#ifndef DRWAV_ASSERT
-#include <assert.h>
-#define DRWAV_ASSERT(expression)           assert(expression)
-#endif
-#ifndef DRWAV_MALLOC
-#define DRWAV_MALLOC(sz)                   malloc((sz))
-#endif
-#ifndef DRWAV_REALLOC
-#define DRWAV_REALLOC(p, sz)               realloc((p), (sz))
-#endif
-#ifndef DRWAV_FREE
-#define DRWAV_FREE(p)                      free((p))
-#endif
-#ifndef DRWAV_COPY_MEMORY
-#define DRWAV_COPY_MEMORY(dst, src, sz)    memcpy((dst), (src), (sz))
-#endif
-#ifndef DRWAV_ZERO_MEMORY
-#define DRWAV_ZERO_MEMORY(p, sz)           memset((p), 0, (sz))
-#endif
-#ifndef DRWAV_ZERO_OBJECT
-#define DRWAV_ZERO_OBJECT(p)               DRWAV_ZERO_MEMORY((p), sizeof(*p))
-#endif
-
-#define drwav_countof(x)                   (sizeof(x) / sizeof(x[0]))
-#define drwav_align(x, a)                  ((((x) + (a) - 1) / (a)) * (a))
-#define drwav_min(a, b)                    (((a) < (b)) ? (a) : (b))
-#define drwav_max(a, b)                    (((a) > (b)) ? (a) : (b))
-#define drwav_clamp(x, lo, hi)             (drwav_max((lo), drwav_min((hi), (x))))
-#define drwav_offset_ptr(p, offset)        (((drwav_uint8*)(p)) + (offset))
-
-#define DRWAV_MAX_SIMD_VECTOR_SIZE         64  /* 64 for AVX-512 in the future. */
-
-/* CPU architecture. */
-#if defined(__x86_64__) || defined(_M_X64)
-    #define DRWAV_X64
-#elif defined(__i386) || defined(_M_IX86)
-    #define DRWAV_X86
-#elif defined(__arm__) || defined(_M_ARM)
-    #define DRWAV_ARM
-#endif
-
-#ifdef _MSC_VER
-    #define DRWAV_INLINE __forceinline
-#elif defined(__GNUC__)
-    /*
-    I've had a bug report where GCC is emitting warnings about functions possibly not being inlineable. This warning happens when
-    the __attribute__((always_inline)) attribute is defined without an "inline" statement. I think therefore there must be some
-    case where "__inline__" is not always defined, thus the compiler emitting these warnings. When using -std=c89 or -ansi on the
-    command line, we cannot use the "inline" keyword and instead need to use "__inline__". In an attempt to work around this issue
-    I am using "__inline__" only when we're compiling in strict ANSI mode.
-    */
-    #if defined(__STRICT_ANSI__)
-        #define DRWAV_GNUC_INLINE_HINT __inline__
-    #else
-        #define DRWAV_GNUC_INLINE_HINT inline
-    #endif
-
-    #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)) || defined(__clang__)
-        #define DRWAV_INLINE DRWAV_GNUC_INLINE_HINT __attribute__((always_inline))
-    #else
-        #define DRWAV_INLINE DRWAV_GNUC_INLINE_HINT
-    #endif
-#elif defined(__WATCOMC__)
-    #define DRWAV_INLINE __inline
-#else
-    #define DRWAV_INLINE
-#endif
-
-#if defined(SIZE_MAX)
-    #define DRWAV_SIZE_MAX  SIZE_MAX
-#else
-    #if defined(_WIN64) || defined(_LP64) || defined(__LP64__)
-        #define DRWAV_SIZE_MAX  ((drwav_uint64)0xFFFFFFFFFFFFFFFF)
-    #else
-        #define DRWAV_SIZE_MAX  0xFFFFFFFF
-    #endif
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-    #define DRWAV_HAS_BYTESWAP16_INTRINSIC
-    #define DRWAV_HAS_BYTESWAP32_INTRINSIC
-    #define DRWAV_HAS_BYTESWAP64_INTRINSIC
-#elif defined(__clang__)
-    #if defined(__has_builtin)
-        #if __has_builtin(__builtin_bswap16)
-            #define DRWAV_HAS_BYTESWAP16_INTRINSIC
-        #endif
-        #if __has_builtin(__builtin_bswap32)
-            #define DRWAV_HAS_BYTESWAP32_INTRINSIC
-        #endif
-        #if __has_builtin(__builtin_bswap64)
-            #define DRWAV_HAS_BYTESWAP64_INTRINSIC
-        #endif
-    #endif
-#elif defined(__GNUC__)
-    #if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
-        #define DRWAV_HAS_BYTESWAP32_INTRINSIC
-        #define DRWAV_HAS_BYTESWAP64_INTRINSIC
-    #endif
-    #if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
-        #define DRWAV_HAS_BYTESWAP16_INTRINSIC
-    #endif
-#endif
-
-DRWAV_API void drwav_version(drwav_uint32* pMajor, drwav_uint32* pMinor, drwav_uint32* pRevision)
-{
-    if (pMajor) {
-        *pMajor = DRWAV_VERSION_MAJOR;
-    }
-
-    if (pMinor) {
-        *pMinor = DRWAV_VERSION_MINOR;
-    }
-
-    if (pRevision) {
-        *pRevision = DRWAV_VERSION_REVISION;
-    }
-}
-
-DRWAV_API const char* drwav_version_string(void)
-{
-    return DRWAV_VERSION_STRING;
-}
-
-/*
-These limits are used for basic validation when initializing the decoder. If you exceed these limits, first of all: what on Earth are
-you doing?! (Let me know, I'd be curious!) Second, you can adjust these by #define-ing them before the dr_wav implementation.
-*/
-#ifndef DRWAV_MAX_SAMPLE_RATE
-#define DRWAV_MAX_SAMPLE_RATE       384000
-#endif
-#ifndef DRWAV_MAX_CHANNELS
-#define DRWAV_MAX_CHANNELS          256
-#endif
-#ifndef DRWAV_MAX_BITS_PER_SAMPLE
-#define DRWAV_MAX_BITS_PER_SAMPLE   64
-#endif
-
-static const drwav_uint8 drwavGUID_W64_RIFF[16] = {0x72,0x69,0x66,0x66, 0x2E,0x91, 0xCF,0x11, 0xA5,0xD6, 0x28,0xDB,0x04,0xC1,0x00,0x00};    /* 66666972-912E-11CF-A5D6-28DB04C10000 */
-static const drwav_uint8 drwavGUID_W64_WAVE[16] = {0x77,0x61,0x76,0x65, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A};    /* 65766177-ACF3-11D3-8CD1-00C04F8EDB8A */
-/*static const drwav_uint8 drwavGUID_W64_JUNK[16] = {0x6A,0x75,0x6E,0x6B, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A};*/    /* 6B6E756A-ACF3-11D3-8CD1-00C04F8EDB8A */
-static const drwav_uint8 drwavGUID_W64_FMT [16] = {0x66,0x6D,0x74,0x20, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A};    /* 20746D66-ACF3-11D3-8CD1-00C04F8EDB8A */
-static const drwav_uint8 drwavGUID_W64_FACT[16] = {0x66,0x61,0x63,0x74, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A};    /* 74636166-ACF3-11D3-8CD1-00C04F8EDB8A */
-static const drwav_uint8 drwavGUID_W64_DATA[16] = {0x64,0x61,0x74,0x61, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A};    /* 61746164-ACF3-11D3-8CD1-00C04F8EDB8A */
-/*static const drwav_uint8 drwavGUID_W64_SMPL[16] = {0x73,0x6D,0x70,0x6C, 0xF3,0xAC, 0xD3,0x11, 0x8C,0xD1, 0x00,0xC0,0x4F,0x8E,0xDB,0x8A};*/    /* 6C706D73-ACF3-11D3-8CD1-00C04F8EDB8A */
-
-
-static DRWAV_INLINE int drwav__is_little_endian(void)
-{
-#if defined(DRWAV_X86) || defined(DRWAV_X64)
-    return DRWAV_TRUE;
-#elif defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && __BYTE_ORDER == __LITTLE_ENDIAN
-    return DRWAV_TRUE;
-#else
-    int n = 1;
-    return (*(char*)&n) == 1;
-#endif
-}
-
-
-static DRWAV_INLINE void drwav_bytes_to_guid(const drwav_uint8* data, drwav_uint8* guid)
-{
-    int i;
-    for (i = 0; i < 16; ++i) {
-        guid[i] = data[i];
-    }
-}
-
-
-static DRWAV_INLINE drwav_uint16 drwav__bswap16(drwav_uint16 n)
-{
-#ifdef DRWAV_HAS_BYTESWAP16_INTRINSIC
-    #if defined(_MSC_VER)
-        return _byteswap_ushort(n);
-    #elif defined(__GNUC__) || defined(__clang__)
-        return __builtin_bswap16(n);
-    #else
-        #error "This compiler does not support the byte swap intrinsic."
-    #endif
-#else
-    return ((n & 0xFF00) >> 8) |
-           ((n & 0x00FF) << 8);
-#endif
-}
-
-static DRWAV_INLINE drwav_uint32 drwav__bswap32(drwav_uint32 n)
-{
-#ifdef DRWAV_HAS_BYTESWAP32_INTRINSIC
-    #if defined(_MSC_VER)
-        return _byteswap_ulong(n);
-    #elif defined(__GNUC__) || defined(__clang__)
-        #if defined(DRWAV_ARM) && (defined(__ARM_ARCH) && __ARM_ARCH >= 6) && !defined(DRWAV_64BIT)   /* <-- 64-bit inline assembly has not been tested, so disabling for now. */
-            /* Inline assembly optimized implementation for ARM. In my testing, GCC does not generate optimized code with __builtin_bswap32(). */
-            drwav_uint32 r;
-            __asm__ __volatile__ (
-            #if defined(DRWAV_64BIT)
-                "rev %w[out], %w[in]" : [out]"=r"(r) : [in]"r"(n)   /* <-- This is untested. If someone in the community could test this, that would be appreciated! */
-            #else
-                "rev %[out], %[in]" : [out]"=r"(r) : [in]"r"(n)
-            #endif
-            );
-            return r;
-        #else
-            return __builtin_bswap32(n);
-        #endif
-    #else
-        #error "This compiler does not support the byte swap intrinsic."
-    #endif
-#else
-    return ((n & 0xFF000000) >> 24) |
-           ((n & 0x00FF0000) >>  8) |
-           ((n & 0x0000FF00) <<  8) |
-           ((n & 0x000000FF) << 24);
-#endif
-}
-
-static DRWAV_INLINE drwav_uint64 drwav__bswap64(drwav_uint64 n)
-{
-#ifdef DRWAV_HAS_BYTESWAP64_INTRINSIC
-    #if defined(_MSC_VER)
-        return _byteswap_uint64(n);
-    #elif defined(__GNUC__) || defined(__clang__)
-        return __builtin_bswap64(n);
-    #else
-        #error "This compiler does not support the byte swap intrinsic."
-    #endif
-#else
-    /* Weird "<< 32" bitshift is required for C89 because it doesn't support 64-bit constants. Should be optimized out by a good compiler. */
-    return ((n & ((drwav_uint64)0xFF000000 << 32)) >> 56) |
-           ((n & ((drwav_uint64)0x00FF0000 << 32)) >> 40) |
-           ((n & ((drwav_uint64)0x0000FF00 << 32)) >> 24) |
-           ((n & ((drwav_uint64)0x000000FF << 32)) >>  8) |
-           ((n & ((drwav_uint64)0xFF000000      )) <<  8) |
-           ((n & ((drwav_uint64)0x00FF0000      )) << 24) |
-           ((n & ((drwav_uint64)0x0000FF00      )) << 40) |
-           ((n & ((drwav_uint64)0x000000FF      )) << 56);
-#endif
-}
-
-
-static DRWAV_INLINE drwav_int16 drwav__bswap_s16(drwav_int16 n)
-{
-    return (drwav_int16)drwav__bswap16((drwav_uint16)n);
-}
-
-static DRWAV_INLINE void drwav__bswap_samples_s16(drwav_int16* pSamples, drwav_uint64 sampleCount)
-{
-    drwav_uint64 iSample;
-    for (iSample = 0; iSample < sampleCount; iSample += 1) {
-        pSamples[iSample] = drwav__bswap_s16(pSamples[iSample]);
-    }
-}
-
-
-static DRWAV_INLINE void drwav__bswap_s24(drwav_uint8* p)
-{
-    drwav_uint8 t;
-    t = p[0];
-    p[0] = p[2];
-    p[2] = t;
-}
-
-static DRWAV_INLINE void drwav__bswap_samples_s24(drwav_uint8* pSamples, drwav_uint64 sampleCount)
-{
-    drwav_uint64 iSample;
-    for (iSample = 0; iSample < sampleCount; iSample += 1) {
-        drwav_uint8* pSample = pSamples + (iSample*3);
-        drwav__bswap_s24(pSample);
-    }
-}
-
-
-static DRWAV_INLINE drwav_int32 drwav__bswap_s32(drwav_int32 n)
-{
-    return (drwav_int32)drwav__bswap32((drwav_uint32)n);
-}
-
-static DRWAV_INLINE void drwav__bswap_samples_s32(drwav_int32* pSamples, drwav_uint64 sampleCount)
-{
-    drwav_uint64 iSample;
-    for (iSample = 0; iSample < sampleCount; iSample += 1) {
-        pSamples[iSample] = drwav__bswap_s32(pSamples[iSample]);
-    }
-}
-
-
-static DRWAV_INLINE float drwav__bswap_f32(float n)
-{
-    union {
-        drwav_uint32 i;
-        float f;
-    } x;
-    x.f = n;
-    x.i = drwav__bswap32(x.i);
-
-    return x.f;
-}
-
-static DRWAV_INLINE void drwav__bswap_samples_f32(float* pSamples, drwav_uint64 sampleCount)
-{
-    drwav_uint64 iSample;
-    for (iSample = 0; iSample < sampleCount; iSample += 1) {
-        pSamples[iSample] = drwav__bswap_f32(pSamples[iSample]);
-    }
-}
-
-
-static DRWAV_INLINE double drwav__bswap_f64(double n)
-{
-    union {
-        drwav_uint64 i;
-        double f;
-    } x;
-    x.f = n;
-    x.i = drwav__bswap64(x.i);
-
-    return x.f;
-}
-
-static DRWAV_INLINE void drwav__bswap_samples_f64(double* pSamples, drwav_uint64 sampleCount)
-{
-    drwav_uint64 iSample;
-    for (iSample = 0; iSample < sampleCount; iSample += 1) {
-        pSamples[iSample] = drwav__bswap_f64(pSamples[iSample]);
-    }
-}
-
-
-static DRWAV_INLINE void drwav__bswap_samples_pcm(void* pSamples, drwav_uint64 sampleCount, drwav_uint32 bytesPerSample)
-{
-    /* Assumes integer PCM. Floating point PCM is done in drwav__bswap_samples_ieee(). */
-    switch (bytesPerSample)
-    {
-        case 1: /* u8 */
-        {
-            /* no-op. */
-        } break;
-        case 2: /* s16, s12 (loosely packed) */
-        {
-            drwav__bswap_samples_s16((drwav_int16*)pSamples, sampleCount);
-        } break;
-        case 3: /* s24 */
-        {
-            drwav__bswap_samples_s24((drwav_uint8*)pSamples, sampleCount);
-        } break;
-        case 4: /* s32 */
-        {
-            drwav__bswap_samples_s32((drwav_int32*)pSamples, sampleCount);
-        } break;
-        default:
-        {
-            /* Unsupported format. */
-            DRWAV_ASSERT(DRWAV_FALSE);
-        } break;
-    }
-}
-
-static DRWAV_INLINE void drwav__bswap_samples_ieee(void* pSamples, drwav_uint64 sampleCount, drwav_uint32 bytesPerSample)
-{
-    switch (bytesPerSample)
-    {
-    #if 0   /* Contributions welcome for f16 support. */
-        case 2: /* f16 */
-        {
-            drwav__bswap_samples_f16((drwav_float16*)pSamples, sampleCount);
-        } break;
-    #endif
-        case 4: /* f32 */
-        {
-            drwav__bswap_samples_f32((float*)pSamples, sampleCount);
-        } break;
-        case 8: /* f64 */
-        {
-            drwav__bswap_samples_f64((double*)pSamples, sampleCount);
-        } break;
-        default:
-        {
-            /* Unsupported format. */
-            DRWAV_ASSERT(DRWAV_FALSE);
-        } break;
-    }
-}
-
-static DRWAV_INLINE void drwav__bswap_samples(void* pSamples, drwav_uint64 sampleCount, drwav_uint32 bytesPerSample, drwav_uint16 format)
-{
-    switch (format)
-    {
-        case DR_WAVE_FORMAT_PCM:
-        {
-            drwav__bswap_samples_pcm(pSamples, sampleCount, bytesPerSample);
-        } break;
-
-        case DR_WAVE_FORMAT_IEEE_FLOAT:
-        {
-            drwav__bswap_samples_ieee(pSamples, sampleCount, bytesPerSample);
-        } break;
-
-        case DR_WAVE_FORMAT_ALAW:
-        case DR_WAVE_FORMAT_MULAW:
-        {
-            drwav__bswap_samples_s16((drwav_int16*)pSamples, sampleCount);
-        } break;
-
-        case DR_WAVE_FORMAT_ADPCM:
-        case DR_WAVE_FORMAT_DVI_ADPCM:
-        default:
-        {
-            /* Unsupported format. */
-            DRWAV_ASSERT(DRWAV_FALSE);
-        } break;
-    }
-}
-
-
-DRWAV_PRIVATE void* drwav__malloc_default(size_t sz, void* pUserData)
-{
-    (void)pUserData;
-    return DRWAV_MALLOC(sz);
-}
-
-DRWAV_PRIVATE void* drwav__realloc_default(void* p, size_t sz, void* pUserData)
-{
-    (void)pUserData;
-    return DRWAV_REALLOC(p, sz);
-}
-
-DRWAV_PRIVATE void drwav__free_default(void* p, void* pUserData)
-{
-    (void)pUserData;
-    DRWAV_FREE(p);
-}
-
-
-DRWAV_PRIVATE void* drwav__malloc_from_callbacks(size_t sz, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pAllocationCallbacks == NULL) {
-        return NULL;
-    }
-
-    if (pAllocationCallbacks->onMalloc != NULL) {
-        return pAllocationCallbacks->onMalloc(sz, pAllocationCallbacks->pUserData);
-    }
-
-    /* Try using realloc(). */
-    if (pAllocationCallbacks->onRealloc != NULL) {
-        return pAllocationCallbacks->onRealloc(NULL, sz, pAllocationCallbacks->pUserData);
-    }
-
-    return NULL;
-}
-
-DRWAV_PRIVATE void* drwav__realloc_from_callbacks(void* p, size_t szNew, size_t szOld, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pAllocationCallbacks == NULL) {
-        return NULL;
-    }
-
-    if (pAllocationCallbacks->onRealloc != NULL) {
-        return pAllocationCallbacks->onRealloc(p, szNew, pAllocationCallbacks->pUserData);
-    }
-
-    /* Try emulating realloc() in terms of malloc()/free(). */
-    if (pAllocationCallbacks->onMalloc != NULL && pAllocationCallbacks->onFree != NULL) {
-        void* p2;
-
-        p2 = pAllocationCallbacks->onMalloc(szNew, pAllocationCallbacks->pUserData);
-        if (p2 == NULL) {
-            return NULL;
-        }
-
-        if (p != NULL) {
-            DRWAV_COPY_MEMORY(p2, p, szOld);
-            pAllocationCallbacks->onFree(p, pAllocationCallbacks->pUserData);
-        }
-
-        return p2;
-    }
-
-    return NULL;
-}
-
-DRWAV_PRIVATE void drwav__free_from_callbacks(void* p, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (p == NULL || pAllocationCallbacks == NULL) {
-        return;
-    }
-
-    if (pAllocationCallbacks->onFree != NULL) {
-        pAllocationCallbacks->onFree(p, pAllocationCallbacks->pUserData);
-    }
-}
-
-
-DRWAV_PRIVATE drwav_allocation_callbacks drwav_copy_allocation_callbacks_or_defaults(const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pAllocationCallbacks != NULL) {
-        /* Copy. */
-        return *pAllocationCallbacks;
-    } else {
-        /* Defaults. */
-        drwav_allocation_callbacks allocationCallbacks;
-        allocationCallbacks.pUserData = NULL;
-        allocationCallbacks.onMalloc  = drwav__malloc_default;
-        allocationCallbacks.onRealloc = drwav__realloc_default;
-        allocationCallbacks.onFree    = drwav__free_default;
-        return allocationCallbacks;
-    }
-}
-
-
-static DRWAV_INLINE drwav_bool32 drwav__is_compressed_format_tag(drwav_uint16 formatTag)
-{
-    return
-        formatTag == DR_WAVE_FORMAT_ADPCM ||
-        formatTag == DR_WAVE_FORMAT_DVI_ADPCM;
-}
-
-DRWAV_PRIVATE unsigned int drwav__chunk_padding_size_riff(drwav_uint64 chunkSize)
-{
-    return (unsigned int)(chunkSize % 2);
-}
-
-DRWAV_PRIVATE unsigned int drwav__chunk_padding_size_w64(drwav_uint64 chunkSize)
-{
-    return (unsigned int)(chunkSize % 8);
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut);
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 samplesToRead, drwav_int16* pBufferOut);
-DRWAV_PRIVATE drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount);
-
-DRWAV_PRIVATE drwav_result drwav__read_chunk_header(drwav_read_proc onRead, void* pUserData, drwav_container container, drwav_uint64* pRunningBytesReadOut, drwav_chunk_header* pHeaderOut)
-{
-    if (container == drwav_container_riff || container == drwav_container_rf64) {
-        drwav_uint8 sizeInBytes[4];
-
-        if (onRead(pUserData, pHeaderOut->id.fourcc, 4) != 4) {
-            return DRWAV_AT_END;
-        }
-
-        if (onRead(pUserData, sizeInBytes, 4) != 4) {
-            return DRWAV_INVALID_FILE;
-        }
-
-        pHeaderOut->sizeInBytes = drwav_bytes_to_u32(sizeInBytes);
-        pHeaderOut->paddingSize = drwav__chunk_padding_size_riff(pHeaderOut->sizeInBytes);
-        *pRunningBytesReadOut += 8;
-    } else {
-        drwav_uint8 sizeInBytes[8];
-
-        if (onRead(pUserData, pHeaderOut->id.guid, 16) != 16) {
-            return DRWAV_AT_END;
-        }
-
-        if (onRead(pUserData, sizeInBytes, 8) != 8) {
-            return DRWAV_INVALID_FILE;
-        }
-
-        pHeaderOut->sizeInBytes = drwav_bytes_to_u64(sizeInBytes) - 24;    /* <-- Subtract 24 because w64 includes the size of the header. */
-        pHeaderOut->paddingSize = drwav__chunk_padding_size_w64(pHeaderOut->sizeInBytes);
-        *pRunningBytesReadOut += 24;
-    }
-
-    return DRWAV_SUCCESS;
-}
-
-DRWAV_PRIVATE drwav_bool32 drwav__seek_forward(drwav_seek_proc onSeek, drwav_uint64 offset, void* pUserData)
-{
-    drwav_uint64 bytesRemainingToSeek = offset;
-    while (bytesRemainingToSeek > 0) {
-        if (bytesRemainingToSeek > 0x7FFFFFFF) {
-            if (!onSeek(pUserData, 0x7FFFFFFF, drwav_seek_origin_current)) {
-                return DRWAV_FALSE;
-            }
-            bytesRemainingToSeek -= 0x7FFFFFFF;
-        } else {
-            if (!onSeek(pUserData, (int)bytesRemainingToSeek, drwav_seek_origin_current)) {
-                return DRWAV_FALSE;
-            }
-            bytesRemainingToSeek = 0;
-        }
-    }
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_PRIVATE drwav_bool32 drwav__seek_from_start(drwav_seek_proc onSeek, drwav_uint64 offset, void* pUserData)
-{
-    if (offset <= 0x7FFFFFFF) {
-        return onSeek(pUserData, (int)offset, drwav_seek_origin_start);
-    }
-
-    /* Larger than 32-bit seek. */
-    if (!onSeek(pUserData, 0x7FFFFFFF, drwav_seek_origin_start)) {
-        return DRWAV_FALSE;
-    }
-    offset -= 0x7FFFFFFF;
-
-    for (;;) {
-        if (offset <= 0x7FFFFFFF) {
-            return onSeek(pUserData, (int)offset, drwav_seek_origin_current);
-        }
-
-        if (!onSeek(pUserData, 0x7FFFFFFF, drwav_seek_origin_current)) {
-            return DRWAV_FALSE;
-        }
-        offset -= 0x7FFFFFFF;
-    }
-
-    /* Should never get here. */
-    /*return DRWAV_TRUE; */
-}
-
-
-DRWAV_PRIVATE drwav_bool32 drwav__read_fmt(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, drwav_container container, drwav_uint64* pRunningBytesReadOut, drwav_fmt* fmtOut)
-{
-    drwav_chunk_header header;
-    drwav_uint8 fmt[16];
-
-    if (drwav__read_chunk_header(onRead, pUserData, container, pRunningBytesReadOut, &header) != DRWAV_SUCCESS) {
-        return DRWAV_FALSE;
-    }
-
-
-    /* Skip non-fmt chunks. */
-    while (((container == drwav_container_riff || container == drwav_container_rf64) && !drwav_fourcc_equal(header.id.fourcc, "fmt ")) || (container == drwav_container_w64 && !drwav_guid_equal(header.id.guid, drwavGUID_W64_FMT))) {
-        if (!drwav__seek_forward(onSeek, header.sizeInBytes + header.paddingSize, pUserData)) {
-            return DRWAV_FALSE;
-        }
-        *pRunningBytesReadOut += header.sizeInBytes + header.paddingSize;
-
-        /* Try the next header. */
-        if (drwav__read_chunk_header(onRead, pUserData, container, pRunningBytesReadOut, &header) != DRWAV_SUCCESS) {
-            return DRWAV_FALSE;
-        }
-    }
-
-
-    /* Validation. */
-    if (container == drwav_container_riff || container == drwav_container_rf64) {
-        if (!drwav_fourcc_equal(header.id.fourcc, "fmt ")) {
-            return DRWAV_FALSE;
-        }
-    } else {
-        if (!drwav_guid_equal(header.id.guid, drwavGUID_W64_FMT)) {
-            return DRWAV_FALSE;
-        }
-    }
-
-
-    if (onRead(pUserData, fmt, sizeof(fmt)) != sizeof(fmt)) {
-        return DRWAV_FALSE;
-    }
-    *pRunningBytesReadOut += sizeof(fmt);
-
-    fmtOut->formatTag      = drwav_bytes_to_u16(fmt + 0);
-    fmtOut->channels       = drwav_bytes_to_u16(fmt + 2);
-    fmtOut->sampleRate     = drwav_bytes_to_u32(fmt + 4);
-    fmtOut->avgBytesPerSec = drwav_bytes_to_u32(fmt + 8);
-    fmtOut->blockAlign     = drwav_bytes_to_u16(fmt + 12);
-    fmtOut->bitsPerSample  = drwav_bytes_to_u16(fmt + 14);
-
-    fmtOut->extendedSize       = 0;
-    fmtOut->validBitsPerSample = 0;
-    fmtOut->channelMask        = 0;
-    DRWAV_ZERO_MEMORY(fmtOut->subFormat, sizeof(fmtOut->subFormat));
-
-    if (header.sizeInBytes > 16) {
-        drwav_uint8 fmt_cbSize[2];
-        int bytesReadSoFar = 0;
-
-        if (onRead(pUserData, fmt_cbSize, sizeof(fmt_cbSize)) != sizeof(fmt_cbSize)) {
-            return DRWAV_FALSE;    /* Expecting more data. */
-        }
-        *pRunningBytesReadOut += sizeof(fmt_cbSize);
-
-        bytesReadSoFar = 18;
-
-        fmtOut->extendedSize = drwav_bytes_to_u16(fmt_cbSize);
-        if (fmtOut->extendedSize > 0) {
-            /* Simple validation. */
-            if (fmtOut->formatTag == DR_WAVE_FORMAT_EXTENSIBLE) {
-                if (fmtOut->extendedSize != 22) {
-                    return DRWAV_FALSE;
-                }
-            }
-
-            if (fmtOut->formatTag == DR_WAVE_FORMAT_EXTENSIBLE) {
-                drwav_uint8 fmtext[22];
-                if (onRead(pUserData, fmtext, fmtOut->extendedSize) != fmtOut->extendedSize) {
-                    return DRWAV_FALSE;    /* Expecting more data. */
-                }
-
-                fmtOut->validBitsPerSample = drwav_bytes_to_u16(fmtext + 0);
-                fmtOut->channelMask        = drwav_bytes_to_u32(fmtext + 2);
-                drwav_bytes_to_guid(fmtext + 6, fmtOut->subFormat);
-            } else {
-                if (!onSeek(pUserData, fmtOut->extendedSize, drwav_seek_origin_current)) {
-                    return DRWAV_FALSE;
-                }
-            }
-            *pRunningBytesReadOut += fmtOut->extendedSize;
-
-            bytesReadSoFar += fmtOut->extendedSize;
-        }
-
-        /* Seek past any leftover bytes. For w64 the leftover will be defined based on the chunk size. */
-        if (!onSeek(pUserData, (int)(header.sizeInBytes - bytesReadSoFar), drwav_seek_origin_current)) {
-            return DRWAV_FALSE;
-        }
-        *pRunningBytesReadOut += (header.sizeInBytes - bytesReadSoFar);
-    }
-
-    if (header.paddingSize > 0) {
-        if (!onSeek(pUserData, header.paddingSize, drwav_seek_origin_current)) {
-            return DRWAV_FALSE;
-        }
-        *pRunningBytesReadOut += header.paddingSize;
-    }
-
-    return DRWAV_TRUE;
-}
-
-
-DRWAV_PRIVATE size_t drwav__on_read(drwav_read_proc onRead, void* pUserData, void* pBufferOut, size_t bytesToRead, drwav_uint64* pCursor)
-{
-    size_t bytesRead;
-
-    DRWAV_ASSERT(onRead != NULL);
-    DRWAV_ASSERT(pCursor != NULL);
-
-    bytesRead = onRead(pUserData, pBufferOut, bytesToRead);
-    *pCursor += bytesRead;
-    return bytesRead;
-}
-
-#if 0
-DRWAV_PRIVATE drwav_bool32 drwav__on_seek(drwav_seek_proc onSeek, void* pUserData, int offset, drwav_seek_origin origin, drwav_uint64* pCursor)
-{
-    DRWAV_ASSERT(onSeek != NULL);
-    DRWAV_ASSERT(pCursor != NULL);
-
-    if (!onSeek(pUserData, offset, origin)) {
-        return DRWAV_FALSE;
-    }
-
-    if (origin == drwav_seek_origin_start) {
-        *pCursor = offset;
-    } else {
-        *pCursor += offset;
-    }
-
-    return DRWAV_TRUE;
-}
-#endif
-
-
-#define DRWAV_SMPL_BYTES                    36
-#define DRWAV_SMPL_LOOP_BYTES               24
-#define DRWAV_INST_BYTES                    7
-#define DRWAV_ACID_BYTES                    24
-#define DRWAV_CUE_BYTES                     4
-#define DRWAV_BEXT_BYTES                    602
-#define DRWAV_BEXT_DESCRIPTION_BYTES        256
-#define DRWAV_BEXT_ORIGINATOR_NAME_BYTES    32
-#define DRWAV_BEXT_ORIGINATOR_REF_BYTES     32
-#define DRWAV_BEXT_RESERVED_BYTES           180
-#define DRWAV_BEXT_UMID_BYTES               64
-#define DRWAV_CUE_POINT_BYTES               24
-#define DRWAV_LIST_LABEL_OR_NOTE_BYTES      4
-#define DRWAV_LIST_LABELLED_TEXT_BYTES      20
-
-#define DRWAV_METADATA_ALIGNMENT            8
-
-typedef enum
-{
-    drwav__metadata_parser_stage_count,
-    drwav__metadata_parser_stage_read
-} drwav__metadata_parser_stage;
-
-typedef struct
-{
-    drwav_read_proc onRead;
-    drwav_seek_proc onSeek;
-    void *pReadSeekUserData;
-    drwav__metadata_parser_stage stage;
-    drwav_metadata *pMetadata;
-    drwav_uint32 metadataCount;
-    drwav_uint8 *pData;
-    drwav_uint8 *pDataCursor;
-    drwav_uint64 metadataCursor;
-    drwav_uint64 extraCapacity;
-} drwav__metadata_parser;
-
-DRWAV_PRIVATE size_t drwav__metadata_memory_capacity(drwav__metadata_parser* pParser)
-{
-    drwav_uint64 cap = sizeof(drwav_metadata) * (drwav_uint64)pParser->metadataCount + pParser->extraCapacity;
-    if (cap > DRWAV_SIZE_MAX) {
-        return 0;   /* Too big. */
-    }
-
-    return (size_t)cap; /* Safe cast thanks to the check above. */
-}
-
-DRWAV_PRIVATE drwav_uint8* drwav__metadata_get_memory(drwav__metadata_parser* pParser, size_t size, size_t align)
-{
-    drwav_uint8* pResult;
-
-    if (align) {
-        drwav_uintptr modulo = (drwav_uintptr)pParser->pDataCursor % align;
-        if (modulo != 0) {
-            pParser->pDataCursor += align - modulo;
-        }
-    }
-    
-    pResult = pParser->pDataCursor;
-
-    /*
-    Getting to the point where this function is called means there should always be memory
-    available. Out of memory checks should have been done at an earlier stage.
-    */
-    DRWAV_ASSERT((pResult + size) <= (pParser->pData + drwav__metadata_memory_capacity(pParser)));
-
-    pParser->pDataCursor += size;
-    return pResult;
-}
-
-DRWAV_PRIVATE void drwav__metadata_request_extra_memory_for_stage_2(drwav__metadata_parser* pParser, size_t bytes, size_t align)
-{
-    size_t extra = bytes + (align ? (align - 1) : 0);
-    pParser->extraCapacity += extra;
-}
-
-DRWAV_PRIVATE drwav_result drwav__metadata_alloc(drwav__metadata_parser* pParser, drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pParser->extraCapacity != 0 || pParser->metadataCount != 0) {
-        pAllocationCallbacks->onFree(pParser->pData, pAllocationCallbacks->pUserData);
-
-        pParser->pData = (drwav_uint8*)pAllocationCallbacks->onMalloc(drwav__metadata_memory_capacity(pParser), pAllocationCallbacks->pUserData);
-        pParser->pDataCursor = pParser->pData;
-
-        if (pParser->pData == NULL) {
-            return DRWAV_OUT_OF_MEMORY;
-        }
-
-        /*
-        We don't need to worry about specifying an alignment here because malloc always returns something
-        of suitable alignment. This also means than pParser->pMetadata is all that we need to store in order
-        for us to free when we are done.
-        */
-        pParser->pMetadata = (drwav_metadata*)drwav__metadata_get_memory(pParser, sizeof(drwav_metadata) * pParser->metadataCount, 1);
-        pParser->metadataCursor = 0;
-    }
-
-    return DRWAV_SUCCESS;
-}
-
-DRWAV_PRIVATE size_t drwav__metadata_parser_read(drwav__metadata_parser* pParser, void* pBufferOut, size_t bytesToRead, drwav_uint64* pCursor)
-{
-    if (pCursor != NULL) {
-        return drwav__on_read(pParser->onRead, pParser->pReadSeekUserData, pBufferOut, bytesToRead, pCursor);
-    } else {
-        return pParser->onRead(pParser->pReadSeekUserData, pBufferOut, bytesToRead);
-    }
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__read_smpl_to_metadata_obj(drwav__metadata_parser* pParser, const drwav_chunk_header* pChunkHeader, drwav_metadata* pMetadata)
-{
-    drwav_uint8 smplHeaderData[DRWAV_SMPL_BYTES];
-    drwav_uint64 totalBytesRead = 0;
-    size_t bytesJustRead = drwav__metadata_parser_read(pParser, smplHeaderData, sizeof(smplHeaderData), &totalBytesRead);
-
-    DRWAV_ASSERT(pParser->stage == drwav__metadata_parser_stage_read);
-    DRWAV_ASSERT(pChunkHeader != NULL);
-
-    if (bytesJustRead == sizeof(smplHeaderData)) {
-        drwav_uint32 iSampleLoop;
-
-        pMetadata->type                                     = drwav_metadata_type_smpl;
-        pMetadata->data.smpl.manufacturerId                 = drwav_bytes_to_u32(smplHeaderData + 0);
-        pMetadata->data.smpl.productId                      = drwav_bytes_to_u32(smplHeaderData + 4);
-        pMetadata->data.smpl.samplePeriodNanoseconds        = drwav_bytes_to_u32(smplHeaderData + 8);
-        pMetadata->data.smpl.midiUnityNote                  = drwav_bytes_to_u32(smplHeaderData + 12);
-        pMetadata->data.smpl.midiPitchFraction              = drwav_bytes_to_u32(smplHeaderData + 16);
-        pMetadata->data.smpl.smpteFormat                    = drwav_bytes_to_u32(smplHeaderData + 20);
-        pMetadata->data.smpl.smpteOffset                    = drwav_bytes_to_u32(smplHeaderData + 24);
-        pMetadata->data.smpl.sampleLoopCount                = drwav_bytes_to_u32(smplHeaderData + 28);
-        pMetadata->data.smpl.samplerSpecificDataSizeInBytes = drwav_bytes_to_u32(smplHeaderData + 32);
-
-        /*
-        The loop count needs to be validated against the size of the chunk for safety so we don't
-        attempt to read over the boundary of the chunk.
-        */
-        if (pMetadata->data.smpl.sampleLoopCount == (pChunkHeader->sizeInBytes - DRWAV_SMPL_BYTES) / DRWAV_SMPL_LOOP_BYTES) {
-            pMetadata->data.smpl.pLoops = (drwav_smpl_loop*)drwav__metadata_get_memory(pParser, sizeof(drwav_smpl_loop) * pMetadata->data.smpl.sampleLoopCount, DRWAV_METADATA_ALIGNMENT);
-
-            for (iSampleLoop = 0; iSampleLoop < pMetadata->data.smpl.sampleLoopCount; ++iSampleLoop) {
-                drwav_uint8 smplLoopData[DRWAV_SMPL_LOOP_BYTES];
-                bytesJustRead = drwav__metadata_parser_read(pParser, smplLoopData, sizeof(smplLoopData), &totalBytesRead);
-
-                if (bytesJustRead == sizeof(smplLoopData)) {
-                    pMetadata->data.smpl.pLoops[iSampleLoop].cuePointId            = drwav_bytes_to_u32(smplLoopData + 0);
-                    pMetadata->data.smpl.pLoops[iSampleLoop].type                  = drwav_bytes_to_u32(smplLoopData + 4);
-                    pMetadata->data.smpl.pLoops[iSampleLoop].firstSampleByteOffset = drwav_bytes_to_u32(smplLoopData + 8);
-                    pMetadata->data.smpl.pLoops[iSampleLoop].lastSampleByteOffset  = drwav_bytes_to_u32(smplLoopData + 12);
-                    pMetadata->data.smpl.pLoops[iSampleLoop].sampleFraction        = drwav_bytes_to_u32(smplLoopData + 16);
-                    pMetadata->data.smpl.pLoops[iSampleLoop].playCount             = drwav_bytes_to_u32(smplLoopData + 20);
-                } else {
-                    break;
-                }
-            }
-
-            if (pMetadata->data.smpl.samplerSpecificDataSizeInBytes > 0) {
-                pMetadata->data.smpl.pSamplerSpecificData = drwav__metadata_get_memory(pParser, pMetadata->data.smpl.samplerSpecificDataSizeInBytes, 1);
-                DRWAV_ASSERT(pMetadata->data.smpl.pSamplerSpecificData != NULL);
-
-                drwav__metadata_parser_read(pParser, pMetadata->data.smpl.pSamplerSpecificData, pMetadata->data.smpl.samplerSpecificDataSizeInBytes, &totalBytesRead);
-            }
-        }
-    }
-
-    return totalBytesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__read_cue_to_metadata_obj(drwav__metadata_parser* pParser, const drwav_chunk_header* pChunkHeader, drwav_metadata* pMetadata)
-{
-    drwav_uint8 cueHeaderSectionData[DRWAV_CUE_BYTES];
-    drwav_uint64 totalBytesRead = 0;
-    size_t bytesJustRead = drwav__metadata_parser_read(pParser, cueHeaderSectionData, sizeof(cueHeaderSectionData), &totalBytesRead);
-
-    DRWAV_ASSERT(pParser->stage == drwav__metadata_parser_stage_read);
-
-    if (bytesJustRead == sizeof(cueHeaderSectionData)) {
-        pMetadata->type                   = drwav_metadata_type_cue;
-        pMetadata->data.cue.cuePointCount = drwav_bytes_to_u32(cueHeaderSectionData);
-
-        /*
-        We need to validate the cue point count against the size of the chunk so we don't read
-        beyond the chunk.
-        */
-        if (pMetadata->data.cue.cuePointCount == (pChunkHeader->sizeInBytes - DRWAV_CUE_BYTES) / DRWAV_CUE_POINT_BYTES) {
-            pMetadata->data.cue.pCuePoints    = (drwav_cue_point*)drwav__metadata_get_memory(pParser, sizeof(drwav_cue_point) * pMetadata->data.cue.cuePointCount, DRWAV_METADATA_ALIGNMENT);
-            DRWAV_ASSERT(pMetadata->data.cue.pCuePoints != NULL);
-
-            if (pMetadata->data.cue.cuePointCount > 0) {
-                drwav_uint32 iCuePoint;
-
-                for (iCuePoint = 0; iCuePoint < pMetadata->data.cue.cuePointCount; ++iCuePoint) {
-                    drwav_uint8 cuePointData[DRWAV_CUE_POINT_BYTES];
-                    bytesJustRead = drwav__metadata_parser_read(pParser, cuePointData, sizeof(cuePointData), &totalBytesRead);
-
-                    if (bytesJustRead == sizeof(cuePointData)) {
-                        pMetadata->data.cue.pCuePoints[iCuePoint].id                = drwav_bytes_to_u32(cuePointData + 0);
-                        pMetadata->data.cue.pCuePoints[iCuePoint].playOrderPosition = drwav_bytes_to_u32(cuePointData + 4);
-                        pMetadata->data.cue.pCuePoints[iCuePoint].dataChunkId[0]    = cuePointData[8];
-                        pMetadata->data.cue.pCuePoints[iCuePoint].dataChunkId[1]    = cuePointData[9];
-                        pMetadata->data.cue.pCuePoints[iCuePoint].dataChunkId[2]    = cuePointData[10];
-                        pMetadata->data.cue.pCuePoints[iCuePoint].dataChunkId[3]    = cuePointData[11];
-                        pMetadata->data.cue.pCuePoints[iCuePoint].chunkStart        = drwav_bytes_to_u32(cuePointData + 12);
-                        pMetadata->data.cue.pCuePoints[iCuePoint].blockStart        = drwav_bytes_to_u32(cuePointData + 16);
-                        pMetadata->data.cue.pCuePoints[iCuePoint].sampleByteOffset  = drwav_bytes_to_u32(cuePointData + 20);
-                    } else {
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    return totalBytesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__read_inst_to_metadata_obj(drwav__metadata_parser* pParser, drwav_metadata* pMetadata)
-{
-    drwav_uint8 instData[DRWAV_INST_BYTES];
-    drwav_uint64 bytesRead = drwav__metadata_parser_read(pParser, instData, sizeof(instData), NULL);
-
-    DRWAV_ASSERT(pParser->stage == drwav__metadata_parser_stage_read);
-
-    if (bytesRead == sizeof(instData)) {
-        pMetadata->type                    = drwav_metadata_type_inst;
-        pMetadata->data.inst.midiUnityNote = (drwav_int8)instData[0];
-        pMetadata->data.inst.fineTuneCents = (drwav_int8)instData[1];
-        pMetadata->data.inst.gainDecibels  = (drwav_int8)instData[2];
-        pMetadata->data.inst.lowNote       = (drwav_int8)instData[3];
-        pMetadata->data.inst.highNote      = (drwav_int8)instData[4];
-        pMetadata->data.inst.lowVelocity   = (drwav_int8)instData[5];
-        pMetadata->data.inst.highVelocity  = (drwav_int8)instData[6];
-    }
-
-    return bytesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__read_acid_to_metadata_obj(drwav__metadata_parser* pParser, drwav_metadata* pMetadata)
-{
-    drwav_uint8 acidData[DRWAV_ACID_BYTES];
-    drwav_uint64 bytesRead = drwav__metadata_parser_read(pParser, acidData, sizeof(acidData), NULL);
-
-    DRWAV_ASSERT(pParser->stage == drwav__metadata_parser_stage_read);
-
-    if (bytesRead == sizeof(acidData)) {
-        pMetadata->type                       = drwav_metadata_type_acid;
-        pMetadata->data.acid.flags            = drwav_bytes_to_u32(acidData + 0);
-        pMetadata->data.acid.midiUnityNote    = drwav_bytes_to_u16(acidData + 4);
-        pMetadata->data.acid.reserved1        = drwav_bytes_to_u16(acidData + 6);
-        pMetadata->data.acid.reserved2        = drwav_bytes_to_f32(acidData + 8);
-        pMetadata->data.acid.numBeats         = drwav_bytes_to_u32(acidData + 12);
-        pMetadata->data.acid.meterDenominator = drwav_bytes_to_u16(acidData + 16);
-        pMetadata->data.acid.meterNumerator   = drwav_bytes_to_u16(acidData + 18);
-        pMetadata->data.acid.tempo            = drwav_bytes_to_f32(acidData + 20);
-    }
-
-    return bytesRead;
-}
-
-DRWAV_PRIVATE size_t drwav__strlen(const char* str)
-{
-    size_t result = 0;
-
-    while (*str++) {
-        result += 1;
-    }
-
-    return result;
-}
-
-DRWAV_PRIVATE size_t drwav__strlen_clamped(const char* str, size_t maxToRead)
-{
-    size_t result = 0;
-
-    while (*str++ && result < maxToRead) {
-        result += 1;
-    }
-
-    return result;
-}
-
-DRWAV_PRIVATE char* drwav__metadata_copy_string(drwav__metadata_parser* pParser, const char* str, size_t maxToRead)
-{
-    size_t len = drwav__strlen_clamped(str, maxToRead);
-
-    if (len) {
-        char* result = (char*)drwav__metadata_get_memory(pParser, len + 1, 1);
-        DRWAV_ASSERT(result != NULL);
-
-        DRWAV_COPY_MEMORY(result, str, len);
-        result[len] = '\0';
-
-        return result;
-    } else {
-        return NULL;
-    }
-}
-
-typedef struct
-{
-    const void* pBuffer;
-    size_t sizeInBytes;
-    size_t cursor;
-} drwav_buffer_reader;
-
-DRWAV_PRIVATE drwav_result drwav_buffer_reader_init(const void* pBuffer, size_t sizeInBytes, drwav_buffer_reader* pReader)
-{
-    DRWAV_ASSERT(pBuffer != NULL);
-    DRWAV_ASSERT(pReader != NULL);
-
-    DRWAV_ZERO_OBJECT(pReader);
-
-    pReader->pBuffer     = pBuffer;
-    pReader->sizeInBytes = sizeInBytes;
-    pReader->cursor      = 0;
-
-    return DRWAV_SUCCESS;
-}
-
-DRWAV_PRIVATE const void* drwav_buffer_reader_ptr(const drwav_buffer_reader* pReader)
-{
-    DRWAV_ASSERT(pReader != NULL);
-
-    return drwav_offset_ptr(pReader->pBuffer, pReader->cursor);
-}
-
-DRWAV_PRIVATE drwav_result drwav_buffer_reader_seek(drwav_buffer_reader* pReader, size_t bytesToSeek)
-{
-    DRWAV_ASSERT(pReader != NULL);
-
-    if (pReader->cursor + bytesToSeek > pReader->sizeInBytes) {
-        return DRWAV_BAD_SEEK;  /* Seeking too far forward. */
-    }
-
-    pReader->cursor += bytesToSeek;
-
-    return DRWAV_SUCCESS;
-}
-
-DRWAV_PRIVATE drwav_result drwav_buffer_reader_read(drwav_buffer_reader* pReader, void* pDst, size_t bytesToRead, size_t* pBytesRead)
-{
-    drwav_result result = DRWAV_SUCCESS;
-    size_t bytesRemaining;
-
-    DRWAV_ASSERT(pReader != NULL);
-    
-    if (pBytesRead != NULL) {
-        *pBytesRead = 0;
-    }
-
-    bytesRemaining = (pReader->sizeInBytes - pReader->cursor);
-    if (bytesToRead > bytesRemaining) {
-        bytesToRead = bytesRemaining;
-    }
-
-    if (pDst == NULL) {
-        /* Seek. */
-        result = drwav_buffer_reader_seek(pReader, bytesToRead);
-    } else {
-        /* Read. */
-        DRWAV_COPY_MEMORY(pDst, drwav_buffer_reader_ptr(pReader), bytesToRead);
-        pReader->cursor += bytesToRead;
-    }
-
-    DRWAV_ASSERT(pReader->cursor <= pReader->sizeInBytes);
-
-    if (result == DRWAV_SUCCESS) {
-        if (pBytesRead != NULL) {
-            *pBytesRead = bytesToRead;
-        }
-    }
-
-    return DRWAV_SUCCESS;
-}
-
-DRWAV_PRIVATE drwav_result drwav_buffer_reader_read_u16(drwav_buffer_reader* pReader, drwav_uint16* pDst)
-{
-    drwav_result result;
-    size_t bytesRead;
-    drwav_uint8 data[2];
-
-    DRWAV_ASSERT(pReader != NULL);
-    DRWAV_ASSERT(pDst != NULL);
-
-    *pDst = 0;  /* Safety. */
-
-    result = drwav_buffer_reader_read(pReader, data, sizeof(*pDst), &bytesRead);
-    if (result != DRWAV_SUCCESS || bytesRead != sizeof(*pDst)) {
-        return result;
-    }
-
-    *pDst = drwav_bytes_to_u16(data);
-
-    return DRWAV_SUCCESS;
-}
-
-DRWAV_PRIVATE drwav_result drwav_buffer_reader_read_u32(drwav_buffer_reader* pReader, drwav_uint32* pDst)
-{
-    drwav_result result;
-    size_t bytesRead;
-    drwav_uint8 data[4];
-
-    DRWAV_ASSERT(pReader != NULL);
-    DRWAV_ASSERT(pDst != NULL);
-
-    *pDst = 0;  /* Safety. */
-
-    result = drwav_buffer_reader_read(pReader, data, sizeof(*pDst), &bytesRead);
-    if (result != DRWAV_SUCCESS || bytesRead != sizeof(*pDst)) {
-        return result;
-    }
-
-    *pDst = drwav_bytes_to_u32(data);
-
-    return DRWAV_SUCCESS;
-}
-
-
-
-DRWAV_PRIVATE drwav_uint64 drwav__read_bext_to_metadata_obj(drwav__metadata_parser* pParser, drwav_metadata* pMetadata, drwav_uint64 chunkSize)
-{
-    drwav_uint8 bextData[DRWAV_BEXT_BYTES];
-    size_t bytesRead = drwav__metadata_parser_read(pParser, bextData, sizeof(bextData), NULL);
-
-    DRWAV_ASSERT(pParser->stage == drwav__metadata_parser_stage_read);
-    
-    if (bytesRead == sizeof(bextData)) {
-        drwav_buffer_reader reader;
-        drwav_uint32 timeReferenceLow;
-        drwav_uint32 timeReferenceHigh;
-        size_t extraBytes;
-
-        pMetadata->type = drwav_metadata_type_bext;
-
-        if (drwav_buffer_reader_init(bextData, bytesRead, &reader) == DRWAV_SUCCESS) {
-            pMetadata->data.bext.pDescription = drwav__metadata_copy_string(pParser, (const char*)drwav_buffer_reader_ptr(&reader), DRWAV_BEXT_DESCRIPTION_BYTES);
-            drwav_buffer_reader_seek(&reader, DRWAV_BEXT_DESCRIPTION_BYTES);
-
-            pMetadata->data.bext.pOriginatorName = drwav__metadata_copy_string(pParser, (const char*)drwav_buffer_reader_ptr(&reader), DRWAV_BEXT_ORIGINATOR_NAME_BYTES);
-            drwav_buffer_reader_seek(&reader, DRWAV_BEXT_ORIGINATOR_NAME_BYTES);
-
-            pMetadata->data.bext.pOriginatorReference = drwav__metadata_copy_string(pParser, (const char*)drwav_buffer_reader_ptr(&reader), DRWAV_BEXT_ORIGINATOR_REF_BYTES);
-            drwav_buffer_reader_seek(&reader, DRWAV_BEXT_ORIGINATOR_REF_BYTES);
-
-            drwav_buffer_reader_read(&reader, pMetadata->data.bext.pOriginationDate, sizeof(pMetadata->data.bext.pOriginationDate), NULL);
-            drwav_buffer_reader_read(&reader, pMetadata->data.bext.pOriginationTime, sizeof(pMetadata->data.bext.pOriginationTime), NULL);
-
-            drwav_buffer_reader_read_u32(&reader, &timeReferenceLow);
-            drwav_buffer_reader_read_u32(&reader, &timeReferenceHigh);
-            pMetadata->data.bext.timeReference = ((drwav_uint64)timeReferenceHigh << 32) + timeReferenceLow;
-
-            drwav_buffer_reader_read_u16(&reader, &pMetadata->data.bext.version);
-
-            pMetadata->data.bext.pUMID = drwav__metadata_get_memory(pParser, DRWAV_BEXT_UMID_BYTES, 1);
-            drwav_buffer_reader_read(&reader, pMetadata->data.bext.pUMID, DRWAV_BEXT_UMID_BYTES, NULL);
-
-            drwav_buffer_reader_read_u16(&reader, &pMetadata->data.bext.loudnessValue);
-            drwav_buffer_reader_read_u16(&reader, &pMetadata->data.bext.loudnessRange);
-            drwav_buffer_reader_read_u16(&reader, &pMetadata->data.bext.maxTruePeakLevel);
-            drwav_buffer_reader_read_u16(&reader, &pMetadata->data.bext.maxMomentaryLoudness);
-            drwav_buffer_reader_read_u16(&reader, &pMetadata->data.bext.maxShortTermLoudness);
-
-            DRWAV_ASSERT((drwav_offset_ptr(drwav_buffer_reader_ptr(&reader), DRWAV_BEXT_RESERVED_BYTES)) == (bextData + DRWAV_BEXT_BYTES));
-
-            extraBytes = (size_t)(chunkSize - DRWAV_BEXT_BYTES);
-            if (extraBytes > 0) {
-                pMetadata->data.bext.pCodingHistory = (char*)drwav__metadata_get_memory(pParser, extraBytes + 1, 1);
-                DRWAV_ASSERT(pMetadata->data.bext.pCodingHistory != NULL);
-
-                bytesRead += drwav__metadata_parser_read(pParser, pMetadata->data.bext.pCodingHistory, extraBytes, NULL);
-                pMetadata->data.bext.codingHistorySize = (drwav_uint32)drwav__strlen(pMetadata->data.bext.pCodingHistory);
-            } else {
-                pMetadata->data.bext.pCodingHistory    = NULL;
-                pMetadata->data.bext.codingHistorySize = 0;
-            }
-        }
-    }
-
-    return bytesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__read_list_label_or_note_to_metadata_obj(drwav__metadata_parser* pParser, drwav_metadata* pMetadata, drwav_uint64 chunkSize, drwav_metadata_type type)
-{
-    drwav_uint8 cueIDBuffer[DRWAV_LIST_LABEL_OR_NOTE_BYTES];
-    drwav_uint64 totalBytesRead = 0;
-    size_t bytesJustRead = drwav__metadata_parser_read(pParser, cueIDBuffer, sizeof(cueIDBuffer), &totalBytesRead);
-
-    DRWAV_ASSERT(pParser->stage == drwav__metadata_parser_stage_read);    
-
-    if (bytesJustRead == sizeof(cueIDBuffer)) {
-        drwav_uint32 sizeIncludingNullTerminator;
-
-        pMetadata->type = type;
-        pMetadata->data.labelOrNote.cuePointId = drwav_bytes_to_u32(cueIDBuffer);
-
-        sizeIncludingNullTerminator = (drwav_uint32)chunkSize - DRWAV_LIST_LABEL_OR_NOTE_BYTES;
-        if (sizeIncludingNullTerminator > 0) {
-            pMetadata->data.labelOrNote.stringLength = sizeIncludingNullTerminator - 1;
-            pMetadata->data.labelOrNote.pString      = (char*)drwav__metadata_get_memory(pParser, sizeIncludingNullTerminator, 1);
-            DRWAV_ASSERT(pMetadata->data.labelOrNote.pString != NULL);
-
-            drwav__metadata_parser_read(pParser, pMetadata->data.labelOrNote.pString, sizeIncludingNullTerminator, &totalBytesRead);
-        } else {
-            pMetadata->data.labelOrNote.stringLength = 0;
-            pMetadata->data.labelOrNote.pString      = NULL;
-        }
-    }
-
-    return totalBytesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__read_list_labelled_cue_region_to_metadata_obj(drwav__metadata_parser* pParser, drwav_metadata* pMetadata, drwav_uint64 chunkSize)
-{
-    drwav_uint8 buffer[DRWAV_LIST_LABELLED_TEXT_BYTES];
-    drwav_uint64 totalBytesRead = 0;
-    size_t bytesJustRead = drwav__metadata_parser_read(pParser, buffer, sizeof(buffer), &totalBytesRead);
-
-    DRWAV_ASSERT(pParser->stage == drwav__metadata_parser_stage_read);
-
-    if (bytesJustRead == sizeof(buffer)) {
-        drwav_uint32 sizeIncludingNullTerminator;
-
-        pMetadata->type                                = drwav_metadata_type_list_labelled_cue_region;
-        pMetadata->data.labelledCueRegion.cuePointId   = drwav_bytes_to_u32(buffer + 0);
-        pMetadata->data.labelledCueRegion.sampleLength = drwav_bytes_to_u32(buffer + 4);
-        pMetadata->data.labelledCueRegion.purposeId[0] = buffer[8];
-        pMetadata->data.labelledCueRegion.purposeId[1] = buffer[9];
-        pMetadata->data.labelledCueRegion.purposeId[2] = buffer[10];
-        pMetadata->data.labelledCueRegion.purposeId[3] = buffer[11];
-        pMetadata->data.labelledCueRegion.country      = drwav_bytes_to_u16(buffer + 12);
-        pMetadata->data.labelledCueRegion.language     = drwav_bytes_to_u16(buffer + 14);
-        pMetadata->data.labelledCueRegion.dialect      = drwav_bytes_to_u16(buffer + 16);
-        pMetadata->data.labelledCueRegion.codePage     = drwav_bytes_to_u16(buffer + 18);
-
-        sizeIncludingNullTerminator = (drwav_uint32)chunkSize - DRWAV_LIST_LABELLED_TEXT_BYTES;
-        if (sizeIncludingNullTerminator > 0) {
-            pMetadata->data.labelledCueRegion.stringLength = sizeIncludingNullTerminator - 1;
-            pMetadata->data.labelledCueRegion.pString      = (char*)drwav__metadata_get_memory(pParser, sizeIncludingNullTerminator, 1);
-            DRWAV_ASSERT(pMetadata->data.labelledCueRegion.pString != NULL);
-
-            drwav__metadata_parser_read(pParser, pMetadata->data.labelledCueRegion.pString, sizeIncludingNullTerminator, &totalBytesRead);
-        } else {
-            pMetadata->data.labelledCueRegion.stringLength = 0;
-            pMetadata->data.labelledCueRegion.pString      = NULL;
-        }
-    }
-
-    return totalBytesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__metadata_process_info_text_chunk(drwav__metadata_parser* pParser, drwav_uint64 chunkSize, drwav_metadata_type type)
-{
-    drwav_uint64 bytesRead = 0;
-    drwav_uint32 stringSizeWithNullTerminator = (drwav_uint32)chunkSize;
-
-    if (pParser->stage == drwav__metadata_parser_stage_count) {
-        pParser->metadataCount += 1;
-        drwav__metadata_request_extra_memory_for_stage_2(pParser, stringSizeWithNullTerminator, 1);
-    } else {
-        drwav_metadata* pMetadata = &pParser->pMetadata[pParser->metadataCursor];
-        pMetadata->type = type;
-        if (stringSizeWithNullTerminator > 0) {
-            pMetadata->data.infoText.stringLength = stringSizeWithNullTerminator - 1;
-            pMetadata->data.infoText.pString = (char*)drwav__metadata_get_memory(pParser, stringSizeWithNullTerminator, 1);
-            DRWAV_ASSERT(pMetadata->data.infoText.pString != NULL);
-
-            bytesRead = drwav__metadata_parser_read(pParser, pMetadata->data.infoText.pString, (size_t)stringSizeWithNullTerminator, NULL);
-            if (bytesRead == chunkSize) {
-                pParser->metadataCursor += 1;
-            } else {
-                /* Failed to parse. */
-            }
-        } else {
-            pMetadata->data.infoText.stringLength = 0;
-            pMetadata->data.infoText.pString      = NULL;
-            pParser->metadataCursor += 1;
-        }
-    }
-
-    return bytesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__metadata_process_unknown_chunk(drwav__metadata_parser* pParser, const drwav_uint8* pChunkId, drwav_uint64 chunkSize, drwav_metadata_location location)
-{
-    drwav_uint64 bytesRead = 0;
-
-    if (location == drwav_metadata_location_invalid) {
-        return 0;
-    }
-
-    if (drwav_fourcc_equal(pChunkId, "data") || drwav_fourcc_equal(pChunkId, "fmt") || drwav_fourcc_equal(pChunkId, "fact")) {
-        return 0;
-    }
-
-    if (pParser->stage == drwav__metadata_parser_stage_count) {
-        pParser->metadataCount += 1;
-        drwav__metadata_request_extra_memory_for_stage_2(pParser, (size_t)chunkSize, 1);
-    } else {
-        drwav_metadata* pMetadata = &pParser->pMetadata[pParser->metadataCursor];
-        pMetadata->type                         = drwav_metadata_type_unknown;
-        pMetadata->data.unknown.chunkLocation   = location;
-        pMetadata->data.unknown.id[0]           = pChunkId[0];
-        pMetadata->data.unknown.id[1]           = pChunkId[1];
-        pMetadata->data.unknown.id[2]           = pChunkId[2];
-        pMetadata->data.unknown.id[3]           = pChunkId[3];
-        pMetadata->data.unknown.dataSizeInBytes = (drwav_uint32)chunkSize;
-        pMetadata->data.unknown.pData           = (drwav_uint8 *)drwav__metadata_get_memory(pParser, (size_t)chunkSize, 1);
-        DRWAV_ASSERT(pMetadata->data.unknown.pData != NULL);
-
-        bytesRead = drwav__metadata_parser_read(pParser, pMetadata->data.unknown.pData, pMetadata->data.unknown.dataSizeInBytes, NULL);
-        if (bytesRead == pMetadata->data.unknown.dataSizeInBytes) {
-            pParser->metadataCursor += 1;
-        } else {
-            /* Failed to read. */
-        }
-    }
-
-    return bytesRead;
-}
-
-DRWAV_PRIVATE drwav_bool32 drwav__chunk_matches(drwav_metadata_type allowedMetadataTypes, const drwav_uint8* pChunkID, drwav_metadata_type type, const char* pID)
-{
-    return (allowedMetadataTypes & type) && drwav_fourcc_equal(pChunkID, pID);
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__metadata_process_chunk(drwav__metadata_parser* pParser, const drwav_chunk_header* pChunkHeader, drwav_metadata_type allowedMetadataTypes)
-{
-    const drwav_uint8 *pChunkID = pChunkHeader->id.fourcc;
-    drwav_uint64 bytesRead = 0;
-
-    if (drwav__chunk_matches(allowedMetadataTypes, pChunkID, drwav_metadata_type_smpl, "smpl")) {
-        if (pChunkHeader->sizeInBytes >= DRWAV_SMPL_BYTES) {
-            if (pParser->stage == drwav__metadata_parser_stage_count) {
-                drwav_uint8 buffer[4];
-                size_t bytesJustRead;
-
-                if (!pParser->onSeek(pParser->pReadSeekUserData, 28, drwav_seek_origin_current)) {
-                    return bytesRead;
-                }
-                bytesRead += 28;
-
-                bytesJustRead = drwav__metadata_parser_read(pParser, buffer, sizeof(buffer), &bytesRead);
-                if (bytesJustRead == sizeof(buffer)) {
-                    drwav_uint32 loopCount = drwav_bytes_to_u32(buffer);
-                    drwav_uint64 calculatedLoopCount;
-
-                    /* The loop count must be validated against the size of the chunk. */
-                    calculatedLoopCount = (pChunkHeader->sizeInBytes - DRWAV_SMPL_BYTES) / DRWAV_SMPL_LOOP_BYTES;
-                    if (calculatedLoopCount == loopCount) {
-                        bytesJustRead = drwav__metadata_parser_read(pParser, buffer, sizeof(buffer), &bytesRead);
-                        if (bytesJustRead == sizeof(buffer)) {
-                            drwav_uint32 samplerSpecificDataSizeInBytes = drwav_bytes_to_u32(buffer);
-
-                            pParser->metadataCount += 1;
-                            drwav__metadata_request_extra_memory_for_stage_2(pParser, sizeof(drwav_smpl_loop) * loopCount, DRWAV_METADATA_ALIGNMENT);
-                            drwav__metadata_request_extra_memory_for_stage_2(pParser, samplerSpecificDataSizeInBytes, 1);
-                        }
-                    } else {
-                        /* Loop count in header does not match the size of the chunk. */
-                    }                    
-                }
-            } else {
-                bytesRead = drwav__read_smpl_to_metadata_obj(pParser, pChunkHeader, &pParser->pMetadata[pParser->metadataCursor]);
-                if (bytesRead == pChunkHeader->sizeInBytes) {
-                    pParser->metadataCursor += 1;
-                } else {
-                    /* Failed to parse. */
-                }
-            }
-        } else {
-            /* Incorrectly formed chunk. */
-        }
-    } else if (drwav__chunk_matches(allowedMetadataTypes, pChunkID, drwav_metadata_type_inst, "inst")) {
-        if (pChunkHeader->sizeInBytes == DRWAV_INST_BYTES) {
-            if (pParser->stage == drwav__metadata_parser_stage_count) {
-                pParser->metadataCount += 1;
-            } else {
-                bytesRead = drwav__read_inst_to_metadata_obj(pParser, &pParser->pMetadata[pParser->metadataCursor]);
-                if (bytesRead == pChunkHeader->sizeInBytes) {
-                    pParser->metadataCursor += 1;
-                } else {
-                    /* Failed to parse. */
-                }
-            }
-        } else {
-            /* Incorrectly formed chunk. */
-        }
-    } else if (drwav__chunk_matches(allowedMetadataTypes, pChunkID, drwav_metadata_type_acid, "acid")) {
-        if (pChunkHeader->sizeInBytes == DRWAV_ACID_BYTES) {
-            if (pParser->stage == drwav__metadata_parser_stage_count) {
-                pParser->metadataCount += 1;
-            } else {
-                bytesRead = drwav__read_acid_to_metadata_obj(pParser, &pParser->pMetadata[pParser->metadataCursor]);
-                if (bytesRead == pChunkHeader->sizeInBytes) {
-                    pParser->metadataCursor += 1;
-                } else {
-                    /* Failed to parse. */
-                }
-            }
-        } else {
-            /* Incorrectly formed chunk. */
-        }
-    } else if (drwav__chunk_matches(allowedMetadataTypes, pChunkID, drwav_metadata_type_cue, "cue ")) {
-        if (pChunkHeader->sizeInBytes >= DRWAV_CUE_BYTES) {
-            if (pParser->stage == drwav__metadata_parser_stage_count) {
-                size_t cueCount;
-
-                pParser->metadataCount += 1;
-                cueCount = (size_t)(pChunkHeader->sizeInBytes - DRWAV_CUE_BYTES) / DRWAV_CUE_POINT_BYTES;
-                drwav__metadata_request_extra_memory_for_stage_2(pParser, sizeof(drwav_cue_point) * cueCount, DRWAV_METADATA_ALIGNMENT);
-            } else {
-                bytesRead = drwav__read_cue_to_metadata_obj(pParser, pChunkHeader, &pParser->pMetadata[pParser->metadataCursor]);
-                if (bytesRead == pChunkHeader->sizeInBytes) {
-                    pParser->metadataCursor += 1;
-                } else {
-                    /* Failed to parse. */
-                }
-            }
-        } else {
-            /* Incorrectly formed chunk. */
-        }
-    } else if (drwav__chunk_matches(allowedMetadataTypes, pChunkID, drwav_metadata_type_bext, "bext")) {
-        if (pChunkHeader->sizeInBytes >= DRWAV_BEXT_BYTES) {
-            if (pParser->stage == drwav__metadata_parser_stage_count) {
-                /* The description field is the largest one in a bext chunk, so that is the max size of this temporary buffer. */
-                char buffer[DRWAV_BEXT_DESCRIPTION_BYTES + 1];
-                size_t allocSizeNeeded = DRWAV_BEXT_UMID_BYTES; /* We know we will need SMPTE umid size. */
-                size_t bytesJustRead;
-
-                buffer[DRWAV_BEXT_DESCRIPTION_BYTES] = '\0';
-                bytesJustRead = drwav__metadata_parser_read(pParser, buffer, DRWAV_BEXT_DESCRIPTION_BYTES, &bytesRead);
-                if (bytesJustRead != DRWAV_BEXT_DESCRIPTION_BYTES) {
-                    return bytesRead;
-                }
-                allocSizeNeeded += drwav__strlen(buffer) + 1;
-
-                buffer[DRWAV_BEXT_ORIGINATOR_NAME_BYTES] = '\0';
-                bytesJustRead = drwav__metadata_parser_read(pParser, buffer, DRWAV_BEXT_ORIGINATOR_NAME_BYTES, &bytesRead);
-                if (bytesJustRead != DRWAV_BEXT_ORIGINATOR_NAME_BYTES) {
-                    return bytesRead;
-                }
-                allocSizeNeeded += drwav__strlen(buffer) + 1;
-
-                buffer[DRWAV_BEXT_ORIGINATOR_REF_BYTES] = '\0';
-                bytesJustRead = drwav__metadata_parser_read(pParser, buffer, DRWAV_BEXT_ORIGINATOR_REF_BYTES, &bytesRead);
-                if (bytesJustRead != DRWAV_BEXT_ORIGINATOR_REF_BYTES) {
-                    return bytesRead;
-                }
-                allocSizeNeeded += drwav__strlen(buffer) + 1;
-                allocSizeNeeded += (size_t)pChunkHeader->sizeInBytes - DRWAV_BEXT_BYTES; /* Coding history. */
-
-                drwav__metadata_request_extra_memory_for_stage_2(pParser, allocSizeNeeded, 1);
-
-                pParser->metadataCount += 1;
-            } else {
-                bytesRead = drwav__read_bext_to_metadata_obj(pParser, &pParser->pMetadata[pParser->metadataCursor], pChunkHeader->sizeInBytes);
-                if (bytesRead == pChunkHeader->sizeInBytes) {
-                    pParser->metadataCursor += 1;
-                } else {
-                    /* Failed to parse. */
-                }
-            }
-        } else {
-            /* Incorrectly formed chunk. */
-        }
-    } else if (drwav_fourcc_equal(pChunkID, "LIST") || drwav_fourcc_equal(pChunkID, "list")) {
-        drwav_metadata_location listType = drwav_metadata_location_invalid;
-        while (bytesRead < pChunkHeader->sizeInBytes) {
-            drwav_uint8 subchunkId[4];
-            drwav_uint8 subchunkSizeBuffer[4];
-            drwav_uint64 subchunkDataSize;
-            drwav_uint64 subchunkBytesRead = 0;
-            drwav_uint64 bytesJustRead = drwav__metadata_parser_read(pParser, subchunkId, sizeof(subchunkId), &bytesRead);
-            if (bytesJustRead != sizeof(subchunkId)) {
-                break;
-            }
-
-            /*
-            The first thing in a list chunk should be "adtl" or "INFO".
-
-              - adtl means this list is a Associated Data List Chunk and will contain labels, notes
-                or labelled cue regions.
-              - INFO means this list is an Info List Chunk containing info text chunks such as IPRD
-                which would specifies the album of this wav file.
-
-            No data follows the adtl or INFO id so we just make note of what type this list is and
-            continue.
-            */
-            if (drwav_fourcc_equal(subchunkId, "adtl")) {
-                listType = drwav_metadata_location_inside_adtl_list;
-                continue;
-            } else if (drwav_fourcc_equal(subchunkId, "INFO")) {
-                listType = drwav_metadata_location_inside_info_list;
-                continue;
-            }
-
-            bytesJustRead = drwav__metadata_parser_read(pParser, subchunkSizeBuffer, sizeof(subchunkSizeBuffer), &bytesRead);
-            if (bytesJustRead != sizeof(subchunkSizeBuffer)) {
-                break;
-            }
-            subchunkDataSize = drwav_bytes_to_u32(subchunkSizeBuffer);
-
-            if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_label, "labl") || drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_note, "note")) {
-                if (subchunkDataSize >= DRWAV_LIST_LABEL_OR_NOTE_BYTES) {
-                    drwav_uint64 stringSizeWithNullTerm = subchunkDataSize - DRWAV_LIST_LABEL_OR_NOTE_BYTES;
-                    if (pParser->stage == drwav__metadata_parser_stage_count) {
-                        pParser->metadataCount += 1;
-                        drwav__metadata_request_extra_memory_for_stage_2(pParser, (size_t)stringSizeWithNullTerm, 1);
-                    } else {
-                        subchunkBytesRead = drwav__read_list_label_or_note_to_metadata_obj(pParser, &pParser->pMetadata[pParser->metadataCursor], subchunkDataSize, drwav_fourcc_equal(subchunkId, "labl") ? drwav_metadata_type_list_label : drwav_metadata_type_list_note);
-                        if (subchunkBytesRead == subchunkDataSize) {
-                            pParser->metadataCursor += 1;
-                        } else {
-                            /* Failed to parse. */
-                        }
-                    }
-                } else {
-                    /* Incorrectly formed chunk. */
-                }
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_labelled_cue_region, "ltxt")) {
-                if (subchunkDataSize >= DRWAV_LIST_LABELLED_TEXT_BYTES) {
-                    drwav_uint64 stringSizeWithNullTerminator = subchunkDataSize - DRWAV_LIST_LABELLED_TEXT_BYTES;
-                    if (pParser->stage == drwav__metadata_parser_stage_count) {
-                        pParser->metadataCount += 1;
-                        drwav__metadata_request_extra_memory_for_stage_2(pParser, (size_t)stringSizeWithNullTerminator, 1);
-                    } else {
-                        subchunkBytesRead = drwav__read_list_labelled_cue_region_to_metadata_obj(pParser, &pParser->pMetadata[pParser->metadataCursor], subchunkDataSize);
-                        if (subchunkBytesRead == subchunkDataSize) {
-                            pParser->metadataCursor += 1;
-                        } else {
-                            /* Failed to parse. */
-                        }
-                    }
-                } else {
-                    /* Incorrectly formed chunk. */
-                }
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_info_software, "ISFT")) {
-                subchunkBytesRead = drwav__metadata_process_info_text_chunk(pParser, subchunkDataSize,  drwav_metadata_type_list_info_software);
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_info_copyright, "ICOP")) {
-                subchunkBytesRead = drwav__metadata_process_info_text_chunk(pParser, subchunkDataSize,  drwav_metadata_type_list_info_copyright);
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_info_title, "INAM")) {
-                subchunkBytesRead = drwav__metadata_process_info_text_chunk(pParser, subchunkDataSize,  drwav_metadata_type_list_info_title);
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_info_artist, "IART")) {
-                subchunkBytesRead = drwav__metadata_process_info_text_chunk(pParser, subchunkDataSize,  drwav_metadata_type_list_info_artist);
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_info_comment, "ICMT")) {
-                subchunkBytesRead = drwav__metadata_process_info_text_chunk(pParser, subchunkDataSize,  drwav_metadata_type_list_info_comment);
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_info_date, "ICRD")) {
-                subchunkBytesRead = drwav__metadata_process_info_text_chunk(pParser, subchunkDataSize,  drwav_metadata_type_list_info_date);
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_info_genre, "IGNR")) {
-                subchunkBytesRead = drwav__metadata_process_info_text_chunk(pParser, subchunkDataSize,  drwav_metadata_type_list_info_genre);
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_info_album, "IPRD")) {
-                subchunkBytesRead = drwav__metadata_process_info_text_chunk(pParser, subchunkDataSize,  drwav_metadata_type_list_info_album);
-            } else if (drwav__chunk_matches(allowedMetadataTypes, subchunkId, drwav_metadata_type_list_info_tracknumber, "ITRK")) {
-                subchunkBytesRead = drwav__metadata_process_info_text_chunk(pParser, subchunkDataSize,  drwav_metadata_type_list_info_tracknumber);
-            } else if ((allowedMetadataTypes & drwav_metadata_type_unknown) != 0) {
-                subchunkBytesRead = drwav__metadata_process_unknown_chunk(pParser, subchunkId, subchunkDataSize, listType);
-            }
-
-            bytesRead += subchunkBytesRead;
-            DRWAV_ASSERT(subchunkBytesRead <= subchunkDataSize);
-
-            if (subchunkBytesRead < subchunkDataSize) {
-                drwav_uint64 bytesToSeek = subchunkDataSize - subchunkBytesRead;
-
-                if (!pParser->onSeek(pParser->pReadSeekUserData, (int)bytesToSeek, drwav_seek_origin_current)) {
-                    break;
-                }
-                bytesRead += bytesToSeek;
-            }
-
-            if ((subchunkDataSize % 2) == 1) {
-                if (!pParser->onSeek(pParser->pReadSeekUserData, 1, drwav_seek_origin_current)) {
-                    break;
-                }
-                bytesRead += 1;
-            }
-        }
-    } else if ((allowedMetadataTypes & drwav_metadata_type_unknown) != 0) {
-        bytesRead = drwav__metadata_process_unknown_chunk(pParser, pChunkID, pChunkHeader->sizeInBytes, drwav_metadata_location_top_level);
-    }
-
-    return bytesRead;
-}
-
-
-DRWAV_PRIVATE drwav_uint32 drwav_get_bytes_per_pcm_frame(drwav* pWav)
-{
-    drwav_uint32 bytesPerFrame;
-
-    /*
-    The bytes per frame is a bit ambiguous. It can be either be based on the bits per sample, or the block align. The way I'm doing it here
-    is that if the bits per sample is a multiple of 8, use floor(bitsPerSample*channels/8), otherwise fall back to the block align.
-    */
-    if ((pWav->bitsPerSample & 0x7) == 0) {
-        /* Bits per sample is a multiple of 8. */
-        bytesPerFrame = (pWav->bitsPerSample * pWav->fmt.channels) >> 3;
-    } else {
-        bytesPerFrame = pWav->fmt.blockAlign;
-    }
-
-    /* Validation for known formats. a-law and mu-law should be 1 byte per channel. If it's not, it's not decodable. */
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW || pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) {
-        if (bytesPerFrame != pWav->fmt.channels) {
-            return 0;   /* Invalid file. */
-        }
-    }
-
-    return bytesPerFrame;
-}
-
-DRWAV_API drwav_uint16 drwav_fmt_get_format(const drwav_fmt* pFMT)
-{
-    if (pFMT == NULL) {
-        return 0;
-    }
-
-    if (pFMT->formatTag != DR_WAVE_FORMAT_EXTENSIBLE) {
-        return pFMT->formatTag;
-    } else {
-        return drwav_bytes_to_u16(pFMT->subFormat);    /* Only the first two bytes are required. */
-    }
-}
-
-DRWAV_PRIVATE drwav_bool32 drwav_preinit(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pReadSeekUserData, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pWav == NULL || onRead == NULL || onSeek == NULL) {
-        return DRWAV_FALSE;
-    }
-
-    DRWAV_ZERO_MEMORY(pWav, sizeof(*pWav));
-    pWav->onRead    = onRead;
-    pWav->onSeek    = onSeek;
-    pWav->pUserData = pReadSeekUserData;
-    pWav->allocationCallbacks = drwav_copy_allocation_callbacks_or_defaults(pAllocationCallbacks);
-
-    if (pWav->allocationCallbacks.onFree == NULL || (pWav->allocationCallbacks.onMalloc == NULL && pWav->allocationCallbacks.onRealloc == NULL)) {
-        return DRWAV_FALSE;    /* Invalid allocation callbacks. */
-    }
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_PRIVATE drwav_bool32 drwav_init__internal(drwav* pWav, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags)
-{
-    /* This function assumes drwav_preinit() has been called beforehand. */
-
-    drwav_uint64 cursor;    /* <-- Keeps track of the byte position so we can seek to specific locations. */
-    drwav_bool32 sequential;
-    drwav_uint8 riff[4];
-    drwav_fmt fmt;
-    unsigned short translatedFormatTag;
-    drwav_bool32 foundDataChunk;
-    drwav_uint64 dataChunkSize = 0; /* <-- Important! Don't explicitly set this to 0 anywhere else. Calculation of the size of the data chunk is performed in different paths depending on the container. */
-    drwav_uint64 sampleCountFromFactChunk = 0;  /* Same as dataChunkSize - make sure this is the only place this is initialized to 0. */
-    drwav_uint64 chunkSize;
-    drwav__metadata_parser metadataParser;
-
-    cursor = 0;
-    sequential = (flags & DRWAV_SEQUENTIAL) != 0;
-
-    /* The first 4 bytes should be the RIFF identifier. */
-    if (drwav__on_read(pWav->onRead, pWav->pUserData, riff, sizeof(riff), &cursor) != sizeof(riff)) {
-        return DRWAV_FALSE;
-    }
-
-    /*
-    The first 4 bytes can be used to identify the container. For RIFF files it will start with "RIFF" and for
-    w64 it will start with "riff".
-    */
-    if (drwav_fourcc_equal(riff, "RIFF")) {
-        pWav->container = drwav_container_riff;
-    } else if (drwav_fourcc_equal(riff, "riff")) {
-        int i;
-        drwav_uint8 riff2[12];
-
-        pWav->container = drwav_container_w64;
-
-        /* Check the rest of the GUID for validity. */
-        if (drwav__on_read(pWav->onRead, pWav->pUserData, riff2, sizeof(riff2), &cursor) != sizeof(riff2)) {
-            return DRWAV_FALSE;
-        }
-
-        for (i = 0; i < 12; ++i) {
-            if (riff2[i] != drwavGUID_W64_RIFF[i+4]) {
-                return DRWAV_FALSE;
-            }
-        }
-    } else if (drwav_fourcc_equal(riff, "RF64")) {
-        pWav->container = drwav_container_rf64;
-    } else {
-        return DRWAV_FALSE;   /* Unknown or unsupported container. */
-    }
-
-
-    if (pWav->container == drwav_container_riff || pWav->container == drwav_container_rf64) {
-        drwav_uint8 chunkSizeBytes[4];
-        drwav_uint8 wave[4];
-
-        /* RIFF/WAVE */
-        if (drwav__on_read(pWav->onRead, pWav->pUserData, chunkSizeBytes, sizeof(chunkSizeBytes), &cursor) != sizeof(chunkSizeBytes)) {
-            return DRWAV_FALSE;
-        }
-
-        if (pWav->container == drwav_container_riff) {
-            if (drwav_bytes_to_u32(chunkSizeBytes) < 36) {
-                return DRWAV_FALSE;    /* Chunk size should always be at least 36 bytes. */
-            }
-        } else {
-            if (drwav_bytes_to_u32(chunkSizeBytes) != 0xFFFFFFFF) {
-                return DRWAV_FALSE;    /* Chunk size should always be set to -1/0xFFFFFFFF for RF64. The actual size is retrieved later. */
-            }
-        }
-
-        if (drwav__on_read(pWav->onRead, pWav->pUserData, wave, sizeof(wave), &cursor) != sizeof(wave)) {
-            return DRWAV_FALSE;
-        }
-
-        if (!drwav_fourcc_equal(wave, "WAVE")) {
-            return DRWAV_FALSE;    /* Expecting "WAVE". */
-        }
-    } else {
-        drwav_uint8 chunkSizeBytes[8];
-        drwav_uint8 wave[16];
-
-        /* W64 */
-        if (drwav__on_read(pWav->onRead, pWav->pUserData, chunkSizeBytes, sizeof(chunkSizeBytes), &cursor) != sizeof(chunkSizeBytes)) {
-            return DRWAV_FALSE;
-        }
-
-        if (drwav_bytes_to_u64(chunkSizeBytes) < 80) {
-            return DRWAV_FALSE;
-        }
-
-        if (drwav__on_read(pWav->onRead, pWav->pUserData, wave, sizeof(wave), &cursor) != sizeof(wave)) {
-            return DRWAV_FALSE;
-        }
-
-        if (!drwav_guid_equal(wave, drwavGUID_W64_WAVE)) {
-            return DRWAV_FALSE;
-        }
-    }
-
-
-    /* For RF64, the "ds64" chunk must come next, before the "fmt " chunk. */
-    if (pWav->container == drwav_container_rf64) {
-        drwav_uint8 sizeBytes[8];
-        drwav_uint64 bytesRemainingInChunk;
-        drwav_chunk_header header;
-        drwav_result result = drwav__read_chunk_header(pWav->onRead, pWav->pUserData, pWav->container, &cursor, &header);
-        if (result != DRWAV_SUCCESS) {
-            return DRWAV_FALSE;
-        }
-
-        if (!drwav_fourcc_equal(header.id.fourcc, "ds64")) {
-            return DRWAV_FALSE; /* Expecting "ds64". */
-        }
-
-        bytesRemainingInChunk = header.sizeInBytes + header.paddingSize;
-
-        /* We don't care about the size of the RIFF chunk - skip it. */
-        if (!drwav__seek_forward(pWav->onSeek, 8, pWav->pUserData)) {
-            return DRWAV_FALSE;
-        }
-        bytesRemainingInChunk -= 8;
-        cursor += 8;
-
-
-        /* Next 8 bytes is the size of the "data" chunk. */
-        if (drwav__on_read(pWav->onRead, pWav->pUserData, sizeBytes, sizeof(sizeBytes), &cursor) != sizeof(sizeBytes)) {
-            return DRWAV_FALSE;
-        }
-        bytesRemainingInChunk -= 8;
-        dataChunkSize = drwav_bytes_to_u64(sizeBytes);
-
-
-        /* Next 8 bytes is the same count which we would usually derived from the FACT chunk if it was available. */
-        if (drwav__on_read(pWav->onRead, pWav->pUserData, sizeBytes, sizeof(sizeBytes), &cursor) != sizeof(sizeBytes)) {
-            return DRWAV_FALSE;
-        }
-        bytesRemainingInChunk -= 8;
-        sampleCountFromFactChunk = drwav_bytes_to_u64(sizeBytes);
-
-
-        /* Skip over everything else. */
-        if (!drwav__seek_forward(pWav->onSeek, bytesRemainingInChunk, pWav->pUserData)) {
-            return DRWAV_FALSE;
-        }
-        cursor += bytesRemainingInChunk;
-    }
-
-
-    /* The next bytes should be the "fmt " chunk. */
-    if (!drwav__read_fmt(pWav->onRead, pWav->onSeek, pWav->pUserData, pWav->container, &cursor, &fmt)) {
-        return DRWAV_FALSE;    /* Failed to read the "fmt " chunk. */
-    }
-
-    /* Basic validation. */
-    if ((fmt.sampleRate    == 0 || fmt.sampleRate    > DRWAV_MAX_SAMPLE_RATE)     ||
-        (fmt.channels      == 0 || fmt.channels      > DRWAV_MAX_CHANNELS)        ||
-        (fmt.bitsPerSample == 0 || fmt.bitsPerSample > DRWAV_MAX_BITS_PER_SAMPLE) ||
-        fmt.blockAlign == 0) {
-        return DRWAV_FALSE; /* Probably an invalid WAV file. */
-    }
-
-
-    /* Translate the internal format. */
-    translatedFormatTag = fmt.formatTag;
-    if (translatedFormatTag == DR_WAVE_FORMAT_EXTENSIBLE) {
-        translatedFormatTag = drwav_bytes_to_u16(fmt.subFormat + 0);
-    }
-
-    DRWAV_ZERO_MEMORY(&metadataParser, sizeof(metadataParser));
-
-    /* Not tested on W64. */
-    if (!sequential && pWav->allowedMetadataTypes != drwav_metadata_type_none && (pWav->container == drwav_container_riff || pWav->container == drwav_container_rf64)) {
-        drwav_uint64 cursorForMetadata = cursor;
-
-        metadataParser.onRead = pWav->onRead;
-        metadataParser.onSeek = pWav->onSeek;
-        metadataParser.pReadSeekUserData = pWav->pUserData;
-        metadataParser.stage = drwav__metadata_parser_stage_count;
-
-        for (;;) {
-            drwav_result result;
-            drwav_uint64 bytesRead;
-            drwav_uint64 remainingBytes;
-            drwav_chunk_header header;
-            
-            result = drwav__read_chunk_header(pWav->onRead, pWav->pUserData, pWav->container, &cursorForMetadata, &header);
-            if (result != DRWAV_SUCCESS) {
-                break;
-            }
-
-            bytesRead = drwav__metadata_process_chunk(&metadataParser, &header, pWav->allowedMetadataTypes);
-            DRWAV_ASSERT(bytesRead <= header.sizeInBytes);
-
-            remainingBytes = header.sizeInBytes - bytesRead + header.paddingSize;
-            if (!drwav__seek_forward(pWav->onSeek, remainingBytes, pWav->pUserData)) {
-                break;
-            }
-            cursorForMetadata += remainingBytes;
-        }
-
-        if (!drwav__seek_from_start(pWav->onSeek, cursor, pWav->pUserData)) {
-            return DRWAV_FALSE;
-        }
-
-        drwav__metadata_alloc(&metadataParser, &pWav->allocationCallbacks);
-        metadataParser.stage = drwav__metadata_parser_stage_read;
-    }
-
-    /*
-    We need to enumerate over each chunk for two reasons:
-      1) The "data" chunk may not be the next one
-      2) We may want to report each chunk back to the client
-
-    In order to correctly report each chunk back to the client we will need to keep looping until the end of the file.
-    */
-    foundDataChunk = DRWAV_FALSE;
-
-    /* The next chunk we care about is the "data" chunk. This is not necessarily the next chunk so we'll need to loop. */
-    for (;;) {
-        drwav_chunk_header header;
-        drwav_result result = drwav__read_chunk_header(pWav->onRead, pWav->pUserData, pWav->container, &cursor, &header);
-        if (result != DRWAV_SUCCESS) {
-            if (!foundDataChunk) {
-                return DRWAV_FALSE;
-            } else {
-                break;  /* Probably at the end of the file. Get out of the loop. */
-            }
-        }
-
-        /* Tell the client about this chunk. */
-        if (!sequential && onChunk != NULL) {
-            drwav_uint64 callbackBytesRead = onChunk(pChunkUserData, pWav->onRead, pWav->onSeek, pWav->pUserData, &header, pWav->container, &fmt);
-
-            /*
-            dr_wav may need to read the contents of the chunk, so we now need to seek back to the position before
-            we called the callback.
-            */
-            if (callbackBytesRead > 0) {
-                if (!drwav__seek_from_start(pWav->onSeek, cursor, pWav->pUserData)) {
-                    return DRWAV_FALSE;
-                }
-            }
-        }
-
-        if (!sequential && pWav->allowedMetadataTypes != drwav_metadata_type_none && (pWav->container == drwav_container_riff || pWav->container == drwav_container_rf64)) {
-            drwav_uint64 bytesRead = drwav__metadata_process_chunk(&metadataParser, &header, pWav->allowedMetadataTypes);
-
-            if (bytesRead > 0) {
-                if (!drwav__seek_from_start(pWav->onSeek, cursor, pWav->pUserData)) {
-                    return DRWAV_FALSE;
-                }
-            }
-        }
-
-
-        if (!foundDataChunk) {
-            pWav->dataChunkDataPos = cursor;
-        }
-
-        chunkSize = header.sizeInBytes;
-        if (pWav->container == drwav_container_riff || pWav->container == drwav_container_rf64) {
-            if (drwav_fourcc_equal(header.id.fourcc, "data")) {
-                foundDataChunk = DRWAV_TRUE;
-                if (pWav->container != drwav_container_rf64) {  /* The data chunk size for RF64 will always be set to 0xFFFFFFFF here. It was set to it's true value earlier. */
-                    dataChunkSize = chunkSize;
-                }
-            }
-        } else {
-            if (drwav_guid_equal(header.id.guid, drwavGUID_W64_DATA)) {
-                foundDataChunk = DRWAV_TRUE;
-                dataChunkSize = chunkSize;
-            }
-        }
-
-        /*
-        If at this point we have found the data chunk and we're running in sequential mode, we need to break out of this loop. The reason for
-        this is that we would otherwise require a backwards seek which sequential mode forbids.
-        */
-        if (foundDataChunk && sequential) {
-            break;
-        }
-
-        /* Optional. Get the total sample count from the FACT chunk. This is useful for compressed formats. */
-        if (pWav->container == drwav_container_riff) {
-            if (drwav_fourcc_equal(header.id.fourcc, "fact")) {
-                drwav_uint32 sampleCount;
-                if (drwav__on_read(pWav->onRead, pWav->pUserData, &sampleCount, 4, &cursor) != 4) {
-                    return DRWAV_FALSE;
-                }
-                chunkSize -= 4;
-
-                if (!foundDataChunk) {
-                    pWav->dataChunkDataPos = cursor;
-                }
-
-                /*
-                The sample count in the "fact" chunk is either unreliable, or I'm not understanding it properly. For now I am only enabling this
-                for Microsoft ADPCM formats.
-                */
-                if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) {
-                    sampleCountFromFactChunk = sampleCount;
-                } else {
-                    sampleCountFromFactChunk = 0;
-                }
-            }
-        } else if (pWav->container == drwav_container_w64) {
-            if (drwav_guid_equal(header.id.guid, drwavGUID_W64_FACT)) {
-                if (drwav__on_read(pWav->onRead, pWav->pUserData, &sampleCountFromFactChunk, 8, &cursor) != 8) {
-                    return DRWAV_FALSE;
-                }
-                chunkSize -= 8;
-
-                if (!foundDataChunk) {
-                    pWav->dataChunkDataPos = cursor;
-                }
-            }
-        } else if (pWav->container == drwav_container_rf64) {
-            /* We retrieved the sample count from the ds64 chunk earlier so no need to do that here. */
-        }
-
-        /* Make sure we seek past the padding. */
-        chunkSize += header.paddingSize;
-        if (!drwav__seek_forward(pWav->onSeek, chunkSize, pWav->pUserData)) {
-            break;
-        }
-        cursor += chunkSize;
-
-        if (!foundDataChunk) {
-            pWav->dataChunkDataPos = cursor;
-        }
-    }
-
-    pWav->pMetadata     = metadataParser.pMetadata;
-    pWav->metadataCount = metadataParser.metadataCount;
-
-    /* If we haven't found a data chunk, return an error. */
-    if (!foundDataChunk) {
-        return DRWAV_FALSE;
-    }
-
-    /* We may have moved passed the data chunk. If so we need to move back. If running in sequential mode we can assume we are already sitting on the data chunk. */
-    if (!sequential) {
-        if (!drwav__seek_from_start(pWav->onSeek, pWav->dataChunkDataPos, pWav->pUserData)) {
-            return DRWAV_FALSE;
-        }
-        cursor = pWav->dataChunkDataPos;
-    }
-
-
-    /* At this point we should be sitting on the first byte of the raw audio data. */
-
-    pWav->fmt                 = fmt;
-    pWav->sampleRate          = fmt.sampleRate;
-    pWav->channels            = fmt.channels;
-    pWav->bitsPerSample       = fmt.bitsPerSample;
-    pWav->bytesRemaining      = dataChunkSize;
-    pWav->translatedFormatTag = translatedFormatTag;
-    pWav->dataChunkDataSize   = dataChunkSize;
-
-    if (sampleCountFromFactChunk != 0) {
-        pWav->totalPCMFrameCount = sampleCountFromFactChunk;
-    } else {
-        drwav_uint32 bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-        if (bytesPerFrame == 0) {
-            return DRWAV_FALSE; /* Invalid file. */
-        }
-
-        pWav->totalPCMFrameCount = dataChunkSize / bytesPerFrame;
-
-        if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) {
-            drwav_uint64 totalBlockHeaderSizeInBytes;
-            drwav_uint64 blockCount = dataChunkSize / fmt.blockAlign;
-
-            /* Make sure any trailing partial block is accounted for. */
-            if ((blockCount * fmt.blockAlign) < dataChunkSize) {
-                blockCount += 1;
-            }
-
-            /* We decode two samples per byte. There will be blockCount headers in the data chunk. This is enough to know how to calculate the total PCM frame count. */
-            totalBlockHeaderSizeInBytes = blockCount * (6*fmt.channels);
-            pWav->totalPCMFrameCount = ((dataChunkSize - totalBlockHeaderSizeInBytes) * 2) / fmt.channels;
-        }
-        if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) {
-            drwav_uint64 totalBlockHeaderSizeInBytes;
-            drwav_uint64 blockCount = dataChunkSize / fmt.blockAlign;
-
-            /* Make sure any trailing partial block is accounted for. */
-            if ((blockCount * fmt.blockAlign) < dataChunkSize) {
-                blockCount += 1;
-            }
-
-            /* We decode two samples per byte. There will be blockCount headers in the data chunk. This is enough to know how to calculate the total PCM frame count. */
-            totalBlockHeaderSizeInBytes = blockCount * (4*fmt.channels);
-            pWav->totalPCMFrameCount = ((dataChunkSize - totalBlockHeaderSizeInBytes) * 2) / fmt.channels;
-
-            /* The header includes a decoded sample for each channel which acts as the initial predictor sample. */
-            pWav->totalPCMFrameCount += blockCount;
-        }
-    }
-
-    /* Some formats only support a certain number of channels. */
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM || pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) {
-        if (pWav->channels > 2) {
-            return DRWAV_FALSE;
-        }
-    }
-
-    /* The number of bytes per frame must be known. If not, it's an invalid file and not decodable. */
-    if (drwav_get_bytes_per_pcm_frame(pWav) == 0) {
-        return DRWAV_FALSE;
-    }
-
-#ifdef DR_WAV_LIBSNDFILE_COMPAT
-    /*
-    I use libsndfile as a benchmark for testing, however in the version I'm using (from the Windows installer on the libsndfile website),
-    it appears the total sample count libsndfile uses for MS-ADPCM is incorrect. It would seem they are computing the total sample count
-    from the number of blocks, however this results in the inclusion of extra silent samples at the end of the last block. The correct
-    way to know the total sample count is to inspect the "fact" chunk, which should always be present for compressed formats, and should
-    always include the sample count. This little block of code below is only used to emulate the libsndfile logic so I can properly run my
-    correctness tests against libsndfile, and is disabled by default.
-    */
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) {
-        drwav_uint64 blockCount = dataChunkSize / fmt.blockAlign;
-        pWav->totalPCMFrameCount = (((blockCount * (fmt.blockAlign - (6*pWav->channels))) * 2)) / fmt.channels;  /* x2 because two samples per byte. */
-    }
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) {
-        drwav_uint64 blockCount = dataChunkSize / fmt.blockAlign;
-        pWav->totalPCMFrameCount = (((blockCount * (fmt.blockAlign - (4*pWav->channels))) * 2) + (blockCount * pWav->channels)) / fmt.channels;
-    }
-#endif
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_API drwav_bool32 drwav_init(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_ex(pWav, onRead, onSeek, NULL, pUserData, NULL, 0, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_ex(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, drwav_chunk_proc onChunk, void* pReadSeekUserData, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (!drwav_preinit(pWav, onRead, onSeek, pReadSeekUserData, pAllocationCallbacks)) {
-        return DRWAV_FALSE;
-    }
-
-    return drwav_init__internal(pWav, onChunk, pChunkUserData, flags);
-}
-
-DRWAV_API drwav_bool32 drwav_init_with_metadata(drwav* pWav, drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (!drwav_preinit(pWav, onRead, onSeek, pUserData, pAllocationCallbacks)) {
-        return DRWAV_FALSE;
-    }
-
-    pWav->allowedMetadataTypes = drwav_metadata_type_all_including_unknown;   /* <-- Needs to be set to tell drwav_init_ex() that we need to process metadata. */
-    return drwav_init__internal(pWav, NULL, NULL, flags);
-}
-
-DRWAV_API drwav_metadata* drwav_take_ownership_of_metadata(drwav* pWav)
-{
-    drwav_metadata *result = pWav->pMetadata;
-
-    pWav->pMetadata     = NULL;
-    pWav->metadataCount = 0;
-
-    return result;
-}
-
-
-DRWAV_PRIVATE size_t drwav__write(drwav* pWav, const void* pData, size_t dataSize)
-{
-    DRWAV_ASSERT(pWav          != NULL);
-    DRWAV_ASSERT(pWav->onWrite != NULL);
-
-    /* Generic write. Assumes no byte reordering required. */
-    return pWav->onWrite(pWav->pUserData, pData, dataSize);
-}
-
-DRWAV_PRIVATE size_t drwav__write_byte(drwav* pWav, drwav_uint8 byte)
-{
-    DRWAV_ASSERT(pWav          != NULL);
-    DRWAV_ASSERT(pWav->onWrite != NULL);
-
-    return pWav->onWrite(pWav->pUserData, &byte, 1);
-}
-
-DRWAV_PRIVATE size_t drwav__write_u16ne_to_le(drwav* pWav, drwav_uint16 value)
-{
-    DRWAV_ASSERT(pWav          != NULL);
-    DRWAV_ASSERT(pWav->onWrite != NULL);
-
-    if (!drwav__is_little_endian()) {
-        value = drwav__bswap16(value);
-    }
-
-    return drwav__write(pWav, &value, 2);
-}
-
-DRWAV_PRIVATE size_t drwav__write_u32ne_to_le(drwav* pWav, drwav_uint32 value)
-{
-    DRWAV_ASSERT(pWav          != NULL);
-    DRWAV_ASSERT(pWav->onWrite != NULL);
-
-    if (!drwav__is_little_endian()) {
-        value = drwav__bswap32(value);
-    }
-
-    return drwav__write(pWav, &value, 4);
-}
-
-DRWAV_PRIVATE size_t drwav__write_u64ne_to_le(drwav* pWav, drwav_uint64 value)
-{
-    DRWAV_ASSERT(pWav          != NULL);
-    DRWAV_ASSERT(pWav->onWrite != NULL);
-
-    if (!drwav__is_little_endian()) {
-        value = drwav__bswap64(value);
-    }
-
-    return drwav__write(pWav, &value, 8);
-}
-
-DRWAV_PRIVATE size_t drwav__write_f32ne_to_le(drwav* pWav, float value)
-{
-    union {
-       drwav_uint32 u32;
-       float f32;
-    } u;
-
-    DRWAV_ASSERT(pWav          != NULL);
-    DRWAV_ASSERT(pWav->onWrite != NULL);
-
-    u.f32 = value;
-
-    if (!drwav__is_little_endian()) {
-        u.u32 = drwav__bswap32(u.u32);
-    }
-
-    return drwav__write(pWav, &u.u32, 4);
-}
-
-DRWAV_PRIVATE size_t drwav__write_or_count(drwav* pWav, const void* pData, size_t dataSize)
-{
-    if (pWav == NULL) {
-        return dataSize;
-    }
-
-    return drwav__write(pWav, pData, dataSize);
-}
-
-DRWAV_PRIVATE size_t drwav__write_or_count_byte(drwav* pWav, drwav_uint8 byte)
-{
-    if (pWav == NULL) {
-        return 1;
-    }
-
-    return drwav__write_byte(pWav, byte);
-}
-
-DRWAV_PRIVATE size_t drwav__write_or_count_u16ne_to_le(drwav* pWav, drwav_uint16 value)
-{
-    if (pWav == NULL) {
-        return 2;
-    }
-
-    return drwav__write_u16ne_to_le(pWav, value);
-}
-
-DRWAV_PRIVATE size_t drwav__write_or_count_u32ne_to_le(drwav* pWav, drwav_uint32 value)
-{
-    if (pWav == NULL) {
-        return 4;
-    }
-
-    return drwav__write_u32ne_to_le(pWav, value);
-}
-
-#if 0   /* Unused for now. */
-DRWAV_PRIVATE size_t drwav__write_or_count_u64ne_to_le(drwav* pWav, drwav_uint64 value)
-{
-    if (pWav == NULL) {
-        return 8;
-    }
-
-    return drwav__write_u64ne_to_le(pWav, value);
-}
-#endif
-
-DRWAV_PRIVATE size_t drwav__write_or_count_f32ne_to_le(drwav* pWav, float value)
-{
-    if (pWav == NULL) {
-        return 4;
-    }
-
-    return drwav__write_f32ne_to_le(pWav, value);
-}
-
-DRWAV_PRIVATE size_t drwav__write_or_count_string_to_fixed_size_buf(drwav* pWav, char* str, size_t bufFixedSize)
-{
-    size_t len;
-
-    if (pWav == NULL) {
-        return bufFixedSize;
-    }
-
-    len = drwav__strlen_clamped(str, bufFixedSize);
-    drwav__write_or_count(pWav, str, len);
-
-    if (len < bufFixedSize) {
-        size_t i;
-        for (i = 0; i < bufFixedSize - len; ++i) {
-            drwav__write_byte(pWav, 0);
-        }
-    }
-
-    return bufFixedSize;
-}
-
-
-/* pWav can be NULL meaning just count the bytes that would be written. */
-DRWAV_PRIVATE size_t drwav__write_or_count_metadata(drwav* pWav, drwav_metadata* pMetadatas, drwav_uint32 metadataCount)
-{
-    size_t bytesWritten = 0;
-    drwav_bool32 hasListAdtl = DRWAV_FALSE;
-    drwav_bool32 hasListInfo = DRWAV_FALSE;
-    drwav_uint32 iMetadata;
-
-    if (pMetadatas == NULL || metadataCount == 0) {
-        return 0;
-    }
-
-    for (iMetadata = 0; iMetadata < metadataCount; ++iMetadata) {
-        drwav_metadata* pMetadata = &pMetadatas[iMetadata];
-        drwav_uint32 chunkSize = 0;
-
-        if ((pMetadata->type & drwav_metadata_type_list_all_info_strings) || (pMetadata->type == drwav_metadata_type_unknown && pMetadata->data.unknown.chunkLocation == drwav_metadata_location_inside_info_list)) {
-            hasListInfo = DRWAV_TRUE;
-        }
-
-        if ((pMetadata->type & drwav_metadata_type_list_all_adtl) || (pMetadata->type == drwav_metadata_type_unknown && pMetadata->data.unknown.chunkLocation == drwav_metadata_location_inside_adtl_list)) {
-            hasListAdtl = DRWAV_TRUE;
-        }
-
-        switch (pMetadata->type) {
-            case drwav_metadata_type_smpl:
-            {
-                drwav_uint32 iLoop;
-
-                chunkSize = DRWAV_SMPL_BYTES + DRWAV_SMPL_LOOP_BYTES * pMetadata->data.smpl.sampleLoopCount + pMetadata->data.smpl.samplerSpecificDataSizeInBytes;
-
-                bytesWritten += drwav__write_or_count(pWav, "smpl", 4);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, chunkSize);
-
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.manufacturerId);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.productId);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.samplePeriodNanoseconds);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.midiUnityNote);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.midiPitchFraction);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.smpteFormat);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.smpteOffset);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.sampleLoopCount);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.samplerSpecificDataSizeInBytes);
-
-                for (iLoop = 0; iLoop < pMetadata->data.smpl.sampleLoopCount; ++iLoop) {
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].cuePointId);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].type);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].firstSampleByteOffset);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].lastSampleByteOffset);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].sampleFraction);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.smpl.pLoops[iLoop].playCount);
-                }
-
-                if (pMetadata->data.smpl.samplerSpecificDataSizeInBytes > 0) {
-                    bytesWritten += drwav__write(pWav, pMetadata->data.smpl.pSamplerSpecificData, pMetadata->data.smpl.samplerSpecificDataSizeInBytes);
-                }  
-            } break;
-
-            case drwav_metadata_type_inst:
-            {
-                chunkSize = DRWAV_INST_BYTES;
-
-                bytesWritten += drwav__write_or_count(pWav, "inst", 4);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, chunkSize);
-                bytesWritten += drwav__write_or_count(pWav, &pMetadata->data.inst.midiUnityNote, 1);
-                bytesWritten += drwav__write_or_count(pWav, &pMetadata->data.inst.fineTuneCents, 1);
-                bytesWritten += drwav__write_or_count(pWav, &pMetadata->data.inst.gainDecibels, 1);
-                bytesWritten += drwav__write_or_count(pWav, &pMetadata->data.inst.lowNote, 1);
-                bytesWritten += drwav__write_or_count(pWav, &pMetadata->data.inst.highNote, 1);
-                bytesWritten += drwav__write_or_count(pWav, &pMetadata->data.inst.lowVelocity, 1);
-                bytesWritten += drwav__write_or_count(pWav, &pMetadata->data.inst.highVelocity, 1);
-            } break;
-
-            case drwav_metadata_type_cue:
-            {
-                drwav_uint32 iCuePoint;
-
-                chunkSize = DRWAV_CUE_BYTES + DRWAV_CUE_POINT_BYTES * pMetadata->data.cue.cuePointCount;
-
-                bytesWritten += drwav__write_or_count(pWav, "cue ", 4);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, chunkSize);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.cuePointCount);
-                for (iCuePoint = 0; iCuePoint < pMetadata->data.cue.cuePointCount; ++iCuePoint) {
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].id);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].playOrderPosition);
-                    bytesWritten += drwav__write_or_count(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].dataChunkId, 4);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].chunkStart);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].blockStart);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.cue.pCuePoints[iCuePoint].sampleByteOffset);
-                }
-            } break;
-
-            case drwav_metadata_type_acid:
-            {
-                chunkSize = DRWAV_ACID_BYTES;
-
-                bytesWritten += drwav__write_or_count(pWav, "acid", 4);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, chunkSize);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.acid.flags);
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.acid.midiUnityNote);
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.acid.reserved1);
-                bytesWritten += drwav__write_or_count_f32ne_to_le(pWav, pMetadata->data.acid.reserved2);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.acid.numBeats);
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.acid.meterDenominator);
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.acid.meterNumerator);
-                bytesWritten += drwav__write_or_count_f32ne_to_le(pWav, pMetadata->data.acid.tempo);
-            } break;
-
-            case drwav_metadata_type_bext:
-            {
-                char reservedBuf[DRWAV_BEXT_RESERVED_BYTES];
-                drwav_uint32 timeReferenceLow;
-                drwav_uint32 timeReferenceHigh;
-
-                chunkSize = DRWAV_BEXT_BYTES + pMetadata->data.bext.codingHistorySize;
-
-                bytesWritten += drwav__write_or_count(pWav, "bext", 4);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, chunkSize);
-
-                bytesWritten += drwav__write_or_count_string_to_fixed_size_buf(pWav, pMetadata->data.bext.pDescription, DRWAV_BEXT_DESCRIPTION_BYTES);
-                bytesWritten += drwav__write_or_count_string_to_fixed_size_buf(pWav, pMetadata->data.bext.pOriginatorName, DRWAV_BEXT_ORIGINATOR_NAME_BYTES);
-                bytesWritten += drwav__write_or_count_string_to_fixed_size_buf(pWav, pMetadata->data.bext.pOriginatorReference, DRWAV_BEXT_ORIGINATOR_REF_BYTES);
-                bytesWritten += drwav__write_or_count(pWav, pMetadata->data.bext.pOriginationDate, sizeof(pMetadata->data.bext.pOriginationDate));
-                bytesWritten += drwav__write_or_count(pWav, pMetadata->data.bext.pOriginationTime, sizeof(pMetadata->data.bext.pOriginationTime));
-
-                timeReferenceLow  = (drwav_uint32)(pMetadata->data.bext.timeReference & 0xFFFFFFFF);
-                timeReferenceHigh = (drwav_uint32)(pMetadata->data.bext.timeReference >> 32);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, timeReferenceLow);
-                bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, timeReferenceHigh);
-
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.bext.version);
-                bytesWritten += drwav__write_or_count(pWav, pMetadata->data.bext.pUMID, DRWAV_BEXT_UMID_BYTES);
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.bext.loudnessValue);
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.bext.loudnessRange);
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.bext.maxTruePeakLevel);
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.bext.maxMomentaryLoudness);
-                bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.bext.maxShortTermLoudness);
-
-                DRWAV_ZERO_MEMORY(reservedBuf, sizeof(reservedBuf));
-                bytesWritten += drwav__write_or_count(pWav, reservedBuf, sizeof(reservedBuf));
-
-                if (pMetadata->data.bext.codingHistorySize > 0) {
-                    bytesWritten += drwav__write_or_count(pWav, pMetadata->data.bext.pCodingHistory, pMetadata->data.bext.codingHistorySize);
-                }
-            } break;
-
-            case drwav_metadata_type_unknown:
-            {
-                if (pMetadata->data.unknown.chunkLocation == drwav_metadata_location_top_level) {
-                    chunkSize = pMetadata->data.unknown.dataSizeInBytes;
-
-                    bytesWritten += drwav__write_or_count(pWav, pMetadata->data.unknown.id, 4);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, chunkSize);
-                    bytesWritten += drwav__write_or_count(pWav, pMetadata->data.unknown.pData, pMetadata->data.unknown.dataSizeInBytes);
-                }
-            } break;
-
-            default: break;
-        }
-        if ((chunkSize % 2) != 0) {
-            bytesWritten += drwav__write_or_count_byte(pWav, 0);
-        }
-    }
-
-    if (hasListInfo) {
-        drwav_uint32 chunkSize = 4; /* Start with 4 bytes for "INFO". */
-        for (iMetadata = 0; iMetadata < metadataCount; ++iMetadata) {
-            drwav_metadata* pMetadata = &pMetadatas[iMetadata];
-
-            if ((pMetadata->type & drwav_metadata_type_list_all_info_strings)) {
-                chunkSize += 8; /* For id and string size. */
-                chunkSize += pMetadata->data.infoText.stringLength + 1; /* Include null terminator. */
-            } else if (pMetadata->type == drwav_metadata_type_unknown && pMetadata->data.unknown.chunkLocation == drwav_metadata_location_inside_info_list) {
-                chunkSize += 8; /* For id string size. */
-                chunkSize += pMetadata->data.unknown.dataSizeInBytes;
-            }
-
-            if ((chunkSize % 2) != 0) {
-                chunkSize += 1;
-            }
-        }
-
-        bytesWritten += drwav__write_or_count(pWav, "LIST", 4);
-        bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, chunkSize);
-        bytesWritten += drwav__write_or_count(pWav, "INFO", 4);
-
-        for (iMetadata = 0; iMetadata < metadataCount; ++iMetadata) {
-            drwav_metadata* pMetadata = &pMetadatas[iMetadata];
-            drwav_uint32 subchunkSize = 0;
-
-            if (pMetadata->type & drwav_metadata_type_list_all_info_strings) {
-                const char* pID = NULL;
-
-                switch (pMetadata->type) {
-                    case drwav_metadata_type_list_info_software:    pID = "ISFT"; break;
-                    case drwav_metadata_type_list_info_copyright:   pID = "ICOP"; break;
-                    case drwav_metadata_type_list_info_title:       pID = "INAM"; break;
-                    case drwav_metadata_type_list_info_artist:      pID = "IART"; break;
-                    case drwav_metadata_type_list_info_comment:     pID = "ICMT"; break;
-                    case drwav_metadata_type_list_info_date:        pID = "ICRD"; break;
-                    case drwav_metadata_type_list_info_genre:       pID = "IGNR"; break;
-                    case drwav_metadata_type_list_info_album:       pID = "IPRD"; break;
-                    case drwav_metadata_type_list_info_tracknumber: pID = "ITRK"; break;
-                    default: break;
-                }
-
-                DRWAV_ASSERT(pID != NULL);
-
-                if (pMetadata->data.infoText.stringLength) {
-                    subchunkSize = pMetadata->data.infoText.stringLength + 1;
-                    bytesWritten += drwav__write_or_count(pWav, pID, 4);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, subchunkSize);
-                    bytesWritten += drwav__write_or_count(pWav, pMetadata->data.infoText.pString, pMetadata->data.infoText.stringLength);
-                    bytesWritten += drwav__write_or_count_byte(pWav, '\0');
-                }
-            } else if (pMetadata->type == drwav_metadata_type_unknown && pMetadata->data.unknown.chunkLocation == drwav_metadata_location_inside_info_list) {
-                if (pMetadata->data.unknown.dataSizeInBytes) {
-                    subchunkSize = pMetadata->data.unknown.dataSizeInBytes;
-
-                    bytesWritten += drwav__write_or_count(pWav, pMetadata->data.unknown.id, 4);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.unknown.dataSizeInBytes);
-                    bytesWritten += drwav__write_or_count(pWav, pMetadata->data.unknown.pData, subchunkSize);
-                }
-            }
-
-            if ((subchunkSize % 2) != 0) {
-                bytesWritten += drwav__write_or_count_byte(pWav, 0);
-            }
-        }
-    }
-
-    if (hasListAdtl) {
-        drwav_uint32 chunkSize = 4; /* start with 4 bytes for "adtl" */
-
-        for (iMetadata = 0; iMetadata < metadataCount; ++iMetadata) {
-            drwav_metadata* pMetadata = &pMetadatas[iMetadata];
-
-            switch (pMetadata->type)
-            {
-                case drwav_metadata_type_list_label:
-                case drwav_metadata_type_list_note:
-                {
-                    chunkSize += 8; /* for id and chunk size */
-                    chunkSize += DRWAV_LIST_LABEL_OR_NOTE_BYTES;
-
-                    if (pMetadata->data.labelOrNote.stringLength > 0) {
-                        chunkSize += pMetadata->data.labelOrNote.stringLength + 1;
-                    }    
-                } break;
-
-                case drwav_metadata_type_list_labelled_cue_region:
-                {
-                    chunkSize += 8; /* for id and chunk size */
-                    chunkSize += DRWAV_LIST_LABELLED_TEXT_BYTES;
-
-                    if (pMetadata->data.labelledCueRegion.stringLength > 0) {
-                        chunkSize += pMetadata->data.labelledCueRegion.stringLength + 1;
-                    }
-                } break;
-
-                case drwav_metadata_type_unknown:
-                {
-                    if (pMetadata->data.unknown.chunkLocation == drwav_metadata_location_inside_adtl_list) {
-                        chunkSize += 8; /* for id and chunk size */
-                        chunkSize += pMetadata->data.unknown.dataSizeInBytes;
-                    }
-                } break;
-
-                default: break;
-            }
-
-            if ((chunkSize % 2) != 0) {
-                chunkSize += 1;
-            }
-        }
-
-        bytesWritten += drwav__write_or_count(pWav, "LIST", 4);
-        bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, chunkSize);
-        bytesWritten += drwav__write_or_count(pWav, "adtl", 4);
-
-        for (iMetadata = 0; iMetadata < metadataCount; ++iMetadata) {
-            drwav_metadata* pMetadata = &pMetadatas[iMetadata];
-            drwav_uint32 subchunkSize = 0;
-
-            switch (pMetadata->type)
-            {
-                case drwav_metadata_type_list_label:
-                case drwav_metadata_type_list_note:
-                {
-                    if (pMetadata->data.labelOrNote.stringLength > 0) {
-                        const char *pID = NULL;
-
-                        if (pMetadata->type == drwav_metadata_type_list_label) {
-                            pID = "labl";
-                        }
-                        else if (pMetadata->type == drwav_metadata_type_list_note) {
-                            pID = "note";
-                        }
-
-                        DRWAV_ASSERT(pID != NULL);
-                        DRWAV_ASSERT(pMetadata->data.labelOrNote.pString != NULL);
-
-                        subchunkSize = DRWAV_LIST_LABEL_OR_NOTE_BYTES;
-
-                        bytesWritten += drwav__write_or_count(pWav, pID, 4);
-                        subchunkSize += pMetadata->data.labelOrNote.stringLength + 1;
-                        bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, subchunkSize);
-
-                        bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.labelOrNote.cuePointId);
-                        bytesWritten += drwav__write_or_count(pWav, pMetadata->data.labelOrNote.pString, pMetadata->data.labelOrNote.stringLength);
-                        bytesWritten += drwav__write_or_count_byte(pWav, '\0');
-                    }
-                } break;
-
-                case drwav_metadata_type_list_labelled_cue_region:
-                {
-                    subchunkSize = DRWAV_LIST_LABELLED_TEXT_BYTES;
-
-                    bytesWritten += drwav__write_or_count(pWav, "ltxt", 4);
-                    if (pMetadata->data.labelledCueRegion.stringLength > 0) {
-                        subchunkSize += pMetadata->data.labelledCueRegion.stringLength + 1;
-                    }
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, subchunkSize);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.labelledCueRegion.cuePointId);
-                    bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, pMetadata->data.labelledCueRegion.sampleLength);
-                    bytesWritten += drwav__write_or_count(pWav, pMetadata->data.labelledCueRegion.purposeId, 4);
-                    bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.labelledCueRegion.country);
-                    bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.labelledCueRegion.language);
-                    bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.labelledCueRegion.dialect);
-                    bytesWritten += drwav__write_or_count_u16ne_to_le(pWav, pMetadata->data.labelledCueRegion.codePage);
-
-                    if (pMetadata->data.labelledCueRegion.stringLength > 0) {
-                        DRWAV_ASSERT(pMetadata->data.labelledCueRegion.pString != NULL);
-
-                        bytesWritten += drwav__write_or_count(pWav, pMetadata->data.labelledCueRegion.pString, pMetadata->data.labelledCueRegion.stringLength);
-                        bytesWritten += drwav__write_or_count_byte(pWav, '\0');
-                    }
-                } break;
-
-                case drwav_metadata_type_unknown:
-                {
-                    if (pMetadata->data.unknown.chunkLocation == drwav_metadata_location_inside_adtl_list) {
-                        subchunkSize = pMetadata->data.unknown.dataSizeInBytes;
-
-                        DRWAV_ASSERT(pMetadata->data.unknown.pData != NULL);
-                        bytesWritten += drwav__write_or_count(pWav, pMetadata->data.unknown.id, 4);
-                        bytesWritten += drwav__write_or_count_u32ne_to_le(pWav, subchunkSize);
-                        bytesWritten += drwav__write_or_count(pWav, pMetadata->data.unknown.pData, subchunkSize);
-                    }
-                } break;
-
-                default: break;
-            }
-
-            if ((subchunkSize % 2) != 0) {
-                bytesWritten += drwav__write_or_count_byte(pWav, 0);
-            }
-        }
-    }
-
-    DRWAV_ASSERT((bytesWritten % 2) == 0);
-
-    return bytesWritten;
-}
-
-DRWAV_PRIVATE drwav_uint32 drwav__riff_chunk_size_riff(drwav_uint64 dataChunkSize, drwav_metadata* pMetadata, drwav_uint32 metadataCount)
-{
-    drwav_uint64 chunkSize = 4 + 24 + (drwav_uint64)drwav__write_or_count_metadata(NULL, pMetadata, metadataCount) + 8 + dataChunkSize + drwav__chunk_padding_size_riff(dataChunkSize); /* 4 = "WAVE". 24 = "fmt " chunk. 8 = "data" + u32 data size. */
-    if (chunkSize > 0xFFFFFFFFUL) {
-        chunkSize = 0xFFFFFFFFUL;
-    }
-
-    return (drwav_uint32)chunkSize; /* Safe cast due to the clamp above. */
-}
-
-DRWAV_PRIVATE drwav_uint32 drwav__data_chunk_size_riff(drwav_uint64 dataChunkSize)
-{
-    if (dataChunkSize <= 0xFFFFFFFFUL) {
-        return (drwav_uint32)dataChunkSize;
-    } else {
-        return 0xFFFFFFFFUL;
-    }
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__riff_chunk_size_w64(drwav_uint64 dataChunkSize)
-{
-    drwav_uint64 dataSubchunkPaddingSize = drwav__chunk_padding_size_w64(dataChunkSize);
-
-    return 80 + 24 + dataChunkSize + dataSubchunkPaddingSize;   /* +24 because W64 includes the size of the GUID and size fields. */
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__data_chunk_size_w64(drwav_uint64 dataChunkSize)
-{
-    return 24 + dataChunkSize;        /* +24 because W64 includes the size of the GUID and size fields. */
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__riff_chunk_size_rf64(drwav_uint64 dataChunkSize, drwav_metadata *metadata, drwav_uint32 numMetadata)
-{
-    drwav_uint64 chunkSize = 4 + 36 + 24 + (drwav_uint64)drwav__write_or_count_metadata(NULL, metadata, numMetadata) + 8 + dataChunkSize + drwav__chunk_padding_size_riff(dataChunkSize); /* 4 = "WAVE". 36 = "ds64" chunk. 24 = "fmt " chunk. 8 = "data" + u32 data size. */
-    if (chunkSize > 0xFFFFFFFFUL) {
-        chunkSize = 0xFFFFFFFFUL;
-    }
-
-    return chunkSize;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav__data_chunk_size_rf64(drwav_uint64 dataChunkSize)
-{
-    return dataChunkSize;
-}
-
-
-
-DRWAV_PRIVATE drwav_bool32 drwav_preinit_write(drwav* pWav, const drwav_data_format* pFormat, drwav_bool32 isSequential, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pWav == NULL || onWrite == NULL) {
-        return DRWAV_FALSE;
-    }
-
-    if (!isSequential && onSeek == NULL) {
-        return DRWAV_FALSE; /* <-- onSeek is required when in non-sequential mode. */
-    }
-
-    /* Not currently supporting compressed formats. Will need to add support for the "fact" chunk before we enable this. */
-    if (pFormat->format == DR_WAVE_FORMAT_EXTENSIBLE) {
-        return DRWAV_FALSE;
-    }
-    if (pFormat->format == DR_WAVE_FORMAT_ADPCM || pFormat->format == DR_WAVE_FORMAT_DVI_ADPCM) {
-        return DRWAV_FALSE;
-    }
-
-    DRWAV_ZERO_MEMORY(pWav, sizeof(*pWav));
-    pWav->onWrite   = onWrite;
-    pWav->onSeek    = onSeek;
-    pWav->pUserData = pUserData;
-    pWav->allocationCallbacks = drwav_copy_allocation_callbacks_or_defaults(pAllocationCallbacks);
-
-    if (pWav->allocationCallbacks.onFree == NULL || (pWav->allocationCallbacks.onMalloc == NULL && pWav->allocationCallbacks.onRealloc == NULL)) {
-        return DRWAV_FALSE;    /* Invalid allocation callbacks. */
-    }
-
-    pWav->fmt.formatTag = (drwav_uint16)pFormat->format;
-    pWav->fmt.channels = (drwav_uint16)pFormat->channels;
-    pWav->fmt.sampleRate = pFormat->sampleRate;
-    pWav->fmt.avgBytesPerSec = (drwav_uint32)((pFormat->bitsPerSample * pFormat->sampleRate * pFormat->channels) / 8);
-    pWav->fmt.blockAlign = (drwav_uint16)((pFormat->channels * pFormat->bitsPerSample) / 8);
-    pWav->fmt.bitsPerSample = (drwav_uint16)pFormat->bitsPerSample;
-    pWav->fmt.extendedSize = 0;
-    pWav->isSequentialWrite = isSequential;
-
-    return DRWAV_TRUE;
-}
-
-
-DRWAV_PRIVATE drwav_bool32 drwav_init_write__internal(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount)
-{
-    /* The function assumes drwav_preinit_write() was called beforehand. */
-
-    size_t runningPos = 0;
-    drwav_uint64 initialDataChunkSize = 0;
-    drwav_uint64 chunkSizeFMT;
-
-    /*
-    The initial values for the "RIFF" and "data" chunks depends on whether or not we are initializing in sequential mode or not. In
-    sequential mode we set this to its final values straight away since they can be calculated from the total sample count. In non-
-    sequential mode we initialize it all to zero and fill it out in drwav_uninit() using a backwards seek.
-    */
-    if (pWav->isSequentialWrite) {
-        initialDataChunkSize = (totalSampleCount * pWav->fmt.bitsPerSample) / 8;
-
-        /*
-        The RIFF container has a limit on the number of samples. drwav is not allowing this. There's no practical limits for Wave64
-        so for the sake of simplicity I'm not doing any validation for that.
-        */
-        if (pFormat->container == drwav_container_riff) {
-            if (initialDataChunkSize > (0xFFFFFFFFUL - 36)) {
-                return DRWAV_FALSE; /* Not enough room to store every sample. */
-            }
-        }
-    }
-
-    pWav->dataChunkDataSizeTargetWrite = initialDataChunkSize;
-
-
-    /* "RIFF" chunk. */
-    if (pFormat->container == drwav_container_riff) {
-        drwav_uint32 chunkSizeRIFF = 28 + (drwav_uint32)initialDataChunkSize;   /* +28 = "WAVE" + [sizeof "fmt " chunk] */
-        runningPos += drwav__write(pWav, "RIFF", 4);
-        runningPos += drwav__write_u32ne_to_le(pWav, chunkSizeRIFF);
-        runningPos += drwav__write(pWav, "WAVE", 4);
-    } else if (pFormat->container == drwav_container_w64) {
-        drwav_uint64 chunkSizeRIFF = 80 + 24 + initialDataChunkSize;            /* +24 because W64 includes the size of the GUID and size fields. */
-        runningPos += drwav__write(pWav, drwavGUID_W64_RIFF, 16);
-        runningPos += drwav__write_u64ne_to_le(pWav, chunkSizeRIFF);
-        runningPos += drwav__write(pWav, drwavGUID_W64_WAVE, 16);
-    } else if (pFormat->container == drwav_container_rf64) {
-        runningPos += drwav__write(pWav, "RF64", 4);
-        runningPos += drwav__write_u32ne_to_le(pWav, 0xFFFFFFFF);               /* Always 0xFFFFFFFF for RF64. Set to a proper value in the "ds64" chunk. */
-        runningPos += drwav__write(pWav, "WAVE", 4);
-    }
-
-
-    /* "ds64" chunk (RF64 only). */
-    if (pFormat->container == drwav_container_rf64) {
-        drwav_uint32 initialds64ChunkSize = 28;                                 /* 28 = [Size of RIFF (8 bytes)] + [Size of DATA (8 bytes)] + [Sample Count (8 bytes)] + [Table Length (4 bytes)]. Table length always set to 0. */
-        drwav_uint64 initialRiffChunkSize = 8 + initialds64ChunkSize + initialDataChunkSize;    /* +8 for the ds64 header. */
-
-        runningPos += drwav__write(pWav, "ds64", 4);
-        runningPos += drwav__write_u32ne_to_le(pWav, initialds64ChunkSize);     /* Size of ds64. */
-        runningPos += drwav__write_u64ne_to_le(pWav, initialRiffChunkSize);     /* Size of RIFF. Set to true value at the end. */
-        runningPos += drwav__write_u64ne_to_le(pWav, initialDataChunkSize);     /* Size of DATA. Set to true value at the end. */
-        runningPos += drwav__write_u64ne_to_le(pWav, totalSampleCount);         /* Sample count. */
-        runningPos += drwav__write_u32ne_to_le(pWav, 0);                        /* Table length. Always set to zero in our case since we're not doing any other chunks than "DATA". */
-    }
-
-
-    /* "fmt " chunk. */
-    if (pFormat->container == drwav_container_riff || pFormat->container == drwav_container_rf64) {
-        chunkSizeFMT = 16;
-        runningPos += drwav__write(pWav, "fmt ", 4);
-        runningPos += drwav__write_u32ne_to_le(pWav, (drwav_uint32)chunkSizeFMT);
-    } else if (pFormat->container == drwav_container_w64) {
-        chunkSizeFMT = 40;
-        runningPos += drwav__write(pWav, drwavGUID_W64_FMT, 16);
-        runningPos += drwav__write_u64ne_to_le(pWav, chunkSizeFMT);
-    }
-
-    runningPos += drwav__write_u16ne_to_le(pWav, pWav->fmt.formatTag);
-    runningPos += drwav__write_u16ne_to_le(pWav, pWav->fmt.channels);
-    runningPos += drwav__write_u32ne_to_le(pWav, pWav->fmt.sampleRate);
-    runningPos += drwav__write_u32ne_to_le(pWav, pWav->fmt.avgBytesPerSec);
-    runningPos += drwav__write_u16ne_to_le(pWav, pWav->fmt.blockAlign);
-    runningPos += drwav__write_u16ne_to_le(pWav, pWav->fmt.bitsPerSample);
-
-    /* TODO: is a 'fact' chunk required for DR_WAVE_FORMAT_IEEE_FLOAT? */
-
-    if (!pWav->isSequentialWrite && pWav->pMetadata != NULL && pWav->metadataCount > 0 && (pFormat->container == drwav_container_riff || pFormat->container == drwav_container_rf64)) {
-        runningPos += drwav__write_or_count_metadata(pWav, pWav->pMetadata, pWav->metadataCount);
-    }
-
-    pWav->dataChunkDataPos = runningPos;
-
-    /* "data" chunk. */
-    if (pFormat->container == drwav_container_riff) {
-        drwav_uint32 chunkSizeDATA = (drwav_uint32)initialDataChunkSize;
-        runningPos += drwav__write(pWav, "data", 4);
-        runningPos += drwav__write_u32ne_to_le(pWav, chunkSizeDATA);
-    } else if (pFormat->container == drwav_container_w64) {
-        drwav_uint64 chunkSizeDATA = 24 + initialDataChunkSize;     /* +24 because W64 includes the size of the GUID and size fields. */
-        runningPos += drwav__write(pWav, drwavGUID_W64_DATA, 16);
-        runningPos += drwav__write_u64ne_to_le(pWav, chunkSizeDATA);
-    } else if (pFormat->container == drwav_container_rf64) {
-        runningPos += drwav__write(pWav, "data", 4);
-        runningPos += drwav__write_u32ne_to_le(pWav, 0xFFFFFFFF);   /* Always set to 0xFFFFFFFF for RF64. The true size of the data chunk is specified in the ds64 chunk. */
-    }
-
-    /* Set some properties for the client's convenience. */
-    pWav->container = pFormat->container;
-    pWav->channels = (drwav_uint16)pFormat->channels;
-    pWav->sampleRate = pFormat->sampleRate;
-    pWav->bitsPerSample = (drwav_uint16)pFormat->bitsPerSample;
-    pWav->translatedFormatTag = (drwav_uint16)pFormat->format;
-    pWav->dataChunkDataPos = runningPos;
-
-    return DRWAV_TRUE;
-}
-
-
-DRWAV_API drwav_bool32 drwav_init_write(drwav* pWav, const drwav_data_format* pFormat, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (!drwav_preinit_write(pWav, pFormat, DRWAV_FALSE, onWrite, onSeek, pUserData, pAllocationCallbacks)) {
-        return DRWAV_FALSE;
-    }
-
-    return drwav_init_write__internal(pWav, pFormat, 0);               /* DRWAV_FALSE = Not Sequential */
-}
-
-DRWAV_API drwav_bool32 drwav_init_write_sequential(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_write_proc onWrite, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (!drwav_preinit_write(pWav, pFormat, DRWAV_TRUE, onWrite, NULL, pUserData, pAllocationCallbacks)) {
-        return DRWAV_FALSE;
-    }
-
-    return drwav_init_write__internal(pWav, pFormat, totalSampleCount); /* DRWAV_TRUE = Sequential */
-}
-
-DRWAV_API drwav_bool32 drwav_init_write_sequential_pcm_frames(drwav* pWav, const drwav_data_format* pFormat, drwav_uint64 totalPCMFrameCount, drwav_write_proc onWrite, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pFormat == NULL) {
-        return DRWAV_FALSE;
-    }
-
-    return drwav_init_write_sequential(pWav, pFormat, totalPCMFrameCount*pFormat->channels, onWrite, pUserData, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_write_with_metadata(drwav* pWav, const drwav_data_format* pFormat, drwav_write_proc onWrite, drwav_seek_proc onSeek, void* pUserData, const drwav_allocation_callbacks* pAllocationCallbacks, drwav_metadata* pMetadata, drwav_uint32 metadataCount)
-{
-    if (!drwav_preinit_write(pWav, pFormat, DRWAV_FALSE, onWrite, onSeek, pUserData, pAllocationCallbacks)) {
-        return DRWAV_FALSE;
-    }
-
-    pWav->pMetadata     = pMetadata;
-    pWav->metadataCount = metadataCount;
-
-    return drwav_init_write__internal(pWav, pFormat, 0);
-}
-
-
-DRWAV_API drwav_uint64 drwav_target_write_size_bytes(const drwav_data_format* pFormat, drwav_uint64 totalFrameCount, drwav_metadata* pMetadata, drwav_uint32 metadataCount)
-{
-    /* Casting totalFrameCount to drwav_int64 for VC6 compatibility. No issues in practice because nobody is going to exhaust the whole 63 bits. */
-    drwav_uint64 targetDataSizeBytes = (drwav_uint64)((drwav_int64)totalFrameCount * pFormat->channels * pFormat->bitsPerSample/8.0);
-    drwav_uint64 riffChunkSizeBytes;
-    drwav_uint64 fileSizeBytes = 0;
-
-    if (pFormat->container == drwav_container_riff) {
-        riffChunkSizeBytes = drwav__riff_chunk_size_riff(targetDataSizeBytes, pMetadata, metadataCount);
-        fileSizeBytes = (8 + riffChunkSizeBytes);   /* +8 because WAV doesn't include the size of the ChunkID and ChunkSize fields. */
-    } else if (pFormat->container == drwav_container_w64) {
-        riffChunkSizeBytes = drwav__riff_chunk_size_w64(targetDataSizeBytes);
-        fileSizeBytes = riffChunkSizeBytes;
-    } else if (pFormat->container == drwav_container_rf64) {
-        riffChunkSizeBytes = drwav__riff_chunk_size_rf64(targetDataSizeBytes, pMetadata, metadataCount);
-        fileSizeBytes = (8 + riffChunkSizeBytes);   /* +8 because WAV doesn't include the size of the ChunkID and ChunkSize fields. */
-    }
-
-    return fileSizeBytes;
-}
-
-
-#ifndef DR_WAV_NO_STDIO
-
-/* drwav_result_from_errno() is only used for fopen() and wfopen() so putting it inside DR_WAV_NO_STDIO for now. If something else needs this later we can move it out. */
-#include <errno.h>
-DRWAV_PRIVATE drwav_result drwav_result_from_errno(int e)
-{
-    switch (e)
-    {
-        case 0: return DRWAV_SUCCESS;
-    #ifdef EPERM
-        case EPERM: return DRWAV_INVALID_OPERATION;
-    #endif
-    #ifdef ENOENT
-        case ENOENT: return DRWAV_DOES_NOT_EXIST;
-    #endif
-    #ifdef ESRCH
-        case ESRCH: return DRWAV_DOES_NOT_EXIST;
-    #endif
-    #ifdef EINTR
-        case EINTR: return DRWAV_INTERRUPT;
-    #endif
-    #ifdef EIO
-        case EIO: return DRWAV_IO_ERROR;
-    #endif
-    #ifdef ENXIO
-        case ENXIO: return DRWAV_DOES_NOT_EXIST;
-    #endif
-    #ifdef E2BIG
-        case E2BIG: return DRWAV_INVALID_ARGS;
-    #endif
-    #ifdef ENOEXEC
-        case ENOEXEC: return DRWAV_INVALID_FILE;
-    #endif
-    #ifdef EBADF
-        case EBADF: return DRWAV_INVALID_FILE;
-    #endif
-    #ifdef ECHILD
-        case ECHILD: return DRWAV_ERROR;
-    #endif
-    #ifdef EAGAIN
-        case EAGAIN: return DRWAV_UNAVAILABLE;
-    #endif
-    #ifdef ENOMEM
-        case ENOMEM: return DRWAV_OUT_OF_MEMORY;
-    #endif
-    #ifdef EACCES
-        case EACCES: return DRWAV_ACCESS_DENIED;
-    #endif
-    #ifdef EFAULT
-        case EFAULT: return DRWAV_BAD_ADDRESS;
-    #endif
-    #ifdef ENOTBLK
-        case ENOTBLK: return DRWAV_ERROR;
-    #endif
-    #ifdef EBUSY
-        case EBUSY: return DRWAV_BUSY;
-    #endif
-    #ifdef EEXIST
-        case EEXIST: return DRWAV_ALREADY_EXISTS;
-    #endif
-    #ifdef EXDEV
-        case EXDEV: return DRWAV_ERROR;
-    #endif
-    #ifdef ENODEV
-        case ENODEV: return DRWAV_DOES_NOT_EXIST;
-    #endif
-    #ifdef ENOTDIR
-        case ENOTDIR: return DRWAV_NOT_DIRECTORY;
-    #endif
-    #ifdef EISDIR
-        case EISDIR: return DRWAV_IS_DIRECTORY;
-    #endif
-    #ifdef EINVAL
-        case EINVAL: return DRWAV_INVALID_ARGS;
-    #endif
-    #ifdef ENFILE
-        case ENFILE: return DRWAV_TOO_MANY_OPEN_FILES;
-    #endif
-    #ifdef EMFILE
-        case EMFILE: return DRWAV_TOO_MANY_OPEN_FILES;
-    #endif
-    #ifdef ENOTTY
-        case ENOTTY: return DRWAV_INVALID_OPERATION;
-    #endif
-    #ifdef ETXTBSY
-        case ETXTBSY: return DRWAV_BUSY;
-    #endif
-    #ifdef EFBIG
-        case EFBIG: return DRWAV_TOO_BIG;
-    #endif
-    #ifdef ENOSPC
-        case ENOSPC: return DRWAV_NO_SPACE;
-    #endif
-    #ifdef ESPIPE
-        case ESPIPE: return DRWAV_BAD_SEEK;
-    #endif
-    #ifdef EROFS
-        case EROFS: return DRWAV_ACCESS_DENIED;
-    #endif
-    #ifdef EMLINK
-        case EMLINK: return DRWAV_TOO_MANY_LINKS;
-    #endif
-    #ifdef EPIPE
-        case EPIPE: return DRWAV_BAD_PIPE;
-    #endif
-    #ifdef EDOM
-        case EDOM: return DRWAV_OUT_OF_RANGE;
-    #endif
-    #ifdef ERANGE
-        case ERANGE: return DRWAV_OUT_OF_RANGE;
-    #endif
-    #ifdef EDEADLK
-        case EDEADLK: return DRWAV_DEADLOCK;
-    #endif
-    #ifdef ENAMETOOLONG
-        case ENAMETOOLONG: return DRWAV_PATH_TOO_LONG;
-    #endif
-    #ifdef ENOLCK
-        case ENOLCK: return DRWAV_ERROR;
-    #endif
-    #ifdef ENOSYS
-        case ENOSYS: return DRWAV_NOT_IMPLEMENTED;
-    #endif
-    #ifdef ENOTEMPTY
-        case ENOTEMPTY: return DRWAV_DIRECTORY_NOT_EMPTY;
-    #endif
-    #ifdef ELOOP
-        case ELOOP: return DRWAV_TOO_MANY_LINKS;
-    #endif
-    #ifdef ENOMSG
-        case ENOMSG: return DRWAV_NO_MESSAGE;
-    #endif
-    #ifdef EIDRM
-        case EIDRM: return DRWAV_ERROR;
-    #endif
-    #ifdef ECHRNG
-        case ECHRNG: return DRWAV_ERROR;
-    #endif
-    #ifdef EL2NSYNC
-        case EL2NSYNC: return DRWAV_ERROR;
-    #endif
-    #ifdef EL3HLT
-        case EL3HLT: return DRWAV_ERROR;
-    #endif
-    #ifdef EL3RST
-        case EL3RST: return DRWAV_ERROR;
-    #endif
-    #ifdef ELNRNG
-        case ELNRNG: return DRWAV_OUT_OF_RANGE;
-    #endif
-    #ifdef EUNATCH
-        case EUNATCH: return DRWAV_ERROR;
-    #endif
-    #ifdef ENOCSI
-        case ENOCSI: return DRWAV_ERROR;
-    #endif
-    #ifdef EL2HLT
-        case EL2HLT: return DRWAV_ERROR;
-    #endif
-    #ifdef EBADE
-        case EBADE: return DRWAV_ERROR;
-    #endif
-    #ifdef EBADR
-        case EBADR: return DRWAV_ERROR;
-    #endif
-    #ifdef EXFULL
-        case EXFULL: return DRWAV_ERROR;
-    #endif
-    #ifdef ENOANO
-        case ENOANO: return DRWAV_ERROR;
-    #endif
-    #ifdef EBADRQC
-        case EBADRQC: return DRWAV_ERROR;
-    #endif
-    #ifdef EBADSLT
-        case EBADSLT: return DRWAV_ERROR;
-    #endif
-    #ifdef EBFONT
-        case EBFONT: return DRWAV_INVALID_FILE;
-    #endif
-    #ifdef ENOSTR
-        case ENOSTR: return DRWAV_ERROR;
-    #endif
-    #ifdef ENODATA
-        case ENODATA: return DRWAV_NO_DATA_AVAILABLE;
-    #endif
-    #ifdef ETIME
-        case ETIME: return DRWAV_TIMEOUT;
-    #endif
-    #ifdef ENOSR
-        case ENOSR: return DRWAV_NO_DATA_AVAILABLE;
-    #endif
-    #ifdef ENONET
-        case ENONET: return DRWAV_NO_NETWORK;
-    #endif
-    #ifdef ENOPKG
-        case ENOPKG: return DRWAV_ERROR;
-    #endif
-    #ifdef EREMOTE
-        case EREMOTE: return DRWAV_ERROR;
-    #endif
-    #ifdef ENOLINK
-        case ENOLINK: return DRWAV_ERROR;
-    #endif
-    #ifdef EADV
-        case EADV: return DRWAV_ERROR;
-    #endif
-    #ifdef ESRMNT
-        case ESRMNT: return DRWAV_ERROR;
-    #endif
-    #ifdef ECOMM
-        case ECOMM: return DRWAV_ERROR;
-    #endif
-    #ifdef EPROTO
-        case EPROTO: return DRWAV_ERROR;
-    #endif
-    #ifdef EMULTIHOP
-        case EMULTIHOP: return DRWAV_ERROR;
-    #endif
-    #ifdef EDOTDOT
-        case EDOTDOT: return DRWAV_ERROR;
-    #endif
-    #ifdef EBADMSG
-        case EBADMSG: return DRWAV_BAD_MESSAGE;
-    #endif
-    #ifdef EOVERFLOW
-        case EOVERFLOW: return DRWAV_TOO_BIG;
-    #endif
-    #ifdef ENOTUNIQ
-        case ENOTUNIQ: return DRWAV_NOT_UNIQUE;
-    #endif
-    #ifdef EBADFD
-        case EBADFD: return DRWAV_ERROR;
-    #endif
-    #ifdef EREMCHG
-        case EREMCHG: return DRWAV_ERROR;
-    #endif
-    #ifdef ELIBACC
-        case ELIBACC: return DRWAV_ACCESS_DENIED;
-    #endif
-    #ifdef ELIBBAD
-        case ELIBBAD: return DRWAV_INVALID_FILE;
-    #endif
-    #ifdef ELIBSCN
-        case ELIBSCN: return DRWAV_INVALID_FILE;
-    #endif
-    #ifdef ELIBMAX
-        case ELIBMAX: return DRWAV_ERROR;
-    #endif
-    #ifdef ELIBEXEC
-        case ELIBEXEC: return DRWAV_ERROR;
-    #endif
-    #ifdef EILSEQ
-        case EILSEQ: return DRWAV_INVALID_DATA;
-    #endif
-    #ifdef ERESTART
-        case ERESTART: return DRWAV_ERROR;
-    #endif
-    #ifdef ESTRPIPE
-        case ESTRPIPE: return DRWAV_ERROR;
-    #endif
-    #ifdef EUSERS
-        case EUSERS: return DRWAV_ERROR;
-    #endif
-    #ifdef ENOTSOCK
-        case ENOTSOCK: return DRWAV_NOT_SOCKET;
-    #endif
-    #ifdef EDESTADDRREQ
-        case EDESTADDRREQ: return DRWAV_NO_ADDRESS;
-    #endif
-    #ifdef EMSGSIZE
-        case EMSGSIZE: return DRWAV_TOO_BIG;
-    #endif
-    #ifdef EPROTOTYPE
-        case EPROTOTYPE: return DRWAV_BAD_PROTOCOL;
-    #endif
-    #ifdef ENOPROTOOPT
-        case ENOPROTOOPT: return DRWAV_PROTOCOL_UNAVAILABLE;
-    #endif
-    #ifdef EPROTONOSUPPORT
-        case EPROTONOSUPPORT: return DRWAV_PROTOCOL_NOT_SUPPORTED;
-    #endif
-    #ifdef ESOCKTNOSUPPORT
-        case ESOCKTNOSUPPORT: return DRWAV_SOCKET_NOT_SUPPORTED;
-    #endif
-    #ifdef EOPNOTSUPP
-        case EOPNOTSUPP: return DRWAV_INVALID_OPERATION;
-    #endif
-    #ifdef EPFNOSUPPORT
-        case EPFNOSUPPORT: return DRWAV_PROTOCOL_FAMILY_NOT_SUPPORTED;
-    #endif
-    #ifdef EAFNOSUPPORT
-        case EAFNOSUPPORT: return DRWAV_ADDRESS_FAMILY_NOT_SUPPORTED;
-    #endif
-    #ifdef EADDRINUSE
-        case EADDRINUSE: return DRWAV_ALREADY_IN_USE;
-    #endif
-    #ifdef EADDRNOTAVAIL
-        case EADDRNOTAVAIL: return DRWAV_ERROR;
-    #endif
-    #ifdef ENETDOWN
-        case ENETDOWN: return DRWAV_NO_NETWORK;
-    #endif
-    #ifdef ENETUNREACH
-        case ENETUNREACH: return DRWAV_NO_NETWORK;
-    #endif
-    #ifdef ENETRESET
-        case ENETRESET: return DRWAV_NO_NETWORK;
-    #endif
-    #ifdef ECONNABORTED
-        case ECONNABORTED: return DRWAV_NO_NETWORK;
-    #endif
-    #ifdef ECONNRESET
-        case ECONNRESET: return DRWAV_CONNECTION_RESET;
-    #endif
-    #ifdef ENOBUFS
-        case ENOBUFS: return DRWAV_NO_SPACE;
-    #endif
-    #ifdef EISCONN
-        case EISCONN: return DRWAV_ALREADY_CONNECTED;
-    #endif
-    #ifdef ENOTCONN
-        case ENOTCONN: return DRWAV_NOT_CONNECTED;
-    #endif
-    #ifdef ESHUTDOWN
-        case ESHUTDOWN: return DRWAV_ERROR;
-    #endif
-    #ifdef ETOOMANYREFS
-        case ETOOMANYREFS: return DRWAV_ERROR;
-    #endif
-    #ifdef ETIMEDOUT
-        case ETIMEDOUT: return DRWAV_TIMEOUT;
-    #endif
-    #ifdef ECONNREFUSED
-        case ECONNREFUSED: return DRWAV_CONNECTION_REFUSED;
-    #endif
-    #ifdef EHOSTDOWN
-        case EHOSTDOWN: return DRWAV_NO_HOST;
-    #endif
-    #ifdef EHOSTUNREACH
-        case EHOSTUNREACH: return DRWAV_NO_HOST;
-    #endif
-    #ifdef EALREADY
-        case EALREADY: return DRWAV_IN_PROGRESS;
-    #endif
-    #ifdef EINPROGRESS
-        case EINPROGRESS: return DRWAV_IN_PROGRESS;
-    #endif
-    #ifdef ESTALE
-        case ESTALE: return DRWAV_INVALID_FILE;
-    #endif
-    #ifdef EUCLEAN
-        case EUCLEAN: return DRWAV_ERROR;
-    #endif
-    #ifdef ENOTNAM
-        case ENOTNAM: return DRWAV_ERROR;
-    #endif
-    #ifdef ENAVAIL
-        case ENAVAIL: return DRWAV_ERROR;
-    #endif
-    #ifdef EISNAM
-        case EISNAM: return DRWAV_ERROR;
-    #endif
-    #ifdef EREMOTEIO
-        case EREMOTEIO: return DRWAV_IO_ERROR;
-    #endif
-    #ifdef EDQUOT
-        case EDQUOT: return DRWAV_NO_SPACE;
-    #endif
-    #ifdef ENOMEDIUM
-        case ENOMEDIUM: return DRWAV_DOES_NOT_EXIST;
-    #endif
-    #ifdef EMEDIUMTYPE
-        case EMEDIUMTYPE: return DRWAV_ERROR;
-    #endif
-    #ifdef ECANCELED
-        case ECANCELED: return DRWAV_CANCELLED;
-    #endif
-    #ifdef ENOKEY
-        case ENOKEY: return DRWAV_ERROR;
-    #endif
-    #ifdef EKEYEXPIRED
-        case EKEYEXPIRED: return DRWAV_ERROR;
-    #endif
-    #ifdef EKEYREVOKED
-        case EKEYREVOKED: return DRWAV_ERROR;
-    #endif
-    #ifdef EKEYREJECTED
-        case EKEYREJECTED: return DRWAV_ERROR;
-    #endif
-    #ifdef EOWNERDEAD
-        case EOWNERDEAD: return DRWAV_ERROR;
-    #endif
-    #ifdef ENOTRECOVERABLE
-        case ENOTRECOVERABLE: return DRWAV_ERROR;
-    #endif
-    #ifdef ERFKILL
-        case ERFKILL: return DRWAV_ERROR;
-    #endif
-    #ifdef EHWPOISON
-        case EHWPOISON: return DRWAV_ERROR;
-    #endif
-        default: return DRWAV_ERROR;
-    }
-}
-
-DRWAV_PRIVATE drwav_result drwav_fopen(FILE** ppFile, const char* pFilePath, const char* pOpenMode)
-{
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-    errno_t err;
-#endif
-
-    if (ppFile != NULL) {
-        *ppFile = NULL;  /* Safety. */
-    }
-
-    if (pFilePath == NULL || pOpenMode == NULL || ppFile == NULL) {
-        return DRWAV_INVALID_ARGS;
-    }
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-    err = fopen_s(ppFile, pFilePath, pOpenMode);
-    if (err != 0) {
-        return drwav_result_from_errno(err);
-    }
-#else
-#if defined(_WIN32) || defined(__APPLE__)
-    *ppFile = fopen(pFilePath, pOpenMode);
-#else
-    #if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 && defined(_LARGEFILE64_SOURCE)
-        *ppFile = fopen64(pFilePath, pOpenMode);
-    #else
-        *ppFile = fopen(pFilePath, pOpenMode);
-    #endif
-#endif
-    if (*ppFile == NULL) {
-        drwav_result result = drwav_result_from_errno(errno);
-        if (result == DRWAV_SUCCESS) {
-            result = DRWAV_ERROR;   /* Just a safety check to make sure we never ever return success when pFile == NULL. */
-        }
-
-        return result;
-    }
-#endif
-
-    return DRWAV_SUCCESS;
-}
-
-/*
-_wfopen() isn't always available in all compilation environments.
-
-    * Windows only.
-    * MSVC seems to support it universally as far back as VC6 from what I can tell (haven't checked further back).
-    * MinGW-64 (both 32- and 64-bit) seems to support it.
-    * MinGW wraps it in !defined(__STRICT_ANSI__).
-    * OpenWatcom wraps it in !defined(_NO_EXT_KEYS).
-
-This can be reviewed as compatibility issues arise. The preference is to use _wfopen_s() and _wfopen() as opposed to the wcsrtombs()
-fallback, so if you notice your compiler not detecting this properly I'm happy to look at adding support.
-*/
-#if defined(_WIN32)
-    #if defined(_MSC_VER) || defined(__MINGW64__) || (!defined(__STRICT_ANSI__) && !defined(_NO_EXT_KEYS))
-        #define DRWAV_HAS_WFOPEN
-    #endif
-#endif
-
-#ifndef DR_WAV_NO_WCHAR
-DRWAV_PRIVATE drwav_result drwav_wfopen(FILE** ppFile, const wchar_t* pFilePath, const wchar_t* pOpenMode, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (ppFile != NULL) {
-        *ppFile = NULL;  /* Safety. */
-    }
-
-    if (pFilePath == NULL || pOpenMode == NULL || ppFile == NULL) {
-        return DRWAV_INVALID_ARGS;
-    }
-
-#if defined(DRWAV_HAS_WFOPEN)
-    {
-        /* Use _wfopen() on Windows. */
-    #if defined(_MSC_VER) && _MSC_VER >= 1400
-        errno_t err = _wfopen_s(ppFile, pFilePath, pOpenMode);
-        if (err != 0) {
-            return drwav_result_from_errno(err);
-        }
-    #else
-        *ppFile = _wfopen(pFilePath, pOpenMode);
-        if (*ppFile == NULL) {
-            return drwav_result_from_errno(errno);
-        }
-    #endif
-        (void)pAllocationCallbacks;
-    }
-#else
-	/*
-    Use fopen() on anything other than Windows. Requires a conversion. This is annoying because
-	fopen() is locale specific. The only real way I can think of to do this is with wcsrtombs(). Note
-	that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for
-    maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler
-	error I'll look into improving compatibility.
-    */
-
-	/*
-	Some compilers don't support wchar_t or wcsrtombs() which we're using below. In this case we just
-	need to abort with an error. If you encounter a compiler lacking such support, add it to this list
-	and submit a bug report and it'll be added to the library upstream.
-	*/
-	#if defined(__DJGPP__)
-	{
-		/* Nothing to do here. This will fall through to the error check below. */
-	}
-	#else
-    {
-        mbstate_t mbs;
-        size_t lenMB;
-        const wchar_t* pFilePathTemp = pFilePath;
-        char* pFilePathMB = NULL;
-        char pOpenModeMB[32] = {0};
-
-        /* Get the length first. */
-        DRWAV_ZERO_OBJECT(&mbs);
-        lenMB = wcsrtombs(NULL, &pFilePathTemp, 0, &mbs);
-        if (lenMB == (size_t)-1) {
-            return drwav_result_from_errno(errno);
-        }
-
-        pFilePathMB = (char*)drwav__malloc_from_callbacks(lenMB + 1, pAllocationCallbacks);
-        if (pFilePathMB == NULL) {
-            return DRWAV_OUT_OF_MEMORY;
-        }
-
-        pFilePathTemp = pFilePath;
-        DRWAV_ZERO_OBJECT(&mbs);
-        wcsrtombs(pFilePathMB, &pFilePathTemp, lenMB + 1, &mbs);
-
-        /* The open mode should always consist of ASCII characters so we should be able to do a trivial conversion. */
-        {
-            size_t i = 0;
-            for (;;) {
-                if (pOpenMode[i] == 0) {
-                    pOpenModeMB[i] = '\0';
-                    break;
-                }
-
-                pOpenModeMB[i] = (char)pOpenMode[i];
-                i += 1;
-            }
-        }
-
-        *ppFile = fopen(pFilePathMB, pOpenModeMB);
-
-        drwav__free_from_callbacks(pFilePathMB, pAllocationCallbacks);
-    }
-	#endif
-
-    if (*ppFile == NULL) {
-        return DRWAV_ERROR;
-    }
-#endif
-
-    return DRWAV_SUCCESS;
-}
-#endif
-
-
-DRWAV_PRIVATE size_t drwav__on_read_stdio(void* pUserData, void* pBufferOut, size_t bytesToRead)
-{
-    return fread(pBufferOut, 1, bytesToRead, (FILE*)pUserData);
-}
-
-DRWAV_PRIVATE size_t drwav__on_write_stdio(void* pUserData, const void* pData, size_t bytesToWrite)
-{
-    return fwrite(pData, 1, bytesToWrite, (FILE*)pUserData);
-}
-
-DRWAV_PRIVATE drwav_bool32 drwav__on_seek_stdio(void* pUserData, int offset, drwav_seek_origin origin)
-{
-    return fseek((FILE*)pUserData, offset, (origin == drwav_seek_origin_current) ? SEEK_CUR : SEEK_SET) == 0;
-}
-
-DRWAV_API drwav_bool32 drwav_init_file(drwav* pWav, const char* filename, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_file_ex(pWav, filename, NULL, NULL, 0, pAllocationCallbacks);
-}
-
-
-DRWAV_PRIVATE drwav_bool32 drwav_init_file__internal_FILE(drwav* pWav, FILE* pFile, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags, drwav_metadata_type allowedMetadataTypes, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav_bool32 result;
-
-    result = drwav_preinit(pWav, drwav__on_read_stdio, drwav__on_seek_stdio, (void*)pFile, pAllocationCallbacks);
-    if (result != DRWAV_TRUE) {
-        fclose(pFile);
-        return result;
-    }
-    
-    pWav->allowedMetadataTypes = allowedMetadataTypes;
-
-    result = drwav_init__internal(pWav, onChunk, pChunkUserData, flags);
-    if (result != DRWAV_TRUE) {
-        fclose(pFile);
-        return result;
-    }
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_API drwav_bool32 drwav_init_file_ex(drwav* pWav, const char* filename, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    FILE* pFile;
-    if (drwav_fopen(&pFile, filename, "rb") != DRWAV_SUCCESS) {
-        return DRWAV_FALSE;
-    }
-
-    /* This takes ownership of the FILE* object. */
-    return drwav_init_file__internal_FILE(pWav, pFile, onChunk, pChunkUserData, flags, drwav_metadata_type_none, pAllocationCallbacks);
-}
-
-#ifndef DR_WAV_NO_WCHAR
-DRWAV_API drwav_bool32 drwav_init_file_w(drwav* pWav, const wchar_t* filename, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_file_ex_w(pWav, filename, NULL, NULL, 0, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_file_ex_w(drwav* pWav, const wchar_t* filename, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    FILE* pFile;
-    if (drwav_wfopen(&pFile, filename, L"rb", pAllocationCallbacks) != DRWAV_SUCCESS) {
-        return DRWAV_FALSE;
-    }
-
-    /* This takes ownership of the FILE* object. */
-    return drwav_init_file__internal_FILE(pWav, pFile, onChunk, pChunkUserData, flags, drwav_metadata_type_none, pAllocationCallbacks);
-}
-#endif
-
-DRWAV_API drwav_bool32 drwav_init_file_with_metadata(drwav* pWav, const char* filename, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    FILE* pFile;
-    if (drwav_fopen(&pFile, filename, "rb") != DRWAV_SUCCESS) {
-        return DRWAV_FALSE;
-    }
-
-    /* This takes ownership of the FILE* object. */
-    return drwav_init_file__internal_FILE(pWav, pFile, NULL, NULL, flags, drwav_metadata_type_all_including_unknown, pAllocationCallbacks);
-}
-
-#ifndef DR_WAV_NO_WCHAR
-DRWAV_API drwav_bool32 drwav_init_file_with_metadata_w(drwav* pWav, const wchar_t* filename, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    FILE* pFile;
-    if (drwav_wfopen(&pFile, filename, L"rb", pAllocationCallbacks) != DRWAV_SUCCESS) {
-        return DRWAV_FALSE;
-    }
-
-    /* This takes ownership of the FILE* object. */
-    return drwav_init_file__internal_FILE(pWav, pFile, NULL, NULL, flags, drwav_metadata_type_all_including_unknown, pAllocationCallbacks);
-}
-#endif
-
-
-DRWAV_PRIVATE drwav_bool32 drwav_init_file_write__internal_FILE(drwav* pWav, FILE* pFile, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav_bool32 result;
-
-    result = drwav_preinit_write(pWav, pFormat, isSequential, drwav__on_write_stdio, drwav__on_seek_stdio, (void*)pFile, pAllocationCallbacks);
-    if (result != DRWAV_TRUE) {
-        fclose(pFile);
-        return result;
-    }
-
-    result = drwav_init_write__internal(pWav, pFormat, totalSampleCount);
-    if (result != DRWAV_TRUE) {
-        fclose(pFile);
-        return result;
-    }
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_PRIVATE drwav_bool32 drwav_init_file_write__internal(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    FILE* pFile;
-    if (drwav_fopen(&pFile, filename, "wb") != DRWAV_SUCCESS) {
-        return DRWAV_FALSE;
-    }
-
-    /* This takes ownership of the FILE* object. */
-    return drwav_init_file_write__internal_FILE(pWav, pFile, pFormat, totalSampleCount, isSequential, pAllocationCallbacks);
-}
-
-#ifndef DR_WAV_NO_WCHAR
-DRWAV_PRIVATE drwav_bool32 drwav_init_file_write_w__internal(drwav* pWav, const wchar_t* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    FILE* pFile;
-    if (drwav_wfopen(&pFile, filename, L"wb", pAllocationCallbacks) != DRWAV_SUCCESS) {
-        return DRWAV_FALSE;
-    }
-
-    /* This takes ownership of the FILE* object. */
-    return drwav_init_file_write__internal_FILE(pWav, pFile, pFormat, totalSampleCount, isSequential, pAllocationCallbacks);
-}
-#endif
-
-DRWAV_API drwav_bool32 drwav_init_file_write(drwav* pWav, const char* filename, const drwav_data_format* pFormat, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_file_write__internal(pWav, filename, pFormat, 0, DRWAV_FALSE, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_file_write_sequential(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_file_write__internal(pWav, filename, pFormat, totalSampleCount, DRWAV_TRUE, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_file_write_sequential_pcm_frames(drwav* pWav, const char* filename, const drwav_data_format* pFormat, drwav_uint64 totalPCMFrameCount, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pFormat == NULL) {
-        return DRWAV_FALSE;
-    }
-
-    return drwav_init_file_write_sequential(pWav, filename, pFormat, totalPCMFrameCount*pFormat->channels, pAllocationCallbacks);
-}
-
-#ifndef DR_WAV_NO_WCHAR
-DRWAV_API drwav_bool32 drwav_init_file_write_w(drwav* pWav, const wchar_t* filename, const drwav_data_format* pFormat, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_file_write_w__internal(pWav, filename, pFormat, 0, DRWAV_FALSE, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_file_write_sequential_w(drwav* pWav, const wchar_t* filename, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_file_write_w__internal(pWav, filename, pFormat, totalSampleCount, DRWAV_TRUE, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_file_write_sequential_pcm_frames_w(drwav* pWav, const wchar_t* filename, const drwav_data_format* pFormat, drwav_uint64 totalPCMFrameCount, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pFormat == NULL) {
-        return DRWAV_FALSE;
-    }
-
-    return drwav_init_file_write_sequential_w(pWav, filename, pFormat, totalPCMFrameCount*pFormat->channels, pAllocationCallbacks);
-}
-#endif
-#endif  /* DR_WAV_NO_STDIO */
-
-
-DRWAV_PRIVATE size_t drwav__on_read_memory(void* pUserData, void* pBufferOut, size_t bytesToRead)
-{
-    drwav* pWav = (drwav*)pUserData;
-    size_t bytesRemaining;
-
-    DRWAV_ASSERT(pWav != NULL);
-    DRWAV_ASSERT(pWav->memoryStream.dataSize >= pWav->memoryStream.currentReadPos);
-
-    bytesRemaining = pWav->memoryStream.dataSize - pWav->memoryStream.currentReadPos;
-    if (bytesToRead > bytesRemaining) {
-        bytesToRead = bytesRemaining;
-    }
-
-    if (bytesToRead > 0) {
-        DRWAV_COPY_MEMORY(pBufferOut, pWav->memoryStream.data + pWav->memoryStream.currentReadPos, bytesToRead);
-        pWav->memoryStream.currentReadPos += bytesToRead;
-    }
-
-    return bytesToRead;
-}
-
-DRWAV_PRIVATE drwav_bool32 drwav__on_seek_memory(void* pUserData, int offset, drwav_seek_origin origin)
-{
-    drwav* pWav = (drwav*)pUserData;
-    DRWAV_ASSERT(pWav != NULL);
-
-    if (origin == drwav_seek_origin_current) {
-        if (offset > 0) {
-            if (pWav->memoryStream.currentReadPos + offset > pWav->memoryStream.dataSize) {
-                return DRWAV_FALSE; /* Trying to seek too far forward. */
-            }
-        } else {
-            if (pWav->memoryStream.currentReadPos < (size_t)-offset) {
-                return DRWAV_FALSE; /* Trying to seek too far backwards. */
-            }
-        }
-
-        /* This will never underflow thanks to the clamps above. */
-        pWav->memoryStream.currentReadPos += offset;
-    } else {
-        if ((drwav_uint32)offset <= pWav->memoryStream.dataSize) {
-            pWav->memoryStream.currentReadPos = offset;
-        } else {
-            return DRWAV_FALSE; /* Trying to seek too far forward. */
-        }
-    }
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_PRIVATE size_t drwav__on_write_memory(void* pUserData, const void* pDataIn, size_t bytesToWrite)
-{
-    drwav* pWav = (drwav*)pUserData;
-    size_t bytesRemaining;
-
-    DRWAV_ASSERT(pWav != NULL);
-    DRWAV_ASSERT(pWav->memoryStreamWrite.dataCapacity >= pWav->memoryStreamWrite.currentWritePos);
-
-    bytesRemaining = pWav->memoryStreamWrite.dataCapacity - pWav->memoryStreamWrite.currentWritePos;
-    if (bytesRemaining < bytesToWrite) {
-        /* Need to reallocate. */
-        void* pNewData;
-        size_t newDataCapacity = (pWav->memoryStreamWrite.dataCapacity == 0) ? 256 : pWav->memoryStreamWrite.dataCapacity * 2;
-
-        /* If doubling wasn't enough, just make it the minimum required size to write the data. */
-        if ((newDataCapacity - pWav->memoryStreamWrite.currentWritePos) < bytesToWrite) {
-            newDataCapacity = pWav->memoryStreamWrite.currentWritePos + bytesToWrite;
-        }
-
-        pNewData = drwav__realloc_from_callbacks(*pWav->memoryStreamWrite.ppData, newDataCapacity, pWav->memoryStreamWrite.dataCapacity, &pWav->allocationCallbacks);
-        if (pNewData == NULL) {
-            return 0;
-        }
-
-        *pWav->memoryStreamWrite.ppData = pNewData;
-        pWav->memoryStreamWrite.dataCapacity = newDataCapacity;
-    }
-
-    DRWAV_COPY_MEMORY(((drwav_uint8*)(*pWav->memoryStreamWrite.ppData)) + pWav->memoryStreamWrite.currentWritePos, pDataIn, bytesToWrite);
-
-    pWav->memoryStreamWrite.currentWritePos += bytesToWrite;
-    if (pWav->memoryStreamWrite.dataSize < pWav->memoryStreamWrite.currentWritePos) {
-        pWav->memoryStreamWrite.dataSize = pWav->memoryStreamWrite.currentWritePos;
-    }
-
-    *pWav->memoryStreamWrite.pDataSize = pWav->memoryStreamWrite.dataSize;
-
-    return bytesToWrite;
-}
-
-DRWAV_PRIVATE drwav_bool32 drwav__on_seek_memory_write(void* pUserData, int offset, drwav_seek_origin origin)
-{
-    drwav* pWav = (drwav*)pUserData;
-    DRWAV_ASSERT(pWav != NULL);
-
-    if (origin == drwav_seek_origin_current) {
-        if (offset > 0) {
-            if (pWav->memoryStreamWrite.currentWritePos + offset > pWav->memoryStreamWrite.dataSize) {
-                offset = (int)(pWav->memoryStreamWrite.dataSize - pWav->memoryStreamWrite.currentWritePos);  /* Trying to seek too far forward. */
-            }
-        } else {
-            if (pWav->memoryStreamWrite.currentWritePos < (size_t)-offset) {
-                offset = -(int)pWav->memoryStreamWrite.currentWritePos;  /* Trying to seek too far backwards. */
-            }
-        }
-
-        /* This will never underflow thanks to the clamps above. */
-        pWav->memoryStreamWrite.currentWritePos += offset;
-    } else {
-        if ((drwav_uint32)offset <= pWav->memoryStreamWrite.dataSize) {
-            pWav->memoryStreamWrite.currentWritePos = offset;
-        } else {
-            pWav->memoryStreamWrite.currentWritePos = pWav->memoryStreamWrite.dataSize;  /* Trying to seek too far forward. */
-        }
-    }
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_API drwav_bool32 drwav_init_memory(drwav* pWav, const void* data, size_t dataSize, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_memory_ex(pWav, data, dataSize, NULL, NULL, 0, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_memory_ex(drwav* pWav, const void* data, size_t dataSize, drwav_chunk_proc onChunk, void* pChunkUserData, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (data == NULL || dataSize == 0) {
-        return DRWAV_FALSE;
-    }
-
-    if (!drwav_preinit(pWav, drwav__on_read_memory, drwav__on_seek_memory, pWav, pAllocationCallbacks)) {
-        return DRWAV_FALSE;
-    }
-
-    pWav->memoryStream.data = (const drwav_uint8*)data;
-    pWav->memoryStream.dataSize = dataSize;
-    pWav->memoryStream.currentReadPos = 0;
-
-    return drwav_init__internal(pWav, onChunk, pChunkUserData, flags);
-}
-
-DRWAV_API drwav_bool32 drwav_init_memory_with_metadata(drwav* pWav, const void* data, size_t dataSize, drwav_uint32 flags, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (data == NULL || dataSize == 0) {
-        return DRWAV_FALSE;
-    }
-
-    if (!drwav_preinit(pWav, drwav__on_read_memory, drwav__on_seek_memory, pWav, pAllocationCallbacks)) {
-        return DRWAV_FALSE;
-    }
-
-    pWav->memoryStream.data = (const drwav_uint8*)data;
-    pWav->memoryStream.dataSize = dataSize;
-    pWav->memoryStream.currentReadPos = 0;
-
-    pWav->allowedMetadataTypes = drwav_metadata_type_all_including_unknown;
-
-    return drwav_init__internal(pWav, NULL, NULL, flags);
-}
-
-
-DRWAV_PRIVATE drwav_bool32 drwav_init_memory_write__internal(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, drwav_bool32 isSequential, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (ppData == NULL || pDataSize == NULL) {
-        return DRWAV_FALSE;
-    }
-
-    *ppData = NULL; /* Important because we're using realloc()! */
-    *pDataSize = 0;
-
-    if (!drwav_preinit_write(pWav, pFormat, isSequential, drwav__on_write_memory, drwav__on_seek_memory_write, pWav, pAllocationCallbacks)) {
-        return DRWAV_FALSE;
-    }
-
-    pWav->memoryStreamWrite.ppData = ppData;
-    pWav->memoryStreamWrite.pDataSize = pDataSize;
-    pWav->memoryStreamWrite.dataSize = 0;
-    pWav->memoryStreamWrite.dataCapacity = 0;
-    pWav->memoryStreamWrite.currentWritePos = 0;
-
-    return drwav_init_write__internal(pWav, pFormat, totalSampleCount);
-}
-
-DRWAV_API drwav_bool32 drwav_init_memory_write(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_memory_write__internal(pWav, ppData, pDataSize, pFormat, 0, DRWAV_FALSE, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_memory_write_sequential(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalSampleCount, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    return drwav_init_memory_write__internal(pWav, ppData, pDataSize, pFormat, totalSampleCount, DRWAV_TRUE, pAllocationCallbacks);
-}
-
-DRWAV_API drwav_bool32 drwav_init_memory_write_sequential_pcm_frames(drwav* pWav, void** ppData, size_t* pDataSize, const drwav_data_format* pFormat, drwav_uint64 totalPCMFrameCount, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pFormat == NULL) {
-        return DRWAV_FALSE;
-    }
-
-    return drwav_init_memory_write_sequential(pWav, ppData, pDataSize, pFormat, totalPCMFrameCount*pFormat->channels, pAllocationCallbacks);
-}
-
-
-
-DRWAV_API drwav_result drwav_uninit(drwav* pWav)
-{
-    drwav_result result = DRWAV_SUCCESS;
-
-    if (pWav == NULL) {
-        return DRWAV_INVALID_ARGS;
-    }
-
-    /*
-    If the drwav object was opened in write mode we'll need to finalize a few things:
-      - Make sure the "data" chunk is aligned to 16-bits for RIFF containers, or 64 bits for W64 containers.
-      - Set the size of the "data" chunk.
-    */
-    if (pWav->onWrite != NULL) {
-        drwav_uint32 paddingSize = 0;
-
-        /* Padding. Do not adjust pWav->dataChunkDataSize - this should not include the padding. */
-        if (pWav->container == drwav_container_riff || pWav->container == drwav_container_rf64) {
-            paddingSize = drwav__chunk_padding_size_riff(pWav->dataChunkDataSize);
-        } else {
-            paddingSize = drwav__chunk_padding_size_w64(pWav->dataChunkDataSize);
-        }
-
-        if (paddingSize > 0) {
-            drwav_uint64 paddingData = 0;
-            drwav__write(pWav, &paddingData, paddingSize);  /* Byte order does not matter for this. */
-        }
-
-        /*
-        Chunk sizes. When using sequential mode, these will have been filled in at initialization time. We only need
-        to do this when using non-sequential mode.
-        */
-        if (pWav->onSeek && !pWav->isSequentialWrite) {
-            if (pWav->container == drwav_container_riff) {
-                /* The "RIFF" chunk size. */
-                if (pWav->onSeek(pWav->pUserData, 4, drwav_seek_origin_start)) {
-                    drwav_uint32 riffChunkSize = drwav__riff_chunk_size_riff(pWav->dataChunkDataSize, pWav->pMetadata, pWav->metadataCount);
-                    drwav__write_u32ne_to_le(pWav, riffChunkSize);
-                }
-
-                /* The "data" chunk size. */
-                if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 4, drwav_seek_origin_start)) {
-                    drwav_uint32 dataChunkSize = drwav__data_chunk_size_riff(pWav->dataChunkDataSize);
-                    drwav__write_u32ne_to_le(pWav, dataChunkSize);
-                }
-            } else if (pWav->container == drwav_container_w64) {
-                /* The "RIFF" chunk size. */
-                if (pWav->onSeek(pWav->pUserData, 16, drwav_seek_origin_start)) {
-                    drwav_uint64 riffChunkSize = drwav__riff_chunk_size_w64(pWav->dataChunkDataSize);
-                    drwav__write_u64ne_to_le(pWav, riffChunkSize);
-                }
-
-                /* The "data" chunk size. */
-                if (pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos - 8, drwav_seek_origin_start)) {
-                    drwav_uint64 dataChunkSize = drwav__data_chunk_size_w64(pWav->dataChunkDataSize);
-                    drwav__write_u64ne_to_le(pWav, dataChunkSize);
-                }
-            } else if (pWav->container == drwav_container_rf64) {
-                /* We only need to update the ds64 chunk. The "RIFF" and "data" chunks always have their sizes set to 0xFFFFFFFF for RF64. */
-                int ds64BodyPos = 12 + 8;
-
-                /* The "RIFF" chunk size. */
-                if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 0, drwav_seek_origin_start)) {
-                    drwav_uint64 riffChunkSize = drwav__riff_chunk_size_rf64(pWav->dataChunkDataSize, pWav->pMetadata, pWav->metadataCount);
-                    drwav__write_u64ne_to_le(pWav, riffChunkSize);
-                }
-
-                /* The "data" chunk size. */
-                if (pWav->onSeek(pWav->pUserData, ds64BodyPos + 8, drwav_seek_origin_start)) {
-                    drwav_uint64 dataChunkSize = drwav__data_chunk_size_rf64(pWav->dataChunkDataSize);
-                    drwav__write_u64ne_to_le(pWav, dataChunkSize);
-                }
-            }
-        }
-
-        /* Validation for sequential mode. */
-        if (pWav->isSequentialWrite) {
-            if (pWav->dataChunkDataSize != pWav->dataChunkDataSizeTargetWrite) {
-                result = DRWAV_INVALID_FILE;
-            }
-        }
-    } else {
-        if (pWav->pMetadata != NULL) {
-            pWav->allocationCallbacks.onFree(pWav->pMetadata, pWav->allocationCallbacks.pUserData);
-        }
-    }
-
-#ifndef DR_WAV_NO_STDIO
-    /*
-    If we opened the file with drwav_open_file() we will want to close the file handle. We can know whether or not drwav_open_file()
-    was used by looking at the onRead and onSeek callbacks.
-    */
-    if (pWav->onRead == drwav__on_read_stdio || pWav->onWrite == drwav__on_write_stdio) {
-        fclose((FILE*)pWav->pUserData);
-    }
-#endif
-
-    return result;
-}
-
-
-
-DRWAV_API size_t drwav_read_raw(drwav* pWav, size_t bytesToRead, void* pBufferOut)
-{
-    size_t bytesRead;
-    drwav_uint32 bytesPerFrame;
-
-    if (pWav == NULL || bytesToRead == 0) {
-        return 0;   /* Invalid args. */
-    }
-
-    if (bytesToRead > pWav->bytesRemaining) {
-        bytesToRead = (size_t)pWav->bytesRemaining;
-    }
-
-    if (bytesToRead == 0) {
-        return 0;   /* At end. */
-    }
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;   /* Could not determine the bytes per frame. */
-    }
-
-    if (pBufferOut != NULL) {
-        bytesRead = pWav->onRead(pWav->pUserData, pBufferOut, bytesToRead);
-    } else {
-        /* We need to seek. If we fail, we need to read-and-discard to make sure we get a good byte count. */
-        bytesRead = 0;
-        while (bytesRead < bytesToRead) {
-            size_t bytesToSeek = (bytesToRead - bytesRead);
-            if (bytesToSeek > 0x7FFFFFFF) {
-                bytesToSeek = 0x7FFFFFFF;
-            }
-
-            if (pWav->onSeek(pWav->pUserData, (int)bytesToSeek, drwav_seek_origin_current) == DRWAV_FALSE) {
-                break;
-            }
-
-            bytesRead += bytesToSeek;
-        }
-
-        /* When we get here we may need to read-and-discard some data. */
-        while (bytesRead < bytesToRead) {
-            drwav_uint8 buffer[4096];
-            size_t bytesSeeked;
-            size_t bytesToSeek = (bytesToRead - bytesRead);
-            if (bytesToSeek > sizeof(buffer)) {
-                bytesToSeek = sizeof(buffer);
-            }
-
-            bytesSeeked = pWav->onRead(pWav->pUserData, buffer, bytesToSeek);
-            bytesRead += bytesSeeked;
-
-            if (bytesSeeked < bytesToSeek) {
-                break;  /* Reached the end. */
-            }
-        }
-    }
-
-    pWav->readCursorInPCMFrames += bytesRead / bytesPerFrame;
-
-    pWav->bytesRemaining -= bytesRead;
-    return bytesRead;
-}
-
-
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_le(drwav* pWav, drwav_uint64 framesToRead, void* pBufferOut)
-{
-    drwav_uint32 bytesPerFrame;
-    drwav_uint64 bytesToRead;   /* Intentionally uint64 instead of size_t so we can do a check that we're not reading too much on 32-bit builds. */
-
-    if (pWav == NULL || framesToRead == 0) {
-        return 0;
-    }
-
-    /* Cannot use this function for compressed formats. */
-    if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) {
-        return 0;
-    }
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    /* Don't try to read more samples than can potentially fit in the output buffer. */
-    bytesToRead = framesToRead * bytesPerFrame;
-    if (bytesToRead > DRWAV_SIZE_MAX) {
-        bytesToRead = (DRWAV_SIZE_MAX / bytesPerFrame) * bytesPerFrame; /* Round the number of bytes to read to a clean frame boundary. */
-    }
-
-    /*
-    Doing an explicit check here just to make it clear that we don't want to be attempt to read anything if there's no bytes to read. There
-    *could* be a time where it evaluates to 0 due to overflowing.
-    */
-    if (bytesToRead == 0) {
-        return 0;
-    }
-
-    return drwav_read_raw(pWav, (size_t)bytesToRead, pBufferOut) / bytesPerFrame;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_be(drwav* pWav, drwav_uint64 framesToRead, void* pBufferOut)
-{
-    drwav_uint64 framesRead = drwav_read_pcm_frames_le(pWav, framesToRead, pBufferOut);
-
-    if (pBufferOut != NULL) {
-        drwav_uint32 bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-        if (bytesPerFrame == 0) {
-            return 0;   /* Could not get the bytes per frame which means bytes per sample cannot be determined and we don't know how to byte swap. */
-        }
-
-        drwav__bswap_samples(pBufferOut, framesRead*pWav->channels, bytesPerFrame/pWav->channels, pWav->translatedFormatTag);
-    }
-
-    return framesRead;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames(drwav* pWav, drwav_uint64 framesToRead, void* pBufferOut)
-{
-    if (drwav__is_little_endian()) {
-        return drwav_read_pcm_frames_le(pWav, framesToRead, pBufferOut);
-    } else {
-        return drwav_read_pcm_frames_be(pWav, framesToRead, pBufferOut);
-    }
-}
-
-
-
-DRWAV_PRIVATE drwav_bool32 drwav_seek_to_first_pcm_frame(drwav* pWav)
-{
-    if (pWav->onWrite != NULL) {
-        return DRWAV_FALSE; /* No seeking in write mode. */
-    }
-
-    if (!pWav->onSeek(pWav->pUserData, (int)pWav->dataChunkDataPos, drwav_seek_origin_start)) {
-        return DRWAV_FALSE;
-    }
-
-    if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) {
-        /* Cached data needs to be cleared for compressed formats. */
-        if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) {
-            DRWAV_ZERO_OBJECT(&pWav->msadpcm);
-        } else if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) {
-            DRWAV_ZERO_OBJECT(&pWav->ima);
-        } else {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* If this assertion is triggered it means I've implemented a new compressed format but forgot to add a branch for it here. */
-        }
-    }
-
-    pWav->readCursorInPCMFrames = 0;
-    pWav->bytesRemaining = pWav->dataChunkDataSize;
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_API drwav_bool32 drwav_seek_to_pcm_frame(drwav* pWav, drwav_uint64 targetFrameIndex)
-{
-    /* Seeking should be compatible with wave files > 2GB. */
-
-    if (pWav == NULL || pWav->onSeek == NULL) {
-        return DRWAV_FALSE;
-    }
-
-    /* No seeking in write mode. */
-    if (pWav->onWrite != NULL) {
-        return DRWAV_FALSE;
-    }
-
-    /* If there are no samples, just return DRWAV_TRUE without doing anything. */
-    if (pWav->totalPCMFrameCount == 0) {
-        return DRWAV_TRUE;
-    }
-
-    /* Make sure the sample is clamped. */
-    if (targetFrameIndex > pWav->totalPCMFrameCount) {
-        targetFrameIndex = pWav->totalPCMFrameCount;
-    }
-
-    /*
-    For compressed formats we just use a slow generic seek. If we are seeking forward we just seek forward. If we are going backwards we need
-    to seek back to the start.
-    */
-    if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) {
-        /* TODO: This can be optimized. */
-
-        /*
-        If we're seeking forward it's simple - just keep reading samples until we hit the sample we're requesting. If we're seeking backwards,
-        we first need to seek back to the start and then just do the same thing as a forward seek.
-        */
-        if (targetFrameIndex < pWav->readCursorInPCMFrames) {
-            if (!drwav_seek_to_first_pcm_frame(pWav)) {
-                return DRWAV_FALSE;
-            }
-        }
-
-        if (targetFrameIndex > pWav->readCursorInPCMFrames) {
-            drwav_uint64 offsetInFrames = targetFrameIndex - pWav->readCursorInPCMFrames;
-
-            drwav_int16 devnull[2048];
-            while (offsetInFrames > 0) {
-                drwav_uint64 framesRead = 0;
-                drwav_uint64 framesToRead = offsetInFrames;
-                if (framesToRead > drwav_countof(devnull)/pWav->channels) {
-                    framesToRead = drwav_countof(devnull)/pWav->channels;
-                }
-
-                if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) {
-                    framesRead = drwav_read_pcm_frames_s16__msadpcm(pWav, framesToRead, devnull);
-                } else if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) {
-                    framesRead = drwav_read_pcm_frames_s16__ima(pWav, framesToRead, devnull);
-                } else {
-                    DRWAV_ASSERT(DRWAV_FALSE);  /* If this assertion is triggered it means I've implemented a new compressed format but forgot to add a branch for it here. */
-                }
-
-                if (framesRead != framesToRead) {
-                    return DRWAV_FALSE;
-                }
-
-                offsetInFrames -= framesRead;
-            }
-        }
-    } else {
-        drwav_uint64 totalSizeInBytes;
-        drwav_uint64 currentBytePos;
-        drwav_uint64 targetBytePos;
-        drwav_uint64 offset;
-        drwav_uint32 bytesPerFrame;
-
-        bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-        if (bytesPerFrame == 0) {
-            return DRWAV_FALSE; /* Not able to calculate offset. */
-        }
-
-        totalSizeInBytes = pWav->totalPCMFrameCount * bytesPerFrame;
-        DRWAV_ASSERT(totalSizeInBytes >= pWav->bytesRemaining);
-
-        currentBytePos = totalSizeInBytes - pWav->bytesRemaining;
-        targetBytePos  = targetFrameIndex * bytesPerFrame;
-
-        if (currentBytePos < targetBytePos) {
-            /* Offset forwards. */
-            offset = (targetBytePos - currentBytePos);
-        } else {
-            /* Offset backwards. */
-            if (!drwav_seek_to_first_pcm_frame(pWav)) {
-                return DRWAV_FALSE;
-            }
-            offset = targetBytePos;
-        }
-
-        while (offset > 0) {
-            int offset32 = ((offset > INT_MAX) ? INT_MAX : (int)offset);
-            if (!pWav->onSeek(pWav->pUserData, offset32, drwav_seek_origin_current)) {
-                return DRWAV_FALSE;
-            }
-
-            pWav->readCursorInPCMFrames += offset32 / bytesPerFrame;
-            pWav->bytesRemaining        -= offset32;
-            offset                      -= offset32;
-        }
-    }
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_API drwav_result drwav_get_cursor_in_pcm_frames(drwav* pWav, drwav_uint64* pCursor)
-{
-    if (pCursor == NULL) {
-        return DRWAV_INVALID_ARGS;
-    }
-
-    *pCursor = 0;   /* Safety. */
-
-    if (pWav == NULL) {
-        return DRWAV_INVALID_ARGS;
-    }
-
-    *pCursor = pWav->readCursorInPCMFrames;
-
-    return DRWAV_SUCCESS;
-}
-
-DRWAV_API drwav_result drwav_get_length_in_pcm_frames(drwav* pWav, drwav_uint64* pLength)
-{
-    if (pLength == NULL) {
-        return DRWAV_INVALID_ARGS;
-    }
-
-    *pLength = 0;   /* Safety. */
-
-    if (pWav == NULL) {
-        return DRWAV_INVALID_ARGS;
-    }
-
-    *pLength = pWav->totalPCMFrameCount;
-
-    return DRWAV_SUCCESS;
-}
-
-
-DRWAV_API size_t drwav_write_raw(drwav* pWav, size_t bytesToWrite, const void* pData)
-{
-    size_t bytesWritten;
-
-    if (pWav == NULL || bytesToWrite == 0 || pData == NULL) {
-        return 0;
-    }
-
-    bytesWritten = pWav->onWrite(pWav->pUserData, pData, bytesToWrite);
-    pWav->dataChunkDataSize += bytesWritten;
-
-    return bytesWritten;
-}
-
-DRWAV_API drwav_uint64 drwav_write_pcm_frames_le(drwav* pWav, drwav_uint64 framesToWrite, const void* pData)
-{
-    drwav_uint64 bytesToWrite;
-    drwav_uint64 bytesWritten;
-    const drwav_uint8* pRunningData;
-
-    if (pWav == NULL || framesToWrite == 0 || pData == NULL) {
-        return 0;
-    }
-
-    bytesToWrite = ((framesToWrite * pWav->channels * pWav->bitsPerSample) / 8);
-    if (bytesToWrite > DRWAV_SIZE_MAX) {
-        return 0;
-    }
-
-    bytesWritten = 0;
-    pRunningData = (const drwav_uint8*)pData;
-
-    while (bytesToWrite > 0) {
-        size_t bytesJustWritten;
-        drwav_uint64 bytesToWriteThisIteration;
-
-        bytesToWriteThisIteration = bytesToWrite;
-        DRWAV_ASSERT(bytesToWriteThisIteration <= DRWAV_SIZE_MAX);  /* <-- This is checked above. */
-
-        bytesJustWritten = drwav_write_raw(pWav, (size_t)bytesToWriteThisIteration, pRunningData);
-        if (bytesJustWritten == 0) {
-            break;
-        }
-
-        bytesToWrite -= bytesJustWritten;
-        bytesWritten += bytesJustWritten;
-        pRunningData += bytesJustWritten;
-    }
-
-    return (bytesWritten * 8) / pWav->bitsPerSample / pWav->channels;
-}
-
-DRWAV_API drwav_uint64 drwav_write_pcm_frames_be(drwav* pWav, drwav_uint64 framesToWrite, const void* pData)
-{
-    drwav_uint64 bytesToWrite;
-    drwav_uint64 bytesWritten;
-    drwav_uint32 bytesPerSample;
-    const drwav_uint8* pRunningData;
-
-    if (pWav == NULL || framesToWrite == 0 || pData == NULL) {
-        return 0;
-    }
-
-    bytesToWrite = ((framesToWrite * pWav->channels * pWav->bitsPerSample) / 8);
-    if (bytesToWrite > DRWAV_SIZE_MAX) {
-        return 0;
-    }
-
-    bytesWritten = 0;
-    pRunningData = (const drwav_uint8*)pData;
-
-    bytesPerSample = drwav_get_bytes_per_pcm_frame(pWav) / pWav->channels;
-    if (bytesPerSample == 0) {
-        return 0;   /* Cannot determine bytes per sample, or bytes per sample is less than one byte. */
-    }
-
-    while (bytesToWrite > 0) {
-        drwav_uint8 temp[4096];
-        drwav_uint32 sampleCount;
-        size_t bytesJustWritten;
-        drwav_uint64 bytesToWriteThisIteration;
-
-        bytesToWriteThisIteration = bytesToWrite;
-        DRWAV_ASSERT(bytesToWriteThisIteration <= DRWAV_SIZE_MAX);  /* <-- This is checked above. */
-
-        /*
-        WAV files are always little-endian. We need to byte swap on big-endian architectures. Since our input buffer is read-only we need
-        to use an intermediary buffer for the conversion.
-        */
-        sampleCount = sizeof(temp)/bytesPerSample;
-
-        if (bytesToWriteThisIteration > ((drwav_uint64)sampleCount)*bytesPerSample) {
-            bytesToWriteThisIteration = ((drwav_uint64)sampleCount)*bytesPerSample;
-        }
-
-        DRWAV_COPY_MEMORY(temp, pRunningData, (size_t)bytesToWriteThisIteration);
-        drwav__bswap_samples(temp, sampleCount, bytesPerSample, pWav->translatedFormatTag);
-
-        bytesJustWritten = drwav_write_raw(pWav, (size_t)bytesToWriteThisIteration, temp);
-        if (bytesJustWritten == 0) {
-            break;
-        }
-
-        bytesToWrite -= bytesJustWritten;
-        bytesWritten += bytesJustWritten;
-        pRunningData += bytesJustWritten;
-    }
-
-    return (bytesWritten * 8) / pWav->bitsPerSample / pWav->channels;
-}
-
-DRWAV_API drwav_uint64 drwav_write_pcm_frames(drwav* pWav, drwav_uint64 framesToWrite, const void* pData)
-{
-    if (drwav__is_little_endian()) {
-        return drwav_write_pcm_frames_le(pWav, framesToWrite, pData);
-    } else {
-        return drwav_write_pcm_frames_be(pWav, framesToWrite, pData);
-    }
-}
-
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__msadpcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut)
-{
-    drwav_uint64 totalFramesRead = 0;
-
-    DRWAV_ASSERT(pWav != NULL);
-    DRWAV_ASSERT(framesToRead > 0);
-
-    /* TODO: Lots of room for optimization here. */
-
-    while (pWav->readCursorInPCMFrames < pWav->totalPCMFrameCount) {
-        DRWAV_ASSERT(framesToRead > 0); /* This loop iteration will never get hit with framesToRead == 0 because it's asserted at the top, and we check for 0 inside the loop just below. */
-
-        /* If there are no cached frames we need to load a new block. */
-        if (pWav->msadpcm.cachedFrameCount == 0 && pWav->msadpcm.bytesRemainingInBlock == 0) {
-            if (pWav->channels == 1) {
-                /* Mono. */
-                drwav_uint8 header[7];
-                if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) {
-                    return totalFramesRead;
-                }
-                pWav->msadpcm.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header);
-
-                pWav->msadpcm.predictor[0]     = header[0];
-                pWav->msadpcm.delta[0]         = drwav_bytes_to_s16(header + 1);
-                pWav->msadpcm.prevFrames[0][1] = (drwav_int32)drwav_bytes_to_s16(header + 3);
-                pWav->msadpcm.prevFrames[0][0] = (drwav_int32)drwav_bytes_to_s16(header + 5);
-                pWav->msadpcm.cachedFrames[2]  = pWav->msadpcm.prevFrames[0][0];
-                pWav->msadpcm.cachedFrames[3]  = pWav->msadpcm.prevFrames[0][1];
-                pWav->msadpcm.cachedFrameCount = 2;
-            } else {
-                /* Stereo. */
-                drwav_uint8 header[14];
-                if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) {
-                    return totalFramesRead;
-                }
-                pWav->msadpcm.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header);
-
-                pWav->msadpcm.predictor[0] = header[0];
-                pWav->msadpcm.predictor[1] = header[1];
-                pWav->msadpcm.delta[0] = drwav_bytes_to_s16(header + 2);
-                pWav->msadpcm.delta[1] = drwav_bytes_to_s16(header + 4);
-                pWav->msadpcm.prevFrames[0][1] = (drwav_int32)drwav_bytes_to_s16(header + 6);
-                pWav->msadpcm.prevFrames[1][1] = (drwav_int32)drwav_bytes_to_s16(header + 8);
-                pWav->msadpcm.prevFrames[0][0] = (drwav_int32)drwav_bytes_to_s16(header + 10);
-                pWav->msadpcm.prevFrames[1][0] = (drwav_int32)drwav_bytes_to_s16(header + 12);
-
-                pWav->msadpcm.cachedFrames[0] = pWav->msadpcm.prevFrames[0][0];
-                pWav->msadpcm.cachedFrames[1] = pWav->msadpcm.prevFrames[1][0];
-                pWav->msadpcm.cachedFrames[2] = pWav->msadpcm.prevFrames[0][1];
-                pWav->msadpcm.cachedFrames[3] = pWav->msadpcm.prevFrames[1][1];
-                pWav->msadpcm.cachedFrameCount = 2;
-            }
-        }
-
-        /* Output anything that's cached. */
-        while (framesToRead > 0 && pWav->msadpcm.cachedFrameCount > 0 && pWav->readCursorInPCMFrames < pWav->totalPCMFrameCount) {
-            if (pBufferOut != NULL) {
-                drwav_uint32 iSample = 0;
-                for (iSample = 0; iSample < pWav->channels; iSample += 1) {
-                    pBufferOut[iSample] = (drwav_int16)pWav->msadpcm.cachedFrames[(drwav_countof(pWav->msadpcm.cachedFrames) - (pWav->msadpcm.cachedFrameCount*pWav->channels)) + iSample];
-                }
-
-                pBufferOut += pWav->channels;
-            }
-
-            framesToRead    -= 1;
-            totalFramesRead += 1;
-            pWav->readCursorInPCMFrames += 1;
-            pWav->msadpcm.cachedFrameCount -= 1;
-        }
-
-        if (framesToRead == 0) {
-            break;
-        }
-
-
-        /*
-        If there's nothing left in the cache, just go ahead and load more. If there's nothing left to load in the current block we just continue to the next
-        loop iteration which will trigger the loading of a new block.
-        */
-        if (pWav->msadpcm.cachedFrameCount == 0) {
-            if (pWav->msadpcm.bytesRemainingInBlock == 0) {
-                continue;
-            } else {
-                static drwav_int32 adaptationTable[] = {
-                    230, 230, 230, 230, 307, 409, 512, 614,
-                    768, 614, 512, 409, 307, 230, 230, 230
-                };
-                static drwav_int32 coeff1Table[] = { 256, 512, 0, 192, 240, 460,  392 };
-                static drwav_int32 coeff2Table[] = { 0,  -256, 0, 64,  0,  -208, -232 };
-
-                drwav_uint8 nibbles;
-                drwav_int32 nibble0;
-                drwav_int32 nibble1;
-
-                if (pWav->onRead(pWav->pUserData, &nibbles, 1) != 1) {
-                    return totalFramesRead;
-                }
-                pWav->msadpcm.bytesRemainingInBlock -= 1;
-
-                /* TODO: Optimize away these if statements. */
-                nibble0 = ((nibbles & 0xF0) >> 4); if ((nibbles & 0x80)) { nibble0 |= 0xFFFFFFF0UL; }
-                nibble1 = ((nibbles & 0x0F) >> 0); if ((nibbles & 0x08)) { nibble1 |= 0xFFFFFFF0UL; }
-
-                if (pWav->channels == 1) {
-                    /* Mono. */
-                    drwav_int32 newSample0;
-                    drwav_int32 newSample1;
-
-                    newSample0  = ((pWav->msadpcm.prevFrames[0][1] * coeff1Table[pWav->msadpcm.predictor[0]]) + (pWav->msadpcm.prevFrames[0][0] * coeff2Table[pWav->msadpcm.predictor[0]])) >> 8;
-                    newSample0 += nibble0 * pWav->msadpcm.delta[0];
-                    newSample0  = drwav_clamp(newSample0, -32768, 32767);
-
-                    pWav->msadpcm.delta[0] = (adaptationTable[((nibbles & 0xF0) >> 4)] * pWav->msadpcm.delta[0]) >> 8;
-                    if (pWav->msadpcm.delta[0] < 16) {
-                        pWav->msadpcm.delta[0] = 16;
-                    }
-
-                    pWav->msadpcm.prevFrames[0][0] = pWav->msadpcm.prevFrames[0][1];
-                    pWav->msadpcm.prevFrames[0][1] = newSample0;
-
-
-                    newSample1  = ((pWav->msadpcm.prevFrames[0][1] * coeff1Table[pWav->msadpcm.predictor[0]]) + (pWav->msadpcm.prevFrames[0][0] * coeff2Table[pWav->msadpcm.predictor[0]])) >> 8;
-                    newSample1 += nibble1 * pWav->msadpcm.delta[0];
-                    newSample1  = drwav_clamp(newSample1, -32768, 32767);
-
-                    pWav->msadpcm.delta[0] = (adaptationTable[((nibbles & 0x0F) >> 0)] * pWav->msadpcm.delta[0]) >> 8;
-                    if (pWav->msadpcm.delta[0] < 16) {
-                        pWav->msadpcm.delta[0] = 16;
-                    }
-
-                    pWav->msadpcm.prevFrames[0][0] = pWav->msadpcm.prevFrames[0][1];
-                    pWav->msadpcm.prevFrames[0][1] = newSample1;
-
-
-                    pWav->msadpcm.cachedFrames[2] = newSample0;
-                    pWav->msadpcm.cachedFrames[3] = newSample1;
-                    pWav->msadpcm.cachedFrameCount = 2;
-                } else {
-                    /* Stereo. */
-                    drwav_int32 newSample0;
-                    drwav_int32 newSample1;
-
-                    /* Left. */
-                    newSample0  = ((pWav->msadpcm.prevFrames[0][1] * coeff1Table[pWav->msadpcm.predictor[0]]) + (pWav->msadpcm.prevFrames[0][0] * coeff2Table[pWav->msadpcm.predictor[0]])) >> 8;
-                    newSample0 += nibble0 * pWav->msadpcm.delta[0];
-                    newSample0  = drwav_clamp(newSample0, -32768, 32767);
-
-                    pWav->msadpcm.delta[0] = (adaptationTable[((nibbles & 0xF0) >> 4)] * pWav->msadpcm.delta[0]) >> 8;
-                    if (pWav->msadpcm.delta[0] < 16) {
-                        pWav->msadpcm.delta[0] = 16;
-                    }
-
-                    pWav->msadpcm.prevFrames[0][0] = pWav->msadpcm.prevFrames[0][1];
-                    pWav->msadpcm.prevFrames[0][1] = newSample0;
-
-
-                    /* Right. */
-                    newSample1  = ((pWav->msadpcm.prevFrames[1][1] * coeff1Table[pWav->msadpcm.predictor[1]]) + (pWav->msadpcm.prevFrames[1][0] * coeff2Table[pWav->msadpcm.predictor[1]])) >> 8;
-                    newSample1 += nibble1 * pWav->msadpcm.delta[1];
-                    newSample1  = drwav_clamp(newSample1, -32768, 32767);
-
-                    pWav->msadpcm.delta[1] = (adaptationTable[((nibbles & 0x0F) >> 0)] * pWav->msadpcm.delta[1]) >> 8;
-                    if (pWav->msadpcm.delta[1] < 16) {
-                        pWav->msadpcm.delta[1] = 16;
-                    }
-
-                    pWav->msadpcm.prevFrames[1][0] = pWav->msadpcm.prevFrames[1][1];
-                    pWav->msadpcm.prevFrames[1][1] = newSample1;
-
-                    pWav->msadpcm.cachedFrames[2] = newSample0;
-                    pWav->msadpcm.cachedFrames[3] = newSample1;
-                    pWav->msadpcm.cachedFrameCount = 1;
-                }
-            }
-        }
-    }
-
-    return totalFramesRead;
-}
-
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__ima(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut)
-{
-    drwav_uint64 totalFramesRead = 0;
-    drwav_uint32 iChannel;
-
-    static drwav_int32 indexTable[16] = {
-        -1, -1, -1, -1, 2, 4, 6, 8,
-        -1, -1, -1, -1, 2, 4, 6, 8
-    };
-
-    static drwav_int32 stepTable[89] = {
-        7,     8,     9,     10,    11,    12,    13,    14,    16,    17,
-        19,    21,    23,    25,    28,    31,    34,    37,    41,    45,
-        50,    55,    60,    66,    73,    80,    88,    97,    107,   118,
-        130,   143,   157,   173,   190,   209,   230,   253,   279,   307,
-        337,   371,   408,   449,   494,   544,   598,   658,   724,   796,
-        876,   963,   1060,  1166,  1282,  1411,  1552,  1707,  1878,  2066,
-        2272,  2499,  2749,  3024,  3327,  3660,  4026,  4428,  4871,  5358,
-        5894,  6484,  7132,  7845,  8630,  9493,  10442, 11487, 12635, 13899,
-        15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
-    };
-
-    DRWAV_ASSERT(pWav != NULL);
-    DRWAV_ASSERT(framesToRead > 0);
-
-    /* TODO: Lots of room for optimization here. */
-
-    while (pWav->readCursorInPCMFrames < pWav->totalPCMFrameCount) {
-        DRWAV_ASSERT(framesToRead > 0); /* This loop iteration will never get hit with framesToRead == 0 because it's asserted at the top, and we check for 0 inside the loop just below. */
-
-        /* If there are no cached samples we need to load a new block. */
-        if (pWav->ima.cachedFrameCount == 0 && pWav->ima.bytesRemainingInBlock == 0) {
-            if (pWav->channels == 1) {
-                /* Mono. */
-                drwav_uint8 header[4];
-                if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) {
-                    return totalFramesRead;
-                }
-                pWav->ima.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header);
-
-                if (header[2] >= drwav_countof(stepTable)) {
-                    pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, drwav_seek_origin_current);
-                    pWav->ima.bytesRemainingInBlock = 0;
-                    return totalFramesRead; /* Invalid data. */
-                }
-
-                pWav->ima.predictor[0] = drwav_bytes_to_s16(header + 0);
-                pWav->ima.stepIndex[0] = drwav_clamp(header[2], 0, (drwav_int32)drwav_countof(stepTable)-1);    /* Clamp not necessary because we checked above, but adding here to silence a static analysis warning. */
-                pWav->ima.cachedFrames[drwav_countof(pWav->ima.cachedFrames) - 1] = pWav->ima.predictor[0];
-                pWav->ima.cachedFrameCount = 1;
-            } else {
-                /* Stereo. */
-                drwav_uint8 header[8];
-                if (pWav->onRead(pWav->pUserData, header, sizeof(header)) != sizeof(header)) {
-                    return totalFramesRead;
-                }
-                pWav->ima.bytesRemainingInBlock = pWav->fmt.blockAlign - sizeof(header);
-
-                if (header[2] >= drwav_countof(stepTable) || header[6] >= drwav_countof(stepTable)) {
-                    pWav->onSeek(pWav->pUserData, pWav->ima.bytesRemainingInBlock, drwav_seek_origin_current);
-                    pWav->ima.bytesRemainingInBlock = 0;
-                    return totalFramesRead; /* Invalid data. */
-                }
-
-                pWav->ima.predictor[0] = drwav_bytes_to_s16(header + 0);
-                pWav->ima.stepIndex[0] = drwav_clamp(header[2], 0, (drwav_int32)drwav_countof(stepTable)-1);    /* Clamp not necessary because we checked above, but adding here to silence a static analysis warning. */
-                pWav->ima.predictor[1] = drwav_bytes_to_s16(header + 4);
-                pWav->ima.stepIndex[1] = drwav_clamp(header[6], 0, (drwav_int32)drwav_countof(stepTable)-1);    /* Clamp not necessary because we checked above, but adding here to silence a static analysis warning. */
-
-                pWav->ima.cachedFrames[drwav_countof(pWav->ima.cachedFrames) - 2] = pWav->ima.predictor[0];
-                pWav->ima.cachedFrames[drwav_countof(pWav->ima.cachedFrames) - 1] = pWav->ima.predictor[1];
-                pWav->ima.cachedFrameCount = 1;
-            }
-        }
-
-        /* Output anything that's cached. */
-        while (framesToRead > 0 && pWav->ima.cachedFrameCount > 0 && pWav->readCursorInPCMFrames < pWav->totalPCMFrameCount) {
-            if (pBufferOut != NULL) {
-                drwav_uint32 iSample;
-                for (iSample = 0; iSample < pWav->channels; iSample += 1) {
-                    pBufferOut[iSample] = (drwav_int16)pWav->ima.cachedFrames[(drwav_countof(pWav->ima.cachedFrames) - (pWav->ima.cachedFrameCount*pWav->channels)) + iSample];
-                }
-                pBufferOut += pWav->channels;
-            }
-
-            framesToRead    -= 1;
-            totalFramesRead += 1;
-            pWav->readCursorInPCMFrames += 1;
-            pWav->ima.cachedFrameCount -= 1;
-        }
-
-        if (framesToRead == 0) {
-            break;
-        }
-
-        /*
-        If there's nothing left in the cache, just go ahead and load more. If there's nothing left to load in the current block we just continue to the next
-        loop iteration which will trigger the loading of a new block.
-        */
-        if (pWav->ima.cachedFrameCount == 0) {
-            if (pWav->ima.bytesRemainingInBlock == 0) {
-                continue;
-            } else {
-                /*
-                From what I can tell with stereo streams, it looks like every 4 bytes (8 samples) is for one channel. So it goes 4 bytes for the
-                left channel, 4 bytes for the right channel.
-                */
-                pWav->ima.cachedFrameCount = 8;
-                for (iChannel = 0; iChannel < pWav->channels; ++iChannel) {
-                    drwav_uint32 iByte;
-                    drwav_uint8 nibbles[4];
-                    if (pWav->onRead(pWav->pUserData, &nibbles, 4) != 4) {
-                        pWav->ima.cachedFrameCount = 0;
-                        return totalFramesRead;
-                    }
-                    pWav->ima.bytesRemainingInBlock -= 4;
-
-                    for (iByte = 0; iByte < 4; ++iByte) {
-                        drwav_uint8 nibble0 = ((nibbles[iByte] & 0x0F) >> 0);
-                        drwav_uint8 nibble1 = ((nibbles[iByte] & 0xF0) >> 4);
-
-                        drwav_int32 step      = stepTable[pWav->ima.stepIndex[iChannel]];
-                        drwav_int32 predictor = pWav->ima.predictor[iChannel];
-
-                        drwav_int32      diff  = step >> 3;
-                        if (nibble0 & 1) diff += step >> 2;
-                        if (nibble0 & 2) diff += step >> 1;
-                        if (nibble0 & 4) diff += step;
-                        if (nibble0 & 8) diff  = -diff;
-
-                        predictor = drwav_clamp(predictor + diff, -32768, 32767);
-                        pWav->ima.predictor[iChannel] = predictor;
-                        pWav->ima.stepIndex[iChannel] = drwav_clamp(pWav->ima.stepIndex[iChannel] + indexTable[nibble0], 0, (drwav_int32)drwav_countof(stepTable)-1);
-                        pWav->ima.cachedFrames[(drwav_countof(pWav->ima.cachedFrames) - (pWav->ima.cachedFrameCount*pWav->channels)) + (iByte*2+0)*pWav->channels + iChannel] = predictor;
-
-
-                        step      = stepTable[pWav->ima.stepIndex[iChannel]];
-                        predictor = pWav->ima.predictor[iChannel];
-
-                                         diff  = step >> 3;
-                        if (nibble1 & 1) diff += step >> 2;
-                        if (nibble1 & 2) diff += step >> 1;
-                        if (nibble1 & 4) diff += step;
-                        if (nibble1 & 8) diff  = -diff;
-
-                        predictor = drwav_clamp(predictor + diff, -32768, 32767);
-                        pWav->ima.predictor[iChannel] = predictor;
-                        pWav->ima.stepIndex[iChannel] = drwav_clamp(pWav->ima.stepIndex[iChannel] + indexTable[nibble1], 0, (drwav_int32)drwav_countof(stepTable)-1);
-                        pWav->ima.cachedFrames[(drwav_countof(pWav->ima.cachedFrames) - (pWav->ima.cachedFrameCount*pWav->channels)) + (iByte*2+1)*pWav->channels + iChannel] = predictor;
-                    }
-                }
-            }
-        }
-    }
-
-    return totalFramesRead;
-}
-
-
-#ifndef DR_WAV_NO_CONVERSION_API
-static unsigned short g_drwavAlawTable[256] = {
-    0xEA80, 0xEB80, 0xE880, 0xE980, 0xEE80, 0xEF80, 0xEC80, 0xED80, 0xE280, 0xE380, 0xE080, 0xE180, 0xE680, 0xE780, 0xE480, 0xE580,
-    0xF540, 0xF5C0, 0xF440, 0xF4C0, 0xF740, 0xF7C0, 0xF640, 0xF6C0, 0xF140, 0xF1C0, 0xF040, 0xF0C0, 0xF340, 0xF3C0, 0xF240, 0xF2C0,
-    0xAA00, 0xAE00, 0xA200, 0xA600, 0xBA00, 0xBE00, 0xB200, 0xB600, 0x8A00, 0x8E00, 0x8200, 0x8600, 0x9A00, 0x9E00, 0x9200, 0x9600,
-    0xD500, 0xD700, 0xD100, 0xD300, 0xDD00, 0xDF00, 0xD900, 0xDB00, 0xC500, 0xC700, 0xC100, 0xC300, 0xCD00, 0xCF00, 0xC900, 0xCB00,
-    0xFEA8, 0xFEB8, 0xFE88, 0xFE98, 0xFEE8, 0xFEF8, 0xFEC8, 0xFED8, 0xFE28, 0xFE38, 0xFE08, 0xFE18, 0xFE68, 0xFE78, 0xFE48, 0xFE58,
-    0xFFA8, 0xFFB8, 0xFF88, 0xFF98, 0xFFE8, 0xFFF8, 0xFFC8, 0xFFD8, 0xFF28, 0xFF38, 0xFF08, 0xFF18, 0xFF68, 0xFF78, 0xFF48, 0xFF58,
-    0xFAA0, 0xFAE0, 0xFA20, 0xFA60, 0xFBA0, 0xFBE0, 0xFB20, 0xFB60, 0xF8A0, 0xF8E0, 0xF820, 0xF860, 0xF9A0, 0xF9E0, 0xF920, 0xF960,
-    0xFD50, 0xFD70, 0xFD10, 0xFD30, 0xFDD0, 0xFDF0, 0xFD90, 0xFDB0, 0xFC50, 0xFC70, 0xFC10, 0xFC30, 0xFCD0, 0xFCF0, 0xFC90, 0xFCB0,
-    0x1580, 0x1480, 0x1780, 0x1680, 0x1180, 0x1080, 0x1380, 0x1280, 0x1D80, 0x1C80, 0x1F80, 0x1E80, 0x1980, 0x1880, 0x1B80, 0x1A80,
-    0x0AC0, 0x0A40, 0x0BC0, 0x0B40, 0x08C0, 0x0840, 0x09C0, 0x0940, 0x0EC0, 0x0E40, 0x0FC0, 0x0F40, 0x0CC0, 0x0C40, 0x0DC0, 0x0D40,
-    0x5600, 0x5200, 0x5E00, 0x5A00, 0x4600, 0x4200, 0x4E00, 0x4A00, 0x7600, 0x7200, 0x7E00, 0x7A00, 0x6600, 0x6200, 0x6E00, 0x6A00,
-    0x2B00, 0x2900, 0x2F00, 0x2D00, 0x2300, 0x2100, 0x2700, 0x2500, 0x3B00, 0x3900, 0x3F00, 0x3D00, 0x3300, 0x3100, 0x3700, 0x3500,
-    0x0158, 0x0148, 0x0178, 0x0168, 0x0118, 0x0108, 0x0138, 0x0128, 0x01D8, 0x01C8, 0x01F8, 0x01E8, 0x0198, 0x0188, 0x01B8, 0x01A8,
-    0x0058, 0x0048, 0x0078, 0x0068, 0x0018, 0x0008, 0x0038, 0x0028, 0x00D8, 0x00C8, 0x00F8, 0x00E8, 0x0098, 0x0088, 0x00B8, 0x00A8,
-    0x0560, 0x0520, 0x05E0, 0x05A0, 0x0460, 0x0420, 0x04E0, 0x04A0, 0x0760, 0x0720, 0x07E0, 0x07A0, 0x0660, 0x0620, 0x06E0, 0x06A0,
-    0x02B0, 0x0290, 0x02F0, 0x02D0, 0x0230, 0x0210, 0x0270, 0x0250, 0x03B0, 0x0390, 0x03F0, 0x03D0, 0x0330, 0x0310, 0x0370, 0x0350
-};
-
-static unsigned short g_drwavMulawTable[256] = {
-    0x8284, 0x8684, 0x8A84, 0x8E84, 0x9284, 0x9684, 0x9A84, 0x9E84, 0xA284, 0xA684, 0xAA84, 0xAE84, 0xB284, 0xB684, 0xBA84, 0xBE84,
-    0xC184, 0xC384, 0xC584, 0xC784, 0xC984, 0xCB84, 0xCD84, 0xCF84, 0xD184, 0xD384, 0xD584, 0xD784, 0xD984, 0xDB84, 0xDD84, 0xDF84,
-    0xE104, 0xE204, 0xE304, 0xE404, 0xE504, 0xE604, 0xE704, 0xE804, 0xE904, 0xEA04, 0xEB04, 0xEC04, 0xED04, 0xEE04, 0xEF04, 0xF004,
-    0xF0C4, 0xF144, 0xF1C4, 0xF244, 0xF2C4, 0xF344, 0xF3C4, 0xF444, 0xF4C4, 0xF544, 0xF5C4, 0xF644, 0xF6C4, 0xF744, 0xF7C4, 0xF844,
-    0xF8A4, 0xF8E4, 0xF924, 0xF964, 0xF9A4, 0xF9E4, 0xFA24, 0xFA64, 0xFAA4, 0xFAE4, 0xFB24, 0xFB64, 0xFBA4, 0xFBE4, 0xFC24, 0xFC64,
-    0xFC94, 0xFCB4, 0xFCD4, 0xFCF4, 0xFD14, 0xFD34, 0xFD54, 0xFD74, 0xFD94, 0xFDB4, 0xFDD4, 0xFDF4, 0xFE14, 0xFE34, 0xFE54, 0xFE74,
-    0xFE8C, 0xFE9C, 0xFEAC, 0xFEBC, 0xFECC, 0xFEDC, 0xFEEC, 0xFEFC, 0xFF0C, 0xFF1C, 0xFF2C, 0xFF3C, 0xFF4C, 0xFF5C, 0xFF6C, 0xFF7C,
-    0xFF88, 0xFF90, 0xFF98, 0xFFA0, 0xFFA8, 0xFFB0, 0xFFB8, 0xFFC0, 0xFFC8, 0xFFD0, 0xFFD8, 0xFFE0, 0xFFE8, 0xFFF0, 0xFFF8, 0x0000,
-    0x7D7C, 0x797C, 0x757C, 0x717C, 0x6D7C, 0x697C, 0x657C, 0x617C, 0x5D7C, 0x597C, 0x557C, 0x517C, 0x4D7C, 0x497C, 0x457C, 0x417C,
-    0x3E7C, 0x3C7C, 0x3A7C, 0x387C, 0x367C, 0x347C, 0x327C, 0x307C, 0x2E7C, 0x2C7C, 0x2A7C, 0x287C, 0x267C, 0x247C, 0x227C, 0x207C,
-    0x1EFC, 0x1DFC, 0x1CFC, 0x1BFC, 0x1AFC, 0x19FC, 0x18FC, 0x17FC, 0x16FC, 0x15FC, 0x14FC, 0x13FC, 0x12FC, 0x11FC, 0x10FC, 0x0FFC,
-    0x0F3C, 0x0EBC, 0x0E3C, 0x0DBC, 0x0D3C, 0x0CBC, 0x0C3C, 0x0BBC, 0x0B3C, 0x0ABC, 0x0A3C, 0x09BC, 0x093C, 0x08BC, 0x083C, 0x07BC,
-    0x075C, 0x071C, 0x06DC, 0x069C, 0x065C, 0x061C, 0x05DC, 0x059C, 0x055C, 0x051C, 0x04DC, 0x049C, 0x045C, 0x041C, 0x03DC, 0x039C,
-    0x036C, 0x034C, 0x032C, 0x030C, 0x02EC, 0x02CC, 0x02AC, 0x028C, 0x026C, 0x024C, 0x022C, 0x020C, 0x01EC, 0x01CC, 0x01AC, 0x018C,
-    0x0174, 0x0164, 0x0154, 0x0144, 0x0134, 0x0124, 0x0114, 0x0104, 0x00F4, 0x00E4, 0x00D4, 0x00C4, 0x00B4, 0x00A4, 0x0094, 0x0084,
-    0x0078, 0x0070, 0x0068, 0x0060, 0x0058, 0x0050, 0x0048, 0x0040, 0x0038, 0x0030, 0x0028, 0x0020, 0x0018, 0x0010, 0x0008, 0x0000
-};
-
-static DRWAV_INLINE drwav_int16 drwav__alaw_to_s16(drwav_uint8 sampleIn)
-{
-    return (short)g_drwavAlawTable[sampleIn];
-}
-
-static DRWAV_INLINE drwav_int16 drwav__mulaw_to_s16(drwav_uint8 sampleIn)
-{
-    return (short)g_drwavMulawTable[sampleIn];
-}
-
-
-
-DRWAV_PRIVATE void drwav__pcm_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample)
-{
-    size_t i;
-
-    /* Special case for 8-bit sample data because it's treated as unsigned. */
-    if (bytesPerSample == 1) {
-        drwav_u8_to_s16(pOut, pIn, totalSampleCount);
-        return;
-    }
-
-
-    /* Slightly more optimal implementation for common formats. */
-    if (bytesPerSample == 2) {
-        for (i = 0; i < totalSampleCount; ++i) {
-           *pOut++ = ((const drwav_int16*)pIn)[i];
-        }
-        return;
-    }
-    if (bytesPerSample == 3) {
-        drwav_s24_to_s16(pOut, pIn, totalSampleCount);
-        return;
-    }
-    if (bytesPerSample == 4) {
-        drwav_s32_to_s16(pOut, (const drwav_int32*)pIn, totalSampleCount);
-        return;
-    }
-
-
-    /* Anything more than 64 bits per sample is not supported. */
-    if (bytesPerSample > 8) {
-        DRWAV_ZERO_MEMORY(pOut, totalSampleCount * sizeof(*pOut));
-        return;
-    }
-
-
-    /* Generic, slow converter. */
-    for (i = 0; i < totalSampleCount; ++i) {
-        drwav_uint64 sample = 0;
-        unsigned int shift  = (8 - bytesPerSample) * 8;
-
-        unsigned int j;
-        for (j = 0; j < bytesPerSample; j += 1) {
-            DRWAV_ASSERT(j < 8);
-            sample |= (drwav_uint64)(pIn[j]) << shift;
-            shift  += 8;
-        }
-
-        pIn += j;
-        *pOut++ = (drwav_int16)((drwav_int64)sample >> 48);
-    }
-}
-
-DRWAV_PRIVATE void drwav__ieee_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample)
-{
-    if (bytesPerSample == 4) {
-        drwav_f32_to_s16(pOut, (const float*)pIn, totalSampleCount);
-        return;
-    } else if (bytesPerSample == 8) {
-        drwav_f64_to_s16(pOut, (const double*)pIn, totalSampleCount);
-        return;
-    } else {
-        /* Only supporting 32- and 64-bit float. Output silence in all other cases. Contributions welcome for 16-bit float. */
-        DRWAV_ZERO_MEMORY(pOut, totalSampleCount * sizeof(*pOut));
-        return;
-    }
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__pcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    /* Fast path. */
-    if ((pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM && pWav->bitsPerSample == 16) || pBufferOut == NULL) {
-        return drwav_read_pcm_frames(pWav, framesToRead, pBufferOut);
-    }
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav__pcm_to_s16(pBufferOut, sampleData, (size_t)samplesRead, bytesPerSample);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__ieee(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    if (pBufferOut == NULL) {
-        return drwav_read_pcm_frames(pWav, framesToRead, NULL);
-    }
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav__ieee_to_s16(pBufferOut, sampleData, (size_t)samplesRead, bytesPerSample);    /* Safe cast. */
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__alaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    if (pBufferOut == NULL) {
-        return drwav_read_pcm_frames(pWav, framesToRead, NULL);
-    }
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav_alaw_to_s16(pBufferOut, sampleData, (size_t)samplesRead);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s16__mulaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    if (pBufferOut == NULL) {
-        return drwav_read_pcm_frames(pWav, framesToRead, NULL);
-    }
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav_mulaw_to_s16(pBufferOut, sampleData, (size_t)samplesRead);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s16(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut)
-{
-    if (pWav == NULL || framesToRead == 0) {
-        return 0;
-    }
-
-    if (pBufferOut == NULL) {
-        return drwav_read_pcm_frames(pWav, framesToRead, NULL);
-    }
-
-    /* Don't try to read more samples than can potentially fit in the output buffer. */
-    if (framesToRead * pWav->channels * sizeof(drwav_int16) > DRWAV_SIZE_MAX) {
-        framesToRead = DRWAV_SIZE_MAX / sizeof(drwav_int16) / pWav->channels;
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM) {
-        return drwav_read_pcm_frames_s16__pcm(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT) {
-        return drwav_read_pcm_frames_s16__ieee(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW) {
-        return drwav_read_pcm_frames_s16__alaw(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) {
-        return drwav_read_pcm_frames_s16__mulaw(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) {
-        return drwav_read_pcm_frames_s16__msadpcm(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) {
-        return drwav_read_pcm_frames_s16__ima(pWav, framesToRead, pBufferOut);
-    }
-
-    return 0;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s16le(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut)
-{
-    drwav_uint64 framesRead = drwav_read_pcm_frames_s16(pWav, framesToRead, pBufferOut);
-    if (pBufferOut != NULL && drwav__is_little_endian() == DRWAV_FALSE) {
-        drwav__bswap_samples_s16(pBufferOut, framesRead*pWav->channels);
-    }
-
-    return framesRead;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s16be(drwav* pWav, drwav_uint64 framesToRead, drwav_int16* pBufferOut)
-{
-    drwav_uint64 framesRead = drwav_read_pcm_frames_s16(pWav, framesToRead, pBufferOut);
-    if (pBufferOut != NULL && drwav__is_little_endian() == DRWAV_TRUE) {
-        drwav__bswap_samples_s16(pBufferOut, framesRead*pWav->channels);
-    }
-
-    return framesRead;
-}
-
-
-DRWAV_API void drwav_u8_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    int r;
-    size_t i;
-    for (i = 0; i < sampleCount; ++i) {
-        int x = pIn[i];
-        r = x << 8;
-        r = r - 32768;
-        pOut[i] = (short)r;
-    }
-}
-
-DRWAV_API void drwav_s24_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    int r;
-    size_t i;
-    for (i = 0; i < sampleCount; ++i) {
-        int x = ((int)(((unsigned int)(((const drwav_uint8*)pIn)[i*3+0]) << 8) | ((unsigned int)(((const drwav_uint8*)pIn)[i*3+1]) << 16) | ((unsigned int)(((const drwav_uint8*)pIn)[i*3+2])) << 24)) >> 8;
-        r = x >> 8;
-        pOut[i] = (short)r;
-    }
-}
-
-DRWAV_API void drwav_s32_to_s16(drwav_int16* pOut, const drwav_int32* pIn, size_t sampleCount)
-{
-    int r;
-    size_t i;
-    for (i = 0; i < sampleCount; ++i) {
-        int x = pIn[i];
-        r = x >> 16;
-        pOut[i] = (short)r;
-    }
-}
-
-DRWAV_API void drwav_f32_to_s16(drwav_int16* pOut, const float* pIn, size_t sampleCount)
-{
-    int r;
-    size_t i;
-    for (i = 0; i < sampleCount; ++i) {
-        float x = pIn[i];
-        float c;
-        c = ((x < -1) ? -1 : ((x > 1) ? 1 : x));
-        c = c + 1;
-        r = (int)(c * 32767.5f);
-        r = r - 32768;
-        pOut[i] = (short)r;
-    }
-}
-
-DRWAV_API void drwav_f64_to_s16(drwav_int16* pOut, const double* pIn, size_t sampleCount)
-{
-    int r;
-    size_t i;
-    for (i = 0; i < sampleCount; ++i) {
-        double x = pIn[i];
-        double c;
-        c = ((x < -1) ? -1 : ((x > 1) ? 1 : x));
-        c = c + 1;
-        r = (int)(c * 32767.5);
-        r = r - 32768;
-        pOut[i] = (short)r;
-    }
-}
-
-DRWAV_API void drwav_alaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-    for (i = 0; i < sampleCount; ++i) {
-        pOut[i] = drwav__alaw_to_s16(pIn[i]);
-    }
-}
-
-DRWAV_API void drwav_mulaw_to_s16(drwav_int16* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-    for (i = 0; i < sampleCount; ++i) {
-        pOut[i] = drwav__mulaw_to_s16(pIn[i]);
-    }
-}
-
-
-
-DRWAV_PRIVATE void drwav__pcm_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount, unsigned int bytesPerSample)
-{
-    unsigned int i;
-
-    /* Special case for 8-bit sample data because it's treated as unsigned. */
-    if (bytesPerSample == 1) {
-        drwav_u8_to_f32(pOut, pIn, sampleCount);
-        return;
-    }
-
-    /* Slightly more optimal implementation for common formats. */
-    if (bytesPerSample == 2) {
-        drwav_s16_to_f32(pOut, (const drwav_int16*)pIn, sampleCount);
-        return;
-    }
-    if (bytesPerSample == 3) {
-        drwav_s24_to_f32(pOut, pIn, sampleCount);
-        return;
-    }
-    if (bytesPerSample == 4) {
-        drwav_s32_to_f32(pOut, (const drwav_int32*)pIn, sampleCount);
-        return;
-    }
-
-
-    /* Anything more than 64 bits per sample is not supported. */
-    if (bytesPerSample > 8) {
-        DRWAV_ZERO_MEMORY(pOut, sampleCount * sizeof(*pOut));
-        return;
-    }
-
-
-    /* Generic, slow converter. */
-    for (i = 0; i < sampleCount; ++i) {
-        drwav_uint64 sample = 0;
-        unsigned int shift  = (8 - bytesPerSample) * 8;
-
-        unsigned int j;
-        for (j = 0; j < bytesPerSample; j += 1) {
-            DRWAV_ASSERT(j < 8);
-            sample |= (drwav_uint64)(pIn[j]) << shift;
-            shift  += 8;
-        }
-
-        pIn += j;
-        *pOut++ = (float)((drwav_int64)sample / 9223372036854775807.0);
-    }
-}
-
-DRWAV_PRIVATE void drwav__ieee_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount, unsigned int bytesPerSample)
-{
-    if (bytesPerSample == 4) {
-        unsigned int i;
-        for (i = 0; i < sampleCount; ++i) {
-            *pOut++ = ((const float*)pIn)[i];
-        }
-        return;
-    } else if (bytesPerSample == 8) {
-        drwav_f64_to_f32(pOut, (const double*)pIn, sampleCount);
-        return;
-    } else {
-        /* Only supporting 32- and 64-bit float. Output silence in all other cases. Contributions welcome for 16-bit float. */
-        DRWAV_ZERO_MEMORY(pOut, sampleCount * sizeof(*pOut));
-        return;
-    }
-}
-
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__pcm(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav__pcm_to_f32(pBufferOut, sampleData, (size_t)samplesRead, bytesPerSample);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__msadpcm_ima(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut)
-{
-    /*
-    We're just going to borrow the implementation from the drwav_read_s16() since ADPCM is a little bit more complicated than other formats and I don't
-    want to duplicate that code.
-    */
-    drwav_uint64 totalFramesRead;
-    drwav_int16 samples16[2048];
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, drwav_countof(samples16)/pWav->channels);
-        drwav_uint64 framesRead = drwav_read_pcm_frames_s16(pWav, framesToReadThisIteration, samples16);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        drwav_s16_to_f32(pBufferOut, samples16, (size_t)(framesRead*pWav->channels));   /* <-- Safe cast because we're clamping to 2048. */
-
-        pBufferOut      += framesRead*pWav->channels;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__ieee(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    /* Fast path. */
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT && pWav->bitsPerSample == 32) {
-        return drwav_read_pcm_frames(pWav, framesToRead, pBufferOut);
-    }
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav__ieee_to_f32(pBufferOut, sampleData, (size_t)samplesRead, bytesPerSample);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__alaw(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav_alaw_to_f32(pBufferOut, sampleData, (size_t)samplesRead);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_f32__mulaw(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav_mulaw_to_f32(pBufferOut, sampleData, (size_t)samplesRead);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_f32(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut)
-{
-    if (pWav == NULL || framesToRead == 0) {
-        return 0;
-    }
-
-    if (pBufferOut == NULL) {
-        return drwav_read_pcm_frames(pWav, framesToRead, NULL);
-    }
-
-    /* Don't try to read more samples than can potentially fit in the output buffer. */
-    if (framesToRead * pWav->channels * sizeof(float) > DRWAV_SIZE_MAX) {
-        framesToRead = DRWAV_SIZE_MAX / sizeof(float) / pWav->channels;
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM) {
-        return drwav_read_pcm_frames_f32__pcm(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM || pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) {
-        return drwav_read_pcm_frames_f32__msadpcm_ima(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT) {
-        return drwav_read_pcm_frames_f32__ieee(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW) {
-        return drwav_read_pcm_frames_f32__alaw(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) {
-        return drwav_read_pcm_frames_f32__mulaw(pWav, framesToRead, pBufferOut);
-    }
-
-    return 0;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_f32le(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut)
-{
-    drwav_uint64 framesRead = drwav_read_pcm_frames_f32(pWav, framesToRead, pBufferOut);
-    if (pBufferOut != NULL && drwav__is_little_endian() == DRWAV_FALSE) {
-        drwav__bswap_samples_f32(pBufferOut, framesRead*pWav->channels);
-    }
-
-    return framesRead;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_f32be(drwav* pWav, drwav_uint64 framesToRead, float* pBufferOut)
-{
-    drwav_uint64 framesRead = drwav_read_pcm_frames_f32(pWav, framesToRead, pBufferOut);
-    if (pBufferOut != NULL && drwav__is_little_endian() == DRWAV_TRUE) {
-        drwav__bswap_samples_f32(pBufferOut, framesRead*pWav->channels);
-    }
-
-    return framesRead;
-}
-
-
-DRWAV_API void drwav_u8_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-#ifdef DR_WAV_LIBSNDFILE_COMPAT
-    /*
-    It appears libsndfile uses slightly different logic for the u8 -> f32 conversion to dr_wav, which in my opinion is incorrect. It appears
-    libsndfile performs the conversion something like "f32 = (u8 / 256) * 2 - 1", however I think it should be "f32 = (u8 / 255) * 2 - 1" (note
-    the divisor of 256 vs 255). I use libsndfile as a benchmark for testing, so I'm therefore leaving this block here just for my automated
-    correctness testing. This is disabled by default.
-    */
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = (pIn[i] / 256.0f) * 2 - 1;
-    }
-#else
-    for (i = 0; i < sampleCount; ++i) {
-        float x = pIn[i];
-        x = x * 0.00784313725490196078f;    /* 0..255 to 0..2 */
-        x = x - 1;                          /* 0..2 to -1..1 */
-
-        *pOut++ = x;
-    }
-#endif
-}
-
-DRWAV_API void drwav_s16_to_f32(float* pOut, const drwav_int16* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = pIn[i] * 0.000030517578125f;
-    }
-}
-
-DRWAV_API void drwav_s24_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        double x;
-        drwav_uint32 a = ((drwav_uint32)(pIn[i*3+0]) <<  8);
-        drwav_uint32 b = ((drwav_uint32)(pIn[i*3+1]) << 16);
-        drwav_uint32 c = ((drwav_uint32)(pIn[i*3+2]) << 24);
-
-        x = (double)((drwav_int32)(a | b | c) >> 8);
-        *pOut++ = (float)(x * 0.00000011920928955078125);
-    }
-}
-
-DRWAV_API void drwav_s32_to_f32(float* pOut, const drwav_int32* pIn, size_t sampleCount)
-{
-    size_t i;
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = (float)(pIn[i] / 2147483648.0);
-    }
-}
-
-DRWAV_API void drwav_f64_to_f32(float* pOut, const double* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = (float)pIn[i];
-    }
-}
-
-DRWAV_API void drwav_alaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = drwav__alaw_to_s16(pIn[i]) / 32768.0f;
-    }
-}
-
-DRWAV_API void drwav_mulaw_to_f32(float* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = drwav__mulaw_to_s16(pIn[i]) / 32768.0f;
-    }
-}
-
-
-
-DRWAV_PRIVATE void drwav__pcm_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample)
-{
-    unsigned int i;
-
-    /* Special case for 8-bit sample data because it's treated as unsigned. */
-    if (bytesPerSample == 1) {
-        drwav_u8_to_s32(pOut, pIn, totalSampleCount);
-        return;
-    }
-
-    /* Slightly more optimal implementation for common formats. */
-    if (bytesPerSample == 2) {
-        drwav_s16_to_s32(pOut, (const drwav_int16*)pIn, totalSampleCount);
-        return;
-    }
-    if (bytesPerSample == 3) {
-        drwav_s24_to_s32(pOut, pIn, totalSampleCount);
-        return;
-    }
-    if (bytesPerSample == 4) {
-        for (i = 0; i < totalSampleCount; ++i) {
-           *pOut++ = ((const drwav_int32*)pIn)[i];
-        }
-        return;
-    }
-
-
-    /* Anything more than 64 bits per sample is not supported. */
-    if (bytesPerSample > 8) {
-        DRWAV_ZERO_MEMORY(pOut, totalSampleCount * sizeof(*pOut));
-        return;
-    }
-
-
-    /* Generic, slow converter. */
-    for (i = 0; i < totalSampleCount; ++i) {
-        drwav_uint64 sample = 0;
-        unsigned int shift  = (8 - bytesPerSample) * 8;
-
-        unsigned int j;
-        for (j = 0; j < bytesPerSample; j += 1) {
-            DRWAV_ASSERT(j < 8);
-            sample |= (drwav_uint64)(pIn[j]) << shift;
-            shift  += 8;
-        }
-
-        pIn += j;
-        *pOut++ = (drwav_int32)((drwav_int64)sample >> 32);
-    }
-}
-
-DRWAV_PRIVATE void drwav__ieee_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t totalSampleCount, unsigned int bytesPerSample)
-{
-    if (bytesPerSample == 4) {
-        drwav_f32_to_s32(pOut, (const float*)pIn, totalSampleCount);
-        return;
-    } else if (bytesPerSample == 8) {
-        drwav_f64_to_s32(pOut, (const double*)pIn, totalSampleCount);
-        return;
-    } else {
-        /* Only supporting 32- and 64-bit float. Output silence in all other cases. Contributions welcome for 16-bit float. */
-        DRWAV_ZERO_MEMORY(pOut, totalSampleCount * sizeof(*pOut));
-        return;
-    }
-}
-
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__pcm(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    /* Fast path. */
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM && pWav->bitsPerSample == 32) {
-        return drwav_read_pcm_frames(pWav, framesToRead, pBufferOut);
-    }
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav__pcm_to_s32(pBufferOut, sampleData, (size_t)samplesRead, bytesPerSample);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__msadpcm_ima(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut)
-{
-    /*
-    We're just going to borrow the implementation from the drwav_read_s16() since ADPCM is a little bit more complicated than other formats and I don't
-    want to duplicate that code.
-    */
-    drwav_uint64 totalFramesRead = 0;
-    drwav_int16 samples16[2048];
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, drwav_countof(samples16)/pWav->channels);
-        drwav_uint64 framesRead = drwav_read_pcm_frames_s16(pWav, framesToReadThisIteration, samples16);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        drwav_s16_to_s32(pBufferOut, samples16, (size_t)(framesRead*pWav->channels));   /* <-- Safe cast because we're clamping to 2048. */
-
-        pBufferOut      += framesRead*pWav->channels;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__ieee(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav__ieee_to_s32(pBufferOut, sampleData, (size_t)samplesRead, bytesPerSample);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__alaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav_alaw_to_s32(pBufferOut, sampleData, (size_t)samplesRead);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_PRIVATE drwav_uint64 drwav_read_pcm_frames_s32__mulaw(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut)
-{
-    drwav_uint64 totalFramesRead;
-    drwav_uint8 sampleData[4096] = {0};
-    drwav_uint32 bytesPerFrame;
-    drwav_uint32 bytesPerSample;
-    drwav_uint64 samplesRead;
-
-    bytesPerFrame = drwav_get_bytes_per_pcm_frame(pWav);
-    if (bytesPerFrame == 0) {
-        return 0;
-    }
-
-    bytesPerSample = bytesPerFrame / pWav->channels;
-    if (bytesPerSample == 0 || (bytesPerFrame % pWav->channels) != 0) {
-        return 0;   /* Only byte-aligned formats are supported. */
-    }
-
-    totalFramesRead = 0;
-
-    while (framesToRead > 0) {
-        drwav_uint64 framesToReadThisIteration = drwav_min(framesToRead, sizeof(sampleData)/bytesPerFrame);
-        drwav_uint64 framesRead = drwav_read_pcm_frames(pWav, framesToReadThisIteration, sampleData);
-        if (framesRead == 0) {
-            break;
-        }
-
-        DRWAV_ASSERT(framesRead <= framesToReadThisIteration);   /* If this fails it means there's a bug in drwav_read_pcm_frames(). */
-
-        /* Validation to ensure we don't read too much from out intermediary buffer. This is to protect from invalid files. */
-        samplesRead = framesRead * pWav->channels;
-        if ((samplesRead * bytesPerSample) > sizeof(sampleData)) {
-            DRWAV_ASSERT(DRWAV_FALSE);  /* This should never happen with a valid file. */
-            break;
-        }
-
-        drwav_mulaw_to_s32(pBufferOut, sampleData, (size_t)samplesRead);
-
-        pBufferOut      += samplesRead;
-        framesToRead    -= framesRead;
-        totalFramesRead += framesRead;
-    }
-
-    return totalFramesRead;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s32(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut)
-{
-    if (pWav == NULL || framesToRead == 0) {
-        return 0;
-    }
-
-    if (pBufferOut == NULL) {
-        return drwav_read_pcm_frames(pWav, framesToRead, NULL);
-    }
-
-    /* Don't try to read more samples than can potentially fit in the output buffer. */
-    if (framesToRead * pWav->channels * sizeof(drwav_int32) > DRWAV_SIZE_MAX) {
-        framesToRead = DRWAV_SIZE_MAX / sizeof(drwav_int32) / pWav->channels;
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_PCM) {
-        return drwav_read_pcm_frames_s32__pcm(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM || pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) {
-        return drwav_read_pcm_frames_s32__msadpcm_ima(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_IEEE_FLOAT) {
-        return drwav_read_pcm_frames_s32__ieee(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ALAW) {
-        return drwav_read_pcm_frames_s32__alaw(pWav, framesToRead, pBufferOut);
-    }
-
-    if (pWav->translatedFormatTag == DR_WAVE_FORMAT_MULAW) {
-        return drwav_read_pcm_frames_s32__mulaw(pWav, framesToRead, pBufferOut);
-    }
-
-    return 0;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s32le(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut)
-{
-    drwav_uint64 framesRead = drwav_read_pcm_frames_s32(pWav, framesToRead, pBufferOut);
-    if (pBufferOut != NULL && drwav__is_little_endian() == DRWAV_FALSE) {
-        drwav__bswap_samples_s32(pBufferOut, framesRead*pWav->channels);
-    }
-
-    return framesRead;
-}
-
-DRWAV_API drwav_uint64 drwav_read_pcm_frames_s32be(drwav* pWav, drwav_uint64 framesToRead, drwav_int32* pBufferOut)
-{
-    drwav_uint64 framesRead = drwav_read_pcm_frames_s32(pWav, framesToRead, pBufferOut);
-    if (pBufferOut != NULL && drwav__is_little_endian() == DRWAV_TRUE) {
-        drwav__bswap_samples_s32(pBufferOut, framesRead*pWav->channels);
-    }
-
-    return framesRead;
-}
-
-
-DRWAV_API void drwav_u8_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = ((int)pIn[i] - 128) << 24;
-    }
-}
-
-DRWAV_API void drwav_s16_to_s32(drwav_int32* pOut, const drwav_int16* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = pIn[i] << 16;
-    }
-}
-
-DRWAV_API void drwav_s24_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        unsigned int s0 = pIn[i*3 + 0];
-        unsigned int s1 = pIn[i*3 + 1];
-        unsigned int s2 = pIn[i*3 + 2];
-
-        drwav_int32 sample32 = (drwav_int32)((s0 << 8) | (s1 << 16) | (s2 << 24));
-        *pOut++ = sample32;
-    }
-}
-
-DRWAV_API void drwav_f32_to_s32(drwav_int32* pOut, const float* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = (drwav_int32)(2147483648.0 * pIn[i]);
-    }
-}
-
-DRWAV_API void drwav_f64_to_s32(drwav_int32* pOut, const double* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = (drwav_int32)(2147483648.0 * pIn[i]);
-    }
-}
-
-DRWAV_API void drwav_alaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i = 0; i < sampleCount; ++i) {
-        *pOut++ = ((drwav_int32)drwav__alaw_to_s16(pIn[i])) << 16;
-    }
-}
-
-DRWAV_API void drwav_mulaw_to_s32(drwav_int32* pOut, const drwav_uint8* pIn, size_t sampleCount)
-{
-    size_t i;
-
-    if (pOut == NULL || pIn == NULL) {
-        return;
-    }
-
-    for (i= 0; i < sampleCount; ++i) {
-        *pOut++ = ((drwav_int32)drwav__mulaw_to_s16(pIn[i])) << 16;
-    }
-}
-
-
-
-DRWAV_PRIVATE drwav_int16* drwav__read_pcm_frames_and_close_s16(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalFrameCount)
-{
-    drwav_uint64 sampleDataSize;
-    drwav_int16* pSampleData;
-    drwav_uint64 framesRead;
-
-    DRWAV_ASSERT(pWav != NULL);
-
-    sampleDataSize = pWav->totalPCMFrameCount * pWav->channels * sizeof(drwav_int16);
-    if (sampleDataSize > DRWAV_SIZE_MAX) {
-        drwav_uninit(pWav);
-        return NULL;    /* File's too big. */
-    }
-
-    pSampleData = (drwav_int16*)drwav__malloc_from_callbacks((size_t)sampleDataSize, &pWav->allocationCallbacks); /* <-- Safe cast due to the check above. */
-    if (pSampleData == NULL) {
-        drwav_uninit(pWav);
-        return NULL;    /* Failed to allocate memory. */
-    }
-
-    framesRead = drwav_read_pcm_frames_s16(pWav, (size_t)pWav->totalPCMFrameCount, pSampleData);
-    if (framesRead != pWav->totalPCMFrameCount) {
-        drwav__free_from_callbacks(pSampleData, &pWav->allocationCallbacks);
-        drwav_uninit(pWav);
-        return NULL;    /* There was an error reading the samples. */
-    }
-
-    drwav_uninit(pWav);
-
-    if (sampleRate) {
-        *sampleRate = pWav->sampleRate;
-    }
-    if (channels) {
-        *channels = pWav->channels;
-    }
-    if (totalFrameCount) {
-        *totalFrameCount = pWav->totalPCMFrameCount;
-    }
-
-    return pSampleData;
-}
-
-DRWAV_PRIVATE float* drwav__read_pcm_frames_and_close_f32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalFrameCount)
-{
-    drwav_uint64 sampleDataSize;
-    float* pSampleData;
-    drwav_uint64 framesRead;
-
-    DRWAV_ASSERT(pWav != NULL);
-
-    sampleDataSize = pWav->totalPCMFrameCount * pWav->channels * sizeof(float);
-    if (sampleDataSize > DRWAV_SIZE_MAX) {
-        drwav_uninit(pWav);
-        return NULL;    /* File's too big. */
-    }
-
-    pSampleData = (float*)drwav__malloc_from_callbacks((size_t)sampleDataSize, &pWav->allocationCallbacks); /* <-- Safe cast due to the check above. */
-    if (pSampleData == NULL) {
-        drwav_uninit(pWav);
-        return NULL;    /* Failed to allocate memory. */
-    }
-
-    framesRead = drwav_read_pcm_frames_f32(pWav, (size_t)pWav->totalPCMFrameCount, pSampleData);
-    if (framesRead != pWav->totalPCMFrameCount) {
-        drwav__free_from_callbacks(pSampleData, &pWav->allocationCallbacks);
-        drwav_uninit(pWav);
-        return NULL;    /* There was an error reading the samples. */
-    }
-
-    drwav_uninit(pWav);
-
-    if (sampleRate) {
-        *sampleRate = pWav->sampleRate;
-    }
-    if (channels) {
-        *channels = pWav->channels;
-    }
-    if (totalFrameCount) {
-        *totalFrameCount = pWav->totalPCMFrameCount;
-    }
-
-    return pSampleData;
-}
-
-DRWAV_PRIVATE drwav_int32* drwav__read_pcm_frames_and_close_s32(drwav* pWav, unsigned int* channels, unsigned int* sampleRate, drwav_uint64* totalFrameCount)
-{
-    drwav_uint64 sampleDataSize;
-    drwav_int32* pSampleData;
-    drwav_uint64 framesRead;
-
-    DRWAV_ASSERT(pWav != NULL);
-
-    sampleDataSize = pWav->totalPCMFrameCount * pWav->channels * sizeof(drwav_int32);
-    if (sampleDataSize > DRWAV_SIZE_MAX) {
-        drwav_uninit(pWav);
-        return NULL;    /* File's too big. */
-    }
-
-    pSampleData = (drwav_int32*)drwav__malloc_from_callbacks((size_t)sampleDataSize, &pWav->allocationCallbacks); /* <-- Safe cast due to the check above. */
-    if (pSampleData == NULL) {
-        drwav_uninit(pWav);
-        return NULL;    /* Failed to allocate memory. */
-    }
-
-    framesRead = drwav_read_pcm_frames_s32(pWav, (size_t)pWav->totalPCMFrameCount, pSampleData);
-    if (framesRead != pWav->totalPCMFrameCount) {
-        drwav__free_from_callbacks(pSampleData, &pWav->allocationCallbacks);
-        drwav_uninit(pWav);
-        return NULL;    /* There was an error reading the samples. */
-    }
-
-    drwav_uninit(pWav);
-
-    if (sampleRate) {
-        *sampleRate = pWav->sampleRate;
-    }
-    if (channels) {
-        *channels = pWav->channels;
-    }
-    if (totalFrameCount) {
-        *totalFrameCount = pWav->totalPCMFrameCount;
-    }
-
-    return pSampleData;
-}
-
-
-
-DRWAV_API drwav_int16* drwav_open_and_read_pcm_frames_s16(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init(&wav, onRead, onSeek, pUserData, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_s16(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-DRWAV_API float* drwav_open_and_read_pcm_frames_f32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init(&wav, onRead, onSeek, pUserData, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_f32(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-DRWAV_API drwav_int32* drwav_open_and_read_pcm_frames_s32(drwav_read_proc onRead, drwav_seek_proc onSeek, void* pUserData, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init(&wav, onRead, onSeek, pUserData, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_s32(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-#ifndef DR_WAV_NO_STDIO
-DRWAV_API drwav_int16* drwav_open_file_and_read_pcm_frames_s16(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init_file(&wav, filename, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_s16(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-DRWAV_API float* drwav_open_file_and_read_pcm_frames_f32(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init_file(&wav, filename, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_f32(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-DRWAV_API drwav_int32* drwav_open_file_and_read_pcm_frames_s32(const char* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init_file(&wav, filename, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_s32(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-
-#ifndef DR_WAV_NO_WCHAR
-DRWAV_API drwav_int16* drwav_open_file_and_read_pcm_frames_s16_w(const wchar_t* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init_file_w(&wav, filename, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_s16(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-DRWAV_API float* drwav_open_file_and_read_pcm_frames_f32_w(const wchar_t* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init_file_w(&wav, filename, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_f32(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-DRWAV_API drwav_int32* drwav_open_file_and_read_pcm_frames_s32_w(const wchar_t* filename, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init_file_w(&wav, filename, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_s32(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-#endif /* DR_WAV_NO_WCHAR */
-#endif /* DR_WAV_NO_STDIO */
-
-DRWAV_API drwav_int16* drwav_open_memory_and_read_pcm_frames_s16(const void* data, size_t dataSize, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init_memory(&wav, data, dataSize, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_s16(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-DRWAV_API float* drwav_open_memory_and_read_pcm_frames_f32(const void* data, size_t dataSize, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init_memory(&wav, data, dataSize, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_f32(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-
-DRWAV_API drwav_int32* drwav_open_memory_and_read_pcm_frames_s32(const void* data, size_t dataSize, unsigned int* channelsOut, unsigned int* sampleRateOut, drwav_uint64* totalFrameCountOut, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    drwav wav;
-
-    if (channelsOut) {
-        *channelsOut = 0;
-    }
-    if (sampleRateOut) {
-        *sampleRateOut = 0;
-    }
-    if (totalFrameCountOut) {
-        *totalFrameCountOut = 0;
-    }
-
-    if (!drwav_init_memory(&wav, data, dataSize, pAllocationCallbacks)) {
-        return NULL;
-    }
-
-    return drwav__read_pcm_frames_and_close_s32(&wav, channelsOut, sampleRateOut, totalFrameCountOut);
-}
-#endif  /* DR_WAV_NO_CONVERSION_API */
-
-
-DRWAV_API void drwav_free(void* p, const drwav_allocation_callbacks* pAllocationCallbacks)
-{
-    if (pAllocationCallbacks != NULL) {
-        drwav__free_from_callbacks(p, pAllocationCallbacks);
-    } else {
-        drwav__free_default(p, NULL);
-    }
-}
-
-DRWAV_API drwav_uint16 drwav_bytes_to_u16(const drwav_uint8* data)
-{
-    return ((drwav_uint16)data[0] << 0) | ((drwav_uint16)data[1] << 8);
-}
-
-DRWAV_API drwav_int16 drwav_bytes_to_s16(const drwav_uint8* data)
-{
-    return (drwav_int16)drwav_bytes_to_u16(data);
-}
-
-DRWAV_API drwav_uint32 drwav_bytes_to_u32(const drwav_uint8* data)
-{
-    return ((drwav_uint32)data[0] << 0) | ((drwav_uint32)data[1] << 8) | ((drwav_uint32)data[2] << 16) | ((drwav_uint32)data[3] << 24);
-}
-
-DRWAV_API float drwav_bytes_to_f32(const drwav_uint8* data)
-{
-    union {
-        drwav_uint32 u32;
-        float f32;
-    } value;
-
-    value.u32 = drwav_bytes_to_u32(data);
-    return value.f32;
-}
-
-DRWAV_API drwav_int32 drwav_bytes_to_s32(const drwav_uint8* data)
-{
-    return (drwav_int32)drwav_bytes_to_u32(data);
-}
-
-DRWAV_API drwav_uint64 drwav_bytes_to_u64(const drwav_uint8* data)
-{
-    return
-        ((drwav_uint64)data[0] <<  0) | ((drwav_uint64)data[1] <<  8) | ((drwav_uint64)data[2] << 16) | ((drwav_uint64)data[3] << 24) |
-        ((drwav_uint64)data[4] << 32) | ((drwav_uint64)data[5] << 40) | ((drwav_uint64)data[6] << 48) | ((drwav_uint64)data[7] << 56);
-}
-
-DRWAV_API drwav_int64 drwav_bytes_to_s64(const drwav_uint8* data)
-{
-    return (drwav_int64)drwav_bytes_to_u64(data);
-}
-
-
-DRWAV_API drwav_bool32 drwav_guid_equal(const drwav_uint8 a[16], const drwav_uint8 b[16])
-{
-    int i;
-    for (i = 0; i < 16; i += 1) {
-        if (a[i] != b[i]) {
-            return DRWAV_FALSE;
-        }
-    }
-
-    return DRWAV_TRUE;
-}
-
-DRWAV_API drwav_bool32 drwav_fourcc_equal(const drwav_uint8* a, const char* b)
-{
-    return
-        a[0] == b[0] &&
-        a[1] == b[1] &&
-        a[2] == b[2] &&
-        a[3] == b[3];
-}
-
-#ifdef __MRC__
-/* Undo the pragma at the beginning of this file. */
-#pragma options opt reset
-#endif
-
-#endif  /* dr_wav_c */
-#endif  /* DR_WAV_IMPLEMENTATION */
-
-/*
-REVISION HISTORY
-================
-v0.13.7 - 2022-09-17
-  - Fix compilation with DJGPP.
-  - Add support for disabling wchar_t with DR_WAV_NO_WCHAR.
-
-v0.13.6 - 2022-04-10
-  - Fix compilation error on older versions of GCC.
-  - Remove some dependencies on the standard library.
-
-v0.13.5 - 2022-01-26
-  - Fix an error when seeking to the end of the file.
-
-v0.13.4 - 2021-12-08
-  - Fix some static analysis warnings.
-
-v0.13.3 - 2021-11-24
-  - Fix an incorrect assertion when trying to endian swap 1-byte sample formats. This is now a no-op
-    rather than a failed assertion.
-  - Fix a bug with parsing of the bext chunk.
-  - Fix some static analysis warnings.
-
-v0.13.2 - 2021-10-02
-  - Fix a possible buffer overflow when reading from compressed formats.
-
-v0.13.1 - 2021-07-31
-  - Fix platform detection for ARM64.
-
-v0.13.0 - 2021-07-01
-  - Improve support for reading and writing metadata. Use the `_with_metadata()` APIs to initialize
-    a WAV decoder and store the metadata within the `drwav` object. Use the `pMetadata` and
-    `metadataCount` members of the `drwav` object to read the data. The old way of handling metadata
-    via a callback is still usable and valid.
-  - API CHANGE: drwav_target_write_size_bytes() now takes extra parameters for calculating the
-    required write size when writing metadata.
-  - Add drwav_get_cursor_in_pcm_frames()
-  - Add drwav_get_length_in_pcm_frames()
-  - Fix a bug where drwav_read_raw() can call the read callback with a byte count of zero.
-
-v0.12.20 - 2021-06-11
-  - Fix some undefined behavior.
-
-v0.12.19 - 2021-02-21
-  - Fix a warning due to referencing _MSC_VER when it is undefined.
-  - Minor improvements to the management of some internal state concerning the data chunk cursor.
-
-v0.12.18 - 2021-01-31
-  - Clean up some static analysis warnings.
-
-v0.12.17 - 2021-01-17
-  - Minor fix to sample code in documentation.
-  - Correctly qualify a private API as private rather than public.
-  - Code cleanup.
-
-v0.12.16 - 2020-12-02
-  - Fix a bug when trying to read more bytes than can fit in a size_t.
-
-v0.12.15 - 2020-11-21
-  - Fix compilation with OpenWatcom.
-
-v0.12.14 - 2020-11-13
-  - Minor code clean up.
-
-v0.12.13 - 2020-11-01
-  - Improve compiler support for older versions of GCC.
-
-v0.12.12 - 2020-09-28
-  - Add support for RF64.
-  - Fix a bug in writing mode where the size of the RIFF chunk incorrectly includes the header section.
-
-v0.12.11 - 2020-09-08
-  - Fix a compilation error on older compilers.
-
-v0.12.10 - 2020-08-24
-  - Fix a bug when seeking with ADPCM formats.
-
-v0.12.9 - 2020-08-02
-  - Simplify sized types.
-
-v0.12.8 - 2020-07-25
-  - Fix a compilation warning.
-
-v0.12.7 - 2020-07-15
-  - Fix some bugs on big-endian architectures.
-  - Fix an error in s24 to f32 conversion.
-
-v0.12.6 - 2020-06-23
-  - Change drwav_read_*() to allow NULL to be passed in as the output buffer which is equivalent to a forward seek.
-  - Fix a buffer overflow when trying to decode invalid IMA-ADPCM files.
-  - Add include guard for the implementation section.
-
-v0.12.5 - 2020-05-27
-  - Minor documentation fix.
-
-v0.12.4 - 2020-05-16
-  - Replace assert() with DRWAV_ASSERT().
-  - Add compile-time and run-time version querying.
-    - DRWAV_VERSION_MINOR
-    - DRWAV_VERSION_MAJOR
-    - DRWAV_VERSION_REVISION
-    - DRWAV_VERSION_STRING
-    - drwav_version()
-    - drwav_version_string()
-
-v0.12.3 - 2020-04-30
-  - Fix compilation errors with VC6.
-
-v0.12.2 - 2020-04-21
-  - Fix a bug where drwav_init_file() does not close the file handle after attempting to load an erroneous file.
-
-v0.12.1 - 2020-04-13
-  - Fix some pedantic warnings.
-
-v0.12.0 - 2020-04-04
-  - API CHANGE: Add container and format parameters to the chunk callback.
-  - Minor documentation updates.
-
-v0.11.5 - 2020-03-07
-  - Fix compilation error with Visual Studio .NET 2003.
-
-v0.11.4 - 2020-01-29
-  - Fix some static analysis warnings.
-  - Fix a bug when reading f32 samples from an A-law encoded stream.
-
-v0.11.3 - 2020-01-12
-  - Minor changes to some f32 format conversion routines.
-  - Minor bug fix for ADPCM conversion when end of file is reached.
-
-v0.11.2 - 2019-12-02
-  - Fix a possible crash when using custom memory allocators without a custom realloc() implementation.
-  - Fix an integer overflow bug.
-  - Fix a null pointer dereference bug.
-  - Add limits to sample rate, channels and bits per sample to tighten up some validation.
-
-v0.11.1 - 2019-10-07
-  - Internal code clean up.
-
-v0.11.0 - 2019-10-06
-  - API CHANGE: Add support for user defined memory allocation routines. This system allows the program to specify their own memory allocation
-    routines with a user data pointer for client-specific contextual data. This adds an extra parameter to the end of the following APIs:
-    - drwav_init()
-    - drwav_init_ex()
-    - drwav_init_file()
-    - drwav_init_file_ex()
-    - drwav_init_file_w()
-    - drwav_init_file_w_ex()
-    - drwav_init_memory()
-    - drwav_init_memory_ex()
-    - drwav_init_write()
-    - drwav_init_write_sequential()
-    - drwav_init_write_sequential_pcm_frames()
-    - drwav_init_file_write()
-    - drwav_init_file_write_sequential()
-    - drwav_init_file_write_sequential_pcm_frames()
-    - drwav_init_file_write_w()
-    - drwav_init_file_write_sequential_w()
-    - drwav_init_file_write_sequential_pcm_frames_w()
-    - drwav_init_memory_write()
-    - drwav_init_memory_write_sequential()
-    - drwav_init_memory_write_sequential_pcm_frames()
-    - drwav_open_and_read_pcm_frames_s16()
-    - drwav_open_and_read_pcm_frames_f32()
-    - drwav_open_and_read_pcm_frames_s32()
-    - drwav_open_file_and_read_pcm_frames_s16()
-    - drwav_open_file_and_read_pcm_frames_f32()
-    - drwav_open_file_and_read_pcm_frames_s32()
-    - drwav_open_file_and_read_pcm_frames_s16_w()
-    - drwav_open_file_and_read_pcm_frames_f32_w()
-    - drwav_open_file_and_read_pcm_frames_s32_w()
-    - drwav_open_memory_and_read_pcm_frames_s16()
-    - drwav_open_memory_and_read_pcm_frames_f32()
-    - drwav_open_memory_and_read_pcm_frames_s32()
-    Set this extra parameter to NULL to use defaults which is the same as the previous behaviour. Setting this NULL will use
-    DRWAV_MALLOC, DRWAV_REALLOC and DRWAV_FREE.
-  - Add support for reading and writing PCM frames in an explicit endianness. New APIs:
-    - drwav_read_pcm_frames_le()
-    - drwav_read_pcm_frames_be()
-    - drwav_read_pcm_frames_s16le()
-    - drwav_read_pcm_frames_s16be()
-    - drwav_read_pcm_frames_f32le()
-    - drwav_read_pcm_frames_f32be()
-    - drwav_read_pcm_frames_s32le()
-    - drwav_read_pcm_frames_s32be()
-    - drwav_write_pcm_frames_le()
-    - drwav_write_pcm_frames_be()
-  - Remove deprecated APIs.
-  - API CHANGE: The following APIs now return native-endian data. Previously they returned little-endian data.
-    - drwav_read_pcm_frames()
-    - drwav_read_pcm_frames_s16()
-    - drwav_read_pcm_frames_s32()
-    - drwav_read_pcm_frames_f32()
-    - drwav_open_and_read_pcm_frames_s16()
-    - drwav_open_and_read_pcm_frames_s32()
-    - drwav_open_and_read_pcm_frames_f32()
-    - drwav_open_file_and_read_pcm_frames_s16()
-    - drwav_open_file_and_read_pcm_frames_s32()
-    - drwav_open_file_and_read_pcm_frames_f32()
-    - drwav_open_file_and_read_pcm_frames_s16_w()
-    - drwav_open_file_and_read_pcm_frames_s32_w()
-    - drwav_open_file_and_read_pcm_frames_f32_w()
-    - drwav_open_memory_and_read_pcm_frames_s16()
-    - drwav_open_memory_and_read_pcm_frames_s32()
-    - drwav_open_memory_and_read_pcm_frames_f32()
-
-v0.10.1 - 2019-08-31
-  - Correctly handle partial trailing ADPCM blocks.
-
-v0.10.0 - 2019-08-04
-  - Remove deprecated APIs.
-  - Add wchar_t variants for file loading APIs:
-      drwav_init_file_w()
-      drwav_init_file_ex_w()
-      drwav_init_file_write_w()
-      drwav_init_file_write_sequential_w()
-  - Add drwav_target_write_size_bytes() which calculates the total size in bytes of a WAV file given a format and sample count.
-  - Add APIs for specifying the PCM frame count instead of the sample count when opening in sequential write mode:
-      drwav_init_write_sequential_pcm_frames()
-      drwav_init_file_write_sequential_pcm_frames()
-      drwav_init_file_write_sequential_pcm_frames_w()
-      drwav_init_memory_write_sequential_pcm_frames()
-  - Deprecate drwav_open*() and drwav_close():
-      drwav_open()
-      drwav_open_ex()
-      drwav_open_write()
-      drwav_open_write_sequential()
-      drwav_open_file()
-      drwav_open_file_ex()
-      drwav_open_file_write()
-      drwav_open_file_write_sequential()
-      drwav_open_memory()
-      drwav_open_memory_ex()
-      drwav_open_memory_write()
-      drwav_open_memory_write_sequential()
-      drwav_close()
-  - Minor documentation updates.
-
-v0.9.2 - 2019-05-21
-  - Fix warnings.
-
-v0.9.1 - 2019-05-05
-  - Add support for C89.
-  - Change license to choice of public domain or MIT-0.
-
-v0.9.0 - 2018-12-16
-  - API CHANGE: Add new reading APIs for reading by PCM frames instead of samples. Old APIs have been deprecated and
-    will be removed in v0.10.0. Deprecated APIs and their replacements:
-      drwav_read()                     -> drwav_read_pcm_frames()
-      drwav_read_s16()                 -> drwav_read_pcm_frames_s16()
-      drwav_read_f32()                 -> drwav_read_pcm_frames_f32()
-      drwav_read_s32()                 -> drwav_read_pcm_frames_s32()
-      drwav_seek_to_sample()           -> drwav_seek_to_pcm_frame()
-      drwav_write()                    -> drwav_write_pcm_frames()
-      drwav_open_and_read_s16()        -> drwav_open_and_read_pcm_frames_s16()
-      drwav_open_and_read_f32()        -> drwav_open_and_read_pcm_frames_f32()
-      drwav_open_and_read_s32()        -> drwav_open_and_read_pcm_frames_s32()
-      drwav_open_file_and_read_s16()   -> drwav_open_file_and_read_pcm_frames_s16()
-      drwav_open_file_and_read_f32()   -> drwav_open_file_and_read_pcm_frames_f32()
-      drwav_open_file_and_read_s32()   -> drwav_open_file_and_read_pcm_frames_s32()
-      drwav_open_memory_and_read_s16() -> drwav_open_memory_and_read_pcm_frames_s16()
-      drwav_open_memory_and_read_f32() -> drwav_open_memory_and_read_pcm_frames_f32()
-      drwav_open_memory_and_read_s32() -> drwav_open_memory_and_read_pcm_frames_s32()
-      drwav::totalSampleCount          -> drwav::totalPCMFrameCount
-  - API CHANGE: Rename drwav_open_and_read_file_*() to drwav_open_file_and_read_*().
-  - API CHANGE: Rename drwav_open_and_read_memory_*() to drwav_open_memory_and_read_*().
-  - Add built-in support for smpl chunks.
-  - Add support for firing a callback for each chunk in the file at initialization time.
-    - This is enabled through the drwav_init_ex(), etc. family of APIs.
-  - Handle invalid FMT chunks more robustly.
-
-v0.8.5 - 2018-09-11
-  - Const correctness.
-  - Fix a potential stack overflow.
-
-v0.8.4 - 2018-08-07
-  - Improve 64-bit detection.
-
-v0.8.3 - 2018-08-05
-  - Fix C++ build on older versions of GCC.
-
-v0.8.2 - 2018-08-02
-  - Fix some big-endian bugs.
-
-v0.8.1 - 2018-06-29
-  - Add support for sequential writing APIs.
-  - Disable seeking in write mode.
-  - Fix bugs with Wave64.
-  - Fix typos.
-
-v0.8 - 2018-04-27
-  - Bug fix.
-  - Start using major.minor.revision versioning.
-
-v0.7f - 2018-02-05
-  - Restrict ADPCM formats to a maximum of 2 channels.
-
-v0.7e - 2018-02-02
-  - Fix a crash.
-
-v0.7d - 2018-02-01
-  - Fix a crash.
-
-v0.7c - 2018-02-01
-  - Set drwav.bytesPerSample to 0 for all compressed formats.
-  - Fix a crash when reading 16-bit floating point WAV files. In this case dr_wav will output silence for
-    all format conversion reading APIs (*_s16, *_s32, *_f32 APIs).
-  - Fix some divide-by-zero errors.
-
-v0.7b - 2018-01-22
-  - Fix errors with seeking of compressed formats.
-  - Fix compilation error when DR_WAV_NO_CONVERSION_API
-
-v0.7a - 2017-11-17
-  - Fix some GCC warnings.
-
-v0.7 - 2017-11-04
-  - Add writing APIs.
-
-v0.6 - 2017-08-16
-  - API CHANGE: Rename dr_* types to drwav_*.
-  - Add support for custom implementations of malloc(), realloc(), etc.
-  - Add support for Microsoft ADPCM.
-  - Add support for IMA ADPCM (DVI, format code 0x11).
-  - Optimizations to drwav_read_s16().
-  - Bug fixes.
-
-v0.5g - 2017-07-16
-  - Change underlying type for booleans to unsigned.
-
-v0.5f - 2017-04-04
-  - Fix a minor bug with drwav_open_and_read_s16() and family.
-
-v0.5e - 2016-12-29
-  - Added support for reading samples as signed 16-bit integers. Use the _s16() family of APIs for this.
-  - Minor fixes to documentation.
-
-v0.5d - 2016-12-28
-  - Use drwav_int* and drwav_uint* sized types to improve compiler support.
-
-v0.5c - 2016-11-11
-  - Properly handle JUNK chunks that come before the FMT chunk.
-
-v0.5b - 2016-10-23
-  - A minor change to drwav_bool8 and drwav_bool32 types.
-
-v0.5a - 2016-10-11
-  - Fixed a bug with drwav_open_and_read() and family due to incorrect argument ordering.
-  - Improve A-law and mu-law efficiency.
-
-v0.5 - 2016-09-29
-  - API CHANGE. Swap the order of "channels" and "sampleRate" parameters in drwav_open_and_read*(). Rationale for this is to
-    keep it consistent with dr_audio and dr_flac.
-
-v0.4b - 2016-09-18
-  - Fixed a typo in documentation.
-
-v0.4a - 2016-09-18
-  - Fixed a typo.
-  - Change date format to ISO 8601 (YYYY-MM-DD)
-
-v0.4 - 2016-07-13
-  - API CHANGE. Make onSeek consistent with dr_flac.
-  - API CHANGE. Rename drwav_seek() to drwav_seek_to_sample() for clarity and consistency with dr_flac.
-  - Added support for Sony Wave64.
-
-v0.3a - 2016-05-28
-  - API CHANGE. Return drwav_bool32 instead of int in onSeek callback.
-  - Fixed a memory leak.
-
-v0.3 - 2016-05-22
-  - Lots of API changes for consistency.
-
-v0.2a - 2016-05-16
-  - Fixed Linux/GCC build.
-
-v0.2 - 2016-05-11
-  - Added support for reading data as signed 32-bit PCM for consistency with dr_flac.
-
-v0.1a - 2016-05-07
-  - Fixed a bug in drwav_open_file() where the file handle would not be closed if the loader failed to initialize.
-
-v0.1 - 2016-05-04
-  - Initial versioned release.
-*/
-
-/*
-This software is available as a choice of the following licenses. Choose
-whichever you prefer.
-
-===============================================================================
-ALTERNATIVE 1 - Public Domain (www.unlicense.org)
-===============================================================================
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-
-===============================================================================
-ALTERNATIVE 2 - MIT No Attribution
-===============================================================================
-Copyright 2020 David Reid
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/jeaiii_to_text.LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/jeaiii_to_text.LICENSE
deleted file mode 100644
index 76b39fe6e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/jeaiii_to_text.LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 James Edward Anhalt III - https://github.com/jeaiii/itoa
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/jeaiii_to_text.h b/contrib/tinyusdz/tinyusdz_repo/src/external/jeaiii_to_text.h
deleted file mode 100644
index 39f87800c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/jeaiii_to_text.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2022 James Edward Anhalt III - https://github.com/jeaiii/itoa
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#ifndef JEAIII_TO_TEXT_H_
-#define JEAIII_TO_TEXT_H_
-
-namespace jeaiii
-{
-    using u32 = decltype(0xffffffff);
-    using u64 = decltype(0xffffffffffffffff);
-
-    struct pair
-    {
-        char dd[2];
-        constexpr pair(char c) : dd{ c, '\0' } { }
-        constexpr pair(int n) : dd{ "0123456789"[n / 10], "0123456789"[n % 10] } { }
-    };
-
-    constexpr struct
-    {
-        pair dd[100]
-        {
-            0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
-            10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-            20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-            30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-            40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-            50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-            60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
-            70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-            80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
-            90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
-        };
-        pair fd[100]
-        {
-            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-            10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-            20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-            30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-            40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
-            50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-            60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
-            70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
-            80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
-            90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
-        };
-    }
-    digits;
-
-    constexpr u64 mask24 = (u64(1) << 24) - 1;
-    constexpr u64 mask32 = (u64(1) << 32) - 1;
-    constexpr u64 mask57 = (u64(1) << 57) - 1;
-
-    template<bool, class, class F> struct _cond { using type = F; };
-    template<class T, class F> struct _cond<true, T, F> { using type = T; };
-    template<bool B, class T, class F> using cond = typename _cond<B, T, F>::type;
-
-    template<class T>
-#if defined(_MSC_VER)
-    __forceinline
-#else
-    inline
-#endif
-    char* to_text_from_integer(char* b, T i)
-    {
-        constexpr auto q = sizeof(T);
-        using U = cond<q == 1, unsigned char, cond<q <= sizeof(short), unsigned short, cond<q <= sizeof(u32), u32, u64>>>;
-
-        // convert bool to int before test with unary + to silence warning if T happens to be bool
-        U const n = +i < 0 ? *b++ = '-', U(0) - U(i) : U(i);
-
-        if (n < u32(1e2))
-        {
-            *reinterpret_cast<pair*>(b) = digits.fd[n];
-            return n < 10 ? b + 1 : b + 2;
-        }
-        if (n < u32(1e6))
-        {
-            if (n < u32(1e4))
-            {
-                auto f0 = u32(10 * (1 << 24) / 1e3 + 1) * n;
-                *reinterpret_cast<pair*>(b) = digits.fd[f0 >> 24];
-                b -= n < u32(1e3);
-                auto f2 = (f0 & mask24) * 100;
-                *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 24];
-                return b + 4;
-            }
-            auto f0 = u64(10 * (1ull << 32ull)/ 1e5 + 1) * n;
-            *reinterpret_cast<pair*>(b) = digits.fd[f0 >> 32];
-            b -= n < u32(1e5);
-            auto f2 = (f0 & mask32) * 100;
-            *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 32];
-            auto f4 = (f2 & mask32) * 100;
-            *reinterpret_cast<pair*>(b + 4) = digits.dd[f4 >> 32];
-            return b + 6;
-        }
-        if (n < u64(1ull << 32ull))
-        {
-            if (n < u32(1e8))
-            {
-                auto f0 = u64(10 * (1ull << 48ull) / 1e7 + 1) * n >> 16;
-                *reinterpret_cast<pair*>(b) = digits.fd[f0 >> 32];
-                b -= n < u32(1e7);
-                auto f2 = (f0 & mask32) * 100;
-                *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 32];
-                auto f4 = (f2 & mask32) * 100;
-                *reinterpret_cast<pair*>(b + 4) = digits.dd[f4 >> 32];
-                auto f6 = (f4 & mask32) * 100;
-                *reinterpret_cast<pair*>(b + 6) = digits.dd[f6 >> 32];
-                return b + 8;
-            }
-            auto f0 = u64(10 * (1ull << 57ull) / 1e9 + 1) * n;
-            *reinterpret_cast<pair*>(b) = digits.fd[f0 >> 57];
-            b -= n < u32(1e9);
-            auto f2 = (f0 & mask57) * 100;
-            *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 57];
-            auto f4 = (f2 & mask57) * 100;
-            *reinterpret_cast<pair*>(b + 4) = digits.dd[f4 >> 57];
-            auto f6 = (f4 & mask57) * 100;
-            *reinterpret_cast<pair*>(b + 6) = digits.dd[f6 >> 57];
-            auto f8 = (f6 & mask57) * 100;
-            *reinterpret_cast<pair*>(b + 8) = digits.dd[f8 >> 57];
-            return b + 10;
-        }
-
-        // if we get here U must be u64 but some compilers don't know that, so reassign n to a u64 to avoid warnings
-        u32 z = n % u32(1e8);
-        u64 u = n / u32(1e8);
-
-        if (u < u32(1e2))
-        {
-            // u can't be 1 digit (if u < 10 it would have been handled above as a 9 digit 32bit number)
-            *reinterpret_cast<pair*>(b) = digits.dd[u];
-            b += 2;
-        }
-        else if (u < u32(1e6))
-        {
-            if (u < u32(1e4))
-            {
-                auto f0 = u32(10 * (1 << 24) / 1e3 + 1) * u;
-                *reinterpret_cast<pair*>(b) = digits.fd[f0 >> 24];
-                b -= u < u32(1e3);
-                auto f2 = (f0 & mask24) * 100;
-                *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 24];
-                b += 4;
-            }
-            else
-            {
-                auto f0 = u64(10 * (1ull << 32ull) / 1e5 + 1) * u;
-                *reinterpret_cast<pair*>(b) = digits.fd[f0 >> 32];
-                b -= u < u32(1e5);
-                auto f2 = (f0 & mask32) * 100;
-                *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 32];
-                auto f4 = (f2 & mask32) * 100;
-                *reinterpret_cast<pair*>(b + 4) = digits.dd[f4 >> 32];
-                b += 6;
-            }
-        }
-        else if (u < u32(1e8))
-        {
-            auto f0 = u64(10 * (1ull << 48ull) / 1e7 + 1) * u >> 16;
-            *reinterpret_cast<pair*>(b) = digits.fd[f0 >> 32];
-            b -= u < u32(1e7);
-            auto f2 = (f0 & mask32) * 100;
-            *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 32];
-            auto f4 = (f2 & mask32) * 100;
-            *reinterpret_cast<pair*>(b + 4) = digits.dd[f4 >> 32];
-            auto f6 = (f4 & mask32) * 100;
-            *reinterpret_cast<pair*>(b + 6) = digits.dd[f6 >> 32];
-            b += 8;
-        }
-        else if (u < u64(1ull << 32ull))
-        {
-            auto f0 = u64(10 * (1ull << 57ull) / 1e9 + 1) * u;
-            *reinterpret_cast<pair*>(b) = digits.fd[f0 >> 57];
-            b -= u < u32(1e9);
-            auto f2 = (f0 & mask57) * 100;
-            *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 57];
-            auto f4 = (f2 & mask57) * 100;
-            *reinterpret_cast<pair*>(b + 4) = digits.dd[f4 >> 57];
-            auto f6 = (f4 & mask57) * 100;
-            *reinterpret_cast<pair*>(b + 6) = digits.dd[f6 >> 57];
-            auto f8 = (f6 & mask57) * 100;
-            *reinterpret_cast<pair*>(b + 8) = digits.dd[f8 >> 57];
-            b += 10;
-        }
-        else
-        {
-            u32 y = u % u32(1e8);
-            u /= u32(1e8);
-
-            // u is 2, 3, or 4 digits (if u < 10 it would have been handled above)
-            if (u < u32(1e2))
-            {
-                *reinterpret_cast<pair*>(b) = digits.dd[u];
-                b += 2;
-            }
-            else
-            {
-                auto f0 = u32(10 * (1 << 24) / 1e3 + 1) * u;
-                *reinterpret_cast<pair*>(b) = digits.fd[f0 >> 24];
-                b -= u < u32(1e3);
-                auto f2 = (f0 & mask24) * 100;
-                *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 24];
-                b += 4;
-            }
-            // do 8 digits
-            auto f0 = (u64((1ull << 48ull) / 1e6 + 1) * y >> 16) + 1;
-            *reinterpret_cast<pair*>(b) = digits.dd[f0 >> 32];
-            auto f2 = (f0 & mask32) * 100;
-            *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 32];
-            auto f4 = (f2 & mask32) * 100;
-            *reinterpret_cast<pair*>(b + 4) = digits.dd[f4 >> 32];
-            auto f6 = (f4 & mask32) * 100;
-            *reinterpret_cast<pair*>(b + 6) = digits.dd[f6 >> 32];
-            b += 8;
-        }
-        // do 8 digits
-        auto f0 = (u64((1ull << 48ull) / 1e6 + 1) * z >> 16) + 1;
-        *reinterpret_cast<pair*>(b) = digits.dd[f0 >> 32];
-        auto f2 = (f0 & mask32) * 100;
-        *reinterpret_cast<pair*>(b + 2) = digits.dd[f2 >> 32];
-        auto f4 = (f2 & mask32) * 100;
-        *reinterpret_cast<pair*>(b + 4) = digits.dd[f4 >> 32];
-        auto f6 = (f4 & mask32) * 100;
-        *reinterpret_cast<pair*>(b + 6) = digits.dd[f6 >> 32];
-        return b + 8;
-    }
-}
-#endif // JEAIII_TO_TEXT_H_
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/jsonhpp/LICENSE.MIT b/contrib/tinyusdz/tinyusdz_repo/src/external/jsonhpp/LICENSE.MIT
deleted file mode 100644
index 1c1f7a690..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/jsonhpp/LICENSE.MIT
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License 
-
-Copyright (c) 2013-2022 Niels Lohmann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/jsonhpp/nlohmann/json.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/jsonhpp/nlohmann/json.hpp
deleted file mode 100644
index 4d1a37ad7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/jsonhpp/nlohmann/json.hpp
+++ /dev/null
@@ -1,24596 +0,0 @@
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-/****************************************************************************\
- * Note on documentation: The source files contain links to the online      *
- * documentation of the public API at https://json.nlohmann.me. This URL    *
- * contains the most recent documentation and should also be applicable to  *
- * previous versions; documentation for deprecated functions is not         *
- * removed, but marked deprecated. See "Generate documentation" section in  *
- * file docs/README.md.                                                     *
-\****************************************************************************/
-
-#ifndef INCLUDE_NLOHMANN_JSON_HPP_
-#define INCLUDE_NLOHMANN_JSON_HPP_
-
-#include <algorithm> // all_of, find, for_each
-#include <cstddef> // nullptr_t, ptrdiff_t, size_t
-#include <functional> // hash, less
-#include <initializer_list> // initializer_list
-#ifndef JSON_NO_IO
-    #include <iosfwd> // istream, ostream
-#endif  // JSON_NO_IO
-#include <iterator> // random_access_iterator_tag
-#include <memory> // unique_ptr
-#include <numeric> // accumulate
-#include <string> // string, stoi, to_string
-#include <utility> // declval, forward, move, pair, swap
-#include <vector> // vector
-
-// #include <nlohmann/adl_serializer.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <utility>
-
-// #include <nlohmann/detail/abi_macros.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// This file contains all macro definitions affecting or depending on the ABI
-
-#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
-    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
-        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 2
-            #warning "Already included a different version of the library!"
-        #endif
-    #endif
-#endif
-
-#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
-#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
-#define NLOHMANN_JSON_VERSION_PATCH 2   // NOLINT(modernize-macro-to-enum)
-
-#ifndef JSON_DIAGNOSTICS
-    #define JSON_DIAGNOSTICS 0
-#endif
-
-#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
-#endif
-
-#if JSON_DIAGNOSTICS
-    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
-#else
-    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
-#endif
-
-#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
-#else
-    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
-    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
-#endif
-
-// Construct the namespace ABI tags component
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
-    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
-
-#define NLOHMANN_JSON_ABI_TAGS                                       \
-    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
-            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
-            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
-
-// Construct the namespace version component
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
-    _v ## major ## _ ## minor ## _ ## patch
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
-    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
-
-#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
-#define NLOHMANN_JSON_NAMESPACE_VERSION
-#else
-#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
-    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
-                                           NLOHMANN_JSON_VERSION_MINOR, \
-                                           NLOHMANN_JSON_VERSION_PATCH)
-#endif
-
-// Combine namespace components
-#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
-#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
-    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
-
-#ifndef NLOHMANN_JSON_NAMESPACE
-#define NLOHMANN_JSON_NAMESPACE               \
-    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
-            NLOHMANN_JSON_ABI_TAGS,           \
-            NLOHMANN_JSON_NAMESPACE_VERSION)
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
-#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
-    namespace nlohmann                               \
-    {                                                \
-    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
-                NLOHMANN_JSON_ABI_TAGS,              \
-                NLOHMANN_JSON_NAMESPACE_VERSION)     \
-    {
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_END
-#define NLOHMANN_JSON_NAMESPACE_END                                     \
-    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
-    }  // namespace nlohmann
-#endif
-
-// #include <nlohmann/detail/conversions/from_json.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <algorithm> // transform
-#include <array> // array
-#include <forward_list> // forward_list
-#include <iterator> // inserter, front_inserter, end
-#include <map> // map
-#include <string> // string
-#include <tuple> // tuple, make_tuple
-#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
-#include <unordered_map> // unordered_map
-#include <utility> // pair, declval
-#include <valarray> // valarray
-
-// #include <nlohmann/detail/exceptions.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstddef> // nullptr_t
-#include <exception> // exception
-#include <stdexcept> // runtime_error
-#include <string> // to_string
-#include <vector> // vector
-
-// #include <nlohmann/detail/value_t.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <array> // array
-#include <cstddef> // size_t
-#include <cstdint> // uint8_t
-#include <string> // string
-
-// #include <nlohmann/detail/macro_scope.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <utility> // declval, pair
-// #include <nlohmann/detail/meta/detected.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <type_traits>
-
-// #include <nlohmann/detail/meta/void_t.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-template<typename ...Ts> struct make_void
-{
-    using type = void;
-};
-template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-// https://en.cppreference.com/w/cpp/experimental/is_detected
-struct nonesuch
-{
-    nonesuch() = delete;
-    ~nonesuch() = delete;
-    nonesuch(nonesuch const&) = delete;
-    nonesuch(nonesuch const&&) = delete;
-    void operator=(nonesuch const&) = delete;
-    void operator=(nonesuch&&) = delete;
-};
-
-template<class Default,
-         class AlwaysVoid,
-         template<class...> class Op,
-         class... Args>
-struct detector
-{
-    using value_t = std::false_type;
-    using type = Default;
-};
-
-template<class Default, template<class...> class Op, class... Args>
-struct detector<Default, void_t<Op<Args...>>, Op, Args...>
-{
-    using value_t = std::true_type;
-    using type = Op<Args...>;
-};
-
-template<template<class...> class Op, class... Args>
-using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
-
-template<template<class...> class Op, class... Args>
-struct is_detected_lazy : is_detected<Op, Args...> { };
-
-template<template<class...> class Op, class... Args>
-using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
-
-template<class Default, template<class...> class Op, class... Args>
-using detected_or = detector<Default, void, Op, Args...>;
-
-template<class Default, template<class...> class Op, class... Args>
-using detected_or_t = typename detected_or<Default, Op, Args...>::type;
-
-template<class Expected, template<class...> class Op, class... Args>
-using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
-
-template<class To, template<class...> class Op, class... Args>
-using is_detected_convertible =
-    std::is_convertible<detected_t<Op, Args...>, To>;
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/thirdparty/hedley/hedley.hpp>
-
-
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-FileCopyrightText: 2016-2021 Evan Nemerson <evan@nemerson.com>
-// SPDX-License-Identifier: MIT
-
-/* Hedley - https://nemequ.github.io/hedley
- * Created by Evan Nemerson <evan@nemerson.com>
- */
-
-#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
-#if defined(JSON_HEDLEY_VERSION)
-    #undef JSON_HEDLEY_VERSION
-#endif
-#define JSON_HEDLEY_VERSION 15
-
-#if defined(JSON_HEDLEY_STRINGIFY_EX)
-    #undef JSON_HEDLEY_STRINGIFY_EX
-#endif
-#define JSON_HEDLEY_STRINGIFY_EX(x) #x
-
-#if defined(JSON_HEDLEY_STRINGIFY)
-    #undef JSON_HEDLEY_STRINGIFY
-#endif
-#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
-
-#if defined(JSON_HEDLEY_CONCAT_EX)
-    #undef JSON_HEDLEY_CONCAT_EX
-#endif
-#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
-
-#if defined(JSON_HEDLEY_CONCAT)
-    #undef JSON_HEDLEY_CONCAT
-#endif
-#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
-
-#if defined(JSON_HEDLEY_CONCAT3_EX)
-    #undef JSON_HEDLEY_CONCAT3_EX
-#endif
-#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
-
-#if defined(JSON_HEDLEY_CONCAT3)
-    #undef JSON_HEDLEY_CONCAT3
-#endif
-#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
-
-#if defined(JSON_HEDLEY_VERSION_ENCODE)
-    #undef JSON_HEDLEY_VERSION_ENCODE
-#endif
-#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
-    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
-    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
-    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
-
-#if defined(JSON_HEDLEY_GNUC_VERSION)
-    #undef JSON_HEDLEY_GNUC_VERSION
-#endif
-#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
-    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-#elif defined(__GNUC__)
-    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
-    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_GNUC_VERSION)
-    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_MSVC_VERSION)
-    #undef JSON_HEDLEY_MSVC_VERSION
-#endif
-#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
-#elif defined(_MSC_FULL_VER) && !defined(__ICL)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
-#elif defined(_MSC_VER) && !defined(__ICL)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
-    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
-#endif
-#if !defined(JSON_HEDLEY_MSVC_VERSION)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
-#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
-#else
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_VERSION)
-    #undef JSON_HEDLEY_INTEL_VERSION
-#endif
-#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL)
-    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
-#elif defined(__INTEL_COMPILER) && !defined(__ICL)
-    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
-    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_INTEL_VERSION)
-    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
-    #undef JSON_HEDLEY_INTEL_CL_VERSION
-#endif
-#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL)
-    #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK)
-    #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
-    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_PGI_VERSION)
-    #undef JSON_HEDLEY_PGI_VERSION
-#endif
-#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
-    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
-#endif
-
-#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
-    #undef JSON_HEDLEY_PGI_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_PGI_VERSION)
-    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_SUNPRO_VERSION)
-    #undef JSON_HEDLEY_SUNPRO_VERSION
-#endif
-#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
-#elif defined(__SUNPRO_C)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
-#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
-#elif defined(__SUNPRO_CC)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
-#endif
-
-#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
-    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_SUNPRO_VERSION)
-    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
-    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
-#endif
-#if defined(__EMSCRIPTEN__)
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
-#endif
-
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
-    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_ARM_VERSION)
-    #undef JSON_HEDLEY_ARM_VERSION
-#endif
-#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
-#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
-#endif
-
-#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
-    #undef JSON_HEDLEY_ARM_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_ARM_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_IBM_VERSION)
-    #undef JSON_HEDLEY_IBM_VERSION
-#endif
-#if defined(__ibmxl__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
-#elif defined(__xlC__) && defined(__xlC_ver__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
-#elif defined(__xlC__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
-#endif
-
-#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
-    #undef JSON_HEDLEY_IBM_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_IBM_VERSION)
-    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_VERSION)
-    #undef JSON_HEDLEY_TI_VERSION
-#endif
-#if \
-    defined(__TI_COMPILER_VERSION__) && \
-    ( \
-      defined(__TMS470__) || defined(__TI_ARM__) || \
-      defined(__MSP430__) || \
-      defined(__TMS320C2000__) \
-    )
-#if (__TI_COMPILER_VERSION__ >= 16000000)
-    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-#endif
-
-#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_VERSION)
-    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
-    #undef JSON_HEDLEY_TI_CL2000_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
-    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
-    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL430_VERSION)
-    #undef JSON_HEDLEY_TI_CL430_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
-    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL430_VERSION)
-    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
-    #undef JSON_HEDLEY_TI_ARMCL_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
-    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
-    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
-    #undef JSON_HEDLEY_TI_CL6X_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
-    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
-    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
-    #undef JSON_HEDLEY_TI_CL7X_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
-    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
-    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
-    #undef JSON_HEDLEY_TI_CLPRU_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
-    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
-    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_CRAY_VERSION)
-    #undef JSON_HEDLEY_CRAY_VERSION
-#endif
-#if defined(_CRAYC)
-    #if defined(_RELEASE_PATCHLEVEL)
-        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
-    #else
-        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
-    #endif
-#endif
-
-#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
-    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_CRAY_VERSION)
-    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_IAR_VERSION)
-    #undef JSON_HEDLEY_IAR_VERSION
-#endif
-#if defined(__IAR_SYSTEMS_ICC__)
-    #if __VER__ > 1000
-        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
-    #else
-        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0)
-    #endif
-#endif
-
-#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
-    #undef JSON_HEDLEY_IAR_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_IAR_VERSION)
-    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TINYC_VERSION)
-    #undef JSON_HEDLEY_TINYC_VERSION
-#endif
-#if defined(__TINYC__)
-    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
-#endif
-
-#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
-    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TINYC_VERSION)
-    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_DMC_VERSION)
-    #undef JSON_HEDLEY_DMC_VERSION
-#endif
-#if defined(__DMC__)
-    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
-#endif
-
-#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
-    #undef JSON_HEDLEY_DMC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_DMC_VERSION)
-    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_COMPCERT_VERSION)
-    #undef JSON_HEDLEY_COMPCERT_VERSION
-#endif
-#if defined(__COMPCERT_VERSION__)
-    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
-#endif
-
-#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
-    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_COMPCERT_VERSION)
-    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_PELLES_VERSION)
-    #undef JSON_HEDLEY_PELLES_VERSION
-#endif
-#if defined(__POCC__)
-    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
-    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_PELLES_VERSION)
-    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
-    #undef JSON_HEDLEY_MCST_LCC_VERSION
-#endif
-#if defined(__LCC__) && defined(__LCC_MINOR__)
-    #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__)
-#endif
-
-#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK)
-    #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
-    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_VERSION)
-    #undef JSON_HEDLEY_GCC_VERSION
-#endif
-#if \
-    defined(JSON_HEDLEY_GNUC_VERSION) && \
-    !defined(__clang__) && \
-    !defined(JSON_HEDLEY_INTEL_VERSION) && \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_ARM_VERSION) && \
-    !defined(JSON_HEDLEY_CRAY_VERSION) && \
-    !defined(JSON_HEDLEY_TI_VERSION) && \
-    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
-    !defined(__COMPCERT__) && \
-    !defined(JSON_HEDLEY_MCST_LCC_VERSION)
-    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
-#endif
-
-#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
-    #undef JSON_HEDLEY_GCC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_GCC_VERSION)
-    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_ATTRIBUTE
-#endif
-#if \
-  defined(__has_attribute) && \
-  ( \
-    (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \
-  )
-#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
-#else
-#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
-#endif
-#if defined(__has_attribute)
-    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
-#endif
-#if defined(__has_attribute)
-    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
-#endif
-#if \
-    defined(__has_cpp_attribute) && \
-    defined(__cplusplus) && \
-    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
-    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
-#endif
-#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
-#elif \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_IAR_VERSION) && \
-    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
-    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
-#else
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
-#endif
-#if defined(__has_cpp_attribute) && defined(__cplusplus)
-    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
-#endif
-#if defined(__has_cpp_attribute) && defined(__cplusplus)
-    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_BUILTIN)
-    #undef JSON_HEDLEY_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
-    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
-    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_FEATURE)
-    #undef JSON_HEDLEY_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
-    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
-    #undef JSON_HEDLEY_GCC_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_EXTENSION)
-    #undef JSON_HEDLEY_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
-    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
-    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_WARNING)
-    #undef JSON_HEDLEY_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
-    #undef JSON_HEDLEY_GNUC_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
-    #undef JSON_HEDLEY_GCC_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if \
-    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
-    defined(__clang__) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
-    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
-    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
-#else
-    #define JSON_HEDLEY_PRAGMA(value)
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
-    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
-#endif
-#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
-    #undef JSON_HEDLEY_DIAGNOSTIC_POP
-#endif
-#if defined(__clang__)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
-    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
-#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
-    #define JSON_HEDLEY_DIAGNOSTIC_POP
-#endif
-
-/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
-   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
-#endif
-#if defined(__cplusplus)
-#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
-#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
-#      if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions")
-#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
-    _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#      else
-#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#      endif
-#    else
-#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#    endif
-#  endif
-#endif
-#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
-#endif
-
-#if defined(JSON_HEDLEY_CONST_CAST)
-    #undef JSON_HEDLEY_CONST_CAST
-#endif
-#if defined(__cplusplus)
-#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
-#elif \
-  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
-        JSON_HEDLEY_DIAGNOSTIC_PUSH \
-        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
-        ((T) (expr)); \
-        JSON_HEDLEY_DIAGNOSTIC_POP \
-    }))
-#else
-#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_REINTERPRET_CAST)
-    #undef JSON_HEDLEY_REINTERPRET_CAST
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
-#else
-    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_STATIC_CAST)
-    #undef JSON_HEDLEY_STATIC_CAST
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
-#else
-    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_CPP_CAST)
-    #undef JSON_HEDLEY_CPP_CAST
-#endif
-#if defined(__cplusplus)
-#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
-#    define JSON_HEDLEY_CPP_CAST(T, expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
-    ((T) (expr)) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
-#    define JSON_HEDLEY_CPP_CAST(T, expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("diag_suppress=Pe137") \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  else
-#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
-#  endif
-#else
-#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
-#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445")
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
-#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
-#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
-#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292))
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098")
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunused-function")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505))
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
-#endif
-
-#if defined(JSON_HEDLEY_DEPRECATED)
-    #undef JSON_HEDLEY_DEPRECATED
-#endif
-#if defined(JSON_HEDLEY_DEPRECATED_FOR)
-    #undef JSON_HEDLEY_DEPRECATED_FOR
-#endif
-#if \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
-#elif \
-    (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
-#elif defined(__cplusplus) && (__cplusplus >= 201402L)
-    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
-#else
-    #define JSON_HEDLEY_DEPRECATED(since)
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
-#endif
-
-#if defined(JSON_HEDLEY_UNAVAILABLE)
-    #undef JSON_HEDLEY_UNAVAILABLE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
-#else
-    #define JSON_HEDLEY_UNAVAILABLE(available_since)
-#endif
-
-#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
-    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
-#endif
-#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
-    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
-#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-#elif defined(_Check_return_) /* SAL */
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
-#else
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
-#endif
-
-#if defined(JSON_HEDLEY_SENTINEL)
-    #undef JSON_HEDLEY_SENTINEL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
-#else
-    #define JSON_HEDLEY_SENTINEL(position)
-#endif
-
-#if defined(JSON_HEDLEY_NO_RETURN)
-    #undef JSON_HEDLEY_NO_RETURN
-#endif
-#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_NO_RETURN __noreturn
-#elif \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-    #define JSON_HEDLEY_NO_RETURN _Noreturn
-#elif defined(__cplusplus) && (__cplusplus >= 201103L)
-    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
-#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
-#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
-    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
-    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
-#else
-    #define JSON_HEDLEY_NO_RETURN
-#endif
-
-#if defined(JSON_HEDLEY_NO_ESCAPE)
-    #undef JSON_HEDLEY_NO_ESCAPE
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
-    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
-#else
-    #define JSON_HEDLEY_NO_ESCAPE
-#endif
-
-#if defined(JSON_HEDLEY_UNREACHABLE)
-    #undef JSON_HEDLEY_UNREACHABLE
-#endif
-#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
-    #undef JSON_HEDLEY_UNREACHABLE_RETURN
-#endif
-#if defined(JSON_HEDLEY_ASSUME)
-    #undef JSON_HEDLEY_ASSUME
-#endif
-#if \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
-#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
-    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
-#elif \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
-    #if defined(__cplusplus)
-        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
-    #else
-        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
-    #endif
-#endif
-#if \
-    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
-#elif defined(JSON_HEDLEY_ASSUME)
-    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
-#endif
-#if !defined(JSON_HEDLEY_ASSUME)
-    #if defined(JSON_HEDLEY_UNREACHABLE)
-        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
-    #else
-        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
-    #endif
-#endif
-#if defined(JSON_HEDLEY_UNREACHABLE)
-    #if  \
-        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
-        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
-        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
-    #else
-        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
-    #endif
-#else
-    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
-#endif
-#if !defined(JSON_HEDLEY_UNREACHABLE)
-    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
-#endif
-
-JSON_HEDLEY_DIAGNOSTIC_PUSH
-#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
-    #pragma clang diagnostic ignored "-Wpedantic"
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
-    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#endif
-#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
-    #if defined(__clang__)
-        #pragma clang diagnostic ignored "-Wvariadic-macros"
-    #elif defined(JSON_HEDLEY_GCC_VERSION)
-        #pragma GCC diagnostic ignored "-Wvariadic-macros"
-    #endif
-#endif
-#if defined(JSON_HEDLEY_NON_NULL)
-    #undef JSON_HEDLEY_NON_NULL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
-    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
-#else
-    #define JSON_HEDLEY_NON_NULL(...)
-#endif
-JSON_HEDLEY_DIAGNOSTIC_POP
-
-#if defined(JSON_HEDLEY_PRINTF_FORMAT)
-    #undef JSON_HEDLEY_PRINTF_FORMAT
-#endif
-#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
-#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
-#else
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
-#endif
-
-#if defined(JSON_HEDLEY_CONSTEXPR)
-    #undef JSON_HEDLEY_CONSTEXPR
-#endif
-#if defined(__cplusplus)
-    #if __cplusplus >= 201103L
-        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
-    #endif
-#endif
-#if !defined(JSON_HEDLEY_CONSTEXPR)
-    #define JSON_HEDLEY_CONSTEXPR
-#endif
-
-#if defined(JSON_HEDLEY_PREDICT)
-    #undef JSON_HEDLEY_PREDICT
-#endif
-#if defined(JSON_HEDLEY_LIKELY)
-    #undef JSON_HEDLEY_LIKELY
-#endif
-#if defined(JSON_HEDLEY_UNLIKELY)
-    #undef JSON_HEDLEY_UNLIKELY
-#endif
-#if defined(JSON_HEDLEY_UNPREDICTABLE)
-    #undef JSON_HEDLEY_UNPREDICTABLE
-#endif
-#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
-    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
-#endif
-#if \
-  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
-#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
-#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
-#elif \
-  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
-  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
-  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
-  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
-  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
-  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
-    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
-    (__extension__ ({ \
-        double hedley_probability_ = (probability); \
-        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
-    }))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
-    (__extension__ ({ \
-        double hedley_probability_ = (probability); \
-        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
-    }))
-#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
-#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
-#else
-#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
-#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
-#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
-#endif
-#if !defined(JSON_HEDLEY_UNPREDICTABLE)
-    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
-#endif
-
-#if defined(JSON_HEDLEY_MALLOC)
-    #undef JSON_HEDLEY_MALLOC
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_MALLOC __declspec(restrict)
-#else
-    #define JSON_HEDLEY_MALLOC
-#endif
-
-#if defined(JSON_HEDLEY_PURE)
-    #undef JSON_HEDLEY_PURE
-#endif
-#if \
-  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#  define JSON_HEDLEY_PURE __attribute__((__pure__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
-#elif defined(__cplusplus) && \
-    ( \
-      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
-      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
-      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
-    )
-#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
-#else
-#  define JSON_HEDLEY_PURE
-#endif
-
-#if defined(JSON_HEDLEY_CONST)
-    #undef JSON_HEDLEY_CONST
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_CONST __attribute__((__const__))
-#elif \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
-#else
-    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
-#endif
-
-#if defined(JSON_HEDLEY_RESTRICT)
-    #undef JSON_HEDLEY_RESTRICT
-#endif
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
-    #define JSON_HEDLEY_RESTRICT restrict
-#elif \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
-    defined(__clang__) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_RESTRICT __restrict
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
-    #define JSON_HEDLEY_RESTRICT _Restrict
-#else
-    #define JSON_HEDLEY_RESTRICT
-#endif
-
-#if defined(JSON_HEDLEY_INLINE)
-    #undef JSON_HEDLEY_INLINE
-#endif
-#if \
-    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
-    (defined(__cplusplus) && (__cplusplus >= 199711L))
-    #define JSON_HEDLEY_INLINE inline
-#elif \
-    defined(JSON_HEDLEY_GCC_VERSION) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
-    #define JSON_HEDLEY_INLINE __inline__
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_INLINE __inline
-#else
-    #define JSON_HEDLEY_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_ALWAYS_INLINE)
-    #undef JSON_HEDLEY_ALWAYS_INLINE
-#endif
-#if \
-  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
-  JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
-#elif \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
-  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
-#elif defined(__cplusplus) && \
-    ( \
-      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
-      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
-    )
-#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
-#else
-#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_NEVER_INLINE)
-    #undef JSON_HEDLEY_NEVER_INLINE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
-#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
-#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
-    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
-    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
-#else
-    #define JSON_HEDLEY_NEVER_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_PRIVATE)
-    #undef JSON_HEDLEY_PRIVATE
-#endif
-#if defined(JSON_HEDLEY_PUBLIC)
-    #undef JSON_HEDLEY_PUBLIC
-#endif
-#if defined(JSON_HEDLEY_IMPORT)
-    #undef JSON_HEDLEY_IMPORT
-#endif
-#if defined(_WIN32) || defined(__CYGWIN__)
-#  define JSON_HEDLEY_PRIVATE
-#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
-#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
-#else
-#  if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-    ( \
-      defined(__TI_EABI__) && \
-      ( \
-        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
-      ) \
-    ) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
-#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
-#  else
-#    define JSON_HEDLEY_PRIVATE
-#    define JSON_HEDLEY_PUBLIC
-#  endif
-#  define JSON_HEDLEY_IMPORT    extern
-#endif
-
-#if defined(JSON_HEDLEY_NO_THROW)
-    #undef JSON_HEDLEY_NO_THROW
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
-    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
-#else
-    #define JSON_HEDLEY_NO_THROW
-#endif
-
-#if defined(JSON_HEDLEY_FALL_THROUGH)
-    #undef JSON_HEDLEY_FALL_THROUGH
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
-    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
-    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
-#elif defined(__fallthrough) /* SAL */
-    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
-#else
-    #define JSON_HEDLEY_FALL_THROUGH
-#endif
-
-#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
-    #undef JSON_HEDLEY_RETURNS_NON_NULL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
-#elif defined(_Ret_notnull_) /* SAL */
-    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
-#else
-    #define JSON_HEDLEY_RETURNS_NON_NULL
-#endif
-
-#if defined(JSON_HEDLEY_ARRAY_PARAM)
-    #undef JSON_HEDLEY_ARRAY_PARAM
-#endif
-#if \
-    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
-    !defined(__STDC_NO_VLA__) && \
-    !defined(__cplusplus) && \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_TINYC_VERSION)
-    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
-#else
-    #define JSON_HEDLEY_ARRAY_PARAM(name)
-#endif
-
-#if defined(JSON_HEDLEY_IS_CONSTANT)
-    #undef JSON_HEDLEY_IS_CONSTANT
-#endif
-#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
-    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
-#endif
-/* JSON_HEDLEY_IS_CONSTEXPR_ is for
-   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
-#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
-    #undef JSON_HEDLEY_IS_CONSTEXPR_
-#endif
-#if \
-    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
-#endif
-#if !defined(__cplusplus)
-#  if \
-       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
-       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
-       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
-#if defined(__INTPTR_TYPE__)
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
-#else
-    #include <stdint.h>
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
-#endif
-#  elif \
-       ( \
-          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
-          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
-          !defined(JSON_HEDLEY_PGI_VERSION) && \
-          !defined(JSON_HEDLEY_IAR_VERSION)) || \
-       (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
-       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
-       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
-       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
-       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
-#if defined(__INTPTR_TYPE__)
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
-#else
-    #include <stdint.h>
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
-#endif
-#  elif \
-       defined(JSON_HEDLEY_GCC_VERSION) || \
-       defined(JSON_HEDLEY_INTEL_VERSION) || \
-       defined(JSON_HEDLEY_TINYC_VERSION) || \
-       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
-       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
-       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
-       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
-       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
-       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
-       defined(__clang__)
-#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
-        sizeof(void) != \
-        sizeof(*( \
-                  1 ? \
-                  ((void*) ((expr) * 0L) ) : \
-((struct { char v[sizeof(void) * 2]; } *) 1) \
-                ) \
-              ) \
-                                            )
-#  endif
-#endif
-#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
-    #if !defined(JSON_HEDLEY_IS_CONSTANT)
-        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
-    #endif
-    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
-#else
-    #if !defined(JSON_HEDLEY_IS_CONSTANT)
-        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
-    #endif
-    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
-#endif
-
-#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
-    #undef JSON_HEDLEY_BEGIN_C_DECLS
-#endif
-#if defined(JSON_HEDLEY_END_C_DECLS)
-    #undef JSON_HEDLEY_END_C_DECLS
-#endif
-#if defined(JSON_HEDLEY_C_DECL)
-    #undef JSON_HEDLEY_C_DECL
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
-    #define JSON_HEDLEY_END_C_DECLS }
-    #define JSON_HEDLEY_C_DECL extern "C"
-#else
-    #define JSON_HEDLEY_BEGIN_C_DECLS
-    #define JSON_HEDLEY_END_C_DECLS
-    #define JSON_HEDLEY_C_DECL
-#endif
-
-#if defined(JSON_HEDLEY_STATIC_ASSERT)
-    #undef JSON_HEDLEY_STATIC_ASSERT
-#endif
-#if \
-  !defined(__cplusplus) && ( \
-      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
-      (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
-      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
-      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-      defined(_Static_assert) \
-    )
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
-#elif \
-  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
-  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
-#else
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
-#endif
-
-#if defined(JSON_HEDLEY_NULL)
-    #undef JSON_HEDLEY_NULL
-#endif
-#if defined(__cplusplus)
-    #if __cplusplus >= 201103L
-        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
-    #elif defined(NULL)
-        #define JSON_HEDLEY_NULL NULL
-    #else
-        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
-    #endif
-#elif defined(NULL)
-    #define JSON_HEDLEY_NULL NULL
-#else
-    #define JSON_HEDLEY_NULL ((void*) 0)
-#endif
-
-#if defined(JSON_HEDLEY_MESSAGE)
-    #undef JSON_HEDLEY_MESSAGE
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-#  define JSON_HEDLEY_MESSAGE(msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
-    JSON_HEDLEY_PRAGMA(message msg) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#elif \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
-#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#else
-#  define JSON_HEDLEY_MESSAGE(msg)
-#endif
-
-#if defined(JSON_HEDLEY_WARNING)
-    #undef JSON_HEDLEY_WARNING
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-#  define JSON_HEDLEY_WARNING(msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
-    JSON_HEDLEY_PRAGMA(clang warning msg) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#elif \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
-  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
-#elif \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
-  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#else
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
-#endif
-
-#if defined(JSON_HEDLEY_REQUIRE)
-    #undef JSON_HEDLEY_REQUIRE
-#endif
-#if defined(JSON_HEDLEY_REQUIRE_MSG)
-    #undef JSON_HEDLEY_REQUIRE_MSG
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
-#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
-#    define JSON_HEDLEY_REQUIRE(expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
-    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
-    __attribute__((diagnose_if(!(expr), msg, "error"))) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  else
-#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
-#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
-#  endif
-#else
-#  define JSON_HEDLEY_REQUIRE(expr)
-#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
-#endif
-
-#if defined(JSON_HEDLEY_FLAGS)
-    #undef JSON_HEDLEY_FLAGS
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion"))
-    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
-#else
-    #define JSON_HEDLEY_FLAGS
-#endif
-
-#if defined(JSON_HEDLEY_FLAGS_CAST)
-    #undef JSON_HEDLEY_FLAGS_CAST
-#endif
-#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
-#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
-        JSON_HEDLEY_DIAGNOSTIC_PUSH \
-        _Pragma("warning(disable:188)") \
-        ((T) (expr)); \
-        JSON_HEDLEY_DIAGNOSTIC_POP \
-    }))
-#else
-#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
-#endif
-
-#if defined(JSON_HEDLEY_EMPTY_BASES)
-    #undef JSON_HEDLEY_EMPTY_BASES
-#endif
-#if \
-    (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
-#else
-    #define JSON_HEDLEY_EMPTY_BASES
-#endif
-
-/* Remaining macros are deprecated. */
-
-#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
-    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
-#endif
-#if defined(__clang__)
-    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
-#else
-    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
-    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
-#endif
-#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
-    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
-    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
-#endif
-#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
-    #undef JSON_HEDLEY_CLANG_HAS_WARNING
-#endif
-#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
-
-#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
-
-
-// This file contains all internal macro definitions (except those affecting ABI)
-// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-
-// exclude unsupported compilers
-#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
-    #if defined(__clang__)
-        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
-        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
-            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #endif
-#endif
-
-// C++ language standard detection
-// if the user manually specified the used c++ version this is skipped
-#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
-    #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
-        #define JSON_HAS_CPP_20
-        #define JSON_HAS_CPP_17
-        #define JSON_HAS_CPP_14
-    #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-        #define JSON_HAS_CPP_17
-        #define JSON_HAS_CPP_14
-    #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
-        #define JSON_HAS_CPP_14
-    #endif
-    // the cpp 11 flag is always specified because it is the minimal required version
-    #define JSON_HAS_CPP_11
-#endif
-
-#ifdef __has_include
-    #if __has_include(<version>)
-        #include <version>
-    #endif
-#endif
-
-#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM)
-    #ifdef JSON_HAS_CPP_17
-        #if defined(__cpp_lib_filesystem)
-            #define JSON_HAS_FILESYSTEM 1
-        #elif defined(__cpp_lib_experimental_filesystem)
-            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
-        #elif !defined(__has_include)
-            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
-        #elif __has_include(<filesystem>)
-            #define JSON_HAS_FILESYSTEM 1
-        #elif __has_include(<experimental/filesystem>)
-            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
-        #endif
-
-        // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
-        #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support
-        #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support
-        #if defined(__clang_major__) && __clang_major__ < 7
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
-        #if defined(_MSC_VER) && _MSC_VER < 1914
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before iOS 13
-        #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before macOS Catalina
-        #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-    #endif
-#endif
-
-#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0
-#endif
-
-#ifndef JSON_HAS_FILESYSTEM
-    #define JSON_HAS_FILESYSTEM 0
-#endif
-
-#ifndef JSON_HAS_THREE_WAY_COMPARISON
-    #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \
-        && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L
-        #define JSON_HAS_THREE_WAY_COMPARISON 1
-    #else
-        #define JSON_HAS_THREE_WAY_COMPARISON 0
-    #endif
-#endif
-
-#ifndef JSON_HAS_RANGES
-    // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error
-    #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427
-        #define JSON_HAS_RANGES 0
-    #elif defined(__cpp_lib_ranges)
-        #define JSON_HAS_RANGES 1
-    #else
-        #define JSON_HAS_RANGES 0
-    #endif
-#endif
-
-#ifdef JSON_HAS_CPP_17
-    #define JSON_INLINE_VARIABLE inline
-#else
-    #define JSON_INLINE_VARIABLE
-#endif
-
-#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address)
-    #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]]
-#else
-    #define JSON_NO_UNIQUE_ADDRESS
-#endif
-
-// disable documentation warnings on clang
-#if defined(__clang__)
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wdocumentation"
-    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
-#endif
-
-// allow disabling exceptions
-#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
-    #define JSON_THROW(exception) throw exception
-    #define JSON_TRY try
-    #define JSON_CATCH(exception) catch(exception)
-    #define JSON_INTERNAL_CATCH(exception) catch(exception)
-#else
-    #include <cstdlib>
-    #define JSON_THROW(exception) std::abort()
-    #define JSON_TRY if(true)
-    #define JSON_CATCH(exception) if(false)
-    #define JSON_INTERNAL_CATCH(exception) if(false)
-#endif
-
-// override exception macros
-#if defined(JSON_THROW_USER)
-    #undef JSON_THROW
-    #define JSON_THROW JSON_THROW_USER
-#endif
-#if defined(JSON_TRY_USER)
-    #undef JSON_TRY
-    #define JSON_TRY JSON_TRY_USER
-#endif
-#if defined(JSON_CATCH_USER)
-    #undef JSON_CATCH
-    #define JSON_CATCH JSON_CATCH_USER
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
-#endif
-#if defined(JSON_INTERNAL_CATCH_USER)
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
-#endif
-
-// allow overriding assert
-#if !defined(JSON_ASSERT)
-    #include <cassert> // assert
-    #define JSON_ASSERT(x) assert(x)
-#endif
-
-// allow to access some private functions (needed by the test suite)
-#if defined(JSON_TESTS_PRIVATE)
-    #define JSON_PRIVATE_UNLESS_TESTED public
-#else
-    #define JSON_PRIVATE_UNLESS_TESTED private
-#endif
-
-/*!
-@brief macro to briefly define a mapping between an enum and JSON
-@def NLOHMANN_JSON_SERIALIZE_ENUM
-@since version 3.4.0
-*/
-#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
-    template<typename BasicJsonType>                                                            \
-    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
-    {                                                                                           \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
-        auto it = std::find_if(std::begin(m), std::end(m),                                      \
-                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
-        {                                                                                       \
-            return ej_pair.first == e;                                                          \
-        });                                                                                     \
-        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
-    }                                                                                           \
-    template<typename BasicJsonType>                                                            \
-    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
-    {                                                                                           \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
-        auto it = std::find_if(std::begin(m), std::end(m),                                      \
-                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
-        {                                                                                       \
-            return ej_pair.second == j;                                                         \
-        });                                                                                     \
-        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
-    }
-
-// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
-// may be removed in the future once the class is split.
-
-#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
-    template<template<typename, typename, typename...> class ObjectType,   \
-             template<typename, typename...> class ArrayType,              \
-             class StringType, class BooleanType, class NumberIntegerType, \
-             class NumberUnsignedType, class NumberFloatType,              \
-             template<typename> class AllocatorType,                       \
-             template<typename, typename = void> class JSONSerializer,     \
-             class BinaryType>
-
-#define NLOHMANN_BASIC_JSON_TPL                                            \
-    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
-    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
-    AllocatorType, JSONSerializer, BinaryType>
-
-// Macros to simplify conversion from/to types
-
-#define NLOHMANN_JSON_EXPAND( x ) x
-#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
-#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
-        NLOHMANN_JSON_PASTE64, \
-        NLOHMANN_JSON_PASTE63, \
-        NLOHMANN_JSON_PASTE62, \
-        NLOHMANN_JSON_PASTE61, \
-        NLOHMANN_JSON_PASTE60, \
-        NLOHMANN_JSON_PASTE59, \
-        NLOHMANN_JSON_PASTE58, \
-        NLOHMANN_JSON_PASTE57, \
-        NLOHMANN_JSON_PASTE56, \
-        NLOHMANN_JSON_PASTE55, \
-        NLOHMANN_JSON_PASTE54, \
-        NLOHMANN_JSON_PASTE53, \
-        NLOHMANN_JSON_PASTE52, \
-        NLOHMANN_JSON_PASTE51, \
-        NLOHMANN_JSON_PASTE50, \
-        NLOHMANN_JSON_PASTE49, \
-        NLOHMANN_JSON_PASTE48, \
-        NLOHMANN_JSON_PASTE47, \
-        NLOHMANN_JSON_PASTE46, \
-        NLOHMANN_JSON_PASTE45, \
-        NLOHMANN_JSON_PASTE44, \
-        NLOHMANN_JSON_PASTE43, \
-        NLOHMANN_JSON_PASTE42, \
-        NLOHMANN_JSON_PASTE41, \
-        NLOHMANN_JSON_PASTE40, \
-        NLOHMANN_JSON_PASTE39, \
-        NLOHMANN_JSON_PASTE38, \
-        NLOHMANN_JSON_PASTE37, \
-        NLOHMANN_JSON_PASTE36, \
-        NLOHMANN_JSON_PASTE35, \
-        NLOHMANN_JSON_PASTE34, \
-        NLOHMANN_JSON_PASTE33, \
-        NLOHMANN_JSON_PASTE32, \
-        NLOHMANN_JSON_PASTE31, \
-        NLOHMANN_JSON_PASTE30, \
-        NLOHMANN_JSON_PASTE29, \
-        NLOHMANN_JSON_PASTE28, \
-        NLOHMANN_JSON_PASTE27, \
-        NLOHMANN_JSON_PASTE26, \
-        NLOHMANN_JSON_PASTE25, \
-        NLOHMANN_JSON_PASTE24, \
-        NLOHMANN_JSON_PASTE23, \
-        NLOHMANN_JSON_PASTE22, \
-        NLOHMANN_JSON_PASTE21, \
-        NLOHMANN_JSON_PASTE20, \
-        NLOHMANN_JSON_PASTE19, \
-        NLOHMANN_JSON_PASTE18, \
-        NLOHMANN_JSON_PASTE17, \
-        NLOHMANN_JSON_PASTE16, \
-        NLOHMANN_JSON_PASTE15, \
-        NLOHMANN_JSON_PASTE14, \
-        NLOHMANN_JSON_PASTE13, \
-        NLOHMANN_JSON_PASTE12, \
-        NLOHMANN_JSON_PASTE11, \
-        NLOHMANN_JSON_PASTE10, \
-        NLOHMANN_JSON_PASTE9, \
-        NLOHMANN_JSON_PASTE8, \
-        NLOHMANN_JSON_PASTE7, \
-        NLOHMANN_JSON_PASTE6, \
-        NLOHMANN_JSON_PASTE5, \
-        NLOHMANN_JSON_PASTE4, \
-        NLOHMANN_JSON_PASTE3, \
-        NLOHMANN_JSON_PASTE2, \
-        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
-#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
-#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
-#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
-#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
-#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
-#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
-#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
-#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
-#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
-#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
-#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
-#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
-#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
-#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
-#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
-#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
-#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
-#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
-#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
-#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
-#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
-#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
-#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
-#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
-#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
-#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
-#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
-#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
-#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
-#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
-#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
-#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
-#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
-#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
-#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
-#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
-#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
-#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
-#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
-#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
-#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
-#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
-#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
-#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
-#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
-#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
-#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
-#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
-#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
-#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
-#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
-#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
-#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
-#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
-#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
-#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
-#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
-#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
-#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
-#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
-#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
-#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
-#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
-
-#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
-#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
-#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1);
-
-/*!
-@brief macro
-@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
-@since version 3.9.0
-*/
-#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
-    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
-    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
-
-#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
-    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
-    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
-
-/*!
-@brief macro
-@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
-@since version 3.9.0
-*/
-#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
-    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
-    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
-
-#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
-    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
-    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { Type nlohmann_json_default_obj; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
-
-
-// inspired from https://stackoverflow.com/a/26745591
-// allows to call any std function as if (e.g. with begin):
-// using std::begin; begin(x);
-//
-// it allows using the detected idiom to retrieve the return type
-// of such an expression
-#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name)                                 \
-    namespace detail {                                                            \
-    using std::std_name;                                                          \
-    \
-    template<typename... T>                                                       \
-    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
-    }                                                                             \
-    \
-    namespace detail2 {                                                           \
-    struct std_name##_tag                                                         \
-    {                                                                             \
-    };                                                                            \
-    \
-    template<typename... T>                                                       \
-    std_name##_tag std_name(T&&...);                                              \
-    \
-    template<typename... T>                                                       \
-    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
-    \
-    template<typename... T>                                                       \
-    struct would_call_std_##std_name                                              \
-    {                                                                             \
-        static constexpr auto const value = ::nlohmann::detail::                  \
-                                            is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
-    };                                                                            \
-    } /* namespace detail2 */ \
-    \
-    template<typename... T>                                                       \
-    struct would_call_std_##std_name : detail2::would_call_std_##std_name<T...>   \
-    {                                                                             \
-    }
-
-#ifndef JSON_USE_IMPLICIT_CONVERSIONS
-    #define JSON_USE_IMPLICIT_CONVERSIONS 1
-#endif
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    #define JSON_EXPLICIT
-#else
-    #define JSON_EXPLICIT explicit
-#endif
-
-#ifndef JSON_DISABLE_ENUM_SERIALIZATION
-    #define JSON_DISABLE_ENUM_SERIALIZATION 0
-#endif
-
-#ifndef JSON_USE_GLOBAL_UDLS
-    #define JSON_USE_GLOBAL_UDLS 1
-#endif
-
-#if JSON_HAS_THREE_WAY_COMPARISON
-    #include <compare> // partial_ordering
-#endif
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-///////////////////////////
-// JSON type enumeration //
-///////////////////////////
-
-/*!
-@brief the JSON type enumeration
-
-This enumeration collects the different JSON types. It is internally used to
-distinguish the stored values, and the functions @ref basic_json::is_null(),
-@ref basic_json::is_object(), @ref basic_json::is_array(),
-@ref basic_json::is_string(), @ref basic_json::is_boolean(),
-@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
-@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
-@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
-@ref basic_json::is_structured() rely on it.
-
-@note There are three enumeration entries (number_integer, number_unsigned, and
-number_float), because the library distinguishes these three types for numbers:
-@ref basic_json::number_unsigned_t is used for unsigned integers,
-@ref basic_json::number_integer_t is used for signed integers, and
-@ref basic_json::number_float_t is used for floating-point numbers or to
-approximate integers which do not fit in the limits of their respective type.
-
-@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
-value with the default value for a given type
-
-@since version 1.0.0
-*/
-enum class value_t : std::uint8_t
-{
-    null,             ///< null value
-    object,           ///< object (unordered set of name/value pairs)
-    array,            ///< array (ordered collection of values)
-    string,           ///< string value
-    boolean,          ///< boolean value
-    number_integer,   ///< number value (signed integer)
-    number_unsigned,  ///< number value (unsigned integer)
-    number_float,     ///< number value (floating-point)
-    binary,           ///< binary array (ordered collection of bytes)
-    discarded         ///< discarded by the parser callback function
-};
-
-/*!
-@brief comparison operator for JSON types
-
-Returns an ordering that is similar to Python:
-- order: null < boolean < number < object < array < string < binary
-- furthermore, each type is not smaller than itself
-- discarded values are not comparable
-- binary is represented as a b"" string in python and directly comparable to a
-  string; however, making a binary array directly comparable with a string would
-  be surprising behavior in a JSON file.
-
-@since version 1.0.0
-*/
-#if JSON_HAS_THREE_WAY_COMPARISON
-    inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD*
-#else
-    inline bool operator<(const value_t lhs, const value_t rhs) noexcept
-#endif
-{
-    static constexpr std::array<std::uint8_t, 9> order = {{
-            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
-            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
-            6 /* binary */
-        }
-    };
-
-    const auto l_index = static_cast<std::size_t>(lhs);
-    const auto r_index = static_cast<std::size_t>(rhs);
-#if JSON_HAS_THREE_WAY_COMPARISON
-    if (l_index < order.size() && r_index < order.size())
-    {
-        return order[l_index] <=> order[r_index]; // *NOPAD*
-    }
-    return std::partial_ordering::unordered;
-#else
-    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
-#endif
-}
-
-// GCC selects the built-in operator< over an operator rewritten from
-// a user-defined spaceship operator
-// Clang, MSVC, and ICC select the rewritten candidate
-// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200)
-#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__)
-inline bool operator<(const value_t lhs, const value_t rhs) noexcept
-{
-    return std::is_lt(lhs <=> rhs); // *NOPAD*
-}
-#endif
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/string_escape.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-/*!
-@brief replace all occurrences of a substring by another string
-
-@param[in,out] s  the string to manipulate; changed so that all
-               occurrences of @a f are replaced with @a t
-@param[in]     f  the substring to replace with @a t
-@param[in]     t  the string to replace @a f
-
-@pre The search string @a f must not be empty. **This precondition is
-enforced with an assertion.**
-
-@since version 2.0.0
-*/
-template<typename StringType>
-inline void replace_substring(StringType& s, const StringType& f,
-                              const StringType& t)
-{
-    JSON_ASSERT(!f.empty());
-    for (auto pos = s.find(f);                // find first occurrence of f
-            pos != StringType::npos;          // make sure f was found
-            s.replace(pos, f.size(), t),      // replace with t, and
-            pos = s.find(f, pos + t.size()))  // find next occurrence of f
-    {}
-}
-
-/*!
- * @brief string escaping as described in RFC 6901 (Sect. 4)
- * @param[in] s string to escape
- * @return    escaped string
- *
- * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
- */
-template<typename StringType>
-inline StringType escape(StringType s)
-{
-    replace_substring(s, StringType{"~"}, StringType{"~0"});
-    replace_substring(s, StringType{"/"}, StringType{"~1"});
-    return s;
-}
-
-/*!
- * @brief string unescaping as described in RFC 6901 (Sect. 4)
- * @param[in] s string to unescape
- * @return    unescaped string
- *
- * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
- */
-template<typename StringType>
-static void unescape(StringType& s)
-{
-    replace_substring(s, StringType{"~1"}, StringType{"/"});
-    replace_substring(s, StringType{"~0"}, StringType{"~"});
-}
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/input/position_t.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstddef> // size_t
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-/// struct to capture the start position of the current token
-struct position_t
-{
-    /// the total number of characters read
-    std::size_t chars_read_total = 0;
-    /// the number of characters read in the current line
-    std::size_t chars_read_current_line = 0;
-    /// the number of lines read
-    std::size_t lines_read = 0;
-
-    /// conversion to size_t to preserve SAX interface
-    constexpr operator size_t() const
-    {
-        return chars_read_total;
-    }
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-FileCopyrightText: 2018 The Abseil Authors
-// SPDX-License-Identifier: MIT
-
-
-
-#include <array> // array
-#include <cstddef> // size_t
-#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
-#include <utility> // index_sequence, make_index_sequence, index_sequence_for
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-template<typename T>
-using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-#ifdef JSON_HAS_CPP_14
-
-// the following utilities are natively available in C++14
-using std::enable_if_t;
-using std::index_sequence;
-using std::make_index_sequence;
-using std::index_sequence_for;
-
-#else
-
-// alias templates to reduce boilerplate
-template<bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
-// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
-
-//// START OF CODE FROM GOOGLE ABSEIL
-
-// integer_sequence
-//
-// Class template representing a compile-time integer sequence. An instantiation
-// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
-// type through its template arguments (which is a common need when
-// working with C++11 variadic templates). `absl::integer_sequence` is designed
-// to be a drop-in replacement for C++14's `std::integer_sequence`.
-//
-// Example:
-//
-//   template< class T, T... Ints >
-//   void user_function(integer_sequence<T, Ints...>);
-//
-//   int main()
-//   {
-//     // user_function's `T` will be deduced to `int` and `Ints...`
-//     // will be deduced to `0, 1, 2, 3, 4`.
-//     user_function(make_integer_sequence<int, 5>());
-//   }
-template <typename T, T... Ints>
-struct integer_sequence
-{
-    using value_type = T;
-    static constexpr std::size_t size() noexcept
-    {
-        return sizeof...(Ints);
-    }
-};
-
-// index_sequence
-//
-// A helper template for an `integer_sequence` of `size_t`,
-// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
-// `std::index_sequence`.
-template <size_t... Ints>
-using index_sequence = integer_sequence<size_t, Ints...>;
-
-namespace utility_internal
-{
-
-template <typename Seq, size_t SeqSize, size_t Rem>
-struct Extend;
-
-// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
-{
-    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
-};
-
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
-{
-    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
-};
-
-// Recursion helper for 'make_integer_sequence<T, N>'.
-// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
-template <typename T, size_t N>
-struct Gen
-{
-    using type =
-        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
-};
-
-template <typename T>
-struct Gen<T, 0>
-{
-    using type = integer_sequence<T>;
-};
-
-}  // namespace utility_internal
-
-// Compile-time sequences of integers
-
-// make_integer_sequence
-//
-// This template alias is equivalent to
-// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
-// replacement for C++14's `std::make_integer_sequence`.
-template <typename T, T N>
-using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
-
-// make_index_sequence
-//
-// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
-// and is designed to be a drop-in replacement for C++14's
-// `std::make_index_sequence`.
-template <size_t N>
-using make_index_sequence = make_integer_sequence<size_t, N>;
-
-// index_sequence_for
-//
-// Converts a typename pack into an index sequence of the same length, and
-// is designed to be a drop-in replacement for C++14's
-// `std::index_sequence_for()`
-template <typename... Ts>
-using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-
-//// END OF CODE FROM GOOGLE ABSEIL
-
-#endif
-
-// dispatch utility (taken from ranges-v3)
-template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
-template<> struct priority_tag<0> {};
-
-// taken from ranges-v3
-template<typename T>
-struct static_const
-{
-    static JSON_INLINE_VARIABLE constexpr T value{};
-};
-
-#ifndef JSON_HAS_CPP_17
-    template<typename T>
-    constexpr T static_const<T>::value;
-#endif
-
-template<typename T, typename... Args>
-inline constexpr std::array<T, sizeof...(Args)> make_array(Args&& ... args)
-{
-    return std::array<T, sizeof...(Args)> {{static_cast<T>(std::forward<Args>(args))...}};
-}
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <limits> // numeric_limits
-#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
-#include <utility> // declval
-#include <tuple> // tuple
-
-// #include <nlohmann/detail/iterators/iterator_traits.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <iterator> // random_access_iterator_tag
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-// #include <nlohmann/detail/meta/void_t.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-template<typename It, typename = void>
-struct iterator_types {};
-
-template<typename It>
-struct iterator_types <
-    It,
-    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
-    typename It::reference, typename It::iterator_category >>
-{
-    using difference_type = typename It::difference_type;
-    using value_type = typename It::value_type;
-    using pointer = typename It::pointer;
-    using reference = typename It::reference;
-    using iterator_category = typename It::iterator_category;
-};
-
-// This is required as some compilers implement std::iterator_traits in a way that
-// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
-template<typename T, typename = void>
-struct iterator_traits
-{
-};
-
-template<typename T>
-struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
-            : iterator_types<T>
-{
-};
-
-template<typename T>
-struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
-{
-    using iterator_category = std::random_access_iterator_tag;
-    using value_type = T;
-    using difference_type = ptrdiff_t;
-    using pointer = T*;
-    using reference = T&;
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/call_std/begin.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin);
-
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/meta/call_std/end.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end);
-
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-// #include <nlohmann/json_fwd.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-    #define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-    #include <cstdint> // int64_t, uint64_t
-    #include <map> // map
-    #include <memory> // allocator
-    #include <string> // string
-    #include <vector> // vector
-
-    // #include <nlohmann/detail/abi_macros.hpp>
-
-
-    /*!
-    @brief namespace for Niels Lohmann
-    @see https://github.com/nlohmann
-    @since version 1.0.0
-    */
-    NLOHMANN_JSON_NAMESPACE_BEGIN
-
-    /*!
-    @brief default JSONSerializer template argument
-
-    This serializer ignores the template arguments and uses ADL
-    ([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-    for serialization.
-    */
-    template<typename T = void, typename SFINAE = void>
-    struct adl_serializer;
-
-    /// a class to store JSON values
-    /// @sa https://json.nlohmann.me/api/basic_json/
-    template<template<typename U, typename V, typename... Args> class ObjectType =
-    std::map,
-    template<typename U, typename... Args> class ArrayType = std::vector,
-    class StringType = std::string, class BooleanType = bool,
-    class NumberIntegerType = std::int64_t,
-    class NumberUnsignedType = std::uint64_t,
-    class NumberFloatType = double,
-    template<typename U> class AllocatorType = std::allocator,
-    template<typename T, typename SFINAE = void> class JSONSerializer =
-    adl_serializer,
-    class BinaryType = std::vector<std::uint8_t>>
-    class basic_json;
-
-    /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
-    /// @sa https://json.nlohmann.me/api/json_pointer/
-    template<typename RefStringType>
-    class json_pointer;
-
-    /*!
-    @brief default specialization
-    @sa https://json.nlohmann.me/api/json/
-    */
-    using json = basic_json<>;
-
-    /// @brief a minimal map-like container that preserves insertion order
-    /// @sa https://json.nlohmann.me/api/ordered_map/
-    template<class Key, class T, class IgnoredLess, class Allocator>
-    struct ordered_map;
-
-    /// @brief specialization that maintains the insertion order of object keys
-    /// @sa https://json.nlohmann.me/api/ordered_json/
-    using ordered_json = basic_json<nlohmann::ordered_map>;
-
-    NLOHMANN_JSON_NAMESPACE_END
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-/*!
-@brief detail namespace with internal helper functions
-
-This namespace collects functions that should not be exposed,
-implementations of some @ref basic_json methods, and meta-programming helpers.
-
-@since version 2.1.0
-*/
-namespace detail
-{
-
-/////////////
-// helpers //
-/////////////
-
-// Note to maintainers:
-//
-// Every trait in this file expects a non CV-qualified type.
-// The only exceptions are in the 'aliases for detected' section
-// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
-//
-// In this case, T has to be properly CV-qualified to constraint the function arguments
-// (e.g. to_json(BasicJsonType&, const T&))
-
-template<typename> struct is_basic_json : std::false_type {};
-
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
-
-// used by exceptions create() member functions
-// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t
-// false_type otherwise
-template<typename BasicJsonContext>
-struct is_basic_json_context :
-    std::integral_constant < bool,
-    is_basic_json<typename std::remove_cv<typename std::remove_pointer<BasicJsonContext>::type>::type>::value
-    || std::is_same<BasicJsonContext, std::nullptr_t>::value >
-{};
-
-//////////////////////
-// json_ref helpers //
-//////////////////////
-
-template<typename>
-class json_ref;
-
-template<typename>
-struct is_json_ref : std::false_type {};
-
-template<typename T>
-struct is_json_ref<json_ref<T>> : std::true_type {};
-
-//////////////////////////
-// aliases for detected //
-//////////////////////////
-
-template<typename T>
-using mapped_type_t = typename T::mapped_type;
-
-template<typename T>
-using key_type_t = typename T::key_type;
-
-template<typename T>
-using value_type_t = typename T::value_type;
-
-template<typename T>
-using difference_type_t = typename T::difference_type;
-
-template<typename T>
-using pointer_t = typename T::pointer;
-
-template<typename T>
-using reference_t = typename T::reference;
-
-template<typename T>
-using iterator_category_t = typename T::iterator_category;
-
-template<typename T, typename... Args>
-using to_json_function = decltype(T::to_json(std::declval<Args>()...));
-
-template<typename T, typename... Args>
-using from_json_function = decltype(T::from_json(std::declval<Args>()...));
-
-template<typename T, typename U>
-using get_template_function = decltype(std::declval<T>().template get<U>());
-
-// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
-template<typename BasicJsonType, typename T, typename = void>
-struct has_from_json : std::false_type {};
-
-// trait checking if j.get<T> is valid
-// use this trait instead of std::is_constructible or std::is_convertible,
-// both rely on, or make use of implicit conversions, and thus fail when T
-// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
-template <typename BasicJsonType, typename T>
-struct is_getable
-{
-    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
-};
-
-template<typename BasicJsonType, typename T>
-struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<void, from_json_function, serializer,
-        const BasicJsonType&, T&>::value;
-};
-
-// This trait checks if JSONSerializer<T>::from_json(json const&) exists
-// this overload is used for non-default-constructible user-defined-types
-template<typename BasicJsonType, typename T, typename = void>
-struct has_non_default_from_json : std::false_type {};
-
-template<typename BasicJsonType, typename T>
-struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<T, from_json_function, serializer,
-        const BasicJsonType&>::value;
-};
-
-// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
-// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
-template<typename BasicJsonType, typename T, typename = void>
-struct has_to_json : std::false_type {};
-
-template<typename BasicJsonType, typename T>
-struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
-        T>::value;
-};
-
-template<typename T>
-using detect_key_compare = typename T::key_compare;
-
-template<typename T>
-struct has_key_compare : std::integral_constant<bool, is_detected<detect_key_compare, T>::value> {};
-
-// obtains the actual object key comparator
-template<typename BasicJsonType>
-struct actual_object_comparator
-{
-    using object_t = typename BasicJsonType::object_t;
-    using object_comparator_t = typename BasicJsonType::default_object_comparator_t;
-    using type = typename std::conditional < has_key_compare<object_t>::value,
-          typename object_t::key_compare, object_comparator_t>::type;
-};
-
-template<typename BasicJsonType>
-using actual_object_comparator_t = typename actual_object_comparator<BasicJsonType>::type;
-
-///////////////////
-// is_ functions //
-///////////////////
-
-// https://en.cppreference.com/w/cpp/types/conjunction
-template<class...> struct conjunction : std::true_type { };
-template<class B> struct conjunction<B> : B { };
-template<class B, class... Bn>
-struct conjunction<B, Bn...>
-: std::conditional<static_cast<bool>(B::value), conjunction<Bn...>, B>::type {};
-
-// https://en.cppreference.com/w/cpp/types/negation
-template<class B> struct negation : std::integral_constant < bool, !B::value > { };
-
-// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
-// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
-// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
-template <typename T>
-struct is_default_constructible : std::is_default_constructible<T> {};
-
-template <typename T1, typename T2>
-struct is_default_constructible<std::pair<T1, T2>>
-            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
-
-template <typename T1, typename T2>
-struct is_default_constructible<const std::pair<T1, T2>>
-            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
-
-template <typename... Ts>
-struct is_default_constructible<std::tuple<Ts...>>
-            : conjunction<is_default_constructible<Ts>...> {};
-
-template <typename... Ts>
-struct is_default_constructible<const std::tuple<Ts...>>
-            : conjunction<is_default_constructible<Ts>...> {};
-
-
-template <typename T, typename... Args>
-struct is_constructible : std::is_constructible<T, Args...> {};
-
-template <typename T1, typename T2>
-struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
-
-template <typename T1, typename T2>
-struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
-
-template <typename... Ts>
-struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
-
-template <typename... Ts>
-struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
-
-
-template<typename T, typename = void>
-struct is_iterator_traits : std::false_type {};
-
-template<typename T>
-struct is_iterator_traits<iterator_traits<T>>
-{
-  private:
-    using traits = iterator_traits<T>;
-
-  public:
-    static constexpr auto value =
-        is_detected<value_type_t, traits>::value &&
-        is_detected<difference_type_t, traits>::value &&
-        is_detected<pointer_t, traits>::value &&
-        is_detected<iterator_category_t, traits>::value &&
-        is_detected<reference_t, traits>::value;
-};
-
-template<typename T>
-struct is_range
-{
-  private:
-    using t_ref = typename std::add_lvalue_reference<T>::type;
-
-    using iterator = detected_t<result_of_begin, t_ref>;
-    using sentinel = detected_t<result_of_end, t_ref>;
-
-    // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator
-    // and https://en.cppreference.com/w/cpp/iterator/sentinel_for
-    // but reimplementing these would be too much work, as a lot of other concepts are used underneath
-    static constexpr auto is_iterator_begin =
-        is_iterator_traits<iterator_traits<iterator>>::value;
-
-  public:
-    static constexpr bool value = !std::is_same<iterator, nonesuch>::value && !std::is_same<sentinel, nonesuch>::value && is_iterator_begin;
-};
-
-template<typename R>
-using iterator_t = enable_if_t<is_range<R>::value, result_of_begin<decltype(std::declval<R&>())>>;
-
-template<typename T>
-using range_value_t = value_type_t<iterator_traits<iterator_t<T>>>;
-
-// The following implementation of is_complete_type is taken from
-// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
-// and is written by Xiang Fan who agreed to using it in this library.
-
-template<typename T, typename = void>
-struct is_complete_type : std::false_type {};
-
-template<typename T>
-struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
-
-template<typename BasicJsonType, typename CompatibleObjectType,
-         typename = void>
-struct is_compatible_object_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleObjectType>
-struct is_compatible_object_type_impl <
-    BasicJsonType, CompatibleObjectType,
-    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
-    is_detected<key_type_t, CompatibleObjectType>::value >>
-{
-    using object_t = typename BasicJsonType::object_t;
-
-    // macOS's is_constructible does not play well with nonesuch...
-    static constexpr bool value =
-        is_constructible<typename object_t::key_type,
-        typename CompatibleObjectType::key_type>::value &&
-        is_constructible<typename object_t::mapped_type,
-        typename CompatibleObjectType::mapped_type>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleObjectType>
-struct is_compatible_object_type
-    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
-
-template<typename BasicJsonType, typename ConstructibleObjectType,
-         typename = void>
-struct is_constructible_object_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename ConstructibleObjectType>
-struct is_constructible_object_type_impl <
-    BasicJsonType, ConstructibleObjectType,
-    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
-    is_detected<key_type_t, ConstructibleObjectType>::value >>
-{
-    using object_t = typename BasicJsonType::object_t;
-
-    static constexpr bool value =
-        (is_default_constructible<ConstructibleObjectType>::value &&
-         (std::is_move_assignable<ConstructibleObjectType>::value ||
-          std::is_copy_assignable<ConstructibleObjectType>::value) &&
-         (is_constructible<typename ConstructibleObjectType::key_type,
-          typename object_t::key_type>::value &&
-          std::is_same <
-          typename object_t::mapped_type,
-          typename ConstructibleObjectType::mapped_type >::value)) ||
-        (has_from_json<BasicJsonType,
-         typename ConstructibleObjectType::mapped_type>::value ||
-         has_non_default_from_json <
-         BasicJsonType,
-         typename ConstructibleObjectType::mapped_type >::value);
-};
-
-template<typename BasicJsonType, typename ConstructibleObjectType>
-struct is_constructible_object_type
-    : is_constructible_object_type_impl<BasicJsonType,
-      ConstructibleObjectType> {};
-
-template<typename BasicJsonType, typename CompatibleStringType>
-struct is_compatible_string_type
-{
-    static constexpr auto value =
-        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
-};
-
-template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type
-{
-    // launder type through decltype() to fix compilation failure on ICPC
-#ifdef __INTEL_COMPILER
-    using laundered_type = decltype(std::declval<ConstructibleStringType>());
-#else
-    using laundered_type = ConstructibleStringType;
-#endif
-
-    static constexpr auto value =
-        conjunction <
-        is_constructible<laundered_type, typename BasicJsonType::string_t>,
-        is_detected_exact<typename BasicJsonType::string_t::value_type,
-        value_type_t, laundered_type >>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
-struct is_compatible_array_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type_impl <
-    BasicJsonType, CompatibleArrayType,
-    enable_if_t <
-    is_detected<iterator_t, CompatibleArrayType>::value&&
-    is_iterator_traits<iterator_traits<detected_t<iterator_t, CompatibleArrayType>>>::value&&
-// special case for types like std::filesystem::path whose iterator's value_type are themselves
-// c.f. https://github.com/nlohmann/json/pull/3073
-    !std::is_same<CompatibleArrayType, detected_t<range_value_t, CompatibleArrayType>>::value >>
-{
-    static constexpr bool value =
-        is_constructible<BasicJsonType,
-        range_value_t<CompatibleArrayType>>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type
-    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
-
-template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
-struct is_constructible_array_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t<std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value >>
-            : std::true_type {};
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t < !std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value&&
-    !is_compatible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
-    is_default_constructible<ConstructibleArrayType>::value&&
-(std::is_move_assignable<ConstructibleArrayType>::value ||
- std::is_copy_assignable<ConstructibleArrayType>::value)&&
-is_detected<iterator_t, ConstructibleArrayType>::value&&
-is_iterator_traits<iterator_traits<detected_t<iterator_t, ConstructibleArrayType>>>::value&&
-is_detected<range_value_t, ConstructibleArrayType>::value&&
-// special case for types like std::filesystem::path whose iterator's value_type are themselves
-// c.f. https://github.com/nlohmann/json/pull/3073
-!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
-        is_complete_type <
-        detected_t<range_value_t, ConstructibleArrayType >>::value >>
-{
-    using value_type = range_value_t<ConstructibleArrayType>;
-
-    static constexpr bool value =
-        std::is_same<value_type,
-        typename BasicJsonType::array_t::value_type>::value ||
-        has_from_json<BasicJsonType,
-        value_type>::value ||
-        has_non_default_from_json <
-        BasicJsonType,
-        value_type >::value;
-};
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type
-    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType,
-         typename = void>
-struct is_compatible_integer_type_impl : std::false_type {};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type_impl <
-    RealIntegerType, CompatibleNumberIntegerType,
-    enable_if_t < std::is_integral<RealIntegerType>::value&&
-    std::is_integral<CompatibleNumberIntegerType>::value&&
-    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
-{
-    // is there an assert somewhere on overflows?
-    using RealLimits = std::numeric_limits<RealIntegerType>;
-    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
-
-    static constexpr auto value =
-        is_constructible<RealIntegerType,
-        CompatibleNumberIntegerType>::value &&
-        CompatibleLimits::is_integer &&
-        RealLimits::is_signed == CompatibleLimits::is_signed;
-};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type
-    : is_compatible_integer_type_impl<RealIntegerType,
-      CompatibleNumberIntegerType> {};
-
-template<typename BasicJsonType, typename CompatibleType, typename = void>
-struct is_compatible_type_impl: std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type_impl <
-    BasicJsonType, CompatibleType,
-    enable_if_t<is_complete_type<CompatibleType>::value >>
-{
-    static constexpr bool value =
-        has_to_json<BasicJsonType, CompatibleType>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type
-    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
-
-template<typename T1, typename T2>
-struct is_constructible_tuple : std::false_type {};
-
-template<typename T1, typename... Args>
-struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
-
-template<typename BasicJsonType, typename T>
-struct is_json_iterator_of : std::false_type {};
-
-template<typename BasicJsonType>
-struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::iterator> : std::true_type {};
-
-template<typename BasicJsonType>
-struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::const_iterator> : std::true_type
-{};
-
-// checks if a given type T is a template specialization of Primary
-template<template <typename...> class Primary, typename T>
-struct is_specialization_of : std::false_type {};
-
-template<template <typename...> class Primary, typename... Args>
-struct is_specialization_of<Primary, Primary<Args...>> : std::true_type {};
-
-template<typename T>
-using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>;
-
-// checks if A and B are comparable using Compare functor
-template<typename Compare, typename A, typename B, typename = void>
-struct is_comparable : std::false_type {};
-
-template<typename Compare, typename A, typename B>
-struct is_comparable<Compare, A, B, void_t<
-decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())),
-decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))
->> : std::true_type {};
-
-template<typename T>
-using detect_is_transparent = typename T::is_transparent;
-
-// type trait to check if KeyType can be used as object key (without a BasicJsonType)
-// see is_usable_as_basic_json_key_type below
-template<typename Comparator, typename ObjectKeyType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
-         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
-using is_usable_as_key_type = typename std::conditional <
-                              is_comparable<Comparator, ObjectKeyType, KeyTypeCVRef>::value
-                              && !(ExcludeObjectKeyType && std::is_same<KeyType,
-                                   ObjectKeyType>::value)
-                              && (!RequireTransparentComparator
-                                  || is_detected <detect_is_transparent, Comparator>::value)
-                              && !is_json_pointer<KeyType>::value,
-                              std::true_type,
-                              std::false_type >::type;
-
-// type trait to check if KeyType can be used as object key
-// true if:
-//   - KeyType is comparable with BasicJsonType::object_t::key_type
-//   - if ExcludeObjectKeyType is true, KeyType is not BasicJsonType::object_t::key_type
-//   - the comparator is transparent or RequireTransparentComparator is false
-//   - KeyType is not a JSON iterator or json_pointer
-template<typename BasicJsonType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
-         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
-using is_usable_as_basic_json_key_type = typename std::conditional <
-        is_usable_as_key_type<typename BasicJsonType::object_comparator_t,
-        typename BasicJsonType::object_t::key_type, KeyTypeCVRef,
-        RequireTransparentComparator, ExcludeObjectKeyType>::value
-        && !is_json_iterator_of<BasicJsonType, KeyType>::value,
-        std::true_type,
-        std::false_type >::type;
-
-template<typename ObjectType, typename KeyType>
-using detect_erase_with_key_type = decltype(std::declval<ObjectType&>().erase(std::declval<KeyType>()));
-
-// type trait to check if object_t has an erase() member functions accepting KeyType
-template<typename BasicJsonType, typename KeyType>
-using has_erase_with_key_type = typename std::conditional <
-                                is_detected <
-                                detect_erase_with_key_type,
-                                typename BasicJsonType::object_t, KeyType >::value,
-                                std::true_type,
-                                std::false_type >::type;
-
-// a naive helper to check if a type is an ordered_map (exploits the fact that
-// ordered_map inherits capacity() from std::vector)
-template <typename T>
-struct is_ordered_map
-{
-    using one = char;
-
-    struct two
-    {
-        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-    };
-
-    template <typename C> static one test( decltype(&C::capacity) ) ;
-    template <typename C> static two test(...);
-
-    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-};
-
-// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
-template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
-T conditional_static_cast(U value)
-{
-    return static_cast<T>(value);
-}
-
-template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
-T conditional_static_cast(U value)
-{
-    return value;
-}
-
-template<typename... Types>
-using all_integral = conjunction<std::is_integral<Types>...>;
-
-template<typename... Types>
-using all_signed = conjunction<std::is_signed<Types>...>;
-
-template<typename... Types>
-using all_unsigned = conjunction<std::is_unsigned<Types>...>;
-
-// there's a disjunction trait in another PR; replace when merged
-template<typename... Types>
-using same_sign = std::integral_constant < bool,
-      all_signed<Types...>::value || all_unsigned<Types...>::value >;
-
-template<typename OfType, typename T>
-using never_out_of_range = std::integral_constant < bool,
-      (std::is_signed<OfType>::value && (sizeof(T) < sizeof(OfType)))
-      || (same_sign<OfType, T>::value && sizeof(OfType) == sizeof(T)) >;
-
-template<typename OfType, typename T,
-         bool OfTypeSigned = std::is_signed<OfType>::value,
-         bool TSigned = std::is_signed<T>::value>
-struct value_in_range_of_impl2;
-
-template<typename OfType, typename T>
-struct value_in_range_of_impl2<OfType, T, false, false>
-{
-    static constexpr bool test(T val)
-    {
-        using CommonType = typename std::common_type<OfType, T>::type;
-        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
-    }
-};
-
-template<typename OfType, typename T>
-struct value_in_range_of_impl2<OfType, T, true, false>
-{
-    static constexpr bool test(T val)
-    {
-        using CommonType = typename std::common_type<OfType, T>::type;
-        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
-    }
-};
-
-template<typename OfType, typename T>
-struct value_in_range_of_impl2<OfType, T, false, true>
-{
-    static constexpr bool test(T val)
-    {
-        using CommonType = typename std::common_type<OfType, T>::type;
-        return val >= 0 && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
-    }
-};
-
-
-template<typename OfType, typename T>
-struct value_in_range_of_impl2<OfType, T, true, true>
-{
-    static constexpr bool test(T val)
-    {
-        using CommonType = typename std::common_type<OfType, T>::type;
-        return static_cast<CommonType>(val) >= static_cast<CommonType>((std::numeric_limits<OfType>::min)())
-               && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
-    }
-};
-
-template<typename OfType, typename T,
-         bool NeverOutOfRange = never_out_of_range<OfType, T>::value,
-         typename = detail::enable_if_t<all_integral<OfType, T>::value>>
-struct value_in_range_of_impl1;
-
-template<typename OfType, typename T>
-struct value_in_range_of_impl1<OfType, T, false>
-{
-    static constexpr bool test(T val)
-    {
-        return value_in_range_of_impl2<OfType, T>::test(val);
-    }
-};
-
-template<typename OfType, typename T>
-struct value_in_range_of_impl1<OfType, T, true>
-{
-    static constexpr bool test(T /*val*/)
-    {
-        return true;
-    }
-};
-
-template<typename OfType, typename T>
-inline constexpr bool value_in_range_of(T val)
-{
-    return value_in_range_of_impl1<OfType, T>::test(val);
-}
-
-template<bool Value>
-using bool_constant = std::integral_constant<bool, Value>;
-
-///////////////////////////////////////////////////////////////////////////////
-// is_c_string
-///////////////////////////////////////////////////////////////////////////////
-
-namespace impl
-{
-
-template<typename T>
-inline constexpr bool is_c_string()
-{
-    using TUnExt = typename std::remove_extent<T>::type;
-    using TUnCVExt = typename std::remove_cv<TUnExt>::type;
-    using TUnPtr = typename std::remove_pointer<T>::type;
-    using TUnCVPtr = typename std::remove_cv<TUnPtr>::type;
-    return
-        (std::is_array<T>::value && std::is_same<TUnCVExt, char>::value)
-        || (std::is_pointer<T>::value && std::is_same<TUnCVPtr, char>::value);
-}
-
-}  // namespace impl
-
-// checks whether T is a [cv] char */[cv] char[] C string
-template<typename T>
-struct is_c_string : bool_constant<impl::is_c_string<T>()> {};
-
-template<typename T>
-using is_c_string_uncvref = is_c_string<uncvref_t<T>>;
-
-///////////////////////////////////////////////////////////////////////////////
-// is_transparent
-///////////////////////////////////////////////////////////////////////////////
-
-namespace impl
-{
-
-template<typename T>
-inline constexpr bool is_transparent()
-{
-    return is_detected<detect_is_transparent, T>::value;
-}
-
-}  // namespace impl
-
-// checks whether T has a member named is_transparent
-template<typename T>
-struct is_transparent : bool_constant<impl::is_transparent<T>()> {};
-
-///////////////////////////////////////////////////////////////////////////////
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/string_concat.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstring> // strlen
-#include <string> // string
-#include <utility> // forward
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-inline std::size_t concat_length()
-{
-    return 0;
-}
-
-template<typename... Args>
-inline std::size_t concat_length(const char* cstr, Args&& ... rest);
-
-template<typename StringType, typename... Args>
-inline std::size_t concat_length(const StringType& str, Args&& ... rest);
-
-template<typename... Args>
-inline std::size_t concat_length(const char /*c*/, Args&& ... rest)
-{
-    return 1 + concat_length(std::forward<Args>(rest)...);
-}
-
-template<typename... Args>
-inline std::size_t concat_length(const char* cstr, Args&& ... rest)
-{
-    // cppcheck-suppress ignoredReturnValue
-    return ::strlen(cstr) + concat_length(std::forward<Args>(rest)...);
-}
-
-template<typename StringType, typename... Args>
-inline std::size_t concat_length(const StringType& str, Args&& ... rest)
-{
-    return str.size() + concat_length(std::forward<Args>(rest)...);
-}
-
-template<typename OutStringType>
-inline void concat_into(OutStringType& /*out*/)
-{}
-
-template<typename StringType, typename Arg>
-using string_can_append = decltype(std::declval<StringType&>().append(std::declval < Arg && > ()));
-
-template<typename StringType, typename Arg>
-using detect_string_can_append = is_detected<string_can_append, StringType, Arg>;
-
-template<typename StringType, typename Arg>
-using string_can_append_op = decltype(std::declval<StringType&>() += std::declval < Arg && > ());
-
-template<typename StringType, typename Arg>
-using detect_string_can_append_op = is_detected<string_can_append_op, StringType, Arg>;
-
-template<typename StringType, typename Arg>
-using string_can_append_iter = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().begin(), std::declval<const Arg&>().end()));
-
-template<typename StringType, typename Arg>
-using detect_string_can_append_iter = is_detected<string_can_append_iter, StringType, Arg>;
-
-template<typename StringType, typename Arg>
-using string_can_append_data = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().data(), std::declval<const Arg&>().size()));
-
-template<typename StringType, typename Arg>
-using detect_string_can_append_data = is_detected<string_can_append_data, StringType, Arg>;
-
-template < typename OutStringType, typename Arg, typename... Args,
-           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
-                         && detect_string_can_append_op<OutStringType, Arg>::value, int > = 0 >
-inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest);
-
-template < typename OutStringType, typename Arg, typename... Args,
-           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
-                         && !detect_string_can_append_op<OutStringType, Arg>::value
-                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > = 0 >
-inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
-
-template < typename OutStringType, typename Arg, typename... Args,
-           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
-                         && !detect_string_can_append_op<OutStringType, Arg>::value
-                         && !detect_string_can_append_iter<OutStringType, Arg>::value
-                         && detect_string_can_append_data<OutStringType, Arg>::value, int > = 0 >
-inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
-
-template<typename OutStringType, typename Arg, typename... Args,
-         enable_if_t<detect_string_can_append<OutStringType, Arg>::value, int> = 0>
-inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest)
-{
-    out.append(std::forward<Arg>(arg));
-    concat_into(out, std::forward<Args>(rest)...);
-}
-
-template < typename OutStringType, typename Arg, typename... Args,
-           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
-                         && detect_string_can_append_op<OutStringType, Arg>::value, int > >
-inline void concat_into(OutStringType& out, Arg&& arg, Args&& ... rest)
-{
-    out += std::forward<Arg>(arg);
-    concat_into(out, std::forward<Args>(rest)...);
-}
-
-template < typename OutStringType, typename Arg, typename... Args,
-           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
-                         && !detect_string_can_append_op<OutStringType, Arg>::value
-                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > >
-inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
-{
-    out.append(arg.begin(), arg.end());
-    concat_into(out, std::forward<Args>(rest)...);
-}
-
-template < typename OutStringType, typename Arg, typename... Args,
-           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
-                         && !detect_string_can_append_op<OutStringType, Arg>::value
-                         && !detect_string_can_append_iter<OutStringType, Arg>::value
-                         && detect_string_can_append_data<OutStringType, Arg>::value, int > >
-inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
-{
-    out.append(arg.data(), arg.size());
-    concat_into(out, std::forward<Args>(rest)...);
-}
-
-template<typename OutStringType = std::string, typename... Args>
-inline OutStringType concat(Args && ... args)
-{
-    OutStringType str;
-    str.reserve(concat_length(std::forward<Args>(args)...));
-    concat_into(str, std::forward<Args>(args)...);
-    return str;
-}
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-////////////////
-// exceptions //
-////////////////
-
-/// @brief general exception of the @ref basic_json class
-/// @sa https://json.nlohmann.me/api/basic_json/exception/
-class exception : public std::exception
-{
-  public:
-    /// returns the explanatory string
-    const char* what() const noexcept override
-    {
-        return m.what();
-    }
-
-    /// the id of the exception
-    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
-
-  protected:
-    JSON_HEDLEY_NON_NULL(3)
-    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing)
-
-    static std::string name(const std::string& ename, int id_)
-    {
-        return concat("[json.exception.", ename, '.', std::to_string(id_), "] ");
-    }
-
-    static std::string diagnostics(std::nullptr_t /*leaf_element*/)
-    {
-        return "";
-    }
-
-    template<typename BasicJsonType>
-    static std::string diagnostics(const BasicJsonType* leaf_element)
-    {
-#if JSON_DIAGNOSTICS
-        std::vector<std::string> tokens;
-        for (const auto* current = leaf_element; current != nullptr && current->m_parent != nullptr; current = current->m_parent)
-        {
-            switch (current->m_parent->type())
-            {
-                case value_t::array:
-                {
-                    for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i)
-                    {
-                        if (&current->m_parent->m_value.array->operator[](i) == current)
-                        {
-                            tokens.emplace_back(std::to_string(i));
-                            break;
-                        }
-                    }
-                    break;
-                }
-
-                case value_t::object:
-                {
-                    for (const auto& element : *current->m_parent->m_value.object)
-                    {
-                        if (&element.second == current)
-                        {
-                            tokens.emplace_back(element.first.c_str());
-                            break;
-                        }
-                    }
-                    break;
-                }
-
-                case value_t::null: // LCOV_EXCL_LINE
-                case value_t::string: // LCOV_EXCL_LINE
-                case value_t::boolean: // LCOV_EXCL_LINE
-                case value_t::number_integer: // LCOV_EXCL_LINE
-                case value_t::number_unsigned: // LCOV_EXCL_LINE
-                case value_t::number_float: // LCOV_EXCL_LINE
-                case value_t::binary: // LCOV_EXCL_LINE
-                case value_t::discarded: // LCOV_EXCL_LINE
-                default:   // LCOV_EXCL_LINE
-                    break; // LCOV_EXCL_LINE
-            }
-        }
-
-        if (tokens.empty())
-        {
-            return "";
-        }
-
-        auto str = std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
-                                   [](const std::string & a, const std::string & b)
-        {
-            return concat(a, '/', detail::escape(b));
-        });
-        return concat('(', str, ") ");
-#else
-        static_cast<void>(leaf_element);
-        return "";
-#endif
-    }
-
-  private:
-    /// an exception object as storage for error messages
-    std::runtime_error m;
-};
-
-/// @brief exception indicating a parse error
-/// @sa https://json.nlohmann.me/api/basic_json/parse_error/
-class parse_error : public exception
-{
-  public:
-    /*!
-    @brief create a parse error exception
-    @param[in] id_       the id of the exception
-    @param[in] pos       the position where the error occurred (or with
-                         chars_read_total=0 if the position cannot be
-                         determined)
-    @param[in] what_arg  the explanatory string
-    @return parse_error object
-    */
-    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
-    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, BasicJsonContext context)
-    {
-        std::string w = concat(exception::name("parse_error", id_), "parse error",
-                               position_string(pos), ": ", exception::diagnostics(context), what_arg);
-        return {id_, pos.chars_read_total, w.c_str()};
-    }
-
-    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
-    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, BasicJsonContext context)
-    {
-        std::string w = concat(exception::name("parse_error", id_), "parse error",
-                               (byte_ != 0 ? (concat(" at byte ", std::to_string(byte_))) : ""),
-                               ": ", exception::diagnostics(context), what_arg);
-        return {id_, byte_, w.c_str()};
-    }
-
-    /*!
-    @brief byte index of the parse error
-
-    The byte index of the last read character in the input file.
-
-    @note For an input with n bytes, 1 is the index of the first character and
-          n+1 is the index of the terminating null byte or the end of file.
-          This also holds true when reading a byte vector (CBOR or MessagePack).
-    */
-    const std::size_t byte;
-
-  private:
-    parse_error(int id_, std::size_t byte_, const char* what_arg)
-        : exception(id_, what_arg), byte(byte_) {}
-
-    static std::string position_string(const position_t& pos)
-    {
-        return concat(" at line ", std::to_string(pos.lines_read + 1),
-                      ", column ", std::to_string(pos.chars_read_current_line));
-    }
-};
-
-/// @brief exception indicating errors with iterators
-/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/
-class invalid_iterator : public exception
-{
-  public:
-    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
-    static invalid_iterator create(int id_, const std::string& what_arg, BasicJsonContext context)
-    {
-        std::string w = concat(exception::name("invalid_iterator", id_), exception::diagnostics(context), what_arg);
-        return {id_, w.c_str()};
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    invalid_iterator(int id_, const char* what_arg)
-        : exception(id_, what_arg) {}
-};
-
-/// @brief exception indicating executing a member function with a wrong type
-/// @sa https://json.nlohmann.me/api/basic_json/type_error/
-class type_error : public exception
-{
-  public:
-    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
-    static type_error create(int id_, const std::string& what_arg, BasicJsonContext context)
-    {
-        std::string w = concat(exception::name("type_error", id_), exception::diagnostics(context), what_arg);
-        return {id_, w.c_str()};
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/// @brief exception indicating access out of the defined range
-/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/
-class out_of_range : public exception
-{
-  public:
-    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
-    static out_of_range create(int id_, const std::string& what_arg, BasicJsonContext context)
-    {
-        std::string w = concat(exception::name("out_of_range", id_), exception::diagnostics(context), what_arg);
-        return {id_, w.c_str()};
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/// @brief exception indicating other library errors
-/// @sa https://json.nlohmann.me/api/basic_json/other_error/
-class other_error : public exception
-{
-  public:
-    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
-    static other_error create(int id_, const std::string& what_arg, BasicJsonContext context)
-    {
-        std::string w = concat(exception::name("other_error", id_), exception::diagnostics(context), what_arg);
-        return {id_, w.c_str()};
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/identity_tag.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-// dispatching helper struct
-template <class T> struct identity_tag {};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/meta/std_fs.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
-#include <experimental/filesystem>
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-namespace std_fs = std::experimental::filesystem;
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-#elif JSON_HAS_FILESYSTEM
-#include <filesystem>
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-namespace std_fs = std::filesystem;
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-#endif
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/string_concat.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-template<typename BasicJsonType>
-inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be null, but is ", j.type_name()), &j));
-    }
-    n = nullptr;
-}
-
-// overloads for basic_json template parameters
-template < typename BasicJsonType, typename ArithmeticType,
-           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
-                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-                         int > = 0 >
-void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-
-        case value_t::null:
-        case value_t::object:
-        case value_t::array:
-        case value_t::string:
-        case value_t::boolean:
-        case value_t::binary:
-        case value_t::discarded:
-        default:
-            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
-    }
-}
-
-template<typename BasicJsonType>
-inline void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be boolean, but is ", j.type_name()), &j));
-    }
-    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
-}
-
-template<typename BasicJsonType>
-inline void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
-    }
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template <
-    typename BasicJsonType, typename StringType,
-    enable_if_t <
-        std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value
-        && is_detected_exact<typename BasicJsonType::string_t::value_type, value_type_t, StringType>::value
-        && !std::is_same<typename BasicJsonType::string_t, StringType>::value
-        && !is_json_ref<StringType>::value, int > = 0 >
-inline void from_json(const BasicJsonType& j, StringType& s)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
-    }
-
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template<typename BasicJsonType>
-inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-#if !JSON_DISABLE_ENUM_SERIALIZATION
-template<typename BasicJsonType, typename EnumType,
-         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-inline void from_json(const BasicJsonType& j, EnumType& e)
-{
-    typename std::underlying_type<EnumType>::type val;
-    get_arithmetic_value(j, val);
-    e = static_cast<EnumType>(val);
-}
-#endif  // JSON_DISABLE_ENUM_SERIALIZATION
-
-// forward_list doesn't have an insert method
-template<typename BasicJsonType, typename T, typename Allocator,
-         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-inline void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
-    }
-    l.clear();
-    std::transform(j.rbegin(), j.rend(),
-                   std::front_inserter(l), [](const BasicJsonType & i)
-    {
-        return i.template get<T>();
-    });
-}
-
-// valarray doesn't have an insert method
-template<typename BasicJsonType, typename T,
-         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-inline void from_json(const BasicJsonType& j, std::valarray<T>& l)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
-    }
-    l.resize(j.size());
-    std::transform(j.begin(), j.end(), std::begin(l),
-                   [](const BasicJsonType & elem)
-    {
-        return elem.template get<T>();
-    });
-}
-
-template<typename BasicJsonType, typename T, std::size_t N>
-auto from_json(const BasicJsonType& j, T (&arr)[N])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
--> decltype(j.template get<T>(), void())
-{
-    for (std::size_t i = 0; i < N; ++i)
-    {
-        arr[i] = j.at(i).template get<T>();
-    }
-}
-
-template<typename BasicJsonType>
-inline void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
-{
-    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
-}
-
-template<typename BasicJsonType, typename T, std::size_t N>
-auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
-                          priority_tag<2> /*unused*/)
--> decltype(j.template get<T>(), void())
-{
-    for (std::size_t i = 0; i < N; ++i)
-    {
-        arr[i] = j.at(i).template get<T>();
-    }
-}
-
-template<typename BasicJsonType, typename ConstructibleArrayType,
-         enable_if_t<
-             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
-             int> = 0>
-auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
--> decltype(
-    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
-    j.template get<typename ConstructibleArrayType::value_type>(),
-    void())
-{
-    using std::end;
-
-    ConstructibleArrayType ret;
-    ret.reserve(j.size());
-    std::transform(j.begin(), j.end(),
-                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename ConstructibleArrayType::value_type>();
-    });
-    arr = std::move(ret);
-}
-
-template<typename BasicJsonType, typename ConstructibleArrayType,
-         enable_if_t<
-             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
-             int> = 0>
-inline void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
-                                 priority_tag<0> /*unused*/)
-{
-    using std::end;
-
-    ConstructibleArrayType ret;
-    std::transform(
-        j.begin(), j.end(), std::inserter(ret, end(ret)),
-        [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename ConstructibleArrayType::value_type>();
-    });
-    arr = std::move(ret);
-}
-
-template < typename BasicJsonType, typename ConstructibleArrayType,
-           enable_if_t <
-               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
-               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
-               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
-               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
-               !is_basic_json<ConstructibleArrayType>::value,
-               int > = 0 >
-auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
--> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
-j.template get<typename ConstructibleArrayType::value_type>(),
-void())
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
-    }
-
-    from_json_array_impl(j, arr, priority_tag<3> {});
-}
-
-template < typename BasicJsonType, typename T, std::size_t... Idx >
-std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
-        identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
-{
-    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
-}
-
-template < typename BasicJsonType, typename T, std::size_t N >
-auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
--> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
-    }
-
-    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
-}
-
-template<typename BasicJsonType>
-inline void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be binary, but is ", j.type_name()), &j));
-    }
-
-    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
-}
-
-template<typename BasicJsonType, typename ConstructibleObjectType,
-         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
-inline void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be object, but is ", j.type_name()), &j));
-    }
-
-    ConstructibleObjectType ret;
-    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
-    using value_type = typename ConstructibleObjectType::value_type;
-    std::transform(
-        inner_object->begin(), inner_object->end(),
-        std::inserter(ret, ret.begin()),
-        [](typename BasicJsonType::object_t::value_type const & p)
-    {
-        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
-    });
-    obj = std::move(ret);
-}
-
-// overload for arithmetic types, not chosen for basic_json template arguments
-// (BooleanType, etc..); note: Is it really necessary to provide explicit
-// overloads for boolean_t etc. in case of a custom BooleanType which is not
-// an arithmetic type?
-template < typename BasicJsonType, typename ArithmeticType,
-           enable_if_t <
-               std::is_arithmetic<ArithmeticType>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-               int > = 0 >
-inline void from_json(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-        case value_t::boolean:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
-            break;
-        }
-
-        case value_t::null:
-        case value_t::object:
-        case value_t::array:
-        case value_t::string:
-        case value_t::binary:
-        case value_t::discarded:
-        default:
-            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
-    }
-}
-
-template<typename BasicJsonType, typename... Args, std::size_t... Idx>
-std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
-{
-    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
-}
-
-template < typename BasicJsonType, class A1, class A2 >
-std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
-{
-    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
-            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
-}
-
-template<typename BasicJsonType, typename A1, typename A2>
-inline void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
-{
-    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
-}
-
-template<typename BasicJsonType, typename... Args>
-std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
-{
-    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
-}
-
-template<typename BasicJsonType, typename... Args>
-inline void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
-{
-    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
-}
-
-template<typename BasicJsonType, typename TupleRelated>
-auto from_json(BasicJsonType&& j, TupleRelated&& t)
--> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
-    }
-
-    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
-}
-
-template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
-           typename = enable_if_t < !std::is_constructible <
-                                        typename BasicJsonType::string_t, Key >::value >>
-inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
-    }
-    m.clear();
-    for (const auto& p : j)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
-    }
-}
-
-template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
-           typename = enable_if_t < !std::is_constructible <
-                                        typename BasicJsonType::string_t, Key >::value >>
-inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
-    }
-    m.clear();
-    for (const auto& p : j)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
-    }
-}
-
-#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
-template<typename BasicJsonType>
-inline void from_json(const BasicJsonType& j, std_fs::path& p)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
-    }
-    p = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-#endif
-
-struct from_json_fn
-{
-    template<typename BasicJsonType, typename T>
-    auto operator()(const BasicJsonType& j, T&& val) const
-    noexcept(noexcept(from_json(j, std::forward<T>(val))))
-    -> decltype(from_json(j, std::forward<T>(val)))
-    {
-        return from_json(j, std::forward<T>(val));
-    }
-};
-
-}  // namespace detail
-
-#ifndef JSON_HAS_CPP_17
-/// namespace to hold default `from_json` function
-/// to see why this is required:
-/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
-namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
-{
-#endif
-JSON_INLINE_VARIABLE constexpr const auto& from_json = // NOLINT(misc-definitions-in-headers)
-    detail::static_const<detail::from_json_fn>::value;
-#ifndef JSON_HAS_CPP_17
-}  // namespace
-#endif
-
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/conversions/to_json.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <algorithm> // copy
-#include <iterator> // begin, end
-#include <string> // string
-#include <tuple> // tuple, get
-#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
-#include <utility> // move, forward, declval, pair
-#include <valarray> // valarray
-#include <vector> // vector
-
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstddef> // size_t
-#include <iterator> // input_iterator_tag
-#include <string> // string, to_string
-#include <tuple> // tuple_size, get, tuple_element
-#include <utility> // move
-
-#if JSON_HAS_RANGES
-    #include <ranges> // enable_borrowed_range
-#endif
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-template<typename string_type>
-void int_to_string( string_type& target, std::size_t value )
-{
-    // For ADL
-    using std::to_string;
-    target = to_string(value);
-}
-template<typename IteratorType> class iteration_proxy_value
-{
-  public:
-    using difference_type = std::ptrdiff_t;
-    using value_type = iteration_proxy_value;
-    using pointer = value_type *;
-    using reference = value_type &;
-    using iterator_category = std::input_iterator_tag;
-    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
-
-  private:
-    /// the iterator
-    IteratorType anchor{};
-    /// an index for arrays (used to create key names)
-    std::size_t array_index = 0;
-    /// last stringified array index
-    mutable std::size_t array_index_last = 0;
-    /// a string representation of the array index
-    mutable string_type array_index_str = "0";
-    /// an empty string (to return a reference for primitive values)
-    string_type empty_str{};
-
-  public:
-    explicit iteration_proxy_value() = default;
-    explicit iteration_proxy_value(IteratorType it, std::size_t array_index_ = 0)
-    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
-             && std::is_nothrow_default_constructible<string_type>::value)
-        : anchor(std::move(it))
-        , array_index(array_index_)
-    {}
-
-    iteration_proxy_value(iteration_proxy_value const&) = default;
-    iteration_proxy_value& operator=(iteration_proxy_value const&) = default;
-    // older GCCs are a bit fussy and require explicit noexcept specifiers on defaulted functions
-    iteration_proxy_value(iteration_proxy_value&&)
-    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
-             && std::is_nothrow_move_constructible<string_type>::value) = default;
-    iteration_proxy_value& operator=(iteration_proxy_value&&)
-    noexcept(std::is_nothrow_move_assignable<IteratorType>::value
-             && std::is_nothrow_move_assignable<string_type>::value) = default;
-    ~iteration_proxy_value() = default;
-
-    /// dereference operator (needed for range-based for)
-    const iteration_proxy_value& operator*() const
-    {
-        return *this;
-    }
-
-    /// increment operator (needed for range-based for)
-    iteration_proxy_value& operator++()
-    {
-        ++anchor;
-        ++array_index;
-
-        return *this;
-    }
-
-    iteration_proxy_value operator++(int)& // NOLINT(cert-dcl21-cpp)
-    {
-        auto tmp = iteration_proxy_value(anchor, array_index);
-        ++anchor;
-        ++array_index;
-        return tmp;
-    }
-
-    /// equality operator (needed for InputIterator)
-    bool operator==(const iteration_proxy_value& o) const
-    {
-        return anchor == o.anchor;
-    }
-
-    /// inequality operator (needed for range-based for)
-    bool operator!=(const iteration_proxy_value& o) const
-    {
-        return anchor != o.anchor;
-    }
-
-    /// return key of the iterator
-    const string_type& key() const
-    {
-        JSON_ASSERT(anchor.m_object != nullptr);
-
-        switch (anchor.m_object->type())
-        {
-            // use integer array index as key
-            case value_t::array:
-            {
-                if (array_index != array_index_last)
-                {
-                    int_to_string( array_index_str, array_index );
-                    array_index_last = array_index;
-                }
-                return array_index_str;
-            }
-
-            // use key from the object
-            case value_t::object:
-                return anchor.key();
-
-            // use an empty key for all primitive types
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return empty_str;
-        }
-    }
-
-    /// return value of the iterator
-    typename IteratorType::reference value() const
-    {
-        return anchor.value();
-    }
-};
-
-/// proxy class for the items() function
-template<typename IteratorType> class iteration_proxy
-{
-  private:
-    /// the container to iterate
-    typename IteratorType::pointer container = nullptr;
-
-  public:
-    explicit iteration_proxy() = default;
-
-    /// construct iteration proxy from a container
-    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
-        : container(&cont) {}
-
-    iteration_proxy(iteration_proxy const&) = default;
-    iteration_proxy& operator=(iteration_proxy const&) = default;
-    iteration_proxy(iteration_proxy&&) noexcept = default;
-    iteration_proxy& operator=(iteration_proxy&&) noexcept = default;
-    ~iteration_proxy() = default;
-
-    /// return iterator begin (needed for range-based for)
-    iteration_proxy_value<IteratorType> begin() const noexcept
-    {
-        return iteration_proxy_value<IteratorType>(container->begin());
-    }
-
-    /// return iterator end (needed for range-based for)
-    iteration_proxy_value<IteratorType> end() const noexcept
-    {
-        return iteration_proxy_value<IteratorType>(container->end());
-    }
-};
-
-// Structured Bindings Support
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
-auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
-{
-    return i.key();
-}
-// Structured Bindings Support
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
-auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
-{
-    return i.value();
-}
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// The Addition to the STD Namespace is required to add
-// Structured Bindings Support to the iteration_proxy_value class
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-namespace std
-{
-
-#if defined(__clang__)
-    // Fix: https://github.com/nlohmann/json/issues/1401
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wmismatched-tags"
-#endif
-template<typename IteratorType>
-class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
-            : public std::integral_constant<std::size_t, 2> {};
-
-template<std::size_t N, typename IteratorType>
-class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
-{
-  public:
-    using type = decltype(
-                     get<N>(std::declval <
-                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
-};
-#if defined(__clang__)
-    #pragma clang diagnostic pop
-#endif
-
-}  // namespace std
-
-#if JSON_HAS_RANGES
-    template <typename IteratorType>
-    inline constexpr bool ::std::ranges::enable_borrowed_range<::nlohmann::detail::iteration_proxy<IteratorType>> = true;
-#endif
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/std_fs.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-//////////////////
-// constructors //
-//////////////////
-
-/*
- * Note all external_constructor<>::construct functions need to call
- * j.m_value.destroy(j.m_type) to avoid a memory leak in case j contains an
- * allocated value (e.g., a string). See bug issue
- * https://github.com/nlohmann/json/issues/2865 for more information.
- */
-
-template<value_t> struct external_constructor;
-
-template<>
-struct external_constructor<value_t::boolean>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::boolean;
-        j.m_value = b;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::string>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::string;
-        j.m_value = s;
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::string;
-        j.m_value = std::move(s);
-        j.assert_invariant();
-    }
-
-    template < typename BasicJsonType, typename CompatibleStringType,
-               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
-                             int > = 0 >
-    static void construct(BasicJsonType& j, const CompatibleStringType& str)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::string;
-        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::binary>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::binary;
-        j.m_value = typename BasicJsonType::binary_t(b);
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::binary;
-        j.m_value = typename BasicJsonType::binary_t(std::move(b));
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_float>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::number_float;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_unsigned>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::number_unsigned;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_integer>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::number_integer;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::array>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = arr;
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = std::move(arr);
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template < typename BasicJsonType, typename CompatibleArrayType,
-               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
-                             int > = 0 >
-    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
-    {
-        using std::begin;
-        using std::end;
-
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->reserve(arr.size());
-        for (const bool x : arr)
-        {
-            j.m_value.array->push_back(x);
-            j.set_parent(j.m_value.array->back());
-        }
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType, typename T,
-             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->resize(arr.size());
-        if (arr.size() > 0)
-        {
-            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
-        }
-        j.set_parents();
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::object>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::object;
-        j.m_value = obj;
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::object;
-        j.m_value = std::move(obj);
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template < typename BasicJsonType, typename CompatibleObjectType,
-               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
-    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
-    {
-        using std::begin;
-        using std::end;
-
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::object;
-        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
-        j.set_parents();
-        j.assert_invariant();
-    }
-};
-
-/////////////
-// to_json //
-/////////////
-
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
-inline void to_json(BasicJsonType& j, T b) noexcept
-{
-    external_constructor<value_t::boolean>::construct(j, b);
-}
-
-template < typename BasicJsonType, typename BoolRef,
-           enable_if_t <
-               ((std::is_same<std::vector<bool>::reference, BoolRef>::value
-                 && !std::is_same <std::vector<bool>::reference, typename BasicJsonType::boolean_t&>::value)
-                || (std::is_same<std::vector<bool>::const_reference, BoolRef>::value
-                    && !std::is_same <detail::uncvref_t<std::vector<bool>::const_reference>,
-                                      typename BasicJsonType::boolean_t >::value))
-               && std::is_convertible<const BoolRef&, typename BasicJsonType::boolean_t>::value, int > = 0 >
-inline void to_json(BasicJsonType& j, const BoolRef& b) noexcept
-{
-    external_constructor<value_t::boolean>::construct(j, static_cast<typename BasicJsonType::boolean_t>(b));
-}
-
-template<typename BasicJsonType, typename CompatibleString,
-         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
-inline void to_json(BasicJsonType& j, const CompatibleString& s)
-{
-    external_constructor<value_t::string>::construct(j, s);
-}
-
-template<typename BasicJsonType>
-inline void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
-{
-    external_constructor<value_t::string>::construct(j, std::move(s));
-}
-
-template<typename BasicJsonType, typename FloatType,
-         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
-inline void to_json(BasicJsonType& j, FloatType val) noexcept
-{
-    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
-}
-
-template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
-         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
-inline void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
-{
-    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
-}
-
-template<typename BasicJsonType, typename CompatibleNumberIntegerType,
-         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
-inline void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
-{
-    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
-}
-
-#if !JSON_DISABLE_ENUM_SERIALIZATION
-template<typename BasicJsonType, typename EnumType,
-         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-inline void to_json(BasicJsonType& j, EnumType e) noexcept
-{
-    using underlying_type = typename std::underlying_type<EnumType>::type;
-    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
-}
-#endif  // JSON_DISABLE_ENUM_SERIALIZATION
-
-template<typename BasicJsonType>
-inline void to_json(BasicJsonType& j, const std::vector<bool>& e)
-{
-    external_constructor<value_t::array>::construct(j, e);
-}
-
-template < typename BasicJsonType, typename CompatibleArrayType,
-           enable_if_t < is_compatible_array_type<BasicJsonType,
-                         CompatibleArrayType>::value&&
-                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
-                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
-                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
-                         !is_basic_json<CompatibleArrayType>::value,
-                         int > = 0 >
-inline void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
-{
-    external_constructor<value_t::array>::construct(j, arr);
-}
-
-template<typename BasicJsonType>
-inline void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
-{
-    external_constructor<value_t::binary>::construct(j, bin);
-}
-
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-inline void to_json(BasicJsonType& j, const std::valarray<T>& arr)
-{
-    external_constructor<value_t::array>::construct(j, std::move(arr));
-}
-
-template<typename BasicJsonType>
-inline void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
-{
-    external_constructor<value_t::array>::construct(j, std::move(arr));
-}
-
-template < typename BasicJsonType, typename CompatibleObjectType,
-           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
-inline void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
-{
-    external_constructor<value_t::object>::construct(j, obj);
-}
-
-template<typename BasicJsonType>
-inline void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
-{
-    external_constructor<value_t::object>::construct(j, std::move(obj));
-}
-
-template <
-    typename BasicJsonType, typename T, std::size_t N,
-    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
-                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-                  int > = 0 >
-inline void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-{
-    external_constructor<value_t::array>::construct(j, arr);
-}
-
-template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
-inline void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
-{
-    j = { p.first, p.second };
-}
-
-// for https://github.com/nlohmann/json/pull/1134
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
-inline void to_json(BasicJsonType& j, const T& b)
-{
-    j = { {b.key(), b.value()} };
-}
-
-template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
-inline void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
-{
-    j = { std::get<Idx>(t)... };
-}
-
-template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
-inline void to_json(BasicJsonType& j, const T& t)
-{
-    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
-}
-
-#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
-template<typename BasicJsonType>
-inline void to_json(BasicJsonType& j, const std_fs::path& p)
-{
-    j = p.string();
-}
-#endif
-
-struct to_json_fn
-{
-    template<typename BasicJsonType, typename T>
-    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
-    -> decltype(to_json(j, std::forward<T>(val)), void())
-    {
-        return to_json(j, std::forward<T>(val));
-    }
-};
-}  // namespace detail
-
-#ifndef JSON_HAS_CPP_17
-/// namespace to hold default `to_json` function
-/// to see why this is required:
-/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
-namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
-{
-#endif
-JSON_INLINE_VARIABLE constexpr const auto& to_json = // NOLINT(misc-definitions-in-headers)
-    detail::static_const<detail::to_json_fn>::value;
-#ifndef JSON_HAS_CPP_17
-}  // namespace
-#endif
-
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/meta/identity_tag.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-/// @sa https://json.nlohmann.me/api/adl_serializer/
-template<typename ValueType, typename>
-struct adl_serializer
-{
-    /// @brief convert a JSON value to any value type
-    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
-    template<typename BasicJsonType, typename TargetType = ValueType>
-    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
-        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
-    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
-    {
-        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
-    }
-
-    /// @brief convert a JSON value to any value type
-    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
-    template<typename BasicJsonType, typename TargetType = ValueType>
-    static auto from_json(BasicJsonType && j) noexcept(
-    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
-    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
-    {
-        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
-    }
-
-    /// @brief convert any value type to a JSON value
-    /// @sa https://json.nlohmann.me/api/adl_serializer/to_json/
-    template<typename BasicJsonType, typename TargetType = ValueType>
-    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
-        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
-    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
-    {
-        ::nlohmann::to_json(j, std::forward<TargetType>(val));
-    }
-};
-
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/byte_container_with_subtype.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstdint> // uint8_t, uint64_t
-#include <tuple> // tie
-#include <utility> // move
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-/// @brief an internal type for a backed binary type
-/// @sa https://json.nlohmann.me/api/byte_container_with_subtype/
-template<typename BinaryType>
-class byte_container_with_subtype : public BinaryType
-{
-  public:
-    using container_type = BinaryType;
-    using subtype_type = std::uint64_t;
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype() noexcept(noexcept(container_type()))
-        : container_type()
-    {}
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
-        : container_type(b)
-    {}
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
-        : container_type(std::move(b))
-    {}
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
-        : container_type(b)
-        , m_subtype(subtype_)
-        , m_has_subtype(true)
-    {}
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
-        : container_type(std::move(b))
-        , m_subtype(subtype_)
-        , m_has_subtype(true)
-    {}
-
-    bool operator==(const byte_container_with_subtype& rhs) const
-    {
-        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
-               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
-    }
-
-    bool operator!=(const byte_container_with_subtype& rhs) const
-    {
-        return !(rhs == *this);
-    }
-
-    /// @brief sets the binary subtype
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/set_subtype/
-    void set_subtype(subtype_type subtype_) noexcept
-    {
-        m_subtype = subtype_;
-        m_has_subtype = true;
-    }
-
-    /// @brief return the binary subtype
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/subtype/
-    constexpr subtype_type subtype() const noexcept
-    {
-        return m_has_subtype ? m_subtype : static_cast<subtype_type>(-1);
-    }
-
-    /// @brief return whether the value has a subtype
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/has_subtype/
-    constexpr bool has_subtype() const noexcept
-    {
-        return m_has_subtype;
-    }
-
-    /// @brief clears the binary subtype
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/clear_subtype/
-    void clear_subtype() noexcept
-    {
-        m_subtype = 0;
-        m_has_subtype = false;
-    }
-
-  private:
-    subtype_type m_subtype = 0;
-    bool m_has_subtype = false;
-};
-
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/conversions/from_json.hpp>
-
-// #include <nlohmann/detail/conversions/to_json.hpp>
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/hash.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstdint> // uint8_t
-#include <cstddef> // size_t
-#include <functional> // hash
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-// boost::hash_combine
-inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
-{
-    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
-    return seed;
-}
-
-/*!
-@brief hash a JSON value
-
-The hash function tries to rely on std::hash where possible. Furthermore, the
-type of the JSON value is taken into account to have different hash values for
-null, 0, 0U, and false, etc.
-
-@tparam BasicJsonType basic_json specialization
-@param j JSON value to hash
-@return hash value of j
-*/
-template<typename BasicJsonType>
-std::size_t hash(const BasicJsonType& j)
-{
-    using string_t = typename BasicJsonType::string_t;
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-
-    const auto type = static_cast<std::size_t>(j.type());
-    switch (j.type())
-    {
-        case BasicJsonType::value_t::null:
-        case BasicJsonType::value_t::discarded:
-        {
-            return combine(type, 0);
-        }
-
-        case BasicJsonType::value_t::object:
-        {
-            auto seed = combine(type, j.size());
-            for (const auto& element : j.items())
-            {
-                const auto h = std::hash<string_t> {}(element.key());
-                seed = combine(seed, h);
-                seed = combine(seed, hash(element.value()));
-            }
-            return seed;
-        }
-
-        case BasicJsonType::value_t::array:
-        {
-            auto seed = combine(type, j.size());
-            for (const auto& element : j)
-            {
-                seed = combine(seed, hash(element));
-            }
-            return seed;
-        }
-
-        case BasicJsonType::value_t::string:
-        {
-            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::boolean:
-        {
-            const auto h = std::hash<bool> {}(j.template get<bool>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::number_integer:
-        {
-            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::number_unsigned:
-        {
-            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::number_float:
-        {
-            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::binary:
-        {
-            auto seed = combine(type, j.get_binary().size());
-            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
-            seed = combine(seed, h);
-            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
-            for (const auto byte : j.get_binary())
-            {
-                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
-            }
-            return seed;
-        }
-
-        default:                   // LCOV_EXCL_LINE
-            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-            return 0;              // LCOV_EXCL_LINE
-    }
-}
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/input/binary_reader.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <algorithm> // generate_n
-#include <array> // array
-#include <cmath> // ldexp
-#include <cstddef> // size_t
-#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
-#include <cstdio> // snprintf
-#include <cstring> // memcpy
-#include <iterator> // back_inserter
-#include <limits> // numeric_limits
-#include <string> // char_traits, string
-#include <utility> // make_pair, move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <array> // array
-#include <cstddef> // size_t
-#include <cstring> // strlen
-#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
-#include <memory> // shared_ptr, make_shared, addressof
-#include <numeric> // accumulate
-#include <string> // string, char_traits
-#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
-#include <utility> // pair, declval
-
-#ifndef JSON_NO_IO
-    #include <cstdio>   // FILE *
-    #include <istream>  // istream
-#endif                  // JSON_NO_IO
-
-// #include <nlohmann/detail/iterators/iterator_traits.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-/// the supported input formats
-enum class input_format_t { json, cbor, msgpack, ubjson, bson, bjdata };
-
-////////////////////
-// input adapters //
-////////////////////
-
-#ifndef JSON_NO_IO
-/*!
-Input adapter for stdio file access. This adapter read only 1 byte and do not use any
- buffer. This adapter is a very low level adapter.
-*/
-class file_input_adapter
-{
-  public:
-    using char_type = char;
-
-    JSON_HEDLEY_NON_NULL(2)
-    explicit file_input_adapter(std::FILE* f) noexcept
-        : m_file(f)
-    {
-        JSON_ASSERT(m_file != nullptr);
-    }
-
-    // make class move-only
-    file_input_adapter(const file_input_adapter&) = delete;
-    file_input_adapter(file_input_adapter&&) noexcept = default;
-    file_input_adapter& operator=(const file_input_adapter&) = delete;
-    file_input_adapter& operator=(file_input_adapter&&) = delete;
-    ~file_input_adapter() = default;
-
-    std::char_traits<char>::int_type get_character() noexcept
-    {
-        return std::fgetc(m_file);
-    }
-
-  private:
-    /// the file pointer to read from
-    std::FILE* m_file;
-};
-
-
-/*!
-Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
-beginning of input. Does not support changing the underlying std::streambuf
-in mid-input. Maintains underlying std::istream and std::streambuf to support
-subsequent use of standard std::istream operations to process any input
-characters following those used in parsing the JSON input.  Clears the
-std::istream flags; any input errors (e.g., EOF) will be detected by the first
-subsequent call for input from the std::istream.
-*/
-class input_stream_adapter
-{
-  public:
-    using char_type = char;
-
-    ~input_stream_adapter()
-    {
-        // clear stream flags; we use underlying streambuf I/O, do not
-        // maintain ifstream flags, except eof
-        if (is != nullptr)
-        {
-            is->clear(is->rdstate() & std::ios::eofbit);
-        }
-    }
-
-    explicit input_stream_adapter(std::istream& i)
-        : is(&i), sb(i.rdbuf())
-    {}
-
-    // delete because of pointer members
-    input_stream_adapter(const input_stream_adapter&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
-
-    input_stream_adapter(input_stream_adapter&& rhs) noexcept
-        : is(rhs.is), sb(rhs.sb)
-    {
-        rhs.is = nullptr;
-        rhs.sb = nullptr;
-    }
-
-    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
-    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
-    // end up as the same value, e.g. 0xFFFFFFFF.
-    std::char_traits<char>::int_type get_character()
-    {
-        auto res = sb->sbumpc();
-        // set eof manually, as we don't use the istream interface.
-        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
-        {
-            is->clear(is->rdstate() | std::ios::eofbit);
-        }
-        return res;
-    }
-
-  private:
-    /// the associated input stream
-    std::istream* is = nullptr;
-    std::streambuf* sb = nullptr;
-};
-#endif  // JSON_NO_IO
-
-// General-purpose iterator-based adapter. It might not be as fast as
-// theoretically possible for some containers, but it is extremely versatile.
-template<typename IteratorType>
-class iterator_input_adapter
-{
-  public:
-    using char_type = typename std::iterator_traits<IteratorType>::value_type;
-
-    iterator_input_adapter(IteratorType first, IteratorType last)
-        : current(std::move(first)), end(std::move(last))
-    {}
-
-    typename std::char_traits<char_type>::int_type get_character()
-    {
-        if (JSON_HEDLEY_LIKELY(current != end))
-        {
-            auto result = std::char_traits<char_type>::to_int_type(*current);
-            std::advance(current, 1);
-            return result;
-        }
-
-        return std::char_traits<char_type>::eof();
-    }
-
-  private:
-    IteratorType current;
-    IteratorType end;
-
-    template<typename BaseInputAdapter, size_t T>
-    friend struct wide_string_input_helper;
-
-    bool empty() const
-    {
-        return current == end;
-    }
-};
-
-
-template<typename BaseInputAdapter, size_t T>
-struct wide_string_input_helper;
-
-template<typename BaseInputAdapter>
-struct wide_string_input_helper<BaseInputAdapter, 4>
-{
-    // UTF-32
-    static void fill_buffer(BaseInputAdapter& input,
-                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
-                            size_t& utf8_bytes_index,
-                            size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (JSON_HEDLEY_UNLIKELY(input.empty()))
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const auto wc = input.get_character();
-
-            // UTF-32 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 2;
-            }
-            else if (wc <= 0xFFFF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 3;
-            }
-            else if (wc <= 0x10FFFF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
-                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 4;
-            }
-            else
-            {
-                // unknown character
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-        }
-    }
-};
-
-template<typename BaseInputAdapter>
-struct wide_string_input_helper<BaseInputAdapter, 2>
-{
-    // UTF-16
-    static void fill_buffer(BaseInputAdapter& input,
-                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
-                            size_t& utf8_bytes_index,
-                            size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (JSON_HEDLEY_UNLIKELY(input.empty()))
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const auto wc = input.get_character();
-
-            // UTF-16 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 2;
-            }
-            else if (0xD800 > wc || wc >= 0xE000)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 3;
-            }
-            else
-            {
-                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
-                {
-                    const auto wc2 = static_cast<unsigned int>(input.get_character());
-                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
-                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
-                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
-                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
-                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
-                    utf8_bytes_filled = 4;
-                }
-                else
-                {
-                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                    utf8_bytes_filled = 1;
-                }
-            }
-        }
-    }
-};
-
-// Wraps another input apdater to convert wide character types into individual bytes.
-template<typename BaseInputAdapter, typename WideCharType>
-class wide_string_input_adapter
-{
-  public:
-    using char_type = char;
-
-    wide_string_input_adapter(BaseInputAdapter base)
-        : base_adapter(base) {}
-
-    typename std::char_traits<char>::int_type get_character() noexcept
-    {
-        // check if buffer needs to be filled
-        if (utf8_bytes_index == utf8_bytes_filled)
-        {
-            fill_buffer<sizeof(WideCharType)>();
-
-            JSON_ASSERT(utf8_bytes_filled > 0);
-            JSON_ASSERT(utf8_bytes_index == 0);
-        }
-
-        // use buffer
-        JSON_ASSERT(utf8_bytes_filled > 0);
-        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
-        return utf8_bytes[utf8_bytes_index++];
-    }
-
-  private:
-    BaseInputAdapter base_adapter;
-
-    template<size_t T>
-    void fill_buffer()
-    {
-        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
-    }
-
-    /// a buffer for UTF-8 bytes
-    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
-
-    /// index to the utf8_codes array for the next valid byte
-    std::size_t utf8_bytes_index = 0;
-    /// number of valid bytes in the utf8_codes array
-    std::size_t utf8_bytes_filled = 0;
-};
-
-
-template<typename IteratorType, typename Enable = void>
-struct iterator_input_adapter_factory
-{
-    using iterator_type = IteratorType;
-    using char_type = typename std::iterator_traits<iterator_type>::value_type;
-    using adapter_type = iterator_input_adapter<iterator_type>;
-
-    static adapter_type create(IteratorType first, IteratorType last)
-    {
-        return adapter_type(std::move(first), std::move(last));
-    }
-};
-
-template<typename T>
-struct is_iterator_of_multibyte
-{
-    using value_type = typename std::iterator_traits<T>::value_type;
-    enum
-    {
-        value = sizeof(value_type) > 1
-    };
-};
-
-template<typename IteratorType>
-struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
-{
-    using iterator_type = IteratorType;
-    using char_type = typename std::iterator_traits<iterator_type>::value_type;
-    using base_adapter_type = iterator_input_adapter<iterator_type>;
-    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
-
-    static adapter_type create(IteratorType first, IteratorType last)
-    {
-        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
-    }
-};
-
-// General purpose iterator-based input
-template<typename IteratorType>
-typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
-{
-    using factory_type = iterator_input_adapter_factory<IteratorType>;
-    return factory_type::create(first, last);
-}
-
-// Convenience shorthand from container to iterator
-// Enables ADL on begin(container) and end(container)
-// Encloses the using declarations in namespace for not to leak them to outside scope
-
-namespace container_input_adapter_factory_impl
-{
-
-using std::begin;
-using std::end;
-
-template<typename ContainerType, typename Enable = void>
-struct container_input_adapter_factory {};
-
-template<typename ContainerType>
-struct container_input_adapter_factory< ContainerType,
-       void_t<decltype(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>()))>>
-       {
-           using adapter_type = decltype(input_adapter(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>())));
-
-           static adapter_type create(const ContainerType& container)
-{
-    return input_adapter(begin(container), end(container));
-}
-       };
-
-}  // namespace container_input_adapter_factory_impl
-
-template<typename ContainerType>
-typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
-{
-    return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
-}
-
-#ifndef JSON_NO_IO
-// Special cases with fast paths
-inline file_input_adapter input_adapter(std::FILE* file)
-{
-    return file_input_adapter(file);
-}
-
-inline input_stream_adapter input_adapter(std::istream& stream)
-{
-    return input_stream_adapter(stream);
-}
-
-inline input_stream_adapter input_adapter(std::istream&& stream)
-{
-    return input_stream_adapter(stream);
-}
-#endif  // JSON_NO_IO
-
-using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
-
-// Null-delimited strings, and the like.
-template < typename CharT,
-           typename std::enable_if <
-               std::is_pointer<CharT>::value&&
-               !std::is_array<CharT>::value&&
-               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
-               sizeof(typename std::remove_pointer<CharT>::type) == 1,
-               int >::type = 0 >
-contiguous_bytes_input_adapter input_adapter(CharT b)
-{
-    auto length = std::strlen(reinterpret_cast<const char*>(b));
-    const auto* ptr = reinterpret_cast<const char*>(b);
-    return input_adapter(ptr, ptr + length);
-}
-
-template<typename T, std::size_t N>
-auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-{
-    return input_adapter(array, array + N);
-}
-
-// This class only handles inputs of input_buffer_adapter type.
-// It's required so that expressions like {ptr, len} can be implicitly cast
-// to the correct adapter.
-class span_input_adapter
-{
-  public:
-    template < typename CharT,
-               typename std::enable_if <
-                   std::is_pointer<CharT>::value&&
-                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
-                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
-                   int >::type = 0 >
-    span_input_adapter(CharT b, std::size_t l)
-        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
-
-    template<class IteratorType,
-             typename std::enable_if<
-                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
-                 int>::type = 0>
-    span_input_adapter(IteratorType first, IteratorType last)
-        : ia(input_adapter(first, last)) {}
-
-    contiguous_bytes_input_adapter&& get()
-    {
-        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
-    }
-
-  private:
-    contiguous_bytes_input_adapter ia;
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/input/json_sax.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstddef>
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/string_concat.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-/*!
-@brief SAX interface
-
-This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
-Each function is called in different situations while the input is parsed. The
-boolean return value informs the parser whether to continue processing the
-input.
-*/
-template<typename BasicJsonType>
-struct json_sax
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-
-    /*!
-    @brief a null value was read
-    @return whether parsing should proceed
-    */
-    virtual bool null() = 0;
-
-    /*!
-    @brief a boolean value was read
-    @param[in] val  boolean value
-    @return whether parsing should proceed
-    */
-    virtual bool boolean(bool val) = 0;
-
-    /*!
-    @brief an integer number was read
-    @param[in] val  integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_integer(number_integer_t val) = 0;
-
-    /*!
-    @brief an unsigned integer number was read
-    @param[in] val  unsigned integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_unsigned(number_unsigned_t val) = 0;
-
-    /*!
-    @brief a floating-point number was read
-    @param[in] val  floating-point value
-    @param[in] s    raw token value
-    @return whether parsing should proceed
-    */
-    virtual bool number_float(number_float_t val, const string_t& s) = 0;
-
-    /*!
-    @brief a string value was read
-    @param[in] val  string value
-    @return whether parsing should proceed
-    @note It is safe to move the passed string value.
-    */
-    virtual bool string(string_t& val) = 0;
-
-    /*!
-    @brief a binary value was read
-    @param[in] val  binary value
-    @return whether parsing should proceed
-    @note It is safe to move the passed binary value.
-    */
-    virtual bool binary(binary_t& val) = 0;
-
-    /*!
-    @brief the beginning of an object was read
-    @param[in] elements  number of object elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_object(std::size_t elements) = 0;
-
-    /*!
-    @brief an object key was read
-    @param[in] val  object key
-    @return whether parsing should proceed
-    @note It is safe to move the passed string.
-    */
-    virtual bool key(string_t& val) = 0;
-
-    /*!
-    @brief the end of an object was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_object() = 0;
-
-    /*!
-    @brief the beginning of an array was read
-    @param[in] elements  number of array elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_array(std::size_t elements) = 0;
-
-    /*!
-    @brief the end of an array was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_array() = 0;
-
-    /*!
-    @brief a parse error occurred
-    @param[in] position    the position in the input where the error occurs
-    @param[in] last_token  the last read token
-    @param[in] ex          an exception object describing the error
-    @return whether parsing should proceed (must return false)
-    */
-    virtual bool parse_error(std::size_t position,
-                             const std::string& last_token,
-                             const detail::exception& ex) = 0;
-
-    json_sax() = default;
-    json_sax(const json_sax&) = default;
-    json_sax(json_sax&&) noexcept = default;
-    json_sax& operator=(const json_sax&) = default;
-    json_sax& operator=(json_sax&&) noexcept = default;
-    virtual ~json_sax() = default;
-};
-
-
-namespace detail
-{
-/*!
-@brief SAX implementation to create a JSON value from SAX events
-
-This class implements the @ref json_sax interface and processes the SAX events
-to create a JSON value which makes it basically a DOM parser. The structure or
-hierarchy of the JSON value is managed by the stack `ref_stack` which contains
-a pointer to the respective array or object for each recursion depth.
-
-After successful parsing, the value that is passed by reference to the
-constructor contains the parsed value.
-
-@tparam BasicJsonType  the JSON type
-*/
-template<typename BasicJsonType>
-class json_sax_dom_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-
-    /*!
-    @param[in,out] r  reference to a JSON value that is manipulated while
-                       parsing
-    @param[in] allow_exceptions_  whether parse errors yield exceptions
-    */
-    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
-        : root(r), allow_exceptions(allow_exceptions_)
-    {}
-
-    // make class move-only
-    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~json_sax_dom_parser() = default;
-
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t& /*unused*/)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool binary(binary_t& val)
-    {
-        handle_value(std::move(val));
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
-
-        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        JSON_ASSERT(!ref_stack.empty());
-        JSON_ASSERT(ref_stack.back()->is_object());
-
-        // add null at given key and store the reference for later
-        object_element = &(ref_stack.back()->m_value.object->operator[](val));
-        return true;
-    }
-
-    bool end_object()
-    {
-        JSON_ASSERT(!ref_stack.empty());
-        JSON_ASSERT(ref_stack.back()->is_object());
-
-        ref_stack.back()->set_parents();
-        ref_stack.pop_back();
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
-
-        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        JSON_ASSERT(!ref_stack.empty());
-        JSON_ASSERT(ref_stack.back()->is_array());
-
-        ref_stack.back()->set_parents();
-        ref_stack.pop_back();
-        return true;
-    }
-
-    template<class Exception>
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const Exception& ex)
-    {
-        errored = true;
-        static_cast<void>(ex);
-        if (allow_exceptions)
-        {
-            JSON_THROW(ex);
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-    */
-    template<typename Value>
-    JSON_HEDLEY_RETURNS_NON_NULL
-    BasicJsonType* handle_value(Value&& v)
-    {
-        if (ref_stack.empty())
-        {
-            root = BasicJsonType(std::forward<Value>(v));
-            return &root;
-        }
-
-        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
-
-        if (ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
-            return &(ref_stack.back()->m_value.array->back());
-        }
-
-        JSON_ASSERT(ref_stack.back()->is_object());
-        JSON_ASSERT(object_element);
-        *object_element = BasicJsonType(std::forward<Value>(v));
-        return object_element;
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack {};
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-};
-
-template<typename BasicJsonType>
-class json_sax_dom_callback_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using parser_callback_t = typename BasicJsonType::parser_callback_t;
-    using parse_event_t = typename BasicJsonType::parse_event_t;
-
-    json_sax_dom_callback_parser(BasicJsonType& r,
-                                 const parser_callback_t cb,
-                                 const bool allow_exceptions_ = true)
-        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
-    {
-        keep_stack.push_back(true);
-    }
-
-    // make class move-only
-    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~json_sax_dom_callback_parser() = default;
-
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t& /*unused*/)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool binary(binary_t& val)
-    {
-        handle_value(std::move(val));
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        // check callback for object start
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::object, true);
-        ref_stack.push_back(val.second);
-
-        // check object limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        BasicJsonType k = BasicJsonType(val);
-
-        // check callback for key
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
-        key_keep_stack.push_back(keep);
-
-        // add discarded value at given key and store the reference for later
-        if (keep && ref_stack.back())
-        {
-            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
-        }
-
-        return true;
-    }
-
-    bool end_object()
-    {
-        if (ref_stack.back())
-        {
-            if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
-            {
-                // discard object
-                *ref_stack.back() = discarded;
-            }
-            else
-            {
-                ref_stack.back()->set_parents();
-            }
-        }
-
-        JSON_ASSERT(!ref_stack.empty());
-        JSON_ASSERT(!keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
-        {
-            // remove discarded value
-            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
-            {
-                if (it->is_discarded())
-                {
-                    ref_stack.back()->erase(it);
-                    break;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::array, true);
-        ref_stack.push_back(val.second);
-
-        // check array limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        bool keep = true;
-
-        if (ref_stack.back())
-        {
-            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
-            if (keep)
-            {
-                ref_stack.back()->set_parents();
-            }
-            else
-            {
-                // discard array
-                *ref_stack.back() = discarded;
-            }
-        }
-
-        JSON_ASSERT(!ref_stack.empty());
-        JSON_ASSERT(!keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        // remove discarded value
-        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->pop_back();
-        }
-
-        return true;
-    }
-
-    template<class Exception>
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const Exception& ex)
-    {
-        errored = true;
-        static_cast<void>(ex);
-        if (allow_exceptions)
-        {
-            JSON_THROW(ex);
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @param[in] v  value to add to the JSON value we build during parsing
-    @param[in] skip_callback  whether we should skip calling the callback
-               function; this is required after start_array() and
-               start_object() SAX events, because otherwise we would call the
-               callback function with an empty array or object, respectively.
-
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-
-    @return pair of boolean (whether value should be kept) and pointer (to the
-            passed value in the ref_stack hierarchy; nullptr if not kept)
-    */
-    template<typename Value>
-    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
-    {
-        JSON_ASSERT(!keep_stack.empty());
-
-        // do not handle this value if we know it would be added to a discarded
-        // container
-        if (!keep_stack.back())
-        {
-            return {false, nullptr};
-        }
-
-        // create value
-        auto value = BasicJsonType(std::forward<Value>(v));
-
-        // check callback
-        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
-
-        // do not handle this value if we just learnt it shall be discarded
-        if (!keep)
-        {
-            return {false, nullptr};
-        }
-
-        if (ref_stack.empty())
-        {
-            root = std::move(value);
-            return {true, &root};
-        }
-
-        // skip this value if we already decided to skip the parent
-        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
-        if (!ref_stack.back())
-        {
-            return {false, nullptr};
-        }
-
-        // we now only expect arrays and objects
-        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
-
-        // array
-        if (ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->emplace_back(std::move(value));
-            return {true, &(ref_stack.back()->m_value.array->back())};
-        }
-
-        // object
-        JSON_ASSERT(ref_stack.back()->is_object());
-        // check if we should store an element for the current key
-        JSON_ASSERT(!key_keep_stack.empty());
-        const bool store_element = key_keep_stack.back();
-        key_keep_stack.pop_back();
-
-        if (!store_element)
-        {
-            return {false, nullptr};
-        }
-
-        JSON_ASSERT(object_element);
-        *object_element = std::move(value);
-        return {true, object_element};
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack {};
-    /// stack to manage which values to keep
-    std::vector<bool> keep_stack {};
-    /// stack to manage which object keys to keep
-    std::vector<bool> key_keep_stack {};
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// callback function
-    const parser_callback_t callback = nullptr;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-    /// a discarded value for the callback
-    BasicJsonType discarded = BasicJsonType::value_t::discarded;
-};
-
-template<typename BasicJsonType>
-class json_sax_acceptor
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-
-    bool null()
-    {
-        return true;
-    }
-
-    bool boolean(bool /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_integer(number_integer_t /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool string(string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool binary(binary_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool start_object(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
-    {
-        return true;
-    }
-
-    bool key(string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool end_object()
-    {
-        return true;
-    }
-
-    bool start_array(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
-    {
-        return true;
-    }
-
-    bool end_array()
-    {
-        return true;
-    }
-
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
-    {
-        return false;
-    }
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/input/lexer.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <array> // array
-#include <clocale> // localeconv
-#include <cstddef> // size_t
-#include <cstdio> // snprintf
-#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
-#include <initializer_list> // initializer_list
-#include <string> // char_traits, string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/position_t.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-///////////
-// lexer //
-///////////
-
-template<typename BasicJsonType>
-class lexer_base
-{
-  public:
-    /// token types for the parser
-    enum class token_type
-    {
-        uninitialized,    ///< indicating the scanner is uninitialized
-        literal_true,     ///< the `true` literal
-        literal_false,    ///< the `false` literal
-        literal_null,     ///< the `null` literal
-        value_string,     ///< a string -- use get_string() for actual value
-        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
-        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
-        value_float,      ///< an floating point number -- use get_number_float() for actual value
-        begin_array,      ///< the character for array begin `[`
-        begin_object,     ///< the character for object begin `{`
-        end_array,        ///< the character for array end `]`
-        end_object,       ///< the character for object end `}`
-        name_separator,   ///< the name separator `:`
-        value_separator,  ///< the value separator `,`
-        parse_error,      ///< indicating a parse error
-        end_of_input,     ///< indicating the end of the input buffer
-        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
-    };
-
-    /// return name of values of type token_type (only used for errors)
-    JSON_HEDLEY_RETURNS_NON_NULL
-    JSON_HEDLEY_CONST
-    static const char* token_type_name(const token_type t) noexcept
-    {
-        switch (t)
-        {
-            case token_type::uninitialized:
-                return "<uninitialized>";
-            case token_type::literal_true:
-                return "true literal";
-            case token_type::literal_false:
-                return "false literal";
-            case token_type::literal_null:
-                return "null literal";
-            case token_type::value_string:
-                return "string literal";
-            case token_type::value_unsigned:
-            case token_type::value_integer:
-            case token_type::value_float:
-                return "number literal";
-            case token_type::begin_array:
-                return "'['";
-            case token_type::begin_object:
-                return "'{'";
-            case token_type::end_array:
-                return "']'";
-            case token_type::end_object:
-                return "'}'";
-            case token_type::name_separator:
-                return "':'";
-            case token_type::value_separator:
-                return "','";
-            case token_type::parse_error:
-                return "<parse error>";
-            case token_type::end_of_input:
-                return "end of input";
-            case token_type::literal_or_value:
-                return "'[', '{', or a literal";
-            // LCOV_EXCL_START
-            default: // catch non-enum values
-                return "unknown token";
-                // LCOV_EXCL_STOP
-        }
-    }
-};
-/*!
-@brief lexical analysis
-
-This class organizes the lexical analysis during JSON deserialization.
-*/
-template<typename BasicJsonType, typename InputAdapterType>
-class lexer : public lexer_base<BasicJsonType>
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
-
-  public:
-    using token_type = typename lexer_base<BasicJsonType>::token_type;
-
-    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
-        : ia(std::move(adapter))
-        , ignore_comments(ignore_comments_)
-        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
-    {}
-
-    // delete because of pointer members
-    lexer(const lexer&) = delete;
-    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    lexer& operator=(lexer&) = delete;
-    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~lexer() = default;
-
-  private:
-    /////////////////////
-    // locales
-    /////////////////////
-
-    /// return the locale-dependent decimal point
-    JSON_HEDLEY_PURE
-    static char get_decimal_point() noexcept
-    {
-        const auto* loc = localeconv();
-        JSON_ASSERT(loc != nullptr);
-        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
-    }
-
-    /////////////////////
-    // scan functions
-    /////////////////////
-
-    /*!
-    @brief get codepoint from 4 hex characters following `\u`
-
-    For input "\u c1 c2 c3 c4" the codepoint is:
-      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
-    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
-
-    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
-    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
-    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
-    between the ASCII value of the character and the desired integer value.
-
-    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
-            non-hex character)
-    */
-    int get_codepoint()
-    {
-        // this function only makes sense after reading `\u`
-        JSON_ASSERT(current == 'u');
-        int codepoint = 0;
-
-        const auto factors = { 12u, 8u, 4u, 0u };
-        for (const auto factor : factors)
-        {
-            get();
-
-            if (current >= '0' && current <= '9')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
-            }
-            else if (current >= 'A' && current <= 'F')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
-            }
-            else if (current >= 'a' && current <= 'f')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
-            }
-            else
-            {
-                return -1;
-            }
-        }
-
-        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
-        return codepoint;
-    }
-
-    /*!
-    @brief check if the next byte(s) are inside a given range
-
-    Adds the current byte and, for each passed range, reads a new byte and
-    checks if it is inside the range. If a violation was detected, set up an
-    error message and return false. Otherwise, return true.
-
-    @param[in] ranges  list of integers; interpreted as list of pairs of
-                       inclusive lower and upper bound, respectively
-
-    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
-         1, 2, or 3 pairs. This precondition is enforced by an assertion.
-
-    @return true if and only if no range violation was detected
-    */
-    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
-    {
-        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
-        add(current);
-
-        for (auto range = ranges.begin(); range != ranges.end(); ++range)
-        {
-            get();
-            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range)))
-            {
-                add(current);
-            }
-            else
-            {
-                error_message = "invalid string: ill-formed UTF-8 byte";
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief scan a string literal
-
-    This function scans a string according to Sect. 7 of RFC 8259. While
-    scanning, bytes are escaped and copied into buffer token_buffer. Then the
-    function returns successfully, token_buffer is *not* null-terminated (as it
-    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
-    string.
-
-    @return token_type::value_string if string could be successfully scanned,
-            token_type::parse_error otherwise
-
-    @note In case of errors, variable error_message contains a textual
-          description.
-    */
-    token_type scan_string()
-    {
-        // reset token_buffer (ignore opening quote)
-        reset();
-
-        // we entered the function by reading an open quote
-        JSON_ASSERT(current == '\"');
-
-        while (true)
-        {
-            // get next character
-            switch (get())
-            {
-                // end of file while parsing string
-                case std::char_traits<char_type>::eof():
-                {
-                    error_message = "invalid string: missing closing quote";
-                    return token_type::parse_error;
-                }
-
-                // closing quote
-                case '\"':
-                {
-                    return token_type::value_string;
-                }
-
-                // escapes
-                case '\\':
-                {
-                    switch (get())
-                    {
-                        // quotation mark
-                        case '\"':
-                            add('\"');
-                            break;
-                        // reverse solidus
-                        case '\\':
-                            add('\\');
-                            break;
-                        // solidus
-                        case '/':
-                            add('/');
-                            break;
-                        // backspace
-                        case 'b':
-                            add('\b');
-                            break;
-                        // form feed
-                        case 'f':
-                            add('\f');
-                            break;
-                        // line feed
-                        case 'n':
-                            add('\n');
-                            break;
-                        // carriage return
-                        case 'r':
-                            add('\r');
-                            break;
-                        // tab
-                        case 't':
-                            add('\t');
-                            break;
-
-                        // unicode escapes
-                        case 'u':
-                        {
-                            const int codepoint1 = get_codepoint();
-                            int codepoint = codepoint1; // start with codepoint1
-
-                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
-                            {
-                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
-                                return token_type::parse_error;
-                            }
-
-                            // check if code point is a high surrogate
-                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
-                            {
-                                // expect next \uxxxx entry
-                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
-                                {
-                                    const int codepoint2 = get_codepoint();
-
-                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
-                                    {
-                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
-                                        return token_type::parse_error;
-                                    }
-
-                                    // check if codepoint2 is a low surrogate
-                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
-                                    {
-                                        // overwrite codepoint
-                                        codepoint = static_cast<int>(
-                                                        // high surrogate occupies the most significant 22 bits
-                                                        (static_cast<unsigned int>(codepoint1) << 10u)
-                                                        // low surrogate occupies the least significant 15 bits
-                                                        + static_cast<unsigned int>(codepoint2)
-                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
-                                                        // in the result, so we have to subtract with:
-                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
-                                                        - 0x35FDC00u);
-                                    }
-                                    else
-                                    {
-                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
-                                        return token_type::parse_error;
-                                    }
-                                }
-                                else
-                                {
-                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
-                                    return token_type::parse_error;
-                                }
-                            }
-                            else
-                            {
-                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
-                                {
-                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
-                                    return token_type::parse_error;
-                                }
-                            }
-
-                            // result of the above calculation yields a proper codepoint
-                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
-
-                            // translate codepoint into bytes
-                            if (codepoint < 0x80)
-                            {
-                                // 1-byte characters: 0xxxxxxx (ASCII)
-                                add(static_cast<char_int_type>(codepoint));
-                            }
-                            else if (codepoint <= 0x7FF)
-                            {
-                                // 2-byte characters: 110xxxxx 10xxxxxx
-                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
-                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-                            else if (codepoint <= 0xFFFF)
-                            {
-                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
-                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-                            else
-                            {
-                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
-                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
-                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-
-                            break;
-                        }
-
-                        // other characters after escape
-                        default:
-                            error_message = "invalid string: forbidden character after backslash";
-                            return token_type::parse_error;
-                    }
-
-                    break;
-                }
-
-                // invalid control characters
-                case 0x00:
-                {
-                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
-                    return token_type::parse_error;
-                }
-
-                case 0x01:
-                {
-                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
-                    return token_type::parse_error;
-                }
-
-                case 0x02:
-                {
-                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
-                    return token_type::parse_error;
-                }
-
-                case 0x03:
-                {
-                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
-                    return token_type::parse_error;
-                }
-
-                case 0x04:
-                {
-                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
-                    return token_type::parse_error;
-                }
-
-                case 0x05:
-                {
-                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
-                    return token_type::parse_error;
-                }
-
-                case 0x06:
-                {
-                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
-                    return token_type::parse_error;
-                }
-
-                case 0x07:
-                {
-                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
-                    return token_type::parse_error;
-                }
-
-                case 0x08:
-                {
-                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
-                    return token_type::parse_error;
-                }
-
-                case 0x09:
-                {
-                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
-                    return token_type::parse_error;
-                }
-
-                case 0x0A:
-                {
-                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
-                    return token_type::parse_error;
-                }
-
-                case 0x0B:
-                {
-                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
-                    return token_type::parse_error;
-                }
-
-                case 0x0C:
-                {
-                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
-                    return token_type::parse_error;
-                }
-
-                case 0x0D:
-                {
-                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
-                    return token_type::parse_error;
-                }
-
-                case 0x0E:
-                {
-                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
-                    return token_type::parse_error;
-                }
-
-                case 0x0F:
-                {
-                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
-                    return token_type::parse_error;
-                }
-
-                case 0x10:
-                {
-                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
-                    return token_type::parse_error;
-                }
-
-                case 0x11:
-                {
-                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
-                    return token_type::parse_error;
-                }
-
-                case 0x12:
-                {
-                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
-                    return token_type::parse_error;
-                }
-
-                case 0x13:
-                {
-                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
-                    return token_type::parse_error;
-                }
-
-                case 0x14:
-                {
-                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
-                    return token_type::parse_error;
-                }
-
-                case 0x15:
-                {
-                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
-                    return token_type::parse_error;
-                }
-
-                case 0x16:
-                {
-                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
-                    return token_type::parse_error;
-                }
-
-                case 0x17:
-                {
-                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
-                    return token_type::parse_error;
-                }
-
-                case 0x18:
-                {
-                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
-                    return token_type::parse_error;
-                }
-
-                case 0x19:
-                {
-                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
-                    return token_type::parse_error;
-                }
-
-                case 0x1A:
-                {
-                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
-                    return token_type::parse_error;
-                }
-
-                case 0x1B:
-                {
-                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
-                    return token_type::parse_error;
-                }
-
-                case 0x1C:
-                {
-                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
-                    return token_type::parse_error;
-                }
-
-                case 0x1D:
-                {
-                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
-                    return token_type::parse_error;
-                }
-
-                case 0x1E:
-                {
-                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
-                    return token_type::parse_error;
-                }
-
-                case 0x1F:
-                {
-                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
-                    return token_type::parse_error;
-                }
-
-                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
-                case 0x20:
-                case 0x21:
-                case 0x23:
-                case 0x24:
-                case 0x25:
-                case 0x26:
-                case 0x27:
-                case 0x28:
-                case 0x29:
-                case 0x2A:
-                case 0x2B:
-                case 0x2C:
-                case 0x2D:
-                case 0x2E:
-                case 0x2F:
-                case 0x30:
-                case 0x31:
-                case 0x32:
-                case 0x33:
-                case 0x34:
-                case 0x35:
-                case 0x36:
-                case 0x37:
-                case 0x38:
-                case 0x39:
-                case 0x3A:
-                case 0x3B:
-                case 0x3C:
-                case 0x3D:
-                case 0x3E:
-                case 0x3F:
-                case 0x40:
-                case 0x41:
-                case 0x42:
-                case 0x43:
-                case 0x44:
-                case 0x45:
-                case 0x46:
-                case 0x47:
-                case 0x48:
-                case 0x49:
-                case 0x4A:
-                case 0x4B:
-                case 0x4C:
-                case 0x4D:
-                case 0x4E:
-                case 0x4F:
-                case 0x50:
-                case 0x51:
-                case 0x52:
-                case 0x53:
-                case 0x54:
-                case 0x55:
-                case 0x56:
-                case 0x57:
-                case 0x58:
-                case 0x59:
-                case 0x5A:
-                case 0x5B:
-                case 0x5D:
-                case 0x5E:
-                case 0x5F:
-                case 0x60:
-                case 0x61:
-                case 0x62:
-                case 0x63:
-                case 0x64:
-                case 0x65:
-                case 0x66:
-                case 0x67:
-                case 0x68:
-                case 0x69:
-                case 0x6A:
-                case 0x6B:
-                case 0x6C:
-                case 0x6D:
-                case 0x6E:
-                case 0x6F:
-                case 0x70:
-                case 0x71:
-                case 0x72:
-                case 0x73:
-                case 0x74:
-                case 0x75:
-                case 0x76:
-                case 0x77:
-                case 0x78:
-                case 0x79:
-                case 0x7A:
-                case 0x7B:
-                case 0x7C:
-                case 0x7D:
-                case 0x7E:
-                case 0x7F:
-                {
-                    add(current);
-                    break;
-                }
-
-                // U+0080..U+07FF: bytes C2..DF 80..BF
-                case 0xC2:
-                case 0xC3:
-                case 0xC4:
-                case 0xC5:
-                case 0xC6:
-                case 0xC7:
-                case 0xC8:
-                case 0xC9:
-                case 0xCA:
-                case 0xCB:
-                case 0xCC:
-                case 0xCD:
-                case 0xCE:
-                case 0xCF:
-                case 0xD0:
-                case 0xD1:
-                case 0xD2:
-                case 0xD3:
-                case 0xD4:
-                case 0xD5:
-                case 0xD6:
-                case 0xD7:
-                case 0xD8:
-                case 0xD9:
-                case 0xDA:
-                case 0xDB:
-                case 0xDC:
-                case 0xDD:
-                case 0xDE:
-                case 0xDF:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
-                case 0xE0:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
-                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
-                case 0xE1:
-                case 0xE2:
-                case 0xE3:
-                case 0xE4:
-                case 0xE5:
-                case 0xE6:
-                case 0xE7:
-                case 0xE8:
-                case 0xE9:
-                case 0xEA:
-                case 0xEB:
-                case 0xEC:
-                case 0xEE:
-                case 0xEF:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
-                case 0xED:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
-                case 0xF0:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
-                case 0xF1:
-                case 0xF2:
-                case 0xF3:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
-                case 0xF4:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // remaining bytes (80..C1 and F5..FF) are ill-formed
-                default:
-                {
-                    error_message = "invalid string: ill-formed UTF-8 byte";
-                    return token_type::parse_error;
-                }
-            }
-        }
-    }
-
-    /*!
-     * @brief scan a comment
-     * @return whether comment could be scanned successfully
-     */
-    bool scan_comment()
-    {
-        switch (get())
-        {
-            // single-line comments skip input until a newline or EOF is read
-            case '/':
-            {
-                while (true)
-                {
-                    switch (get())
-                    {
-                        case '\n':
-                        case '\r':
-                        case std::char_traits<char_type>::eof():
-                        case '\0':
-                            return true;
-
-                        default:
-                            break;
-                    }
-                }
-            }
-
-            // multi-line comments skip input until */ is read
-            case '*':
-            {
-                while (true)
-                {
-                    switch (get())
-                    {
-                        case std::char_traits<char_type>::eof():
-                        case '\0':
-                        {
-                            error_message = "invalid comment; missing closing '*/'";
-                            return false;
-                        }
-
-                        case '*':
-                        {
-                            switch (get())
-                            {
-                                case '/':
-                                    return true;
-
-                                default:
-                                {
-                                    unget();
-                                    continue;
-                                }
-                            }
-                        }
-
-                        default:
-                            continue;
-                    }
-                }
-            }
-
-            // unexpected character after reading '/'
-            default:
-            {
-                error_message = "invalid comment; expecting '/' or '*' after '/'";
-                return false;
-            }
-        }
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(float& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtof(str, endptr);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(double& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtod(str, endptr);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(long double& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtold(str, endptr);
-    }
-
-    /*!
-    @brief scan a number literal
-
-    This function scans a string according to Sect. 6 of RFC 8259.
-
-    The function is realized with a deterministic finite state machine derived
-    from the grammar described in RFC 8259. Starting in state "init", the
-    input is read and used to determined the next state. Only state "done"
-    accepts the number. State "error" is a trap state to model errors. In the
-    table below, "anything" means any character but the ones listed before.
-
-    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
-    ---------|----------|----------|----------|---------|---------|----------|-----------
-    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
-    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
-    zero     | done     | done     | exponent | done    | done    | decimal1 | done
-    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
-    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
-    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
-    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
-    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
-    any2     | any2     | any2     | done     | done    | done    | done     | done
-
-    The state machine is realized with one label per state (prefixed with
-    "scan_number_") and `goto` statements between them. The state machine
-    contains cycles, but any cycle can be left when EOF is read. Therefore,
-    the function is guaranteed to terminate.
-
-    During scanning, the read bytes are stored in token_buffer. This string is
-    then converted to a signed integer, an unsigned integer, or a
-    floating-point number.
-
-    @return token_type::value_unsigned, token_type::value_integer, or
-            token_type::value_float if number could be successfully scanned,
-            token_type::parse_error otherwise
-
-    @note The scanner is independent of the current locale. Internally, the
-          locale's decimal point is used instead of `.` to work with the
-          locale-dependent converters.
-    */
-    token_type scan_number()  // lgtm [cpp/use-of-goto]
-    {
-        // reset token_buffer to store the number's bytes
-        reset();
-
-        // the type of the parsed number; initially set to unsigned; will be
-        // changed if minus sign, decimal point or exponent is read
-        token_type number_type = token_type::value_unsigned;
-
-        // state (init): we just found out we need to scan a number
-        switch (current)
-        {
-            case '-':
-            {
-                add(current);
-                goto scan_number_minus;
-            }
-
-            case '0':
-            {
-                add(current);
-                goto scan_number_zero;
-            }
-
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            // all other characters are rejected outside scan_number()
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-
-scan_number_minus:
-        // state: we just parsed a leading minus sign
-        number_type = token_type::value_integer;
-        switch (get())
-        {
-            case '0':
-            {
-                add(current);
-                goto scan_number_zero;
-            }
-
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after '-'";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_zero:
-        // state: we just parse a zero (maybe with a leading minus sign)
-        switch (get())
-        {
-            case '.':
-            {
-                add(decimal_point_char);
-                goto scan_number_decimal1;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_any1:
-        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            case '.':
-            {
-                add(decimal_point_char);
-                goto scan_number_decimal1;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_decimal1:
-        // state: we just parsed a decimal point
-        number_type = token_type::value_float;
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_decimal2;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after '.'";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_decimal2:
-        // we just parsed at least one number after a decimal point
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_decimal2;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_exponent:
-        // we just parsed an exponent
-        number_type = token_type::value_float;
-        switch (get())
-        {
-            case '+':
-            case '-':
-            {
-                add(current);
-                goto scan_number_sign;
-            }
-
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-            {
-                error_message =
-                    "invalid number; expected '+', '-', or digit after exponent";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_sign:
-        // we just parsed an exponent sign
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after exponent sign";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_any2:
-        // we just parsed a number after the exponent or exponent sign
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_done:
-        // unget the character after the number (we only read it to know that
-        // we are done scanning a number)
-        unget();
-
-        char* endptr = nullptr; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-        errno = 0;
-
-        // try to parse integers first and fall back to floats
-        if (number_type == token_type::value_unsigned)
-        {
-            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
-
-            // we checked the number format before
-            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
-
-            if (errno == 0)
-            {
-                value_unsigned = static_cast<number_unsigned_t>(x);
-                if (value_unsigned == x)
-                {
-                    return token_type::value_unsigned;
-                }
-            }
-        }
-        else if (number_type == token_type::value_integer)
-        {
-            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
-
-            // we checked the number format before
-            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
-
-            if (errno == 0)
-            {
-                value_integer = static_cast<number_integer_t>(x);
-                if (value_integer == x)
-                {
-                    return token_type::value_integer;
-                }
-            }
-        }
-
-        // this code is reached if we parse a floating-point number or if an
-        // integer conversion above failed
-        strtof(value_float, token_buffer.data(), &endptr);
-
-        // we checked the number format before
-        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
-
-        return token_type::value_float;
-    }
-
-    /*!
-    @param[in] literal_text  the literal text to expect
-    @param[in] length        the length of the passed literal text
-    @param[in] return_type   the token type to return on success
-    */
-    JSON_HEDLEY_NON_NULL(2)
-    token_type scan_literal(const char_type* literal_text, const std::size_t length,
-                            token_type return_type)
-    {
-        JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
-        for (std::size_t i = 1; i < length; ++i)
-        {
-            if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
-            {
-                error_message = "invalid literal";
-                return token_type::parse_error;
-            }
-        }
-        return return_type;
-    }
-
-    /////////////////////
-    // input management
-    /////////////////////
-
-    /// reset token_buffer; current character is beginning of token
-    void reset() noexcept
-    {
-        token_buffer.clear();
-        token_string.clear();
-        token_string.push_back(std::char_traits<char_type>::to_char_type(current));
-    }
-
-    /*
-    @brief get next character from the input
-
-    This function provides the interface to the used input adapter. It does
-    not throw in case the input reached EOF, but returns a
-    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
-    for use in error messages.
-
-    @return character read from the input
-    */
-    char_int_type get()
-    {
-        ++position.chars_read_total;
-        ++position.chars_read_current_line;
-
-        if (next_unget)
-        {
-            // just reset the next_unget variable and work with current
-            next_unget = false;
-        }
-        else
-        {
-            current = ia.get_character();
-        }
-
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
-        {
-            token_string.push_back(std::char_traits<char_type>::to_char_type(current));
-        }
-
-        if (current == '\n')
-        {
-            ++position.lines_read;
-            position.chars_read_current_line = 0;
-        }
-
-        return current;
-    }
-
-    /*!
-    @brief unget current character (read it again on next get)
-
-    We implement unget by setting variable next_unget to true. The input is not
-    changed - we just simulate ungetting by modifying chars_read_total,
-    chars_read_current_line, and token_string. The next call to get() will
-    behave as if the unget character is read again.
-    */
-    void unget()
-    {
-        next_unget = true;
-
-        --position.chars_read_total;
-
-        // in case we "unget" a newline, we have to also decrement the lines_read
-        if (position.chars_read_current_line == 0)
-        {
-            if (position.lines_read > 0)
-            {
-                --position.lines_read;
-            }
-        }
-        else
-        {
-            --position.chars_read_current_line;
-        }
-
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
-        {
-            JSON_ASSERT(!token_string.empty());
-            token_string.pop_back();
-        }
-    }
-
-    /// add a character to token_buffer
-    void add(char_int_type c)
-    {
-        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
-    }
-
-  public:
-    /////////////////////
-    // value getters
-    /////////////////////
-
-    /// return integer value
-    constexpr number_integer_t get_number_integer() const noexcept
-    {
-        return value_integer;
-    }
-
-    /// return unsigned integer value
-    constexpr number_unsigned_t get_number_unsigned() const noexcept
-    {
-        return value_unsigned;
-    }
-
-    /// return floating-point value
-    constexpr number_float_t get_number_float() const noexcept
-    {
-        return value_float;
-    }
-
-    /// return current string value (implicitly resets the token; useful only once)
-    string_t& get_string()
-    {
-        return token_buffer;
-    }
-
-    /////////////////////
-    // diagnostics
-    /////////////////////
-
-    /// return position of last read token
-    constexpr position_t get_position() const noexcept
-    {
-        return position;
-    }
-
-    /// return the last read token (for errors only).  Will never contain EOF
-    /// (an arbitrary value that is not a valid char value, often -1), because
-    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
-    std::string get_token_string() const
-    {
-        // escape control characters
-        std::string result;
-        for (const auto c : token_string)
-        {
-            if (static_cast<unsigned char>(c) <= '\x1F')
-            {
-                // escape control characters
-                std::array<char, 9> cs{{}};
-                static_cast<void>((std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                result += cs.data();
-            }
-            else
-            {
-                // add character as is
-                result.push_back(static_cast<std::string::value_type>(c));
-            }
-        }
-
-        return result;
-    }
-
-    /// return syntax error message
-    JSON_HEDLEY_RETURNS_NON_NULL
-    constexpr const char* get_error_message() const noexcept
-    {
-        return error_message;
-    }
-
-    /////////////////////
-    // actual scanner
-    /////////////////////
-
-    /*!
-    @brief skip the UTF-8 byte order mark
-    @return true iff there is no BOM or the correct BOM has been skipped
-    */
-    bool skip_bom()
-    {
-        if (get() == 0xEF)
-        {
-            // check if we completely parse the BOM
-            return get() == 0xBB && get() == 0xBF;
-        }
-
-        // the first character is not the beginning of the BOM; unget it to
-        // process is later
-        unget();
-        return true;
-    }
-
-    void skip_whitespace()
-    {
-        do
-        {
-            get();
-        }
-        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
-    }
-
-    token_type scan()
-    {
-        // initially, skip the BOM
-        if (position.chars_read_total == 0 && !skip_bom())
-        {
-            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
-            return token_type::parse_error;
-        }
-
-        // read next character and ignore whitespace
-        skip_whitespace();
-
-        // ignore comments
-        while (ignore_comments && current == '/')
-        {
-            if (!scan_comment())
-            {
-                return token_type::parse_error;
-            }
-
-            // skip following whitespace
-            skip_whitespace();
-        }
-
-        switch (current)
-        {
-            // structural characters
-            case '[':
-                return token_type::begin_array;
-            case ']':
-                return token_type::end_array;
-            case '{':
-                return token_type::begin_object;
-            case '}':
-                return token_type::end_object;
-            case ':':
-                return token_type::name_separator;
-            case ',':
-                return token_type::value_separator;
-
-            // literals
-            case 't':
-            {
-                std::array<char_type, 4> true_literal = {{static_cast<char_type>('t'), static_cast<char_type>('r'), static_cast<char_type>('u'), static_cast<char_type>('e')}};
-                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
-            }
-            case 'f':
-            {
-                std::array<char_type, 5> false_literal = {{static_cast<char_type>('f'), static_cast<char_type>('a'), static_cast<char_type>('l'), static_cast<char_type>('s'), static_cast<char_type>('e')}};
-                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
-            }
-            case 'n':
-            {
-                std::array<char_type, 4> null_literal = {{static_cast<char_type>('n'), static_cast<char_type>('u'), static_cast<char_type>('l'), static_cast<char_type>('l')}};
-                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
-            }
-
-            // string
-            case '\"':
-                return scan_string();
-
-            // number
-            case '-':
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-                return scan_number();
-
-            // end of input (the null byte is needed when parsing from
-            // string literals)
-            case '\0':
-            case std::char_traits<char_type>::eof():
-                return token_type::end_of_input;
-
-            // error
-            default:
-                error_message = "invalid literal";
-                return token_type::parse_error;
-        }
-    }
-
-  private:
-    /// input adapter
-    InputAdapterType ia;
-
-    /// whether comments should be ignored (true) or signaled as errors (false)
-    const bool ignore_comments = false;
-
-    /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
-
-    /// whether the next get() call should just return current
-    bool next_unget = false;
-
-    /// the start position of the current token
-    position_t position {};
-
-    /// raw input token string (for error messages)
-    std::vector<char_type> token_string {};
-
-    /// buffer for variable-length tokens (numbers, strings)
-    string_t token_buffer {};
-
-    /// a description of occurred lexer errors
-    const char* error_message = "";
-
-    // number values
-    number_integer_t value_integer = 0;
-    number_unsigned_t value_unsigned = 0;
-    number_float_t value_float = 0;
-
-    /// the decimal point
-    const char_int_type decimal_point_char = '.';
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/is_sax.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstdint> // size_t
-#include <utility> // declval
-#include <string> // string
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-template<typename T>
-using null_function_t = decltype(std::declval<T&>().null());
-
-template<typename T>
-using boolean_function_t =
-    decltype(std::declval<T&>().boolean(std::declval<bool>()));
-
-template<typename T, typename Integer>
-using number_integer_function_t =
-    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
-
-template<typename T, typename Unsigned>
-using number_unsigned_function_t =
-    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
-
-template<typename T, typename Float, typename String>
-using number_float_function_t = decltype(std::declval<T&>().number_float(
-                                    std::declval<Float>(), std::declval<const String&>()));
-
-template<typename T, typename String>
-using string_function_t =
-    decltype(std::declval<T&>().string(std::declval<String&>()));
-
-template<typename T, typename Binary>
-using binary_function_t =
-    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
-
-template<typename T>
-using start_object_function_t =
-    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
-
-template<typename T, typename String>
-using key_function_t =
-    decltype(std::declval<T&>().key(std::declval<String&>()));
-
-template<typename T>
-using end_object_function_t = decltype(std::declval<T&>().end_object());
-
-template<typename T>
-using start_array_function_t =
-    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
-
-template<typename T>
-using end_array_function_t = decltype(std::declval<T&>().end_array());
-
-template<typename T, typename Exception>
-using parse_error_function_t = decltype(std::declval<T&>().parse_error(
-        std::declval<std::size_t>(), std::declval<const std::string&>(),
-        std::declval<const Exception&>()));
-
-template<typename SAX, typename BasicJsonType>
-struct is_sax
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static constexpr bool value =
-        is_detected_exact<bool, null_function_t, SAX>::value &&
-        is_detected_exact<bool, boolean_function_t, SAX>::value &&
-        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
-        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
-        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
-        is_detected_exact<bool, start_object_function_t, SAX>::value &&
-        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, end_object_function_t, SAX>::value &&
-        is_detected_exact<bool, start_array_function_t, SAX>::value &&
-        is_detected_exact<bool, end_array_function_t, SAX>::value &&
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
-};
-
-template<typename SAX, typename BasicJsonType>
-struct is_sax_static_asserts
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
-                  "Missing/invalid function: bool null()");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(
-        is_detected_exact<bool, number_integer_function_t, SAX,
-        number_integer_t>::value,
-        "Missing/invalid function: bool number_integer(number_integer_t)");
-    static_assert(
-        is_detected_exact<bool, number_unsigned_function_t, SAX,
-        number_unsigned_t>::value,
-        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
-    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
-                  number_float_t, string_t>::value,
-                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
-    static_assert(
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
-        "Missing/invalid function: bool string(string_t&)");
-    static_assert(
-        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
-        "Missing/invalid function: bool binary(binary_t&)");
-    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_object(std::size_t)");
-    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
-                  "Missing/invalid function: bool key(string_t&)");
-    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_object()");
-    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_array(std::size_t)");
-    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_array()");
-    static_assert(
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
-        "Missing/invalid function: bool parse_error(std::size_t, const "
-        "std::string&, const exception&)");
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/string_concat.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-/// how to treat CBOR tags
-enum class cbor_tag_handler_t
-{
-    error,   ///< throw a parse_error exception in case of a tag
-    ignore,  ///< ignore tags
-    store    ///< store tags as binary type
-};
-
-/*!
-@brief determine system byte order
-
-@return true if and only if system's byte order is little endian
-
-@note from https://stackoverflow.com/a/1001328/266378
-*/
-static inline bool little_endianness(int num = 1) noexcept
-{
-    return *reinterpret_cast<char*>(&num) == 1;
-}
-
-
-///////////////////
-// binary reader //
-///////////////////
-
-/*!
-@brief deserialization of CBOR, MessagePack, and UBJSON values
-*/
-template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType>>
-class binary_reader
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using json_sax_t = SAX;
-    using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
-
-  public:
-    /*!
-    @brief create a binary reader
-
-    @param[in] adapter  input adapter to read from
-    */
-    explicit binary_reader(InputAdapterType&& adapter, const input_format_t format = input_format_t::json) noexcept : ia(std::move(adapter)), input_format(format)
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-    }
-
-    // make class move-only
-    binary_reader(const binary_reader&) = delete;
-    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    binary_reader& operator=(const binary_reader&) = delete;
-    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~binary_reader() = default;
-
-    /*!
-    @param[in] format  the binary format to parse
-    @param[in] sax_    a SAX event processor
-    @param[in] strict  whether to expect the input to be consumed completed
-    @param[in] tag_handler  how to treat CBOR tags
-
-    @return whether parsing was successful
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    bool sax_parse(const input_format_t format,
-                   json_sax_t* sax_,
-                   const bool strict = true,
-                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        sax = sax_;
-        bool result = false;
-
-        switch (format)
-        {
-            case input_format_t::bson:
-                result = parse_bson_internal();
-                break;
-
-            case input_format_t::cbor:
-                result = parse_cbor_internal(true, tag_handler);
-                break;
-
-            case input_format_t::msgpack:
-                result = parse_msgpack_internal();
-                break;
-
-            case input_format_t::ubjson:
-            case input_format_t::bjdata:
-                result = parse_ubjson_internal();
-                break;
-
-            case input_format_t::json: // LCOV_EXCL_LINE
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-
-        // strict mode: next byte must be EOF
-        if (result && strict)
-        {
-            if (input_format == input_format_t::ubjson || input_format == input_format_t::bjdata)
-            {
-                get_ignore_noop();
-            }
-            else
-            {
-                get();
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char_type>::eof()))
-            {
-                return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read,
-                                        exception_message(input_format, concat("expected end of input; last byte: 0x", get_token_string()), "value"), nullptr));
-            }
-        }
-
-        return result;
-    }
-
-  private:
-    //////////
-    // BSON //
-    //////////
-
-    /*!
-    @brief Reads in a BSON-object and passes it to the SAX-parser.
-    @return whether a valid BSON-value was passed to the SAX parser
-    */
-    bool parse_bson_internal()
-    {
-        std::int32_t document_size{};
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
-        {
-            return false;
-        }
-
-        return sax->end_object();
-    }
-
-    /*!
-    @brief Parses a C-style string from the BSON input.
-    @param[in,out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @return `true` if the \x00-byte indicating the end of the string was
-             encountered before the EOF; false` indicates an unexpected EOF.
-    */
-    bool get_bson_cstr(string_t& result)
-    {
-        auto out = std::back_inserter(result);
-        while (true)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
-            {
-                return false;
-            }
-            if (current == 0x00)
-            {
-                return true;
-            }
-            *out++ = static_cast<typename string_t::value_type>(current);
-        }
-    }
-
-    /*!
-    @brief Parses a zero-terminated string of length @a len from the BSON
-           input.
-    @param[in] len  The length (including the zero-byte at the end) of the
-                    string to be read.
-    @param[in,out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @tparam NumberType The type of the length @a len
-    @pre len >= 1
-    @return `true` if the string was successfully parsed
-    */
-    template<typename NumberType>
-    bool get_bson_string(const NumberType len, string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(len < 1))
-        {
-            auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
-                                    exception_message(input_format_t::bson, concat("string length must be at least 1, is ", std::to_string(len)), "string"), nullptr));
-        }
-
-        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != std::char_traits<char_type>::eof();
-    }
-
-    /*!
-    @brief Parses a byte array input of length @a len from the BSON input.
-    @param[in] len  The length of the byte array to be read.
-    @param[in,out] result  A reference to the binary variable where the read
-                            array is to be stored.
-    @tparam NumberType The type of the length @a len
-    @pre len >= 0
-    @return `true` if the byte array was successfully parsed
-    */
-    template<typename NumberType>
-    bool get_bson_binary(const NumberType len, binary_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(len < 0))
-        {
-            auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
-                                    exception_message(input_format_t::bson, concat("byte array length cannot be negative, is ", std::to_string(len)), "binary"), nullptr));
-        }
-
-        // All BSON binary values have a subtype
-        std::uint8_t subtype{};
-        get_number<std::uint8_t>(input_format_t::bson, subtype);
-        result.set_subtype(subtype);
-
-        return get_binary(input_format_t::bson, len, result);
-    }
-
-    /*!
-    @brief Read a BSON document element of the given @a element_type.
-    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
-    @param[in] element_type_parse_position The position in the input stream,
-               where the `element_type` was read.
-    @warning Not all BSON element types are supported yet. An unsupported
-             @a element_type will give rise to a parse_error.114:
-             Unsupported BSON record type 0x...
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_internal(const char_int_type element_type,
-                                     const std::size_t element_type_parse_position)
-    {
-        switch (element_type)
-        {
-            case 0x01: // double
-            {
-                double number{};
-                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0x02: // string
-            {
-                std::int32_t len{};
-                string_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
-            }
-
-            case 0x03: // object
-            {
-                return parse_bson_internal();
-            }
-
-            case 0x04: // array
-            {
-                return parse_bson_array();
-            }
-
-            case 0x05: // binary
-            {
-                std::int32_t len{};
-                binary_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
-            }
-
-            case 0x08: // boolean
-            {
-                return sax->boolean(get() != 0);
-            }
-
-            case 0x0A: // null
-            {
-                return sax->null();
-            }
-
-            case 0x10: // int32
-            {
-                std::int32_t value{};
-                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
-            }
-
-            case 0x12: // int64
-            {
-                std::int64_t value{};
-                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
-            }
-
-            default: // anything else not supported (yet)
-            {
-                std::array<char, 3> cr{{}};
-                static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                std::string cr_str{cr.data()};
-                return sax->parse_error(element_type_parse_position, cr_str,
-                                        parse_error::create(114, element_type_parse_position, concat("Unsupported BSON record type 0x", cr_str), nullptr));
-            }
-        }
-    }
-
-    /*!
-    @brief Read a BSON element list (as specified in the BSON-spec)
-
-    The same binary layout is used for objects and arrays, hence it must be
-    indicated with the argument @a is_array which one is expected
-    (true --> array, false --> object).
-
-    @param[in] is_array Determines if the element list being read is to be
-                        treated as an object (@a is_array == false), or as an
-                        array (@a is_array == true).
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_list(const bool is_array)
-    {
-        string_t key;
-
-        while (auto element_type = get())
-        {
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
-            {
-                return false;
-            }
-
-            const std::size_t element_type_parse_position = chars_read;
-            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
-            {
-                return false;
-            }
-
-            if (!is_array && !sax->key(key))
-            {
-                return false;
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
-            {
-                return false;
-            }
-
-            // get_bson_cstr only appends
-            key.clear();
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief Reads an array from the BSON input and passes it to the SAX-parser.
-    @return whether a valid BSON-array was passed to the SAX parser
-    */
-    bool parse_bson_array()
-    {
-        std::int32_t document_size{};
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
-        {
-            return false;
-        }
-
-        return sax->end_array();
-    }
-
-    //////////
-    // CBOR //
-    //////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true) or whether the last read character should
-                         be considered instead (false)
-    @param[in] tag_handler how CBOR tags should be treated
-
-    @return whether a valid CBOR value was passed to the SAX parser
-    */
-    bool parse_cbor_internal(const bool get_char,
-                             const cbor_tag_handler_t tag_handler)
-    {
-        switch (get_char ? get() : current)
-        {
-            // EOF
-            case std::char_traits<char_type>::eof():
-                return unexpect_eof(input_format_t::cbor, "value");
-
-            // Integer 0x00..0x17 (0..23)
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            case 0x18: // Unsigned integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            case 0x19: // Unsigned integer (two-byte uint16_t follows)
-            {
-                std::uint16_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
-            {
-                std::uint32_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
-            {
-                std::uint64_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            // Negative integer -1-0x00..-1-0x17 (-1..-24)
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
-
-            case 0x38: // Negative integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
-            {
-                std::uint16_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
-            {
-                std::uint32_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
-            {
-                std::uint64_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
-                        - static_cast<number_integer_t>(number));
-            }
-
-            // Binary data (0x00..0x17 bytes follow)
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            case 0x58: // Binary data (one-byte uint8_t for n follows)
-            case 0x59: // Binary data (two-byte uint16_t for n follow)
-            case 0x5A: // Binary data (four-byte uint32_t for n follow)
-            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
-            case 0x5F: // Binary data (indefinite length)
-            {
-                binary_t b;
-                return get_cbor_binary(b) && sax->binary(b);
-            }
-
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                string_t s;
-                return get_cbor_string(s) && sax->string(s);
-            }
-
-            // array (0x00..0x17 data items follow)
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-                return get_cbor_array(
-                           conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
-
-            case 0x98: // array (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x99: // array (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x9A: // array (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x9B: // array (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x9F: // array (indefinite length)
-                return get_cbor_array(static_cast<std::size_t>(-1), tag_handler);
-
-            // map (0x00..0x17 pairs of data items follow)
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-                return get_cbor_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
-
-            case 0xB8: // map (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xB9: // map (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xBA: // map (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xBB: // map (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xBF: // map (indefinite length)
-                return get_cbor_object(static_cast<std::size_t>(-1), tag_handler);
-
-            case 0xC6: // tagged item
-            case 0xC7:
-            case 0xC8:
-            case 0xC9:
-            case 0xCA:
-            case 0xCB:
-            case 0xCC:
-            case 0xCD:
-            case 0xCE:
-            case 0xCF:
-            case 0xD0:
-            case 0xD1:
-            case 0xD2:
-            case 0xD3:
-            case 0xD4:
-            case 0xD8: // tagged item (1 bytes follow)
-            case 0xD9: // tagged item (2 bytes follow)
-            case 0xDA: // tagged item (4 bytes follow)
-            case 0xDB: // tagged item (8 bytes follow)
-            {
-                switch (tag_handler)
-                {
-                    case cbor_tag_handler_t::error:
-                    {
-                        auto last_token = get_token_string();
-                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
-                                                exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
-                    }
-
-                    case cbor_tag_handler_t::ignore:
-                    {
-                        // ignore binary subtype
-                        switch (current)
-                        {
-                            case 0xD8:
-                            {
-                                std::uint8_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            case 0xD9:
-                            {
-                                std::uint16_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            case 0xDA:
-                            {
-                                std::uint32_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            case 0xDB:
-                            {
-                                std::uint64_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            default:
-                                break;
-                        }
-                        return parse_cbor_internal(true, tag_handler);
-                    }
-
-                    case cbor_tag_handler_t::store:
-                    {
-                        binary_t b;
-                        // use binary subtype and store in binary container
-                        switch (current)
-                        {
-                            case 0xD8:
-                            {
-                                std::uint8_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            case 0xD9:
-                            {
-                                std::uint16_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            case 0xDA:
-                            {
-                                std::uint32_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            case 0xDB:
-                            {
-                                std::uint64_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            default:
-                                return parse_cbor_internal(true, tag_handler);
-                        }
-                        get();
-                        return get_cbor_binary(b) && sax->binary(b);
-                    }
-
-                    default:                 // LCOV_EXCL_LINE
-                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-                        return false;        // LCOV_EXCL_LINE
-                }
-            }
-
-            case 0xF4: // false
-                return sax->boolean(false);
-
-            case 0xF5: // true
-                return sax->boolean(true);
-
-            case 0xF6: // null
-                return sax->null();
-
-            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
-            {
-                const auto byte1_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-                const auto byte2_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-
-                const auto byte1 = static_cast<unsigned char>(byte1_raw);
-                const auto byte2 = static_cast<unsigned char>(byte2_raw);
-
-                // code from RFC 7049, Appendix D, Figure 3:
-                // As half-precision floating-point numbers were only added
-                // to IEEE 754 in 2008, today's programming platforms often
-                // still only have limited support for them. It is very
-                // easy to include at least decoding support for them even
-                // without such support. An example of a small decoder for
-                // half-precision floating-point numbers in the C language
-                // is shown in Fig. 3.
-                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
-                const double val = [&half]
-                {
-                    const int exp = (half >> 10u) & 0x1Fu;
-                    const unsigned int mant = half & 0x3FFu;
-                    JSON_ASSERT(0 <= exp&& exp <= 32);
-                    JSON_ASSERT(mant <= 1024);
-                    switch (exp)
-                    {
-                        case 0:
-                            return std::ldexp(mant, -24);
-                        case 31:
-                            return (mant == 0)
-                            ? std::numeric_limits<double>::infinity()
-                            : std::numeric_limits<double>::quiet_NaN();
-                        default:
-                            return std::ldexp(mant + 1024, exp - 25);
-                    }
-                }();
-                return sax->number_float((half & 0x8000u) != 0
-                                         ? static_cast<number_float_t>(-val)
-                                         : static_cast<number_float_t>(val), "");
-            }
-
-            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
-            {
-                float number{};
-                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
-            {
-                double number{};
-                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            default: // anything else (0xFF is handled inside the other types)
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
-                                        exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a CBOR string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-    Additionally, CBOR's strings with indefinite lengths are supported.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_cbor_string(string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            {
-                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                while (get() != 0xFF)
-                {
-                    string_t chunk;
-                    if (!get_cbor_string(chunk))
-                    {
-                        return false;
-                    }
-                    result.append(chunk);
-                }
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
-                                        exception_message(input_format_t::cbor, concat("expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x", last_token), "string"), nullptr));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a CBOR byte array
-
-    This function first reads starting bytes to determine the expected
-    byte array length and then copies this number of bytes into the byte array.
-    Additionally, CBOR's byte arrays with indefinite lengths are supported.
-
-    @param[out] result  created byte array
-
-    @return whether byte array creation completed
-    */
-    bool get_cbor_binary(binary_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // Binary data (0x00..0x17 bytes follow)
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            {
-                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0x58: // Binary data (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x59: // Binary data (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x5A: // Binary data (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x5F: // Binary data (indefinite length)
-            {
-                while (get() != 0xFF)
-                {
-                    binary_t chunk;
-                    if (!get_cbor_binary(chunk))
-                    {
-                        return false;
-                    }
-                    result.insert(result.end(), chunk.begin(), chunk.end());
-                }
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
-                                        exception_message(input_format_t::cbor, concat("expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x", last_token), "binary"), nullptr));
-            }
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array or static_cast<std::size_t>(-1) for an
-                    array of indefinite size
-    @param[in] tag_handler how CBOR tags should be treated
-    @return whether array creation completed
-    */
-    bool get_cbor_array(const std::size_t len,
-                        const cbor_tag_handler_t tag_handler)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
-        {
-            return false;
-        }
-
-        if (len != static_cast<std::size_t>(-1))
-        {
-            for (std::size_t i = 0; i < len; ++i)
-            {
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                {
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            while (get() != 0xFF)
-            {
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
-                {
-                    return false;
-                }
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object or static_cast<std::size_t>(-1) for an
-                    object of indefinite size
-    @param[in] tag_handler how CBOR tags should be treated
-    @return whether object creation completed
-    */
-    bool get_cbor_object(const std::size_t len,
-                         const cbor_tag_handler_t tag_handler)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
-        {
-            return false;
-        }
-
-        if (len != 0)
-        {
-            string_t key;
-            if (len != static_cast<std::size_t>(-1))
-            {
-                for (std::size_t i = 0; i < len; ++i)
-                {
-                    get();
-                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-
-                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-            else
-            {
-                while (get() != 0xFF)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-
-                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    /////////////
-    // MsgPack //
-    /////////////
-
-    /*!
-    @return whether a valid MessagePack value was passed to the SAX parser
-    */
-    bool parse_msgpack_internal()
-    {
-        switch (get())
-        {
-            // EOF
-            case std::char_traits<char_type>::eof():
-                return unexpect_eof(input_format_t::msgpack, "value");
-
-            // positive fixint
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-            case 0x18:
-            case 0x19:
-            case 0x1A:
-            case 0x1B:
-            case 0x1C:
-            case 0x1D:
-            case 0x1E:
-            case 0x1F:
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-            case 0x38:
-            case 0x39:
-            case 0x3A:
-            case 0x3B:
-            case 0x3C:
-            case 0x3D:
-            case 0x3E:
-            case 0x3F:
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            case 0x58:
-            case 0x59:
-            case 0x5A:
-            case 0x5B:
-            case 0x5C:
-            case 0x5D:
-            case 0x5E:
-            case 0x5F:
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78:
-            case 0x79:
-            case 0x7A:
-            case 0x7B:
-            case 0x7C:
-            case 0x7D:
-            case 0x7E:
-            case 0x7F:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            // fixmap
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-                return get_msgpack_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixarray
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-            case 0x98:
-            case 0x99:
-            case 0x9A:
-            case 0x9B:
-            case 0x9C:
-            case 0x9D:
-            case 0x9E:
-            case 0x9F:
-                return get_msgpack_array(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            case 0xD9: // str 8
-            case 0xDA: // str 16
-            case 0xDB: // str 32
-            {
-                string_t s;
-                return get_msgpack_string(s) && sax->string(s);
-            }
-
-            case 0xC0: // nil
-                return sax->null();
-
-            case 0xC2: // false
-                return sax->boolean(false);
-
-            case 0xC3: // true
-                return sax->boolean(true);
-
-            case 0xC4: // bin 8
-            case 0xC5: // bin 16
-            case 0xC6: // bin 32
-            case 0xC7: // ext 8
-            case 0xC8: // ext 16
-            case 0xC9: // ext 32
-            case 0xD4: // fixext 1
-            case 0xD5: // fixext 2
-            case 0xD6: // fixext 4
-            case 0xD7: // fixext 8
-            case 0xD8: // fixext 16
-            {
-                binary_t b;
-                return get_msgpack_binary(b) && sax->binary(b);
-            }
-
-            case 0xCA: // float 32
-            {
-                float number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCB: // float 64
-            {
-                double number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCC: // uint 8
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xCD: // uint 16
-            {
-                std::uint16_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xCE: // uint 32
-            {
-                std::uint32_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xCF: // uint 64
-            {
-                std::uint64_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xD0: // int 8
-            {
-                std::int8_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xD1: // int 16
-            {
-                std::int16_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xD2: // int 32
-            {
-                std::int32_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xD3: // int 64
-            {
-                std::int64_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xDC: // array 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
-            }
-
-            case 0xDD: // array 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_array(conditional_static_cast<std::size_t>(len));
-            }
-
-            case 0xDE: // map 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xDF: // map 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_object(conditional_static_cast<std::size_t>(len));
-            }
-
-            // negative fixint
-            case 0xE0:
-            case 0xE1:
-            case 0xE2:
-            case 0xE3:
-            case 0xE4:
-            case 0xE5:
-            case 0xE6:
-            case 0xE7:
-            case 0xE8:
-            case 0xE9:
-            case 0xEA:
-            case 0xEB:
-            case 0xEC:
-            case 0xED:
-            case 0xEE:
-            case 0xEF:
-            case 0xF0:
-            case 0xF1:
-            case 0xF2:
-            case 0xF3:
-            case 0xF4:
-            case 0xF5:
-            case 0xF6:
-            case 0xF7:
-            case 0xF8:
-            case 0xF9:
-            case 0xFA:
-            case 0xFB:
-            case 0xFC:
-            case 0xFD:
-            case 0xFE:
-            case 0xFF:
-                return sax->number_integer(static_cast<std::int8_t>(current));
-
-            default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
-                                        exception_message(input_format_t::msgpack, concat("invalid byte: 0x", last_token), "value"), nullptr));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a MessagePack string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_msgpack_string(string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            {
-                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0xD9: // str 8
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDA: // str 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDB: // str 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
-                                        exception_message(input_format_t::msgpack, concat("expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x", last_token), "string"), nullptr));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a MessagePack byte array
-
-    This function first reads starting bytes to determine the expected
-    byte array length and then copies this number of bytes into a byte array.
-
-    @param[out] result  created byte array
-
-    @return whether byte array creation completed
-    */
-    bool get_msgpack_binary(binary_t& result)
-    {
-        // helper function to set the subtype
-        auto assign_and_return_true = [&result](std::int8_t subtype)
-        {
-            result.set_subtype(static_cast<std::uint8_t>(subtype));
-            return true;
-        };
-
-        switch (current)
-        {
-            case 0xC4: // bin 8
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_binary(input_format_t::msgpack, len, result);
-            }
-
-            case 0xC5: // bin 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_binary(input_format_t::msgpack, len, result);
-            }
-
-            case 0xC6: // bin 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_binary(input_format_t::msgpack, len, result);
-            }
-
-            case 0xC7: // ext 8
-            {
-                std::uint8_t len{};
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, len, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xC8: // ext 16
-            {
-                std::uint16_t len{};
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, len, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xC9: // ext 32
-            {
-                std::uint32_t len{};
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, len, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD4: // fixext 1
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 1, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD5: // fixext 2
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 2, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD6: // fixext 4
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 4, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD7: // fixext 8
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 8, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD8: // fixext 16
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 16, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            default:           // LCOV_EXCL_LINE
-                return false;  // LCOV_EXCL_LINE
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array
-    @return whether array creation completed
-    */
-    bool get_msgpack_array(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
-        {
-            return false;
-        }
-
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
-            {
-                return false;
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object
-    @return whether object creation completed
-    */
-    bool get_msgpack_object(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
-        {
-            return false;
-        }
-
-        string_t key;
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
-            {
-                return false;
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
-            {
-                return false;
-            }
-            key.clear();
-        }
-
-        return sax->end_object();
-    }
-
-    ////////////
-    // UBJSON //
-    ////////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether a valid UBJSON value was passed to the SAX parser
-    */
-    bool parse_ubjson_internal(const bool get_char = true)
-    {
-        return get_ubjson_value(get_char ? get_ignore_noop() : current);
-    }
-
-    /*!
-    @brief reads a UBJSON string
-
-    This function is either called after reading the 'S' byte explicitly
-    indicating a string, or in case of an object key where the 'S' byte can be
-    left out.
-
-    @param[out] result   created string
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether string creation completed
-    */
-    bool get_ubjson_string(string_t& result, const bool get_char = true)
-    {
-        if (get_char)
-        {
-            get();  // TODO(niels): may we ignore N here?
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            case 'U':
-            {
-                std::uint8_t len{};
-                return get_number(input_format, len) && get_string(input_format, len, result);
-            }
-
-            case 'i':
-            {
-                std::int8_t len{};
-                return get_number(input_format, len) && get_string(input_format, len, result);
-            }
-
-            case 'I':
-            {
-                std::int16_t len{};
-                return get_number(input_format, len) && get_string(input_format, len, result);
-            }
-
-            case 'l':
-            {
-                std::int32_t len{};
-                return get_number(input_format, len) && get_string(input_format, len, result);
-            }
-
-            case 'L':
-            {
-                std::int64_t len{};
-                return get_number(input_format, len) && get_string(input_format, len, result);
-            }
-
-            case 'u':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                std::uint16_t len{};
-                return get_number(input_format, len) && get_string(input_format, len, result);
-            }
-
-            case 'm':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                std::uint32_t len{};
-                return get_number(input_format, len) && get_string(input_format, len, result);
-            }
-
-            case 'M':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                std::uint64_t len{};
-                return get_number(input_format, len) && get_string(input_format, len, result);
-            }
-
-            default:
-                break;
-        }
-        auto last_token = get_token_string();
-        std::string message;
-
-        if (input_format != input_format_t::bjdata)
-        {
-            message = "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token;
-        }
-        else
-        {
-            message = "expected length type specification (U, i, u, I, m, l, M, L); last byte: 0x" + last_token;
-        }
-        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "string"), nullptr));
-    }
-
-    /*!
-    @param[out] dim  an integer vector storing the ND array dimensions
-    @return whether reading ND array size vector is successful
-    */
-    bool get_ubjson_ndarray_size(std::vector<size_t>& dim)
-    {
-        std::pair<std::size_t, char_int_type> size_and_type;
-        size_t dimlen = 0;
-        bool no_ndarray = true;
-
-        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type, no_ndarray)))
-        {
-            return false;
-        }
-
-        if (size_and_type.first != npos)
-        {
-            if (size_and_type.second != 0)
-            {
-                if (size_and_type.second != 'N')
-                {
-                    for (std::size_t i = 0; i < size_and_type.first; ++i)
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, size_and_type.second)))
-                        {
-                            return false;
-                        }
-                        dim.push_back(dimlen);
-                    }
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray)))
-                    {
-                        return false;
-                    }
-                    dim.push_back(dimlen);
-                }
-            }
-        }
-        else
-        {
-            while (current != ']')
-            {
-                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, current)))
-                {
-                    return false;
-                }
-                dim.push_back(dimlen);
-                get_ignore_noop();
-            }
-        }
-        return true;
-    }
-
-    /*!
-    @param[out] result  determined size
-    @param[in,out] is_ndarray  for input, `true` means already inside an ndarray vector
-                               or ndarray dimension is not allowed; `false` means ndarray
-                               is allowed; for output, `true` means an ndarray is found;
-                               is_ndarray can only return `true` when its initial value
-                               is `false`
-    @param[in] prefix  type marker if already read, otherwise set to 0
-
-    @return whether size determination completed
-    */
-    bool get_ubjson_size_value(std::size_t& result, bool& is_ndarray, char_int_type prefix = 0)
-    {
-        if (prefix == 0)
-        {
-            prefix = get_ignore_noop();
-        }
-
-        switch (prefix)
-        {
-            case 'U':
-            {
-                std::uint8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'i':
-            {
-                std::int8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
-                {
-                    return false;
-                }
-                if (number < 0)
-                {
-                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
-                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
-                }
-                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
-                return true;
-            }
-
-            case 'I':
-            {
-                std::int16_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
-                {
-                    return false;
-                }
-                if (number < 0)
-                {
-                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
-                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'l':
-            {
-                std::int32_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
-                {
-                    return false;
-                }
-                if (number < 0)
-                {
-                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
-                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'L':
-            {
-                std::int64_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
-                {
-                    return false;
-                }
-                if (number < 0)
-                {
-                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
-                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
-                }
-                if (!value_in_range_of<std::size_t>(number))
-                {
-                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
-                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'u':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                std::uint16_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'm':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                std::uint32_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
-                {
-                    return false;
-                }
-                result = conditional_static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'M':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                std::uint64_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
-                {
-                    return false;
-                }
-                if (!value_in_range_of<std::size_t>(number))
-                {
-                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
-                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
-                }
-                result = detail::conditional_static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case '[':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                if (is_ndarray) // ndarray dimensional vector can only contain integers, and can not embed another array
-                {
-                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read, exception_message(input_format, "ndarray dimentional vector is not allowed", "size"), nullptr));
-                }
-                std::vector<size_t> dim;
-                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_ndarray_size(dim)))
-                {
-                    return false;
-                }
-                if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1)) // return normal array size if 1D row vector
-                {
-                    result = dim.at(dim.size() - 1);
-                    return true;
-                }
-                if (!dim.empty())  // if ndarray, convert to an object in JData annotated array format
-                {
-                    for (auto i : dim) // test if any dimension in an ndarray is 0, if so, return a 1D empty container
-                    {
-                        if ( i == 0 )
-                        {
-                            result = 0;
-                            return true;
-                        }
-                    }
-
-                    string_t key = "_ArraySize_";
-                    if (JSON_HEDLEY_UNLIKELY(!sax->start_object(3) || !sax->key(key) || !sax->start_array(dim.size())))
-                    {
-                        return false;
-                    }
-                    result = 1;
-                    for (auto i : dim)
-                    {
-                        result *= i;
-                        if (result == 0 || result == npos) // because dim elements shall not have zeros, result = 0 means overflow happened; it also can't be npos as it is used to initialize size in get_ubjson_size_type()
-                        {
-                            return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408, exception_message(input_format, "excessive ndarray size caused overflow", "size"), nullptr));
-                        }
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(static_cast<number_unsigned_t>(i))))
-                        {
-                            return false;
-                        }
-                    }
-                    is_ndarray = true;
-                    return sax->end_array();
-                }
-                result = 0;
-                return true;
-            }
-
-            default:
-                break;
-        }
-        auto last_token = get_token_string();
-        std::string message;
-
-        if (input_format != input_format_t::bjdata)
-        {
-            message = "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token;
-        }
-        else
-        {
-            message = "expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x" + last_token;
-        }
-        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "size"), nullptr));
-    }
-
-    /*!
-    @brief determine the type and size for a container
-
-    In the optimized UBJSON format, a type and a size can be provided to allow
-    for a more compact representation.
-
-    @param[out] result  pair of the size and the type
-    @param[in] inside_ndarray  whether the parser is parsing an ND array dimensional vector
-
-    @return whether pair creation completed
-    */
-    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result, bool inside_ndarray = false)
-    {
-        result.first = npos; // size
-        result.second = 0; // type
-        bool is_ndarray = false;
-
-        get_ignore_noop();
-
-        if (current == '$')
-        {
-            result.second = get();  // must not ignore 'N', because 'N' maybe the type
-            if (input_format == input_format_t::bjdata
-                    && JSON_HEDLEY_UNLIKELY(std::binary_search(bjd_optimized_type_markers.begin(), bjd_optimized_type_markers.end(), result.second)))
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
-                                        exception_message(input_format, concat("marker 0x", last_token, " is not a permitted optimized array type"), "type"), nullptr));
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "type")))
-            {
-                return false;
-            }
-
-            get_ignore_noop();
-            if (JSON_HEDLEY_UNLIKELY(current != '#'))
-            {
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
-                {
-                    return false;
-                }
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
-                                        exception_message(input_format, concat("expected '#' after type information; last byte: 0x", last_token), "size"), nullptr));
-            }
-
-            bool is_error = get_ubjson_size_value(result.first, is_ndarray);
-            if (input_format == input_format_t::bjdata && is_ndarray)
-            {
-                if (inside_ndarray)
-                {
-                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
-                                            exception_message(input_format, "ndarray can not be recursive", "size"), nullptr));
-                }
-                result.second |= (1 << 8); // use bit 8 to indicate ndarray, all UBJSON and BJData markers should be ASCII letters
-            }
-            return is_error;
-        }
-
-        if (current == '#')
-        {
-            bool is_error = get_ubjson_size_value(result.first, is_ndarray);
-            if (input_format == input_format_t::bjdata && is_ndarray)
-            {
-                return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
-                                        exception_message(input_format, "ndarray requires both type and size", "size"), nullptr));
-            }
-            return is_error;
-        }
-
-        return true;
-    }
-
-    /*!
-    @param prefix  the previously read or set type prefix
-    @return whether value creation completed
-    */
-    bool get_ubjson_value(const char_int_type prefix)
-    {
-        switch (prefix)
-        {
-            case std::char_traits<char_type>::eof():  // EOF
-                return unexpect_eof(input_format, "value");
-
-            case 'T':  // true
-                return sax->boolean(true);
-            case 'F':  // false
-                return sax->boolean(false);
-
-            case 'Z':  // null
-                return sax->null();
-
-            case 'U':
-            {
-                std::uint8_t number{};
-                return get_number(input_format, number) && sax->number_unsigned(number);
-            }
-
-            case 'i':
-            {
-                std::int8_t number{};
-                return get_number(input_format, number) && sax->number_integer(number);
-            }
-
-            case 'I':
-            {
-                std::int16_t number{};
-                return get_number(input_format, number) && sax->number_integer(number);
-            }
-
-            case 'l':
-            {
-                std::int32_t number{};
-                return get_number(input_format, number) && sax->number_integer(number);
-            }
-
-            case 'L':
-            {
-                std::int64_t number{};
-                return get_number(input_format, number) && sax->number_integer(number);
-            }
-
-            case 'u':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                std::uint16_t number{};
-                return get_number(input_format, number) && sax->number_unsigned(number);
-            }
-
-            case 'm':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                std::uint32_t number{};
-                return get_number(input_format, number) && sax->number_unsigned(number);
-            }
-
-            case 'M':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                std::uint64_t number{};
-                return get_number(input_format, number) && sax->number_unsigned(number);
-            }
-
-            case 'h':
-            {
-                if (input_format != input_format_t::bjdata)
-                {
-                    break;
-                }
-                const auto byte1_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
-                {
-                    return false;
-                }
-                const auto byte2_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
-                {
-                    return false;
-                }
-
-                const auto byte1 = static_cast<unsigned char>(byte1_raw);
-                const auto byte2 = static_cast<unsigned char>(byte2_raw);
-
-                // code from RFC 7049, Appendix D, Figure 3:
-                // As half-precision floating-point numbers were only added
-                // to IEEE 754 in 2008, today's programming platforms often
-                // still only have limited support for them. It is very
-                // easy to include at least decoding support for them even
-                // without such support. An example of a small decoder for
-                // half-precision floating-point numbers in the C language
-                // is shown in Fig. 3.
-                const auto half = static_cast<unsigned int>((byte2 << 8u) + byte1);
-                const double val = [&half]
-                {
-                    const int exp = (half >> 10u) & 0x1Fu;
-                    const unsigned int mant = half & 0x3FFu;
-                    JSON_ASSERT(0 <= exp&& exp <= 32);
-                    JSON_ASSERT(mant <= 1024);
-                    switch (exp)
-                    {
-                        case 0:
-                            return std::ldexp(mant, -24);
-                        case 31:
-                            return (mant == 0)
-                            ? std::numeric_limits<double>::infinity()
-                            : std::numeric_limits<double>::quiet_NaN();
-                        default:
-                            return std::ldexp(mant + 1024, exp - 25);
-                    }
-                }();
-                return sax->number_float((half & 0x8000u) != 0
-                                         ? static_cast<number_float_t>(-val)
-                                         : static_cast<number_float_t>(val), "");
-            }
-
-            case 'd':
-            {
-                float number{};
-                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'D':
-            {
-                double number{};
-                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'H':
-            {
-                return get_ubjson_high_precision_number();
-            }
-
-            case 'C':  // char
-            {
-                get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "char")))
-                {
-                    return false;
-                }
-                if (JSON_HEDLEY_UNLIKELY(current > 127))
-                {
-                    auto last_token = get_token_string();
-                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
-                                            exception_message(input_format, concat("byte after 'C' must be in range 0x00..0x7F; last byte: 0x", last_token), "char"), nullptr));
-                }
-                string_t s(1, static_cast<typename string_t::value_type>(current));
-                return sax->string(s);
-            }
-
-            case 'S':  // string
-            {
-                string_t s;
-                return get_ubjson_string(s) && sax->string(s);
-            }
-
-            case '[':  // array
-                return get_ubjson_array();
-
-            case '{':  // object
-                return get_ubjson_object();
-
-            default: // anything else
-                break;
-        }
-        auto last_token = get_token_string();
-        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format, "invalid byte: 0x" + last_token, "value"), nullptr));
-    }
-
-    /*!
-    @return whether array creation completed
-    */
-    bool get_ubjson_array()
-    {
-        std::pair<std::size_t, char_int_type> size_and_type;
-        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        // if bit-8 of size_and_type.second is set to 1, encode bjdata ndarray as an object in JData annotated array format (https://github.com/NeuroJSON/jdata):
-        // {"_ArrayType_" : "typeid", "_ArraySize_" : [n1, n2, ...], "_ArrayData_" : [v1, v2, ...]}
-
-        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
-        {
-            size_and_type.second &= ~(static_cast<char_int_type>(1) << 8);  // use bit 8 to indicate ndarray, here we remove the bit to restore the type marker
-            auto it = std::lower_bound(bjd_types_map.begin(), bjd_types_map.end(), size_and_type.second, [](const bjd_type & p, char_int_type t)
-            {
-                return p.first < t;
-            });
-            string_t key = "_ArrayType_";
-            if (JSON_HEDLEY_UNLIKELY(it == bjd_types_map.end() || it->first != size_and_type.second))
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
-                                        exception_message(input_format, "invalid byte: 0x" + last_token, "type"), nullptr));
-            }
-
-            string_t type = it->second; // sax->string() takes a reference
-            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->string(type)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second == 'C')
-            {
-                size_and_type.second = 'U';
-            }
-
-            key = "_ArrayData_";
-            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->start_array(size_and_type.first) ))
-            {
-                return false;
-            }
-
-            for (std::size_t i = 0; i < size_and_type.first; ++i)
-            {
-                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
-                {
-                    return false;
-                }
-            }
-
-            return (sax->end_array() && sax->end_object());
-        }
-
-        if (size_and_type.first != npos)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                if (size_and_type.second != 'N')
-                {
-                    for (std::size_t i = 0; i < size_and_type.first; ++i)
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
-            {
-                return false;
-            }
-
-            while (current != ']')
-            {
-                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @return whether object creation completed
-    */
-    bool get_ubjson_object()
-    {
-        std::pair<std::size_t, char_int_type> size_and_type;
-        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        // do not accept ND-array size in objects in BJData
-        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
-        {
-            auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
-                                    exception_message(input_format, "BJData object does not support ND-array size in optimized format", "object"), nullptr));
-        }
-
-        string_t key;
-        if (size_and_type.first != npos)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-        }
-        else
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
-            {
-                return false;
-            }
-
-            while (current != '}')
-            {
-                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
-                {
-                    return false;
-                }
-                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-                key.clear();
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    // Note, no reader for UBJSON binary types is implemented because they do
-    // not exist
-
-    bool get_ubjson_high_precision_number()
-    {
-        // get size of following number string
-        std::size_t size{};
-        bool no_ndarray = true;
-        auto res = get_ubjson_size_value(size, no_ndarray);
-        if (JSON_HEDLEY_UNLIKELY(!res))
-        {
-            return res;
-        }
-
-        // get number string
-        std::vector<char> number_vector;
-        for (std::size_t i = 0; i < size; ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
-            {
-                return false;
-            }
-            number_vector.push_back(static_cast<char>(current));
-        }
-
-        // parse number string
-        using ia_type = decltype(detail::input_adapter(number_vector));
-        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
-        const auto result_number = number_lexer.scan();
-        const auto number_string = number_lexer.get_token_string();
-        const auto result_remainder = number_lexer.scan();
-
-        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
-
-        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
-        {
-            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
-                                    exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
-        }
-
-        switch (result_number)
-        {
-            case token_type::value_integer:
-                return sax->number_integer(number_lexer.get_number_integer());
-            case token_type::value_unsigned:
-                return sax->number_unsigned(number_lexer.get_number_unsigned());
-            case token_type::value_float:
-                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
-            case token_type::uninitialized:
-            case token_type::literal_true:
-            case token_type::literal_false:
-            case token_type::literal_null:
-            case token_type::value_string:
-            case token_type::begin_array:
-            case token_type::begin_object:
-            case token_type::end_array:
-            case token_type::end_object:
-            case token_type::name_separator:
-            case token_type::value_separator:
-            case token_type::parse_error:
-            case token_type::end_of_input:
-            case token_type::literal_or_value:
-            default:
-                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
-                                        exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
-        }
-    }
-
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-
-    /*!
-    @brief get next character from the input
-
-    This function provides the interface to the used input adapter. It does
-    not throw in case the input reached EOF, but returns a -'ve valued
-    `std::char_traits<char_type>::eof()` in that case.
-
-    @return character read from the input
-    */
-    char_int_type get()
-    {
-        ++chars_read;
-        return current = ia.get_character();
-    }
-
-    /*!
-    @return character read from the input after ignoring all 'N' entries
-    */
-    char_int_type get_ignore_noop()
-    {
-        do
-        {
-            get();
-        }
-        while (current == 'N');
-
-        return current;
-    }
-
-    /*
-    @brief read a number from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format   the current format (for diagnostics)
-    @param[out] result  number of type @a NumberType
-
-    @return whether conversion completed
-
-    @note This function needs to respect the system's endianness, because
-          bytes in CBOR, MessagePack, and UBJSON are stored in network order
-          (big endian) and therefore need reordering on little endian systems.
-          On the other hand, BSON and BJData use little endian and should reorder
-          on big endian systems.
-    */
-    template<typename NumberType, bool InputIsLittleEndian = false>
-    bool get_number(const input_format_t format, NumberType& result)
-    {
-        // step 1: read input into array with system's byte order
-        std::array<std::uint8_t, sizeof(NumberType)> vec{};
-        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number")))
-            {
-                return false;
-            }
-
-            // reverse byte order prior to conversion if necessary
-            if (is_little_endian != (InputIsLittleEndian || format == input_format_t::bjdata))
-            {
-                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
-            }
-            else
-            {
-                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
-            }
-        }
-
-        // step 2: convert array into number of type T and return
-        std::memcpy(&result, vec.data(), sizeof(NumberType));
-        return true;
-    }
-
-    /*!
-    @brief create a string by reading characters from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format the current format (for diagnostics)
-    @param[in] len number of characters to read
-    @param[out] result string created by reading @a len bytes
-
-    @return whether string creation completed
-
-    @note We can not reserve @a len bytes for the result, because @a len
-          may be too large. Usually, @ref unexpect_eof() detects the end of
-          the input before we run out of string memory.
-    */
-    template<typename NumberType>
-    bool get_string(const input_format_t format,
-                    const NumberType len,
-                    string_t& result)
-    {
-        bool success = true;
-        for (NumberType i = 0; i < len; i++)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
-            {
-                success = false;
-                break;
-            }
-            result.push_back(static_cast<typename string_t::value_type>(current));
-        }
-        return success;
-    }
-
-    /*!
-    @brief create a byte array by reading bytes from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format the current format (for diagnostics)
-    @param[in] len number of bytes to read
-    @param[out] result byte array created by reading @a len bytes
-
-    @return whether byte array creation completed
-
-    @note We can not reserve @a len bytes for the result, because @a len
-          may be too large. Usually, @ref unexpect_eof() detects the end of
-          the input before we run out of memory.
-    */
-    template<typename NumberType>
-    bool get_binary(const input_format_t format,
-                    const NumberType len,
-                    binary_t& result)
-    {
-        bool success = true;
-        for (NumberType i = 0; i < len; i++)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
-            {
-                success = false;
-                break;
-            }
-            result.push_back(static_cast<std::uint8_t>(current));
-        }
-        return success;
-    }
-
-    /*!
-    @param[in] format   the current format (for diagnostics)
-    @param[in] context  further context information (for diagnostics)
-    @return whether the last read character is not EOF
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    bool unexpect_eof(const input_format_t format, const char* context) const
-    {
-        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char_type>::eof()))
-        {
-            return sax->parse_error(chars_read, "<end of file>",
-                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), nullptr));
-        }
-        return true;
-    }
-
-    /*!
-    @return a string representation of the last read byte
-    */
-    std::string get_token_string() const
-    {
-        std::array<char, 3> cr{{}};
-        static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-        return std::string{cr.data()};
-    }
-
-    /*!
-    @param[in] format   the current format
-    @param[in] detail   a detailed error message
-    @param[in] context  further context information
-    @return a message string to use in the parse_error exceptions
-    */
-    std::string exception_message(const input_format_t format,
-                                  const std::string& detail,
-                                  const std::string& context) const
-    {
-        std::string error_msg = "syntax error while parsing ";
-
-        switch (format)
-        {
-            case input_format_t::cbor:
-                error_msg += "CBOR";
-                break;
-
-            case input_format_t::msgpack:
-                error_msg += "MessagePack";
-                break;
-
-            case input_format_t::ubjson:
-                error_msg += "UBJSON";
-                break;
-
-            case input_format_t::bson:
-                error_msg += "BSON";
-                break;
-
-            case input_format_t::bjdata:
-                error_msg += "BJData";
-                break;
-
-            case input_format_t::json: // LCOV_EXCL_LINE
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-
-        return concat(error_msg, ' ', context, ": ", detail);
-    }
-
-  private:
-    static JSON_INLINE_VARIABLE constexpr std::size_t npos = static_cast<std::size_t>(-1);
-
-    /// input adapter
-    InputAdapterType ia;
-
-    /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
-
-    /// the number of characters read
-    std::size_t chars_read = 0;
-
-    /// whether we can assume little endianness
-    const bool is_little_endian = little_endianness();
-
-    /// input format
-    const input_format_t input_format = input_format_t::json;
-
-    /// the SAX parser
-    json_sax_t* sax = nullptr;
-
-    // excluded markers in bjdata optimized type
-#define JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_ \
-    make_array<char_int_type>('F', 'H', 'N', 'S', 'T', 'Z', '[', '{')
-
-#define JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_ \
-    make_array<bjd_type>(                      \
-    bjd_type{'C', "char"},                     \
-    bjd_type{'D', "double"},                   \
-    bjd_type{'I', "int16"},                    \
-    bjd_type{'L', "int64"},                    \
-    bjd_type{'M', "uint64"},                   \
-    bjd_type{'U', "uint8"},                    \
-    bjd_type{'d', "single"},                   \
-    bjd_type{'i', "int8"},                     \
-    bjd_type{'l', "int32"},                    \
-    bjd_type{'m', "uint32"},                   \
-    bjd_type{'u', "uint16"})
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    // lookup tables
-    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
-    const decltype(JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_) bjd_optimized_type_markers =
-        JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_;
-
-    using bjd_type = std::pair<char_int_type, string_t>;
-    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
-    const decltype(JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_) bjd_types_map =
-        JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_;
-
-#undef JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_
-#undef JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_
-};
-
-#ifndef JSON_HAS_CPP_17
-    template<typename BasicJsonType, typename InputAdapterType, typename SAX>
-    constexpr std::size_t binary_reader<BasicJsonType, InputAdapterType, SAX>::npos;
-#endif
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-// #include <nlohmann/detail/input/parser.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cmath> // isfinite
-#include <cstdint> // uint8_t
-#include <functional> // function
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/json_sax.hpp>
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
-// #include <nlohmann/detail/string_concat.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-////////////
-// parser //
-////////////
-
-enum class parse_event_t : std::uint8_t
-{
-    /// the parser read `{` and started to process a JSON object
-    object_start,
-    /// the parser read `}` and finished processing a JSON object
-    object_end,
-    /// the parser read `[` and started to process a JSON array
-    array_start,
-    /// the parser read `]` and finished processing a JSON array
-    array_end,
-    /// the parser read a key of a value in an object
-    key,
-    /// the parser finished reading a JSON value
-    value
-};
-
-template<typename BasicJsonType>
-using parser_callback_t =
-    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
-
-/*!
-@brief syntax analysis
-
-This class implements a recursive descent parser.
-*/
-template<typename BasicJsonType, typename InputAdapterType>
-class parser
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
-    using token_type = typename lexer_t::token_type;
-
-  public:
-    /// a parser reading from an input adapter
-    explicit parser(InputAdapterType&& adapter,
-                    const parser_callback_t<BasicJsonType> cb = nullptr,
-                    const bool allow_exceptions_ = true,
-                    const bool skip_comments = false)
-        : callback(cb)
-        , m_lexer(std::move(adapter), skip_comments)
-        , allow_exceptions(allow_exceptions_)
-    {
-        // read first token
-        get_token();
-    }
-
-    /*!
-    @brief public parser interface
-
-    @param[in] strict      whether to expect the last token to be EOF
-    @param[in,out] result  parsed JSON value
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-    */
-    void parse(const bool strict, BasicJsonType& result)
-    {
-        if (callback)
-        {
-            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
-            sax_parse_internal(&sdp);
-
-            // in strict mode, input must be completely read
-            if (strict && (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(),
-                                                    exception_message(token_type::end_of_input, "value"), nullptr));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-
-            // set top-level value to null if it was discarded by the callback
-            // function
-            if (result.is_discarded())
-            {
-                result = nullptr;
-            }
-        }
-        else
-        {
-            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
-            sax_parse_internal(&sdp);
-
-            // in strict mode, input must be completely read
-            if (strict && (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-        }
-
-        result.assert_invariant();
-    }
-
-    /*!
-    @brief public accept interface
-
-    @param[in] strict  whether to expect the last token to be EOF
-    @return whether the input is a proper JSON text
-    */
-    bool accept(const bool strict = true)
-    {
-        json_sax_acceptor<BasicJsonType> sax_acceptor;
-        return sax_parse(&sax_acceptor, strict);
-    }
-
-    template<typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    bool sax_parse(SAX* sax, const bool strict = true)
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-        const bool result = sax_parse_internal(sax);
-
-        // strict mode: next byte must be EOF
-        if (result && strict && (get_token() != token_type::end_of_input))
-        {
-            return sax->parse_error(m_lexer.get_position(),
-                                    m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
-        }
-
-        return result;
-    }
-
-  private:
-    template<typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    bool sax_parse_internal(SAX* sax)
-    {
-        // stack to remember the hierarchy of structured values we are parsing
-        // true = array; false = object
-        std::vector<bool> states;
-        // value to avoid a goto (see comment where set to true)
-        bool skip_to_state_evaluation = false;
-
-        while (true)
-        {
-            if (!skip_to_state_evaluation)
-            {
-                // invariant: get_token() was called before each iteration
-                switch (last_token)
-                {
-                    case token_type::begin_object:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing } -> we are done
-                        if (get_token() == token_type::end_object)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // parse key
-                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
-                        }
-                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-
-                        // parse separator (:)
-                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
-                        }
-
-                        // remember we are now inside an object
-                        states.push_back(false);
-
-                        // parse values
-                        get_token();
-                        continue;
-                    }
-
-                    case token_type::begin_array:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing ] -> we are done
-                        if (get_token() == token_type::end_array)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // remember we are now inside an array
-                        states.push_back(true);
-
-                        // parse values (no need to call get_token)
-                        continue;
-                    }
-
-                    case token_type::value_float:
-                    {
-                        const auto res = m_lexer.get_number_float();
-
-                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    out_of_range::create(406, concat("number overflow parsing '", m_lexer.get_token_string(), '\''), nullptr));
-                        }
-
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-
-                        break;
-                    }
-
-                    case token_type::literal_false:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::literal_null:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::literal_true:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_integer:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_string:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_unsigned:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::parse_error:
-                    {
-                        // using "uninitialized" to avoid "expected" message
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), nullptr));
-                    }
-
-                    case token_type::uninitialized:
-                    case token_type::end_array:
-                    case token_type::end_object:
-                    case token_type::name_separator:
-                    case token_type::value_separator:
-                    case token_type::end_of_input:
-                    case token_type::literal_or_value:
-                    default: // the last token was unexpected
-                    {
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
-                    }
-                }
-            }
-            else
-            {
-                skip_to_state_evaluation = false;
-            }
-
-            // we reached this line after we successfully parsed a value
-            if (states.empty())
-            {
-                // empty stack: we reached the end of the hierarchy: done
-                return true;
-            }
-
-            if (states.back())  // array
-            {
-                // comma -> next value
-                if (get_token() == token_type::value_separator)
-                {
-                    // parse a new value
-                    get_token();
-                    continue;
-                }
-
-                // closing ]
-                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
-                    {
-                        return false;
-                    }
-
-                    // We are done with this array. Before we can parse a
-                    // new value, we need to evaluate the new state first.
-                    // By setting skip_to_state_evaluation to false, we
-                    // are effectively jumping to the beginning of this if.
-                    JSON_ASSERT(!states.empty());
-                    states.pop_back();
-                    skip_to_state_evaluation = true;
-                    continue;
-                }
-
-                return sax->parse_error(m_lexer.get_position(),
-                                        m_lexer.get_token_string(),
-                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), nullptr));
-            }
-
-            // states.back() is false -> object
-
-            // comma -> next value
-            if (get_token() == token_type::value_separator)
-            {
-                // parse key
-                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
-                {
-                    return sax->parse_error(m_lexer.get_position(),
-                                            m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
-                }
-
-                if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
-                {
-                    return false;
-                }
-
-                // parse separator (:)
-                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
-                {
-                    return sax->parse_error(m_lexer.get_position(),
-                                            m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
-                }
-
-                // parse values
-                get_token();
-                continue;
-            }
-
-            // closing }
-            if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
-            {
-                if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
-                {
-                    return false;
-                }
-
-                // We are done with this object. Before we can parse a
-                // new value, we need to evaluate the new state first.
-                // By setting skip_to_state_evaluation to false, we
-                // are effectively jumping to the beginning of this if.
-                JSON_ASSERT(!states.empty());
-                states.pop_back();
-                skip_to_state_evaluation = true;
-                continue;
-            }
-
-            return sax->parse_error(m_lexer.get_position(),
-                                    m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), nullptr));
-        }
-    }
-
-    /// get next token from lexer
-    token_type get_token()
-    {
-        return last_token = m_lexer.scan();
-    }
-
-    std::string exception_message(const token_type expected, const std::string& context)
-    {
-        std::string error_msg = "syntax error ";
-
-        if (!context.empty())
-        {
-            error_msg += concat("while parsing ", context, ' ');
-        }
-
-        error_msg += "- ";
-
-        if (last_token == token_type::parse_error)
-        {
-            error_msg += concat(m_lexer.get_error_message(), "; last read: '",
-                                m_lexer.get_token_string(), '\'');
-        }
-        else
-        {
-            error_msg += concat("unexpected ", lexer_t::token_type_name(last_token));
-        }
-
-        if (expected != token_type::uninitialized)
-        {
-            error_msg += concat("; expected ", lexer_t::token_type_name(expected));
-        }
-
-        return error_msg;
-    }
-
-  private:
-    /// callback function
-    const parser_callback_t<BasicJsonType> callback = nullptr;
-    /// the type of the last read token
-    token_type last_token = token_type::uninitialized;
-    /// the lexer
-    lexer_t m_lexer;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/iterators/internal_iterator.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstddef> // ptrdiff_t
-#include <limits>  // numeric_limits
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-/*
-@brief an iterator for primitive JSON types
-
-This class models an iterator for primitive JSON types (boolean, number,
-string). It's only purpose is to allow the iterator/const_iterator classes
-to "iterate" over primitive values. Internally, the iterator is modeled by
-a `difference_type` variable. Value begin_value (`0`) models the begin,
-end_value (`1`) models past the end.
-*/
-class primitive_iterator_t
-{
-  private:
-    using difference_type = std::ptrdiff_t;
-    static constexpr difference_type begin_value = 0;
-    static constexpr difference_type end_value = begin_value + 1;
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /// iterator as signed integer type
-    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
-
-  public:
-    constexpr difference_type get_value() const noexcept
-    {
-        return m_it;
-    }
-
-    /// set iterator to a defined beginning
-    void set_begin() noexcept
-    {
-        m_it = begin_value;
-    }
-
-    /// set iterator to a defined past the end
-    void set_end() noexcept
-    {
-        m_it = end_value;
-    }
-
-    /// return whether the iterator can be dereferenced
-    constexpr bool is_begin() const noexcept
-    {
-        return m_it == begin_value;
-    }
-
-    /// return whether the iterator is at end
-    constexpr bool is_end() const noexcept
-    {
-        return m_it == end_value;
-    }
-
-    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it == rhs.m_it;
-    }
-
-    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it < rhs.m_it;
-    }
-
-    primitive_iterator_t operator+(difference_type n) noexcept
-    {
-        auto result = *this;
-        result += n;
-        return result;
-    }
-
-    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it - rhs.m_it;
-    }
-
-    primitive_iterator_t& operator++() noexcept
-    {
-        ++m_it;
-        return *this;
-    }
-
-    primitive_iterator_t operator++(int)& noexcept // NOLINT(cert-dcl21-cpp)
-    {
-        auto result = *this;
-        ++m_it;
-        return result;
-    }
-
-    primitive_iterator_t& operator--() noexcept
-    {
-        --m_it;
-        return *this;
-    }
-
-    primitive_iterator_t operator--(int)& noexcept // NOLINT(cert-dcl21-cpp)
-    {
-        auto result = *this;
-        --m_it;
-        return result;
-    }
-
-    primitive_iterator_t& operator+=(difference_type n) noexcept
-    {
-        m_it += n;
-        return *this;
-    }
-
-    primitive_iterator_t& operator-=(difference_type n) noexcept
-    {
-        m_it -= n;
-        return *this;
-    }
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-/*!
-@brief an iterator value
-
-@note This structure could easily be a union, but MSVC currently does not allow
-unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
-*/
-template<typename BasicJsonType> struct internal_iterator
-{
-    /// iterator for JSON objects
-    typename BasicJsonType::object_t::iterator object_iterator {};
-    /// iterator for JSON arrays
-    typename BasicJsonType::array_t::iterator array_iterator {};
-    /// generic iterator for all other types
-    primitive_iterator_t primitive_iterator {};
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/iterators/iter_impl.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
-#include <type_traits> // conditional, is_const, remove_const
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/iterators/internal_iterator.hpp>
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-// forward declare, to be able to friend it later on
-template<typename IteratorType> class iteration_proxy;
-template<typename IteratorType> class iteration_proxy_value;
-
-/*!
-@brief a template for a bidirectional iterator for the @ref basic_json class
-This class implements a both iterators (iterator and const_iterator) for the
-@ref basic_json class.
-@note An iterator is called *initialized* when a pointer to a JSON value has
-      been set (e.g., by a constructor or a copy assignment). If the iterator is
-      default-constructed, it is *uninitialized* and most methods are undefined.
-      **The library uses assertions to detect calls on uninitialized iterators.**
-@requirement The class satisfies the following concept requirements:
--
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
-  The iterator that can be moved can be moved in both directions (i.e.
-  incremented and decremented).
-@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
-       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
-*/
-template<typename BasicJsonType>
-class iter_impl // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
-{
-    /// the iterator with BasicJsonType of different const-ness
-    using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
-    /// allow basic_json to access private members
-    friend other_iter_impl;
-    friend BasicJsonType;
-    friend iteration_proxy<iter_impl>;
-    friend iteration_proxy_value<iter_impl>;
-
-    using object_t = typename BasicJsonType::object_t;
-    using array_t = typename BasicJsonType::array_t;
-    // make sure BasicJsonType is basic_json or const basic_json
-    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
-                  "iter_impl only accepts (const) basic_json");
-    // superficial check for the LegacyBidirectionalIterator named requirement
-    static_assert(std::is_base_of<std::bidirectional_iterator_tag, std::bidirectional_iterator_tag>::value
-                  &&  std::is_base_of<std::bidirectional_iterator_tag, typename std::iterator_traits<typename array_t::iterator>::iterator_category>::value,
-                  "basic_json iterator assumes array and object type iterators satisfy the LegacyBidirectionalIterator named requirement.");
-
-  public:
-    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
-    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
-    /// A user-defined iterator should provide publicly accessible typedefs named
-    /// iterator_category, value_type, difference_type, pointer, and reference.
-    /// Note that value_type is required to be non-const, even for constant iterators.
-    using iterator_category = std::bidirectional_iterator_tag;
-
-    /// the type of the values when the iterator is dereferenced
-    using value_type = typename BasicJsonType::value_type;
-    /// a type to represent differences between iterators
-    using difference_type = typename BasicJsonType::difference_type;
-    /// defines a pointer to the type iterated over (value_type)
-    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
-          typename BasicJsonType::const_pointer,
-          typename BasicJsonType::pointer>::type;
-    /// defines a reference to the type iterated over (value_type)
-    using reference =
-        typename std::conditional<std::is_const<BasicJsonType>::value,
-        typename BasicJsonType::const_reference,
-        typename BasicJsonType::reference>::type;
-
-    iter_impl() = default;
-    ~iter_impl() = default;
-    iter_impl(iter_impl&&) noexcept = default;
-    iter_impl& operator=(iter_impl&&) noexcept = default;
-
-    /*!
-    @brief constructor for a given JSON instance
-    @param[in] object  pointer to a JSON object for this iterator
-    @pre object != nullptr
-    @post The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    explicit iter_impl(pointer object) noexcept : m_object(object)
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = typename object_t::iterator();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = typename array_t::iterator();
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator = primitive_iterator_t();
-                break;
-            }
-        }
-    }
-
-    /*!
-    @note The conventional copy constructor and copy assignment are implicitly
-          defined. Combined with the following converting constructor and
-          assignment, they support: (1) copy from iterator to iterator, (2)
-          copy from const iterator to const iterator, and (3) conversion from
-          iterator to const iterator. However conversion from const iterator
-          to iterator is not defined.
-    */
-
-    /*!
-    @brief const copy constructor
-    @param[in] other const iterator to copy from
-    @note This copy constructor had to be defined explicitly to circumvent a bug
-          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
-          information refer to: https://github.com/nlohmann/json/issues/1608
-    */
-    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
-        : m_object(other.m_object), m_it(other.m_it)
-    {}
-
-    /*!
-    @brief converting assignment
-    @param[in] other const iterator to copy from
-    @return const/non-const iterator
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
-    {
-        if (&other != this)
-        {
-            m_object = other.m_object;
-            m_it = other.m_it;
-        }
-        return *this;
-    }
-
-    /*!
-    @brief converting constructor
-    @param[in] other  non-const iterator to copy from
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
-        : m_object(other.m_object), m_it(other.m_it)
-    {}
-
-    /*!
-    @brief converting assignment
-    @param[in] other  non-const iterator to copy from
-    @return const/non-const iterator
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
-    {
-        m_object = other.m_object;
-        m_it = other.m_it;
-        return *this;
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /*!
-    @brief set the iterator to the first value
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    void set_begin() noexcept
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = m_object->m_value.object->begin();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = m_object->m_value.array->begin();
-                break;
-            }
-
-            case value_t::null:
-            {
-                // set to end so begin()==end() is true: null is empty
-                m_it.primitive_iterator.set_end();
-                break;
-            }
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator.set_begin();
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief set the iterator past the last value
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    void set_end() noexcept
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = m_object->m_value.object->end();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = m_object->m_value.array->end();
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator.set_end();
-                break;
-            }
-        }
-    }
-
-  public:
-    /*!
-    @brief return a reference to the value pointed to by the iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference operator*() const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
-                return m_it.object_iterator->second;
-            }
-
-            case value_t::array:
-            {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
-                return *m_it.array_iterator;
-            }
-
-            case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
-                {
-                    return *m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
-            }
-        }
-    }
-
-    /*!
-    @brief dereference the iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    pointer operator->() const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
-                return &(m_it.object_iterator->second);
-            }
-
-            case value_t::array:
-            {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
-                return &*m_it.array_iterator;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
-                {
-                    return m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
-            }
-        }
-    }
-
-    /*!
-    @brief post-increment (it++)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator++(int)& // NOLINT(cert-dcl21-cpp)
-    {
-        auto result = *this;
-        ++(*this);
-        return result;
-    }
-
-    /*!
-    @brief pre-increment (++it)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator++()
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                std::advance(m_it.object_iterator, 1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, 1);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                ++m_it.primitive_iterator;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief post-decrement (it--)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator--(int)& // NOLINT(cert-dcl21-cpp)
-    {
-        auto result = *this;
-        --(*this);
-        return result;
-    }
-
-    /*!
-    @brief pre-decrement (--it)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator--()
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                std::advance(m_it.object_iterator, -1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, -1);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                --m_it.primitive_iterator;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief comparison: equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
-    bool operator==(const IterImpl& other) const
-    {
-        // if objects are not the same, the comparison is undefined
-        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
-        }
-
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                return (m_it.object_iterator == other.m_it.object_iterator);
-
-            case value_t::array:
-                return (m_it.array_iterator == other.m_it.array_iterator);
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
-        }
-    }
-
-    /*!
-    @brief comparison: not equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
-    bool operator!=(const IterImpl& other) const
-    {
-        return !operator==(other);
-    }
-
-    /*!
-    @brief comparison: smaller
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator<(const iter_impl& other) const
-    {
-        // if objects are not the same, the comparison is undefined
-        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
-        }
-
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", m_object));
-
-            case value_t::array:
-                return (m_it.array_iterator < other.m_it.array_iterator);
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
-        }
-    }
-
-    /*!
-    @brief comparison: less than or equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator<=(const iter_impl& other) const
-    {
-        return !other.operator < (*this);
-    }
-
-    /*!
-    @brief comparison: greater than
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator>(const iter_impl& other) const
-    {
-        return !operator<=(other);
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator>=(const iter_impl& other) const
-    {
-        return !operator<(other);
-    }
-
-    /*!
-    @brief add to iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator+=(difference_type i)
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, i);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator += i;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief subtract from iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator-=(difference_type i)
-    {
-        return operator+=(-i);
-    }
-
-    /*!
-    @brief add to iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator+(difference_type i) const
-    {
-        auto result = *this;
-        result += i;
-        return result;
-    }
-
-    /*!
-    @brief addition of distance and iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    friend iter_impl operator+(difference_type i, const iter_impl& it)
-    {
-        auto result = it;
-        result += i;
-        return result;
-    }
-
-    /*!
-    @brief subtract from iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator-(difference_type i) const
-    {
-        auto result = *this;
-        result -= i;
-        return result;
-    }
-
-    /*!
-    @brief return difference
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    difference_type operator-(const iter_impl& other) const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
-
-            case value_t::array:
-                return m_it.array_iterator - other.m_it.array_iterator;
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return m_it.primitive_iterator - other.m_it.primitive_iterator;
-        }
-    }
-
-    /*!
-    @brief access to successor
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference operator[](difference_type n) const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", m_object));
-
-            case value_t::array:
-                return *std::next(m_it.array_iterator, n);
-
-            case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
-                {
-                    return *m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
-            }
-        }
-    }
-
-    /*!
-    @brief return the key of an object iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    const typename object_t::key_type& key() const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
-        {
-            return m_it.object_iterator->first;
-        }
-
-        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", m_object));
-    }
-
-    /*!
-    @brief return the value of an iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference value() const
-    {
-        return operator*();
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /// associated JSON instance
-    pointer m_object = nullptr;
-    /// the actual iterator of the associated instance
-    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-
-// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <cstddef> // ptrdiff_t
-#include <iterator> // reverse_iterator
-#include <utility> // declval
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-//////////////////////
-// reverse_iterator //
-//////////////////////
-
-/*!
-@brief a template for a reverse iterator class
-
-@tparam Base the base iterator type to reverse. Valid types are @ref
-iterator (to create @ref reverse_iterator) and @ref const_iterator (to
-create @ref const_reverse_iterator).
-
-@requirement The class satisfies the following concept requirements:
--
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
-  The iterator that can be moved can be moved in both directions (i.e.
-  incremented and decremented).
-- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
-  It is possible to write to the pointed-to element (only if @a Base is
-  @ref iterator).
-
-@since version 1.0.0
-*/
-template<typename Base>
-class json_reverse_iterator : public std::reverse_iterator<Base>
-{
-  public:
-    using difference_type = std::ptrdiff_t;
-    /// shortcut to the reverse iterator adapter
-    using base_iterator = std::reverse_iterator<Base>;
-    /// the reference type for the pointed-to element
-    using reference = typename Base::reference;
-
-    /// create reverse iterator from iterator
-    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
-        : base_iterator(it) {}
-
-    /// create reverse iterator from base class
-    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
-
-    /// post-increment (it++)
-    json_reverse_iterator operator++(int)& // NOLINT(cert-dcl21-cpp)
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
-    }
-
-    /// pre-increment (++it)
-    json_reverse_iterator& operator++()
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
-    }
-
-    /// post-decrement (it--)
-    json_reverse_iterator operator--(int)& // NOLINT(cert-dcl21-cpp)
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
-    }
-
-    /// pre-decrement (--it)
-    json_reverse_iterator& operator--()
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
-    }
-
-    /// add to iterator
-    json_reverse_iterator& operator+=(difference_type i)
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
-    }
-
-    /// add to iterator
-    json_reverse_iterator operator+(difference_type i) const
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
-    }
-
-    /// subtract from iterator
-    json_reverse_iterator operator-(difference_type i) const
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
-    }
-
-    /// return difference
-    difference_type operator-(const json_reverse_iterator& other) const
-    {
-        return base_iterator(*this) - base_iterator(other);
-    }
-
-    /// access to successor
-    reference operator[](difference_type n) const
-    {
-        return *(this->operator+(n));
-    }
-
-    /// return the key of an object iterator
-    auto key() const -> decltype(std::declval<Base>().key())
-    {
-        auto it = --this->base();
-        return it.key();
-    }
-
-    /// return the value of an iterator
-    reference value() const
-    {
-        auto it = --this->base();
-        return it.operator * ();
-    }
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-// #include <nlohmann/detail/json_pointer.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <algorithm> // all_of
-#include <cctype> // isdigit
-#include <cerrno> // errno, ERANGE
-#include <cstdlib> // strtoull
-#ifndef JSON_NO_IO
-    #include <iosfwd> // ostream
-#endif  // JSON_NO_IO
-#include <limits> // max
-#include <numeric> // accumulate
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/string_concat.hpp>
-
-// #include <nlohmann/detail/string_escape.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
-/// @sa https://json.nlohmann.me/api/json_pointer/
-template<typename RefStringType>
-class json_pointer
-{
-    // allow basic_json to access private members
-    NLOHMANN_BASIC_JSON_TPL_DECLARATION
-    friend class basic_json;
-
-    template<typename>
-    friend class json_pointer;
-
-    template<typename T>
-    struct string_t_helper
-    {
-        using type = T;
-    };
-
-    NLOHMANN_BASIC_JSON_TPL_DECLARATION
-    struct string_t_helper<NLOHMANN_BASIC_JSON_TPL>
-    {
-        using type = StringType;
-    };
-
-  public:
-    // for backwards compatibility accept BasicJsonType
-    using string_t = typename string_t_helper<RefStringType>::type;
-
-    /// @brief create JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/json_pointer/
-    explicit json_pointer(const string_t& s = "")
-        : reference_tokens(split(s))
-    {}
-
-    /// @brief return a string representation of the JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/to_string/
-    string_t to_string() const
-    {
-        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
-                               string_t{},
-                               [](const string_t& a, const string_t& b)
-        {
-            return detail::concat(a, '/', detail::escape(b));
-        });
-    }
-
-    /// @brief return a string representation of the JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_string/
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, to_string())
-    operator string_t() const
-    {
-        return to_string();
-    }
-
-#ifndef JSON_NO_IO
-    /// @brief write string representation of the JSON pointer to stream
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
-    friend std::ostream& operator<<(std::ostream& o, const json_pointer& ptr)
-    {
-        o << ptr.to_string();
-        return o;
-    }
-#endif
-
-    /// @brief append another JSON pointer at the end of this JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
-    json_pointer& operator/=(const json_pointer& ptr)
-    {
-        reference_tokens.insert(reference_tokens.end(),
-                                ptr.reference_tokens.begin(),
-                                ptr.reference_tokens.end());
-        return *this;
-    }
-
-    /// @brief append an unescaped reference token at the end of this JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
-    json_pointer& operator/=(string_t token)
-    {
-        push_back(std::move(token));
-        return *this;
-    }
-
-    /// @brief append an array index at the end of this JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
-    json_pointer& operator/=(std::size_t array_idx)
-    {
-        return *this /= std::to_string(array_idx);
-    }
-
-    /// @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
-    friend json_pointer operator/(const json_pointer& lhs,
-                                  const json_pointer& rhs)
-    {
-        return json_pointer(lhs) /= rhs;
-    }
-
-    /// @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
-    friend json_pointer operator/(const json_pointer& lhs, string_t token) // NOLINT(performance-unnecessary-value-param)
-    {
-        return json_pointer(lhs) /= std::move(token);
-    }
-
-    /// @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
-    friend json_pointer operator/(const json_pointer& lhs, std::size_t array_idx)
-    {
-        return json_pointer(lhs) /= array_idx;
-    }
-
-    /// @brief returns the parent of this JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/parent_pointer/
-    json_pointer parent_pointer() const
-    {
-        if (empty())
-        {
-            return *this;
-        }
-
-        json_pointer res = *this;
-        res.pop_back();
-        return res;
-    }
-
-    /// @brief remove last reference token
-    /// @sa https://json.nlohmann.me/api/json_pointer/pop_back/
-    void pop_back()
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
-        }
-
-        reference_tokens.pop_back();
-    }
-
-    /// @brief return last reference token
-    /// @sa https://json.nlohmann.me/api/json_pointer/back/
-    const string_t& back() const
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
-        }
-
-        return reference_tokens.back();
-    }
-
-    /// @brief append an unescaped token at the end of the reference pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
-    void push_back(const string_t& token)
-    {
-        reference_tokens.push_back(token);
-    }
-
-    /// @brief append an unescaped token at the end of the reference pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
-    void push_back(string_t&& token)
-    {
-        reference_tokens.push_back(std::move(token));
-    }
-
-    /// @brief return whether pointer points to the root document
-    /// @sa https://json.nlohmann.me/api/json_pointer/empty/
-    bool empty() const noexcept
-    {
-        return reference_tokens.empty();
-    }
-
-  private:
-    /*!
-    @param[in] s  reference token to be converted into an array index
-
-    @return integer representation of @a s
-
-    @throw parse_error.106  if an array index begins with '0'
-    @throw parse_error.109  if an array index begins not with a digit
-    @throw out_of_range.404 if string @a s could not be converted to an integer
-    @throw out_of_range.410 if an array index exceeds size_type
-    */
-    template<typename BasicJsonType>
-    static typename BasicJsonType::size_type array_index(const string_t& s)
-    {
-        using size_type = typename BasicJsonType::size_type;
-
-        // error condition (cf. RFC 6901, Sect. 4)
-        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
-        {
-            JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr));
-        }
-
-        // error condition (cf. RFC 6901, Sect. 4)
-        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
-        {
-            JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr));
-        }
-
-        const char* p = s.c_str();
-        char* p_end = nullptr;
-        errno = 0; // strtoull doesn't reset errno
-        unsigned long long res = std::strtoull(p, &p_end, 10); // NOLINT(runtime/int)
-        if (p == p_end // invalid input or empty string
-                || errno == ERANGE // out of range
-                || JSON_HEDLEY_UNLIKELY(static_cast<std::size_t>(p_end - p) != s.size())) // incomplete read
-        {
-            JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr));
-        }
-
-        // only triggered on special platforms (like 32bit), see also
-        // https://github.com/nlohmann/json/pull/2203
-        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
-        {
-            JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr));   // LCOV_EXCL_LINE
-        }
-
-        return static_cast<size_type>(res);
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    json_pointer top() const
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
-        }
-
-        json_pointer result = *this;
-        result.reference_tokens = {reference_tokens[0]};
-        return result;
-    }
-
-  private:
-    /*!
-    @brief create and return a reference to the pointed to value
-
-    @complexity Linear in the number of reference tokens.
-
-    @throw parse_error.109 if array index is not a number
-    @throw type_error.313 if value cannot be unflattened
-    */
-    template<typename BasicJsonType>
-    BasicJsonType& get_and_create(BasicJsonType& j) const
-    {
-        auto* result = &j;
-
-        // in case no reference tokens exist, return a reference to the JSON value
-        // j which will be overwritten by a primitive value
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (result->type())
-            {
-                case detail::value_t::null:
-                {
-                    if (reference_token == "0")
-                    {
-                        // start a new array if reference token is 0
-                        result = &result->operator[](0);
-                    }
-                    else
-                    {
-                        // start a new object otherwise
-                        result = &result->operator[](reference_token);
-                    }
-                    break;
-                }
-
-                case detail::value_t::object:
-                {
-                    // create an entry in the object
-                    result = &result->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    // create an entry in the array
-                    result = &result->operator[](array_index<BasicJsonType>(reference_token));
-                    break;
-                }
-
-                /*
-                The following code is only reached if there exists a reference
-                token _and_ the current value is primitive. In this case, we have
-                an error situation, because primitive values may only occur as
-                single value; that is, with an empty list of reference tokens.
-                */
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", &j));
-            }
-        }
-
-        return *result;
-    }
-
-    /*!
-    @brief return a reference to the pointed to value
-
-    @note This version does not throw if a value is not present, but tries to
-          create nested values instead. For instance, calling this function
-          with pointer `"/this/that"` on a null value is equivalent to calling
-          `operator[]("this").operator[]("that")` on that value, effectively
-          changing the null value to an object.
-
-    @param[in] ptr  a JSON value
-
-    @return reference to the JSON value pointed to by the JSON pointer
-
-    @complexity Linear in the length of the JSON pointer.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    template<typename BasicJsonType>
-    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            // convert null values to arrays or objects before continuing
-            if (ptr->is_null())
-            {
-                // check if reference token is a number
-                const bool nums =
-                    std::all_of(reference_token.begin(), reference_token.end(),
-                                [](const unsigned char x)
-                {
-                    return std::isdigit(x);
-                });
-
-                // change value to array for numbers or "-" or to object otherwise
-                *ptr = (nums || reference_token == "-")
-                       ? detail::value_t::array
-                       : detail::value_t::object;
-            }
-
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // use unchecked object access
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (reference_token == "-")
-                    {
-                        // explicitly treat "-" as index beyond the end
-                        ptr = &ptr->operator[](ptr->m_value.array->size());
-                    }
-                    else
-                    {
-                        // convert array index to number; unchecked access
-                        ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
-                    }
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    template<typename BasicJsonType>
-    BasicJsonType& get_checked(BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // note: at performs range check
-                    ptr = &ptr->at(reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
-                                "array index '-' (", std::to_string(ptr->m_value.array->size()),
-                                ") is out of range"), ptr));
-                    }
-
-                    // note: at performs range check
-                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @brief return a const reference to the pointed to value
-
-    @param[in] ptr  a JSON value
-
-    @return const reference to the JSON value pointed to by the JSON
-    pointer
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    template<typename BasicJsonType>
-    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // use unchecked object access
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" cannot be used for const access
-                        JSON_THROW(detail::out_of_range::create(402, detail::concat("array index '-' (", std::to_string(ptr->m_value.array->size()), ") is out of range"), ptr));
-                    }
-
-                    // use unchecked array access
-                    ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    template<typename BasicJsonType>
-    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // note: at performs range check
-                    ptr = &ptr->at(reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
-                                "array index '-' (", std::to_string(ptr->m_value.array->size()),
-                                ") is out of range"), ptr));
-                    }
-
-                    // note: at performs range check
-                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    */
-    template<typename BasicJsonType>
-    bool contains(const BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    if (!ptr->contains(reference_token))
-                    {
-                        // we did not find the key in the object
-                        return false;
-                    }
-
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
-                    {
-                        // invalid char
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
-                        {
-                            // first char should be between '1' and '9'
-                            return false;
-                        }
-                        for (std::size_t i = 1; i < reference_token.size(); i++)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
-                            {
-                                // other char should be between '0' and '9'
-                                return false;
-                            }
-                        }
-                    }
-
-                    const auto idx = array_index<BasicJsonType>(reference_token);
-                    if (idx >= ptr->size())
-                    {
-                        // index out of range
-                        return false;
-                    }
-
-                    ptr = &ptr->operator[](idx);
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                {
-                    // we do not expect primitive values if there is still a
-                    // reference token to process
-                    return false;
-                }
-            }
-        }
-
-        // no reference token left means we found a primitive value
-        return true;
-    }
-
-    /*!
-    @brief split the string input to reference tokens
-
-    @note This function is only called by the json_pointer constructor.
-          All exceptions below are documented there.
-
-    @throw parse_error.107  if the pointer is not empty or begins with '/'
-    @throw parse_error.108  if character '~' is not followed by '0' or '1'
-    */
-    static std::vector<string_t> split(const string_t& reference_string)
-    {
-        std::vector<string_t> result;
-
-        // special case: empty reference string -> no reference tokens
-        if (reference_string.empty())
-        {
-            return result;
-        }
-
-        // check if nonempty reference string begins with slash
-        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
-        {
-            JSON_THROW(detail::parse_error::create(107, 1, detail::concat("JSON pointer must be empty or begin with '/' - was: '", reference_string, "'"), nullptr));
-        }
-
-        // extract the reference tokens:
-        // - slash: position of the last read slash (or end of string)
-        // - start: position after the previous slash
-        for (
-            // search for the first slash after the first character
-            std::size_t slash = reference_string.find_first_of('/', 1),
-            // set the beginning of the first reference token
-            start = 1;
-            // we can stop if start == 0 (if slash == string_t::npos)
-            start != 0;
-            // set the beginning of the next reference token
-            // (will eventually be 0 if slash == string_t::npos)
-            start = (slash == string_t::npos) ? 0 : slash + 1,
-            // find next slash
-            slash = reference_string.find_first_of('/', start))
-        {
-            // use the text between the beginning of the reference token
-            // (start) and the last slash (slash).
-            auto reference_token = reference_string.substr(start, slash - start);
-
-            // check reference tokens are properly escaped
-            for (std::size_t pos = reference_token.find_first_of('~');
-                    pos != string_t::npos;
-                    pos = reference_token.find_first_of('~', pos + 1))
-            {
-                JSON_ASSERT(reference_token[pos] == '~');
-
-                // ~ must be followed by 0 or 1
-                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
-                                         (reference_token[pos + 1] != '0' &&
-                                          reference_token[pos + 1] != '1')))
-                {
-                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", nullptr));
-                }
-            }
-
-            // finally, store the reference token
-            detail::unescape(reference_token);
-            result.push_back(reference_token);
-        }
-
-        return result;
-    }
-
-  private:
-    /*!
-    @param[in] reference_string  the reference string to the current value
-    @param[in] value             the value to consider
-    @param[in,out] result        the result object to insert values to
-
-    @note Empty objects or arrays are flattened to `null`.
-    */
-    template<typename BasicJsonType>
-    static void flatten(const string_t& reference_string,
-                        const BasicJsonType& value,
-                        BasicJsonType& result)
-    {
-        switch (value.type())
-        {
-            case detail::value_t::array:
-            {
-                if (value.m_value.array->empty())
-                {
-                    // flatten empty array as null
-                    result[reference_string] = nullptr;
-                }
-                else
-                {
-                    // iterate array and use index as reference string
-                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
-                    {
-                        flatten(detail::concat(reference_string, '/', std::to_string(i)),
-                                value.m_value.array->operator[](i), result);
-                    }
-                }
-                break;
-            }
-
-            case detail::value_t::object:
-            {
-                if (value.m_value.object->empty())
-                {
-                    // flatten empty object as null
-                    result[reference_string] = nullptr;
-                }
-                else
-                {
-                    // iterate object and use keys as reference string
-                    for (const auto& element : *value.m_value.object)
-                    {
-                        flatten(detail::concat(reference_string, '/', detail::escape(element.first)), element.second, result);
-                    }
-                }
-                break;
-            }
-
-            case detail::value_t::null:
-            case detail::value_t::string:
-            case detail::value_t::boolean:
-            case detail::value_t::number_integer:
-            case detail::value_t::number_unsigned:
-            case detail::value_t::number_float:
-            case detail::value_t::binary:
-            case detail::value_t::discarded:
-            default:
-            {
-                // add primitive value with its reference string
-                result[reference_string] = value;
-                break;
-            }
-        }
-    }
-
-    /*!
-    @param[in] value  flattened JSON
-
-    @return unflattened JSON
-
-    @throw parse_error.109 if array index is not a number
-    @throw type_error.314  if value is not an object
-    @throw type_error.315  if object values are not primitive
-    @throw type_error.313  if value cannot be unflattened
-    */
-    template<typename BasicJsonType>
-    static BasicJsonType
-    unflatten(const BasicJsonType& value)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
-        {
-            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", &value));
-        }
-
-        BasicJsonType result;
-
-        // iterate the JSON object values
-        for (const auto& element : *value.m_value.object)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
-            {
-                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", &element.second));
-            }
-
-            // assign value to reference pointed to by JSON pointer; Note that if
-            // the JSON pointer is "" (i.e., points to the whole value), function
-            // get_and_create returns a reference to result itself. An assignment
-            // will then create a primitive value.
-            json_pointer(element.first).get_and_create(result) = element.second;
-        }
-
-        return result;
-    }
-
-    // can't use conversion operator because of ambiguity
-    json_pointer<string_t> convert() const&
-    {
-        json_pointer<string_t> result;
-        result.reference_tokens = reference_tokens;
-        return result;
-    }
-
-    json_pointer<string_t> convert()&&
-    {
-        json_pointer<string_t> result;
-        result.reference_tokens = std::move(reference_tokens);
-        return result;
-    }
-
-  public:
-#if JSON_HAS_THREE_WAY_COMPARISON
-    /// @brief compares two JSON pointers for equality
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
-    template<typename RefStringTypeRhs>
-    bool operator==(const json_pointer<RefStringTypeRhs>& rhs) const noexcept
-    {
-        return reference_tokens == rhs.reference_tokens;
-    }
-
-    /// @brief compares JSON pointer and string for equality
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer))
-    bool operator==(const string_t& rhs) const
-    {
-        return *this == json_pointer(rhs);
-    }
-
-    /// @brief 3-way compares two JSON pointers
-    template<typename RefStringTypeRhs>
-    std::strong_ordering operator<=>(const json_pointer<RefStringTypeRhs>& rhs) const noexcept // *NOPAD*
-    {
-        return  reference_tokens <=> rhs.reference_tokens; // *NOPAD*
-    }
-#else
-    /// @brief compares two JSON pointers for equality
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
-    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
-    // NOLINTNEXTLINE(readability-redundant-declaration)
-    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
-                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
-
-    /// @brief compares JSON pointer and string for equality
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
-    template<typename RefStringTypeLhs, typename StringType>
-    // NOLINTNEXTLINE(readability-redundant-declaration)
-    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
-                           const StringType& rhs);
-
-    /// @brief compares string and JSON pointer for equality
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
-    template<typename RefStringTypeRhs, typename StringType>
-    // NOLINTNEXTLINE(readability-redundant-declaration)
-    friend bool operator==(const StringType& lhs,
-                           const json_pointer<RefStringTypeRhs>& rhs);
-
-    /// @brief compares two JSON pointers for inequality
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
-    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
-    // NOLINTNEXTLINE(readability-redundant-declaration)
-    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
-                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
-
-    /// @brief compares JSON pointer and string for inequality
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
-    template<typename RefStringTypeLhs, typename StringType>
-    // NOLINTNEXTLINE(readability-redundant-declaration)
-    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
-                           const StringType& rhs);
-
-    /// @brief compares string and JSON pointer for inequality
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
-    template<typename RefStringTypeRhs, typename StringType>
-    // NOLINTNEXTLINE(readability-redundant-declaration)
-    friend bool operator!=(const StringType& lhs,
-                           const json_pointer<RefStringTypeRhs>& rhs);
-
-    /// @brief compares two JSON pointer for less-than
-    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
-    // NOLINTNEXTLINE(readability-redundant-declaration)
-    friend bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
-                          const json_pointer<RefStringTypeRhs>& rhs) noexcept;
-#endif
-
-  private:
-    /// the reference tokens
-    std::vector<string_t> reference_tokens;
-};
-
-#if !JSON_HAS_THREE_WAY_COMPARISON
-// functions cannot be defined inside class due to ODR violations
-template<typename RefStringTypeLhs, typename RefStringTypeRhs>
-inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
-                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
-{
-    return lhs.reference_tokens == rhs.reference_tokens;
-}
-
-template<typename RefStringTypeLhs,
-         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
-JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
-inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
-                       const StringType& rhs)
-{
-    return lhs == json_pointer<RefStringTypeLhs>(rhs);
-}
-
-template<typename RefStringTypeRhs,
-         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
-JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
-inline bool operator==(const StringType& lhs,
-                       const json_pointer<RefStringTypeRhs>& rhs)
-{
-    return json_pointer<RefStringTypeRhs>(lhs) == rhs;
-}
-
-template<typename RefStringTypeLhs, typename RefStringTypeRhs>
-inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
-                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
-{
-    return !(lhs == rhs);
-}
-
-template<typename RefStringTypeLhs,
-         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
-JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
-inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
-                       const StringType& rhs)
-{
-    return !(lhs == rhs);
-}
-
-template<typename RefStringTypeRhs,
-         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
-JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
-inline bool operator!=(const StringType& lhs,
-                       const json_pointer<RefStringTypeRhs>& rhs)
-{
-    return !(lhs == rhs);
-}
-
-template<typename RefStringTypeLhs, typename RefStringTypeRhs>
-inline bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
-                      const json_pointer<RefStringTypeRhs>& rhs) noexcept
-{
-    return lhs.reference_tokens < rhs.reference_tokens;
-}
-#endif
-
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/json_ref.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <initializer_list>
-#include <utility>
-
-// #include <nlohmann/detail/abi_macros.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-template<typename BasicJsonType>
-class json_ref
-{
-  public:
-    using value_type = BasicJsonType;
-
-    json_ref(value_type&& value)
-        : owned_value(std::move(value))
-    {}
-
-    json_ref(const value_type& value)
-        : value_ref(&value)
-    {}
-
-    json_ref(std::initializer_list<json_ref> init)
-        : owned_value(init)
-    {}
-
-    template <
-        class... Args,
-        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
-    json_ref(Args && ... args)
-        : owned_value(std::forward<Args>(args)...)
-    {}
-
-    // class should be movable only
-    json_ref(json_ref&&) noexcept = default;
-    json_ref(const json_ref&) = delete;
-    json_ref& operator=(const json_ref&) = delete;
-    json_ref& operator=(json_ref&&) = delete;
-    ~json_ref() = default;
-
-    value_type moved_or_copied() const
-    {
-        if (value_ref == nullptr)
-        {
-            return std::move(owned_value);
-        }
-        return *value_ref;
-    }
-
-    value_type const& operator*() const
-    {
-        return value_ref ? *value_ref : owned_value;
-    }
-
-    value_type const* operator->() const
-    {
-        return &** this;
-    }
-
-  private:
-    mutable value_type owned_value = nullptr;
-    value_type const* value_ref = nullptr;
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/string_concat.hpp>
-
-// #include <nlohmann/detail/string_escape.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/output/binary_writer.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <algorithm> // reverse
-#include <array> // array
-#include <map> // map
-#include <cmath> // isnan, isinf
-#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
-#include <cstring> // memcpy
-#include <limits> // numeric_limits
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/input/binary_reader.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <algorithm> // copy
-#include <cstddef> // size_t
-#include <iterator> // back_inserter
-#include <memory> // shared_ptr, make_shared
-#include <string> // basic_string
-#include <vector> // vector
-
-#ifndef JSON_NO_IO
-    #include <ios>      // streamsize
-    #include <ostream>  // basic_ostream
-#endif  // JSON_NO_IO
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-/// abstract output adapter interface
-template<typename CharType> struct output_adapter_protocol
-{
-    virtual void write_character(CharType c) = 0;
-    virtual void write_characters(const CharType* s, std::size_t length) = 0;
-    virtual ~output_adapter_protocol() = default;
-
-    output_adapter_protocol() = default;
-    output_adapter_protocol(const output_adapter_protocol&) = default;
-    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
-    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
-    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
-};
-
-/// a type to simplify interfaces
-template<typename CharType>
-using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
-
-/// output adapter for byte vectors
-template<typename CharType, typename AllocatorType = std::allocator<CharType>>
-class output_vector_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_vector_adapter(std::vector<CharType, AllocatorType>& vec) noexcept
-        : v(vec)
-    {}
-
-    void write_character(CharType c) override
-    {
-        v.push_back(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        v.insert(v.end(), s, s + length);
-    }
-
-  private:
-    std::vector<CharType, AllocatorType>& v;
-};
-
-#ifndef JSON_NO_IO
-/// output adapter for output streams
-template<typename CharType>
-class output_stream_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
-        : stream(s)
-    {}
-
-    void write_character(CharType c) override
-    {
-        stream.put(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        stream.write(s, static_cast<std::streamsize>(length));
-    }
-
-  private:
-    std::basic_ostream<CharType>& stream;
-};
-#endif  // JSON_NO_IO
-
-/// output adapter for basic_string
-template<typename CharType, typename StringType = std::basic_string<CharType>>
-class output_string_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_string_adapter(StringType& s) noexcept
-        : str(s)
-    {}
-
-    void write_character(CharType c) override
-    {
-        str.push_back(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        str.append(s, length);
-    }
-
-  private:
-    StringType& str;
-};
-
-template<typename CharType, typename StringType = std::basic_string<CharType>>
-class output_adapter
-{
-  public:
-    template<typename AllocatorType = std::allocator<CharType>>
-    output_adapter(std::vector<CharType, AllocatorType>& vec)
-        : oa(std::make_shared<output_vector_adapter<CharType, AllocatorType>>(vec)) {}
-
-#ifndef JSON_NO_IO
-    output_adapter(std::basic_ostream<CharType>& s)
-        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
-#endif  // JSON_NO_IO
-
-    output_adapter(StringType& s)
-        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
-
-    operator output_adapter_t<CharType>()
-    {
-        return oa;
-    }
-
-  private:
-    output_adapter_t<CharType> oa = nullptr;
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/string_concat.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-///////////////////
-// binary writer //
-///////////////////
-
-/*!
-@brief serialization to CBOR and MessagePack values
-*/
-template<typename BasicJsonType, typename CharType>
-class binary_writer
-{
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-
-  public:
-    /*!
-    @brief create a binary writer
-
-    @param[in] adapter  output adapter to write to
-    */
-    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
-    {
-        JSON_ASSERT(oa);
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
-    */
-    void write_bson(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::object:
-            {
-                write_bson_object(*j.m_value.object);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::array:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                JSON_THROW(type_error::create(317, concat("to serialize to BSON, top-level type must be object, but is ", j.type_name()), &j));
-            }
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    */
-    void write_cbor(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                oa->write_character(to_char_type(0xF6));
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                oa->write_character(j.m_value.boolean
-                                    ? to_char_type(0xF5)
-                                    : to_char_type(0xF4));
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // CBOR does not differentiate between positive signed
-                    // integers and unsigned integers. Therefore, we used the
-                    // code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_integer <= 0x17)
-                    {
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x18));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x19));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x1A));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                    }
-                    else
-                    {
-                        oa->write_character(to_char_type(0x1B));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                    }
-                }
-                else
-                {
-                    // The conversions below encode the sign in the first
-                    // byte, and the value is converted to a positive number.
-                    const auto positive_number = -1 - j.m_value.number_integer;
-                    if (j.m_value.number_integer >= -24)
-                    {
-                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x38));
-                        write_number(static_cast<std::uint8_t>(positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x39));
-                        write_number(static_cast<std::uint16_t>(positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x3A));
-                        write_number(static_cast<std::uint32_t>(positive_number));
-                    }
-                    else
-                    {
-                        oa->write_character(to_char_type(0x3B));
-                        write_number(static_cast<std::uint64_t>(positive_number));
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x18));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x19));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x1A));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
-                }
-                else
-                {
-                    oa->write_character(to_char_type(0x1B));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                if (std::isnan(j.m_value.number_float))
-                {
-                    // NaN is 0xf97e00 in CBOR
-                    oa->write_character(to_char_type(0xF9));
-                    oa->write_character(to_char_type(0x7E));
-                    oa->write_character(to_char_type(0x00));
-                }
-                else if (std::isinf(j.m_value.number_float))
-                {
-                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
-                    oa->write_character(to_char_type(0xf9));
-                    oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
-                    oa->write_character(to_char_type(0x00));
-                }
-                else
-                {
-                    write_compact_float(j.m_value.number_float, detail::input_format_t::cbor);
-                }
-                break;
-            }
-
-            case value_t::string:
-            {
-                // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x60 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x78));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x79));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x7A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x7B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write the string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x80 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x98));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x99));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x9A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x9B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_cbor(el);
-                }
-                break;
-            }
-
-            case value_t::binary:
-            {
-                if (j.m_value.binary->has_subtype())
-                {
-                    if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xd8));
-                        write_number(static_cast<std::uint8_t>(j.m_value.binary->subtype()));
-                    }
-                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xd9));
-                        write_number(static_cast<std::uint16_t>(j.m_value.binary->subtype()));
-                    }
-                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xda));
-                        write_number(static_cast<std::uint32_t>(j.m_value.binary->subtype()));
-                    }
-                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xdb));
-                        write_number(static_cast<std::uint64_t>(j.m_value.binary->subtype()));
-                    }
-                }
-
-                // step 1: write control byte and the binary array size
-                const auto N = j.m_value.binary->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x40 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x58));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x59));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x5A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x5B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                    N);
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0xA0 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xB8));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xB9));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xBA));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xBB));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_cbor(el.first);
-                    write_cbor(el.second);
-                }
-                break;
-            }
-
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    */
-    void write_msgpack(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::null: // nil
-            {
-                oa->write_character(to_char_type(0xC0));
-                break;
-            }
-
-            case value_t::boolean: // true and false
-            {
-                oa->write_character(j.m_value.boolean
-                                    ? to_char_type(0xC3)
-                                    : to_char_type(0xC2));
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // MessagePack does not differentiate between positive
-                    // signed integers and unsigned integers. Therefore, we used
-                    // the code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_unsigned < 128)
-                    {
-                        // positive fixnum
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        // uint 8
-                        oa->write_character(to_char_type(0xCC));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        // uint 16
-                        oa->write_character(to_char_type(0xCD));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        // uint 32
-                        oa->write_character(to_char_type(0xCE));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
-                    {
-                        // uint 64
-                        oa->write_character(to_char_type(0xCF));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                    }
-                }
-                else
-                {
-                    if (j.m_value.number_integer >= -32)
-                    {
-                        // negative fixnum
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
-                    {
-                        // int 8
-                        oa->write_character(to_char_type(0xD0));
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
-                    {
-                        // int 16
-                        oa->write_character(to_char_type(0xD1));
-                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
-                    {
-                        // int 32
-                        oa->write_character(to_char_type(0xD2));
-                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
-                    {
-                        // int 64
-                        oa->write_character(to_char_type(0xD3));
-                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned < 128)
-                {
-                    // positive fixnum
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    // uint 8
-                    oa->write_character(to_char_type(0xCC));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // uint 16
-                    oa->write_character(to_char_type(0xCD));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // uint 32
-                    oa->write_character(to_char_type(0xCE));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    // uint 64
-                    oa->write_character(to_char_type(0xCF));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack);
-                break;
-            }
-
-            case value_t::string:
-            {
-                // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
-                if (N <= 31)
-                {
-                    // fixstr
-                    write_number(static_cast<std::uint8_t>(0xA0 | N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    // str 8
-                    oa->write_character(to_char_type(0xD9));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // str 16
-                    oa->write_character(to_char_type(0xDA));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // str 32
-                    oa->write_character(to_char_type(0xDB));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write the string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
-                if (N <= 15)
-                {
-                    // fixarray
-                    write_number(static_cast<std::uint8_t>(0x90 | N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // array 16
-                    oa->write_character(to_char_type(0xDC));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // array 32
-                    oa->write_character(to_char_type(0xDD));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_msgpack(el);
-                }
-                break;
-            }
-
-            case value_t::binary:
-            {
-                // step 0: determine if the binary type has a set subtype to
-                // determine whether or not to use the ext or fixext types
-                const bool use_ext = j.m_value.binary->has_subtype();
-
-                // step 1: write control byte and the byte string length
-                const auto N = j.m_value.binary->size();
-                if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    std::uint8_t output_type{};
-                    bool fixed = true;
-                    if (use_ext)
-                    {
-                        switch (N)
-                        {
-                            case 1:
-                                output_type = 0xD4; // fixext 1
-                                break;
-                            case 2:
-                                output_type = 0xD5; // fixext 2
-                                break;
-                            case 4:
-                                output_type = 0xD6; // fixext 4
-                                break;
-                            case 8:
-                                output_type = 0xD7; // fixext 8
-                                break;
-                            case 16:
-                                output_type = 0xD8; // fixext 16
-                                break;
-                            default:
-                                output_type = 0xC7; // ext 8
-                                fixed = false;
-                                break;
-                        }
-
-                    }
-                    else
-                    {
-                        output_type = 0xC4; // bin 8
-                        fixed = false;
-                    }
-
-                    oa->write_character(to_char_type(output_type));
-                    if (!fixed)
-                    {
-                        write_number(static_cast<std::uint8_t>(N));
-                    }
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC8 // ext 16
-                                               : 0xC5; // bin 16
-
-                    oa->write_character(to_char_type(output_type));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC9 // ext 32
-                                               : 0xC6; // bin 32
-
-                    oa->write_character(to_char_type(output_type));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 1.5: if this is an ext type, write the subtype
-                if (use_ext)
-                {
-                    write_number(static_cast<std::int8_t>(j.m_value.binary->subtype()));
-                }
-
-                // step 2: write the byte string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                    N);
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
-                if (N <= 15)
-                {
-                    // fixmap
-                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // map 16
-                    oa->write_character(to_char_type(0xDE));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // map 32
-                    oa->write_character(to_char_type(0xDF));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_msgpack(el.first);
-                    write_msgpack(el.second);
-                }
-                break;
-            }
-
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    @param[in] use_count   whether to use '#' prefixes (optimized format)
-    @param[in] use_type    whether to use '$' prefixes (optimized format)
-    @param[in] add_prefix  whether prefixes need to be used for this value
-    @param[in] use_bjdata  whether write in BJData format, default is false
-    */
-    void write_ubjson(const BasicJsonType& j, const bool use_count,
-                      const bool use_type, const bool add_prefix = true,
-                      const bool use_bjdata = false)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('Z'));
-                }
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(j.m_value.boolean
-                                        ? to_char_type('T')
-                                        : to_char_type('F'));
-                }
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix, use_bjdata);
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix, use_bjdata);
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix, use_bjdata);
-                break;
-            }
-
-            case value_t::string:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('S'));
-                }
-                write_number_with_ubjson_prefix(j.m_value.string->size(), true, use_bjdata);
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('['));
-                }
-
-                bool prefix_required = true;
-                if (use_type && !j.m_value.array->empty())
-                {
-                    JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
-                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
-                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
-                    {
-                        return ubjson_prefix(v, use_bjdata) == first_prefix;
-                    });
-
-                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
-
-                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
-                    {
-                        prefix_required = false;
-                        oa->write_character(to_char_type('$'));
-                        oa->write_character(first_prefix);
-                    }
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.array->size(), true, use_bjdata);
-                }
-
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_ubjson(el, use_count, use_type, prefix_required, use_bjdata);
-                }
-
-                if (!use_count)
-                {
-                    oa->write_character(to_char_type(']'));
-                }
-
-                break;
-            }
-
-            case value_t::binary:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('['));
-                }
-
-                if (use_type && !j.m_value.binary->empty())
-                {
-                    JSON_ASSERT(use_count);
-                    oa->write_character(to_char_type('$'));
-                    oa->write_character('U');
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.binary->size(), true, use_bjdata);
-                }
-
-                if (use_type)
-                {
-                    oa->write_characters(
-                        reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                        j.m_value.binary->size());
-                }
-                else
-                {
-                    for (size_t i = 0; i < j.m_value.binary->size(); ++i)
-                    {
-                        oa->write_character(to_char_type('U'));
-                        oa->write_character(j.m_value.binary->data()[i]);
-                    }
-                }
-
-                if (!use_count)
-                {
-                    oa->write_character(to_char_type(']'));
-                }
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                if (use_bjdata && j.m_value.object->size() == 3 && j.m_value.object->find("_ArrayType_") != j.m_value.object->end() && j.m_value.object->find("_ArraySize_") != j.m_value.object->end() && j.m_value.object->find("_ArrayData_") != j.m_value.object->end())
-                {
-                    if (!write_bjdata_ndarray(*j.m_value.object, use_count, use_type))  // decode bjdata ndarray in the JData format (https://github.com/NeuroJSON/jdata)
-                    {
-                        break;
-                    }
-                }
-
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('{'));
-                }
-
-                bool prefix_required = true;
-                if (use_type && !j.m_value.object->empty())
-                {
-                    JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
-                    const bool same_prefix = std::all_of(j.begin(), j.end(),
-                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
-                    {
-                        return ubjson_prefix(v, use_bjdata) == first_prefix;
-                    });
-
-                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
-
-                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
-                    {
-                        prefix_required = false;
-                        oa->write_character(to_char_type('$'));
-                        oa->write_character(first_prefix);
-                    }
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.object->size(), true, use_bjdata);
-                }
-
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_number_with_ubjson_prefix(el.first.size(), true, use_bjdata);
-                    oa->write_characters(
-                        reinterpret_cast<const CharType*>(el.first.c_str()),
-                        el.first.size());
-                    write_ubjson(el.second, use_count, use_type, prefix_required, use_bjdata);
-                }
-
-                if (!use_count)
-                {
-                    oa->write_character(to_char_type('}'));
-                }
-
-                break;
-            }
-
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-  private:
-    //////////
-    // BSON //
-    //////////
-
-    /*!
-    @return The size of a BSON document entry header, including the id marker
-            and the entry name size (and its null-terminator).
-    */
-    static std::size_t calc_bson_entry_header_size(const string_t& name, const BasicJsonType& j)
-    {
-        const auto it = name.find(static_cast<typename string_t::value_type>(0));
-        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
-        {
-            JSON_THROW(out_of_range::create(409, concat("BSON key cannot contain code point U+0000 (at byte ", std::to_string(it), ")"), &j));
-            static_cast<void>(j);
-        }
-
-        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
-    }
-
-    /*!
-    @brief Writes the given @a element_type and @a name to the output adapter
-    */
-    void write_bson_entry_header(const string_t& name,
-                                 const std::uint8_t element_type)
-    {
-        oa->write_character(to_char_type(element_type)); // boolean
-        oa->write_characters(
-            reinterpret_cast<const CharType*>(name.c_str()),
-            name.size() + 1u);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and boolean value @a value
-    */
-    void write_bson_boolean(const string_t& name,
-                            const bool value)
-    {
-        write_bson_entry_header(name, 0x08);
-        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and double value @a value
-    */
-    void write_bson_double(const string_t& name,
-                           const double value)
-    {
-        write_bson_entry_header(name, 0x01);
-        write_number<double>(value, true);
-    }
-
-    /*!
-    @return The size of the BSON-encoded string in @a value
-    */
-    static std::size_t calc_bson_string_size(const string_t& value)
-    {
-        return sizeof(std::int32_t) + value.size() + 1ul;
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and string value @a value
-    */
-    void write_bson_string(const string_t& name,
-                           const string_t& value)
-    {
-        write_bson_entry_header(name, 0x02);
-
-        write_number<std::int32_t>(static_cast<std::int32_t>(value.size() + 1ul), true);
-        oa->write_characters(
-            reinterpret_cast<const CharType*>(value.c_str()),
-            value.size() + 1);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and null value
-    */
-    void write_bson_null(const string_t& name)
-    {
-        write_bson_entry_header(name, 0x0A);
-    }
-
-    /*!
-    @return The size of the BSON-encoded integer @a value
-    */
-    static std::size_t calc_bson_integer_size(const std::int64_t value)
-    {
-        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
-               ? sizeof(std::int32_t)
-               : sizeof(std::int64_t);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and integer @a value
-    */
-    void write_bson_integer(const string_t& name,
-                            const std::int64_t value)
-    {
-        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
-        {
-            write_bson_entry_header(name, 0x10); // int32
-            write_number<std::int32_t>(static_cast<std::int32_t>(value), true);
-        }
-        else
-        {
-            write_bson_entry_header(name, 0x12); // int64
-            write_number<std::int64_t>(static_cast<std::int64_t>(value), true);
-        }
-    }
-
-    /*!
-    @return The size of the BSON-encoded unsigned integer in @a j
-    */
-    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
-    {
-        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-               ? sizeof(std::int32_t)
-               : sizeof(std::int64_t);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and unsigned @a value
-    */
-    void write_bson_unsigned(const string_t& name,
-                             const BasicJsonType& j)
-    {
-        if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-        {
-            write_bson_entry_header(name, 0x10 /* int32 */);
-            write_number<std::int32_t>(static_cast<std::int32_t>(j.m_value.number_unsigned), true);
-        }
-        else if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-        {
-            write_bson_entry_header(name, 0x12 /* int64 */);
-            write_number<std::int64_t>(static_cast<std::int64_t>(j.m_value.number_unsigned), true);
-        }
-        else
-        {
-            JSON_THROW(out_of_range::create(407, concat("integer number ", std::to_string(j.m_value.number_unsigned), " cannot be represented by BSON as it does not fit int64"), &j));
-        }
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and object @a value
-    */
-    void write_bson_object_entry(const string_t& name,
-                                 const typename BasicJsonType::object_t& value)
-    {
-        write_bson_entry_header(name, 0x03); // object
-        write_bson_object(value);
-    }
-
-    /*!
-    @return The size of the BSON-encoded array @a value
-    */
-    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
-    {
-        std::size_t array_index = 0ul;
-
-        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), static_cast<std::size_t>(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
-        {
-            return result + calc_bson_element_size(std::to_string(array_index++), el);
-        });
-
-        return sizeof(std::int32_t) + embedded_document_size + 1ul;
-    }
-
-    /*!
-    @return The size of the BSON-encoded binary array @a value
-    */
-    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
-    {
-        return sizeof(std::int32_t) + value.size() + 1ul;
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and array @a value
-    */
-    void write_bson_array(const string_t& name,
-                          const typename BasicJsonType::array_t& value)
-    {
-        write_bson_entry_header(name, 0x04); // array
-        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_array_size(value)), true);
-
-        std::size_t array_index = 0ul;
-
-        for (const auto& el : value)
-        {
-            write_bson_element(std::to_string(array_index++), el);
-        }
-
-        oa->write_character(to_char_type(0x00));
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and binary value @a value
-    */
-    void write_bson_binary(const string_t& name,
-                           const binary_t& value)
-    {
-        write_bson_entry_header(name, 0x05);
-
-        write_number<std::int32_t>(static_cast<std::int32_t>(value.size()), true);
-        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : static_cast<std::uint8_t>(0x00));
-
-        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
-    }
-
-    /*!
-    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
-    @return The calculated size for the BSON document entry for @a j with the given @a name.
-    */
-    static std::size_t calc_bson_element_size(const string_t& name,
-            const BasicJsonType& j)
-    {
-        const auto header_size = calc_bson_entry_header_size(name, j);
-        switch (j.type())
-        {
-            case value_t::object:
-                return header_size + calc_bson_object_size(*j.m_value.object);
-
-            case value_t::array:
-                return header_size + calc_bson_array_size(*j.m_value.array);
-
-            case value_t::binary:
-                return header_size + calc_bson_binary_size(*j.m_value.binary);
-
-            case value_t::boolean:
-                return header_size + 1ul;
-
-            case value_t::number_float:
-                return header_size + 8ul;
-
-            case value_t::number_integer:
-                return header_size + calc_bson_integer_size(j.m_value.number_integer);
-
-            case value_t::number_unsigned:
-                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
-
-            case value_t::string:
-                return header_size + calc_bson_string_size(*j.m_value.string);
-
-            case value_t::null:
-                return header_size + 0ul;
-
-            // LCOV_EXCL_START
-            case value_t::discarded:
-            default:
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
-                return 0ul;
-                // LCOV_EXCL_STOP
-        }
-    }
-
-    /*!
-    @brief Serializes the JSON value @a j to BSON and associates it with the
-           key @a name.
-    @param name The name to associate with the JSON entity @a j within the
-                current BSON document
-    */
-    void write_bson_element(const string_t& name,
-                            const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::object:
-                return write_bson_object_entry(name, *j.m_value.object);
-
-            case value_t::array:
-                return write_bson_array(name, *j.m_value.array);
-
-            case value_t::binary:
-                return write_bson_binary(name, *j.m_value.binary);
-
-            case value_t::boolean:
-                return write_bson_boolean(name, j.m_value.boolean);
-
-            case value_t::number_float:
-                return write_bson_double(name, j.m_value.number_float);
-
-            case value_t::number_integer:
-                return write_bson_integer(name, j.m_value.number_integer);
-
-            case value_t::number_unsigned:
-                return write_bson_unsigned(name, j);
-
-            case value_t::string:
-                return write_bson_string(name, *j.m_value.string);
-
-            case value_t::null:
-                return write_bson_null(name);
-
-            // LCOV_EXCL_START
-            case value_t::discarded:
-            default:
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
-                return;
-                // LCOV_EXCL_STOP
-        }
-    }
-
-    /*!
-    @brief Calculates the size of the BSON serialization of the given
-           JSON-object @a j.
-    @param[in] value  JSON value to serialize
-    @pre       value.type() == value_t::object
-    */
-    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
-    {
-        std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast<std::size_t>(0),
-                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
-        {
-            return result += calc_bson_element_size(el.first, el.second);
-        });
-
-        return sizeof(std::int32_t) + document_size + 1ul;
-    }
-
-    /*!
-    @param[in] value  JSON value to serialize
-    @pre       value.type() == value_t::object
-    */
-    void write_bson_object(const typename BasicJsonType::object_t& value)
-    {
-        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_object_size(value)), true);
-
-        for (const auto& el : value)
-        {
-            write_bson_element(el.first, el.second);
-        }
-
-        oa->write_character(to_char_type(0x00));
-    }
-
-    //////////
-    // CBOR //
-    //////////
-
-    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
-    {
-        return to_char_type(0xFA);  // Single-Precision Float
-    }
-
-    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
-    {
-        return to_char_type(0xFB);  // Double-Precision Float
-    }
-
-    /////////////
-    // MsgPack //
-    /////////////
-
-    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
-    {
-        return to_char_type(0xCA);  // float 32
-    }
-
-    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
-    {
-        return to_char_type(0xCB);  // float 64
-    }
-
-    ////////////
-    // UBJSON //
-    ////////////
-
-    // UBJSON: write number (floating point)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_floating_point<NumberType>::value, int>::type = 0>
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix,
-                                         const bool use_bjdata)
-    {
-        if (add_prefix)
-        {
-            oa->write_character(get_ubjson_float_prefix(n));
-        }
-        write_number(n, use_bjdata);
-    }
-
-    // UBJSON: write number (unsigned integer)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_unsigned<NumberType>::value, int>::type = 0>
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix,
-                                         const bool use_bjdata)
-    {
-        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('i'));  // int8
-            }
-            write_number(static_cast<std::uint8_t>(n), use_bjdata);
-        }
-        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('U'));  // uint8
-            }
-            write_number(static_cast<std::uint8_t>(n), use_bjdata);
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('I'));  // int16
-            }
-            write_number(static_cast<std::int16_t>(n), use_bjdata);
-        }
-        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint16_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
-            }
-            write_number(static_cast<std::uint16_t>(n), use_bjdata);
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('l'));  // int32
-            }
-            write_number(static_cast<std::int32_t>(n), use_bjdata);
-        }
-        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint32_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
-            }
-            write_number(static_cast<std::uint32_t>(n), use_bjdata);
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('L'));  // int64
-            }
-            write_number(static_cast<std::int64_t>(n), use_bjdata);
-        }
-        else if (use_bjdata && n <= (std::numeric_limits<uint64_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('M'));  // uint64 - bjdata only
-            }
-            write_number(static_cast<std::uint64_t>(n), use_bjdata);
-        }
-        else
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('H'));  // high-precision number
-            }
-
-            const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
-            for (std::size_t i = 0; i < number.size(); ++i)
-            {
-                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
-            }
-        }
-    }
-
-    // UBJSON: write number (signed integer)
-    template < typename NumberType, typename std::enable_if <
-                   std::is_signed<NumberType>::value&&
-                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix,
-                                         const bool use_bjdata)
-    {
-        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('i'));  // int8
-            }
-            write_number(static_cast<std::int8_t>(n), use_bjdata);
-        }
-        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('U'));  // uint8
-            }
-            write_number(static_cast<std::uint8_t>(n), use_bjdata);
-        }
-        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('I'));  // int16
-            }
-            write_number(static_cast<std::int16_t>(n), use_bjdata);
-        }
-        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::max)())))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
-            }
-            write_number(static_cast<uint16_t>(n), use_bjdata);
-        }
-        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('l'));  // int32
-            }
-            write_number(static_cast<std::int32_t>(n), use_bjdata);
-        }
-        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::max)())))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
-            }
-            write_number(static_cast<uint32_t>(n), use_bjdata);
-        }
-        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('L'));  // int64
-            }
-            write_number(static_cast<std::int64_t>(n), use_bjdata);
-        }
-        // LCOV_EXCL_START
-        else
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('H'));  // high-precision number
-            }
-
-            const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
-            for (std::size_t i = 0; i < number.size(); ++i)
-            {
-                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
-            }
-        }
-        // LCOV_EXCL_STOP
-    }
-
-    /*!
-    @brief determine the type prefix of container values
-    */
-    CharType ubjson_prefix(const BasicJsonType& j, const bool use_bjdata) const noexcept
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-                return 'Z';
-
-            case value_t::boolean:
-                return j.m_value.boolean ? 'T' : 'F';
-
-            case value_t::number_integer:
-            {
-                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
-                {
-                    return 'i';
-                }
-                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    return 'U';
-                }
-                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
-                {
-                    return 'I';
-                }
-                if (use_bjdata && ((std::numeric_limits<std::uint16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)()))
-                {
-                    return 'u';
-                }
-                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
-                {
-                    return 'l';
-                }
-                if (use_bjdata && ((std::numeric_limits<std::uint32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)()))
-                {
-                    return 'm';
-                }
-                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
-                {
-                    return 'L';
-                }
-                // anything else is treated as high-precision number
-                return 'H'; // LCOV_EXCL_LINE
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
-                {
-                    return 'i';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
-                {
-                    return 'U';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
-                {
-                    return 'I';
-                }
-                if (use_bjdata && j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint16_t>::max)()))
-                {
-                    return 'u';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-                {
-                    return 'l';
-                }
-                if (use_bjdata && j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint32_t>::max)()))
-                {
-                    return 'm';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-                {
-                    return 'L';
-                }
-                if (use_bjdata && j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    return 'M';
-                }
-                // anything else is treated as high-precision number
-                return 'H'; // LCOV_EXCL_LINE
-            }
-
-            case value_t::number_float:
-                return get_ubjson_float_prefix(j.m_value.number_float);
-
-            case value_t::string:
-                return 'S';
-
-            case value_t::array: // fallthrough
-            case value_t::binary:
-                return '[';
-
-            case value_t::object:
-                return '{';
-
-            case value_t::discarded:
-            default:  // discarded values
-                return 'N';
-        }
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
-    {
-        return 'd';  // float 32
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
-    {
-        return 'D';  // float 64
-    }
-
-    /*!
-    @return false if the object is successfully converted to a bjdata ndarray, true if the type or size is invalid
-    */
-    bool write_bjdata_ndarray(const typename BasicJsonType::object_t& value, const bool use_count, const bool use_type)
-    {
-        std::map<string_t, CharType> bjdtype = {{"uint8", 'U'},  {"int8", 'i'},  {"uint16", 'u'}, {"int16", 'I'},
-            {"uint32", 'm'}, {"int32", 'l'}, {"uint64", 'M'}, {"int64", 'L'}, {"single", 'd'}, {"double", 'D'}, {"char", 'C'}
-        };
-
-        string_t key = "_ArrayType_";
-        auto it = bjdtype.find(static_cast<string_t>(value.at(key)));
-        if (it == bjdtype.end())
-        {
-            return true;
-        }
-        CharType dtype = it->second;
-
-        key = "_ArraySize_";
-        std::size_t len = (value.at(key).empty() ? 0 : 1);
-        for (const auto& el : value.at(key))
-        {
-            len *= static_cast<std::size_t>(el.m_value.number_unsigned);
-        }
-
-        key = "_ArrayData_";
-        if (value.at(key).size() != len)
-        {
-            return true;
-        }
-
-        oa->write_character('[');
-        oa->write_character('$');
-        oa->write_character(dtype);
-        oa->write_character('#');
-
-        key = "_ArraySize_";
-        write_ubjson(value.at(key), use_count, use_type, true,  true);
-
-        key = "_ArrayData_";
-        if (dtype == 'U' || dtype == 'C')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<std::uint8_t>(el.m_value.number_unsigned), true);
-            }
-        }
-        else if (dtype == 'i')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<std::int8_t>(el.m_value.number_integer), true);
-            }
-        }
-        else if (dtype == 'u')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<std::uint16_t>(el.m_value.number_unsigned), true);
-            }
-        }
-        else if (dtype == 'I')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<std::int16_t>(el.m_value.number_integer), true);
-            }
-        }
-        else if (dtype == 'm')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<std::uint32_t>(el.m_value.number_unsigned), true);
-            }
-        }
-        else if (dtype == 'l')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<std::int32_t>(el.m_value.number_integer), true);
-            }
-        }
-        else if (dtype == 'M')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<std::uint64_t>(el.m_value.number_unsigned), true);
-            }
-        }
-        else if (dtype == 'L')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<std::int64_t>(el.m_value.number_integer), true);
-            }
-        }
-        else if (dtype == 'd')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<float>(el.m_value.number_float), true);
-            }
-        }
-        else if (dtype == 'D')
-        {
-            for (const auto& el : value.at(key))
-            {
-                write_number(static_cast<double>(el.m_value.number_float), true);
-            }
-        }
-        return false;
-    }
-
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-
-    /*
-    @brief write a number to output input
-    @param[in] n number of type @a NumberType
-    @param[in] OutputIsLittleEndian Set to true if output data is
-                                 required to be little endian
-    @tparam NumberType the type of the number
-
-    @note This function needs to respect the system's endianness, because bytes
-          in CBOR, MessagePack, and UBJSON are stored in network order (big
-          endian) and therefore need reordering on little endian systems.
-          On the other hand, BSON and BJData use little endian and should reorder
-          on big endian systems.
-    */
-    template<typename NumberType>
-    void write_number(const NumberType n, const bool OutputIsLittleEndian = false)
-    {
-        // step 1: write number to array of length NumberType
-        std::array<CharType, sizeof(NumberType)> vec{};
-        std::memcpy(vec.data(), &n, sizeof(NumberType));
-
-        // step 2: write array to output (with possible reordering)
-        if (is_little_endian != OutputIsLittleEndian)
-        {
-            // reverse byte order prior to conversion if necessary
-            std::reverse(vec.begin(), vec.end());
-        }
-
-        oa->write_characters(vec.data(), sizeof(NumberType));
-    }
-
-    void write_compact_float(const number_float_t n, detail::input_format_t format)
-    {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
-                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
-                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
-        {
-            oa->write_character(format == detail::input_format_t::cbor
-                                ? get_cbor_float_prefix(static_cast<float>(n))
-                                : get_msgpack_float_prefix(static_cast<float>(n)));
-            write_number(static_cast<float>(n));
-        }
-        else
-        {
-            oa->write_character(format == detail::input_format_t::cbor
-                                ? get_cbor_float_prefix(n)
-                                : get_msgpack_float_prefix(n));
-            write_number(n);
-        }
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-    }
-
-  public:
-    // The following to_char_type functions are implement the conversion
-    // between uint8_t and CharType. In case CharType is not unsigned,
-    // such a conversion is required to allow values greater than 128.
-    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
-    template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
-    static constexpr CharType to_char_type(std::uint8_t x) noexcept
-    {
-        return *reinterpret_cast<char*>(&x);
-    }
-
-    template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
-    static CharType to_char_type(std::uint8_t x) noexcept
-    {
-        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
-        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
-        CharType result;
-        std::memcpy(&result, &x, sizeof(x));
-        return result;
-    }
-
-    template<typename C = CharType,
-             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
-    static constexpr CharType to_char_type(std::uint8_t x) noexcept
-    {
-        return x;
-    }
-
-    template < typename InputCharType, typename C = CharType,
-               enable_if_t <
-                   std::is_signed<C>::value &&
-                   std::is_signed<char>::value &&
-                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
-                   > * = nullptr >
-    static constexpr CharType to_char_type(InputCharType x) noexcept
-    {
-        return x;
-    }
-
-  private:
-    /// whether we can assume little endianness
-    const bool is_little_endian = little_endianness();
-
-    /// the output
-    output_adapter_t<CharType> oa = nullptr;
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-// #include <nlohmann/detail/output/serializer.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2008-2009 Björn Hoehrmann <bjoern@hoehrmann.de>
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <algorithm> // reverse, remove, fill, find, none_of
-#include <array> // array
-#include <clocale> // localeconv, lconv
-#include <cmath> // labs, isfinite, isnan, signbit
-#include <cstddef> // size_t, ptrdiff_t
-#include <cstdint> // uint8_t
-#include <cstdio> // snprintf
-#include <limits> // numeric_limits
-#include <string> // string, char_traits
-#include <iomanip> // setfill, setw
-#include <type_traits> // is_same
-#include <utility> // move
-
-// #include <nlohmann/detail/conversions/to_chars.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <array> // array
-#include <cmath>   // signbit, isfinite
-#include <cstdint> // intN_t, uintN_t
-#include <cstring> // memcpy, memmove
-#include <limits> // numeric_limits
-#include <type_traits> // conditional
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-/*!
-@brief implements the Grisu2 algorithm for binary to decimal floating-point
-conversion.
-
-This implementation is a slightly modified version of the reference
-implementation which may be obtained from
-http://florian.loitsch.com/publications (bench.tar.gz).
-
-The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
-
-For a detailed description of the algorithm see:
-
-[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
-    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
-    Language Design and Implementation, PLDI 2010
-[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
-    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
-    Design and Implementation, PLDI 1996
-*/
-namespace dtoa_impl
-{
-
-template<typename Target, typename Source>
-Target reinterpret_bits(const Source source)
-{
-    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
-
-    Target target;
-    std::memcpy(&target, &source, sizeof(Source));
-    return target;
-}
-
-struct diyfp // f * 2^e
-{
-    static constexpr int kPrecision = 64; // = q
-
-    std::uint64_t f = 0;
-    int e = 0;
-
-    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
-
-    /*!
-    @brief returns x - y
-    @pre x.e == y.e and x.f >= y.f
-    */
-    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
-    {
-        JSON_ASSERT(x.e == y.e);
-        JSON_ASSERT(x.f >= y.f);
-
-        return {x.f - y.f, x.e};
-    }
-
-    /*!
-    @brief returns x * y
-    @note The result is rounded. (Only the upper q bits are returned.)
-    */
-    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
-    {
-        static_assert(kPrecision == 64, "internal error");
-
-        // Computes:
-        //  f = round((x.f * y.f) / 2^q)
-        //  e = x.e + y.e + q
-
-        // Emulate the 64-bit * 64-bit multiplication:
-        //
-        // p = u * v
-        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
-        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
-        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
-        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
-        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
-        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
-        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
-        //
-        // (Since Q might be larger than 2^32 - 1)
-        //
-        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
-        //
-        // (Q_hi + H does not overflow a 64-bit int)
-        //
-        //   = p_lo + 2^64 p_hi
-
-        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
-        const std::uint64_t u_hi = x.f >> 32u;
-        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
-        const std::uint64_t v_hi = y.f >> 32u;
-
-        const std::uint64_t p0 = u_lo * v_lo;
-        const std::uint64_t p1 = u_lo * v_hi;
-        const std::uint64_t p2 = u_hi * v_lo;
-        const std::uint64_t p3 = u_hi * v_hi;
-
-        const std::uint64_t p0_hi = p0 >> 32u;
-        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
-        const std::uint64_t p1_hi = p1 >> 32u;
-        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
-        const std::uint64_t p2_hi = p2 >> 32u;
-
-        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
-
-        // The full product might now be computed as
-        //
-        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
-        // p_lo = p0_lo + (Q << 32)
-        //
-        // But in this particular case here, the full p_lo is not required.
-        // Effectively we only need to add the highest bit in p_lo to p_hi (and
-        // Q_hi + 1 does not overflow).
-
-        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
-
-        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
-
-        return {h, x.e + y.e + 64};
-    }
-
-    /*!
-    @brief normalize x such that the significand is >= 2^(q-1)
-    @pre x.f != 0
-    */
-    static diyfp normalize(diyfp x) noexcept
-    {
-        JSON_ASSERT(x.f != 0);
-
-        while ((x.f >> 63u) == 0)
-        {
-            x.f <<= 1u;
-            x.e--;
-        }
-
-        return x;
-    }
-
-    /*!
-    @brief normalize x such that the result has the exponent E
-    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
-    */
-    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
-    {
-        const int delta = x.e - target_exponent;
-
-        JSON_ASSERT(delta >= 0);
-        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
-
-        return {x.f << delta, target_exponent};
-    }
-};
-
-struct boundaries
-{
-    diyfp w;
-    diyfp minus;
-    diyfp plus;
-};
-
-/*!
-Compute the (normalized) diyfp representing the input number 'value' and its
-boundaries.
-
-@pre value must be finite and positive
-*/
-template<typename FloatType>
-boundaries compute_boundaries(FloatType value)
-{
-    JSON_ASSERT(std::isfinite(value));
-    JSON_ASSERT(value > 0);
-
-    // Convert the IEEE representation into a diyfp.
-    //
-    // If v is denormal:
-    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
-    // If v is normalized:
-    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
-
-    static_assert(std::numeric_limits<FloatType>::is_iec559,
-                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
-
-    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
-    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
-    constexpr int      kMinExp    = 1 - kBias;
-    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
-
-    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
-
-    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
-    const std::uint64_t E = bits >> (kPrecision - 1);
-    const std::uint64_t F = bits & (kHiddenBit - 1);
-
-    const bool is_denormal = E == 0;
-    const diyfp v = is_denormal
-                    ? diyfp(F, kMinExp)
-                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
-
-    // Compute the boundaries m- and m+ of the floating-point value
-    // v = f * 2^e.
-    //
-    // Determine v- and v+, the floating-point predecessor and successor if v,
-    // respectively.
-    //
-    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
-    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
-    //
-    //      v+ = v + 2^e
-    //
-    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
-    // between m- and m+ round to v, regardless of how the input rounding
-    // algorithm breaks ties.
-    //
-    //      ---+-------------+-------------+-------------+-------------+---  (A)
-    //         v-            m-            v             m+            v+
-    //
-    //      -----------------+------+------+-------------+-------------+---  (B)
-    //                       v-     m-     v             m+            v+
-
-    const bool lower_boundary_is_closer = F == 0 && E > 1;
-    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
-    const diyfp m_minus = lower_boundary_is_closer
-                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
-                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
-
-    // Determine the normalized w+ = m+.
-    const diyfp w_plus = diyfp::normalize(m_plus);
-
-    // Determine w- = m- such that e_(w-) = e_(w+).
-    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
-
-    return {diyfp::normalize(v), w_minus, w_plus};
-}
-
-// Given normalized diyfp w, Grisu needs to find a (normalized) cached
-// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
-// within a certain range [alpha, gamma] (Definition 3.2 from [1])
-//
-//      alpha <= e = e_c + e_w + q <= gamma
-//
-// or
-//
-//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
-//                          <= f_c * f_w * 2^gamma
-//
-// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
-//
-//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
-//
-// or
-//
-//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
-//
-// The choice of (alpha,gamma) determines the size of the table and the form of
-// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
-// in practice:
-//
-// The idea is to cut the number c * w = f * 2^e into two parts, which can be
-// processed independently: An integral part p1, and a fractional part p2:
-//
-//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
-//              = (f div 2^-e) + (f mod 2^-e) * 2^e
-//              = p1 + p2 * 2^e
-//
-// The conversion of p1 into decimal form requires a series of divisions and
-// modulos by (a power of) 10. These operations are faster for 32-bit than for
-// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
-// achieved by choosing
-//
-//      -e >= 32   or   e <= -32 := gamma
-//
-// In order to convert the fractional part
-//
-//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
-//
-// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
-// d[-i] are extracted in order:
-//
-//      (10 * p2) div 2^-e = d[-1]
-//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
-//
-// The multiplication by 10 must not overflow. It is sufficient to choose
-//
-//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
-//
-// Since p2 = f mod 2^-e < 2^-e,
-//
-//      -e <= 60   or   e >= -60 := alpha
-
-constexpr int kAlpha = -60;
-constexpr int kGamma = -32;
-
-struct cached_power // c = f * 2^e ~= 10^k
-{
-    std::uint64_t f;
-    int e;
-    int k;
-};
-
-/*!
-For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
-power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
-satisfies (Definition 3.2 from [1])
-
-     alpha <= e_c + e + q <= gamma.
-*/
-inline cached_power get_cached_power_for_binary_exponent(int e)
-{
-    // Now
-    //
-    //      alpha <= e_c + e + q <= gamma                                    (1)
-    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
-    //
-    // and since the c's are normalized, 2^(q-1) <= f_c,
-    //
-    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
-    //      ==> 2^(alpha - e - 1) <= c
-    //
-    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
-    //
-    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
-    //        = ceil( (alpha - e - 1) * log_10(2) )
-    //
-    // From the paper:
-    // "In theory the result of the procedure could be wrong since c is rounded,
-    //  and the computation itself is approximated [...]. In practice, however,
-    //  this simple function is sufficient."
-    //
-    // For IEEE double precision floating-point numbers converted into
-    // normalized diyfp's w = f * 2^e, with q = 64,
-    //
-    //      e >= -1022      (min IEEE exponent)
-    //           -52        (p - 1)
-    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
-    //           -11        (normalize the diyfp)
-    //         = -1137
-    //
-    // and
-    //
-    //      e <= +1023      (max IEEE exponent)
-    //           -52        (p - 1)
-    //           -11        (normalize the diyfp)
-    //         = 960
-    //
-    // This binary exponent range [-1137,960] results in a decimal exponent
-    // range [-307,324]. One does not need to store a cached power for each
-    // k in this range. For each such k it suffices to find a cached power
-    // such that the exponent of the product lies in [alpha,gamma].
-    // This implies that the difference of the decimal exponents of adjacent
-    // table entries must be less than or equal to
-    //
-    //      floor( (gamma - alpha) * log_10(2) ) = 8.
-    //
-    // (A smaller distance gamma-alpha would require a larger table.)
-
-    // NB:
-    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
-
-    constexpr int kCachedPowersMinDecExp = -300;
-    constexpr int kCachedPowersDecStep = 8;
-
-    static constexpr std::array<cached_power, 79> kCachedPowers =
-    {
-        {
-            { 0xAB70FE17C79AC6CA, -1060, -300 },
-            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
-            { 0xBE5691EF416BD60C, -1007, -284 },
-            { 0x8DD01FAD907FFC3C,  -980, -276 },
-            { 0xD3515C2831559A83,  -954, -268 },
-            { 0x9D71AC8FADA6C9B5,  -927, -260 },
-            { 0xEA9C227723EE8BCB,  -901, -252 },
-            { 0xAECC49914078536D,  -874, -244 },
-            { 0x823C12795DB6CE57,  -847, -236 },
-            { 0xC21094364DFB5637,  -821, -228 },
-            { 0x9096EA6F3848984F,  -794, -220 },
-            { 0xD77485CB25823AC7,  -768, -212 },
-            { 0xA086CFCD97BF97F4,  -741, -204 },
-            { 0xEF340A98172AACE5,  -715, -196 },
-            { 0xB23867FB2A35B28E,  -688, -188 },
-            { 0x84C8D4DFD2C63F3B,  -661, -180 },
-            { 0xC5DD44271AD3CDBA,  -635, -172 },
-            { 0x936B9FCEBB25C996,  -608, -164 },
-            { 0xDBAC6C247D62A584,  -582, -156 },
-            { 0xA3AB66580D5FDAF6,  -555, -148 },
-            { 0xF3E2F893DEC3F126,  -529, -140 },
-            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
-            { 0x87625F056C7C4A8B,  -475, -124 },
-            { 0xC9BCFF6034C13053,  -449, -116 },
-            { 0x964E858C91BA2655,  -422, -108 },
-            { 0xDFF9772470297EBD,  -396, -100 },
-            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
-            { 0xF8A95FCF88747D94,  -343,  -84 },
-            { 0xB94470938FA89BCF,  -316,  -76 },
-            { 0x8A08F0F8BF0F156B,  -289,  -68 },
-            { 0xCDB02555653131B6,  -263,  -60 },
-            { 0x993FE2C6D07B7FAC,  -236,  -52 },
-            { 0xE45C10C42A2B3B06,  -210,  -44 },
-            { 0xAA242499697392D3,  -183,  -36 },
-            { 0xFD87B5F28300CA0E,  -157,  -28 },
-            { 0xBCE5086492111AEB,  -130,  -20 },
-            { 0x8CBCCC096F5088CC,  -103,  -12 },
-            { 0xD1B71758E219652C,   -77,   -4 },
-            { 0x9C40000000000000,   -50,    4 },
-            { 0xE8D4A51000000000,   -24,   12 },
-            { 0xAD78EBC5AC620000,     3,   20 },
-            { 0x813F3978F8940984,    30,   28 },
-            { 0xC097CE7BC90715B3,    56,   36 },
-            { 0x8F7E32CE7BEA5C70,    83,   44 },
-            { 0xD5D238A4ABE98068,   109,   52 },
-            { 0x9F4F2726179A2245,   136,   60 },
-            { 0xED63A231D4C4FB27,   162,   68 },
-            { 0xB0DE65388CC8ADA8,   189,   76 },
-            { 0x83C7088E1AAB65DB,   216,   84 },
-            { 0xC45D1DF942711D9A,   242,   92 },
-            { 0x924D692CA61BE758,   269,  100 },
-            { 0xDA01EE641A708DEA,   295,  108 },
-            { 0xA26DA3999AEF774A,   322,  116 },
-            { 0xF209787BB47D6B85,   348,  124 },
-            { 0xB454E4A179DD1877,   375,  132 },
-            { 0x865B86925B9BC5C2,   402,  140 },
-            { 0xC83553C5C8965D3D,   428,  148 },
-            { 0x952AB45CFA97A0B3,   455,  156 },
-            { 0xDE469FBD99A05FE3,   481,  164 },
-            { 0xA59BC234DB398C25,   508,  172 },
-            { 0xF6C69A72A3989F5C,   534,  180 },
-            { 0xB7DCBF5354E9BECE,   561,  188 },
-            { 0x88FCF317F22241E2,   588,  196 },
-            { 0xCC20CE9BD35C78A5,   614,  204 },
-            { 0x98165AF37B2153DF,   641,  212 },
-            { 0xE2A0B5DC971F303A,   667,  220 },
-            { 0xA8D9D1535CE3B396,   694,  228 },
-            { 0xFB9B7CD9A4A7443C,   720,  236 },
-            { 0xBB764C4CA7A44410,   747,  244 },
-            { 0x8BAB8EEFB6409C1A,   774,  252 },
-            { 0xD01FEF10A657842C,   800,  260 },
-            { 0x9B10A4E5E9913129,   827,  268 },
-            { 0xE7109BFBA19C0C9D,   853,  276 },
-            { 0xAC2820D9623BF429,   880,  284 },
-            { 0x80444B5E7AA7CF85,   907,  292 },
-            { 0xBF21E44003ACDD2D,   933,  300 },
-            { 0x8E679C2F5E44FF8F,   960,  308 },
-            { 0xD433179D9C8CB841,   986,  316 },
-            { 0x9E19DB92B4E31BA9,  1013,  324 },
-        }
-    };
-
-    // This computation gives exactly the same results for k as
-    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
-    // for |e| <= 1500, but doesn't require floating-point operations.
-    // NB: log_10(2) ~= 78913 / 2^18
-    JSON_ASSERT(e >= -1500);
-    JSON_ASSERT(e <=  1500);
-    const int f = kAlpha - e - 1;
-    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
-
-    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
-    JSON_ASSERT(index >= 0);
-    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
-
-    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
-    JSON_ASSERT(kAlpha <= cached.e + e + 64);
-    JSON_ASSERT(kGamma >= cached.e + e + 64);
-
-    return cached;
-}
-
-/*!
-For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
-For n == 0, returns 1 and sets pow10 := 1.
-*/
-inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
-{
-    // LCOV_EXCL_START
-    if (n >= 1000000000)
-    {
-        pow10 = 1000000000;
-        return 10;
-    }
-    // LCOV_EXCL_STOP
-    if (n >= 100000000)
-    {
-        pow10 = 100000000;
-        return  9;
-    }
-    if (n >= 10000000)
-    {
-        pow10 = 10000000;
-        return  8;
-    }
-    if (n >= 1000000)
-    {
-        pow10 = 1000000;
-        return  7;
-    }
-    if (n >= 100000)
-    {
-        pow10 = 100000;
-        return  6;
-    }
-    if (n >= 10000)
-    {
-        pow10 = 10000;
-        return  5;
-    }
-    if (n >= 1000)
-    {
-        pow10 = 1000;
-        return  4;
-    }
-    if (n >= 100)
-    {
-        pow10 = 100;
-        return  3;
-    }
-    if (n >= 10)
-    {
-        pow10 = 10;
-        return  2;
-    }
-
-    pow10 = 1;
-    return 1;
-}
-
-inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
-                         std::uint64_t rest, std::uint64_t ten_k)
-{
-    JSON_ASSERT(len >= 1);
-    JSON_ASSERT(dist <= delta);
-    JSON_ASSERT(rest <= delta);
-    JSON_ASSERT(ten_k > 0);
-
-    //               <--------------------------- delta ---->
-    //                                  <---- dist --------->
-    // --------------[------------------+-------------------]--------------
-    //               M-                 w                   M+
-    //
-    //                                  ten_k
-    //                                <------>
-    //                                       <---- rest ---->
-    // --------------[------------------+----+--------------]--------------
-    //                                  w    V
-    //                                       = buf * 10^k
-    //
-    // ten_k represents a unit-in-the-last-place in the decimal representation
-    // stored in buf.
-    // Decrement buf by ten_k while this takes buf closer to w.
-
-    // The tests are written in this order to avoid overflow in unsigned
-    // integer arithmetic.
-
-    while (rest < dist
-            && delta - rest >= ten_k
-            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
-    {
-        JSON_ASSERT(buf[len - 1] != '0');
-        buf[len - 1]--;
-        rest += ten_k;
-    }
-}
-
-/*!
-Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
-M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
-*/
-inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
-                             diyfp M_minus, diyfp w, diyfp M_plus)
-{
-    static_assert(kAlpha >= -60, "internal error");
-    static_assert(kGamma <= -32, "internal error");
-
-    // Generates the digits (and the exponent) of a decimal floating-point
-    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
-    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
-    //
-    //               <--------------------------- delta ---->
-    //                                  <---- dist --------->
-    // --------------[------------------+-------------------]--------------
-    //               M-                 w                   M+
-    //
-    // Grisu2 generates the digits of M+ from left to right and stops as soon as
-    // V is in [M-,M+].
-
-    JSON_ASSERT(M_plus.e >= kAlpha);
-    JSON_ASSERT(M_plus.e <= kGamma);
-
-    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
-    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
-
-    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
-    //
-    //      M+ = f * 2^e
-    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
-    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
-    //         = p1 + p2 * 2^e
-
-    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
-
-    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
-    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
-
-    // 1)
-    //
-    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
-
-    JSON_ASSERT(p1 > 0);
-
-    std::uint32_t pow10{};
-    const int k = find_largest_pow10(p1, pow10);
-
-    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
-    //
-    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
-    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
-    //
-    //      M+ = p1                                             + p2 * 2^e
-    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
-    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
-    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
-    //
-    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
-    //
-    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
-    //
-    // but stop as soon as
-    //
-    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
-
-    int n = k;
-    while (n > 0)
-    {
-        // Invariants:
-        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
-        //      pow10 = 10^(n-1) <= p1 < 10^n
-        //
-        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
-        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
-        //
-        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
-        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
-        //
-        JSON_ASSERT(d <= 9);
-        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
-        //
-        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
-        //
-        p1 = r;
-        n--;
-        //
-        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
-        //      pow10 = 10^n
-        //
-
-        // Now check if enough digits have been generated.
-        // Compute
-        //
-        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
-        //
-        // Note:
-        // Since rest and delta share the same exponent e, it suffices to
-        // compare the significands.
-        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
-        if (rest <= delta)
-        {
-            // V = buffer * 10^n, with M- <= V <= M+.
-
-            decimal_exponent += n;
-
-            // We may now just stop. But instead look if the buffer could be
-            // decremented to bring V closer to w.
-            //
-            // pow10 = 10^n is now 1 ulp in the decimal representation V.
-            // The rounding procedure works with diyfp's with an implicit
-            // exponent of e.
-            //
-            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
-            //
-            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
-            grisu2_round(buffer, length, dist, delta, rest, ten_n);
-
-            return;
-        }
-
-        pow10 /= 10;
-        //
-        //      pow10 = 10^(n-1) <= p1 < 10^n
-        // Invariants restored.
-    }
-
-    // 2)
-    //
-    // The digits of the integral part have been generated:
-    //
-    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
-    //         = buffer            + p2 * 2^e
-    //
-    // Now generate the digits of the fractional part p2 * 2^e.
-    //
-    // Note:
-    // No decimal point is generated: the exponent is adjusted instead.
-    //
-    // p2 actually represents the fraction
-    //
-    //      p2 * 2^e
-    //          = p2 / 2^-e
-    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
-    //
-    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
-    //
-    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
-    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
-    //
-    // using
-    //
-    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
-    //                = (                   d) * 2^-e + (                   r)
-    //
-    // or
-    //      10^m * p2 * 2^e = d + r * 2^e
-    //
-    // i.e.
-    //
-    //      M+ = buffer + p2 * 2^e
-    //         = buffer + 10^-m * (d + r * 2^e)
-    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
-    //
-    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
-
-    JSON_ASSERT(p2 > delta);
-
-    int m = 0;
-    for (;;)
-    {
-        // Invariant:
-        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
-        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
-        //
-        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
-        p2 *= 10;
-        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
-        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
-        //
-        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
-        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
-        //
-        JSON_ASSERT(d <= 9);
-        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
-        //
-        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
-        //
-        p2 = r;
-        m++;
-        //
-        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
-        // Invariant restored.
-
-        // Check if enough digits have been generated.
-        //
-        //      10^-m * p2 * 2^e <= delta * 2^e
-        //              p2 * 2^e <= 10^m * delta * 2^e
-        //                    p2 <= 10^m * delta
-        delta *= 10;
-        dist  *= 10;
-        if (p2 <= delta)
-        {
-            break;
-        }
-    }
-
-    // V = buffer * 10^-m, with M- <= V <= M+.
-
-    decimal_exponent -= m;
-
-    // 1 ulp in the decimal representation is now 10^-m.
-    // Since delta and dist are now scaled by 10^m, we need to do the
-    // same with ulp in order to keep the units in sync.
-    //
-    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
-    //
-    const std::uint64_t ten_m = one.f;
-    grisu2_round(buffer, length, dist, delta, p2, ten_m);
-
-    // By construction this algorithm generates the shortest possible decimal
-    // number (Loitsch, Theorem 6.2) which rounds back to w.
-    // For an input number of precision p, at least
-    //
-    //      N = 1 + ceil(p * log_10(2))
-    //
-    // decimal digits are sufficient to identify all binary floating-point
-    // numbers (Matula, "In-and-Out conversions").
-    // This implies that the algorithm does not produce more than N decimal
-    // digits.
-    //
-    //      N = 17 for p = 53 (IEEE double precision)
-    //      N = 9  for p = 24 (IEEE single precision)
-}
-
-/*!
-v = buf * 10^decimal_exponent
-len is the length of the buffer (number of decimal digits)
-The buffer must be large enough, i.e. >= max_digits10.
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline void grisu2(char* buf, int& len, int& decimal_exponent,
-                   diyfp m_minus, diyfp v, diyfp m_plus)
-{
-    JSON_ASSERT(m_plus.e == m_minus.e);
-    JSON_ASSERT(m_plus.e == v.e);
-
-    //  --------(-----------------------+-----------------------)--------    (A)
-    //          m-                      v                       m+
-    //
-    //  --------------------(-----------+-----------------------)--------    (B)
-    //                      m-          v                       m+
-    //
-    // First scale v (and m- and m+) such that the exponent is in the range
-    // [alpha, gamma].
-
-    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
-
-    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
-
-    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
-    const diyfp w       = diyfp::mul(v,       c_minus_k);
-    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
-    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
-
-    //  ----(---+---)---------------(---+---)---------------(---+---)----
-    //          w-                      w                       w+
-    //          = c*m-                  = c*v                   = c*m+
-    //
-    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
-    // w+ are now off by a small amount.
-    // In fact:
-    //
-    //      w - v * 10^k < 1 ulp
-    //
-    // To account for this inaccuracy, add resp. subtract 1 ulp.
-    //
-    //  --------+---[---------------(---+---)---------------]---+--------
-    //          w-  M-                  w                   M+  w+
-    //
-    // Now any number in [M-, M+] (bounds included) will round to w when input,
-    // regardless of how the input rounding algorithm breaks ties.
-    //
-    // And digit_gen generates the shortest possible such number in [M-, M+].
-    // Note that this does not mean that Grisu2 always generates the shortest
-    // possible number in the interval (m-, m+).
-    const diyfp M_minus(w_minus.f + 1, w_minus.e);
-    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
-
-    decimal_exponent = -cached.k; // = -(-k) = k
-
-    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
-}
-
-/*!
-v = buf * 10^decimal_exponent
-len is the length of the buffer (number of decimal digits)
-The buffer must be large enough, i.e. >= max_digits10.
-*/
-template<typename FloatType>
-JSON_HEDLEY_NON_NULL(1)
-void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
-{
-    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
-                  "internal error: not enough precision");
-
-    JSON_ASSERT(std::isfinite(value));
-    JSON_ASSERT(value > 0);
-
-    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
-    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
-    // decimal representations are not exactly "short".
-    //
-    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
-    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
-    // and since sprintf promotes floats to doubles, I think this is exactly what 'std::to_chars'
-    // does.
-    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
-    // representation using the corresponding std::from_chars function recovers value exactly". That
-    // indicates that single precision floating-point numbers should be recovered using
-    // 'std::strtof'.
-    //
-    // NB: If the neighbors are computed for single-precision numbers, there is a single float
-    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
-    //     value is off by 1 ulp.
-#if 0
-    const boundaries w = compute_boundaries(static_cast<double>(value));
-#else
-    const boundaries w = compute_boundaries(value);
-#endif
-
-    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
-}
-
-/*!
-@brief appends a decimal representation of e to buf
-@return a pointer to the element following the exponent.
-@pre -1000 < e < 1000
-*/
-JSON_HEDLEY_NON_NULL(1)
-JSON_HEDLEY_RETURNS_NON_NULL
-inline char* append_exponent(char* buf, int e)
-{
-    JSON_ASSERT(e > -1000);
-    JSON_ASSERT(e <  1000);
-
-    if (e < 0)
-    {
-        e = -e;
-        *buf++ = '-';
-    }
-    else
-    {
-        *buf++ = '+';
-    }
-
-    auto k = static_cast<std::uint32_t>(e);
-    if (k < 10)
-    {
-        // Always print at least two digits in the exponent.
-        // This is for compatibility with printf("%g").
-        *buf++ = '0';
-        *buf++ = static_cast<char>('0' + k);
-    }
-    else if (k < 100)
-    {
-        *buf++ = static_cast<char>('0' + k / 10);
-        k %= 10;
-        *buf++ = static_cast<char>('0' + k);
-    }
-    else
-    {
-        *buf++ = static_cast<char>('0' + k / 100);
-        k %= 100;
-        *buf++ = static_cast<char>('0' + k / 10);
-        k %= 10;
-        *buf++ = static_cast<char>('0' + k);
-    }
-
-    return buf;
-}
-
-/*!
-@brief prettify v = buf * 10^decimal_exponent
-
-If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
-notation. Otherwise it will be printed in exponential notation.
-
-@pre min_exp < 0
-@pre max_exp > 0
-*/
-JSON_HEDLEY_NON_NULL(1)
-JSON_HEDLEY_RETURNS_NON_NULL
-inline char* format_buffer(char* buf, int len, int decimal_exponent,
-                           int min_exp, int max_exp)
-{
-    JSON_ASSERT(min_exp < 0);
-    JSON_ASSERT(max_exp > 0);
-
-    const int k = len;
-    const int n = len + decimal_exponent;
-
-    // v = buf * 10^(n-k)
-    // k is the length of the buffer (number of decimal digits)
-    // n is the position of the decimal point relative to the start of the buffer.
-
-    if (k <= n && n <= max_exp)
-    {
-        // digits[000]
-        // len <= max_exp + 2
-
-        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
-        // Make it look like a floating-point number (#362, #378)
-        buf[n + 0] = '.';
-        buf[n + 1] = '0';
-        return buf + (static_cast<size_t>(n) + 2);
-    }
-
-    if (0 < n && n <= max_exp)
-    {
-        // dig.its
-        // len <= max_digits10 + 1
-
-        JSON_ASSERT(k > n);
-
-        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
-        buf[n] = '.';
-        return buf + (static_cast<size_t>(k) + 1U);
-    }
-
-    if (min_exp < n && n <= 0)
-    {
-        // 0.[000]digits
-        // len <= 2 + (-min_exp - 1) + max_digits10
-
-        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
-        buf[0] = '0';
-        buf[1] = '.';
-        std::memset(buf + 2, '0', static_cast<size_t>(-n));
-        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
-    }
-
-    if (k == 1)
-    {
-        // dE+123
-        // len <= 1 + 5
-
-        buf += 1;
-    }
-    else
-    {
-        // d.igitsE+123
-        // len <= max_digits10 + 1 + 5
-
-        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
-        buf[1] = '.';
-        buf += 1 + static_cast<size_t>(k);
-    }
-
-    *buf++ = 'e';
-    return append_exponent(buf, n - 1);
-}
-
-}  // namespace dtoa_impl
-
-/*!
-@brief generates a decimal representation of the floating-point number value in [first, last).
-
-The format of the resulting decimal representation is similar to printf's %g
-format. Returns an iterator pointing past-the-end of the decimal representation.
-
-@note The input number must be finite, i.e. NaN's and Inf's are not supported.
-@note The buffer must be large enough.
-@note The result is NOT null-terminated.
-*/
-template<typename FloatType>
-JSON_HEDLEY_NON_NULL(1, 2)
-JSON_HEDLEY_RETURNS_NON_NULL
-char* to_chars(char* first, const char* last, FloatType value)
-{
-    static_cast<void>(last); // maybe unused - fix warning
-    JSON_ASSERT(std::isfinite(value));
-
-    // Use signbit(value) instead of (value < 0) since signbit works for -0.
-    if (std::signbit(value))
-    {
-        value = -value;
-        *first++ = '-';
-    }
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-    if (value == 0) // +-0
-    {
-        *first++ = '0';
-        // Make it look like a floating-point number (#362, #378)
-        *first++ = '.';
-        *first++ = '0';
-        return first;
-    }
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
-
-    // Compute v = buffer * 10^decimal_exponent.
-    // The decimal digits are stored in the buffer, which needs to be interpreted
-    // as an unsigned decimal integer.
-    // len is the length of the buffer, i.e. the number of decimal digits.
-    int len = 0;
-    int decimal_exponent = 0;
-    dtoa_impl::grisu2(first, len, decimal_exponent, value);
-
-    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
-
-    // Format the buffer like printf("%.*g", prec, value)
-    constexpr int kMinExp = -4;
-    // Use digits10 here to increase compatibility with version 2.
-    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
-
-    JSON_ASSERT(last - first >= kMaxExp + 2);
-    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
-    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
-
-    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
-}
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/output/binary_writer.hpp>
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-// #include <nlohmann/detail/string_concat.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-namespace detail
-{
-
-///////////////////
-// serialization //
-///////////////////
-
-/// how to treat decoding errors
-enum class error_handler_t
-{
-    strict,  ///< throw a type_error exception in case of invalid UTF-8
-    replace, ///< replace invalid UTF-8 sequences with U+FFFD
-    ignore   ///< ignore invalid UTF-8 sequences
-};
-
-template<typename BasicJsonType>
-class serializer
-{
-    using string_t = typename BasicJsonType::string_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using binary_char_t = typename BasicJsonType::binary_t::value_type;
-    static constexpr std::uint8_t UTF8_ACCEPT = 0;
-    static constexpr std::uint8_t UTF8_REJECT = 1;
-
-  public:
-    /*!
-    @param[in] s  output stream to serialize to
-    @param[in] ichar  indentation character to use
-    @param[in] error_handler_  how to react on decoding errors
-    */
-    serializer(output_adapter_t<char> s, const char ichar,
-               error_handler_t error_handler_ = error_handler_t::strict)
-        : o(std::move(s))
-        , loc(std::localeconv())
-        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
-        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
-        , indent_char(ichar)
-        , indent_string(512, indent_char)
-        , error_handler(error_handler_)
-    {}
-
-    // delete because of pointer members
-    serializer(const serializer&) = delete;
-    serializer& operator=(const serializer&) = delete;
-    serializer(serializer&&) = delete;
-    serializer& operator=(serializer&&) = delete;
-    ~serializer() = default;
-
-    /*!
-    @brief internal implementation of the serialization function
-
-    This function is called by the public member function dump and organizes
-    the serialization internally. The indentation level is propagated as
-    additional parameter. In case of arrays and objects, the function is
-    called recursively.
-
-    - strings and object keys are escaped using `escape_string()`
-    - integer numbers are converted implicitly via `operator<<`
-    - floating-point numbers are converted to a string using `"%g"` format
-    - binary values are serialized as objects containing the subtype and the
-      byte array
-
-    @param[in] val               value to serialize
-    @param[in] pretty_print      whether the output shall be pretty-printed
-    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
-    in the output are escaped with `\uXXXX` sequences, and the result consists
-    of ASCII characters only.
-    @param[in] indent_step       the indent level
-    @param[in] current_indent    the current indent level (only used internally)
-    */
-    void dump(const BasicJsonType& val,
-              const bool pretty_print,
-              const bool ensure_ascii,
-              const unsigned int indent_step,
-              const unsigned int current_indent = 0)
-    {
-        switch (val.m_type)
-        {
-            case value_t::object:
-            {
-                if (val.m_value.object->empty())
-                {
-                    o->write_characters("{}", 2);
-                    return;
-                }
-
-                if (pretty_print)
-                {
-                    o->write_characters("{\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
-                    {
-                        o->write_characters(indent_string.c_str(), new_indent);
-                        o->write_character('\"');
-                        dump_escaped(i->first, ensure_ascii);
-                        o->write_characters("\": ", 3);
-                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
-                        o->write_characters(",\n", 2);
-                    }
-
-                    // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
-                    o->write_characters(indent_string.c_str(), new_indent);
-                    o->write_character('\"');
-                    dump_escaped(i->first, ensure_ascii);
-                    o->write_characters("\": ", 3);
-                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
-
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character('}');
-                }
-                else
-                {
-                    o->write_character('{');
-
-                    // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
-                    {
-                        o->write_character('\"');
-                        dump_escaped(i->first, ensure_ascii);
-                        o->write_characters("\":", 2);
-                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
-                        o->write_character(',');
-                    }
-
-                    // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
-                    o->write_character('\"');
-                    dump_escaped(i->first, ensure_ascii);
-                    o->write_characters("\":", 2);
-                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
-
-                    o->write_character('}');
-                }
-
-                return;
-            }
-
-            case value_t::array:
-            {
-                if (val.m_value.array->empty())
-                {
-                    o->write_characters("[]", 2);
-                    return;
-                }
-
-                if (pretty_print)
-                {
-                    o->write_characters("[\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
-                    {
-                        o->write_characters(indent_string.c_str(), new_indent);
-                        dump(*i, true, ensure_ascii, indent_step, new_indent);
-                        o->write_characters(",\n", 2);
-                    }
-
-                    // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
-                    o->write_characters(indent_string.c_str(), new_indent);
-                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
-
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character(']');
-                }
-                else
-                {
-                    o->write_character('[');
-
-                    // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
-                    {
-                        dump(*i, false, ensure_ascii, indent_step, current_indent);
-                        o->write_character(',');
-                    }
-
-                    // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
-                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
-
-                    o->write_character(']');
-                }
-
-                return;
-            }
-
-            case value_t::string:
-            {
-                o->write_character('\"');
-                dump_escaped(*val.m_value.string, ensure_ascii);
-                o->write_character('\"');
-                return;
-            }
-
-            case value_t::binary:
-            {
-                if (pretty_print)
-                {
-                    o->write_characters("{\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    o->write_characters(indent_string.c_str(), new_indent);
-
-                    o->write_characters("\"bytes\": [", 10);
-
-                    if (!val.m_value.binary->empty())
-                    {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
-                        {
-                            dump_integer(*i);
-                            o->write_characters(", ", 2);
-                        }
-                        dump_integer(val.m_value.binary->back());
-                    }
-
-                    o->write_characters("],\n", 3);
-                    o->write_characters(indent_string.c_str(), new_indent);
-
-                    o->write_characters("\"subtype\": ", 11);
-                    if (val.m_value.binary->has_subtype())
-                    {
-                        dump_integer(val.m_value.binary->subtype());
-                    }
-                    else
-                    {
-                        o->write_characters("null", 4);
-                    }
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character('}');
-                }
-                else
-                {
-                    o->write_characters("{\"bytes\":[", 10);
-
-                    if (!val.m_value.binary->empty())
-                    {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
-                        {
-                            dump_integer(*i);
-                            o->write_character(',');
-                        }
-                        dump_integer(val.m_value.binary->back());
-                    }
-
-                    o->write_characters("],\"subtype\":", 12);
-                    if (val.m_value.binary->has_subtype())
-                    {
-                        dump_integer(val.m_value.binary->subtype());
-                        o->write_character('}');
-                    }
-                    else
-                    {
-                        o->write_characters("null}", 5);
-                    }
-                }
-                return;
-            }
-
-            case value_t::boolean:
-            {
-                if (val.m_value.boolean)
-                {
-                    o->write_characters("true", 4);
-                }
-                else
-                {
-                    o->write_characters("false", 5);
-                }
-                return;
-            }
-
-            case value_t::number_integer:
-            {
-                dump_integer(val.m_value.number_integer);
-                return;
-            }
-
-            case value_t::number_unsigned:
-            {
-                dump_integer(val.m_value.number_unsigned);
-                return;
-            }
-
-            case value_t::number_float:
-            {
-                dump_float(val.m_value.number_float);
-                return;
-            }
-
-            case value_t::discarded:
-            {
-                o->write_characters("<discarded>", 11);
-                return;
-            }
-
-            case value_t::null:
-            {
-                o->write_characters("null", 4);
-                return;
-            }
-
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /*!
-    @brief dump escaped string
-
-    Escape a string by replacing certain special characters by a sequence of an
-    escape character (backslash) and another character and other control
-    characters by a sequence of "\u" followed by a four-digit hex
-    representation. The escaped string is written to output stream @a o.
-
-    @param[in] s  the string to escape
-    @param[in] ensure_ascii  whether to escape non-ASCII characters with
-                             \uXXXX sequences
-
-    @complexity Linear in the length of string @a s.
-    */
-    void dump_escaped(const string_t& s, const bool ensure_ascii)
-    {
-        std::uint32_t codepoint{};
-        std::uint8_t state = UTF8_ACCEPT;
-        std::size_t bytes = 0;  // number of bytes written to string_buffer
-
-        // number of bytes written at the point of the last valid byte
-        std::size_t bytes_after_last_accept = 0;
-        std::size_t undumped_chars = 0;
-
-        for (std::size_t i = 0; i < s.size(); ++i)
-        {
-            const auto byte = static_cast<std::uint8_t>(s[i]);
-
-            switch (decode(state, codepoint, byte))
-            {
-                case UTF8_ACCEPT:  // decode found a new code point
-                {
-                    switch (codepoint)
-                    {
-                        case 0x08: // backspace
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'b';
-                            break;
-                        }
-
-                        case 0x09: // horizontal tab
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 't';
-                            break;
-                        }
-
-                        case 0x0A: // newline
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'n';
-                            break;
-                        }
-
-                        case 0x0C: // formfeed
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'f';
-                            break;
-                        }
-
-                        case 0x0D: // carriage return
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'r';
-                            break;
-                        }
-
-                        case 0x22: // quotation mark
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = '\"';
-                            break;
-                        }
-
-                        case 0x5C: // reverse solidus
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = '\\';
-                            break;
-                        }
-
-                        default:
-                        {
-                            // escape control characters (0x00..0x1F) or, if
-                            // ensure_ascii parameter is used, non-ASCII characters
-                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
-                            {
-                                if (codepoint <= 0xFFFF)
-                                {
-                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
-                                                                      static_cast<std::uint16_t>(codepoint)));
-                                    bytes += 6;
-                                }
-                                else
-                                {
-                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
-                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
-                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
-                                    bytes += 12;
-                                }
-                            }
-                            else
-                            {
-                                // copy byte to buffer (all previous bytes
-                                // been copied have in default case above)
-                                string_buffer[bytes++] = s[i];
-                            }
-                            break;
-                        }
-                    }
-
-                    // write buffer and reset index; there must be 13 bytes
-                    // left, as this is the maximal number of bytes to be
-                    // written ("\uxxxx\uxxxx\0") for one code point
-                    if (string_buffer.size() - bytes < 13)
-                    {
-                        o->write_characters(string_buffer.data(), bytes);
-                        bytes = 0;
-                    }
-
-                    // remember the byte position of this accept
-                    bytes_after_last_accept = bytes;
-                    undumped_chars = 0;
-                    break;
-                }
-
-                case UTF8_REJECT:  // decode found invalid UTF-8 byte
-                {
-                    switch (error_handler)
-                    {
-                        case error_handler_t::strict:
-                        {
-                            JSON_THROW(type_error::create(316, concat("invalid UTF-8 byte at index ", std::to_string(i), ": 0x", hex_bytes(byte | 0)), nullptr));
-                        }
-
-                        case error_handler_t::ignore:
-                        case error_handler_t::replace:
-                        {
-                            // in case we saw this character the first time, we
-                            // would like to read it again, because the byte
-                            // may be OK for itself, but just not OK for the
-                            // previous sequence
-                            if (undumped_chars > 0)
-                            {
-                                --i;
-                            }
-
-                            // reset length buffer to the last accepted index;
-                            // thus removing/ignoring the invalid characters
-                            bytes = bytes_after_last_accept;
-
-                            if (error_handler == error_handler_t::replace)
-                            {
-                                // add a replacement character
-                                if (ensure_ascii)
-                                {
-                                    string_buffer[bytes++] = '\\';
-                                    string_buffer[bytes++] = 'u';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'd';
-                                }
-                                else
-                                {
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
-                                }
-
-                                // write buffer and reset index; there must be 13 bytes
-                                // left, as this is the maximal number of bytes to be
-                                // written ("\uxxxx\uxxxx\0") for one code point
-                                if (string_buffer.size() - bytes < 13)
-                                {
-                                    o->write_characters(string_buffer.data(), bytes);
-                                    bytes = 0;
-                                }
-
-                                bytes_after_last_accept = bytes;
-                            }
-
-                            undumped_chars = 0;
-
-                            // continue processing the string
-                            state = UTF8_ACCEPT;
-                            break;
-                        }
-
-                        default:            // LCOV_EXCL_LINE
-                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-                    }
-                    break;
-                }
-
-                default:  // decode found yet incomplete multi-byte code point
-                {
-                    if (!ensure_ascii)
-                    {
-                        // code point will not be escaped - copy byte to buffer
-                        string_buffer[bytes++] = s[i];
-                    }
-                    ++undumped_chars;
-                    break;
-                }
-            }
-        }
-
-        // we finished processing the string
-        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
-        {
-            // write buffer
-            if (bytes > 0)
-            {
-                o->write_characters(string_buffer.data(), bytes);
-            }
-        }
-        else
-        {
-            // we finish reading, but do not accept: string was incomplete
-            switch (error_handler)
-            {
-                case error_handler_t::strict:
-                {
-                    JSON_THROW(type_error::create(316, concat("incomplete UTF-8 string; last byte: 0x", hex_bytes(static_cast<std::uint8_t>(s.back() | 0))), nullptr));
-                }
-
-                case error_handler_t::ignore:
-                {
-                    // write all accepted bytes
-                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
-                    break;
-                }
-
-                case error_handler_t::replace:
-                {
-                    // write all accepted bytes
-                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
-                    // add a replacement character
-                    if (ensure_ascii)
-                    {
-                        o->write_characters("\\ufffd", 6);
-                    }
-                    else
-                    {
-                        o->write_characters("\xEF\xBF\xBD", 3);
-                    }
-                    break;
-                }
-
-                default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-            }
-        }
-    }
-
-  private:
-    /*!
-    @brief count digits
-
-    Count the number of decimal (base 10) digits for an input unsigned integer.
-
-    @param[in] x  unsigned integer number to count its digits
-    @return    number of decimal digits
-    */
-    inline unsigned int count_digits(number_unsigned_t x) noexcept
-    {
-        unsigned int n_digits = 1;
-        for (;;)
-        {
-            if (x < 10)
-            {
-                return n_digits;
-            }
-            if (x < 100)
-            {
-                return n_digits + 1;
-            }
-            if (x < 1000)
-            {
-                return n_digits + 2;
-            }
-            if (x < 10000)
-            {
-                return n_digits + 3;
-            }
-            x = x / 10000u;
-            n_digits += 4;
-        }
-    }
-
-    /*!
-     * @brief convert a byte to a uppercase hex representation
-     * @param[in] byte byte to represent
-     * @return representation ("00".."FF")
-     */
-    static std::string hex_bytes(std::uint8_t byte)
-    {
-        std::string result = "FF";
-        constexpr const char* nibble_to_hex = "0123456789ABCDEF";
-        result[0] = nibble_to_hex[byte / 16];
-        result[1] = nibble_to_hex[byte % 16];
-        return result;
-    }
-
-    // templates to avoid warnings about useless casts
-    template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
-    bool is_negative_number(NumberType x)
-    {
-        return x < 0;
-    }
-
-    template < typename NumberType, enable_if_t <std::is_unsigned<NumberType>::value, int > = 0 >
-    bool is_negative_number(NumberType /*unused*/)
-    {
-        return false;
-    }
-
-    /*!
-    @brief dump an integer
-
-    Dump a given integer to output stream @a o. Works internally with
-    @a number_buffer.
-
-    @param[in] x  integer number (signed or unsigned) to dump
-    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
-    */
-    template < typename NumberType, detail::enable_if_t <
-                   std::is_integral<NumberType>::value ||
-                   std::is_same<NumberType, number_unsigned_t>::value ||
-                   std::is_same<NumberType, number_integer_t>::value ||
-                   std::is_same<NumberType, binary_char_t>::value,
-                   int > = 0 >
-    void dump_integer(NumberType x)
-    {
-        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
-        {
-            {
-                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
-                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
-                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
-                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
-                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
-                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
-                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
-                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
-                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
-                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
-            }
-        };
-
-        // special case for "0"
-        if (x == 0)
-        {
-            o->write_character('0');
-            return;
-        }
-
-        // use a pointer to fill the buffer
-        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-
-        number_unsigned_t abs_value;
-
-        unsigned int n_chars{};
-
-        if (is_negative_number(x))
-        {
-            *buffer_ptr = '-';
-            abs_value = remove_sign(static_cast<number_integer_t>(x));
-
-            // account one more byte for the minus sign
-            n_chars = 1 + count_digits(abs_value);
-        }
-        else
-        {
-            abs_value = static_cast<number_unsigned_t>(x);
-            n_chars = count_digits(abs_value);
-        }
-
-        // spare 1 byte for '\0'
-        JSON_ASSERT(n_chars < number_buffer.size() - 1);
-
-        // jump to the end to generate the string from backward,
-        // so we later avoid reversing the result
-        buffer_ptr += n_chars;
-
-        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
-        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
-        while (abs_value >= 100)
-        {
-            const auto digits_index = static_cast<unsigned>((abs_value % 100));
-            abs_value /= 100;
-            *(--buffer_ptr) = digits_to_99[digits_index][1];
-            *(--buffer_ptr) = digits_to_99[digits_index][0];
-        }
-
-        if (abs_value >= 10)
-        {
-            const auto digits_index = static_cast<unsigned>(abs_value);
-            *(--buffer_ptr) = digits_to_99[digits_index][1];
-            *(--buffer_ptr) = digits_to_99[digits_index][0];
-        }
-        else
-        {
-            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
-        }
-
-        o->write_characters(number_buffer.data(), n_chars);
-    }
-
-    /*!
-    @brief dump a floating-point number
-
-    Dump a given floating-point number to output stream @a o. Works internally
-    with @a number_buffer.
-
-    @param[in] x  floating-point number to dump
-    */
-    void dump_float(number_float_t x)
-    {
-        // NaN / inf
-        if (!std::isfinite(x))
-        {
-            o->write_characters("null", 4);
-            return;
-        }
-
-        // If number_float_t is an IEEE-754 single or double precision number,
-        // use the Grisu2 algorithm to produce short numbers which are
-        // guaranteed to round-trip, using strtof and strtod, resp.
-        //
-        // NB: The test below works if <long double> == <double>.
-        static constexpr bool is_ieee_single_or_double
-            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
-              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
-
-        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
-    }
-
-    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
-    {
-        auto* begin = number_buffer.data();
-        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
-
-        o->write_characters(begin, static_cast<size_t>(end - begin));
-    }
-
-    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
-    {
-        // get number of digits for a float -> text -> float round-trip
-        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
-
-        // the actual conversion
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
-
-        // negative value indicates an error
-        JSON_ASSERT(len > 0);
-        // check if buffer was large enough
-        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
-
-        // erase thousands separator
-        if (thousands_sep != '\0')
-        {
-            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081
-            const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep);
-            std::fill(end, number_buffer.end(), '\0');
-            JSON_ASSERT((end - number_buffer.begin()) <= len);
-            len = (end - number_buffer.begin());
-        }
-
-        // convert decimal point to '.'
-        if (decimal_point != '\0' && decimal_point != '.')
-        {
-            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081
-            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
-            if (dec_pos != number_buffer.end())
-            {
-                *dec_pos = '.';
-            }
-        }
-
-        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
-
-        // determine if we need to append ".0"
-        const bool value_is_int_like =
-            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
-                         [](char c)
-        {
-            return c == '.' || c == 'e';
-        });
-
-        if (value_is_int_like)
-        {
-            o->write_characters(".0", 2);
-        }
-    }
-
-    /*!
-    @brief check whether a string is UTF-8 encoded
-
-    The function checks each byte of a string whether it is UTF-8 encoded. The
-    result of the check is stored in the @a state parameter. The function must
-    be called initially with state 0 (accept). State 1 means the string must
-    be rejected, because the current byte is not allowed. If the string is
-    completely processed, but the state is non-zero, the string ended
-    prematurely; that is, the last byte indicated more bytes should have
-    followed.
-
-    @param[in,out] state  the state of the decoding
-    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
-    @param[in] byte       next byte to decode
-    @return               new state
-
-    @note The function has been edited: a std::array is used.
-
-    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-    */
-    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
-    {
-        static const std::array<std::uint8_t, 400> utf8d =
-        {
-            {
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
-                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
-                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
-                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
-                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
-                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
-                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
-                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
-                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
-            }
-        };
-
-        JSON_ASSERT(byte < utf8d.size());
-        const std::uint8_t type = utf8d[byte];
-
-        codep = (state != UTF8_ACCEPT)
-                ? (byte & 0x3fu) | (codep << 6u)
-                : (0xFFu >> type) & (byte);
-
-        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
-        JSON_ASSERT(index < 400);
-        state = utf8d[index];
-        return state;
-    }
-
-    /*
-     * Overload to make the compiler happy while it is instantiating
-     * dump_integer for number_unsigned_t.
-     * Must never be called.
-     */
-    number_unsigned_t remove_sign(number_unsigned_t x)
-    {
-        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        return x; // LCOV_EXCL_LINE
-    }
-
-    /*
-     * Helper function for dump_integer
-     *
-     * This function takes a negative signed integer and returns its absolute
-     * value as unsigned integer. The plus/minus shuffling is necessary as we can
-     * not directly remove the sign of an arbitrary signed integer as the
-     * absolute values of INT_MIN and INT_MAX are usually not the same. See
-     * #1708 for details.
-     */
-    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
-    {
-        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
-        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
-    }
-
-  private:
-    /// the output of the serializer
-    output_adapter_t<char> o = nullptr;
-
-    /// a (hopefully) large enough character buffer
-    std::array<char, 64> number_buffer{{}};
-
-    /// the locale
-    const std::lconv* loc = nullptr;
-    /// the locale's thousand separator character
-    const char thousands_sep = '\0';
-    /// the locale's decimal point character
-    const char decimal_point = '\0';
-
-    /// string buffer
-    std::array<char, 512> string_buffer{{}};
-
-    /// the indentation character
-    const char indent_char;
-    /// the indentation string
-    string_t indent_string;
-
-    /// error_handler how to react on decoding errors
-    const error_handler_t error_handler;
-};
-
-}  // namespace detail
-NLOHMANN_JSON_NAMESPACE_END
-
-// #include <nlohmann/detail/value_t.hpp>
-
-// #include <nlohmann/json_fwd.hpp>
-
-// #include <nlohmann/ordered_map.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#include <functional> // equal_to, less
-#include <initializer_list> // initializer_list
-#include <iterator> // input_iterator_tag, iterator_traits
-#include <memory> // allocator
-#include <stdexcept> // for out_of_range
-#include <type_traits> // enable_if, is_convertible
-#include <utility> // pair
-#include <vector> // vector
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-/// ordered_map: a minimal map-like container that preserves insertion order
-/// for use within nlohmann::basic_json<ordered_map>
-template <class Key, class T, class IgnoredLess = std::less<Key>,
-          class Allocator = std::allocator<std::pair<const Key, T>>>
-                  struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
-{
-    using key_type = Key;
-    using mapped_type = T;
-    using Container = std::vector<std::pair<const Key, T>, Allocator>;
-    using iterator = typename Container::iterator;
-    using const_iterator = typename Container::const_iterator;
-    using size_type = typename Container::size_type;
-    using value_type = typename Container::value_type;
-#ifdef JSON_HAS_CPP_14
-    using key_compare = std::equal_to<>;
-#else
-    using key_compare = std::equal_to<Key>;
-#endif
-
-    // Explicit constructors instead of `using Container::Container`
-    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
-    ordered_map() noexcept(noexcept(Container())) : Container{} {}
-    explicit ordered_map(const Allocator& alloc) noexcept(noexcept(Container(alloc))) : Container{alloc} {}
-    template <class It>
-    ordered_map(It first, It last, const Allocator& alloc = Allocator())
-        : Container{first, last, alloc} {}
-    ordered_map(std::initializer_list<value_type> init, const Allocator& alloc = Allocator() )
-        : Container{init, alloc} {}
-
-    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return {it, false};
-            }
-        }
-        Container::emplace_back(key, std::forward<T>(t));
-        return {std::prev(this->end()), true};
-    }
-
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
-    std::pair<iterator, bool> emplace(KeyType && key, T && t)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return {it, false};
-            }
-        }
-        Container::emplace_back(std::forward<KeyType>(key), std::forward<T>(t));
-        return {std::prev(this->end()), true};
-    }
-
-    T& operator[](const key_type& key)
-    {
-        return emplace(key, T{}).first->second;
-    }
-
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
-    T & operator[](KeyType && key)
-    {
-        return emplace(std::forward<KeyType>(key), T{}).first->second;
-    }
-
-    const T& operator[](const key_type& key) const
-    {
-        return at(key);
-    }
-
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
-    const T & operator[](KeyType && key) const
-    {
-        return at(std::forward<KeyType>(key));
-    }
-
-    T& at(const key_type& key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return it->second;
-            }
-        }
-
-        JSON_THROW(std::out_of_range("key not found"));
-    }
-
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
-    T & at(KeyType && key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return it->second;
-            }
-        }
-
-        JSON_THROW(std::out_of_range("key not found"));
-    }
-
-    const T& at(const key_type& key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return it->second;
-            }
-        }
-
-        JSON_THROW(std::out_of_range("key not found"));
-    }
-
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
-    const T & at(KeyType && key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return it->second;
-            }
-        }
-
-        JSON_THROW(std::out_of_range("key not found"));
-    }
-
-    size_type erase(const key_type& key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                // Since we cannot move const Keys, re-construct them in place
-                for (auto next = it; ++next != this->end(); ++it)
-                {
-                    it->~value_type(); // Destroy but keep allocation
-                    new (&*it) value_type{std::move(*next)};
-                }
-                Container::pop_back();
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
-    size_type erase(KeyType && key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                // Since we cannot move const Keys, re-construct them in place
-                for (auto next = it; ++next != this->end(); ++it)
-                {
-                    it->~value_type(); // Destroy but keep allocation
-                    new (&*it) value_type{std::move(*next)};
-                }
-                Container::pop_back();
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    iterator erase(iterator pos)
-    {
-        return erase(pos, std::next(pos));
-    }
-
-    iterator erase(iterator first, iterator last)
-    {
-        if (first == last)
-        {
-            return first;
-        }
-
-        const auto elements_affected = std::distance(first, last);
-        const auto offset = std::distance(Container::begin(), first);
-
-        // This is the start situation. We need to delete elements_affected
-        // elements (3 in this example: e, f, g), and need to return an
-        // iterator past the last deleted element (h in this example).
-        // Note that offset is the distance from the start of the vector
-        // to first. We will need this later.
-
-        // [ a, b, c, d, e, f, g, h, i, j ]
-        //               ^        ^
-        //             first    last
-
-        // Since we cannot move const Keys, we re-construct them in place.
-        // We start at first and re-construct (viz. copy) the elements from
-        // the back of the vector. Example for first iteration:
-
-        //               ,--------.
-        //               v        |   destroy e and re-construct with h
-        // [ a, b, c, d, e, f, g, h, i, j ]
-        //               ^        ^
-        //               it       it + elements_affected
-
-        for (auto it = first; std::next(it, elements_affected) != Container::end(); ++it)
-        {
-            it->~value_type(); // destroy but keep allocation
-            new (&*it) value_type{std::move(*std::next(it, elements_affected))}; // "move" next element to it
-        }
-
-        // [ a, b, c, d, h, i, j, h, i, j ]
-        //               ^        ^
-        //             first    last
-
-        // remove the unneeded elements at the end of the vector
-        Container::resize(this->size() - static_cast<size_type>(elements_affected));
-
-        // [ a, b, c, d, h, i, j ]
-        //               ^        ^
-        //             first    last
-
-        // first is now pointing past the last deleted element, but we cannot
-        // use this iterator, because it may have been invalidated by the
-        // resize call. Instead, we can return begin() + offset.
-        return Container::begin() + offset;
-    }
-
-    size_type count(const key_type& key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
-    size_type count(KeyType && key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    iterator find(const key_type& key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return it;
-            }
-        }
-        return Container::end();
-    }
-
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
-    iterator find(KeyType && key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return it;
-            }
-        }
-        return Container::end();
-    }
-
-    const_iterator find(const key_type& key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, key))
-            {
-                return it;
-            }
-        }
-        return Container::end();
-    }
-
-    std::pair<iterator, bool> insert( value_type&& value )
-    {
-        return emplace(value.first, std::move(value.second));
-    }
-
-    std::pair<iterator, bool> insert( const value_type& value )
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (m_compare(it->first, value.first))
-            {
-                return {it, false};
-            }
-        }
-        Container::push_back(value);
-        return {--this->end(), true};
-    }
-
-    template<typename InputIt>
-    using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
-            std::input_iterator_tag>::value>::type;
-
-    template<typename InputIt, typename = require_input_iter<InputIt>>
-    void insert(InputIt first, InputIt last)
-    {
-        for (auto it = first; it != last; ++it)
-        {
-            insert(*it);
-        }
-    }
-
-private:
-    JSON_NO_UNIQUE_ADDRESS key_compare m_compare = key_compare();
-};
-
-NLOHMANN_JSON_NAMESPACE_END
-
-
-#if defined(JSON_HAS_CPP_17)
-    #include <any>
-    #include <string_view>
-#endif
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-/*!
-@brief a class to store JSON values
-
-@internal
-@invariant The member variables @a m_value and @a m_type have the following
-relationship:
-- If `m_type == value_t::object`, then `m_value.object != nullptr`.
-- If `m_type == value_t::array`, then `m_value.array != nullptr`.
-- If `m_type == value_t::string`, then `m_value.string != nullptr`.
-The invariants are checked by member function assert_invariant().
-
-@note ObjectType trick from https://stackoverflow.com/a/9860911
-@endinternal
-
-@since version 1.0.0
-
-@nosubgrouping
-*/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
-{
-  private:
-    template<detail::value_t> friend struct detail::external_constructor;
-
-    template<typename>
-    friend class ::nlohmann::json_pointer;
-    // can be restored when json_pointer backwards compatibility is removed
-    // friend ::nlohmann::json_pointer<StringType>;
-
-    template<typename BasicJsonType, typename InputType>
-    friend class ::nlohmann::detail::parser;
-    friend ::nlohmann::detail::serializer<basic_json>;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::iter_impl;
-    template<typename BasicJsonType, typename CharType>
-    friend class ::nlohmann::detail::binary_writer;
-    template<typename BasicJsonType, typename InputType, typename SAX>
-    friend class ::nlohmann::detail::binary_reader;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_parser;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
-    friend class ::nlohmann::detail::exception;
-
-    /// workaround type for MSVC
-    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    // convenience aliases for types residing in namespace detail;
-    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
-
-    template<typename InputAdapterType>
-    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
-        InputAdapterType adapter,
-        detail::parser_callback_t<basic_json>cb = nullptr,
-        const bool allow_exceptions = true,
-        const bool ignore_comments = false
-                                 )
-    {
-        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
-                std::move(cb), allow_exceptions, ignore_comments);
-    }
-
-  private:
-    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
-    template<typename BasicJsonType>
-    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
-    template<typename BasicJsonType>
-    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
-    template<typename Iterator>
-    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
-    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
-
-    template<typename CharType>
-    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
-
-    template<typename InputType>
-    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
-    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    using serializer = ::nlohmann::detail::serializer<basic_json>;
-
-  public:
-    using value_t = detail::value_t;
-    /// JSON Pointer, see @ref nlohmann::json_pointer
-    using json_pointer = ::nlohmann::json_pointer<StringType>;
-    template<typename T, typename SFINAE>
-    using json_serializer = JSONSerializer<T, SFINAE>;
-    /// how to treat decoding errors
-    using error_handler_t = detail::error_handler_t;
-    /// how to treat CBOR tags
-    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
-    /// helper type for initializer lists of basic_json values
-    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
-
-    using input_format_t = detail::input_format_t;
-    /// SAX interface type, see @ref nlohmann::json_sax
-    using json_sax_t = json_sax<basic_json>;
-
-    ////////////////
-    // exceptions //
-    ////////////////
-
-    /// @name exceptions
-    /// Classes to implement user-defined exceptions.
-    /// @{
-
-    using exception = detail::exception;
-    using parse_error = detail::parse_error;
-    using invalid_iterator = detail::invalid_iterator;
-    using type_error = detail::type_error;
-    using out_of_range = detail::out_of_range;
-    using other_error = detail::other_error;
-
-    /// @}
-
-
-    /////////////////////
-    // container types //
-    /////////////////////
-
-    /// @name container types
-    /// The canonic container types to use @ref basic_json like any other STL
-    /// container.
-    /// @{
-
-    /// the type of elements in a basic_json container
-    using value_type = basic_json;
-
-    /// the type of an element reference
-    using reference = value_type&;
-    /// the type of an element const reference
-    using const_reference = const value_type&;
-
-    /// a type to represent differences between iterators
-    using difference_type = std::ptrdiff_t;
-    /// a type to represent container sizes
-    using size_type = std::size_t;
-
-    /// the allocator type
-    using allocator_type = AllocatorType<basic_json>;
-
-    /// the type of an element pointer
-    using pointer = typename std::allocator_traits<allocator_type>::pointer;
-    /// the type of an element const pointer
-    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
-
-    /// an iterator for a basic_json container
-    using iterator = iter_impl<basic_json>;
-    /// a const iterator for a basic_json container
-    using const_iterator = iter_impl<const basic_json>;
-    /// a reverse iterator for a basic_json container
-    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
-    /// a const reverse iterator for a basic_json container
-    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
-
-    /// @}
-
-
-    /// @brief returns the allocator associated with the container
-    /// @sa https://json.nlohmann.me/api/basic_json/get_allocator/
-    static allocator_type get_allocator()
-    {
-        return allocator_type();
-    }
-
-    /// @brief returns version information on the library
-    /// @sa https://json.nlohmann.me/api/basic_json/meta/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json meta()
-    {
-        basic_json result;
-
-        result["copyright"] = "(C) 2013-2022 Niels Lohmann";
-        result["name"] = "JSON for Modern C++";
-        result["url"] = "https://github.com/nlohmann/json";
-        result["version"]["string"] =
-            detail::concat(std::to_string(NLOHMANN_JSON_VERSION_MAJOR), '.',
-                           std::to_string(NLOHMANN_JSON_VERSION_MINOR), '.',
-                           std::to_string(NLOHMANN_JSON_VERSION_PATCH));
-        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
-        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
-        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
-
-#ifdef _WIN32
-        result["platform"] = "win32";
-#elif defined __linux__
-        result["platform"] = "linux";
-#elif defined __APPLE__
-        result["platform"] = "apple";
-#elif defined __unix__
-        result["platform"] = "unix";
-#else
-        result["platform"] = "unknown";
-#endif
-
-#if defined(__ICC) || defined(__INTEL_COMPILER)
-        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
-#elif defined(__clang__)
-        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
-#elif defined(__GNUC__) || defined(__GNUG__)
-        result["compiler"] = {{"family", "gcc"}, {"version", detail::concat(
-                    std::to_string(__GNUC__), '.',
-                    std::to_string(__GNUC_MINOR__), '.',
-                    std::to_string(__GNUC_PATCHLEVEL__))
-            }
-        };
-#elif defined(__HP_cc) || defined(__HP_aCC)
-        result["compiler"] = "hp"
-#elif defined(__IBMCPP__)
-        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
-#elif defined(_MSC_VER)
-        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
-#elif defined(__PGI)
-        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
-#elif defined(__SUNPRO_CC)
-        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
-#else
-        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
-#endif
-
-
-#if defined(_MSVC_LANG)
-        result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
-#elif defined(__cplusplus)
-        result["compiler"]["c++"] = std::to_string(__cplusplus);
-#else
-        result["compiler"]["c++"] = "unknown";
-#endif
-        return result;
-    }
-
-
-    ///////////////////////////
-    // JSON value data types //
-    ///////////////////////////
-
-    /// @name JSON value data types
-    /// The data types to store a JSON value. These types are derived from
-    /// the template arguments passed to class @ref basic_json.
-    /// @{
-
-    /// @brief default object key comparator type
-    /// The actual object key comparator type (@ref object_comparator_t) may be
-    /// different.
-    /// @sa https://json.nlohmann.me/api/basic_json/default_object_comparator_t/
-#if defined(JSON_HAS_CPP_14)
-    // use of transparent comparator avoids unnecessary repeated construction of temporaries
-    // in functions involving lookup by key with types other than object_t::key_type (aka. StringType)
-    using default_object_comparator_t = std::less<>;
-#else
-    using default_object_comparator_t = std::less<StringType>;
-#endif
-
-    /// @brief a type for an object
-    /// @sa https://json.nlohmann.me/api/basic_json/object_t/
-    using object_t = ObjectType<StringType,
-          basic_json,
-          default_object_comparator_t,
-          AllocatorType<std::pair<const StringType,
-          basic_json>>>;
-
-    /// @brief a type for an array
-    /// @sa https://json.nlohmann.me/api/basic_json/array_t/
-    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
-
-    /// @brief a type for a string
-    /// @sa https://json.nlohmann.me/api/basic_json/string_t/
-    using string_t = StringType;
-
-    /// @brief a type for a boolean
-    /// @sa https://json.nlohmann.me/api/basic_json/boolean_t/
-    using boolean_t = BooleanType;
-
-    /// @brief a type for a number (integer)
-    /// @sa https://json.nlohmann.me/api/basic_json/number_integer_t/
-    using number_integer_t = NumberIntegerType;
-
-    /// @brief a type for a number (unsigned)
-    /// @sa https://json.nlohmann.me/api/basic_json/number_unsigned_t/
-    using number_unsigned_t = NumberUnsignedType;
-
-    /// @brief a type for a number (floating-point)
-    /// @sa https://json.nlohmann.me/api/basic_json/number_float_t/
-    using number_float_t = NumberFloatType;
-
-    /// @brief a type for a packed binary type
-    /// @sa https://json.nlohmann.me/api/basic_json/binary_t/
-    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
-
-    /// @brief object key comparator type
-    /// @sa https://json.nlohmann.me/api/basic_json/object_comparator_t/
-    using object_comparator_t = detail::actual_object_comparator_t<basic_json>;
-
-    /// @}
-
-  private:
-
-    /// helper for exception-safe object creation
-    template<typename T, typename... Args>
-    JSON_HEDLEY_RETURNS_NON_NULL
-    static T* create(Args&& ... args)
-    {
-        AllocatorType<T> alloc;
-        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
-
-        auto deleter = [&](T * obj)
-        {
-            AllocatorTraits::deallocate(alloc, obj, 1);
-        };
-        std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
-        AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
-        JSON_ASSERT(obj != nullptr);
-        return obj.release();
-    }
-
-    ////////////////////////
-    // JSON value storage //
-    ////////////////////////
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /*!
-    @brief a JSON value
-
-    The actual storage for a JSON value of the @ref basic_json class. This
-    union combines the different storage types for the JSON value types
-    defined in @ref value_t.
-
-    JSON type | value_t type    | used type
-    --------- | --------------- | ------------------------
-    object    | object          | pointer to @ref object_t
-    array     | array           | pointer to @ref array_t
-    string    | string          | pointer to @ref string_t
-    boolean   | boolean         | @ref boolean_t
-    number    | number_integer  | @ref number_integer_t
-    number    | number_unsigned | @ref number_unsigned_t
-    number    | number_float    | @ref number_float_t
-    binary    | binary          | pointer to @ref binary_t
-    null      | null            | *no value is stored*
-
-    @note Variable-length types (objects, arrays, and strings) are stored as
-    pointers. The size of the union should not exceed 64 bits if the default
-    value types are used.
-
-    @since version 1.0.0
-    */
-    union json_value
-    {
-        /// object (stored with pointer to save storage)
-        object_t* object;
-        /// array (stored with pointer to save storage)
-        array_t* array;
-        /// string (stored with pointer to save storage)
-        string_t* string;
-        /// binary (stored with pointer to save storage)
-        binary_t* binary;
-        /// boolean
-        boolean_t boolean;
-        /// number (integer)
-        number_integer_t number_integer;
-        /// number (unsigned integer)
-        number_unsigned_t number_unsigned;
-        /// number (floating-point)
-        number_float_t number_float;
-
-        /// default constructor (for null values)
-        json_value() = default;
-        /// constructor for booleans
-        json_value(boolean_t v) noexcept : boolean(v) {}
-        /// constructor for numbers (integer)
-        json_value(number_integer_t v) noexcept : number_integer(v) {}
-        /// constructor for numbers (unsigned)
-        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
-        /// constructor for numbers (floating-point)
-        json_value(number_float_t v) noexcept : number_float(v) {}
-        /// constructor for empty values of a given type
-        json_value(value_t t)
-        {
-            switch (t)
-            {
-                case value_t::object:
-                {
-                    object = create<object_t>();
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    array = create<array_t>();
-                    break;
-                }
-
-                case value_t::string:
-                {
-                    string = create<string_t>("");
-                    break;
-                }
-
-                case value_t::binary:
-                {
-                    binary = create<binary_t>();
-                    break;
-                }
-
-                case value_t::boolean:
-                {
-                    boolean = static_cast<boolean_t>(false);
-                    break;
-                }
-
-                case value_t::number_integer:
-                {
-                    number_integer = static_cast<number_integer_t>(0);
-                    break;
-                }
-
-                case value_t::number_unsigned:
-                {
-                    number_unsigned = static_cast<number_unsigned_t>(0);
-                    break;
-                }
-
-                case value_t::number_float:
-                {
-                    number_float = static_cast<number_float_t>(0.0);
-                    break;
-                }
-
-                case value_t::null:
-                {
-                    object = nullptr;  // silence warning, see #821
-                    break;
-                }
-
-                case value_t::discarded:
-                default:
-                {
-                    object = nullptr;  // silence warning, see #821
-                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
-                    {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.11.2", nullptr)); // LCOV_EXCL_LINE
-                    }
-                    break;
-                }
-            }
-        }
-
-        /// constructor for strings
-        json_value(const string_t& value) : string(create<string_t>(value)) {}
-
-        /// constructor for rvalue strings
-        json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
-
-        /// constructor for objects
-        json_value(const object_t& value) : object(create<object_t>(value)) {}
-
-        /// constructor for rvalue objects
-        json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
-
-        /// constructor for arrays
-        json_value(const array_t& value) : array(create<array_t>(value)) {}
-
-        /// constructor for rvalue arrays
-        json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
-
-        /// constructor for binary arrays
-        json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
-
-        /// constructor for rvalue binary arrays
-        json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
-
-        /// constructor for binary arrays (internal type)
-        json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
-
-        /// constructor for rvalue binary arrays (internal type)
-        json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
-
-        void destroy(value_t t)
-        {
-            if (t == value_t::array || t == value_t::object)
-            {
-                // flatten the current json_value to a heap-allocated stack
-                std::vector<basic_json> stack;
-
-                // move the top-level items to stack
-                if (t == value_t::array)
-                {
-                    stack.reserve(array->size());
-                    std::move(array->begin(), array->end(), std::back_inserter(stack));
-                }
-                else
-                {
-                    stack.reserve(object->size());
-                    for (auto&& it : *object)
-                    {
-                        stack.push_back(std::move(it.second));
-                    }
-                }
-
-                while (!stack.empty())
-                {
-                    // move the last item to local variable to be processed
-                    basic_json current_item(std::move(stack.back()));
-                    stack.pop_back();
-
-                    // if current_item is array/object, move
-                    // its children to the stack to be processed later
-                    if (current_item.is_array())
-                    {
-                        std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(), std::back_inserter(stack));
-
-                        current_item.m_value.array->clear();
-                    }
-                    else if (current_item.is_object())
-                    {
-                        for (auto&& it : *current_item.m_value.object)
-                        {
-                            stack.push_back(std::move(it.second));
-                        }
-
-                        current_item.m_value.object->clear();
-                    }
-
-                    // it's now safe that current_item get destructed
-                    // since it doesn't have any children
-                }
-            }
-
-            switch (t)
-            {
-                case value_t::object:
-                {
-                    AllocatorType<object_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    AllocatorType<array_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
-                    break;
-                }
-
-                case value_t::string:
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
-                    break;
-                }
-
-                case value_t::binary:
-                {
-                    AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
-                    break;
-                }
-
-                case value_t::null:
-                case value_t::boolean:
-                case value_t::number_integer:
-                case value_t::number_unsigned:
-                case value_t::number_float:
-                case value_t::discarded:
-                default:
-                {
-                    break;
-                }
-            }
-        }
-    };
-
-  private:
-    /*!
-    @brief checks the class invariants
-
-    This function asserts the class invariants. It needs to be called at the
-    end of every constructor to make sure that created objects respect the
-    invariant. Furthermore, it has to be called each time the type of a JSON
-    value is changed, because the invariant expresses a relationship between
-    @a m_type and @a m_value.
-
-    Furthermore, the parent relation is checked for arrays and objects: If
-    @a check_parents true and the value is an array or object, then the
-    container's elements must have the current value as parent.
-
-    @param[in] check_parents  whether the parent relation should be checked.
-               The value is true by default and should only be set to false
-               during destruction of objects when the invariant does not
-               need to hold.
-    */
-    void assert_invariant(bool check_parents = true) const noexcept
-    {
-        JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr);
-        JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr);
-        JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr);
-        JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr);
-
-#if JSON_DIAGNOSTICS
-        JSON_TRY
-        {
-            // cppcheck-suppress assertWithSideEffect
-            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
-            {
-                return j.m_parent == this;
-            }));
-        }
-        JSON_CATCH(...) {} // LCOV_EXCL_LINE
-#endif
-        static_cast<void>(check_parents);
-    }
-
-    void set_parents()
-    {
-#if JSON_DIAGNOSTICS
-        switch (m_type)
-        {
-            case value_t::array:
-            {
-                for (auto& element : *m_value.array)
-                {
-                    element.m_parent = this;
-                }
-                break;
-            }
-
-            case value_t::object:
-            {
-                for (auto& element : *m_value.object)
-                {
-                    element.second.m_parent = this;
-                }
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                break;
-        }
-#endif
-    }
-
-    iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
-    {
-#if JSON_DIAGNOSTICS
-        for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
-        {
-            (it + i)->m_parent = this;
-        }
-#else
-        static_cast<void>(count_set_parents);
-#endif
-        return it;
-    }
-
-    reference set_parent(reference j, std::size_t old_capacity = static_cast<std::size_t>(-1))
-    {
-#if JSON_DIAGNOSTICS
-        if (old_capacity != static_cast<std::size_t>(-1))
-        {
-            // see https://github.com/nlohmann/json/issues/2838
-            JSON_ASSERT(type() == value_t::array);
-            if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity))
-            {
-                // capacity has changed: update all parents
-                set_parents();
-                return j;
-            }
-        }
-
-        // ordered_json uses a vector internally, so pointers could have
-        // been invalidated; see https://github.com/nlohmann/json/issues/2962
-#ifdef JSON_HEDLEY_MSVC_VERSION
-#pragma warning(push )
-#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
-#endif
-        if (detail::is_ordered_map<object_t>::value)
-        {
-            set_parents();
-            return j;
-        }
-#ifdef JSON_HEDLEY_MSVC_VERSION
-#pragma warning( pop )
-#endif
-
-        j.m_parent = this;
-#else
-        static_cast<void>(j);
-        static_cast<void>(old_capacity);
-#endif
-        return j;
-    }
-
-  public:
-    //////////////////////////
-    // JSON parser callback //
-    //////////////////////////
-
-    /// @brief parser event types
-    /// @sa https://json.nlohmann.me/api/basic_json/parse_event_t/
-    using parse_event_t = detail::parse_event_t;
-
-    /// @brief per-element parser callback type
-    /// @sa https://json.nlohmann.me/api/basic_json/parser_callback_t/
-    using parser_callback_t = detail::parser_callback_t<basic_json>;
-
-    //////////////////
-    // constructors //
-    //////////////////
-
-    /// @name constructors and destructors
-    /// Constructors of class @ref basic_json, copy/move constructor, copy
-    /// assignment, static functions creating objects, and the destructor.
-    /// @{
-
-    /// @brief create an empty value with a given type
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(const value_t v)
-        : m_type(v), m_value(v)
-    {
-        assert_invariant();
-    }
-
-    /// @brief create a null object
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(std::nullptr_t = nullptr) noexcept // NOLINT(bugprone-exception-escape)
-        : basic_json(value_t::null)
-    {
-        assert_invariant();
-    }
-
-    /// @brief create a JSON value from compatible types
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    template < typename CompatibleType,
-               typename U = detail::uncvref_t<CompatibleType>,
-               detail::enable_if_t <
-                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
-    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
-                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
-                                           std::forward<CompatibleType>(val))))
-    {
-        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief create a JSON value from an existing one
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    template < typename BasicJsonType,
-               detail::enable_if_t <
-                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
-    basic_json(const BasicJsonType& val)
-    {
-        using other_boolean_t = typename BasicJsonType::boolean_t;
-        using other_number_float_t = typename BasicJsonType::number_float_t;
-        using other_number_integer_t = typename BasicJsonType::number_integer_t;
-        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-        using other_string_t = typename BasicJsonType::string_t;
-        using other_object_t = typename BasicJsonType::object_t;
-        using other_array_t = typename BasicJsonType::array_t;
-        using other_binary_t = typename BasicJsonType::binary_t;
-
-        switch (val.type())
-        {
-            case value_t::boolean:
-                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
-                break;
-            case value_t::number_float:
-                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
-                break;
-            case value_t::number_integer:
-                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
-                break;
-            case value_t::number_unsigned:
-                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
-                break;
-            case value_t::string:
-                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
-                break;
-            case value_t::object:
-                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
-                break;
-            case value_t::array:
-                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
-                break;
-            case value_t::binary:
-                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
-                break;
-            case value_t::null:
-                *this = nullptr;
-                break;
-            case value_t::discarded:
-                m_type = value_t::discarded;
-                break;
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-        JSON_ASSERT(m_type == val.type());
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief create a container (array or object) from an initializer list
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(initializer_list_t init,
-               bool type_deduction = true,
-               value_t manual_type = value_t::array)
-    {
-        // check if each element is an array with two elements whose first
-        // element is a string
-        bool is_an_object = std::all_of(init.begin(), init.end(),
-                                        [](const detail::json_ref<basic_json>& element_ref)
-        {
-            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string();
-        });
-
-        // adjust type if type deduction is not wanted
-        if (!type_deduction)
-        {
-            // if array is wanted, do not create an object though possible
-            if (manual_type == value_t::array)
-            {
-                is_an_object = false;
-            }
-
-            // if object is wanted but impossible, throw an exception
-            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
-            {
-                JSON_THROW(type_error::create(301, "cannot create object from initializer list", nullptr));
-            }
-        }
-
-        if (is_an_object)
-        {
-            // the initializer list is a list of pairs -> create object
-            m_type = value_t::object;
-            m_value = value_t::object;
-
-            for (auto& element_ref : init)
-            {
-                auto element = element_ref.moved_or_copied();
-                m_value.object->emplace(
-                    std::move(*((*element.m_value.array)[0].m_value.string)),
-                    std::move((*element.m_value.array)[1]));
-            }
-        }
-        else
-        {
-            // the initializer list describes an array -> create array
-            m_type = value_t::array;
-            m_value.array = create<array_t>(init.begin(), init.end());
-        }
-
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief explicitly create a binary array (without subtype)
-    /// @sa https://json.nlohmann.me/api/basic_json/binary/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(const typename binary_t::container_type& init)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = init;
-        return res;
-    }
-
-    /// @brief explicitly create a binary array (with subtype)
-    /// @sa https://json.nlohmann.me/api/basic_json/binary/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(init, subtype);
-        return res;
-    }
-
-    /// @brief explicitly create a binary array
-    /// @sa https://json.nlohmann.me/api/basic_json/binary/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(typename binary_t::container_type&& init)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = std::move(init);
-        return res;
-    }
-
-    /// @brief explicitly create a binary array (with subtype)
-    /// @sa https://json.nlohmann.me/api/basic_json/binary/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(std::move(init), subtype);
-        return res;
-    }
-
-    /// @brief explicitly create an array from an initializer list
-    /// @sa https://json.nlohmann.me/api/basic_json/array/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json array(initializer_list_t init = {})
-    {
-        return basic_json(init, false, value_t::array);
-    }
-
-    /// @brief explicitly create an object from an initializer list
-    /// @sa https://json.nlohmann.me/api/basic_json/object/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json object(initializer_list_t init = {})
-    {
-        return basic_json(init, false, value_t::object);
-    }
-
-    /// @brief construct an array with count copies of given value
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(size_type cnt, const basic_json& val)
-        : m_type(value_t::array)
-    {
-        m_value.array = create<array_t>(cnt, val);
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief construct a JSON container given an iterator range
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    template < class InputIT, typename std::enable_if <
-                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
-                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
-    basic_json(InputIT first, InputIT last)
-    {
-        JSON_ASSERT(first.m_object != nullptr);
-        JSON_ASSERT(last.m_object != nullptr);
-
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", nullptr));
-        }
-
-        // copy type from first iterator
-        m_type = first.m_object->m_type;
-
-        // check if iterator range is complete for primitive values
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            {
-                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
-                                         || !last.m_it.primitive_iterator.is_end()))
-                {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", first.m_object));
-                }
-                break;
-            }
-
-            case value_t::null:
-            case value_t::object:
-            case value_t::array:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                break;
-        }
-
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = first.m_object->m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = first.m_object->m_value.number_float;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = first.m_object->m_value.boolean;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *first.m_object->m_value.string;
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object = create<object_t>(first.m_it.object_iterator,
-                                                  last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array = create<array_t>(first.m_it.array_iterator,
-                                                last.m_it.array_iterator);
-                break;
-            }
-
-            case value_t::binary:
-            {
-                m_value = *first.m_object->m_value.binary;
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                JSON_THROW(invalid_iterator::create(206, detail::concat("cannot construct with iterators from ", first.m_object->type_name()), first.m_object));
-        }
-
-        set_parents();
-        assert_invariant();
-    }
-
-
-    ///////////////////////////////////////
-    // other constructors and destructor //
-    ///////////////////////////////////////
-
-    template<typename JsonRef,
-             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
-                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
-    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
-
-    /// @brief copy constructor
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(const basic_json& other)
-        : m_type(other.m_type)
-    {
-        // check of passed value is valid
-        other.assert_invariant();
-
-        switch (m_type)
-        {
-            case value_t::object:
-            {
-                m_value = *other.m_value.object;
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value = *other.m_value.array;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *other.m_value.string;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value = other.m_value.boolean;
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                m_value = other.m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value = other.m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value = other.m_value.number_float;
-                break;
-            }
-
-            case value_t::binary:
-            {
-                m_value = *other.m_value.binary;
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                break;
-        }
-
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief move constructor
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(basic_json&& other) noexcept
-        : m_type(std::move(other.m_type)),
-          m_value(std::move(other.m_value))
-    {
-        // check that passed value is valid
-        other.assert_invariant(false);
-
-        // invalidate payload
-        other.m_type = value_t::null;
-        other.m_value = {};
-
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief copy assignment
-    /// @sa https://json.nlohmann.me/api/basic_json/operator=/
-    basic_json& operator=(basic_json other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value&&
-        std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        // check that passed value is valid
-        other.assert_invariant();
-
-        using std::swap;
-        swap(m_type, other.m_type);
-        swap(m_value, other.m_value);
-
-        set_parents();
-        assert_invariant();
-        return *this;
-    }
-
-    /// @brief destructor
-    /// @sa https://json.nlohmann.me/api/basic_json/~basic_json/
-    ~basic_json() noexcept
-    {
-        assert_invariant(false);
-        m_value.destroy(m_type);
-    }
-
-    /// @}
-
-  public:
-    ///////////////////////
-    // object inspection //
-    ///////////////////////
-
-    /// @name object inspection
-    /// Functions to inspect the type of a JSON value.
-    /// @{
-
-    /// @brief serialization
-    /// @sa https://json.nlohmann.me/api/basic_json/dump/
-    string_t dump(const int indent = -1,
-                  const char indent_char = ' ',
-                  const bool ensure_ascii = false,
-                  const error_handler_t error_handler = error_handler_t::strict) const
-    {
-        string_t result;
-        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
-
-        if (indent >= 0)
-        {
-            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
-        }
-        else
-        {
-            s.dump(*this, false, ensure_ascii, 0);
-        }
-
-        return result;
-    }
-
-    /// @brief return the type of the JSON value (explicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/type/
-    constexpr value_t type() const noexcept
-    {
-        return m_type;
-    }
-
-    /// @brief return whether type is primitive
-    /// @sa https://json.nlohmann.me/api/basic_json/is_primitive/
-    constexpr bool is_primitive() const noexcept
-    {
-        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
-    }
-
-    /// @brief return whether type is structured
-    /// @sa https://json.nlohmann.me/api/basic_json/is_structured/
-    constexpr bool is_structured() const noexcept
-    {
-        return is_array() || is_object();
-    }
-
-    /// @brief return whether value is null
-    /// @sa https://json.nlohmann.me/api/basic_json/is_null/
-    constexpr bool is_null() const noexcept
-    {
-        return m_type == value_t::null;
-    }
-
-    /// @brief return whether value is a boolean
-    /// @sa https://json.nlohmann.me/api/basic_json/is_boolean/
-    constexpr bool is_boolean() const noexcept
-    {
-        return m_type == value_t::boolean;
-    }
-
-    /// @brief return whether value is a number
-    /// @sa https://json.nlohmann.me/api/basic_json/is_number/
-    constexpr bool is_number() const noexcept
-    {
-        return is_number_integer() || is_number_float();
-    }
-
-    /// @brief return whether value is an integer number
-    /// @sa https://json.nlohmann.me/api/basic_json/is_number_integer/
-    constexpr bool is_number_integer() const noexcept
-    {
-        return m_type == value_t::number_integer || m_type == value_t::number_unsigned;
-    }
-
-    /// @brief return whether value is an unsigned integer number
-    /// @sa https://json.nlohmann.me/api/basic_json/is_number_unsigned/
-    constexpr bool is_number_unsigned() const noexcept
-    {
-        return m_type == value_t::number_unsigned;
-    }
-
-    /// @brief return whether value is a floating-point number
-    /// @sa https://json.nlohmann.me/api/basic_json/is_number_float/
-    constexpr bool is_number_float() const noexcept
-    {
-        return m_type == value_t::number_float;
-    }
-
-    /// @brief return whether value is an object
-    /// @sa https://json.nlohmann.me/api/basic_json/is_object/
-    constexpr bool is_object() const noexcept
-    {
-        return m_type == value_t::object;
-    }
-
-    /// @brief return whether value is an array
-    /// @sa https://json.nlohmann.me/api/basic_json/is_array/
-    constexpr bool is_array() const noexcept
-    {
-        return m_type == value_t::array;
-    }
-
-    /// @brief return whether value is a string
-    /// @sa https://json.nlohmann.me/api/basic_json/is_string/
-    constexpr bool is_string() const noexcept
-    {
-        return m_type == value_t::string;
-    }
-
-    /// @brief return whether value is a binary array
-    /// @sa https://json.nlohmann.me/api/basic_json/is_binary/
-    constexpr bool is_binary() const noexcept
-    {
-        return m_type == value_t::binary;
-    }
-
-    /// @brief return whether value is discarded
-    /// @sa https://json.nlohmann.me/api/basic_json/is_discarded/
-    constexpr bool is_discarded() const noexcept
-    {
-        return m_type == value_t::discarded;
-    }
-
-    /// @brief return the type of the JSON value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_value_t/
-    constexpr operator value_t() const noexcept
-    {
-        return m_type;
-    }
-
-    /// @}
-
-  private:
-    //////////////////
-    // value access //
-    //////////////////
-
-    /// get a boolean (explicit)
-    boolean_t get_impl(boolean_t* /*unused*/) const
-    {
-        if (JSON_HEDLEY_LIKELY(is_boolean()))
-        {
-            return m_value.boolean;
-        }
-
-        JSON_THROW(type_error::create(302, detail::concat("type must be boolean, but is ", type_name()), this));
-    }
-
-    /// get a pointer to the value (object)
-    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (object)
-    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /// get a pointer to the value (binary)
-    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
-    {
-        return is_binary() ? m_value.binary : nullptr;
-    }
-
-    /// get a pointer to the value (binary)
-    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
-    {
-        return is_binary() ? m_value.binary : nullptr;
-    }
-
-    /*!
-    @brief helper function to implement get_ref()
-
-    This function helps to implement get_ref() without code duplication for
-    const and non-const overloads
-
-    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
-
-    @throw type_error.303 if ReferenceType does not match underlying value
-    type of the current JSON
-    */
-    template<typename ReferenceType, typename ThisType>
-    static ReferenceType get_ref_impl(ThisType& obj)
-    {
-        // delegate the call to get_ptr<>()
-        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
-
-        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
-        {
-            return *ptr;
-        }
-
-        JSON_THROW(type_error::create(303, detail::concat("incompatible ReferenceType for get_ref, actual type is ", obj.type_name()), &obj));
-    }
-
-  public:
-    /// @name value access
-    /// Direct access to the stored value of a JSON value.
-    /// @{
-
-    /// @brief get a pointer value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>()
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-    /// @brief get a pointer value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
-    template < typename PointerType, typename std::enable_if <
-                   std::is_pointer<PointerType>::value&&
-                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
-    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>() const
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-  private:
-    /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType ret;
-    JSONSerializer<ValueType>::from_json(*this, ret);
-    return ret;
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const basic_json&, ValueType&)`, and
-    - @ref json_serializer<ValueType> does not have a `from_json()` method of
-      the form `ValueType from_json(const basic_json&)`
-
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get__ValueType_const}
-
-    @since version 2.1.0
-    */
-    template < typename ValueType,
-               detail::enable_if_t <
-                   detail::is_default_constructible<ValueType>::value&&
-                   detail::has_from_json<basic_json_t, ValueType>::value,
-                   int > = 0 >
-    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
-    {
-        auto ret = ValueType();
-        JSONSerializer<ValueType>::from_json(*this, ret);
-        return ret;
-    }
-
-    /*!
-    @brief get a value (explicit); special case
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    return JSONSerializer<ValueType>::from_json(*this);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json and
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `ValueType from_json(const basic_json&)`
-
-    @note If @ref json_serializer<ValueType> has both overloads of
-    `from_json()`, this one is chosen.
-
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @since version 2.1.0
-    */
-    template < typename ValueType,
-               detail::enable_if_t <
-                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-                   int > = 0 >
-    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
-    {
-        return JSONSerializer<ValueType>::from_json(*this);
-    }
-
-    /*!
-    @brief get special-case overload
-
-    This overloads converts the current @ref basic_json in a different
-    @ref basic_json type
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this, converted into @a BasicJsonType
-
-    @complexity Depending on the implementation of the called `from_json()`
-                method.
-
-    @since version 3.2.0
-    */
-    template < typename BasicJsonType,
-               detail::enable_if_t <
-                   detail::is_basic_json<BasicJsonType>::value,
-                   int > = 0 >
-    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
-    {
-        return *this;
-    }
-
-    /*!
-    @brief get special-case overload
-
-    This overloads avoids a lot of template boilerplate, it can be seen as the
-    identity method
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this
-
-    @complexity Constant.
-
-    @since version 2.1.0
-    */
-    template<typename BasicJsonType,
-             detail::enable_if_t<
-                 std::is_same<BasicJsonType, basic_json_t>::value,
-                 int> = 0>
-    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
-    {
-        return *this;
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-    @copydoc get()
-    */
-    template<typename PointerType,
-             detail::enable_if_t<
-                 std::is_pointer<PointerType>::value,
-                 int> = 0>
-    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
-    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-  public:
-    /*!
-    @brief get a (pointer) value (explicit)
-
-    Performs explicit type conversion between the JSON value and a compatible value if required.
-
-    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
-    No copies are made.
-
-    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
-    from the current @ref basic_json.
-
-    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
-    method.
-
-    @tparam ValueTypeCV the provided value type
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @tparam ValueType if necessary
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
-
-    @since version 2.1.0
-    */
-    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
-#if defined(JSON_HAS_CPP_14)
-    constexpr
-#endif
-    auto get() const noexcept(
-    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
-    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
-    {
-        // we cannot static_assert on ValueTypeCV being non-const, because
-        // there is support for get<const basic_json_t>(), which is why we
-        // still need the uncvref
-        static_assert(!std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
-        return get_impl<ValueType>(detail::priority_tag<4> {});
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-
-    Explicit pointer access to the internally stored JSON value. No copies are
-    made.
-
-    @warning The pointer becomes invalid if the underlying JSON object
-    changes.
-
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t.
-
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get__PointerType}
-
-    @sa see @ref get_ptr() for explicit pointer-member access
-
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-    /// @brief get a value (explicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_to/
-    template < typename ValueType,
-               detail::enable_if_t <
-                   !detail::is_basic_json<ValueType>::value&&
-                   detail::has_from_json<basic_json_t, ValueType>::value,
-                   int > = 0 >
-    ValueType & get_to(ValueType& v) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
-    {
-        JSONSerializer<ValueType>::from_json(*this, v);
-        return v;
-    }
-
-    // specialization to allow calling get_to with a basic_json value
-    // see https://github.com/nlohmann/json/issues/2175
-    template<typename ValueType,
-             detail::enable_if_t <
-                 detail::is_basic_json<ValueType>::value,
-                 int> = 0>
-    ValueType & get_to(ValueType& v) const
-    {
-        v = *this;
-        return v;
-    }
-
-    template <
-        typename T, std::size_t N,
-        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-        detail::enable_if_t <
-            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
-    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-    noexcept(noexcept(JSONSerializer<Array>::from_json(
-                          std::declval<const basic_json_t&>(), v)))
-    {
-        JSONSerializer<Array>::from_json(*this, v);
-        return v;
-    }
-
-    /// @brief get a reference value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
-    template<typename ReferenceType, typename std::enable_if<
-                 std::is_reference<ReferenceType>::value, int>::type = 0>
-    ReferenceType get_ref()
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /// @brief get a reference value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
-    template < typename ReferenceType, typename std::enable_if <
-                   std::is_reference<ReferenceType>::value&&
-                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
-    ReferenceType get_ref() const
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /*!
-    @brief get a value (implicit)
-
-    Implicit type conversion between the JSON value and a compatible value.
-    The call is realized by calling @ref get() const.
-
-    @tparam ValueType non-pointer type compatible to the JSON value, for
-    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
-    `std::vector` types for JSON arrays. The character type of @ref string_t
-    as well as an initializer list of this type is excluded to avoid
-    ambiguities as these types implicitly convert to `std::string`.
-
-    @return copy of the JSON value, converted to type @a ValueType
-
-    @throw type_error.302 in case passed type @a ValueType is incompatible
-    to the JSON value type (e.g., the JSON value is of type boolean, but a
-    string is requested); see example below
-
-    @complexity Linear in the size of the JSON value.
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,operator__ValueType}
-
-    @since version 1.0.0
-    */
-    template < typename ValueType, typename std::enable_if <
-                   detail::conjunction <
-                       detail::negation<std::is_pointer<ValueType>>,
-                       detail::negation<std::is_same<ValueType, std::nullptr_t>>,
-                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
-                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
-                                        detail::negation<detail::is_basic_json<ValueType>>,
-                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
-#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
-                                                detail::negation<std::is_same<ValueType, std::string_view>>,
-#endif
-#if defined(JSON_HAS_CPP_17)
-                                                detail::negation<std::is_same<ValueType, std::any>>,
-#endif
-                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
-                                                >::value, int >::type = 0 >
-                                        JSON_EXPLICIT operator ValueType() const
-    {
-        // delegate the call to get<>() const
-        return get<ValueType>();
-    }
-
-    /// @brief get a binary value
-    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
-    binary_t& get_binary()
-    {
-        if (!is_binary())
-        {
-            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
-        }
-
-        return *get_ptr<binary_t*>();
-    }
-
-    /// @brief get a binary value
-    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
-    const binary_t& get_binary() const
-    {
-        if (!is_binary())
-        {
-            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
-        }
-
-        return *get_ptr<const binary_t*>();
-    }
-
-    /// @}
-
-
-    ////////////////////
-    // element access //
-    ////////////////////
-
-    /// @name element access
-    /// Access to the JSON value.
-    /// @{
-
-    /// @brief access specified array element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    reference at(size_type idx)
-    {
-        // at only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            JSON_TRY
-            {
-                return set_parent(m_value.array->at(idx));
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
-        }
-    }
-
-    /// @brief access specified array element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    const_reference at(size_type idx) const
-    {
-        // at only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            JSON_TRY
-            {
-                return m_value.array->at(idx);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
-        }
-    }
-
-    /// @brief access specified object element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    reference at(const typename object_t::key_type& key)
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
-        }
-
-        auto it = m_value.object->find(key);
-        if (it == m_value.object->end())
-        {
-            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
-        }
-        return set_parent(it->second);
-    }
-
-    /// @brief access specified object element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
-    reference at(KeyType && key)
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
-        }
-
-        auto it = m_value.object->find(std::forward<KeyType>(key));
-        if (it == m_value.object->end())
-        {
-            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
-        }
-        return set_parent(it->second);
-    }
-
-    /// @brief access specified object element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    const_reference at(const typename object_t::key_type& key) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
-        }
-
-        auto it = m_value.object->find(key);
-        if (it == m_value.object->end())
-        {
-            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
-        }
-        return it->second;
-    }
-
-    /// @brief access specified object element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
-    const_reference at(KeyType && key) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
-        }
-
-        auto it = m_value.object->find(std::forward<KeyType>(key));
-        if (it == m_value.object->end())
-        {
-            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
-        }
-        return it->second;
-    }
-
-    /// @brief access specified array element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    reference operator[](size_type idx)
-    {
-        // implicitly convert null value to an empty array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value.array = create<array_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // fill up array with null values if given idx is outside range
-            if (idx >= m_value.array->size())
-            {
-#if JSON_DIAGNOSTICS
-                // remember array size & capacity before resizing
-                const auto old_size = m_value.array->size();
-                const auto old_capacity = m_value.array->capacity();
-#endif
-                m_value.array->resize(idx + 1);
-
-#if JSON_DIAGNOSTICS
-                if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity))
-                {
-                    // capacity has changed: update all parents
-                    set_parents();
-                }
-                else
-                {
-                    // set parent for values added above
-                    set_parents(begin() + static_cast<typename iterator::difference_type>(old_size), static_cast<typename iterator::difference_type>(idx + 1 - old_size));
-                }
-#endif
-                assert_invariant();
-            }
-
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
-    }
-
-    /// @brief access specified array element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    const_reference operator[](size_type idx) const
-    {
-        // const operator[] only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
-    }
-
-    /// @brief access specified object element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    reference operator[](typename object_t::key_type key)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            auto result = m_value.object->emplace(std::move(key), nullptr);
-            return set_parent(result.first->second);
-        }
-
-        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
-    }
-
-    /// @brief access specified object element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    const_reference operator[](const typename object_t::key_type& key) const
-    {
-        // const operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            auto it = m_value.object->find(key);
-            JSON_ASSERT(it != m_value.object->end());
-            return it->second;
-        }
-
-        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
-    }
-
-    // these two functions resolve a (const) char * ambiguity affecting Clang and MSVC
-    // (they seemingly cannot be constrained to resolve the ambiguity)
-    template<typename T>
-    reference operator[](T* key)
-    {
-        return operator[](typename object_t::key_type(key));
-    }
-
-    template<typename T>
-    const_reference operator[](T* key) const
-    {
-        return operator[](typename object_t::key_type(key));
-    }
-
-    /// @brief access specified object element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
-    reference operator[](KeyType && key)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            auto result = m_value.object->emplace(std::forward<KeyType>(key), nullptr);
-            return set_parent(result.first->second);
-        }
-
-        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
-    }
-
-    /// @brief access specified object element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
-    const_reference operator[](KeyType && key) const
-    {
-        // const operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            auto it = m_value.object->find(std::forward<KeyType>(key));
-            JSON_ASSERT(it != m_value.object->end());
-            return it->second;
-        }
-
-        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
-    }
-
-  private:
-    template<typename KeyType>
-    using is_comparable_with_object_key = detail::is_comparable <
-        object_comparator_t, const typename object_t::key_type&, KeyType >;
-
-    template<typename ValueType>
-    using value_return_type = std::conditional <
-        detail::is_c_string_uncvref<ValueType>::value,
-        string_t, typename std::decay<ValueType>::type >;
-
-  public:
-    /// @brief access specified object element with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    template < class ValueType, detail::enable_if_t <
-                   !detail::is_transparent<object_comparator_t>::value
-                   && detail::is_getable<basic_json_t, ValueType>::value
-                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
-    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
-    {
-        // value only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if key is found, return value and given default value otherwise
-            const auto it = find(key);
-            if (it != end())
-            {
-                return it->template get<ValueType>();
-            }
-
-            return default_value;
-        }
-
-        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
-    }
-
-    /// @brief access specified object element with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
-               detail::enable_if_t <
-                   !detail::is_transparent<object_comparator_t>::value
-                   && detail::is_getable<basic_json_t, ReturnType>::value
-                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
-    ReturnType value(const typename object_t::key_type& key, ValueType && default_value) const
-    {
-        // value only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if key is found, return value and given default value otherwise
-            const auto it = find(key);
-            if (it != end())
-            {
-                return it->template get<ReturnType>();
-            }
-
-            return std::forward<ValueType>(default_value);
-        }
-
-        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
-    }
-
-    /// @brief access specified object element with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    template < class ValueType, class KeyType, detail::enable_if_t <
-                   detail::is_transparent<object_comparator_t>::value
-                   && !detail::is_json_pointer<KeyType>::value
-                   && is_comparable_with_object_key<KeyType>::value
-                   && detail::is_getable<basic_json_t, ValueType>::value
-                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
-    ValueType value(KeyType && key, const ValueType& default_value) const
-    {
-        // value only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if key is found, return value and given default value otherwise
-            const auto it = find(std::forward<KeyType>(key));
-            if (it != end())
-            {
-                return it->template get<ValueType>();
-            }
-
-            return default_value;
-        }
-
-        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
-    }
-
-    /// @brief access specified object element via JSON Pointer with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    template < class ValueType, class KeyType, class ReturnType = typename value_return_type<ValueType>::type,
-               detail::enable_if_t <
-                   detail::is_transparent<object_comparator_t>::value
-                   && !detail::is_json_pointer<KeyType>::value
-                   && is_comparable_with_object_key<KeyType>::value
-                   && detail::is_getable<basic_json_t, ReturnType>::value
-                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
-    ReturnType value(KeyType && key, ValueType && default_value) const
-    {
-        // value only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if key is found, return value and given default value otherwise
-            const auto it = find(std::forward<KeyType>(key));
-            if (it != end())
-            {
-                return it->template get<ReturnType>();
-            }
-
-            return std::forward<ValueType>(default_value);
-        }
-
-        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
-    }
-
-    /// @brief access specified object element via JSON Pointer with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    template < class ValueType, detail::enable_if_t <
-                   detail::is_getable<basic_json_t, ValueType>::value
-                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
-    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
-    {
-        // value only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if pointer resolves a value, return it or use default value
-            JSON_TRY
-            {
-                return ptr.get_checked(this).template get<ValueType>();
-            }
-            JSON_INTERNAL_CATCH (out_of_range&)
-            {
-                return default_value;
-            }
-        }
-
-        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
-    }
-
-    /// @brief access specified object element via JSON Pointer with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
-               detail::enable_if_t <
-                   detail::is_getable<basic_json_t, ReturnType>::value
-                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
-    ReturnType value(const json_pointer& ptr, ValueType && default_value) const
-    {
-        // value only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if pointer resolves a value, return it or use default value
-            JSON_TRY
-            {
-                return ptr.get_checked(this).template get<ReturnType>();
-            }
-            JSON_INTERNAL_CATCH (out_of_range&)
-            {
-                return std::forward<ValueType>(default_value);
-            }
-        }
-
-        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
-    }
-
-    template < class ValueType, class BasicJsonType, detail::enable_if_t <
-                   detail::is_basic_json<BasicJsonType>::value
-                   && detail::is_getable<basic_json_t, ValueType>::value
-                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
-    ValueType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, const ValueType& default_value) const
-    {
-        return value(ptr.convert(), default_value);
-    }
-
-    template < class ValueType, class BasicJsonType, class ReturnType = typename value_return_type<ValueType>::type,
-               detail::enable_if_t <
-                   detail::is_basic_json<BasicJsonType>::value
-                   && detail::is_getable<basic_json_t, ReturnType>::value
-                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
-    ReturnType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, ValueType && default_value) const
-    {
-        return value(ptr.convert(), std::forward<ValueType>(default_value));
-    }
-
-    /// @brief access the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/front/
-    reference front()
-    {
-        return *begin();
-    }
-
-    /// @brief access the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/front/
-    const_reference front() const
-    {
-        return *cbegin();
-    }
-
-    /// @brief access the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/back/
-    reference back()
-    {
-        auto tmp = end();
-        --tmp;
-        return *tmp;
-    }
-
-    /// @brief access the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/back/
-    const_reference back() const
-    {
-        auto tmp = cend();
-        --tmp;
-        return *tmp;
-    }
-
-    /// @brief remove element given an iterator
-    /// @sa https://json.nlohmann.me/api/basic_json/erase/
-    template < class IteratorType, detail::enable_if_t <
-                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
-    IteratorType erase(IteratorType pos)
-    {
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            case value_t::binary:
-            {
-                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
-                {
-                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", this));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-                else if (is_binary())
-                {
-                    AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
-        }
-
-        return result;
-    }
-
-    /// @brief remove elements given an iterator range
-    /// @sa https://json.nlohmann.me/api/basic_json/erase/
-    template < class IteratorType, detail::enable_if_t <
-                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
-    IteratorType erase(IteratorType first, IteratorType last)
-    {
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", this));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            case value_t::binary:
-            {
-                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
-                                       || !last.m_it.primitive_iterator.is_end()))
-                {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", this));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-                else if (is_binary())
-                {
-                    AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
-                                              last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
-                                             last.m_it.array_iterator);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
-        }
-
-        return result;
-    }
-
-  private:
-    template < typename KeyType, detail::enable_if_t <
-                   detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
-    size_type erase_internal(KeyType && key)
-    {
-        // this erase only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
-        }
-
-        return m_value.object->erase(std::forward<KeyType>(key));
-    }
-
-    template < typename KeyType, detail::enable_if_t <
-                   !detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
-    size_type erase_internal(KeyType && key)
-    {
-        // this erase only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
-        }
-
-        const auto it = m_value.object->find(std::forward<KeyType>(key));
-        if (it != m_value.object->end())
-        {
-            m_value.object->erase(it);
-            return 1;
-        }
-        return 0;
-    }
-
-  public:
-
-    /// @brief remove element from a JSON object given a key
-    /// @sa https://json.nlohmann.me/api/basic_json/erase/
-    size_type erase(const typename object_t::key_type& key)
-    {
-        // the indirection via erase_internal() is added to avoid making this
-        // function a template and thus de-rank it during overload resolution
-        return erase_internal(key);
-    }
-
-    /// @brief remove element from a JSON object given a key
-    /// @sa https://json.nlohmann.me/api/basic_json/erase/
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
-    size_type erase(KeyType && key)
-    {
-        return erase_internal(std::forward<KeyType>(key));
-    }
-
-    /// @brief remove element from a JSON array given an index
-    /// @sa https://json.nlohmann.me/api/basic_json/erase/
-    void erase(const size_type idx)
-    {
-        // this erase only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
-            {
-                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
-            }
-
-            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
-        }
-        else
-        {
-            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
-        }
-    }
-
-    /// @}
-
-
-    ////////////
-    // lookup //
-    ////////////
-
-    /// @name lookup
-    /// @{
-
-    /// @brief find an element in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/find/
-    iterator find(const typename object_t::key_type& key)
-    {
-        auto result = end();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(key);
-        }
-
-        return result;
-    }
-
-    /// @brief find an element in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/find/
-    const_iterator find(const typename object_t::key_type& key) const
-    {
-        auto result = cend();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(key);
-        }
-
-        return result;
-    }
-
-    /// @brief find an element in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/find/
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
-    iterator find(KeyType && key)
-    {
-        auto result = end();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyType>(key));
-        }
-
-        return result;
-    }
-
-    /// @brief find an element in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/find/
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
-    const_iterator find(KeyType && key) const
-    {
-        auto result = cend();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyType>(key));
-        }
-
-        return result;
-    }
-
-    /// @brief returns the number of occurrences of a key in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/count/
-    size_type count(const typename object_t::key_type& key) const
-    {
-        // return 0 for all nonobject types
-        return is_object() ? m_value.object->count(key) : 0;
-    }
-
-    /// @brief returns the number of occurrences of a key in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/count/
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
-    size_type count(KeyType && key) const
-    {
-        // return 0 for all nonobject types
-        return is_object() ? m_value.object->count(std::forward<KeyType>(key)) : 0;
-    }
-
-    /// @brief check the existence of an element in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/contains/
-    bool contains(const typename object_t::key_type& key) const
-    {
-        return is_object() && m_value.object->find(key) != m_value.object->end();
-    }
-
-    /// @brief check the existence of an element in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/contains/
-    template<class KeyType, detail::enable_if_t<
-                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
-    bool contains(KeyType && key) const
-    {
-        return is_object() && m_value.object->find(std::forward<KeyType>(key)) != m_value.object->end();
-    }
-
-    /// @brief check the existence of an element in a JSON object given a JSON pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/contains/
-    bool contains(const json_pointer& ptr) const
-    {
-        return ptr.contains(this);
-    }
-
-    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
-    bool contains(const typename ::nlohmann::json_pointer<BasicJsonType>& ptr) const
-    {
-        return ptr.contains(this);
-    }
-
-    /// @}
-
-
-    ///////////////
-    // iterators //
-    ///////////////
-
-    /// @name iterators
-    /// @{
-
-    /// @brief returns an iterator to the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/begin/
-    iterator begin() noexcept
-    {
-        iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /// @brief returns an iterator to the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/begin/
-    const_iterator begin() const noexcept
-    {
-        return cbegin();
-    }
-
-    /// @brief returns a const iterator to the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/cbegin/
-    const_iterator cbegin() const noexcept
-    {
-        const_iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /// @brief returns an iterator to one past the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/end/
-    iterator end() noexcept
-    {
-        iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /// @brief returns an iterator to one past the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/end/
-    const_iterator end() const noexcept
-    {
-        return cend();
-    }
-
-    /// @brief returns an iterator to one past the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/cend/
-    const_iterator cend() const noexcept
-    {
-        const_iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /// @brief returns an iterator to the reverse-beginning
-    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
-    reverse_iterator rbegin() noexcept
-    {
-        return reverse_iterator(end());
-    }
-
-    /// @brief returns an iterator to the reverse-beginning
-    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
-    const_reverse_iterator rbegin() const noexcept
-    {
-        return crbegin();
-    }
-
-    /// @brief returns an iterator to the reverse-end
-    /// @sa https://json.nlohmann.me/api/basic_json/rend/
-    reverse_iterator rend() noexcept
-    {
-        return reverse_iterator(begin());
-    }
-
-    /// @brief returns an iterator to the reverse-end
-    /// @sa https://json.nlohmann.me/api/basic_json/rend/
-    const_reverse_iterator rend() const noexcept
-    {
-        return crend();
-    }
-
-    /// @brief returns a const reverse iterator to the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/crbegin/
-    const_reverse_iterator crbegin() const noexcept
-    {
-        return const_reverse_iterator(cend());
-    }
-
-    /// @brief returns a const reverse iterator to one before the first
-    /// @sa https://json.nlohmann.me/api/basic_json/crend/
-    const_reverse_iterator crend() const noexcept
-    {
-        return const_reverse_iterator(cbegin());
-    }
-
-  public:
-    /// @brief wrapper to access iterator member functions in range-based for
-    /// @sa https://json.nlohmann.me/api/basic_json/items/
-    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
-    ///             version 4.0.0 of the library. Please use @ref items() instead;
-    ///             that is, replace `json::iterator_wrapper(j)` with `j.items()`.
-    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
-    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /// @brief wrapper to access iterator member functions in range-based for
-    /// @sa https://json.nlohmann.me/api/basic_json/items/
-    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
-    ///         version 4.0.0 of the library. Please use @ref items() instead;
-    ///         that is, replace `json::iterator_wrapper(j)` with `j.items()`.
-    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
-    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /// @brief helper to access iterator member functions in range-based for
-    /// @sa https://json.nlohmann.me/api/basic_json/items/
-    iteration_proxy<iterator> items() noexcept
-    {
-        return iteration_proxy<iterator>(*this);
-    }
-
-    /// @brief helper to access iterator member functions in range-based for
-    /// @sa https://json.nlohmann.me/api/basic_json/items/
-    iteration_proxy<const_iterator> items() const noexcept
-    {
-        return iteration_proxy<const_iterator>(*this);
-    }
-
-    /// @}
-
-
-    //////////////
-    // capacity //
-    //////////////
-
-    /// @name capacity
-    /// @{
-
-    /// @brief checks whether the container is empty.
-    /// @sa https://json.nlohmann.me/api/basic_json/empty/
-    bool empty() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return true;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::empty()
-                return m_value.array->empty();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::empty()
-                return m_value.object->empty();
-            }
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // all other types are nonempty
-                return false;
-            }
-        }
-    }
-
-    /// @brief returns the number of elements
-    /// @sa https://json.nlohmann.me/api/basic_json/size/
-    size_type size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return 0;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::size()
-                return m_value.array->size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::size()
-                return m_value.object->size();
-            }
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // all other types have size 1
-                return 1;
-            }
-        }
-    }
-
-    /// @brief returns the maximum possible number of elements
-    /// @sa https://json.nlohmann.me/api/basic_json/max_size/
-    size_type max_size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::array:
-            {
-                // delegate call to array_t::max_size()
-                return m_value.array->max_size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::max_size()
-                return m_value.object->max_size();
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // all other types have max_size() == size()
-                return size();
-            }
-        }
-    }
-
-    /// @}
-
-
-    ///////////////
-    // modifiers //
-    ///////////////
-
-    /// @name modifiers
-    /// @{
-
-    /// @brief clears the contents
-    /// @sa https://json.nlohmann.me/api/basic_json/clear/
-    void clear() noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = 0;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = 0;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = 0.0;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = false;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value.string->clear();
-                break;
-            }
-
-            case value_t::binary:
-            {
-                m_value.binary->clear();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array->clear();
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object->clear();
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
-    void push_back(basic_json&& val)
-    {
-        // push_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
-        {
-            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (move semantics)
-        const auto old_capacity = m_value.array->capacity();
-        m_value.array->push_back(std::move(val));
-        set_parent(m_value.array->back(), old_capacity);
-        // if val is moved from, basic_json move constructor marks it null, so we do not call the destructor
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
-    reference operator+=(basic_json&& val)
-    {
-        push_back(std::move(val));
-        return *this;
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
-    void push_back(const basic_json& val)
-    {
-        // push_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
-        {
-            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array
-        const auto old_capacity = m_value.array->capacity();
-        m_value.array->push_back(val);
-        set_parent(m_value.array->back(), old_capacity);
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
-    reference operator+=(const basic_json& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /// @brief add an object to an object
-    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
-    void push_back(const typename object_t::value_type& val)
-    {
-        // push_back only works for null objects or objects
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
-        {
-            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to object
-        auto res = m_value.object->insert(val);
-        set_parent(res.first->second);
-    }
-
-    /// @brief add an object to an object
-    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
-    reference operator+=(const typename object_t::value_type& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /// @brief add an object to an object
-    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
-    void push_back(initializer_list_t init)
-    {
-        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
-        {
-            basic_json&& key = init.begin()->moved_or_copied();
-            push_back(typename object_t::value_type(
-                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
-        }
-        else
-        {
-            push_back(basic_json(init));
-        }
-    }
-
-    /// @brief add an object to an object
-    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
-    reference operator+=(initializer_list_t init)
-    {
-        push_back(init);
-        return *this;
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/emplace_back/
-    template<class... Args>
-    reference emplace_back(Args&& ... args)
-    {
-        // emplace_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
-        {
-            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace_back() with ", type_name()), this));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-        const auto old_capacity = m_value.array->capacity();
-        m_value.array->emplace_back(std::forward<Args>(args)...);
-        return set_parent(m_value.array->back(), old_capacity);
-    }
-
-    /// @brief add an object to an object if key does not exist
-    /// @sa https://json.nlohmann.me/api/basic_json/emplace/
-    template<class... Args>
-    std::pair<iterator, bool> emplace(Args&& ... args)
-    {
-        // emplace only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
-        {
-            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace() with ", type_name()), this));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-        auto res = m_value.object->emplace(std::forward<Args>(args)...);
-        set_parent(res.first->second);
-
-        // create result iterator and set iterator to the result of emplace
-        auto it = begin();
-        it.m_it.object_iterator = res.first;
-
-        // return pair of iterator and boolean
-        return {it, res.second};
-    }
-
-    /// Helper for insertion of an iterator
-    /// @note: This uses std::distance to support GCC 4.8,
-    ///        see https://github.com/nlohmann/json/pull/1257
-    template<typename... Args>
-    iterator insert_iterator(const_iterator pos, Args&& ... args)
-    {
-        iterator result(this);
-        JSON_ASSERT(m_value.array != nullptr);
-
-        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
-        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
-        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
-
-        // This could have been written as:
-        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
-        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
-
-        set_parents();
-        return result;
-    }
-
-    /// @brief inserts element into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // check if iterator pos fits to this JSON value
-            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-            {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
-            }
-
-            // insert to array and return iterator
-            return insert_iterator(pos, val);
-        }
-
-        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
-    }
-
-    /// @brief inserts element into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, basic_json&& val)
-    {
-        return insert(pos, val);
-    }
-
-    /// @brief inserts copies of element into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // check if iterator pos fits to this JSON value
-            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-            {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
-            }
-
-            // insert to array and return iterator
-            return insert_iterator(pos, cnt, val);
-        }
-
-        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
-    }
-
-    /// @brief inserts range of elements into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_UNLIKELY(!is_array()))
-        {
-            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
-        {
-            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", this));
-        }
-
-        // insert to array and return iterator
-        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
-    }
-
-    /// @brief inserts elements from initializer list into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, initializer_list_t ilist)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_UNLIKELY(!is_array()))
-        {
-            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
-        }
-
-        // insert to array and return iterator
-        return insert_iterator(pos, ilist.begin(), ilist.end());
-    }
-
-    /// @brief inserts range of elements into object
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    void insert(const_iterator first, const_iterator last)
-    {
-        // insert only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
-        }
-
-        // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", this));
-        }
-
-        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
-    }
-
-    /// @brief updates a JSON object from another object, overwriting existing keys
-    /// @sa https://json.nlohmann.me/api/basic_json/update/
-    void update(const_reference j, bool merge_objects = false)
-    {
-        update(j.begin(), j.end(), merge_objects);
-    }
-
-    /// @brief updates a JSON object from another object, overwriting existing keys
-    /// @sa https://json.nlohmann.me/api/basic_json/update/
-    void update(const_iterator first, const_iterator last, bool merge_objects = false)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", type_name()), this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
-        }
-
-        // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
-        {
-            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", first.m_object->type_name()), first.m_object));
-        }
-
-        for (auto it = first; it != last; ++it)
-        {
-            if (merge_objects && it.value().is_object())
-            {
-                auto it2 = m_value.object->find(it.key());
-                if (it2 != m_value.object->end())
-                {
-                    it2->second.update(it.value(), true);
-                    continue;
-                }
-            }
-            m_value.object->operator[](it.key()) = it.value();
-#if JSON_DIAGNOSTICS
-            m_value.object->operator[](it.key()).m_parent = this;
-#endif
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(reference other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value&&
-        std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        std::swap(m_type, other.m_type);
-        std::swap(m_value, other.m_value);
-
-        set_parents();
-        other.set_parents();
-        assert_invariant();
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    friend void swap(reference left, reference right) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value&&
-        std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        left.swap(right);
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(array_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            using std::swap;
-            swap(*(m_value.array), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(array_t&) with ", type_name()), this));
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(object_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            using std::swap;
-            swap(*(m_value.object), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(object_t&) with ", type_name()), this));
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(string_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_string()))
-        {
-            using std::swap;
-            swap(*(m_value.string), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(string_t&) with ", type_name()), this));
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(binary_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_binary()))
-        {
-            using std::swap;
-            swap(*(m_value.binary), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t&) with ", type_name()), this));
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_binary()))
-        {
-            using std::swap;
-            swap(*(m_value.binary), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t::container_type&) with ", type_name()), this));
-        }
-    }
-
-    /// @}
-
-    //////////////////////////////////////////
-    // lexicographical comparison operators //
-    //////////////////////////////////////////
-
-    /// @name lexicographical comparison operators
-    /// @{
-
-    // note parentheses around operands are necessary; see
-    // https://github.com/nlohmann/json/issues/1530
-#define JSON_IMPLEMENT_OPERATOR(op, null_result, unordered_result, default_result)                       \
-    const auto lhs_type = lhs.type();                                                                    \
-    const auto rhs_type = rhs.type();                                                                    \
-    \
-    if (lhs_type == rhs_type) /* NOLINT(readability/braces) */                                           \
-    {                                                                                                    \
-        switch (lhs_type)                                                                                \
-        {                                                                                                \
-            case value_t::array:                                                                         \
-                return (*lhs.m_value.array) op (*rhs.m_value.array);                                     \
-                \
-            case value_t::object:                                                                        \
-                return (*lhs.m_value.object) op (*rhs.m_value.object);                                   \
-                \
-            case value_t::null:                                                                          \
-                return (null_result);                                                                    \
-                \
-            case value_t::string:                                                                        \
-                return (*lhs.m_value.string) op (*rhs.m_value.string);                                   \
-                \
-            case value_t::boolean:                                                                       \
-                return (lhs.m_value.boolean) op (rhs.m_value.boolean);                                   \
-                \
-            case value_t::number_integer:                                                                \
-                return (lhs.m_value.number_integer) op (rhs.m_value.number_integer);                     \
-                \
-            case value_t::number_unsigned:                                                               \
-                return (lhs.m_value.number_unsigned) op (rhs.m_value.number_unsigned);                   \
-                \
-            case value_t::number_float:                                                                  \
-                return (lhs.m_value.number_float) op (rhs.m_value.number_float);                         \
-                \
-            case value_t::binary:                                                                        \
-                return (*lhs.m_value.binary) op (*rhs.m_value.binary);                                   \
-                \
-            case value_t::discarded:                                                                     \
-            default:                                                                                     \
-                return (unordered_result);                                                               \
-        }                                                                                                \
-    }                                                                                                    \
-    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)                   \
-    {                                                                                                    \
-        return static_cast<number_float_t>(lhs.m_value.number_integer) op rhs.m_value.number_float;      \
-    }                                                                                                    \
-    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)                   \
-    {                                                                                                    \
-        return lhs.m_value.number_float op static_cast<number_float_t>(rhs.m_value.number_integer);      \
-    }                                                                                                    \
-    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)                  \
-    {                                                                                                    \
-        return static_cast<number_float_t>(lhs.m_value.number_unsigned) op rhs.m_value.number_float;     \
-    }                                                                                                    \
-    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)                  \
-    {                                                                                                    \
-        return lhs.m_value.number_float op static_cast<number_float_t>(rhs.m_value.number_unsigned);     \
-    }                                                                                                    \
-    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)                \
-    {                                                                                                    \
-        return static_cast<number_integer_t>(lhs.m_value.number_unsigned) op rhs.m_value.number_integer; \
-    }                                                                                                    \
-    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)                \
-    {                                                                                                    \
-        return lhs.m_value.number_integer op static_cast<number_integer_t>(rhs.m_value.number_unsigned); \
-    }                                                                                                    \
-    else if(compares_unordered(lhs, rhs))\
-    {\
-        return (unordered_result);\
-    }\
-    \
-    return (default_result);
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    // returns true if:
-    // - any operand is NaN and the other operand is of number type
-    // - any operand is discarded
-    // in legacy mode, discarded values are considered ordered if
-    // an operation is computed as an odd number of inverses of others
-    static bool compares_unordered(const_reference lhs, const_reference rhs, bool inverse = false) noexcept
-    {
-        if ((lhs.is_number_float() && std::isnan(lhs.m_value.number_float) && rhs.is_number())
-                || (rhs.is_number_float() && std::isnan(rhs.m_value.number_float) && lhs.is_number()))
-        {
-            return true;
-        }
-#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-        return (lhs.is_discarded() || rhs.is_discarded()) && !inverse;
-#else
-        static_cast<void>(inverse);
-        return lhs.is_discarded() || rhs.is_discarded();
-#endif
-    }
-
-  private:
-    bool compares_unordered(const_reference rhs, bool inverse = false) const noexcept
-    {
-        return compares_unordered(*this, rhs, inverse);
-    }
-
-  public:
-#if JSON_HAS_THREE_WAY_COMPARISON
-    /// @brief comparison: equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
-    bool operator==(const_reference rhs) const noexcept
-    {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-        const_reference lhs = *this;
-        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-    }
-
-    /// @brief comparison: equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
-    template<typename ScalarType>
-    requires std::is_scalar_v<ScalarType>
-    bool operator==(ScalarType rhs) const noexcept
-    {
-        return *this == basic_json(rhs);
-    }
-
-    /// @brief comparison: not equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
-    bool operator!=(const_reference rhs) const noexcept
-    {
-        if (compares_unordered(rhs, true))
-        {
-            return false;
-        }
-        return !operator==(rhs);
-    }
-
-    /// @brief comparison: 3-way
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
-    std::partial_ordering operator<=>(const_reference rhs) const noexcept // *NOPAD*
-    {
-        const_reference lhs = *this;
-        // default_result is used if we cannot compare values. In that case,
-        // we compare types.
-        JSON_IMPLEMENT_OPERATOR(<=>, // *NOPAD*
-                                std::partial_ordering::equivalent,
-                                std::partial_ordering::unordered,
-                                lhs_type <=> rhs_type) // *NOPAD*
-    }
-
-    /// @brief comparison: 3-way
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
-    template<typename ScalarType>
-    requires std::is_scalar_v<ScalarType>
-    std::partial_ordering operator<=>(ScalarType rhs) const noexcept // *NOPAD*
-    {
-        return *this <=> basic_json(rhs); // *NOPAD*
-    }
-
-#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-    // all operators that are computed as an odd number of inverses of others
-    // need to be overloaded to emulate the legacy comparison behavior
-
-    /// @brief comparison: less than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
-    bool operator<=(const_reference rhs) const noexcept
-    {
-        if (compares_unordered(rhs, true))
-        {
-            return false;
-        }
-        return !(rhs < *this);
-    }
-
-    /// @brief comparison: less than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
-    template<typename ScalarType>
-    requires std::is_scalar_v<ScalarType>
-    bool operator<=(ScalarType rhs) const noexcept
-    {
-        return *this <= basic_json(rhs);
-    }
-
-    /// @brief comparison: greater than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
-    bool operator>=(const_reference rhs) const noexcept
-    {
-        if (compares_unordered(rhs, true))
-        {
-            return false;
-        }
-        return !(*this < rhs);
-    }
-
-    /// @brief comparison: greater than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
-    template<typename ScalarType>
-    requires std::is_scalar_v<ScalarType>
-    bool operator>=(ScalarType rhs) const noexcept
-    {
-        return *this >= basic_json(rhs);
-    }
-#endif
-#else
-    /// @brief comparison: equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
-    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
-    {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-    }
-
-    /// @brief comparison: equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs == basic_json(rhs);
-    }
-
-    /// @brief comparison: equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) == rhs;
-    }
-
-    /// @brief comparison: not equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
-    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
-    {
-        if (compares_unordered(lhs, rhs, true))
-        {
-            return false;
-        }
-        return !(lhs == rhs);
-    }
-
-    /// @brief comparison: not equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs != basic_json(rhs);
-    }
-
-    /// @brief comparison: not equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) != rhs;
-    }
-
-    /// @brief comparison: less than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
-    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
-    {
-        // default_result is used if we cannot compare values. In that case,
-        // we compare types. Note we have to call the operator explicitly,
-        // because MSVC has problems otherwise.
-        JSON_IMPLEMENT_OPERATOR( <, false, false, operator<(lhs_type, rhs_type))
-    }
-
-    /// @brief comparison: less than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs < basic_json(rhs);
-    }
-
-    /// @brief comparison: less than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) < rhs;
-    }
-
-    /// @brief comparison: less than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
-    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
-    {
-        if (compares_unordered(lhs, rhs, true))
-        {
-            return false;
-        }
-        return !(rhs < lhs);
-    }
-
-    /// @brief comparison: less than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs <= basic_json(rhs);
-    }
-
-    /// @brief comparison: less than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) <= rhs;
-    }
-
-    /// @brief comparison: greater than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
-    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
-    {
-        // double inverse
-        if (compares_unordered(lhs, rhs))
-        {
-            return false;
-        }
-        return !(lhs <= rhs);
-    }
-
-    /// @brief comparison: greater than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs > basic_json(rhs);
-    }
-
-    /// @brief comparison: greater than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) > rhs;
-    }
-
-    /// @brief comparison: greater than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
-    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
-    {
-        if (compares_unordered(lhs, rhs, true))
-        {
-            return false;
-        }
-        return !(lhs < rhs);
-    }
-
-    /// @brief comparison: greater than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs >= basic_json(rhs);
-    }
-
-    /// @brief comparison: greater than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) >= rhs;
-    }
-#endif
-
-#undef JSON_IMPLEMENT_OPERATOR
-
-    /// @}
-
-    ///////////////////
-    // serialization //
-    ///////////////////
-
-    /// @name serialization
-    /// @{
-#ifndef JSON_NO_IO
-    /// @brief serialize to stream
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
-    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
-    {
-        // read width member and use it as indentation parameter if nonzero
-        const bool pretty_print = o.width() > 0;
-        const auto indentation = pretty_print ? o.width() : 0;
-
-        // reset width to 0 for subsequent calls to this stream
-        o.width(0);
-
-        // do the actual serialization
-        serializer s(detail::output_adapter<char>(o), o.fill());
-        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
-        return o;
-    }
-
-    /// @brief serialize to stream
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
-    /// @deprecated This function is deprecated since 3.0.0 and will be removed in
-    ///             version 4.0.0 of the library. Please use
-    ///             operator<<(std::ostream&, const basic_json&) instead; that is,
-    ///             replace calls like `j >> o;` with `o << j;`.
-    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
-    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
-    {
-        return o << j;
-    }
-#endif  // JSON_NO_IO
-    /// @}
-
-
-    /////////////////////
-    // deserialization //
-    /////////////////////
-
-    /// @name deserialization
-    /// @{
-
-    /// @brief deserialize from a compatible input
-    /// @sa https://json.nlohmann.me/api/basic_json/parse/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json parse(InputType&& i,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true,
-                            const bool ignore_comments = false)
-    {
-        basic_json result;
-        parser(detail::input_adapter(std::forward<InputType>(i)), cb, allow_exceptions, ignore_comments).parse(true, result);
-        return result;
-    }
-
-    /// @brief deserialize from a pair of character iterators
-    /// @sa https://json.nlohmann.me/api/basic_json/parse/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json parse(IteratorType first,
-                            IteratorType last,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true,
-                            const bool ignore_comments = false)
-    {
-        basic_json result;
-        parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result);
-        return result;
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
-    static basic_json parse(detail::span_input_adapter&& i,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true,
-                            const bool ignore_comments = false)
-    {
-        basic_json result;
-        parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result);
-        return result;
-    }
-
-    /// @brief check if the input is valid JSON
-    /// @sa https://json.nlohmann.me/api/basic_json/accept/
-    template<typename InputType>
-    static bool accept(InputType&& i,
-                       const bool ignore_comments = false)
-    {
-        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
-    }
-
-    /// @brief check if the input is valid JSON
-    /// @sa https://json.nlohmann.me/api/basic_json/accept/
-    template<typename IteratorType>
-    static bool accept(IteratorType first, IteratorType last,
-                       const bool ignore_comments = false)
-    {
-        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
-    static bool accept(detail::span_input_adapter&& i,
-                       const bool ignore_comments = false)
-    {
-        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
-    }
-
-    /// @brief generate SAX events
-    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
-    template <typename InputType, typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    static bool sax_parse(InputType&& i, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true,
-                          const bool ignore_comments = false)
-    {
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        return format == input_format_t::json
-               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
-    }
-
-    /// @brief generate SAX events
-    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
-    template<class IteratorType, class SAX>
-    JSON_HEDLEY_NON_NULL(3)
-    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true,
-                          const bool ignore_comments = false)
-    {
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        return format == input_format_t::json
-               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
-    }
-
-    /// @brief generate SAX events
-    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
-    /// @deprecated This function is deprecated since 3.8.0 and will be removed in
-    ///             version 4.0.0 of the library. Please use
-    ///             sax_parse(ptr, ptr + len) instead.
-    template <typename SAX>
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
-    JSON_HEDLEY_NON_NULL(2)
-    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true,
-                          const bool ignore_comments = false)
-    {
-        auto ia = i.get();
-        return format == input_format_t::json
-               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
-    }
-#ifndef JSON_NO_IO
-    /// @brief deserialize from stream
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
-    /// @deprecated This stream operator is deprecated since 3.0.0 and will be removed in
-    ///             version 4.0.0 of the library. Please use
-    ///             operator>>(std::istream&, basic_json&) instead; that is,
-    ///             replace calls like `j << i;` with `i >> j;`.
-    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
-    friend std::istream& operator<<(basic_json& j, std::istream& i)
-    {
-        return operator>>(i, j);
-    }
-
-    /// @brief deserialize from stream
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
-    friend std::istream& operator>>(std::istream& i, basic_json& j)
-    {
-        parser(detail::input_adapter(i)).parse(false, j);
-        return i;
-    }
-#endif  // JSON_NO_IO
-    /// @}
-
-    ///////////////////////////
-    // convenience functions //
-    ///////////////////////////
-
-    /// @brief return the type as string
-    /// @sa https://json.nlohmann.me/api/basic_json/type_name/
-    JSON_HEDLEY_RETURNS_NON_NULL
-    const char* type_name() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-                return "null";
-            case value_t::object:
-                return "object";
-            case value_t::array:
-                return "array";
-            case value_t::string:
-                return "string";
-            case value_t::boolean:
-                return "boolean";
-            case value_t::binary:
-                return "binary";
-            case value_t::discarded:
-                return "discarded";
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            default:
-                return "number";
-        }
-    }
-
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    //////////////////////
-    // member variables //
-    //////////////////////
-
-    /// the type of the current element
-    value_t m_type = value_t::null;
-
-    /// the value of the current element
-    json_value m_value = {};
-
-#if JSON_DIAGNOSTICS
-    /// a pointer to a parent value (for debugging purposes)
-    basic_json* m_parent = nullptr;
-#endif
-
-    //////////////////////////////////////////
-    // binary serialization/deserialization //
-    //////////////////////////////////////////
-
-    /// @name binary serialization/deserialization support
-    /// @{
-
-  public:
-    /// @brief create a CBOR serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
-    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
-    {
-        std::vector<std::uint8_t> result;
-        to_cbor(j, result);
-        return result;
-    }
-
-    /// @brief create a CBOR serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
-    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
-    {
-        binary_writer<std::uint8_t>(o).write_cbor(j);
-    }
-
-    /// @brief create a CBOR serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
-    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_cbor(j);
-    }
-
-    /// @brief create a MessagePack serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
-    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
-    {
-        std::vector<std::uint8_t> result;
-        to_msgpack(j, result);
-        return result;
-    }
-
-    /// @brief create a MessagePack serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
-    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
-    {
-        binary_writer<std::uint8_t>(o).write_msgpack(j);
-    }
-
-    /// @brief create a MessagePack serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
-    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_msgpack(j);
-    }
-
-    /// @brief create a UBJSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
-    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
-            const bool use_size = false,
-            const bool use_type = false)
-    {
-        std::vector<std::uint8_t> result;
-        to_ubjson(j, result, use_size, use_type);
-        return result;
-    }
-
-    /// @brief create a UBJSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
-    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
-    }
-
-    /// @brief create a UBJSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
-    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
-    }
-
-    /// @brief create a BJData serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
-    static std::vector<std::uint8_t> to_bjdata(const basic_json& j,
-            const bool use_size = false,
-            const bool use_type = false)
-    {
-        std::vector<std::uint8_t> result;
-        to_bjdata(j, result, use_size, use_type);
-        return result;
-    }
-
-    /// @brief create a BJData serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
-    static void to_bjdata(const basic_json& j, detail::output_adapter<std::uint8_t> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type, true, true);
-    }
-
-    /// @brief create a BJData serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
-    static void to_bjdata(const basic_json& j, detail::output_adapter<char> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<char>(o).write_ubjson(j, use_size, use_type, true, true);
-    }
-
-    /// @brief create a BSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
-    static std::vector<std::uint8_t> to_bson(const basic_json& j)
-    {
-        std::vector<std::uint8_t> result;
-        to_bson(j, result);
-        return result;
-    }
-
-    /// @brief create a BSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
-    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
-    {
-        binary_writer<std::uint8_t>(o).write_bson(j);
-    }
-
-    /// @brief create a BSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
-    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_bson(j);
-    }
-
-    /// @brief create a JSON value from an input in CBOR format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_cbor(InputType&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in CBOR format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_cbor(IteratorType first, IteratorType last,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
-    static basic_json from_cbor(const T* ptr, std::size_t len,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
-    }
-
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
-    static basic_json from_cbor(detail::span_input_adapter&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in MessagePack format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_msgpack(InputType&& i,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in MessagePack format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_msgpack(IteratorType first, IteratorType last,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
-    static basic_json from_msgpack(const T* ptr, std::size_t len,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
-    static basic_json from_msgpack(detail::span_input_adapter&& i,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in UBJSON format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_ubjson(InputType&& i,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in UBJSON format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_ubjson(IteratorType first, IteratorType last,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
-    static basic_json from_ubjson(const T* ptr, std::size_t len,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
-    static basic_json from_ubjson(detail::span_input_adapter&& i,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-
-    /// @brief create a JSON value from an input in BJData format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bjdata(InputType&& i,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in BJData format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bjdata(IteratorType first, IteratorType last,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in BSON format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bson(InputType&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in BSON format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bson(IteratorType first, IteratorType last,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
-    static basic_json from_bson(const T* ptr, std::size_t len,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        return from_bson(ptr, ptr + len, strict, allow_exceptions);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
-    static basic_json from_bson(detail::span_input_adapter&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-    /// @}
-
-    //////////////////////////
-    // JSON Pointer support //
-    //////////////////////////
-
-    /// @name JSON Pointer functions
-    /// @{
-
-    /// @brief access specified element via JSON Pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    reference operator[](const json_pointer& ptr)
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
-    reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr)
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /// @brief access specified element via JSON Pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    const_reference operator[](const json_pointer& ptr) const
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
-    const_reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /// @brief access specified element via JSON Pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    reference at(const json_pointer& ptr)
-    {
-        return ptr.get_checked(this);
-    }
-
-    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
-    reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr)
-    {
-        return ptr.get_checked(this);
-    }
-
-    /// @brief access specified element via JSON Pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    const_reference at(const json_pointer& ptr) const
-    {
-        return ptr.get_checked(this);
-    }
-
-    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
-    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
-    const_reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
-    {
-        return ptr.get_checked(this);
-    }
-
-    /// @brief return flattened JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/flatten/
-    basic_json flatten() const
-    {
-        basic_json result(value_t::object);
-        json_pointer::flatten("", *this, result);
-        return result;
-    }
-
-    /// @brief unflatten a previously flattened JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/unflatten/
-    basic_json unflatten() const
-    {
-        return json_pointer::unflatten(*this);
-    }
-
-    /// @}
-
-    //////////////////////////
-    // JSON Patch functions //
-    //////////////////////////
-
-    /// @name JSON Patch functions
-    /// @{
-
-    /// @brief applies a JSON patch in-place without copying the object
-    /// @sa https://json.nlohmann.me/api/basic_json/patch/
-    void patch_inplace(const basic_json& json_patch)
-    {
-        basic_json& result = *this;
-        // the valid JSON Patch operations
-        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
-
-        const auto get_op = [](const std::string & op)
-        {
-            if (op == "add")
-            {
-                return patch_operations::add;
-            }
-            if (op == "remove")
-            {
-                return patch_operations::remove;
-            }
-            if (op == "replace")
-            {
-                return patch_operations::replace;
-            }
-            if (op == "move")
-            {
-                return patch_operations::move;
-            }
-            if (op == "copy")
-            {
-                return patch_operations::copy;
-            }
-            if (op == "test")
-            {
-                return patch_operations::test;
-            }
-
-            return patch_operations::invalid;
-        };
-
-        // wrapper for "add" operation; add value at ptr
-        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
-        {
-            // adding to the root of the target document means replacing it
-            if (ptr.empty())
-            {
-                result = val;
-                return;
-            }
-
-            // make sure the top element of the pointer exists
-            json_pointer top_pointer = ptr.top();
-            if (top_pointer != ptr)
-            {
-                result.at(top_pointer);
-            }
-
-            // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.back();
-            ptr.pop_back();
-            // parent must exist when performing patch add per RFC6902 specs
-            basic_json& parent = result.at(ptr);
-
-            switch (parent.m_type)
-            {
-                case value_t::null:
-                case value_t::object:
-                {
-                    // use operator[] to add value
-                    parent[last_path] = val;
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    if (last_path == "-")
-                    {
-                        // special case: append to back
-                        parent.push_back(val);
-                    }
-                    else
-                    {
-                        const auto idx = json_pointer::template array_index<basic_json_t>(last_path);
-                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
-                        {
-                            // avoid undefined behavior
-                            JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), &parent));
-                        }
-
-                        // default case: insert add offset
-                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
-                    }
-                    break;
-                }
-
-                // if there exists a parent it cannot be primitive
-                case value_t::string: // LCOV_EXCL_LINE
-                case value_t::boolean: // LCOV_EXCL_LINE
-                case value_t::number_integer: // LCOV_EXCL_LINE
-                case value_t::number_unsigned: // LCOV_EXCL_LINE
-                case value_t::number_float: // LCOV_EXCL_LINE
-                case value_t::binary: // LCOV_EXCL_LINE
-                case value_t::discarded: // LCOV_EXCL_LINE
-                default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-            }
-        };
-
-        // wrapper for "remove" operation; remove value at ptr
-        const auto operation_remove = [this, &result](json_pointer & ptr)
-        {
-            // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.back();
-            ptr.pop_back();
-            basic_json& parent = result.at(ptr);
-
-            // remove child
-            if (parent.is_object())
-            {
-                // perform range check
-                auto it = parent.find(last_path);
-                if (JSON_HEDLEY_LIKELY(it != parent.end()))
-                {
-                    parent.erase(it);
-                }
-                else
-                {
-                    JSON_THROW(out_of_range::create(403, detail::concat("key '", last_path, "' not found"), this));
-                }
-            }
-            else if (parent.is_array())
-            {
-                // note erase performs range check
-                parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
-            }
-        };
-
-        // type check: top level value must be an array
-        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
-        {
-            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &json_patch));
-        }
-
-        // iterate and apply the operations
-        for (const auto& val : json_patch)
-        {
-            // wrapper to get a value for an operation
-            const auto get_value = [&val](const std::string & op,
-                                          const std::string & member,
-                                          bool string_type) -> basic_json &
-            {
-                // find value
-                auto it = val.m_value.object->find(member);
-
-                // context-sensitive error message
-                const auto error_msg = (op == "op") ? "operation" : detail::concat("operation '", op, '\'');
-
-                // check if desired value is present
-                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
-                {
-                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
-                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have member '", member, "'"), &val));
-                }
-
-                // check if result is of type string
-                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
-                {
-                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
-                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have string member '", member, "'"), &val));
-                }
-
-                // no error: return value
-                return it->second;
-            };
-
-            // type check: every element of the array must be an object
-            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
-            {
-                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &val));
-            }
-
-            // collect mandatory members
-            const auto op = get_value("op", "op", true).template get<std::string>();
-            const auto path = get_value(op, "path", true).template get<std::string>();
-            json_pointer ptr(path);
-
-            switch (get_op(op))
-            {
-                case patch_operations::add:
-                {
-                    operation_add(ptr, get_value("add", "value", false));
-                    break;
-                }
-
-                case patch_operations::remove:
-                {
-                    operation_remove(ptr);
-                    break;
-                }
-
-                case patch_operations::replace:
-                {
-                    // the "path" location must exist - use at()
-                    result.at(ptr) = get_value("replace", "value", false);
-                    break;
-                }
-
-                case patch_operations::move:
-                {
-                    const auto from_path = get_value("move", "from", true).template get<std::string>();
-                    json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
-
-                    // The move operation is functionally identical to a
-                    // "remove" operation on the "from" location, followed
-                    // immediately by an "add" operation at the target
-                    // location with the value that was just removed.
-                    operation_remove(from_ptr);
-                    operation_add(ptr, v);
-                    break;
-                }
-
-                case patch_operations::copy:
-                {
-                    const auto from_path = get_value("copy", "from", true).template get<std::string>();
-                    const json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
-
-                    // The copy is functionally identical to an "add"
-                    // operation at the target location using the value
-                    // specified in the "from" member.
-                    operation_add(ptr, v);
-                    break;
-                }
-
-                case patch_operations::test:
-                {
-                    bool success = false;
-                    JSON_TRY
-                    {
-                        // check if "value" matches the one at "path"
-                        // the "path" location must exist - use at()
-                        success = (result.at(ptr) == get_value("test", "value", false));
-                    }
-                    JSON_INTERNAL_CATCH (out_of_range&)
-                    {
-                        // ignore out of range errors: success remains false
-                    }
-
-                    // throw an exception if test fails
-                    if (JSON_HEDLEY_UNLIKELY(!success))
-                    {
-                        JSON_THROW(other_error::create(501, detail::concat("unsuccessful: ", val.dump()), &val));
-                    }
-
-                    break;
-                }
-
-                case patch_operations::invalid:
-                default:
-                {
-                    // op must be "add", "remove", "replace", "move", "copy", or
-                    // "test"
-                    JSON_THROW(parse_error::create(105, 0, detail::concat("operation value '", op, "' is invalid"), &val));
-                }
-            }
-        }
-    }
-
-    /// @brief applies a JSON patch to a copy of the current object
-    /// @sa https://json.nlohmann.me/api/basic_json/patch/
-    basic_json patch(const basic_json& json_patch) const
-    {
-        basic_json result = *this;
-        result.patch_inplace(json_patch);
-        return result;
-    }
-
-    /// @brief creates a diff as a JSON patch
-    /// @sa https://json.nlohmann.me/api/basic_json/diff/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json diff(const basic_json& source, const basic_json& target,
-                           const std::string& path = "")
-    {
-        // the patch
-        basic_json result(value_t::array);
-
-        // if the values are the same, return empty patch
-        if (source == target)
-        {
-            return result;
-        }
-
-        if (source.type() != target.type())
-        {
-            // different types: replace value
-            result.push_back(
-            {
-                {"op", "replace"}, {"path", path}, {"value", target}
-            });
-            return result;
-        }
-
-        switch (source.type())
-        {
-            case value_t::array:
-            {
-                // first pass: traverse common elements
-                std::size_t i = 0;
-                while (i < source.size() && i < target.size())
-                {
-                    // recursive call to compare array values at index i
-                    auto temp_diff = diff(source[i], target[i], detail::concat(path, '/', std::to_string(i)));
-                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                    ++i;
-                }
-
-                // We now reached the end of at least one array
-                // in a second pass, traverse the remaining elements
-
-                // remove my remaining elements
-                const auto end_index = static_cast<difference_type>(result.size());
-                while (i < source.size())
-                {
-                    // add operations in reverse order to avoid invalid
-                    // indices
-                    result.insert(result.begin() + end_index, object(
-                    {
-                        {"op", "remove"},
-                        {"path", detail::concat(path, '/', std::to_string(i))}
-                    }));
-                    ++i;
-                }
-
-                // add other remaining elements
-                while (i < target.size())
-                {
-                    result.push_back(
-                    {
-                        {"op", "add"},
-                        {"path", detail::concat(path, "/-")},
-                        {"value", target[i]}
-                    });
-                    ++i;
-                }
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // first pass: traverse this object's elements
-                for (auto it = source.cbegin(); it != source.cend(); ++it)
-                {
-                    // escape the key name to be used in a JSON patch
-                    const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
-
-                    if (target.find(it.key()) != target.end())
-                    {
-                        // recursive call to compare object values at key it
-                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
-                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                    }
-                    else
-                    {
-                        // found a key that is not in o -> remove it
-                        result.push_back(object(
-                        {
-                            {"op", "remove"}, {"path", path_key}
-                        }));
-                    }
-                }
-
-                // second pass: traverse other object's elements
-                for (auto it = target.cbegin(); it != target.cend(); ++it)
-                {
-                    if (source.find(it.key()) == source.end())
-                    {
-                        // found a key that is not in this -> add it
-                        const auto path_key = detail::concat(path, '/', detail::escape(it.key()));
-                        result.push_back(
-                        {
-                            {"op", "add"}, {"path", path_key},
-                            {"value", it.value()}
-                        });
-                    }
-                }
-
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // both primitive type: replace value
-                result.push_back(
-                {
-                    {"op", "replace"}, {"path", path}, {"value", target}
-                });
-                break;
-            }
-        }
-
-        return result;
-    }
-    /// @}
-
-    ////////////////////////////////
-    // JSON Merge Patch functions //
-    ////////////////////////////////
-
-    /// @name JSON Merge Patch functions
-    /// @{
-
-    /// @brief applies a JSON Merge Patch
-    /// @sa https://json.nlohmann.me/api/basic_json/merge_patch/
-    void merge_patch(const basic_json& apply_patch)
-    {
-        if (apply_patch.is_object())
-        {
-            if (!is_object())
-            {
-                *this = object();
-            }
-            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
-            {
-                if (it.value().is_null())
-                {
-                    erase(it.key());
-                }
-                else
-                {
-                    operator[](it.key()).merge_patch(it.value());
-                }
-            }
-        }
-        else
-        {
-            *this = apply_patch;
-        }
-    }
-
-    /// @}
-};
-
-/// @brief user-defined to_string function for JSON values
-/// @sa https://json.nlohmann.me/api/basic_json/to_string/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
-{
-    return j.dump();
-}
-
-inline namespace literals
-{
-inline namespace json_literals
-{
-
-/// @brief user-defined string literal for JSON values
-/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json operator "" _json(const char* s, std::size_t n)
-{
-    return nlohmann::json::parse(s, s + n);
-}
-
-/// @brief user-defined string literal for JSON pointer
-/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
-{
-    return nlohmann::json::json_pointer(std::string(s, n));
-}
-
-}  // namespace json_literals
-}  // namespace literals
-NLOHMANN_JSON_NAMESPACE_END
-
-///////////////////////
-// nonmember support //
-///////////////////////
-
-namespace std // NOLINT(cert-dcl58-cpp)
-{
-
-/// @brief hash value for JSON objects
-/// @sa https://json.nlohmann.me/api/basic_json/std_hash/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL>
-{
-    std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
-    {
-        return nlohmann::detail::hash(j);
-    }
-};
-
-// specialization for std::less<value_t>
-template<>
-struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', see https://github.com/nlohmann/json/pull/679
-{
-    /*!
-    @brief compare two value_t enum values
-    @since version 3.0.0
-    */
-    bool operator()(::nlohmann::detail::value_t lhs,
-                    ::nlohmann::detail::value_t rhs) const noexcept
-    {
-#if JSON_HAS_THREE_WAY_COMPARISON
-        return std::is_lt(lhs <=> rhs); // *NOPAD*
-#else
-        return ::nlohmann::detail::operator<(lhs, rhs);
-#endif
-    }
-};
-
-// C++20 prohibit function specialization in the std namespace.
-#ifndef JSON_HAS_CPP_20
-
-/// @brief exchanges the values of two JSON objects
-/// @sa https://json.nlohmann.me/api/basic_json/std_swap/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC_JSON_TPL& j2) noexcept(  // NOLINT(readability-inconsistent-declaration-parameter-name)
-    is_nothrow_move_constructible<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value&&                          // NOLINT(misc-redundant-expression)
-    is_nothrow_move_assignable<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value)
-{
-    j1.swap(j2);
-}
-
-#endif
-
-}  // namespace std
-
-#if JSON_USE_GLOBAL_UDLS
-    using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
-    using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
-#endif
-
-// #include <nlohmann/detail/macro_unscope.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// restore clang diagnostic settings
-#if defined(__clang__)
-    #pragma clang diagnostic pop
-#endif
-
-// clean up
-#undef JSON_ASSERT
-#undef JSON_INTERNAL_CATCH
-#undef JSON_THROW
-#undef JSON_PRIVATE_UNLESS_TESTED
-#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
-#undef NLOHMANN_BASIC_JSON_TPL
-#undef JSON_EXPLICIT
-#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL
-#undef JSON_INLINE_VARIABLE
-#undef JSON_NO_UNIQUE_ADDRESS
-#undef JSON_DISABLE_ENUM_SERIALIZATION
-#undef JSON_USE_GLOBAL_UDLS
-
-#ifndef JSON_TEST_KEEP_MACROS
-    #undef JSON_CATCH
-    #undef JSON_TRY
-    #undef JSON_HAS_CPP_11
-    #undef JSON_HAS_CPP_14
-    #undef JSON_HAS_CPP_17
-    #undef JSON_HAS_CPP_20
-    #undef JSON_HAS_FILESYSTEM
-    #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-    #undef JSON_HAS_THREE_WAY_COMPARISON
-    #undef JSON_HAS_RANGES
-    #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-#endif
-
-// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-#undef JSON_HEDLEY_ALWAYS_INLINE
-#undef JSON_HEDLEY_ARM_VERSION
-#undef JSON_HEDLEY_ARM_VERSION_CHECK
-#undef JSON_HEDLEY_ARRAY_PARAM
-#undef JSON_HEDLEY_ASSUME
-#undef JSON_HEDLEY_BEGIN_C_DECLS
-#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
-#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
-#undef JSON_HEDLEY_CLANG_HAS_FEATURE
-#undef JSON_HEDLEY_CLANG_HAS_WARNING
-#undef JSON_HEDLEY_COMPCERT_VERSION
-#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
-#undef JSON_HEDLEY_CONCAT
-#undef JSON_HEDLEY_CONCAT3
-#undef JSON_HEDLEY_CONCAT3_EX
-#undef JSON_HEDLEY_CONCAT_EX
-#undef JSON_HEDLEY_CONST
-#undef JSON_HEDLEY_CONSTEXPR
-#undef JSON_HEDLEY_CONST_CAST
-#undef JSON_HEDLEY_CPP_CAST
-#undef JSON_HEDLEY_CRAY_VERSION
-#undef JSON_HEDLEY_CRAY_VERSION_CHECK
-#undef JSON_HEDLEY_C_DECL
-#undef JSON_HEDLEY_DEPRECATED
-#undef JSON_HEDLEY_DEPRECATED_FOR
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
-#undef JSON_HEDLEY_DIAGNOSTIC_POP
-#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
-#undef JSON_HEDLEY_DMC_VERSION
-#undef JSON_HEDLEY_DMC_VERSION_CHECK
-#undef JSON_HEDLEY_EMPTY_BASES
-#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
-#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
-#undef JSON_HEDLEY_END_C_DECLS
-#undef JSON_HEDLEY_FLAGS
-#undef JSON_HEDLEY_FLAGS_CAST
-#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_BUILTIN
-#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_EXTENSION
-#undef JSON_HEDLEY_GCC_HAS_FEATURE
-#undef JSON_HEDLEY_GCC_HAS_WARNING
-#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
-#undef JSON_HEDLEY_GCC_VERSION
-#undef JSON_HEDLEY_GCC_VERSION_CHECK
-#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
-#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
-#undef JSON_HEDLEY_GNUC_HAS_FEATURE
-#undef JSON_HEDLEY_GNUC_HAS_WARNING
-#undef JSON_HEDLEY_GNUC_VERSION
-#undef JSON_HEDLEY_GNUC_VERSION_CHECK
-#undef JSON_HEDLEY_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_BUILTIN
-#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
-#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_EXTENSION
-#undef JSON_HEDLEY_HAS_FEATURE
-#undef JSON_HEDLEY_HAS_WARNING
-#undef JSON_HEDLEY_IAR_VERSION
-#undef JSON_HEDLEY_IAR_VERSION_CHECK
-#undef JSON_HEDLEY_IBM_VERSION
-#undef JSON_HEDLEY_IBM_VERSION_CHECK
-#undef JSON_HEDLEY_IMPORT
-#undef JSON_HEDLEY_INLINE
-#undef JSON_HEDLEY_INTEL_CL_VERSION
-#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
-#undef JSON_HEDLEY_INTEL_VERSION
-#undef JSON_HEDLEY_INTEL_VERSION_CHECK
-#undef JSON_HEDLEY_IS_CONSTANT
-#undef JSON_HEDLEY_IS_CONSTEXPR_
-#undef JSON_HEDLEY_LIKELY
-#undef JSON_HEDLEY_MALLOC
-#undef JSON_HEDLEY_MCST_LCC_VERSION
-#undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
-#undef JSON_HEDLEY_MESSAGE
-#undef JSON_HEDLEY_MSVC_VERSION
-#undef JSON_HEDLEY_MSVC_VERSION_CHECK
-#undef JSON_HEDLEY_NEVER_INLINE
-#undef JSON_HEDLEY_NON_NULL
-#undef JSON_HEDLEY_NO_ESCAPE
-#undef JSON_HEDLEY_NO_RETURN
-#undef JSON_HEDLEY_NO_THROW
-#undef JSON_HEDLEY_NULL
-#undef JSON_HEDLEY_PELLES_VERSION
-#undef JSON_HEDLEY_PELLES_VERSION_CHECK
-#undef JSON_HEDLEY_PGI_VERSION
-#undef JSON_HEDLEY_PGI_VERSION_CHECK
-#undef JSON_HEDLEY_PREDICT
-#undef JSON_HEDLEY_PRINTF_FORMAT
-#undef JSON_HEDLEY_PRIVATE
-#undef JSON_HEDLEY_PUBLIC
-#undef JSON_HEDLEY_PURE
-#undef JSON_HEDLEY_REINTERPRET_CAST
-#undef JSON_HEDLEY_REQUIRE
-#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
-#undef JSON_HEDLEY_REQUIRE_MSG
-#undef JSON_HEDLEY_RESTRICT
-#undef JSON_HEDLEY_RETURNS_NON_NULL
-#undef JSON_HEDLEY_SENTINEL
-#undef JSON_HEDLEY_STATIC_ASSERT
-#undef JSON_HEDLEY_STATIC_CAST
-#undef JSON_HEDLEY_STRINGIFY
-#undef JSON_HEDLEY_STRINGIFY_EX
-#undef JSON_HEDLEY_SUNPRO_VERSION
-#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
-#undef JSON_HEDLEY_TINYC_VERSION
-#undef JSON_HEDLEY_TINYC_VERSION_CHECK
-#undef JSON_HEDLEY_TI_ARMCL_VERSION
-#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL2000_VERSION
-#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL430_VERSION
-#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL6X_VERSION
-#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL7X_VERSION
-#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CLPRU_VERSION
-#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
-#undef JSON_HEDLEY_TI_VERSION
-#undef JSON_HEDLEY_TI_VERSION_CHECK
-#undef JSON_HEDLEY_UNAVAILABLE
-#undef JSON_HEDLEY_UNLIKELY
-#undef JSON_HEDLEY_UNPREDICTABLE
-#undef JSON_HEDLEY_UNREACHABLE
-#undef JSON_HEDLEY_UNREACHABLE_RETURN
-#undef JSON_HEDLEY_VERSION
-#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
-#undef JSON_HEDLEY_VERSION_DECODE_MINOR
-#undef JSON_HEDLEY_VERSION_DECODE_REVISION
-#undef JSON_HEDLEY_VERSION_ENCODE
-#undef JSON_HEDLEY_WARNING
-#undef JSON_HEDLEY_WARN_UNUSED_RESULT
-#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
-#undef JSON_HEDLEY_FALL_THROUGH
-
-
-
-#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/jsonhpp/nlohmann/json_fwd.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/jsonhpp/nlohmann/json_fwd.hpp
deleted file mode 100644
index 83c21f857..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/jsonhpp/nlohmann/json_fwd.hpp
+++ /dev/null
@@ -1,175 +0,0 @@
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
-
-// #include <nlohmann/detail/abi_macros.hpp>
-//     __ _____ _____ _____
-//  __|  |   __|     |   | |  JSON for Modern C++
-// |  |  |__   |  |  | | | |  version 3.11.2
-// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
-//
-// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
-// SPDX-License-Identifier: MIT
-
-
-
-// This file contains all macro definitions affecting or depending on the ABI
-
-#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
-    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
-        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 2
-            #warning "Already included a different version of the library!"
-        #endif
-    #endif
-#endif
-
-#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
-#define NLOHMANN_JSON_VERSION_MINOR 11  // NOLINT(modernize-macro-to-enum)
-#define NLOHMANN_JSON_VERSION_PATCH 2   // NOLINT(modernize-macro-to-enum)
-
-#ifndef JSON_DIAGNOSTICS
-    #define JSON_DIAGNOSTICS 0
-#endif
-
-#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
-#endif
-
-#if JSON_DIAGNOSTICS
-    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
-#else
-    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
-#endif
-
-#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
-    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
-#else
-    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
-    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
-#endif
-
-// Construct the namespace ABI tags component
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b
-#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \
-    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b)
-
-#define NLOHMANN_JSON_ABI_TAGS                                       \
-    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
-            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
-            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON)
-
-// Construct the namespace version component
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
-    _v ## major ## _ ## minor ## _ ## patch
-#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
-    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
-
-#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
-#define NLOHMANN_JSON_NAMESPACE_VERSION
-#else
-#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
-    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
-                                           NLOHMANN_JSON_VERSION_MINOR, \
-                                           NLOHMANN_JSON_VERSION_PATCH)
-#endif
-
-// Combine namespace components
-#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
-#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
-    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
-
-#ifndef NLOHMANN_JSON_NAMESPACE
-#define NLOHMANN_JSON_NAMESPACE               \
-    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
-            NLOHMANN_JSON_ABI_TAGS,           \
-            NLOHMANN_JSON_NAMESPACE_VERSION)
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
-#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
-    namespace nlohmann                               \
-    {                                                \
-    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
-                NLOHMANN_JSON_ABI_TAGS,              \
-                NLOHMANN_JSON_NAMESPACE_VERSION)     \
-    {
-#endif
-
-#ifndef NLOHMANN_JSON_NAMESPACE_END
-#define NLOHMANN_JSON_NAMESPACE_END                                     \
-    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
-    }  // namespace nlohmann
-#endif
-
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-NLOHMANN_JSON_NAMESPACE_BEGIN
-
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-/// a class to store JSON values
-/// @sa https://json.nlohmann.me/api/basic_json/
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>>
-class basic_json;
-
-/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
-/// @sa https://json.nlohmann.me/api/json_pointer/
-template<typename RefStringType>
-class json_pointer;
-
-/*!
-@brief default specialization
-@sa https://json.nlohmann.me/api/json/
-*/
-using json = basic_json<>;
-
-/// @brief a minimal map-like container that preserves insertion order
-/// @sa https://json.nlohmann.me/api/ordered_map/
-template<class Key, class T, class IgnoredLess, class Allocator>
-struct ordered_map;
-
-/// @brief specialization that maintains the insertion order of object keys
-/// @sa https://json.nlohmann.me/api/ordered_json/
-using ordered_json = basic_json<nlohmann::ordered_map>;
-
-NLOHMANN_JSON_NAMESPACE_END
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/miniz.c b/contrib/tinyusdz/tinyusdz_repo/src/external/miniz.c
deleted file mode 100644
index 6e7e2184c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/miniz.c
+++ /dev/null
@@ -1,7852 +0,0 @@
-#include "miniz.h"
-/**************************************************************************
- *
- * Copyright 2013-2014 RAD Game Tools and Valve Software
- * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- **************************************************************************/
-
-
-
-typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1];
-typedef unsigned char mz_validate_uint32[sizeof(mz_uint32) == 4 ? 1 : -1];
-typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1];
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------- zlib-style API's */
-
-mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len)
-{
-    mz_uint32 i, s1 = (mz_uint32)(adler & 0xffff), s2 = (mz_uint32)(adler >> 16);
-    size_t block_len = buf_len % 5552;
-    if (!ptr)
-        return MZ_ADLER32_INIT;
-    while (buf_len)
-    {
-        for (i = 0; i + 7 < block_len; i += 8, ptr += 8)
-        {
-            s1 += ptr[0], s2 += s1;
-            s1 += ptr[1], s2 += s1;
-            s1 += ptr[2], s2 += s1;
-            s1 += ptr[3], s2 += s1;
-            s1 += ptr[4], s2 += s1;
-            s1 += ptr[5], s2 += s1;
-            s1 += ptr[6], s2 += s1;
-            s1 += ptr[7], s2 += s1;
-        }
-        for (; i < block_len; ++i)
-            s1 += *ptr++, s2 += s1;
-        s1 %= 65521U, s2 %= 65521U;
-        buf_len -= block_len;
-        block_len = 5552;
-    }
-    return (s2 << 16) + s1;
-}
-
-/* Karl Malbrain's compact CRC-32. See "A compact CCITT crc16 and crc32 C implementation that balances processor cache usage against speed": http://www.geocities.com/malbrain/ */
-#if 0
-    mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len)
-    {
-        static const mz_uint32 s_crc32[16] = { 0, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
-                                               0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c };
-        mz_uint32 crcu32 = (mz_uint32)crc;
-        if (!ptr)
-            return MZ_CRC32_INIT;
-        crcu32 = ~crcu32;
-        while (buf_len--)
-        {
-            mz_uint8 b = *ptr++;
-            crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)];
-            crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)];
-        }
-        return ~crcu32;
-    }
-#elif defined(USE_EXTERNAL_MZCRC)
-/* If USE_EXTERNAL_CRC is defined, an external module will export the
- * mz_crc32() symbol for us to use, e.g. an SSE-accelerated version.
- * Depending on the impl, it may be necessary to ~ the input/output crc values.
- */
-mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len);
-#else
-/* Faster, but larger CPU cache footprint.
- */
-mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len)
-{
-    static const mz_uint32 s_crc_table[256] =
-        {
-          0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535,
-          0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD,
-          0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D,
-          0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-          0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4,
-          0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
-          0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC,
-          0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-          0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB,
-          0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F,
-          0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB,
-          0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-          0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA,
-          0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE,
-          0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A,
-          0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-          0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409,
-          0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
-          0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739,
-          0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-          0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268,
-          0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0,
-          0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8,
-          0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-          0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF,
-          0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703,
-          0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7,
-          0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-          0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE,
-          0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
-          0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6,
-          0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-          0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D,
-          0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5,
-          0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605,
-          0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-          0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-        };
-
-    mz_uint32 crc32 = (mz_uint32)crc ^ 0xFFFFFFFF;
-    const mz_uint8 *pByte_buf = (const mz_uint8 *)ptr;
-
-    while (buf_len >= 4)
-    {
-        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF];
-        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[1]) & 0xFF];
-        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[2]) & 0xFF];
-        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[3]) & 0xFF];
-        pByte_buf += 4;
-        buf_len -= 4;
-    }
-
-    while (buf_len)
-    {
-        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF];
-        ++pByte_buf;
-        --buf_len;
-    }
-
-    return ~crc32;
-}
-#endif
-
-void mz_free(void *p)
-{
-    MZ_FREE(p);
-}
-
-MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items, size_t size)
-{
-    (void)opaque, (void)items, (void)size;
-    return MZ_MALLOC(items * size);
-}
-MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address)
-{
-    (void)opaque, (void)address;
-    MZ_FREE(address);
-}
-MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size)
-{
-    (void)opaque, (void)address, (void)items, (void)size;
-    return MZ_REALLOC(address, items * size);
-}
-
-const char *mz_version(void)
-{
-    return MZ_VERSION;
-}
-
-#ifndef MINIZ_NO_ZLIB_APIS
-
-#ifndef MINIZ_NO_DEFLATE_APIS
-
-int mz_deflateInit(mz_streamp pStream, int level)
-{
-    return mz_deflateInit2(pStream, level, MZ_DEFLATED, MZ_DEFAULT_WINDOW_BITS, 9, MZ_DEFAULT_STRATEGY);
-}
-
-int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy)
-{
-    tdefl_compressor *pComp;
-    mz_uint comp_flags = TDEFL_COMPUTE_ADLER32 | tdefl_create_comp_flags_from_zip_params(level, window_bits, strategy);
-
-    if (!pStream)
-        return MZ_STREAM_ERROR;
-    if ((method != MZ_DEFLATED) || ((mem_level < 1) || (mem_level > 9)) || ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS)))
-        return MZ_PARAM_ERROR;
-
-    pStream->data_type = 0;
-    pStream->adler = MZ_ADLER32_INIT;
-    pStream->msg = NULL;
-    pStream->reserved = 0;
-    pStream->total_in = 0;
-    pStream->total_out = 0;
-    if (!pStream->zalloc)
-        pStream->zalloc = miniz_def_alloc_func;
-    if (!pStream->zfree)
-        pStream->zfree = miniz_def_free_func;
-
-    pComp = (tdefl_compressor *)pStream->zalloc(pStream->opaque, 1, sizeof(tdefl_compressor));
-    if (!pComp)
-        return MZ_MEM_ERROR;
-
-    pStream->state = (struct mz_internal_state *)pComp;
-
-    if (tdefl_init(pComp, NULL, NULL, comp_flags) != TDEFL_STATUS_OKAY)
-    {
-        mz_deflateEnd(pStream);
-        return MZ_PARAM_ERROR;
-    }
-
-    return MZ_OK;
-}
-
-int mz_deflateReset(mz_streamp pStream)
-{
-    if ((!pStream) || (!pStream->state) || (!pStream->zalloc) || (!pStream->zfree))
-        return MZ_STREAM_ERROR;
-    pStream->total_in = pStream->total_out = 0;
-    tdefl_init((tdefl_compressor *)pStream->state, NULL, NULL, ((tdefl_compressor *)pStream->state)->m_flags);
-    return MZ_OK;
-}
-
-int mz_deflate(mz_streamp pStream, int flush)
-{
-    size_t in_bytes, out_bytes;
-    mz_ulong orig_total_in, orig_total_out;
-    int mz_status = MZ_OK;
-
-    if ((!pStream) || (!pStream->state) || (flush < 0) || (flush > MZ_FINISH) || (!pStream->next_out))
-        return MZ_STREAM_ERROR;
-    if (!pStream->avail_out)
-        return MZ_BUF_ERROR;
-
-    if (flush == MZ_PARTIAL_FLUSH)
-        flush = MZ_SYNC_FLUSH;
-
-    if (((tdefl_compressor *)pStream->state)->m_prev_return_status == TDEFL_STATUS_DONE)
-        return (flush == MZ_FINISH) ? MZ_STREAM_END : MZ_BUF_ERROR;
-
-    orig_total_in = pStream->total_in;
-    orig_total_out = pStream->total_out;
-    for (;;)
-    {
-        tdefl_status defl_status;
-        in_bytes = pStream->avail_in;
-        out_bytes = pStream->avail_out;
-
-        defl_status = tdefl_compress((tdefl_compressor *)pStream->state, pStream->next_in, &in_bytes, pStream->next_out, &out_bytes, (tdefl_flush)flush);
-        pStream->next_in += (mz_uint)in_bytes;
-        pStream->avail_in -= (mz_uint)in_bytes;
-        pStream->total_in += (mz_uint)in_bytes;
-        pStream->adler = tdefl_get_adler32((tdefl_compressor *)pStream->state);
-
-        pStream->next_out += (mz_uint)out_bytes;
-        pStream->avail_out -= (mz_uint)out_bytes;
-        pStream->total_out += (mz_uint)out_bytes;
-
-        if (defl_status < 0)
-        {
-            mz_status = MZ_STREAM_ERROR;
-            break;
-        }
-        else if (defl_status == TDEFL_STATUS_DONE)
-        {
-            mz_status = MZ_STREAM_END;
-            break;
-        }
-        else if (!pStream->avail_out)
-            break;
-        else if ((!pStream->avail_in) && (flush != MZ_FINISH))
-        {
-            if ((flush) || (pStream->total_in != orig_total_in) || (pStream->total_out != orig_total_out))
-                break;
-            return MZ_BUF_ERROR; /* Can't make forward progress without some input.
- */
-        }
-    }
-    return mz_status;
-}
-
-int mz_deflateEnd(mz_streamp pStream)
-{
-    if (!pStream)
-        return MZ_STREAM_ERROR;
-    if (pStream->state)
-    {
-        pStream->zfree(pStream->opaque, pStream->state);
-        pStream->state = NULL;
-    }
-    return MZ_OK;
-}
-
-mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len)
-{
-    (void)pStream;
-    /* This is really over conservative. (And lame, but it's actually pretty tricky to compute a true upper bound given the way tdefl's blocking works.) */
-    return MZ_MAX(128 + (source_len * 110) / 100, 128 + source_len + ((source_len / (31 * 1024)) + 1) * 5);
-}
-
-int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level)
-{
-    int status;
-    mz_stream stream;
-    memset(&stream, 0, sizeof(stream));
-
-    /* In case mz_ulong is 64-bits (argh I hate longs). */
-    if ((mz_uint64)(source_len | *pDest_len) > 0xFFFFFFFFU)
-        return MZ_PARAM_ERROR;
-
-    stream.next_in = pSource;
-    stream.avail_in = (mz_uint32)source_len;
-    stream.next_out = pDest;
-    stream.avail_out = (mz_uint32)*pDest_len;
-
-    status = mz_deflateInit(&stream, level);
-    if (status != MZ_OK)
-        return status;
-
-    status = mz_deflate(&stream, MZ_FINISH);
-    if (status != MZ_STREAM_END)
-    {
-        mz_deflateEnd(&stream);
-        return (status == MZ_OK) ? MZ_BUF_ERROR : status;
-    }
-
-    *pDest_len = stream.total_out;
-    return mz_deflateEnd(&stream);
-}
-
-int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len)
-{
-    return mz_compress2(pDest, pDest_len, pSource, source_len, MZ_DEFAULT_COMPRESSION);
-}
-
-mz_ulong mz_compressBound(mz_ulong source_len)
-{
-    return mz_deflateBound(NULL, source_len);
-}
-
-#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
-
-#ifndef MINIZ_NO_INFLATE_APIS
-
-typedef struct
-{
-    tinfl_decompressor m_decomp;
-    mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed;
-    int m_window_bits;
-    mz_uint8 m_dict[TINFL_LZ_DICT_SIZE];
-    tinfl_status m_last_status;
-} inflate_state;
-
-int mz_inflateInit2(mz_streamp pStream, int window_bits)
-{
-    inflate_state *pDecomp;
-    if (!pStream)
-        return MZ_STREAM_ERROR;
-    if ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS))
-        return MZ_PARAM_ERROR;
-
-    pStream->data_type = 0;
-    pStream->adler = 0;
-    pStream->msg = NULL;
-    pStream->total_in = 0;
-    pStream->total_out = 0;
-    pStream->reserved = 0;
-    if (!pStream->zalloc)
-        pStream->zalloc = miniz_def_alloc_func;
-    if (!pStream->zfree)
-        pStream->zfree = miniz_def_free_func;
-
-    pDecomp = (inflate_state *)pStream->zalloc(pStream->opaque, 1, sizeof(inflate_state));
-    if (!pDecomp)
-        return MZ_MEM_ERROR;
-
-    pStream->state = (struct mz_internal_state *)pDecomp;
-
-    tinfl_init(&pDecomp->m_decomp);
-    pDecomp->m_dict_ofs = 0;
-    pDecomp->m_dict_avail = 0;
-    pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT;
-    pDecomp->m_first_call = 1;
-    pDecomp->m_has_flushed = 0;
-    pDecomp->m_window_bits = window_bits;
-
-    return MZ_OK;
-}
-
-int mz_inflateInit(mz_streamp pStream)
-{
-    return mz_inflateInit2(pStream, MZ_DEFAULT_WINDOW_BITS);
-}
-
-int mz_inflateReset(mz_streamp pStream)
-{
-    inflate_state *pDecomp;
-    if (!pStream)
-        return MZ_STREAM_ERROR;
-
-    pStream->data_type = 0;
-    pStream->adler = 0;
-    pStream->msg = NULL;
-    pStream->total_in = 0;
-    pStream->total_out = 0;
-    pStream->reserved = 0;
-
-    pDecomp = (inflate_state *)pStream->state;
-
-    tinfl_init(&pDecomp->m_decomp);
-    pDecomp->m_dict_ofs = 0;
-    pDecomp->m_dict_avail = 0;
-    pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT;
-    pDecomp->m_first_call = 1;
-    pDecomp->m_has_flushed = 0;
-    /* pDecomp->m_window_bits = window_bits */;
-
-    return MZ_OK;
-}
-
-int mz_inflate(mz_streamp pStream, int flush)
-{
-    inflate_state *pState;
-    mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32;
-    size_t in_bytes, out_bytes, orig_avail_in;
-    tinfl_status status;
-
-    if ((!pStream) || (!pStream->state))
-        return MZ_STREAM_ERROR;
-    if (flush == MZ_PARTIAL_FLUSH)
-        flush = MZ_SYNC_FLUSH;
-    if ((flush) && (flush != MZ_SYNC_FLUSH) && (flush != MZ_FINISH))
-        return MZ_STREAM_ERROR;
-
-    pState = (inflate_state *)pStream->state;
-    if (pState->m_window_bits > 0)
-        decomp_flags |= TINFL_FLAG_PARSE_ZLIB_HEADER;
-    orig_avail_in = pStream->avail_in;
-
-    first_call = pState->m_first_call;
-    pState->m_first_call = 0;
-    if (pState->m_last_status < 0)
-        return MZ_DATA_ERROR;
-
-    if (pState->m_has_flushed && (flush != MZ_FINISH))
-        return MZ_STREAM_ERROR;
-    pState->m_has_flushed |= (flush == MZ_FINISH);
-
-    if ((flush == MZ_FINISH) && (first_call))
-    {
-        /* MZ_FINISH on the first call implies that the input and output buffers are large enough to hold the entire compressed/decompressed file. */
-        decomp_flags |= TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF;
-        in_bytes = pStream->avail_in;
-        out_bytes = pStream->avail_out;
-        status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pStream->next_out, pStream->next_out, &out_bytes, decomp_flags);
-        pState->m_last_status = status;
-        pStream->next_in += (mz_uint)in_bytes;
-        pStream->avail_in -= (mz_uint)in_bytes;
-        pStream->total_in += (mz_uint)in_bytes;
-        pStream->adler = tinfl_get_adler32(&pState->m_decomp);
-        pStream->next_out += (mz_uint)out_bytes;
-        pStream->avail_out -= (mz_uint)out_bytes;
-        pStream->total_out += (mz_uint)out_bytes;
-
-        if (status < 0)
-            return MZ_DATA_ERROR;
-        else if (status != TINFL_STATUS_DONE)
-        {
-            pState->m_last_status = TINFL_STATUS_FAILED;
-            return MZ_BUF_ERROR;
-        }
-        return MZ_STREAM_END;
-    }
-    /* flush != MZ_FINISH then we must assume there's more input. */
-    if (flush != MZ_FINISH)
-        decomp_flags |= TINFL_FLAG_HAS_MORE_INPUT;
-
-    if (pState->m_dict_avail)
-    {
-        n = MZ_MIN(pState->m_dict_avail, pStream->avail_out);
-        memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n);
-        pStream->next_out += n;
-        pStream->avail_out -= n;
-        pStream->total_out += n;
-        pState->m_dict_avail -= n;
-        pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1);
-        return ((pState->m_last_status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
-    }
-
-    for (;;)
-    {
-        in_bytes = pStream->avail_in;
-        out_bytes = TINFL_LZ_DICT_SIZE - pState->m_dict_ofs;
-
-        status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pState->m_dict, pState->m_dict + pState->m_dict_ofs, &out_bytes, decomp_flags);
-        pState->m_last_status = status;
-
-        pStream->next_in += (mz_uint)in_bytes;
-        pStream->avail_in -= (mz_uint)in_bytes;
-        pStream->total_in += (mz_uint)in_bytes;
-        pStream->adler = tinfl_get_adler32(&pState->m_decomp);
-
-        pState->m_dict_avail = (mz_uint)out_bytes;
-
-        n = MZ_MIN(pState->m_dict_avail, pStream->avail_out);
-        memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n);
-        pStream->next_out += n;
-        pStream->avail_out -= n;
-        pStream->total_out += n;
-        pState->m_dict_avail -= n;
-        pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1);
-
-        if (status < 0)
-            return MZ_DATA_ERROR; /* Stream is corrupted (there could be some uncompressed data left in the output dictionary - oh well). */
-        else if ((status == TINFL_STATUS_NEEDS_MORE_INPUT) && (!orig_avail_in))
-            return MZ_BUF_ERROR; /* Signal caller that we can't make forward progress without supplying more input or by setting flush to MZ_FINISH. */
-        else if (flush == MZ_FINISH)
-        {
-            /* The output buffer MUST be large to hold the remaining uncompressed data when flush==MZ_FINISH. */
-            if (status == TINFL_STATUS_DONE)
-                return pState->m_dict_avail ? MZ_BUF_ERROR : MZ_STREAM_END;
-            /* status here must be TINFL_STATUS_HAS_MORE_OUTPUT, which means there's at least 1 more byte on the way. If there's no more room left in the output buffer then something is wrong. */
-            else if (!pStream->avail_out)
-                return MZ_BUF_ERROR;
-        }
-        else if ((status == TINFL_STATUS_DONE) || (!pStream->avail_in) || (!pStream->avail_out) || (pState->m_dict_avail))
-            break;
-    }
-
-    return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
-}
-
-int mz_inflateEnd(mz_streamp pStream)
-{
-    if (!pStream)
-        return MZ_STREAM_ERROR;
-    if (pStream->state)
-    {
-        pStream->zfree(pStream->opaque, pStream->state);
-        pStream->state = NULL;
-    }
-    return MZ_OK;
-}
-int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong *pSource_len)
-{
-    mz_stream stream;
-    int status;
-    memset(&stream, 0, sizeof(stream));
-
-    /* In case mz_ulong is 64-bits (argh I hate longs). */
-    if ((mz_uint64)(*pSource_len | *pDest_len) > 0xFFFFFFFFU)
-        return MZ_PARAM_ERROR;
-
-    stream.next_in = pSource;
-    stream.avail_in = (mz_uint32)*pSource_len;
-    stream.next_out = pDest;
-    stream.avail_out = (mz_uint32)*pDest_len;
-
-    status = mz_inflateInit(&stream);
-    if (status != MZ_OK)
-        return status;
-
-    status = mz_inflate(&stream, MZ_FINISH);
-    *pSource_len = *pSource_len - stream.avail_in;
-    if (status != MZ_STREAM_END)
-    {
-        mz_inflateEnd(&stream);
-        return ((status == MZ_BUF_ERROR) && (!stream.avail_in)) ? MZ_DATA_ERROR : status;
-    }
-    *pDest_len = stream.total_out;
-
-    return mz_inflateEnd(&stream);
-}
-
-int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len)
-{
-    return mz_uncompress2(pDest, pDest_len, pSource, &source_len);
-}
-
-#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
-
-const char *mz_error(int err)
-{
-    static struct
-    {
-        int m_err;
-        const char *m_pDesc;
-    } s_error_descs[] =
-        {
-          { MZ_OK, "" }, { MZ_STREAM_END, "stream end" }, { MZ_NEED_DICT, "need dictionary" }, { MZ_ERRNO, "file error" }, { MZ_STREAM_ERROR, "stream error" }, { MZ_DATA_ERROR, "data error" }, { MZ_MEM_ERROR, "out of memory" }, { MZ_BUF_ERROR, "buf error" }, { MZ_VERSION_ERROR, "version error" }, { MZ_PARAM_ERROR, "parameter error" }
-        };
-    mz_uint i;
-    for (i = 0; i < sizeof(s_error_descs) / sizeof(s_error_descs[0]); ++i)
-        if (s_error_descs[i].m_err == err)
-            return s_error_descs[i].m_pDesc;
-    return NULL;
-}
-
-#endif /*MINIZ_NO_ZLIB_APIS */
-
-#ifdef __cplusplus
-}
-#endif
-
-/*
-  This is free and unencumbered software released into the public domain.
-
-  Anyone is free to copy, modify, publish, use, compile, sell, or
-  distribute this software, either in source code form or as a compiled
-  binary, for any purpose, commercial or non-commercial, and by any
-  means.
-
-  In jurisdictions that recognize copyright laws, the author or authors
-  of this software dedicate any and all copyright interest in the
-  software to the public domain. We make this dedication for the benefit
-  of the public at large and to the detriment of our heirs and
-  successors. We intend this dedication to be an overt act of
-  relinquishment in perpetuity of all present and future rights to this
-  software under copyright law.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
-
-  For more information, please refer to <http://unlicense.org/>
-*/
-/**************************************************************************
- *
- * Copyright 2013-2014 RAD Game Tools and Valve Software
- * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- **************************************************************************/
-
-
-
-#ifndef MINIZ_NO_DEFLATE_APIS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------- Low-level Compression (independent from all decompression API's) */
-
-/* Purposely making these tables static for faster init and thread safety. */
-static const mz_uint16 s_tdefl_len_sym[256] =
-    {
-      257, 258, 259, 260, 261, 262, 263, 264, 265, 265, 266, 266, 267, 267, 268, 268, 269, 269, 269, 269, 270, 270, 270, 270, 271, 271, 271, 271, 272, 272, 272, 272,
-      273, 273, 273, 273, 273, 273, 273, 273, 274, 274, 274, 274, 274, 274, 274, 274, 275, 275, 275, 275, 275, 275, 275, 275, 276, 276, 276, 276, 276, 276, 276, 276,
-      277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
-      279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
-      281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281,
-      282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282,
-      283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283,
-      284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 285
-    };
-
-static const mz_uint8 s_tdefl_len_extra[256] =
-    {
-      0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-      4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-      5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-      5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0
-    };
-
-static const mz_uint8 s_tdefl_small_dist_sym[512] =
-    {
-      0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11,
-      11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-      14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-      15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-      16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-      17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17
-    };
-
-static const mz_uint8 s_tdefl_small_dist_extra[512] =
-    {
-      0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
-      5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-      6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-      7, 7, 7, 7, 7, 7, 7, 7
-    };
-
-static const mz_uint8 s_tdefl_large_dist_sym[128] =
-    {
-      0, 0, 18, 19, 20, 20, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-      26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-      28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-    };
-
-static const mz_uint8 s_tdefl_large_dist_extra[128] =
-    {
-      0, 0, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-      12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-      13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13
-    };
-
-/* Radix sorts tdefl_sym_freq[] array by 16-bit key m_key. Returns ptr to sorted values. */
-typedef struct
-{
-    mz_uint16 m_key, m_sym_index;
-} tdefl_sym_freq;
-static tdefl_sym_freq *tdefl_radix_sort_syms(mz_uint num_syms, tdefl_sym_freq *pSyms0, tdefl_sym_freq *pSyms1)
-{
-    mz_uint32 total_passes = 2, pass_shift, pass, i, hist[256 * 2];
-    tdefl_sym_freq *pCur_syms = pSyms0, *pNew_syms = pSyms1;
-    MZ_CLEAR_ARR(hist);
-    for (i = 0; i < num_syms; i++)
-    {
-        mz_uint freq = pSyms0[i].m_key;
-        hist[freq & 0xFF]++;
-        hist[256 + ((freq >> 8) & 0xFF)]++;
-    }
-    while ((total_passes > 1) && (num_syms == hist[(total_passes - 1) * 256]))
-        total_passes--;
-    for (pass_shift = 0, pass = 0; pass < total_passes; pass++, pass_shift += 8)
-    {
-        const mz_uint32 *pHist = &hist[pass << 8];
-        mz_uint offsets[256], cur_ofs = 0;
-        for (i = 0; i < 256; i++)
-        {
-            offsets[i] = cur_ofs;
-            cur_ofs += pHist[i];
-        }
-        for (i = 0; i < num_syms; i++)
-            pNew_syms[offsets[(pCur_syms[i].m_key >> pass_shift) & 0xFF]++] = pCur_syms[i];
-        {
-            tdefl_sym_freq *t = pCur_syms;
-            pCur_syms = pNew_syms;
-            pNew_syms = t;
-        }
-    }
-    return pCur_syms;
-}
-
-/* tdefl_calculate_minimum_redundancy() originally written by: Alistair Moffat, alistair@cs.mu.oz.au, Jyrki Katajainen, jyrki@diku.dk, November 1996. */
-static void tdefl_calculate_minimum_redundancy(tdefl_sym_freq *A, int n)
-{
-    int root, leaf, next, avbl, used, dpth;
-    if (n == 0)
-        return;
-    else if (n == 1)
-    {
-        A[0].m_key = 1;
-        return;
-    }
-    A[0].m_key += A[1].m_key;
-    root = 0;
-    leaf = 2;
-    for (next = 1; next < n - 1; next++)
-    {
-        if (leaf >= n || A[root].m_key < A[leaf].m_key)
-        {
-            A[next].m_key = A[root].m_key;
-            A[root++].m_key = (mz_uint16)next;
-        }
-        else
-            A[next].m_key = A[leaf++].m_key;
-        if (leaf >= n || (root < next && A[root].m_key < A[leaf].m_key))
-        {
-            A[next].m_key = (mz_uint16)(A[next].m_key + A[root].m_key);
-            A[root++].m_key = (mz_uint16)next;
-        }
-        else
-            A[next].m_key = (mz_uint16)(A[next].m_key + A[leaf++].m_key);
-    }
-    A[n - 2].m_key = 0;
-    for (next = n - 3; next >= 0; next--)
-        A[next].m_key = A[A[next].m_key].m_key + 1;
-    avbl = 1;
-    used = dpth = 0;
-    root = n - 2;
-    next = n - 1;
-    while (avbl > 0)
-    {
-        while (root >= 0 && (int)A[root].m_key == dpth)
-        {
-            used++;
-            root--;
-        }
-        while (avbl > used)
-        {
-            A[next--].m_key = (mz_uint16)(dpth);
-            avbl--;
-        }
-        avbl = 2 * used;
-        dpth++;
-        used = 0;
-    }
-}
-
-/* Limits canonical Huffman code table's max code size. */
-enum
-{
-    TDEFL_MAX_SUPPORTED_HUFF_CODESIZE = 32
-};
-static void tdefl_huffman_enforce_max_code_size(int *pNum_codes, int code_list_len, int max_code_size)
-{
-    int i;
-    mz_uint32 total = 0;
-    if (code_list_len <= 1)
-        return;
-    for (i = max_code_size + 1; i <= TDEFL_MAX_SUPPORTED_HUFF_CODESIZE; i++)
-        pNum_codes[max_code_size] += pNum_codes[i];
-    for (i = max_code_size; i > 0; i--)
-        total += (((mz_uint32)pNum_codes[i]) << (max_code_size - i));
-    while (total != (1UL << max_code_size))
-    {
-        pNum_codes[max_code_size]--;
-        for (i = max_code_size - 1; i > 0; i--)
-            if (pNum_codes[i])
-            {
-                pNum_codes[i]--;
-                pNum_codes[i + 1] += 2;
-                break;
-            }
-        total--;
-    }
-}
-
-static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, int table_len, int code_size_limit, int static_table)
-{
-    int i, j, l, num_codes[1 + TDEFL_MAX_SUPPORTED_HUFF_CODESIZE];
-    mz_uint next_code[TDEFL_MAX_SUPPORTED_HUFF_CODESIZE + 1];
-    MZ_CLEAR_ARR(num_codes);
-    if (static_table)
-    {
-        for (i = 0; i < table_len; i++)
-            num_codes[d->m_huff_code_sizes[table_num][i]]++;
-    }
-    else
-    {
-        tdefl_sym_freq syms0[TDEFL_MAX_HUFF_SYMBOLS], syms1[TDEFL_MAX_HUFF_SYMBOLS], *pSyms;
-        int num_used_syms = 0;
-        const mz_uint16 *pSym_count = &d->m_huff_count[table_num][0];
-        for (i = 0; i < table_len; i++)
-            if (pSym_count[i])
-            {
-                syms0[num_used_syms].m_key = (mz_uint16)pSym_count[i];
-                syms0[num_used_syms++].m_sym_index = (mz_uint16)i;
-            }
-
-        pSyms = tdefl_radix_sort_syms(num_used_syms, syms0, syms1);
-        tdefl_calculate_minimum_redundancy(pSyms, num_used_syms);
-
-        for (i = 0; i < num_used_syms; i++)
-            num_codes[pSyms[i].m_key]++;
-
-        tdefl_huffman_enforce_max_code_size(num_codes, num_used_syms, code_size_limit);
-
-        MZ_CLEAR_ARR(d->m_huff_code_sizes[table_num]);
-        MZ_CLEAR_ARR(d->m_huff_codes[table_num]);
-        for (i = 1, j = num_used_syms; i <= code_size_limit; i++)
-            for (l = num_codes[i]; l > 0; l--)
-                d->m_huff_code_sizes[table_num][pSyms[--j].m_sym_index] = (mz_uint8)(i);
-    }
-
-    next_code[1] = 0;
-    for (j = 0, i = 2; i <= code_size_limit; i++)
-        next_code[i] = j = ((j + num_codes[i - 1]) << 1);
-
-    for (i = 0; i < table_len; i++)
-    {
-        mz_uint rev_code = 0, code, code_size;
-        if ((code_size = d->m_huff_code_sizes[table_num][i]) == 0)
-            continue;
-        code = next_code[code_size]++;
-        for (l = code_size; l > 0; l--, code >>= 1)
-            rev_code = (rev_code << 1) | (code & 1);
-        d->m_huff_codes[table_num][i] = (mz_uint16)rev_code;
-    }
-}
-
-#define TDEFL_PUT_BITS(b, l)                                       \
-    do                                                             \
-    {                                                              \
-        mz_uint bits = b;                                          \
-        mz_uint len = l;                                           \
-        MZ_ASSERT(bits <= ((1U << len) - 1U));                     \
-        d->m_bit_buffer |= (bits << d->m_bits_in);                 \
-        d->m_bits_in += len;                                       \
-        while (d->m_bits_in >= 8)                                  \
-        {                                                          \
-            if (d->m_pOutput_buf < d->m_pOutput_buf_end)           \
-                *d->m_pOutput_buf++ = (mz_uint8)(d->m_bit_buffer); \
-            d->m_bit_buffer >>= 8;                                 \
-            d->m_bits_in -= 8;                                     \
-        }                                                          \
-    }                                                              \
-    MZ_MACRO_END
-
-#define TDEFL_RLE_PREV_CODE_SIZE()                                                                                       \
-    {                                                                                                                    \
-        if (rle_repeat_count)                                                                                            \
-        {                                                                                                                \
-            if (rle_repeat_count < 3)                                                                                    \
-            {                                                                                                            \
-                d->m_huff_count[2][prev_code_size] = (mz_uint16)(d->m_huff_count[2][prev_code_size] + rle_repeat_count); \
-                while (rle_repeat_count--)                                                                               \
-                    packed_code_sizes[num_packed_code_sizes++] = prev_code_size;                                         \
-            }                                                                                                            \
-            else                                                                                                         \
-            {                                                                                                            \
-                d->m_huff_count[2][16] = (mz_uint16)(d->m_huff_count[2][16] + 1);                                        \
-                packed_code_sizes[num_packed_code_sizes++] = 16;                                                         \
-                packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_repeat_count - 3);                           \
-            }                                                                                                            \
-            rle_repeat_count = 0;                                                                                        \
-        }                                                                                                                \
-    }
-
-#define TDEFL_RLE_ZERO_CODE_SIZE()                                                         \
-    {                                                                                      \
-        if (rle_z_count)                                                                   \
-        {                                                                                  \
-            if (rle_z_count < 3)                                                           \
-            {                                                                              \
-                d->m_huff_count[2][0] = (mz_uint16)(d->m_huff_count[2][0] + rle_z_count);  \
-                while (rle_z_count--)                                                      \
-                    packed_code_sizes[num_packed_code_sizes++] = 0;                        \
-            }                                                                              \
-            else if (rle_z_count <= 10)                                                    \
-            {                                                                              \
-                d->m_huff_count[2][17] = (mz_uint16)(d->m_huff_count[2][17] + 1);          \
-                packed_code_sizes[num_packed_code_sizes++] = 17;                           \
-                packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 3);  \
-            }                                                                              \
-            else                                                                           \
-            {                                                                              \
-                d->m_huff_count[2][18] = (mz_uint16)(d->m_huff_count[2][18] + 1);          \
-                packed_code_sizes[num_packed_code_sizes++] = 18;                           \
-                packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 11); \
-            }                                                                              \
-            rle_z_count = 0;                                                               \
-        }                                                                                  \
-    }
-
-static const mz_uint8 s_tdefl_packed_code_size_syms_swizzle[] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
-
-static void tdefl_start_dynamic_block(tdefl_compressor *d)
-{
-    int num_lit_codes, num_dist_codes, num_bit_lengths;
-    mz_uint i, total_code_sizes_to_pack, num_packed_code_sizes, rle_z_count, rle_repeat_count, packed_code_sizes_index;
-    mz_uint8 code_sizes_to_pack[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], packed_code_sizes[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], prev_code_size = 0xFF;
-
-    d->m_huff_count[0][256] = 1;
-
-    tdefl_optimize_huffman_table(d, 0, TDEFL_MAX_HUFF_SYMBOLS_0, 15, MZ_FALSE);
-    tdefl_optimize_huffman_table(d, 1, TDEFL_MAX_HUFF_SYMBOLS_1, 15, MZ_FALSE);
-
-    for (num_lit_codes = 286; num_lit_codes > 257; num_lit_codes--)
-        if (d->m_huff_code_sizes[0][num_lit_codes - 1])
-            break;
-    for (num_dist_codes = 30; num_dist_codes > 1; num_dist_codes--)
-        if (d->m_huff_code_sizes[1][num_dist_codes - 1])
-            break;
-
-    memcpy(code_sizes_to_pack, &d->m_huff_code_sizes[0][0], num_lit_codes);
-    memcpy(code_sizes_to_pack + num_lit_codes, &d->m_huff_code_sizes[1][0], num_dist_codes);
-    total_code_sizes_to_pack = num_lit_codes + num_dist_codes;
-    num_packed_code_sizes = 0;
-    rle_z_count = 0;
-    rle_repeat_count = 0;
-
-    memset(&d->m_huff_count[2][0], 0, sizeof(d->m_huff_count[2][0]) * TDEFL_MAX_HUFF_SYMBOLS_2);
-    for (i = 0; i < total_code_sizes_to_pack; i++)
-    {
-        mz_uint8 code_size = code_sizes_to_pack[i];
-        if (!code_size)
-        {
-            TDEFL_RLE_PREV_CODE_SIZE();
-            if (++rle_z_count == 138)
-            {
-                TDEFL_RLE_ZERO_CODE_SIZE();
-            }
-        }
-        else
-        {
-            TDEFL_RLE_ZERO_CODE_SIZE();
-            if (code_size != prev_code_size)
-            {
-                TDEFL_RLE_PREV_CODE_SIZE();
-                d->m_huff_count[2][code_size] = (mz_uint16)(d->m_huff_count[2][code_size] + 1);
-                packed_code_sizes[num_packed_code_sizes++] = code_size;
-            }
-            else if (++rle_repeat_count == 6)
-            {
-                TDEFL_RLE_PREV_CODE_SIZE();
-            }
-        }
-        prev_code_size = code_size;
-    }
-    if (rle_repeat_count)
-    {
-        TDEFL_RLE_PREV_CODE_SIZE();
-    }
-    else
-    {
-        TDEFL_RLE_ZERO_CODE_SIZE();
-    }
-
-    tdefl_optimize_huffman_table(d, 2, TDEFL_MAX_HUFF_SYMBOLS_2, 7, MZ_FALSE);
-
-    TDEFL_PUT_BITS(2, 2);
-
-    TDEFL_PUT_BITS(num_lit_codes - 257, 5);
-    TDEFL_PUT_BITS(num_dist_codes - 1, 5);
-
-    for (num_bit_lengths = 18; num_bit_lengths >= 0; num_bit_lengths--)
-        if (d->m_huff_code_sizes[2][s_tdefl_packed_code_size_syms_swizzle[num_bit_lengths]])
-            break;
-    num_bit_lengths = MZ_MAX(4, (num_bit_lengths + 1));
-    TDEFL_PUT_BITS(num_bit_lengths - 4, 4);
-    for (i = 0; (int)i < num_bit_lengths; i++)
-        TDEFL_PUT_BITS(d->m_huff_code_sizes[2][s_tdefl_packed_code_size_syms_swizzle[i]], 3);
-
-    for (packed_code_sizes_index = 0; packed_code_sizes_index < num_packed_code_sizes;)
-    {
-        mz_uint code = packed_code_sizes[packed_code_sizes_index++];
-        MZ_ASSERT(code < TDEFL_MAX_HUFF_SYMBOLS_2);
-        TDEFL_PUT_BITS(d->m_huff_codes[2][code], d->m_huff_code_sizes[2][code]);
-        if (code >= 16)
-            TDEFL_PUT_BITS(packed_code_sizes[packed_code_sizes_index++], "\02\03\07"[code - 16]);
-    }
-}
-
-static void tdefl_start_static_block(tdefl_compressor *d)
-{
-    mz_uint i;
-    mz_uint8 *p = &d->m_huff_code_sizes[0][0];
-
-    for (i = 0; i <= 143; ++i)
-        *p++ = 8;
-    for (; i <= 255; ++i)
-        *p++ = 9;
-    for (; i <= 279; ++i)
-        *p++ = 7;
-    for (; i <= 287; ++i)
-        *p++ = 8;
-
-    memset(d->m_huff_code_sizes[1], 5, 32);
-
-    tdefl_optimize_huffman_table(d, 0, 288, 15, MZ_TRUE);
-    tdefl_optimize_huffman_table(d, 1, 32, 15, MZ_TRUE);
-
-    TDEFL_PUT_BITS(1, 2);
-}
-
-static const mz_uint mz_bitmasks[17] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
-
-#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS
-static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
-{
-    mz_uint flags;
-    mz_uint8 *pLZ_codes;
-    mz_uint8 *pOutput_buf = d->m_pOutput_buf;
-    mz_uint8 *pLZ_code_buf_end = d->m_pLZ_code_buf;
-    mz_uint64 bit_buffer = d->m_bit_buffer;
-    mz_uint bits_in = d->m_bits_in;
-
-#define TDEFL_PUT_BITS_FAST(b, l)                    \
-    {                                                \
-        bit_buffer |= (((mz_uint64)(b)) << bits_in); \
-        bits_in += (l);                              \
-    }
-
-    flags = 1;
-    for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < pLZ_code_buf_end; flags >>= 1)
-    {
-        if (flags == 1)
-            flags = *pLZ_codes++ | 0x100;
-
-        if (flags & 1)
-        {
-            mz_uint s0, s1, n0, n1, sym, num_extra_bits;
-            mz_uint match_len = pLZ_codes[0];
-            mz_uint match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8));
-            pLZ_codes += 3;
-
-            MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
-            TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
-            TDEFL_PUT_BITS_FAST(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
-
-            /* This sequence coaxes MSVC into using cmov's vs. jmp's. */
-            s0 = s_tdefl_small_dist_sym[match_dist & 511];
-            n0 = s_tdefl_small_dist_extra[match_dist & 511];
-            s1 = s_tdefl_large_dist_sym[match_dist >> 8];
-            n1 = s_tdefl_large_dist_extra[match_dist >> 8];
-            sym = (match_dist < 512) ? s0 : s1;
-            num_extra_bits = (match_dist < 512) ? n0 : n1;
-
-            MZ_ASSERT(d->m_huff_code_sizes[1][sym]);
-            TDEFL_PUT_BITS_FAST(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]);
-            TDEFL_PUT_BITS_FAST(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits);
-        }
-        else
-        {
-            mz_uint lit = *pLZ_codes++;
-            MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
-            TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
-
-            if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end))
-            {
-                flags >>= 1;
-                lit = *pLZ_codes++;
-                MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
-                TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
-
-                if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end))
-                {
-                    flags >>= 1;
-                    lit = *pLZ_codes++;
-                    MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
-                    TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
-                }
-            }
-        }
-
-        if (pOutput_buf >= d->m_pOutput_buf_end)
-            return MZ_FALSE;
-
-        memcpy(pOutput_buf, &bit_buffer, sizeof(mz_uint64));
-        pOutput_buf += (bits_in >> 3);
-        bit_buffer >>= (bits_in & ~7);
-        bits_in &= 7;
-    }
-
-#undef TDEFL_PUT_BITS_FAST
-
-    d->m_pOutput_buf = pOutput_buf;
-    d->m_bits_in = 0;
-    d->m_bit_buffer = 0;
-
-    while (bits_in)
-    {
-        mz_uint32 n = MZ_MIN(bits_in, 16);
-        TDEFL_PUT_BITS((mz_uint)bit_buffer & mz_bitmasks[n], n);
-        bit_buffer >>= n;
-        bits_in -= n;
-    }
-
-    TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]);
-
-    return (d->m_pOutput_buf < d->m_pOutput_buf_end);
-}
-#else
-static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
-{
-    mz_uint flags;
-    mz_uint8 *pLZ_codes;
-
-    flags = 1;
-    for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < d->m_pLZ_code_buf; flags >>= 1)
-    {
-        if (flags == 1)
-            flags = *pLZ_codes++ | 0x100;
-        if (flags & 1)
-        {
-            mz_uint sym, num_extra_bits;
-            mz_uint match_len = pLZ_codes[0], match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8));
-            pLZ_codes += 3;
-
-            MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
-            TDEFL_PUT_BITS(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
-            TDEFL_PUT_BITS(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
-
-            if (match_dist < 512)
-            {
-                sym = s_tdefl_small_dist_sym[match_dist];
-                num_extra_bits = s_tdefl_small_dist_extra[match_dist];
-            }
-            else
-            {
-                sym = s_tdefl_large_dist_sym[match_dist >> 8];
-                num_extra_bits = s_tdefl_large_dist_extra[match_dist >> 8];
-            }
-            MZ_ASSERT(d->m_huff_code_sizes[1][sym]);
-            TDEFL_PUT_BITS(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]);
-            TDEFL_PUT_BITS(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits);
-        }
-        else
-        {
-            mz_uint lit = *pLZ_codes++;
-            MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
-            TDEFL_PUT_BITS(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
-        }
-    }
-
-    TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]);
-
-    return (d->m_pOutput_buf < d->m_pOutput_buf_end);
-}
-#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS */
-
-static mz_bool tdefl_compress_block(tdefl_compressor *d, mz_bool static_block)
-{
-    if (static_block)
-        tdefl_start_static_block(d);
-    else
-        tdefl_start_dynamic_block(d);
-    return tdefl_compress_lz_codes(d);
-}
-
-static const mz_uint s_tdefl_num_probes[11];
-
-static int tdefl_flush_block(tdefl_compressor *d, int flush)
-{
-    mz_uint saved_bit_buf, saved_bits_in;
-    mz_uint8 *pSaved_output_buf;
-    mz_bool comp_block_succeeded = MZ_FALSE;
-    int n, use_raw_block = ((d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS) != 0) && (d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size;
-    mz_uint8 *pOutput_buf_start = ((d->m_pPut_buf_func == NULL) && ((*d->m_pOut_buf_size - d->m_out_buf_ofs) >= TDEFL_OUT_BUF_SIZE)) ? ((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs) : d->m_output_buf;
-
-    d->m_pOutput_buf = pOutput_buf_start;
-    d->m_pOutput_buf_end = d->m_pOutput_buf + TDEFL_OUT_BUF_SIZE - 16;
-
-    MZ_ASSERT(!d->m_output_flush_remaining);
-    d->m_output_flush_ofs = 0;
-    d->m_output_flush_remaining = 0;
-
-    *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> d->m_num_flags_left);
-    d->m_pLZ_code_buf -= (d->m_num_flags_left == 8);
-
-    if ((d->m_flags & TDEFL_WRITE_ZLIB_HEADER) && (!d->m_block_index))
-    {
-        const mz_uint8 cmf = 0x78;
-        mz_uint8 flg, flevel = 3;
-        mz_uint header, i, mz_un = sizeof(s_tdefl_num_probes) / sizeof(mz_uint);
-
-        /* Determine compression level by reversing the process in tdefl_create_comp_flags_from_zip_params() */
-        for (i = 0; i < mz_un; i++)
-            if (s_tdefl_num_probes[i] == (d->m_flags & 0xFFF)) break;
-
-        if (i < 2)
-            flevel = 0;
-        else if (i < 6)
-            flevel = 1;
-        else if (i == 6)
-            flevel = 2;
-
-        header = cmf << 8 | (flevel << 6);
-        header += 31 - (header % 31);
-        flg = header & 0xFF;
-
-        TDEFL_PUT_BITS(cmf, 8);
-        TDEFL_PUT_BITS(flg, 8);
-    }
-
-    TDEFL_PUT_BITS(flush == TDEFL_FINISH, 1);
-
-    pSaved_output_buf = d->m_pOutput_buf;
-    saved_bit_buf = d->m_bit_buffer;
-    saved_bits_in = d->m_bits_in;
-
-    if (!use_raw_block)
-        comp_block_succeeded = tdefl_compress_block(d, (d->m_flags & TDEFL_FORCE_ALL_STATIC_BLOCKS) || (d->m_total_lz_bytes < 48));
-
-    /* If the block gets expanded, forget the current contents of the output buffer and send a raw block instead. */
-    if (((use_raw_block) || ((d->m_total_lz_bytes) && ((d->m_pOutput_buf - pSaved_output_buf + 1U) >= d->m_total_lz_bytes))) &&
-        ((d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size))
-    {
-        mz_uint i;
-        d->m_pOutput_buf = pSaved_output_buf;
-        d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in;
-        TDEFL_PUT_BITS(0, 2);
-        if (d->m_bits_in)
-        {
-            TDEFL_PUT_BITS(0, 8 - d->m_bits_in);
-        }
-        for (i = 2; i; --i, d->m_total_lz_bytes ^= 0xFFFF)
-        {
-            TDEFL_PUT_BITS(d->m_total_lz_bytes & 0xFFFF, 16);
-        }
-        for (i = 0; i < d->m_total_lz_bytes; ++i)
-        {
-            TDEFL_PUT_BITS(d->m_dict[(d->m_lz_code_buf_dict_pos + i) & TDEFL_LZ_DICT_SIZE_MASK], 8);
-        }
-    }
-    /* Check for the extremely unlikely (if not impossible) case of the compressed block not fitting into the output buffer when using dynamic codes. */
-    else if (!comp_block_succeeded)
-    {
-        d->m_pOutput_buf = pSaved_output_buf;
-        d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in;
-        tdefl_compress_block(d, MZ_TRUE);
-    }
-
-    if (flush)
-    {
-        if (flush == TDEFL_FINISH)
-        {
-            if (d->m_bits_in)
-            {
-                TDEFL_PUT_BITS(0, 8 - d->m_bits_in);
-            }
-            if (d->m_flags & TDEFL_WRITE_ZLIB_HEADER)
-            {
-                mz_uint i, a = d->m_adler32;
-                for (i = 0; i < 4; i++)
-                {
-                    TDEFL_PUT_BITS((a >> 24) & 0xFF, 8);
-                    a <<= 8;
-                }
-            }
-        }
-        else
-        {
-            mz_uint i, z = 0;
-            TDEFL_PUT_BITS(0, 3);
-            if (d->m_bits_in)
-            {
-                TDEFL_PUT_BITS(0, 8 - d->m_bits_in);
-            }
-            for (i = 2; i; --i, z ^= 0xFFFF)
-            {
-                TDEFL_PUT_BITS(z & 0xFFFF, 16);
-            }
-        }
-    }
-
-    MZ_ASSERT(d->m_pOutput_buf < d->m_pOutput_buf_end);
-
-    memset(&d->m_huff_count[0][0], 0, sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0);
-    memset(&d->m_huff_count[1][0], 0, sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1);
-
-    d->m_pLZ_code_buf = d->m_lz_code_buf + 1;
-    d->m_pLZ_flags = d->m_lz_code_buf;
-    d->m_num_flags_left = 8;
-    d->m_lz_code_buf_dict_pos += d->m_total_lz_bytes;
-    d->m_total_lz_bytes = 0;
-    d->m_block_index++;
-
-    if ((n = (int)(d->m_pOutput_buf - pOutput_buf_start)) != 0)
-    {
-        if (d->m_pPut_buf_func)
-        {
-            *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf;
-            if (!(*d->m_pPut_buf_func)(d->m_output_buf, n, d->m_pPut_buf_user))
-                return (d->m_prev_return_status = TDEFL_STATUS_PUT_BUF_FAILED);
-        }
-        else if (pOutput_buf_start == d->m_output_buf)
-        {
-            int bytes_to_copy = (int)MZ_MIN((size_t)n, (size_t)(*d->m_pOut_buf_size - d->m_out_buf_ofs));
-            memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf, bytes_to_copy);
-            d->m_out_buf_ofs += bytes_to_copy;
-            if ((n -= bytes_to_copy) != 0)
-            {
-                d->m_output_flush_ofs = bytes_to_copy;
-                d->m_output_flush_remaining = n;
-            }
-        }
-        else
-        {
-            d->m_out_buf_ofs += n;
-        }
-    }
-
-    return d->m_output_flush_remaining;
-}
-
-#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
-#ifdef MINIZ_UNALIGNED_USE_MEMCPY
-static mz_uint16 TDEFL_READ_UNALIGNED_WORD(const mz_uint8* p)
-{
-	mz_uint16 ret;
-	memcpy(&ret, p, sizeof(mz_uint16));
-	return ret;
-}
-static mz_uint16 TDEFL_READ_UNALIGNED_WORD2(const mz_uint16* p)
-{
-	mz_uint16 ret;
-	memcpy(&ret, p, sizeof(mz_uint16));
-	return ret;
-}
-#else
-#define TDEFL_READ_UNALIGNED_WORD(p) *(const mz_uint16 *)(p)
-#define TDEFL_READ_UNALIGNED_WORD2(p) *(const mz_uint16 *)(p)
-#endif
-static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len)
-{
-    mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
-    mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
-    const mz_uint16 *s = (const mz_uint16 *)(d->m_dict + pos), *p, *q;
-    mz_uint16 c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]), s01 = TDEFL_READ_UNALIGNED_WORD2(s);
-    MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN);
-    if (max_match_len <= match_len)
-        return;
-    for (;;)
-    {
-        for (;;)
-        {
-            if (--num_probes_left == 0)
-                return;
-#define TDEFL_PROBE                                                                             \
-    next_probe_pos = d->m_next[probe_pos];                                                      \
-    if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) \
-        return;                                                                                 \
-    probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK;                                       \
-    if (TDEFL_READ_UNALIGNED_WORD(&d->m_dict[probe_pos + match_len - 1]) == c01)                \
-        break;
-            TDEFL_PROBE;
-            TDEFL_PROBE;
-            TDEFL_PROBE;
-        }
-        if (!dist)
-            break;
-        q = (const mz_uint16 *)(d->m_dict + probe_pos);
-        if (TDEFL_READ_UNALIGNED_WORD2(q) != s01)
-            continue;
-        p = s;
-        probe_len = 32;
-        do
-        {
-        } while ((TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
-                 (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (--probe_len > 0));
-        if (!probe_len)
-        {
-            *pMatch_dist = dist;
-            *pMatch_len = MZ_MIN(max_match_len, (mz_uint)TDEFL_MAX_MATCH_LEN);
-            break;
-        }
-        else if ((probe_len = ((mz_uint)(p - s) * 2) + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q)) > match_len)
-        {
-            *pMatch_dist = dist;
-            if ((*pMatch_len = match_len = MZ_MIN(max_match_len, probe_len)) == max_match_len)
-                break;
-            c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]);
-        }
-    }
-}
-#else
-static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len)
-{
-    mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
-    mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
-    const mz_uint8 *s = d->m_dict + pos, *p, *q;
-    mz_uint8 c0 = d->m_dict[pos + match_len], c1 = d->m_dict[pos + match_len - 1];
-    MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN);
-    if (max_match_len <= match_len)
-        return;
-    for (;;)
-    {
-        for (;;)
-        {
-            if (--num_probes_left == 0)
-                return;
-#define TDEFL_PROBE                                                                               \
-    next_probe_pos = d->m_next[probe_pos];                                                        \
-    if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist))   \
-        return;                                                                                   \
-    probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK;                                         \
-    if ((d->m_dict[probe_pos + match_len] == c0) && (d->m_dict[probe_pos + match_len - 1] == c1)) \
-        break;
-            TDEFL_PROBE;
-            TDEFL_PROBE;
-            TDEFL_PROBE;
-        }
-        if (!dist)
-            break;
-        p = s;
-        q = d->m_dict + probe_pos;
-        for (probe_len = 0; probe_len < max_match_len; probe_len++)
-            if (*p++ != *q++)
-                break;
-        if (probe_len > match_len)
-        {
-            *pMatch_dist = dist;
-            if ((*pMatch_len = match_len = probe_len) == max_match_len)
-                return;
-            c0 = d->m_dict[pos + match_len];
-            c1 = d->m_dict[pos + match_len - 1];
-        }
-    }
-}
-#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES */
-
-#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
-#ifdef MINIZ_UNALIGNED_USE_MEMCPY
-static mz_uint32 TDEFL_READ_UNALIGNED_WORD32(const mz_uint8* p)
-{
-	mz_uint32 ret;
-	memcpy(&ret, p, sizeof(mz_uint32));
-	return ret;
-}
-#else
-#define TDEFL_READ_UNALIGNED_WORD32(p) *(const mz_uint32 *)(p)
-#endif
-static mz_bool tdefl_compress_fast(tdefl_compressor *d)
-{
-    /* Faster, minimally featured LZRW1-style match+parse loop with better register utilization. Intended for applications where raw throughput is valued more highly than ratio. */
-    mz_uint lookahead_pos = d->m_lookahead_pos, lookahead_size = d->m_lookahead_size, dict_size = d->m_dict_size, total_lz_bytes = d->m_total_lz_bytes, num_flags_left = d->m_num_flags_left;
-    mz_uint8 *pLZ_code_buf = d->m_pLZ_code_buf, *pLZ_flags = d->m_pLZ_flags;
-    mz_uint cur_pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK;
-
-    while ((d->m_src_buf_left) || ((d->m_flush) && (lookahead_size)))
-    {
-        const mz_uint TDEFL_COMP_FAST_LOOKAHEAD_SIZE = 4096;
-        mz_uint dst_pos = (lookahead_pos + lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
-        mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(d->m_src_buf_left, TDEFL_COMP_FAST_LOOKAHEAD_SIZE - lookahead_size);
-        d->m_src_buf_left -= num_bytes_to_process;
-        lookahead_size += num_bytes_to_process;
-
-        while (num_bytes_to_process)
-        {
-            mz_uint32 n = MZ_MIN(TDEFL_LZ_DICT_SIZE - dst_pos, num_bytes_to_process);
-            memcpy(d->m_dict + dst_pos, d->m_pSrc, n);
-            if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
-                memcpy(d->m_dict + TDEFL_LZ_DICT_SIZE + dst_pos, d->m_pSrc, MZ_MIN(n, (TDEFL_MAX_MATCH_LEN - 1) - dst_pos));
-            d->m_pSrc += n;
-            dst_pos = (dst_pos + n) & TDEFL_LZ_DICT_SIZE_MASK;
-            num_bytes_to_process -= n;
-        }
-
-        dict_size = MZ_MIN(TDEFL_LZ_DICT_SIZE - lookahead_size, dict_size);
-        if ((!d->m_flush) && (lookahead_size < TDEFL_COMP_FAST_LOOKAHEAD_SIZE))
-            break;
-
-        while (lookahead_size >= 4)
-        {
-            mz_uint cur_match_dist, cur_match_len = 1;
-            mz_uint8 *pCur_dict = d->m_dict + cur_pos;
-            mz_uint first_trigram = TDEFL_READ_UNALIGNED_WORD32(pCur_dict) & 0xFFFFFF;
-            mz_uint hash = (first_trigram ^ (first_trigram >> (24 - (TDEFL_LZ_HASH_BITS - 8)))) & TDEFL_LEVEL1_HASH_SIZE_MASK;
-            mz_uint probe_pos = d->m_hash[hash];
-            d->m_hash[hash] = (mz_uint16)lookahead_pos;
-
-            if (((cur_match_dist = (mz_uint16)(lookahead_pos - probe_pos)) <= dict_size) && ((TDEFL_READ_UNALIGNED_WORD32(d->m_dict + (probe_pos &= TDEFL_LZ_DICT_SIZE_MASK)) & 0xFFFFFF) == first_trigram))
-            {
-                const mz_uint16 *p = (const mz_uint16 *)pCur_dict;
-                const mz_uint16 *q = (const mz_uint16 *)(d->m_dict + probe_pos);
-                mz_uint32 probe_len = 32;
-                do
-                {
-                } while ((TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
-                         (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (--probe_len > 0));
-                cur_match_len = ((mz_uint)(p - (const mz_uint16 *)pCur_dict) * 2) + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q);
-                if (!probe_len)
-                    cur_match_len = cur_match_dist ? TDEFL_MAX_MATCH_LEN : 0;
-
-                if ((cur_match_len < TDEFL_MIN_MATCH_LEN) || ((cur_match_len == TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 8U * 1024U)))
-                {
-                    cur_match_len = 1;
-                    *pLZ_code_buf++ = (mz_uint8)first_trigram;
-                    *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
-                    d->m_huff_count[0][(mz_uint8)first_trigram]++;
-                }
-                else
-                {
-                    mz_uint32 s0, s1;
-                    cur_match_len = MZ_MIN(cur_match_len, lookahead_size);
-
-                    MZ_ASSERT((cur_match_len >= TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 1) && (cur_match_dist <= TDEFL_LZ_DICT_SIZE));
-
-                    cur_match_dist--;
-
-                    pLZ_code_buf[0] = (mz_uint8)(cur_match_len - TDEFL_MIN_MATCH_LEN);
-#ifdef MINIZ_UNALIGNED_USE_MEMCPY
-					memcpy(&pLZ_code_buf[1], &cur_match_dist, sizeof(cur_match_dist));
-#else
-                    *(mz_uint16 *)(&pLZ_code_buf[1]) = (mz_uint16)cur_match_dist;
-#endif
-                    pLZ_code_buf += 3;
-                    *pLZ_flags = (mz_uint8)((*pLZ_flags >> 1) | 0x80);
-
-                    s0 = s_tdefl_small_dist_sym[cur_match_dist & 511];
-                    s1 = s_tdefl_large_dist_sym[cur_match_dist >> 8];
-                    d->m_huff_count[1][(cur_match_dist < 512) ? s0 : s1]++;
-
-                    d->m_huff_count[0][s_tdefl_len_sym[cur_match_len - TDEFL_MIN_MATCH_LEN]]++;
-                }
-            }
-            else
-            {
-                *pLZ_code_buf++ = (mz_uint8)first_trigram;
-                *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
-                d->m_huff_count[0][(mz_uint8)first_trigram]++;
-            }
-
-            if (--num_flags_left == 0)
-            {
-                num_flags_left = 8;
-                pLZ_flags = pLZ_code_buf++;
-            }
-
-            total_lz_bytes += cur_match_len;
-            lookahead_pos += cur_match_len;
-            dict_size = MZ_MIN(dict_size + cur_match_len, (mz_uint)TDEFL_LZ_DICT_SIZE);
-            cur_pos = (cur_pos + cur_match_len) & TDEFL_LZ_DICT_SIZE_MASK;
-            MZ_ASSERT(lookahead_size >= cur_match_len);
-            lookahead_size -= cur_match_len;
-
-            if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8])
-            {
-                int n;
-                d->m_lookahead_pos = lookahead_pos;
-                d->m_lookahead_size = lookahead_size;
-                d->m_dict_size = dict_size;
-                d->m_total_lz_bytes = total_lz_bytes;
-                d->m_pLZ_code_buf = pLZ_code_buf;
-                d->m_pLZ_flags = pLZ_flags;
-                d->m_num_flags_left = num_flags_left;
-                if ((n = tdefl_flush_block(d, 0)) != 0)
-                    return (n < 0) ? MZ_FALSE : MZ_TRUE;
-                total_lz_bytes = d->m_total_lz_bytes;
-                pLZ_code_buf = d->m_pLZ_code_buf;
-                pLZ_flags = d->m_pLZ_flags;
-                num_flags_left = d->m_num_flags_left;
-            }
-        }
-
-        while (lookahead_size)
-        {
-            mz_uint8 lit = d->m_dict[cur_pos];
-
-            total_lz_bytes++;
-            *pLZ_code_buf++ = lit;
-            *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
-            if (--num_flags_left == 0)
-            {
-                num_flags_left = 8;
-                pLZ_flags = pLZ_code_buf++;
-            }
-
-            d->m_huff_count[0][lit]++;
-
-            lookahead_pos++;
-            dict_size = MZ_MIN(dict_size + 1, (mz_uint)TDEFL_LZ_DICT_SIZE);
-            cur_pos = (cur_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK;
-            lookahead_size--;
-
-            if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8])
-            {
-                int n;
-                d->m_lookahead_pos = lookahead_pos;
-                d->m_lookahead_size = lookahead_size;
-                d->m_dict_size = dict_size;
-                d->m_total_lz_bytes = total_lz_bytes;
-                d->m_pLZ_code_buf = pLZ_code_buf;
-                d->m_pLZ_flags = pLZ_flags;
-                d->m_num_flags_left = num_flags_left;
-                if ((n = tdefl_flush_block(d, 0)) != 0)
-                    return (n < 0) ? MZ_FALSE : MZ_TRUE;
-                total_lz_bytes = d->m_total_lz_bytes;
-                pLZ_code_buf = d->m_pLZ_code_buf;
-                pLZ_flags = d->m_pLZ_flags;
-                num_flags_left = d->m_num_flags_left;
-            }
-        }
-    }
-
-    d->m_lookahead_pos = lookahead_pos;
-    d->m_lookahead_size = lookahead_size;
-    d->m_dict_size = dict_size;
-    d->m_total_lz_bytes = total_lz_bytes;
-    d->m_pLZ_code_buf = pLZ_code_buf;
-    d->m_pLZ_flags = pLZ_flags;
-    d->m_num_flags_left = num_flags_left;
-    return MZ_TRUE;
-}
-#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */
-
-static MZ_FORCEINLINE void tdefl_record_literal(tdefl_compressor *d, mz_uint8 lit)
-{
-    d->m_total_lz_bytes++;
-    *d->m_pLZ_code_buf++ = lit;
-    *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> 1);
-    if (--d->m_num_flags_left == 0)
-    {
-        d->m_num_flags_left = 8;
-        d->m_pLZ_flags = d->m_pLZ_code_buf++;
-    }
-    d->m_huff_count[0][lit]++;
-}
-
-static MZ_FORCEINLINE void tdefl_record_match(tdefl_compressor *d, mz_uint match_len, mz_uint match_dist)
-{
-    mz_uint32 s0, s1;
-
-    MZ_ASSERT((match_len >= TDEFL_MIN_MATCH_LEN) && (match_dist >= 1) && (match_dist <= TDEFL_LZ_DICT_SIZE));
-
-    d->m_total_lz_bytes += match_len;
-
-    d->m_pLZ_code_buf[0] = (mz_uint8)(match_len - TDEFL_MIN_MATCH_LEN);
-
-    match_dist -= 1;
-    d->m_pLZ_code_buf[1] = (mz_uint8)(match_dist & 0xFF);
-    d->m_pLZ_code_buf[2] = (mz_uint8)(match_dist >> 8);
-    d->m_pLZ_code_buf += 3;
-
-    *d->m_pLZ_flags = (mz_uint8)((*d->m_pLZ_flags >> 1) | 0x80);
-    if (--d->m_num_flags_left == 0)
-    {
-        d->m_num_flags_left = 8;
-        d->m_pLZ_flags = d->m_pLZ_code_buf++;
-    }
-
-    s0 = s_tdefl_small_dist_sym[match_dist & 511];
-    s1 = s_tdefl_large_dist_sym[(match_dist >> 8) & 127];
-    d->m_huff_count[1][(match_dist < 512) ? s0 : s1]++;
-    d->m_huff_count[0][s_tdefl_len_sym[match_len - TDEFL_MIN_MATCH_LEN]]++;
-}
-
-static mz_bool tdefl_compress_normal(tdefl_compressor *d)
-{
-    const mz_uint8 *pSrc = d->m_pSrc;
-    size_t src_buf_left = d->m_src_buf_left;
-    tdefl_flush flush = d->m_flush;
-
-    while ((src_buf_left) || ((flush) && (d->m_lookahead_size)))
-    {
-        mz_uint len_to_move, cur_match_dist, cur_match_len, cur_pos;
-        /* Update dictionary and hash chains. Keeps the lookahead size equal to TDEFL_MAX_MATCH_LEN. */
-        if ((d->m_lookahead_size + d->m_dict_size) >= (TDEFL_MIN_MATCH_LEN - 1))
-        {
-            mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK, ins_pos = d->m_lookahead_pos + d->m_lookahead_size - 2;
-            mz_uint hash = (d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK];
-            mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(src_buf_left, TDEFL_MAX_MATCH_LEN - d->m_lookahead_size);
-            const mz_uint8 *pSrc_end = pSrc ? pSrc + num_bytes_to_process : NULL;
-            src_buf_left -= num_bytes_to_process;
-            d->m_lookahead_size += num_bytes_to_process;
-            while (pSrc != pSrc_end)
-            {
-                mz_uint8 c = *pSrc++;
-                d->m_dict[dst_pos] = c;
-                if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
-                    d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c;
-                hash = ((hash << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1);
-                d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash];
-                d->m_hash[hash] = (mz_uint16)(ins_pos);
-                dst_pos = (dst_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK;
-                ins_pos++;
-            }
-        }
-        else
-        {
-            while ((src_buf_left) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN))
-            {
-                mz_uint8 c = *pSrc++;
-                mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
-                src_buf_left--;
-                d->m_dict[dst_pos] = c;
-                if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
-                    d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c;
-                if ((++d->m_lookahead_size + d->m_dict_size) >= TDEFL_MIN_MATCH_LEN)
-                {
-                    mz_uint ins_pos = d->m_lookahead_pos + (d->m_lookahead_size - 1) - 2;
-                    mz_uint hash = ((d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << (TDEFL_LZ_HASH_SHIFT * 2)) ^ (d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1);
-                    d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash];
-                    d->m_hash[hash] = (mz_uint16)(ins_pos);
-                }
-            }
-        }
-        d->m_dict_size = MZ_MIN(TDEFL_LZ_DICT_SIZE - d->m_lookahead_size, d->m_dict_size);
-        if ((!flush) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN))
-            break;
-
-        /* Simple lazy/greedy parsing state machine. */
-        len_to_move = 1;
-        cur_match_dist = 0;
-        cur_match_len = d->m_saved_match_len ? d->m_saved_match_len : (TDEFL_MIN_MATCH_LEN - 1);
-        cur_pos = d->m_lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK;
-        if (d->m_flags & (TDEFL_RLE_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS))
-        {
-            if ((d->m_dict_size) && (!(d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS)))
-            {
-                mz_uint8 c = d->m_dict[(cur_pos - 1) & TDEFL_LZ_DICT_SIZE_MASK];
-                cur_match_len = 0;
-                while (cur_match_len < d->m_lookahead_size)
-                {
-                    if (d->m_dict[cur_pos + cur_match_len] != c)
-                        break;
-                    cur_match_len++;
-                }
-                if (cur_match_len < TDEFL_MIN_MATCH_LEN)
-                    cur_match_len = 0;
-                else
-                    cur_match_dist = 1;
-            }
-        }
-        else
-        {
-            tdefl_find_match(d, d->m_lookahead_pos, d->m_dict_size, d->m_lookahead_size, &cur_match_dist, &cur_match_len);
-        }
-        if (((cur_match_len == TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 8U * 1024U)) || (cur_pos == cur_match_dist) || ((d->m_flags & TDEFL_FILTER_MATCHES) && (cur_match_len <= 5)))
-        {
-            cur_match_dist = cur_match_len = 0;
-        }
-        if (d->m_saved_match_len)
-        {
-            if (cur_match_len > d->m_saved_match_len)
-            {
-                tdefl_record_literal(d, (mz_uint8)d->m_saved_lit);
-                if (cur_match_len >= 128)
-                {
-                    tdefl_record_match(d, cur_match_len, cur_match_dist);
-                    d->m_saved_match_len = 0;
-                    len_to_move = cur_match_len;
-                }
-                else
-                {
-                    d->m_saved_lit = d->m_dict[cur_pos];
-                    d->m_saved_match_dist = cur_match_dist;
-                    d->m_saved_match_len = cur_match_len;
-                }
-            }
-            else
-            {
-                tdefl_record_match(d, d->m_saved_match_len, d->m_saved_match_dist);
-                len_to_move = d->m_saved_match_len - 1;
-                d->m_saved_match_len = 0;
-            }
-        }
-        else if (!cur_match_dist)
-            tdefl_record_literal(d, d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)]);
-        else if ((d->m_greedy_parsing) || (d->m_flags & TDEFL_RLE_MATCHES) || (cur_match_len >= 128))
-        {
-            tdefl_record_match(d, cur_match_len, cur_match_dist);
-            len_to_move = cur_match_len;
-        }
-        else
-        {
-            d->m_saved_lit = d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)];
-            d->m_saved_match_dist = cur_match_dist;
-            d->m_saved_match_len = cur_match_len;
-        }
-        /* Move the lookahead forward by len_to_move bytes. */
-        d->m_lookahead_pos += len_to_move;
-        MZ_ASSERT(d->m_lookahead_size >= len_to_move);
-        d->m_lookahead_size -= len_to_move;
-        d->m_dict_size = MZ_MIN(d->m_dict_size + len_to_move, (mz_uint)TDEFL_LZ_DICT_SIZE);
-        /* Check if it's time to flush the current LZ codes to the internal output buffer. */
-        if ((d->m_pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) ||
-            ((d->m_total_lz_bytes > 31 * 1024) && (((((mz_uint)(d->m_pLZ_code_buf - d->m_lz_code_buf) * 115) >> 7) >= d->m_total_lz_bytes) || (d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS))))
-        {
-            int n;
-            d->m_pSrc = pSrc;
-            d->m_src_buf_left = src_buf_left;
-            if ((n = tdefl_flush_block(d, 0)) != 0)
-                return (n < 0) ? MZ_FALSE : MZ_TRUE;
-        }
-    }
-
-    d->m_pSrc = pSrc;
-    d->m_src_buf_left = src_buf_left;
-    return MZ_TRUE;
-}
-
-static tdefl_status tdefl_flush_output_buffer(tdefl_compressor *d)
-{
-    if (d->m_pIn_buf_size)
-    {
-        *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf;
-    }
-
-    if (d->m_pOut_buf_size)
-    {
-        size_t n = MZ_MIN(*d->m_pOut_buf_size - d->m_out_buf_ofs, d->m_output_flush_remaining);
-        memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf + d->m_output_flush_ofs, n);
-        d->m_output_flush_ofs += (mz_uint)n;
-        d->m_output_flush_remaining -= (mz_uint)n;
-        d->m_out_buf_ofs += n;
-
-        *d->m_pOut_buf_size = d->m_out_buf_ofs;
-    }
-
-    return (d->m_finished && !d->m_output_flush_remaining) ? TDEFL_STATUS_DONE : TDEFL_STATUS_OKAY;
-}
-
-tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pIn_buf_size, void *pOut_buf, size_t *pOut_buf_size, tdefl_flush flush)
-{
-    if (!d)
-    {
-        if (pIn_buf_size)
-            *pIn_buf_size = 0;
-        if (pOut_buf_size)
-            *pOut_buf_size = 0;
-        return TDEFL_STATUS_BAD_PARAM;
-    }
-
-    d->m_pIn_buf = pIn_buf;
-    d->m_pIn_buf_size = pIn_buf_size;
-    d->m_pOut_buf = pOut_buf;
-    d->m_pOut_buf_size = pOut_buf_size;
-    d->m_pSrc = (const mz_uint8 *)(pIn_buf);
-    d->m_src_buf_left = pIn_buf_size ? *pIn_buf_size : 0;
-    d->m_out_buf_ofs = 0;
-    d->m_flush = flush;
-
-    if (((d->m_pPut_buf_func != NULL) == ((pOut_buf != NULL) || (pOut_buf_size != NULL))) || (d->m_prev_return_status != TDEFL_STATUS_OKAY) ||
-        (d->m_wants_to_finish && (flush != TDEFL_FINISH)) || (pIn_buf_size && *pIn_buf_size && !pIn_buf) || (pOut_buf_size && *pOut_buf_size && !pOut_buf))
-    {
-        if (pIn_buf_size)
-            *pIn_buf_size = 0;
-        if (pOut_buf_size)
-            *pOut_buf_size = 0;
-        return (d->m_prev_return_status = TDEFL_STATUS_BAD_PARAM);
-    }
-    d->m_wants_to_finish |= (flush == TDEFL_FINISH);
-
-    if ((d->m_output_flush_remaining) || (d->m_finished))
-        return (d->m_prev_return_status = tdefl_flush_output_buffer(d));
-
-#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
-    if (((d->m_flags & TDEFL_MAX_PROBES_MASK) == 1) &&
-        ((d->m_flags & TDEFL_GREEDY_PARSING_FLAG) != 0) &&
-        ((d->m_flags & (TDEFL_FILTER_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS | TDEFL_RLE_MATCHES)) == 0))
-    {
-        if (!tdefl_compress_fast(d))
-            return d->m_prev_return_status;
-    }
-    else
-#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */
-    {
-        if (!tdefl_compress_normal(d))
-            return d->m_prev_return_status;
-    }
-
-    if ((d->m_flags & (TDEFL_WRITE_ZLIB_HEADER | TDEFL_COMPUTE_ADLER32)) && (pIn_buf))
-        d->m_adler32 = (mz_uint32)mz_adler32(d->m_adler32, (const mz_uint8 *)pIn_buf, d->m_pSrc - (const mz_uint8 *)pIn_buf);
-
-    if ((flush) && (!d->m_lookahead_size) && (!d->m_src_buf_left) && (!d->m_output_flush_remaining))
-    {
-        if (tdefl_flush_block(d, flush) < 0)
-            return d->m_prev_return_status;
-        d->m_finished = (flush == TDEFL_FINISH);
-        if (flush == TDEFL_FULL_FLUSH)
-        {
-            MZ_CLEAR_ARR(d->m_hash);
-            MZ_CLEAR_ARR(d->m_next);
-            d->m_dict_size = 0;
-        }
-    }
-
-    return (d->m_prev_return_status = tdefl_flush_output_buffer(d));
-}
-
-tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush)
-{
-    MZ_ASSERT(d->m_pPut_buf_func);
-    return tdefl_compress(d, pIn_buf, &in_buf_size, NULL, NULL, flush);
-}
-
-tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
-{
-    d->m_pPut_buf_func = pPut_buf_func;
-    d->m_pPut_buf_user = pPut_buf_user;
-    d->m_flags = (mz_uint)(flags);
-    d->m_max_probes[0] = 1 + ((flags & 0xFFF) + 2) / 3;
-    d->m_greedy_parsing = (flags & TDEFL_GREEDY_PARSING_FLAG) != 0;
-    d->m_max_probes[1] = 1 + (((flags & 0xFFF) >> 2) + 2) / 3;
-    if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG))
-        MZ_CLEAR_ARR(d->m_hash);
-    d->m_lookahead_pos = d->m_lookahead_size = d->m_dict_size = d->m_total_lz_bytes = d->m_lz_code_buf_dict_pos = d->m_bits_in = 0;
-    d->m_output_flush_ofs = d->m_output_flush_remaining = d->m_finished = d->m_block_index = d->m_bit_buffer = d->m_wants_to_finish = 0;
-    d->m_pLZ_code_buf = d->m_lz_code_buf + 1;
-    d->m_pLZ_flags = d->m_lz_code_buf;
-    *d->m_pLZ_flags = 0;
-    d->m_num_flags_left = 8;
-    d->m_pOutput_buf = d->m_output_buf;
-    d->m_pOutput_buf_end = d->m_output_buf;
-    d->m_prev_return_status = TDEFL_STATUS_OKAY;
-    d->m_saved_match_dist = d->m_saved_match_len = d->m_saved_lit = 0;
-    d->m_adler32 = 1;
-    d->m_pIn_buf = NULL;
-    d->m_pOut_buf = NULL;
-    d->m_pIn_buf_size = NULL;
-    d->m_pOut_buf_size = NULL;
-    d->m_flush = TDEFL_NO_FLUSH;
-    d->m_pSrc = NULL;
-    d->m_src_buf_left = 0;
-    d->m_out_buf_ofs = 0;
-    if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG))
-        MZ_CLEAR_ARR(d->m_dict);
-    memset(&d->m_huff_count[0][0], 0, sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0);
-    memset(&d->m_huff_count[1][0], 0, sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1);
-    return TDEFL_STATUS_OKAY;
-}
-
-tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d)
-{
-    return d->m_prev_return_status;
-}
-
-mz_uint32 tdefl_get_adler32(tdefl_compressor *d)
-{
-    return d->m_adler32;
-}
-
-mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
-{
-    tdefl_compressor *pComp;
-    mz_bool succeeded;
-    if (((buf_len) && (!pBuf)) || (!pPut_buf_func))
-        return MZ_FALSE;
-    pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
-    if (!pComp)
-        return MZ_FALSE;
-    succeeded = (tdefl_init(pComp, pPut_buf_func, pPut_buf_user, flags) == TDEFL_STATUS_OKAY);
-    succeeded = succeeded && (tdefl_compress_buffer(pComp, pBuf, buf_len, TDEFL_FINISH) == TDEFL_STATUS_DONE);
-    MZ_FREE(pComp);
-    return succeeded;
-}
-
-typedef struct
-{
-    size_t m_size, m_capacity;
-    mz_uint8 *m_pBuf;
-    mz_bool m_expandable;
-} tdefl_output_buffer;
-
-static mz_bool tdefl_output_buffer_putter(const void *pBuf, int len, void *pUser)
-{
-    tdefl_output_buffer *p = (tdefl_output_buffer *)pUser;
-    size_t new_size = p->m_size + len;
-    if (new_size > p->m_capacity)
-    {
-        size_t new_capacity = p->m_capacity;
-        mz_uint8 *pNew_buf;
-        if (!p->m_expandable)
-            return MZ_FALSE;
-        do
-        {
-            new_capacity = MZ_MAX(128U, new_capacity << 1U);
-        } while (new_size > new_capacity);
-        pNew_buf = (mz_uint8 *)MZ_REALLOC(p->m_pBuf, new_capacity);
-        if (!pNew_buf)
-            return MZ_FALSE;
-        p->m_pBuf = pNew_buf;
-        p->m_capacity = new_capacity;
-    }
-    memcpy((mz_uint8 *)p->m_pBuf + p->m_size, pBuf, len);
-    p->m_size = new_size;
-    return MZ_TRUE;
-}
-
-void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags)
-{
-    tdefl_output_buffer out_buf;
-    MZ_CLEAR_OBJ(out_buf);
-    if (!pOut_len)
-        return MZ_FALSE;
-    else
-        *pOut_len = 0;
-    out_buf.m_expandable = MZ_TRUE;
-    if (!tdefl_compress_mem_to_output(pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags))
-        return NULL;
-    *pOut_len = out_buf.m_size;
-    return out_buf.m_pBuf;
-}
-
-size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags)
-{
-    tdefl_output_buffer out_buf;
-    MZ_CLEAR_OBJ(out_buf);
-    if (!pOut_buf)
-        return 0;
-    out_buf.m_pBuf = (mz_uint8 *)pOut_buf;
-    out_buf.m_capacity = out_buf_len;
-    if (!tdefl_compress_mem_to_output(pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags))
-        return 0;
-    return out_buf.m_size;
-}
-
-static const mz_uint s_tdefl_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
-
-/* level may actually range from [0,10] (10 is a "hidden" max level, where we want a bit more compression and it's fine if throughput to fall off a cliff on some files). */
-mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy)
-{
-    mz_uint comp_flags = s_tdefl_num_probes[(level >= 0) ? MZ_MIN(10, level) : MZ_DEFAULT_LEVEL] | ((level <= 3) ? TDEFL_GREEDY_PARSING_FLAG : 0);
-    if (window_bits > 0)
-        comp_flags |= TDEFL_WRITE_ZLIB_HEADER;
-
-    if (!level)
-        comp_flags |= TDEFL_FORCE_ALL_RAW_BLOCKS;
-    else if (strategy == MZ_FILTERED)
-        comp_flags |= TDEFL_FILTER_MATCHES;
-    else if (strategy == MZ_HUFFMAN_ONLY)
-        comp_flags &= ~TDEFL_MAX_PROBES_MASK;
-    else if (strategy == MZ_FIXED)
-        comp_flags |= TDEFL_FORCE_ALL_STATIC_BLOCKS;
-    else if (strategy == MZ_RLE)
-        comp_flags |= TDEFL_RLE_MATCHES;
-
-    return comp_flags;
-}
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4204) /* nonstandard extension used : non-constant aggregate initializer (also supported by GNU C and C99, so no big deal) */
-#endif
-
-/* Simple PNG writer function by Alex Evans, 2011. Released into the public domain: https://gist.github.com/908299, more context at
- http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/.
- This is actually a modification of Alex's original code so PNG files generated by this function pass pngcheck. */
-void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip)
-{
-    /* Using a local copy of this array here in case MINIZ_NO_ZLIB_APIS was defined. */
-    static const mz_uint s_tdefl_png_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
-    tdefl_compressor *pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
-    tdefl_output_buffer out_buf;
-    int i, bpl = w * num_chans, y, z;
-    mz_uint32 c;
-    *pLen_out = 0;
-    if (!pComp)
-        return NULL;
-    MZ_CLEAR_OBJ(out_buf);
-    out_buf.m_expandable = MZ_TRUE;
-    out_buf.m_capacity = 57 + MZ_MAX(64, (1 + bpl) * h);
-    if (NULL == (out_buf.m_pBuf = (mz_uint8 *)MZ_MALLOC(out_buf.m_capacity)))
-    {
-        MZ_FREE(pComp);
-        return NULL;
-    }
-    /* write dummy header */
-    for (z = 41; z; --z)
-        tdefl_output_buffer_putter(&z, 1, &out_buf);
-    /* compress image data */
-    tdefl_init(pComp, tdefl_output_buffer_putter, &out_buf, s_tdefl_png_num_probes[MZ_MIN(10, level)] | TDEFL_WRITE_ZLIB_HEADER);
-    for (y = 0; y < h; ++y)
-    {
-        tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH);
-        tdefl_compress_buffer(pComp, (mz_uint8 *)pImage + (flip ? (h - 1 - y) : y) * bpl, bpl, TDEFL_NO_FLUSH);
-    }
-    if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != TDEFL_STATUS_DONE)
-    {
-        MZ_FREE(pComp);
-        MZ_FREE(out_buf.m_pBuf);
-        return NULL;
-    }
-    /* write real header */
-    *pLen_out = out_buf.m_size - 41;
-    {
-        static const mz_uint8 chans[] = { 0x00, 0x00, 0x04, 0x02, 0x06 };
-        mz_uint8 pnghdr[41] = { 0x89, 0x50, 0x4e, 0x47, 0x0d,
-                                0x0a, 0x1a, 0x0a, 0x00, 0x00,
-                                0x00, 0x0d, 0x49, 0x48, 0x44,
-                                0x52, 0x00, 0x00, 0x00, 0x00,
-                                0x00, 0x00, 0x00, 0x00, 0x08,
-                                0x00, 0x00, 0x00, 0x00, 0x00,
-                                0x00, 0x00, 0x00, 0x00, 0x00,
-                                0x00, 0x00, 0x49, 0x44, 0x41,
-                                0x54 };
-        pnghdr[18] = (mz_uint8)(w >> 8);
-        pnghdr[19] = (mz_uint8)w;
-        pnghdr[22] = (mz_uint8)(h >> 8);
-        pnghdr[23] = (mz_uint8)h;
-        pnghdr[25] = chans[num_chans];
-        pnghdr[33] = (mz_uint8)(*pLen_out >> 24);
-        pnghdr[34] = (mz_uint8)(*pLen_out >> 16);
-        pnghdr[35] = (mz_uint8)(*pLen_out >> 8);
-        pnghdr[36] = (mz_uint8)*pLen_out;
-        c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, pnghdr + 12, 17);
-        for (i = 0; i < 4; ++i, c <<= 8)
-            ((mz_uint8 *)(pnghdr + 29))[i] = (mz_uint8)(c >> 24);
-        memcpy(out_buf.m_pBuf, pnghdr, 41);
-    }
-    /* write footer (IDAT CRC-32, followed by IEND chunk) */
-    if (!tdefl_output_buffer_putter("\0\0\0\0\0\0\0\0\x49\x45\x4e\x44\xae\x42\x60\x82", 16, &out_buf))
-    {
-        *pLen_out = 0;
-        MZ_FREE(pComp);
-        MZ_FREE(out_buf.m_pBuf);
-        return NULL;
-    }
-    c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, out_buf.m_pBuf + 41 - 4, *pLen_out + 4);
-    for (i = 0; i < 4; ++i, c <<= 8)
-        (out_buf.m_pBuf + out_buf.m_size - 16)[i] = (mz_uint8)(c >> 24);
-    /* compute final size of file, grab compressed data buffer and return */
-    *pLen_out += 57;
-    MZ_FREE(pComp);
-    return out_buf.m_pBuf;
-}
-void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out)
-{
-    /* Level 6 corresponds to TDEFL_DEFAULT_MAX_PROBES or MZ_DEFAULT_LEVEL (but we can't depend on MZ_DEFAULT_LEVEL being available in case the zlib API's where #defined out) */
-    return tdefl_write_image_to_png_file_in_memory_ex(pImage, w, h, num_chans, pLen_out, 6, MZ_FALSE);
-}
-
-#ifndef MINIZ_NO_MALLOC
-/* Allocate the tdefl_compressor and tinfl_decompressor structures in C so that */
-/* non-C language bindings to tdefL_ and tinfl_ API don't need to worry about */
-/* structure size and allocation mechanism. */
-tdefl_compressor *tdefl_compressor_alloc(void)
-{
-    return (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
-}
-
-void tdefl_compressor_free(tdefl_compressor *pComp)
-{
-    MZ_FREE(pComp);
-}
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
- /**************************************************************************
- *
- * Copyright 2013-2014 RAD Game Tools and Valve Software
- * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- **************************************************************************/
-
-
-
-#ifndef MINIZ_NO_INFLATE_APIS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------- Low-level Decompression (completely independent from all compression API's) */
-
-#define TINFL_MEMCPY(d, s, l) memcpy(d, s, l)
-#define TINFL_MEMSET(p, c, l) memset(p, c, l)
-
-#define TINFL_CR_BEGIN  \
-    switch (r->m_state) \
-    {                   \
-        case 0:
-#define TINFL_CR_RETURN(state_index, result) \
-    do                                       \
-    {                                        \
-        status = result;                     \
-        r->m_state = state_index;            \
-        goto common_exit;                    \
-        case state_index:;                   \
-    }                                        \
-    MZ_MACRO_END
-#define TINFL_CR_RETURN_FOREVER(state_index, result) \
-    do                                               \
-    {                                                \
-        for (;;)                                     \
-        {                                            \
-            TINFL_CR_RETURN(state_index, result);    \
-        }                                            \
-    }                                                \
-    MZ_MACRO_END
-#define TINFL_CR_FINISH }
-
-#define TINFL_GET_BYTE(state_index, c)                                                                                                                           \
-    do                                                                                                                                                           \
-    {                                                                                                                                                            \
-        while (pIn_buf_cur >= pIn_buf_end)                                                                                                                       \
-        {                                                                                                                                                        \
-            TINFL_CR_RETURN(state_index, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) ? TINFL_STATUS_NEEDS_MORE_INPUT : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS); \
-        }                                                                                                                                                        \
-        c = *pIn_buf_cur++;                                                                                                                                      \
-    }                                                                                                                                                            \
-    MZ_MACRO_END
-
-#define TINFL_NEED_BITS(state_index, n)                \
-    do                                                 \
-    {                                                  \
-        mz_uint c;                                     \
-        TINFL_GET_BYTE(state_index, c);                \
-        bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); \
-        num_bits += 8;                                 \
-    } while (num_bits < (mz_uint)(n))
-#define TINFL_SKIP_BITS(state_index, n)      \
-    do                                       \
-    {                                        \
-        if (num_bits < (mz_uint)(n))         \
-        {                                    \
-            TINFL_NEED_BITS(state_index, n); \
-        }                                    \
-        bit_buf >>= (n);                     \
-        num_bits -= (n);                     \
-    }                                        \
-    MZ_MACRO_END
-#define TINFL_GET_BITS(state_index, b, n)    \
-    do                                       \
-    {                                        \
-        if (num_bits < (mz_uint)(n))         \
-        {                                    \
-            TINFL_NEED_BITS(state_index, n); \
-        }                                    \
-        b = bit_buf & ((1 << (n)) - 1);      \
-        bit_buf >>= (n);                     \
-        num_bits -= (n);                     \
-    }                                        \
-    MZ_MACRO_END
-
-/* TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes remaining in the input buffer falls below 2. */
-/* It reads just enough bytes from the input stream that are needed to decode the next Huffman code (and absolutely no more). It works by trying to fully decode a */
-/* Huffman code by using whatever bits are currently present in the bit buffer. If this fails, it reads another byte, and tries again until it succeeds or until the */
-/* bit buffer contains >=15 bits (deflate's max. Huffman code size). */
-#define TINFL_HUFF_BITBUF_FILL(state_index, pLookUp, pTree)                    \
-    do                                                                         \
-    {                                                                          \
-        temp = pLookUp[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)];                \
-        if (temp >= 0)                                                         \
-        {                                                                      \
-            code_len = temp >> 9;                                              \
-            if ((code_len) && (num_bits >= code_len))                          \
-                break;                                                         \
-        }                                                                      \
-        else if (num_bits > TINFL_FAST_LOOKUP_BITS)                            \
-        {                                                                      \
-            code_len = TINFL_FAST_LOOKUP_BITS;                                 \
-            do                                                                 \
-            {                                                                  \
-                temp = pTree[~temp + ((bit_buf >> code_len++) & 1)];           \
-            } while ((temp < 0) && (num_bits >= (code_len + 1)));              \
-            if (temp >= 0)                                                     \
-                break;                                                         \
-        }                                                                      \
-        TINFL_GET_BYTE(state_index, c);                                        \
-        bit_buf |= (((tinfl_bit_buf_t)c) << num_bits);                         \
-        num_bits += 8;                                                         \
-    } while (num_bits < 15);
-
-/* TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex than you would initially expect because the zlib API expects the decompressor to never read */
-/* beyond the final byte of the deflate stream. (In other words, when this macro wants to read another byte from the input, it REALLY needs another byte in order to fully */
-/* decode the next Huffman code.) Handling this properly is particularly important on raw deflate (non-zlib) streams, which aren't followed by a byte aligned adler-32. */
-/* The slow path is only executed at the very end of the input buffer. */
-/* v1.16: The original macro handled the case at the very end of the passed-in input buffer, but we also need to handle the case where the user passes in 1+zillion bytes */
-/* following the deflate data and our non-conservative read-ahead path won't kick in here on this code. This is much trickier. */
-#define TINFL_HUFF_DECODE(state_index, sym, pLookUp, pTree)                                                                         \
-    do                                                                                                                              \
-    {                                                                                                                               \
-        int temp;                                                                                                                   \
-        mz_uint code_len, c;                                                                                                        \
-        if (num_bits < 15)                                                                                                          \
-        {                                                                                                                           \
-            if ((pIn_buf_end - pIn_buf_cur) < 2)                                                                                    \
-            {                                                                                                                       \
-                TINFL_HUFF_BITBUF_FILL(state_index, pLookUp, pTree);                                                                \
-            }                                                                                                                       \
-            else                                                                                                                    \
-            {                                                                                                                       \
-                bit_buf |= (((tinfl_bit_buf_t)pIn_buf_cur[0]) << num_bits) | (((tinfl_bit_buf_t)pIn_buf_cur[1]) << (num_bits + 8)); \
-                pIn_buf_cur += 2;                                                                                                   \
-                num_bits += 16;                                                                                                     \
-            }                                                                                                                       \
-        }                                                                                                                           \
-        if ((temp = pLookUp[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)                                                          \
-            code_len = temp >> 9, temp &= 511;                                                                                      \
-        else                                                                                                                        \
-        {                                                                                                                           \
-            code_len = TINFL_FAST_LOOKUP_BITS;                                                                                      \
-            do                                                                                                                      \
-            {                                                                                                                       \
-                temp = pTree[~temp + ((bit_buf >> code_len++) & 1)];                                                                \
-            } while (temp < 0);                                                                                                     \
-        }                                                                                                                           \
-        sym = temp;                                                                                                                 \
-        bit_buf >>= code_len;                                                                                                       \
-        num_bits -= code_len;                                                                                                       \
-    }                                                                                                                               \
-    MZ_MACRO_END
-
-static void tinfl_clear_tree(tinfl_decompressor *r)
-{
-    if (r->m_type == 0)
-        MZ_CLEAR_ARR(r->m_tree_0);
-    else if (r->m_type == 1)
-        MZ_CLEAR_ARR(r->m_tree_1);
-    else
-        MZ_CLEAR_ARR(r->m_tree_2);
-}
-
-tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags)
-{
-    static const mz_uint16 s_length_base[31] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 };
-    static const mz_uint8 s_length_extra[31] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 0, 0 };
-    static const mz_uint16 s_dist_base[32] = { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 0, 0 };
-    static const mz_uint8 s_dist_extra[32] = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13 };
-    static const mz_uint8 s_length_dezigzag[19] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
-    static const mz_uint16 s_min_table_sizes[3] = { 257, 1, 4 };
-
-    mz_int16 *pTrees[3];
-    mz_uint8 *pCode_sizes[3];
-
-    tinfl_status status = TINFL_STATUS_FAILED;
-    mz_uint32 num_bits, dist, counter, num_extra;
-    tinfl_bit_buf_t bit_buf;
-    const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = pIn_buf_next + *pIn_buf_size;
-    mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = pOut_buf_next ? pOut_buf_next + *pOut_buf_size : NULL;
-    size_t out_buf_size_mask = (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) ? (size_t)-1 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1, dist_from_out_buf_start;
-
-    /* Ensure the output buffer's size is a power of 2, unless the output buffer is large enough to hold the entire output file (in which case it doesn't matter). */
-    if ((!pOut_buf_start) || (!pOut_buf_next) || (!pIn_buf_size) || (!pOut_buf_size))
-    {
-        return TINFL_STATUS_BAD_PARAM;
-    }
-    if (((out_buf_size_mask + 1) & out_buf_size_mask) || (pOut_buf_next < pOut_buf_start))
-    {
-        *pIn_buf_size = *pOut_buf_size = 0;
-        return TINFL_STATUS_BAD_PARAM;
-    }
-
-    pTrees[0] = r->m_tree_0;
-    pTrees[1] = r->m_tree_1;
-    pTrees[2] = r->m_tree_2;
-    pCode_sizes[0] = r->m_code_size_0;
-    pCode_sizes[1] = r->m_code_size_1;
-    pCode_sizes[2] = r->m_code_size_2;
-
-    num_bits = r->m_num_bits;
-    bit_buf = r->m_bit_buf;
-    dist = r->m_dist;
-    counter = r->m_counter;
-    num_extra = r->m_num_extra;
-    dist_from_out_buf_start = r->m_dist_from_out_buf_start;
-    TINFL_CR_BEGIN
-
-    bit_buf = num_bits = dist = counter = num_extra = r->m_zhdr0 = r->m_zhdr1 = 0;
-    r->m_z_adler32 = r->m_check_adler32 = 1;
-    if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER)
-    {
-        TINFL_GET_BYTE(1, r->m_zhdr0);
-        TINFL_GET_BYTE(2, r->m_zhdr1);
-        counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) || (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8));
-        if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))
-            counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)((size_t)1 << (8U + (r->m_zhdr0 >> 4)))));
-        if (counter)
-        {
-            TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED);
-        }
-    }
-
-    do
-    {
-        TINFL_GET_BITS(3, r->m_final, 3);
-        r->m_type = r->m_final >> 1;
-        if (r->m_type == 0)
-        {
-            TINFL_SKIP_BITS(5, num_bits & 7);
-            for (counter = 0; counter < 4; ++counter)
-            {
-                if (num_bits)
-                    TINFL_GET_BITS(6, r->m_raw_header[counter], 8);
-                else
-                    TINFL_GET_BYTE(7, r->m_raw_header[counter]);
-            }
-            if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) != (mz_uint)(0xFFFF ^ (r->m_raw_header[2] | (r->m_raw_header[3] << 8))))
-            {
-                TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED);
-            }
-            while ((counter) && (num_bits))
-            {
-                TINFL_GET_BITS(51, dist, 8);
-                while (pOut_buf_cur >= pOut_buf_end)
-                {
-                    TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT);
-                }
-                *pOut_buf_cur++ = (mz_uint8)dist;
-                counter--;
-            }
-            while (counter)
-            {
-                size_t n;
-                while (pOut_buf_cur >= pOut_buf_end)
-                {
-                    TINFL_CR_RETURN(9, TINFL_STATUS_HAS_MORE_OUTPUT);
-                }
-                while (pIn_buf_cur >= pIn_buf_end)
-                {
-                    TINFL_CR_RETURN(38, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) ? TINFL_STATUS_NEEDS_MORE_INPUT : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS);
-                }
-                n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur), (size_t)(pIn_buf_end - pIn_buf_cur)), counter);
-                TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n);
-                pIn_buf_cur += n;
-                pOut_buf_cur += n;
-                counter -= (mz_uint)n;
-            }
-        }
-        else if (r->m_type == 3)
-        {
-            TINFL_CR_RETURN_FOREVER(10, TINFL_STATUS_FAILED);
-        }
-        else
-        {
-            if (r->m_type == 1)
-            {
-                mz_uint8 *p = r->m_code_size_0;
-                mz_uint i;
-                r->m_table_sizes[0] = 288;
-                r->m_table_sizes[1] = 32;
-                TINFL_MEMSET(r->m_code_size_1, 5, 32);
-                for (i = 0; i <= 143; ++i)
-                    *p++ = 8;
-                for (; i <= 255; ++i)
-                    *p++ = 9;
-                for (; i <= 279; ++i)
-                    *p++ = 7;
-                for (; i <= 287; ++i)
-                    *p++ = 8;
-            }
-            else
-            {
-                for (counter = 0; counter < 3; counter++)
-                {
-                    TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]);
-                    r->m_table_sizes[counter] += s_min_table_sizes[counter];
-                }
-                MZ_CLEAR_ARR(r->m_code_size_2);
-                for (counter = 0; counter < r->m_table_sizes[2]; counter++)
-                {
-                    mz_uint s;
-                    TINFL_GET_BITS(14, s, 3);
-                    r->m_code_size_2[s_length_dezigzag[counter]] = (mz_uint8)s;
-                }
-                r->m_table_sizes[2] = 19;
-            }
-            for (; (int)r->m_type >= 0; r->m_type--)
-            {
-                int tree_next, tree_cur;
-                mz_int16 *pLookUp;
-                mz_int16 *pTree;
-                mz_uint8 *pCode_size;
-                mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16];
-                pLookUp = r->m_look_up[r->m_type];
-                pTree = pTrees[r->m_type];
-                pCode_size = pCode_sizes[r->m_type];
-                MZ_CLEAR_ARR(total_syms);
-                TINFL_MEMSET(pLookUp, 0, sizeof(r->m_look_up[0]));
-                tinfl_clear_tree(r);
-                for (i = 0; i < r->m_table_sizes[r->m_type]; ++i)
-                    total_syms[pCode_size[i]]++;
-                used_syms = 0, total = 0;
-                next_code[0] = next_code[1] = 0;
-                for (i = 1; i <= 15; ++i)
-                {
-                    used_syms += total_syms[i];
-                    next_code[i + 1] = (total = ((total + total_syms[i]) << 1));
-                }
-                if ((65536 != total) && (used_syms > 1))
-                {
-                    TINFL_CR_RETURN_FOREVER(35, TINFL_STATUS_FAILED);
-                }
-                for (tree_next = -1, sym_index = 0; sym_index < r->m_table_sizes[r->m_type]; ++sym_index)
-                {
-                    mz_uint rev_code = 0, l, cur_code, code_size = pCode_size[sym_index];
-                    if (!code_size)
-                        continue;
-                    cur_code = next_code[code_size]++;
-                    for (l = code_size; l > 0; l--, cur_code >>= 1)
-                        rev_code = (rev_code << 1) | (cur_code & 1);
-                    if (code_size <= TINFL_FAST_LOOKUP_BITS)
-                    {
-                        mz_int16 k = (mz_int16)((code_size << 9) | sym_index);
-                        while (rev_code < TINFL_FAST_LOOKUP_SIZE)
-                        {
-                            pLookUp[rev_code] = k;
-                            rev_code += (1 << code_size);
-                        }
-                        continue;
-                    }
-                    if (0 == (tree_cur = pLookUp[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)]))
-                    {
-                        pLookUp[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] = (mz_int16)tree_next;
-                        tree_cur = tree_next;
-                        tree_next -= 2;
-                    }
-                    rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1);
-                    for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--)
-                    {
-                        tree_cur -= ((rev_code >>= 1) & 1);
-                        if (!pTree[-tree_cur - 1])
-                        {
-                            pTree[-tree_cur - 1] = (mz_int16)tree_next;
-                            tree_cur = tree_next;
-                            tree_next -= 2;
-                        }
-                        else
-                            tree_cur = pTree[-tree_cur - 1];
-                    }
-                    tree_cur -= ((rev_code >>= 1) & 1);
-                    pTree[-tree_cur - 1] = (mz_int16)sym_index;
-                }
-                if (r->m_type == 2)
-                {
-                    for (counter = 0; counter < (r->m_table_sizes[0] + r->m_table_sizes[1]);)
-                    {
-                        mz_uint s;
-                        TINFL_HUFF_DECODE(16, dist, r->m_look_up[2], r->m_tree_2);
-                        if (dist < 16)
-                        {
-                            r->m_len_codes[counter++] = (mz_uint8)dist;
-                            continue;
-                        }
-                        if ((dist == 16) && (!counter))
-                        {
-                            TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED);
-                        }
-                        num_extra = "\02\03\07"[dist - 16];
-                        TINFL_GET_BITS(18, s, num_extra);
-                        s += "\03\03\013"[dist - 16];
-                        TINFL_MEMSET(r->m_len_codes + counter, (dist == 16) ? r->m_len_codes[counter - 1] : 0, s);
-                        counter += s;
-                    }
-                    if ((r->m_table_sizes[0] + r->m_table_sizes[1]) != counter)
-                    {
-                        TINFL_CR_RETURN_FOREVER(21, TINFL_STATUS_FAILED);
-                    }
-                    TINFL_MEMCPY(r->m_code_size_0, r->m_len_codes, r->m_table_sizes[0]);
-                    TINFL_MEMCPY(r->m_code_size_1, r->m_len_codes + r->m_table_sizes[0], r->m_table_sizes[1]);
-                }
-            }
-            for (;;)
-            {
-                mz_uint8 *pSrc;
-                for (;;)
-                {
-                    if (((pIn_buf_end - pIn_buf_cur) < 4) || ((pOut_buf_end - pOut_buf_cur) < 2))
-                    {
-                        TINFL_HUFF_DECODE(23, counter, r->m_look_up[0], r->m_tree_0);
-                        if (counter >= 256)
-                            break;
-                        while (pOut_buf_cur >= pOut_buf_end)
-                        {
-                            TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT);
-                        }
-                        *pOut_buf_cur++ = (mz_uint8)counter;
-                    }
-                    else
-                    {
-                        int sym2;
-                        mz_uint code_len;
-#if TINFL_USE_64BIT_BITBUF
-                        if (num_bits < 30)
-                        {
-                            bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits);
-                            pIn_buf_cur += 4;
-                            num_bits += 32;
-                        }
-#else
-                        if (num_bits < 15)
-                        {
-                            bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
-                            pIn_buf_cur += 2;
-                            num_bits += 16;
-                        }
-#endif
-                        if ((sym2 = r->m_look_up[0][bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
-                            code_len = sym2 >> 9;
-                        else
-                        {
-                            code_len = TINFL_FAST_LOOKUP_BITS;
-                            do
-                            {
-                                sym2 = r->m_tree_0[~sym2 + ((bit_buf >> code_len++) & 1)];
-                            } while (sym2 < 0);
-                        }
-                        counter = sym2;
-                        bit_buf >>= code_len;
-                        num_bits -= code_len;
-                        if (counter & 256)
-                            break;
-
-#if !TINFL_USE_64BIT_BITBUF
-                        if (num_bits < 15)
-                        {
-                            bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
-                            pIn_buf_cur += 2;
-                            num_bits += 16;
-                        }
-#endif
-                        if ((sym2 = r->m_look_up[0][bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
-                            code_len = sym2 >> 9;
-                        else
-                        {
-                            code_len = TINFL_FAST_LOOKUP_BITS;
-                            do
-                            {
-                                sym2 = r->m_tree_0[~sym2 + ((bit_buf >> code_len++) & 1)];
-                            } while (sym2 < 0);
-                        }
-                        bit_buf >>= code_len;
-                        num_bits -= code_len;
-
-                        pOut_buf_cur[0] = (mz_uint8)counter;
-                        if (sym2 & 256)
-                        {
-                            pOut_buf_cur++;
-                            counter = sym2;
-                            break;
-                        }
-                        pOut_buf_cur[1] = (mz_uint8)sym2;
-                        pOut_buf_cur += 2;
-                    }
-                }
-                if ((counter &= 511) == 256)
-                    break;
-
-                num_extra = s_length_extra[counter - 257];
-                counter = s_length_base[counter - 257];
-                if (num_extra)
-                {
-                    mz_uint extra_bits;
-                    TINFL_GET_BITS(25, extra_bits, num_extra);
-                    counter += extra_bits;
-                }
-
-                TINFL_HUFF_DECODE(26, dist, r->m_look_up[1], r->m_tree_1);
-                num_extra = s_dist_extra[dist];
-                dist = s_dist_base[dist];
-                if (num_extra)
-                {
-                    mz_uint extra_bits;
-                    TINFL_GET_BITS(27, extra_bits, num_extra);
-                    dist += extra_bits;
-                }
-
-                dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start;
-                if ((dist == 0 || dist > dist_from_out_buf_start || dist_from_out_buf_start == 0) && (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))
-                {
-                    TINFL_CR_RETURN_FOREVER(37, TINFL_STATUS_FAILED);
-                }
-
-                pSrc = pOut_buf_start + ((dist_from_out_buf_start - dist) & out_buf_size_mask);
-
-                if ((MZ_MAX(pOut_buf_cur, pSrc) + counter) > pOut_buf_end)
-                {
-                    while (counter--)
-                    {
-                        while (pOut_buf_cur >= pOut_buf_end)
-                        {
-                            TINFL_CR_RETURN(53, TINFL_STATUS_HAS_MORE_OUTPUT);
-                        }
-                        *pOut_buf_cur++ = pOut_buf_start[(dist_from_out_buf_start++ - dist) & out_buf_size_mask];
-                    }
-                    continue;
-                }
-#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
-                else if ((counter >= 9) && (counter <= dist))
-                {
-                    const mz_uint8 *pSrc_end = pSrc + (counter & ~7);
-                    do
-                    {
-#ifdef MINIZ_UNALIGNED_USE_MEMCPY
-						memcpy(pOut_buf_cur, pSrc, sizeof(mz_uint32)*2);
-#else
-                        ((mz_uint32 *)pOut_buf_cur)[0] = ((const mz_uint32 *)pSrc)[0];
-                        ((mz_uint32 *)pOut_buf_cur)[1] = ((const mz_uint32 *)pSrc)[1];
-#endif
-                        pOut_buf_cur += 8;
-                    } while ((pSrc += 8) < pSrc_end);
-                    if ((counter &= 7) < 3)
-                    {
-                        if (counter)
-                        {
-                            pOut_buf_cur[0] = pSrc[0];
-                            if (counter > 1)
-                                pOut_buf_cur[1] = pSrc[1];
-                            pOut_buf_cur += counter;
-                        }
-                        continue;
-                    }
-                }
-#endif
-                while(counter>2)
-                {
-                    pOut_buf_cur[0] = pSrc[0];
-                    pOut_buf_cur[1] = pSrc[1];
-                    pOut_buf_cur[2] = pSrc[2];
-                    pOut_buf_cur += 3;
-                    pSrc += 3;
-					counter -= 3;
-                }
-                if (counter > 0)
-                {
-                    pOut_buf_cur[0] = pSrc[0];
-                    if (counter > 1)
-                        pOut_buf_cur[1] = pSrc[1];
-                    pOut_buf_cur += counter;
-                }
-            }
-        }
-    } while (!(r->m_final & 1));
-
-    /* Ensure byte alignment and put back any bytes from the bitbuf if we've looked ahead too far on gzip, or other Deflate streams followed by arbitrary data. */
-    /* I'm being super conservative here. A number of simplifications can be made to the byte alignment part, and the Adler32 check shouldn't ever need to worry about reading from the bitbuf now. */
-    TINFL_SKIP_BITS(32, num_bits & 7);
-    while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8))
-    {
-        --pIn_buf_cur;
-        num_bits -= 8;
-    }
-    bit_buf &= ~(~(tinfl_bit_buf_t)0 << num_bits);
-    MZ_ASSERT(!num_bits); /* if this assert fires then we've read beyond the end of non-deflate/zlib streams with following data (such as gzip streams). */
-
-    if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER)
-    {
-        for (counter = 0; counter < 4; ++counter)
-        {
-            mz_uint s;
-            if (num_bits)
-                TINFL_GET_BITS(41, s, 8);
-            else
-                TINFL_GET_BYTE(42, s);
-            r->m_z_adler32 = (r->m_z_adler32 << 8) | s;
-        }
-    }
-    TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE);
-
-    TINFL_CR_FINISH
-
-common_exit:
-    /* As long as we aren't telling the caller that we NEED more input to make forward progress: */
-    /* Put back any bytes from the bitbuf in case we've looked ahead too far on gzip, or other Deflate streams followed by arbitrary data. */
-    /* We need to be very careful here to NOT push back any bytes we definitely know we need to make forward progress, though, or we'll lock the caller up into an inf loop. */
-    if ((status != TINFL_STATUS_NEEDS_MORE_INPUT) && (status != TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS))
-    {
-        while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8))
-        {
-            --pIn_buf_cur;
-            num_bits -= 8;
-        }
-    }
-    r->m_num_bits = num_bits;
-    r->m_bit_buf = bit_buf & ~(~(tinfl_bit_buf_t)0 << num_bits);
-    r->m_dist = dist;
-    r->m_counter = counter;
-    r->m_num_extra = num_extra;
-    r->m_dist_from_out_buf_start = dist_from_out_buf_start;
-    *pIn_buf_size = pIn_buf_cur - pIn_buf_next;
-    *pOut_buf_size = pOut_buf_cur - pOut_buf_next;
-    if ((decomp_flags & (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) && (status >= 0))
-    {
-        const mz_uint8 *ptr = pOut_buf_next;
-        size_t buf_len = *pOut_buf_size;
-        mz_uint32 i, s1 = r->m_check_adler32 & 0xffff, s2 = r->m_check_adler32 >> 16;
-        size_t block_len = buf_len % 5552;
-        while (buf_len)
-        {
-            for (i = 0; i + 7 < block_len; i += 8, ptr += 8)
-            {
-                s1 += ptr[0], s2 += s1;
-                s1 += ptr[1], s2 += s1;
-                s1 += ptr[2], s2 += s1;
-                s1 += ptr[3], s2 += s1;
-                s1 += ptr[4], s2 += s1;
-                s1 += ptr[5], s2 += s1;
-                s1 += ptr[6], s2 += s1;
-                s1 += ptr[7], s2 += s1;
-            }
-            for (; i < block_len; ++i)
-                s1 += *ptr++, s2 += s1;
-            s1 %= 65521U, s2 %= 65521U;
-            buf_len -= block_len;
-            block_len = 5552;
-        }
-        r->m_check_adler32 = (s2 << 16) + s1;
-        if ((status == TINFL_STATUS_DONE) && (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) && (r->m_check_adler32 != r->m_z_adler32))
-            status = TINFL_STATUS_ADLER32_MISMATCH;
-    }
-    return status;
-}
-
-/* Higher level helper functions. */
-void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags)
-{
-    tinfl_decompressor decomp;
-    void *pBuf = NULL, *pNew_buf;
-    size_t src_buf_ofs = 0, out_buf_capacity = 0;
-    *pOut_len = 0;
-    tinfl_init(&decomp);
-    for (;;)
-    {
-        size_t src_buf_size = src_buf_len - src_buf_ofs, dst_buf_size = out_buf_capacity - *pOut_len, new_out_buf_capacity;
-        tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf + src_buf_ofs, &src_buf_size, (mz_uint8 *)pBuf, pBuf ? (mz_uint8 *)pBuf + *pOut_len : NULL, &dst_buf_size,
-                                               (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
-        if ((status < 0) || (status == TINFL_STATUS_NEEDS_MORE_INPUT))
-        {
-            MZ_FREE(pBuf);
-            *pOut_len = 0;
-            return NULL;
-        }
-        src_buf_ofs += src_buf_size;
-        *pOut_len += dst_buf_size;
-        if (status == TINFL_STATUS_DONE)
-            break;
-        new_out_buf_capacity = out_buf_capacity * 2;
-        if (new_out_buf_capacity < 128)
-            new_out_buf_capacity = 128;
-        pNew_buf = MZ_REALLOC(pBuf, new_out_buf_capacity);
-        if (!pNew_buf)
-        {
-            MZ_FREE(pBuf);
-            *pOut_len = 0;
-            return NULL;
-        }
-        pBuf = pNew_buf;
-        out_buf_capacity = new_out_buf_capacity;
-    }
-    return pBuf;
-}
-
-size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags)
-{
-    tinfl_decompressor decomp;
-    tinfl_status status;
-    tinfl_init(&decomp);
-    status = tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf, &src_buf_len, (mz_uint8 *)pOut_buf, (mz_uint8 *)pOut_buf, &out_buf_len, (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
-    return (status != TINFL_STATUS_DONE) ? TINFL_DECOMPRESS_MEM_TO_MEM_FAILED : out_buf_len;
-}
-
-int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
-{
-    int result = 0;
-    tinfl_decompressor decomp;
-    mz_uint8 *pDict = (mz_uint8 *)MZ_MALLOC(TINFL_LZ_DICT_SIZE);
-    size_t in_buf_ofs = 0, dict_ofs = 0;
-    if (!pDict)
-        return TINFL_STATUS_FAILED;
-    memset(pDict,0,TINFL_LZ_DICT_SIZE);
-    tinfl_init(&decomp);
-    for (;;)
-    {
-        size_t in_buf_size = *pIn_buf_size - in_buf_ofs, dst_buf_size = TINFL_LZ_DICT_SIZE - dict_ofs;
-        tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8 *)pIn_buf + in_buf_ofs, &in_buf_size, pDict, pDict + dict_ofs, &dst_buf_size,
-                                               (flags & ~(TINFL_FLAG_HAS_MORE_INPUT | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)));
-        in_buf_ofs += in_buf_size;
-        if ((dst_buf_size) && (!(*pPut_buf_func)(pDict + dict_ofs, (int)dst_buf_size, pPut_buf_user)))
-            break;
-        if (status != TINFL_STATUS_HAS_MORE_OUTPUT)
-        {
-            result = (status == TINFL_STATUS_DONE);
-            break;
-        }
-        dict_ofs = (dict_ofs + dst_buf_size) & (TINFL_LZ_DICT_SIZE - 1);
-    }
-    MZ_FREE(pDict);
-    *pIn_buf_size = in_buf_ofs;
-    return result;
-}
-
-#ifndef MINIZ_NO_MALLOC
-tinfl_decompressor *tinfl_decompressor_alloc(void)
-{
-    tinfl_decompressor *pDecomp = (tinfl_decompressor *)MZ_MALLOC(sizeof(tinfl_decompressor));
-    if (pDecomp)
-        tinfl_init(pDecomp);
-    return pDecomp;
-}
-
-void tinfl_decompressor_free(tinfl_decompressor *pDecomp)
-{
-    MZ_FREE(pDecomp);
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
- /**************************************************************************
- *
- * Copyright 2013-2014 RAD Game Tools and Valve Software
- * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
- * Copyright 2016 Martin Raiber
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- **************************************************************************/
-
-
-#ifndef MINIZ_NO_ARCHIVE_APIS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------- .ZIP archive reading */
-
-#ifdef MINIZ_NO_STDIO
-#define MZ_FILE void *
-#else
-#include <sys/stat.h>
-
-#if defined(_MSC_VER) || defined(__MINGW64__) || defined(__MINGW32__)
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-static WCHAR* mz_utf8z_to_widechar(const char* str)
-{
-  int reqChars = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0);
-  WCHAR* wStr = (WCHAR*)malloc(reqChars * sizeof(WCHAR));
-  MultiByteToWideChar(CP_UTF8, 0, str, -1, wStr, reqChars);
-  return wStr;
-}
-
-static FILE *mz_fopen(const char *pFilename, const char *pMode)
-{
-  WCHAR* wFilename = mz_utf8z_to_widechar(pFilename);
-  WCHAR* wMode = mz_utf8z_to_widechar(pMode);
-  FILE* pFile = NULL;
-  errno_t err = _wfopen_s(&pFile, wFilename, wMode);
-  free(wFilename);
-  free(wMode);
-  return err ? NULL : pFile;
-}
-
-static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream)
-{
-  WCHAR* wPath = mz_utf8z_to_widechar(pPath);
-  WCHAR* wMode = mz_utf8z_to_widechar(pMode);
-  FILE* pFile = NULL;
-  errno_t err = _wfreopen_s(&pFile, wPath, wMode, pStream);
-  free(wPath);
-  free(wMode);
-  return err ? NULL : pFile;
-}
-
-#if defined(__MINGW32__)
-static int mz_stat(const char *path, struct _stat *buffer)
-{
-  WCHAR* wPath = mz_utf8z_to_widechar(path);
-  int res = _wstat(wPath, buffer);
-  free(wPath);
-  return res;
-}
-#else
-static int mz_stat64(const char *path, struct __stat64 *buffer)
-{
-  WCHAR* wPath = mz_utf8z_to_widechar(path);
-  int res = _wstat64(wPath, buffer);
-  free(wPath);
-  return res;
-}
-#endif
-
-#ifndef MINIZ_NO_TIME
-#include <sys/utime.h>
-#endif
-#define MZ_FOPEN mz_fopen
-#define MZ_FCLOSE fclose
-#define MZ_FREAD fread
-#define MZ_FWRITE fwrite
-#define MZ_FTELL64 _ftelli64
-#define MZ_FSEEK64 _fseeki64
-#if defined(__MINGW32__)
-#define MZ_FILE_STAT_STRUCT _stat
-#define MZ_FILE_STAT mz_stat
-#else
-#define MZ_FILE_STAT_STRUCT _stat64
-#define MZ_FILE_STAT mz_stat64 
-#endif
-#define MZ_FFLUSH fflush
-#define MZ_FREOPEN mz_freopen
-#define MZ_DELETE_FILE remove
-
-#elif defined(__WATCOMC__)
-#ifndef MINIZ_NO_TIME
-#include <sys/utime.h>
-#endif
-#define MZ_FOPEN(f, m) fopen(f, m)
-#define MZ_FCLOSE fclose
-#define MZ_FREAD fread
-#define MZ_FWRITE fwrite
-#define MZ_FTELL64 _ftelli64
-#define MZ_FSEEK64 _fseeki64
-#define MZ_FILE_STAT_STRUCT stat
-#define MZ_FILE_STAT stat
-#define MZ_FFLUSH fflush
-#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
-#define MZ_DELETE_FILE remove
-
-#elif defined(__TINYC__)
-#ifndef MINIZ_NO_TIME
-#include <sys/utime.h>
-#endif
-#define MZ_FOPEN(f, m) fopen(f, m)
-#define MZ_FCLOSE fclose
-#define MZ_FREAD fread
-#define MZ_FWRITE fwrite
-#define MZ_FTELL64 ftell
-#define MZ_FSEEK64 fseek
-#define MZ_FILE_STAT_STRUCT stat
-#define MZ_FILE_STAT stat
-#define MZ_FFLUSH fflush
-#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
-#define MZ_DELETE_FILE remove
-
-#elif defined(__USE_LARGEFILE64) /* gcc, clang */
-#ifndef MINIZ_NO_TIME
-#include <utime.h>
-#endif
-#define MZ_FOPEN(f, m) fopen64(f, m)
-#define MZ_FCLOSE fclose
-#define MZ_FREAD fread
-#define MZ_FWRITE fwrite
-#define MZ_FTELL64 ftello64
-#define MZ_FSEEK64 fseeko64
-#define MZ_FILE_STAT_STRUCT stat64
-#define MZ_FILE_STAT stat64
-#define MZ_FFLUSH fflush
-#define MZ_FREOPEN(p, m, s) freopen64(p, m, s)
-#define MZ_DELETE_FILE remove
-
-#elif defined(__APPLE__) || defined(__FreeBSD__)
-#ifndef MINIZ_NO_TIME
-#include <utime.h>
-#endif
-#define MZ_FOPEN(f, m) fopen(f, m)
-#define MZ_FCLOSE fclose
-#define MZ_FREAD fread
-#define MZ_FWRITE fwrite
-#define MZ_FTELL64 ftello
-#define MZ_FSEEK64 fseeko
-#define MZ_FILE_STAT_STRUCT stat
-#define MZ_FILE_STAT stat
-#define MZ_FFLUSH fflush
-#define MZ_FREOPEN(p, m, s) freopen(p, m, s)
-#define MZ_DELETE_FILE remove
-
-#else
-#pragma message("Using fopen, ftello, fseeko, stat() etc. path for file I/O - this path may not support large files.")
-#ifndef MINIZ_NO_TIME
-#include <utime.h>
-#endif
-#define MZ_FOPEN(f, m) fopen(f, m)
-#define MZ_FCLOSE fclose
-#define MZ_FREAD fread
-#define MZ_FWRITE fwrite
-#ifdef __STRICT_ANSI__
-#define MZ_FTELL64 ftell
-#define MZ_FSEEK64 fseek
-#else
-#define MZ_FTELL64 ftello
-#define MZ_FSEEK64 fseeko
-#endif
-#define MZ_FILE_STAT_STRUCT stat
-#define MZ_FILE_STAT stat
-#define MZ_FFLUSH fflush
-#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
-#define MZ_DELETE_FILE remove
-#endif /* #ifdef _MSC_VER */
-#endif /* #ifdef MINIZ_NO_STDIO */
-
-#define MZ_TOLOWER(c) ((((c) >= 'A') && ((c) <= 'Z')) ? ((c) - 'A' + 'a') : (c))
-
-/* Various ZIP archive enums. To completely avoid cross platform compiler alignment and platform endian issues, miniz.c doesn't use structs for any of this stuff. */
-enum
-{
-    /* ZIP archive identifiers and record sizes */
-    MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06054b50,
-    MZ_ZIP_CENTRAL_DIR_HEADER_SIG = 0x02014b50,
-    MZ_ZIP_LOCAL_DIR_HEADER_SIG = 0x04034b50,
-    MZ_ZIP_LOCAL_DIR_HEADER_SIZE = 30,
-    MZ_ZIP_CENTRAL_DIR_HEADER_SIZE = 46,
-    MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE = 22,
-
-    /* ZIP64 archive identifier and record sizes */
-    MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06064b50,
-    MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG = 0x07064b50,
-    MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE = 56,
-    MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE = 20,
-    MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID = 0x0001,
-    MZ_ZIP_DATA_DESCRIPTOR_ID = 0x08074b50,
-    MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24,
-    MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16,
-
-    /* Central directory header record offsets */
-    MZ_ZIP_CDH_SIG_OFS = 0,
-    MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4,
-    MZ_ZIP_CDH_VERSION_NEEDED_OFS = 6,
-    MZ_ZIP_CDH_BIT_FLAG_OFS = 8,
-    MZ_ZIP_CDH_METHOD_OFS = 10,
-    MZ_ZIP_CDH_FILE_TIME_OFS = 12,
-    MZ_ZIP_CDH_FILE_DATE_OFS = 14,
-    MZ_ZIP_CDH_CRC32_OFS = 16,
-    MZ_ZIP_CDH_COMPRESSED_SIZE_OFS = 20,
-    MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS = 24,
-    MZ_ZIP_CDH_FILENAME_LEN_OFS = 28,
-    MZ_ZIP_CDH_EXTRA_LEN_OFS = 30,
-    MZ_ZIP_CDH_COMMENT_LEN_OFS = 32,
-    MZ_ZIP_CDH_DISK_START_OFS = 34,
-    MZ_ZIP_CDH_INTERNAL_ATTR_OFS = 36,
-    MZ_ZIP_CDH_EXTERNAL_ATTR_OFS = 38,
-    MZ_ZIP_CDH_LOCAL_HEADER_OFS = 42,
-
-    /* Local directory header offsets */
-    MZ_ZIP_LDH_SIG_OFS = 0,
-    MZ_ZIP_LDH_VERSION_NEEDED_OFS = 4,
-    MZ_ZIP_LDH_BIT_FLAG_OFS = 6,
-    MZ_ZIP_LDH_METHOD_OFS = 8,
-    MZ_ZIP_LDH_FILE_TIME_OFS = 10,
-    MZ_ZIP_LDH_FILE_DATE_OFS = 12,
-    MZ_ZIP_LDH_CRC32_OFS = 14,
-    MZ_ZIP_LDH_COMPRESSED_SIZE_OFS = 18,
-    MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS = 22,
-    MZ_ZIP_LDH_FILENAME_LEN_OFS = 26,
-    MZ_ZIP_LDH_EXTRA_LEN_OFS = 28,
-    MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR = 1 << 3,
-
-    /* End of central directory offsets */
-    MZ_ZIP_ECDH_SIG_OFS = 0,
-    MZ_ZIP_ECDH_NUM_THIS_DISK_OFS = 4,
-    MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS = 6,
-    MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 8,
-    MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS = 10,
-    MZ_ZIP_ECDH_CDIR_SIZE_OFS = 12,
-    MZ_ZIP_ECDH_CDIR_OFS_OFS = 16,
-    MZ_ZIP_ECDH_COMMENT_SIZE_OFS = 20,
-
-    /* ZIP64 End of central directory locator offsets */
-    MZ_ZIP64_ECDL_SIG_OFS = 0,                    /* 4 bytes */
-    MZ_ZIP64_ECDL_NUM_DISK_CDIR_OFS = 4,          /* 4 bytes */
-    MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS = 8,  /* 8 bytes */
-    MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS = 16, /* 4 bytes */
-
-    /* ZIP64 End of central directory header offsets */
-    MZ_ZIP64_ECDH_SIG_OFS = 0,                       /* 4 bytes */
-    MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS = 4,            /* 8 bytes */
-    MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS = 12,          /* 2 bytes */
-    MZ_ZIP64_ECDH_VERSION_NEEDED_OFS = 14,           /* 2 bytes */
-    MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS = 16,            /* 4 bytes */
-    MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS = 20,            /* 4 bytes */
-    MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 24, /* 8 bytes */
-    MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS = 32,       /* 8 bytes */
-    MZ_ZIP64_ECDH_CDIR_SIZE_OFS = 40,                /* 8 bytes */
-    MZ_ZIP64_ECDH_CDIR_OFS_OFS = 48,                 /* 8 bytes */
-    MZ_ZIP_VERSION_MADE_BY_DOS_FILESYSTEM_ID = 0,
-    MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG = 0x10,
-    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED = 1,
-    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG = 32,
-    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION = 64,
-    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED = 8192,
-    MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 = 1 << 11
-};
-
-typedef struct
-{
-    void *m_p;
-    size_t m_size, m_capacity;
-    mz_uint m_element_size;
-} mz_zip_array;
-
-struct mz_zip_internal_state_tag
-{
-    mz_zip_array m_central_dir;
-    mz_zip_array m_central_dir_offsets;
-    mz_zip_array m_sorted_central_dir_offsets;
-
-    /* The flags passed in when the archive is initially opened. */
-    mz_uint32 m_init_flags;
-
-    /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc. */
-    mz_bool m_zip64;
-
-    /* MZ_TRUE if we found zip64 extended info in the central directory (m_zip64 will also be slammed to true too, even if we didn't find a zip64 end of central dir header, etc.) */
-    mz_bool m_zip64_has_extended_info_fields;
-
-    /* These fields are used by the file, FILE, memory, and memory/heap read/write helpers. */
-    MZ_FILE *m_pFile;
-    mz_uint64 m_file_archive_start_ofs;
-
-    void *m_pMem;
-    size_t m_mem_size;
-    size_t m_mem_capacity;
-};
-
-#define MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(array_ptr, element_size) (array_ptr)->m_element_size = element_size
-
-#if defined(DEBUG) || defined(_DEBUG)
-static MZ_FORCEINLINE mz_uint mz_zip_array_range_check(const mz_zip_array *pArray, mz_uint index)
-{
-    MZ_ASSERT(index < pArray->m_size);
-    return index;
-}
-#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) ((element_type *)((array_ptr)->m_p))[mz_zip_array_range_check(array_ptr, index)]
-#else
-#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) ((element_type *)((array_ptr)->m_p))[index]
-#endif
-
-static MZ_FORCEINLINE void mz_zip_array_init(mz_zip_array *pArray, mz_uint32 element_size)
-{
-    memset(pArray, 0, sizeof(mz_zip_array));
-    pArray->m_element_size = element_size;
-}
-
-static MZ_FORCEINLINE void mz_zip_array_clear(mz_zip_archive *pZip, mz_zip_array *pArray)
-{
-    pZip->m_pFree(pZip->m_pAlloc_opaque, pArray->m_p);
-    memset(pArray, 0, sizeof(mz_zip_array));
-}
-
-static mz_bool mz_zip_array_ensure_capacity(mz_zip_archive *pZip, mz_zip_array *pArray, size_t min_new_capacity, mz_uint growing)
-{
-    void *pNew_p;
-    size_t new_capacity = min_new_capacity;
-    MZ_ASSERT(pArray->m_element_size);
-    if (pArray->m_capacity >= min_new_capacity)
-        return MZ_TRUE;
-    if (growing)
-    {
-        new_capacity = MZ_MAX(1, pArray->m_capacity);
-        while (new_capacity < min_new_capacity)
-            new_capacity *= 2;
-    }
-    if (NULL == (pNew_p = pZip->m_pRealloc(pZip->m_pAlloc_opaque, pArray->m_p, pArray->m_element_size, new_capacity)))
-        return MZ_FALSE;
-    pArray->m_p = pNew_p;
-    pArray->m_capacity = new_capacity;
-    return MZ_TRUE;
-}
-
-static MZ_FORCEINLINE mz_bool mz_zip_array_reserve(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_capacity, mz_uint growing)
-{
-    if (new_capacity > pArray->m_capacity)
-    {
-        if (!mz_zip_array_ensure_capacity(pZip, pArray, new_capacity, growing))
-            return MZ_FALSE;
-    }
-    return MZ_TRUE;
-}
-
-static MZ_FORCEINLINE mz_bool mz_zip_array_resize(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_size, mz_uint growing)
-{
-    if (new_size > pArray->m_capacity)
-    {
-        if (!mz_zip_array_ensure_capacity(pZip, pArray, new_size, growing))
-            return MZ_FALSE;
-    }
-    pArray->m_size = new_size;
-    return MZ_TRUE;
-}
-
-static MZ_FORCEINLINE mz_bool mz_zip_array_ensure_room(mz_zip_archive *pZip, mz_zip_array *pArray, size_t n)
-{
-    return mz_zip_array_reserve(pZip, pArray, pArray->m_size + n, MZ_TRUE);
-}
-
-static MZ_FORCEINLINE mz_bool mz_zip_array_push_back(mz_zip_archive *pZip, mz_zip_array *pArray, const void *pElements, size_t n)
-{
-    size_t orig_size = pArray->m_size;
-    if (!mz_zip_array_resize(pZip, pArray, orig_size + n, MZ_TRUE))
-        return MZ_FALSE;
-    if (n > 0)
-        memcpy((mz_uint8 *)pArray->m_p + orig_size * pArray->m_element_size, pElements, n * pArray->m_element_size);
-    return MZ_TRUE;
-}
-
-#ifndef MINIZ_NO_TIME
-static MZ_TIME_T mz_zip_dos_to_time_t(int dos_time, int dos_date)
-{
-    struct tm tm;
-    memset(&tm, 0, sizeof(tm));
-    tm.tm_isdst = -1;
-    tm.tm_year = ((dos_date >> 9) & 127) + 1980 - 1900;
-    tm.tm_mon = ((dos_date >> 5) & 15) - 1;
-    tm.tm_mday = dos_date & 31;
-    tm.tm_hour = (dos_time >> 11) & 31;
-    tm.tm_min = (dos_time >> 5) & 63;
-    tm.tm_sec = (dos_time << 1) & 62;
-    return mktime(&tm);
-}
-
-#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-static void mz_zip_time_t_to_dos_time(MZ_TIME_T time, mz_uint16 *pDOS_time, mz_uint16 *pDOS_date)
-{
-#ifdef _MSC_VER
-    struct tm tm_struct;
-    struct tm *tm = &tm_struct;
-    errno_t err = localtime_s(tm, &time);
-    if (err)
-    {
-        *pDOS_date = 0;
-        *pDOS_time = 0;
-        return;
-    }
-#else
-    struct tm *tm = localtime(&time);
-#endif /* #ifdef _MSC_VER */
-
-    *pDOS_time = (mz_uint16)(((tm->tm_hour) << 11) + ((tm->tm_min) << 5) + ((tm->tm_sec) >> 1));
-    *pDOS_date = (mz_uint16)(((tm->tm_year + 1900 - 1980) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday);
-}
-#endif /* MINIZ_NO_ARCHIVE_WRITING_APIS */
-
-#ifndef MINIZ_NO_STDIO
-#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-static mz_bool mz_zip_get_file_modified_time(const char *pFilename, MZ_TIME_T *pTime)
-{
-    struct MZ_FILE_STAT_STRUCT file_stat;
-
-    /* On Linux with x86 glibc, this call will fail on large files (I think >= 0x80000000 bytes) unless you compiled with _LARGEFILE64_SOURCE. Argh. */
-    if (MZ_FILE_STAT(pFilename, &file_stat) != 0)
-        return MZ_FALSE;
-
-    *pTime = file_stat.st_mtime;
-
-    return MZ_TRUE;
-}
-#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS*/
-
-static mz_bool mz_zip_set_file_times(const char *pFilename, MZ_TIME_T access_time, MZ_TIME_T modified_time)
-{
-    struct utimbuf t;
-
-    memset(&t, 0, sizeof(t));
-    t.actime = access_time;
-    t.modtime = modified_time;
-
-    return !utime(pFilename, &t);
-}
-#endif /* #ifndef MINIZ_NO_STDIO */
-#endif /* #ifndef MINIZ_NO_TIME */
-
-static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip, mz_zip_error err_num)
-{
-    if (pZip)
-        pZip->m_last_error = err_num;
-    return MZ_FALSE;
-}
-
-static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, mz_uint flags)
-{
-    (void)flags;
-    if ((!pZip) || (pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (!pZip->m_pAlloc)
-        pZip->m_pAlloc = miniz_def_alloc_func;
-    if (!pZip->m_pFree)
-        pZip->m_pFree = miniz_def_free_func;
-    if (!pZip->m_pRealloc)
-        pZip->m_pRealloc = miniz_def_realloc_func;
-
-    pZip->m_archive_size = 0;
-    pZip->m_central_directory_file_ofs = 0;
-    pZip->m_total_files = 0;
-    pZip->m_last_error = MZ_ZIP_NO_ERROR;
-
-    if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
-        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-    memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
-    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8));
-    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32));
-    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32));
-    pZip->m_pState->m_init_flags = flags;
-    pZip->m_pState->m_zip64 = MZ_FALSE;
-    pZip->m_pState->m_zip64_has_extended_info_fields = MZ_FALSE;
-
-    pZip->m_zip_mode = MZ_ZIP_MODE_READING;
-
-    return MZ_TRUE;
-}
-
-static MZ_FORCEINLINE mz_bool mz_zip_reader_filename_less(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, mz_uint r_index)
-{
-    const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
-    const mz_uint8 *pR = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, r_index));
-    mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS), r_len = MZ_READ_LE16(pR + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-    mz_uint8 l = 0, r = 0;
-    pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
-    pR += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
-    pE = pL + MZ_MIN(l_len, r_len);
-    while (pL < pE)
-    {
-        if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR)))
-            break;
-        pL++;
-        pR++;
-    }
-    return (pL == pE) ? (l_len < r_len) : (l < r);
-}
-
-#define MZ_SWAP_UINT32(a, b) \
-    do                       \
-    {                        \
-        mz_uint32 t = a;     \
-        a = b;               \
-        b = t;               \
-    }                        \
-    MZ_MACRO_END
-
-/* Heap sort of lowercased filenames, used to help accelerate plain central directory searches by mz_zip_reader_locate_file(). (Could also use qsort(), but it could allocate memory.) */
-static void mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip)
-{
-    mz_zip_internal_state *pState = pZip->m_pState;
-    const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
-    const mz_zip_array *pCentral_dir = &pState->m_central_dir;
-    mz_uint32 *pIndices;
-    mz_uint32 start, end;
-    const mz_uint32 size = pZip->m_total_files;
-
-    if (size <= 1U)
-        return;
-
-    pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0);
-
-    start = (size - 2U) >> 1U;
-    for (;;)
-    {
-        mz_uint64 child, root = start;
-        for (;;)
-        {
-            if ((child = (root << 1U) + 1U) >= size)
-                break;
-            child += (((child + 1U) < size) && (mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1U])));
-            if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
-                break;
-            MZ_SWAP_UINT32(pIndices[root], pIndices[child]);
-            root = child;
-        }
-        if (!start)
-            break;
-        start--;
-    }
-
-    end = size - 1;
-    while (end > 0)
-    {
-        mz_uint64 child, root = 0;
-        MZ_SWAP_UINT32(pIndices[end], pIndices[0]);
-        for (;;)
-        {
-            if ((child = (root << 1U) + 1U) >= end)
-                break;
-            child += (((child + 1U) < end) && mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1U]));
-            if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
-                break;
-            MZ_SWAP_UINT32(pIndices[root], pIndices[child]);
-            root = child;
-        }
-        end--;
-    }
-}
-
-static mz_bool mz_zip_reader_locate_header_sig(mz_zip_archive *pZip, mz_uint32 record_sig, mz_uint32 record_size, mz_int64 *pOfs)
-{
-    mz_int64 cur_file_ofs;
-    mz_uint32 buf_u32[4096 / sizeof(mz_uint32)];
-    mz_uint8 *pBuf = (mz_uint8 *)buf_u32;
-
-    /* Basic sanity checks - reject files which are too small */
-    if (pZip->m_archive_size < record_size)
-        return MZ_FALSE;
-
-    /* Find the record by scanning the file from the end towards the beginning. */
-    cur_file_ofs = MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0);
-    for (;;)
-    {
-        int i, n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs);
-
-        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n)
-            return MZ_FALSE;
-
-        for (i = n - 4; i >= 0; --i)
-        {
-            mz_uint s = MZ_READ_LE32(pBuf + i);
-            if (s == record_sig)
-            {
-                if ((pZip->m_archive_size - (cur_file_ofs + i)) >= record_size)
-                    break;
-            }
-        }
-
-        if (i >= 0)
-        {
-            cur_file_ofs += i;
-            break;
-        }
-
-        /* Give up if we've searched the entire file, or we've gone back "too far" (~64kb) */
-        if ((!cur_file_ofs) || ((pZip->m_archive_size - cur_file_ofs) >= ((mz_uint64)(MZ_UINT16_MAX) + record_size)))
-            return MZ_FALSE;
-
-        cur_file_ofs = MZ_MAX(cur_file_ofs - (sizeof(buf_u32) - 3), 0);
-    }
-
-    *pOfs = cur_file_ofs;
-    return MZ_TRUE;
-}
-
-static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, mz_uint flags)
-{
-    mz_uint cdir_size = 0, cdir_entries_on_this_disk = 0, num_this_disk = 0, cdir_disk_index = 0;
-    mz_uint64 cdir_ofs = 0;
-    mz_int64 cur_file_ofs = 0;
-    const mz_uint8 *p;
-
-    mz_uint32 buf_u32[4096 / sizeof(mz_uint32)];
-    mz_uint8 *pBuf = (mz_uint8 *)buf_u32;
-    mz_bool sort_central_dir = ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0);
-    mz_uint32 zip64_end_of_central_dir_locator_u32[(MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
-    mz_uint8 *pZip64_locator = (mz_uint8 *)zip64_end_of_central_dir_locator_u32;
-
-    mz_uint32 zip64_end_of_central_dir_header_u32[(MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
-    mz_uint8 *pZip64_end_of_central_dir = (mz_uint8 *)zip64_end_of_central_dir_header_u32;
-
-    mz_uint64 zip64_end_of_central_dir_ofs = 0;
-
-    /* Basic sanity checks - reject files which are too small, and check the first 4 bytes of the file to make sure a local header is there. */
-    if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
-
-    if (!mz_zip_reader_locate_header_sig(pZip, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE, &cur_file_ofs))
-        return mz_zip_set_error(pZip, MZ_ZIP_FAILED_FINDING_CENTRAL_DIR);
-
-    /* Read and verify the end of central directory record. */
-    if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-
-    if (MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG)
-        return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
-
-    if (cur_file_ofs >= (MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE))
-    {
-        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs - MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE, pZip64_locator, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) == MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE)
-        {
-            if (MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_SIG_OFS) == MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG)
-            {
-                zip64_end_of_central_dir_ofs = MZ_READ_LE64(pZip64_locator + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS);
-                if (zip64_end_of_central_dir_ofs > (pZip->m_archive_size - MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE))
-                    return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
-
-                if (pZip->m_pRead(pZip->m_pIO_opaque, zip64_end_of_central_dir_ofs, pZip64_end_of_central_dir, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) == MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)
-                {
-                    if (MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIG_OFS) == MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG)
-                    {
-                        pZip->m_pState->m_zip64 = MZ_TRUE;
-                    }
-                }
-            }
-        }
-    }
-
-    pZip->m_total_files = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS);
-    cdir_entries_on_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS);
-    num_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS);
-    cdir_disk_index = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS);
-    cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS);
-    cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS);
-
-    if (pZip->m_pState->m_zip64)
-    {
-        mz_uint32 zip64_total_num_of_disks = MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS);
-        mz_uint64 zip64_cdir_total_entries = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS);
-        mz_uint64 zip64_cdir_total_entries_on_this_disk = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS);
-        mz_uint64 zip64_size_of_end_of_central_dir_record = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS);
-        mz_uint64 zip64_size_of_central_directory = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_SIZE_OFS);
-
-        if (zip64_size_of_end_of_central_dir_record < (MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - 12))
-            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-        if (zip64_total_num_of_disks != 1U)
-            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
-
-        /* Check for miniz's practical limits */
-        if (zip64_cdir_total_entries > MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-
-        pZip->m_total_files = (mz_uint32)zip64_cdir_total_entries;
-
-        if (zip64_cdir_total_entries_on_this_disk > MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-
-        cdir_entries_on_this_disk = (mz_uint32)zip64_cdir_total_entries_on_this_disk;
-
-        /* Check for miniz's current practical limits (sorry, this should be enough for millions of files) */
-        if (zip64_size_of_central_directory > MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
-
-        cdir_size = (mz_uint32)zip64_size_of_central_directory;
-
-        num_this_disk = MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS);
-
-        cdir_disk_index = MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS);
-
-        cdir_ofs = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_OFS_OFS);
-    }
-
-    if (pZip->m_total_files != cdir_entries_on_this_disk)
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
-
-    if (((num_this_disk | cdir_disk_index) != 0) && ((num_this_disk != 1) || (cdir_disk_index != 1)))
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
-
-    if (cdir_size < (mz_uint64)pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    pZip->m_central_directory_file_ofs = cdir_ofs;
-
-    if (pZip->m_total_files)
-    {
-        mz_uint i, n;
-        /* Read the entire central directory into a heap block, and allocate another heap block to hold the unsorted central dir file record offsets, and possibly another to hold the sorted indices. */
-        if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, MZ_FALSE)) ||
-            (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, pZip->m_total_files, MZ_FALSE)))
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-        if (sort_central_dir)
-        {
-            if (!mz_zip_array_resize(pZip, &pZip->m_pState->m_sorted_central_dir_offsets, pZip->m_total_files, MZ_FALSE))
-                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        }
-
-        if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs, pZip->m_pState->m_central_dir.m_p, cdir_size) != cdir_size)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-
-        /* Now create an index into the central directory file records, do some basic sanity checking on each record */
-        p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p;
-        for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i)
-        {
-            mz_uint total_header_size, disk_index, bit_flags, filename_size, ext_data_size;
-            mz_uint64 comp_size, decomp_size, local_header_ofs;
-
-            if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG))
-                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-            MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, i) = (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p);
-
-            if (sort_central_dir)
-                MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, mz_uint32, i) = i;
-
-            comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
-            decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
-            local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS);
-            filename_size = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-            ext_data_size = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS);
-
-            if ((!pZip->m_pState->m_zip64_has_extended_info_fields) &&
-                (ext_data_size) &&
-                (MZ_MAX(MZ_MAX(comp_size, decomp_size), local_header_ofs) == MZ_UINT32_MAX))
-            {
-                /* Attempt to find zip64 extended information field in the entry's extra data */
-                mz_uint32 extra_size_remaining = ext_data_size;
-
-                if (extra_size_remaining)
-                {
-					const mz_uint8 *pExtra_data;
-					void* buf = NULL;
-
-					if (MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + ext_data_size > n)
-					{
-						buf = MZ_MALLOC(ext_data_size);
-						if(buf==NULL)
-							return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-						if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size, buf, ext_data_size) != ext_data_size)
-						{
-							MZ_FREE(buf);
-							return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-						}
-
-						pExtra_data = (mz_uint8*)buf;
-					}
-					else
-					{
-						pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size;
-					}
-
-                    do
-                    {
-                        mz_uint32 field_id;
-                        mz_uint32 field_data_size;
-
-						if (extra_size_remaining < (sizeof(mz_uint16) * 2))
-						{
-							MZ_FREE(buf);
-							return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-						}
-
-                        field_id = MZ_READ_LE16(pExtra_data);
-                        field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
-
-						if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining)
-						{
-							MZ_FREE(buf);
-							return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-						}
-
-                        if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
-                        {
-                            /* Ok, the archive didn't have any zip64 headers but it uses a zip64 extended information field so mark it as zip64 anyway (this can occur with infozip's zip util when it reads compresses files from stdin). */
-                            pZip->m_pState->m_zip64 = MZ_TRUE;
-                            pZip->m_pState->m_zip64_has_extended_info_fields = MZ_TRUE;
-                            break;
-                        }
-
-                        pExtra_data += sizeof(mz_uint16) * 2 + field_data_size;
-                        extra_size_remaining = extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size;
-                    } while (extra_size_remaining);
-
-					MZ_FREE(buf);
-                }
-            }
-
-            /* I've seen archives that aren't marked as zip64 that uses zip64 ext data, argh */
-            if ((comp_size != MZ_UINT32_MAX) && (decomp_size != MZ_UINT32_MAX))
-            {
-                if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && (decomp_size != comp_size)) || (decomp_size && !comp_size))
-                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-            }
-
-            disk_index = MZ_READ_LE16(p + MZ_ZIP_CDH_DISK_START_OFS);
-            if ((disk_index == MZ_UINT16_MAX) || ((disk_index != num_this_disk) && (disk_index != 1)))
-                return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
-
-            if (comp_size != MZ_UINT32_MAX)
-            {
-                if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size)
-                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-            }
-
-            bit_flags = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
-            if (bit_flags & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED)
-                return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
-
-            if ((total_header_size = MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS)) > n)
-                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-            n -= total_header_size;
-            p += total_header_size;
-        }
-    }
-
-    if (sort_central_dir)
-        mz_zip_reader_sort_central_dir_offsets_by_filename(pZip);
-
-    return MZ_TRUE;
-}
-
-void mz_zip_zero_struct(mz_zip_archive *pZip)
-{
-    if (pZip)
-        MZ_CLEAR_PTR(pZip);
-}
-
-static mz_bool mz_zip_reader_end_internal(mz_zip_archive *pZip, mz_bool set_last_error)
-{
-    mz_bool status = MZ_TRUE;
-
-    if (!pZip)
-        return MZ_FALSE;
-
-    if ((!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
-    {
-        if (set_last_error)
-            pZip->m_last_error = MZ_ZIP_INVALID_PARAMETER;
-
-        return MZ_FALSE;
-    }
-
-    if (pZip->m_pState)
-    {
-        mz_zip_internal_state *pState = pZip->m_pState;
-        pZip->m_pState = NULL;
-
-        mz_zip_array_clear(pZip, &pState->m_central_dir);
-        mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
-        mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
-
-#ifndef MINIZ_NO_STDIO
-        if (pState->m_pFile)
-        {
-            if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE)
-            {
-                if (MZ_FCLOSE(pState->m_pFile) == EOF)
-                {
-                    if (set_last_error)
-                        pZip->m_last_error = MZ_ZIP_FILE_CLOSE_FAILED;
-                    status = MZ_FALSE;
-                }
-            }
-            pState->m_pFile = NULL;
-        }
-#endif /* #ifndef MINIZ_NO_STDIO */
-
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-    }
-    pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
-
-    return status;
-}
-
-mz_bool mz_zip_reader_end(mz_zip_archive *pZip)
-{
-    return mz_zip_reader_end_internal(pZip, MZ_TRUE);
-}
-mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint flags)
-{
-    if ((!pZip) || (!pZip->m_pRead))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (!mz_zip_reader_init_internal(pZip, flags))
-        return MZ_FALSE;
-
-    pZip->m_zip_type = MZ_ZIP_TYPE_USER;
-    pZip->m_archive_size = size;
-
-    if (!mz_zip_reader_read_central_dir(pZip, flags))
-    {
-        mz_zip_reader_end_internal(pZip, MZ_FALSE);
-        return MZ_FALSE;
-    }
-
-    return MZ_TRUE;
-}
-
-static size_t mz_zip_mem_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
-{
-    mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
-    size_t s = (file_ofs >= pZip->m_archive_size) ? 0 : (size_t)MZ_MIN(pZip->m_archive_size - file_ofs, n);
-    memcpy(pBuf, (const mz_uint8 *)pZip->m_pState->m_pMem + file_ofs, s);
-    return s;
-}
-
-mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint flags)
-{
-    if (!pMem)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
-
-    if (!mz_zip_reader_init_internal(pZip, flags))
-        return MZ_FALSE;
-
-    pZip->m_zip_type = MZ_ZIP_TYPE_MEMORY;
-    pZip->m_archive_size = size;
-    pZip->m_pRead = mz_zip_mem_read_func;
-    pZip->m_pIO_opaque = pZip;
-    pZip->m_pNeeds_keepalive = NULL;
-
-#ifdef __cplusplus
-    pZip->m_pState->m_pMem = const_cast<void *>(pMem);
-#else
-    pZip->m_pState->m_pMem = (void *)pMem;
-#endif
-
-    pZip->m_pState->m_mem_size = size;
-
-    if (!mz_zip_reader_read_central_dir(pZip, flags))
-    {
-        mz_zip_reader_end_internal(pZip, MZ_FALSE);
-        return MZ_FALSE;
-    }
-
-    return MZ_TRUE;
-}
-
-#ifndef MINIZ_NO_STDIO
-static size_t mz_zip_file_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
-{
-    mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
-    mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
-
-    file_ofs += pZip->m_pState->m_file_archive_start_ofs;
-
-    if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
-        return 0;
-
-    return MZ_FREAD(pBuf, 1, n, pZip->m_pState->m_pFile);
-}
-
-mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags)
-{
-    return mz_zip_reader_init_file_v2(pZip, pFilename, flags, 0, 0);
-}
-
-mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags, mz_uint64 file_start_ofs, mz_uint64 archive_size)
-{
-    mz_uint64 file_size;
-    MZ_FILE *pFile;
-
-    if ((!pZip) || (!pFilename) || ((archive_size) && (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    pFile = MZ_FOPEN(pFilename, "rb");
-    if (!pFile)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
-
-    file_size = archive_size;
-    if (!file_size)
-    {
-        if (MZ_FSEEK64(pFile, 0, SEEK_END))
-        {
-            MZ_FCLOSE(pFile);
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
-        }
-
-        file_size = MZ_FTELL64(pFile);
-    }
-
-    /* TODO: Better sanity check archive_size and the # of actual remaining bytes */
-
-    if (file_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
-    {
-	MZ_FCLOSE(pFile);
-        return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
-    }
-
-    if (!mz_zip_reader_init_internal(pZip, flags))
-    {
-        MZ_FCLOSE(pFile);
-        return MZ_FALSE;
-    }
-
-    pZip->m_zip_type = MZ_ZIP_TYPE_FILE;
-    pZip->m_pRead = mz_zip_file_read_func;
-    pZip->m_pIO_opaque = pZip;
-    pZip->m_pState->m_pFile = pFile;
-    pZip->m_archive_size = file_size;
-    pZip->m_pState->m_file_archive_start_ofs = file_start_ofs;
-
-    if (!mz_zip_reader_read_central_dir(pZip, flags))
-    {
-        mz_zip_reader_end_internal(pZip, MZ_FALSE);
-        return MZ_FALSE;
-    }
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint64 archive_size, mz_uint flags)
-{
-    mz_uint64 cur_file_ofs;
-
-    if ((!pZip) || (!pFile))
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
-
-    cur_file_ofs = MZ_FTELL64(pFile);
-
-    if (!archive_size)
-    {
-        if (MZ_FSEEK64(pFile, 0, SEEK_END))
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
-
-        archive_size = MZ_FTELL64(pFile) - cur_file_ofs;
-
-        if (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
-            return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
-    }
-
-    if (!mz_zip_reader_init_internal(pZip, flags))
-        return MZ_FALSE;
-
-    pZip->m_zip_type = MZ_ZIP_TYPE_CFILE;
-    pZip->m_pRead = mz_zip_file_read_func;
-
-    pZip->m_pIO_opaque = pZip;
-    pZip->m_pState->m_pFile = pFile;
-    pZip->m_archive_size = archive_size;
-    pZip->m_pState->m_file_archive_start_ofs = cur_file_ofs;
-
-    if (!mz_zip_reader_read_central_dir(pZip, flags))
-    {
-        mz_zip_reader_end_internal(pZip, MZ_FALSE);
-        return MZ_FALSE;
-    }
-
-    return MZ_TRUE;
-}
-
-#endif /* #ifndef MINIZ_NO_STDIO */
-
-static MZ_FORCEINLINE const mz_uint8 *mz_zip_get_cdh(mz_zip_archive *pZip, mz_uint file_index)
-{
-    if ((!pZip) || (!pZip->m_pState) || (file_index >= pZip->m_total_files))
-        return NULL;
-    return &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index));
-}
-
-mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index)
-{
-    mz_uint m_bit_flag;
-    const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
-    if (!p)
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-        return MZ_FALSE;
-    }
-
-    m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
-    return (m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION)) != 0;
-}
-
-mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, mz_uint file_index)
-{
-    mz_uint bit_flag;
-    mz_uint method;
-
-    const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
-    if (!p)
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-        return MZ_FALSE;
-    }
-
-    method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS);
-    bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
-
-    if ((method != 0) && (method != MZ_DEFLATED))
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
-        return MZ_FALSE;
-    }
-
-    if (bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION))
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
-        return MZ_FALSE;
-    }
-
-    if (bit_flag & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
-        return MZ_FALSE;
-    }
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index)
-{
-    mz_uint filename_len, attribute_mapping_id, external_attr;
-    const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
-    if (!p)
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-        return MZ_FALSE;
-    }
-
-    filename_len = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-    if (filename_len)
-    {
-        if (*(p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_len - 1) == '/')
-            return MZ_TRUE;
-    }
-
-    /* Bugfix: This code was also checking if the internal attribute was non-zero, which wasn't correct. */
-    /* Most/all zip writers (hopefully) set DOS file/directory attributes in the low 16-bits, so check for the DOS directory flag and ignore the source OS ID in the created by field. */
-    /* FIXME: Remove this check? Is it necessary - we already check the filename. */
-    attribute_mapping_id = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS) >> 8;
-    (void)attribute_mapping_id;
-
-    external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS);
-    if ((external_attr & MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG) != 0)
-    {
-        return MZ_TRUE;
-    }
-
-    return MZ_FALSE;
-}
-
-static mz_bool mz_zip_file_stat_internal(mz_zip_archive *pZip, mz_uint file_index, const mz_uint8 *pCentral_dir_header, mz_zip_archive_file_stat *pStat, mz_bool *pFound_zip64_extra_data)
-{
-    mz_uint n;
-    const mz_uint8 *p = pCentral_dir_header;
-
-    if (pFound_zip64_extra_data)
-        *pFound_zip64_extra_data = MZ_FALSE;
-
-    if ((!p) || (!pStat))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    /* Extract fields from the central directory record. */
-    pStat->m_file_index = file_index;
-    pStat->m_central_dir_ofs = MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index);
-    pStat->m_version_made_by = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS);
-    pStat->m_version_needed = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_NEEDED_OFS);
-    pStat->m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
-    pStat->m_method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS);
-#ifndef MINIZ_NO_TIME
-    pStat->m_time = mz_zip_dos_to_time_t(MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_TIME_OFS), MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_DATE_OFS));
-#endif
-    pStat->m_crc32 = MZ_READ_LE32(p + MZ_ZIP_CDH_CRC32_OFS);
-    pStat->m_comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
-    pStat->m_uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
-    pStat->m_internal_attr = MZ_READ_LE16(p + MZ_ZIP_CDH_INTERNAL_ATTR_OFS);
-    pStat->m_external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS);
-    pStat->m_local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS);
-
-    /* Copy as much of the filename and comment as possible. */
-    n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-    n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE - 1);
-    memcpy(pStat->m_filename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n);
-    pStat->m_filename[n] = '\0';
-
-    n = MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS);
-    n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE - 1);
-    pStat->m_comment_size = n;
-    memcpy(pStat->m_comment, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS), n);
-    pStat->m_comment[n] = '\0';
-
-    /* Set some flags for convienance */
-    pStat->m_is_directory = mz_zip_reader_is_file_a_directory(pZip, file_index);
-    pStat->m_is_encrypted = mz_zip_reader_is_file_encrypted(pZip, file_index);
-    pStat->m_is_supported = mz_zip_reader_is_file_supported(pZip, file_index);
-
-    /* See if we need to read any zip64 extended information fields. */
-    /* Confusingly, these zip64 fields can be present even on non-zip64 archives (Debian zip on a huge files from stdin piped to stdout creates them). */
-    if (MZ_MAX(MZ_MAX(pStat->m_comp_size, pStat->m_uncomp_size), pStat->m_local_header_ofs) == MZ_UINT32_MAX)
-    {
-        /* Attempt to find zip64 extended information field in the entry's extra data */
-        mz_uint32 extra_size_remaining = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS);
-
-        if (extra_size_remaining)
-        {
-            const mz_uint8 *pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-
-            do
-            {
-                mz_uint32 field_id;
-                mz_uint32 field_data_size;
-
-                if (extra_size_remaining < (sizeof(mz_uint16) * 2))
-                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-                field_id = MZ_READ_LE16(pExtra_data);
-                field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
-
-                if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining)
-                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-                if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
-                {
-                    const mz_uint8 *pField_data = pExtra_data + sizeof(mz_uint16) * 2;
-                    mz_uint32 field_data_remaining = field_data_size;
-
-                    if (pFound_zip64_extra_data)
-                        *pFound_zip64_extra_data = MZ_TRUE;
-
-                    if (pStat->m_uncomp_size == MZ_UINT32_MAX)
-                    {
-                        if (field_data_remaining < sizeof(mz_uint64))
-                            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-                        pStat->m_uncomp_size = MZ_READ_LE64(pField_data);
-                        pField_data += sizeof(mz_uint64);
-                        field_data_remaining -= sizeof(mz_uint64);
-                    }
-
-                    if (pStat->m_comp_size == MZ_UINT32_MAX)
-                    {
-                        if (field_data_remaining < sizeof(mz_uint64))
-                            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-                        pStat->m_comp_size = MZ_READ_LE64(pField_data);
-                        pField_data += sizeof(mz_uint64);
-                        field_data_remaining -= sizeof(mz_uint64);
-                    }
-
-                    if (pStat->m_local_header_ofs == MZ_UINT32_MAX)
-                    {
-                        if (field_data_remaining < sizeof(mz_uint64))
-                            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-                        pStat->m_local_header_ofs = MZ_READ_LE64(pField_data);
-                        pField_data += sizeof(mz_uint64);
-                        field_data_remaining -= sizeof(mz_uint64);
-                    }
-
-                    break;
-                }
-
-                pExtra_data += sizeof(mz_uint16) * 2 + field_data_size;
-                extra_size_remaining = extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size;
-            } while (extra_size_remaining);
-        }
-    }
-
-    return MZ_TRUE;
-}
-
-static MZ_FORCEINLINE mz_bool mz_zip_string_equal(const char *pA, const char *pB, mz_uint len, mz_uint flags)
-{
-    mz_uint i;
-    if (flags & MZ_ZIP_FLAG_CASE_SENSITIVE)
-        return 0 == memcmp(pA, pB, len);
-    for (i = 0; i < len; ++i)
-        if (MZ_TOLOWER(pA[i]) != MZ_TOLOWER(pB[i]))
-            return MZ_FALSE;
-    return MZ_TRUE;
-}
-
-static MZ_FORCEINLINE int mz_zip_filename_compare(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, const char *pR, mz_uint r_len)
-{
-    const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
-    mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-    mz_uint8 l = 0, r = 0;
-    pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
-    pE = pL + MZ_MIN(l_len, r_len);
-    while (pL < pE)
-    {
-        if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR)))
-            break;
-        pL++;
-        pR++;
-    }
-    return (pL == pE) ? (int)(l_len - r_len) : (l - r);
-}
-
-static mz_bool mz_zip_locate_file_binary_search(mz_zip_archive *pZip, const char *pFilename, mz_uint32 *pIndex)
-{
-    mz_zip_internal_state *pState = pZip->m_pState;
-    const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
-    const mz_zip_array *pCentral_dir = &pState->m_central_dir;
-    mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0);
-    const mz_uint32 size = pZip->m_total_files;
-    const mz_uint filename_len = (mz_uint)strlen(pFilename);
-
-    if (pIndex)
-        *pIndex = 0;
-
-    if (size)
-    {
-        /* yes I could use uint32_t's, but then we would have to add some special case checks in the loop, argh, and */
-        /* honestly the major expense here on 32-bit CPU's will still be the filename compare */
-        mz_int64 l = 0, h = (mz_int64)size - 1;
-
-        while (l <= h)
-        {
-            mz_int64 m = l + ((h - l) >> 1);
-            mz_uint32 file_index = pIndices[(mz_uint32)m];
-
-            int comp = mz_zip_filename_compare(pCentral_dir, pCentral_dir_offsets, file_index, pFilename, filename_len);
-            if (!comp)
-            {
-                if (pIndex)
-                    *pIndex = file_index;
-                return MZ_TRUE;
-            }
-            else if (comp < 0)
-                l = m + 1;
-            else
-                h = m - 1;
-        }
-    }
-
-    return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND);
-}
-
-int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags)
-{
-    mz_uint32 index;
-    if (!mz_zip_reader_locate_file_v2(pZip, pName, pComment, flags, &index))
-        return -1;
-    else
-        return (int)index;
-}
-
-mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags, mz_uint32 *pIndex)
-{
-    mz_uint file_index;
-    size_t name_len, comment_len;
-
-    if (pIndex)
-        *pIndex = 0;
-
-    if ((!pZip) || (!pZip->m_pState) || (!pName))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    /* See if we can use a binary search */
-    if (((pZip->m_pState->m_init_flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0) &&
-        (pZip->m_zip_mode == MZ_ZIP_MODE_READING) &&
-        ((flags & (MZ_ZIP_FLAG_IGNORE_PATH | MZ_ZIP_FLAG_CASE_SENSITIVE)) == 0) && (!pComment) && (pZip->m_pState->m_sorted_central_dir_offsets.m_size))
-    {
-        return mz_zip_locate_file_binary_search(pZip, pName, pIndex);
-    }
-
-    /* Locate the entry by scanning the entire central directory */
-    name_len = strlen(pName);
-    if (name_len > MZ_UINT16_MAX)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    comment_len = pComment ? strlen(pComment) : 0;
-    if (comment_len > MZ_UINT16_MAX)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    for (file_index = 0; file_index < pZip->m_total_files; file_index++)
-    {
-        const mz_uint8 *pHeader = &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index));
-        mz_uint filename_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-        const char *pFilename = (const char *)pHeader + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
-        if (filename_len < name_len)
-            continue;
-        if (comment_len)
-        {
-            mz_uint file_extra_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_EXTRA_LEN_OFS), file_comment_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_COMMENT_LEN_OFS);
-            const char *pFile_comment = pFilename + filename_len + file_extra_len;
-            if ((file_comment_len != comment_len) || (!mz_zip_string_equal(pComment, pFile_comment, file_comment_len, flags)))
-                continue;
-        }
-        if ((flags & MZ_ZIP_FLAG_IGNORE_PATH) && (filename_len))
-        {
-            int ofs = filename_len - 1;
-            do
-            {
-                if ((pFilename[ofs] == '/') || (pFilename[ofs] == '\\') || (pFilename[ofs] == ':'))
-                    break;
-            } while (--ofs >= 0);
-            ofs++;
-            pFilename += ofs;
-            filename_len -= ofs;
-        }
-        if ((filename_len == name_len) && (mz_zip_string_equal(pName, pFilename, filename_len, flags)))
-        {
-            if (pIndex)
-                *pIndex = file_index;
-            return MZ_TRUE;
-        }
-    }
-
-    return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND);
-}
-
-static
-mz_bool mz_zip_reader_extract_to_mem_no_alloc1(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size, const mz_zip_archive_file_stat *st)
-{
-    int status = TINFL_STATUS_DONE;
-    mz_uint64 needed_size, cur_file_ofs, comp_remaining, out_buf_ofs = 0, read_buf_size, read_buf_ofs = 0, read_buf_avail;
-    mz_zip_archive_file_stat file_stat;
-    void *pRead_buf;
-    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
-    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
-    tinfl_decompressor inflator;
-
-    if ((!pZip) || (!pZip->m_pState) || ((buf_size) && (!pBuf)) || ((user_read_buf_size) && (!pUser_read_buf)) || (!pZip->m_pRead))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (st) {
-        file_stat = *st;
-    } else
-    if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
-        return MZ_FALSE;
-
-    /* A directory or zero length file */
-    if ((file_stat.m_is_directory) || (!file_stat.m_comp_size))
-        return MZ_TRUE;
-
-    /* Encryption and patch files are not supported. */
-    if (file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
-
-    /* This function only supports decompressing stored and deflate. */
-    if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
-
-    /* Ensure supplied output buffer is large enough. */
-    needed_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? file_stat.m_comp_size : file_stat.m_uncomp_size;
-    if (buf_size < needed_size)
-        return mz_zip_set_error(pZip, MZ_ZIP_BUF_TOO_SMALL);
-
-    /* Read and parse the local directory entry. */
-    cur_file_ofs = file_stat.m_local_header_ofs;
-    if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-
-    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    cur_file_ofs += (mz_uint64)(MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
-    if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method))
-    {
-        /* The file is stored or the caller has requested the compressed data. */
-        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, (size_t)needed_size) != needed_size)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-        if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) == 0)
-        {
-            if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32)
-                return mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED);
-        }
-#endif
-
-        return MZ_TRUE;
-    }
-
-    /* Decompress the file either directly from memory or from a file input buffer. */
-    tinfl_init(&inflator);
-
-    if (pZip->m_pState->m_pMem)
-    {
-        /* Read directly from the archive in memory. */
-        pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
-        read_buf_size = read_buf_avail = file_stat.m_comp_size;
-        comp_remaining = 0;
-    }
-    else if (pUser_read_buf)
-    {
-        /* Use a user provided read buffer. */
-        if (!user_read_buf_size)
-            return MZ_FALSE;
-        pRead_buf = (mz_uint8 *)pUser_read_buf;
-        read_buf_size = user_read_buf_size;
-        read_buf_avail = 0;
-        comp_remaining = file_stat.m_comp_size;
-    }
-    else
-    {
-        /* Temporarily allocate a read buffer. */
-        read_buf_size = MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
-        if (((sizeof(size_t) == sizeof(mz_uint32))) && (read_buf_size > 0x7FFFFFFF))
-            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-
-        if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)read_buf_size)))
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-        read_buf_avail = 0;
-        comp_remaining = file_stat.m_comp_size;
-    }
-
-    do
-    {
-        /* The size_t cast here should be OK because we've verified that the output buffer is >= file_stat.m_uncomp_size above */
-        size_t in_buf_size, out_buf_size = (size_t)(file_stat.m_uncomp_size - out_buf_ofs);
-        if ((!read_buf_avail) && (!pZip->m_pState->m_pMem))
-        {
-            read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
-            if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
-            {
-                status = TINFL_STATUS_FAILED;
-                mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
-                break;
-            }
-            cur_file_ofs += read_buf_avail;
-            comp_remaining -= read_buf_avail;
-            read_buf_ofs = 0;
-        }
-        in_buf_size = (size_t)read_buf_avail;
-        status = tinfl_decompress(&inflator, (mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pBuf, (mz_uint8 *)pBuf + out_buf_ofs, &out_buf_size, TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | (comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0));
-        read_buf_avail -= in_buf_size;
-        read_buf_ofs += in_buf_size;
-        out_buf_ofs += out_buf_size;
-    } while (status == TINFL_STATUS_NEEDS_MORE_INPUT);
-
-    if (status == TINFL_STATUS_DONE)
-    {
-        /* Make sure the entire file was decompressed, and check its CRC. */
-        if (out_buf_ofs != file_stat.m_uncomp_size)
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
-            status = TINFL_STATUS_FAILED;
-        }
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-        else if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32)
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED);
-            status = TINFL_STATUS_FAILED;
-        }
-#endif
-    }
-
-    if ((!pZip->m_pState->m_pMem) && (!pUser_read_buf))
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-
-    return status == TINFL_STATUS_DONE;
-}
-
-mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
-{
-    return mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf, buf_size, flags, pUser_read_buf, user_read_buf_size, NULL);
-}
-
-mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
-{
-    mz_uint32 file_index;
-    if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
-        return MZ_FALSE;
-    return mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf, buf_size, flags, pUser_read_buf, user_read_buf_size, NULL);
-}
-
-mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags)
-{
-    return mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf, buf_size, flags, NULL, 0, NULL);
-}
-
-mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags)
-{
-    return mz_zip_reader_extract_file_to_mem_no_alloc(pZip, pFilename, pBuf, buf_size, flags, NULL, 0);
-}
-
-void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags)
-{
-    mz_zip_archive_file_stat file_stat;
-    mz_uint64 alloc_size;
-    void *pBuf;
-
-    if (pSize)
-        *pSize = 0;
-
-    if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
-        return NULL;
-
-    alloc_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? file_stat.m_comp_size : file_stat.m_uncomp_size;
-    if (((sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF))
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-        return NULL;
-    }
-
-    if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)alloc_size)))
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        return NULL;
-    }
-
-    if (!mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf, (size_t)alloc_size, flags, NULL, 0, &file_stat))
-    {
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-        return NULL;
-    }
-
-    if (pSize)
-        *pSize = (size_t)alloc_size;
-    return pBuf;
-}
-
-void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags)
-{
-    mz_uint32 file_index;
-    if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
-    {
-        if (pSize)
-            *pSize = 0;
-        return MZ_FALSE;
-    }
-    return mz_zip_reader_extract_to_heap(pZip, file_index, pSize, flags);
-}
-
-mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags)
-{
-    int status = TINFL_STATUS_DONE;
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-    mz_uint file_crc32 = MZ_CRC32_INIT;
-#endif
-    mz_uint64 read_buf_size, read_buf_ofs = 0, read_buf_avail, comp_remaining, out_buf_ofs = 0, cur_file_ofs;
-    mz_zip_archive_file_stat file_stat;
-    void *pRead_buf = NULL;
-    void *pWrite_buf = NULL;
-    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
-    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
-
-    if ((!pZip) || (!pZip->m_pState) || (!pCallback) || (!pZip->m_pRead))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
-        return MZ_FALSE;
-
-    /* A directory or zero length file */
-    if ((file_stat.m_is_directory) || (!file_stat.m_comp_size))
-        return MZ_TRUE;
-
-    /* Encryption and patch files are not supported. */
-    if (file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
-
-    /* This function only supports decompressing stored and deflate. */
-    if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
-
-    /* Read and do some minimal validation of the local directory entry (this doesn't crack the zip64 stuff, which we already have from the central dir) */
-    cur_file_ofs = file_stat.m_local_header_ofs;
-    if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-
-    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    cur_file_ofs += (mz_uint64)(MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
-    if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    /* Decompress the file either directly from memory or from a file input buffer. */
-    if (pZip->m_pState->m_pMem)
-    {
-        pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
-        read_buf_size = read_buf_avail = file_stat.m_comp_size;
-        comp_remaining = 0;
-    }
-    else
-    {
-        read_buf_size = MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
-        if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)read_buf_size)))
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-        read_buf_avail = 0;
-        comp_remaining = file_stat.m_comp_size;
-    }
-
-    if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method))
-    {
-        /* The file is stored or the caller has requested the compressed data. */
-        if (pZip->m_pState->m_pMem)
-        {
-            if (((sizeof(size_t) == sizeof(mz_uint32))) && (file_stat.m_comp_size > MZ_UINT32_MAX))
-                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-
-            if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)file_stat.m_comp_size) != file_stat.m_comp_size)
-            {
-                mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
-                status = TINFL_STATUS_FAILED;
-            }
-            else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
-            {
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-                file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)file_stat.m_comp_size);
-#endif
-            }
-
-            cur_file_ofs += file_stat.m_comp_size;
-            out_buf_ofs += file_stat.m_comp_size;
-            comp_remaining = 0;
-        }
-        else
-        {
-            while (comp_remaining)
-            {
-                read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
-                if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
-                {
-                    mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-                    status = TINFL_STATUS_FAILED;
-                    break;
-                }
-
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-                if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
-                {
-                    file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)read_buf_avail);
-                }
-#endif
-
-                if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
-                {
-                    mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
-                    status = TINFL_STATUS_FAILED;
-                    break;
-                }
-
-                cur_file_ofs += read_buf_avail;
-                out_buf_ofs += read_buf_avail;
-                comp_remaining -= read_buf_avail;
-            }
-        }
-    }
-    else
-    {
-        tinfl_decompressor inflator;
-        tinfl_init(&inflator);
-
-        if (NULL == (pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, TINFL_LZ_DICT_SIZE)))
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-            status = TINFL_STATUS_FAILED;
-        }
-        else
-        {
-            do
-            {
-                mz_uint8 *pWrite_buf_cur = (mz_uint8 *)pWrite_buf + (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
-                size_t in_buf_size, out_buf_size = TINFL_LZ_DICT_SIZE - (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
-                if ((!read_buf_avail) && (!pZip->m_pState->m_pMem))
-                {
-                    read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
-                    if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
-                    {
-                        mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-                        status = TINFL_STATUS_FAILED;
-                        break;
-                    }
-                    cur_file_ofs += read_buf_avail;
-                    comp_remaining -= read_buf_avail;
-                    read_buf_ofs = 0;
-                }
-
-                in_buf_size = (size_t)read_buf_avail;
-                status = tinfl_decompress(&inflator, (const mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pWrite_buf, pWrite_buf_cur, &out_buf_size, comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0);
-                read_buf_avail -= in_buf_size;
-                read_buf_ofs += in_buf_size;
-
-                if (out_buf_size)
-                {
-                    if (pCallback(pOpaque, out_buf_ofs, pWrite_buf_cur, out_buf_size) != out_buf_size)
-                    {
-                        mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
-                        status = TINFL_STATUS_FAILED;
-                        break;
-                    }
-
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-                    file_crc32 = (mz_uint32)mz_crc32(file_crc32, pWrite_buf_cur, out_buf_size);
-#endif
-                    if ((out_buf_ofs += out_buf_size) > file_stat.m_uncomp_size)
-                    {
-                        mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
-                        status = TINFL_STATUS_FAILED;
-                        break;
-                    }
-                }
-            } while ((status == TINFL_STATUS_NEEDS_MORE_INPUT) || (status == TINFL_STATUS_HAS_MORE_OUTPUT));
-        }
-    }
-
-    if ((status == TINFL_STATUS_DONE) && (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
-    {
-        /* Make sure the entire file was decompressed, and check its CRC. */
-        if (out_buf_ofs != file_stat.m_uncomp_size)
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
-            status = TINFL_STATUS_FAILED;
-        }
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-        else if (file_crc32 != file_stat.m_crc32)
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
-            status = TINFL_STATUS_FAILED;
-        }
-#endif
-    }
-
-    if (!pZip->m_pState->m_pMem)
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-
-    if (pWrite_buf)
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pWrite_buf);
-
-    return status == TINFL_STATUS_DONE;
-}
-
-mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags)
-{
-    mz_uint32 file_index;
-    if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
-        return MZ_FALSE;
-
-    return mz_zip_reader_extract_to_callback(pZip, file_index, pCallback, pOpaque, flags);
-}
-
-mz_zip_reader_extract_iter_state* mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags)
-{
-    mz_zip_reader_extract_iter_state *pState;
-    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
-    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
-
-    /* Argument sanity check */
-    if ((!pZip) || (!pZip->m_pState))
-        return NULL;
-
-    /* Allocate an iterator status structure */
-    pState = (mz_zip_reader_extract_iter_state*)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_reader_extract_iter_state));
-    if (!pState)
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        return NULL;
-    }
-
-    /* Fetch file details */
-    if (!mz_zip_reader_file_stat(pZip, file_index, &pState->file_stat))
-    {
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-        return NULL;
-    }
-
-    /* Encryption and patch files are not supported. */
-    if (pState->file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-        return NULL;
-    }
-
-    /* This function only supports decompressing stored and deflate. */
-    if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (pState->file_stat.m_method != 0) && (pState->file_stat.m_method != MZ_DEFLATED))
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-        return NULL;
-    }
-
-    /* Init state - save args */
-    pState->pZip = pZip;
-    pState->flags = flags;
-
-    /* Init state - reset variables to defaults */
-    pState->status = TINFL_STATUS_DONE;
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-    pState->file_crc32 = MZ_CRC32_INIT;
-#endif
-    pState->read_buf_ofs = 0;
-    pState->out_buf_ofs = 0;
-    pState->pRead_buf = NULL;
-    pState->pWrite_buf = NULL;
-    pState->out_blk_remain = 0;
-
-    /* Read and parse the local directory entry. */
-    pState->cur_file_ofs = pState->file_stat.m_local_header_ofs;
-    if (pZip->m_pRead(pZip->m_pIO_opaque, pState->cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-        return NULL;
-    }
-
-    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-        return NULL;
-    }
-
-    pState->cur_file_ofs += (mz_uint64)(MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
-    if ((pState->cur_file_ofs + pState->file_stat.m_comp_size) > pZip->m_archive_size)
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-        return NULL;
-    }
-
-    /* Decompress the file either directly from memory or from a file input buffer. */
-    if (pZip->m_pState->m_pMem)
-    {
-        pState->pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + pState->cur_file_ofs;
-        pState->read_buf_size = pState->read_buf_avail = pState->file_stat.m_comp_size;
-        pState->comp_remaining = pState->file_stat.m_comp_size;
-    }
-    else
-    {
-        if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method)))
-        {
-            /* Decompression required, therefore intermediate read buffer required */
-            pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
-            if (NULL == (pState->pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)pState->read_buf_size)))
-            {
-                mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-                pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-                return NULL;
-            }
-        }
-        else
-        {
-            /* Decompression not required - we will be reading directly into user buffer, no temp buf required */
-            pState->read_buf_size = 0;
-        }
-        pState->read_buf_avail = 0;
-        pState->comp_remaining = pState->file_stat.m_comp_size;
-    }
-
-    if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method)))
-    {
-        /* Decompression required, init decompressor */
-        tinfl_init( &pState->inflator );
-
-        /* Allocate write buffer */
-        if (NULL == (pState->pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, TINFL_LZ_DICT_SIZE)))
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-            if (pState->pRead_buf)
-                pZip->m_pFree(pZip->m_pAlloc_opaque, pState->pRead_buf);
-            pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-            return NULL;
-        }
-    }
-
-    return pState;
-}
-
-mz_zip_reader_extract_iter_state* mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, mz_uint flags)
-{
-    mz_uint32 file_index;
-
-    /* Locate file index by name */
-    if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
-        return NULL;
-
-    /* Construct iterator */
-    return mz_zip_reader_extract_iter_new(pZip, file_index, flags);
-}
-
-size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state* pState, void* pvBuf, size_t buf_size)
-{
-    size_t copied_to_caller = 0;
-
-    /* Argument sanity check */
-    if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState) || (!pvBuf))
-        return 0;
-
-    if ((pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method))
-    {
-        /* The file is stored or the caller has requested the compressed data, calc amount to return. */
-        copied_to_caller = (size_t)MZ_MIN( buf_size, pState->comp_remaining );
-
-        /* Zip is in memory....or requires reading from a file? */
-        if (pState->pZip->m_pState->m_pMem)
-        {
-            /* Copy data to caller's buffer */
-            memcpy( pvBuf, pState->pRead_buf, copied_to_caller );
-            pState->pRead_buf = ((mz_uint8*)pState->pRead_buf) + copied_to_caller;
-        }
-        else
-        {
-            /* Read directly into caller's buffer */
-            if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, pState->cur_file_ofs, pvBuf, copied_to_caller) != copied_to_caller)
-            {
-                /* Failed to read all that was asked for, flag failure and alert user */
-                mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED);
-                pState->status = TINFL_STATUS_FAILED;
-                copied_to_caller = 0;
-            }
-        }
-
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-        /* Compute CRC if not returning compressed data only */
-        if (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
-            pState->file_crc32 = (mz_uint32)mz_crc32(pState->file_crc32, (const mz_uint8 *)pvBuf, copied_to_caller);
-#endif
-
-        /* Advance offsets, dec counters */
-        pState->cur_file_ofs += copied_to_caller;
-        pState->out_buf_ofs += copied_to_caller;
-        pState->comp_remaining -= copied_to_caller;
-    }
-    else
-    {
-        do
-        {
-            /* Calc ptr to write buffer - given current output pos and block size */
-            mz_uint8 *pWrite_buf_cur = (mz_uint8 *)pState->pWrite_buf + (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
-
-            /* Calc max output size - given current output pos and block size */
-            size_t in_buf_size, out_buf_size = TINFL_LZ_DICT_SIZE - (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
-
-            if (!pState->out_blk_remain)
-            {
-                /* Read more data from file if none available (and reading from file) */
-                if ((!pState->read_buf_avail) && (!pState->pZip->m_pState->m_pMem))
-                {
-                    /* Calc read size */
-                    pState->read_buf_avail = MZ_MIN(pState->read_buf_size, pState->comp_remaining);
-                    if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, pState->cur_file_ofs, pState->pRead_buf, (size_t)pState->read_buf_avail) != pState->read_buf_avail)
-                    {
-                        mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED);
-                        pState->status = TINFL_STATUS_FAILED;
-                        break;
-                    }
-
-                    /* Advance offsets, dec counters */
-                    pState->cur_file_ofs += pState->read_buf_avail;
-                    pState->comp_remaining -= pState->read_buf_avail;
-                    pState->read_buf_ofs = 0;
-                }
-
-                /* Perform decompression */
-                in_buf_size = (size_t)pState->read_buf_avail;
-                pState->status = tinfl_decompress(&pState->inflator, (const mz_uint8 *)pState->pRead_buf + pState->read_buf_ofs, &in_buf_size, (mz_uint8 *)pState->pWrite_buf, pWrite_buf_cur, &out_buf_size, pState->comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0);
-                pState->read_buf_avail -= in_buf_size;
-                pState->read_buf_ofs += in_buf_size;
-
-                /* Update current output block size remaining */
-                pState->out_blk_remain = out_buf_size;
-            }
-
-            if (pState->out_blk_remain)
-            {
-                /* Calc amount to return. */
-                size_t to_copy = MZ_MIN( (buf_size - copied_to_caller), pState->out_blk_remain );
-
-                /* Copy data to caller's buffer */
-                memcpy( (mz_uint8*)pvBuf + copied_to_caller, pWrite_buf_cur, to_copy );
-
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-                /* Perform CRC */
-                pState->file_crc32 = (mz_uint32)mz_crc32(pState->file_crc32, pWrite_buf_cur, to_copy);
-#endif
-
-                /* Decrement data consumed from block */
-                pState->out_blk_remain -= to_copy;
-
-                /* Inc output offset, while performing sanity check */
-                if ((pState->out_buf_ofs += to_copy) > pState->file_stat.m_uncomp_size)
-                {
-                    mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED);
-                    pState->status = TINFL_STATUS_FAILED;
-                    break;
-                }
-
-                /* Increment counter of data copied to caller */
-                copied_to_caller += to_copy;
-            }
-        } while ( (copied_to_caller < buf_size) && ((pState->status == TINFL_STATUS_NEEDS_MORE_INPUT) || (pState->status == TINFL_STATUS_HAS_MORE_OUTPUT)) );
-    }
-
-    /* Return how many bytes were copied into user buffer */
-    return copied_to_caller;
-}
-
-mz_bool mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state* pState)
-{
-    int status;
-
-    /* Argument sanity check */
-    if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState))
-        return MZ_FALSE;
-
-    /* Was decompression completed and requested? */
-    if ((pState->status == TINFL_STATUS_DONE) && (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
-    {
-        /* Make sure the entire file was decompressed, and check its CRC. */
-        if (pState->out_buf_ofs != pState->file_stat.m_uncomp_size)
-        {
-            mz_zip_set_error(pState->pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
-            pState->status = TINFL_STATUS_FAILED;
-        }
-#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-        else if (pState->file_crc32 != pState->file_stat.m_crc32)
-        {
-            mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED);
-            pState->status = TINFL_STATUS_FAILED;
-        }
-#endif
-    }
-
-    /* Free buffers */
-    if (!pState->pZip->m_pState->m_pMem)
-        pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pRead_buf);
-    if (pState->pWrite_buf)
-        pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pWrite_buf);
-
-    /* Save status */
-    status = pState->status;
-
-    /* Free context */
-    pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState);
-
-    return status == TINFL_STATUS_DONE;
-}
-
-#ifndef MINIZ_NO_STDIO
-static size_t mz_zip_file_write_callback(void *pOpaque, mz_uint64 ofs, const void *pBuf, size_t n)
-{
-    (void)ofs;
-
-    return MZ_FWRITE(pBuf, 1, n, (MZ_FILE *)pOpaque);
-}
-
-mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags)
-{
-    mz_bool status;
-    mz_zip_archive_file_stat file_stat;
-    MZ_FILE *pFile;
-
-    if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
-        return MZ_FALSE;
-
-    if ((file_stat.m_is_directory) || (!file_stat.m_is_supported))
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
-
-    pFile = MZ_FOPEN(pDst_filename, "wb");
-    if (!pFile)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
-
-    status = mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_file_write_callback, pFile, flags);
-
-    if (MZ_FCLOSE(pFile) == EOF)
-    {
-        if (status)
-            mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
-
-        status = MZ_FALSE;
-    }
-
-#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO)
-    if (status)
-        mz_zip_set_file_times(pDst_filename, file_stat.m_time, file_stat.m_time);
-#endif
-
-    return status;
-}
-
-mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags)
-{
-    mz_uint32 file_index;
-    if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, &file_index))
-        return MZ_FALSE;
-
-    return mz_zip_reader_extract_to_file(pZip, file_index, pDst_filename, flags);
-}
-
-mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index, MZ_FILE *pFile, mz_uint flags)
-{
-    mz_zip_archive_file_stat file_stat;
-
-    if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
-        return MZ_FALSE;
-
-    if ((file_stat.m_is_directory) || (!file_stat.m_is_supported))
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
-
-    return mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_file_write_callback, pFile, flags);
-}
-
-mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile, mz_uint flags)
-{
-    mz_uint32 file_index;
-    if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, &file_index))
-        return MZ_FALSE;
-
-    return mz_zip_reader_extract_to_cfile(pZip, file_index, pFile, flags);
-}
-#endif /* #ifndef MINIZ_NO_STDIO */
-
-static size_t mz_zip_compute_crc32_callback(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
-{
-    mz_uint32 *p = (mz_uint32 *)pOpaque;
-    (void)file_ofs;
-    *p = (mz_uint32)mz_crc32(*p, (const mz_uint8 *)pBuf, n);
-    return n;
-}
-
-mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags)
-{
-    mz_zip_archive_file_stat file_stat;
-    mz_zip_internal_state *pState;
-    const mz_uint8 *pCentral_dir_header;
-    mz_bool found_zip64_ext_data_in_cdir = MZ_FALSE;
-    mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE;
-    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
-    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
-    mz_uint64 local_header_ofs = 0;
-    mz_uint32 local_header_filename_len, local_header_extra_len, local_header_crc32;
-    mz_uint64 local_header_comp_size, local_header_uncomp_size;
-    mz_uint32 uncomp_crc32 = MZ_CRC32_INIT;
-    mz_bool has_data_descriptor;
-    mz_uint32 local_header_bit_flags;
-
-    mz_zip_array file_data_array;
-    mz_zip_array_init(&file_data_array, 1);
-
-    if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (!pZip->m_pRead))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (file_index > pZip->m_total_files)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    pState = pZip->m_pState;
-
-    pCentral_dir_header = mz_zip_get_cdh(pZip, file_index);
-
-    if (!mz_zip_file_stat_internal(pZip, file_index, pCentral_dir_header, &file_stat, &found_zip64_ext_data_in_cdir))
-        return MZ_FALSE;
-
-    /* A directory or zero length file */
-    if ((file_stat.m_is_directory) || (!file_stat.m_uncomp_size))
-        return MZ_TRUE;
-
-    /* Encryption and patch files are not supported. */
-    if (file_stat.m_is_encrypted)
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
-
-    /* This function only supports stored and deflate. */
-    if ((file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
-
-    if (!file_stat.m_is_supported)
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
-
-    /* Read and parse the local directory entry. */
-    local_header_ofs = file_stat.m_local_header_ofs;
-    if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-
-    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    local_header_filename_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS);
-    local_header_extra_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
-    local_header_comp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS);
-    local_header_uncomp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS);
-    local_header_crc32 = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_CRC32_OFS);
-    local_header_bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS);
-    has_data_descriptor = (local_header_bit_flags & 8) != 0;
-
-    if (local_header_filename_len != strlen(file_stat.m_filename))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    if ((local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len + local_header_extra_len + file_stat.m_comp_size) > pZip->m_archive_size)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    if (!mz_zip_array_resize(pZip, &file_data_array, MZ_MAX(local_header_filename_len, local_header_extra_len), MZ_FALSE))
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        goto handle_failure;
-    }
-
-    if (local_header_filename_len)
-    {
-        if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE, file_data_array.m_p, local_header_filename_len) != local_header_filename_len)
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-            goto handle_failure;
-        }
-
-        /* I've seen 1 archive that had the same pathname, but used backslashes in the local dir and forward slashes in the central dir. Do we care about this? For now, this case will fail validation. */
-        if (memcmp(file_stat.m_filename, file_data_array.m_p, local_header_filename_len) != 0)
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
-            goto handle_failure;
-        }
-    }
-
-    if ((local_header_extra_len) && ((local_header_comp_size == MZ_UINT32_MAX) || (local_header_uncomp_size == MZ_UINT32_MAX)))
-    {
-        mz_uint32 extra_size_remaining = local_header_extra_len;
-        const mz_uint8 *pExtra_data = (const mz_uint8 *)file_data_array.m_p;
-
-        if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len, file_data_array.m_p, local_header_extra_len) != local_header_extra_len)
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-            goto handle_failure;
-        }
-
-        do
-        {
-            mz_uint32 field_id, field_data_size, field_total_size;
-
-            if (extra_size_remaining < (sizeof(mz_uint16) * 2))
-            {
-                mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-                goto handle_failure;
-            }
-
-            field_id = MZ_READ_LE16(pExtra_data);
-            field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
-            field_total_size = field_data_size + sizeof(mz_uint16) * 2;
-
-            if (field_total_size > extra_size_remaining)
-            {
-                mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-                goto handle_failure;
-            }
-
-            if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
-            {
-                const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32);
-
-                if (field_data_size < sizeof(mz_uint64) * 2)
-                {
-                    mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-                    goto handle_failure;
-                }
-
-                local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data);
-                local_header_comp_size = MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64));
-
-                found_zip64_ext_data_in_ldir = MZ_TRUE;
-                break;
-            }
-
-            pExtra_data += field_total_size;
-            extra_size_remaining -= field_total_size;
-        } while (extra_size_remaining);
-    }
-
-    /* TODO: parse local header extra data when local_header_comp_size is 0xFFFFFFFF! (big_descriptor.zip) */
-    /* I've seen zips in the wild with the data descriptor bit set, but proper local header values and bogus data descriptors */
-    if ((has_data_descriptor) && (!local_header_comp_size) && (!local_header_crc32))
-    {
-        mz_uint8 descriptor_buf[32];
-        mz_bool has_id;
-        const mz_uint8 *pSrc;
-        mz_uint32 file_crc32;
-        mz_uint64 comp_size = 0, uncomp_size = 0;
-
-        mz_uint32 num_descriptor_uint32s = ((pState->m_zip64) || (found_zip64_ext_data_in_ldir)) ? 6 : 4;
-
-        if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len + local_header_extra_len + file_stat.m_comp_size, descriptor_buf, sizeof(mz_uint32) * num_descriptor_uint32s) != (sizeof(mz_uint32) * num_descriptor_uint32s))
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-            goto handle_failure;
-        }
-
-        has_id = (MZ_READ_LE32(descriptor_buf) == MZ_ZIP_DATA_DESCRIPTOR_ID);
-        pSrc = has_id ? (descriptor_buf + sizeof(mz_uint32)) : descriptor_buf;
-
-        file_crc32 = MZ_READ_LE32(pSrc);
-
-        if ((pState->m_zip64) || (found_zip64_ext_data_in_ldir))
-        {
-            comp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32));
-            uncomp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32) + sizeof(mz_uint64));
-        }
-        else
-        {
-            comp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32));
-            uncomp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32) + sizeof(mz_uint32));
-        }
-
-        if ((file_crc32 != file_stat.m_crc32) || (comp_size != file_stat.m_comp_size) || (uncomp_size != file_stat.m_uncomp_size))
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
-            goto handle_failure;
-        }
-    }
-    else
-    {
-        if ((local_header_crc32 != file_stat.m_crc32) || (local_header_comp_size != file_stat.m_comp_size) || (local_header_uncomp_size != file_stat.m_uncomp_size))
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
-            goto handle_failure;
-        }
-    }
-
-    mz_zip_array_clear(pZip, &file_data_array);
-
-    if ((flags & MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY) == 0)
-    {
-        if (!mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_compute_crc32_callback, &uncomp_crc32, 0))
-            return MZ_FALSE;
-
-        /* 1 more check to be sure, although the extract checks too. */
-        if (uncomp_crc32 != file_stat.m_crc32)
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
-            return MZ_FALSE;
-        }
-    }
-
-    return MZ_TRUE;
-
-handle_failure:
-    mz_zip_array_clear(pZip, &file_data_array);
-    return MZ_FALSE;
-}
-
-mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags)
-{
-    mz_zip_internal_state *pState;
-    mz_uint32 i;
-
-    if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (!pZip->m_pRead))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    pState = pZip->m_pState;
-
-    /* Basic sanity checks */
-    if (!pState->m_zip64)
-    {
-        if (pZip->m_total_files > MZ_UINT16_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-
-        if (pZip->m_archive_size > MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-    }
-    else
-    {
-        if (pState->m_central_dir.m_size >= MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-    }
-
-    for (i = 0; i < pZip->m_total_files; i++)
-    {
-        if (MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG & flags)
-        {
-            mz_uint32 found_index;
-            mz_zip_archive_file_stat stat;
-
-            if (!mz_zip_reader_file_stat(pZip, i, &stat))
-                return MZ_FALSE;
-
-            if (!mz_zip_reader_locate_file_v2(pZip, stat.m_filename, NULL, 0, &found_index))
-                return MZ_FALSE;
-
-            /* This check can fail if there are duplicate filenames in the archive (which we don't check for when writing - that's up to the user) */
-            if (found_index != i)
-                return mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
-        }
-
-        if (!mz_zip_validate_file(pZip, i, flags))
-            return MZ_FALSE;
-    }
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, mz_uint flags, mz_zip_error *pErr)
-{
-    mz_bool success = MZ_TRUE;
-    mz_zip_archive zip;
-    mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
-
-    if ((!pMem) || (!size))
-    {
-        if (pErr)
-            *pErr = MZ_ZIP_INVALID_PARAMETER;
-        return MZ_FALSE;
-    }
-
-    mz_zip_zero_struct(&zip);
-
-    if (!mz_zip_reader_init_mem(&zip, pMem, size, flags))
-    {
-        if (pErr)
-            *pErr = zip.m_last_error;
-        return MZ_FALSE;
-    }
-
-    if (!mz_zip_validate_archive(&zip, flags))
-    {
-        actual_err = zip.m_last_error;
-        success = MZ_FALSE;
-    }
-
-    if (!mz_zip_reader_end_internal(&zip, success))
-    {
-        if (!actual_err)
-            actual_err = zip.m_last_error;
-        success = MZ_FALSE;
-    }
-
-    if (pErr)
-        *pErr = actual_err;
-
-    return success;
-}
-
-#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags, mz_zip_error *pErr)
-{
-    mz_bool success = MZ_TRUE;
-    mz_zip_archive zip;
-    mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
-
-    if (!pFilename)
-    {
-        if (pErr)
-            *pErr = MZ_ZIP_INVALID_PARAMETER;
-        return MZ_FALSE;
-    }
-
-    mz_zip_zero_struct(&zip);
-
-    if (!mz_zip_reader_init_file_v2(&zip, pFilename, flags, 0, 0))
-    {
-        if (pErr)
-            *pErr = zip.m_last_error;
-        return MZ_FALSE;
-    }
-
-    if (!mz_zip_validate_archive(&zip, flags))
-    {
-        actual_err = zip.m_last_error;
-        success = MZ_FALSE;
-    }
-
-    if (!mz_zip_reader_end_internal(&zip, success))
-    {
-        if (!actual_err)
-            actual_err = zip.m_last_error;
-        success = MZ_FALSE;
-    }
-
-    if (pErr)
-        *pErr = actual_err;
-
-    return success;
-}
-#endif /* #ifndef MINIZ_NO_STDIO */
-
-/* ------------------- .ZIP archive writing */
-
-#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-
-static MZ_FORCEINLINE void mz_write_le16(mz_uint8 *p, mz_uint16 v)
-{
-    p[0] = (mz_uint8)v;
-    p[1] = (mz_uint8)(v >> 8);
-}
-static MZ_FORCEINLINE void mz_write_le32(mz_uint8 *p, mz_uint32 v)
-{
-    p[0] = (mz_uint8)v;
-    p[1] = (mz_uint8)(v >> 8);
-    p[2] = (mz_uint8)(v >> 16);
-    p[3] = (mz_uint8)(v >> 24);
-}
-static MZ_FORCEINLINE void mz_write_le64(mz_uint8 *p, mz_uint64 v)
-{
-    mz_write_le32(p, (mz_uint32)v);
-    mz_write_le32(p + sizeof(mz_uint32), (mz_uint32)(v >> 32));
-}
-
-#define MZ_WRITE_LE16(p, v) mz_write_le16((mz_uint8 *)(p), (mz_uint16)(v))
-#define MZ_WRITE_LE32(p, v) mz_write_le32((mz_uint8 *)(p), (mz_uint32)(v))
-#define MZ_WRITE_LE64(p, v) mz_write_le64((mz_uint8 *)(p), (mz_uint64)(v))
-
-static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
-{
-    mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
-    mz_zip_internal_state *pState = pZip->m_pState;
-    mz_uint64 new_size = MZ_MAX(file_ofs + n, pState->m_mem_size);
-
-    if (!n)
-        return 0;
-
-    /* An allocation this big is likely to just fail on 32-bit systems, so don't even go there. */
-    if ((sizeof(size_t) == sizeof(mz_uint32)) && (new_size > 0x7FFFFFFF))
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
-        return 0;
-    }
-
-    if (new_size > pState->m_mem_capacity)
-    {
-        void *pNew_block;
-        size_t new_capacity = MZ_MAX(64, pState->m_mem_capacity);
-
-        while (new_capacity < new_size)
-            new_capacity *= 2;
-
-        if (NULL == (pNew_block = pZip->m_pRealloc(pZip->m_pAlloc_opaque, pState->m_pMem, 1, new_capacity)))
-        {
-            mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-            return 0;
-        }
-
-        pState->m_pMem = pNew_block;
-        pState->m_mem_capacity = new_capacity;
-    }
-    memcpy((mz_uint8 *)pState->m_pMem + file_ofs, pBuf, n);
-    pState->m_mem_size = (size_t)new_size;
-    return n;
-}
-
-static mz_bool mz_zip_writer_end_internal(mz_zip_archive *pZip, mz_bool set_last_error)
-{
-    mz_zip_internal_state *pState;
-    mz_bool status = MZ_TRUE;
-
-    if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || ((pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) && (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED)))
-    {
-        if (set_last_error)
-            mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-        return MZ_FALSE;
-    }
-
-    pState = pZip->m_pState;
-    pZip->m_pState = NULL;
-    mz_zip_array_clear(pZip, &pState->m_central_dir);
-    mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
-    mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
-
-#ifndef MINIZ_NO_STDIO
-    if (pState->m_pFile)
-    {
-        if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE)
-        {
-            if (MZ_FCLOSE(pState->m_pFile) == EOF)
-            {
-                if (set_last_error)
-                    mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
-                status = MZ_FALSE;
-            }
-        }
-
-        pState->m_pFile = NULL;
-    }
-#endif /* #ifndef MINIZ_NO_STDIO */
-
-    if ((pZip->m_pWrite == mz_zip_heap_write_func) && (pState->m_pMem))
-    {
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pState->m_pMem);
-        pState->m_pMem = NULL;
-    }
-
-    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
-    pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
-    return status;
-}
-
-mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size, mz_uint flags)
-{
-    mz_bool zip64 = (flags & MZ_ZIP_FLAG_WRITE_ZIP64) != 0;
-
-    if ((!pZip) || (pZip->m_pState) || (!pZip->m_pWrite) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
-    {
-        if (!pZip->m_pRead)
-            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-    }
-
-    if (pZip->m_file_offset_alignment)
-    {
-        /* Ensure user specified file offset alignment is a power of 2. */
-        if (pZip->m_file_offset_alignment & (pZip->m_file_offset_alignment - 1))
-            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-    }
-
-    if (!pZip->m_pAlloc)
-        pZip->m_pAlloc = miniz_def_alloc_func;
-    if (!pZip->m_pFree)
-        pZip->m_pFree = miniz_def_free_func;
-    if (!pZip->m_pRealloc)
-        pZip->m_pRealloc = miniz_def_realloc_func;
-
-    pZip->m_archive_size = existing_size;
-    pZip->m_central_directory_file_ofs = 0;
-    pZip->m_total_files = 0;
-
-    if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
-        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-    memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
-
-    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8));
-    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32));
-    MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32));
-
-    pZip->m_pState->m_zip64 = zip64;
-    pZip->m_pState->m_zip64_has_extended_info_fields = zip64;
-
-    pZip->m_zip_type = MZ_ZIP_TYPE_USER;
-    pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size)
-{
-    return mz_zip_writer_init_v2(pZip, existing_size, 0);
-}
-
-mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size, mz_uint flags)
-{
-    pZip->m_pWrite = mz_zip_heap_write_func;
-    pZip->m_pNeeds_keepalive = NULL;
-
-    if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
-        pZip->m_pRead = mz_zip_mem_read_func;
-
-    pZip->m_pIO_opaque = pZip;
-
-    if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags))
-        return MZ_FALSE;
-
-    pZip->m_zip_type = MZ_ZIP_TYPE_HEAP;
-
-    if (0 != (initial_allocation_size = MZ_MAX(initial_allocation_size, size_to_reserve_at_beginning)))
-    {
-        if (NULL == (pZip->m_pState->m_pMem = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, initial_allocation_size)))
-        {
-            mz_zip_writer_end_internal(pZip, MZ_FALSE);
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        }
-        pZip->m_pState->m_mem_capacity = initial_allocation_size;
-    }
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size)
-{
-    return mz_zip_writer_init_heap_v2(pZip, size_to_reserve_at_beginning, initial_allocation_size, 0);
-}
-
-#ifndef MINIZ_NO_STDIO
-static size_t mz_zip_file_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
-{
-    mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
-    mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
-
-    file_ofs += pZip->m_pState->m_file_archive_start_ofs;
-
-    if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
-    {
-        mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
-        return 0;
-    }
-
-    return MZ_FWRITE(pBuf, 1, n, pZip->m_pState->m_pFile);
-}
-
-mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning)
-{
-    return mz_zip_writer_init_file_v2(pZip, pFilename, size_to_reserve_at_beginning, 0);
-}
-
-mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning, mz_uint flags)
-{
-    MZ_FILE *pFile;
-
-    pZip->m_pWrite = mz_zip_file_write_func;
-    pZip->m_pNeeds_keepalive = NULL;
-
-    if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
-        pZip->m_pRead = mz_zip_file_read_func;
-
-    pZip->m_pIO_opaque = pZip;
-
-    if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags))
-        return MZ_FALSE;
-
-    if (NULL == (pFile = MZ_FOPEN(pFilename, (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) ? "w+b" : "wb")))
-    {
-        mz_zip_writer_end(pZip);
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
-    }
-
-    pZip->m_pState->m_pFile = pFile;
-    pZip->m_zip_type = MZ_ZIP_TYPE_FILE;
-
-    if (size_to_reserve_at_beginning)
-    {
-        mz_uint64 cur_ofs = 0;
-        char buf[4096];
-
-        MZ_CLEAR_ARR(buf);
-
-        do
-        {
-            size_t n = (size_t)MZ_MIN(sizeof(buf), size_to_reserve_at_beginning);
-            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_ofs, buf, n) != n)
-            {
-                mz_zip_writer_end(pZip);
-                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-            }
-            cur_ofs += n;
-            size_to_reserve_at_beginning -= n;
-        } while (size_to_reserve_at_beginning);
-    }
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint flags)
-{
-    pZip->m_pWrite = mz_zip_file_write_func;
-    pZip->m_pNeeds_keepalive = NULL;
-
-    if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
-        pZip->m_pRead = mz_zip_file_read_func;
-
-    pZip->m_pIO_opaque = pZip;
-
-    if (!mz_zip_writer_init_v2(pZip, 0, flags))
-        return MZ_FALSE;
-
-    pZip->m_pState->m_pFile = pFile;
-    pZip->m_pState->m_file_archive_start_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
-    pZip->m_zip_type = MZ_ZIP_TYPE_CFILE;
-
-    return MZ_TRUE;
-}
-#endif /* #ifndef MINIZ_NO_STDIO */
-
-mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags)
-{
-    mz_zip_internal_state *pState;
-
-    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (flags & MZ_ZIP_FLAG_WRITE_ZIP64)
-    {
-        /* We don't support converting a non-zip64 file to zip64 - this seems like more trouble than it's worth. (What about the existing 32-bit data descriptors that could follow the compressed data?) */
-        if (!pZip->m_pState->m_zip64)
-            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-    }
-
-    /* No sense in trying to write to an archive that's already at the support max size */
-    if (pZip->m_pState->m_zip64)
-    {
-        if (pZip->m_total_files == MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-    }
-    else
-    {
-        if (pZip->m_total_files == MZ_UINT16_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-
-        if ((pZip->m_archive_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
-    }
-
-    pState = pZip->m_pState;
-
-    if (pState->m_pFile)
-    {
-#ifdef MINIZ_NO_STDIO
-        (void)pFilename;
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-#else
-        if (pZip->m_pIO_opaque != pZip)
-            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-        if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE)
-        {
-            if (!pFilename)
-                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-            /* Archive is being read from stdio and was originally opened only for reading. Try to reopen as writable. */
-            if (NULL == (pState->m_pFile = MZ_FREOPEN(pFilename, "r+b", pState->m_pFile)))
-            {
-                /* The mz_zip_archive is now in a bogus state because pState->m_pFile is NULL, so just close it. */
-                mz_zip_reader_end_internal(pZip, MZ_FALSE);
-                return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
-            }
-        }
-
-        pZip->m_pWrite = mz_zip_file_write_func;
-        pZip->m_pNeeds_keepalive = NULL;
-#endif /* #ifdef MINIZ_NO_STDIO */
-    }
-    else if (pState->m_pMem)
-    {
-        /* Archive lives in a memory block. Assume it's from the heap that we can resize using the realloc callback. */
-        if (pZip->m_pIO_opaque != pZip)
-            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-        pState->m_mem_capacity = pState->m_mem_size;
-        pZip->m_pWrite = mz_zip_heap_write_func;
-        pZip->m_pNeeds_keepalive = NULL;
-    }
-    /* Archive is being read via a user provided read function - make sure the user has specified a write function too. */
-    else if (!pZip->m_pWrite)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    /* Start writing new files at the archive's current central directory location. */
-    /* TODO: We could add a flag that lets the user start writing immediately AFTER the existing central dir - this would be safer. */
-    pZip->m_archive_size = pZip->m_central_directory_file_ofs;
-    pZip->m_central_directory_file_ofs = 0;
-
-    /* Clear the sorted central dir offsets, they aren't useful or maintained now. */
-    /* Even though we're now in write mode, files can still be extracted and verified, but file locates will be slow. */
-    /* TODO: We could easily maintain the sorted central directory offsets. */
-    mz_zip_array_clear(pZip, &pZip->m_pState->m_sorted_central_dir_offsets);
-
-    pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename)
-{
-    return mz_zip_writer_init_from_reader_v2(pZip, pFilename, 0);
-}
-
-/* TODO: pArchive_name is a terrible name here! */
-mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags)
-{
-    return mz_zip_writer_add_mem_ex(pZip, pArchive_name, pBuf, buf_size, NULL, 0, level_and_flags, 0, 0);
-}
-
-typedef struct
-{
-    mz_zip_archive *m_pZip;
-    mz_uint64 m_cur_archive_file_ofs;
-    mz_uint64 m_comp_size;
-} mz_zip_writer_add_state;
-
-static mz_bool mz_zip_writer_add_put_buf_callback(const void *pBuf, int len, void *pUser)
-{
-    mz_zip_writer_add_state *pState = (mz_zip_writer_add_state *)pUser;
-    if ((int)pState->m_pZip->m_pWrite(pState->m_pZip->m_pIO_opaque, pState->m_cur_archive_file_ofs, pBuf, len) != len)
-        return MZ_FALSE;
-
-    pState->m_cur_archive_file_ofs += len;
-    pState->m_comp_size += len;
-    return MZ_TRUE;
-}
-
-#define MZ_ZIP64_MAX_LOCAL_EXTRA_FIELD_SIZE (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 2)
-#define MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 3)
-static mz_uint32 mz_zip_writer_create_zip64_extra_data(mz_uint8 *pBuf, mz_uint64 *pUncomp_size, mz_uint64 *pComp_size, mz_uint64 *pLocal_header_ofs)
-{
-    mz_uint8 *pDst = pBuf;
-    mz_uint32 field_size = 0;
-
-    MZ_WRITE_LE16(pDst + 0, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID);
-    MZ_WRITE_LE16(pDst + 2, 0);
-    pDst += sizeof(mz_uint16) * 2;
-
-    if (pUncomp_size)
-    {
-        MZ_WRITE_LE64(pDst, *pUncomp_size);
-        pDst += sizeof(mz_uint64);
-        field_size += sizeof(mz_uint64);
-    }
-
-    if (pComp_size)
-    {
-        MZ_WRITE_LE64(pDst, *pComp_size);
-        pDst += sizeof(mz_uint64);
-        field_size += sizeof(mz_uint64);
-    }
-
-    if (pLocal_header_ofs)
-    {
-        MZ_WRITE_LE64(pDst, *pLocal_header_ofs);
-        pDst += sizeof(mz_uint64);
-        field_size += sizeof(mz_uint64);
-    }
-
-    MZ_WRITE_LE16(pBuf + 2, field_size);
-
-    return (mz_uint32)(pDst - pBuf);
-}
-
-static mz_bool mz_zip_writer_create_local_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst, mz_uint16 filename_size, mz_uint16 extra_size, mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date)
-{
-    (void)pZip;
-    memset(pDst, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE);
-    MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_SIG_OFS, MZ_ZIP_LOCAL_DIR_HEADER_SIG);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_VERSION_NEEDED_OFS, method ? 20 : 0);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_BIT_FLAG_OFS, bit_flags);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_METHOD_OFS, method);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_TIME_OFS, dos_time);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_DATE_OFS, dos_date);
-    MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_CRC32_OFS, uncomp_crc32);
-    MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS, MZ_MIN(comp_size, MZ_UINT32_MAX));
-    MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS, MZ_MIN(uncomp_size, MZ_UINT32_MAX));
-    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILENAME_LEN_OFS, filename_size);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_EXTRA_LEN_OFS, extra_size);
-    return MZ_TRUE;
-}
-
-static mz_bool mz_zip_writer_create_central_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst,
-                                                       mz_uint16 filename_size, mz_uint16 extra_size, mz_uint16 comment_size,
-                                                       mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32,
-                                                       mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date,
-                                                       mz_uint64 local_header_ofs, mz_uint32 ext_attributes)
-{
-    (void)pZip;
-    memset(pDst, 0, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
-    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_SIG_OFS, MZ_ZIP_CENTRAL_DIR_HEADER_SIG);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_VERSION_NEEDED_OFS, method ? 20 : 0);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_BIT_FLAG_OFS, bit_flags);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_METHOD_OFS, method);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_TIME_OFS, dos_time);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_DATE_OFS, dos_date);
-    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_CRC32_OFS, uncomp_crc32);
-    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, MZ_MIN(comp_size, MZ_UINT32_MAX));
-    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, MZ_MIN(uncomp_size, MZ_UINT32_MAX));
-    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILENAME_LEN_OFS, filename_size);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_EXTRA_LEN_OFS, extra_size);
-    MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_COMMENT_LEN_OFS, comment_size);
-    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS, ext_attributes);
-    MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_LOCAL_HEADER_OFS, MZ_MIN(local_header_ofs, MZ_UINT32_MAX));
-    return MZ_TRUE;
-}
-
-static mz_bool mz_zip_writer_add_to_central_dir(mz_zip_archive *pZip, const char *pFilename, mz_uint16 filename_size,
-                                                const void *pExtra, mz_uint16 extra_size, const void *pComment, mz_uint16 comment_size,
-                                                mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32,
-                                                mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date,
-                                                mz_uint64 local_header_ofs, mz_uint32 ext_attributes,
-                                                const char *user_extra_data, mz_uint user_extra_data_len)
-{
-    mz_zip_internal_state *pState = pZip->m_pState;
-    mz_uint32 central_dir_ofs = (mz_uint32)pState->m_central_dir.m_size;
-    size_t orig_central_dir_size = pState->m_central_dir.m_size;
-    mz_uint8 central_dir_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
-
-    if (!pZip->m_pState->m_zip64)
-    {
-        if (local_header_ofs > 0xFFFFFFFF)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
-    }
-
-    /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
-    if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + extra_size + user_extra_data_len + comment_size) >= MZ_UINT32_MAX)
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
-
-    if (!mz_zip_writer_create_central_dir_header(pZip, central_dir_header, filename_size, (mz_uint16)(extra_size + user_extra_data_len), comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_header_ofs, ext_attributes))
-        return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-
-    if ((!mz_zip_array_push_back(pZip, &pState->m_central_dir, central_dir_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) ||
-        (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pFilename, filename_size)) ||
-        (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pExtra, extra_size)) ||
-        (!mz_zip_array_push_back(pZip, &pState->m_central_dir, user_extra_data, user_extra_data_len)) ||
-        (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pComment, comment_size)) ||
-        (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &central_dir_ofs, 1)))
-    {
-        /* Try to resize the central directory array back into its original state. */
-        mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
-        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-    }
-
-    return MZ_TRUE;
-}
-
-static mz_bool mz_zip_writer_validate_archive_name(const char *pArchive_name)
-{
-    /* Basic ZIP archive filename validity checks: Valid filenames cannot start with a forward slash, cannot contain a drive letter, and cannot use DOS-style backward slashes. */
-    if (*pArchive_name == '/')
-        return MZ_FALSE;
-
-    /* Making sure the name does not contain drive letters or DOS style backward slashes is the responsibility of the program using miniz*/
-
-    return MZ_TRUE;
-}
-
-static mz_uint mz_zip_writer_compute_padding_needed_for_file_alignment(mz_zip_archive *pZip)
-{
-    mz_uint32 n;
-    if (!pZip->m_file_offset_alignment)
-        return 0;
-    n = (mz_uint32)(pZip->m_archive_size & (pZip->m_file_offset_alignment - 1));
-    return (mz_uint)((pZip->m_file_offset_alignment - n) & (pZip->m_file_offset_alignment - 1));
-}
-
-static mz_bool mz_zip_writer_write_zeros(mz_zip_archive *pZip, mz_uint64 cur_file_ofs, mz_uint32 n)
-{
-    char buf[4096];
-    memset(buf, 0, MZ_MIN(sizeof(buf), n));
-    while (n)
-    {
-        mz_uint32 s = MZ_MIN(sizeof(buf), n);
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_file_ofs, buf, s) != s)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        cur_file_ofs += s;
-        n -= s;
-    }
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
-                                 mz_uint64 uncomp_size, mz_uint32 uncomp_crc32)
-{
-    return mz_zip_writer_add_mem_ex_v2(pZip, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, uncomp_size, uncomp_crc32, NULL, NULL, 0, NULL, 0);
-}
-
-mz_bool mz_zip_writer_add_mem_ex_v2(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size,
-                                    mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, MZ_TIME_T *last_modified,
-                                    const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len)
-{
-    mz_uint16 method = 0, dos_time = 0, dos_date = 0;
-    mz_uint level, ext_attributes = 0, num_alignment_padding_bytes;
-    mz_uint64 local_dir_header_ofs = pZip->m_archive_size, cur_archive_file_ofs = pZip->m_archive_size, comp_size = 0;
-    size_t archive_name_size;
-    mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
-    tdefl_compressor *pComp = NULL;
-    mz_bool store_data_uncompressed;
-    mz_zip_internal_state *pState;
-    mz_uint8 *pExtra_data = NULL;
-    mz_uint32 extra_size = 0;
-    mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
-    mz_uint16 bit_flags = 0;
-
-    if ((int)level_and_flags < 0)
-        level_and_flags = MZ_DEFAULT_LEVEL;
-
-    if (uncomp_size || (buf_size && !(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
-        bit_flags |= MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR;
-
-    if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME))
-        bit_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8;
-
-    level = level_and_flags & 0xF;
-    store_data_uncompressed = ((!level) || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA));
-
-    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || ((buf_size) && (!pBuf)) || (!pArchive_name) || ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    pState = pZip->m_pState;
-
-    if (pState->m_zip64)
-    {
-        if (pZip->m_total_files == MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-    }
-    else
-    {
-        if (pZip->m_total_files == MZ_UINT16_MAX)
-        {
-            pState->m_zip64 = MZ_TRUE;
-            /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */
-        }
-        if (((mz_uint64)buf_size > 0xFFFFFFFF) || (uncomp_size > 0xFFFFFFFF))
-        {
-            pState->m_zip64 = MZ_TRUE;
-            /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
-        }
-    }
-
-    if ((!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (uncomp_size))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (!mz_zip_writer_validate_archive_name(pArchive_name))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
-
-#ifndef MINIZ_NO_TIME
-    if (last_modified != NULL)
-    {
-        mz_zip_time_t_to_dos_time(*last_modified, &dos_time, &dos_date);
-    }
-    else
-    {
-        MZ_TIME_T cur_time;
-        time(&cur_time);
-        mz_zip_time_t_to_dos_time(cur_time, &dos_time, &dos_date);
-    }
-#endif /* #ifndef MINIZ_NO_TIME */
-
-	if (!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
-	{
-		uncomp_crc32 = (mz_uint32)mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, buf_size);
-		uncomp_size = buf_size;
-		if (uncomp_size <= 3)
-		{
-			level = 0;
-			store_data_uncompressed = MZ_TRUE;
-		}
-	}
-
-    archive_name_size = strlen(pArchive_name);
-    if (archive_name_size > MZ_UINT16_MAX)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
-
-    num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
-
-    /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
-    if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX)
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
-
-    if (!pState->m_zip64)
-    {
-        /* Bail early if the archive would obviously become too large */
-        if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size
-			+ MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + user_extra_data_len +
-			pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + user_extra_data_central_len
-			+ MZ_ZIP_DATA_DESCRIPTER_SIZE32) > 0xFFFFFFFF)
-        {
-            pState->m_zip64 = MZ_TRUE;
-            /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
-        }
-    }
-
-    if ((archive_name_size) && (pArchive_name[archive_name_size - 1] == '/'))
-    {
-        /* Set DOS Subdirectory attribute bit. */
-        ext_attributes |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG;
-
-        /* Subdirectories cannot contain data. */
-        if ((buf_size) || (uncomp_size))
-            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-    }
-
-    /* Try to do any allocations before writing to the archive, so if an allocation fails the file remains unmodified. (A good idea if we're doing an in-place modification.) */
-    if ((!mz_zip_array_ensure_room(pZip, &pState->m_central_dir, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + (pState->m_zip64 ? MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE : 0))) || (!mz_zip_array_ensure_room(pZip, &pState->m_central_dir_offsets, 1)))
-        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-    if ((!store_data_uncompressed) && (buf_size))
-    {
-        if (NULL == (pComp = (tdefl_compressor *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor))))
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-    }
-
-    if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes))
-    {
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-        return MZ_FALSE;
-    }
-
-    local_dir_header_ofs += num_alignment_padding_bytes;
-    if (pZip->m_file_offset_alignment)
-    {
-        MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == 0);
-    }
-    cur_archive_file_ofs += num_alignment_padding_bytes;
-
-    MZ_CLEAR_ARR(local_dir_header);
-
-    if (!store_data_uncompressed || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
-    {
-        method = MZ_DEFLATED;
-    }
-
-    if (pState->m_zip64)
-    {
-        if (uncomp_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX)
-        {
-            pExtra_data = extra_data;
-            extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
-                                                               (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
-        }
-
-        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, bit_flags, dos_time, dos_date))
-            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        cur_archive_file_ofs += sizeof(local_dir_header);
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
-        {
-            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-        }
-        cur_archive_file_ofs += archive_name_size;
-
-        if (pExtra_data != NULL)
-        {
-            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, extra_size) != extra_size)
-                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-            cur_archive_file_ofs += extra_size;
-        }
-    }
-    else
-    {
-        if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX))
-            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)user_extra_data_len, 0, 0, 0, method, bit_flags, dos_time, dos_date))
-            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        cur_archive_file_ofs += sizeof(local_dir_header);
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
-        {
-            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-        }
-        cur_archive_file_ofs += archive_name_size;
-    }
-
-	if (user_extra_data_len > 0)
-	{
-		if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, user_extra_data, user_extra_data_len) != user_extra_data_len)
-			return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-		cur_archive_file_ofs += user_extra_data_len;
-	}
-
-    if (store_data_uncompressed)
-    {
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pBuf, buf_size) != buf_size)
-        {
-            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-        }
-
-        cur_archive_file_ofs += buf_size;
-        comp_size = buf_size;
-    }
-    else if (buf_size)
-    {
-        mz_zip_writer_add_state state;
-
-        state.m_pZip = pZip;
-        state.m_cur_archive_file_ofs = cur_archive_file_ofs;
-        state.m_comp_size = 0;
-
-        if ((tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY) ||
-            (tdefl_compress_buffer(pComp, pBuf, buf_size, TDEFL_FINISH) != TDEFL_STATUS_DONE))
-        {
-            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-            return mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED);
-        }
-
-        comp_size = state.m_comp_size;
-        cur_archive_file_ofs = state.m_cur_archive_file_ofs;
-    }
-
-    pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-    pComp = NULL;
-
-    if (uncomp_size)
-    {
-        mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64];
-        mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32;
-
-        MZ_ASSERT(bit_flags & MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR);
-
-        MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID);
-        MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32);
-        if (pExtra_data == NULL)
-        {
-            if (comp_size > MZ_UINT32_MAX)
-                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-
-            MZ_WRITE_LE32(local_dir_footer + 8, comp_size);
-            MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size);
-        }
-        else
-        {
-            MZ_WRITE_LE64(local_dir_footer + 8, comp_size);
-            MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size);
-            local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64;
-        }
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_footer, local_dir_footer_size) != local_dir_footer_size)
-            return MZ_FALSE;
-
-        cur_archive_file_ofs += local_dir_footer_size;
-    }
-
-    if (pExtra_data != NULL)
-    {
-        extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
-                                                           (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
-    }
-
-    if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, (mz_uint16)extra_size, pComment,
-                                          comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_dir_header_ofs, ext_attributes,
-                                          user_extra_data_central, user_extra_data_central_len))
-        return MZ_FALSE;
-
-    pZip->m_total_files++;
-    pZip->m_archive_size = cur_archive_file_ofs;
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pArchive_name, mz_file_read_func read_callback, void* callback_opaque, mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
-                                const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len)
-{
-    mz_uint16 gen_flags;
-    mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes;
-    mz_uint16 method = 0, dos_time = 0, dos_date = 0, ext_attributes = 0;
-    mz_uint64 local_dir_header_ofs, cur_archive_file_ofs = pZip->m_archive_size, uncomp_size = 0, comp_size = 0;
-    size_t archive_name_size;
-    mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
-    mz_uint8 *pExtra_data = NULL;
-    mz_uint32 extra_size = 0;
-    mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
-    mz_zip_internal_state *pState;
-    mz_uint64 file_ofs = 0, cur_archive_header_file_ofs;
-
-    if ((int)level_and_flags < 0)
-        level_and_flags = MZ_DEFAULT_LEVEL;
-    level = level_and_flags & 0xF;
-
-    gen_flags = (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE) ? 0 : MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR;
-
-    if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME))
-        gen_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8;
-
-    /* Sanity checks */
-    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pArchive_name) || ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    pState = pZip->m_pState;
-
-    if ((!pState->m_zip64) && (max_size > MZ_UINT32_MAX))
-    {
-        /* Source file is too large for non-zip64 */
-        /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
-        pState->m_zip64 = MZ_TRUE;
-    }
-
-    /* We could support this, but why? */
-    if (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (!mz_zip_writer_validate_archive_name(pArchive_name))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
-
-    if (pState->m_zip64)
-    {
-        if (pZip->m_total_files == MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-    }
-    else
-    {
-        if (pZip->m_total_files == MZ_UINT16_MAX)
-        {
-            pState->m_zip64 = MZ_TRUE;
-            /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */
-        }
-    }
-
-    archive_name_size = strlen(pArchive_name);
-    if (archive_name_size > MZ_UINT16_MAX)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
-
-    num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
-
-    /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
-    if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX)
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
-
-    if (!pState->m_zip64)
-    {
-        /* Bail early if the archive would obviously become too large */
-        if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE
-			+ archive_name_size + comment_size + user_extra_data_len + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 1024
-			+ MZ_ZIP_DATA_DESCRIPTER_SIZE32 + user_extra_data_central_len) > 0xFFFFFFFF)
-        {
-            pState->m_zip64 = MZ_TRUE;
-            /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
-        }
-    }
-
-#ifndef MINIZ_NO_TIME
-    if (pFile_time)
-    {
-        mz_zip_time_t_to_dos_time(*pFile_time, &dos_time, &dos_date);
-    }
-#endif
-
-    if (max_size <= 3)
-        level = 0;
-
-    if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes))
-    {
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-    }
-
-    cur_archive_file_ofs += num_alignment_padding_bytes;
-    local_dir_header_ofs = cur_archive_file_ofs;
-
-    if (pZip->m_file_offset_alignment)
-    {
-        MZ_ASSERT((cur_archive_file_ofs & (pZip->m_file_offset_alignment - 1)) == 0);
-    }
-
-    if (max_size && level)
-    {
-        method = MZ_DEFLATED;
-    }
-
-    MZ_CLEAR_ARR(local_dir_header);
-    if (pState->m_zip64)
-    {
-        if (max_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX)
-        {
-            pExtra_data = extra_data;
-            if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)
-                extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
-                                                               (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL,
-                                                                (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
-            else
-                extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, NULL,
-                                                                   NULL,
-                                                                   (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
-        }
-
-        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, gen_flags, dos_time, dos_date))
-            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        cur_archive_file_ofs += sizeof(local_dir_header);
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
-        {
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-        }
-
-        cur_archive_file_ofs += archive_name_size;
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, extra_size) != extra_size)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        cur_archive_file_ofs += extra_size;
-    }
-    else
-    {
-        if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX))
-            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)user_extra_data_len, 0, 0, 0, method, gen_flags, dos_time, dos_date))
-            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        cur_archive_file_ofs += sizeof(local_dir_header);
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
-        {
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-        }
-
-        cur_archive_file_ofs += archive_name_size;
-    }
-
-    if (user_extra_data_len > 0)
-    {
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, user_extra_data, user_extra_data_len) != user_extra_data_len)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        cur_archive_file_ofs += user_extra_data_len;
-    }
-
-    if (max_size)
-    {
-        void *pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, MZ_ZIP_MAX_IO_BUF_SIZE);
-        if (!pRead_buf)
-        {
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        }
-
-        if (!level)
-        {
-            while (1)
-            {
-                size_t n = read_callback(callback_opaque, file_ofs, pRead_buf, MZ_ZIP_MAX_IO_BUF_SIZE);
-                if (n == 0)
-                    break;
-
-                if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size))
-                {
-                    pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-                }
-                if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pRead_buf, n) != n)
-                {
-                    pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-                }
-                file_ofs += n;
-                uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n);
-                cur_archive_file_ofs += n;
-            }
-            uncomp_size = file_ofs;
-            comp_size = uncomp_size;
-        }
-        else
-        {
-            mz_bool result = MZ_FALSE;
-            mz_zip_writer_add_state state;
-            tdefl_compressor *pComp = (tdefl_compressor *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor));
-            if (!pComp)
-            {
-                pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-            }
-
-            state.m_pZip = pZip;
-            state.m_cur_archive_file_ofs = cur_archive_file_ofs;
-            state.m_comp_size = 0;
-
-            if (tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY)
-            {
-                pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-                pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-            }
-
-            for (;;)
-            {
-                tdefl_status status;
-                tdefl_flush flush = TDEFL_NO_FLUSH;
-
-                size_t n = read_callback(callback_opaque, file_ofs, pRead_buf, MZ_ZIP_MAX_IO_BUF_SIZE);
-                if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size))
-                {
-                    mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-                    break;
-                }
-
-                file_ofs += n;
-                uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n);
-
-                if (pZip->m_pNeeds_keepalive != NULL && pZip->m_pNeeds_keepalive(pZip->m_pIO_opaque))
-                    flush = TDEFL_FULL_FLUSH;
-
-                if (n == 0)
-                    flush = TDEFL_FINISH;
-
-                status = tdefl_compress_buffer(pComp, pRead_buf, n, flush);
-                if (status == TDEFL_STATUS_DONE)
-                {
-                    result = MZ_TRUE;
-                    break;
-                }
-                else if (status != TDEFL_STATUS_OKAY)
-                {
-                    mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED);
-                    break;
-                }
-            }
-
-            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
-
-            if (!result)
-            {
-                pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-                return MZ_FALSE;
-            }
-
-            uncomp_size = file_ofs;
-            comp_size = state.m_comp_size;
-            cur_archive_file_ofs = state.m_cur_archive_file_ofs;
-        }
-
-        pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
-    }
-
-    if (!(level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE))
-    {
-        mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64];
-        mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32;
-
-        MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID);
-        MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32);
-        if (pExtra_data == NULL)
-        {
-            if (comp_size > MZ_UINT32_MAX)
-                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-
-            MZ_WRITE_LE32(local_dir_footer + 8, comp_size);
-            MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size);
-        }
-        else
-        {
-            MZ_WRITE_LE64(local_dir_footer + 8, comp_size);
-            MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size);
-            local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64;
-        }
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_footer, local_dir_footer_size) != local_dir_footer_size)
-            return MZ_FALSE;
-
-        cur_archive_file_ofs += local_dir_footer_size;
-    }
-
-    if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)
-    {
-        if (pExtra_data != NULL)
-        {
-            extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
-                                                               (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
-        }
-
-        if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header,
-                                                   (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len),
-                                                   (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : uncomp_size, 
-                                                    (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : comp_size,
-                                                   uncomp_crc32, method, gen_flags, dos_time, dos_date))
-            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
-
-        cur_archive_header_file_ofs = local_dir_header_ofs;
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        if (pExtra_data != NULL)
-        {
-            cur_archive_header_file_ofs += sizeof(local_dir_header);
-
-            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
-            {
-                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-            }
-
-            cur_archive_header_file_ofs += archive_name_size;
-
-            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, extra_data, extra_size) != extra_size)
-                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-            cur_archive_header_file_ofs += extra_size;
-        }
-    }
-
-    if (pExtra_data != NULL)
-    {
-        extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
-                                                           (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
-    }
-
-    if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, (mz_uint16)extra_size, pComment, comment_size,
-                                          uncomp_size, comp_size, uncomp_crc32, method, gen_flags, dos_time, dos_date, local_dir_header_ofs, ext_attributes,
-                                          user_extra_data_central, user_extra_data_central_len))
-        return MZ_FALSE;
-
-    pZip->m_total_files++;
-    pZip->m_archive_size = cur_archive_file_ofs;
-
-    return MZ_TRUE;
-}
-
-#ifndef MINIZ_NO_STDIO
-
-static size_t mz_file_read_func_stdio(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
-{
-	MZ_FILE *pSrc_file = (MZ_FILE *)pOpaque;
-	mz_int64 cur_ofs = MZ_FTELL64(pSrc_file);
-
-	if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pSrc_file, (mz_int64)file_ofs, SEEK_SET))))
-		return 0;
-
-	return MZ_FREAD(pBuf, 1, n, pSrc_file);
-}
-
-mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
-	const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len)
-{
-	return mz_zip_writer_add_read_buf_callback(pZip, pArchive_name, mz_file_read_func_stdio, pSrc_file, max_size, pFile_time, pComment, comment_size, level_and_flags,
-		user_extra_data, user_extra_data_len, user_extra_data_central, user_extra_data_central_len);
-}
-
-mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
-{
-    MZ_FILE *pSrc_file = NULL;
-    mz_uint64 uncomp_size = 0;
-    MZ_TIME_T file_modified_time;
-    MZ_TIME_T *pFile_time = NULL;
-    mz_bool status;
-
-    memset(&file_modified_time, 0, sizeof(file_modified_time));
-
-#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO)
-    pFile_time = &file_modified_time;
-    if (!mz_zip_get_file_modified_time(pSrc_filename, &file_modified_time))
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_STAT_FAILED);
-#endif
-
-    pSrc_file = MZ_FOPEN(pSrc_filename, "rb");
-    if (!pSrc_file)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
-
-    MZ_FSEEK64(pSrc_file, 0, SEEK_END);
-    uncomp_size = MZ_FTELL64(pSrc_file);
-    MZ_FSEEK64(pSrc_file, 0, SEEK_SET);
-
-    status = mz_zip_writer_add_cfile(pZip, pArchive_name, pSrc_file, uncomp_size, pFile_time, pComment, comment_size, level_and_flags, NULL, 0, NULL, 0);
-
-    MZ_FCLOSE(pSrc_file);
-
-    return status;
-}
-#endif /* #ifndef MINIZ_NO_STDIO */
-
-static mz_bool mz_zip_writer_update_zip64_extension_block(mz_zip_array *pNew_ext, mz_zip_archive *pZip, const mz_uint8 *pExt, mz_uint32 ext_len, mz_uint64 *pComp_size, mz_uint64 *pUncomp_size, mz_uint64 *pLocal_header_ofs, mz_uint32 *pDisk_start)
-{
-    /* + 64 should be enough for any new zip64 data */
-    if (!mz_zip_array_reserve(pZip, pNew_ext, ext_len + 64, MZ_FALSE))
-        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-    mz_zip_array_resize(pZip, pNew_ext, 0, MZ_FALSE);
-
-    if ((pUncomp_size) || (pComp_size) || (pLocal_header_ofs) || (pDisk_start))
-    {
-        mz_uint8 new_ext_block[64];
-        mz_uint8 *pDst = new_ext_block;
-        mz_write_le16(pDst, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID);
-        mz_write_le16(pDst + sizeof(mz_uint16), 0);
-        pDst += sizeof(mz_uint16) * 2;
-
-        if (pUncomp_size)
-        {
-            mz_write_le64(pDst, *pUncomp_size);
-            pDst += sizeof(mz_uint64);
-        }
-
-        if (pComp_size)
-        {
-            mz_write_le64(pDst, *pComp_size);
-            pDst += sizeof(mz_uint64);
-        }
-
-        if (pLocal_header_ofs)
-        {
-            mz_write_le64(pDst, *pLocal_header_ofs);
-            pDst += sizeof(mz_uint64);
-        }
-
-        if (pDisk_start)
-        {
-            mz_write_le32(pDst, *pDisk_start);
-            pDst += sizeof(mz_uint32);
-        }
-
-        mz_write_le16(new_ext_block + sizeof(mz_uint16), (mz_uint16)((pDst - new_ext_block) - sizeof(mz_uint16) * 2));
-
-        if (!mz_zip_array_push_back(pZip, pNew_ext, new_ext_block, pDst - new_ext_block))
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-    }
-
-    if ((pExt) && (ext_len))
-    {
-        mz_uint32 extra_size_remaining = ext_len;
-        const mz_uint8 *pExtra_data = pExt;
-
-        do
-        {
-            mz_uint32 field_id, field_data_size, field_total_size;
-
-            if (extra_size_remaining < (sizeof(mz_uint16) * 2))
-                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-            field_id = MZ_READ_LE16(pExtra_data);
-            field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
-            field_total_size = field_data_size + sizeof(mz_uint16) * 2;
-
-            if (field_total_size > extra_size_remaining)
-                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-            if (field_id != MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
-            {
-                if (!mz_zip_array_push_back(pZip, pNew_ext, pExtra_data, field_total_size))
-                    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-            }
-
-            pExtra_data += field_total_size;
-            extra_size_remaining -= field_total_size;
-        } while (extra_size_remaining);
-    }
-
-    return MZ_TRUE;
-}
-
-/* TODO: This func is now pretty freakin complex due to zip64, split it up? */
-mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index)
-{
-    mz_uint n, bit_flags, num_alignment_padding_bytes, src_central_dir_following_data_size;
-    mz_uint64 src_archive_bytes_remaining, local_dir_header_ofs;
-    mz_uint64 cur_src_file_ofs, cur_dst_file_ofs;
-    mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
-    mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
-    mz_uint8 new_central_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
-    size_t orig_central_dir_size;
-    mz_zip_internal_state *pState;
-    void *pBuf;
-    const mz_uint8 *pSrc_central_header;
-    mz_zip_archive_file_stat src_file_stat;
-    mz_uint32 src_filename_len, src_comment_len, src_ext_len;
-    mz_uint32 local_header_filename_size, local_header_extra_len;
-    mz_uint64 local_header_comp_size, local_header_uncomp_size;
-    mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE;
-
-    /* Sanity checks */
-    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pSource_zip->m_pRead))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    pState = pZip->m_pState;
-
-    /* Don't support copying files from zip64 archives to non-zip64, even though in some cases this is possible */
-    if ((pSource_zip->m_pState->m_zip64) && (!pZip->m_pState->m_zip64))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    /* Get pointer to the source central dir header and crack it */
-    if (NULL == (pSrc_central_header = mz_zip_get_cdh(pSource_zip, src_file_index)))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (MZ_READ_LE32(pSrc_central_header + MZ_ZIP_CDH_SIG_OFS) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    src_filename_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-    src_comment_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_COMMENT_LEN_OFS);
-    src_ext_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS);
-    src_central_dir_following_data_size = src_filename_len + src_ext_len + src_comment_len;
-
-    /* TODO: We don't support central dir's >= MZ_UINT32_MAX bytes right now (+32 fudge factor in case we need to add more extra data) */
-    if ((pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size + 32) >= MZ_UINT32_MAX)
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
-
-    num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
-
-    if (!pState->m_zip64)
-    {
-        if (pZip->m_total_files == MZ_UINT16_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-    }
-    else
-    {
-        /* TODO: Our zip64 support still has some 32-bit limits that may not be worth fixing. */
-        if (pZip->m_total_files == MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-    }
-
-    if (!mz_zip_file_stat_internal(pSource_zip, src_file_index, pSrc_central_header, &src_file_stat, NULL))
-        return MZ_FALSE;
-
-    cur_src_file_ofs = src_file_stat.m_local_header_ofs;
-    cur_dst_file_ofs = pZip->m_archive_size;
-
-    /* Read the source archive's local dir header */
-    if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-
-    if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-
-    cur_src_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE;
-
-    /* Compute the total size we need to copy (filename+extra data+compressed data) */
-    local_header_filename_size = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS);
-    local_header_extra_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
-    local_header_comp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS);
-    local_header_uncomp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS);
-    src_archive_bytes_remaining = src_file_stat.m_comp_size + local_header_filename_size + local_header_extra_len ;
-
-    /* Try to find a zip64 extended information field */
-    if ((local_header_extra_len) && ((local_header_comp_size == MZ_UINT32_MAX) || (local_header_uncomp_size == MZ_UINT32_MAX)))
-    {
-        mz_zip_array file_data_array;
-        const mz_uint8 *pExtra_data;
-        mz_uint32 extra_size_remaining = local_header_extra_len;
-
-        mz_zip_array_init(&file_data_array, 1);
-        if (!mz_zip_array_resize(pZip, &file_data_array, local_header_extra_len, MZ_FALSE))
-        {
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        }
-
-        if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, src_file_stat.m_local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_size, file_data_array.m_p, local_header_extra_len) != local_header_extra_len)
-        {
-            mz_zip_array_clear(pZip, &file_data_array);
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-        }
-
-        pExtra_data = (const mz_uint8 *)file_data_array.m_p;
-
-        do
-        {
-            mz_uint32 field_id, field_data_size, field_total_size;
-
-            if (extra_size_remaining < (sizeof(mz_uint16) * 2))
-            {
-                mz_zip_array_clear(pZip, &file_data_array);
-                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-            }
-
-            field_id = MZ_READ_LE16(pExtra_data);
-            field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
-            field_total_size = field_data_size + sizeof(mz_uint16) * 2;
-
-            if (field_total_size > extra_size_remaining)
-            {
-                mz_zip_array_clear(pZip, &file_data_array);
-                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-            }
-
-            if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
-            {
-                const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32);
-
-                if (field_data_size < sizeof(mz_uint64) * 2)
-                {
-                    mz_zip_array_clear(pZip, &file_data_array);
-                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
-                }
-
-                local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data);
-                local_header_comp_size = MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64)); /* may be 0 if there's a descriptor */
-
-                found_zip64_ext_data_in_ldir = MZ_TRUE;
-                break;
-            }
-
-            pExtra_data += field_total_size;
-            extra_size_remaining -= field_total_size;
-        } while (extra_size_remaining);
-
-        mz_zip_array_clear(pZip, &file_data_array);
-    }
-
-    if (!pState->m_zip64)
-    {
-        /* Try to detect if the new archive will most likely wind up too big and bail early (+(sizeof(mz_uint32) * 4) is for the optional descriptor which could be present, +64 is a fudge factor). */
-        /* We also check when the archive is finalized so this doesn't need to be perfect. */
-        mz_uint64 approx_new_archive_size = cur_dst_file_ofs + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + src_archive_bytes_remaining + (sizeof(mz_uint32) * 4) +
-                                            pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 64;
-
-        if (approx_new_archive_size >= MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-    }
-
-    /* Write dest archive padding */
-    if (!mz_zip_writer_write_zeros(pZip, cur_dst_file_ofs, num_alignment_padding_bytes))
-        return MZ_FALSE;
-
-    cur_dst_file_ofs += num_alignment_padding_bytes;
-
-    local_dir_header_ofs = cur_dst_file_ofs;
-    if (pZip->m_file_offset_alignment)
-    {
-        MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == 0);
-    }
-
-    /* The original zip's local header+ext block doesn't change, even with zip64, so we can just copy it over to the dest zip */
-    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-    cur_dst_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE;
-
-    /* Copy over the source archive bytes to the dest archive, also ensure we have enough buf space to handle optional data descriptor */
-    if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)MZ_MAX(32U, MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, src_archive_bytes_remaining)))))
-        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-    while (src_archive_bytes_remaining)
-    {
-        n = (mz_uint)MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, src_archive_bytes_remaining);
-        if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, n) != n)
-        {
-            pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-        }
-        cur_src_file_ofs += n;
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n)
-        {
-            pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-        }
-        cur_dst_file_ofs += n;
-
-        src_archive_bytes_remaining -= n;
-    }
-
-    /* Now deal with the optional data descriptor */
-    bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS);
-    if (bit_flags & 8)
-    {
-        /* Copy data descriptor */
-        if ((pSource_zip->m_pState->m_zip64) || (found_zip64_ext_data_in_ldir))
-        {
-            /* src is zip64, dest must be zip64 */
-
-            /* name			uint32_t's */
-            /* id				1 (optional in zip64?) */
-            /* crc			1 */
-            /* comp_size	2 */
-            /* uncomp_size 2 */
-            if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, (sizeof(mz_uint32) * 6)) != (sizeof(mz_uint32) * 6))
-            {
-                pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-                return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-            }
-
-            n = sizeof(mz_uint32) * ((MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID) ? 6 : 5);
-        }
-        else
-        {
-            /* src is NOT zip64 */
-            mz_bool has_id;
-
-            if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, sizeof(mz_uint32) * 4) != sizeof(mz_uint32) * 4)
-            {
-                pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-                return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
-            }
-
-            has_id = (MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID);
-
-            if (pZip->m_pState->m_zip64)
-            {
-                /* dest is zip64, so upgrade the data descriptor */
-                const mz_uint8 *pSrc_descriptor = (const mz_uint8 *)pBuf + (has_id ? sizeof(mz_uint32) : 0);
-                const mz_uint32 src_crc32 = MZ_READ_LE32(pSrc_descriptor);
-                const mz_uint64 src_comp_size = MZ_READ_LE32(pSrc_descriptor + sizeof(mz_uint32));
-                const mz_uint64 src_uncomp_size = MZ_READ_LE32(pSrc_descriptor + 2*sizeof(mz_uint32));
-
-                mz_write_le32((mz_uint8 *)pBuf, MZ_ZIP_DATA_DESCRIPTOR_ID);
-                mz_write_le32((mz_uint8 *)pBuf + sizeof(mz_uint32) * 1, src_crc32);
-                mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 2, src_comp_size);
-                mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 4, src_uncomp_size);
-
-                n = sizeof(mz_uint32) * 6;
-            }
-            else
-            {
-                /* dest is NOT zip64, just copy it as-is */
-                n = sizeof(mz_uint32) * (has_id ? 4 : 3);
-            }
-        }
-
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n)
-        {
-            pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-        }
-
-        cur_src_file_ofs += n;
-        cur_dst_file_ofs += n;
-    }
-    pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
-
-    /* Finally, add the new central dir header */
-    orig_central_dir_size = pState->m_central_dir.m_size;
-
-    memcpy(new_central_header, pSrc_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
-
-    if (pState->m_zip64)
-    {
-        /* This is the painful part: We need to write a new central dir header + ext block with updated zip64 fields, and ensure the old fields (if any) are not included. */
-        const mz_uint8 *pSrc_ext = pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len;
-        mz_zip_array new_ext_block;
-
-        mz_zip_array_init(&new_ext_block, sizeof(mz_uint8));
-
-        MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, MZ_UINT32_MAX);
-        MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, MZ_UINT32_MAX);
-        MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, MZ_UINT32_MAX);
-
-        if (!mz_zip_writer_update_zip64_extension_block(&new_ext_block, pZip, pSrc_ext, src_ext_len, &src_file_stat.m_comp_size, &src_file_stat.m_uncomp_size, &local_dir_header_ofs, NULL))
-        {
-            mz_zip_array_clear(pZip, &new_ext_block);
-            return MZ_FALSE;
-        }
-
-        MZ_WRITE_LE16(new_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS, new_ext_block.m_size);
-
-        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
-        {
-            mz_zip_array_clear(pZip, &new_ext_block);
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        }
-
-        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, src_filename_len))
-        {
-            mz_zip_array_clear(pZip, &new_ext_block);
-            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        }
-
-        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_ext_block.m_p, new_ext_block.m_size))
-        {
-            mz_zip_array_clear(pZip, &new_ext_block);
-            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        }
-
-        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len + src_ext_len, src_comment_len))
-        {
-            mz_zip_array_clear(pZip, &new_ext_block);
-            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        }
-
-        mz_zip_array_clear(pZip, &new_ext_block);
-    }
-    else
-    {
-        /* sanity checks */
-        if (cur_dst_file_ofs > MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-
-        if (local_dir_header_ofs >= MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
-
-        MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, local_dir_header_ofs);
-
-        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-
-        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, src_central_dir_following_data_size))
-        {
-            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
-            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-        }
-    }
-
-    /* This shouldn't trigger unless we screwed up during the initial sanity checks */
-    if (pState->m_central_dir.m_size >= MZ_UINT32_MAX)
-    {
-        /* TODO: Support central dirs >= 32-bits in size */
-        mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
-        return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
-    }
-
-    n = (mz_uint32)orig_central_dir_size;
-    if (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &n, 1))
-    {
-        mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
-        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
-    }
-
-    pZip->m_total_files++;
-    pZip->m_archive_size = cur_dst_file_ofs;
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip)
-{
-    mz_zip_internal_state *pState;
-    mz_uint64 central_dir_ofs, central_dir_size;
-    mz_uint8 hdr[256];
-
-    if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    pState = pZip->m_pState;
-
-    if (pState->m_zip64)
-    {
-        if ((mz_uint64)pState->m_central_dir.m_size >= MZ_UINT32_MAX)
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-    }
-    else
-    {
-        if ((pZip->m_total_files > MZ_UINT16_MAX) || ((pZip->m_archive_size + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX))
-            return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
-    }
-
-    central_dir_ofs = 0;
-    central_dir_size = 0;
-    if (pZip->m_total_files)
-    {
-        /* Write central directory */
-        central_dir_ofs = pZip->m_archive_size;
-        central_dir_size = pState->m_central_dir.m_size;
-        pZip->m_central_directory_file_ofs = central_dir_ofs;
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, central_dir_ofs, pState->m_central_dir.m_p, (size_t)central_dir_size) != central_dir_size)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        pZip->m_archive_size += central_dir_size;
-    }
-
-    if (pState->m_zip64)
-    {
-        /* Write zip64 end of central directory header */
-        mz_uint64 rel_ofs_to_zip64_ecdr = pZip->m_archive_size;
-
-        MZ_CLEAR_ARR(hdr);
-        MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDH_SIG_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG);
-        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - sizeof(mz_uint32) - sizeof(mz_uint64));
-        MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS, 0x031E); /* TODO: always Unix */
-        MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_NEEDED_OFS, 0x002D);
-        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, pZip->m_total_files);
-        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS, pZip->m_total_files);
-        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_SIZE_OFS, central_dir_size);
-        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_OFS_OFS, central_dir_ofs);
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE;
-
-        /* Write zip64 end of central directory locator */
-        MZ_CLEAR_ARR(hdr);
-        MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_SIG_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG);
-        MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS, rel_ofs_to_zip64_ecdr);
-        MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS, 1);
-        if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) != MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE)
-            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-        pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE;
-    }
-
-    /* Write end of central directory record */
-    MZ_CLEAR_ARR(hdr);
-    MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_SIG_OFS, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG);
-    MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files));
-    MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS, MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files));
-    MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_SIZE_OFS, MZ_MIN(MZ_UINT32_MAX, central_dir_size));
-    MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_OFS_OFS, MZ_MIN(MZ_UINT32_MAX, central_dir_ofs));
-
-    if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
-
-#ifndef MINIZ_NO_STDIO
-    if ((pState->m_pFile) && (MZ_FFLUSH(pState->m_pFile) == EOF))
-        return mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
-#endif /* #ifndef MINIZ_NO_STDIO */
-
-    pZip->m_archive_size += MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE;
-
-    pZip->m_zip_mode = MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED;
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf, size_t *pSize)
-{
-    if ((!ppBuf) || (!pSize))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    *ppBuf = NULL;
-    *pSize = 0;
-
-    if ((!pZip) || (!pZip->m_pState))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (pZip->m_pWrite != mz_zip_heap_write_func)
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    if (!mz_zip_writer_finalize_archive(pZip))
-        return MZ_FALSE;
-
-    *ppBuf = pZip->m_pState->m_pMem;
-    *pSize = pZip->m_pState->m_mem_size;
-    pZip->m_pState->m_pMem = NULL;
-    pZip->m_pState->m_mem_size = pZip->m_pState->m_mem_capacity = 0;
-
-    return MZ_TRUE;
-}
-
-mz_bool mz_zip_writer_end(mz_zip_archive *pZip)
-{
-    return mz_zip_writer_end_internal(pZip, MZ_TRUE);
-}
-
-#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
-{
-    return mz_zip_add_mem_to_archive_file_in_place_v2(pZip_filename, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, NULL);
-}
-
-mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_zip_error *pErr)
-{
-    mz_bool status, created_new_archive = MZ_FALSE;
-    mz_zip_archive zip_archive;
-    struct MZ_FILE_STAT_STRUCT file_stat;
-    mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
-
-    mz_zip_zero_struct(&zip_archive);
-    if ((int)level_and_flags < 0)
-        level_and_flags = MZ_DEFAULT_LEVEL;
-
-    if ((!pZip_filename) || (!pArchive_name) || ((buf_size) && (!pBuf)) || ((comment_size) && (!pComment)) || ((level_and_flags & 0xF) > MZ_UBER_COMPRESSION))
-    {
-        if (pErr)
-            *pErr = MZ_ZIP_INVALID_PARAMETER;
-        return MZ_FALSE;
-    }
-
-    if (!mz_zip_writer_validate_archive_name(pArchive_name))
-    {
-        if (pErr)
-            *pErr = MZ_ZIP_INVALID_FILENAME;
-        return MZ_FALSE;
-    }
-
-    /* Important: The regular non-64 bit version of stat() can fail here if the file is very large, which could cause the archive to be overwritten. */
-    /* So be sure to compile with _LARGEFILE64_SOURCE 1 */
-    if (MZ_FILE_STAT(pZip_filename, &file_stat) != 0)
-    {
-        /* Create a new archive. */
-        if (!mz_zip_writer_init_file_v2(&zip_archive, pZip_filename, 0, level_and_flags))
-        {
-            if (pErr)
-                *pErr = zip_archive.m_last_error;
-            return MZ_FALSE;
-        }
-
-        created_new_archive = MZ_TRUE;
-    }
-    else
-    {
-        /* Append to an existing archive. */
-        if (!mz_zip_reader_init_file_v2(&zip_archive, pZip_filename, level_and_flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0))
-        {
-            if (pErr)
-                *pErr = zip_archive.m_last_error;
-            return MZ_FALSE;
-        }
-
-        if (!mz_zip_writer_init_from_reader_v2(&zip_archive, pZip_filename, level_and_flags))
-        {
-            if (pErr)
-                *pErr = zip_archive.m_last_error;
-
-            mz_zip_reader_end_internal(&zip_archive, MZ_FALSE);
-
-            return MZ_FALSE;
-        }
-    }
-
-    status = mz_zip_writer_add_mem_ex(&zip_archive, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, 0, 0);
-    actual_err = zip_archive.m_last_error;
-
-    /* Always finalize, even if adding failed for some reason, so we have a valid central directory. (This may not always succeed, but we can try.) */
-    if (!mz_zip_writer_finalize_archive(&zip_archive))
-    {
-        if (!actual_err)
-            actual_err = zip_archive.m_last_error;
-
-        status = MZ_FALSE;
-    }
-
-    if (!mz_zip_writer_end_internal(&zip_archive, status))
-    {
-        if (!actual_err)
-            actual_err = zip_archive.m_last_error;
-
-        status = MZ_FALSE;
-    }
-
-    if ((!status) && (created_new_archive))
-    {
-        /* It's a new archive and something went wrong, so just delete it. */
-        int ignoredStatus = MZ_DELETE_FILE(pZip_filename);
-        (void)ignoredStatus;
-    }
-
-    if (pErr)
-        *pErr = actual_err;
-
-    return status;
-}
-
-void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, const char *pArchive_name, const char *pComment, size_t *pSize, mz_uint flags, mz_zip_error *pErr)
-{
-    mz_uint32 file_index;
-    mz_zip_archive zip_archive;
-    void *p = NULL;
-
-    if (pSize)
-        *pSize = 0;
-
-    if ((!pZip_filename) || (!pArchive_name))
-    {
-        if (pErr)
-            *pErr = MZ_ZIP_INVALID_PARAMETER;
-
-        return NULL;
-    }
-
-    mz_zip_zero_struct(&zip_archive);
-    if (!mz_zip_reader_init_file_v2(&zip_archive, pZip_filename, flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0))
-    {
-        if (pErr)
-            *pErr = zip_archive.m_last_error;
-
-        return NULL;
-    }
-
-    if (mz_zip_reader_locate_file_v2(&zip_archive, pArchive_name, pComment, flags, &file_index))
-    {
-        p = mz_zip_reader_extract_to_heap(&zip_archive, file_index, pSize, flags);
-    }
-
-    mz_zip_reader_end_internal(&zip_archive, p != NULL);
-
-    if (pErr)
-        *pErr = zip_archive.m_last_error;
-
-    return p;
-}
-
-void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint flags)
-{
-    return mz_zip_extract_archive_file_to_heap_v2(pZip_filename, pArchive_name, NULL, pSize, flags, NULL);
-}
-
-#endif /* #ifndef MINIZ_NO_STDIO */
-
-#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */
-
-/* ------------------- Misc utils */
-
-mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip)
-{
-    return pZip ? pZip->m_zip_mode : MZ_ZIP_MODE_INVALID;
-}
-
-mz_zip_type mz_zip_get_type(mz_zip_archive *pZip)
-{
-    return pZip ? pZip->m_zip_type : MZ_ZIP_TYPE_INVALID;
-}
-
-mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num)
-{
-    mz_zip_error prev_err;
-
-    if (!pZip)
-        return MZ_ZIP_INVALID_PARAMETER;
-
-    prev_err = pZip->m_last_error;
-
-    pZip->m_last_error = err_num;
-    return prev_err;
-}
-
-mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip)
-{
-    if (!pZip)
-        return MZ_ZIP_INVALID_PARAMETER;
-
-    return pZip->m_last_error;
-}
-
-mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip)
-{
-    return mz_zip_set_last_error(pZip, MZ_ZIP_NO_ERROR);
-}
-
-mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip)
-{
-    mz_zip_error prev_err;
-
-    if (!pZip)
-        return MZ_ZIP_INVALID_PARAMETER;
-
-    prev_err = pZip->m_last_error;
-
-    pZip->m_last_error = MZ_ZIP_NO_ERROR;
-    return prev_err;
-}
-
-const char *mz_zip_get_error_string(mz_zip_error mz_err)
-{
-    switch (mz_err)
-    {
-        case MZ_ZIP_NO_ERROR:
-            return "no error";
-        case MZ_ZIP_UNDEFINED_ERROR:
-            return "undefined error";
-        case MZ_ZIP_TOO_MANY_FILES:
-            return "too many files";
-        case MZ_ZIP_FILE_TOO_LARGE:
-            return "file too large";
-        case MZ_ZIP_UNSUPPORTED_METHOD:
-            return "unsupported method";
-        case MZ_ZIP_UNSUPPORTED_ENCRYPTION:
-            return "unsupported encryption";
-        case MZ_ZIP_UNSUPPORTED_FEATURE:
-            return "unsupported feature";
-        case MZ_ZIP_FAILED_FINDING_CENTRAL_DIR:
-            return "failed finding central directory";
-        case MZ_ZIP_NOT_AN_ARCHIVE:
-            return "not a ZIP archive";
-        case MZ_ZIP_INVALID_HEADER_OR_CORRUPTED:
-            return "invalid header or archive is corrupted";
-        case MZ_ZIP_UNSUPPORTED_MULTIDISK:
-            return "unsupported multidisk archive";
-        case MZ_ZIP_DECOMPRESSION_FAILED:
-            return "decompression failed or archive is corrupted";
-        case MZ_ZIP_COMPRESSION_FAILED:
-            return "compression failed";
-        case MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE:
-            return "unexpected decompressed size";
-        case MZ_ZIP_CRC_CHECK_FAILED:
-            return "CRC-32 check failed";
-        case MZ_ZIP_UNSUPPORTED_CDIR_SIZE:
-            return "unsupported central directory size";
-        case MZ_ZIP_ALLOC_FAILED:
-            return "allocation failed";
-        case MZ_ZIP_FILE_OPEN_FAILED:
-            return "file open failed";
-        case MZ_ZIP_FILE_CREATE_FAILED:
-            return "file create failed";
-        case MZ_ZIP_FILE_WRITE_FAILED:
-            return "file write failed";
-        case MZ_ZIP_FILE_READ_FAILED:
-            return "file read failed";
-        case MZ_ZIP_FILE_CLOSE_FAILED:
-            return "file close failed";
-        case MZ_ZIP_FILE_SEEK_FAILED:
-            return "file seek failed";
-        case MZ_ZIP_FILE_STAT_FAILED:
-            return "file stat failed";
-        case MZ_ZIP_INVALID_PARAMETER:
-            return "invalid parameter";
-        case MZ_ZIP_INVALID_FILENAME:
-            return "invalid filename";
-        case MZ_ZIP_BUF_TOO_SMALL:
-            return "buffer too small";
-        case MZ_ZIP_INTERNAL_ERROR:
-            return "internal error";
-        case MZ_ZIP_FILE_NOT_FOUND:
-            return "file not found";
-        case MZ_ZIP_ARCHIVE_TOO_LARGE:
-            return "archive is too large";
-        case MZ_ZIP_VALIDATION_FAILED:
-            return "validation failed";
-        case MZ_ZIP_WRITE_CALLBACK_FAILED:
-            return "write callback failed";
-	case MZ_ZIP_TOTAL_ERRORS:
-            return "total errors";
-        default:
-            break;
-    }
-
-    return "unknown error";
-}
-
-/* Note: Just because the archive is not zip64 doesn't necessarily mean it doesn't have Zip64 extended information extra field, argh. */
-mz_bool mz_zip_is_zip64(mz_zip_archive *pZip)
-{
-    if ((!pZip) || (!pZip->m_pState))
-        return MZ_FALSE;
-
-    return pZip->m_pState->m_zip64;
-}
-
-size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip)
-{
-    if ((!pZip) || (!pZip->m_pState))
-        return 0;
-
-    return pZip->m_pState->m_central_dir.m_size;
-}
-
-mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip)
-{
-    return pZip ? pZip->m_total_files : 0;
-}
-
-mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip)
-{
-    if (!pZip)
-        return 0;
-    return pZip->m_archive_size;
-}
-
-mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip)
-{
-    if ((!pZip) || (!pZip->m_pState))
-        return 0;
-    return pZip->m_pState->m_file_archive_start_ofs;
-}
-
-MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip)
-{
-    if ((!pZip) || (!pZip->m_pState))
-        return 0;
-    return pZip->m_pState->m_pFile;
-}
-
-size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs, void *pBuf, size_t n)
-{
-    if ((!pZip) || (!pZip->m_pState) || (!pBuf) || (!pZip->m_pRead))
-        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-
-    return pZip->m_pRead(pZip->m_pIO_opaque, file_ofs, pBuf, n);
-}
-
-mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size)
-{
-    mz_uint n;
-    const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
-    if (!p)
-    {
-        if (filename_buf_size)
-            pFilename[0] = '\0';
-        mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
-        return 0;
-    }
-    n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
-    if (filename_buf_size)
-    {
-        n = MZ_MIN(n, filename_buf_size - 1);
-        memcpy(pFilename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n);
-        pFilename[n] = '\0';
-    }
-    return n + 1;
-}
-
-mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat)
-{
-    return mz_zip_file_stat_internal(pZip, file_index, mz_zip_get_cdh(pZip, file_index), pStat, NULL);
-}
-
-mz_bool mz_zip_end(mz_zip_archive *pZip)
-{
-    if (!pZip)
-        return MZ_FALSE;
-
-    if (pZip->m_zip_mode == MZ_ZIP_MODE_READING)
-        return mz_zip_reader_end(pZip);
-#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-    else if ((pZip->m_zip_mode == MZ_ZIP_MODE_WRITING) || (pZip->m_zip_mode == MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED))
-        return mz_zip_writer_end(pZip);
-#endif
-
-    return MZ_FALSE;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*#ifndef MINIZ_NO_ARCHIVE_APIS*/
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/miniz.h b/contrib/tinyusdz/tinyusdz_repo/src/external/miniz.h
deleted file mode 100644
index 9fcfffcc8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/miniz.h
+++ /dev/null
@@ -1,1422 +0,0 @@
-#ifndef MINIZ_EXPORT
-#define MINIZ_EXPORT
-#endif
-/* miniz.c 3.0.0 - public domain deflate/inflate, zlib-subset, ZIP reading/writing/appending, PNG writing
-   See "unlicense" statement at the end of this file.
-   Rich Geldreich <richgel99@gmail.com>, last updated Oct. 13, 2013
-   Implements RFC 1950: http://www.ietf.org/rfc/rfc1950.txt and RFC 1951: http://www.ietf.org/rfc/rfc1951.txt
-
-   Most API's defined in miniz.c are optional. For example, to disable the archive related functions just define
-   MINIZ_NO_ARCHIVE_APIS, or to get rid of all stdio usage define MINIZ_NO_STDIO (see the list below for more macros).
-
-   * Low-level Deflate/Inflate implementation notes:
-
-     Compression: Use the "tdefl" API's. The compressor supports raw, static, and dynamic blocks, lazy or
-     greedy parsing, match length filtering, RLE-only, and Huffman-only streams. It performs and compresses
-     approximately as well as zlib.
-
-     Decompression: Use the "tinfl" API's. The entire decompressor is implemented as a single function
-     coroutine: see tinfl_decompress(). It supports decompression into a 32KB (or larger power of 2) wrapping buffer, or into a memory
-     block large enough to hold the entire file.
-
-     The low-level tdefl/tinfl API's do not make any use of dynamic memory allocation.
-
-   * zlib-style API notes:
-
-     miniz.c implements a fairly large subset of zlib. There's enough functionality present for it to be a drop-in
-     zlib replacement in many apps:
-        The z_stream struct, optional memory allocation callbacks
-        deflateInit/deflateInit2/deflate/deflateReset/deflateEnd/deflateBound
-        inflateInit/inflateInit2/inflate/inflateReset/inflateEnd
-        compress, compress2, compressBound, uncompress
-        CRC-32, Adler-32 - Using modern, minimal code size, CPU cache friendly routines.
-        Supports raw deflate streams or standard zlib streams with adler-32 checking.
-
-     Limitations:
-      The callback API's are not implemented yet. No support for gzip headers or zlib static dictionaries.
-      I've tried to closely emulate zlib's various flavors of stream flushing and return status codes, but
-      there are no guarantees that miniz.c pulls this off perfectly.
-
-   * PNG writing: See the tdefl_write_image_to_png_file_in_memory() function, originally written by
-     Alex Evans. Supports 1-4 bytes/pixel images.
-
-   * ZIP archive API notes:
-
-     The ZIP archive API's where designed with simplicity and efficiency in mind, with just enough abstraction to
-     get the job done with minimal fuss. There are simple API's to retrieve file information, read files from
-     existing archives, create new archives, append new files to existing archives, or clone archive data from
-     one archive to another. It supports archives located in memory or the heap, on disk (using stdio.h),
-     or you can specify custom file read/write callbacks.
-
-     - Archive reading: Just call this function to read a single file from a disk archive:
-
-      void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name,
-        size_t *pSize, mz_uint zip_flags);
-
-     For more complex cases, use the "mz_zip_reader" functions. Upon opening an archive, the entire central
-     directory is located and read as-is into memory, and subsequent file access only occurs when reading individual files.
-
-     - Archives file scanning: The simple way is to use this function to scan a loaded archive for a specific file:
-
-     int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags);
-
-     The locate operation can optionally check file comments too, which (as one example) can be used to identify
-     multiple versions of the same file in an archive. This function uses a simple linear search through the central
-     directory, so it's not very fast.
-
-     Alternately, you can iterate through all the files in an archive (using mz_zip_reader_get_num_files()) and
-     retrieve detailed info on each file by calling mz_zip_reader_file_stat().
-
-     - Archive creation: Use the "mz_zip_writer" functions. The ZIP writer immediately writes compressed file data
-     to disk and builds an exact image of the central directory in memory. The central directory image is written
-     all at once at the end of the archive file when the archive is finalized.
-
-     The archive writer can optionally align each file's local header and file data to any power of 2 alignment,
-     which can be useful when the archive will be read from optical media. Also, the writer supports placing
-     arbitrary data blobs at the very beginning of ZIP archives. Archives written using either feature are still
-     readable by any ZIP tool.
-
-     - Archive appending: The simple way to add a single file to an archive is to call this function:
-
-      mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name,
-        const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
-
-     The archive will be created if it doesn't already exist, otherwise it'll be appended to.
-     Note the appending is done in-place and is not an atomic operation, so if something goes wrong
-     during the operation it's possible the archive could be left without a central directory (although the local
-     file headers and file data will be fine, so the archive will be recoverable).
-
-     For more complex archive modification scenarios:
-     1. The safest way is to use a mz_zip_reader to read the existing archive, cloning only those bits you want to
-     preserve into a new archive using using the mz_zip_writer_add_from_zip_reader() function (which compiles the
-     compressed file data as-is). When you're done, delete the old archive and rename the newly written archive, and
-     you're done. This is safe but requires a bunch of temporary disk space or heap memory.
-
-     2. Or, you can convert an mz_zip_reader in-place to an mz_zip_writer using mz_zip_writer_init_from_reader(),
-     append new files as needed, then finalize the archive which will write an updated central directory to the
-     original archive. (This is basically what mz_zip_add_mem_to_archive_file_in_place() does.) There's a
-     possibility that the archive's central directory could be lost with this method if anything goes wrong, though.
-
-     - ZIP archive support limitations:
-     No spanning support. Extraction functions can only handle unencrypted, stored or deflated files.
-     Requires streams capable of seeking.
-
-   * This is a header file library, like stb_image.c. To get only a header file, either cut and paste the
-     below header, or create miniz.h, #define MINIZ_HEADER_FILE_ONLY, and then include miniz.c from it.
-
-   * Important: For best perf. be sure to customize the below macros for your target platform:
-     #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
-     #define MINIZ_LITTLE_ENDIAN 1
-     #define MINIZ_HAS_64BIT_REGISTERS 1
-
-   * On platforms using glibc, Be sure to "#define _LARGEFILE64_SOURCE 1" before including miniz.c to ensure miniz
-     uses the 64-bit variants: fopen64(), stat64(), etc. Otherwise you won't be able to process large files
-     (i.e. 32-bit stat() fails for me on files > 0x7FFFFFFF bytes).
-*/
-#pragma once
-
-
-
-/* Defines to completely disable specific portions of miniz.c: 
-   If all macros here are defined the only functionality remaining will be CRC-32 and adler-32. */
-
-/* Define MINIZ_NO_STDIO to disable all usage and any functions which rely on stdio for file I/O. */
-/*#define MINIZ_NO_STDIO */
-
-/* If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able to get the current time, or */
-/* get/set file times, and the C run-time funcs that get/set times won't be called. */
-/* The current downside is the times written to your archives will be from 1979. */
-/*#define MINIZ_NO_TIME */
-
-/* Define MINIZ_NO_DEFLATE_APIS to disable all compression API's. */
-/*#define MINIZ_NO_DEFLATE_APIS */
-
-/* Define MINIZ_NO_INFLATE_APIS to disable all decompression API's. */
-/*#define MINIZ_NO_INFLATE_APIS */
-
-/* Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. */
-/*#define MINIZ_NO_ARCHIVE_APIS */
-
-/* Define MINIZ_NO_ARCHIVE_WRITING_APIS to disable all writing related ZIP archive API's. */
-/*#define MINIZ_NO_ARCHIVE_WRITING_APIS */
-
-/* Define MINIZ_NO_ZLIB_APIS to remove all ZLIB-style compression/decompression API's. */
-/*#define MINIZ_NO_ZLIB_APIS */
-
-/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */
-/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
-
-/* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc. 
-   Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc
-   callbacks to the zlib and archive API's, and a few stand-alone helper API's which don't provide custom user
-   functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work. */
-/*#define MINIZ_NO_MALLOC */
-
-#ifdef MINIZ_NO_INFLATE_APIS
-#define MINIZ_NO_ARCHIVE_APIS
-#endif
-
-#ifdef MINIZ_NO_DEFLATE_APIS
-#define MINIZ_NO_ARCHIVE_WRITING_APIS
-#endif
-
-#if defined(__TINYC__) && (defined(__linux) || defined(__linux__))
-/* TODO: Work around "error: include file 'sys\utime.h' when compiling with tcc on Linux */
-#define MINIZ_NO_TIME
-#endif
-
-#include <stddef.h>
-
-#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_ARCHIVE_APIS)
-#include <time.h>
-#endif
-
-#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(i386) || defined(__ia64__) || defined(__x86_64__)
-/* MINIZ_X86_OR_X64_CPU is only used to help set the below macros. */
-#define MINIZ_X86_OR_X64_CPU 1
-#else
-#define MINIZ_X86_OR_X64_CPU 0
-#endif
-
-/* Set MINIZ_LITTLE_ENDIAN only if not set */
-#if !defined(MINIZ_LITTLE_ENDIAN)
-#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
-
-#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-/* Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. */
-#define MINIZ_LITTLE_ENDIAN 1
-#else
-#define MINIZ_LITTLE_ENDIAN 0
-#endif
-
-#else
-
-#if MINIZ_X86_OR_X64_CPU
-#define MINIZ_LITTLE_ENDIAN 1
-#else
-#define MINIZ_LITTLE_ENDIAN 0
-#endif
-
-#endif
-#endif
-
-/* Using unaligned loads and stores causes errors when using UBSan */
-#if defined(__has_feature)
-#if __has_feature(undefined_behavior_sanitizer)
-#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
-#endif
-#endif
-
-/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */
-#if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES)
-#if MINIZ_X86_OR_X64_CPU
-/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */
-#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
-#define MINIZ_UNALIGNED_USE_MEMCPY
-#else
-#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
-#endif
-#endif
-
-#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__)
-/* Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are reasonably fast (and don't involve compiler generated calls to helper functions). */
-#define MINIZ_HAS_64BIT_REGISTERS 1
-#else
-#define MINIZ_HAS_64BIT_REGISTERS 0
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------- zlib-style API Definitions. */
-
-/* For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. Beware: mz_ulong can be either 32 or 64-bits! */
-typedef unsigned long mz_ulong;
-
-/* mz_free() internally uses the MZ_FREE() macro (which by default calls free() unless you've modified the MZ_MALLOC macro) to release a block allocated from the heap. */
-MINIZ_EXPORT void mz_free(void *p);
-
-#define MZ_ADLER32_INIT (1)
-/* mz_adler32() returns the initial adler-32 value to use when called with ptr==NULL. */
-MINIZ_EXPORT mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len);
-
-#define MZ_CRC32_INIT (0)
-/* mz_crc32() returns the initial CRC-32 value to use when called with ptr==NULL. */
-MINIZ_EXPORT mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, size_t buf_len);
-
-/* Compression strategies. */
-enum
-{
-    MZ_DEFAULT_STRATEGY = 0,
-    MZ_FILTERED = 1,
-    MZ_HUFFMAN_ONLY = 2,
-    MZ_RLE = 3,
-    MZ_FIXED = 4
-};
-
-/* Method */
-#define MZ_DEFLATED 8
-
-/* Heap allocation callbacks.
-Note that mz_alloc_func parameter types purposely differ from zlib's: items/size is size_t, not unsigned long. */
-typedef void *(*mz_alloc_func)(void *opaque, size_t items, size_t size);
-typedef void (*mz_free_func)(void *opaque, void *address);
-typedef void *(*mz_realloc_func)(void *opaque, void *address, size_t items, size_t size);
-
-/* Compression levels: 0-9 are the standard zlib-style levels, 10 is best possible compression (not zlib compatible, and may be very slow), MZ_DEFAULT_COMPRESSION=MZ_DEFAULT_LEVEL. */
-enum
-{
-    MZ_NO_COMPRESSION = 0,
-    MZ_BEST_SPEED = 1,
-    MZ_BEST_COMPRESSION = 9,
-    MZ_UBER_COMPRESSION = 10,
-    MZ_DEFAULT_LEVEL = 6,
-    MZ_DEFAULT_COMPRESSION = -1
-};
-
-#define MZ_VERSION "11.0.2"
-#define MZ_VERNUM 0xB002
-#define MZ_VER_MAJOR 11
-#define MZ_VER_MINOR 2
-#define MZ_VER_REVISION 0
-#define MZ_VER_SUBREVISION 0
-
-#ifndef MINIZ_NO_ZLIB_APIS
-
-/* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other values are for advanced use (refer to the zlib docs). */
-enum
-{
-    MZ_NO_FLUSH = 0,
-    MZ_PARTIAL_FLUSH = 1,
-    MZ_SYNC_FLUSH = 2,
-    MZ_FULL_FLUSH = 3,
-    MZ_FINISH = 4,
-    MZ_BLOCK = 5
-};
-
-/* Return status codes. MZ_PARAM_ERROR is non-standard. */
-enum
-{
-    MZ_OK = 0,
-    MZ_STREAM_END = 1,
-    MZ_NEED_DICT = 2,
-    MZ_ERRNO = -1,
-    MZ_STREAM_ERROR = -2,
-    MZ_DATA_ERROR = -3,
-    MZ_MEM_ERROR = -4,
-    MZ_BUF_ERROR = -5,
-    MZ_VERSION_ERROR = -6,
-    MZ_PARAM_ERROR = -10000
-};
-
-/* Window bits */
-#define MZ_DEFAULT_WINDOW_BITS 15
-
-struct mz_internal_state;
-
-/* Compression/decompression stream struct. */
-typedef struct mz_stream_s
-{
-    const unsigned char *next_in; /* pointer to next byte to read */
-    unsigned int avail_in;        /* number of bytes available at next_in */
-    mz_ulong total_in;            /* total number of bytes consumed so far */
-
-    unsigned char *next_out; /* pointer to next byte to write */
-    unsigned int avail_out;  /* number of bytes that can be written to next_out */
-    mz_ulong total_out;      /* total number of bytes produced so far */
-
-    char *msg;                       /* error msg (unused) */
-    struct mz_internal_state *state; /* internal state, allocated by zalloc/zfree */
-
-    mz_alloc_func zalloc; /* optional heap allocation function (defaults to malloc) */
-    mz_free_func zfree;   /* optional heap free function (defaults to free) */
-    void *opaque;         /* heap alloc function user pointer */
-
-    int data_type;     /* data_type (unused) */
-    mz_ulong adler;    /* adler32 of the source or uncompressed data */
-    mz_ulong reserved; /* not used */
-} mz_stream;
-
-typedef mz_stream *mz_streamp;
-
-/* Returns the version string of miniz.c. */
-MINIZ_EXPORT const char *mz_version(void);
-
-#ifndef MINIZ_NO_DEFLATE_APIS
-
-/* mz_deflateInit() initializes a compressor with default options: */
-/* Parameters: */
-/*  pStream must point to an initialized mz_stream struct. */
-/*  level must be between [MZ_NO_COMPRESSION, MZ_BEST_COMPRESSION]. */
-/*  level 1 enables a specially optimized compression function that's been optimized purely for performance, not ratio. */
-/*  (This special func. is currently only enabled when MINIZ_USE_UNALIGNED_LOADS_AND_STORES and MINIZ_LITTLE_ENDIAN are defined.) */
-/* Return values: */
-/*  MZ_OK on success. */
-/*  MZ_STREAM_ERROR if the stream is bogus. */
-/*  MZ_PARAM_ERROR if the input parameters are bogus. */
-/*  MZ_MEM_ERROR on out of memory. */
-MINIZ_EXPORT int mz_deflateInit(mz_streamp pStream, int level);
-
-/* mz_deflateInit2() is like mz_deflate(), except with more control: */
-/* Additional parameters: */
-/*   method must be MZ_DEFLATED */
-/*   window_bits must be MZ_DEFAULT_WINDOW_BITS (to wrap the deflate stream with zlib header/adler-32 footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate/no header or footer) */
-/*   mem_level must be between [1, 9] (it's checked but ignored by miniz.c) */
-MINIZ_EXPORT int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy);
-
-/* Quickly resets a compressor without having to reallocate anything. Same as calling mz_deflateEnd() followed by mz_deflateInit()/mz_deflateInit2(). */
-MINIZ_EXPORT int mz_deflateReset(mz_streamp pStream);
-
-/* mz_deflate() compresses the input to output, consuming as much of the input and producing as much output as possible. */
-/* Parameters: */
-/*   pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. */
-/*   flush may be MZ_NO_FLUSH, MZ_PARTIAL_FLUSH/MZ_SYNC_FLUSH, MZ_FULL_FLUSH, or MZ_FINISH. */
-/* Return values: */
-/*   MZ_OK on success (when flushing, or if more input is needed but not available, and/or there's more output to be written but the output buffer is full). */
-/*   MZ_STREAM_END if all input has been consumed and all output bytes have been written. Don't call mz_deflate() on the stream anymore. */
-/*   MZ_STREAM_ERROR if the stream is bogus. */
-/*   MZ_PARAM_ERROR if one of the parameters is invalid. */
-/*   MZ_BUF_ERROR if no forward progress is possible because the input and/or output buffers are empty. (Fill up the input buffer or free up some output space and try again.) */
-MINIZ_EXPORT int mz_deflate(mz_streamp pStream, int flush);
-
-/* mz_deflateEnd() deinitializes a compressor: */
-/* Return values: */
-/*  MZ_OK on success. */
-/*  MZ_STREAM_ERROR if the stream is bogus. */
-MINIZ_EXPORT int mz_deflateEnd(mz_streamp pStream);
-
-/* mz_deflateBound() returns a (very) conservative upper bound on the amount of data that could be generated by deflate(), assuming flush is set to only MZ_NO_FLUSH or MZ_FINISH. */
-MINIZ_EXPORT mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len);
-
-/* Single-call compression functions mz_compress() and mz_compress2(): */
-/* Returns MZ_OK on success, or one of the error codes from mz_deflate() on failure. */
-MINIZ_EXPORT int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len);
-MINIZ_EXPORT int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level);
-
-/* mz_compressBound() returns a (very) conservative upper bound on the amount of data that could be generated by calling mz_compress(). */
-MINIZ_EXPORT mz_ulong mz_compressBound(mz_ulong source_len);
-
-#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
-
-#ifndef MINIZ_NO_INFLATE_APIS
-
-/* Initializes a decompressor. */
-MINIZ_EXPORT int mz_inflateInit(mz_streamp pStream);
-
-/* mz_inflateInit2() is like mz_inflateInit() with an additional option that controls the window size and whether or not the stream has been wrapped with a zlib header/footer: */
-/* window_bits must be MZ_DEFAULT_WINDOW_BITS (to parse zlib header/footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate). */
-MINIZ_EXPORT int mz_inflateInit2(mz_streamp pStream, int window_bits);
-
-/* Quickly resets a compressor without having to reallocate anything. Same as calling mz_inflateEnd() followed by mz_inflateInit()/mz_inflateInit2(). */
-MINIZ_EXPORT int mz_inflateReset(mz_streamp pStream);
-
-/* Decompresses the input stream to the output, consuming only as much of the input as needed, and writing as much to the output as possible. */
-/* Parameters: */
-/*   pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. */
-/*   flush may be MZ_NO_FLUSH, MZ_SYNC_FLUSH, or MZ_FINISH. */
-/*   On the first call, if flush is MZ_FINISH it's assumed the input and output buffers are both sized large enough to decompress the entire stream in a single call (this is slightly faster). */
-/*   MZ_FINISH implies that there are no more source bytes available beside what's already in the input buffer, and that the output buffer is large enough to hold the rest of the decompressed data. */
-/* Return values: */
-/*   MZ_OK on success. Either more input is needed but not available, and/or there's more output to be written but the output buffer is full. */
-/*   MZ_STREAM_END if all needed input has been consumed and all output bytes have been written. For zlib streams, the adler-32 of the decompressed data has also been verified. */
-/*   MZ_STREAM_ERROR if the stream is bogus. */
-/*   MZ_DATA_ERROR if the deflate stream is invalid. */
-/*   MZ_PARAM_ERROR if one of the parameters is invalid. */
-/*   MZ_BUF_ERROR if no forward progress is possible because the input buffer is empty but the inflater needs more input to continue, or if the output buffer is not large enough. Call mz_inflate() again */
-/*   with more input data, or with more room in the output buffer (except when using single call decompression, described above). */
-MINIZ_EXPORT int mz_inflate(mz_streamp pStream, int flush);
-
-/* Deinitializes a decompressor. */
-MINIZ_EXPORT int mz_inflateEnd(mz_streamp pStream);
-
-/* Single-call decompression. */
-/* Returns MZ_OK on success, or one of the error codes from mz_inflate() on failure. */
-MINIZ_EXPORT int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len);
-MINIZ_EXPORT int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong *pSource_len);
-#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
-
-/* Returns a string description of the specified error code, or NULL if the error code is invalid. */
-MINIZ_EXPORT const char *mz_error(int err);
-
-/* Redefine zlib-compatible names to miniz equivalents, so miniz.c can be used as a drop-in replacement for the subset of zlib that miniz.c supports. */
-/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAMES to disable zlib-compatibility if you use zlib in the same project. */
-#ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES
-typedef unsigned char Byte;
-typedef unsigned int uInt;
-typedef mz_ulong uLong;
-typedef Byte Bytef;
-typedef uInt uIntf;
-typedef char charf;
-typedef int intf;
-typedef void *voidpf;
-typedef uLong uLongf;
-typedef void *voidp;
-typedef void *const voidpc;
-#define Z_NULL 0
-#define Z_NO_FLUSH MZ_NO_FLUSH
-#define Z_PARTIAL_FLUSH MZ_PARTIAL_FLUSH
-#define Z_SYNC_FLUSH MZ_SYNC_FLUSH
-#define Z_FULL_FLUSH MZ_FULL_FLUSH
-#define Z_FINISH MZ_FINISH
-#define Z_BLOCK MZ_BLOCK
-#define Z_OK MZ_OK
-#define Z_STREAM_END MZ_STREAM_END
-#define Z_NEED_DICT MZ_NEED_DICT
-#define Z_ERRNO MZ_ERRNO
-#define Z_STREAM_ERROR MZ_STREAM_ERROR
-#define Z_DATA_ERROR MZ_DATA_ERROR
-#define Z_MEM_ERROR MZ_MEM_ERROR
-#define Z_BUF_ERROR MZ_BUF_ERROR
-#define Z_VERSION_ERROR MZ_VERSION_ERROR
-#define Z_PARAM_ERROR MZ_PARAM_ERROR
-#define Z_NO_COMPRESSION MZ_NO_COMPRESSION
-#define Z_BEST_SPEED MZ_BEST_SPEED
-#define Z_BEST_COMPRESSION MZ_BEST_COMPRESSION
-#define Z_DEFAULT_COMPRESSION MZ_DEFAULT_COMPRESSION
-#define Z_DEFAULT_STRATEGY MZ_DEFAULT_STRATEGY
-#define Z_FILTERED MZ_FILTERED
-#define Z_HUFFMAN_ONLY MZ_HUFFMAN_ONLY
-#define Z_RLE MZ_RLE
-#define Z_FIXED MZ_FIXED
-#define Z_DEFLATED MZ_DEFLATED
-#define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS
-#define alloc_func mz_alloc_func
-#define free_func mz_free_func
-#define internal_state mz_internal_state
-#define z_stream mz_stream
-
-#ifndef MINIZ_NO_DEFLATE_APIS
-#define deflateInit mz_deflateInit
-#define deflateInit2 mz_deflateInit2
-#define deflateReset mz_deflateReset
-#define deflate mz_deflate
-#define deflateEnd mz_deflateEnd
-#define deflateBound mz_deflateBound
-#define compress mz_compress
-#define compress2 mz_compress2
-#define compressBound mz_compressBound
-#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
-
-#ifndef MINIZ_NO_INFLATE_APIS
-#define inflateInit mz_inflateInit
-#define inflateInit2 mz_inflateInit2
-#define inflateReset mz_inflateReset
-#define inflate mz_inflate
-#define inflateEnd mz_inflateEnd
-#define uncompress mz_uncompress
-#define uncompress2 mz_uncompress2
-#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
-
-#define crc32 mz_crc32
-#define adler32 mz_adler32
-#define MAX_WBITS 15
-#define MAX_MEM_LEVEL 9
-#define zError mz_error
-#define ZLIB_VERSION MZ_VERSION
-#define ZLIB_VERNUM MZ_VERNUM
-#define ZLIB_VER_MAJOR MZ_VER_MAJOR
-#define ZLIB_VER_MINOR MZ_VER_MINOR
-#define ZLIB_VER_REVISION MZ_VER_REVISION
-#define ZLIB_VER_SUBREVISION MZ_VER_SUBREVISION
-#define zlibVersion mz_version
-#define zlib_version mz_version()
-#endif /* #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
-
-#endif /* MINIZ_NO_ZLIB_APIS */
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-
-
-#pragma once
-#include <assert.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-
-/* ------------------- Types and macros */
-typedef unsigned char mz_uint8;
-typedef signed short mz_int16;
-typedef unsigned short mz_uint16;
-typedef unsigned int mz_uint32;
-typedef unsigned int mz_uint;
-typedef int64_t mz_int64;
-typedef uint64_t mz_uint64;
-typedef int mz_bool;
-
-#define MZ_FALSE (0)
-#define MZ_TRUE (1)
-
-/* Works around MSVC's spammy "warning C4127: conditional expression is constant" message. */
-#ifdef _MSC_VER
-#define MZ_MACRO_END while (0, 0)
-#else
-#define MZ_MACRO_END while (0)
-#endif
-
-#ifdef MINIZ_NO_STDIO
-#define MZ_FILE void *
-#else
-#include <stdio.h>
-#define MZ_FILE FILE
-#endif /* #ifdef MINIZ_NO_STDIO */
-
-#ifdef MINIZ_NO_TIME
-typedef struct mz_dummy_time_t_tag
-{
-    mz_uint32 m_dummy1;
-    mz_uint32 m_dummy2;
-} mz_dummy_time_t;
-#define MZ_TIME_T mz_dummy_time_t
-#else
-#define MZ_TIME_T time_t
-#endif
-
-#define MZ_ASSERT(x) assert(x)
-
-#ifdef MINIZ_NO_MALLOC
-#define MZ_MALLOC(x) NULL
-#define MZ_FREE(x) (void)x, ((void)0)
-#define MZ_REALLOC(p, x) NULL
-#else
-#define MZ_MALLOC(x) malloc(x)
-#define MZ_FREE(x) free(x)
-#define MZ_REALLOC(p, x) realloc(p, x)
-#endif
-
-#define MZ_MAX(a, b) (((a) > (b)) ? (a) : (b))
-#define MZ_MIN(a, b) (((a) < (b)) ? (a) : (b))
-#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj))
-#define MZ_CLEAR_ARR(obj) memset((obj), 0, sizeof(obj))
-#define MZ_CLEAR_PTR(obj) memset((obj), 0, sizeof(*obj))
-
-#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
-#define MZ_READ_LE16(p) *((const mz_uint16 *)(p))
-#define MZ_READ_LE32(p) *((const mz_uint32 *)(p))
-#else
-#define MZ_READ_LE16(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U))
-#define MZ_READ_LE32(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) | ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) | ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U))
-#endif
-
-#define MZ_READ_LE64(p) (((mz_uint64)MZ_READ_LE32(p)) | (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32))) << 32U))
-
-#ifdef _MSC_VER
-#define MZ_FORCEINLINE __forceinline
-#elif defined(__GNUC__)
-#define MZ_FORCEINLINE __inline__ __attribute__((__always_inline__))
-#else
-#define MZ_FORCEINLINE inline
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items, size_t size);
-extern MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address);
-extern MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size);
-
-#define MZ_UINT16_MAX (0xFFFFU)
-#define MZ_UINT32_MAX (0xFFFFFFFFU)
-
-#ifdef __cplusplus
-}
-#endif
- #pragma once
-
-
-#ifndef MINIZ_NO_DEFLATE_APIS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* ------------------- Low-level Compression API Definitions */
-
-/* Set TDEFL_LESS_MEMORY to 1 to use less memory (compression will be slightly slower, and raw/dynamic blocks will be output more frequently). */
-#define TDEFL_LESS_MEMORY 0
-
-/* tdefl_init() compression flags logically OR'd together (low 12 bits contain the max. number of probes per dictionary search): */
-/* TDEFL_DEFAULT_MAX_PROBES: The compressor defaults to 128 dictionary probes per dictionary search. 0=Huffman only, 1=Huffman+LZ (fastest/crap compression), 4095=Huffman+LZ (slowest/best compression). */
-enum
-{
-    TDEFL_HUFFMAN_ONLY = 0,
-    TDEFL_DEFAULT_MAX_PROBES = 128,
-    TDEFL_MAX_PROBES_MASK = 0xFFF
-};
-
-/* TDEFL_WRITE_ZLIB_HEADER: If set, the compressor outputs a zlib header before the deflate data, and the Adler-32 of the source data at the end. Otherwise, you'll get raw deflate data. */
-/* TDEFL_COMPUTE_ADLER32: Always compute the adler-32 of the input data (even when not writing zlib headers). */
-/* TDEFL_GREEDY_PARSING_FLAG: Set to use faster greedy parsing, instead of more efficient lazy parsing. */
-/* TDEFL_NONDETERMINISTIC_PARSING_FLAG: Enable to decrease the compressor's initialization time to the minimum, but the output may vary from run to run given the same input (depending on the contents of memory). */
-/* TDEFL_RLE_MATCHES: Only look for RLE matches (matches with a distance of 1) */
-/* TDEFL_FILTER_MATCHES: Discards matches <= 5 chars if enabled. */
-/* TDEFL_FORCE_ALL_STATIC_BLOCKS: Disable usage of optimized Huffman tables. */
-/* TDEFL_FORCE_ALL_RAW_BLOCKS: Only use raw (uncompressed) deflate blocks. */
-/* The low 12 bits are reserved to control the max # of hash probes per dictionary lookup (see TDEFL_MAX_PROBES_MASK). */
-enum
-{
-    TDEFL_WRITE_ZLIB_HEADER = 0x01000,
-    TDEFL_COMPUTE_ADLER32 = 0x02000,
-    TDEFL_GREEDY_PARSING_FLAG = 0x04000,
-    TDEFL_NONDETERMINISTIC_PARSING_FLAG = 0x08000,
-    TDEFL_RLE_MATCHES = 0x10000,
-    TDEFL_FILTER_MATCHES = 0x20000,
-    TDEFL_FORCE_ALL_STATIC_BLOCKS = 0x40000,
-    TDEFL_FORCE_ALL_RAW_BLOCKS = 0x80000
-};
-
-/* High level compression functions: */
-/* tdefl_compress_mem_to_heap() compresses a block in memory to a heap block allocated via malloc(). */
-/* On entry: */
-/*  pSrc_buf, src_buf_len: Pointer and size of source block to compress. */
-/*  flags: The max match finder probes (default is 128) logically OR'd against the above flags. Higher probes are slower but improve compression. */
-/* On return: */
-/*  Function returns a pointer to the compressed data, or NULL on failure. */
-/*  *pOut_len will be set to the compressed data's size, which could be larger than src_buf_len on uncompressible data. */
-/*  The caller must free() the returned block when it's no longer needed. */
-MINIZ_EXPORT void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags);
-
-/* tdefl_compress_mem_to_mem() compresses a block in memory to another block in memory. */
-/* Returns 0 on failure. */
-MINIZ_EXPORT size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags);
-
-/* Compresses an image to a compressed PNG file in memory. */
-/* On entry: */
-/*  pImage, w, h, and num_chans describe the image to compress. num_chans may be 1, 2, 3, or 4. */
-/*  The image pitch in bytes per scanline will be w*num_chans. The leftmost pixel on the top scanline is stored first in memory. */
-/*  level may range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL */
-/*  If flip is true, the image will be flipped on the Y axis (useful for OpenGL apps). */
-/* On return: */
-/*  Function returns a pointer to the compressed data, or NULL on failure. */
-/*  *pLen_out will be set to the size of the PNG image file. */
-/*  The caller must mz_free() the returned heap block (which will typically be larger than *pLen_out) when it's no longer needed. */
-MINIZ_EXPORT void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip);
-MINIZ_EXPORT void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out);
-
-/* Output stream interface. The compressor uses this interface to write compressed data. It'll typically be called TDEFL_OUT_BUF_SIZE at a time. */
-typedef mz_bool (*tdefl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser);
-
-/* tdefl_compress_mem_to_output() compresses a block to an output stream. The above helpers use this function internally. */
-MINIZ_EXPORT mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
-
-enum
-{
-    TDEFL_MAX_HUFF_TABLES = 3,
-    TDEFL_MAX_HUFF_SYMBOLS_0 = 288,
-    TDEFL_MAX_HUFF_SYMBOLS_1 = 32,
-    TDEFL_MAX_HUFF_SYMBOLS_2 = 19,
-    TDEFL_LZ_DICT_SIZE = 32768,
-    TDEFL_LZ_DICT_SIZE_MASK = TDEFL_LZ_DICT_SIZE - 1,
-    TDEFL_MIN_MATCH_LEN = 3,
-    TDEFL_MAX_MATCH_LEN = 258
-};
-
-/* TDEFL_OUT_BUF_SIZE MUST be large enough to hold a single entire compressed output block (using static/fixed Huffman codes). */
-#if TDEFL_LESS_MEMORY
-enum
-{
-    TDEFL_LZ_CODE_BUF_SIZE = 24 * 1024,
-    TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13) / 10,
-    TDEFL_MAX_HUFF_SYMBOLS = 288,
-    TDEFL_LZ_HASH_BITS = 12,
-    TDEFL_LEVEL1_HASH_SIZE_MASK = 4095,
-    TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3,
-    TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS
-};
-#else
-enum
-{
-    TDEFL_LZ_CODE_BUF_SIZE = 64 * 1024,
-    TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13) / 10,
-    TDEFL_MAX_HUFF_SYMBOLS = 288,
-    TDEFL_LZ_HASH_BITS = 15,
-    TDEFL_LEVEL1_HASH_SIZE_MASK = 4095,
-    TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3,
-    TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS
-};
-#endif
-
-/* The low-level tdefl functions below may be used directly if the above helper functions aren't flexible enough. The low-level functions don't make any heap allocations, unlike the above helper functions. */
-typedef enum {
-    TDEFL_STATUS_BAD_PARAM = -2,
-    TDEFL_STATUS_PUT_BUF_FAILED = -1,
-    TDEFL_STATUS_OKAY = 0,
-    TDEFL_STATUS_DONE = 1
-} tdefl_status;
-
-/* Must map to MZ_NO_FLUSH, MZ_SYNC_FLUSH, etc. enums */
-typedef enum {
-    TDEFL_NO_FLUSH = 0,
-    TDEFL_SYNC_FLUSH = 2,
-    TDEFL_FULL_FLUSH = 3,
-    TDEFL_FINISH = 4
-} tdefl_flush;
-
-/* tdefl's compression state structure. */
-typedef struct
-{
-    tdefl_put_buf_func_ptr m_pPut_buf_func;
-    void *m_pPut_buf_user;
-    mz_uint m_flags, m_max_probes[2];
-    int m_greedy_parsing;
-    mz_uint m_adler32, m_lookahead_pos, m_lookahead_size, m_dict_size;
-    mz_uint8 *m_pLZ_code_buf, *m_pLZ_flags, *m_pOutput_buf, *m_pOutput_buf_end;
-    mz_uint m_num_flags_left, m_total_lz_bytes, m_lz_code_buf_dict_pos, m_bits_in, m_bit_buffer;
-    mz_uint m_saved_match_dist, m_saved_match_len, m_saved_lit, m_output_flush_ofs, m_output_flush_remaining, m_finished, m_block_index, m_wants_to_finish;
-    tdefl_status m_prev_return_status;
-    const void *m_pIn_buf;
-    void *m_pOut_buf;
-    size_t *m_pIn_buf_size, *m_pOut_buf_size;
-    tdefl_flush m_flush;
-    const mz_uint8 *m_pSrc;
-    size_t m_src_buf_left, m_out_buf_ofs;
-    mz_uint8 m_dict[TDEFL_LZ_DICT_SIZE + TDEFL_MAX_MATCH_LEN - 1];
-    mz_uint16 m_huff_count[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
-    mz_uint16 m_huff_codes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
-    mz_uint8 m_huff_code_sizes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
-    mz_uint8 m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE];
-    mz_uint16 m_next[TDEFL_LZ_DICT_SIZE];
-    mz_uint16 m_hash[TDEFL_LZ_HASH_SIZE];
-    mz_uint8 m_output_buf[TDEFL_OUT_BUF_SIZE];
-} tdefl_compressor;
-
-/* Initializes the compressor. */
-/* There is no corresponding deinit() function because the tdefl API's do not dynamically allocate memory. */
-/* pBut_buf_func: If NULL, output data will be supplied to the specified callback. In this case, the user should call the tdefl_compress_buffer() API for compression. */
-/* If pBut_buf_func is NULL the user should always call the tdefl_compress() API. */
-/* flags: See the above enums (TDEFL_HUFFMAN_ONLY, TDEFL_WRITE_ZLIB_HEADER, etc.) */
-MINIZ_EXPORT tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
-
-/* Compresses a block of data, consuming as much of the specified input buffer as possible, and writing as much compressed data to the specified output buffer as possible. */
-MINIZ_EXPORT tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pIn_buf_size, void *pOut_buf, size_t *pOut_buf_size, tdefl_flush flush);
-
-/* tdefl_compress_buffer() is only usable when the tdefl_init() is called with a non-NULL tdefl_put_buf_func_ptr. */
-/* tdefl_compress_buffer() always consumes the entire input buffer. */
-MINIZ_EXPORT tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush);
-
-MINIZ_EXPORT tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d);
-MINIZ_EXPORT mz_uint32 tdefl_get_adler32(tdefl_compressor *d);
-
-/* Create tdefl_compress() flags given zlib-style compression parameters. */
-/* level may range from [0,10] (where 10 is absolute max compression, but may be much slower on some files) */
-/* window_bits may be -15 (raw deflate) or 15 (zlib) */
-/* strategy may be either MZ_DEFAULT_STRATEGY, MZ_FILTERED, MZ_HUFFMAN_ONLY, MZ_RLE, or MZ_FIXED */
-MINIZ_EXPORT mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy);
-
-#ifndef MINIZ_NO_MALLOC
-/* Allocate the tdefl_compressor structure in C so that */
-/* non-C language bindings to tdefl_ API don't need to worry about */
-/* structure size and allocation mechanism. */
-MINIZ_EXPORT tdefl_compressor *tdefl_compressor_alloc(void);
-MINIZ_EXPORT void tdefl_compressor_free(tdefl_compressor *pComp);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
- #pragma once
-
-/* ------------------- Low-level Decompression API Definitions */
-
-#ifndef MINIZ_NO_INFLATE_APIS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Decompression flags used by tinfl_decompress(). */
-/* TINFL_FLAG_PARSE_ZLIB_HEADER: If set, the input has a valid zlib header and ends with an adler32 checksum (it's a valid zlib stream). Otherwise, the input is a raw deflate stream. */
-/* TINFL_FLAG_HAS_MORE_INPUT: If set, there are more input bytes available beyond the end of the supplied input buffer. If clear, the input buffer contains all remaining input. */
-/* TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF: If set, the output buffer is large enough to hold the entire decompressed stream. If clear, the output buffer is at least the size of the dictionary (typically 32KB). */
-/* TINFL_FLAG_COMPUTE_ADLER32: Force adler-32 checksum computation of the decompressed bytes. */
-enum
-{
-    TINFL_FLAG_PARSE_ZLIB_HEADER = 1,
-    TINFL_FLAG_HAS_MORE_INPUT = 2,
-    TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4,
-    TINFL_FLAG_COMPUTE_ADLER32 = 8
-};
-
-/* High level decompression functions: */
-/* tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block allocated via malloc(). */
-/* On entry: */
-/*  pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data to decompress. */
-/* On return: */
-/*  Function returns a pointer to the decompressed data, or NULL on failure. */
-/*  *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on uncompressible data. */
-/*  The caller must call mz_free() on the returned block when it's no longer needed. */
-MINIZ_EXPORT void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags);
-
-/* tinfl_decompress_mem_to_mem() decompresses a block in memory to another block in memory. */
-/* Returns TINFL_DECOMPRESS_MEM_TO_MEM_FAILED on failure, or the number of bytes written on success. */
-#define TINFL_DECOMPRESS_MEM_TO_MEM_FAILED ((size_t)(-1))
-MINIZ_EXPORT size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags);
-
-/* tinfl_decompress_mem_to_callback() decompresses a block in memory to an internal 32KB buffer, and a user provided callback function will be called to flush the buffer. */
-/* Returns 1 on success or 0 on failure. */
-typedef int (*tinfl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser);
-MINIZ_EXPORT int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
-
-struct tinfl_decompressor_tag;
-typedef struct tinfl_decompressor_tag tinfl_decompressor;
-
-#ifndef MINIZ_NO_MALLOC
-/* Allocate the tinfl_decompressor structure in C so that */
-/* non-C language bindings to tinfl_ API don't need to worry about */
-/* structure size and allocation mechanism. */
-MINIZ_EXPORT tinfl_decompressor *tinfl_decompressor_alloc(void);
-MINIZ_EXPORT void tinfl_decompressor_free(tinfl_decompressor *pDecomp);
-#endif
-
-/* Max size of LZ dictionary. */
-#define TINFL_LZ_DICT_SIZE 32768
-
-/* Return status. */
-typedef enum {
-    /* This flags indicates the inflator needs 1 or more input bytes to make forward progress, but the caller is indicating that no more are available. The compressed data */
-    /* is probably corrupted. If you call the inflator again with more bytes it'll try to continue processing the input but this is a BAD sign (either the data is corrupted or you called it incorrectly). */
-    /* If you call it again with no input you'll just get TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS again. */
-    TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS = -4,
-
-    /* This flag indicates that one or more of the input parameters was obviously bogus. (You can try calling it again, but if you get this error the calling code is wrong.) */
-    TINFL_STATUS_BAD_PARAM = -3,
-
-    /* This flags indicate the inflator is finished but the adler32 check of the uncompressed data didn't match. If you call it again it'll return TINFL_STATUS_DONE. */
-    TINFL_STATUS_ADLER32_MISMATCH = -2,
-
-    /* This flags indicate the inflator has somehow failed (bad code, corrupted input, etc.). If you call it again without resetting via tinfl_init() it it'll just keep on returning the same status failure code. */
-    TINFL_STATUS_FAILED = -1,
-
-    /* Any status code less than TINFL_STATUS_DONE must indicate a failure. */
-
-    /* This flag indicates the inflator has returned every byte of uncompressed data that it can, has consumed every byte that it needed, has successfully reached the end of the deflate stream, and */
-    /* if zlib headers and adler32 checking enabled that it has successfully checked the uncompressed data's adler32. If you call it again you'll just get TINFL_STATUS_DONE over and over again. */
-    TINFL_STATUS_DONE = 0,
-
-    /* This flag indicates the inflator MUST have more input data (even 1 byte) before it can make any more forward progress, or you need to clear the TINFL_FLAG_HAS_MORE_INPUT */
-    /* flag on the next call if you don't have any more source data. If the source data was somehow corrupted it's also possible (but unlikely) for the inflator to keep on demanding input to */
-    /* proceed, so be sure to properly set the TINFL_FLAG_HAS_MORE_INPUT flag. */
-    TINFL_STATUS_NEEDS_MORE_INPUT = 1,
-
-    /* This flag indicates the inflator definitely has 1 or more bytes of uncompressed data available, but it cannot write this data into the output buffer. */
-    /* Note if the source compressed data was corrupted it's possible for the inflator to return a lot of uncompressed data to the caller. I've been assuming you know how much uncompressed data to expect */
-    /* (either exact or worst case) and will stop calling the inflator and fail after receiving too much. In pure streaming scenarios where you have no idea how many bytes to expect this may not be possible */
-    /* so I may need to add some code to address this. */
-    TINFL_STATUS_HAS_MORE_OUTPUT = 2
-} tinfl_status;
-
-/* Initializes the decompressor to its initial state. */
-#define tinfl_init(r)     \
-    do                    \
-    {                     \
-        (r)->m_state = 0; \
-    }                     \
-    MZ_MACRO_END
-#define tinfl_get_adler32(r) (r)->m_check_adler32
-
-/* Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. */
-/* This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. */
-MINIZ_EXPORT tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags);
-
-/* Internal/private bits follow. */
-enum
-{
-    TINFL_MAX_HUFF_TABLES = 3,
-    TINFL_MAX_HUFF_SYMBOLS_0 = 288,
-    TINFL_MAX_HUFF_SYMBOLS_1 = 32,
-    TINFL_MAX_HUFF_SYMBOLS_2 = 19,
-    TINFL_FAST_LOOKUP_BITS = 10,
-    TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS
-};
-
-#if MINIZ_HAS_64BIT_REGISTERS
-#define TINFL_USE_64BIT_BITBUF 1
-#else
-#define TINFL_USE_64BIT_BITBUF 0
-#endif
-
-#if TINFL_USE_64BIT_BITBUF
-typedef mz_uint64 tinfl_bit_buf_t;
-#define TINFL_BITBUF_SIZE (64)
-#else
-typedef mz_uint32 tinfl_bit_buf_t;
-#define TINFL_BITBUF_SIZE (32)
-#endif
-
-struct tinfl_decompressor_tag
-{
-    mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, m_check_adler32, m_dist, m_counter, m_num_extra, m_table_sizes[TINFL_MAX_HUFF_TABLES];
-    tinfl_bit_buf_t m_bit_buf;
-    size_t m_dist_from_out_buf_start;
-    mz_int16 m_look_up[TINFL_MAX_HUFF_TABLES][TINFL_FAST_LOOKUP_SIZE];
-    mz_int16 m_tree_0[TINFL_MAX_HUFF_SYMBOLS_0 * 2];
-    mz_int16 m_tree_1[TINFL_MAX_HUFF_SYMBOLS_1 * 2];
-    mz_int16 m_tree_2[TINFL_MAX_HUFF_SYMBOLS_2 * 2];
-    mz_uint8 m_code_size_0[TINFL_MAX_HUFF_SYMBOLS_0];
-    mz_uint8 m_code_size_1[TINFL_MAX_HUFF_SYMBOLS_1];
-    mz_uint8 m_code_size_2[TINFL_MAX_HUFF_SYMBOLS_2];
-    mz_uint8 m_raw_header[4], m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137];
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
- 
-#pragma once
-
-
-/* ------------------- ZIP archive reading/writing */
-
-#ifndef MINIZ_NO_ARCHIVE_APIS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum
-{
-    /* Note: These enums can be reduced as needed to save memory or stack space - they are pretty conservative. */
-    MZ_ZIP_MAX_IO_BUF_SIZE = 64 * 1024,
-    MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE = 512,
-    MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE = 512
-};
-
-typedef struct
-{
-    /* Central directory file index. */
-    mz_uint32 m_file_index;
-
-    /* Byte offset of this entry in the archive's central directory. Note we currently only support up to UINT_MAX or less bytes in the central dir. */
-    mz_uint64 m_central_dir_ofs;
-
-    /* These fields are copied directly from the zip's central dir. */
-    mz_uint16 m_version_made_by;
-    mz_uint16 m_version_needed;
-    mz_uint16 m_bit_flag;
-    mz_uint16 m_method;
-
-    /* CRC-32 of uncompressed data. */
-    mz_uint32 m_crc32;
-
-    /* File's compressed size. */
-    mz_uint64 m_comp_size;
-
-    /* File's uncompressed size. Note, I've seen some old archives where directory entries had 512 bytes for their uncompressed sizes, but when you try to unpack them you actually get 0 bytes. */
-    mz_uint64 m_uncomp_size;
-
-    /* Zip internal and external file attributes. */
-    mz_uint16 m_internal_attr;
-    mz_uint32 m_external_attr;
-
-    /* Entry's local header file offset in bytes. */
-    mz_uint64 m_local_header_ofs;
-
-    /* Size of comment in bytes. */
-    mz_uint32 m_comment_size;
-
-    /* MZ_TRUE if the entry appears to be a directory. */
-    mz_bool m_is_directory;
-
-    /* MZ_TRUE if the entry uses encryption/strong encryption (which miniz_zip doesn't support) */
-    mz_bool m_is_encrypted;
-
-    /* MZ_TRUE if the file is not encrypted, a patch file, and if it uses a compression method we support. */
-    mz_bool m_is_supported;
-
-    /* Filename. If string ends in '/' it's a subdirectory entry. */
-    /* Guaranteed to be zero terminated, may be truncated to fit. */
-    char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE];
-
-    /* Comment field. */
-    /* Guaranteed to be zero terminated, may be truncated to fit. */
-    char m_comment[MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE];
-
-#ifdef MINIZ_NO_TIME
-    MZ_TIME_T m_padding;
-#else
-    MZ_TIME_T m_time;
-#endif
-} mz_zip_archive_file_stat;
-
-typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n);
-typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n);
-typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque);
-
-struct mz_zip_internal_state_tag;
-typedef struct mz_zip_internal_state_tag mz_zip_internal_state;
-
-typedef enum {
-    MZ_ZIP_MODE_INVALID = 0,
-    MZ_ZIP_MODE_READING = 1,
-    MZ_ZIP_MODE_WRITING = 2,
-    MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3
-} mz_zip_mode;
-
-typedef enum {
-    MZ_ZIP_FLAG_CASE_SENSITIVE = 0x0100,
-    MZ_ZIP_FLAG_IGNORE_PATH = 0x0200,
-    MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400,
-    MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800,
-    MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG = 0x1000, /* if enabled, mz_zip_reader_locate_file() will be called on each file as its validated to ensure the func finds the file in the central dir (intended for testing) */
-    MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY = 0x2000,     /* validate the local headers, but don't decompress the entire file and check the crc32 */
-    MZ_ZIP_FLAG_WRITE_ZIP64 = 0x4000,               /* always use the zip64 file format, instead of the original zip file format with automatic switch to zip64. Use as flags parameter with mz_zip_writer_init*_v2 */
-    MZ_ZIP_FLAG_WRITE_ALLOW_READING = 0x8000,
-    MZ_ZIP_FLAG_ASCII_FILENAME = 0x10000,
-    /*After adding a compressed file, seek back
-    to local file header and set the correct sizes*/
-    MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE = 0x20000
-} mz_zip_flags;
-
-typedef enum {
-    MZ_ZIP_TYPE_INVALID = 0,
-    MZ_ZIP_TYPE_USER,
-    MZ_ZIP_TYPE_MEMORY,
-    MZ_ZIP_TYPE_HEAP,
-    MZ_ZIP_TYPE_FILE,
-    MZ_ZIP_TYPE_CFILE,
-    MZ_ZIP_TOTAL_TYPES
-} mz_zip_type;
-
-/* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or modify this enum. */
-typedef enum {
-    MZ_ZIP_NO_ERROR = 0,
-    MZ_ZIP_UNDEFINED_ERROR,
-    MZ_ZIP_TOO_MANY_FILES,
-    MZ_ZIP_FILE_TOO_LARGE,
-    MZ_ZIP_UNSUPPORTED_METHOD,
-    MZ_ZIP_UNSUPPORTED_ENCRYPTION,
-    MZ_ZIP_UNSUPPORTED_FEATURE,
-    MZ_ZIP_FAILED_FINDING_CENTRAL_DIR,
-    MZ_ZIP_NOT_AN_ARCHIVE,
-    MZ_ZIP_INVALID_HEADER_OR_CORRUPTED,
-    MZ_ZIP_UNSUPPORTED_MULTIDISK,
-    MZ_ZIP_DECOMPRESSION_FAILED,
-    MZ_ZIP_COMPRESSION_FAILED,
-    MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE,
-    MZ_ZIP_CRC_CHECK_FAILED,
-    MZ_ZIP_UNSUPPORTED_CDIR_SIZE,
-    MZ_ZIP_ALLOC_FAILED,
-    MZ_ZIP_FILE_OPEN_FAILED,
-    MZ_ZIP_FILE_CREATE_FAILED,
-    MZ_ZIP_FILE_WRITE_FAILED,
-    MZ_ZIP_FILE_READ_FAILED,
-    MZ_ZIP_FILE_CLOSE_FAILED,
-    MZ_ZIP_FILE_SEEK_FAILED,
-    MZ_ZIP_FILE_STAT_FAILED,
-    MZ_ZIP_INVALID_PARAMETER,
-    MZ_ZIP_INVALID_FILENAME,
-    MZ_ZIP_BUF_TOO_SMALL,
-    MZ_ZIP_INTERNAL_ERROR,
-    MZ_ZIP_FILE_NOT_FOUND,
-    MZ_ZIP_ARCHIVE_TOO_LARGE,
-    MZ_ZIP_VALIDATION_FAILED,
-    MZ_ZIP_WRITE_CALLBACK_FAILED,
-    MZ_ZIP_TOTAL_ERRORS
-} mz_zip_error;
-
-typedef struct
-{
-    mz_uint64 m_archive_size;
-    mz_uint64 m_central_directory_file_ofs;
-
-    /* We only support up to UINT32_MAX files in zip64 mode. */
-    mz_uint32 m_total_files;
-    mz_zip_mode m_zip_mode;
-    mz_zip_type m_zip_type;
-    mz_zip_error m_last_error;
-
-    mz_uint64 m_file_offset_alignment;
-
-    mz_alloc_func m_pAlloc;
-    mz_free_func m_pFree;
-    mz_realloc_func m_pRealloc;
-    void *m_pAlloc_opaque;
-
-    mz_file_read_func m_pRead;
-    mz_file_write_func m_pWrite;
-    mz_file_needs_keepalive m_pNeeds_keepalive;
-    void *m_pIO_opaque;
-
-    mz_zip_internal_state *m_pState;
-
-} mz_zip_archive;
-
-typedef struct
-{
-    mz_zip_archive *pZip;
-    mz_uint flags;
-
-    int status;
-
-    mz_uint64 read_buf_size, read_buf_ofs, read_buf_avail, comp_remaining, out_buf_ofs, cur_file_ofs;
-    mz_zip_archive_file_stat file_stat;
-    void *pRead_buf;
-    void *pWrite_buf;
-
-    size_t out_blk_remain;
-
-    tinfl_decompressor inflator;
-
-#ifdef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
-    mz_uint padding;
-#else
-    mz_uint file_crc32;
-#endif
-
-} mz_zip_reader_extract_iter_state;
-
-/* -------- ZIP reading */
-
-/* Inits a ZIP archive reader. */
-/* These functions read and validate the archive's central directory. */
-MINIZ_EXPORT mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint flags);
-
-MINIZ_EXPORT mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint flags);
-
-#ifndef MINIZ_NO_STDIO
-/* Read a archive from a disk file. */
-/* file_start_ofs is the file offset where the archive actually begins, or 0. */
-/* actual_archive_size is the true total size of the archive, which may be smaller than the file's actual size on disk. If zero the entire file is treated as the archive. */
-MINIZ_EXPORT mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags);
-MINIZ_EXPORT mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags, mz_uint64 file_start_ofs, mz_uint64 archive_size);
-
-/* Read an archive from an already opened FILE, beginning at the current file position. */
-/* The archive is assumed to be archive_size bytes long. If archive_size is 0, then the entire rest of the file is assumed to contain the archive. */
-/* The FILE will NOT be closed when mz_zip_reader_end() is called. */
-MINIZ_EXPORT mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint64 archive_size, mz_uint flags);
-#endif
-
-/* Ends archive reading, freeing all allocations, and closing the input archive file if mz_zip_reader_init_file() was used. */
-MINIZ_EXPORT mz_bool mz_zip_reader_end(mz_zip_archive *pZip);
-
-/* -------- ZIP reading or writing */
-
-/* Clears a mz_zip_archive struct to all zeros. */
-/* Important: This must be done before passing the struct to any mz_zip functions. */
-MINIZ_EXPORT void mz_zip_zero_struct(mz_zip_archive *pZip);
-
-MINIZ_EXPORT mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip);
-MINIZ_EXPORT mz_zip_type mz_zip_get_type(mz_zip_archive *pZip);
-
-/* Returns the total number of files in the archive. */
-MINIZ_EXPORT mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip);
-
-MINIZ_EXPORT mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip);
-MINIZ_EXPORT mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip);
-MINIZ_EXPORT MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip);
-
-/* Reads n bytes of raw archive data, starting at file offset file_ofs, to pBuf. */
-MINIZ_EXPORT size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs, void *pBuf, size_t n);
-
-/* All mz_zip funcs set the m_last_error field in the mz_zip_archive struct. These functions retrieve/manipulate this field. */
-/* Note that the m_last_error functionality is not thread safe. */
-MINIZ_EXPORT mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num);
-MINIZ_EXPORT mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip);
-MINIZ_EXPORT mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip);
-MINIZ_EXPORT mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip);
-MINIZ_EXPORT const char *mz_zip_get_error_string(mz_zip_error mz_err);
-
-/* MZ_TRUE if the archive file entry is a directory entry. */
-MINIZ_EXPORT mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index);
-
-/* MZ_TRUE if the file is encrypted/strong encrypted. */
-MINIZ_EXPORT mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index);
-
-/* MZ_TRUE if the compression method is supported, and the file is not encrypted, and the file is not a compressed patch file. */
-MINIZ_EXPORT mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, mz_uint file_index);
-
-/* Retrieves the filename of an archive file entry. */
-/* Returns the number of bytes written to pFilename, or if filename_buf_size is 0 this function returns the number of bytes needed to fully store the filename. */
-MINIZ_EXPORT mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size);
-
-/* Attempts to locates a file in the archive's central directory. */
-/* Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH */
-/* Returns -1 if the file cannot be found. */
-MINIZ_EXPORT int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags);
-MINIZ_EXPORT mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags, mz_uint32 *file_index);
-
-/* Returns detailed information about an archive file entry. */
-MINIZ_EXPORT mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat);
-
-/* MZ_TRUE if the file is in zip64 format. */
-/* A file is considered zip64 if it contained a zip64 end of central directory marker, or if it contained any zip64 extended file information fields in the central directory. */
-MINIZ_EXPORT mz_bool mz_zip_is_zip64(mz_zip_archive *pZip);
-
-/* Returns the total central directory size in bytes. */
-/* The current max supported size is <= MZ_UINT32_MAX. */
-MINIZ_EXPORT size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip);
-
-/* Extracts a archive file to a memory buffer using no memory allocation. */
-/* There must be at least enough room on the stack to store the inflator's state (~34KB or so). */
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
-
-/* Extracts a archive file to a memory buffer. */
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags);
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags);
-
-/* Extracts a archive file to a dynamically allocated heap buffer. */
-/* The memory will be allocated via the mz_zip_archive's alloc/realloc functions. */
-/* Returns NULL and sets the last error on failure. */
-MINIZ_EXPORT void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags);
-MINIZ_EXPORT void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags);
-
-/* Extracts a archive file using a callback function to output the file's data. */
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags);
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags);
-
-/* Extract a file iteratively */
-MINIZ_EXPORT mz_zip_reader_extract_iter_state* mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
-MINIZ_EXPORT mz_zip_reader_extract_iter_state* mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, mz_uint flags);
-MINIZ_EXPORT size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state* pState, void* pvBuf, size_t buf_size);
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state* pState);
-
-#ifndef MINIZ_NO_STDIO
-/* Extracts a archive file to a disk file and sets its last accessed and modified times. */
-/* This function only extracts files, not archive directory records. */
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags);
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags);
-
-/* Extracts a archive file starting at the current position in the destination FILE stream. */
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index, MZ_FILE *File, mz_uint flags);
-MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile, mz_uint flags);
-#endif
-
-#if 0
-/* TODO */
-	typedef void *mz_zip_streaming_extract_state_ptr;
-	mz_zip_streaming_extract_state_ptr mz_zip_streaming_extract_begin(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
-	mz_uint64 mz_zip_streaming_extract_get_size(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
-	mz_uint64 mz_zip_streaming_extract_get_cur_ofs(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
-	mz_bool mz_zip_streaming_extract_seek(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, mz_uint64 new_ofs);
-	size_t mz_zip_streaming_extract_read(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, void *pBuf, size_t buf_size);
-	mz_bool mz_zip_streaming_extract_end(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
-#endif
-
-/* This function compares the archive's local headers, the optional local zip64 extended information block, and the optional descriptor following the compressed data vs. the data in the central directory. */
-/* It also validates that each file can be successfully uncompressed unless the MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY is specified. */
-MINIZ_EXPORT mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
-
-/* Validates an entire archive by calling mz_zip_validate_file() on each file. */
-MINIZ_EXPORT mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags);
-
-/* Misc utils/helpers, valid for ZIP reading or writing */
-MINIZ_EXPORT mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, mz_uint flags, mz_zip_error *pErr);
-#ifndef MINIZ_NO_STDIO
-MINIZ_EXPORT mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags, mz_zip_error *pErr);
-#endif
-
-/* Universal end function - calls either mz_zip_reader_end() or mz_zip_writer_end(). */
-MINIZ_EXPORT mz_bool mz_zip_end(mz_zip_archive *pZip);
-
-/* -------- ZIP writing */
-
-#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-
-/* Inits a ZIP archive writer. */
-/*Set pZip->m_pWrite (and pZip->m_pIO_opaque) before calling mz_zip_writer_init or mz_zip_writer_init_v2*/
-/*The output is streamable, i.e. file_ofs in mz_file_write_func always increases only by n*/
-MINIZ_EXPORT mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size);
-MINIZ_EXPORT mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size, mz_uint flags);
-
-MINIZ_EXPORT mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size);
-MINIZ_EXPORT mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size, mz_uint flags);
-
-#ifndef MINIZ_NO_STDIO
-MINIZ_EXPORT mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning);
-MINIZ_EXPORT mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning, mz_uint flags);
-MINIZ_EXPORT mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint flags);
-#endif
-
-/* Converts a ZIP archive reader object into a writer object, to allow efficient in-place file appends to occur on an existing archive. */
-/* For archives opened using mz_zip_reader_init_file, pFilename must be the archive's filename so it can be reopened for writing. If the file can't be reopened, mz_zip_reader_end() will be called. */
-/* For archives opened using mz_zip_reader_init_mem, the memory block must be growable using the realloc callback (which defaults to realloc unless you've overridden it). */
-/* Finally, for archives opened using mz_zip_reader_init, the mz_zip_archive's user provided m_pWrite function cannot be NULL. */
-/* Note: In-place archive modification is not recommended unless you know what you're doing, because if execution stops or something goes wrong before */
-/* the archive is finalized the file's central directory will be hosed. */
-MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename);
-MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags);
-
-/* Adds the contents of a memory buffer to an archive. These functions record the current local time into the archive. */
-/* To add a directory entry, call this method with an archive name ending in a forwardslash with an empty buffer. */
-/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */
-MINIZ_EXPORT mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags);
-
-/* Like mz_zip_writer_add_mem(), except you can specify a file comment field, and optionally supply the function with already compressed data. */
-/* uncomp_size/uncomp_crc32 are only used if the MZ_ZIP_FLAG_COMPRESSED_DATA flag is specified. */
-MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
-                                              mz_uint64 uncomp_size, mz_uint32 uncomp_crc32);
-
-MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex_v2(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
-                                                 mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, MZ_TIME_T *last_modified, const char *user_extra_data_local, mz_uint user_extra_data_local_len,
-                                                 const char *user_extra_data_central, mz_uint user_extra_data_central_len);
-
-/* Adds the contents of a file to an archive. This function also records the disk file's modified time into the archive. */
-/* File data is supplied via a read callback function. User mz_zip_writer_add_(c)file to add a file directly.*/
-MINIZ_EXPORT mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pArchive_name, mz_file_read_func read_callback, void* callback_opaque, mz_uint64 max_size,
-	const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, const char *user_extra_data_local, mz_uint user_extra_data_local_len,
-	const char *user_extra_data_central, mz_uint user_extra_data_central_len);
-
-
-#ifndef MINIZ_NO_STDIO
-/* Adds the contents of a disk file to an archive. This function also records the disk file's modified time into the archive. */
-/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */
-MINIZ_EXPORT mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
-
-/* Like mz_zip_writer_add_file(), except the file data is read from the specified FILE stream. */
-MINIZ_EXPORT mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, mz_uint64 max_size,
-                                const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, const char *user_extra_data_local, mz_uint user_extra_data_local_len,
-                                const char *user_extra_data_central, mz_uint user_extra_data_central_len);
-#endif
-
-/* Adds a file to an archive by fully cloning the data from another archive. */
-/* This function fully clones the source file's compressed data (no recompression), along with its full filename, extra data (it may add or modify the zip64 local header extra data field), and the optional descriptor following the compressed data. */
-MINIZ_EXPORT mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index);
-
-/* Finalizes the archive by writing the central directory records followed by the end of central directory record. */
-/* After an archive is finalized, the only valid call on the mz_zip_archive struct is mz_zip_writer_end(). */
-/* An archive must be manually finalized by calling this function for it to be valid. */
-MINIZ_EXPORT mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip);
-
-/* Finalizes a heap archive, returning a pointer to the heap block and its size. */
-/* The heap block will be allocated using the mz_zip_archive's alloc/realloc callbacks. */
-MINIZ_EXPORT mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf, size_t *pSize);
-
-/* Ends archive writing, freeing all allocations, and closing the output file if mz_zip_writer_init_file() was used. */
-/* Note for the archive to be valid, it *must* have been finalized before ending (this function will not do it for you). */
-MINIZ_EXPORT mz_bool mz_zip_writer_end(mz_zip_archive *pZip);
-
-/* -------- Misc. high-level helper functions: */
-
-/* mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically) appends a memory blob to a ZIP archive. */
-/* Note this is NOT a fully safe operation. If it crashes or dies in some way your archive can be left in a screwed up state (without a central directory). */
-/* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */
-/* TODO: Perhaps add an option to leave the existing central dir in place in case the add dies? We could then truncate the file (so the old central dir would be at the end) if something goes wrong. */
-MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
-MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_zip_error *pErr);
-
-#ifndef MINIZ_NO_STDIO
-/* Reads a single file from an archive into a heap block. */
-/* If pComment is not NULL, only the file with the specified comment will be extracted. */
-/* Returns NULL on failure. */
-MINIZ_EXPORT void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint flags);
-MINIZ_EXPORT void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, const char *pArchive_name, const char *pComment, size_t *pSize, mz_uint flags, mz_zip_error *pErr);
-#endif
-
-#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MINIZ_NO_ARCHIVE_APIS */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/CMakeLists.txt
deleted file mode 100644
index 3d14d614c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-cmake_minimum_required(VERSION 3.15...3.22)
-project(nanobind)
-
-# ---------------------------------------------------------------------------
-# Only build tests by default if this is the top-level CMake project
-# ---------------------------------------------------------------------------
-
-if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-  set(NB_TEST_DEFAULT ON)
-else()
-  set(NB_TEST_DEFAULT OFF)
-endif()
-
-option(NB_TEST   "Compile nanobind tests?" ${NB_TEST_DEFAULT})
-
-# ---------------------------------------------------------------------------
-# Do a release build if nothing was specified
-# ---------------------------------------------------------------------------
-
-if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "nanobind: setting build type to 'Release' as none was specified.")
-  set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
-    "MinSizeRel" "RelWithDebInfo")
-endif()
-
-# ---------------------------------------------------------------------------
-# Check whether all dependencies are present
-# ---------------------------------------------------------------------------
-
-if (NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/ext/robin_map/include")
-  message(FATAL_ERROR "The nanobind dependencies are missing! "
-    "You probably did not clone the project with --recursive. It is possible to recover "
-    "by invoking\n$ git submodule update --init --recursive")
-endif()
-
-# ---------------------------------------------------------------------------
-# Compile with a few more compiler warnings turned on
-# ---------------------------------------------------------------------------
-
-if (MSVC)
-  if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  else()
-    add_compile_options(/W4)
-  endif()
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
-  add_compile_options(-Wall -Wextra -Wno-unused-local-typedefs)
-endif()
-
-# ---------------------------------------------------------------------------
-# Find the Python interpreter and development libraries
-# ---------------------------------------------------------------------------
-
-# TinyUSDZ fix: find_package(Python3) is invoked at project toplevel.
-
-#set(Python_FIND_FRAMEWORK LAST) # Prefer Brew/Conda to Apple framework python
-#find_package(Python 3.8 COMPONENTS Interpreter Development REQUIRED)
-
-if ((Python3_VERSION_MAJOR LESS 3) OR ((Python3_VERSION_MAJOR EQUAL 3) AND (Python3_VERSION_MINOR LESS 8)))
-  message(FATAL_ERROR "nanobind requires Python >= 3.8")
-endif()
-
-# ---------------------------------------------------------------------------
-# Include nanobind cmake functionality
-# ---------------------------------------------------------------------------
-
-find_package(nanobind
-  PATHS ${CMAKE_CURRENT_SOURCE_DIR}/cmake
-  NO_DEFAULT_PATH)
-
-if (NB_TEST)
-  add_subdirectory(tests)
-endif()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/LICENSE
deleted file mode 100644
index 3d3426d40..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>, All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/README.md b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/README.md
deleted file mode 100644
index 3e33d9ff6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/README.md
+++ /dev/null
@@ -1,520 +0,0 @@
-# nanobind — Seamless operability between C++17 and Python
-
-[![Continuous Integration](https://github.com/wjakob/nanobind/actions/workflows/ci.yml/badge.svg)](https://github.com/wjakob/nanobind/actions/workflows/ci.yml)
-[![](https://img.shields.io/pypi/v/nanobind.svg)](https://pypi.org/pypi/nanobind/)
-![](https://img.shields.io/pypi/l/nanobind.svg)
-[![](https://img.shields.io/badge/Example_project-Link-green)](https://github.com/wjakob/nanobind_example)
-
-_nanobind_ is a small binding library that exposes C++ types in Python and vice
-versa. It is reminiscent of
-_[Boost.Python](https://www.boost.org/doc/libs/1_64_0/libs/python/doc/html)_
-and _[pybind11](http://github.com/pybind/pybind11)_ and uses near-identical
-syntax. In contrast to these existing tools, _nanobind_ is more _efficient_:
-bindings compile in a shorter amount of time, producing smaller binaries with
-better runtime performance.
-
-## Why _yet another_ binding library?
-
-I started the _[pybind11](http://github.com/pybind/pybind11)_ project back in
-2015 to generate better and more efficient C++/Python bindings. Thanks to many
-amazing contributions by others, _pybind11_ has become a core dependency of
-software across the world including flagship projects like PyTorch and
-Tensorflow. Every day, the repository is cloned more than 100.000 times.
-Hundreds of contributed extensions and generalizations address use cases of
-this diverse audience. However, all of this success also came with _costs_: the
-complexity of the library grew tremendously, which had a negative impact on
-efficiency.
-
-Ironically, the situation today feels like 2015 all over again: binding
-generation with existing tools (_Boost.Python_, _pybind11_) is slow and
-produces enormous binaries with overheads on runtime performance. At the same
-time, key improvements in C++17 and Python 3.8 provide opportunities for
-drastic simplifications. Therefore, I am starting _another_ binding project..
-This time, the scope is intentionally limited so that this doesn't turn into an
-endless cycle.
-
-## Performance
-
-> **TLDR**: _nanobind_ bindings compile ~2-3× faster, producing
-~3× smaller binaries, with up to ~8× lower overheads on runtime performance
-(when comparing to _pybind11_ with `-Os` size optimizations).
-
-The following experiments analyze the performance of a very large
-function-heavy (`func`) and class-heavy (`class`) binding microbenchmark
-compiled using _Boost.Python_, _pybind11_, and _nanobind_ in both `debug` and
-size-optimized (`opt`) modes.
-A comparison with [cppyy](https://cppyy.readthedocs.io/en/latest/) (which uses
-dynamic compilation) is also shown later.
-Details on the experimental setup can be found
-[here](https://github.com/wjakob/nanobind/blob/master/docs/benchmark.md).
-
-The first plot contrasts the **compilation time**, where "_number_ ×"
-annotations denote the amount of time spent relative to _nanobind_. As shown
-below, _nanobind_ achieves a consistent ~**2-3× improvement** compared to
-_pybind11_.
-<p align="center">
-<img src="https://github.com/wjakob/nanobind/raw/master/docs/images/times.svg" alt="Compilation time benchmark" width="850"/>
-</p>
-
-_nanobind_ also greatly reduces the **binary size** of the compiled bindings.
-There is a roughly **3× improvement** compared to _pybind11_ and a **8-9×
-improvement** compared to _Boost.Python_ (both with size optimizations).
-<p align="center">
-<img src="https://github.com/wjakob/nanobind/raw/master/docs/images/sizes.svg" alt="Binary size benchmark" width="850"/>
-</p>
-
-The last experiment compares the **runtime performance overheads** by calling
-one of the bound functions many times in a loop. Here, it is also interesting
-to compare against [cppyy](https://cppyy.readthedocs.io/en/latest/) (gray bar)
-and a pure Python implementation that runs bytecode without binding overheads
-(hatched red bar).
-
-<p align="center">
-<img src="https://github.com/wjakob/nanobind/raw/master/docs/images/perf.svg" alt="Runtime performance benchmark" width="850"/>
-</p>
-
-This data shows that the overhead of calling a _nanobind_ function is lower
-than that of an equivalent function call done within CPython. The functions
-benchmarked here don't perform CPU-intensive work, so this this mainly measures
-the overheads of performing a function call, boxing/unboxing arguments and
-return values, etc.
-
-The difference to _pybind11_ is _significant_: a ~**2× improvement** for simple
-functions, and an **~8× improvement** when classes are being passed around.
-Complexities in _pybind11_ related to overload resolution, multiple
-inheritance, and holders are the main reasons for this difference. Those
-features were either simplified or completely removed in _nanobind_.
-
-Finally, there is a **~1.4× improvement** in both experiments compared
-to _cppyy_ (please ignore the two `[debug]` columns—I did not feel
-comfortable adjusting the JIT compilation flags; all _cppyy_ bindings
-are therefore optimized.)
-
-## What are technical differences between _nanobind_ and _cppyy_?
-
-_cppyy_ is based on dynamic parsing of C++ code and *just-in-time* (JIT)
-compilation of bindings via the LLVM compiler infrastructure. The authors of
-_cppyy_ report that their tool produces bindings with much lower overheads
-compared to _pybind11_, and the above plots show that this is indeed true.
-However, _nanobind_ retakes the performance lead in these experiments.
-
-With speed gone as the main differentiating factor, other qualitative
-differences make these two tools appropriate to different audiences: _cppyy_
-has its origin in CERN's ROOT mega-project and must be highly dynamic to work
-with that codebase: it can parse header files to generate bindings as needed.
-_cppyy_ works particularly well together with PyPy and can avoid
-boxing/unboxing overheads with this combination. The main downside of _cppyy_
-is that it depends on big and complex machinery (Cling/Clang/LLVM) that must
-be deployed on the user's side and then run there. There isn't a way of
-pre-generating bindings and then shipping just the output of this process.
-
-_nanobind_ is relatively static in comparison: you must tell it which functions
-to expose via binding declarations. These declarations offer a high degree of
-flexibility that users will typically use to create bindings that feel
-_pythonic_. At compile-time, those declarations turn into a sequence of CPython
-API calls, which produces self-contained bindings that are easy to redistribute
-via [PyPI](https://pypi.org) or elsewhere. Tools like
-[cibuildwheel](https://cibuildwheel.readthedocs.io/en/stable/) and
-[scikit-build](https://scikit-build.readthedocs.io/en/latest/index.html) can
-fully automate the process of generating _Python wheels_ for each target
-platform. A minimal [example
-project](https://github.com/wjakob/nanobind_example) shows how to do this
-automatically via [GitHub Actions](https://github.com/features/actions).
-
-## What are technical differences between _nanobind_ and _pybind11_?
-
-_nanobind_ and _pybind11_ are the most similar of all of the binding tools
-compared above.
-
-The main difference is between them is a change in philosophy: _pybind11_ must
-deal with *all of C++* to bind complex legacy codebases, while _nanobind_
-targets a smaller C++ subset. **The codebase has to adapt to the binding tool
-and not the other way around!**, which allows _nanobind_ to be simpler and
-faster. Pull requests with extensions and generalizations were welcomed in
-_pybind11_, but they will likely be rejected in this project.
-
-An overview of removed features is provided in a [separate
-document](https://github.com/wjakob/nanobind/blob/master/docs/removed.md).
-Besides feature removal, the rewrite was also an opportunity to address
-long-standing performance issues in _pybind11_:
-
-- C++ objects are now co-located with the Python object whenever possible (less
-  pointer chasing compared to _pybind11_). The per-instance overhead for
-  wrapping a C++ type into a Python object shrinks by 2.3x. (_pybind11_: 56
-  bytes, _nanobind_: 24 bytes.)
-
-- C++ function binding information is now co-located with the Python function
-  object (less pointer chasing).
-
-- C++ type binding information is now co-located with the Python type object
-  (less pointer chasing, fewer hashtable lookups).
-
-- _nanobind_ internally replaces `std::unordered_map` with a more efficient
-  hash table ([tsl::robin_map](https://github.com/Tessil/robin-map), which is
-  included as a git submodule).
-
-- function calls from/to Python are realized using [PEP 590 vector
-  calls](https://www.python.org/dev/peps/pep-0590), which gives a nice speed
-  boost. The main function dispatch loop no longer allocates heap memory.
-
-- _pybind11_ was designed as a header-only library, which is generally a good
-  thing because it simplifies the compilation workflow. However, one major
-  downside of this is that a large amount of redundant code has to be compiled
-  in each binding file (e.g., the function dispatch loop and all of the related
-  internal data structures). _nanobind_ compiles a separate shared or static
-  support library (`libnanobind`) and links it against the binding code to
-  avoid redundant compilation. When using the CMake `nanobind_add_module()`
-  function, this all happens transparently.
-
-- `#include <pybind11/pybind11.h>` pulls in a large portion of the STL (about
-  2.1 MiB of headers with Clang and libc++). _nanobind_ minimizes STL usage to
-  avoid this problem. Type casters even for for basic types like `std::string`
-  require an explicit opt-in by including an extra header file (e.g. `#include
-  <nanobind/stl/string.h>`).
-
-- _pybind11_ is dependent on *link time optimization* (LTO) to produce
-  reasonably-sized bindings, which makes linking a build time bottleneck. With
-  _nanobind_'s split into a precompiled core library and minimal
-  metatemplating, LTO is no longer important.
-
-- _nanobind_ maintains efficient internal data structures for lifetime
-  management (needed for `nb::keep_alive`, `nb::rv_policy::reference_internal`,
-  the `std::shared_ptr` interface, etc.). With these changes, it is no longer
-  necessary that bound types are weak-referenceable, which saves a pointer per
-  instance.
-
-### Other improvements
-
-Besides performance improvements, _nanobind_ includes a quality-of-live
-improvements for developers:
-
-- _nanobind_ has [greatly
-  improved](https://github.com/wjakob/nanobind/blob/master/docs/tensor.md)
-  support for exchanging CPU/GPU/TPU/.. tensor data structures with modern
-  array programming frameworks.
-
-- _nanobind_ can target Python's [stable ABI
-  interface](https://docs.python.org/3/c-api/stable.html) starting with Python
-  3.12. This means that extension modules will eventually be compatible with
-  any future version of Python without having to compile separate binaries per
-  version. That vision is still far out, however: it will require Python 3.12+
-  to be widely deployed.
-
-- When the python interpreter shuts down, _nanobind_ reports instance, type,
-  and function leaks related to bindings, which is useful for tracking down
-  reference counting issues.
-
-- _nanobind_ deletes its internal data structures when the Python interpreter
-  terminates, which avoids memory leak reports in tools like _valgrind_.
-
-- In _pybind11_, function docstrings are pre-rendered while the binding code
-  runs (`.def(...)`). This can create confusing signatures containing C++ types
-  when the binding code of those C++ types hasn't yet run. _nanobind_ does not
-  pre-render function docstrings: they are created on the fly when queried.
-
-- _nanobind_ docstrings have improved out-of-the-box compatibility with tools
-  like [Sphinx](https://www.sphinx-doc.org/en/master/).
-
-### Dependencies
-
-_nanobind_ depends on recent versions of everything:
-
-- **C++17**: The `if constexpr` feature was crucial to simplify the internal
-  meta-templating of this library.
-- **Python 3.8+**: _nanobind_ heavily relies on [PEP 590 vector
-  calls](https://www.python.org/dev/peps/pep-0590) that were introduced in
-  version 3.8.
-- **CMake 3.15+**: Recent CMake versions include important improvements to
-  `FindPython` that this project depends on.
-- **Supported compilers**: Clang 7, GCC 8, MSVC2019 (or newer) are officially
-  supported.
-
-  Other compilers like MinGW, Intel (icpc, oneAPI), NVIDIA (PGI, nvcc) may or
-  may not work but aren't officially supported. Pull requests to work around
-  bugs in these compilers will not be accepted, as similar changes introduced
-  significant complexity in _pybind11_. Instead, please file bugs with the
-  vendors so that they will fix their compilers.
-
-### CMake interface
-
-_nanobind_ integrates with CMake to simplify binding compilation. Please see
-the [separate
-writeup](https://github.com/wjakob/nanobind/blob/master/docs/cmake.md) for
-details.
-
-The easiest way to get started is by cloning
-[`nanobind_example`](https://github.com/wjakob/nanobind_example), which is a
-minimal project with _nanobind_-based bindings compiled via CMake and
-[`scikit-build`](https://scikit-build.readthedocs.io/en/latest/). It also shows
-how to use GitHub Actions to deploy binary wheels for a variety of platforms.
-
-### API differences
-
-_nanobind_ mostly follows the _pybind11_ API, hence the [pybind11
-documentation](https://pybind11.readthedocs.io/en/stable) is the main source of
-documentation for this project. A number of simplifications and noteworthy
-changes are detailed below.
-
-- **Namespace**. _nanobind_ types and functions are located in the `nanobind` namespace. The
-  `namespace nb = nanobind;` shorthand alias is recommended.
-
-- **Macros**. The `PYBIND11_*` macros (e.g., `PYBIND11_OVERRIDE(..)`) were
-  renamed to `NB_*` (e.g., `NB_OVERRIDE(..)`).
-
-- **Shared pointers and holders**. _nanobind_ removes the concept of a _holder
-  type_, which caused inefficiencies and introduced complexity in _pybind11_.
-  This has implications on object ownership, shared ownership, and interactions
-  with C++ shared/unique pointers.
-
-  Please see the following [separate page](docs/ownership.md) for the
-  nitty-gritty details on shared and unique pointers. Classes with _intrusive_
-  reference counting also continue to be supported, please see the [linked
-  page](docs/intrusive.md) for details.
-
-  The gist is that use of shared/unique pointers requires one or both of the
-  following optional header files:
-
-  - [`nanobind/stl/unique_ptr.h`](https://github.com/wjakob/nanobind/blob/master/include/nanobind/stl/unique_ptr.h)
-  - [`nanobind/stl/shared_ptr.h`](https://github.com/wjakob/nanobind/blob/master/include/nanobind/stl/shared_ptr.h)
-
-  Binding functions that take ``std::unique_ptr<T>`` arguments involves some
-  limitations that can be avoided by changing their signatures to use
-  ``std::unique_ptr<T, nb::deleter<T>>`` instead. Usage of
-  ``std::enable_shared_from_this<T>`` is prohibited and will raise a
-  compile-time assertion. This is consistent with the philosophy of this
-  library: _the codebase has to adapt to the binding tool and not the other way
-  around_.
-
-  It is no longer necessary to specify holder types in the type declaration:
-
-  _pybind11_:
-  ```cpp
-  py::class_<MyType, std::shared_ptr<MyType>>(m, "MyType")
-    ...
-  ```
-
-  _nanobind_:
-  ```cpp
-  nb::class_<MyType>(m, "MyType")
-    ...
-  ```
-
-- **Null pointers**. In contrast to _pybind11_, _nanobind_ by default does
-  _not_ permit ``None``-valued arguments during overload resolution. They need
-  to be enabled explicitly using the ``.none()`` member of an argument
-  annotation.
-
-  ```cpp
-      .def("func", &func, "arg"_a.none());
-  ```
-
-  It is also possible to set a ``None`` default value as follows:
-
-  ```cpp
-      .def("func", &func, "arg"_a.none() = nb::none());
-  ```
-
-- **Implicit type conversions**. In _pybind11_, implicit conversions were
-  specified using a follow-up function call. In _nanobind_, they are specified
-  within the constructor declarations:
-
-  _pybind11_:
-  ```cpp
-  py::class_<MyType>(m, "MyType")
-      .def(py::init<MyOtherType>());
-
-  py::implicitly_convertible<MyOtherType, MyType>();
-  ```
-
-  _nanobind_:
-  ```cpp
-  nb::class_<MyType>(m, "MyType")
-      .def(nb::init_implicit<MyOtherType>());
-  ```
-
-- **Custom constructors**: In _pybind11_, custom constructors (i.e. ones that
-  do not already exist in the C++ class) could be specified as lambda function
-  returning an instance of the desired type.
-
-  ```
-  nb::class_<MyType>(m, "MyType")
-      .def(nb::init([](int) { return MyType(...); }));
-
-  ```
-
-  Unfortunately, the implementation of this feature was quite complex and often
-  required involved further internal calls to the move or copy constructor.
-  *nanobind* instead reverts to how pybind11 originally implemented this
-  feature using in-place construction ("[placement
-  new](https://en.wikipedia.org/wiki/Placement_syntax)"):
-
-  ```
-  nb::class_<MyType>(m, "MyType")
-      .def("__init__", [](MyType *t) { new (t) MyType(...); });
-  ```
-
-  The provided lambda function will be called with a pointer to uninitialized
-  memory that has already been allocated (this memory region is co-located with
-  the Python object for reasons of efficiency). The lambda function can then
-  either run an in-place constructor and return normally (in which case the
-  instance is assumed to be correctly constructed) or fail by raising an
-  exception.
-
-- **Trampoline classes.** Trampolines, i.e., polymorphic class implementations
-  that forward virtual function calls to Python, now require an extra
-  `NB_TRAMPOLINE(parent, size)` declaration, where `parent` refers to the
-  parent class and `size` is at least as big as the number of `NB_OVERRIDE_*()`
-  calls. _nanobind_ caches information to enable efficient function dispatch,
-  for which it must know the number of trampoline "slots". Example:
-
-  ```cpp
-  struct PyAnimal : Animal {
-      NB_TRAMPOLINE(Animal, 1);
-
-      std::string name() const override {
-          NB_OVERRIDE(std::string, Animal, name);
-      }
-  };
-  ```
-
-  Trampoline declarations with an insufficient size may eventually trigger a
-  Python `RuntimeError` exception with a descriptive label, e.g.
-  `nanobind::detail::get_trampoline('PyAnimal::what()'): the trampoline ran out
-  of slots (you will need to increase the value provided to the NB_TRAMPOLINE()
-  macro)!`.
-
-- **Type casters.** The API of custom type casters has changed _significantly_.
-  In a nutshell, the following changes are needed:
-
-  - `load()` was renamed to `from_python()`. The function now takes an extra
-    `uint8_t flags` (instead `bool convert`, which is now represented by the
-    flag `nanobind::detail::cast_flags::convert`). A `cleanup_list *` pointer
-    keeps track of Python temporaries that are created by the conversion, and
-    which need to be deallocated after a function call has taken place. `flags`
-    and `cleanup` should be passed to any recursive usage of
-    `type_caster::from_python()`.
-
-  - `cast()` was renamed to `from_cpp()`. The function takes a return value
-    policy (as before) and a `cleanup_list *` pointer.
-
-  Both functions must be marked as `noexcept`. In contrast to _pybind11_,
-  errors during type casting are only propagated using status codes. If a
-  severe error condition arises that should be reported, use Python warning API
-  calls for this, e.g. `PyErr_WarnFormat()`.
-
-  Note that the cleanup list is only available when `from_python()` or
-  `from_cpp()` are called as part of function dispatch, while usage by
-  `nanobind::cast()` sets `cleanup` to `nullptr`. This case should be handled
-  gracefully by refusing the conversion if the cleanup list is absolutely required.
-
-  The [std::pair type
-  caster](https://github.com/wjakob/nanobind/blob/master/include/nanobind/stl/pair.h)
-  may be useful as a reference for these changes.
-
-- The following types and functions were renamed:
-
-  | _pybind11_           | _nanobind_      |
-  | -------------------- | --------------- |
-  | `error_already_set`  | `python_error`  |
-  | `type::of<T>`        | `type<T>`       |
-  | `type`               | `type_object`   |
-  | `reinterpret_borrow` | `borrow`        |
-  | `reinterpret_steal`  | `steal`         |
-  | `custom_type_setup`  | `type_callback` |
-
-- **New features.**
-
-  - **Unified DLPack/Buffer protocol integration**: _nanobind_ can retrieve and
-    return tensors using two standard protocols:
-    [DLPack](https://github.com/dmlc/dlpack), and the the [buffer
-    protocol](https://docs.python.org/3/c-api/buffer.html). This enables
-    zero-copy data exchange of CPU and GPU tensors with array programming
-    frameworks including [NumPy](https://numpy.org),
-    [PyTorch](https://pytorch.org), [TensorFlow](https://www.tensorflow.org),
-    [JAX](https://jax.readthedocs.io), etc.
-
-    Details on using this feature can be found
-    [here](https://github.com/wjakob/nanobind/blob/master/docs/tensor.md).
-
-
-  - **Supplemental type data**: _nanobind_ can store supplemental data along
-    with registered types. An example use of this fairly advanced feature are
-    libraries that register large numbers of different types (e.g. flavors of
-    tensors). A single generically implemented function can then query this
-    supplemental information to handle each type slightly differently.
-
-    ```cpp
-    struct Supplement {
-        ... // should be a POD (plain old data) type
-    };
-
-    // Register a new type Test, and reserve space for sizeof(Supplement)
-    nb::class_<Test> cls(m, "Test", nb::supplement<Supplement>(), nb::is_final())
-
-    /// Mutable reference to 'Supplement' portion in Python type object
-    Supplement &supplement = nb::type_supplement<Supplement>(cls);
-    ```
-
-    The supplement is not propagated to subclasses created within Python.
-    Such types should therefore be created with `nb::is_final()`.
-
-  - **Low-level interface**: _nanobind_ exposes a low-level interface to
-    provide fine-grained control over the sequence of steps that instantiates a
-    Python object wrapping a C++ instance. Like the above point, this is useful
-    when writing generic binding code that manipulates _nanobind_-based objects
-    of various types.
-
-    Details on using this feature can be found
-    [here](https://github.com/wjakob/nanobind/blob/master/docs/lowlevel.md).
-
-  - **Python type wrappers**: The `nb::handle_t<T>` type behaves just like the
-    `nb::handle` class and wraps a `PyObject *` pointer. However, when binding
-    a function that takes such an argument, _nanobind_ will only call the
-    associated function overload when the underlying Python object wraps a C++
-    instance of type `T`.
-
-    Siimlarly, the `nb::type_object_t<T>` type behaves just like the
-    `nb::type_object` class and wraps a `PyTypeObject *` pointer. However, when
-    binding a function that takes such an argument, _nanobind_ will only call
-    the associated function overload when the underlying Python type object is
-    a subtype of the C++ type `T`.
-
-  - **Raw docstrings**: In cases where absolute control over docstrings is
-    required (for example, so that complex cases can be parsed by a tool like
-    [Sphinx](https://www.sphinx-doc.org)), the ``nb::raw_doc`` attribute can be
-    specified to functions. In this case, _nanobind_ will _skip_ generation of
-    a combined docstring that enumerates overloads along with type information.
-
-    Example:
-
-    ```cpp
-    m.def("identity", [](float arg) { return arg; });
-    m.def("identity", [](int arg) { return arg; },
-          nb::raw_doc(
-              "identity(arg)\n"
-              "An identity function for integers and floats\n"
-              "\n"
-              "Args:\n"
-              "    arg (float | int): Input value\n"
-              "\n"
-              "Returns:\n"
-              "    float | int: Result of the identity operation"));
-    ```
-
-    Writing detailed docstrings in this way is rather tedious. In practice,
-    they would usually be extracted from C++ heades using a tool like
-    [pybind11_mkdoc](https://github.com/pybind/pybind11_mkdoc).
-
-## How to cite this project?
-
-Please use the following BibTeX template to cite nanobind in scientific
-discourse:
-
-```bibtex
-@misc{nanobind,
-   author = {Wenzel Jakob},
-   year = {2022},
-   note = {https://github.com/wjakob/nanobind},
-   title = {nanobind -- Seamless operability between C++17 and Python}
-}
-```
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/cmake/nanobind-config.cmake b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/cmake/nanobind-config.cmake
deleted file mode 100644
index fe349c17a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/cmake/nanobind-config.cmake
+++ /dev/null
@@ -1,247 +0,0 @@
-include_guard(GLOBAL)
-
-if (NOT TARGET Python3::Module)
-  message(FATAL_ERROR "You must invoke 'find_package(Python3 COMPONENTS Interpreter Development REQUIRED)' prior to including nanobind.")
-endif()
-
-# Determine the Python extension suffix and stash in the CMake cache
-execute_process(
-  COMMAND "${Python3_EXECUTABLE}" "-c"
-    "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))"
-  RESULT_VARIABLE NB_SUFFIX_RET
-  OUTPUT_VARIABLE NB_SUFFIX
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-if (NB_SUFFIX_RET AND NOT NB_SUFFIX_RET EQUAL 0)
-  message(FATAL_ERROR "nanobind: Python sysconfig query to "
-    "find 'EXT_SUFFIX' property failed!")
-endif()
-
-set(NB_SUFFIX ${NB_SUFFIX} CACHE INTERNAL "")
-
-get_filename_component(NB_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(NB_DIR "${NB_DIR}" PATH)
-set(NB_DIR ${NB_DIR} CACHE INTERNAL "")
-
-# ---------------------------------------------------------------------------
-# Helper function to strip unnecessary sections from binaries on Linux/macOS
-# ---------------------------------------------------------------------------
-function(nanobind_strip name)
-  if (CMAKE_STRIP AND NOT MSVC AND NOT CMAKE_BUILD_TYPE MATCHES Debug|RelWithDebInfo)
-    if(APPLE)
-      set(NB_STRIP_OPT -x)
-    endif()
-
-    add_custom_command(
-      TARGET ${name}
-      POST_BUILD
-      COMMAND ${CMAKE_STRIP} ${NB_STRIP_OPT} $<TARGET_FILE:${name}>)
-  endif()
-endfunction()
-
-
-# ---------------------------------------------------------------------------
-# Create shared/static library targets for nanobind's non-templated core
-# ---------------------------------------------------------------------------
-
-function (nanobuild_build_library TARGET_NAME TARGET_TYPE)
-  if (TARGET ${TARGET_NAME})
-    return()
-  endif()
-
-  add_library(${TARGET_NAME} ${TARGET_TYPE}
-    EXCLUDE_FROM_ALL
-    ${NB_DIR}/include/nanobind/nanobind.h
-    ${NB_DIR}/include/nanobind/nb_attr.h
-    ${NB_DIR}/include/nanobind/nb_cast.h
-    ${NB_DIR}/include/nanobind/nb_descr.h
-    ${NB_DIR}/include/nanobind/nb_error.h
-    ${NB_DIR}/include/nanobind/nb_lib.h
-    ${NB_DIR}/include/nanobind/nb_python.h
-    ${NB_DIR}/include/nanobind/nb_tuple.h
-    ${NB_DIR}/include/nanobind/nb_accessor.h
-    ${NB_DIR}/include/nanobind/nb_call.h
-    ${NB_DIR}/include/nanobind/nb_class.h
-    ${NB_DIR}/include/nanobind/nb_defs.h
-    ${NB_DIR}/include/nanobind/nb_enums.h
-    ${NB_DIR}/include/nanobind/nb_func.h
-    ${NB_DIR}/include/nanobind/nb_misc.h
-    ${NB_DIR}/include/nanobind/nb_traits.h
-    ${NB_DIR}/include/nanobind/nb_types.h
-    ${NB_DIR}/include/nanobind/trampoline.h
-    ${NB_DIR}/include/nanobind/tensor.h
-    ${NB_DIR}/include/nanobind/operators.h
-    ${NB_DIR}/include/nanobind/stl/shared_ptr.h
-    ${NB_DIR}/include/nanobind/stl/unique_ptr.h
-    ${NB_DIR}/include/nanobind/stl/string.h
-    ${NB_DIR}/include/nanobind/stl/tuple.h
-    ${NB_DIR}/include/nanobind/stl/pair.h
-    ${NB_DIR}/include/nanobind/stl/function.h
-    ${NB_DIR}/include/nanobind/stl/vector.h
-    ${NB_DIR}/include/nanobind/stl/list.h
-
-    ${NB_DIR}/src/buffer.h
-    ${NB_DIR}/src/nb_internals.h
-    ${NB_DIR}/src/nb_internals.cpp
-    ${NB_DIR}/src/nb_func.cpp
-    ${NB_DIR}/src/nb_type.cpp
-    ${NB_DIR}/src/nb_enum.cpp
-    ${NB_DIR}/src/common.cpp
-    ${NB_DIR}/src/error.cpp
-    ${NB_DIR}/src/tensor.cpp
-    ${NB_DIR}/src/trampoline.cpp
-    ${NB_DIR}/src/implicit.cpp
-  )
-
-  if (TARGET_TYPE STREQUAL "SHARED")
-    if (APPLE)
-      target_link_options(${TARGET_NAME} PRIVATE -undefined dynamic_lookup)
-    endif()
-
-    target_compile_definitions(${TARGET_NAME} PRIVATE -DNB_BUILD)
-    target_compile_definitions(${TARGET_NAME} PUBLIC -DNB_SHARED)
-    nanobind_strip(${TARGET_NAME})
-
-    # LTO causes problems in a static build, but use it in shared release builds
-    set_target_properties(${TARGET_NAME} PROPERTIES
-      INTERPROCEDURAL_OPTIMIZATION_RELEASE ON
-      INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL ON)
-  endif()
-
-  set_target_properties(${TARGET_NAME} PROPERTIES
-    POSITION_INDEPENDENT_CODE ON)
-
-  if (MSVC)
-    # C++20 needed for designated initializers on MSVC..
-    target_compile_features(${TARGET_NAME} PRIVATE cxx_std_20)
-    # Do not complain about vsnprintf
-    target_compile_definitions(${TARGET_NAME} PRIVATE -D_CRT_SECURE_NO_WARNINGS)
-  else()
-    target_compile_features(${TARGET_NAME} PRIVATE cxx_std_17)
-    target_compile_options(${TARGET_NAME} PRIVATE -fno-strict-aliasing)
-  endif()
-
-  if (WIN32)
-    target_link_libraries(${TARGET_NAME} PUBLIC Python3::Module)
-  endif()
-
-  target_include_directories(${TARGET_NAME} PRIVATE
-    ${NB_DIR}/include
-    ${NB_DIR}/ext/robin_map/include
-    ${Python3_INCLUDE_DIRS})
-endfunction()
-
-# ---------------------------------------------------------------------------
-# Define a convenience function for creating nanobind targets
-# ---------------------------------------------------------------------------
-
-function(nanobind_opt_size name)
-  if (MSVC)
-    set(NB_OPT_SIZE /Os)
-  else()
-    set(NB_OPT_SIZE -Os)
-  endif()
-
-  target_compile_options(${name} PRIVATE
-      $<$<CONFIG:Release>:${NB_OPT_SIZE}>
-      $<$<CONFIG:MinSizeRel>:${NB_OPT_SIZE}>
-      $<$<CONFIG:RelWithDebInfo>:${NB_OPT_SIZE}>)
-endfunction()
-
-function(nanobind_disable_stack_protector name)
-  if (NOT MSVC)
-    # The stack protector affects binding size negatively (+8% on Linux in my
-    # benchmarks). Protecting from stack smashing in a Python VM seems in any
-    # case futile, so let's get rid of it by default in optimized modes.
-    target_compile_options(${name} PRIVATE
-        $<$<CONFIG:Release>:-fno-stack-protector>
-        $<$<CONFIG:MinSizeRel>:-fno-stack-protector>
-        $<$<CONFIG:RelWithDebInfo>:-fno-stack-protector>)
-  endif()
-endfunction()
-
-function(nanobind_extension name)
-  set_target_properties(${name} PROPERTIES PREFIX "" SUFFIX "${NB_SUFFIX}")
-endfunction()
-
-function(nanobind_extension_abi3 name)
-  get_filename_component(ext "${NB_SUFFIX}" LAST_EXT)
-  set_target_properties(${name} PROPERTIES PREFIX "" SUFFIX ".abi3${ext}")
-endfunction()
-
-function (nanobind_cpp17 name)
-  target_compile_features(${name} PRIVATE cxx_std_17)
-  set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX)
-endfunction()
-
-function (nanobind_msvc)
-  if (MSVC)
-    target_compile_options(${name} PRIVATE /bigobj /MP)
-  endif()
-endfunction()
-
-function (nanobind_lto name)
-  set_target_properties(${name} PROPERTIES
-    INTERPROCEDURAL_OPTIMIZATION_RELEASE ON
-    INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL ON)
-endfunction()
-
-function (nanobind_headers name)
-  target_include_directories(${name} PRIVATE ${NB_DIR}/include)
-endfunction()
-
-function(nanobind_add_module name)
-  cmake_parse_arguments(PARSE_ARGV 1 ARG "NOMINSIZE;STABLE_ABI;NOSTRIP;NB_STATIC;NB_SHARED;PROTECT_STACK;LTO" "" "")
-
-  Python3_add_library(${name} MODULE ${ARG_UNPARSED_ARGUMENTS})
-
-  nanobind_cpp17(${name})
-  nanobind_msvc(${name})
-  nanobind_headers(${name})
-
-  # Limited API interface only supported in Python >= 3.12
-  if ((Python3_VERSION_MAJOR EQUAL 3) AND (Python3_VERSION_MINOR LESS 12))
-    set(ARG_STABLE_ABI OFF)
-  endif()
-
-  if (ARG_STABLE_ABI)
-    if (ARG_NB_STATIC)
-      nanobuild_build_library(nanobind-static-abi3 STATIC)
-      set(libname nanobind-static-abi3)
-    else()
-      nanobuild_build_library(nanobind-abi3 SHARED)
-      set(libname nanobind-abi3)
-    endif()
-
-    target_compile_definitions(${libname} PUBLIC -DPy_LIMITED_API=0x030C0000)
-    nanobind_extension_abi3(${name})
-  else()
-    if (ARG_NB_STATIC)
-      nanobuild_build_library(nanobind-static STATIC)
-      set(libname nanobind-static)
-    else()
-      nanobuild_build_library(nanobind SHARED)
-      set(libname nanobind)
-    endif()
-
-    nanobind_extension(${name})
-  endif()
-
-  target_link_libraries(${name} PRIVATE ${libname})
-
-  if (NOT ARG_PROTECT_STACK)
-    nanobind_disable_stack_protector(${name})
-  endif()
-
-  if (NOT ARG_NOMINSIZE)
-    nanobind_opt_size(${name})
-  endif()
-
-  if (NOT ARG_NOSTRIP)
-    nanobind_strip(${name})
-  endif()
-
-  if (ARG_LTO)
-    nanobind_lto(${name})
-  endif()
-endfunction()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/CMakeLists.txt
deleted file mode 100644
index 924f38f02..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-include(GNUInstallDirs)
-
-
-project(tsl-robin-map VERSION 0.6.3)
-
-add_library(robin_map INTERFACE)
-# Use tsl::robin_map as target, more consistent with other libraries conventions (Boost, Qt, ...)
-add_library(tsl::robin_map ALIAS robin_map)
-
-target_include_directories(robin_map INTERFACE
-                           "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-                           "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
-
-list(APPEND headers "${CMAKE_CURRENT_SOURCE_DIR}/include/tsl/robin_growth_policy.h"
-                    "${CMAKE_CURRENT_SOURCE_DIR}/include/tsl/robin_hash.h"
-                    "${CMAKE_CURRENT_SOURCE_DIR}/include/tsl/robin_map.h"
-                    "${CMAKE_CURRENT_SOURCE_DIR}/include/tsl/robin_set.h")
-target_sources(robin_map INTERFACE "$<BUILD_INTERFACE:${headers}>")
-
-if(MSVC)
-    target_sources(robin_map INTERFACE
-                   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tsl-robin-map.natvis>"
-                   "$<INSTALL_INTERFACE:${CMAKE_INSTALL_DATAROOTDIR}/tsl-robin-map.natvis>")
-endif()
-
-
-
-
-# Installation (only compatible with CMake version >= 3.3)
-if(${CMAKE_VERSION} VERSION_GREATER "3.2")
-    include(CMakePackageConfigHelpers)
-
-    ## Install include directory and potential natvis file
-    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/tsl"
-            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-
-    if(MSVC)
-        install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/tsl-robin-map.natvis"
-                DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}")
-    endif()
-
-
-
-    ## Create and install tsl-robin-mapConfig.cmake
-    configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/tsl-robin-mapConfig.cmake.in"
-                                  "${CMAKE_CURRENT_BINARY_DIR}/tsl-robin-mapConfig.cmake"
-                                  INSTALL_DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/tsl-robin-map")
-
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tsl-robin-mapConfig.cmake"
-            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/tsl-robin-map")
-
-
-
-    ## Create and install tsl-robin-mapTargets.cmake
-    install(TARGETS robin_map
-            EXPORT tsl-robin-mapTargets)
-
-    install(EXPORT tsl-robin-mapTargets
-            NAMESPACE tsl::
-            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/tsl-robin-map")
-
-
-
-    ## Create and install tsl-robin-mapConfigVersion.cmake
-    # tsl-robin-map is header-only and does not depend on the architecture.
-    # Remove CMAKE_SIZEOF_VOID_P from tsl-robin-mapConfigVersion.cmake so that a
-    # tsl-robin-mapConfig.cmake generated for a 64 bit target can be used for 32 bit
-    # targets and vice versa.
-    set(CMAKE_SIZEOF_VOID_P_BACKUP ${CMAKE_SIZEOF_VOID_P})
-    unset(CMAKE_SIZEOF_VOID_P)
-    write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/tsl-robin-mapConfigVersion.cmake"
-                                     COMPATIBILITY SameMajorVersion)
-    set(CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P_BACKUP})
-
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tsl-robin-mapConfigVersion.cmake"
-            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/tsl-robin-map")
-endif()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/LICENSE
deleted file mode 100644
index e9c5ae95f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/README.md b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/README.md
deleted file mode 100644
index 612b277b1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/README.md
+++ /dev/null
@@ -1,483 +0,0 @@
-[![Build Status](https://travis-ci.org/Tessil/robin-map.svg?branch=master)](https://travis-ci.org/Tessil/robin-map) [![Build status](https://ci.appveyor.com/api/projects/status/lo79n4ya4nta79q4/branch/master?svg=true)](https://ci.appveyor.com/project/Tessil/robin-map/branch/master)
-
-## A C++ implementation of a fast hash map and hash set using robin hood hashing
-
-The robin-map library is a C++ implementation of a fast hash map and hash set using open-addressing and linear robin hood hashing with backward shift deletion to resolve collisions.
-
-Four classes are provided: `tsl::robin_map`, `tsl::robin_set`, `tsl::robin_pg_map` and `tsl::robin_pg_set`. The first two are faster and use a power of two growth policy, the last two use a prime growth policy instead and are able to cope better with a poor hash function. Use the prime version if there is a chance of repeating patterns in the lower bits of your hash (e.g. you are storing pointers with an identity hash function). See [GrowthPolicy](#growth-policy) for details.
-
-A **benchmark** of `tsl::robin_map` against other hash maps may be found [here](https://tessil.github.io/2016/08/29/benchmark-hopscotch-map.html). This page also gives some advices on which hash table structure you should try for your use case (useful if you are a bit lost with the multiple hash tables implementations in the `tsl` namespace).
-
-### Key features
-
-- Header-only library, just add the [include](include/) directory to your include path and you are ready to go. If you use CMake, you can also use the `tsl::robin_map` exported target from the [CMakeLists.txt](CMakeLists.txt).
-- Fast hash table, check the [benchmark](https://tessil.github.io/2016/08/29/benchmark-hopscotch-map.html) for some numbers.
-- Support for move-only and non-default constructible key/value.
-- Support for heterogeneous lookups allowing the usage of `find` with a type different than `Key` (e.g. if you have a map that uses `std::unique_ptr<foo>` as key, you can use a `foo*` or a `std::uintptr_t` as key parameter to `find` without constructing a `std::unique_ptr<foo>`, see [example](#heterogeneous-lookups)).
-- No need to reserve any sentinel value from the keys.
-- Possibility to store the hash value alongside the stored key-value for faster rehash and lookup if the hash or the key equal functions are expensive to compute. Note that hash may be stored even if not asked explicitly when the library can detect that it will have no impact on the size of the structure in memory due to alignment. See the [StoreHash](https://tessil.github.io/robin-map/classtsl_1_1robin__map.html#details) template parameter for details.
-- If the hash is known before a lookup, it is possible to pass it as parameter to speed-up the lookup (see `precalculated_hash` parameter in [API](https://tessil.github.io/robin-map/classtsl_1_1robin__map.html#a35021b11aabb61820236692a54b3a0f8)).
-- Support for efficient serialization and deserialization (see [example](#serialization) and the `serialize/deserialize` methods in the [API](https://tessil.github.io/robin-map/classtsl_1_1robin__map.html) for details).
-- The library can be used with exceptions disabled (through `-fno-exceptions` option on Clang and GCC, without an `/EH` option on MSVC or simply by defining `TSL_NO_EXCEPTIONS`). `std::terminate` is used in replacement of the `throw` instruction when exceptions are disabled.
-- API closely similar to `std::unordered_map` and `std::unordered_set`.
-
-### Differences compared to `std::unordered_map`
-
-`tsl::robin_map` tries to have an interface similar to `std::unordered_map`, but some differences exist.
-- The **strong exception guarantee only holds** if the following statement is true `std::is_nothrow_swappable<value_type>::value && std::is_nothrow_move_constructible<value_type>::value` (where `value_type` is `Key` for `tsl::robin_set` and `std::pair<Key, T>` for `tsl::robin_map`). Otherwise if an exception is thrown during the swap or the move, the structure may end up in a undefined state. Note that per the standard, a `value_type` with a noexcept copy constructor and no move constructor also satisfies this condition and will thus guarantee the strong exception guarantee for the structure (see [API](https://tessil.github.io/robin-map/classtsl_1_1robin__map.html#details) for details).
-- The type `Key`, and also `T` in case of map, must be swappable. They must also be copy and/or move constructible.
-- Iterator invalidation doesn't behave in the same way, any operation modifying the hash table invalidate them (see [API](https://tessil.github.io/robin-map/classtsl_1_1robin__map.html#details) for details).
-- References and pointers to keys or values in the map are invalidated in the same way as iterators to these keys-values.
-- For iterators of `tsl::robin_map`, `operator*()` and `operator->()` return a reference and a pointer to `const std::pair<Key, T>` instead of `std::pair<const Key, T>` making the value `T` not modifiable. To modify the value you have to call the `value()` method of the iterator to get a mutable reference. Example:
-```c++
-tsl::robin_map<int, int> map = {{1, 1}, {2, 1}, {3, 1}};
-for(auto it = map.begin(); it != map.end(); ++it) {
-    //it->second = 2; // Illegal
-    it.value() = 2; // Ok
-}
-```
-- No support for some buckets related methods (like `bucket_size`, `bucket`, ...).
-
-These differences also apply between `std::unordered_set` and `tsl::robin_set`.
-
-Thread-safety guarantees are the same as `std::unordered_map/set` (i.e. possible to have multiple readers with no writer).
-
-### Growth policy
-
-The library supports multiple growth policies through the `GrowthPolicy` template parameter. Three policies are provided by the library but you can easily implement your own if needed.
-
-* **[tsl::rh::power_of_two_growth_policy.](https://tessil.github.io/robin-map/classtsl_1_1rh_1_1power__of__two__growth__policy.html)** Default policy used by `tsl::robin_map/set`. This policy keeps the size of the bucket array of the hash table to a power of two. This constraint allows the policy to avoid the usage of the slow modulo operation to map a hash to a bucket, instead of <code>hash % 2<sup>n</sup></code>, it uses <code>hash & (2<sup>n</sup> - 1)</code> (see [fast modulo](https://en.wikipedia.org/wiki/Modulo_operation#Performance_issues)). Fast but this may cause a lot of collisions with a poor hash function as the modulo with a power of two only masks the most significant bits in the end.
-* **[tsl::rh::prime_growth_policy.](https://tessil.github.io/robin-map/classtsl_1_1rh_1_1prime__growth__policy.html)** Default policy used by `tsl::robin_pg_map/set`. The policy keeps the size of the bucket array of the hash table to a prime number. When mapping a hash to a bucket, using a prime number as modulo will result in a better distribution of the hash across the buckets even with a poor hash function. To allow the compiler to optimize the modulo operation, the policy use a lookup table with constant primes modulos (see [API](https://tessil.github.io/robin-map/classtsl_1_1rh_1_1prime__growth__policy.html#details) for details). Slower than `tsl::rh::power_of_two_growth_policy` but more secure.
-* **[tsl::rh::mod_growth_policy.](https://tessil.github.io/robin-map/classtsl_1_1rh_1_1mod__growth__policy.html)** The policy grows the map by a customizable growth factor passed in parameter. It then just use the modulo operator to map a hash to a bucket. Slower but more flexible.
-
-
-To implement your own policy, you have to implement the following interface.
-
-```c++
-struct custom_policy {
-    // Called on hash table construction and rehash, min_bucket_count_in_out is the minimum buckets
-    // that the hash table needs. The policy can change it to a higher number of buckets if needed 
-    // and the hash table will use this value as bucket count. If 0 bucket is asked, then the value
-    // must stay at 0.
-    explicit custom_policy(std::size_t& min_bucket_count_in_out);
-    
-    // Return the bucket [0, bucket_count()) to which the hash belongs. 
-    // If bucket_count() is 0, it must always return 0.
-    std::size_t bucket_for_hash(std::size_t hash) const noexcept;
-    
-    // Return the number of buckets that should be used on next growth
-    std::size_t next_bucket_count() const;
-    
-    // Maximum number of buckets supported by the policy
-    std::size_t max_bucket_count() const;
-    
-    // Reset the growth policy as if the policy was created with a bucket count of 0.
-    // After a clear, the policy must always return 0 when bucket_for_hash() is called.
-    void clear() noexcept;
-}
-```
-
-### Installation
-
-To use robin-map, just add the [include](include/) directory to your include path. It is a **header-only** library.
-
-If you use CMake, you can also use the `tsl::robin_map` exported target from the [CMakeLists.txt](CMakeLists.txt) with `target_link_libraries`. 
-```cmake
-# Example where the robin-map project is stored in a third-party directory
-add_subdirectory(third-party/robin-map)
-target_link_libraries(your_target PRIVATE tsl::robin_map)  
-```
-
-If the project has been installed through `make install`, you can also use `find_package(tsl-robin-map REQUIRED)` instead of `add_subdirectory`.
-
-The library is available in [vcpkg](https://github.com/Microsoft/vcpkg/tree/master/ports/robin-map) and [conan](https://bintray.com/tessil/tsl/tsl-robin-map%3Atessil). It's also present in [Debian](https://packages.debian.org/buster/robin-map-dev), [Ubuntu](https://packages.ubuntu.com/disco/robin-map-dev) and [Fedora](https://apps.fedoraproject.org/packages/robin-map-devel) package repositories.
-
-The code should work with any C++11 standard-compliant compiler and has been tested with GCC 4.8.4, Clang 3.5.0 and Visual Studio 2015.
-
-To run the tests you will need the Boost Test library and CMake.
-
-```bash
-git clone https://github.com/Tessil/robin-map.git
-cd robin-map/tests
-mkdir build
-cd build
-cmake ..
-cmake --build .
-./tsl_robin_map_tests
-```
-
-### Usage
-
-The API can be found [here](https://tessil.github.io/robin-map/). 
-
-All methods are not documented yet, but they replicate the behavior of the ones in `std::unordered_map` and `std::unordered_set`, except if specified otherwise.
-
-
-### Example
-
-```c++
-#include <cstdint>
-#include <iostream>
-#include <string>
-#include <tsl/robin_map.h>
-#include <tsl/robin_set.h>
-
-int main() {
-    tsl::robin_map<std::string, int> map = {{"a", 1}, {"b", 2}};
-    map["c"] = 3;
-    map["d"] = 4;
-    
-    map.insert({"e", 5});
-    map.erase("b");
-    
-    for(auto it = map.begin(); it != map.end(); ++it) {
-        //it->second += 2; // Not valid.
-        it.value() += 2;
-    }
-    
-    // {d, 6} {a, 3} {e, 7} {c, 5}
-    for(const auto& key_value : map) {
-        std::cout << "{" << key_value.first << ", " << key_value.second << "}" << std::endl;
-    }
-    
-        
-    if(map.find("a") != map.end()) {
-        std::cout << "Found \"a\"." << std::endl;
-    }
-    
-    const std::size_t precalculated_hash = std::hash<std::string>()("a");
-    // If we already know the hash beforehand, we can pass it in parameter to speed-up lookups.
-    if(map.find("a", precalculated_hash) != map.end()) {
-        std::cout << "Found \"a\" with hash " << precalculated_hash << "." << std::endl;
-    }
-    
-    
-    /*
-     * Calculating the hash and comparing two std::string may be slow. 
-     * We can store the hash of each std::string in the hash map to make 
-     * the inserts and lookups faster by setting StoreHash to true.
-     */ 
-    tsl::robin_map<std::string, int, std::hash<std::string>, 
-                   std::equal_to<std::string>,
-                   std::allocator<std::pair<std::string, int>>,
-                   true> map2;
-                       
-    map2["a"] = 1;
-    map2["b"] = 2;
-    
-    // {a, 1} {b, 2}
-    for(const auto& key_value : map2) {
-        std::cout << "{" << key_value.first << ", " << key_value.second << "}" << std::endl;
-    }
-    
-    
-    
-    
-    tsl::robin_set<int> set;
-    set.insert({1, 9, 0});
-    set.insert({2, -1, 9});
-    
-    // {0} {1} {2} {9} {-1}
-    for(const auto& key : set) {
-        std::cout << "{" << key << "}" << std::endl;
-    }
-}  
-```
-
-#### Heterogeneous lookups
-
-Heterogeneous overloads allow the usage of other types than `Key` for lookup and erase operations as long as the used types are hashable and comparable to `Key`.
-
-To activate the heterogeneous overloads in `tsl::robin_map/set`, the qualified-id `KeyEqual::is_transparent` must be valid. It works the same way as for [`std::map::find`](http://en.cppreference.com/w/cpp/container/map/find). You can either use [`std::equal_to<>`](http://en.cppreference.com/w/cpp/utility/functional/equal_to_void) or define your own function object.
-
-Both `KeyEqual` and `Hash` will need to be able to deal with the different types.
-
-```c++
-#include <functional>
-#include <iostream>
-#include <string>
-#include <tsl/robin_map.h>
-
-
-struct employee {
-    employee(int id, std::string name) : m_id(id), m_name(std::move(name)) {
-    }
-    
-    // Either we include the comparators in the class and we use `std::equal_to<>`...
-    friend bool operator==(const employee& empl, int empl_id) {
-        return empl.m_id == empl_id;
-    }
-    
-    friend bool operator==(int empl_id, const employee& empl) {
-        return empl_id == empl.m_id;
-    }
-    
-    friend bool operator==(const employee& empl1, const employee& empl2) {
-        return empl1.m_id == empl2.m_id;
-    }
-    
-    
-    int m_id;
-    std::string m_name;
-};
-
-// ... or we implement a separate class to compare employees.
-struct equal_employee {
-    using is_transparent = void;
-    
-    bool operator()(const employee& empl, int empl_id) const {
-        return empl.m_id == empl_id;
-    }
-    
-    bool operator()(int empl_id, const employee& empl) const {
-        return empl_id == empl.m_id;
-    }
-    
-    bool operator()(const employee& empl1, const employee& empl2) const {
-        return empl1.m_id == empl2.m_id;
-    }
-};
-
-struct hash_employee {
-    std::size_t operator()(const employee& empl) const {
-        return std::hash<int>()(empl.m_id);
-    }
-    
-    std::size_t operator()(int id) const {
-        return std::hash<int>()(id);
-    }
-};
-
-
-int main() {
-    // Use std::equal_to<> which will automatically deduce and forward the parameters
-    tsl::robin_map<employee, int, hash_employee, std::equal_to<>> map; 
-    map.insert({employee(1, "John Doe"), 2001});
-    map.insert({employee(2, "Jane Doe"), 2002});
-    map.insert({employee(3, "John Smith"), 2003});
-
-    // John Smith 2003
-    auto it = map.find(3);
-    if(it != map.end()) {
-        std::cout << it->first.m_name << " " << it->second << std::endl;
-    }
-
-    map.erase(1);
-
-
-
-    // Use a custom KeyEqual which has an is_transparent member type
-    tsl::robin_map<employee, int, hash_employee, equal_employee> map2;
-    map2.insert({employee(4, "Johnny Doe"), 2004});
-
-    // 2004
-    std::cout << map2.at(4) << std::endl;
-}  
-```
-
-
-#### Serialization
-
-The library provides an efficient way to serialize and deserialize a map or a set so that it can be saved to a file or send through the network.
-To do so, it requires the user to provide a function object for both serialization and deserialization.
-
-```c++
-struct serializer {
-    // Must support the following types for U: std::int16_t, std::uint32_t, 
-    // std::uint64_t, float and std::pair<Key, T> if a map is used or Key for 
-    // a set.
-    template<typename U>
-    void operator()(const U& value);
-};
-```
-
-```c++
-struct deserializer {
-    // Must support the following types for U: std::int16_t, std::uint32_t, 
-    // std::uint64_t, float and std::pair<Key, T> if a map is used or Key for 
-    // a set.
-    template<typename U>
-    U operator()();
-};
-```
-
-Note that the implementation leaves binary compatibility (endianness, float binary representation, size of int, ...) of the types it serializes/deserializes in the hands of the provided function objects if compatibility is required.
-
-More details regarding the `serialize` and `deserialize` methods can be found in the [API](https://tessil.github.io/robin-map/classtsl_1_1robin__map.html).
-
-```c++
-#include <cassert>
-#include <cstdint>
-#include <fstream>
-#include <type_traits>
-#include <tsl/robin_map.h>
-
-
-class serializer {
-public:
-    serializer(const char* file_name) {
-        m_ostream.exceptions(m_ostream.badbit | m_ostream.failbit);
-        m_ostream.open(file_name, std::ios::binary);
-    }
-    
-    template<class T,
-             typename std::enable_if<std::is_arithmetic<T>::value>::type* = nullptr>
-    void operator()(const T& value) {
-        m_ostream.write(reinterpret_cast<const char*>(&value), sizeof(T));
-    }
-    
-    void operator()(const std::pair<std::int64_t, std::int64_t>& value) {
-        (*this)(value.first);
-        (*this)(value.second);
-    }
-
-private:
-    std::ofstream m_ostream;
-};
-
-class deserializer {
-public:
-    deserializer(const char* file_name) {
-        m_istream.exceptions(m_istream.badbit | m_istream.failbit | m_istream.eofbit);
-        m_istream.open(file_name, std::ios::binary);
-    }
-    
-    template<class T>
-    T operator()() {
-        T value;
-        deserialize(value);
-        
-        return value;
-    }
-    
-private:
-    template<class T,
-             typename std::enable_if<std::is_arithmetic<T>::value>::type* = nullptr>
-    void deserialize(T& value) {
-        m_istream.read(reinterpret_cast<char*>(&value), sizeof(T));
-    }
-    
-    void deserialize(std::pair<std::int64_t, std::int64_t>& value) {
-        deserialize(value.first);
-        deserialize(value.second);
-    }
-
-private:
-    std::ifstream m_istream;
-};
-
-
-int main() {
-    const tsl::robin_map<std::int64_t, std::int64_t> map = {{1, -1}, {2, -2}, {3, -3}, {4, -4}};
-    
-    
-    const char* file_name = "robin_map.data";
-    {
-        serializer serial(file_name);
-        map.serialize(serial);
-    }
-    
-    {
-        deserializer dserial(file_name);
-        auto map_deserialized = tsl::robin_map<std::int64_t, std::int64_t>::deserialize(dserial);
-        
-        assert(map == map_deserialized);
-    }
-    
-    {
-        deserializer dserial(file_name);
-        
-        /**
-         * If the serialized and deserialized map are hash compatibles (see conditions in API), 
-         * setting the argument to true speed-up the deserialization process as we don't have 
-         * to recalculate the hash of each key. We also know how much space each bucket needs.
-         */
-        const bool hash_compatible = true;
-        auto map_deserialized = 
-            tsl::robin_map<std::int64_t, std::int64_t>::deserialize(dserial, hash_compatible);
-        
-        assert(map == map_deserialized);
-    }
-} 
-```
-
-##### Serialization with Boost Serialization and compression with zlib
-
-It is possible to use a serialization library to avoid the boilerplate. 
-
-The following example uses Boost Serialization with the Boost zlib compression stream to reduce the size of the resulting serialized file. The example requires C++20 due to the usage of the template parameter list syntax in lambdas, but it can be adapted to less recent versions.
-
-```c++
-#include <boost/archive/binary_iarchive.hpp>
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/iostreams/filter/zlib.hpp>
-#include <boost/iostreams/filtering_stream.hpp>
-#include <boost/serialization/split_free.hpp>
-#include <boost/serialization/utility.hpp>
-#include <cassert>
-#include <cstdint>
-#include <fstream>
-#include <tsl/robin_map.h>
-
-
-namespace boost { namespace serialization {
-    template<class Archive, class Key, class T>
-    void serialize(Archive & ar, tsl::robin_map<Key, T>& map, const unsigned int version) {
-        split_free(ar, map, version); 
-    }
-
-    template<class Archive, class Key, class T>
-    void save(Archive & ar, const tsl::robin_map<Key, T>& map, const unsigned int /*version*/) {
-        auto serializer = [&ar](const auto& v) { ar & v; };
-        map.serialize(serializer);
-    }
-
-    template<class Archive, class Key, class T>
-    void load(Archive & ar, tsl::robin_map<Key, T>& map, const unsigned int /*version*/) {
-        auto deserializer = [&ar]<typename U>() { U u; ar & u; return u; };
-        map = tsl::robin_map<Key, T>::deserialize(deserializer);
-    }
-}}
-
-
-int main() {
-    tsl::robin_map<std::int64_t, std::int64_t> map = {{1, -1}, {2, -2}, {3, -3}, {4, -4}};
-    
-    
-    const char* file_name = "robin_map.data";
-    {
-        std::ofstream ofs;
-        ofs.exceptions(ofs.badbit | ofs.failbit);
-        ofs.open(file_name, std::ios::binary);
-        
-        boost::iostreams::filtering_ostream fo;
-        fo.push(boost::iostreams::zlib_compressor());
-        fo.push(ofs);
-        
-        boost::archive::binary_oarchive oa(fo);
-        
-        oa << map;
-    }
-    
-    {
-        std::ifstream ifs;
-        ifs.exceptions(ifs.badbit | ifs.failbit | ifs.eofbit);
-        ifs.open(file_name, std::ios::binary);
-        
-        boost::iostreams::filtering_istream fi;
-        fi.push(boost::iostreams::zlib_decompressor());
-        fi.push(ifs);
-        
-        boost::archive::binary_iarchive ia(fi);
-     
-        tsl::robin_map<std::int64_t, std::int64_t> map_deserialized;   
-        ia >> map_deserialized;
-        
-        assert(map == map_deserialized);
-    }
-}
-```
-
-### License
-
-The code is licensed under the MIT license, see the [LICENSE file](LICENSE) for details.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/cmake/tsl-robin-mapConfig.cmake.in b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/cmake/tsl-robin-mapConfig.cmake.in
deleted file mode 100644
index d2ce23305..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/cmake/tsl-robin-mapConfig.cmake.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# This module sets the following variables:
-# * tsl-robin-map_FOUND - true if tsl-robin-map found on the system
-# * tsl-robin-map_INCLUDE_DIRS - the directory containing tsl-robin-map headers
-@PACKAGE_INIT@
-
-if(NOT TARGET tsl::robin_map)
-  include("${CMAKE_CURRENT_LIST_DIR}/tsl-robin-mapTargets.cmake")
-  get_target_property(tsl-robin-map_INCLUDE_DIRS tsl::robin_map INTERFACE_INCLUDE_DIRECTORIES)
-endif()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_growth_policy.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_growth_policy.h
deleted file mode 100644
index 62f9a2e07..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_growth_policy.h
+++ /dev/null
@@ -1,406 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef TSL_ROBIN_GROWTH_POLICY_H
-#define TSL_ROBIN_GROWTH_POLICY_H
-
-#include <algorithm>
-#include <array>
-#include <climits>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <iterator>
-#include <limits>
-#include <ratio>
-#include <stdexcept>
-
-#ifdef TSL_DEBUG
-#define tsl_rh_assert(expr) assert(expr)
-#else
-#define tsl_rh_assert(expr) (static_cast<void>(0))
-#endif
-
-/**
- * If exceptions are enabled, throw the exception passed in parameter, otherwise
- * call std::terminate.
- */
-#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || \
-     (defined(_MSC_VER) && defined(_CPPUNWIND))) &&        \
-    !defined(TSL_NO_EXCEPTIONS)
-#define TSL_RH_THROW_OR_TERMINATE(ex, msg) throw ex(msg)
-#else
-#define TSL_RH_NO_EXCEPTIONS
-#ifdef NDEBUG
-#define TSL_RH_THROW_OR_TERMINATE(ex, msg) std::terminate()
-#else
-#include <iostream>
-#define TSL_RH_THROW_OR_TERMINATE(ex, msg) \
-  do {                                     \
-    std::cerr << msg << std::endl;         \
-    std::terminate();                      \
-  } while (0)
-#endif
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-#define TSL_RH_LIKELY(exp) (__builtin_expect(!!(exp), true))
-#else
-#define TSL_RH_LIKELY(exp) (exp)
-#endif
-
-#define TSL_RH_UNUSED(x) static_cast<void>(x)
-
-namespace tsl {
-namespace rh {
-
-/**
- * Grow the hash table by a factor of GrowthFactor keeping the bucket count to a
- * power of two. It allows the table to use a mask operation instead of a modulo
- * operation to map a hash to a bucket.
- *
- * GrowthFactor must be a power of two >= 2.
- */
-template <std::size_t GrowthFactor>
-class power_of_two_growth_policy {
- public:
-  /**
-   * Called on the hash table creation and on rehash. The number of buckets for
-   * the table is passed in parameter. This number is a minimum, the policy may
-   * update this value with a higher value if needed (but not lower).
-   *
-   * If 0 is given, min_bucket_count_in_out must still be 0 after the policy
-   * creation and bucket_for_hash must always return 0 in this case.
-   */
-  explicit power_of_two_growth_policy(std::size_t& min_bucket_count_in_out) {
-    if (min_bucket_count_in_out > max_bucket_count()) {
-      TSL_RH_THROW_OR_TERMINATE(std::length_error,
-                                "The hash table exceeds its maximum size.");
-    }
-
-    if (min_bucket_count_in_out > 0) {
-      min_bucket_count_in_out =
-          round_up_to_power_of_two(min_bucket_count_in_out);
-      m_mask = min_bucket_count_in_out - 1;
-    } else {
-      m_mask = 0;
-    }
-  }
-
-  /**
-   * Return the bucket [0, bucket_count()) to which the hash belongs.
-   * If bucket_count() is 0, it must always return 0.
-   */
-  std::size_t bucket_for_hash(std::size_t hash) const noexcept {
-    return hash & m_mask;
-  }
-
-  /**
-   * Return the number of buckets that should be used on next growth.
-   */
-  std::size_t next_bucket_count() const {
-    if ((m_mask + 1) > max_bucket_count() / GrowthFactor) {
-      TSL_RH_THROW_OR_TERMINATE(std::length_error,
-                                "The hash table exceeds its maximum size.");
-    }
-
-    return (m_mask + 1) * GrowthFactor;
-  }
-
-  /**
-   * Return the maximum number of buckets supported by the policy.
-   */
-  std::size_t max_bucket_count() const {
-    // Largest power of two.
-    return (std::numeric_limits<std::size_t>::max() / 2) + 1;
-  }
-
-  /**
-   * Reset the growth policy as if it was created with a bucket count of 0.
-   * After a clear, the policy must always return 0 when bucket_for_hash is
-   * called.
-   */
-  void clear() noexcept { m_mask = 0; }
-
- private:
-  static std::size_t round_up_to_power_of_two(std::size_t value) {
-    if (is_power_of_two(value)) {
-      return value;
-    }
-
-    if (value == 0) {
-      return 1;
-    }
-
-    --value;
-    for (std::size_t i = 1; i < sizeof(std::size_t) * CHAR_BIT; i *= 2) {
-      value |= value >> i;
-    }
-
-    return value + 1;
-  }
-
-  static constexpr bool is_power_of_two(std::size_t value) {
-    return value != 0 && (value & (value - 1)) == 0;
-  }
-
- protected:
-  static_assert(is_power_of_two(GrowthFactor) && GrowthFactor >= 2,
-                "GrowthFactor must be a power of two >= 2.");
-
-  std::size_t m_mask;
-};
-
-/**
- * Grow the hash table by GrowthFactor::num / GrowthFactor::den and use a modulo
- * to map a hash to a bucket. Slower but it can be useful if you want a slower
- * growth.
- */
-template <class GrowthFactor = std::ratio<3, 2>>
-class mod_growth_policy {
- public:
-  explicit mod_growth_policy(std::size_t& min_bucket_count_in_out) {
-    if (min_bucket_count_in_out > max_bucket_count()) {
-      TSL_RH_THROW_OR_TERMINATE(std::length_error,
-                                "The hash table exceeds its maximum size.");
-    }
-
-    if (min_bucket_count_in_out > 0) {
-      m_mod = min_bucket_count_in_out;
-    } else {
-      m_mod = 1;
-    }
-  }
-
-  std::size_t bucket_for_hash(std::size_t hash) const noexcept {
-    return hash % m_mod;
-  }
-
-  std::size_t next_bucket_count() const {
-    if (m_mod == max_bucket_count()) {
-      TSL_RH_THROW_OR_TERMINATE(std::length_error,
-                                "The hash table exceeds its maximum size.");
-    }
-
-    const double next_bucket_count =
-        std::ceil(double(m_mod) * REHASH_SIZE_MULTIPLICATION_FACTOR);
-    if (!std::isnormal(next_bucket_count)) {
-      TSL_RH_THROW_OR_TERMINATE(std::length_error,
-                                "The hash table exceeds its maximum size.");
-    }
-
-    if (next_bucket_count > double(max_bucket_count())) {
-      return max_bucket_count();
-    } else {
-      return std::size_t(next_bucket_count);
-    }
-  }
-
-  std::size_t max_bucket_count() const { return MAX_BUCKET_COUNT; }
-
-  void clear() noexcept { m_mod = 1; }
-
- private:
-  static constexpr double REHASH_SIZE_MULTIPLICATION_FACTOR =
-      1.0 * GrowthFactor::num / GrowthFactor::den;
-  static const std::size_t MAX_BUCKET_COUNT =
-      std::size_t(double(std::numeric_limits<std::size_t>::max() /
-                         REHASH_SIZE_MULTIPLICATION_FACTOR));
-
-  static_assert(REHASH_SIZE_MULTIPLICATION_FACTOR >= 1.1,
-                "Growth factor should be >= 1.1.");
-
-  std::size_t m_mod;
-};
-
-namespace detail {
-
-#if SIZE_MAX >= ULLONG_MAX
-#define TSL_RH_NB_PRIMES 51
-#elif SIZE_MAX >= ULONG_MAX
-#define TSL_RH_NB_PRIMES 40
-#else
-#define TSL_RH_NB_PRIMES 23
-#endif
-
-static constexpr const std::array<std::size_t, TSL_RH_NB_PRIMES> PRIMES = {{
-    1u,
-    5u,
-    17u,
-    29u,
-    37u,
-    53u,
-    67u,
-    79u,
-    97u,
-    131u,
-    193u,
-    257u,
-    389u,
-    521u,
-    769u,
-    1031u,
-    1543u,
-    2053u,
-    3079u,
-    6151u,
-    12289u,
-    24593u,
-    49157u,
-#if SIZE_MAX >= ULONG_MAX
-    98317ul,
-    196613ul,
-    393241ul,
-    786433ul,
-    1572869ul,
-    3145739ul,
-    6291469ul,
-    12582917ul,
-    25165843ul,
-    50331653ul,
-    100663319ul,
-    201326611ul,
-    402653189ul,
-    805306457ul,
-    1610612741ul,
-    3221225473ul,
-    4294967291ul,
-#endif
-#if SIZE_MAX >= ULLONG_MAX
-    6442450939ull,
-    12884901893ull,
-    25769803751ull,
-    51539607551ull,
-    103079215111ull,
-    206158430209ull,
-    412316860441ull,
-    824633720831ull,
-    1649267441651ull,
-    3298534883309ull,
-    6597069766657ull,
-#endif
-}};
-
-template <unsigned int IPrime>
-static constexpr std::size_t mod(std::size_t hash) {
-  return hash % PRIMES[IPrime];
-}
-
-// MOD_PRIME[iprime](hash) returns hash % PRIMES[iprime]. This table allows for
-// faster modulo as the compiler can optimize the modulo code better with a
-// constant known at the compilation.
-static constexpr const std::array<std::size_t (*)(std::size_t),
-                                  TSL_RH_NB_PRIMES>
-    MOD_PRIME = {{
-        &mod<0>,  &mod<1>,  &mod<2>,  &mod<3>,  &mod<4>,  &mod<5>,
-        &mod<6>,  &mod<7>,  &mod<8>,  &mod<9>,  &mod<10>, &mod<11>,
-        &mod<12>, &mod<13>, &mod<14>, &mod<15>, &mod<16>, &mod<17>,
-        &mod<18>, &mod<19>, &mod<20>, &mod<21>, &mod<22>,
-#if SIZE_MAX >= ULONG_MAX
-        &mod<23>, &mod<24>, &mod<25>, &mod<26>, &mod<27>, &mod<28>,
-        &mod<29>, &mod<30>, &mod<31>, &mod<32>, &mod<33>, &mod<34>,
-        &mod<35>, &mod<36>, &mod<37>, &mod<38>, &mod<39>,
-#endif
-#if SIZE_MAX >= ULLONG_MAX
-        &mod<40>, &mod<41>, &mod<42>, &mod<43>, &mod<44>, &mod<45>,
-        &mod<46>, &mod<47>, &mod<48>, &mod<49>, &mod<50>,
-#endif
-    }};
-
-}  // namespace detail
-
-/**
- * Grow the hash table by using prime numbers as bucket count. Slower than
- * tsl::rh::power_of_two_growth_policy in general but will probably distribute
- * the values around better in the buckets with a poor hash function.
- *
- * To allow the compiler to optimize the modulo operation, a lookup table is
- * used with constant primes numbers.
- *
- * With a switch the code would look like:
- * \code
- * switch(iprime) { // iprime is the current prime of the hash table
- *     case 0: hash % 5ul;
- *             break;
- *     case 1: hash % 17ul;
- *             break;
- *     case 2: hash % 29ul;
- *             break;
- *     ...
- * }
- * \endcode
- *
- * Due to the constant variable in the modulo the compiler is able to optimize
- * the operation by a series of multiplications, substractions and shifts.
- *
- * The 'hash % 5' could become something like 'hash - (hash * 0xCCCCCCCD) >> 34)
- * * 5' in a 64 bits environment.
- */
-class prime_growth_policy {
- public:
-  explicit prime_growth_policy(std::size_t& min_bucket_count_in_out) {
-    auto it_prime = std::lower_bound(
-        detail::PRIMES.begin(), detail::PRIMES.end(), min_bucket_count_in_out);
-    if (it_prime == detail::PRIMES.end()) {
-      TSL_RH_THROW_OR_TERMINATE(std::length_error,
-                                "The hash table exceeds its maximum size.");
-    }
-
-    m_iprime = static_cast<unsigned int>(
-        std::distance(detail::PRIMES.begin(), it_prime));
-    if (min_bucket_count_in_out > 0) {
-      min_bucket_count_in_out = *it_prime;
-    } else {
-      min_bucket_count_in_out = 0;
-    }
-  }
-
-  std::size_t bucket_for_hash(std::size_t hash) const noexcept {
-    return detail::MOD_PRIME[m_iprime](hash);
-  }
-
-  std::size_t next_bucket_count() const {
-    if (m_iprime + 1 >= detail::PRIMES.size()) {
-      TSL_RH_THROW_OR_TERMINATE(std::length_error,
-                                "The hash table exceeds its maximum size.");
-    }
-
-    return detail::PRIMES[m_iprime + 1];
-  }
-
-  std::size_t max_bucket_count() const { return detail::PRIMES.back(); }
-
-  void clear() noexcept { m_iprime = 0; }
-
- private:
-  unsigned int m_iprime;
-
-  static_assert(std::numeric_limits<decltype(m_iprime)>::max() >=
-                    detail::PRIMES.size(),
-                "The type of m_iprime is not big enough.");
-};
-
-}  // namespace rh
-}  // namespace tsl
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_hash.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_hash.h
deleted file mode 100644
index e34eac32f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_hash.h
+++ /dev/null
@@ -1,1625 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef TSL_ROBIN_HASH_H
-#define TSL_ROBIN_HASH_H
-
-#include <algorithm>
-#include <cassert>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <exception>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <stdexcept>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "robin_growth_policy.h"
-
-namespace tsl {
-
-namespace detail_robin_hash {
-
-template <typename T>
-struct make_void {
-  using type = void;
-};
-
-template <typename T, typename = void>
-struct has_is_transparent : std::false_type {};
-
-template <typename T>
-struct has_is_transparent<T,
-                          typename make_void<typename T::is_transparent>::type>
-    : std::true_type {};
-
-template <typename U>
-struct is_power_of_two_policy : std::false_type {};
-
-template <std::size_t GrowthFactor>
-struct is_power_of_two_policy<tsl::rh::power_of_two_growth_policy<GrowthFactor>>
-    : std::true_type {};
-
-// Only available in C++17, we need to be compatible with C++11
-template <class T>
-const T& clamp(const T& v, const T& lo, const T& hi) {
-  return std::min(hi, std::max(lo, v));
-}
-
-template <typename T, typename U>
-static T numeric_cast(U value,
-                      const char* error_message = "numeric_cast() failed.") {
-  T ret = static_cast<T>(value);
-  if (static_cast<U>(ret) != value) {
-    TSL_RH_THROW_OR_TERMINATE(std::runtime_error, error_message);
-  }
-
-  const bool is_same_signedness =
-      (std::is_unsigned<T>::value && std::is_unsigned<U>::value) ||
-      (std::is_signed<T>::value && std::is_signed<U>::value);
-  if (!is_same_signedness && (ret < T{}) != (value < U{})) {
-    TSL_RH_THROW_OR_TERMINATE(std::runtime_error, error_message);
-  }
-
-  return ret;
-}
-
-template <class T, class Deserializer>
-static T deserialize_value(Deserializer& deserializer) {
-  // MSVC < 2017 is not conformant, circumvent the problem by removing the
-  // template keyword
-#if defined(_MSC_VER) && _MSC_VER < 1910
-  return deserializer.Deserializer::operator()<T>();
-#else
-  return deserializer.Deserializer::template operator()<T>();
-#endif
-}
-
-/**
- * Fixed size type used to represent size_type values on serialization. Need to
- * be big enough to represent a std::size_t on 32 and 64 bits platforms, and
- * must be the same size on both platforms.
- */
-using slz_size_type = std::uint64_t;
-static_assert(std::numeric_limits<slz_size_type>::max() >=
-                  std::numeric_limits<std::size_t>::max(),
-              "slz_size_type must be >= std::size_t");
-
-using truncated_hash_type = std::uint32_t;
-
-/**
- * Helper class that stores a truncated hash if StoreHash is true and nothing
- * otherwise.
- */
-template <bool StoreHash>
-class bucket_entry_hash {
- public:
-  bool bucket_hash_equal(std::size_t /*hash*/) const noexcept { return true; }
-
-  truncated_hash_type truncated_hash() const noexcept { return 0; }
-
- protected:
-  void set_hash(truncated_hash_type /*hash*/) noexcept {}
-};
-
-template <>
-class bucket_entry_hash<true> {
- public:
-  bool bucket_hash_equal(std::size_t hash) const noexcept {
-    return m_hash == truncated_hash_type(hash);
-  }
-
-  truncated_hash_type truncated_hash() const noexcept { return m_hash; }
-
- protected:
-  void set_hash(truncated_hash_type hash) noexcept {
-    m_hash = truncated_hash_type(hash);
-  }
-
- private:
-  truncated_hash_type m_hash;
-};
-
-/**
- * Each bucket entry has:
- * - A value of type `ValueType`.
- * - An integer to store how far the value of the bucket, if any, is from its
- * ideal bucket (ex: if the current bucket 5 has the value 'foo' and
- * `hash('foo') % nb_buckets` == 3, `dist_from_ideal_bucket()` will return 2 as
- * the current value of the bucket is two buckets away from its ideal bucket) If
- * there is no value in the bucket (i.e. `empty()` is true)
- * `dist_from_ideal_bucket()` will be < 0.
- * - A marker which tells us if the bucket is the last bucket of the bucket
- * array (useful for the iterator of the hash table).
- * - If `StoreHash` is true, 32 bits of the hash of the value, if any, are also
- * stored in the bucket. If the size of the hash is more than 32 bits, it is
- * truncated. We don't store the full hash as storing the hash is a potential
- * opportunity to use the unused space due to the alignment of the bucket_entry
- * structure. We can thus potentially store the hash without any extra space
- *   (which would not be possible with 64 bits of the hash).
- */
-template <typename ValueType, bool StoreHash>
-class bucket_entry : public bucket_entry_hash<StoreHash> {
-  using bucket_hash = bucket_entry_hash<StoreHash>;
-
- public:
-  using value_type = ValueType;
-  using distance_type = std::int16_t;
-
-  bucket_entry() noexcept
-      : bucket_hash(),
-        m_dist_from_ideal_bucket(EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET),
-        m_last_bucket(false) {
-    tsl_rh_assert(empty());
-  }
-
-  bucket_entry(bool last_bucket) noexcept
-      : bucket_hash(),
-        m_dist_from_ideal_bucket(EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET),
-        m_last_bucket(last_bucket) {
-    tsl_rh_assert(empty());
-  }
-
-  bucket_entry(const bucket_entry& other) noexcept(
-      std::is_nothrow_copy_constructible<value_type>::value)
-      : bucket_hash(other),
-        m_dist_from_ideal_bucket(EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET),
-        m_last_bucket(other.m_last_bucket) {
-    if (!other.empty()) {
-      ::new (static_cast<void*>(std::addressof(m_value)))
-          value_type(other.value());
-      m_dist_from_ideal_bucket = other.m_dist_from_ideal_bucket;
-    }
-  }
-
-  /**
-   * Never really used, but still necessary as we must call resize on an empty
-   * `std::vector<bucket_entry>`. and we need to support move-only types. See
-   * robin_hash constructor for details.
-   */
-  bucket_entry(bucket_entry&& other) noexcept(
-      std::is_nothrow_move_constructible<value_type>::value)
-      : bucket_hash(std::move(other)),
-        m_dist_from_ideal_bucket(EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET),
-        m_last_bucket(other.m_last_bucket) {
-    if (!other.empty()) {
-      ::new (static_cast<void*>(std::addressof(m_value)))
-          value_type(std::move(other.value()));
-      m_dist_from_ideal_bucket = other.m_dist_from_ideal_bucket;
-    }
-  }
-
-  bucket_entry& operator=(const bucket_entry& other) noexcept(
-      std::is_nothrow_copy_constructible<value_type>::value) {
-    if (this != &other) {
-      clear();
-
-      bucket_hash::operator=(other);
-      if (!other.empty()) {
-        ::new (static_cast<void*>(std::addressof(m_value)))
-            value_type(other.value());
-      }
-
-      m_dist_from_ideal_bucket = other.m_dist_from_ideal_bucket;
-      m_last_bucket = other.m_last_bucket;
-    }
-
-    return *this;
-  }
-
-  bucket_entry& operator=(bucket_entry&&) = delete;
-
-  ~bucket_entry() noexcept { clear(); }
-
-  void clear() noexcept {
-    if (!empty()) {
-      destroy_value();
-      m_dist_from_ideal_bucket = EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET;
-    }
-  }
-
-  bool empty() const noexcept {
-    return m_dist_from_ideal_bucket == EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET;
-  }
-
-  value_type& value() noexcept {
-    tsl_rh_assert(!empty());
-    return *reinterpret_cast<value_type*>(std::addressof(m_value));
-  }
-
-  const value_type& value() const noexcept {
-    tsl_rh_assert(!empty());
-    return *reinterpret_cast<const value_type*>(std::addressof(m_value));
-  }
-
-  distance_type dist_from_ideal_bucket() const noexcept {
-    return m_dist_from_ideal_bucket;
-  }
-
-  bool last_bucket() const noexcept { return m_last_bucket; }
-
-  void set_as_last_bucket() noexcept { m_last_bucket = true; }
-
-  template <typename... Args>
-  void set_value_of_empty_bucket(distance_type dist_from_ideal_bucket,
-                                 truncated_hash_type hash,
-                                 Args&&... value_type_args) {
-    tsl_rh_assert(dist_from_ideal_bucket >= 0);
-    tsl_rh_assert(empty());
-
-    ::new (static_cast<void*>(std::addressof(m_value)))
-        value_type(std::forward<Args>(value_type_args)...);
-    this->set_hash(hash);
-    m_dist_from_ideal_bucket = dist_from_ideal_bucket;
-
-    tsl_rh_assert(!empty());
-  }
-
-  void swap_with_value_in_bucket(distance_type& dist_from_ideal_bucket,
-                                 truncated_hash_type& hash, value_type& value) {
-    tsl_rh_assert(!empty());
-
-    using std::swap;
-    swap(value, this->value());
-    swap(dist_from_ideal_bucket, m_dist_from_ideal_bucket);
-
-    if (StoreHash) {
-      const truncated_hash_type tmp_hash = this->truncated_hash();
-      this->set_hash(hash);
-      hash = tmp_hash;
-    } else {
-      // Avoid warning of unused variable if StoreHash is false
-      TSL_RH_UNUSED(hash);
-    }
-  }
-
-  static truncated_hash_type truncate_hash(std::size_t hash) noexcept {
-    return truncated_hash_type(hash);
-  }
-
- private:
-  void destroy_value() noexcept {
-    tsl_rh_assert(!empty());
-    value().~value_type();
-  }
-
- public:
-  static const distance_type EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET = -1;
-  static const distance_type DIST_FROM_IDEAL_BUCKET_LIMIT = 4096;
-  static_assert(DIST_FROM_IDEAL_BUCKET_LIMIT <=
-                    std::numeric_limits<distance_type>::max() - 1,
-                "DIST_FROM_IDEAL_BUCKET_LIMIT must be <= "
-                "std::numeric_limits<distance_type>::max() - 1.");
-
- private:
-  using storage = typename std::aligned_storage<sizeof(value_type),
-                                                alignof(value_type)>::type;
-
-  distance_type m_dist_from_ideal_bucket;
-  bool m_last_bucket;
-  storage m_value;
-};
-
-/**
- * Internal common class used by `robin_map` and `robin_set`.
- *
- * ValueType is what will be stored by `robin_hash` (usually `std::pair<Key, T>`
- * for map and `Key` for set).
- *
- * `KeySelect` should be a `FunctionObject` which takes a `ValueType` in
- * parameter and returns a reference to the key.
- *
- * `ValueSelect` should be a `FunctionObject` which takes a `ValueType` in
- * parameter and returns a reference to the value. `ValueSelect` should be void
- * if there is no value (in a set for example).
- *
- * The strong exception guarantee only holds if the expression
- * `std::is_nothrow_swappable<ValueType>::value &&
- * std::is_nothrow_move_constructible<ValueType>::value` is true.
- *
- * Behaviour is undefined if the destructor of `ValueType` throws.
- */
-template <class ValueType, class KeySelect, class ValueSelect, class Hash,
-          class KeyEqual, class Allocator, bool StoreHash, class GrowthPolicy>
-class robin_hash : private Hash, private KeyEqual, private GrowthPolicy {
- private:
-  template <typename U>
-  using has_mapped_type =
-      typename std::integral_constant<bool, !std::is_same<U, void>::value>;
-
-  static_assert(
-      noexcept(std::declval<GrowthPolicy>().bucket_for_hash(std::size_t(0))),
-      "GrowthPolicy::bucket_for_hash must be noexcept.");
-  static_assert(noexcept(std::declval<GrowthPolicy>().clear()),
-                "GrowthPolicy::clear must be noexcept.");
-
- public:
-  template <bool IsConst>
-  class robin_iterator;
-
-  using key_type = typename KeySelect::key_type;
-  using value_type = ValueType;
-  using size_type = std::size_t;
-  using difference_type = std::ptrdiff_t;
-  using hasher = Hash;
-  using key_equal = KeyEqual;
-  using allocator_type = Allocator;
-  using reference = value_type&;
-  using const_reference = const value_type&;
-  using pointer = value_type*;
-  using const_pointer = const value_type*;
-  using iterator = robin_iterator<false>;
-  using const_iterator = robin_iterator<true>;
-
- private:
-  /**
-   * Either store the hash because we are asked by the `StoreHash` template
-   * parameter or store the hash because it doesn't cost us anything in size and
-   * can be used to speed up rehash.
-   */
-  static constexpr bool STORE_HASH =
-      StoreHash ||
-      ((sizeof(tsl::detail_robin_hash::bucket_entry<value_type, true>) ==
-        sizeof(tsl::detail_robin_hash::bucket_entry<value_type, false>)) &&
-       (sizeof(std::size_t) == sizeof(truncated_hash_type) ||
-        is_power_of_two_policy<GrowthPolicy>::value) &&
-       // Don't store the hash for primitive types with default hash.
-       (!std::is_arithmetic<key_type>::value ||
-        !std::is_same<Hash, std::hash<key_type>>::value));
-
-  /**
-   * Only use the stored hash on lookup if we are explicitly asked. We are not
-   * sure how slow the KeyEqual operation is. An extra comparison may slow
-   * things down with a fast KeyEqual.
-   */
-  static constexpr bool USE_STORED_HASH_ON_LOOKUP = StoreHash;
-
-  /**
-   * We can only use the hash on rehash if the size of the hash type is the same
-   * as the stored one or if we use a power of two modulo. In the case of the
-   * power of two modulo, we just mask the least significant bytes, we just have
-   * to check that the truncated_hash_type didn't truncated more bytes.
-   */
-  static bool USE_STORED_HASH_ON_REHASH(size_type bucket_count) {
-    if (STORE_HASH && sizeof(std::size_t) == sizeof(truncated_hash_type)) {
-      TSL_RH_UNUSED(bucket_count);
-      return true;
-    } else if (STORE_HASH && is_power_of_two_policy<GrowthPolicy>::value) {
-      tsl_rh_assert(bucket_count > 0);
-      return (bucket_count - 1) <=
-             std::numeric_limits<truncated_hash_type>::max();
-    } else {
-      TSL_RH_UNUSED(bucket_count);
-      return false;
-    }
-  }
-
-  using bucket_entry =
-      tsl::detail_robin_hash::bucket_entry<value_type, STORE_HASH>;
-  using distance_type = typename bucket_entry::distance_type;
-
-  using buckets_allocator = typename std::allocator_traits<
-      allocator_type>::template rebind_alloc<bucket_entry>;
-  using buckets_container_type = std::vector<bucket_entry, buckets_allocator>;
-
- public:
-  /**
-   * The 'operator*()' and 'operator->()' methods return a const reference and
-   * const pointer respectively to the stored value type.
-   *
-   * In case of a map, to get a mutable reference to the value associated to a
-   * key (the '.second' in the stored pair), you have to call 'value()'.
-   *
-   * The main reason for this is that if we returned a `std::pair<Key, T>&`
-   * instead of a `const std::pair<Key, T>&`, the user may modify the key which
-   * will put the map in a undefined state.
-   */
-  template <bool IsConst>
-  class robin_iterator {
-    friend class robin_hash;
-
-   private:
-    using bucket_entry_ptr =
-        typename std::conditional<IsConst, const bucket_entry*,
-                                  bucket_entry*>::type;
-
-    robin_iterator(bucket_entry_ptr bucket) noexcept : m_bucket(bucket) {}
-
-   public:
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = const typename robin_hash::value_type;
-    using difference_type = std::ptrdiff_t;
-    using reference = value_type&;
-    using pointer = value_type*;
-
-    robin_iterator() noexcept {}
-
-    // Copy constructor from iterator to const_iterator.
-    template <bool TIsConst = IsConst,
-              typename std::enable_if<TIsConst>::type* = nullptr>
-    robin_iterator(const robin_iterator<!TIsConst>& other) noexcept
-        : m_bucket(other.m_bucket) {}
-
-    robin_iterator(const robin_iterator& other) = default;
-    robin_iterator(robin_iterator&& other) = default;
-    robin_iterator& operator=(const robin_iterator& other) = default;
-    robin_iterator& operator=(robin_iterator&& other) = default;
-
-    const typename robin_hash::key_type& key() const {
-      return KeySelect()(m_bucket->value());
-    }
-
-    template <class U = ValueSelect,
-              typename std::enable_if<has_mapped_type<U>::value &&
-                                      IsConst>::type* = nullptr>
-    const typename U::value_type& value() const {
-      return U()(m_bucket->value());
-    }
-
-    template <class U = ValueSelect,
-              typename std::enable_if<has_mapped_type<U>::value &&
-                                      !IsConst>::type* = nullptr>
-    typename U::value_type& value() const {
-      return U()(m_bucket->value());
-    }
-
-    reference operator*() const { return m_bucket->value(); }
-
-    pointer operator->() const { return std::addressof(m_bucket->value()); }
-
-    robin_iterator& operator++() {
-      while (true) {
-        if (m_bucket->last_bucket()) {
-          ++m_bucket;
-          return *this;
-        }
-
-        ++m_bucket;
-        if (!m_bucket->empty()) {
-          return *this;
-        }
-      }
-    }
-
-    robin_iterator operator++(int) {
-      robin_iterator tmp(*this);
-      ++*this;
-
-      return tmp;
-    }
-
-    friend bool operator==(const robin_iterator& lhs,
-                           const robin_iterator& rhs) {
-      return lhs.m_bucket == rhs.m_bucket;
-    }
-
-    friend bool operator!=(const robin_iterator& lhs,
-                           const robin_iterator& rhs) {
-      return !(lhs == rhs);
-    }
-
-   private:
-    bucket_entry_ptr m_bucket;
-  };
-
- public:
-#if defined(__cplusplus) && __cplusplus >= 201402L
-  robin_hash(size_type bucket_count, const Hash& hash, const KeyEqual& equal,
-             const Allocator& alloc,
-             float min_load_factor = DEFAULT_MIN_LOAD_FACTOR,
-             float max_load_factor = DEFAULT_MAX_LOAD_FACTOR)
-      : Hash(hash),
-        KeyEqual(equal),
-        GrowthPolicy(bucket_count),
-        m_buckets_data(
-            [&]() {
-              if (bucket_count > max_bucket_count()) {
-                TSL_RH_THROW_OR_TERMINATE(
-                    std::length_error,
-                    "The map exceeds its maximum bucket count.");
-              }
-
-              return bucket_count;
-            }(),
-            alloc),
-        m_buckets(m_buckets_data.empty() ? static_empty_bucket_ptr()
-                                         : m_buckets_data.data()),
-        m_bucket_count(bucket_count),
-        m_nb_elements(0),
-        m_grow_on_next_insert(false),
-        m_try_shrink_on_next_insert(false) {
-    if (m_bucket_count > 0) {
-      tsl_rh_assert(!m_buckets_data.empty());
-      m_buckets_data.back().set_as_last_bucket();
-    }
-
-    this->min_load_factor(min_load_factor);
-    this->max_load_factor(max_load_factor);
-  }
-#else
-  /**
-   * C++11 doesn't support the creation of a std::vector with a custom allocator
-   * and 'count' default-inserted elements. The needed contructor `explicit
-   * vector(size_type count, const Allocator& alloc = Allocator());` is only
-   * available in C++14 and later. We thus must resize after using the
-   * `vector(const Allocator& alloc)` constructor.
-   *
-   * We can't use `vector(size_type count, const T& value, const Allocator&
-   * alloc)` as it requires the value T to be copyable.
-   */
-  robin_hash(size_type bucket_count, const Hash& hash, const KeyEqual& equal,
-             const Allocator& alloc,
-             float min_load_factor = DEFAULT_MIN_LOAD_FACTOR,
-             float max_load_factor = DEFAULT_MAX_LOAD_FACTOR)
-      : Hash(hash),
-        KeyEqual(equal),
-        GrowthPolicy(bucket_count),
-        m_buckets_data(alloc),
-        m_buckets(static_empty_bucket_ptr()),
-        m_bucket_count(bucket_count),
-        m_nb_elements(0),
-        m_grow_on_next_insert(false),
-        m_try_shrink_on_next_insert(false) {
-    if (bucket_count > max_bucket_count()) {
-      TSL_RH_THROW_OR_TERMINATE(std::length_error,
-                                "The map exceeds its maximum bucket count.");
-    }
-
-    if (m_bucket_count > 0) {
-      m_buckets_data.resize(m_bucket_count);
-      m_buckets = m_buckets_data.data();
-
-      tsl_rh_assert(!m_buckets_data.empty());
-      m_buckets_data.back().set_as_last_bucket();
-    }
-
-    this->min_load_factor(min_load_factor);
-    this->max_load_factor(max_load_factor);
-  }
-#endif
-
-  robin_hash(const robin_hash& other)
-      : Hash(other),
-        KeyEqual(other),
-        GrowthPolicy(other),
-        m_buckets_data(other.m_buckets_data),
-        m_buckets(m_buckets_data.empty() ? static_empty_bucket_ptr()
-                                         : m_buckets_data.data()),
-        m_bucket_count(other.m_bucket_count),
-        m_nb_elements(other.m_nb_elements),
-        m_load_threshold(other.m_load_threshold),
-        m_min_load_factor(other.m_min_load_factor),
-        m_max_load_factor(other.m_max_load_factor),
-        m_grow_on_next_insert(other.m_grow_on_next_insert),
-        m_try_shrink_on_next_insert(other.m_try_shrink_on_next_insert) {}
-
-  robin_hash(robin_hash&& other) noexcept(
-      std::is_nothrow_move_constructible<
-          Hash>::value&& std::is_nothrow_move_constructible<KeyEqual>::value&&
-          std::is_nothrow_move_constructible<GrowthPolicy>::value&&
-              std::is_nothrow_move_constructible<buckets_container_type>::value)
-      : Hash(std::move(static_cast<Hash&>(other))),
-        KeyEqual(std::move(static_cast<KeyEqual&>(other))),
-        GrowthPolicy(std::move(static_cast<GrowthPolicy&>(other))),
-        m_buckets_data(std::move(other.m_buckets_data)),
-        m_buckets(m_buckets_data.empty() ? static_empty_bucket_ptr()
-                                         : m_buckets_data.data()),
-        m_bucket_count(other.m_bucket_count),
-        m_nb_elements(other.m_nb_elements),
-        m_load_threshold(other.m_load_threshold),
-        m_min_load_factor(other.m_min_load_factor),
-        m_max_load_factor(other.m_max_load_factor),
-        m_grow_on_next_insert(other.m_grow_on_next_insert),
-        m_try_shrink_on_next_insert(other.m_try_shrink_on_next_insert) {
-    other.clear_and_shrink();
-  }
-
-  robin_hash& operator=(const robin_hash& other) {
-    if (&other != this) {
-      Hash::operator=(other);
-      KeyEqual::operator=(other);
-      GrowthPolicy::operator=(other);
-
-      m_buckets_data = other.m_buckets_data;
-      m_buckets = m_buckets_data.empty() ? static_empty_bucket_ptr()
-                                         : m_buckets_data.data();
-      m_bucket_count = other.m_bucket_count;
-      m_nb_elements = other.m_nb_elements;
-
-      m_load_threshold = other.m_load_threshold;
-      m_min_load_factor = other.m_min_load_factor;
-      m_max_load_factor = other.m_max_load_factor;
-
-      m_grow_on_next_insert = other.m_grow_on_next_insert;
-      m_try_shrink_on_next_insert = other.m_try_shrink_on_next_insert;
-    }
-
-    return *this;
-  }
-
-  robin_hash& operator=(robin_hash&& other) {
-    other.swap(*this);
-    other.clear();
-
-    return *this;
-  }
-
-  allocator_type get_allocator() const {
-    return m_buckets_data.get_allocator();
-  }
-
-  /*
-   * Iterators
-   */
-  iterator begin() noexcept {
-    std::size_t i = 0;
-    while (i < m_bucket_count && m_buckets[i].empty()) {
-      i++;
-    }
-
-    return iterator(m_buckets + i);
-  }
-
-  const_iterator begin() const noexcept { return cbegin(); }
-
-  const_iterator cbegin() const noexcept {
-    std::size_t i = 0;
-    while (i < m_bucket_count && m_buckets[i].empty()) {
-      i++;
-    }
-
-    return const_iterator(m_buckets + i);
-  }
-
-  iterator end() noexcept { return iterator(m_buckets + m_bucket_count); }
-
-  const_iterator end() const noexcept { return cend(); }
-
-  const_iterator cend() const noexcept {
-    return const_iterator(m_buckets + m_bucket_count);
-  }
-
-  /*
-   * Capacity
-   */
-  bool empty() const noexcept { return m_nb_elements == 0; }
-
-  size_type size() const noexcept { return m_nb_elements; }
-
-  size_type max_size() const noexcept { return m_buckets_data.max_size(); }
-
-  /*
-   * Modifiers
-   */
-  void clear() noexcept {
-    if (m_min_load_factor > 0.0f) {
-      clear_and_shrink();
-    } else {
-      for (auto& bucket : m_buckets_data) {
-        bucket.clear();
-      }
-
-      m_nb_elements = 0;
-      m_grow_on_next_insert = false;
-    }
-  }
-
-  template <typename P>
-  std::pair<iterator, bool> insert(P&& value) {
-    return insert_impl(KeySelect()(value), std::forward<P>(value));
-  }
-
-  template <typename P>
-  iterator insert_hint(const_iterator hint, P&& value) {
-    if (hint != cend() &&
-        compare_keys(KeySelect()(*hint), KeySelect()(value))) {
-      return mutable_iterator(hint);
-    }
-
-    return insert(std::forward<P>(value)).first;
-  }
-
-  template <class InputIt>
-  void insert(InputIt first, InputIt last) {
-    if (std::is_base_of<
-            std::forward_iterator_tag,
-            typename std::iterator_traits<InputIt>::iterator_category>::value) {
-      const auto nb_elements_insert = std::distance(first, last);
-      const size_type nb_free_buckets = m_load_threshold - size();
-      tsl_rh_assert(m_load_threshold >= size());
-
-      if (nb_elements_insert > 0 &&
-          nb_free_buckets < size_type(nb_elements_insert)) {
-        reserve(size() + size_type(nb_elements_insert));
-      }
-    }
-
-    for (; first != last; ++first) {
-      insert(*first);
-    }
-  }
-
-  template <class K, class M>
-  std::pair<iterator, bool> insert_or_assign(K&& key, M&& obj) {
-    auto it = try_emplace(std::forward<K>(key), std::forward<M>(obj));
-    if (!it.second) {
-      it.first.value() = std::forward<M>(obj);
-    }
-
-    return it;
-  }
-
-  template <class K, class M>
-  iterator insert_or_assign(const_iterator hint, K&& key, M&& obj) {
-    if (hint != cend() && compare_keys(KeySelect()(*hint), key)) {
-      auto it = mutable_iterator(hint);
-      it.value() = std::forward<M>(obj);
-
-      return it;
-    }
-
-    return insert_or_assign(std::forward<K>(key), std::forward<M>(obj)).first;
-  }
-
-  template <class... Args>
-  std::pair<iterator, bool> emplace(Args&&... args) {
-    return insert(value_type(std::forward<Args>(args)...));
-  }
-
-  template <class... Args>
-  iterator emplace_hint(const_iterator hint, Args&&... args) {
-    return insert_hint(hint, value_type(std::forward<Args>(args)...));
-  }
-
-  template <class K, class... Args>
-  std::pair<iterator, bool> try_emplace(K&& key, Args&&... args) {
-    return insert_impl(key, std::piecewise_construct,
-                       std::forward_as_tuple(std::forward<K>(key)),
-                       std::forward_as_tuple(std::forward<Args>(args)...));
-  }
-
-  template <class K, class... Args>
-  iterator try_emplace_hint(const_iterator hint, K&& key, Args&&... args) {
-    if (hint != cend() && compare_keys(KeySelect()(*hint), key)) {
-      return mutable_iterator(hint);
-    }
-
-    return try_emplace(std::forward<K>(key), std::forward<Args>(args)...).first;
-  }
-
-  /**
-   * Here to avoid `template<class K> size_type erase(const K& key)` being used
-   * when we use an `iterator` instead of a `const_iterator`.
-   */
-  iterator erase(iterator pos) {
-    erase_from_bucket(pos);
-
-    /**
-     * Erase bucket used a backward shift after clearing the bucket.
-     * Check if there is a new value in the bucket, if not get the next
-     * non-empty.
-     */
-    if (pos.m_bucket->empty()) {
-      ++pos;
-    }
-
-    m_try_shrink_on_next_insert = true;
-
-    return pos;
-  }
-
-  iterator erase(const_iterator pos) { return erase(mutable_iterator(pos)); }
-
-  iterator erase(const_iterator first, const_iterator last) {
-    if (first == last) {
-      return mutable_iterator(first);
-    }
-
-    auto first_mutable = mutable_iterator(first);
-    auto last_mutable = mutable_iterator(last);
-    for (auto it = first_mutable.m_bucket; it != last_mutable.m_bucket; ++it) {
-      if (!it->empty()) {
-        it->clear();
-        m_nb_elements--;
-      }
-    }
-
-    if (last_mutable == end()) {
-      m_try_shrink_on_next_insert = true;
-      return end();
-    }
-
-    /*
-     * Backward shift on the values which come after the deleted values.
-     * We try to move the values closer to their ideal bucket.
-     */
-    std::size_t icloser_bucket =
-        static_cast<std::size_t>(first_mutable.m_bucket - m_buckets);
-    std::size_t ito_move_closer_value =
-        static_cast<std::size_t>(last_mutable.m_bucket - m_buckets);
-    tsl_rh_assert(ito_move_closer_value > icloser_bucket);
-
-    const std::size_t ireturn_bucket =
-        ito_move_closer_value -
-        std::min(
-            ito_move_closer_value - icloser_bucket,
-            std::size_t(
-                m_buckets[ito_move_closer_value].dist_from_ideal_bucket()));
-
-    while (ito_move_closer_value < m_bucket_count &&
-           m_buckets[ito_move_closer_value].dist_from_ideal_bucket() > 0) {
-      icloser_bucket =
-          ito_move_closer_value -
-          std::min(
-              ito_move_closer_value - icloser_bucket,
-              std::size_t(
-                  m_buckets[ito_move_closer_value].dist_from_ideal_bucket()));
-
-      tsl_rh_assert(m_buckets[icloser_bucket].empty());
-      const distance_type new_distance = distance_type(
-          m_buckets[ito_move_closer_value].dist_from_ideal_bucket() -
-          (ito_move_closer_value - icloser_bucket));
-      m_buckets[icloser_bucket].set_value_of_empty_bucket(
-          new_distance, m_buckets[ito_move_closer_value].truncated_hash(),
-          std::move(m_buckets[ito_move_closer_value].value()));
-      m_buckets[ito_move_closer_value].clear();
-
-      ++icloser_bucket;
-      ++ito_move_closer_value;
-    }
-
-    m_try_shrink_on_next_insert = true;
-
-    return iterator(m_buckets + ireturn_bucket);
-  }
-
-  template <class K>
-  size_type erase(const K& key) {
-    return erase(key, hash_key(key));
-  }
-
-  template <class K>
-  size_type erase(const K& key, std::size_t hash) {
-    auto it = find(key, hash);
-    if (it != end()) {
-      erase_from_bucket(it);
-      m_try_shrink_on_next_insert = true;
-
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  void swap(robin_hash& other) {
-    using std::swap;
-
-    swap(static_cast<Hash&>(*this), static_cast<Hash&>(other));
-    swap(static_cast<KeyEqual&>(*this), static_cast<KeyEqual&>(other));
-    swap(static_cast<GrowthPolicy&>(*this), static_cast<GrowthPolicy&>(other));
-    swap(m_buckets_data, other.m_buckets_data);
-    swap(m_buckets, other.m_buckets);
-    swap(m_bucket_count, other.m_bucket_count);
-    swap(m_nb_elements, other.m_nb_elements);
-    swap(m_load_threshold, other.m_load_threshold);
-    swap(m_min_load_factor, other.m_min_load_factor);
-    swap(m_max_load_factor, other.m_max_load_factor);
-    swap(m_grow_on_next_insert, other.m_grow_on_next_insert);
-    swap(m_try_shrink_on_next_insert, other.m_try_shrink_on_next_insert);
-  }
-
-  /*
-   * Lookup
-   */
-  template <class K, class U = ValueSelect,
-            typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
-  typename U::value_type& at(const K& key) {
-    return at(key, hash_key(key));
-  }
-
-  template <class K, class U = ValueSelect,
-            typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
-  typename U::value_type& at(const K& key, std::size_t hash) {
-    return const_cast<typename U::value_type&>(
-        static_cast<const robin_hash*>(this)->at(key, hash));
-  }
-
-  template <class K, class U = ValueSelect,
-            typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
-  const typename U::value_type& at(const K& key) const {
-    return at(key, hash_key(key));
-  }
-
-  template <class K, class U = ValueSelect,
-            typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
-  const typename U::value_type& at(const K& key, std::size_t hash) const {
-    auto it = find(key, hash);
-    if (it != cend()) {
-      return it.value();
-    } else {
-      TSL_RH_THROW_OR_TERMINATE(std::out_of_range, "Couldn't find key.");
-    }
-  }
-
-  template <class K, class U = ValueSelect,
-            typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
-  typename U::value_type& operator[](K&& key) {
-    return try_emplace(std::forward<K>(key)).first.value();
-  }
-
-  template <class K>
-  size_type count(const K& key) const {
-    return count(key, hash_key(key));
-  }
-
-  template <class K>
-  size_type count(const K& key, std::size_t hash) const {
-    if (find(key, hash) != cend()) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  template <class K>
-  iterator find(const K& key) {
-    return find_impl(key, hash_key(key));
-  }
-
-  template <class K>
-  iterator find(const K& key, std::size_t hash) {
-    return find_impl(key, hash);
-  }
-
-  template <class K>
-  const_iterator find(const K& key) const {
-    return find_impl(key, hash_key(key));
-  }
-
-  template <class K>
-  const_iterator find(const K& key, std::size_t hash) const {
-    return find_impl(key, hash);
-  }
-
-  template <class K>
-  bool contains(const K& key) const {
-    return contains(key, hash_key(key));
-  }
-
-  template <class K>
-  bool contains(const K& key, std::size_t hash) const {
-    return count(key, hash) != 0;
-  }
-
-  template <class K>
-  std::pair<iterator, iterator> equal_range(const K& key) {
-    return equal_range(key, hash_key(key));
-  }
-
-  template <class K>
-  std::pair<iterator, iterator> equal_range(const K& key, std::size_t hash) {
-    iterator it = find(key, hash);
-    return std::make_pair(it, (it == end()) ? it : std::next(it));
-  }
-
-  template <class K>
-  std::pair<const_iterator, const_iterator> equal_range(const K& key) const {
-    return equal_range(key, hash_key(key));
-  }
-
-  template <class K>
-  std::pair<const_iterator, const_iterator> equal_range(
-      const K& key, std::size_t hash) const {
-    const_iterator it = find(key, hash);
-    return std::make_pair(it, (it == cend()) ? it : std::next(it));
-  }
-
-  /*
-   * Bucket interface
-   */
-  size_type bucket_count() const { return m_bucket_count; }
-
-  size_type max_bucket_count() const {
-    return std::min(GrowthPolicy::max_bucket_count(),
-                    m_buckets_data.max_size());
-  }
-
-  /*
-   * Hash policy
-   */
-  float load_factor() const {
-    if (bucket_count() == 0) {
-      return 0;
-    }
-
-    return float(m_nb_elements) / float(bucket_count());
-  }
-
-  float min_load_factor() const { return m_min_load_factor; }
-
-  float max_load_factor() const { return m_max_load_factor; }
-
-  void min_load_factor(float ml) {
-    m_min_load_factor = clamp(ml, float(MINIMUM_MIN_LOAD_FACTOR),
-                              float(MAXIMUM_MIN_LOAD_FACTOR));
-  }
-
-  void max_load_factor(float ml) {
-    m_max_load_factor = clamp(ml, float(MINIMUM_MAX_LOAD_FACTOR),
-                              float(MAXIMUM_MAX_LOAD_FACTOR));
-    m_load_threshold = size_type(float(bucket_count()) * m_max_load_factor);
-  }
-
-  void rehash(size_type count_) {
-    count_ = std::max(count_,
-                     size_type(std::ceil(float(size()) / max_load_factor())));
-    rehash_impl(count_);
-  }
-
-  void reserve(size_type count_) {
-    rehash(size_type(std::ceil(float(count_) / max_load_factor())));
-  }
-
-  /*
-   * Observers
-   */
-  hasher hash_function() const { return static_cast<const Hash&>(*this); }
-
-  key_equal key_eq() const { return static_cast<const KeyEqual&>(*this); }
-
-  /*
-   * Other
-   */
-  iterator mutable_iterator(const_iterator pos) {
-    return iterator(const_cast<bucket_entry*>(pos.m_bucket));
-  }
-
-  template <class Serializer>
-  void serialize(Serializer& serializer) const {
-    serialize_impl(serializer);
-  }
-
-  template <class Deserializer>
-  void deserialize(Deserializer& deserializer, bool hash_compatible) {
-    deserialize_impl(deserializer, hash_compatible);
-  }
-
- private:
-  template <class K>
-  std::size_t hash_key(const K& key) const {
-    return Hash::operator()(key);
-  }
-
-  template <class K1, class K2>
-  bool compare_keys(const K1& key1, const K2& key2) const {
-    return KeyEqual::operator()(key1, key2);
-  }
-
-  std::size_t bucket_for_hash(std::size_t hash) const {
-    const std::size_t bucket = GrowthPolicy::bucket_for_hash(hash);
-    tsl_rh_assert(bucket < m_bucket_count ||
-                  (bucket == 0 && m_bucket_count == 0));
-
-    return bucket;
-  }
-
-  template <class U = GrowthPolicy,
-            typename std::enable_if<is_power_of_two_policy<U>::value>::type* =
-                nullptr>
-  std::size_t next_bucket(std::size_t index) const noexcept {
-    tsl_rh_assert(index < bucket_count());
-
-    return (index + 1) & this->m_mask;
-  }
-
-  template <class U = GrowthPolicy,
-            typename std::enable_if<!is_power_of_two_policy<U>::value>::type* =
-                nullptr>
-  std::size_t next_bucket(std::size_t index) const noexcept {
-    tsl_rh_assert(index < bucket_count());
-
-    index++;
-    return (index != bucket_count()) ? index : 0;
-  }
-
-  template <class K>
-  iterator find_impl(const K& key, std::size_t hash) {
-    return mutable_iterator(
-        static_cast<const robin_hash*>(this)->find(key, hash));
-  }
-
-  template <class K>
-  const_iterator find_impl(const K& key, std::size_t hash) const {
-    std::size_t ibucket = bucket_for_hash(hash);
-    distance_type dist_from_ideal_bucket = 0;
-
-    while (dist_from_ideal_bucket <=
-           m_buckets[ibucket].dist_from_ideal_bucket()) {
-      if (TSL_RH_LIKELY(
-              (!USE_STORED_HASH_ON_LOOKUP ||
-               m_buckets[ibucket].bucket_hash_equal(hash)) &&
-              compare_keys(KeySelect()(m_buckets[ibucket].value()), key))) {
-        return const_iterator(m_buckets + ibucket);
-      }
-
-      ibucket = next_bucket(ibucket);
-      dist_from_ideal_bucket++;
-    }
-
-    return cend();
-  }
-
-  void erase_from_bucket(iterator pos) {
-    pos.m_bucket->clear();
-    m_nb_elements--;
-
-    /**
-     * Backward shift, swap the empty bucket, previous_ibucket, with the values
-     * on its right, ibucket, until we cross another empty bucket or if the
-     * other bucket has a distance_from_ideal_bucket == 0.
-     *
-     * We try to move the values closer to their ideal bucket.
-     */
-    std::size_t previous_ibucket =
-        static_cast<std::size_t>(pos.m_bucket - m_buckets);
-    std::size_t ibucket = next_bucket(previous_ibucket);
-
-    while (m_buckets[ibucket].dist_from_ideal_bucket() > 0) {
-      tsl_rh_assert(m_buckets[previous_ibucket].empty());
-
-      const distance_type new_distance =
-          distance_type(m_buckets[ibucket].dist_from_ideal_bucket() - 1);
-      m_buckets[previous_ibucket].set_value_of_empty_bucket(
-          new_distance, m_buckets[ibucket].truncated_hash(),
-          std::move(m_buckets[ibucket].value()));
-      m_buckets[ibucket].clear();
-
-      previous_ibucket = ibucket;
-      ibucket = next_bucket(ibucket);
-    }
-  }
-
-  template <class K, class... Args>
-  std::pair<iterator, bool> insert_impl(const K& key,
-                                        Args&&... value_type_args) {
-    const std::size_t hash = hash_key(key);
-
-    std::size_t ibucket = bucket_for_hash(hash);
-    distance_type dist_from_ideal_bucket = 0;
-
-    while (dist_from_ideal_bucket <=
-           m_buckets[ibucket].dist_from_ideal_bucket()) {
-      if ((!USE_STORED_HASH_ON_LOOKUP ||
-           m_buckets[ibucket].bucket_hash_equal(hash)) &&
-          compare_keys(KeySelect()(m_buckets[ibucket].value()), key)) {
-        return std::make_pair(iterator(m_buckets + ibucket), false);
-      }
-
-      ibucket = next_bucket(ibucket);
-      dist_from_ideal_bucket++;
-    }
-
-    if (rehash_on_extreme_load()) {
-      ibucket = bucket_for_hash(hash);
-      dist_from_ideal_bucket = 0;
-
-      while (dist_from_ideal_bucket <=
-             m_buckets[ibucket].dist_from_ideal_bucket()) {
-        ibucket = next_bucket(ibucket);
-        dist_from_ideal_bucket++;
-      }
-    }
-
-    if (m_buckets[ibucket].empty()) {
-      m_buckets[ibucket].set_value_of_empty_bucket(
-          dist_from_ideal_bucket, bucket_entry::truncate_hash(hash),
-          std::forward<Args>(value_type_args)...);
-    } else {
-      insert_value(ibucket, dist_from_ideal_bucket,
-                   bucket_entry::truncate_hash(hash),
-                   std::forward<Args>(value_type_args)...);
-    }
-
-    m_nb_elements++;
-    /*
-     * The value will be inserted in ibucket in any case, either because it was
-     * empty or by stealing the bucket (robin hood).
-     */
-    return std::make_pair(iterator(m_buckets + ibucket), true);
-  }
-
-  template <class... Args>
-  void insert_value(std::size_t ibucket, distance_type dist_from_ideal_bucket,
-                    truncated_hash_type hash, Args&&... value_type_args) {
-    value_type value(std::forward<Args>(value_type_args)...);
-    insert_value_impl(ibucket, dist_from_ideal_bucket, hash, value);
-  }
-
-  void insert_value(std::size_t ibucket, distance_type dist_from_ideal_bucket,
-                    truncated_hash_type hash, value_type&& value) {
-    insert_value_impl(ibucket, dist_from_ideal_bucket, hash, value);
-  }
-
-  /*
-   * We don't use `value_type&& value` as last argument due to a bug in MSVC
-   * when `value_type` is a pointer, The compiler is not able to see the
-   * difference between `std::string*` and `std::string*&&` resulting in a
-   * compilation error.
-   *
-   * The `value` will be in a moved state at the end of the function.
-   */
-  void insert_value_impl(std::size_t ibucket,
-                         distance_type dist_from_ideal_bucket,
-                         truncated_hash_type hash, value_type& value) {
-    m_buckets[ibucket].swap_with_value_in_bucket(dist_from_ideal_bucket, hash,
-                                                 value);
-    ibucket = next_bucket(ibucket);
-    dist_from_ideal_bucket++;
-
-    while (!m_buckets[ibucket].empty()) {
-      if (dist_from_ideal_bucket >
-          m_buckets[ibucket].dist_from_ideal_bucket()) {
-        if (dist_from_ideal_bucket >=
-            bucket_entry::DIST_FROM_IDEAL_BUCKET_LIMIT) {
-          /**
-           * The number of probes is really high, rehash the map on the next
-           * insert. Difficult to do now as rehash may throw an exception.
-           */
-          m_grow_on_next_insert = true;
-        }
-
-        m_buckets[ibucket].swap_with_value_in_bucket(dist_from_ideal_bucket,
-                                                     hash, value);
-      }
-
-      ibucket = next_bucket(ibucket);
-      dist_from_ideal_bucket++;
-    }
-
-    m_buckets[ibucket].set_value_of_empty_bucket(dist_from_ideal_bucket, hash,
-                                                 std::move(value));
-  }
-
-  void rehash_impl(size_type count_) {
-    robin_hash new_table(count_, static_cast<Hash&>(*this),
-                         static_cast<KeyEqual&>(*this), get_allocator(),
-                         m_min_load_factor, m_max_load_factor);
-
-    const bool use_stored_hash =
-        USE_STORED_HASH_ON_REHASH(new_table.bucket_count());
-    for (auto& bucket : m_buckets_data) {
-      if (bucket.empty()) {
-        continue;
-      }
-
-      const std::size_t hash =
-          use_stored_hash ? bucket.truncated_hash()
-                          : new_table.hash_key(KeySelect()(bucket.value()));
-
-      new_table.insert_value_on_rehash(new_table.bucket_for_hash(hash), 0,
-                                       bucket_entry::truncate_hash(hash),
-                                       std::move(bucket.value()));
-    }
-
-    new_table.m_nb_elements = m_nb_elements;
-    new_table.swap(*this);
-  }
-
-  void clear_and_shrink() noexcept {
-    GrowthPolicy::clear();
-    m_buckets_data.clear();
-    m_buckets = static_empty_bucket_ptr();
-    m_bucket_count = 0;
-    m_nb_elements = 0;
-    m_load_threshold = 0;
-    m_grow_on_next_insert = false;
-    m_try_shrink_on_next_insert = false;
-  }
-
-  void insert_value_on_rehash(std::size_t ibucket,
-                              distance_type dist_from_ideal_bucket,
-                              truncated_hash_type hash, value_type&& value) {
-    while (true) {
-      if (dist_from_ideal_bucket >
-          m_buckets[ibucket].dist_from_ideal_bucket()) {
-        if (m_buckets[ibucket].empty()) {
-          m_buckets[ibucket].set_value_of_empty_bucket(dist_from_ideal_bucket,
-                                                       hash, std::move(value));
-          return;
-        } else {
-          m_buckets[ibucket].swap_with_value_in_bucket(dist_from_ideal_bucket,
-                                                       hash, value);
-        }
-      }
-
-      dist_from_ideal_bucket++;
-      ibucket = next_bucket(ibucket);
-    }
-  }
-
-  /**
-   * Grow the table if m_grow_on_next_insert is true or we reached the
-   * max_load_factor. Shrink the table if m_try_shrink_on_next_insert is true
-   * (an erase occurred) and we're below the min_load_factor.
-   *
-   * Return true if the table has been rehashed.
-   */
-  bool rehash_on_extreme_load() {
-    if (m_grow_on_next_insert || size() >= m_load_threshold) {
-      rehash_impl(GrowthPolicy::next_bucket_count());
-      m_grow_on_next_insert = false;
-
-      return true;
-    }
-
-    if (m_try_shrink_on_next_insert) {
-      m_try_shrink_on_next_insert = false;
-      if (m_min_load_factor != 0.0f && load_factor() < m_min_load_factor) {
-        reserve(size() + 1);
-
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  template <class Serializer>
-  void serialize_impl(Serializer& serializer) const {
-    const slz_size_type version = SERIALIZATION_PROTOCOL_VERSION;
-    serializer(version);
-
-    // Indicate if the truncated hash of each bucket is stored. Use a
-    // std::int16_t instead of a bool to avoid the need for the serializer to
-    // support an extra 'bool' type.
-    const std::int16_t hash_stored_for_bucket =
-        static_cast<std::int16_t>(STORE_HASH);
-    serializer(hash_stored_for_bucket);
-
-    const slz_size_type nb_elements = m_nb_elements;
-    serializer(nb_elements);
-
-    const slz_size_type bucket_count = m_buckets_data.size();
-    serializer(bucket_count);
-
-    const float min_load_factor = m_min_load_factor;
-    serializer(min_load_factor);
-
-    const float max_load_factor = m_max_load_factor;
-    serializer(max_load_factor);
-
-    for (const bucket_entry& bucket : m_buckets_data) {
-      if (bucket.empty()) {
-        const std::int16_t empty_bucket =
-            bucket_entry::EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET;
-        serializer(empty_bucket);
-      } else {
-        const std::int16_t dist_from_ideal_bucket =
-            bucket.dist_from_ideal_bucket();
-        serializer(dist_from_ideal_bucket);
-        if (STORE_HASH) {
-          const std::uint32_t truncated_hash = bucket.truncated_hash();
-          serializer(truncated_hash);
-        }
-        serializer(bucket.value());
-      }
-    }
-  }
-
-  template <class Deserializer>
-  void deserialize_impl(Deserializer& deserializer, bool hash_compatible) {
-    tsl_rh_assert(m_buckets_data.empty());  // Current hash table must be empty
-
-    const slz_size_type version =
-        deserialize_value<slz_size_type>(deserializer);
-    // For now we only have one version of the serialization protocol.
-    // If it doesn't match there is a problem with the file.
-    if (version != SERIALIZATION_PROTOCOL_VERSION) {
-      TSL_RH_THROW_OR_TERMINATE(std::runtime_error,
-                                "Can't deserialize the ordered_map/set. "
-                                "The protocol version header is invalid.");
-    }
-
-    const bool hash_stored_for_bucket =
-        deserialize_value<std::int16_t>(deserializer) ? true : false;
-    if (hash_compatible && STORE_HASH != hash_stored_for_bucket) {
-      TSL_RH_THROW_OR_TERMINATE(
-          std::runtime_error,
-          "Can't deserialize a map with a different StoreHash "
-          "than the one used during the serialization when "
-          "hash compatibility is used");
-    }
-
-    const slz_size_type nb_elements =
-        deserialize_value<slz_size_type>(deserializer);
-    const slz_size_type bucket_count_ds =
-        deserialize_value<slz_size_type>(deserializer);
-    const float min_load_factor = deserialize_value<float>(deserializer);
-    const float max_load_factor = deserialize_value<float>(deserializer);
-
-    if (min_load_factor < MINIMUM_MIN_LOAD_FACTOR ||
-        min_load_factor > MAXIMUM_MIN_LOAD_FACTOR) {
-      TSL_RH_THROW_OR_TERMINATE(
-          std::runtime_error,
-          "Invalid min_load_factor. Check that the serializer "
-          "and deserializer support floats correctly as they "
-          "can be converted implicitly to ints.");
-    }
-
-    if (max_load_factor < MINIMUM_MAX_LOAD_FACTOR ||
-        max_load_factor > MAXIMUM_MAX_LOAD_FACTOR) {
-      TSL_RH_THROW_OR_TERMINATE(
-          std::runtime_error,
-          "Invalid max_load_factor. Check that the serializer "
-          "and deserializer support floats correctly as they "
-          "can be converted implicitly to ints.");
-    }
-
-    this->min_load_factor(min_load_factor);
-    this->max_load_factor(max_load_factor);
-
-    if (bucket_count_ds == 0) {
-      tsl_rh_assert(nb_elements == 0);
-      return;
-    }
-
-    if (!hash_compatible) {
-      reserve(numeric_cast<size_type>(nb_elements,
-                                      "Deserialized nb_elements is too big."));
-      for (slz_size_type ibucket = 0; ibucket < bucket_count_ds; ibucket++) {
-        const distance_type dist_from_ideal_bucket =
-            deserialize_value<std::int16_t>(deserializer);
-        if (dist_from_ideal_bucket !=
-            bucket_entry::EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET) {
-          if (hash_stored_for_bucket) {
-            TSL_RH_UNUSED(deserialize_value<std::uint32_t>(deserializer));
-          }
-
-          insert(deserialize_value<value_type>(deserializer));
-        }
-      }
-
-      tsl_rh_assert(nb_elements == size());
-    } else {
-      m_bucket_count = numeric_cast<size_type>(
-          bucket_count_ds, "Deserialized bucket_count is too big.");
-
-      GrowthPolicy::operator=(GrowthPolicy(m_bucket_count));
-      // GrowthPolicy should not modify the bucket count we got from
-      // deserialization
-      if (m_bucket_count != bucket_count_ds) {
-        TSL_RH_THROW_OR_TERMINATE(std::runtime_error,
-                                  "The GrowthPolicy is not the same even "
-                                  "though hash_compatible is true.");
-      }
-
-      m_nb_elements = numeric_cast<size_type>(
-          nb_elements, "Deserialized nb_elements is too big.");
-      m_buckets_data.resize(m_bucket_count);
-      m_buckets = m_buckets_data.data();
-
-      for (bucket_entry& bucket : m_buckets_data) {
-        const distance_type dist_from_ideal_bucket =
-            deserialize_value<std::int16_t>(deserializer);
-        if (dist_from_ideal_bucket !=
-            bucket_entry::EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET) {
-          truncated_hash_type truncated_hash = 0;
-          if (hash_stored_for_bucket) {
-            tsl_rh_assert(hash_stored_for_bucket);
-            truncated_hash = deserialize_value<std::uint32_t>(deserializer);
-          }
-
-          bucket.set_value_of_empty_bucket(
-              dist_from_ideal_bucket, truncated_hash,
-              deserialize_value<value_type>(deserializer));
-        }
-      }
-
-      if (!m_buckets_data.empty()) {
-        m_buckets_data.back().set_as_last_bucket();
-      }
-    }
-  }
-
- public:
-  static const size_type DEFAULT_INIT_BUCKETS_SIZE = 0;
-
-  static constexpr float DEFAULT_MAX_LOAD_FACTOR = 0.5f;
-  static constexpr float MINIMUM_MAX_LOAD_FACTOR = 0.2f;
-  static constexpr float MAXIMUM_MAX_LOAD_FACTOR = 0.95f;
-
-  static constexpr float DEFAULT_MIN_LOAD_FACTOR = 0.0f;
-  static constexpr float MINIMUM_MIN_LOAD_FACTOR = 0.0f;
-  static constexpr float MAXIMUM_MIN_LOAD_FACTOR = 0.15f;
-
-  static_assert(MINIMUM_MAX_LOAD_FACTOR < MAXIMUM_MAX_LOAD_FACTOR,
-                "MINIMUM_MAX_LOAD_FACTOR should be < MAXIMUM_MAX_LOAD_FACTOR");
-  static_assert(MINIMUM_MIN_LOAD_FACTOR < MAXIMUM_MIN_LOAD_FACTOR,
-                "MINIMUM_MIN_LOAD_FACTOR should be < MAXIMUM_MIN_LOAD_FACTOR");
-  static_assert(MAXIMUM_MIN_LOAD_FACTOR < MINIMUM_MAX_LOAD_FACTOR,
-                "MAXIMUM_MIN_LOAD_FACTOR should be < MINIMUM_MAX_LOAD_FACTOR");
-
- private:
-  /**
-   * Protocol version currenlty used for serialization.
-   */
-  static const slz_size_type SERIALIZATION_PROTOCOL_VERSION = 1;
-
-  /**
-   * Return an always valid pointer to an static empty bucket_entry with
-   * last_bucket() == true.
-   */
-  bucket_entry* static_empty_bucket_ptr() noexcept {
-    static bucket_entry empty_bucket(true);
-    return &empty_bucket;
-  }
-
- private:
-  buckets_container_type m_buckets_data;
-
-  /**
-   * Points to m_buckets_data.data() if !m_buckets_data.empty() otherwise points
-   * to static_empty_bucket_ptr. This variable is useful to avoid the cost of
-   * checking if m_buckets_data is empty when trying to find an element.
-   *
-   * TODO Remove m_buckets_data and only use a pointer instead of a
-   * pointer+vector to save some space in the robin_hash object. Manage the
-   * Allocator manually.
-   */
-  bucket_entry* m_buckets;
-
-  /**
-   * Used a lot in find, avoid the call to m_buckets_data.size() which is a bit
-   * slower.
-   */
-  size_type m_bucket_count;
-
-  size_type m_nb_elements;
-
-  size_type m_load_threshold;
-
-  float m_min_load_factor;
-  float m_max_load_factor;
-
-  bool m_grow_on_next_insert;
-
-  /**
-   * We can't shrink down the map on erase operations as the erase methods need
-   * to return the next iterator. Shrinking the map would invalidate all the
-   * iterators and we could not return the next iterator in a meaningful way, On
-   * erase, we thus just indicate on erase that we should try to shrink the hash
-   * table on the next insert if we go below the min_load_factor.
-   */
-  bool m_try_shrink_on_next_insert;
-};
-
-}  // namespace detail_robin_hash
-
-}  // namespace tsl
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_map.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_map.h
deleted file mode 100644
index 3de7a59dc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_map.h
+++ /dev/null
@@ -1,807 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef TSL_ROBIN_MAP_H
-#define TSL_ROBIN_MAP_H
-
-#include <cstddef>
-#include <functional>
-#include <initializer_list>
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-#include "robin_hash.h"
-
-namespace tsl {
-
-/**
- * Implementation of a hash map using open-addressing and the robin hood hashing
- * algorithm with backward shift deletion.
- *
- * For operations modifying the hash map (insert, erase, rehash, ...), the
- * strong exception guarantee is only guaranteed when the expression
- * `std::is_nothrow_swappable<std::pair<Key, T>>::value &&
- * std::is_nothrow_move_constructible<std::pair<Key, T>>::value` is true,
- * otherwise if an exception is thrown during the swap or the move, the hash map
- * may end up in a undefined state. Per the standard a `Key` or `T` with a
- * noexcept copy constructor and no move constructor also satisfies the
- * `std::is_nothrow_move_constructible<std::pair<Key, T>>::value` criterion (and
- * will thus guarantee the strong exception for the map).
- *
- * When `StoreHash` is true, 32 bits of the hash are stored alongside the
- * values. It can improve the performance during lookups if the `KeyEqual`
- * function takes time (if it engenders a cache-miss for example) as we then
- * compare the stored hashes before comparing the keys. When
- * `tsl::rh::power_of_two_growth_policy` is used as `GrowthPolicy`, it may also
- * speed-up the rehash process as we can avoid to recalculate the hash. When it
- * is detected that storing the hash will not incur any memory penalty due to
- * alignment (i.e. `sizeof(tsl::detail_robin_hash::bucket_entry<ValueType,
- * true>) == sizeof(tsl::detail_robin_hash::bucket_entry<ValueType, false>)`)
- * and `tsl::rh::power_of_two_growth_policy` is used, the hash will be stored
- * even if `StoreHash` is false so that we can speed-up the rehash (but it will
- * not be used on lookups unless `StoreHash` is true).
- *
- * `GrowthPolicy` defines how the map grows and consequently how a hash value is
- * mapped to a bucket. By default the map uses
- * `tsl::rh::power_of_two_growth_policy`. This policy keeps the number of
- * buckets to a power of two and uses a mask to map the hash to a bucket instead
- * of the slow modulo. Other growth policies are available and you may define
- * your own growth policy, check `tsl::rh::power_of_two_growth_policy` for the
- * interface.
- *
- * `std::pair<Key, T>` must be swappable.
- *
- * `Key` and `T` must be copy and/or move constructible.
- *
- * If the destructor of `Key` or `T` throws an exception, the behaviour of the
- * class is undefined.
- *
- * Iterators invalidation:
- *  - clear, operator=, reserve, rehash: always invalidate the iterators.
- *  - insert, emplace, emplace_hint, operator[]: if there is an effective
- * insert, invalidate the iterators.
- *  - erase: always invalidate the iterators.
- */
-template <class Key, class T, class Hash = std::hash<Key>,
-          class KeyEqual = std::equal_to<Key>,
-          class Allocator = std::allocator<std::pair<Key, T>>,
-          bool StoreHash = false,
-          class GrowthPolicy = tsl::rh::power_of_two_growth_policy<2>>
-class robin_map {
- private:
-  template <typename U>
-  using has_is_transparent = tsl::detail_robin_hash::has_is_transparent<U>;
-
-  class KeySelect {
-   public:
-    using key_type = Key;
-
-    const key_type& operator()(const std::pair<Key, T>& key_value) const
-        noexcept {
-      return key_value.first;
-    }
-
-    key_type& operator()(std::pair<Key, T>& key_value) noexcept {
-      return key_value.first;
-    }
-  };
-
-  class ValueSelect {
-   public:
-    using value_type = T;
-
-    const value_type& operator()(const std::pair<Key, T>& key_value) const
-        noexcept {
-      return key_value.second;
-    }
-
-    value_type& operator()(std::pair<Key, T>& key_value) noexcept {
-      return key_value.second;
-    }
-  };
-
-  using ht = detail_robin_hash::robin_hash<std::pair<Key, T>, KeySelect,
-                                           ValueSelect, Hash, KeyEqual,
-                                           Allocator, StoreHash, GrowthPolicy>;
-
- public:
-  using key_type = typename ht::key_type;
-  using mapped_type = T;
-  using value_type = typename ht::value_type;
-  using size_type = typename ht::size_type;
-  using difference_type = typename ht::difference_type;
-  using hasher = typename ht::hasher;
-  using key_equal = typename ht::key_equal;
-  using allocator_type = typename ht::allocator_type;
-  using reference = typename ht::reference;
-  using const_reference = typename ht::const_reference;
-  using pointer = typename ht::pointer;
-  using const_pointer = typename ht::const_pointer;
-  using iterator = typename ht::iterator;
-  using const_iterator = typename ht::const_iterator;
-
- public:
-  /*
-   * Constructors
-   */
-  robin_map() : robin_map(ht::DEFAULT_INIT_BUCKETS_SIZE) {}
-
-  explicit robin_map(size_type bucket_count, const Hash& hash = Hash(),
-                     const KeyEqual& equal = KeyEqual(),
-                     const Allocator& alloc = Allocator())
-      : m_ht(bucket_count, hash, equal, alloc) {}
-
-  robin_map(size_type bucket_count, const Allocator& alloc)
-      : robin_map(bucket_count, Hash(), KeyEqual(), alloc) {}
-
-  robin_map(size_type bucket_count, const Hash& hash, const Allocator& alloc)
-      : robin_map(bucket_count, hash, KeyEqual(), alloc) {}
-
-  explicit robin_map(const Allocator& alloc)
-      : robin_map(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {}
-
-  template <class InputIt>
-  robin_map(InputIt first, InputIt last,
-            size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
-            const Hash& hash = Hash(), const KeyEqual& equal = KeyEqual(),
-            const Allocator& alloc = Allocator())
-      : robin_map(bucket_count, hash, equal, alloc) {
-    insert(first, last);
-  }
-
-  template <class InputIt>
-  robin_map(InputIt first, InputIt last, size_type bucket_count,
-            const Allocator& alloc)
-      : robin_map(first, last, bucket_count, Hash(), KeyEqual(), alloc) {}
-
-  template <class InputIt>
-  robin_map(InputIt first, InputIt last, size_type bucket_count,
-            const Hash& hash, const Allocator& alloc)
-      : robin_map(first, last, bucket_count, hash, KeyEqual(), alloc) {}
-
-  robin_map(std::initializer_list<value_type> init,
-            size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
-            const Hash& hash = Hash(), const KeyEqual& equal = KeyEqual(),
-            const Allocator& alloc = Allocator())
-      : robin_map(init.begin(), init.end(), bucket_count, hash, equal, alloc) {}
-
-  robin_map(std::initializer_list<value_type> init, size_type bucket_count,
-            const Allocator& alloc)
-      : robin_map(init.begin(), init.end(), bucket_count, Hash(), KeyEqual(),
-                  alloc) {}
-
-  robin_map(std::initializer_list<value_type> init, size_type bucket_count,
-            const Hash& hash, const Allocator& alloc)
-      : robin_map(init.begin(), init.end(), bucket_count, hash, KeyEqual(),
-                  alloc) {}
-
-  robin_map& operator=(std::initializer_list<value_type> ilist) {
-    m_ht.clear();
-
-    m_ht.reserve(ilist.size());
-    m_ht.insert(ilist.begin(), ilist.end());
-
-    return *this;
-  }
-
-  allocator_type get_allocator() const { return m_ht.get_allocator(); }
-
-  /*
-   * Iterators
-   */
-  iterator begin() noexcept { return m_ht.begin(); }
-  const_iterator begin() const noexcept { return m_ht.begin(); }
-  const_iterator cbegin() const noexcept { return m_ht.cbegin(); }
-
-  iterator end() noexcept { return m_ht.end(); }
-  const_iterator end() const noexcept { return m_ht.end(); }
-  const_iterator cend() const noexcept { return m_ht.cend(); }
-
-  /*
-   * Capacity
-   */
-  bool empty() const noexcept { return m_ht.empty(); }
-  size_type size() const noexcept { return m_ht.size(); }
-  size_type max_size() const noexcept { return m_ht.max_size(); }
-
-  /*
-   * Modifiers
-   */
-  void clear() noexcept { m_ht.clear(); }
-
-  std::pair<iterator, bool> insert(const value_type& value) {
-    return m_ht.insert(value);
-  }
-
-  template <class P, typename std::enable_if<std::is_constructible<
-                         value_type, P&&>::value>::type* = nullptr>
-  std::pair<iterator, bool> insert(P&& value) {
-    return m_ht.emplace(std::forward<P>(value));
-  }
-
-  std::pair<iterator, bool> insert(value_type&& value) {
-    return m_ht.insert(std::move(value));
-  }
-
-  iterator insert(const_iterator hint, const value_type& value) {
-    return m_ht.insert_hint(hint, value);
-  }
-
-  template <class P, typename std::enable_if<std::is_constructible<
-                         value_type, P&&>::value>::type* = nullptr>
-  iterator insert(const_iterator hint, P&& value) {
-    return m_ht.emplace_hint(hint, std::forward<P>(value));
-  }
-
-  iterator insert(const_iterator hint, value_type&& value) {
-    return m_ht.insert_hint(hint, std::move(value));
-  }
-
-  template <class InputIt>
-  void insert(InputIt first, InputIt last) {
-    m_ht.insert(first, last);
-  }
-
-  void insert(std::initializer_list<value_type> ilist) {
-    m_ht.insert(ilist.begin(), ilist.end());
-  }
-
-  template <class M>
-  std::pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj) {
-    return m_ht.insert_or_assign(k, std::forward<M>(obj));
-  }
-
-  template <class M>
-  std::pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj) {
-    return m_ht.insert_or_assign(std::move(k), std::forward<M>(obj));
-  }
-
-  template <class M>
-  iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj) {
-    return m_ht.insert_or_assign(hint, k, std::forward<M>(obj));
-  }
-
-  template <class M>
-  iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj) {
-    return m_ht.insert_or_assign(hint, std::move(k), std::forward<M>(obj));
-  }
-
-  /**
-   * Due to the way elements are stored, emplace will need to move or copy the
-   * key-value once. The method is equivalent to
-   * insert(value_type(std::forward<Args>(args)...));
-   *
-   * Mainly here for compatibility with the std::unordered_map interface.
-   */
-  template <class... Args>
-  std::pair<iterator, bool> emplace(Args&&... args) {
-    return m_ht.emplace(std::forward<Args>(args)...);
-  }
-
-  /**
-   * Due to the way elements are stored, emplace_hint will need to move or copy
-   * the key-value once. The method is equivalent to insert(hint,
-   * value_type(std::forward<Args>(args)...));
-   *
-   * Mainly here for compatibility with the std::unordered_map interface.
-   */
-  template <class... Args>
-  iterator emplace_hint(const_iterator hint, Args&&... args) {
-    return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
-  }
-
-  template <class... Args>
-  std::pair<iterator, bool> try_emplace(const key_type& k, Args&&... args) {
-    return m_ht.try_emplace(k, std::forward<Args>(args)...);
-  }
-
-  template <class... Args>
-  std::pair<iterator, bool> try_emplace(key_type&& k, Args&&... args) {
-    return m_ht.try_emplace(std::move(k), std::forward<Args>(args)...);
-  }
-
-  template <class... Args>
-  iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args) {
-    return m_ht.try_emplace_hint(hint, k, std::forward<Args>(args)...);
-  }
-
-  template <class... Args>
-  iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args) {
-    return m_ht.try_emplace_hint(hint, std::move(k),
-                                 std::forward<Args>(args)...);
-  }
-
-  iterator erase(iterator pos) { return m_ht.erase(pos); }
-  iterator erase(const_iterator pos) { return m_ht.erase(pos); }
-  iterator erase(const_iterator first, const_iterator last) {
-    return m_ht.erase(first, last);
-  }
-  size_type erase(const key_type& key) { return m_ht.erase(key); }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup to the value if you already have the hash.
-   */
-  size_type erase(const key_type& key, std::size_t precalculated_hash) {
-    return m_ht.erase(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  size_type erase(const K& key) {
-    return m_ht.erase(key);
-  }
-
-  /**
-   * @copydoc erase(const K& key)
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup to the value if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  size_type erase(const K& key, std::size_t precalculated_hash) {
-    return m_ht.erase(key, precalculated_hash);
-  }
-
-  void swap(robin_map& other) { other.m_ht.swap(m_ht); }
-
-  /*
-   * Lookup
-   */
-  T& at(const Key& key) { return m_ht.at(key); }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  T& at(const Key& key, std::size_t precalculated_hash) {
-    return m_ht.at(key, precalculated_hash);
-  }
-
-  const T& at(const Key& key) const { return m_ht.at(key); }
-
-  /**
-   * @copydoc at(const Key& key, std::size_t precalculated_hash)
-   */
-  const T& at(const Key& key, std::size_t precalculated_hash) const {
-    return m_ht.at(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  T& at(const K& key) {
-    return m_ht.at(key);
-  }
-
-  /**
-   * @copydoc at(const K& key)
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  T& at(const K& key, std::size_t precalculated_hash) {
-    return m_ht.at(key, precalculated_hash);
-  }
-
-  /**
-   * @copydoc at(const K& key)
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  const T& at(const K& key) const {
-    return m_ht.at(key);
-  }
-
-  /**
-   * @copydoc at(const K& key, std::size_t precalculated_hash)
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  const T& at(const K& key, std::size_t precalculated_hash) const {
-    return m_ht.at(key, precalculated_hash);
-  }
-
-  T& operator[](const Key& key) { return m_ht[key]; }
-  T& operator[](Key&& key) { return m_ht[std::move(key)]; }
-
-  size_type count(const Key& key) const { return m_ht.count(key); }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  size_type count(const Key& key, std::size_t precalculated_hash) const {
-    return m_ht.count(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  size_type count(const K& key) const {
-    return m_ht.count(key);
-  }
-
-  /**
-   * @copydoc count(const K& key) const
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  size_type count(const K& key, std::size_t precalculated_hash) const {
-    return m_ht.count(key, precalculated_hash);
-  }
-
-  iterator find(const Key& key) { return m_ht.find(key); }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  iterator find(const Key& key, std::size_t precalculated_hash) {
-    return m_ht.find(key, precalculated_hash);
-  }
-
-  const_iterator find(const Key& key) const { return m_ht.find(key); }
-
-  /**
-   * @copydoc find(const Key& key, std::size_t precalculated_hash)
-   */
-  const_iterator find(const Key& key, std::size_t precalculated_hash) const {
-    return m_ht.find(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  iterator find(const K& key) {
-    return m_ht.find(key);
-  }
-
-  /**
-   * @copydoc find(const K& key)
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  iterator find(const K& key, std::size_t precalculated_hash) {
-    return m_ht.find(key, precalculated_hash);
-  }
-
-  /**
-   * @copydoc find(const K& key)
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  const_iterator find(const K& key) const {
-    return m_ht.find(key);
-  }
-
-  /**
-   * @copydoc find(const K& key)
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  const_iterator find(const K& key, std::size_t precalculated_hash) const {
-    return m_ht.find(key, precalculated_hash);
-  }
-
-  bool contains(const Key& key) const { return m_ht.contains(key); }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  bool contains(const Key& key, std::size_t precalculated_hash) const {
-    return m_ht.contains(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  bool contains(const K& key) const {
-    return m_ht.contains(key);
-  }
-
-  /**
-   * @copydoc contains(const K& key) const
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  bool contains(const K& key, std::size_t precalculated_hash) const {
-    return m_ht.contains(key, precalculated_hash);
-  }
-
-  std::pair<iterator, iterator> equal_range(const Key& key) {
-    return m_ht.equal_range(key);
-  }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  std::pair<iterator, iterator> equal_range(const Key& key,
-                                            std::size_t precalculated_hash) {
-    return m_ht.equal_range(key, precalculated_hash);
-  }
-
-  std::pair<const_iterator, const_iterator> equal_range(const Key& key) const {
-    return m_ht.equal_range(key);
-  }
-
-  /**
-   * @copydoc equal_range(const Key& key, std::size_t precalculated_hash)
-   */
-  std::pair<const_iterator, const_iterator> equal_range(
-      const Key& key, std::size_t precalculated_hash) const {
-    return m_ht.equal_range(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  std::pair<iterator, iterator> equal_range(const K& key) {
-    return m_ht.equal_range(key);
-  }
-
-  /**
-   * @copydoc equal_range(const K& key)
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  std::pair<iterator, iterator> equal_range(const K& key,
-                                            std::size_t precalculated_hash) {
-    return m_ht.equal_range(key, precalculated_hash);
-  }
-
-  /**
-   * @copydoc equal_range(const K& key)
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  std::pair<const_iterator, const_iterator> equal_range(const K& key) const {
-    return m_ht.equal_range(key);
-  }
-
-  /**
-   * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  std::pair<const_iterator, const_iterator> equal_range(
-      const K& key, std::size_t precalculated_hash) const {
-    return m_ht.equal_range(key, precalculated_hash);
-  }
-
-  /*
-   * Bucket interface
-   */
-  size_type bucket_count() const { return m_ht.bucket_count(); }
-  size_type max_bucket_count() const { return m_ht.max_bucket_count(); }
-
-  /*
-   *  Hash policy
-   */
-  float load_factor() const { return m_ht.load_factor(); }
-
-  float min_load_factor() const { return m_ht.min_load_factor(); }
-  float max_load_factor() const { return m_ht.max_load_factor(); }
-
-  /**
-   * Set the `min_load_factor` to `ml`. When the `load_factor` of the map goes
-   * below `min_load_factor` after some erase operations, the map will be
-   * shrunk when an insertion occurs. The erase method itself never shrinks
-   * the map.
-   *
-   * The default value of `min_load_factor` is 0.0f, the map never shrinks by
-   * default.
-   */
-  void min_load_factor(float ml) { m_ht.min_load_factor(ml); }
-  void max_load_factor(float ml) { m_ht.max_load_factor(ml); }
-
-  void rehash(size_type count_) { m_ht.rehash(count_); }
-  void reserve(size_type count_) { m_ht.reserve(count_); }
-
-  /*
-   * Observers
-   */
-  hasher hash_function() const { return m_ht.hash_function(); }
-  key_equal key_eq() const { return m_ht.key_eq(); }
-
-  /*
-   * Other
-   */
-
-  /**
-   * Convert a const_iterator to an iterator.
-   */
-  iterator mutable_iterator(const_iterator pos) {
-    return m_ht.mutable_iterator(pos);
-  }
-
-  /**
-   * Serialize the map through the `serializer` parameter.
-   *
-   * The `serializer` parameter must be a function object that supports the
-   * following call:
-   *  - `template<typename U> void operator()(const U& value);` where the types
-   * `std::int16_t`, `std::uint32_t`, `std::uint64_t`, `float` and
-   * `std::pair<Key, T>` must be supported for U.
-   *
-   * The implementation leaves binary compatibility (endianness, IEEE 754 for
-   * floats, ...) of the types it serializes in the hands of the `Serializer`
-   * function object if compatibility is required.
-   */
-  template <class Serializer>
-  void serialize(Serializer& serializer) const {
-    m_ht.serialize(serializer);
-  }
-
-  /**
-   * Deserialize a previously serialized map through the `deserializer`
-   * parameter.
-   *
-   * The `deserializer` parameter must be a function object that supports the
-   * following call:
-   *  - `template<typename U> U operator()();` where the types `std::int16_t`,
-   * `std::uint32_t`, `std::uint64_t`, `float` and `std::pair<Key, T>` must be
-   * supported for U.
-   *
-   * If the deserialized hash map type is hash compatible with the serialized
-   * map, the deserialization process can be sped up by setting
-   * `hash_compatible` to true. To be hash compatible, the Hash, KeyEqual and
-   * GrowthPolicy must behave the same way than the ones used on the serialized
-   * map and the StoreHash must have the same value. The `std::size_t` must also
-   * be of the same size as the one on the platform used to serialize the map.
-   * If these criteria are not met, the behaviour is undefined with
-   * `hash_compatible` sets to true.
-   *
-   * The behaviour is undefined if the type `Key` and `T` of the `robin_map` are
-   * not the same as the types used during serialization.
-   *
-   * The implementation leaves binary compatibility (endianness, IEEE 754 for
-   * floats, size of int, ...) of the types it deserializes in the hands of the
-   * `Deserializer` function object if compatibility is required.
-   */
-  template <class Deserializer>
-  static robin_map deserialize(Deserializer& deserializer,
-                               bool hash_compatible = false) {
-    robin_map map(0);
-    map.m_ht.deserialize(deserializer, hash_compatible);
-
-    return map;
-  }
-
-  friend bool operator==(const robin_map& lhs, const robin_map& rhs) {
-    if (lhs.size() != rhs.size()) {
-      return false;
-    }
-
-    for (const auto& element_lhs : lhs) {
-      const auto it_element_rhs = rhs.find(element_lhs.first);
-      if (it_element_rhs == rhs.cend() ||
-          element_lhs.second != it_element_rhs->second) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  friend bool operator!=(const robin_map& lhs, const robin_map& rhs) {
-    return !operator==(lhs, rhs);
-  }
-
-  friend void swap(robin_map& lhs, robin_map& rhs) { lhs.swap(rhs); }
-
- private:
-  ht m_ht;
-};
-
-/**
- * Same as `tsl::robin_map<Key, T, Hash, KeyEqual, Allocator, StoreHash,
- * tsl::rh::prime_growth_policy>`.
- */
-template <class Key, class T, class Hash = std::hash<Key>,
-          class KeyEqual = std::equal_to<Key>,
-          class Allocator = std::allocator<std::pair<Key, T>>,
-          bool StoreHash = false>
-using robin_pg_map = robin_map<Key, T, Hash, KeyEqual, Allocator, StoreHash,
-                               tsl::rh::prime_growth_policy>;
-
-}  // end namespace tsl
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_set.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_set.h
deleted file mode 100644
index 54789509c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/include/tsl/robin_set.h
+++ /dev/null
@@ -1,660 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef TSL_ROBIN_SET_H
-#define TSL_ROBIN_SET_H
-
-#include <cstddef>
-#include <functional>
-#include <initializer_list>
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-#include "robin_hash.h"
-
-namespace tsl {
-
-/**
- * Implementation of a hash set using open-addressing and the robin hood hashing
- * algorithm with backward shift deletion.
- *
- * For operations modifying the hash set (insert, erase, rehash, ...), the
- * strong exception guarantee is only guaranteed when the expression
- * `std::is_nothrow_swappable<Key>::value &&
- * std::is_nothrow_move_constructible<Key>::value` is true, otherwise if an
- * exception is thrown during the swap or the move, the hash set may end up in a
- * undefined state. Per the standard a `Key` with a noexcept copy constructor
- * and no move constructor also satisfies the
- * `std::is_nothrow_move_constructible<Key>::value` criterion (and will thus
- * guarantee the strong exception for the set).
- *
- * When `StoreHash` is true, 32 bits of the hash are stored alongside the
- * values. It can improve the performance during lookups if the `KeyEqual`
- * function takes time (or engenders a cache-miss for example) as we then
- * compare the stored hashes before comparing the keys. When
- * `tsl::rh::power_of_two_growth_policy` is used as `GrowthPolicy`, it may also
- * speed-up the rehash process as we can avoid to recalculate the hash. When it
- * is detected that storing the hash will not incur any memory penalty due to
- * alignment (i.e. `sizeof(tsl::detail_robin_hash::bucket_entry<ValueType,
- * true>) == sizeof(tsl::detail_robin_hash::bucket_entry<ValueType, false>)`)
- * and `tsl::rh::power_of_two_growth_policy` is used, the hash will be stored
- * even if `StoreHash` is false so that we can speed-up the rehash (but it will
- * not be used on lookups unless `StoreHash` is true).
- *
- * `GrowthPolicy` defines how the set grows and consequently how a hash value is
- * mapped to a bucket. By default the set uses
- * `tsl::rh::power_of_two_growth_policy`. This policy keeps the number of
- * buckets to a power of two and uses a mask to set the hash to a bucket instead
- * of the slow modulo. Other growth policies are available and you may define
- * your own growth policy, check `tsl::rh::power_of_two_growth_policy` for the
- * interface.
- *
- * `Key` must be swappable.
- *
- * `Key` must be copy and/or move constructible.
- *
- * If the destructor of `Key` throws an exception, the behaviour of the class is
- * undefined.
- *
- * Iterators invalidation:
- *  - clear, operator=, reserve, rehash: always invalidate the iterators.
- *  - insert, emplace, emplace_hint, operator[]: if there is an effective
- * insert, invalidate the iterators.
- *  - erase: always invalidate the iterators.
- */
-template <class Key, class Hash = std::hash<Key>,
-          class KeyEqual = std::equal_to<Key>,
-          class Allocator = std::allocator<Key>, bool StoreHash = false,
-          class GrowthPolicy = tsl::rh::power_of_two_growth_policy<2>>
-class robin_set {
- private:
-  template <typename U>
-  using has_is_transparent = tsl::detail_robin_hash::has_is_transparent<U>;
-
-  class KeySelect {
-   public:
-    using key_type = Key;
-
-    const key_type& operator()(const Key& key) const noexcept { return key; }
-
-    key_type& operator()(Key& key) noexcept { return key; }
-  };
-
-  using ht = detail_robin_hash::robin_hash<Key, KeySelect, void, Hash, KeyEqual,
-                                           Allocator, StoreHash, GrowthPolicy>;
-
- public:
-  using key_type = typename ht::key_type;
-  using value_type = typename ht::value_type;
-  using size_type = typename ht::size_type;
-  using difference_type = typename ht::difference_type;
-  using hasher = typename ht::hasher;
-  using key_equal = typename ht::key_equal;
-  using allocator_type = typename ht::allocator_type;
-  using reference = typename ht::reference;
-  using const_reference = typename ht::const_reference;
-  using pointer = typename ht::pointer;
-  using const_pointer = typename ht::const_pointer;
-  using iterator = typename ht::iterator;
-  using const_iterator = typename ht::const_iterator;
-
-  /*
-   * Constructors
-   */
-  robin_set() : robin_set(ht::DEFAULT_INIT_BUCKETS_SIZE) {}
-
-  explicit robin_set(size_type bucket_count, const Hash& hash = Hash(),
-                     const KeyEqual& equal = KeyEqual(),
-                     const Allocator& alloc = Allocator())
-      : m_ht(bucket_count, hash, equal, alloc) {}
-
-  robin_set(size_type bucket_count, const Allocator& alloc)
-      : robin_set(bucket_count, Hash(), KeyEqual(), alloc) {}
-
-  robin_set(size_type bucket_count, const Hash& hash, const Allocator& alloc)
-      : robin_set(bucket_count, hash, KeyEqual(), alloc) {}
-
-  explicit robin_set(const Allocator& alloc)
-      : robin_set(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {}
-
-  template <class InputIt>
-  robin_set(InputIt first, InputIt last,
-            size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
-            const Hash& hash = Hash(), const KeyEqual& equal = KeyEqual(),
-            const Allocator& alloc = Allocator())
-      : robin_set(bucket_count, hash, equal, alloc) {
-    insert(first, last);
-  }
-
-  template <class InputIt>
-  robin_set(InputIt first, InputIt last, size_type bucket_count,
-            const Allocator& alloc)
-      : robin_set(first, last, bucket_count, Hash(), KeyEqual(), alloc) {}
-
-  template <class InputIt>
-  robin_set(InputIt first, InputIt last, size_type bucket_count,
-            const Hash& hash, const Allocator& alloc)
-      : robin_set(first, last, bucket_count, hash, KeyEqual(), alloc) {}
-
-  robin_set(std::initializer_list<value_type> init,
-            size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
-            const Hash& hash = Hash(), const KeyEqual& equal = KeyEqual(),
-            const Allocator& alloc = Allocator())
-      : robin_set(init.begin(), init.end(), bucket_count, hash, equal, alloc) {}
-
-  robin_set(std::initializer_list<value_type> init, size_type bucket_count,
-            const Allocator& alloc)
-      : robin_set(init.begin(), init.end(), bucket_count, Hash(), KeyEqual(),
-                  alloc) {}
-
-  robin_set(std::initializer_list<value_type> init, size_type bucket_count,
-            const Hash& hash, const Allocator& alloc)
-      : robin_set(init.begin(), init.end(), bucket_count, hash, KeyEqual(),
-                  alloc) {}
-
-  robin_set& operator=(std::initializer_list<value_type> ilist) {
-    m_ht.clear();
-
-    m_ht.reserve(ilist.size());
-    m_ht.insert(ilist.begin(), ilist.end());
-
-    return *this;
-  }
-
-  allocator_type get_allocator() const { return m_ht.get_allocator(); }
-
-  /*
-   * Iterators
-   */
-  iterator begin() noexcept { return m_ht.begin(); }
-  const_iterator begin() const noexcept { return m_ht.begin(); }
-  const_iterator cbegin() const noexcept { return m_ht.cbegin(); }
-
-  iterator end() noexcept { return m_ht.end(); }
-  const_iterator end() const noexcept { return m_ht.end(); }
-  const_iterator cend() const noexcept { return m_ht.cend(); }
-
-  /*
-   * Capacity
-   */
-  bool empty() const noexcept { return m_ht.empty(); }
-  size_type size() const noexcept { return m_ht.size(); }
-  size_type max_size() const noexcept { return m_ht.max_size(); }
-
-  /*
-   * Modifiers
-   */
-  void clear() noexcept { m_ht.clear(); }
-
-  std::pair<iterator, bool> insert(const value_type& value) {
-    return m_ht.insert(value);
-  }
-
-  std::pair<iterator, bool> insert(value_type&& value) {
-    return m_ht.insert(std::move(value));
-  }
-
-  iterator insert(const_iterator hint, const value_type& value) {
-    return m_ht.insert_hint(hint, value);
-  }
-
-  iterator insert(const_iterator hint, value_type&& value) {
-    return m_ht.insert_hint(hint, std::move(value));
-  }
-
-  template <class InputIt>
-  void insert(InputIt first, InputIt last) {
-    m_ht.insert(first, last);
-  }
-
-  void insert(std::initializer_list<value_type> ilist) {
-    m_ht.insert(ilist.begin(), ilist.end());
-  }
-
-  /**
-   * Due to the way elements are stored, emplace will need to move or copy the
-   * key-value once. The method is equivalent to
-   * insert(value_type(std::forward<Args>(args)...));
-   *
-   * Mainly here for compatibility with the std::unordered_map interface.
-   */
-  template <class... Args>
-  std::pair<iterator, bool> emplace(Args&&... args) {
-    return m_ht.emplace(std::forward<Args>(args)...);
-  }
-
-  /**
-   * Due to the way elements are stored, emplace_hint will need to move or copy
-   * the key-value once. The method is equivalent to insert(hint,
-   * value_type(std::forward<Args>(args)...));
-   *
-   * Mainly here for compatibility with the std::unordered_map interface.
-   */
-  template <class... Args>
-  iterator emplace_hint(const_iterator hint, Args&&... args) {
-    return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
-  }
-
-  iterator erase(iterator pos) { return m_ht.erase(pos); }
-  iterator erase(const_iterator pos) { return m_ht.erase(pos); }
-  iterator erase(const_iterator first, const_iterator last) {
-    return m_ht.erase(first, last);
-  }
-  size_type erase(const key_type& key) { return m_ht.erase(key); }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup to the value if you already have the hash.
-   */
-  size_type erase(const key_type& key, std::size_t precalculated_hash) {
-    return m_ht.erase(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  size_type erase(const K& key) {
-    return m_ht.erase(key);
-  }
-
-  /**
-   * @copydoc erase(const K& key)
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup to the value if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  size_type erase(const K& key, std::size_t precalculated_hash) {
-    return m_ht.erase(key, precalculated_hash);
-  }
-
-  void swap(robin_set& other) { other.m_ht.swap(m_ht); }
-
-  /*
-   * Lookup
-   */
-  size_type count(const Key& key) const { return m_ht.count(key); }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  size_type count(const Key& key, std::size_t precalculated_hash) const {
-    return m_ht.count(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  size_type count(const K& key) const {
-    return m_ht.count(key);
-  }
-
-  /**
-   * @copydoc count(const K& key) const
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  size_type count(const K& key, std::size_t precalculated_hash) const {
-    return m_ht.count(key, precalculated_hash);
-  }
-
-  iterator find(const Key& key) { return m_ht.find(key); }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  iterator find(const Key& key, std::size_t precalculated_hash) {
-    return m_ht.find(key, precalculated_hash);
-  }
-
-  const_iterator find(const Key& key) const { return m_ht.find(key); }
-
-  /**
-   * @copydoc find(const Key& key, std::size_t precalculated_hash)
-   */
-  const_iterator find(const Key& key, std::size_t precalculated_hash) const {
-    return m_ht.find(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  iterator find(const K& key) {
-    return m_ht.find(key);
-  }
-
-  /**
-   * @copydoc find(const K& key)
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  iterator find(const K& key, std::size_t precalculated_hash) {
-    return m_ht.find(key, precalculated_hash);
-  }
-
-  /**
-   * @copydoc find(const K& key)
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  const_iterator find(const K& key) const {
-    return m_ht.find(key);
-  }
-
-  /**
-   * @copydoc find(const K& key)
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  const_iterator find(const K& key, std::size_t precalculated_hash) const {
-    return m_ht.find(key, precalculated_hash);
-  }
-
-  bool contains(const Key& key) const { return m_ht.contains(key); }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  bool contains(const Key& key, std::size_t precalculated_hash) const {
-    return m_ht.contains(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  bool contains(const K& key) const {
-    return m_ht.contains(key);
-  }
-
-  /**
-   * @copydoc contains(const K& key) const
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  bool contains(const K& key, std::size_t precalculated_hash) const {
-    return m_ht.contains(key, precalculated_hash);
-  }
-
-  std::pair<iterator, iterator> equal_range(const Key& key) {
-    return m_ht.equal_range(key);
-  }
-
-  /**
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  std::pair<iterator, iterator> equal_range(const Key& key,
-                                            std::size_t precalculated_hash) {
-    return m_ht.equal_range(key, precalculated_hash);
-  }
-
-  std::pair<const_iterator, const_iterator> equal_range(const Key& key) const {
-    return m_ht.equal_range(key);
-  }
-
-  /**
-   * @copydoc equal_range(const Key& key, std::size_t precalculated_hash)
-   */
-  std::pair<const_iterator, const_iterator> equal_range(
-      const Key& key, std::size_t precalculated_hash) const {
-    return m_ht.equal_range(key, precalculated_hash);
-  }
-
-  /**
-   * This overload only participates in the overload resolution if the typedef
-   * KeyEqual::is_transparent exists. If so, K must be hashable and comparable
-   * to Key.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  std::pair<iterator, iterator> equal_range(const K& key) {
-    return m_ht.equal_range(key);
-  }
-
-  /**
-   * @copydoc equal_range(const K& key)
-   *
-   * Use the hash value 'precalculated_hash' instead of hashing the key. The
-   * hash value should be the same as hash_function()(key). Useful to speed-up
-   * the lookup if you already have the hash.
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  std::pair<iterator, iterator> equal_range(const K& key,
-                                            std::size_t precalculated_hash) {
-    return m_ht.equal_range(key, precalculated_hash);
-  }
-
-  /**
-   * @copydoc equal_range(const K& key)
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  std::pair<const_iterator, const_iterator> equal_range(const K& key) const {
-    return m_ht.equal_range(key);
-  }
-
-  /**
-   * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
-   */
-  template <
-      class K, class KE = KeyEqual,
-      typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr>
-  std::pair<const_iterator, const_iterator> equal_range(
-      const K& key, std::size_t precalculated_hash) const {
-    return m_ht.equal_range(key, precalculated_hash);
-  }
-
-  /*
-   * Bucket interface
-   */
-  size_type bucket_count() const { return m_ht.bucket_count(); }
-  size_type max_bucket_count() const { return m_ht.max_bucket_count(); }
-
-  /*
-   *  Hash policy
-   */
-  float load_factor() const { return m_ht.load_factor(); }
-
-  float min_load_factor() const { return m_ht.min_load_factor(); }
-  float max_load_factor() const { return m_ht.max_load_factor(); }
-
-  /**
-   * Set the `min_load_factor` to `ml`. When the `load_factor` of the set goes
-   * below `min_load_factor` after some erase operations, the set will be
-   * shrunk when an insertion occurs. The erase method itself never shrinks
-   * the set.
-   *
-   * The default value of `min_load_factor` is 0.0f, the set never shrinks by
-   * default.
-   */
-  void min_load_factor(float ml) { m_ht.min_load_factor(ml); }
-  void max_load_factor(float ml) { m_ht.max_load_factor(ml); }
-
-  void rehash(size_type count_) { m_ht.rehash(count_); }
-  void reserve(size_type count_) { m_ht.reserve(count_); }
-
-  /*
-   * Observers
-   */
-  hasher hash_function() const { return m_ht.hash_function(); }
-  key_equal key_eq() const { return m_ht.key_eq(); }
-
-  /*
-   * Other
-   */
-
-  /**
-   * Convert a const_iterator to an iterator.
-   */
-  iterator mutable_iterator(const_iterator pos) {
-    return m_ht.mutable_iterator(pos);
-  }
-
-  friend bool operator==(const robin_set& lhs, const robin_set& rhs) {
-    if (lhs.size() != rhs.size()) {
-      return false;
-    }
-
-    for (const auto& element_lhs : lhs) {
-      const auto it_element_rhs = rhs.find(element_lhs);
-      if (it_element_rhs == rhs.cend()) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Serialize the set through the `serializer` parameter.
-   *
-   * The `serializer` parameter must be a function object that supports the
-   * following call:
-   *  - `template<typename U> void operator()(const U& value);` where the types
-   * `std::int16_t`, `std::uint32_t`, `std::uint64_t`, `float` and `Key` must be
-   * supported for U.
-   *
-   * The implementation leaves binary compatibility (endianness, IEEE 754 for
-   * floats, ...) of the types it serializes in the hands of the `Serializer`
-   * function object if compatibility is required.
-   */
-  template <class Serializer>
-  void serialize(Serializer& serializer) const {
-    m_ht.serialize(serializer);
-  }
-
-  /**
-   * Deserialize a previously serialized set through the `deserializer`
-   * parameter.
-   *
-   * The `deserializer` parameter must be a function object that supports the
-   * following call:
-   *  - `template<typename U> U operator()();` where the types `std::int16_t`,
-   * `std::uint32_t`, `std::uint64_t`, `float` and `Key` must be supported for
-   * U.
-   *
-   * If the deserialized hash set type is hash compatible with the serialized
-   * set, the deserialization process can be sped up by setting
-   * `hash_compatible` to true. To be hash compatible, the Hash, KeyEqual and
-   * GrowthPolicy must behave the same way than the ones used on the serialized
-   * set and the StoreHash must have the same value. The `std::size_t` must also
-   * be of the same size as the one on the platform used to serialize the set.
-   * If these criteria are not met, the behaviour is undefined with
-   * `hash_compatible` sets to true.
-   *
-   * The behaviour is undefined if the type `Key` of the `robin_set` is not the
-   * same as the type used during serialization.
-   *
-   * The implementation leaves binary compatibility (endianness, IEEE 754 for
-   * floats, size of int, ...) of the types it deserializes in the hands of the
-   * `Deserializer` function object if compatibility is required.
-   */
-  template <class Deserializer>
-  static robin_set deserialize(Deserializer& deserializer,
-                               bool hash_compatible = false) {
-    robin_set set(0);
-    set.m_ht.deserialize(deserializer, hash_compatible);
-
-    return set;
-  }
-
-  friend bool operator!=(const robin_set& lhs, const robin_set& rhs) {
-    return !operator==(lhs, rhs);
-  }
-
-  friend void swap(robin_set& lhs, robin_set& rhs) { lhs.swap(rhs); }
-
- private:
-  ht m_ht;
-};
-
-/**
- * Same as `tsl::robin_set<Key, Hash, KeyEqual, Allocator, StoreHash,
- * tsl::rh::prime_growth_policy>`.
- */
-template <class Key, class Hash = std::hash<Key>,
-          class KeyEqual = std::equal_to<Key>,
-          class Allocator = std::allocator<Key>, bool StoreHash = false>
-using robin_pg_set = robin_set<Key, Hash, KeyEqual, Allocator, StoreHash,
-                               tsl::rh::prime_growth_policy>;
-
-}  // end namespace tsl
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/CMakeLists.txt
deleted file mode 100644
index 3accb0e6f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-
-project(tsl_robin_map_tests)
-
-add_executable(tsl_robin_map_tests "main.cpp" 
-                                   "custom_allocator_tests.cpp"
-                                   "policy_tests.cpp"
-                                   "robin_map_tests.cpp" 
-                                   "robin_set_tests.cpp")
-
-target_compile_features(tsl_robin_map_tests PRIVATE cxx_std_11)
-                                    
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    target_compile_options(tsl_robin_map_tests PRIVATE -Werror -Wall -Wextra -Wold-style-cast -DTSL_DEBUG -UNDEBUG)
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    target_compile_options(tsl_robin_map_tests PRIVATE /bigobj /WX /W3 /DTSL_DEBUG /UNDEBUG)
-endif()
-
-# Boost::unit_test_framework
-find_package(Boost 1.54.0 REQUIRED COMPONENTS unit_test_framework)
-target_link_libraries(tsl_robin_map_tests PRIVATE Boost::unit_test_framework)   
-
-# tsl::robin_map
-add_subdirectory(../ ${CMAKE_CURRENT_BINARY_DIR}/tsl)
-target_link_libraries(tsl_robin_map_tests PRIVATE tsl::robin_map)  
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/custom_allocator_tests.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/custom_allocator_tests.cpp
deleted file mode 100644
index 816e12ef0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/custom_allocator_tests.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#define BOOST_TEST_DYN_LINK
-
-#include <tsl/robin_map.h>
-
-#include <boost/test/unit_test.hpp>
-#include <cstddef>
-#include <cstdlib>
-#include <functional>
-#include <limits>
-#include <stdexcept>
-#include <type_traits>
-#include <utility>
-
-#include "utils.h"
-
-static std::size_t nb_custom_allocs = 0;
-
-template <typename T>
-class custom_allocator {
- public:
-  using value_type = T;
-  using pointer = T*;
-  using const_pointer = const T*;
-  using reference = T&;
-  using const_reference = const T&;
-  using size_type = std::size_t;
-  using difference_type = std::ptrdiff_t;
-  using propagate_on_container_move_assignment = std::true_type;
-
-  template <typename U>
-  struct rebind {
-    using other = custom_allocator<U>;
-  };
-
-  custom_allocator() = default;
-  custom_allocator(const custom_allocator&) = default;
-
-  template <typename U>
-  custom_allocator(const custom_allocator<U>&) {}
-
-  pointer address(reference x) const noexcept { return &x; }
-
-  const_pointer address(const_reference x) const noexcept { return &x; }
-
-  pointer allocate(size_type n, const void* /*hint*/ = 0) {
-    nb_custom_allocs++;
-
-    pointer ptr = static_cast<pointer>(std::malloc(n * sizeof(T)));
-    if (ptr == nullptr) {
-#ifdef TSL_RH_NO_EXCEPTIONS
-      std::abort();
-#else
-      throw std::bad_alloc();
-#endif
-    }
-
-    return ptr;
-  }
-
-  void deallocate(T* p, size_type /*n*/) { std::free(p); }
-
-  size_type max_size() const noexcept {
-    return std::numeric_limits<size_type>::max() / sizeof(value_type);
-  }
-
-  template <typename U, typename... Args>
-  void construct(U* p, Args&&... args) {
-    ::new (static_cast<void*>(p)) U(std::forward<Args>(args)...);
-  }
-
-  template <typename U>
-  void destroy(U* p) {
-    p->~U();
-  }
-};
-
-template <class T, class U>
-bool operator==(const custom_allocator<T>&, const custom_allocator<U>&) {
-  return true;
-}
-
-template <class T, class U>
-bool operator!=(const custom_allocator<T>&, const custom_allocator<U>&) {
-  return false;
-}
-
-// TODO Avoid overloading new to check number of global new
-// static std::size_t nb_global_new = 0;
-// void* operator new(std::size_t sz) {
-//     nb_global_new++;
-//     return std::malloc(sz);
-// }
-//
-// void operator delete(void* ptr) noexcept {
-//     std::free(ptr);
-// }
-
-BOOST_AUTO_TEST_SUITE(test_custom_allocator)
-
-BOOST_AUTO_TEST_CASE(test_custom_allocator_1) {
-  //    nb_global_new = 0;
-  nb_custom_allocs = 0;
-
-  tsl::robin_map<int, int, std::hash<int>, std::equal_to<int>,
-                 custom_allocator<std::pair<int, int>>>
-      map;
-
-  const int nb_elements = 1000;
-  for (int i = 0; i < nb_elements; i++) {
-    map.insert({i, i * 2});
-  }
-
-  BOOST_CHECK_NE(nb_custom_allocs, 0);
-  //    BOOST_CHECK_EQUAL(nb_global_new, 0);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/main.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/main.cpp
deleted file mode 100644
index f299aa1f9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/main.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#define BOOST_TEST_MODULE robin_map_tests
-#define BOOST_TEST_DYN_LINK
-
-#include <boost/test/unit_test.hpp>
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/policy_tests.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/policy_tests.cpp
deleted file mode 100644
index f38d3c117..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/policy_tests.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#define BOOST_TEST_DYN_LINK
-
-#include <tsl/robin_growth_policy.h>
-
-#include <boost/mpl/list.hpp>
-#include <boost/test/unit_test.hpp>
-#include <cstddef>
-#include <limits>
-#include <ratio>
-#include <stdexcept>
-
-#include "utils.h"
-
-BOOST_AUTO_TEST_SUITE(test_policy)
-
-using test_types =
-    boost::mpl::list<tsl::rh::power_of_two_growth_policy<2>,
-                     tsl::rh::power_of_two_growth_policy<4>,
-                     tsl::rh::prime_growth_policy, tsl::rh::mod_growth_policy<>,
-                     tsl::rh::mod_growth_policy<std::ratio<7, 2>>>;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(test_policy, Policy, test_types) {
-  // Call next_bucket_count() on the policy until we reach its
-  // max_bucket_count()
-  std::size_t bucket_count = 0;
-  Policy policy(bucket_count);
-
-  BOOST_CHECK_EQUAL(policy.bucket_for_hash(0), 0);
-  BOOST_CHECK_EQUAL(bucket_count, 0);
-
-#ifndef TSL_RH_NO_EXCEPTIONS
-  bool exception_thrown = false;
-  try {
-    while (true) {
-      const std::size_t previous_bucket_count = bucket_count;
-
-      bucket_count = policy.next_bucket_count();
-      policy = Policy(bucket_count);
-
-      BOOST_CHECK_EQUAL(policy.bucket_for_hash(0), 0);
-      BOOST_CHECK(bucket_count > previous_bucket_count);
-    }
-  } catch (const std::length_error&) {
-    exception_thrown = true;
-  }
-
-  BOOST_CHECK(exception_thrown);
-#endif
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(test_policy_min_bucket_count, Policy,
-                              test_types) {
-  // Check policy when a bucket_count of 0 is asked.
-  std::size_t bucket_count = 0;
-  Policy policy(bucket_count);
-
-  BOOST_CHECK_EQUAL(policy.bucket_for_hash(0), 0);
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(test_policy_max_bucket_count, Policy,
-                              test_types) {
-  // Test a bucket_count equals to the max_bucket_count limit and above
-  std::size_t bucket_count = 0;
-  Policy policy(bucket_count);
-
-  bucket_count = policy.max_bucket_count();
-  Policy policy2(bucket_count);
-
-  bucket_count = std::numeric_limits<std::size_t>::max();
-  TSL_RH_CHECK_THROW((Policy(bucket_count)), std::length_error);
-
-  bucket_count = policy.max_bucket_count() + 1;
-  TSL_RH_CHECK_THROW((Policy(bucket_count)), std::length_error);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/robin_map_tests.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/robin_map_tests.cpp
deleted file mode 100644
index 34cbd26ac..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/robin_map_tests.cpp
+++ /dev/null
@@ -1,1443 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#define BOOST_TEST_DYN_LINK
-
-#include <tsl/robin_map.h>
-
-#include <boost/mpl/list.hpp>
-#include <boost/test/unit_test.hpp>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <iterator>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "utils.h"
-
-BOOST_AUTO_TEST_SUITE(test_robin_map)
-
-using test_types = boost::mpl::list<
-    tsl::robin_map<std::int64_t, std::int64_t>,
-    tsl::robin_map<std::string, std::string>,
-    // Test with hash having a lot of collisions
-    tsl::robin_map<std::int64_t, std::int64_t, mod_hash<9>>,
-    tsl::robin_map<std::string, std::string, mod_hash<9>>,
-    tsl::robin_map<move_only_test, move_only_test, mod_hash<9>>,
-    tsl::robin_map<copy_only_test, copy_only_test, mod_hash<9>>,
-    tsl::robin_map<self_reference_member_test, self_reference_member_test,
-                   mod_hash<9>>,
-
-    // other GrowthPolicy
-    tsl::robin_map<move_only_test, move_only_test, mod_hash<9>,
-                   std::equal_to<move_only_test>,
-                   std::allocator<std::pair<move_only_test, move_only_test>>,
-                   true, tsl::rh::power_of_two_growth_policy<4>>,
-    tsl::robin_pg_map<move_only_test, move_only_test, mod_hash<9>>,
-    tsl::robin_map<move_only_test, move_only_test, mod_hash<9>,
-                   std::equal_to<move_only_test>,
-                   std::allocator<std::pair<move_only_test, move_only_test>>,
-                   false, tsl::rh::mod_growth_policy<>>,
-
-    tsl::robin_map<copy_only_test, copy_only_test, mod_hash<9>,
-                   std::equal_to<copy_only_test>,
-                   std::allocator<std::pair<copy_only_test, copy_only_test>>,
-                   false, tsl::rh::power_of_two_growth_policy<4>>,
-    tsl::robin_pg_map<copy_only_test, copy_only_test, mod_hash<9>>,
-    tsl::robin_map<copy_only_test, copy_only_test, mod_hash<9>,
-                   std::equal_to<copy_only_test>,
-                   std::allocator<std::pair<copy_only_test, copy_only_test>>,
-                   true, tsl::rh::mod_growth_policy<>>>;
-
-/**
- * insert
- */
-BOOST_AUTO_TEST_CASE_TEMPLATE(test_insert, HMap, test_types) {
-  // insert x values, insert them again, check values
-  using key_t = typename HMap::key_type;
-  using value_t = typename HMap::mapped_type;
-
-  const std::size_t nb_values = 1000;
-  HMap map(0);
-  BOOST_CHECK_EQUAL(map.bucket_count(), 0);
-
-  typename HMap::iterator it;
-  bool inserted;
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    std::tie(it, inserted) =
-        map.insert({utils::get_key<key_t>(i), utils::get_value<value_t>(i)});
-
-    BOOST_CHECK_EQUAL(it->first, utils::get_key<key_t>(i));
-    BOOST_CHECK_EQUAL(it->second, utils::get_value<value_t>(i));
-    BOOST_CHECK(inserted);
-  }
-  BOOST_CHECK_EQUAL(map.size(), nb_values);
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    std::tie(it, inserted) = map.insert(
-        {utils::get_key<key_t>(i), utils::get_value<value_t>(i + 1)});
-
-    BOOST_CHECK_EQUAL(it->first, utils::get_key<key_t>(i));
-    BOOST_CHECK_EQUAL(it->second, utils::get_value<value_t>(i));
-    BOOST_CHECK(!inserted);
-  }
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    it = map.find(utils::get_key<key_t>(i));
-
-    BOOST_CHECK_EQUAL(it->first, utils::get_key<key_t>(i));
-    BOOST_CHECK_EQUAL(it->second, utils::get_value<value_t>(i));
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_range_insert) {
-  // create a vector<std::pair> of values to insert, insert part of them in the
-  // map, check values
-  const int nb_values = 1000;
-  std::vector<std::pair<int, int>> values_to_insert(nb_values);
-  for (int i = 0; i < nb_values; i++) {
-    values_to_insert[i] = std::make_pair(i, i + 1);
-  }
-
-  tsl::robin_map<int, int> map = {{-1, 1}, {-2, 2}};
-  map.insert(std::next(values_to_insert.begin(), 10),
-             values_to_insert.end() - 5);
-
-  BOOST_CHECK_EQUAL(map.size(), 987);
-
-  BOOST_CHECK_EQUAL(map.at(-1), 1);
-  BOOST_CHECK_EQUAL(map.at(-2), 2);
-
-  for (int i = 10; i < nb_values - 5; i++) {
-    BOOST_CHECK_EQUAL(map.at(i), i + 1);
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_insert_with_hint) {
-  tsl::robin_map<int, int> map{{1, 0}, {2, 1}, {3, 2}};
-
-  // Wrong hint
-  BOOST_CHECK(map.insert(map.find(2), std::make_pair(3, 4)) == map.find(3));
-
-  // Good hint
-  BOOST_CHECK(map.insert(map.find(2), std::make_pair(2, 4)) == map.find(2));
-
-  // end() hint
-  BOOST_CHECK(map.insert(map.find(10), std::make_pair(2, 4)) == map.find(2));
-
-  BOOST_CHECK_EQUAL(map.size(), 3);
-
-  // end() hint, new value
-  BOOST_CHECK_EQUAL(map.insert(map.find(10), std::make_pair(4, 3))->first, 4);
-
-  // Wrong hint, new value
-  BOOST_CHECK_EQUAL(map.insert(map.find(2), std::make_pair(5, 4))->first, 5);
-
-  BOOST_CHECK_EQUAL(map.size(), 5);
-}
-
-/**
- * emplace_hint
- */
-BOOST_AUTO_TEST_CASE(test_emplace_hint) {
-  tsl::robin_map<int, int> map{{1, 0}, {2, 1}, {3, 2}};
-
-  // Wrong hint
-  BOOST_CHECK(map.emplace_hint(map.find(2), std::piecewise_construct,
-                               std::forward_as_tuple(3),
-                               std::forward_as_tuple(4)) == map.find(3));
-
-  // Good hint
-  BOOST_CHECK(map.emplace_hint(map.find(2), std::piecewise_construct,
-                               std::forward_as_tuple(2),
-                               std::forward_as_tuple(4)) == map.find(2));
-
-  // end() hint
-  BOOST_CHECK(map.emplace_hint(map.find(10), std::piecewise_construct,
-                               std::forward_as_tuple(2),
-                               std::forward_as_tuple(4)) == map.find(2));
-
-  BOOST_CHECK_EQUAL(map.size(), 3);
-
-  // end() hint, new value
-  BOOST_CHECK_EQUAL(
-      map.emplace_hint(map.find(10), std::piecewise_construct,
-                       std::forward_as_tuple(4), std::forward_as_tuple(3))
-          ->first,
-      4);
-
-  // Wrong hint, new value
-  BOOST_CHECK_EQUAL(
-      map.emplace_hint(map.find(2), std::piecewise_construct,
-                       std::forward_as_tuple(5), std::forward_as_tuple(4))
-          ->first,
-      5);
-
-  BOOST_CHECK_EQUAL(map.size(), 5);
-}
-
-/**
- * emplace
- */
-BOOST_AUTO_TEST_CASE(test_emplace) {
-  tsl::robin_map<std::int64_t, move_only_test> map;
-  tsl::robin_map<std::int64_t, move_only_test>::iterator it;
-  bool inserted;
-
-  std::tie(it, inserted) =
-      map.emplace(std::piecewise_construct, std::forward_as_tuple(10),
-                  std::forward_as_tuple(1));
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(1));
-  BOOST_CHECK(inserted);
-
-  std::tie(it, inserted) =
-      map.emplace(std::piecewise_construct, std::forward_as_tuple(10),
-                  std::forward_as_tuple(3));
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(1));
-  BOOST_CHECK(!inserted);
-}
-
-/**
- * try_emplace
- */
-BOOST_AUTO_TEST_CASE(test_try_emplace) {
-  tsl::robin_map<std::int64_t, move_only_test> map;
-  tsl::robin_map<std::int64_t, move_only_test>::iterator it;
-  bool inserted;
-
-  std::tie(it, inserted) = map.try_emplace(10, 1);
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(1));
-  BOOST_CHECK(inserted);
-
-  std::tie(it, inserted) = map.try_emplace(10, 3);
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(1));
-  BOOST_CHECK(!inserted);
-}
-
-BOOST_AUTO_TEST_CASE(test_try_emplace_2) {
-  // Insert x values with try_emplace, insert them again, check with find.
-  tsl::robin_map<std::string, move_only_test> map;
-  tsl::robin_map<std::string, move_only_test>::iterator it;
-  bool inserted;
-
-  const std::size_t nb_values = 1000;
-  for (std::size_t i = 0; i < nb_values; i++) {
-    std::tie(it, inserted) = map.try_emplace(utils::get_key<std::string>(i), i);
-
-    BOOST_CHECK_EQUAL(it->first, utils::get_key<std::string>(i));
-    BOOST_CHECK_EQUAL(it->second, move_only_test(i));
-    BOOST_CHECK(inserted);
-  }
-  BOOST_CHECK_EQUAL(map.size(), nb_values);
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    std::tie(it, inserted) =
-        map.try_emplace(utils::get_key<std::string>(i), i + 1);
-
-    BOOST_CHECK_EQUAL(it->first, utils::get_key<std::string>(i));
-    BOOST_CHECK_EQUAL(it->second, move_only_test(i));
-    BOOST_CHECK(!inserted);
-  }
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    it = map.find(utils::get_key<std::string>(i));
-
-    BOOST_CHECK_EQUAL(it->first, utils::get_key<std::string>(i));
-    BOOST_CHECK_EQUAL(it->second, move_only_test(i));
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_try_emplace_hint) {
-  tsl::robin_map<std::int64_t, move_only_test> map(0);
-
-  // end() hint, new value
-  auto it = map.try_emplace(map.find(10), 10, 1);
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(1));
-
-  // Good hint
-  it = map.try_emplace(map.find(10), 10, 3);
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(1));
-
-  // Wrong hint, new value
-  it = map.try_emplace(map.find(10), 1, 3);
-  BOOST_CHECK_EQUAL(it->first, 1);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(3));
-}
-
-/**
- * insert_or_assign
- */
-BOOST_AUTO_TEST_CASE(test_insert_or_assign) {
-  tsl::robin_map<std::int64_t, move_only_test> map;
-  tsl::robin_map<std::int64_t, move_only_test>::iterator it;
-  bool inserted;
-
-  std::tie(it, inserted) = map.insert_or_assign(10, move_only_test(1));
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(1));
-  BOOST_CHECK(inserted);
-
-  std::tie(it, inserted) = map.insert_or_assign(10, move_only_test(3));
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(3));
-  BOOST_CHECK(!inserted);
-}
-
-BOOST_AUTO_TEST_CASE(test_insert_or_assign_hint) {
-  tsl::robin_map<std::int64_t, move_only_test> map(0);
-
-  // end() hint, new value
-  auto it = map.insert_or_assign(map.find(10), 10, move_only_test(1));
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(1));
-
-  // Good hint
-  it = map.insert_or_assign(map.find(10), 10, move_only_test(3));
-  BOOST_CHECK_EQUAL(it->first, 10);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(3));
-
-  // Bad hint, new value
-  it = map.insert_or_assign(map.find(10), 1, move_only_test(3));
-  BOOST_CHECK_EQUAL(it->first, 1);
-  BOOST_CHECK_EQUAL(it->second, move_only_test(3));
-}
-
-/**
- * erase
- */
-BOOST_AUTO_TEST_CASE(test_range_erase_all) {
-  // insert x values, delete all with iterators
-  using HMap = tsl::robin_map<std::string, std::int64_t>;
-
-  const std::size_t nb_values = 1000;
-  HMap map = utils::get_filled_hash_map<HMap>(nb_values);
-
-  auto it = map.erase(map.begin(), map.end());
-  BOOST_CHECK(it == map.end());
-  BOOST_CHECK(map.empty());
-}
-
-BOOST_AUTO_TEST_CASE(test_range_erase) {
-  // insert x values, delete all with iterators except 10 first and 780 last
-  // values
-  using HMap = tsl::robin_map<std::string, std::int64_t>;
-
-  const std::size_t nb_values = 1000;
-  HMap map = utils::get_filled_hash_map<HMap>(nb_values);
-
-  auto it_first = std::next(map.begin(), 10);
-  auto it_last = std::next(map.begin(), 220);
-
-  auto it = map.erase(it_first, it_last);
-  BOOST_CHECK_EQUAL(std::distance(it, map.end()), 780);
-  BOOST_CHECK_EQUAL(map.size(), 790);
-  BOOST_CHECK_EQUAL(std::distance(map.begin(), map.end()), 790);
-
-  for (auto& val : map) {
-    BOOST_CHECK_EQUAL(map.count(val.first), 1);
-  }
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(test_erase_loop, HMap, test_types) {
-  // insert x values, delete all one by one with iterator
-  std::size_t nb_values = 1000;
-
-  HMap map = utils::get_filled_hash_map<HMap>(nb_values);
-  HMap map2 = utils::get_filled_hash_map<HMap>(nb_values);
-
-  auto it = map.begin();
-  // Use second map to check for key after delete as we may not copy the key
-  // with move-only types.
-  auto it2 = map2.begin();
-  while (it != map.end()) {
-    it = map.erase(it);
-    --nb_values;
-
-    BOOST_CHECK_EQUAL(map.count(it2->first), 0);
-    BOOST_CHECK_EQUAL(map.size(), nb_values);
-    ++it2;
-  }
-
-  BOOST_CHECK(map.empty());
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(test_erase_loop_range, HMap, test_types) {
-  // insert x values, delete all five by five with iterators
-  const std::size_t hop = 5;
-  std::size_t nb_values = 1000;
-
-  BOOST_REQUIRE_EQUAL(nb_values % hop, 0);
-
-  HMap map = utils::get_filled_hash_map<HMap>(nb_values);
-
-  auto it = map.begin();
-  while (it != map.end()) {
-    it = map.erase(it, std::next(it, hop));
-    nb_values -= hop;
-
-    BOOST_CHECK_EQUAL(map.size(), nb_values);
-  }
-
-  BOOST_CHECK(map.empty());
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(test_insert_erase_insert, HMap, test_types) {
-  // insert x/2 values, delete x/4 values, insert x/2 values, find each value
-  using key_t = typename HMap::key_type;
-  using value_t = typename HMap::mapped_type;
-
-  const std::size_t nb_values = 2000;
-  HMap map(10);
-  typename HMap::iterator it;
-  bool inserted;
-
-  // Insert nb_values/2
-  for (std::size_t i = 0; i < nb_values / 2; i++) {
-    std::tie(it, inserted) =
-        map.insert({utils::get_key<key_t>(i), utils::get_value<value_t>(i)});
-
-    BOOST_CHECK_EQUAL(it->first, utils::get_key<key_t>(i));
-    BOOST_CHECK_EQUAL(it->second, utils::get_value<value_t>(i));
-    BOOST_CHECK(inserted);
-  }
-  BOOST_CHECK_EQUAL(map.size(), nb_values / 2);
-
-  // Delete nb_values/4
-  for (std::size_t i = 0; i < nb_values / 2; i++) {
-    if (i % 2 == 0) {
-      BOOST_CHECK_EQUAL(map.erase(utils::get_key<key_t>(i)), 1);
-    }
-  }
-  BOOST_CHECK_EQUAL(map.size(), nb_values / 4);
-
-  // Insert nb_values/2
-  for (std::size_t i = nb_values / 2; i < nb_values; i++) {
-    std::tie(it, inserted) =
-        map.insert({utils::get_key<key_t>(i), utils::get_value<value_t>(i)});
-
-    BOOST_CHECK_EQUAL(it->first, utils::get_key<key_t>(i));
-    BOOST_CHECK_EQUAL(it->second, utils::get_value<value_t>(i));
-    BOOST_CHECK(inserted);
-  }
-  BOOST_CHECK_EQUAL(map.size(), nb_values - nb_values / 4);
-
-  // Find
-  for (std::size_t i = 0; i < nb_values; i++) {
-    if (i % 2 == 0 && i < nb_values / 2) {
-      it = map.find(utils::get_key<key_t>(i));
-
-      BOOST_CHECK(it == map.end());
-    } else {
-      it = map.find(utils::get_key<key_t>(i));
-
-      BOOST_REQUIRE(it != map.end());
-      BOOST_CHECK_EQUAL(it->first, utils::get_key<key_t>(i));
-      BOOST_CHECK_EQUAL(it->second, utils::get_value<value_t>(i));
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_range_erase_same_iterators) {
-  // insert x values, test erase with same iterator as each parameter, check if
-  // returned mutable iterator is valid.
-  const std::size_t nb_values = 100;
-  auto map =
-      utils::get_filled_hash_map<tsl::robin_map<std::int64_t, std::int64_t>>(
-          nb_values);
-
-  tsl::robin_map<std::int64_t, std::int64_t>::const_iterator it_const =
-      map.cbegin();
-  std::advance(it_const, 10);
-
-  tsl::robin_map<std::int64_t, std::int64_t>::iterator it_mutable =
-      map.erase(it_const, it_const);
-  BOOST_CHECK(it_const == it_mutable);
-  BOOST_CHECK(map.mutable_iterator(it_const) == it_mutable);
-  BOOST_CHECK_EQUAL(map.size(), 100);
-
-  it_mutable.value() = -100;
-  BOOST_CHECK_EQUAL(it_const.value(), -100);
-}
-
-/**
- * max_load_factor
- */
-BOOST_AUTO_TEST_CASE(test_max_load_factor_extreme_factors) {
-  tsl::robin_map<std::int64_t, std::int64_t> map;
-
-  map.max_load_factor(0.0f);
-  BOOST_CHECK_GT(map.max_load_factor(), 0.0f);
-
-  map.max_load_factor(10.0f);
-  BOOST_CHECK_LT(map.max_load_factor(), 1.0f);
-}
-
-/**
- * min_load_factor
- */
-BOOST_AUTO_TEST_CASE(test_min_load_factor_extreme_factors) {
-  tsl::robin_map<std::int64_t, std::int64_t> map;
-
-  BOOST_CHECK_EQUAL(map.min_load_factor(), 0.0f);
-  BOOST_CHECK_LT(map.min_load_factor(), map.max_load_factor());
-
-  map.min_load_factor(-10.0f);
-  BOOST_CHECK_EQUAL(map.min_load_factor(), 0.0f);
-
-  map.min_load_factor(0.9f);
-  map.max_load_factor(0.1f);
-
-  // max_load_factor should always be > min_load_factor.
-  // Factors should have been clamped.
-  BOOST_CHECK_LT(map.min_load_factor(), map.max_load_factor());
-}
-
-BOOST_AUTO_TEST_CASE(test_min_load_factor) {
-  // set min_load_factor to 0.15 and max_load_factor to 0.5.
-  // rehash to 100 buckets, insert 50 elements, erase until load_factor() <
-  // min_load_factor(), insert an element, check if map has shrinked.
-  const std::size_t nb_values = 50;
-  tsl::robin_map<std::int64_t, std::int64_t> map;
-
-  map.min_load_factor(0.15f);
-  BOOST_CHECK_EQUAL(map.min_load_factor(), 0.15f);
-
-  map.max_load_factor(0.5f);
-  BOOST_CHECK_EQUAL(map.max_load_factor(), 0.5f);
-
-  map.rehash(nb_values * 2);
-  for (std::size_t i = 0; i < nb_values; i++) {
-    map.insert(
-        {utils::get_key<std::int64_t>(i), utils::get_value<std::int64_t>(i)});
-  }
-  BOOST_CHECK_GT(map.load_factor(), map.min_load_factor());
-
-  while (map.load_factor() >= map.min_load_factor()) {
-    map.erase(map.begin());
-  }
-
-  // Shrink is done on insert.
-  map.insert({utils::get_key<std::int64_t>(map.bucket_count()),
-              utils::get_value<std::int64_t>(map.bucket_count())});
-  BOOST_CHECK_GT(map.load_factor(), map.min_load_factor());
-}
-
-BOOST_AUTO_TEST_CASE(test_min_load_factor_range_erase) {
-  // set min_load_factor to 0.15 and max_load_factor to 0.5.
-  // rehash to 100 buckets, insert 50 elements, erase 40 with range erase,
-  // insert an element, check if map has shrinked.
-  const std::size_t nb_values = 50;
-  const std::size_t nb_values_erase = 40;
-  tsl::robin_map<std::int64_t, std::int64_t> map;
-
-  map.min_load_factor(0.15f);
-  BOOST_CHECK_EQUAL(map.min_load_factor(), 0.15f);
-
-  map.max_load_factor(0.5f);
-  BOOST_CHECK_EQUAL(map.max_load_factor(), 0.5f);
-
-  map.rehash(nb_values * 2);
-  for (std::size_t i = 0; i < nb_values; i++) {
-    map.insert(
-        {utils::get_key<std::int64_t>(i), utils::get_value<std::int64_t>(i)});
-  }
-  BOOST_CHECK_GT(map.load_factor(), map.min_load_factor());
-
-  map.erase(std::next(map.begin(), nb_values - nb_values_erase), map.end());
-
-  // Shrink is done on insert.
-  map.insert({utils::get_key<std::int64_t>(map.bucket_count()),
-              utils::get_value<std::int64_t>(map.bucket_count())});
-  BOOST_CHECK_GT(map.load_factor(), map.min_load_factor());
-  BOOST_CHECK_LT(map.bucket_count(), nb_values * 2);
-}
-
-/**
- * rehash
- */
-BOOST_AUTO_TEST_CASE(test_rehash_empty) {
-  // test rehash(0), test find/erase/insert on map.
-  const std::size_t nb_values = 100;
-  auto map =
-      utils::get_filled_hash_map<tsl::robin_map<std::int64_t, std::int64_t>>(
-          nb_values);
-
-  const std::size_t bucket_count = map.bucket_count();
-  BOOST_CHECK(bucket_count >= nb_values);
-
-  map.clear();
-  BOOST_CHECK_EQUAL(map.bucket_count(), bucket_count);
-  BOOST_CHECK(map.empty());
-
-  map.rehash(0);
-  BOOST_CHECK_EQUAL(map.bucket_count(), 0);
-  BOOST_CHECK(map.empty());
-
-  BOOST_CHECK(map.find(1) == map.end());
-  BOOST_CHECK_EQUAL(map.erase(1), 0);
-  BOOST_CHECK(map.insert({1, 10}).second);
-  BOOST_CHECK_EQUAL(map.at(1), 10);
-}
-
-/**
- * operator== and operator!=
- */
-BOOST_AUTO_TEST_CASE(test_compare) {
-  const tsl::robin_map<std::string, std::int64_t> map1 = {
-      {"a", 1}, {"e", 5}, {"d", 4}, {"c", 3}, {"b", 2}};
-  const tsl::robin_map<std::string, std::int64_t> map1_copy = {
-      {"e", 5}, {"c", 3}, {"b", 2}, {"a", 1}, {"d", 4}};
-  const tsl::robin_map<std::string, std::int64_t> map2 = {
-      {"e", 5}, {"c", 3}, {"b", 2}, {"a", 1}, {"d", 4}, {"f", 6}};
-  const tsl::robin_map<std::string, std::int64_t> map3 = {
-      {"e", 5}, {"c", 3}, {"b", 2}, {"a", 1}};
-  const tsl::robin_map<std::string, std::int64_t> map4 = {
-      {"a", 1}, {"e", 5}, {"d", 4}, {"c", 3}, {"b", 26}};
-  const tsl::robin_map<std::string, std::int64_t> map5 = {
-      {"a", 1}, {"e", 5}, {"d", 4}, {"c", 3}, {"z", 2}};
-
-  BOOST_CHECK(map1 == map1_copy);
-  BOOST_CHECK(map1_copy == map1);
-
-  BOOST_CHECK(map1 != map2);
-  BOOST_CHECK(map2 != map1);
-
-  BOOST_CHECK(map1 != map3);
-  BOOST_CHECK(map3 != map1);
-
-  BOOST_CHECK(map1 != map4);
-  BOOST_CHECK(map4 != map1);
-
-  BOOST_CHECK(map1 != map5);
-  BOOST_CHECK(map5 != map1);
-
-  BOOST_CHECK(map2 != map3);
-  BOOST_CHECK(map3 != map2);
-
-  BOOST_CHECK(map2 != map4);
-  BOOST_CHECK(map4 != map2);
-
-  BOOST_CHECK(map2 != map5);
-  BOOST_CHECK(map5 != map2);
-
-  BOOST_CHECK(map3 != map4);
-  BOOST_CHECK(map4 != map3);
-
-  BOOST_CHECK(map3 != map5);
-  BOOST_CHECK(map5 != map3);
-
-  BOOST_CHECK(map4 != map5);
-  BOOST_CHECK(map5 != map4);
-}
-
-/**
- * clear
- */
-BOOST_AUTO_TEST_CASE(test_clear) {
-  // insert x values, clear map, test insert
-  using HMap = tsl::robin_map<std::int64_t, std::int64_t>;
-
-  const std::size_t nb_values = 1000;
-  auto map = utils::get_filled_hash_map<HMap>(nb_values);
-
-  map.clear();
-  BOOST_CHECK_EQUAL(map.size(), 0);
-  BOOST_CHECK_EQUAL(std::distance(map.begin(), map.end()), 0);
-
-  map.insert({5, -5});
-  map.insert({{1, -1}, {2, -1}, {4, -4}, {3, -3}});
-
-  BOOST_CHECK(map == (HMap({{5, -5}, {1, -1}, {2, -1}, {4, -4}, {3, -3}})));
-}
-
-BOOST_AUTO_TEST_CASE(test_clear_with_min_load_factor) {
-  // insert x values, clear map, test insert
-  using HMap = tsl::robin_map<std::int64_t, std::int64_t>;
-
-  const std::size_t nb_values = 1000;
-  auto map = utils::get_filled_hash_map<HMap>(nb_values);
-  map.min_load_factor(0.1f);
-
-  map.clear();
-  BOOST_CHECK_EQUAL(map.bucket_count(), 0);
-  BOOST_CHECK_EQUAL(map.size(), 0);
-  BOOST_CHECK_EQUAL(std::distance(map.begin(), map.end()), 0);
-
-  map.insert({5, -5});
-  map.insert({{1, -1}, {2, -1}, {4, -4}, {3, -3}});
-
-  BOOST_CHECK(map == (HMap({{5, -5}, {1, -1}, {2, -1}, {4, -4}, {3, -3}})));
-}
-
-/**
- * iterator.value()
- */
-BOOST_AUTO_TEST_CASE(test_modify_value_through_iterator) {
-  // insert x values, modify value of even keys with iterators, check values
-  const std::size_t nb_values = 100;
-  auto map =
-      utils::get_filled_hash_map<tsl::robin_map<std::int64_t, std::int64_t>>(
-          nb_values);
-
-  for (auto it = map.begin(); it != map.end(); it++) {
-    if (it.key() % 2 == 0) {
-      it.value() = -1;
-    }
-  }
-
-  for (auto& val : map) {
-    if (val.first % 2 == 0) {
-      BOOST_CHECK_EQUAL(val.second, -1);
-    } else {
-      BOOST_CHECK_NE(val.second, -1);
-    }
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_modify_value_through_iterator_with_const_qualifier) {
-  tsl::robin_map<int, int> map = {{0, 1}};
-  const auto it = map.begin();
-
-  BOOST_CHECK_EQUAL(it->second, 1);
-  it.value() += 10;
-  BOOST_CHECK_EQUAL(it->second, 11);
-}
-
-/**
- * constructor
- */
-BOOST_AUTO_TEST_CASE(test_extreme_bucket_count_value_construction) {
-  TSL_RH_CHECK_THROW(
-      (tsl::robin_map<int, int, std::hash<int>, std::equal_to<int>,
-                      std::allocator<std::pair<int, int>>, false,
-                      tsl::rh::power_of_two_growth_policy<2>>(
-          std::numeric_limits<std::size_t>::max())),
-      std::length_error);
-
-  TSL_RH_CHECK_THROW(
-      (tsl::robin_map<int, int, std::hash<int>, std::equal_to<int>,
-                      std::allocator<std::pair<int, int>>, false,
-                      tsl::rh::power_of_two_growth_policy<2>>(
-          std::numeric_limits<std::size_t>::max() / 2 + 1)),
-      std::length_error);
-
-  TSL_RH_CHECK_THROW(
-      (tsl::robin_map<int, int, std::hash<int>, std::equal_to<int>,
-                      std::allocator<std::pair<int, int>>, false,
-                      tsl::rh::prime_growth_policy>(
-          std::numeric_limits<std::size_t>::max())),
-      std::length_error);
-
-  TSL_RH_CHECK_THROW(
-      (tsl::robin_map<int, int, std::hash<int>, std::equal_to<int>,
-                      std::allocator<std::pair<int, int>>, false,
-                      tsl::rh::prime_growth_policy>(
-          std::numeric_limits<std::size_t>::max() / 2)),
-      std::length_error);
-
-  TSL_RH_CHECK_THROW(
-      (tsl::robin_map<int, int, std::hash<int>, std::equal_to<int>,
-                      std::allocator<std::pair<int, int>>, false,
-                      tsl::rh::mod_growth_policy<>>(
-          std::numeric_limits<std::size_t>::max())),
-      std::length_error);
-}
-
-BOOST_AUTO_TEST_CASE(test_range_construct) {
-  tsl::robin_map<int, int> map = {{2, 1}, {1, 0}, {3, 2}};
-
-  tsl::robin_map<int, int> map2(map.begin(), map.end());
-  tsl::robin_map<int, int> map3(map.cbegin(), map.cend());
-}
-
-/**
- * operator=(std::initializer_list)
- */
-BOOST_AUTO_TEST_CASE(test_assign_operator) {
-  tsl::robin_map<std::int64_t, std::int64_t> map = {{0, 10}, {-2, 20}};
-  BOOST_CHECK_EQUAL(map.size(), 2);
-
-  map = {{1, 3}, {2, 4}};
-  BOOST_CHECK_EQUAL(map.size(), 2);
-  BOOST_CHECK_EQUAL(map.at(1), 3);
-  BOOST_CHECK_EQUAL(map.at(2), 4);
-  BOOST_CHECK(map.find(0) == map.end());
-
-  map = {};
-  BOOST_CHECK(map.empty());
-}
-
-/**
- * move/copy constructor/operator
- */
-BOOST_AUTO_TEST_CASE(test_move_constructor) {
-  // insert x values in map, move map into map_move with move constructor, check
-  // map and map_move, insert additional values in map_move, check map_move
-  using HMap = tsl::robin_map<std::string, move_only_test>;
-
-  const std::size_t nb_values = 100;
-  HMap map = utils::get_filled_hash_map<HMap>(nb_values);
-  HMap map_move(std::move(map));
-
-  BOOST_CHECK(map_move == utils::get_filled_hash_map<HMap>(nb_values));
-  BOOST_CHECK(map == (HMap()));
-
-  for (std::size_t i = nb_values; i < nb_values * 2; i++) {
-    map_move.insert(
-        {utils::get_key<std::string>(i), utils::get_value<move_only_test>(i)});
-  }
-
-  BOOST_CHECK_EQUAL(map_move.size(), nb_values * 2);
-  BOOST_CHECK(map_move == utils::get_filled_hash_map<HMap>(nb_values * 2));
-}
-
-BOOST_AUTO_TEST_CASE(test_move_constructor_empty) {
-  tsl::robin_map<std::string, move_only_test> map(0);
-  tsl::robin_map<std::string, move_only_test> map_move(std::move(map));
-
-  BOOST_CHECK(map.empty());
-  BOOST_CHECK(map_move.empty());
-
-  BOOST_CHECK(map.find("") == map.end());
-  BOOST_CHECK(map_move.find("") == map_move.end());
-}
-
-BOOST_AUTO_TEST_CASE(test_move_operator) {
-  // insert x values in map, move map into map_move with move operator, check
-  // map and map_move, insert additional values in map_move, check map_move
-  using HMap = tsl::robin_map<std::string, move_only_test>;
-
-  const std::size_t nb_values = 100;
-  HMap map = utils::get_filled_hash_map<HMap>(nb_values);
-  HMap map_move = utils::get_filled_hash_map<HMap>(1);
-  map_move = std::move(map);
-
-  BOOST_CHECK(map_move == utils::get_filled_hash_map<HMap>(nb_values));
-  BOOST_CHECK(map == (HMap()));
-
-  for (std::size_t i = nb_values; i < nb_values * 2; i++) {
-    map_move.insert(
-        {utils::get_key<std::string>(i), utils::get_value<move_only_test>(i)});
-  }
-
-  BOOST_CHECK_EQUAL(map_move.size(), nb_values * 2);
-  BOOST_CHECK(map_move == utils::get_filled_hash_map<HMap>(nb_values * 2));
-}
-
-BOOST_AUTO_TEST_CASE(test_move_operator_empty) {
-  tsl::robin_map<std::string, move_only_test> map(0);
-  tsl::robin_map<std::string, move_only_test> map_move;
-  map_move = (std::move(map));
-
-  BOOST_CHECK(map.empty());
-  BOOST_CHECK(map_move.empty());
-
-  BOOST_CHECK(map.find("") == map.end());
-  BOOST_CHECK(map_move.find("") == map_move.end());
-}
-
-BOOST_AUTO_TEST_CASE(test_reassign_moved_object_move_constructor) {
-  using HMap = tsl::robin_map<std::string, std::string>;
-
-  HMap map = {{"Key1", "Value1"}, {"Key2", "Value2"}, {"Key3", "Value3"}};
-  HMap map_move(std::move(map));
-
-  BOOST_CHECK_EQUAL(map_move.size(), 3);
-  BOOST_CHECK_EQUAL(map.size(), 0);
-
-  map = {{"Key4", "Value4"}, {"Key5", "Value5"}};
-  BOOST_CHECK(map == (HMap({{"Key4", "Value4"}, {"Key5", "Value5"}})));
-}
-
-BOOST_AUTO_TEST_CASE(test_reassign_moved_object_move_operator) {
-  using HMap = tsl::robin_map<std::string, std::string>;
-
-  HMap map = {{"Key1", "Value1"}, {"Key2", "Value2"}, {"Key3", "Value3"}};
-  HMap map_move = std::move(map);
-
-  BOOST_CHECK_EQUAL(map_move.size(), 3);
-  BOOST_CHECK_EQUAL(map.size(), 0);
-
-  map = {{"Key4", "Value4"}, {"Key5", "Value5"}};
-  BOOST_CHECK(map == (HMap({{"Key4", "Value4"}, {"Key5", "Value5"}})));
-}
-
-BOOST_AUTO_TEST_CASE(test_use_after_move_constructor) {
-  using HMap = tsl::robin_map<std::string, move_only_test>;
-
-  const std::size_t nb_values = 100;
-  HMap map = utils::get_filled_hash_map<HMap>(nb_values);
-  HMap map_move(std::move(map));
-
-  BOOST_CHECK(map == (HMap()));
-  BOOST_CHECK_EQUAL(map.size(), 0);
-  BOOST_CHECK_EQUAL(map.bucket_count(), 0);
-  BOOST_CHECK_EQUAL(map.erase("a"), 0);
-  BOOST_CHECK(map.find("a") == map.end());
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    map.insert(
-        {utils::get_key<std::string>(i), utils::get_value<move_only_test>(i)});
-  }
-
-  BOOST_CHECK_EQUAL(map.size(), nb_values);
-  BOOST_CHECK(map == map_move);
-}
-
-BOOST_AUTO_TEST_CASE(test_use_after_move_operator) {
-  using HMap = tsl::robin_map<std::string, move_only_test>;
-
-  const std::size_t nb_values = 100;
-  HMap map = utils::get_filled_hash_map<HMap>(nb_values);
-  HMap map_move(0);
-  map_move = std::move(map);
-
-  BOOST_CHECK(map == (HMap()));
-  BOOST_CHECK_EQUAL(map.size(), 0);
-  BOOST_CHECK_EQUAL(map.bucket_count(), 0);
-  BOOST_CHECK_EQUAL(map.erase("a"), 0);
-  BOOST_CHECK(map.find("a") == map.end());
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    map.insert(
-        {utils::get_key<std::string>(i), utils::get_value<move_only_test>(i)});
-  }
-
-  BOOST_CHECK_EQUAL(map.size(), nb_values);
-  BOOST_CHECK(map == map_move);
-}
-
-BOOST_AUTO_TEST_CASE(test_copy_constructor_and_operator) {
-  using HMap = tsl::robin_map<std::string, std::string, mod_hash<9>>;
-
-  const std::size_t nb_values = 100;
-  HMap map = utils::get_filled_hash_map<HMap>(nb_values);
-
-  HMap map_copy = map;
-  HMap map_copy2(map);
-  HMap map_copy3 = utils::get_filled_hash_map<HMap>(1);
-  map_copy3 = map;
-
-  BOOST_CHECK(map == map_copy);
-  map.clear();
-
-  BOOST_CHECK(map_copy == map_copy2);
-  BOOST_CHECK(map_copy == map_copy3);
-}
-
-BOOST_AUTO_TEST_CASE(test_copy_constructor_empty) {
-  tsl::robin_map<std::string, int> map(0);
-  tsl::robin_map<std::string, int> map_copy(map);
-
-  BOOST_CHECK(map.empty());
-  BOOST_CHECK(map_copy.empty());
-
-  BOOST_CHECK(map.find("") == map.end());
-  BOOST_CHECK(map_copy.find("") == map_copy.end());
-}
-
-BOOST_AUTO_TEST_CASE(test_copy_operator_empty) {
-  tsl::robin_map<std::string, int> map(0);
-  tsl::robin_map<std::string, int> map_copy(16);
-  map_copy = map;
-
-  BOOST_CHECK(map.empty());
-  BOOST_CHECK(map_copy.empty());
-
-  BOOST_CHECK(map.find("") == map.end());
-  BOOST_CHECK(map_copy.find("") == map_copy.end());
-}
-
-/**
- * at
- */
-BOOST_AUTO_TEST_CASE(test_at) {
-  // insert x values, use at for known and unknown values.
-  const tsl::robin_map<std::int64_t, std::int64_t> map = {{0, 10}, {-2, 20}};
-
-  BOOST_CHECK_EQUAL(map.at(0), 10);
-  BOOST_CHECK_EQUAL(map.at(-2), 20);
-  TSL_RH_CHECK_THROW(map.at(1), std::out_of_range);
-}
-
-/**
- * contains
- */
-BOOST_AUTO_TEST_CASE(test_contains) {
-  tsl::robin_map<std::int64_t, std::int64_t> map = {{0, 10}, {-2, 20}};
-
-  BOOST_CHECK(map.contains(0));
-  BOOST_CHECK(map.contains(-2));
-  BOOST_CHECK(!map.contains(-3));
-}
-
-/**
- * equal_range
- */
-BOOST_AUTO_TEST_CASE(test_equal_range) {
-  const tsl::robin_map<std::int64_t, std::int64_t> map = {{0, 10}, {-2, 20}};
-
-  auto it_pair = map.equal_range(0);
-  BOOST_REQUIRE_EQUAL(std::distance(it_pair.first, it_pair.second), 1);
-  BOOST_CHECK_EQUAL(it_pair.first->second, 10);
-
-  it_pair = map.equal_range(1);
-  BOOST_CHECK(it_pair.first == it_pair.second);
-  BOOST_CHECK(it_pair.first == map.end());
-}
-
-/**
- * operator[]
- */
-BOOST_AUTO_TEST_CASE(test_access_operator) {
-  // insert x values, use at for known and unknown values.
-  tsl::robin_map<std::int64_t, std::int64_t> map = {{0, 10}, {-2, 20}};
-
-  BOOST_CHECK_EQUAL(map[0], 10);
-  BOOST_CHECK_EQUAL(map[-2], 20);
-  BOOST_CHECK_EQUAL(map[2], std::int64_t());
-
-  BOOST_CHECK_EQUAL(map.size(), 3);
-}
-
-/**
- * swap
- */
-BOOST_AUTO_TEST_CASE(test_swap) {
-  tsl::robin_map<std::int64_t, std::int64_t> map = {{1, 10}, {8, 80}, {3, 30}};
-  tsl::robin_map<std::int64_t, std::int64_t> map2 = {{4, 40}, {5, 50}};
-
-  using std::swap;
-  swap(map, map2);
-
-  BOOST_CHECK(map ==
-              (tsl::robin_map<std::int64_t, std::int64_t>{{4, 40}, {5, 50}}));
-  BOOST_CHECK(map2 == (tsl::robin_map<std::int64_t, std::int64_t>{
-                          {1, 10}, {8, 80}, {3, 30}}));
-
-  map.insert({6, 60});
-  map2.insert({4, 40});
-
-  BOOST_CHECK(map == (tsl::robin_map<std::int64_t, std::int64_t>{
-                         {4, 40}, {5, 50}, {6, 60}}));
-  BOOST_CHECK(map2 == (tsl::robin_map<std::int64_t, std::int64_t>{
-                          {1, 10}, {8, 80}, {3, 30}, {4, 40}}));
-}
-
-BOOST_AUTO_TEST_CASE(test_swap_empty) {
-  tsl::robin_map<std::int64_t, std::int64_t> map = {{1, 10}, {8, 80}, {3, 30}};
-  tsl::robin_map<std::int64_t, std::int64_t> map2;
-
-  using std::swap;
-  swap(map, map2);
-
-  BOOST_CHECK(map == (tsl::robin_map<std::int64_t, std::int64_t>{}));
-  BOOST_CHECK(map2 == (tsl::robin_map<std::int64_t, std::int64_t>{
-                          {1, 10}, {8, 80}, {3, 30}}));
-
-  map.insert({6, 60});
-  map2.insert({4, 40});
-
-  BOOST_CHECK(map == (tsl::robin_map<std::int64_t, std::int64_t>{{6, 60}}));
-  BOOST_CHECK(map2 == (tsl::robin_map<std::int64_t, std::int64_t>{
-                          {1, 10}, {8, 80}, {3, 30}, {4, 40}}));
-}
-
-/**
- * serialize and deserialize
- */
-BOOST_AUTO_TEST_CASE(test_serialize_desearialize_empty) {
-  // serialize empty map; deserialize in new map; check equal.
-  // for deserialization, test it with and without hash compatibility.
-  const tsl::robin_map<std::string, move_only_test> empty_map(0);
-
-  serializer serial;
-  empty_map.serialize(serial);
-
-  deserializer dserial(serial.str());
-  auto empty_map_deserialized = decltype(empty_map)::deserialize(dserial, true);
-  BOOST_CHECK(empty_map_deserialized == empty_map);
-
-  deserializer dserial2(serial.str());
-  empty_map_deserialized = decltype(empty_map)::deserialize(dserial2, false);
-  BOOST_CHECK(empty_map_deserialized == empty_map);
-}
-
-BOOST_AUTO_TEST_CASE(test_serialize_desearialize) {
-  // insert x values; delete some values; serialize map; deserialize in new map;
-  // check equal. for deserialization, test it with and without hash
-  // compatibility.
-  const std::size_t nb_values = 1000;
-
-  tsl::robin_map<std::int32_t, move_only_test> map;
-  for (std::size_t i = 0; i < nb_values + 40; i++) {
-    map.insert(
-        {utils::get_key<std::int32_t>(i), utils::get_value<move_only_test>(i)});
-  }
-
-  for (std::size_t i = nb_values; i < nb_values + 40; i++) {
-    map.erase(utils::get_key<std::int32_t>(i));
-  }
-  BOOST_CHECK_EQUAL(map.size(), nb_values);
-
-  serializer serial;
-  map.serialize(serial);
-
-  deserializer dserial(serial.str());
-  auto map_deserialized = decltype(map)::deserialize(dserial, true);
-  BOOST_CHECK(map == map_deserialized);
-
-  deserializer dserial2(serial.str());
-  map_deserialized = decltype(map)::deserialize(dserial2, false);
-  BOOST_CHECK(map_deserialized == map);
-
-  // Deserializing a map with StoreHash=true from a map serialized with
-  // StoreHash=false with hash_compatible=true should throw an exception.
-  deserializer dserial3(serial.str());
-  TSL_RH_CHECK_THROW(
-      (tsl::robin_map<std::int32_t, move_only_test, std::hash<std::int32_t>,
-                      std::equal_to<std::int32_t>,
-                      std::allocator<std::pair<std::int32_t, move_only_test>>,
-                      true>::deserialize(dserial3, true)),
-      std::runtime_error);
-}
-
-BOOST_AUTO_TEST_CASE(test_serialize_desearialize_with_store_hash) {
-  // insert x values; delete some values; serialize map; deserialize in new map;
-  // check equal. for deserialization, test it with and without hash
-  // compatibility.
-  const std::size_t nb_values = 1000;
-
-  tsl::robin_map<std::int32_t, move_only_test, std::hash<std::int32_t>,
-                 std::equal_to<std::int32_t>,
-                 std::allocator<std::pair<std::int32_t, move_only_test>>, true>
-      map;
-  for (std::size_t i = 0; i < nb_values + 40; i++) {
-    map.insert(
-        {utils::get_key<std::int32_t>(i), utils::get_value<move_only_test>(i)});
-  }
-
-  for (std::size_t i = nb_values; i < nb_values + 40; i++) {
-    map.erase(utils::get_key<std::int32_t>(i));
-  }
-  BOOST_CHECK_EQUAL(map.size(), nb_values);
-
-  serializer serial;
-  map.serialize(serial);
-
-  deserializer dserial(serial.str());
-  auto map_deserialized = decltype(map)::deserialize(dserial, true);
-  BOOST_CHECK(map == map_deserialized);
-
-  deserializer dserial2(serial.str());
-  map_deserialized = decltype(map)::deserialize(dserial2, false);
-  BOOST_CHECK(map_deserialized == map);
-
-  // Deserializing a map with StoreHash=false from a map serialized with
-  // StoreHash=true with hash_compatible=true should throw an exception.
-  deserializer dserial3(serial.str());
-  TSL_RH_CHECK_THROW((tsl::robin_map<std::int32_t, move_only_test>::deserialize(
-                         dserial3, true)),
-                     std::runtime_error);
-}
-
-BOOST_AUTO_TEST_CASE(test_serialize_desearialize_with_different_hash) {
-  // insert x values; serialize map; deserialize in new map which has a
-  // different hash; check equal
-  struct hash_str_diff {
-    std::size_t operator()(const std::string& str) const {
-      return std::hash<std::string>()(str) + 123;
-    }
-  };
-
-  const std::size_t nb_values = 1000;
-
-  tsl::robin_map<std::string, move_only_test> map;
-  for (std::size_t i = 0; i < nb_values; i++) {
-    map.insert(
-        {utils::get_key<std::string>(i), utils::get_value<move_only_test>(i)});
-  }
-  BOOST_CHECK_EQUAL(map.size(), nb_values);
-
-  serializer serial;
-  map.serialize(serial);
-
-  deserializer dserial(serial.str());
-  auto map_deserialized =
-      tsl::robin_map<std::string, move_only_test, hash_str_diff>::deserialize(
-          dserial, false);
-
-  BOOST_CHECK_EQUAL(map_deserialized.size(), map.size());
-  for (const auto& val : map) {
-    BOOST_CHECK(map_deserialized.find(val.first) != map_deserialized.end());
-  }
-}
-
-/**
- * KeyEqual
- */
-BOOST_AUTO_TEST_CASE(test_key_equal) {
-  // Use a KeyEqual and Hash where any odd unsigned number 'x' is equal to
-  // 'x-1'. Make sure that KeyEqual is called (and not ==).
-  struct hash {
-    std::size_t operator()(std::uint64_t v) const {
-      if (v % 2u == 1u) {
-        return std::hash<std::uint64_t>()(v - 1);
-      } else {
-        return std::hash<std::uint64_t>()(v);
-      }
-    }
-  };
-
-  struct key_equal {
-    bool operator()(std::uint64_t lhs, std::uint64_t rhs) const {
-      if (lhs % 2u == 1u) {
-        lhs--;
-      }
-
-      if (rhs % 2u == 1u) {
-        rhs--;
-      }
-
-      return lhs == rhs;
-    }
-  };
-
-  tsl::robin_map<std::uint64_t, std::uint64_t, hash, key_equal> map;
-  BOOST_CHECK(map.insert({2, 10}).second);
-  BOOST_CHECK_EQUAL(map.at(2), 10);
-  BOOST_CHECK_EQUAL(map.at(3), 10);
-  BOOST_CHECK(!map.insert({3, 10}).second);
-
-  BOOST_CHECK_EQUAL(map.size(), 1);
-}
-
-/**
- * other
- */
-BOOST_AUTO_TEST_CASE(test_heterogeneous_lookups) {
-  struct hash_ptr {
-    std::size_t operator()(const std::unique_ptr<int>& p) const {
-      return std::hash<std::uintptr_t>()(
-          reinterpret_cast<std::uintptr_t>(p.get()));
-    }
-
-    std::size_t operator()(std::uintptr_t p) const {
-      return std::hash<std::uintptr_t>()(p);
-    }
-
-    std::size_t operator()(const int* const& p) const {
-      return std::hash<std::uintptr_t>()(reinterpret_cast<std::uintptr_t>(p));
-    }
-  };
-
-  struct equal_to_ptr {
-    using is_transparent = std::true_type;
-
-    bool operator()(const std::unique_ptr<int>& p1,
-                    const std::unique_ptr<int>& p2) const {
-      return p1 == p2;
-    }
-
-    bool operator()(const std::unique_ptr<int>& p1, std::uintptr_t p2) const {
-      return reinterpret_cast<std::uintptr_t>(p1.get()) == p2;
-    }
-
-    bool operator()(std::uintptr_t p1, const std::unique_ptr<int>& p2) const {
-      return p1 == reinterpret_cast<std::uintptr_t>(p2.get());
-    }
-
-    bool operator()(const std::unique_ptr<int>& p1,
-                    const int* const& p2) const {
-      return p1.get() == p2;
-    }
-
-    bool operator()(const int* const& p1,
-                    const std::unique_ptr<int>& p2) const {
-      return p1 == p2.get();
-    }
-  };
-
-  std::unique_ptr<int> ptr1(new int(1));
-  std::unique_ptr<int> ptr2(new int(2));
-  std::unique_ptr<int> ptr3(new int(3));
-  int other = -1;
-
-  const std::uintptr_t addr1 = reinterpret_cast<std::uintptr_t>(ptr1.get());
-  const int* const addr2 = ptr2.get();
-  const int* const addr_unknown = &other;
-
-  tsl::robin_map<std::unique_ptr<int>, int, hash_ptr, equal_to_ptr> map;
-  map.insert({std::move(ptr1), 4});
-  map.insert({std::move(ptr2), 5});
-  map.insert({std::move(ptr3), 6});
-
-  BOOST_CHECK_EQUAL(map.size(), 3);
-
-  BOOST_CHECK_EQUAL(map.at(addr1), 4);
-  BOOST_CHECK_EQUAL(map.at(addr2), 5);
-  TSL_RH_CHECK_THROW(map.at(addr_unknown), std::out_of_range);
-
-  BOOST_REQUIRE(map.find(addr1) != map.end());
-  BOOST_CHECK_EQUAL(*map.find(addr1)->first, 1);
-
-  BOOST_REQUIRE(map.find(addr2) != map.end());
-  BOOST_CHECK_EQUAL(*map.find(addr2)->first, 2);
-
-  BOOST_CHECK(map.find(addr_unknown) == map.end());
-
-  BOOST_CHECK_EQUAL(map.count(addr1), 1);
-  BOOST_CHECK_EQUAL(map.count(addr2), 1);
-  BOOST_CHECK_EQUAL(map.count(addr_unknown), 0);
-
-  BOOST_CHECK_EQUAL(map.erase(addr1), 1);
-  BOOST_CHECK_EQUAL(map.erase(addr2), 1);
-  BOOST_CHECK_EQUAL(map.erase(addr_unknown), 0);
-
-  BOOST_CHECK_EQUAL(map.size(), 1);
-}
-
-/**
- * Various operations on empty map
- */
-BOOST_AUTO_TEST_CASE(test_empty_map) {
-  tsl::robin_map<std::string, int> map(0);
-
-  BOOST_CHECK_EQUAL(map.bucket_count(), 0);
-  BOOST_CHECK_EQUAL(map.size(), 0);
-  BOOST_CHECK_EQUAL(map.load_factor(), 0);
-  BOOST_CHECK(map.empty());
-
-  BOOST_CHECK(map.begin() == map.end());
-  BOOST_CHECK(map.begin() == map.cend());
-  BOOST_CHECK(map.cbegin() == map.cend());
-
-  BOOST_CHECK(map.find("") == map.end());
-  BOOST_CHECK(map.find("test") == map.end());
-
-  BOOST_CHECK_EQUAL(map.count(""), 0);
-  BOOST_CHECK_EQUAL(map.count("test"), 0);
-
-  BOOST_CHECK(!map.contains(""));
-  BOOST_CHECK(!map.contains("test"));
-
-  TSL_RH_CHECK_THROW(map.at(""), std::out_of_range);
-  TSL_RH_CHECK_THROW(map.at("test"), std::out_of_range);
-
-  auto range = map.equal_range("test");
-  BOOST_CHECK(range.first == range.second);
-
-  BOOST_CHECK_EQUAL(map.erase("test"), 0);
-  BOOST_CHECK(map.erase(map.begin(), map.end()) == map.end());
-
-  BOOST_CHECK_EQUAL(map["new value"], int{});
-}
-
-/**
- * Test precalculated hash
- */
-BOOST_AUTO_TEST_CASE(test_precalculated_hash) {
-  tsl::robin_map<int, int, identity_hash<int>> map = {
-      {1, -1}, {2, -2}, {3, -3}, {4, -4}, {5, -5}, {6, -6}};
-  const tsl::robin_map<int, int, identity_hash<int>> map_const = map;
-
-  /**
-   * find
-   */
-  BOOST_REQUIRE(map.find(3, map.hash_function()(3)) != map.end());
-  BOOST_CHECK_EQUAL(map.find(3, map.hash_function()(3))->second, -3);
-
-  BOOST_REQUIRE(map_const.find(3, map_const.hash_function()(3)) !=
-                map_const.end());
-  BOOST_CHECK_EQUAL(map_const.find(3, map_const.hash_function()(3))->second,
-                    -3);
-
-  BOOST_REQUIRE_NE(map.hash_function()(2), map.hash_function()(3));
-  BOOST_CHECK(map.find(3, map.hash_function()(2)) == map.end());
-
-  /**
-   * at
-   */
-  BOOST_CHECK_EQUAL(map.at(3, map.hash_function()(3)), -3);
-  BOOST_CHECK_EQUAL(map_const.at(3, map_const.hash_function()(3)), -3);
-
-  BOOST_REQUIRE_NE(map.hash_function()(2), map.hash_function()(3));
-  TSL_RH_CHECK_THROW(map.at(3, map.hash_function()(2)), std::out_of_range);
-
-  /**
-   * contains
-   */
-  BOOST_CHECK(map.contains(3, map.hash_function()(3)));
-  BOOST_CHECK(map_const.contains(3, map_const.hash_function()(3)));
-
-  BOOST_REQUIRE_NE(map.hash_function()(2), map.hash_function()(3));
-  BOOST_CHECK(!map.contains(3, map.hash_function()(2)));
-
-  /**
-   * count
-   */
-  BOOST_CHECK_EQUAL(map.count(3, map.hash_function()(3)), 1);
-  BOOST_CHECK_EQUAL(map_const.count(3, map_const.hash_function()(3)), 1);
-
-  BOOST_REQUIRE_NE(map.hash_function()(2), map.hash_function()(3));
-  BOOST_CHECK_EQUAL(map.count(3, map.hash_function()(2)), 0);
-
-  /**
-   * equal_range
-   */
-  auto it_range = map.equal_range(3, map.hash_function()(3));
-  BOOST_REQUIRE_EQUAL(std::distance(it_range.first, it_range.second), 1);
-  BOOST_CHECK_EQUAL(it_range.first->second, -3);
-
-  auto it_range_const = map_const.equal_range(3, map_const.hash_function()(3));
-  BOOST_REQUIRE_EQUAL(
-      std::distance(it_range_const.first, it_range_const.second), 1);
-  BOOST_CHECK_EQUAL(it_range_const.first->second, -3);
-
-  it_range = map.equal_range(3, map.hash_function()(2));
-  BOOST_REQUIRE_NE(map.hash_function()(2), map.hash_function()(3));
-  BOOST_CHECK_EQUAL(std::distance(it_range.first, it_range.second), 0);
-
-  /**
-   * erase
-   */
-  BOOST_CHECK_EQUAL(map.erase(3, map.hash_function()(3)), 1);
-
-  BOOST_REQUIRE_NE(map.hash_function()(2), map.hash_function()(4));
-  BOOST_CHECK_EQUAL(map.erase(4, map.hash_function()(2)), 0);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/robin_set_tests.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/robin_set_tests.cpp
deleted file mode 100644
index af397b217..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/robin_set_tests.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#define BOOST_TEST_DYN_LINK
-
-#include <tsl/robin_set.h>
-
-#include <boost/mpl/list.hpp>
-#include <boost/test/unit_test.hpp>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <string>
-#include <tuple>
-#include <utility>
-
-#include "utils.h"
-
-BOOST_AUTO_TEST_SUITE(test_robin_set)
-
-using test_types =
-    boost::mpl::list<tsl::robin_set<std::int64_t>, tsl::robin_set<std::string>,
-                     tsl::robin_set<self_reference_member_test>,
-                     tsl::robin_set<move_only_test>,
-                     tsl::robin_pg_set<self_reference_member_test>,
-                     tsl::robin_set<move_only_test, std::hash<move_only_test>,
-                                    std::equal_to<move_only_test>,
-                                    std::allocator<move_only_test>, true,
-                                    tsl::rh::prime_growth_policy>,
-                     tsl::robin_set<self_reference_member_test,
-                                    std::hash<self_reference_member_test>,
-                                    std::equal_to<self_reference_member_test>,
-                                    std::allocator<self_reference_member_test>,
-                                    true, tsl::rh::mod_growth_policy<>>,
-                     tsl::robin_set<move_only_test, std::hash<move_only_test>,
-                                    std::equal_to<move_only_test>,
-                                    std::allocator<move_only_test>, false,
-                                    tsl::rh::mod_growth_policy<>>>;
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(test_insert, HSet, test_types) {
-  // insert x values, insert them again, check values
-  using key_t = typename HSet::key_type;
-
-  const std::size_t nb_values = 1000;
-  HSet set;
-  typename HSet::iterator it;
-  bool inserted;
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    std::tie(it, inserted) = set.insert(utils::get_key<key_t>(i));
-
-    BOOST_CHECK_EQUAL(*it, utils::get_key<key_t>(i));
-    BOOST_CHECK(inserted);
-  }
-  BOOST_CHECK_EQUAL(set.size(), nb_values);
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    std::tie(it, inserted) = set.insert(utils::get_key<key_t>(i));
-
-    BOOST_CHECK_EQUAL(*it, utils::get_key<key_t>(i));
-    BOOST_CHECK(!inserted);
-  }
-
-  for (std::size_t i = 0; i < nb_values; i++) {
-    it = set.find(utils::get_key<key_t>(i));
-
-    BOOST_CHECK_EQUAL(*it, utils::get_key<key_t>(i));
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_compare) {
-  const tsl::robin_set<std::string> set1 = {"a", "e", "d", "c", "b"};
-  const tsl::robin_set<std::string> set1_copy = {"e", "c", "b", "a", "d"};
-  const tsl::robin_set<std::string> set2 = {"e", "c", "b", "a", "d", "f"};
-  const tsl::robin_set<std::string> set3 = {"e", "c", "b", "a"};
-  const tsl::robin_set<std::string> set4 = {"a", "e", "d", "c", "z"};
-
-  BOOST_CHECK(set1 == set1_copy);
-  BOOST_CHECK(set1_copy == set1);
-
-  BOOST_CHECK(set1 != set2);
-  BOOST_CHECK(set2 != set1);
-
-  BOOST_CHECK(set1 != set3);
-  BOOST_CHECK(set3 != set1);
-
-  BOOST_CHECK(set1 != set4);
-  BOOST_CHECK(set4 != set1);
-
-  BOOST_CHECK(set2 != set3);
-  BOOST_CHECK(set3 != set2);
-
-  BOOST_CHECK(set2 != set4);
-  BOOST_CHECK(set4 != set2);
-
-  BOOST_CHECK(set3 != set4);
-  BOOST_CHECK(set4 != set3);
-}
-
-BOOST_AUTO_TEST_CASE(test_insert_pointer) {
-  // Test added mainly to be sure that the code compiles with MSVC due to a bug
-  // in the compiler. See robin_hash::insert_value_impl for details.
-  std::string value;
-  std::string* value_ptr = &value;
-
-  tsl::robin_set<std::string*> set;
-  set.insert(value_ptr);
-  set.emplace(value_ptr);
-
-  BOOST_CHECK_EQUAL(set.size(), 1);
-  BOOST_CHECK_EQUAL(**set.begin(), value);
-}
-
-/**
- * serialize and deserialize
- */
-BOOST_AUTO_TEST_CASE(test_serialize_deserialize) {
-  // insert x values; delete some values; serialize set; deserialize in new set;
-  // check equal. for deserialization, test it with and without hash
-  // compatibility.
-  const std::size_t nb_values = 1000;
-
-  tsl::robin_set<move_only_test> set;
-  for (std::size_t i = 0; i < nb_values + 40; i++) {
-    set.insert(utils::get_key<move_only_test>(i));
-  }
-
-  for (std::size_t i = nb_values; i < nb_values + 40; i++) {
-    set.erase(utils::get_key<move_only_test>(i));
-  }
-  BOOST_CHECK_EQUAL(set.size(), nb_values);
-
-  serializer serial;
-  set.serialize(serial);
-
-  deserializer dserial(serial.str());
-  auto set_deserialized = decltype(set)::deserialize(dserial, true);
-  BOOST_CHECK(set == set_deserialized);
-
-  deserializer dserial2(serial.str());
-  set_deserialized = decltype(set)::deserialize(dserial2, false);
-  BOOST_CHECK(set_deserialized == set);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/utils.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/utils.h
deleted file mode 100644
index 697066f2f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tests/utils.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
- * MIT License
- *
- * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef TSL_UTILS_H
-#define TSL_UTILS_H
-
-#include <tsl/robin_hash.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <ostream>
-#include <string>
-#include <utility>
-
-#ifdef TSL_RH_NO_EXCEPTIONS
-#define TSL_RH_CHECK_THROW(S, E)
-#else
-#define TSL_RH_CHECK_THROW(S, E) BOOST_CHECK_THROW(S, E)
-#endif
-
-template <typename T>
-class identity_hash {
- public:
-  std::size_t operator()(const T& value) const {
-    return static_cast<std::size_t>(value);
-  }
-};
-
-template <unsigned int MOD>
-class mod_hash {
- public:
-  template <typename T>
-  std::size_t operator()(const T& value) const {
-    return std::hash<T>()(value) % MOD;
-  }
-};
-
-class self_reference_member_test {
- public:
-  self_reference_member_test()
-      : m_value(std::to_string(-1)), m_value_ptr(&m_value) {}
-
-  explicit self_reference_member_test(std::int64_t value)
-      : m_value(std::to_string(value)), m_value_ptr(&m_value) {}
-
-  self_reference_member_test(const self_reference_member_test& other)
-      : m_value(*other.m_value_ptr), m_value_ptr(&m_value) {}
-
-  self_reference_member_test(self_reference_member_test&& other)
-      : m_value(*other.m_value_ptr), m_value_ptr(&m_value) {}
-
-  self_reference_member_test& operator=(
-      const self_reference_member_test& other) {
-    m_value = *other.m_value_ptr;
-    m_value_ptr = &m_value;
-
-    return *this;
-  }
-
-  self_reference_member_test& operator=(self_reference_member_test&& other) {
-    m_value = *other.m_value_ptr;
-    m_value_ptr = &m_value;
-
-    return *this;
-  }
-
-  std::string value() const { return *m_value_ptr; }
-
-  friend std::ostream& operator<<(std::ostream& stream,
-                                  const self_reference_member_test& value) {
-    stream << *value.m_value_ptr;
-
-    return stream;
-  }
-
-  friend bool operator==(const self_reference_member_test& lhs,
-                         const self_reference_member_test& rhs) {
-    return *lhs.m_value_ptr == *rhs.m_value_ptr;
-  }
-
-  friend bool operator!=(const self_reference_member_test& lhs,
-                         const self_reference_member_test& rhs) {
-    return !(lhs == rhs);
-  }
-
-  friend bool operator<(const self_reference_member_test& lhs,
-                        const self_reference_member_test& rhs) {
-    return *lhs.m_value_ptr < *rhs.m_value_ptr;
-  }
-
- private:
-  std::string m_value;
-  std::string* m_value_ptr;
-};
-
-class move_only_test {
- public:
-  explicit move_only_test(std::int64_t value)
-      : m_value(new std::string(std::to_string(value))) {}
-
-  explicit move_only_test(std::string value)
-      : m_value(new std::string(std::move(value))) {}
-
-  move_only_test(const move_only_test&) = delete;
-  move_only_test(move_only_test&&) = default;
-  move_only_test& operator=(const move_only_test&) = delete;
-  move_only_test& operator=(move_only_test&&) = default;
-
-  friend std::ostream& operator<<(std::ostream& stream,
-                                  const move_only_test& value) {
-    if (value.m_value == nullptr) {
-      stream << "null";
-    } else {
-      stream << *value.m_value;
-    }
-
-    return stream;
-  }
-
-  friend bool operator==(const move_only_test& lhs, const move_only_test& rhs) {
-    if (lhs.m_value == nullptr || rhs.m_value == nullptr) {
-      return lhs.m_value == nullptr && rhs.m_value == nullptr;
-    } else {
-      return *lhs.m_value == *rhs.m_value;
-    }
-  }
-
-  friend bool operator!=(const move_only_test& lhs, const move_only_test& rhs) {
-    return !(lhs == rhs);
-  }
-
-  friend bool operator<(const move_only_test& lhs, const move_only_test& rhs) {
-    if (lhs.m_value == nullptr && rhs.m_value == nullptr) {
-      return false;
-    } else if (lhs.m_value == nullptr) {
-      return true;
-    } else if (rhs.m_value == nullptr) {
-      return false;
-    } else {
-      return *lhs.m_value < *rhs.m_value;
-    }
-  }
-
-  const std::string& value() const { return *m_value; }
-
- private:
-  std::unique_ptr<std::string> m_value;
-};
-
-class copy_only_test {
- public:
-  explicit copy_only_test(std::int64_t value)
-      : m_value(std::to_string(value)) {}
-
-  copy_only_test(const copy_only_test& other) : m_value(other.m_value) {}
-
-  copy_only_test& operator=(const copy_only_test& other) {
-    m_value = other.m_value;
-
-    return *this;
-  }
-
-  ~copy_only_test() {}
-
-  friend std::ostream& operator<<(std::ostream& stream,
-                                  const copy_only_test& value) {
-    stream << value.m_value;
-
-    return stream;
-  }
-
-  friend bool operator==(const copy_only_test& lhs, const copy_only_test& rhs) {
-    return lhs.m_value == rhs.m_value;
-  }
-
-  friend bool operator!=(const copy_only_test& lhs, const copy_only_test& rhs) {
-    return !(lhs == rhs);
-  }
-
-  friend bool operator<(const copy_only_test& lhs, const copy_only_test& rhs) {
-    return lhs.m_value < rhs.m_value;
-  }
-
-  std::string value() const { return m_value; }
-
- private:
-  std::string m_value;
-};
-
-namespace std {
-template <>
-struct hash<self_reference_member_test> {
-  std::size_t operator()(const self_reference_member_test& val) const {
-    return std::hash<std::string>()(val.value());
-  }
-};
-
-template <>
-struct hash<move_only_test> {
-  std::size_t operator()(const move_only_test& val) const {
-    return std::hash<std::string>()(val.value());
-  }
-};
-
-template <>
-struct hash<copy_only_test> {
-  std::size_t operator()(const copy_only_test& val) const {
-    return std::hash<std::string>()(val.value());
-  }
-};
-}  // namespace std
-
-class utils {
- public:
-  template <typename T>
-  static T get_key(std::size_t counter);
-
-  template <typename T>
-  static T get_value(std::size_t counter);
-
-  template <typename HMap>
-  static HMap get_filled_hash_map(std::size_t nb_elements);
-};
-
-template <>
-inline std::int32_t utils::get_key<std::int32_t>(std::size_t counter) {
-  return tsl::detail_robin_hash::numeric_cast<std::int32_t>(counter);
-}
-
-template <>
-inline std::int64_t utils::get_key<std::int64_t>(std::size_t counter) {
-  return tsl::detail_robin_hash::numeric_cast<std::int64_t>(counter);
-}
-
-template <>
-inline self_reference_member_test utils::get_key<self_reference_member_test>(
-    std::size_t counter) {
-  return self_reference_member_test(
-      tsl::detail_robin_hash::numeric_cast<std::int64_t>(counter));
-}
-
-template <>
-inline std::string utils::get_key<std::string>(std::size_t counter) {
-  return "Key " + std::to_string(counter);
-}
-
-template <>
-inline move_only_test utils::get_key<move_only_test>(std::size_t counter) {
-  return move_only_test(
-      tsl::detail_robin_hash::numeric_cast<std::int64_t>(counter));
-}
-
-template <>
-inline copy_only_test utils::get_key<copy_only_test>(std::size_t counter) {
-  return copy_only_test(
-      tsl::detail_robin_hash::numeric_cast<std::int64_t>(counter));
-}
-
-template <>
-inline std::int32_t utils::get_value<std::int32_t>(std::size_t counter) {
-  return tsl::detail_robin_hash::numeric_cast<std::int32_t>(counter * 2);
-}
-
-template <>
-inline std::int64_t utils::get_value<std::int64_t>(std::size_t counter) {
-  return tsl::detail_robin_hash::numeric_cast<std::int64_t>(counter * 2);
-}
-
-template <>
-inline self_reference_member_test utils::get_value<self_reference_member_test>(
-    std::size_t counter) {
-  return self_reference_member_test(
-      tsl::detail_robin_hash::numeric_cast<std::int64_t>(counter * 2));
-}
-
-template <>
-inline std::string utils::get_value<std::string>(std::size_t counter) {
-  return "Value " + std::to_string(counter);
-}
-
-template <>
-inline move_only_test utils::get_value<move_only_test>(std::size_t counter) {
-  return move_only_test(
-      tsl::detail_robin_hash::numeric_cast<std::int64_t>(counter * 2));
-}
-
-template <>
-inline copy_only_test utils::get_value<copy_only_test>(std::size_t counter) {
-  return copy_only_test(
-      tsl::detail_robin_hash::numeric_cast<std::int64_t>(counter * 2));
-}
-
-template <typename HMap>
-inline HMap utils::get_filled_hash_map(std::size_t nb_elements) {
-  using key_t = typename HMap::key_type;
-  using value_t = typename HMap::mapped_type;
-
-  HMap map;
-  map.reserve(nb_elements);
-
-  for (std::size_t i = 0; i < nb_elements; i++) {
-    map.insert({utils::get_key<key_t>(i), utils::get_value<value_t>(i)});
-  }
-
-  return map;
-}
-
-template <class T>
-struct is_pair : std::false_type {};
-
-template <class T1, class T2>
-struct is_pair<std::pair<T1, T2>> : std::true_type {};
-
-/**
- * serializer helper to test serialize(...) and deserialize(...) functions
- */
-class serializer {
- public:
-  serializer() { m_ostream.exceptions(m_ostream.badbit | m_ostream.failbit); }
-
-  template <class T>
-  void operator()(const T& val) {
-    serialize_impl(val);
-  }
-
-  std::string str() const { return m_ostream.str(); }
-
- private:
-  template <typename T, typename U>
-  void serialize_impl(const std::pair<T, U>& val) {
-    serialize_impl(val.first);
-    serialize_impl(val.second);
-  }
-
-  void serialize_impl(const std::string& val) {
-    serialize_impl(
-        tsl::detail_robin_hash::numeric_cast<std::uint64_t>(val.size()));
-    m_ostream.write(val.data(), val.size());
-  }
-
-  void serialize_impl(const move_only_test& val) {
-    serialize_impl(val.value());
-  }
-
-  template <class T, typename std::enable_if<
-                         std::is_arithmetic<T>::value>::type* = nullptr>
-  void serialize_impl(const T& val) {
-    m_ostream.write(reinterpret_cast<const char*>(&val), sizeof(val));
-  }
-
- private:
-  std::stringstream m_ostream;
-};
-
-class deserializer {
- public:
-  explicit deserializer(const std::string& init_str = "")
-      : m_istream(init_str) {
-    m_istream.exceptions(m_istream.badbit | m_istream.failbit |
-                         m_istream.eofbit);
-  }
-
-  template <class T>
-  T operator()() {
-    return deserialize_impl<T>();
-  }
-
- private:
-  template <class T,
-            typename std::enable_if<is_pair<T>::value>::type* = nullptr>
-  T deserialize_impl() {
-    auto first = deserialize_impl<typename T::first_type>();
-    return std::make_pair(std::move(first),
-                          deserialize_impl<typename T::second_type>());
-  }
-
-  template <class T, typename std::enable_if<
-                         std::is_same<std::string, T>::value>::type* = nullptr>
-  T deserialize_impl() {
-    const std::size_t str_size =
-        tsl::detail_robin_hash::numeric_cast<std::size_t>(
-            deserialize_impl<std::uint64_t>());
-
-    // TODO std::string::data() return a const pointer pre-C++17. Avoid the
-    // inefficient double allocation.
-    std::vector<char> chars(str_size);
-    m_istream.read(chars.data(), str_size);
-
-    return std::string(chars.data(), chars.size());
-  }
-
-  template <class T, typename std::enable_if<std::is_same<
-                         move_only_test, T>::value>::type* = nullptr>
-  move_only_test deserialize_impl() {
-    return move_only_test(deserialize_impl<std::string>());
-  }
-
-  template <class T, typename std::enable_if<
-                         std::is_arithmetic<T>::value>::type* = nullptr>
-  T deserialize_impl() {
-    T val;
-    m_istream.read(reinterpret_cast<char*>(&val), sizeof(val));
-
-    return val;
-  }
-
- private:
-  std::stringstream m_istream;
-};
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tsl-robin-map.natvis b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tsl-robin-map.natvis
deleted file mode 100644
index f6eb842e2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/ext/robin_map/tsl-robin-map.natvis
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-    <!-- Written in VC 2017 15.7 but is expected to be compatible with VC 2015 -->
-
-    <!-- Visualization that shows the index in the name column and the key-value pair in the value column -->
-    <Type Name="tsl::robin_map&lt;*&gt;" Priority="Medium">
-        <AlternativeType Name="tsl::robin_set&lt;*&gt;"/>
-        <DisplayString>{{ size={m_ht.m_nb_elements} }}</DisplayString>
-        <Expand>
-            <Item Name="[bucket_count]" IncludeView="detailed">m_ht.m_buckets_data._Mypair._Myval2._Mylast - m_ht.m_buckets_data._Mypair._Myval2._Myfirst</Item>
-            <Item Name="[load_factor]" Condition="m_ht.m_buckets_data._Mypair._Myval2._Myfirst != m_ht.m_buckets_data._Mypair._Myval2._Mylast" IncludeView="detailed">
-                ((float)m_ht.m_nb_elements) / ((float)(m_ht.m_buckets_data._Mypair._Myval2._Mylast - m_ht.m_buckets_data._Mypair._Myval2._Myfirst))
-            </Item>
-            <Item Name="[load_factor]" Condition="m_ht.m_buckets_data._Mypair._Myval2._Myfirst == m_ht.m_buckets_data._Mypair._Myval2._Mylast" IncludeView="detailed">
-                0
-            </Item>
-            <Item Name="[max_load_factor]" IncludeView="detailed">m_ht.m_max_load_factor</Item>
-            <CustomListItems>
-                <Variable Name="bucket" InitialValue="m_ht.m_buckets"/>
-
-                <Size>m_ht.m_nb_elements</Size>
-                <Loop>
-                    <Item Condition="bucket-&gt;m_dist_from_ideal_bucket != -1">*bucket</Item>
-                    <Break Condition="bucket-&gt;m_last_bucket"/>
-                    <Exec>++bucket</Exec>
-                </Loop>
-            </CustomListItems>
-        </Expand>
-    </Type>
-
-    <!-- Visualization that shows the key in the name column and the key-value pair in the value column -->
-    <Type Name="tsl::robin_map&lt;*&gt;" ExcludeView="ShowElementsByIndex" Priority="MediumHigh">
-        <DisplayString>{{ size={m_ht.m_nb_elements} }}</DisplayString>
-        <Expand>
-            <Item Name="[bucket_count]" IncludeView="detailed">m_ht.m_buckets_data._Mypair._Myval2._Mylast - m_ht.m_buckets_data._Mypair._Myval2._Myfirst</Item>
-            <Item Name="[load_factor]" Condition="m_ht.m_buckets_data._Mypair._Myval2._Myfirst != m_ht.m_buckets_data._Mypair._Myval2._Mylast" IncludeView="detailed">
-                ((float)m_ht.m_nb_elements) / ((float)(m_ht.m_buckets_data._Mypair._Myval2._Mylast - m_ht.m_buckets_data._Mypair._Myval2._Myfirst))
-            </Item>
-            <Item Name="[load_factor]" Condition="m_ht.m_buckets_data._Mypair._Myval2._Myfirst == m_ht.m_buckets_data._Mypair._Myval2._Mylast" IncludeView="detailed">
-                0
-            </Item>
-            <Item Name="[max_load_factor]" IncludeView="detailed">m_ht.m_max_load_factor</Item>
-            <CustomListItems>
-                <Variable Name="bucket" InitialValue="m_ht.m_buckets"/>
-
-                <Size>m_ht.m_nb_elements</Size>
-                <Loop>
-                    <Item Condition="bucket-&gt;m_dist_from_ideal_bucket != -1" Name="[{reinterpret_cast&lt;std::pair&lt;$T1,$T2&gt;*&gt;(&amp;bucket->m_value)->first}]">*bucket</Item>
-                    <Break Condition="bucket-&gt;m_last_bucket"/>
-                    <Exec>++bucket</Exec>
-                </Loop>
-            </CustomListItems>
-        </Expand>
-    </Type>
-
-    <Type Name="tsl::detail_robin_hash::robin_hash&lt;*&gt;::robin_iterator&lt;*&gt;">
-        <DisplayString>{*m_bucket}</DisplayString>
-        <Expand>
-            <ExpandedItem>*m_bucket</ExpandedItem>
-        </Expand>
-    </Type>
-
-    <Type Name="tsl::detail_robin_hash::bucket_entry&lt;*&gt;">
-        <DisplayString Condition="m_dist_from_ideal_bucket == -1">empty</DisplayString>
-        <DisplayString Condition="m_dist_from_ideal_bucket != -1">{*reinterpret_cast&lt;$T1*&gt;(&amp;m_value)}</DisplayString>
-        <Expand>
-            <ExpandedItem Condition="m_dist_from_ideal_bucket != -1">*reinterpret_cast&lt;$T1*&gt;(&amp;m_value)</ExpandedItem>
-        </Expand>
-    </Type>
-
-    <Type Name="tsl::detail_robin_hash::bucket_entry&lt;*&gt;" IncludeView="MapHelper">
-        <DisplayString Condition="m_dist_from_ideal_bucket == -1">empty</DisplayString>
-        <DisplayString Condition="m_dist_from_ideal_bucket != -1">{reinterpret_cast&lt;$T1*&gt;(&amp;m_value)->second}</DisplayString>
-        <Expand>
-            <ExpandedItem Condition="m_dist_from_ideal_bucket != -1">*reinterpret_cast&lt;$T1*&gt;(&amp;m_value)</ExpandedItem>
-        </Expand>
-    </Type>
-</AutoVisualizer>
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nanobind.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nanobind.h
deleted file mode 100644
index 75b7d8028..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nanobind.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    nanobind/nanobind.h: Main include file for core nanobind components
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#if __cplusplus < 201703L && (!defined(_MSVC_LANG) || _MSVC_LANG < 201703L)
-#  error The nanobind library requires C++17!
-#endif
-
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  pragma warning(disable: 4702) // unreachable code (e.g. when binding a noreturn function)
-   // The next two lines disable warnings that are "just noise" according to Stephan T. Lavavej (a MSFT STL maintainer)
-#  pragma warning(disable: 4275) // non dll-interface class 'std::exception' used as base for dll-interface class [..]
-#  pragma warning(disable: 4251) // [..] needs to have a dll-interface to be used by clients of class [..]
-#endif
-
-#define NB_VERSION_MAJOR 0
-#define NB_VERSION_MINOR 0
-#define NB_VERSION_PATCH 5
-
-// Core C++ headers that nanobind depends on
-#include <cstdint>
-#include <stdexcept>
-#include <type_traits>
-#include <typeinfo>
-#include <utility>
-#include <new>
-
-// Implementation. The nb_*.h files should only be included through nanobind.h
-#include "nb_python.h"
-#include "nb_defs.h"
-#include "nb_enums.h"
-#include "nb_traits.h"
-#include "nb_tuple.h"
-#include "nb_lib.h"
-#include "nb_descr.h"
-#include "nb_types.h"
-#include "nb_accessor.h"
-#include "nb_error.h"
-#include "nb_attr.h"
-#include "nb_cast.h"
-#include "nb_call.h"
-#include "nb_func.h"
-#include "nb_class.h"
-#include "nb_misc.h"
-
-#if defined(_MSC_VER)
-#  pragma warning(pop)
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_accessor.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_accessor.h
deleted file mode 100644
index 9e957219a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_accessor.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-    nanobind/nb_accessor.h: Accessor helper class for .attr(), operator[]
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-template <typename Impl> class accessor : public api<accessor<Impl>> {
-public:
-    static constexpr auto Name = const_name("object");
-
-    template <typename Key>
-    accessor(handle obj, Key &&key)
-        : m_base(obj.ptr()), m_key(std::move(key)) { }
-    accessor(const accessor &) = delete;
-    accessor(accessor &&) = delete;
-    ~accessor() {
-        if constexpr (Impl::cache_dec_ref)
-            Py_XDECREF(m_cache);
-    }
-
-    template <typename T> accessor& operator=(T &&value);
-
-    template <typename T, enable_if_t<std::is_base_of_v<object, T>> = 0>
-    operator T() const { return borrow<T>(ptr()); }
-    NB_INLINE PyObject *ptr() const {
-        Impl::get(m_base, m_key, &m_cache);
-        return m_cache;
-    }
-    NB_INLINE handle base() const { return m_base; }
-    NB_INLINE object key() const { return steal(Impl::key(m_key)); }
-
-private:
-    PyObject *m_base;
-    mutable PyObject *m_cache{nullptr};
-    typename Impl::key_type m_key;
-};
-
-struct str_attr {
-    static constexpr bool cache_dec_ref = true;
-    using key_type = const char *;
-
-    NB_INLINE static void get(PyObject *obj, const char *key, PyObject **cache) {
-        detail::getattr_maybe(obj, key, cache);
-    }
-
-    NB_INLINE static void set(PyObject *obj, const char *key, PyObject *v) {
-        setattr(obj, key, v);
-    }
-
-    NB_INLINE static PyObject *key(const char *key) {
-        return PyUnicode_InternFromString(key);
-    }
-};
-
-struct obj_attr {
-    static constexpr bool cache_dec_ref = true;
-    using key_type = handle;
-
-    NB_INLINE static void get(PyObject *obj, handle key, PyObject **cache) {
-        detail::getattr_maybe(obj, key.ptr(), cache);
-    }
-
-    NB_INLINE static void set(PyObject *obj, handle key, PyObject *v) {
-        setattr(obj, key.ptr(), v);
-    }
-
-    NB_INLINE static PyObject *key(handle key) {
-        Py_INCREF(key.ptr());
-        return key.ptr();
-    }
-};
-
-struct str_item {
-    static constexpr bool cache_dec_ref = true;
-    using key_type = const char *;
-
-    NB_INLINE static void get(PyObject *obj, const char *key, PyObject **cache) {
-        detail::getitem_maybe(obj, key, cache);
-    }
-
-    NB_INLINE static void set(PyObject *obj, const char *key, PyObject *v) {
-        setitem(obj, key, v);
-    }
-};
-
-struct obj_item {
-    static constexpr bool cache_dec_ref = true;
-    using key_type = handle;
-
-    NB_INLINE static void get(PyObject *obj, handle key, PyObject **cache) {
-        detail::getitem_maybe(obj, key.ptr(), cache);
-    }
-
-    NB_INLINE static void set(PyObject *obj, handle key, PyObject *v) {
-        setitem(obj, key.ptr(), v);
-    }
-};
-
-struct num_item {
-    static constexpr bool cache_dec_ref = true;
-    using key_type = Py_ssize_t;
-
-    NB_INLINE static void get(PyObject *obj, Py_ssize_t index, PyObject **cache) {
-        detail::getitem_maybe(obj, index, cache);
-    }
-
-    NB_INLINE static void set(PyObject *obj, Py_ssize_t index, PyObject *v) {
-        setitem(obj, index, v);
-    }
-};
-
-struct num_item_list {
-    static constexpr bool cache_dec_ref = false;
-    using key_type = Py_ssize_t;
-
-    NB_INLINE static void get(PyObject *obj, Py_ssize_t index, PyObject **cache) {
-        *cache = NB_LIST_GET_ITEM(obj, index);
-    }
-
-    NB_INLINE static void set(PyObject *obj, Py_ssize_t index, PyObject *v) {
-        PyObject *old = NB_LIST_GET_ITEM(obj, index);
-        Py_INCREF(v);
-        NB_LIST_SET_ITEM(obj, index, v);
-        Py_DECREF(old);
-    }
-};
-
-struct num_item_tuple {
-    static constexpr bool cache_dec_ref = false;
-    using key_type = Py_ssize_t;
-
-    NB_INLINE static void get(PyObject *obj, Py_ssize_t index, PyObject **cache) {
-        *cache = NB_TUPLE_GET_ITEM(obj, index);
-    }
-
-    template <typename...Ts> static void set(Ts...) {
-        static_assert(false_v<Ts...>, "tuples are immutable!");
-    }
-};
-
-template <typename D> accessor<obj_attr> api<D>::attr(handle key) const {
-    return { derived(), borrow(key) };
-}
-
-template <typename D> accessor<str_attr> api<D>::attr(const char *key) const {
-    return { derived(), key };
-}
-
-template <typename D> accessor<obj_item> api<D>::operator[](handle key) const {
-    return { derived(), borrow(key) };
-}
-
-template <typename D> accessor<str_item> api<D>::operator[](const char *key) const {
-    return { derived(), key };
-}
-
-template <typename D>
-template <typename T, enable_if_t<std::is_arithmetic_v<T>>>
-accessor<num_item> api<D>::operator[](T index) const {
-    return { derived(), (Py_ssize_t) index };
-}
-
-NAMESPACE_END(detail)
-
-template <typename T, detail::enable_if_t<std::is_arithmetic_v<T>>>
-detail::accessor<detail::num_item_list> list::operator[](T index) const {
-    return { derived(), (Py_ssize_t) index };
-}
-
-template <typename T, detail::enable_if_t<std::is_arithmetic_v<T>>>
-detail::accessor<detail::num_item_tuple> tuple::operator[](T index) const {
-    return { derived(), (Py_ssize_t) index };
-}
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_attr.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_attr.h
deleted file mode 100644
index 3050990da..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_attr.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-    nanobind/nb_attr.h: Annotations for function and class declarations
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-
-struct scope {
-    PyObject *value;
-    NB_INLINE scope(handle value) : value(value.ptr()) {}
-};
-
-struct name {
-    const char *value;
-    NB_INLINE name(const char *value) : value(value) {}
-};
-
-struct arg_v;
-struct arg {
-    NB_INLINE constexpr explicit arg(const char *name = nullptr) : name(name) {}
-    template <typename T> NB_INLINE arg_v operator=(T &&value) const;
-    NB_INLINE arg &noconvert(bool value = true) {
-        convert_ = !value;
-        return *this;
-    }
-    NB_INLINE arg &none(bool value = true) {
-        none_ = value;
-        return *this;
-    }
-
-    const char *name;
-    uint8_t convert_{ true };
-    bool none_{ false };
-};
-
-struct arg_v : arg {
-    object value;
-    NB_INLINE arg_v(const arg &base, object &&value)
-        : arg(base), value(std::move(value)) {}
-};
-
-template <typename... Ts> struct call_guard {
-    using type = detail::tuple<Ts...>;
-};
-
-struct dynamic_attr {};
-struct is_method {};
-struct is_implicit {};
-struct is_operator {};
-struct is_arithmetic {};
-struct is_final {};
-struct is_enum { bool is_signed; };
-
-template <size_t /* Nurse */, size_t /* Patient */> struct keep_alive {};
-template <typename T> struct supplement {};
-template <typename T> struct intrusive_ptr {
-    intrusive_ptr(void (*set_self_py)(T *, PyObject *))
-        : set_self_py(set_self_py) {}
-    void (*set_self_py)(T *, PyObject *);
-};
-
-struct type_callback {
-    type_callback(void (*value)(PyType_Slot **) noexcept) : value(value) {}
-    void (*value)(PyType_Slot **) noexcept;
-};
-struct raw_doc {
-    const char *value;
-    raw_doc(const char *doc) : value(doc) {}
-};
-
-NAMESPACE_BEGIN(literals)
-constexpr arg operator"" _a(const char *name, size_t) { return arg(name); }
-NAMESPACE_END(literals)
-
-NAMESPACE_BEGIN(detail)
-
-enum class func_flags : uint32_t {
-    /* Low 3 bits reserved for return value policy */
-
-    /// Did the user specify a name for this function, or is it anonymous?
-    has_name = (1 << 4),
-    /// Did the user specify a scope where this function should be installed?
-    has_scope = (1 << 5),
-    /// Did the user specify a docstring?
-    has_doc = (1 << 6),
-    /// Did the user specify nb::arg/arg_v annotations for all arguments?
-    has_args = (1 << 7),
-    /// Does the function signature contain an *args-style argument?
-    has_var_args = (1 << 8),
-    /// Does the function signature contain an *kwargs-style argument?
-    has_var_kwargs = (1 << 9),
-    /// Is this function a class method?
-    is_method = (1 << 10),
-    /// Is this function a method called __init__? (automatically generated)
-    is_constructor = (1 << 11),
-    /// Can this constructor be used to perform an implicit conversion?
-    is_implicit = (1 << 12),
-    /// Is this function an arithmetic operator?
-    is_operator = (1 << 13),
-    /// When the function is GCed, do we need to call func_data_prelim::free?
-    has_free = (1 << 14),
-    /// Should the func_new() call return a new reference?
-    return_ref = (1 << 15),
-    /// Does this overload specify a raw docstring that should take precedence?
-    raw_doc = (1 << 16)
-};
-
-struct arg_data {
-    const char *name;
-    PyObject *name_py;
-    PyObject *value;
-    bool convert;
-    bool none;
-};
-
-template <size_t Size> struct func_data_prelim {
-    // A small amount of space to capture data used by the function/closure
-    void *capture[3];
-
-    // Callback to clean up the 'capture' field
-    void (*free)(void *);
-
-    /// Implementation of the function call
-    PyObject *(*impl)(void *, PyObject **, uint8_t *, rv_policy,
-                      cleanup_list *);
-
-    /// Function signature description
-    const char *descr;
-
-    /// C++ types referenced by 'descr'
-    const std::type_info **descr_types;
-
-    /// Supplementary flags
-    uint32_t flags;
-
-    /// Total number of function call arguments
-    uint32_t nargs;
-
-    // ------- Extra fields -------
-
-    const char *name;
-    const char *doc;
-    PyObject *scope;
-
-#if defined(_MSC_VER)
-    arg_data args[Size == 0 ? 1 : Size];
-#else
-    arg_data args[Size];
-#endif
-};
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, const name &name, size_t &) {
-    f.name = name.value;
-    f.flags |= (uint32_t) func_flags::has_name;
-}
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, const scope &scope, size_t &) {
-    f.scope = scope.value;
-    f.flags |= (uint32_t) func_flags::has_scope;
-}
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, const raw_doc &d, size_t &) {
-    f.flags |= (uint32_t) func_flags::has_doc | (uint32_t) func_flags::raw_doc;
-    f.doc = d.value;
-}
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, const char *doc, size_t &) {
-    f.doc = doc;
-    f.flags |= (uint32_t) func_flags::has_doc;
-}
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, is_method, size_t &) {
-    f.flags |= (uint32_t) func_flags::is_method;
-}
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, is_implicit, size_t &) {
-    f.flags |= (uint32_t) func_flags::is_implicit;
-}
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, is_operator, size_t &) {
-    f.flags |= (uint32_t) func_flags::is_operator;
-}
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, rv_policy pol, size_t &) {
-    f.flags = (f.flags & ~0b11) | (uint16_t) pol;
-}
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, const arg &a, size_t &index) {
-    arg_data &arg = f.args[index++];
-    arg.name = a.name;
-    arg.value = nullptr;
-    arg.convert = a.convert_;
-    arg.none = a.none_;
-}
-
-template <typename F>
-NB_INLINE void func_extra_apply(F &f, const arg_v &a, size_t &index) {
-    arg_data &arg = f.args[index++];
-    arg.name = a.name;
-    arg.value = a.value.ptr();
-    arg.convert = a.convert_;
-    arg.none = a.none_;
-}
-
-template <typename F, typename... Ts>
-NB_INLINE void func_extra_apply(F &, call_guard<Ts...>, size_t &) {}
-
-template <typename F, size_t Nurse, size_t Patient>
-NB_INLINE void func_extra_apply(F &, nanobind::keep_alive<Nurse, Patient>,
-                                size_t &) {}
-
-template <typename... Ts> struct extract_guard { using type = void; };
-
-template <typename T, typename... Ts> struct extract_guard<T, Ts...> {
-    using type = typename extract_guard<Ts...>::type;
-};
-
-template <typename... Cs, typename... Ts>
-struct extract_guard<call_guard<Cs...>, Ts...> {
-    static_assert(std::is_same_v<typename extract_guard<Ts...>::type, void>,
-                  "call_guard<> can only be specified once!");
-    using type = call_guard<Cs...>;
-};
-
-template <typename T>
-NB_INLINE void process_keep_alive(PyObject **, PyObject *, T *) {}
-
-template <size_t Nurse, size_t Patient>
-NB_INLINE void
-process_keep_alive(PyObject **args, PyObject *result,
-                   nanobind::keep_alive<Nurse, Patient> *) noexcept {
-    keep_alive(Nurse == 0 ? result : args[Nurse - 1],
-               Patient == 0 ? result : args[Patient - 1]);
-}
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_call.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_call.h
deleted file mode 100644
index f23e84d6e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_call.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-    nanobind/nb_call.h: Functionality for calling Python functions from C++
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-class kwargs_proxy : public handle {
-public:
-    explicit kwargs_proxy(handle h) : handle(h) { }
-};
-
-class args_proxy : public handle {
-public:
-    explicit args_proxy(handle h) : handle(h) { }
-    kwargs_proxy operator*() const { return kwargs_proxy(*this); }
-};
-
-template <typename Derived>
-args_proxy api<Derived>::operator*() const {
-    return args_proxy(derived().ptr());
-}
-
-/// Implementation detail of api<T>::operator() (call operator)
-template <typename T>
-NB_INLINE void call_analyze(size_t &nargs, size_t &nkwargs, const T &value) {
-    using D = std::decay_t<T>;
-
-    if constexpr (std::is_same_v<D, arg_v>)
-        nkwargs++;
-    else if constexpr (std::is_same_v<D, args_proxy>)
-        nargs += len(value);
-    else if constexpr (std::is_same_v<D, kwargs_proxy>)
-        nkwargs += len(value);
-    else
-        nargs += 1;
-
-    (void) nargs; (void) nkwargs; (void) value;
-}
-
-/// Implementation detail of api<T>::operator() (call operator)
-template <rv_policy policy, typename T>
-NB_INLINE void call_init(PyObject **args, PyObject *kwnames, size_t &nargs,
-                         size_t &nkwargs, const size_t kwargs_offset,
-                         T &&value) {
-    using D = std::decay_t<T>;
-
-    if constexpr (std::is_same_v<D, arg_v>) {
-        args[kwargs_offset + nkwargs] = value.value.release().ptr();
-        NB_TUPLE_SET_ITEM(kwnames, nkwargs++,
-                         PyUnicode_InternFromString(value.name));
-    } else if constexpr (std::is_same_v<D, args_proxy>) {
-        for (size_t i = 0, l = len(value); i < l; ++i)
-            args[nargs++] = borrow(value[i]).release().ptr();
-    } else if constexpr (std::is_same_v<D, kwargs_proxy>) {
-        PyObject *key, *entry;
-        Py_ssize_t pos = 0;
-
-        while (PyDict_Next(value.ptr(), &pos, &key, &entry)) {
-            Py_INCREF(key); Py_INCREF(entry);
-            args[kwargs_offset + nkwargs] = entry;
-            NB_TUPLE_SET_ITEM(kwnames, nkwargs++, key);
-        }
-    } else {
-        args[nargs++] =
-            make_caster<T>::from_cpp((forward_t<T>) value,
-                                     detail::infer_policy<T>(policy), nullptr).ptr();
-    }
-    (void) args; (void) kwnames; (void) nargs;
-    (void) nkwargs; (void) kwargs_offset;
-}
-
-#define NB_DO_VECTORCALL()                                                     \
-    PyObject *base, **args_p;                                                  \
-    if constexpr (method_call) {                                               \
-        base = derived().key().release().ptr();                                \
-        args[0] = derived().base().inc_ref().ptr();                            \
-        args_p = args;                                                         \
-        nargs++;                                                               \
-    } else {                                                                   \
-        base = derived().inc_ref().ptr();                                      \
-        args[0] = nullptr;                                                     \
-        args_p = args + 1;                                                     \
-    }                                                                          \
-    nargs |= NB_VECTORCALL_ARGUMENTS_OFFSET;                                   \
-    return steal(obj_vectorcall(base, args_p, nargs, kwnames, method_call))
-
-template <typename Derived>
-template <rv_policy policy, typename... Args>
-object api<Derived>::operator()(Args &&...args_) const {
-    static constexpr bool method_call =
-        std::is_same_v<Derived, accessor<obj_attr>> ||
-        std::is_same_v<Derived, accessor<str_attr>>;
-
-    if constexpr (((std::is_same_v<Args, arg_v> ||
-                    std::is_same_v<Args, args_proxy> ||
-                    std::is_same_v<Args, kwargs_proxy>) || ...)) {
-        // Complex call with keyword arguments, *args/**kwargs expansion, etc.
-        size_t nargs = 0, nkwargs = 0, nargs2 = 0, nkwargs2 = 0;
-
-        // Determine storage requirements for positional and keyword args
-        (call_analyze(nargs, nkwargs, (const Args &) args_), ...);
-
-        // Allocate memory on the stack
-        PyObject **args =
-            (PyObject **) alloca((nargs + nkwargs + 1) * sizeof(PyObject *));
-        PyObject *kwnames =
-            nkwargs ? PyTuple_New((Py_ssize_t) nkwargs) : nullptr;
-
-        // Fill 'args' and 'kwnames' variables
-        (call_init<policy>(args + 1, kwnames, nargs2, nkwargs2, nargs,
-                           (forward_t<Args>) args_), ...);
-
-        NB_DO_VECTORCALL();
-    } else {
-        // Simple version with only positional arguments
-        PyObject *args[sizeof...(Args) + 1], *kwnames = nullptr;
-        size_t nargs = 0;
-
-        ((args[1 + nargs++] =
-              detail::make_caster<Args>::from_cpp(
-                  (detail::forward_t<Args>) args_, policy, nullptr)
-                  .ptr()),
-         ...);
-
-        NB_DO_VECTORCALL();
-    }
-}
-
-#undef NB_DO_VECTORCALL
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_cast.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_cast.h
deleted file mode 100644
index a24a1b5f7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_cast.h
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
-    nanobind/nb_cast.h: Type caster interface and essential type casters
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#define NB_TYPE_CASTER(Value_, descr)                                          \
-    using Value = Value_;                                                      \
-    static constexpr bool IsClass = false;                                     \
-    static constexpr auto Name = descr;                                        \
-    template <typename T_> using Cast = movable_cast_t<T_>;                    \
-    static handle from_cpp(Value *p, rv_policy policy, cleanup_list *list) {   \
-        if (!p)                                                                \
-            return none().release();                                           \
-        return from_cpp(*p, policy, list);                                     \
-    }                                                                          \
-    explicit operator Value *() { return &value; }                             \
-    explicit operator Value &() { return value; }                              \
-    explicit operator Value &&() && { return (Value &&) value; }               \
-    Value value;
-
-#define NB_MAKE_OPAQUE(...)                                                    \
-    namespace nanobind::detail {                                               \
-    template <> class type_caster<__VA_ARGS__>                                 \
-        : public type_caster_base<__VA_ARGS__> { }; }
-
-#define NB_TYPE(...) __VA_ARGS__
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-enum cast_flags : uint8_t {
-    // Enable implicit conversions (impl. assumes this is 1, don't reorder..)
-    convert = (1 << 0),
-
-    // Passed to the 'self' argument in a constructor call (__init__)
-    construct = (1 << 1)
-};
-
-template <typename T> using cast_t = typename make_caster<T>::template Cast<T>;
-
-template <typename T>
-using simple_cast_t =
-    std::conditional_t<is_pointer_v<T>, intrinsic_t<T> *, intrinsic_t<T> &>;
-
-template <typename T>
-using movable_cast_t =
-    std::conditional_t<is_pointer_v<T>, intrinsic_t<T> *,
-                       std::conditional_t<std::is_rvalue_reference_v<T>,
-                                          intrinsic_t<T> &&, intrinsic_t<T> &>>;
-
-template <typename T>
-struct type_caster<T, enable_if_t<std::is_arithmetic_v<T> && !is_std_char_v<T>>> {
-public:
-    NB_INLINE bool from_python(handle src, uint8_t flags, cleanup_list *) noexcept {
-        std::pair<T, bool> result;
-
-        if constexpr (std::is_floating_point_v<T>) {
-            if constexpr (sizeof(T) == 8)
-                result = detail::load_f64(src.ptr(), flags);
-            else
-                result = detail::load_f32(src.ptr(), flags);
-        } else {
-            if constexpr (std::is_signed_v<T>) {
-                if constexpr (sizeof(T) == 8)
-                    result = detail::load_i64(src.ptr(), flags);
-                else if constexpr (sizeof(T) == 4)
-                    result = detail::load_i32(src.ptr(), flags);
-                else if constexpr (sizeof(T) == 2)
-                    result = detail::load_i16(src.ptr(), flags);
-                else
-                    result = detail::load_i8(src.ptr(), flags);
-            } else {
-                if constexpr (sizeof(T) == 8)
-                    result = detail::load_u64(src.ptr(), flags);
-                else if constexpr (sizeof(T) == 4)
-                    result = detail::load_u32(src.ptr(), flags);
-                else if constexpr (sizeof(T) == 2)
-                    result = detail::load_u16(src.ptr(), flags);
-                else
-                    result = detail::load_u8(src.ptr(), flags);
-            }
-        }
-
-        value = result.first;
-        return result.second;
-    }
-
-    NB_INLINE static handle from_cpp(T src, rv_policy, cleanup_list *) noexcept {
-        if constexpr (std::is_floating_point_v<T>) {
-            return PyFloat_FromDouble((double) src);
-        } else {
-            if constexpr (std::is_signed_v<T>) {
-                if constexpr (sizeof(T) <= sizeof(long))
-                    return PyLong_FromLong((long) src);
-                else
-                    return PyLong_FromLongLong((long long) src);
-            } else {
-                if constexpr (sizeof(T) <= sizeof(unsigned long))
-                    return PyLong_FromUnsignedLong((unsigned long) src);
-                else
-                    return PyLong_FromUnsignedLongLong((unsigned long long) src);
-            }
-        }
-    }
-
-    NB_TYPE_CASTER(T, const_name<std::is_integral_v<T>>("int", "float"));
-};
-
-template <> struct type_caster<void_type> {
-    static constexpr auto Name = const_name("None");
-};
-
-template <> struct type_caster<std::nullptr_t> {
-    bool from_python(handle src, uint8_t, cleanup_list *) noexcept {
-        if (src.is_none())
-            return true;
-        return false;
-    }
-
-    static handle from_cpp(std::nullptr_t, rv_policy, cleanup_list *) noexcept {
-        return none().inc_ref();
-    }
-
-    NB_TYPE_CASTER(std::nullptr_t, const_name("None"));
-};
-
-template <> struct type_caster<bool> {
-    bool from_python(handle src, uint8_t, cleanup_list *) noexcept {
-        if (src.ptr() == Py_True) {
-            value = true;
-            return true;
-        } else if (src.ptr() == Py_False) {
-            value = false;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    static handle from_cpp(bool src, rv_policy, cleanup_list *) noexcept {
-        return handle(src ? Py_True : Py_False).inc_ref();
-    }
-
-    NB_TYPE_CASTER(bool, const_name("bool"));
-};
-
-template <> struct type_caster<char> {
-    using Value = const char *;
-    Value value;
-    static constexpr bool IsClass = false;
-    static constexpr auto Name = const_name("str");
-    template <typename T_>
-    using Cast = std::conditional_t<is_pointer_v<T_>, const char *, char>;
-
-    bool from_python(handle src, uint8_t, cleanup_list *) noexcept {
-        value = PyUnicode_AsUTF8AndSize(src.ptr(), nullptr);
-        if (!value) {
-            PyErr_Clear();
-            return false;
-        }
-        return true;
-    }
-
-    static handle from_cpp(const char *value, rv_policy,
-                           cleanup_list *) noexcept {
-        return PyUnicode_FromString(value);
-    }
-
-    static handle from_cpp(char value, rv_policy, cleanup_list *) noexcept {
-        return PyUnicode_FromStringAndSize(&value, 1);
-    }
-
-    explicit operator const char *() { return value; }
-
-    explicit operator char() {
-        if (value && value[0] && value[1] == '\0')
-            return value[0];
-        throw next_overload();
-    }
-};
-
-template <typename T>
-struct type_caster<T, enable_if_t<std::is_base_of_v<detail::api_tag, T>>> {
-public:
-    NB_TYPE_CASTER(T, T::Name)
-
-    bool from_python(handle src, uint8_t, cleanup_list *) noexcept {
-        if (!isinstance<T>(src))
-            return false;
-
-        if constexpr (std::is_base_of_v<object, T>)
-            value = borrow<T>(src);
-        else
-            value = src;
-
-        return true;
-    }
-
-    static handle from_cpp(const handle &src, rv_policy,
-                           cleanup_list *) noexcept {
-        return src.inc_ref();
-    }
-};
-
-template <typename T> NB_INLINE rv_policy infer_policy(rv_policy policy) {
-    if constexpr (is_pointer_v<T>) {
-        if (policy == rv_policy::automatic)
-            policy = rv_policy::take_ownership;
-        else if (policy == rv_policy::automatic_reference)
-            policy = rv_policy::reference;
-    } else if constexpr (std::is_lvalue_reference_v<T>) {
-        if (policy == rv_policy::automatic ||
-            policy == rv_policy::automatic_reference)
-            policy = rv_policy::copy;
-    } else {
-        if (policy == rv_policy::automatic ||
-            policy == rv_policy::automatic_reference ||
-            policy == rv_policy::reference ||
-            policy == rv_policy::reference_internal)
-            policy = rv_policy::move;
-    }
-    return policy;
-}
-
-template <typename Type_> struct type_caster_base {
-    using Type = Type_;
-    static constexpr auto Name = const_name<Type>();
-    static constexpr bool IsClass = true;
-
-    template <typename T> using Cast = movable_cast_t<T>;
-
-    NB_INLINE bool from_python(handle src, uint8_t flags,
-                               cleanup_list *cleanup) noexcept {
-        return nb_type_get(&typeid(Type), src.ptr(), flags, cleanup,
-                           (void **) &value);
-    }
-
-    template <typename T>
-    NB_INLINE static handle from_cpp(T &&value, rv_policy policy,
-                                     cleanup_list *cleanup) noexcept {
-        Type *value_p;
-        if constexpr (is_pointer_v<T>)
-            value_p = (Type *) value;
-        else
-            value_p = (Type *) &value;
-
-        return nb_type_put(&typeid(Type), value_p, infer_policy<T>(policy),
-                           cleanup, nullptr);
-    }
-
-    operator Type*() { return value; }
-
-    operator Type&() {
-        if (!value)
-            raise_next_overload();
-        return *value;
-    }
-
-    operator Type&&() && {
-        if (!value)
-            raise_next_overload();
-        return (Type &&) *value;
-    }
-
-private:
-    Type *value;
-};
-
-template <typename Type, typename SFINAE>
-struct type_caster : type_caster_base<Type> { };
-
-NAMESPACE_END(detail)
-
-template <typename T, typename Derived>
-T cast(const detail::api<Derived> &value, bool convert = true) {
-    if constexpr (std::is_same_v<T, void>) {
-        return;
-    } else {
-        using Ti     = detail::intrinsic_t<T>;
-        using Caster = detail::make_caster<Ti>;
-
-        Caster caster;
-        if (!caster.from_python(value.derived().ptr(),
-                                convert ? (uint8_t) detail::cast_flags::convert
-                                        : (uint8_t) 0, nullptr))
-            detail::raise("nanobind::cast(...): conversion failed!");
-
-        if constexpr (std::is_same_v<T, const char *>) {
-            return caster.operator const char *();
-        } else {
-            static_assert(
-                !(std::is_reference_v<T> || std::is_pointer_v<T>) || Caster::IsClass,
-                "nanobind::cast(): cannot return a reference to a temporary.");
-
-            if constexpr (detail::is_pointer_v<T>)
-                return caster.operator Ti*();
-            else
-                return caster.operator Ti&();
-        }
-    }
-}
-
-template <typename T>
-object cast(T &&value, rv_policy policy = rv_policy::automatic_reference) {
-    handle h = detail::make_caster<T>::from_cpp(
-        (detail::forward_t<T>) value, detail::infer_policy<T>(policy), nullptr);
-    if (!h.is_valid())
-        detail::raise("nanobind::cast(...): conversion failed!");
-    return steal(h);
-}
-
-template <rv_policy policy = rv_policy::automatic, typename... Args>
-tuple make_tuple(Args &&...args) {
-    tuple result = steal<tuple>(PyTuple_New((Py_ssize_t) sizeof...(Args)));
-
-    size_t nargs = 0;
-    PyObject *o = result.ptr();
-
-    (NB_TUPLE_SET_ITEM(o, nargs++,
-                      detail::make_caster<Args>::from_cpp(
-                          (detail::forward_t<Args>) args,
-                          detail::infer_policy<Args>(policy), nullptr).ptr()),
-     ...);
-
-    detail::tuple_check(o, sizeof...(Args));
-
-    return result;
-}
-
-template <typename T> arg_v arg::operator=(T &&value) const {
-    return arg_v(*this, cast((detail::forward_t<T>) value));
-}
-
-template <typename Impl> template <typename T>
-detail::accessor<Impl>& detail::accessor<Impl>::operator=(T &&value) {
-    object result = cast((detail::forward_t<T>) value);
-    Impl::set(m_base, m_key, result.ptr());
-    return *this;
-}
-
-template <typename T> void list::append(T &&value) {
-    object o = nanobind::cast(value);
-    if (PyList_Append(m_ptr, o.ptr()))
-        detail::raise_python_error();
-}
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_class.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_class.h
deleted file mode 100644
index 362fec842..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_class.h
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
-    nanobind/nb_class.h: Functionality for binding C++ classes/structs
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-enum class type_flags : uint32_t {
-    /// Does the type provide a C++ destructor?
-    is_destructible          = (1 << 0),
-
-    /// Does the type provide a C++ copy constructor?
-    is_copy_constructible    = (1 << 1),
-
-    /// Does the type provide a C++ move constructor?
-    is_move_constructible    = (1 << 2),
-
-    /// Is this a python type that extends a bound C++ type?
-    is_python_type           = (1 << 4),
-
-    /// Is the 'scope' field of the type_data structure set?
-    has_scope                = (1 << 5),
-
-    /// Is the 'doc' field of the type_data structure set?
-    has_doc                  = (1 << 6),
-
-    /// Is the 'base' field of the type_data structure set?
-    has_base                 = (1 << 7),
-
-    /// Is the 'base_py' field of the type_data structure set?
-    has_base_py              = (1 << 8),
-
-    /// Is the 'destruct' field of the type_data structure set?
-    has_destruct             = (1 << 9),
-
-    /// Is the 'copy' field of the type_data structure set?
-    has_copy                 = (1 << 10),
-
-    /// Is the 'move' field of the type_data structure set?
-    has_move                 = (1 << 11),
-
-    /// Internal: does the type maintain a list of implicit conversions?
-    has_implicit_conversions = (1 << 12),
-
-    /// This type is a signed enumeration
-    is_signed_enum           = (1 << 13),
-
-    /// This type is an unsigned enumeration
-    is_unsigned_enum         = (1 << 14),
-
-    /// This type is an arithmetic enumeration
-    is_arithmetic            = (1 << 15),
-
-    /// This type is an arithmetic enumeration
-    has_type_callback        = (1 << 16),
-
-    /// This type does not permit subclassing from Python
-    is_final                 = (1 << 17),
-
-    /// This type does not permit subclassing from Python
-    has_supplement           = (1 << 18),
-
-    /// Instances of this type support dynamic attribute assignment
-    has_dynamic_attr         = (1 << 19),
-
-    /// The class uses an intrusive reference counting approach
-    intrusive_ptr            = (1 << 20)
-};
-
-struct type_data {
-    uint32_t size;
-    uint32_t align : 8;
-    uint32_t flags : 24;
-    const char *name;
-    const char *doc;
-    PyObject *scope;
-    const std::type_info *type;
-    const std::type_info *base;
-    PyTypeObject *type_py;
-    PyTypeObject *base_py;
-    void (*destruct)(void *);
-    void (*copy)(void *, const void *);
-    void (*move)(void *, void *) noexcept;
-    const std::type_info **implicit;
-    bool (**implicit_py)(PyTypeObject *, PyObject *, cleanup_list *) noexcept;
-    void (*type_callback)(PyType_Slot **) noexcept;
-    void *supplement;
-    void (*set_self_py)(void *, PyObject *);
-#if defined(Py_LIMITED_API)
-    size_t dictoffset;
-#endif
-};
-
-NB_INLINE void type_extra_apply(type_data &t, const handle &h) {
-    t.flags |= (uint32_t) type_flags::has_base_py;
-    t.base_py = (PyTypeObject *) h.ptr();
-}
-
-NB_INLINE void type_extra_apply(type_data &t, const char *doc) {
-    t.flags |= (uint32_t) type_flags::has_doc;
-    t.doc = doc;
-}
-
-NB_INLINE void type_extra_apply(type_data &t, type_callback c) {
-    t.flags |= (uint32_t) type_flags::has_type_callback;
-    t.type_callback = c.value;
-}
-
-template <typename T>
-NB_INLINE void type_extra_apply(type_data &t, intrusive_ptr<T> ip) {
-    t.flags |= (uint32_t) type_flags::intrusive_ptr;
-    t.set_self_py = (void (*)(void *, PyObject *)) ip.set_self_py;
-}
-
-NB_INLINE void type_extra_apply(type_data &t, is_enum e) {
-    if (e.is_signed)
-        t.flags |= (uint32_t) type_flags::is_signed_enum;
-    else
-        t.flags |= (uint32_t) type_flags::is_unsigned_enum;
-}
-
-NB_INLINE void type_extra_apply(type_data &t, is_final) {
-    t.flags |= (uint32_t) type_flags::is_final;
-}
-
-NB_INLINE void type_extra_apply(type_data &t, is_arithmetic) {
-    t.flags |= (uint32_t) type_flags::is_arithmetic;
-}
-
-NB_INLINE void type_extra_apply(type_data &t, dynamic_attr) {
-    t.flags |= (uint32_t) type_flags::has_dynamic_attr;
-}
-
-template <typename T>
-NB_INLINE void type_extra_apply(type_data &t, supplement<T>) {
-    static_assert(std::is_trivially_default_constructible_v<T>,
-                  "The supplement type must be a POD (plain old data) type");
-    t.flags |= (uint32_t) type_flags::has_supplement;
-    t.supplement = (void *) malloc(sizeof(T));
-}
-
-template <typename... Args> struct init {
-    template <typename Class, typename... Extra>
-    NB_INLINE static void execute(Class &cl, const Extra&... extra) {
-        using Type = typename Class::Type;
-        using Alias = typename Class::Alias;
-        static_assert(
-            make_caster<Type>::IsClass,
-            "Attempted to create a constructor for a type that won't be "
-            "handled by the nanobind's class type caster. Is it possible that "
-            "you forgot to add NB_MAKE_OPAQUE() somewhere?");
-
-        cl.def(
-            "__init__",
-            [](Type *v, Args... args) {
-                new ((Alias *) v) Alias{ (forward_t<Args>) args... };
-            },
-            extra...);
-    }
-};
-
-template <typename Arg> struct init_implicit {
-    template <typename Class, typename... Extra>
-    NB_INLINE static void execute(Class &cl, const Extra&... extra) {
-        using Type = typename Class::Type;
-        using Alias = typename Class::Alias;
-        using Caster = make_caster<Arg>;
-        static_assert(
-            make_caster<Type>::IsClass,
-            "Attempted to create a constructor for a type that won't be "
-            "handled by the nanobind's class type caster. Is it possible that "
-            "you forgot to add NB_MAKE_OPAQUE() somewhere?");
-
-        cl.def(
-            "__init__",
-            [](Type *v, Arg arg) {
-                new ((Alias *) v) Alias{ (forward_t<Arg>) arg };
-            }, is_implicit(), extra...);
-
-        if constexpr (!Caster::IsClass) {
-            implicitly_convertible(
-                [](PyTypeObject *, PyObject *src,
-                   cleanup_list *cleanup) noexcept -> bool {
-                    return Caster().from_python(src, cast_flags::convert,
-                                                cleanup);
-                },
-                &typeid(Type));
-        }
-    }
-};
-
-template <typename T> void wrap_copy(void *dst, const void *src) {
-    new ((T *) dst) T(*(const T *) src);
-}
-
-template <typename T> void wrap_move(void *dst, void *src) noexcept {
-    new ((T *) dst) T(std::move(*(T *) src));
-}
-
-template <typename T> void wrap_destruct(void *value) noexcept {
-    ((T *) value)->~T();
-}
-
-template <typename, template <typename, typename> typename, typename...>
-struct extract;
-
-template <typename T, template <typename, typename> typename Pred>
-struct extract<T, Pred> {
-    using type = T;
-};
-
-template <typename T, template <typename, typename> typename Pred,
-          typename Tv, typename... Ts>
-struct extract<T, Pred, Tv, Ts...> {
-    using type = std::conditional_t<
-        Pred<T, Tv>::value,
-        Tv,
-        typename extract<T, Pred, Ts...>::type
-    >;
-};
-
-template <typename T, typename Arg> using is_alias = std::is_base_of<T, Arg>;
-template <typename T, typename Arg> using is_base = std::is_base_of<Arg, T>;
-
-enum op_id : int;
-enum op_type : int;
-struct undefined_t;
-template <op_id id, op_type ot, typename L = undefined_t, typename R = undefined_t> struct op_;
-
-NAMESPACE_END(detail)
-
-template <typename T, typename... Ts>
-class class_ : public object {
-public:
-    NB_OBJECT_DEFAULT(class_, object, "type", PyType_Check);
-    using Type = T;
-    using Base  = typename detail::extract<T, detail::is_base,  Ts...>::type;
-    using Alias = typename detail::extract<T, detail::is_alias, Ts...>::type;
-
-    static_assert(sizeof(Alias) < (1 << 24), "instance size is too big!");
-    static_assert(alignof(Alias) < (1 << 8), "instance alignment is too big!");
-    static_assert(
-        sizeof...(Ts) == !std::is_same_v<Base, T> + !std::is_same_v<Alias, T>,
-        "nanobind::class_<> was invoked with extra arguments that could not be handled");
-
-    template <typename... Extra>
-    NB_INLINE class_(handle scope, const char *name, const Extra &... extra) {
-        detail::type_data d;
-
-        d.flags = (uint32_t) detail::type_flags::has_scope;
-        d.align = (uint8_t) alignof(Alias);
-        d.size = (uint32_t) sizeof(Alias);
-        d.supplement = 0;
-        d.name = name;
-        d.scope = scope.ptr();
-        d.type = &typeid(T);
-
-        if constexpr (!std::is_same_v<Base, T>) {
-            d.base = &typeid(Base);
-            d.flags |= (uint16_t) detail::type_flags::has_base;
-        }
-
-        if constexpr (std::is_copy_constructible_v<T>) {
-            d.flags |= (uint16_t) detail::type_flags::is_copy_constructible;
-
-            if constexpr (!std::is_trivially_copy_constructible_v<T>) {
-                d.flags |= (uint16_t) detail::type_flags::has_copy;
-                d.copy = detail::wrap_copy<T>;
-            }
-        }
-
-        if constexpr (std::is_move_constructible_v<T>) {
-            d.flags |= (uint16_t) detail::type_flags::is_move_constructible;
-
-            if constexpr (!std::is_trivially_move_constructible_v<T>) {
-                d.flags |= (uint16_t) detail::type_flags::has_move;
-                d.move = detail::wrap_move<T>;
-            }
-        }
-
-        if constexpr (std::is_destructible_v<T>) {
-            d.flags |= (uint16_t) detail::type_flags::is_destructible;
-
-            if constexpr (!std::is_trivially_destructible_v<T>) {
-                d.flags |= (uint16_t) detail::type_flags::has_destruct;
-                d.destruct = detail::wrap_destruct<T>;
-            }
-        }
-
-        (detail::type_extra_apply(d, extra), ...);
-
-        m_ptr = detail::nb_type_new(&d);
-    }
-
-    template <typename Func, typename... Extra>
-    NB_INLINE class_ &def(const char *name_, Func &&f, const Extra &... extra) {
-        cpp_function_def((detail::forward_t<Func>) f, scope(*this), name(name_),
-                         is_method(), extra...);
-        return *this;
-    }
-
-    template <typename... Args, typename... Extra>
-    NB_INLINE class_ &def(detail::init<Args...> init, const Extra &... extra) {
-        init.execute(*this, extra...);
-        return *this;
-    }
-
-    template <typename... Args, typename... Extra>
-    NB_INLINE class_ &def(detail::init_implicit<Args...> init,
-                          const Extra &... extra) {
-        init.execute(*this, extra...);
-        return *this;
-    }
-
-    template <typename Func, typename... Extra>
-    NB_INLINE class_ &def_static(const char *name_, Func &&f,
-                                 const Extra &... extra) {
-        static_assert(
-            !std::is_member_function_pointer_v<Func>,
-            "def_static(...) called with a non-static member function pointer");
-        cpp_function_def((detail::forward_t<Func>) f, scope(*this), name(name_),
-                         extra...);
-        return *this;
-    }
-
-    template <typename Getter, typename Setter, typename... Extra>
-    NB_INLINE class_ &def_property(const char *name_, Getter &&getter,
-                                   Setter &&setter, const Extra &...extra) {
-        object get_p, set_p;
-
-        if constexpr (!std::is_same_v<Getter, std::nullptr_t>)
-            get_p = cpp_function((detail::forward_t<Getter>) getter,
-                                 scope(*this), is_method(),
-                                 rv_policy::reference_internal, extra...);
-
-        if constexpr (!std::is_same_v<Setter, std::nullptr_t>)
-            set_p = cpp_function((detail::forward_t<Setter>) setter,
-                                 scope(*this), is_method(), extra...);
-
-        detail::property_install(m_ptr, name_, false, get_p.ptr(),
-                                 set_p.ptr());
-        return *this;
-    }
-
-    template <typename Getter, typename Setter, typename... Extra>
-    NB_INLINE class_ &def_property_static(const char *name_, Getter &&getter,
-                                          Setter &&setter,
-                                          const Extra &...extra) {
-        object get_p, set_p;
-
-        if constexpr (!std::is_same_v<Getter, std::nullptr_t>)
-            get_p = cpp_function((detail::forward_t<Getter>) getter,
-                                 scope(*this), rv_policy::reference, extra...);
-
-        if constexpr (!std::is_same_v<Setter, std::nullptr_t>)
-            set_p = cpp_function((detail::forward_t<Setter>) setter,
-                                 scope(*this), extra...);
-
-        detail::property_install(m_ptr, name_, true, get_p.ptr(),
-                                 set_p.ptr());
-        return *this;
-    }
-
-    template <typename Getter, typename... Extra>
-    NB_INLINE class_ &def_property_readonly(const char *name_, Getter &&getter,
-                                            const Extra &...extra) {
-        return def_property(name_, getter, nullptr, extra...);
-    }
-
-    template <typename Getter, typename... Extra>
-    NB_INLINE class_ &def_property_readonly_static(const char *name_,
-                                                   Getter &&getter,
-                                                   const Extra &...extra) {
-        return def_property_static(name_, getter, nullptr, extra...);
-    }
-
-    template <typename C, typename D, typename... Extra>
-    NB_INLINE class_ &def_readwrite(const char *name, D C::*pm,
-                                    const Extra &...extra) {
-        static_assert(std::is_base_of_v<C, T>,
-                      "def_readwrite() requires a (base) class member!");
-
-        def_property(name,
-            [pm](const T &c) -> const D & { return c.*pm; },
-            [pm](T &c, const D &value) { c.*pm = value; },
-            extra...);
-
-        return *this;
-    }
-
-    template <typename D, typename... Extra>
-    NB_INLINE class_ &def_readwrite_static(const char *name, D *pm,
-                                           const Extra &...extra) {
-        def_property_static(name,
-            [pm](handle) -> const D & { return *pm; },
-            [pm](handle, const D &value) { *pm = value; }, extra...);
-
-        return *this;
-    }
-
-    template <typename C, typename D, typename... Extra>
-    NB_INLINE class_ &def_readonly(const char *name, D C::*pm,
-                                   const Extra &...extra) {
-        static_assert(std::is_base_of_v<C, T>,
-                      "def_readonly() requires a (base) class member!");
-
-        def_property_readonly(name,
-            [pm](const T &c) -> const D & { return c.*pm; }, extra...);
-
-        return *this;
-    }
-
-    template <typename D, typename... Extra>
-    NB_INLINE class_ &def_readonly_static(const char *name, D *pm,
-                                          const Extra &...extra) {
-        def_property_readonly_static(name,
-            [pm](handle) -> const D & { return *pm; }, extra...);
-
-        return *this;
-    }
-
-    template <detail::op_id id, detail::op_type ot, typename L, typename R, typename... Extra>
-    class_ &def(const detail::op_<id, ot, L, R> &op, const Extra&... extra) {
-        op.execute(*this, extra...);
-        return *this;
-    }
-
-    template <detail::op_id id, detail::op_type ot, typename L, typename R, typename... Extra>
-    class_ & def_cast(const detail::op_<id, ot, L, R> &op, const Extra&... extra) {
-        op.execute_cast(*this, extra...);
-        return *this;
-    }
-
-};
-
-template <typename T> class enum_ : public class_<T> {
-public:
-    static_assert(std::is_enum_v<T>, "nanobind::enum_<> requires an enumeration type!");
-
-    using Base = class_<T>;
-
-    template <typename... Extra>
-    NB_INLINE enum_(handle scope, const char *name, const Extra &...extra)
-        : Base(scope, name, extra...,
-               is_enum{ std::is_signed_v<std::underlying_type_t<T>> }) { }
-
-    NB_INLINE enum_ &value(const char *name, T value, const char *doc = nullptr) {
-        detail::nb_enum_put(Base::m_ptr, name, &value, doc);
-        return *this;
-    }
-
-    NB_INLINE void export_values() { detail::nb_enum_export(Base::m_ptr); }
-};
-
-template <typename... Args> NB_INLINE detail::init<Args...> init() { return { }; }
-template <typename Arg> NB_INLINE detail::init_implicit<Arg> init_implicit() { return { }; }
-
-// Low level access to nanobind type objects
-inline bool type_check(handle h) { return detail::nb_type_check(h.ptr()); }
-inline size_t type_size(handle h) { return detail::nb_type_size(h.ptr()); }
-inline size_t type_align(handle h) { return detail::nb_type_align(h.ptr()); }
-inline const std::type_info& type_info(handle h) { return *detail::nb_type_info(h.ptr()); }
-template <typename T>
-inline T &type_supplement(handle h) { return *(T *) detail::nb_type_supplement(h.ptr()); }
-
-// Low level access to nanobind instance objects
-inline bool inst_check(handle h) { return type_check(h.type()); }
-inline object inst_alloc(handle h) { return steal(detail::nb_inst_alloc((PyTypeObject *) h.ptr())); }
-inline void inst_zero(handle h) { detail::nb_inst_zero(h.ptr()); }
-inline void inst_set_state(handle h, bool ready, bool destruct) { detail::nb_inst_set_state(h.ptr(), ready, destruct); }
-inline std::pair<bool, bool> inst_state(handle h) { return detail::nb_inst_state(h.ptr()); }
-inline void inst_mark_ready(handle h) { inst_set_state(h, true, true); }
-inline bool inst_ready(handle h) { return inst_state(h).first; }
-inline void inst_destruct(handle h) { detail::nb_inst_destruct(h.ptr()); }
-inline void inst_copy(handle dst, handle src) { detail::nb_inst_copy(dst.ptr(), src.ptr()); }
-inline void inst_move(handle dst, handle src) { detail::nb_inst_move(dst.ptr(), src.ptr()); }
-template <typename T> T *inst_ptr(handle h) { return (T *) detail::nb_inst_ptr(h.ptr()); }
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_defs.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_defs.h
deleted file mode 100644
index d2fae9ee9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_defs.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-    nanobind/nb_defs.h: Preprocessor definitions used by the project
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#define NB_STRINGIFY(x) #x
-#define NB_TOSTRING(x) NB_STRINGIFY(x)
-#define NB_CONCAT(first, second) first##second
-#define NB_NEXT_OVERLOAD ((PyObject *) 1) // special failure return code
-
-#if !defined(NAMESPACE_BEGIN)
-#  define NAMESPACE_BEGIN(name) namespace name {
-#endif
-
-#if !defined(NAMESPACE_END)
-#  define NAMESPACE_END(name) }
-#endif
-
-#if defined(_WIN32)
-#  define NB_EXPORT        __declspec(dllexport)
-#  define NB_IMPORT        __declspec(dllimport)
-#  define NB_INLINE        __forceinline
-#  define NB_INLINE_LAMBDA
-#  define NB_NOINLINE      __declspec(noinline)
-# define  NB_STRDUP        _strdup
-#else
-#  define NB_EXPORT        __attribute__ ((visibility("default")))
-#  define NB_IMPORT        __attribute__ ((visibility("default")))
-#  define NB_INLINE        inline __attribute__((always_inline))
-#  define NB_NOINLINE      __attribute__((noinline))
-#if defined(__clang__)
-#    define NB_INLINE_LAMBDA __attribute__((always_inline))
-#else
-#    define NB_INLINE_LAMBDA
-#endif
-#  define NB_STRDUP        strdup
-#endif
-
-#if defined(__GNUC__)
-#  define NB_NAMESPACE nanobind __attribute__((visibility("hidden")))
-#else
-#  define NB_NAMESPACE nanobind
-#endif
-
-#if defined(NB_SHARED)
-#  if defined(NB_BUILD)
-#    define NB_CORE NB_EXPORT
-#  else
-#    define NB_CORE NB_IMPORT
-#  endif
-#else
-#  if defined(_WIN32)
-#    define NB_CORE
-#  else
-#    define NB_CORE NB_EXPORT
-#  endif
-#endif
-
-#if defined(__cpp_lib_char8_t) && __cpp_lib_char8_t >= 201811L
-#  define NB_HAS_U8STRING
-#endif
-
-#if defined(Py_TPFLAGS_HAVE_VECTORCALL)
-#  define NB_VECTORCALL PyObject_Vectorcall
-#  define NB_HAVE_VECTORCALL Py_TPFLAGS_HAVE_VECTORCALL
-#elif defined(_Py_TPFLAGS_HAVE_VECTORCALL)
-#  define NB_VECTORCALL _PyObject_Vectorcall
-#  define NB_HAVE_VECTORCALL _Py_TPFLAGS_HAVE_VECTORCALL
-#else
-#  define NB_HAVE_VECTORCALL (1UL << 11)
-#endif
-
-#if defined(PY_VECTORCALL_ARGUMENTS_OFFSET)
-#  define NB_VECTORCALL_ARGUMENTS_OFFSET PY_VECTORCALL_ARGUMENTS_OFFSET
-#  define NB_VECTORCALL_NARGS PyVectorcall_NARGS
-#else
-#  define NB_VECTORCALL_ARGUMENTS_OFFSET ((size_t) 1 << (8 * sizeof(size_t) - 1))
-#  define NB_VECTORCALL_NARGS(n) ((n) & ~NB_VECTORCALL_ARGUMENTS_OFFSET)
-#endif
-
-#if defined(Py_LIMITED_API)
-#  define NB_TUPLE_GET_SIZE PyTuple_Size
-#  define NB_TUPLE_GET_ITEM PyTuple_GetItem
-#  define NB_TUPLE_SET_ITEM PyTuple_SetItem
-#  define NB_LIST_GET_SIZE PyList_Size
-#  define NB_LIST_GET_ITEM PyList_GetItem
-#  define NB_LIST_SET_ITEM PyList_SetItem
-#  define NB_DICT_GET_SIZE PyDict_Size
-#else
-#  define NB_TUPLE_GET_SIZE PyTuple_GET_SIZE
-#  define NB_TUPLE_GET_ITEM PyTuple_GET_ITEM
-#  define NB_TUPLE_SET_ITEM PyTuple_SET_ITEM
-#  define NB_LIST_GET_SIZE PyList_GET_SIZE
-#  define NB_LIST_GET_ITEM PyList_GET_ITEM
-#  define NB_LIST_SET_ITEM PyList_SET_ITEM
-#  define NB_DICT_GET_SIZE PyDict_GET_SIZE
-#endif
-
-
-#define NB_MODULE(name, variable)                                              \
-    extern "C" [[maybe_unused]] NB_EXPORT PyObject *PyInit_##name();           \
-    static PyModuleDef NB_CONCAT(nanobind_module_def_, name);                  \
-    [[maybe_unused]] static void NB_CONCAT(nanobind_init_,                     \
-                                           name)(::nanobind::module_ &);       \
-    extern "C" NB_EXPORT PyObject *PyInit_##name() {                           \
-        nanobind::module_ m =                                                  \
-            nanobind::borrow<nanobind::module_>(nanobind::detail::module_new(  \
-                NB_TOSTRING(name), &NB_CONCAT(nanobind_module_def_, name)));   \
-        try {                                                                  \
-            NB_CONCAT(nanobind_init_, name)(m);                                \
-            return m.ptr();                                                    \
-        } catch (const std::exception &e) {                                    \
-            PyErr_SetString(PyExc_ImportError, e.what());                      \
-            return nullptr;                                                    \
-        }                                                                      \
-    }                                                                          \
-    void NB_CONCAT(nanobind_init_, name)(::nanobind::module_ & (variable))
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_descr.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_descr.h
deleted file mode 100644
index 000772277..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_descr.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-    nanobind/nb_descr.h: Constexpr string class for function signatures
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-/// Helper type for concatenating type signatures at compile time
-template <size_t N, typename... Ts>
-struct descr {
-    char text[N + 1]{'\0'};
-
-    constexpr descr() = default;
-    constexpr descr(char const (&s)[N+1]) : descr(s, std::make_index_sequence<N>()) { }
-
-    template <size_t... Is>
-    constexpr descr(char const (&s)[N+1], std::index_sequence<Is...>) : text{s[Is]..., '\0'} { }
-
-    template <typename... Cs>
-    constexpr descr(char c, Cs... cs) : text{c, static_cast<char>(cs)..., '\0'} { }
-
-    constexpr size_t type_count() const { return sizeof...(Ts); }
-
-    NB_INLINE void put_types(const std::type_info **out) const {
-        size_t ctr = 0;
-        ((out[ctr++] = &typeid(Ts)), ...);
-        out[ctr++] = nullptr;
-    }
-};
-
-template <size_t N1, size_t N2, typename... Ts1, typename... Ts2, size_t... Is1, size_t... Is2>
-constexpr descr<N1 + N2, Ts1..., Ts2...> plus_impl(const descr<N1, Ts1...> &a, const descr<N2, Ts2...> &b,
-                                                   std::index_sequence<Is1...>, std::index_sequence<Is2...>) {
-    return {a.text[Is1]..., b.text[Is2]...};
-}
-
-template <size_t N1, size_t N2, typename... Ts1, typename... Ts2>
-constexpr descr<N1 + N2, Ts1..., Ts2...> operator+(const descr<N1, Ts1...> &a, const descr<N2, Ts2...> &b) {
-    return plus_impl(a, b, std::make_index_sequence<N1>(), std::make_index_sequence<N2>());
-}
-
-template <size_t N>
-constexpr descr<N - 1> const_name(char const(&text)[N]) { return descr<N - 1>(text); }
-constexpr descr<0> const_name(char const(&)[1]) { return {}; }
-
-template <size_t Rem, size_t... Digits>
-struct int_to_str : int_to_str<Rem / 10, Rem % 10, Digits...> {};
-template <size_t... Digits> struct int_to_str<0, Digits...> {
-    static constexpr auto digits = descr<sizeof...(Digits)>(('0' + Digits)...);
-};
-
-constexpr auto const_name(char c) { return descr<1>(c); }
-
-// Ternary description (like std::conditional)
-template <bool B, size_t N1, size_t N2>
-constexpr auto const_name(char const(&text1)[N1], char const(&text2)[N2]) {
-    (void) text1; (void) text2;
-
-    if constexpr(B)
-        return const_name(text1);
-    else
-        return const_name(text2);
-}
-
-template <bool B, typename T1, typename T2>
-constexpr auto const_name(const T1 &d1, const T2 &d2) {
-    (void) d1; (void) d2;
-
-    if constexpr (B)
-        return d1;
-    else
-        return d2;
-}
-
-template <size_t Size>
-auto constexpr const_name() -> std::remove_cv_t<decltype(int_to_str<Size / 10, Size % 10>::digits)> {
-    return int_to_str<Size / 10, Size % 10>::digits;
-}
-
-template <typename Type> constexpr descr<1, Type> const_name() { return {'%'}; }
-
-constexpr descr<0> concat() { return {}; }
-constexpr descr<0> concat_maybe() { return {}; }
-
-template <size_t N, typename... Ts>
-constexpr descr<N, Ts...> concat(const descr<N, Ts...> &descr) { return descr; }
-
-template <size_t N, typename... Ts>
-constexpr descr<N, Ts...> concat_maybe(const descr<N, Ts...> &descr) { return descr; }
-
-template <size_t N, typename... Ts, typename... Args>
-constexpr auto concat(const descr<N, Ts...> &d, const Args &...args)
-    -> decltype(std::declval<descr<N + 2, Ts...>>() + concat(args...)) {
-    return d + const_name(", ") + concat(args...);
-}
-
-template <size_t N, typename... Ts, typename... Args>
-constexpr auto concat_maybe(const descr<N, Ts...> &d, const Args &... args)
-    -> decltype(
-        std::declval<descr<N + sizeof...(Ts) == 0 ? 0 : (N + 2), Ts...>>() +
-        concat_maybe(args...)) {
-    if constexpr (N + sizeof...(Ts) == 0)
-        return concat_maybe(args...);
-    else
-        return d + const_name(", ") + concat_maybe(args...);
-}
-
-template <size_t N, typename... Ts>
-constexpr descr<N + 2, Ts...> type_descr(const descr<N, Ts...> &descr) {
-    return const_name("{") + descr + const_name("}");
-}
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_enums.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_enums.h
deleted file mode 100644
index 7243a0e84..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_enums.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    nanobind/nb_enum.h: enumerations used in nanobind (just rv_policy atm.)
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-
-// Approach used to cast a previously unknown C++ instance into a Python object
-enum class rv_policy {
-    /** This is the default return value policy, which falls back to the policy
-        rv_policy::take_ownership when the return value is a pointer.
-        Otherwise, it uses return_value::move or return_value::copy for rvalue
-        and lvalue references, respectively. See below for a description of what
-        all of these different policies do. */
-    automatic = 0,
-
-    /** As above, but use policy rv_policy::reference when the return
-        value is a pointer. This is the default conversion policy for function
-        arguments when calling Python functions manually from C++ code (i.e. via
-        handle::operator()). You probably won't need to use this. */
-    automatic_reference = 1,
-
-    /** Reference an existing object (i.e. do not create a new copy) and take
-        ownership. Python will call the destructor and delete operator when the
-        object’s reference count reaches zero. Undefined behavior ensues when
-        the C++ side does the same.. */
-    take_ownership = 2,
-
-    /** Create a new copy of the returned object, which will be owned by
-        Python. This policy is comparably safe because the lifetimes of the two
-        instances are decoupled. */
-    copy = 3,
-
-    /** Use std::move to move the return value contents into a new instance
-        that will be owned by Python. This policy is comparably safe because the
-        lifetimes of the two instances (move source and destination) are
-        decoupled. */
-    move = 4,
-
-    /** Reference an existing object, but do not take ownership. The C++ side
-        is responsible for managing the object’s lifetime and deallocating it
-        when it is no longer used. Warning: undefined behavior will ensue when
-        the C++ side deletes an object that is still referenced and used by
-        Python. */
-    reference = 5,
-
-    /** This policy only applies to methods and properties. It references the
-        object without taking ownership similar to the above
-        rv_policy::reference policy. In contrast to that policy, the
-        function or property’s implicit this argument (called the parent) is
-        considered to be the the owner of the return value (the child).
-        nanobind then couples the lifetime of the parent to the child via a
-        reference relationship that ensures that the parent cannot be garbage
-        collected while Python is still using the child. More advanced
-        variations of this scheme are also possible using combinations of
-        rv_policy::reference and the keep_alive call policy */
-    reference_internal = 6,
-
-    /** Conservative policy: only succeed if the object is already
-       registered with nanobind. */
-    none = 7
-
-    /* Note to self: nb_func.h assumes that this value fits into 3 bits,
-       hence no further policies can be added. */
-};
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_error.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_error.h
deleted file mode 100644
index 3b790f4c5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_error.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    nanobind/nb_error.h: Python exception handling, binding of exceptions
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-
-/// RAII wrapper that temporarily clears any Python error state
-struct error_scope {
-    PyObject *type, *value, *trace;
-    error_scope() { PyErr_Fetch(&type, &value, &trace); }
-    ~error_scope() { PyErr_Restore(type, value, trace); }
-};
-
-/// Wraps a Python error state as a C++ exception
-class NB_EXPORT python_error : public std::exception {
-public:
-    python_error();
-    python_error(const python_error &);
-    python_error(python_error &&) noexcept;
-    ~python_error() override;
-
-    /// Move the error back into the Python domain
-    void restore();
-
-    const handle type() const { return m_type; }
-    const handle value() const { return m_value; }
-    const handle trace() const { return m_trace; }
-
-    const char *what() const noexcept override;
-
-private:
-    object m_type, m_value, m_trace;
-    mutable char *m_what = nullptr;
-};
-
-/// Throw from a bound method to skip to the next overload
-class NB_EXPORT next_overload : public std::exception {
-public:
-    next_overload();
-    ~next_overload() override;
-};
-
-// Base interface used to expose common Python exceptions in C++
-class NB_EXPORT builtin_exception : public std::runtime_error {
-public:
-    using std::runtime_error::runtime_error;
-    virtual void set_error() const = 0;
-};
-
-#define NB_EXCEPTION(type)                                          \
-    class NB_EXPORT type : public builtin_exception {               \
-    public:                                                         \
-        using builtin_exception::builtin_exception;                 \
-        type();                                                     \
-        void set_error() const override;                            \
-    };
-
-NB_EXCEPTION(stop_iteration)
-NB_EXCEPTION(index_error)
-NB_EXCEPTION(key_error)
-NB_EXCEPTION(value_error)
-NB_EXCEPTION(type_error)
-NB_EXCEPTION(buffer_error)
-NB_EXCEPTION(import_error)
-NB_EXCEPTION(attribute_error)
-
-#undef NB_EXCEPTION
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_func.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_func.h
deleted file mode 100644
index 408a54ef8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_func.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-    nanobind/nb_func.h: Functionality for binding C++ functions/methods
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-template <bool ReturnRef, bool CheckGuard, typename Func, typename Return,
-          typename... Args, size_t... Is, typename... Extra>
-NB_INLINE PyObject *func_create(Func &&func, Return (*)(Args...),
-                                std::index_sequence<Is...> is,
-                                const Extra &...extra) {
-    using Guard = typename extract_guard<Extra...>::type;
-
-    if constexpr (CheckGuard && !std::is_same_v<Guard, void>) {
-        return func_create<ReturnRef, false>(
-            [func = (forward_t<Func>) func](Args... args) NB_INLINE_LAMBDA {
-                typename Guard::type g;
-                (void) g;
-                return func(args...);
-            },
-            (Return(*)(Args...)) nullptr, is, extra...);
-    }
-
-    (void) is;
-
-    // Detect locations of nb::args / nb::kwargs (if exists)
-    static constexpr size_t
-        args_pos_1 = index_1_v<std::is_same_v<intrinsic_t<Args>, args>...>,
-        args_pos_n = index_n_v<std::is_same_v<intrinsic_t<Args>, args>...>,
-        kwargs_pos_1 = index_1_v<std::is_same_v<intrinsic_t<Args>, kwargs>...>,
-        kwargs_pos_n = index_n_v<std::is_same_v<intrinsic_t<Args>, kwargs>...>,
-        nargs = sizeof...(Args);
-
-    // Determine the number of nb::arg/nb::arg_v annotations
-    constexpr size_t nargs_provided =
-        ((std::is_same_v<arg, Extra> + std::is_same_v<arg_v, Extra>) + ... + 0);
-    constexpr bool is_method_det =
-        (std::is_same_v<is_method, Extra> + ... + 0) != 0;
-
-    /// A few compile-time consistency checks
-    static_assert(args_pos_1 == args_pos_n && kwargs_pos_1 == kwargs_pos_n,
-        "Repeated use of nb::kwargs or nb::args in the function signature!");
-    static_assert(nargs_provided == 0 || nargs_provided + is_method_det == nargs,
-        "The number of nb::arg annotations must match the argument count!");
-    static_assert(kwargs_pos_1 == nargs || kwargs_pos_1 + 1 == nargs,
-        "nb::kwargs must be the last element of the function signature!");
-    static_assert(args_pos_1 == nargs || args_pos_1 + 1 == kwargs_pos_1,
-        "nb::args must follow positional arguments and precede nb::kwargs!");
-
-    // Collect function signature information for the docstring
-    using cast_out = make_caster<
-        std::conditional_t<std::is_void_v<Return>, void_type, Return>>;
-    constexpr auto descr =
-        const_name("(") + concat(type_descr(make_caster<Args>::Name)...) +
-        const_name(") -> ") + cast_out::Name;
-    const std::type_info* descr_types[descr.type_count() + 1];
-    descr.put_types(descr_types);
-
-    // Auxiliary data structure to capture the provided function/closure
-    struct capture {
-        std::remove_reference_t<Func> func;
-    };
-
-    // The following temporary record will describe the function in detail
-    func_data_prelim<nargs_provided> f;
-    f.flags = (args_pos_1   < nargs ? (uint32_t) func_flags::has_var_args   : 0) |
-              (kwargs_pos_1 < nargs ? (uint32_t) func_flags::has_var_kwargs : 0) |
-              (nargs_provided       ? (uint32_t) func_flags::has_args       : 0) |
-              (ReturnRef            ? (uint32_t) func_flags::return_ref     : 0);
-
-    /* Store captured function inside 'func_data_prelim' if there is space. Issues
-       with aliasing are resolved via separate compilation of libnanobind. */
-    if constexpr (sizeof(capture) <= sizeof(f.capture)) {
-        capture *cap = (capture *) f.capture;
-        new (cap) capture{ (forward_t<Func>) func };
-
-        if constexpr (!std::is_trivially_destructible_v<capture>) {
-            f.flags |= (uint32_t) func_flags::has_free;
-            f.free = [](void *p) {
-                ((capture *) p)->~capture();
-            };
-        }
-    } else {
-        void **cap = (void **) f.capture;
-        cap[0] = new capture{ (forward_t<Func>) func };
-
-        f.flags |= (uint32_t) func_flags::has_free;
-        f.free = [](void *p) {
-            delete (capture *) ((void **) p)[0];
-        };
-    }
-
-    f.impl = [](void *p, PyObject **args, uint8_t *args_flags, rv_policy policy,
-                cleanup_list *cleanup) -> PyObject * {
-        (void)p; (void)args; (void)args_flags; (void)policy; (void)cleanup;
-
-        const capture *cap;
-        if constexpr (sizeof(capture) <= sizeof(f.capture))
-            cap = (capture *) p;
-        else
-            cap = (capture *) ((void **) p)[0];
-
-        tuple<make_caster<Args>...> in;
-        (void) in;
-
-        if ((!in.template get<Is>().from_python(args[Is], args_flags[Is],
-                                                cleanup) || ...))
-            return NB_NEXT_OVERLOAD;
-
-        PyObject *result;
-        if constexpr (std::is_void_v<Return>) {
-            cap->func(((make_caster<Args>&&) in.template get<Is>()).operator cast_t<Args>()...);
-            Py_INCREF(Py_None);
-            result = Py_None;
-        } else {
-            result = cast_out::from_cpp(
-                       cap->func(((make_caster<Args> &&) in.template get<Is>())
-                                     .operator cast_t<Args>()...),
-                       policy, cleanup).ptr();
-        }
-
-        (process_keep_alive(args, result, (Extra *) nullptr), ...);
-
-        return result;
-    };
-
-    f.descr = descr.text;
-    f.descr_types = descr_types;
-    f.nargs = (uint16_t) nargs;
-
-    // Fill remaining fields of 'f'
-    size_t arg_index = 0;
-    (void) arg_index;
-    (func_extra_apply(f, extra, arg_index), ...);
-
-    return nb_func_new((const void *) &f);
-}
-
-NAMESPACE_END(detail)
-
-template <typename Return, typename... Args, typename... Extra>
-NB_INLINE object cpp_function(Return (*f)(Args...), const Extra&... extra) {
-    return steal(detail::func_create<true, true>(
-        f, f, std::make_index_sequence<sizeof...(Args)>(), extra...));
-}
-
-template <typename Return, typename... Args, typename... Extra>
-NB_INLINE void cpp_function_def(Return (*f)(Args...), const Extra&... extra) {
-    detail::func_create<false, true>(
-        f, f, std::make_index_sequence<sizeof...(Args)>(), extra...);
-}
-
-/// Construct a cpp_function from a lambda function (pot. with internal state)
-template <
-    typename Func, typename... Extra,
-    detail::enable_if_t<detail::is_lambda_v<std::remove_reference_t<Func>>> = 0>
-NB_INLINE object cpp_function(Func &&f, const Extra &...extra) {
-    using am = detail::analyze_method<decltype(&std::remove_reference_t<Func>::operator())>;
-    return steal(detail::func_create<true, true>(
-        (detail::forward_t<Func>) f, (typename am::func *) nullptr,
-        std::make_index_sequence<am::argc>(), extra...));
-}
-
-template <
-    typename Func, typename... Extra,
-    detail::enable_if_t<detail::is_lambda_v<std::remove_reference_t<Func>>> = 0>
-NB_INLINE void cpp_function_def(Func &&f, const Extra &...extra) {
-    using am = detail::analyze_method<decltype(&std::remove_reference_t<Func>::operator())>;
-    detail::func_create<false, true>(
-        (detail::forward_t<Func>) f, (typename am::func *) nullptr,
-        std::make_index_sequence<am::argc>(), extra...);
-}
-
-/// Construct a cpp_function from a class method (non-const)
-template <typename Return, typename Class, typename... Args, typename... Extra>
-NB_INLINE object cpp_function(Return (Class::*f)(Args...), const Extra &...extra) {
-    return steal(detail::func_create<true, true>(
-        [f](Class *c, Args... args) NB_INLINE_LAMBDA -> Return {
-            return (c->*f)((detail::forward_t<Args>) args...);
-        },
-        (Return(*)(Class *, Args...)) nullptr,
-        std::make_index_sequence<sizeof...(Args) + 1>(), extra...));
-}
-
-template <typename Return, typename Class, typename... Args, typename... Extra>
-NB_INLINE void cpp_function_def(Return (Class::*f)(Args...), const Extra &...extra) {
-    detail::func_create<false, true>(
-        [f](Class *c, Args... args) NB_INLINE_LAMBDA -> Return {
-            return (c->*f)((detail::forward_t<Args>) args...);
-        },
-        (Return(*)(Class *, Args...)) nullptr,
-        std::make_index_sequence<sizeof...(Args) + 1>(), extra...);
-}
-
-/// Construct a cpp_function from a class method (const)
-template <typename Return, typename Class, typename... Args, typename... Extra>
-NB_INLINE object cpp_function(Return (Class::*f)(Args...) const, const Extra &...extra) {
-    return steal(detail::func_create<true, true>(
-        [f](const Class *c, Args... args) NB_INLINE_LAMBDA -> Return {
-            return (c->*f)((detail::forward_t<Args>) args...);
-        },
-        (Return(*)(const Class *, Args...)) nullptr,
-        std::make_index_sequence<sizeof...(Args) + 1>(), extra...));
-}
-
-template <typename Return, typename Class, typename... Args, typename... Extra>
-NB_INLINE void cpp_function_def(Return (Class::*f)(Args...) const, const Extra &...extra) {
-    detail::func_create<false, true>(
-        [f](const Class *c, Args... args) NB_INLINE_LAMBDA -> Return {
-            return (c->*f)((detail::forward_t<Args>) args...);
-        },
-        (Return(*)(const Class *, Args...)) nullptr,
-        std::make_index_sequence<sizeof...(Args) + 1>(), extra...);
-}
-
-template <typename Func, typename... Extra>
-module_ &module_::def(const char *name_, Func &&f, const Extra &...extra) {
-    cpp_function_def((detail::forward_t<Func>) f, scope(*this),
-                     name(name_), extra...);
-    return *this;
-}
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_lib.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_lib.h
deleted file mode 100644
index ba9f9c614..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_lib.h
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
-    nanobind/nb_lib.h: Interface to libnanobind.so
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-
-// Forward declarations for types in dlpack.h (1)
-namespace dlpack { struct tensor; struct dtype; }
-
-NAMESPACE_BEGIN(detail)
-
-// Forward declarations for types in dlpack.h (2)
-struct tensor_handle;
-struct tensor_req;
-
-/**
- * Helper class to clean temporaries created by function dispatch.
- * The first element serves a special role: it stores the 'self'
- * object of method calls (for rv_policy::reference_internal).
- */
-struct NB_CORE cleanup_list {
-public:
-    static constexpr uint32_t Small = 6;
-
-    cleanup_list(PyObject *self) :
-        m_size{1},
-        m_capacity{Small},
-        m_data{m_local} {
-        m_local[0] = self;
-    }
-
-    ~cleanup_list() = default;
-
-    /// Append a single PyObject to the cleanup stack
-    NB_INLINE void append(PyObject *value) noexcept {
-        if (m_size >= m_capacity)
-            expand();
-        m_data[m_size++] = value;
-    }
-
-    NB_INLINE PyObject *self() const {
-        return m_local[0];
-    }
-
-    /// Decrease the reference count of all appended objects
-    void release() noexcept;
-
-protected:
-    /// Out of memory, expand..
-    void expand() noexcept;
-
-protected:
-    uint32_t m_size;
-    uint32_t m_capacity;
-    PyObject **m_data;
-    PyObject *m_local[Small];
-};
-
-
-// ========================================================================
-
-/// Raise a std::runtime_error with the given message
-#if defined(__GNUC__)
-    __attribute__((noreturn, __format__ (__printf__, 1, 2)))
-#else
-    [[noreturn]]
-#endif
-NB_CORE void raise(const char *fmt, ...);
-
-/// Abort the process with a fatal error
-#if defined(__GNUC__)
-    __attribute__((noreturn, __format__ (__printf__, 1, 2)))
-#else
-    [[noreturn]]
-#endif
-NB_CORE void fail(const char *fmt, ...) noexcept;
-
-/// Raise nanobind::python_error after an error condition was found
-NB_CORE void raise_python_error();
-
-/// Raise nanobind::next_overload
-NB_CORE void raise_next_overload();
-
-// ========================================================================
-
-/// Convert a Python object into a Python unicode string
-NB_CORE PyObject *str_from_obj(PyObject *o);
-
-/// Convert an UTF8 null-terminated C string into a Python unicode string
-NB_CORE PyObject *str_from_cstr(const char *c);
-
-/// Convert an UTF8 C string + size into a Python unicode string
-NB_CORE PyObject *str_from_cstr_and_size(const char *c, size_t n);
-
-// ========================================================================
-
-/// Get an object attribute or raise an exception
-NB_CORE PyObject *getattr(PyObject *obj, const char *key);
-NB_CORE PyObject *getattr(PyObject *obj, PyObject *key);
-
-/// Get an object attribute or return a default value (never raises)
-NB_CORE PyObject *getattr(PyObject *obj, const char *key, PyObject *def) noexcept;
-NB_CORE PyObject *getattr(PyObject *obj, PyObject *key, PyObject *def) noexcept;
-
-/// Get an object attribute or raise an exception. Skip if 'out' is non-null
-NB_CORE void getattr_maybe(PyObject *obj, const char *key, PyObject **out);
-NB_CORE void getattr_maybe(PyObject *obj, PyObject *key, PyObject **out);
-
-/// Set an object attribute / item
-NB_CORE void setattr(PyObject *obj, const char *key, PyObject *value);
-NB_CORE void setattr(PyObject *obj, PyObject *key, PyObject *value);
-
-// ========================================================================
-
-/// Index into an object or raise an exception. Skip if 'out' is non-null
-NB_CORE void getitem_maybe(PyObject *obj, Py_ssize_t, PyObject **out);
-NB_CORE void getitem_maybe(PyObject *obj, const char *key, PyObject **out);
-NB_CORE void getitem_maybe(PyObject *obj, PyObject *key, PyObject **out);
-
-/// Set an item or raise an exception
-NB_CORE void setitem(PyObject *obj, Py_ssize_t, PyObject *value);
-NB_CORE void setitem(PyObject *obj, const char *key, PyObject *value);
-NB_CORE void setitem(PyObject *obj, PyObject *key, PyObject *value);
-
-// ========================================================================
-
-/// Determine the length of a Python object
-NB_CORE size_t obj_len(PyObject *o);
-
-/// Obtain a string representation of a Python object
-NB_CORE PyObject* obj_repr(PyObject *o);
-
-/// Perform a comparison between Python objects and handle errors
-NB_CORE bool obj_comp(PyObject *a, PyObject *b, int value);
-
-/// Perform an unary operation on a Python object with error handling
-NB_CORE PyObject *obj_op_1(PyObject *a, PyObject* (*op)(PyObject*));
-
-/// Perform an unary operation on a Python object with error handling
-NB_CORE PyObject *obj_op_2(PyObject *a, PyObject *b,
-                           PyObject *(*op)(PyObject *, PyObject *));
-
-// Perform a vector function call
-NB_CORE PyObject *obj_vectorcall(PyObject *base, PyObject *const *args,
-                                 size_t nargsf, PyObject *kwnames,
-                                 bool method_call);
-
-/// Create an iterator from 'o', raise an exception in case of errors
-NB_CORE PyObject *obj_iter(PyObject *o);
-
-/// Advance the iterator 'o', raise an exception in case of errors
-NB_CORE PyObject *obj_iter_next(PyObject *o);
-
-// ========================================================================
-
-// Conversion validity check done by nb::make_tuple
-NB_CORE void tuple_check(PyObject *tuple, size_t nargs);
-
-// ========================================================================
-
-// Append a single argument to a function call
-NB_CORE void call_append_arg(PyObject *args, size_t &nargs, PyObject *value);
-
-// Append a variable-length sequence of arguments to a function call
-NB_CORE void call_append_args(PyObject *args, size_t &nargs, PyObject *value);
-
-// Append a single keyword argument to a function call
-NB_CORE void call_append_kwarg(PyObject *kwargs, const char *name, PyObject *value);
-
-// Append a variable-length dictionary of keyword arguments to a function call
-NB_CORE void call_append_kwargs(PyObject *kwargs, PyObject *value);
-
-// ========================================================================
-
-// If the given sequence has the size 'size', return a pointer to its contents.
-// May produce a temporary.
-NB_CORE PyObject **seq_get_with_size(PyObject *seq, size_t size,
-                                     PyObject **temp) noexcept;
-
-// Like the above, but return the size instead of checking it.
-NB_CORE PyObject **seq_get(PyObject *seq, size_t *size,
-                           PyObject **temp) noexcept;
-
-// ========================================================================
-
-/// Create a new capsule object
-NB_CORE PyObject *capsule_new(const void *ptr,
-                              void (*free)(void *) noexcept) noexcept;
-
-// ========================================================================
-
-/// Create a Python function object for the given function record
-NB_CORE PyObject *nb_func_new(const void *data) noexcept;
-
-// ========================================================================
-
-/// Create a Python type object for the given type record
-struct type_data;
-NB_CORE PyObject *nb_type_new(const type_data *c) noexcept;
-
-/// Extract a pointer to a C++ type underlying a Python object, if possible
-NB_CORE bool nb_type_get(const std::type_info *t, PyObject *o, uint8_t flags,
-                         cleanup_list *cleanup, void **out) noexcept;
-
-/// Cast a C++ type instance into a Python object
-NB_CORE PyObject *nb_type_put(const std::type_info *cpp_type, void *value,
-                              rv_policy rvp, cleanup_list *cleanup,
-                              bool *is_new) noexcept;
-
-// Special version of 'nb_type_put' for unique pointers and ownership transfer
-NB_CORE PyObject *nb_type_put_unique(const std::type_info *cpp_type,
-                                     void *value, cleanup_list *cleanup,
-                                     bool cpp_delete) noexcept;
-
-/// Try to reliquish ownership from Python object to a unique_ptr
-NB_CORE void nb_type_relinquish_ownership(PyObject *o, bool cpp_delete);
-
-/// Get a pointer to a user-defined 'extra' value associated with the nb_type t.
-NB_CORE void *nb_type_supplement(PyObject *t) noexcept;
-
-/// Check if the given python object represents a nanobind type
-NB_CORE bool nb_type_check(PyObject *t) noexcept;
-
-/// Return the size of the type wrapped by the given nanobind type object
-NB_CORE size_t nb_type_size(PyObject *t) noexcept;
-
-/// Return the alignment of the type wrapped by the given nanobind type object
-NB_CORE size_t nb_type_align(PyObject *t) noexcept;
-
-/// Return the C++ type_info wrapped by the given nanobind type object
-NB_CORE const std::type_info *nb_type_info(PyObject *t) noexcept;
-
-/// Get a pointer to the instance data of a nanobind instance (nb_inst)
-NB_CORE void *nb_inst_ptr(PyObject *o) noexcept;
-
-/// Check if a Python type object wraps an instance of a specific C++ type
-NB_CORE bool nb_type_isinstance(PyObject *obj, const std::type_info *t) noexcept;
-
-/// Search for the Python type object associated with a C++ type
-NB_CORE PyObject *nb_type_lookup(const std::type_info *t) noexcept;
-
-/// Allocate an instance of type 't'
-NB_CORE PyObject *nb_inst_alloc(PyTypeObject *t);
-
-/// Call the destructor of the given python object
-NB_CORE void nb_inst_destruct(PyObject *o) noexcept;
-
-/// Zero-initialize a POD type and mark it as ready + to be destructed upon GC
-NB_CORE void nb_inst_zero(PyObject *o) noexcept;
-
-/// Copy-construct 'dst' from 'src', mark it as ready and to be destructed (must have the same nb_type)
-NB_CORE void nb_inst_copy(PyObject *dst, const PyObject *src) noexcept;
-
-/// Move-construct 'dst' from 'src', mark it as ready and to be destructed (must have the same nb_type)
-NB_CORE void nb_inst_move(PyObject *dst, const PyObject *src) noexcept;
-
-/**
- * This function can be used to manually set two important flags associated with
- * every nanobind instance (``nb_inst``).
- *
- * 1. 'ready': is the object fully constructed? Otherwise, nanobind will not
- *    allow passing it to a function.
- *
- * 2. 'destruct': Should nanobind call the C++ destructor when the instance
- *    is garbage collected?
- */
-NB_CORE void nb_inst_set_state(PyObject *o, bool ready, bool destruct) noexcept;
-
-/// Query the 'ready' and 'destruct' flags of an instance
-NB_CORE std::pair<bool, bool> nb_inst_state(PyObject *o) noexcept;
-
-// ========================================================================
-
-// Create and install a Python property object
-NB_CORE void property_install(PyObject *scope, const char *name, bool is_static,
-                              PyObject *getter, PyObject *setter) noexcept;
-
-// ========================================================================
-
-NB_CORE PyObject *get_override(void *ptr, const std::type_info *type,
-                               const char *name, bool pure);
-
-// ========================================================================
-
-// Ensure that 'patient' cannot be GCed while 'nurse' is alive
-NB_CORE void keep_alive(PyObject *nurse, PyObject *patient) noexcept;
-
-// Keep 'payload' alive until 'nurse' is GCed
-NB_CORE void keep_alive(PyObject *nurse, void *payload,
-                        void (*deleter)(void *) noexcept) noexcept;
-
-// ========================================================================
-
-/// Indicate to nanobind that an implicit constructor can convert 'src' -> 'dst'
-NB_CORE void implicitly_convertible(const std::type_info *src,
-                                    const std::type_info *dst) noexcept;
-
-/// Register a callback to check if implicit conversion to 'dst' is possible
-NB_CORE void implicitly_convertible(bool (*predicate)(PyTypeObject *,
-                                                      PyObject *,
-                                                      cleanup_list *),
-                                    const std::type_info *dst) noexcept;
-
-// ========================================================================
-
-/// Add an entry to an enumeration
-NB_CORE void nb_enum_put(PyObject *type, const char *name, const void *value,
-                         const char *doc) noexcept;
-
-/// Export enum entries to the parent scope
-NB_CORE void nb_enum_export(PyObject *type);
-
-// ========================================================================
-
-/// Try to import a Python extension module, raises an exception upon failure
-NB_CORE PyObject *module_import(const char *name);
-
-/// Create a new extension module with the given name
-NB_CORE PyObject *module_new(const char *name, PyModuleDef *def) noexcept;
-
-/// Create a submodule of an existing module
-NB_CORE PyObject *module_new_submodule(PyObject *base, const char *name,
-                                       const char *doc) noexcept;
-
-
-// ========================================================================
-
-// Try to import a reference-counted tensor object via DLPack
-NB_CORE tensor_handle *tensor_import(PyObject *o, const tensor_req *req,
-                                     bool convert) noexcept;
-
-// Describe a local tensor object using a DLPack capsule
-NB_CORE tensor_handle *tensor_create(void *value, size_t ndim,
-                                     const size_t *shape, PyObject *owner,
-                                     const int64_t *strides,
-                                     dlpack::dtype *dtype, int32_t device,
-                                     int32_t device_id);
-
-/// Increase the reference count of the given tensor object; returns a pointer
-/// to the underlying DLtensor
-NB_CORE dlpack::tensor *tensor_inc_ref(tensor_handle *) noexcept;
-
-/// Decrease the reference count of the given tensor object
-NB_CORE void tensor_dec_ref(tensor_handle *) noexcept;
-
-/// Wrap a tensor_handle* into a PyCapsule
-NB_CORE PyObject *tensor_wrap(tensor_handle *, int framework) noexcept;
-
-// ========================================================================
-
-/// Print to stdout using Python
-NB_CORE void print(PyObject *file, PyObject *str, PyObject *end);
-
-// ========================================================================
-
-NB_CORE std::pair<int8_t, bool>   load_i8 (PyObject *o, uint8_t flags) noexcept;
-NB_CORE std::pair<uint8_t, bool>  load_u8 (PyObject *o, uint8_t flags) noexcept;
-NB_CORE std::pair<int16_t, bool>  load_i16(PyObject *o, uint8_t flags) noexcept;
-NB_CORE std::pair<uint16_t, bool> load_u16(PyObject *o, uint8_t flags) noexcept;
-NB_CORE std::pair<int32_t, bool>  load_i32(PyObject *o, uint8_t flags) noexcept;
-NB_CORE std::pair<uint32_t, bool> load_u32(PyObject *o, uint8_t flags) noexcept;
-NB_CORE std::pair<int64_t, bool>  load_i64(PyObject *o, uint8_t flags) noexcept;
-NB_CORE std::pair<uint64_t, bool> load_u64(PyObject *o, uint8_t flags) noexcept;
-NB_CORE std::pair<float, bool>    load_f32(PyObject *o, uint8_t flags) noexcept;
-NB_CORE std::pair<double, bool>   load_f64(PyObject *o, uint8_t flags) noexcept;
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_misc.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_misc.h
deleted file mode 100644
index c38e4ec5f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_misc.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    nanobind/nb_misc.h: Miscellaneous bits (GIL, etc.)
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-
-struct gil_scoped_acquire {
-public:
-    gil_scoped_acquire() noexcept : state(PyGILState_Ensure()) { }
-    ~gil_scoped_acquire() { PyGILState_Release(state); }
-
-private:
-    const PyGILState_STATE state;
-};
-
-class gil_scoped_release {
-public:
-    gil_scoped_release() noexcept : state(PyEval_SaveThread()) { }
-    ~gil_scoped_release() { PyEval_RestoreThread(state); }
-
-private:
-    PyThreadState *state;
-};
-
-// Deleter for std::unique_ptr<T> (handles ownership by both C++ and Python)
-template <typename T> struct deleter {
-    /// Instance should be cleared using a delete expression
-    deleter()  = default;
-
-    /// Instance owned by Python, reduce reference count upon deletion
-    deleter(handle h) : o(h.ptr()) { }
-
-    /// Does Python own storage of the underlying object
-    bool owned_by_python() const { return o != nullptr; }
-
-    /// Does C++ own storage of the underlying object
-    bool owned_by_cpp() const { return o == nullptr; }
-
-    /// Perform the requested deletion operation
-    void operator()(void *p) noexcept {
-        if (o) {
-            gil_scoped_acquire guard;
-            Py_DECREF(o);
-        } else {
-            delete (T *) p;
-        }
-    }
-
-    PyObject *o{nullptr};
-};
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_python.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_python.h
deleted file mode 100644
index 41846abca..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_python.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-    nanobind/nb_python.h: Include CPython headers while temporarily disabling
-    certain warnings. Also, disable dangerous preprocessor definitions.
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-/// Include Python header, disable linking to pythonX_d.lib on Windows in debug mode
-
-#if defined(_MSC_VER)
-#  pragma warning(push)
-#  if defined(_DEBUG) && !defined(Py_DEBUG)
-#    define NB_DEBUG_MARKER
-#    undef _DEBUG
-#  endif
-#endif
-
-#include <Python.h>
-#include <frameobject.h>
-#include <pythread.h>
-#include <structmember.h>
-
-/* Python #defines overrides on all sorts of core functions, which
-   tends to weak havok in C++ codebases that expect these to work
-   like regular functions (potentially with several overloads) */
-#if defined(isalnum)
-#  undef isalnum
-#  undef isalpha
-#  undef islower
-#  undef isspace
-#  undef isupper
-#  undef tolower
-#  undef toupper
-#endif
-
-#if defined(copysign)
-#  undef copysign
-#endif
-
-#if defined(setter)
-#  undef setter
-#endif
-
-#if defined(getter)
-#  undef getter
-#endif
-
-#if defined(_MSC_VER)
-#  if defined(NB_DEBUG_MARKER)
-#    define _DEBUG
-#    undef NB_DEBUG_MARKER
-#  endif
-#  pragma warning(pop)
-#endif
-
-#if PY_VERSION_HEX < 0x03080000
-#  error The nanobind library requires Python 3.8 (or newer)
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_traits.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_traits.h
deleted file mode 100644
index 214e34e2e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_traits.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-    nanobind/nb_traits.h: type traits for metaprogramming in nanobind
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-struct void_type { };
-
-template <bool... Bs> struct index_1;
-template <bool... Bs> struct index_n;
-
-template <> struct index_1<> { constexpr static size_t value = 0; };
-template <> struct index_n<> { constexpr static size_t value = 0; };
-
-template <bool B, bool... Bs> struct index_1<B, Bs...> {
-    constexpr static size_t value_rec = index_1<Bs...>::value;
-    constexpr static size_t value = B ? 0 : (value_rec + 1);
-};
-
-template <bool B, bool... Bs> struct index_n<B, Bs...> {
-    constexpr static size_t value_rec = index_n<Bs...>::value;
-    constexpr static size_t value =
-        (value_rec < sizeof...(Bs) || !B) ? (value_rec + 1) : 0;
-};
-
-template <bool... Bs> constexpr size_t index_1_v = index_1<Bs...>::value;
-template <bool... Bs> constexpr size_t index_n_v = index_n<Bs...>::value;
-
-/// Helper template to strip away type modifiers
-template <typename T> struct intrinsic_type                       { using type = T; };
-template <typename T> struct intrinsic_type<const T>              { using type = typename intrinsic_type<T>::type; };
-template <typename T> struct intrinsic_type<T*>                   { using type = typename intrinsic_type<T>::type; };
-template <typename T> struct intrinsic_type<T&>                   { using type = typename intrinsic_type<T>::type; };
-template <typename T> struct intrinsic_type<T&&>                  { using type = typename intrinsic_type<T>::type; };
-template <typename T, size_t N> struct intrinsic_type<const T[N]> { using type = typename intrinsic_type<T>::type; };
-template <typename T, size_t N> struct intrinsic_type<T[N]>       { using type = typename intrinsic_type<T>::type; };
-template <typename T> using intrinsic_t = typename intrinsic_type<T>::type;
-
-// More relaxed pointer test
-template <typename T>
-constexpr bool is_pointer_v = std::is_pointer_v<std::remove_reference_t<T>>;
-
-template <typename T, typename U>
-using forwarded_type = std::conditional_t<std::is_lvalue_reference_v<T>,
-                                          std::remove_reference_t<U> &,
-                                          std::remove_reference_t<U> &&>;
-
-/// Forwards a value U as rvalue or lvalue according to whether T is rvalue or lvalue; typically
-/// used for forwarding a container's elements.
-template <typename T, typename U> NB_INLINE forwarded_type<T, U> forward_like(U &&u) {
-    return (forwarded_type<T, U>) u;
-}
-
-template <typename T>
-constexpr bool is_std_char_v =
-    std::is_same_v<T, char>
-#if defined(NB_HAS_U8STRING)
-    || std::is_same_v<T, char8_t> /* std::u8string */
-#endif
-    || std::is_same_v<T, char16_t> ||
-    std::is_same_v<T, char32_t> || std::is_same_v<T, wchar_t>;
-
-template <bool V> using enable_if_t = std::enable_if_t<V, int>;
-
-/// Check if a function is a lambda function
-template <typename T>
-constexpr bool is_lambda_v = !std::is_function_v<T> && !std::is_pointer_v<T> &&
-                             !std::is_member_pointer_v<T>;
-
-/// Inspect the signature of a method call
-template <typename T> struct analyze_method { };
-template <typename Cls, typename Ret, typename... Args>
-struct analyze_method<Ret (Cls::*)(Args...)> {
-    using func = Ret(Args...);
-    static constexpr size_t argc = sizeof...(Args);
-};
-
-template <typename Cls, typename Ret, typename... Args>
-struct analyze_method<Ret (Cls::*)(Args...) const> {
-    using func = Ret(Args...);
-    static constexpr size_t argc = sizeof...(Args);
-};
-
-template <typename T>
-using forward_t = std::conditional_t<std::is_lvalue_reference_v<T>, T, T &&>;
-
-template <typename...> inline constexpr bool false_v = false;
-
-template <typename... Args> struct overload_cast_impl {
-    template <typename Return>
-    constexpr auto operator()(Return (*pf)(Args...)) const noexcept
-                              -> decltype(pf) { return pf; }
-
-    template <typename Return, typename Class>
-    constexpr auto operator()(Return (Class::*pmf)(Args...), std::false_type = {}) const noexcept
-                              -> decltype(pmf) { return pmf; }
-
-    template <typename Return, typename Class>
-    constexpr auto operator()(Return (Class::*pmf)(Args...) const, std::true_type) const noexcept
-                              -> decltype(pmf) { return pmf; }
-};
-
-/// Detector pattern
-template <typename SFINAE, template <typename> typename Op, typename Arg>
-struct detector : std::false_type { };
-
-template <template <typename> typename Op, typename Arg>
-struct detector<std::void_t<Op<Arg>>, Op, Arg>
-    : std::true_type { };
-
-NAMESPACE_END(detail)
-
-template <typename... Args>
-static constexpr detail::overload_cast_impl<Args...> overload_cast = {};
-static constexpr auto const_ = std::true_type{};
-
-template <template<typename> class Op, typename Arg>
-constexpr bool is_detected_v = detail::detector<void, Op, Arg>::value;
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_tuple.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_tuple.h
deleted file mode 100644
index 5bf3fb7ba..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_tuple.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-    nanobind/nb_tuple.h: tiny self-contained tuple class
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-/**
- * \brief nanobind::tuple<...>: a tiny recursive tuple class
- *
- * std::tuple<...> is one of those STL types that just seems unnecessarily
- * complex for typical usage. It pulls in a large amount of headers (22K LOC,
- * 530 KiB with Clang/libc++) and goes through elaborate contortions to avoid a
- * recursive definition. This is helpful when dealing with very large tuples
- * (e.g. efficient compilation of std::get<1000>() in a tuple with 10K entries).
- * When working with small tuples used to pass around a few arguments, a simple
- * recursive definition compiles faster (generated code is identical).
- */
-
-template <typename... Ts> struct tuple;
-template <> struct tuple<> {
-    template <size_t> using type = void;
-};
-
-template <typename T, typename... Ts> struct tuple<T, Ts...> : tuple<Ts...> {
-    using Base = tuple<Ts...>;
-
-    tuple() = default;
-    tuple(const tuple &) = default;
-    tuple(tuple &&) noexcept = default;
-    tuple& operator=(tuple &&) noexcept = default;
-    tuple& operator=(const tuple &) = default;
-
-    template <typename A, typename... As>
-    NB_INLINE tuple(A &&a, As &&...as)
-        : Base((detail::forward_t<As>) as...), value((detail::forward_t<A>) a) {}
-
-    template <size_t I> NB_INLINE auto& get() {
-        if constexpr (I == 0)
-            return value;
-        else
-            return Base::template get<I - 1>();
-    }
-
-    template <size_t I> NB_INLINE const auto& get() const {
-        if constexpr (I == 0)
-            return value;
-        else
-            return Base::template get<I - 1>();
-    }
-
-    template <size_t I>
-    using type =
-        std::conditional_t<I == 0, T, typename Base::template type<I - 1>>;
-
-private:
-    T value;
-};
-
-template <typename... Ts> tuple(Ts &&...) -> tuple<std::decay_t<Ts>...>;
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
-
-// Support for C++17 structured bindings
-template <typename... Ts>
-struct std::tuple_size<nanobind::detail::tuple<Ts...>>
-    : std::integral_constant<size_t, sizeof...(Ts)> { };
-
-template <size_t I, typename... Ts>
-struct std::tuple_element<I, nanobind::detail::tuple<Ts...>> {
-    using type = typename nanobind::detail::tuple<Ts...>::template type<I>;
-};
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_types.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_types.h
deleted file mode 100644
index 6ed8a23df..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/nb_types.h
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
-    nanobind/nb_types.h: nb::dict/str/list/..: C++ wrappers for Python types
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-
-/// Macro defining functions/constructors for nanobind::handle subclasses
-#define NB_OBJECT(Type, Parent, Str, Check)                                    \
-public:                                                                        \
-    static constexpr auto Name = detail::const_name(Str);                      \
-    NB_INLINE Type(handle h, detail::borrow_t)                                 \
-        : Parent(h, detail::borrow_t{}) {}                                     \
-    NB_INLINE Type(handle h, detail::steal_t)                                  \
-        : Parent(h, detail::steal_t{}) {}                                      \
-    NB_INLINE static bool check_(handle h) {                                   \
-        return Check(h.ptr());                                                 \
-    }
-
-/// Like NB_OBJECT but allow null-initialization
-#define NB_OBJECT_DEFAULT(Type, Parent, Str, Check)                            \
-    NB_OBJECT(Type, Parent, Str, Check)                                        \
-    NB_INLINE Type() : Parent() {}
-
-/// Helper macro to create detail::api comparison functions
-#define NB_API_COMP(name, op)                                                  \
-    template <typename T> NB_INLINE bool name(const api<T> &o) const {         \
-        return detail::obj_comp(derived().ptr(), o.derived().ptr(), op);       \
-    }
-
-/// Helper macro to create detail::api unary operators
-#define NB_API_OP_1(name, op)                                                  \
-    NB_INLINE auto name() const {                                              \
-        return steal(detail::obj_op_1(derived().ptr(), op));                   \
-    }
-
-/// Helper macro to create detail::api binary operators
-#define NB_API_OP_2(name, op)                                                  \
-    template <typename T> NB_INLINE auto name(const api<T> &o) const {         \
-        return steal(                                                          \
-            detail::obj_op_2(derived().ptr(), o.derived().ptr(), op));         \
-    }
-
-#define NB_API_OP_2_I(name, op)                                                \
-    template <typename T> NB_INLINE auto name(const api<T> &o) {               \
-        return steal(                                                          \
-            detail::obj_op_2(derived().ptr(), o.derived().ptr(), op));         \
-    }
-
-
-// A few forward declarations
-class object;
-class handle;
-class iterator;
-
-template <typename T = object> T borrow(handle h);
-template <typename T = object> T steal(handle h);
-
-NAMESPACE_BEGIN(detail)
-
-template <typename T, typename SFINAE = int> struct type_caster;
-template <typename T> using make_caster = type_caster<intrinsic_t<T>>;
-
-template <typename Impl> class accessor;
-struct str_attr; struct obj_attr;
-struct str_item; struct obj_item; struct num_item;
-struct num_item_list; struct num_item_tuple;
-class args_proxy; class kwargs_proxy;
-struct borrow_t { };
-struct steal_t { };
-class api_tag { };
-class dict_iterator;
-struct fast_iterator;
-
-// Standard operations provided by every nanobind object
-template <typename Derived> class api : public api_tag {
-public:
-    Derived &derived() { return static_cast<Derived &>(*this); }
-    const Derived &derived() const { return static_cast<const Derived &>(*this); }
-
-    NB_INLINE bool is(handle value) const;
-    NB_INLINE bool is_none() const { return derived().ptr() == Py_None; }
-    NB_INLINE bool is_type() const { return PyType_Check(derived().ptr()); }
-    NB_INLINE bool is_valid() const { return derived().ptr() != nullptr; }
-    NB_INLINE handle inc_ref() const & noexcept;
-    NB_INLINE handle dec_ref() const & noexcept;
-    iterator begin() const;
-    iterator end() const;
-
-    NB_INLINE handle type() const;
-    NB_INLINE operator handle() const;
-
-    accessor<obj_attr> attr(handle key) const;
-    accessor<str_attr> attr(const char *key) const;
-
-    accessor<obj_item> operator[](handle key) const;
-    accessor<str_item> operator[](const char *key) const;
-    template <typename T, enable_if_t<std::is_arithmetic_v<T>> = 1>
-    accessor<num_item> operator[](T key) const;
-    args_proxy operator*() const;
-
-    template <rv_policy policy = rv_policy::automatic_reference,
-              typename... Args>
-    object operator()(Args &&...args) const;
-
-    NB_API_COMP(equal,      Py_EQ)
-    NB_API_COMP(not_equal,  Py_NE)
-    NB_API_COMP(operator<,  Py_LT)
-    NB_API_COMP(operator<=, Py_LE)
-    NB_API_COMP(operator>,  Py_GT)
-    NB_API_COMP(operator>=, Py_GE)
-    NB_API_OP_1(operator-,  PyNumber_Negative)
-    NB_API_OP_1(operator!,  PyNumber_Invert)
-    NB_API_OP_2(operator+,  PyNumber_Add)
-    NB_API_OP_2(operator-,  PyNumber_Subtract)
-    NB_API_OP_2(operator*,  PyNumber_Multiply)
-    NB_API_OP_2(operator/,  PyNumber_TrueDivide)
-    NB_API_OP_2(operator|,  PyNumber_Or)
-    NB_API_OP_2(operator&,  PyNumber_And)
-    NB_API_OP_2(operator^,  PyNumber_Xor)
-    NB_API_OP_2(operator<<, PyNumber_Lshift)
-    NB_API_OP_2(operator>>, PyNumber_Rshift)
-    NB_API_OP_2(floor_div,  PyNumber_FloorDivide)
-    NB_API_OP_2_I(operator+=, PyNumber_InPlaceAdd)
-    NB_API_OP_2_I(operator-=, PyNumber_InPlaceSubtract)
-    NB_API_OP_2_I(operator*=, PyNumber_InPlaceMultiply)
-    NB_API_OP_2_I(operator/=, PyNumber_InPlaceTrueDivide)
-    NB_API_OP_2_I(operator|=, PyNumber_InPlaceOr)
-    NB_API_OP_2_I(operator&=, PyNumber_InPlaceAnd)
-    NB_API_OP_2_I(operator^=, PyNumber_InPlaceXor)
-    NB_API_OP_2_I(operator<<=,PyNumber_InPlaceLshift)
-    NB_API_OP_2_I(operator>>=,PyNumber_InPlaceRshift)
-};
-
-NAMESPACE_END(detail)
-
-class handle : public detail::api<handle> {
-    friend class python_error;
-    friend struct detail::str_attr;
-    friend struct detail::obj_attr;
-    friend struct detail::str_item;
-    friend struct detail::obj_item;
-    friend struct detail::num_item;
-public:
-    static constexpr auto Name = detail::const_name("object");
-
-    handle() = default;
-    handle(const handle &) = default;
-    handle(handle &&) noexcept = default;
-    handle &operator=(const handle &) = default;
-    handle &operator=(handle &&) noexcept = default;
-    NB_INLINE handle(const PyObject *ptr) : m_ptr((PyObject *) ptr) { }
-    NB_INLINE handle(const PyTypeObject *ptr) : m_ptr((PyObject *) ptr) { }
-
-    const handle& inc_ref() const & noexcept { Py_XINCREF(m_ptr); return *this; }
-    const handle& dec_ref() const & noexcept { Py_XDECREF(m_ptr); return *this; }
-
-    NB_INLINE operator bool() const { return m_ptr != nullptr; }
-    NB_INLINE PyObject *ptr() const { return m_ptr; }
-    NB_INLINE static bool check_(handle) { return true; }
-
-protected:
-    PyObject *m_ptr = nullptr;
-};
-
-class object : public handle {
-public:
-    static constexpr auto Name = detail::const_name("object");
-
-    object() = default;
-    object(const object &o) : handle(o) { inc_ref(); }
-    object(object &&o) noexcept : handle(o) { o.m_ptr = nullptr; }
-    ~object() { dec_ref(); }
-    object(handle h, detail::borrow_t) : handle(h) { inc_ref(); }
-    object(handle h, detail::steal_t) : handle(h) { }
-
-    handle release() {
-      handle temp(m_ptr);
-      m_ptr = nullptr;
-      return temp;
-    }
-
-    void clear() {
-        dec_ref();
-        m_ptr = nullptr;
-    }
-
-    object& operator=(const object &o) {
-        handle temp(m_ptr);
-        o.inc_ref();
-        m_ptr = o.m_ptr;
-        temp.dec_ref();
-        return *this;
-    }
-
-    object& operator=(object &&o) noexcept {
-        handle temp(m_ptr);
-        m_ptr = o.m_ptr;
-        o.m_ptr = nullptr;
-        temp.dec_ref();
-        return *this;
-    }
-};
-
-template <typename T> NB_INLINE T borrow(handle h) {
-    return { h, detail::borrow_t() };
-}
-
-template <typename T> NB_INLINE T steal(handle h) {
-    return { h, detail::steal_t() };
-}
-
-inline bool hasattr(handle obj, const char *key) noexcept {
-    return PyObject_HasAttrString(obj.ptr(), key);
-}
-
-inline bool hasattr(handle obj, handle key) noexcept {
-    return PyObject_HasAttr(obj.ptr(), key.ptr());
-}
-
-inline object getattr(handle obj, const char *key) {
-    return steal(detail::getattr(obj.ptr(), key));
-}
-
-inline object getattr(handle obj, handle key) {
-    return steal(detail::getattr(obj.ptr(), key.ptr()));
-}
-
-inline object getattr(handle obj, const char *key, handle def) noexcept {
-    return steal(detail::getattr(obj.ptr(), key, def.ptr()));
-}
-
-inline object getattr(handle obj, handle key, handle value) noexcept {
-    return steal(detail::getattr(obj.ptr(), key.ptr(), value.ptr()));
-}
-
-inline void setattr(handle obj, const char *key, handle value) {
-    detail::setattr(obj.ptr(), key, value.ptr());
-}
-
-inline void setattr(handle obj, handle key, handle value) {
-    detail::setattr(obj.ptr(), key.ptr(), value.ptr());
-}
-
-class module_ : public object {
-public:
-    NB_OBJECT(module_, object, "module", PyModule_CheckExact);
-
-    template <typename Func, typename... Extra>
-    module_ &def(const char *name_, Func &&f, const Extra &...extra);
-
-    /// Import and return a module or throws `python_error`.
-    static NB_INLINE module_ import_(const char *name) {
-        return steal<module_>(detail::module_import(name));
-    }
-
-    /// Import and return a module or throws `python_error`.
-    NB_INLINE module_ def_submodule(const char *name,
-                                    const char *doc = nullptr) {
-        return borrow<module_>(detail::module_new_submodule(m_ptr, name, doc));
-    }
-};
-
-class capsule : public object {
-    NB_OBJECT_DEFAULT(capsule, object, "capsule", PyCapsule_CheckExact)
-
-    capsule(const void *ptr, void (*free)(void *) noexcept = nullptr) {
-        m_ptr = detail::capsule_new(ptr, free);
-    }
-
-    void *data() const { return PyCapsule_GetPointer(m_ptr, nullptr); }
-};
-
-class str : public object {
-    NB_OBJECT_DEFAULT(str, object, "str", PyUnicode_Check)
-
-    explicit str(handle h)
-        : object(detail::str_from_obj(h.ptr()), detail::steal_t{}) { }
-
-    explicit str(const char *c)
-        : object(detail::str_from_cstr(c), detail::steal_t{}) { }
-
-    explicit str(const char *c, size_t n)
-        : object(detail::str_from_cstr_and_size(c, n), detail::steal_t{}) { }
-
-    const char *c_str() { return PyUnicode_AsUTF8AndSize(m_ptr, nullptr); }
-};
-
-class tuple : public object {
-    NB_OBJECT_DEFAULT(tuple, object, "tuple", PyTuple_Check)
-    size_t size() const { return NB_TUPLE_GET_SIZE(m_ptr); }
-    template <typename T, detail::enable_if_t<std::is_arithmetic_v<T>> = 1>
-    detail::accessor<detail::num_item_tuple> operator[](T key) const;
-#if !defined(Py_LIMITED_API)
-    detail::fast_iterator begin() const;
-    detail::fast_iterator end() const;
-#endif
-};
-
-class type_object : public object {
-    NB_OBJECT_DEFAULT(type_object, object, "type", PyType_Check)
-};
-
-class list : public object {
-    NB_OBJECT(list, object, "list", PyList_Check)
-    list() : object(PyList_New(0), detail::steal_t()) { }
-    size_t size() const { return NB_LIST_GET_SIZE(m_ptr); }
-
-    template <typename T> void append(T &&value);
-
-    template <typename T, detail::enable_if_t<std::is_arithmetic_v<T>> = 1>
-    detail::accessor<detail::num_item_list> operator[](T key) const;
-#if !defined(Py_LIMITED_API)
-    detail::fast_iterator begin() const;
-    detail::fast_iterator end() const;
-#endif
-};
-
-class dict : public object {
-    NB_OBJECT(dict, object, "dict", PyDict_Check)
-    dict() : object(PyDict_New(), detail::steal_t()) { }
-    size_t size() const { return NB_DICT_GET_SIZE(m_ptr); }
-    detail::dict_iterator begin() const;
-    detail::dict_iterator end() const;
-    list keys() const { return steal<list>(detail::obj_op_1(m_ptr, PyDict_Keys)); }
-    list values() const { return steal<list>(detail::obj_op_1(m_ptr, PyDict_Values)); }
-    list items() const { return steal<list>(detail::obj_op_1(m_ptr, PyDict_Items)); }
-};
-
-class sequence : public object {
-    NB_OBJECT_DEFAULT(sequence, object, "Sequence", PySequence_Check)
-};
-
-class mapping : public object {
-    NB_OBJECT_DEFAULT(mapping, object, "Mapping", PyMapping_Check)
-    list keys() const { return steal<list>(detail::obj_op_1(m_ptr, PyMapping_Keys)); }
-    list values() const { return steal<list>(detail::obj_op_1(m_ptr, PyMapping_Values)); }
-    list items() const { return steal<list>(detail::obj_op_1(m_ptr, PyMapping_Items)); }
-};
-
-class args : public tuple {
-    NB_OBJECT_DEFAULT(args, tuple, "tuple", PyTuple_Check)
-};
-
-class kwargs : public dict {
-    NB_OBJECT_DEFAULT(kwargs, dict, "dict", PyDict_Check)
-};
-
-class iterator : public object {
-public:
-    using difference_type = Py_ssize_t;
-    using value_type = handle;
-    using reference = const handle;
-    using pointer = const handle *;
-
-    NB_OBJECT_DEFAULT(iterator, object, "iterator", PyIter_Check)
-
-    iterator& operator++() {
-        m_value = steal(detail::obj_iter_next(m_ptr));
-        return *this;
-    }
-
-    iterator operator++(int) {
-        iterator rv = *this;
-        m_value = steal(detail::obj_iter_next(m_ptr));
-        return rv;
-    }
-
-    handle operator*() const {
-        if (is_valid() && !m_value.is_valid())
-            m_value = steal(detail::obj_iter_next(m_ptr));
-        return m_value;
-    }
-
-    pointer operator->() const { operator*(); return &m_value; }
-
-    static iterator sentinel() { return {}; }
-
-    friend bool operator==(const iterator &a, const iterator &b) { return a->ptr() == b->ptr(); }
-    friend bool operator!=(const iterator &a, const iterator &b) { return a->ptr() != b->ptr(); }
-
-private:
-    mutable object m_value;
-};
-
-template <typename T>
-NB_INLINE bool isinstance(handle obj) noexcept {
-    if constexpr (std::is_base_of_v<handle, T>)
-        return T::check_(obj);
-    else
-        return detail::nb_type_isinstance(obj.ptr(), &typeid(detail::intrinsic_t<T>));
-}
-
-NB_INLINE str repr(handle h) { return steal<str>(detail::obj_repr(h.ptr())); }
-NB_INLINE size_t len(handle h) { return detail::obj_len(h.ptr()); }
-NB_INLINE size_t len(const tuple &t) { return NB_TUPLE_GET_SIZE(t.ptr()); }
-NB_INLINE size_t len(const list &t) { return NB_LIST_GET_SIZE(t.ptr()); }
-NB_INLINE size_t len(const dict &t) { return NB_DICT_GET_SIZE(t.ptr()); }
-
-inline void print(handle value, handle end = handle(), handle file = handle()) {
-    detail::print(value.ptr(), end.ptr(), file.ptr());
-}
-
-inline void print(const char *str, handle end = handle(), handle file = handle()) {
-    print(nanobind::str(str), end, file);
-}
-
-/// Retrieve the Python type object associated with a C++ class
-template <typename T> handle type() {
-    return detail::nb_type_lookup(&typeid(detail::intrinsic_t<T>));
-}
-
-inline object none() { return borrow(Py_None); }
-inline dict builtins() { return borrow<dict>(PyEval_GetBuiltins()); }
-
-inline iterator iter(handle h) {
-    return steal<iterator>(detail::obj_iter(h.ptr()));
-}
-
-template <typename T> class handle_t : public handle {
-public:
-    static constexpr auto Name = detail::make_caster<T>::Name;
-
-    using handle::handle;
-    using handle::operator=;
-    handle_t(const handle &h) : handle(h) { }
-
-    static bool check_(handle h) { return isinstance<T>(h); }
-};
-
-template <typename T> class type_object_t : public type_object {
-public:
-    static constexpr auto Name = detail::const_name("type[") +
-                                 detail::make_caster<T>::Name +
-                                 detail::const_name("]");
-
-    using type_object::type_object;
-    using type_object::operator=;
-
-    static bool check_(handle h) {
-        return PyType_Check(h.ptr()) &&
-               PyType_IsSubtype((PyTypeObject *) h.ptr(),
-                                (PyTypeObject *) nanobind::type<T>().ptr());
-    }
-};
-
-
-NAMESPACE_BEGIN(detail)
-template <typename Derived> NB_INLINE api<Derived>::operator handle() const {
-    return derived().ptr();
-}
-
-template <typename Derived> NB_INLINE handle api<Derived>::type() const {
-    return (PyObject *) Py_TYPE(derived().ptr());
-}
-
-template <typename Derived>
-NB_INLINE handle api<Derived>::inc_ref() const &noexcept {
-    return operator handle().inc_ref();
-}
-
-template <typename Derived>
-NB_INLINE bool api<Derived>::is(handle value) const {
-    return derived().ptr() == value.ptr();
-}
-
-template <typename Derived> iterator api<Derived>::begin() const {
-    return iter(*this);
-}
-
-template <typename Derived> iterator api<Derived>::end() const {
-    return iterator::sentinel();
-}
-
-struct fast_iterator {
-    using value_type = handle;
-    using reference = const value_type;
-
-    fast_iterator(PyObject **value) : value(value) { }
-
-    fast_iterator& operator++() { value++; return *this; }
-    fast_iterator operator++(int) { fast_iterator rv = *this; value++; return rv; }
-    friend bool operator==(const fast_iterator &a, const fast_iterator &b) { return a.value == b.value; }
-    friend bool operator!=(const fast_iterator &a, const fast_iterator &b) { return a.value != b.value; }
-
-    handle operator*() const { return *value; }
-
-    PyObject **value;
-};
-
-class dict_iterator {
-public:
-    using value_type = std::pair<handle, handle>;
-    using reference = const value_type;
-
-    dict_iterator() : obj(handle()), pos(-1) { }
-
-    dict_iterator(handle obj) : obj(obj), pos(0) {
-        increment();
-    }
-
-    dict_iterator& operator++() {
-        increment();
-        return *this;
-    }
-
-    dict_iterator operator++(int) {
-        dict_iterator rv = *this;
-        increment();
-        return rv;
-    }
-
-    void increment() {
-        if (PyDict_Next(obj.ptr(), &pos, &key, &value) == 0)
-            pos = -1;
-    }
-
-    value_type operator*() const { return { key, value }; }
-
-    friend bool operator==(const dict_iterator &a, const dict_iterator &b) { return a.pos == b.pos; }
-    friend bool operator!=(const dict_iterator &a, const dict_iterator &b) { return a.pos != b.pos; }
-
-private:
-    handle obj;
-    Py_ssize_t pos;
-    PyObject *key = nullptr, *value = nullptr;
-};
-
-
-NAMESPACE_END(detail)
-
-inline detail::dict_iterator dict::begin() const { return { *this }; }
-inline detail::dict_iterator dict::end() const { return { }; }
-
-#if !defined(Py_LIMITED_API)
-inline detail::fast_iterator tuple::begin() const {
-    return ((PyTupleObject *) m_ptr)->ob_item;
-}
-inline detail::fast_iterator tuple::end() const {
-    PyTupleObject *v = (PyTupleObject *) m_ptr;
-    return v->ob_item + v->ob_base.ob_size;
-}
-inline detail::fast_iterator list::begin() const {
-    return ((PyListObject *) m_ptr)->ob_item;
-}
-inline detail::fast_iterator list::end() const {
-    PyListObject *v = (PyListObject *) m_ptr;
-    return v->ob_item + v->ob_base.ob_size;
-}
-#endif
-
-NAMESPACE_END(NB_NAMESPACE)
-
-#undef NB_API_COMP
-#undef NB_API_OP_1
-#undef NB_API_OP_2
-#undef NB_API_OP_2_I
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/operators.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/operators.h
deleted file mode 100644
index f4bdc8fb8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/operators.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-    nanobind/operators.h: convenience functionality for operator overloading
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-#pragma once
-
-#include <nanobind/nanobind.h>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-/// Enumeration with all supported operator types
-enum op_id : int {
-    op_add, op_sub, op_mul, op_div, op_mod, op_divmod, op_pow, op_lshift,
-    op_rshift, op_and, op_xor, op_or, op_neg, op_pos, op_abs, op_invert,
-    op_int, op_long, op_float, op_str, op_cmp, op_gt, op_ge, op_lt, op_le,
-    op_eq, op_ne, op_iadd, op_isub, op_imul, op_idiv, op_imod, op_ilshift,
-    op_irshift, op_iand, op_ixor, op_ior, op_complex, op_bool, op_nonzero,
-    op_repr, op_truediv, op_itruediv, op_hash
-};
-
-enum op_type : int {
-    op_l, /* base type on left */
-    op_r, /* base type on right */
-    op_u  /* unary operator */
-};
-
-struct self_t { };
-[[maybe_unused]] static const self_t self = self_t();
-
-/// Type for an unused type slot
-struct undefined_t { };
-
-/// base template of operator implementations
-template <op_id, op_type, typename B, typename L, typename R> struct op_impl { };
-
-/// Operator implementation generator
-template <op_id id, op_type ot, typename L, typename R> struct op_ {
-    template <typename Class, typename... Extra> void execute(Class &cl, const Extra&... extra) const {
-        using Type = typename Class::Type;
-        using Lt = std::conditional_t<std::is_same_v<L, self_t>, Type, L>;
-        using Rt = std::conditional_t<std::is_same_v<R, self_t>, Type, R>;
-        using Op = op_impl<id, ot, Type, Lt, Rt>;
-        cl.def(Op::name(), &Op::execute, is_operator(), extra...);
-    }
-
-    template <typename Class, typename... Extra> void execute_cast(Class &cl, const Extra&... extra) const {
-        using Type = typename Class::Type;
-        using Lt = std::conditional_t<std::is_same_v<L, self_t>, Type, L>;
-        using Rt = std::conditional_t<std::is_same_v<R, self_t>, Type, R>;
-        using Op = op_impl<id, ot, Type, Lt, Rt>;
-        cl.def(Op::name(), &Op::execute_cast, is_operator(), extra...);
-    }
-};
-
-#define NB_BINARY_OPERATOR(id, rid, op, expr)                                          \
-template <typename B, typename L, typename R> struct op_impl<op_##id, op_l, B, L, R> { \
-    static char const* name() { return "__" #id "__"; }                                \
-    static auto execute(const L &l, const R &r) -> decltype(expr) { return (expr); }   \
-    static B execute_cast(const L &l, const R &r) { return B(expr); }                  \
-};                                                                                     \
-template <typename B, typename L, typename R> struct op_impl<op_##id, op_r, B, L, R> { \
-    static char const* name() { return "__" #rid "__"; }                               \
-    static auto execute(const R &r, const L &l) -> decltype(expr) { return (expr); }   \
-    static B execute_cast(const R &r, const L &l) { return B(expr); }                  \
-};                                                                                     \
-inline op_<op_##id, op_l, self_t, self_t> op(const self_t &, const self_t &) {         \
-    return op_<op_##id, op_l, self_t, self_t>();                                       \
-}                                                                                      \
-template <typename T> op_<op_##id, op_l, self_t, T> op(const self_t &, const T &) {    \
-    return op_<op_##id, op_l, self_t, T>();                                            \
-}                                                                                      \
-template <typename T> op_<op_##id, op_r, T, self_t> op(const T &, const self_t &) {    \
-    return op_<op_##id, op_r, T, self_t>();                                            \
-}
-
-#define NB_INPLACE_OPERATOR(id, op, expr)                                              \
-template <typename B, typename L, typename R> struct op_impl<op_##id, op_l, B, L, R> { \
-    static char const* name() { return "__" #id "__"; }                                \
-    static auto execute(L &l, const R &r) -> decltype(expr) { return expr; }           \
-    static B execute_cast(L &l, const R &r) { return B(expr); }                        \
-};                                                                                     \
-template <typename T> op_<op_##id, op_l, self_t, T> op(const self_t &, const T &) {    \
-    return op_<op_##id, op_l, self_t, T>();                                            \
-}
-
-#define NB_UNARY_OPERATOR(id, op, expr)                                                \
-template <typename B, typename L> struct op_impl<op_##id, op_u, B, L, undefined_t> {   \
-    static char const* name() { return "__" #id "__"; }                                \
-    static auto execute(const L &l) -> decltype(expr) { return expr; }                 \
-    static B execute_cast(const L &l) { return B(expr); }                              \
-};                                                                                     \
-inline op_<op_##id, op_u, self_t, undefined_t> op(const self_t &) {                    \
-    return op_<op_##id, op_u, self_t, undefined_t>();                                  \
-}
-
-NB_BINARY_OPERATOR(sub,       rsub,         operator-,    l - r)
-NB_BINARY_OPERATOR(add,       radd,         operator+,    l + r)
-NB_BINARY_OPERATOR(mul,       rmul,         operator*,    l * r)
-NB_BINARY_OPERATOR(truediv,   rtruediv,     operator/,    l / r)
-NB_BINARY_OPERATOR(mod,       rmod,         operator%,    l % r)
-NB_BINARY_OPERATOR(lshift,    rlshift,      operator<<,   l << r)
-NB_BINARY_OPERATOR(rshift,    rrshift,      operator>>,   l >> r)
-NB_BINARY_OPERATOR(and,       rand,         operator&,    l & r)
-NB_BINARY_OPERATOR(xor,       rxor,         operator^,    l ^ r)
-NB_BINARY_OPERATOR(eq,        eq,           operator==,   l == r)
-NB_BINARY_OPERATOR(ne,        ne,           operator!=,   l != r)
-NB_BINARY_OPERATOR(or,        ror,          operator|,    l | r)
-NB_BINARY_OPERATOR(gt,        lt,           operator>,    l > r)
-NB_BINARY_OPERATOR(ge,        le,           operator>=,   l >= r)
-NB_BINARY_OPERATOR(lt,        gt,           operator<,    l < r)
-NB_BINARY_OPERATOR(le,        ge,           operator<=,   l <= r)
-NB_INPLACE_OPERATOR(iadd,     operator+=,   l += r)
-NB_INPLACE_OPERATOR(isub,     operator-=,   l -= r)
-NB_INPLACE_OPERATOR(imul,     operator*=,   l *= r)
-NB_INPLACE_OPERATOR(itruediv, operator/=,   l /= r)
-NB_INPLACE_OPERATOR(imod,     operator%=,   l %= r)
-NB_INPLACE_OPERATOR(ilshift,  operator<<=,  l <<= r)
-NB_INPLACE_OPERATOR(irshift,  operator>>=,  l >>= r)
-NB_INPLACE_OPERATOR(iand,     operator&=,   l &= r)
-NB_INPLACE_OPERATOR(ixor,     operator^=,   l ^= r)
-NB_INPLACE_OPERATOR(ior,      operator|=,   l |= r)
-NB_UNARY_OPERATOR(neg,        operator-,    -l)
-NB_UNARY_OPERATOR(pos,        operator+,    +l)
-NB_UNARY_OPERATOR(abs,        abs,          std::abs(l))
-NB_UNARY_OPERATOR(hash,       hash,         std::hash<L>()(l))
-NB_UNARY_OPERATOR(invert,     operator~,    (~l))
-NB_UNARY_OPERATOR(bool,       operator!,    !!l)
-NB_UNARY_OPERATOR(int,        int_,         (int) l)
-NB_UNARY_OPERATOR(float,      float_,       (double) l)
-
-#undef NB_BINARY_OPERATOR
-#undef NB_INPLACE_OPERATOR
-#undef NB_UNARY_OPERATOR
-
-NAMESPACE_END(detail)
-
-// Add named operators so that they are accessible via `nb::`.
-using detail::self;
-using detail::hash;
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/detail/nb_list.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/detail/nb_list.h
deleted file mode 100644
index 8d8309e43..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/detail/nb_list.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#pragma once
-
-#include <nanobind/nanobind.h>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-template <typename Value_, typename Entry> struct list_caster {
-    NB_TYPE_CASTER(Value_, const_name("Sequence[") + make_caster<Entry>::Name +
-                               const_name("]"));
-
-    using Caster = make_caster<Entry>;
-
-    template <typename T> using has_reserve = decltype(std::declval<T>().reserve(0));
-
-    bool from_python(handle src, uint8_t flags, cleanup_list *cleanup) noexcept {
-        size_t size;
-        PyObject *temp;
-
-        /* Will initialize 'size' and 'temp'. All return values and
-           return parameters are zero/NULL in the case of a failure. */
-        PyObject **o = seq_get(src.ptr(), &size, &temp);
-
-        value.clear();
-
-        if constexpr (is_detected_v<has_reserve, Value_>)
-            value.reserve(size);
-
-        Caster caster;
-        bool success = o != nullptr;
-
-        for (size_t i = 0; i < size; ++i) {
-            if (!caster.from_python(o[i], flags, cleanup)) {
-                success = false;
-                break;
-            }
-            value.push_back(((Caster &&) caster).operator cast_t<Entry &&>());
-        }
-
-        Py_XDECREF(temp);
-
-        return success;
-    }
-
-    template <typename T>
-    static handle from_cpp(T &&src, rv_policy policy, cleanup_list *cleanup) {
-        object list = steal(PyList_New(src.size()));
-        if (list) {
-            Py_ssize_t index = 0;
-
-            for (auto &value : src) {
-                handle h =
-                    Caster::from_cpp(forward_like<T>(value), policy, cleanup);
-
-                NB_LIST_SET_ITEM(list.ptr(), index++, h.ptr());
-                if (!h.is_valid())
-                    return handle();
-            }
-        }
-
-        return list.release();
-    }
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/function.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/function.h
deleted file mode 100644
index 2fa1158d6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/function.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-#include <nanobind/nanobind.h>
-#include <functional>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-struct function_handle {
-    object f;
-    explicit function_handle(handle h): f(borrow(h)) { }
-    function_handle(function_handle &&h) noexcept : f(std::move(h.f)) { }
-    function_handle(const function_handle &h) {
-        gil_scoped_acquire acq;
-        f = h.f;
-    }
-
-    ~function_handle() {
-        if (f.is_valid()) {
-            gil_scoped_acquire acq;
-            f.release().dec_ref();
-        }
-    }
-};
-
-template <typename Return, typename... Args>
-struct type_caster<std::function<Return(Args...)>> {
-    NB_TYPE_CASTER(std::function <Return(Args...)>,
-                   const_name("Callable[[") +
-                       concat(make_caster<Args>::Name...) + const_name("], ") +
-                       make_caster<Return>::Name + const_name("]"));
-
-    bool from_python(handle src, uint8_t flags, cleanup_list *) noexcept {
-        if (src.is_none())
-            return flags & cast_flags::convert;
-
-        if (!PyCallable_Check(src.ptr()))
-            return false;
-
-        value = [f = function_handle(src)](Args... args) -> Return {
-            gil_scoped_acquire acq;
-            return cast<Return>(f.f((forward_t<Args>) args...));
-        };
-
-        return true;
-    }
-
-    static handle from_cpp(const Value &value, rv_policy,
-                           cleanup_list *) noexcept {
-        if (!value)
-            return none().inc_ref();
-        return cpp_function(value).release();
-    }
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/list.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/list.h
deleted file mode 100644
index dd367ff5a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/list.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "detail/nb_list.h"
-#include <list>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-template <typename Type, typename Alloc> struct type_caster<std::list<Type, Alloc>>
- : list_caster<std::list<Type, Alloc>, Type> { };
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/pair.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/pair.h
deleted file mode 100644
index 1091009ce..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/pair.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#pragma once
-
-#include <nanobind/nanobind.h>
-#include <utility>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-template <typename T1, typename T2> struct type_caster<std::pair<T1, T2>> {
-    using Value = std::pair<T1, T2>;
-
-    // Sub type casters
-    using Caster1 = make_caster<T1>;
-    using Caster2 = make_caster<T2>;
-
-    /**
-     * \brief Target type for extracting the result of a `from_python` cast
-     * using the C++ cast operator (see operator Value() below)
-     *
-     * The std::pair type caster is slightly restricted: to support pairs
-     * containing references, the pair is constructed on the fly in the cast
-     * operator. Other classes will typically specify the more general
-     *
-     * ```
-     * template <typename T> using Cast = default_cast_t<T_>;
-     * // or, even better:
-     * template <typename T> using Cast = movable_cast_t<T_>;
-     * ```
-     *
-     * which can also cast to pointers, or lvalue/rvalue references.
-     */
-    template <typename T> using Cast = Value;
-
-    // Value name for docstring generation
-    static constexpr auto Name =
-        const_name("tuple[") + concat(Caster1::Name, Caster2::Name) + const_name("]");
-
-    /// Python -> C++ caster, populates `caster1` and `caster2` upon success
-    bool from_python(handle src, uint8_t flags,
-                     cleanup_list *cleanup) noexcept {
-        PyObject *temp; // always initialized by the following line
-        PyObject **o = seq_get_with_size(src.ptr(), 2, &temp);
-
-        bool success = o &&
-                       caster1.from_python(o[0], flags, cleanup) &&
-                       caster2.from_python(o[1], flags, cleanup);
-
-        Py_XDECREF(temp);
-
-        return success;
-    }
-
-    template <typename T>
-    static handle from_cpp(T *value, rv_policy policy, cleanup_list *cleanup) {
-        if (!value)
-            return none().release();
-        return from_cpp(*value, policy, cleanup);
-    }
-
-    template <typename T>
-    static handle from_cpp(T &&value, rv_policy policy,
-                           cleanup_list *cleanup) noexcept {
-        object o1 = steal(
-            Caster1::from_cpp(forward_like<T>(value.first), policy, cleanup));
-        if (!o1.is_valid())
-            return {};
-
-        object o2 = steal(
-            Caster2::from_cpp(forward_like<T>(value.second), policy, cleanup));
-        if (!o2.is_valid())
-            return {};
-
-        PyObject *r = PyTuple_New(2);
-        NB_TUPLE_SET_ITEM(r, 0, o1.release().ptr());
-        NB_TUPLE_SET_ITEM(r, 1, o2.release().ptr());
-        return r;
-    }
-
-    /// Return the constructed tuple by copying from the sub-casters
-    explicit operator Value() & {
-        return Value(caster1.operator cast_t<T1>(),
-                     caster2.operator cast_t<T2>());
-    }
-
-    // Return the constructed type by moving from the sub-casters
-    explicit operator Value() && {
-        return Value(((Caster1 &&) caster1).operator cast_t<T1>(),
-                     ((Caster2 &&) caster2).operator cast_t<T2>());
-    }
-
-    Caster1 caster1;
-    Caster2 caster2;
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/shared_ptr.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/shared_ptr.h
deleted file mode 100644
index c4f6f5661..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/shared_ptr.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    nanobind/stl/shared_ptr.h: Type caster for std::shared_ptr<T>
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include <nanobind/nanobind.h>
-#include <memory>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-/**
- * Create a generic std::shared_ptr to evade population of a potential
- * std::enable_shared_from_this weak pointer. The specified deleter reduces the
- * reference count of the Python object.
- *
- * The next two functions are simultaneously marked as 'inline' (to avoid
- * linker errors) and 'NB_NOINLINE' (to avoid them being inlined into every
- * single shared_ptr type_caster, which would enlarge the binding size)
- */
-inline NB_NOINLINE std::shared_ptr<void>
-shared_from_python(void *ptr, handle h) noexcept {
-    struct py_deleter {
-        void operator()(void *) noexcept {
-            gil_scoped_acquire guard;
-            Py_DECREF(o);
-        }
-
-        PyObject *o;
-    };
-
-    if (ptr)
-        return std::shared_ptr<void>(ptr, py_deleter{ h.inc_ref().ptr() });
-    else
-        return std::shared_ptr<void>((PyObject *) nullptr);
-}
-
-inline NB_NOINLINE void shared_from_cpp(std::shared_ptr<void> &&ptr,
-                                        PyObject *o) noexcept {
-    keep_alive(o, new std::shared_ptr<void>(std::move(ptr)),
-               [](void *p) noexcept { delete (std::shared_ptr<void> *) p; });
-}
-
-template <class T, class = void>
-struct uses_shared_from_this : std::false_type { };
-
-template <class T>
-struct uses_shared_from_this<
-    T, std::void_t<decltype(std::declval<T>().shared_from_this())>>
-    : std::true_type { };
-
-template <typename T> struct type_caster<std::shared_ptr<T>> {
-    using Value = std::shared_ptr<T>;
-    using Caster = make_caster<T>;
-    static_assert(Caster::IsClass,
-                  "Binding 'shared_ptr<T>' requires that 'T' can also be bound "
-                  "by nanobind. It appears that you specified a type which "
-                  "would undergo conversion/copying, which is not allowed.");
-    static_assert(
-        !uses_shared_from_this<T>::value,
-        "nanobind does not permit use of std::shared_from_this, which can "
-        "cause undefined behavior. (Refer to docs/ownership.md for details.)");
-
-    static constexpr auto Name = Caster::Name;
-    static constexpr bool IsClass = true;
-
-    template <typename T_> using Cast = movable_cast_t<T_>;
-
-    Value value;
-
-    bool from_python(handle src, uint8_t flags,
-                     cleanup_list *cleanup) noexcept {
-        Caster caster;
-        if (!caster.from_python(src, flags, cleanup))
-            return false;
-
-        value = std::static_pointer_cast<T>(
-            shared_from_python(caster.operator T *(), src));
-
-        return true;
-    }
-
-    static handle from_cpp(const Value *value, rv_policy policy,
-                           cleanup_list *cleanup) noexcept {
-        if (!value)
-            return (PyObject *) nullptr;
-        return from_cpp(*value, policy, cleanup);
-    }
-
-    static handle from_cpp(const Value &value, rv_policy,
-                           cleanup_list *cleanup) noexcept {
-        bool is_new = false;
-        handle result = nb_type_put(&typeid(T), value.get(),
-                                    rv_policy::reference, cleanup, &is_new);
-
-        if (is_new)
-            shared_from_cpp(std::static_pointer_cast<void>(value),
-                            result.ptr());
-
-        return result;
-    }
-
-    explicit operator Value *() { return &value; }
-    explicit operator Value &() { return value; }
-    explicit operator Value &&() && { return (Value &&) value; }
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/string.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/string.h
deleted file mode 100644
index e83eefaab..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/string.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <nanobind/nanobind.h>
-#include <string>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-template <> struct type_caster<std::string> {
-    NB_TYPE_CASTER(std::string, const_name("str"));
-
-    bool from_python(handle src, uint8_t, cleanup_list *) noexcept {
-        Py_ssize_t size;
-        const char *str = PyUnicode_AsUTF8AndSize(src.ptr(), &size);
-        if (!str) {
-            PyErr_Clear();
-            return false;
-        }
-        value = std::string(str, (size_t) size);
-        return true;
-    }
-
-    static handle from_cpp(const std::string &value, rv_policy,
-                           cleanup_list *) noexcept {
-        return PyUnicode_FromStringAndSize(value.c_str(), value.size());
-    }
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/tuple.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/tuple.h
deleted file mode 100644
index fe89004ea..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/tuple.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#pragma once
-
-#include <nanobind/nanobind.h>
-#include <tuple>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-template <typename... Ts> struct type_caster<std::tuple<Ts...>> {
-    static constexpr size_t N  = sizeof...(Ts),
-                            N1 = N > 0 ? N : 1;
-
-    using Value = std::tuple<Ts...>;
-    using Indices = std::make_index_sequence<N>;
-
-    static constexpr bool IsClass = false;
-    static constexpr auto Name = const_name("tuple[") +
-                                 concat(make_caster<Ts>::Name...) +
-                                 const_name("]");
-
-    template <typename T> using Cast = Value;
-
-    bool from_python(handle src, uint8_t flags,
-                     cleanup_list *cleanup) noexcept {
-        return from_python_impl(src, flags, cleanup, Indices{});
-    }
-
-    template <size_t... Is>
-    NB_INLINE bool from_python_impl(handle src, uint8_t flags,
-                                    cleanup_list *cleanup,
-                                    std::index_sequence<Is...>) noexcept {
-        (void) src; (void) flags; (void) cleanup;
-
-        PyObject *temp; // always initialized by the following line
-        PyObject **o = seq_get_with_size(src.ptr(), N, &temp);
-
-        bool success =
-            (o && ... &&
-             std::get<Is>(casters).from_python(o[Is], flags, cleanup));
-
-        Py_XDECREF(temp);
-
-        return success;
-    }
-
-    template <typename T>
-    static handle from_cpp(T&& value, rv_policy policy,
-                           cleanup_list *cleanup) noexcept {
-        return from_cpp_impl((forward_t<T>) value, policy, cleanup, Indices{});
-    }
-
-    template <typename T>
-    static handle from_cpp(T *value, rv_policy policy, cleanup_list *cleanup) {
-        if (!value)
-            return none().release();
-        return from_cpp_impl(*value, policy, cleanup, Indices{});
-    }
-
-    template <typename T, size_t... Is>
-    static NB_INLINE handle from_cpp_impl(T &&value, rv_policy policy,
-                                          cleanup_list *cleanup,
-                                          std::index_sequence<Is...>) noexcept {
-        (void) value; (void) policy; (void) cleanup;
-        object o[N1];
-
-        bool success =
-            (... &&
-             ((o[Is] = steal(make_caster<Ts>::from_cpp(
-                   forward_like<T>(std::get<Is>(value)), policy, cleanup))),
-              o[Is].is_valid()));
-
-        if (!success)
-            return handle();
-
-        PyObject *r = PyTuple_New(N);
-        (NB_TUPLE_SET_ITEM(r, Is, o[Is].release().ptr()), ...);
-        return r;
-    }
-
-    explicit operator Value() & {
-        return cast_impl(Indices{});
-    }
-
-    explicit operator Value() && {
-        return ((type_caster &&) *this).cast_impl(Indices{});
-    }
-
-    template <size_t... Is>
-    NB_INLINE Value cast_impl(std::index_sequence<Is...>) & {
-        return Value(std::get<Is>(casters).operator cast_t<Ts>()...);
-    }
-
-    template <size_t... Is>
-    NB_INLINE Value cast_impl(std::index_sequence<Is...>) && {
-        return Value(((make_caster<Ts> &&) std::get<Is>(casters)).operator cast_t<Ts>()...);
-    }
-
-    std::tuple<make_caster<Ts>...> casters;
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/unique_ptr.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/unique_ptr.h
deleted file mode 100644
index 84f7ff3ac..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/unique_ptr.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    nanobind/stl/unique_ptr.h: Type caster for std::unique_ptr<T>
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include <nanobind/nanobind.h>
-#include <memory>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-template <typename T, typename Deleter>
-struct type_caster<std::unique_ptr<T, Deleter>> {
-    using Value = std::unique_ptr<T, Deleter>;
-    using Caster = make_caster<T>;
-
-    static constexpr bool IsDefaultDeleter =
-        std::is_same_v<Deleter, std::default_delete<T>>;
-    static constexpr bool IsNanobindDeleter =
-        std::is_same_v<Deleter, deleter<T>>;
-
-    static_assert(Caster::IsClass,
-                  "Binding 'std::unique_ptr<T>' requires that 'T' can also be "
-                  "bound by nanobind. It appears that you specified a type which "
-                  "would undergo conversion/copying, which is not allowed.");
-
-    static_assert(IsDefaultDeleter || IsNanobindDeleter,
-                  "Binding std::unique_ptr<T, Deleter> requires that 'Deleter' is either "
-                  "'std::default_delete<T>' or 'nanobind::deleter<T>'");
-
-    static constexpr auto Name = Caster::Name;
-    static constexpr bool IsClass = true;
-    template <typename T_> using Cast = Value;
-
-    Caster caster;
-    handle src;
-
-    bool from_python(handle src_, uint8_t, cleanup_list *) noexcept {
-        // Stash source python object
-        src = src_;
-
-        /* Try casting to a pointer of the underlying type. We pass flags=0 and
-           cleanup=nullptr to prevent implicit type conversions (they are
-           problematic since the instance then wouldn't be owned by 'src') */
-        return caster.from_python(src_, 0, nullptr);
-    }
-
-    template <typename T2>
-    static handle from_cpp(T2 *value, rv_policy policy,
-                           cleanup_list *cleanup) noexcept {
-        if (!value)
-            return handle();
-
-        return from_cpp(*value, policy, cleanup);
-    }
-
-    template <typename T2>
-    static handle from_cpp(T2 &&value,
-                           rv_policy, cleanup_list *cleanup) noexcept {
-
-        bool cpp_delete = true;
-        if constexpr (IsNanobindDeleter)
-            cpp_delete = value.get_deleter().owned_by_cpp();
-
-        handle result =
-            nb_type_put_unique(&typeid(T), value.get(), cleanup, cpp_delete);
-
-        if (result.is_valid()) {
-            if (cpp_delete)
-                value.release();
-            else
-                value.reset();
-        }
-
-        return result;
-    }
-
-    explicit operator Value() {
-        nb_type_relinquish_ownership(src.ptr(), IsDefaultDeleter);
-
-        T *value = caster.operator T *();
-        if constexpr (IsNanobindDeleter)
-            return Value(value, deleter<T>(src.inc_ref()));
-        else
-            return Value(value);
-    }
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/vector.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/vector.h
deleted file mode 100644
index a542c3abd..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/stl/vector.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "detail/nb_list.h"
-#include <vector>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-template <typename Type, typename Alloc> struct type_caster<std::vector<Type, Alloc>>
- : list_caster<std::vector<Type, Alloc>, Type> { };
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/tensor.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/tensor.h
deleted file mode 100644
index 6ec655f4f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/tensor.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-    nanobind/tensor.h: functionality to input/output tensors via DLPack
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-
-    The API below is based on the DLPack project
-    (https://github.com/dmlc/dlpack/blob/main/include/dlpack/dlpack.h)
-*/
-#pragma once
-
-#include <nanobind/nanobind.h>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-
-NAMESPACE_BEGIN(device)
-#define NB_DEVICE(enum_name, enum_value)                              \
-    struct enum_name {                                                \
-        static constexpr auto name = detail::const_name(#enum_name);  \
-        static constexpr int32_t value = enum_value;                  \
-        static constexpr bool is_device = true;                       \
-    }
-NB_DEVICE(none, 0); NB_DEVICE(cpu, 1); NB_DEVICE(cuda, 2);
-NB_DEVICE(cuda_host, 3); NB_DEVICE(opencl, 4); NB_DEVICE(vulkan, 7);
-NB_DEVICE(metal, 8); NB_DEVICE(rocm, 10); NB_DEVICE(rocm_host, 11);
-NB_DEVICE(cuda_managed, 13); NB_DEVICE(oneapi, 14);
-#undef NB_DEVICE
-NAMESPACE_END(device)
-
-NAMESPACE_BEGIN(dlpack)
-
-enum class dtype_code : uint8_t {
-    Int = 0, UInt = 1, Float = 2, Bfloat = 4, Complex = 5
-};
-
-struct device {
-    int32_t device_type = 0;
-    int32_t device_id = 0;
-};
-
-struct dtype {
-    uint8_t code = 0;
-    uint8_t bits = 0;
-    uint16_t lanes = 0;
-
-    bool operator==(const dtype &o) const {
-        return code == o.code && bits == o.bits && lanes == o.lanes;
-    }
-    bool operator!=(const dtype &o) const { return !operator==(o); }
-};
-
-struct tensor {
-    void *data = nullptr;
-    nanobind::dlpack::device device;
-    int32_t ndim = 0;
-    nanobind::dlpack::dtype dtype;
-    int64_t *shape = nullptr;
-    int64_t *strides = nullptr;
-    uint64_t byte_offset = 0;
-};
-
-NAMESPACE_END(dlpack)
-
-constexpr size_t any = (size_t) -1;
-
-template <size_t... Is> struct shape {
-    static constexpr size_t size = sizeof...(Is);
-};
-
-struct c_contig { };
-struct f_contig { };
-struct numpy { };
-struct tensorflow { };
-struct pytorch { };
-struct jax { };
-
-template <typename T> constexpr dlpack::dtype dtype() {
-    static_assert(
-        std::is_floating_point_v<T> || std::is_integral_v<T>,
-        "nanobind::dtype<T>: T must be a floating point or integer variable!"
-    );
-
-    dlpack::dtype result;
-
-    if constexpr (std::is_floating_point_v<T>)
-        result.code = (uint8_t) dlpack::dtype_code::Float;
-    else if constexpr (std::is_signed_v<T>)
-        result.code = (uint8_t) dlpack::dtype_code::Int;
-    else
-        result.code = (uint8_t) dlpack::dtype_code::UInt;
-
-    result.bits = sizeof(T) * 8;
-    result.lanes = 1;
-
-    return result;
-}
-
-
-NAMESPACE_BEGIN(detail)
-
-enum class tensor_framework : int { none, numpy, tensorflow, pytorch, jax };
-
-struct tensor_req {
-    dlpack::dtype dtype;
-    uint32_t ndim = 0;
-    size_t *shape = nullptr;
-    bool req_shape = false;
-    bool req_dtype = false;
-    char req_order = '\0';
-    uint8_t req_device = 0;
-};
-
-template <typename T, typename = int> struct tensor_arg {
-    static constexpr size_t size = 0;
-    static constexpr auto name = descr<0>{ };
-    static void apply(tensor_req &) { }
-};
-
-template <typename T> struct tensor_arg<T, enable_if_t<std::is_floating_point_v<T>>> {
-    static constexpr size_t size = 0;
-
-    static constexpr auto name =
-        const_name("dtype=float") + const_name<sizeof(T) * 8>();
-
-    static void apply(tensor_req &tr) {
-        tr.dtype = dtype<T>();
-        tr.req_dtype = true;
-    }
-};
-
-template <typename T> struct tensor_arg<T, enable_if_t<std::is_integral_v<T>>> {
-    static constexpr size_t size = 0;
-
-    static constexpr auto name =
-        const_name("dtype=") + const_name<std::is_unsigned_v<T>>("u", "") +
-        const_name("int") + const_name<sizeof(T) * 8>();
-
-    static void apply(tensor_req &tr) {
-        tr.dtype = dtype<T>();
-        tr.req_dtype = true;
-    }
-};
-
-template <size_t... Is> struct tensor_arg<shape<Is...>> {
-    static constexpr size_t size = sizeof...(Is);
-    static constexpr auto name =
-        const_name("shape=(") +
-        concat(const_name<Is == any>(const_name("*"), const_name<Is>())...) +
-        const_name(")");
-
-    static void apply(tensor_req &tr) {
-        size_t i = 0;
-        ((tr.shape[i++] = Is), ...);
-        tr.ndim = (uint32_t) sizeof...(Is);
-        tr.req_shape = true;
-    }
-};
-
-template <> struct tensor_arg<c_contig> {
-    static constexpr size_t size = 0;
-    static constexpr auto name = const_name("order='C'");
-    static void apply(tensor_req &tr) { tr.req_order = 'C'; }
-};
-
-template <> struct tensor_arg<f_contig> {
-    static constexpr size_t size = 0;
-    static constexpr auto name = const_name("order='F'");
-    static void apply(tensor_req &tr) { tr.req_order = 'F'; }
-};
-
-template <typename T> struct tensor_arg<T, enable_if_t<T::is_device>> {
-    static constexpr size_t size = 0;
-    static constexpr auto name = const_name("device='") + T::name + const_name('\'');
-    static void apply(tensor_req &tr) { tr.req_device = (uint8_t) T::value; }
-};
-
-template <typename... Ts> struct tensor_info {
-    using scalar_type = void;
-    using shape_type = void;
-    constexpr static auto name = const_name("tensor");
-    constexpr static tensor_framework framework = tensor_framework::none;
-};
-
-template <typename T, typename... Ts> struct tensor_info<T, Ts...>  : tensor_info<Ts...> {
-    using scalar_type =
-        std::conditional_t<std::is_scalar_v<T>, T,
-                           typename tensor_info<Ts...>::scalar_type>;
-};
-
-template <size_t... Is, typename... Ts> struct tensor_info<shape<Is...>, Ts...> : tensor_info<Ts...> {
-    using shape_type = shape<Is...>;
-};
-
-template <typename... Ts> struct tensor_info<numpy, Ts...> : tensor_info<Ts...> {
-    constexpr static auto name = const_name("numpy.ndarray");
-    constexpr static tensor_framework framework = tensor_framework::numpy;
-};
-
-template <typename... Ts> struct tensor_info<pytorch, Ts...> : tensor_info<Ts...> {
-    constexpr static auto name = const_name("torch.Tensor");
-    constexpr static tensor_framework framework = tensor_framework::pytorch;
-};
-
-template <typename... Ts> struct tensor_info<tensorflow, Ts...> : tensor_info<Ts...> {
-    constexpr static auto name = const_name("tensorflow.python.framework.ops.EagerTensor");
-    constexpr static tensor_framework framework = tensor_framework::tensorflow;
-};
-
-template <typename... Ts> struct tensor_info<jax, Ts...> : tensor_info<Ts...> {
-    constexpr static auto name = const_name("jaxlib.xla_extension.DeviceArray");
-    constexpr static tensor_framework framework = tensor_framework::jax;
-};
-
-NAMESPACE_END(detail)
-
-template <typename... Args> class tensor {
-public:
-    using Info = detail::tensor_info<Args...>;
-    using Scalar = typename Info::scalar_type;
-
-    tensor() = default;
-
-    explicit tensor(detail::tensor_handle *handle) : m_handle(handle) {
-        if (handle)
-            m_tensor = *detail::tensor_inc_ref(handle);
-    }
-
-    tensor(void *value,
-           size_t ndim,
-           const size_t *shape,
-           handle owner = nanobind::handle(),
-           const int64_t *strides = nullptr,
-           dlpack::dtype dtype = nanobind::dtype<Scalar>(),
-           int32_t device_type = device::cpu::value,
-           int32_t device_id = 0) {
-        m_handle =
-            detail::tensor_create(value, ndim, shape, owner.ptr(), strides,
-                                  &dtype, device_type, device_id);
-        m_tensor = *detail::tensor_inc_ref(m_handle);
-    }
-
-    ~tensor() {
-        detail::tensor_dec_ref(m_handle);
-    }
-
-    tensor(const tensor &t) : m_handle(t.m_handle), m_tensor(t.m_tensor) {
-        detail::tensor_inc_ref(m_handle);
-    }
-
-    tensor(tensor &&t) noexcept : m_handle(t.m_handle), m_tensor(t.m_tensor) {
-        t.m_handle = nullptr;
-        t.m_tensor = dlpack::tensor();
-    }
-
-    tensor &operator=(tensor &&t) noexcept {
-        detail::tensor_dec_ref(m_handle);
-        m_handle = t.m_handle;
-        m_tensor = t.m_tensor;
-        t.m_handle = nullptr;
-        t.m_tensor = dlpack::tensor();
-        return *this;
-    }
-
-    tensor &operator=(const tensor &t) {
-        detail::tensor_inc_ref(t.m_handle);
-        detail::tensor_dec_ref(m_handle);
-        m_handle = t.m_handle;
-        m_tensor = t.m_tensor;
-        return *this;
-    }
-
-    dlpack::dtype dtype() const { return m_tensor.dtype; }
-    size_t ndim() const { return m_tensor.ndim; }
-    size_t shape(size_t i) const { return m_tensor.shape[i]; }
-    int64_t stride(size_t i) const { return m_tensor.strides[i]; }
-    bool is_valid() const { return m_handle != nullptr; }
-    int32_t device_type() const { return m_tensor.device.device_type; }
-    int32_t device_id() const { return m_tensor.device.device_id; }
-    detail::tensor_handle *handle() const { return m_handle; }
-
-    const void *data() const {
-        return (const uint8_t *) m_tensor.data + m_tensor.byte_offset;
-    }
-    void *data() { return (uint8_t *) m_tensor.data + m_tensor.byte_offset; }
-
-    template <typename... Ts>
-    NB_INLINE auto& operator()(Ts... indices) {
-        static_assert(
-            !std::is_same_v<typename Info::scalar_type, void>,
-            "To use nb::tensor::operator(), you must add a scalar type "
-            "annotation (e.g. 'float') to the tensor template parameters.");
-        static_assert(
-            !std::is_same_v<typename Info::shape_type, void>,
-            "To use nb::tensor::operator(), you must add a nb::shape<> "
-            "annotation to the tensor template parameters.");
-        static_assert(sizeof...(Ts) == Info::shape_type::size,
-                      "nb::tensor::operator(): invalid number of arguments");
-
-        int64_t counter = 0, index = 0;
-        ((index += int64_t(indices) * m_tensor.strides[counter++]), ...);
-        return (typename Info::scalar_type &) *(
-            (uint8_t *) m_tensor.data + m_tensor.byte_offset +
-            index * sizeof(typename Info::scalar_type));
-    }
-
-private:
-    detail::tensor_handle *m_handle = nullptr;
-    dlpack::tensor m_tensor;
-};
-
-NAMESPACE_BEGIN(detail)
-
-template <typename... Args> struct type_caster<tensor<Args...>> {
-    NB_TYPE_CASTER(tensor<Args...>, Value::Info::name + const_name("[") +
-                                        concat_maybe(detail::tensor_arg<Args>::name...) +
-                                        const_name("]"));
-
-    bool from_python(handle src, uint8_t flags, cleanup_list *) noexcept {
-        constexpr size_t size = (0 + ... + detail::tensor_arg<Args>::size);
-        size_t shape[size + 1];
-        detail::tensor_req req;
-        req.shape = shape;
-        (detail::tensor_arg<Args>::apply(req), ...);
-        value = tensor<Args...>(tensor_import(
-            src.ptr(), &req, flags & (uint8_t) cast_flags::convert));
-        return value.is_valid();
-    }
-
-    static handle from_cpp(const tensor<Args...> &tensor, rv_policy,
-                           cleanup_list *) noexcept {
-        return tensor_wrap(tensor.handle(), int(Value::Info::framework));
-    }
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/trampoline.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/trampoline.h
deleted file mode 100644
index 1968f7c0d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/include/nanobind/trampoline.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    nanobind/trampoline.h: functionality for overriding C++ virtual
-    functions from within Python
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include <nanobind/nanobind.h>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-NB_CORE void trampoline_new(void **data, size_t size, void *ptr,
-                            const std::type_info *cpp_type) noexcept;
-NB_CORE void trampoline_release(void **data, size_t size) noexcept;
-
-NB_CORE PyObject *trampoline_lookup(void **data, size_t size, const char *name,
-                                    bool pure);
-
-template <size_t Size> struct trampoline {
-    mutable void *data[2 * Size + 1];
-
-    NB_INLINE trampoline(void *ptr, const std::type_info *cpp_type) {
-        trampoline_new(data, Size, ptr, cpp_type);
-    }
-
-    NB_INLINE ~trampoline() { trampoline_release(data, Size); }
-
-    NB_INLINE handle lookup(const char *name, bool pure) const {
-        return trampoline_lookup(data, Size, name, pure);
-    }
-
-    NB_INLINE handle base() const { return (PyObject *) data[0]; }
-};
-
-#define NB_TRAMPOLINE(base, size)                                              \
-    nanobind::detail::trampoline<size> trampoline{ this, &typeid(base) };
-
-#define NB_OVERRIDE_NAME(ret_type, base_type, name, func, ...)                 \
-    nanobind::handle key = trampoline.lookup(name, false);                     \
-    if (key.is_valid()) {                                                      \
-        nanobind::gil_scoped_acquire guard;                                    \
-        return nanobind::cast<ret_type>(                                       \
-            trampoline.base().attr(key)(__VA_ARGS__));                         \
-    } else {                                                                   \
-        return base_type::func(__VA_ARGS__);                                   \
-    }
-
-#define NB_OVERRIDE_PURE_NAME(ret_type, base_type, name, func, ...)            \
-    nanobind::handle key = trampoline.lookup(name, true);                      \
-    nanobind::gil_scoped_acquire guard;                                        \
-    return nanobind::cast<ret_type>(trampoline.base().attr(key)(__VA_ARGS__));
-
-#define NB_OVERRIDE(ret_type, base_type, func, ...)                            \
-    NB_OVERRIDE_NAME(ret_type, base_type, #func, func, __VA_ARGS__)
-
-#define NB_OVERRIDE_PURE(ret_type, base_type, func, ...)                       \
-    NB_OVERRIDE_PURE_NAME(ret_type, base_type, #func, func, __VA_ARGS__)
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/buffer.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/buffer.h
deleted file mode 100644
index 9e4050583..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/buffer.h
+++ /dev/null
@@ -1,163 +0,0 @@
-#include <string.h>
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-struct Buffer {
-public:
-    // Disable copy/move constructor and assignment
-    Buffer(const Buffer &) = delete;
-    Buffer(Buffer &&) = delete;
-    Buffer &operator=(const Buffer &) = delete;
-    Buffer &operator=(Buffer &&) = delete;
-
-    Buffer(size_t size = 0)
-        : m_start((char *) malloc(size)) {
-        if (!m_start) {
-            fprintf(stderr, "Buffer::Buffer(): out of memory (unrecoverable error)!");
-            abort();
-        }
-        m_end = m_start + size;
-        if (size)
-            clear();
-    }
-
-    ~Buffer() {
-        free(m_start);
-    }
-
-    /// Append a string with the specified length
-    void put(const char *str, size_t size) {
-        if (m_cur + size >= m_end)
-            expand(size + 1 - remain());
-
-        memcpy(m_cur, str, size);
-        m_cur += size;
-        *m_cur = '\0';
-    }
-
-    /// Append a string
-    template <size_t N> void put(const char (&str)[N]) {
-        put(str, N - 1);
-    }
-
-    /// Append a dynamic string
-    void put_dstr(const char *str) { put(str, strlen(str)); }
-
-    /// Append a single character to the buffer
-    void put(char c) {
-        if (m_cur + 1 >= m_end)
-            expand();
-        *m_cur++ = c;
-        *m_cur = '\0';
-    }
-
-    /// Append multiple copies of a single character to the buffer
-    void put(char c, size_t count) {
-        if (m_cur + count >= m_end)
-            expand(count + 1 - remain());
-        for (size_t i = 0; i < count; ++i)
-            *m_cur++ = c;
-        *m_cur = '\0';
-    }
-
-    /// Append a formatted (printf-style) string to the buffer
-#if defined(__GNUC__)
-    __attribute__((__format__ (__printf__, 2, 3)))
-#endif
-    size_t fmt(const char *format, ...) {
-        size_t written;
-        do {
-            size_t size = remain();
-            va_list args;
-            va_start(args, format);
-            written = (size_t) vsnprintf(m_cur, size, format, args);
-            va_end(args);
-
-            if (written + 1 < size) {
-                m_cur += written;
-                break;
-            }
-
-            expand();
-        } while (true);
-
-        return written;
-    }
-
-    const char *get() { return m_start; }
-
-    void clear() {
-        m_cur = m_start;
-        if (m_start != m_end)
-            m_start[0] = '\0';
-    }
-
-    /// Remove the last 'n' characters
-    void rewind(size_t n) {
-        if (m_cur < m_start + n)
-            m_cur = m_start;
-        else
-            m_cur -= n;
-        *m_cur = '\0';
-    }
-
-    /// Append an unsigned 32 bit integer
-    void put_uint32(uint32_t value) {
-        const int digits = 10;
-        const char *num = "0123456789";
-        char buf[digits];
-        int i = digits;
-
-        do {
-            buf[--i] = num[value % 10];
-            value /= 10;
-        } while (value);
-
-        return put(buf + i, digits - i);
-    }
-
-    char *copy(size_t offset = 0) const {
-        size_t copy_size = size() + 1 - offset;
-        char *tmp = (char *) malloc(copy_size);
-        if (!tmp) {
-            fprintf(stderr, "Buffer::copy(): out of memory (unrecoverable error)!");
-            abort();
-        }
-        memcpy(tmp, m_start + offset, copy_size);
-        return tmp;
-    }
-
-    size_t size() const { return m_cur - m_start; }
-    size_t remain() const { return m_end - m_cur; }
-
-private:
-    void expand(size_t minval = 2) {
-        size_t old_alloc_size = m_end - m_start,
-               new_alloc_size = 2 * old_alloc_size + minval,
-               used_size      = m_cur - m_start,
-               copy_size      = used_size + 1;
-
-        if (old_alloc_size < copy_size)
-            copy_size = old_alloc_size;
-
-        char *tmp = (char *) malloc(new_alloc_size);
-        if (!tmp) {
-            fprintf(stderr, "Buffer::expand(): out of memory (unrecoverable error)!");
-            abort();
-        }
-
-        memcpy(tmp, m_start, copy_size);
-        free(m_start);
-
-        m_start = tmp;
-        m_end = m_start + new_alloc_size;
-        m_cur = m_start + used_size;
-    }
-
-private:
-    char *m_start{nullptr}, *m_cur{nullptr}, *m_end{nullptr};
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/common.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/common.cpp
deleted file mode 100644
index 98ade4813..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/common.cpp
+++ /dev/null
@@ -1,822 +0,0 @@
-/*
-    src/common.cpp: miscellaneous libnanobind functionality
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#include <nanobind/nanobind.h>
-#include "nb_internals.h"
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-
-#if defined(__GNUC__)
-    __attribute__((noreturn, __format__ (__printf__, 1, 2)))
-#else
-    [[noreturn]]
-#endif
-void raise(const char *fmt, ...) {
-    char buf[512];
-    va_list args;
-
-    va_start(args, fmt);
-    size_t size = vsnprintf(buf, sizeof(buf), fmt, args);
-    va_end(args);
-
-    if (size < sizeof(buf))
-        throw std::runtime_error(buf);
-
-    scoped_pymalloc<char> temp(size + 1);
-
-    va_start(args, fmt);
-    vsnprintf(temp.get(), size + 1, fmt, args);
-    va_end(args);
-
-    throw std::runtime_error(temp.get());
-}
-
-/// Abort the process with a fatal error
-#if defined(__GNUC__)
-    __attribute__((noreturn, __format__ (__printf__, 1, 2)))
-#else
-    [[noreturn]]
-#endif
-void fail(const char *fmt, ...) noexcept {
-    va_list args;
-    fprintf(stderr, "Critical nanobind error: ");
-    va_start(args, fmt);
-    vfprintf(stderr, fmt, args);
-    va_end(args);
-    fprintf(stderr, "\n");
-    abort();
-}
-
-PyObject *capsule_new(const void *ptr, void (*free)(void *) noexcept) noexcept {
-    auto capsule_free = [](PyObject *o) {
-        auto free_2 = (void (*)(void *))(PyCapsule_GetContext(o));
-        if (free_2)
-            free_2(PyCapsule_GetPointer(o, nullptr));
-    };
-
-    PyObject *c = PyCapsule_New((void *) ptr, nullptr, capsule_free);
-
-    if (!c)
-        fail("nanobind::detail::capsule_new(): allocation failed!");
-
-    if (PyCapsule_SetContext(c, (void *) free) != 0)
-        fail("nanobind::detail::capsule_new(): could not set context!");
-
-    return c;
-}
-
-void raise_python_error() {
-    if (PyErr_Occurred())
-        throw python_error();
-    else
-        fail("nanobind::detail::raise_python_error() called without "
-             "an error condition!");
-}
-
-void raise_next_overload() {
-    throw next_overload();
-}
-
-// ========================================================================
-
-void cleanup_list::release() noexcept {
-    /* Don't decrease the reference count of the first
-       element, it stores the 'self' element. */
-    for (size_t i = 1; i < m_size; ++i)
-        Py_DECREF(m_data[i]);
-    if (m_capacity != Small)
-        free(m_data);
-    m_data = nullptr;
-}
-
-void cleanup_list::expand() noexcept {
-    uint32_t new_capacity = m_capacity * 2;
-    PyObject **new_data = (PyObject **) malloc(new_capacity * sizeof(PyObject *));
-    if (!new_data)
-        fail("nanobind::detail::cleanup_list::expand(): out of memory!");
-    memcpy(new_data, m_data, m_size * sizeof(PyObject *));
-    if (m_capacity != Small)
-        free(m_data);
-    m_data = new_data;
-    m_capacity = new_capacity;
-}
-
-// ========================================================================
-
-PyObject *module_new(const char *name, PyModuleDef *def) noexcept {
-    memset(def, 0, sizeof(PyModuleDef));
-    def->m_name = name;
-    def->m_size = -1;
-    PyObject *m = PyModule_Create(def);
-    if (!m)
-        fail("nanobind::detail::module_new(): allocation failed!");
-    return m;
-}
-
-PyObject *module_import(const char *name) {
-    PyObject *res = PyImport_ImportModule(name);
-    if (!res)
-        throw python_error();
-    return res;
-}
-
-PyObject *module_new_submodule(PyObject *base, const char *name,
-                               const char *doc) noexcept {
-
-    PyObject *base_name = PyModule_GetNameObject(base),
-             *name_py, *res;
-    if (!base_name)
-        goto fail;
-
-    name_py = PyUnicode_FromFormat("%U.%s", base_name, name);
-    if (!name_py)
-        goto fail;
-
-    res = PyImport_AddModuleObject(name_py);
-    if (doc) {
-        PyObject *doc_py = PyUnicode_FromString(doc);
-        if (!doc_py || PyObject_SetAttrString(res, "__doc__", doc_py))
-            goto fail;
-        Py_DECREF(doc_py);
-    }
-    Py_DECREF(name_py);
-    Py_DECREF(base_name);
-
-    Py_INCREF(res);
-    if (PyModule_AddObject(base, name, res))
-        goto fail;
-
-    return res;
-
-fail:
-    fail("nanobind::detail::module_new_submodule(): failed.");
-}
-
-// ========================================================================
-
-size_t obj_len(PyObject *o) {
-    Py_ssize_t res = PyObject_Length(o);
-    if (res < 0)
-        raise_python_error();
-    return (size_t) res;
-}
-
-PyObject *obj_repr(PyObject *o) {
-    PyObject *res = PyObject_Repr(o);
-    if (!res)
-        raise_python_error();
-    return res;
-}
-
-bool obj_comp(PyObject *a, PyObject *b, int value) {
-    int rv = PyObject_RichCompareBool(a, b, value);
-    if (rv == -1)
-        raise_python_error();
-    return rv == 1;
-}
-
-PyObject *obj_op_1(PyObject *a, PyObject* (*op)(PyObject*)) {
-    PyObject *res = op(a);
-    if (!res)
-        raise_python_error();
-    return res;
-}
-
-PyObject *obj_op_2(PyObject *a, PyObject *b,
-                   PyObject *(*op)(PyObject *, PyObject *) ) {
-    PyObject *res = op(a, b);
-    if (!res)
-        raise_python_error();
-
-    return res;
-}
-
-#if defined(Py_LIMITED_API)
-PyObject *_PyObject_Vectorcall(PyObject *base, PyObject *const *args,
-                               size_t nargsf, PyObject *kwnames) {
-    size_t nargs = NB_VECTORCALL_NARGS(nargsf);
-
-    PyObject *args_tuple = PyTuple_New(nargs);
-    if (!args_tuple)
-        return nullptr;
-
-    for (size_t i = 0; i < nargs; ++i) {
-        Py_INCREF(args[i]);
-        NB_TUPLE_SET_ITEM(args_tuple, i, args[i]);
-    }
-
-    PyObject *kwargs = nullptr;
-    if (kwnames) {
-        kwargs = PyDict_New();
-        if (!kwargs) {
-            Py_DECREF(args_tuple);
-            return nullptr;
-        }
-
-        for (size_t i = 0, l = NB_TUPLE_GET_SIZE(kwnames); i < l; ++i) {
-            PyObject *k = NB_TUPLE_GET_ITEM(kwnames, i),
-                     *v = args[i + nargs];
-            if (PyDict_SetItem(kwargs, k, v)) {
-                Py_DECREF(kwargs);
-                Py_DECREF(args_tuple);
-                return nullptr;
-            }
-
-        }
-    }
-
-    PyObject *res = PyObject_Call(base, args_tuple, kwargs);
-
-    Py_DECREF(args_tuple);
-    Py_XDECREF(kwargs);
-
-    return res;
-}
-#endif
-
-
-PyObject *obj_vectorcall(PyObject *base, PyObject *const *args, size_t nargsf,
-                         PyObject *kwnames, bool method_call) {
-    const char *error = nullptr;
-    PyObject *res = nullptr;
-
-    size_t nargs_total =
-        NB_VECTORCALL_NARGS(nargsf) + (kwnames ? NB_TUPLE_GET_SIZE(kwnames) : 0);
-
-#if !defined(Py_LIMITED_API)
-    if (!PyGILState_Check()) {
-        error = "nanobind::detail::obj_vectorcall(): PyGILState_Check() failure." ;
-        goto end;
-    }
-#endif
-
-    for (size_t i = 0; i < nargs_total; ++i) {
-        if (!args[i]) {
-            error = "nanobind::detail::obj_vectorcall(): argument conversion failure." ;
-            goto end;
-        }
-    }
-
-#if PY_VERSION_HEX < 0x03090000 || defined(Py_LIMITED_API)
-    if (method_call) {
-        PyObject *self = PyObject_GetAttr(args[0], /* name = */ base);
-        if (self) {
-            res = _PyObject_Vectorcall(self, args + 1, nargsf - 1, kwnames);
-            Py_DECREF(self);
-        }
-    } else {
-        res = _PyObject_Vectorcall(base, args, nargsf, kwnames);
-    }
-#else
-    res = (method_call ? PyObject_VectorcallMethod
-                       : PyObject_Vectorcall)(base, args, nargsf, kwnames);
-#endif
-
-end:
-    for (size_t i = 0; i < nargs_total; ++i)
-        Py_XDECREF(args[i]);
-    Py_XDECREF(kwnames);
-    Py_DECREF(base);
-
-    if (error)
-        raise("%s", error);
-    else if (!res)
-        raise_python_error();
-
-    return res;
-}
-
-
-PyObject *obj_iter(PyObject *o) {
-    PyObject *result = PyObject_GetIter(o);
-    if (!result)
-        raise_python_error();
-    return result;
-}
-
-PyObject *obj_iter_next(PyObject *o) {
-    PyObject *result = PyIter_Next(o);
-    if (!result && PyErr_Occurred())
-        raise_python_error();
-    return result;
-}
-
-
-// ========================================================================
-
-PyObject *getattr(PyObject *obj, const char *key) {
-    PyObject *res = PyObject_GetAttrString(obj, key);
-    if (!res)
-        raise_python_error();
-    return res;
-}
-
-PyObject *getattr(PyObject *obj, PyObject *key) {
-    PyObject *res = PyObject_GetAttr(obj, key);
-    if (!res)
-        raise_python_error();
-    return res;
-}
-
-PyObject *getattr(PyObject *obj, const char *key, PyObject *def) noexcept {
-    PyObject *res = PyObject_GetAttrString(obj, key);
-    if (res)
-        return res;
-    PyErr_Clear();
-    Py_XINCREF(def);
-    return def;
-}
-
-PyObject *getattr(PyObject *obj, PyObject *key, PyObject *def) noexcept {
-    PyObject *res = PyObject_GetAttr(obj, key);
-    if (res)
-        return res;
-    PyErr_Clear();
-    Py_XINCREF(def);
-    return def;
-}
-
-void getattr_maybe(PyObject *obj, const char *key, PyObject **out) {
-    if (*out)
-        return;
-
-    PyObject *res = PyObject_GetAttrString(obj, key);
-    if (!res)
-        raise_python_error();
-
-    *out = res;
-}
-
-void getattr_maybe(PyObject *obj, PyObject *key, PyObject **out) {
-    if (*out)
-        return;
-
-    PyObject *res = PyObject_GetAttr(obj, key);
-    if (!res)
-        raise_python_error();
-
-    *out = res;
-}
-
-void setattr(PyObject *obj, const char *key, PyObject *value) {
-    int rv = PyObject_SetAttrString(obj, key, value);
-    if (rv)
-        raise_python_error();
-}
-
-void setattr(PyObject *obj, PyObject *key, PyObject *value) {
-    int rv = PyObject_SetAttr(obj, key, value);
-    if (rv)
-        raise_python_error();
-}
-
-// ========================================================================
-
-void getitem_maybe(PyObject *obj, Py_ssize_t key, PyObject **out) {
-    if (*out)
-        return;
-
-    PyObject *res = PySequence_GetItem(obj, key);
-    if (!res)
-        raise_python_error();
-
-    *out = res;
-}
-
-void getitem_maybe(PyObject *obj, const char *key_, PyObject **out) {
-    if (*out)
-        return;
-
-    PyObject *key, *res;
-
-    key = PyUnicode_FromString(key_);
-    if (!key)
-        raise_python_error();
-
-    res = PyObject_GetItem(obj, key);
-    Py_DECREF(key);
-
-    if (!res)
-        raise_python_error();
-
-    *out = res;
-}
-
-void getitem_maybe(PyObject *obj, PyObject *key, PyObject **out) {
-    if (*out)
-        return;
-
-    PyObject *res = PyObject_GetItem(obj, key);
-    if (!res)
-        raise_python_error();
-
-    *out = res;
-}
-
-void setitem(PyObject *obj, Py_ssize_t key, PyObject *value) {
-    int rv = PySequence_SetItem(obj, key, value);
-    if (rv)
-        raise_python_error();
-}
-
-void setitem(PyObject *obj, const char *key_, PyObject *value) {
-    PyObject *key = PyUnicode_FromString(key_);
-    if (!key)
-        raise_python_error();
-
-    int rv = PyObject_SetItem(obj, key, value);
-    Py_DECREF(key);
-
-    if (rv)
-        raise_python_error();
-}
-
-void setitem(PyObject *obj, PyObject *key, PyObject *value) {
-    int rv = PyObject_SetItem(obj, key, value);
-    if (rv)
-        raise_python_error();
-}
-
-// ========================================================================
-
-PyObject *str_from_obj(PyObject *o) {
-    PyObject *result = PyObject_Str(o);
-    if (!result)
-        raise_python_error();
-    return result;
-}
-
-PyObject *str_from_cstr(const char *str) {
-    PyObject *result = PyUnicode_FromString(str);
-    if (!result)
-        raise("nanobind::detail::str_from_cstr(): conversion error!");
-    return result;
-}
-
-PyObject *str_from_cstr_and_size(const char *str, size_t size) {
-    PyObject *result = PyUnicode_FromStringAndSize(str, (Py_ssize_t) size);
-    if (!result)
-        raise("nanobind::detail::str_from_cstr_and_size(): conversion error!");
-    return result;
-}
-
-// ========================================================================
-
-PyObject **seq_get(PyObject *seq, size_t *size_out, PyObject **temp_out) noexcept {
-    PyObject *temp = nullptr;
-    size_t size = 0;
-    PyObject **result = nullptr;
-
-    /* This function is used during overload resolution; if anything
-       goes wrong, it fails gracefully without reporting errors. Other
-       overloads will then be tried. */
-
-#if !defined(Py_LIMITED_API)
-    if (PyTuple_CheckExact(seq)) {
-        size = (size_t) PyTuple_GET_SIZE(seq);
-        result = ((PyTupleObject *) seq)->ob_item;
-        /* Special case for zero-sized lists/tuples. CPython
-           sets ob_item to NULL, which this function incidentally uses to
-           signal an error. Return a nonzero pointer that will, however,
-           still trigger a segfault if dereferenced. */
-        if (size == 0)
-            result = (PyObject **) 1;
-    } else if (PyList_CheckExact(seq)) {
-        size = (size_t) PyList_GET_SIZE(seq);
-        result = ((PyListObject *) seq)->ob_item;
-        if (size == 0) // ditto
-            result = (PyObject **) 1;
-    } else if (PySequence_Check(seq)) {
-        temp = PySequence_Fast(seq, "");
-
-        if (temp)
-            result = seq_get(temp, &size, temp_out);
-        else
-            PyErr_Clear();
-    }
-#else
-    /* There isn't a nice way to get a PyObject** in Py_LIMITED_API. This
-       is going to be slow, but hopefully also very future-proof.. */
-    if (PySequence_Check(seq)) {
-        Py_ssize_t size_seq = PySequence_Length(seq);
-
-        if (size_seq >= 0) {
-            result = (PyObject **) PyObject_Malloc(sizeof(PyObject *) *
-                                                   (size_seq + 1));
-
-            if (result) {
-                result[size_seq] = nullptr;
-
-                for (Py_ssize_t i = 0; i < size_seq; ++i) {
-                    PyObject *o = PySequence_GetItem(seq, i);
-
-                    if (o) {
-                        result[i] = o;
-                    } else {
-                        for (Py_ssize_t j = 0; j < i; ++j)
-                            Py_DECREF(result[j]);
-
-                        PyObject_Free(result);
-                        result = nullptr;
-                        break;
-                    }
-                }
-            }
-
-            if (result) {
-                temp = PyCapsule_New(result, nullptr, [](PyObject *o) {
-                    PyObject **ptr = (PyObject **) PyCapsule_GetPointer(o, nullptr);
-                    for (size_t i = 0; ptr[i] != nullptr; ++i)
-                        Py_DECREF(ptr[i]);
-                    PyObject_Free(ptr);
-                });
-
-                if (temp) {
-                    size = (size_t) size_seq;
-                } else if (!temp) {
-                    PyErr_Clear();
-                    for (Py_ssize_t i = 0; i < size_seq; ++i)
-                        Py_DECREF(result[i]);
-
-                    PyObject_Free(result);
-                    result = nullptr;
-                }
-            }
-        } else if (size_seq < 0) {
-            PyErr_Clear();
-        }
-    }
-#endif
-
-    *temp_out = temp;
-    *size_out = size;
-    return result;
-}
-
-
-PyObject **seq_get_with_size(PyObject *seq, size_t size,
-                             PyObject **temp_out) noexcept {
-
-    /* This function is used during overload resolution; if anything
-       goes wrong, it fails gracefully without reporting errors. Other
-       overloads will then be tried. */
-
-    PyObject *temp = nullptr,
-             **result = nullptr;
-
-#if !defined(Py_LIMITED_API)
-    if (PyTuple_CheckExact(seq)) {
-        if (size == (size_t) PyTuple_GET_SIZE(seq)) {
-            result = ((PyTupleObject *) seq)->ob_item;
-            /* Special case for zero-sized lists/tuples. CPython
-               sets ob_item to NULL, which this function incidentally uses to
-               signal an error. Return a nonzero pointer that will, however,
-               still trigger a segfault if dereferenced. */
-            if (size == 0)
-                result = (PyObject **) 1;
-        }
-    } else if (PyList_CheckExact(seq)) {
-        if (size == (size_t) PyList_GET_SIZE(seq)) {
-            result = ((PyListObject *) seq)->ob_item;
-            if (size == 0) // ditto
-                result = (PyObject **) 1;
-        }
-    } else if (PySequence_Check(seq)) {
-        temp = PySequence_Fast(seq, "");
-
-        if (temp)
-            result = seq_get_with_size(temp, size, temp_out);
-        else
-            PyErr_Clear();
-    }
-#else
-    /* There isn't a nice way to get a PyObject** in Py_LIMITED_API. This
-       is going to be slow, but hopefully also very future-proof.. */
-    if (PySequence_Check(seq)) {
-        Py_ssize_t size_seq = PySequence_Length(seq);
-
-        if (size == (size_t) size_seq) {
-            result =
-                (PyObject **) PyObject_Malloc(sizeof(PyObject *) * (size + 1));
-
-            if (result) {
-                result[size] = nullptr;
-
-                for (Py_ssize_t i = 0; i < size_seq; ++i) {
-                    PyObject *o = PySequence_GetItem(seq, i);
-
-                    if (o) {
-                        result[i] = o;
-                    } else {
-                        for (Py_ssize_t j = 0; j < i; ++j)
-                            Py_DECREF(result[j]);
-
-                        PyObject_Free(result);
-                        result = nullptr;
-                        break;
-                    }
-                }
-            }
-
-            if (result) {
-                temp = PyCapsule_New(result, nullptr, [](PyObject *o) {
-                    PyObject **ptr = (PyObject **) PyCapsule_GetPointer(o, nullptr);
-                    for (size_t i = 0; ptr[i] != nullptr; ++i)
-                        Py_DECREF(ptr[i]);
-                    PyObject_Free(ptr);
-                });
-
-                if (!temp) {
-                    PyErr_Clear();
-                    for (Py_ssize_t i = 0; i < size_seq; ++i)
-                        Py_DECREF(result[i]);
-
-                    PyObject_Free(result);
-                    result = nullptr;
-                }
-            }
-        } else if (size_seq < 0) {
-            PyErr_Clear();
-        }
-    }
-#endif
-
-    *temp_out = temp;
-    return result;
-}
-
-// ========================================================================
-
-void property_install(PyObject *scope, const char *name, bool is_static,
-                      PyObject *getter, PyObject *setter) noexcept {
-    const nb_internals &internals = internals_get();
-    handle property = (PyObject *) (is_static ? internals.nb_static_property
-                                              : &PyProperty_Type);
-    (void) is_static;
-    PyObject *m = getter ? getter : setter;
-    object doc = none();
-
-    if (m && (Py_TYPE(m) == internals.nb_func ||
-              Py_TYPE(m) == internals.nb_method)) {
-        func_data *f = nb_func_data(m);
-        if (f->flags & (uint32_t) func_flags::has_doc)
-            doc = str(f->doc);
-    }
-
-    handle(scope).attr(name) = property(
-        getter ? handle(getter) : handle(Py_None),
-        setter ? handle(setter) : handle(Py_None),
-        handle(Py_None), // deleter
-        doc
-    );
-}
-
-// ========================================================================
-
-void tuple_check(PyObject *tuple, size_t nargs) {
-    for (size_t i = 0; i < nargs; ++i) {
-        if (!NB_TUPLE_GET_ITEM(tuple, i))
-            raise("nanobind::detail::tuple_check(...): conversion of argument "
-                  "%zu failed!", i + 1);
-    }
-}
-
-// ========================================================================
-
-void print(PyObject *value, PyObject *end, PyObject *file) {
-    if (!file)
-        file = PySys_GetObject("stdout");
-
-    int rv = PyFile_WriteObject(value, file, Py_PRINT_RAW);
-    if (rv)
-        raise_python_error();
-
-    if (end)
-        rv = PyFile_WriteObject(end, file, Py_PRINT_RAW);
-    else
-        rv = PyFile_WriteString("\n", file);
-
-    if (rv)
-        raise_python_error();
-}
-
-// ========================================================================
-
-std::pair<double, bool> load_f64(PyObject *o, uint8_t flags) noexcept {
-    const bool convert = flags & (uint8_t) cast_flags::convert;
-
-    if (convert || PyFloat_Check(o)) {
-        double result = PyFloat_AsDouble(o);
-
-        if (result != -1.0 || !PyErr_Occurred())
-            return { result, true };
-        else
-            PyErr_Clear();
-    }
-
-    return { 0.0, false };
-}
-
-std::pair<float, bool> load_f32(PyObject *o, uint8_t flags) noexcept {
-    const bool convert = flags & (uint8_t) cast_flags::convert;
-    if (convert || PyFloat_Check(o)) {
-        double result = PyFloat_AsDouble(o);
-
-        if (result != -1.0 || !PyErr_Occurred())
-            return { (float) result, true };
-        else
-            PyErr_Clear();
-    }
-
-    return { 0.f, false };
-}
-
-template <typename T>
-NB_INLINE std::pair<T, bool> load_int(PyObject *o, uint32_t flags) noexcept {
-    using T0 = std::conditional_t<sizeof(T) <= sizeof(long), long, long long>;
-    using Tp = std::conditional_t<std::is_signed_v<T>, T0, std::make_unsigned_t<T0>>;
-
-    const bool convert = flags & (uint8_t) cast_flags::convert;
-    object temp;
-
-    if (!PyLong_Check(o)) {
-        if (convert) {
-            if constexpr (std::is_unsigned_v<T>) {
-                // Unsigned PyLong_* conversions don't call __index__()..
-                temp = steal(PyNumber_Long(o));
-                if (!temp.is_valid()) {
-                    PyErr_Clear();
-                    return { T(0), false };
-                }
-
-                o = temp.ptr();
-            }
-        } else {
-            return { T(0), false };
-        }
-    }
-
-    Tp value_p;
-    if constexpr (std::is_unsigned_v<Tp>) {
-        value_p = sizeof(T) <= sizeof(long) ? (Tp) PyLong_AsUnsignedLong(o)
-                                            : (Tp) PyLong_AsUnsignedLongLong(o);
-    } else {
-        value_p = sizeof(T) <= sizeof(long) ? (Tp) PyLong_AsLong(o)
-                                            : (Tp) PyLong_AsLongLong(o);
-    }
-
-    if (value_p == Tp(-1) && PyErr_Occurred()) {
-        PyErr_Clear();
-        return { T(0), false };
-    }
-
-    T value = (T) value_p;
-    if constexpr (sizeof(Tp) != sizeof(T)) {
-        if (value_p != (Tp) value)
-            return { T(0), false };
-    }
-    return { value, true };
-}
-
-std::pair<uint8_t, bool> load_u8(PyObject *o, uint8_t flags) noexcept {
-    return load_int<uint8_t>(o, flags);
-}
-
-std::pair<int8_t, bool> load_i8(PyObject *o, uint8_t flags) noexcept {
-    return load_int<int8_t>(o, flags);
-}
-
-std::pair<uint16_t, bool> load_u16(PyObject *o, uint8_t flags) noexcept {
-    return load_int<uint16_t>(o, flags);
-}
-
-std::pair<int16_t, bool> load_i16(PyObject *o, uint8_t flags) noexcept {
-    return load_int<int16_t>(o, flags);
-}
-
-std::pair<uint32_t, bool> load_u32(PyObject *o, uint8_t flags) noexcept {
-    return load_int<uint32_t>(o, flags);
-}
-
-std::pair<int32_t, bool> load_i32(PyObject *o, uint8_t flags) noexcept {
-    return load_int<int32_t>(o, flags);
-}
-
-std::pair<uint64_t, bool> load_u64(PyObject *o, uint8_t flags) noexcept {
-    return load_int<uint64_t>(o, flags);
-}
-
-std::pair<int64_t, bool> load_i64(PyObject *o, uint8_t flags) noexcept {
-    return load_int<int64_t>(o, flags);
-}
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/error.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/error.cpp
deleted file mode 100644
index 4a5ebd190..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/error.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-    src/error.cpp: libnanobind functionality for exceptions
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#include <nanobind/nanobind.h>
-#include "buffer.h"
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-Buffer buf(128);
-
-NAMESPACE_END(detail)
-
-python_error::python_error() {
-    PyErr_Fetch(&m_type.m_ptr, &m_value.m_ptr, &m_trace.m_ptr);
-}
-
-python_error::~python_error() {
-    free(m_what);
-}
-
-python_error::python_error(const python_error &e) : std::exception(e),
-    m_type{e.m_type},
-    m_value{e.m_value},
-    m_trace{e.m_trace} {
-    if (e.m_what)
-        m_what = NB_STRDUP(e.m_what);
-}
-
-python_error::python_error(python_error &&e) noexcept : std::exception(e),
-    m_type{std::move(e.m_type)},
-    m_value{std::move(e.m_value)},
-    m_trace{std::move(e.m_trace)} {
-    std::swap(m_what, e.m_what);
-}
-
-const char *python_error::what() const noexcept {
-    if (m_what)
-        return m_what;
-
-    using detail::buf;
-
-    buf.clear();
-
-    if (m_type.is_valid()) {
-        object name = m_type.attr("__name__");
-        buf.put_dstr(borrow<str>(name).c_str());
-        buf.put(": ");
-    }
-
-    if (m_value.is_valid())
-        buf.put_dstr(str(m_value).c_str());
-
-#if !defined(Py_LIMITED_API)
-    if (m_trace.is_valid()) {
-        PyTracebackObject *to = (PyTracebackObject *) m_trace.ptr();
-
-        // Get the deepest trace possible
-        while (to->tb_next)
-            to = to->tb_next;
-
-        PyFrameObject *frame = to->tb_frame;
-#if PY_VERSION_HEX >= 0x03090000
-        Py_XINCREF(frame);
-#endif
-
-        buf.put("\n\nAt:\n");
-        while (frame) {
-#if PY_VERSION_HEX >= 0x03090000
-            PyCodeObject *f_code = PyFrame_GetCode(frame);
-#else
-            PyCodeObject *f_code = frame->f_code;
-            Py_INCREF(f_code);
-#endif
-            buf.put_dstr(borrow<str>(f_code->co_filename).c_str());
-            buf.put('(');
-            buf.put_uint32(PyFrame_GetLineNumber(frame));
-            buf.put("): ");
-            buf.put_dstr(borrow<str>(f_code->co_name).c_str());
-            buf.put('\n');
-
-#if PY_VERSION_HEX >= 0x03090000
-            PyFrameObject *frame_new = PyFrame_GetBack(frame);
-            Py_DECREF(frame);
-            frame = frame_new;
-#else
-            frame = frame->f_back;
-#endif
-           Py_DECREF(f_code);
-        }
-    }
-#endif
-
-    m_what = buf.copy();
-    return m_what;
-}
-
-void python_error::restore() {
-    PyErr_Restore(m_type.release().ptr(), m_value.release().ptr(),
-                  m_trace.release().ptr());
-}
-
-next_overload::next_overload() : std::exception() { }
-next_overload::~next_overload() = default;
-
-#define NB_EXCEPTION(name, type)                                               \
-    name::name() : builtin_exception("") { }                                   \
-    void name::set_error() const { PyErr_SetString(type, what()); }
-
-NB_EXCEPTION(stop_iteration, PyExc_StopIteration)
-NB_EXCEPTION(index_error, PyExc_IndexError)
-NB_EXCEPTION(key_error, PyExc_KeyError)
-NB_EXCEPTION(value_error, PyExc_ValueError)
-NB_EXCEPTION(type_error, PyExc_TypeError)
-NB_EXCEPTION(buffer_error, PyExc_BufferError)
-NB_EXCEPTION(import_error, PyExc_ImportError)
-NB_EXCEPTION(attribute_error, PyExc_AttributeError)
-
-#undef NB_EXCEPTION
-
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/implicit.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/implicit.cpp
deleted file mode 100644
index 9835ccb98..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/implicit.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-    src/implicit.cpp: functions for registering implicit conversions
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#include <nanobind/trampoline.h>
-#include "nb_internals.h"
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-void implicitly_convertible(const std::type_info *src,
-                            const std::type_info *dst) noexcept {
-    nb_internals &internals = internals_get();
-
-    auto it = internals.type_c2p.find(std::type_index(*dst));
-    if (it == internals.type_c2p.end())
-        fail("nanobind::detail::implicitly_convertible(src=%s, dst=%s): "
-             "destination type unknown!", type_name(src), type_name(dst));
-
-    type_data *t = it->second;
-    size_t size = 0;
-
-    if (t->flags & (uint32_t) type_flags::has_implicit_conversions) {
-        while (t->implicit && t->implicit[size])
-            size++;
-    } else {
-        t->implicit = nullptr;
-        t->implicit_py = nullptr;
-        t->flags |= (uint32_t) type_flags::has_implicit_conversions;
-    }
-
-    void **data = (void **) malloc(sizeof(void *) * (size + 2));
-
-    memcpy(data, t->implicit, size * sizeof(void *));
-    data[size] = (void *) src;
-    data[size + 1] = nullptr;
-    free(t->implicit);
-    t->implicit = (decltype(t->implicit)) data;
-}
-
-void implicitly_convertible(bool (*predicate)(PyTypeObject *, PyObject *,
-                                              cleanup_list *),
-                            const std::type_info *dst) noexcept {
-    nb_internals &internals = internals_get();
-
-    auto it = internals.type_c2p.find(std::type_index(*dst));
-    if (it == internals.type_c2p.end())
-        fail("nanobind::detail::implicitly_convertible(src=<predicate>, dst=%s): "
-             "destination type unknown!", type_name(dst));
-
-    type_data *t = it->second;
-    size_t size = 0;
-
-    if (t->flags & (uint32_t) type_flags::has_implicit_conversions) {
-        while (t->implicit_py && t->implicit_py[size])
-            size++;
-    } else {
-        t->implicit = nullptr;
-        t->implicit_py = nullptr;
-        t->flags |= (uint32_t) type_flags::has_implicit_conversions;
-    }
-
-    void **data = (void **) malloc(sizeof(void *) * (size + 2));
-    memcpy(data, t->implicit_py, size * sizeof(void *));
-    data[size] = (void *) predicate;
-    data[size + 1] = nullptr;
-    free(t->implicit_py);
-    t->implicit_py = (decltype(t->implicit_py)) data;
-}
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nanobind/__init__.py b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nanobind/__init__.py
deleted file mode 100644
index 11d67f4ba..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nanobind/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import sys
-import os
-
-if sys.version_info < (3, 8):
-    raise ImportError("nanobind does not support Python < 3.8.")
-
-def include_dir() -> str:
-    "Return the path to the nanobind include directory"
-    return os.path.join(os.path.abspath(os.path.dirname(__file__)), "include")
-
-def cmake_dir() -> str:
-    "Return the path to the nanobind CMake module directory."
-    return os.path.join(os.path.abspath(os.path.dirname(__file__)), "cmake")
-
-__version__ = "0.0.5"
-
-__all__ = (
-    "__version__",
-    "include_dir",
-    "cmake_dir",
-)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_enum.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_enum.cpp
deleted file mode 100644
index afdb179d6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_enum.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
-    src/nb_enum.cpp: nanobind enumeration type
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#include <nanobind/nanobind.h>
-#include "nb_internals.h"
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-static PyObject *nb_enum_int(PyObject *o);
-
-/// Map to unique representative enum instance, returns a borrowed reference
-static PyObject *nb_enum_lookup(PyObject *self) {
-    PyObject *int_val = nb_enum_int(self),
-             *dict    = PyObject_GetAttrString((PyObject *) Py_TYPE(self), "__entries");
-
-    PyObject *rec = nullptr;
-    if (int_val && dict)
-        rec = (PyObject *) PyDict_GetItem(dict, int_val);
-
-    Py_XDECREF(int_val);
-    Py_XDECREF(dict);
-
-    if (rec && PyTuple_CheckExact(rec) && NB_TUPLE_GET_SIZE(rec) == 3) {
-        return rec;
-    } else {
-        PyErr_Clear();
-        PyErr_SetString(PyExc_RuntimeError, "nb_enum: could not find entry!");
-        return nullptr;
-    }
-}
-
-static PyObject *nb_enum_repr(PyObject *self) {
-    PyObject *entry = nb_enum_lookup(self);
-    if (!entry)
-        return nullptr;
-
-    PyObject *name = nb_inst_name(self);
-    PyObject *result =
-        PyUnicode_FromFormat("%U.%U", name, NB_TUPLE_GET_ITEM(entry, 0));
-    Py_DECREF(name);
-
-    return result;
-}
-
-static PyObject *nb_enum_get_name(PyObject *self, void *) {
-    PyObject *entry = nb_enum_lookup(self);
-    if (!entry)
-        return nullptr;
-
-    PyObject *result = NB_TUPLE_GET_ITEM(entry, 0);
-    Py_INCREF(result);
-    return result;
-}
-
-static PyObject *nb_enum_get_doc(PyObject *self, void *) {
-    PyObject *entry = nb_enum_lookup(self);
-    if (!entry)
-        return nullptr;
-
-    PyObject *result = NB_TUPLE_GET_ITEM(entry, 1);
-    Py_INCREF(result);
-    return result;
-}
-
-static PyObject *nb_enum_int(PyObject *o) {
-    type_data *t = nb_type_data(Py_TYPE(o));
-
-    const void *p = inst_ptr((nb_inst *) o);
-    if (t->flags & (uint32_t) type_flags::is_unsigned_enum) {
-        unsigned long long value;
-        switch (t->size) {
-            case 1: value = (unsigned long long) *(const uint8_t *)  p; break;
-            case 2: value = (unsigned long long) *(const uint16_t *) p; break;
-            case 4: value = (unsigned long long) *(const uint32_t *) p; break;
-            case 8: value = (unsigned long long) *(const uint64_t *) p; break;
-            default: PyErr_SetString(PyExc_TypeError, "nb_enum: invalid type size!");
-                     return nullptr;
-        }
-        return PyLong_FromUnsignedLongLong(value);
-    } else if (t->flags & (uint32_t) type_flags::is_signed_enum) {
-        long long value;
-        switch (t->size) {
-            case 1: value = (long long) *(const int8_t *)  p; break;
-            case 2: value = (long long) *(const int16_t *) p; break;
-            case 4: value = (long long) *(const int32_t *) p; break;
-            case 8: value = (long long) *(const int64_t *) p; break;
-            default: PyErr_SetString(PyExc_TypeError, "nb_enum: invalid type size!");
-                     return nullptr;
-        }
-        return PyLong_FromLongLong(value);
-    } else {
-        PyErr_SetString(PyExc_TypeError, "nb_enum: input is not an enumeration!");
-        return nullptr;
-    }
-}
-
-static PyObject *nb_enum_init(PyTypeObject *subtype, PyObject *args, PyObject *kwds) {
-    PyObject *arg;
-
-    if (kwds || NB_TUPLE_GET_SIZE(args) != 1)
-        goto error;
-
-    arg = NB_TUPLE_GET_ITEM(args, 0);
-    if (PyLong_Check(arg)) {
-        PyObject *entries =
-            PyObject_GetAttrString((PyObject *) subtype, "__entries");
-        if (!entries)
-            goto error;
-
-        PyObject *item = PyDict_GetItem(entries, arg);
-        Py_DECREF(entries);
-
-        if (item && PyTuple_CheckExact(item) && NB_TUPLE_GET_SIZE(item) == 3) {
-            item = NB_TUPLE_GET_ITEM(item, 2);
-            Py_INCREF(item);
-            return item;
-        }
-    } else if (Py_TYPE(arg) == subtype) {
-        Py_INCREF(arg);
-        return arg;
-    }
-
-error:
-    PyErr_Clear();
-    PyErr_Format(PyExc_RuntimeError,
-                 "%s(): could not convert the input into an enumeration value!",
-                 nb_type_data(subtype)->name);
-    return nullptr;
-}
-
-static PyGetSetDef nb_enum_getset[] = {
-    { "__doc__", nb_enum_get_doc, nullptr, nullptr, nullptr },
-    { "__name__", nb_enum_get_name, nullptr, nullptr, nullptr },
-    { nullptr, nullptr, nullptr, nullptr, nullptr }
-};
-
-PyObject *nb_enum_richcompare(PyObject *a, PyObject *b, int op) {
-    PyObject *ia = PyNumber_Long(a);
-    PyObject *ib = PyNumber_Long(b);
-    if (!ia || !ib)
-        return nullptr;
-    PyObject *result = PyObject_RichCompare(ia, ib, op);
-    Py_DECREF(ia);
-    Py_DECREF(ib);
-    return result;
-}
-
-#define NB_ENUM_UNOP(name, op)                                                 \
-    PyObject *nb_enum_##name(PyObject *a) {                                    \
-        PyObject *ia = PyNumber_Long(a);                                       \
-        if (!ia)                                                               \
-            return nullptr;                                                    \
-        PyObject *result = op(ia);                                             \
-        Py_DECREF(ia);                                                         \
-        return result;                                                         \
-    }
-
-#define NB_ENUM_BINOP(name, op)                                                \
-    PyObject *nb_enum_##name(PyObject *a, PyObject *b) {                       \
-        PyObject *ia = PyNumber_Long(a);                                       \
-        PyObject *ib = PyNumber_Long(b);                                       \
-        if (!ia || !ib)                                                        \
-            return nullptr;                                                    \
-        PyObject *result = op(ia, ib);                                         \
-        Py_DECREF(ia);                                                         \
-        Py_DECREF(ib);                                                         \
-        return result;                                                         \
-    }
-
-NB_ENUM_BINOP(add, PyNumber_Add)
-NB_ENUM_BINOP(sub, PyNumber_Subtract)
-NB_ENUM_BINOP(mul, PyNumber_Multiply)
-NB_ENUM_BINOP(div, PyNumber_FloorDivide)
-NB_ENUM_BINOP(and, PyNumber_And)
-NB_ENUM_BINOP(or, PyNumber_Or)
-NB_ENUM_BINOP(xor, PyNumber_Xor)
-NB_ENUM_BINOP(lshift, PyNumber_Lshift)
-NB_ENUM_BINOP(rshift, PyNumber_Rshift)
-NB_ENUM_UNOP(neg, PyNumber_Negative)
-NB_ENUM_UNOP(inv, PyNumber_Invert)
-NB_ENUM_UNOP(abs, PyNumber_Absolute)
-
-int nb_enum_clear(PyObject *) {
-    return 0;
-}
-
-int nb_enum_traverse(PyObject *o, visitproc visit, void *arg) {
-    Py_VISIT(Py_TYPE(o));
-    return 0;
-}
-
-void nb_enum_prepare(PyType_Slot **s, bool is_arithmetic) {
-    PyType_Slot *t = *s;
-
-    *t++ = { Py_tp_new, (void *) nb_enum_init };
-    *t++ = { Py_tp_init, (void *) nullptr };
-    *t++ = { Py_tp_repr, (void *) nb_enum_repr };
-    *t++ = { Py_tp_richcompare, (void *) nb_enum_richcompare };
-    *t++ = { Py_nb_int, (void *) nb_enum_int };
-    *t++ = { Py_tp_getset, (void *) nb_enum_getset };
-    *t++ = { Py_tp_traverse, (void *) nb_enum_traverse };
-    *t++ = { Py_tp_clear, (void *) nb_enum_clear };
-
-    if (is_arithmetic) {
-        *t++ = { Py_nb_add, (void *) nb_enum_add };
-        *t++ = { Py_nb_subtract, (void *) nb_enum_sub };
-        *t++ = { Py_nb_multiply, (void *) nb_enum_sub };
-        *t++ = { Py_nb_floor_divide, (void *) nb_enum_div };
-        *t++ = { Py_nb_or, (void *) nb_enum_or };
-        *t++ = { Py_nb_xor, (void *) nb_enum_xor };
-        *t++ = { Py_nb_and, (void *) nb_enum_and };
-        *t++ = { Py_nb_rshift, (void *) nb_enum_rshift };
-        *t++ = { Py_nb_lshift, (void *) nb_enum_lshift };
-        *t++ = { Py_nb_negative, (void *) nb_enum_neg };
-        *t++ = { Py_nb_invert, (void *) nb_enum_inv };
-        *t++ = { Py_nb_absolute, (void *) nb_enum_abs };
-    }
-
-    *s = t;
-}
-
-void nb_enum_put(PyObject *type, const char *name, const void *value,
-                 const char *doc) noexcept {
-    PyObject *doc_obj, *rec, *dict, *int_val;
-
-    PyObject *name_obj = PyUnicode_InternFromString(name);
-    if (doc) {
-        doc_obj = PyUnicode_FromString(doc);
-    } else {
-        doc_obj = Py_None;
-        Py_INCREF(Py_None);
-    }
-
-    nb_inst *inst = (nb_inst *) inst_new_impl((PyTypeObject *) type, nullptr);
-
-    if (!doc_obj || !name_obj || !inst)
-        goto error;
-
-    rec = PyTuple_New(3);
-    NB_TUPLE_SET_ITEM(rec, 0, name_obj);
-    NB_TUPLE_SET_ITEM(rec, 1, doc_obj);
-    NB_TUPLE_SET_ITEM(rec, 2, (PyObject *) inst);
-
-    memcpy(inst_ptr(inst), value, nb_type_data((PyTypeObject *) type)->size);
-    inst->destruct = false;
-    inst->cpp_delete = false;
-    inst->ready = true;
-
-    if (PyObject_SetAttr(type, name_obj, (PyObject *) inst))
-        goto error;
-
-    int_val = nb_enum_int((PyObject *) inst);
-    if (!int_val)
-        goto error;
-
-    dict = PyObject_GetAttrString(type, "__entries");
-    if (!dict) {
-        PyErr_Clear();
-        dict = PyDict_New();
-        if (!dict)
-            goto error;
-
-        if (PyObject_SetAttrString(type, "__entries", dict))
-            goto error;
-    }
-
-    if (PyDict_SetItem(dict, int_val, rec))
-        goto error;
-
-    Py_DECREF(int_val);
-    Py_DECREF(dict);
-    Py_DECREF(rec);
-
-    return;
-
-error:
-    fail("nanobind::detail::nb_enum_add(): could not create enum entry!");
-}
-
-void nb_enum_export(PyObject *tp) {
-    type_data *t = nb_type_data((PyTypeObject *) tp);
-    PyObject *entries = PyObject_GetAttrString(tp, "__entries");
-
-    if (!entries || !(t->flags & (uint32_t) type_flags::has_scope))
-        fail("nanobind::detail::nb_enum_export(): internal error!");
-
-    PyObject *key, *value;
-    Py_ssize_t pos = 0;
-
-    while (PyDict_Next(entries, &pos, &key, &value)) {
-        if (!PyTuple_CheckExact(value) || NB_TUPLE_GET_SIZE(value) != 3)
-            fail("nanobind::detail::nb_enum_export(): internal error! (2)");
-
-        setattr(t->scope,
-                NB_TUPLE_GET_ITEM(value, 0),
-                NB_TUPLE_GET_ITEM(value, 2));
-    }
-
-    Py_DECREF(entries);
-}
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_func.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_func.cpp
deleted file mode 100644
index e9d490c88..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_func.cpp
+++ /dev/null
@@ -1,1016 +0,0 @@
-/*
-    src/nb_func.cpp: nanobind function type
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "nb_internals.h"
-#include "buffer.h"
-
-#if defined(__GNUG__)
-#  include <cxxabi.h>
-#endif
-
-#if defined(_MSC_VER)
-#  pragma warning(disable: 4706) // assignment within conditional expression
-#endif
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-// Forward/external declarations
-extern Buffer buf;
-
-static PyObject *nb_func_vectorcall_simple(PyObject *, PyObject *const *,
-                                           size_t, PyObject *) noexcept;
-static PyObject *nb_func_vectorcall_complex(PyObject *, PyObject *const *,
-                                            size_t, PyObject *) noexcept;
-static void nb_func_render_signature(const func_data *f) noexcept;
-
-/// Free a function overload chain
-void nb_func_dealloc(PyObject *self) {
-    size_t size = (size_t) Py_SIZE(self);
-
-    if (size) {
-        func_data *f = nb_func_data(self);
-
-        // Delete from registered function list
-        auto &funcs = internals_get().funcs;
-        auto it = funcs.find(self);
-        if (it == funcs.end()) {
-            const char *name = (f->flags & (uint32_t) func_flags::has_name)
-                                   ? f->name : "<anonymous>";
-            fail("nanobind::detail::nb_func_dealloc(\"%s\"): function not found!",
-                 name);
-        }
-        funcs.erase(it);
-
-        for (size_t i = 0; i < size; ++i) {
-            if (f->flags & (uint32_t) func_flags::has_free)
-                f->free(f->capture);
-
-            if (f->flags & (uint32_t) func_flags::has_args) {
-                for (size_t j = 0; j < f->nargs; ++j) {
-                    Py_XDECREF(f->args[j].value);
-                    Py_XDECREF(f->args[j].name_py);
-                }
-            }
-
-            free(f->args);
-            free((char *) f->descr);
-            free(f->descr_types);
-            ++f;
-        }
-    }
-
-    PyObject_Free(self);
-}
-
-void nb_bound_method_dealloc(PyObject *self) {
-    nb_bound_method *mb = (nb_bound_method *) self;
-    Py_DECREF((PyObject *) mb->func);
-    Py_DECREF(mb->self);
-    PyObject_Free(self);
-}
-
-/**
- * \brief Wrap a C++ function into a Python function object
- *
- * This is an implementation detail of nanobind::cpp_function.
- */
-PyObject *nb_func_new(const void *in_) noexcept {
-    func_data_prelim<0> *f = (func_data_prelim<0> *) in_;
-
-    const bool has_scope      = f->flags & (uint32_t) func_flags::has_scope,
-               has_name       = f->flags & (uint32_t) func_flags::has_name,
-               has_args       = f->flags & (uint32_t) func_flags::has_args,
-               has_var_args   = f->flags & (uint32_t) func_flags::has_var_args,
-               has_var_kwargs = f->flags & (uint32_t) func_flags::has_var_kwargs,
-               is_implicit    = f->flags & (uint32_t) func_flags::is_implicit,
-               is_method      = f->flags & (uint32_t) func_flags::is_method,
-               return_ref     = f->flags & (uint32_t) func_flags::return_ref;
-
-    PyObject *name = nullptr;
-    PyObject *func_prev = nullptr;
-    nb_internals &internals = internals_get();
-
-    // Check for previous overloads
-    if (has_scope && has_name) {
-        name = PyUnicode_FromString(f->name);
-        if (!name)
-            fail("nb::detail::nb_func_new(\"%s\"): invalid name.", f->name);
-
-        func_prev = PyObject_GetAttr(f->scope, name);
-        if (func_prev) {
-            if (Py_TYPE(func_prev) == internals.nb_func ||
-                Py_TYPE(func_prev) == internals.nb_method) {
-                func_data *fp = nb_func_data(func_prev);
-
-                if ((fp->flags & (uint32_t) func_flags::is_method) !=
-                    (f ->flags & (uint32_t) func_flags::is_method))
-                    fail("nb::detail::nb_func_new(\"%s\"): mismatched static/"
-                         "instance method flags in function overloads!", f->name);
-
-                /* Never append a method to an overload chain of a parent class;
-                   instead, hide the parent's overloads in this case */
-                if (fp->scope != f->scope)
-                    Py_CLEAR(func_prev);
-            } else if (f->name[0] == '_') {
-                Py_CLEAR(func_prev);
-            } else {
-                fail("nb::detail::nb_func_new(\"%s\"): cannot overload "
-                     "existing non-function object of the same name!", f->name);
-            }
-        } else {
-            PyErr_Clear();
-        }
-    }
-
-    // Create a new function and destroy the old one
-    Py_ssize_t to_copy = func_prev ? Py_SIZE(func_prev) : 0;
-    nb_func *func = (nb_func *) PyType_GenericAlloc(
-        is_method ? internals.nb_method : internals.nb_func, to_copy + 1);
-    if (!func)
-        fail("nb::detail::nb_func_new(\"%s\"): alloc. failed (1).",
-             has_name ? f->name : "<anonymous>");
-
-    func->max_nargs_pos = f->nargs;
-    func->complex_call = has_args || has_var_args || has_var_kwargs;
-
-    if (func_prev) {
-        func->complex_call |= ((nb_func *) func_prev)->complex_call;
-        func->max_nargs_pos = std::max(func->max_nargs_pos,
-                                       ((nb_func *) func_prev)->max_nargs_pos);
-
-        func_data *cur  = nb_func_data(func),
-                  *prev = nb_func_data(func_prev);
-
-        memcpy(cur, prev, sizeof(func_data) * to_copy);
-        memset(prev, 0, sizeof(func_data) * to_copy);
-
-        ((PyVarObject *) func_prev)->ob_size = 0;
-
-        auto it = internals.funcs.find(func_prev);
-        if (it == internals.funcs.end())
-            fail("nanobind::detail::nb_func_new(): internal update failed (1)!");
-        internals.funcs.erase(it);
-    }
-
-    func->vectorcall = func->complex_call ? nb_func_vectorcall_complex
-                                          : nb_func_vectorcall_simple;
-
-    // Register the function
-    auto [it, success] = internals.funcs.insert(func);
-    if (!success)
-        fail("nanobind::detail::nb_func_new(): internal update failed (2)!");
-
-    func_data *fc = nb_func_data(func) + to_copy;
-    memcpy(fc, f, sizeof(func_data_prelim<0>));
-    if (has_name) {
-        fc->flags |= strcmp(fc->name, "__init__") == 0
-                         ? (uint32_t) func_flags::is_constructor
-                         : (uint16_t) 0;
-    } else {
-        fc->name = "<anonymous>";
-    }
-
-    if (is_implicit) {
-        if (!(fc->flags & (uint32_t) func_flags::is_constructor))
-            fail("nb::detail::nb_func_new(\"%s\"): nanobind::is_implicit() "
-                 "should only be specified for constructors.", f->name);
-        if (f->nargs != 2)
-            fail("nb::detail::nb_func_new(\"%s\"): implicit constructors "
-                 "should only have one argument.", f->name);
-
-        if (f->descr_types[1])
-            implicitly_convertible(f->descr_types[1], f->descr_types[0]);
-    }
-
-    for (size_t i = 0;; ++i) {
-        if (!f->descr[i]) {
-            fc->descr = (char *) malloc(sizeof(char) * (i + 1));
-            memcpy((char *) fc->descr, f->descr, (i + 1) * sizeof(char));
-            break;
-        }
-    }
-
-    for (size_t i = 0;; ++i) {
-        if (!f->descr_types[i]) {
-            fc->descr_types = (const std::type_info **)
-                malloc(sizeof(const std::type_info *) * (i + 1));
-            memcpy(fc->descr_types, f->descr_types,
-                        (i + 1) * sizeof(const std::type_info *));
-            break;
-        }
-    }
-
-    if (has_args) {
-        arg_data *args_in = std::launder((arg_data *) f->args);
-        fc->args =
-            (arg_data *) malloc(sizeof(arg_data) * (f->nargs + is_method));
-
-        if (is_method) // add implicit 'self' argument annotation
-            fc->args[0] = arg_data{ "self", nullptr, nullptr, false, false };
-        for (size_t i = is_method; i < fc->nargs; ++i)
-            fc->args[i] = args_in[i - is_method];
-
-        for (size_t i = 0; i < fc->nargs; ++i) {
-            arg_data &a = fc->args[i];
-            if (a.name)
-                a.name_py = PyUnicode_InternFromString(a.name);
-            else
-                a.name_py = nullptr;
-            Py_XINCREF(a.value);
-        }
-    }
-
-    if (has_scope && name) {
-        int rv = PyObject_SetAttr(f->scope, name, (PyObject *) func);
-        if (rv)
-            fail("nb::detail::nb_func_new(\"%s\"): setattr. failed.", f->name);
-    }
-
-    Py_XDECREF(name);
-
-    if (return_ref) {
-        return (PyObject *) func;
-    } else {
-        Py_DECREF(func);
-        return nullptr;
-    }
-}
-
-/// Used by nb_func_vectorcall: generate an error when overload resolution fails
-static NB_NOINLINE PyObject *
-nb_func_error_overload(PyObject *self, PyObject *const *args_in,
-                       size_t nargs_in, PyObject *kwargs_in) noexcept {
-    const uint32_t count = (uint32_t) Py_SIZE(self);
-    func_data *f = nb_func_data(self);
-
-    if (f->flags & (uint32_t) func_flags::is_operator) {
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    }
-
-    buf.clear();
-    buf.put_dstr(f->name);
-    buf.put("(): incompatible function arguments. The following argument types "
-            "are supported:\n");
-
-    for (uint32_t i = 0; i < count; ++i) {
-        buf.put("    ");
-        buf.put_uint32(i + 1);
-        buf.put(". ");
-        nb_func_render_signature(f + i);
-        buf.put('\n');
-    }
-
-    buf.put("\nInvoked with types: ");
-    for (size_t i = 0; i < nargs_in; ++i) {
-        str name = steal<str>(nb_inst_name(args_in[i]));
-        buf.put_dstr(name.c_str());
-        if (i + 1 < nargs_in)
-            buf.put(", ");
-    }
-
-    if (kwargs_in) {
-        if (nargs_in)
-            buf.put(", ");
-        buf.put("kwargs = { ");
-
-        size_t nkwargs_in = (size_t) NB_TUPLE_GET_SIZE(kwargs_in);
-        for (size_t j = 0; j < nkwargs_in; ++j) {
-            PyObject *key   = NB_TUPLE_GET_ITEM(kwargs_in, j),
-                     *value = args_in[nargs_in + j];
-
-            const char *key_cstr = PyUnicode_AsUTF8AndSize(key, nullptr);
-            buf.put_dstr(key_cstr);
-            buf.put(": ");
-            str name = steal<str>(nb_inst_name(value));
-            buf.put_dstr(name.c_str());
-            buf.put(", ");
-        }
-        buf.rewind(2);
-        buf.put(" }");
-    }
-
-    PyErr_SetString(PyExc_TypeError, buf.get());
-    return nullptr;
-}
-
-/// Used by nb_func_vectorcall: generate an error when result conversion fails
-static NB_NOINLINE PyObject *nb_func_error_noconvert(PyObject *self,
-                                                     PyObject *const *, size_t,
-                                                     PyObject *) noexcept {
-    if (PyErr_Occurred())
-        return nullptr;
-    func_data *f = nb_func_data(self);
-    buf.clear();
-    buf.put("Unable to convert function return value to a Python "
-            "type! The signature was\n    ");
-    nb_func_render_signature(f);
-    PyErr_SetString(PyExc_TypeError, buf.get());
-    return nullptr;
-}
-
-/// Used by nb_func_vectorcall: convert a C++ exception into a Python error
-static NB_NOINLINE void nb_func_convert_cpp_exception() noexcept {
-    std::exception_ptr e = std::current_exception();
-    for (auto const &et : internals_get().exception_translators) {
-        try {
-            et(e);
-            return;
-        } catch (...) {
-            e = std::current_exception();
-        }
-    }
-
-    PyErr_SetString(PyExc_SystemError,
-                    "nanobind::detail::nb_func_error_except(): exception "
-                    "could not be translated!");
-}
-
-static PyTypeObject *nb_type_cache = nullptr;
-
-/// Dispatch loop that is used to invoke functions created by nb_func_new
-static PyObject *nb_func_vectorcall_complex(PyObject *self,
-                                            PyObject *const *args_in,
-                                            size_t nargsf,
-                                            PyObject *kwargs_in) noexcept {
-    const size_t count      = (size_t) Py_SIZE(self),
-                 nargs_in   = (size_t) NB_VECTORCALL_NARGS(nargsf),
-                 nkwargs_in = kwargs_in ? (size_t) NB_TUPLE_GET_SIZE(kwargs_in) : 0;
-
-    func_data *fr = nb_func_data(self);
-
-    const bool is_method = fr->flags & (uint32_t) func_flags::is_method,
-               is_constructor = fr->flags & (uint32_t) func_flags::is_constructor;
-
-    PyObject *result = nullptr, *self_arg = nullptr;
-
-    if (is_method) {
-        self_arg = nargs_in > 0 ? args_in[0] : nullptr;
-
-        if (!nb_type_cache)
-            nb_type_cache = internals_get().nb_type;
-
-        if (self_arg && Py_TYPE((PyObject *) Py_TYPE(self_arg)) != nb_type_cache)
-            self_arg = nullptr;
-
-        if (!self_arg) {
-            PyErr_SetString(
-                PyExc_RuntimeError,
-                "nanobind::detail::nb_func_vectorcall(): the 'self' argument "
-                "of a method call should be a nanobind class.");
-            return nullptr;
-        }
-
-        current_method_data = current_method{ fr->name, self_arg };
-
-        if (is_constructor) {
-            if (((nb_inst *) self_arg)->ready) {
-                PyErr_SetString(
-                    PyExc_RuntimeError,
-                    "nanobind::detail::nb_func_vectorcall(): the __init__ "
-                    "method should not be called on an initialized object!");
-                return nullptr;
-            }
-        }
-    }
-
-    /* The following lines allocate memory on the stack, which is very efficient
-       but also potentially dangerous since it can be used to generate stack
-       overflows. We refuse unrealistically large number of 'kwargs' (the
-       'max_nargs_pos' value is fine since it is specified by the bindings) */
-    if (nkwargs_in > 1024) {
-        PyErr_SetString(PyExc_TypeError,
-                        "nanobind::detail::nb_func_vectorcall(): too many (> "
-                        "1024) keyword arguments.");
-        return nullptr;
-    }
-
-
-    // Handler routine that will be invoked in case of an error condition
-    PyObject *(*error_handler)(PyObject *, PyObject *const *, size_t,
-                               PyObject *) noexcept = nullptr;
-
-    // Small array holding temporaries (implicit conversion/*args/**kwargs)
-    cleanup_list cleanup(self_arg);
-
-    // Preallocate stack memory for function dispatch
-    size_t max_nargs_pos = ((nb_func *) self)->max_nargs_pos;
-    PyObject **args = (PyObject **) alloca(max_nargs_pos * sizeof(PyObject *));
-    uint8_t *args_flags = (uint8_t *) alloca(max_nargs_pos * sizeof(uint8_t));
-    bool *kwarg_used = (bool *) alloca(nkwargs_in * sizeof(bool));
-
-    /*  The logic below tries to find a suitable overload using two passes
-        of the overload chain (or 1, if there are no overloads). The first pass
-        is strict and permits no implicit conversions, while the second pass
-        allows them.
-
-        The following is done per overload during a pass
-
-        1. Copy positional arguments while checking that named positional
-           arguments weren't *also* specified as kwarg. Substitute missing
-           entries using keyword arguments or default argument values provided
-           in the bindings, if available.
-
-        3. Ensure that either all keyword arguments were "consumed", or that
-           the function takes a kwargs argument to accept unconsumed kwargs.
-
-        4. Any positional arguments still left get put into a tuple (for args),
-           and any leftover kwargs get put into a dict.
-
-        5. Pack everything into a vector; if we have nb::args or nb::kwargs, they are an
-           extra tuple or dict at the end of the positional arguments.
-
-        6. Call the function call dispatcher (func_data::impl)
-
-        If one of these fail, move on to the next overload and keep trying
-        until we get a result other than NB_NEXT_OVERLOAD.
-    */
-
-    for (int pass = (count > 1) ? 0 : 1; pass < 2; ++pass) {
-        for (size_t k = 0; k < count; ++k) {
-            const func_data *f = fr + k;
-
-            const bool has_args       = f->flags & (uint32_t) func_flags::has_args,
-                       has_var_args   = f->flags & (uint32_t) func_flags::has_var_args,
-                       has_var_kwargs = f->flags & (uint32_t) func_flags::has_var_kwargs;
-
-            /// Number of positional arguments
-            size_t nargs_pos = f->nargs - has_var_args - has_var_kwargs;
-
-            if (nargs_in > nargs_pos && !has_var_args)
-                continue; // Too many positional arguments given for this overload
-
-            if (nargs_in < nargs_pos && !has_args)
-                continue; // Not enough positional arguments, insufficient
-                          // keyword/default arguments to fill in the blanks
-
-            memset(kwarg_used, 0, nkwargs_in * sizeof(bool));
-
-            // 1. Copy positional arguments, potentially substitute kwargs/defaults
-            size_t i = 0;
-            for (; i < nargs_pos; ++i) {
-                PyObject *arg = nullptr;
-                bool arg_convert  = pass == 1,
-                     arg_none     = false;
-
-                if (i < nargs_in)
-                    arg = args_in[i];
-
-                if (has_args) {
-                    const arg_data &ad = f->args[i];
-
-                    if (kwargs_in && ad.name_py) {
-                        PyObject *hit = nullptr;
-                        for (size_t j = 0; j < nkwargs_in; ++j) {
-                            PyObject *key = NB_TUPLE_GET_ITEM(kwargs_in, j);
-                            if (key == ad.name_py) {
-                                hit = args_in[nargs_in + j];
-                                kwarg_used[j] = true;
-                                break;
-                            }
-                        }
-
-                        if (hit) {
-                            if (arg)
-                                break; // conflict between keyword and positional arg.
-                            arg = hit;
-                        }
-                    }
-
-                    if (!arg)
-                        arg = ad.value;
-
-                    arg_convert &= ad.convert;
-                    arg_none = ad.none;
-                }
-
-                if (!arg || (arg == Py_None && !arg_none))
-                    break;
-
-                args[i] = arg;
-                args_flags[i] = arg_convert ? (uint8_t) cast_flags::convert : 0;
-            }
-
-            // Skip this overload if positional arguments were unavailable
-            if (i != nargs_pos)
-                continue;
-
-            // Deal with remaining positional arguments
-            if (has_var_args) {
-                PyObject *tuple = PyTuple_New(
-                    nargs_in > nargs_pos ? (Py_ssize_t) (nargs_in - nargs_pos) : 0);
-
-                for (size_t j = nargs_pos; j < nargs_in; ++j) {
-                    PyObject *o = args_in[j];
-                    Py_INCREF(o);
-                    NB_TUPLE_SET_ITEM(tuple, j - nargs_pos, o);
-                }
-
-                args[nargs_pos] = tuple;
-                args_flags[nargs_pos] = 0;
-                cleanup.append(tuple);
-            }
-
-            // Deal with remaining keyword arguments
-            if (has_var_kwargs) {
-                PyObject *dict = PyDict_New();
-                for (size_t j = 0; j < nkwargs_in; ++j) {
-                    PyObject *key = NB_TUPLE_GET_ITEM(kwargs_in, j);
-                    if (!kwarg_used[j])
-                        PyDict_SetItem(dict, key, args_in[nargs_in + j]);
-                }
-
-                args[nargs_pos + has_var_args] = dict;
-                args_flags[nargs_pos + has_var_args] = 0;
-                cleanup.append(dict);
-            } else if (kwargs_in) {
-                bool success = true;
-                for (size_t j = 0; j < nkwargs_in; ++j)
-                    success &= kwarg_used[j];
-                if (!success)
-                    continue;
-            }
-
-            if (is_constructor)
-                args_flags[0] = (uint8_t) cast_flags::construct;
-
-            try {
-                // Found a suitable overload, let's try calling it
-                result = f->impl((void *) f->capture, args, args_flags,
-                                 (rv_policy) (f->flags & 0b111), &cleanup);
-
-                if (!result) {
-                    error_handler = nb_func_error_noconvert;
-                    goto done;
-                }
-            } catch (next_overload &) {
-                result = NB_NEXT_OVERLOAD;
-            } catch (python_error &e) {
-                e.restore();
-                result = nullptr;
-                goto done;
-            } catch (...) {
-                nb_func_convert_cpp_exception();
-                result = nullptr;
-                goto done;
-            }
-
-            if (result != NB_NEXT_OVERLOAD) {
-                if (is_constructor) {
-                    nb_inst *self_arg_nb = (nb_inst *) self_arg;
-                    self_arg_nb->destruct = true;
-                    self_arg_nb->ready = true;
-
-                    const type_data *t = nb_type_data(Py_TYPE(self_arg));
-                    if (t->flags & (uint32_t) type_flags::intrusive_ptr)
-                        t->set_self_py(inst_ptr(self_arg_nb), self_arg);
-                }
-
-                goto done;
-            }
-        }
-    }
-
-    error_handler = nb_func_error_overload;
-
-done:
-    cleanup.release();
-
-    if (error_handler)
-        result = error_handler(self, args_in, nargs_in, kwargs_in);
-
-    if (is_method)
-        current_method_data = current_method{ nullptr, nullptr };
-
-    return result;
-}
-
-/// Simplified nb_func_vectorcall variant for functions w/o keyword arguments
-static PyObject *nb_func_vectorcall_simple(PyObject *self,
-                                           PyObject *const *args_in,
-                                           size_t nargsf,
-                                           PyObject *kwargs_in) noexcept {
-    func_data *fr = nb_func_data(self);
-
-    const size_t count         = (size_t) Py_SIZE(self),
-                 nargs_in      = (size_t) NB_VECTORCALL_NARGS(nargsf),
-                 max_nargs_pos = ((nb_func *) self)->max_nargs_pos;
-
-    const bool is_method = fr->flags & (uint32_t) func_flags::is_method,
-               is_constructor = fr->flags & (uint32_t) func_flags::is_constructor;
-
-    PyObject *result = nullptr, *self_arg = nullptr;
-
-    if (is_method) {
-        self_arg = nargs_in > 0 ? args_in[0] : nullptr;
-
-        if (!nb_type_cache)
-            nb_type_cache = internals_get().nb_type;
-
-        if (self_arg && Py_TYPE((PyObject *) Py_TYPE(self_arg)) != nb_type_cache)
-            self_arg = nullptr;
-
-        if (!self_arg) {
-            PyErr_SetString(
-                PyExc_RuntimeError,
-                "nanobind::detail::nb_func_vectorcall_simple(): the 'self' "
-                "argument of a method call should be a nanobind class.");
-            return nullptr;
-        }
-
-        self_arg = args_in[0];
-        current_method_data = current_method{ fr->name, self_arg };
-
-        if (is_constructor) {
-            if (((nb_inst *) self_arg)->ready) {
-                PyErr_SetString(PyExc_RuntimeError,
-                                "nanobind::detail::nb_func_vectorcall_simple():"
-                                " the __init__ method should not be called on "
-                                "an initialized object!");
-                return nullptr;
-            }
-        }
-    }
-
-    /// Small array holding temporaries (implicit conversion/*args/**kwargs)
-    cleanup_list cleanup(self_arg);
-
-    // Handler routine that will be invoked in case of an error condition
-    PyObject *(*error_handler)(PyObject *, PyObject *const *, size_t,
-                               PyObject *) noexcept = nullptr;
-
-    uint8_t *args_flags = (uint8_t *) alloca(max_nargs_pos * sizeof(uint8_t));
-
-    bool fail = kwargs_in != nullptr;
-    for (size_t i = 0; i < nargs_in; ++i)
-        fail |= args_in[i] == Py_None;
-    if (fail) { // keyword/None arguments unsupported in simple vectorcall
-        error_handler = nb_func_error_overload;
-        goto done;
-    }
-
-    for (int pass = (count > 1) ? 0 : 1; pass < 2; ++pass) {
-        memset(args_flags, pass, max_nargs_pos * sizeof(uint8_t));
-        if (is_constructor)
-            args_flags[0] = (uint8_t) cast_flags::construct;
-
-        for (size_t k = 0; k < count; ++k) {
-            const func_data *f = fr + k;
-
-            if (nargs_in != f->nargs)
-                continue;
-
-            try {
-                // Found a suitable overload, let's try calling it
-                result = f->impl((void *) f->capture, (PyObject **) args_in,
-                                 args_flags, (rv_policy) (f->flags & 0b111),
-                                 &cleanup);
-
-                if (!result) {
-                    error_handler = nb_func_error_noconvert;
-                    goto done;
-                }
-            } catch (next_overload &) {
-                result = NB_NEXT_OVERLOAD;
-            } catch (python_error &e) {
-                e.restore();
-                result = nullptr;
-                goto done;
-            } catch (...) {
-                nb_func_convert_cpp_exception();
-                result = nullptr;
-                goto done;
-            }
-
-            if (result != NB_NEXT_OVERLOAD) {
-                if (is_constructor) {
-                    nb_inst *self_arg_nb = (nb_inst *) self_arg;
-                    self_arg_nb->destruct = true;
-                    self_arg_nb->ready = true;
-
-                    const type_data *t = nb_type_data(Py_TYPE(self_arg));
-                    if (t->flags & (uint32_t) type_flags::intrusive_ptr)
-                        t->set_self_py(inst_ptr(self_arg_nb), self_arg);
-                }
-
-                goto done;
-            }
-        }
-    }
-
-    error_handler = nb_func_error_overload;
-
-done:
-    cleanup.release();
-
-    if (error_handler)
-        result = error_handler(self, args_in, nargs_in, kwargs_in);
-
-    if (is_method)
-        current_method_data = current_method{ nullptr, nullptr };
-
-    return result;
-}
-
-static PyObject *nb_bound_method_vectorcall(PyObject *self,
-                                            PyObject *const *args_in,
-                                            size_t nargsf,
-                                            PyObject *kwargs_in) noexcept {
-    nb_bound_method *mb = (nb_bound_method *) self;
-    size_t nargs = NB_VECTORCALL_NARGS(nargsf);
-
-    PyObject *result;
-    if (nargsf & NB_VECTORCALL_ARGUMENTS_OFFSET) {
-        PyObject **args_tmp = (PyObject **) args_in - 1;
-        PyObject *tmp = args_tmp[0];
-        args_tmp[0] = mb->self;
-        result = mb->func->vectorcall((PyObject *) mb->func, args_tmp, nargs + 1, kwargs_in);
-        args_tmp[0] = tmp;
-    } else {
-        PyObject **args_tmp = (PyObject **) PyObject_Malloc((nargs + 1) * sizeof(PyObject *));
-        if (!args_tmp)
-            return PyErr_NoMemory();
-        args_tmp[0] = mb->self;
-        for (size_t i = 0; i < nargs; ++i)
-            args_tmp[i + 1] = args_in[i];
-        result = mb->func->vectorcall((PyObject *) mb->func, args_tmp, nargs + 1, kwargs_in);
-        PyObject_Free(args_tmp);
-    }
-
-    return result;
-}
-
-PyObject *nb_method_descr_get(PyObject *self, PyObject *inst, PyObject *) {
-    if (inst) {
-        /* Return a bound method. This should be avoidable in most cases via the
-           'CALL_METHOD' opcode and vector calls. Pytest rewrites the bytecode
-           in a way that breaks this optimization :-/ */
-
-        nb_bound_method *mb = (nb_bound_method *) PyObject_Malloc(sizeof(nb_bound_method));
-        PyObject_Init((PyObject *) mb, internals_get().nb_bound_method);
-
-        mb->func = (nb_func *) self;
-        mb->self = inst;
-        mb->vectorcall = nb_bound_method_vectorcall;
-
-        Py_INCREF(self);
-        Py_INCREF(inst);
-
-        return (PyObject *) mb;
-    } else {
-        Py_INCREF(self);
-        return self;
-    }
-}
-
-
-/// Render the function signature of a single function
-static void nb_func_render_signature(const func_data *f) noexcept {
-    const bool is_method      = f->flags & (uint32_t) func_flags::is_method,
-               has_args       = f->flags & (uint32_t) func_flags::has_args,
-               has_var_args   = f->flags & (uint32_t) func_flags::has_var_args,
-               has_var_kwargs = f->flags & (uint32_t) func_flags::has_var_kwargs;
-
-    const std::type_info **descr_type = f->descr_types;
-    nb_internals &internals = internals_get();
-
-    size_t arg_index = 0;
-    buf.put_dstr(f->name);
-
-    for (const char *pc = f->descr; *pc != '\0'; ++pc) {
-        char c = *pc;
-
-        switch (c) {
-            case '{':
-                // Argument name
-                if (has_var_kwargs && arg_index + 1 == (size_t) f->nargs) {
-                    buf.put("**");
-                    if (has_args && f->args[arg_index].name)
-                        buf.put_dstr(f->args[arg_index].name);
-                    else
-                        buf.put("kwargs");
-                    pc += 4; // strlen("dict")
-                    break;
-                }
-
-                if (has_var_args && arg_index + 1 + has_var_kwargs == (size_t) f->nargs) {
-                    buf.put("*");
-                    if (has_args && f->args[arg_index].name)
-                        buf.put_dstr(f->args[arg_index].name);
-                    else
-                        buf.put("args");
-                    pc += 5; // strlen("tuple")
-                    break;
-                }
-
-                if (has_args && f->args[arg_index].name) {
-                    buf.put_dstr(f->args[arg_index].name);
-                } else if (is_method && arg_index == 0) {
-                    buf.put("self");
-
-                    // Skip over type
-                    while (*pc != '}') {
-                        if (*pc == '%')
-                            descr_type++;
-                        pc++;
-                    }
-                    arg_index++;
-                    continue;
-                } else {
-                    buf.put("arg");
-                    if (arg_index > size_t(is_method) ||
-                        f->nargs > 1 + (uint32_t) is_method)
-                        buf.put_uint32((uint32_t) (arg_index - is_method));
-                }
-
-                if (!(is_method && arg_index == 0))
-                    buf.put(": ");
-                if (has_args && f->args[arg_index].none)
-                    buf.put("Optional[");
-                break;
-
-            case '}':
-                // Default argument
-                if (has_args) {
-                    if (f->args[arg_index].none)
-                        buf.put(']');
-
-                    if (f->args[arg_index].value) {
-                        PyObject *o = f->args[arg_index].value;
-                        PyObject *str = PyObject_Str(o);
-                        bool is_str = PyUnicode_Check(o);
-
-                        if (str) {
-                            Py_ssize_t size = 0;
-                            const char *cstr =
-                                PyUnicode_AsUTF8AndSize(str, &size);
-                            if (!cstr) {
-                                PyErr_Clear();
-                            } else {
-                                buf.put(" = ");
-                                if (is_str)
-                                    buf.put('\'');
-                                buf.put(cstr, (size_t) size);
-                                if (is_str)
-                                    buf.put('\'');
-                            }
-                            Py_DECREF(str);
-                        } else {
-                            PyErr_Clear();
-                        }
-                    }
-                }
-
-                arg_index++;
-
-                if (arg_index == f->nargs - has_var_args - has_var_kwargs && !has_args)
-                    buf.put(", /");
-
-                break;
-
-            case '%':
-                if (!*descr_type)
-                    fail("nb::detail::nb_func_finalize(): missing type!");
-
-                if (!(is_method && arg_index == 0)) {
-                    auto it = internals.type_c2p.find(std::type_index(**descr_type));
-
-                    if (it != internals.type_c2p.end()) {
-                        handle th((PyObject *) it->second->type_py);
-                        buf.put_dstr((borrow<str>(th.attr("__module__"))).c_str());
-                        buf.put('.');
-                        buf.put_dstr((borrow<str>(th.attr("__qualname__"))).c_str());
-                    } else {
-                        char *name = type_name(*descr_type);
-                        buf.put_dstr(name);
-                        free(name);
-                    }
-                }
-
-                descr_type++;
-                break;
-
-            default:
-                buf.put(c);
-                break;
-        }
-    }
-
-    if (arg_index != f->nargs || *descr_type != nullptr)
-        fail("nanobind::detail::nb_func_finalize(%s): arguments inconsistent.", f->name);
-}
-
-PyObject *nb_func_getattro(PyObject *self, PyObject *name_) {
-    func_data *f = nb_func_data(self);
-    const char *name = PyUnicode_AsUTF8AndSize(name_, nullptr);
-
-    if (!name)
-        return nullptr;
-
-    if (strcmp(name, "__name__") == 0) {
-        if (f->flags & (uint32_t) func_flags::has_name) {
-            return PyUnicode_FromString(f->name);
-        }
-    } else if (strcmp(name, "__qualname__") == 0) {
-        if ((f->flags & (uint32_t) func_flags::has_scope) &&
-            (f->flags & (uint32_t) func_flags::has_name)) {
-            PyObject *scope_name = PyObject_GetAttrString(f->scope, "__qualname__");
-            if (scope_name) {
-                return PyUnicode_FromFormat("%U.%s", scope_name, f->name);
-            } else {
-                PyErr_Clear();
-                return PyUnicode_FromString(f->name);
-            }
-        }
-    } else if (strcmp(name, "__module__") == 0) {
-        if (f->flags & (uint32_t) func_flags::has_scope) {
-            return PyObject_GetAttrString(
-                f->scope, PyModule_Check(f->scope) ? "__name__" : "__module__");
-        }
-    } else if (strcmp(name, "__doc__") == 0) {
-        uint32_t count = (uint32_t) Py_SIZE(self);
-
-        buf.clear();
-
-        size_t doc_count = 0;
-        for (uint32_t i = 0; i < count; ++i) {
-            const func_data *fi = f + i;
-            if (fi->flags & (uint32_t) func_flags::raw_doc)
-                return PyUnicode_FromString(fi->doc);
-
-            nb_func_render_signature(fi);
-            buf.put('\n');
-            if ((fi->flags & (uint32_t) func_flags::has_doc) && fi->doc[0] != '\0')
-                doc_count++;
-        }
-
-        if (doc_count > 1)
-            buf.put("\nOverloaded function.\n");
-
-        for (uint32_t i = 0; i < count; ++i) {
-            const func_data *fi = f + i;
-
-            if ((fi->flags & (uint32_t) func_flags::has_doc) && fi->doc[0] != '\0') {
-                buf.put('\n');
-
-                if (doc_count > 1) {
-                    buf.put_uint32(i + 1);
-                    buf.put(". ``");
-                    nb_func_render_signature(fi);
-                    buf.put("``\n\n");
-                }
-
-                buf.put_dstr(fi->doc);
-                buf.put('\n');
-            }
-        }
-
-        if (buf.size() > 0) // remove last newline
-            buf.rewind(1);
-
-        return PyUnicode_FromString(buf.get());
-    } else {
-        return PyObject_GenericGetAttr(self, name_);
-    }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-/// Excise a substring from 's'
-static void strexc(char *s, const char *sub) {
-    size_t len = strlen(sub);
-    if (len == 0)
-        return;
-
-    char *p = s;
-    while ((p = strstr(p, sub)))
-        memmove(p, p + len, strlen(p + len) + 1);
-}
-
-/// Return a readable string representation of a C++ type
-char *type_name(const std::type_info *t) {
-    const char *name_in = t->name();
-
-#if defined(__GNUG__)
-    int status = 0;
-    char *name = abi::__cxa_demangle(name_in, nullptr, nullptr, &status);
-#else
-    char *name = NB_STRDUP(name_in);
-    strexc(name, "class ");
-    strexc(name, "struct ");
-    strexc(name, "enum ");
-#endif
-    strexc(name, "nanobind::");
-    return name;
-}
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_internals.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_internals.cpp
deleted file mode 100644
index 300faf86d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_internals.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
-    src/internals.cpp: internal libnanobind data structures
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#include <nanobind/nanobind.h>
-#include <structmember.h>
-#include "nb_internals.h"
-
-#if defined(__GNUC__) && !defined(__clang__)
-#  pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-/// Tracks the ABI of nanobind
-#ifndef NB_INTERNALS_VERSION
-#  define NB_INTERNALS_VERSION 2
-#endif
-
-/// On MSVC, debug and release builds are not ABI-compatible!
-#if defined(_MSC_VER) && defined(_DEBUG)
-#  define NB_BUILD_TYPE "_debug"
-#else
-#  define NB_BUILD_TYPE ""
-#endif
-
-/// Let's assume that different compilers are ABI-incompatible.
-#if defined(_MSC_VER)
-#  define NB_COMPILER_TYPE "_msvc"
-#elif defined(__INTEL_COMPILER)
-#  define NB_COMPILER_TYPE "_icc"
-#elif defined(__clang__)
-#  define NB_COMPILER_TYPE "_clang"
-#elif defined(__PGI)
-#  define NB_COMPILER_TYPE "_pgi"
-#elif defined(__MINGW32__)
-#  define NB_COMPILER_TYPE "_mingw"
-#elif defined(__CYGWIN__)
-#  define NB_COMPILER_TYPE "_gcc_cygwin"
-#elif defined(__GNUC__)
-#  define NB_COMPILER_TYPE "_gcc"
-#else
-#  define NB_COMPILER_TYPE "_unknown"
-#endif
-
-/// Also standard libs
-#if defined(_LIBCPP_VERSION)
-#  define NB_STDLIB "_libcpp"
-#elif defined(__GLIBCXX__) || defined(__GLIBCPP__)
-#  define NB_STDLIB "_libstdcpp"
-#else
-#  define NB_STDLIB ""
-#endif
-
-/// On Linux/OSX, changes in __GXX_ABI_VERSION__ indicate ABI incompatibility.
-#if defined(__GXX_ABI_VERSION)
-#  define NB_BUILD_ABI "_cxxabi" NB_TOSTRING(__GXX_ABI_VERSION)
-#else
-#  define NB_BUILD_ABI ""
-#endif
-
-#if defined(Py_LIMITED_API)
-#  define NB_LIMITED_API "_limited"
-#else
-#  define NB_LIMITED_API ""
-#endif
-
-#define NB_INTERNALS_ID "__nb_internals_v" \
-    NB_TOSTRING(NB_INTERNALS_VERSION) NB_COMPILER_TYPE NB_STDLIB NB_BUILD_ABI NB_BUILD_TYPE NB_LIMITED_API "__"
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-extern void nb_func_dealloc(PyObject *);
-extern void nb_bound_method_dealloc(PyObject *);
-extern PyObject *nb_func_getattro(PyObject *, PyObject *);
-extern PyObject *nb_method_descr_get(PyObject *, PyObject *, PyObject *);
-extern int nb_type_setattro(PyObject*, PyObject*, PyObject*);
-extern PyObject *nb_tensor_get(PyObject *, PyObject *);
-extern int nb_tensor_getbuffer(PyObject *exporter, Py_buffer *view, int);
-extern void nb_tensor_releasebuffer(PyObject *, Py_buffer *);
-extern void nb_tensor_dealloc(PyObject *self);
-extern PyObject *nb_tensor_new(PyTypeObject *, PyObject *, PyObject *);
-static PyObject *nb_static_property_get(PyObject *, PyObject *, PyObject *);
-
-#if PY_VERSION_HEX >= 0x03090000
-#  define NB_HAVE_VECTORCALL_MAYBE NB_HAVE_VECTORCALL
-#else
-#  define NB_HAVE_VECTORCALL_MAYBE 0
-#endif
-
-static PyMemberDef nb_func_members[] = {
-    { "__vectorcalloffset__", T_PYSSIZET,
-      (Py_ssize_t) offsetof(nb_func, vectorcall), READONLY, nullptr },
-    { nullptr, 0, 0, 0, nullptr }
-};
-
-static PyType_Slot nb_func_slots[] = {
-    { Py_tp_members, (void *) nb_func_members },
-    { Py_tp_dealloc, (void *) nb_func_dealloc },
-    { Py_tp_getattro, (void *) nb_func_getattro },
-    { Py_tp_new, (void *) PyType_GenericNew },
-#if PY_VERSION_HEX < 0x030C0000
-    { Py_tp_call, (void *) PyVectorcall_Call },
-#endif
-    { 0, nullptr }
-};
-
-static PyType_Spec nb_func_spec = {
-    .name = "nanobind.nb_func",
-    .basicsize = (int) sizeof(nb_func),
-    .itemsize = (int) sizeof(func_data),
-    .flags = Py_TPFLAGS_DEFAULT | NB_HAVE_VECTORCALL_MAYBE,
-    .slots = nb_func_slots
-};
-
-static PyType_Slot nb_method_slots[] = {
-    { Py_tp_members, (void *) nb_func_members },
-    { Py_tp_dealloc, (void *) nb_func_dealloc },
-    { Py_tp_getattro, (void *) nb_func_getattro },
-    { Py_tp_descr_get, (void *) nb_method_descr_get },
-    { Py_tp_new, (void *) PyType_GenericNew },
-#if PY_VERSION_HEX < 0x030C0000
-    { Py_tp_call, (void *) PyVectorcall_Call },
-#endif
-    { 0, nullptr }
-};
-
-static PyType_Spec nb_method_spec = {
-    .name = "nanobind.nb_method",
-    .basicsize = (int) sizeof(nb_func),
-    .itemsize = (int) sizeof(func_data),
-    .flags = Py_TPFLAGS_DEFAULT | NB_HAVE_VECTORCALL_MAYBE
-        | Py_TPFLAGS_METHOD_DESCRIPTOR,
-    .slots = nb_method_slots
-};
-
-static PyMemberDef nb_bound_method_members[] = {
-    { "__vectorcalloffset__", T_PYSSIZET,
-      (Py_ssize_t) offsetof(nb_bound_method, vectorcall), READONLY, nullptr },
-    { nullptr, 0, 0, 0, nullptr }
-};
-
-static PyType_Slot nb_bound_method_slots[] = {
-    { Py_tp_members, (void *) nb_bound_method_members },
-    { Py_tp_dealloc, (void *) nb_bound_method_dealloc },
-#if PY_VERSION_HEX < 0x030C0000
-    { Py_tp_call, (void *) PyVectorcall_Call },
-#endif
-    { 0, nullptr }
-};
-
-static PyType_Spec nb_bound_method_spec = {
-    .name = "nanobind.nb_bound_method",
-    .basicsize = (int) sizeof(nb_bound_method),
-    .flags = Py_TPFLAGS_DEFAULT | NB_HAVE_VECTORCALL_MAYBE,
-    .slots = nb_bound_method_slots
-};
-
-static PyType_Slot nb_type_slots[] = {
-    { Py_tp_base, nullptr },
-    { Py_tp_dealloc, (void *) nb_type_dealloc },
-    { Py_tp_setattro, (void *) nb_type_setattro },
-    { Py_tp_init, (void *) nb_type_init },
-    { 0, nullptr }
-};
-
-static PyType_Spec nb_type_spec = {
-    .name = "nanobind.nb_type",
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-    .slots = nb_type_slots
-};
-
-static PyType_Slot nb_enum_slots[] = {
-    { Py_tp_base, nullptr },
-    { Py_tp_traverse, nullptr },
-    { Py_tp_clear, nullptr },
-    { 0, nullptr }
-};
-
-static PyType_Spec nb_enum_spec = {
-    .name = "nanobind.nb_enum",
-    .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
-    .slots = nb_enum_slots
-};
-
-static PyType_Slot nb_static_property_slots[] = {
-    { Py_tp_base, nullptr },
-    { Py_tp_methods, nullptr },
-    { Py_tp_members, nullptr },
-    { Py_tp_descr_get, (void *) nb_static_property_get },
-    { 0, nullptr }
-};
-
-static PyType_Spec nb_static_property_spec = {
-    .name = "nanobind.nb_static_property",
-    .flags = Py_TPFLAGS_DEFAULT,
-    .slots = nb_static_property_slots
-};
-
-static PyMethodDef nb_tensor_methods[] = {
-    { "__dlpack__", (PyCFunction) nb_tensor_get, METH_NOARGS, nullptr },
-    { nullptr, nullptr, 0, nullptr}
-};
-
-static PyType_Slot nb_tensor_slots[] = {
-    { Py_tp_dealloc, (void *) nb_tensor_dealloc },
-    { Py_tp_methods, (void *) nb_tensor_methods },
-    { Py_tp_new, (void *) nb_tensor_new },
-#if PY_VERSION_HEX >= 0x03090000
-    { Py_bf_getbuffer, (void *) nb_tensor_getbuffer },
-    { Py_bf_releasebuffer, (void *) nb_tensor_releasebuffer },
-#endif
-    { 0, nullptr }
-};
-
-static PyType_Spec nb_tensor_spec = {
-    .name = "nanobind.nb_tensor",
-    .basicsize = (int) sizeof(nb_tensor),
-    .flags = Py_TPFLAGS_DEFAULT,
-    .slots = nb_tensor_slots
-};
-
-/// `nb_static_property_property.__get__()`: Always pass the class instead of the instance.
-static PyObject *nb_static_property_get(PyObject *self, PyObject *, PyObject *cls) {
-    if (internals_get().nb_static_property_enabled) {
-        #if defined(Py_LIMITED_API)
-            static descrgetfunc tp_descr_get =
-                (descrgetfunc) PyType_GetSlot(&PyProperty_Type, Py_tp_descr_get);
-        #else
-            descrgetfunc tp_descr_get = PyProperty_Type.tp_descr_get;
-        #endif
-
-        return tp_descr_get(self, cls, cls);
-    } else {
-        Py_INCREF(self);
-        return self;
-    }
-}
-
-/// `nb_static_property_property.__set__()`: Just like the above `__get__()`.
-int nb_static_property_set(PyObject *self, PyObject *obj, PyObject *value) {
-    PyObject *cls = PyType_Check(obj) ? obj : (PyObject *) Py_TYPE(obj);
-
-    #if defined(Py_LIMITED_API)
-        static descrsetfunc tp_descr_set =
-            (descrsetfunc) PyType_GetSlot(&PyProperty_Type, Py_tp_descr_set);
-    #else
-        descrsetfunc tp_descr_set = PyProperty_Type.tp_descr_set;
-    #endif
-
-    return tp_descr_set(self, cls, value);
-}
-
-NB_THREAD_LOCAL current_method current_method_data =
-    current_method{ nullptr, nullptr };
-
-static nb_internals *internals_p = nullptr;
-
-void default_exception_translator(const std::exception_ptr &p) {
-    try {
-        std::rethrow_exception(p);
-    } catch (python_error &e) {
-        e.restore();
-    } catch (const builtin_exception &e) {
-        e.set_error();
-    } catch (const std::bad_alloc &e) {
-        PyErr_SetString(PyExc_MemoryError, e.what());
-    } catch (const std::domain_error &e) {
-        PyErr_SetString(PyExc_ValueError, e.what());
-    } catch (const std::invalid_argument &e) {
-        PyErr_SetString(PyExc_ValueError, e.what());
-    } catch (const std::length_error &e) {
-        PyErr_SetString(PyExc_ValueError, e.what());
-    } catch (const std::out_of_range &e) {
-        PyErr_SetString(PyExc_IndexError, e.what());
-    } catch (const std::range_error &e) {
-        PyErr_SetString(PyExc_ValueError, e.what());
-    } catch (const std::overflow_error &e) {
-        PyErr_SetString(PyExc_OverflowError, e.what());
-    } catch (const std::exception &e) {
-        PyErr_SetString(PyExc_RuntimeError, e.what());
-    }
-}
-
-static void internals_cleanup() {
-    bool leak = false;
-
-    if (!internals_p->inst_c2p.empty()) {
-        fprintf(stderr, "nanobind: leaked %zu instances!\n",
-                internals_p->inst_c2p.size());
-        leak = true;
-    }
-
-    if (!internals_p->keep_alive.empty()) {
-        fprintf(stderr, "nanobind: leaked %zu keep_alive records!\n",
-                internals_p->keep_alive.size());
-        leak = true;
-    }
-
-    if (!internals_p->type_c2p.empty()) {
-        fprintf(stderr, "nanobind: leaked %zu types!\n",
-                internals_p->type_c2p.size());
-        for (const auto &kv : internals_p->type_c2p)
-            fprintf(stderr, " - leaked type \"%s\"\n", kv.second->name);
-        leak = true;
-    }
-
-    if (!internals_p->funcs.empty()) {
-        fprintf(stderr, "nanobind: leaked %zu functions!\n",
-                internals_p->funcs.size());
-        for (void *f : internals_p->funcs)
-            fprintf(stderr, " - leaked function \"%s\"\n",
-                    nb_func_data(f)->name);
-        leak = true;
-    }
-
-    if (!leak) {
-        delete internals_p;
-        internals_p = nullptr;
-    } else {
-        fprintf(stderr, "nanobind: this is likely caused by a reference "
-                        "counting issue in the binding code.\n");
-    }
-}
-
-static void internals_make() {
-    str nb_name("nanobind");
-
-    internals_p = new nb_internals();
-    internals_p->exception_translators.push_back(default_exception_translator);
-
-    PyObject *capsule = PyCapsule_New(internals_p, nullptr, nullptr);
-    PyObject *nb_module = PyModule_NewObject(nb_name.ptr());
-    int rv = PyDict_SetItemString(PyEval_GetBuiltins(), NB_INTERNALS_ID, capsule);
-    if (rv || !capsule || !nb_module)
-        fail("nanobind::detail::internals_make(): allocation failed!");
-    Py_DECREF(capsule);
-
-    internals_p->type_basicsize =
-        cast<int>(handle(&PyType_Type).attr("__basicsize__"));
-
-    nb_type_spec.basicsize = nb_enum_spec.basicsize =
-        internals_p->type_basicsize + (int) sizeof(type_data);
-    nb_type_spec.itemsize = nb_enum_spec.itemsize =
-        cast<int>(handle(&PyType_Type).attr("__itemsize__"));
-
-    internals_p->nb_func = (PyTypeObject *) PyType_FromSpec(&nb_func_spec);
-    internals_p->nb_method = (PyTypeObject *) PyType_FromSpec(&nb_method_spec);
-    internals_p->nb_bound_method =
-        (PyTypeObject *) PyType_FromSpec(&nb_bound_method_spec);
-
-    nb_type_slots[0].pfunc = &PyType_Type;
-    internals_p->nb_type = (PyTypeObject *) PyType_FromSpec(&nb_type_spec);
-
-    nb_enum_slots[0].pfunc = internals_p->nb_type;
-    nb_static_property_slots[0].pfunc = &PyProperty_Type;
-
-#if defined(Py_LIMITED_API)
-    nb_enum_slots[1].pfunc = PyType_GetSlot(&PyType_Type, Py_tp_traverse);
-    nb_enum_slots[2].pfunc = PyType_GetSlot(&PyType_Type, Py_tp_clear);
-    nb_static_property_slots[1].pfunc = PyType_GetSlot(&PyProperty_Type, Py_tp_methods);
-    nb_static_property_slots[2].pfunc = PyType_GetSlot(&PyProperty_Type, Py_tp_members);
-#else
-    nb_enum_slots[1].pfunc = (void *) PyType_Type.tp_traverse;
-    nb_enum_slots[2].pfunc = (void *) PyType_Type.tp_clear;
-    nb_static_property_slots[1].pfunc = PyProperty_Type.tp_methods;
-    nb_static_property_slots[2].pfunc = PyProperty_Type.tp_members;
-#endif
-
-    internals_p->nb_enum = (PyTypeObject *) PyType_FromSpec(&nb_enum_spec);
-    internals_p->nb_static_property =
-        (PyTypeObject *) PyType_FromSpec(&nb_static_property_spec);
-    internals_p->nb_static_property_enabled = true;
-
-    internals_p->nb_tensor = (PyTypeObject *) PyType_FromSpec(&nb_tensor_spec);
-    if (!internals_p->nb_func || !internals_p->nb_method ||
-        !internals_p->nb_bound_method || !internals_p->nb_type ||
-        !internals_p->nb_enum || !internals_p->nb_static_property ||
-        !internals_p->nb_tensor)
-        fail("nanobind::detail::internals_make(): type initialization failed!");
-
-#if PY_VERSION_HEX < 0x03090000
-    internals_p->nb_tensor->tp_as_buffer->bf_getbuffer = nb_tensor_getbuffer;
-    internals_p->nb_tensor->tp_as_buffer->bf_releasebuffer = nb_tensor_releasebuffer;
-    internals_p->nb_func->tp_flags |= NB_HAVE_VECTORCALL;
-    internals_p->nb_func->tp_vectorcall_offset = offsetof(nb_func, vectorcall);
-    internals_p->nb_method->tp_flags |= NB_HAVE_VECTORCALL;
-    internals_p->nb_method->tp_vectorcall_offset = offsetof(nb_func, vectorcall);
-    internals_p->nb_bound_method->tp_flags |= NB_HAVE_VECTORCALL;
-    internals_p->nb_bound_method->tp_vectorcall_offset = offsetof(nb_bound_method, vectorcall);
-#endif
-
-    if (Py_AtExit(internals_cleanup))
-        fprintf(stderr,
-                "Warning: could not install the nanobind cleanup handler! This "
-                "is needed to check for reference leaks and release remaining "
-                "resources at interpreter shutdown (e.g., to avoid leaks being "
-                "reported by tools like 'valgrind'). If you are a user of a "
-                "python extension library, you can ignore this warning.");
-}
-
-static void internals_fetch() {
-    PyObject *capsule =
-        PyDict_GetItemString(PyEval_GetBuiltins(), NB_INTERNALS_ID);
-
-    if (capsule) {
-        internals_p = (nb_internals *) PyCapsule_GetPointer(capsule, nullptr);
-        if (!internals_p)
-            fail("nanobind::detail::internals_fetch(): internal error!");
-        return;
-    }
-
-    internals_make();
-}
-
-nb_internals &internals_get() noexcept {
-    if (!internals_p)
-        internals_fetch();
-    return *internals_p;
-}
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_internals.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_internals.h
deleted file mode 100644
index 8ca07a317..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_internals.h
+++ /dev/null
@@ -1,270 +0,0 @@
-#if defined(__GNUC__)
-/// Don't warn about missing fields in PyTypeObject declarations
-#  pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#elif defined(_MSC_VER)
-#  pragma warning(disable: 4127) // conditional expression is constant (in robin_*.h)
-#endif
-
-#include <nanobind/nanobind.h>
-#include <tsl/robin_map.h>
-#include <tsl/robin_set.h>
-#include <typeindex>
-#include <cstring>
-
-#if defined(_MSC_VER)
-#  define NB_THREAD_LOCAL __declspec(thread)
-#else
-#  define NB_THREAD_LOCAL __thread
-#endif
-
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-/// Nanobind function metadata (overloads, etc.)
-struct func_data : func_data_prelim<0> {
-    arg_data *args;
-};
-
-/// Python object representing an instance of a bound C++ type
-struct nb_inst { // usually: 24 bytes
-    PyObject_HEAD
-
-    /// Offset to the actual instance data
-    int32_t offset;
-
-    /**
-     * The variable 'offset' can either encode an offset relative to the
-     * nb_inst address that leads to the instance data, or it can encode a
-     * relative offset to a pointer that must be dereferenced to get to the
-     * instance data. 'direct' is 'true' in the former case.
-     */
-    bool direct : 1;
-
-    /// Is the instance data co-located with the Python object?
-    bool internal : 1;
-
-    /// Is the instance properly initialized?
-    bool ready : 1;
-
-    /// Should the destructor be called when this instance is GCed?
-    bool destruct : 1;
-
-    /// Should nanobind call 'operator delete' when this instance is GCed?
-    bool cpp_delete : 1;
-
-    /// Does this instance hold reference to others? (via internals.keep_alive)
-    bool clear_keep_alive : 1;
-};
-
-static_assert(sizeof(nb_inst) == sizeof(PyObject) + sizeof(void *));
-
-struct nb_enum_supplement {
-    PyObject *name;
-    const char *doc;
-};
-
-/// Python object representing a bound C++ function
-struct nb_func {
-    PyObject_VAR_HEAD
-    PyObject* (*vectorcall)(PyObject *, PyObject * const*, size_t, PyObject *);
-    uint32_t max_nargs_pos;
-    bool complex_call;
-};
-
-/// Python object representing a `nb_tensor` (which wraps a DLPack tensor)
-struct nb_tensor {
-    PyObject_HEAD
-    PyObject *capsule;
-};
-
-/// Python object representing an `nb_method` bound to an instance (analogous to non-public PyMethod_Type)
-struct nb_bound_method {
-    PyObject_HEAD
-    PyObject* (*vectorcall)(PyObject *, PyObject * const*, size_t, PyObject *);
-    nb_func *func;
-    PyObject *self;
-};
-
-/// Pointers require a good hash function to randomize the mapping to buckets
-struct ptr_hash {
-    size_t operator()(const void *p) const {
-        uintptr_t v = (uintptr_t) p;
-        // fmix64 from MurmurHash by Austin Appleby (public domain)
-        v ^= v >> 33;
-        v *= (uintptr_t) 0xff51afd7ed558ccdull;
-        v ^= v >> 33;
-        v *= (uintptr_t) 0xc4ceb9fe1a85ec53ull;
-        v ^= v >> 33;
-        return (size_t) v;
-    }
-};
-
-struct ptr_type_hash {
-    NB_INLINE size_t
-    operator()(const std::pair<const void *, std::type_index> &value) const {
-        return ptr_hash()(value.first) ^ value.second.hash_code();
-    }
-};
-
-struct keep_alive_entry {
-    void *data; // unique data pointer
-    void (*deleter)(void *) noexcept; // custom deleter, excluded from hashing/equality
-
-    keep_alive_entry(void *data, void (*deleter)(void *) noexcept = nullptr)
-        : data(data), deleter(deleter) { }
-};
-
-/// Equality operator for keep_alive_entry (only targets data field)
-struct keep_alive_eq {
-    NB_INLINE bool operator()(const keep_alive_entry &a,
-                              const keep_alive_entry &b) const {
-        return a.data == b.data;
-    }
-};
-
-/// Hash operator for keep_alive_entry (only targets data field)
-struct keep_alive_hash {
-    NB_INLINE size_t operator()(const keep_alive_entry &entry) const {
-        return ptr_hash()(entry.data);
-    }
-};
-
-// Minimal allocator definition, contains only the parts needed by tsl::*
-template <typename T> class py_allocator {
-public:
-    using value_type = T;
-    using pointer = T *;
-    using size_type = std::size_t;
-
-    py_allocator() = default;
-    py_allocator(const py_allocator &) = default;
-
-    template <typename U> py_allocator(const py_allocator<U> &) { }
-
-    pointer allocate(size_type n, const void * /*hint*/ = nullptr) noexcept {
-        void *p = PyMem_Malloc(n * sizeof(T));
-        if (!p)
-            fail("PyMem_Malloc(): out of memory!");
-        return static_cast<pointer>(p);
-    }
-
-    void deallocate(T *p, size_type /*n*/) noexcept { PyMem_Free(p); }
-};
-
-template <class T1, class T2>
-bool operator==(const py_allocator<T1> &, const py_allocator<T2> &) noexcept {
-    return true;
-}
-
-template <typename key, typename hash = std::hash<key>,
-          typename eq = std::equal_to<key>>
-using py_set = tsl::robin_set<key, hash, eq, py_allocator<key>>;
-
-template <typename key, typename value, typename hash = std::hash<key>,
-          typename eq = std::equal_to<key>>
-using py_map =
-    tsl::robin_map<key, value, hash, eq, py_allocator<std::pair<key, value>>>;
-
-using keep_alive_set =
-    py_set<keep_alive_entry, keep_alive_hash, keep_alive_eq>;
-
-struct nb_internals {
-    /// Registered metaclasses for nanobind classes and enumerations
-    PyTypeObject *nb_type, *nb_enum;
-
-    /// Types of nanobind functions and methods
-    PyTypeObject *nb_func, *nb_method, *nb_bound_method;
-
-    /// Property variant for static attributes
-    PyTypeObject *nb_static_property;
-    bool nb_static_property_enabled;
-
-    /// Tensor wrpaper
-    PyTypeObject *nb_tensor;
-
-    /// Size fields of PyTypeObject
-    int type_basicsize, type_itemsize;
-
-    /// Instance pointer -> Python object mapping
-    py_map<std::pair<void *, std::type_index>, nb_inst *, ptr_type_hash>
-        inst_c2p;
-
-    /// C++ type -> Python type mapping
-    py_map<std::type_index, type_data *> type_c2p;
-
-    /// Dictionary of sets storing keep_alive references
-    py_map<void *, keep_alive_set, ptr_hash> keep_alive;
-
-    /// nb_func/meth instance list for leak reporting
-    py_set<void *, ptr_hash> funcs;
-
-    /// Registered C++ -> Python exception translators
-    std::vector<void (*)(const std::exception_ptr &)> exception_translators;
-};
-
-struct current_method {
-    const char *name;
-    PyObject *self;
-};
-
-extern NB_THREAD_LOCAL current_method current_method_data;
-
-extern nb_internals &internals_get() noexcept;
-extern char *type_name(const std::type_info *t);
-
-// Forward declarations
-extern int nb_type_init(PyObject *, PyObject *, PyObject *);
-extern void nb_type_dealloc(PyObject *o);
-extern PyObject *inst_new_impl(PyTypeObject *tp, void *value);
-extern void nb_enum_prepare(PyType_Slot **s, bool is_arithmetic);
-extern int nb_static_property_set(PyObject *, PyObject *, PyObject *);
-
-/// Fetch the nanobind function record from a 'nb_func' instance
-NB_INLINE func_data *nb_func_data(void *o) {
-    return (func_data *) (((char *) o) + sizeof(nb_func));
-}
-
-#if defined(Py_LIMITED_API)
-extern type_data *nb_type_data_static(PyTypeObject *o) noexcept;
-#endif
-
-/// Fetch the nanobind type record from a 'nb_type' instance
-NB_INLINE type_data *nb_type_data(PyTypeObject *o) noexcept{
-    #if !defined(Py_LIMITED_API)
-        return (type_data *) (((char *) o) + sizeof(PyHeapTypeObject));
-    #else
-        return nb_type_data_static(o);
-    #endif
-}
-
-extern PyObject *nb_type_name(PyTypeObject *o) noexcept;
-inline PyObject *nb_inst_name(PyObject *o) noexcept { return nb_type_name(Py_TYPE(o)); }
-
-inline void *inst_ptr(nb_inst *self) {
-    void *ptr = (void *) ((intptr_t) self + self->offset);
-    return self->direct ? ptr : *(void **) ptr;
-}
-
-template <typename T> struct scoped_pymalloc {
-    scoped_pymalloc(size_t size = 1) {
-        ptr = (T *) PyMem_Malloc(size * sizeof(T));
-        if (!ptr)
-            fail("scoped_pymalloc(): could not allocate %zu bytes of memory!", size);
-    }
-    ~scoped_pymalloc() { PyMem_Free(ptr); }
-    T *release() {
-        T *temp = ptr;
-        ptr = nullptr;
-        return temp;
-    }
-    T *get() const { return ptr; }
-    T &operator[](size_t i) { return ptr[i]; }
-    T *operator->() { return ptr; }
-private:
-    T *ptr{ nullptr };
-};
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_type.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_type.cpp
deleted file mode 100644
index e1c77e464..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/nb_type.cpp
+++ /dev/null
@@ -1,1110 +0,0 @@
-/*
-    src/nb_type.cpp: libnanobind functionality for binding classes
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#include "nb_internals.h"
-
-#if defined(_MSC_VER)
-#  pragma warning(disable: 4706) // assignment within conditional expression
-#endif
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-static PyObject **nb_dict_ptr(PyObject *self) {
-    PyTypeObject *tp = Py_TYPE(self);
-#if !defined(Py_LIMITED_API)
-    return (PyObject **) ((uint8_t *) self + tp->tp_dictoffset);
-#else
-    return (PyObject **) ((uint8_t *) self + nb_type_data(tp)->dictoffset);
-#endif
-}
-
-static int inst_clear(PyObject *self) {
-    PyObject *&dict = *nb_dict_ptr(self);
-    Py_CLEAR(dict);
-    return 0;
-}
-
-static int inst_traverse(PyObject *self, visitproc visit, void *arg) {
-    PyObject *&dict = *nb_dict_ptr(self);
-    if (dict)
-        Py_VISIT(dict);
-#if PY_VERSION_HEX >= 0x03090000
-    Py_VISIT(Py_TYPE(self));
-#endif
-    return 0;
-}
-
-static int inst_init(PyObject *self, PyObject *, PyObject *) {
-    const type_data *t = nb_type_data(Py_TYPE(self));
-    PyErr_Format(PyExc_TypeError, "%s: no constructor defined!", t->name);
-    return -1;
-}
-
-/// Allocate memory for a nb_type instance with internal or external storage
-PyObject *inst_new_impl(PyTypeObject *tp, void *value) {
-    bool gc = PyType_HasFeature(tp, Py_TPFLAGS_HAVE_GC);
-    const type_data *t = nb_type_data(tp);
-    size_t align = (size_t) t->align;
-
-    nb_inst *self;
-
-    if (!gc) {
-        size_t size = sizeof(nb_inst);
-        if (!value) {
-            // Internal storage: space for the object and padding for alignment
-            size += t->size;
-            if (align > sizeof(void *))
-                size += align - sizeof(void *);
-        }
-
-        self = (nb_inst *) PyObject_Malloc(size);
-        if (!self)
-            return PyErr_NoMemory();
-        memset(self, 0, sizeof(nb_inst));
-        PyObject_Init((PyObject *) self, tp);
-    } else {
-        self = (nb_inst *) PyType_GenericAlloc(tp, 0);
-    }
-
-    if (!value) {
-        // Compute suitably aligned instance payload pointer
-        uintptr_t payload = (uintptr_t) (self + 1);
-        payload = (payload + align - 1) / align * align;
-
-        // Encode offset to aligned payload
-        self->offset = (int32_t) ((intptr_t) payload - (intptr_t) self);
-        self->direct = true;
-        self->internal = true;
-
-        value = (void *) payload;
-    } else {
-        // Compute offset to instance value
-        int32_t offset = (int32_t) ((intptr_t) value - (intptr_t) self);
-
-        if ((intptr_t) self + offset == (intptr_t) value) {
-            // Offset *is* representable as 32 bit value
-            self->offset = offset;
-            self->direct = true;
-        } else {
-            if (!gc) {
-                // Offset *not* representable, allocate extra memory for a pointer
-                nb_inst *self_2 =
-                    (nb_inst *) PyObject_Realloc(self, sizeof(nb_inst) + sizeof(void *));
-
-                if (!self_2) {
-                    PyObject_Free(self);
-                    return PyErr_NoMemory();
-                }
-
-                self = self_2;
-            }
-
-            *(void **) (self + 1) = value;
-            self->offset = (int32_t) sizeof(nb_inst);
-            self->direct = false;
-        }
-
-        self->internal = false;
-    }
-
-    // Update hash table that maps from C++ to Python instance
-    auto [it, success] = internals_get().inst_c2p.try_emplace(
-        std::pair<void *, std::type_index>(value, *t->type),
-        self);
-
-    if (!success)
-        fail("nanobind::detail::inst_new(): duplicate object!");
-
-    return (PyObject *) self;
-}
-
-// Allocate a new instance with co-located storage
-PyObject *inst_new(PyTypeObject *type, PyObject *, PyObject *) {
-    return inst_new_impl(type, nullptr);
-}
-
-static void inst_dealloc(PyObject *self) {
-    PyTypeObject *tp = Py_TYPE(self);
-    const type_data *t = nb_type_data(tp);
-
-    bool gc = PyType_HasFeature(tp, Py_TPFLAGS_HAVE_GC);
-    if (gc)
-        PyObject_GC_UnTrack(self);
-
-    if (t->flags & (uint32_t) type_flags::has_dynamic_attr) {
-        PyObject *&dict = *nb_dict_ptr(self);
-        Py_CLEAR(dict);
-    }
-
-    nb_inst *inst = (nb_inst *) self;
-    void *p = inst_ptr(inst);
-
-    if (inst->destruct) {
-        if (t->flags & (uint32_t) type_flags::is_destructible) {
-            if (t->flags & (uint32_t) type_flags::has_destruct)
-                t->destruct(p);
-        } else {
-            fail("nanobind::detail::inst_dealloc(\"%s\"): attempted to call "
-                 "the destructor of a non-destructible type!", t->name);
-        }
-    }
-
-    if (inst->cpp_delete) {
-        if (t->align <= (uint32_t) __STDCPP_DEFAULT_NEW_ALIGNMENT__)
-            operator delete(p);
-        else
-            operator delete(p, std::align_val_t(t->align));
-    }
-
-    nb_internals &internals = internals_get();
-    if (inst->clear_keep_alive) {
-        auto it = internals.keep_alive.find(self);
-        if (it == internals.keep_alive.end())
-            fail("nanobind::detail::inst_dealloc(\"%s\"): inconsistent "
-                 "keep_alive information", t->name);
-
-        keep_alive_set ref_set = std::move(it.value());
-        internals.keep_alive.erase(it);
-
-        for (keep_alive_entry e: ref_set) {
-            if (!e.deleter)
-                Py_DECREF((PyObject *) e.data);
-            else
-                e.deleter(e.data);
-        }
-    }
-
-    // Update hash table that maps from C++ to Python instance
-    auto it = internals.inst_c2p.find(
-        std::pair<void *, std::type_index>(p, *t->type));
-    if (it == internals.inst_c2p.end())
-        fail("nanobind::detail::inst_dealloc(\"%s\"): attempted to delete "
-             "an unknown instance (%p)!", t->name, p);
-    internals.inst_c2p.erase(it);
-
-    if (gc) {
-        #if defined(Py_LIMITED_API)
-            static freefunc tp_free =
-                (freefunc) PyType_GetSlot(tp, Py_tp_free);
-        #else
-            freefunc tp_free = tp->tp_free;
-        #endif
-
-        tp_free(self);
-    } else {
-        PyObject_Free(self);
-    }
-
-    Py_DECREF(tp);
-}
-
-void nb_type_dealloc(PyObject *o) {
-    type_data *t = nb_type_data((PyTypeObject *) o);
-
-    if (t->type && (t->flags & (uint32_t) type_flags::is_python_type) == 0) {
-        nb_internals &internals = internals_get();
-        auto it = internals.type_c2p.find(std::type_index(*t->type));
-        if (it == internals.type_c2p.end())
-            fail("nanobind::detail::nb_type_dealloc(\"%s\"): could not "
-                 "find type!", t->name);
-        internals.type_c2p.erase(it);
-    }
-
-    if (t->flags & (uint32_t) type_flags::has_implicit_conversions) {
-        free(t->implicit);
-        free(t->implicit_py);
-    }
-
-    if (t->flags & (uint32_t) type_flags::has_supplement)
-        free(t->supplement);
-
-    free((char *) t->name);
-
-    #if defined(Py_LIMITED_API)
-        static destructor tp_dealloc =
-            (destructor) PyType_GetSlot(&PyType_Type, Py_tp_dealloc);
-    #else
-        destructor tp_dealloc = PyType_Type.tp_dealloc;
-    #endif
-
-    tp_dealloc(o);
-}
-
-/// Called when a C++ type is extended from within Python
-int nb_type_init(PyObject *self, PyObject *args, PyObject *kwds) {
-    if (NB_TUPLE_GET_SIZE(args) != 3) {
-        PyErr_SetString(PyExc_RuntimeError,
-                        "nb_type_init(): invalid number of arguments!");
-        return -1;
-    }
-
-    PyObject *bases = NB_TUPLE_GET_ITEM(args, 1);
-    if (!PyTuple_CheckExact(bases) || NB_TUPLE_GET_SIZE(bases) != 1) {
-        PyErr_SetString(PyExc_RuntimeError,
-                        "nb_type_init(): invalid number of bases!");
-        return -1;
-    }
-
-    PyObject *base = NB_TUPLE_GET_ITEM(bases, 0);
-    if (!PyType_Check(base)) {
-        PyErr_SetString(PyExc_RuntimeError, "nb_type_init(): expected a base type object!");
-        return -1;
-    }
-
-    type_data *t_b = nb_type_data((PyTypeObject *) base);
-    if (t_b->flags & (uint32_t) type_flags::is_final) {
-        PyErr_Format(PyExc_TypeError, "The type '%s' prohibits subclassing!",
-                     t_b->name);
-        return -1;
-    }
-
-    #if defined(Py_LIMITED_API)
-        static initproc tp_init =
-            (initproc) PyType_GetSlot(&PyType_Type, Py_tp_init);
-    #else
-        initproc tp_init = PyType_Type.tp_init;
-    #endif
-
-    int rv = tp_init(self, args, kwds);
-    if (rv)
-        return rv;
-
-    type_data *t = nb_type_data((PyTypeObject *) self);
-
-    *t = *t_b;
-    t->flags |=  (uint32_t) type_flags::is_python_type;
-    t->flags &= ~((uint32_t) type_flags::has_implicit_conversions |
-                  (uint32_t) type_flags::has_supplement);
-    PyObject *name = nb_type_name((PyTypeObject *) self);
-    t->name = NB_STRDUP(PyUnicode_AsUTF8AndSize(name, nullptr));
-    Py_DECREF(name);
-    t->type_py = (PyTypeObject *) self;
-    t->base = t_b->type;
-    t->base_py = t_b->type_py;
-    t->implicit = nullptr;
-    t->implicit_py = nullptr;
-    t->supplement = nullptr;
-
-    return 0;
-}
-
-/// Called when a C++ type is bound via nb::class_<>
-PyObject *nb_type_new(const type_data *t) noexcept {
-    bool is_signed_enum    = t->flags & (uint32_t) type_flags::is_signed_enum,
-         is_unsigned_enum  = t->flags & (uint32_t) type_flags::is_unsigned_enum,
-         is_arithmetic     = t->flags & (uint32_t) type_flags::is_arithmetic,
-         is_enum           = is_signed_enum || is_unsigned_enum,
-         has_scope         = t->flags & (uint32_t) type_flags::has_scope,
-         has_doc           = t->flags & (uint32_t) type_flags::has_doc,
-         has_base          = t->flags & (uint32_t) type_flags::has_base,
-         has_base_py       = t->flags & (uint32_t) type_flags::has_base_py,
-         has_type_callback = t->flags & (uint32_t) type_flags::has_type_callback,
-         has_supplement    = t->flags & (uint32_t) type_flags::has_supplement,
-         has_dynamic_attr  = t->flags & (uint32_t) type_flags::has_dynamic_attr,
-         intrusive_ptr     = t->flags & (uint32_t) type_flags::intrusive_ptr;
-
-    nb_internals &internals = internals_get();
-    str name(t->name), qualname = name;
-    object modname;
-    PyObject *mod = nullptr;
-
-    if (has_scope) {
-        if (PyModule_Check(t->scope)) {
-            mod = t->scope;
-            modname = getattr(t->scope, "__name__", handle());
-        } else {
-            modname = getattr(t->scope, "__module__", handle());
-
-            object scope_qualname = getattr(t->scope, "__qualname__", handle());
-            if (scope_qualname.is_valid())
-                qualname = steal<str>(
-                    PyUnicode_FromFormat("%U.%U", scope_qualname.ptr(), name.ptr()));
-        }
-    }
-
-    if (modname.is_valid())
-        name = steal<str>(
-            PyUnicode_FromFormat("%U.%U", modname.ptr(), name.ptr()));
-
-    constexpr size_t ptr_size = sizeof(void *);
-    size_t basicsize = sizeof(nb_inst) + t->size;
-    if (t->align > ptr_size)
-        basicsize += t->align - ptr_size;
-
-    PyObject *base = nullptr;
-    if (has_base_py) {
-        if (has_base)
-            fail("nanobind::detail::nb_type_new(\"%s\"): multiple base types "
-                 "specified!", t->name);
-        base = (PyObject *) t->base_py;
-    } else if (has_base) {
-        auto it = internals.type_c2p.find(std::type_index(*t->base));
-        if (it == internals.type_c2p.end())
-            fail("nanobind::detail::nb_type_new(\"%s\"): base type \"%s\" not "
-                 "known to nanobind!", t->name, type_name(t->base));
-        base = (PyObject *) it->second->type_py;
-    }
-
-    type_data *tb = nullptr;
-    if (base) {
-        // Check if the base type already has dynamic attributes
-        tb = nb_type_data((PyTypeObject *) base);
-        if (tb->flags & (uint32_t) type_flags::has_dynamic_attr)
-            has_dynamic_attr = true;
-
-        /* Handle a corner case (base class larger than derived class)
-           which can arise when extending trampoline base classes */
-        size_t base_basicsize = sizeof(nb_inst) + tb->size;
-        if (tb->align > ptr_size)
-            base_basicsize += tb->align - ptr_size;
-        if (base_basicsize > basicsize)
-            basicsize = base_basicsize;
-    }
-
-    char *name_copy = NB_STRDUP(name.c_str());
-
-    PyMemberDef members[2] { };
-    PyType_Slot slots[128], *s = slots;
-    PyType_Spec spec = {
-        .name = name_copy,
-        .basicsize = (int) basicsize,
-        .flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-        .slots = slots
-    };
-
-    if (base)
-        *s++ = { Py_tp_base, (void *) base };
-
-    *s++ = { Py_tp_init, (void *) inst_init };
-    *s++ = { Py_tp_new, (void *) inst_new };
-    *s++ = { Py_tp_dealloc, (void *) inst_dealloc };
-
-    if (has_doc)
-        *s++ = { Py_tp_doc, (void *) t->doc };
-
-    if (has_type_callback)
-        t->type_callback(&s);
-
-    if (is_enum)
-        nb_enum_prepare(&s, is_arithmetic);
-
-    for (PyType_Slot *ts = slots; ts != s; ++ts) {
-        if (ts->slot == Py_tp_traverse ||
-            ts->slot == Py_tp_clear)
-            spec.flags |= Py_TPFLAGS_HAVE_GC;
-    }
-
-    if (has_dynamic_attr) {
-        if (spec.flags & Py_TPFLAGS_HAVE_GC)
-            fail("nanobind::detail::nb_type_new(\"%s\"): internal error -- "
-                 "attempted to enable dynamic attributes in a type with its "
-                 "own garbage collection hooks!", t->name);
-
-        // realign to sizeof(void*), add one pointer
-        basicsize = (basicsize + ptr_size - 1) / ptr_size * ptr_size;
-        basicsize += ptr_size;
-
-        members[0] = PyMemberDef{ "__dictoffset__", T_PYSSIZET,
-                                  (Py_ssize_t) (basicsize - ptr_size), READONLY,
-                                  nullptr };
-        *s++ = { Py_tp_members, (void *) members };
-        *s++ = { Py_tp_traverse, (void *) inst_traverse };
-        *s++ = { Py_tp_clear, (void *) inst_clear };
-
-        spec.basicsize = (int) basicsize;
-        spec.flags |= Py_TPFLAGS_HAVE_GC;
-    }
-
-    *s++ = { 0, nullptr };
-
-    PyTypeObject *metaclass = is_enum ? internals.nb_enum
-                                      : internals.nb_type;
-
-#if PY_VERSION_HEX >= 0x030C0000
-    // Life is good, PyType_FromMetaclass() is available
-    PyObject *result = PyType_FromMetaclass(metaclass, mod, &spec, base);
-    if (!result)
-        fail("nanobind::detail::nb_type_new(\"%s\"): type construction failed!", t->name);
-#else
-    /* The fallback code below is cursed. It provides an alternative when
-       PyType_FromMetaclass() is not available we are furthermore *not*
-       targeting the stable ABI interface. It calls PyType_FromSpec() to create
-       a tentative type, copies its contents into a larger type with a
-       different metaclass, then lets the original type expire. */
-
-    (void) mod;
-
-    PyObject *temp = PyType_FromSpec(&spec);
-    PyHeapTypeObject *temp_ht = (PyHeapTypeObject *) temp;
-    PyTypeObject *temp_tp = &temp_ht->ht_type;
-
-    Py_INCREF(temp_ht->ht_name);
-    Py_INCREF(temp_ht->ht_qualname);
-    Py_INCREF(temp_tp->tp_base);
-    Py_XINCREF(temp_ht->ht_slots);
-
-    PyObject *result = PyType_GenericAlloc(metaclass, 0);
-    if (!temp || !result)
-        fail("nanobind::detail::nb_type_new(\"%s\"): type construction failed!",
-             t->name);
-
-    PyHeapTypeObject *ht = (PyHeapTypeObject *) result;
-    PyTypeObject *tp = &ht->ht_type;
-
-    memcpy(ht, temp_ht, sizeof(PyHeapTypeObject));
-
-    tp->ob_base.ob_base.ob_type = metaclass;
-    tp->ob_base.ob_base.ob_refcnt = 1;
-    tp->ob_base.ob_size = 0;
-    tp->tp_as_async = &ht->as_async;
-    tp->tp_as_number = &ht->as_number;
-    tp->tp_as_sequence = &ht->as_sequence;
-    tp->tp_as_mapping = &ht->as_mapping;
-    tp->tp_as_buffer = &ht->as_buffer;
-    tp->tp_name = name_copy;
-    tp->tp_flags = spec.flags | Py_TPFLAGS_HEAPTYPE;
-
-#if PY_VERSION_HEX < 0x03090000
-    if (has_dynamic_attr)
-        tp->tp_dictoffset = (Py_ssize_t) (basicsize - ptr_size);
-#endif
-
-    tp->tp_dict = tp->tp_bases = tp->tp_mro = tp->tp_cache =
-        tp->tp_subclasses = tp->tp_weaklist = nullptr;
-    ht->ht_cached_keys = nullptr;
-    tp->tp_version_tag = 0;
-
-    PyType_Ready(tp);
-    Py_DECREF(temp);
-#endif
-
-    type_data *to = nb_type_data((PyTypeObject *) result);
-    *to = *t;
-
-    if (!intrusive_ptr && tb &&
-        (tb->flags & (uint32_t) type_flags::intrusive_ptr)) {
-        to->flags |= (uint32_t) type_flags::intrusive_ptr;
-        to->set_self_py = tb->set_self_py;
-    }
-
-    to->name = name_copy;
-    to->type_py = (PyTypeObject *) result;
-
-    if (has_supplement) {
-        if (!to->supplement)
-            fail("nanobind::detail::nb_type_new(\"%s\"): supplemental data "
-                 "allocation failed!", t->name);
-    } else {
-        to->supplement = nullptr;
-    }
-
-    if (has_dynamic_attr) {
-        to->flags |= (uint32_t) type_flags::has_dynamic_attr;
-        #if defined(Py_LIMITED_API)
-            to->dictoffset = (Py_ssize_t) (basicsize - ptr_size);
-        #endif
-    }
-
-    if (has_scope)
-        setattr(t->scope, t->name, result);
-
-    setattr(result, "__qualname__", qualname.ptr());
-
-    if (modname.is_valid())
-        setattr(result, "__module__", modname.ptr());
-
-    // Update hash table that maps from std::type_info to Python type
-    auto [it, success] =
-        internals.type_c2p.try_emplace(std::type_index(*t->type), to);
-    if (!success)
-        fail("nanobind::detail::nb_type_new(\"%s\"): type was already "
-             "registered!", t->name);
-
-    return result;
-}
-
-/// Encapsulates the implicit conversion part of nb_type_get()
-static NB_NOINLINE bool nb_type_get_implicit(PyObject *src,
-                                             const std::type_info *cpp_type_src,
-                                             const type_data *dst_type,
-                                             nb_internals &internals,
-                                             cleanup_list *cleanup, void **out) {
-    if (dst_type->implicit && cpp_type_src) {
-        const std::type_info **it = dst_type->implicit;
-        const std::type_info *v;
-
-        while ((v = *it++)) {
-            if (v == cpp_type_src || *v == *cpp_type_src)
-                goto found;
-        }
-
-        it = dst_type->implicit;
-        while ((v = *it++)) {
-            auto it2 = internals.type_c2p.find(std::type_index(*v));
-            if (it2 != internals.type_c2p.end() &&
-                PyType_IsSubtype(Py_TYPE(src), it2->second->type_py))
-                goto found;
-        }
-    }
-
-    if (dst_type->implicit_py) {
-        bool (**it)(PyTypeObject *, PyObject *, cleanup_list *) noexcept =
-            dst_type->implicit_py;
-        bool (*v2)(PyTypeObject *, PyObject *, cleanup_list *) noexcept;
-
-        while ((v2 = *it++)) {
-            if (v2(dst_type->type_py, src, cleanup))
-                goto found;
-        }
-    }
-
-    return false;
-
-found:
-
-    PyObject *result;
-#if PY_VERSION_HEX < 0x03090000 || defined(Py_LIMITED_API)
-    PyObject *args = PyTuple_New(1);
-    if (!args) {
-        PyErr_Clear();
-        return false;
-    }
-    Py_INCREF(src);
-    NB_TUPLE_SET_ITEM(args, 0, src);
-    result = PyObject_CallObject((PyObject *) dst_type->type_py, args);
-    Py_DECREF(args);
-#else
-    PyObject *args[2] = { nullptr, src };
-    result = PyObject_Vectorcall((PyObject *) dst_type->type_py, args + 1,
-                                 NB_VECTORCALL_ARGUMENTS_OFFSET + 1, nullptr);
-#endif
-
-    if (result) {
-        cleanup->append(result);
-        *out = inst_ptr((nb_inst *) result);
-        return true;
-    } else {
-        PyErr_Clear();
-
-        PyObject *name = nb_inst_name(src);
-        PyErr_WarnFormat(PyExc_RuntimeWarning, 1,
-                         "nanobind: implicit conversion from type '%U' "
-                         "to type '%s' failed!", dst_type->name);
-        Py_DECREF(name);
-
-        return false;
-    }
-}
-
-// Attempt to retrieve a pointer to a C++ instance
-bool nb_type_get(const std::type_info *cpp_type, PyObject *src, uint8_t flags,
-                 cleanup_list *cleanup, void **out) noexcept {
-    // Convert None -> nullptr
-    if (src == Py_None) {
-        *out = nullptr;
-        return true;
-    }
-
-    nb_internals &internals = internals_get();
-    PyTypeObject *src_type = Py_TYPE(src);
-    const std::type_info *cpp_type_src = nullptr;
-    const PyTypeObject *metaclass = Py_TYPE((PyObject *) src_type);
-    const bool src_is_nb_type = metaclass == internals.nb_type ||
-                                metaclass == internals.nb_enum;
-
-    type_data *dst_type = nullptr;
-
-    // If 'src' is a nanobind-bound type
-    if (src_is_nb_type) {
-        type_data *t = nb_type_data(src_type);
-        cpp_type_src = t->type;
-
-        // Check if the source / destination typeid are an exact match
-        bool valid = cpp_type == cpp_type_src || *cpp_type == *cpp_type_src;
-
-        // If not, look up the Python type and check the inheritance chain
-        if (!valid) {
-            auto it = internals.type_c2p.find(std::type_index(*cpp_type));
-            if (it != internals.type_c2p.end()) {
-                dst_type = it->second;
-                valid = PyType_IsSubtype(src_type, dst_type->type_py);
-            }
-        }
-
-        // Success, return the pointer if the instance is correctly initialized
-        if (valid) {
-            nb_inst *inst = (nb_inst *) src;
-
-            if (!inst->ready &&
-                (flags & (uint8_t) cast_flags::construct) == 0) {
-                PyErr_WarnFormat(PyExc_RuntimeWarning, 1,
-                                 "nanobind: attempted to access an "
-                                 "uninitialized instance of type '%s'!\n",
-                                 t->name);
-                return false;
-            }
-
-            *out = inst_ptr(inst);
-
-            return true;
-        }
-    }
-
-    // Try an implicit conversion as last resort (if possible & requested)
-    if ((flags & (uint16_t) cast_flags::convert) && cleanup) {
-        if (!src_is_nb_type) {
-            auto it = internals.type_c2p.find(std::type_index(*cpp_type));
-            if (it != internals.type_c2p.end())
-                dst_type = it->second;
-        }
-
-        if (dst_type &&
-            (dst_type->flags & (uint32_t) type_flags::has_implicit_conversions))
-            return nb_type_get_implicit(src, cpp_type_src, dst_type, internals,
-                                        cleanup, out);
-    }
-    return false;
-}
-
-static PyObject *keep_alive_callback(PyObject *self, PyObject *const *args,
-                                     Py_ssize_t nargs) {
-    if (nargs != 1 || !PyWeakref_CheckRefExact(args[0]))
-        fail("nanobind::detail::keep_alive_callback(): invalid input!");
-    Py_DECREF(args[0]); // self
-    Py_DECREF(self); // patient
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyMethodDef keep_alive_callback_def = {
-    "keep_alive_callback",
-    (PyCFunction) (void *) keep_alive_callback,
-    METH_FASTCALL,
-    "Implementation detail of nanobind::detail::keep_alive"
-};
-
-
-void keep_alive(PyObject *nurse, PyObject *patient) noexcept {
-    if (!patient)
-        return;
-
-    if (!nurse)
-        fail("nanobind::detail::keep_alive(): the 'nurse' argument must be "
-             "provided!");
-
-    nb_internals &internals = internals_get();
-    PyTypeObject *metaclass = Py_TYPE((PyObject *) Py_TYPE(nurse));
-
-    if (metaclass == internals.nb_type || metaclass == internals.nb_enum) {
-        // Populate nanobind-internal data structures
-        keep_alive_set &keep_alive = internals.keep_alive[nurse];
-
-        auto [it, success] = keep_alive.emplace(patient);
-        if (success) {
-            Py_INCREF(patient);
-            ((nb_inst *) nurse)->clear_keep_alive = true;
-        } else {
-            if (it->deleter)
-                fail("nanobind::detail::keep_alive(): internal error: entry "
-                     "has a deletion callback!");
-        }
-    } else {
-        PyObject *callback =
-            PyCFunction_New(&keep_alive_callback_def, patient);
-        if (!callback)
-            fail("nanobind::detail::keep_alive(): callback creation failed!");
-        PyObject *weakref = PyWeakref_NewRef(nurse, callback);
-        if (!weakref)
-            fail("nanobind::detail::keep_alive(): could not create a weak "
-                 "reference! Likely, the 'nurse' argument you specified is not "
-                 "a weak-referenceable type!");
-
-        // Increase patient reference count, leak weak reference
-        Py_INCREF(patient);
-        Py_DECREF(callback);
-    }
-}
-
-void keep_alive(PyObject *nurse, void *payload,
-                void (*callback)(void *) noexcept) noexcept {
-    if (!nurse)
-        fail("nanobind::detail::keep_alive(): nurse==nullptr!");
-
-    PyTypeObject *metaclass = Py_TYPE((PyObject *) Py_TYPE(nurse));
-
-    nb_internals &internals = internals_get();
-
-    if (metaclass == internals.nb_type || metaclass == internals.nb_enum) {
-        keep_alive_set &keep_alive = internals.keep_alive[nurse];
-        auto [it, success] = keep_alive.emplace(payload, callback);
-        if (!success)
-            raise("keep_alive(): the given 'payload' pointer was already registered!");
-        ((nb_inst *) nurse)->clear_keep_alive = true;
-    } else {
-        PyObject *patient = capsule_new(payload, callback);
-        keep_alive(nurse, patient);
-        Py_DECREF(patient);
-    }
-}
-
-PyObject *nb_type_put(const std::type_info *cpp_type, void *value,
-                      rv_policy rvp, cleanup_list *cleanup,
-                      bool *is_new) noexcept {
-    // Convert nullptr -> None
-    if (!value) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    // Check if the instance is already registered with nanobind
-    nb_internals &internals = internals_get();
-    auto it = internals.inst_c2p.find(
-        std::pair<void *, std::type_index>(value, *cpp_type));
-    if (it != internals.inst_c2p.end()) {
-        PyObject *result = (PyObject *) it->second;
-        Py_INCREF(result);
-        return result;
-    } else if (rvp == rv_policy::none) {
-        return nullptr;
-    }
-
-    // Look up the corresponding type
-    auto it2 = internals.type_c2p.find(std::type_index(*cpp_type));
-    if (it2 == internals.type_c2p.end())
-        return nullptr;
-
-    // The reference_internals RVP needs a self pointer, give up if unavailable
-    if (rvp == rv_policy::reference_internal && (!cleanup || !cleanup->self()))
-        return nullptr;
-
-    type_data *t = it2->second;
-    const bool intrusive = t->flags & (uint32_t) type_flags::intrusive_ptr;
-    if (intrusive)
-        rvp = rv_policy::take_ownership;
-
-    const bool store_in_obj = rvp == rv_policy::copy || rvp == rv_policy::move;
-
-    nb_inst *inst =
-        (nb_inst *) inst_new_impl(t->type_py, store_in_obj ? nullptr : value);
-    if (!inst)
-        return nullptr;
-
-    if (is_new)
-        *is_new = true;
-
-    void *new_value = inst_ptr(inst);
-    if (rvp == rv_policy::move) {
-        if (t->flags & (uint32_t) type_flags::is_move_constructible) {
-            if (t->flags & (uint32_t) type_flags::has_move) {
-                try {
-                    t->move(new_value, value);
-                } catch (...) {
-                    Py_DECREF(inst);
-                    return nullptr;
-                }
-            } else {
-                memcpy(new_value, value, t->size);
-                memset(value, 0, t->size);
-            }
-        } else {
-            if (t->flags & (uint32_t) type_flags::is_copy_constructible) {
-                rvp = rv_policy::copy;
-            } else {
-                fail("nanobind::detail::nb_type_put(\"%s\"): attempted to move "
-                     "an instance that is neither copy- nor move-constructible!",
-                     t->name);
-            }
-        }
-    }
-
-    if (rvp == rv_policy::copy) {
-        if (t->flags & (uint32_t) type_flags::is_copy_constructible) {
-            if (t->flags & (uint32_t) type_flags::has_copy) {
-                try {
-                    t->copy(new_value, value);
-                } catch (...) {
-                    Py_DECREF(inst);
-                    return nullptr;
-                }
-            } else {
-                memcpy(new_value, value, t->size);
-            }
-        } else {
-            fail("nanobind::detail::nb_type_put(\"%s\"): attempted to copy "
-                 "an instance that is not copy-constructible!", t->name);
-        }
-    }
-
-    inst->destruct = rvp != rv_policy::reference && rvp != rv_policy::reference_internal;
-    inst->cpp_delete = rvp == rv_policy::take_ownership;
-    inst->ready = true;
-
-    if (rvp == rv_policy::reference_internal)
-        keep_alive((PyObject *) inst, cleanup->self());
-
-    if (intrusive)
-        t->set_self_py(new_value, (PyObject *) inst);
-
-    return (PyObject *) inst;
-}
-
-PyObject *nb_type_put_unique(const std::type_info *cpp_type, void *value,
-                             cleanup_list *cleanup, bool cpp_delete) noexcept {
-    rv_policy policy = cpp_delete ? rv_policy::take_ownership : rv_policy::none;
-
-    bool is_new = false;
-    PyObject *o = nb_type_put(cpp_type, value, policy, cleanup, &is_new);
-    if (!o)
-        return nullptr;
-
-    if (!cpp_delete && is_new)
-        fail("nanobind::detail::nb_type_put_unique(type='%s', cpp_delete=%i): "
-             "ownership status has become corrupted.",
-             type_name(cpp_type), cpp_delete);
-
-    nb_inst *inst = (nb_inst *) o;
-
-    if (cpp_delete) {
-        if (inst->ready != is_new || inst->destruct != is_new ||
-            inst->cpp_delete != is_new)
-            fail("nanobind::detail::nb_type_put_unique(type='%s', "
-                 "cpp_delete=%i): unexpected status flags! (ready=%i, "
-                 "destruct=%i, cpp_delete=%i)",
-                 type_name(cpp_type), cpp_delete, inst->ready,
-                 inst->destruct, inst->cpp_delete);
-
-        inst->ready = inst->destruct = inst->cpp_delete = true;
-    } else {
-        if (inst->ready)
-            fail("nanobind::detail::nb_type_put_unique('%s'): ownership "
-                 "status has become corrupted.", type_name(cpp_type));
-        inst->ready = true;
-    }
-    return o;
-}
-
-void nb_type_relinquish_ownership(PyObject *o, bool cpp_delete) {
-    nb_inst *inst = (nb_inst *) o;
-
-    // This function is called to indicate ownership *changes*
-    if (!inst->ready)
-        fail("nanobind::detail::nb_relinquish_ownership('%s'): ownership "
-             "status has become corrupted.",
-             PyUnicode_AsUTF8AndSize(nb_inst_name(o), nullptr));
-
-    if (cpp_delete) {
-        if (!inst->cpp_delete || !inst->destruct || inst->internal) {
-            PyErr_WarnFormat(
-                PyExc_RuntimeWarning, 1,
-                "nanobind::detail::nb_relinquish_ownership(): could not "
-                "transfer ownership of a Python instance of type '%s' to C++. "
-                "This is only possible when the instance was previously "
-                "constructed on the C++ side and is now owned by Python, which "
-                "was not the case here. You could change the unique pointer "
-                "signature to std::unique_ptr<T, nb::deleter<T>> to work around "
-                "this issue.",
-                PyUnicode_AsUTF8AndSize(nb_inst_name(o), nullptr));
-
-            raise_next_overload();
-        }
-
-        inst->cpp_delete = false;
-        inst->destruct = false;
-    }
-
-    inst->ready = false;
-}
-
-/// Special case to handle 'Class.property = value' assignments
-int nb_type_setattro(PyObject* obj, PyObject* name, PyObject* value) {
-    nb_internals &internals = internals_get();
-
-    internals.nb_static_property_enabled = false;
-    PyObject *cur = PyObject_GetAttr(obj, name);
-    internals.nb_static_property_enabled = true;
-
-    if (cur) {
-        if (Py_TYPE(cur) == internals.nb_static_property) {
-            int rv = nb_static_property_set(cur, obj, value);
-            Py_DECREF(cur);
-            return rv;
-        }
-        Py_DECREF(cur);
-    } else {
-        PyErr_Clear();
-    }
-
-    #if defined(Py_LIMITED_API)
-        static setattrofunc tp_setattro =
-            (setattrofunc) PyType_GetSlot(&PyType_Type, Py_tp_setattro);
-    #else
-        setattrofunc tp_setattro = PyType_Type.tp_setattro;
-    #endif
-
-    return tp_setattro(obj, name, value);
-}
-
-bool nb_type_isinstance(PyObject *o, const std::type_info *t) noexcept {
-    nb_internals &internals = internals_get();
-    auto it = internals.type_c2p.find(std::type_index(*t));
-    if (it == internals.type_c2p.end())
-        return false;
-    return PyType_IsSubtype(Py_TYPE(o), it->second->type_py);
-}
-
-PyObject *nb_type_lookup(const std::type_info *t) noexcept {
-    nb_internals &internals = internals_get();
-    auto it = internals.type_c2p.find(std::type_index(*t));
-    if (it != internals.type_c2p.end())
-        return (PyObject *) it->second->type_py;
-    return nullptr;
-}
-
-bool nb_type_check(PyObject *t) noexcept {
-    nb_internals &internals = internals_get();
-    PyTypeObject *metaclass = Py_TYPE(t);
-
-    return metaclass == internals.nb_type ||
-           metaclass == internals.nb_enum;
-}
-
-size_t nb_type_size(PyObject *t) noexcept {
-    return nb_type_data((PyTypeObject *) t)->size;
-}
-
-size_t nb_type_align(PyObject *t) noexcept {
-    return nb_type_data((PyTypeObject *) t)->align;
-}
-
-const std::type_info *nb_type_info(PyObject *t) noexcept {
-    return nb_type_data((PyTypeObject *) t)->type;
-}
-
-void *nb_type_supplement(PyObject *t) noexcept {
-    return nb_type_data((PyTypeObject *) t)->supplement;
-}
-
-PyObject *nb_inst_alloc(PyTypeObject *t) {
-    PyObject *result = inst_new_impl(t, nullptr);
-    if (!result)
-        raise_python_error();
-    return result;
-}
-
-void *nb_inst_ptr(PyObject *o) noexcept {
-    return inst_ptr((nb_inst *) o);
-}
-
-void nb_inst_zero(PyObject *o) noexcept {
-    nb_inst *nbi = (nb_inst *) o;
-    type_data *t = nb_type_data(Py_TYPE(o));
-    memset(inst_ptr(nbi), 0, t->size);
-    nbi->ready = nbi->destruct = true;
-}
-
-void nb_inst_set_state(PyObject *o, bool ready, bool destruct) noexcept {
-    nb_inst *nbi = (nb_inst *) o;
-    nbi->ready = ready;
-    nbi->destruct = destruct;
-}
-
-std::pair<bool, bool> nb_inst_state(PyObject *o) noexcept {
-    nb_inst *nbi = (nb_inst *) o;
-    return { (bool) nbi->ready, (bool) nbi->destruct };
-}
-
-void nb_inst_destruct(PyObject *o) noexcept {
-    nb_inst *nbi = (nb_inst *) o;
-    type_data *t = nb_type_data(Py_TYPE(o));
-
-    if (nbi->destruct) {
-        if (t->flags & (uint32_t) type_flags::is_destructible) {
-            if (t->flags & (uint32_t) type_flags::has_destruct)
-                t->destruct(inst_ptr(nbi));
-        } else {
-            fail("nanobind::detail::nb_inst_destruct(\"%s\"): attempted to call "
-                 "the destructor of a non-destructible type!", t->name);
-        }
-        nbi->destruct = false;
-    }
-
-    nbi->ready = false;
-}
-
-void nb_inst_copy(PyObject *dst, const PyObject *src) noexcept {
-    PyTypeObject *tp = Py_TYPE((PyObject *) src);
-    type_data *t = nb_type_data(tp);
-
-    if (tp != Py_TYPE(dst) ||
-        (t->flags & (uint32_t) type_flags::is_copy_constructible) == 0)
-        fail("nanobind::detail::nb_inst_copy(): invalid arguments!");
-
-    nb_inst *nbi = (nb_inst *) dst;
-    const void *src_data = inst_ptr((nb_inst *) src);
-    void *dst_data = inst_ptr(nbi);
-
-    if (t->flags & (uint32_t) type_flags::has_copy)
-        t->copy(dst_data, src_data);
-    else
-        memcpy(dst_data, src_data, t->size);
-
-    nbi->ready = nbi->destruct = true;
-}
-
-void nb_inst_move(PyObject *dst, const PyObject *src) noexcept {
-    PyTypeObject *tp = Py_TYPE((PyObject *) src);
-    type_data *t = nb_type_data(tp);
-
-    if (tp != Py_TYPE(dst) ||
-        (t->flags & (uint32_t) type_flags::is_move_constructible) == 0)
-        fail("nanobind::detail::nb_inst_move(): invalid arguments!");
-
-    nb_inst *nbi = (nb_inst *) dst;
-    void *src_data = inst_ptr((nb_inst *) src);
-    void *dst_data = inst_ptr(nbi);
-
-    if (t->flags & (uint32_t) type_flags::has_move) {
-        t->move(dst_data, src_data);
-    } else {
-        memcpy(dst_data, src_data, t->size);
-        memset(src_data, 0, t->size);
-    }
-
-    nbi->ready = nbi->destruct = true;
-}
-
-#if defined(Py_LIMITED_API)
-static size_t type_basicsize = 0;
-type_data *nb_type_data_static(PyTypeObject *o) noexcept {
-    if (type_basicsize == 0)
-        type_basicsize = cast<size_t>(handle(&PyType_Type).attr("__basicsize__"));
-    return (type_data *) (((char *) o) + type_basicsize);
-}
-#endif
-
-/// Fetch the name of an instance as 'char *' (must be deallocated using 'free'!)
-PyObject *nb_type_name(PyTypeObject *tp) noexcept {
-    PyObject *name = PyObject_GetAttrString((PyObject *) tp, "__name__");
-
-    if (PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE)) {
-        PyObject *mod      = PyObject_GetAttrString((PyObject *) tp, "__module__"),
-                 *combined = PyUnicode_FromFormat("%U.%U", mod, name);
-
-        Py_DECREF(mod);
-        Py_DECREF(name);
-        name = combined;
-    }
-
-    return name;
-}
-
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/tensor.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/tensor.cpp
deleted file mode 100644
index 74b6b1dd8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/tensor.cpp
+++ /dev/null
@@ -1,611 +0,0 @@
-#include <nanobind/tensor.h>
-#include <atomic>
-#include "nb_internals.h"
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-// ========================================================================
-
-struct managed_tensor {
-    dlpack::tensor dl_tensor;
-    void *manager_ctx;
-    void (*deleter)(managed_tensor *);
-};
-
-struct tensor_handle {
-    managed_tensor *tensor;
-    std::atomic<size_t> refcount;
-    PyObject *owner;
-    bool free_shape;
-    bool free_strides;
-    bool call_deleter;
-};
-
-PyObject *nb_tensor_new(PyTypeObject *tp, PyObject *args,
-                        PyObject *kwargs) {
-
-    allocfunc tp_alloc;
-#if defined(Py_LIMITED_API)
-    tp_alloc = (allocfunc) PyType_GetSlot(tp, Py_tp_alloc);
-#else
-    tp_alloc = tp->tp_alloc;
-#endif
-
-    PyObject* result = tp_alloc(tp, 0);
-    if (NB_TUPLE_GET_SIZE(args) != 1 || kwargs)
-        fail("nanobind::detail::nb_tensor_new(): internal error!");
-
-    PyObject *capsule = NB_TUPLE_GET_ITEM(args, 0);
-    ((nb_tensor *) result)->capsule = capsule;
-    Py_INCREF(capsule);
-    return result;
-}
-
-void nb_tensor_dealloc(PyObject *self) {
-    Py_DECREF(((nb_tensor *) self)->capsule);
-
-    freefunc tp_free;
-#if defined(Py_LIMITED_API)
-    tp_free = (freefunc) PyType_GetSlot(Py_TYPE(self), Py_tp_free);
-#else
-    tp_free = Py_TYPE(self)->tp_free;
-#endif
-
-    tp_free(self);
-}
-
-PyObject *nb_tensor_get(PyObject *self, PyObject *) {
-    PyObject *result = ((nb_tensor *) self)->capsule;
-    Py_INCREF(result);
-    return result;
-}
-
-int nb_tensor_getbuffer(PyObject *exporter, Py_buffer *view, int) {
-    nb_tensor *self = (nb_tensor *) exporter;
-
-    void *ptr = PyCapsule_GetPointer(self->capsule, "dltensor");
-    if (!ptr)
-        fail("nanobind::tensor::nb_tensor_getbuffer(): internal error!");
-
-    dlpack::tensor &t = ((managed_tensor *) ptr)->dl_tensor;
-
-    if (t.device.device_type != device::cpu::value) {
-        PyErr_SetString(PyExc_BufferError, "Only CPU-allocated tensors can be "
-                                           "accessed via the buffer protocol!");
-        return -1;
-    }
-
-    const char *format = nullptr;
-    switch ((dlpack::dtype_code) t.dtype.code) {
-        case dlpack::dtype_code::Int:
-            switch (t.dtype.bits) {
-                case 8: format = "b"; break;
-                case 16: format = "h"; break;
-                case 32: format = "i"; break;
-                case 64: format = "q"; break;
-            }
-            break;
-
-        case dlpack::dtype_code::UInt:
-            switch (t.dtype.bits) {
-                case 8: format = "B"; break;
-                case 16: format = "H"; break;
-                case 32: format = "I"; break;
-                case 64: format = "Q"; break;
-            }
-            break;
-
-        case dlpack::dtype_code::Float:
-            switch (t.dtype.bits) {
-                case 16: format = "e"; break;
-                case 32: format = "f"; break;
-                case 64: format = "d"; break;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    if (!format || t.dtype.lanes != 1) {
-        PyErr_SetString(
-            PyExc_BufferError,
-            "Don't know how to convert DLPack dtype into buffer protocol format!");
-        return -1;
-    }
-
-    view->format = (char *) format;
-    view->itemsize = t.dtype.bits / 8;
-    view->buf = (void *) ((uintptr_t) t.data + t.byte_offset);
-    view->obj = exporter;
-    Py_INCREF(exporter);
-
-    Py_ssize_t len = view->itemsize;
-    scoped_pymalloc<Py_ssize_t> strides(t.ndim), shape(t.ndim);
-    for (int32_t i = 0; i < t.ndim; ++i) {
-        len *= (Py_ssize_t) t.shape[i];
-        strides[i] = (Py_ssize_t) t.strides[i] * view->itemsize;
-        shape[i] = (Py_ssize_t) t.shape[i];
-    }
-
-    view->ndim = t.ndim;
-    view->len = len;
-    view->readonly = false;
-    view->suboffsets = nullptr;
-    view->internal = nullptr;
-    view->strides = strides.release();
-    view->shape = shape.release();
-
-    return 0;
-}
-
-void nb_tensor_releasebuffer(PyObject *, Py_buffer *view) {
-    PyMem_Free(view->shape);
-    PyMem_Free(view->strides);
-}
-
-static PyObject *dlpack_from_buffer_protocol(PyObject *o) {
-    scoped_pymalloc<Py_buffer> view;
-    scoped_pymalloc<managed_tensor> mt;
-
-    if (PyObject_GetBuffer(o, view.get(), PyBUF_RECORDS)) {
-        PyErr_Clear();
-        return nullptr;
-    }
-
-    char format = 'B';
-    const char *format_str = view->format;
-    if (format_str)
-        format = *format_str;
-
-    bool skip_first = format == '@' || format == '=';
-
-    int32_t num = 1;
-    if(*(uint8_t *) &num == 1) {
-        if (format == '<')
-            skip_first = true;
-    } else {
-        if (format == '!' || format == '>')
-            skip_first = true;
-    }
-
-    if (skip_first && format_str)
-        format = *++format_str;
-
-    dlpack::dtype dt { };
-    bool fail = format_str && format_str[1] != '\0';
-
-    if (!fail) {
-        switch (format) {
-            case 'c':
-            case 'b':
-            case 'h':
-            case 'i':
-            case 'l':
-            case 'q':
-            case 'n': dt.code = (uint8_t) dlpack::dtype_code::Int; break;
-
-            case 'B':
-            case 'H':
-            case 'I':
-            case 'L':
-            case 'Q':
-            case 'N': dt.code = (uint8_t) dlpack::dtype_code::UInt; break;
-
-            case 'e':
-            case 'f':
-            case 'd': dt.code = (uint8_t) dlpack::dtype_code::Float; break;
-
-            default:
-                fail = true;
-        }
-        dt.lanes = 1;
-        dt.bits = (uint8_t) (view->itemsize * 8);
-    }
-
-    if (fail) {
-        PyBuffer_Release(view.get());
-        return nullptr;
-    }
-
-    mt->deleter = [](managed_tensor *mt2) {
-        gil_scoped_acquire guard;
-        Py_buffer *buf = (Py_buffer *) mt2->manager_ctx;
-        PyBuffer_Release(buf);
-        PyMem_Free(mt2->dl_tensor.shape);
-        PyMem_Free(mt2->dl_tensor.strides);
-        PyMem_Free(mt2);
-    };
-
-    /* DLPack mandates 256-byte alignment of the 'DLTensor::data' field, but
-       PyTorch unfortunately ignores the 'byte_offset' value.. :-( */
-#if 0
-    uintptr_t value_int = (uintptr_t) view->buf,
-              value_rounded = (value_int / 256) * 256;
-#else
-    uintptr_t value_int = (uintptr_t) view->buf,
-              value_rounded = value_int;
-#endif
-
-    mt->dl_tensor.data = (void *) value_rounded;
-    mt->dl_tensor.device = { device::cpu::value, 0 };
-    mt->dl_tensor.ndim = view->ndim;
-    mt->dl_tensor.dtype = dt;
-    mt->dl_tensor.byte_offset = value_int - value_rounded;
-
-    scoped_pymalloc<int64_t> strides(view->ndim);
-    scoped_pymalloc<int64_t> shape(view->ndim);
-    for (size_t i = 0; i < (size_t) view->ndim; ++i) {
-        strides[i] = (int64_t) (view->strides[i] / view->itemsize);
-        shape[i] = (int64_t) view->shape[i];
-    }
-
-    mt->manager_ctx = view.release();
-    mt->dl_tensor.shape = shape.release();
-    mt->dl_tensor.strides = strides.release();
-
-    return PyCapsule_New(mt.release(), "dltensor", [](PyObject *o) {
-        error_scope scope; // temporarily save any existing errors
-        managed_tensor *mt =
-            (managed_tensor *) PyCapsule_GetPointer(o, "dltensor");
-        if (mt) {
-            if (mt->deleter)
-                mt->deleter(mt);
-        } else {
-            PyErr_Clear();
-        }
-    });
-}
-
-tensor_handle *tensor_import(PyObject *o, const tensor_req *req,
-                             bool convert) noexcept {
-    object capsule;
-
-    // If this is not a capsule, try calling o.__dlpack__()
-    if (!PyCapsule_CheckExact(o)) {
-        capsule = steal(PyObject_CallMethod(o, "__dlpack__", nullptr));
-
-        if (!capsule.is_valid()) {
-            PyErr_Clear();
-            PyTypeObject *tp = Py_TYPE(o);
-
-            try {
-                const char *module_name =
-                    borrow<str>(handle(tp).attr("__module__")).c_str();
-
-                object package;
-                if (strncmp(module_name, "tensorflow.", 11) == 0)
-                    package = module_::import_("tensorflow.experimental.dlpack");
-                else if (strcmp(module_name, "torch") == 0)
-                    package = module_::import_("torch.utils.dlpack");
-                else if (strncmp(module_name, "jaxlib", 6) == 0)
-                    package = module_::import_("jax.dlpack");
-
-                if (package.is_valid())
-                    capsule = package.attr("to_dlpack")(handle(o));
-            } catch (...) {
-                capsule.clear();
-            }
-        }
-
-        // Try creating a tensor via the buffer protocol
-        if (!capsule.is_valid())
-            capsule = steal(dlpack_from_buffer_protocol(o));
-
-        if (!capsule.is_valid())
-            return nullptr;
-    } else {
-        capsule = borrow(o);
-    }
-
-    // Extract the pointer underlying the capsule
-    void *ptr = PyCapsule_GetPointer(capsule.ptr(), "dltensor");
-    if (!ptr) {
-        PyErr_Clear();
-        return nullptr;
-    }
-
-    // Check if the tensor satisfies the requirements
-    dlpack::tensor &t = ((managed_tensor *) ptr)->dl_tensor;
-
-    bool pass_dtype = true, pass_device = true,
-         pass_shape = true, pass_order = true;
-
-    if (req->req_dtype)
-        pass_dtype = t.dtype == req->dtype;
-
-    if (req->req_device)
-        pass_device = t.device.device_type == req->req_device;
-
-    if (req->req_shape) {
-        pass_shape &= req->ndim == (uint32_t) t.ndim;
-
-        if (pass_shape) {
-            for (uint32_t i = 0; i < req->ndim; ++i) {
-                if (req->shape[i] != (size_t) t.shape[i] &&
-                    req->shape[i] != nanobind::any) {
-                    pass_shape = false;
-                    break;
-                }
-            }
-        }
-    }
-
-    scoped_pymalloc<int64_t> strides(t.ndim);
-    if ((req->req_order || t.strides == nullptr) && t.ndim > 0) {
-        size_t accum = 1;
-
-        if (req->req_order == 'C' || t.strides == nullptr) {
-            for (uint32_t i = (uint32_t) (t.ndim - 1);;) {
-                strides[i] = accum;
-                accum *= t.shape[i];
-                if (i == 0)
-                    break;
-                --i;
-            }
-        } else if (req->req_order == 'F') {
-            pass_order &= t.strides != nullptr;
-
-            for (uint32_t i = 0; i < (uint32_t) t.ndim; ++i) {
-                strides[i] = accum;
-                accum *= t.shape[i];
-            }
-        } else {
-            pass_order = false;
-        }
-
-        if (t.strides) {
-            for (uint32_t i = 0; i < (uint32_t) t.ndim; ++i) {
-                if (strides[i] != t.strides[i]) {
-                    pass_order = false;
-                    break;
-                }
-            }
-        }
-    }
-
-    // Support implicit conversion of 'dtype' and order
-    if (pass_device && pass_shape && (!pass_dtype || !pass_order) && convert &&
-        capsule.ptr() != o) {
-        PyTypeObject *tp = Py_TYPE(o);
-        str module_name_o = borrow<str>(handle(tp).attr("__module__"));
-        const char *module_name = module_name_o.c_str();
-
-        char order = 'K';
-        if (req->req_order != '\0')
-            order = req->req_order;
-
-        if (req->dtype.lanes != 1)
-            return nullptr;
-
-        const char *prefix = nullptr;
-        char dtype[8];
-        switch (req->dtype.code) {
-            case (uint8_t) dlpack::dtype_code::Int: prefix = "int"; break;
-            case (uint8_t) dlpack::dtype_code::UInt: prefix = "uint"; break;
-            case (uint8_t) dlpack::dtype_code::Float: prefix = "float"; break;
-            default:
-                return nullptr;
-        }
-        snprintf(dtype, sizeof(dtype), "%s%u", prefix, req->dtype.bits);
-
-        object converted;
-        try {
-            if (strcmp(module_name, "numpy") == 0) {
-                converted = handle(o).attr("astype")(dtype, order);
-            } else if (strcmp(module_name, "torch") == 0) {
-                converted = handle(o).attr("to")(
-                    arg("dtype") = module_::import_("torch").attr(dtype),
-                    arg("copy") = true
-                );
-            } else if (strncmp(module_name, "tensorflow.", 11) == 0) {
-                converted = module_::import_("tensorflow")
-                                .attr("cast")(handle(o), dtype);
-            } else if (strncmp(module_name, "jaxlib", 6) == 0) {
-                converted = handle(o).attr("astype")(dtype);
-            }
-        } catch (...) { converted.clear(); }
-
-        // Potentially try again recursively
-        if (!converted.is_valid())
-            return nullptr;
-        else
-            return tensor_import(converted.ptr(), req, false);
-    }
-
-    if (!pass_dtype || !pass_device || !pass_shape || !pass_order)
-        return nullptr;
-
-    // Create a reference-counted wrapper
-    scoped_pymalloc<tensor_handle> result;
-    result->tensor = (managed_tensor *) ptr;
-    result->refcount = 0;
-    result->owner = nullptr;
-    result->free_shape = false;
-    result->call_deleter = true;
-
-    // Ensure that the strides member is always initialized
-    if (t.strides) {
-        result->free_strides = false;
-    } else {
-        result->free_strides = true;
-        t.strides = strides.release();
-    }
-
-    // Mark the dltensor capsule as "consumed"
-    if (PyCapsule_SetName(capsule.ptr(), "used_dltensor") ||
-        PyCapsule_SetDestructor(capsule.ptr(), nullptr))
-        fail("nanobind::detail::tensor_import(): could not mark dltensor "
-             "capsule as consumed!");
-
-    return result.release();
-}
-
-dlpack::tensor *tensor_inc_ref(tensor_handle *th) noexcept {
-    if (!th)
-        return nullptr;
-    ++th->refcount;
-    return &th->tensor->dl_tensor;
-}
-
-void tensor_dec_ref(tensor_handle *th) noexcept {
-    if (!th)
-        return;
-    size_t rc_value = th->refcount--;
-
-    if (rc_value == 0) {
-        fail("tensor_dec_ref(): reference count became negative!");
-    } else if (rc_value == 1) {
-        Py_XDECREF(th->owner);
-        managed_tensor *mt = th->tensor;
-        if (th->free_shape) {
-            PyMem_Free(mt->dl_tensor.shape);
-            mt->dl_tensor.shape = nullptr;
-        }
-        if (th->free_strides) {
-            PyMem_Free(mt->dl_tensor.strides);
-            mt->dl_tensor.strides = nullptr;
-        }
-        if (th->call_deleter) {
-            if (mt->deleter)
-                mt->deleter(mt);
-        } else {
-            PyMem_Free(mt);
-        }
-        PyMem_Free(th);
-    }
-}
-
-tensor_handle *tensor_create(void *value, size_t ndim, const size_t *shape_in,
-                            PyObject *owner, const int64_t *strides_in,
-                            dlpack::dtype *dtype, int32_t device_type,
-                            int32_t device_id) {
-    /* DLPack mandates 256-byte alignment of the 'DLTensor::data' field, but
-       PyTorch unfortunately ignores the 'byte_offset' value.. :-( */
-#if 0
-    uintptr_t value_int = (uintptr_t) value,
-              value_rounded = (value_int / 256) * 256;
-#else
-    uintptr_t value_int = (uintptr_t) value,
-              value_rounded = value_int;
-#endif
-
-
-    scoped_pymalloc<managed_tensor> tensor;
-    scoped_pymalloc<tensor_handle> result;
-    scoped_pymalloc<int64_t> shape(ndim), strides(ndim);
-
-    auto deleter = [](managed_tensor *mt) {
-        gil_scoped_acquire guard;
-        tensor_handle *th = (tensor_handle *) mt->manager_ctx;
-        tensor_dec_ref(th);
-    };
-
-    for (size_t i = 0; i < ndim; ++i)
-        shape[i] = (int64_t) shape_in[i];
-
-    int64_t prod = 1;
-    for (size_t i = ndim - 1; ;) {
-        if (strides_in) {
-            strides[i] = strides_in[i];
-        } else {
-            strides[i] = prod;
-            prod *= (int64_t) shape_in[i];
-        }
-        if (i == 0)
-            break;
-        --i;
-    }
-
-    tensor->dl_tensor.data = (void *) value_rounded;
-    tensor->dl_tensor.device.device_type = device_type;
-    tensor->dl_tensor.device.device_id = device_id;
-    tensor->dl_tensor.ndim = (int32_t) ndim;
-    tensor->dl_tensor.dtype = *dtype;
-    tensor->dl_tensor.byte_offset = value_int - value_rounded;
-    tensor->dl_tensor.shape = shape.release();
-    tensor->dl_tensor.strides = strides.release();
-    tensor->manager_ctx = result.get();
-    tensor->deleter = deleter;
-    result->tensor = (managed_tensor *) tensor.release();
-    result->refcount = 0;
-    result->owner = owner;
-    result->free_shape = true;
-    result->free_strides = true;
-    result->call_deleter = false;
-    Py_XINCREF(owner);
-    return result.release();
-}
-
-static void tensor_capsule_destructor(PyObject *o) {
-    error_scope scope; // temporarily save any existing errors
-    managed_tensor *mt =
-        (managed_tensor *) PyCapsule_GetPointer(o, "dltensor");
-    if (mt)
-        tensor_dec_ref((tensor_handle *) mt->manager_ctx);
-    else
-        PyErr_Clear();
-}
-
-PyObject *tensor_wrap(tensor_handle *th, int framework) noexcept {
-    tensor_inc_ref(th);
-    object o = steal(PyCapsule_New(th->tensor, "dltensor", tensor_capsule_destructor)),
-           package;
-
-    switch ((tensor_framework) framework) {
-        case tensor_framework::none:
-            break;
-
-        case tensor_framework::numpy:
-            package = module_::import_("numpy");
-            o = handle(internals_get().nb_tensor)(o);
-            break;
-
-        case tensor_framework::pytorch:
-            package = module_::import_("torch.utils.dlpack");
-            break;
-
-
-        case tensor_framework::tensorflow:
-            package = module_::import_("tensorflow.experimental.dlpack");
-            break;
-
-        case tensor_framework::jax:
-            package = module_::import_("jax.dlpack");
-            break;
-
-
-        default:
-            fail("nanobind::detail::tensor_wrap(): unknown framework "
-                 "specified!");
-    }
-
-
-    if (package.is_valid()) {
-        try {
-            o = package.attr("from_dlpack")(o);
-        } catch (...) {
-            if ((tensor_framework) framework == tensor_framework::numpy) {
-                try {
-                    // Older numpy versions
-                    o = package.attr("_from_dlpack")(o);
-                } catch (...) {
-                    try {
-                        // Yet older numpy versions
-                        o = package.attr("asarray")(o);
-                    } catch (...) {
-                        return nullptr;
-                    }
-                }
-            } else {
-                return nullptr;
-            }
-        }
-    }
-
-    return o.release().ptr();
-}
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/trampoline.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/trampoline.cpp
deleted file mode 100644
index 07ccabbf7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanobind/src/trampoline.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    src/trampoline.cpp: support for overriding virtual functions in Python
-
-    Copyright (c) 2022 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#include <nanobind/trampoline.h>
-#include "nb_internals.h"
-
-NAMESPACE_BEGIN(NB_NAMESPACE)
-NAMESPACE_BEGIN(detail)
-
-void trampoline_new(void **data, size_t size, void *ptr,
-                    const std::type_info *cpp_type) noexcept {
-    // GIL is held when the trampoline constructor runs
-    nb_internals &internals = internals_get();
-    auto it = internals.inst_c2p.find(
-        std::pair<void *, std::type_index>(ptr, *cpp_type));
-    if (it == internals.inst_c2p.end())
-        fail("nanobind::detail::trampoline_new(): instance not found!");
-
-    data[0] = it->second;
-    memset(data + 1, 0, sizeof(void *) * 2 * size);
-}
-
-void trampoline_release(void **data, size_t size) noexcept {
-    // GIL is held when the trampoline destructor runs
-    for (size_t i = 0; i < size; ++i)
-        Py_XDECREF((PyObject *) data[i*2 + 2]);
-}
-
-PyObject *trampoline_lookup(void **data, size_t size, const char *name,
-                            bool pure) {
-    const PyObject *None = Py_None;
-
-    current_method cm = current_method_data;
-    if (cm.self == data[0] && (cm.name == name || strcmp(cm.name, name) == 0))
-        return nullptr;
-
-    // First quick sweep without lock
-    for (size_t i = 0; i < size; i++) {
-        void *d_name  = data[2*i + 1],
-             *d_value = data[2*i + 2];
-        if (name == d_name && d_value)
-            return d_value != None ? (PyObject *) d_value : nullptr;
-    }
-
-    PyGILState_STATE state = PyGILState_Ensure();
-
-    // Nothing found -- retry, now with lock held
-    for (size_t i = 0; i < size; i++) {
-        void *d_name  = data[2*i + 1],
-             *d_value = data[2*i + 2];
-        if (name == d_name && d_value) {
-            PyGILState_Release(state);
-            return d_value != None ? (PyObject *) d_value : nullptr;
-        }
-    }
-
-    // Sill no luck -- perform a lookup and populate the trampoline
-    const char *error = nullptr;
-    PyTypeObject *value_tp = nullptr;
-
-    size_t offset = 0;
-    for (; offset < size; offset++) {
-        if (data[2 * offset + 1] == nullptr &&
-            data[2 * offset + 2] == nullptr)
-            break;
-    }
-
-    nb_internals &internals = internals_get();
-    PyObject *key = nullptr, *value = nullptr;
-
-    if (offset == size) {
-        error = "the trampoline ran out of slots (you will need to increase "
-                "the value provided to the NB_TRAMPOLINE() macro)";
-        goto fail;
-    }
-
-    key = PyUnicode_InternFromString(name);
-    if (!key) {
-        error = "could not intern string";
-        goto fail;
-    }
-
-    value = PyObject_GetAttr((PyObject *) data[0], key);
-    if (!value) {
-        error = "lookup failed";
-        goto fail;
-    }
-
-    value_tp = Py_TYPE(value);
-    Py_CLEAR(value);
-
-    if (value_tp == internals.nb_func || value_tp == internals.nb_method ||
-        value_tp == internals.nb_bound_method) {
-        if (pure) {
-            error = "tried to call a pure virtual function";
-            goto fail;
-        }
-
-        Py_DECREF(key);
-        key = Py_None;
-        Py_INCREF(Py_None);
-    }
-
-    data[2 * offset + 1] = (void *) name;
-    data[2 * offset + 2] = key;
-
-    PyGILState_Release(state);
-    return key != None ? (PyObject *) key : nullptr;
-
-fail:
-    type_data *t = nb_type_data(Py_TYPE((PyObject *) data[0]));
-    PyGILState_Release(state);
-
-    raise("nanobind::detail::get_trampoline('%s::%s()'): %s!",
-          t->name, name, error);
-}
-
-NAMESPACE_END(detail)
-NAMESPACE_END(NB_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/nanozlib.h b/contrib/tinyusdz/tinyusdz_repo/src/external/nanozlib.h
deleted file mode 100644
index 468cb94ed..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/nanozlib.h
+++ /dev/null
@@ -1,473 +0,0 @@
-/* SPDX-License-Identifier: Apache 2.0 */
-/* Copyright 2023 - Present, Light Transport Entertainment Inc. */
-
-/* TODO:
- *
- * - [ ] Stream decoding API
- * - [ ] Stream encoding API
- *
- */
-
-#ifndef NANOZLIB_H_
-#define NANOZLIB_H_
-
-#include <stdint.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum nanoz_status {
-  NANOZ_SUCCESS = 0,
-  NANOZ_ERROR = -1,  // general error code.
-  NANOZ_ERROR_INVALID_ARGUMENT = -2,
-  NANOZ_ERROR_CORRUPTED = -3,
-  NANOZ_ERROR_INTERNAL = -4,
-} nanoz_status_t;
-
-#if 0  // TODO
-/* Up to 2GB chunk. */
-typedef (*nanoz_stream_read)(const uint8_t *addr, uint8_t *dst_addr, const uint32_t read_bytes, const void *user_ptr);
-typedef (*nanoz_stream_write)(const uint8_t *addr, const uint32_t write_bytes, const void *user_ptr);
-#endif
-
-/* TODO: Get uncompressed size function */
-
-/*
- * zlib decompression. Up to 2GB compressed data.
- *
- * @param[in] src_addr Source buffer address containing compressed data.
- * @param[in] src_size Source buffer bytes.
- * @param[in] dst_size Destination buffer size. Must be larger than or equal to uncompressed size.
- * @param[out] dst_addr Destination buffer address.
- * @param[out] uncompressed_size Uncompressed bytes.
- * contain `uncompressed_size` bytes.
- * @return NANOZ_SUCCESS upon success.
- *
- * TODO: return error message string.
- */
-nanoz_status_t nanoz_uncompress(const unsigned char *src_addr,
-                                int32_t src_size,
-                                const uint64_t dst_size,
-                                unsigned char *dst_addr,
-                                uint64_t *uncompressed_size);
-
-/*
- * Compute compress bound.
- */
-uint64_t nanoz_compressBound(uint64_t sourceLen);
-
-/*
- * zlib compression. Currently we use stb's zlib_compress
- *
- * @param[in] data Input data
- * @param[in] data_len Input data bytes(up to 2GB)
- * @param[out] out_len Input data
- * @param[in] quality Compression quality(5 or more. Usually 8)
- *
- * @return Compressed bytes upon success. NULL when failed to compress or any input parameter is wrong.
- */
-unsigned char *nanoz_compress(unsigned char *data, int data_len, int *out_len,
-                              int quality);
-
-#if 0  // TODO
-nanoz_status_t nanoz_stream_uncompress(nanoz_stream_read *reader, nanoz_stream_writer *writer);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#if defined(NANOZLIB_IMPLEMENTATION)
-
-#define WUFFS_IMPLEMENTATION
-
-#define WUFFS_CONFIG__STATIC_FUNCTIONS
-
-#define WUFFS_CONFIG__MODULES
-#define WUFFS_CONFIG__MODULE__BASE
-#define WUFFS_CONFIG__MODULE__CRC32
-#define WUFFS_CONFIG__MODULE__ADLER32
-#define WUFFS_CONFIG__MODULE__DEFLATE
-#define WUFFS_CONFIG__MODULE__ZLIB
-
-// Use wuffs-unsupported-snapshot.c
-#include "wuffs-unsupported-snapshot.c"
-//#include "wuffs-v0.3.c"
-
-#define WORK_BUFFER_ARRAY_SIZE \
-  WUFFS_ZLIB__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE
-
-nanoz_status_t nanoz_uncompress(const unsigned char *src_addr,
-                                const int32_t src_size,
-                                const uint64_t dst_size,
-                                unsigned char *dst_addr,
-                                uint64_t *uncompressed_size_out) {
-// WUFFS_ZLIB__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE = 1, its tiny bytes and
-// safe to alloc worbuf at heap location.
-#if WORK_BUFFER_ARRAY_SIZE > 0
-  uint8_t work_buffer_array[WORK_BUFFER_ARRAY_SIZE];
-#else
-  // Not all C/C++ compilers support 0-length arrays.
-  uint8_t work_buffer_array[1];
-#endif
-
-  if (!src_addr) {
-    return NANOZ_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (src_size < 4) {
-    return NANOZ_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (!dst_addr) {
-    return NANOZ_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (dst_size < 1) {
-    return NANOZ_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (!uncompressed_size_out) {
-    return NANOZ_ERROR_INVALID_ARGUMENT;
-  }
-
-  wuffs_zlib__decoder dec;
-  wuffs_base__status status =
-      wuffs_zlib__decoder__initialize(&dec, sizeof dec, WUFFS_VERSION, 0);
-  if (!wuffs_base__status__is_ok(&status)) {
-    // wuffs_base__status__message(&status);
-    return NANOZ_ERROR_INTERNAL;
-  }
-
-  // TODO: Streamed decoding?
-
-  wuffs_base__io_buffer dst;
-  dst.data.ptr = dst_addr;
-  dst.data.len = dst_size;
-  dst.meta.wi = 0;
-  dst.meta.ri = 0;
-  dst.meta.pos = 0;
-  dst.meta.closed = false;
-
-  wuffs_base__io_buffer src;
-  src.data.ptr = const_cast<uint8_t *>(src_addr);  // remove const
-  src.data.len = src_size;
-  src.meta.wi = src_size;
-  src.meta.ri = 0;
-  src.meta.pos = 0;
-  src.meta.closed = false;
-
-  status = wuffs_zlib__decoder__transform_io(
-      &dec, &dst, &src,
-      wuffs_base__make_slice_u8(work_buffer_array, WORK_BUFFER_ARRAY_SIZE));
-
-  uint64_t uncompressed_size{0};
-
-  if (dst.meta.wi) {
-    dst.meta.ri = dst.meta.wi;
-    uncompressed_size = dst.meta.wi;
-    wuffs_base__io_buffer__compact(&dst);
-  }
-
-  if (status.repr == wuffs_base__suspension__short_read) {
-    // ok
-  } else if (status.repr == wuffs_base__suspension__short_write) {
-    // read&write should succeed at once.
-    return NANOZ_ERROR_CORRUPTED;
-  }
-
-  const char *stat_msg = wuffs_base__status__message(&status);
-  if (stat_msg) {
-    return NANOZ_ERROR_INTERNAL;
-  }
-
-  (*uncompressed_size_out) = uncompressed_size;
-
-  return NANOZ_SUCCESS;
-}
-
-#ifndef NANOZ_MALLOC
-#define NANOZ_MALLOC(sz) malloc(sz)
-#define NANOZ_REALLOC(p, newsz) realloc(p, newsz)
-#define NANOZ_FREE(p) free(p)
-#endif
-
-#ifndef NANOZ_REALLOC_SIZED
-#define NANOZ_REALLOC_SIZED(p, oldsz, newsz) NANOZ_REALLOC(p, newsz)
-#endif
-
-#ifndef NANOZ_MEMMOVE
-#define NANOZ_MEMMOVE(a, b, sz) memmove(a, b, sz)
-#endif
-
-#define NANOZ_UCHAR(x) (unsigned char)((x)&0xff)
-
-// #ifndef NANOZ_ZLIB_COMPRESS
-//  stretchy buffer; nanoz__sbpush() == vector<>::push_back() --
-//  nanoz__sbcount() == vector<>::size()
-#define nanoz__sbraw(a) ((int *)(void *)(a)-2)
-#define nanoz__sbm(a) nanoz__sbraw(a)[0]
-#define nanoz__sbn(a) nanoz__sbraw(a)[1]
-
-#define nanoz__sbneedgrow(a, n) ((a) == 0 || nanoz__sbn(a) + n >= nanoz__sbm(a))
-#define nanoz__sbmaybegrow(a, n) \
-  (nanoz__sbneedgrow(a, (n)) ? nanoz__sbgrow(a, n) : 0)
-#define nanoz__sbgrow(a, n) nanoz__sbgrowf((void **)&(a), (n), sizeof(*(a)))
-
-#define nanoz__sbpush(a, v) \
-  (nanoz__sbmaybegrow(a, 1), (a)[nanoz__sbn(a)++] = (v))
-#define nanoz__sbcount(a) ((a) ? nanoz__sbn(a) : 0)
-#define nanoz__sbfree(a) ((a) ? NANOZ_FREE(nanoz__sbraw(a)), 0 : 0)
-
-static void *nanoz__sbgrowf(void **arr, int increment, int itemsize) {
-  int m = *arr ? 2 * nanoz__sbm(*arr) + increment : increment + 1;
-  void *p = NANOZ_REALLOC_SIZED(
-      *arr ? nanoz__sbraw(*arr) : 0,
-      *arr ? (nanoz__sbm(*arr) * itemsize + sizeof(int) * 2) : 0,
-      itemsize * m + sizeof(int) * 2);
-  if (!p) {
-    return nullptr;
-  }
-
-  if (p) {
-    if (!*arr) ((int *)p)[1] = 0;
-    *arr = (void *)((int *)p + 2);
-    nanoz__sbm(*arr) = m;
-  }
-  return *arr;
-}
-
-static unsigned char *nanoz__zlib_flushf(unsigned char *data,
-                                         unsigned int *bitbuffer,
-                                         int *bitcount) {
-  while (*bitcount >= 8) {
-    nanoz__sbpush(data, NANOZ_UCHAR(*bitbuffer));
-    *bitbuffer >>= 8;
-    *bitcount -= 8;
-  }
-  return data;
-}
-
-static int nanoz__zlib_bitrev(int code, int codebits) {
-  int res = 0;
-  while (codebits--) {
-    res = (res << 1) | (code & 1);
-    code >>= 1;
-  }
-  return res;
-}
-
-static unsigned int nanoz__zlib_countm(unsigned char *a, unsigned char *b,
-                                       int limit) {
-  int i;
-  for (i = 0; i < limit && i < 258; ++i)
-    if (a[i] != b[i]) break;
-  return i;
-}
-
-static unsigned int nanoz__zhash(unsigned char *data) {
-  uint32_t hash = data[0] + (data[1] << 8) + (data[2] << 16);
-  hash ^= hash << 3;
-  hash += hash >> 5;
-  hash ^= hash << 4;
-  hash += hash >> 17;
-  hash ^= hash << 25;
-  hash += hash >> 6;
-  return hash;
-}
-
-#define nanoz__zlib_flush() (out = nanoz__zlib_flushf(out, &bitbuf, &bitcount))
-#define nanoz__zlib_add(code, codebits) \
-  (bitbuf |= (code) << bitcount, bitcount += (codebits), nanoz__zlib_flush())
-#define nanoz__zlib_huffa(b, c) nanoz__zlib_add(nanoz__zlib_bitrev(b, c), c)
-// default huffman tables
-#define nanoz__zlib_huff1(n) nanoz__zlib_huffa(0x30 + (n), 8)
-#define nanoz__zlib_huff2(n) nanoz__zlib_huffa(0x190 + (n)-144, 9)
-#define nanoz__zlib_huff3(n) nanoz__zlib_huffa(0 + (n)-256, 7)
-#define nanoz__zlib_huff4(n) nanoz__zlib_huffa(0xc0 + (n)-280, 8)
-#define nanoz__zlib_huff(n)            \
-  ((n) <= 143   ? nanoz__zlib_huff1(n) \
-   : (n) <= 255 ? nanoz__zlib_huff2(n) \
-   : (n) <= 279 ? nanoz__zlib_huff3(n) \
-                : nanoz__zlib_huff4(n))
-#define nanoz__zlib_huffb(n) \
-  ((n) <= 143 ? nanoz__zlib_huff1(n) : nanoz__zlib_huff2(n))
-
-#define nanoz__ZHASH 16384
-
-// #endif // NANOZ_ZLIB_COMPRESS
-
-unsigned char *nanoz_compress(unsigned char *data, int data_len, int *out_len,
-                              int quality) {
-  static unsigned short lengthc[] = {
-      3,  4,  5,  6,  7,  8,  9,  10, 11,  13,  15,  17,  19,  23,  27,
-      31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 259};
-  static unsigned char lengtheb[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
-                                     1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
-                                     4, 4, 4, 4, 5, 5, 5, 5, 0};
-  static unsigned short distc[] = {
-      1,    2,    3,    4,    5,    7,     9,     13,    17,   25,   33,
-      49,   65,   97,   129,  193,  257,   385,   513,   769,  1025, 1537,
-      2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 32768};
-  static unsigned char disteb[] = {0, 0, 0,  0,  1,  1,  2,  2,  3,  3,
-                                   4, 4, 5,  5,  6,  6,  7,  7,  8,  8,
-                                   9, 9, 10, 10, 11, 11, 12, 12, 13, 13};
-  unsigned int bitbuf = 0;
-  int i, j, bitcount = 0;
-  unsigned char *out = NULL;
-
-  if (!data) {
-    return NULL;
-  }
-
-  if (data_len < 1) {
-    return NULL;
-  }
-
-  if (!out_len) {
-    return NULL;
-  }
-
-  unsigned char ***hash_table =
-      (unsigned char ***)NANOZ_MALLOC(nanoz__ZHASH * sizeof(unsigned char **));
-  if (hash_table == NULL) return NULL;
-  if (quality < 5) quality = 5;
-
-  nanoz__sbpush(out, 0x78);  // DEFLATE 32K window
-  nanoz__sbpush(out, 0x5e);  // FLEVEL = 1
-  nanoz__zlib_add(1, 1);     // BFINAL = 1
-  nanoz__zlib_add(1, 2);     // BTYPE = 1 -- fixed huffman
-
-  for (i = 0; i < nanoz__ZHASH; ++i) hash_table[i] = NULL;
-
-  i = 0;
-  while (i < data_len - 3) {
-    // hash next 3 bytes of data to be compressed
-    int h = nanoz__zhash(data + i) & (nanoz__ZHASH - 1), best = 3;
-    unsigned char *bestloc = 0;
-    unsigned char **hlist = hash_table[h];
-    int n = nanoz__sbcount(hlist);
-    for (j = 0; j < n; ++j) {
-      if (hlist[j] - data > i - 32768) {  // if entry lies within window
-        int d = nanoz__zlib_countm(hlist[j], data + i, data_len - i);
-        if (d >= best) {
-          best = d;
-          bestloc = hlist[j];
-        }
-      }
-    }
-    // when hash table entry is too long, delete half the entries
-    if (hash_table[h] && nanoz__sbn(hash_table[h]) == 2 * quality) {
-      NANOZ_MEMMOVE(hash_table[h], hash_table[h] + quality,
-                    sizeof(hash_table[h][0]) * quality);
-      nanoz__sbn(hash_table[h]) = quality;
-    }
-    nanoz__sbpush(hash_table[h], data + i);
-
-    if (bestloc) {
-      // "lazy matching" - check match at *next* byte, and if it's better, do
-      // cur byte as literal
-      h = nanoz__zhash(data + i + 1) & (nanoz__ZHASH - 1);
-      hlist = hash_table[h];
-      n = nanoz__sbcount(hlist);
-      for (j = 0; j < n; ++j) {
-        if (hlist[j] - data > i - 32767) {
-          int e = nanoz__zlib_countm(hlist[j], data + i + 1, data_len - i - 1);
-          if (e > best) {  // if next match is better, bail on current match
-            bestloc = NULL;
-            break;
-          }
-        }
-      }
-    }
-
-    if (bestloc) {
-      int d = (int)(data + i - bestloc);  // distance back
-      // NANOZ_ASSERT(d <= 32767 && best <= 258);
-      if (d <= 32767 && best <= 258) {
-        // OK
-      } else {
-        return NULL;  // FIXME: may leak
-      }
-      for (j = 0; best > lengthc[j + 1] - 1; ++j)
-        ;
-      nanoz__zlib_huff(j + 257);
-      if (lengtheb[j]) nanoz__zlib_add(best - lengthc[j], lengtheb[j]);
-      for (j = 0; d > distc[j + 1] - 1; ++j)
-        ;
-      nanoz__zlib_add(nanoz__zlib_bitrev(j, 5), 5);
-      if (disteb[j]) nanoz__zlib_add(d - distc[j], disteb[j]);
-      i += best;
-    } else {
-      nanoz__zlib_huffb(data[i]);
-      ++i;
-    }
-  }
-  // write out final bytes
-  for (; i < data_len; ++i) nanoz__zlib_huffb(data[i]);
-  nanoz__zlib_huff(256);  // end of block
-  // pad with 0 bits to byte boundary
-  while (bitcount) nanoz__zlib_add(0, 1);
-
-  for (i = 0; i < nanoz__ZHASH; ++i) (void)nanoz__sbfree(hash_table[i]);
-  NANOZ_FREE(hash_table);
-
-  // store uncompressed instead if compression was worse
-  if (nanoz__sbn(out) > data_len + 2 + ((data_len + 32766) / 32767) * 5) {
-    nanoz__sbn(out) = 2;  // truncate to DEFLATE 32K window and FLEVEL = 1
-    for (j = 0; j < data_len;) {
-      int blocklen = data_len - j;
-      if (blocklen > 32767) blocklen = 32767;
-      nanoz__sbpush(
-          out,
-          data_len - j == blocklen);  // BFINAL = ?, BTYPE = 0 -- no compression
-      nanoz__sbpush(out, NANOZ_UCHAR(blocklen));  // LEN
-      nanoz__sbpush(out, NANOZ_UCHAR(blocklen >> 8));
-      nanoz__sbpush(out, NANOZ_UCHAR(~blocklen));  // NLEN
-      nanoz__sbpush(out, NANOZ_UCHAR(~blocklen >> 8));
-      memcpy(out + nanoz__sbn(out), data + j, blocklen);
-      nanoz__sbn(out) += blocklen;
-      j += blocklen;
-    }
-  }
-
-  {
-    // compute adler32 on input
-    unsigned int s1 = 1, s2 = 0;
-    int blocklen = (int)(data_len % 5552);
-    j = 0;
-    while (j < data_len) {
-      for (i = 0; i < blocklen; ++i) {
-        s1 += data[j + i];
-        s2 += s1;
-      }
-      s1 %= 65521;
-      s2 %= 65521;
-      j += blocklen;
-      blocklen = 5552;
-    }
-    nanoz__sbpush(out, NANOZ_UCHAR(s2 >> 8));
-    nanoz__sbpush(out, NANOZ_UCHAR(s2));
-    nanoz__sbpush(out, NANOZ_UCHAR(s1 >> 8));
-    nanoz__sbpush(out, NANOZ_UCHAR(s1));
-  }
-  *out_len = nanoz__sbn(out);
-  // make returned pointer freeable
-  NANOZ_MEMMOVE(nanoz__sbraw(out), out, *out_len);
-  return (unsigned char *)nanoz__sbraw(out);
-}
-
-// from zlib
-uint64_t nanoz_compressBound(uint64_t sourceLen)
-{
-  // TODO: Overflow check?
-  return sourceLen + (sourceLen >> 12ull) + (sourceLen >> 14ull) +
-         (sourceLen >> 25ull) + 13ull;
-}
-
-
-#endif  // NANOZDEC_IMPLEMENTATION
-
-#endif /* NANOZDEC_H_ */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/ogt_vox.h b/contrib/tinyusdz/tinyusdz_repo/src/external/ogt_vox.h
deleted file mode 100644
index c432213d9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/ogt_vox.h
+++ /dev/null
@@ -1,2411 +0,0 @@
-/*
-    opengametools vox file reader/writer - v0.6 - MIT license - Justin Paver, Oct 2019
-
-    This is a single-header-file library that provides easy-to-use
-    support for reading MagicaVoxel .vox files into structures that
-    are easy to dereference and extract information from. It also
-    supports writing back out to .vox file from those structures.
-
-    Please see the MIT license information at the end of this file.
-
-    Also, please consider sharing any improvements you make.
-
-    For more information and more tools, visit:
-      https://github.com/jpaver/opengametools
-
-    HOW TO COMPILE THIS LIBRARY
-
-    1.  To compile this library, do this in *one* C or C++ file:
-        #define OGT_VOX_IMPLEMENTATION
-        #include "ogt_vox.h"
-
-    2. From any other module, it is sufficient to just #include this as usual:
-        #include "ogt_vox.h"
-
-    HOW TO READ A VOX SCENE (See demo_vox.cpp)
-
-    1. load a .vox file off disk into a memory buffer.
-
-    2. construct a scene from the memory buffer:
-       ogt_vox_scene* scene = ogt_vox_read_scene(buffer, buffer_size);
-
-    3. use the scene members to extract the information you need. eg.
-       printf("# of layers: %u\n", scene->num_layers );
-
-    4. destroy the scene:
-       ogt_vox_destroy_scene(scene);
-
-    HOW TO MERGE MULTIPLE VOX SCENES (See merge_vox.cpp)
-
-    1. construct multiple scenes from files you want to merge.
-
-        // read buffer1/buffer_size1 from "test1.vox"
-        // read buffer2/buffer_size2 from "test2.vox"
-        // read buffer3/buffer_size3 from "test3.vox"
-        ogt_vox_scene* scene1 = ogt_vox_read_scene(buffer1, buffer_size1);
-        ogt_vox_scene* scene2 = ogt_vox_read_scene(buffer2, buffer_size2);
-        ogt_vox_scene* scene3 = ogt_vox_read_scene(buffer3, buffer_size3);
-
-    2. construct a merged scene
-
-        const ogt_vox_scene* scenes[] = {scene1, scene2, scene3};
-        ogt_vox_scene* merged_scene = ogt_vox_merge_scenes(scenes, 3, NULL, 0);
-
-    3. save out the merged scene
-
-        uint8_t* out_buffer = ogt_vox_write_scene(merged_scene, &out_buffer_size);
-        // save out_buffer to disk as a .vox file (it has length out_buffer_size)
-
-    4. destroy the merged scene:
-
-        ogt_vox_destroy_scene(merged_scene);
-
-    EXPLANATION OF SCENE ELEMENTS:
-
-    A ogt_vox_scene comprises primarily a set of instances, models, layers and a palette.
-
-    A ogt_vox_palette contains a set of 256 colors that is used for the scene.
-    Each color is represented by a 4-tuple called an ogt_vox_rgba which contains red,
-    green, blue and alpha values for the color.
-
-    A ogt_vox_model is a 3-dimensional grid of voxels, where each of those voxels
-    is represented by an 8-bit color index. Voxels are arranged in order of increasing
-    X then increasing Y then increasing Z.
-
-    Given the x,y,z values for a voxel within the model dimensions, the voxels index
-    in the grid can be obtained as follows:
-
-        voxel_index = x + (y * model->size_x) + (z * model->size_x * model->size_y)
-
-    The index is only valid if the coordinate x,y,z satisfy the following conditions:
-            0 <= x < model->size_x -AND-
-            0 <= y < model->size_y -AND-
-            0 <= z < model->size_z
-
-    A voxels color index can be obtained as follows:
-
-        uint8_t color_index = model->voxel_data[voxel_index];
-
-    If color_index == 0, the voxel is not solid and can be skipped,
-    If color_index != 0, the voxel is solid and can be used to lookup the color in the palette:
-
-        ogt_vox_rgba color = scene->palette.color[ color_index]
-
-    A ogt_vox_instance is an individual placement of a voxel model within the scene. Each
-    instance has a transform that determines its position and orientation within the scene,
-    but it also has an index that specifies which model the instance uses for its shape. It
-    is expected that there is a many-to-one mapping of instances to models.
-
-    An ogt_vox_layer is used to conceptually group instances. Each instance indexes the
-    layer that it belongs to, but the layer itself has its own name and hidden/shown state.
-
-    EXPLANATION OF MERGED SCENES:
-
-    A merged scene contains all the models and all the scene instances from
-    each of the scenes that were passed into it.
-
-    The merged scene will have a combined palette of all the source scene
-    palettes by trying to match existing colors exactly, and falling back
-    to an RGB-distance matched color when all 256 colors in the merged
-    scene palette has been allocated.
-
-    You can explicitly control up to 255 merge palette colors by providing
-    those colors to ogt_vox_merge_scenes in the required_colors parameters eg.
-
-        const ogt_vox_palette palette;  // load this via .vox or procedurally or whatever
-        const ogt_vox_scene* scenes[] = {scene1, scene2, scene3};
-        // palette.color[0] is always the empty color which is why we pass 255 colors starting from index 1 only:
-        ogt_vox_scene* merged_scene = ogt_vox_merge_scenes(scenes, 3, &palette.color[1], 255);
-
-    EXPLANATION OF MODEL PIVOTS
-
-    If a voxel model grid has dimension size.xyz in terms of number of voxels, the centre pivot
-    for that model is located at floor( size.xyz / 2).
-
-    eg. for a 3x4x1 voxel model, the pivot would be at (1,2,0), or the X in the below ascii art.
-
-           4 +-----+-----+-----+
-             |  .  |  .  |  .  |
-           3 +-----+-----+-----+
-             |  .  |  .  |  .  |
-           2 +-----X-----+-----+
-             |  .  |  .  |  .  |
-           1 +-----+-----+-----+
-             |  .  |  .  |  .  |
-           0 +-----+-----+-----+
-             0     1     2     3
-
-     An example model in this grid form factor might look like this:
-
-           4 +-----+-----+-----+
-             |  .  |  .  |  .  |
-           3 +-----+-----+-----+
-                   |  .  |
-           2       X-----+
-                   |  .  |
-           1       +-----+
-                   |  .  |
-           0       +-----+
-             0     1     2     3
-
-     If you were to generate a mesh from this, clearly each vertex and each face would be on an integer
-     coordinate eg. 1, 2, 3 etc. while the centre of each grid location (ie. the . in the above diagram)
-     will be on a coordinate that is halfway between integer coordinates. eg. 1.5, 2.5, 3.5 etc.
-
-     To ensure your mesh is properly centered such that instance transforms are correctly applied, you
-     want the pivot to be treated as if it were (0,0,0) in model space. To achieve this, simply
-     subtract the pivot from any geometry that is generated (eg. vertices in a mesh).
-
-     For the 3x4x1 voxel model above, doing this would look like this:
-
-           2 +-----+-----+-----+
-             |  .  |  .  |  .  |
-           1 +-----+-----+-----+
-                   |  .  |
-           0       X-----+
-                   |  .  |
-          -1       +-----+
-                   |  .  |
-          -2       +-----+
-            -1     0     1     2
-
-
-*/
-
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-#ifndef OGT_VOX_H__
-#define OGT_VOX_H__
-
-#if _MSC_VER == 1400
-    // VS2005 doesn't have inttypes or stdint so we just define what we need here.
-    typedef unsigned char uint8_t;
-    typedef signed int    int32_t;
-    typedef unsigned int  uint32_t;
-	#ifndef UINT32_MAX
-		#define UINT32_MAX	((uint32_t)0xFFFFFFFF)
-	#endif
-	#ifndef INT32_MAX
-		#define INT32_MAX	((int32_t)0x7FFFFFFF)
-	#endif
-	#ifndef UINT8_MAX
-		#define UINT8_MAX	((uint8_t)0xFF)
-	#endif
-#elif defined(_MSC_VER)
-    // general VS*
-    #include <inttypes.h>
-#elif __APPLE__
-    // general Apple compiler
-#elif defined(__GNUC__)
-    // any GCC*
-    #include <inttypes.h>
-    #include <stdlib.h> // for size_t
-#else
-    #error some fixup needed for this platform?
-#endif
-
-    // denotes an invalid group index. Usually this is only applicable to the scene's root group's parent.
-    static const uint32_t k_invalid_group_index = UINT32_MAX;
-
-    // color
-    typedef struct ogt_vox_rgba
-    {
-        uint8_t r,g,b,a;            // red, green, blue and alpha components of a color.
-    } ogt_vox_rgba;
-
-    // column-major 4x4 matrix
-    typedef struct ogt_vox_transform
-    {
-        float m00, m01, m02, m03;   // column 0 of 4x4 matrix, 1st three elements = x axis vector, last element always 0.0
-        float m10, m11, m12, m13;   // column 1 of 4x4 matrix, 1st three elements = y axis vector, last element always 0.0
-        float m20, m21, m22, m23;   // column 2 of 4x4 matrix, 1st three elements = z axis vector, last element always 0.0
-        float m30, m31, m32, m33;   // column 3 of 4x4 matrix. 1st three elements = translation vector, last element always 1.0
-    } ogt_vox_transform;
-
-    // a palette of colors
-    typedef struct ogt_vox_palette
-    {
-        ogt_vox_rgba color[256];      // palette of colors. use the voxel indices to lookup color from the palette.
-    } ogt_vox_palette;
-
-    // Extended Material Chunk MATL types
-    enum ogt_matl_type
-    {
-        ogt_matl_type_diffuse = 0, // diffuse is default
-        ogt_matl_type_metal   = 1,
-        ogt_matl_type_glass   = 2,
-        ogt_matl_type_emit    = 3,
-        ogt_matl_type_blend   = 4,
-        ogt_matl_type_media   = 5,
-    };
-
-    // Content Flags for ogt_vox_matl values for a given material
-    static const uint32_t k_ogt_vox_matl_have_metal  = 1 << 0;
-    static const uint32_t k_ogt_vox_matl_have_rough  = 1 << 1;
-    static const uint32_t k_ogt_vox_matl_have_spec   = 1 << 2;
-    static const uint32_t k_ogt_vox_matl_have_ior    = 1 << 3;
-    static const uint32_t k_ogt_vox_matl_have_att    = 1 << 4;
-    static const uint32_t k_ogt_vox_matl_have_flux   = 1 << 5;
-    static const uint32_t k_ogt_vox_matl_have_emit   = 1 << 6;
-    static const uint32_t k_ogt_vox_matl_have_ldr    = 1 << 7;
-    static const uint32_t k_ogt_vox_matl_have_trans  = 1 << 8;
-    static const uint32_t k_ogt_vox_matl_have_alpha  = 1 << 9;
-    static const uint32_t k_ogt_vox_matl_have_d      = 1 << 10;
-    static const uint32_t k_ogt_vox_matl_have_sp     = 1 << 11;
-    static const uint32_t k_ogt_vox_matl_have_g      = 1 << 12;
-    static const uint32_t k_ogt_vox_matl_have_media  = 1 << 13;
-
-    // Extended Material Chunk MATL information
-    typedef struct ogt_vox_matl
-    {
-        uint32_t      content_flags; // set of k_ogt_vox_matl_* OR together to denote contents available
-        ogt_matl_type type;
-        float         metal;
-        float         rough;
-        float         spec;
-        float         ior;
-        float         att;
-        float         flux;
-        float         emit;
-        float         ldr;
-        float         trans;
-        float         alpha;
-        float         d;
-        float         sp;
-        float         g;
-        float         media;
-
-    } ogt_vox_matl;
-
-    // Extended Material Chunk MATL array of materials
-    typedef struct ogt_vox_matl_array
-    {
-        ogt_vox_matl matl[256];      // extended material information from Material Chunk MATL
-    } ogt_vox_matl_array;
-
-    // a 3-dimensional model of voxels
-    typedef struct ogt_vox_model
-    {
-        uint32_t       size_x;        // number of voxels in the local x dimension
-        uint32_t       size_y;        // number of voxels in the local y dimension
-        uint32_t       size_z;        // number of voxels in the local z dimension
-        uint32_t       voxel_hash;    // hash of the content of the grid.
-        const uint8_t* voxel_data;    // grid of voxel data comprising color indices in x -> y -> z order. a color index of 0 means empty, all other indices mean solid and can be used to index the scene's palette to obtain the color for the voxel.
-    } ogt_vox_model;
-
-    // an instance of a model within the scene
-    typedef struct ogt_vox_instance
-    {
-        const char*       name;         // name of the instance if there is one, will be NULL otherwise.
-        ogt_vox_transform transform;    // orientation and position of this instance within the scene. This is relative to its group local transform if group_index is not 0
-        uint32_t          model_index;  // index of the model used by this instance. used to lookup the model in the scene's models[] array.
-        uint32_t          layer_index;  // index of the layer used by this instance. used to lookup the layer in the scene's layers[] array.
-        uint32_t          group_index;  // this will be the index of the group in the scene's groups[] array. If group is zero it will be the scene root group and the instance transform will be a world-space transform, otherwise the transform is relative to the group.
-        bool              hidden;       // whether this instance is individually hidden or not. Note: the instance can also be hidden when its layer is hidden, or if it belongs to a group that is hidden.
-    } ogt_vox_instance;
-
-    // describes a layer within the scene
-    typedef struct ogt_vox_layer
-    {
-        const char* name;               // name of this layer if there is one, will be NULL otherwise.
-        bool        hidden;             // whether this layer is hidden or not.
-    } ogt_vox_layer;
-
-    // describes a group within the scene
-    typedef struct ogt_vox_group
-    {
-        ogt_vox_transform transform;            // transform of this group relative to its parent group (if any), otherwise this will be relative to world-space.
-        uint32_t          parent_group_index;   // if this group is parented to another group, this will be the index of its parent in the scene's groups[] array, otherwise this group will be the scene root group and this value will be k_invalid_group_index
-        uint32_t          layer_index;          // which layer this group belongs to. used to lookup the layer in the scene's layers[] array.
-        bool              hidden;               // whether this group is hidden or not.
-    } ogt_vox_group;
-
-    // the scene parsed from a .vox file.
-    typedef struct ogt_vox_scene
-    {
-        uint32_t                num_models;     // number of models within the scene.
-        uint32_t                num_instances;  // number of instances in the scene
-        uint32_t                num_layers;     // number of layers in the scene
-        uint32_t                num_groups;     // number of groups in the scene
-        const ogt_vox_model**   models;         // array of models. size is num_models
-        const ogt_vox_instance* instances;      // array of instances. size is num_instances
-        const ogt_vox_layer*    layers;         // array of layers. size is num_layers
-        const ogt_vox_group*    groups;         // array of groups. size is num_groups
-        ogt_vox_palette         palette;        // the palette for this scene
-        ogt_vox_matl_array      materials;      // the extended materials for this scene
-    } ogt_vox_scene;
-
-    // allocate memory function interface. pass in size, and get a pointer to memory with at least that size available.
-    typedef void* (*ogt_vox_alloc_func)(size_t size);
-
-    // free memory function interface. pass in a pointer previously allocated and it will be released back to the system managing memory.
-    typedef void  (*ogt_vox_free_func)(void* ptr);
-
-    // override the default scene memory allocator if you need to control memory precisely.
-    void  ogt_vox_set_memory_allocator(ogt_vox_alloc_func alloc_func, ogt_vox_free_func free_func);
-    void* ogt_vox_malloc(size_t size);
-    void  ogt_vox_free(void* mem);
-
-    // flags for ogt_vox_read_scene_with_flags
-    static const uint32_t k_read_scene_flags_groups = 1 << 0; // if not specified, all instance transforms will be flattened into world space. If specified, will read group information and keep all transforms as local transform relative to the group they are in.
-
-    // creates a scene from a vox file within a memory buffer of a given size.
-    // you can destroy the input buffer once you have the scene as this function will allocate separate memory for the scene objecvt.
-    const ogt_vox_scene* ogt_vox_read_scene(const uint8_t* buffer, uint32_t buffer_size);
-
-    // just like ogt_vox_read_scene, but you can additionally pass a union of k_read_scene_flags
-    const ogt_vox_scene* ogt_vox_read_scene_with_flags(const uint8_t* buffer, uint32_t buffer_size, uint32_t read_flags);
-
-    // destroys a scene object to release its memory.
-    void ogt_vox_destroy_scene(const ogt_vox_scene* scene);
-
-    // writes the scene to a new buffer and returns the buffer size. free the buffer with ogt_vox_free
-    uint8_t* ogt_vox_write_scene(const ogt_vox_scene* scene, uint32_t* buffer_size);
-
-    // merges the specified scenes together to create a bigger scene. Merged scene can be destroyed using ogt_vox_destroy_scene
-    // If you require specific colors in the merged scene palette, provide up to and including 255 of them via required_colors/required_color_count.
-    ogt_vox_scene* ogt_vox_merge_scenes(const ogt_vox_scene** scenes, uint32_t scene_count, const ogt_vox_rgba* required_colors, const uint32_t required_color_count);
-
-#endif // OGT_VOX_H__
-
-//-----------------------------------------------------------------------------------------------------------------
-//
-// If you're only interested in using this library, everything you need is above this point.
-// If you're interested in how this library works, everything you need is below this point.
-//
-//-----------------------------------------------------------------------------------------------------------------
-#ifdef OGT_VOX_IMPLEMENTATION
-    #include <assert.h>
-    #include <stdlib.h>
-    #include <string.h>
-    #include <stdio.h>
-
-    // MAKE_VOX_CHUNK_ID: used to construct a literal to describe a chunk in a .vox file.
-    #define MAKE_VOX_CHUNK_ID(c0,c1,c2,c3)     ( (c0<<0) | (c1<<8) | (c2<<16) | (c3<<24) )
-
-    static const uint32_t CHUNK_ID_VOX_ = MAKE_VOX_CHUNK_ID('V','O','X',' ');
-    static const uint32_t CHUNK_ID_MAIN = MAKE_VOX_CHUNK_ID('M','A','I','N');
-    static const uint32_t CHUNK_ID_SIZE = MAKE_VOX_CHUNK_ID('S','I','Z','E');
-    static const uint32_t CHUNK_ID_XYZI = MAKE_VOX_CHUNK_ID('X','Y','Z','I');
-    static const uint32_t CHUNK_ID_RGBA = MAKE_VOX_CHUNK_ID('R','G','B','A');
-    static const uint32_t CHUNK_ID_nTRN = MAKE_VOX_CHUNK_ID('n','T','R','N');
-    static const uint32_t CHUNK_ID_nGRP = MAKE_VOX_CHUNK_ID('n','G','R','P');
-    static const uint32_t CHUNK_ID_nSHP = MAKE_VOX_CHUNK_ID('n','S','H','P');
-    static const uint32_t CHUNK_ID_IMAP = MAKE_VOX_CHUNK_ID('I','M','A','P');
-    static const uint32_t CHUNK_ID_LAYR = MAKE_VOX_CHUNK_ID('L','A','Y','R');
-    static const uint32_t CHUNK_ID_MATL = MAKE_VOX_CHUNK_ID('M','A','T','L');
-    static const uint32_t CHUNK_ID_MATT = MAKE_VOX_CHUNK_ID('M','A','T','T');
-    static const uint32_t CHUNK_ID_rOBJ = MAKE_VOX_CHUNK_ID('r','O','B','J');
-
-    // Some older .vox files will not store a palette, in which case the following palette will be used!
-    static const uint8_t k_default_vox_palette[256 * 4] = {
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcc, 0xff, 0xff, 0xff, 0x99, 0xff, 0xff, 0xff, 0x66, 0xff, 0xff, 0xff, 0x33, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xcc, 0xff, 0xff, 0xff, 0xcc, 0xcc, 0xff,
-        0xff, 0xcc, 0x99, 0xff, 0xff, 0xcc, 0x66, 0xff, 0xff, 0xcc, 0x33, 0xff, 0xff, 0xcc, 0x00, 0xff, 0xff, 0x99, 0xff, 0xff, 0xff, 0x99, 0xcc, 0xff, 0xff, 0x99, 0x99, 0xff, 0xff, 0x99, 0x66, 0xff,
-        0xff, 0x99, 0x33, 0xff, 0xff, 0x99, 0x00, 0xff, 0xff, 0x66, 0xff, 0xff, 0xff, 0x66, 0xcc, 0xff, 0xff, 0x66, 0x99, 0xff, 0xff, 0x66, 0x66, 0xff, 0xff, 0x66, 0x33, 0xff, 0xff, 0x66, 0x00, 0xff,
-        0xff, 0x33, 0xff, 0xff, 0xff, 0x33, 0xcc, 0xff, 0xff, 0x33, 0x99, 0xff, 0xff, 0x33, 0x66, 0xff, 0xff, 0x33, 0x33, 0xff, 0xff, 0x33, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xcc, 0xff,
-        0xff, 0x00, 0x99, 0xff, 0xff, 0x00, 0x66, 0xff, 0xff, 0x00, 0x33, 0xff, 0xff, 0x00, 0x00, 0xff, 0xcc, 0xff, 0xff, 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0xff, 0x99, 0xff, 0xcc, 0xff, 0x66, 0xff,
-        0xcc, 0xff, 0x33, 0xff, 0xcc, 0xff, 0x00, 0xff, 0xcc, 0xcc, 0xff, 0xff, 0xcc, 0xcc, 0xcc, 0xff, 0xcc, 0xcc, 0x99, 0xff, 0xcc, 0xcc, 0x66, 0xff, 0xcc, 0xcc, 0x33, 0xff, 0xcc, 0xcc, 0x00, 0xff,
-        0xcc, 0x99, 0xff, 0xff, 0xcc, 0x99, 0xcc, 0xff, 0xcc, 0x99, 0x99, 0xff, 0xcc, 0x99, 0x66, 0xff, 0xcc, 0x99, 0x33, 0xff, 0xcc, 0x99, 0x00, 0xff, 0xcc, 0x66, 0xff, 0xff, 0xcc, 0x66, 0xcc, 0xff,
-        0xcc, 0x66, 0x99, 0xff, 0xcc, 0x66, 0x66, 0xff, 0xcc, 0x66, 0x33, 0xff, 0xcc, 0x66, 0x00, 0xff, 0xcc, 0x33, 0xff, 0xff, 0xcc, 0x33, 0xcc, 0xff, 0xcc, 0x33, 0x99, 0xff, 0xcc, 0x33, 0x66, 0xff,
-        0xcc, 0x33, 0x33, 0xff, 0xcc, 0x33, 0x00, 0xff, 0xcc, 0x00, 0xff, 0xff, 0xcc, 0x00, 0xcc, 0xff, 0xcc, 0x00, 0x99, 0xff, 0xcc, 0x00, 0x66, 0xff, 0xcc, 0x00, 0x33, 0xff, 0xcc, 0x00, 0x00, 0xff,
-        0x99, 0xff, 0xff, 0xff, 0x99, 0xff, 0xcc, 0xff, 0x99, 0xff, 0x99, 0xff, 0x99, 0xff, 0x66, 0xff, 0x99, 0xff, 0x33, 0xff, 0x99, 0xff, 0x00, 0xff, 0x99, 0xcc, 0xff, 0xff, 0x99, 0xcc, 0xcc, 0xff,
-        0x99, 0xcc, 0x99, 0xff, 0x99, 0xcc, 0x66, 0xff, 0x99, 0xcc, 0x33, 0xff, 0x99, 0xcc, 0x00, 0xff, 0x99, 0x99, 0xff, 0xff, 0x99, 0x99, 0xcc, 0xff, 0x99, 0x99, 0x99, 0xff, 0x99, 0x99, 0x66, 0xff,
-        0x99, 0x99, 0x33, 0xff, 0x99, 0x99, 0x00, 0xff, 0x99, 0x66, 0xff, 0xff, 0x99, 0x66, 0xcc, 0xff, 0x99, 0x66, 0x99, 0xff, 0x99, 0x66, 0x66, 0xff, 0x99, 0x66, 0x33, 0xff, 0x99, 0x66, 0x00, 0xff,
-        0x99, 0x33, 0xff, 0xff, 0x99, 0x33, 0xcc, 0xff, 0x99, 0x33, 0x99, 0xff, 0x99, 0x33, 0x66, 0xff, 0x99, 0x33, 0x33, 0xff, 0x99, 0x33, 0x00, 0xff, 0x99, 0x00, 0xff, 0xff, 0x99, 0x00, 0xcc, 0xff,
-        0x99, 0x00, 0x99, 0xff, 0x99, 0x00, 0x66, 0xff, 0x99, 0x00, 0x33, 0xff, 0x99, 0x00, 0x00, 0xff, 0x66, 0xff, 0xff, 0xff, 0x66, 0xff, 0xcc, 0xff, 0x66, 0xff, 0x99, 0xff, 0x66, 0xff, 0x66, 0xff,
-        0x66, 0xff, 0x33, 0xff, 0x66, 0xff, 0x00, 0xff, 0x66, 0xcc, 0xff, 0xff, 0x66, 0xcc, 0xcc, 0xff, 0x66, 0xcc, 0x99, 0xff, 0x66, 0xcc, 0x66, 0xff, 0x66, 0xcc, 0x33, 0xff, 0x66, 0xcc, 0x00, 0xff,
-        0x66, 0x99, 0xff, 0xff, 0x66, 0x99, 0xcc, 0xff, 0x66, 0x99, 0x99, 0xff, 0x66, 0x99, 0x66, 0xff, 0x66, 0x99, 0x33, 0xff, 0x66, 0x99, 0x00, 0xff, 0x66, 0x66, 0xff, 0xff, 0x66, 0x66, 0xcc, 0xff,
-        0x66, 0x66, 0x99, 0xff, 0x66, 0x66, 0x66, 0xff, 0x66, 0x66, 0x33, 0xff, 0x66, 0x66, 0x00, 0xff, 0x66, 0x33, 0xff, 0xff, 0x66, 0x33, 0xcc, 0xff, 0x66, 0x33, 0x99, 0xff, 0x66, 0x33, 0x66, 0xff,
-        0x66, 0x33, 0x33, 0xff, 0x66, 0x33, 0x00, 0xff, 0x66, 0x00, 0xff, 0xff, 0x66, 0x00, 0xcc, 0xff, 0x66, 0x00, 0x99, 0xff, 0x66, 0x00, 0x66, 0xff, 0x66, 0x00, 0x33, 0xff, 0x66, 0x00, 0x00, 0xff,
-        0x33, 0xff, 0xff, 0xff, 0x33, 0xff, 0xcc, 0xff, 0x33, 0xff, 0x99, 0xff, 0x33, 0xff, 0x66, 0xff, 0x33, 0xff, 0x33, 0xff, 0x33, 0xff, 0x00, 0xff, 0x33, 0xcc, 0xff, 0xff, 0x33, 0xcc, 0xcc, 0xff,
-        0x33, 0xcc, 0x99, 0xff, 0x33, 0xcc, 0x66, 0xff, 0x33, 0xcc, 0x33, 0xff, 0x33, 0xcc, 0x00, 0xff, 0x33, 0x99, 0xff, 0xff, 0x33, 0x99, 0xcc, 0xff, 0x33, 0x99, 0x99, 0xff, 0x33, 0x99, 0x66, 0xff,
-        0x33, 0x99, 0x33, 0xff, 0x33, 0x99, 0x00, 0xff, 0x33, 0x66, 0xff, 0xff, 0x33, 0x66, 0xcc, 0xff, 0x33, 0x66, 0x99, 0xff, 0x33, 0x66, 0x66, 0xff, 0x33, 0x66, 0x33, 0xff, 0x33, 0x66, 0x00, 0xff,
-        0x33, 0x33, 0xff, 0xff, 0x33, 0x33, 0xcc, 0xff, 0x33, 0x33, 0x99, 0xff, 0x33, 0x33, 0x66, 0xff, 0x33, 0x33, 0x33, 0xff, 0x33, 0x33, 0x00, 0xff, 0x33, 0x00, 0xff, 0xff, 0x33, 0x00, 0xcc, 0xff,
-        0x33, 0x00, 0x99, 0xff, 0x33, 0x00, 0x66, 0xff, 0x33, 0x00, 0x33, 0xff, 0x33, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0xcc, 0xff, 0x00, 0xff, 0x99, 0xff, 0x00, 0xff, 0x66, 0xff,
-        0x00, 0xff, 0x33, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xcc, 0xff, 0xff, 0x00, 0xcc, 0xcc, 0xff, 0x00, 0xcc, 0x99, 0xff, 0x00, 0xcc, 0x66, 0xff, 0x00, 0xcc, 0x33, 0xff, 0x00, 0xcc, 0x00, 0xff,
-        0x00, 0x99, 0xff, 0xff, 0x00, 0x99, 0xcc, 0xff, 0x00, 0x99, 0x99, 0xff, 0x00, 0x99, 0x66, 0xff, 0x00, 0x99, 0x33, 0xff, 0x00, 0x99, 0x00, 0xff, 0x00, 0x66, 0xff, 0xff, 0x00, 0x66, 0xcc, 0xff,
-        0x00, 0x66, 0x99, 0xff, 0x00, 0x66, 0x66, 0xff, 0x00, 0x66, 0x33, 0xff, 0x00, 0x66, 0x00, 0xff, 0x00, 0x33, 0xff, 0xff, 0x00, 0x33, 0xcc, 0xff, 0x00, 0x33, 0x99, 0xff, 0x00, 0x33, 0x66, 0xff,
-        0x00, 0x33, 0x33, 0xff, 0x00, 0x33, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xcc, 0xff, 0x00, 0x00, 0x99, 0xff, 0x00, 0x00, 0x66, 0xff, 0x00, 0x00, 0x33, 0xff, 0xee, 0x00, 0x00, 0xff,
-        0xdd, 0x00, 0x00, 0xff, 0xbb, 0x00, 0x00, 0xff, 0xaa, 0x00, 0x00, 0xff, 0x88, 0x00, 0x00, 0xff, 0x77, 0x00, 0x00, 0xff, 0x55, 0x00, 0x00, 0xff, 0x44, 0x00, 0x00, 0xff, 0x22, 0x00, 0x00, 0xff,
-        0x11, 0x00, 0x00, 0xff, 0x00, 0xee, 0x00, 0xff, 0x00, 0xdd, 0x00, 0xff, 0x00, 0xbb, 0x00, 0xff, 0x00, 0xaa, 0x00, 0xff, 0x00, 0x88, 0x00, 0xff, 0x00, 0x77, 0x00, 0xff, 0x00, 0x55, 0x00, 0xff,
-        0x00, 0x44, 0x00, 0xff, 0x00, 0x22, 0x00, 0xff, 0x00, 0x11, 0x00, 0xff, 0x00, 0x00, 0xee, 0xff, 0x00, 0x00, 0xdd, 0xff, 0x00, 0x00, 0xbb, 0xff, 0x00, 0x00, 0xaa, 0xff, 0x00, 0x00, 0x88, 0xff,
-        0x00, 0x00, 0x77, 0xff, 0x00, 0x00, 0x55, 0xff, 0x00, 0x00, 0x44, 0xff, 0x00, 0x00, 0x22, 0xff, 0x00, 0x00, 0x11, 0xff, 0xee, 0xee, 0xee, 0xff, 0xdd, 0xdd, 0xdd, 0xff, 0xbb, 0xbb, 0xbb, 0xff,
-        0xaa, 0xaa, 0xaa, 0xff, 0x88, 0x88, 0x88, 0xff, 0x77, 0x77, 0x77, 0xff, 0x55, 0x55, 0x55, 0xff, 0x44, 0x44, 0x44, 0xff, 0x22, 0x22, 0x22, 0xff, 0x11, 0x11, 0x11, 0xff, 0x00, 0x00, 0x00, 0xff,
-    };
-
-    // internal math/helper utilities
-    static inline uint32_t _vox_max(uint32_t a, uint32_t b) {
-        return (a > b) ? a : b;
-    }
-    static inline uint32_t _vox_min(uint32_t a, uint32_t b) {
-        return (a < b) ? a : b;
-    }
-
-    // string utilities
-    #ifdef _MSC_VER
-        #define _vox_str_scanf(str,...)      sscanf_s(str,__VA_ARGS__)
-        #define _vox_strcpy_static(dst,src)  strcpy_s(dst,src)
-        #define _vox_strcasecmp(a,b)         _stricmp(a,b)
-        #define _vox_strcmp(a,b)             strcmp(a,b)
-        #define _vox_strlen(a)               strlen(a)
-        #define _vox_sprintf(str,str_max,fmt,...)    sprintf_s(str, str_max, fmt, __VA_ARGS__)
-    #else
-        #define _vox_str_scanf(str,...)      sscanf(str,__VA_ARGS__)
-        #define _vox_strcpy_static(dst,src)  strcpy(dst,src)
-        #define _vox_strcasecmp(a,b)         strcasecmp(a,b)
-        #define _vox_strcmp(a,b)             strcmp(a,b)
-        #define _vox_strlen(a)               strlen(a)
-        #define _vox_sprintf(str,str_max,fmt,...)    snprintf(str, str_max, fmt, __VA_ARGS__)
-    #endif
-
-    // 3d vector utilities
-    struct vec3 {
-        float x, y, z;
-    };
-    static inline vec3 vec3_make(float x, float y, float z) { vec3 v; v.x = x; v.y = y; v.z = z; return v; }
-    static inline vec3 vec3_negate(const vec3& v) { vec3 r; r.x = -v.x;  r.y = -v.y; r.z = -v.z; return r; }
-
-    // API for emulating file transactions on an in-memory buffer of data.
-    struct _vox_file {
-        const  uint8_t* buffer;       // source buffer data
-        const uint32_t  buffer_size;  // size of the data in the buffer
-        uint32_t        offset;       // current offset in the buffer data.
-    };
-
-    static uint32_t _vox_file_bytes_remaining(const _vox_file* fp) {
-        if (fp->offset < fp->buffer_size) {
-            return fp->buffer_size - fp->offset;
-        } else {
-            return 0;
-        }
-    }
-
-    static bool _vox_file_read(_vox_file* fp, void* data, uint32_t data_size) {
-        size_t data_to_read = _vox_min(_vox_file_bytes_remaining(fp), data_size);
-        memcpy(data, &fp->buffer[fp->offset], data_to_read);
-        fp->offset += data_size;
-        return data_to_read == data_size;
-    }
-
-    static void _vox_file_seek_forwards(_vox_file* fp, uint32_t offset) {
-        fp->offset += _vox_min(offset, _vox_file_bytes_remaining(fp));
-    }
-
-    static const void* _vox_file_data_pointer(const _vox_file* fp) {
-        return &fp->buffer[fp->offset];
-    }
-
-    // hash utilities
-    static uint32_t _vox_hash(const uint8_t* data, uint32_t data_size) {
-        uint32_t hash = 0;
-        for (uint32_t i = 0; i < data_size; i++)
-            hash = data[i] + (hash * 65559);
-        return hash;
-    }
-
-    // memory allocation utils.
-    static void* _ogt_priv_alloc_default(size_t size) { return malloc(size); }
-    static void  _ogt_priv_free_default(void* ptr)    { free(ptr); }
-    static ogt_vox_alloc_func g_alloc_func = _ogt_priv_alloc_default; // default function for allocating
-    static ogt_vox_free_func  g_free_func = _ogt_priv_free_default;   // default  function for freeing.
-
-    // set the provided allocate/free functions if they are non-null, otherwise reset to default allocate/free functions
-    void ogt_vox_set_memory_allocator(ogt_vox_alloc_func alloc_func, ogt_vox_free_func free_func)
-    {
-        assert((alloc_func && free_func) ||      // both alloc/free must be non-NULL -OR-
-            (!alloc_func && !free_func));    // both alloc/free must be NULL. No mixing 'n matching.
-        if (alloc_func && free_func) {
-            g_alloc_func = alloc_func;
-            g_free_func = free_func;
-        }
-        else  {
-            // reset to default allocate/free functions.
-            g_alloc_func = _ogt_priv_alloc_default;
-            g_free_func = _ogt_priv_free_default;
-        }
-    }
-
-    static void* _vox_malloc(size_t size) {
-        return size ? g_alloc_func(size) : NULL;
-    }
-
-    static void* _vox_calloc(size_t size) {
-        void* pMem = _vox_malloc(size);
-        if (pMem)
-            memset(pMem, 0, size);
-        return pMem;
-    }
-
-    static void _vox_free(void* old_ptr) {
-        if (old_ptr)
-            g_free_func(old_ptr);
-    }
-
-    static void* _vox_realloc(void* old_ptr, size_t old_size, size_t new_size) {
-        // early out if new size is non-zero and no resize is required.
-        if (new_size && old_size >= new_size)
-            return old_ptr;
-
-        // memcpy from the old ptr only if both sides are valid.
-        void* new_ptr = _vox_malloc(new_size);
-        if (new_ptr) {
-            // copy any existing elements over
-            if (old_ptr && old_size)
-                memcpy(new_ptr, old_ptr, old_size);
-            // zero out any new tail elements
-            assert(new_size > old_size); // this should be guaranteed by the _vox_realloc early out case above.
-            uintptr_t new_tail_ptr = (uintptr_t)new_ptr + old_size;
-            memset((void*)new_tail_ptr, 0, new_size - old_size);
-        }
-        if (old_ptr)
-            _vox_free(old_ptr);
-        return new_ptr;
-    }
-
-    // std::vector-style allocator, which use client-provided allocation functions.
-    template <class T> struct _vox_array {
-        _vox_array() : data(NULL), capacity(0), count(0) { }
-        ~_vox_array() {
-            _vox_free(data);
-            data = NULL;
-            count = 0;
-            capacity = 0;
-        }
-        void reserve(size_t new_capacity) {
-            data = (T*)_vox_realloc(data, capacity * sizeof(T), new_capacity * sizeof(T));
-            capacity = new_capacity;
-        }
-        void grow_to_fit_index(size_t index) {
-            if (index >= count)
-                resize(index + 1);
-        }
-        void resize(size_t new_count) {
-            if (new_count > capacity)
-                reserve(new_count);
-            count = new_count;
-        }
-        void push_back(const T & new_element) {
-            if (count == capacity) {
-                size_t new_capacity = capacity ? (capacity * 3) >> 1 : 2;   // grow by 50% each time, otherwise start at 2 elements.
-                reserve(new_capacity);
-                assert(capacity > count);
-            }
-            data[count++] = new_element;
-        }
-        void push_back_many(const T * new_elements, size_t num_elements) {
-            if (count + num_elements > capacity) {
-                size_t new_capacity = capacity + num_elements;
-                new_capacity = new_capacity ? (new_capacity * 3) >> 1 : 2;   // grow by 50% each time, otherwise start at 2 elements.
-                reserve(new_capacity);
-                assert(capacity >= (count + num_elements));
-            }
-            for (size_t i = 0; i < num_elements; i++)
-                data[count + i] = new_elements[i];
-            count += num_elements;
-        }
-        size_t size() const {
-            return count;
-        }
-        T& operator[](size_t index) {
-            assert(index < count);
-            return data[index];
-        }
-        const T& operator[](size_t index) const {
-            assert(index < count);
-            return data[index];
-        }
-        T*     data;      // data for the array
-        size_t capacity;  // capacity of the array
-        size_t count;      // size of the array
-    };
-
-    // matrix utilities
-    static ogt_vox_transform _vox_transform_identity() {
-        ogt_vox_transform t;
-        t.m00 = 1.0f; t.m01 = 0.0f; t.m02 = 0.0f; t.m03 = 0.0f;
-        t.m10 = 0.0f; t.m11 = 1.0f; t.m12 = 0.0f; t.m13 = 0.0f;
-        t.m20 = 0.0f; t.m21 = 0.0f; t.m22 = 1.0f; t.m23 = 0.0f;
-        t.m30 = 0.0f; t.m31 = 0.0f; t.m32 = 0.0f; t.m33 = 1.0f;
-        return t;
-    }
-
-    static ogt_vox_transform _vox_transform_multiply(const ogt_vox_transform& a, const ogt_vox_transform& b) {
-        ogt_vox_transform r;
-        r.m00 = (a.m00 * b.m00) + (a.m01 * b.m10) + (a.m02 * b.m20) + (a.m03 * b.m30);
-        r.m01 = (a.m00 * b.m01) + (a.m01 * b.m11) + (a.m02 * b.m21) + (a.m03 * b.m31);
-        r.m02 = (a.m00 * b.m02) + (a.m01 * b.m12) + (a.m02 * b.m22) + (a.m03 * b.m32);
-        r.m03 = (a.m00 * b.m03) + (a.m01 * b.m13) + (a.m02 * b.m23) + (a.m03 * b.m33);
-        r.m10 = (a.m10 * b.m00) + (a.m11 * b.m10) + (a.m12 * b.m20) + (a.m13 * b.m30);
-        r.m11 = (a.m10 * b.m01) + (a.m11 * b.m11) + (a.m12 * b.m21) + (a.m13 * b.m31);
-        r.m12 = (a.m10 * b.m02) + (a.m11 * b.m12) + (a.m12 * b.m22) + (a.m13 * b.m32);
-        r.m13 = (a.m10 * b.m03) + (a.m11 * b.m13) + (a.m12 * b.m23) + (a.m13 * b.m33);
-        r.m20 = (a.m20 * b.m00) + (a.m21 * b.m10) + (a.m22 * b.m20) + (a.m23 * b.m30);
-        r.m21 = (a.m20 * b.m01) + (a.m21 * b.m11) + (a.m22 * b.m21) + (a.m23 * b.m31);
-        r.m22 = (a.m20 * b.m02) + (a.m21 * b.m12) + (a.m22 * b.m22) + (a.m23 * b.m32);
-        r.m23 = (a.m20 * b.m03) + (a.m21 * b.m13) + (a.m22 * b.m23) + (a.m23 * b.m33);
-        r.m30 = (a.m30 * b.m00) + (a.m31 * b.m10) + (a.m32 * b.m20) + (a.m33 * b.m30);
-        r.m31 = (a.m30 * b.m01) + (a.m31 * b.m11) + (a.m32 * b.m21) + (a.m33 * b.m31);
-        r.m32 = (a.m30 * b.m02) + (a.m31 * b.m12) + (a.m32 * b.m22) + (a.m33 * b.m32);
-        r.m33 = (a.m30 * b.m03) + (a.m31 * b.m13) + (a.m32 * b.m23) + (a.m33 * b.m33);
-        return r;
-    }
-
-    // dictionary utilities
-    static const uint32_t k_vox_max_dict_buffer_size = 4096;
-    static const uint32_t k_vox_max_dict_key_value_pairs = 256;
-    struct _vox_dictionary {
-        const char* keys[k_vox_max_dict_key_value_pairs];
-        const char* values[k_vox_max_dict_key_value_pairs];
-        uint32_t    num_key_value_pairs;
-        char        buffer[k_vox_max_dict_buffer_size + 4];    // max 4096, +4 for safety
-        uint32_t    buffer_mem_used;
-    };
-
-    static bool _vox_file_read_dict(_vox_dictionary * dict, _vox_file * fp) {
-        uint32_t num_pairs_to_read = 0;
-        _vox_file_read(fp, &num_pairs_to_read, sizeof(uint32_t));
-        assert(num_pairs_to_read <= k_vox_max_dict_key_value_pairs);
-
-        dict->buffer_mem_used = 0;
-        dict->num_key_value_pairs = 0;
-        for (uint32_t i = 0; i < num_pairs_to_read; i++) {
-            // get the size of the key string
-            uint32_t key_string_size = 0;
-            if (!_vox_file_read(fp, &key_string_size, sizeof(uint32_t)))
-                return false;
-            // allocate space for the key, and read it in.
-            if (dict->buffer_mem_used + key_string_size > k_vox_max_dict_buffer_size)
-                return false;
-            char* key = &dict->buffer[dict->buffer_mem_used];
-            dict->buffer_mem_used += key_string_size + 1;    // + 1 for zero terminator
-            if (!_vox_file_read(fp, key, key_string_size))
-                return false;
-            key[key_string_size] = 0;    // zero-terminate
-            assert(_vox_strlen(key) == key_string_size);    // sanity check
-
-            // get the size of the value string
-            uint32_t value_string_size = 0;
-            if (!_vox_file_read(fp, &value_string_size, sizeof(uint32_t)))
-                return false;
-            // allocate space for the value, and read it in.
-            if (dict->buffer_mem_used + value_string_size > k_vox_max_dict_buffer_size)
-                return false;
-            char* value = &dict->buffer[dict->buffer_mem_used];
-            dict->buffer_mem_used += value_string_size + 1;    // + 1 for zero terminator
-            if (!_vox_file_read(fp, value, value_string_size))
-                return false;
-            value[value_string_size] = 0;    // zero-terminate
-            assert(_vox_strlen(value) == value_string_size);    // sanity check
-            // now assign it in the dictionary
-            dict->keys[dict->num_key_value_pairs] = key;
-            dict->values[dict->num_key_value_pairs] = value;
-            dict->num_key_value_pairs++;
-        }
-
-        return true;
-    }
-
-    // helper for looking up in the dictionary
-    static const char* _vox_dict_get_value_as_string(const _vox_dictionary* dict, const char* key_to_find, const char* default_value = NULL) {
-        for (uint32_t i = 0; i < dict->num_key_value_pairs; i++)
-            if (_vox_strcasecmp(dict->keys[i], key_to_find) == 0)
-                return dict->values[i];
-        return default_value;
-    }
-
-    // lookup table for _vox_make_transform_from_dict_strings
-    static const vec3 k_vectors[4] = {
-	vec3_make(1.0f, 0.0f, 0.0f),
-	vec3_make(0.0f, 1.0f, 0.0f),
-	vec3_make(0.0f, 0.0f, 1.0f),
-	vec3_make(0.0f, 0.0f, 0.0f)    // invalid!
-    };
-
-    // lookup table for _vox_make_transform_from_dict_strings
-    static const uint32_t k_row2_index[] = { UINT32_MAX, UINT32_MAX, UINT32_MAX, 2, UINT32_MAX, 1, 0, UINT32_MAX };
-
-
-    static ogt_vox_transform _vox_make_transform_from_dict_strings(const char* rotation_string, const char* translation_string) {
-        ogt_vox_transform transform = _vox_transform_identity();
-
-        if (rotation_string != NULL) {
-            // compute the per-row indexes into k_vectors[] array.
-            // unpack rotation bits.
-            //  bits  : meaning
-            //  0 - 1 : index of the non-zero entry in the first row
-            //  2 - 3 : index of the non-zero entry in the second row
-            uint32_t packed_rotation_bits = atoi(rotation_string);
-            uint32_t row0_vec_index = (packed_rotation_bits >> 0) & 3;
-            uint32_t row1_vec_index = (packed_rotation_bits >> 2) & 3;
-            uint32_t row2_vec_index = k_row2_index[(1 << row0_vec_index) | (1 << row1_vec_index)];    // process of elimination to determine row 2 index based on row0/row1 being one of {0,1,2} choose 2.
-            assert(row2_vec_index != UINT32_MAX); // if you hit this, you probably have invalid indices for row0_vec_index/row1_vec_index.
-
-            // unpack rotation bits for vector signs
-            //  bits  : meaning
-            //  4     : the sign in the first row  (0 : positive; 1 : negative)
-            //  5     : the sign in the second row (0 : positive; 1 : negative)
-            //  6     : the sign in the third row  (0 : positive; 1 : negative)
-            vec3 row0 = k_vectors[row0_vec_index];
-            vec3 row1 = k_vectors[row1_vec_index];
-            vec3 row2 = k_vectors[row2_vec_index];
-            if (packed_rotation_bits & (1 << 4))
-                row0 = vec3_negate(row0);
-            if (packed_rotation_bits & (1 << 5))
-                row1 = vec3_negate(row1);
-            if (packed_rotation_bits & (1 << 6))
-                row2 = vec3_negate(row2);
-
-            // magicavoxel stores rows, we need columns, so we do the swizzle here into columns
-            transform.m00 = row0.x; transform.m01 = row1.x; transform.m02 = row2.x;
-            transform.m10 = row0.y; transform.m11 = row1.y; transform.m12 = row2.y;
-            transform.m20 = row0.z; transform.m21 = row1.z; transform.m22 = row2.z;
-        }
-
-        if (translation_string != NULL) {
-            int32_t x = 0;
-            int32_t y = 0;
-            int32_t z = 0;
-            _vox_str_scanf(translation_string, "%i %i %i", &x, &y, &z);
-            transform.m30 = (float)x;
-            transform.m31 = (float)y;
-            transform.m32 = (float)z;
-        }
-        return transform;
-    }
-
-    enum _vox_scene_node_type
-    {
-        k_nodetype_invalid   = 0,    // has not been parsed yet.
-        k_nodetype_group     = 1,
-        k_nodetype_transform = 2,
-        k_nodetype_shape     = 3,
-    };
-
-    struct _vox_scene_node_ {
-        _vox_scene_node_type node_type;    // only gets assigned when this has been parsed, otherwise will be k_nodetype_invalid
-        union {
-            // used only when node_type == k_nodetype_transform
-            struct {
-                char              name[65];    // max name size is 64 plus 1 for null terminator
-                ogt_vox_transform transform;
-                uint32_t          child_node_id;
-                uint32_t          layer_id;
-                bool              hidden;
-            } transform;
-            // used only when node_type == k_nodetype_group
-            struct {
-                uint32_t first_child_node_id_index; // the index of the first child node ID within the ChildNodeID array
-                uint32_t num_child_nodes;           // number of child node IDs starting at the first index
-            } group;
-            // used only when node_type == k_nodetype_shape
-            struct {
-                uint32_t model_id;                  // will be UINT32_MAX if there is no model. Unlikely, there should always be a model.
-            } shape;
-        } u;
-    };
-
-    static void generate_instances_for_node(
-        const _vox_array<_vox_scene_node_> & nodes, uint32_t node_index, const _vox_array<uint32_t> & child_id_array, uint32_t layer_index,
-        const ogt_vox_transform& transform, const _vox_array<ogt_vox_model*> & model_ptrs, const char* transform_last_name, bool transform_last_hidden,
-        _vox_array<ogt_vox_instance> & instances, _vox_array<char> & string_data, _vox_array<ogt_vox_group>& groups, uint32_t group_index, bool generate_groups)
-    {
-        const _vox_scene_node_* node = &nodes[node_index];
-        assert(node);
-        switch (node->node_type)
-        {
-            case k_nodetype_transform:
-            {
-                ogt_vox_transform new_transform = (generate_groups) ? node->u.transform.transform  // don't multiply by the parent transform. caller wants the group-relative transform
-                        : _vox_transform_multiply(node->u.transform.transform, transform);         // flatten the transform if we're not generating groups: child transform * parent transform
-                const char* new_transform_name = node->u.transform.name[0] ? node->u.transform.name : NULL;
-                transform_last_name = new_transform_name ? new_transform_name : transform_last_name;    // if this node has a name, use it instead of our parent name
-                generate_instances_for_node(nodes, node->u.transform.child_node_id, child_id_array, node->u.transform.layer_id, new_transform, model_ptrs, transform_last_name, node->u.transform.hidden, instances, string_data, groups, group_index, generate_groups);
-                break;
-            }
-            case k_nodetype_group:
-            {
-                // create a new group only if we're generating groups.
-                uint32_t next_group_index = 0;
-                if (generate_groups) {
-                    next_group_index = (uint32_t)groups.size();
-                    ogt_vox_group group;
-                    group.parent_group_index = group_index;
-                    group.transform          = transform;
-                    group.hidden             = transform_last_hidden;
-                    group.layer_index        = layer_index;
-                    groups.push_back(group);
-                }
-                // child nodes will only be hidden if their immediate transform is hidden.
-                transform_last_hidden = false;
-
-                const uint32_t* child_node_ids = (const uint32_t*)& child_id_array[node->u.group.first_child_node_id_index];
-                for (uint32_t i = 0; i < node->u.group.num_child_nodes; i++) {
-                    generate_instances_for_node(nodes, child_node_ids[i], child_id_array, layer_index, transform, model_ptrs, transform_last_name, transform_last_hidden, instances, string_data, groups, next_group_index, generate_groups);
-                }
-                break;
-            }
-            case k_nodetype_shape:
-            {
-                assert(node->u.shape.model_id < model_ptrs.size());
-                if (node->u.shape.model_id < model_ptrs.size() &&    // model ID is valid
-                    model_ptrs[node->u.shape.model_id] != NULL )     // model is non-NULL.
-                {
-                    assert(generate_groups || group_index == 0);     // if we're not generating groups, group_index should be zero to map to the root group.
-                    ogt_vox_instance new_instance;
-                    new_instance.model_index = node->u.shape.model_id;
-                    new_instance.transform   = transform;
-                    new_instance.layer_index = layer_index;
-                    new_instance.group_index = group_index;
-                    new_instance.hidden      = transform_last_hidden;
-                    // if we got a transform name, allocate space in string_data for it and keep track of the index
-                    // within string data. This will be patched to a real pointer at the very end.
-                    new_instance.name = 0;
-                    if (transform_last_name && transform_last_name[0]) {
-                        new_instance.name = (const char*)(string_data.size());
-                        size_t name_size = _vox_strlen(transform_last_name) + 1;       // +1 for terminator
-                        string_data.push_back_many(transform_last_name, name_size);
-                    }
-                    // create the instance
-                    instances.push_back(new_instance);
-                }
-                break;
-            }
-            default:
-            {
-                assert(0); // unhandled node type!
-            }
-        }
-    }
-
-    // returns true if the 2 models are content-wise identical.
-    static bool _vox_models_are_equal(const ogt_vox_model* lhs, const ogt_vox_model* rhs) {
-        // early out: if hashes don't match, they can't be equal
-        // if hashes match, they might be equal OR there might be a hash collision.
-        if (lhs->voxel_hash != rhs->voxel_hash)
-            return false;
-        // early out: if number of voxels in the model's grid don't match, they can't be equal.
-        uint32_t num_voxels_lhs = lhs->size_x * lhs->size_y * lhs->size_z;
-        uint32_t num_voxels_rhs = rhs->size_x * rhs->size_y * rhs->size_z;
-        if (num_voxels_lhs != num_voxels_rhs)
-            return false;
-        // Finally, we know their hashes are the same, and their dimensions are the same
-        // but they are only equal if they have exactly the same voxel data.
-        return memcmp(lhs->voxel_data, rhs->voxel_data, num_voxels_lhs) == 0 ? true : false;
-    }
-
-    const ogt_vox_scene* ogt_vox_read_scene_with_flags(const uint8_t * buffer, uint32_t buffer_size, uint32_t read_flags) {
-        _vox_file file = { buffer, buffer_size, 0 };
-        _vox_file* fp = &file;
-
-        // parsing state/context
-        _vox_array<ogt_vox_model*>   model_ptrs;
-        _vox_array<_vox_scene_node_> nodes;
-        _vox_array<ogt_vox_instance> instances;
-        _vox_array<char>             string_data;
-        _vox_array<ogt_vox_layer>    layers;
-        _vox_array<ogt_vox_group>    groups;
-        _vox_array<uint32_t>         child_ids;
-        ogt_vox_palette              palette;
-        ogt_vox_matl_array           materials;
-        _vox_dictionary              dict;
-        uint32_t                     size_x = 0;
-        uint32_t                     size_y = 0;
-        uint32_t                     size_z = 0;
-        uint8_t                      index_map[256];
-        bool                         found_index_map_chunk = false;
-
-        // size some of our arrays to prevent resizing during the parsing for smallish cases.
-        model_ptrs.reserve(64);
-        instances.reserve(256);
-        child_ids.reserve(256);
-        nodes.reserve(16);
-        layers.reserve(8);
-        groups.reserve(0);
-        string_data.reserve(256);
-
-        // push a sentinel character into these datastructures. This allows us to keep indexes
-        // rather than pointers into data-structures that grow, and still allow an index of 0
-        // to means invalid
-        string_data.push_back('X');
-        child_ids.push_back(UINT32_MAX);
-
-        // copy the default palette into the scene. It may get overwritten by a palette chunk later
-        memcpy(&palette, k_default_vox_palette, sizeof(ogt_vox_palette));
-
-        // zero initialize materials (this sets valid defaults)
-        memset(&materials, 0, sizeof(materials));
-
-        // load and validate fileheader and file version.
-        uint32_t file_header = 0;
-        uint32_t file_version = 0;
-        _vox_file_read(fp, &file_header, sizeof(uint32_t));
-        _vox_file_read(fp, &file_version, sizeof(uint32_t));
-        if (file_header != CHUNK_ID_VOX_ || file_version != 150)
-            return NULL;
-
-        // parse chunks until we reach the end of the file/buffer
-        while (_vox_file_bytes_remaining(fp) >= sizeof(uint32_t) * 3)
-        {
-            // read the fields common to all chunks
-            uint32_t chunk_id         = 0;
-            uint32_t chunk_size       = 0;
-            uint32_t chunk_child_size = 0;
-            _vox_file_read(fp, &chunk_id, sizeof(uint32_t));
-            _vox_file_read(fp, &chunk_size, sizeof(uint32_t));
-            _vox_file_read(fp, &chunk_child_size, sizeof(uint32_t));
-
-            // process the chunk.
-            switch (chunk_id)
-            {
-                case CHUNK_ID_MAIN:
-                {
-                    break;
-                }
-                case CHUNK_ID_SIZE:
-                {
-                    assert(chunk_size == 12 && chunk_child_size == 0);
-                    _vox_file_read(fp, &size_x, sizeof(uint32_t));
-                    _vox_file_read(fp, &size_y, sizeof(uint32_t));
-                    _vox_file_read(fp, &size_z, sizeof(uint32_t));
-                    break;
-                }
-                case CHUNK_ID_XYZI:
-                {
-                    assert(size_x && size_y && size_z);    // must have read a SIZE chunk prior to XYZI.
-                    // read the number of voxels to process for this moodel
-                    uint32_t num_voxels_in_chunk = 0;
-                    _vox_file_read(fp, &num_voxels_in_chunk, sizeof(uint32_t));
-                    if (num_voxels_in_chunk != 0) {
-                        uint32_t voxel_count = size_x * size_y * size_z;
-                        ogt_vox_model * model = (ogt_vox_model*)_vox_calloc(sizeof(ogt_vox_model) + voxel_count);        // 1 byte for each voxel
-                        if (!model)
-                            return NULL;
-                        uint8_t * voxel_data = (uint8_t*)&model[1];
-
-                        // insert the model into the model array
-                        model_ptrs.push_back(model);
-
-                        // now setup the model
-                        model->size_x = size_x;
-                        model->size_y = size_y;
-                        model->size_z = size_z;
-                        model->voxel_data = voxel_data;
-
-                        // setup some strides for computing voxel index based on x/y/z
-                        const uint32_t k_stride_x = 1;
-                        const uint32_t k_stride_y = size_x;
-                        const uint32_t k_stride_z = size_x * size_y;
-
-                        // read this many voxels and store it in voxel data.
-                        const uint8_t * packed_voxel_data = (const uint8_t*)_vox_file_data_pointer(fp);
-                        const uint32_t voxels_to_read = _vox_min(_vox_file_bytes_remaining(fp) / 4, num_voxels_in_chunk);
-                        for (uint32_t i = 0; i < voxels_to_read; i++) {
-                            uint8_t x = packed_voxel_data[i * 4 + 0];
-                            uint8_t y = packed_voxel_data[i * 4 + 1];
-                            uint8_t z = packed_voxel_data[i * 4 + 2];
-                            uint8_t color_index = packed_voxel_data[i * 4 + 3];
-                            assert(x < size_x && y < size_y && z < size_z);
-                            voxel_data[(x * k_stride_x) + (y * k_stride_y) + (z * k_stride_z)] = color_index;
-                        }
-                        _vox_file_seek_forwards(fp, num_voxels_in_chunk * 4);
-                        // compute the hash of the voxels in this model-- used to accelerate duplicate models checking.
-                        model->voxel_hash = _vox_hash(voxel_data, size_x * size_y * size_z);
-                    }
-                    else {
-                        model_ptrs.push_back(NULL);
-                    }
-                    break;
-                }
-                case CHUNK_ID_RGBA:
-                {
-                    assert(chunk_size == sizeof(palette));
-                    _vox_file_read(fp, &palette, sizeof(palette));
-                    break;
-                }
-                case CHUNK_ID_nTRN:
-                {
-                    uint32_t node_id = 0;
-                    _vox_file_read(fp, &node_id, sizeof(node_id));
-
-                    // Parse the node dictionary, which can contain:
-                    //   _name:   string
-                    //   _hidden: 0/1
-                    char node_name[65];
-                    bool hidden = false;
-                    node_name[0] = 0;
-                    {
-                        _vox_file_read_dict(&dict, fp);
-                        const char* name_string = _vox_dict_get_value_as_string(&dict, "_name");
-                        if (name_string)
-                            _vox_strcpy_static(node_name, name_string);
-                        // if we got a hidden attribute - assign it now.
-                        const char* hidden_string = _vox_dict_get_value_as_string(&dict, "_hidden", "0");
-                        if (hidden_string)
-                            hidden = (hidden_string[0] == '1' ? true : false);
-                    }
-
-
-                    // get other properties.
-                    uint32_t child_node_id = 0, reserved_id = 0, layer_id = 0, num_frames = 0;
-                    _vox_file_read(fp, &child_node_id, sizeof(child_node_id));
-                    _vox_file_read(fp, &reserved_id,   sizeof(reserved_id));
-                    _vox_file_read(fp, &layer_id,      sizeof(layer_id));
-                    _vox_file_read(fp, &num_frames,    sizeof(num_frames));
-                    assert(reserved_id == UINT32_MAX && num_frames == 1); // must be these values according to the spec
-
-                    // Parse the frame dictionary that contains:
-                    //   _r : int8 ROTATION (c)
-                    //   _t : int32x3 translation
-                    // and extract a transform
-                    ogt_vox_transform frame_transform;
-                    {
-                        _vox_file_read_dict(&dict, fp);
-                        const char* rotation_value    = _vox_dict_get_value_as_string(&dict, "_r");
-                        const char* translation_value = _vox_dict_get_value_as_string(&dict, "_t");
-                        frame_transform = _vox_make_transform_from_dict_strings(rotation_value, translation_value);
-                    }
-                    // setup the transform node.
-                    {
-                        nodes.grow_to_fit_index(node_id);
-                        _vox_scene_node_* transform_node = &nodes[node_id];
-                        assert(transform_node);
-                        transform_node->node_type = k_nodetype_transform;
-                        transform_node->u.transform.child_node_id = child_node_id;
-                        transform_node->u.transform.layer_id      = layer_id;
-                        transform_node->u.transform.transform     = frame_transform;
-                        transform_node->u.transform.hidden        = hidden;
-                        // assign the name
-                        _vox_strcpy_static(transform_node->u.transform.name, node_name);
-                    }
-                    break;
-                }
-                case CHUNK_ID_nGRP:
-                {
-                    uint32_t node_id = 0;
-                    _vox_file_read(fp, &node_id, sizeof(node_id));
-
-                    // parse the node dictionary - data is unused.
-                    _vox_file_read_dict(&dict, fp);
-
-                    // setup the group node
-                    nodes.grow_to_fit_index(node_id);
-                    _vox_scene_node_* group_node = &nodes[node_id];
-                    group_node->node_type = k_nodetype_group;
-                    group_node->u.group.first_child_node_id_index = 0;
-                    group_node->u.group.num_child_nodes           = 0;
-
-                    // setup all child scene nodes to point back to this node.
-                    uint32_t num_child_nodes = 0;
-                    _vox_file_read(fp, &num_child_nodes, sizeof(num_child_nodes));
-
-                    // allocate space for all the child node IDs
-                    if (num_child_nodes) {
-                        size_t prior_size = child_ids.size();
-                        assert(prior_size > 0); // should be guaranteed by the sentinel we reserved at the very beginning.
-                        child_ids.resize(prior_size + num_child_nodes);
-                        _vox_file_read(fp, &child_ids[prior_size], sizeof(uint32_t) * num_child_nodes);
-                        group_node->u.group.first_child_node_id_index = (uint32_t)prior_size;
-                        group_node->u.group.num_child_nodes = num_child_nodes;
-                    }
-                    break;
-                }
-                case CHUNK_ID_nSHP:
-                {
-                    uint32_t node_id = 0;
-                    _vox_file_read(fp, &node_id, sizeof(node_id));
-
-                    // setup the shape node
-                    nodes.grow_to_fit_index(node_id);
-                    _vox_scene_node_* shape_node = &nodes[node_id];
-                    shape_node->node_type = k_nodetype_shape;
-                    shape_node->u.shape.model_id = UINT32_MAX;
-
-                    // parse the node dictionary - data is unused.
-                    _vox_file_read_dict(&dict, fp);
-
-                    uint32_t num_models = 0;
-                    _vox_file_read(fp, &num_models, sizeof(num_models));
-                    assert(num_models == 1); // must be 1 according to the spec.
-
-                    // assign instances
-                    _vox_file_read(fp, &shape_node->u.shape.model_id, sizeof(uint32_t));
-                    assert(shape_node->u.shape.model_id < model_ptrs.size());
-
-                    // parse the model dictionary - data is unsued.
-                    _vox_file_read_dict(&dict, fp);
-                    break;
-                }
-                case CHUNK_ID_IMAP:
-                {
-                    assert(chunk_size == 256);
-                    _vox_file_read(fp, index_map, 256);
-                    found_index_map_chunk = true;
-                    break;
-                }
-                case CHUNK_ID_LAYR:
-                {
-                    int32_t layer_id = 0;
-                    int32_t reserved_id = 0;
-                    _vox_file_read(fp, &layer_id, sizeof(layer_id));
-                    _vox_file_read_dict(&dict, fp);
-                    _vox_file_read(fp, &reserved_id, sizeof(reserved_id));
-                    assert(reserved_id == -1);
-
-                    layers.grow_to_fit_index(layer_id);
-                    layers[layer_id].name = NULL;
-                    layers[layer_id].hidden = false;
-
-                    // if we got a layer name from the LAYR dictionary, allocate space in string_data for it and keep track of the index
-                    // within string data. This will be patched to a real pointer at the very end.
-                    const char* name_string = _vox_dict_get_value_as_string(&dict, "_name", NULL);
-                    if (name_string) {
-                        layers[layer_id].name = (const char*)(string_data.size());
-                        size_t name_size = _vox_strlen(name_string) + 1;       // +1 for terminator
-                        string_data.push_back_many(name_string, name_size);
-                    }
-                    // if we got a hidden attribute - assign it now.
-                    const char* hidden_string = _vox_dict_get_value_as_string(&dict, "_hidden", "0");
-                    if (hidden_string)
-                        layers[layer_id].hidden = (hidden_string[0] == '1' ? true : false);
-                    break;
-                }
-                case CHUNK_ID_MATL:
-                {
-                    int32_t material_id = 0;
-                    _vox_file_read(fp, &material_id, sizeof(material_id));
-                    material_id = material_id & 0xFF; // incoming material 256 is material 0
-                    _vox_file_read_dict(&dict, fp);
-                    const char* type_string = _vox_dict_get_value_as_string(&dict, "_type", NULL);
-                    if (type_string) {
-                        if (0 == _vox_strcmp(type_string,"_diffuse")) {
-                            materials.matl[material_id].type = ogt_matl_type_diffuse;
-                        }
-                        else if (0 == _vox_strcmp(type_string,"_metal")) {
-                            materials.matl[material_id].type = ogt_matl_type_metal;
-                        }
-                        else if (0 == _vox_strcmp(type_string,"_glass")) {
-                            materials.matl[material_id].type = ogt_matl_type_glass;
-                        }
-                        else if (0 == _vox_strcmp(type_string,"_emit")) {
-                            materials.matl[material_id].type = ogt_matl_type_emit;
-                        }
-                        else if (0 == _vox_strcmp(type_string,"_blend")) {
-                            materials.matl[material_id].type = ogt_matl_type_blend;
-                        }
-                        else if (0 == _vox_strcmp(type_string,"_media")) {
-                            materials.matl[material_id].type = ogt_matl_type_media;
-                        }
-                    }
-                    const char* metal_string = _vox_dict_get_value_as_string(&dict, "_metal", NULL);
-                    if (metal_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_metal;
-                        materials.matl[material_id].metal = (float)atof(metal_string);
-                    }
-                    const char* rough_string = _vox_dict_get_value_as_string(&dict, "_rough", NULL);
-                    if (rough_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_rough;
-                        materials.matl[material_id].rough = (float)atof(rough_string);
-                    }
-                    const char* spec_string = _vox_dict_get_value_as_string(&dict, "_spec", NULL);
-                    if (spec_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_spec;
-                        materials.matl[material_id].spec = (float)atof(spec_string);
-                    }
-                    const char* ior_string = _vox_dict_get_value_as_string(&dict, "_ior", NULL);
-                    if (ior_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_ior;
-                        materials.matl[material_id].ior = (float)atof(ior_string);
-                    }
-                    const char* att_string = _vox_dict_get_value_as_string(&dict, "_att", NULL);
-                    if (att_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_att;
-                        materials.matl[material_id].att = (float)atof(att_string);
-                    }
-                    const char* flux_string = _vox_dict_get_value_as_string(&dict, "_flux", NULL);
-                    if (flux_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_flux;
-                        materials.matl[material_id].flux = (float)atof(flux_string);
-                    }
-                    const char* emit_string = _vox_dict_get_value_as_string(&dict, "_emit", NULL);
-                    if (emit_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_emit;
-                        materials.matl[material_id].emit = (float)atof(emit_string);
-                    }
-                    const char* ldr_string = _vox_dict_get_value_as_string(&dict, "_ldr", NULL);
-                    if (ldr_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_ldr;
-                        materials.matl[material_id].ldr = (float)atof(ldr_string);
-                    }
-                    const char* trans_string = _vox_dict_get_value_as_string(&dict, "_trans", NULL);
-                    if (trans_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_trans;
-                        materials.matl[material_id].trans = (float)atof(trans_string);
-                    }
-                    const char* alpha_string = _vox_dict_get_value_as_string(&dict, "_alpha", NULL);
-                    if (alpha_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_alpha;
-                        materials.matl[material_id].alpha = (float)atof(alpha_string);
-                    }
-                    const char* d_string = _vox_dict_get_value_as_string(&dict, "_d", NULL);
-                    if (d_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_d;
-                        materials.matl[material_id].d = (float)atof(d_string);
-                    }
-                    const char* sp_string = _vox_dict_get_value_as_string(&dict, "_sp", NULL);
-                    if (sp_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_sp;
-                        materials.matl[material_id].sp = (float)atof(sp_string);
-                    }
-                    const char* g_string = _vox_dict_get_value_as_string(&dict, "_g", NULL);
-                    if (g_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_g;
-                        materials.matl[material_id].g = (float)atof(g_string);
-                    }
-                    const char* media_string = _vox_dict_get_value_as_string(&dict, "_media", NULL);
-                    if (media_string) {
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_media;
-                        materials.matl[material_id].media = (float)atof(media_string);
-                    }
-                    break;
-                }
-                case CHUNK_ID_MATT:
-                {
-                    int32_t material_id = 0;
-                    _vox_file_read(fp, &material_id, sizeof(material_id));
-                    material_id = material_id & 0xFF; // incoming material 256 is material 0
-
-                    // 0 : diffuse
-                    // 1 : metal
-                    // 2 : glass
-                    // 3 : emissive
-                    int32_t material_type = 0;
-                    _vox_file_read(fp, &material_type, sizeof(material_type));
-
-                    // diffuse  : 1.0
-                    // metal    : (0.0 - 1.0] : blend between metal and diffuse material
-                    // glass    : (0.0 - 1.0] : blend between glass and diffuse material
-                    // emissive : (0.0 - 1.0] : self-illuminated material
-                    float material_weight = 0.0f;
-                    _vox_file_read(fp, &material_weight, sizeof(material_weight));
-
-                    // bit(0) : Plastic
-                    // bit(1) : Roughness
-                    // bit(2) : Specular
-                    // bit(3) : IOR
-                    // bit(4) : Attenuation
-                    // bit(5) : Power
-                    // bit(6) : Glow
-                    // bit(7) : isTotalPower (*no value)
-                    uint32_t property_bits = 0u;
-                    _vox_file_read(fp, &property_bits, sizeof(property_bits));
-
-                    materials.matl[material_id].type = (ogt_matl_type)material_type;
-                    switch (material_type) {
-                    case ogt_matl_type_diffuse:
-                        break;
-                    case ogt_matl_type_metal:
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_metal;
-                        materials.matl[material_id].metal = material_weight;
-                        break;
-                    case ogt_matl_type_glass:
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_trans;
-                        materials.matl[material_id].trans = material_weight;
-                        break;
-                    case ogt_matl_type_emit:
-                        materials.matl[material_id].content_flags |= k_ogt_vox_matl_have_emit;
-                        materials.matl[material_id].emit = material_weight;
-                        break;
-                    }
-
-                    assert(chunk_size >= 16u);
-                    const uint32_t remaining = chunk_size - 16u;
-                    _vox_file_seek_forwards(fp, remaining);
-                    break;
-                }
-                // we don't handle rOBJ (just a dict of render settings), so we just skip the chunk payload.
-                case CHUNK_ID_rOBJ:
-                default:
-                {
-                    _vox_file_seek_forwards(fp, chunk_size);
-                    break;
-                }
-            } // end switch
-        }
-
-        // ok, now that we've parsed all scene nodes - walk the scene hierarchy, and generate instances
-        // we can't do this while parsing chunks unfortunately because some chunks reference chunks
-        // that are later in the file than them.
-        if (nodes.size()) {
-            bool generate_groups = read_flags & k_read_scene_flags_groups ? true : false;
-            // if we're not reading scene-embedded groups, we generate only one and then flatten all instance transforms.
-            if (!generate_groups) {
-                ogt_vox_group root_group;
-                root_group.transform          = _vox_transform_identity();
-                root_group.parent_group_index = k_invalid_group_index;
-                root_group.layer_index        = 0;
-                root_group.hidden             = false;
-                groups.push_back(root_group);
-            }
-            generate_instances_for_node(nodes, 0, child_ids, 0, _vox_transform_identity(), model_ptrs, NULL, false, instances, string_data, groups, k_invalid_group_index, generate_groups);
-        }
-        else if (model_ptrs.size() == 1) {
-            // add a single instance
-            ogt_vox_instance new_instance;
-            new_instance.model_index = 0;
-            new_instance.group_index = 0;
-            new_instance.transform   = _vox_transform_identity();
-            new_instance.layer_index = 0;
-            new_instance.name        = 0;
-            new_instance.hidden      = false;
-            instances.push_back(new_instance);
-        }
-
-        // if we didn't get a layer chunk -- just create a default layer.
-        if (layers.size() == 0) {
-            // go through all instances and ensure they are only mapped to layer 0
-            for (uint32_t i = 0; i < instances.size(); i++)
-                instances[i].layer_index = 0;
-            // add a single layer
-            ogt_vox_layer new_layer;
-            new_layer.hidden = false;
-            new_layer.name   = NULL;
-            layers.push_back(new_layer);
-        }
-
-        // To support index-level assumptions (eg. artists using top 16 colors for color/palette cycling,
-        // other ranges for emissive etc), we must ensure the order of colors that the artist sees in the
-        // magicavoxel tool matches the actual index we'll end up using here. Unfortunately, magicavoxel
-        // does an unexpected thing when remapping colors in the editor using ctrl+drag within the palette.
-        // Instead of remapping all indices in all models, it just keeps track of a display index to actual
-        // palette map and uses that to show reordered colors in the palette window. This is how that
-        // map works:
-        //   displaycolor[k] = paletteColor[imap[k]]
-        // To ensure our indices are in the same order as displayed by magicavoxel within the palette
-        // window, we apply the mapping from the IMAP chunk both to the color palette and indices within each
-        // voxel model.
-        if (found_index_map_chunk)
-        {
-            // the imap chunk maps from display index to actual index.
-            // generate an inverse index map (maps from actual index to display index)
-            uint8_t index_map_inverse[256];
-            for (uint32_t i = 0; i < 256; i++) {
-                index_map_inverse[index_map[i]] = (uint8_t)i;
-            }
-
-            // reorder colors in the palette so the palette contains colors in display order
-            ogt_vox_palette old_palette = palette;
-            for (uint32_t i = 0; i < 256; i++) {
-                uint32_t remapped_index = (index_map[i] + 255) & 0xFF;
-                palette.color[i] = old_palette.color[remapped_index];
-            }
-
-            // reorder materials
-            ogt_vox_matl_array old_materials = materials;
-            for (uint32_t i = 0; i < 256; i++) {
-                uint32_t remapped_i = (i + 255) & 0xFF;
-                uint32_t remapped_index = index_map[remapped_i];
-                materials.matl[i] = old_materials.matl[remapped_index];
-            }
-
-
-            // ensure that all models are remapped so they are using display order palette indices.
-            for (uint32_t i = 0; i < model_ptrs.size(); i++) {
-                ogt_vox_model* model = model_ptrs[i];
-                if (model) {
-                    uint32_t num_voxels = model->size_x * model->size_y * model->size_z;
-                    uint8_t* voxels = (uint8_t*)&model[1];
-                    for (uint32_t j = 0; j < num_voxels; j++)
-                        voxels[j] = 1 + index_map_inverse[voxels[j]];
-                }
-            }
-        }
-
-        // rotate the scene palette now so voxel indices can just map straight into the palette
-        {
-            ogt_vox_rgba last_color = palette.color[255];
-            for (uint32_t i = 255; i > 0; i--)
-                palette.color[i] = palette.color[i - 1];
-            palette.color[0] = last_color;
-            palette.color[0].a = 0;  // alpha is zero for the 0th color as that color index represents a transparent voxel.
-        }
-
-        // check for models that are identical by doing a pair-wise compare. If we find identical
-        // models, we'll end up with NULL gaps in the model_ptrs array, but instances will have
-        // been remapped to keep the earlier model.
-        for (uint32_t i = 0; i < model_ptrs.size(); i++) {
-            if (!model_ptrs[i])
-                continue;
-            for (uint32_t j = i+1; j < model_ptrs.size(); j++) {
-                if (!model_ptrs[j] || !_vox_models_are_equal(model_ptrs[i], model_ptrs[j]))
-                    continue;
-                // model i and model j are the same, so free model j and keep model i.
-                _vox_free(model_ptrs[j]);
-                model_ptrs[j] = NULL;
-                // remap all instances that were referring to j to now refer to i.
-                for (uint32_t k = 0; k < instances.size(); k++)
-                    if (instances[k].model_index == j)
-                        instances[k].model_index = i;
-            }
-        }
-
-        // sometimes a model can be created which has no solid voxels within just due to the
-        // authoring flow within magicavoxel. We have already have prevented creation of
-        // instances that refer to empty models, but here we want to compact the model_ptrs
-        // array such that it contains no more NULL models. This also requires we remap the
-        // indices for instances so they continue to refer to their correct models.
-        {
-            // first, check to see if we find any empty model. No need to do work otherwise.
-            bool found_empty_model = false;
-            for (uint32_t i = 0; i < model_ptrs.size() && !found_empty_model; i++) {
-                if (model_ptrs[i] == NULL)
-                    found_empty_model = true;
-            }
-            if (found_empty_model) {
-                // build a remap table for all instances and simultaneously compact the model_ptrs array.
-                uint32_t* model_remap = (uint32_t*)_vox_malloc(model_ptrs.size() * sizeof(uint32_t));
-                uint32_t num_output_models = 0;
-                for (uint32_t i = 0; i < model_ptrs.size(); i++) {
-                    if (model_ptrs[i] != NULL) {
-                        model_ptrs[num_output_models] = model_ptrs[i];
-                        model_remap[i] = num_output_models;
-                        num_output_models++;
-                    }
-                    else {
-                        model_remap[i] = UINT32_MAX;
-                    }
-                }
-                model_ptrs.resize(num_output_models);
-
-                // remap all instances to point to the compacted model index
-                for (uint32_t i = 0; i < instances.size(); i++) {
-                    uint32_t new_model_index = model_remap[instances[i].model_index];
-                    assert(new_model_index != UINT32_MAX);   // we should have suppressed instances already that point to NULL models.
-                    instances[i].model_index = new_model_index;
-                }
-
-                // free remap table
-                _vox_free(model_remap);
-                model_remap = NULL;
-            }
-        }
-
-        // finally, construct the output scene..
-        size_t scene_size = sizeof(ogt_vox_scene) + string_data.size();
-        ogt_vox_scene* scene = (ogt_vox_scene*)_vox_calloc(scene_size);
-        {
-            // copy name data into the scene
-            char* scene_string_data = (char*)&scene[1];
-            memcpy(scene_string_data, &string_data[0], sizeof(char) * string_data.size());
-
-            // copy instances over to scene
-            size_t num_scene_instances = instances.size();
-            ogt_vox_instance* scene_instances = (ogt_vox_instance*)_vox_malloc(sizeof(ogt_vox_instance) * num_scene_instances);
-            if (num_scene_instances) {
-                memcpy(scene_instances, &instances[0], sizeof(ogt_vox_instance) * num_scene_instances);
-            }
-            scene->instances = scene_instances;
-            scene->num_instances = (uint32_t)instances.size();
-
-            // copy model pointers over to the scene,
-            size_t num_scene_models = model_ptrs.size();
-            ogt_vox_model** scene_models = (ogt_vox_model * *)_vox_malloc(sizeof(ogt_vox_model*) * num_scene_models);
-            if (num_scene_models)
-                memcpy(scene_models, &model_ptrs[0], sizeof(ogt_vox_model*) * num_scene_models);
-            scene->models     = (const ogt_vox_model **)scene_models;
-            scene->num_models = (uint32_t)num_scene_models;
-
-            // copy layer pointers over to the scene
-            size_t num_scene_layers = layers.size();
-            ogt_vox_layer* scene_layers = (ogt_vox_layer*)_vox_malloc(sizeof(ogt_vox_layer) * num_scene_layers);
-            memcpy(scene_layers, &layers[0], sizeof(ogt_vox_layer) * num_scene_layers);
-            scene->layers     = scene_layers;
-            scene->num_layers = (uint32_t)num_scene_layers;
-
-            // copy group pointers over to the scene
-            size_t num_scene_groups = groups.size();
-            ogt_vox_group* scene_groups = num_scene_groups ? (ogt_vox_group*)_vox_malloc(sizeof(ogt_vox_group) * num_scene_groups) : NULL;
-            if (num_scene_groups)
-                memcpy(scene_groups, &groups[0], sizeof(ogt_vox_group)* num_scene_groups);
-            scene->groups     = scene_groups;
-            scene->num_groups = (uint32_t)num_scene_groups;
-
-            // now patch up instance name pointers to point into the scene string area
-            for (uint32_t i = 0; i < num_scene_instances; i++)
-                if (scene_instances[i].name)
-                    scene_instances[i].name = scene_string_data + (size_t)scene_instances[i].name;
-
-            // now patch up layer name pointers to point into the scene string area
-            for (uint32_t i = 0; i < num_scene_layers; i++)
-                if (scene_layers[i].name)
-                    scene_layers[i].name = scene_string_data + (size_t)scene_layers[i].name;
-
-            // copy the palette.
-            scene->palette = palette;
-
-            // copy the materials.
-            scene->materials = materials;
-        }
-        return scene;
-    }
-
-    const ogt_vox_scene* ogt_vox_read_scene(const uint8_t* buffer, uint32_t buffer_size) {
-        return ogt_vox_read_scene_with_flags(buffer, buffer_size, 0);
-    }
-
-    void ogt_vox_destroy_scene(const ogt_vox_scene * _scene) {
-        ogt_vox_scene* scene = const_cast<ogt_vox_scene*>(_scene);
-        // free models from model array
-        for (uint32_t i = 0; i < scene->num_models; i++)
-            _vox_free((void*)scene->models[i]);
-        // free model array itself
-        if (scene->models) {
-            _vox_free(scene->models);
-            scene->models = NULL;
-        }
-        // free instance array
-        if (scene->instances) {
-            _vox_free(const_cast<ogt_vox_instance*>(scene->instances));
-            scene->instances = NULL;
-        }
-        // free layer array
-        if (scene->layers) {
-            _vox_free(const_cast<ogt_vox_layer*>(scene->layers));
-            scene->layers = NULL;
-        }
-        // free groups array
-        if (scene->groups) {
-            _vox_free(const_cast<ogt_vox_group*>(scene->groups));
-            scene->groups = NULL;
-        }
-        // finally, free the scene.
-        _vox_free(scene);
-    }
-
-    // the vector should be a unit vector aligned along one of the cardinal directions exactly. eg. (1,0,0) or (0, 0, -1)
-       // this function returns the non-zero column index in out_index and the returns whether that entry is negative.
-    static bool _vox_get_vec3_rotation_bits(const vec3& vec, uint8_t& out_index) {
-        const float* f = &vec.x;
-        out_index = 3;
-        bool is_negative = false;
-        for (uint8_t i = 0; i < 3; i++) {
-            if (f[i] == 1.0f || f[i] == -1.0f) {
-                out_index = i;
-                is_negative = f[i] < 0.0f ? true : false;
-            }
-            else {
-                assert(f[i] == 0.0f);   // must be zero
-            }
-        }
-        assert(out_index != 3); // if you hit this, you probably have all zeroes in the vector!
-        return is_negative;
-    }
-
-    static uint8_t _vox_make_packed_rotation_from_transform(const ogt_vox_transform * transform) {
-        // magicavoxel stores rows, and we have columns, so we do the swizzle here into rows
-        vec3 row0 = vec3_make(transform->m00, transform->m10, transform->m20);
-        vec3 row1 = vec3_make(transform->m01, transform->m11, transform->m21);
-        vec3 row2 = vec3_make(transform->m02, transform->m12, transform->m22);
-        uint8_t row0_index = 3, row1_index = 3, row2_index = 3;
-        bool row0_negative = _vox_get_vec3_rotation_bits(row0, row0_index);
-        bool row1_negative = _vox_get_vec3_rotation_bits(row1, row1_index);
-        bool row2_negative = _vox_get_vec3_rotation_bits(row2, row2_index);
-        assert(((1 << row0_index) | (1 << row1_index) | (1 << row2_index)) == 7); // check that rows are orthogonal. There must be a non-zero entry in column 0, 1 and 2 across these 3 rows.
-        return (row0_index) | (row1_index << 2) | (row0_negative ? 1 << 4 : 0) | (row1_negative ? 1 << 5 : 0) | (row2_negative ? 1 << 6 : 0);
-    }
-
-    struct _vox_file_writeable {
-        _vox_array<uint8_t> data;
-    };
-
-    static void _vox_file_writeable_init(_vox_file_writeable* fp) {
-        fp->data.reserve(1024);
-    }
-    static void _vox_file_write(_vox_file_writeable* fp, const void* data, uint32_t data_size) {
-        fp->data.push_back_many((const uint8_t*)data, data_size);
-    }
-    static void _vox_file_write_uint32(_vox_file_writeable* fp, uint32_t data) {
-        fp->data.push_back_many((const uint8_t*)&data, sizeof(uint32_t));
-    }
-    static void _vox_file_write_uint8(_vox_file_writeable* fp, uint8_t data) {
-        fp->data.push_back_many((const uint8_t*)&data, sizeof(uint8_t));
-    }
-    static uint32_t _vox_file_get_offset(const _vox_file_writeable* fp) {
-        return (uint32_t)fp->data.count;
-    }
-    static uint8_t* _vox_file_get_data(_vox_file_writeable* fp) {
-        return &fp->data[0];
-    }
-    static void _vox_file_write_dict_key_value(_vox_file_writeable* fp, const char* key, const char* value) {
-        if (key == NULL || value == NULL)
-            return;
-        uint32_t key_len   = (uint32_t)_vox_strlen(key);
-        uint32_t value_len = (uint32_t)_vox_strlen(value);
-        _vox_file_write_uint32(fp, key_len);
-        _vox_file_write(fp, key, key_len);
-        _vox_file_write_uint32(fp, value_len);
-        _vox_file_write(fp, value, value_len);
-    }
-
-    static uint32_t _vox_dict_key_value_size(const char* key, const char* value) {
-        if (key == NULL || value == NULL)
-            return 0;
-        size_t size = sizeof(uint32_t) + _vox_strlen(key) + sizeof(uint32_t) + _vox_strlen(value);
-        return (uint32_t)size;
-    }
-
-    static void _vox_file_write_chunk_nTRN(_vox_file_writeable* fp, uint32_t node_id, uint32_t child_node_id, const char* name, bool hidden, const ogt_vox_transform* transform, uint32_t layer_id)
-    {
-        // obtain dictionary string pointers
-        const char* hidden_string = hidden ? "1" : NULL;
-        const char* t_string = NULL;
-        const char* r_string = NULL;
-        char t_string_buf[65];
-        char r_string_buf[65];
-        t_string_buf[0] = 0;
-        r_string_buf[0] = 0;
-        if (transform != NULL) {
-            uint8_t packed_rotation_bits = _vox_make_packed_rotation_from_transform(transform);
-            _vox_sprintf(t_string_buf, sizeof(t_string_buf), "%i %i %i", (int32_t)transform->m30, (int32_t)transform->m31, (int32_t)transform->m32);
-            _vox_sprintf(r_string_buf, sizeof(r_string_buf), "%u", packed_rotation_bits);
-            t_string = t_string_buf;
-            r_string = r_string_buf;
-        }
-
-        uint32_t node_dict_size =
-            sizeof(uint32_t) + // num key value pairs
-            _vox_dict_key_value_size("_name",   name) +
-            _vox_dict_key_value_size("_hidden", hidden_string);
-
-        uint32_t frame_dict_size =
-            sizeof(uint32_t) + // num key value pairs
-            _vox_dict_key_value_size("_t", t_string) +
-            _vox_dict_key_value_size("_r", r_string);
-
-        uint32_t chunk_size_ntrn =
-            sizeof(uint32_t) +   // node_id
-            node_dict_size +     // node dictionary
-            4 * sizeof(uint32_t) + // middle section - 4 uint32s
-            frame_dict_size;
-
-        // write the nTRN header
-        _vox_file_write_uint32(fp, CHUNK_ID_nTRN);
-        _vox_file_write_uint32(fp, chunk_size_ntrn);
-        _vox_file_write_uint32(fp, 0);
-
-        // write the nTRN payload
-        _vox_file_write_uint32(fp, node_id);
-
-        // write the node dictionary
-        uint32_t node_dict_keyvalue_count = (name ? 1 : 0) + (hidden_string ? 1 : 0);
-        _vox_file_write_uint32(fp, node_dict_keyvalue_count);  // num key values
-        _vox_file_write_dict_key_value(fp, "_name", name);
-        _vox_file_write_dict_key_value(fp, "_hidden", hidden_string);
-
-        // get other properties.
-        _vox_file_write_uint32(fp, child_node_id);
-        _vox_file_write_uint32(fp, UINT32_MAX); // reserved_id must have all bits set.
-        _vox_file_write_uint32(fp, layer_id);
-        _vox_file_write_uint32(fp, 1);          // num_frames must be 1
-
-        // write the frame dictionary
-        _vox_file_write_uint32(fp, (r_string ? 1 : 0) + (t_string ? 1 : 0));  // num key values
-        _vox_file_write_dict_key_value(fp, "_r", r_string);
-        _vox_file_write_dict_key_value(fp, "_t", t_string);
-    }
-
-    // saves the scene out to a buffer that when saved as a .vox file can be loaded with magicavoxel.
-    uint8_t* ogt_vox_write_scene(const ogt_vox_scene* scene, uint32_t* buffer_size) {
-        _vox_file_writeable file;
-        _vox_file_writeable_init(&file);
-        _vox_file_writeable* fp = &file;
-
-        // write file header and file version
-        _vox_file_write_uint32(fp, CHUNK_ID_VOX_);
-        _vox_file_write_uint32(fp, 150);
-
-        // write the main chunk
-        _vox_file_write_uint32(fp, CHUNK_ID_MAIN);
-        _vox_file_write_uint32(fp, 0);
-        _vox_file_write_uint32(fp, 0);  // this main_chunk_child_size will get patched up once everything is written.
-
-        // we need to know how to patch up the main chunk size after we've written everything
-        const uint32_t offset_post_main_chunk = _vox_file_get_offset(fp);
-
-        // write out all model chunks
-        for (uint32_t i = 0; i < scene->num_models; i++) {
-            const ogt_vox_model* model = scene->models[i];
-            assert(model->size_x <= 256 && model->size_y <= 256 && model->size_z <= 256);
-            // count the number of solid voxels in the grid
-            uint32_t num_voxels_in_grid = model->size_x * model->size_y * model->size_z;
-            uint32_t num_solid_voxels = 0;
-            for (uint32_t voxel_index = 0; voxel_index < num_voxels_in_grid; voxel_index++)
-                if (model->voxel_data[voxel_index] != 0)
-                    num_solid_voxels++;
-            uint32_t chunk_size_xyzi = sizeof(uint32_t) + 4 * num_solid_voxels;
-
-            // write the SIZE chunk header
-            _vox_file_write_uint32(fp, CHUNK_ID_SIZE);
-            _vox_file_write_uint32(fp, 12);
-            _vox_file_write_uint32(fp, 0);
-
-            // write the SIZE chunk payload
-            _vox_file_write_uint32(fp, model->size_x);
-            _vox_file_write_uint32(fp, model->size_y);
-            _vox_file_write_uint32(fp, model->size_z);
-
-            // write the XYZI chunk header
-            _vox_file_write_uint32(fp, CHUNK_ID_XYZI);
-            _vox_file_write_uint32(fp, chunk_size_xyzi);
-            _vox_file_write_uint32(fp, 0);
-
-            // write out XYZI chunk payload
-            _vox_file_write_uint32(fp, num_solid_voxels);
-            uint32_t voxel_index = 0;
-            for (uint32_t z = 0; z < model->size_z; z++) {
-                for (uint32_t y = 0; y < model->size_y; y++) {
-                    for (uint32_t x = 0; x < model->size_x; x++, voxel_index++) {
-                        uint8_t color_index = model->voxel_data[voxel_index];
-                        if (color_index != 0) {
-                            _vox_file_write_uint8(fp, (uint8_t)x);
-                            _vox_file_write_uint8(fp, (uint8_t)y);
-                            _vox_file_write_uint8(fp, (uint8_t)z);
-                            _vox_file_write_uint8(fp, color_index);
-                        }
-                    }
-                }
-            }
-        }
-
-        // define our node_id ranges.
-        assert(scene->num_groups);
-        uint32_t first_group_transform_node_id    = 0;
-        uint32_t first_group_node_id              = first_group_transform_node_id + scene->num_groups;
-        uint32_t first_shape_node_id              = first_group_node_id + scene->num_groups;
-        uint32_t first_instance_transform_node_id = first_shape_node_id + scene->num_models;
-
-        // write the nTRN nodes for each of the groups in the scene.
-        for (uint32_t group_index = 0; group_index < scene->num_groups; group_index++) {
-            const ogt_vox_group* group = &scene->groups[group_index];
-            _vox_file_write_chunk_nTRN(fp, first_group_transform_node_id + group_index, first_group_node_id + group_index, NULL, group->hidden, &group->transform, group->layer_index);
-        }
-        // write the group nodes for each of the groups in the scene
-        for (uint32_t group_index = 0; group_index < scene->num_groups; group_index++) {
-            // count how many childnodes  there are. This is simply the sum of all
-            // groups and instances that have this group as its parent
-            uint32_t num_child_nodes = 0;
-            for (uint32_t child_group_index = 0; child_group_index < scene->num_groups; child_group_index++)
-                if (scene->groups[child_group_index].parent_group_index == group_index)
-                    num_child_nodes++;
-            for (uint32_t child_instance_index = 0; child_instance_index < scene->num_instances; child_instance_index++)
-                if (scene->instances[child_instance_index].group_index == group_index)
-                    num_child_nodes++;
-
-            // count number of dictionary items
-            const char* hidden_string = scene->groups[group_index].hidden ? "1" : NULL;
-            uint32_t group_dict_keyvalue_count = (hidden_string ? 1 : 0);
-
-            // compute the chunk size.
-            uint32_t chunk_size_ngrp =
-                sizeof(uint32_t) +                   // node_id
-                sizeof(uint32_t) +                   // num keyvalue pairs in node dictionary
-                _vox_dict_key_value_size("_hidden", hidden_string) +
-                sizeof(uint32_t) +                   // num_child_nodes field
-                sizeof(uint32_t) * num_child_nodes;  // uint32_t for each child node id.
-
-            // write the nGRP header
-            _vox_file_write_uint32(fp, CHUNK_ID_nGRP);
-            _vox_file_write_uint32(fp, chunk_size_ngrp);
-            _vox_file_write_uint32(fp, 0);
-            // write the nGRP payload
-            _vox_file_write_uint32(fp, first_group_node_id + group_index);       // node_id
-            _vox_file_write_uint32(fp, group_dict_keyvalue_count); // num keyvalue pairs in node dictionary
-            _vox_file_write_dict_key_value(fp, "_hidden", hidden_string);
-            _vox_file_write_uint32(fp, num_child_nodes);
-            // write the child group transform nodes
-            for (uint32_t child_group_index = 0; child_group_index < scene->num_groups; child_group_index++)
-                if (scene->groups[child_group_index].parent_group_index == group_index)
-                    _vox_file_write_uint32(fp, first_group_transform_node_id + child_group_index);
-            // write the child instance transform nodes
-            for (uint32_t child_instance_index = 0; child_instance_index < scene->num_instances; child_instance_index++)
-                if (scene->instances[child_instance_index].group_index == group_index)
-                    _vox_file_write_uint32(fp, first_instance_transform_node_id + child_instance_index);
-        }
-
-        // write out an nSHP chunk for each of the models
-        for (uint32_t i = 0; i < scene->num_models; i++) {
-            // compute the size of the nSHP chunk
-            uint32_t chunk_size_nshp =
-                sizeof(uint32_t) +      // node_id
-                sizeof(uint32_t) +      // num keyvalue pairs in node dictionary
-                sizeof(uint32_t) +      // num_models
-                sizeof(uint32_t) +      // model_id
-                sizeof(uint32_t);       // num keyvalue pairs in model dictionary
-            // write the nSHP chunk header
-            _vox_file_write_uint32(fp, CHUNK_ID_nSHP);
-            _vox_file_write_uint32(fp, chunk_size_nshp);
-            _vox_file_write_uint32(fp, 0);
-            // write the nSHP chunk payload
-            _vox_file_write_uint32(fp, first_shape_node_id + i);    // node_id
-            _vox_file_write_uint32(fp, 0);                          // num keyvalue pairs in node dictionary
-            _vox_file_write_uint32(fp, 1);                          // num_models must be 1
-            _vox_file_write_uint32(fp, i);                          // model_id
-            _vox_file_write_uint32(fp, 0);                          // num keyvalue pairs in model dictionary
-        }
-        // write out an nTRN chunk for all instances - and make them point to the relevant nSHP chunk
-        for (uint32_t i = 0; i < scene->num_instances; i++) {
-            const ogt_vox_instance* instance = &scene->instances[i];
-            uint32_t node_id       = first_instance_transform_node_id + i;
-            uint32_t child_node_id = first_shape_node_id + instance->model_index;
-            _vox_file_write_chunk_nTRN(fp, node_id, child_node_id, instance->name, instance->hidden, &instance->transform, instance->layer_index);
-        }
-
-        // write out RGBA chunk for the palette
-        {
-            // .vox stores palette rotated by 1 color index, so do that now.
-            ogt_vox_palette rotated_palette;
-            for (uint32_t i = 0; i < 256; i++)
-                rotated_palette.color[i] = scene->palette.color[(i + 1) & 255];
-
-            // write the palette chunk header
-            _vox_file_write_uint32(fp, CHUNK_ID_RGBA);
-            _vox_file_write_uint32(fp, sizeof(ogt_vox_palette));
-            _vox_file_write_uint32(fp, 0);
-            // write the palette chunk payload
-            _vox_file_write(fp, &rotated_palette, sizeof(ogt_vox_palette));
-        }
-
-        // write out MATL chunk
-        {
-            // keep in sync with ogt_matl_type
-            static const char *type_str[] = {"_diffuse", "_metal", "_glass", "_emit", "_blend", "_media"};
-
-            for (int32_t i = 0; i < 256; ++i) {
-                const ogt_vox_matl &matl = scene->materials.matl[i];
-                if (matl.content_flags == 0u) {
-                    continue;
-                }
-                char matl_metal[16] = "";
-                char matl_rough[16] = "";
-                char matl_spec[16] = "";
-                char matl_ior[16] = "";
-                char matl_att[16] = "";
-                char matl_flux[16] = "";
-                char matl_emit[16] = "";
-                char matl_ldr[16] = "";
-                char matl_trans[16] = "";
-                char matl_alpha[16] = "";
-                char matl_d[16] = "";
-                char matl_sp[16] = "";
-                char matl_g[16] = "";
-                char matl_media[16] = "";
-                uint32_t matl_dict_size = 0;
-                uint32_t matl_dict_keyvalue_count = 0;
-
-                if (matl.content_flags & k_ogt_vox_matl_have_metal) {
-                    _vox_sprintf(matl_metal, sizeof(matl_metal), "%f", matl.metal);
-                    matl_dict_size += _vox_dict_key_value_size("_metal", matl_metal);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_rough) {
-                    _vox_sprintf(matl_rough, sizeof(matl_rough), "%f", matl.rough);
-                    matl_dict_size += _vox_dict_key_value_size("_rough", matl_rough);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_spec) {
-                    _vox_sprintf(matl_spec, sizeof(matl_spec), "%f", matl.spec);
-                    matl_dict_size += _vox_dict_key_value_size("_spec", matl_spec);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_ior) {
-                    _vox_sprintf(matl_ior, sizeof(matl_ior), "%f", matl.ior);
-                    matl_dict_size += _vox_dict_key_value_size("_ior", matl_ior);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_att) {
-                    _vox_sprintf(matl_att, sizeof(matl_att), "%f", matl.att);
-                    matl_dict_size += _vox_dict_key_value_size("_att", matl_att);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_flux) {
-                    _vox_sprintf(matl_flux, sizeof(matl_flux), "%f", matl.flux);
-                    matl_dict_size += _vox_dict_key_value_size("_flux", matl_flux);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_emit) {
-                    _vox_sprintf(matl_emit, sizeof(matl_emit), "%f", matl.emit);
-                    matl_dict_size += _vox_dict_key_value_size("_emit", matl_emit);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_ldr) {
-                    _vox_sprintf(matl_ldr, sizeof(matl_ldr), "%f", matl.ldr);
-                    matl_dict_size += _vox_dict_key_value_size("_ldr", matl_ldr);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_trans) {
-                    _vox_sprintf(matl_trans, sizeof(matl_trans), "%f", matl.trans);
-                    matl_dict_size += _vox_dict_key_value_size("_trans", matl_trans);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_alpha) {
-                    _vox_sprintf(matl_alpha, sizeof(matl_alpha), "%f", matl.alpha);
-                    matl_dict_size += _vox_dict_key_value_size("_alpha", matl_alpha);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_d) {
-                    _vox_sprintf(matl_d, sizeof(matl_d), "%f", matl.d);
-                    matl_dict_size += _vox_dict_key_value_size("_d", matl_d);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_sp) {
-                    _vox_sprintf(matl_sp, sizeof(matl_sp), "%f", matl.sp);
-                    matl_dict_size += _vox_dict_key_value_size("_sp", matl_sp);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_g) {
-                    _vox_sprintf(matl_g, sizeof(matl_g), "%f", matl.g);
-                    matl_dict_size += _vox_dict_key_value_size("_g", matl_g);
-                    ++matl_dict_keyvalue_count;
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_media) {
-                    _vox_sprintf(matl_media, sizeof(matl_media), "%f", matl.media);
-                    matl_dict_size += _vox_dict_key_value_size("_media", matl_media);
-                    ++matl_dict_keyvalue_count;
-                }
-                matl_dict_size += _vox_dict_key_value_size("_type", type_str[matl.type]);
-
-                // write the material chunk header
-                _vox_file_write_uint32(fp, CHUNK_ID_MATL);
-                _vox_file_write_uint32(fp, sizeof(uint32_t) + sizeof(uint32_t) + matl_dict_size);
-                _vox_file_write_uint32(fp, 0);
-                _vox_file_write_uint32(fp, i); // material id
-                _vox_file_write_uint32(fp, matl_dict_keyvalue_count);
-                _vox_file_write_dict_key_value(fp, "_type", type_str[matl.type]);
-                if (matl.content_flags & k_ogt_vox_matl_have_metal) {
-                    _vox_file_write_dict_key_value(fp, "_metal", matl_metal);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_rough) {
-                    _vox_file_write_dict_key_value(fp, "_rough", matl_rough);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_spec) {
-                    _vox_file_write_dict_key_value(fp, "_spec", matl_spec);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_ior) {
-                    _vox_file_write_dict_key_value(fp, "_ior", matl_ior);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_att) {
-                    _vox_file_write_dict_key_value(fp, "_att", matl_att);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_flux) {
-                    _vox_file_write_dict_key_value(fp, "_flux", matl_flux);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_emit) {
-                    _vox_file_write_dict_key_value(fp, "_emit", matl_emit);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_ldr) {
-                    _vox_file_write_dict_key_value(fp, "_ldr", matl_ldr);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_trans) {
-                    _vox_file_write_dict_key_value(fp, "_trans", matl_trans);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_alpha) {
-                    _vox_file_write_dict_key_value(fp, "_alpha", matl_alpha);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_d) {
-                    _vox_file_write_dict_key_value(fp, "_d", matl_d);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_sp) {
-                    _vox_file_write_dict_key_value(fp, "_sp", matl_sp);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_g) {
-                    _vox_file_write_dict_key_value(fp, "_g", matl_g);
-                }
-                if (matl.content_flags & k_ogt_vox_matl_have_media) {
-                    _vox_file_write_dict_key_value(fp, "_media", matl_media);
-                }
-            }
-        }
-
-        // write all layer chunks out.
-        for (uint32_t i = 0; i < scene->num_layers; i++) {
-            const char* layer_name_string = scene->layers[i].name;
-            const char* hidden_string = scene->layers[i].hidden ? "1" : NULL;
-            uint32_t layer_chunk_size =
-                sizeof(int32_t) +   // layer_id
-                sizeof(uint32_t) +  // num key value pairs
-                _vox_dict_key_value_size("_name", layer_name_string) +
-                _vox_dict_key_value_size("_hidden", hidden_string) +
-                sizeof(int32_t);    // reserved id, must be -1
-            uint32_t layer_dict_keyvalue_count = (layer_name_string ? 1 : 0) + (hidden_string ? 1 : 0);
-            // write the layer chunk header
-            _vox_file_write_uint32(fp, CHUNK_ID_LAYR);
-            _vox_file_write_uint32(fp, layer_chunk_size);
-            _vox_file_write_uint32(fp, 0);
-            // write the layer chunk payload
-            _vox_file_write_uint32(fp, i);                          // layer_id
-            _vox_file_write_uint32(fp, layer_dict_keyvalue_count);  // num keyvalue pairs in layer dictionary
-            _vox_file_write_dict_key_value(fp, "_name",   layer_name_string);
-            _vox_file_write_dict_key_value(fp, "_hidden", hidden_string);
-            _vox_file_write_uint32(fp, UINT32_MAX);                 // reserved id
-        }
-
-        // we deliberately don't free the fp->data field, just pass the buffer pointer and size out to the caller
-        *buffer_size = (uint32_t)fp->data.count;
-        uint8_t* buffer_data = _vox_file_get_data(fp);
-        // we deliberately clear this pointer so it doesn't get auto-freed on exiting. The caller will own the memory hereafter.
-        fp->data.data = NULL;
-
-        // patch up the main chunk's child chunk size now that we've written everything we're going to write.
-        {
-            uint32_t* main_chunk_child_size = (uint32_t*)& buffer_data[offset_post_main_chunk - sizeof(uint32_t)];
-            *main_chunk_child_size = *buffer_size - offset_post_main_chunk;
-        }
-
-        return buffer_data;
-    }
-
-    void* ogt_vox_malloc(size_t size) {
-        return _vox_malloc(size);
-    }
-
-    void ogt_vox_free(void* mem) {
-        _vox_free(mem);
-    }
-
-    // compute the minimum and maximum x coordinate within the scene.
-    static void compute_scene_bounding_box_x(const ogt_vox_scene * scene, int32_t & out_min_x, int32_t & out_max_x) {
-        if (scene->num_instances && scene->num_models)
-        {
-            // We don't apply orientation to the model dimensions and compute the exact min/max.
-            // Instead we just conservatively use the maximum dimension of the model.
-            int32_t scene_min_x =  0x7ffffff;
-            int32_t scene_max_x = -0x7ffffff;
-            for (uint32_t instance_index = 0; instance_index < scene->num_instances; instance_index++) {
-                const ogt_vox_instance* instance = &scene->instances[instance_index];
-                // compute the instance transform, taking into account the group hierarchy.
-                ogt_vox_transform instance_transform = instance->transform;
-                uint32_t parent_group_index = instance->group_index;
-                while (parent_group_index != k_invalid_group_index) {
-                    const ogt_vox_group* group = &scene->groups[parent_group_index];
-                    instance_transform = _vox_transform_multiply(instance_transform, group->transform);
-                    parent_group_index = group->parent_group_index;
-                }
-
-                const ogt_vox_model* model = scene->models[instance->model_index];
-                // the instance_transform can be rotated, so we try to figure out whether the
-                // model's local x, y or z size is aligned along the world x axis.
-                // One of the column vectors of the transform must have a non-zero in its
-                // x field and the dimension associated with that column is the correct choice of rus.
-                int32_t max_dim = instance_transform.m00 != 0.0f ? model->size_x :
-                                  instance_transform.m10 != 0.0f ? model->size_y :
-                                  instance_transform.m20 != 0.0f ? model->size_z : model->size_x;
-                int32_t half_dim = max_dim / 2;
-                int32_t min_x = (int32_t)instance_transform.m30 - half_dim;
-                int32_t max_x = (int32_t)instance_transform.m30 + half_dim;
-                scene_min_x = min_x < scene_min_x ? min_x : scene_min_x;
-                scene_max_x = max_x > scene_max_x ? max_x : scene_max_x;
-            }
-            // pass out the dimensions.
-            out_min_x = scene_min_x;
-            out_max_x = scene_max_x;
-        }
-        else {
-            out_min_x = 0;
-            out_max_x = 0;
-        }
-    }
-
-    // returns a mask of which color indices are used by the specified scene.
-    // used_mask[0] can be false at the end of this if all models 100% fill their voxel grid with solid voxels, so callers
-    // should handle that case properly.
-    static void compute_scene_used_color_index_mask(bool* used_mask, const ogt_vox_scene * scene) {
-        memset(used_mask, 0, 256);
-        for (uint32_t model_index = 0; model_index < scene->num_models; model_index++) {
-            const ogt_vox_model* model = scene->models[model_index];
-            uint32_t voxel_count = model->size_x * model->size_y * model->size_z;
-            for (uint32_t voxel_index = 0; voxel_index < voxel_count; voxel_index++) {
-                uint8_t color_index = model->voxel_data[voxel_index];
-                used_mask[color_index] = true;
-            }
-        }
-    }
-
-    // finds an exact color in the specified palette if it exists, and UINT32_MAX otherwise
-    static uint32_t find_exact_color_in_palette(const ogt_vox_rgba * palette, uint32_t palette_count, const ogt_vox_rgba color_to_find) {
-        for (uint32_t color_index = 1; color_index < palette_count; color_index++) {
-            const ogt_vox_rgba color_to_match = palette[color_index];
-            // we only try to match r,g,b components exactly.
-            if (color_to_match.r == color_to_find.r && color_to_match.g == color_to_find.g && color_to_match.b == color_to_find.b)
-                return color_index;
-        }
-        // no exact color found
-        return UINT32_MAX;
-    }
-
-    // finds the index within the specified palette that is closest to the color we want to find
-    static uint32_t find_closest_color_in_palette(const ogt_vox_rgba * palette, uint32_t palette_count, const ogt_vox_rgba color_to_find) {
-        // the lower the score the better, so initialize this to the maximum possible score
-        int32_t  best_score = INT32_MAX;
-        uint32_t best_index = 1;
-        // Here we compute a score based on the pythagorean distance between each color in the palette and the color to find.
-        // The distance is in R,G,B space, and we choose the color with the lowest score.
-        for (uint32_t color_index = 1; color_index < palette_count; color_index++) {
-            int32_t r_diff = (int32_t)color_to_find.r - (int32_t)palette[color_index].r;
-            int32_t g_diff = (int32_t)color_to_find.g - (int32_t)palette[color_index].g;
-            int32_t b_diff = (int32_t)color_to_find.b - (int32_t)palette[color_index].b;
-            // There are 2 aspects of our treatment of color here you may want to experiment with:
-            // 1. differences in R, differences in G, differences in B are weighted the same rather than perceptually. Different weightings may be better for you.
-            // 2. We treat R,G,B as if they are in a perceptually linear within each channel. eg. the differences between
-            //    a value of 5 and 8 in any channel is perceptually the same as the difference between 233 and 236 in the same channel.
-            int32_t score = (r_diff * r_diff) + (g_diff * g_diff) + (b_diff * b_diff);
-            if (score < best_score) {
-                best_score = score;
-                best_index = color_index;
-            }
-        }
-        assert(best_score < INT32_MAX); // this might indicate a completely degenerate palette.
-        return best_index;
-    }
-
-    static void update_master_palette_from_scene(ogt_vox_rgba * master_palette, uint32_t & master_palette_count, const ogt_vox_scene * scene, uint32_t * scene_to_master_map) {
-        // compute the mask of used colors in the scene.
-        bool scene_used_mask[256];
-        compute_scene_used_color_index_mask(scene_used_mask, scene);
-
-        // initialize the map that converts from scene color_index to master color_index
-        scene_to_master_map[0] = 0;              // zero/empty always maps to zero/empty in the master palette
-        for (uint32_t i = 1; i < 256; i++)
-            scene_to_master_map[i] = UINT32_MAX; // UINT32_MAX means unassigned
-
-        // for each used color in the scene, now allocate it into the master palette.
-        for (uint32_t color_index = 1; color_index < 256; color_index++) {
-            if (scene_used_mask[color_index]) {
-                const ogt_vox_rgba color = scene->palette.color[color_index];
-                // find the exact color in the master palette. Will be UINT32_MAX if the color doesn't already exist
-                uint32_t master_index = find_exact_color_in_palette(master_palette, master_palette_count, color);
-                if (master_index == UINT32_MAX) {
-                    if (master_palette_count < 256) {
-                        // master palette capacity hasn't been exceeded so far, allocate the color to it.
-                        master_palette[master_palette_count] = color;
-                        master_index = master_palette_count++;
-                    }
-                    else {
-                        // otherwise, find the color that is perceptually closest to the original color.
-
-                        // TODO(jpaver): It is potentially problematic if we hit this path for a many-scene merge.
-                        // Earlier scenes will reserve their colors exactly into the master palette, whereas later
-                        // scenes will end up having some of their colors remapped to different colors.
-
-                        // A more holistic approach to color allocation may be necessary here eg.
-                        // we might allow the master palette to grow to more than 256 entries, and then use
-                        // similarity/frequency metrics to reduce the palette from that down to 256 entries. This
-                        // will mean all scenes will have be equally important if they have a high-frequency
-                        // usage of a color.
-                        master_index = find_closest_color_in_palette(master_palette, master_palette_count, color);
-                    }
-                }
-                // caller needs to know how to map its original color index into the master palette
-                scene_to_master_map[color_index] = master_index;
-            }
-        }
-    }
-
-    ogt_vox_scene* ogt_vox_merge_scenes(const ogt_vox_scene** scenes, uint32_t scene_count, const ogt_vox_rgba* required_colors, const uint32_t required_color_count) {
-        assert(required_color_count <= 255);    // can't exceed the maximum colors in the master palette plus the empty slot.
-
-        // initialize the master palette. If required colors are specified, map them into the master palette now.
-        ogt_vox_rgba  master_palette[256];
-        uint32_t master_palette_count = 1;          // color_index 0 is reserved for empty color!
-        memset(&master_palette, 0, sizeof(master_palette));
-        for (uint32_t required_index = 0; required_index < required_color_count; required_index++)
-            master_palette[master_palette_count++] = required_colors[required_index];
-
-        // count the number of required models, instances in the master scene
-        uint32_t max_layers = 1;  // we don't actually merge layers. Every instance will be in layer 0.
-        uint32_t max_models = 0;
-        uint32_t max_instances = 0;
-        uint32_t max_groups = 1;  // we add 1 root global group that everything will ultimately be parented to.
-        for (uint32_t scene_index = 0; scene_index < scene_count; scene_index++) {
-            if (!scenes[scene_index])
-                continue;
-            max_instances += scenes[scene_index]->num_instances;
-            max_models += scenes[scene_index]->num_models;
-            max_groups += scenes[scene_index]->num_groups;
-        }
-
-        // allocate the master instances array
-        ogt_vox_instance* instances = (ogt_vox_instance*)_vox_malloc(sizeof(ogt_vox_instance) * max_instances);
-        ogt_vox_model** models      = (ogt_vox_model**)_vox_malloc(sizeof(ogt_vox_model*) * max_models);
-        ogt_vox_layer* layers       = (ogt_vox_layer*)_vox_malloc(sizeof(ogt_vox_layer) * max_layers);
-        ogt_vox_group* groups       = (ogt_vox_group*)_vox_malloc(sizeof(ogt_vox_group) * max_groups);
-        uint32_t num_instances = 0;
-        uint32_t num_models    = 0;
-        uint32_t num_layers    = 0;
-        uint32_t num_groups    = 0;
-
-        // add a single layer.
-        layers[num_layers].hidden = false;
-        layers[num_layers].name = "merged";
-        num_layers++;
-
-        // magicavoxel expects exactly 1 root group, so if we have multiple scenes with multiple roots,
-        // we must ensure all merged scenes are parented to the same root group. Allocate it now for the
-        // merged scene.
-        uint32_t global_root_group_index = num_groups;
-        {
-            assert(global_root_group_index == 0);
-            ogt_vox_group root_group;
-            root_group.hidden             = false;
-            root_group.layer_index        = 0;
-            root_group.parent_group_index = k_invalid_group_index;
-            root_group.transform          = _vox_transform_identity();
-            groups[num_groups++] = root_group;
-        }
-
-        // go ahead and do the merge now!
-        size_t string_data_size = 0;
-        int32_t offset_x = 0;
-        for (uint32_t scene_index = 0; scene_index < scene_count; scene_index++) {
-            const ogt_vox_scene* scene = scenes[scene_index];
-            if (!scene)
-                continue;
-
-            // update the master palette, and get the map of this scene's color indices into the master palette.
-            uint32_t scene_color_index_to_master_map[256];
-            update_master_palette_from_scene(master_palette, master_palette_count, scene, scene_color_index_to_master_map);
-
-            // cache away the base model index for this scene.
-            uint32_t base_model_index = num_models;
-            uint32_t base_group_index = num_groups;
-
-            // create copies of all models that have color indices remapped.
-            for (uint32_t model_index = 0; model_index < scene->num_models; model_index++) {
-                const ogt_vox_model* model = scene->models[model_index];
-                uint32_t voxel_count = model->size_x * model->size_y * model->size_z;
-                // clone the model
-                ogt_vox_model* override_model = (ogt_vox_model*)_vox_malloc(sizeof(ogt_vox_model) + voxel_count);
-                uint8_t * override_voxel_data = (uint8_t*)& override_model[1];
-
-                // remap all color indices in the cloned model so they reference the master palette now!
-                for (uint32_t voxel_index = 0; voxel_index < voxel_count; voxel_index++) {
-                    uint8_t  old_color_index = model->voxel_data[voxel_index];
-                    uint32_t new_color_index = scene_color_index_to_master_map[old_color_index];
-                    assert(new_color_index < 256);
-                    override_voxel_data[voxel_index] = (uint8_t)new_color_index;
-                }
-                // assign the new model.
-                *override_model = *model;
-                override_model->voxel_data = override_voxel_data;
-                override_model->voxel_hash = _vox_hash(override_voxel_data, voxel_count);
-
-                models[num_models++] = override_model;
-            }
-
-            // compute the scene bounding box on x dimension. this is used to offset instances
-            // and groups in the merged model along X dimension such that they do not overlap
-            // with instances from another scene in the merged model.
-            int32_t scene_min_x, scene_max_x;
-            compute_scene_bounding_box_x(scene, scene_min_x, scene_max_x);
-            float scene_offset_x = (float)(offset_x - scene_min_x);
-
-            // each scene has a root group, and it must the 0th group in its local groups[] array,
-            assert(scene->groups[0].parent_group_index == k_invalid_group_index);
-            // create copies of all groups into the merged scene (except the root group from each scene -- which is why we start group_index at 1 here)
-            for (uint32_t group_index = 1; group_index < scene->num_groups; group_index++) {
-                const ogt_vox_group* src_group = &scene->groups[group_index];
-                assert(src_group->parent_group_index != k_invalid_group_index); // there can be only 1 root group per scene and it must be the 0th group.
-                ogt_vox_group dst_group = *src_group;
-                assert(dst_group.parent_group_index < scene->num_groups);
-                dst_group.layer_index        = 0;
-                dst_group.parent_group_index = (dst_group.parent_group_index == 0) ? global_root_group_index : base_group_index + (dst_group.parent_group_index - 1);
-                // if this group belongs to the global root group, it must be translated so it doesn't overlap with other scenes.
-                if (dst_group.parent_group_index == global_root_group_index)
-                    dst_group.transform.m30 += scene_offset_x;
-                groups[num_groups++] = dst_group;
-            }
-
-            // create copies of all instances (and bias them such that minimum on x starts at zero)
-            for (uint32_t instance_index = 0; instance_index < scene->num_instances; instance_index++) {
-                const ogt_vox_instance* src_instance = &scene->instances[instance_index];
-                assert(src_instance->group_index < scene->num_groups);  // every instance must be mapped to a group.
-                ogt_vox_instance* dst_instance = &instances[num_instances++];
-                *dst_instance = *src_instance;
-                dst_instance->layer_index = 0;
-                dst_instance->group_index = (dst_instance->group_index == 0) ? global_root_group_index : base_group_index + (dst_instance->group_index - 1);
-                dst_instance->model_index += base_model_index;
-                if (dst_instance->name)
-                    string_data_size += _vox_strlen(dst_instance->name) + 1; // + 1 for zero terminator
-                // if this instance belongs to the global rot group, it must be translated so it doesn't overlap with other scenes.
-                if (dst_instance->group_index == global_root_group_index)
-                    dst_instance->transform.m30 += scene_offset_x;
-            }
-
-            offset_x += (scene_max_x - scene_min_x); // step the width of the scene in x dimension
-            offset_x += 4;                           // a margin of this many voxels between scenes
-        }
-
-        // fill any unused master palette entries with purple/invalid color.
-        const ogt_vox_rgba k_invalid_color = { 255, 0, 255, 255 };  // purple = invalid
-        for (uint32_t color_index = master_palette_count; color_index < 256; color_index++)
-            master_palette[color_index] = k_invalid_color;
-
-        // assign the master scene on output. string_data is part of the scene allocation.
-        size_t scene_size = sizeof(ogt_vox_scene) + string_data_size;
-        ogt_vox_scene * merged_scene = (ogt_vox_scene*)_vox_calloc(scene_size);
-
-        // copy name data into the string section and make instances point to it. This makes the merged model self-contained.
-        char* scene_string_data = (char*)&merged_scene[1];
-        for (uint32_t instance_index = 0; instance_index < num_instances; instance_index++) {
-            if (instances[instance_index].name) {
-                size_t string_len = _vox_strlen(instances[instance_index].name) + 1; // +1 for zero terminator
-                memcpy(scene_string_data, instances[instance_index].name, string_len);
-                instances[instance_index].name = scene_string_data;
-                scene_string_data += string_len;
-            }
-        }
-
-        assert(num_groups <= max_groups);
-
-        memset(merged_scene, 0, sizeof(ogt_vox_scene));
-        merged_scene->instances     = instances;
-        merged_scene->num_instances = max_instances;
-        merged_scene->models        = (const ogt_vox_model * *)models;
-        merged_scene->num_models    = max_models;
-        merged_scene->layers        = layers;
-        merged_scene->num_layers    = max_layers;
-        merged_scene->groups        = groups;
-        merged_scene->num_groups    = num_groups;
-        // copy color palette into the merged scene
-        for (uint32_t color_index = 0; color_index < 256; color_index++)
-            merged_scene->palette.color[color_index] = master_palette[color_index];
-
-        return merged_scene;
-    }
-
- #endif // #ifdef OGT_VOX_IMPLEMENTATION
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-/* -------------------------------------------------------------------------------------------------------------------------------------------------
-
-    MIT License
-
-    Copyright (c) 2019 Justin Paver
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
-
-------------------------------------------------------------------------------------------------------------------------------------------------- */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pugiconfig.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/pugiconfig.hpp
deleted file mode 100644
index d6ad8c7f6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pugiconfig.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * pugixml parser - version 1.13
- * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at https://pugixml.org/
- *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
- *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
- */
-
-#ifndef HEADER_PUGICONFIG_HPP
-#define HEADER_PUGICONFIG_HPP
-
-// Uncomment this to enable wchar_t mode
-// #define PUGIXML_WCHAR_MODE
-
-// Uncomment this to enable compact mode
-// #define PUGIXML_COMPACT
-
-// Uncomment this to disable XPath
-// #define PUGIXML_NO_XPATH
-
-// Uncomment this to disable STL
-// #define PUGIXML_NO_STL
-
-// Uncomment this to disable exceptions
-// tinyusdz mod
-#define PUGIXML_NO_EXCEPTIONS
-
-// Set this to control attributes for public classes/functions, i.e.:
-// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
-// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
-// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
-// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
-
-// Tune these constants to adjust memory-related behavior
-// #define PUGIXML_MEMORY_PAGE_SIZE 32768
-// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
-// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
-
-// Tune this constant to adjust max nesting for XPath queries
-// #define PUGIXML_XPATH_DEPTH_LIMIT 1024
-
-// Uncomment this to switch to header-only version
-// #define PUGIXML_HEADER_ONLY
-
-// Uncomment this to enable long long support
-// #define PUGIXML_HAS_LONG_LONG
-
-#endif
-
-/**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pugixml.LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/pugixml.LICENSE
deleted file mode 100644
index 63042bd91..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pugixml.LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-MIT License
-
-Copyright (c) 2006-2022 Arseny Kapoulkine
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pugixml.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/pugixml.cpp
deleted file mode 100644
index e02a137fd..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pugixml.cpp
+++ /dev/null
@@ -1,13188 +0,0 @@
-/**
- * pugixml parser - version 1.13
- * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at https://pugixml.org/
- *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
- *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
- */
-
-#ifndef SOURCE_PUGIXML_CPP
-#define SOURCE_PUGIXML_CPP
-
-#include "pugixml.hpp"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <limits.h>
-
-#ifdef PUGIXML_WCHAR_MODE
-#	include <wchar.h>
-#endif
-
-#ifndef PUGIXML_NO_XPATH
-#	include <math.h>
-#	include <float.h>
-#endif
-
-#ifndef PUGIXML_NO_STL
-#	include <istream>
-#	include <ostream>
-#	include <string>
-#endif
-
-// For placement new
-#include <new>
-
-// For load_file
-#if defined(__linux__) || defined(__APPLE__)
-#include <sys/stat.h>
-#endif
-
-#ifdef _MSC_VER
-#	pragma warning(push)
-#	pragma warning(disable: 4127) // conditional expression is constant
-#	pragma warning(disable: 4324) // structure was padded due to __declspec(align())
-#	pragma warning(disable: 4702) // unreachable code
-#	pragma warning(disable: 4996) // this function or variable may be unsafe
-#endif
-
-#if defined(_MSC_VER) && defined(__c2__)
-#	pragma clang diagnostic push
-#	pragma clang diagnostic ignored "-Wdeprecated" // this function or variable may be unsafe
-#endif
-
-#ifdef __INTEL_COMPILER
-#	pragma warning(disable: 177) // function was declared but never referenced
-#	pragma warning(disable: 279) // controlling expression is constant
-#	pragma warning(disable: 1478 1786) // function was declared "deprecated"
-#	pragma warning(disable: 1684) // conversion from pointer to same-sized integral type
-#endif
-
-#if defined(__BORLANDC__) && defined(PUGIXML_HEADER_ONLY)
-#	pragma warn -8080 // symbol is declared but never used; disabling this inside push/pop bracket does not make the warning go away
-#endif
-
-#ifdef __BORLANDC__
-#	pragma option push
-#	pragma warn -8008 // condition is always false
-#	pragma warn -8066 // unreachable code
-#endif
-
-#ifdef __SNC__
-// Using diag_push/diag_pop does not disable the warnings inside templates due to a compiler bug
-#	pragma diag_suppress=178 // function was declared but never referenced
-#	pragma diag_suppress=237 // controlling expression is constant
-#endif
-
-#ifdef __TI_COMPILER_VERSION__
-#	pragma diag_suppress 179 // function was declared but never referenced
-#endif
-
-// Inlining controls
-#if defined(_MSC_VER) && _MSC_VER >= 1300
-#	define PUGI_IMPL_NO_INLINE __declspec(noinline)
-#elif defined(__GNUC__)
-#	define PUGI_IMPL_NO_INLINE __attribute__((noinline))
-#else
-#	define PUGI_IMPL_NO_INLINE
-#endif
-
-// Branch weight controls
-#if defined(__GNUC__) && !defined(__c2__)
-#	define PUGI_IMPL_UNLIKELY(cond) __builtin_expect(cond, 0)
-#else
-#	define PUGI_IMPL_UNLIKELY(cond) (cond)
-#endif
-
-// Simple static assertion
-#define PUGI_IMPL_STATIC_ASSERT(cond) { static const char condition_failed[(cond) ? 1 : -1] = {0}; (void)condition_failed[0]; }
-
-// Digital Mars C++ bug workaround for passing char loaded from memory via stack
-#ifdef __DMC__
-#	define PUGI_IMPL_DMC_VOLATILE volatile
-#else
-#	define PUGI_IMPL_DMC_VOLATILE
-#endif
-
-// Integer sanitizer workaround; we only apply this for clang since gcc8 has no_sanitize but not unsigned-integer-overflow and produces "attribute directive ignored" warnings
-#if defined(__clang__) && defined(__has_attribute)
-#	if __has_attribute(no_sanitize)
-#		define PUGI_IMPL_UNSIGNED_OVERFLOW __attribute__((no_sanitize("unsigned-integer-overflow")))
-#	else
-#		define PUGI_IMPL_UNSIGNED_OVERFLOW
-#	endif
-#else
-#	define PUGI_IMPL_UNSIGNED_OVERFLOW
-#endif
-
-// Borland C++ bug workaround for not defining ::memcpy depending on header include order (can't always use std::memcpy because some compilers don't have it at all)
-#if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST)
-using std::memcpy;
-using std::memmove;
-using std::memset;
-#endif
-
-// Old versions of GCC do not define ::malloc and ::free depending on header include order
-#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4))
-using std::malloc;
-using std::free;
-#endif
-
-// Some MinGW/GCC versions have headers that erroneously omit LLONG_MIN/LLONG_MAX/ULLONG_MAX definitions from limits.h in some configurations
-#if defined(PUGIXML_HAS_LONG_LONG) && defined(__GNUC__) && !defined(LLONG_MAX) && !defined(LLONG_MIN) && !defined(ULLONG_MAX)
-#	define LLONG_MIN (-LLONG_MAX - 1LL)
-#	define LLONG_MAX __LONG_LONG_MAX__
-#	define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-#endif
-
-// In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features
-#if defined(_MSC_VER) && !defined(__S3E__) && !defined(_WIN32_WCE)
-#	define PUGI_IMPL_MSVC_CRT_VERSION _MSC_VER
-#elif defined(_WIN32_WCE)
-#	define PUGI_IMPL_MSVC_CRT_VERSION 1310 // MSVC7.1
-#endif
-
-// Not all platforms have snprintf; we define a wrapper that uses snprintf if possible. This only works with buffers with a known size.
-#if __cplusplus >= 201103
-#	define PUGI_IMPL_SNPRINTF(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)
-#elif defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
-#	define PUGI_IMPL_SNPRINTF(buf, ...) _snprintf_s(buf, _countof(buf), _TRUNCATE, __VA_ARGS__)
-#elif defined(__APPLE__) && __clang_major__ >= 14 // Xcode 14 marks sprintf as deprecated while still using C++98 by default
-#	define PUGI_IMPL_SNPRINTF(buf, fmt, arg1, arg2) snprintf(buf, sizeof(buf), fmt, arg1, arg2)
-#else
-#	define PUGI_IMPL_SNPRINTF sprintf
-#endif
-
-// We put implementation details into an anonymous namespace in source mode, but have to keep it in non-anonymous namespace in header-only mode to prevent binary bloat.
-#ifdef PUGIXML_HEADER_ONLY
-#	define PUGI_IMPL_NS_BEGIN namespace pugi { namespace impl {
-#	define PUGI_IMPL_NS_END } }
-#	define PUGI_IMPL_FN inline
-#	define PUGI_IMPL_FN_NO_INLINE inline
-#else
-#	if defined(_MSC_VER) && _MSC_VER < 1300 // MSVC6 seems to have an amusing bug with anonymous namespaces inside namespaces
-#		define PUGI_IMPL_NS_BEGIN namespace pugi { namespace impl {
-#		define PUGI_IMPL_NS_END } }
-#	else
-#		define PUGI_IMPL_NS_BEGIN namespace pugi { namespace impl { namespace {
-#		define PUGI_IMPL_NS_END } } }
-#	endif
-#	define PUGI_IMPL_FN
-#	define PUGI_IMPL_FN_NO_INLINE PUGI_IMPL_NO_INLINE
-#endif
-
-// uintptr_t
-#if (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(__BORLANDC__) && __BORLANDC__ < 0x561)
-namespace pugi
-{
-#	ifndef _UINTPTR_T_DEFINED
-	typedef size_t uintptr_t;
-#	endif
-
-	typedef unsigned __int8 uint8_t;
-	typedef unsigned __int16 uint16_t;
-	typedef unsigned __int32 uint32_t;
-}
-#else
-#	include <stdint.h>
-#endif
-
-// Memory allocation
-PUGI_IMPL_NS_BEGIN
-	PUGI_IMPL_FN void* default_allocate(size_t size)
-	{
-		return malloc(size);
-	}
-
-	PUGI_IMPL_FN void default_deallocate(void* ptr)
-	{
-		free(ptr);
-	}
-
-	template <typename T>
-	struct xml_memory_management_function_storage
-	{
-		static allocation_function allocate;
-		static deallocation_function deallocate;
-	};
-
-	// Global allocation functions are stored in class statics so that in header mode linker deduplicates them
-	// Without a template<> we'll get multiple definitions of the same static
-	template <typename T> allocation_function xml_memory_management_function_storage<T>::allocate = default_allocate;
-	template <typename T> deallocation_function xml_memory_management_function_storage<T>::deallocate = default_deallocate;
-
-	typedef xml_memory_management_function_storage<int> xml_memory;
-PUGI_IMPL_NS_END
-
-// String utilities
-PUGI_IMPL_NS_BEGIN
-	// Get string length
-	PUGI_IMPL_FN size_t strlength(const char_t* s)
-	{
-		assert(s);
-
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcslen(s);
-	#else
-		return strlen(s);
-	#endif
-	}
-
-	// Compare two strings
-	PUGI_IMPL_FN bool strequal(const char_t* src, const char_t* dst)
-	{
-		assert(src && dst);
-
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcscmp(src, dst) == 0;
-	#else
-		return strcmp(src, dst) == 0;
-	#endif
-	}
-
-	// Compare lhs with [rhs_begin, rhs_end)
-	PUGI_IMPL_FN bool strequalrange(const char_t* lhs, const char_t* rhs, size_t count)
-	{
-		for (size_t i = 0; i < count; ++i)
-			if (lhs[i] != rhs[i])
-				return false;
-
-		return lhs[count] == 0;
-	}
-
-	// Get length of wide string, even if CRT lacks wide character support
-	PUGI_IMPL_FN size_t strlength_wide(const wchar_t* s)
-	{
-		assert(s);
-
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcslen(s);
-	#else
-		const wchar_t* end = s;
-		while (*end) end++;
-		return static_cast<size_t>(end - s);
-	#endif
-	}
-PUGI_IMPL_NS_END
-
-// auto_ptr-like object for exception recovery
-PUGI_IMPL_NS_BEGIN
-	template <typename T> struct auto_deleter
-	{
-		typedef void (*D)(T*);
-
-		T* data;
-		D deleter;
-
-		auto_deleter(T* data_, D deleter_): data(data_), deleter(deleter_)
-		{
-		}
-
-		~auto_deleter()
-		{
-			if (data) deleter(data);
-		}
-
-		T* release()
-		{
-			T* result = data;
-			data = 0;
-			return result;
-		}
-	};
-PUGI_IMPL_NS_END
-
-#ifdef PUGIXML_COMPACT
-PUGI_IMPL_NS_BEGIN
-	class compact_hash_table
-	{
-	public:
-		compact_hash_table(): _items(0), _capacity(0), _count(0)
-		{
-		}
-
-		void clear()
-		{
-			if (_items)
-			{
-				xml_memory::deallocate(_items);
-				_items = 0;
-				_capacity = 0;
-				_count = 0;
-			}
-		}
-
-		void* find(const void* key)
-		{
-			if (_capacity == 0) return 0;
-
-			item_t* item = get_item(key);
-			assert(item);
-			assert(item->key == key || (item->key == 0 && item->value == 0));
-
-			return item->value;
-		}
-
-		void insert(const void* key, void* value)
-		{
-			assert(_capacity != 0 && _count < _capacity - _capacity / 4);
-
-			item_t* item = get_item(key);
-			assert(item);
-
-			if (item->key == 0)
-			{
-				_count++;
-				item->key = key;
-			}
-
-			item->value = value;
-		}
-
-		bool reserve(size_t extra = 16)
-		{
-			if (_count + extra >= _capacity - _capacity / 4)
-				return rehash(_count + extra);
-
-			return true;
-		}
-
-	private:
-		struct item_t
-		{
-			const void* key;
-			void* value;
-		};
-
-		item_t* _items;
-		size_t _capacity;
-
-		size_t _count;
-
-		bool rehash(size_t count);
-
-		item_t* get_item(const void* key)
-		{
-			assert(key);
-			assert(_capacity > 0);
-
-			size_t hashmod = _capacity - 1;
-			size_t bucket = hash(key) & hashmod;
-
-			for (size_t probe = 0; probe <= hashmod; ++probe)
-			{
-				item_t& probe_item = _items[bucket];
-
-				if (probe_item.key == key || probe_item.key == 0)
-					return &probe_item;
-
-				// hash collision, quadratic probing
-				bucket = (bucket + probe + 1) & hashmod;
-			}
-
-			assert(false && "Hash table is full"); // unreachable
-			return 0;
-		}
-
-		static PUGI_IMPL_UNSIGNED_OVERFLOW unsigned int hash(const void* key)
-		{
-			unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key) & 0xffffffff);
-
-			// MurmurHash3 32-bit finalizer
-			h ^= h >> 16;
-			h *= 0x85ebca6bu;
-			h ^= h >> 13;
-			h *= 0xc2b2ae35u;
-			h ^= h >> 16;
-
-			return h;
-		}
-	};
-
-	PUGI_IMPL_FN_NO_INLINE bool compact_hash_table::rehash(size_t count)
-	{
-		size_t capacity = 32;
-		while (count >= capacity - capacity / 4)
-			capacity *= 2;
-
-		compact_hash_table rt;
-		rt._capacity = capacity;
-		rt._items = static_cast<item_t*>(xml_memory::allocate(sizeof(item_t) * capacity));
-
-		if (!rt._items)
-			return false;
-
-		memset(rt._items, 0, sizeof(item_t) * capacity);
-
-		for (size_t i = 0; i < _capacity; ++i)
-			if (_items[i].key)
-				rt.insert(_items[i].key, _items[i].value);
-
-		if (_items)
-			xml_memory::deallocate(_items);
-
-		_capacity = capacity;
-		_items = rt._items;
-
-		assert(_count == rt._count);
-
-		return true;
-	}
-
-PUGI_IMPL_NS_END
-#endif
-
-PUGI_IMPL_NS_BEGIN
-#ifdef PUGIXML_COMPACT
-	static const uintptr_t xml_memory_block_alignment = 4;
-#else
-	static const uintptr_t xml_memory_block_alignment = sizeof(void*);
-#endif
-
-	// extra metadata bits
-	static const uintptr_t xml_memory_page_contents_shared_mask = 64;
-	static const uintptr_t xml_memory_page_name_allocated_mask = 32;
-	static const uintptr_t xml_memory_page_value_allocated_mask = 16;
-	static const uintptr_t xml_memory_page_type_mask = 15;
-
-	// combined masks for string uniqueness
-	static const uintptr_t xml_memory_page_name_allocated_or_shared_mask = xml_memory_page_name_allocated_mask | xml_memory_page_contents_shared_mask;
-	static const uintptr_t xml_memory_page_value_allocated_or_shared_mask = xml_memory_page_value_allocated_mask | xml_memory_page_contents_shared_mask;
-
-#ifdef PUGIXML_COMPACT
-	#define PUGI_IMPL_GETHEADER_IMPL(object, page, flags) // unused
-	#define PUGI_IMPL_GETPAGE_IMPL(header) (header).get_page()
-#else
-	#define PUGI_IMPL_GETHEADER_IMPL(object, page, flags) (((reinterpret_cast<char*>(object) - reinterpret_cast<char*>(page)) << 8) | (flags))
-	// this macro casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
-	#define PUGI_IMPL_GETPAGE_IMPL(header) static_cast<impl::xml_memory_page*>(const_cast<void*>(static_cast<const void*>(reinterpret_cast<const char*>(&header) - (header >> 8))))
-#endif
-
-	#define PUGI_IMPL_GETPAGE(n) PUGI_IMPL_GETPAGE_IMPL((n)->header)
-	#define PUGI_IMPL_NODETYPE(n) static_cast<xml_node_type>((n)->header & impl::xml_memory_page_type_mask)
-
-	struct xml_allocator;
-
-	struct xml_memory_page
-	{
-		static xml_memory_page* construct(void* memory)
-		{
-			xml_memory_page* result = static_cast<xml_memory_page*>(memory);
-
-			result->allocator = 0;
-			result->prev = 0;
-			result->next = 0;
-			result->busy_size = 0;
-			result->freed_size = 0;
-
-		#ifdef PUGIXML_COMPACT
-			result->compact_string_base = 0;
-			result->compact_shared_parent = 0;
-			result->compact_page_marker = 0;
-		#endif
-
-			return result;
-		}
-
-		xml_allocator* allocator;
-
-		xml_memory_page* prev;
-		xml_memory_page* next;
-
-		size_t busy_size;
-		size_t freed_size;
-
-	#ifdef PUGIXML_COMPACT
-		char_t* compact_string_base;
-		void* compact_shared_parent;
-		uint32_t* compact_page_marker;
-	#endif
-	};
-
-	static const size_t xml_memory_page_size =
-	#ifdef PUGIXML_MEMORY_PAGE_SIZE
-		(PUGIXML_MEMORY_PAGE_SIZE)
-	#else
-		32768
-	#endif
-		- sizeof(xml_memory_page);
-
-	struct xml_memory_string_header
-	{
-		uint16_t page_offset; // offset from page->data
-		uint16_t full_size; // 0 if string occupies whole page
-	};
-
-	struct xml_allocator
-	{
-		xml_allocator(xml_memory_page* root): _root(root), _busy_size(root->busy_size)
-		{
-		#ifdef PUGIXML_COMPACT
-			_hash = 0;
-		#endif
-		}
-
-		xml_memory_page* allocate_page(size_t data_size)
-		{
-			size_t size = sizeof(xml_memory_page) + data_size;
-
-			// allocate block with some alignment, leaving memory for worst-case padding
-			void* memory = xml_memory::allocate(size);
-			if (!memory) return 0;
-
-			// prepare page structure
-			xml_memory_page* page = xml_memory_page::construct(memory);
-			assert(page);
-
-			assert(this == _root->allocator);
-			page->allocator = this;
-
-			return page;
-		}
-
-		static void deallocate_page(xml_memory_page* page)
-		{
-			xml_memory::deallocate(page);
-		}
-
-		void* allocate_memory_oob(size_t size, xml_memory_page*& out_page);
-
-		void* allocate_memory(size_t size, xml_memory_page*& out_page)
-		{
-			if (PUGI_IMPL_UNLIKELY(_busy_size + size > xml_memory_page_size))
-				return allocate_memory_oob(size, out_page);
-
-			void* buf = reinterpret_cast<char*>(_root) + sizeof(xml_memory_page) + _busy_size;
-
-			_busy_size += size;
-
-			out_page = _root;
-
-			return buf;
-		}
-
-	#ifdef PUGIXML_COMPACT
-		void* allocate_object(size_t size, xml_memory_page*& out_page)
-		{
-			void* result = allocate_memory(size + sizeof(uint32_t), out_page);
-			if (!result) return 0;
-
-			// adjust for marker
-			ptrdiff_t offset = static_cast<char*>(result) - reinterpret_cast<char*>(out_page->compact_page_marker);
-
-			if (PUGI_IMPL_UNLIKELY(static_cast<uintptr_t>(offset) >= 256 * xml_memory_block_alignment))
-			{
-				// insert new marker
-				uint32_t* marker = static_cast<uint32_t*>(result);
-
-				*marker = static_cast<uint32_t>(reinterpret_cast<char*>(marker) - reinterpret_cast<char*>(out_page));
-				out_page->compact_page_marker = marker;
-
-				// since we don't reuse the page space until we reallocate it, we can just pretend that we freed the marker block
-				// this will make sure deallocate_memory correctly tracks the size
-				out_page->freed_size += sizeof(uint32_t);
-
-				return marker + 1;
-			}
-			else
-			{
-				// roll back uint32_t part
-				_busy_size -= sizeof(uint32_t);
-
-				return result;
-			}
-		}
-	#else
-		void* allocate_object(size_t size, xml_memory_page*& out_page)
-		{
-			return allocate_memory(size, out_page);
-		}
-	#endif
-
-		void deallocate_memory(void* ptr, size_t size, xml_memory_page* page)
-		{
-			if (page == _root) page->busy_size = _busy_size;
-
-			assert(ptr >= reinterpret_cast<char*>(page) + sizeof(xml_memory_page) && ptr < reinterpret_cast<char*>(page) + sizeof(xml_memory_page) + page->busy_size);
-			(void)!ptr;
-
-			page->freed_size += size;
-			assert(page->freed_size <= page->busy_size);
-
-			if (page->freed_size == page->busy_size)
-			{
-				if (page->next == 0)
-				{
-					assert(_root == page);
-
-					// top page freed, just reset sizes
-					page->busy_size = 0;
-					page->freed_size = 0;
-
-				#ifdef PUGIXML_COMPACT
-					// reset compact state to maximize efficiency
-					page->compact_string_base = 0;
-					page->compact_shared_parent = 0;
-					page->compact_page_marker = 0;
-				#endif
-
-					_busy_size = 0;
-				}
-				else
-				{
-					assert(_root != page);
-					assert(page->prev);
-
-					// remove from the list
-					page->prev->next = page->next;
-					page->next->prev = page->prev;
-
-					// deallocate
-					deallocate_page(page);
-				}
-			}
-		}
-
-		char_t* allocate_string(size_t length)
-		{
-			static const size_t max_encoded_offset = (1 << 16) * xml_memory_block_alignment;
-
-			PUGI_IMPL_STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset);
-
-			// allocate memory for string and header block
-			size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t);
-
-			// round size up to block alignment boundary
-			size_t full_size = (size + (xml_memory_block_alignment - 1)) & ~(xml_memory_block_alignment - 1);
-
-			xml_memory_page* page;
-			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(allocate_memory(full_size, page));
-
-			if (!header) return 0;
-
-			// setup header
-			ptrdiff_t page_offset = reinterpret_cast<char*>(header) - reinterpret_cast<char*>(page) - sizeof(xml_memory_page);
-
-			assert(page_offset % xml_memory_block_alignment == 0);
-			assert(page_offset >= 0 && static_cast<size_t>(page_offset) < max_encoded_offset);
-			header->page_offset = static_cast<uint16_t>(static_cast<size_t>(page_offset) / xml_memory_block_alignment);
-
-			// full_size == 0 for large strings that occupy the whole page
-			assert(full_size % xml_memory_block_alignment == 0);
-			assert(full_size < max_encoded_offset || (page->busy_size == full_size && page_offset == 0));
-			header->full_size = static_cast<uint16_t>(full_size < max_encoded_offset ? full_size / xml_memory_block_alignment : 0);
-
-			// round-trip through void* to avoid 'cast increases required alignment of target type' warning
-			// header is guaranteed a pointer-sized alignment, which should be enough for char_t
-			return static_cast<char_t*>(static_cast<void*>(header + 1));
-		}
-
-		void deallocate_string(char_t* string)
-		{
-			// this function casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
-			// we're guaranteed the proper (pointer-sized) alignment on the input string if it was allocated via allocate_string
-
-			// get header
-			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(static_cast<void*>(string)) - 1;
-			assert(header);
-
-			// deallocate
-			size_t page_offset = sizeof(xml_memory_page) + header->page_offset * xml_memory_block_alignment;
-			xml_memory_page* page = reinterpret_cast<xml_memory_page*>(static_cast<void*>(reinterpret_cast<char*>(header) - page_offset));
-
-			// if full_size == 0 then this string occupies the whole page
-			size_t full_size = header->full_size == 0 ? page->busy_size : header->full_size * xml_memory_block_alignment;
-
-			deallocate_memory(header, full_size, page);
-		}
-
-		bool reserve()
-		{
-		#ifdef PUGIXML_COMPACT
-			return _hash->reserve();
-		#else
-			return true;
-		#endif
-		}
-
-		xml_memory_page* _root;
-		size_t _busy_size;
-
-	#ifdef PUGIXML_COMPACT
-		compact_hash_table* _hash;
-	#endif
-	};
-
-	PUGI_IMPL_FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page)
-	{
-		const size_t large_allocation_threshold = xml_memory_page_size / 4;
-
-		xml_memory_page* page = allocate_page(size <= large_allocation_threshold ? xml_memory_page_size : size);
-		out_page = page;
-
-		if (!page) return 0;
-
-		if (size <= large_allocation_threshold)
-		{
-			_root->busy_size = _busy_size;
-
-			// insert page at the end of linked list
-			page->prev = _root;
-			_root->next = page;
-			_root = page;
-
-			_busy_size = size;
-		}
-		else
-		{
-			// insert page before the end of linked list, so that it is deleted as soon as possible
-			// the last page is not deleted even if it's empty (see deallocate_memory)
-			assert(_root->prev);
-
-			page->prev = _root->prev;
-			page->next = _root;
-
-			_root->prev->next = page;
-			_root->prev = page;
-
-			page->busy_size = size;
-		}
-
-		return reinterpret_cast<char*>(page) + sizeof(xml_memory_page);
-	}
-PUGI_IMPL_NS_END
-
-#ifdef PUGIXML_COMPACT
-PUGI_IMPL_NS_BEGIN
-	static const uintptr_t compact_alignment_log2 = 2;
-	static const uintptr_t compact_alignment = 1 << compact_alignment_log2;
-
-	class compact_header
-	{
-	public:
-		compact_header(xml_memory_page* page, unsigned int flags)
-		{
-			PUGI_IMPL_STATIC_ASSERT(xml_memory_block_alignment == compact_alignment);
-
-			ptrdiff_t offset = (reinterpret_cast<char*>(this) - reinterpret_cast<char*>(page->compact_page_marker));
-			assert(offset % compact_alignment == 0 && static_cast<uintptr_t>(offset) < 256 * compact_alignment);
-
-			_page = static_cast<unsigned char>(offset >> compact_alignment_log2);
-			_flags = static_cast<unsigned char>(flags);
-		}
-
-		void operator&=(uintptr_t mod)
-		{
-			_flags &= static_cast<unsigned char>(mod);
-		}
-
-		void operator|=(uintptr_t mod)
-		{
-			_flags |= static_cast<unsigned char>(mod);
-		}
-
-		uintptr_t operator&(uintptr_t mod) const
-		{
-			return _flags & mod;
-		}
-
-		xml_memory_page* get_page() const
-		{
-			// round-trip through void* to silence 'cast increases required alignment of target type' warnings
-			const char* page_marker = reinterpret_cast<const char*>(this) - (_page << compact_alignment_log2);
-			const char* page = page_marker - *reinterpret_cast<const uint32_t*>(static_cast<const void*>(page_marker));
-
-			return const_cast<xml_memory_page*>(reinterpret_cast<const xml_memory_page*>(static_cast<const void*>(page)));
-		}
-
-	private:
-		unsigned char _page;
-		unsigned char _flags;
-	};
-
-	PUGI_IMPL_FN xml_memory_page* compact_get_page(const void* object, int header_offset)
-	{
-		const compact_header* header = reinterpret_cast<const compact_header*>(static_cast<const char*>(object) - header_offset);
-
-		return header->get_page();
-	}
-
-	template <int header_offset, typename T> PUGI_IMPL_FN_NO_INLINE T* compact_get_value(const void* object)
-	{
-		return static_cast<T*>(compact_get_page(object, header_offset)->allocator->_hash->find(object));
-	}
-
-	template <int header_offset, typename T> PUGI_IMPL_FN_NO_INLINE void compact_set_value(const void* object, T* value)
-	{
-		compact_get_page(object, header_offset)->allocator->_hash->insert(object, value);
-	}
-
-	template <typename T, int header_offset, int start = -126> class compact_pointer
-	{
-	public:
-		compact_pointer(): _data(0)
-		{
-		}
-
-		void operator=(const compact_pointer& rhs)
-		{
-			*this = rhs + 0;
-		}
-
-		void operator=(T* value)
-		{
-			if (value)
-			{
-				// value is guaranteed to be compact-aligned; 'this' is not
-				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
-				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
-				// compensate for arithmetic shift rounding for negative values
-				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
-				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) - start;
-
-				if (static_cast<uintptr_t>(offset) <= 253)
-					_data = static_cast<unsigned char>(offset + 1);
-				else
-				{
-					compact_set_value<header_offset>(this, value);
-
-					_data = 255;
-				}
-			}
-			else
-				_data = 0;
-		}
-
-		operator T*() const
-		{
-			if (_data)
-			{
-				if (_data < 255)
-				{
-					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
-
-					return reinterpret_cast<T*>(base + (_data - 1 + start) * compact_alignment);
-				}
-				else
-					return compact_get_value<header_offset, T>(this);
-			}
-			else
-				return 0;
-		}
-
-		T* operator->() const
-		{
-			return *this;
-		}
-
-	private:
-		unsigned char _data;
-	};
-
-	template <typename T, int header_offset> class compact_pointer_parent
-	{
-	public:
-		compact_pointer_parent(): _data(0)
-		{
-		}
-
-		void operator=(const compact_pointer_parent& rhs)
-		{
-			*this = rhs + 0;
-		}
-
-		void operator=(T* value)
-		{
-			if (value)
-			{
-				// value is guaranteed to be compact-aligned; 'this' is not
-				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
-				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
-				// compensate for arithmetic shift behavior for negative values
-				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
-				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) + 65533;
-
-				if (static_cast<uintptr_t>(offset) <= 65533)
-				{
-					_data = static_cast<unsigned short>(offset + 1);
-				}
-				else
-				{
-					xml_memory_page* page = compact_get_page(this, header_offset);
-
-					if (PUGI_IMPL_UNLIKELY(page->compact_shared_parent == 0))
-						page->compact_shared_parent = value;
-
-					if (page->compact_shared_parent == value)
-					{
-						_data = 65534;
-					}
-					else
-					{
-						compact_set_value<header_offset>(this, value);
-
-						_data = 65535;
-					}
-				}
-			}
-			else
-			{
-				_data = 0;
-			}
-		}
-
-		operator T*() const
-		{
-			if (_data)
-			{
-				if (_data < 65534)
-				{
-					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
-
-					return reinterpret_cast<T*>(base + (_data - 1 - 65533) * compact_alignment);
-				}
-				else if (_data == 65534)
-					return static_cast<T*>(compact_get_page(this, header_offset)->compact_shared_parent);
-				else
-					return compact_get_value<header_offset, T>(this);
-			}
-			else
-				return 0;
-		}
-
-		T* operator->() const
-		{
-			return *this;
-		}
-
-	private:
-		uint16_t _data;
-	};
-
-	template <int header_offset, int base_offset> class compact_string
-	{
-	public:
-		compact_string(): _data(0)
-		{
-		}
-
-		void operator=(const compact_string& rhs)
-		{
-			*this = rhs + 0;
-		}
-
-		void operator=(char_t* value)
-		{
-			if (value)
-			{
-				xml_memory_page* page = compact_get_page(this, header_offset);
-
-				if (PUGI_IMPL_UNLIKELY(page->compact_string_base == 0))
-					page->compact_string_base = value;
-
-				ptrdiff_t offset = value - page->compact_string_base;
-
-				if (static_cast<uintptr_t>(offset) < (65535 << 7))
-				{
-					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
-					uint16_t* base = reinterpret_cast<uint16_t*>(static_cast<void*>(reinterpret_cast<char*>(this) - base_offset));
-
-					if (*base == 0)
-					{
-						*base = static_cast<uint16_t>((offset >> 7) + 1);
-						_data = static_cast<unsigned char>((offset & 127) + 1);
-					}
-					else
-					{
-						ptrdiff_t remainder = offset - ((*base - 1) << 7);
-
-						if (static_cast<uintptr_t>(remainder) <= 253)
-						{
-							_data = static_cast<unsigned char>(remainder + 1);
-						}
-						else
-						{
-							compact_set_value<header_offset>(this, value);
-
-							_data = 255;
-						}
-					}
-				}
-				else
-				{
-					compact_set_value<header_offset>(this, value);
-
-					_data = 255;
-				}
-			}
-			else
-			{
-				_data = 0;
-			}
-		}
-
-		operator char_t*() const
-		{
-			if (_data)
-			{
-				if (_data < 255)
-				{
-					xml_memory_page* page = compact_get_page(this, header_offset);
-
-					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
-					const uint16_t* base = reinterpret_cast<const uint16_t*>(static_cast<const void*>(reinterpret_cast<const char*>(this) - base_offset));
-					assert(*base);
-
-					ptrdiff_t offset = ((*base - 1) << 7) + (_data - 1);
-
-					return page->compact_string_base + offset;
-				}
-				else
-				{
-					return compact_get_value<header_offset, char_t>(this);
-				}
-			}
-			else
-				return 0;
-		}
-
-	private:
-		unsigned char _data;
-	};
-PUGI_IMPL_NS_END
-#endif
-
-#ifdef PUGIXML_COMPACT
-namespace pugi
-{
-	struct xml_attribute_struct
-	{
-		xml_attribute_struct(impl::xml_memory_page* page): header(page, 0), namevalue_base(0)
-		{
-			PUGI_IMPL_STATIC_ASSERT(sizeof(xml_attribute_struct) == 8);
-		}
-
-		impl::compact_header header;
-
-		uint16_t namevalue_base;
-
-		impl::compact_string<4, 2> name;
-		impl::compact_string<5, 3> value;
-
-		impl::compact_pointer<xml_attribute_struct, 6> prev_attribute_c;
-		impl::compact_pointer<xml_attribute_struct, 7, 0> next_attribute;
-	};
-
-	struct xml_node_struct
-	{
-		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type), namevalue_base(0)
-		{
-			PUGI_IMPL_STATIC_ASSERT(sizeof(xml_node_struct) == 12);
-		}
-
-		impl::compact_header header;
-
-		uint16_t namevalue_base;
-
-		impl::compact_string<4, 2> name;
-		impl::compact_string<5, 3> value;
-
-		impl::compact_pointer_parent<xml_node_struct, 6> parent;
-
-		impl::compact_pointer<xml_node_struct, 8, 0> first_child;
-
-		impl::compact_pointer<xml_node_struct,  9>    prev_sibling_c;
-		impl::compact_pointer<xml_node_struct, 10, 0> next_sibling;
-
-		impl::compact_pointer<xml_attribute_struct, 11, 0> first_attribute;
-	};
-}
-#else
-namespace pugi
-{
-	struct xml_attribute_struct
-	{
-		xml_attribute_struct(impl::xml_memory_page* page): name(0), value(0), prev_attribute_c(0), next_attribute(0)
-		{
-			header = PUGI_IMPL_GETHEADER_IMPL(this, page, 0);
-		}
-
-		uintptr_t header;
-
-		char_t*	name;
-		char_t*	value;
-
-		xml_attribute_struct* prev_attribute_c;
-		xml_attribute_struct* next_attribute;
-	};
-
-	struct xml_node_struct
-	{
-		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0)
-		{
-			header = PUGI_IMPL_GETHEADER_IMPL(this, page, type);
-		}
-
-		uintptr_t header;
-
-		char_t* name;
-		char_t* value;
-
-		xml_node_struct* parent;
-
-		xml_node_struct* first_child;
-
-		xml_node_struct* prev_sibling_c;
-		xml_node_struct* next_sibling;
-
-		xml_attribute_struct* first_attribute;
-	};
-}
-#endif
-
-PUGI_IMPL_NS_BEGIN
-	struct xml_extra_buffer
-	{
-		char_t* buffer;
-		xml_extra_buffer* next;
-	};
-
-	struct xml_document_struct: public xml_node_struct, public xml_allocator
-	{
-		xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(0), extra_buffers(0)
-		{
-		}
-
-		const char_t* buffer;
-
-		xml_extra_buffer* extra_buffers;
-
-	#ifdef PUGIXML_COMPACT
-		compact_hash_table hash;
-	#endif
-	};
-
-	template <typename Object> inline xml_allocator& get_allocator(const Object* object)
-	{
-		assert(object);
-
-		return *PUGI_IMPL_GETPAGE(object)->allocator;
-	}
-
-	template <typename Object> inline xml_document_struct& get_document(const Object* object)
-	{
-		assert(object);
-
-		return *static_cast<xml_document_struct*>(PUGI_IMPL_GETPAGE(object)->allocator);
-	}
-PUGI_IMPL_NS_END
-
-// Low-level DOM operations
-PUGI_IMPL_NS_BEGIN
-	inline xml_attribute_struct* allocate_attribute(xml_allocator& alloc)
-	{
-		xml_memory_page* page;
-		void* memory = alloc.allocate_object(sizeof(xml_attribute_struct), page);
-		if (!memory) return 0;
-
-		return new (memory) xml_attribute_struct(page);
-	}
-
-	inline xml_node_struct* allocate_node(xml_allocator& alloc, xml_node_type type)
-	{
-		xml_memory_page* page;
-		void* memory = alloc.allocate_object(sizeof(xml_node_struct), page);
-		if (!memory) return 0;
-
-		return new (memory) xml_node_struct(page, type);
-	}
-
-	inline void destroy_attribute(xml_attribute_struct* a, xml_allocator& alloc)
-	{
-		if (a->header & impl::xml_memory_page_name_allocated_mask)
-			alloc.deallocate_string(a->name);
-
-		if (a->header & impl::xml_memory_page_value_allocated_mask)
-			alloc.deallocate_string(a->value);
-
-		alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI_IMPL_GETPAGE(a));
-	}
-
-	inline void destroy_node(xml_node_struct* n, xml_allocator& alloc)
-	{
-		if (n->header & impl::xml_memory_page_name_allocated_mask)
-			alloc.deallocate_string(n->name);
-
-		if (n->header & impl::xml_memory_page_value_allocated_mask)
-			alloc.deallocate_string(n->value);
-
-		for (xml_attribute_struct* attr = n->first_attribute; attr; )
-		{
-			xml_attribute_struct* next = attr->next_attribute;
-
-			destroy_attribute(attr, alloc);
-
-			attr = next;
-		}
-
-		for (xml_node_struct* child = n->first_child; child; )
-		{
-			xml_node_struct* next = child->next_sibling;
-
-			destroy_node(child, alloc);
-
-			child = next;
-		}
-
-		alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI_IMPL_GETPAGE(n));
-	}
-
-	inline void append_node(xml_node_struct* child, xml_node_struct* node)
-	{
-		child->parent = node;
-
-		xml_node_struct* head = node->first_child;
-
-		if (head)
-		{
-			xml_node_struct* tail = head->prev_sibling_c;
-
-			tail->next_sibling = child;
-			child->prev_sibling_c = tail;
-			head->prev_sibling_c = child;
-		}
-		else
-		{
-			node->first_child = child;
-			child->prev_sibling_c = child;
-		}
-	}
-
-	inline void prepend_node(xml_node_struct* child, xml_node_struct* node)
-	{
-		child->parent = node;
-
-		xml_node_struct* head = node->first_child;
-
-		if (head)
-		{
-			child->prev_sibling_c = head->prev_sibling_c;
-			head->prev_sibling_c = child;
-		}
-		else
-			child->prev_sibling_c = child;
-
-		child->next_sibling = head;
-		node->first_child = child;
-	}
-
-	inline void insert_node_after(xml_node_struct* child, xml_node_struct* node)
-	{
-		xml_node_struct* parent = node->parent;
-
-		child->parent = parent;
-
-		xml_node_struct* next = node->next_sibling;
-
-		if (next)
-			next->prev_sibling_c = child;
-		else
-			parent->first_child->prev_sibling_c = child;
-
-		child->next_sibling = next;
-		child->prev_sibling_c = node;
-
-		node->next_sibling = child;
-	}
-
-	inline void insert_node_before(xml_node_struct* child, xml_node_struct* node)
-	{
-		xml_node_struct* parent = node->parent;
-
-		child->parent = parent;
-
-		xml_node_struct* prev = node->prev_sibling_c;
-
-		if (prev->next_sibling)
-			prev->next_sibling = child;
-		else
-			parent->first_child = child;
-
-		child->prev_sibling_c = prev;
-		child->next_sibling = node;
-
-		node->prev_sibling_c = child;
-	}
-
-	inline void remove_node(xml_node_struct* node)
-	{
-		xml_node_struct* parent = node->parent;
-
-		xml_node_struct* next = node->next_sibling;
-		xml_node_struct* prev = node->prev_sibling_c;
-
-		if (next)
-			next->prev_sibling_c = prev;
-		else
-			parent->first_child->prev_sibling_c = prev;
-
-		if (prev->next_sibling)
-			prev->next_sibling = next;
-		else
-			parent->first_child = next;
-
-		node->parent = 0;
-		node->prev_sibling_c = 0;
-		node->next_sibling = 0;
-	}
-
-	inline void append_attribute(xml_attribute_struct* attr, xml_node_struct* node)
-	{
-		xml_attribute_struct* head = node->first_attribute;
-
-		if (head)
-		{
-			xml_attribute_struct* tail = head->prev_attribute_c;
-
-			tail->next_attribute = attr;
-			attr->prev_attribute_c = tail;
-			head->prev_attribute_c = attr;
-		}
-		else
-		{
-			node->first_attribute = attr;
-			attr->prev_attribute_c = attr;
-		}
-	}
-
-	inline void prepend_attribute(xml_attribute_struct* attr, xml_node_struct* node)
-	{
-		xml_attribute_struct* head = node->first_attribute;
-
-		if (head)
-		{
-			attr->prev_attribute_c = head->prev_attribute_c;
-			head->prev_attribute_c = attr;
-		}
-		else
-			attr->prev_attribute_c = attr;
-
-		attr->next_attribute = head;
-		node->first_attribute = attr;
-	}
-
-	inline void insert_attribute_after(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
-	{
-		xml_attribute_struct* next = place->next_attribute;
-
-		if (next)
-			next->prev_attribute_c = attr;
-		else
-			node->first_attribute->prev_attribute_c = attr;
-
-		attr->next_attribute = next;
-		attr->prev_attribute_c = place;
-		place->next_attribute = attr;
-	}
-
-	inline void insert_attribute_before(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
-	{
-		xml_attribute_struct* prev = place->prev_attribute_c;
-
-		if (prev->next_attribute)
-			prev->next_attribute = attr;
-		else
-			node->first_attribute = attr;
-
-		attr->prev_attribute_c = prev;
-		attr->next_attribute = place;
-		place->prev_attribute_c = attr;
-	}
-
-	inline void remove_attribute(xml_attribute_struct* attr, xml_node_struct* node)
-	{
-		xml_attribute_struct* next = attr->next_attribute;
-		xml_attribute_struct* prev = attr->prev_attribute_c;
-
-		if (next)
-			next->prev_attribute_c = prev;
-		else
-			node->first_attribute->prev_attribute_c = prev;
-
-		if (prev->next_attribute)
-			prev->next_attribute = next;
-		else
-			node->first_attribute = next;
-
-		attr->prev_attribute_c = 0;
-		attr->next_attribute = 0;
-	}
-
-	PUGI_IMPL_FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element)
-	{
-		if (!alloc.reserve()) return 0;
-
-		xml_node_struct* child = allocate_node(alloc, type);
-		if (!child) return 0;
-
-		append_node(child, node);
-
-		return child;
-	}
-
-	PUGI_IMPL_FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc)
-	{
-		if (!alloc.reserve()) return 0;
-
-		xml_attribute_struct* attr = allocate_attribute(alloc);
-		if (!attr) return 0;
-
-		append_attribute(attr, node);
-
-		return attr;
-	}
-PUGI_IMPL_NS_END
-
-// Helper classes for code generation
-PUGI_IMPL_NS_BEGIN
-	struct opt_false
-	{
-		enum { value = 0 };
-	};
-
-	struct opt_true
-	{
-		enum { value = 1 };
-	};
-PUGI_IMPL_NS_END
-
-// Unicode utilities
-PUGI_IMPL_NS_BEGIN
-	inline uint16_t endian_swap(uint16_t value)
-	{
-		return static_cast<uint16_t>(((value & 0xff) << 8) | (value >> 8));
-	}
-
-	inline uint32_t endian_swap(uint32_t value)
-	{
-		return ((value & 0xff) << 24) | ((value & 0xff00) << 8) | ((value & 0xff0000) >> 8) | (value >> 24);
-	}
-
-	struct utf8_counter
-	{
-		typedef size_t value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			// U+0000..U+007F
-			if (ch < 0x80) return result + 1;
-			// U+0080..U+07FF
-			else if (ch < 0x800) return result + 2;
-			// U+0800..U+FFFF
-			else return result + 3;
-		}
-
-		static value_type high(value_type result, uint32_t)
-		{
-			// U+10000..U+10FFFF
-			return result + 4;
-		}
-	};
-
-	struct utf8_writer
-	{
-		typedef uint8_t* value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			// U+0000..U+007F
-			if (ch < 0x80)
-			{
-				*result = static_cast<uint8_t>(ch);
-				return result + 1;
-			}
-			// U+0080..U+07FF
-			else if (ch < 0x800)
-			{
-				result[0] = static_cast<uint8_t>(0xC0 | (ch >> 6));
-				result[1] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
-				return result + 2;
-			}
-			// U+0800..U+FFFF
-			else
-			{
-				result[0] = static_cast<uint8_t>(0xE0 | (ch >> 12));
-				result[1] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
-				result[2] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
-				return result + 3;
-			}
-		}
-
-		static value_type high(value_type result, uint32_t ch)
-		{
-			// U+10000..U+10FFFF
-			result[0] = static_cast<uint8_t>(0xF0 | (ch >> 18));
-			result[1] = static_cast<uint8_t>(0x80 | ((ch >> 12) & 0x3F));
-			result[2] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
-			result[3] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
-			return result + 4;
-		}
-
-		static value_type any(value_type result, uint32_t ch)
-		{
-			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
-		}
-	};
-
-	struct utf16_counter
-	{
-		typedef size_t value_type;
-
-		static value_type low(value_type result, uint32_t)
-		{
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t)
-		{
-			return result + 2;
-		}
-	};
-
-	struct utf16_writer
-	{
-		typedef uint16_t* value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			*result = static_cast<uint16_t>(ch);
-
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t ch)
-		{
-			uint32_t msh = static_cast<uint32_t>(ch - 0x10000) >> 10;
-			uint32_t lsh = static_cast<uint32_t>(ch - 0x10000) & 0x3ff;
-
-			result[0] = static_cast<uint16_t>(0xD800 + msh);
-			result[1] = static_cast<uint16_t>(0xDC00 + lsh);
-
-			return result + 2;
-		}
-
-		static value_type any(value_type result, uint32_t ch)
-		{
-			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
-		}
-	};
-
-	struct utf32_counter
-	{
-		typedef size_t value_type;
-
-		static value_type low(value_type result, uint32_t)
-		{
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t)
-		{
-			return result + 1;
-		}
-	};
-
-	struct utf32_writer
-	{
-		typedef uint32_t* value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			*result = ch;
-
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t ch)
-		{
-			*result = ch;
-
-			return result + 1;
-		}
-
-		static value_type any(value_type result, uint32_t ch)
-		{
-			*result = ch;
-
-			return result + 1;
-		}
-	};
-
-	struct latin1_writer
-	{
-		typedef uint8_t* value_type;
-
-		static value_type low(value_type result, uint32_t ch)
-		{
-			*result = static_cast<uint8_t>(ch > 255 ? '?' : ch);
-
-			return result + 1;
-		}
-
-		static value_type high(value_type result, uint32_t ch)
-		{
-			(void)ch;
-
-			*result = '?';
-
-			return result + 1;
-		}
-	};
-
-	struct utf8_decoder
-	{
-		typedef uint8_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
-		{
-			const uint8_t utf8_byte_mask = 0x3f;
-
-			while (size)
-			{
-				uint8_t lead = *data;
-
-				// 0xxxxxxx -> U+0000..U+007F
-				if (lead < 0x80)
-				{
-					result = Traits::low(result, lead);
-					data += 1;
-					size -= 1;
-
-					// process aligned single-byte (ascii) blocks
-					if ((reinterpret_cast<uintptr_t>(data) & 3) == 0)
-					{
-						// round-trip through void* to silence 'cast increases required alignment of target type' warnings
-						while (size >= 4 && (*static_cast<const uint32_t*>(static_cast<const void*>(data)) & 0x80808080) == 0)
-						{
-							result = Traits::low(result, data[0]);
-							result = Traits::low(result, data[1]);
-							result = Traits::low(result, data[2]);
-							result = Traits::low(result, data[3]);
-							data += 4;
-							size -= 4;
-						}
-					}
-				}
-				// 110xxxxx -> U+0080..U+07FF
-				else if (static_cast<unsigned int>(lead - 0xC0) < 0x20 && size >= 2 && (data[1] & 0xc0) == 0x80)
-				{
-					result = Traits::low(result, ((lead & ~0xC0) << 6) | (data[1] & utf8_byte_mask));
-					data += 2;
-					size -= 2;
-				}
-				// 1110xxxx -> U+0800-U+FFFF
-				else if (static_cast<unsigned int>(lead - 0xE0) < 0x10 && size >= 3 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80)
-				{
-					result = Traits::low(result, ((lead & ~0xE0) << 12) | ((data[1] & utf8_byte_mask) << 6) | (data[2] & utf8_byte_mask));
-					data += 3;
-					size -= 3;
-				}
-				// 11110xxx -> U+10000..U+10FFFF
-				else if (static_cast<unsigned int>(lead - 0xF0) < 0x08 && size >= 4 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80 && (data[3] & 0xc0) == 0x80)
-				{
-					result = Traits::high(result, ((lead & ~0xF0) << 18) | ((data[1] & utf8_byte_mask) << 12) | ((data[2] & utf8_byte_mask) << 6) | (data[3] & utf8_byte_mask));
-					data += 4;
-					size -= 4;
-				}
-				// 10xxxxxx or 11111xxx -> invalid
-				else
-				{
-					data += 1;
-					size -= 1;
-				}
-			}
-
-			return result;
-		}
-	};
-
-	template <typename opt_swap> struct utf16_decoder
-	{
-		typedef uint16_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const uint16_t* data, size_t size, typename Traits::value_type result, Traits)
-		{
-			while (size)
-			{
-				uint16_t lead = opt_swap::value ? endian_swap(*data) : *data;
-
-				// U+0000..U+D7FF
-				if (lead < 0xD800)
-				{
-					result = Traits::low(result, lead);
-					data += 1;
-					size -= 1;
-				}
-				// U+E000..U+FFFF
-				else if (static_cast<unsigned int>(lead - 0xE000) < 0x2000)
-				{
-					result = Traits::low(result, lead);
-					data += 1;
-					size -= 1;
-				}
-				// surrogate pair lead
-				else if (static_cast<unsigned int>(lead - 0xD800) < 0x400 && size >= 2)
-				{
-					uint16_t next = opt_swap::value ? endian_swap(data[1]) : data[1];
-
-					if (static_cast<unsigned int>(next - 0xDC00) < 0x400)
-					{
-						result = Traits::high(result, 0x10000 + ((lead & 0x3ff) << 10) + (next & 0x3ff));
-						data += 2;
-						size -= 2;
-					}
-					else
-					{
-						data += 1;
-						size -= 1;
-					}
-				}
-				else
-				{
-					data += 1;
-					size -= 1;
-				}
-			}
-
-			return result;
-		}
-	};
-
-	template <typename opt_swap> struct utf32_decoder
-	{
-		typedef uint32_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const uint32_t* data, size_t size, typename Traits::value_type result, Traits)
-		{
-			while (size)
-			{
-				uint32_t lead = opt_swap::value ? endian_swap(*data) : *data;
-
-				// U+0000..U+FFFF
-				if (lead < 0x10000)
-				{
-					result = Traits::low(result, lead);
-					data += 1;
-					size -= 1;
-				}
-				// U+10000..U+10FFFF
-				else
-				{
-					result = Traits::high(result, lead);
-					data += 1;
-					size -= 1;
-				}
-			}
-
-			return result;
-		}
-	};
-
-	struct latin1_decoder
-	{
-		typedef uint8_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
-		{
-			while (size)
-			{
-				result = Traits::low(result, *data);
-				data += 1;
-				size -= 1;
-			}
-
-			return result;
-		}
-	};
-
-	template <size_t size> struct wchar_selector;
-
-	template <> struct wchar_selector<2>
-	{
-		typedef uint16_t type;
-		typedef utf16_counter counter;
-		typedef utf16_writer writer;
-		typedef utf16_decoder<opt_false> decoder;
-	};
-
-	template <> struct wchar_selector<4>
-	{
-		typedef uint32_t type;
-		typedef utf32_counter counter;
-		typedef utf32_writer writer;
-		typedef utf32_decoder<opt_false> decoder;
-	};
-
-	typedef wchar_selector<sizeof(wchar_t)>::counter wchar_counter;
-	typedef wchar_selector<sizeof(wchar_t)>::writer wchar_writer;
-
-	struct wchar_decoder
-	{
-		typedef wchar_t type;
-
-		template <typename Traits> static inline typename Traits::value_type process(const wchar_t* data, size_t size, typename Traits::value_type result, Traits traits)
-		{
-			typedef wchar_selector<sizeof(wchar_t)>::decoder decoder;
-
-			return decoder::process(reinterpret_cast<const typename decoder::type*>(data), size, result, traits);
-		}
-	};
-
-#ifdef PUGIXML_WCHAR_MODE
-	PUGI_IMPL_FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length)
-	{
-		for (size_t i = 0; i < length; ++i)
-			result[i] = static_cast<wchar_t>(endian_swap(static_cast<wchar_selector<sizeof(wchar_t)>::type>(data[i])));
-	}
-#endif
-PUGI_IMPL_NS_END
-
-PUGI_IMPL_NS_BEGIN
-	enum chartype_t
-	{
-		ct_parse_pcdata = 1,	// \0, &, \r, <
-		ct_parse_attr = 2,		// \0, &, \r, ', "
-		ct_parse_attr_ws = 4,	// \0, &, \r, ', ", \n, tab
-		ct_space = 8,			// \r, \n, space, tab
-		ct_parse_cdata = 16,	// \0, ], >, \r
-		ct_parse_comment = 32,	// \0, -, >, \r
-		ct_symbol = 64,			// Any symbol > 127, a-z, A-Z, 0-9, _, :, -, .
-		ct_start_symbol = 128	// Any symbol > 127, a-z, A-Z, _, :
-	};
-
-	static const unsigned char chartype_table[256] =
-	{
-		55,  0,   0,   0,   0,   0,   0,   0,      0,   12,  12,  0,   0,   63,  0,   0,   // 0-15
-		0,   0,   0,   0,   0,   0,   0,   0,      0,   0,   0,   0,   0,   0,   0,   0,   // 16-31
-		8,   0,   6,   0,   0,   0,   7,   6,      0,   0,   0,   0,   0,   96,  64,  0,   // 32-47
-		64,  64,  64,  64,  64,  64,  64,  64,     64,  64,  192, 0,   1,   0,   48,  0,   // 48-63
-		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 64-79
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0,   0,   16,  0,   192, // 80-95
-		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 96-111
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0, 0, 0, 0, 0,           // 112-127
-
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 128+
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
-		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192
-	};
-
-	enum chartypex_t
-	{
-		ctx_special_pcdata = 1,   // Any symbol >= 0 and < 32 (except \t, \r, \n), &, <, >
-		ctx_special_attr = 2,     // Any symbol >= 0 and < 32, &, <, ", '
-		ctx_start_symbol = 4,	  // Any symbol > 127, a-z, A-Z, _
-		ctx_digit = 8,			  // 0-9
-		ctx_symbol = 16			  // Any symbol > 127, a-z, A-Z, 0-9, _, -, .
-	};
-
-	static const unsigned char chartypex_table[256] =
-	{
-		3,  3,  3,  3,  3,  3,  3,  3,     3,  2,  2,  3,  3,  2,  3,  3,     // 0-15
-		3,  3,  3,  3,  3,  3,  3,  3,     3,  3,  3,  3,  3,  3,  3,  3,     // 16-31
-		0,  0,  2,  0,  0,  0,  3,  2,     0,  0,  0,  0,  0, 16, 16,  0,     // 32-47
-		24, 24, 24, 24, 24, 24, 24, 24,    24, 24, 0,  0,  3,  0,  1,  0,     // 48-63
-
-		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 64-79
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  20,    // 80-95
-		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 96-111
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  0,     // 112-127
-
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 128+
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
-		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20
-	};
-
-#ifdef PUGIXML_WCHAR_MODE
-	#define PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, table) ((static_cast<unsigned int>(c) < 128 ? table[static_cast<unsigned int>(c)] : table[128]) & (ct))
-#else
-	#define PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, table) (table[static_cast<unsigned char>(c)] & (ct))
-#endif
-
-	#define PUGI_IMPL_IS_CHARTYPE(c, ct) PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, chartype_table)
-	#define PUGI_IMPL_IS_CHARTYPEX(c, ct) PUGI_IMPL_IS_CHARTYPE_IMPL(c, ct, chartypex_table)
-
-	PUGI_IMPL_FN bool is_little_endian()
-	{
-		unsigned int ui = 1;
-
-		return *reinterpret_cast<unsigned char*>(&ui) == 1;
-	}
-
-	PUGI_IMPL_FN xml_encoding get_wchar_encoding()
-	{
-		PUGI_IMPL_STATIC_ASSERT(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4);
-
-		if (sizeof(wchar_t) == 2)
-			return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-		else
-			return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-	}
-
-	PUGI_IMPL_FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length)
-	{
-	#define PUGI_IMPL_SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; }
-	#define PUGI_IMPL_SCANCHARTYPE(ct) { while (offset < size && PUGI_IMPL_IS_CHARTYPE(data[offset], ct)) offset++; }
-
-		// check if we have a non-empty XML declaration
-		if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI_IMPL_IS_CHARTYPE(data[5], ct_space)))
-			return false;
-
-		// scan XML declaration until the encoding field
-		for (size_t i = 6; i + 1 < size; ++i)
-		{
-			// declaration can not contain ? in quoted values
-			if (data[i] == '?')
-				return false;
-
-			if (data[i] == 'e' && data[i + 1] == 'n')
-			{
-				size_t offset = i;
-
-				// encoding follows the version field which can't contain 'en' so this has to be the encoding if XML is well formed
-				PUGI_IMPL_SCANCHAR('e'); PUGI_IMPL_SCANCHAR('n'); PUGI_IMPL_SCANCHAR('c'); PUGI_IMPL_SCANCHAR('o');
-				PUGI_IMPL_SCANCHAR('d'); PUGI_IMPL_SCANCHAR('i'); PUGI_IMPL_SCANCHAR('n'); PUGI_IMPL_SCANCHAR('g');
-
-				// S? = S?
-				PUGI_IMPL_SCANCHARTYPE(ct_space);
-				PUGI_IMPL_SCANCHAR('=');
-				PUGI_IMPL_SCANCHARTYPE(ct_space);
-
-				// the only two valid delimiters are ' and "
-				uint8_t delimiter = (offset < size && data[offset] == '"') ? '"' : '\'';
-
-				PUGI_IMPL_SCANCHAR(delimiter);
-
-				size_t start = offset;
-
-				out_encoding = data + offset;
-
-				PUGI_IMPL_SCANCHARTYPE(ct_symbol);
-
-				out_length = offset - start;
-
-				PUGI_IMPL_SCANCHAR(delimiter);
-
-				return true;
-			}
-		}
-
-		return false;
-
-	#undef PUGI_IMPL_SCANCHAR
-	#undef PUGI_IMPL_SCANCHARTYPE
-	}
-
-	PUGI_IMPL_FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size)
-	{
-		// skip encoding autodetection if input buffer is too small
-		if (size < 4) return encoding_utf8;
-
-		uint8_t d0 = data[0], d1 = data[1], d2 = data[2], d3 = data[3];
-
-		// look for BOM in first few bytes
-		if (d0 == 0 && d1 == 0 && d2 == 0xfe && d3 == 0xff) return encoding_utf32_be;
-		if (d0 == 0xff && d1 == 0xfe && d2 == 0 && d3 == 0) return encoding_utf32_le;
-		if (d0 == 0xfe && d1 == 0xff) return encoding_utf16_be;
-		if (d0 == 0xff && d1 == 0xfe) return encoding_utf16_le;
-		if (d0 == 0xef && d1 == 0xbb && d2 == 0xbf) return encoding_utf8;
-
-		// look for <, <? or <?xm in various encodings
-		if (d0 == 0 && d1 == 0 && d2 == 0 && d3 == 0x3c) return encoding_utf32_be;
-		if (d0 == 0x3c && d1 == 0 && d2 == 0 && d3 == 0) return encoding_utf32_le;
-		if (d0 == 0 && d1 == 0x3c && d2 == 0 && d3 == 0x3f) return encoding_utf16_be;
-		if (d0 == 0x3c && d1 == 0 && d2 == 0x3f && d3 == 0) return encoding_utf16_le;
-
-		// look for utf16 < followed by node name (this may fail, but is better than utf8 since it's zero terminated so early)
-		if (d0 == 0 && d1 == 0x3c) return encoding_utf16_be;
-		if (d0 == 0x3c && d1 == 0) return encoding_utf16_le;
-
-		// no known BOM detected; parse declaration
-		const uint8_t* enc = 0;
-		size_t enc_length = 0;
-
-		if (d0 == 0x3c && d1 == 0x3f && d2 == 0x78 && d3 == 0x6d && parse_declaration_encoding(data, size, enc, enc_length))
-		{
-			// iso-8859-1 (case-insensitive)
-			if (enc_length == 10
-				&& (enc[0] | ' ') == 'i' && (enc[1] | ' ') == 's' && (enc[2] | ' ') == 'o'
-				&& enc[3] == '-' && enc[4] == '8' && enc[5] == '8' && enc[6] == '5' && enc[7] == '9'
-				&& enc[8] == '-' && enc[9] == '1')
-				return encoding_latin1;
-
-			// latin1 (case-insensitive)
-			if (enc_length == 6
-				&& (enc[0] | ' ') == 'l' && (enc[1] | ' ') == 'a' && (enc[2] | ' ') == 't'
-				&& (enc[3] | ' ') == 'i' && (enc[4] | ' ') == 'n'
-				&& enc[5] == '1')
-				return encoding_latin1;
-		}
-
-		return encoding_utf8;
-	}
-
-	PUGI_IMPL_FN xml_encoding get_buffer_encoding(xml_encoding encoding, const void* contents, size_t size)
-	{
-		// replace wchar encoding with utf implementation
-		if (encoding == encoding_wchar) return get_wchar_encoding();
-
-		// replace utf16 encoding with utf16 with specific endianness
-		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-		// replace utf32 encoding with utf32 with specific endianness
-		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-		// only do autodetection if no explicit encoding is requested
-		if (encoding != encoding_auto) return encoding;
-
-		// try to guess encoding (based on XML specification, Appendix F.1)
-		const uint8_t* data = static_cast<const uint8_t*>(contents);
-
-		return guess_buffer_encoding(data, size);
-	}
-
-	PUGI_IMPL_FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
-	{
-		size_t length = size / sizeof(char_t);
-
-		if (is_mutable)
-		{
-			out_buffer = static_cast<char_t*>(const_cast<void*>(contents));
-			out_length = length;
-		}
-		else
-		{
-			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-			if (!buffer) return false;
-
-			if (contents)
-				memcpy(buffer, contents, length * sizeof(char_t));
-			else
-				assert(length == 0);
-
-			buffer[length] = 0;
-
-			out_buffer = buffer;
-			out_length = length + 1;
-		}
-
-		return true;
-	}
-
-#ifdef PUGIXML_WCHAR_MODE
-	PUGI_IMPL_FN bool need_endian_swap_utf(xml_encoding le, xml_encoding re)
-	{
-		return (le == encoding_utf16_be && re == encoding_utf16_le) || (le == encoding_utf16_le && re == encoding_utf16_be) ||
-			   (le == encoding_utf32_be && re == encoding_utf32_le) || (le == encoding_utf32_le && re == encoding_utf32_be);
-	}
-
-	PUGI_IMPL_FN bool convert_buffer_endian_swap(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
-	{
-		const char_t* data = static_cast<const char_t*>(contents);
-		size_t length = size / sizeof(char_t);
-
-		if (is_mutable)
-		{
-			char_t* buffer = const_cast<char_t*>(data);
-
-			convert_wchar_endian_swap(buffer, data, length);
-
-			out_buffer = buffer;
-			out_length = length;
-		}
-		else
-		{
-			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-			if (!buffer) return false;
-
-			convert_wchar_endian_swap(buffer, data, length);
-			buffer[length] = 0;
-
-			out_buffer = buffer;
-			out_length = length + 1;
-		}
-
-		return true;
-	}
-
-	template <typename D> PUGI_IMPL_FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
-	{
-		const typename D::type* data = static_cast<const typename D::type*>(contents);
-		size_t data_length = size / sizeof(typename D::type);
-
-		// first pass: get length in wchar_t units
-		size_t length = D::process(data, data_length, 0, wchar_counter());
-
-		// allocate buffer of suitable length
-		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-		if (!buffer) return false;
-
-		// second pass: convert utf16 input to wchar_t
-		wchar_writer::value_type obegin = reinterpret_cast<wchar_writer::value_type>(buffer);
-		wchar_writer::value_type oend = D::process(data, data_length, obegin, wchar_writer());
-
-		assert(oend == obegin + length);
-		*oend = 0;
-
-		out_buffer = buffer;
-		out_length = length + 1;
-
-		return true;
-	}
-
-	PUGI_IMPL_FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
-	{
-		// get native encoding
-		xml_encoding wchar_encoding = get_wchar_encoding();
-
-		// fast path: no conversion required
-		if (encoding == wchar_encoding)
-			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
-
-		// only endian-swapping is required
-		if (need_endian_swap_utf(encoding, wchar_encoding))
-			return convert_buffer_endian_swap(out_buffer, out_length, contents, size, is_mutable);
-
-		// source encoding is utf8
-		if (encoding == encoding_utf8)
-			return convert_buffer_generic(out_buffer, out_length, contents, size, utf8_decoder());
-
-		// source encoding is utf16
-		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-			return (native_encoding == encoding) ?
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
-		}
-
-		// source encoding is utf32
-		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-			return (native_encoding == encoding) ?
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
-		}
-
-		// source encoding is latin1
-		if (encoding == encoding_latin1)
-			return convert_buffer_generic(out_buffer, out_length, contents, size, latin1_decoder());
-
-		assert(false && "Invalid encoding"); // unreachable
-		return false;
-	}
-#else
-	template <typename D> PUGI_IMPL_FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
-	{
-		const typename D::type* data = static_cast<const typename D::type*>(contents);
-		size_t data_length = size / sizeof(typename D::type);
-
-		// first pass: get length in utf8 units
-		size_t length = D::process(data, data_length, 0, utf8_counter());
-
-		// allocate buffer of suitable length
-		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-		if (!buffer) return false;
-
-		// second pass: convert utf16 input to utf8
-		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
-		uint8_t* oend = D::process(data, data_length, obegin, utf8_writer());
-
-		assert(oend == obegin + length);
-		*oend = 0;
-
-		out_buffer = buffer;
-		out_length = length + 1;
-
-		return true;
-	}
-
-	PUGI_IMPL_FN size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size)
-	{
-		for (size_t i = 0; i < size; ++i)
-			if (data[i] > 127)
-				return i;
-
-		return size;
-	}
-
-	PUGI_IMPL_FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
-	{
-		const uint8_t* data = static_cast<const uint8_t*>(contents);
-		size_t data_length = size;
-
-		// get size of prefix that does not need utf8 conversion
-		size_t prefix_length = get_latin1_7bit_prefix_length(data, data_length);
-		assert(prefix_length <= data_length);
-
-		const uint8_t* postfix = data + prefix_length;
-		size_t postfix_length = data_length - prefix_length;
-
-		// if no conversion is needed, just return the original buffer
-		if (postfix_length == 0) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
-
-		// first pass: get length in utf8 units
-		size_t length = prefix_length + latin1_decoder::process(postfix, postfix_length, 0, utf8_counter());
-
-		// allocate buffer of suitable length
-		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-		if (!buffer) return false;
-
-		// second pass: convert latin1 input to utf8
-		memcpy(buffer, data, prefix_length);
-
-		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
-		uint8_t* oend = latin1_decoder::process(postfix, postfix_length, obegin + prefix_length, utf8_writer());
-
-		assert(oend == obegin + length);
-		*oend = 0;
-
-		out_buffer = buffer;
-		out_length = length + 1;
-
-		return true;
-	}
-
-	PUGI_IMPL_FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
-	{
-		// fast path: no conversion required
-		if (encoding == encoding_utf8)
-			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
-
-		// source encoding is utf16
-		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-			return (native_encoding == encoding) ?
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
-		}
-
-		// source encoding is utf32
-		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-			return (native_encoding == encoding) ?
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
-				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
-		}
-
-		// source encoding is latin1
-		if (encoding == encoding_latin1)
-			return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable);
-
-		assert(false && "Invalid encoding"); // unreachable
-		return false;
-	}
-#endif
-
-	PUGI_IMPL_FN size_t as_utf8_begin(const wchar_t* str, size_t length)
-	{
-		// get length in utf8 characters
-		return wchar_decoder::process(str, length, 0, utf8_counter());
-	}
-
-	PUGI_IMPL_FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length)
-	{
-		// convert to utf8
-		uint8_t* begin = reinterpret_cast<uint8_t*>(buffer);
-		uint8_t* end = wchar_decoder::process(str, length, begin, utf8_writer());
-
-		assert(begin + size == end);
-		(void)!end;
-		(void)!size;
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI_IMPL_FN std::string as_utf8_impl(const wchar_t* str, size_t length)
-	{
-		// first pass: get length in utf8 characters
-		size_t size = as_utf8_begin(str, length);
-
-		// allocate resulting string
-		std::string result;
-		result.resize(size);
-
-		// second pass: convert to utf8
-		if (size > 0) as_utf8_end(&result[0], size, str, length);
-
-		return result;
-	}
-
-	PUGI_IMPL_FN std::basic_string<wchar_t> as_wide_impl(const char* str, size_t size)
-	{
-		const uint8_t* data = reinterpret_cast<const uint8_t*>(str);
-
-		// first pass: get length in wchar_t units
-		size_t length = utf8_decoder::process(data, size, 0, wchar_counter());
-
-		// allocate resulting string
-		std::basic_string<wchar_t> result;
-		result.resize(length);
-
-		// second pass: convert to wchar_t
-		if (length > 0)
-		{
-			wchar_writer::value_type begin = reinterpret_cast<wchar_writer::value_type>(&result[0]);
-			wchar_writer::value_type end = utf8_decoder::process(data, size, begin, wchar_writer());
-
-			assert(begin + length == end);
-			(void)!end;
-		}
-
-		return result;
-	}
-#endif
-
-	template <typename Header>
-	inline bool strcpy_insitu_allow(size_t length, const Header& header, uintptr_t header_mask, char_t* target)
-	{
-		// never reuse shared memory
-		if (header & xml_memory_page_contents_shared_mask) return false;
-
-		size_t target_length = strlength(target);
-
-		// always reuse document buffer memory if possible
-		if ((header & header_mask) == 0) return target_length >= length;
-
-		// reuse heap memory if waste is not too great
-		const size_t reuse_threshold = 32;
-
-		return target_length >= length && (target_length < reuse_threshold || target_length - length < target_length / 2);
-	}
-
-	template <typename String, typename Header>
-	PUGI_IMPL_FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length)
-	{
-		assert((header & header_mask) == 0 || dest); // header bit indicates whether dest was previously allocated
-
-		if (source_length == 0)
-		{
-			// empty string and null pointer are equivalent, so just deallocate old memory
-			xml_allocator* alloc = PUGI_IMPL_GETPAGE_IMPL(header)->allocator;
-
-			if (header & header_mask) alloc->deallocate_string(dest);
-
-			// mark the string as not allocated
-			dest = 0;
-			header &= ~header_mask;
-
-			return true;
-		}
-		else if (dest && strcpy_insitu_allow(source_length, header, header_mask, dest))
-		{
-			// we can reuse old buffer, so just copy the new data (including zero terminator)
-			memcpy(dest, source, source_length * sizeof(char_t));
-			dest[source_length] = 0;
-
-			return true;
-		}
-		else
-		{
-			xml_allocator* alloc = PUGI_IMPL_GETPAGE_IMPL(header)->allocator;
-
-			if (!alloc->reserve()) return false;
-
-			// allocate new buffer
-			char_t* buf = alloc->allocate_string(source_length + 1);
-			if (!buf) return false;
-
-			// copy the string (including zero terminator)
-			memcpy(buf, source, source_length * sizeof(char_t));
-			buf[source_length] = 0;
-
-			// deallocate old buffer (*after* the above to protect against overlapping memory and/or allocation failures)
-			if (header & header_mask) alloc->deallocate_string(dest);
-
-			// the string is now allocated, so set the flag
-			dest = buf;
-			header |= header_mask;
-
-			return true;
-		}
-	}
-
-	struct gap
-	{
-		char_t* end;
-		size_t size;
-
-		gap(): end(0), size(0)
-		{
-		}
-
-		// Push new gap, move s count bytes further (skipping the gap).
-		// Collapse previous gap.
-		void push(char_t*& s, size_t count)
-		{
-			if (end) // there was a gap already; collapse it
-			{
-				// Move [old_gap_end, new_gap_start) to [old_gap_start, ...)
-				assert(s >= end);
-				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
-			}
-
-			s += count; // end of current gap
-
-			// "merge" two gaps
-			end = s;
-			size += count;
-		}
-
-		// Collapse all gaps, return past-the-end pointer
-		char_t* flush(char_t* s)
-		{
-			if (end)
-			{
-				// Move [old_gap_end, current_pos) to [old_gap_start, ...)
-				assert(s >= end);
-				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
-
-				return s - size;
-			}
-			else return s;
-		}
-	};
-
-	PUGI_IMPL_FN char_t* strconv_escape(char_t* s, gap& g)
-	{
-		char_t* stre = s + 1;
-
-		switch (*stre)
-		{
-			case '#':	// &#...
-			{
-				unsigned int ucsc = 0;
-
-				if (stre[1] == 'x') // &#x... (hex code)
-				{
-					stre += 2;
-
-					char_t ch = *stre;
-
-					if (ch == ';') return stre;
-
-					for (;;)
-					{
-						if (static_cast<unsigned int>(ch - '0') <= 9)
-							ucsc = 16 * ucsc + (ch - '0');
-						else if (static_cast<unsigned int>((ch | ' ') - 'a') <= 5)
-							ucsc = 16 * ucsc + ((ch | ' ') - 'a' + 10);
-						else if (ch == ';')
-							break;
-						else // cancel
-							return stre;
-
-						ch = *++stre;
-					}
-
-					++stre;
-				}
-				else	// &#... (dec code)
-				{
-					char_t ch = *++stre;
-
-					if (ch == ';') return stre;
-
-					for (;;)
-					{
-						if (static_cast<unsigned int>(ch - '0') <= 9)
-							ucsc = 10 * ucsc + (ch - '0');
-						else if (ch == ';')
-							break;
-						else // cancel
-							return stre;
-
-						ch = *++stre;
-					}
-
-					++stre;
-				}
-
-			#ifdef PUGIXML_WCHAR_MODE
-				s = reinterpret_cast<char_t*>(wchar_writer::any(reinterpret_cast<wchar_writer::value_type>(s), ucsc));
-			#else
-				s = reinterpret_cast<char_t*>(utf8_writer::any(reinterpret_cast<uint8_t*>(s), ucsc));
-			#endif
-
-				g.push(s, stre - s);
-				return stre;
-			}
-
-			case 'a':	// &a
-			{
-				++stre;
-
-				if (*stre == 'm') // &am
-				{
-					if (*++stre == 'p' && *++stre == ';') // &amp;
-					{
-						*s++ = '&';
-						++stre;
-
-						g.push(s, stre - s);
-						return stre;
-					}
-				}
-				else if (*stre == 'p') // &ap
-				{
-					if (*++stre == 'o' && *++stre == 's' && *++stre == ';') // &apos;
-					{
-						*s++ = '\'';
-						++stre;
-
-						g.push(s, stre - s);
-						return stre;
-					}
-				}
-				break;
-			}
-
-			case 'g': // &g
-			{
-				if (*++stre == 't' && *++stre == ';') // &gt;
-				{
-					*s++ = '>';
-					++stre;
-
-					g.push(s, stre - s);
-					return stre;
-				}
-				break;
-			}
-
-			case 'l': // &l
-			{
-				if (*++stre == 't' && *++stre == ';') // &lt;
-				{
-					*s++ = '<';
-					++stre;
-
-					g.push(s, stre - s);
-					return stre;
-				}
-				break;
-			}
-
-			case 'q': // &q
-			{
-				if (*++stre == 'u' && *++stre == 'o' && *++stre == 't' && *++stre == ';') // &quot;
-				{
-					*s++ = '"';
-					++stre;
-
-					g.push(s, stre - s);
-					return stre;
-				}
-				break;
-			}
-
-			default:
-				break;
-		}
-
-		return stre;
-	}
-
-	// Parser utilities
-	#define PUGI_IMPL_ENDSWITH(c, e)        ((c) == (e) || ((c) == 0 && endch == (e)))
-	#define PUGI_IMPL_SKIPWS()              { while (PUGI_IMPL_IS_CHARTYPE(*s, ct_space)) ++s; }
-	#define PUGI_IMPL_OPTSET(OPT)           ( optmsk & (OPT) )
-	#define PUGI_IMPL_PUSHNODE(TYPE)        { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI_IMPL_THROW_ERROR(status_out_of_memory, s); }
-	#define PUGI_IMPL_POPNODE()             { cursor = cursor->parent; }
-	#define PUGI_IMPL_SCANFOR(X)            { while (*s != 0 && !(X)) ++s; }
-	#define PUGI_IMPL_SCANWHILE(X)          { while (X) ++s; }
-	#define PUGI_IMPL_SCANWHILE_UNROLL(X)   { for (;;) { char_t ss = s[0]; if (PUGI_IMPL_UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI_IMPL_UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
-	#define PUGI_IMPL_ENDSEG()              { ch = *s; *s = 0; ++s; }
-	#define PUGI_IMPL_THROW_ERROR(err, m)   return error_offset = m, error_status = err, static_cast<char_t*>(0)
-	#define PUGI_IMPL_CHECK_ERROR(err, m)   { if (*s == 0) PUGI_IMPL_THROW_ERROR(err, m); }
-
-	PUGI_IMPL_FN char_t* strconv_comment(char_t* s, char_t endch)
-	{
-		gap g;
-
-		while (true)
-		{
-			PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_comment));
-
-			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
-			{
-				*s++ = '\n'; // replace first one with 0x0a
-
-				if (*s == '\n') g.push(s, 1);
-			}
-			else if (s[0] == '-' && s[1] == '-' && PUGI_IMPL_ENDSWITH(s[2], '>')) // comment ends here
-			{
-				*g.flush(s) = 0;
-
-				return s + (s[2] == '>' ? 3 : 2);
-			}
-			else if (*s == 0)
-			{
-				return 0;
-			}
-			else ++s;
-		}
-	}
-
-	PUGI_IMPL_FN char_t* strconv_cdata(char_t* s, char_t endch)
-	{
-		gap g;
-
-		while (true)
-		{
-			PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_cdata));
-
-			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
-			{
-				*s++ = '\n'; // replace first one with 0x0a
-
-				if (*s == '\n') g.push(s, 1);
-			}
-			else if (s[0] == ']' && s[1] == ']' && PUGI_IMPL_ENDSWITH(s[2], '>')) // CDATA ends here
-			{
-				*g.flush(s) = 0;
-
-				return s + 1;
-			}
-			else if (*s == 0)
-			{
-				return 0;
-			}
-			else ++s;
-		}
-	}
-
-	typedef char_t* (*strconv_pcdata_t)(char_t*);
-
-	template <typename opt_trim, typename opt_eol, typename opt_escape> struct strconv_pcdata_impl
-	{
-		static char_t* parse(char_t* s)
-		{
-			gap g;
-
-			char_t* begin = s;
-
-			while (true)
-			{
-				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_pcdata));
-
-				if (*s == '<') // PCDATA ends here
-				{
-					char_t* end = g.flush(s);
-
-					if (opt_trim::value)
-						while (end > begin && PUGI_IMPL_IS_CHARTYPE(end[-1], ct_space))
-							--end;
-
-					*end = 0;
-
-					return s + 1;
-				}
-				else if (opt_eol::value && *s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
-				{
-					*s++ = '\n'; // replace first one with 0x0a
-
-					if (*s == '\n') g.push(s, 1);
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (*s == 0)
-				{
-					char_t* end = g.flush(s);
-
-					if (opt_trim::value)
-						while (end > begin && PUGI_IMPL_IS_CHARTYPE(end[-1], ct_space))
-							--end;
-
-					*end = 0;
-
-					return s;
-				}
-				else ++s;
-			}
-		}
-	};
-
-	PUGI_IMPL_FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask)
-	{
-		PUGI_IMPL_STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800);
-
-		switch (((optmask >> 4) & 3) | ((optmask >> 9) & 4)) // get bitmask for flags (trim eol escapes); this simultaneously checks 3 options from assertion above
-		{
-		case 0: return strconv_pcdata_impl<opt_false, opt_false, opt_false>::parse;
-		case 1: return strconv_pcdata_impl<opt_false, opt_false, opt_true>::parse;
-		case 2: return strconv_pcdata_impl<opt_false, opt_true, opt_false>::parse;
-		case 3: return strconv_pcdata_impl<opt_false, opt_true, opt_true>::parse;
-		case 4: return strconv_pcdata_impl<opt_true, opt_false, opt_false>::parse;
-		case 5: return strconv_pcdata_impl<opt_true, opt_false, opt_true>::parse;
-		case 6: return strconv_pcdata_impl<opt_true, opt_true, opt_false>::parse;
-		case 7: return strconv_pcdata_impl<opt_true, opt_true, opt_true>::parse;
-		default: assert(false); return 0; // unreachable
-		}
-	}
-
-	typedef char_t* (*strconv_attribute_t)(char_t*, char_t);
-
-	template <typename opt_escape> struct strconv_attribute_impl
-	{
-		static char_t* parse_wnorm(char_t* s, char_t end_quote)
-		{
-			gap g;
-
-			// trim leading whitespaces
-			if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
-			{
-				char_t* str = s;
-
-				do ++str;
-				while (PUGI_IMPL_IS_CHARTYPE(*str, ct_space));
-
-				g.push(s, str - s);
-			}
-
-			while (true)
-			{
-				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space));
-
-				if (*s == end_quote)
-				{
-					char_t* str = g.flush(s);
-
-					do *str-- = 0;
-					while (PUGI_IMPL_IS_CHARTYPE(*str, ct_space));
-
-					return s + 1;
-				}
-				else if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
-				{
-					*s++ = ' ';
-
-					if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
-					{
-						char_t* str = s + 1;
-						while (PUGI_IMPL_IS_CHARTYPE(*str, ct_space)) ++str;
-
-						g.push(s, str - s);
-					}
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (!*s)
-				{
-					return 0;
-				}
-				else ++s;
-			}
-		}
-
-		static char_t* parse_wconv(char_t* s, char_t end_quote)
-		{
-			gap g;
-
-			while (true)
-			{
-				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr_ws));
-
-				if (*s == end_quote)
-				{
-					*g.flush(s) = 0;
-
-					return s + 1;
-				}
-				else if (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
-				{
-					if (*s == '\r')
-					{
-						*s++ = ' ';
-
-						if (*s == '\n') g.push(s, 1);
-					}
-					else *s++ = ' ';
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (!*s)
-				{
-					return 0;
-				}
-				else ++s;
-			}
-		}
-
-		static char_t* parse_eol(char_t* s, char_t end_quote)
-		{
-			gap g;
-
-			while (true)
-			{
-				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr));
-
-				if (*s == end_quote)
-				{
-					*g.flush(s) = 0;
-
-					return s + 1;
-				}
-				else if (*s == '\r')
-				{
-					*s++ = '\n';
-
-					if (*s == '\n') g.push(s, 1);
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (!*s)
-				{
-					return 0;
-				}
-				else ++s;
-			}
-		}
-
-		static char_t* parse_simple(char_t* s, char_t end_quote)
-		{
-			gap g;
-
-			while (true)
-			{
-				PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPE(ss, ct_parse_attr));
-
-				if (*s == end_quote)
-				{
-					*g.flush(s) = 0;
-
-					return s + 1;
-				}
-				else if (opt_escape::value && *s == '&')
-				{
-					s = strconv_escape(s, g);
-				}
-				else if (!*s)
-				{
-					return 0;
-				}
-				else ++s;
-			}
-		}
-	};
-
-	PUGI_IMPL_FN strconv_attribute_t get_strconv_attribute(unsigned int optmask)
-	{
-		PUGI_IMPL_STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80);
-
-		switch ((optmask >> 4) & 15) // get bitmask for flags (wnorm wconv eol escapes); this simultaneously checks 4 options from assertion above
-		{
-		case 0:  return strconv_attribute_impl<opt_false>::parse_simple;
-		case 1:  return strconv_attribute_impl<opt_true>::parse_simple;
-		case 2:  return strconv_attribute_impl<opt_false>::parse_eol;
-		case 3:  return strconv_attribute_impl<opt_true>::parse_eol;
-		case 4:  return strconv_attribute_impl<opt_false>::parse_wconv;
-		case 5:  return strconv_attribute_impl<opt_true>::parse_wconv;
-		case 6:  return strconv_attribute_impl<opt_false>::parse_wconv;
-		case 7:  return strconv_attribute_impl<opt_true>::parse_wconv;
-		case 8:  return strconv_attribute_impl<opt_false>::parse_wnorm;
-		case 9:  return strconv_attribute_impl<opt_true>::parse_wnorm;
-		case 10: return strconv_attribute_impl<opt_false>::parse_wnorm;
-		case 11: return strconv_attribute_impl<opt_true>::parse_wnorm;
-		case 12: return strconv_attribute_impl<opt_false>::parse_wnorm;
-		case 13: return strconv_attribute_impl<opt_true>::parse_wnorm;
-		case 14: return strconv_attribute_impl<opt_false>::parse_wnorm;
-		case 15: return strconv_attribute_impl<opt_true>::parse_wnorm;
-		default: assert(false); return 0; // unreachable
-		}
-	}
-
-	inline xml_parse_result make_parse_result(xml_parse_status status, ptrdiff_t offset = 0)
-	{
-		xml_parse_result result;
-		result.status = status;
-		result.offset = offset;
-
-		return result;
-	}
-
-	struct xml_parser
-	{
-		xml_allocator* alloc;
-		char_t* error_offset;
-		xml_parse_status error_status;
-
-		xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(0), error_status(status_ok)
-		{
-		}
-
-		// DOCTYPE consists of nested sections of the following possible types:
-		// <!-- ... -->, <? ... ?>, "...", '...'
-		// <![...]]>
-		// <!...>
-		// First group can not contain nested groups
-		// Second group can contain nested groups of the same type
-		// Third group can contain all other groups
-		char_t* parse_doctype_primitive(char_t* s)
-		{
-			if (*s == '"' || *s == '\'')
-			{
-				// quoted string
-				char_t ch = *s++;
-				PUGI_IMPL_SCANFOR(*s == ch);
-				if (!*s) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
-
-				s++;
-			}
-			else if (s[0] == '<' && s[1] == '?')
-			{
-				// <? ... ?>
-				s += 2;
-				PUGI_IMPL_SCANFOR(s[0] == '?' && s[1] == '>'); // no need for ENDSWITH because ?> can't terminate proper doctype
-				if (!*s) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
-
-				s += 2;
-			}
-			else if (s[0] == '<' && s[1] == '!' && s[2] == '-' && s[3] == '-')
-			{
-				s += 4;
-				PUGI_IMPL_SCANFOR(s[0] == '-' && s[1] == '-' && s[2] == '>'); // no need for ENDSWITH because --> can't terminate proper doctype
-				if (!*s) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
-
-				s += 3;
-			}
-			else PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
-
-			return s;
-		}
-
-		char_t* parse_doctype_ignore(char_t* s)
-		{
-			size_t depth = 0;
-
-			assert(s[0] == '<' && s[1] == '!' && s[2] == '[');
-			s += 3;
-
-			while (*s)
-			{
-				if (s[0] == '<' && s[1] == '!' && s[2] == '[')
-				{
-					// nested ignore section
-					s += 3;
-					depth++;
-				}
-				else if (s[0] == ']' && s[1] == ']' && s[2] == '>')
-				{
-					// ignore section end
-					s += 3;
-
-					if (depth == 0)
-						return s;
-
-					depth--;
-				}
-				else s++;
-			}
-
-			PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
-		}
-
-		char_t* parse_doctype_group(char_t* s, char_t endch)
-		{
-			size_t depth = 0;
-
-			assert((s[0] == '<' || s[0] == 0) && s[1] == '!');
-			s += 2;
-
-			while (*s)
-			{
-				if (s[0] == '<' && s[1] == '!' && s[2] != '-')
-				{
-					if (s[2] == '[')
-					{
-						// ignore
-						s = parse_doctype_ignore(s);
-						if (!s) return s;
-					}
-					else
-					{
-						// some control group
-						s += 2;
-						depth++;
-					}
-				}
-				else if (s[0] == '<' || s[0] == '"' || s[0] == '\'')
-				{
-					// unknown tag (forbidden), or some primitive group
-					s = parse_doctype_primitive(s);
-					if (!s) return s;
-				}
-				else if (*s == '>')
-				{
-					if (depth == 0)
-						return s;
-
-					depth--;
-					s++;
-				}
-				else s++;
-			}
-
-			if (depth != 0 || endch != '>') PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
-
-			return s;
-		}
-
-		char_t* parse_exclamation(char_t* s, xml_node_struct* cursor, unsigned int optmsk, char_t endch)
-		{
-			// parse node contents, starting with exclamation mark
-			++s;
-
-			if (*s == '-') // '<!-...'
-			{
-				++s;
-
-				if (*s == '-') // '<!--...'
-				{
-					++s;
-
-					if (PUGI_IMPL_OPTSET(parse_comments))
-					{
-						PUGI_IMPL_PUSHNODE(node_comment); // Append a new node on the tree.
-						cursor->value = s; // Save the offset.
-					}
-
-					if (PUGI_IMPL_OPTSET(parse_eol) && PUGI_IMPL_OPTSET(parse_comments))
-					{
-						s = strconv_comment(s, endch);
-
-						if (!s) PUGI_IMPL_THROW_ERROR(status_bad_comment, cursor->value);
-					}
-					else
-					{
-						// Scan for terminating '-->'.
-						PUGI_IMPL_SCANFOR(s[0] == '-' && s[1] == '-' && PUGI_IMPL_ENDSWITH(s[2], '>'));
-						PUGI_IMPL_CHECK_ERROR(status_bad_comment, s);
-
-						if (PUGI_IMPL_OPTSET(parse_comments))
-							*s = 0; // Zero-terminate this segment at the first terminating '-'.
-
-						s += (s[2] == '>' ? 3 : 2); // Step over the '\0->'.
-					}
-				}
-				else PUGI_IMPL_THROW_ERROR(status_bad_comment, s);
-			}
-			else if (*s == '[')
-			{
-				// '<![CDATA[...'
-				if (*++s=='C' && *++s=='D' && *++s=='A' && *++s=='T' && *++s=='A' && *++s == '[')
-				{
-					++s;
-
-					if (PUGI_IMPL_OPTSET(parse_cdata))
-					{
-						PUGI_IMPL_PUSHNODE(node_cdata); // Append a new node on the tree.
-						cursor->value = s; // Save the offset.
-
-						if (PUGI_IMPL_OPTSET(parse_eol))
-						{
-							s = strconv_cdata(s, endch);
-
-							if (!s) PUGI_IMPL_THROW_ERROR(status_bad_cdata, cursor->value);
-						}
-						else
-						{
-							// Scan for terminating ']]>'.
-							PUGI_IMPL_SCANFOR(s[0] == ']' && s[1] == ']' && PUGI_IMPL_ENDSWITH(s[2], '>'));
-							PUGI_IMPL_CHECK_ERROR(status_bad_cdata, s);
-
-							*s++ = 0; // Zero-terminate this segment.
-						}
-					}
-					else // Flagged for discard, but we still have to scan for the terminator.
-					{
-						// Scan for terminating ']]>'.
-						PUGI_IMPL_SCANFOR(s[0] == ']' && s[1] == ']' && PUGI_IMPL_ENDSWITH(s[2], '>'));
-						PUGI_IMPL_CHECK_ERROR(status_bad_cdata, s);
-
-						++s;
-					}
-
-					s += (s[1] == '>' ? 2 : 1); // Step over the last ']>'.
-				}
-				else PUGI_IMPL_THROW_ERROR(status_bad_cdata, s);
-			}
-			else if (s[0] == 'D' && s[1] == 'O' && s[2] == 'C' && s[3] == 'T' && s[4] == 'Y' && s[5] == 'P' && PUGI_IMPL_ENDSWITH(s[6], 'E'))
-			{
-				s -= 2;
-
-				if (cursor->parent) PUGI_IMPL_THROW_ERROR(status_bad_doctype, s);
-
-				char_t* mark = s + 9;
-
-				s = parse_doctype_group(s, endch);
-				if (!s) return s;
-
-				assert((*s == 0 && endch == '>') || *s == '>');
-				if (*s) *s++ = 0;
-
-				if (PUGI_IMPL_OPTSET(parse_doctype))
-				{
-					while (PUGI_IMPL_IS_CHARTYPE(*mark, ct_space)) ++mark;
-
-					PUGI_IMPL_PUSHNODE(node_doctype);
-
-					cursor->value = mark;
-				}
-			}
-			else if (*s == 0 && endch == '-') PUGI_IMPL_THROW_ERROR(status_bad_comment, s);
-			else if (*s == 0 && endch == '[') PUGI_IMPL_THROW_ERROR(status_bad_cdata, s);
-			else PUGI_IMPL_THROW_ERROR(status_unrecognized_tag, s);
-
-			return s;
-		}
-
-		char_t* parse_question(char_t* s, xml_node_struct*& ref_cursor, unsigned int optmsk, char_t endch)
-		{
-			// load into registers
-			xml_node_struct* cursor = ref_cursor;
-			char_t ch = 0;
-
-			// parse node contents, starting with question mark
-			++s;
-
-			// read PI target
-			char_t* target = s;
-
-			if (!PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
-
-			PUGI_IMPL_SCANWHILE(PUGI_IMPL_IS_CHARTYPE(*s, ct_symbol));
-			PUGI_IMPL_CHECK_ERROR(status_bad_pi, s);
-
-			// determine node type; stricmp / strcasecmp is not portable
-			bool declaration = (target[0] | ' ') == 'x' && (target[1] | ' ') == 'm' && (target[2] | ' ') == 'l' && target + 3 == s;
-
-			if (declaration ? PUGI_IMPL_OPTSET(parse_declaration) : PUGI_IMPL_OPTSET(parse_pi))
-			{
-				if (declaration)
-				{
-					// disallow non top-level declarations
-					if (cursor->parent) PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
-
-					PUGI_IMPL_PUSHNODE(node_declaration);
-				}
-				else
-				{
-					PUGI_IMPL_PUSHNODE(node_pi);
-				}
-
-				cursor->name = target;
-
-				PUGI_IMPL_ENDSEG();
-
-				// parse value/attributes
-				if (ch == '?')
-				{
-					// empty node
-					if (!PUGI_IMPL_ENDSWITH(*s, '>')) PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
-					s += (*s == '>');
-
-					PUGI_IMPL_POPNODE();
-				}
-				else if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
-				{
-					PUGI_IMPL_SKIPWS();
-
-					// scan for tag end
-					char_t* value = s;
-
-					PUGI_IMPL_SCANFOR(s[0] == '?' && PUGI_IMPL_ENDSWITH(s[1], '>'));
-					PUGI_IMPL_CHECK_ERROR(status_bad_pi, s);
-
-					if (declaration)
-					{
-						// replace ending ? with / so that 'element' terminates properly
-						*s = '/';
-
-						// we exit from this function with cursor at node_declaration, which is a signal to parse() to go to LOC_ATTRIBUTES
-						s = value;
-					}
-					else
-					{
-						// store value and step over >
-						cursor->value = value;
-
-						PUGI_IMPL_POPNODE();
-
-						PUGI_IMPL_ENDSEG();
-
-						s += (*s == '>');
-					}
-				}
-				else PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
-			}
-			else
-			{
-				// scan for tag end
-				PUGI_IMPL_SCANFOR(s[0] == '?' && PUGI_IMPL_ENDSWITH(s[1], '>'));
-				PUGI_IMPL_CHECK_ERROR(status_bad_pi, s);
-
-				s += (s[1] == '>' ? 2 : 1);
-			}
-
-			// store from registers
-			ref_cursor = cursor;
-
-			return s;
-		}
-
-		char_t* parse_tree(char_t* s, xml_node_struct* root, unsigned int optmsk, char_t endch)
-		{
-			strconv_attribute_t strconv_attribute = get_strconv_attribute(optmsk);
-			strconv_pcdata_t strconv_pcdata = get_strconv_pcdata(optmsk);
-
-			char_t ch = 0;
-			xml_node_struct* cursor = root;
-			char_t* mark = s;
-
-			while (*s != 0)
-			{
-				if (*s == '<')
-				{
-					++s;
-
-				LOC_TAG:
-					if (PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) // '<#...'
-					{
-						PUGI_IMPL_PUSHNODE(node_element); // Append a new node to the tree.
-
-						cursor->name = s;
-
-						PUGI_IMPL_SCANWHILE_UNROLL(PUGI_IMPL_IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
-						PUGI_IMPL_ENDSEG(); // Save char in 'ch', terminate & step over.
-
-						if (ch == '>')
-						{
-							// end of tag
-						}
-						else if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
-						{
-						LOC_ATTRIBUTES:
-							while (true)
-							{
-								PUGI_IMPL_SKIPWS(); // Eat any whitespace.
-
-								if (PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) // <... #...
-								{
-									xml_attribute_struct* a = append_new_attribute(cursor, *alloc); // Make space for this attribute.
-									if (!a) PUGI_IMPL_THROW_ERROR(status_out_of_memory, s);
-
-									a->name = s; // Save the offset.
-
-									PUGI_IMPL_SCANWHILE_UNROLL(PUGI_IMPL_IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
-									PUGI_IMPL_ENDSEG(); // Save char in 'ch', terminate & step over.
-
-									if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
-									{
-										PUGI_IMPL_SKIPWS(); // Eat any whitespace.
-
-										ch = *s;
-										++s;
-									}
-
-									if (ch == '=') // '<... #=...'
-									{
-										PUGI_IMPL_SKIPWS(); // Eat any whitespace.
-
-										if (*s == '"' || *s == '\'') // '<... #="...'
-										{
-											ch = *s; // Save quote char to avoid breaking on "''" -or- '""'.
-											++s; // Step over the quote.
-											a->value = s; // Save the offset.
-
-											s = strconv_attribute(s, ch);
-
-											if (!s) PUGI_IMPL_THROW_ERROR(status_bad_attribute, a->value);
-
-											// After this line the loop continues from the start;
-											// Whitespaces, / and > are ok, symbols and EOF are wrong,
-											// everything else will be detected
-											if (PUGI_IMPL_IS_CHARTYPE(*s, ct_start_symbol)) PUGI_IMPL_THROW_ERROR(status_bad_attribute, s);
-										}
-										else PUGI_IMPL_THROW_ERROR(status_bad_attribute, s);
-									}
-									else PUGI_IMPL_THROW_ERROR(status_bad_attribute, s);
-								}
-								else if (*s == '/')
-								{
-									++s;
-
-									if (*s == '>')
-									{
-										PUGI_IMPL_POPNODE();
-										s++;
-										break;
-									}
-									else if (*s == 0 && endch == '>')
-									{
-										PUGI_IMPL_POPNODE();
-										break;
-									}
-									else PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
-								}
-								else if (*s == '>')
-								{
-									++s;
-
-									break;
-								}
-								else if (*s == 0 && endch == '>')
-								{
-									break;
-								}
-								else PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
-							}
-
-							// !!!
-						}
-						else if (ch == '/') // '<#.../'
-						{
-							if (!PUGI_IMPL_ENDSWITH(*s, '>')) PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
-
-							PUGI_IMPL_POPNODE(); // Pop.
-
-							s += (*s == '>');
-						}
-						else if (ch == 0)
-						{
-							// we stepped over null terminator, backtrack & handle closing tag
-							--s;
-
-							if (endch != '>') PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
-						}
-						else PUGI_IMPL_THROW_ERROR(status_bad_start_element, s);
-					}
-					else if (*s == '/')
-					{
-						++s;
-
-						mark = s;
-
-						char_t* name = cursor->name;
-						if (!name) PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, mark);
-
-						while (PUGI_IMPL_IS_CHARTYPE(*s, ct_symbol))
-						{
-							if (*s++ != *name++) PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, mark);
-						}
-
-						if (*name)
-						{
-							if (*s == 0 && name[0] == endch && name[1] == 0) PUGI_IMPL_THROW_ERROR(status_bad_end_element, s);
-							else PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, mark);
-						}
-
-						PUGI_IMPL_POPNODE(); // Pop.
-
-						PUGI_IMPL_SKIPWS();
-
-						if (*s == 0)
-						{
-							if (endch != '>') PUGI_IMPL_THROW_ERROR(status_bad_end_element, s);
-						}
-						else
-						{
-							if (*s != '>') PUGI_IMPL_THROW_ERROR(status_bad_end_element, s);
-							++s;
-						}
-					}
-					else if (*s == '?') // '<?...'
-					{
-						s = parse_question(s, cursor, optmsk, endch);
-						if (!s) return s;
-
-						assert(cursor);
-						if (PUGI_IMPL_NODETYPE(cursor) == node_declaration) goto LOC_ATTRIBUTES;
-					}
-					else if (*s == '!') // '<!...'
-					{
-						s = parse_exclamation(s, cursor, optmsk, endch);
-						if (!s) return s;
-					}
-					else if (*s == 0 && endch == '?') PUGI_IMPL_THROW_ERROR(status_bad_pi, s);
-					else PUGI_IMPL_THROW_ERROR(status_unrecognized_tag, s);
-				}
-				else
-				{
-					mark = s; // Save this offset while searching for a terminator.
-
-					PUGI_IMPL_SKIPWS(); // Eat whitespace if no genuine PCDATA here.
-
-					if (*s == '<' || !*s)
-					{
-						// We skipped some whitespace characters because otherwise we would take the tag branch instead of PCDATA one
-						assert(mark != s);
-
-						if (!PUGI_IMPL_OPTSET(parse_ws_pcdata | parse_ws_pcdata_single) || PUGI_IMPL_OPTSET(parse_trim_pcdata))
-						{
-							continue;
-						}
-						else if (PUGI_IMPL_OPTSET(parse_ws_pcdata_single))
-						{
-							if (s[0] != '<' || s[1] != '/' || cursor->first_child) continue;
-						}
-					}
-
-					if (!PUGI_IMPL_OPTSET(parse_trim_pcdata))
-						s = mark;
-
-					if (cursor->parent || PUGI_IMPL_OPTSET(parse_fragment))
-					{
-						if (PUGI_IMPL_OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value)
-						{
-							cursor->value = s; // Save the offset.
-						}
-						else
-						{
-							PUGI_IMPL_PUSHNODE(node_pcdata); // Append a new node on the tree.
-
-							cursor->value = s; // Save the offset.
-
-							PUGI_IMPL_POPNODE(); // Pop since this is a standalone.
-						}
-
-						s = strconv_pcdata(s);
-
-						if (!*s) break;
-					}
-					else
-					{
-						PUGI_IMPL_SCANFOR(*s == '<'); // '...<'
-						if (!*s) break;
-
-						++s;
-					}
-
-					// We're after '<'
-					goto LOC_TAG;
-				}
-			}
-
-			// check that last tag is closed
-			if (cursor != root) PUGI_IMPL_THROW_ERROR(status_end_element_mismatch, s);
-
-			return s;
-		}
-
-	#ifdef PUGIXML_WCHAR_MODE
-		static char_t* parse_skip_bom(char_t* s)
-		{
-			unsigned int bom = 0xfeff;
-			return (s[0] == static_cast<wchar_t>(bom)) ? s + 1 : s;
-		}
-	#else
-		static char_t* parse_skip_bom(char_t* s)
-		{
-			return (s[0] == '\xef' && s[1] == '\xbb' && s[2] == '\xbf') ? s + 3 : s;
-		}
-	#endif
-
-		static bool has_element_node_siblings(xml_node_struct* node)
-		{
-			while (node)
-			{
-				if (PUGI_IMPL_NODETYPE(node) == node_element) return true;
-
-				node = node->next_sibling;
-			}
-
-			return false;
-		}
-
-		static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk)
-		{
-			// early-out for empty documents
-			if (length == 0)
-				return make_parse_result(PUGI_IMPL_OPTSET(parse_fragment) ? status_ok : status_no_document_element);
-
-			// get last child of the root before parsing
-			xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0;
-
-			// create parser on stack
-			xml_parser parser(static_cast<xml_allocator*>(xmldoc));
-
-			// save last character and make buffer zero-terminated (speeds up parsing)
-			char_t endch = buffer[length - 1];
-			buffer[length - 1] = 0;
-
-			// skip BOM to make sure it does not end up as part of parse output
-			char_t* buffer_data = parse_skip_bom(buffer);
-
-			// perform actual parsing
-			parser.parse_tree(buffer_data, root, optmsk, endch);
-
-			xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0);
-			assert(result.offset >= 0 && static_cast<size_t>(result.offset) <= length);
-
-			if (result)
-			{
-				// since we removed last character, we have to handle the only possible false positive (stray <)
-				if (endch == '<')
-					return make_parse_result(status_unrecognized_tag, length - 1);
-
-				// check if there are any element nodes parsed
-				xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child+ 0;
-
-				if (!PUGI_IMPL_OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed))
-					return make_parse_result(status_no_document_element, length - 1);
-			}
-			else
-			{
-				// roll back offset if it occurs on a null terminator in the source buffer
-				if (result.offset > 0 && static_cast<size_t>(result.offset) == length - 1 && endch == 0)
-					result.offset--;
-			}
-
-			return result;
-		}
-	};
-
-	// Output facilities
-	PUGI_IMPL_FN xml_encoding get_write_native_encoding()
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		return get_wchar_encoding();
-	#else
-		return encoding_utf8;
-	#endif
-	}
-
-	PUGI_IMPL_FN xml_encoding get_write_encoding(xml_encoding encoding)
-	{
-		// replace wchar encoding with utf implementation
-		if (encoding == encoding_wchar) return get_wchar_encoding();
-
-		// replace utf16 encoding with utf16 with specific endianness
-		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-		// replace utf32 encoding with utf32 with specific endianness
-		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-		// only do autodetection if no explicit encoding is requested
-		if (encoding != encoding_auto) return encoding;
-
-		// assume utf8 encoding
-		return encoding_utf8;
-	}
-
-	template <typename D, typename T> PUGI_IMPL_FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T)
-	{
-		PUGI_IMPL_STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
-
-		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
-
-		return static_cast<size_t>(end - dest) * sizeof(*dest);
-	}
-
-	template <typename D, typename T> PUGI_IMPL_FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap)
-	{
-		PUGI_IMPL_STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
-
-		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
-
-		if (opt_swap)
-		{
-			for (typename T::value_type i = dest; i != end; ++i)
-				*i = endian_swap(*i);
-		}
-
-		return static_cast<size_t>(end - dest) * sizeof(*dest);
-	}
-
-#ifdef PUGIXML_WCHAR_MODE
-	PUGI_IMPL_FN size_t get_valid_length(const char_t* data, size_t length)
-	{
-		if (length < 1) return 0;
-
-		// discard last character if it's the lead of a surrogate pair
-		return (sizeof(wchar_t) == 2 && static_cast<unsigned int>(static_cast<uint16_t>(data[length - 1]) - 0xD800) < 0x400) ? length - 1 : length;
-	}
-
-	PUGI_IMPL_FN size_t convert_buffer_output(char_t* r_char, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
-	{
-		// only endian-swapping is required
-		if (need_endian_swap_utf(encoding, get_wchar_encoding()))
-		{
-			convert_wchar_endian_swap(r_char, data, length);
-
-			return length * sizeof(char_t);
-		}
-
-		// convert to utf8
-		if (encoding == encoding_utf8)
-			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), utf8_writer());
-
-		// convert to utf16
-		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-			return convert_buffer_output_generic(r_u16, data, length, wchar_decoder(), utf16_writer(), native_encoding != encoding);
-		}
-
-		// convert to utf32
-		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-			return convert_buffer_output_generic(r_u32, data, length, wchar_decoder(), utf32_writer(), native_encoding != encoding);
-		}
-
-		// convert to latin1
-		if (encoding == encoding_latin1)
-			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), latin1_writer());
-
-		assert(false && "Invalid encoding"); // unreachable
-		return 0;
-	}
-#else
-	PUGI_IMPL_FN size_t get_valid_length(const char_t* data, size_t length)
-	{
-		if (length < 5) return 0;
-
-		for (size_t i = 1; i <= 4; ++i)
-		{
-			uint8_t ch = static_cast<uint8_t>(data[length - i]);
-
-			// either a standalone character or a leading one
-			if ((ch & 0xc0) != 0x80) return length - i;
-		}
-
-		// there are four non-leading characters at the end, sequence tail is broken so might as well process the whole chunk
-		return length;
-	}
-
-	PUGI_IMPL_FN size_t convert_buffer_output(char_t* /* r_char */, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
-	{
-		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
-
-			return convert_buffer_output_generic(r_u16, data, length, utf8_decoder(), utf16_writer(), native_encoding != encoding);
-		}
-
-		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
-		{
-			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
-
-			return convert_buffer_output_generic(r_u32, data, length, utf8_decoder(), utf32_writer(), native_encoding != encoding);
-		}
-
-		if (encoding == encoding_latin1)
-			return convert_buffer_output_generic(r_u8, data, length, utf8_decoder(), latin1_writer());
-
-		assert(false && "Invalid encoding"); // unreachable
-		return 0;
-	}
-#endif
-
-	class xml_buffered_writer
-	{
-		xml_buffered_writer(const xml_buffered_writer&);
-		xml_buffered_writer& operator=(const xml_buffered_writer&);
-
-	public:
-		xml_buffered_writer(xml_writer& writer_, xml_encoding user_encoding): writer(writer_), bufsize(0), encoding(get_write_encoding(user_encoding))
-		{
-			PUGI_IMPL_STATIC_ASSERT(bufcapacity >= 8);
-		}
-
-		size_t flush()
-		{
-			flush(buffer, bufsize);
-			bufsize = 0;
-			return 0;
-		}
-
-		void flush(const char_t* data, size_t size)
-		{
-			if (size == 0) return;
-
-			// fast path, just write data
-			if (encoding == get_write_native_encoding())
-				writer.write(data, size * sizeof(char_t));
-			else
-			{
-				// convert chunk
-				size_t result = convert_buffer_output(scratch.data_char, scratch.data_u8, scratch.data_u16, scratch.data_u32, data, size, encoding);
-				assert(result <= sizeof(scratch));
-
-				// write data
-				writer.write(scratch.data_u8, result);
-			}
-		}
-
-		void write_direct(const char_t* data, size_t length)
-		{
-			// flush the remaining buffer contents
-			flush();
-
-			// handle large chunks
-			if (length > bufcapacity)
-			{
-				if (encoding == get_write_native_encoding())
-				{
-					// fast path, can just write data chunk
-					writer.write(data, length * sizeof(char_t));
-					return;
-				}
-
-				// need to convert in suitable chunks
-				while (length > bufcapacity)
-				{
-					// get chunk size by selecting such number of characters that are guaranteed to fit into scratch buffer
-					// and form a complete codepoint sequence (i.e. discard start of last codepoint if necessary)
-					size_t chunk_size = get_valid_length(data, bufcapacity);
-					assert(chunk_size);
-
-					// convert chunk and write
-					flush(data, chunk_size);
-
-					// iterate
-					data += chunk_size;
-					length -= chunk_size;
-				}
-
-				// small tail is copied below
-				bufsize = 0;
-			}
-
-			memcpy(buffer + bufsize, data, length * sizeof(char_t));
-			bufsize += length;
-		}
-
-		void write_buffer(const char_t* data, size_t length)
-		{
-			size_t offset = bufsize;
-
-			if (offset + length <= bufcapacity)
-			{
-				memcpy(buffer + offset, data, length * sizeof(char_t));
-				bufsize = offset + length;
-			}
-			else
-			{
-				write_direct(data, length);
-			}
-		}
-
-		void write_string(const char_t* data)
-		{
-			// write the part of the string that fits in the buffer
-			size_t offset = bufsize;
-
-			while (*data && offset < bufcapacity)
-				buffer[offset++] = *data++;
-
-			// write the rest
-			if (offset < bufcapacity)
-			{
-				bufsize = offset;
-			}
-			else
-			{
-				// backtrack a bit if we have split the codepoint
-				size_t length = offset - bufsize;
-				size_t extra = length - get_valid_length(data - length, length);
-
-				bufsize = offset - extra;
-
-				write_direct(data - extra, strlength(data) + extra);
-			}
-		}
-
-		void write(char_t d0)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 1) offset = flush();
-
-			buffer[offset + 0] = d0;
-			bufsize = offset + 1;
-		}
-
-		void write(char_t d0, char_t d1)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 2) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			bufsize = offset + 2;
-		}
-
-		void write(char_t d0, char_t d1, char_t d2)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 3) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			buffer[offset + 2] = d2;
-			bufsize = offset + 3;
-		}
-
-		void write(char_t d0, char_t d1, char_t d2, char_t d3)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 4) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			buffer[offset + 2] = d2;
-			buffer[offset + 3] = d3;
-			bufsize = offset + 4;
-		}
-
-		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 5) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			buffer[offset + 2] = d2;
-			buffer[offset + 3] = d3;
-			buffer[offset + 4] = d4;
-			bufsize = offset + 5;
-		}
-
-		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4, char_t d5)
-		{
-			size_t offset = bufsize;
-			if (offset > bufcapacity - 6) offset = flush();
-
-			buffer[offset + 0] = d0;
-			buffer[offset + 1] = d1;
-			buffer[offset + 2] = d2;
-			buffer[offset + 3] = d3;
-			buffer[offset + 4] = d4;
-			buffer[offset + 5] = d5;
-			bufsize = offset + 6;
-		}
-
-		// utf8 maximum expansion: x4 (-> utf32)
-		// utf16 maximum expansion: x2 (-> utf32)
-		// utf32 maximum expansion: x1
-		enum
-		{
-			bufcapacitybytes =
-			#ifdef PUGIXML_MEMORY_OUTPUT_STACK
-				PUGIXML_MEMORY_OUTPUT_STACK
-			#else
-				10240
-			#endif
-			,
-			bufcapacity = bufcapacitybytes / (sizeof(char_t) + 4)
-		};
-
-		char_t buffer[bufcapacity];
-
-		union
-		{
-			uint8_t data_u8[4 * bufcapacity];
-			uint16_t data_u16[2 * bufcapacity];
-			uint32_t data_u32[bufcapacity];
-			char_t data_char[bufcapacity];
-		} scratch;
-
-		xml_writer& writer;
-		size_t bufsize;
-		xml_encoding encoding;
-	};
-
-	PUGI_IMPL_FN void text_output_escaped(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
-	{
-		while (*s)
-		{
-			const char_t* prev = s;
-
-			// While *s is a usual symbol
-			PUGI_IMPL_SCANWHILE_UNROLL(!PUGI_IMPL_IS_CHARTYPEX(ss, type));
-
-			writer.write_buffer(prev, static_cast<size_t>(s - prev));
-
-			switch (*s)
-			{
-				case 0: break;
-				case '&':
-					writer.write('&', 'a', 'm', 'p', ';');
-					++s;
-					break;
-				case '<':
-					writer.write('&', 'l', 't', ';');
-					++s;
-					break;
-				case '>':
-					writer.write('&', 'g', 't', ';');
-					++s;
-					break;
-				case '"':
-					if (flags & format_attribute_single_quote)
-						writer.write('"');
-					else
-						writer.write('&', 'q', 'u', 'o', 't', ';');
-					++s;
-					break;
-				case '\'':
-					if (flags & format_attribute_single_quote)
-						writer.write('&', 'a', 'p', 'o', 's', ';');
-					else
-						writer.write('\'');
-					++s;
-					break;
-				default: // s is not a usual symbol
-				{
-					unsigned int ch = static_cast<unsigned int>(*s++);
-					assert(ch < 32);
-
-					if (!(flags & format_skip_control_chars))
-						writer.write('&', '#', static_cast<char_t>((ch / 10) + '0'), static_cast<char_t>((ch % 10) + '0'), ';');
-				}
-			}
-		}
-	}
-
-	PUGI_IMPL_FN void text_output(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
-	{
-		if (flags & format_no_escapes)
-			writer.write_string(s);
-		else
-			text_output_escaped(writer, s, type, flags);
-	}
-
-	PUGI_IMPL_FN void text_output_cdata(xml_buffered_writer& writer, const char_t* s)
-	{
-		do
-		{
-			writer.write('<', '!', '[', 'C', 'D');
-			writer.write('A', 'T', 'A', '[');
-
-			const char_t* prev = s;
-
-			// look for ]]> sequence - we can't output it as is since it terminates CDATA
-			while (*s && !(s[0] == ']' && s[1] == ']' && s[2] == '>')) ++s;
-
-			// skip ]] if we stopped at ]]>, > will go to the next CDATA section
-			if (*s) s += 2;
-
-			writer.write_buffer(prev, static_cast<size_t>(s - prev));
-
-			writer.write(']', ']', '>');
-		}
-		while (*s);
-	}
-
-	PUGI_IMPL_FN void text_output_indent(xml_buffered_writer& writer, const char_t* indent, size_t indent_length, unsigned int depth)
-	{
-		switch (indent_length)
-		{
-		case 1:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write(indent[0]);
-			break;
-		}
-
-		case 2:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write(indent[0], indent[1]);
-			break;
-		}
-
-		case 3:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write(indent[0], indent[1], indent[2]);
-			break;
-		}
-
-		case 4:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write(indent[0], indent[1], indent[2], indent[3]);
-			break;
-		}
-
-		default:
-		{
-			for (unsigned int i = 0; i < depth; ++i)
-				writer.write_buffer(indent, indent_length);
-		}
-		}
-	}
-
-	PUGI_IMPL_FN void node_output_comment(xml_buffered_writer& writer, const char_t* s)
-	{
-		writer.write('<', '!', '-', '-');
-
-		while (*s)
-		{
-			const char_t* prev = s;
-
-			// look for -\0 or -- sequence - we can't output it since -- is illegal in comment body
-			while (*s && !(s[0] == '-' && (s[1] == '-' || s[1] == 0))) ++s;
-
-			writer.write_buffer(prev, static_cast<size_t>(s - prev));
-
-			if (*s)
-			{
-				assert(*s == '-');
-
-				writer.write('-', ' ');
-				++s;
-			}
-		}
-
-		writer.write('-', '-', '>');
-	}
-
-	PUGI_IMPL_FN void node_output_pi_value(xml_buffered_writer& writer, const char_t* s)
-	{
-		while (*s)
-		{
-			const char_t* prev = s;
-
-			// look for ?> sequence - we can't output it since ?> terminates PI
-			while (*s && !(s[0] == '?' && s[1] == '>')) ++s;
-
-			writer.write_buffer(prev, static_cast<size_t>(s - prev));
-
-			if (*s)
-			{
-				assert(s[0] == '?' && s[1] == '>');
-
-				writer.write('?', ' ', '>');
-				s += 2;
-			}
-		}
-	}
-
-	PUGI_IMPL_FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
-	{
-		const char_t* default_name = PUGIXML_TEXT(":anonymous");
-		const char_t enquotation_char = (flags & format_attribute_single_quote) ? '\'' : '"';
-
-		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
-		{
-			if ((flags & (format_indent_attributes | format_raw)) == format_indent_attributes)
-			{
-				writer.write('\n');
-
-				text_output_indent(writer, indent, indent_length, depth + 1);
-			}
-			else
-			{
-				writer.write(' ');
-			}
-
-			writer.write_string(a->name ? a->name + 0 : default_name);
-			writer.write('=', enquotation_char);
-
-			if (a->value)
-				text_output(writer, a->value, ctx_special_attr, flags);
-
-			writer.write(enquotation_char);
-		}
-	}
-
-	PUGI_IMPL_FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
-	{
-		const char_t* default_name = PUGIXML_TEXT(":anonymous");
-		const char_t* name = node->name ? node->name + 0 : default_name;
-
-		writer.write('<');
-		writer.write_string(name);
-
-		if (node->first_attribute)
-			node_output_attributes(writer, node, indent, indent_length, flags, depth);
-
-		// element nodes can have value if parse_embed_pcdata was used
-		if (!node->value)
-		{
-			if (!node->first_child)
-			{
-				if (flags & format_no_empty_element_tags)
-				{
-					writer.write('>', '<', '/');
-					writer.write_string(name);
-					writer.write('>');
-
-					return false;
-				}
-				else
-				{
-					if ((flags & format_raw) == 0)
-						writer.write(' ');
-
-					writer.write('/', '>');
-
-					return false;
-				}
-			}
-			else
-			{
-				writer.write('>');
-
-				return true;
-			}
-		}
-		else
-		{
-			writer.write('>');
-
-			text_output(writer, node->value, ctx_special_pcdata, flags);
-
-			if (!node->first_child)
-			{
-				writer.write('<', '/');
-				writer.write_string(name);
-				writer.write('>');
-
-				return false;
-			}
-			else
-			{
-				return true;
-			}
-		}
-	}
-
-	PUGI_IMPL_FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node)
-	{
-		const char_t* default_name = PUGIXML_TEXT(":anonymous");
-		const char_t* name = node->name ? node->name + 0 : default_name;
-
-		writer.write('<', '/');
-		writer.write_string(name);
-		writer.write('>');
-	}
-
-	PUGI_IMPL_FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
-	{
-		const char_t* default_name = PUGIXML_TEXT(":anonymous");
-
-		switch (PUGI_IMPL_NODETYPE(node))
-		{
-			case node_pcdata:
-				text_output(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""), ctx_special_pcdata, flags);
-				break;
-
-			case node_cdata:
-				text_output_cdata(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
-				break;
-
-			case node_comment:
-				node_output_comment(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
-				break;
-
-			case node_pi:
-				writer.write('<', '?');
-				writer.write_string(node->name ? node->name + 0 : default_name);
-
-				if (node->value)
-				{
-					writer.write(' ');
-					node_output_pi_value(writer, node->value);
-				}
-
-				writer.write('?', '>');
-				break;
-
-			case node_declaration:
-				writer.write('<', '?');
-				writer.write_string(node->name ? node->name + 0 : default_name);
-				node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0);
-				writer.write('?', '>');
-				break;
-
-			case node_doctype:
-				writer.write('<', '!', 'D', 'O', 'C');
-				writer.write('T', 'Y', 'P', 'E');
-
-				if (node->value)
-				{
-					writer.write(' ');
-					writer.write_string(node->value);
-				}
-
-				writer.write('>');
-				break;
-
-			default:
-				assert(false && "Invalid node type"); // unreachable
-		}
-	}
-
-	enum indent_flags_t
-	{
-		indent_newline = 1,
-		indent_indent = 2
-	};
-
-	PUGI_IMPL_FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth)
-	{
-		size_t indent_length = ((flags & (format_indent | format_indent_attributes)) && (flags & format_raw) == 0) ? strlength(indent) : 0;
-		unsigned int indent_flags = indent_indent;
-
-		xml_node_struct* node = root;
-
-		do
-		{
-			assert(node);
-
-			// begin writing current node
-			if (PUGI_IMPL_NODETYPE(node) == node_pcdata || PUGI_IMPL_NODETYPE(node) == node_cdata)
-			{
-				node_output_simple(writer, node, flags);
-
-				indent_flags = 0;
-			}
-			else
-			{
-				if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
-					writer.write('\n');
-
-				if ((indent_flags & indent_indent) && indent_length)
-					text_output_indent(writer, indent, indent_length, depth);
-
-				if (PUGI_IMPL_NODETYPE(node) == node_element)
-				{
-					indent_flags = indent_newline | indent_indent;
-
-					if (node_output_start(writer, node, indent, indent_length, flags, depth))
-					{
-						// element nodes can have value if parse_embed_pcdata was used
-						if (node->value)
-							indent_flags = 0;
-
-						node = node->first_child;
-						depth++;
-						continue;
-					}
-				}
-				else if (PUGI_IMPL_NODETYPE(node) == node_document)
-				{
-					indent_flags = indent_indent;
-
-					if (node->first_child)
-					{
-						node = node->first_child;
-						continue;
-					}
-				}
-				else
-				{
-					node_output_simple(writer, node, flags);
-
-					indent_flags = indent_newline | indent_indent;
-				}
-			}
-
-			// continue to the next node
-			while (node != root)
-			{
-				if (node->next_sibling)
-				{
-					node = node->next_sibling;
-					break;
-				}
-
-				node = node->parent;
-
-				// write closing node
-				if (PUGI_IMPL_NODETYPE(node) == node_element)
-				{
-					depth--;
-
-					if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
-						writer.write('\n');
-
-					if ((indent_flags & indent_indent) && indent_length)
-						text_output_indent(writer, indent, indent_length, depth);
-
-					node_output_end(writer, node);
-
-					indent_flags = indent_newline | indent_indent;
-				}
-			}
-		}
-		while (node != root);
-
-		if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
-			writer.write('\n');
-	}
-
-	PUGI_IMPL_FN bool has_declaration(xml_node_struct* node)
-	{
-		for (xml_node_struct* child = node->first_child; child; child = child->next_sibling)
-		{
-			xml_node_type type = PUGI_IMPL_NODETYPE(child);
-
-			if (type == node_declaration) return true;
-			if (type == node_element) return false;
-		}
-
-		return false;
-	}
-
-	PUGI_IMPL_FN bool is_attribute_of(xml_attribute_struct* attr, xml_node_struct* node)
-	{
-		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
-			if (a == attr)
-				return true;
-
-		return false;
-	}
-
-	PUGI_IMPL_FN bool allow_insert_attribute(xml_node_type parent)
-	{
-		return parent == node_element || parent == node_declaration;
-	}
-
-	PUGI_IMPL_FN bool allow_insert_child(xml_node_type parent, xml_node_type child)
-	{
-		if (parent != node_document && parent != node_element) return false;
-		if (child == node_document || child == node_null) return false;
-		if (parent != node_document && (child == node_declaration || child == node_doctype)) return false;
-
-		return true;
-	}
-
-	PUGI_IMPL_FN bool allow_move(xml_node parent, xml_node child)
-	{
-		// check that child can be a child of parent
-		if (!allow_insert_child(parent.type(), child.type()))
-			return false;
-
-		// check that node is not moved between documents
-		if (parent.root() != child.root())
-			return false;
-
-		// check that new parent is not in the child subtree
-		xml_node cur = parent;
-
-		while (cur)
-		{
-			if (cur == child)
-				return false;
-
-			cur = cur.parent();
-		}
-
-		return true;
-	}
-
-	template <typename String, typename Header>
-	PUGI_IMPL_FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc)
-	{
-		assert(!dest && (header & header_mask) == 0); // copies are performed into fresh nodes
-
-		if (source)
-		{
-			if (alloc && (source_header & header_mask) == 0)
-			{
-				dest = source;
-
-				// since strcpy_insitu can reuse document buffer memory we need to mark both source and dest as shared
-				header |= xml_memory_page_contents_shared_mask;
-				source_header |= xml_memory_page_contents_shared_mask;
-			}
-			else
-				strcpy_insitu(dest, header, header_mask, source, strlength(source));
-		}
-	}
-
-	PUGI_IMPL_FN void node_copy_contents(xml_node_struct* dn, xml_node_struct* sn, xml_allocator* shared_alloc)
-	{
-		node_copy_string(dn->name, dn->header, xml_memory_page_name_allocated_mask, sn->name, sn->header, shared_alloc);
-		node_copy_string(dn->value, dn->header, xml_memory_page_value_allocated_mask, sn->value, sn->header, shared_alloc);
-
-		for (xml_attribute_struct* sa = sn->first_attribute; sa; sa = sa->next_attribute)
-		{
-			xml_attribute_struct* da = append_new_attribute(dn, get_allocator(dn));
-
-			if (da)
-			{
-				node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
-				node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
-			}
-		}
-	}
-
-	PUGI_IMPL_FN void node_copy_tree(xml_node_struct* dn, xml_node_struct* sn)
-	{
-		xml_allocator& alloc = get_allocator(dn);
-		xml_allocator* shared_alloc = (&alloc == &get_allocator(sn)) ? &alloc : 0;
-
-		node_copy_contents(dn, sn, shared_alloc);
-
-		xml_node_struct* dit = dn;
-		xml_node_struct* sit = sn->first_child;
-
-		while (sit && sit != sn)
-		{
-			// loop invariant: dit is inside the subtree rooted at dn
-			assert(dit);
-
-			// when a tree is copied into one of the descendants, we need to skip that subtree to avoid an infinite loop
-			if (sit != dn)
-			{
-				xml_node_struct* copy = append_new_node(dit, alloc, PUGI_IMPL_NODETYPE(sit));
-
-				if (copy)
-				{
-					node_copy_contents(copy, sit, shared_alloc);
-
-					if (sit->first_child)
-					{
-						dit = copy;
-						sit = sit->first_child;
-						continue;
-					}
-				}
-			}
-
-			// continue to the next node
-			do
-			{
-				if (sit->next_sibling)
-				{
-					sit = sit->next_sibling;
-					break;
-				}
-
-				sit = sit->parent;
-				dit = dit->parent;
-
-				// loop invariant: dit is inside the subtree rooted at dn while sit is inside sn
-				assert(sit == sn || dit);
-			}
-			while (sit != sn);
-		}
-
-		assert(!sit || dit == dn->parent);
-	}
-
-	PUGI_IMPL_FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa)
-	{
-		xml_allocator& alloc = get_allocator(da);
-		xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : 0;
-
-		node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
-		node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
-	}
-
-	inline bool is_text_node(xml_node_struct* node)
-	{
-		xml_node_type type = PUGI_IMPL_NODETYPE(node);
-
-		return type == node_pcdata || type == node_cdata;
-	}
-
-	// get value with conversion functions
-	template <typename U> PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW U string_to_integer(const char_t* value, U minv, U maxv)
-	{
-		U result = 0;
-		const char_t* s = value;
-
-		while (PUGI_IMPL_IS_CHARTYPE(*s, ct_space))
-			s++;
-
-		bool negative = (*s == '-');
-
-		s += (*s == '+' || *s == '-');
-
-		bool overflow = false;
-
-		if (s[0] == '0' && (s[1] | ' ') == 'x')
-		{
-			s += 2;
-
-			// since overflow detection relies on length of the sequence skip leading zeros
-			while (*s == '0')
-				s++;
-
-			const char_t* start = s;
-
-			for (;;)
-			{
-				if (static_cast<unsigned>(*s - '0') < 10)
-					result = result * 16 + (*s - '0');
-				else if (static_cast<unsigned>((*s | ' ') - 'a') < 6)
-					result = result * 16 + ((*s | ' ') - 'a' + 10);
-				else
-					break;
-
-				s++;
-			}
-
-			size_t digits = static_cast<size_t>(s - start);
-
-			overflow = digits > sizeof(U) * 2;
-		}
-		else
-		{
-			// since overflow detection relies on length of the sequence skip leading zeros
-			while (*s == '0')
-				s++;
-
-			const char_t* start = s;
-
-			for (;;)
-			{
-				if (static_cast<unsigned>(*s - '0') < 10)
-					result = result * 10 + (*s - '0');
-				else
-					break;
-
-				s++;
-			}
-
-			size_t digits = static_cast<size_t>(s - start);
-
-			PUGI_IMPL_STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2);
-
-			const size_t max_digits10 = sizeof(U) == 8 ? 20 : sizeof(U) == 4 ? 10 : 5;
-			const char_t max_lead = sizeof(U) == 8 ? '1' : sizeof(U) == 4 ? '4' : '6';
-			const size_t high_bit = sizeof(U) * 8 - 1;
-
-			overflow = digits >= max_digits10 && !(digits == max_digits10 && (*start < max_lead || (*start == max_lead && result >> high_bit)));
-		}
-
-		if (negative)
-		{
-			// Workaround for crayc++ CC-3059: Expected no overflow in routine.
-		#ifdef _CRAYC
-			return (overflow || result > ~minv + 1) ? minv : ~result + 1;
-		#else
-			return (overflow || result > 0 - minv) ? minv : 0 - result;
-		#endif
-		}
-		else
-			return (overflow || result > maxv) ? maxv : result;
-	}
-
-	PUGI_IMPL_FN int get_value_int(const char_t* value)
-	{
-		return string_to_integer<unsigned int>(value, static_cast<unsigned int>(INT_MIN), INT_MAX);
-	}
-
-	PUGI_IMPL_FN unsigned int get_value_uint(const char_t* value)
-	{
-		return string_to_integer<unsigned int>(value, 0, UINT_MAX);
-	}
-
-	PUGI_IMPL_FN double get_value_double(const char_t* value)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcstod(value, 0);
-	#else
-		return strtod(value, 0);
-	#endif
-	}
-
-	PUGI_IMPL_FN float get_value_float(const char_t* value)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		return static_cast<float>(wcstod(value, 0));
-	#else
-		return static_cast<float>(strtod(value, 0));
-	#endif
-	}
-
-	PUGI_IMPL_FN bool get_value_bool(const char_t* value)
-	{
-		// only look at first char
-		char_t first = *value;
-
-		// 1*, t* (true), T* (True), y* (yes), Y* (YES)
-		return (first == '1' || first == 't' || first == 'T' || first == 'y' || first == 'Y');
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI_IMPL_FN long long get_value_llong(const char_t* value)
-	{
-		return string_to_integer<unsigned long long>(value, static_cast<unsigned long long>(LLONG_MIN), LLONG_MAX);
-	}
-
-	PUGI_IMPL_FN unsigned long long get_value_ullong(const char_t* value)
-	{
-		return string_to_integer<unsigned long long>(value, 0, ULLONG_MAX);
-	}
-#endif
-
-	template <typename U> PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative)
-	{
-		char_t* result = end - 1;
-		U rest = negative ? 0 - value : value;
-
-		do
-		{
-			*result-- = static_cast<char_t>('0' + (rest % 10));
-			rest /= 10;
-		}
-		while (rest);
-
-		assert(result >= begin);
-		(void)begin;
-
-		*result = '-';
-
-		return result + !negative;
-	}
-
-	// set value with conversion functions
-	template <typename String, typename Header>
-	PUGI_IMPL_FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		char_t wbuf[128];
-		assert(strlen(buf) < sizeof(wbuf) / sizeof(wbuf[0]));
-
-		size_t offset = 0;
-		for (; buf[offset]; ++offset) wbuf[offset] = buf[offset];
-
-		return strcpy_insitu(dest, header, header_mask, wbuf, offset);
-	#else
-		return strcpy_insitu(dest, header, header_mask, buf, strlen(buf));
-	#endif
-	}
-
-	template <typename U, typename String, typename Header>
-	PUGI_IMPL_FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative)
-	{
-		char_t buf[64];
-		char_t* end = buf + sizeof(buf) / sizeof(buf[0]);
-		char_t* begin = integer_to_string(buf, end, value, negative);
-
-		return strcpy_insitu(dest, header, header_mask, begin, end - begin);
-	}
-
-	template <typename String, typename Header>
-	PUGI_IMPL_FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value, int precision)
-	{
-		char buf[128];
-		PUGI_IMPL_SNPRINTF(buf, "%.*g", precision, double(value));
-
-		return set_value_ascii(dest, header, header_mask, buf);
-	}
-
-	template <typename String, typename Header>
-	PUGI_IMPL_FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value, int precision)
-	{
-		char buf[128];
-		PUGI_IMPL_SNPRINTF(buf, "%.*g", precision, value);
-
-		return set_value_ascii(dest, header, header_mask, buf);
-	}
-
-	template <typename String, typename Header>
-	PUGI_IMPL_FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value)
-	{
-		return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5);
-	}
-
-	PUGI_IMPL_FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer)
-	{
-		// check input buffer
-		if (!contents && size) return make_parse_result(status_io_error);
-
-		// get actual encoding
-		xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size);
-
-		// if convert_buffer below throws bad_alloc, we still need to deallocate contents if we own it
-		auto_deleter<void> contents_guard(own ? contents : 0, xml_memory::deallocate);
-
-		// get private buffer
-		char_t* buffer = 0;
-		size_t length = 0;
-
-		// coverity[var_deref_model]
-		if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory);
-
-		// after this we either deallocate contents (below) or hold on to it via doc->buffer, so we don't need to guard it
-		contents_guard.release();
-
-		// delete original buffer if we performed a conversion
-		if (own && buffer != contents && contents) impl::xml_memory::deallocate(contents);
-
-		// grab onto buffer if it's our buffer, user is responsible for deallocating contents himself
-		if (own || buffer != contents) *out_buffer = buffer;
-
-		// store buffer for offset_debug
-		doc->buffer = buffer;
-
-		// parse
-		xml_parse_result res = impl::xml_parser::parse(buffer, length, doc, root, options);
-
-		// remember encoding
-		res.encoding = buffer_encoding;
-
-		return res;
-	}
-
-	// we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick
-	PUGI_IMPL_FN xml_parse_status get_file_size(FILE* file, size_t& out_result)
-	{
-	#if defined(__linux__) || defined(__APPLE__)
-		// this simultaneously retrieves the file size and file mode (to guard against loading non-files)
-		struct stat st;
-		if (fstat(fileno(file), &st) != 0) return status_io_error;
-
-		// anything that's not a regular file doesn't have a coherent length
-		if (!S_ISREG(st.st_mode)) return status_io_error;
-
-		typedef off_t length_type;
-		length_type length = st.st_size;
-	#elif defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
-		// there are 64-bit versions of fseek/ftell, let's use them
-		typedef __int64 length_type;
-
-		_fseeki64(file, 0, SEEK_END);
-		length_type length = _ftelli64(file);
-		_fseeki64(file, 0, SEEK_SET);
-	#elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR))
-		// there are 64-bit versions of fseek/ftell, let's use them
-		typedef off64_t length_type;
-
-		fseeko64(file, 0, SEEK_END);
-		length_type length = ftello64(file);
-		fseeko64(file, 0, SEEK_SET);
-	#else
-		// if this is a 32-bit OS, long is enough; if this is a unix system, long is 64-bit, which is enough; otherwise we can't do anything anyway.
-		typedef long length_type;
-
-		fseek(file, 0, SEEK_END);
-		length_type length = ftell(file);
-		fseek(file, 0, SEEK_SET);
-	#endif
-
-		// check for I/O errors
-		if (length < 0) return status_io_error;
-
-		// check for overflow
-		size_t result = static_cast<size_t>(length);
-
-		if (static_cast<length_type>(result) != length) return status_out_of_memory;
-
-		// finalize
-		out_result = result;
-
-		return status_ok;
-	}
-
-	// This function assumes that buffer has extra sizeof(char_t) writable bytes after size
-	PUGI_IMPL_FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding)
-	{
-		// We only need to zero-terminate if encoding conversion does not do it for us
-	#ifdef PUGIXML_WCHAR_MODE
-		xml_encoding wchar_encoding = get_wchar_encoding();
-
-		if (encoding == wchar_encoding || need_endian_swap_utf(encoding, wchar_encoding))
-		{
-			size_t length = size / sizeof(char_t);
-
-			static_cast<char_t*>(buffer)[length] = 0;
-			return (length + 1) * sizeof(char_t);
-		}
-	#else
-		if (encoding == encoding_utf8)
-		{
-			static_cast<char*>(buffer)[size] = 0;
-			return size + 1;
-		}
-	#endif
-
-		return size;
-	}
-
-	PUGI_IMPL_FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer)
-	{
-		if (!file) return make_parse_result(status_file_not_found);
-
-		// get file size (can result in I/O errors)
-		size_t size = 0;
-		xml_parse_status size_status = get_file_size(file, size);
-		if (size_status != status_ok) return make_parse_result(size_status);
-
-		size_t max_suffix_size = sizeof(char_t);
-
-		// allocate buffer for the whole file
-		char* contents = static_cast<char*>(xml_memory::allocate(size + max_suffix_size));
-		if (!contents) return make_parse_result(status_out_of_memory);
-
-		// read file in memory
-		size_t read_size = fread(contents, 1, size, file);
-
-		if (read_size != size)
-		{
-			xml_memory::deallocate(contents);
-			return make_parse_result(status_io_error);
-		}
-
-		xml_encoding real_encoding = get_buffer_encoding(encoding, contents, size);
-
-		return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer);
-	}
-
-	PUGI_IMPL_FN void close_file(FILE* file)
-	{
-		fclose(file);
-	}
-
-#ifndef PUGIXML_NO_STL
-	template <typename T> struct xml_stream_chunk
-	{
-		static xml_stream_chunk* create()
-		{
-			void* memory = xml_memory::allocate(sizeof(xml_stream_chunk));
-			if (!memory) return 0;
-
-			return new (memory) xml_stream_chunk();
-		}
-
-		static void destroy(xml_stream_chunk* chunk)
-		{
-			// free chunk chain
-			while (chunk)
-			{
-				xml_stream_chunk* next_ = chunk->next;
-
-				xml_memory::deallocate(chunk);
-
-				chunk = next_;
-			}
-		}
-
-		xml_stream_chunk(): next(0), size(0)
-		{
-		}
-
-		xml_stream_chunk* next;
-		size_t size;
-
-		T data[xml_memory_page_size / sizeof(T)];
-	};
-
-	template <typename T> PUGI_IMPL_FN xml_parse_status load_stream_data_noseek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
-	{
-		auto_deleter<xml_stream_chunk<T> > chunks(0, xml_stream_chunk<T>::destroy);
-
-		// read file to a chunk list
-		size_t total = 0;
-		xml_stream_chunk<T>* last = 0;
-
-		while (!stream.eof())
-		{
-			// allocate new chunk
-			xml_stream_chunk<T>* chunk = xml_stream_chunk<T>::create();
-			if (!chunk) return status_out_of_memory;
-
-			// append chunk to list
-			if (last) last = last->next = chunk;
-			else chunks.data = last = chunk;
-
-			// read data to chunk
-			stream.read(chunk->data, static_cast<std::streamsize>(sizeof(chunk->data) / sizeof(T)));
-			chunk->size = static_cast<size_t>(stream.gcount()) * sizeof(T);
-
-			// read may set failbit | eofbit in case gcount() is less than read length, so check for other I/O errors
-			if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
-
-			// guard against huge files (chunk size is small enough to make this overflow check work)
-			if (total + chunk->size < total) return status_out_of_memory;
-			total += chunk->size;
-		}
-
-		size_t max_suffix_size = sizeof(char_t);
-
-		// copy chunk list to a contiguous buffer
-		char* buffer = static_cast<char*>(xml_memory::allocate(total + max_suffix_size));
-		if (!buffer) return status_out_of_memory;
-
-		char* write = buffer;
-
-		for (xml_stream_chunk<T>* chunk = chunks.data; chunk; chunk = chunk->next)
-		{
-			assert(write + chunk->size <= buffer + total);
-			memcpy(write, chunk->data, chunk->size);
-			write += chunk->size;
-		}
-
-		assert(write == buffer + total);
-
-		// return buffer
-		*out_buffer = buffer;
-		*out_size = total;
-
-		return status_ok;
-	}
-
-	template <typename T> PUGI_IMPL_FN xml_parse_status load_stream_data_seek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
-	{
-		// get length of remaining data in stream
-		typename std::basic_istream<T>::pos_type pos = stream.tellg();
-		stream.seekg(0, std::ios::end);
-		std::streamoff length = stream.tellg() - pos;
-		stream.seekg(pos);
-
-		if (stream.fail() || pos < 0) return status_io_error;
-
-		// guard against huge files
-		size_t read_length = static_cast<size_t>(length);
-
-		if (static_cast<std::streamsize>(read_length) != length || length < 0) return status_out_of_memory;
-
-		size_t max_suffix_size = sizeof(char_t);
-
-		// read stream data into memory (guard against stream exceptions with buffer holder)
-		auto_deleter<void> buffer(xml_memory::allocate(read_length * sizeof(T) + max_suffix_size), xml_memory::deallocate);
-		if (!buffer.data) return status_out_of_memory;
-
-		stream.read(static_cast<T*>(buffer.data), static_cast<std::streamsize>(read_length));
-
-		// read may set failbit | eofbit in case gcount() is less than read_length (i.e. line ending conversion), so check for other I/O errors
-		if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
-
-		// return buffer
-		size_t actual_length = static_cast<size_t>(stream.gcount());
-		assert(actual_length <= read_length);
-
-		*out_buffer = buffer.release();
-		*out_size = actual_length * sizeof(T);
-
-		return status_ok;
-	}
-
-	template <typename T> PUGI_IMPL_FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream<T>& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer)
-	{
-		void* buffer = 0;
-		size_t size = 0;
-		xml_parse_status status = status_ok;
-
-		// if stream has an error bit set, bail out (otherwise tellg() can fail and we'll clear error bits)
-		if (stream.fail()) return make_parse_result(status_io_error);
-
-		// load stream to memory (using seek-based implementation if possible, since it's faster and takes less memory)
-		if (stream.tellg() < 0)
-		{
-			stream.clear(); // clear error flags that could be set by a failing tellg
-			status = load_stream_data_noseek(stream, &buffer, &size);
-		}
-		else
-			status = load_stream_data_seek(stream, &buffer, &size);
-
-		if (status != status_ok) return make_parse_result(status);
-
-		xml_encoding real_encoding = get_buffer_encoding(encoding, buffer, size);
-
-		return load_buffer_impl(doc, doc, buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding, true, true, out_buffer);
-	}
-#endif
-
-#if defined(PUGI_IMPL_MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR)))
-	PUGI_IMPL_FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
-	{
-#if defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
-		FILE* file = 0;
-		return _wfopen_s(&file, path, mode) == 0 ? file : 0;
-#else
-		return _wfopen(path, mode);
-#endif
-	}
-#else
-	PUGI_IMPL_FN char* convert_path_heap(const wchar_t* str)
-	{
-		assert(str);
-
-		// first pass: get length in utf8 characters
-		size_t length = strlength_wide(str);
-		size_t size = as_utf8_begin(str, length);
-
-		// allocate resulting string
-		char* result = static_cast<char*>(xml_memory::allocate(size + 1));
-		if (!result) return 0;
-
-		// second pass: convert to utf8
-		as_utf8_end(result, size, str, length);
-
-		// zero-terminate
-		result[size] = 0;
-
-		return result;
-	}
-
-	PUGI_IMPL_FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
-	{
-		// there is no standard function to open wide paths, so our best bet is to try utf8 path
-		char* path_utf8 = convert_path_heap(path);
-		if (!path_utf8) return 0;
-
-		// convert mode to ASCII (we mirror _wfopen interface)
-		char mode_ascii[4] = {0};
-		for (size_t i = 0; mode[i]; ++i) mode_ascii[i] = static_cast<char>(mode[i]);
-
-		// try to open the utf8 path
-		FILE* result = fopen(path_utf8, mode_ascii);
-
-		// free dummy buffer
-		xml_memory::deallocate(path_utf8);
-
-		return result;
-	}
-#endif
-
-	PUGI_IMPL_FN FILE* open_file(const char* path, const char* mode)
-	{
-#if defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
-		FILE* file = 0;
-		return fopen_s(&file, path, mode) == 0 ? file : 0;
-#else
-		return fopen(path, mode);
-#endif
-	}
-
-	PUGI_IMPL_FN bool save_file_impl(const xml_document& doc, FILE* file, const char_t* indent, unsigned int flags, xml_encoding encoding)
-	{
-		if (!file) return false;
-
-		xml_writer_file writer(file);
-		doc.save(writer, indent, flags, encoding);
-
-		return fflush(file) == 0 && ferror(file) == 0;
-	}
-
-	struct name_null_sentry
-	{
-		xml_node_struct* node;
-		char_t* name;
-
-		name_null_sentry(xml_node_struct* node_): node(node_), name(node_->name)
-		{
-			node->name = 0;
-		}
-
-		~name_null_sentry()
-		{
-			node->name = name;
-		}
-	};
-PUGI_IMPL_NS_END
-
-namespace pugi
-{
-	PUGI_IMPL_FN xml_writer::~xml_writer()
-	{
-	}
-
-	PUGI_IMPL_FN xml_writer_file::xml_writer_file(void* file_): file(file_)
-	{
-	}
-
-	PUGI_IMPL_FN void xml_writer_file::write(const void* data, size_t size)
-	{
-		size_t result = fwrite(data, 1, size, static_cast<FILE*>(file));
-		(void)!result; // unfortunately we can't do proper error handling here
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI_IMPL_FN xml_writer_stream::xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream): narrow_stream(&stream), wide_stream(0)
-	{
-	}
-
-	PUGI_IMPL_FN xml_writer_stream::xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream): narrow_stream(0), wide_stream(&stream)
-	{
-	}
-
-	PUGI_IMPL_FN void xml_writer_stream::write(const void* data, size_t size)
-	{
-		if (narrow_stream)
-		{
-			assert(!wide_stream);
-			narrow_stream->write(reinterpret_cast<const char*>(data), static_cast<std::streamsize>(size));
-		}
-		else
-		{
-			assert(wide_stream);
-			assert(size % sizeof(wchar_t) == 0);
-
-			wide_stream->write(reinterpret_cast<const wchar_t*>(data), static_cast<std::streamsize>(size / sizeof(wchar_t)));
-		}
-	}
-#endif
-
-	PUGI_IMPL_FN xml_tree_walker::xml_tree_walker(): _depth(0)
-	{
-	}
-
-	PUGI_IMPL_FN xml_tree_walker::~xml_tree_walker()
-	{
-	}
-
-	PUGI_IMPL_FN int xml_tree_walker::depth() const
-	{
-		return _depth;
-	}
-
-	PUGI_IMPL_FN bool xml_tree_walker::begin(xml_node&)
-	{
-		return true;
-	}
-
-	PUGI_IMPL_FN bool xml_tree_walker::end(xml_node&)
-	{
-		return true;
-	}
-
-	PUGI_IMPL_FN xml_attribute::xml_attribute(): _attr(0)
-	{
-	}
-
-	PUGI_IMPL_FN xml_attribute::xml_attribute(xml_attribute_struct* attr): _attr(attr)
-	{
-	}
-
-	PUGI_IMPL_FN static void unspecified_bool_xml_attribute(xml_attribute***)
-	{
-	}
-
-	PUGI_IMPL_FN xml_attribute::operator xml_attribute::unspecified_bool_type() const
-	{
-		return _attr ? unspecified_bool_xml_attribute : 0;
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::operator!() const
-	{
-		return !_attr;
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::operator==(const xml_attribute& r) const
-	{
-		return (_attr == r._attr);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::operator!=(const xml_attribute& r) const
-	{
-		return (_attr != r._attr);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::operator<(const xml_attribute& r) const
-	{
-		return (_attr < r._attr);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::operator>(const xml_attribute& r) const
-	{
-		return (_attr > r._attr);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::operator<=(const xml_attribute& r) const
-	{
-		return (_attr <= r._attr);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::operator>=(const xml_attribute& r) const
-	{
-		return (_attr >= r._attr);
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_attribute::next_attribute() const
-	{
-		if (!_attr) return xml_attribute();
-		return xml_attribute(_attr->next_attribute);
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_attribute::previous_attribute() const
-	{
-		if (!_attr) return xml_attribute();
-		xml_attribute_struct* prev = _attr->prev_attribute_c;
-		return prev->next_attribute ? xml_attribute(prev) : xml_attribute();
-	}
-
-	PUGI_IMPL_FN const char_t* xml_attribute::as_string(const char_t* def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? value : def;
-	}
-
-	PUGI_IMPL_FN int xml_attribute::as_int(int def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_int(value) : def;
-	}
-
-	PUGI_IMPL_FN unsigned int xml_attribute::as_uint(unsigned int def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_uint(value) : def;
-	}
-
-	PUGI_IMPL_FN double xml_attribute::as_double(double def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_double(value) : def;
-	}
-
-	PUGI_IMPL_FN float xml_attribute::as_float(float def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_float(value) : def;
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::as_bool(bool def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_bool(value) : def;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI_IMPL_FN long long xml_attribute::as_llong(long long def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_llong(value) : def;
-	}
-
-	PUGI_IMPL_FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const
-	{
-		if (!_attr) return def;
-		const char_t* value = _attr->value;
-		return value ? impl::get_value_ullong(value) : def;
-	}
-#endif
-
-	PUGI_IMPL_FN bool xml_attribute::empty() const
-	{
-		return !_attr;
-	}
-
-	PUGI_IMPL_FN const char_t* xml_attribute::name() const
-	{
-		if (!_attr) return PUGIXML_TEXT("");
-		const char_t* name = _attr->name;
-		return name ? name : PUGIXML_TEXT("");
-	}
-
-	PUGI_IMPL_FN const char_t* xml_attribute::value() const
-	{
-		if (!_attr) return PUGIXML_TEXT("");
-		const char_t* value = _attr->value;
-		return value ? value : PUGIXML_TEXT("");
-	}
-
-	PUGI_IMPL_FN size_t xml_attribute::hash_value() const
-	{
-		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_attr) / sizeof(xml_attribute_struct));
-	}
-
-	PUGI_IMPL_FN xml_attribute_struct* xml_attribute::internal_object() const
-	{
-		return _attr;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(const char_t* rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(int rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(unsigned int rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(long rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(unsigned long rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(double rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(float rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(bool rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(long long rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute::operator=(unsigned long long rhs)
-	{
-		set_value(rhs);
-		return *this;
-	}
-#endif
-
-	PUGI_IMPL_FN bool xml_attribute::set_name(const char_t* rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(const char_t* rhs, size_t sz)
-	{
-		if (!_attr) return false;
-
-		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, sz);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(const char_t* rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(int rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(unsigned int rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(long rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(unsigned long rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(double rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(double rhs, int precision)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(float rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(float rhs, int precision)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(bool rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_bool(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI_IMPL_FN bool xml_attribute::set_value(long long rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
-	}
-
-	PUGI_IMPL_FN bool xml_attribute::set_value(unsigned long long rhs)
-	{
-		if (!_attr) return false;
-
-		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
-	}
-#endif
-
-#ifdef __BORLANDC__
-	PUGI_IMPL_FN bool operator&&(const xml_attribute& lhs, bool rhs)
-	{
-		return (bool)lhs && rhs;
-	}
-
-	PUGI_IMPL_FN bool operator||(const xml_attribute& lhs, bool rhs)
-	{
-		return (bool)lhs || rhs;
-	}
-#endif
-
-	PUGI_IMPL_FN xml_node::xml_node(): _root(0)
-	{
-	}
-
-	PUGI_IMPL_FN xml_node::xml_node(xml_node_struct* p): _root(p)
-	{
-	}
-
-	PUGI_IMPL_FN static void unspecified_bool_xml_node(xml_node***)
-	{
-	}
-
-	PUGI_IMPL_FN xml_node::operator xml_node::unspecified_bool_type() const
-	{
-		return _root ? unspecified_bool_xml_node : 0;
-	}
-
-	PUGI_IMPL_FN bool xml_node::operator!() const
-	{
-		return !_root;
-	}
-
-	PUGI_IMPL_FN xml_node::iterator xml_node::begin() const
-	{
-		return iterator(_root ? _root->first_child + 0 : 0, _root);
-	}
-
-	PUGI_IMPL_FN xml_node::iterator xml_node::end() const
-	{
-		return iterator(0, _root);
-	}
-
-	PUGI_IMPL_FN xml_node::attribute_iterator xml_node::attributes_begin() const
-	{
-		return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root);
-	}
-
-	PUGI_IMPL_FN xml_node::attribute_iterator xml_node::attributes_end() const
-	{
-		return attribute_iterator(0, _root);
-	}
-
-	PUGI_IMPL_FN xml_object_range<xml_node_iterator> xml_node::children() const
-	{
-		return xml_object_range<xml_node_iterator>(begin(), end());
-	}
-
-	PUGI_IMPL_FN xml_object_range<xml_named_node_iterator> xml_node::children(const char_t* name_) const
-	{
-		return xml_object_range<xml_named_node_iterator>(xml_named_node_iterator(child(name_)._root, _root, name_), xml_named_node_iterator(0, _root, name_));
-	}
-
-	PUGI_IMPL_FN xml_object_range<xml_attribute_iterator> xml_node::attributes() const
-	{
-		return xml_object_range<xml_attribute_iterator>(attributes_begin(), attributes_end());
-	}
-
-	PUGI_IMPL_FN bool xml_node::operator==(const xml_node& r) const
-	{
-		return (_root == r._root);
-	}
-
-	PUGI_IMPL_FN bool xml_node::operator!=(const xml_node& r) const
-	{
-		return (_root != r._root);
-	}
-
-	PUGI_IMPL_FN bool xml_node::operator<(const xml_node& r) const
-	{
-		return (_root < r._root);
-	}
-
-	PUGI_IMPL_FN bool xml_node::operator>(const xml_node& r) const
-	{
-		return (_root > r._root);
-	}
-
-	PUGI_IMPL_FN bool xml_node::operator<=(const xml_node& r) const
-	{
-		return (_root <= r._root);
-	}
-
-	PUGI_IMPL_FN bool xml_node::operator>=(const xml_node& r) const
-	{
-		return (_root >= r._root);
-	}
-
-	PUGI_IMPL_FN bool xml_node::empty() const
-	{
-		return !_root;
-	}
-
-	PUGI_IMPL_FN const char_t* xml_node::name() const
-	{
-		if (!_root) return PUGIXML_TEXT("");
-		const char_t* name = _root->name;
-		return name ? name : PUGIXML_TEXT("");
-	}
-
-	PUGI_IMPL_FN xml_node_type xml_node::type() const
-	{
-		return _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
-	}
-
-	PUGI_IMPL_FN const char_t* xml_node::value() const
-	{
-		if (!_root) return PUGIXML_TEXT("");
-		const char_t* value = _root->value;
-		return value ? value : PUGIXML_TEXT("");
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::child(const char_t* name_) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-				return xml_node(i);
-		}
-
-		return xml_node();
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::attribute(const char_t* name_) const
-	{
-		if (!_root) return xml_attribute();
-
-		for (xml_attribute_struct* i = _root->first_attribute; i; i = i->next_attribute)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-				return xml_attribute(i);
-		}
-
-		return xml_attribute();
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::next_sibling(const char_t* name_) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->next_sibling; i; i = i->next_sibling)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-				return xml_node(i);
-		}
-
-		return xml_node();
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::next_sibling() const
-	{
-		return _root ? xml_node(_root->next_sibling) : xml_node();
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::previous_sibling(const char_t* name_) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->prev_sibling_c; i->next_sibling; i = i->prev_sibling_c)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-				return xml_node(i);
-		}
-
-		return xml_node();
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const
-	{
-		xml_attribute_struct* hint = hint_._attr;
-
-		// if hint is not an attribute of node, behavior is not defined
-		assert(!hint || (_root && impl::is_attribute_of(hint, _root)));
-
-		if (!_root) return xml_attribute();
-
-		// optimistically search from hint up until the end
-		for (xml_attribute_struct* i = hint; i; i = i->next_attribute)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-			{
-				// update hint to maximize efficiency of searching for consecutive attributes
-				hint_._attr = i->next_attribute;
-
-				return xml_attribute(i);
-			}
-		}
-
-		// wrap around and search from the first attribute until the hint
-		// 'j' null pointer check is technically redundant, but it prevents a crash in case the assertion above fails
-		for (xml_attribute_struct* j = _root->first_attribute; j && j != hint; j = j->next_attribute)
-		{
-			const char_t* jname = j->name;
-			if (jname && impl::strequal(name_, jname))
-			{
-				// update hint to maximize efficiency of searching for consecutive attributes
-				hint_._attr = j->next_attribute;
-
-				return xml_attribute(j);
-			}
-		}
-
-		return xml_attribute();
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::previous_sibling() const
-	{
-		if (!_root) return xml_node();
-		xml_node_struct* prev = _root->prev_sibling_c;
-		return prev->next_sibling ? xml_node(prev) : xml_node();
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::parent() const
-	{
-		return _root ? xml_node(_root->parent) : xml_node();
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::root() const
-	{
-		return _root ? xml_node(&impl::get_document(_root)) : xml_node();
-	}
-
-	PUGI_IMPL_FN xml_text xml_node::text() const
-	{
-		return xml_text(_root);
-	}
-
-	PUGI_IMPL_FN const char_t* xml_node::child_value() const
-	{
-		if (!_root) return PUGIXML_TEXT("");
-
-		// element nodes can have value if parse_embed_pcdata was used
-		if (PUGI_IMPL_NODETYPE(_root) == node_element && _root->value)
-			return _root->value;
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-		{
-			const char_t* ivalue = i->value;
-			if (impl::is_text_node(i) && ivalue)
-				return ivalue;
-		}
-
-		return PUGIXML_TEXT("");
-	}
-
-	PUGI_IMPL_FN const char_t* xml_node::child_value(const char_t* name_) const
-	{
-		return child(name_).child_value();
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::first_attribute() const
-	{
-		if (!_root) return xml_attribute();
-		return xml_attribute(_root->first_attribute);
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::last_attribute() const
-	{
-		if (!_root) return xml_attribute();
-		xml_attribute_struct* first = _root->first_attribute;
-		return first ? xml_attribute(first->prev_attribute_c) : xml_attribute();
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::first_child() const
-	{
-		if (!_root) return xml_node();
-		return xml_node(_root->first_child);
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::last_child() const
-	{
-		if (!_root) return xml_node();
-		xml_node_struct* first = _root->first_child;
-		return first ? xml_node(first->prev_sibling_c) : xml_node();
-	}
-
-	PUGI_IMPL_FN bool xml_node::set_name(const char_t* rhs)
-	{
-		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
-
-		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
-			return false;
-
-		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
-	}
-
-	PUGI_IMPL_FN bool xml_node::set_value(const char_t* rhs, size_t sz)
-	{
-		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
-
-		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
-			return false;
-
-		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, sz);
-	}
-
-	PUGI_IMPL_FN bool xml_node::set_value(const char_t* rhs)
-	{
-		xml_node_type type_ = _root ? PUGI_IMPL_NODETYPE(_root) : node_null;
-
-		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
-			return false;
-
-		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::append_attribute(const char_t* name_)
-	{
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::append_attribute(a._attr, _root);
-
-		a.set_name(name_);
-
-		return a;
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::prepend_attribute(const char_t* name_)
-	{
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::prepend_attribute(a._attr, _root);
-
-		a.set_name(name_);
-
-		return a;
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr)
-	{
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::insert_attribute_after(a._attr, attr._attr, _root);
-
-		a.set_name(name_);
-
-		return a;
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr)
-	{
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::insert_attribute_before(a._attr, attr._attr, _root);
-
-		a.set_name(name_);
-
-		return a;
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::append_copy(const xml_attribute& proto)
-	{
-		if (!proto) return xml_attribute();
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::append_attribute(a._attr, _root);
-		impl::node_copy_attribute(a._attr, proto._attr);
-
-		return a;
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto)
-	{
-		if (!proto) return xml_attribute();
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::prepend_attribute(a._attr, _root);
-		impl::node_copy_attribute(a._attr, proto._attr);
-
-		return a;
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr)
-	{
-		if (!proto) return xml_attribute();
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::insert_attribute_after(a._attr, attr._attr, _root);
-		impl::node_copy_attribute(a._attr, proto._attr);
-
-		return a;
-	}
-
-	PUGI_IMPL_FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr)
-	{
-		if (!proto) return xml_attribute();
-		if (!impl::allow_insert_attribute(type())) return xml_attribute();
-		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_attribute();
-
-		xml_attribute a(impl::allocate_attribute(alloc));
-		if (!a) return xml_attribute();
-
-		impl::insert_attribute_before(a._attr, attr._attr, _root);
-		impl::node_copy_attribute(a._attr, proto._attr);
-
-		return a;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::append_child(xml_node_type type_)
-	{
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::append_node(n._root, _root);
-
-		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
-
-		return n;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::prepend_child(xml_node_type type_)
-	{
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::prepend_node(n._root, _root);
-
-		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
-
-		return n;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::insert_child_before(xml_node_type type_, const xml_node& node)
-	{
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::insert_node_before(n._root, node._root);
-
-		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
-
-		return n;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::insert_child_after(xml_node_type type_, const xml_node& node)
-	{
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::insert_node_after(n._root, node._root);
-
-		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
-
-		return n;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::append_child(const char_t* name_)
-	{
-		xml_node result = append_child(node_element);
-
-		result.set_name(name_);
-
-		return result;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::prepend_child(const char_t* name_)
-	{
-		xml_node result = prepend_child(node_element);
-
-		result.set_name(name_);
-
-		return result;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::insert_child_after(const char_t* name_, const xml_node& node)
-	{
-		xml_node result = insert_child_after(node_element, node);
-
-		result.set_name(name_);
-
-		return result;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::insert_child_before(const char_t* name_, const xml_node& node)
-	{
-		xml_node result = insert_child_before(node_element, node);
-
-		result.set_name(name_);
-
-		return result;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::append_copy(const xml_node& proto)
-	{
-		xml_node_type type_ = proto.type();
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::append_node(n._root, _root);
-		impl::node_copy_tree(n._root, proto._root);
-
-		return n;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::prepend_copy(const xml_node& proto)
-	{
-		xml_node_type type_ = proto.type();
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::prepend_node(n._root, _root);
-		impl::node_copy_tree(n._root, proto._root);
-
-		return n;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::insert_copy_after(const xml_node& proto, const xml_node& node)
-	{
-		xml_node_type type_ = proto.type();
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::insert_node_after(n._root, node._root);
-		impl::node_copy_tree(n._root, proto._root);
-
-		return n;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::insert_copy_before(const xml_node& proto, const xml_node& node)
-	{
-		xml_node_type type_ = proto.type();
-		if (!impl::allow_insert_child(type(), type_)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		xml_node n(impl::allocate_node(alloc, type_));
-		if (!n) return xml_node();
-
-		impl::insert_node_before(n._root, node._root);
-		impl::node_copy_tree(n._root, proto._root);
-
-		return n;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::append_move(const xml_node& moved)
-	{
-		if (!impl::allow_move(*this, moved)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
-		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
-
-		impl::remove_node(moved._root);
-		impl::append_node(moved._root, _root);
-
-		return moved;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::prepend_move(const xml_node& moved)
-	{
-		if (!impl::allow_move(*this, moved)) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
-		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
-
-		impl::remove_node(moved._root);
-		impl::prepend_node(moved._root, _root);
-
-		return moved;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node)
-	{
-		if (!impl::allow_move(*this, moved)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-		if (moved._root == node._root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
-		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
-
-		impl::remove_node(moved._root);
-		impl::insert_node_after(moved._root, node._root);
-
-		return moved;
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node)
-	{
-		if (!impl::allow_move(*this, moved)) return xml_node();
-		if (!node._root || node._root->parent != _root) return xml_node();
-		if (moved._root == node._root) return xml_node();
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return xml_node();
-
-		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
-		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
-
-		impl::remove_node(moved._root);
-		impl::insert_node_before(moved._root, node._root);
-
-		return moved;
-	}
-
-	PUGI_IMPL_FN bool xml_node::remove_attribute(const char_t* name_)
-	{
-		return remove_attribute(attribute(name_));
-	}
-
-	PUGI_IMPL_FN bool xml_node::remove_attribute(const xml_attribute& a)
-	{
-		if (!_root || !a._attr) return false;
-		if (!impl::is_attribute_of(a._attr, _root)) return false;
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return false;
-
-		impl::remove_attribute(a._attr, _root);
-		impl::destroy_attribute(a._attr, alloc);
-
-		return true;
-	}
-
-	PUGI_IMPL_FN bool xml_node::remove_attributes()
-	{
-		if (!_root) return false;
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return false;
-
-		for (xml_attribute_struct* attr = _root->first_attribute; attr; )
-		{
-			xml_attribute_struct* next = attr->next_attribute;
-
-			impl::destroy_attribute(attr, alloc);
-
-			attr = next;
-		}
-
-		_root->first_attribute = 0;
-
-		return true;
-	}
-
-	PUGI_IMPL_FN bool xml_node::remove_child(const char_t* name_)
-	{
-		return remove_child(child(name_));
-	}
-
-	PUGI_IMPL_FN bool xml_node::remove_child(const xml_node& n)
-	{
-		if (!_root || !n._root || n._root->parent != _root) return false;
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return false;
-
-		impl::remove_node(n._root);
-		impl::destroy_node(n._root, alloc);
-
-		return true;
-	}
-
-	PUGI_IMPL_FN bool xml_node::remove_children()
-	{
-		if (!_root) return false;
-
-		impl::xml_allocator& alloc = impl::get_allocator(_root);
-		if (!alloc.reserve()) return false;
-
-		for (xml_node_struct* cur = _root->first_child; cur; )
-		{
-			xml_node_struct* next = cur->next_sibling;
-
-			impl::destroy_node(cur, alloc);
-
-			cur = next;
-		}
-
-		_root->first_child = 0;
-
-		return true;
-	}
-
-	PUGI_IMPL_FN xml_parse_result xml_node::append_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
-	{
-		// append_buffer is only valid for elements/documents
-		if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root);
-
-		// get document node
-		impl::xml_document_struct* doc = &impl::get_document(_root);
-
-		// disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense
-		doc->header |= impl::xml_memory_page_contents_shared_mask;
-
-		// get extra buffer element (we'll store the document fragment buffer there so that we can deallocate it later)
-		impl::xml_memory_page* page = 0;
-		impl::xml_extra_buffer* extra = static_cast<impl::xml_extra_buffer*>(doc->allocate_memory(sizeof(impl::xml_extra_buffer) + sizeof(void*), page));
-		(void)page;
-
-		if (!extra) return impl::make_parse_result(status_out_of_memory);
-
-	#ifdef PUGIXML_COMPACT
-		// align the memory block to a pointer boundary; this is required for compact mode where memory allocations are only 4b aligned
-		// note that this requires up to sizeof(void*)-1 additional memory, which the allocation above takes into account
-		extra = reinterpret_cast<impl::xml_extra_buffer*>((reinterpret_cast<uintptr_t>(extra) + (sizeof(void*) - 1)) & ~(sizeof(void*) - 1));
-	#endif
-
-		// add extra buffer to the list
-		extra->buffer = 0;
-		extra->next = doc->extra_buffers;
-		doc->extra_buffers = extra;
-
-		// name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level
-		impl::name_null_sentry sentry(_root);
-
-		return impl::load_buffer_impl(doc, _root, const_cast<void*>(contents), size, options, encoding, false, false, &extra->buffer);
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-		{
-			const char_t* iname = i->name;
-			if (iname && impl::strequal(name_, iname))
-			{
-				for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
-				{
-					const char_t* aname = a->name;
-					if (aname && impl::strequal(attr_name, aname))
-					{
-						const char_t* avalue = a->value;
-						if (impl::strequal(attr_value, avalue ? avalue : PUGIXML_TEXT("")))
-							return xml_node(i);
-					}
-				}
-			}
-		}
-
-		return xml_node();
-	}
-
-	PUGI_IMPL_FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const
-	{
-		if (!_root) return xml_node();
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-			for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
-			{
-				const char_t* aname = a->name;
-				if (aname && impl::strequal(attr_name, aname))
-				{
-					const char_t* avalue = a->value;
-					if (impl::strequal(attr_value, avalue ? avalue : PUGIXML_TEXT("")))
-						return xml_node(i);
-				}
-			}
-
-		return xml_node();
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI_IMPL_FN string_t xml_node::path(char_t delimiter) const
-	{
-		if (!_root) return string_t();
-
-		size_t offset = 0;
-
-		for (xml_node_struct* i = _root; i; i = i->parent)
-		{
-			const char_t* iname = i->name;
-			offset += (i != _root);
-			offset += iname ? impl::strlength(iname) : 0;
-		}
-
-		string_t result;
-		result.resize(offset);
-
-		for (xml_node_struct* j = _root; j; j = j->parent)
-		{
-			if (j != _root)
-				result[--offset] = delimiter;
-
-			const char_t* jname = j->name;
-			if (jname)
-			{
-				size_t length = impl::strlength(jname);
-
-				offset -= length;
-				memcpy(&result[offset], jname, length * sizeof(char_t));
-			}
-		}
-
-		assert(offset == 0);
-
-		return result;
-	}
-#endif
-
-	PUGI_IMPL_FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const
-	{
-		xml_node context = path_[0] == delimiter ? root() : *this;
-
-		if (!context._root) return xml_node();
-
-		const char_t* path_segment = path_;
-
-		while (*path_segment == delimiter) ++path_segment;
-
-		const char_t* path_segment_end = path_segment;
-
-		while (*path_segment_end && *path_segment_end != delimiter) ++path_segment_end;
-
-		if (path_segment == path_segment_end) return context;
-
-		const char_t* next_segment = path_segment_end;
-
-		while (*next_segment == delimiter) ++next_segment;
-
-		if (*path_segment == '.' && path_segment + 1 == path_segment_end)
-			return context.first_element_by_path(next_segment, delimiter);
-		else if (*path_segment == '.' && *(path_segment+1) == '.' && path_segment + 2 == path_segment_end)
-			return context.parent().first_element_by_path(next_segment, delimiter);
-		else
-		{
-			for (xml_node_struct* j = context._root->first_child; j; j = j->next_sibling)
-			{
-				const char_t* jname = j->name;
-				if (jname && impl::strequalrange(jname, path_segment, static_cast<size_t>(path_segment_end - path_segment)))
-				{
-					xml_node subsearch = xml_node(j).first_element_by_path(next_segment, delimiter);
-
-					if (subsearch) return subsearch;
-				}
-			}
-
-			return xml_node();
-		}
-	}
-
-	PUGI_IMPL_FN bool xml_node::traverse(xml_tree_walker& walker)
-	{
-		walker._depth = -1;
-
-		xml_node arg_begin(_root);
-		if (!walker.begin(arg_begin)) return false;
-
-		xml_node_struct* cur = _root ? _root->first_child + 0 : 0;
-
-		if (cur)
-		{
-			++walker._depth;
-
-			do
-			{
-				xml_node arg_for_each(cur);
-				if (!walker.for_each(arg_for_each))
-					return false;
-
-				if (cur->first_child)
-				{
-					++walker._depth;
-					cur = cur->first_child;
-				}
-				else if (cur->next_sibling)
-					cur = cur->next_sibling;
-				else
-				{
-					while (!cur->next_sibling && cur != _root && cur->parent)
-					{
-						--walker._depth;
-						cur = cur->parent;
-					}
-
-					if (cur != _root)
-						cur = cur->next_sibling;
-				}
-			}
-			while (cur && cur != _root);
-		}
-
-		assert(walker._depth == -1);
-
-		xml_node arg_end(_root);
-		return walker.end(arg_end);
-	}
-
-	PUGI_IMPL_FN size_t xml_node::hash_value() const
-	{
-		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_root) / sizeof(xml_node_struct));
-	}
-
-	PUGI_IMPL_FN xml_node_struct* xml_node::internal_object() const
-	{
-		return _root;
-	}
-
-	PUGI_IMPL_FN void xml_node::print(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
-	{
-		if (!_root) return;
-
-		impl::xml_buffered_writer buffered_writer(writer, encoding);
-
-		impl::node_output(buffered_writer, _root, indent, flags, depth);
-
-		buffered_writer.flush();
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI_IMPL_FN void xml_node::print(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
-	{
-		xml_writer_stream writer(stream);
-
-		print(writer, indent, flags, encoding, depth);
-	}
-
-	PUGI_IMPL_FN void xml_node::print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags, unsigned int depth) const
-	{
-		xml_writer_stream writer(stream);
-
-		print(writer, indent, flags, encoding_wchar, depth);
-	}
-#endif
-
-	PUGI_IMPL_FN ptrdiff_t xml_node::offset_debug() const
-	{
-		if (!_root) return -1;
-
-		impl::xml_document_struct& doc = impl::get_document(_root);
-
-		// we can determine the offset reliably only if there is exactly once parse buffer
-		if (!doc.buffer || doc.extra_buffers) return -1;
-
-		switch (type())
-		{
-		case node_document:
-			return 0;
-
-		case node_element:
-		case node_declaration:
-		case node_pi:
-			return _root->name && (_root->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0 ? _root->name - doc.buffer : -1;
-
-		case node_pcdata:
-		case node_cdata:
-		case node_comment:
-		case node_doctype:
-			return _root->value && (_root->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0 ? _root->value - doc.buffer : -1;
-
-		default:
-			assert(false && "Invalid node type"); // unreachable
-			return -1;
-		}
-	}
-
-#ifdef __BORLANDC__
-	PUGI_IMPL_FN bool operator&&(const xml_node& lhs, bool rhs)
-	{
-		return (bool)lhs && rhs;
-	}
-
-	PUGI_IMPL_FN bool operator||(const xml_node& lhs, bool rhs)
-	{
-		return (bool)lhs || rhs;
-	}
-#endif
-
-	PUGI_IMPL_FN xml_text::xml_text(xml_node_struct* root): _root(root)
-	{
-	}
-
-	PUGI_IMPL_FN xml_node_struct* xml_text::_data() const
-	{
-		if (!_root || impl::is_text_node(_root)) return _root;
-
-		// element nodes can have value if parse_embed_pcdata was used
-		if (PUGI_IMPL_NODETYPE(_root) == node_element && _root->value)
-			return _root;
-
-		for (xml_node_struct* node = _root->first_child; node; node = node->next_sibling)
-			if (impl::is_text_node(node))
-				return node;
-
-		return 0;
-	}
-
-	PUGI_IMPL_FN xml_node_struct* xml_text::_data_new()
-	{
-		xml_node_struct* d = _data();
-		if (d) return d;
-
-		return xml_node(_root).append_child(node_pcdata).internal_object();
-	}
-
-	PUGI_IMPL_FN xml_text::xml_text(): _root(0)
-	{
-	}
-
-	PUGI_IMPL_FN static void unspecified_bool_xml_text(xml_text***)
-	{
-	}
-
-	PUGI_IMPL_FN xml_text::operator xml_text::unspecified_bool_type() const
-	{
-		return _data() ? unspecified_bool_xml_text : 0;
-	}
-
-	PUGI_IMPL_FN bool xml_text::operator!() const
-	{
-		return !_data();
-	}
-
-	PUGI_IMPL_FN bool xml_text::empty() const
-	{
-		return _data() == 0;
-	}
-
-	PUGI_IMPL_FN const char_t* xml_text::get() const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return PUGIXML_TEXT("");
-		const char_t* value = d->value;
-		return value ? value : PUGIXML_TEXT("");
-	}
-
-	PUGI_IMPL_FN const char_t* xml_text::as_string(const char_t* def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? value : def;
-	}
-
-	PUGI_IMPL_FN int xml_text::as_int(int def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_int(value) : def;
-	}
-
-	PUGI_IMPL_FN unsigned int xml_text::as_uint(unsigned int def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_uint(value) : def;
-	}
-
-	PUGI_IMPL_FN double xml_text::as_double(double def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_double(value) : def;
-	}
-
-	PUGI_IMPL_FN float xml_text::as_float(float def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_float(value) : def;
-	}
-
-	PUGI_IMPL_FN bool xml_text::as_bool(bool def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_bool(value) : def;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI_IMPL_FN long long xml_text::as_llong(long long def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_llong(value) : def;
-	}
-
-	PUGI_IMPL_FN unsigned long long xml_text::as_ullong(unsigned long long def) const
-	{
-		xml_node_struct* d = _data();
-		if (!d) return def;
-		const char_t* value = d->value;
-		return value ? impl::get_value_ullong(value) : def;
-	}
-#endif
-
-	PUGI_IMPL_FN bool xml_text::set(const char_t* rhs, size_t sz)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, sz) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(const char_t* rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(int rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(unsigned int rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(long rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(unsigned long rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(float rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(float rhs, int precision)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(double rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(double rhs, int precision)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(bool rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_bool(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI_IMPL_FN bool xml_text::set(long long rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
-	}
-
-	PUGI_IMPL_FN bool xml_text::set(unsigned long long rhs)
-	{
-		xml_node_struct* dn = _data_new();
-
-		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
-	}
-#endif
-
-	PUGI_IMPL_FN xml_text& xml_text::operator=(const char_t* rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_text& xml_text::operator=(int rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_text& xml_text::operator=(unsigned int rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_text& xml_text::operator=(long rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_text& xml_text::operator=(unsigned long rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_text& xml_text::operator=(double rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_text& xml_text::operator=(float rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_text& xml_text::operator=(bool rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-#ifdef PUGIXML_HAS_LONG_LONG
-	PUGI_IMPL_FN xml_text& xml_text::operator=(long long rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_text& xml_text::operator=(unsigned long long rhs)
-	{
-		set(rhs);
-		return *this;
-	}
-#endif
-
-	PUGI_IMPL_FN xml_node xml_text::data() const
-	{
-		return xml_node(_data());
-	}
-
-#ifdef __BORLANDC__
-	PUGI_IMPL_FN bool operator&&(const xml_text& lhs, bool rhs)
-	{
-		return (bool)lhs && rhs;
-	}
-
-	PUGI_IMPL_FN bool operator||(const xml_text& lhs, bool rhs)
-	{
-		return (bool)lhs || rhs;
-	}
-#endif
-
-	PUGI_IMPL_FN xml_node_iterator::xml_node_iterator()
-	{
-	}
-
-	PUGI_IMPL_FN xml_node_iterator::xml_node_iterator(const xml_node& node): _wrap(node), _parent(node.parent())
-	{
-	}
-
-	PUGI_IMPL_FN xml_node_iterator::xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
-	{
-	}
-
-	PUGI_IMPL_FN bool xml_node_iterator::operator==(const xml_node_iterator& rhs) const
-	{
-		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
-	}
-
-	PUGI_IMPL_FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const
-	{
-		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
-	}
-
-	PUGI_IMPL_FN xml_node& xml_node_iterator::operator*() const
-	{
-		assert(_wrap._root);
-		return _wrap;
-	}
-
-	PUGI_IMPL_FN xml_node* xml_node_iterator::operator->() const
-	{
-		assert(_wrap._root);
-		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
-	}
-
-	PUGI_IMPL_FN xml_node_iterator& xml_node_iterator::operator++()
-	{
-		assert(_wrap._root);
-		_wrap._root = _wrap._root->next_sibling;
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_node_iterator xml_node_iterator::operator++(int)
-	{
-		xml_node_iterator temp = *this;
-		++*this;
-		return temp;
-	}
-
-	PUGI_IMPL_FN xml_node_iterator& xml_node_iterator::operator--()
-	{
-		_wrap = _wrap._root ? _wrap.previous_sibling() : _parent.last_child();
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_node_iterator xml_node_iterator::operator--(int)
-	{
-		xml_node_iterator temp = *this;
-		--*this;
-		return temp;
-	}
-
-	PUGI_IMPL_FN xml_attribute_iterator::xml_attribute_iterator()
-	{
-	}
-
-	PUGI_IMPL_FN xml_attribute_iterator::xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent): _wrap(attr), _parent(parent)
-	{
-	}
-
-	PUGI_IMPL_FN xml_attribute_iterator::xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
-	{
-	}
-
-	PUGI_IMPL_FN bool xml_attribute_iterator::operator==(const xml_attribute_iterator& rhs) const
-	{
-		return _wrap._attr == rhs._wrap._attr && _parent._root == rhs._parent._root;
-	}
-
-	PUGI_IMPL_FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const
-	{
-		return _wrap._attr != rhs._wrap._attr || _parent._root != rhs._parent._root;
-	}
-
-	PUGI_IMPL_FN xml_attribute& xml_attribute_iterator::operator*() const
-	{
-		assert(_wrap._attr);
-		return _wrap;
-	}
-
-	PUGI_IMPL_FN xml_attribute* xml_attribute_iterator::operator->() const
-	{
-		assert(_wrap._attr);
-		return const_cast<xml_attribute*>(&_wrap); // BCC5 workaround
-	}
-
-	PUGI_IMPL_FN xml_attribute_iterator& xml_attribute_iterator::operator++()
-	{
-		assert(_wrap._attr);
-		_wrap._attr = _wrap._attr->next_attribute;
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute_iterator xml_attribute_iterator::operator++(int)
-	{
-		xml_attribute_iterator temp = *this;
-		++*this;
-		return temp;
-	}
-
-	PUGI_IMPL_FN xml_attribute_iterator& xml_attribute_iterator::operator--()
-	{
-		_wrap = _wrap._attr ? _wrap.previous_attribute() : _parent.last_attribute();
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_attribute_iterator xml_attribute_iterator::operator--(int)
-	{
-		xml_attribute_iterator temp = *this;
-		--*this;
-		return temp;
-	}
-
-	PUGI_IMPL_FN xml_named_node_iterator::xml_named_node_iterator(): _name(0)
-	{
-	}
-
-	PUGI_IMPL_FN xml_named_node_iterator::xml_named_node_iterator(const xml_node& node, const char_t* name): _wrap(node), _parent(node.parent()), _name(name)
-	{
-	}
-
-	PUGI_IMPL_FN xml_named_node_iterator::xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name): _wrap(ref), _parent(parent), _name(name)
-	{
-	}
-
-	PUGI_IMPL_FN bool xml_named_node_iterator::operator==(const xml_named_node_iterator& rhs) const
-	{
-		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
-	}
-
-	PUGI_IMPL_FN bool xml_named_node_iterator::operator!=(const xml_named_node_iterator& rhs) const
-	{
-		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
-	}
-
-	PUGI_IMPL_FN xml_node& xml_named_node_iterator::operator*() const
-	{
-		assert(_wrap._root);
-		return _wrap;
-	}
-
-	PUGI_IMPL_FN xml_node* xml_named_node_iterator::operator->() const
-	{
-		assert(_wrap._root);
-		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
-	}
-
-	PUGI_IMPL_FN xml_named_node_iterator& xml_named_node_iterator::operator++()
-	{
-		assert(_wrap._root);
-		_wrap = _wrap.next_sibling(_name);
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_named_node_iterator xml_named_node_iterator::operator++(int)
-	{
-		xml_named_node_iterator temp = *this;
-		++*this;
-		return temp;
-	}
-
-	PUGI_IMPL_FN xml_named_node_iterator& xml_named_node_iterator::operator--()
-	{
-		if (_wrap._root)
-			_wrap = _wrap.previous_sibling(_name);
-		else
-		{
-			_wrap = _parent.last_child();
-
-			if (!impl::strequal(_wrap.name(), _name))
-				_wrap = _wrap.previous_sibling(_name);
-		}
-
-		return *this;
-	}
-
-	PUGI_IMPL_FN xml_named_node_iterator xml_named_node_iterator::operator--(int)
-	{
-		xml_named_node_iterator temp = *this;
-		--*this;
-		return temp;
-	}
-
-	PUGI_IMPL_FN xml_parse_result::xml_parse_result(): status(status_internal_error), offset(0), encoding(encoding_auto)
-	{
-	}
-
-	PUGI_IMPL_FN xml_parse_result::operator bool() const
-	{
-		return status == status_ok;
-	}
-
-	PUGI_IMPL_FN const char* xml_parse_result::description() const
-	{
-		switch (status)
-		{
-		case status_ok: return "No error";
-
-		case status_file_not_found: return "File was not found";
-		case status_io_error: return "Error reading from file/stream";
-		case status_out_of_memory: return "Could not allocate memory";
-		case status_internal_error: return "Internal error occurred";
-
-		case status_unrecognized_tag: return "Could not determine tag type";
-
-		case status_bad_pi: return "Error parsing document declaration/processing instruction";
-		case status_bad_comment: return "Error parsing comment";
-		case status_bad_cdata: return "Error parsing CDATA section";
-		case status_bad_doctype: return "Error parsing document type declaration";
-		case status_bad_pcdata: return "Error parsing PCDATA section";
-		case status_bad_start_element: return "Error parsing start element tag";
-		case status_bad_attribute: return "Error parsing element attribute";
-		case status_bad_end_element: return "Error parsing end element tag";
-		case status_end_element_mismatch: return "Start-end tags mismatch";
-
-		case status_append_invalid_root: return "Unable to append nodes: root is not an element or document";
-
-		case status_no_document_element: return "No document element found";
-
-		default: return "Unknown error";
-		}
-	}
-
-	PUGI_IMPL_FN xml_document::xml_document(): _buffer(0)
-	{
-		_create();
-	}
-
-	PUGI_IMPL_FN xml_document::~xml_document()
-	{
-		_destroy();
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI_IMPL_FN xml_document::xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT: _buffer(0)
-	{
-		_create();
-		_move(rhs);
-	}
-
-	PUGI_IMPL_FN xml_document& xml_document::operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
-	{
-		if (this == &rhs) return *this;
-
-		_destroy();
-		_create();
-		_move(rhs);
-
-		return *this;
-	}
-#endif
-
-	PUGI_IMPL_FN void xml_document::reset()
-	{
-		_destroy();
-		_create();
-	}
-
-	PUGI_IMPL_FN void xml_document::reset(const xml_document& proto)
-	{
-		reset();
-
-		impl::node_copy_tree(_root, proto._root);
-	}
-
-	PUGI_IMPL_FN void xml_document::_create()
-	{
-		assert(!_root);
-
-	#ifdef PUGIXML_COMPACT
-		// space for page marker for the first page (uint32_t), rounded up to pointer size; assumes pointers are at least 32-bit
-		const size_t page_offset = sizeof(void*);
-	#else
-		const size_t page_offset = 0;
-	#endif
-
-		// initialize sentinel page
-		PUGI_IMPL_STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory));
-
-		// prepare page structure
-		impl::xml_memory_page* page = impl::xml_memory_page::construct(_memory);
-		assert(page);
-
-		page->busy_size = impl::xml_memory_page_size;
-
-		// setup first page marker
-	#ifdef PUGIXML_COMPACT
-		// round-trip through void* to avoid 'cast increases required alignment of target type' warning
-		page->compact_page_marker = reinterpret_cast<uint32_t*>(static_cast<void*>(reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page)));
-		*page->compact_page_marker = sizeof(impl::xml_memory_page);
-	#endif
-
-		// allocate new root
-		_root = new (reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page) + page_offset) impl::xml_document_struct(page);
-		_root->prev_sibling_c = _root;
-
-		// setup sentinel page
-		page->allocator = static_cast<impl::xml_document_struct*>(_root);
-
-		// setup hash table pointer in allocator
-	#ifdef PUGIXML_COMPACT
-		page->allocator->_hash = &static_cast<impl::xml_document_struct*>(_root)->hash;
-	#endif
-
-		// verify the document allocation
-		assert(reinterpret_cast<char*>(_root) + sizeof(impl::xml_document_struct) <= _memory + sizeof(_memory));
-	}
-
-	PUGI_IMPL_FN void xml_document::_destroy()
-	{
-		assert(_root);
-
-		// destroy static storage
-		if (_buffer)
-		{
-			impl::xml_memory::deallocate(_buffer);
-			_buffer = 0;
-		}
-
-		// destroy extra buffers (note: no need to destroy linked list nodes, they're allocated using document allocator)
-		for (impl::xml_extra_buffer* extra = static_cast<impl::xml_document_struct*>(_root)->extra_buffers; extra; extra = extra->next)
-		{
-			if (extra->buffer) impl::xml_memory::deallocate(extra->buffer);
-		}
-
-		// destroy dynamic storage, leave sentinel page (it's in static memory)
-		impl::xml_memory_page* root_page = PUGI_IMPL_GETPAGE(_root);
-		assert(root_page && !root_page->prev);
-		assert(reinterpret_cast<char*>(root_page) >= _memory && reinterpret_cast<char*>(root_page) < _memory + sizeof(_memory));
-
-		for (impl::xml_memory_page* page = root_page->next; page; )
-		{
-			impl::xml_memory_page* next = page->next;
-
-			impl::xml_allocator::deallocate_page(page);
-
-			page = next;
-		}
-
-	#ifdef PUGIXML_COMPACT
-		// destroy hash table
-		static_cast<impl::xml_document_struct*>(_root)->hash.clear();
-	#endif
-
-		_root = 0;
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI_IMPL_FN void xml_document::_move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
-	{
-		impl::xml_document_struct* doc = static_cast<impl::xml_document_struct*>(_root);
-		impl::xml_document_struct* other = static_cast<impl::xml_document_struct*>(rhs._root);
-
-		// save first child pointer for later; this needs hash access
-		xml_node_struct* other_first_child = other->first_child;
-
-	#ifdef PUGIXML_COMPACT
-		// reserve space for the hash table up front; this is the only operation that can fail
-		// if it does, we have no choice but to throw (if we have exceptions)
-		if (other_first_child)
-		{
-			size_t other_children = 0;
-			for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
-				other_children++;
-
-			// in compact mode, each pointer assignment could result in a hash table request
-			// during move, we have to relocate document first_child and parents of all children
-			// normally there's just one child and its parent has a pointerless encoding but
-			// we assume the worst here
-			if (!other->_hash->reserve(other_children + 1))
-			{
-			#ifdef PUGIXML_NO_EXCEPTIONS
-				return;
-			#else
-				throw std::bad_alloc();
-			#endif
-			}
-		}
-	#endif
-
-		// move allocation state
-		// note that other->_root may point to the embedded document page, in which case we should keep original (empty) state
-		if (other->_root != PUGI_IMPL_GETPAGE(other))
-		{
-			doc->_root = other->_root;
-			doc->_busy_size = other->_busy_size;
-		}
-
-		// move buffer state
-		doc->buffer = other->buffer;
-		doc->extra_buffers = other->extra_buffers;
-		_buffer = rhs._buffer;
-
-	#ifdef PUGIXML_COMPACT
-		// move compact hash; note that the hash table can have pointers to other but they will be "inactive", similarly to nodes removed with remove_child
-		doc->hash = other->hash;
-		doc->_hash = &doc->hash;
-
-		// make sure we don't access other hash up until the end when we reinitialize other document
-		other->_hash = 0;
-	#endif
-
-		// move page structure
-		impl::xml_memory_page* doc_page = PUGI_IMPL_GETPAGE(doc);
-		assert(doc_page && !doc_page->prev && !doc_page->next);
-
-		impl::xml_memory_page* other_page = PUGI_IMPL_GETPAGE(other);
-		assert(other_page && !other_page->prev);
-
-		// relink pages since root page is embedded into xml_document
-		if (impl::xml_memory_page* page = other_page->next)
-		{
-			assert(page->prev == other_page);
-
-			page->prev = doc_page;
-
-			doc_page->next = page;
-			other_page->next = 0;
-		}
-
-		// make sure pages point to the correct document state
-		for (impl::xml_memory_page* page = doc_page->next; page; page = page->next)
-		{
-			assert(page->allocator == other);
-
-			page->allocator = doc;
-
-		#ifdef PUGIXML_COMPACT
-			// this automatically migrates most children between documents and prevents ->parent assignment from allocating
-			if (page->compact_shared_parent == other)
-				page->compact_shared_parent = doc;
-		#endif
-		}
-
-		// move tree structure
-		assert(!doc->first_child);
-
-		doc->first_child = other_first_child;
-
-		for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
-		{
-		#ifdef PUGIXML_COMPACT
-			// most children will have migrated when we reassigned compact_shared_parent
-			assert(node->parent == other || node->parent == doc);
-
-			node->parent = doc;
-		#else
-			assert(node->parent == other);
-			node->parent = doc;
-		#endif
-		}
-
-		// reset other document
-		new (other) impl::xml_document_struct(PUGI_IMPL_GETPAGE(other));
-		rhs._buffer = 0;
-	}
-#endif
-
-#ifndef PUGIXML_NO_STL
-	PUGI_IMPL_FN xml_parse_result xml_document::load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding, &_buffer);
-	}
-
-	PUGI_IMPL_FN xml_parse_result xml_document::load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options)
-	{
-		reset();
-
-		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding_wchar, &_buffer);
-	}
-#endif
-
-	PUGI_IMPL_FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options)
-	{
-		// Force native encoding (skip autodetection)
-	#ifdef PUGIXML_WCHAR_MODE
-		xml_encoding encoding = encoding_wchar;
-	#else
-		xml_encoding encoding = encoding_utf8;
-	#endif
-
-		return load_buffer(contents, impl::strlength(contents) * sizeof(char_t), options, encoding);
-	}
-
-	PUGI_IMPL_FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
-	{
-		return load_string(contents, options);
-	}
-
-	PUGI_IMPL_FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		using impl::auto_deleter; // MSVC7 workaround
-		auto_deleter<FILE> file(impl::open_file(path_, "rb"), impl::close_file);
-
-		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
-	}
-
-	PUGI_IMPL_FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		using impl::auto_deleter; // MSVC7 workaround
-		auto_deleter<FILE> file(impl::open_file_wide(path_, L"rb"), impl::close_file);
-
-		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
-	}
-
-	PUGI_IMPL_FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, const_cast<void*>(contents), size, options, encoding, false, false, &_buffer);
-	}
-
-	PUGI_IMPL_FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, false, &_buffer);
-	}
-
-	PUGI_IMPL_FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding)
-	{
-		reset();
-
-		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, true, &_buffer);
-	}
-
-	PUGI_IMPL_FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const
-	{
-		impl::xml_buffered_writer buffered_writer(writer, encoding);
-
-		if ((flags & format_write_bom) && encoding != encoding_latin1)
-		{
-			// BOM always represents the codepoint U+FEFF, so just write it in native encoding
-		#ifdef PUGIXML_WCHAR_MODE
-			unsigned int bom = 0xfeff;
-			buffered_writer.write(static_cast<wchar_t>(bom));
-		#else
-			buffered_writer.write('\xef', '\xbb', '\xbf');
-		#endif
-		}
-
-		if (!(flags & format_no_declaration) && !impl::has_declaration(_root))
-		{
-			buffered_writer.write_string(PUGIXML_TEXT("<?xml version=\"1.0\""));
-			if (encoding == encoding_latin1) buffered_writer.write_string(PUGIXML_TEXT(" encoding=\"ISO-8859-1\""));
-			buffered_writer.write('?', '>');
-			if (!(flags & format_raw)) buffered_writer.write('\n');
-		}
-
-		impl::node_output(buffered_writer, _root, indent, flags, 0);
-
-		buffered_writer.flush();
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI_IMPL_FN void xml_document::save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding) const
-	{
-		xml_writer_stream writer(stream);
-
-		save(writer, indent, flags, encoding);
-	}
-
-	PUGI_IMPL_FN void xml_document::save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags) const
-	{
-		xml_writer_stream writer(stream);
-
-		save(writer, indent, flags, encoding_wchar);
-	}
-#endif
-
-	PUGI_IMPL_FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
-	{
-		using impl::auto_deleter; // MSVC7 workaround
-		auto_deleter<FILE> file(impl::open_file(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::close_file);
-
-		return impl::save_file_impl(*this, file.data, indent, flags, encoding) && fclose(file.release()) == 0;
-	}
-
-	PUGI_IMPL_FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
-	{
-		using impl::auto_deleter; // MSVC7 workaround
-		auto_deleter<FILE> file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::close_file);
-
-		return impl::save_file_impl(*this, file.data, indent, flags, encoding) && fclose(file.release()) == 0;
-	}
-
-	PUGI_IMPL_FN xml_node xml_document::document_element() const
-	{
-		assert(_root);
-
-		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
-			if (PUGI_IMPL_NODETYPE(i) == node_element)
-				return xml_node(i);
-
-		return xml_node();
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI_IMPL_FN std::string PUGIXML_FUNCTION as_utf8(const wchar_t* str)
-	{
-		assert(str);
-
-		return impl::as_utf8_impl(str, impl::strlength_wide(str));
-	}
-
-	PUGI_IMPL_FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)
-	{
-		return impl::as_utf8_impl(str.c_str(), str.size());
-	}
-
-	PUGI_IMPL_FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str)
-	{
-		assert(str);
-
-		return impl::as_wide_impl(str, strlen(str));
-	}
-
-	PUGI_IMPL_FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::string& str)
-	{
-		return impl::as_wide_impl(str.c_str(), str.size());
-	}
-#endif
-
-	PUGI_IMPL_FN void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate)
-	{
-		impl::xml_memory::allocate = allocate;
-		impl::xml_memory::deallocate = deallocate;
-	}
-
-	PUGI_IMPL_FN allocation_function PUGIXML_FUNCTION get_memory_allocation_function()
-	{
-		return impl::xml_memory::allocate;
-	}
-
-	PUGI_IMPL_FN deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function()
-	{
-		return impl::xml_memory::deallocate;
-	}
-}
-
-#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
-namespace std
-{
-	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
-	PUGI_IMPL_FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-
-	PUGI_IMPL_FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-
-	PUGI_IMPL_FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_named_node_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-}
-#endif
-
-#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
-namespace std
-{
-	// Workarounds for (non-standard) iterator category detection
-	PUGI_IMPL_FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-
-	PUGI_IMPL_FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-
-	PUGI_IMPL_FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_named_node_iterator&)
-	{
-		return std::bidirectional_iterator_tag();
-	}
-}
-#endif
-
-#ifndef PUGIXML_NO_XPATH
-// STL replacements
-PUGI_IMPL_NS_BEGIN
-	struct equal_to
-	{
-		template <typename T> bool operator()(const T& lhs, const T& rhs) const
-		{
-			return lhs == rhs;
-		}
-	};
-
-	struct not_equal_to
-	{
-		template <typename T> bool operator()(const T& lhs, const T& rhs) const
-		{
-			return lhs != rhs;
-		}
-	};
-
-	struct less
-	{
-		template <typename T> bool operator()(const T& lhs, const T& rhs) const
-		{
-			return lhs < rhs;
-		}
-	};
-
-	struct less_equal
-	{
-		template <typename T> bool operator()(const T& lhs, const T& rhs) const
-		{
-			return lhs <= rhs;
-		}
-	};
-
-	template <typename T> inline void swap(T& lhs, T& rhs)
-	{
-		T temp = lhs;
-		lhs = rhs;
-		rhs = temp;
-	}
-
-	template <typename I, typename Pred> PUGI_IMPL_FN I min_element(I begin, I end, const Pred& pred)
-	{
-		I result = begin;
-
-		for (I it = begin + 1; it != end; ++it)
-			if (pred(*it, *result))
-				result = it;
-
-		return result;
-	}
-
-	template <typename I> PUGI_IMPL_FN void reverse(I begin, I end)
-	{
-		while (end - begin > 1)
-			swap(*begin++, *--end);
-	}
-
-	template <typename I> PUGI_IMPL_FN I unique(I begin, I end)
-	{
-		// fast skip head
-		while (end - begin > 1 && *begin != *(begin + 1))
-			begin++;
-
-		if (begin == end)
-			return begin;
-
-		// last written element
-		I write = begin++;
-
-		// merge unique elements
-		while (begin != end)
-		{
-			if (*begin != *write)
-				*++write = *begin++;
-			else
-				begin++;
-		}
-
-		// past-the-end (write points to live element)
-		return write + 1;
-	}
-
-	template <typename T, typename Pred> PUGI_IMPL_FN void insertion_sort(T* begin, T* end, const Pred& pred)
-	{
-		if (begin == end)
-			return;
-
-		for (T* it = begin + 1; it != end; ++it)
-		{
-			T val = *it;
-			T* hole = it;
-
-			// move hole backwards
-			while (hole > begin && pred(val, *(hole - 1)))
-			{
-				*hole = *(hole - 1);
-				hole--;
-			}
-
-			// fill hole with element
-			*hole = val;
-		}
-	}
-
-	template <typename I, typename Pred> inline I median3(I first, I middle, I last, const Pred& pred)
-	{
-		if (pred(*middle, *first))
-			swap(middle, first);
-		if (pred(*last, *middle))
-			swap(last, middle);
-		if (pred(*middle, *first))
-			swap(middle, first);
-
-		return middle;
-	}
-
-	template <typename T, typename Pred> PUGI_IMPL_FN void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
-	{
-		// invariant: array is split into 4 groups: = < ? > (each variable denotes the boundary between the groups)
-		T* eq = begin;
-		T* lt = begin;
-		T* gt = end;
-
-		while (lt < gt)
-		{
-			if (pred(*lt, pivot))
-				lt++;
-			else if (*lt == pivot)
-				swap(*eq++, *lt++);
-			else
-				swap(*lt, *--gt);
-		}
-
-		// we now have just 4 groups: = < >; move equal elements to the middle
-		T* eqbeg = gt;
-
-		for (T* it = begin; it != eq; ++it)
-			swap(*it, *--eqbeg);
-
-		*out_eqbeg = eqbeg;
-		*out_eqend = gt;
-	}
-
-	template <typename I, typename Pred> PUGI_IMPL_FN void sort(I begin, I end, const Pred& pred)
-	{
-		// sort large chunks
-		while (end - begin > 16)
-		{
-			// find median element
-			I middle = begin + (end - begin) / 2;
-			I median = median3(begin, middle, end - 1, pred);
-
-			// partition in three chunks (< = >)
-			I eqbeg, eqend;
-			partition3(begin, end, *median, pred, &eqbeg, &eqend);
-
-			// loop on larger half
-			if (eqbeg - begin > end - eqend)
-			{
-				sort(eqend, end, pred);
-				end = eqbeg;
-			}
-			else
-			{
-				sort(begin, eqbeg, pred);
-				begin = eqend;
-			}
-		}
-
-		// insertion sort small chunk
-		insertion_sort(begin, end, pred);
-	}
-
-	PUGI_IMPL_FN bool hash_insert(const void** table, size_t size, const void* key)
-	{
-		assert(key);
-
-		unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key));
-
-		// MurmurHash3 32-bit finalizer
-		h ^= h >> 16;
-		h *= 0x85ebca6bu;
-		h ^= h >> 13;
-		h *= 0xc2b2ae35u;
-		h ^= h >> 16;
-
-		size_t hashmod = size - 1;
-		size_t bucket = h & hashmod;
-
-		for (size_t probe = 0; probe <= hashmod; ++probe)
-		{
-			if (table[bucket] == 0)
-			{
-				table[bucket] = key;
-				return true;
-			}
-
-			if (table[bucket] == key)
-				return false;
-
-			// hash collision, quadratic probing
-			bucket = (bucket + probe + 1) & hashmod;
-		}
-
-		assert(false && "Hash table is full"); // unreachable
-		return false;
-	}
-PUGI_IMPL_NS_END
-
-// Allocator used for AST and evaluation stacks
-PUGI_IMPL_NS_BEGIN
-	static const size_t xpath_memory_page_size =
-	#ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE
-		PUGIXML_MEMORY_XPATH_PAGE_SIZE
-	#else
-		4096
-	#endif
-		;
-
-	static const uintptr_t xpath_memory_block_alignment = sizeof(double) > sizeof(void*) ? sizeof(double) : sizeof(void*);
-
-	struct xpath_memory_block
-	{
-		xpath_memory_block* next;
-		size_t capacity;
-
-		union
-		{
-			char data[xpath_memory_page_size];
-			double alignment;
-		};
-	};
-
-	struct xpath_allocator
-	{
-		xpath_memory_block* _root;
-		size_t _root_size;
-		bool* _error;
-
-		xpath_allocator(xpath_memory_block* root, bool* error = 0): _root(root), _root_size(0), _error(error)
-		{
-		}
-
-		void* allocate(size_t size)
-		{
-			// round size up to block alignment boundary
-			size = (size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
-
-			if (_root_size + size <= _root->capacity)
-			{
-				void* buf = &_root->data[0] + _root_size;
-				_root_size += size;
-				return buf;
-			}
-			else
-			{
-				// make sure we have at least 1/4th of the page free after allocation to satisfy subsequent allocation requests
-				size_t block_capacity_base = sizeof(_root->data);
-				size_t block_capacity_req = size + block_capacity_base / 4;
-				size_t block_capacity = (block_capacity_base > block_capacity_req) ? block_capacity_base : block_capacity_req;
-
-				size_t block_size = block_capacity + offsetof(xpath_memory_block, data);
-
-				xpath_memory_block* block = static_cast<xpath_memory_block*>(xml_memory::allocate(block_size));
-				if (!block)
-				{
-					if (_error) *_error = true;
-					return 0;
-				}
-
-				block->next = _root;
-				block->capacity = block_capacity;
-
-				_root = block;
-				_root_size = size;
-
-				return block->data;
-			}
-		}
-
-		void* reallocate(void* ptr, size_t old_size, size_t new_size)
-		{
-			// round size up to block alignment boundary
-			old_size = (old_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
-			new_size = (new_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
-
-			// we can only reallocate the last object
-			assert(ptr == 0 || static_cast<char*>(ptr) + old_size == &_root->data[0] + _root_size);
-
-			// try to reallocate the object inplace
-			if (ptr && _root_size - old_size + new_size <= _root->capacity)
-			{
-				_root_size = _root_size - old_size + new_size;
-				return ptr;
-			}
-
-			// allocate a new block
-			void* result = allocate(new_size);
-			if (!result) return 0;
-
-			// we have a new block
-			if (ptr)
-			{
-				// copy old data (we only support growing)
-				assert(new_size >= old_size);
-				memcpy(result, ptr, old_size);
-
-				// free the previous page if it had no other objects
-				assert(_root->data == result);
-				assert(_root->next);
-
-				if (_root->next->data == ptr)
-				{
-					// deallocate the whole page, unless it was the first one
-					xpath_memory_block* next = _root->next->next;
-
-					if (next)
-					{
-						xml_memory::deallocate(_root->next);
-						_root->next = next;
-					}
-				}
-			}
-
-			return result;
-		}
-
-		void revert(const xpath_allocator& state)
-		{
-			// free all new pages
-			xpath_memory_block* cur = _root;
-
-			while (cur != state._root)
-			{
-				xpath_memory_block* next = cur->next;
-
-				xml_memory::deallocate(cur);
-
-				cur = next;
-			}
-
-			// restore state
-			_root = state._root;
-			_root_size = state._root_size;
-		}
-
-		void release()
-		{
-			xpath_memory_block* cur = _root;
-			assert(cur);
-
-			while (cur->next)
-			{
-				xpath_memory_block* next = cur->next;
-
-				xml_memory::deallocate(cur);
-
-				cur = next;
-			}
-		}
-	};
-
-	struct xpath_allocator_capture
-	{
-		xpath_allocator_capture(xpath_allocator* alloc): _target(alloc), _state(*alloc)
-		{
-		}
-
-		~xpath_allocator_capture()
-		{
-			_target->revert(_state);
-		}
-
-		xpath_allocator* _target;
-		xpath_allocator _state;
-	};
-
-	struct xpath_stack
-	{
-		xpath_allocator* result;
-		xpath_allocator* temp;
-	};
-
-	struct xpath_stack_data
-	{
-		xpath_memory_block blocks[2];
-		xpath_allocator result;
-		xpath_allocator temp;
-		xpath_stack stack;
-		bool oom;
-
-		xpath_stack_data(): result(blocks + 0, &oom), temp(blocks + 1, &oom), oom(false)
-		{
-			blocks[0].next = blocks[1].next = 0;
-			blocks[0].capacity = blocks[1].capacity = sizeof(blocks[0].data);
-
-			stack.result = &result;
-			stack.temp = &temp;
-		}
-
-		~xpath_stack_data()
-		{
-			result.release();
-			temp.release();
-		}
-	};
-PUGI_IMPL_NS_END
-
-// String class
-PUGI_IMPL_NS_BEGIN
-	class xpath_string
-	{
-		const char_t* _buffer;
-		bool _uses_heap;
-		size_t _length_heap;
-
-		static char_t* duplicate_string(const char_t* string, size_t length, xpath_allocator* alloc)
-		{
-			char_t* result = static_cast<char_t*>(alloc->allocate((length + 1) * sizeof(char_t)));
-			if (!result) return 0;
-
-			memcpy(result, string, length * sizeof(char_t));
-			result[length] = 0;
-
-			return result;
-		}
-
-		xpath_string(const char_t* buffer, bool uses_heap_, size_t length_heap): _buffer(buffer), _uses_heap(uses_heap_), _length_heap(length_heap)
-		{
-		}
-
-	public:
-		static xpath_string from_const(const char_t* str)
-		{
-			return xpath_string(str, false, 0);
-		}
-
-		static xpath_string from_heap_preallocated(const char_t* begin, const char_t* end)
-		{
-			assert(begin <= end && *end == 0);
-
-			return xpath_string(begin, true, static_cast<size_t>(end - begin));
-		}
-
-		static xpath_string from_heap(const char_t* begin, const char_t* end, xpath_allocator* alloc)
-		{
-			assert(begin <= end);
-
-			if (begin == end)
-				return xpath_string();
-
-			size_t length = static_cast<size_t>(end - begin);
-			const char_t* data = duplicate_string(begin, length, alloc);
-
-			return data ? xpath_string(data, true, length) : xpath_string();
-		}
-
-		xpath_string(): _buffer(PUGIXML_TEXT("")), _uses_heap(false), _length_heap(0)
-		{
-		}
-
-		void append(const xpath_string& o, xpath_allocator* alloc)
-		{
-			// skip empty sources
-			if (!*o._buffer) return;
-
-			// fast append for constant empty target and constant source
-			if (!*_buffer && !_uses_heap && !o._uses_heap)
-			{
-				_buffer = o._buffer;
-			}
-			else
-			{
-				// need to make heap copy
-				size_t target_length = length();
-				size_t source_length = o.length();
-				size_t result_length = target_length + source_length;
-
-				// allocate new buffer
-				char_t* result = static_cast<char_t*>(alloc->reallocate(_uses_heap ? const_cast<char_t*>(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t)));
-				if (!result) return;
-
-				// append first string to the new buffer in case there was no reallocation
-				if (!_uses_heap) memcpy(result, _buffer, target_length * sizeof(char_t));
-
-				// append second string to the new buffer
-				memcpy(result + target_length, o._buffer, source_length * sizeof(char_t));
-				result[result_length] = 0;
-
-				// finalize
-				_buffer = result;
-				_uses_heap = true;
-				_length_heap = result_length;
-			}
-		}
-
-		const char_t* c_str() const
-		{
-			return _buffer;
-		}
-
-		size_t length() const
-		{
-			return _uses_heap ? _length_heap : strlength(_buffer);
-		}
-
-		char_t* data(xpath_allocator* alloc)
-		{
-			// make private heap copy
-			if (!_uses_heap)
-			{
-				size_t length_ = strlength(_buffer);
-				const char_t* data_ = duplicate_string(_buffer, length_, alloc);
-
-				if (!data_) return 0;
-
-				_buffer = data_;
-				_uses_heap = true;
-				_length_heap = length_;
-			}
-
-			return const_cast<char_t*>(_buffer);
-		}
-
-		bool empty() const
-		{
-			return *_buffer == 0;
-		}
-
-		bool operator==(const xpath_string& o) const
-		{
-			return strequal(_buffer, o._buffer);
-		}
-
-		bool operator!=(const xpath_string& o) const
-		{
-			return !strequal(_buffer, o._buffer);
-		}
-
-		bool uses_heap() const
-		{
-			return _uses_heap;
-		}
-	};
-PUGI_IMPL_NS_END
-
-PUGI_IMPL_NS_BEGIN
-	PUGI_IMPL_FN bool starts_with(const char_t* string, const char_t* pattern)
-	{
-		while (*pattern && *string == *pattern)
-		{
-			string++;
-			pattern++;
-		}
-
-		return *pattern == 0;
-	}
-
-	PUGI_IMPL_FN const char_t* find_char(const char_t* s, char_t c)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcschr(s, c);
-	#else
-		return strchr(s, c);
-	#endif
-	}
-
-	PUGI_IMPL_FN const char_t* find_substring(const char_t* s, const char_t* p)
-	{
-	#ifdef PUGIXML_WCHAR_MODE
-		// MSVC6 wcsstr bug workaround (if s is empty it always returns 0)
-		return (*p == 0) ? s : wcsstr(s, p);
-	#else
-		return strstr(s, p);
-	#endif
-	}
-
-	// Converts symbol to lower case, if it is an ASCII one
-	PUGI_IMPL_FN char_t tolower_ascii(char_t ch)
-	{
-		return static_cast<unsigned int>(ch - 'A') < 26 ? static_cast<char_t>(ch | ' ') : ch;
-	}
-
-	PUGI_IMPL_FN xpath_string string_value(const xpath_node& na, xpath_allocator* alloc)
-	{
-		if (na.attribute())
-			return xpath_string::from_const(na.attribute().value());
-		else
-		{
-			xml_node n = na.node();
-
-			switch (n.type())
-			{
-			case node_pcdata:
-			case node_cdata:
-			case node_comment:
-			case node_pi:
-				return xpath_string::from_const(n.value());
-
-			case node_document:
-			case node_element:
-			{
-				xpath_string result;
-
-				// element nodes can have value if parse_embed_pcdata was used
-				if (n.value()[0])
-					result.append(xpath_string::from_const(n.value()), alloc);
-
-				xml_node cur = n.first_child();
-
-				while (cur && cur != n)
-				{
-					if (cur.type() == node_pcdata || cur.type() == node_cdata)
-						result.append(xpath_string::from_const(cur.value()), alloc);
-
-					if (cur.first_child())
-						cur = cur.first_child();
-					else if (cur.next_sibling())
-						cur = cur.next_sibling();
-					else
-					{
-						while (!cur.next_sibling() && cur != n)
-							cur = cur.parent();
-
-						if (cur != n) cur = cur.next_sibling();
-					}
-				}
-
-				return result;
-			}
-
-			default:
-				return xpath_string();
-			}
-		}
-	}
-
-	PUGI_IMPL_FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn)
-	{
-		assert(ln->parent == rn->parent);
-
-		// there is no common ancestor (the shared parent is null), nodes are from different documents
-		if (!ln->parent) return ln < rn;
-
-		// determine sibling order
-		xml_node_struct* ls = ln;
-		xml_node_struct* rs = rn;
-
-		while (ls && rs)
-		{
-			if (ls == rn) return true;
-			if (rs == ln) return false;
-
-			ls = ls->next_sibling;
-			rs = rs->next_sibling;
-		}
-
-		// if rn sibling chain ended ln must be before rn
-		return !rs;
-	}
-
-	PUGI_IMPL_FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn)
-	{
-		// find common ancestor at the same depth, if any
-		xml_node_struct* lp = ln;
-		xml_node_struct* rp = rn;
-
-		while (lp && rp && lp->parent != rp->parent)
-		{
-			lp = lp->parent;
-			rp = rp->parent;
-		}
-
-		// parents are the same!
-		if (lp && rp) return node_is_before_sibling(lp, rp);
-
-		// nodes are at different depths, need to normalize heights
-		bool left_higher = !lp;
-
-		while (lp)
-		{
-			lp = lp->parent;
-			ln = ln->parent;
-		}
-
-		while (rp)
-		{
-			rp = rp->parent;
-			rn = rn->parent;
-		}
-
-		// one node is the ancestor of the other
-		if (ln == rn) return left_higher;
-
-		// find common ancestor... again
-		while (ln->parent != rn->parent)
-		{
-			ln = ln->parent;
-			rn = rn->parent;
-		}
-
-		return node_is_before_sibling(ln, rn);
-	}
-
-	PUGI_IMPL_FN bool node_is_ancestor(xml_node_struct* parent, xml_node_struct* node)
-	{
-		while (node && node != parent) node = node->parent;
-
-		return parent && node == parent;
-	}
-
-	PUGI_IMPL_FN const void* document_buffer_order(const xpath_node& xnode)
-	{
-		xml_node_struct* node = xnode.node().internal_object();
-
-		if (node)
-		{
-			if ((get_document(node).header & xml_memory_page_contents_shared_mask) == 0)
-			{
-				if (node->name && (node->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return node->name;
-				if (node->value && (node->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return node->value;
-			}
-
-			return 0;
-		}
-
-		xml_attribute_struct* attr = xnode.attribute().internal_object();
-
-		if (attr)
-		{
-			if ((get_document(attr).header & xml_memory_page_contents_shared_mask) == 0)
-			{
-				if ((attr->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return attr->name;
-				if ((attr->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return attr->value;
-			}
-
-			return 0;
-		}
-
-		return 0;
-	}
-
-	struct document_order_comparator
-	{
-		bool operator()(const xpath_node& lhs, const xpath_node& rhs) const
-		{
-			// optimized document order based check
-			const void* lo = document_buffer_order(lhs);
-			const void* ro = document_buffer_order(rhs);
-
-			if (lo && ro) return lo < ro;
-
-			// slow comparison
-			xml_node ln = lhs.node(), rn = rhs.node();
-
-			// compare attributes
-			if (lhs.attribute() && rhs.attribute())
-			{
-				// shared parent
-				if (lhs.parent() == rhs.parent())
-				{
-					// determine sibling order
-					for (xml_attribute a = lhs.attribute(); a; a = a.next_attribute())
-						if (a == rhs.attribute())
-							return true;
-
-					return false;
-				}
-
-				// compare attribute parents
-				ln = lhs.parent();
-				rn = rhs.parent();
-			}
-			else if (lhs.attribute())
-			{
-				// attributes go after the parent element
-				if (lhs.parent() == rhs.node()) return false;
-
-				ln = lhs.parent();
-			}
-			else if (rhs.attribute())
-			{
-				// attributes go after the parent element
-				if (rhs.parent() == lhs.node()) return true;
-
-				rn = rhs.parent();
-			}
-
-			if (ln == rn) return false;
-
-			if (!ln || !rn) return ln < rn;
-
-			return node_is_before(ln.internal_object(), rn.internal_object());
-		}
-	};
-
-	PUGI_IMPL_FN double gen_nan()
-	{
-	#if defined(__STDC_IEC_559__) || ((FLT_RADIX - 0 == 2) && (FLT_MAX_EXP - 0 == 128) && (FLT_MANT_DIG - 0 == 24))
-		PUGI_IMPL_STATIC_ASSERT(sizeof(float) == sizeof(uint32_t));
-		typedef uint32_t UI; // BCC5 workaround
-		union { float f; UI i; } u;
-		u.i = 0x7fc00000;
-		return double(u.f);
-	#else
-		// fallback
-		const volatile double zero = 0.0;
-		return zero / zero;
-	#endif
-	}
-
-	PUGI_IMPL_FN bool is_nan(double value)
-	{
-	#if defined(PUGI_IMPL_MSVC_CRT_VERSION) || defined(__BORLANDC__)
-		return !!_isnan(value);
-	#elif defined(fpclassify) && defined(FP_NAN)
-		return fpclassify(value) == FP_NAN;
-	#else
-		// fallback
-		const volatile double v = value;
-		return v != v;
-	#endif
-	}
-
-	PUGI_IMPL_FN const char_t* convert_number_to_string_special(double value)
-	{
-	#if defined(PUGI_IMPL_MSVC_CRT_VERSION) || defined(__BORLANDC__)
-		if (_finite(value)) return (value == 0) ? PUGIXML_TEXT("0") : 0;
-		if (_isnan(value)) return PUGIXML_TEXT("NaN");
-		return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
-	#elif defined(fpclassify) && defined(FP_NAN) && defined(FP_INFINITE) && defined(FP_ZERO)
-		switch (fpclassify(value))
-		{
-		case FP_NAN:
-			return PUGIXML_TEXT("NaN");
-
-		case FP_INFINITE:
-			return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
-
-		case FP_ZERO:
-			return PUGIXML_TEXT("0");
-
-		default:
-			return 0;
-		}
-	#else
-		// fallback
-		const volatile double v = value;
-
-		if (v == 0) return PUGIXML_TEXT("0");
-		if (v != v) return PUGIXML_TEXT("NaN");
-		if (v * 2 == v) return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
-		return 0;
-	#endif
-	}
-
-	PUGI_IMPL_FN bool convert_number_to_boolean(double value)
-	{
-		return (value != 0 && !is_nan(value));
-	}
-
-	PUGI_IMPL_FN void truncate_zeros(char* begin, char* end)
-	{
-		while (begin != end && end[-1] == '0') end--;
-
-		*end = 0;
-	}
-
-	// gets mantissa digits in the form of 0.xxxxx with 0. implied and the exponent
-#if defined(PUGI_IMPL_MSVC_CRT_VERSION) && PUGI_IMPL_MSVC_CRT_VERSION >= 1400
-	PUGI_IMPL_FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
-	{
-		// get base values
-		int sign, exponent;
-		_ecvt_s(buffer, sizeof(buffer), value, DBL_DIG + 1, &exponent, &sign);
-
-		// truncate redundant zeros
-		truncate_zeros(buffer, buffer + strlen(buffer));
-
-		// fill results
-		*out_mantissa = buffer;
-		*out_exponent = exponent;
-	}
-#else
-	PUGI_IMPL_FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
-	{
-		// get a scientific notation value with IEEE DBL_DIG decimals
-		PUGI_IMPL_SNPRINTF(buffer, "%.*e", DBL_DIG, value);
-
-		// get the exponent (possibly negative)
-		char* exponent_string = strchr(buffer, 'e');
-		assert(exponent_string);
-
-		int exponent = atoi(exponent_string + 1);
-
-		// extract mantissa string: skip sign
-		char* mantissa = buffer[0] == '-' ? buffer + 1 : buffer;
-		assert(mantissa[0] != '0' && (mantissa[1] == '.' || mantissa[1] == ','));
-
-		// divide mantissa by 10 to eliminate integer part
-		mantissa[1] = mantissa[0];
-		mantissa++;
-		exponent++;
-
-		// remove extra mantissa digits and zero-terminate mantissa
-		truncate_zeros(mantissa, exponent_string);
-
-		// fill results
-		*out_mantissa = mantissa;
-		*out_exponent = exponent;
-	}
-#endif
-
-	PUGI_IMPL_FN xpath_string convert_number_to_string(double value, xpath_allocator* alloc)
-	{
-		// try special number conversion
-		const char_t* special = convert_number_to_string_special(value);
-		if (special) return xpath_string::from_const(special);
-
-		// get mantissa + exponent form
-		char mantissa_buffer[32];
-
-		char* mantissa;
-		int exponent;
-		convert_number_to_mantissa_exponent(value, mantissa_buffer, &mantissa, &exponent);
-
-		// allocate a buffer of suitable length for the number
-		size_t result_size = strlen(mantissa_buffer) + (exponent > 0 ? exponent : -exponent) + 4;
-		char_t* result = static_cast<char_t*>(alloc->allocate(sizeof(char_t) * result_size));
-		if (!result) return xpath_string();
-
-		// make the number!
-		char_t* s = result;
-
-		// sign
-		if (value < 0) *s++ = '-';
-
-		// integer part
-		if (exponent <= 0)
-		{
-			*s++ = '0';
-		}
-		else
-		{
-			while (exponent > 0)
-			{
-				assert(*mantissa == 0 || static_cast<unsigned int>(*mantissa - '0') <= 9);
-				*s++ = *mantissa ? *mantissa++ : '0';
-				exponent--;
-			}
-		}
-
-		// fractional part
-		if (*mantissa)
-		{
-			// decimal point
-			*s++ = '.';
-
-			// extra zeroes from negative exponent
-			while (exponent < 0)
-			{
-				*s++ = '0';
-				exponent++;
-			}
-
-			// extra mantissa digits
-			while (*mantissa)
-			{
-				assert(static_cast<unsigned int>(*mantissa - '0') <= 9);
-				*s++ = *mantissa++;
-			}
-		}
-
-		// zero-terminate
-		assert(s < result + result_size);
-		*s = 0;
-
-		return xpath_string::from_heap_preallocated(result, s);
-	}
-
-	PUGI_IMPL_FN bool check_string_to_number_format(const char_t* string)
-	{
-		// parse leading whitespace
-		while (PUGI_IMPL_IS_CHARTYPE(*string, ct_space)) ++string;
-
-		// parse sign
-		if (*string == '-') ++string;
-
-		if (!*string) return false;
-
-		// if there is no integer part, there should be a decimal part with at least one digit
-		if (!PUGI_IMPL_IS_CHARTYPEX(string[0], ctx_digit) && (string[0] != '.' || !PUGI_IMPL_IS_CHARTYPEX(string[1], ctx_digit))) return false;
-
-		// parse integer part
-		while (PUGI_IMPL_IS_CHARTYPEX(*string, ctx_digit)) ++string;
-
-		// parse decimal part
-		if (*string == '.')
-		{
-			++string;
-
-			while (PUGI_IMPL_IS_CHARTYPEX(*string, ctx_digit)) ++string;
-		}
-
-		// parse trailing whitespace
-		while (PUGI_IMPL_IS_CHARTYPE(*string, ct_space)) ++string;
-
-		return *string == 0;
-	}
-
-	PUGI_IMPL_FN double convert_string_to_number(const char_t* string)
-	{
-		// check string format
-		if (!check_string_to_number_format(string)) return gen_nan();
-
-		// parse string
-	#ifdef PUGIXML_WCHAR_MODE
-		return wcstod(string, 0);
-	#else
-		return strtod(string, 0);
-	#endif
-	}
-
-	PUGI_IMPL_FN bool convert_string_to_number_scratch(char_t (&buffer)[32], const char_t* begin, const char_t* end, double* out_result)
-	{
-		size_t length = static_cast<size_t>(end - begin);
-		char_t* scratch = buffer;
-
-		if (length >= sizeof(buffer) / sizeof(buffer[0]))
-		{
-			// need to make dummy on-heap copy
-			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-			if (!scratch) return false;
-		}
-
-		// copy string to zero-terminated buffer and perform conversion
-		memcpy(scratch, begin, length * sizeof(char_t));
-		scratch[length] = 0;
-
-		*out_result = convert_string_to_number(scratch);
-
-		// free dummy buffer
-		if (scratch != buffer) xml_memory::deallocate(scratch);
-
-		return true;
-	}
-
-	PUGI_IMPL_FN double round_nearest(double value)
-	{
-		return floor(value + 0.5);
-	}
-
-	PUGI_IMPL_FN double round_nearest_nzero(double value)
-	{
-		// same as round_nearest, but returns -0 for [-0.5, -0]
-		// ceil is used to differentiate between +0 and -0 (we return -0 for [-0.5, -0] and +0 for +0)
-		return (value >= -0.5 && value <= 0) ? ceil(value) : floor(value + 0.5);
-	}
-
-	PUGI_IMPL_FN const char_t* qualified_name(const xpath_node& node)
-	{
-		return node.attribute() ? node.attribute().name() : node.node().name();
-	}
-
-	PUGI_IMPL_FN const char_t* local_name(const xpath_node& node)
-	{
-		const char_t* name = qualified_name(node);
-		const char_t* p = find_char(name, ':');
-
-		return p ? p + 1 : name;
-	}
-
-	struct namespace_uri_predicate
-	{
-		const char_t* prefix;
-		size_t prefix_length;
-
-		namespace_uri_predicate(const char_t* name)
-		{
-			const char_t* pos = find_char(name, ':');
-
-			prefix = pos ? name : 0;
-			prefix_length = pos ? static_cast<size_t>(pos - name) : 0;
-		}
-
-		bool operator()(xml_attribute a) const
-		{
-			const char_t* name = a.name();
-
-			if (!starts_with(name, PUGIXML_TEXT("xmlns"))) return false;
-
-			return prefix ? name[5] == ':' && strequalrange(name + 6, prefix, prefix_length) : name[5] == 0;
-		}
-	};
-
-	PUGI_IMPL_FN const char_t* namespace_uri(xml_node node)
-	{
-		namespace_uri_predicate pred = node.name();
-
-		xml_node p = node;
-
-		while (p)
-		{
-			xml_attribute a = p.find_attribute(pred);
-
-			if (a) return a.value();
-
-			p = p.parent();
-		}
-
-		return PUGIXML_TEXT("");
-	}
-
-	PUGI_IMPL_FN const char_t* namespace_uri(xml_attribute attr, xml_node parent)
-	{
-		namespace_uri_predicate pred = attr.name();
-
-		// Default namespace does not apply to attributes
-		if (!pred.prefix) return PUGIXML_TEXT("");
-
-		xml_node p = parent;
-
-		while (p)
-		{
-			xml_attribute a = p.find_attribute(pred);
-
-			if (a) return a.value();
-
-			p = p.parent();
-		}
-
-		return PUGIXML_TEXT("");
-	}
-
-	PUGI_IMPL_FN const char_t* namespace_uri(const xpath_node& node)
-	{
-		return node.attribute() ? namespace_uri(node.attribute(), node.parent()) : namespace_uri(node.node());
-	}
-
-	PUGI_IMPL_FN char_t* normalize_space(char_t* buffer)
-	{
-		char_t* write = buffer;
-
-		for (char_t* it = buffer; *it; )
-		{
-			char_t ch = *it++;
-
-			if (PUGI_IMPL_IS_CHARTYPE(ch, ct_space))
-			{
-				// replace whitespace sequence with single space
-				while (PUGI_IMPL_IS_CHARTYPE(*it, ct_space)) it++;
-
-				// avoid leading spaces
-				if (write != buffer) *write++ = ' ';
-			}
-			else *write++ = ch;
-		}
-
-		// remove trailing space
-		if (write != buffer && PUGI_IMPL_IS_CHARTYPE(write[-1], ct_space)) write--;
-
-		// zero-terminate
-		*write = 0;
-
-		return write;
-	}
-
-	PUGI_IMPL_FN char_t* translate(char_t* buffer, const char_t* from, const char_t* to, size_t to_length)
-	{
-		char_t* write = buffer;
-
-		while (*buffer)
-		{
-			PUGI_IMPL_DMC_VOLATILE char_t ch = *buffer++;
-
-			const char_t* pos = find_char(from, ch);
-
-			if (!pos)
-				*write++ = ch; // do not process
-			else if (static_cast<size_t>(pos - from) < to_length)
-				*write++ = to[pos - from]; // replace
-		}
-
-		// zero-terminate
-		*write = 0;
-
-		return write;
-	}
-
-	PUGI_IMPL_FN unsigned char* translate_table_generate(xpath_allocator* alloc, const char_t* from, const char_t* to)
-	{
-		unsigned char table[128] = {0};
-
-		while (*from)
-		{
-			unsigned int fc = static_cast<unsigned int>(*from);
-			unsigned int tc = static_cast<unsigned int>(*to);
-
-			if (fc >= 128 || tc >= 128)
-				return 0;
-
-			// code=128 means "skip character"
-			if (!table[fc])
-				table[fc] = static_cast<unsigned char>(tc ? tc : 128);
-
-			from++;
-			if (tc) to++;
-		}
-
-		for (int i = 0; i < 128; ++i)
-			if (!table[i])
-				table[i] = static_cast<unsigned char>(i);
-
-		void* result = alloc->allocate(sizeof(table));
-		if (!result) return 0;
-
-		memcpy(result, table, sizeof(table));
-
-		return static_cast<unsigned char*>(result);
-	}
-
-	PUGI_IMPL_FN char_t* translate_table(char_t* buffer, const unsigned char* table)
-	{
-		char_t* write = buffer;
-
-		while (*buffer)
-		{
-			char_t ch = *buffer++;
-			unsigned int index = static_cast<unsigned int>(ch);
-
-			if (index < 128)
-			{
-				unsigned char code = table[index];
-
-				// code=128 means "skip character" (table size is 128 so 128 can be a special value)
-				// this code skips these characters without extra branches
-				*write = static_cast<char_t>(code);
-				write += 1 - (code >> 7);
-			}
-			else
-			{
-				*write++ = ch;
-			}
-		}
-
-		// zero-terminate
-		*write = 0;
-
-		return write;
-	}
-
-	inline bool is_xpath_attribute(const char_t* name)
-	{
-		return !(starts_with(name, PUGIXML_TEXT("xmlns")) && (name[5] == 0 || name[5] == ':'));
-	}
-
-	struct xpath_variable_boolean: xpath_variable
-	{
-		xpath_variable_boolean(): xpath_variable(xpath_type_boolean), value(false)
-		{
-		}
-
-		bool value;
-		char_t name[1];
-	};
-
-	struct xpath_variable_number: xpath_variable
-	{
-		xpath_variable_number(): xpath_variable(xpath_type_number), value(0)
-		{
-		}
-
-		double value;
-		char_t name[1];
-	};
-
-	struct xpath_variable_string: xpath_variable
-	{
-		xpath_variable_string(): xpath_variable(xpath_type_string), value(0)
-		{
-		}
-
-		~xpath_variable_string()
-		{
-			if (value) xml_memory::deallocate(value);
-		}
-
-		char_t* value;
-		char_t name[1];
-	};
-
-	struct xpath_variable_node_set: xpath_variable
-	{
-		xpath_variable_node_set(): xpath_variable(xpath_type_node_set)
-		{
-		}
-
-		xpath_node_set value;
-		char_t name[1];
-	};
-
-	static const xpath_node_set dummy_node_set;
-
-	PUGI_IMPL_FN PUGI_IMPL_UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str)
-	{
-		// Jenkins one-at-a-time hash (http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time)
-		unsigned int result = 0;
-
-		while (*str)
-		{
-			result += static_cast<unsigned int>(*str++);
-			result += result << 10;
-			result ^= result >> 6;
-		}
-
-		result += result << 3;
-		result ^= result >> 11;
-		result += result << 15;
-
-		return result;
-	}
-
-	template <typename T> PUGI_IMPL_FN T* new_xpath_variable(const char_t* name)
-	{
-		size_t length = strlength(name);
-		if (length == 0) return 0; // empty variable names are invalid
-
-		// $$ we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters
-		void* memory = xml_memory::allocate(sizeof(T) + length * sizeof(char_t));
-		if (!memory) return 0;
-
-		T* result = new (memory) T();
-
-		memcpy(result->name, name, (length + 1) * sizeof(char_t));
-
-		return result;
-	}
-
-	PUGI_IMPL_FN xpath_variable* new_xpath_variable(xpath_value_type type, const char_t* name)
-	{
-		switch (type)
-		{
-		case xpath_type_node_set:
-			return new_xpath_variable<xpath_variable_node_set>(name);
-
-		case xpath_type_number:
-			return new_xpath_variable<xpath_variable_number>(name);
-
-		case xpath_type_string:
-			return new_xpath_variable<xpath_variable_string>(name);
-
-		case xpath_type_boolean:
-			return new_xpath_variable<xpath_variable_boolean>(name);
-
-		default:
-			return 0;
-		}
-	}
-
-	template <typename T> PUGI_IMPL_FN void delete_xpath_variable(T* var)
-	{
-		var->~T();
-		xml_memory::deallocate(var);
-	}
-
-	PUGI_IMPL_FN void delete_xpath_variable(xpath_value_type type, xpath_variable* var)
-	{
-		switch (type)
-		{
-		case xpath_type_node_set:
-			delete_xpath_variable(static_cast<xpath_variable_node_set*>(var));
-			break;
-
-		case xpath_type_number:
-			delete_xpath_variable(static_cast<xpath_variable_number*>(var));
-			break;
-
-		case xpath_type_string:
-			delete_xpath_variable(static_cast<xpath_variable_string*>(var));
-			break;
-
-		case xpath_type_boolean:
-			delete_xpath_variable(static_cast<xpath_variable_boolean*>(var));
-			break;
-
-		default:
-			assert(false && "Invalid variable type"); // unreachable
-		}
-	}
-
-	PUGI_IMPL_FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs)
-	{
-		switch (rhs->type())
-		{
-		case xpath_type_node_set:
-			return lhs->set(static_cast<const xpath_variable_node_set*>(rhs)->value);
-
-		case xpath_type_number:
-			return lhs->set(static_cast<const xpath_variable_number*>(rhs)->value);
-
-		case xpath_type_string:
-			return lhs->set(static_cast<const xpath_variable_string*>(rhs)->value);
-
-		case xpath_type_boolean:
-			return lhs->set(static_cast<const xpath_variable_boolean*>(rhs)->value);
-
-		default:
-			assert(false && "Invalid variable type"); // unreachable
-			return false;
-		}
-	}
-
-	PUGI_IMPL_FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result)
-	{
-		size_t length = static_cast<size_t>(end - begin);
-		char_t* scratch = buffer;
-
-		if (length >= sizeof(buffer) / sizeof(buffer[0]))
-		{
-			// need to make dummy on-heap copy
-			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
-			if (!scratch) return false;
-		}
-
-		// copy string to zero-terminated buffer and perform lookup
-		memcpy(scratch, begin, length * sizeof(char_t));
-		scratch[length] = 0;
-
-		*out_result = set->get(scratch);
-
-		// free dummy buffer
-		if (scratch != buffer) xml_memory::deallocate(scratch);
-
-		return true;
-	}
-PUGI_IMPL_NS_END
-
-// Internal node set class
-PUGI_IMPL_NS_BEGIN
-	PUGI_IMPL_FN xpath_node_set::type_t xpath_get_order(const xpath_node* begin, const xpath_node* end)
-	{
-		if (end - begin < 2)
-			return xpath_node_set::type_sorted;
-
-		document_order_comparator cmp;
-
-		bool first = cmp(begin[0], begin[1]);
-
-		for (const xpath_node* it = begin + 1; it + 1 < end; ++it)
-			if (cmp(it[0], it[1]) != first)
-				return xpath_node_set::type_unsorted;
-
-		return first ? xpath_node_set::type_sorted : xpath_node_set::type_sorted_reverse;
-	}
-
-	PUGI_IMPL_FN xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev)
-	{
-		xpath_node_set::type_t order = rev ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
-
-		if (type == xpath_node_set::type_unsorted)
-		{
-			xpath_node_set::type_t sorted = xpath_get_order(begin, end);
-
-			if (sorted == xpath_node_set::type_unsorted)
-			{
-				sort(begin, end, document_order_comparator());
-
-				type = xpath_node_set::type_sorted;
-			}
-			else
-				type = sorted;
-		}
-
-		if (type != order) reverse(begin, end);
-
-		return order;
-	}
-
-	PUGI_IMPL_FN xpath_node xpath_first(const xpath_node* begin, const xpath_node* end, xpath_node_set::type_t type)
-	{
-		if (begin == end) return xpath_node();
-
-		switch (type)
-		{
-		case xpath_node_set::type_sorted:
-			return *begin;
-
-		case xpath_node_set::type_sorted_reverse:
-			return *(end - 1);
-
-		case xpath_node_set::type_unsorted:
-			return *min_element(begin, end, document_order_comparator());
-
-		default:
-			assert(false && "Invalid node set type"); // unreachable
-			return xpath_node();
-		}
-	}
-
-	class xpath_node_set_raw
-	{
-		xpath_node_set::type_t _type;
-
-		xpath_node* _begin;
-		xpath_node* _end;
-		xpath_node* _eos;
-
-	public:
-		xpath_node_set_raw(): _type(xpath_node_set::type_unsorted), _begin(0), _end(0), _eos(0)
-		{
-		}
-
-		xpath_node* begin() const
-		{
-			return _begin;
-		}
-
-		xpath_node* end() const
-		{
-			return _end;
-		}
-
-		bool empty() const
-		{
-			return _begin == _end;
-		}
-
-		size_t size() const
-		{
-			return static_cast<size_t>(_end - _begin);
-		}
-
-		xpath_node first() const
-		{
-			return xpath_first(_begin, _end, _type);
-		}
-
-		void push_back_grow(const xpath_node& node, xpath_allocator* alloc);
-
-		void push_back(const xpath_node& node, xpath_allocator* alloc)
-		{
-			if (_end != _eos)
-				*_end++ = node;
-			else
-				push_back_grow(node, alloc);
-		}
-
-		void append(const xpath_node* begin_, const xpath_node* end_, xpath_allocator* alloc)
-		{
-			if (begin_ == end_) return;
-
-			size_t size_ = static_cast<size_t>(_end - _begin);
-			size_t capacity = static_cast<size_t>(_eos - _begin);
-			size_t count = static_cast<size_t>(end_ - begin_);
-
-			if (size_ + count > capacity)
-			{
-				// reallocate the old array or allocate a new one
-				xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), (size_ + count) * sizeof(xpath_node)));
-				if (!data) return;
-
-				// finalize
-				_begin = data;
-				_end = data + size_;
-				_eos = data + size_ + count;
-			}
-
-			memcpy(_end, begin_, count * sizeof(xpath_node));
-			_end += count;
-		}
-
-		void sort_do()
-		{
-			_type = xpath_sort(_begin, _end, _type, false);
-		}
-
-		void truncate(xpath_node* pos)
-		{
-			assert(_begin <= pos && pos <= _end);
-
-			_end = pos;
-		}
-
-		void remove_duplicates(xpath_allocator* alloc)
-		{
-			if (_type == xpath_node_set::type_unsorted && _end - _begin > 2)
-			{
-				xpath_allocator_capture cr(alloc);
-
-				size_t size_ = static_cast<size_t>(_end - _begin);
-
-				size_t hash_size = 1;
-				while (hash_size < size_ + size_ / 2) hash_size *= 2;
-
-				const void** hash_data = static_cast<const void**>(alloc->allocate(hash_size * sizeof(void**)));
-				if (!hash_data) return;
-
-				memset(hash_data, 0, hash_size * sizeof(const void**));
-
-				xpath_node* write = _begin;
-
-				for (xpath_node* it = _begin; it != _end; ++it)
-				{
-					const void* attr = it->attribute().internal_object();
-					const void* node = it->node().internal_object();
-					const void* key = attr ? attr : node;
-
-					if (key && hash_insert(hash_data, hash_size, key))
-					{
-						*write++ = *it;
-					}
-				}
-
-				_end = write;
-			}
-			else
-			{
-				_end = unique(_begin, _end);
-			}
-		}
-
-		xpath_node_set::type_t type() const
-		{
-			return _type;
-		}
-
-		void set_type(xpath_node_set::type_t value)
-		{
-			_type = value;
-		}
-	};
-
-	PUGI_IMPL_FN_NO_INLINE void xpath_node_set_raw::push_back_grow(const xpath_node& node, xpath_allocator* alloc)
-	{
-		size_t capacity = static_cast<size_t>(_eos - _begin);
-
-		// get new capacity (1.5x rule)
-		size_t new_capacity = capacity + capacity / 2 + 1;
-
-		// reallocate the old array or allocate a new one
-		xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), new_capacity * sizeof(xpath_node)));
-		if (!data) return;
-
-		// finalize
-		_begin = data;
-		_end = data + capacity;
-		_eos = data + new_capacity;
-
-		// push
-		*_end++ = node;
-	}
-PUGI_IMPL_NS_END
-
-PUGI_IMPL_NS_BEGIN
-	struct xpath_context
-	{
-		xpath_node n;
-		size_t position, size;
-
-		xpath_context(const xpath_node& n_, size_t position_, size_t size_): n(n_), position(position_), size(size_)
-		{
-		}
-	};
-
-	enum lexeme_t
-	{
-		lex_none = 0,
-		lex_equal,
-		lex_not_equal,
-		lex_less,
-		lex_greater,
-		lex_less_or_equal,
-		lex_greater_or_equal,
-		lex_plus,
-		lex_minus,
-		lex_multiply,
-		lex_union,
-		lex_var_ref,
-		lex_open_brace,
-		lex_close_brace,
-		lex_quoted_string,
-		lex_number,
-		lex_slash,
-		lex_double_slash,
-		lex_open_square_brace,
-		lex_close_square_brace,
-		lex_string,
-		lex_comma,
-		lex_axis_attribute,
-		lex_dot,
-		lex_double_dot,
-		lex_double_colon,
-		lex_eof
-	};
-
-	struct xpath_lexer_string
-	{
-		const char_t* begin;
-		const char_t* end;
-
-		xpath_lexer_string(): begin(0), end(0)
-		{
-		}
-
-		bool operator==(const char_t* other) const
-		{
-			size_t length = static_cast<size_t>(end - begin);
-
-			return strequalrange(other, begin, length);
-		}
-	};
-
-	class xpath_lexer
-	{
-		const char_t* _cur;
-		const char_t* _cur_lexeme_pos;
-		xpath_lexer_string _cur_lexeme_contents;
-
-		lexeme_t _cur_lexeme;
-
-	public:
-		explicit xpath_lexer(const char_t* query): _cur(query)
-		{
-			next();
-		}
-
-		const char_t* state() const
-		{
-			return _cur;
-		}
-
-		void next()
-		{
-			const char_t* cur = _cur;
-
-			while (PUGI_IMPL_IS_CHARTYPE(*cur, ct_space)) ++cur;
-
-			// save lexeme position for error reporting
-			_cur_lexeme_pos = cur;
-
-			switch (*cur)
-			{
-			case 0:
-				_cur_lexeme = lex_eof;
-				break;
-
-			case '>':
-				if (*(cur+1) == '=')
-				{
-					cur += 2;
-					_cur_lexeme = lex_greater_or_equal;
-				}
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_greater;
-				}
-				break;
-
-			case '<':
-				if (*(cur+1) == '=')
-				{
-					cur += 2;
-					_cur_lexeme = lex_less_or_equal;
-				}
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_less;
-				}
-				break;
-
-			case '!':
-				if (*(cur+1) == '=')
-				{
-					cur += 2;
-					_cur_lexeme = lex_not_equal;
-				}
-				else
-				{
-					_cur_lexeme = lex_none;
-				}
-				break;
-
-			case '=':
-				cur += 1;
-				_cur_lexeme = lex_equal;
-
-				break;
-
-			case '+':
-				cur += 1;
-				_cur_lexeme = lex_plus;
-
-				break;
-
-			case '-':
-				cur += 1;
-				_cur_lexeme = lex_minus;
-
-				break;
-
-			case '*':
-				cur += 1;
-				_cur_lexeme = lex_multiply;
-
-				break;
-
-			case '|':
-				cur += 1;
-				_cur_lexeme = lex_union;
-
-				break;
-
-			case '$':
-				cur += 1;
-
-				if (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_start_symbol))
-				{
-					_cur_lexeme_contents.begin = cur;
-
-					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
-
-					if (cur[0] == ':' && PUGI_IMPL_IS_CHARTYPEX(cur[1], ctx_symbol)) // qname
-					{
-						cur++; // :
-
-						while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
-					}
-
-					_cur_lexeme_contents.end = cur;
-
-					_cur_lexeme = lex_var_ref;
-				}
-				else
-				{
-					_cur_lexeme = lex_none;
-				}
-
-				break;
-
-			case '(':
-				cur += 1;
-				_cur_lexeme = lex_open_brace;
-
-				break;
-
-			case ')':
-				cur += 1;
-				_cur_lexeme = lex_close_brace;
-
-				break;
-
-			case '[':
-				cur += 1;
-				_cur_lexeme = lex_open_square_brace;
-
-				break;
-
-			case ']':
-				cur += 1;
-				_cur_lexeme = lex_close_square_brace;
-
-				break;
-
-			case ',':
-				cur += 1;
-				_cur_lexeme = lex_comma;
-
-				break;
-
-			case '/':
-				if (*(cur+1) == '/')
-				{
-					cur += 2;
-					_cur_lexeme = lex_double_slash;
-				}
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_slash;
-				}
-				break;
-
-			case '.':
-				if (*(cur+1) == '.')
-				{
-					cur += 2;
-					_cur_lexeme = lex_double_dot;
-				}
-				else if (PUGI_IMPL_IS_CHARTYPEX(*(cur+1), ctx_digit))
-				{
-					_cur_lexeme_contents.begin = cur; // .
-
-					++cur;
-
-					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit)) cur++;
-
-					_cur_lexeme_contents.end = cur;
-
-					_cur_lexeme = lex_number;
-				}
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_dot;
-				}
-				break;
-
-			case '@':
-				cur += 1;
-				_cur_lexeme = lex_axis_attribute;
-
-				break;
-
-			case '"':
-			case '\'':
-			{
-				char_t terminator = *cur;
-
-				++cur;
-
-				_cur_lexeme_contents.begin = cur;
-				while (*cur && *cur != terminator) cur++;
-				_cur_lexeme_contents.end = cur;
-
-				if (!*cur)
-					_cur_lexeme = lex_none;
-				else
-				{
-					cur += 1;
-					_cur_lexeme = lex_quoted_string;
-				}
-
-				break;
-			}
-
-			case ':':
-				if (*(cur+1) == ':')
-				{
-					cur += 2;
-					_cur_lexeme = lex_double_colon;
-				}
-				else
-				{
-					_cur_lexeme = lex_none;
-				}
-				break;
-
-			default:
-				if (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit))
-				{
-					_cur_lexeme_contents.begin = cur;
-
-					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit)) cur++;
-
-					if (*cur == '.')
-					{
-						cur++;
-
-						while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_digit)) cur++;
-					}
-
-					_cur_lexeme_contents.end = cur;
-
-					_cur_lexeme = lex_number;
-				}
-				else if (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_start_symbol))
-				{
-					_cur_lexeme_contents.begin = cur;
-
-					while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
-
-					if (cur[0] == ':')
-					{
-						if (cur[1] == '*') // namespace test ncname:*
-						{
-							cur += 2; // :*
-						}
-						else if (PUGI_IMPL_IS_CHARTYPEX(cur[1], ctx_symbol)) // namespace test qname
-						{
-							cur++; // :
-
-							while (PUGI_IMPL_IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
-						}
-					}
-
-					_cur_lexeme_contents.end = cur;
-
-					_cur_lexeme = lex_string;
-				}
-				else
-				{
-					_cur_lexeme = lex_none;
-				}
-			}
-
-			_cur = cur;
-		}
-
-		lexeme_t current() const
-		{
-			return _cur_lexeme;
-		}
-
-		const char_t* current_pos() const
-		{
-			return _cur_lexeme_pos;
-		}
-
-		const xpath_lexer_string& contents() const
-		{
-			assert(_cur_lexeme == lex_var_ref || _cur_lexeme == lex_number || _cur_lexeme == lex_string || _cur_lexeme == lex_quoted_string);
-
-			return _cur_lexeme_contents;
-		}
-	};
-
-	enum ast_type_t
-	{
-		ast_unknown,
-		ast_op_or,						// left or right
-		ast_op_and,						// left and right
-		ast_op_equal,					// left = right
-		ast_op_not_equal,				// left != right
-		ast_op_less,					// left < right
-		ast_op_greater,					// left > right
-		ast_op_less_or_equal,			// left <= right
-		ast_op_greater_or_equal,		// left >= right
-		ast_op_add,						// left + right
-		ast_op_subtract,				// left - right
-		ast_op_multiply,				// left * right
-		ast_op_divide,					// left / right
-		ast_op_mod,						// left % right
-		ast_op_negate,					// left - right
-		ast_op_union,					// left | right
-		ast_predicate,					// apply predicate to set; next points to next predicate
-		ast_filter,						// select * from left where right
-		ast_string_constant,			// string constant
-		ast_number_constant,			// number constant
-		ast_variable,					// variable
-		ast_func_last,					// last()
-		ast_func_position,				// position()
-		ast_func_count,					// count(left)
-		ast_func_id,					// id(left)
-		ast_func_local_name_0,			// local-name()
-		ast_func_local_name_1,			// local-name(left)
-		ast_func_namespace_uri_0,		// namespace-uri()
-		ast_func_namespace_uri_1,		// namespace-uri(left)
-		ast_func_name_0,				// name()
-		ast_func_name_1,				// name(left)
-		ast_func_string_0,				// string()
-		ast_func_string_1,				// string(left)
-		ast_func_concat,				// concat(left, right, siblings)
-		ast_func_starts_with,			// starts_with(left, right)
-		ast_func_contains,				// contains(left, right)
-		ast_func_substring_before,		// substring-before(left, right)
-		ast_func_substring_after,		// substring-after(left, right)
-		ast_func_substring_2,			// substring(left, right)
-		ast_func_substring_3,			// substring(left, right, third)
-		ast_func_string_length_0,		// string-length()
-		ast_func_string_length_1,		// string-length(left)
-		ast_func_normalize_space_0,		// normalize-space()
-		ast_func_normalize_space_1,		// normalize-space(left)
-		ast_func_translate,				// translate(left, right, third)
-		ast_func_boolean,				// boolean(left)
-		ast_func_not,					// not(left)
-		ast_func_true,					// true()
-		ast_func_false,					// false()
-		ast_func_lang,					// lang(left)
-		ast_func_number_0,				// number()
-		ast_func_number_1,				// number(left)
-		ast_func_sum,					// sum(left)
-		ast_func_floor,					// floor(left)
-		ast_func_ceiling,				// ceiling(left)
-		ast_func_round,					// round(left)
-		ast_step,						// process set left with step
-		ast_step_root,					// select root node
-
-		ast_opt_translate_table,		// translate(left, right, third) where right/third are constants
-		ast_opt_compare_attribute		// @name = 'string'
-	};
-
-	enum axis_t
-	{
-		axis_ancestor,
-		axis_ancestor_or_self,
-		axis_attribute,
-		axis_child,
-		axis_descendant,
-		axis_descendant_or_self,
-		axis_following,
-		axis_following_sibling,
-		axis_namespace,
-		axis_parent,
-		axis_preceding,
-		axis_preceding_sibling,
-		axis_self
-	};
-
-	enum nodetest_t
-	{
-		nodetest_none,
-		nodetest_name,
-		nodetest_type_node,
-		nodetest_type_comment,
-		nodetest_type_pi,
-		nodetest_type_text,
-		nodetest_pi,
-		nodetest_all,
-		nodetest_all_in_namespace
-	};
-
-	enum predicate_t
-	{
-		predicate_default,
-		predicate_posinv,
-		predicate_constant,
-		predicate_constant_one
-	};
-
-	enum nodeset_eval_t
-	{
-		nodeset_eval_all,
-		nodeset_eval_any,
-		nodeset_eval_first
-	};
-
-	template <axis_t N> struct axis_to_type
-	{
-		static const axis_t axis;
-	};
-
-	template <axis_t N> const axis_t axis_to_type<N>::axis = N;
-
-	class xpath_ast_node
-	{
-	private:
-		// node type
-		char _type;
-		char _rettype;
-
-		// for ast_step
-		char _axis;
-
-		// for ast_step/ast_predicate/ast_filter
-		char _test;
-
-		// tree node structure
-		xpath_ast_node* _left;
-		xpath_ast_node* _right;
-		xpath_ast_node* _next;
-
-		union
-		{
-			// value for ast_string_constant
-			const char_t* string;
-			// value for ast_number_constant
-			double number;
-			// variable for ast_variable
-			xpath_variable* variable;
-			// node test for ast_step (node name/namespace/node type/pi target)
-			const char_t* nodetest;
-			// table for ast_opt_translate_table
-			const unsigned char* table;
-		} _data;
-
-		xpath_ast_node(const xpath_ast_node&);
-		xpath_ast_node& operator=(const xpath_ast_node&);
-
-		template <class Comp> static bool compare_eq(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
-		{
-			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
-
-			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
-			{
-				if (lt == xpath_type_boolean || rt == xpath_type_boolean)
-					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
-				else if (lt == xpath_type_number || rt == xpath_type_number)
-					return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
-				else if (lt == xpath_type_string || rt == xpath_type_string)
-				{
-					xpath_allocator_capture cr(stack.result);
-
-					xpath_string ls = lhs->eval_string(c, stack);
-					xpath_string rs = rhs->eval_string(c, stack);
-
-					return comp(ls, rs);
-				}
-			}
-			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
-				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
-					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-					{
-						xpath_allocator_capture cri(stack.result);
-
-						if (comp(string_value(*li, stack.result), string_value(*ri, stack.result)))
-							return true;
-					}
-
-				return false;
-			}
-			else
-			{
-				if (lt == xpath_type_node_set)
-				{
-					swap(lhs, rhs);
-					swap(lt, rt);
-				}
-
-				if (lt == xpath_type_boolean)
-					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
-				else if (lt == xpath_type_number)
-				{
-					xpath_allocator_capture cr(stack.result);
-
-					double l = lhs->eval_number(c, stack);
-					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-					{
-						xpath_allocator_capture cri(stack.result);
-
-						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
-							return true;
-					}
-
-					return false;
-				}
-				else if (lt == xpath_type_string)
-				{
-					xpath_allocator_capture cr(stack.result);
-
-					xpath_string l = lhs->eval_string(c, stack);
-					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-					{
-						xpath_allocator_capture cri(stack.result);
-
-						if (comp(l, string_value(*ri, stack.result)))
-							return true;
-					}
-
-					return false;
-				}
-			}
-
-			assert(false && "Wrong types"); // unreachable
-			return false;
-		}
-
-		static bool eval_once(xpath_node_set::type_t type, nodeset_eval_t eval)
-		{
-			return type == xpath_node_set::type_sorted ? eval != nodeset_eval_all : eval == nodeset_eval_any;
-		}
-
-		template <class Comp> static bool compare_rel(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
-		{
-			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
-
-			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
-				return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
-			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
-				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
-				{
-					xpath_allocator_capture cri(stack.result);
-
-					double l = convert_string_to_number(string_value(*li, stack.result).c_str());
-
-					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-					{
-						xpath_allocator_capture crii(stack.result);
-
-						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
-							return true;
-					}
-				}
-
-				return false;
-			}
-			else if (lt != xpath_type_node_set && rt == xpath_type_node_set)
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				double l = lhs->eval_number(c, stack);
-				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
-
-				for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
-				{
-					xpath_allocator_capture cri(stack.result);
-
-					if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
-						return true;
-				}
-
-				return false;
-			}
-			else if (lt == xpath_type_node_set && rt != xpath_type_node_set)
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
-				double r = rhs->eval_number(c, stack);
-
-				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
-				{
-					xpath_allocator_capture cri(stack.result);
-
-					if (comp(convert_string_to_number(string_value(*li, stack.result).c_str()), r))
-						return true;
-				}
-
-				return false;
-			}
-			else
-			{
-				assert(false && "Wrong types"); // unreachable
-				return false;
-			}
-		}
-
-		static void apply_predicate_boolean(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
-		{
-			assert(ns.size() >= first);
-			assert(expr->rettype() != xpath_type_number);
-
-			size_t i = 1;
-			size_t size = ns.size() - first;
-
-			xpath_node* last = ns.begin() + first;
-
-			// remove_if... or well, sort of
-			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
-			{
-				xpath_context c(*it, i, size);
-
-				if (expr->eval_boolean(c, stack))
-				{
-					*last++ = *it;
-
-					if (once) break;
-				}
-			}
-
-			ns.truncate(last);
-		}
-
-		static void apply_predicate_number(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
-		{
-			assert(ns.size() >= first);
-			assert(expr->rettype() == xpath_type_number);
-
-			size_t i = 1;
-			size_t size = ns.size() - first;
-
-			xpath_node* last = ns.begin() + first;
-
-			// remove_if... or well, sort of
-			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
-			{
-				xpath_context c(*it, i, size);
-
-				if (expr->eval_number(c, stack) == static_cast<double>(i))
-				{
-					*last++ = *it;
-
-					if (once) break;
-				}
-			}
-
-			ns.truncate(last);
-		}
-
-		static void apply_predicate_number_const(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack)
-		{
-			assert(ns.size() >= first);
-			assert(expr->rettype() == xpath_type_number);
-
-			size_t size = ns.size() - first;
-
-			xpath_node* last = ns.begin() + first;
-
-			xpath_node cn;
-			xpath_context c(cn, 1, size);
-
-			double er = expr->eval_number(c, stack);
-
-			if (er >= 1.0 && er <= static_cast<double>(size))
-			{
-				size_t eri = static_cast<size_t>(er);
-
-				if (er == static_cast<double>(eri))
-				{
-					xpath_node r = last[eri - 1];
-
-					*last++ = r;
-				}
-			}
-
-			ns.truncate(last);
-		}
-
-		void apply_predicate(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, bool once)
-		{
-			if (ns.size() == first) return;
-
-			assert(_type == ast_filter || _type == ast_predicate);
-
-			if (_test == predicate_constant || _test == predicate_constant_one)
-				apply_predicate_number_const(ns, first, _right, stack);
-			else if (_right->rettype() == xpath_type_number)
-				apply_predicate_number(ns, first, _right, stack, once);
-			else
-				apply_predicate_boolean(ns, first, _right, stack, once);
-		}
-
-		void apply_predicates(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, nodeset_eval_t eval)
-		{
-			if (ns.size() == first) return;
-
-			bool last_once = eval_once(ns.type(), eval);
-
-			for (xpath_ast_node* pred = _right; pred; pred = pred->_next)
-				pred->apply_predicate(ns, first, stack, !pred->_next && last_once);
-		}
-
-		bool step_push(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* parent, xpath_allocator* alloc)
-		{
-			assert(a);
-
-			const char_t* name = a->name ? a->name + 0 : PUGIXML_TEXT("");
-
-			switch (_test)
-			{
-			case nodetest_name:
-				if (strequal(name, _data.nodetest) && is_xpath_attribute(name))
-				{
-					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_type_node:
-			case nodetest_all:
-				if (is_xpath_attribute(name))
-				{
-					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_all_in_namespace:
-				if (starts_with(name, _data.nodetest) && is_xpath_attribute(name))
-				{
-					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
-					return true;
-				}
-				break;
-
-			default:
-				;
-			}
-
-			return false;
-		}
-
-		bool step_push(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc)
-		{
-			assert(n);
-
-			xml_node_type type = PUGI_IMPL_NODETYPE(n);
-
-			switch (_test)
-			{
-			case nodetest_name:
-				if (type == node_element && n->name && strequal(n->name, _data.nodetest))
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_type_node:
-				ns.push_back(xml_node(n), alloc);
-				return true;
-
-			case nodetest_type_comment:
-				if (type == node_comment)
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_type_text:
-				if (type == node_pcdata || type == node_cdata)
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_type_pi:
-				if (type == node_pi)
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_pi:
-				if (type == node_pi && n->name && strequal(n->name, _data.nodetest))
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_all:
-				if (type == node_element)
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			case nodetest_all_in_namespace:
-				if (type == node_element && n->name && starts_with(n->name, _data.nodetest))
-				{
-					ns.push_back(xml_node(n), alloc);
-					return true;
-				}
-				break;
-
-			default:
-				assert(false && "Unknown axis"); // unreachable
-			}
-
-			return false;
-		}
-
-		template <class T> void step_fill(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc, bool once, T)
-		{
-			const axis_t axis = T::axis;
-
-			switch (axis)
-			{
-			case axis_attribute:
-			{
-				for (xml_attribute_struct* a = n->first_attribute; a; a = a->next_attribute)
-					if (step_push(ns, a, n, alloc) & once)
-						return;
-
-				break;
-			}
-
-			case axis_child:
-			{
-				for (xml_node_struct* c = n->first_child; c; c = c->next_sibling)
-					if (step_push(ns, c, alloc) & once)
-						return;
-
-				break;
-			}
-
-			case axis_descendant:
-			case axis_descendant_or_self:
-			{
-				if (axis == axis_descendant_or_self)
-					if (step_push(ns, n, alloc) & once)
-						return;
-
-				xml_node_struct* cur = n->first_child;
-
-				while (cur)
-				{
-					if (step_push(ns, cur, alloc) & once)
-						return;
-
-					if (cur->first_child)
-						cur = cur->first_child;
-					else
-					{
-						while (!cur->next_sibling)
-						{
-							cur = cur->parent;
-
-							if (cur == n) return;
-						}
-
-						cur = cur->next_sibling;
-					}
-				}
-
-				break;
-			}
-
-			case axis_following_sibling:
-			{
-				for (xml_node_struct* c = n->next_sibling; c; c = c->next_sibling)
-					if (step_push(ns, c, alloc) & once)
-						return;
-
-				break;
-			}
-
-			case axis_preceding_sibling:
-			{
-				for (xml_node_struct* c = n->prev_sibling_c; c->next_sibling; c = c->prev_sibling_c)
-					if (step_push(ns, c, alloc) & once)
-						return;
-
-				break;
-			}
-
-			case axis_following:
-			{
-				xml_node_struct* cur = n;
-
-				// exit from this node so that we don't include descendants
-				while (!cur->next_sibling)
-				{
-					cur = cur->parent;
-
-					if (!cur) return;
-				}
-
-				cur = cur->next_sibling;
-
-				while (cur)
-				{
-					if (step_push(ns, cur, alloc) & once)
-						return;
-
-					if (cur->first_child)
-						cur = cur->first_child;
-					else
-					{
-						while (!cur->next_sibling)
-						{
-							cur = cur->parent;
-
-							if (!cur) return;
-						}
-
-						cur = cur->next_sibling;
-					}
-				}
-
-				break;
-			}
-
-			case axis_preceding:
-			{
-				xml_node_struct* cur = n;
-
-				// exit from this node so that we don't include descendants
-				while (!cur->prev_sibling_c->next_sibling)
-				{
-					cur = cur->parent;
-
-					if (!cur) return;
-				}
-
-				cur = cur->prev_sibling_c;
-
-				while (cur)
-				{
-					if (cur->first_child)
-						cur = cur->first_child->prev_sibling_c;
-					else
-					{
-						// leaf node, can't be ancestor
-						if (step_push(ns, cur, alloc) & once)
-							return;
-
-						while (!cur->prev_sibling_c->next_sibling)
-						{
-							cur = cur->parent;
-
-							if (!cur) return;
-
-							if (!node_is_ancestor(cur, n))
-								if (step_push(ns, cur, alloc) & once)
-									return;
-						}
-
-						cur = cur->prev_sibling_c;
-					}
-				}
-
-				break;
-			}
-
-			case axis_ancestor:
-			case axis_ancestor_or_self:
-			{
-				if (axis == axis_ancestor_or_self)
-					if (step_push(ns, n, alloc) & once)
-						return;
-
-				xml_node_struct* cur = n->parent;
-
-				while (cur)
-				{
-					if (step_push(ns, cur, alloc) & once)
-						return;
-
-					cur = cur->parent;
-				}
-
-				break;
-			}
-
-			case axis_self:
-			{
-				step_push(ns, n, alloc);
-
-				break;
-			}
-
-			case axis_parent:
-			{
-				if (n->parent)
-					step_push(ns, n->parent, alloc);
-
-				break;
-			}
-
-			default:
-				assert(false && "Unimplemented axis"); // unreachable
-			}
-		}
-
-		template <class T> void step_fill(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* p, xpath_allocator* alloc, bool once, T v)
-		{
-			const axis_t axis = T::axis;
-
-			switch (axis)
-			{
-			case axis_ancestor:
-			case axis_ancestor_or_self:
-			{
-				if (axis == axis_ancestor_or_self && _test == nodetest_type_node) // reject attributes based on principal node type test
-					if (step_push(ns, a, p, alloc) & once)
-						return;
-
-				xml_node_struct* cur = p;
-
-				while (cur)
-				{
-					if (step_push(ns, cur, alloc) & once)
-						return;
-
-					cur = cur->parent;
-				}
-
-				break;
-			}
-
-			case axis_descendant_or_self:
-			case axis_self:
-			{
-				if (_test == nodetest_type_node) // reject attributes based on principal node type test
-					step_push(ns, a, p, alloc);
-
-				break;
-			}
-
-			case axis_following:
-			{
-				xml_node_struct* cur = p;
-
-				while (cur)
-				{
-					if (cur->first_child)
-						cur = cur->first_child;
-					else
-					{
-						while (!cur->next_sibling)
-						{
-							cur = cur->parent;
-
-							if (!cur) return;
-						}
-
-						cur = cur->next_sibling;
-					}
-
-					if (step_push(ns, cur, alloc) & once)
-						return;
-				}
-
-				break;
-			}
-
-			case axis_parent:
-			{
-				step_push(ns, p, alloc);
-
-				break;
-			}
-
-			case axis_preceding:
-			{
-				// preceding:: axis does not include attribute nodes and attribute ancestors (they are the same as parent's ancestors), so we can reuse node preceding
-				step_fill(ns, p, alloc, once, v);
-				break;
-			}
-
-			default:
-				assert(false && "Unimplemented axis"); // unreachable
-			}
-		}
-
-		template <class T> void step_fill(xpath_node_set_raw& ns, const xpath_node& xn, xpath_allocator* alloc, bool once, T v)
-		{
-			const axis_t axis = T::axis;
-			const bool axis_has_attributes = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_descendant_or_self || axis == axis_following || axis == axis_parent || axis == axis_preceding || axis == axis_self);
-
-			if (xn.node())
-				step_fill(ns, xn.node().internal_object(), alloc, once, v);
-			else if (axis_has_attributes && xn.attribute() && xn.parent())
-				step_fill(ns, xn.attribute().internal_object(), xn.parent().internal_object(), alloc, once, v);
-		}
-
-		template <class T> xpath_node_set_raw step_do(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval, T v)
-		{
-			const axis_t axis = T::axis;
-			const bool axis_reverse = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_preceding || axis == axis_preceding_sibling);
-			const xpath_node_set::type_t axis_type = axis_reverse ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
-
-			bool once =
-				(axis == axis_attribute && _test == nodetest_name) ||
-				(!_right && eval_once(axis_type, eval)) ||
-			    // coverity[mixed_enums]
-				(_right && !_right->_next && _right->_test == predicate_constant_one);
-
-			xpath_node_set_raw ns;
-			ns.set_type(axis_type);
-
-			if (_left)
-			{
-				xpath_node_set_raw s = _left->eval_node_set(c, stack, nodeset_eval_all);
-
-				// self axis preserves the original order
-				if (axis == axis_self) ns.set_type(s.type());
-
-				for (const xpath_node* it = s.begin(); it != s.end(); ++it)
-				{
-					size_t size = ns.size();
-
-					// in general, all axes generate elements in a particular order, but there is no order guarantee if axis is applied to two nodes
-					if (axis != axis_self && size != 0) ns.set_type(xpath_node_set::type_unsorted);
-
-					step_fill(ns, *it, stack.result, once, v);
-					if (_right) apply_predicates(ns, size, stack, eval);
-				}
-			}
-			else
-			{
-				step_fill(ns, c.n, stack.result, once, v);
-				if (_right) apply_predicates(ns, 0, stack, eval);
-			}
-
-			// child, attribute and self axes always generate unique set of nodes
-			// for other axis, if the set stayed sorted, it stayed unique because the traversal algorithms do not visit the same node twice
-			if (axis != axis_child && axis != axis_attribute && axis != axis_self && ns.type() == xpath_node_set::type_unsorted)
-				ns.remove_duplicates(stack.temp);
-
-			return ns;
-		}
-
-	public:
-		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, const char_t* value):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
-		{
-			assert(type == ast_string_constant);
-			_data.string = value;
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, double value):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
-		{
-			assert(type == ast_number_constant);
-			_data.number = value;
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_variable* value):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
-		{
-			assert(type == ast_variable);
-			_data.variable = value;
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = 0, xpath_ast_node* right = 0):
-			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(0)
-		{
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents):
-			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(static_cast<char>(axis)), _test(static_cast<char>(test)), _left(left), _right(0), _next(0)
-		{
-			assert(type == ast_step);
-			_data.nodetest = contents;
-		}
-
-		xpath_ast_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test):
-			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(0), _test(static_cast<char>(test)), _left(left), _right(right), _next(0)
-		{
-			assert(type == ast_filter || type == ast_predicate);
-		}
-
-		void set_next(xpath_ast_node* value)
-		{
-			_next = value;
-		}
-
-		void set_right(xpath_ast_node* value)
-		{
-			_right = value;
-		}
-
-		bool eval_boolean(const xpath_context& c, const xpath_stack& stack)
-		{
-			switch (_type)
-			{
-			case ast_op_or:
-				return _left->eval_boolean(c, stack) || _right->eval_boolean(c, stack);
-
-			case ast_op_and:
-				return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack);
-
-			case ast_op_equal:
-				return compare_eq(_left, _right, c, stack, equal_to());
-
-			case ast_op_not_equal:
-				return compare_eq(_left, _right, c, stack, not_equal_to());
-
-			case ast_op_less:
-				return compare_rel(_left, _right, c, stack, less());
-
-			case ast_op_greater:
-				return compare_rel(_right, _left, c, stack, less());
-
-			case ast_op_less_or_equal:
-				return compare_rel(_left, _right, c, stack, less_equal());
-
-			case ast_op_greater_or_equal:
-				return compare_rel(_right, _left, c, stack, less_equal());
-
-			case ast_func_starts_with:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_string lr = _left->eval_string(c, stack);
-				xpath_string rr = _right->eval_string(c, stack);
-
-				return starts_with(lr.c_str(), rr.c_str());
-			}
-
-			case ast_func_contains:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_string lr = _left->eval_string(c, stack);
-				xpath_string rr = _right->eval_string(c, stack);
-
-				return find_substring(lr.c_str(), rr.c_str()) != 0;
-			}
-
-			case ast_func_boolean:
-				return _left->eval_boolean(c, stack);
-
-			case ast_func_not:
-				return !_left->eval_boolean(c, stack);
-
-			case ast_func_true:
-				return true;
-
-			case ast_func_false:
-				return false;
-
-			case ast_func_lang:
-			{
-				if (c.n.attribute()) return false;
-
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_string lang = _left->eval_string(c, stack);
-
-				for (xml_node n = c.n.node(); n; n = n.parent())
-				{
-					xml_attribute a = n.attribute(PUGIXML_TEXT("xml:lang"));
-
-					if (a)
-					{
-						const char_t* value = a.value();
-
-						// strnicmp / strncasecmp is not portable
-						for (const char_t* lit = lang.c_str(); *lit; ++lit)
-						{
-							if (tolower_ascii(*lit) != tolower_ascii(*value)) return false;
-							++value;
-						}
-
-						return *value == 0 || *value == '-';
-					}
-				}
-
-				return false;
-			}
-
-			case ast_opt_compare_attribute:
-			{
-				const char_t* value = (_right->_type == ast_string_constant) ? _right->_data.string : _right->_data.variable->get_string();
-
-				xml_attribute attr = c.n.node().attribute(_left->_data.nodetest);
-
-				return attr && strequal(attr.value(), value) && is_xpath_attribute(attr.name());
-			}
-
-			case ast_variable:
-			{
-				assert(_rettype == _data.variable->type());
-
-				if (_rettype == xpath_type_boolean)
-					return _data.variable->get_boolean();
-
-				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
-				break;
-			}
-
-			default:
-				;
-			}
-
-			// none of the ast types that return the value directly matched, we need to perform type conversion
-			switch (_rettype)
-			{
-			case xpath_type_number:
-				return convert_number_to_boolean(eval_number(c, stack));
-
-			case xpath_type_string:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return !eval_string(c, stack).empty();
-			}
-
-			case xpath_type_node_set:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return !eval_node_set(c, stack, nodeset_eval_any).empty();
-			}
-
-			default:
-				assert(false && "Wrong expression for return type boolean"); // unreachable
-				return false;
-			}
-		}
-
-		double eval_number(const xpath_context& c, const xpath_stack& stack)
-		{
-			switch (_type)
-			{
-			case ast_op_add:
-				return _left->eval_number(c, stack) + _right->eval_number(c, stack);
-
-			case ast_op_subtract:
-				return _left->eval_number(c, stack) - _right->eval_number(c, stack);
-
-			case ast_op_multiply:
-				return _left->eval_number(c, stack) * _right->eval_number(c, stack);
-
-			case ast_op_divide:
-				return _left->eval_number(c, stack) / _right->eval_number(c, stack);
-
-			case ast_op_mod:
-				return fmod(_left->eval_number(c, stack), _right->eval_number(c, stack));
-
-			case ast_op_negate:
-				return -_left->eval_number(c, stack);
-
-			case ast_number_constant:
-				return _data.number;
-
-			case ast_func_last:
-				return static_cast<double>(c.size);
-
-			case ast_func_position:
-				return static_cast<double>(c.position);
-
-			case ast_func_count:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return static_cast<double>(_left->eval_node_set(c, stack, nodeset_eval_all).size());
-			}
-
-			case ast_func_string_length_0:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return static_cast<double>(string_value(c.n, stack.result).length());
-			}
-
-			case ast_func_string_length_1:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return static_cast<double>(_left->eval_string(c, stack).length());
-			}
-
-			case ast_func_number_0:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return convert_string_to_number(string_value(c.n, stack.result).c_str());
-			}
-
-			case ast_func_number_1:
-				return _left->eval_number(c, stack);
-
-			case ast_func_sum:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				double r = 0;
-
-				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_all);
-
-				for (const xpath_node* it = ns.begin(); it != ns.end(); ++it)
-				{
-					xpath_allocator_capture cri(stack.result);
-
-					r += convert_string_to_number(string_value(*it, stack.result).c_str());
-				}
-
-				return r;
-			}
-
-			case ast_func_floor:
-			{
-				double r = _left->eval_number(c, stack);
-
-				return r == r ? floor(r) : r;
-			}
-
-			case ast_func_ceiling:
-			{
-				double r = _left->eval_number(c, stack);
-
-				return r == r ? ceil(r) : r;
-			}
-
-			case ast_func_round:
-				return round_nearest_nzero(_left->eval_number(c, stack));
-
-			case ast_variable:
-			{
-				assert(_rettype == _data.variable->type());
-
-				if (_rettype == xpath_type_number)
-					return _data.variable->get_number();
-
-				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
-				break;
-			}
-
-			default:
-				;
-			}
-
-			// none of the ast types that return the value directly matched, we need to perform type conversion
-			switch (_rettype)
-			{
-			case xpath_type_boolean:
-				return eval_boolean(c, stack) ? 1 : 0;
-
-			case xpath_type_string:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return convert_string_to_number(eval_string(c, stack).c_str());
-			}
-
-			case xpath_type_node_set:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				return convert_string_to_number(eval_string(c, stack).c_str());
-			}
-
-			default:
-				assert(false && "Wrong expression for return type number"); // unreachable
-				return 0;
-			}
-		}
-
-		xpath_string eval_string_concat(const xpath_context& c, const xpath_stack& stack)
-		{
-			assert(_type == ast_func_concat);
-
-			xpath_allocator_capture ct(stack.temp);
-
-			// count the string number
-			size_t count = 1;
-			for (xpath_ast_node* nc = _right; nc; nc = nc->_next) count++;
-
-			// allocate a buffer for temporary string objects
-			xpath_string* buffer = static_cast<xpath_string*>(stack.temp->allocate(count * sizeof(xpath_string)));
-			if (!buffer) return xpath_string();
-
-			// evaluate all strings to temporary stack
-			xpath_stack swapped_stack = {stack.temp, stack.result};
-
-			buffer[0] = _left->eval_string(c, swapped_stack);
-
-			size_t pos = 1;
-			for (xpath_ast_node* n = _right; n; n = n->_next, ++pos) buffer[pos] = n->eval_string(c, swapped_stack);
-			assert(pos == count);
-
-			// get total length
-			size_t length = 0;
-			for (size_t i = 0; i < count; ++i) length += buffer[i].length();
-
-			// create final string
-			char_t* result = static_cast<char_t*>(stack.result->allocate((length + 1) * sizeof(char_t)));
-			if (!result) return xpath_string();
-
-			char_t* ri = result;
-
-			for (size_t j = 0; j < count; ++j)
-				for (const char_t* bi = buffer[j].c_str(); *bi; ++bi)
-					*ri++ = *bi;
-
-			*ri = 0;
-
-			return xpath_string::from_heap_preallocated(result, ri);
-		}
-
-		xpath_string eval_string(const xpath_context& c, const xpath_stack& stack)
-		{
-			switch (_type)
-			{
-			case ast_string_constant:
-				return xpath_string::from_const(_data.string);
-
-			case ast_func_local_name_0:
-			{
-				xpath_node na = c.n;
-
-				return xpath_string::from_const(local_name(na));
-			}
-
-			case ast_func_local_name_1:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
-				xpath_node na = ns.first();
-
-				return xpath_string::from_const(local_name(na));
-			}
-
-			case ast_func_name_0:
-			{
-				xpath_node na = c.n;
-
-				return xpath_string::from_const(qualified_name(na));
-			}
-
-			case ast_func_name_1:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
-				xpath_node na = ns.first();
-
-				return xpath_string::from_const(qualified_name(na));
-			}
-
-			case ast_func_namespace_uri_0:
-			{
-				xpath_node na = c.n;
-
-				return xpath_string::from_const(namespace_uri(na));
-			}
-
-			case ast_func_namespace_uri_1:
-			{
-				xpath_allocator_capture cr(stack.result);
-
-				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
-				xpath_node na = ns.first();
-
-				return xpath_string::from_const(namespace_uri(na));
-			}
-
-			case ast_func_string_0:
-				return string_value(c.n, stack.result);
-
-			case ast_func_string_1:
-				return _left->eval_string(c, stack);
-
-			case ast_func_concat:
-				return eval_string_concat(c, stack);
-
-			case ast_func_substring_before:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, swapped_stack);
-				xpath_string p = _right->eval_string(c, swapped_stack);
-
-				const char_t* pos = find_substring(s.c_str(), p.c_str());
-
-				return pos ? xpath_string::from_heap(s.c_str(), pos, stack.result) : xpath_string();
-			}
-
-			case ast_func_substring_after:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, swapped_stack);
-				xpath_string p = _right->eval_string(c, swapped_stack);
-
-				const char_t* pos = find_substring(s.c_str(), p.c_str());
-				if (!pos) return xpath_string();
-
-				const char_t* rbegin = pos + p.length();
-				const char_t* rend = s.c_str() + s.length();
-
-				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
-			}
-
-			case ast_func_substring_2:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, swapped_stack);
-				size_t s_length = s.length();
-
-				double first = round_nearest(_right->eval_number(c, stack));
-
-				if (is_nan(first)) return xpath_string(); // NaN
-				else if (first >= static_cast<double>(s_length + 1)) return xpath_string();
-
-				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
-				assert(1 <= pos && pos <= s_length + 1);
-
-				const char_t* rbegin = s.c_str() + (pos - 1);
-				const char_t* rend = s.c_str() + s.length();
-
-				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
-			}
-
-			case ast_func_substring_3:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, swapped_stack);
-				size_t s_length = s.length();
-
-				double first = round_nearest(_right->eval_number(c, stack));
-				double last = first + round_nearest(_right->_next->eval_number(c, stack));
-
-				if (is_nan(first) || is_nan(last)) return xpath_string();
-				else if (first >= static_cast<double>(s_length + 1)) return xpath_string();
-				else if (first >= last) return xpath_string();
-				else if (last < 1) return xpath_string();
-
-				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
-				size_t end = last >= static_cast<double>(s_length + 1) ? s_length + 1 : static_cast<size_t>(last);
-
-				assert(1 <= pos && pos <= end && end <= s_length + 1);
-				const char_t* rbegin = s.c_str() + (pos - 1);
-				const char_t* rend = s.c_str() + (end - 1);
-
-				return (end == s_length + 1 && !s.uses_heap()) ? xpath_string::from_const(rbegin) : xpath_string::from_heap(rbegin, rend, stack.result);
-			}
-
-			case ast_func_normalize_space_0:
-			{
-				xpath_string s = string_value(c.n, stack.result);
-
-				char_t* begin = s.data(stack.result);
-				if (!begin) return xpath_string();
-
-				char_t* end = normalize_space(begin);
-
-				return xpath_string::from_heap_preallocated(begin, end);
-			}
-
-			case ast_func_normalize_space_1:
-			{
-				xpath_string s = _left->eval_string(c, stack);
-
-				char_t* begin = s.data(stack.result);
-				if (!begin) return xpath_string();
-
-				char_t* end = normalize_space(begin);
-
-				return xpath_string::from_heap_preallocated(begin, end);
-			}
-
-			case ast_func_translate:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_string s = _left->eval_string(c, stack);
-				xpath_string from = _right->eval_string(c, swapped_stack);
-				xpath_string to = _right->_next->eval_string(c, swapped_stack);
-
-				char_t* begin = s.data(stack.result);
-				if (!begin) return xpath_string();
-
-				char_t* end = translate(begin, from.c_str(), to.c_str(), to.length());
-
-				return xpath_string::from_heap_preallocated(begin, end);
-			}
-
-			case ast_opt_translate_table:
-			{
-				xpath_string s = _left->eval_string(c, stack);
-
-				char_t* begin = s.data(stack.result);
-				if (!begin) return xpath_string();
-
-				char_t* end = translate_table(begin, _data.table);
-
-				return xpath_string::from_heap_preallocated(begin, end);
-			}
-
-			case ast_variable:
-			{
-				assert(_rettype == _data.variable->type());
-
-				if (_rettype == xpath_type_string)
-					return xpath_string::from_const(_data.variable->get_string());
-
-				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
-				break;
-			}
-
-			default:
-				;
-			}
-
-			// none of the ast types that return the value directly matched, we need to perform type conversion
-			switch (_rettype)
-			{
-			case xpath_type_boolean:
-				return xpath_string::from_const(eval_boolean(c, stack) ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"));
-
-			case xpath_type_number:
-				return convert_number_to_string(eval_number(c, stack), stack.result);
-
-			case xpath_type_node_set:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_node_set_raw ns = eval_node_set(c, swapped_stack, nodeset_eval_first);
-				return ns.empty() ? xpath_string() : string_value(ns.first(), stack.result);
-			}
-
-			default:
-				assert(false && "Wrong expression for return type string"); // unreachable
-				return xpath_string();
-			}
-		}
-
-		xpath_node_set_raw eval_node_set(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval)
-		{
-			switch (_type)
-			{
-			case ast_op_union:
-			{
-				xpath_allocator_capture cr(stack.temp);
-
-				xpath_stack swapped_stack = {stack.temp, stack.result};
-
-				xpath_node_set_raw ls = _left->eval_node_set(c, stack, eval);
-				xpath_node_set_raw rs = _right->eval_node_set(c, swapped_stack, eval);
-
-				// we can optimize merging two sorted sets, but this is a very rare operation, so don't bother
-				ls.set_type(xpath_node_set::type_unsorted);
-
-				ls.append(rs.begin(), rs.end(), stack.result);
-				ls.remove_duplicates(stack.temp);
-
-				return ls;
-			}
-
-			case ast_filter:
-			{
-				xpath_node_set_raw set = _left->eval_node_set(c, stack, _test == predicate_constant_one ? nodeset_eval_first : nodeset_eval_all);
-
-				// either expression is a number or it contains position() call; sort by document order
-				if (_test != predicate_posinv) set.sort_do();
-
-				bool once = eval_once(set.type(), eval);
-
-				apply_predicate(set, 0, stack, once);
-
-				return set;
-			}
-
-			case ast_func_id:
-				return xpath_node_set_raw();
-
-			case ast_step:
-			{
-				switch (_axis)
-				{
-				case axis_ancestor:
-					return step_do(c, stack, eval, axis_to_type<axis_ancestor>());
-
-				case axis_ancestor_or_self:
-					return step_do(c, stack, eval, axis_to_type<axis_ancestor_or_self>());
-
-				case axis_attribute:
-					return step_do(c, stack, eval, axis_to_type<axis_attribute>());
-
-				case axis_child:
-					return step_do(c, stack, eval, axis_to_type<axis_child>());
-
-				case axis_descendant:
-					return step_do(c, stack, eval, axis_to_type<axis_descendant>());
-
-				case axis_descendant_or_self:
-					return step_do(c, stack, eval, axis_to_type<axis_descendant_or_self>());
-
-				case axis_following:
-					return step_do(c, stack, eval, axis_to_type<axis_following>());
-
-				case axis_following_sibling:
-					return step_do(c, stack, eval, axis_to_type<axis_following_sibling>());
-
-				case axis_namespace:
-					// namespaced axis is not supported
-					return xpath_node_set_raw();
-
-				case axis_parent:
-					return step_do(c, stack, eval, axis_to_type<axis_parent>());
-
-				case axis_preceding:
-					return step_do(c, stack, eval, axis_to_type<axis_preceding>());
-
-				case axis_preceding_sibling:
-					return step_do(c, stack, eval, axis_to_type<axis_preceding_sibling>());
-
-				case axis_self:
-					return step_do(c, stack, eval, axis_to_type<axis_self>());
-
-				default:
-					assert(false && "Unknown axis"); // unreachable
-					return xpath_node_set_raw();
-				}
-			}
-
-			case ast_step_root:
-			{
-				assert(!_right); // root step can't have any predicates
-
-				xpath_node_set_raw ns;
-
-				ns.set_type(xpath_node_set::type_sorted);
-
-				if (c.n.node()) ns.push_back(c.n.node().root(), stack.result);
-				else if (c.n.attribute()) ns.push_back(c.n.parent().root(), stack.result);
-
-				return ns;
-			}
-
-			case ast_variable:
-			{
-				assert(_rettype == _data.variable->type());
-
-				if (_rettype == xpath_type_node_set)
-				{
-					const xpath_node_set& s = _data.variable->get_node_set();
-
-					xpath_node_set_raw ns;
-
-					ns.set_type(s.type());
-					ns.append(s.begin(), s.end(), stack.result);
-
-					return ns;
-				}
-
-				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
-				break;
-			}
-
-			default:
-				;
-			}
-
-			// none of the ast types that return the value directly matched, but conversions to node set are invalid
-			assert(false && "Wrong expression for return type node set"); // unreachable
-			return xpath_node_set_raw();
-		}
-
-		void optimize(xpath_allocator* alloc)
-		{
-			if (_left)
-				_left->optimize(alloc);
-
-			if (_right)
-				_right->optimize(alloc);
-
-			if (_next)
-				_next->optimize(alloc);
-
-			// coverity[var_deref_model]
-			optimize_self(alloc);
-		}
-
-		void optimize_self(xpath_allocator* alloc)
-		{
-			// Rewrite [position()=expr] with [expr]
-			// Note that this step has to go before classification to recognize [position()=1]
-			if ((_type == ast_filter || _type == ast_predicate) &&
-				_right && // workaround for clang static analyzer (_right is never null for ast_filter/ast_predicate)
-				_right->_type == ast_op_equal && _right->_left->_type == ast_func_position && _right->_right->_rettype == xpath_type_number)
-			{
-				_right = _right->_right;
-			}
-
-			// Classify filter/predicate ops to perform various optimizations during evaluation
-			if ((_type == ast_filter || _type == ast_predicate) && _right) // workaround for clang static analyzer (_right is never null for ast_filter/ast_predicate)
-			{
-				assert(_test == predicate_default);
-
-				if (_right->_type == ast_number_constant && _right->_data.number == 1.0)
-					_test = predicate_constant_one;
-				else if (_right->_rettype == xpath_type_number && (_right->_type == ast_number_constant || _right->_type == ast_variable || _right->_type == ast_func_last))
-					_test = predicate_constant;
-				else if (_right->_rettype != xpath_type_number && _right->is_posinv_expr())
-					_test = predicate_posinv;
-			}
-
-			// Rewrite descendant-or-self::node()/child::foo with descendant::foo
-			// The former is a full form of //foo, the latter is much faster since it executes the node test immediately
-			// Do a similar kind of rewrite for self/descendant/descendant-or-self axes
-			// Note that we only rewrite positionally invariant steps (//foo[1] != /descendant::foo[1])
-			if (_type == ast_step && (_axis == axis_child || _axis == axis_self || _axis == axis_descendant || _axis == axis_descendant_or_self) &&
-				_left && _left->_type == ast_step && _left->_axis == axis_descendant_or_self && _left->_test == nodetest_type_node && !_left->_right &&
-				is_posinv_step())
-			{
-				if (_axis == axis_child || _axis == axis_descendant)
-					_axis = axis_descendant;
-				else
-					_axis = axis_descendant_or_self;
-
-				_left = _left->_left;
-			}
-
-			// Use optimized lookup table implementation for translate() with constant arguments
-			if (_type == ast_func_translate &&
-				_right && // workaround for clang static analyzer (_right is never null for ast_func_translate)
-				_right->_type == ast_string_constant && _right->_next->_type == ast_string_constant)
-			{
-				unsigned char* table = translate_table_generate(alloc, _right->_data.string, _right->_next->_data.string);
-
-				if (table)
-				{
-					_type = ast_opt_translate_table;
-					_data.table = table;
-				}
-			}
-
-			// Use optimized path for @attr = 'value' or @attr = $value
-			if (_type == ast_op_equal &&
-				_left && _right && // workaround for clang static analyzer and Coverity (_left and _right are never null for ast_op_equal)
-                // coverity[mixed_enums]
-				_left->_type == ast_step && _left->_axis == axis_attribute && _left->_test == nodetest_name && !_left->_left && !_left->_right &&
-				(_right->_type == ast_string_constant || (_right->_type == ast_variable && _right->_rettype == xpath_type_string)))
-			{
-				_type = ast_opt_compare_attribute;
-			}
-		}
-
-		bool is_posinv_expr() const
-		{
-			switch (_type)
-			{
-			case ast_func_position:
-			case ast_func_last:
-				return false;
-
-			case ast_string_constant:
-			case ast_number_constant:
-			case ast_variable:
-				return true;
-
-			case ast_step:
-			case ast_step_root:
-				return true;
-
-			case ast_predicate:
-			case ast_filter:
-				return true;
-
-			default:
-				if (_left && !_left->is_posinv_expr()) return false;
-
-				for (xpath_ast_node* n = _right; n; n = n->_next)
-					if (!n->is_posinv_expr()) return false;
-
-				return true;
-			}
-		}
-
-		bool is_posinv_step() const
-		{
-			assert(_type == ast_step);
-
-			for (xpath_ast_node* n = _right; n; n = n->_next)
-			{
-				assert(n->_type == ast_predicate);
-
-				if (n->_test != predicate_posinv)
-					return false;
-			}
-
-			return true;
-		}
-
-		xpath_value_type rettype() const
-		{
-			return static_cast<xpath_value_type>(_rettype);
-		}
-	};
-
-	static const size_t xpath_ast_depth_limit =
-	#ifdef PUGIXML_XPATH_DEPTH_LIMIT
-		PUGIXML_XPATH_DEPTH_LIMIT
-	#else
-		1024
-	#endif
-		;
-
-	struct xpath_parser
-	{
-		xpath_allocator* _alloc;
-		xpath_lexer _lexer;
-
-		const char_t* _query;
-		xpath_variable_set* _variables;
-
-		xpath_parse_result* _result;
-
-		char_t _scratch[32];
-
-		size_t _depth;
-
-		xpath_ast_node* error(const char* message)
-		{
-			_result->error = message;
-			_result->offset = _lexer.current_pos() - _query;
-
-			return 0;
-		}
-
-		xpath_ast_node* error_oom()
-		{
-			assert(_alloc->_error);
-			*_alloc->_error = true;
-
-			return 0;
-		}
-
-		xpath_ast_node* error_rec()
-		{
-			return error("Exceeded maximum allowed query depth");
-		}
-
-		void* alloc_node()
-		{
-			return _alloc->allocate(sizeof(xpath_ast_node));
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, const char_t* value)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, double value)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_variable* value)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_ast_node* left = 0, xpath_ast_node* right = 0)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, rettype, left, right) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, left, axis, test, contents) : 0;
-		}
-
-		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test)
-		{
-			void* memory = alloc_node();
-			return memory ? new (memory) xpath_ast_node(type, left, right, test) : 0;
-		}
-
-		const char_t* alloc_string(const xpath_lexer_string& value)
-		{
-			if (!value.begin)
-				return PUGIXML_TEXT("");
-
-			size_t length = static_cast<size_t>(value.end - value.begin);
-
-			char_t* c = static_cast<char_t*>(_alloc->allocate((length + 1) * sizeof(char_t)));
-			if (!c) return 0;
-
-			memcpy(c, value.begin, length * sizeof(char_t));
-			c[length] = 0;
-
-			return c;
-		}
-
-		xpath_ast_node* parse_function(const xpath_lexer_string& name, size_t argc, xpath_ast_node* args[2])
-		{
-			switch (name.begin[0])
-			{
-			case 'b':
-				if (name == PUGIXML_TEXT("boolean") && argc == 1)
-					return alloc_node(ast_func_boolean, xpath_type_boolean, args[0]);
-
-				break;
-
-			case 'c':
-				if (name == PUGIXML_TEXT("count") && argc == 1)
-				{
-					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(ast_func_count, xpath_type_number, args[0]);
-				}
-				else if (name == PUGIXML_TEXT("contains") && argc == 2)
-					return alloc_node(ast_func_contains, xpath_type_boolean, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("concat") && argc >= 2)
-					return alloc_node(ast_func_concat, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("ceiling") && argc == 1)
-					return alloc_node(ast_func_ceiling, xpath_type_number, args[0]);
-
-				break;
-
-			case 'f':
-				if (name == PUGIXML_TEXT("false") && argc == 0)
-					return alloc_node(ast_func_false, xpath_type_boolean);
-				else if (name == PUGIXML_TEXT("floor") && argc == 1)
-					return alloc_node(ast_func_floor, xpath_type_number, args[0]);
-
-				break;
-
-			case 'i':
-				if (name == PUGIXML_TEXT("id") && argc == 1)
-					return alloc_node(ast_func_id, xpath_type_node_set, args[0]);
-
-				break;
-
-			case 'l':
-				if (name == PUGIXML_TEXT("last") && argc == 0)
-					return alloc_node(ast_func_last, xpath_type_number);
-				else if (name == PUGIXML_TEXT("lang") && argc == 1)
-					return alloc_node(ast_func_lang, xpath_type_boolean, args[0]);
-				else if (name == PUGIXML_TEXT("local-name") && argc <= 1)
-				{
-					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(argc == 0 ? ast_func_local_name_0 : ast_func_local_name_1, xpath_type_string, args[0]);
-				}
-
-				break;
-
-			case 'n':
-				if (name == PUGIXML_TEXT("name") && argc <= 1)
-				{
-					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(argc == 0 ? ast_func_name_0 : ast_func_name_1, xpath_type_string, args[0]);
-				}
-				else if (name == PUGIXML_TEXT("namespace-uri") && argc <= 1)
-				{
-					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(argc == 0 ? ast_func_namespace_uri_0 : ast_func_namespace_uri_1, xpath_type_string, args[0]);
-				}
-				else if (name == PUGIXML_TEXT("normalize-space") && argc <= 1)
-					return alloc_node(argc == 0 ? ast_func_normalize_space_0 : ast_func_normalize_space_1, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("not") && argc == 1)
-					return alloc_node(ast_func_not, xpath_type_boolean, args[0]);
-				else if (name == PUGIXML_TEXT("number") && argc <= 1)
-					return alloc_node(argc == 0 ? ast_func_number_0 : ast_func_number_1, xpath_type_number, args[0]);
-
-				break;
-
-			case 'p':
-				if (name == PUGIXML_TEXT("position") && argc == 0)
-					return alloc_node(ast_func_position, xpath_type_number);
-
-				break;
-
-			case 'r':
-				if (name == PUGIXML_TEXT("round") && argc == 1)
-					return alloc_node(ast_func_round, xpath_type_number, args[0]);
-
-				break;
-
-			case 's':
-				if (name == PUGIXML_TEXT("string") && argc <= 1)
-					return alloc_node(argc == 0 ? ast_func_string_0 : ast_func_string_1, xpath_type_string, args[0]);
-				else if (name == PUGIXML_TEXT("string-length") && argc <= 1)
-					return alloc_node(argc == 0 ? ast_func_string_length_0 : ast_func_string_length_1, xpath_type_number, args[0]);
-				else if (name == PUGIXML_TEXT("starts-with") && argc == 2)
-					return alloc_node(ast_func_starts_with, xpath_type_boolean, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("substring-before") && argc == 2)
-					return alloc_node(ast_func_substring_before, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("substring-after") && argc == 2)
-					return alloc_node(ast_func_substring_after, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("substring") && (argc == 2 || argc == 3))
-					return alloc_node(argc == 2 ? ast_func_substring_2 : ast_func_substring_3, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("sum") && argc == 1)
-				{
-					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
-					return alloc_node(ast_func_sum, xpath_type_number, args[0]);
-				}
-
-				break;
-
-			case 't':
-				if (name == PUGIXML_TEXT("translate") && argc == 3)
-					return alloc_node(ast_func_translate, xpath_type_string, args[0], args[1]);
-				else if (name == PUGIXML_TEXT("true") && argc == 0)
-					return alloc_node(ast_func_true, xpath_type_boolean);
-
-				break;
-
-			default:
-				break;
-			}
-
-			return error("Unrecognized function or wrong parameter count");
-		}
-
-		axis_t parse_axis_name(const xpath_lexer_string& name, bool& specified)
-		{
-			specified = true;
-
-			switch (name.begin[0])
-			{
-			case 'a':
-				if (name == PUGIXML_TEXT("ancestor"))
-					return axis_ancestor;
-				else if (name == PUGIXML_TEXT("ancestor-or-self"))
-					return axis_ancestor_or_self;
-				else if (name == PUGIXML_TEXT("attribute"))
-					return axis_attribute;
-
-				break;
-
-			case 'c':
-				if (name == PUGIXML_TEXT("child"))
-					return axis_child;
-
-				break;
-
-			case 'd':
-				if (name == PUGIXML_TEXT("descendant"))
-					return axis_descendant;
-				else if (name == PUGIXML_TEXT("descendant-or-self"))
-					return axis_descendant_or_self;
-
-				break;
-
-			case 'f':
-				if (name == PUGIXML_TEXT("following"))
-					return axis_following;
-				else if (name == PUGIXML_TEXT("following-sibling"))
-					return axis_following_sibling;
-
-				break;
-
-			case 'n':
-				if (name == PUGIXML_TEXT("namespace"))
-					return axis_namespace;
-
-				break;
-
-			case 'p':
-				if (name == PUGIXML_TEXT("parent"))
-					return axis_parent;
-				else if (name == PUGIXML_TEXT("preceding"))
-					return axis_preceding;
-				else if (name == PUGIXML_TEXT("preceding-sibling"))
-					return axis_preceding_sibling;
-
-				break;
-
-			case 's':
-				if (name == PUGIXML_TEXT("self"))
-					return axis_self;
-
-				break;
-
-			default:
-				break;
-			}
-
-			specified = false;
-			return axis_child;
-		}
-
-		nodetest_t parse_node_test_type(const xpath_lexer_string& name)
-		{
-			switch (name.begin[0])
-			{
-			case 'c':
-				if (name == PUGIXML_TEXT("comment"))
-					return nodetest_type_comment;
-
-				break;
-
-			case 'n':
-				if (name == PUGIXML_TEXT("node"))
-					return nodetest_type_node;
-
-				break;
-
-			case 'p':
-				if (name == PUGIXML_TEXT("processing-instruction"))
-					return nodetest_type_pi;
-
-				break;
-
-			case 't':
-				if (name == PUGIXML_TEXT("text"))
-					return nodetest_type_text;
-
-				break;
-
-			default:
-				break;
-			}
-
-			return nodetest_none;
-		}
-
-		// PrimaryExpr ::= VariableReference | '(' Expr ')' | Literal | Number | FunctionCall
-		xpath_ast_node* parse_primary_expression()
-		{
-			switch (_lexer.current())
-			{
-			case lex_var_ref:
-			{
-				xpath_lexer_string name = _lexer.contents();
-
-				if (!_variables)
-					return error("Unknown variable: variable set is not provided");
-
-				xpath_variable* var = 0;
-				if (!get_variable_scratch(_scratch, _variables, name.begin, name.end, &var))
-					return error_oom();
-
-				if (!var)
-					return error("Unknown variable: variable set does not contain the given name");
-
-				_lexer.next();
-
-				return alloc_node(ast_variable, var->type(), var);
-			}
-
-			case lex_open_brace:
-			{
-				_lexer.next();
-
-				xpath_ast_node* n = parse_expression();
-				if (!n) return 0;
-
-				if (_lexer.current() != lex_close_brace)
-					return error("Expected ')' to match an opening '('");
-
-				_lexer.next();
-
-				return n;
-			}
-
-			case lex_quoted_string:
-			{
-				const char_t* value = alloc_string(_lexer.contents());
-				if (!value) return 0;
-
-				_lexer.next();
-
-				return alloc_node(ast_string_constant, xpath_type_string, value);
-			}
-
-			case lex_number:
-			{
-				double value = 0;
-
-				if (!convert_string_to_number_scratch(_scratch, _lexer.contents().begin, _lexer.contents().end, &value))
-					return error_oom();
-
-				_lexer.next();
-
-				return alloc_node(ast_number_constant, xpath_type_number, value);
-			}
-
-			case lex_string:
-			{
-				xpath_ast_node* args[2] = {0};
-				size_t argc = 0;
-
-				xpath_lexer_string function = _lexer.contents();
-				_lexer.next();
-
-				xpath_ast_node* last_arg = 0;
-
-				if (_lexer.current() != lex_open_brace)
-					return error("Unrecognized function call");
-				_lexer.next();
-
-				size_t old_depth = _depth;
-
-				while (_lexer.current() != lex_close_brace)
-				{
-					if (argc > 0)
-					{
-						if (_lexer.current() != lex_comma)
-							return error("No comma between function arguments");
-						_lexer.next();
-					}
-
-					if (++_depth > xpath_ast_depth_limit)
-						return error_rec();
-
-					xpath_ast_node* n = parse_expression();
-					if (!n) return 0;
-
-					if (argc < 2) args[argc] = n;
-					else last_arg->set_next(n);
-
-					argc++;
-					last_arg = n;
-				}
-
-				_lexer.next();
-
-				_depth = old_depth;
-
-				return parse_function(function, argc, args);
-			}
-
-			default:
-				return error("Unrecognizable primary expression");
-			}
-		}
-
-		// FilterExpr ::= PrimaryExpr | FilterExpr Predicate
-		// Predicate ::= '[' PredicateExpr ']'
-		// PredicateExpr ::= Expr
-		xpath_ast_node* parse_filter_expression()
-		{
-			xpath_ast_node* n = parse_primary_expression();
-			if (!n) return 0;
-
-			size_t old_depth = _depth;
-
-			while (_lexer.current() == lex_open_square_brace)
-			{
-				_lexer.next();
-
-				if (++_depth > xpath_ast_depth_limit)
-					return error_rec();
-
-				if (n->rettype() != xpath_type_node_set)
-					return error("Predicate has to be applied to node set");
-
-				xpath_ast_node* expr = parse_expression();
-				if (!expr) return 0;
-
-				n = alloc_node(ast_filter, n, expr, predicate_default);
-				if (!n) return 0;
-
-				if (_lexer.current() != lex_close_square_brace)
-					return error("Expected ']' to match an opening '['");
-
-				_lexer.next();
-			}
-
-			_depth = old_depth;
-
-			return n;
-		}
-
-		// Step ::= AxisSpecifier NodeTest Predicate* | AbbreviatedStep
-		// AxisSpecifier ::= AxisName '::' | '@'?
-		// NodeTest ::= NameTest | NodeType '(' ')' | 'processing-instruction' '(' Literal ')'
-		// NameTest ::= '*' | NCName ':' '*' | QName
-		// AbbreviatedStep ::= '.' | '..'
-		xpath_ast_node* parse_step(xpath_ast_node* set)
-		{
-			if (set && set->rettype() != xpath_type_node_set)
-				return error("Step has to be applied to node set");
-
-			bool axis_specified = false;
-			axis_t axis = axis_child; // implied child axis
-
-			if (_lexer.current() == lex_axis_attribute)
-			{
-				axis = axis_attribute;
-				axis_specified = true;
-
-				_lexer.next();
-			}
-			else if (_lexer.current() == lex_dot)
-			{
-				_lexer.next();
-
-				if (_lexer.current() == lex_open_square_brace)
-					return error("Predicates are not allowed after an abbreviated step");
-
-				return alloc_node(ast_step, set, axis_self, nodetest_type_node, 0);
-			}
-			else if (_lexer.current() == lex_double_dot)
-			{
-				_lexer.next();
-
-				if (_lexer.current() == lex_open_square_brace)
-					return error("Predicates are not allowed after an abbreviated step");
-
-				return alloc_node(ast_step, set, axis_parent, nodetest_type_node, 0);
-			}
-
-			nodetest_t nt_type = nodetest_none;
-			xpath_lexer_string nt_name;
-
-			if (_lexer.current() == lex_string)
-			{
-				// node name test
-				nt_name = _lexer.contents();
-				_lexer.next();
-
-				// was it an axis name?
-				if (_lexer.current() == lex_double_colon)
-				{
-					// parse axis name
-					if (axis_specified)
-						return error("Two axis specifiers in one step");
-
-					axis = parse_axis_name(nt_name, axis_specified);
-
-					if (!axis_specified)
-						return error("Unknown axis");
-
-					// read actual node test
-					_lexer.next();
-
-					if (_lexer.current() == lex_multiply)
-					{
-						nt_type = nodetest_all;
-						nt_name = xpath_lexer_string();
-						_lexer.next();
-					}
-					else if (_lexer.current() == lex_string)
-					{
-						nt_name = _lexer.contents();
-						_lexer.next();
-					}
-					else
-					{
-						return error("Unrecognized node test");
-					}
-				}
-
-				if (nt_type == nodetest_none)
-				{
-					// node type test or processing-instruction
-					if (_lexer.current() == lex_open_brace)
-					{
-						_lexer.next();
-
-						if (_lexer.current() == lex_close_brace)
-						{
-							_lexer.next();
-
-							nt_type = parse_node_test_type(nt_name);
-
-							if (nt_type == nodetest_none)
-								return error("Unrecognized node type");
-
-							nt_name = xpath_lexer_string();
-						}
-						else if (nt_name == PUGIXML_TEXT("processing-instruction"))
-						{
-							if (_lexer.current() != lex_quoted_string)
-								return error("Only literals are allowed as arguments to processing-instruction()");
-
-							nt_type = nodetest_pi;
-							nt_name = _lexer.contents();
-							_lexer.next();
-
-							if (_lexer.current() != lex_close_brace)
-								return error("Unmatched brace near processing-instruction()");
-							_lexer.next();
-						}
-						else
-						{
-							return error("Unmatched brace near node type test");
-						}
-					}
-					// QName or NCName:*
-					else
-					{
-						if (nt_name.end - nt_name.begin > 2 && nt_name.end[-2] == ':' && nt_name.end[-1] == '*') // NCName:*
-						{
-							nt_name.end--; // erase *
-
-							nt_type = nodetest_all_in_namespace;
-						}
-						else
-						{
-							nt_type = nodetest_name;
-						}
-					}
-				}
-			}
-			else if (_lexer.current() == lex_multiply)
-			{
-				nt_type = nodetest_all;
-				_lexer.next();
-			}
-			else
-			{
-				return error("Unrecognized node test");
-			}
-
-			const char_t* nt_name_copy = alloc_string(nt_name);
-			if (!nt_name_copy) return 0;
-
-			xpath_ast_node* n = alloc_node(ast_step, set, axis, nt_type, nt_name_copy);
-			if (!n) return 0;
-
-			size_t old_depth = _depth;
-
-			xpath_ast_node* last = 0;
-
-			while (_lexer.current() == lex_open_square_brace)
-			{
-				_lexer.next();
-
-				if (++_depth > xpath_ast_depth_limit)
-					return error_rec();
-
-				xpath_ast_node* expr = parse_expression();
-				if (!expr) return 0;
-
-				xpath_ast_node* pred = alloc_node(ast_predicate, 0, expr, predicate_default);
-				if (!pred) return 0;
-
-				if (_lexer.current() != lex_close_square_brace)
-					return error("Expected ']' to match an opening '['");
-				_lexer.next();
-
-				if (last) last->set_next(pred);
-				else n->set_right(pred);
-
-				last = pred;
-			}
-
-			_depth = old_depth;
-
-			return n;
-		}
-
-		// RelativeLocationPath ::= Step | RelativeLocationPath '/' Step | RelativeLocationPath '//' Step
-		xpath_ast_node* parse_relative_location_path(xpath_ast_node* set)
-		{
-			xpath_ast_node* n = parse_step(set);
-			if (!n) return 0;
-
-			size_t old_depth = _depth;
-
-			while (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
-			{
-				lexeme_t l = _lexer.current();
-				_lexer.next();
-
-				if (l == lex_double_slash)
-				{
-					n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
-					if (!n) return 0;
-
-					++_depth;
-				}
-
-				if (++_depth > xpath_ast_depth_limit)
-					return error_rec();
-
-				n = parse_step(n);
-				if (!n) return 0;
-			}
-
-			_depth = old_depth;
-
-			return n;
-		}
-
-		// LocationPath ::= RelativeLocationPath | AbsoluteLocationPath
-		// AbsoluteLocationPath ::= '/' RelativeLocationPath? | '//' RelativeLocationPath
-		xpath_ast_node* parse_location_path()
-		{
-			if (_lexer.current() == lex_slash)
-			{
-				_lexer.next();
-
-				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
-				if (!n) return 0;
-
-				// relative location path can start from axis_attribute, dot, double_dot, multiply and string lexemes; any other lexeme means standalone root path
-				lexeme_t l = _lexer.current();
-
-				if (l == lex_string || l == lex_axis_attribute || l == lex_dot || l == lex_double_dot || l == lex_multiply)
-					return parse_relative_location_path(n);
-				else
-					return n;
-			}
-			else if (_lexer.current() == lex_double_slash)
-			{
-				_lexer.next();
-
-				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
-				if (!n) return 0;
-
-				n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
-				if (!n) return 0;
-
-				return parse_relative_location_path(n);
-			}
-
-			// else clause moved outside of if because of bogus warning 'control may reach end of non-void function being inlined' in gcc 4.0.1
-			return parse_relative_location_path(0);
-		}
-
-		// PathExpr ::= LocationPath
-		//				| FilterExpr
-		//				| FilterExpr '/' RelativeLocationPath
-		//				| FilterExpr '//' RelativeLocationPath
-		// UnionExpr ::= PathExpr | UnionExpr '|' PathExpr
-		// UnaryExpr ::= UnionExpr | '-' UnaryExpr
-		xpath_ast_node* parse_path_or_unary_expression()
-		{
-			// Clarification.
-			// PathExpr begins with either LocationPath or FilterExpr.
-			// FilterExpr begins with PrimaryExpr
-			// PrimaryExpr begins with '$' in case of it being a variable reference,
-			// '(' in case of it being an expression, string literal, number constant or
-			// function call.
-			if (_lexer.current() == lex_var_ref || _lexer.current() == lex_open_brace ||
-				_lexer.current() == lex_quoted_string || _lexer.current() == lex_number ||
-				_lexer.current() == lex_string)
-			{
-				if (_lexer.current() == lex_string)
-				{
-					// This is either a function call, or not - if not, we shall proceed with location path
-					const char_t* state = _lexer.state();
-
-					while (PUGI_IMPL_IS_CHARTYPE(*state, ct_space)) ++state;
-
-					if (*state != '(')
-						return parse_location_path();
-
-					// This looks like a function call; however this still can be a node-test. Check it.
-					if (parse_node_test_type(_lexer.contents()) != nodetest_none)
-						return parse_location_path();
-				}
-
-				xpath_ast_node* n = parse_filter_expression();
-				if (!n) return 0;
-
-				if (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
-				{
-					lexeme_t l = _lexer.current();
-					_lexer.next();
-
-					if (l == lex_double_slash)
-					{
-						if (n->rettype() != xpath_type_node_set)
-							return error("Step has to be applied to node set");
-
-						n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
-						if (!n) return 0;
-					}
-
-					// select from location path
-					return parse_relative_location_path(n);
-				}
-
-				return n;
-			}
-			else if (_lexer.current() == lex_minus)
-			{
-				_lexer.next();
-
-				// precedence 7+ - only parses union expressions
-				xpath_ast_node* n = parse_expression(7);
-				if (!n) return 0;
-
-				return alloc_node(ast_op_negate, xpath_type_number, n);
-			}
-			else
-			{
-				return parse_location_path();
-			}
-		}
-
-		struct binary_op_t
-		{
-			ast_type_t asttype;
-			xpath_value_type rettype;
-			int precedence;
-
-			binary_op_t(): asttype(ast_unknown), rettype(xpath_type_none), precedence(0)
-			{
-			}
-
-			binary_op_t(ast_type_t asttype_, xpath_value_type rettype_, int precedence_): asttype(asttype_), rettype(rettype_), precedence(precedence_)
-			{
-			}
-
-			static binary_op_t parse(xpath_lexer& lexer)
-			{
-				switch (lexer.current())
-				{
-				case lex_string:
-					if (lexer.contents() == PUGIXML_TEXT("or"))
-						return binary_op_t(ast_op_or, xpath_type_boolean, 1);
-					else if (lexer.contents() == PUGIXML_TEXT("and"))
-						return binary_op_t(ast_op_and, xpath_type_boolean, 2);
-					else if (lexer.contents() == PUGIXML_TEXT("div"))
-						return binary_op_t(ast_op_divide, xpath_type_number, 6);
-					else if (lexer.contents() == PUGIXML_TEXT("mod"))
-						return binary_op_t(ast_op_mod, xpath_type_number, 6);
-					else
-						return binary_op_t();
-
-				case lex_equal:
-					return binary_op_t(ast_op_equal, xpath_type_boolean, 3);
-
-				case lex_not_equal:
-					return binary_op_t(ast_op_not_equal, xpath_type_boolean, 3);
-
-				case lex_less:
-					return binary_op_t(ast_op_less, xpath_type_boolean, 4);
-
-				case lex_greater:
-					return binary_op_t(ast_op_greater, xpath_type_boolean, 4);
-
-				case lex_less_or_equal:
-					return binary_op_t(ast_op_less_or_equal, xpath_type_boolean, 4);
-
-				case lex_greater_or_equal:
-					return binary_op_t(ast_op_greater_or_equal, xpath_type_boolean, 4);
-
-				case lex_plus:
-					return binary_op_t(ast_op_add, xpath_type_number, 5);
-
-				case lex_minus:
-					return binary_op_t(ast_op_subtract, xpath_type_number, 5);
-
-				case lex_multiply:
-					return binary_op_t(ast_op_multiply, xpath_type_number, 6);
-
-				case lex_union:
-					return binary_op_t(ast_op_union, xpath_type_node_set, 7);
-
-				default:
-					return binary_op_t();
-				}
-			}
-		};
-
-		xpath_ast_node* parse_expression_rec(xpath_ast_node* lhs, int limit)
-		{
-			binary_op_t op = binary_op_t::parse(_lexer);
-
-			while (op.asttype != ast_unknown && op.precedence >= limit)
-			{
-				_lexer.next();
-
-				if (++_depth > xpath_ast_depth_limit)
-					return error_rec();
-
-				xpath_ast_node* rhs = parse_path_or_unary_expression();
-				if (!rhs) return 0;
-
-				binary_op_t nextop = binary_op_t::parse(_lexer);
-
-				while (nextop.asttype != ast_unknown && nextop.precedence > op.precedence)
-				{
-					rhs = parse_expression_rec(rhs, nextop.precedence);
-					if (!rhs) return 0;
-
-					nextop = binary_op_t::parse(_lexer);
-				}
-
-				if (op.asttype == ast_op_union && (lhs->rettype() != xpath_type_node_set || rhs->rettype() != xpath_type_node_set))
-					return error("Union operator has to be applied to node sets");
-
-				lhs = alloc_node(op.asttype, op.rettype, lhs, rhs);
-				if (!lhs) return 0;
-
-				op = binary_op_t::parse(_lexer);
-			}
-
-			return lhs;
-		}
-
-		// Expr ::= OrExpr
-		// OrExpr ::= AndExpr | OrExpr 'or' AndExpr
-		// AndExpr ::= EqualityExpr | AndExpr 'and' EqualityExpr
-		// EqualityExpr ::= RelationalExpr
-		//					| EqualityExpr '=' RelationalExpr
-		//					| EqualityExpr '!=' RelationalExpr
-		// RelationalExpr ::= AdditiveExpr
-		//					  | RelationalExpr '<' AdditiveExpr
-		//					  | RelationalExpr '>' AdditiveExpr
-		//					  | RelationalExpr '<=' AdditiveExpr
-		//					  | RelationalExpr '>=' AdditiveExpr
-		// AdditiveExpr ::= MultiplicativeExpr
-		//					| AdditiveExpr '+' MultiplicativeExpr
-		//					| AdditiveExpr '-' MultiplicativeExpr
-		// MultiplicativeExpr ::= UnaryExpr
-		//						  | MultiplicativeExpr '*' UnaryExpr
-		//						  | MultiplicativeExpr 'div' UnaryExpr
-		//						  | MultiplicativeExpr 'mod' UnaryExpr
-		xpath_ast_node* parse_expression(int limit = 0)
-		{
-			size_t old_depth = _depth;
-
-			if (++_depth > xpath_ast_depth_limit)
-				return error_rec();
-
-			xpath_ast_node* n = parse_path_or_unary_expression();
-			if (!n) return 0;
-
-			n = parse_expression_rec(n, limit);
-
-			_depth = old_depth;
-
-			return n;
-		}
-
-		xpath_parser(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result): _alloc(alloc), _lexer(query), _query(query), _variables(variables), _result(result), _depth(0)
-		{
-		}
-
-		xpath_ast_node* parse()
-		{
-			xpath_ast_node* n = parse_expression();
-			if (!n) return 0;
-
-			assert(_depth == 0);
-
-			// check if there are unparsed tokens left
-			if (_lexer.current() != lex_eof)
-				return error("Incorrect query");
-
-			return n;
-		}
-
-		static xpath_ast_node* parse(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result)
-		{
-			xpath_parser parser(query, variables, alloc, result);
-
-			return parser.parse();
-		}
-	};
-
-	struct xpath_query_impl
-	{
-		static xpath_query_impl* create()
-		{
-			void* memory = xml_memory::allocate(sizeof(xpath_query_impl));
-			if (!memory) return 0;
-
-			return new (memory) xpath_query_impl();
-		}
-
-		static void destroy(xpath_query_impl* impl)
-		{
-			// free all allocated pages
-			impl->alloc.release();
-
-			// free allocator memory (with the first page)
-			xml_memory::deallocate(impl);
-		}
-
-		xpath_query_impl(): root(0), alloc(&block, &oom), oom(false)
-		{
-			block.next = 0;
-			block.capacity = sizeof(block.data);
-		}
-
-		xpath_ast_node* root;
-		xpath_allocator alloc;
-		xpath_memory_block block;
-		bool oom;
-	};
-
-	PUGI_IMPL_FN impl::xpath_ast_node* evaluate_node_set_prepare(xpath_query_impl* impl)
-	{
-		if (!impl) return 0;
-
-		if (impl->root->rettype() != xpath_type_node_set)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return 0;
-		#else
-			xpath_parse_result res;
-			res.error = "Expression does not evaluate to node set";
-
-			throw xpath_exception(res);
-		#endif
-		}
-
-		return impl->root;
-	}
-PUGI_IMPL_NS_END
-
-namespace pugi
-{
-#ifndef PUGIXML_NO_EXCEPTIONS
-	PUGI_IMPL_FN xpath_exception::xpath_exception(const xpath_parse_result& result_): _result(result_)
-	{
-		assert(_result.error);
-	}
-
-	PUGI_IMPL_FN const char* xpath_exception::what() const throw()
-	{
-		return _result.error;
-	}
-
-	PUGI_IMPL_FN const xpath_parse_result& xpath_exception::result() const
-	{
-		return _result;
-	}
-#endif
-
-	PUGI_IMPL_FN xpath_node::xpath_node()
-	{
-	}
-
-	PUGI_IMPL_FN xpath_node::xpath_node(const xml_node& node_): _node(node_)
-	{
-	}
-
-	PUGI_IMPL_FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_)
-	{
-	}
-
-	PUGI_IMPL_FN xml_node xpath_node::node() const
-	{
-		return _attribute ? xml_node() : _node;
-	}
-
-	PUGI_IMPL_FN xml_attribute xpath_node::attribute() const
-	{
-		return _attribute;
-	}
-
-	PUGI_IMPL_FN xml_node xpath_node::parent() const
-	{
-		return _attribute ? _node : _node.parent();
-	}
-
-	PUGI_IMPL_FN static void unspecified_bool_xpath_node(xpath_node***)
-	{
-	}
-
-	PUGI_IMPL_FN xpath_node::operator xpath_node::unspecified_bool_type() const
-	{
-		return (_node || _attribute) ? unspecified_bool_xpath_node : 0;
-	}
-
-	PUGI_IMPL_FN bool xpath_node::operator!() const
-	{
-		return !(_node || _attribute);
-	}
-
-	PUGI_IMPL_FN bool xpath_node::operator==(const xpath_node& n) const
-	{
-		return _node == n._node && _attribute == n._attribute;
-	}
-
-	PUGI_IMPL_FN bool xpath_node::operator!=(const xpath_node& n) const
-	{
-		return _node != n._node || _attribute != n._attribute;
-	}
-
-#ifdef __BORLANDC__
-	PUGI_IMPL_FN bool operator&&(const xpath_node& lhs, bool rhs)
-	{
-		return (bool)lhs && rhs;
-	}
-
-	PUGI_IMPL_FN bool operator||(const xpath_node& lhs, bool rhs)
-	{
-		return (bool)lhs || rhs;
-	}
-#endif
-
-	PUGI_IMPL_FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_)
-	{
-		assert(begin_ <= end_);
-
-		size_t size_ = static_cast<size_t>(end_ - begin_);
-
-		// use internal buffer for 0 or 1 elements, heap buffer otherwise
-		xpath_node* storage = (size_ <= 1) ? _storage : static_cast<xpath_node*>(impl::xml_memory::allocate(size_ * sizeof(xpath_node)));
-
-		if (!storage)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return;
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		// deallocate old buffer
-		if (_begin != _storage)
-			impl::xml_memory::deallocate(_begin);
-
-		// size check is necessary because for begin_ = end_ = nullptr, memcpy is UB
-		if (size_)
-			memcpy(storage, begin_, size_ * sizeof(xpath_node));
-
-		_begin = storage;
-		_end = storage + size_;
-		_type = type_;
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI_IMPL_FN void xpath_node_set::_move(xpath_node_set& rhs) PUGIXML_NOEXCEPT
-	{
-		_type = rhs._type;
-		_storage[0] = rhs._storage[0];
-		_begin = (rhs._begin == rhs._storage) ? _storage : rhs._begin;
-		_end = _begin + (rhs._end - rhs._begin);
-
-		rhs._type = type_unsorted;
-		rhs._begin = rhs._storage;
-		rhs._end = rhs._storage;
-	}
-#endif
-
-	PUGI_IMPL_FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(_storage), _end(_storage)
-	{
-	}
-
-	PUGI_IMPL_FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(_storage), _end(_storage)
-	{
-		_assign(begin_, end_, type_);
-	}
-
-	PUGI_IMPL_FN xpath_node_set::~xpath_node_set()
-	{
-		if (_begin != _storage)
-			impl::xml_memory::deallocate(_begin);
-	}
-
-	PUGI_IMPL_FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(_storage), _end(_storage)
-	{
-		_assign(ns._begin, ns._end, ns._type);
-	}
-
-	PUGI_IMPL_FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns)
-	{
-		if (this == &ns) return *this;
-
-		_assign(ns._begin, ns._end, ns._type);
-
-		return *this;
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI_IMPL_FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT: _type(type_unsorted), _begin(_storage), _end(_storage)
-	{
-		_move(rhs);
-	}
-
-	PUGI_IMPL_FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT
-	{
-		if (this == &rhs) return *this;
-
-		if (_begin != _storage)
-			impl::xml_memory::deallocate(_begin);
-
-		_move(rhs);
-
-		return *this;
-	}
-#endif
-
-	PUGI_IMPL_FN xpath_node_set::type_t xpath_node_set::type() const
-	{
-		return _type;
-	}
-
-	PUGI_IMPL_FN size_t xpath_node_set::size() const
-	{
-		return _end - _begin;
-	}
-
-	PUGI_IMPL_FN bool xpath_node_set::empty() const
-	{
-		return _begin == _end;
-	}
-
-	PUGI_IMPL_FN const xpath_node& xpath_node_set::operator[](size_t index) const
-	{
-		assert(index < size());
-		return _begin[index];
-	}
-
-	PUGI_IMPL_FN xpath_node_set::const_iterator xpath_node_set::begin() const
-	{
-		return _begin;
-	}
-
-	PUGI_IMPL_FN xpath_node_set::const_iterator xpath_node_set::end() const
-	{
-		return _end;
-	}
-
-	PUGI_IMPL_FN void xpath_node_set::sort(bool reverse)
-	{
-		_type = impl::xpath_sort(_begin, _end, _type, reverse);
-	}
-
-	PUGI_IMPL_FN xpath_node xpath_node_set::first() const
-	{
-		return impl::xpath_first(_begin, _end, _type);
-	}
-
-	PUGI_IMPL_FN xpath_parse_result::xpath_parse_result(): error("Internal error"), offset(0)
-	{
-	}
-
-	PUGI_IMPL_FN xpath_parse_result::operator bool() const
-	{
-		return error == 0;
-	}
-
-	PUGI_IMPL_FN const char* xpath_parse_result::description() const
-	{
-		return error ? error : "No error";
-	}
-
-	PUGI_IMPL_FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0)
-	{
-	}
-
-	PUGI_IMPL_FN const char_t* xpath_variable::name() const
-	{
-		switch (_type)
-		{
-		case xpath_type_node_set:
-			return static_cast<const impl::xpath_variable_node_set*>(this)->name;
-
-		case xpath_type_number:
-			return static_cast<const impl::xpath_variable_number*>(this)->name;
-
-		case xpath_type_string:
-			return static_cast<const impl::xpath_variable_string*>(this)->name;
-
-		case xpath_type_boolean:
-			return static_cast<const impl::xpath_variable_boolean*>(this)->name;
-
-		default:
-			assert(false && "Invalid variable type"); // unreachable
-			return 0;
-		}
-	}
-
-	PUGI_IMPL_FN xpath_value_type xpath_variable::type() const
-	{
-		return _type;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable::get_boolean() const
-	{
-		return (_type == xpath_type_boolean) ? static_cast<const impl::xpath_variable_boolean*>(this)->value : false;
-	}
-
-	PUGI_IMPL_FN double xpath_variable::get_number() const
-	{
-		return (_type == xpath_type_number) ? static_cast<const impl::xpath_variable_number*>(this)->value : impl::gen_nan();
-	}
-
-	PUGI_IMPL_FN const char_t* xpath_variable::get_string() const
-	{
-		const char_t* value = (_type == xpath_type_string) ? static_cast<const impl::xpath_variable_string*>(this)->value : 0;
-		return value ? value : PUGIXML_TEXT("");
-	}
-
-	PUGI_IMPL_FN const xpath_node_set& xpath_variable::get_node_set() const
-	{
-		return (_type == xpath_type_node_set) ? static_cast<const impl::xpath_variable_node_set*>(this)->value : impl::dummy_node_set;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable::set(bool value)
-	{
-		if (_type != xpath_type_boolean) return false;
-
-		static_cast<impl::xpath_variable_boolean*>(this)->value = value;
-		return true;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable::set(double value)
-	{
-		if (_type != xpath_type_number) return false;
-
-		static_cast<impl::xpath_variable_number*>(this)->value = value;
-		return true;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable::set(const char_t* value)
-	{
-		if (_type != xpath_type_string) return false;
-
-		impl::xpath_variable_string* var = static_cast<impl::xpath_variable_string*>(this);
-
-		// duplicate string
-		size_t size = (impl::strlength(value) + 1) * sizeof(char_t);
-
-		char_t* copy = static_cast<char_t*>(impl::xml_memory::allocate(size));
-		if (!copy) return false;
-
-		memcpy(copy, value, size);
-
-		// replace old string
-		if (var->value) impl::xml_memory::deallocate(var->value);
-		var->value = copy;
-
-		return true;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable::set(const xpath_node_set& value)
-	{
-		if (_type != xpath_type_node_set) return false;
-
-		static_cast<impl::xpath_variable_node_set*>(this)->value = value;
-		return true;
-	}
-
-	PUGI_IMPL_FN xpath_variable_set::xpath_variable_set()
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			_data[i] = 0;
-	}
-
-	PUGI_IMPL_FN xpath_variable_set::~xpath_variable_set()
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			_destroy(_data[i]);
-	}
-
-	PUGI_IMPL_FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs)
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			_data[i] = 0;
-
-		_assign(rhs);
-	}
-
-	PUGI_IMPL_FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs)
-	{
-		if (this == &rhs) return *this;
-
-		_assign(rhs);
-
-		return *this;
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI_IMPL_FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-		{
-			_data[i] = rhs._data[i];
-			rhs._data[i] = 0;
-		}
-	}
-
-	PUGI_IMPL_FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-		{
-			_destroy(_data[i]);
-
-			_data[i] = rhs._data[i];
-			rhs._data[i] = 0;
-		}
-
-		return *this;
-	}
-#endif
-
-	PUGI_IMPL_FN void xpath_variable_set::_assign(const xpath_variable_set& rhs)
-	{
-		xpath_variable_set temp;
-
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-			if (rhs._data[i] && !_clone(rhs._data[i], &temp._data[i]))
-				return;
-
-		_swap(temp);
-	}
-
-	PUGI_IMPL_FN void xpath_variable_set::_swap(xpath_variable_set& rhs)
-	{
-		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
-		{
-			xpath_variable* chain = _data[i];
-
-			_data[i] = rhs._data[i];
-			rhs._data[i] = chain;
-		}
-	}
-
-	PUGI_IMPL_FN xpath_variable* xpath_variable_set::_find(const char_t* name) const
-	{
-		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
-		size_t hash = impl::hash_string(name) % hash_size;
-
-		// look for existing variable
-		for (xpath_variable* var = _data[hash]; var; var = var->_next)
-			if (impl::strequal(var->name(), name))
-				return var;
-
-		return 0;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result)
-	{
-		xpath_variable* last = 0;
-
-		while (var)
-		{
-			// allocate storage for new variable
-			xpath_variable* nvar = impl::new_xpath_variable(var->_type, var->name());
-			if (!nvar) return false;
-
-			// link the variable to the result immediately to handle failures gracefully
-			if (last)
-				last->_next = nvar;
-			else
-				*out_result = nvar;
-
-			last = nvar;
-
-			// copy the value; this can fail due to out-of-memory conditions
-			if (!impl::copy_xpath_variable(nvar, var)) return false;
-
-			var = var->_next;
-		}
-
-		return true;
-	}
-
-	PUGI_IMPL_FN void xpath_variable_set::_destroy(xpath_variable* var)
-	{
-		while (var)
-		{
-			xpath_variable* next = var->_next;
-
-			impl::delete_xpath_variable(var->_type, var);
-
-			var = next;
-		}
-	}
-
-	PUGI_IMPL_FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type)
-	{
-		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
-		size_t hash = impl::hash_string(name) % hash_size;
-
-		// look for existing variable
-		for (xpath_variable* var = _data[hash]; var; var = var->_next)
-			if (impl::strequal(var->name(), name))
-				return var->type() == type ? var : 0;
-
-		// add new variable
-		xpath_variable* result = impl::new_xpath_variable(type, name);
-
-		if (result)
-		{
-			result->_next = _data[hash];
-
-			_data[hash] = result;
-		}
-
-		return result;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, bool value)
-	{
-		xpath_variable* var = add(name, xpath_type_boolean);
-		return var ? var->set(value) : false;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, double value)
-	{
-		xpath_variable* var = add(name, xpath_type_number);
-		return var ? var->set(value) : false;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, const char_t* value)
-	{
-		xpath_variable* var = add(name, xpath_type_string);
-		return var ? var->set(value) : false;
-	}
-
-	PUGI_IMPL_FN bool xpath_variable_set::set(const char_t* name, const xpath_node_set& value)
-	{
-		xpath_variable* var = add(name, xpath_type_node_set);
-		return var ? var->set(value) : false;
-	}
-
-	PUGI_IMPL_FN xpath_variable* xpath_variable_set::get(const char_t* name)
-	{
-		return _find(name);
-	}
-
-	PUGI_IMPL_FN const xpath_variable* xpath_variable_set::get(const char_t* name) const
-	{
-		return _find(name);
-	}
-
-	PUGI_IMPL_FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0)
-	{
-		impl::xpath_query_impl* qimpl = impl::xpath_query_impl::create();
-
-		if (!qimpl)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			_result.error = "Out of memory";
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-		else
-		{
-			using impl::auto_deleter; // MSVC7 workaround
-			auto_deleter<impl::xpath_query_impl> impl(qimpl, impl::xpath_query_impl::destroy);
-
-			qimpl->root = impl::xpath_parser::parse(query, variables, &qimpl->alloc, &_result);
-
-			if (qimpl->root)
-			{
-				qimpl->root->optimize(&qimpl->alloc);
-
-				_impl = impl.release();
-				_result.error = 0;
-			}
-			else
-			{
-			#ifdef PUGIXML_NO_EXCEPTIONS
-				if (qimpl->oom) _result.error = "Out of memory";
-			#else
-				if (qimpl->oom) throw std::bad_alloc();
-				throw xpath_exception(_result);
-			#endif
-			}
-		}
-	}
-
-	PUGI_IMPL_FN xpath_query::xpath_query(): _impl(0)
-	{
-	}
-
-	PUGI_IMPL_FN xpath_query::~xpath_query()
-	{
-		if (_impl)
-			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
-	}
-
-#ifdef PUGIXML_HAS_MOVE
-	PUGI_IMPL_FN xpath_query::xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT
-	{
-		_impl = rhs._impl;
-		_result = rhs._result;
-		rhs._impl = 0;
-		rhs._result = xpath_parse_result();
-	}
-
-	PUGI_IMPL_FN xpath_query& xpath_query::operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT
-	{
-		if (this == &rhs) return *this;
-
-		if (_impl)
-			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
-
-		_impl = rhs._impl;
-		_result = rhs._result;
-		rhs._impl = 0;
-		rhs._result = xpath_parse_result();
-
-		return *this;
-	}
-#endif
-
-	PUGI_IMPL_FN xpath_value_type xpath_query::return_type() const
-	{
-		if (!_impl) return xpath_type_none;
-
-		return static_cast<impl::xpath_query_impl*>(_impl)->root->rettype();
-	}
-
-	PUGI_IMPL_FN bool xpath_query::evaluate_boolean(const xpath_node& n) const
-	{
-		if (!_impl) return false;
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		bool r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_boolean(c, sd.stack);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return false;
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return r;
-	}
-
-	PUGI_IMPL_FN double xpath_query::evaluate_number(const xpath_node& n) const
-	{
-		if (!_impl) return impl::gen_nan();
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		double r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_number(c, sd.stack);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return impl::gen_nan();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return r;
-	}
-
-#ifndef PUGIXML_NO_STL
-	PUGI_IMPL_FN string_t xpath_query::evaluate_string(const xpath_node& n) const
-	{
-		if (!_impl) return string_t();
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		impl::xpath_string r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return string_t();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return string_t(r.c_str(), r.length());
-	}
-#endif
-
-	PUGI_IMPL_FN size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const
-	{
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		impl::xpath_string r = _impl ? static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack) : impl::xpath_string();
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			r = impl::xpath_string();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		size_t full_size = r.length() + 1;
-
-		if (capacity > 0)
-		{
-			size_t size = (full_size < capacity) ? full_size : capacity;
-			assert(size > 0);
-
-			memcpy(buffer, r.c_str(), (size - 1) * sizeof(char_t));
-			buffer[size - 1] = 0;
-		}
-
-		return full_size;
-	}
-
-	PUGI_IMPL_FN xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const
-	{
-		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
-		if (!root) return xpath_node_set();
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_all);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return xpath_node_set();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return xpath_node_set(r.begin(), r.end(), r.type());
-	}
-
-	PUGI_IMPL_FN xpath_node xpath_query::evaluate_node(const xpath_node& n) const
-	{
-		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
-		if (!root) return xpath_node();
-
-		impl::xpath_context c(n, 1, 1);
-		impl::xpath_stack_data sd;
-
-		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_first);
-
-		if (sd.oom)
-		{
-		#ifdef PUGIXML_NO_EXCEPTIONS
-			return xpath_node();
-		#else
-			throw std::bad_alloc();
-		#endif
-		}
-
-		return r.first();
-	}
-
-	PUGI_IMPL_FN const xpath_parse_result& xpath_query::result() const
-	{
-		return _result;
-	}
-
-	PUGI_IMPL_FN static void unspecified_bool_xpath_query(xpath_query***)
-	{
-	}
-
-	PUGI_IMPL_FN xpath_query::operator xpath_query::unspecified_bool_type() const
-	{
-		return _impl ? unspecified_bool_xpath_query : 0;
-	}
-
-	PUGI_IMPL_FN bool xpath_query::operator!() const
-	{
-		return !_impl;
-	}
-
-	PUGI_IMPL_FN xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables) const
-	{
-		xpath_query q(query, variables);
-		return q.evaluate_node(*this);
-	}
-
-	PUGI_IMPL_FN xpath_node xml_node::select_node(const xpath_query& query) const
-	{
-		return query.evaluate_node(*this);
-	}
-
-	PUGI_IMPL_FN xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables) const
-	{
-		xpath_query q(query, variables);
-		return q.evaluate_node_set(*this);
-	}
-
-	PUGI_IMPL_FN xpath_node_set xml_node::select_nodes(const xpath_query& query) const
-	{
-		return query.evaluate_node_set(*this);
-	}
-
-	PUGI_IMPL_FN xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables) const
-	{
-		xpath_query q(query, variables);
-		return q.evaluate_node(*this);
-	}
-
-	PUGI_IMPL_FN xpath_node xml_node::select_single_node(const xpath_query& query) const
-	{
-		return query.evaluate_node(*this);
-	}
-}
-
-#endif
-
-#ifdef __BORLANDC__
-#	pragma option pop
-#endif
-
-// Intel C++ does not properly keep warning state for function templates,
-// so popping warning state at the end of translation unit leads to warnings in the middle.
-#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-#	pragma warning(pop)
-#endif
-
-#if defined(_MSC_VER) && defined(__c2__)
-#	pragma clang diagnostic pop
-#endif
-
-// Undefine all local macros (makes sure we're not leaking macros in header-only mode)
-#undef PUGI_IMPL_NO_INLINE
-#undef PUGI_IMPL_UNLIKELY
-#undef PUGI_IMPL_STATIC_ASSERT
-#undef PUGI_IMPL_DMC_VOLATILE
-#undef PUGI_IMPL_UNSIGNED_OVERFLOW
-#undef PUGI_IMPL_MSVC_CRT_VERSION
-#undef PUGI_IMPL_SNPRINTF
-#undef PUGI_IMPL_NS_BEGIN
-#undef PUGI_IMPL_NS_END
-#undef PUGI_IMPL_FN
-#undef PUGI_IMPL_FN_NO_INLINE
-#undef PUGI_IMPL_GETHEADER_IMPL
-#undef PUGI_IMPL_GETPAGE_IMPL
-#undef PUGI_IMPL_GETPAGE
-#undef PUGI_IMPL_NODETYPE
-#undef PUGI_IMPL_IS_CHARTYPE_IMPL
-#undef PUGI_IMPL_IS_CHARTYPE
-#undef PUGI_IMPL_IS_CHARTYPEX
-#undef PUGI_IMPL_ENDSWITH
-#undef PUGI_IMPL_SKIPWS
-#undef PUGI_IMPL_OPTSET
-#undef PUGI_IMPL_PUSHNODE
-#undef PUGI_IMPL_POPNODE
-#undef PUGI_IMPL_SCANFOR
-#undef PUGI_IMPL_SCANWHILE
-#undef PUGI_IMPL_SCANWHILE_UNROLL
-#undef PUGI_IMPL_ENDSEG
-#undef PUGI_IMPL_THROW_ERROR
-#undef PUGI_IMPL_CHECK_ERROR
-
-#endif
-
-/**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pugixml.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/pugixml.hpp
deleted file mode 100644
index 874975995..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pugixml.hpp
+++ /dev/null
@@ -1,1510 +0,0 @@
-/**
- * pugixml parser - version 1.13
- * --------------------------------------------------------
- * Copyright (C) 2006-2022, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
- * Report bugs and download new versions at https://pugixml.org/
- *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
- *
- * This work is based on the pugxml parser, which is:
- * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
- */
-
-// Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons
-// Note: pugixml used major * 100 + minor * 10 + patch format up until 1.9 (which had version identifier 190); starting from pugixml 1.10, the minor version number is two digits
-#ifndef PUGIXML_VERSION
-#	define PUGIXML_VERSION 1130 // 1.13
-#endif
-
-// Include user configuration file (this can define various configuration macros)
-#include "pugiconfig.hpp"
-
-#ifndef HEADER_PUGIXML_HPP
-#define HEADER_PUGIXML_HPP
-
-// Include stddef.h for size_t and ptrdiff_t
-#include <stddef.h>
-
-// Include exception header for XPath
-#if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS)
-#	include <exception>
-#endif
-
-// Include STL headers
-#ifndef PUGIXML_NO_STL
-#	include <iterator>
-#	include <iosfwd>
-#	include <string>
-#endif
-
-// Macro for deprecated features
-#ifndef PUGIXML_DEPRECATED
-#	if defined(__GNUC__)
-#		define PUGIXML_DEPRECATED __attribute__((deprecated))
-#	elif defined(_MSC_VER) && _MSC_VER >= 1300
-#		define PUGIXML_DEPRECATED __declspec(deprecated)
-#	else
-#		define PUGIXML_DEPRECATED
-#	endif
-#endif
-
-// If no API is defined, assume default
-#ifndef PUGIXML_API
-#	define PUGIXML_API
-#endif
-
-// If no API for classes is defined, assume default
-#ifndef PUGIXML_CLASS
-#	define PUGIXML_CLASS PUGIXML_API
-#endif
-
-// If no API for functions is defined, assume default
-#ifndef PUGIXML_FUNCTION
-#	define PUGIXML_FUNCTION PUGIXML_API
-#endif
-
-// If the platform is known to have long long support, enable long long functions
-#ifndef PUGIXML_HAS_LONG_LONG
-#	if __cplusplus >= 201103
-#		define PUGIXML_HAS_LONG_LONG
-#	elif defined(_MSC_VER) && _MSC_VER >= 1400
-#		define PUGIXML_HAS_LONG_LONG
-#	endif
-#endif
-
-// If the platform is known to have move semantics support, compile move ctor/operator implementation
-#ifndef PUGIXML_HAS_MOVE
-#	if __cplusplus >= 201103
-#		define PUGIXML_HAS_MOVE
-#	elif defined(_MSC_VER) && _MSC_VER >= 1600
-#		define PUGIXML_HAS_MOVE
-#	endif
-#endif
-
-// If C++ is 2011 or higher, add 'noexcept' specifiers
-#ifndef PUGIXML_NOEXCEPT
-#	if __cplusplus >= 201103
-#		define PUGIXML_NOEXCEPT noexcept
-#	elif defined(_MSC_VER) && _MSC_VER >= 1900
-#		define PUGIXML_NOEXCEPT noexcept
-#	else
-#		define PUGIXML_NOEXCEPT
-#	endif
-#endif
-
-// Some functions can not be noexcept in compact mode
-#ifdef PUGIXML_COMPACT
-#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT
-#else
-#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT PUGIXML_NOEXCEPT
-#endif
-
-// If C++ is 2011 or higher, add 'override' qualifiers
-#ifndef PUGIXML_OVERRIDE
-#	if __cplusplus >= 201103
-#		define PUGIXML_OVERRIDE override
-#	elif defined(_MSC_VER) && _MSC_VER >= 1700
-#		define PUGIXML_OVERRIDE override
-#	else
-#		define PUGIXML_OVERRIDE
-#	endif
-#endif
-
-// If C++ is 2011 or higher, use 'nullptr'
-#ifndef PUGIXML_NULL
-#	if __cplusplus >= 201103
-#		define PUGIXML_NULL nullptr
-#	elif defined(_MSC_VER) && _MSC_VER >= 1600
-#		define PUGIXML_NULL nullptr
-#	else
-#		define PUGIXML_NULL 0
-#	endif
-#endif
-
-// Character interface macros
-#ifdef PUGIXML_WCHAR_MODE
-#	define PUGIXML_TEXT(t) L ## t
-#	define PUGIXML_CHAR wchar_t
-#else
-#	define PUGIXML_TEXT(t) t
-#	define PUGIXML_CHAR char
-#endif
-
-namespace pugi
-{
-	// Character type used for all internal storage and operations; depends on PUGIXML_WCHAR_MODE
-	typedef PUGIXML_CHAR char_t;
-
-#ifndef PUGIXML_NO_STL
-	// String type used for operations that work with STL string; depends on PUGIXML_WCHAR_MODE
-	typedef std::basic_string<PUGIXML_CHAR, std::char_traits<PUGIXML_CHAR>, std::allocator<PUGIXML_CHAR> > string_t;
-#endif
-}
-
-// The PugiXML namespace
-namespace pugi
-{
-	// Tree node types
-	enum xml_node_type
-	{
-		node_null,			// Empty (null) node handle
-		node_document,		// A document tree's absolute root
-		node_element,		// Element tag, i.e. '<node/>'
-		node_pcdata,		// Plain character data, i.e. 'text'
-		node_cdata,			// Character data, i.e. '<![CDATA[text]]>'
-		node_comment,		// Comment tag, i.e. '<!-- text -->'
-		node_pi,			// Processing instruction, i.e. '<?name?>'
-		node_declaration,	// Document declaration, i.e. '<?xml version="1.0"?>'
-		node_doctype		// Document type declaration, i.e. '<!DOCTYPE doc>'
-	};
-
-	// Parsing options
-
-	// Minimal parsing mode (equivalent to turning all other flags off).
-	// Only elements and PCDATA sections are added to the DOM tree, no text conversions are performed.
-	const unsigned int parse_minimal = 0x0000;
-
-	// This flag determines if processing instructions (node_pi) are added to the DOM tree. This flag is off by default.
-	const unsigned int parse_pi = 0x0001;
-
-	// This flag determines if comments (node_comment) are added to the DOM tree. This flag is off by default.
-	const unsigned int parse_comments = 0x0002;
-
-	// This flag determines if CDATA sections (node_cdata) are added to the DOM tree. This flag is on by default.
-	const unsigned int parse_cdata = 0x0004;
-
-	// This flag determines if plain character data (node_pcdata) that consist only of whitespace are added to the DOM tree.
-	// This flag is off by default; turning it on usually results in slower parsing and more memory consumption.
-	const unsigned int parse_ws_pcdata = 0x0008;
-
-	// This flag determines if character and entity references are expanded during parsing. This flag is on by default.
-	const unsigned int parse_escapes = 0x0010;
-
-	// This flag determines if EOL characters are normalized (converted to #xA) during parsing. This flag is on by default.
-	const unsigned int parse_eol = 0x0020;
-
-	// This flag determines if attribute values are normalized using CDATA normalization rules during parsing. This flag is on by default.
-	const unsigned int parse_wconv_attribute = 0x0040;
-
-	// This flag determines if attribute values are normalized using NMTOKENS normalization rules during parsing. This flag is off by default.
-	const unsigned int parse_wnorm_attribute = 0x0080;
-
-	// This flag determines if document declaration (node_declaration) is added to the DOM tree. This flag is off by default.
-	const unsigned int parse_declaration = 0x0100;
-
-	// This flag determines if document type declaration (node_doctype) is added to the DOM tree. This flag is off by default.
-	const unsigned int parse_doctype = 0x0200;
-
-	// This flag determines if plain character data (node_pcdata) that is the only child of the parent node and that consists only
-	// of whitespace is added to the DOM tree.
-	// This flag is off by default; turning it on may result in slower parsing and more memory consumption.
-	const unsigned int parse_ws_pcdata_single = 0x0400;
-
-	// This flag determines if leading and trailing whitespace is to be removed from plain character data. This flag is off by default.
-	const unsigned int parse_trim_pcdata = 0x0800;
-
-	// This flag determines if plain character data that does not have a parent node is added to the DOM tree, and if an empty document
-	// is a valid document. This flag is off by default.
-	const unsigned int parse_fragment = 0x1000;
-
-	// This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of
-	// the document; this flag is only recommended for parsing documents with many PCDATA nodes in memory-constrained environments.
-	// This flag is off by default.
-	const unsigned int parse_embed_pcdata = 0x2000;
-
-	// The default parsing mode.
-	// Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded,
-	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
-	const unsigned int parse_default = parse_cdata | parse_escapes | parse_wconv_attribute | parse_eol;
-
-	// The full parsing mode.
-	// Nodes of all types are added to the DOM tree, character/reference entities are expanded,
-	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
-	const unsigned int parse_full = parse_default | parse_pi | parse_comments | parse_declaration | parse_doctype;
-
-	// These flags determine the encoding of input data for XML document
-	enum xml_encoding
-	{
-		encoding_auto,		// Auto-detect input encoding using BOM or < / <? detection; use UTF8 if BOM is not found
-		encoding_utf8,		// UTF8 encoding
-		encoding_utf16_le,	// Little-endian UTF16
-		encoding_utf16_be,	// Big-endian UTF16
-		encoding_utf16,		// UTF16 with native endianness
-		encoding_utf32_le,	// Little-endian UTF32
-		encoding_utf32_be,	// Big-endian UTF32
-		encoding_utf32,		// UTF32 with native endianness
-		encoding_wchar,		// The same encoding wchar_t has (either UTF16 or UTF32)
-		encoding_latin1
-	};
-
-	// Formatting flags
-
-	// Indent the nodes that are written to output stream with as many indentation strings as deep the node is in DOM tree. This flag is on by default.
-	const unsigned int format_indent = 0x01;
-
-	// Write encoding-specific BOM to the output stream. This flag is off by default.
-	const unsigned int format_write_bom = 0x02;
-
-	// Use raw output mode (no indentation and no line breaks are written). This flag is off by default.
-	const unsigned int format_raw = 0x04;
-
-	// Omit default XML declaration even if there is no declaration in the document. This flag is off by default.
-	const unsigned int format_no_declaration = 0x08;
-
-	// Don't escape attribute values and PCDATA contents. This flag is off by default.
-	const unsigned int format_no_escapes = 0x10;
-
-	// Open file using text mode in xml_document::save_file. This enables special character (i.e. new-line) conversions on some systems. This flag is off by default.
-	const unsigned int format_save_file_text = 0x20;
-
-	// Write every attribute on a new line with appropriate indentation. This flag is off by default.
-	const unsigned int format_indent_attributes = 0x40;
-
-	// Don't output empty element tags, instead writing an explicit start and end tag even if there are no children. This flag is off by default.
-	const unsigned int format_no_empty_element_tags = 0x80;
-
-	// Skip characters belonging to range [0; 32) instead of "&#xNN;" encoding. This flag is off by default.
-	const unsigned int format_skip_control_chars = 0x100;
-
-	// Use single quotes ' instead of double quotes " for enclosing attribute values. This flag is off by default.
-	const unsigned int format_attribute_single_quote = 0x200;
-
-	// The default set of formatting flags.
-	// Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none.
-	const unsigned int format_default = format_indent;
-
-	const int default_double_precision = 17;
-	const int default_float_precision = 9;
-
-	// Forward declarations
-	struct xml_attribute_struct;
-	struct xml_node_struct;
-
-	class xml_node_iterator;
-	class xml_attribute_iterator;
-	class xml_named_node_iterator;
-
-	class xml_tree_walker;
-
-	struct xml_parse_result;
-
-	class xml_node;
-
-	class xml_text;
-
-	#ifndef PUGIXML_NO_XPATH
-	class xpath_node;
-	class xpath_node_set;
-	class xpath_query;
-	class xpath_variable_set;
-	#endif
-
-	// Range-based for loop support
-	template <typename It> class xml_object_range
-	{
-	public:
-		typedef It const_iterator;
-		typedef It iterator;
-
-		xml_object_range(It b, It e): _begin(b), _end(e)
-		{
-		}
-
-		It begin() const { return _begin; }
-		It end() const { return _end; }
-
-		bool empty() const { return _begin == _end; }
-
-	private:
-		It _begin, _end;
-	};
-
-	// Writer interface for node printing (see xml_node::print)
-	class PUGIXML_CLASS xml_writer
-	{
-	public:
-		virtual ~xml_writer();
-
-		// Write memory chunk into stream/file/whatever
-		virtual void write(const void* data, size_t size) = 0;
-	};
-
-	// xml_writer implementation for FILE*
-	class PUGIXML_CLASS xml_writer_file: public xml_writer
-	{
-	public:
-		// Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio
-		xml_writer_file(void* file);
-
-		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
-
-	private:
-		void* file;
-	};
-
-	#ifndef PUGIXML_NO_STL
-	// xml_writer implementation for streams
-	class PUGIXML_CLASS xml_writer_stream: public xml_writer
-	{
-	public:
-		// Construct writer from an output stream object
-		xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream);
-		xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream);
-
-		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
-
-	private:
-		std::basic_ostream<char, std::char_traits<char> >* narrow_stream;
-		std::basic_ostream<wchar_t, std::char_traits<wchar_t> >* wide_stream;
-	};
-	#endif
-
-	// A light-weight handle for manipulating attributes in DOM tree
-	class PUGIXML_CLASS xml_attribute
-	{
-		friend class xml_attribute_iterator;
-		friend class xml_node;
-
-	private:
-		xml_attribute_struct* _attr;
-
-		typedef void (*unspecified_bool_type)(xml_attribute***);
-
-	public:
-		// Default constructor. Constructs an empty attribute.
-		xml_attribute();
-
-		// Constructs attribute from internal pointer
-		explicit xml_attribute(xml_attribute_struct* attr);
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-
-		// Comparison operators (compares wrapped attribute pointers)
-		bool operator==(const xml_attribute& r) const;
-		bool operator!=(const xml_attribute& r) const;
-		bool operator<(const xml_attribute& r) const;
-		bool operator>(const xml_attribute& r) const;
-		bool operator<=(const xml_attribute& r) const;
-		bool operator>=(const xml_attribute& r) const;
-
-		// Check if attribute is empty
-		bool empty() const;
-
-		// Get attribute name/value, or "" if attribute is empty
-		const char_t* name() const;
-		const char_t* value() const;
-
-		// Get attribute value, or the default value if attribute is empty
-		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
-
-		// Get attribute value as a number, or the default value if conversion did not succeed or attribute is empty
-		int as_int(int def = 0) const;
-		unsigned int as_uint(unsigned int def = 0) const;
-		double as_double(double def = 0) const;
-		float as_float(float def = 0) const;
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		long long as_llong(long long def = 0) const;
-		unsigned long long as_ullong(unsigned long long def = 0) const;
-	#endif
-
-		// Get attribute value as bool (returns true if first character is in '1tTyY' set), or the default value if attribute is empty
-		bool as_bool(bool def = false) const;
-
-		// Set attribute name/value (returns false if attribute is empty or there is not enough memory)
-		bool set_name(const char_t* rhs);
-		bool set_value(const char_t* rhs, size_t sz);
-		bool set_value(const char_t* rhs);
-
-		// Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
-		bool set_value(int rhs);
-		bool set_value(unsigned int rhs);
-		bool set_value(long rhs);
-		bool set_value(unsigned long rhs);
-		bool set_value(double rhs);
-		bool set_value(double rhs, int precision);
-		bool set_value(float rhs);
-		bool set_value(float rhs, int precision);
-		bool set_value(bool rhs);
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		bool set_value(long long rhs);
-		bool set_value(unsigned long long rhs);
-	#endif
-
-		// Set attribute value (equivalent to set_value without error checking)
-		xml_attribute& operator=(const char_t* rhs);
-		xml_attribute& operator=(int rhs);
-		xml_attribute& operator=(unsigned int rhs);
-		xml_attribute& operator=(long rhs);
-		xml_attribute& operator=(unsigned long rhs);
-		xml_attribute& operator=(double rhs);
-		xml_attribute& operator=(float rhs);
-		xml_attribute& operator=(bool rhs);
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		xml_attribute& operator=(long long rhs);
-		xml_attribute& operator=(unsigned long long rhs);
-	#endif
-
-		// Get next/previous attribute in the attribute list of the parent node
-		xml_attribute next_attribute() const;
-		xml_attribute previous_attribute() const;
-
-		// Get hash value (unique for handles to the same object)
-		size_t hash_value() const;
-
-		// Get internal pointer
-		xml_attribute_struct* internal_object() const;
-	};
-
-#ifdef __BORLANDC__
-	// Borland C++ workaround
-	bool PUGIXML_FUNCTION operator&&(const xml_attribute& lhs, bool rhs);
-	bool PUGIXML_FUNCTION operator||(const xml_attribute& lhs, bool rhs);
-#endif
-
-	// A light-weight handle for manipulating nodes in DOM tree
-	class PUGIXML_CLASS xml_node
-	{
-		friend class xml_attribute_iterator;
-		friend class xml_node_iterator;
-		friend class xml_named_node_iterator;
-
-	protected:
-		xml_node_struct* _root;
-
-		typedef void (*unspecified_bool_type)(xml_node***);
-
-	public:
-		// Default constructor. Constructs an empty node.
-		xml_node();
-
-		// Constructs node from internal pointer
-		explicit xml_node(xml_node_struct* p);
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-
-		// Comparison operators (compares wrapped node pointers)
-		bool operator==(const xml_node& r) const;
-		bool operator!=(const xml_node& r) const;
-		bool operator<(const xml_node& r) const;
-		bool operator>(const xml_node& r) const;
-		bool operator<=(const xml_node& r) const;
-		bool operator>=(const xml_node& r) const;
-
-		// Check if node is empty.
-		bool empty() const;
-
-		// Get node type
-		xml_node_type type() const;
-
-		// Get node name, or "" if node is empty or it has no name
-		const char_t* name() const;
-
-		// Get node value, or "" if node is empty or it has no value
-		// Note: For <node>text</node> node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes.
-		const char_t* value() const;
-
-		// Get attribute list
-		xml_attribute first_attribute() const;
-		xml_attribute last_attribute() const;
-
-		// Get children list
-		xml_node first_child() const;
-		xml_node last_child() const;
-
-		// Get next/previous sibling in the children list of the parent node
-		xml_node next_sibling() const;
-		xml_node previous_sibling() const;
-
-		// Get parent node
-		xml_node parent() const;
-
-		// Get root of DOM tree this node belongs to
-		xml_node root() const;
-
-		// Get text object for the current node
-		xml_text text() const;
-
-		// Get child, attribute or next/previous sibling with the specified name
-		xml_node child(const char_t* name) const;
-		xml_attribute attribute(const char_t* name) const;
-		xml_node next_sibling(const char_t* name) const;
-		xml_node previous_sibling(const char_t* name) const;
-
-		// Get attribute, starting the search from a hint (and updating hint so that searching for a sequence of attributes is fast)
-		xml_attribute attribute(const char_t* name, xml_attribute& hint) const;
-
-		// Get child value of current node; that is, value of the first child node of type PCDATA/CDATA
-		const char_t* child_value() const;
-
-		// Get child value of child with specified name. Equivalent to child(name).child_value().
-		const char_t* child_value(const char_t* name) const;
-
-		// Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value)
-		bool set_name(const char_t* rhs);
-		bool set_value(const char_t* rhs, size_t sz);
-		bool set_value(const char_t* rhs);
-
-		// Add attribute with specified name. Returns added attribute, or empty attribute on errors.
-		xml_attribute append_attribute(const char_t* name);
-		xml_attribute prepend_attribute(const char_t* name);
-		xml_attribute insert_attribute_after(const char_t* name, const xml_attribute& attr);
-		xml_attribute insert_attribute_before(const char_t* name, const xml_attribute& attr);
-
-		// Add a copy of the specified attribute. Returns added attribute, or empty attribute on errors.
-		xml_attribute append_copy(const xml_attribute& proto);
-		xml_attribute prepend_copy(const xml_attribute& proto);
-		xml_attribute insert_copy_after(const xml_attribute& proto, const xml_attribute& attr);
-		xml_attribute insert_copy_before(const xml_attribute& proto, const xml_attribute& attr);
-
-		// Add child node with specified type. Returns added node, or empty node on errors.
-		xml_node append_child(xml_node_type type = node_element);
-		xml_node prepend_child(xml_node_type type = node_element);
-		xml_node insert_child_after(xml_node_type type, const xml_node& node);
-		xml_node insert_child_before(xml_node_type type, const xml_node& node);
-
-		// Add child element with specified name. Returns added node, or empty node on errors.
-		xml_node append_child(const char_t* name);
-		xml_node prepend_child(const char_t* name);
-		xml_node insert_child_after(const char_t* name, const xml_node& node);
-		xml_node insert_child_before(const char_t* name, const xml_node& node);
-
-		// Add a copy of the specified node as a child. Returns added node, or empty node on errors.
-		xml_node append_copy(const xml_node& proto);
-		xml_node prepend_copy(const xml_node& proto);
-		xml_node insert_copy_after(const xml_node& proto, const xml_node& node);
-		xml_node insert_copy_before(const xml_node& proto, const xml_node& node);
-
-		// Move the specified node to become a child of this node. Returns moved node, or empty node on errors.
-		xml_node append_move(const xml_node& moved);
-		xml_node prepend_move(const xml_node& moved);
-		xml_node insert_move_after(const xml_node& moved, const xml_node& node);
-		xml_node insert_move_before(const xml_node& moved, const xml_node& node);
-
-		// Remove specified attribute
-		bool remove_attribute(const xml_attribute& a);
-		bool remove_attribute(const char_t* name);
-
-		// Remove all attributes
-		bool remove_attributes();
-
-		// Remove specified child
-		bool remove_child(const xml_node& n);
-		bool remove_child(const char_t* name);
-
-		// Remove all children
-		bool remove_children();
-
-		// Parses buffer as an XML document fragment and appends all nodes as children of the current node.
-		// Copies/converts the buffer, so it may be deleted or changed after the function returns.
-		// Note: append_buffer allocates memory that has the lifetime of the owning document; removing the appended nodes does not immediately reclaim that memory.
-		xml_parse_result append_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Find attribute using predicate. Returns first attribute for which predicate returned true.
-		template <typename Predicate> xml_attribute find_attribute(Predicate pred) const
-		{
-			if (!_root) return xml_attribute();
-
-			for (xml_attribute attrib = first_attribute(); attrib; attrib = attrib.next_attribute())
-				if (pred(attrib))
-					return attrib;
-
-			return xml_attribute();
-		}
-
-		// Find child node using predicate. Returns first child for which predicate returned true.
-		template <typename Predicate> xml_node find_child(Predicate pred) const
-		{
-			if (!_root) return xml_node();
-
-			for (xml_node node = first_child(); node; node = node.next_sibling())
-				if (pred(node))
-					return node;
-
-			return xml_node();
-		}
-
-		// Find node from subtree using predicate. Returns first node from subtree (depth-first), for which predicate returned true.
-		template <typename Predicate> xml_node find_node(Predicate pred) const
-		{
-			if (!_root) return xml_node();
-
-			xml_node cur = first_child();
-
-			while (cur._root && cur._root != _root)
-			{
-				if (pred(cur)) return cur;
-
-				if (cur.first_child()) cur = cur.first_child();
-				else if (cur.next_sibling()) cur = cur.next_sibling();
-				else
-				{
-					while (!cur.next_sibling() && cur._root != _root) cur = cur.parent();
-
-					if (cur._root != _root) cur = cur.next_sibling();
-				}
-			}
-
-			return xml_node();
-		}
-
-		// Find child node by attribute name/value
-		xml_node find_child_by_attribute(const char_t* name, const char_t* attr_name, const char_t* attr_value) const;
-		xml_node find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const;
-
-	#ifndef PUGIXML_NO_STL
-		// Get the absolute node path from root as a text string.
-		string_t path(char_t delimiter = '/') const;
-	#endif
-
-		// Search for a node by path consisting of node names and . or .. elements.
-		xml_node first_element_by_path(const char_t* path, char_t delimiter = '/') const;
-
-		// Recursively traverse subtree with xml_tree_walker
-		bool traverse(xml_tree_walker& walker);
-
-	#ifndef PUGIXML_NO_XPATH
-		// Select single node by evaluating XPath query. Returns first node from the resulting node set.
-		xpath_node select_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
-		xpath_node select_node(const xpath_query& query) const;
-
-		// Select node set by evaluating XPath query
-		xpath_node_set select_nodes(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
-		xpath_node_set select_nodes(const xpath_query& query) const;
-
-		// (deprecated: use select_node instead) Select single node by evaluating XPath query.
-		PUGIXML_DEPRECATED xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
-		PUGIXML_DEPRECATED xpath_node select_single_node(const xpath_query& query) const;
-
-	#endif
-
-		// Print subtree using a writer object
-		void print(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
-
-	#ifndef PUGIXML_NO_STL
-		// Print subtree to stream
-		void print(std::basic_ostream<char, std::char_traits<char> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
-		void print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, unsigned int depth = 0) const;
-	#endif
-
-		// Child nodes iterators
-		typedef xml_node_iterator iterator;
-
-		iterator begin() const;
-		iterator end() const;
-
-		// Attribute iterators
-		typedef xml_attribute_iterator attribute_iterator;
-
-		attribute_iterator attributes_begin() const;
-		attribute_iterator attributes_end() const;
-
-		// Range-based for support
-		xml_object_range<xml_node_iterator> children() const;
-		xml_object_range<xml_attribute_iterator> attributes() const;
-
-		// Range-based for support for all children with the specified name
-		// Note: name pointer must have a longer lifetime than the returned object; be careful with passing temporaries!
-		xml_object_range<xml_named_node_iterator> children(const char_t* name) const;
-
-		// Get node offset in parsed file/string (in char_t units) for debugging purposes
-		ptrdiff_t offset_debug() const;
-
-		// Get hash value (unique for handles to the same object)
-		size_t hash_value() const;
-
-		// Get internal pointer
-		xml_node_struct* internal_object() const;
-	};
-
-#ifdef __BORLANDC__
-	// Borland C++ workaround
-	bool PUGIXML_FUNCTION operator&&(const xml_node& lhs, bool rhs);
-	bool PUGIXML_FUNCTION operator||(const xml_node& lhs, bool rhs);
-#endif
-
-	// A helper for working with text inside PCDATA nodes
-	class PUGIXML_CLASS xml_text
-	{
-		friend class xml_node;
-
-		xml_node_struct* _root;
-
-		typedef void (*unspecified_bool_type)(xml_text***);
-
-		explicit xml_text(xml_node_struct* root);
-
-		xml_node_struct* _data_new();
-		xml_node_struct* _data() const;
-
-	public:
-		// Default constructor. Constructs an empty object.
-		xml_text();
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-
-		// Check if text object is empty
-		bool empty() const;
-
-		// Get text, or "" if object is empty
-		const char_t* get() const;
-
-		// Get text, or the default value if object is empty
-		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
-
-		// Get text as a number, or the default value if conversion did not succeed or object is empty
-		int as_int(int def = 0) const;
-		unsigned int as_uint(unsigned int def = 0) const;
-		double as_double(double def = 0) const;
-		float as_float(float def = 0) const;
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		long long as_llong(long long def = 0) const;
-		unsigned long long as_ullong(unsigned long long def = 0) const;
-	#endif
-
-		// Get text as bool (returns true if first character is in '1tTyY' set), or the default value if object is empty
-		bool as_bool(bool def = false) const;
-
-		// Set text (returns false if object is empty or there is not enough memory)
-		bool set(const char_t* rhs, size_t sz);
-		bool set(const char_t* rhs);
-
-		// Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
-		bool set(int rhs);
-		bool set(unsigned int rhs);
-		bool set(long rhs);
-		bool set(unsigned long rhs);
-		bool set(double rhs);
-		bool set(double rhs, int precision);
-		bool set(float rhs);
-		bool set(float rhs, int precision);
-		bool set(bool rhs);
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		bool set(long long rhs);
-		bool set(unsigned long long rhs);
-	#endif
-
-		// Set text (equivalent to set without error checking)
-		xml_text& operator=(const char_t* rhs);
-		xml_text& operator=(int rhs);
-		xml_text& operator=(unsigned int rhs);
-		xml_text& operator=(long rhs);
-		xml_text& operator=(unsigned long rhs);
-		xml_text& operator=(double rhs);
-		xml_text& operator=(float rhs);
-		xml_text& operator=(bool rhs);
-
-	#ifdef PUGIXML_HAS_LONG_LONG
-		xml_text& operator=(long long rhs);
-		xml_text& operator=(unsigned long long rhs);
-	#endif
-
-		// Get the data node (node_pcdata or node_cdata) for this object
-		xml_node data() const;
-	};
-
-#ifdef __BORLANDC__
-	// Borland C++ workaround
-	bool PUGIXML_FUNCTION operator&&(const xml_text& lhs, bool rhs);
-	bool PUGIXML_FUNCTION operator||(const xml_text& lhs, bool rhs);
-#endif
-
-	// Child node iterator (a bidirectional iterator over a collection of xml_node)
-	class PUGIXML_CLASS xml_node_iterator
-	{
-		friend class xml_node;
-
-	private:
-		mutable xml_node _wrap;
-		xml_node _parent;
-
-		xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent);
-
-	public:
-		// Iterator traits
-		typedef ptrdiff_t difference_type;
-		typedef xml_node value_type;
-		typedef xml_node* pointer;
-		typedef xml_node& reference;
-
-	#ifndef PUGIXML_NO_STL
-		typedef std::bidirectional_iterator_tag iterator_category;
-	#endif
-
-		// Default constructor
-		xml_node_iterator();
-
-		// Construct an iterator which points to the specified node
-		xml_node_iterator(const xml_node& node);
-
-		// Iterator operators
-		bool operator==(const xml_node_iterator& rhs) const;
-		bool operator!=(const xml_node_iterator& rhs) const;
-
-		xml_node& operator*() const;
-		xml_node* operator->() const;
-
-		xml_node_iterator& operator++();
-		xml_node_iterator operator++(int);
-
-		xml_node_iterator& operator--();
-		xml_node_iterator operator--(int);
-	};
-
-	// Attribute iterator (a bidirectional iterator over a collection of xml_attribute)
-	class PUGIXML_CLASS xml_attribute_iterator
-	{
-		friend class xml_node;
-
-	private:
-		mutable xml_attribute _wrap;
-		xml_node _parent;
-
-		xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent);
-
-	public:
-		// Iterator traits
-		typedef ptrdiff_t difference_type;
-		typedef xml_attribute value_type;
-		typedef xml_attribute* pointer;
-		typedef xml_attribute& reference;
-
-	#ifndef PUGIXML_NO_STL
-		typedef std::bidirectional_iterator_tag iterator_category;
-	#endif
-
-		// Default constructor
-		xml_attribute_iterator();
-
-		// Construct an iterator which points to the specified attribute
-		xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent);
-
-		// Iterator operators
-		bool operator==(const xml_attribute_iterator& rhs) const;
-		bool operator!=(const xml_attribute_iterator& rhs) const;
-
-		xml_attribute& operator*() const;
-		xml_attribute* operator->() const;
-
-		xml_attribute_iterator& operator++();
-		xml_attribute_iterator operator++(int);
-
-		xml_attribute_iterator& operator--();
-		xml_attribute_iterator operator--(int);
-	};
-
-	// Named node range helper
-	class PUGIXML_CLASS xml_named_node_iterator
-	{
-		friend class xml_node;
-
-	public:
-		// Iterator traits
-		typedef ptrdiff_t difference_type;
-		typedef xml_node value_type;
-		typedef xml_node* pointer;
-		typedef xml_node& reference;
-
-	#ifndef PUGIXML_NO_STL
-		typedef std::bidirectional_iterator_tag iterator_category;
-	#endif
-
-		// Default constructor
-		xml_named_node_iterator();
-
-		// Construct an iterator which points to the specified node
-		// Note: name pointer is stored in the iterator and must have a longer lifetime than iterator itself
-		xml_named_node_iterator(const xml_node& node, const char_t* name);
-
-		// Iterator operators
-		bool operator==(const xml_named_node_iterator& rhs) const;
-		bool operator!=(const xml_named_node_iterator& rhs) const;
-
-		xml_node& operator*() const;
-		xml_node* operator->() const;
-
-		xml_named_node_iterator& operator++();
-		xml_named_node_iterator operator++(int);
-
-		xml_named_node_iterator& operator--();
-		xml_named_node_iterator operator--(int);
-
-	private:
-		mutable xml_node _wrap;
-		xml_node _parent;
-		const char_t* _name;
-
-		xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name);
-	};
-
-	// Abstract tree walker class (see xml_node::traverse)
-	class PUGIXML_CLASS xml_tree_walker
-	{
-		friend class xml_node;
-
-	private:
-		int _depth;
-
-	protected:
-		// Get current traversal depth
-		int depth() const;
-
-	public:
-		xml_tree_walker();
-		virtual ~xml_tree_walker();
-
-		// Callback that is called when traversal begins
-		virtual bool begin(xml_node& node);
-
-		// Callback that is called for each node traversed
-		virtual bool for_each(xml_node& node) = 0;
-
-		// Callback that is called when traversal ends
-		virtual bool end(xml_node& node);
-	};
-
-	// Parsing status, returned as part of xml_parse_result object
-	enum xml_parse_status
-	{
-		status_ok = 0,				// No error
-
-		status_file_not_found,		// File was not found during load_file()
-		status_io_error,			// Error reading from file/stream
-		status_out_of_memory,		// Could not allocate memory
-		status_internal_error,		// Internal error occurred
-
-		status_unrecognized_tag,	// Parser could not determine tag type
-
-		status_bad_pi,				// Parsing error occurred while parsing document declaration/processing instruction
-		status_bad_comment,			// Parsing error occurred while parsing comment
-		status_bad_cdata,			// Parsing error occurred while parsing CDATA section
-		status_bad_doctype,			// Parsing error occurred while parsing document type declaration
-		status_bad_pcdata,			// Parsing error occurred while parsing PCDATA section
-		status_bad_start_element,	// Parsing error occurred while parsing start element tag
-		status_bad_attribute,		// Parsing error occurred while parsing element attribute
-		status_bad_end_element,		// Parsing error occurred while parsing end element tag
-		status_end_element_mismatch,// There was a mismatch of start-end tags (closing tag had incorrect name, some tag was not closed or there was an excessive closing tag)
-
-		status_append_invalid_root,	// Unable to append nodes since root type is not node_element or node_document (exclusive to xml_node::append_buffer)
-
-		status_no_document_element	// Parsing resulted in a document without element nodes
-	};
-
-	// Parsing result
-	struct PUGIXML_CLASS xml_parse_result
-	{
-		// Parsing status (see xml_parse_status)
-		xml_parse_status status;
-
-		// Last parsed offset (in char_t units from start of input data)
-		ptrdiff_t offset;
-
-		// Source document encoding
-		xml_encoding encoding;
-
-		// Default constructor, initializes object to failed state
-		xml_parse_result();
-
-		// Cast to bool operator
-		operator bool() const;
-
-		// Get error description
-		const char* description() const;
-	};
-
-	// Document class (DOM tree root)
-	class PUGIXML_CLASS xml_document: public xml_node
-	{
-	private:
-		char_t* _buffer;
-
-		char _memory[192];
-
-		// Non-copyable semantics
-		xml_document(const xml_document&);
-		xml_document& operator=(const xml_document&);
-
-		void _create();
-		void _destroy();
-		void _move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
-
-	public:
-		// Default constructor, makes empty document
-		xml_document();
-
-		// Destructor, invalidates all node/attribute handles to this document
-		~xml_document();
-
-	#ifdef PUGIXML_HAS_MOVE
-		// Move semantics support
-		xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
-		xml_document& operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
-	#endif
-
-		// Removes all nodes, leaving the empty document
-		void reset();
-
-		// Removes all nodes, then copies the entire contents of the specified document
-		void reset(const xml_document& proto);
-
-	#ifndef PUGIXML_NO_STL
-		// Load document from stream.
-		xml_parse_result load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-		xml_parse_result load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options = parse_default);
-	#endif
-
-		// (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied.
-		PUGIXML_DEPRECATED xml_parse_result load(const char_t* contents, unsigned int options = parse_default);
-
-		// Load document from zero-terminated string. No encoding conversions are applied.
-		xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default);
-
-		// Load document from file
-		xml_parse_result load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-		xml_parse_result load_file(const wchar_t* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Load document from buffer. Copies/converts the buffer, so it may be deleted or changed after the function returns.
-		xml_parse_result load_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
-		// You should ensure that buffer data will persist throughout the document's lifetime, and free the buffer memory manually once document is destroyed.
-		xml_parse_result load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
-		// You should allocate the buffer with pugixml allocation function; document will free the buffer when it is no longer needed (you can't use it anymore).
-		xml_parse_result load_buffer_inplace_own(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
-
-		// Save XML document to writer (semantics is slightly different from xml_node::print, see documentation for details).
-		void save(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
-
-	#ifndef PUGIXML_NO_STL
-		// Save XML document to stream (semantics is slightly different from xml_node::print, see documentation for details).
-		void save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
-		void save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default) const;
-	#endif
-
-		// Save XML to file
-		bool save_file(const char* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
-		bool save_file(const wchar_t* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
-
-		// Get document element
-		xml_node document_element() const;
-	};
-
-#ifndef PUGIXML_NO_XPATH
-	// XPath query return type
-	enum xpath_value_type
-	{
-		xpath_type_none,	  // Unknown type (query failed to compile)
-		xpath_type_node_set,  // Node set (xpath_node_set)
-		xpath_type_number,	  // Number
-		xpath_type_string,	  // String
-		xpath_type_boolean	  // Boolean
-	};
-
-	// XPath parsing result
-	struct PUGIXML_CLASS xpath_parse_result
-	{
-		// Error message (0 if no error)
-		const char* error;
-
-		// Last parsed offset (in char_t units from string start)
-		ptrdiff_t offset;
-
-		// Default constructor, initializes object to failed state
-		xpath_parse_result();
-
-		// Cast to bool operator
-		operator bool() const;
-
-		// Get error description
-		const char* description() const;
-	};
-
-	// A single XPath variable
-	class PUGIXML_CLASS xpath_variable
-	{
-		friend class xpath_variable_set;
-
-	protected:
-		xpath_value_type _type;
-		xpath_variable* _next;
-
-		xpath_variable(xpath_value_type type);
-
-		// Non-copyable semantics
-		xpath_variable(const xpath_variable&);
-		xpath_variable& operator=(const xpath_variable&);
-
-	public:
-		// Get variable name
-		const char_t* name() const;
-
-		// Get variable type
-		xpath_value_type type() const;
-
-		// Get variable value; no type conversion is performed, default value (false, NaN, empty string, empty node set) is returned on type mismatch error
-		bool get_boolean() const;
-		double get_number() const;
-		const char_t* get_string() const;
-		const xpath_node_set& get_node_set() const;
-
-		// Set variable value; no type conversion is performed, false is returned on type mismatch error
-		bool set(bool value);
-		bool set(double value);
-		bool set(const char_t* value);
-		bool set(const xpath_node_set& value);
-	};
-
-	// A set of XPath variables
-	class PUGIXML_CLASS xpath_variable_set
-	{
-	private:
-		xpath_variable* _data[64];
-
-		void _assign(const xpath_variable_set& rhs);
-		void _swap(xpath_variable_set& rhs);
-
-		xpath_variable* _find(const char_t* name) const;
-
-		static bool _clone(xpath_variable* var, xpath_variable** out_result);
-		static void _destroy(xpath_variable* var);
-
-	public:
-		// Default constructor/destructor
-		xpath_variable_set();
-		~xpath_variable_set();
-
-		// Copy constructor/assignment operator
-		xpath_variable_set(const xpath_variable_set& rhs);
-		xpath_variable_set& operator=(const xpath_variable_set& rhs);
-
-	#ifdef PUGIXML_HAS_MOVE
-		// Move semantics support
-		xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
-		xpath_variable_set& operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
-	#endif
-
-		// Add a new variable or get the existing one, if the types match
-		xpath_variable* add(const char_t* name, xpath_value_type type);
-
-		// Set value of an existing variable; no type conversion is performed, false is returned if there is no such variable or if types mismatch
-		bool set(const char_t* name, bool value);
-		bool set(const char_t* name, double value);
-		bool set(const char_t* name, const char_t* value);
-		bool set(const char_t* name, const xpath_node_set& value);
-
-		// Get existing variable by name
-		xpath_variable* get(const char_t* name);
-		const xpath_variable* get(const char_t* name) const;
-	};
-
-	// A compiled XPath query object
-	class PUGIXML_CLASS xpath_query
-	{
-	private:
-		void* _impl;
-		xpath_parse_result _result;
-
-		typedef void (*unspecified_bool_type)(xpath_query***);
-
-		// Non-copyable semantics
-		xpath_query(const xpath_query&);
-		xpath_query& operator=(const xpath_query&);
-
-	public:
-		// Construct a compiled object from XPath expression.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors.
-		explicit xpath_query(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL);
-
-		// Constructor
-		xpath_query();
-
-		// Destructor
-		~xpath_query();
-
-	#ifdef PUGIXML_HAS_MOVE
-		// Move semantics support
-		xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT;
-		xpath_query& operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT;
-	#endif
-
-		// Get query expression return type
-		xpath_value_type return_type() const;
-
-		// Evaluate expression as boolean value in the specified context; performs type conversion if necessary.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
-		bool evaluate_boolean(const xpath_node& n) const;
-
-		// Evaluate expression as double value in the specified context; performs type conversion if necessary.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
-		double evaluate_number(const xpath_node& n) const;
-
-	#ifndef PUGIXML_NO_STL
-		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
-		string_t evaluate_string(const xpath_node& n) const;
-	#endif
-
-		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
-		// At most capacity characters are written to the destination buffer, full result size is returned (includes terminating zero).
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
-		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty  set instead.
-		size_t evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const;
-
-		// Evaluate expression as node set in the specified context.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
-		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node set instead.
-		xpath_node_set evaluate_node_set(const xpath_node& n) const;
-
-		// Evaluate expression as node set in the specified context.
-		// Return first node in document order, or empty node if node set is empty.
-		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
-		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node instead.
-		xpath_node evaluate_node(const xpath_node& n) const;
-
-		// Get parsing result (used to get compilation errors in PUGIXML_NO_EXCEPTIONS mode)
-		const xpath_parse_result& result() const;
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-	};
-
-	#ifndef PUGIXML_NO_EXCEPTIONS
-        #if defined(_MSC_VER)
-          // C4275 can be ignored in Visual C++ if you are deriving
-          // from a type in the Standard C++ Library
-          #pragma warning(push)
-          #pragma warning(disable: 4275)
-        #endif
-	// XPath exception class
-	class PUGIXML_CLASS xpath_exception: public std::exception
-	{
-	private:
-		xpath_parse_result _result;
-
-	public:
-		// Construct exception from parse result
-		explicit xpath_exception(const xpath_parse_result& result);
-
-		// Get error message
-		virtual const char* what() const throw() PUGIXML_OVERRIDE;
-
-		// Get parse result
-		const xpath_parse_result& result() const;
-	};
-        #if defined(_MSC_VER)
-          #pragma warning(pop)
-        #endif
-	#endif
-
-	// XPath node class (either xml_node or xml_attribute)
-	class PUGIXML_CLASS xpath_node
-	{
-	private:
-		xml_node _node;
-		xml_attribute _attribute;
-
-		typedef void (*unspecified_bool_type)(xpath_node***);
-
-	public:
-		// Default constructor; constructs empty XPath node
-		xpath_node();
-
-		// Construct XPath node from XML node/attribute
-		xpath_node(const xml_node& node);
-		xpath_node(const xml_attribute& attribute, const xml_node& parent);
-
-		// Get node/attribute, if any
-		xml_node node() const;
-		xml_attribute attribute() const;
-
-		// Get parent of contained node/attribute
-		xml_node parent() const;
-
-		// Safe bool conversion operator
-		operator unspecified_bool_type() const;
-
-		// Borland C++ workaround
-		bool operator!() const;
-
-		// Comparison operators
-		bool operator==(const xpath_node& n) const;
-		bool operator!=(const xpath_node& n) const;
-	};
-
-#ifdef __BORLANDC__
-	// Borland C++ workaround
-	bool PUGIXML_FUNCTION operator&&(const xpath_node& lhs, bool rhs);
-	bool PUGIXML_FUNCTION operator||(const xpath_node& lhs, bool rhs);
-#endif
-
-	// A fixed-size collection of XPath nodes
-	class PUGIXML_CLASS xpath_node_set
-	{
-	public:
-		// Collection type
-		enum type_t
-		{
-			type_unsorted,			// Not ordered
-			type_sorted,			// Sorted by document order (ascending)
-			type_sorted_reverse		// Sorted by document order (descending)
-		};
-
-		// Constant iterator type
-		typedef const xpath_node* const_iterator;
-
-		// We define non-constant iterator to be the same as constant iterator so that various generic algorithms (i.e. boost foreach) work
-		typedef const xpath_node* iterator;
-
-		// Default constructor. Constructs empty set.
-		xpath_node_set();
-
-		// Constructs a set from iterator range; data is not checked for duplicates and is not sorted according to provided type, so be careful
-		xpath_node_set(const_iterator begin, const_iterator end, type_t type = type_unsorted);
-
-		// Destructor
-		~xpath_node_set();
-
-		// Copy constructor/assignment operator
-		xpath_node_set(const xpath_node_set& ns);
-		xpath_node_set& operator=(const xpath_node_set& ns);
-
-	#ifdef PUGIXML_HAS_MOVE
-		// Move semantics support
-		xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
-		xpath_node_set& operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
-	#endif
-
-		// Get collection type
-		type_t type() const;
-
-		// Get collection size
-		size_t size() const;
-
-		// Indexing operator
-		const xpath_node& operator[](size_t index) const;
-
-		// Collection iterators
-		const_iterator begin() const;
-		const_iterator end() const;
-
-		// Sort the collection in ascending/descending order by document order
-		void sort(bool reverse = false);
-
-		// Get first node in the collection by document order
-		xpath_node first() const;
-
-		// Check if collection is empty
-		bool empty() const;
-
-	private:
-		type_t _type;
-
-		xpath_node _storage[1];
-
-		xpath_node* _begin;
-		xpath_node* _end;
-
-		void _assign(const_iterator begin, const_iterator end, type_t type);
-		void _move(xpath_node_set& rhs) PUGIXML_NOEXCEPT;
-	};
-#endif
-
-#ifndef PUGIXML_NO_STL
-	// Convert wide string to UTF8
-	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const wchar_t* str);
-	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >& str);
-
-	// Convert UTF8 to wide string
-	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const char* str);
-	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& str);
-#endif
-
-	// Memory allocation function interface; returns pointer to allocated memory or NULL on failure
-	typedef void* (*allocation_function)(size_t size);
-
-	// Memory deallocation function interface
-	typedef void (*deallocation_function)(void* ptr);
-
-	// Override default memory management functions. All subsequent allocations/deallocations will be performed via supplied functions.
-	void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate);
-
-	// Get current memory management functions
-	allocation_function PUGIXML_FUNCTION get_memory_allocation_function();
-	deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function();
-}
-
-#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
-namespace std
-{
-	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_node_iterator&);
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_attribute_iterator&);
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_named_node_iterator&);
-}
-#endif
-
-#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
-namespace std
-{
-	// Workarounds for (non-standard) iterator category detection
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_node_iterator&);
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_attribute_iterator&);
-	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_named_node_iterator&);
-}
-#endif
-
-#endif
-
-// Make sure implementation is included in header-only mode
-// Use macro expansion in #include to work around QMake (QTBUG-11923)
-#if defined(PUGIXML_HEADER_ONLY) && !defined(PUGIXML_SOURCE)
-#	define PUGIXML_SOURCE "pugixml.cpp"
-#	include PUGIXML_SOURCE
-#endif
-
-/**
- * Copyright (c) 2006-2022 Arseny Kapoulkine
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/CMakeLists.txt
deleted file mode 100644
index 3787982cb..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/CMakeLists.txt
+++ /dev/null
@@ -1,299 +0,0 @@
-# CMakeLists.txt -- Build system for the pybind11 modules
-#
-# Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
-#
-# All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-cmake_minimum_required(VERSION 3.4)
-
-# The `cmake_minimum_required(VERSION 3.4...3.22)` syntax does not work with
-# some versions of VS that have a patched CMake 3.11. This forces us to emulate
-# the behavior using the following workaround:
-if(${CMAKE_VERSION} VERSION_LESS 3.22)
-  cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
-  cmake_policy(VERSION 3.22)
-endif()
-
-# Avoid infinite recursion if tests include this as a subdirectory
-if(DEFINED PYBIND11_MASTER_PROJECT)
-  return()
-endif()
-
-# Extract project version from source
-file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/include/pybind11/detail/common.h"
-     pybind11_version_defines REGEX "#define PYBIND11_VERSION_(MAJOR|MINOR|PATCH) ")
-
-foreach(ver ${pybind11_version_defines})
-  if(ver MATCHES [[#define PYBIND11_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$]])
-    set(PYBIND11_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}")
-  endif()
-endforeach()
-
-if(PYBIND11_VERSION_PATCH MATCHES [[\.([a-zA-Z0-9]+)$]])
-  set(pybind11_VERSION_TYPE "${CMAKE_MATCH_1}")
-endif()
-string(REGEX MATCH "^[0-9]+" PYBIND11_VERSION_PATCH "${PYBIND11_VERSION_PATCH}")
-
-project(
-  pybind11
-  LANGUAGES CXX
-  VERSION "${PYBIND11_VERSION_MAJOR}.${PYBIND11_VERSION_MINOR}.${PYBIND11_VERSION_PATCH}")
-
-# Standard includes
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
-include(CMakeDependentOption)
-
-if(NOT pybind11_FIND_QUIETLY)
-  message(STATUS "pybind11 v${pybind11_VERSION} ${pybind11_VERSION_TYPE}")
-endif()
-
-# Check if pybind11 is being used directly or via add_subdirectory
-if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
-  ### Warn if not an out-of-source builds
-  if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-    set(lines
-        "You are building in-place. If that is not what you intended to "
-        "do, you can clean the source directory with:\n"
-        "rm -r CMakeCache.txt CMakeFiles/ cmake_uninstall.cmake pybind11Config.cmake "
-        "pybind11ConfigVersion.cmake tests/CMakeFiles/\n")
-    message(AUTHOR_WARNING ${lines})
-  endif()
-
-  set(PYBIND11_MASTER_PROJECT ON)
-
-  if(OSX AND CMAKE_VERSION VERSION_LESS 3.7)
-    # Bug in macOS CMake < 3.7 is unable to download catch
-    message(WARNING "CMAKE 3.7+ needed on macOS to download catch, and newer HIGHLY recommended")
-  elseif(WINDOWS AND CMAKE_VERSION VERSION_LESS 3.8)
-    # Only tested with 3.8+ in CI.
-    message(WARNING "CMAKE 3.8+ tested on Windows, previous versions untested")
-  endif()
-
-  message(STATUS "CMake ${CMAKE_VERSION}")
-
-  if(CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_EXTENSIONS OFF)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  endif()
-
-  set(pybind11_system "")
-
-  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-else()
-  set(PYBIND11_MASTER_PROJECT OFF)
-  set(pybind11_system SYSTEM)
-endif()
-
-# Options
-option(PYBIND11_INSTALL "Install pybind11 header files?" ${PYBIND11_MASTER_PROJECT})
-option(PYBIND11_TEST "Build pybind11 test suite?" ${PYBIND11_MASTER_PROJECT})
-option(PYBIND11_NOPYTHON "Disable search for Python" OFF)
-set(PYBIND11_INTERNALS_VERSION
-    ""
-    CACHE STRING "Override the ABI version, may be used to enable the unstable ABI.")
-
-cmake_dependent_option(
-  USE_PYTHON_INCLUDE_DIR
-  "Install pybind11 headers in Python include directory instead of default installation prefix"
-  OFF "PYBIND11_INSTALL" OFF)
-
-cmake_dependent_option(PYBIND11_FINDPYTHON "Force new FindPython" OFF
-                       "NOT CMAKE_VERSION VERSION_LESS 3.12" OFF)
-
-# NB: when adding a header don't forget to also add it to setup.py
-set(PYBIND11_HEADERS
-    include/pybind11/detail/class.h
-    include/pybind11/detail/common.h
-    include/pybind11/detail/descr.h
-    include/pybind11/detail/init.h
-    include/pybind11/detail/internals.h
-    include/pybind11/detail/type_caster_base.h
-    include/pybind11/detail/typeid.h
-    include/pybind11/attr.h
-    include/pybind11/buffer_info.h
-    include/pybind11/cast.h
-    include/pybind11/chrono.h
-    include/pybind11/common.h
-    include/pybind11/complex.h
-    include/pybind11/options.h
-    include/pybind11/eigen.h
-    include/pybind11/embed.h
-    include/pybind11/eval.h
-    include/pybind11/gil.h
-    include/pybind11/iostream.h
-    include/pybind11/functional.h
-    include/pybind11/numpy.h
-    include/pybind11/operators.h
-    include/pybind11/pybind11.h
-    include/pybind11/pytypes.h
-    include/pybind11/stl.h
-    include/pybind11/stl_bind.h
-    include/pybind11/stl/filesystem.h)
-
-# Compare with grep and warn if mismatched
-if(PYBIND11_MASTER_PROJECT AND NOT CMAKE_VERSION VERSION_LESS 3.12)
-  file(
-    GLOB_RECURSE _pybind11_header_check
-    LIST_DIRECTORIES false
-    RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-    CONFIGURE_DEPENDS "include/pybind11/*.h")
-  set(_pybind11_here_only ${PYBIND11_HEADERS})
-  set(_pybind11_disk_only ${_pybind11_header_check})
-  list(REMOVE_ITEM _pybind11_here_only ${_pybind11_header_check})
-  list(REMOVE_ITEM _pybind11_disk_only ${PYBIND11_HEADERS})
-  if(_pybind11_here_only)
-    message(AUTHOR_WARNING "PYBIND11_HEADERS has extra files:" ${_pybind11_here_only})
-  endif()
-  if(_pybind11_disk_only)
-    message(AUTHOR_WARNING "PYBIND11_HEADERS is missing files:" ${_pybind11_disk_only})
-  endif()
-endif()
-
-# CMake 3.12 added list(TRANSFORM <list> PREPEND
-# But we can't use it yet
-string(REPLACE "include/" "${CMAKE_CURRENT_SOURCE_DIR}/include/" PYBIND11_HEADERS
-               "${PYBIND11_HEADERS}")
-
-# Cache variable so this can be used in parent projects
-set(pybind11_INCLUDE_DIR
-    "${CMAKE_CURRENT_LIST_DIR}/include"
-    CACHE INTERNAL "Directory where pybind11 headers are located")
-
-# Backward compatible variable for add_subdirectory mode
-if(NOT PYBIND11_MASTER_PROJECT)
-  set(PYBIND11_INCLUDE_DIR
-      "${pybind11_INCLUDE_DIR}"
-      CACHE INTERNAL "")
-endif()
-
-# Note: when creating targets, you cannot use if statements at configure time -
-# you need generator expressions, because those will be placed in the target file.
-# You can also place ifs *in* the Config.in, but not here.
-
-# This section builds targets, but does *not* touch Python
-# Non-IMPORT targets cannot be defined twice
-if(NOT TARGET pybind11_headers)
-  # Build the headers-only target (no Python included):
-  # (long name used here to keep this from clashing in subdirectory mode)
-  add_library(pybind11_headers INTERFACE)
-  add_library(pybind11::pybind11_headers ALIAS pybind11_headers) # to match exported target
-  add_library(pybind11::headers ALIAS pybind11_headers) # easier to use/remember
-
-  target_include_directories(
-    pybind11_headers ${pybind11_system} INTERFACE $<BUILD_INTERFACE:${pybind11_INCLUDE_DIR}>
-                                                  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-
-  target_compile_features(pybind11_headers INTERFACE cxx_inheriting_constructors cxx_user_literals
-                                                     cxx_right_angle_brackets)
-  if(NOT "${PYBIND11_INTERNALS_VERSION}" STREQUAL "")
-    target_compile_definitions(
-      pybind11_headers INTERFACE "PYBIND11_INTERNALS_VERSION=${PYBIND11_INTERNALS_VERSION}")
-  endif()
-else()
-  # It is invalid to install a target twice, too.
-  set(PYBIND11_INSTALL OFF)
-endif()
-
-include("${CMAKE_CURRENT_SOURCE_DIR}/tools/pybind11Common.cmake")
-
-# Relative directory setting
-if(USE_PYTHON_INCLUDE_DIR AND DEFINED Python_INCLUDE_DIRS)
-  file(RELATIVE_PATH CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX} ${Python_INCLUDE_DIRS})
-elseif(USE_PYTHON_INCLUDE_DIR AND DEFINED PYTHON_INCLUDE_DIR)
-  file(RELATIVE_PATH CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX} ${PYTHON_INCLUDE_DIRS})
-endif()
-
-if(PYBIND11_INSTALL)
-  install(DIRECTORY ${pybind11_INCLUDE_DIR}/pybind11 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-  set(PYBIND11_CMAKECONFIG_INSTALL_DIR
-      "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}"
-      CACHE STRING "install path for pybind11Config.cmake")
-
-  if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
-    set(pybind11_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
-  else()
-    set(pybind11_INCLUDEDIR "\$\{PACKAGE_PREFIX_DIR\}/${CMAKE_INSTALL_INCLUDEDIR}")
-  endif()
-
-  configure_package_config_file(
-    tools/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-    INSTALL_DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
-
-  if(CMAKE_VERSION VERSION_LESS 3.14)
-    # Remove CMAKE_SIZEOF_VOID_P from ConfigVersion.cmake since the library does
-    # not depend on architecture specific settings or libraries.
-    set(_PYBIND11_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
-    unset(CMAKE_SIZEOF_VOID_P)
-
-    write_basic_package_version_file(
-      ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-      VERSION ${PROJECT_VERSION}
-      COMPATIBILITY AnyNewerVersion)
-
-    set(CMAKE_SIZEOF_VOID_P ${_PYBIND11_CMAKE_SIZEOF_VOID_P})
-  else()
-    # CMake 3.14+ natively supports header-only libraries
-    write_basic_package_version_file(
-      ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-      VERSION ${PROJECT_VERSION}
-      COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT)
-  endif()
-
-  install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-          ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-          tools/FindPythonLibsNew.cmake
-          tools/pybind11Common.cmake
-          tools/pybind11Tools.cmake
-          tools/pybind11NewTools.cmake
-    DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
-
-  if(NOT PYBIND11_EXPORT_NAME)
-    set(PYBIND11_EXPORT_NAME "${PROJECT_NAME}Targets")
-  endif()
-
-  install(TARGETS pybind11_headers EXPORT "${PYBIND11_EXPORT_NAME}")
-
-  install(
-    EXPORT "${PYBIND11_EXPORT_NAME}"
-    NAMESPACE "pybind11::"
-    DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
-
-  # Uninstall target
-  if(PYBIND11_MASTER_PROJECT)
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake_uninstall.cmake.in"
-                   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
-
-    add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P
-                                        ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-  endif()
-endif()
-
-# BUILD_TESTING takes priority, but only if this is the master project
-if(PYBIND11_MASTER_PROJECT AND DEFINED BUILD_TESTING)
-  if(BUILD_TESTING)
-    if(_pybind11_nopython)
-      message(FATAL_ERROR "Cannot activate tests in NOPYTHON mode")
-    else()
-      add_subdirectory(tests)
-    endif()
-  endif()
-else()
-  if(PYBIND11_TEST)
-    if(_pybind11_nopython)
-      message(FATAL_ERROR "Cannot activate tests in NOPYTHON mode")
-    else()
-      add_subdirectory(tests)
-    endif()
-  endif()
-endif()
-
-# Better symmetry with find_package(pybind11 CONFIG) mode.
-if(NOT PYBIND11_MASTER_PROJECT)
-  set(pybind11_FOUND
-      TRUE
-      CACHE INTERNAL "True if pybind11 and all required components found on the system")
-endif()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/LICENSE
deleted file mode 100644
index e466b0dfd..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>, All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Please also refer to the file .github/CONTRIBUTING.md, which clarifies licensing of
-external contributions to this project including patches, pull requests, etc.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/README.rst b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/README.rst
deleted file mode 100644
index 3c75edb57..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/README.rst
+++ /dev/null
@@ -1,180 +0,0 @@
-.. figure:: https://github.com/pybind/pybind11/raw/master/docs/pybind11-logo.png
-   :alt: pybind11 logo
-
-**pybind11 — Seamless operability between C++11 and Python**
-
-|Latest Documentation Status| |Stable Documentation Status| |Gitter chat| |GitHub Discussions| |CI| |Build status|
-
-|Repology| |PyPI package| |Conda-forge| |Python Versions|
-
-`Setuptools example <https://github.com/pybind/python_example>`_
-• `Scikit-build example <https://github.com/pybind/scikit_build_example>`_
-• `CMake example <https://github.com/pybind/cmake_example>`_
-
-.. start
-
-
-**pybind11** is a lightweight header-only library that exposes C++ types
-in Python and vice versa, mainly to create Python bindings of existing
-C++ code. Its goals and syntax are similar to the excellent
-`Boost.Python <http://www.boost.org/doc/libs/1_58_0/libs/python/doc/>`_
-library by David Abrahams: to minimize boilerplate code in traditional
-extension modules by inferring type information using compile-time
-introspection.
-
-The main issue with Boost.Python—and the reason for creating such a
-similar project—is Boost. Boost is an enormously large and complex suite
-of utility libraries that works with almost every C++ compiler in
-existence. This compatibility has its cost: arcane template tricks and
-workarounds are necessary to support the oldest and buggiest of compiler
-specimens. Now that C++11-compatible compilers are widely available,
-this heavy machinery has become an excessively large and unnecessary
-dependency.
-
-Think of this library as a tiny self-contained version of Boost.Python
-with everything stripped away that isn't relevant for binding
-generation. Without comments, the core header files only require ~4K
-lines of code and depend on Python (3.6+, or PyPy) and the C++
-standard library. This compact implementation was possible thanks to
-some of the new C++11 language features (specifically: tuples, lambda
-functions and variadic templates). Since its creation, this library has
-grown beyond Boost.Python in many ways, leading to dramatically simpler
-binding code in many common situations.
-
-Tutorial and reference documentation is provided at
-`pybind11.readthedocs.io <https://pybind11.readthedocs.io/en/latest>`_.
-A PDF version of the manual is available
-`here <https://pybind11.readthedocs.io/_/downloads/en/latest/pdf/>`_.
-And the source code is always available at
-`github.com/pybind/pybind11 <https://github.com/pybind/pybind11>`_.
-
-
-Core features
--------------
-
-
-pybind11 can map the following core C++ features to Python:
-
-- Functions accepting and returning custom data structures per value,
-  reference, or pointer
-- Instance methods and static methods
-- Overloaded functions
-- Instance attributes and static attributes
-- Arbitrary exception types
-- Enumerations
-- Callbacks
-- Iterators and ranges
-- Custom operators
-- Single and multiple inheritance
-- STL data structures
-- Smart pointers with reference counting like ``std::shared_ptr``
-- Internal references with correct reference counting
-- C++ classes with virtual (and pure virtual) methods can be extended
-  in Python
-
-Goodies
--------
-
-In addition to the core functionality, pybind11 provides some extra
-goodies:
-
-- Python 3.6+, and PyPy3 7.3 are supported with an implementation-agnostic
-  interface (pybind11 2.9 was the last version to support Python 2 and 3.5).
-
-- It is possible to bind C++11 lambda functions with captured
-  variables. The lambda capture data is stored inside the resulting
-  Python function object.
-
-- pybind11 uses C++11 move constructors and move assignment operators
-  whenever possible to efficiently transfer custom data types.
-
-- It's easy to expose the internal storage of custom data types through
-  Pythons' buffer protocols. This is handy e.g. for fast conversion
-  between C++ matrix classes like Eigen and NumPy without expensive
-  copy operations.
-
-- pybind11 can automatically vectorize functions so that they are
-  transparently applied to all entries of one or more NumPy array
-  arguments.
-
-- Python's slice-based access and assignment operations can be
-  supported with just a few lines of code.
-
-- Everything is contained in just a few header files; there is no need
-  to link against any additional libraries.
-
-- Binaries are generally smaller by a factor of at least 2 compared to
-  equivalent bindings generated by Boost.Python. A recent pybind11
-  conversion of PyRosetta, an enormous Boost.Python binding project,
-  `reported <https://graylab.jhu.edu/Sergey/2016.RosettaCon/PyRosetta-4.pdf>`_
-  a binary size reduction of **5.4x** and compile time reduction by
-  **5.8x**.
-
-- Function signatures are precomputed at compile time (using
-  ``constexpr``), leading to smaller binaries.
-
-- With little extra effort, C++ types can be pickled and unpickled
-  similar to regular Python objects.
-
-Supported compilers
--------------------
-
-1. Clang/LLVM 3.3 or newer (for Apple Xcode's clang, this is 5.0.0 or
-   newer)
-2. GCC 4.8 or newer
-3. Microsoft Visual Studio 2017 or newer
-4. Intel classic C++ compiler 18 or newer (ICC 20.2 tested in CI)
-5. Cygwin/GCC (previously tested on 2.5.1)
-6. NVCC (CUDA 11.0 tested in CI)
-7. NVIDIA PGI (20.9 tested in CI)
-
-About
------
-
-This project was created by `Wenzel
-Jakob <http://rgl.epfl.ch/people/wjakob>`_. Significant features and/or
-improvements to the code were contributed by Jonas Adler, Lori A. Burns,
-Sylvain Corlay, Eric Cousineau, Aaron Gokaslan, Ralf Grosse-Kunstleve, Trent Houliston, Axel
-Huebl, @hulucc, Yannick Jadoul, Sergey Lyskov Johan Mabille, Tomasz Miąsko,
-Dean Moldovan, Ben Pritchard, Jason Rhinelander, Boris Schäling, Pim
-Schellart, Henry Schreiner, Ivan Smirnov, Boris Staletic, and Patrick Stewart.
-
-We thank Google for a generous financial contribution to the continuous
-integration infrastructure used by this project.
-
-
-Contributing
-~~~~~~~~~~~~
-
-See the `contributing
-guide <https://github.com/pybind/pybind11/blob/master/.github/CONTRIBUTING.md>`_
-for information on building and contributing to pybind11.
-
-License
-~~~~~~~
-
-pybind11 is provided under a BSD-style license that can be found in the
-`LICENSE <https://github.com/pybind/pybind11/blob/master/LICENSE>`_
-file. By using, distributing, or contributing to this project, you agree
-to the terms and conditions of this license.
-
-.. |Latest Documentation Status| image:: https://readthedocs.org/projects/pybind11/badge?version=latest
-   :target: http://pybind11.readthedocs.org/en/latest
-.. |Stable Documentation Status| image:: https://img.shields.io/badge/docs-stable-blue.svg
-   :target: http://pybind11.readthedocs.org/en/stable
-.. |Gitter chat| image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
-   :target: https://gitter.im/pybind/Lobby
-.. |CI| image:: https://github.com/pybind/pybind11/workflows/CI/badge.svg
-   :target: https://github.com/pybind/pybind11/actions
-.. |Build status| image:: https://ci.appveyor.com/api/projects/status/riaj54pn4h08xy40?svg=true
-   :target: https://ci.appveyor.com/project/wjakob/pybind11
-.. |PyPI package| image:: https://img.shields.io/pypi/v/pybind11.svg
-   :target: https://pypi.org/project/pybind11/
-.. |Conda-forge| image:: https://img.shields.io/conda/vn/conda-forge/pybind11.svg
-   :target: https://github.com/conda-forge/pybind11-feedstock
-.. |Repology| image:: https://repology.org/badge/latest-versions/python:pybind11.svg
-   :target: https://repology.org/project/python:pybind11/versions
-.. |Python Versions| image:: https://img.shields.io/pypi/pyversions/pybind11.svg
-   :target: https://pypi.org/project/pybind11/
-.. |GitHub Discussions| image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&logo=github
-   :target: https://github.com/pybind/pybind11/discussions
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/attr.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/attr.h
deleted file mode 100644
index db7cd8eff..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/attr.h
+++ /dev/null
@@ -1,678 +0,0 @@
-/*
-    pybind11/attr.h: Infrastructure for processing custom
-    type and function attributes
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-#include "cast.h"
-
-#include <functional>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-/// \addtogroup annotations
-/// @{
-
-/// Annotation for methods
-struct is_method {
-    handle class_;
-    explicit is_method(const handle &c) : class_(c) {}
-};
-
-/// Annotation for operators
-struct is_operator {};
-
-/// Annotation for classes that cannot be subclassed
-struct is_final {};
-
-/// Annotation for parent scope
-struct scope {
-    handle value;
-    explicit scope(const handle &s) : value(s) {}
-};
-
-/// Annotation for documentation
-struct doc {
-    const char *value;
-    explicit doc(const char *value) : value(value) {}
-};
-
-/// Annotation for function names
-struct name {
-    const char *value;
-    explicit name(const char *value) : value(value) {}
-};
-
-/// Annotation indicating that a function is an overload associated with a given "sibling"
-struct sibling {
-    handle value;
-    explicit sibling(const handle &value) : value(value.ptr()) {}
-};
-
-/// Annotation indicating that a class derives from another given type
-template <typename T>
-struct base {
-
-    PYBIND11_DEPRECATED(
-        "base<T>() was deprecated in favor of specifying 'T' as a template argument to class_")
-    base() = default;
-};
-
-/// Keep patient alive while nurse lives
-template <size_t Nurse, size_t Patient>
-struct keep_alive {};
-
-/// Annotation indicating that a class is involved in a multiple inheritance relationship
-struct multiple_inheritance {};
-
-/// Annotation which enables dynamic attributes, i.e. adds `__dict__` to a class
-struct dynamic_attr {};
-
-/// Annotation which enables the buffer protocol for a type
-struct buffer_protocol {};
-
-/// Annotation which requests that a special metaclass is created for a type
-struct metaclass {
-    handle value;
-
-    PYBIND11_DEPRECATED("py::metaclass() is no longer required. It's turned on by default now.")
-    metaclass() = default;
-
-    /// Override pybind11's default metaclass
-    explicit metaclass(handle value) : value(value) {}
-};
-
-/// Specifies a custom callback with signature `void (PyHeapTypeObject*)` that
-/// may be used to customize the Python type.
-///
-/// The callback is invoked immediately before `PyType_Ready`.
-///
-/// Note: This is an advanced interface, and uses of it may require changes to
-/// work with later versions of pybind11.  You may wish to consult the
-/// implementation of `make_new_python_type` in `detail/classes.h` to understand
-/// the context in which the callback will be run.
-struct custom_type_setup {
-    using callback = std::function<void(PyHeapTypeObject *heap_type)>;
-
-    explicit custom_type_setup(callback value) : value(std::move(value)) {}
-
-    callback value;
-};
-
-/// Annotation that marks a class as local to the module:
-struct module_local {
-    const bool value;
-    constexpr explicit module_local(bool v = true) : value(v) {}
-};
-
-/// Annotation to mark enums as an arithmetic type
-struct arithmetic {};
-
-/// Mark a function for addition at the beginning of the existing overload chain instead of the end
-struct prepend {};
-
-/** \rst
-    A call policy which places one or more guard variables (``Ts...``) around the function call.
-
-    For example, this definition:
-
-    .. code-block:: cpp
-
-        m.def("foo", foo, py::call_guard<T>());
-
-    is equivalent to the following pseudocode:
-
-    .. code-block:: cpp
-
-        m.def("foo", [](args...) {
-            T scope_guard;
-            return foo(args...); // forwarded arguments
-        });
- \endrst */
-template <typename... Ts>
-struct call_guard;
-
-template <>
-struct call_guard<> {
-    using type = detail::void_type;
-};
-
-template <typename T>
-struct call_guard<T> {
-    static_assert(std::is_default_constructible<T>::value,
-                  "The guard type must be default constructible");
-
-    using type = T;
-};
-
-template <typename T, typename... Ts>
-struct call_guard<T, Ts...> {
-    struct type {
-        T guard{}; // Compose multiple guard types with left-to-right default-constructor order
-        typename call_guard<Ts...>::type next{};
-    };
-};
-
-/// @} annotations
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-/* Forward declarations */
-enum op_id : int;
-enum op_type : int;
-struct undefined_t;
-template <op_id id, op_type ot, typename L = undefined_t, typename R = undefined_t>
-struct op_;
-void keep_alive_impl(size_t Nurse, size_t Patient, function_call &call, handle ret);
-
-/// Internal data structure which holds metadata about a keyword argument
-struct argument_record {
-    const char *name;  ///< Argument name
-    const char *descr; ///< Human-readable version of the argument value
-    handle value;      ///< Associated Python object
-    bool convert : 1;  ///< True if the argument is allowed to convert when loading
-    bool none : 1;     ///< True if None is allowed when loading
-
-    argument_record(const char *name, const char *descr, handle value, bool convert, bool none)
-        : name(name), descr(descr), value(value), convert(convert), none(none) {}
-};
-
-/// Internal data structure which holds metadata about a bound function (signature, overloads,
-/// etc.)
-struct function_record {
-    function_record()
-        : is_constructor(false), is_new_style_constructor(false), is_stateless(false),
-          is_operator(false), is_method(false), has_args(false), has_kwargs(false),
-          prepend(false) {}
-
-    /// Function name
-    char *name = nullptr; /* why no C++ strings? They generate heavier code.. */
-
-    // User-specified documentation string
-    char *doc = nullptr;
-
-    /// Human-readable version of the function signature
-    char *signature = nullptr;
-
-    /// List of registered keyword arguments
-    std::vector<argument_record> args;
-
-    /// Pointer to lambda function which converts arguments and performs the actual call
-    handle (*impl)(function_call &) = nullptr;
-
-    /// Storage for the wrapped function pointer and captured data, if any
-    void *data[3] = {};
-
-    /// Pointer to custom destructor for 'data' (if needed)
-    void (*free_data)(function_record *ptr) = nullptr;
-
-    /// Return value policy associated with this function
-    return_value_policy policy = return_value_policy::automatic;
-
-    /// True if name == '__init__'
-    bool is_constructor : 1;
-
-    /// True if this is a new-style `__init__` defined in `detail/init.h`
-    bool is_new_style_constructor : 1;
-
-    /// True if this is a stateless function pointer
-    bool is_stateless : 1;
-
-    /// True if this is an operator (__add__), etc.
-    bool is_operator : 1;
-
-    /// True if this is a method
-    bool is_method : 1;
-
-    /// True if the function has a '*args' argument
-    bool has_args : 1;
-
-    /// True if the function has a '**kwargs' argument
-    bool has_kwargs : 1;
-
-    /// True if this function is to be inserted at the beginning of the overload resolution chain
-    bool prepend : 1;
-
-    /// Number of arguments (including py::args and/or py::kwargs, if present)
-    std::uint16_t nargs;
-
-    /// Number of leading positional arguments, which are terminated by a py::args or py::kwargs
-    /// argument or by a py::kw_only annotation.
-    std::uint16_t nargs_pos = 0;
-
-    /// Number of leading arguments (counted in `nargs`) that are positional-only
-    std::uint16_t nargs_pos_only = 0;
-
-    /// Python method object
-    PyMethodDef *def = nullptr;
-
-    /// Python handle to the parent scope (a class or a module)
-    handle scope;
-
-    /// Python handle to the sibling function representing an overload chain
-    handle sibling;
-
-    /// Pointer to next overload
-    function_record *next = nullptr;
-};
-
-/// Special data structure which (temporarily) holds metadata about a bound class
-struct type_record {
-    PYBIND11_NOINLINE type_record()
-        : multiple_inheritance(false), dynamic_attr(false), buffer_protocol(false),
-          default_holder(true), module_local(false), is_final(false) {}
-
-    /// Handle to the parent scope
-    handle scope;
-
-    /// Name of the class
-    const char *name = nullptr;
-
-    // Pointer to RTTI type_info data structure
-    const std::type_info *type = nullptr;
-
-    /// How large is the underlying C++ type?
-    size_t type_size = 0;
-
-    /// What is the alignment of the underlying C++ type?
-    size_t type_align = 0;
-
-    /// How large is the type's holder?
-    size_t holder_size = 0;
-
-    /// The global operator new can be overridden with a class-specific variant
-    void *(*operator_new)(size_t) = nullptr;
-
-    /// Function pointer to class_<..>::init_instance
-    void (*init_instance)(instance *, const void *) = nullptr;
-
-    /// Function pointer to class_<..>::dealloc
-    void (*dealloc)(detail::value_and_holder &) = nullptr;
-
-    /// List of base classes of the newly created type
-    list bases;
-
-    /// Optional docstring
-    const char *doc = nullptr;
-
-    /// Custom metaclass (optional)
-    handle metaclass;
-
-    /// Custom type setup.
-    custom_type_setup::callback custom_type_setup_callback;
-
-    /// Multiple inheritance marker
-    bool multiple_inheritance : 1;
-
-    /// Does the class manage a __dict__?
-    bool dynamic_attr : 1;
-
-    /// Does the class implement the buffer protocol?
-    bool buffer_protocol : 1;
-
-    /// Is the default (unique_ptr) holder type used?
-    bool default_holder : 1;
-
-    /// Is the class definition local to the module shared object?
-    bool module_local : 1;
-
-    /// Is the class inheritable from python classes?
-    bool is_final : 1;
-
-    PYBIND11_NOINLINE void add_base(const std::type_info &base, void *(*caster)(void *) ) {
-        auto *base_info = detail::get_type_info(base, false);
-        if (!base_info) {
-            std::string tname(base.name());
-            detail::clean_type_id(tname);
-            pybind11_fail("generic_type: type \"" + std::string(name)
-                          + "\" referenced unknown base type \"" + tname + "\"");
-        }
-
-        if (default_holder != base_info->default_holder) {
-            std::string tname(base.name());
-            detail::clean_type_id(tname);
-            pybind11_fail("generic_type: type \"" + std::string(name) + "\" "
-                          + (default_holder ? "does not have" : "has")
-                          + " a non-default holder type while its base \"" + tname + "\" "
-                          + (base_info->default_holder ? "does not" : "does"));
-        }
-
-        bases.append((PyObject *) base_info->type);
-
-#if PY_VERSION_HEX < 0x030B0000
-        dynamic_attr |= base_info->type->tp_dictoffset != 0;
-#else
-        dynamic_attr |= (base_info->type->tp_flags & Py_TPFLAGS_MANAGED_DICT) != 0;
-#endif
-
-        if (caster) {
-            base_info->implicit_casts.emplace_back(type, caster);
-        }
-    }
-};
-
-inline function_call::function_call(const function_record &f, handle p) : func(f), parent(p) {
-    args.reserve(f.nargs);
-    args_convert.reserve(f.nargs);
-}
-
-/// Tag for a new-style `__init__` defined in `detail/init.h`
-struct is_new_style_constructor {};
-
-/**
- * Partial template specializations to process custom attributes provided to
- * cpp_function_ and class_. These are either used to initialize the respective
- * fields in the type_record and function_record data structures or executed at
- * runtime to deal with custom call policies (e.g. keep_alive).
- */
-template <typename T, typename SFINAE = void>
-struct process_attribute;
-
-template <typename T>
-struct process_attribute_default {
-    /// Default implementation: do nothing
-    static void init(const T &, function_record *) {}
-    static void init(const T &, type_record *) {}
-    static void precall(function_call &) {}
-    static void postcall(function_call &, handle) {}
-};
-
-/// Process an attribute specifying the function's name
-template <>
-struct process_attribute<name> : process_attribute_default<name> {
-    static void init(const name &n, function_record *r) { r->name = const_cast<char *>(n.value); }
-};
-
-/// Process an attribute specifying the function's docstring
-template <>
-struct process_attribute<doc> : process_attribute_default<doc> {
-    static void init(const doc &n, function_record *r) { r->doc = const_cast<char *>(n.value); }
-};
-
-/// Process an attribute specifying the function's docstring (provided as a C-style string)
-template <>
-struct process_attribute<const char *> : process_attribute_default<const char *> {
-    static void init(const char *d, function_record *r) { r->doc = const_cast<char *>(d); }
-    static void init(const char *d, type_record *r) { r->doc = const_cast<char *>(d); }
-};
-template <>
-struct process_attribute<char *> : process_attribute<const char *> {};
-
-/// Process an attribute indicating the function's return value policy
-template <>
-struct process_attribute<return_value_policy> : process_attribute_default<return_value_policy> {
-    static void init(const return_value_policy &p, function_record *r) { r->policy = p; }
-};
-
-/// Process an attribute which indicates that this is an overloaded function associated with a
-/// given sibling
-template <>
-struct process_attribute<sibling> : process_attribute_default<sibling> {
-    static void init(const sibling &s, function_record *r) { r->sibling = s.value; }
-};
-
-/// Process an attribute which indicates that this function is a method
-template <>
-struct process_attribute<is_method> : process_attribute_default<is_method> {
-    static void init(const is_method &s, function_record *r) {
-        r->is_method = true;
-        r->scope = s.class_;
-    }
-};
-
-/// Process an attribute which indicates the parent scope of a method
-template <>
-struct process_attribute<scope> : process_attribute_default<scope> {
-    static void init(const scope &s, function_record *r) { r->scope = s.value; }
-};
-
-/// Process an attribute which indicates that this function is an operator
-template <>
-struct process_attribute<is_operator> : process_attribute_default<is_operator> {
-    static void init(const is_operator &, function_record *r) { r->is_operator = true; }
-};
-
-template <>
-struct process_attribute<is_new_style_constructor>
-    : process_attribute_default<is_new_style_constructor> {
-    static void init(const is_new_style_constructor &, function_record *r) {
-        r->is_new_style_constructor = true;
-    }
-};
-
-inline void check_kw_only_arg(const arg &a, function_record *r) {
-    if (r->args.size() > r->nargs_pos && (!a.name || a.name[0] == '\0')) {
-        pybind11_fail("arg(): cannot specify an unnamed argument after a kw_only() annotation or "
-                      "args() argument");
-    }
-}
-
-inline void append_self_arg_if_needed(function_record *r) {
-    if (r->is_method && r->args.empty()) {
-        r->args.emplace_back("self", nullptr, handle(), /*convert=*/true, /*none=*/false);
-    }
-}
-
-/// Process a keyword argument attribute (*without* a default value)
-template <>
-struct process_attribute<arg> : process_attribute_default<arg> {
-    static void init(const arg &a, function_record *r) {
-        append_self_arg_if_needed(r);
-        r->args.emplace_back(a.name, nullptr, handle(), !a.flag_noconvert, a.flag_none);
-
-        check_kw_only_arg(a, r);
-    }
-};
-
-/// Process a keyword argument attribute (*with* a default value)
-template <>
-struct process_attribute<arg_v> : process_attribute_default<arg_v> {
-    static void init(const arg_v &a, function_record *r) {
-        if (r->is_method && r->args.empty()) {
-            r->args.emplace_back(
-                "self", /*descr=*/nullptr, /*parent=*/handle(), /*convert=*/true, /*none=*/false);
-        }
-
-        if (!a.value) {
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-            std::string descr("'");
-            if (a.name) {
-                descr += std::string(a.name) + ": ";
-            }
-            descr += a.type + "'";
-            if (r->is_method) {
-                if (r->name) {
-                    descr += " in method '" + (std::string) str(r->scope) + "."
-                             + (std::string) r->name + "'";
-                } else {
-                    descr += " in method of '" + (std::string) str(r->scope) + "'";
-                }
-            } else if (r->name) {
-                descr += " in function '" + (std::string) r->name + "'";
-            }
-            pybind11_fail("arg(): could not convert default argument " + descr
-                          + " into a Python object (type not registered yet?)");
-#else
-            pybind11_fail("arg(): could not convert default argument "
-                          "into a Python object (type not registered yet?). "
-                          "#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for "
-                          "more information.");
-#endif
-        }
-        r->args.emplace_back(a.name, a.descr, a.value.inc_ref(), !a.flag_noconvert, a.flag_none);
-
-        check_kw_only_arg(a, r);
-    }
-};
-
-/// Process a keyword-only-arguments-follow pseudo argument
-template <>
-struct process_attribute<kw_only> : process_attribute_default<kw_only> {
-    static void init(const kw_only &, function_record *r) {
-        append_self_arg_if_needed(r);
-        if (r->has_args && r->nargs_pos != static_cast<std::uint16_t>(r->args.size())) {
-            pybind11_fail("Mismatched args() and kw_only(): they must occur at the same relative "
-                          "argument location (or omit kw_only() entirely)");
-        }
-        r->nargs_pos = static_cast<std::uint16_t>(r->args.size());
-    }
-};
-
-/// Process a positional-only-argument maker
-template <>
-struct process_attribute<pos_only> : process_attribute_default<pos_only> {
-    static void init(const pos_only &, function_record *r) {
-        append_self_arg_if_needed(r);
-        r->nargs_pos_only = static_cast<std::uint16_t>(r->args.size());
-        if (r->nargs_pos_only > r->nargs_pos) {
-            pybind11_fail("pos_only(): cannot follow a py::args() argument");
-        }
-        // It also can't follow a kw_only, but a static_assert in pybind11.h checks that
-    }
-};
-
-/// Process a parent class attribute.  Single inheritance only (class_ itself already guarantees
-/// that)
-template <typename T>
-struct process_attribute<T, enable_if_t<is_pyobject<T>::value>>
-    : process_attribute_default<handle> {
-    static void init(const handle &h, type_record *r) { r->bases.append(h); }
-};
-
-/// Process a parent class attribute (deprecated, does not support multiple inheritance)
-template <typename T>
-struct process_attribute<base<T>> : process_attribute_default<base<T>> {
-    static void init(const base<T> &, type_record *r) { r->add_base(typeid(T), nullptr); }
-};
-
-/// Process a multiple inheritance attribute
-template <>
-struct process_attribute<multiple_inheritance> : process_attribute_default<multiple_inheritance> {
-    static void init(const multiple_inheritance &, type_record *r) {
-        r->multiple_inheritance = true;
-    }
-};
-
-template <>
-struct process_attribute<dynamic_attr> : process_attribute_default<dynamic_attr> {
-    static void init(const dynamic_attr &, type_record *r) { r->dynamic_attr = true; }
-};
-
-template <>
-struct process_attribute<custom_type_setup> {
-    static void init(const custom_type_setup &value, type_record *r) {
-        r->custom_type_setup_callback = value.value;
-    }
-};
-
-template <>
-struct process_attribute<is_final> : process_attribute_default<is_final> {
-    static void init(const is_final &, type_record *r) { r->is_final = true; }
-};
-
-template <>
-struct process_attribute<buffer_protocol> : process_attribute_default<buffer_protocol> {
-    static void init(const buffer_protocol &, type_record *r) { r->buffer_protocol = true; }
-};
-
-template <>
-struct process_attribute<metaclass> : process_attribute_default<metaclass> {
-    static void init(const metaclass &m, type_record *r) { r->metaclass = m.value; }
-};
-
-template <>
-struct process_attribute<module_local> : process_attribute_default<module_local> {
-    static void init(const module_local &l, type_record *r) { r->module_local = l.value; }
-};
-
-/// Process a 'prepend' attribute, putting this at the beginning of the overload chain
-template <>
-struct process_attribute<prepend> : process_attribute_default<prepend> {
-    static void init(const prepend &, function_record *r) { r->prepend = true; }
-};
-
-/// Process an 'arithmetic' attribute for enums (does nothing here)
-template <>
-struct process_attribute<arithmetic> : process_attribute_default<arithmetic> {};
-
-template <typename... Ts>
-struct process_attribute<call_guard<Ts...>> : process_attribute_default<call_guard<Ts...>> {};
-
-/**
- * Process a keep_alive call policy -- invokes keep_alive_impl during the
- * pre-call handler if both Nurse, Patient != 0 and use the post-call handler
- * otherwise
- */
-template <size_t Nurse, size_t Patient>
-struct process_attribute<keep_alive<Nurse, Patient>>
-    : public process_attribute_default<keep_alive<Nurse, Patient>> {
-    template <size_t N = Nurse, size_t P = Patient, enable_if_t<N != 0 && P != 0, int> = 0>
-    static void precall(function_call &call) {
-        keep_alive_impl(Nurse, Patient, call, handle());
-    }
-    template <size_t N = Nurse, size_t P = Patient, enable_if_t<N != 0 && P != 0, int> = 0>
-    static void postcall(function_call &, handle) {}
-    template <size_t N = Nurse, size_t P = Patient, enable_if_t<N == 0 || P == 0, int> = 0>
-    static void precall(function_call &) {}
-    template <size_t N = Nurse, size_t P = Patient, enable_if_t<N == 0 || P == 0, int> = 0>
-    static void postcall(function_call &call, handle ret) {
-        keep_alive_impl(Nurse, Patient, call, ret);
-    }
-};
-
-/// Recursively iterate over variadic template arguments
-template <typename... Args>
-struct process_attributes {
-    static void init(const Args &...args, function_record *r) {
-        PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(r);
-        PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(r);
-        using expander = int[];
-        (void) expander{
-            0, ((void) process_attribute<typename std::decay<Args>::type>::init(args, r), 0)...};
-    }
-    static void init(const Args &...args, type_record *r) {
-        PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(r);
-        PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(r);
-        using expander = int[];
-        (void) expander{0,
-                        (process_attribute<typename std::decay<Args>::type>::init(args, r), 0)...};
-    }
-    static void precall(function_call &call) {
-        PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(call);
-        using expander = int[];
-        (void) expander{0,
-                        (process_attribute<typename std::decay<Args>::type>::precall(call), 0)...};
-    }
-    static void postcall(function_call &call, handle fn_ret) {
-        PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(call, fn_ret);
-        PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(fn_ret);
-        using expander = int[];
-        (void) expander{
-            0, (process_attribute<typename std::decay<Args>::type>::postcall(call, fn_ret), 0)...};
-    }
-};
-
-template <typename T>
-using is_call_guard = is_instantiation<call_guard, T>;
-
-/// Extract the ``type`` from the first `call_guard` in `Extras...` (or `void_type` if none found)
-template <typename... Extra>
-using extract_guard_t = typename exactly_one_t<is_call_guard, call_guard<>, Extra...>::type;
-
-/// Check the number of named arguments at compile time
-template <typename... Extra,
-          size_t named = constexpr_sum(std::is_base_of<arg, Extra>::value...),
-          size_t self = constexpr_sum(std::is_same<is_method, Extra>::value...)>
-constexpr bool expected_num_args(size_t nargs, bool has_args, bool has_kwargs) {
-    PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(nargs, has_args, has_kwargs);
-    return named == 0 || (self + named + size_t(has_args) + size_t(has_kwargs)) == nargs;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/buffer_info.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/buffer_info.h
deleted file mode 100644
index 06120d556..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/buffer_info.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-    pybind11/buffer_info.h: Python buffer object interface
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Default, C-style strides
-inline std::vector<ssize_t> c_strides(const std::vector<ssize_t> &shape, ssize_t itemsize) {
-    auto ndim = shape.size();
-    std::vector<ssize_t> strides(ndim, itemsize);
-    if (ndim > 0) {
-        for (size_t i = ndim - 1; i > 0; --i) {
-            strides[i - 1] = strides[i] * shape[i];
-        }
-    }
-    return strides;
-}
-
-// F-style strides; default when constructing an array_t with `ExtraFlags & f_style`
-inline std::vector<ssize_t> f_strides(const std::vector<ssize_t> &shape, ssize_t itemsize) {
-    auto ndim = shape.size();
-    std::vector<ssize_t> strides(ndim, itemsize);
-    for (size_t i = 1; i < ndim; ++i) {
-        strides[i] = strides[i - 1] * shape[i - 1];
-    }
-    return strides;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Information record describing a Python buffer object
-struct buffer_info {
-    void *ptr = nullptr;          // Pointer to the underlying storage
-    ssize_t itemsize = 0;         // Size of individual items in bytes
-    ssize_t size = 0;             // Total number of entries
-    std::string format;           // For homogeneous buffers, this should be set to
-                                  // format_descriptor<T>::format()
-    ssize_t ndim = 0;             // Number of dimensions
-    std::vector<ssize_t> shape;   // Shape of the tensor (1 entry per dimension)
-    std::vector<ssize_t> strides; // Number of bytes between adjacent entries
-                                  // (for each per dimension)
-    bool readonly = false;        // flag to indicate if the underlying storage may be written to
-
-    buffer_info() = default;
-
-    buffer_info(void *ptr,
-                ssize_t itemsize,
-                const std::string &format,
-                ssize_t ndim,
-                detail::any_container<ssize_t> shape_in,
-                detail::any_container<ssize_t> strides_in,
-                bool readonly = false)
-        : ptr(ptr), itemsize(itemsize), size(1), format(format), ndim(ndim),
-          shape(std::move(shape_in)), strides(std::move(strides_in)), readonly(readonly) {
-        if (ndim != (ssize_t) shape.size() || ndim != (ssize_t) strides.size()) {
-            pybind11_fail("buffer_info: ndim doesn't match shape and/or strides length");
-        }
-        for (size_t i = 0; i < (size_t) ndim; ++i) {
-            size *= shape[i];
-        }
-    }
-
-    template <typename T>
-    buffer_info(T *ptr,
-                detail::any_container<ssize_t> shape_in,
-                detail::any_container<ssize_t> strides_in,
-                bool readonly = false)
-        : buffer_info(private_ctr_tag(),
-                      ptr,
-                      sizeof(T),
-                      format_descriptor<T>::format(),
-                      static_cast<ssize_t>(shape_in->size()),
-                      std::move(shape_in),
-                      std::move(strides_in),
-                      readonly) {}
-
-    buffer_info(void *ptr,
-                ssize_t itemsize,
-                const std::string &format,
-                ssize_t size,
-                bool readonly = false)
-        : buffer_info(ptr, itemsize, format, 1, {size}, {itemsize}, readonly) {}
-
-    template <typename T>
-    buffer_info(T *ptr, ssize_t size, bool readonly = false)
-        : buffer_info(ptr, sizeof(T), format_descriptor<T>::format(), size, readonly) {}
-
-    template <typename T>
-    buffer_info(const T *ptr, ssize_t size, bool readonly = true)
-        : buffer_info(
-            const_cast<T *>(ptr), sizeof(T), format_descriptor<T>::format(), size, readonly) {}
-
-    explicit buffer_info(Py_buffer *view, bool ownview = true)
-        : buffer_info(
-            view->buf,
-            view->itemsize,
-            view->format,
-            view->ndim,
-            {view->shape, view->shape + view->ndim},
-            /* Though buffer::request() requests PyBUF_STRIDES, ctypes objects
-             * ignore this flag and return a view with NULL strides.
-             * When strides are NULL, build them manually.  */
-            view->strides
-                ? std::vector<ssize_t>(view->strides, view->strides + view->ndim)
-                : detail::c_strides({view->shape, view->shape + view->ndim}, view->itemsize),
-            (view->readonly != 0)) {
-        // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
-        this->m_view = view;
-        // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
-        this->ownview = ownview;
-    }
-
-    buffer_info(const buffer_info &) = delete;
-    buffer_info &operator=(const buffer_info &) = delete;
-
-    buffer_info(buffer_info &&other) noexcept { (*this) = std::move(other); }
-
-    buffer_info &operator=(buffer_info &&rhs) noexcept {
-        ptr = rhs.ptr;
-        itemsize = rhs.itemsize;
-        size = rhs.size;
-        format = std::move(rhs.format);
-        ndim = rhs.ndim;
-        shape = std::move(rhs.shape);
-        strides = std::move(rhs.strides);
-        std::swap(m_view, rhs.m_view);
-        std::swap(ownview, rhs.ownview);
-        readonly = rhs.readonly;
-        return *this;
-    }
-
-    ~buffer_info() {
-        if (m_view && ownview) {
-            PyBuffer_Release(m_view);
-            delete m_view;
-        }
-    }
-
-    Py_buffer *view() const { return m_view; }
-    Py_buffer *&view() { return m_view; }
-
-private:
-    struct private_ctr_tag {};
-
-    buffer_info(private_ctr_tag,
-                void *ptr,
-                ssize_t itemsize,
-                const std::string &format,
-                ssize_t ndim,
-                detail::any_container<ssize_t> &&shape_in,
-                detail::any_container<ssize_t> &&strides_in,
-                bool readonly)
-        : buffer_info(
-            ptr, itemsize, format, ndim, std::move(shape_in), std::move(strides_in), readonly) {}
-
-    Py_buffer *m_view = nullptr;
-    bool ownview = false;
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename T, typename SFINAE = void>
-struct compare_buffer_info {
-    static bool compare(const buffer_info &b) {
-        return b.format == format_descriptor<T>::format() && b.itemsize == (ssize_t) sizeof(T);
-    }
-};
-
-template <typename T>
-struct compare_buffer_info<T, detail::enable_if_t<std::is_integral<T>::value>> {
-    static bool compare(const buffer_info &b) {
-        return (size_t) b.itemsize == sizeof(T)
-               && (b.format == format_descriptor<T>::value
-                   || ((sizeof(T) == sizeof(long))
-                       && b.format == (std::is_unsigned<T>::value ? "L" : "l"))
-                   || ((sizeof(T) == sizeof(size_t))
-                       && b.format == (std::is_unsigned<T>::value ? "N" : "n")));
-    }
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/cast.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/cast.h
deleted file mode 100644
index a0e32281b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/cast.h
+++ /dev/null
@@ -1,1665 +0,0 @@
-/*
-    pybind11/cast.h: Partial template specializations to cast between
-    C++ and Python types
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-#include "detail/descr.h"
-#include "detail/type_caster_base.h"
-#include "detail/typeid.h"
-#include "pytypes.h"
-
-#include <array>
-#include <cstring>
-#include <functional>
-#include <iosfwd>
-#include <iterator>
-#include <memory>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename type, typename SFINAE = void>
-class type_caster : public type_caster_base<type> {};
-template <typename type>
-using make_caster = type_caster<intrinsic_t<type>>;
-
-// Shortcut for calling a caster's `cast_op_type` cast operator for casting a type_caster to a T
-template <typename T>
-typename make_caster<T>::template cast_op_type<T> cast_op(make_caster<T> &caster) {
-    return caster.operator typename make_caster<T>::template cast_op_type<T>();
-}
-template <typename T>
-typename make_caster<T>::template cast_op_type<typename std::add_rvalue_reference<T>::type>
-cast_op(make_caster<T> &&caster) {
-    return std::move(caster).operator typename make_caster<T>::
-        template cast_op_type<typename std::add_rvalue_reference<T>::type>();
-}
-
-template <typename type>
-class type_caster<std::reference_wrapper<type>> {
-private:
-    using caster_t = make_caster<type>;
-    caster_t subcaster;
-    using reference_t = type &;
-    using subcaster_cast_op_type = typename caster_t::template cast_op_type<reference_t>;
-
-    static_assert(
-        std::is_same<typename std::remove_const<type>::type &, subcaster_cast_op_type>::value
-            || std::is_same<reference_t, subcaster_cast_op_type>::value,
-        "std::reference_wrapper<T> caster requires T to have a caster with an "
-        "`operator T &()` or `operator const T &()`");
-
-public:
-    bool load(handle src, bool convert) { return subcaster.load(src, convert); }
-    static constexpr auto name = caster_t::name;
-    static handle
-    cast(const std::reference_wrapper<type> &src, return_value_policy policy, handle parent) {
-        // It is definitely wrong to take ownership of this pointer, so mask that rvp
-        if (policy == return_value_policy::take_ownership
-            || policy == return_value_policy::automatic) {
-            policy = return_value_policy::automatic_reference;
-        }
-        return caster_t::cast(&src.get(), policy, parent);
-    }
-    template <typename T>
-    using cast_op_type = std::reference_wrapper<type>;
-    explicit operator std::reference_wrapper<type>() { return cast_op<type &>(subcaster); }
-};
-
-#define PYBIND11_TYPE_CASTER(type, py_name)                                                       \
-protected:                                                                                        \
-    type value;                                                                                   \
-                                                                                                  \
-public:                                                                                           \
-    static constexpr auto name = py_name;                                                         \
-    template <typename T_,                                                                        \
-              ::pybind11::detail::enable_if_t<                                                    \
-                  std::is_same<type, ::pybind11::detail::remove_cv_t<T_>>::value,                 \
-                  int> = 0>                                                                       \
-    static ::pybind11::handle cast(                                                               \
-        T_ *src, ::pybind11::return_value_policy policy, ::pybind11::handle parent) {             \
-        if (!src)                                                                                 \
-            return ::pybind11::none().release();                                                  \
-        if (policy == ::pybind11::return_value_policy::take_ownership) {                          \
-            auto h = cast(std::move(*src), policy, parent);                                       \
-            delete src;                                                                           \
-            return h;                                                                             \
-        }                                                                                         \
-        return cast(*src, policy, parent);                                                        \
-    }                                                                                             \
-    operator type *() { return &value; }               /* NOLINT(bugprone-macro-parentheses) */   \
-    operator type &() { return value; }                /* NOLINT(bugprone-macro-parentheses) */   \
-    operator type &&() && { return std::move(value); } /* NOLINT(bugprone-macro-parentheses) */   \
-    template <typename T_>                                                                        \
-    using cast_op_type = ::pybind11::detail::movable_cast_op_type<T_>
-
-template <typename CharT>
-using is_std_char_type = any_of<std::is_same<CharT, char>, /* std::string */
-#if defined(PYBIND11_HAS_U8STRING)
-                                std::is_same<CharT, char8_t>, /* std::u8string */
-#endif
-                                std::is_same<CharT, char16_t>, /* std::u16string */
-                                std::is_same<CharT, char32_t>, /* std::u32string */
-                                std::is_same<CharT, wchar_t>   /* std::wstring */
-                                >;
-
-template <typename T>
-struct type_caster<T, enable_if_t<std::is_arithmetic<T>::value && !is_std_char_type<T>::value>> {
-    using _py_type_0 = conditional_t<sizeof(T) <= sizeof(long), long, long long>;
-    using _py_type_1 = conditional_t<std::is_signed<T>::value,
-                                     _py_type_0,
-                                     typename std::make_unsigned<_py_type_0>::type>;
-    using py_type = conditional_t<std::is_floating_point<T>::value, double, _py_type_1>;
-
-public:
-    bool load(handle src, bool convert) {
-        py_type py_value;
-
-        if (!src) {
-            return false;
-        }
-
-#if !defined(PYPY_VERSION)
-        auto index_check = [](PyObject *o) { return PyIndex_Check(o); };
-#else
-        // In PyPy 7.3.3, `PyIndex_Check` is implemented by calling `__index__`,
-        // while CPython only considers the existence of `nb_index`/`__index__`.
-        auto index_check = [](PyObject *o) { return hasattr(o, "__index__"); };
-#endif
-
-        if (std::is_floating_point<T>::value) {
-            if (convert || PyFloat_Check(src.ptr())) {
-                py_value = (py_type) PyFloat_AsDouble(src.ptr());
-            } else {
-                return false;
-            }
-        } else if (PyFloat_Check(src.ptr())
-                   || (!convert && !PYBIND11_LONG_CHECK(src.ptr()) && !index_check(src.ptr()))) {
-            return false;
-        } else {
-            handle src_or_index = src;
-            // PyPy: 7.3.7's 3.8 does not implement PyLong_*'s __index__ calls.
-#if PY_VERSION_HEX < 0x03080000 || defined(PYPY_VERSION)
-            object index;
-            if (!PYBIND11_LONG_CHECK(src.ptr())) { // So: index_check(src.ptr())
-                index = reinterpret_steal<object>(PyNumber_Index(src.ptr()));
-                if (!index) {
-                    PyErr_Clear();
-                    if (!convert)
-                        return false;
-                } else {
-                    src_or_index = index;
-                }
-            }
-#endif
-            if (std::is_unsigned<py_type>::value) {
-                py_value = as_unsigned<py_type>(src_or_index.ptr());
-            } else { // signed integer:
-                py_value = sizeof(T) <= sizeof(long)
-                               ? (py_type) PyLong_AsLong(src_or_index.ptr())
-                               : (py_type) PYBIND11_LONG_AS_LONGLONG(src_or_index.ptr());
-            }
-        }
-
-        // Python API reported an error
-        bool py_err = py_value == (py_type) -1 && PyErr_Occurred();
-
-        // Check to see if the conversion is valid (integers should match exactly)
-        // Signed/unsigned checks happen elsewhere
-        if (py_err
-            || (std::is_integral<T>::value && sizeof(py_type) != sizeof(T)
-                && py_value != (py_type) (T) py_value)) {
-            PyErr_Clear();
-            if (py_err && convert && (PyNumber_Check(src.ptr()) != 0)) {
-                auto tmp = reinterpret_steal<object>(std::is_floating_point<T>::value
-                                                         ? PyNumber_Float(src.ptr())
-                                                         : PyNumber_Long(src.ptr()));
-                PyErr_Clear();
-                return load(tmp, false);
-            }
-            return false;
-        }
-
-        value = (T) py_value;
-        return true;
-    }
-
-    template <typename U = T>
-    static typename std::enable_if<std::is_floating_point<U>::value, handle>::type
-    cast(U src, return_value_policy /* policy */, handle /* parent */) {
-        return PyFloat_FromDouble((double) src);
-    }
-
-    template <typename U = T>
-    static typename std::enable_if<!std::is_floating_point<U>::value && std::is_signed<U>::value
-                                       && (sizeof(U) <= sizeof(long)),
-                                   handle>::type
-    cast(U src, return_value_policy /* policy */, handle /* parent */) {
-        return PYBIND11_LONG_FROM_SIGNED((long) src);
-    }
-
-    template <typename U = T>
-    static typename std::enable_if<!std::is_floating_point<U>::value && std::is_unsigned<U>::value
-                                       && (sizeof(U) <= sizeof(unsigned long)),
-                                   handle>::type
-    cast(U src, return_value_policy /* policy */, handle /* parent */) {
-        return PYBIND11_LONG_FROM_UNSIGNED((unsigned long) src);
-    }
-
-    template <typename U = T>
-    static typename std::enable_if<!std::is_floating_point<U>::value && std::is_signed<U>::value
-                                       && (sizeof(U) > sizeof(long)),
-                                   handle>::type
-    cast(U src, return_value_policy /* policy */, handle /* parent */) {
-        return PyLong_FromLongLong((long long) src);
-    }
-
-    template <typename U = T>
-    static typename std::enable_if<!std::is_floating_point<U>::value && std::is_unsigned<U>::value
-                                       && (sizeof(U) > sizeof(unsigned long)),
-                                   handle>::type
-    cast(U src, return_value_policy /* policy */, handle /* parent */) {
-        return PyLong_FromUnsignedLongLong((unsigned long long) src);
-    }
-
-    PYBIND11_TYPE_CASTER(T, const_name<std::is_integral<T>::value>("int", "float"));
-};
-
-template <typename T>
-struct void_caster {
-public:
-    bool load(handle src, bool) {
-        if (src && src.is_none()) {
-            return true;
-        }
-        return false;
-    }
-    static handle cast(T, return_value_policy /* policy */, handle /* parent */) {
-        return none().inc_ref();
-    }
-    PYBIND11_TYPE_CASTER(T, const_name("None"));
-};
-
-template <>
-class type_caster<void_type> : public void_caster<void_type> {};
-
-template <>
-class type_caster<void> : public type_caster<void_type> {
-public:
-    using type_caster<void_type>::cast;
-
-    bool load(handle h, bool) {
-        if (!h) {
-            return false;
-        }
-        if (h.is_none()) {
-            value = nullptr;
-            return true;
-        }
-
-        /* Check if this is a capsule */
-        if (isinstance<capsule>(h)) {
-            value = reinterpret_borrow<capsule>(h);
-            return true;
-        }
-
-        /* Check if this is a C++ type */
-        const auto &bases = all_type_info((PyTypeObject *) type::handle_of(h).ptr());
-        if (bases.size() == 1) { // Only allowing loading from a single-value type
-            value = values_and_holders(reinterpret_cast<instance *>(h.ptr())).begin()->value_ptr();
-            return true;
-        }
-
-        /* Fail */
-        return false;
-    }
-
-    static handle cast(const void *ptr, return_value_policy /* policy */, handle /* parent */) {
-        if (ptr) {
-            return capsule(ptr).release();
-        }
-        return none().inc_ref();
-    }
-
-    template <typename T>
-    using cast_op_type = void *&;
-    explicit operator void *&() { return value; }
-    static constexpr auto name = const_name("capsule");
-
-private:
-    void *value = nullptr;
-};
-
-template <>
-class type_caster<std::nullptr_t> : public void_caster<std::nullptr_t> {};
-
-template <>
-class type_caster<bool> {
-public:
-    bool load(handle src, bool convert) {
-        if (!src) {
-            return false;
-        }
-        if (src.ptr() == Py_True) {
-            value = true;
-            return true;
-        }
-        if (src.ptr() == Py_False) {
-            value = false;
-            return true;
-        }
-        if (convert || (std::strcmp("numpy.bool_", Py_TYPE(src.ptr())->tp_name) == 0)) {
-            // (allow non-implicit conversion for numpy booleans)
-
-            Py_ssize_t res = -1;
-            if (src.is_none()) {
-                res = 0; // None is implicitly converted to False
-            }
-#if defined(PYPY_VERSION)
-            // On PyPy, check that "__bool__" attr exists
-            else if (hasattr(src, PYBIND11_BOOL_ATTR)) {
-                res = PyObject_IsTrue(src.ptr());
-            }
-#else
-            // Alternate approach for CPython: this does the same as the above, but optimized
-            // using the CPython API so as to avoid an unneeded attribute lookup.
-            else if (auto *tp_as_number = src.ptr()->ob_type->tp_as_number) {
-                if (PYBIND11_NB_BOOL(tp_as_number)) {
-                    res = (*PYBIND11_NB_BOOL(tp_as_number))(src.ptr());
-                }
-            }
-#endif
-            if (res == 0 || res == 1) {
-                value = (res != 0);
-                return true;
-            }
-            PyErr_Clear();
-        }
-        return false;
-    }
-    static handle cast(bool src, return_value_policy /* policy */, handle /* parent */) {
-        return handle(src ? Py_True : Py_False).inc_ref();
-    }
-    PYBIND11_TYPE_CASTER(bool, const_name("bool"));
-};
-
-// Helper class for UTF-{8,16,32} C++ stl strings:
-template <typename StringType, bool IsView = false>
-struct string_caster {
-    using CharT = typename StringType::value_type;
-
-    // Simplify life by being able to assume standard char sizes (the standard only guarantees
-    // minimums, but Python requires exact sizes)
-    static_assert(!std::is_same<CharT, char>::value || sizeof(CharT) == 1,
-                  "Unsupported char size != 1");
-#if defined(PYBIND11_HAS_U8STRING)
-    static_assert(!std::is_same<CharT, char8_t>::value || sizeof(CharT) == 1,
-                  "Unsupported char8_t size != 1");
-#endif
-    static_assert(!std::is_same<CharT, char16_t>::value || sizeof(CharT) == 2,
-                  "Unsupported char16_t size != 2");
-    static_assert(!std::is_same<CharT, char32_t>::value || sizeof(CharT) == 4,
-                  "Unsupported char32_t size != 4");
-    // wchar_t can be either 16 bits (Windows) or 32 (everywhere else)
-    static_assert(!std::is_same<CharT, wchar_t>::value || sizeof(CharT) == 2 || sizeof(CharT) == 4,
-                  "Unsupported wchar_t size != 2/4");
-    static constexpr size_t UTF_N = 8 * sizeof(CharT);
-
-    bool load(handle src, bool) {
-        handle load_src = src;
-        if (!src) {
-            return false;
-        }
-        if (!PyUnicode_Check(load_src.ptr())) {
-            return load_raw(load_src);
-        }
-
-        // For UTF-8 we avoid the need for a temporary `bytes` object by using
-        // `PyUnicode_AsUTF8AndSize`.
-        if (PYBIND11_SILENCE_MSVC_C4127(UTF_N == 8)) {
-            Py_ssize_t size = -1;
-            const auto *buffer
-                = reinterpret_cast<const CharT *>(PyUnicode_AsUTF8AndSize(load_src.ptr(), &size));
-            if (!buffer) {
-                PyErr_Clear();
-                return false;
-            }
-            value = StringType(buffer, static_cast<size_t>(size));
-            return true;
-        }
-
-        auto utfNbytes
-            = reinterpret_steal<object>(PyUnicode_AsEncodedString(load_src.ptr(),
-                                                                  UTF_N == 8    ? "utf-8"
-                                                                  : UTF_N == 16 ? "utf-16"
-                                                                                : "utf-32",
-                                                                  nullptr));
-        if (!utfNbytes) {
-            PyErr_Clear();
-            return false;
-        }
-
-        const auto *buffer
-            = reinterpret_cast<const CharT *>(PYBIND11_BYTES_AS_STRING(utfNbytes.ptr()));
-        size_t length = (size_t) PYBIND11_BYTES_SIZE(utfNbytes.ptr()) / sizeof(CharT);
-        // Skip BOM for UTF-16/32
-        if (PYBIND11_SILENCE_MSVC_C4127(UTF_N > 8)) {
-            buffer++;
-            length--;
-        }
-        value = StringType(buffer, length);
-
-        // If we're loading a string_view we need to keep the encoded Python object alive:
-        if (IsView) {
-            loader_life_support::add_patient(utfNbytes);
-        }
-
-        return true;
-    }
-
-    static handle
-    cast(const StringType &src, return_value_policy /* policy */, handle /* parent */) {
-        const char *buffer = reinterpret_cast<const char *>(src.data());
-        auto nbytes = ssize_t(src.size() * sizeof(CharT));
-        handle s = decode_utfN(buffer, nbytes);
-        if (!s) {
-            throw error_already_set();
-        }
-        return s;
-    }
-
-    PYBIND11_TYPE_CASTER(StringType, const_name(PYBIND11_STRING_NAME));
-
-private:
-    static handle decode_utfN(const char *buffer, ssize_t nbytes) {
-#if !defined(PYPY_VERSION)
-        return UTF_N == 8    ? PyUnicode_DecodeUTF8(buffer, nbytes, nullptr)
-               : UTF_N == 16 ? PyUnicode_DecodeUTF16(buffer, nbytes, nullptr, nullptr)
-                             : PyUnicode_DecodeUTF32(buffer, nbytes, nullptr, nullptr);
-#else
-        // PyPy segfaults when on PyUnicode_DecodeUTF16 (and possibly on PyUnicode_DecodeUTF32 as
-        // well), so bypass the whole thing by just passing the encoding as a string value, which
-        // works properly:
-        return PyUnicode_Decode(buffer,
-                                nbytes,
-                                UTF_N == 8    ? "utf-8"
-                                : UTF_N == 16 ? "utf-16"
-                                              : "utf-32",
-                                nullptr);
-#endif
-    }
-
-    // When loading into a std::string or char*, accept a bytes/bytearray object as-is (i.e.
-    // without any encoding/decoding attempt).  For other C++ char sizes this is a no-op.
-    // which supports loading a unicode from a str, doesn't take this path.
-    template <typename C = CharT>
-    bool load_raw(enable_if_t<std::is_same<C, char>::value, handle> src) {
-        if (PYBIND11_BYTES_CHECK(src.ptr())) {
-            // We were passed raw bytes; accept it into a std::string or char*
-            // without any encoding attempt.
-            const char *bytes = PYBIND11_BYTES_AS_STRING(src.ptr());
-            if (!bytes) {
-                pybind11_fail("Unexpected PYBIND11_BYTES_AS_STRING() failure.");
-            }
-            value = StringType(bytes, (size_t) PYBIND11_BYTES_SIZE(src.ptr()));
-            return true;
-        }
-        if (PyByteArray_Check(src.ptr())) {
-            // We were passed a bytearray; accept it into a std::string or char*
-            // without any encoding attempt.
-            const char *bytearray = PyByteArray_AsString(src.ptr());
-            if (!bytearray) {
-                pybind11_fail("Unexpected PyByteArray_AsString() failure.");
-            }
-            value = StringType(bytearray, (size_t) PyByteArray_Size(src.ptr()));
-            return true;
-        }
-
-        return false;
-    }
-
-    template <typename C = CharT>
-    bool load_raw(enable_if_t<!std::is_same<C, char>::value, handle>) {
-        return false;
-    }
-};
-
-template <typename CharT, class Traits, class Allocator>
-struct type_caster<std::basic_string<CharT, Traits, Allocator>,
-                   enable_if_t<is_std_char_type<CharT>::value>>
-    : string_caster<std::basic_string<CharT, Traits, Allocator>> {};
-
-#ifdef PYBIND11_HAS_STRING_VIEW
-template <typename CharT, class Traits>
-struct type_caster<std::basic_string_view<CharT, Traits>,
-                   enable_if_t<is_std_char_type<CharT>::value>>
-    : string_caster<std::basic_string_view<CharT, Traits>, true> {};
-#endif
-
-// Type caster for C-style strings.  We basically use a std::string type caster, but also add the
-// ability to use None as a nullptr char* (which the string caster doesn't allow).
-template <typename CharT>
-struct type_caster<CharT, enable_if_t<is_std_char_type<CharT>::value>> {
-    using StringType = std::basic_string<CharT>;
-    using StringCaster = make_caster<StringType>;
-    StringCaster str_caster;
-    bool none = false;
-    CharT one_char = 0;
-
-public:
-    bool load(handle src, bool convert) {
-        if (!src) {
-            return false;
-        }
-        if (src.is_none()) {
-            // Defer accepting None to other overloads (if we aren't in convert mode):
-            if (!convert) {
-                return false;
-            }
-            none = true;
-            return true;
-        }
-        return str_caster.load(src, convert);
-    }
-
-    static handle cast(const CharT *src, return_value_policy policy, handle parent) {
-        if (src == nullptr) {
-            return pybind11::none().inc_ref();
-        }
-        return StringCaster::cast(StringType(src), policy, parent);
-    }
-
-    static handle cast(CharT src, return_value_policy policy, handle parent) {
-        if (std::is_same<char, CharT>::value) {
-            handle s = PyUnicode_DecodeLatin1((const char *) &src, 1, nullptr);
-            if (!s) {
-                throw error_already_set();
-            }
-            return s;
-        }
-        return StringCaster::cast(StringType(1, src), policy, parent);
-    }
-
-    explicit operator CharT *() {
-        return none ? nullptr : const_cast<CharT *>(static_cast<StringType &>(str_caster).c_str());
-    }
-    explicit operator CharT &() {
-        if (none) {
-            throw value_error("Cannot convert None to a character");
-        }
-
-        auto &value = static_cast<StringType &>(str_caster);
-        size_t str_len = value.size();
-        if (str_len == 0) {
-            throw value_error("Cannot convert empty string to a character");
-        }
-
-        // If we're in UTF-8 mode, we have two possible failures: one for a unicode character that
-        // is too high, and one for multiple unicode characters (caught later), so we need to
-        // figure out how long the first encoded character is in bytes to distinguish between these
-        // two errors.  We also allow want to allow unicode characters U+0080 through U+00FF, as
-        // those can fit into a single char value.
-        if (PYBIND11_SILENCE_MSVC_C4127(StringCaster::UTF_N == 8) && str_len > 1 && str_len <= 4) {
-            auto v0 = static_cast<unsigned char>(value[0]);
-            // low bits only: 0-127
-            // 0b110xxxxx - start of 2-byte sequence
-            // 0b1110xxxx - start of 3-byte sequence
-            // 0b11110xxx - start of 4-byte sequence
-            size_t char0_bytes = (v0 & 0x80) == 0      ? 1
-                                 : (v0 & 0xE0) == 0xC0 ? 2
-                                 : (v0 & 0xF0) == 0xE0 ? 3
-                                                       : 4;
-
-            if (char0_bytes == str_len) {
-                // If we have a 128-255 value, we can decode it into a single char:
-                if (char0_bytes == 2 && (v0 & 0xFC) == 0xC0) { // 0x110000xx 0x10xxxxxx
-                    one_char = static_cast<CharT>(((v0 & 3) << 6)
-                                                  + (static_cast<unsigned char>(value[1]) & 0x3F));
-                    return one_char;
-                }
-                // Otherwise we have a single character, but it's > U+00FF
-                throw value_error("Character code point not in range(0x100)");
-            }
-        }
-
-        // UTF-16 is much easier: we can only have a surrogate pair for values above U+FFFF, thus a
-        // surrogate pair with total length 2 instantly indicates a range error (but not a "your
-        // string was too long" error).
-        else if (PYBIND11_SILENCE_MSVC_C4127(StringCaster::UTF_N == 16) && str_len == 2) {
-            one_char = static_cast<CharT>(value[0]);
-            if (one_char >= 0xD800 && one_char < 0xE000) {
-                throw value_error("Character code point not in range(0x10000)");
-            }
-        }
-
-        if (str_len != 1) {
-            throw value_error("Expected a character, but multi-character string found");
-        }
-
-        one_char = value[0];
-        return one_char;
-    }
-
-    static constexpr auto name = const_name(PYBIND11_STRING_NAME);
-    template <typename _T>
-    using cast_op_type = pybind11::detail::cast_op_type<_T>;
-};
-
-// Base implementation for std::tuple and std::pair
-template <template <typename...> class Tuple, typename... Ts>
-class tuple_caster {
-    using type = Tuple<Ts...>;
-    static constexpr auto size = sizeof...(Ts);
-    using indices = make_index_sequence<size>;
-
-public:
-    bool load(handle src, bool convert) {
-        if (!isinstance<sequence>(src)) {
-            return false;
-        }
-        const auto seq = reinterpret_borrow<sequence>(src);
-        if (seq.size() != size) {
-            return false;
-        }
-        return load_impl(seq, convert, indices{});
-    }
-
-    template <typename T>
-    static handle cast(T &&src, return_value_policy policy, handle parent) {
-        return cast_impl(std::forward<T>(src), policy, parent, indices{});
-    }
-
-    // copied from the PYBIND11_TYPE_CASTER macro
-    template <typename T>
-    static handle cast(T *src, return_value_policy policy, handle parent) {
-        if (!src) {
-            return none().release();
-        }
-        if (policy == return_value_policy::take_ownership) {
-            auto h = cast(std::move(*src), policy, parent);
-            delete src;
-            return h;
-        }
-        return cast(*src, policy, parent);
-    }
-
-    static constexpr auto name
-        = const_name("Tuple[") + concat(make_caster<Ts>::name...) + const_name("]");
-
-    template <typename T>
-    using cast_op_type = type;
-
-    explicit operator type() & { return implicit_cast(indices{}); }
-    explicit operator type() && { return std::move(*this).implicit_cast(indices{}); }
-
-protected:
-    template <size_t... Is>
-    type implicit_cast(index_sequence<Is...>) & {
-        return type(cast_op<Ts>(std::get<Is>(subcasters))...);
-    }
-    template <size_t... Is>
-    type implicit_cast(index_sequence<Is...>) && {
-        return type(cast_op<Ts>(std::move(std::get<Is>(subcasters)))...);
-    }
-
-    static constexpr bool load_impl(const sequence &, bool, index_sequence<>) { return true; }
-
-    template <size_t... Is>
-    bool load_impl(const sequence &seq, bool convert, index_sequence<Is...>) {
-#ifdef __cpp_fold_expressions
-        if ((... || !std::get<Is>(subcasters).load(seq[Is], convert))) {
-            return false;
-        }
-#else
-        for (bool r : {std::get<Is>(subcasters).load(seq[Is], convert)...}) {
-            if (!r) {
-                return false;
-            }
-        }
-#endif
-        return true;
-    }
-
-    /* Implementation: Convert a C++ tuple into a Python tuple */
-    template <typename T, size_t... Is>
-    static handle
-    cast_impl(T &&src, return_value_policy policy, handle parent, index_sequence<Is...>) {
-        PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(src, policy, parent);
-        PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(policy, parent);
-        std::array<object, size> entries{{reinterpret_steal<object>(
-            make_caster<Ts>::cast(std::get<Is>(std::forward<T>(src)), policy, parent))...}};
-        for (const auto &entry : entries) {
-            if (!entry) {
-                return handle();
-            }
-        }
-        tuple result(size);
-        int counter = 0;
-        for (auto &entry : entries) {
-            PyTuple_SET_ITEM(result.ptr(), counter++, entry.release().ptr());
-        }
-        return result.release();
-    }
-
-    Tuple<make_caster<Ts>...> subcasters;
-};
-
-template <typename T1, typename T2>
-class type_caster<std::pair<T1, T2>> : public tuple_caster<std::pair, T1, T2> {};
-
-template <typename... Ts>
-class type_caster<std::tuple<Ts...>> : public tuple_caster<std::tuple, Ts...> {};
-
-/// Helper class which abstracts away certain actions. Users can provide specializations for
-/// custom holders, but it's only necessary if the type has a non-standard interface.
-template <typename T>
-struct holder_helper {
-    static auto get(const T &p) -> decltype(p.get()) { return p.get(); }
-};
-
-/// Type caster for holder types like std::shared_ptr, etc.
-/// The SFINAE hook is provided to help work around the current lack of support
-/// for smart-pointer interoperability. Please consider it an implementation
-/// detail that may change in the future, as formal support for smart-pointer
-/// interoperability is added into pybind11.
-template <typename type, typename holder_type, typename SFINAE = void>
-struct copyable_holder_caster : public type_caster_base<type> {
-public:
-    using base = type_caster_base<type>;
-    static_assert(std::is_base_of<base, type_caster<type>>::value,
-                  "Holder classes are only supported for custom types");
-    using base::base;
-    using base::cast;
-    using base::typeinfo;
-    using base::value;
-
-    bool load(handle src, bool convert) {
-        return base::template load_impl<copyable_holder_caster<type, holder_type>>(src, convert);
-    }
-
-    explicit operator type *() { return this->value; }
-    // static_cast works around compiler error with MSVC 17 and CUDA 10.2
-    // see issue #2180
-    explicit operator type &() { return *(static_cast<type *>(this->value)); }
-    explicit operator holder_type *() { return std::addressof(holder); }
-    explicit operator holder_type &() { return holder; }
-
-    static handle cast(const holder_type &src, return_value_policy, handle) {
-        const auto *ptr = holder_helper<holder_type>::get(src);
-        return type_caster_base<type>::cast_holder(ptr, &src);
-    }
-
-protected:
-    friend class type_caster_generic;
-    void check_holder_compat() {
-        if (typeinfo->default_holder) {
-            throw cast_error("Unable to load a custom holder type from a default-holder instance");
-        }
-    }
-
-    bool load_value(value_and_holder &&v_h) {
-        if (v_h.holder_constructed()) {
-            value = v_h.value_ptr();
-            holder = v_h.template holder<holder_type>();
-            return true;
-        }
-        throw cast_error("Unable to cast from non-held to held instance (T& to Holder<T>) "
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-                         "(#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for "
-                         "type information)");
-#else
-                         "of type '"
-                         + type_id<holder_type>() + "''");
-#endif
-    }
-
-    template <typename T = holder_type,
-              detail::enable_if_t<!std::is_constructible<T, const T &, type *>::value, int> = 0>
-    bool try_implicit_casts(handle, bool) {
-        return false;
-    }
-
-    template <typename T = holder_type,
-              detail::enable_if_t<std::is_constructible<T, const T &, type *>::value, int> = 0>
-    bool try_implicit_casts(handle src, bool convert) {
-        for (auto &cast : typeinfo->implicit_casts) {
-            copyable_holder_caster sub_caster(*cast.first);
-            if (sub_caster.load(src, convert)) {
-                value = cast.second(sub_caster.value);
-                holder = holder_type(sub_caster.holder, (type *) value);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    static bool try_direct_conversions(handle) { return false; }
-
-    holder_type holder;
-};
-
-/// Specialize for the common std::shared_ptr, so users don't need to
-template <typename T>
-class type_caster<std::shared_ptr<T>> : public copyable_holder_caster<T, std::shared_ptr<T>> {};
-
-/// Type caster for holder types like std::unique_ptr.
-/// Please consider the SFINAE hook an implementation detail, as explained
-/// in the comment for the copyable_holder_caster.
-template <typename type, typename holder_type, typename SFINAE = void>
-struct move_only_holder_caster {
-    static_assert(std::is_base_of<type_caster_base<type>, type_caster<type>>::value,
-                  "Holder classes are only supported for custom types");
-
-    static handle cast(holder_type &&src, return_value_policy, handle) {
-        auto *ptr = holder_helper<holder_type>::get(src);
-        return type_caster_base<type>::cast_holder(ptr, std::addressof(src));
-    }
-    static constexpr auto name = type_caster_base<type>::name;
-};
-
-template <typename type, typename deleter>
-class type_caster<std::unique_ptr<type, deleter>>
-    : public move_only_holder_caster<type, std::unique_ptr<type, deleter>> {};
-
-template <typename type, typename holder_type>
-using type_caster_holder = conditional_t<is_copy_constructible<holder_type>::value,
-                                         copyable_holder_caster<type, holder_type>,
-                                         move_only_holder_caster<type, holder_type>>;
-
-template <typename T, bool Value = false>
-struct always_construct_holder {
-    static constexpr bool value = Value;
-};
-
-/// Create a specialization for custom holder types (silently ignores std::shared_ptr)
-#define PYBIND11_DECLARE_HOLDER_TYPE(type, holder_type, ...)                                      \
-    PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)                                                  \
-    namespace detail {                                                                            \
-    template <typename type>                                                                      \
-    struct always_construct_holder<holder_type> : always_construct_holder<void, ##__VA_ARGS__> {  \
-    };                                                                                            \
-    template <typename type>                                                                      \
-    class type_caster<holder_type, enable_if_t<!is_shared_ptr<holder_type>::value>>               \
-        : public type_caster_holder<type, holder_type> {};                                        \
-    }                                                                                             \
-    PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-// PYBIND11_DECLARE_HOLDER_TYPE holder types:
-template <typename base, typename holder>
-struct is_holder_type
-    : std::is_base_of<detail::type_caster_holder<base, holder>, detail::type_caster<holder>> {};
-// Specialization for always-supported unique_ptr holders:
-template <typename base, typename deleter>
-struct is_holder_type<base, std::unique_ptr<base, deleter>> : std::true_type {};
-
-template <typename T>
-struct handle_type_name {
-    static constexpr auto name = const_name<T>();
-};
-template <>
-struct handle_type_name<bool_> {
-    static constexpr auto name = const_name("bool");
-};
-template <>
-struct handle_type_name<bytes> {
-    static constexpr auto name = const_name(PYBIND11_BYTES_NAME);
-};
-template <>
-struct handle_type_name<int_> {
-    static constexpr auto name = const_name("int");
-};
-template <>
-struct handle_type_name<iterable> {
-    static constexpr auto name = const_name("Iterable");
-};
-template <>
-struct handle_type_name<iterator> {
-    static constexpr auto name = const_name("Iterator");
-};
-template <>
-struct handle_type_name<float_> {
-    static constexpr auto name = const_name("float");
-};
-template <>
-struct handle_type_name<none> {
-    static constexpr auto name = const_name("None");
-};
-template <>
-struct handle_type_name<args> {
-    static constexpr auto name = const_name("*args");
-};
-template <>
-struct handle_type_name<kwargs> {
-    static constexpr auto name = const_name("**kwargs");
-};
-
-template <typename type>
-struct pyobject_caster {
-    template <typename T = type, enable_if_t<std::is_same<T, handle>::value, int> = 0>
-    pyobject_caster() : value() {}
-
-    // `type` may not be default constructible (e.g. frozenset, anyset).  Initializing `value`
-    // to a nil handle is safe since it will only be accessed if `load` succeeds.
-    template <typename T = type, enable_if_t<std::is_base_of<object, T>::value, int> = 0>
-    pyobject_caster() : value(reinterpret_steal<type>(handle())) {}
-
-    template <typename T = type, enable_if_t<std::is_same<T, handle>::value, int> = 0>
-    bool load(handle src, bool /* convert */) {
-        value = src;
-        return static_cast<bool>(value);
-    }
-
-    template <typename T = type, enable_if_t<std::is_base_of<object, T>::value, int> = 0>
-    bool load(handle src, bool /* convert */) {
-        if (!isinstance<type>(src)) {
-            return false;
-        }
-        value = reinterpret_borrow<type>(src);
-        return true;
-    }
-
-    static handle cast(const handle &src, return_value_policy /* policy */, handle /* parent */) {
-        return src.inc_ref();
-    }
-    PYBIND11_TYPE_CASTER(type, handle_type_name<type>::name);
-};
-
-template <typename T>
-class type_caster<T, enable_if_t<is_pyobject<T>::value>> : public pyobject_caster<T> {};
-
-// Our conditions for enabling moving are quite restrictive:
-// At compile time:
-// - T needs to be a non-const, non-pointer, non-reference type
-// - type_caster<T>::operator T&() must exist
-// - the type must be move constructible (obviously)
-// At run-time:
-// - if the type is non-copy-constructible, the object must be the sole owner of the type (i.e. it
-//   must have ref_count() == 1)h
-// If any of the above are not satisfied, we fall back to copying.
-template <typename T>
-using move_is_plain_type
-    = satisfies_none_of<T, std::is_void, std::is_pointer, std::is_reference, std::is_const>;
-template <typename T, typename SFINAE = void>
-struct move_always : std::false_type {};
-template <typename T>
-struct move_always<
-    T,
-    enable_if_t<
-        all_of<move_is_plain_type<T>,
-               negation<is_copy_constructible<T>>,
-               std::is_move_constructible<T>,
-               std::is_same<decltype(std::declval<make_caster<T>>().operator T &()), T &>>::value>>
-    : std::true_type {};
-template <typename T, typename SFINAE = void>
-struct move_if_unreferenced : std::false_type {};
-template <typename T>
-struct move_if_unreferenced<
-    T,
-    enable_if_t<
-        all_of<move_is_plain_type<T>,
-               negation<move_always<T>>,
-               std::is_move_constructible<T>,
-               std::is_same<decltype(std::declval<make_caster<T>>().operator T &()), T &>>::value>>
-    : std::true_type {};
-template <typename T>
-using move_never = none_of<move_always<T>, move_if_unreferenced<T>>;
-
-// Detect whether returning a `type` from a cast on type's type_caster is going to result in a
-// reference or pointer to a local variable of the type_caster.  Basically, only
-// non-reference/pointer `type`s and reference/pointers from a type_caster_generic are safe;
-// everything else returns a reference/pointer to a local variable.
-template <typename type>
-using cast_is_temporary_value_reference
-    = bool_constant<(std::is_reference<type>::value || std::is_pointer<type>::value)
-                    && !std::is_base_of<type_caster_generic, make_caster<type>>::value
-                    && !std::is_same<intrinsic_t<type>, void>::value>;
-
-// When a value returned from a C++ function is being cast back to Python, we almost always want to
-// force `policy = move`, regardless of the return value policy the function/method was declared
-// with.
-template <typename Return, typename SFINAE = void>
-struct return_value_policy_override {
-    static return_value_policy policy(return_value_policy p) { return p; }
-};
-
-template <typename Return>
-struct return_value_policy_override<
-    Return,
-    detail::enable_if_t<std::is_base_of<type_caster_generic, make_caster<Return>>::value, void>> {
-    static return_value_policy policy(return_value_policy p) {
-        return !std::is_lvalue_reference<Return>::value && !std::is_pointer<Return>::value
-                   ? return_value_policy::move
-                   : p;
-    }
-};
-
-// Basic python -> C++ casting; throws if casting fails
-template <typename T, typename SFINAE>
-type_caster<T, SFINAE> &load_type(type_caster<T, SFINAE> &conv, const handle &handle) {
-    static_assert(!detail::is_pyobject<T>::value,
-                  "Internal error: type_caster should only be used for C++ types");
-    if (!conv.load(handle, true)) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-        throw cast_error("Unable to cast Python instance to C++ type (#define "
-                         "PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for details)");
-#else
-        throw cast_error("Unable to cast Python instance of type "
-                         + (std::string) str(type::handle_of(handle)) + " to C++ type '"
-                         + type_id<T>() + "'");
-#endif
-    }
-    return conv;
-}
-// Wrapper around the above that also constructs and returns a type_caster
-template <typename T>
-make_caster<T> load_type(const handle &handle) {
-    make_caster<T> conv;
-    load_type(conv, handle);
-    return conv;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-// pytype -> C++ type
-template <typename T, detail::enable_if_t<!detail::is_pyobject<T>::value, int> = 0>
-T cast(const handle &handle) {
-    using namespace detail;
-    static_assert(!cast_is_temporary_value_reference<T>::value,
-                  "Unable to cast type to reference: value is local to type caster");
-    return cast_op<T>(load_type<T>(handle));
-}
-
-// pytype -> pytype (calls converting constructor)
-template <typename T, detail::enable_if_t<detail::is_pyobject<T>::value, int> = 0>
-T cast(const handle &handle) {
-    return T(reinterpret_borrow<object>(handle));
-}
-
-// C++ type -> py::object
-template <typename T, detail::enable_if_t<!detail::is_pyobject<T>::value, int> = 0>
-object cast(T &&value,
-            return_value_policy policy = return_value_policy::automatic_reference,
-            handle parent = handle()) {
-    using no_ref_T = typename std::remove_reference<T>::type;
-    if (policy == return_value_policy::automatic) {
-        policy = std::is_pointer<no_ref_T>::value     ? return_value_policy::take_ownership
-                 : std::is_lvalue_reference<T>::value ? return_value_policy::copy
-                                                      : return_value_policy::move;
-    } else if (policy == return_value_policy::automatic_reference) {
-        policy = std::is_pointer<no_ref_T>::value     ? return_value_policy::reference
-                 : std::is_lvalue_reference<T>::value ? return_value_policy::copy
-                                                      : return_value_policy::move;
-    }
-    return reinterpret_steal<object>(
-        detail::make_caster<T>::cast(std::forward<T>(value), policy, parent));
-}
-
-template <typename T>
-T handle::cast() const {
-    return pybind11::cast<T>(*this);
-}
-template <>
-inline void handle::cast() const {
-    return;
-}
-
-template <typename T>
-detail::enable_if_t<!detail::move_never<T>::value, T> move(object &&obj) {
-    if (obj.ref_count() > 1) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-        throw cast_error(
-            "Unable to cast Python instance to C++ rvalue: instance has multiple references"
-            " (#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for details)");
-#else
-        throw cast_error("Unable to move from Python " + (std::string) str(type::handle_of(obj))
-                         + " instance to C++ " + type_id<T>()
-                         + " instance: instance has multiple references");
-#endif
-    }
-
-    // Move into a temporary and return that, because the reference may be a local value of `conv`
-    T ret = std::move(detail::load_type<T>(obj).operator T &());
-    return ret;
-}
-
-// Calling cast() on an rvalue calls pybind11::cast with the object rvalue, which does:
-// - If we have to move (because T has no copy constructor), do it.  This will fail if the moved
-//   object has multiple references, but trying to copy will fail to compile.
-// - If both movable and copyable, check ref count: if 1, move; otherwise copy
-// - Otherwise (not movable), copy.
-template <typename T>
-detail::enable_if_t<!detail::is_pyobject<T>::value && detail::move_always<T>::value, T>
-cast(object &&object) {
-    return move<T>(std::move(object));
-}
-template <typename T>
-detail::enable_if_t<!detail::is_pyobject<T>::value && detail::move_if_unreferenced<T>::value, T>
-cast(object &&object) {
-    if (object.ref_count() > 1) {
-        return cast<T>(object);
-    }
-    return move<T>(std::move(object));
-}
-template <typename T>
-detail::enable_if_t<!detail::is_pyobject<T>::value && detail::move_never<T>::value, T>
-cast(object &&object) {
-    return cast<T>(object);
-}
-
-// pytype rvalue -> pytype (calls converting constructor)
-template <typename T>
-detail::enable_if_t<detail::is_pyobject<T>::value, T> cast(object &&object) {
-    return T(std::move(object));
-}
-
-template <typename T>
-T object::cast() const & {
-    return pybind11::cast<T>(*this);
-}
-template <typename T>
-T object::cast() && {
-    return pybind11::cast<T>(std::move(*this));
-}
-template <>
-inline void object::cast() const & {
-    return;
-}
-template <>
-inline void object::cast() && {
-    return;
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Declared in pytypes.h:
-template <typename T, enable_if_t<!is_pyobject<T>::value, int>>
-object object_or_cast(T &&o) {
-    return pybind11::cast(std::forward<T>(o));
-}
-
-// Placeholder type for the unneeded (and dead code) static variable in the
-// PYBIND11_OVERRIDE_OVERRIDE macro
-struct override_unused {};
-template <typename ret_type>
-using override_caster_t = conditional_t<cast_is_temporary_value_reference<ret_type>::value,
-                                        make_caster<ret_type>,
-                                        override_unused>;
-
-// Trampoline use: for reference/pointer types to value-converted values, we do a value cast, then
-// store the result in the given variable.  For other types, this is a no-op.
-template <typename T>
-enable_if_t<cast_is_temporary_value_reference<T>::value, T> cast_ref(object &&o,
-                                                                     make_caster<T> &caster) {
-    return cast_op<T>(load_type(caster, o));
-}
-template <typename T>
-enable_if_t<!cast_is_temporary_value_reference<T>::value, T> cast_ref(object &&,
-                                                                      override_unused &) {
-    pybind11_fail("Internal error: cast_ref fallback invoked");
-}
-
-// Trampoline use: Having a pybind11::cast with an invalid reference type is going to
-// static_assert, even though if it's in dead code, so we provide a "trampoline" to pybind11::cast
-// that only does anything in cases where pybind11::cast is valid.
-template <typename T>
-enable_if_t<cast_is_temporary_value_reference<T>::value, T> cast_safe(object &&) {
-    pybind11_fail("Internal error: cast_safe fallback invoked");
-}
-template <typename T>
-enable_if_t<std::is_same<void, intrinsic_t<T>>::value, void> cast_safe(object &&) {}
-template <typename T>
-enable_if_t<detail::none_of<cast_is_temporary_value_reference<T>,
-                            std::is_same<void, intrinsic_t<T>>>::value,
-            T>
-cast_safe(object &&o) {
-    return pybind11::cast<T>(std::move(o));
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-// The overloads could coexist, i.e. the #if is not strictly speaking needed,
-// but it is an easy minor optimization.
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-inline cast_error cast_error_unable_to_convert_call_arg() {
-    return cast_error("Unable to convert call argument to Python object (#define "
-                      "PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for details)");
-}
-#else
-inline cast_error cast_error_unable_to_convert_call_arg(const std::string &name,
-                                                        const std::string &type) {
-    return cast_error("Unable to convert call argument '" + name + "' of type '" + type
-                      + "' to Python object");
-}
-#endif
-
-template <return_value_policy policy = return_value_policy::automatic_reference>
-tuple make_tuple() {
-    return tuple(0);
-}
-
-template <return_value_policy policy = return_value_policy::automatic_reference, typename... Args>
-tuple make_tuple(Args &&...args_) {
-    constexpr size_t size = sizeof...(Args);
-    std::array<object, size> args{{reinterpret_steal<object>(
-        detail::make_caster<Args>::cast(std::forward<Args>(args_), policy, nullptr))...}};
-    for (size_t i = 0; i < args.size(); i++) {
-        if (!args[i]) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-            throw cast_error_unable_to_convert_call_arg();
-#else
-            std::array<std::string, size> argtypes{{type_id<Args>()...}};
-            throw cast_error_unable_to_convert_call_arg(std::to_string(i), argtypes[i]);
-#endif
-        }
-    }
-    tuple result(size);
-    int counter = 0;
-    for (auto &arg_value : args) {
-        PyTuple_SET_ITEM(result.ptr(), counter++, arg_value.release().ptr());
-    }
-    return result;
-}
-
-/// \ingroup annotations
-/// Annotation for arguments
-struct arg {
-    /// Constructs an argument with the name of the argument; if null or omitted, this is a
-    /// positional argument.
-    constexpr explicit arg(const char *name = nullptr)
-        : name(name), flag_noconvert(false), flag_none(true) {}
-    /// Assign a value to this argument
-    template <typename T>
-    arg_v operator=(T &&value) const;
-    /// Indicate that the type should not be converted in the type caster
-    arg &noconvert(bool flag = true) {
-        flag_noconvert = flag;
-        return *this;
-    }
-    /// Indicates that the argument should/shouldn't allow None (e.g. for nullable pointer args)
-    arg &none(bool flag = true) {
-        flag_none = flag;
-        return *this;
-    }
-
-    const char *name;        ///< If non-null, this is a named kwargs argument
-    bool flag_noconvert : 1; ///< If set, do not allow conversion (requires a supporting type
-                             ///< caster!)
-    bool flag_none : 1;      ///< If set (the default), allow None to be passed to this argument
-};
-
-/// \ingroup annotations
-/// Annotation for arguments with values
-struct arg_v : arg {
-private:
-    template <typename T>
-    arg_v(arg &&base, T &&x, const char *descr = nullptr)
-        : arg(base), value(reinterpret_steal<object>(detail::make_caster<T>::cast(
-                         std::forward<T>(x), return_value_policy::automatic, {}))),
-          descr(descr)
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-          ,
-          type(type_id<T>())
-#endif
-    {
-        // Workaround! See:
-        // https://github.com/pybind/pybind11/issues/2336
-        // https://github.com/pybind/pybind11/pull/2685#issuecomment-731286700
-        if (PyErr_Occurred()) {
-            PyErr_Clear();
-        }
-    }
-
-public:
-    /// Direct construction with name, default, and description
-    template <typename T>
-    arg_v(const char *name, T &&x, const char *descr = nullptr)
-        : arg_v(arg(name), std::forward<T>(x), descr) {}
-
-    /// Called internally when invoking `py::arg("a") = value`
-    template <typename T>
-    arg_v(const arg &base, T &&x, const char *descr = nullptr)
-        : arg_v(arg(base), std::forward<T>(x), descr) {}
-
-    /// Same as `arg::noconvert()`, but returns *this as arg_v&, not arg&
-    arg_v &noconvert(bool flag = true) {
-        arg::noconvert(flag);
-        return *this;
-    }
-
-    /// Same as `arg::nonone()`, but returns *this as arg_v&, not arg&
-    arg_v &none(bool flag = true) {
-        arg::none(flag);
-        return *this;
-    }
-
-    /// The default value
-    object value;
-    /// The (optional) description of the default value
-    const char *descr;
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-    /// The C++ type name of the default value (only available when compiled in debug mode)
-    std::string type;
-#endif
-};
-
-/// \ingroup annotations
-/// Annotation indicating that all following arguments are keyword-only; the is the equivalent of
-/// an unnamed '*' argument
-struct kw_only {};
-
-/// \ingroup annotations
-/// Annotation indicating that all previous arguments are positional-only; the is the equivalent of
-/// an unnamed '/' argument (in Python 3.8)
-struct pos_only {};
-
-template <typename T>
-arg_v arg::operator=(T &&value) const {
-    return {*this, std::forward<T>(value)};
-}
-
-/// Alias for backward compatibility -- to be removed in version 2.0
-template <typename /*unused*/>
-using arg_t = arg_v;
-
-inline namespace literals {
-/** \rst
-    String literal version of `arg`
- \endrst */
-constexpr arg operator"" _a(const char *name, size_t) { return arg(name); }
-} // namespace literals
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename T>
-using is_kw_only = std::is_same<intrinsic_t<T>, kw_only>;
-template <typename T>
-using is_pos_only = std::is_same<intrinsic_t<T>, pos_only>;
-
-// forward declaration (definition in attr.h)
-struct function_record;
-
-/// Internal data associated with a single function call
-struct function_call {
-    function_call(const function_record &f, handle p); // Implementation in attr.h
-
-    /// The function data:
-    const function_record &func;
-
-    /// Arguments passed to the function:
-    std::vector<handle> args;
-
-    /// The `convert` value the arguments should be loaded with
-    std::vector<bool> args_convert;
-
-    /// Extra references for the optional `py::args` and/or `py::kwargs` arguments (which, if
-    /// present, are also in `args` but without a reference).
-    object args_ref, kwargs_ref;
-
-    /// The parent, if any
-    handle parent;
-
-    /// If this is a call to an initializer, this argument contains `self`
-    handle init_self;
-};
-
-/// Helper class which loads arguments for C++ functions called from Python
-template <typename... Args>
-class argument_loader {
-    using indices = make_index_sequence<sizeof...(Args)>;
-
-    template <typename Arg>
-    using argument_is_args = std::is_same<intrinsic_t<Arg>, args>;
-    template <typename Arg>
-    using argument_is_kwargs = std::is_same<intrinsic_t<Arg>, kwargs>;
-    // Get kwargs argument position, or -1 if not present:
-    static constexpr auto kwargs_pos = constexpr_last<argument_is_kwargs, Args...>();
-
-    static_assert(kwargs_pos == -1 || kwargs_pos == (int) sizeof...(Args) - 1,
-                  "py::kwargs is only permitted as the last argument of a function");
-
-public:
-    static constexpr bool has_kwargs = kwargs_pos != -1;
-
-    // py::args argument position; -1 if not present.
-    static constexpr int args_pos = constexpr_last<argument_is_args, Args...>();
-
-    static_assert(args_pos == -1 || args_pos == constexpr_first<argument_is_args, Args...>(),
-                  "py::args cannot be specified more than once");
-
-    static constexpr auto arg_names = concat(type_descr(make_caster<Args>::name)...);
-
-    bool load_args(function_call &call) { return load_impl_sequence(call, indices{}); }
-
-    template <typename Return, typename Guard, typename Func>
-    // NOLINTNEXTLINE(readability-const-return-type)
-    enable_if_t<!std::is_void<Return>::value, Return> call(Func &&f) && {
-        return std::move(*this).template call_impl<remove_cv_t<Return>>(
-            std::forward<Func>(f), indices{}, Guard{});
-    }
-
-    template <typename Return, typename Guard, typename Func>
-    enable_if_t<std::is_void<Return>::value, void_type> call(Func &&f) && {
-        std::move(*this).template call_impl<remove_cv_t<Return>>(
-            std::forward<Func>(f), indices{}, Guard{});
-        return void_type();
-    }
-
-private:
-    static bool load_impl_sequence(function_call &, index_sequence<>) { return true; }
-
-    template <size_t... Is>
-    bool load_impl_sequence(function_call &call, index_sequence<Is...>) {
-#ifdef __cpp_fold_expressions
-        if ((... || !std::get<Is>(argcasters).load(call.args[Is], call.args_convert[Is]))) {
-            return false;
-        }
-#else
-        for (bool r : {std::get<Is>(argcasters).load(call.args[Is], call.args_convert[Is])...}) {
-            if (!r) {
-                return false;
-            }
-        }
-#endif
-        return true;
-    }
-
-    template <typename Return, typename Func, size_t... Is, typename Guard>
-    Return call_impl(Func &&f, index_sequence<Is...>, Guard &&) && {
-        return std::forward<Func>(f)(cast_op<Args>(std::move(std::get<Is>(argcasters)))...);
-    }
-
-    std::tuple<make_caster<Args>...> argcasters;
-};
-
-/// Helper class which collects only positional arguments for a Python function call.
-/// A fancier version below can collect any argument, but this one is optimal for simple calls.
-template <return_value_policy policy>
-class simple_collector {
-public:
-    template <typename... Ts>
-    explicit simple_collector(Ts &&...values)
-        : m_args(pybind11::make_tuple<policy>(std::forward<Ts>(values)...)) {}
-
-    const tuple &args() const & { return m_args; }
-    dict kwargs() const { return {}; }
-
-    tuple args() && { return std::move(m_args); }
-
-    /// Call a Python function and pass the collected arguments
-    object call(PyObject *ptr) const {
-        PyObject *result = PyObject_CallObject(ptr, m_args.ptr());
-        if (!result) {
-            throw error_already_set();
-        }
-        return reinterpret_steal<object>(result);
-    }
-
-private:
-    tuple m_args;
-};
-
-/// Helper class which collects positional, keyword, * and ** arguments for a Python function call
-template <return_value_policy policy>
-class unpacking_collector {
-public:
-    template <typename... Ts>
-    explicit unpacking_collector(Ts &&...values) {
-        // Tuples aren't (easily) resizable so a list is needed for collection,
-        // but the actual function call strictly requires a tuple.
-        auto args_list = list();
-        using expander = int[];
-        (void) expander{0, (process(args_list, std::forward<Ts>(values)), 0)...};
-
-        m_args = std::move(args_list);
-    }
-
-    const tuple &args() const & { return m_args; }
-    const dict &kwargs() const & { return m_kwargs; }
-
-    tuple args() && { return std::move(m_args); }
-    dict kwargs() && { return std::move(m_kwargs); }
-
-    /// Call a Python function and pass the collected arguments
-    object call(PyObject *ptr) const {
-        PyObject *result = PyObject_Call(ptr, m_args.ptr(), m_kwargs.ptr());
-        if (!result) {
-            throw error_already_set();
-        }
-        return reinterpret_steal<object>(result);
-    }
-
-private:
-    template <typename T>
-    void process(list &args_list, T &&x) {
-        auto o = reinterpret_steal<object>(
-            detail::make_caster<T>::cast(std::forward<T>(x), policy, {}));
-        if (!o) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-            throw cast_error_unable_to_convert_call_arg();
-#else
-            throw cast_error_unable_to_convert_call_arg(std::to_string(args_list.size()),
-                                                        type_id<T>());
-#endif
-        }
-        args_list.append(std::move(o));
-    }
-
-    void process(list &args_list, detail::args_proxy ap) {
-        for (auto a : ap) {
-            args_list.append(a);
-        }
-    }
-
-    void process(list & /*args_list*/, arg_v a) {
-        if (!a.name) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-            nameless_argument_error();
-#else
-            nameless_argument_error(a.type);
-#endif
-        }
-        if (m_kwargs.contains(a.name)) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-            multiple_values_error();
-#else
-            multiple_values_error(a.name);
-#endif
-        }
-        if (!a.value) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-            throw cast_error_unable_to_convert_call_arg();
-#else
-            throw cast_error_unable_to_convert_call_arg(a.name, a.type);
-#endif
-        }
-        m_kwargs[a.name] = a.value;
-    }
-
-    void process(list & /*args_list*/, detail::kwargs_proxy kp) {
-        if (!kp) {
-            return;
-        }
-        for (auto k : reinterpret_borrow<dict>(kp)) {
-            if (m_kwargs.contains(k.first)) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-                multiple_values_error();
-#else
-                multiple_values_error(str(k.first));
-#endif
-            }
-            m_kwargs[k.first] = k.second;
-        }
-    }
-
-    [[noreturn]] static void nameless_argument_error() {
-        throw type_error(
-            "Got kwargs without a name; only named arguments "
-            "may be passed via py::arg() to a python function call. "
-            "(#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for details)");
-    }
-    [[noreturn]] static void nameless_argument_error(const std::string &type) {
-        throw type_error("Got kwargs without a name of type '" + type
-                         + "'; only named "
-                           "arguments may be passed via py::arg() to a python function call. ");
-    }
-    [[noreturn]] static void multiple_values_error() {
-        throw type_error(
-            "Got multiple values for keyword argument "
-            "(#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for details)");
-    }
-
-    [[noreturn]] static void multiple_values_error(const std::string &name) {
-        throw type_error("Got multiple values for keyword argument '" + name + "'");
-    }
-
-private:
-    tuple m_args;
-    dict m_kwargs;
-};
-
-// [workaround(intel)] Separate function required here
-// We need to put this into a separate function because the Intel compiler
-// fails to compile enable_if_t<!all_of<is_positional<Args>...>::value>
-// (tested with ICC 2021.1 Beta 20200827).
-template <typename... Args>
-constexpr bool args_are_all_positional() {
-    return all_of<is_positional<Args>...>::value;
-}
-
-/// Collect only positional arguments for a Python function call
-template <return_value_policy policy,
-          typename... Args,
-          typename = enable_if_t<args_are_all_positional<Args...>()>>
-simple_collector<policy> collect_arguments(Args &&...args) {
-    return simple_collector<policy>(std::forward<Args>(args)...);
-}
-
-/// Collect all arguments, including keywords and unpacking (only instantiated when needed)
-template <return_value_policy policy,
-          typename... Args,
-          typename = enable_if_t<!args_are_all_positional<Args...>()>>
-unpacking_collector<policy> collect_arguments(Args &&...args) {
-    // Following argument order rules for generalized unpacking according to PEP 448
-    static_assert(constexpr_last<is_positional, Args...>()
-                          < constexpr_first<is_keyword_or_ds, Args...>()
-                      && constexpr_last<is_s_unpacking, Args...>()
-                             < constexpr_first<is_ds_unpacking, Args...>(),
-                  "Invalid function call: positional args must precede keywords and ** unpacking; "
-                  "* unpacking must precede ** unpacking");
-    return unpacking_collector<policy>(std::forward<Args>(args)...);
-}
-
-template <typename Derived>
-template <return_value_policy policy, typename... Args>
-object object_api<Derived>::operator()(Args &&...args) const {
-#ifndef NDEBUG
-    if (!PyGILState_Check()) {
-        pybind11_fail("pybind11::object_api<>::operator() PyGILState_Check() failure.");
-    }
-#endif
-    return detail::collect_arguments<policy>(std::forward<Args>(args)...).call(derived().ptr());
-}
-
-template <typename Derived>
-template <return_value_policy policy, typename... Args>
-object object_api<Derived>::call(Args &&...args) const {
-    return operator()<policy>(std::forward<Args>(args)...);
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-template <typename T>
-handle type::handle_of() {
-    static_assert(std::is_base_of<detail::type_caster_generic, detail::make_caster<T>>::value,
-                  "py::type::of<T> only supports the case where T is a registered C++ types.");
-
-    return detail::get_type_handle(typeid(T), true);
-}
-
-#define PYBIND11_MAKE_OPAQUE(...)                                                                 \
-    PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)                                                  \
-    namespace detail {                                                                            \
-    template <>                                                                                   \
-    class type_caster<__VA_ARGS__> : public type_caster_base<__VA_ARGS__> {};                     \
-    }                                                                                             \
-    PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-/// Lets you pass a type containing a `,` through a macro parameter without needing a separate
-/// typedef, e.g.:
-/// `PYBIND11_OVERRIDE(PYBIND11_TYPE(ReturnType<A, B>), PYBIND11_TYPE(Parent<C, D>), f, arg)`
-#define PYBIND11_TYPE(...) __VA_ARGS__
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/chrono.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/chrono.h
deleted file mode 100644
index 167ea0e3d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/chrono.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-    pybind11/chrono.h: Transparent conversion between std::chrono and python's datetime
-
-    Copyright (c) 2016 Trent Houliston <trent@houliston.me> and
-                       Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-#include <chrono>
-#include <cmath>
-#include <ctime>
-#include <datetime.h>
-#include <mutex>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename type>
-class duration_caster {
-public:
-    using rep = typename type::rep;
-    using period = typename type::period;
-
-    // signed 25 bits required by the standard.
-    using days = std::chrono::duration<int_least32_t, std::ratio<86400>>;
-
-    bool load(handle src, bool) {
-        using namespace std::chrono;
-
-        // Lazy initialise the PyDateTime import
-        if (!PyDateTimeAPI) {
-            PyDateTime_IMPORT;
-        }
-
-        if (!src) {
-            return false;
-        }
-        // If invoked with datetime.delta object
-        if (PyDelta_Check(src.ptr())) {
-            value = type(duration_cast<duration<rep, period>>(
-                days(PyDateTime_DELTA_GET_DAYS(src.ptr()))
-                + seconds(PyDateTime_DELTA_GET_SECONDS(src.ptr()))
-                + microseconds(PyDateTime_DELTA_GET_MICROSECONDS(src.ptr()))));
-            return true;
-        }
-        // If invoked with a float we assume it is seconds and convert
-        if (PyFloat_Check(src.ptr())) {
-            value = type(duration_cast<duration<rep, period>>(
-                duration<double>(PyFloat_AsDouble(src.ptr()))));
-            return true;
-        }
-        return false;
-    }
-
-    // If this is a duration just return it back
-    static const std::chrono::duration<rep, period> &
-    get_duration(const std::chrono::duration<rep, period> &src) {
-        return src;
-    }
-
-    // If this is a time_point get the time_since_epoch
-    template <typename Clock>
-    static std::chrono::duration<rep, period>
-    get_duration(const std::chrono::time_point<Clock, std::chrono::duration<rep, period>> &src) {
-        return src.time_since_epoch();
-    }
-
-    static handle cast(const type &src, return_value_policy /* policy */, handle /* parent */) {
-        using namespace std::chrono;
-
-        // Use overloaded function to get our duration from our source
-        // Works out if it is a duration or time_point and get the duration
-        auto d = get_duration(src);
-
-        // Lazy initialise the PyDateTime import
-        if (!PyDateTimeAPI) {
-            PyDateTime_IMPORT;
-        }
-
-        // Declare these special duration types so the conversions happen with the correct
-        // primitive types (int)
-        using dd_t = duration<int, std::ratio<86400>>;
-        using ss_t = duration<int, std::ratio<1>>;
-        using us_t = duration<int, std::micro>;
-
-        auto dd = duration_cast<dd_t>(d);
-        auto subd = d - dd;
-        auto ss = duration_cast<ss_t>(subd);
-        auto us = duration_cast<us_t>(subd - ss);
-        return PyDelta_FromDSU(dd.count(), ss.count(), us.count());
-    }
-
-    PYBIND11_TYPE_CASTER(type, const_name("datetime.timedelta"));
-};
-
-inline std::tm *localtime_thread_safe(const std::time_t *time, std::tm *buf) {
-#if (defined(__STDC_LIB_EXT1__) && defined(__STDC_WANT_LIB_EXT1__)) || defined(_MSC_VER)
-    if (localtime_s(buf, time))
-        return nullptr;
-    return buf;
-#else
-    static std::mutex mtx;
-    std::lock_guard<std::mutex> lock(mtx);
-    std::tm *tm_ptr = std::localtime(time);
-    if (tm_ptr != nullptr) {
-        *buf = *tm_ptr;
-    }
-    return tm_ptr;
-#endif
-}
-
-// This is for casting times on the system clock into datetime.datetime instances
-template <typename Duration>
-class type_caster<std::chrono::time_point<std::chrono::system_clock, Duration>> {
-public:
-    using type = std::chrono::time_point<std::chrono::system_clock, Duration>;
-    bool load(handle src, bool) {
-        using namespace std::chrono;
-
-        // Lazy initialise the PyDateTime import
-        if (!PyDateTimeAPI) {
-            PyDateTime_IMPORT;
-        }
-
-        if (!src) {
-            return false;
-        }
-
-        std::tm cal;
-        microseconds msecs;
-
-        if (PyDateTime_Check(src.ptr())) {
-            cal.tm_sec = PyDateTime_DATE_GET_SECOND(src.ptr());
-            cal.tm_min = PyDateTime_DATE_GET_MINUTE(src.ptr());
-            cal.tm_hour = PyDateTime_DATE_GET_HOUR(src.ptr());
-            cal.tm_mday = PyDateTime_GET_DAY(src.ptr());
-            cal.tm_mon = PyDateTime_GET_MONTH(src.ptr()) - 1;
-            cal.tm_year = PyDateTime_GET_YEAR(src.ptr()) - 1900;
-            cal.tm_isdst = -1;
-            msecs = microseconds(PyDateTime_DATE_GET_MICROSECOND(src.ptr()));
-        } else if (PyDate_Check(src.ptr())) {
-            cal.tm_sec = 0;
-            cal.tm_min = 0;
-            cal.tm_hour = 0;
-            cal.tm_mday = PyDateTime_GET_DAY(src.ptr());
-            cal.tm_mon = PyDateTime_GET_MONTH(src.ptr()) - 1;
-            cal.tm_year = PyDateTime_GET_YEAR(src.ptr()) - 1900;
-            cal.tm_isdst = -1;
-            msecs = microseconds(0);
-        } else if (PyTime_Check(src.ptr())) {
-            cal.tm_sec = PyDateTime_TIME_GET_SECOND(src.ptr());
-            cal.tm_min = PyDateTime_TIME_GET_MINUTE(src.ptr());
-            cal.tm_hour = PyDateTime_TIME_GET_HOUR(src.ptr());
-            cal.tm_mday = 1;  // This date (day, month, year) = (1, 0, 70)
-            cal.tm_mon = 0;   // represents 1-Jan-1970, which is the first
-            cal.tm_year = 70; // earliest available date for Python's datetime
-            cal.tm_isdst = -1;
-            msecs = microseconds(PyDateTime_TIME_GET_MICROSECOND(src.ptr()));
-        } else {
-            return false;
-        }
-
-        value = time_point_cast<Duration>(system_clock::from_time_t(std::mktime(&cal)) + msecs);
-        return true;
-    }
-
-    static handle cast(const std::chrono::time_point<std::chrono::system_clock, Duration> &src,
-                       return_value_policy /* policy */,
-                       handle /* parent */) {
-        using namespace std::chrono;
-
-        // Lazy initialise the PyDateTime import
-        if (!PyDateTimeAPI) {
-            PyDateTime_IMPORT;
-        }
-
-        // Get out microseconds, and make sure they are positive, to avoid bug in eastern
-        // hemisphere time zones (cfr. https://github.com/pybind/pybind11/issues/2417)
-        using us_t = duration<int, std::micro>;
-        auto us = duration_cast<us_t>(src.time_since_epoch() % seconds(1));
-        if (us.count() < 0) {
-            us += seconds(1);
-        }
-
-        // Subtract microseconds BEFORE `system_clock::to_time_t`, because:
-        // > If std::time_t has lower precision, it is implementation-defined whether the value is
-        // rounded or truncated. (https://en.cppreference.com/w/cpp/chrono/system_clock/to_time_t)
-        std::time_t tt
-            = system_clock::to_time_t(time_point_cast<system_clock::duration>(src - us));
-
-        std::tm localtime;
-        std::tm *localtime_ptr = localtime_thread_safe(&tt, &localtime);
-        if (!localtime_ptr) {
-            throw cast_error("Unable to represent system_clock in local time");
-        }
-        return PyDateTime_FromDateAndTime(localtime.tm_year + 1900,
-                                          localtime.tm_mon + 1,
-                                          localtime.tm_mday,
-                                          localtime.tm_hour,
-                                          localtime.tm_min,
-                                          localtime.tm_sec,
-                                          us.count());
-    }
-    PYBIND11_TYPE_CASTER(type, const_name("datetime.datetime"));
-};
-
-// Other clocks that are not the system clock are not measured as datetime.datetime objects
-// since they are not measured on calendar time. So instead we just make them timedeltas
-// Or if they have passed us a time as a float we convert that
-template <typename Clock, typename Duration>
-class type_caster<std::chrono::time_point<Clock, Duration>>
-    : public duration_caster<std::chrono::time_point<Clock, Duration>> {};
-
-template <typename Rep, typename Period>
-class type_caster<std::chrono::duration<Rep, Period>>
-    : public duration_caster<std::chrono::duration<Rep, Period>> {};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/common.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/common.h
deleted file mode 100644
index 6c8a4f1e8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/common.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "detail/common.h"
-#warning "Including 'common.h' is deprecated. It will be removed in v3.0. Use 'pybind11.h'."
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/complex.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/complex.h
deleted file mode 100644
index 8a831c12c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/complex.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    pybind11/complex.h: Complex number support
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-#include <complex>
-
-/// glibc defines I as a macro which breaks things, e.g., boost template names
-#ifdef I
-#    undef I
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-template <typename T>
-struct format_descriptor<std::complex<T>, detail::enable_if_t<std::is_floating_point<T>::value>> {
-    static constexpr const char c = format_descriptor<T>::c;
-    static constexpr const char value[3] = {'Z', c, '\0'};
-    static std::string format() { return std::string(value); }
-};
-
-#ifndef PYBIND11_CPP17
-
-template <typename T>
-constexpr const char
-    format_descriptor<std::complex<T>,
-                      detail::enable_if_t<std::is_floating_point<T>::value>>::value[3];
-
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename T>
-struct is_fmt_numeric<std::complex<T>, detail::enable_if_t<std::is_floating_point<T>::value>> {
-    static constexpr bool value = true;
-    static constexpr int index = is_fmt_numeric<T>::index + 3;
-};
-
-template <typename T>
-class type_caster<std::complex<T>> {
-public:
-    bool load(handle src, bool convert) {
-        if (!src) {
-            return false;
-        }
-        if (!convert && !PyComplex_Check(src.ptr())) {
-            return false;
-        }
-        Py_complex result = PyComplex_AsCComplex(src.ptr());
-        if (result.real == -1.0 && PyErr_Occurred()) {
-            PyErr_Clear();
-            return false;
-        }
-        value = std::complex<T>((T) result.real, (T) result.imag);
-        return true;
-    }
-
-    static handle
-    cast(const std::complex<T> &src, return_value_policy /* policy */, handle /* parent */) {
-        return PyComplex_FromDoubles((double) src.real(), (double) src.imag());
-    }
-
-    PYBIND11_TYPE_CASTER(std::complex<T>, const_name("complex"));
-};
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/class.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/class.h
deleted file mode 100644
index 42720f844..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/class.h
+++ /dev/null
@@ -1,742 +0,0 @@
-/*
-    pybind11/detail/class.h: Python C API implementation details for py::class_
-
-    Copyright (c) 2017 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "../attr.h"
-#include "../options.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-#if !defined(PYPY_VERSION)
-#    define PYBIND11_BUILTIN_QUALNAME
-#    define PYBIND11_SET_OLDPY_QUALNAME(obj, nameobj)
-#else
-// In PyPy, we still set __qualname__ so that we can produce reliable function type
-// signatures; in CPython this macro expands to nothing:
-#    define PYBIND11_SET_OLDPY_QUALNAME(obj, nameobj)                                             \
-        setattr((PyObject *) obj, "__qualname__", nameobj)
-#endif
-
-inline std::string get_fully_qualified_tp_name(PyTypeObject *type) {
-#if !defined(PYPY_VERSION)
-    return type->tp_name;
-#else
-    auto module_name = handle((PyObject *) type).attr("__module__").cast<std::string>();
-    if (module_name == PYBIND11_BUILTINS_MODULE)
-        return type->tp_name;
-    else
-        return std::move(module_name) + "." + type->tp_name;
-#endif
-}
-
-inline PyTypeObject *type_incref(PyTypeObject *type) {
-    Py_INCREF(type);
-    return type;
-}
-
-#if !defined(PYPY_VERSION)
-
-/// `pybind11_static_property.__get__()`: Always pass the class instead of the instance.
-extern "C" inline PyObject *pybind11_static_get(PyObject *self, PyObject * /*ob*/, PyObject *cls) {
-    return PyProperty_Type.tp_descr_get(self, cls, cls);
-}
-
-/// `pybind11_static_property.__set__()`: Just like the above `__get__()`.
-extern "C" inline int pybind11_static_set(PyObject *self, PyObject *obj, PyObject *value) {
-    PyObject *cls = PyType_Check(obj) ? obj : (PyObject *) Py_TYPE(obj);
-    return PyProperty_Type.tp_descr_set(self, cls, value);
-}
-
-/** A `static_property` is the same as a `property` but the `__get__()` and `__set__()`
-    methods are modified to always use the object type instead of a concrete instance.
-    Return value: New reference. */
-inline PyTypeObject *make_static_property_type() {
-    constexpr auto *name = "pybind11_static_property";
-    auto name_obj = reinterpret_steal<object>(PYBIND11_FROM_STRING(name));
-
-    /* Danger zone: from now (and until PyType_Ready), make sure to
-       issue no Python C API calls which could potentially invoke the
-       garbage collector (the GC will call type_traverse(), which will in
-       turn find the newly constructed type in an invalid state) */
-    auto *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
-    if (!heap_type) {
-        pybind11_fail("make_static_property_type(): error allocating type!");
-    }
-
-    heap_type->ht_name = name_obj.inc_ref().ptr();
-#    ifdef PYBIND11_BUILTIN_QUALNAME
-    heap_type->ht_qualname = name_obj.inc_ref().ptr();
-#    endif
-
-    auto *type = &heap_type->ht_type;
-    type->tp_name = name;
-    type->tp_base = type_incref(&PyProperty_Type);
-    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
-    type->tp_descr_get = pybind11_static_get;
-    type->tp_descr_set = pybind11_static_set;
-
-    if (PyType_Ready(type) < 0) {
-        pybind11_fail("make_static_property_type(): failure in PyType_Ready()!");
-    }
-
-    setattr((PyObject *) type, "__module__", str("pybind11_builtins"));
-    PYBIND11_SET_OLDPY_QUALNAME(type, name_obj);
-
-    return type;
-}
-
-#else // PYPY
-
-/** PyPy has some issues with the above C API, so we evaluate Python code instead.
-    This function will only be called once so performance isn't really a concern.
-    Return value: New reference. */
-inline PyTypeObject *make_static_property_type() {
-    auto d = dict();
-    PyObject *result = PyRun_String(R"(\
-class pybind11_static_property(property):
-    def __get__(self, obj, cls):
-        return property.__get__(self, cls, cls)
-
-    def __set__(self, obj, value):
-        cls = obj if isinstance(obj, type) else type(obj)
-        property.__set__(self, cls, value)
-)",
-                                    Py_file_input,
-                                    d.ptr(),
-                                    d.ptr());
-    if (result == nullptr)
-        throw error_already_set();
-    Py_DECREF(result);
-    return (PyTypeObject *) d["pybind11_static_property"].cast<object>().release().ptr();
-}
-
-#endif // PYPY
-
-/** Types with static properties need to handle `Type.static_prop = x` in a specific way.
-    By default, Python replaces the `static_property` itself, but for wrapped C++ types
-    we need to call `static_property.__set__()` in order to propagate the new value to
-    the underlying C++ data structure. */
-extern "C" inline int pybind11_meta_setattro(PyObject *obj, PyObject *name, PyObject *value) {
-    // Use `_PyType_Lookup()` instead of `PyObject_GetAttr()` in order to get the raw
-    // descriptor (`property`) instead of calling `tp_descr_get` (`property.__get__()`).
-    PyObject *descr = _PyType_Lookup((PyTypeObject *) obj, name);
-
-    // The following assignment combinations are possible:
-    //   1. `Type.static_prop = value`             --> descr_set: `Type.static_prop.__set__(value)`
-    //   2. `Type.static_prop = other_static_prop` --> setattro:  replace existing `static_prop`
-    //   3. `Type.regular_attribute = value`       --> setattro:  regular attribute assignment
-    auto *const static_prop = (PyObject *) get_internals().static_property_type;
-    const auto call_descr_set = (descr != nullptr) && (value != nullptr)
-                                && (PyObject_IsInstance(descr, static_prop) != 0)
-                                && (PyObject_IsInstance(value, static_prop) == 0);
-    if (call_descr_set) {
-        // Call `static_property.__set__()` instead of replacing the `static_property`.
-#if !defined(PYPY_VERSION)
-        return Py_TYPE(descr)->tp_descr_set(descr, obj, value);
-#else
-        if (PyObject *result = PyObject_CallMethod(descr, "__set__", "OO", obj, value)) {
-            Py_DECREF(result);
-            return 0;
-        } else {
-            return -1;
-        }
-#endif
-    } else {
-        // Replace existing attribute.
-        return PyType_Type.tp_setattro(obj, name, value);
-    }
-}
-
-/**
- * Python 3's PyInstanceMethod_Type hides itself via its tp_descr_get, which prevents aliasing
- * methods via cls.attr("m2") = cls.attr("m1"): instead the tp_descr_get returns a plain function,
- * when called on a class, or a PyMethod, when called on an instance.  Override that behaviour here
- * to do a special case bypass for PyInstanceMethod_Types.
- */
-extern "C" inline PyObject *pybind11_meta_getattro(PyObject *obj, PyObject *name) {
-    PyObject *descr = _PyType_Lookup((PyTypeObject *) obj, name);
-    if (descr && PyInstanceMethod_Check(descr)) {
-        Py_INCREF(descr);
-        return descr;
-    }
-    return PyType_Type.tp_getattro(obj, name);
-}
-
-/// metaclass `__call__` function that is used to create all pybind11 objects.
-extern "C" inline PyObject *pybind11_meta_call(PyObject *type, PyObject *args, PyObject *kwargs) {
-
-    // use the default metaclass call to create/initialize the object
-    PyObject *self = PyType_Type.tp_call(type, args, kwargs);
-    if (self == nullptr) {
-        return nullptr;
-    }
-
-    // This must be a pybind11 instance
-    auto *instance = reinterpret_cast<detail::instance *>(self);
-
-    // Ensure that the base __init__ function(s) were called
-    for (const auto &vh : values_and_holders(instance)) {
-        if (!vh.holder_constructed()) {
-            PyErr_Format(PyExc_TypeError,
-                         "%.200s.__init__() must be called when overriding __init__",
-                         get_fully_qualified_tp_name(vh.type->type).c_str());
-            Py_DECREF(self);
-            return nullptr;
-        }
-    }
-
-    return self;
-}
-
-/// Cleanup the type-info for a pybind11-registered type.
-extern "C" inline void pybind11_meta_dealloc(PyObject *obj) {
-    auto *type = (PyTypeObject *) obj;
-    auto &internals = get_internals();
-
-    // A pybind11-registered type will:
-    // 1) be found in internals.registered_types_py
-    // 2) have exactly one associated `detail::type_info`
-    auto found_type = internals.registered_types_py.find(type);
-    if (found_type != internals.registered_types_py.end() && found_type->second.size() == 1
-        && found_type->second[0]->type == type) {
-
-        auto *tinfo = found_type->second[0];
-        auto tindex = std::type_index(*tinfo->cpptype);
-        internals.direct_conversions.erase(tindex);
-
-        if (tinfo->module_local) {
-            get_local_internals().registered_types_cpp.erase(tindex);
-        } else {
-            internals.registered_types_cpp.erase(tindex);
-        }
-        internals.registered_types_py.erase(tinfo->type);
-
-        // Actually just `std::erase_if`, but that's only available in C++20
-        auto &cache = internals.inactive_override_cache;
-        for (auto it = cache.begin(), last = cache.end(); it != last;) {
-            if (it->first == (PyObject *) tinfo->type) {
-                it = cache.erase(it);
-            } else {
-                ++it;
-            }
-        }
-
-        delete tinfo;
-    }
-
-    PyType_Type.tp_dealloc(obj);
-}
-
-/** This metaclass is assigned by default to all pybind11 types and is required in order
-    for static properties to function correctly. Users may override this using `py::metaclass`.
-    Return value: New reference. */
-inline PyTypeObject *make_default_metaclass() {
-    constexpr auto *name = "pybind11_type";
-    auto name_obj = reinterpret_steal<object>(PYBIND11_FROM_STRING(name));
-
-    /* Danger zone: from now (and until PyType_Ready), make sure to
-       issue no Python C API calls which could potentially invoke the
-       garbage collector (the GC will call type_traverse(), which will in
-       turn find the newly constructed type in an invalid state) */
-    auto *heap_type = (PyHeapTypeObject *) PyType_Type.tp_alloc(&PyType_Type, 0);
-    if (!heap_type) {
-        pybind11_fail("make_default_metaclass(): error allocating metaclass!");
-    }
-
-    heap_type->ht_name = name_obj.inc_ref().ptr();
-#ifdef PYBIND11_BUILTIN_QUALNAME
-    heap_type->ht_qualname = name_obj.inc_ref().ptr();
-#endif
-
-    auto *type = &heap_type->ht_type;
-    type->tp_name = name;
-    type->tp_base = type_incref(&PyType_Type);
-    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
-
-    type->tp_call = pybind11_meta_call;
-
-    type->tp_setattro = pybind11_meta_setattro;
-    type->tp_getattro = pybind11_meta_getattro;
-
-    type->tp_dealloc = pybind11_meta_dealloc;
-
-    if (PyType_Ready(type) < 0) {
-        pybind11_fail("make_default_metaclass(): failure in PyType_Ready()!");
-    }
-
-    setattr((PyObject *) type, "__module__", str("pybind11_builtins"));
-    PYBIND11_SET_OLDPY_QUALNAME(type, name_obj);
-
-    return type;
-}
-
-/// For multiple inheritance types we need to recursively register/deregister base pointers for any
-/// base classes with pointers that are difference from the instance value pointer so that we can
-/// correctly recognize an offset base class pointer. This calls a function with any offset base
-/// ptrs.
-inline void traverse_offset_bases(void *valueptr,
-                                  const detail::type_info *tinfo,
-                                  instance *self,
-                                  bool (*f)(void * /*parentptr*/, instance * /*self*/)) {
-    for (handle h : reinterpret_borrow<tuple>(tinfo->type->tp_bases)) {
-        if (auto *parent_tinfo = get_type_info((PyTypeObject *) h.ptr())) {
-            for (auto &c : parent_tinfo->implicit_casts) {
-                if (c.first == tinfo->cpptype) {
-                    auto *parentptr = c.second(valueptr);
-                    if (parentptr != valueptr) {
-                        f(parentptr, self);
-                    }
-                    traverse_offset_bases(parentptr, parent_tinfo, self, f);
-                    break;
-                }
-            }
-        }
-    }
-}
-
-inline bool register_instance_impl(void *ptr, instance *self) {
-    get_internals().registered_instances.emplace(ptr, self);
-    return true; // unused, but gives the same signature as the deregister func
-}
-inline bool deregister_instance_impl(void *ptr, instance *self) {
-    auto &registered_instances = get_internals().registered_instances;
-    auto range = registered_instances.equal_range(ptr);
-    for (auto it = range.first; it != range.second; ++it) {
-        if (self == it->second) {
-            registered_instances.erase(it);
-            return true;
-        }
-    }
-    return false;
-}
-
-inline void register_instance(instance *self, void *valptr, const type_info *tinfo) {
-    register_instance_impl(valptr, self);
-    if (!tinfo->simple_ancestors) {
-        traverse_offset_bases(valptr, tinfo, self, register_instance_impl);
-    }
-}
-
-inline bool deregister_instance(instance *self, void *valptr, const type_info *tinfo) {
-    bool ret = deregister_instance_impl(valptr, self);
-    if (!tinfo->simple_ancestors) {
-        traverse_offset_bases(valptr, tinfo, self, deregister_instance_impl);
-    }
-    return ret;
-}
-
-/// Instance creation function for all pybind11 types. It allocates the internal instance layout
-/// for holding C++ objects and holders.  Allocation is done lazily (the first time the instance is
-/// cast to a reference or pointer), and initialization is done by an `__init__` function.
-inline PyObject *make_new_instance(PyTypeObject *type) {
-#if defined(PYPY_VERSION)
-    // PyPy gets tp_basicsize wrong (issue 2482) under multiple inheritance when the first
-    // inherited object is a plain Python type (i.e. not derived from an extension type).  Fix it.
-    ssize_t instance_size = static_cast<ssize_t>(sizeof(instance));
-    if (type->tp_basicsize < instance_size) {
-        type->tp_basicsize = instance_size;
-    }
-#endif
-    PyObject *self = type->tp_alloc(type, 0);
-    auto *inst = reinterpret_cast<instance *>(self);
-    // Allocate the value/holder internals:
-    inst->allocate_layout();
-
-    return self;
-}
-
-/// Instance creation function for all pybind11 types. It only allocates space for the
-/// C++ object, but doesn't call the constructor -- an `__init__` function must do that.
-extern "C" inline PyObject *pybind11_object_new(PyTypeObject *type, PyObject *, PyObject *) {
-    return make_new_instance(type);
-}
-
-/// An `__init__` function constructs the C++ object. Users should provide at least one
-/// of these using `py::init` or directly with `.def(__init__, ...)`. Otherwise, the
-/// following default function will be used which simply throws an exception.
-extern "C" inline int pybind11_object_init(PyObject *self, PyObject *, PyObject *) {
-    PyTypeObject *type = Py_TYPE(self);
-    std::string msg = get_fully_qualified_tp_name(type) + ": No constructor defined!";
-    PyErr_SetString(PyExc_TypeError, msg.c_str());
-    return -1;
-}
-
-inline void add_patient(PyObject *nurse, PyObject *patient) {
-    auto &internals = get_internals();
-    auto *instance = reinterpret_cast<detail::instance *>(nurse);
-    instance->has_patients = true;
-    Py_INCREF(patient);
-    internals.patients[nurse].push_back(patient);
-}
-
-inline void clear_patients(PyObject *self) {
-    auto *instance = reinterpret_cast<detail::instance *>(self);
-    auto &internals = get_internals();
-    auto pos = internals.patients.find(self);
-    assert(pos != internals.patients.end());
-    // Clearing the patients can cause more Python code to run, which
-    // can invalidate the iterator. Extract the vector of patients
-    // from the unordered_map first.
-    auto patients = std::move(pos->second);
-    internals.patients.erase(pos);
-    instance->has_patients = false;
-    for (PyObject *&patient : patients) {
-        Py_CLEAR(patient);
-    }
-}
-
-/// Clears all internal data from the instance and removes it from registered instances in
-/// preparation for deallocation.
-inline void clear_instance(PyObject *self) {
-    auto *instance = reinterpret_cast<detail::instance *>(self);
-
-    // Deallocate any values/holders, if present:
-    for (auto &v_h : values_and_holders(instance)) {
-        if (v_h) {
-
-            // We have to deregister before we call dealloc because, for virtual MI types, we still
-            // need to be able to get the parent pointers.
-            if (v_h.instance_registered()
-                && !deregister_instance(instance, v_h.value_ptr(), v_h.type)) {
-                pybind11_fail(
-                    "pybind11_object_dealloc(): Tried to deallocate unregistered instance!");
-            }
-
-            if (instance->owned || v_h.holder_constructed()) {
-                v_h.type->dealloc(v_h);
-            }
-        }
-    }
-    // Deallocate the value/holder layout internals:
-    instance->deallocate_layout();
-
-    if (instance->weakrefs) {
-        PyObject_ClearWeakRefs(self);
-    }
-
-    PyObject **dict_ptr = _PyObject_GetDictPtr(self);
-    if (dict_ptr) {
-        Py_CLEAR(*dict_ptr);
-    }
-
-    if (instance->has_patients) {
-        clear_patients(self);
-    }
-}
-
-/// Instance destructor function for all pybind11 types. It calls `type_info.dealloc`
-/// to destroy the C++ object itself, while the rest is Python bookkeeping.
-extern "C" inline void pybind11_object_dealloc(PyObject *self) {
-    clear_instance(self);
-
-    auto *type = Py_TYPE(self);
-    type->tp_free(self);
-
-#if PY_VERSION_HEX < 0x03080000
-    // `type->tp_dealloc != pybind11_object_dealloc` means that we're being called
-    // as part of a derived type's dealloc, in which case we're not allowed to decref
-    // the type here. For cross-module compatibility, we shouldn't compare directly
-    // with `pybind11_object_dealloc`, but with the common one stashed in internals.
-    auto pybind11_object_type = (PyTypeObject *) get_internals().instance_base;
-    if (type->tp_dealloc == pybind11_object_type->tp_dealloc)
-        Py_DECREF(type);
-#else
-    // This was not needed before Python 3.8 (Python issue 35810)
-    // https://github.com/pybind/pybind11/issues/1946
-    Py_DECREF(type);
-#endif
-}
-
-std::string error_string();
-
-/** Create the type which can be used as a common base for all classes.  This is
-    needed in order to satisfy Python's requirements for multiple inheritance.
-    Return value: New reference. */
-inline PyObject *make_object_base_type(PyTypeObject *metaclass) {
-    constexpr auto *name = "pybind11_object";
-    auto name_obj = reinterpret_steal<object>(PYBIND11_FROM_STRING(name));
-
-    /* Danger zone: from now (and until PyType_Ready), make sure to
-       issue no Python C API calls which could potentially invoke the
-       garbage collector (the GC will call type_traverse(), which will in
-       turn find the newly constructed type in an invalid state) */
-    auto *heap_type = (PyHeapTypeObject *) metaclass->tp_alloc(metaclass, 0);
-    if (!heap_type) {
-        pybind11_fail("make_object_base_type(): error allocating type!");
-    }
-
-    heap_type->ht_name = name_obj.inc_ref().ptr();
-#ifdef PYBIND11_BUILTIN_QUALNAME
-    heap_type->ht_qualname = name_obj.inc_ref().ptr();
-#endif
-
-    auto *type = &heap_type->ht_type;
-    type->tp_name = name;
-    type->tp_base = type_incref(&PyBaseObject_Type);
-    type->tp_basicsize = static_cast<ssize_t>(sizeof(instance));
-    type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE;
-
-    type->tp_new = pybind11_object_new;
-    type->tp_init = pybind11_object_init;
-    type->tp_dealloc = pybind11_object_dealloc;
-
-    /* Support weak references (needed for the keep_alive feature) */
-    type->tp_weaklistoffset = offsetof(instance, weakrefs);
-
-    if (PyType_Ready(type) < 0) {
-        pybind11_fail("PyType_Ready failed in make_object_base_type(): " + error_string());
-    }
-
-    setattr((PyObject *) type, "__module__", str("pybind11_builtins"));
-    PYBIND11_SET_OLDPY_QUALNAME(type, name_obj);
-
-    assert(!PyType_HasFeature(type, Py_TPFLAGS_HAVE_GC));
-    return (PyObject *) heap_type;
-}
-
-/// dynamic_attr: Support for `d = instance.__dict__`.
-extern "C" inline PyObject *pybind11_get_dict(PyObject *self, void *) {
-    PyObject *&dict = *_PyObject_GetDictPtr(self);
-    if (!dict) {
-        dict = PyDict_New();
-    }
-    Py_XINCREF(dict);
-    return dict;
-}
-
-/// dynamic_attr: Support for `instance.__dict__ = dict()`.
-extern "C" inline int pybind11_set_dict(PyObject *self, PyObject *new_dict, void *) {
-    if (!PyDict_Check(new_dict)) {
-        PyErr_Format(PyExc_TypeError,
-                     "__dict__ must be set to a dictionary, not a '%.200s'",
-                     get_fully_qualified_tp_name(Py_TYPE(new_dict)).c_str());
-        return -1;
-    }
-    PyObject *&dict = *_PyObject_GetDictPtr(self);
-    Py_INCREF(new_dict);
-    Py_CLEAR(dict);
-    dict = new_dict;
-    return 0;
-}
-
-/// dynamic_attr: Allow the garbage collector to traverse the internal instance `__dict__`.
-extern "C" inline int pybind11_traverse(PyObject *self, visitproc visit, void *arg) {
-    PyObject *&dict = *_PyObject_GetDictPtr(self);
-    Py_VISIT(dict);
-// https://docs.python.org/3/c-api/typeobj.html#c.PyTypeObject.tp_traverse
-#if PY_VERSION_HEX >= 0x03090000
-    Py_VISIT(Py_TYPE(self));
-#endif
-    return 0;
-}
-
-/// dynamic_attr: Allow the GC to clear the dictionary.
-extern "C" inline int pybind11_clear(PyObject *self) {
-    PyObject *&dict = *_PyObject_GetDictPtr(self);
-    Py_CLEAR(dict);
-    return 0;
-}
-
-/// Give instances of this type a `__dict__` and opt into garbage collection.
-inline void enable_dynamic_attributes(PyHeapTypeObject *heap_type) {
-    auto *type = &heap_type->ht_type;
-    type->tp_flags |= Py_TPFLAGS_HAVE_GC;
-#if PY_VERSION_HEX < 0x030B0000
-    type->tp_dictoffset = type->tp_basicsize;           // place dict at the end
-    type->tp_basicsize += (ssize_t) sizeof(PyObject *); // and allocate enough space for it
-#else
-    type->tp_flags |= Py_TPFLAGS_MANAGED_DICT;
-#endif
-    type->tp_traverse = pybind11_traverse;
-    type->tp_clear = pybind11_clear;
-
-    static PyGetSetDef getset[] = {
-        {const_cast<char *>("__dict__"), pybind11_get_dict, pybind11_set_dict, nullptr, nullptr},
-        {nullptr, nullptr, nullptr, nullptr, nullptr}};
-    type->tp_getset = getset;
-}
-
-/// buffer_protocol: Fill in the view as specified by flags.
-extern "C" inline int pybind11_getbuffer(PyObject *obj, Py_buffer *view, int flags) {
-    // Look for a `get_buffer` implementation in this type's info or any bases (following MRO).
-    type_info *tinfo = nullptr;
-    for (auto type : reinterpret_borrow<tuple>(Py_TYPE(obj)->tp_mro)) {
-        tinfo = get_type_info((PyTypeObject *) type.ptr());
-        if (tinfo && tinfo->get_buffer) {
-            break;
-        }
-    }
-    if (view == nullptr || !tinfo || !tinfo->get_buffer) {
-        if (view) {
-            view->obj = nullptr;
-        }
-        PyErr_SetString(PyExc_BufferError, "pybind11_getbuffer(): Internal error");
-        return -1;
-    }
-    std::memset(view, 0, sizeof(Py_buffer));
-    buffer_info *info = tinfo->get_buffer(obj, tinfo->get_buffer_data);
-    if ((flags & PyBUF_WRITABLE) == PyBUF_WRITABLE && info->readonly) {
-        delete info;
-        // view->obj = nullptr;  // Was just memset to 0, so not necessary
-        PyErr_SetString(PyExc_BufferError, "Writable buffer requested for readonly storage");
-        return -1;
-    }
-    view->obj = obj;
-    view->ndim = 1;
-    view->internal = info;
-    view->buf = info->ptr;
-    view->itemsize = info->itemsize;
-    view->len = view->itemsize;
-    for (auto s : info->shape) {
-        view->len *= s;
-    }
-    view->readonly = static_cast<int>(info->readonly);
-    if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT) {
-        view->format = const_cast<char *>(info->format.c_str());
-    }
-    if ((flags & PyBUF_STRIDES) == PyBUF_STRIDES) {
-        view->ndim = (int) info->ndim;
-        view->strides = info->strides.data();
-        view->shape = info->shape.data();
-    }
-    Py_INCREF(view->obj);
-    return 0;
-}
-
-/// buffer_protocol: Release the resources of the buffer.
-extern "C" inline void pybind11_releasebuffer(PyObject *, Py_buffer *view) {
-    delete (buffer_info *) view->internal;
-}
-
-/// Give this type a buffer interface.
-inline void enable_buffer_protocol(PyHeapTypeObject *heap_type) {
-    heap_type->ht_type.tp_as_buffer = &heap_type->as_buffer;
-
-    heap_type->as_buffer.bf_getbuffer = pybind11_getbuffer;
-    heap_type->as_buffer.bf_releasebuffer = pybind11_releasebuffer;
-}
-
-/** Create a brand new Python type according to the `type_record` specification.
-    Return value: New reference. */
-inline PyObject *make_new_python_type(const type_record &rec) {
-    auto name = reinterpret_steal<object>(PYBIND11_FROM_STRING(rec.name));
-
-    auto qualname = name;
-    if (rec.scope && !PyModule_Check(rec.scope.ptr()) && hasattr(rec.scope, "__qualname__")) {
-        qualname = reinterpret_steal<object>(
-            PyUnicode_FromFormat("%U.%U", rec.scope.attr("__qualname__").ptr(), name.ptr()));
-    }
-
-    object module_;
-    if (rec.scope) {
-        if (hasattr(rec.scope, "__module__")) {
-            module_ = rec.scope.attr("__module__");
-        } else if (hasattr(rec.scope, "__name__")) {
-            module_ = rec.scope.attr("__name__");
-        }
-    }
-
-    const auto *full_name = c_str(
-#if !defined(PYPY_VERSION)
-        module_ ? str(module_).cast<std::string>() + "." + rec.name :
-#endif
-                rec.name);
-
-    char *tp_doc = nullptr;
-    if (rec.doc && options::show_user_defined_docstrings()) {
-        /* Allocate memory for docstring (using PyObject_MALLOC, since
-           Python will free this later on) */
-        size_t size = std::strlen(rec.doc) + 1;
-        tp_doc = (char *) PyObject_MALLOC(size);
-        std::memcpy((void *) tp_doc, rec.doc, size);
-    }
-
-    auto &internals = get_internals();
-    auto bases = tuple(rec.bases);
-    auto *base = (bases.empty()) ? internals.instance_base : bases[0].ptr();
-
-    /* Danger zone: from now (and until PyType_Ready), make sure to
-       issue no Python C API calls which could potentially invoke the
-       garbage collector (the GC will call type_traverse(), which will in
-       turn find the newly constructed type in an invalid state) */
-    auto *metaclass
-        = rec.metaclass.ptr() ? (PyTypeObject *) rec.metaclass.ptr() : internals.default_metaclass;
-
-    auto *heap_type = (PyHeapTypeObject *) metaclass->tp_alloc(metaclass, 0);
-    if (!heap_type) {
-        pybind11_fail(std::string(rec.name) + ": Unable to create type object!");
-    }
-
-    heap_type->ht_name = name.release().ptr();
-#ifdef PYBIND11_BUILTIN_QUALNAME
-    heap_type->ht_qualname = qualname.inc_ref().ptr();
-#endif
-
-    auto *type = &heap_type->ht_type;
-    type->tp_name = full_name;
-    type->tp_doc = tp_doc;
-    type->tp_base = type_incref((PyTypeObject *) base);
-    type->tp_basicsize = static_cast<ssize_t>(sizeof(instance));
-    if (!bases.empty()) {
-        type->tp_bases = bases.release().ptr();
-    }
-
-    /* Don't inherit base __init__ */
-    type->tp_init = pybind11_object_init;
-
-    /* Supported protocols */
-    type->tp_as_number = &heap_type->as_number;
-    type->tp_as_sequence = &heap_type->as_sequence;
-    type->tp_as_mapping = &heap_type->as_mapping;
-    type->tp_as_async = &heap_type->as_async;
-
-    /* Flags */
-    type->tp_flags |= Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE;
-    if (!rec.is_final) {
-        type->tp_flags |= Py_TPFLAGS_BASETYPE;
-    }
-
-    if (rec.dynamic_attr) {
-        enable_dynamic_attributes(heap_type);
-    }
-
-    if (rec.buffer_protocol) {
-        enable_buffer_protocol(heap_type);
-    }
-
-    if (rec.custom_type_setup_callback) {
-        rec.custom_type_setup_callback(heap_type);
-    }
-
-    if (PyType_Ready(type) < 0) {
-        pybind11_fail(std::string(rec.name) + ": PyType_Ready failed: " + error_string());
-    }
-
-    assert(!rec.dynamic_attr || PyType_HasFeature(type, Py_TPFLAGS_HAVE_GC));
-
-    /* Register type with the parent scope */
-    if (rec.scope) {
-        setattr(rec.scope, rec.name, (PyObject *) type);
-    } else {
-        Py_INCREF(type); // Keep it alive forever (reference leak)
-    }
-
-    if (module_) { // Needed by pydoc
-        setattr((PyObject *) type, "__module__", module_);
-    }
-
-    PYBIND11_SET_OLDPY_QUALNAME(type, qualname);
-
-    return (PyObject *) type;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/common.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/common.h
deleted file mode 100644
index 9e6947daa..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/common.h
+++ /dev/null
@@ -1,1187 +0,0 @@
-/*
-    pybind11/detail/common.h -- Basic macros
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#define PYBIND11_VERSION_MAJOR 2
-#define PYBIND11_VERSION_MINOR 11
-#define PYBIND11_VERSION_PATCH 0.dev1
-
-// Similar to Python's convention: https://docs.python.org/3/c-api/apiabiversion.html
-// Additional convention: 0xD = dev
-#define PYBIND11_VERSION_HEX 0x020B00D1
-
-#define PYBIND11_NAMESPACE_BEGIN(name) namespace name {
-#define PYBIND11_NAMESPACE_END(name) }
-
-// Robust support for some features and loading modules compiled against different pybind versions
-// requires forcing hidden visibility on pybind code, so we enforce this by setting the attribute
-// on the main `pybind11` namespace.
-#if !defined(PYBIND11_NAMESPACE)
-#    ifdef __GNUG__
-#        define PYBIND11_NAMESPACE pybind11 __attribute__((visibility("hidden")))
-#    else
-#        define PYBIND11_NAMESPACE pybind11
-#    endif
-#endif
-
-#if !(defined(_MSC_VER) && __cplusplus == 199711L)
-#    if __cplusplus >= 201402L
-#        define PYBIND11_CPP14
-#        if __cplusplus >= 201703L
-#            define PYBIND11_CPP17
-#            if __cplusplus >= 202002L
-#                define PYBIND11_CPP20
-// Please update tests/pybind11_tests.cpp `cpp_std()` when adding a macro here.
-#            endif
-#        endif
-#    endif
-#elif defined(_MSC_VER) && __cplusplus == 199711L
-// MSVC sets _MSVC_LANG rather than __cplusplus (supposedly until the standard is fully
-// implemented). Unless you use the /Zc:__cplusplus flag on Visual Studio 2017 15.7 Preview 3
-// or newer.
-#    if _MSVC_LANG >= 201402L
-#        define PYBIND11_CPP14
-#        if _MSVC_LANG > 201402L
-#            define PYBIND11_CPP17
-#            if _MSVC_LANG >= 202002L
-#                define PYBIND11_CPP20
-#            endif
-#        endif
-#    endif
-#endif
-
-// Compiler version assertions
-#if defined(__INTEL_COMPILER)
-#    if __INTEL_COMPILER < 1800
-#        error pybind11 requires Intel C++ compiler v18 or newer
-#    elif __INTEL_COMPILER < 1900 && defined(PYBIND11_CPP14)
-#        error pybind11 supports only C++11 with Intel C++ compiler v18. Use v19 or newer for C++14.
-#    endif
-/* The following pragma cannot be pop'ed:
-   https://community.intel.com/t5/Intel-C-Compiler/Inline-and-no-inline-warning/td-p/1216764 */
-#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
-#elif defined(__clang__) && !defined(__apple_build_version__)
-#    if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 3)
-#        error pybind11 requires clang 3.3 or newer
-#    endif
-#elif defined(__clang__)
-// Apple changes clang version macros to its Xcode version; the first Xcode release based on
-// (upstream) clang 3.3 was Xcode 5:
-#    if __clang_major__ < 5
-#        error pybind11 requires Xcode/clang 5.0 or newer
-#    endif
-#elif defined(__GNUG__)
-#    if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8)
-#        error pybind11 requires gcc 4.8 or newer
-#    endif
-#elif defined(_MSC_VER)
-#    if _MSC_VER < 1910
-#        error pybind11 2.10+ requires MSVC 2017 or newer
-#    endif
-#endif
-
-#if !defined(PYBIND11_EXPORT)
-#    if defined(WIN32) || defined(_WIN32)
-#        define PYBIND11_EXPORT __declspec(dllexport)
-#    else
-#        define PYBIND11_EXPORT __attribute__((visibility("default")))
-#    endif
-#endif
-
-#if !defined(PYBIND11_EXPORT_EXCEPTION)
-#    ifdef __MINGW32__
-// workaround for:
-// error: 'dllexport' implies default visibility, but xxx has already been declared with a
-// different visibility
-#        define PYBIND11_EXPORT_EXCEPTION
-#    else
-#        define PYBIND11_EXPORT_EXCEPTION PYBIND11_EXPORT
-#    endif
-#endif
-
-// For CUDA, GCC7, GCC8:
-// PYBIND11_NOINLINE_FORCED is incompatible with `-Wattributes -Werror`.
-// When defining PYBIND11_NOINLINE_FORCED, it is best to also use `-Wno-attributes`.
-// However, the measured shared-library size saving when using noinline are only
-// 1.7% for CUDA, -0.2% for GCC7, and 0.0% for GCC8 (using -DCMAKE_BUILD_TYPE=MinSizeRel,
-// the default under pybind11/tests).
-#if !defined(PYBIND11_NOINLINE_FORCED)                                                            \
-    && (defined(__CUDACC__) || (defined(__GNUC__) && (__GNUC__ == 7 || __GNUC__ == 8)))
-#    define PYBIND11_NOINLINE_DISABLED
-#endif
-
-// The PYBIND11_NOINLINE macro is for function DEFINITIONS.
-// In contrast, FORWARD DECLARATIONS should never use this macro:
-// https://stackoverflow.com/questions/9317473/forward-declaration-of-inline-functions
-#if defined(PYBIND11_NOINLINE_DISABLED) // Option for maximum portability and experimentation.
-#    define PYBIND11_NOINLINE inline
-#elif defined(_MSC_VER)
-#    define PYBIND11_NOINLINE __declspec(noinline) inline
-#else
-#    define PYBIND11_NOINLINE __attribute__((noinline)) inline
-#endif
-
-#if defined(__MINGW32__)
-// For unknown reasons all PYBIND11_DEPRECATED member trigger a warning when declared
-// whether it is used or not
-#    define PYBIND11_DEPRECATED(reason)
-#elif defined(PYBIND11_CPP14)
-#    define PYBIND11_DEPRECATED(reason) [[deprecated(reason)]]
-#else
-#    define PYBIND11_DEPRECATED(reason) __attribute__((deprecated(reason)))
-#endif
-
-#if defined(PYBIND11_CPP17)
-#    define PYBIND11_MAYBE_UNUSED [[maybe_unused]]
-#elif defined(_MSC_VER) && !defined(__clang__)
-#    define PYBIND11_MAYBE_UNUSED
-#else
-#    define PYBIND11_MAYBE_UNUSED __attribute__((__unused__))
-#endif
-
-/* Don't let Python.h #define (v)snprintf as macro because they are implemented
-   properly in Visual Studio since 2015. */
-#if defined(_MSC_VER)
-#    define HAVE_SNPRINTF 1
-#endif
-
-/// Include Python header, disable linking to pythonX_d.lib on Windows in debug mode
-#if defined(_MSC_VER)
-#    pragma warning(push)
-// C4505: 'PySlice_GetIndicesEx': unreferenced local function has been removed (PyPy only)
-#    pragma warning(disable : 4505)
-#    if defined(_DEBUG) && !defined(Py_DEBUG)
-// Workaround for a VS 2022 issue.
-// NOTE: This workaround knowingly violates the Python.h include order requirement:
-// https://docs.python.org/3/c-api/intro.html#include-files
-// See https://github.com/pybind/pybind11/pull/3497 for full context.
-#        include <yvals.h>
-#        if _MSVC_STL_VERSION >= 143
-#            include <crtdefs.h>
-#        endif
-#        define PYBIND11_DEBUG_MARKER
-#        undef _DEBUG
-#    endif
-#endif
-
-// https://en.cppreference.com/w/c/chrono/localtime
-#if defined(__STDC_LIB_EXT1__) && !defined(__STDC_WANT_LIB_EXT1__)
-#    define __STDC_WANT_LIB_EXT1__
-#endif
-
-#ifdef __has_include
-// std::optional (but including it in c++14 mode isn't allowed)
-#    if defined(PYBIND11_CPP17) && __has_include(<optional>)
-#        define PYBIND11_HAS_OPTIONAL 1
-#    endif
-// std::experimental::optional (but not allowed in c++11 mode)
-#    if defined(PYBIND11_CPP14) && (__has_include(<experimental/optional>) && \
-                                 !__has_include(<optional>))
-#        define PYBIND11_HAS_EXP_OPTIONAL 1
-#    endif
-// std::variant
-#    if defined(PYBIND11_CPP17) && __has_include(<variant>)
-#        define PYBIND11_HAS_VARIANT 1
-#    endif
-#elif defined(_MSC_VER) && defined(PYBIND11_CPP17)
-#    define PYBIND11_HAS_OPTIONAL 1
-#    define PYBIND11_HAS_VARIANT 1
-#endif
-
-#if defined(PYBIND11_CPP17)
-#    if defined(__has_include)
-#        if __has_include(<string_view>)
-#            define PYBIND11_HAS_STRING_VIEW
-#        endif
-#    elif defined(_MSC_VER)
-#        define PYBIND11_HAS_STRING_VIEW
-#    endif
-#endif
-
-#if defined(__cpp_lib_char8_t) && __cpp_lib_char8_t >= 201811L
-#    define PYBIND11_HAS_U8STRING
-#endif
-
-#include <Python.h>
-#if PY_VERSION_HEX < 0x03060000
-#    error "PYTHON < 3.6 IS UNSUPPORTED. pybind11 v2.9 was the last to support Python 2 and 3.5."
-#endif
-#include <frameobject.h>
-#include <pythread.h>
-
-/* Python #defines overrides on all sorts of core functions, which
-   tends to weak havok in C++ codebases that expect these to work
-   like regular functions (potentially with several overloads) */
-#if defined(isalnum)
-#    undef isalnum
-#    undef isalpha
-#    undef islower
-#    undef isspace
-#    undef isupper
-#    undef tolower
-#    undef toupper
-#endif
-
-#if defined(copysign)
-#    undef copysign
-#endif
-
-#if defined(_MSC_VER)
-#    if defined(PYBIND11_DEBUG_MARKER)
-#        define _DEBUG
-#        undef PYBIND11_DEBUG_MARKER
-#    endif
-#    pragma warning(pop)
-#endif
-
-#include <cstddef>
-#include <cstring>
-#include <exception>
-#include <forward_list>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <type_traits>
-#include <typeindex>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-#if defined(__has_include)
-#    if __has_include(<version>)
-#        include <version>
-#    endif
-#endif
-
-// #define PYBIND11_STR_LEGACY_PERMISSIVE
-// If DEFINED, pybind11::str can hold PyUnicodeObject or PyBytesObject
-//             (probably surprising and never documented, but this was the
-//             legacy behavior until and including v2.6.x). As a side-effect,
-//             pybind11::isinstance<str>() is true for both pybind11::str and
-//             pybind11::bytes.
-// If UNDEFINED, pybind11::str can only hold PyUnicodeObject, and
-//               pybind11::isinstance<str>() is true only for pybind11::str.
-//               However, for Python 2 only (!), the pybind11::str caster
-//               implicitly decoded bytes to PyUnicodeObject. This was to ease
-//               the transition from the legacy behavior to the non-permissive
-//               behavior.
-
-/// Compatibility macros for Python 2 / Python 3 versions TODO: remove
-#define PYBIND11_INSTANCE_METHOD_NEW(ptr, class_) PyInstanceMethod_New(ptr)
-#define PYBIND11_INSTANCE_METHOD_CHECK PyInstanceMethod_Check
-#define PYBIND11_INSTANCE_METHOD_GET_FUNCTION PyInstanceMethod_GET_FUNCTION
-#define PYBIND11_BYTES_CHECK PyBytes_Check
-#define PYBIND11_BYTES_FROM_STRING PyBytes_FromString
-#define PYBIND11_BYTES_FROM_STRING_AND_SIZE PyBytes_FromStringAndSize
-#define PYBIND11_BYTES_AS_STRING_AND_SIZE PyBytes_AsStringAndSize
-#define PYBIND11_BYTES_AS_STRING PyBytes_AsString
-#define PYBIND11_BYTES_SIZE PyBytes_Size
-#define PYBIND11_LONG_CHECK(o) PyLong_Check(o)
-#define PYBIND11_LONG_AS_LONGLONG(o) PyLong_AsLongLong(o)
-#define PYBIND11_LONG_FROM_SIGNED(o) PyLong_FromSsize_t((ssize_t) (o))
-#define PYBIND11_LONG_FROM_UNSIGNED(o) PyLong_FromSize_t((size_t) (o))
-#define PYBIND11_BYTES_NAME "bytes"
-#define PYBIND11_STRING_NAME "str"
-#define PYBIND11_SLICE_OBJECT PyObject
-#define PYBIND11_FROM_STRING PyUnicode_FromString
-#define PYBIND11_STR_TYPE ::pybind11::str
-#define PYBIND11_BOOL_ATTR "__bool__"
-#define PYBIND11_NB_BOOL(ptr) ((ptr)->nb_bool)
-#define PYBIND11_BUILTINS_MODULE "builtins"
-// Providing a separate declaration to make Clang's -Wmissing-prototypes happy.
-// See comment for PYBIND11_MODULE below for why this is marked "maybe unused".
-#define PYBIND11_PLUGIN_IMPL(name)                                                                \
-    extern "C" PYBIND11_MAYBE_UNUSED PYBIND11_EXPORT PyObject *PyInit_##name();                   \
-    extern "C" PYBIND11_EXPORT PyObject *PyInit_##name()
-
-#define PYBIND11_TRY_NEXT_OVERLOAD ((PyObject *) 1) // special failure return code
-#define PYBIND11_STRINGIFY(x) #x
-#define PYBIND11_TOSTRING(x) PYBIND11_STRINGIFY(x)
-#define PYBIND11_CONCAT(first, second) first##second
-#define PYBIND11_ENSURE_INTERNALS_READY pybind11::detail::get_internals();
-
-#define PYBIND11_CHECK_PYTHON_VERSION                                                             \
-    {                                                                                             \
-        const char *compiled_ver                                                                  \
-            = PYBIND11_TOSTRING(PY_MAJOR_VERSION) "." PYBIND11_TOSTRING(PY_MINOR_VERSION);        \
-        const char *runtime_ver = Py_GetVersion();                                                \
-        size_t len = std::strlen(compiled_ver);                                                   \
-        if (std::strncmp(runtime_ver, compiled_ver, len) != 0                                     \
-            || (runtime_ver[len] >= '0' && runtime_ver[len] <= '9')) {                            \
-            PyErr_Format(PyExc_ImportError,                                                       \
-                         "Python version mismatch: module was compiled for Python %s, "           \
-                         "but the interpreter version is incompatible: %s.",                      \
-                         compiled_ver,                                                            \
-                         runtime_ver);                                                            \
-            return nullptr;                                                                       \
-        }                                                                                         \
-    }
-
-#define PYBIND11_CATCH_INIT_EXCEPTIONS                                                            \
-    catch (pybind11::error_already_set & e) {                                                     \
-        pybind11::raise_from(e, PyExc_ImportError, "initialization failed");                      \
-        return nullptr;                                                                           \
-    }                                                                                             \
-    catch (const std::exception &e) {                                                             \
-        PyErr_SetString(PyExc_ImportError, e.what());                                             \
-        return nullptr;                                                                           \
-    }
-
-/** \rst
-    ***Deprecated in favor of PYBIND11_MODULE***
-
-    This macro creates the entry point that will be invoked when the Python interpreter
-    imports a plugin library. Please create a `module_` in the function body and return
-    the pointer to its underlying Python object at the end.
-
-    .. code-block:: cpp
-
-        PYBIND11_PLUGIN(example) {
-            pybind11::module_ m("example", "pybind11 example plugin");
-            /// Set up bindings here
-            return m.ptr();
-        }
-\endrst */
-#define PYBIND11_PLUGIN(name)                                                                     \
-    PYBIND11_DEPRECATED("PYBIND11_PLUGIN is deprecated, use PYBIND11_MODULE")                     \
-    static PyObject *pybind11_init();                                                             \
-    PYBIND11_PLUGIN_IMPL(name) {                                                                  \
-        PYBIND11_CHECK_PYTHON_VERSION                                                             \
-        PYBIND11_ENSURE_INTERNALS_READY                                                           \
-        try {                                                                                     \
-            return pybind11_init();                                                               \
-        }                                                                                         \
-        PYBIND11_CATCH_INIT_EXCEPTIONS                                                            \
-    }                                                                                             \
-    PyObject *pybind11_init()
-
-/** \rst
-    This macro creates the entry point that will be invoked when the Python interpreter
-    imports an extension module. The module name is given as the fist argument and it
-    should not be in quotes. The second macro argument defines a variable of type
-    `py::module_` which can be used to initialize the module.
-
-    The entry point is marked as "maybe unused" to aid dead-code detection analysis:
-    since the entry point is typically only looked up at runtime and not referenced
-    during translation, it would otherwise appear as unused ("dead") code.
-
-    .. code-block:: cpp
-
-        PYBIND11_MODULE(example, m) {
-            m.doc() = "pybind11 example module";
-
-            // Add bindings here
-            m.def("foo", []() {
-                return "Hello, World!";
-            });
-        }
-\endrst */
-#define PYBIND11_MODULE(name, variable)                                                           \
-    static ::pybind11::module_::module_def PYBIND11_CONCAT(pybind11_module_def_, name)            \
-        PYBIND11_MAYBE_UNUSED;                                                                    \
-    PYBIND11_MAYBE_UNUSED                                                                         \
-    static void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ &);                     \
-    PYBIND11_PLUGIN_IMPL(name) {                                                                  \
-        PYBIND11_CHECK_PYTHON_VERSION                                                             \
-        PYBIND11_ENSURE_INTERNALS_READY                                                           \
-        auto m = ::pybind11::module_::create_extension_module(                                    \
-            PYBIND11_TOSTRING(name), nullptr, &PYBIND11_CONCAT(pybind11_module_def_, name));      \
-        try {                                                                                     \
-            PYBIND11_CONCAT(pybind11_init_, name)(m);                                             \
-            return m.ptr();                                                                       \
-        }                                                                                         \
-        PYBIND11_CATCH_INIT_EXCEPTIONS                                                            \
-    }                                                                                             \
-    void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ & (variable))
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-using ssize_t = Py_ssize_t;
-using size_t = std::size_t;
-
-template <typename IntType>
-inline ssize_t ssize_t_cast(const IntType &val) {
-    static_assert(sizeof(IntType) <= sizeof(ssize_t), "Implicit narrowing is not permitted.");
-    return static_cast<ssize_t>(val);
-}
-
-/// Approach used to cast a previously unknown C++ instance into a Python object
-enum class return_value_policy : uint8_t {
-    /** This is the default return value policy, which falls back to the policy
-        return_value_policy::take_ownership when the return value is a pointer.
-        Otherwise, it uses return_value::move or return_value::copy for rvalue
-        and lvalue references, respectively. See below for a description of what
-        all of these different policies do. */
-    automatic = 0,
-
-    /** As above, but use policy return_value_policy::reference when the return
-        value is a pointer. This is the default conversion policy for function
-        arguments when calling Python functions manually from C++ code (i.e. via
-        handle::operator()). You probably won't need to use this. */
-    automatic_reference,
-
-    /** Reference an existing object (i.e. do not create a new copy) and take
-        ownership. Python will call the destructor and delete operator when the
-        object's reference count reaches zero. Undefined behavior ensues when
-        the C++ side does the same.. */
-    take_ownership,
-
-    /** Create a new copy of the returned object, which will be owned by
-        Python. This policy is comparably safe because the lifetimes of the two
-        instances are decoupled. */
-    copy,
-
-    /** Use std::move to move the return value contents into a new instance
-        that will be owned by Python. This policy is comparably safe because the
-        lifetimes of the two instances (move source and destination) are
-        decoupled. */
-    move,
-
-    /** Reference an existing object, but do not take ownership. The C++ side
-        is responsible for managing the object's lifetime and deallocating it
-        when it is no longer used. Warning: undefined behavior will ensue when
-        the C++ side deletes an object that is still referenced and used by
-        Python. */
-    reference,
-
-    /** This policy only applies to methods and properties. It references the
-        object without taking ownership similar to the above
-        return_value_policy::reference policy. In contrast to that policy, the
-        function or property's implicit this argument (called the parent) is
-        considered to be the the owner of the return value (the child).
-        pybind11 then couples the lifetime of the parent to the child via a
-        reference relationship that ensures that the parent cannot be garbage
-        collected while Python is still using the child. More advanced
-        variations of this scheme are also possible using combinations of
-        return_value_policy::reference and the keep_alive call policy */
-    reference_internal
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-inline static constexpr int log2(size_t n, int k = 0) {
-    return (n <= 1) ? k : log2(n >> 1, k + 1);
-}
-
-// Returns the size as a multiple of sizeof(void *), rounded up.
-inline static constexpr size_t size_in_ptrs(size_t s) {
-    return 1 + ((s - 1) >> log2(sizeof(void *)));
-}
-
-/**
- * The space to allocate for simple layout instance holders (see below) in multiple of the size of
- * a pointer (e.g.  2 means 16 bytes on 64-bit architectures).  The default is the minimum required
- * to holder either a std::unique_ptr or std::shared_ptr (which is almost always
- * sizeof(std::shared_ptr<T>)).
- */
-constexpr size_t instance_simple_holder_in_ptrs() {
-    static_assert(sizeof(std::shared_ptr<int>) >= sizeof(std::unique_ptr<int>),
-                  "pybind assumes std::shared_ptrs are at least as big as std::unique_ptrs");
-    return size_in_ptrs(sizeof(std::shared_ptr<int>));
-}
-
-// Forward declarations
-struct type_info;
-struct value_and_holder;
-
-struct nonsimple_values_and_holders {
-    void **values_and_holders;
-    uint8_t *status;
-};
-
-/// The 'instance' type which needs to be standard layout (need to be able to use 'offsetof')
-struct instance {
-    PyObject_HEAD
-    /// Storage for pointers and holder; see simple_layout, below, for a description
-    union {
-        void *simple_value_holder[1 + instance_simple_holder_in_ptrs()];
-        nonsimple_values_and_holders nonsimple;
-    };
-    /// Weak references
-    PyObject *weakrefs;
-    /// If true, the pointer is owned which means we're free to manage it with a holder.
-    bool owned : 1;
-    /**
-     * An instance has two possible value/holder layouts.
-     *
-     * Simple layout (when this flag is true), means the `simple_value_holder` is set with a
-     * pointer and the holder object governing that pointer, i.e. [val1*][holder].  This layout is
-     * applied whenever there is no python-side multiple inheritance of bound C++ types *and* the
-     * type's holder will fit in the default space (which is large enough to hold either a
-     * std::unique_ptr or std::shared_ptr).
-     *
-     * Non-simple layout applies when using custom holders that require more space than
-     * `shared_ptr` (which is typically the size of two pointers), or when multiple inheritance is
-     * used on the python side.  Non-simple layout allocates the required amount of memory to have
-     * multiple bound C++ classes as parents.  Under this layout, `nonsimple.values_and_holders` is
-     * set to a pointer to allocated space of the required space to hold a sequence of value
-     * pointers and holders followed `status`, a set of bit flags (1 byte each), i.e.
-     * [val1*][holder1][val2*][holder2]...[bb...]  where each [block] is rounded up to a multiple
-     * of `sizeof(void *)`.  `nonsimple.status` is, for convenience, a pointer to the beginning of
-     * the [bb...] block (but not independently allocated).
-     *
-     * Status bits indicate whether the associated holder is constructed (&
-     * status_holder_constructed) and whether the value pointer is registered (&
-     * status_instance_registered) in `registered_instances`.
-     */
-    bool simple_layout : 1;
-    /// For simple layout, tracks whether the holder has been constructed
-    bool simple_holder_constructed : 1;
-    /// For simple layout, tracks whether the instance is registered in `registered_instances`
-    bool simple_instance_registered : 1;
-    /// If true, get_internals().patients has an entry for this object
-    bool has_patients : 1;
-
-    /// Initializes all of the above type/values/holders data (but not the instance values
-    /// themselves)
-    void allocate_layout();
-
-    /// Destroys/deallocates all of the above
-    void deallocate_layout();
-
-    /// Returns the value_and_holder wrapper for the given type (or the first, if `find_type`
-    /// omitted).  Returns a default-constructed (with `.inst = nullptr`) object on failure if
-    /// `throw_if_missing` is false.
-    value_and_holder get_value_and_holder(const type_info *find_type = nullptr,
-                                          bool throw_if_missing = true);
-
-    /// Bit values for the non-simple status flags
-    static constexpr uint8_t status_holder_constructed = 1;
-    static constexpr uint8_t status_instance_registered = 2;
-};
-
-static_assert(std::is_standard_layout<instance>::value,
-              "Internal error: `pybind11::detail::instance` is not standard layout!");
-
-/// from __cpp_future__ import (convenient aliases from C++14/17)
-#if defined(PYBIND11_CPP14)
-using std::conditional_t;
-using std::enable_if_t;
-using std::remove_cv_t;
-using std::remove_reference_t;
-#else
-template <bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-template <bool B, typename T, typename F>
-using conditional_t = typename std::conditional<B, T, F>::type;
-template <typename T>
-using remove_cv_t = typename std::remove_cv<T>::type;
-template <typename T>
-using remove_reference_t = typename std::remove_reference<T>::type;
-#endif
-
-#if defined(PYBIND11_CPP20)
-using std::remove_cvref;
-using std::remove_cvref_t;
-#else
-template <class T>
-struct remove_cvref {
-    using type = remove_cv_t<remove_reference_t<T>>;
-};
-template <class T>
-using remove_cvref_t = typename remove_cvref<T>::type;
-#endif
-
-/// Index sequences
-#if defined(PYBIND11_CPP14)
-using std::index_sequence;
-using std::make_index_sequence;
-#else
-template <size_t...>
-struct index_sequence {};
-template <size_t N, size_t... S>
-struct make_index_sequence_impl : make_index_sequence_impl<N - 1, N - 1, S...> {};
-template <size_t... S>
-struct make_index_sequence_impl<0, S...> {
-    using type = index_sequence<S...>;
-};
-template <size_t N>
-using make_index_sequence = typename make_index_sequence_impl<N>::type;
-#endif
-
-/// Make an index sequence of the indices of true arguments
-template <typename ISeq, size_t, bool...>
-struct select_indices_impl {
-    using type = ISeq;
-};
-template <size_t... IPrev, size_t I, bool B, bool... Bs>
-struct select_indices_impl<index_sequence<IPrev...>, I, B, Bs...>
-    : select_indices_impl<conditional_t<B, index_sequence<IPrev..., I>, index_sequence<IPrev...>>,
-                          I + 1,
-                          Bs...> {};
-template <bool... Bs>
-using select_indices = typename select_indices_impl<index_sequence<>, 0, Bs...>::type;
-
-/// Backports of std::bool_constant and std::negation to accommodate older compilers
-template <bool B>
-using bool_constant = std::integral_constant<bool, B>;
-template <typename T>
-struct negation : bool_constant<!T::value> {};
-
-// PGI/Intel cannot detect operator delete with the "compatible" void_t impl, so
-// using the new one (C++14 defect, so generally works on newer compilers, even
-// if not in C++17 mode)
-#if defined(__PGIC__) || defined(__INTEL_COMPILER)
-template <typename...>
-using void_t = void;
-#else
-template <typename...>
-struct void_t_impl {
-    using type = void;
-};
-template <typename... Ts>
-using void_t = typename void_t_impl<Ts...>::type;
-#endif
-
-/// Compile-time all/any/none of that check the boolean value of all template types
-#if defined(__cpp_fold_expressions) && !(defined(_MSC_VER) && (_MSC_VER < 1916))
-template <class... Ts>
-using all_of = bool_constant<(Ts::value && ...)>;
-template <class... Ts>
-using any_of = bool_constant<(Ts::value || ...)>;
-#elif !defined(_MSC_VER)
-template <bool...>
-struct bools {};
-template <class... Ts>
-using all_of = std::is_same<bools<Ts::value..., true>, bools<true, Ts::value...>>;
-template <class... Ts>
-using any_of = negation<all_of<negation<Ts>...>>;
-#else
-// MSVC has trouble with the above, but supports std::conjunction, which we can use instead (albeit
-// at a slight loss of compilation efficiency).
-template <class... Ts>
-using all_of = std::conjunction<Ts...>;
-template <class... Ts>
-using any_of = std::disjunction<Ts...>;
-#endif
-template <class... Ts>
-using none_of = negation<any_of<Ts...>>;
-
-template <class T, template <class> class... Predicates>
-using satisfies_all_of = all_of<Predicates<T>...>;
-template <class T, template <class> class... Predicates>
-using satisfies_any_of = any_of<Predicates<T>...>;
-template <class T, template <class> class... Predicates>
-using satisfies_none_of = none_of<Predicates<T>...>;
-
-/// Strip the class from a method type
-template <typename T>
-struct remove_class {};
-template <typename C, typename R, typename... A>
-struct remove_class<R (C::*)(A...)> {
-    using type = R(A...);
-};
-template <typename C, typename R, typename... A>
-struct remove_class<R (C::*)(A...) const> {
-    using type = R(A...);
-};
-
-/// Helper template to strip away type modifiers
-template <typename T>
-struct intrinsic_type {
-    using type = T;
-};
-template <typename T>
-struct intrinsic_type<const T> {
-    using type = typename intrinsic_type<T>::type;
-};
-template <typename T>
-struct intrinsic_type<T *> {
-    using type = typename intrinsic_type<T>::type;
-};
-template <typename T>
-struct intrinsic_type<T &> {
-    using type = typename intrinsic_type<T>::type;
-};
-template <typename T>
-struct intrinsic_type<T &&> {
-    using type = typename intrinsic_type<T>::type;
-};
-template <typename T, size_t N>
-struct intrinsic_type<const T[N]> {
-    using type = typename intrinsic_type<T>::type;
-};
-template <typename T, size_t N>
-struct intrinsic_type<T[N]> {
-    using type = typename intrinsic_type<T>::type;
-};
-template <typename T>
-using intrinsic_t = typename intrinsic_type<T>::type;
-
-/// Helper type to replace 'void' in some expressions
-struct void_type {};
-
-/// Helper template which holds a list of types
-template <typename...>
-struct type_list {};
-
-/// Compile-time integer sum
-#ifdef __cpp_fold_expressions
-template <typename... Ts>
-constexpr size_t constexpr_sum(Ts... ns) {
-    return (0 + ... + size_t{ns});
-}
-#else
-constexpr size_t constexpr_sum() { return 0; }
-template <typename T, typename... Ts>
-constexpr size_t constexpr_sum(T n, Ts... ns) {
-    return size_t{n} + constexpr_sum(ns...);
-}
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(constexpr_impl)
-/// Implementation details for constexpr functions
-constexpr int first(int i) { return i; }
-template <typename T, typename... Ts>
-constexpr int first(int i, T v, Ts... vs) {
-    return v ? i : first(i + 1, vs...);
-}
-
-constexpr int last(int /*i*/, int result) { return result; }
-template <typename T, typename... Ts>
-constexpr int last(int i, int result, T v, Ts... vs) {
-    return last(i + 1, v ? i : result, vs...);
-}
-PYBIND11_NAMESPACE_END(constexpr_impl)
-
-/// Return the index of the first type in Ts which satisfies Predicate<T>.
-/// Returns sizeof...(Ts) if none match.
-template <template <typename> class Predicate, typename... Ts>
-constexpr int constexpr_first() {
-    return constexpr_impl::first(0, Predicate<Ts>::value...);
-}
-
-/// Return the index of the last type in Ts which satisfies Predicate<T>, or -1 if none match.
-template <template <typename> class Predicate, typename... Ts>
-constexpr int constexpr_last() {
-    return constexpr_impl::last(0, -1, Predicate<Ts>::value...);
-}
-
-/// Return the Nth element from the parameter pack
-template <size_t N, typename T, typename... Ts>
-struct pack_element {
-    using type = typename pack_element<N - 1, Ts...>::type;
-};
-template <typename T, typename... Ts>
-struct pack_element<0, T, Ts...> {
-    using type = T;
-};
-
-/// Return the one and only type which matches the predicate, or Default if none match.
-/// If more than one type matches the predicate, fail at compile-time.
-template <template <typename> class Predicate, typename Default, typename... Ts>
-struct exactly_one {
-    static constexpr auto found = constexpr_sum(Predicate<Ts>::value...);
-    static_assert(found <= 1, "Found more than one type matching the predicate");
-
-    static constexpr auto index = found ? constexpr_first<Predicate, Ts...>() : 0;
-    using type = conditional_t<found, typename pack_element<index, Ts...>::type, Default>;
-};
-template <template <typename> class P, typename Default>
-struct exactly_one<P, Default> {
-    using type = Default;
-};
-
-template <template <typename> class Predicate, typename Default, typename... Ts>
-using exactly_one_t = typename exactly_one<Predicate, Default, Ts...>::type;
-
-/// Defer the evaluation of type T until types Us are instantiated
-template <typename T, typename... /*Us*/>
-struct deferred_type {
-    using type = T;
-};
-template <typename T, typename... Us>
-using deferred_t = typename deferred_type<T, Us...>::type;
-
-/// Like is_base_of, but requires a strict base (i.e. `is_strict_base_of<T, T>::value == false`,
-/// unlike `std::is_base_of`)
-template <typename Base, typename Derived>
-using is_strict_base_of
-    = bool_constant<std::is_base_of<Base, Derived>::value && !std::is_same<Base, Derived>::value>;
-
-/// Like is_base_of, but also requires that the base type is accessible (i.e. that a Derived
-/// pointer can be converted to a Base pointer) For unions, `is_base_of<T, T>::value` is False, so
-/// we need to check `is_same` as well.
-template <typename Base, typename Derived>
-using is_accessible_base_of
-    = bool_constant<(std::is_same<Base, Derived>::value || std::is_base_of<Base, Derived>::value)
-                    && std::is_convertible<Derived *, Base *>::value>;
-
-template <template <typename...> class Base>
-struct is_template_base_of_impl {
-    template <typename... Us>
-    static std::true_type check(Base<Us...> *);
-    static std::false_type check(...);
-};
-
-/// Check if a template is the base of a type. For example:
-/// `is_template_base_of<Base, T>` is true if `struct T : Base<U> {}` where U can be anything
-template <template <typename...> class Base, typename T>
-// Sadly, all MSVC versions incl. 2022 need the workaround, even in C++20 mode.
-// See also: https://github.com/pybind/pybind11/pull/3741
-#if !defined(_MSC_VER)
-using is_template_base_of
-    = decltype(is_template_base_of_impl<Base>::check((intrinsic_t<T> *) nullptr));
-#else
-struct is_template_base_of
-    : decltype(is_template_base_of_impl<Base>::check((intrinsic_t<T> *) nullptr)) {
-};
-#endif
-
-/// Check if T is an instantiation of the template `Class`. For example:
-/// `is_instantiation<shared_ptr, T>` is true if `T == shared_ptr<U>` where U can be anything.
-template <template <typename...> class Class, typename T>
-struct is_instantiation : std::false_type {};
-template <template <typename...> class Class, typename... Us>
-struct is_instantiation<Class, Class<Us...>> : std::true_type {};
-
-/// Check if T is std::shared_ptr<U> where U can be anything
-template <typename T>
-using is_shared_ptr = is_instantiation<std::shared_ptr, T>;
-
-/// Check if T looks like an input iterator
-template <typename T, typename = void>
-struct is_input_iterator : std::false_type {};
-template <typename T>
-struct is_input_iterator<T,
-                         void_t<decltype(*std::declval<T &>()), decltype(++std::declval<T &>())>>
-    : std::true_type {};
-
-template <typename T>
-using is_function_pointer
-    = bool_constant<std::is_pointer<T>::value
-                    && std::is_function<typename std::remove_pointer<T>::type>::value>;
-
-template <typename F>
-struct strip_function_object {
-    // If you are encountering an
-    // 'error: name followed by "::" must be a class or namespace name'
-    // with the Intel compiler and a noexcept function here,
-    // try to use noexcept(true) instead of plain noexcept.
-    using type = typename remove_class<decltype(&F::operator())>::type;
-};
-
-// Extracts the function signature from a function, function pointer or lambda.
-template <typename Function, typename F = remove_reference_t<Function>>
-using function_signature_t = conditional_t<
-    std::is_function<F>::value,
-    F,
-    typename conditional_t<std::is_pointer<F>::value || std::is_member_pointer<F>::value,
-                           std::remove_pointer<F>,
-                           strip_function_object<F>>::type>;
-
-/// Returns true if the type looks like a lambda: that is, isn't a function, pointer or member
-/// pointer.  Note that this can catch all sorts of other things, too; this is intended to be used
-/// in a place where passing a lambda makes sense.
-template <typename T>
-using is_lambda = satisfies_none_of<remove_reference_t<T>,
-                                    std::is_function,
-                                    std::is_pointer,
-                                    std::is_member_pointer>;
-
-// [workaround(intel)] Internal error on fold expression
-/// Apply a function over each element of a parameter pack
-#if defined(__cpp_fold_expressions) && !defined(__INTEL_COMPILER)
-// Intel compiler produces an internal error on this fold expression (tested with ICC 19.0.2)
-#    define PYBIND11_EXPAND_SIDE_EFFECTS(PATTERN) (((PATTERN), void()), ...)
-#else
-using expand_side_effects = bool[];
-#    define PYBIND11_EXPAND_SIDE_EFFECTS(PATTERN)                                                 \
-        (void) pybind11::detail::expand_side_effects { ((PATTERN), void(), false)..., false }
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-
-#if defined(_MSC_VER)
-#    pragma warning(push)
-#    pragma warning(disable : 4275)
-//     warning C4275: An exported class was derived from a class that wasn't exported.
-//     Can be ignored when derived from a STL class.
-#endif
-/// C++ bindings of builtin Python exceptions
-class PYBIND11_EXPORT_EXCEPTION builtin_exception : public std::runtime_error {
-public:
-    using std::runtime_error::runtime_error;
-    /// Set the error using the Python C API
-    virtual void set_error() const = 0;
-};
-#if defined(_MSC_VER)
-#    pragma warning(pop)
-#endif
-
-#define PYBIND11_RUNTIME_EXCEPTION(name, type)                                                    \
-    class PYBIND11_EXPORT_EXCEPTION name : public builtin_exception {                             \
-    public:                                                                                       \
-        using builtin_exception::builtin_exception;                                               \
-        name() : name("") {}                                                                      \
-        void set_error() const override { PyErr_SetString(type, what()); }                        \
-    };
-
-PYBIND11_RUNTIME_EXCEPTION(stop_iteration, PyExc_StopIteration)
-PYBIND11_RUNTIME_EXCEPTION(index_error, PyExc_IndexError)
-PYBIND11_RUNTIME_EXCEPTION(key_error, PyExc_KeyError)
-PYBIND11_RUNTIME_EXCEPTION(value_error, PyExc_ValueError)
-PYBIND11_RUNTIME_EXCEPTION(type_error, PyExc_TypeError)
-PYBIND11_RUNTIME_EXCEPTION(buffer_error, PyExc_BufferError)
-PYBIND11_RUNTIME_EXCEPTION(import_error, PyExc_ImportError)
-PYBIND11_RUNTIME_EXCEPTION(attribute_error, PyExc_AttributeError)
-PYBIND11_RUNTIME_EXCEPTION(cast_error, PyExc_RuntimeError) /// Thrown when pybind11::cast or
-                                                           /// handle::call fail due to a type
-                                                           /// casting error
-PYBIND11_RUNTIME_EXCEPTION(reference_cast_error, PyExc_RuntimeError) /// Used internally
-
-[[noreturn]] PYBIND11_NOINLINE void pybind11_fail(const char *reason) {
-    assert(!PyErr_Occurred());
-    throw std::runtime_error(reason);
-}
-[[noreturn]] PYBIND11_NOINLINE void pybind11_fail(const std::string &reason) {
-    assert(!PyErr_Occurred());
-    throw std::runtime_error(reason);
-}
-
-template <typename T, typename SFINAE = void>
-struct format_descriptor {};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-// Returns the index of the given type in the type char array below, and in the list in numpy.h
-// The order here is: bool; 8 ints ((signed,unsigned)x(8,16,32,64)bits); float,double,long double;
-// complex float,double,long double.  Note that the long double types only participate when long
-// double is actually longer than double (it isn't under MSVC).
-// NB: not only the string below but also complex.h and numpy.h rely on this order.
-template <typename T, typename SFINAE = void>
-struct is_fmt_numeric {
-    static constexpr bool value = false;
-};
-template <typename T>
-struct is_fmt_numeric<T, enable_if_t<std::is_arithmetic<T>::value>> {
-    static constexpr bool value = true;
-    static constexpr int index
-        = std::is_same<T, bool>::value
-              ? 0
-              : 1
-                    + (std::is_integral<T>::value
-                           ? detail::log2(sizeof(T)) * 2 + std::is_unsigned<T>::value
-                           : 8
-                                 + (std::is_same<T, double>::value        ? 1
-                                    : std::is_same<T, long double>::value ? 2
-                                                                          : 0));
-};
-PYBIND11_NAMESPACE_END(detail)
-
-template <typename T>
-struct format_descriptor<T, detail::enable_if_t<std::is_arithmetic<T>::value>> {
-    static constexpr const char c = "?bBhHiIqQfdg"[detail::is_fmt_numeric<T>::index];
-    static constexpr const char value[2] = {c, '\0'};
-    static std::string format() { return std::string(1, c); }
-};
-
-#if !defined(PYBIND11_CPP17)
-
-template <typename T>
-constexpr const char
-    format_descriptor<T, detail::enable_if_t<std::is_arithmetic<T>::value>>::value[2];
-
-#endif
-
-/// RAII wrapper that temporarily clears any Python error state
-struct error_scope {
-    PyObject *type, *value, *trace;
-    error_scope() { PyErr_Fetch(&type, &value, &trace); }
-    error_scope(const error_scope &) = delete;
-    error_scope &operator=(const error_scope &) = delete;
-    ~error_scope() { PyErr_Restore(type, value, trace); }
-};
-
-/// Dummy destructor wrapper that can be used to expose classes with a private destructor
-struct nodelete {
-    template <typename T>
-    void operator()(T *) {}
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-template <typename... Args>
-struct overload_cast_impl {
-    template <typename Return>
-    constexpr auto operator()(Return (*pf)(Args...)) const noexcept -> decltype(pf) {
-        return pf;
-    }
-
-    template <typename Return, typename Class>
-    constexpr auto operator()(Return (Class::*pmf)(Args...), std::false_type = {}) const noexcept
-        -> decltype(pmf) {
-        return pmf;
-    }
-
-    template <typename Return, typename Class>
-    constexpr auto operator()(Return (Class::*pmf)(Args...) const, std::true_type) const noexcept
-        -> decltype(pmf) {
-        return pmf;
-    }
-};
-PYBIND11_NAMESPACE_END(detail)
-
-// overload_cast requires variable templates: C++14
-#if defined(PYBIND11_CPP14)
-#    define PYBIND11_OVERLOAD_CAST 1
-/// Syntax sugar for resolving overloaded function pointers:
-///  - regular: static_cast<Return (Class::*)(Arg0, Arg1, Arg2)>(&Class::func)
-///  - sweet:   overload_cast<Arg0, Arg1, Arg2>(&Class::func)
-template <typename... Args>
-#    if (defined(_MSC_VER) && _MSC_VER < 1920) /* MSVC 2017 */                                    \
-        || (defined(__clang__) && __clang_major__ == 5)
-static constexpr detail::overload_cast_impl<Args...> overload_cast = {};
-#    else
-static constexpr detail::overload_cast_impl<Args...> overload_cast;
-#    endif
-#endif
-
-/// Const member function selector for overload_cast
-///  - regular: static_cast<Return (Class::*)(Arg) const>(&Class::func)
-///  - sweet:   overload_cast<Arg>(&Class::func, const_)
-static constexpr auto const_ = std::true_type{};
-
-#if !defined(PYBIND11_CPP14) // no overload_cast: providing something that static_assert-fails:
-template <typename... Args>
-struct overload_cast {
-    static_assert(detail::deferred_t<std::false_type, Args...>::value,
-                  "pybind11::overload_cast<...> requires compiling in C++14 mode");
-};
-#endif // overload_cast
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Adaptor for converting arbitrary container arguments into a vector; implicitly convertible from
-// any standard container (or C-style array) supporting std::begin/std::end, any singleton
-// arithmetic type (if T is arithmetic), or explicitly constructible from an iterator pair.
-template <typename T>
-class any_container {
-    std::vector<T> v;
-
-public:
-    any_container() = default;
-
-    // Can construct from a pair of iterators
-    template <typename It, typename = enable_if_t<is_input_iterator<It>::value>>
-    any_container(It first, It last) : v(first, last) {}
-
-    // Implicit conversion constructor from any arbitrary container type
-    // with values convertible to T
-    template <typename Container,
-              typename = enable_if_t<
-                  std::is_convertible<decltype(*std::begin(std::declval<const Container &>())),
-                                      T>::value>>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    any_container(const Container &c) : any_container(std::begin(c), std::end(c)) {}
-
-    // initializer_list's aren't deducible, so don't get matched by the above template;
-    // we need this to explicitly allow implicit conversion from one:
-    template <typename TIn, typename = enable_if_t<std::is_convertible<TIn, T>::value>>
-    any_container(const std::initializer_list<TIn> &c) : any_container(c.begin(), c.end()) {}
-
-    // Avoid copying if given an rvalue vector of the correct type.
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    any_container(std::vector<T> &&v) : v(std::move(v)) {}
-
-    // Moves the vector out of an rvalue any_container
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator std::vector<T> &&() && { return std::move(v); }
-
-    // Dereferencing obtains a reference to the underlying vector
-    std::vector<T> &operator*() { return v; }
-    const std::vector<T> &operator*() const { return v; }
-
-    // -> lets you call methods on the underlying vector
-    std::vector<T> *operator->() { return &v; }
-    const std::vector<T> *operator->() const { return &v; }
-};
-
-// Forward-declaration; see detail/class.h
-std::string get_fully_qualified_tp_name(PyTypeObject *);
-
-template <typename T>
-inline static std::shared_ptr<T>
-try_get_shared_from_this(std::enable_shared_from_this<T> *holder_value_ptr) {
-// Pre C++17, this code path exploits undefined behavior, but is known to work on many platforms.
-// Use at your own risk!
-// See also https://en.cppreference.com/w/cpp/memory/enable_shared_from_this, and in particular
-// the `std::shared_ptr<Good> gp1 = not_so_good.getptr();` and `try`-`catch` parts of the example.
-#if defined(__cpp_lib_enable_shared_from_this) && (!defined(_MSC_VER) || _MSC_VER >= 1912)
-    return holder_value_ptr->weak_from_this().lock();
-#else
-    try {
-        return holder_value_ptr->shared_from_this();
-    } catch (const std::bad_weak_ptr &) {
-        return nullptr;
-    }
-#endif
-}
-
-// For silencing "unused" compiler warnings in special situations.
-template <typename... Args>
-#if defined(_MSC_VER) && _MSC_VER < 1920 // MSVC 2017
-constexpr
-#endif
-    inline void
-    silence_unused_warnings(Args &&...) {
-}
-
-// MSVC warning C4100: Unreferenced formal parameter
-#if defined(_MSC_VER) && _MSC_VER <= 1916
-#    define PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(...)                                         \
-        detail::silence_unused_warnings(__VA_ARGS__)
-#else
-#    define PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(...)
-#endif
-
-// GCC -Wunused-but-set-parameter  All GCC versions (as of July 2021).
-#if defined(__GNUG__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
-#    define PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(...)                       \
-        detail::silence_unused_warnings(__VA_ARGS__)
-#else
-#    define PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(...)
-#endif
-
-#if defined(_MSC_VER) // All versions (as of July 2021).
-
-// warning C4127: Conditional expression is constant
-constexpr inline bool silence_msvc_c4127(bool cond) { return cond; }
-
-#    define PYBIND11_SILENCE_MSVC_C4127(...) ::pybind11::detail::silence_msvc_c4127(__VA_ARGS__)
-
-#else
-#    define PYBIND11_SILENCE_MSVC_C4127(...) __VA_ARGS__
-#endif
-
-#if defined(__clang__)                                                                            \
-    && (defined(__apple_build_version__) /* AppleClang 13.0.0.13000029 was the only data point    \
-                                            available. */                                         \
-        || (__clang_major__ >= 7                                                                  \
-            && __clang_major__ <= 12) /* Clang 3, 5, 13, 14, 15 do not generate the warning. */   \
-    )
-#    define PYBIND11_DETECTED_CLANG_WITH_MISLEADING_CALL_STD_MOVE_EXPLICITLY_WARNING
-// Example:
-// tests/test_kwargs_and_defaults.cpp:46:68: error: local variable 'args' will be copied despite
-// being returned by name [-Werror,-Wreturn-std-move]
-//     m.def("args_function", [](py::args args) -> py::tuple { return args; });
-//                                                                    ^~~~
-// test_kwargs_and_defaults.cpp:46:68: note: call 'std::move' explicitly to avoid copying
-//     m.def("args_function", [](py::args args) -> py::tuple { return args; });
-//                                                                    ^~~~
-//                                                                    std::move(args)
-#endif
-
-// Pybind offers detailed error messages by default for all builts that are debug (through the
-// negation of ndebug). This can also be manually enabled by users, for any builds, through
-// defining PYBIND11_DETAILED_ERROR_MESSAGES.
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES) && !defined(NDEBUG)
-#    define PYBIND11_DETAILED_ERROR_MESSAGES
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/descr.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/descr.h
deleted file mode 100644
index e7a5e2c14..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/descr.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-    pybind11/detail/descr.h: Helper type for concatenating type signatures at compile time
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "common.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-#if !defined(_MSC_VER)
-#    define PYBIND11_DESCR_CONSTEXPR static constexpr
-#else
-#    define PYBIND11_DESCR_CONSTEXPR const
-#endif
-
-/* Concatenate type signatures at compile time */
-template <size_t N, typename... Ts>
-struct descr {
-    char text[N + 1]{'\0'};
-
-    constexpr descr() = default;
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    constexpr descr(char const (&s)[N + 1]) : descr(s, make_index_sequence<N>()) {}
-
-    template <size_t... Is>
-    constexpr descr(char const (&s)[N + 1], index_sequence<Is...>) : text{s[Is]..., '\0'} {}
-
-    template <typename... Chars>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    constexpr descr(char c, Chars... cs) : text{c, static_cast<char>(cs)..., '\0'} {}
-
-    static constexpr std::array<const std::type_info *, sizeof...(Ts) + 1> types() {
-        return {{&typeid(Ts)..., nullptr}};
-    }
-};
-
-template <size_t N1, size_t N2, typename... Ts1, typename... Ts2, size_t... Is1, size_t... Is2>
-constexpr descr<N1 + N2, Ts1..., Ts2...> plus_impl(const descr<N1, Ts1...> &a,
-                                                   const descr<N2, Ts2...> &b,
-                                                   index_sequence<Is1...>,
-                                                   index_sequence<Is2...>) {
-    PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(b);
-    return {a.text[Is1]..., b.text[Is2]...};
-}
-
-template <size_t N1, size_t N2, typename... Ts1, typename... Ts2>
-constexpr descr<N1 + N2, Ts1..., Ts2...> operator+(const descr<N1, Ts1...> &a,
-                                                   const descr<N2, Ts2...> &b) {
-    return plus_impl(a, b, make_index_sequence<N1>(), make_index_sequence<N2>());
-}
-
-template <size_t N>
-constexpr descr<N - 1> const_name(char const (&text)[N]) {
-    return descr<N - 1>(text);
-}
-constexpr descr<0> const_name(char const (&)[1]) { return {}; }
-
-template <size_t Rem, size_t... Digits>
-struct int_to_str : int_to_str<Rem / 10, Rem % 10, Digits...> {};
-template <size_t... Digits>
-struct int_to_str<0, Digits...> {
-    // WARNING: This only works with C++17 or higher.
-    static constexpr auto digits = descr<sizeof...(Digits)>(('0' + Digits)...);
-};
-
-// Ternary description (like std::conditional)
-template <bool B, size_t N1, size_t N2>
-constexpr enable_if_t<B, descr<N1 - 1>> const_name(char const (&text1)[N1], char const (&)[N2]) {
-    return const_name(text1);
-}
-template <bool B, size_t N1, size_t N2>
-constexpr enable_if_t<!B, descr<N2 - 1>> const_name(char const (&)[N1], char const (&text2)[N2]) {
-    return const_name(text2);
-}
-
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<B, T1> const_name(const T1 &d, const T2 &) {
-    return d;
-}
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<!B, T2> const_name(const T1 &, const T2 &d) {
-    return d;
-}
-
-template <size_t Size>
-auto constexpr const_name() -> remove_cv_t<decltype(int_to_str<Size / 10, Size % 10>::digits)> {
-    return int_to_str<Size / 10, Size % 10>::digits;
-}
-
-template <typename Type>
-constexpr descr<1, Type> const_name() {
-    return {'%'};
-}
-
-// If "_" is defined as a macro, py::detail::_ cannot be provided.
-// It is therefore best to use py::detail::const_name universally.
-// This block is for backward compatibility only.
-// (The const_name code is repeated to avoid introducing a "_" #define ourselves.)
-#ifndef _
-#    define PYBIND11_DETAIL_UNDERSCORE_BACKWARD_COMPATIBILITY
-template <size_t N>
-constexpr descr<N - 1> _(char const (&text)[N]) {
-    return const_name<N>(text);
-}
-template <bool B, size_t N1, size_t N2>
-constexpr enable_if_t<B, descr<N1 - 1>> _(char const (&text1)[N1], char const (&text2)[N2]) {
-    return const_name<B, N1, N2>(text1, text2);
-}
-template <bool B, size_t N1, size_t N2>
-constexpr enable_if_t<!B, descr<N2 - 1>> _(char const (&text1)[N1], char const (&text2)[N2]) {
-    return const_name<B, N1, N2>(text1, text2);
-}
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<B, T1> _(const T1 &d1, const T2 &d2) {
-    return const_name<B, T1, T2>(d1, d2);
-}
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<!B, T2> _(const T1 &d1, const T2 &d2) {
-    return const_name<B, T1, T2>(d1, d2);
-}
-
-template <size_t Size>
-auto constexpr _() -> remove_cv_t<decltype(int_to_str<Size / 10, Size % 10>::digits)> {
-    return const_name<Size>();
-}
-template <typename Type>
-constexpr descr<1, Type> _() {
-    return const_name<Type>();
-}
-#endif // #ifndef _
-
-constexpr descr<0> concat() { return {}; }
-
-template <size_t N, typename... Ts>
-constexpr descr<N, Ts...> concat(const descr<N, Ts...> &descr) {
-    return descr;
-}
-
-template <size_t N, typename... Ts, typename... Args>
-constexpr auto concat(const descr<N, Ts...> &d, const Args &...args)
-    -> decltype(std::declval<descr<N + 2, Ts...>>() + concat(args...)) {
-    return d + const_name(", ") + concat(args...);
-}
-
-template <size_t N, typename... Ts>
-constexpr descr<N + 2, Ts...> type_descr(const descr<N, Ts...> &descr) {
-    return const_name("{") + descr + const_name("}");
-}
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/init.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/init.h
deleted file mode 100644
index 05f4fe54a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/init.h
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
-    pybind11/detail/init.h: init factory function implementation and support code.
-
-    Copyright (c) 2017 Jason Rhinelander <jason@imaginary.ca>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "class.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <>
-class type_caster<value_and_holder> {
-public:
-    bool load(handle h, bool) {
-        value = reinterpret_cast<value_and_holder *>(h.ptr());
-        return true;
-    }
-
-    template <typename>
-    using cast_op_type = value_and_holder &;
-    explicit operator value_and_holder &() { return *value; }
-    static constexpr auto name = const_name<value_and_holder>();
-
-private:
-    value_and_holder *value = nullptr;
-};
-
-PYBIND11_NAMESPACE_BEGIN(initimpl)
-
-inline void no_nullptr(void *ptr) {
-    if (!ptr) {
-        throw type_error("pybind11::init(): factory function returned nullptr");
-    }
-}
-
-// Implementing functions for all forms of py::init<...> and py::init(...)
-template <typename Class>
-using Cpp = typename Class::type;
-template <typename Class>
-using Alias = typename Class::type_alias;
-template <typename Class>
-using Holder = typename Class::holder_type;
-
-template <typename Class>
-using is_alias_constructible = std::is_constructible<Alias<Class>, Cpp<Class> &&>;
-
-// Takes a Cpp pointer and returns true if it actually is a polymorphic Alias instance.
-template <typename Class, enable_if_t<Class::has_alias, int> = 0>
-bool is_alias(Cpp<Class> *ptr) {
-    return dynamic_cast<Alias<Class> *>(ptr) != nullptr;
-}
-// Failing fallback version of the above for a no-alias class (always returns false)
-template <typename /*Class*/>
-constexpr bool is_alias(void *) {
-    return false;
-}
-
-// Constructs and returns a new object; if the given arguments don't map to a constructor, we fall
-// back to brace aggregate initiailization so that for aggregate initialization can be used with
-// py::init, e.g.  `py::init<int, int>` to initialize a `struct T { int a; int b; }`.  For
-// non-aggregate types, we need to use an ordinary T(...) constructor (invoking as `T{...}` usually
-// works, but will not do the expected thing when `T` has an `initializer_list<T>` constructor).
-template <typename Class,
-          typename... Args,
-          detail::enable_if_t<std::is_constructible<Class, Args...>::value, int> = 0>
-inline Class *construct_or_initialize(Args &&...args) {
-    return new Class(std::forward<Args>(args)...);
-}
-template <typename Class,
-          typename... Args,
-          detail::enable_if_t<!std::is_constructible<Class, Args...>::value, int> = 0>
-inline Class *construct_or_initialize(Args &&...args) {
-    return new Class{std::forward<Args>(args)...};
-}
-
-// Attempts to constructs an alias using a `Alias(Cpp &&)` constructor.  This allows types with
-// an alias to provide only a single Cpp factory function as long as the Alias can be
-// constructed from an rvalue reference of the base Cpp type.  This means that Alias classes
-// can, when appropriate, simply define a `Alias(Cpp &&)` constructor rather than needing to
-// inherit all the base class constructors.
-template <typename Class>
-void construct_alias_from_cpp(std::true_type /*is_alias_constructible*/,
-                              value_and_holder &v_h,
-                              Cpp<Class> &&base) {
-    v_h.value_ptr() = new Alias<Class>(std::move(base));
-}
-template <typename Class>
-[[noreturn]] void construct_alias_from_cpp(std::false_type /*!is_alias_constructible*/,
-                                           value_and_holder &,
-                                           Cpp<Class> &&) {
-    throw type_error("pybind11::init(): unable to convert returned instance to required "
-                     "alias class: no `Alias<Class>(Class &&)` constructor available");
-}
-
-// Error-generating fallback for factories that don't match one of the below construction
-// mechanisms.
-template <typename Class>
-void construct(...) {
-    static_assert(!std::is_same<Class, Class>::value /* always false */,
-                  "pybind11::init(): init function must return a compatible pointer, "
-                  "holder, or value");
-}
-
-// Pointer return v1: the factory function returns a class pointer for a registered class.
-// If we don't need an alias (because this class doesn't have one, or because the final type is
-// inherited on the Python side) we can simply take over ownership.  Otherwise we need to try to
-// construct an Alias from the returned base instance.
-template <typename Class>
-void construct(value_and_holder &v_h, Cpp<Class> *ptr, bool need_alias) {
-    PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(need_alias);
-    no_nullptr(ptr);
-    if (PYBIND11_SILENCE_MSVC_C4127(Class::has_alias) && need_alias && !is_alias<Class>(ptr)) {
-        // We're going to try to construct an alias by moving the cpp type.  Whether or not
-        // that succeeds, we still need to destroy the original cpp pointer (either the
-        // moved away leftover, if the alias construction works, or the value itself if we
-        // throw an error), but we can't just call `delete ptr`: it might have a special
-        // deleter, or might be shared_from_this.  So we construct a holder around it as if
-        // it was a normal instance, then steal the holder away into a local variable; thus
-        // the holder and destruction happens when we leave the C++ scope, and the holder
-        // class gets to handle the destruction however it likes.
-        v_h.value_ptr() = ptr;
-        v_h.set_instance_registered(true);          // To prevent init_instance from registering it
-        v_h.type->init_instance(v_h.inst, nullptr); // Set up the holder
-        Holder<Class> temp_holder(std::move(v_h.holder<Holder<Class>>())); // Steal the holder
-        v_h.type->dealloc(v_h); // Destroys the moved-out holder remains, resets value ptr to null
-        v_h.set_instance_registered(false);
-
-        construct_alias_from_cpp<Class>(is_alias_constructible<Class>{}, v_h, std::move(*ptr));
-    } else {
-        // Otherwise the type isn't inherited, so we don't need an Alias
-        v_h.value_ptr() = ptr;
-    }
-}
-
-// Pointer return v2: a factory that always returns an alias instance ptr.  We simply take over
-// ownership of the pointer.
-template <typename Class, enable_if_t<Class::has_alias, int> = 0>
-void construct(value_and_holder &v_h, Alias<Class> *alias_ptr, bool) {
-    no_nullptr(alias_ptr);
-    v_h.value_ptr() = static_cast<Cpp<Class> *>(alias_ptr);
-}
-
-// Holder return: copy its pointer, and move or copy the returned holder into the new instance's
-// holder.  This also handles types like std::shared_ptr<T> and std::unique_ptr<T> where T is a
-// derived type (through those holder's implicit conversion from derived class holder
-// constructors).
-template <typename Class>
-void construct(value_and_holder &v_h, Holder<Class> holder, bool need_alias) {
-    PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(need_alias);
-    auto *ptr = holder_helper<Holder<Class>>::get(holder);
-    no_nullptr(ptr);
-    // If we need an alias, check that the held pointer is actually an alias instance
-    if (PYBIND11_SILENCE_MSVC_C4127(Class::has_alias) && need_alias && !is_alias<Class>(ptr)) {
-        throw type_error("pybind11::init(): construction failed: returned holder-wrapped instance "
-                         "is not an alias instance");
-    }
-
-    v_h.value_ptr() = ptr;
-    v_h.type->init_instance(v_h.inst, &holder);
-}
-
-// return-by-value version 1: returning a cpp class by value.  If the class has an alias and an
-// alias is required the alias must have an `Alias(Cpp &&)` constructor so that we can construct
-// the alias from the base when needed (i.e. because of Python-side inheritance).  When we don't
-// need it, we simply move-construct the cpp value into a new instance.
-template <typename Class>
-void construct(value_and_holder &v_h, Cpp<Class> &&result, bool need_alias) {
-    PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(need_alias);
-    static_assert(std::is_move_constructible<Cpp<Class>>::value,
-                  "pybind11::init() return-by-value factory function requires a movable class");
-    if (PYBIND11_SILENCE_MSVC_C4127(Class::has_alias) && need_alias) {
-        construct_alias_from_cpp<Class>(is_alias_constructible<Class>{}, v_h, std::move(result));
-    } else {
-        v_h.value_ptr() = new Cpp<Class>(std::move(result));
-    }
-}
-
-// return-by-value version 2: returning a value of the alias type itself.  We move-construct an
-// Alias instance (even if no the python-side inheritance is involved).  The is intended for
-// cases where Alias initialization is always desired.
-template <typename Class>
-void construct(value_and_holder &v_h, Alias<Class> &&result, bool) {
-    static_assert(
-        std::is_move_constructible<Alias<Class>>::value,
-        "pybind11::init() return-by-alias-value factory function requires a movable alias class");
-    v_h.value_ptr() = new Alias<Class>(std::move(result));
-}
-
-// Implementing class for py::init<...>()
-template <typename... Args>
-struct constructor {
-    template <typename Class, typename... Extra, enable_if_t<!Class::has_alias, int> = 0>
-    static void execute(Class &cl, const Extra &...extra) {
-        cl.def(
-            "__init__",
-            [](value_and_holder &v_h, Args... args) {
-                v_h.value_ptr() = construct_or_initialize<Cpp<Class>>(std::forward<Args>(args)...);
-            },
-            is_new_style_constructor(),
-            extra...);
-    }
-
-    template <typename Class,
-              typename... Extra,
-              enable_if_t<Class::has_alias && std::is_constructible<Cpp<Class>, Args...>::value,
-                          int> = 0>
-    static void execute(Class &cl, const Extra &...extra) {
-        cl.def(
-            "__init__",
-            [](value_and_holder &v_h, Args... args) {
-                if (Py_TYPE(v_h.inst) == v_h.type->type) {
-                    v_h.value_ptr()
-                        = construct_or_initialize<Cpp<Class>>(std::forward<Args>(args)...);
-                } else {
-                    v_h.value_ptr()
-                        = construct_or_initialize<Alias<Class>>(std::forward<Args>(args)...);
-                }
-            },
-            is_new_style_constructor(),
-            extra...);
-    }
-
-    template <typename Class,
-              typename... Extra,
-              enable_if_t<Class::has_alias && !std::is_constructible<Cpp<Class>, Args...>::value,
-                          int> = 0>
-    static void execute(Class &cl, const Extra &...extra) {
-        cl.def(
-            "__init__",
-            [](value_and_holder &v_h, Args... args) {
-                v_h.value_ptr()
-                    = construct_or_initialize<Alias<Class>>(std::forward<Args>(args)...);
-            },
-            is_new_style_constructor(),
-            extra...);
-    }
-};
-
-// Implementing class for py::init_alias<...>()
-template <typename... Args>
-struct alias_constructor {
-    template <typename Class,
-              typename... Extra,
-              enable_if_t<Class::has_alias && std::is_constructible<Alias<Class>, Args...>::value,
-                          int> = 0>
-    static void execute(Class &cl, const Extra &...extra) {
-        cl.def(
-            "__init__",
-            [](value_and_holder &v_h, Args... args) {
-                v_h.value_ptr()
-                    = construct_or_initialize<Alias<Class>>(std::forward<Args>(args)...);
-            },
-            is_new_style_constructor(),
-            extra...);
-    }
-};
-
-// Implementation class for py::init(Func) and py::init(Func, AliasFunc)
-template <typename CFunc,
-          typename AFunc = void_type (*)(),
-          typename = function_signature_t<CFunc>,
-          typename = function_signature_t<AFunc>>
-struct factory;
-
-// Specialization for py::init(Func)
-template <typename Func, typename Return, typename... Args>
-struct factory<Func, void_type (*)(), Return(Args...)> {
-    remove_reference_t<Func> class_factory;
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    factory(Func &&f) : class_factory(std::forward<Func>(f)) {}
-
-    // The given class either has no alias or has no separate alias factory;
-    // this always constructs the class itself.  If the class is registered with an alias
-    // type and an alias instance is needed (i.e. because the final type is a Python class
-    // inheriting from the C++ type) the returned value needs to either already be an alias
-    // instance, or the alias needs to be constructible from a `Class &&` argument.
-    template <typename Class, typename... Extra>
-    void execute(Class &cl, const Extra &...extra) && {
-#if defined(PYBIND11_CPP14)
-        cl.def(
-            "__init__",
-            [func = std::move(class_factory)]
-#else
-        auto &func = class_factory;
-        cl.def(
-            "__init__",
-            [func]
-#endif
-            (value_and_holder &v_h, Args... args) {
-                construct<Class>(
-                    v_h, func(std::forward<Args>(args)...), Py_TYPE(v_h.inst) != v_h.type->type);
-            },
-            is_new_style_constructor(),
-            extra...);
-    }
-};
-
-// Specialization for py::init(Func, AliasFunc)
-template <typename CFunc,
-          typename AFunc,
-          typename CReturn,
-          typename... CArgs,
-          typename AReturn,
-          typename... AArgs>
-struct factory<CFunc, AFunc, CReturn(CArgs...), AReturn(AArgs...)> {
-    static_assert(sizeof...(CArgs) == sizeof...(AArgs),
-                  "pybind11::init(class_factory, alias_factory): class and alias factories "
-                  "must have identical argument signatures");
-    static_assert(all_of<std::is_same<CArgs, AArgs>...>::value,
-                  "pybind11::init(class_factory, alias_factory): class and alias factories "
-                  "must have identical argument signatures");
-
-    remove_reference_t<CFunc> class_factory;
-    remove_reference_t<AFunc> alias_factory;
-
-    factory(CFunc &&c, AFunc &&a)
-        : class_factory(std::forward<CFunc>(c)), alias_factory(std::forward<AFunc>(a)) {}
-
-    // The class factory is called when the `self` type passed to `__init__` is the direct
-    // class (i.e. not inherited), the alias factory when `self` is a Python-side subtype.
-    template <typename Class, typename... Extra>
-    void execute(Class &cl, const Extra &...extra) && {
-        static_assert(Class::has_alias,
-                      "The two-argument version of `py::init()` can "
-                      "only be used if the class has an alias");
-#if defined(PYBIND11_CPP14)
-        cl.def(
-            "__init__",
-            [class_func = std::move(class_factory), alias_func = std::move(alias_factory)]
-#else
-        auto &class_func = class_factory;
-        auto &alias_func = alias_factory;
-        cl.def(
-            "__init__",
-            [class_func, alias_func]
-#endif
-            (value_and_holder &v_h, CArgs... args) {
-                if (Py_TYPE(v_h.inst) == v_h.type->type) {
-                    // If the instance type equals the registered type we don't have inheritance,
-                    // so don't need the alias and can construct using the class function:
-                    construct<Class>(v_h, class_func(std::forward<CArgs>(args)...), false);
-                } else {
-                    construct<Class>(v_h, alias_func(std::forward<CArgs>(args)...), true);
-                }
-            },
-            is_new_style_constructor(),
-            extra...);
-    }
-};
-
-/// Set just the C++ state. Same as `__init__`.
-template <typename Class, typename T>
-void setstate(value_and_holder &v_h, T &&result, bool need_alias) {
-    construct<Class>(v_h, std::forward<T>(result), need_alias);
-}
-
-/// Set both the C++ and Python states
-template <typename Class,
-          typename T,
-          typename O,
-          enable_if_t<std::is_convertible<O, handle>::value, int> = 0>
-void setstate(value_and_holder &v_h, std::pair<T, O> &&result, bool need_alias) {
-    construct<Class>(v_h, std::move(result.first), need_alias);
-    auto d = handle(result.second);
-    if (PyDict_Check(d.ptr()) && PyDict_Size(d.ptr()) == 0) {
-        // Skipping setattr below, to not force use of py::dynamic_attr() for Class unnecessarily.
-        // See PR #2972 for details.
-        return;
-    }
-    setattr((PyObject *) v_h.inst, "__dict__", d);
-}
-
-/// Implementation for py::pickle(GetState, SetState)
-template <typename Get,
-          typename Set,
-          typename = function_signature_t<Get>,
-          typename = function_signature_t<Set>>
-struct pickle_factory;
-
-template <typename Get,
-          typename Set,
-          typename RetState,
-          typename Self,
-          typename NewInstance,
-          typename ArgState>
-struct pickle_factory<Get, Set, RetState(Self), NewInstance(ArgState)> {
-    static_assert(std::is_same<intrinsic_t<RetState>, intrinsic_t<ArgState>>::value,
-                  "The type returned by `__getstate__` must be the same "
-                  "as the argument accepted by `__setstate__`");
-
-    remove_reference_t<Get> get;
-    remove_reference_t<Set> set;
-
-    pickle_factory(Get get, Set set) : get(std::forward<Get>(get)), set(std::forward<Set>(set)) {}
-
-    template <typename Class, typename... Extra>
-    void execute(Class &cl, const Extra &...extra) && {
-        cl.def("__getstate__", std::move(get));
-
-#if defined(PYBIND11_CPP14)
-        cl.def(
-            "__setstate__",
-            [func = std::move(set)]
-#else
-        auto &func = set;
-        cl.def(
-            "__setstate__",
-            [func]
-#endif
-            (value_and_holder &v_h, ArgState state) {
-                setstate<Class>(
-                    v_h, func(std::forward<ArgState>(state)), Py_TYPE(v_h.inst) != v_h.type->type);
-            },
-            is_new_style_constructor(),
-            extra...);
-    }
-};
-
-PYBIND11_NAMESPACE_END(initimpl)
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/internals.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/internals.h
deleted file mode 100644
index 6ca5e1482..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/internals.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
-    pybind11/detail/internals.h: Internal data structure and related functions
-
-    Copyright (c) 2017 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "../pytypes.h"
-
-#include <exception>
-
-/// Tracks the `internals` and `type_info` ABI version independent of the main library version.
-///
-/// Some portions of the code use an ABI that is conditional depending on this
-/// version number.  That allows ABI-breaking changes to be "pre-implemented".
-/// Once the default version number is incremented, the conditional logic that
-/// no longer applies can be removed.  Additionally, users that need not
-/// maintain ABI compatibility can increase the version number in order to take
-/// advantage of any functionality/efficiency improvements that depend on the
-/// newer ABI.
-///
-/// WARNING: If you choose to manually increase the ABI version, note that
-/// pybind11 may not be tested as thoroughly with a non-default ABI version, and
-/// further ABI-incompatible changes may be made before the ABI is officially
-/// changed to the new version.
-#ifndef PYBIND11_INTERNALS_VERSION
-#    define PYBIND11_INTERNALS_VERSION 4
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-using ExceptionTranslator = void (*)(std::exception_ptr);
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Forward declarations
-inline PyTypeObject *make_static_property_type();
-inline PyTypeObject *make_default_metaclass();
-inline PyObject *make_object_base_type(PyTypeObject *metaclass);
-
-// The old Python Thread Local Storage (TLS) API is deprecated in Python 3.7 in favor of the new
-// Thread Specific Storage (TSS) API.
-#if PY_VERSION_HEX >= 0x03070000
-// Avoid unnecessary allocation of `Py_tss_t`, since we cannot use
-// `Py_LIMITED_API` anyway.
-#    if PYBIND11_INTERNALS_VERSION > 4
-#        define PYBIND11_TLS_KEY_REF Py_tss_t &
-#        ifdef __GNUC__
-// Clang on macOS warns due to `Py_tss_NEEDS_INIT` not specifying an initializer
-// for every field.
-#            define PYBIND11_TLS_KEY_INIT(var)                                                    \
-                _Pragma("GCC diagnostic push")                                         /**/       \
-                    _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") /**/       \
-                    Py_tss_t var                                                                  \
-                    = Py_tss_NEEDS_INIT;                                                          \
-                _Pragma("GCC diagnostic pop")
-#        else
-#            define PYBIND11_TLS_KEY_INIT(var) Py_tss_t var = Py_tss_NEEDS_INIT;
-#        endif
-#        define PYBIND11_TLS_KEY_CREATE(var) (PyThread_tss_create(&(var)) == 0)
-#        define PYBIND11_TLS_GET_VALUE(key) PyThread_tss_get(&(key))
-#        define PYBIND11_TLS_REPLACE_VALUE(key, value) PyThread_tss_set(&(key), (value))
-#        define PYBIND11_TLS_DELETE_VALUE(key) PyThread_tss_set(&(key), nullptr)
-#        define PYBIND11_TLS_FREE(key) PyThread_tss_delete(&(key))
-#    else
-#        define PYBIND11_TLS_KEY_REF Py_tss_t *
-#        define PYBIND11_TLS_KEY_INIT(var) Py_tss_t *var = nullptr;
-#        define PYBIND11_TLS_KEY_CREATE(var)                                                      \
-            (((var) = PyThread_tss_alloc()) != nullptr && (PyThread_tss_create((var)) == 0))
-#        define PYBIND11_TLS_GET_VALUE(key) PyThread_tss_get((key))
-#        define PYBIND11_TLS_REPLACE_VALUE(key, value) PyThread_tss_set((key), (value))
-#        define PYBIND11_TLS_DELETE_VALUE(key) PyThread_tss_set((key), nullptr)
-#        define PYBIND11_TLS_FREE(key) PyThread_tss_free(key)
-#    endif
-#else
-// Usually an int but a long on Cygwin64 with Python 3.x
-#    define PYBIND11_TLS_KEY_REF decltype(PyThread_create_key())
-#    define PYBIND11_TLS_KEY_INIT(var) PYBIND11_TLS_KEY_REF var = 0;
-#    define PYBIND11_TLS_KEY_CREATE(var) (((var) = PyThread_create_key()) != -1)
-#    define PYBIND11_TLS_GET_VALUE(key) PyThread_get_key_value((key))
-#    if defined(PYPY_VERSION)
-// On CPython < 3.4 and on PyPy, `PyThread_set_key_value` strangely does not set
-// the value if it has already been set.  Instead, it must first be deleted and
-// then set again.
-inline void tls_replace_value(PYBIND11_TLS_KEY_REF key, void *value) {
-    PyThread_delete_key_value(key);
-    PyThread_set_key_value(key, value);
-}
-#        define PYBIND11_TLS_DELETE_VALUE(key) PyThread_delete_key_value(key)
-#        define PYBIND11_TLS_REPLACE_VALUE(key, value)                                            \
-            ::pybind11::detail::tls_replace_value((key), (value))
-#    else
-#        define PYBIND11_TLS_DELETE_VALUE(key) PyThread_set_key_value((key), nullptr)
-#        define PYBIND11_TLS_REPLACE_VALUE(key, value) PyThread_set_key_value((key), (value))
-#    endif
-#    define PYBIND11_TLS_FREE(key) (void) key
-#endif
-
-// Python loads modules by default with dlopen with the RTLD_LOCAL flag; under libc++ and possibly
-// other STLs, this means `typeid(A)` from one module won't equal `typeid(A)` from another module
-// even when `A` is the same, non-hidden-visibility type (e.g. from a common include).  Under
-// libstdc++, this doesn't happen: equality and the type_index hash are based on the type name,
-// which works.  If not under a known-good stl, provide our own name-based hash and equality
-// functions that use the type name.
-#if defined(__GLIBCXX__)
-inline bool same_type(const std::type_info &lhs, const std::type_info &rhs) { return lhs == rhs; }
-using type_hash = std::hash<std::type_index>;
-using type_equal_to = std::equal_to<std::type_index>;
-#else
-inline bool same_type(const std::type_info &lhs, const std::type_info &rhs) {
-    return lhs.name() == rhs.name() || std::strcmp(lhs.name(), rhs.name()) == 0;
-}
-
-struct type_hash {
-    size_t operator()(const std::type_index &t) const {
-        size_t hash = 5381;
-        const char *ptr = t.name();
-        while (auto c = static_cast<unsigned char>(*ptr++)) {
-            hash = (hash * 33) ^ c;
-        }
-        return hash;
-    }
-};
-
-struct type_equal_to {
-    bool operator()(const std::type_index &lhs, const std::type_index &rhs) const {
-        return lhs.name() == rhs.name() || std::strcmp(lhs.name(), rhs.name()) == 0;
-    }
-};
-#endif
-
-template <typename value_type>
-using type_map = std::unordered_map<std::type_index, value_type, type_hash, type_equal_to>;
-
-struct override_hash {
-    inline size_t operator()(const std::pair<const PyObject *, const char *> &v) const {
-        size_t value = std::hash<const void *>()(v.first);
-        value ^= std::hash<const void *>()(v.second) + 0x9e3779b9 + (value << 6) + (value >> 2);
-        return value;
-    }
-};
-
-/// Internal data structure used to track registered instances and types.
-/// Whenever binary incompatible changes are made to this structure,
-/// `PYBIND11_INTERNALS_VERSION` must be incremented.
-struct internals {
-    // std::type_index -> pybind11's type information
-    type_map<type_info *> registered_types_cpp;
-    // PyTypeObject* -> base type_info(s)
-    std::unordered_map<PyTypeObject *, std::vector<type_info *>> registered_types_py;
-    std::unordered_multimap<const void *, instance *> registered_instances; // void * -> instance*
-    std::unordered_set<std::pair<const PyObject *, const char *>, override_hash>
-        inactive_override_cache;
-    type_map<std::vector<bool (*)(PyObject *, void *&)>> direct_conversions;
-    std::unordered_map<const PyObject *, std::vector<PyObject *>> patients;
-    std::forward_list<ExceptionTranslator> registered_exception_translators;
-    std::unordered_map<std::string, void *> shared_data; // Custom data to be shared across
-                                                         // extensions
-#if PYBIND11_INTERNALS_VERSION == 4
-    std::vector<PyObject *> unused_loader_patient_stack_remove_at_v5;
-#endif
-    std::forward_list<std::string> static_strings; // Stores the std::strings backing
-                                                   // detail::c_str()
-    PyTypeObject *static_property_type;
-    PyTypeObject *default_metaclass;
-    PyObject *instance_base;
-#if defined(WITH_THREAD)
-    PYBIND11_TLS_KEY_INIT(tstate)
-#    if PYBIND11_INTERNALS_VERSION > 4
-    PYBIND11_TLS_KEY_INIT(loader_life_support_tls_key)
-#    endif // PYBIND11_INTERNALS_VERSION > 4
-    PyInterpreterState *istate = nullptr;
-    ~internals() {
-#    if PYBIND11_INTERNALS_VERSION > 4
-        PYBIND11_TLS_FREE(loader_life_support_tls_key);
-#    endif // PYBIND11_INTERNALS_VERSION > 4
-
-        // This destructor is called *after* Py_Finalize() in finalize_interpreter().
-        // That *SHOULD BE* fine. The following details what happens when PyThread_tss_free is
-        // called. PYBIND11_TLS_FREE is PyThread_tss_free on python 3.7+. On older python, it does
-        // nothing. PyThread_tss_free calls PyThread_tss_delete and PyMem_RawFree.
-        // PyThread_tss_delete just calls TlsFree (on Windows) or pthread_key_delete (on *NIX).
-        // Neither of those have anything to do with CPython internals. PyMem_RawFree *requires*
-        // that the `tstate` be allocated with the CPython allocator.
-        PYBIND11_TLS_FREE(tstate);
-    }
-#endif
-};
-
-/// Additional type information which does not fit into the PyTypeObject.
-/// Changes to this struct also require bumping `PYBIND11_INTERNALS_VERSION`.
-struct type_info {
-    PyTypeObject *type;
-    const std::type_info *cpptype;
-    size_t type_size, type_align, holder_size_in_ptrs;
-    void *(*operator_new)(size_t);
-    void (*init_instance)(instance *, const void *);
-    void (*dealloc)(value_and_holder &v_h);
-    std::vector<PyObject *(*) (PyObject *, PyTypeObject *)> implicit_conversions;
-    std::vector<std::pair<const std::type_info *, void *(*) (void *)>> implicit_casts;
-    std::vector<bool (*)(PyObject *, void *&)> *direct_conversions;
-    buffer_info *(*get_buffer)(PyObject *, void *) = nullptr;
-    void *get_buffer_data = nullptr;
-    void *(*module_local_load)(PyObject *, const type_info *) = nullptr;
-    /* A simple type never occurs as a (direct or indirect) parent
-     * of a class that makes use of multiple inheritance.
-     * A type can be simple even if it has non-simple ancestors as long as it has no descendants.
-     */
-    bool simple_type : 1;
-    /* True if there is no multiple inheritance in this type's inheritance tree */
-    bool simple_ancestors : 1;
-    /* for base vs derived holder_type checks */
-    bool default_holder : 1;
-    /* true if this is a type registered with py::module_local */
-    bool module_local : 1;
-};
-
-/// On MSVC, debug and release builds are not ABI-compatible!
-#if defined(_MSC_VER) && defined(_DEBUG)
-#    define PYBIND11_BUILD_TYPE "_debug"
-#else
-#    define PYBIND11_BUILD_TYPE ""
-#endif
-
-/// Let's assume that different compilers are ABI-incompatible.
-/// A user can manually set this string if they know their
-/// compiler is compatible.
-#ifndef PYBIND11_COMPILER_TYPE
-#    if defined(_MSC_VER)
-#        define PYBIND11_COMPILER_TYPE "_msvc"
-#    elif defined(__INTEL_COMPILER)
-#        define PYBIND11_COMPILER_TYPE "_icc"
-#    elif defined(__clang__)
-#        define PYBIND11_COMPILER_TYPE "_clang"
-#    elif defined(__PGI)
-#        define PYBIND11_COMPILER_TYPE "_pgi"
-#    elif defined(__MINGW32__)
-#        define PYBIND11_COMPILER_TYPE "_mingw"
-#    elif defined(__CYGWIN__)
-#        define PYBIND11_COMPILER_TYPE "_gcc_cygwin"
-#    elif defined(__GNUC__)
-#        define PYBIND11_COMPILER_TYPE "_gcc"
-#    else
-#        define PYBIND11_COMPILER_TYPE "_unknown"
-#    endif
-#endif
-
-/// Also standard libs
-#ifndef PYBIND11_STDLIB
-#    if defined(_LIBCPP_VERSION)
-#        define PYBIND11_STDLIB "_libcpp"
-#    elif defined(__GLIBCXX__) || defined(__GLIBCPP__)
-#        define PYBIND11_STDLIB "_libstdcpp"
-#    else
-#        define PYBIND11_STDLIB ""
-#    endif
-#endif
-
-/// On Linux/OSX, changes in __GXX_ABI_VERSION__ indicate ABI incompatibility.
-#ifndef PYBIND11_BUILD_ABI
-#    if defined(__GXX_ABI_VERSION)
-#        define PYBIND11_BUILD_ABI "_cxxabi" PYBIND11_TOSTRING(__GXX_ABI_VERSION)
-#    else
-#        define PYBIND11_BUILD_ABI ""
-#    endif
-#endif
-
-#ifndef PYBIND11_INTERNALS_KIND
-#    if defined(WITH_THREAD)
-#        define PYBIND11_INTERNALS_KIND ""
-#    else
-#        define PYBIND11_INTERNALS_KIND "_without_thread"
-#    endif
-#endif
-
-#define PYBIND11_INTERNALS_ID                                                                     \
-    "__pybind11_internals_v" PYBIND11_TOSTRING(PYBIND11_INTERNALS_VERSION)                        \
-        PYBIND11_INTERNALS_KIND PYBIND11_COMPILER_TYPE PYBIND11_STDLIB PYBIND11_BUILD_ABI         \
-            PYBIND11_BUILD_TYPE "__"
-
-#define PYBIND11_MODULE_LOCAL_ID                                                                  \
-    "__pybind11_module_local_v" PYBIND11_TOSTRING(PYBIND11_INTERNALS_VERSION)                     \
-        PYBIND11_INTERNALS_KIND PYBIND11_COMPILER_TYPE PYBIND11_STDLIB PYBIND11_BUILD_ABI         \
-            PYBIND11_BUILD_TYPE "__"
-
-/// Each module locally stores a pointer to the `internals` data. The data
-/// itself is shared among modules with the same `PYBIND11_INTERNALS_ID`.
-inline internals **&get_internals_pp() {
-    static internals **internals_pp = nullptr;
-    return internals_pp;
-}
-
-// forward decl
-inline void translate_exception(std::exception_ptr);
-
-template <class T,
-          enable_if_t<std::is_same<std::nested_exception, remove_cvref_t<T>>::value, int> = 0>
-bool handle_nested_exception(const T &exc, const std::exception_ptr &p) {
-    std::exception_ptr nested = exc.nested_ptr();
-    if (nested != nullptr && nested != p) {
-        translate_exception(nested);
-        return true;
-    }
-    return false;
-}
-
-template <class T,
-          enable_if_t<!std::is_same<std::nested_exception, remove_cvref_t<T>>::value, int> = 0>
-bool handle_nested_exception(const T &exc, const std::exception_ptr &p) {
-    if (const auto *nep = dynamic_cast<const std::nested_exception *>(std::addressof(exc))) {
-        return handle_nested_exception(*nep, p);
-    }
-    return false;
-}
-
-inline bool raise_err(PyObject *exc_type, const char *msg) {
-    if (PyErr_Occurred()) {
-        raise_from(exc_type, msg);
-        return true;
-    }
-    PyErr_SetString(exc_type, msg);
-    return false;
-}
-
-inline void translate_exception(std::exception_ptr p) {
-    if (!p) {
-        return;
-    }
-    try {
-        std::rethrow_exception(p);
-    } catch (error_already_set &e) {
-        handle_nested_exception(e, p);
-        e.restore();
-        return;
-    } catch (const builtin_exception &e) {
-        // Could not use template since it's an abstract class.
-        if (const auto *nep = dynamic_cast<const std::nested_exception *>(std::addressof(e))) {
-            handle_nested_exception(*nep, p);
-        }
-        e.set_error();
-        return;
-    } catch (const std::bad_alloc &e) {
-        handle_nested_exception(e, p);
-        raise_err(PyExc_MemoryError, e.what());
-        return;
-    } catch (const std::domain_error &e) {
-        handle_nested_exception(e, p);
-        raise_err(PyExc_ValueError, e.what());
-        return;
-    } catch (const std::invalid_argument &e) {
-        handle_nested_exception(e, p);
-        raise_err(PyExc_ValueError, e.what());
-        return;
-    } catch (const std::length_error &e) {
-        handle_nested_exception(e, p);
-        raise_err(PyExc_ValueError, e.what());
-        return;
-    } catch (const std::out_of_range &e) {
-        handle_nested_exception(e, p);
-        raise_err(PyExc_IndexError, e.what());
-        return;
-    } catch (const std::range_error &e) {
-        handle_nested_exception(e, p);
-        raise_err(PyExc_ValueError, e.what());
-        return;
-    } catch (const std::overflow_error &e) {
-        handle_nested_exception(e, p);
-        raise_err(PyExc_OverflowError, e.what());
-        return;
-    } catch (const std::exception &e) {
-        handle_nested_exception(e, p);
-        raise_err(PyExc_RuntimeError, e.what());
-        return;
-    } catch (const std::nested_exception &e) {
-        handle_nested_exception(e, p);
-        raise_err(PyExc_RuntimeError, "Caught an unknown nested exception!");
-        return;
-    } catch (...) {
-        raise_err(PyExc_RuntimeError, "Caught an unknown exception!");
-        return;
-    }
-}
-
-#if !defined(__GLIBCXX__)
-inline void translate_local_exception(std::exception_ptr p) {
-    try {
-        if (p) {
-            std::rethrow_exception(p);
-        }
-    } catch (error_already_set &e) {
-        e.restore();
-        return;
-    } catch (const builtin_exception &e) {
-        e.set_error();
-        return;
-    }
-}
-#endif
-
-/// Return a reference to the current `internals` data
-PYBIND11_NOINLINE internals &get_internals() {
-    auto **&internals_pp = get_internals_pp();
-    if (internals_pp && *internals_pp) {
-        return **internals_pp;
-    }
-
-    // Ensure that the GIL is held since we will need to make Python calls.
-    // Cannot use py::gil_scoped_acquire here since that constructor calls get_internals.
-    struct gil_scoped_acquire_local {
-        gil_scoped_acquire_local() : state(PyGILState_Ensure()) {}
-        ~gil_scoped_acquire_local() { PyGILState_Release(state); }
-        const PyGILState_STATE state;
-    } gil;
-    error_scope err_scope;
-
-    PYBIND11_STR_TYPE id(PYBIND11_INTERNALS_ID);
-    auto builtins = handle(PyEval_GetBuiltins());
-    if (builtins.contains(id) && isinstance<capsule>(builtins[id])) {
-        internals_pp = static_cast<internals **>(capsule(builtins[id]));
-
-        // We loaded builtins through python's builtins, which means that our `error_already_set`
-        // and `builtin_exception` may be different local classes than the ones set up in the
-        // initial exception translator, below, so add another for our local exception classes.
-        //
-        // libstdc++ doesn't require this (types there are identified only by name)
-        // libc++ with CPython doesn't require this (types are explicitly exported)
-        // libc++ with PyPy still need it, awaiting further investigation
-#if !defined(__GLIBCXX__)
-        (*internals_pp)->registered_exception_translators.push_front(&translate_local_exception);
-#endif
-    } else {
-        if (!internals_pp) {
-            internals_pp = new internals *();
-        }
-        auto *&internals_ptr = *internals_pp;
-        internals_ptr = new internals();
-#if defined(WITH_THREAD)
-
-#    if PY_VERSION_HEX < 0x03090000
-        PyEval_InitThreads();
-#    endif
-        PyThreadState *tstate = PyThreadState_Get();
-        if (!PYBIND11_TLS_KEY_CREATE(internals_ptr->tstate)) {
-            pybind11_fail("get_internals: could not successfully initialize the tstate TSS key!");
-        }
-        PYBIND11_TLS_REPLACE_VALUE(internals_ptr->tstate, tstate);
-
-#    if PYBIND11_INTERNALS_VERSION > 4
-        if (!PYBIND11_TLS_KEY_CREATE(internals_ptr->loader_life_support_tls_key)) {
-            pybind11_fail("get_internals: could not successfully initialize the "
-                          "loader_life_support TSS key!");
-        }
-#    endif
-        internals_ptr->istate = tstate->interp;
-#endif
-        builtins[id] = capsule(internals_pp);
-        internals_ptr->registered_exception_translators.push_front(&translate_exception);
-        internals_ptr->static_property_type = make_static_property_type();
-        internals_ptr->default_metaclass = make_default_metaclass();
-        internals_ptr->instance_base = make_object_base_type(internals_ptr->default_metaclass);
-    }
-    return **internals_pp;
-}
-
-// the internals struct (above) is shared between all the modules. local_internals are only
-// for a single module. Any changes made to internals may require an update to
-// PYBIND11_INTERNALS_VERSION, breaking backwards compatibility. local_internals is, by design,
-// restricted to a single module. Whether a module has local internals or not should not
-// impact any other modules, because the only things accessing the local internals is the
-// module that contains them.
-struct local_internals {
-    type_map<type_info *> registered_types_cpp;
-    std::forward_list<ExceptionTranslator> registered_exception_translators;
-#if defined(WITH_THREAD) && PYBIND11_INTERNALS_VERSION == 4
-
-    // For ABI compatibility, we can't store the loader_life_support TLS key in
-    // the `internals` struct directly.  Instead, we store it in `shared_data` and
-    // cache a copy in `local_internals`.  If we allocated a separate TLS key for
-    // each instance of `local_internals`, we could end up allocating hundreds of
-    // TLS keys if hundreds of different pybind11 modules are loaded (which is a
-    // plausible number).
-    PYBIND11_TLS_KEY_INIT(loader_life_support_tls_key)
-
-    // Holds the shared TLS key for the loader_life_support stack.
-    struct shared_loader_life_support_data {
-        PYBIND11_TLS_KEY_INIT(loader_life_support_tls_key)
-        shared_loader_life_support_data() {
-            if (!PYBIND11_TLS_KEY_CREATE(loader_life_support_tls_key)) {
-                pybind11_fail("local_internals: could not successfully initialize the "
-                              "loader_life_support TLS key!");
-            }
-        }
-        // We can't help but leak the TLS key, because Python never unloads extension modules.
-    };
-
-    local_internals() {
-        auto &internals = get_internals();
-        // Get or create the `loader_life_support_stack_key`.
-        auto &ptr = internals.shared_data["_life_support"];
-        if (!ptr) {
-            ptr = new shared_loader_life_support_data;
-        }
-        loader_life_support_tls_key
-            = static_cast<shared_loader_life_support_data *>(ptr)->loader_life_support_tls_key;
-    }
-#endif //  defined(WITH_THREAD) && PYBIND11_INTERNALS_VERSION == 4
-};
-
-/// Works like `get_internals`, but for things which are locally registered.
-inline local_internals &get_local_internals() {
-    static local_internals locals;
-    return locals;
-}
-
-/// Constructs a std::string with the given arguments, stores it in `internals`, and returns its
-/// `c_str()`.  Such strings objects have a long storage duration -- the internal strings are only
-/// cleared when the program exits or after interpreter shutdown (when embedding), and so are
-/// suitable for c-style strings needed by Python internals (such as PyTypeObject's tp_name).
-template <typename... Args>
-const char *c_str(Args &&...args) {
-    auto &strings = get_internals().static_strings;
-    strings.emplace_front(std::forward<Args>(args)...);
-    return strings.front().c_str();
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Returns a named pointer that is shared among all extension modules (using the same
-/// pybind11 version) running in the current interpreter. Names starting with underscores
-/// are reserved for internal usage. Returns `nullptr` if no matching entry was found.
-PYBIND11_NOINLINE void *get_shared_data(const std::string &name) {
-    auto &internals = detail::get_internals();
-    auto it = internals.shared_data.find(name);
-    return it != internals.shared_data.end() ? it->second : nullptr;
-}
-
-/// Set the shared data that can be later recovered by `get_shared_data()`.
-PYBIND11_NOINLINE void *set_shared_data(const std::string &name, void *data) {
-    detail::get_internals().shared_data[name] = data;
-    return data;
-}
-
-/// Returns a typed reference to a shared data entry (by using `get_shared_data()`) if
-/// such entry exists. Otherwise, a new object of default-constructible type `T` is
-/// added to the shared data under the given name and a reference to it is returned.
-template <typename T>
-T &get_or_create_shared_data(const std::string &name) {
-    auto &internals = detail::get_internals();
-    auto it = internals.shared_data.find(name);
-    T *ptr = (T *) (it != internals.shared_data.end() ? it->second : nullptr);
-    if (!ptr) {
-        ptr = new T();
-        internals.shared_data[name] = ptr;
-    }
-    return *ptr;
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/type_caster_base.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/type_caster_base.h
deleted file mode 100644
index 21f69c289..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/type_caster_base.h
+++ /dev/null
@@ -1,1010 +0,0 @@
-/*
-    pybind11/detail/type_caster_base.h (originally first part of pybind11/cast.h)
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "../pytypes.h"
-#include "common.h"
-#include "descr.h"
-#include "internals.h"
-#include "typeid.h"
-
-#include <cstdint>
-#include <iterator>
-#include <new>
-#include <string>
-#include <type_traits>
-#include <typeindex>
-#include <typeinfo>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// A life support system for temporary objects created by `type_caster::load()`.
-/// Adding a patient will keep it alive up until the enclosing function returns.
-class loader_life_support {
-private:
-    loader_life_support *parent = nullptr;
-    std::unordered_set<PyObject *> keep_alive;
-
-#if defined(WITH_THREAD)
-    // Store stack pointer in thread-local storage.
-    static PYBIND11_TLS_KEY_REF get_stack_tls_key() {
-#    if PYBIND11_INTERNALS_VERSION == 4
-        return get_local_internals().loader_life_support_tls_key;
-#    else
-        return get_internals().loader_life_support_tls_key;
-#    endif
-    }
-    static loader_life_support *get_stack_top() {
-        return static_cast<loader_life_support *>(PYBIND11_TLS_GET_VALUE(get_stack_tls_key()));
-    }
-    static void set_stack_top(loader_life_support *value) {
-        PYBIND11_TLS_REPLACE_VALUE(get_stack_tls_key(), value);
-    }
-#else
-    // Use single global variable for stack.
-    static loader_life_support **get_stack_pp() {
-        static loader_life_support *global_stack = nullptr;
-        return global_stack;
-    }
-    static loader_life_support *get_stack_top() { return *get_stack_pp(); }
-    static void set_stack_top(loader_life_support *value) { *get_stack_pp() = value; }
-#endif
-
-public:
-    /// A new patient frame is created when a function is entered
-    loader_life_support() : parent{get_stack_top()} { set_stack_top(this); }
-
-    /// ... and destroyed after it returns
-    ~loader_life_support() {
-        if (get_stack_top() != this) {
-            pybind11_fail("loader_life_support: internal error");
-        }
-        set_stack_top(parent);
-        for (auto *item : keep_alive) {
-            Py_DECREF(item);
-        }
-    }
-
-    /// This can only be used inside a pybind11-bound function, either by `argument_loader`
-    /// at argument preparation time or by `py::cast()` at execution time.
-    PYBIND11_NOINLINE static void add_patient(handle h) {
-        loader_life_support *frame = get_stack_top();
-        if (!frame) {
-            // NOTE: It would be nice to include the stack frames here, as this indicates
-            // use of pybind11::cast<> outside the normal call framework, finding such
-            // a location is challenging. Developers could consider printing out
-            // stack frame addresses here using something like __builtin_frame_address(0)
-            throw cast_error("When called outside a bound function, py::cast() cannot "
-                             "do Python -> C++ conversions which require the creation "
-                             "of temporary values");
-        }
-
-        if (frame->keep_alive.insert(h.ptr()).second) {
-            Py_INCREF(h.ptr());
-        }
-    }
-};
-
-// Gets the cache entry for the given type, creating it if necessary.  The return value is the pair
-// returned by emplace, i.e. an iterator for the entry and a bool set to `true` if the entry was
-// just created.
-inline std::pair<decltype(internals::registered_types_py)::iterator, bool>
-all_type_info_get_cache(PyTypeObject *type);
-
-// Populates a just-created cache entry.
-PYBIND11_NOINLINE void all_type_info_populate(PyTypeObject *t, std::vector<type_info *> &bases) {
-    std::vector<PyTypeObject *> check;
-    for (handle parent : reinterpret_borrow<tuple>(t->tp_bases)) {
-        check.push_back((PyTypeObject *) parent.ptr());
-    }
-
-    auto const &type_dict = get_internals().registered_types_py;
-    for (size_t i = 0; i < check.size(); i++) {
-        auto *type = check[i];
-        // Ignore Python2 old-style class super type:
-        if (!PyType_Check((PyObject *) type)) {
-            continue;
-        }
-
-        // Check `type` in the current set of registered python types:
-        auto it = type_dict.find(type);
-        if (it != type_dict.end()) {
-            // We found a cache entry for it, so it's either pybind-registered or has pre-computed
-            // pybind bases, but we have to make sure we haven't already seen the type(s) before:
-            // we want to follow Python/virtual C++ rules that there should only be one instance of
-            // a common base.
-            for (auto *tinfo : it->second) {
-                // NB: Could use a second set here, rather than doing a linear search, but since
-                // having a large number of immediate pybind11-registered types seems fairly
-                // unlikely, that probably isn't worthwhile.
-                bool found = false;
-                for (auto *known : bases) {
-                    if (known == tinfo) {
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found) {
-                    bases.push_back(tinfo);
-                }
-            }
-        } else if (type->tp_bases) {
-            // It's some python type, so keep follow its bases classes to look for one or more
-            // registered types
-            if (i + 1 == check.size()) {
-                // When we're at the end, we can pop off the current element to avoid growing
-                // `check` when adding just one base (which is typical--i.e. when there is no
-                // multiple inheritance)
-                check.pop_back();
-                i--;
-            }
-            for (handle parent : reinterpret_borrow<tuple>(type->tp_bases)) {
-                check.push_back((PyTypeObject *) parent.ptr());
-            }
-        }
-    }
-}
-
-/**
- * Extracts vector of type_info pointers of pybind-registered roots of the given Python type.  Will
- * be just 1 pybind type for the Python type of a pybind-registered class, or for any Python-side
- * derived class that uses single inheritance.  Will contain as many types as required for a Python
- * class that uses multiple inheritance to inherit (directly or indirectly) from multiple
- * pybind-registered classes.  Will be empty if neither the type nor any base classes are
- * pybind-registered.
- *
- * The value is cached for the lifetime of the Python type.
- */
-inline const std::vector<detail::type_info *> &all_type_info(PyTypeObject *type) {
-    auto ins = all_type_info_get_cache(type);
-    if (ins.second) {
-        // New cache entry: populate it
-        all_type_info_populate(type, ins.first->second);
-    }
-
-    return ins.first->second;
-}
-
-/**
- * Gets a single pybind11 type info for a python type.  Returns nullptr if neither the type nor any
- * ancestors are pybind11-registered.  Throws an exception if there are multiple bases--use
- * `all_type_info` instead if you want to support multiple bases.
- */
-PYBIND11_NOINLINE detail::type_info *get_type_info(PyTypeObject *type) {
-    const auto &bases = all_type_info(type);
-    if (bases.empty()) {
-        return nullptr;
-    }
-    if (bases.size() > 1) {
-        pybind11_fail(
-            "pybind11::detail::get_type_info: type has multiple pybind11-registered bases");
-    }
-    return bases.front();
-}
-
-inline detail::type_info *get_local_type_info(const std::type_index &tp) {
-    auto &locals = get_local_internals().registered_types_cpp;
-    auto it = locals.find(tp);
-    if (it != locals.end()) {
-        return it->second;
-    }
-    return nullptr;
-}
-
-inline detail::type_info *get_global_type_info(const std::type_index &tp) {
-    auto &types = get_internals().registered_types_cpp;
-    auto it = types.find(tp);
-    if (it != types.end()) {
-        return it->second;
-    }
-    return nullptr;
-}
-
-/// Return the type info for a given C++ type; on lookup failure can either throw or return
-/// nullptr.
-PYBIND11_NOINLINE detail::type_info *get_type_info(const std::type_index &tp,
-                                                   bool throw_if_missing = false) {
-    if (auto *ltype = get_local_type_info(tp)) {
-        return ltype;
-    }
-    if (auto *gtype = get_global_type_info(tp)) {
-        return gtype;
-    }
-
-    if (throw_if_missing) {
-        std::string tname = tp.name();
-        detail::clean_type_id(tname);
-        pybind11_fail("pybind11::detail::get_type_info: unable to find type info for \""
-                      + std::move(tname) + '"');
-    }
-    return nullptr;
-}
-
-PYBIND11_NOINLINE handle get_type_handle(const std::type_info &tp, bool throw_if_missing) {
-    detail::type_info *type_info = get_type_info(tp, throw_if_missing);
-    return handle(type_info ? ((PyObject *) type_info->type) : nullptr);
-}
-
-// Searches the inheritance graph for a registered Python instance, using all_type_info().
-PYBIND11_NOINLINE handle find_registered_python_instance(void *src,
-                                                         const detail::type_info *tinfo) {
-    auto it_instances = get_internals().registered_instances.equal_range(src);
-    for (auto it_i = it_instances.first; it_i != it_instances.second; ++it_i) {
-        for (auto *instance_type : detail::all_type_info(Py_TYPE(it_i->second))) {
-            if (instance_type && same_type(*instance_type->cpptype, *tinfo->cpptype)) {
-                return handle((PyObject *) it_i->second).inc_ref();
-            }
-        }
-    }
-    return handle();
-}
-
-struct value_and_holder {
-    instance *inst = nullptr;
-    size_t index = 0u;
-    const detail::type_info *type = nullptr;
-    void **vh = nullptr;
-
-    // Main constructor for a found value/holder:
-    value_and_holder(instance *i, const detail::type_info *type, size_t vpos, size_t index)
-        : inst{i}, index{index}, type{type}, vh{inst->simple_layout
-                                                    ? inst->simple_value_holder
-                                                    : &inst->nonsimple.values_and_holders[vpos]} {}
-
-    // Default constructor (used to signal a value-and-holder not found by get_value_and_holder())
-    value_and_holder() = default;
-
-    // Used for past-the-end iterator
-    explicit value_and_holder(size_t index) : index{index} {}
-
-    template <typename V = void>
-    V *&value_ptr() const {
-        return reinterpret_cast<V *&>(vh[0]);
-    }
-    // True if this `value_and_holder` has a non-null value pointer
-    explicit operator bool() const { return value_ptr() != nullptr; }
-
-    template <typename H>
-    H &holder() const {
-        return reinterpret_cast<H &>(vh[1]);
-    }
-    bool holder_constructed() const {
-        return inst->simple_layout
-                   ? inst->simple_holder_constructed
-                   : (inst->nonsimple.status[index] & instance::status_holder_constructed) != 0u;
-    }
-    // NOLINTNEXTLINE(readability-make-member-function-const)
-    void set_holder_constructed(bool v = true) {
-        if (inst->simple_layout) {
-            inst->simple_holder_constructed = v;
-        } else if (v) {
-            inst->nonsimple.status[index] |= instance::status_holder_constructed;
-        } else {
-            inst->nonsimple.status[index] &= (std::uint8_t) ~instance::status_holder_constructed;
-        }
-    }
-    bool instance_registered() const {
-        return inst->simple_layout
-                   ? inst->simple_instance_registered
-                   : ((inst->nonsimple.status[index] & instance::status_instance_registered) != 0);
-    }
-    // NOLINTNEXTLINE(readability-make-member-function-const)
-    void set_instance_registered(bool v = true) {
-        if (inst->simple_layout) {
-            inst->simple_instance_registered = v;
-        } else if (v) {
-            inst->nonsimple.status[index] |= instance::status_instance_registered;
-        } else {
-            inst->nonsimple.status[index] &= (std::uint8_t) ~instance::status_instance_registered;
-        }
-    }
-};
-
-// Container for accessing and iterating over an instance's values/holders
-struct values_and_holders {
-private:
-    instance *inst;
-    using type_vec = std::vector<detail::type_info *>;
-    const type_vec &tinfo;
-
-public:
-    explicit values_and_holders(instance *inst)
-        : inst{inst}, tinfo(all_type_info(Py_TYPE(inst))) {}
-
-    struct iterator {
-    private:
-        instance *inst = nullptr;
-        const type_vec *types = nullptr;
-        value_and_holder curr;
-        friend struct values_and_holders;
-        iterator(instance *inst, const type_vec *tinfo)
-            : inst{inst}, types{tinfo},
-              curr(inst /* instance */,
-                   types->empty() ? nullptr : (*types)[0] /* type info */,
-                   0, /* vpos: (non-simple types only): the first vptr comes first */
-                   0 /* index */) {}
-        // Past-the-end iterator:
-        explicit iterator(size_t end) : curr(end) {}
-
-    public:
-        bool operator==(const iterator &other) const { return curr.index == other.curr.index; }
-        bool operator!=(const iterator &other) const { return curr.index != other.curr.index; }
-        iterator &operator++() {
-            if (!inst->simple_layout) {
-                curr.vh += 1 + (*types)[curr.index]->holder_size_in_ptrs;
-            }
-            ++curr.index;
-            curr.type = curr.index < types->size() ? (*types)[curr.index] : nullptr;
-            return *this;
-        }
-        value_and_holder &operator*() { return curr; }
-        value_and_holder *operator->() { return &curr; }
-    };
-
-    iterator begin() { return iterator(inst, &tinfo); }
-    iterator end() { return iterator(tinfo.size()); }
-
-    iterator find(const type_info *find_type) {
-        auto it = begin(), endit = end();
-        while (it != endit && it->type != find_type) {
-            ++it;
-        }
-        return it;
-    }
-
-    size_t size() { return tinfo.size(); }
-};
-
-/**
- * Extracts C++ value and holder pointer references from an instance (which may contain multiple
- * values/holders for python-side multiple inheritance) that match the given type.  Throws an error
- * if the given type (or ValueType, if omitted) is not a pybind11 base of the given instance.  If
- * `find_type` is omitted (or explicitly specified as nullptr) the first value/holder are returned,
- * regardless of type (and the resulting .type will be nullptr).
- *
- * The returned object should be short-lived: in particular, it must not outlive the called-upon
- * instance.
- */
-PYBIND11_NOINLINE value_and_holder
-instance::get_value_and_holder(const type_info *find_type /*= nullptr default in common.h*/,
-                               bool throw_if_missing /*= true in common.h*/) {
-    // Optimize common case:
-    if (!find_type || Py_TYPE(this) == find_type->type) {
-        return value_and_holder(this, find_type, 0, 0);
-    }
-
-    detail::values_and_holders vhs(this);
-    auto it = vhs.find(find_type);
-    if (it != vhs.end()) {
-        return *it;
-    }
-
-    if (!throw_if_missing) {
-        return value_and_holder();
-    }
-
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-    pybind11_fail("pybind11::detail::instance::get_value_and_holder: `"
-                  + get_fully_qualified_tp_name(find_type->type)
-                  + "' is not a pybind11 base of the given `"
-                  + get_fully_qualified_tp_name(Py_TYPE(this)) + "' instance");
-#else
-    pybind11_fail(
-        "pybind11::detail::instance::get_value_and_holder: "
-        "type is not a pybind11 base of the given instance "
-        "(#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for type details)");
-#endif
-}
-
-PYBIND11_NOINLINE void instance::allocate_layout() {
-    const auto &tinfo = all_type_info(Py_TYPE(this));
-
-    const size_t n_types = tinfo.size();
-
-    if (n_types == 0) {
-        pybind11_fail(
-            "instance allocation failed: new instance has no pybind11-registered base types");
-    }
-
-    simple_layout
-        = n_types == 1 && tinfo.front()->holder_size_in_ptrs <= instance_simple_holder_in_ptrs();
-
-    // Simple path: no python-side multiple inheritance, and a small-enough holder
-    if (simple_layout) {
-        simple_value_holder[0] = nullptr;
-        simple_holder_constructed = false;
-        simple_instance_registered = false;
-    } else { // multiple base types or a too-large holder
-        // Allocate space to hold: [v1*][h1][v2*][h2]...[bb...] where [vN*] is a value pointer,
-        // [hN] is the (uninitialized) holder instance for value N, and [bb...] is a set of bool
-        // values that tracks whether each associated holder has been initialized.  Each [block] is
-        // padded, if necessary, to an integer multiple of sizeof(void *).
-        size_t space = 0;
-        for (auto *t : tinfo) {
-            space += 1;                      // value pointer
-            space += t->holder_size_in_ptrs; // holder instance
-        }
-        size_t flags_at = space;
-        space += size_in_ptrs(n_types); // status bytes (holder_constructed and
-                                        // instance_registered)
-
-        // Allocate space for flags, values, and holders, and initialize it to 0 (flags and values,
-        // in particular, need to be 0).  Use Python's memory allocation
-        // functions: Python is using pymalloc, which is designed to be
-        // efficient for small allocations like the one we're doing here;
-        // for larger allocations they are just wrappers around malloc.
-        // TODO: is this still true for pure Python 3.6?
-        nonsimple.values_and_holders = (void **) PyMem_Calloc(space, sizeof(void *));
-        if (!nonsimple.values_and_holders) {
-            throw std::bad_alloc();
-        }
-        nonsimple.status
-            = reinterpret_cast<std::uint8_t *>(&nonsimple.values_and_holders[flags_at]);
-    }
-    owned = true;
-}
-
-// NOLINTNEXTLINE(readability-make-member-function-const)
-PYBIND11_NOINLINE void instance::deallocate_layout() {
-    if (!simple_layout) {
-        PyMem_Free(nonsimple.values_and_holders);
-    }
-}
-
-PYBIND11_NOINLINE bool isinstance_generic(handle obj, const std::type_info &tp) {
-    handle type = detail::get_type_handle(tp, false);
-    if (!type) {
-        return false;
-    }
-    return isinstance(obj, type);
-}
-
-PYBIND11_NOINLINE handle get_object_handle(const void *ptr, const detail::type_info *type) {
-    auto &instances = get_internals().registered_instances;
-    auto range = instances.equal_range(ptr);
-    for (auto it = range.first; it != range.second; ++it) {
-        for (const auto &vh : values_and_holders(it->second)) {
-            if (vh.type == type) {
-                return handle((PyObject *) it->second);
-            }
-        }
-    }
-    return handle();
-}
-
-inline PyThreadState *get_thread_state_unchecked() {
-#if defined(PYPY_VERSION)
-    return PyThreadState_GET();
-#else
-    return _PyThreadState_UncheckedGet();
-#endif
-}
-
-// Forward declarations
-void keep_alive_impl(handle nurse, handle patient);
-inline PyObject *make_new_instance(PyTypeObject *type);
-
-class type_caster_generic {
-public:
-    PYBIND11_NOINLINE explicit type_caster_generic(const std::type_info &type_info)
-        : typeinfo(get_type_info(type_info)), cpptype(&type_info) {}
-
-    explicit type_caster_generic(const type_info *typeinfo)
-        : typeinfo(typeinfo), cpptype(typeinfo ? typeinfo->cpptype : nullptr) {}
-
-    bool load(handle src, bool convert) { return load_impl<type_caster_generic>(src, convert); }
-
-    PYBIND11_NOINLINE static handle cast(const void *_src,
-                                         return_value_policy policy,
-                                         handle parent,
-                                         const detail::type_info *tinfo,
-                                         void *(*copy_constructor)(const void *),
-                                         void *(*move_constructor)(const void *),
-                                         const void *existing_holder = nullptr) {
-        if (!tinfo) { // no type info: error will be set already
-            return handle();
-        }
-
-        void *src = const_cast<void *>(_src);
-        if (src == nullptr) {
-            return none().release();
-        }
-
-        if (handle registered_inst = find_registered_python_instance(src, tinfo)) {
-            return registered_inst;
-        }
-
-        auto inst = reinterpret_steal<object>(make_new_instance(tinfo->type));
-        auto *wrapper = reinterpret_cast<instance *>(inst.ptr());
-        wrapper->owned = false;
-        void *&valueptr = values_and_holders(wrapper).begin()->value_ptr();
-
-        switch (policy) {
-            case return_value_policy::automatic:
-            case return_value_policy::take_ownership:
-                valueptr = src;
-                wrapper->owned = true;
-                break;
-
-            case return_value_policy::automatic_reference:
-            case return_value_policy::reference:
-                valueptr = src;
-                wrapper->owned = false;
-                break;
-
-            case return_value_policy::copy:
-                if (copy_constructor) {
-                    valueptr = copy_constructor(src);
-                } else {
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-                    std::string type_name(tinfo->cpptype->name());
-                    detail::clean_type_id(type_name);
-                    throw cast_error("return_value_policy = copy, but type " + type_name
-                                     + " is non-copyable!");
-#else
-                    throw cast_error("return_value_policy = copy, but type is "
-                                     "non-copyable! (#define PYBIND11_DETAILED_ERROR_MESSAGES or "
-                                     "compile in debug mode for details)");
-#endif
-                }
-                wrapper->owned = true;
-                break;
-
-            case return_value_policy::move:
-                if (move_constructor) {
-                    valueptr = move_constructor(src);
-                } else if (copy_constructor) {
-                    valueptr = copy_constructor(src);
-                } else {
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-                    std::string type_name(tinfo->cpptype->name());
-                    detail::clean_type_id(type_name);
-                    throw cast_error("return_value_policy = move, but type " + type_name
-                                     + " is neither movable nor copyable!");
-#else
-                    throw cast_error("return_value_policy = move, but type is neither "
-                                     "movable nor copyable! "
-                                     "(#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in "
-                                     "debug mode for details)");
-#endif
-                }
-                wrapper->owned = true;
-                break;
-
-            case return_value_policy::reference_internal:
-                valueptr = src;
-                wrapper->owned = false;
-                keep_alive_impl(inst, parent);
-                break;
-
-            default:
-                throw cast_error("unhandled return_value_policy: should not happen!");
-        }
-
-        tinfo->init_instance(wrapper, existing_holder);
-
-        return inst.release();
-    }
-
-    // Base methods for generic caster; there are overridden in copyable_holder_caster
-    void load_value(value_and_holder &&v_h) {
-        auto *&vptr = v_h.value_ptr();
-        // Lazy allocation for unallocated values:
-        if (vptr == nullptr) {
-            const auto *type = v_h.type ? v_h.type : typeinfo;
-            if (type->operator_new) {
-                vptr = type->operator_new(type->type_size);
-            } else {
-#if defined(__cpp_aligned_new) && (!defined(_MSC_VER) || _MSC_VER >= 1912)
-                if (type->type_align > __STDCPP_DEFAULT_NEW_ALIGNMENT__) {
-                    vptr = ::operator new(type->type_size, std::align_val_t(type->type_align));
-                } else {
-                    vptr = ::operator new(type->type_size);
-                }
-#else
-                vptr = ::operator new(type->type_size);
-#endif
-            }
-        }
-        value = vptr;
-    }
-    bool try_implicit_casts(handle src, bool convert) {
-        for (const auto &cast : typeinfo->implicit_casts) {
-            type_caster_generic sub_caster(*cast.first);
-            if (sub_caster.load(src, convert)) {
-                value = cast.second(sub_caster.value);
-                return true;
-            }
-        }
-        return false;
-    }
-    bool try_direct_conversions(handle src) {
-        for (auto &converter : *typeinfo->direct_conversions) {
-            if (converter(src.ptr(), value)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    void check_holder_compat() {}
-
-    PYBIND11_NOINLINE static void *local_load(PyObject *src, const type_info *ti) {
-        auto caster = type_caster_generic(ti);
-        if (caster.load(src, false)) {
-            return caster.value;
-        }
-        return nullptr;
-    }
-
-    /// Try to load with foreign typeinfo, if available. Used when there is no
-    /// native typeinfo, or when the native one wasn't able to produce a value.
-    PYBIND11_NOINLINE bool try_load_foreign_module_local(handle src) {
-        constexpr auto *local_key = PYBIND11_MODULE_LOCAL_ID;
-        const auto pytype = type::handle_of(src);
-        if (!hasattr(pytype, local_key)) {
-            return false;
-        }
-
-        type_info *foreign_typeinfo = reinterpret_borrow<capsule>(getattr(pytype, local_key));
-        // Only consider this foreign loader if actually foreign and is a loader of the correct cpp
-        // type
-        if (foreign_typeinfo->module_local_load == &local_load
-            || (cpptype && !same_type(*cpptype, *foreign_typeinfo->cpptype))) {
-            return false;
-        }
-
-        if (auto *result = foreign_typeinfo->module_local_load(src.ptr(), foreign_typeinfo)) {
-            value = result;
-            return true;
-        }
-        return false;
-    }
-
-    // Implementation of `load`; this takes the type of `this` so that it can dispatch the relevant
-    // bits of code between here and copyable_holder_caster where the two classes need different
-    // logic (without having to resort to virtual inheritance).
-    template <typename ThisT>
-    PYBIND11_NOINLINE bool load_impl(handle src, bool convert) {
-        if (!src) {
-            return false;
-        }
-        if (!typeinfo) {
-            return try_load_foreign_module_local(src);
-        }
-
-        auto &this_ = static_cast<ThisT &>(*this);
-        this_.check_holder_compat();
-
-        PyTypeObject *srctype = Py_TYPE(src.ptr());
-
-        // Case 1: If src is an exact type match for the target type then we can reinterpret_cast
-        // the instance's value pointer to the target type:
-        if (srctype == typeinfo->type) {
-            this_.load_value(reinterpret_cast<instance *>(src.ptr())->get_value_and_holder());
-            return true;
-        }
-        // Case 2: We have a derived class
-        if (PyType_IsSubtype(srctype, typeinfo->type)) {
-            const auto &bases = all_type_info(srctype);
-            bool no_cpp_mi = typeinfo->simple_type;
-
-            // Case 2a: the python type is a Python-inherited derived class that inherits from just
-            // one simple (no MI) pybind11 class, or is an exact match, so the C++ instance is of
-            // the right type and we can use reinterpret_cast.
-            // (This is essentially the same as case 2b, but because not using multiple inheritance
-            // is extremely common, we handle it specially to avoid the loop iterator and type
-            // pointer lookup overhead)
-            if (bases.size() == 1 && (no_cpp_mi || bases.front()->type == typeinfo->type)) {
-                this_.load_value(reinterpret_cast<instance *>(src.ptr())->get_value_and_holder());
-                return true;
-            }
-            // Case 2b: the python type inherits from multiple C++ bases.  Check the bases to see
-            // if we can find an exact match (or, for a simple C++ type, an inherited match); if
-            // so, we can safely reinterpret_cast to the relevant pointer.
-            if (bases.size() > 1) {
-                for (auto *base : bases) {
-                    if (no_cpp_mi ? PyType_IsSubtype(base->type, typeinfo->type)
-                                  : base->type == typeinfo->type) {
-                        this_.load_value(
-                            reinterpret_cast<instance *>(src.ptr())->get_value_and_holder(base));
-                        return true;
-                    }
-                }
-            }
-
-            // Case 2c: C++ multiple inheritance is involved and we couldn't find an exact type
-            // match in the registered bases, above, so try implicit casting (needed for proper C++
-            // casting when MI is involved).
-            if (this_.try_implicit_casts(src, convert)) {
-                return true;
-            }
-        }
-
-        // Perform an implicit conversion
-        if (convert) {
-            for (const auto &converter : typeinfo->implicit_conversions) {
-                auto temp = reinterpret_steal<object>(converter(src.ptr(), typeinfo->type));
-                if (load_impl<ThisT>(temp, false)) {
-                    loader_life_support::add_patient(temp);
-                    return true;
-                }
-            }
-            if (this_.try_direct_conversions(src)) {
-                return true;
-            }
-        }
-
-        // Failed to match local typeinfo. Try again with global.
-        if (typeinfo->module_local) {
-            if (auto *gtype = get_global_type_info(*typeinfo->cpptype)) {
-                typeinfo = gtype;
-                return load(src, false);
-            }
-        }
-
-        // Global typeinfo has precedence over foreign module_local
-        if (try_load_foreign_module_local(src)) {
-            return true;
-        }
-
-        // Custom converters didn't take None, now we convert None to nullptr.
-        if (src.is_none()) {
-            // Defer accepting None to other overloads (if we aren't in convert mode):
-            if (!convert) {
-                return false;
-            }
-            value = nullptr;
-            return true;
-        }
-
-        return false;
-    }
-
-    // Called to do type lookup and wrap the pointer and type in a pair when a dynamic_cast
-    // isn't needed or can't be used.  If the type is unknown, sets the error and returns a pair
-    // with .second = nullptr.  (p.first = nullptr is not an error: it becomes None).
-    PYBIND11_NOINLINE static std::pair<const void *, const type_info *>
-    src_and_type(const void *src,
-                 const std::type_info &cast_type,
-                 const std::type_info *rtti_type = nullptr) {
-        if (auto *tpi = get_type_info(cast_type)) {
-            return {src, const_cast<const type_info *>(tpi)};
-        }
-
-        // Not found, set error:
-        std::string tname = rtti_type ? rtti_type->name() : cast_type.name();
-        detail::clean_type_id(tname);
-        std::string msg = "Unregistered type : " + tname;
-        PyErr_SetString(PyExc_TypeError, msg.c_str());
-        return {nullptr, nullptr};
-    }
-
-    const type_info *typeinfo = nullptr;
-    const std::type_info *cpptype = nullptr;
-    void *value = nullptr;
-};
-
-/**
- * Determine suitable casting operator for pointer-or-lvalue-casting type casters.  The type caster
- * needs to provide `operator T*()` and `operator T&()` operators.
- *
- * If the type supports moving the value away via an `operator T&&() &&` method, it should use
- * `movable_cast_op_type` instead.
- */
-template <typename T>
-using cast_op_type = conditional_t<std::is_pointer<remove_reference_t<T>>::value,
-                                   typename std::add_pointer<intrinsic_t<T>>::type,
-                                   typename std::add_lvalue_reference<intrinsic_t<T>>::type>;
-
-/**
- * Determine suitable casting operator for a type caster with a movable value.  Such a type caster
- * needs to provide `operator T*()`, `operator T&()`, and `operator T&&() &&`.  The latter will be
- * called in appropriate contexts where the value can be moved rather than copied.
- *
- * These operator are automatically provided when using the PYBIND11_TYPE_CASTER macro.
- */
-template <typename T>
-using movable_cast_op_type
-    = conditional_t<std::is_pointer<typename std::remove_reference<T>::type>::value,
-                    typename std::add_pointer<intrinsic_t<T>>::type,
-                    conditional_t<std::is_rvalue_reference<T>::value,
-                                  typename std::add_rvalue_reference<intrinsic_t<T>>::type,
-                                  typename std::add_lvalue_reference<intrinsic_t<T>>::type>>;
-
-// std::is_copy_constructible isn't quite enough: it lets std::vector<T> (and similar) through when
-// T is non-copyable, but code containing such a copy constructor fails to actually compile.
-template <typename T, typename SFINAE = void>
-struct is_copy_constructible : std::is_copy_constructible<T> {};
-
-// Specialization for types that appear to be copy constructible but also look like stl containers
-// (we specifically check for: has `value_type` and `reference` with `reference = value_type&`): if
-// so, copy constructability depends on whether the value_type is copy constructible.
-template <typename Container>
-struct is_copy_constructible<
-    Container,
-    enable_if_t<
-        all_of<std::is_copy_constructible<Container>,
-               std::is_same<typename Container::value_type &, typename Container::reference>,
-               // Avoid infinite recursion
-               negation<std::is_same<Container, typename Container::value_type>>>::value>>
-    : is_copy_constructible<typename Container::value_type> {};
-
-// Likewise for std::pair
-// (after C++17 it is mandatory that the copy constructor not exist when the two types aren't
-// themselves copy constructible, but this can not be relied upon when T1 or T2 are themselves
-// containers).
-template <typename T1, typename T2>
-struct is_copy_constructible<std::pair<T1, T2>>
-    : all_of<is_copy_constructible<T1>, is_copy_constructible<T2>> {};
-
-// The same problems arise with std::is_copy_assignable, so we use the same workaround.
-template <typename T, typename SFINAE = void>
-struct is_copy_assignable : std::is_copy_assignable<T> {};
-template <typename Container>
-struct is_copy_assignable<Container,
-                          enable_if_t<all_of<std::is_copy_assignable<Container>,
-                                             std::is_same<typename Container::value_type &,
-                                                          typename Container::reference>>::value>>
-    : is_copy_assignable<typename Container::value_type> {};
-template <typename T1, typename T2>
-struct is_copy_assignable<std::pair<T1, T2>>
-    : all_of<is_copy_assignable<T1>, is_copy_assignable<T2>> {};
-
-PYBIND11_NAMESPACE_END(detail)
-
-// polymorphic_type_hook<itype>::get(src, tinfo) determines whether the object pointed
-// to by `src` actually is an instance of some class derived from `itype`.
-// If so, it sets `tinfo` to point to the std::type_info representing that derived
-// type, and returns a pointer to the start of the most-derived object of that type
-// (in which `src` is a subobject; this will be the same address as `src` in most
-// single inheritance cases). If not, or if `src` is nullptr, it simply returns `src`
-// and leaves `tinfo` at its default value of nullptr.
-//
-// The default polymorphic_type_hook just returns src. A specialization for polymorphic
-// types determines the runtime type of the passed object and adjusts the this-pointer
-// appropriately via dynamic_cast<void*>. This is what enables a C++ Animal* to appear
-// to Python as a Dog (if Dog inherits from Animal, Animal is polymorphic, Dog is
-// registered with pybind11, and this Animal is in fact a Dog).
-//
-// You may specialize polymorphic_type_hook yourself for types that want to appear
-// polymorphic to Python but do not use C++ RTTI. (This is a not uncommon pattern
-// in performance-sensitive applications, used most notably in LLVM.)
-//
-// polymorphic_type_hook_base allows users to specialize polymorphic_type_hook with
-// std::enable_if. User provided specializations will always have higher priority than
-// the default implementation and specialization provided in polymorphic_type_hook_base.
-template <typename itype, typename SFINAE = void>
-struct polymorphic_type_hook_base {
-    static const void *get(const itype *src, const std::type_info *&) { return src; }
-};
-template <typename itype>
-struct polymorphic_type_hook_base<itype, detail::enable_if_t<std::is_polymorphic<itype>::value>> {
-    static const void *get(const itype *src, const std::type_info *&type) {
-        type = src ? &typeid(*src) : nullptr;
-        return dynamic_cast<const void *>(src);
-    }
-};
-template <typename itype, typename SFINAE = void>
-struct polymorphic_type_hook : public polymorphic_type_hook_base<itype> {};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// Generic type caster for objects stored on the heap
-template <typename type>
-class type_caster_base : public type_caster_generic {
-    using itype = intrinsic_t<type>;
-
-public:
-    static constexpr auto name = const_name<type>();
-
-    type_caster_base() : type_caster_base(typeid(type)) {}
-    explicit type_caster_base(const std::type_info &info) : type_caster_generic(info) {}
-
-    static handle cast(const itype &src, return_value_policy policy, handle parent) {
-        if (policy == return_value_policy::automatic
-            || policy == return_value_policy::automatic_reference) {
-            policy = return_value_policy::copy;
-        }
-        return cast(&src, policy, parent);
-    }
-
-    static handle cast(itype &&src, return_value_policy, handle parent) {
-        return cast(&src, return_value_policy::move, parent);
-    }
-
-    // Returns a (pointer, type_info) pair taking care of necessary type lookup for a
-    // polymorphic type (using RTTI by default, but can be overridden by specializing
-    // polymorphic_type_hook). If the instance isn't derived, returns the base version.
-    static std::pair<const void *, const type_info *> src_and_type(const itype *src) {
-        const auto &cast_type = typeid(itype);
-        const std::type_info *instance_type = nullptr;
-        const void *vsrc = polymorphic_type_hook<itype>::get(src, instance_type);
-        if (instance_type && !same_type(cast_type, *instance_type)) {
-            // This is a base pointer to a derived type. If the derived type is registered
-            // with pybind11, we want to make the full derived object available.
-            // In the typical case where itype is polymorphic, we get the correct
-            // derived pointer (which may be != base pointer) by a dynamic_cast to
-            // most derived type. If itype is not polymorphic, we won't get here
-            // except via a user-provided specialization of polymorphic_type_hook,
-            // and the user has promised that no this-pointer adjustment is
-            // required in that case, so it's OK to use static_cast.
-            if (const auto *tpi = get_type_info(*instance_type)) {
-                return {vsrc, tpi};
-            }
-        }
-        // Otherwise we have either a nullptr, an `itype` pointer, or an unknown derived pointer,
-        // so don't do a cast
-        return type_caster_generic::src_and_type(src, cast_type, instance_type);
-    }
-
-    static handle cast(const itype *src, return_value_policy policy, handle parent) {
-        auto st = src_and_type(src);
-        return type_caster_generic::cast(st.first,
-                                         policy,
-                                         parent,
-                                         st.second,
-                                         make_copy_constructor(src),
-                                         make_move_constructor(src));
-    }
-
-    static handle cast_holder(const itype *src, const void *holder) {
-        auto st = src_and_type(src);
-        return type_caster_generic::cast(st.first,
-                                         return_value_policy::take_ownership,
-                                         {},
-                                         st.second,
-                                         nullptr,
-                                         nullptr,
-                                         holder);
-    }
-
-    template <typename T>
-    using cast_op_type = detail::cast_op_type<T>;
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator itype *() { return (type *) value; }
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator itype &() {
-        if (!value) {
-            throw reference_cast_error();
-        }
-        return *((itype *) value);
-    }
-
-protected:
-    using Constructor = void *(*) (const void *);
-
-    /* Only enabled when the types are {copy,move}-constructible *and* when the type
-       does not have a private operator new implementation. A comma operator is used in the
-       decltype argument to apply SFINAE to the public copy/move constructors.*/
-    template <typename T, typename = enable_if_t<is_copy_constructible<T>::value>>
-    static auto make_copy_constructor(const T *)
-        -> decltype(new T(std::declval<const T>()), Constructor{}) {
-        return [](const void *arg) -> void * { return new T(*reinterpret_cast<const T *>(arg)); };
-    }
-
-    template <typename T, typename = enable_if_t<std::is_move_constructible<T>::value>>
-    static auto make_move_constructor(const T *)
-        -> decltype(new T(std::declval<T &&>()), Constructor{}) {
-        return [](const void *arg) -> void * {
-            return new T(std::move(*const_cast<T *>(reinterpret_cast<const T *>(arg))));
-        };
-    }
-
-    static Constructor make_copy_constructor(...) { return nullptr; }
-    static Constructor make_move_constructor(...) { return nullptr; }
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/typeid.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/typeid.h
deleted file mode 100644
index a67b52135..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/detail/typeid.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-    pybind11/detail/typeid.h: Compiler-independent access to type identifiers
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include <cstdio>
-#include <cstdlib>
-
-#if defined(__GNUG__)
-#    include <cxxabi.h>
-#endif
-
-#include "common.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// Erase all occurrences of a substring
-inline void erase_all(std::string &string, const std::string &search) {
-    for (size_t pos = 0;;) {
-        pos = string.find(search, pos);
-        if (pos == std::string::npos) {
-            break;
-        }
-        string.erase(pos, search.length());
-    }
-}
-
-PYBIND11_NOINLINE void clean_type_id(std::string &name) {
-#if defined(__GNUG__)
-    int status = 0;
-    std::unique_ptr<char, void (*)(void *)> res{
-        abi::__cxa_demangle(name.c_str(), nullptr, nullptr, &status), std::free};
-    if (status == 0) {
-        name = res.get();
-    }
-#else
-    detail::erase_all(name, "class ");
-    detail::erase_all(name, "struct ");
-    detail::erase_all(name, "enum ");
-#endif
-    detail::erase_all(name, "pybind11::");
-}
-
-inline std::string clean_type_id(const char *typeid_name) {
-    std::string name(typeid_name);
-    detail::clean_type_id(name);
-    return name;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Return a string representation of a C++ type
-template <typename T>
-static std::string type_id() {
-    return detail::clean_type_id(typeid(T).name());
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/eigen.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/eigen.h
deleted file mode 100644
index 831625229..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/eigen.h
+++ /dev/null
@@ -1,713 +0,0 @@
-/*
-    pybind11/eigen.h: Transparent conversion for dense and sparse Eigen matrices
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-/* HINT: To suppress warnings originating from the Eigen headers, use -isystem.
-   See also:
-       https://stackoverflow.com/questions/2579576/i-dir-vs-isystem-dir
-       https://stackoverflow.com/questions/1741816/isystem-for-ms-visual-studio-c-compiler
-*/
-
-#include "numpy.h"
-
-// The C4127 suppression was introduced for Eigen 3.4.0. In theory we could
-// make it version specific, or even remove it later, but considering that
-// 1. C4127 is generally far more distracting than useful for modern template code, and
-// 2. we definitely want to ignore any MSVC warnings originating from Eigen code,
-//    it is probably best to keep this around indefinitely.
-#if defined(_MSC_VER)
-#    pragma warning(push)
-#    pragma warning(disable : 4127) // C4127: conditional expression is constant
-#    pragma warning(disable : 5054) // https://github.com/pybind/pybind11/pull/3741
-//       C5054: operator '&': deprecated between enumerations of different types
-#elif defined(__MINGW32__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-
-#include <Eigen/Core>
-#include <Eigen/SparseCore>
-
-#if defined(_MSC_VER)
-#    pragma warning(pop)
-#elif defined(__MINGW32__)
-#    pragma GCC diagnostic pop
-#endif
-
-// Eigen prior to 3.2.7 doesn't have proper move constructors--but worse, some classes get implicit
-// move constructors that break things.  We could detect this an explicitly copy, but an extra copy
-// of matrices seems highly undesirable.
-static_assert(EIGEN_VERSION_AT_LEAST(3, 2, 7),
-              "Eigen support in pybind11 requires Eigen >= 3.2.7");
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-// Provide a convenience alias for easier pass-by-ref usage with fully dynamic strides:
-using EigenDStride = Eigen::Stride<Eigen::Dynamic, Eigen::Dynamic>;
-template <typename MatrixType>
-using EigenDRef = Eigen::Ref<MatrixType, 0, EigenDStride>;
-template <typename MatrixType>
-using EigenDMap = Eigen::Map<MatrixType, 0, EigenDStride>;
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-#if EIGEN_VERSION_AT_LEAST(3, 3, 0)
-using EigenIndex = Eigen::Index;
-template <typename Scalar, int Flags, typename StorageIndex>
-using EigenMapSparseMatrix = Eigen::Map<Eigen::SparseMatrix<Scalar, Flags, StorageIndex>>;
-#else
-using EigenIndex = EIGEN_DEFAULT_DENSE_INDEX_TYPE;
-template <typename Scalar, int Flags, typename StorageIndex>
-using EigenMapSparseMatrix = Eigen::MappedSparseMatrix<Scalar, Flags, StorageIndex>;
-#endif
-
-// Matches Eigen::Map, Eigen::Ref, blocks, etc:
-template <typename T>
-using is_eigen_dense_map = all_of<is_template_base_of<Eigen::DenseBase, T>,
-                                  std::is_base_of<Eigen::MapBase<T, Eigen::ReadOnlyAccessors>, T>>;
-template <typename T>
-using is_eigen_mutable_map = std::is_base_of<Eigen::MapBase<T, Eigen::WriteAccessors>, T>;
-template <typename T>
-using is_eigen_dense_plain
-    = all_of<negation<is_eigen_dense_map<T>>, is_template_base_of<Eigen::PlainObjectBase, T>>;
-template <typename T>
-using is_eigen_sparse = is_template_base_of<Eigen::SparseMatrixBase, T>;
-// Test for objects inheriting from EigenBase<Derived> that aren't captured by the above.  This
-// basically covers anything that can be assigned to a dense matrix but that don't have a typical
-// matrix data layout that can be copied from their .data().  For example, DiagonalMatrix and
-// SelfAdjointView fall into this category.
-template <typename T>
-using is_eigen_other
-    = all_of<is_template_base_of<Eigen::EigenBase, T>,
-             negation<any_of<is_eigen_dense_map<T>, is_eigen_dense_plain<T>, is_eigen_sparse<T>>>>;
-
-// Captures numpy/eigen conformability status (returned by EigenProps::conformable()):
-template <bool EigenRowMajor>
-struct EigenConformable {
-    bool conformable = false;
-    EigenIndex rows = 0, cols = 0;
-    EigenDStride stride{0, 0};    // Only valid if negativestrides is false!
-    bool negativestrides = false; // If true, do not use stride!
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    EigenConformable(bool fits = false) : conformable{fits} {}
-    // Matrix type:
-    EigenConformable(EigenIndex r, EigenIndex c, EigenIndex rstride, EigenIndex cstride)
-        : conformable{true}, rows{r}, cols{c},
-          // TODO: when Eigen bug #747 is fixed, remove the tests for non-negativity.
-          // http://eigen.tuxfamily.org/bz/show_bug.cgi?id=747
-          stride{EigenRowMajor ? (rstride > 0 ? rstride : 0)
-                               : (cstride > 0 ? cstride : 0) /* outer stride */,
-                 EigenRowMajor ? (cstride > 0 ? cstride : 0)
-                               : (rstride > 0 ? rstride : 0) /* inner stride */},
-          negativestrides{rstride < 0 || cstride < 0} {}
-    // Vector type:
-    EigenConformable(EigenIndex r, EigenIndex c, EigenIndex stride)
-        : EigenConformable(r, c, r == 1 ? c * stride : stride, c == 1 ? r : r * stride) {}
-
-    template <typename props>
-    bool stride_compatible() const {
-        // To have compatible strides, we need (on both dimensions) one of fully dynamic strides,
-        // matching strides, or a dimension size of 1 (in which case the stride value is
-        // irrelevant). Alternatively, if any dimension size is 0, the strides are not relevant
-        // (and numpy ≥ 1.23 sets the strides to 0 in that case, so we need to check explicitly).
-        if (negativestrides) {
-            return false;
-        }
-        if (rows == 0 || cols == 0) {
-            return true;
-        }
-        return (props::inner_stride == Eigen::Dynamic || props::inner_stride == stride.inner()
-                || (EigenRowMajor ? cols : rows) == 1)
-               && (props::outer_stride == Eigen::Dynamic || props::outer_stride == stride.outer()
-                   || (EigenRowMajor ? rows : cols) == 1);
-    }
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator bool() const { return conformable; }
-};
-
-template <typename Type>
-struct eigen_extract_stride {
-    using type = Type;
-};
-template <typename PlainObjectType, int MapOptions, typename StrideType>
-struct eigen_extract_stride<Eigen::Map<PlainObjectType, MapOptions, StrideType>> {
-    using type = StrideType;
-};
-template <typename PlainObjectType, int Options, typename StrideType>
-struct eigen_extract_stride<Eigen::Ref<PlainObjectType, Options, StrideType>> {
-    using type = StrideType;
-};
-
-// Helper struct for extracting information from an Eigen type
-template <typename Type_>
-struct EigenProps {
-    using Type = Type_;
-    using Scalar = typename Type::Scalar;
-    using StrideType = typename eigen_extract_stride<Type>::type;
-    static constexpr EigenIndex rows = Type::RowsAtCompileTime, cols = Type::ColsAtCompileTime,
-                                size = Type::SizeAtCompileTime;
-    static constexpr bool row_major = Type::IsRowMajor,
-                          vector
-                          = Type::IsVectorAtCompileTime, // At least one dimension has fixed size 1
-        fixed_rows = rows != Eigen::Dynamic, fixed_cols = cols != Eigen::Dynamic,
-                          fixed = size != Eigen::Dynamic, // Fully-fixed size
-        dynamic = !fixed_rows && !fixed_cols;             // Fully-dynamic size
-
-    template <EigenIndex i, EigenIndex ifzero>
-    using if_zero = std::integral_constant<EigenIndex, i == 0 ? ifzero : i>;
-    static constexpr EigenIndex inner_stride
-        = if_zero<StrideType::InnerStrideAtCompileTime, 1>::value,
-        outer_stride = if_zero < StrideType::OuterStrideAtCompileTime,
-        vector      ? size
-        : row_major ? cols
-                    : rows > ::value;
-    static constexpr bool dynamic_stride
-        = inner_stride == Eigen::Dynamic && outer_stride == Eigen::Dynamic;
-    static constexpr bool requires_row_major
-        = !dynamic_stride && !vector && (row_major ? inner_stride : outer_stride) == 1;
-    static constexpr bool requires_col_major
-        = !dynamic_stride && !vector && (row_major ? outer_stride : inner_stride) == 1;
-
-    // Takes an input array and determines whether we can make it fit into the Eigen type.  If
-    // the array is a vector, we attempt to fit it into either an Eigen 1xN or Nx1 vector
-    // (preferring the latter if it will fit in either, i.e. for a fully dynamic matrix type).
-    static EigenConformable<row_major> conformable(const array &a) {
-        const auto dims = a.ndim();
-        if (dims < 1 || dims > 2) {
-            return false;
-        }
-
-        if (dims == 2) { // Matrix type: require exact match (or dynamic)
-
-            EigenIndex np_rows = a.shape(0), np_cols = a.shape(1),
-                       np_rstride = a.strides(0) / static_cast<ssize_t>(sizeof(Scalar)),
-                       np_cstride = a.strides(1) / static_cast<ssize_t>(sizeof(Scalar));
-            if ((PYBIND11_SILENCE_MSVC_C4127(fixed_rows) && np_rows != rows)
-                || (PYBIND11_SILENCE_MSVC_C4127(fixed_cols) && np_cols != cols)) {
-                return false;
-            }
-
-            return {np_rows, np_cols, np_rstride, np_cstride};
-        }
-
-        // Otherwise we're storing an n-vector.  Only one of the strides will be used, but
-        // whichever is used, we want the (single) numpy stride value.
-        const EigenIndex n = a.shape(0),
-                         stride = a.strides(0) / static_cast<ssize_t>(sizeof(Scalar));
-
-        if (vector) { // Eigen type is a compile-time vector
-            if (PYBIND11_SILENCE_MSVC_C4127(fixed) && size != n) {
-                return false; // Vector size mismatch
-            }
-            return {rows == 1 ? 1 : n, cols == 1 ? 1 : n, stride};
-        }
-        if (fixed) {
-            // The type has a fixed size, but is not a vector: abort
-            return false;
-        }
-        if (fixed_cols) {
-            // Since this isn't a vector, cols must be != 1.  We allow this only if it exactly
-            // equals the number of elements (rows is Dynamic, and so 1 row is allowed).
-            if (cols != n) {
-                return false;
-            }
-            return {1, n, stride};
-        } // Otherwise it's either fully dynamic, or column dynamic; both become a column vector
-        if (PYBIND11_SILENCE_MSVC_C4127(fixed_rows) && rows != n) {
-            return false;
-        }
-        return {n, 1, stride};
-    }
-
-    static constexpr bool show_writeable
-        = is_eigen_dense_map<Type>::value && is_eigen_mutable_map<Type>::value;
-    static constexpr bool show_order = is_eigen_dense_map<Type>::value;
-    static constexpr bool show_c_contiguous = show_order && requires_row_major;
-    static constexpr bool show_f_contiguous
-        = !show_c_contiguous && show_order && requires_col_major;
-
-    static constexpr auto descriptor
-        = const_name("numpy.ndarray[") + npy_format_descriptor<Scalar>::name + const_name("[")
-          + const_name<fixed_rows>(const_name<(size_t) rows>(), const_name("m")) + const_name(", ")
-          + const_name<fixed_cols>(const_name<(size_t) cols>(), const_name("n")) + const_name("]")
-          +
-          // For a reference type (e.g. Ref<MatrixXd>) we have other constraints that might need to
-          // be satisfied: writeable=True (for a mutable reference), and, depending on the map's
-          // stride options, possibly f_contiguous or c_contiguous.  We include them in the
-          // descriptor output to provide some hint as to why a TypeError is occurring (otherwise
-          // it can be confusing to see that a function accepts a 'numpy.ndarray[float64[3,2]]' and
-          // an error message that you *gave* a numpy.ndarray of the right type and dimensions.
-          const_name<show_writeable>(", flags.writeable", "")
-          + const_name<show_c_contiguous>(", flags.c_contiguous", "")
-          + const_name<show_f_contiguous>(", flags.f_contiguous", "") + const_name("]");
-};
-
-// Casts an Eigen type to numpy array.  If given a base, the numpy array references the src data,
-// otherwise it'll make a copy.  writeable lets you turn off the writeable flag for the array.
-template <typename props>
-handle
-eigen_array_cast(typename props::Type const &src, handle base = handle(), bool writeable = true) {
-    constexpr ssize_t elem_size = sizeof(typename props::Scalar);
-    array a;
-    if (props::vector) {
-        a = array({src.size()}, {elem_size * src.innerStride()}, src.data(), base);
-    } else {
-        a = array({src.rows(), src.cols()},
-                  {elem_size * src.rowStride(), elem_size * src.colStride()},
-                  src.data(),
-                  base);
-    }
-
-    if (!writeable) {
-        array_proxy(a.ptr())->flags &= ~detail::npy_api::NPY_ARRAY_WRITEABLE_;
-    }
-
-    return a.release();
-}
-
-// Takes an lvalue ref to some Eigen type and a (python) base object, creating a numpy array that
-// reference the Eigen object's data with `base` as the python-registered base class (if omitted,
-// the base will be set to None, and lifetime management is up to the caller).  The numpy array is
-// non-writeable if the given type is const.
-template <typename props, typename Type>
-handle eigen_ref_array(Type &src, handle parent = none()) {
-    // none here is to get past array's should-we-copy detection, which currently always
-    // copies when there is no base.  Setting the base to None should be harmless.
-    return eigen_array_cast<props>(src, parent, !std::is_const<Type>::value);
-}
-
-// Takes a pointer to some dense, plain Eigen type, builds a capsule around it, then returns a
-// numpy array that references the encapsulated data with a python-side reference to the capsule to
-// tie its destruction to that of any dependent python objects.  Const-ness is determined by
-// whether or not the Type of the pointer given is const.
-template <typename props, typename Type, typename = enable_if_t<is_eigen_dense_plain<Type>::value>>
-handle eigen_encapsulate(Type *src) {
-    capsule base(src, [](void *o) { delete static_cast<Type *>(o); });
-    return eigen_ref_array<props>(*src, base);
-}
-
-// Type caster for regular, dense matrix types (e.g. MatrixXd), but not maps/refs/etc. of dense
-// types.
-template <typename Type>
-struct type_caster<Type, enable_if_t<is_eigen_dense_plain<Type>::value>> {
-    using Scalar = typename Type::Scalar;
-    using props = EigenProps<Type>;
-
-    bool load(handle src, bool convert) {
-        // If we're in no-convert mode, only load if given an array of the correct type
-        if (!convert && !isinstance<array_t<Scalar>>(src)) {
-            return false;
-        }
-
-        // Coerce into an array, but don't do type conversion yet; the copy below handles it.
-        auto buf = array::ensure(src);
-
-        if (!buf) {
-            return false;
-        }
-
-        auto dims = buf.ndim();
-        if (dims < 1 || dims > 2) {
-            return false;
-        }
-
-        auto fits = props::conformable(buf);
-        if (!fits) {
-            return false;
-        }
-
-        // Allocate the new type, then build a numpy reference into it
-        value = Type(fits.rows, fits.cols);
-        auto ref = reinterpret_steal<array>(eigen_ref_array<props>(value));
-        if (dims == 1) {
-            ref = ref.squeeze();
-        } else if (ref.ndim() == 1) {
-            buf = buf.squeeze();
-        }
-
-        int result = detail::npy_api::get().PyArray_CopyInto_(ref.ptr(), buf.ptr());
-
-        if (result < 0) { // Copy failed!
-            PyErr_Clear();
-            return false;
-        }
-
-        return true;
-    }
-
-private:
-    // Cast implementation
-    template <typename CType>
-    static handle cast_impl(CType *src, return_value_policy policy, handle parent) {
-        switch (policy) {
-            case return_value_policy::take_ownership:
-            case return_value_policy::automatic:
-                return eigen_encapsulate<props>(src);
-            case return_value_policy::move:
-                return eigen_encapsulate<props>(new CType(std::move(*src)));
-            case return_value_policy::copy:
-                return eigen_array_cast<props>(*src);
-            case return_value_policy::reference:
-            case return_value_policy::automatic_reference:
-                return eigen_ref_array<props>(*src);
-            case return_value_policy::reference_internal:
-                return eigen_ref_array<props>(*src, parent);
-            default:
-                throw cast_error("unhandled return_value_policy: should not happen!");
-        };
-    }
-
-public:
-    // Normal returned non-reference, non-const value:
-    static handle cast(Type &&src, return_value_policy /* policy */, handle parent) {
-        return cast_impl(&src, return_value_policy::move, parent);
-    }
-    // If you return a non-reference const, we mark the numpy array readonly:
-    static handle cast(const Type &&src, return_value_policy /* policy */, handle parent) {
-        return cast_impl(&src, return_value_policy::move, parent);
-    }
-    // lvalue reference return; default (automatic) becomes copy
-    static handle cast(Type &src, return_value_policy policy, handle parent) {
-        if (policy == return_value_policy::automatic
-            || policy == return_value_policy::automatic_reference) {
-            policy = return_value_policy::copy;
-        }
-        return cast_impl(&src, policy, parent);
-    }
-    // const lvalue reference return; default (automatic) becomes copy
-    static handle cast(const Type &src, return_value_policy policy, handle parent) {
-        if (policy == return_value_policy::automatic
-            || policy == return_value_policy::automatic_reference) {
-            policy = return_value_policy::copy;
-        }
-        return cast(&src, policy, parent);
-    }
-    // non-const pointer return
-    static handle cast(Type *src, return_value_policy policy, handle parent) {
-        return cast_impl(src, policy, parent);
-    }
-    // const pointer return
-    static handle cast(const Type *src, return_value_policy policy, handle parent) {
-        return cast_impl(src, policy, parent);
-    }
-
-    static constexpr auto name = props::descriptor;
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator Type *() { return &value; }
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator Type &() { return value; }
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator Type &&() && { return std::move(value); }
-    template <typename T>
-    using cast_op_type = movable_cast_op_type<T>;
-
-private:
-    Type value;
-};
-
-// Base class for casting reference/map/block/etc. objects back to python.
-template <typename MapType>
-struct eigen_map_caster {
-private:
-    using props = EigenProps<MapType>;
-
-public:
-    // Directly referencing a ref/map's data is a bit dangerous (whatever the map/ref points to has
-    // to stay around), but we'll allow it under the assumption that you know what you're doing
-    // (and have an appropriate keep_alive in place).  We return a numpy array pointing directly at
-    // the ref's data (The numpy array ends up read-only if the ref was to a const matrix type.)
-    // Note that this means you need to ensure you don't destroy the object in some other way (e.g.
-    // with an appropriate keep_alive, or with a reference to a statically allocated matrix).
-    static handle cast(const MapType &src, return_value_policy policy, handle parent) {
-        switch (policy) {
-            case return_value_policy::copy:
-                return eigen_array_cast<props>(src);
-            case return_value_policy::reference_internal:
-                return eigen_array_cast<props>(src, parent, is_eigen_mutable_map<MapType>::value);
-            case return_value_policy::reference:
-            case return_value_policy::automatic:
-            case return_value_policy::automatic_reference:
-                return eigen_array_cast<props>(src, none(), is_eigen_mutable_map<MapType>::value);
-            default:
-                // move, take_ownership don't make any sense for a ref/map:
-                pybind11_fail("Invalid return_value_policy for Eigen Map/Ref/Block type");
-        }
-    }
-
-    static constexpr auto name = props::descriptor;
-
-    // Explicitly delete these: support python -> C++ conversion on these (i.e. these can be return
-    // types but not bound arguments).  We still provide them (with an explicitly delete) so that
-    // you end up here if you try anyway.
-    bool load(handle, bool) = delete;
-    operator MapType() = delete;
-    template <typename>
-    using cast_op_type = MapType;
-};
-
-// We can return any map-like object (but can only load Refs, specialized next):
-template <typename Type>
-struct type_caster<Type, enable_if_t<is_eigen_dense_map<Type>::value>> : eigen_map_caster<Type> {};
-
-// Loader for Ref<...> arguments.  See the documentation for info on how to make this work without
-// copying (it requires some extra effort in many cases).
-template <typename PlainObjectType, typename StrideType>
-struct type_caster<
-    Eigen::Ref<PlainObjectType, 0, StrideType>,
-    enable_if_t<is_eigen_dense_map<Eigen::Ref<PlainObjectType, 0, StrideType>>::value>>
-    : public eigen_map_caster<Eigen::Ref<PlainObjectType, 0, StrideType>> {
-private:
-    using Type = Eigen::Ref<PlainObjectType, 0, StrideType>;
-    using props = EigenProps<Type>;
-    using Scalar = typename props::Scalar;
-    using MapType = Eigen::Map<PlainObjectType, 0, StrideType>;
-    using Array
-        = array_t<Scalar,
-                  array::forcecast
-                      | ((props::row_major ? props::inner_stride : props::outer_stride) == 1
-                             ? array::c_style
-                         : (props::row_major ? props::outer_stride : props::inner_stride) == 1
-                             ? array::f_style
-                             : 0)>;
-    static constexpr bool need_writeable = is_eigen_mutable_map<Type>::value;
-    // Delay construction (these have no default constructor)
-    std::unique_ptr<MapType> map;
-    std::unique_ptr<Type> ref;
-    // Our array.  When possible, this is just a numpy array pointing to the source data, but
-    // sometimes we can't avoid copying (e.g. input is not a numpy array at all, has an
-    // incompatible layout, or is an array of a type that needs to be converted).  Using a numpy
-    // temporary (rather than an Eigen temporary) saves an extra copy when we need both type
-    // conversion and storage order conversion.  (Note that we refuse to use this temporary copy
-    // when loading an argument for a Ref<M> with M non-const, i.e. a read-write reference).
-    Array copy_or_ref;
-
-public:
-    bool load(handle src, bool convert) {
-        // First check whether what we have is already an array of the right type.  If not, we
-        // can't avoid a copy (because the copy is also going to do type conversion).
-        bool need_copy = !isinstance<Array>(src);
-
-        EigenConformable<props::row_major> fits;
-        if (!need_copy) {
-            // We don't need a converting copy, but we also need to check whether the strides are
-            // compatible with the Ref's stride requirements
-            auto aref = reinterpret_borrow<Array>(src);
-
-            if (aref && (!need_writeable || aref.writeable())) {
-                fits = props::conformable(aref);
-                if (!fits) {
-                    return false; // Incompatible dimensions
-                }
-                if (!fits.template stride_compatible<props>()) {
-                    need_copy = true;
-                } else {
-                    copy_or_ref = std::move(aref);
-                }
-            } else {
-                need_copy = true;
-            }
-        }
-
-        if (need_copy) {
-            // We need to copy: If we need a mutable reference, or we're not supposed to convert
-            // (either because we're in the no-convert overload pass, or because we're explicitly
-            // instructed not to copy (via `py::arg().noconvert()`) we have to fail loading.
-            if (!convert || need_writeable) {
-                return false;
-            }
-
-            Array copy = Array::ensure(src);
-            if (!copy) {
-                return false;
-            }
-            fits = props::conformable(copy);
-            if (!fits || !fits.template stride_compatible<props>()) {
-                return false;
-            }
-            copy_or_ref = std::move(copy);
-            loader_life_support::add_patient(copy_or_ref);
-        }
-
-        ref.reset();
-        map.reset(new MapType(data(copy_or_ref),
-                              fits.rows,
-                              fits.cols,
-                              make_stride(fits.stride.outer(), fits.stride.inner())));
-        ref.reset(new Type(*map));
-
-        return true;
-    }
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator Type *() { return ref.get(); }
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator Type &() { return *ref; }
-    template <typename _T>
-    using cast_op_type = pybind11::detail::cast_op_type<_T>;
-
-private:
-    template <typename T = Type, enable_if_t<is_eigen_mutable_map<T>::value, int> = 0>
-    Scalar *data(Array &a) {
-        return a.mutable_data();
-    }
-
-    template <typename T = Type, enable_if_t<!is_eigen_mutable_map<T>::value, int> = 0>
-    const Scalar *data(Array &a) {
-        return a.data();
-    }
-
-    // Attempt to figure out a constructor of `Stride` that will work.
-    // If both strides are fixed, use a default constructor:
-    template <typename S>
-    using stride_ctor_default = bool_constant<S::InnerStrideAtCompileTime != Eigen::Dynamic
-                                              && S::OuterStrideAtCompileTime != Eigen::Dynamic
-                                              && std::is_default_constructible<S>::value>;
-    // Otherwise, if there is a two-index constructor, assume it is (outer,inner) like
-    // Eigen::Stride, and use it:
-    template <typename S>
-    using stride_ctor_dual
-        = bool_constant<!stride_ctor_default<S>::value
-                        && std::is_constructible<S, EigenIndex, EigenIndex>::value>;
-    // Otherwise, if there is a one-index constructor, and just one of the strides is dynamic, use
-    // it (passing whichever stride is dynamic).
-    template <typename S>
-    using stride_ctor_outer
-        = bool_constant<!any_of<stride_ctor_default<S>, stride_ctor_dual<S>>::value
-                        && S::OuterStrideAtCompileTime == Eigen::Dynamic
-                        && S::InnerStrideAtCompileTime != Eigen::Dynamic
-                        && std::is_constructible<S, EigenIndex>::value>;
-    template <typename S>
-    using stride_ctor_inner
-        = bool_constant<!any_of<stride_ctor_default<S>, stride_ctor_dual<S>>::value
-                        && S::InnerStrideAtCompileTime == Eigen::Dynamic
-                        && S::OuterStrideAtCompileTime != Eigen::Dynamic
-                        && std::is_constructible<S, EigenIndex>::value>;
-
-    template <typename S = StrideType, enable_if_t<stride_ctor_default<S>::value, int> = 0>
-    static S make_stride(EigenIndex, EigenIndex) {
-        return S();
-    }
-    template <typename S = StrideType, enable_if_t<stride_ctor_dual<S>::value, int> = 0>
-    static S make_stride(EigenIndex outer, EigenIndex inner) {
-        return S(outer, inner);
-    }
-    template <typename S = StrideType, enable_if_t<stride_ctor_outer<S>::value, int> = 0>
-    static S make_stride(EigenIndex outer, EigenIndex) {
-        return S(outer);
-    }
-    template <typename S = StrideType, enable_if_t<stride_ctor_inner<S>::value, int> = 0>
-    static S make_stride(EigenIndex, EigenIndex inner) {
-        return S(inner);
-    }
-};
-
-// type_caster for special matrix types (e.g. DiagonalMatrix), which are EigenBase, but not
-// EigenDense (i.e. they don't have a data(), at least not with the usual matrix layout).
-// load() is not supported, but we can cast them into the python domain by first copying to a
-// regular Eigen::Matrix, then casting that.
-template <typename Type>
-struct type_caster<Type, enable_if_t<is_eigen_other<Type>::value>> {
-protected:
-    using Matrix
-        = Eigen::Matrix<typename Type::Scalar, Type::RowsAtCompileTime, Type::ColsAtCompileTime>;
-    using props = EigenProps<Matrix>;
-
-public:
-    static handle cast(const Type &src, return_value_policy /* policy */, handle /* parent */) {
-        handle h = eigen_encapsulate<props>(new Matrix(src));
-        return h;
-    }
-    static handle cast(const Type *src, return_value_policy policy, handle parent) {
-        return cast(*src, policy, parent);
-    }
-
-    static constexpr auto name = props::descriptor;
-
-    // Explicitly delete these: support python -> C++ conversion on these (i.e. these can be return
-    // types but not bound arguments).  We still provide them (with an explicitly delete) so that
-    // you end up here if you try anyway.
-    bool load(handle, bool) = delete;
-    operator Type() = delete;
-    template <typename>
-    using cast_op_type = Type;
-};
-
-template <typename Type>
-struct type_caster<Type, enable_if_t<is_eigen_sparse<Type>::value>> {
-    using Scalar = typename Type::Scalar;
-    using StorageIndex = remove_reference_t<decltype(*std::declval<Type>().outerIndexPtr())>;
-    using Index = typename Type::Index;
-    static constexpr bool rowMajor = Type::IsRowMajor;
-
-    bool load(handle src, bool) {
-        if (!src) {
-            return false;
-        }
-
-        auto obj = reinterpret_borrow<object>(src);
-        object sparse_module = module_::import("scipy.sparse");
-        object matrix_type = sparse_module.attr(rowMajor ? "csr_matrix" : "csc_matrix");
-
-        if (!type::handle_of(obj).is(matrix_type)) {
-            try {
-                obj = matrix_type(obj);
-            } catch (const error_already_set &) {
-                return false;
-            }
-        }
-
-        auto values = array_t<Scalar>((object) obj.attr("data"));
-        auto innerIndices = array_t<StorageIndex>((object) obj.attr("indices"));
-        auto outerIndices = array_t<StorageIndex>((object) obj.attr("indptr"));
-        auto shape = pybind11::tuple((pybind11::object) obj.attr("shape"));
-        auto nnz = obj.attr("nnz").cast<Index>();
-
-        if (!values || !innerIndices || !outerIndices) {
-            return false;
-        }
-
-        value = EigenMapSparseMatrix<Scalar,
-                                     Type::Flags &(Eigen::RowMajor | Eigen::ColMajor),
-                                     StorageIndex>(shape[0].cast<Index>(),
-                                                   shape[1].cast<Index>(),
-                                                   std::move(nnz),
-                                                   outerIndices.mutable_data(),
-                                                   innerIndices.mutable_data(),
-                                                   values.mutable_data());
-
-        return true;
-    }
-
-    static handle cast(const Type &src, return_value_policy /* policy */, handle /* parent */) {
-        const_cast<Type &>(src).makeCompressed();
-
-        object matrix_type
-            = module_::import("scipy.sparse").attr(rowMajor ? "csr_matrix" : "csc_matrix");
-
-        array data(src.nonZeros(), src.valuePtr());
-        array outerIndices((rowMajor ? src.rows() : src.cols()) + 1, src.outerIndexPtr());
-        array innerIndices(src.nonZeros(), src.innerIndexPtr());
-
-        return matrix_type(pybind11::make_tuple(
-                               std::move(data), std::move(innerIndices), std::move(outerIndices)),
-                           pybind11::make_tuple(src.rows(), src.cols()))
-            .release();
-    }
-
-    PYBIND11_TYPE_CASTER(Type,
-                         const_name<(Type::IsRowMajor) != 0>("scipy.sparse.csr_matrix[",
-                                                             "scipy.sparse.csc_matrix[")
-                             + npy_format_descriptor<Scalar>::name + const_name("]"));
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/embed.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/embed.h
deleted file mode 100644
index d6999cd77..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/embed.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-    pybind11/embed.h: Support for embedding the interpreter
-
-    Copyright (c) 2017 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-#include "eval.h"
-
-#include <memory>
-#include <vector>
-
-#if defined(PYPY_VERSION)
-#    error Embedding the interpreter is not supported with PyPy
-#endif
-
-#define PYBIND11_EMBEDDED_MODULE_IMPL(name)                                                       \
-    extern "C" PyObject *pybind11_init_impl_##name();                                             \
-    extern "C" PyObject *pybind11_init_impl_##name() { return pybind11_init_wrapper_##name(); }
-
-/** \rst
-    Add a new module to the table of builtins for the interpreter. Must be
-    defined in global scope. The first macro parameter is the name of the
-    module (without quotes). The second parameter is the variable which will
-    be used as the interface to add functions and classes to the module.
-
-    .. code-block:: cpp
-
-        PYBIND11_EMBEDDED_MODULE(example, m) {
-            // ... initialize functions and classes here
-            m.def("foo", []() {
-                return "Hello, World!";
-            });
-        }
- \endrst */
-#define PYBIND11_EMBEDDED_MODULE(name, variable)                                                  \
-    static ::pybind11::module_::module_def PYBIND11_CONCAT(pybind11_module_def_, name);           \
-    static void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_ &);                     \
-    static PyObject PYBIND11_CONCAT(*pybind11_init_wrapper_, name)() {                            \
-        auto m = ::pybind11::module_::create_extension_module(                                    \
-            PYBIND11_TOSTRING(name), nullptr, &PYBIND11_CONCAT(pybind11_module_def_, name));      \
-        try {                                                                                     \
-            PYBIND11_CONCAT(pybind11_init_, name)(m);                                             \
-            return m.ptr();                                                                       \
-        }                                                                                         \
-        PYBIND11_CATCH_INIT_EXCEPTIONS                                                            \
-    }                                                                                             \
-    PYBIND11_EMBEDDED_MODULE_IMPL(name)                                                           \
-    ::pybind11::detail::embedded_module PYBIND11_CONCAT(pybind11_module_, name)(                  \
-        PYBIND11_TOSTRING(name), PYBIND11_CONCAT(pybind11_init_impl_, name));                     \
-    void PYBIND11_CONCAT(pybind11_init_, name)(::pybind11::module_                                \
-                                               & variable) // NOLINT(bugprone-macro-parentheses)
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// Python 2.7/3.x compatible version of `PyImport_AppendInittab` and error checks.
-struct embedded_module {
-    using init_t = PyObject *(*) ();
-    embedded_module(const char *name, init_t init) {
-        if (Py_IsInitialized() != 0) {
-            pybind11_fail("Can't add new modules after the interpreter has been initialized");
-        }
-
-        auto result = PyImport_AppendInittab(name, init);
-        if (result == -1) {
-            pybind11_fail("Insufficient memory to add a new module");
-        }
-    }
-};
-
-struct wide_char_arg_deleter {
-    void operator()(wchar_t *ptr) const {
-        // API docs: https://docs.python.org/3/c-api/sys.html#c.Py_DecodeLocale
-        PyMem_RawFree(ptr);
-    }
-};
-
-inline wchar_t *widen_chars(const char *safe_arg) {
-    wchar_t *widened_arg = Py_DecodeLocale(safe_arg, nullptr);
-    return widened_arg;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/** \rst
-    Initialize the Python interpreter. No other pybind11 or CPython API functions can be
-    called before this is done; with the exception of `PYBIND11_EMBEDDED_MODULE`. The
-    optional `init_signal_handlers` parameter can be used to skip the registration of
-    signal handlers (see the `Python documentation`_ for details). Calling this function
-    again after the interpreter has already been initialized is a fatal error.
-
-    If initializing the Python interpreter fails, then the program is terminated.  (This
-    is controlled by the CPython runtime and is an exception to pybind11's normal behavior
-    of throwing exceptions on errors.)
-
-    The remaining optional parameters, `argc`, `argv`, and `add_program_dir_to_path` are
-    used to populate ``sys.argv`` and ``sys.path``.
-    See the |PySys_SetArgvEx documentation|_ for details.
-
-    .. _Python documentation: https://docs.python.org/3/c-api/init.html#c.Py_InitializeEx
-    .. |PySys_SetArgvEx documentation| replace:: ``PySys_SetArgvEx`` documentation
-    .. _PySys_SetArgvEx documentation: https://docs.python.org/3/c-api/init.html#c.PySys_SetArgvEx
- \endrst */
-inline void initialize_interpreter(bool init_signal_handlers = true,
-                                   int argc = 0,
-                                   const char *const *argv = nullptr,
-                                   bool add_program_dir_to_path = true) {
-    if (Py_IsInitialized() != 0) {
-        pybind11_fail("The interpreter is already running");
-    }
-
-#if PY_VERSION_HEX < 0x030B0000
-
-    Py_InitializeEx(init_signal_handlers ? 1 : 0);
-
-    // Before it was special-cased in python 3.8, passing an empty or null argv
-    // caused a segfault, so we have to reimplement the special case ourselves.
-    bool special_case = (argv == nullptr || argc <= 0);
-
-    const char *const empty_argv[]{"\0"};
-    const char *const *safe_argv = special_case ? empty_argv : argv;
-    if (special_case) {
-        argc = 1;
-    }
-
-    auto argv_size = static_cast<size_t>(argc);
-    // SetArgv* on python 3 takes wchar_t, so we have to convert.
-    std::unique_ptr<wchar_t *[]> widened_argv(new wchar_t *[argv_size]);
-    std::vector<std::unique_ptr<wchar_t[], detail::wide_char_arg_deleter>> widened_argv_entries;
-    widened_argv_entries.reserve(argv_size);
-    for (size_t ii = 0; ii < argv_size; ++ii) {
-        widened_argv_entries.emplace_back(detail::widen_chars(safe_argv[ii]));
-        if (!widened_argv_entries.back()) {
-            // A null here indicates a character-encoding failure or the python
-            // interpreter out of memory. Give up.
-            return;
-        }
-        widened_argv[ii] = widened_argv_entries.back().get();
-    }
-
-    auto *pysys_argv = widened_argv.get();
-
-    PySys_SetArgvEx(argc, pysys_argv, static_cast<int>(add_program_dir_to_path));
-#else
-    PyConfig config;
-    PyConfig_InitIsolatedConfig(&config);
-    config.install_signal_handlers = init_signal_handlers ? 1 : 0;
-
-    PyStatus status = PyConfig_SetBytesArgv(&config, argc, const_cast<char *const *>(argv));
-    if (PyStatus_Exception(status)) {
-        // A failure here indicates a character-encoding failure or the python
-        // interpreter out of memory. Give up.
-        PyConfig_Clear(&config);
-        throw std::runtime_error(PyStatus_IsError(status) ? status.err_msg
-                                                          : "Failed to prepare CPython");
-    }
-    status = Py_InitializeFromConfig(&config);
-    PyConfig_Clear(&config);
-    if (PyStatus_Exception(status)) {
-        throw std::runtime_error(PyStatus_IsError(status) ? status.err_msg
-                                                          : "Failed to init CPython");
-    }
-    if (add_program_dir_to_path) {
-        PyRun_SimpleString("import sys, os.path; "
-                           "sys.path.insert(0, "
-                           "os.path.abspath(os.path.dirname(sys.argv[0])) "
-                           "if sys.argv and os.path.exists(sys.argv[0]) else '')");
-    }
-#endif
-}
-
-/** \rst
-    Shut down the Python interpreter. No pybind11 or CPython API functions can be called
-    after this. In addition, pybind11 objects must not outlive the interpreter:
-
-    .. code-block:: cpp
-
-        { // BAD
-            py::initialize_interpreter();
-            auto hello = py::str("Hello, World!");
-            py::finalize_interpreter();
-        } // <-- BOOM, hello's destructor is called after interpreter shutdown
-
-        { // GOOD
-            py::initialize_interpreter();
-            { // scoped
-                auto hello = py::str("Hello, World!");
-            } // <-- OK, hello is cleaned up properly
-            py::finalize_interpreter();
-        }
-
-        { // BETTER
-            py::scoped_interpreter guard{};
-            auto hello = py::str("Hello, World!");
-        }
-
-    .. warning::
-
-        The interpreter can be restarted by calling `initialize_interpreter` again.
-        Modules created using pybind11 can be safely re-initialized. However, Python
-        itself cannot completely unload binary extension modules and there are several
-        caveats with regard to interpreter restarting. All the details can be found
-        in the CPython documentation. In short, not all interpreter memory may be
-        freed, either due to reference cycles or user-created global data.
-
- \endrst */
-inline void finalize_interpreter() {
-    handle builtins(PyEval_GetBuiltins());
-    const char *id = PYBIND11_INTERNALS_ID;
-
-    // Get the internals pointer (without creating it if it doesn't exist).  It's possible for the
-    // internals to be created during Py_Finalize() (e.g. if a py::capsule calls `get_internals()`
-    // during destruction), so we get the pointer-pointer here and check it after Py_Finalize().
-    detail::internals **internals_ptr_ptr = detail::get_internals_pp();
-    // It could also be stashed in builtins, so look there too:
-    if (builtins.contains(id) && isinstance<capsule>(builtins[id])) {
-        internals_ptr_ptr = capsule(builtins[id]);
-    }
-    // Local internals contains data managed by the current interpreter, so we must clear them to
-    // avoid undefined behaviors when initializing another interpreter
-    detail::get_local_internals().registered_types_cpp.clear();
-    detail::get_local_internals().registered_exception_translators.clear();
-
-    Py_Finalize();
-
-    if (internals_ptr_ptr) {
-        delete *internals_ptr_ptr;
-        *internals_ptr_ptr = nullptr;
-    }
-}
-
-/** \rst
-    Scope guard version of `initialize_interpreter` and `finalize_interpreter`.
-    This a move-only guard and only a single instance can exist.
-
-    See `initialize_interpreter` for a discussion of its constructor arguments.
-
-    .. code-block:: cpp
-
-        #include <pybind11/embed.h>
-
-        int main() {
-            py::scoped_interpreter guard{};
-            py::print(Hello, World!);
-        } // <-- interpreter shutdown
- \endrst */
-class scoped_interpreter {
-public:
-    explicit scoped_interpreter(bool init_signal_handlers = true,
-                                int argc = 0,
-                                const char *const *argv = nullptr,
-                                bool add_program_dir_to_path = true) {
-        initialize_interpreter(init_signal_handlers, argc, argv, add_program_dir_to_path);
-    }
-
-    scoped_interpreter(const scoped_interpreter &) = delete;
-    scoped_interpreter(scoped_interpreter &&other) noexcept { other.is_valid = false; }
-    scoped_interpreter &operator=(const scoped_interpreter &) = delete;
-    scoped_interpreter &operator=(scoped_interpreter &&) = delete;
-
-    ~scoped_interpreter() {
-        if (is_valid) {
-            finalize_interpreter();
-        }
-    }
-
-private:
-    bool is_valid = true;
-};
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/eval.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/eval.h
deleted file mode 100644
index bd5f981f5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/eval.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-    pybind11/eval.h: Support for evaluating Python expressions and statements
-    from strings and files
-
-    Copyright (c) 2016 Klemens Morgenstern <klemens.morgenstern@ed-chemnitz.de> and
-                       Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-#include <utility>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-inline void ensure_builtins_in_globals(object &global) {
-#if defined(PYPY_VERSION) || PY_VERSION_HEX < 0x03080000
-    // Running exec and eval adds `builtins` module under `__builtins__` key to
-    // globals if not yet present.  Python 3.8 made PyRun_String behave
-    // similarly. Let's also do that for older versions, for consistency. This
-    // was missing from PyPy3.8 7.3.7.
-    if (!global.contains("__builtins__"))
-        global["__builtins__"] = module_::import(PYBIND11_BUILTINS_MODULE);
-#else
-    (void) global;
-#endif
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-enum eval_mode {
-    /// Evaluate a string containing an isolated expression
-    eval_expr,
-
-    /// Evaluate a string containing a single statement. Returns \c none
-    eval_single_statement,
-
-    /// Evaluate a string containing a sequence of statement. Returns \c none
-    eval_statements
-};
-
-template <eval_mode mode = eval_expr>
-object eval(const str &expr, object global = globals(), object local = object()) {
-    if (!local) {
-        local = global;
-    }
-
-    detail::ensure_builtins_in_globals(global);
-
-    /* PyRun_String does not accept a PyObject / encoding specifier,
-       this seems to be the only alternative */
-    std::string buffer = "# -*- coding: utf-8 -*-\n" + (std::string) expr;
-
-    int start = 0;
-    switch (mode) {
-        case eval_expr:
-            start = Py_eval_input;
-            break;
-        case eval_single_statement:
-            start = Py_single_input;
-            break;
-        case eval_statements:
-            start = Py_file_input;
-            break;
-        default:
-            pybind11_fail("invalid evaluation mode");
-    }
-
-    PyObject *result = PyRun_String(buffer.c_str(), start, global.ptr(), local.ptr());
-    if (!result) {
-        throw error_already_set();
-    }
-    return reinterpret_steal<object>(result);
-}
-
-template <eval_mode mode = eval_expr, size_t N>
-object eval(const char (&s)[N], object global = globals(), object local = object()) {
-    /* Support raw string literals by removing common leading whitespace */
-    auto expr = (s[0] == '\n') ? str(module_::import("textwrap").attr("dedent")(s)) : str(s);
-    return eval<mode>(expr, std::move(global), std::move(local));
-}
-
-inline void exec(const str &expr, object global = globals(), object local = object()) {
-    eval<eval_statements>(expr, std::move(global), std::move(local));
-}
-
-template <size_t N>
-void exec(const char (&s)[N], object global = globals(), object local = object()) {
-    eval<eval_statements>(s, std::move(global), std::move(local));
-}
-
-#if defined(PYPY_VERSION)
-template <eval_mode mode = eval_statements>
-object eval_file(str, object, object) {
-    pybind11_fail("eval_file not supported in PyPy3. Use eval");
-}
-template <eval_mode mode = eval_statements>
-object eval_file(str, object) {
-    pybind11_fail("eval_file not supported in PyPy3. Use eval");
-}
-template <eval_mode mode = eval_statements>
-object eval_file(str) {
-    pybind11_fail("eval_file not supported in PyPy3. Use eval");
-}
-#else
-template <eval_mode mode = eval_statements>
-object eval_file(str fname, object global = globals(), object local = object()) {
-    if (!local) {
-        local = global;
-    }
-
-    detail::ensure_builtins_in_globals(global);
-
-    int start = 0;
-    switch (mode) {
-        case eval_expr:
-            start = Py_eval_input;
-            break;
-        case eval_single_statement:
-            start = Py_single_input;
-            break;
-        case eval_statements:
-            start = Py_file_input;
-            break;
-        default:
-            pybind11_fail("invalid evaluation mode");
-    }
-
-    int closeFile = 1;
-    std::string fname_str = (std::string) fname;
-    FILE *f = _Py_fopen_obj(fname.ptr(), "r");
-    if (!f) {
-        PyErr_Clear();
-        pybind11_fail("File \"" + fname_str + "\" could not be opened!");
-    }
-
-    if (!global.contains("__file__")) {
-        global["__file__"] = std::move(fname);
-    }
-
-    PyObject *result
-        = PyRun_FileEx(f, fname_str.c_str(), start, global.ptr(), local.ptr(), closeFile);
-
-    if (!result) {
-        throw error_already_set();
-    }
-    return reinterpret_steal<object>(result);
-}
-#endif
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/functional.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/functional.h
deleted file mode 100644
index 4034990d8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/functional.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-    pybind11/functional.h: std::function<> support
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-#include <functional>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename Return, typename... Args>
-struct type_caster<std::function<Return(Args...)>> {
-    using type = std::function<Return(Args...)>;
-    using retval_type = conditional_t<std::is_same<Return, void>::value, void_type, Return>;
-    using function_type = Return (*)(Args...);
-
-public:
-    bool load(handle src, bool convert) {
-        if (src.is_none()) {
-            // Defer accepting None to other overloads (if we aren't in convert mode):
-            if (!convert) {
-                return false;
-            }
-            return true;
-        }
-
-        if (!isinstance<function>(src)) {
-            return false;
-        }
-
-        auto func = reinterpret_borrow<function>(src);
-
-        /*
-           When passing a C++ function as an argument to another C++
-           function via Python, every function call would normally involve
-           a full C++ -> Python -> C++ roundtrip, which can be prohibitive.
-           Here, we try to at least detect the case where the function is
-           stateless (i.e. function pointer or lambda function without
-           captured variables), in which case the roundtrip can be avoided.
-         */
-        if (auto cfunc = func.cpp_function()) {
-            auto *cfunc_self = PyCFunction_GET_SELF(cfunc.ptr());
-            if (isinstance<capsule>(cfunc_self)) {
-                auto c = reinterpret_borrow<capsule>(cfunc_self);
-                auto *rec = (function_record *) c;
-
-                while (rec != nullptr) {
-                    if (rec->is_stateless
-                        && same_type(typeid(function_type),
-                                     *reinterpret_cast<const std::type_info *>(rec->data[1]))) {
-                        struct capture {
-                            function_type f;
-                        };
-                        value = ((capture *) &rec->data)->f;
-                        return true;
-                    }
-                    rec = rec->next;
-                }
-            }
-            // PYPY segfaults here when passing builtin function like sum.
-            // Raising an fail exception here works to prevent the segfault, but only on gcc.
-            // See PR #1413 for full details
-        }
-
-        // ensure GIL is held during functor destruction
-        struct func_handle {
-            function f;
-#if !(defined(_MSC_VER) && _MSC_VER == 1916 && defined(PYBIND11_CPP17))
-            // This triggers a syntax error under very special conditions (very weird indeed).
-            explicit
-#endif
-                func_handle(function &&f_) noexcept
-                : f(std::move(f_)) {
-            }
-            func_handle(const func_handle &f_) { operator=(f_); }
-            func_handle &operator=(const func_handle &f_) {
-                gil_scoped_acquire acq;
-                f = f_.f;
-                return *this;
-            }
-            ~func_handle() {
-                gil_scoped_acquire acq;
-                function kill_f(std::move(f));
-            }
-        };
-
-        // to emulate 'move initialization capture' in C++11
-        struct func_wrapper {
-            func_handle hfunc;
-            explicit func_wrapper(func_handle &&hf) noexcept : hfunc(std::move(hf)) {}
-            Return operator()(Args... args) const {
-                gil_scoped_acquire acq;
-                // casts the returned object as a rvalue to the return type
-                return hfunc.f(std::forward<Args>(args)...).template cast<Return>();
-            }
-        };
-
-        value = func_wrapper(func_handle(std::move(func)));
-        return true;
-    }
-
-    template <typename Func>
-    static handle cast(Func &&f_, return_value_policy policy, handle /* parent */) {
-        if (!f_) {
-            return none().inc_ref();
-        }
-
-        auto result = f_.template target<function_type>();
-        if (result) {
-            return cpp_function(*result, policy).release();
-        }
-        return cpp_function(std::forward<Func>(f_), policy).release();
-    }
-
-    PYBIND11_TYPE_CASTER(type,
-                         const_name("Callable[[") + concat(make_caster<Args>::name...)
-                             + const_name("], ") + make_caster<retval_type>::name
-                             + const_name("]"));
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/gil.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/gil.h
deleted file mode 100644
index a0b5de151..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/gil.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-    pybind11/gil.h: RAII helpers for managing the GIL
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-#include "detail/internals.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// forward declarations
-PyThreadState *get_thread_state_unchecked();
-
-PYBIND11_NAMESPACE_END(detail)
-
-#if defined(WITH_THREAD) && !defined(PYPY_VERSION)
-
-/* The functions below essentially reproduce the PyGILState_* API using a RAII
- * pattern, but there are a few important differences:
- *
- * 1. When acquiring the GIL from an non-main thread during the finalization
- *    phase, the GILState API blindly terminates the calling thread, which
- *    is often not what is wanted. This API does not do this.
- *
- * 2. The gil_scoped_release function can optionally cut the relationship
- *    of a PyThreadState and its associated thread, which allows moving it to
- *    another thread (this is a fairly rare/advanced use case).
- *
- * 3. The reference count of an acquired thread state can be controlled. This
- *    can be handy to prevent cases where callbacks issued from an external
- *    thread would otherwise constantly construct and destroy thread state data
- *    structures.
- *
- * See the Python bindings of NanoGUI (http://github.com/wjakob/nanogui) for an
- * example which uses features 2 and 3 to migrate the Python thread of
- * execution to another thread (to run the event loop on the original thread,
- * in this case).
- */
-
-class gil_scoped_acquire {
-public:
-    PYBIND11_NOINLINE gil_scoped_acquire() {
-        auto &internals = detail::get_internals();
-        tstate = (PyThreadState *) PYBIND11_TLS_GET_VALUE(internals.tstate);
-
-        if (!tstate) {
-            /* Check if the GIL was acquired using the PyGILState_* API instead (e.g. if
-               calling from a Python thread). Since we use a different key, this ensures
-               we don't create a new thread state and deadlock in PyEval_AcquireThread
-               below. Note we don't save this state with internals.tstate, since we don't
-               create it we would fail to clear it (its reference count should be > 0). */
-            tstate = PyGILState_GetThisThreadState();
-        }
-
-        if (!tstate) {
-            tstate = PyThreadState_New(internals.istate);
-#    if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-            if (!tstate) {
-                pybind11_fail("scoped_acquire: could not create thread state!");
-            }
-#    endif
-            tstate->gilstate_counter = 0;
-            PYBIND11_TLS_REPLACE_VALUE(internals.tstate, tstate);
-        } else {
-            release = detail::get_thread_state_unchecked() != tstate;
-        }
-
-        if (release) {
-            PyEval_AcquireThread(tstate);
-        }
-
-        inc_ref();
-    }
-
-    void inc_ref() { ++tstate->gilstate_counter; }
-
-    PYBIND11_NOINLINE void dec_ref() {
-        --tstate->gilstate_counter;
-#    if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-        if (detail::get_thread_state_unchecked() != tstate) {
-            pybind11_fail("scoped_acquire::dec_ref(): thread state must be current!");
-        }
-        if (tstate->gilstate_counter < 0) {
-            pybind11_fail("scoped_acquire::dec_ref(): reference count underflow!");
-        }
-#    endif
-        if (tstate->gilstate_counter == 0) {
-#    if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-            if (!release) {
-                pybind11_fail("scoped_acquire::dec_ref(): internal error!");
-            }
-#    endif
-            PyThreadState_Clear(tstate);
-            if (active) {
-                PyThreadState_DeleteCurrent();
-            }
-            PYBIND11_TLS_DELETE_VALUE(detail::get_internals().tstate);
-            release = false;
-        }
-    }
-
-    /// This method will disable the PyThreadState_DeleteCurrent call and the
-    /// GIL won't be acquired. This method should be used if the interpreter
-    /// could be shutting down when this is called, as thread deletion is not
-    /// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and
-    /// protect subsequent code.
-    PYBIND11_NOINLINE void disarm() { active = false; }
-
-    PYBIND11_NOINLINE ~gil_scoped_acquire() {
-        dec_ref();
-        if (release) {
-            PyEval_SaveThread();
-        }
-    }
-
-private:
-    PyThreadState *tstate = nullptr;
-    bool release = true;
-    bool active = true;
-};
-
-class gil_scoped_release {
-public:
-    explicit gil_scoped_release(bool disassoc = false) : disassoc(disassoc) {
-        // `get_internals()` must be called here unconditionally in order to initialize
-        // `internals.tstate` for subsequent `gil_scoped_acquire` calls. Otherwise, an
-        // initialization race could occur as multiple threads try `gil_scoped_acquire`.
-        auto &internals = detail::get_internals();
-        // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
-        tstate = PyEval_SaveThread();
-        if (disassoc) {
-            // Python >= 3.7 can remove this, it's an int before 3.7
-            // NOLINTNEXTLINE(readability-qualified-auto)
-            auto key = internals.tstate;
-            PYBIND11_TLS_DELETE_VALUE(key);
-        }
-    }
-
-    /// This method will disable the PyThreadState_DeleteCurrent call and the
-    /// GIL won't be acquired. This method should be used if the interpreter
-    /// could be shutting down when this is called, as thread deletion is not
-    /// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and
-    /// protect subsequent code.
-    PYBIND11_NOINLINE void disarm() { active = false; }
-
-    ~gil_scoped_release() {
-        if (!tstate) {
-            return;
-        }
-        // `PyEval_RestoreThread()` should not be called if runtime is finalizing
-        if (active) {
-            PyEval_RestoreThread(tstate);
-        }
-        if (disassoc) {
-            // Python >= 3.7 can remove this, it's an int before 3.7
-            // NOLINTNEXTLINE(readability-qualified-auto)
-            auto key = detail::get_internals().tstate;
-            PYBIND11_TLS_REPLACE_VALUE(key, tstate);
-        }
-    }
-
-private:
-    PyThreadState *tstate;
-    bool disassoc;
-    bool active = true;
-};
-#elif defined(PYPY_VERSION)
-class gil_scoped_acquire {
-    PyGILState_STATE state;
-
-public:
-    gil_scoped_acquire() { state = PyGILState_Ensure(); }
-    ~gil_scoped_acquire() { PyGILState_Release(state); }
-    void disarm() {}
-};
-
-class gil_scoped_release {
-    PyThreadState *state;
-
-public:
-    gil_scoped_release() { state = PyEval_SaveThread(); }
-    ~gil_scoped_release() { PyEval_RestoreThread(state); }
-    void disarm() {}
-};
-#else
-class gil_scoped_acquire {
-    void disarm() {}
-};
-class gil_scoped_release {
-    void disarm() {}
-};
-#endif
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/iostream.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/iostream.h
deleted file mode 100644
index 1878089e3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/iostream.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-    pybind11/iostream.h -- Tools to assist with redirecting cout and cerr to Python
-
-    Copyright (c) 2017 Henry F. Schreiner
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-
-    WARNING: The implementation in this file is NOT thread safe. Multiple
-    threads writing to a redirected ostream concurrently cause data races
-    and potentially buffer overflows. Therefore it is currently a requirement
-    that all (possibly) concurrent redirected ostream writes are protected by
-    a mutex.
-    #HelpAppreciated: Work on iostream.h thread safety.
-    For more background see the discussions under
-    https://github.com/pybind/pybind11/pull/2982 and
-    https://github.com/pybind/pybind11/pull/2995.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-#include <algorithm>
-#include <cstring>
-#include <iostream>
-#include <iterator>
-#include <memory>
-#include <ostream>
-#include <streambuf>
-#include <string>
-#include <utility>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Buffer that writes to Python instead of C++
-class pythonbuf : public std::streambuf {
-private:
-    using traits_type = std::streambuf::traits_type;
-
-    const size_t buf_size;
-    std::unique_ptr<char[]> d_buffer;
-    object pywrite;
-    object pyflush;
-
-    int overflow(int c) override {
-        if (!traits_type::eq_int_type(c, traits_type::eof())) {
-            *pptr() = traits_type::to_char_type(c);
-            pbump(1);
-        }
-        return sync() == 0 ? traits_type::not_eof(c) : traits_type::eof();
-    }
-
-    // Computes how many bytes at the end of the buffer are part of an
-    // incomplete sequence of UTF-8 bytes.
-    // Precondition: pbase() < pptr()
-    size_t utf8_remainder() const {
-        const auto rbase = std::reverse_iterator<char *>(pbase());
-        const auto rpptr = std::reverse_iterator<char *>(pptr());
-        auto is_ascii = [](char c) { return (static_cast<unsigned char>(c) & 0x80) == 0x00; };
-        auto is_leading = [](char c) { return (static_cast<unsigned char>(c) & 0xC0) == 0xC0; };
-        auto is_leading_2b = [](char c) { return static_cast<unsigned char>(c) <= 0xDF; };
-        auto is_leading_3b = [](char c) { return static_cast<unsigned char>(c) <= 0xEF; };
-        // If the last character is ASCII, there are no incomplete code points
-        if (is_ascii(*rpptr)) {
-            return 0;
-        }
-        // Otherwise, work back from the end of the buffer and find the first
-        // UTF-8 leading byte
-        const auto rpend = rbase - rpptr >= 3 ? rpptr + 3 : rbase;
-        const auto leading = std::find_if(rpptr, rpend, is_leading);
-        if (leading == rbase) {
-            return 0;
-        }
-        const auto dist = static_cast<size_t>(leading - rpptr);
-        size_t remainder = 0;
-
-        if (dist == 0) {
-            remainder = 1; // 1-byte code point is impossible
-        } else if (dist == 1) {
-            remainder = is_leading_2b(*leading) ? 0 : dist + 1;
-        } else if (dist == 2) {
-            remainder = is_leading_3b(*leading) ? 0 : dist + 1;
-        }
-        // else if (dist >= 3), at least 4 bytes before encountering an UTF-8
-        // leading byte, either no remainder or invalid UTF-8.
-        // Invalid UTF-8 will cause an exception later when converting
-        // to a Python string, so that's not handled here.
-        return remainder;
-    }
-
-    // This function must be non-virtual to be called in a destructor.
-    int _sync() {
-        if (pbase() != pptr()) { // If buffer is not empty
-            gil_scoped_acquire tmp;
-            // This subtraction cannot be negative, so dropping the sign.
-            auto size = static_cast<size_t>(pptr() - pbase());
-            size_t remainder = utf8_remainder();
-
-            if (size > remainder) {
-                str line(pbase(), size - remainder);
-                pywrite(std::move(line));
-                pyflush();
-            }
-
-            // Copy the remainder at the end of the buffer to the beginning:
-            if (remainder > 0) {
-                std::memmove(pbase(), pptr() - remainder, remainder);
-            }
-            setp(pbase(), epptr());
-            pbump(static_cast<int>(remainder));
-        }
-        return 0;
-    }
-
-    int sync() override { return _sync(); }
-
-public:
-    explicit pythonbuf(const object &pyostream, size_t buffer_size = 1024)
-        : buf_size(buffer_size), d_buffer(new char[buf_size]), pywrite(pyostream.attr("write")),
-          pyflush(pyostream.attr("flush")) {
-        setp(d_buffer.get(), d_buffer.get() + buf_size - 1);
-    }
-
-    pythonbuf(pythonbuf &&) = default;
-
-    /// Sync before destroy
-    ~pythonbuf() override { _sync(); }
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-/** \rst
-    This a move-only guard that redirects output.
-
-    .. code-block:: cpp
-
-        #include <pybind11/iostream.h>
-
-        ...
-
-        {
-            py::scoped_ostream_redirect output;
-            std::cout << "Hello, World!"; // Python stdout
-        } // <-- return std::cout to normal
-
-    You can explicitly pass the c++ stream and the python object,
-    for example to guard stderr instead.
-
-    .. code-block:: cpp
-
-        {
-            py::scoped_ostream_redirect output{
-                std::cerr, py::module::import("sys").attr("stderr")};
-            std::cout << "Hello, World!";
-        }
- \endrst */
-class scoped_ostream_redirect {
-protected:
-    std::streambuf *old;
-    std::ostream &costream;
-    detail::pythonbuf buffer;
-
-public:
-    explicit scoped_ostream_redirect(std::ostream &costream = std::cout,
-                                     const object &pyostream
-                                     = module_::import("sys").attr("stdout"))
-        : costream(costream), buffer(pyostream) {
-        old = costream.rdbuf(&buffer);
-    }
-
-    ~scoped_ostream_redirect() { costream.rdbuf(old); }
-
-    scoped_ostream_redirect(const scoped_ostream_redirect &) = delete;
-    scoped_ostream_redirect(scoped_ostream_redirect &&other) = default;
-    scoped_ostream_redirect &operator=(const scoped_ostream_redirect &) = delete;
-    scoped_ostream_redirect &operator=(scoped_ostream_redirect &&) = delete;
-};
-
-/** \rst
-    Like `scoped_ostream_redirect`, but redirects cerr by default. This class
-    is provided primary to make ``py::call_guard`` easier to make.
-
-    .. code-block:: cpp
-
-     m.def("noisy_func", &noisy_func,
-           py::call_guard<scoped_ostream_redirect,
-                          scoped_estream_redirect>());
-
-\endrst */
-class scoped_estream_redirect : public scoped_ostream_redirect {
-public:
-    explicit scoped_estream_redirect(std::ostream &costream = std::cerr,
-                                     const object &pyostream
-                                     = module_::import("sys").attr("stderr"))
-        : scoped_ostream_redirect(costream, pyostream) {}
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Class to redirect output as a context manager. C++ backend.
-class OstreamRedirect {
-    bool do_stdout_;
-    bool do_stderr_;
-    std::unique_ptr<scoped_ostream_redirect> redirect_stdout;
-    std::unique_ptr<scoped_estream_redirect> redirect_stderr;
-
-public:
-    explicit OstreamRedirect(bool do_stdout = true, bool do_stderr = true)
-        : do_stdout_(do_stdout), do_stderr_(do_stderr) {}
-
-    void enter() {
-        if (do_stdout_) {
-            redirect_stdout.reset(new scoped_ostream_redirect());
-        }
-        if (do_stderr_) {
-            redirect_stderr.reset(new scoped_estream_redirect());
-        }
-    }
-
-    void exit() {
-        redirect_stdout.reset();
-        redirect_stderr.reset();
-    }
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-/** \rst
-    This is a helper function to add a C++ redirect context manager to Python
-    instead of using a C++ guard. To use it, add the following to your binding code:
-
-    .. code-block:: cpp
-
-        #include <pybind11/iostream.h>
-
-        ...
-
-        py::add_ostream_redirect(m, "ostream_redirect");
-
-    You now have a Python context manager that redirects your output:
-
-    .. code-block:: python
-
-        with m.ostream_redirect():
-            m.print_to_cout_function()
-
-    This manager can optionally be told which streams to operate on:
-
-    .. code-block:: python
-
-        with m.ostream_redirect(stdout=true, stderr=true):
-            m.noisy_function_with_error_printing()
-
- \endrst */
-inline class_<detail::OstreamRedirect>
-add_ostream_redirect(module_ m, const std::string &name = "ostream_redirect") {
-    return class_<detail::OstreamRedirect>(std::move(m), name.c_str(), module_local())
-        .def(init<bool, bool>(), arg("stdout") = true, arg("stderr") = true)
-        .def("__enter__", &detail::OstreamRedirect::enter)
-        .def("__exit__", [](detail::OstreamRedirect &self_, const args &) { self_.exit(); });
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/numpy.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/numpy.h
deleted file mode 100644
index 56e5edc5a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/numpy.h
+++ /dev/null
@@ -1,1991 +0,0 @@
-/*
-    pybind11/numpy.h: Basic NumPy support, vectorize() wrapper
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-#include "complex.h"
-
-#include <algorithm>
-#include <array>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <functional>
-#include <numeric>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <typeindex>
-#include <utility>
-#include <vector>
-
-/* This will be true on all flat address space platforms and allows us to reduce the
-   whole npy_intp / ssize_t / Py_intptr_t business down to just ssize_t for all size
-   and dimension types (e.g. shape, strides, indexing), instead of inflicting this
-   upon the library user. */
-static_assert(sizeof(::pybind11::ssize_t) == sizeof(Py_intptr_t), "ssize_t != Py_intptr_t");
-static_assert(std::is_signed<Py_intptr_t>::value, "Py_intptr_t must be signed");
-// We now can reinterpret_cast between py::ssize_t and Py_intptr_t (MSVC + PyPy cares)
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-class array; // Forward declaration
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <>
-struct handle_type_name<array> {
-    static constexpr auto name = const_name("numpy.ndarray");
-};
-
-template <typename type, typename SFINAE = void>
-struct npy_format_descriptor;
-
-struct PyArrayDescr_Proxy {
-    PyObject_HEAD
-    PyObject *typeobj;
-    char kind;
-    char type;
-    char byteorder;
-    char flags;
-    int type_num;
-    int elsize;
-    int alignment;
-    char *subarray;
-    PyObject *fields;
-    PyObject *names;
-};
-
-struct PyArray_Proxy {
-    PyObject_HEAD
-    char *data;
-    int nd;
-    ssize_t *dimensions;
-    ssize_t *strides;
-    PyObject *base;
-    PyObject *descr;
-    int flags;
-};
-
-struct PyVoidScalarObject_Proxy {
-    PyObject_VAR_HEAD char *obval;
-    PyArrayDescr_Proxy *descr;
-    int flags;
-    PyObject *base;
-};
-
-struct numpy_type_info {
-    PyObject *dtype_ptr;
-    std::string format_str;
-};
-
-struct numpy_internals {
-    std::unordered_map<std::type_index, numpy_type_info> registered_dtypes;
-
-    numpy_type_info *get_type_info(const std::type_info &tinfo, bool throw_if_missing = true) {
-        auto it = registered_dtypes.find(std::type_index(tinfo));
-        if (it != registered_dtypes.end()) {
-            return &(it->second);
-        }
-        if (throw_if_missing) {
-            pybind11_fail(std::string("NumPy type info missing for ") + tinfo.name());
-        }
-        return nullptr;
-    }
-
-    template <typename T>
-    numpy_type_info *get_type_info(bool throw_if_missing = true) {
-        return get_type_info(typeid(typename std::remove_cv<T>::type), throw_if_missing);
-    }
-};
-
-PYBIND11_NOINLINE void load_numpy_internals(numpy_internals *&ptr) {
-    ptr = &get_or_create_shared_data<numpy_internals>("_numpy_internals");
-}
-
-inline numpy_internals &get_numpy_internals() {
-    static numpy_internals *ptr = nullptr;
-    if (!ptr) {
-        load_numpy_internals(ptr);
-    }
-    return *ptr;
-}
-
-template <typename T>
-struct same_size {
-    template <typename U>
-    using as = bool_constant<sizeof(T) == sizeof(U)>;
-};
-
-template <typename Concrete>
-constexpr int platform_lookup() {
-    return -1;
-}
-
-// Lookup a type according to its size, and return a value corresponding to the NumPy typenum.
-template <typename Concrete, typename T, typename... Ts, typename... Ints>
-constexpr int platform_lookup(int I, Ints... Is) {
-    return sizeof(Concrete) == sizeof(T) ? I : platform_lookup<Concrete, Ts...>(Is...);
-}
-
-struct npy_api {
-    enum constants {
-        NPY_ARRAY_C_CONTIGUOUS_ = 0x0001,
-        NPY_ARRAY_F_CONTIGUOUS_ = 0x0002,
-        NPY_ARRAY_OWNDATA_ = 0x0004,
-        NPY_ARRAY_FORCECAST_ = 0x0010,
-        NPY_ARRAY_ENSUREARRAY_ = 0x0040,
-        NPY_ARRAY_ALIGNED_ = 0x0100,
-        NPY_ARRAY_WRITEABLE_ = 0x0400,
-        NPY_BOOL_ = 0,
-        NPY_BYTE_,
-        NPY_UBYTE_,
-        NPY_SHORT_,
-        NPY_USHORT_,
-        NPY_INT_,
-        NPY_UINT_,
-        NPY_LONG_,
-        NPY_ULONG_,
-        NPY_LONGLONG_,
-        NPY_ULONGLONG_,
-        NPY_FLOAT_,
-        NPY_DOUBLE_,
-        NPY_LONGDOUBLE_,
-        NPY_CFLOAT_,
-        NPY_CDOUBLE_,
-        NPY_CLONGDOUBLE_,
-        NPY_OBJECT_ = 17,
-        NPY_STRING_,
-        NPY_UNICODE_,
-        NPY_VOID_,
-        // Platform-dependent normalization
-        NPY_INT8_ = NPY_BYTE_,
-        NPY_UINT8_ = NPY_UBYTE_,
-        NPY_INT16_ = NPY_SHORT_,
-        NPY_UINT16_ = NPY_USHORT_,
-        // `npy_common.h` defines the integer aliases. In order, it checks:
-        // NPY_BITSOF_LONG, NPY_BITSOF_LONGLONG, NPY_BITSOF_INT, NPY_BITSOF_SHORT, NPY_BITSOF_CHAR
-        // and assigns the alias to the first matching size, so we should check in this order.
-        NPY_INT32_
-        = platform_lookup<std::int32_t, long, int, short>(NPY_LONG_, NPY_INT_, NPY_SHORT_),
-        NPY_UINT32_ = platform_lookup<std::uint32_t, unsigned long, unsigned int, unsigned short>(
-            NPY_ULONG_, NPY_UINT_, NPY_USHORT_),
-        NPY_INT64_
-        = platform_lookup<std::int64_t, long, long long, int>(NPY_LONG_, NPY_LONGLONG_, NPY_INT_),
-        NPY_UINT64_
-        = platform_lookup<std::uint64_t, unsigned long, unsigned long long, unsigned int>(
-            NPY_ULONG_, NPY_ULONGLONG_, NPY_UINT_),
-    };
-
-    struct PyArray_Dims {
-        Py_intptr_t *ptr;
-        int len;
-    };
-
-    static npy_api &get() {
-        static npy_api api = lookup();
-        return api;
-    }
-
-    bool PyArray_Check_(PyObject *obj) const {
-        return PyObject_TypeCheck(obj, PyArray_Type_) != 0;
-    }
-    bool PyArrayDescr_Check_(PyObject *obj) const {
-        return PyObject_TypeCheck(obj, PyArrayDescr_Type_) != 0;
-    }
-
-    unsigned int (*PyArray_GetNDArrayCFeatureVersion_)();
-    PyObject *(*PyArray_DescrFromType_)(int);
-    PyObject *(*PyArray_NewFromDescr_)(PyTypeObject *,
-                                       PyObject *,
-                                       int,
-                                       Py_intptr_t const *,
-                                       Py_intptr_t const *,
-                                       void *,
-                                       int,
-                                       PyObject *);
-    // Unused. Not removed because that affects ABI of the class.
-    PyObject *(*PyArray_DescrNewFromType_)(int);
-    int (*PyArray_CopyInto_)(PyObject *, PyObject *);
-    PyObject *(*PyArray_NewCopy_)(PyObject *, int);
-    PyTypeObject *PyArray_Type_;
-    PyTypeObject *PyVoidArrType_Type_;
-    PyTypeObject *PyArrayDescr_Type_;
-    PyObject *(*PyArray_DescrFromScalar_)(PyObject *);
-    PyObject *(*PyArray_FromAny_)(PyObject *, PyObject *, int, int, int, PyObject *);
-    int (*PyArray_DescrConverter_)(PyObject *, PyObject **);
-    bool (*PyArray_EquivTypes_)(PyObject *, PyObject *);
-    int (*PyArray_GetArrayParamsFromObject_)(PyObject *,
-                                             PyObject *,
-                                             unsigned char,
-                                             PyObject **,
-                                             int *,
-                                             Py_intptr_t *,
-                                             PyObject **,
-                                             PyObject *);
-    PyObject *(*PyArray_Squeeze_)(PyObject *);
-    // Unused. Not removed because that affects ABI of the class.
-    int (*PyArray_SetBaseObject_)(PyObject *, PyObject *);
-    PyObject *(*PyArray_Resize_)(PyObject *, PyArray_Dims *, int, int);
-    PyObject *(*PyArray_Newshape_)(PyObject *, PyArray_Dims *, int);
-    PyObject *(*PyArray_View_)(PyObject *, PyObject *, PyObject *);
-
-private:
-    enum functions {
-        API_PyArray_GetNDArrayCFeatureVersion = 211,
-        API_PyArray_Type = 2,
-        API_PyArrayDescr_Type = 3,
-        API_PyVoidArrType_Type = 39,
-        API_PyArray_DescrFromType = 45,
-        API_PyArray_DescrFromScalar = 57,
-        API_PyArray_FromAny = 69,
-        API_PyArray_Resize = 80,
-        API_PyArray_CopyInto = 82,
-        API_PyArray_NewCopy = 85,
-        API_PyArray_NewFromDescr = 94,
-        API_PyArray_DescrNewFromType = 96,
-        API_PyArray_Newshape = 135,
-        API_PyArray_Squeeze = 136,
-        API_PyArray_View = 137,
-        API_PyArray_DescrConverter = 174,
-        API_PyArray_EquivTypes = 182,
-        API_PyArray_GetArrayParamsFromObject = 278,
-        API_PyArray_SetBaseObject = 282
-    };
-
-    static npy_api lookup() {
-        module_ m = module_::import("numpy.core.multiarray");
-        auto c = m.attr("_ARRAY_API");
-        void **api_ptr = (void **) PyCapsule_GetPointer(c.ptr(), nullptr);
-        npy_api api;
-#define DECL_NPY_API(Func) api.Func##_ = (decltype(api.Func##_)) api_ptr[API_##Func];
-        DECL_NPY_API(PyArray_GetNDArrayCFeatureVersion);
-        if (api.PyArray_GetNDArrayCFeatureVersion_() < 0x7) {
-            pybind11_fail("pybind11 numpy support requires numpy >= 1.7.0");
-        }
-        DECL_NPY_API(PyArray_Type);
-        DECL_NPY_API(PyVoidArrType_Type);
-        DECL_NPY_API(PyArrayDescr_Type);
-        DECL_NPY_API(PyArray_DescrFromType);
-        DECL_NPY_API(PyArray_DescrFromScalar);
-        DECL_NPY_API(PyArray_FromAny);
-        DECL_NPY_API(PyArray_Resize);
-        DECL_NPY_API(PyArray_CopyInto);
-        DECL_NPY_API(PyArray_NewCopy);
-        DECL_NPY_API(PyArray_NewFromDescr);
-        DECL_NPY_API(PyArray_DescrNewFromType);
-        DECL_NPY_API(PyArray_Newshape);
-        DECL_NPY_API(PyArray_Squeeze);
-        DECL_NPY_API(PyArray_View);
-        DECL_NPY_API(PyArray_DescrConverter);
-        DECL_NPY_API(PyArray_EquivTypes);
-        DECL_NPY_API(PyArray_GetArrayParamsFromObject);
-        DECL_NPY_API(PyArray_SetBaseObject);
-
-#undef DECL_NPY_API
-        return api;
-    }
-};
-
-inline PyArray_Proxy *array_proxy(void *ptr) { return reinterpret_cast<PyArray_Proxy *>(ptr); }
-
-inline const PyArray_Proxy *array_proxy(const void *ptr) {
-    return reinterpret_cast<const PyArray_Proxy *>(ptr);
-}
-
-inline PyArrayDescr_Proxy *array_descriptor_proxy(PyObject *ptr) {
-    return reinterpret_cast<PyArrayDescr_Proxy *>(ptr);
-}
-
-inline const PyArrayDescr_Proxy *array_descriptor_proxy(const PyObject *ptr) {
-    return reinterpret_cast<const PyArrayDescr_Proxy *>(ptr);
-}
-
-inline bool check_flags(const void *ptr, int flag) {
-    return (flag == (array_proxy(ptr)->flags & flag));
-}
-
-template <typename T>
-struct is_std_array : std::false_type {};
-template <typename T, size_t N>
-struct is_std_array<std::array<T, N>> : std::true_type {};
-template <typename T>
-struct is_complex : std::false_type {};
-template <typename T>
-struct is_complex<std::complex<T>> : std::true_type {};
-
-template <typename T>
-struct array_info_scalar {
-    using type = T;
-    static constexpr bool is_array = false;
-    static constexpr bool is_empty = false;
-    static constexpr auto extents = const_name("");
-    static void append_extents(list & /* shape */) {}
-};
-// Computes underlying type and a comma-separated list of extents for array
-// types (any mix of std::array and built-in arrays). An array of char is
-// treated as scalar because it gets special handling.
-template <typename T>
-struct array_info : array_info_scalar<T> {};
-template <typename T, size_t N>
-struct array_info<std::array<T, N>> {
-    using type = typename array_info<T>::type;
-    static constexpr bool is_array = true;
-    static constexpr bool is_empty = (N == 0) || array_info<T>::is_empty;
-    static constexpr size_t extent = N;
-
-    // appends the extents to shape
-    static void append_extents(list &shape) {
-        shape.append(N);
-        array_info<T>::append_extents(shape);
-    }
-
-    static constexpr auto extents = const_name<array_info<T>::is_array>(
-        concat(const_name<N>(), array_info<T>::extents), const_name<N>());
-};
-// For numpy we have special handling for arrays of characters, so we don't include
-// the size in the array extents.
-template <size_t N>
-struct array_info<char[N]> : array_info_scalar<char[N]> {};
-template <size_t N>
-struct array_info<std::array<char, N>> : array_info_scalar<std::array<char, N>> {};
-template <typename T, size_t N>
-struct array_info<T[N]> : array_info<std::array<T, N>> {};
-template <typename T>
-using remove_all_extents_t = typename array_info<T>::type;
-
-template <typename T>
-using is_pod_struct
-    = all_of<std::is_standard_layout<T>, // since we're accessing directly in memory
-                                         // we need a standard layout type
-#if defined(__GLIBCXX__)                                                                          \
-    && (__GLIBCXX__ < 20150422 || __GLIBCXX__ == 20150426 || __GLIBCXX__ == 20150623              \
-        || __GLIBCXX__ == 20150626 || __GLIBCXX__ == 20160803)
-             // libstdc++ < 5 (including versions 4.8.5, 4.9.3 and 4.9.4 which were released after
-             // 5) don't implement is_trivially_copyable, so approximate it
-             std::is_trivially_destructible<T>,
-             satisfies_any_of<T, std::has_trivial_copy_constructor, std::has_trivial_copy_assign>,
-#else
-             std::is_trivially_copyable<T>,
-#endif
-             satisfies_none_of<T,
-                               std::is_reference,
-                               std::is_array,
-                               is_std_array,
-                               std::is_arithmetic,
-                               is_complex,
-                               std::is_enum>>;
-
-// Replacement for std::is_pod (deprecated in C++20)
-template <typename T>
-using is_pod = all_of<std::is_standard_layout<T>, std::is_trivial<T>>;
-
-template <ssize_t Dim = 0, typename Strides>
-ssize_t byte_offset_unsafe(const Strides &) {
-    return 0;
-}
-template <ssize_t Dim = 0, typename Strides, typename... Ix>
-ssize_t byte_offset_unsafe(const Strides &strides, ssize_t i, Ix... index) {
-    return i * strides[Dim] + byte_offset_unsafe<Dim + 1>(strides, index...);
-}
-
-/**
- * Proxy class providing unsafe, unchecked const access to array data.  This is constructed through
- * the `unchecked<T, N>()` method of `array` or the `unchecked<N>()` method of `array_t<T>`. `Dims`
- * will be -1 for dimensions determined at runtime.
- */
-template <typename T, ssize_t Dims>
-class unchecked_reference {
-protected:
-    static constexpr bool Dynamic = Dims < 0;
-    const unsigned char *data_;
-    // Storing the shape & strides in local variables (i.e. these arrays) allows the compiler to
-    // make large performance gains on big, nested loops, but requires compile-time dimensions
-    conditional_t<Dynamic, const ssize_t *, std::array<ssize_t, (size_t) Dims>> shape_, strides_;
-    const ssize_t dims_;
-
-    friend class pybind11::array;
-    // Constructor for compile-time dimensions:
-    template <bool Dyn = Dynamic>
-    unchecked_reference(const void *data,
-                        const ssize_t *shape,
-                        const ssize_t *strides,
-                        enable_if_t<!Dyn, ssize_t>)
-        : data_{reinterpret_cast<const unsigned char *>(data)}, dims_{Dims} {
-        for (size_t i = 0; i < (size_t) dims_; i++) {
-            shape_[i] = shape[i];
-            strides_[i] = strides[i];
-        }
-    }
-    // Constructor for runtime dimensions:
-    template <bool Dyn = Dynamic>
-    unchecked_reference(const void *data,
-                        const ssize_t *shape,
-                        const ssize_t *strides,
-                        enable_if_t<Dyn, ssize_t> dims)
-        : data_{reinterpret_cast<const unsigned char *>(data)}, shape_{shape}, strides_{strides},
-          dims_{dims} {}
-
-public:
-    /**
-     * Unchecked const reference access to data at the given indices.  For a compile-time known
-     * number of dimensions, this requires the correct number of arguments; for run-time
-     * dimensionality, this is not checked (and so is up to the caller to use safely).
-     */
-    template <typename... Ix>
-    const T &operator()(Ix... index) const {
-        static_assert(ssize_t{sizeof...(Ix)} == Dims || Dynamic,
-                      "Invalid number of indices for unchecked array reference");
-        return *reinterpret_cast<const T *>(data_
-                                            + byte_offset_unsafe(strides_, ssize_t(index)...));
-    }
-    /**
-     * Unchecked const reference access to data; this operator only participates if the reference
-     * is to a 1-dimensional array.  When present, this is exactly equivalent to `obj(index)`.
-     */
-    template <ssize_t D = Dims, typename = enable_if_t<D == 1 || Dynamic>>
-    const T &operator[](ssize_t index) const {
-        return operator()(index);
-    }
-
-    /// Pointer access to the data at the given indices.
-    template <typename... Ix>
-    const T *data(Ix... ix) const {
-        return &operator()(ssize_t(ix)...);
-    }
-
-    /// Returns the item size, i.e. sizeof(T)
-    constexpr static ssize_t itemsize() { return sizeof(T); }
-
-    /// Returns the shape (i.e. size) of dimension `dim`
-    ssize_t shape(ssize_t dim) const { return shape_[(size_t) dim]; }
-
-    /// Returns the number of dimensions of the array
-    ssize_t ndim() const { return dims_; }
-
-    /// Returns the total number of elements in the referenced array, i.e. the product of the
-    /// shapes
-    template <bool Dyn = Dynamic>
-    enable_if_t<!Dyn, ssize_t> size() const {
-        return std::accumulate(
-            shape_.begin(), shape_.end(), (ssize_t) 1, std::multiplies<ssize_t>());
-    }
-    template <bool Dyn = Dynamic>
-    enable_if_t<Dyn, ssize_t> size() const {
-        return std::accumulate(shape_, shape_ + ndim(), (ssize_t) 1, std::multiplies<ssize_t>());
-    }
-
-    /// Returns the total number of bytes used by the referenced data.  Note that the actual span
-    /// in memory may be larger if the referenced array has non-contiguous strides (e.g. for a
-    /// slice).
-    ssize_t nbytes() const { return size() * itemsize(); }
-};
-
-template <typename T, ssize_t Dims>
-class unchecked_mutable_reference : public unchecked_reference<T, Dims> {
-    friend class pybind11::array;
-    using ConstBase = unchecked_reference<T, Dims>;
-    using ConstBase::ConstBase;
-    using ConstBase::Dynamic;
-
-public:
-    // Bring in const-qualified versions from base class
-    using ConstBase::operator();
-    using ConstBase::operator[];
-
-    /// Mutable, unchecked access to data at the given indices.
-    template <typename... Ix>
-    T &operator()(Ix... index) {
-        static_assert(ssize_t{sizeof...(Ix)} == Dims || Dynamic,
-                      "Invalid number of indices for unchecked array reference");
-        return const_cast<T &>(ConstBase::operator()(index...));
-    }
-    /**
-     * Mutable, unchecked access data at the given index; this operator only participates if the
-     * reference is to a 1-dimensional array (or has runtime dimensions).  When present, this is
-     * exactly equivalent to `obj(index)`.
-     */
-    template <ssize_t D = Dims, typename = enable_if_t<D == 1 || Dynamic>>
-    T &operator[](ssize_t index) {
-        return operator()(index);
-    }
-
-    /// Mutable pointer access to the data at the given indices.
-    template <typename... Ix>
-    T *mutable_data(Ix... ix) {
-        return &operator()(ssize_t(ix)...);
-    }
-};
-
-template <typename T, ssize_t Dim>
-struct type_caster<unchecked_reference<T, Dim>> {
-    static_assert(Dim == 0 && Dim > 0 /* always fail */,
-                  "unchecked array proxy object is not castable");
-};
-template <typename T, ssize_t Dim>
-struct type_caster<unchecked_mutable_reference<T, Dim>>
-    : type_caster<unchecked_reference<T, Dim>> {};
-
-PYBIND11_NAMESPACE_END(detail)
-
-class dtype : public object {
-public:
-    PYBIND11_OBJECT_DEFAULT(dtype, object, detail::npy_api::get().PyArrayDescr_Check_)
-
-    explicit dtype(const buffer_info &info) {
-        dtype descr(_dtype_from_pep3118()(pybind11::str(info.format)));
-        // If info.itemsize == 0, use the value calculated from the format string
-        m_ptr = descr.strip_padding(info.itemsize != 0 ? info.itemsize : descr.itemsize())
-                    .release()
-                    .ptr();
-    }
-
-    explicit dtype(const pybind11::str &format) : dtype(from_args(format)) {}
-
-    explicit dtype(const std::string &format) : dtype(pybind11::str(format)) {}
-
-    explicit dtype(const char *format) : dtype(pybind11::str(format)) {}
-
-    dtype(list names, list formats, list offsets, ssize_t itemsize) {
-        dict args;
-        args["names"] = std::move(names);
-        args["formats"] = std::move(formats);
-        args["offsets"] = std::move(offsets);
-        args["itemsize"] = pybind11::int_(itemsize);
-        m_ptr = from_args(args).release().ptr();
-    }
-
-    explicit dtype(int typenum)
-        : object(detail::npy_api::get().PyArray_DescrFromType_(typenum), stolen_t{}) {
-        if (m_ptr == nullptr) {
-            throw error_already_set();
-        }
-    }
-
-    /// This is essentially the same as calling numpy.dtype(args) in Python.
-    static dtype from_args(const object &args) {
-        PyObject *ptr = nullptr;
-        if ((detail::npy_api::get().PyArray_DescrConverter_(args.ptr(), &ptr) == 0) || !ptr) {
-            throw error_already_set();
-        }
-        return reinterpret_steal<dtype>(ptr);
-    }
-
-    /// Return dtype associated with a C++ type.
-    template <typename T>
-    static dtype of() {
-        return detail::npy_format_descriptor<typename std::remove_cv<T>::type>::dtype();
-    }
-
-    /// Size of the data type in bytes.
-    ssize_t itemsize() const { return detail::array_descriptor_proxy(m_ptr)->elsize; }
-
-    /// Returns true for structured data types.
-    bool has_fields() const { return detail::array_descriptor_proxy(m_ptr)->names != nullptr; }
-
-    /// Single-character code for dtype's kind.
-    /// For example, floating point types are 'f' and integral types are 'i'.
-    char kind() const { return detail::array_descriptor_proxy(m_ptr)->kind; }
-
-    /// Single-character for dtype's type.
-    /// For example, ``float`` is 'f', ``double`` 'd', ``int`` 'i', and ``long`` 'l'.
-    char char_() const {
-        // Note: The signature, `dtype::char_` follows the naming of NumPy's
-        // public Python API (i.e., ``dtype.char``), rather than its internal
-        // C API (``PyArray_Descr::type``).
-        return detail::array_descriptor_proxy(m_ptr)->type;
-    }
-
-    /// type number of dtype.
-    int num() const {
-        // Note: The signature, `dtype::num` follows the naming of NumPy's public
-        // Python API (i.e., ``dtype.num``), rather than its internal
-        // C API (``PyArray_Descr::type_num``).
-        return detail::array_descriptor_proxy(m_ptr)->type_num;
-    }
-
-    /// Single character for byteorder
-    char byteorder() const { return detail::array_descriptor_proxy(m_ptr)->byteorder; }
-
-    /// Alignment of the data type
-    int alignment() const { return detail::array_descriptor_proxy(m_ptr)->alignment; }
-
-    /// Flags for the array descriptor
-    char flags() const { return detail::array_descriptor_proxy(m_ptr)->flags; }
-
-private:
-    static object _dtype_from_pep3118() {
-        static PyObject *obj = module_::import("numpy.core._internal")
-                                   .attr("_dtype_from_pep3118")
-                                   .cast<object>()
-                                   .release()
-                                   .ptr();
-        return reinterpret_borrow<object>(obj);
-    }
-
-    dtype strip_padding(ssize_t itemsize) {
-        // Recursively strip all void fields with empty names that are generated for
-        // padding fields (as of NumPy v1.11).
-        if (!has_fields()) {
-            return *this;
-        }
-
-        struct field_descr {
-            pybind11::str name;
-            object format;
-            pybind11::int_ offset;
-            field_descr(pybind11::str &&name, object &&format, pybind11::int_ &&offset)
-                : name{std::move(name)}, format{std::move(format)}, offset{std::move(offset)} {};
-        };
-        auto field_dict = attr("fields").cast<dict>();
-        std::vector<field_descr> field_descriptors;
-        field_descriptors.reserve(field_dict.size());
-
-        for (auto field : field_dict.attr("items")()) {
-            auto spec = field.cast<tuple>();
-            auto name = spec[0].cast<pybind11::str>();
-            auto spec_fo = spec[1].cast<tuple>();
-            auto format = spec_fo[0].cast<dtype>();
-            auto offset = spec_fo[1].cast<pybind11::int_>();
-            if ((len(name) == 0u) && format.kind() == 'V') {
-                continue;
-            }
-            field_descriptors.emplace_back(
-                std::move(name), format.strip_padding(format.itemsize()), std::move(offset));
-        }
-
-        std::sort(field_descriptors.begin(),
-                  field_descriptors.end(),
-                  [](const field_descr &a, const field_descr &b) {
-                      return a.offset.cast<int>() < b.offset.cast<int>();
-                  });
-
-        list names, formats, offsets;
-        for (auto &descr : field_descriptors) {
-            names.append(std::move(descr.name));
-            formats.append(std::move(descr.format));
-            offsets.append(std::move(descr.offset));
-        }
-        return dtype(std::move(names), std::move(formats), std::move(offsets), itemsize);
-    }
-};
-
-class array : public buffer {
-public:
-    PYBIND11_OBJECT_CVT(array, buffer, detail::npy_api::get().PyArray_Check_, raw_array)
-
-    enum {
-        c_style = detail::npy_api::NPY_ARRAY_C_CONTIGUOUS_,
-        f_style = detail::npy_api::NPY_ARRAY_F_CONTIGUOUS_,
-        forcecast = detail::npy_api::NPY_ARRAY_FORCECAST_
-    };
-
-    array() : array(0, static_cast<const double *>(nullptr)) {}
-
-    using ShapeContainer = detail::any_container<ssize_t>;
-    using StridesContainer = detail::any_container<ssize_t>;
-
-    // Constructs an array taking shape/strides from arbitrary container types
-    array(const pybind11::dtype &dt,
-          ShapeContainer shape,
-          StridesContainer strides,
-          const void *ptr = nullptr,
-          handle base = handle()) {
-
-        if (strides->empty()) {
-            *strides = detail::c_strides(*shape, dt.itemsize());
-        }
-
-        auto ndim = shape->size();
-        if (ndim != strides->size()) {
-            pybind11_fail("NumPy: shape ndim doesn't match strides ndim");
-        }
-        auto descr = dt;
-
-        int flags = 0;
-        if (base && ptr) {
-            if (isinstance<array>(base)) {
-                /* Copy flags from base (except ownership bit) */
-                flags = reinterpret_borrow<array>(base).flags()
-                        & ~detail::npy_api::NPY_ARRAY_OWNDATA_;
-            } else {
-                /* Writable by default, easy to downgrade later on if needed */
-                flags = detail::npy_api::NPY_ARRAY_WRITEABLE_;
-            }
-        }
-
-        auto &api = detail::npy_api::get();
-        auto tmp = reinterpret_steal<object>(api.PyArray_NewFromDescr_(
-            api.PyArray_Type_,
-            descr.release().ptr(),
-            (int) ndim,
-            // Use reinterpret_cast for PyPy on Windows (remove if fixed, checked on 7.3.1)
-            reinterpret_cast<Py_intptr_t *>(shape->data()),
-            reinterpret_cast<Py_intptr_t *>(strides->data()),
-            const_cast<void *>(ptr),
-            flags,
-            nullptr));
-        if (!tmp) {
-            throw error_already_set();
-        }
-        if (ptr) {
-            if (base) {
-                api.PyArray_SetBaseObject_(tmp.ptr(), base.inc_ref().ptr());
-            } else {
-                tmp = reinterpret_steal<object>(
-                    api.PyArray_NewCopy_(tmp.ptr(), -1 /* any order */));
-            }
-        }
-        m_ptr = tmp.release().ptr();
-    }
-
-    array(const pybind11::dtype &dt,
-          ShapeContainer shape,
-          const void *ptr = nullptr,
-          handle base = handle())
-        : array(dt, std::move(shape), {}, ptr, base) {}
-
-    template <typename T,
-              typename
-              = detail::enable_if_t<std::is_integral<T>::value && !std::is_same<bool, T>::value>>
-    array(const pybind11::dtype &dt, T count, const void *ptr = nullptr, handle base = handle())
-        : array(dt, {{count}}, ptr, base) {}
-
-    template <typename T>
-    array(ShapeContainer shape, StridesContainer strides, const T *ptr, handle base = handle())
-        : array(pybind11::dtype::of<T>(), std::move(shape), std::move(strides), ptr, base) {}
-
-    template <typename T>
-    array(ShapeContainer shape, const T *ptr, handle base = handle())
-        : array(std::move(shape), {}, ptr, base) {}
-
-    template <typename T>
-    explicit array(ssize_t count, const T *ptr, handle base = handle())
-        : array({count}, {}, ptr, base) {}
-
-    explicit array(const buffer_info &info, handle base = handle())
-        : array(pybind11::dtype(info), info.shape, info.strides, info.ptr, base) {}
-
-    /// Array descriptor (dtype)
-    pybind11::dtype dtype() const {
-        return reinterpret_borrow<pybind11::dtype>(detail::array_proxy(m_ptr)->descr);
-    }
-
-    /// Total number of elements
-    ssize_t size() const {
-        return std::accumulate(shape(), shape() + ndim(), (ssize_t) 1, std::multiplies<ssize_t>());
-    }
-
-    /// Byte size of a single element
-    ssize_t itemsize() const {
-        return detail::array_descriptor_proxy(detail::array_proxy(m_ptr)->descr)->elsize;
-    }
-
-    /// Total number of bytes
-    ssize_t nbytes() const { return size() * itemsize(); }
-
-    /// Number of dimensions
-    ssize_t ndim() const { return detail::array_proxy(m_ptr)->nd; }
-
-    /// Base object
-    object base() const { return reinterpret_borrow<object>(detail::array_proxy(m_ptr)->base); }
-
-    /// Dimensions of the array
-    const ssize_t *shape() const { return detail::array_proxy(m_ptr)->dimensions; }
-
-    /// Dimension along a given axis
-    ssize_t shape(ssize_t dim) const {
-        if (dim >= ndim()) {
-            fail_dim_check(dim, "invalid axis");
-        }
-        return shape()[dim];
-    }
-
-    /// Strides of the array
-    const ssize_t *strides() const { return detail::array_proxy(m_ptr)->strides; }
-
-    /// Stride along a given axis
-    ssize_t strides(ssize_t dim) const {
-        if (dim >= ndim()) {
-            fail_dim_check(dim, "invalid axis");
-        }
-        return strides()[dim];
-    }
-
-    /// Return the NumPy array flags
-    int flags() const { return detail::array_proxy(m_ptr)->flags; }
-
-    /// If set, the array is writeable (otherwise the buffer is read-only)
-    bool writeable() const {
-        return detail::check_flags(m_ptr, detail::npy_api::NPY_ARRAY_WRITEABLE_);
-    }
-
-    /// If set, the array owns the data (will be freed when the array is deleted)
-    bool owndata() const {
-        return detail::check_flags(m_ptr, detail::npy_api::NPY_ARRAY_OWNDATA_);
-    }
-
-    /// Pointer to the contained data. If index is not provided, points to the
-    /// beginning of the buffer. May throw if the index would lead to out of bounds access.
-    template <typename... Ix>
-    const void *data(Ix... index) const {
-        return static_cast<const void *>(detail::array_proxy(m_ptr)->data + offset_at(index...));
-    }
-
-    /// Mutable pointer to the contained data. If index is not provided, points to the
-    /// beginning of the buffer. May throw if the index would lead to out of bounds access.
-    /// May throw if the array is not writeable.
-    template <typename... Ix>
-    void *mutable_data(Ix... index) {
-        check_writeable();
-        return static_cast<void *>(detail::array_proxy(m_ptr)->data + offset_at(index...));
-    }
-
-    /// Byte offset from beginning of the array to a given index (full or partial).
-    /// May throw if the index would lead to out of bounds access.
-    template <typename... Ix>
-    ssize_t offset_at(Ix... index) const {
-        if ((ssize_t) sizeof...(index) > ndim()) {
-            fail_dim_check(sizeof...(index), "too many indices for an array");
-        }
-        return byte_offset(ssize_t(index)...);
-    }
-
-    ssize_t offset_at() const { return 0; }
-
-    /// Item count from beginning of the array to a given index (full or partial).
-    /// May throw if the index would lead to out of bounds access.
-    template <typename... Ix>
-    ssize_t index_at(Ix... index) const {
-        return offset_at(index...) / itemsize();
-    }
-
-    /**
-     * Returns a proxy object that provides access to the array's data without bounds or
-     * dimensionality checking.  Will throw if the array is missing the `writeable` flag.  Use with
-     * care: the array must not be destroyed or reshaped for the duration of the returned object,
-     * and the caller must take care not to access invalid dimensions or dimension indices.
-     */
-    template <typename T, ssize_t Dims = -1>
-    detail::unchecked_mutable_reference<T, Dims> mutable_unchecked() & {
-        if (PYBIND11_SILENCE_MSVC_C4127(Dims >= 0) && ndim() != Dims) {
-            throw std::domain_error("array has incorrect number of dimensions: "
-                                    + std::to_string(ndim()) + "; expected "
-                                    + std::to_string(Dims));
-        }
-        return detail::unchecked_mutable_reference<T, Dims>(
-            mutable_data(), shape(), strides(), ndim());
-    }
-
-    /**
-     * Returns a proxy object that provides const access to the array's data without bounds or
-     * dimensionality checking.  Unlike `mutable_unchecked()`, this does not require that the
-     * underlying array have the `writable` flag.  Use with care: the array must not be destroyed
-     * or reshaped for the duration of the returned object, and the caller must take care not to
-     * access invalid dimensions or dimension indices.
-     */
-    template <typename T, ssize_t Dims = -1>
-    detail::unchecked_reference<T, Dims> unchecked() const & {
-        if (PYBIND11_SILENCE_MSVC_C4127(Dims >= 0) && ndim() != Dims) {
-            throw std::domain_error("array has incorrect number of dimensions: "
-                                    + std::to_string(ndim()) + "; expected "
-                                    + std::to_string(Dims));
-        }
-        return detail::unchecked_reference<T, Dims>(data(), shape(), strides(), ndim());
-    }
-
-    /// Return a new view with all of the dimensions of length 1 removed
-    array squeeze() {
-        auto &api = detail::npy_api::get();
-        return reinterpret_steal<array>(api.PyArray_Squeeze_(m_ptr));
-    }
-
-    /// Resize array to given shape
-    /// If refcheck is true and more that one reference exist to this array
-    /// then resize will succeed only if it makes a reshape, i.e. original size doesn't change
-    void resize(ShapeContainer new_shape, bool refcheck = true) {
-        detail::npy_api::PyArray_Dims d
-            = {// Use reinterpret_cast for PyPy on Windows (remove if fixed, checked on 7.3.1)
-               reinterpret_cast<Py_intptr_t *>(new_shape->data()),
-               int(new_shape->size())};
-        // try to resize, set ordering param to -1 cause it's not used anyway
-        auto new_array = reinterpret_steal<object>(
-            detail::npy_api::get().PyArray_Resize_(m_ptr, &d, int(refcheck), -1));
-        if (!new_array) {
-            throw error_already_set();
-        }
-        if (isinstance<array>(new_array)) {
-            *this = std::move(new_array);
-        }
-    }
-
-    /// Optional `order` parameter omitted, to be added as needed.
-    array reshape(ShapeContainer new_shape) {
-        detail::npy_api::PyArray_Dims d
-            = {reinterpret_cast<Py_intptr_t *>(new_shape->data()), int(new_shape->size())};
-        auto new_array
-            = reinterpret_steal<array>(detail::npy_api::get().PyArray_Newshape_(m_ptr, &d, 0));
-        if (!new_array) {
-            throw error_already_set();
-        }
-        return new_array;
-    }
-
-    /// Create a view of an array in a different data type.
-    /// This function may fundamentally reinterpret the data in the array.
-    /// It is the responsibility of the caller to ensure that this is safe.
-    /// Only supports the `dtype` argument, the `type` argument is omitted,
-    /// to be added as needed.
-    array view(const std::string &dtype) {
-        auto &api = detail::npy_api::get();
-        auto new_view = reinterpret_steal<array>(api.PyArray_View_(
-            m_ptr, dtype::from_args(pybind11::str(dtype)).release().ptr(), nullptr));
-        if (!new_view) {
-            throw error_already_set();
-        }
-        return new_view;
-    }
-
-    /// Ensure that the argument is a NumPy array
-    /// In case of an error, nullptr is returned and the Python error is cleared.
-    static array ensure(handle h, int ExtraFlags = 0) {
-        auto result = reinterpret_steal<array>(raw_array(h.ptr(), ExtraFlags));
-        if (!result) {
-            PyErr_Clear();
-        }
-        return result;
-    }
-
-protected:
-    template <typename, typename>
-    friend struct detail::npy_format_descriptor;
-
-    void fail_dim_check(ssize_t dim, const std::string &msg) const {
-        throw index_error(msg + ": " + std::to_string(dim) + " (ndim = " + std::to_string(ndim())
-                          + ')');
-    }
-
-    template <typename... Ix>
-    ssize_t byte_offset(Ix... index) const {
-        check_dimensions(index...);
-        return detail::byte_offset_unsafe(strides(), ssize_t(index)...);
-    }
-
-    void check_writeable() const {
-        if (!writeable()) {
-            throw std::domain_error("array is not writeable");
-        }
-    }
-
-    template <typename... Ix>
-    void check_dimensions(Ix... index) const {
-        check_dimensions_impl(ssize_t(0), shape(), ssize_t(index)...);
-    }
-
-    void check_dimensions_impl(ssize_t, const ssize_t *) const {}
-
-    template <typename... Ix>
-    void check_dimensions_impl(ssize_t axis, const ssize_t *shape, ssize_t i, Ix... index) const {
-        if (i >= *shape) {
-            throw index_error(std::string("index ") + std::to_string(i)
-                              + " is out of bounds for axis " + std::to_string(axis)
-                              + " with size " + std::to_string(*shape));
-        }
-        check_dimensions_impl(axis + 1, shape + 1, index...);
-    }
-
-    /// Create array from any object -- always returns a new reference
-    static PyObject *raw_array(PyObject *ptr, int ExtraFlags = 0) {
-        if (ptr == nullptr) {
-            PyErr_SetString(PyExc_ValueError, "cannot create a pybind11::array from a nullptr");
-            return nullptr;
-        }
-        return detail::npy_api::get().PyArray_FromAny_(
-            ptr, nullptr, 0, 0, detail::npy_api::NPY_ARRAY_ENSUREARRAY_ | ExtraFlags, nullptr);
-    }
-};
-
-template <typename T, int ExtraFlags = array::forcecast>
-class array_t : public array {
-private:
-    struct private_ctor {};
-    // Delegating constructor needed when both moving and accessing in the same constructor
-    array_t(private_ctor,
-            ShapeContainer &&shape,
-            StridesContainer &&strides,
-            const T *ptr,
-            handle base)
-        : array(std::move(shape), std::move(strides), ptr, base) {}
-
-public:
-    static_assert(!detail::array_info<T>::is_array, "Array types cannot be used with array_t");
-
-    using value_type = T;
-
-    array_t() : array(0, static_cast<const T *>(nullptr)) {}
-    array_t(handle h, borrowed_t) : array(h, borrowed_t{}) {}
-    array_t(handle h, stolen_t) : array(h, stolen_t{}) {}
-
-    PYBIND11_DEPRECATED("Use array_t<T>::ensure() instead")
-    array_t(handle h, bool is_borrowed) : array(raw_array_t(h.ptr()), stolen_t{}) {
-        if (!m_ptr) {
-            PyErr_Clear();
-        }
-        if (!is_borrowed) {
-            Py_XDECREF(h.ptr());
-        }
-    }
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    array_t(const object &o) : array(raw_array_t(o.ptr()), stolen_t{}) {
-        if (!m_ptr) {
-            throw error_already_set();
-        }
-    }
-
-    explicit array_t(const buffer_info &info, handle base = handle()) : array(info, base) {}
-
-    array_t(ShapeContainer shape,
-            StridesContainer strides,
-            const T *ptr = nullptr,
-            handle base = handle())
-        : array(std::move(shape), std::move(strides), ptr, base) {}
-
-    explicit array_t(ShapeContainer shape, const T *ptr = nullptr, handle base = handle())
-        : array_t(private_ctor{},
-                  std::move(shape),
-                  (ExtraFlags & f_style) != 0 ? detail::f_strides(*shape, itemsize())
-                                              : detail::c_strides(*shape, itemsize()),
-                  ptr,
-                  base) {}
-
-    explicit array_t(ssize_t count, const T *ptr = nullptr, handle base = handle())
-        : array({count}, {}, ptr, base) {}
-
-    constexpr ssize_t itemsize() const { return sizeof(T); }
-
-    template <typename... Ix>
-    ssize_t index_at(Ix... index) const {
-        return offset_at(index...) / itemsize();
-    }
-
-    template <typename... Ix>
-    const T *data(Ix... index) const {
-        return static_cast<const T *>(array::data(index...));
-    }
-
-    template <typename... Ix>
-    T *mutable_data(Ix... index) {
-        return static_cast<T *>(array::mutable_data(index...));
-    }
-
-    // Reference to element at a given index
-    template <typename... Ix>
-    const T &at(Ix... index) const {
-        if ((ssize_t) sizeof...(index) != ndim()) {
-            fail_dim_check(sizeof...(index), "index dimension mismatch");
-        }
-        return *(static_cast<const T *>(array::data())
-                 + byte_offset(ssize_t(index)...) / itemsize());
-    }
-
-    // Mutable reference to element at a given index
-    template <typename... Ix>
-    T &mutable_at(Ix... index) {
-        if ((ssize_t) sizeof...(index) != ndim()) {
-            fail_dim_check(sizeof...(index), "index dimension mismatch");
-        }
-        return *(static_cast<T *>(array::mutable_data())
-                 + byte_offset(ssize_t(index)...) / itemsize());
-    }
-
-    /**
-     * Returns a proxy object that provides access to the array's data without bounds or
-     * dimensionality checking.  Will throw if the array is missing the `writeable` flag.  Use with
-     * care: the array must not be destroyed or reshaped for the duration of the returned object,
-     * and the caller must take care not to access invalid dimensions or dimension indices.
-     */
-    template <ssize_t Dims = -1>
-    detail::unchecked_mutable_reference<T, Dims> mutable_unchecked() & {
-        return array::mutable_unchecked<T, Dims>();
-    }
-
-    /**
-     * Returns a proxy object that provides const access to the array's data without bounds or
-     * dimensionality checking.  Unlike `unchecked()`, this does not require that the underlying
-     * array have the `writable` flag.  Use with care: the array must not be destroyed or reshaped
-     * for the duration of the returned object, and the caller must take care not to access invalid
-     * dimensions or dimension indices.
-     */
-    template <ssize_t Dims = -1>
-    detail::unchecked_reference<T, Dims> unchecked() const & {
-        return array::unchecked<T, Dims>();
-    }
-
-    /// Ensure that the argument is a NumPy array of the correct dtype (and if not, try to convert
-    /// it).  In case of an error, nullptr is returned and the Python error is cleared.
-    static array_t ensure(handle h) {
-        auto result = reinterpret_steal<array_t>(raw_array_t(h.ptr()));
-        if (!result) {
-            PyErr_Clear();
-        }
-        return result;
-    }
-
-    static bool check_(handle h) {
-        const auto &api = detail::npy_api::get();
-        return api.PyArray_Check_(h.ptr())
-               && api.PyArray_EquivTypes_(detail::array_proxy(h.ptr())->descr,
-                                          dtype::of<T>().ptr())
-               && detail::check_flags(h.ptr(), ExtraFlags & (array::c_style | array::f_style));
-    }
-
-protected:
-    /// Create array from any object -- always returns a new reference
-    static PyObject *raw_array_t(PyObject *ptr) {
-        if (ptr == nullptr) {
-            PyErr_SetString(PyExc_ValueError, "cannot create a pybind11::array_t from a nullptr");
-            return nullptr;
-        }
-        return detail::npy_api::get().PyArray_FromAny_(ptr,
-                                                       dtype::of<T>().release().ptr(),
-                                                       0,
-                                                       0,
-                                                       detail::npy_api::NPY_ARRAY_ENSUREARRAY_
-                                                           | ExtraFlags,
-                                                       nullptr);
-    }
-};
-
-template <typename T>
-struct format_descriptor<T, detail::enable_if_t<detail::is_pod_struct<T>::value>> {
-    static std::string format() {
-        return detail::npy_format_descriptor<typename std::remove_cv<T>::type>::format();
-    }
-};
-
-template <size_t N>
-struct format_descriptor<char[N]> {
-    static std::string format() { return std::to_string(N) + 's'; }
-};
-template <size_t N>
-struct format_descriptor<std::array<char, N>> {
-    static std::string format() { return std::to_string(N) + 's'; }
-};
-
-template <typename T>
-struct format_descriptor<T, detail::enable_if_t<std::is_enum<T>::value>> {
-    static std::string format() {
-        return format_descriptor<
-            typename std::remove_cv<typename std::underlying_type<T>::type>::type>::format();
-    }
-};
-
-template <typename T>
-struct format_descriptor<T, detail::enable_if_t<detail::array_info<T>::is_array>> {
-    static std::string format() {
-        using namespace detail;
-        static constexpr auto extents = const_name("(") + array_info<T>::extents + const_name(")");
-        return extents.text + format_descriptor<remove_all_extents_t<T>>::format();
-    }
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-template <typename T, int ExtraFlags>
-struct pyobject_caster<array_t<T, ExtraFlags>> {
-    using type = array_t<T, ExtraFlags>;
-
-    bool load(handle src, bool convert) {
-        if (!convert && !type::check_(src)) {
-            return false;
-        }
-        value = type::ensure(src);
-        return static_cast<bool>(value);
-    }
-
-    static handle cast(const handle &src, return_value_policy /* policy */, handle /* parent */) {
-        return src.inc_ref();
-    }
-    PYBIND11_TYPE_CASTER(type, handle_type_name<type>::name);
-};
-
-template <typename T>
-struct compare_buffer_info<T, detail::enable_if_t<detail::is_pod_struct<T>::value>> {
-    static bool compare(const buffer_info &b) {
-        return npy_api::get().PyArray_EquivTypes_(dtype::of<T>().ptr(), dtype(b).ptr());
-    }
-};
-
-template <typename T, typename = void>
-struct npy_format_descriptor_name;
-
-template <typename T>
-struct npy_format_descriptor_name<T, enable_if_t<std::is_integral<T>::value>> {
-    static constexpr auto name = const_name<std::is_same<T, bool>::value>(
-        const_name("bool"),
-        const_name<std::is_signed<T>::value>("numpy.int", "numpy.uint")
-            + const_name<sizeof(T) * 8>());
-};
-
-template <typename T>
-struct npy_format_descriptor_name<T, enable_if_t<std::is_floating_point<T>::value>> {
-    static constexpr auto name = const_name < std::is_same<T, float>::value
-                                 || std::is_same<T, const float>::value
-                                 || std::is_same<T, double>::value
-                                 || std::is_same<T, const double>::value
-                                        > (const_name("numpy.float") + const_name<sizeof(T) * 8>(),
-                                           const_name("numpy.longdouble"));
-};
-
-template <typename T>
-struct npy_format_descriptor_name<T, enable_if_t<is_complex<T>::value>> {
-    static constexpr auto name = const_name < std::is_same<typename T::value_type, float>::value
-                                 || std::is_same<typename T::value_type, const float>::value
-                                 || std::is_same<typename T::value_type, double>::value
-                                 || std::is_same<typename T::value_type, const double>::value
-                                        > (const_name("numpy.complex")
-                                               + const_name<sizeof(typename T::value_type) * 16>(),
-                                           const_name("numpy.longcomplex"));
-};
-
-template <typename T>
-struct npy_format_descriptor<
-    T,
-    enable_if_t<satisfies_any_of<T, std::is_arithmetic, is_complex>::value>>
-    : npy_format_descriptor_name<T> {
-private:
-    // NB: the order here must match the one in common.h
-    constexpr static const int values[15] = {npy_api::NPY_BOOL_,
-                                             npy_api::NPY_BYTE_,
-                                             npy_api::NPY_UBYTE_,
-                                             npy_api::NPY_INT16_,
-                                             npy_api::NPY_UINT16_,
-                                             npy_api::NPY_INT32_,
-                                             npy_api::NPY_UINT32_,
-                                             npy_api::NPY_INT64_,
-                                             npy_api::NPY_UINT64_,
-                                             npy_api::NPY_FLOAT_,
-                                             npy_api::NPY_DOUBLE_,
-                                             npy_api::NPY_LONGDOUBLE_,
-                                             npy_api::NPY_CFLOAT_,
-                                             npy_api::NPY_CDOUBLE_,
-                                             npy_api::NPY_CLONGDOUBLE_};
-
-public:
-    static constexpr int value = values[detail::is_fmt_numeric<T>::index];
-
-    static pybind11::dtype dtype() {
-        if (auto *ptr = npy_api::get().PyArray_DescrFromType_(value)) {
-            return reinterpret_steal<pybind11::dtype>(ptr);
-        }
-        pybind11_fail("Unsupported buffer format!");
-    }
-};
-
-#define PYBIND11_DECL_CHAR_FMT                                                                    \
-    static constexpr auto name = const_name("S") + const_name<N>();                               \
-    static pybind11::dtype dtype() {                                                              \
-        return pybind11::dtype(std::string("S") + std::to_string(N));                             \
-    }
-template <size_t N>
-struct npy_format_descriptor<char[N]> {
-    PYBIND11_DECL_CHAR_FMT
-};
-template <size_t N>
-struct npy_format_descriptor<std::array<char, N>> {
-    PYBIND11_DECL_CHAR_FMT
-};
-#undef PYBIND11_DECL_CHAR_FMT
-
-template <typename T>
-struct npy_format_descriptor<T, enable_if_t<array_info<T>::is_array>> {
-private:
-    using base_descr = npy_format_descriptor<typename array_info<T>::type>;
-
-public:
-    static_assert(!array_info<T>::is_empty, "Zero-sized arrays are not supported");
-
-    static constexpr auto name
-        = const_name("(") + array_info<T>::extents + const_name(")") + base_descr::name;
-    static pybind11::dtype dtype() {
-        list shape;
-        array_info<T>::append_extents(shape);
-        return pybind11::dtype::from_args(
-            pybind11::make_tuple(base_descr::dtype(), std::move(shape)));
-    }
-};
-
-template <typename T>
-struct npy_format_descriptor<T, enable_if_t<std::is_enum<T>::value>> {
-private:
-    using base_descr = npy_format_descriptor<typename std::underlying_type<T>::type>;
-
-public:
-    static constexpr auto name = base_descr::name;
-    static pybind11::dtype dtype() { return base_descr::dtype(); }
-};
-
-struct field_descriptor {
-    const char *name;
-    ssize_t offset;
-    ssize_t size;
-    std::string format;
-    dtype descr;
-};
-
-PYBIND11_NOINLINE void register_structured_dtype(any_container<field_descriptor> fields,
-                                                 const std::type_info &tinfo,
-                                                 ssize_t itemsize,
-                                                 bool (*direct_converter)(PyObject *, void *&)) {
-
-    auto &numpy_internals = get_numpy_internals();
-    if (numpy_internals.get_type_info(tinfo, false)) {
-        pybind11_fail("NumPy: dtype is already registered");
-    }
-
-    // Use ordered fields because order matters as of NumPy 1.14:
-    // https://docs.scipy.org/doc/numpy/release.html#multiple-field-indexing-assignment-of-structured-arrays
-    std::vector<field_descriptor> ordered_fields(std::move(fields));
-    std::sort(
-        ordered_fields.begin(),
-        ordered_fields.end(),
-        [](const field_descriptor &a, const field_descriptor &b) { return a.offset < b.offset; });
-
-    list names, formats, offsets;
-    for (auto &field : ordered_fields) {
-        if (!field.descr) {
-            pybind11_fail(std::string("NumPy: unsupported field dtype: `") + field.name + "` @ "
-                          + tinfo.name());
-        }
-        names.append(pybind11::str(field.name));
-        formats.append(field.descr);
-        offsets.append(pybind11::int_(field.offset));
-    }
-    auto *dtype_ptr
-        = pybind11::dtype(std::move(names), std::move(formats), std::move(offsets), itemsize)
-              .release()
-              .ptr();
-
-    // There is an existing bug in NumPy (as of v1.11): trailing bytes are
-    // not encoded explicitly into the format string. This will supposedly
-    // get fixed in v1.12; for further details, see these:
-    // - https://github.com/numpy/numpy/issues/7797
-    // - https://github.com/numpy/numpy/pull/7798
-    // Because of this, we won't use numpy's logic to generate buffer format
-    // strings and will just do it ourselves.
-    ssize_t offset = 0;
-    std::ostringstream oss;
-    // mark the structure as unaligned with '^', because numpy and C++ don't
-    // always agree about alignment (particularly for complex), and we're
-    // explicitly listing all our padding. This depends on none of the fields
-    // overriding the endianness. Putting the ^ in front of individual fields
-    // isn't guaranteed to work due to https://github.com/numpy/numpy/issues/9049
-    oss << "^T{";
-    for (auto &field : ordered_fields) {
-        if (field.offset > offset) {
-            oss << (field.offset - offset) << 'x';
-        }
-        oss << field.format << ':' << field.name << ':';
-        offset = field.offset + field.size;
-    }
-    if (itemsize > offset) {
-        oss << (itemsize - offset) << 'x';
-    }
-    oss << '}';
-    auto format_str = oss.str();
-
-    // Sanity check: verify that NumPy properly parses our buffer format string
-    auto &api = npy_api::get();
-    auto arr = array(buffer_info(nullptr, itemsize, format_str, 1));
-    if (!api.PyArray_EquivTypes_(dtype_ptr, arr.dtype().ptr())) {
-        pybind11_fail("NumPy: invalid buffer descriptor!");
-    }
-
-    auto tindex = std::type_index(tinfo);
-    numpy_internals.registered_dtypes[tindex] = {dtype_ptr, std::move(format_str)};
-    get_internals().direct_conversions[tindex].push_back(direct_converter);
-}
-
-template <typename T, typename SFINAE>
-struct npy_format_descriptor {
-    static_assert(is_pod_struct<T>::value,
-                  "Attempt to use a non-POD or unimplemented POD type as a numpy dtype");
-
-    static constexpr auto name = make_caster<T>::name;
-
-    static pybind11::dtype dtype() { return reinterpret_borrow<pybind11::dtype>(dtype_ptr()); }
-
-    static std::string format() {
-        static auto format_str = get_numpy_internals().get_type_info<T>(true)->format_str;
-        return format_str;
-    }
-
-    static void register_dtype(any_container<field_descriptor> fields) {
-        register_structured_dtype(std::move(fields),
-                                  typeid(typename std::remove_cv<T>::type),
-                                  sizeof(T),
-                                  &direct_converter);
-    }
-
-private:
-    static PyObject *dtype_ptr() {
-        static PyObject *ptr = get_numpy_internals().get_type_info<T>(true)->dtype_ptr;
-        return ptr;
-    }
-
-    static bool direct_converter(PyObject *obj, void *&value) {
-        auto &api = npy_api::get();
-        if (!PyObject_TypeCheck(obj, api.PyVoidArrType_Type_)) {
-            return false;
-        }
-        if (auto descr = reinterpret_steal<object>(api.PyArray_DescrFromScalar_(obj))) {
-            if (api.PyArray_EquivTypes_(dtype_ptr(), descr.ptr())) {
-                value = ((PyVoidScalarObject_Proxy *) obj)->obval;
-                return true;
-            }
-        }
-        return false;
-    }
-};
-
-#ifdef __CLION_IDE__ // replace heavy macro with dummy code for the IDE (doesn't affect code)
-#    define PYBIND11_NUMPY_DTYPE(Type, ...) ((void) 0)
-#    define PYBIND11_NUMPY_DTYPE_EX(Type, ...) ((void) 0)
-#else
-
-#    define PYBIND11_FIELD_DESCRIPTOR_EX(T, Field, Name)                                          \
-        ::pybind11::detail::field_descriptor {                                                    \
-            Name, offsetof(T, Field), sizeof(decltype(std::declval<T>().Field)),                  \
-                ::pybind11::format_descriptor<decltype(std::declval<T>().Field)>::format(),       \
-                ::pybind11::detail::npy_format_descriptor<                                        \
-                    decltype(std::declval<T>().Field)>::dtype()                                   \
-        }
-
-// Extract name, offset and format descriptor for a struct field
-#    define PYBIND11_FIELD_DESCRIPTOR(T, Field) PYBIND11_FIELD_DESCRIPTOR_EX(T, Field, #    Field)
-
-// The main idea of this macro is borrowed from https://github.com/swansontec/map-macro
-// (C) William Swanson, Paul Fultz
-#    define PYBIND11_EVAL0(...) __VA_ARGS__
-#    define PYBIND11_EVAL1(...) PYBIND11_EVAL0(PYBIND11_EVAL0(PYBIND11_EVAL0(__VA_ARGS__)))
-#    define PYBIND11_EVAL2(...) PYBIND11_EVAL1(PYBIND11_EVAL1(PYBIND11_EVAL1(__VA_ARGS__)))
-#    define PYBIND11_EVAL3(...) PYBIND11_EVAL2(PYBIND11_EVAL2(PYBIND11_EVAL2(__VA_ARGS__)))
-#    define PYBIND11_EVAL4(...) PYBIND11_EVAL3(PYBIND11_EVAL3(PYBIND11_EVAL3(__VA_ARGS__)))
-#    define PYBIND11_EVAL(...) PYBIND11_EVAL4(PYBIND11_EVAL4(PYBIND11_EVAL4(__VA_ARGS__)))
-#    define PYBIND11_MAP_END(...)
-#    define PYBIND11_MAP_OUT
-#    define PYBIND11_MAP_COMMA ,
-#    define PYBIND11_MAP_GET_END() 0, PYBIND11_MAP_END
-#    define PYBIND11_MAP_NEXT0(test, next, ...) next PYBIND11_MAP_OUT
-#    define PYBIND11_MAP_NEXT1(test, next) PYBIND11_MAP_NEXT0(test, next, 0)
-#    define PYBIND11_MAP_NEXT(test, next) PYBIND11_MAP_NEXT1(PYBIND11_MAP_GET_END test, next)
-#    if defined(_MSC_VER)                                                                         \
-        && !defined(__clang__) // MSVC is not as eager to expand macros, hence this workaround
-#        define PYBIND11_MAP_LIST_NEXT1(test, next)                                               \
-            PYBIND11_EVAL0(PYBIND11_MAP_NEXT0(test, PYBIND11_MAP_COMMA next, 0))
-#    else
-#        define PYBIND11_MAP_LIST_NEXT1(test, next)                                               \
-            PYBIND11_MAP_NEXT0(test, PYBIND11_MAP_COMMA next, 0)
-#    endif
-#    define PYBIND11_MAP_LIST_NEXT(test, next)                                                    \
-        PYBIND11_MAP_LIST_NEXT1(PYBIND11_MAP_GET_END test, next)
-#    define PYBIND11_MAP_LIST0(f, t, x, peek, ...)                                                \
-        f(t, x) PYBIND11_MAP_LIST_NEXT(peek, PYBIND11_MAP_LIST1)(f, t, peek, __VA_ARGS__)
-#    define PYBIND11_MAP_LIST1(f, t, x, peek, ...)                                                \
-        f(t, x) PYBIND11_MAP_LIST_NEXT(peek, PYBIND11_MAP_LIST0)(f, t, peek, __VA_ARGS__)
-// PYBIND11_MAP_LIST(f, t, a1, a2, ...) expands to f(t, a1), f(t, a2), ...
-#    define PYBIND11_MAP_LIST(f, t, ...)                                                          \
-        PYBIND11_EVAL(PYBIND11_MAP_LIST1(f, t, __VA_ARGS__, (), 0))
-
-#    define PYBIND11_NUMPY_DTYPE(Type, ...)                                                       \
-        ::pybind11::detail::npy_format_descriptor<Type>::register_dtype(                          \
-            ::std::vector<::pybind11::detail::field_descriptor>{                                  \
-                PYBIND11_MAP_LIST(PYBIND11_FIELD_DESCRIPTOR, Type, __VA_ARGS__)})
-
-#    if defined(_MSC_VER) && !defined(__clang__)
-#        define PYBIND11_MAP2_LIST_NEXT1(test, next)                                              \
-            PYBIND11_EVAL0(PYBIND11_MAP_NEXT0(test, PYBIND11_MAP_COMMA next, 0))
-#    else
-#        define PYBIND11_MAP2_LIST_NEXT1(test, next)                                              \
-            PYBIND11_MAP_NEXT0(test, PYBIND11_MAP_COMMA next, 0)
-#    endif
-#    define PYBIND11_MAP2_LIST_NEXT(test, next)                                                   \
-        PYBIND11_MAP2_LIST_NEXT1(PYBIND11_MAP_GET_END test, next)
-#    define PYBIND11_MAP2_LIST0(f, t, x1, x2, peek, ...)                                          \
-        f(t, x1, x2) PYBIND11_MAP2_LIST_NEXT(peek, PYBIND11_MAP2_LIST1)(f, t, peek, __VA_ARGS__)
-#    define PYBIND11_MAP2_LIST1(f, t, x1, x2, peek, ...)                                          \
-        f(t, x1, x2) PYBIND11_MAP2_LIST_NEXT(peek, PYBIND11_MAP2_LIST0)(f, t, peek, __VA_ARGS__)
-// PYBIND11_MAP2_LIST(f, t, a1, a2, ...) expands to f(t, a1, a2), f(t, a3, a4), ...
-#    define PYBIND11_MAP2_LIST(f, t, ...)                                                         \
-        PYBIND11_EVAL(PYBIND11_MAP2_LIST1(f, t, __VA_ARGS__, (), 0))
-
-#    define PYBIND11_NUMPY_DTYPE_EX(Type, ...)                                                    \
-        ::pybind11::detail::npy_format_descriptor<Type>::register_dtype(                          \
-            ::std::vector<::pybind11::detail::field_descriptor>{                                  \
-                PYBIND11_MAP2_LIST(PYBIND11_FIELD_DESCRIPTOR_EX, Type, __VA_ARGS__)})
-
-#endif // __CLION_IDE__
-
-class common_iterator {
-public:
-    using container_type = std::vector<ssize_t>;
-    using value_type = container_type::value_type;
-    using size_type = container_type::size_type;
-
-    common_iterator() : m_strides() {}
-
-    common_iterator(void *ptr, const container_type &strides, const container_type &shape)
-        : p_ptr(reinterpret_cast<char *>(ptr)), m_strides(strides.size()) {
-        m_strides.back() = static_cast<value_type>(strides.back());
-        for (size_type i = m_strides.size() - 1; i != 0; --i) {
-            size_type j = i - 1;
-            auto s = static_cast<value_type>(shape[i]);
-            m_strides[j] = strides[j] + m_strides[i] - strides[i] * s;
-        }
-    }
-
-    void increment(size_type dim) { p_ptr += m_strides[dim]; }
-
-    void *data() const { return p_ptr; }
-
-private:
-    char *p_ptr{nullptr};
-    container_type m_strides;
-};
-
-template <size_t N>
-class multi_array_iterator {
-public:
-    using container_type = std::vector<ssize_t>;
-
-    multi_array_iterator(const std::array<buffer_info, N> &buffers, const container_type &shape)
-        : m_shape(shape.size()), m_index(shape.size(), 0), m_common_iterator() {
-
-        // Manual copy to avoid conversion warning if using std::copy
-        for (size_t i = 0; i < shape.size(); ++i) {
-            m_shape[i] = shape[i];
-        }
-
-        container_type strides(shape.size());
-        for (size_t i = 0; i < N; ++i) {
-            init_common_iterator(buffers[i], shape, m_common_iterator[i], strides);
-        }
-    }
-
-    multi_array_iterator &operator++() {
-        for (size_t j = m_index.size(); j != 0; --j) {
-            size_t i = j - 1;
-            if (++m_index[i] != m_shape[i]) {
-                increment_common_iterator(i);
-                break;
-            }
-            m_index[i] = 0;
-        }
-        return *this;
-    }
-
-    template <size_t K, class T = void>
-    T *data() const {
-        return reinterpret_cast<T *>(m_common_iterator[K].data());
-    }
-
-private:
-    using common_iter = common_iterator;
-
-    void init_common_iterator(const buffer_info &buffer,
-                              const container_type &shape,
-                              common_iter &iterator,
-                              container_type &strides) {
-        auto buffer_shape_iter = buffer.shape.rbegin();
-        auto buffer_strides_iter = buffer.strides.rbegin();
-        auto shape_iter = shape.rbegin();
-        auto strides_iter = strides.rbegin();
-
-        while (buffer_shape_iter != buffer.shape.rend()) {
-            if (*shape_iter == *buffer_shape_iter) {
-                *strides_iter = *buffer_strides_iter;
-            } else {
-                *strides_iter = 0;
-            }
-
-            ++buffer_shape_iter;
-            ++buffer_strides_iter;
-            ++shape_iter;
-            ++strides_iter;
-        }
-
-        std::fill(strides_iter, strides.rend(), 0);
-        iterator = common_iter(buffer.ptr, strides, shape);
-    }
-
-    void increment_common_iterator(size_t dim) {
-        for (auto &iter : m_common_iterator) {
-            iter.increment(dim);
-        }
-    }
-
-    container_type m_shape;
-    container_type m_index;
-    std::array<common_iter, N> m_common_iterator;
-};
-
-enum class broadcast_trivial { non_trivial, c_trivial, f_trivial };
-
-// Populates the shape and number of dimensions for the set of buffers.  Returns a
-// broadcast_trivial enum value indicating whether the broadcast is "trivial"--that is, has each
-// buffer being either a singleton or a full-size, C-contiguous (`c_trivial`) or Fortran-contiguous
-// (`f_trivial`) storage buffer; returns `non_trivial` otherwise.
-template <size_t N>
-broadcast_trivial
-broadcast(const std::array<buffer_info, N> &buffers, ssize_t &ndim, std::vector<ssize_t> &shape) {
-    ndim = std::accumulate(
-        buffers.begin(), buffers.end(), ssize_t(0), [](ssize_t res, const buffer_info &buf) {
-            return std::max(res, buf.ndim);
-        });
-
-    shape.clear();
-    shape.resize((size_t) ndim, 1);
-
-    // Figure out the output size, and make sure all input arrays conform (i.e. are either size 1
-    // or the full size).
-    for (size_t i = 0; i < N; ++i) {
-        auto res_iter = shape.rbegin();
-        auto end = buffers[i].shape.rend();
-        for (auto shape_iter = buffers[i].shape.rbegin(); shape_iter != end;
-             ++shape_iter, ++res_iter) {
-            const auto &dim_size_in = *shape_iter;
-            auto &dim_size_out = *res_iter;
-
-            // Each input dimension can either be 1 or `n`, but `n` values must match across
-            // buffers
-            if (dim_size_out == 1) {
-                dim_size_out = dim_size_in;
-            } else if (dim_size_in != 1 && dim_size_in != dim_size_out) {
-                pybind11_fail("pybind11::vectorize: incompatible size/dimension of inputs!");
-            }
-        }
-    }
-
-    bool trivial_broadcast_c = true;
-    bool trivial_broadcast_f = true;
-    for (size_t i = 0; i < N && (trivial_broadcast_c || trivial_broadcast_f); ++i) {
-        if (buffers[i].size == 1) {
-            continue;
-        }
-
-        // Require the same number of dimensions:
-        if (buffers[i].ndim != ndim) {
-            return broadcast_trivial::non_trivial;
-        }
-
-        // Require all dimensions be full-size:
-        if (!std::equal(buffers[i].shape.cbegin(), buffers[i].shape.cend(), shape.cbegin())) {
-            return broadcast_trivial::non_trivial;
-        }
-
-        // Check for C contiguity (but only if previous inputs were also C contiguous)
-        if (trivial_broadcast_c) {
-            ssize_t expect_stride = buffers[i].itemsize;
-            auto end = buffers[i].shape.crend();
-            for (auto shape_iter = buffers[i].shape.crbegin(),
-                      stride_iter = buffers[i].strides.crbegin();
-                 trivial_broadcast_c && shape_iter != end;
-                 ++shape_iter, ++stride_iter) {
-                if (expect_stride == *stride_iter) {
-                    expect_stride *= *shape_iter;
-                } else {
-                    trivial_broadcast_c = false;
-                }
-            }
-        }
-
-        // Check for Fortran contiguity (if previous inputs were also F contiguous)
-        if (trivial_broadcast_f) {
-            ssize_t expect_stride = buffers[i].itemsize;
-            auto end = buffers[i].shape.cend();
-            for (auto shape_iter = buffers[i].shape.cbegin(),
-                      stride_iter = buffers[i].strides.cbegin();
-                 trivial_broadcast_f && shape_iter != end;
-                 ++shape_iter, ++stride_iter) {
-                if (expect_stride == *stride_iter) {
-                    expect_stride *= *shape_iter;
-                } else {
-                    trivial_broadcast_f = false;
-                }
-            }
-        }
-    }
-
-    return trivial_broadcast_c   ? broadcast_trivial::c_trivial
-           : trivial_broadcast_f ? broadcast_trivial::f_trivial
-                                 : broadcast_trivial::non_trivial;
-}
-
-template <typename T>
-struct vectorize_arg {
-    static_assert(!std::is_rvalue_reference<T>::value,
-                  "Functions with rvalue reference arguments cannot be vectorized");
-    // The wrapped function gets called with this type:
-    using call_type = remove_reference_t<T>;
-    // Is this a vectorized argument?
-    static constexpr bool vectorize
-        = satisfies_any_of<call_type, std::is_arithmetic, is_complex, is_pod>::value
-          && satisfies_none_of<call_type,
-                               std::is_pointer,
-                               std::is_array,
-                               is_std_array,
-                               std::is_enum>::value
-          && (!std::is_reference<T>::value
-              || (std::is_lvalue_reference<T>::value && std::is_const<call_type>::value));
-    // Accept this type: an array for vectorized types, otherwise the type as-is:
-    using type = conditional_t<vectorize, array_t<remove_cv_t<call_type>, array::forcecast>, T>;
-};
-
-// py::vectorize when a return type is present
-template <typename Func, typename Return, typename... Args>
-struct vectorize_returned_array {
-    using Type = array_t<Return>;
-
-    static Type create(broadcast_trivial trivial, const std::vector<ssize_t> &shape) {
-        if (trivial == broadcast_trivial::f_trivial) {
-            return array_t<Return, array::f_style>(shape);
-        }
-        return array_t<Return>(shape);
-    }
-
-    static Return *mutable_data(Type &array) { return array.mutable_data(); }
-
-    static Return call(Func &f, Args &...args) { return f(args...); }
-
-    static void call(Return *out, size_t i, Func &f, Args &...args) { out[i] = f(args...); }
-};
-
-// py::vectorize when a return type is not present
-template <typename Func, typename... Args>
-struct vectorize_returned_array<Func, void, Args...> {
-    using Type = none;
-
-    static Type create(broadcast_trivial, const std::vector<ssize_t> &) { return none(); }
-
-    static void *mutable_data(Type &) { return nullptr; }
-
-    static detail::void_type call(Func &f, Args &...args) {
-        f(args...);
-        return {};
-    }
-
-    static void call(void *, size_t, Func &f, Args &...args) { f(args...); }
-};
-
-template <typename Func, typename Return, typename... Args>
-struct vectorize_helper {
-
-// NVCC for some reason breaks if NVectorized is private
-#ifdef __CUDACC__
-public:
-#else
-private:
-#endif
-
-    static constexpr size_t N = sizeof...(Args);
-    static constexpr size_t NVectorized = constexpr_sum(vectorize_arg<Args>::vectorize...);
-    static_assert(
-        NVectorized >= 1,
-        "pybind11::vectorize(...) requires a function with at least one vectorizable argument");
-
-public:
-    template <typename T,
-              // SFINAE to prevent shadowing the copy constructor.
-              typename = detail::enable_if_t<
-                  !std::is_same<vectorize_helper, typename std::decay<T>::type>::value>>
-    explicit vectorize_helper(T &&f) : f(std::forward<T>(f)) {}
-
-    object operator()(typename vectorize_arg<Args>::type... args) {
-        return run(args...,
-                   make_index_sequence<N>(),
-                   select_indices<vectorize_arg<Args>::vectorize...>(),
-                   make_index_sequence<NVectorized>());
-    }
-
-private:
-    remove_reference_t<Func> f;
-
-    // Internal compiler error in MSVC 19.16.27025.1 (Visual Studio 2017 15.9.4), when compiling
-    // with "/permissive-" flag when arg_call_types is manually inlined.
-    using arg_call_types = std::tuple<typename vectorize_arg<Args>::call_type...>;
-    template <size_t Index>
-    using param_n_t = typename std::tuple_element<Index, arg_call_types>::type;
-
-    using returned_array = vectorize_returned_array<Func, Return, Args...>;
-
-    // Runs a vectorized function given arguments tuple and three index sequences:
-    //     - Index is the full set of 0 ... (N-1) argument indices;
-    //     - VIndex is the subset of argument indices with vectorized parameters, letting us access
-    //       vectorized arguments (anything not in this sequence is passed through)
-    //     - BIndex is a incremental sequence (beginning at 0) of the same size as VIndex, so that
-    //       we can store vectorized buffer_infos in an array (argument VIndex has its buffer at
-    //       index BIndex in the array).
-    template <size_t... Index, size_t... VIndex, size_t... BIndex>
-    object run(typename vectorize_arg<Args>::type &...args,
-               index_sequence<Index...> i_seq,
-               index_sequence<VIndex...> vi_seq,
-               index_sequence<BIndex...> bi_seq) {
-
-        // Pointers to values the function was called with; the vectorized ones set here will start
-        // out as array_t<T> pointers, but they will be changed them to T pointers before we make
-        // call the wrapped function.  Non-vectorized pointers are left as-is.
-        std::array<void *, N> params{{&args...}};
-
-        // The array of `buffer_info`s of vectorized arguments:
-        std::array<buffer_info, NVectorized> buffers{
-            {reinterpret_cast<array *>(params[VIndex])->request()...}};
-
-        /* Determine dimensions parameters of output array */
-        ssize_t nd = 0;
-        std::vector<ssize_t> shape(0);
-        auto trivial = broadcast(buffers, nd, shape);
-        auto ndim = (size_t) nd;
-
-        size_t size
-            = std::accumulate(shape.begin(), shape.end(), (size_t) 1, std::multiplies<size_t>());
-
-        // If all arguments are 0-dimension arrays (i.e. single values) return a plain value (i.e.
-        // not wrapped in an array).
-        if (size == 1 && ndim == 0) {
-            PYBIND11_EXPAND_SIDE_EFFECTS(params[VIndex] = buffers[BIndex].ptr);
-            return cast(
-                returned_array::call(f, *reinterpret_cast<param_n_t<Index> *>(params[Index])...));
-        }
-
-        auto result = returned_array::create(trivial, shape);
-#ifdef PYBIND11_DETECTED_CLANG_WITH_MISLEADING_CALL_STD_MOVE_EXPLICITLY_WARNING
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wreturn-std-move"
-#endif
-
-        if (size == 0) {
-            return result;
-        }
-
-        /* Call the function */
-        auto *mutable_data = returned_array::mutable_data(result);
-        if (trivial == broadcast_trivial::non_trivial) {
-            apply_broadcast(buffers, params, mutable_data, size, shape, i_seq, vi_seq, bi_seq);
-        } else {
-            apply_trivial(buffers, params, mutable_data, size, i_seq, vi_seq, bi_seq);
-        }
-
-        return result;
-#ifdef PYBIND11_DETECTED_CLANG_WITH_MISLEADING_CALL_STD_MOVE_EXPLICITLY_WARNING
-#    pragma clang diagnostic pop
-#endif
-    }
-
-    template <size_t... Index, size_t... VIndex, size_t... BIndex>
-    void apply_trivial(std::array<buffer_info, NVectorized> &buffers,
-                       std::array<void *, N> &params,
-                       Return *out,
-                       size_t size,
-                       index_sequence<Index...>,
-                       index_sequence<VIndex...>,
-                       index_sequence<BIndex...>) {
-
-        // Initialize an array of mutable byte references and sizes with references set to the
-        // appropriate pointer in `params`; as we iterate, we'll increment each pointer by its size
-        // (except for singletons, which get an increment of 0).
-        std::array<std::pair<unsigned char *&, const size_t>, NVectorized> vecparams{
-            {std::pair<unsigned char *&, const size_t>(
-                reinterpret_cast<unsigned char *&>(params[VIndex] = buffers[BIndex].ptr),
-                buffers[BIndex].size == 1 ? 0 : sizeof(param_n_t<VIndex>))...}};
-
-        for (size_t i = 0; i < size; ++i) {
-            returned_array::call(
-                out, i, f, *reinterpret_cast<param_n_t<Index> *>(params[Index])...);
-            for (auto &x : vecparams) {
-                x.first += x.second;
-            }
-        }
-    }
-
-    template <size_t... Index, size_t... VIndex, size_t... BIndex>
-    void apply_broadcast(std::array<buffer_info, NVectorized> &buffers,
-                         std::array<void *, N> &params,
-                         Return *out,
-                         size_t size,
-                         const std::vector<ssize_t> &output_shape,
-                         index_sequence<Index...>,
-                         index_sequence<VIndex...>,
-                         index_sequence<BIndex...>) {
-
-        multi_array_iterator<NVectorized> input_iter(buffers, output_shape);
-
-        for (size_t i = 0; i < size; ++i, ++input_iter) {
-            PYBIND11_EXPAND_SIDE_EFFECTS((params[VIndex] = input_iter.template data<BIndex>()));
-            returned_array::call(
-                out, i, f, *reinterpret_cast<param_n_t<Index> *>(std::get<Index>(params))...);
-        }
-    }
-};
-
-template <typename Func, typename Return, typename... Args>
-vectorize_helper<Func, Return, Args...> vectorize_extractor(const Func &f, Return (*)(Args...)) {
-    return detail::vectorize_helper<Func, Return, Args...>(f);
-}
-
-template <typename T, int Flags>
-struct handle_type_name<array_t<T, Flags>> {
-    static constexpr auto name
-        = const_name("numpy.ndarray[") + npy_format_descriptor<T>::name + const_name("]");
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-// Vanilla pointer vectorizer:
-template <typename Return, typename... Args>
-detail::vectorize_helper<Return (*)(Args...), Return, Args...> vectorize(Return (*f)(Args...)) {
-    return detail::vectorize_helper<Return (*)(Args...), Return, Args...>(f);
-}
-
-// lambda vectorizer:
-template <typename Func, detail::enable_if_t<detail::is_lambda<Func>::value, int> = 0>
-auto vectorize(Func &&f)
-    -> decltype(detail::vectorize_extractor(std::forward<Func>(f),
-                                            (detail::function_signature_t<Func> *) nullptr)) {
-    return detail::vectorize_extractor(std::forward<Func>(f),
-                                       (detail::function_signature_t<Func> *) nullptr);
-}
-
-// Vectorize a class method (non-const):
-template <typename Return,
-          typename Class,
-          typename... Args,
-          typename Helper = detail::vectorize_helper<
-              decltype(std::mem_fn(std::declval<Return (Class::*)(Args...)>())),
-              Return,
-              Class *,
-              Args...>>
-Helper vectorize(Return (Class::*f)(Args...)) {
-    return Helper(std::mem_fn(f));
-}
-
-// Vectorize a class method (const):
-template <typename Return,
-          typename Class,
-          typename... Args,
-          typename Helper = detail::vectorize_helper<
-              decltype(std::mem_fn(std::declval<Return (Class::*)(Args...) const>())),
-              Return,
-              const Class *,
-              Args...>>
-Helper vectorize(Return (Class::*f)(Args...) const) {
-    return Helper(std::mem_fn(f));
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/operators.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/operators.h
deleted file mode 100644
index a0c3b78d6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/operators.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-    pybind11/operator.h: Metatemplates for operator overloading
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// Enumeration with all supported operator types
-enum op_id : int {
-    op_add,
-    op_sub,
-    op_mul,
-    op_div,
-    op_mod,
-    op_divmod,
-    op_pow,
-    op_lshift,
-    op_rshift,
-    op_and,
-    op_xor,
-    op_or,
-    op_neg,
-    op_pos,
-    op_abs,
-    op_invert,
-    op_int,
-    op_long,
-    op_float,
-    op_str,
-    op_cmp,
-    op_gt,
-    op_ge,
-    op_lt,
-    op_le,
-    op_eq,
-    op_ne,
-    op_iadd,
-    op_isub,
-    op_imul,
-    op_idiv,
-    op_imod,
-    op_ilshift,
-    op_irshift,
-    op_iand,
-    op_ixor,
-    op_ior,
-    op_complex,
-    op_bool,
-    op_nonzero,
-    op_repr,
-    op_truediv,
-    op_itruediv,
-    op_hash
-};
-
-enum op_type : int {
-    op_l, /* base type on left */
-    op_r, /* base type on right */
-    op_u  /* unary operator */
-};
-
-struct self_t {};
-static const self_t self = self_t();
-
-/// Type for an unused type slot
-struct undefined_t {};
-
-/// Don't warn about an unused variable
-inline self_t __self() { return self; }
-
-/// base template of operator implementations
-template <op_id, op_type, typename B, typename L, typename R>
-struct op_impl {};
-
-/// Operator implementation generator
-template <op_id id, op_type ot, typename L, typename R>
-struct op_ {
-    template <typename Class, typename... Extra>
-    void execute(Class &cl, const Extra &...extra) const {
-        using Base = typename Class::type;
-        using L_type = conditional_t<std::is_same<L, self_t>::value, Base, L>;
-        using R_type = conditional_t<std::is_same<R, self_t>::value, Base, R>;
-        using op = op_impl<id, ot, Base, L_type, R_type>;
-        cl.def(op::name(), &op::execute, is_operator(), extra...);
-    }
-    template <typename Class, typename... Extra>
-    void execute_cast(Class &cl, const Extra &...extra) const {
-        using Base = typename Class::type;
-        using L_type = conditional_t<std::is_same<L, self_t>::value, Base, L>;
-        using R_type = conditional_t<std::is_same<R, self_t>::value, Base, R>;
-        using op = op_impl<id, ot, Base, L_type, R_type>;
-        cl.def(op::name(), &op::execute_cast, is_operator(), extra...);
-    }
-};
-
-#define PYBIND11_BINARY_OPERATOR(id, rid, op, expr)                                               \
-    template <typename B, typename L, typename R>                                                 \
-    struct op_impl<op_##id, op_l, B, L, R> {                                                      \
-        static char const *name() { return "__" #id "__"; }                                       \
-        static auto execute(const L &l, const R &r) -> decltype(expr) { return (expr); }          \
-        static B execute_cast(const L &l, const R &r) { return B(expr); }                         \
-    };                                                                                            \
-    template <typename B, typename L, typename R>                                                 \
-    struct op_impl<op_##id, op_r, B, L, R> {                                                      \
-        static char const *name() { return "__" #rid "__"; }                                      \
-        static auto execute(const R &r, const L &l) -> decltype(expr) { return (expr); }          \
-        static B execute_cast(const R &r, const L &l) { return B(expr); }                         \
-    };                                                                                            \
-    inline op_<op_##id, op_l, self_t, self_t> op(const self_t &, const self_t &) {                \
-        return op_<op_##id, op_l, self_t, self_t>();                                              \
-    }                                                                                             \
-    template <typename T>                                                                         \
-    op_<op_##id, op_l, self_t, T> op(const self_t &, const T &) {                                 \
-        return op_<op_##id, op_l, self_t, T>();                                                   \
-    }                                                                                             \
-    template <typename T>                                                                         \
-    op_<op_##id, op_r, T, self_t> op(const T &, const self_t &) {                                 \
-        return op_<op_##id, op_r, T, self_t>();                                                   \
-    }
-
-#define PYBIND11_INPLACE_OPERATOR(id, op, expr)                                                   \
-    template <typename B, typename L, typename R>                                                 \
-    struct op_impl<op_##id, op_l, B, L, R> {                                                      \
-        static char const *name() { return "__" #id "__"; }                                       \
-        static auto execute(L &l, const R &r) -> decltype(expr) { return expr; }                  \
-        static B execute_cast(L &l, const R &r) { return B(expr); }                               \
-    };                                                                                            \
-    template <typename T>                                                                         \
-    op_<op_##id, op_l, self_t, T> op(const self_t &, const T &) {                                 \
-        return op_<op_##id, op_l, self_t, T>();                                                   \
-    }
-
-#define PYBIND11_UNARY_OPERATOR(id, op, expr)                                                     \
-    template <typename B, typename L>                                                             \
-    struct op_impl<op_##id, op_u, B, L, undefined_t> {                                            \
-        static char const *name() { return "__" #id "__"; }                                       \
-        static auto execute(const L &l) -> decltype(expr) { return expr; }                        \
-        static B execute_cast(const L &l) { return B(expr); }                                     \
-    };                                                                                            \
-    inline op_<op_##id, op_u, self_t, undefined_t> op(const self_t &) {                           \
-        return op_<op_##id, op_u, self_t, undefined_t>();                                         \
-    }
-
-PYBIND11_BINARY_OPERATOR(sub, rsub, operator-, l - r)
-PYBIND11_BINARY_OPERATOR(add, radd, operator+, l + r)
-PYBIND11_BINARY_OPERATOR(mul, rmul, operator*, l *r)
-PYBIND11_BINARY_OPERATOR(truediv, rtruediv, operator/, l / r)
-PYBIND11_BINARY_OPERATOR(mod, rmod, operator%, l % r)
-PYBIND11_BINARY_OPERATOR(lshift, rlshift, operator<<, l << r)
-PYBIND11_BINARY_OPERATOR(rshift, rrshift, operator>>, l >> r)
-PYBIND11_BINARY_OPERATOR(and, rand, operator&, l &r)
-PYBIND11_BINARY_OPERATOR(xor, rxor, operator^, l ^ r)
-PYBIND11_BINARY_OPERATOR(eq, eq, operator==, l == r)
-PYBIND11_BINARY_OPERATOR(ne, ne, operator!=, l != r)
-PYBIND11_BINARY_OPERATOR(or, ror, operator|, l | r)
-PYBIND11_BINARY_OPERATOR(gt, lt, operator>, l > r)
-PYBIND11_BINARY_OPERATOR(ge, le, operator>=, l >= r)
-PYBIND11_BINARY_OPERATOR(lt, gt, operator<, l < r)
-PYBIND11_BINARY_OPERATOR(le, ge, operator<=, l <= r)
-// PYBIND11_BINARY_OPERATOR(pow,       rpow,         pow,          std::pow(l,  r))
-PYBIND11_INPLACE_OPERATOR(iadd, operator+=, l += r)
-PYBIND11_INPLACE_OPERATOR(isub, operator-=, l -= r)
-PYBIND11_INPLACE_OPERATOR(imul, operator*=, l *= r)
-PYBIND11_INPLACE_OPERATOR(itruediv, operator/=, l /= r)
-PYBIND11_INPLACE_OPERATOR(imod, operator%=, l %= r)
-PYBIND11_INPLACE_OPERATOR(ilshift, operator<<=, l <<= r)
-PYBIND11_INPLACE_OPERATOR(irshift, operator>>=, l >>= r)
-PYBIND11_INPLACE_OPERATOR(iand, operator&=, l &= r)
-PYBIND11_INPLACE_OPERATOR(ixor, operator^=, l ^= r)
-PYBIND11_INPLACE_OPERATOR(ior, operator|=, l |= r)
-PYBIND11_UNARY_OPERATOR(neg, operator-, -l)
-PYBIND11_UNARY_OPERATOR(pos, operator+, +l)
-// WARNING: This usage of `abs` should only be done for existing STL overloads.
-// Adding overloads directly in to the `std::` namespace is advised against:
-// https://en.cppreference.com/w/cpp/language/extending_std
-PYBIND11_UNARY_OPERATOR(abs, abs, std::abs(l))
-PYBIND11_UNARY_OPERATOR(hash, hash, std::hash<L>()(l))
-PYBIND11_UNARY_OPERATOR(invert, operator~, (~l))
-PYBIND11_UNARY_OPERATOR(bool, operator!, !!l)
-PYBIND11_UNARY_OPERATOR(int, int_, (int) l)
-PYBIND11_UNARY_OPERATOR(float, float_, (double) l)
-
-#undef PYBIND11_BINARY_OPERATOR
-#undef PYBIND11_INPLACE_OPERATOR
-#undef PYBIND11_UNARY_OPERATOR
-PYBIND11_NAMESPACE_END(detail)
-
-using detail::self;
-// Add named operators so that they are accessible via `py::`.
-using detail::hash;
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/options.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/options.h
deleted file mode 100644
index 1e493bdcc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/options.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    pybind11/options.h: global settings that are configurable at runtime.
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-class options {
-public:
-    // Default RAII constructor, which leaves settings as they currently are.
-    options() : previous_state(global_state()) {}
-
-    // Class is non-copyable.
-    options(const options &) = delete;
-    options &operator=(const options &) = delete;
-
-    // Destructor, which restores settings that were in effect before.
-    ~options() { global_state() = previous_state; }
-
-    // Setter methods (affect the global state):
-
-    options &disable_user_defined_docstrings() & {
-        global_state().show_user_defined_docstrings = false;
-        return *this;
-    }
-
-    options &enable_user_defined_docstrings() & {
-        global_state().show_user_defined_docstrings = true;
-        return *this;
-    }
-
-    options &disable_function_signatures() & {
-        global_state().show_function_signatures = false;
-        return *this;
-    }
-
-    options &enable_function_signatures() & {
-        global_state().show_function_signatures = true;
-        return *this;
-    }
-
-    // Getter methods (return the global state):
-
-    static bool show_user_defined_docstrings() {
-        return global_state().show_user_defined_docstrings;
-    }
-
-    static bool show_function_signatures() { return global_state().show_function_signatures; }
-
-    // This type is not meant to be allocated on the heap.
-    void *operator new(size_t) = delete;
-
-private:
-    struct state {
-        bool show_user_defined_docstrings = true; //< Include user-supplied texts in docstrings.
-        bool show_function_signatures = true;     //< Include auto-generated function signatures
-                                                  //  in docstrings.
-    };
-
-    static state &global_state() {
-        static state instance;
-        return instance;
-    }
-
-    state previous_state;
-};
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/pybind11.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/pybind11.h
deleted file mode 100644
index c889dc416..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/pybind11.h
+++ /dev/null
@@ -1,2864 +0,0 @@
-/*
-    pybind11/pybind11.h: Main header file of the C++11 python
-    binding generator library
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/class.h"
-#include "detail/init.h"
-#include "attr.h"
-#include "gil.h"
-#include "options.h"
-
-#include <cstdlib>
-#include <cstring>
-#include <memory>
-#include <new>
-#include <string>
-#include <utility>
-#include <vector>
-
-#if defined(__cpp_lib_launder) && !(defined(_MSC_VER) && (_MSC_VER < 1914))
-#    define PYBIND11_STD_LAUNDER std::launder
-#    define PYBIND11_HAS_STD_LAUNDER 1
-#else
-#    define PYBIND11_STD_LAUNDER
-#    define PYBIND11_HAS_STD_LAUNDER 0
-#endif
-#if defined(__GNUG__) && !defined(__clang__)
-#    include <cxxabi.h>
-#endif
-
-/* https://stackoverflow.com/questions/46798456/handling-gccs-noexcept-type-warning
-   This warning is about ABI compatibility, not code health.
-   It is only actually needed in a couple places, but apparently GCC 7 "generates this warning if
-   and only if the first template instantiation ... involves noexcept" [stackoverflow], therefore
-   it could get triggered from seemingly random places, depending on user code.
-   No other GCC version generates this warning.
- */
-#if defined(__GNUC__) && __GNUC__ == 7
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wnoexcept-type"
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Apply all the extensions translators from a list
-// Return true if one of the translators completed without raising an exception
-// itself. Return of false indicates that if there are other translators
-// available, they should be tried.
-inline bool apply_exception_translators(std::forward_list<ExceptionTranslator> &translators) {
-    auto last_exception = std::current_exception();
-
-    for (auto &translator : translators) {
-        try {
-            translator(last_exception);
-            return true;
-        } catch (...) {
-            last_exception = std::current_exception();
-        }
-    }
-    return false;
-}
-
-#if defined(_MSC_VER)
-#    define PYBIND11_COMPAT_STRDUP _strdup
-#else
-#    define PYBIND11_COMPAT_STRDUP strdup
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Wraps an arbitrary C++ function/method/lambda function/.. into a callable Python object
-class cpp_function : public function {
-public:
-    cpp_function() = default;
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    cpp_function(std::nullptr_t) {}
-
-    /// Construct a cpp_function from a vanilla function pointer
-    template <typename Return, typename... Args, typename... Extra>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    cpp_function(Return (*f)(Args...), const Extra &...extra) {
-        initialize(f, f, extra...);
-    }
-
-    /// Construct a cpp_function from a lambda function (possibly with internal state)
-    template <typename Func,
-              typename... Extra,
-              typename = detail::enable_if_t<detail::is_lambda<Func>::value>>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    cpp_function(Func &&f, const Extra &...extra) {
-        initialize(
-            std::forward<Func>(f), (detail::function_signature_t<Func> *) nullptr, extra...);
-    }
-
-    /// Construct a cpp_function from a class method (non-const, no ref-qualifier)
-    template <typename Return, typename Class, typename... Arg, typename... Extra>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    cpp_function(Return (Class::*f)(Arg...), const Extra &...extra) {
-        initialize(
-            [f](Class *c, Arg... args) -> Return { return (c->*f)(std::forward<Arg>(args)...); },
-            (Return(*)(Class *, Arg...)) nullptr,
-            extra...);
-    }
-
-    /// Construct a cpp_function from a class method (non-const, lvalue ref-qualifier)
-    /// A copy of the overload for non-const functions without explicit ref-qualifier
-    /// but with an added `&`.
-    template <typename Return, typename Class, typename... Arg, typename... Extra>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    cpp_function(Return (Class::*f)(Arg...) &, const Extra &...extra) {
-        initialize(
-            [f](Class *c, Arg... args) -> Return { return (c->*f)(std::forward<Arg>(args)...); },
-            (Return(*)(Class *, Arg...)) nullptr,
-            extra...);
-    }
-
-    /// Construct a cpp_function from a class method (const, no ref-qualifier)
-    template <typename Return, typename Class, typename... Arg, typename... Extra>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    cpp_function(Return (Class::*f)(Arg...) const, const Extra &...extra) {
-        initialize([f](const Class *c,
-                       Arg... args) -> Return { return (c->*f)(std::forward<Arg>(args)...); },
-                   (Return(*)(const Class *, Arg...)) nullptr,
-                   extra...);
-    }
-
-    /// Construct a cpp_function from a class method (const, lvalue ref-qualifier)
-    /// A copy of the overload for const functions without explicit ref-qualifier
-    /// but with an added `&`.
-    template <typename Return, typename Class, typename... Arg, typename... Extra>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    cpp_function(Return (Class::*f)(Arg...) const &, const Extra &...extra) {
-        initialize([f](const Class *c,
-                       Arg... args) -> Return { return (c->*f)(std::forward<Arg>(args)...); },
-                   (Return(*)(const Class *, Arg...)) nullptr,
-                   extra...);
-    }
-
-    /// Return the function name
-    object name() const { return attr("__name__"); }
-
-protected:
-    struct InitializingFunctionRecordDeleter {
-        // `destruct(function_record, false)`: `initialize_generic` copies strings and
-        // takes care of cleaning up in case of exceptions. So pass `false` to `free_strings`.
-        void operator()(detail::function_record *rec) { destruct(rec, false); }
-    };
-    using unique_function_record
-        = std::unique_ptr<detail::function_record, InitializingFunctionRecordDeleter>;
-
-    /// Space optimization: don't inline this frequently instantiated fragment
-    PYBIND11_NOINLINE unique_function_record make_function_record() {
-        return unique_function_record(new detail::function_record());
-    }
-
-    /// Special internal constructor for functors, lambda functions, etc.
-    template <typename Func, typename Return, typename... Args, typename... Extra>
-    void initialize(Func &&f, Return (*)(Args...), const Extra &...extra) {
-        using namespace detail;
-        struct capture {
-            remove_reference_t<Func> f;
-        };
-
-        /* Store the function including any extra state it might have (e.g. a lambda capture
-         * object) */
-        // The unique_ptr makes sure nothing is leaked in case of an exception.
-        auto unique_rec = make_function_record();
-        auto *rec = unique_rec.get();
-
-        /* Store the capture object directly in the function record if there is enough space */
-        if (PYBIND11_SILENCE_MSVC_C4127(sizeof(capture) <= sizeof(rec->data))) {
-            /* Without these pragmas, GCC warns that there might not be
-               enough space to use the placement new operator. However, the
-               'if' statement above ensures that this is the case. */
-#if defined(__GNUG__) && __GNUC__ >= 6 && !defined(__clang__) && !defined(__INTEL_COMPILER)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wplacement-new"
-#endif
-            new ((capture *) &rec->data) capture{std::forward<Func>(f)};
-#if defined(__GNUG__) && __GNUC__ >= 6 && !defined(__clang__) && !defined(__INTEL_COMPILER)
-#    pragma GCC diagnostic pop
-#endif
-#if defined(__GNUG__) && !PYBIND11_HAS_STD_LAUNDER && !defined(__INTEL_COMPILER)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-            // UB without std::launder, but without breaking ABI and/or
-            // a significant refactoring it's "impossible" to solve.
-            if (!std::is_trivially_destructible<capture>::value) {
-                rec->free_data = [](function_record *r) {
-                    auto data = PYBIND11_STD_LAUNDER((capture *) &r->data);
-                    (void) data;
-                    data->~capture();
-                };
-            }
-#if defined(__GNUG__) && !PYBIND11_HAS_STD_LAUNDER && !defined(__INTEL_COMPILER)
-#    pragma GCC diagnostic pop
-#endif
-        } else {
-            rec->data[0] = new capture{std::forward<Func>(f)};
-            rec->free_data = [](function_record *r) { delete ((capture *) r->data[0]); };
-        }
-
-        /* Type casters for the function arguments and return value */
-        using cast_in = argument_loader<Args...>;
-        using cast_out
-            = make_caster<conditional_t<std::is_void<Return>::value, void_type, Return>>;
-
-        static_assert(
-            expected_num_args<Extra...>(
-                sizeof...(Args), cast_in::args_pos >= 0, cast_in::has_kwargs),
-            "The number of argument annotations does not match the number of function arguments");
-
-        /* Dispatch code which converts function arguments and performs the actual function call */
-        rec->impl = [](function_call &call) -> handle {
-            cast_in args_converter;
-
-            /* Try to cast the function arguments into the C++ domain */
-            if (!args_converter.load_args(call)) {
-                return PYBIND11_TRY_NEXT_OVERLOAD;
-            }
-
-            /* Invoke call policy pre-call hook */
-            process_attributes<Extra...>::precall(call);
-
-            /* Get a pointer to the capture object */
-            const auto *data = (sizeof(capture) <= sizeof(call.func.data) ? &call.func.data
-                                                                          : call.func.data[0]);
-            auto *cap = const_cast<capture *>(reinterpret_cast<const capture *>(data));
-
-            /* Override policy for rvalues -- usually to enforce rvp::move on an rvalue */
-            return_value_policy policy
-                = return_value_policy_override<Return>::policy(call.func.policy);
-
-            /* Function scope guard -- defaults to the compile-to-nothing `void_type` */
-            using Guard = extract_guard_t<Extra...>;
-
-            /* Perform the function call */
-            handle result
-                = cast_out::cast(std::move(args_converter).template call<Return, Guard>(cap->f),
-                                 policy,
-                                 call.parent);
-
-            /* Invoke call policy post-call hook */
-            process_attributes<Extra...>::postcall(call, result);
-
-            return result;
-        };
-
-        rec->nargs_pos = cast_in::args_pos >= 0
-                             ? static_cast<std::uint16_t>(cast_in::args_pos)
-                             : sizeof...(Args) - cast_in::has_kwargs; // Will get reduced more if
-                                                                      // we have a kw_only
-        rec->has_args = cast_in::args_pos >= 0;
-        rec->has_kwargs = cast_in::has_kwargs;
-
-        /* Process any user-provided function attributes */
-        process_attributes<Extra...>::init(extra..., rec);
-
-        {
-            constexpr bool has_kw_only_args = any_of<std::is_same<kw_only, Extra>...>::value,
-                           has_pos_only_args = any_of<std::is_same<pos_only, Extra>...>::value,
-                           has_arg_annotations = any_of<is_keyword<Extra>...>::value;
-            static_assert(has_arg_annotations || !has_kw_only_args,
-                          "py::kw_only requires the use of argument annotations");
-            static_assert(has_arg_annotations || !has_pos_only_args,
-                          "py::pos_only requires the use of argument annotations (for docstrings "
-                          "and aligning the annotations to the argument)");
-
-            static_assert(constexpr_sum(is_kw_only<Extra>::value...) <= 1,
-                          "py::kw_only may be specified only once");
-            static_assert(constexpr_sum(is_pos_only<Extra>::value...) <= 1,
-                          "py::pos_only may be specified only once");
-            constexpr auto kw_only_pos = constexpr_first<is_kw_only, Extra...>();
-            constexpr auto pos_only_pos = constexpr_first<is_pos_only, Extra...>();
-            static_assert(!(has_kw_only_args && has_pos_only_args) || pos_only_pos < kw_only_pos,
-                          "py::pos_only must come before py::kw_only");
-        }
-
-        /* Generate a readable signature describing the function's arguments and return
-           value types */
-        static constexpr auto signature
-            = const_name("(") + cast_in::arg_names + const_name(") -> ") + cast_out::name;
-        PYBIND11_DESCR_CONSTEXPR auto types = decltype(signature)::types();
-
-        /* Register the function with Python from generic (non-templated) code */
-        // Pass on the ownership over the `unique_rec` to `initialize_generic`. `rec` stays valid.
-        initialize_generic(std::move(unique_rec), signature.text, types.data(), sizeof...(Args));
-
-        /* Stash some additional information used by an important optimization in 'functional.h' */
-        using FunctionType = Return (*)(Args...);
-        constexpr bool is_function_ptr
-            = std::is_convertible<Func, FunctionType>::value && sizeof(capture) == sizeof(void *);
-        if (is_function_ptr) {
-            rec->is_stateless = true;
-            rec->data[1]
-                = const_cast<void *>(reinterpret_cast<const void *>(&typeid(FunctionType)));
-        }
-    }
-
-    // Utility class that keeps track of all duplicated strings, and cleans them up in its
-    // destructor, unless they are released. Basically a RAII-solution to deal with exceptions
-    // along the way.
-    class strdup_guard {
-    public:
-        strdup_guard() = default;
-        strdup_guard(const strdup_guard &) = delete;
-        strdup_guard &operator=(const strdup_guard &) = delete;
-
-        ~strdup_guard() {
-            for (auto *s : strings) {
-                std::free(s);
-            }
-        }
-        char *operator()(const char *s) {
-            auto *t = PYBIND11_COMPAT_STRDUP(s);
-            strings.push_back(t);
-            return t;
-        }
-        void release() { strings.clear(); }
-
-    private:
-        std::vector<char *> strings;
-    };
-
-    /// Register a function call with Python (generic non-templated code goes here)
-    void initialize_generic(unique_function_record &&unique_rec,
-                            const char *text,
-                            const std::type_info *const *types,
-                            size_t args) {
-        // Do NOT receive `unique_rec` by value. If this function fails to move out the unique_ptr,
-        // we do not want this to destruct the pointer. `initialize` (the caller) still relies on
-        // the pointee being alive after this call. Only move out if a `capsule` is going to keep
-        // it alive.
-        auto *rec = unique_rec.get();
-
-        // Keep track of strdup'ed strings, and clean them up as long as the function's capsule
-        // has not taken ownership yet (when `unique_rec.release()` is called).
-        // Note: This cannot easily be fixed by a `unique_ptr` with custom deleter, because the
-        // strings are only referenced before strdup'ing. So only *after* the following block could
-        // `destruct` safely be called, but even then, `repr` could still throw in the middle of
-        // copying all strings.
-        strdup_guard guarded_strdup;
-
-        /* Create copies of all referenced C-style strings */
-        rec->name = guarded_strdup(rec->name ? rec->name : "");
-        if (rec->doc) {
-            rec->doc = guarded_strdup(rec->doc);
-        }
-        for (auto &a : rec->args) {
-            if (a.name) {
-                a.name = guarded_strdup(a.name);
-            }
-            if (a.descr) {
-                a.descr = guarded_strdup(a.descr);
-            } else if (a.value) {
-                a.descr = guarded_strdup(repr(a.value).cast<std::string>().c_str());
-            }
-        }
-
-        rec->is_constructor = (std::strcmp(rec->name, "__init__") == 0)
-                              || (std::strcmp(rec->name, "__setstate__") == 0);
-
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES) && !defined(PYBIND11_DISABLE_NEW_STYLE_INIT_WARNING)
-        if (rec->is_constructor && !rec->is_new_style_constructor) {
-            const auto class_name
-                = detail::get_fully_qualified_tp_name((PyTypeObject *) rec->scope.ptr());
-            const auto func_name = std::string(rec->name);
-            PyErr_WarnEx(PyExc_FutureWarning,
-                         ("pybind11-bound class '" + class_name
-                          + "' is using an old-style "
-                            "placement-new '"
-                          + func_name
-                          + "' which has been deprecated. See "
-                            "the upgrade guide in pybind11's docs. This message is only visible "
-                            "when compiled in debug mode.")
-                             .c_str(),
-                         0);
-        }
-#endif
-
-        /* Generate a proper function signature */
-        std::string signature;
-        size_t type_index = 0, arg_index = 0;
-        bool is_starred = false;
-        for (const auto *pc = text; *pc != '\0'; ++pc) {
-            const auto c = *pc;
-
-            if (c == '{') {
-                // Write arg name for everything except *args and **kwargs.
-                is_starred = *(pc + 1) == '*';
-                if (is_starred) {
-                    continue;
-                }
-                // Separator for keyword-only arguments, placed before the kw
-                // arguments start (unless we are already putting an *args)
-                if (!rec->has_args && arg_index == rec->nargs_pos) {
-                    signature += "*, ";
-                }
-                if (arg_index < rec->args.size() && rec->args[arg_index].name) {
-                    signature += rec->args[arg_index].name;
-                } else if (arg_index == 0 && rec->is_method) {
-                    signature += "self";
-                } else {
-                    signature += "arg" + std::to_string(arg_index - (rec->is_method ? 1 : 0));
-                }
-                signature += ": ";
-            } else if (c == '}') {
-                // Write default value if available.
-                if (!is_starred && arg_index < rec->args.size() && rec->args[arg_index].descr) {
-                    signature += " = ";
-                    signature += rec->args[arg_index].descr;
-                }
-                // Separator for positional-only arguments (placed after the
-                // argument, rather than before like *
-                if (rec->nargs_pos_only > 0 && (arg_index + 1) == rec->nargs_pos_only) {
-                    signature += ", /";
-                }
-                if (!is_starred) {
-                    arg_index++;
-                }
-            } else if (c == '%') {
-                const std::type_info *t = types[type_index++];
-                if (!t) {
-                    pybind11_fail("Internal error while parsing type signature (1)");
-                }
-                if (auto *tinfo = detail::get_type_info(*t)) {
-                    handle th((PyObject *) tinfo->type);
-                    signature += th.attr("__module__").cast<std::string>() + "."
-                                 + th.attr("__qualname__").cast<std::string>();
-                } else if (rec->is_new_style_constructor && arg_index == 0) {
-                    // A new-style `__init__` takes `self` as `value_and_holder`.
-                    // Rewrite it to the proper class type.
-                    signature += rec->scope.attr("__module__").cast<std::string>() + "."
-                                 + rec->scope.attr("__qualname__").cast<std::string>();
-                } else {
-                    std::string tname(t->name());
-                    detail::clean_type_id(tname);
-                    signature += tname;
-                }
-            } else {
-                signature += c;
-            }
-        }
-
-        if (arg_index != args - rec->has_args - rec->has_kwargs || types[type_index] != nullptr) {
-            pybind11_fail("Internal error while parsing type signature (2)");
-        }
-
-        rec->signature = guarded_strdup(signature.c_str());
-        rec->args.shrink_to_fit();
-        rec->nargs = (std::uint16_t) args;
-
-        if (rec->sibling && PYBIND11_INSTANCE_METHOD_CHECK(rec->sibling.ptr())) {
-            rec->sibling = PYBIND11_INSTANCE_METHOD_GET_FUNCTION(rec->sibling.ptr());
-        }
-
-        detail::function_record *chain = nullptr, *chain_start = rec;
-        if (rec->sibling) {
-            if (PyCFunction_Check(rec->sibling.ptr())) {
-                auto *self = PyCFunction_GET_SELF(rec->sibling.ptr());
-                capsule rec_capsule = isinstance<capsule>(self) ? reinterpret_borrow<capsule>(self)
-                                                                : capsule(self);
-                chain = (detail::function_record *) rec_capsule;
-                /* Never append a method to an overload chain of a parent class;
-                   instead, hide the parent's overloads in this case */
-                if (!chain->scope.is(rec->scope)) {
-                    chain = nullptr;
-                }
-            }
-            // Don't trigger for things like the default __init__, which are wrapper_descriptors
-            // that we are intentionally replacing
-            else if (!rec->sibling.is_none() && rec->name[0] != '_') {
-                pybind11_fail("Cannot overload existing non-function object \""
-                              + std::string(rec->name) + "\" with a function of the same name");
-            }
-        }
-
-        if (!chain) {
-            /* No existing overload was found, create a new function object */
-            rec->def = new PyMethodDef();
-            std::memset(rec->def, 0, sizeof(PyMethodDef));
-            rec->def->ml_name = rec->name;
-            rec->def->ml_meth
-                = reinterpret_cast<PyCFunction>(reinterpret_cast<void (*)()>(dispatcher));
-            rec->def->ml_flags = METH_VARARGS | METH_KEYWORDS;
-
-            capsule rec_capsule(unique_rec.release(),
-                                [](void *ptr) { destruct((detail::function_record *) ptr); });
-            guarded_strdup.release();
-
-            object scope_module;
-            if (rec->scope) {
-                if (hasattr(rec->scope, "__module__")) {
-                    scope_module = rec->scope.attr("__module__");
-                } else if (hasattr(rec->scope, "__name__")) {
-                    scope_module = rec->scope.attr("__name__");
-                }
-            }
-
-            m_ptr = PyCFunction_NewEx(rec->def, rec_capsule.ptr(), scope_module.ptr());
-            if (!m_ptr) {
-                pybind11_fail("cpp_function::cpp_function(): Could not allocate function object");
-            }
-        } else {
-            /* Append at the beginning or end of the overload chain */
-            m_ptr = rec->sibling.ptr();
-            inc_ref();
-            if (chain->is_method != rec->is_method) {
-                pybind11_fail(
-                    "overloading a method with both static and instance methods is not supported; "
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-                    "#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for more "
-                    "details"
-#else
-                    "error while attempting to bind "
-                    + std::string(rec->is_method ? "instance" : "static") + " method "
-                    + std::string(pybind11::str(rec->scope.attr("__name__"))) + "."
-                    + std::string(rec->name) + signature
-#endif
-                );
-            }
-
-            if (rec->prepend) {
-                // Beginning of chain; we need to replace the capsule's current head-of-the-chain
-                // pointer with this one, then make this one point to the previous head of the
-                // chain.
-                chain_start = rec;
-                rec->next = chain;
-                auto rec_capsule
-                    = reinterpret_borrow<capsule>(((PyCFunctionObject *) m_ptr)->m_self);
-                rec_capsule.set_pointer(unique_rec.release());
-                guarded_strdup.release();
-            } else {
-                // Or end of chain (normal behavior)
-                chain_start = chain;
-                while (chain->next) {
-                    chain = chain->next;
-                }
-                chain->next = unique_rec.release();
-                guarded_strdup.release();
-            }
-        }
-
-        std::string signatures;
-        int index = 0;
-        /* Create a nice pydoc rec including all signatures and
-           docstrings of the functions in the overload chain */
-        if (chain && options::show_function_signatures()) {
-            // First a generic signature
-            signatures += rec->name;
-            signatures += "(*args, **kwargs)\n";
-            signatures += "Overloaded function.\n\n";
-        }
-        // Then specific overload signatures
-        bool first_user_def = true;
-        for (auto *it = chain_start; it != nullptr; it = it->next) {
-            if (options::show_function_signatures()) {
-                if (index > 0) {
-                    signatures += '\n';
-                }
-                if (chain) {
-                    signatures += std::to_string(++index) + ". ";
-                }
-                signatures += rec->name;
-                signatures += it->signature;
-                signatures += '\n';
-            }
-            if (it->doc && it->doc[0] != '\0' && options::show_user_defined_docstrings()) {
-                // If we're appending another docstring, and aren't printing function signatures,
-                // we need to append a newline first:
-                if (!options::show_function_signatures()) {
-                    if (first_user_def) {
-                        first_user_def = false;
-                    } else {
-                        signatures += '\n';
-                    }
-                }
-                if (options::show_function_signatures()) {
-                    signatures += '\n';
-                }
-                signatures += it->doc;
-                if (options::show_function_signatures()) {
-                    signatures += '\n';
-                }
-            }
-        }
-
-        /* Install docstring */
-        auto *func = (PyCFunctionObject *) m_ptr;
-        std::free(const_cast<char *>(func->m_ml->ml_doc));
-        // Install docstring if it's non-empty (when at least one option is enabled)
-        func->m_ml->ml_doc
-            = signatures.empty() ? nullptr : PYBIND11_COMPAT_STRDUP(signatures.c_str());
-
-        if (rec->is_method) {
-            m_ptr = PYBIND11_INSTANCE_METHOD_NEW(m_ptr, rec->scope.ptr());
-            if (!m_ptr) {
-                pybind11_fail(
-                    "cpp_function::cpp_function(): Could not allocate instance method object");
-            }
-            Py_DECREF(func);
-        }
-    }
-
-    /// When a cpp_function is GCed, release any memory allocated by pybind11
-    static void destruct(detail::function_record *rec, bool free_strings = true) {
-// If on Python 3.9, check the interpreter "MICRO" (patch) version.
-// If this is running on 3.9.0, we have to work around a bug.
-#if !defined(PYPY_VERSION) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION == 9
-        static bool is_zero = Py_GetVersion()[4] == '0';
-#endif
-
-        while (rec) {
-            detail::function_record *next = rec->next;
-            if (rec->free_data) {
-                rec->free_data(rec);
-            }
-            // During initialization, these strings might not have been copied yet,
-            // so they cannot be freed. Once the function has been created, they can.
-            // Check `make_function_record` for more details.
-            if (free_strings) {
-                std::free((char *) rec->name);
-                std::free((char *) rec->doc);
-                std::free((char *) rec->signature);
-                for (auto &arg : rec->args) {
-                    std::free(const_cast<char *>(arg.name));
-                    std::free(const_cast<char *>(arg.descr));
-                }
-            }
-            for (auto &arg : rec->args) {
-                arg.value.dec_ref();
-            }
-            if (rec->def) {
-                std::free(const_cast<char *>(rec->def->ml_doc));
-// Python 3.9.0 decref's these in the wrong order; rec->def
-// If loaded on 3.9.0, let these leak (use Python 3.9.1 at runtime to fix)
-// See https://github.com/python/cpython/pull/22670
-#if !defined(PYPY_VERSION) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION == 9
-                if (!is_zero) {
-                    delete rec->def;
-                }
-#else
-                delete rec->def;
-#endif
-            }
-            delete rec;
-            rec = next;
-        }
-    }
-
-    /// Main dispatch logic for calls to functions bound using pybind11
-    static PyObject *dispatcher(PyObject *self, PyObject *args_in, PyObject *kwargs_in) {
-        using namespace detail;
-
-        /* Iterator over the list of potentially admissible overloads */
-        const function_record *overloads = (function_record *) PyCapsule_GetPointer(self, nullptr),
-                              *it = overloads;
-
-        /* Need to know how many arguments + keyword arguments there are to pick the right
-           overload */
-        const auto n_args_in = (size_t) PyTuple_GET_SIZE(args_in);
-
-        handle parent = n_args_in > 0 ? PyTuple_GET_ITEM(args_in, 0) : nullptr,
-               result = PYBIND11_TRY_NEXT_OVERLOAD;
-
-        auto self_value_and_holder = value_and_holder();
-        if (overloads->is_constructor) {
-            if (!parent
-                || !PyObject_TypeCheck(parent.ptr(), (PyTypeObject *) overloads->scope.ptr())) {
-                PyErr_SetString(
-                    PyExc_TypeError,
-                    "__init__(self, ...) called with invalid or missing `self` argument");
-                return nullptr;
-            }
-
-            auto *const tinfo = get_type_info((PyTypeObject *) overloads->scope.ptr());
-            auto *const pi = reinterpret_cast<instance *>(parent.ptr());
-            self_value_and_holder = pi->get_value_and_holder(tinfo, true);
-
-            // If this value is already registered it must mean __init__ is invoked multiple times;
-            // we really can't support that in C++, so just ignore the second __init__.
-            if (self_value_and_holder.instance_registered()) {
-                return none().release().ptr();
-            }
-        }
-
-        try {
-            // We do this in two passes: in the first pass, we load arguments with `convert=false`;
-            // in the second, we allow conversion (except for arguments with an explicit
-            // py::arg().noconvert()).  This lets us prefer calls without conversion, with
-            // conversion as a fallback.
-            std::vector<function_call> second_pass;
-
-            // However, if there are no overloads, we can just skip the no-convert pass entirely
-            const bool overloaded = it != nullptr && it->next != nullptr;
-
-            for (; it != nullptr; it = it->next) {
-
-                /* For each overload:
-                   1. Copy all positional arguments we were given, also checking to make sure that
-                      named positional arguments weren't *also* specified via kwarg.
-                   2. If we weren't given enough, try to make up the omitted ones by checking
-                      whether they were provided by a kwarg matching the `py::arg("name")` name. If
-                      so, use it (and remove it from kwargs); if not, see if the function binding
-                      provided a default that we can use.
-                   3. Ensure that either all keyword arguments were "consumed", or that the
-                   function takes a kwargs argument to accept unconsumed kwargs.
-                   4. Any positional arguments still left get put into a tuple (for args), and any
-                      leftover kwargs get put into a dict.
-                   5. Pack everything into a vector; if we have py::args or py::kwargs, they are an
-                      extra tuple or dict at the end of the positional arguments.
-                   6. Call the function call dispatcher (function_record::impl)
-
-                   If one of these fail, move on to the next overload and keep trying until we get
-                   a result other than PYBIND11_TRY_NEXT_OVERLOAD.
-                 */
-
-                const function_record &func = *it;
-                size_t num_args = func.nargs; // Number of positional arguments that we need
-                if (func.has_args) {
-                    --num_args; // (but don't count py::args
-                }
-                if (func.has_kwargs) {
-                    --num_args; //  or py::kwargs)
-                }
-                size_t pos_args = func.nargs_pos;
-
-                if (!func.has_args && n_args_in > pos_args) {
-                    continue; // Too many positional arguments for this overload
-                }
-
-                if (n_args_in < pos_args && func.args.size() < pos_args) {
-                    continue; // Not enough positional arguments given, and not enough defaults to
-                              // fill in the blanks
-                }
-
-                function_call call(func, parent);
-
-                // Protect std::min with parentheses
-                size_t args_to_copy = (std::min)(pos_args, n_args_in);
-                size_t args_copied = 0;
-
-                // 0. Inject new-style `self` argument
-                if (func.is_new_style_constructor) {
-                    // The `value` may have been preallocated by an old-style `__init__`
-                    // if it was a preceding candidate for overload resolution.
-                    if (self_value_and_holder) {
-                        self_value_and_holder.type->dealloc(self_value_and_holder);
-                    }
-
-                    call.init_self = PyTuple_GET_ITEM(args_in, 0);
-                    call.args.emplace_back(reinterpret_cast<PyObject *>(&self_value_and_holder));
-                    call.args_convert.push_back(false);
-                    ++args_copied;
-                }
-
-                // 1. Copy any position arguments given.
-                bool bad_arg = false;
-                for (; args_copied < args_to_copy; ++args_copied) {
-                    const argument_record *arg_rec
-                        = args_copied < func.args.size() ? &func.args[args_copied] : nullptr;
-                    if (kwargs_in && arg_rec && arg_rec->name
-                        && dict_getitemstring(kwargs_in, arg_rec->name)) {
-                        bad_arg = true;
-                        break;
-                    }
-
-                    handle arg(PyTuple_GET_ITEM(args_in, args_copied));
-                    if (arg_rec && !arg_rec->none && arg.is_none()) {
-                        bad_arg = true;
-                        break;
-                    }
-                    call.args.push_back(arg);
-                    call.args_convert.push_back(arg_rec ? arg_rec->convert : true);
-                }
-                if (bad_arg) {
-                    continue; // Maybe it was meant for another overload (issue #688)
-                }
-
-                // Keep track of how many position args we copied out in case we need to come back
-                // to copy the rest into a py::args argument.
-                size_t positional_args_copied = args_copied;
-
-                // We'll need to copy this if we steal some kwargs for defaults
-                dict kwargs = reinterpret_borrow<dict>(kwargs_in);
-
-                // 1.5. Fill in any missing pos_only args from defaults if they exist
-                if (args_copied < func.nargs_pos_only) {
-                    for (; args_copied < func.nargs_pos_only; ++args_copied) {
-                        const auto &arg_rec = func.args[args_copied];
-                        handle value;
-
-                        if (arg_rec.value) {
-                            value = arg_rec.value;
-                        }
-                        if (value) {
-                            call.args.push_back(value);
-                            call.args_convert.push_back(arg_rec.convert);
-                        } else {
-                            break;
-                        }
-                    }
-
-                    if (args_copied < func.nargs_pos_only) {
-                        continue; // Not enough defaults to fill the positional arguments
-                    }
-                }
-
-                // 2. Check kwargs and, failing that, defaults that may help complete the list
-                if (args_copied < num_args) {
-                    bool copied_kwargs = false;
-
-                    for (; args_copied < num_args; ++args_copied) {
-                        const auto &arg_rec = func.args[args_copied];
-
-                        handle value;
-                        if (kwargs_in && arg_rec.name) {
-                            value = dict_getitemstring(kwargs.ptr(), arg_rec.name);
-                        }
-
-                        if (value) {
-                            // Consume a kwargs value
-                            if (!copied_kwargs) {
-                                kwargs = reinterpret_steal<dict>(PyDict_Copy(kwargs.ptr()));
-                                copied_kwargs = true;
-                            }
-                            if (PyDict_DelItemString(kwargs.ptr(), arg_rec.name) == -1) {
-                                throw error_already_set();
-                            }
-                        } else if (arg_rec.value) {
-                            value = arg_rec.value;
-                        }
-
-                        if (!arg_rec.none && value.is_none()) {
-                            break;
-                        }
-
-                        if (value) {
-                            // If we're at the py::args index then first insert a stub for it to be
-                            // replaced later
-                            if (func.has_args && call.args.size() == func.nargs_pos) {
-                                call.args.push_back(none());
-                            }
-
-                            call.args.push_back(value);
-                            call.args_convert.push_back(arg_rec.convert);
-                        } else {
-                            break;
-                        }
-                    }
-
-                    if (args_copied < num_args) {
-                        continue; // Not enough arguments, defaults, or kwargs to fill the
-                                  // positional arguments
-                    }
-                }
-
-                // 3. Check everything was consumed (unless we have a kwargs arg)
-                if (kwargs && !kwargs.empty() && !func.has_kwargs) {
-                    continue; // Unconsumed kwargs, but no py::kwargs argument to accept them
-                }
-
-                // 4a. If we have a py::args argument, create a new tuple with leftovers
-                if (func.has_args) {
-                    tuple extra_args;
-                    if (args_to_copy == 0) {
-                        // We didn't copy out any position arguments from the args_in tuple, so we
-                        // can reuse it directly without copying:
-                        extra_args = reinterpret_borrow<tuple>(args_in);
-                    } else if (positional_args_copied >= n_args_in) {
-                        extra_args = tuple(0);
-                    } else {
-                        size_t args_size = n_args_in - positional_args_copied;
-                        extra_args = tuple(args_size);
-                        for (size_t i = 0; i < args_size; ++i) {
-                            extra_args[i] = PyTuple_GET_ITEM(args_in, positional_args_copied + i);
-                        }
-                    }
-                    if (call.args.size() <= func.nargs_pos) {
-                        call.args.push_back(extra_args);
-                    } else {
-                        call.args[func.nargs_pos] = extra_args;
-                    }
-                    call.args_convert.push_back(false);
-                    call.args_ref = std::move(extra_args);
-                }
-
-                // 4b. If we have a py::kwargs, pass on any remaining kwargs
-                if (func.has_kwargs) {
-                    if (!kwargs.ptr()) {
-                        kwargs = dict(); // If we didn't get one, send an empty one
-                    }
-                    call.args.push_back(kwargs);
-                    call.args_convert.push_back(false);
-                    call.kwargs_ref = std::move(kwargs);
-                }
-
-// 5. Put everything in a vector.  Not technically step 5, we've been building it
-// in `call.args` all along.
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-                if (call.args.size() != func.nargs || call.args_convert.size() != func.nargs) {
-                    pybind11_fail("Internal error: function call dispatcher inserted wrong number "
-                                  "of arguments!");
-                }
-#endif
-
-                std::vector<bool> second_pass_convert;
-                if (overloaded) {
-                    // We're in the first no-convert pass, so swap out the conversion flags for a
-                    // set of all-false flags.  If the call fails, we'll swap the flags back in for
-                    // the conversion-allowed call below.
-                    second_pass_convert.resize(func.nargs, false);
-                    call.args_convert.swap(second_pass_convert);
-                }
-
-                // 6. Call the function.
-                try {
-                    loader_life_support guard{};
-                    result = func.impl(call);
-                } catch (reference_cast_error &) {
-                    result = PYBIND11_TRY_NEXT_OVERLOAD;
-                }
-
-                if (result.ptr() != PYBIND11_TRY_NEXT_OVERLOAD) {
-                    break;
-                }
-
-                if (overloaded) {
-                    // The (overloaded) call failed; if the call has at least one argument that
-                    // permits conversion (i.e. it hasn't been explicitly specified `.noconvert()`)
-                    // then add this call to the list of second pass overloads to try.
-                    for (size_t i = func.is_method ? 1 : 0; i < pos_args; i++) {
-                        if (second_pass_convert[i]) {
-                            // Found one: swap the converting flags back in and store the call for
-                            // the second pass.
-                            call.args_convert.swap(second_pass_convert);
-                            second_pass.push_back(std::move(call));
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (overloaded && !second_pass.empty() && result.ptr() == PYBIND11_TRY_NEXT_OVERLOAD) {
-                // The no-conversion pass finished without success, try again with conversion
-                // allowed
-                for (auto &call : second_pass) {
-                    try {
-                        loader_life_support guard{};
-                        result = call.func.impl(call);
-                    } catch (reference_cast_error &) {
-                        result = PYBIND11_TRY_NEXT_OVERLOAD;
-                    }
-
-                    if (result.ptr() != PYBIND11_TRY_NEXT_OVERLOAD) {
-                        // The error reporting logic below expects 'it' to be valid, as it would be
-                        // if we'd encountered this failure in the first-pass loop.
-                        if (!result) {
-                            it = &call.func;
-                        }
-                        break;
-                    }
-                }
-            }
-        } catch (error_already_set &e) {
-            e.restore();
-            return nullptr;
-#ifdef __GLIBCXX__
-        } catch (abi::__forced_unwind &) {
-            throw;
-#endif
-        } catch (...) {
-            /* When an exception is caught, give each registered exception
-               translator a chance to translate it to a Python exception. First
-               all module-local translators will be tried in reverse order of
-               registration. If none of the module-locale translators handle
-               the exception (or there are no module-locale translators) then
-               the global translators will be tried, also in reverse order of
-               registration.
-
-               A translator may choose to do one of the following:
-
-                - catch the exception and call PyErr_SetString or PyErr_SetObject
-                  to set a standard (or custom) Python exception, or
-                - do nothing and let the exception fall through to the next translator, or
-                - delegate translation to the next translator by throwing a new type of exception.
-             */
-
-            auto &local_exception_translators
-                = get_local_internals().registered_exception_translators;
-            if (detail::apply_exception_translators(local_exception_translators)) {
-                return nullptr;
-            }
-            auto &exception_translators = get_internals().registered_exception_translators;
-            if (detail::apply_exception_translators(exception_translators)) {
-                return nullptr;
-            }
-
-            PyErr_SetString(PyExc_SystemError,
-                            "Exception escaped from default exception translator!");
-            return nullptr;
-        }
-
-        auto append_note_if_missing_header_is_suspected = [](std::string &msg) {
-            if (msg.find("std::") != std::string::npos) {
-                msg += "\n\n"
-                       "Did you forget to `#include <pybind11/stl.h>`? Or <pybind11/complex.h>,\n"
-                       "<pybind11/functional.h>, <pybind11/chrono.h>, etc. Some automatic\n"
-                       "conversions are optional and require extra headers to be included\n"
-                       "when compiling your pybind11 module.";
-            }
-        };
-
-        if (result.ptr() == PYBIND11_TRY_NEXT_OVERLOAD) {
-            if (overloads->is_operator) {
-                return handle(Py_NotImplemented).inc_ref().ptr();
-            }
-
-            std::string msg = std::string(overloads->name) + "(): incompatible "
-                              + std::string(overloads->is_constructor ? "constructor" : "function")
-                              + " arguments. The following argument types are supported:\n";
-
-            int ctr = 0;
-            for (const function_record *it2 = overloads; it2 != nullptr; it2 = it2->next) {
-                msg += "    " + std::to_string(++ctr) + ". ";
-
-                bool wrote_sig = false;
-                if (overloads->is_constructor) {
-                    // For a constructor, rewrite `(self: Object, arg0, ...) -> NoneType` as
-                    // `Object(arg0, ...)`
-                    std::string sig = it2->signature;
-                    size_t start = sig.find('(') + 7; // skip "(self: "
-                    if (start < sig.size()) {
-                        // End at the , for the next argument
-                        size_t end = sig.find(", "), next = end + 2;
-                        size_t ret = sig.rfind(" -> ");
-                        // Or the ), if there is no comma:
-                        if (end >= sig.size()) {
-                            next = end = sig.find(')');
-                        }
-                        if (start < end && next < sig.size()) {
-                            msg.append(sig, start, end - start);
-                            msg += '(';
-                            msg.append(sig, next, ret - next);
-                            wrote_sig = true;
-                        }
-                    }
-                }
-                if (!wrote_sig) {
-                    msg += it2->signature;
-                }
-
-                msg += '\n';
-            }
-            msg += "\nInvoked with: ";
-            auto args_ = reinterpret_borrow<tuple>(args_in);
-            bool some_args = false;
-            for (size_t ti = overloads->is_constructor ? 1 : 0; ti < args_.size(); ++ti) {
-                if (!some_args) {
-                    some_args = true;
-                } else {
-                    msg += ", ";
-                }
-                try {
-                    msg += pybind11::repr(args_[ti]);
-                } catch (const error_already_set &) {
-                    msg += "<repr raised Error>";
-                }
-            }
-            if (kwargs_in) {
-                auto kwargs = reinterpret_borrow<dict>(kwargs_in);
-                if (!kwargs.empty()) {
-                    if (some_args) {
-                        msg += "; ";
-                    }
-                    msg += "kwargs: ";
-                    bool first = true;
-                    for (auto kwarg : kwargs) {
-                        if (first) {
-                            first = false;
-                        } else {
-                            msg += ", ";
-                        }
-                        msg += pybind11::str("{}=").format(kwarg.first);
-                        try {
-                            msg += pybind11::repr(kwarg.second);
-                        } catch (const error_already_set &) {
-                            msg += "<repr raised Error>";
-                        }
-                    }
-                }
-            }
-
-            append_note_if_missing_header_is_suspected(msg);
-            // Attach additional error info to the exception if supported
-            if (PyErr_Occurred()) {
-                // #HelpAppreciated: unit test coverage for this branch.
-                raise_from(PyExc_TypeError, msg.c_str());
-                return nullptr;
-            }
-            PyErr_SetString(PyExc_TypeError, msg.c_str());
-            return nullptr;
-        }
-        if (!result) {
-            std::string msg = "Unable to convert function return value to a "
-                              "Python type! The signature was\n\t";
-            msg += it->signature;
-            append_note_if_missing_header_is_suspected(msg);
-            // Attach additional error info to the exception if supported
-            if (PyErr_Occurred()) {
-                raise_from(PyExc_TypeError, msg.c_str());
-                return nullptr;
-            }
-            PyErr_SetString(PyExc_TypeError, msg.c_str());
-            return nullptr;
-        }
-        if (overloads->is_constructor && !self_value_and_holder.holder_constructed()) {
-            auto *pi = reinterpret_cast<instance *>(parent.ptr());
-            self_value_and_holder.type->init_instance(pi, nullptr);
-        }
-        return result.ptr();
-    }
-};
-
-/// Wrapper for Python extension modules
-class module_ : public object {
-public:
-    PYBIND11_OBJECT_DEFAULT(module_, object, PyModule_Check)
-
-    /// Create a new top-level Python module with the given name and docstring
-    PYBIND11_DEPRECATED("Use PYBIND11_MODULE or module_::create_extension_module instead")
-    explicit module_(const char *name, const char *doc = nullptr) {
-        *this = create_extension_module(name, doc, new PyModuleDef());
-    }
-
-    /** \rst
-        Create Python binding for a new function within the module scope. ``Func``
-        can be a plain C++ function, a function pointer, or a lambda function. For
-        details on the ``Extra&& ... extra`` argument, see section :ref:`extras`.
-    \endrst */
-    template <typename Func, typename... Extra>
-    module_ &def(const char *name_, Func &&f, const Extra &...extra) {
-        cpp_function func(std::forward<Func>(f),
-                          name(name_),
-                          scope(*this),
-                          sibling(getattr(*this, name_, none())),
-                          extra...);
-        // NB: allow overwriting here because cpp_function sets up a chain with the intention of
-        // overwriting (and has already checked internally that it isn't overwriting
-        // non-functions).
-        add_object(name_, func, true /* overwrite */);
-        return *this;
-    }
-
-    /** \rst
-        Create and return a new Python submodule with the given name and docstring.
-        This also works recursively, i.e.
-
-        .. code-block:: cpp
-
-            py::module_ m("example", "pybind11 example plugin");
-            py::module_ m2 = m.def_submodule("sub", "A submodule of 'example'");
-            py::module_ m3 = m2.def_submodule("subsub", "A submodule of 'example.sub'");
-    \endrst */
-    module_ def_submodule(const char *name, const char *doc = nullptr) {
-        const char *this_name = PyModule_GetName(m_ptr);
-        if (this_name == nullptr) {
-            throw error_already_set();
-        }
-        std::string full_name = std::string(this_name) + '.' + name;
-        handle submodule = PyImport_AddModule(full_name.c_str());
-        if (!submodule) {
-            throw error_already_set();
-        }
-        auto result = reinterpret_borrow<module_>(submodule);
-        if (doc && options::show_user_defined_docstrings()) {
-            result.attr("__doc__") = pybind11::str(doc);
-        }
-        attr(name) = result;
-        return result;
-    }
-
-    /// Import and return a module or throws `error_already_set`.
-    static module_ import(const char *name) {
-        PyObject *obj = PyImport_ImportModule(name);
-        if (!obj) {
-            throw error_already_set();
-        }
-        return reinterpret_steal<module_>(obj);
-    }
-
-    /// Reload the module or throws `error_already_set`.
-    void reload() {
-        PyObject *obj = PyImport_ReloadModule(ptr());
-        if (!obj) {
-            throw error_already_set();
-        }
-        *this = reinterpret_steal<module_>(obj);
-    }
-
-    /** \rst
-        Adds an object to the module using the given name.  Throws if an object with the given name
-        already exists.
-
-        ``overwrite`` should almost always be false: attempting to overwrite objects that pybind11
-        has established will, in most cases, break things.
-    \endrst */
-    PYBIND11_NOINLINE void add_object(const char *name, handle obj, bool overwrite = false) {
-        if (!overwrite && hasattr(*this, name)) {
-            pybind11_fail(
-                "Error during initialization: multiple incompatible definitions with name \""
-                + std::string(name) + "\"");
-        }
-
-        PyModule_AddObject(ptr(), name, obj.inc_ref().ptr() /* steals a reference */);
-    }
-
-    using module_def = PyModuleDef; // TODO: Can this be removed (it was needed only for Python 2)?
-
-    /** \rst
-        Create a new top-level module that can be used as the main module of a C extension.
-
-        ``def`` should point to a statically allocated module_def.
-    \endrst */
-    static module_ create_extension_module(const char *name, const char *doc, module_def *def) {
-        // module_def is PyModuleDef
-        // Placement new (not an allocation).
-        def = new (def)
-            PyModuleDef{/* m_base */ PyModuleDef_HEAD_INIT,
-                        /* m_name */ name,
-                        /* m_doc */ options::show_user_defined_docstrings() ? doc : nullptr,
-                        /* m_size */ -1,
-                        /* m_methods */ nullptr,
-                        /* m_slots */ nullptr,
-                        /* m_traverse */ nullptr,
-                        /* m_clear */ nullptr,
-                        /* m_free */ nullptr};
-        auto *m = PyModule_Create(def);
-        if (m == nullptr) {
-            if (PyErr_Occurred()) {
-                throw error_already_set();
-            }
-            pybind11_fail("Internal error in module_::create_extension_module()");
-        }
-        // TODO: Should be reinterpret_steal for Python 3, but Python also steals it again when
-        //       returned from PyInit_...
-        //       For Python 2, reinterpret_borrow was correct.
-        return reinterpret_borrow<module_>(m);
-    }
-};
-
-// When inside a namespace (or anywhere as long as it's not the first item on a line),
-// C++20 allows "module" to be used. This is provided for backward compatibility, and for
-// simplicity, if someone wants to use py::module for example, that is perfectly safe.
-using module = module_;
-
-/// \ingroup python_builtins
-/// Return a dictionary representing the global variables in the current execution frame,
-/// or ``__main__.__dict__`` if there is no frame (usually when the interpreter is embedded).
-inline dict globals() {
-    PyObject *p = PyEval_GetGlobals();
-    return reinterpret_borrow<dict>(p ? p : module_::import("__main__").attr("__dict__").ptr());
-}
-
-template <typename... Args, typename = detail::enable_if_t<args_are_all_keyword_or_ds<Args...>()>>
-PYBIND11_DEPRECATED("make_simple_namespace should be replaced with "
-                    "py::module_::import(\"types\").attr(\"SimpleNamespace\") ")
-object make_simple_namespace(Args &&...args_) {
-    return module_::import("types").attr("SimpleNamespace")(std::forward<Args>(args_)...);
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-/// Generic support for creating new Python heap types
-class generic_type : public object {
-public:
-    PYBIND11_OBJECT_DEFAULT(generic_type, object, PyType_Check)
-protected:
-    void initialize(const type_record &rec) {
-        if (rec.scope && hasattr(rec.scope, "__dict__")
-            && rec.scope.attr("__dict__").contains(rec.name)) {
-            pybind11_fail("generic_type: cannot initialize type \"" + std::string(rec.name)
-                          + "\": an object with that name is already defined");
-        }
-
-        if ((rec.module_local ? get_local_type_info(*rec.type) : get_global_type_info(*rec.type))
-            != nullptr) {
-            pybind11_fail("generic_type: type \"" + std::string(rec.name)
-                          + "\" is already registered!");
-        }
-
-        m_ptr = make_new_python_type(rec);
-
-        /* Register supplemental type information in C++ dict */
-        auto *tinfo = new detail::type_info();
-        tinfo->type = (PyTypeObject *) m_ptr;
-        tinfo->cpptype = rec.type;
-        tinfo->type_size = rec.type_size;
-        tinfo->type_align = rec.type_align;
-        tinfo->operator_new = rec.operator_new;
-        tinfo->holder_size_in_ptrs = size_in_ptrs(rec.holder_size);
-        tinfo->init_instance = rec.init_instance;
-        tinfo->dealloc = rec.dealloc;
-        tinfo->simple_type = true;
-        tinfo->simple_ancestors = true;
-        tinfo->default_holder = rec.default_holder;
-        tinfo->module_local = rec.module_local;
-
-        auto &internals = get_internals();
-        auto tindex = std::type_index(*rec.type);
-        tinfo->direct_conversions = &internals.direct_conversions[tindex];
-        if (rec.module_local) {
-            get_local_internals().registered_types_cpp[tindex] = tinfo;
-        } else {
-            internals.registered_types_cpp[tindex] = tinfo;
-        }
-        internals.registered_types_py[(PyTypeObject *) m_ptr] = {tinfo};
-
-        if (rec.bases.size() > 1 || rec.multiple_inheritance) {
-            mark_parents_nonsimple(tinfo->type);
-            tinfo->simple_ancestors = false;
-        } else if (rec.bases.size() == 1) {
-            auto *parent_tinfo = get_type_info((PyTypeObject *) rec.bases[0].ptr());
-            assert(parent_tinfo != nullptr);
-            bool parent_simple_ancestors = parent_tinfo->simple_ancestors;
-            tinfo->simple_ancestors = parent_simple_ancestors;
-            // The parent can no longer be a simple type if it has MI and has a child
-            parent_tinfo->simple_type = parent_tinfo->simple_type && parent_simple_ancestors;
-        }
-
-        if (rec.module_local) {
-            // Stash the local typeinfo and loader so that external modules can access it.
-            tinfo->module_local_load = &type_caster_generic::local_load;
-            setattr(m_ptr, PYBIND11_MODULE_LOCAL_ID, capsule(tinfo));
-        }
-    }
-
-    /// Helper function which tags all parents of a type using mult. inheritance
-    void mark_parents_nonsimple(PyTypeObject *value) {
-        auto t = reinterpret_borrow<tuple>(value->tp_bases);
-        for (handle h : t) {
-            auto *tinfo2 = get_type_info((PyTypeObject *) h.ptr());
-            if (tinfo2) {
-                tinfo2->simple_type = false;
-            }
-            mark_parents_nonsimple((PyTypeObject *) h.ptr());
-        }
-    }
-
-    void install_buffer_funcs(buffer_info *(*get_buffer)(PyObject *, void *),
-                              void *get_buffer_data) {
-        auto *type = (PyHeapTypeObject *) m_ptr;
-        auto *tinfo = detail::get_type_info(&type->ht_type);
-
-        if (!type->ht_type.tp_as_buffer) {
-            pybind11_fail("To be able to register buffer protocol support for the type '"
-                          + get_fully_qualified_tp_name(tinfo->type)
-                          + "' the associated class<>(..) invocation must "
-                            "include the pybind11::buffer_protocol() annotation!");
-        }
-
-        tinfo->get_buffer = get_buffer;
-        tinfo->get_buffer_data = get_buffer_data;
-    }
-
-    // rec_func must be set for either fget or fset.
-    void def_property_static_impl(const char *name,
-                                  handle fget,
-                                  handle fset,
-                                  detail::function_record *rec_func) {
-        const auto is_static = (rec_func != nullptr) && !(rec_func->is_method && rec_func->scope);
-        const auto has_doc = (rec_func != nullptr) && (rec_func->doc != nullptr)
-                             && pybind11::options::show_user_defined_docstrings();
-        auto property = handle(
-            (PyObject *) (is_static ? get_internals().static_property_type : &PyProperty_Type));
-        attr(name) = property(fget.ptr() ? fget : none(),
-                              fset.ptr() ? fset : none(),
-                              /*deleter*/ none(),
-                              pybind11::str(has_doc ? rec_func->doc : ""));
-    }
-};
-
-/// Set the pointer to operator new if it exists. The cast is needed because it can be overloaded.
-template <typename T,
-          typename = void_t<decltype(static_cast<void *(*) (size_t)>(T::operator new))>>
-void set_operator_new(type_record *r) {
-    r->operator_new = &T::operator new;
-}
-
-template <typename>
-void set_operator_new(...) {}
-
-template <typename T, typename SFINAE = void>
-struct has_operator_delete : std::false_type {};
-template <typename T>
-struct has_operator_delete<T, void_t<decltype(static_cast<void (*)(void *)>(T::operator delete))>>
-    : std::true_type {};
-template <typename T, typename SFINAE = void>
-struct has_operator_delete_size : std::false_type {};
-template <typename T>
-struct has_operator_delete_size<
-    T,
-    void_t<decltype(static_cast<void (*)(void *, size_t)>(T::operator delete))>> : std::true_type {
-};
-/// Call class-specific delete if it exists or global otherwise. Can also be an overload set.
-template <typename T, enable_if_t<has_operator_delete<T>::value, int> = 0>
-void call_operator_delete(T *p, size_t, size_t) {
-    T::operator delete(p);
-}
-template <
-    typename T,
-    enable_if_t<!has_operator_delete<T>::value && has_operator_delete_size<T>::value, int> = 0>
-void call_operator_delete(T *p, size_t s, size_t) {
-    T::operator delete(p, s);
-}
-
-inline void call_operator_delete(void *p, size_t s, size_t a) {
-    (void) s;
-    (void) a;
-#if defined(__cpp_aligned_new) && (!defined(_MSC_VER) || _MSC_VER >= 1912)
-    if (a > __STDCPP_DEFAULT_NEW_ALIGNMENT__) {
-#    ifdef __cpp_sized_deallocation
-        ::operator delete(p, s, std::align_val_t(a));
-#    else
-        ::operator delete(p, std::align_val_t(a));
-#    endif
-        return;
-    }
-#endif
-#ifdef __cpp_sized_deallocation
-    ::operator delete(p, s);
-#else
-    ::operator delete(p);
-#endif
-}
-
-inline void add_class_method(object &cls, const char *name_, const cpp_function &cf) {
-    cls.attr(cf.name()) = cf;
-    if (std::strcmp(name_, "__eq__") == 0 && !cls.attr("__dict__").contains("__hash__")) {
-        cls.attr("__hash__") = none();
-    }
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Given a pointer to a member function, cast it to its `Derived` version.
-/// Forward everything else unchanged.
-template <typename /*Derived*/, typename F>
-auto method_adaptor(F &&f) -> decltype(std::forward<F>(f)) {
-    return std::forward<F>(f);
-}
-
-template <typename Derived, typename Return, typename Class, typename... Args>
-auto method_adaptor(Return (Class::*pmf)(Args...)) -> Return (Derived::*)(Args...) {
-    static_assert(
-        detail::is_accessible_base_of<Class, Derived>::value,
-        "Cannot bind an inaccessible base class method; use a lambda definition instead");
-    return pmf;
-}
-
-template <typename Derived, typename Return, typename Class, typename... Args>
-auto method_adaptor(Return (Class::*pmf)(Args...) const) -> Return (Derived::*)(Args...) const {
-    static_assert(
-        detail::is_accessible_base_of<Class, Derived>::value,
-        "Cannot bind an inaccessible base class method; use a lambda definition instead");
-    return pmf;
-}
-
-template <typename type_, typename... options>
-class class_ : public detail::generic_type {
-    template <typename T>
-    using is_holder = detail::is_holder_type<type_, T>;
-    template <typename T>
-    using is_subtype = detail::is_strict_base_of<type_, T>;
-    template <typename T>
-    using is_base = detail::is_strict_base_of<T, type_>;
-    // struct instead of using here to help MSVC:
-    template <typename T>
-    struct is_valid_class_option : detail::any_of<is_holder<T>, is_subtype<T>, is_base<T>> {};
-
-public:
-    using type = type_;
-    using type_alias = detail::exactly_one_t<is_subtype, void, options...>;
-    constexpr static bool has_alias = !std::is_void<type_alias>::value;
-    using holder_type = detail::exactly_one_t<is_holder, std::unique_ptr<type>, options...>;
-
-    static_assert(detail::all_of<is_valid_class_option<options>...>::value,
-                  "Unknown/invalid class_ template parameters provided");
-
-    static_assert(!has_alias || std::is_polymorphic<type>::value,
-                  "Cannot use an alias class with a non-polymorphic type");
-
-    PYBIND11_OBJECT(class_, generic_type, PyType_Check)
-
-    template <typename... Extra>
-    class_(handle scope, const char *name, const Extra &...extra) {
-        using namespace detail;
-
-        // MI can only be specified via class_ template options, not constructor parameters
-        static_assert(
-            none_of<is_pyobject<Extra>...>::value || // no base class arguments, or:
-                (constexpr_sum(is_pyobject<Extra>::value...) == 1 && // Exactly one base
-                 constexpr_sum(is_base<options>::value...) == 0 &&   // no template option bases
-                 // no multiple_inheritance attr
-                 none_of<std::is_same<multiple_inheritance, Extra>...>::value),
-            "Error: multiple inheritance bases must be specified via class_ template options");
-
-        type_record record;
-        record.scope = scope;
-        record.name = name;
-        record.type = &typeid(type);
-        record.type_size = sizeof(conditional_t<has_alias, type_alias, type>);
-        record.type_align = alignof(conditional_t<has_alias, type_alias, type> &);
-        record.holder_size = sizeof(holder_type);
-        record.init_instance = init_instance;
-        record.dealloc = dealloc;
-        record.default_holder = detail::is_instantiation<std::unique_ptr, holder_type>::value;
-
-        set_operator_new<type>(&record);
-
-        /* Register base classes specified via template arguments to class_, if any */
-        PYBIND11_EXPAND_SIDE_EFFECTS(add_base<options>(record));
-
-        /* Process optional arguments, if any */
-        process_attributes<Extra...>::init(extra..., &record);
-
-        generic_type::initialize(record);
-
-        if (has_alias) {
-            auto &instances = record.module_local ? get_local_internals().registered_types_cpp
-                                                  : get_internals().registered_types_cpp;
-            instances[std::type_index(typeid(type_alias))]
-                = instances[std::type_index(typeid(type))];
-        }
-    }
-
-    template <typename Base, detail::enable_if_t<is_base<Base>::value, int> = 0>
-    static void add_base(detail::type_record &rec) {
-        rec.add_base(typeid(Base), [](void *src) -> void * {
-            return static_cast<Base *>(reinterpret_cast<type *>(src));
-        });
-    }
-
-    template <typename Base, detail::enable_if_t<!is_base<Base>::value, int> = 0>
-    static void add_base(detail::type_record &) {}
-
-    template <typename Func, typename... Extra>
-    class_ &def(const char *name_, Func &&f, const Extra &...extra) {
-        cpp_function cf(method_adaptor<type>(std::forward<Func>(f)),
-                        name(name_),
-                        is_method(*this),
-                        sibling(getattr(*this, name_, none())),
-                        extra...);
-        add_class_method(*this, name_, cf);
-        return *this;
-    }
-
-    template <typename Func, typename... Extra>
-    class_ &def_static(const char *name_, Func &&f, const Extra &...extra) {
-        static_assert(!std::is_member_function_pointer<Func>::value,
-                      "def_static(...) called with a non-static member function pointer");
-        cpp_function cf(std::forward<Func>(f),
-                        name(name_),
-                        scope(*this),
-                        sibling(getattr(*this, name_, none())),
-                        extra...);
-        auto cf_name = cf.name();
-        attr(std::move(cf_name)) = staticmethod(std::move(cf));
-        return *this;
-    }
-
-    template <detail::op_id id, detail::op_type ot, typename L, typename R, typename... Extra>
-    class_ &def(const detail::op_<id, ot, L, R> &op, const Extra &...extra) {
-        op.execute(*this, extra...);
-        return *this;
-    }
-
-    template <detail::op_id id, detail::op_type ot, typename L, typename R, typename... Extra>
-    class_ &def_cast(const detail::op_<id, ot, L, R> &op, const Extra &...extra) {
-        op.execute_cast(*this, extra...);
-        return *this;
-    }
-
-    template <typename... Args, typename... Extra>
-    class_ &def(const detail::initimpl::constructor<Args...> &init, const Extra &...extra) {
-        PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(init);
-        init.execute(*this, extra...);
-        return *this;
-    }
-
-    template <typename... Args, typename... Extra>
-    class_ &def(const detail::initimpl::alias_constructor<Args...> &init, const Extra &...extra) {
-        PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(init);
-        init.execute(*this, extra...);
-        return *this;
-    }
-
-    template <typename... Args, typename... Extra>
-    class_ &def(detail::initimpl::factory<Args...> &&init, const Extra &...extra) {
-        std::move(init).execute(*this, extra...);
-        return *this;
-    }
-
-    template <typename... Args, typename... Extra>
-    class_ &def(detail::initimpl::pickle_factory<Args...> &&pf, const Extra &...extra) {
-        std::move(pf).execute(*this, extra...);
-        return *this;
-    }
-
-    template <typename Func>
-    class_ &def_buffer(Func &&func) {
-        struct capture {
-            Func func;
-        };
-        auto *ptr = new capture{std::forward<Func>(func)};
-        install_buffer_funcs(
-            [](PyObject *obj, void *ptr) -> buffer_info * {
-                detail::make_caster<type> caster;
-                if (!caster.load(obj, false)) {
-                    return nullptr;
-                }
-                return new buffer_info(((capture *) ptr)->func(std::move(caster)));
-            },
-            ptr);
-        weakref(m_ptr, cpp_function([ptr](handle wr) {
-                    delete ptr;
-                    wr.dec_ref();
-                }))
-            .release();
-        return *this;
-    }
-
-    template <typename Return, typename Class, typename... Args>
-    class_ &def_buffer(Return (Class::*func)(Args...)) {
-        return def_buffer([func](type &obj) { return (obj.*func)(); });
-    }
-
-    template <typename Return, typename Class, typename... Args>
-    class_ &def_buffer(Return (Class::*func)(Args...) const) {
-        return def_buffer([func](const type &obj) { return (obj.*func)(); });
-    }
-
-    template <typename C, typename D, typename... Extra>
-    class_ &def_readwrite(const char *name, D C::*pm, const Extra &...extra) {
-        static_assert(std::is_same<C, type>::value || std::is_base_of<C, type>::value,
-                      "def_readwrite() requires a class member (or base class member)");
-        cpp_function fget([pm](const type &c) -> const D & { return c.*pm; }, is_method(*this)),
-            fset([pm](type &c, const D &value) { c.*pm = value; }, is_method(*this));
-        def_property(name, fget, fset, return_value_policy::reference_internal, extra...);
-        return *this;
-    }
-
-    template <typename C, typename D, typename... Extra>
-    class_ &def_readonly(const char *name, const D C::*pm, const Extra &...extra) {
-        static_assert(std::is_same<C, type>::value || std::is_base_of<C, type>::value,
-                      "def_readonly() requires a class member (or base class member)");
-        cpp_function fget([pm](const type &c) -> const D & { return c.*pm; }, is_method(*this));
-        def_property_readonly(name, fget, return_value_policy::reference_internal, extra...);
-        return *this;
-    }
-
-    template <typename D, typename... Extra>
-    class_ &def_readwrite_static(const char *name, D *pm, const Extra &...extra) {
-        cpp_function fget([pm](const object &) -> const D & { return *pm; }, scope(*this)),
-            fset([pm](const object &, const D &value) { *pm = value; }, scope(*this));
-        def_property_static(name, fget, fset, return_value_policy::reference, extra...);
-        return *this;
-    }
-
-    template <typename D, typename... Extra>
-    class_ &def_readonly_static(const char *name, const D *pm, const Extra &...extra) {
-        cpp_function fget([pm](const object &) -> const D & { return *pm; }, scope(*this));
-        def_property_readonly_static(name, fget, return_value_policy::reference, extra...);
-        return *this;
-    }
-
-    /// Uses return_value_policy::reference_internal by default
-    template <typename Getter, typename... Extra>
-    class_ &def_property_readonly(const char *name, const Getter &fget, const Extra &...extra) {
-        return def_property_readonly(name,
-                                     cpp_function(method_adaptor<type>(fget)),
-                                     return_value_policy::reference_internal,
-                                     extra...);
-    }
-
-    /// Uses cpp_function's return_value_policy by default
-    template <typename... Extra>
-    class_ &
-    def_property_readonly(const char *name, const cpp_function &fget, const Extra &...extra) {
-        return def_property(name, fget, nullptr, extra...);
-    }
-
-    /// Uses return_value_policy::reference by default
-    template <typename Getter, typename... Extra>
-    class_ &
-    def_property_readonly_static(const char *name, const Getter &fget, const Extra &...extra) {
-        return def_property_readonly_static(
-            name, cpp_function(fget), return_value_policy::reference, extra...);
-    }
-
-    /// Uses cpp_function's return_value_policy by default
-    template <typename... Extra>
-    class_ &def_property_readonly_static(const char *name,
-                                         const cpp_function &fget,
-                                         const Extra &...extra) {
-        return def_property_static(name, fget, nullptr, extra...);
-    }
-
-    /// Uses return_value_policy::reference_internal by default
-    template <typename Getter, typename Setter, typename... Extra>
-    class_ &
-    def_property(const char *name, const Getter &fget, const Setter &fset, const Extra &...extra) {
-        return def_property(name, fget, cpp_function(method_adaptor<type>(fset)), extra...);
-    }
-    template <typename Getter, typename... Extra>
-    class_ &def_property(const char *name,
-                         const Getter &fget,
-                         const cpp_function &fset,
-                         const Extra &...extra) {
-        return def_property(name,
-                            cpp_function(method_adaptor<type>(fget)),
-                            fset,
-                            return_value_policy::reference_internal,
-                            extra...);
-    }
-
-    /// Uses cpp_function's return_value_policy by default
-    template <typename... Extra>
-    class_ &def_property(const char *name,
-                         const cpp_function &fget,
-                         const cpp_function &fset,
-                         const Extra &...extra) {
-        return def_property_static(name, fget, fset, is_method(*this), extra...);
-    }
-
-    /// Uses return_value_policy::reference by default
-    template <typename Getter, typename... Extra>
-    class_ &def_property_static(const char *name,
-                                const Getter &fget,
-                                const cpp_function &fset,
-                                const Extra &...extra) {
-        return def_property_static(
-            name, cpp_function(fget), fset, return_value_policy::reference, extra...);
-    }
-
-    /// Uses cpp_function's return_value_policy by default
-    template <typename... Extra>
-    class_ &def_property_static(const char *name,
-                                const cpp_function &fget,
-                                const cpp_function &fset,
-                                const Extra &...extra) {
-        static_assert(0 == detail::constexpr_sum(std::is_base_of<arg, Extra>::value...),
-                      "Argument annotations are not allowed for properties");
-        auto rec_fget = get_function_record(fget), rec_fset = get_function_record(fset);
-        auto *rec_active = rec_fget;
-        if (rec_fget) {
-            char *doc_prev = rec_fget->doc; /* 'extra' field may include a property-specific
-                                               documentation string */
-            detail::process_attributes<Extra...>::init(extra..., rec_fget);
-            if (rec_fget->doc && rec_fget->doc != doc_prev) {
-                std::free(doc_prev);
-                rec_fget->doc = PYBIND11_COMPAT_STRDUP(rec_fget->doc);
-            }
-        }
-        if (rec_fset) {
-            char *doc_prev = rec_fset->doc;
-            detail::process_attributes<Extra...>::init(extra..., rec_fset);
-            if (rec_fset->doc && rec_fset->doc != doc_prev) {
-                std::free(doc_prev);
-                rec_fset->doc = PYBIND11_COMPAT_STRDUP(rec_fset->doc);
-            }
-            if (!rec_active) {
-                rec_active = rec_fset;
-            }
-        }
-        def_property_static_impl(name, fget, fset, rec_active);
-        return *this;
-    }
-
-private:
-    /// Initialize holder object, variant 1: object derives from enable_shared_from_this
-    template <typename T>
-    static void init_holder(detail::instance *inst,
-                            detail::value_and_holder &v_h,
-                            const holder_type * /* unused */,
-                            const std::enable_shared_from_this<T> * /* dummy */) {
-
-        auto sh = std::dynamic_pointer_cast<typename holder_type::element_type>(
-            detail::try_get_shared_from_this(v_h.value_ptr<type>()));
-        if (sh) {
-            new (std::addressof(v_h.holder<holder_type>())) holder_type(std::move(sh));
-            v_h.set_holder_constructed();
-        }
-
-        if (!v_h.holder_constructed() && inst->owned) {
-            new (std::addressof(v_h.holder<holder_type>())) holder_type(v_h.value_ptr<type>());
-            v_h.set_holder_constructed();
-        }
-    }
-
-    static void init_holder_from_existing(const detail::value_and_holder &v_h,
-                                          const holder_type *holder_ptr,
-                                          std::true_type /*is_copy_constructible*/) {
-        new (std::addressof(v_h.holder<holder_type>()))
-            holder_type(*reinterpret_cast<const holder_type *>(holder_ptr));
-    }
-
-    static void init_holder_from_existing(const detail::value_and_holder &v_h,
-                                          const holder_type *holder_ptr,
-                                          std::false_type /*is_copy_constructible*/) {
-        new (std::addressof(v_h.holder<holder_type>()))
-            holder_type(std::move(*const_cast<holder_type *>(holder_ptr)));
-    }
-
-    /// Initialize holder object, variant 2: try to construct from existing holder object, if
-    /// possible
-    static void init_holder(detail::instance *inst,
-                            detail::value_and_holder &v_h,
-                            const holder_type *holder_ptr,
-                            const void * /* dummy -- not enable_shared_from_this<T>) */) {
-        if (holder_ptr) {
-            init_holder_from_existing(v_h, holder_ptr, std::is_copy_constructible<holder_type>());
-            v_h.set_holder_constructed();
-        } else if (PYBIND11_SILENCE_MSVC_C4127(detail::always_construct_holder<holder_type>::value)
-                   || inst->owned) {
-            new (std::addressof(v_h.holder<holder_type>())) holder_type(v_h.value_ptr<type>());
-            v_h.set_holder_constructed();
-        }
-    }
-
-    /// Performs instance initialization including constructing a holder and registering the known
-    /// instance.  Should be called as soon as the `type` value_ptr is set for an instance.  Takes
-    /// an optional pointer to an existing holder to use; if not specified and the instance is
-    /// `.owned`, a new holder will be constructed to manage the value pointer.
-    static void init_instance(detail::instance *inst, const void *holder_ptr) {
-        auto v_h = inst->get_value_and_holder(detail::get_type_info(typeid(type)));
-        if (!v_h.instance_registered()) {
-            register_instance(inst, v_h.value_ptr(), v_h.type);
-            v_h.set_instance_registered();
-        }
-        init_holder(inst, v_h, (const holder_type *) holder_ptr, v_h.value_ptr<type>());
-    }
-
-    /// Deallocates an instance; via holder, if constructed; otherwise via operator delete.
-    static void dealloc(detail::value_and_holder &v_h) {
-        // We could be deallocating because we are cleaning up after a Python exception.
-        // If so, the Python error indicator will be set. We need to clear that before
-        // running the destructor, in case the destructor code calls more Python.
-        // If we don't, the Python API will exit with an exception, and pybind11 will
-        // throw error_already_set from the C++ destructor which is forbidden and triggers
-        // std::terminate().
-        error_scope scope;
-        if (v_h.holder_constructed()) {
-            v_h.holder<holder_type>().~holder_type();
-            v_h.set_holder_constructed(false);
-        } else {
-            detail::call_operator_delete(
-                v_h.value_ptr<type>(), v_h.type->type_size, v_h.type->type_align);
-        }
-        v_h.value_ptr() = nullptr;
-    }
-
-    static detail::function_record *get_function_record(handle h) {
-        h = detail::get_function(h);
-        return h ? (detail::function_record *) reinterpret_borrow<capsule>(
-                   PyCFunction_GET_SELF(h.ptr()))
-                 : nullptr;
-    }
-};
-
-/// Binds an existing constructor taking arguments Args...
-template <typename... Args>
-detail::initimpl::constructor<Args...> init() {
-    return {};
-}
-/// Like `init<Args...>()`, but the instance is always constructed through the alias class (even
-/// when not inheriting on the Python side).
-template <typename... Args>
-detail::initimpl::alias_constructor<Args...> init_alias() {
-    return {};
-}
-
-/// Binds a factory function as a constructor
-template <typename Func, typename Ret = detail::initimpl::factory<Func>>
-Ret init(Func &&f) {
-    return {std::forward<Func>(f)};
-}
-
-/// Dual-argument factory function: the first function is called when no alias is needed, the
-/// second when an alias is needed (i.e. due to python-side inheritance).  Arguments must be
-/// identical.
-template <typename CFunc, typename AFunc, typename Ret = detail::initimpl::factory<CFunc, AFunc>>
-Ret init(CFunc &&c, AFunc &&a) {
-    return {std::forward<CFunc>(c), std::forward<AFunc>(a)};
-}
-
-/// Binds pickling functions `__getstate__` and `__setstate__` and ensures that the type
-/// returned by `__getstate__` is the same as the argument accepted by `__setstate__`.
-template <typename GetState, typename SetState>
-detail::initimpl::pickle_factory<GetState, SetState> pickle(GetState &&g, SetState &&s) {
-    return {std::forward<GetState>(g), std::forward<SetState>(s)};
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-inline str enum_name(handle arg) {
-    dict entries = arg.get_type().attr("__entries");
-    for (auto kv : entries) {
-        if (handle(kv.second[int_(0)]).equal(arg)) {
-            return pybind11::str(kv.first);
-        }
-    }
-    return "???";
-}
-
-struct enum_base {
-    enum_base(const handle &base, const handle &parent) : m_base(base), m_parent(parent) {}
-
-    PYBIND11_NOINLINE void init(bool is_arithmetic, bool is_convertible) {
-        m_base.attr("__entries") = dict();
-        auto property = handle((PyObject *) &PyProperty_Type);
-        auto static_property = handle((PyObject *) get_internals().static_property_type);
-
-        m_base.attr("__repr__") = cpp_function(
-            [](const object &arg) -> str {
-                handle type = type::handle_of(arg);
-                object type_name = type.attr("__name__");
-                return pybind11::str("<{}.{}: {}>")
-                    .format(std::move(type_name), enum_name(arg), int_(arg));
-            },
-            name("__repr__"),
-            is_method(m_base));
-
-        m_base.attr("name") = property(cpp_function(&enum_name, name("name"), is_method(m_base)));
-
-        m_base.attr("__str__") = cpp_function(
-            [](handle arg) -> str {
-                object type_name = type::handle_of(arg).attr("__name__");
-                return pybind11::str("{}.{}").format(std::move(type_name), enum_name(arg));
-            },
-            name("name"),
-            is_method(m_base));
-
-        m_base.attr("__doc__") = static_property(
-            cpp_function(
-                [](handle arg) -> std::string {
-                    std::string docstring;
-                    dict entries = arg.attr("__entries");
-                    if (((PyTypeObject *) arg.ptr())->tp_doc) {
-                        docstring += std::string(((PyTypeObject *) arg.ptr())->tp_doc) + "\n\n";
-                    }
-                    docstring += "Members:";
-                    for (auto kv : entries) {
-                        auto key = std::string(pybind11::str(kv.first));
-                        auto comment = kv.second[int_(1)];
-                        docstring += "\n\n  " + key;
-                        if (!comment.is_none()) {
-                            docstring += " : " + (std::string) pybind11::str(comment);
-                        }
-                    }
-                    return docstring;
-                },
-                name("__doc__")),
-            none(),
-            none(),
-            "");
-
-        m_base.attr("__members__") = static_property(cpp_function(
-                                                         [](handle arg) -> dict {
-                                                             dict entries = arg.attr("__entries"),
-                                                                  m;
-                                                             for (auto kv : entries) {
-                                                                 m[kv.first] = kv.second[int_(0)];
-                                                             }
-                                                             return m;
-                                                         },
-                                                         name("__members__")),
-                                                     none(),
-                                                     none(),
-                                                     "");
-
-#define PYBIND11_ENUM_OP_STRICT(op, expr, strict_behavior)                                        \
-    m_base.attr(op) = cpp_function(                                                               \
-        [](const object &a, const object &b) {                                                    \
-            if (!type::handle_of(a).is(type::handle_of(b)))                                       \
-                strict_behavior; /* NOLINT(bugprone-macro-parentheses) */                         \
-            return expr;                                                                          \
-        },                                                                                        \
-        name(op),                                                                                 \
-        is_method(m_base),                                                                        \
-        arg("other"))
-
-#define PYBIND11_ENUM_OP_CONV(op, expr)                                                           \
-    m_base.attr(op) = cpp_function(                                                               \
-        [](const object &a_, const object &b_) {                                                  \
-            int_ a(a_), b(b_);                                                                    \
-            return expr;                                                                          \
-        },                                                                                        \
-        name(op),                                                                                 \
-        is_method(m_base),                                                                        \
-        arg("other"))
-
-#define PYBIND11_ENUM_OP_CONV_LHS(op, expr)                                                       \
-    m_base.attr(op) = cpp_function(                                                               \
-        [](const object &a_, const object &b) {                                                   \
-            int_ a(a_);                                                                           \
-            return expr;                                                                          \
-        },                                                                                        \
-        name(op),                                                                                 \
-        is_method(m_base),                                                                        \
-        arg("other"))
-
-        if (is_convertible) {
-            PYBIND11_ENUM_OP_CONV_LHS("__eq__", !b.is_none() && a.equal(b));
-            PYBIND11_ENUM_OP_CONV_LHS("__ne__", b.is_none() || !a.equal(b));
-
-            if (is_arithmetic) {
-                PYBIND11_ENUM_OP_CONV("__lt__", a < b);
-                PYBIND11_ENUM_OP_CONV("__gt__", a > b);
-                PYBIND11_ENUM_OP_CONV("__le__", a <= b);
-                PYBIND11_ENUM_OP_CONV("__ge__", a >= b);
-                PYBIND11_ENUM_OP_CONV("__and__", a & b);
-                PYBIND11_ENUM_OP_CONV("__rand__", a & b);
-                PYBIND11_ENUM_OP_CONV("__or__", a | b);
-                PYBIND11_ENUM_OP_CONV("__ror__", a | b);
-                PYBIND11_ENUM_OP_CONV("__xor__", a ^ b);
-                PYBIND11_ENUM_OP_CONV("__rxor__", a ^ b);
-                m_base.attr("__invert__")
-                    = cpp_function([](const object &arg) { return ~(int_(arg)); },
-                                   name("__invert__"),
-                                   is_method(m_base));
-            }
-        } else {
-            PYBIND11_ENUM_OP_STRICT("__eq__", int_(a).equal(int_(b)), return false);
-            PYBIND11_ENUM_OP_STRICT("__ne__", !int_(a).equal(int_(b)), return true);
-
-            if (is_arithmetic) {
-#define PYBIND11_THROW throw type_error("Expected an enumeration of matching type!");
-                PYBIND11_ENUM_OP_STRICT("__lt__", int_(a) < int_(b), PYBIND11_THROW);
-                PYBIND11_ENUM_OP_STRICT("__gt__", int_(a) > int_(b), PYBIND11_THROW);
-                PYBIND11_ENUM_OP_STRICT("__le__", int_(a) <= int_(b), PYBIND11_THROW);
-                PYBIND11_ENUM_OP_STRICT("__ge__", int_(a) >= int_(b), PYBIND11_THROW);
-#undef PYBIND11_THROW
-            }
-        }
-
-#undef PYBIND11_ENUM_OP_CONV_LHS
-#undef PYBIND11_ENUM_OP_CONV
-#undef PYBIND11_ENUM_OP_STRICT
-
-        m_base.attr("__getstate__") = cpp_function(
-            [](const object &arg) { return int_(arg); }, name("__getstate__"), is_method(m_base));
-
-        m_base.attr("__hash__") = cpp_function(
-            [](const object &arg) { return int_(arg); }, name("__hash__"), is_method(m_base));
-    }
-
-    PYBIND11_NOINLINE void value(char const *name_, object value, const char *doc = nullptr) {
-        dict entries = m_base.attr("__entries");
-        str name(name_);
-        if (entries.contains(name)) {
-            std::string type_name = (std::string) str(m_base.attr("__name__"));
-            throw value_error(std::move(type_name) + ": element \"" + std::string(name_)
-                              + "\" already exists!");
-        }
-
-        entries[name] = pybind11::make_tuple(value, doc);
-        m_base.attr(std::move(name)) = std::move(value);
-    }
-
-    PYBIND11_NOINLINE void export_values() {
-        dict entries = m_base.attr("__entries");
-        for (auto kv : entries) {
-            m_parent.attr(kv.first) = kv.second[int_(0)];
-        }
-    }
-
-    handle m_base;
-    handle m_parent;
-};
-
-template <bool is_signed, size_t length>
-struct equivalent_integer {};
-template <>
-struct equivalent_integer<true, 1> {
-    using type = int8_t;
-};
-template <>
-struct equivalent_integer<false, 1> {
-    using type = uint8_t;
-};
-template <>
-struct equivalent_integer<true, 2> {
-    using type = int16_t;
-};
-template <>
-struct equivalent_integer<false, 2> {
-    using type = uint16_t;
-};
-template <>
-struct equivalent_integer<true, 4> {
-    using type = int32_t;
-};
-template <>
-struct equivalent_integer<false, 4> {
-    using type = uint32_t;
-};
-template <>
-struct equivalent_integer<true, 8> {
-    using type = int64_t;
-};
-template <>
-struct equivalent_integer<false, 8> {
-    using type = uint64_t;
-};
-
-template <typename IntLike>
-using equivalent_integer_t =
-    typename equivalent_integer<std::is_signed<IntLike>::value, sizeof(IntLike)>::type;
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Binds C++ enumerations and enumeration classes to Python
-template <typename Type>
-class enum_ : public class_<Type> {
-public:
-    using Base = class_<Type>;
-    using Base::attr;
-    using Base::def;
-    using Base::def_property_readonly;
-    using Base::def_property_readonly_static;
-    using Underlying = typename std::underlying_type<Type>::type;
-    // Scalar is the integer representation of underlying type
-    using Scalar = detail::conditional_t<detail::any_of<detail::is_std_char_type<Underlying>,
-                                                        std::is_same<Underlying, bool>>::value,
-                                         detail::equivalent_integer_t<Underlying>,
-                                         Underlying>;
-
-    template <typename... Extra>
-    enum_(const handle &scope, const char *name, const Extra &...extra)
-        : class_<Type>(scope, name, extra...), m_base(*this, scope) {
-        constexpr bool is_arithmetic = detail::any_of<std::is_same<arithmetic, Extra>...>::value;
-        constexpr bool is_convertible = std::is_convertible<Type, Underlying>::value;
-        m_base.init(is_arithmetic, is_convertible);
-
-        def(init([](Scalar i) { return static_cast<Type>(i); }), arg("value"));
-        def_property_readonly("value", [](Type value) { return (Scalar) value; });
-        def("__int__", [](Type value) { return (Scalar) value; });
-        def("__index__", [](Type value) { return (Scalar) value; });
-        attr("__setstate__") = cpp_function(
-            [](detail::value_and_holder &v_h, Scalar arg) {
-                detail::initimpl::setstate<Base>(
-                    v_h, static_cast<Type>(arg), Py_TYPE(v_h.inst) != v_h.type->type);
-            },
-            detail::is_new_style_constructor(),
-            pybind11::name("__setstate__"),
-            is_method(*this),
-            arg("state"));
-    }
-
-    /// Export enumeration entries into the parent scope
-    enum_ &export_values() {
-        m_base.export_values();
-        return *this;
-    }
-
-    /// Add an enumeration entry
-    enum_ &value(char const *name, Type value, const char *doc = nullptr) {
-        m_base.value(name, pybind11::cast(value, return_value_policy::copy), doc);
-        return *this;
-    }
-
-private:
-    detail::enum_base m_base;
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-PYBIND11_NOINLINE void keep_alive_impl(handle nurse, handle patient) {
-    if (!nurse || !patient) {
-        pybind11_fail("Could not activate keep_alive!");
-    }
-
-    if (patient.is_none() || nurse.is_none()) {
-        return; /* Nothing to keep alive or nothing to be kept alive by */
-    }
-
-    auto tinfo = all_type_info(Py_TYPE(nurse.ptr()));
-    if (!tinfo.empty()) {
-        /* It's a pybind-registered type, so we can store the patient in the
-         * internal list. */
-        add_patient(nurse.ptr(), patient.ptr());
-    } else {
-        /* Fall back to clever approach based on weak references taken from
-         * Boost.Python. This is not used for pybind-registered types because
-         * the objects can be destroyed out-of-order in a GC pass. */
-        cpp_function disable_lifesupport([patient](handle weakref) {
-            patient.dec_ref();
-            weakref.dec_ref();
-        });
-
-        weakref wr(nurse, disable_lifesupport);
-
-        patient.inc_ref(); /* reference patient and leak the weak reference */
-        (void) wr.release();
-    }
-}
-
-PYBIND11_NOINLINE void
-keep_alive_impl(size_t Nurse, size_t Patient, function_call &call, handle ret) {
-    auto get_arg = [&](size_t n) {
-        if (n == 0) {
-            return ret;
-        }
-        if (n == 1 && call.init_self) {
-            return call.init_self;
-        }
-        if (n <= call.args.size()) {
-            return call.args[n - 1];
-        }
-        return handle();
-    };
-
-    keep_alive_impl(get_arg(Nurse), get_arg(Patient));
-}
-
-inline std::pair<decltype(internals::registered_types_py)::iterator, bool>
-all_type_info_get_cache(PyTypeObject *type) {
-    auto res = get_internals()
-                   .registered_types_py
-#ifdef __cpp_lib_unordered_map_try_emplace
-                   .try_emplace(type);
-#else
-                   .emplace(type, std::vector<detail::type_info *>());
-#endif
-    if (res.second) {
-        // New cache entry created; set up a weak reference to automatically remove it if the type
-        // gets destroyed:
-        weakref((PyObject *) type, cpp_function([type](handle wr) {
-                    get_internals().registered_types_py.erase(type);
-
-                    // TODO consolidate the erasure code in pybind11_meta_dealloc() in class.h
-                    auto &cache = get_internals().inactive_override_cache;
-                    for (auto it = cache.begin(), last = cache.end(); it != last;) {
-                        if (it->first == reinterpret_cast<PyObject *>(type)) {
-                            it = cache.erase(it);
-                        } else {
-                            ++it;
-                        }
-                    }
-
-                    wr.dec_ref();
-                }))
-            .release();
-    }
-
-    return res;
-}
-
-/* There are a large number of apparently unused template arguments because
- * each combination requires a separate py::class_ registration.
- */
-template <typename Access,
-          return_value_policy Policy,
-          typename Iterator,
-          typename Sentinel,
-          typename ValueType,
-          typename... Extra>
-struct iterator_state {
-    Iterator it;
-    Sentinel end;
-    bool first_or_done;
-};
-
-// Note: these helpers take the iterator by non-const reference because some
-// iterators in the wild can't be dereferenced when const. The & after Iterator
-// is required for MSVC < 16.9. SFINAE cannot be reused for result_type due to
-// bugs in ICC, NVCC, and PGI compilers. See PR #3293.
-template <typename Iterator, typename SFINAE = decltype(*std::declval<Iterator &>())>
-struct iterator_access {
-    using result_type = decltype(*std::declval<Iterator &>());
-    // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
-    result_type operator()(Iterator &it) const { return *it; }
-};
-
-template <typename Iterator, typename SFINAE = decltype((*std::declval<Iterator &>()).first)>
-class iterator_key_access {
-private:
-    using pair_type = decltype(*std::declval<Iterator &>());
-
-public:
-    /* If either the pair itself or the element of the pair is a reference, we
-     * want to return a reference, otherwise a value. When the decltype
-     * expression is parenthesized it is based on the value category of the
-     * expression; otherwise it is the declared type of the pair member.
-     * The use of declval<pair_type> in the second branch rather than directly
-     * using *std::declval<Iterator &>() is a workaround for nvcc
-     * (it's not used in the first branch because going via decltype and back
-     * through declval does not perfectly preserve references).
-     */
-    using result_type
-        = conditional_t<std::is_reference<decltype(*std::declval<Iterator &>())>::value,
-                        decltype(((*std::declval<Iterator &>()).first)),
-                        decltype(std::declval<pair_type>().first)>;
-    result_type operator()(Iterator &it) const { return (*it).first; }
-};
-
-template <typename Iterator, typename SFINAE = decltype((*std::declval<Iterator &>()).second)>
-class iterator_value_access {
-private:
-    using pair_type = decltype(*std::declval<Iterator &>());
-
-public:
-    using result_type
-        = conditional_t<std::is_reference<decltype(*std::declval<Iterator &>())>::value,
-                        decltype(((*std::declval<Iterator &>()).second)),
-                        decltype(std::declval<pair_type>().second)>;
-    result_type operator()(Iterator &it) const { return (*it).second; }
-};
-
-template <typename Access,
-          return_value_policy Policy,
-          typename Iterator,
-          typename Sentinel,
-          typename ValueType,
-          typename... Extra>
-iterator make_iterator_impl(Iterator &&first, Sentinel &&last, Extra &&...extra) {
-    using state = detail::iterator_state<Access, Policy, Iterator, Sentinel, ValueType, Extra...>;
-    // TODO: state captures only the types of Extra, not the values
-
-    if (!detail::get_type_info(typeid(state), false)) {
-        class_<state>(handle(), "iterator", pybind11::module_local())
-            .def("__iter__", [](state &s) -> state & { return s; })
-            .def(
-                "__next__",
-                [](state &s) -> ValueType {
-                    if (!s.first_or_done) {
-                        ++s.it;
-                    } else {
-                        s.first_or_done = false;
-                    }
-                    if (s.it == s.end) {
-                        s.first_or_done = true;
-                        throw stop_iteration();
-                    }
-                    return Access()(s.it);
-                    // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
-                },
-                std::forward<Extra>(extra)...,
-                Policy);
-    }
-
-    return cast(state{std::forward<Iterator>(first), std::forward<Sentinel>(last), true});
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Makes a python iterator from a first and past-the-end C++ InputIterator.
-template <return_value_policy Policy = return_value_policy::reference_internal,
-          typename Iterator,
-          typename Sentinel,
-          typename ValueType = typename detail::iterator_access<Iterator>::result_type,
-          typename... Extra>
-iterator make_iterator(Iterator &&first, Sentinel &&last, Extra &&...extra) {
-    return detail::make_iterator_impl<detail::iterator_access<Iterator>,
-                                      Policy,
-                                      Iterator,
-                                      Sentinel,
-                                      ValueType,
-                                      Extra...>(std::forward<Iterator>(first),
-                                                std::forward<Sentinel>(last),
-                                                std::forward<Extra>(extra)...);
-}
-
-/// Makes a python iterator over the keys (`.first`) of a iterator over pairs from a
-/// first and past-the-end InputIterator.
-template <return_value_policy Policy = return_value_policy::reference_internal,
-          typename Iterator,
-          typename Sentinel,
-          typename KeyType = typename detail::iterator_key_access<Iterator>::result_type,
-          typename... Extra>
-iterator make_key_iterator(Iterator &&first, Sentinel &&last, Extra &&...extra) {
-    return detail::make_iterator_impl<detail::iterator_key_access<Iterator>,
-                                      Policy,
-                                      Iterator,
-                                      Sentinel,
-                                      KeyType,
-                                      Extra...>(std::forward<Iterator>(first),
-                                                std::forward<Sentinel>(last),
-                                                std::forward<Extra>(extra)...);
-}
-
-/// Makes a python iterator over the values (`.second`) of a iterator over pairs from a
-/// first and past-the-end InputIterator.
-template <return_value_policy Policy = return_value_policy::reference_internal,
-          typename Iterator,
-          typename Sentinel,
-          typename ValueType = typename detail::iterator_value_access<Iterator>::result_type,
-          typename... Extra>
-iterator make_value_iterator(Iterator &&first, Sentinel &&last, Extra &&...extra) {
-    return detail::make_iterator_impl<detail::iterator_value_access<Iterator>,
-                                      Policy,
-                                      Iterator,
-                                      Sentinel,
-                                      ValueType,
-                                      Extra...>(std::forward<Iterator>(first),
-                                                std::forward<Sentinel>(last),
-                                                std::forward<Extra>(extra)...);
-}
-
-/// Makes an iterator over values of an stl container or other container supporting
-/// `std::begin()`/`std::end()`
-template <return_value_policy Policy = return_value_policy::reference_internal,
-          typename Type,
-          typename... Extra>
-iterator make_iterator(Type &value, Extra &&...extra) {
-    return make_iterator<Policy>(
-        std::begin(value), std::end(value), std::forward<Extra>(extra)...);
-}
-
-/// Makes an iterator over the keys (`.first`) of a stl map-like container supporting
-/// `std::begin()`/`std::end()`
-template <return_value_policy Policy = return_value_policy::reference_internal,
-          typename Type,
-          typename... Extra>
-iterator make_key_iterator(Type &value, Extra &&...extra) {
-    return make_key_iterator<Policy>(
-        std::begin(value), std::end(value), std::forward<Extra>(extra)...);
-}
-
-/// Makes an iterator over the values (`.second`) of a stl map-like container supporting
-/// `std::begin()`/`std::end()`
-template <return_value_policy Policy = return_value_policy::reference_internal,
-          typename Type,
-          typename... Extra>
-iterator make_value_iterator(Type &value, Extra &&...extra) {
-    return make_value_iterator<Policy>(
-        std::begin(value), std::end(value), std::forward<Extra>(extra)...);
-}
-
-template <typename InputType, typename OutputType>
-void implicitly_convertible() {
-    struct set_flag {
-        bool &flag;
-        explicit set_flag(bool &flag_) : flag(flag_) { flag_ = true; }
-        ~set_flag() { flag = false; }
-    };
-    auto implicit_caster = [](PyObject *obj, PyTypeObject *type) -> PyObject * {
-        static bool currently_used = false;
-        if (currently_used) { // implicit conversions are non-reentrant
-            return nullptr;
-        }
-        set_flag flag_helper(currently_used);
-        if (!detail::make_caster<InputType>().load(obj, false)) {
-            return nullptr;
-        }
-        tuple args(1);
-        args[0] = obj;
-        PyObject *result = PyObject_Call((PyObject *) type, args.ptr(), nullptr);
-        if (result == nullptr) {
-            PyErr_Clear();
-        }
-        return result;
-    };
-
-    if (auto *tinfo = detail::get_type_info(typeid(OutputType))) {
-        tinfo->implicit_conversions.emplace_back(std::move(implicit_caster));
-    } else {
-        pybind11_fail("implicitly_convertible: Unable to find type " + type_id<OutputType>());
-    }
-}
-
-inline void register_exception_translator(ExceptionTranslator &&translator) {
-    detail::get_internals().registered_exception_translators.push_front(
-        std::forward<ExceptionTranslator>(translator));
-}
-
-/**
- * Add a new module-local exception translator. Locally registered functions
- * will be tried before any globally registered exception translators, which
- * will only be invoked if the module-local handlers do not deal with
- * the exception.
- */
-inline void register_local_exception_translator(ExceptionTranslator &&translator) {
-    detail::get_local_internals().registered_exception_translators.push_front(
-        std::forward<ExceptionTranslator>(translator));
-}
-
-/**
- * Wrapper to generate a new Python exception type.
- *
- * This should only be used with PyErr_SetString for now.
- * It is not (yet) possible to use as a py::base.
- * Template type argument is reserved for future use.
- */
-template <typename type>
-class exception : public object {
-public:
-    exception() = default;
-    exception(handle scope, const char *name, handle base = PyExc_Exception) {
-        std::string full_name
-            = scope.attr("__name__").cast<std::string>() + std::string(".") + name;
-        m_ptr = PyErr_NewException(const_cast<char *>(full_name.c_str()), base.ptr(), nullptr);
-        if (hasattr(scope, "__dict__") && scope.attr("__dict__").contains(name)) {
-            pybind11_fail("Error during initialization: multiple incompatible "
-                          "definitions with name \""
-                          + std::string(name) + "\"");
-        }
-        scope.attr(name) = *this;
-    }
-
-    // Sets the current python exception to this exception object with the given message
-    void operator()(const char *message) { PyErr_SetString(m_ptr, message); }
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-// Returns a reference to a function-local static exception object used in the simple
-// register_exception approach below.  (It would be simpler to have the static local variable
-// directly in register_exception, but that makes clang <3.5 segfault - issue #1349).
-template <typename CppException>
-exception<CppException> &get_exception_object() {
-    static exception<CppException> ex;
-    return ex;
-}
-
-// Helper function for register_exception and register_local_exception
-template <typename CppException>
-exception<CppException> &
-register_exception_impl(handle scope, const char *name, handle base, bool isLocal) {
-    auto &ex = detail::get_exception_object<CppException>();
-    if (!ex) {
-        ex = exception<CppException>(scope, name, base);
-    }
-
-    auto register_func
-        = isLocal ? &register_local_exception_translator : &register_exception_translator;
-
-    register_func([](std::exception_ptr p) {
-        if (!p) {
-            return;
-        }
-        try {
-            std::rethrow_exception(p);
-        } catch (const CppException &e) {
-            detail::get_exception_object<CppException>()(e.what());
-        }
-    });
-    return ex;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/**
- * Registers a Python exception in `m` of the given `name` and installs a translator to
- * translate the C++ exception to the created Python exception using the what() method.
- * This is intended for simple exception translations; for more complex translation, register the
- * exception object and translator directly.
- */
-template <typename CppException>
-exception<CppException> &
-register_exception(handle scope, const char *name, handle base = PyExc_Exception) {
-    return detail::register_exception_impl<CppException>(scope, name, base, false /* isLocal */);
-}
-
-/**
- * Registers a Python exception in `m` of the given `name` and installs a translator to
- * translate the C++ exception to the created Python exception using the what() method.
- * This translator will only be used for exceptions that are thrown in this module and will be
- * tried before global exception translators, including those registered with register_exception.
- * This is intended for simple exception translations; for more complex translation, register the
- * exception object and translator directly.
- */
-template <typename CppException>
-exception<CppException> &
-register_local_exception(handle scope, const char *name, handle base = PyExc_Exception) {
-    return detail::register_exception_impl<CppException>(scope, name, base, true /* isLocal */);
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-PYBIND11_NOINLINE void print(const tuple &args, const dict &kwargs) {
-    auto strings = tuple(args.size());
-    for (size_t i = 0; i < args.size(); ++i) {
-        strings[i] = str(args[i]);
-    }
-    auto sep = kwargs.contains("sep") ? kwargs["sep"] : str(" ");
-    auto line = sep.attr("join")(std::move(strings));
-
-    object file;
-    if (kwargs.contains("file")) {
-        file = kwargs["file"].cast<object>();
-    } else {
-        try {
-            file = module_::import("sys").attr("stdout");
-        } catch (const error_already_set &) {
-            /* If print() is called from code that is executed as
-               part of garbage collection during interpreter shutdown,
-               importing 'sys' can fail. Give up rather than crashing the
-               interpreter in this case. */
-            return;
-        }
-    }
-
-    auto write = file.attr("write");
-    write(std::move(line));
-    write(kwargs.contains("end") ? kwargs["end"] : str("\n"));
-
-    if (kwargs.contains("flush") && kwargs["flush"].cast<bool>()) {
-        file.attr("flush")();
-    }
-}
-PYBIND11_NAMESPACE_END(detail)
-
-template <return_value_policy policy = return_value_policy::automatic_reference, typename... Args>
-void print(Args &&...args) {
-    auto c = detail::collect_arguments<policy>(std::forward<Args>(args)...);
-    detail::print(c.args(), c.kwargs());
-}
-
-inline void
-error_already_set::m_fetched_error_deleter(detail::error_fetch_and_normalize *raw_ptr) {
-    gil_scoped_acquire gil;
-    error_scope scope;
-    delete raw_ptr;
-}
-
-inline const char *error_already_set::what() const noexcept {
-    gil_scoped_acquire gil;
-    error_scope scope;
-    return m_fetched_error->error_string().c_str();
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-inline function
-get_type_override(const void *this_ptr, const type_info *this_type, const char *name) {
-    handle self = get_object_handle(this_ptr, this_type);
-    if (!self) {
-        return function();
-    }
-    handle type = type::handle_of(self);
-    auto key = std::make_pair(type.ptr(), name);
-
-    /* Cache functions that aren't overridden in Python to avoid
-       many costly Python dictionary lookups below */
-    auto &cache = get_internals().inactive_override_cache;
-    if (cache.find(key) != cache.end()) {
-        return function();
-    }
-
-    function override = getattr(self, name, function());
-    if (override.is_cpp_function()) {
-        cache.insert(std::move(key));
-        return function();
-    }
-
-    /* Don't call dispatch code if invoked from overridden function.
-       Unfortunately this doesn't work on PyPy. */
-#if !defined(PYPY_VERSION)
-#    if PY_VERSION_HEX >= 0x03090000
-    PyFrameObject *frame = PyThreadState_GetFrame(PyThreadState_Get());
-    if (frame != nullptr) {
-        PyCodeObject *f_code = PyFrame_GetCode(frame);
-        // f_code is guaranteed to not be NULL
-        if ((std::string) str(f_code->co_name) == name && f_code->co_argcount > 0) {
-            PyObject *locals = PyEval_GetLocals();
-            if (locals != nullptr) {
-                PyObject *co_varnames = PyObject_GetAttrString((PyObject *) f_code, "co_varnames");
-                PyObject *self_arg = PyTuple_GET_ITEM(co_varnames, 0);
-                Py_DECREF(co_varnames);
-                PyObject *self_caller = dict_getitem(locals, self_arg);
-                if (self_caller == self.ptr()) {
-                    Py_DECREF(f_code);
-                    Py_DECREF(frame);
-                    return function();
-                }
-            }
-        }
-        Py_DECREF(f_code);
-        Py_DECREF(frame);
-    }
-#    else
-    PyFrameObject *frame = PyThreadState_Get()->frame;
-    if (frame != nullptr && (std::string) str(frame->f_code->co_name) == name
-        && frame->f_code->co_argcount > 0) {
-        PyFrame_FastToLocals(frame);
-        PyObject *self_caller
-            = dict_getitem(frame->f_locals, PyTuple_GET_ITEM(frame->f_code->co_varnames, 0));
-        if (self_caller == self.ptr()) {
-            return function();
-        }
-    }
-#    endif
-
-#else
-    /* PyPy currently doesn't provide a detailed cpyext emulation of
-       frame objects, so we have to emulate this using Python. This
-       is going to be slow..*/
-    dict d;
-    d["self"] = self;
-    d["name"] = pybind11::str(name);
-    PyObject *result
-        = PyRun_String("import inspect\n"
-                       "frame = inspect.currentframe()\n"
-                       "if frame is not None:\n"
-                       "    frame = frame.f_back\n"
-                       "    if frame is not None and str(frame.f_code.co_name) == name and "
-                       "frame.f_code.co_argcount > 0:\n"
-                       "        self_caller = frame.f_locals[frame.f_code.co_varnames[0]]\n"
-                       "        if self_caller == self:\n"
-                       "            self = None\n",
-                       Py_file_input,
-                       d.ptr(),
-                       d.ptr());
-    if (result == nullptr)
-        throw error_already_set();
-    Py_DECREF(result);
-    if (d["self"].is_none())
-        return function();
-#endif
-
-    return override;
-}
-PYBIND11_NAMESPACE_END(detail)
-
-/** \rst
-  Try to retrieve a python method by the provided name from the instance pointed to by the
-  this_ptr.
-
-  :this_ptr: The pointer to the object the overridden method should be retrieved for. This should
-             be the first non-trampoline class encountered in the inheritance chain.
-  :name: The name of the overridden Python method to retrieve.
-  :return: The Python method by this name from the object or an empty function wrapper.
- \endrst */
-template <class T>
-function get_override(const T *this_ptr, const char *name) {
-    auto *tinfo = detail::get_type_info(typeid(T));
-    return tinfo ? detail::get_type_override(this_ptr, tinfo, name) : function();
-}
-
-#define PYBIND11_OVERRIDE_IMPL(ret_type, cname, name, ...)                                        \
-    do {                                                                                          \
-        pybind11::gil_scoped_acquire gil;                                                         \
-        pybind11::function override                                                               \
-            = pybind11::get_override(static_cast<const cname *>(this), name);                     \
-        if (override) {                                                                           \
-            auto o = override(__VA_ARGS__);                                                       \
-            if (pybind11::detail::cast_is_temporary_value_reference<ret_type>::value) {           \
-                static pybind11::detail::override_caster_t<ret_type> caster;                      \
-                return pybind11::detail::cast_ref<ret_type>(std::move(o), caster);                \
-            }                                                                                     \
-            return pybind11::detail::cast_safe<ret_type>(std::move(o));                           \
-        }                                                                                         \
-    } while (false)
-
-/** \rst
-    Macro to populate the virtual method in the trampoline class. This macro tries to look up a
-    method named 'fn' from the Python side, deals with the :ref:`gil` and necessary argument
-    conversions to call this method and return the appropriate type.
-    See :ref:`overriding_virtuals` for more information. This macro should be used when the method
-    name in C is not the same as the method name in Python. For example with `__str__`.
-
-    .. code-block:: cpp
-
-      std::string toString() override {
-        PYBIND11_OVERRIDE_NAME(
-            std::string, // Return type (ret_type)
-            Animal,      // Parent class (cname)
-            "__str__",   // Name of method in Python (name)
-            toString,    // Name of function in C++ (fn)
-        );
-      }
-\endrst */
-#define PYBIND11_OVERRIDE_NAME(ret_type, cname, name, fn, ...)                                    \
-    do {                                                                                          \
-        PYBIND11_OVERRIDE_IMPL(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, __VA_ARGS__); \
-        return cname::fn(__VA_ARGS__);                                                            \
-    } while (false)
-
-/** \rst
-    Macro for pure virtual functions, this function is identical to
-    :c:macro:`PYBIND11_OVERRIDE_NAME`, except that it throws if no override can be found.
-\endrst */
-#define PYBIND11_OVERRIDE_PURE_NAME(ret_type, cname, name, fn, ...)                               \
-    do {                                                                                          \
-        PYBIND11_OVERRIDE_IMPL(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, __VA_ARGS__); \
-        pybind11::pybind11_fail(                                                                  \
-            "Tried to call pure virtual function \"" PYBIND11_STRINGIFY(cname) "::" name "\"");   \
-    } while (false)
-
-/** \rst
-    Macro to populate the virtual method in the trampoline class. This macro tries to look up the
-    method from the Python side, deals with the :ref:`gil` and necessary argument conversions to
-    call this method and return the appropriate type. This macro should be used if the method name
-    in C and in Python are identical.
-    See :ref:`overriding_virtuals` for more information.
-
-    .. code-block:: cpp
-
-      class PyAnimal : public Animal {
-      public:
-          // Inherit the constructors
-          using Animal::Animal;
-
-          // Trampoline (need one for each virtual function)
-          std::string go(int n_times) override {
-              PYBIND11_OVERRIDE_PURE(
-                  std::string, // Return type (ret_type)
-                  Animal,      // Parent class (cname)
-                  go,          // Name of function in C++ (must match Python name) (fn)
-                  n_times      // Argument(s) (...)
-              );
-          }
-      };
-\endrst */
-#define PYBIND11_OVERRIDE(ret_type, cname, fn, ...)                                               \
-    PYBIND11_OVERRIDE_NAME(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), #fn, fn, __VA_ARGS__)
-
-/** \rst
-    Macro for pure virtual functions, this function is identical to :c:macro:`PYBIND11_OVERRIDE`,
-    except that it throws if no override can be found.
-\endrst */
-#define PYBIND11_OVERRIDE_PURE(ret_type, cname, fn, ...)                                          \
-    PYBIND11_OVERRIDE_PURE_NAME(                                                                  \
-        PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), #fn, fn, __VA_ARGS__)
-
-// Deprecated versions
-
-PYBIND11_DEPRECATED("get_type_overload has been deprecated")
-inline function
-get_type_overload(const void *this_ptr, const detail::type_info *this_type, const char *name) {
-    return detail::get_type_override(this_ptr, this_type, name);
-}
-
-template <class T>
-inline function get_overload(const T *this_ptr, const char *name) {
-    return get_override(this_ptr, name);
-}
-
-#define PYBIND11_OVERLOAD_INT(ret_type, cname, name, ...)                                         \
-    PYBIND11_OVERRIDE_IMPL(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, __VA_ARGS__)
-#define PYBIND11_OVERLOAD_NAME(ret_type, cname, name, fn, ...)                                    \
-    PYBIND11_OVERRIDE_NAME(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, fn, __VA_ARGS__)
-#define PYBIND11_OVERLOAD_PURE_NAME(ret_type, cname, name, fn, ...)                               \
-    PYBIND11_OVERRIDE_PURE_NAME(                                                                  \
-        PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), name, fn, __VA_ARGS__);
-#define PYBIND11_OVERLOAD(ret_type, cname, fn, ...)                                               \
-    PYBIND11_OVERRIDE(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), fn, __VA_ARGS__)
-#define PYBIND11_OVERLOAD_PURE(ret_type, cname, fn, ...)                                          \
-    PYBIND11_OVERRIDE_PURE(PYBIND11_TYPE(ret_type), PYBIND11_TYPE(cname), fn, __VA_ARGS__);
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-#if defined(__GNUC__) && __GNUC__ == 7
-#    pragma GCC diagnostic pop // -Wnoexcept-type
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/pytypes.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/pytypes.h
deleted file mode 100644
index 6ba1f5f20..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/pytypes.h
+++ /dev/null
@@ -1,2426 +0,0 @@
-/*
-    pybind11/pytypes.h: Convenience wrapper classes for basic Python types
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-#include "buffer_info.h"
-
-#include <assert.h>
-#include <cstddef>
-#include <exception>
-#include <frameobject.h>
-#include <iterator>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <typeinfo>
-#include <utility>
-
-#if defined(PYBIND11_HAS_OPTIONAL)
-#    include <optional>
-#endif
-
-#ifdef PYBIND11_HAS_STRING_VIEW
-#    include <string_view>
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-/* A few forward declarations */
-class handle;
-class object;
-class str;
-class iterator;
-class type;
-struct arg;
-struct arg_v;
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-class args_proxy;
-bool isinstance_generic(handle obj, const std::type_info &tp);
-
-// Accessor forward declarations
-template <typename Policy>
-class accessor;
-namespace accessor_policies {
-struct obj_attr;
-struct str_attr;
-struct generic_item;
-struct sequence_item;
-struct list_item;
-struct tuple_item;
-} // namespace accessor_policies
-using obj_attr_accessor = accessor<accessor_policies::obj_attr>;
-using str_attr_accessor = accessor<accessor_policies::str_attr>;
-using item_accessor = accessor<accessor_policies::generic_item>;
-using sequence_accessor = accessor<accessor_policies::sequence_item>;
-using list_accessor = accessor<accessor_policies::list_item>;
-using tuple_accessor = accessor<accessor_policies::tuple_item>;
-
-/// Tag and check to identify a class which implements the Python object API
-class pyobject_tag {};
-template <typename T>
-using is_pyobject = std::is_base_of<pyobject_tag, remove_reference_t<T>>;
-
-/** \rst
-    A mixin class which adds common functions to `handle`, `object` and various accessors.
-    The only requirement for `Derived` is to implement ``PyObject *Derived::ptr() const``.
-\endrst */
-template <typename Derived>
-class object_api : public pyobject_tag {
-    const Derived &derived() const { return static_cast<const Derived &>(*this); }
-
-public:
-    /** \rst
-        Return an iterator equivalent to calling ``iter()`` in Python. The object
-        must be a collection which supports the iteration protocol.
-    \endrst */
-    iterator begin() const;
-    /// Return a sentinel which ends iteration.
-    iterator end() const;
-
-    /** \rst
-        Return an internal functor to invoke the object's sequence protocol. Casting
-        the returned ``detail::item_accessor`` instance to a `handle` or `object`
-        subclass causes a corresponding call to ``__getitem__``. Assigning a `handle`
-        or `object` subclass causes a call to ``__setitem__``.
-    \endrst */
-    item_accessor operator[](handle key) const;
-    /// See above (the only difference is that the key's reference is stolen)
-    item_accessor operator[](object &&key) const;
-    /// See above (the only difference is that the key is provided as a string literal)
-    item_accessor operator[](const char *key) const;
-
-    /** \rst
-        Return an internal functor to access the object's attributes. Casting the
-        returned ``detail::obj_attr_accessor`` instance to a `handle` or `object`
-        subclass causes a corresponding call to ``getattr``. Assigning a `handle`
-        or `object` subclass causes a call to ``setattr``.
-    \endrst */
-    obj_attr_accessor attr(handle key) const;
-    /// See above (the only difference is that the key's reference is stolen)
-    obj_attr_accessor attr(object &&key) const;
-    /// See above (the only difference is that the key is provided as a string literal)
-    str_attr_accessor attr(const char *key) const;
-
-    /** \rst
-        Matches * unpacking in Python, e.g. to unpack arguments out of a ``tuple``
-        or ``list`` for a function call. Applying another * to the result yields
-        ** unpacking, e.g. to unpack a dict as function keyword arguments.
-        See :ref:`calling_python_functions`.
-    \endrst */
-    args_proxy operator*() const;
-
-    /// Check if the given item is contained within this object, i.e. ``item in obj``.
-    template <typename T>
-    bool contains(T &&item) const;
-
-    /** \rst
-        Assuming the Python object is a function or implements the ``__call__``
-        protocol, ``operator()`` invokes the underlying function, passing an
-        arbitrary set of parameters. The result is returned as a `object` and
-        may need to be converted back into a Python object using `handle::cast()`.
-
-        When some of the arguments cannot be converted to Python objects, the
-        function will throw a `cast_error` exception. When the Python function
-        call fails, a `error_already_set` exception is thrown.
-    \endrst */
-    template <return_value_policy policy = return_value_policy::automatic_reference,
-              typename... Args>
-    object operator()(Args &&...args) const;
-    template <return_value_policy policy = return_value_policy::automatic_reference,
-              typename... Args>
-    PYBIND11_DEPRECATED("call(...) was deprecated in favor of operator()(...)")
-    object call(Args &&...args) const;
-
-    /// Equivalent to ``obj is other`` in Python.
-    bool is(object_api const &other) const { return derived().ptr() == other.derived().ptr(); }
-    /// Equivalent to ``obj is None`` in Python.
-    bool is_none() const { return derived().ptr() == Py_None; }
-    /// Equivalent to obj == other in Python
-    bool equal(object_api const &other) const { return rich_compare(other, Py_EQ); }
-    bool not_equal(object_api const &other) const { return rich_compare(other, Py_NE); }
-    bool operator<(object_api const &other) const { return rich_compare(other, Py_LT); }
-    bool operator<=(object_api const &other) const { return rich_compare(other, Py_LE); }
-    bool operator>(object_api const &other) const { return rich_compare(other, Py_GT); }
-    bool operator>=(object_api const &other) const { return rich_compare(other, Py_GE); }
-
-    object operator-() const;
-    object operator~() const;
-    object operator+(object_api const &other) const;
-    object operator+=(object_api const &other);
-    object operator-(object_api const &other) const;
-    object operator-=(object_api const &other);
-    object operator*(object_api const &other) const;
-    object operator*=(object_api const &other);
-    object operator/(object_api const &other) const;
-    object operator/=(object_api const &other);
-    object operator|(object_api const &other) const;
-    object operator|=(object_api const &other);
-    object operator&(object_api const &other) const;
-    object operator&=(object_api const &other);
-    object operator^(object_api const &other) const;
-    object operator^=(object_api const &other);
-    object operator<<(object_api const &other) const;
-    object operator<<=(object_api const &other);
-    object operator>>(object_api const &other) const;
-    object operator>>=(object_api const &other);
-
-    PYBIND11_DEPRECATED("Use py::str(obj) instead")
-    pybind11::str str() const;
-
-    /// Get or set the object's docstring, i.e. ``obj.__doc__``.
-    str_attr_accessor doc() const;
-
-    /// Return the object's current reference count
-    int ref_count() const { return static_cast<int>(Py_REFCNT(derived().ptr())); }
-
-    // TODO PYBIND11_DEPRECATED(
-    //     "Call py::type::handle_of(h) or py::type::of(h) instead of h.get_type()")
-    handle get_type() const;
-
-private:
-    bool rich_compare(object_api const &other, int value) const;
-};
-
-template <typename T>
-using is_pyobj_ptr_or_nullptr_t = detail::any_of<std::is_same<T, PyObject *>,
-                                                 std::is_same<T, PyObject *const>,
-                                                 std::is_same<T, std::nullptr_t>>;
-
-PYBIND11_NAMESPACE_END(detail)
-
-#if !defined(PYBIND11_HANDLE_REF_DEBUG) && !defined(NDEBUG)
-#    define PYBIND11_HANDLE_REF_DEBUG
-#endif
-
-/** \rst
-    Holds a reference to a Python object (no reference counting)
-
-    The `handle` class is a thin wrapper around an arbitrary Python object (i.e. a
-    ``PyObject *`` in Python's C API). It does not perform any automatic reference
-    counting and merely provides a basic C++ interface to various Python API functions.
-
-    .. seealso::
-        The `object` class inherits from `handle` and adds automatic reference
-        counting features.
-\endrst */
-class handle : public detail::object_api<handle> {
-public:
-    /// The default constructor creates a handle with a ``nullptr``-valued pointer
-    handle() = default;
-
-    /// Enable implicit conversion from ``PyObject *`` and ``nullptr``.
-    /// Not using ``handle(PyObject *ptr)`` to avoid implicit conversion from ``0``.
-    template <typename T,
-              detail::enable_if_t<detail::is_pyobj_ptr_or_nullptr_t<T>::value, int> = 0>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    handle(T ptr) : m_ptr(ptr) {}
-
-    /// Enable implicit conversion through ``T::operator PyObject *()``.
-    template <
-        typename T,
-        detail::enable_if_t<detail::all_of<detail::none_of<std::is_base_of<handle, T>,
-                                                           detail::is_pyobj_ptr_or_nullptr_t<T>>,
-                                           std::is_convertible<T, PyObject *>>::value,
-                            int> = 0>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    handle(T &obj) : m_ptr(obj) {}
-
-    /// Return the underlying ``PyObject *`` pointer
-    PyObject *ptr() const { return m_ptr; }
-    PyObject *&ptr() { return m_ptr; }
-
-    /** \rst
-        Manually increase the reference count of the Python object. Usually, it is
-        preferable to use the `object` class which derives from `handle` and calls
-        this function automatically. Returns a reference to itself.
-    \endrst */
-    const handle &inc_ref() const & {
-#ifdef PYBIND11_HANDLE_REF_DEBUG
-        inc_ref_counter(1);
-#endif
-        Py_XINCREF(m_ptr);
-        return *this;
-    }
-
-    /** \rst
-        Manually decrease the reference count of the Python object. Usually, it is
-        preferable to use the `object` class which derives from `handle` and calls
-        this function automatically. Returns a reference to itself.
-    \endrst */
-    const handle &dec_ref() const & {
-        Py_XDECREF(m_ptr);
-        return *this;
-    }
-
-    /** \rst
-        Attempt to cast the Python object into the given C++ type. A `cast_error`
-        will be throw upon failure.
-    \endrst */
-    template <typename T>
-    T cast() const;
-    /// Return ``true`` when the `handle` wraps a valid Python object
-    explicit operator bool() const { return m_ptr != nullptr; }
-    /** \rst
-        Deprecated: Check that the underlying pointers are the same.
-        Equivalent to ``obj1 is obj2`` in Python.
-    \endrst */
-    PYBIND11_DEPRECATED("Use obj1.is(obj2) instead")
-    bool operator==(const handle &h) const { return m_ptr == h.m_ptr; }
-    PYBIND11_DEPRECATED("Use !obj1.is(obj2) instead")
-    bool operator!=(const handle &h) const { return m_ptr != h.m_ptr; }
-    PYBIND11_DEPRECATED("Use handle::operator bool() instead")
-    bool check() const { return m_ptr != nullptr; }
-
-protected:
-    PyObject *m_ptr = nullptr;
-
-#ifdef PYBIND11_HANDLE_REF_DEBUG
-private:
-    static std::size_t inc_ref_counter(std::size_t add) {
-        thread_local std::size_t counter = 0;
-        counter += add;
-        return counter;
-    }
-
-public:
-    static std::size_t inc_ref_counter() { return inc_ref_counter(0); }
-#endif
-};
-
-/** \rst
-    Holds a reference to a Python object (with reference counting)
-
-    Like `handle`, the `object` class is a thin wrapper around an arbitrary Python
-    object (i.e. a ``PyObject *`` in Python's C API). In contrast to `handle`, it
-    optionally increases the object's reference count upon construction, and it
-    *always* decreases the reference count when the `object` instance goes out of
-    scope and is destructed. When using `object` instances consistently, it is much
-    easier to get reference counting right at the first attempt.
-\endrst */
-class object : public handle {
-public:
-    object() = default;
-    PYBIND11_DEPRECATED("Use reinterpret_borrow<object>() or reinterpret_steal<object>()")
-    object(handle h, bool is_borrowed) : handle(h) {
-        if (is_borrowed) {
-            inc_ref();
-        }
-    }
-    /// Copy constructor; always increases the reference count
-    object(const object &o) : handle(o) { inc_ref(); }
-    /// Move constructor; steals the object from ``other`` and preserves its reference count
-    object(object &&other) noexcept : handle(other) { other.m_ptr = nullptr; }
-    /// Destructor; automatically calls `handle::dec_ref()`
-    ~object() { dec_ref(); }
-
-    /** \rst
-        Resets the internal pointer to ``nullptr`` without decreasing the
-        object's reference count. The function returns a raw handle to the original
-        Python object.
-    \endrst */
-    handle release() {
-        PyObject *tmp = m_ptr;
-        m_ptr = nullptr;
-        return handle(tmp);
-    }
-
-    object &operator=(const object &other) {
-        // Skip inc_ref and dec_ref if both objects are the same
-        if (!this->is(other)) {
-            other.inc_ref();
-            // Use temporary variable to ensure `*this` remains valid while
-            // `Py_XDECREF` executes, in case `*this` is accessible from Python.
-            handle temp(m_ptr);
-            m_ptr = other.m_ptr;
-            temp.dec_ref();
-        }
-        return *this;
-    }
-
-    object &operator=(object &&other) noexcept {
-        if (this != &other) {
-            handle temp(m_ptr);
-            m_ptr = other.m_ptr;
-            other.m_ptr = nullptr;
-            temp.dec_ref();
-        }
-        return *this;
-    }
-
-#define PYBIND11_INPLACE_OP(iop)                                                                  \
-    object iop(object_api const &other) { return operator=(handle::iop(other)); }
-
-    PYBIND11_INPLACE_OP(operator+=)
-    PYBIND11_INPLACE_OP(operator-=)
-    PYBIND11_INPLACE_OP(operator*=)
-    PYBIND11_INPLACE_OP(operator/=)
-    PYBIND11_INPLACE_OP(operator|=)
-    PYBIND11_INPLACE_OP(operator&=)
-    PYBIND11_INPLACE_OP(operator^=)
-    PYBIND11_INPLACE_OP(operator<<=)
-    PYBIND11_INPLACE_OP(operator>>=)
-#undef PYBIND11_INPLACE_OP
-
-    // Calling cast() on an object lvalue just copies (via handle::cast)
-    template <typename T>
-    T cast() const &;
-    // Calling on an object rvalue does a move, if needed and/or possible
-    template <typename T>
-    T cast() &&;
-
-protected:
-    // Tags for choosing constructors from raw PyObject *
-    struct borrowed_t {};
-    struct stolen_t {};
-
-    /// @cond BROKEN
-    template <typename T>
-    friend T reinterpret_borrow(handle);
-    template <typename T>
-    friend T reinterpret_steal(handle);
-    /// @endcond
-
-public:
-    // Only accessible from derived classes and the reinterpret_* functions
-    object(handle h, borrowed_t) : handle(h) { inc_ref(); }
-    object(handle h, stolen_t) : handle(h) {}
-};
-
-/** \rst
-    Declare that a `handle` or ``PyObject *`` is a certain type and borrow the reference.
-    The target type ``T`` must be `object` or one of its derived classes. The function
-    doesn't do any conversions or checks. It's up to the user to make sure that the
-    target type is correct.
-
-    .. code-block:: cpp
-
-        PyObject *p = PyList_GetItem(obj, index);
-        py::object o = reinterpret_borrow<py::object>(p);
-        // or
-        py::tuple t = reinterpret_borrow<py::tuple>(p); // <-- `p` must be already be a `tuple`
-\endrst */
-template <typename T>
-T reinterpret_borrow(handle h) {
-    return {h, object::borrowed_t{}};
-}
-
-/** \rst
-    Like `reinterpret_borrow`, but steals the reference.
-
-     .. code-block:: cpp
-
-        PyObject *p = PyObject_Str(obj);
-        py::str s = reinterpret_steal<py::str>(p); // <-- `p` must be already be a `str`
-\endrst */
-template <typename T>
-T reinterpret_steal(handle h) {
-    return {h, object::stolen_t{}};
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Equivalent to obj.__class__.__name__ (or obj.__name__ if obj is a class).
-inline const char *obj_class_name(PyObject *obj) {
-    if (Py_TYPE(obj) == &PyType_Type) {
-        return reinterpret_cast<PyTypeObject *>(obj)->tp_name;
-    }
-    return Py_TYPE(obj)->tp_name;
-}
-
-std::string error_string();
-
-struct error_fetch_and_normalize {
-    // Immediate normalization is long-established behavior (starting with
-    // https://github.com/pybind/pybind11/commit/135ba8deafb8bf64a15b24d1513899eb600e2011
-    // from Sep 2016) and safest. Normalization could be deferred, but this could mask
-    // errors elsewhere, the performance gain is very minor in typical situations
-    // (usually the dominant bottleneck is EH unwinding), and the implementation here
-    // would be more complex.
-    explicit error_fetch_and_normalize(const char *called) {
-        PyErr_Fetch(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());
-        if (!m_type) {
-            pybind11_fail("Internal error: " + std::string(called)
-                          + " called while "
-                            "Python error indicator not set.");
-        }
-        const char *exc_type_name_orig = detail::obj_class_name(m_type.ptr());
-        if (exc_type_name_orig == nullptr) {
-            pybind11_fail("Internal error: " + std::string(called)
-                          + " failed to obtain the name "
-                            "of the original active exception type.");
-        }
-        m_lazy_error_string = exc_type_name_orig;
-        // PyErr_NormalizeException() may change the exception type if there are cascading
-        // failures. This can potentially be extremely confusing.
-        PyErr_NormalizeException(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());
-        if (m_type.ptr() == nullptr) {
-            pybind11_fail("Internal error: " + std::string(called)
-                          + " failed to normalize the "
-                            "active exception.");
-        }
-        const char *exc_type_name_norm = detail::obj_class_name(m_type.ptr());
-        if (exc_type_name_orig == nullptr) {
-            pybind11_fail("Internal error: " + std::string(called)
-                          + " failed to obtain the name "
-                            "of the normalized active exception type.");
-        }
-#if defined(PYPY_VERSION)
-        // This behavior runs the risk of masking errors in the error handling, but avoids a
-        // conflict with PyPy, which relies on the normalization here to change OSError to
-        // FileNotFoundError (https://github.com/pybind/pybind11/issues/4075).
-        m_lazy_error_string = exc_type_name_norm;
-#else
-        if (exc_type_name_norm != m_lazy_error_string) {
-            std::string msg = std::string(called)
-                              + ": MISMATCH of original and normalized "
-                                "active exception types: ";
-            msg += "ORIGINAL ";
-            msg += m_lazy_error_string;
-            msg += " REPLACED BY ";
-            msg += exc_type_name_norm;
-            msg += ": " + format_value_and_trace();
-            pybind11_fail(msg);
-        }
-#endif
-    }
-
-    error_fetch_and_normalize(const error_fetch_and_normalize &) = delete;
-    error_fetch_and_normalize(error_fetch_and_normalize &&) = delete;
-
-    std::string format_value_and_trace() const {
-        std::string result;
-        std::string message_error_string;
-        if (m_value) {
-            auto value_str = reinterpret_steal<object>(PyObject_Str(m_value.ptr()));
-            if (!value_str) {
-                message_error_string = detail::error_string();
-                result = "<MESSAGE UNAVAILABLE DUE TO ANOTHER EXCEPTION>";
-            } else {
-                result = value_str.cast<std::string>();
-            }
-        } else {
-            result = "<MESSAGE UNAVAILABLE>";
-        }
-        if (result.empty()) {
-            result = "<EMPTY MESSAGE>";
-        }
-
-        bool have_trace = false;
-        if (m_trace) {
-#if !defined(PYPY_VERSION)
-            auto *tb = reinterpret_cast<PyTracebackObject *>(m_trace.ptr());
-
-            // Get the deepest trace possible.
-            while (tb->tb_next) {
-                tb = tb->tb_next;
-            }
-
-            PyFrameObject *frame = tb->tb_frame;
-            Py_XINCREF(frame);
-            result += "\n\nAt:\n";
-            while (frame) {
-#    if PY_VERSION_HEX >= 0x030900B1
-                PyCodeObject *f_code = PyFrame_GetCode(frame);
-#    else
-                PyCodeObject *f_code = frame->f_code;
-                Py_INCREF(f_code);
-#    endif
-                int lineno = PyFrame_GetLineNumber(frame);
-                result += "  ";
-                result += handle(f_code->co_filename).cast<std::string>();
-                result += '(';
-                result += std::to_string(lineno);
-                result += "): ";
-                result += handle(f_code->co_name).cast<std::string>();
-                result += '\n';
-                Py_DECREF(f_code);
-#    if PY_VERSION_HEX >= 0x030900B1
-                auto *b_frame = PyFrame_GetBack(frame);
-#    else
-                auto *b_frame = frame->f_back;
-                Py_XINCREF(b_frame);
-#    endif
-                Py_DECREF(frame);
-                frame = b_frame;
-            }
-
-            have_trace = true;
-#endif //! defined(PYPY_VERSION)
-        }
-
-        if (!message_error_string.empty()) {
-            if (!have_trace) {
-                result += '\n';
-            }
-            result += "\nMESSAGE UNAVAILABLE DUE TO EXCEPTION: " + message_error_string;
-        }
-
-        return result;
-    }
-
-    std::string const &error_string() const {
-        if (!m_lazy_error_string_completed) {
-            m_lazy_error_string += ": " + format_value_and_trace();
-            m_lazy_error_string_completed = true;
-        }
-        return m_lazy_error_string;
-    }
-
-    void restore() {
-        if (m_restore_called) {
-            pybind11_fail("Internal error: pybind11::detail::error_fetch_and_normalize::restore() "
-                          "called a second time. ORIGINAL ERROR: "
-                          + error_string());
-        }
-        PyErr_Restore(m_type.inc_ref().ptr(), m_value.inc_ref().ptr(), m_trace.inc_ref().ptr());
-        m_restore_called = true;
-    }
-
-    bool matches(handle exc) const {
-        return (PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()) != 0);
-    }
-
-    // Not protecting these for simplicity.
-    object m_type, m_value, m_trace;
-
-private:
-    // Only protecting invariants.
-    mutable std::string m_lazy_error_string;
-    mutable bool m_lazy_error_string_completed = false;
-    mutable bool m_restore_called = false;
-};
-
-inline std::string error_string() {
-    return error_fetch_and_normalize("pybind11::detail::error_string").error_string();
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-#if defined(_MSC_VER)
-#    pragma warning(push)
-#    pragma warning(disable : 4275 4251)
-//     warning C4275: An exported class was derived from a class that wasn't exported.
-//     Can be ignored when derived from a STL class.
-#endif
-/// Fetch and hold an error which was already set in Python.  An instance of this is typically
-/// thrown to propagate python-side errors back through C++ which can either be caught manually or
-/// else falls back to the function dispatcher (which then raises the captured error back to
-/// python).
-class PYBIND11_EXPORT_EXCEPTION error_already_set : public std::exception {
-public:
-    /// Fetches the current Python exception (using PyErr_Fetch()), which will clear the
-    /// current Python error indicator.
-    error_already_set()
-        : m_fetched_error{new detail::error_fetch_and_normalize("pybind11::error_already_set"),
-                          m_fetched_error_deleter} {}
-
-    /// The what() result is built lazily on demand.
-    /// WARNING: This member function needs to acquire the Python GIL. This can lead to
-    ///          crashes (undefined behavior) if the Python interpreter is finalizing.
-    const char *what() const noexcept override;
-
-    /// Restores the currently-held Python error (which will clear the Python error indicator first
-    /// if already set).
-    /// NOTE: This member function will always restore the normalized exception, which may or may
-    ///       not be the original Python exception.
-    /// WARNING: The GIL must be held when this member function is called!
-    void restore() { m_fetched_error->restore(); }
-
-    /// If it is impossible to raise the currently-held error, such as in a destructor, we can
-    /// write it out using Python's unraisable hook (`sys.unraisablehook`). The error context
-    /// should be some object whose `repr()` helps identify the location of the error. Python
-    /// already knows the type and value of the error, so there is no need to repeat that.
-    void discard_as_unraisable(object err_context) {
-        restore();
-        PyErr_WriteUnraisable(err_context.ptr());
-    }
-    /// An alternate version of `discard_as_unraisable()`, where a string provides information on
-    /// the location of the error. For example, `__func__` could be helpful.
-    /// WARNING: The GIL must be held when this member function is called!
-    void discard_as_unraisable(const char *err_context) {
-        discard_as_unraisable(reinterpret_steal<object>(PYBIND11_FROM_STRING(err_context)));
-    }
-
-    // Does nothing; provided for backwards compatibility.
-    PYBIND11_DEPRECATED("Use of error_already_set.clear() is deprecated")
-    void clear() {}
-
-    /// Check if the currently trapped error type matches the given Python exception class (or a
-    /// subclass thereof).  May also be passed a tuple to search for any exception class matches in
-    /// the given tuple.
-    bool matches(handle exc) const { return m_fetched_error->matches(exc); }
-
-    const object &type() const { return m_fetched_error->m_type; }
-    const object &value() const { return m_fetched_error->m_value; }
-    const object &trace() const { return m_fetched_error->m_trace; }
-
-private:
-    std::shared_ptr<detail::error_fetch_and_normalize> m_fetched_error;
-
-    /// WARNING: This custom deleter needs to acquire the Python GIL. This can lead to
-    ///          crashes (undefined behavior) if the Python interpreter is finalizing.
-    static void m_fetched_error_deleter(detail::error_fetch_and_normalize *raw_ptr);
-};
-#if defined(_MSC_VER)
-#    pragma warning(pop)
-#endif
-
-/// Replaces the current Python error indicator with the chosen error, performing a
-/// 'raise from' to indicate that the chosen error was caused by the original error.
-inline void raise_from(PyObject *type, const char *message) {
-    // Based on _PyErr_FormatVFromCause:
-    // https://github.com/python/cpython/blob/467ab194fc6189d9f7310c89937c51abeac56839/Python/errors.c#L405
-    // See https://github.com/pybind/pybind11/pull/2112 for details.
-    PyObject *exc = nullptr, *val = nullptr, *val2 = nullptr, *tb = nullptr;
-
-    assert(PyErr_Occurred());
-    PyErr_Fetch(&exc, &val, &tb);
-    PyErr_NormalizeException(&exc, &val, &tb);
-    if (tb != nullptr) {
-        PyException_SetTraceback(val, tb);
-        Py_DECREF(tb);
-    }
-    Py_DECREF(exc);
-    assert(!PyErr_Occurred());
-
-    PyErr_SetString(type, message);
-
-    PyErr_Fetch(&exc, &val2, &tb);
-    PyErr_NormalizeException(&exc, &val2, &tb);
-    Py_INCREF(val);
-    PyException_SetCause(val2, val);
-    PyException_SetContext(val2, val);
-    PyErr_Restore(exc, val2, tb);
-}
-
-/// Sets the current Python error indicator with the chosen error, performing a 'raise from'
-/// from the error contained in error_already_set to indicate that the chosen error was
-/// caused by the original error.
-inline void raise_from(error_already_set &err, PyObject *type, const char *message) {
-    err.restore();
-    raise_from(type, message);
-}
-
-/** \defgroup python_builtins const_name
-    Unless stated otherwise, the following C++ functions behave the same
-    as their Python counterparts.
- */
-
-/** \ingroup python_builtins
-    \rst
-    Return true if ``obj`` is an instance of ``T``. Type ``T`` must be a subclass of
-    `object` or a class which was exposed to Python as ``py::class_<T>``.
-\endrst */
-template <typename T, detail::enable_if_t<std::is_base_of<object, T>::value, int> = 0>
-bool isinstance(handle obj) {
-    return T::check_(obj);
-}
-
-template <typename T, detail::enable_if_t<!std::is_base_of<object, T>::value, int> = 0>
-bool isinstance(handle obj) {
-    return detail::isinstance_generic(obj, typeid(T));
-}
-
-template <>
-inline bool isinstance<handle>(handle) = delete;
-template <>
-inline bool isinstance<object>(handle obj) {
-    return obj.ptr() != nullptr;
-}
-
-/// \ingroup python_builtins
-/// Return true if ``obj`` is an instance of the ``type``.
-inline bool isinstance(handle obj, handle type) {
-    const auto result = PyObject_IsInstance(obj.ptr(), type.ptr());
-    if (result == -1) {
-        throw error_already_set();
-    }
-    return result != 0;
-}
-
-/// \addtogroup python_builtins
-/// @{
-inline bool hasattr(handle obj, handle name) {
-    return PyObject_HasAttr(obj.ptr(), name.ptr()) == 1;
-}
-
-inline bool hasattr(handle obj, const char *name) {
-    return PyObject_HasAttrString(obj.ptr(), name) == 1;
-}
-
-inline void delattr(handle obj, handle name) {
-    if (PyObject_DelAttr(obj.ptr(), name.ptr()) != 0) {
-        throw error_already_set();
-    }
-}
-
-inline void delattr(handle obj, const char *name) {
-    if (PyObject_DelAttrString(obj.ptr(), name) != 0) {
-        throw error_already_set();
-    }
-}
-
-inline object getattr(handle obj, handle name) {
-    PyObject *result = PyObject_GetAttr(obj.ptr(), name.ptr());
-    if (!result) {
-        throw error_already_set();
-    }
-    return reinterpret_steal<object>(result);
-}
-
-inline object getattr(handle obj, const char *name) {
-    PyObject *result = PyObject_GetAttrString(obj.ptr(), name);
-    if (!result) {
-        throw error_already_set();
-    }
-    return reinterpret_steal<object>(result);
-}
-
-inline object getattr(handle obj, handle name, handle default_) {
-    if (PyObject *result = PyObject_GetAttr(obj.ptr(), name.ptr())) {
-        return reinterpret_steal<object>(result);
-    }
-    PyErr_Clear();
-    return reinterpret_borrow<object>(default_);
-}
-
-inline object getattr(handle obj, const char *name, handle default_) {
-    if (PyObject *result = PyObject_GetAttrString(obj.ptr(), name)) {
-        return reinterpret_steal<object>(result);
-    }
-    PyErr_Clear();
-    return reinterpret_borrow<object>(default_);
-}
-
-inline void setattr(handle obj, handle name, handle value) {
-    if (PyObject_SetAttr(obj.ptr(), name.ptr(), value.ptr()) != 0) {
-        throw error_already_set();
-    }
-}
-
-inline void setattr(handle obj, const char *name, handle value) {
-    if (PyObject_SetAttrString(obj.ptr(), name, value.ptr()) != 0) {
-        throw error_already_set();
-    }
-}
-
-inline ssize_t hash(handle obj) {
-    auto h = PyObject_Hash(obj.ptr());
-    if (h == -1) {
-        throw error_already_set();
-    }
-    return h;
-}
-
-/// @} python_builtins
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-inline handle get_function(handle value) {
-    if (value) {
-        if (PyInstanceMethod_Check(value.ptr())) {
-            value = PyInstanceMethod_GET_FUNCTION(value.ptr());
-        } else if (PyMethod_Check(value.ptr())) {
-            value = PyMethod_GET_FUNCTION(value.ptr());
-        }
-    }
-    return value;
-}
-
-// Reimplementation of python's dict helper functions to ensure that exceptions
-// aren't swallowed (see #2862)
-
-// copied from cpython _PyDict_GetItemStringWithError
-inline PyObject *dict_getitemstring(PyObject *v, const char *key) {
-    PyObject *kv = nullptr, *rv = nullptr;
-    kv = PyUnicode_FromString(key);
-    if (kv == nullptr) {
-        throw error_already_set();
-    }
-
-    rv = PyDict_GetItemWithError(v, kv);
-    Py_DECREF(kv);
-    if (rv == nullptr && PyErr_Occurred()) {
-        throw error_already_set();
-    }
-    return rv;
-}
-
-inline PyObject *dict_getitem(PyObject *v, PyObject *key) {
-    PyObject *rv = PyDict_GetItemWithError(v, key);
-    if (rv == nullptr && PyErr_Occurred()) {
-        throw error_already_set();
-    }
-    return rv;
-}
-
-// Helper aliases/functions to support implicit casting of values given to python
-// accessors/methods. When given a pyobject, this simply returns the pyobject as-is; for other C++
-// type, the value goes through pybind11::cast(obj) to convert it to an `object`.
-template <typename T, enable_if_t<is_pyobject<T>::value, int> = 0>
-auto object_or_cast(T &&o) -> decltype(std::forward<T>(o)) {
-    return std::forward<T>(o);
-}
-// The following casting version is implemented in cast.h:
-template <typename T, enable_if_t<!is_pyobject<T>::value, int> = 0>
-object object_or_cast(T &&o);
-// Match a PyObject*, which we want to convert directly to handle via its converting constructor
-inline handle object_or_cast(PyObject *ptr) { return ptr; }
-
-#if defined(_MSC_VER) && _MSC_VER < 1920
-#    pragma warning(push)
-#    pragma warning(disable : 4522) // warning C4522: multiple assignment operators specified
-#endif
-template <typename Policy>
-class accessor : public object_api<accessor<Policy>> {
-    using key_type = typename Policy::key_type;
-
-public:
-    accessor(handle obj, key_type key) : obj(obj), key(std::move(key)) {}
-    accessor(const accessor &) = default;
-    accessor(accessor &&) noexcept = default;
-
-    // accessor overload required to override default assignment operator (templates are not
-    // allowed to replace default compiler-generated assignments).
-    void operator=(const accessor &a) && { std::move(*this).operator=(handle(a)); }
-    void operator=(const accessor &a) & { operator=(handle(a)); }
-
-    template <typename T>
-    void operator=(T &&value) && {
-        Policy::set(obj, key, object_or_cast(std::forward<T>(value)));
-    }
-    template <typename T>
-    void operator=(T &&value) & {
-        get_cache() = ensure_object(object_or_cast(std::forward<T>(value)));
-    }
-
-    template <typename T = Policy>
-    PYBIND11_DEPRECATED(
-        "Use of obj.attr(...) as bool is deprecated in favor of pybind11::hasattr(obj, ...)")
-    explicit
-    operator enable_if_t<std::is_same<T, accessor_policies::str_attr>::value
-                             || std::is_same<T, accessor_policies::obj_attr>::value,
-                         bool>() const {
-        return hasattr(obj, key);
-    }
-    template <typename T = Policy>
-    PYBIND11_DEPRECATED("Use of obj[key] as bool is deprecated in favor of obj.contains(key)")
-    explicit
-    operator enable_if_t<std::is_same<T, accessor_policies::generic_item>::value, bool>() const {
-        return obj.contains(key);
-    }
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator object() const { return get_cache(); }
-    PyObject *ptr() const { return get_cache().ptr(); }
-    template <typename T>
-    T cast() const {
-        return get_cache().template cast<T>();
-    }
-
-private:
-    static object ensure_object(object &&o) { return std::move(o); }
-    static object ensure_object(handle h) { return reinterpret_borrow<object>(h); }
-
-    object &get_cache() const {
-        if (!cache) {
-            cache = Policy::get(obj, key);
-        }
-        return cache;
-    }
-
-private:
-    handle obj;
-    key_type key;
-    mutable object cache;
-};
-#if defined(_MSC_VER) && _MSC_VER < 1920
-#    pragma warning(pop)
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(accessor_policies)
-struct obj_attr {
-    using key_type = object;
-    static object get(handle obj, handle key) { return getattr(obj, key); }
-    static void set(handle obj, handle key, handle val) { setattr(obj, key, val); }
-};
-
-struct str_attr {
-    using key_type = const char *;
-    static object get(handle obj, const char *key) { return getattr(obj, key); }
-    static void set(handle obj, const char *key, handle val) { setattr(obj, key, val); }
-};
-
-struct generic_item {
-    using key_type = object;
-
-    static object get(handle obj, handle key) {
-        PyObject *result = PyObject_GetItem(obj.ptr(), key.ptr());
-        if (!result) {
-            throw error_already_set();
-        }
-        return reinterpret_steal<object>(result);
-    }
-
-    static void set(handle obj, handle key, handle val) {
-        if (PyObject_SetItem(obj.ptr(), key.ptr(), val.ptr()) != 0) {
-            throw error_already_set();
-        }
-    }
-};
-
-struct sequence_item {
-    using key_type = size_t;
-
-    template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
-    static object get(handle obj, const IdxType &index) {
-        PyObject *result = PySequence_GetItem(obj.ptr(), ssize_t_cast(index));
-        if (!result) {
-            throw error_already_set();
-        }
-        return reinterpret_steal<object>(result);
-    }
-
-    template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
-    static void set(handle obj, const IdxType &index, handle val) {
-        // PySequence_SetItem does not steal a reference to 'val'
-        if (PySequence_SetItem(obj.ptr(), ssize_t_cast(index), val.ptr()) != 0) {
-            throw error_already_set();
-        }
-    }
-};
-
-struct list_item {
-    using key_type = size_t;
-
-    template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
-    static object get(handle obj, const IdxType &index) {
-        PyObject *result = PyList_GetItem(obj.ptr(), ssize_t_cast(index));
-        if (!result) {
-            throw error_already_set();
-        }
-        return reinterpret_borrow<object>(result);
-    }
-
-    template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
-    static void set(handle obj, const IdxType &index, handle val) {
-        // PyList_SetItem steals a reference to 'val'
-        if (PyList_SetItem(obj.ptr(), ssize_t_cast(index), val.inc_ref().ptr()) != 0) {
-            throw error_already_set();
-        }
-    }
-};
-
-struct tuple_item {
-    using key_type = size_t;
-
-    template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
-    static object get(handle obj, const IdxType &index) {
-        PyObject *result = PyTuple_GetItem(obj.ptr(), ssize_t_cast(index));
-        if (!result) {
-            throw error_already_set();
-        }
-        return reinterpret_borrow<object>(result);
-    }
-
-    template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
-    static void set(handle obj, const IdxType &index, handle val) {
-        // PyTuple_SetItem steals a reference to 'val'
-        if (PyTuple_SetItem(obj.ptr(), ssize_t_cast(index), val.inc_ref().ptr()) != 0) {
-            throw error_already_set();
-        }
-    }
-};
-PYBIND11_NAMESPACE_END(accessor_policies)
-
-/// STL iterator template used for tuple, list, sequence and dict
-template <typename Policy>
-class generic_iterator : public Policy {
-    using It = generic_iterator;
-
-public:
-    using difference_type = ssize_t;
-    using iterator_category = typename Policy::iterator_category;
-    using value_type = typename Policy::value_type;
-    using reference = typename Policy::reference;
-    using pointer = typename Policy::pointer;
-
-    generic_iterator() = default;
-    generic_iterator(handle seq, ssize_t index) : Policy(seq, index) {}
-
-    // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
-    reference operator*() const { return Policy::dereference(); }
-    // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
-    reference operator[](difference_type n) const { return *(*this + n); }
-    pointer operator->() const { return **this; }
-
-    It &operator++() {
-        Policy::increment();
-        return *this;
-    }
-    It operator++(int) {
-        auto copy = *this;
-        Policy::increment();
-        return copy;
-    }
-    It &operator--() {
-        Policy::decrement();
-        return *this;
-    }
-    It operator--(int) {
-        auto copy = *this;
-        Policy::decrement();
-        return copy;
-    }
-    It &operator+=(difference_type n) {
-        Policy::advance(n);
-        return *this;
-    }
-    It &operator-=(difference_type n) {
-        Policy::advance(-n);
-        return *this;
-    }
-
-    friend It operator+(const It &a, difference_type n) {
-        auto copy = a;
-        return copy += n;
-    }
-    friend It operator+(difference_type n, const It &b) { return b + n; }
-    friend It operator-(const It &a, difference_type n) {
-        auto copy = a;
-        return copy -= n;
-    }
-    friend difference_type operator-(const It &a, const It &b) { return a.distance_to(b); }
-
-    friend bool operator==(const It &a, const It &b) { return a.equal(b); }
-    friend bool operator!=(const It &a, const It &b) { return !(a == b); }
-    friend bool operator<(const It &a, const It &b) { return b - a > 0; }
-    friend bool operator>(const It &a, const It &b) { return b < a; }
-    friend bool operator>=(const It &a, const It &b) { return !(a < b); }
-    friend bool operator<=(const It &a, const It &b) { return !(a > b); }
-};
-
-PYBIND11_NAMESPACE_BEGIN(iterator_policies)
-/// Quick proxy class needed to implement ``operator->`` for iterators which can't return pointers
-template <typename T>
-struct arrow_proxy {
-    T value;
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    arrow_proxy(T &&value) noexcept : value(std::move(value)) {}
-    T *operator->() const { return &value; }
-};
-
-/// Lightweight iterator policy using just a simple pointer: see ``PySequence_Fast_ITEMS``
-class sequence_fast_readonly {
-protected:
-    using iterator_category = std::random_access_iterator_tag;
-    using value_type = handle;
-    using reference = const handle; // PR #3263
-    using pointer = arrow_proxy<const handle>;
-
-    sequence_fast_readonly(handle obj, ssize_t n) : ptr(PySequence_Fast_ITEMS(obj.ptr()) + n) {}
-
-    // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
-    reference dereference() const { return *ptr; }
-    void increment() { ++ptr; }
-    void decrement() { --ptr; }
-    void advance(ssize_t n) { ptr += n; }
-    bool equal(const sequence_fast_readonly &b) const { return ptr == b.ptr; }
-    ssize_t distance_to(const sequence_fast_readonly &b) const { return ptr - b.ptr; }
-
-private:
-    PyObject **ptr;
-};
-
-/// Full read and write access using the sequence protocol: see ``detail::sequence_accessor``
-class sequence_slow_readwrite {
-protected:
-    using iterator_category = std::random_access_iterator_tag;
-    using value_type = object;
-    using reference = sequence_accessor;
-    using pointer = arrow_proxy<const sequence_accessor>;
-
-    sequence_slow_readwrite(handle obj, ssize_t index) : obj(obj), index(index) {}
-
-    reference dereference() const { return {obj, static_cast<size_t>(index)}; }
-    void increment() { ++index; }
-    void decrement() { --index; }
-    void advance(ssize_t n) { index += n; }
-    bool equal(const sequence_slow_readwrite &b) const { return index == b.index; }
-    ssize_t distance_to(const sequence_slow_readwrite &b) const { return index - b.index; }
-
-private:
-    handle obj;
-    ssize_t index;
-};
-
-/// Python's dictionary protocol permits this to be a forward iterator
-class dict_readonly {
-protected:
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = std::pair<handle, handle>;
-    using reference = const value_type; // PR #3263
-    using pointer = arrow_proxy<const value_type>;
-
-    dict_readonly() = default;
-    dict_readonly(handle obj, ssize_t pos) : obj(obj), pos(pos) { increment(); }
-
-    // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
-    reference dereference() const { return {key, value}; }
-    void increment() {
-        if (PyDict_Next(obj.ptr(), &pos, &key, &value) == 0) {
-            pos = -1;
-        }
-    }
-    bool equal(const dict_readonly &b) const { return pos == b.pos; }
-
-private:
-    handle obj;
-    PyObject *key = nullptr, *value = nullptr;
-    ssize_t pos = -1;
-};
-PYBIND11_NAMESPACE_END(iterator_policies)
-
-#if !defined(PYPY_VERSION)
-using tuple_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>;
-using list_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>;
-#else
-using tuple_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;
-using list_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;
-#endif
-
-using sequence_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;
-using dict_iterator = generic_iterator<iterator_policies::dict_readonly>;
-
-inline bool PyIterable_Check(PyObject *obj) {
-    PyObject *iter = PyObject_GetIter(obj);
-    if (iter) {
-        Py_DECREF(iter);
-        return true;
-    }
-    PyErr_Clear();
-    return false;
-}
-
-inline bool PyNone_Check(PyObject *o) { return o == Py_None; }
-inline bool PyEllipsis_Check(PyObject *o) { return o == Py_Ellipsis; }
-
-#ifdef PYBIND11_STR_LEGACY_PERMISSIVE
-inline bool PyUnicode_Check_Permissive(PyObject *o) {
-    return PyUnicode_Check(o) || PYBIND11_BYTES_CHECK(o);
-}
-#    define PYBIND11_STR_CHECK_FUN detail::PyUnicode_Check_Permissive
-#else
-#    define PYBIND11_STR_CHECK_FUN PyUnicode_Check
-#endif
-
-inline bool PyStaticMethod_Check(PyObject *o) { return o->ob_type == &PyStaticMethod_Type; }
-
-class kwargs_proxy : public handle {
-public:
-    explicit kwargs_proxy(handle h) : handle(h) {}
-};
-
-class args_proxy : public handle {
-public:
-    explicit args_proxy(handle h) : handle(h) {}
-    kwargs_proxy operator*() const { return kwargs_proxy(*this); }
-};
-
-/// Python argument categories (using PEP 448 terms)
-template <typename T>
-using is_keyword = std::is_base_of<arg, T>;
-template <typename T>
-using is_s_unpacking = std::is_same<args_proxy, T>; // * unpacking
-template <typename T>
-using is_ds_unpacking = std::is_same<kwargs_proxy, T>; // ** unpacking
-template <typename T>
-using is_positional = satisfies_none_of<T, is_keyword, is_s_unpacking, is_ds_unpacking>;
-template <typename T>
-using is_keyword_or_ds = satisfies_any_of<T, is_keyword, is_ds_unpacking>;
-
-// Call argument collector forward declarations
-template <return_value_policy policy = return_value_policy::automatic_reference>
-class simple_collector;
-template <return_value_policy policy = return_value_policy::automatic_reference>
-class unpacking_collector;
-
-PYBIND11_NAMESPACE_END(detail)
-
-// TODO: After the deprecated constructors are removed, this macro can be simplified by
-//       inheriting ctors: `using Parent::Parent`. It's not an option right now because
-//       the `using` statement triggers the parent deprecation warning even if the ctor
-//       isn't even used.
-#define PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun)                                            \
-public:                                                                                           \
-    PYBIND11_DEPRECATED("Use reinterpret_borrow<" #Name ">() or reinterpret_steal<" #Name ">()")  \
-    Name(handle h, bool is_borrowed)                                                              \
-        : Parent(is_borrowed ? Parent(h, borrowed_t{}) : Parent(h, stolen_t{})) {}                \
-    Name(handle h, borrowed_t) : Parent(h, borrowed_t{}) {}                                       \
-    Name(handle h, stolen_t) : Parent(h, stolen_t{}) {}                                           \
-    PYBIND11_DEPRECATED("Use py::isinstance<py::python_type>(obj) instead")                       \
-    bool check() const { return m_ptr != nullptr && (CheckFun(m_ptr) != 0); }                     \
-    static bool check_(handle h) { return h.ptr() != nullptr && CheckFun(h.ptr()); }              \
-    template <typename Policy_> /* NOLINTNEXTLINE(google-explicit-constructor) */                 \
-    Name(const ::pybind11::detail::accessor<Policy_> &a) : Name(object(a)) {}
-
-#define PYBIND11_OBJECT_CVT(Name, Parent, CheckFun, ConvertFun)                                   \
-    PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun)                                                \
-    /* This is deliberately not 'explicit' to allow implicit conversion from object: */           \
-    /* NOLINTNEXTLINE(google-explicit-constructor) */                                             \
-    Name(const object &o)                                                                         \
-        : Parent(check_(o) ? o.inc_ref().ptr() : ConvertFun(o.ptr()), stolen_t{}) {               \
-        if (!m_ptr)                                                                               \
-            throw ::pybind11::error_already_set();                                                \
-    }                                                                                             \
-    /* NOLINTNEXTLINE(google-explicit-constructor) */                                             \
-    Name(object &&o) : Parent(check_(o) ? o.release().ptr() : ConvertFun(o.ptr()), stolen_t{}) {  \
-        if (!m_ptr)                                                                               \
-            throw ::pybind11::error_already_set();                                                \
-    }
-
-#define PYBIND11_OBJECT_CVT_DEFAULT(Name, Parent, CheckFun, ConvertFun)                           \
-    PYBIND11_OBJECT_CVT(Name, Parent, CheckFun, ConvertFun)                                       \
-    Name() = default;
-
-#define PYBIND11_OBJECT_CHECK_FAILED(Name, o_ptr)                                                 \
-    ::pybind11::type_error("Object of type '"                                                     \
-                           + ::pybind11::detail::get_fully_qualified_tp_name(Py_TYPE(o_ptr))      \
-                           + "' is not an instance of '" #Name "'")
-
-#define PYBIND11_OBJECT(Name, Parent, CheckFun)                                                   \
-    PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun)                                                \
-    /* This is deliberately not 'explicit' to allow implicit conversion from object: */           \
-    /* NOLINTNEXTLINE(google-explicit-constructor) */                                             \
-    Name(const object &o) : Parent(o) {                                                           \
-        if (m_ptr && !check_(m_ptr))                                                              \
-            throw PYBIND11_OBJECT_CHECK_FAILED(Name, m_ptr);                                      \
-    }                                                                                             \
-    /* NOLINTNEXTLINE(google-explicit-constructor) */                                             \
-    Name(object &&o) : Parent(std::move(o)) {                                                     \
-        if (m_ptr && !check_(m_ptr))                                                              \
-            throw PYBIND11_OBJECT_CHECK_FAILED(Name, m_ptr);                                      \
-    }
-
-#define PYBIND11_OBJECT_DEFAULT(Name, Parent, CheckFun)                                           \
-    PYBIND11_OBJECT(Name, Parent, CheckFun)                                                       \
-    Name() = default;
-
-/// \addtogroup pytypes
-/// @{
-
-/** \rst
-    Wraps a Python iterator so that it can also be used as a C++ input iterator
-
-    Caveat: copying an iterator does not (and cannot) clone the internal
-    state of the Python iterable. This also applies to the post-increment
-    operator. This iterator should only be used to retrieve the current
-    value using ``operator*()``.
-\endrst */
-class iterator : public object {
-public:
-    using iterator_category = std::input_iterator_tag;
-    using difference_type = ssize_t;
-    using value_type = handle;
-    using reference = const handle; // PR #3263
-    using pointer = const handle *;
-
-    PYBIND11_OBJECT_DEFAULT(iterator, object, PyIter_Check)
-
-    iterator &operator++() {
-        advance();
-        return *this;
-    }
-
-    iterator operator++(int) {
-        auto rv = *this;
-        advance();
-        return rv;
-    }
-
-    // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
-    reference operator*() const {
-        if (m_ptr && !value.ptr()) {
-            auto &self = const_cast<iterator &>(*this);
-            self.advance();
-        }
-        return value;
-    }
-
-    pointer operator->() const {
-        operator*();
-        return &value;
-    }
-
-    /** \rst
-         The value which marks the end of the iteration. ``it == iterator::sentinel()``
-         is equivalent to catching ``StopIteration`` in Python.
-
-         .. code-block:: cpp
-
-             void foo(py::iterator it) {
-                 while (it != py::iterator::sentinel()) {
-                    // use `*it`
-                    ++it;
-                 }
-             }
-    \endrst */
-    static iterator sentinel() { return {}; }
-
-    friend bool operator==(const iterator &a, const iterator &b) { return a->ptr() == b->ptr(); }
-    friend bool operator!=(const iterator &a, const iterator &b) { return a->ptr() != b->ptr(); }
-
-private:
-    void advance() {
-        value = reinterpret_steal<object>(PyIter_Next(m_ptr));
-        if (PyErr_Occurred()) {
-            throw error_already_set();
-        }
-    }
-
-private:
-    object value = {};
-};
-
-class type : public object {
-public:
-    PYBIND11_OBJECT(type, object, PyType_Check)
-
-    /// Return a type handle from a handle or an object
-    static handle handle_of(handle h) { return handle((PyObject *) Py_TYPE(h.ptr())); }
-
-    /// Return a type object from a handle or an object
-    static type of(handle h) { return type(type::handle_of(h), borrowed_t{}); }
-
-    // Defined in pybind11/cast.h
-    /// Convert C++ type to handle if previously registered. Does not convert
-    /// standard types, like int, float. etc. yet.
-    /// See https://github.com/pybind/pybind11/issues/2486
-    template <typename T>
-    static handle handle_of();
-
-    /// Convert C++ type to type if previously registered. Does not convert
-    /// standard types, like int, float. etc. yet.
-    /// See https://github.com/pybind/pybind11/issues/2486
-    template <typename T>
-    static type of() {
-        return type(type::handle_of<T>(), borrowed_t{});
-    }
-};
-
-class iterable : public object {
-public:
-    PYBIND11_OBJECT_DEFAULT(iterable, object, detail::PyIterable_Check)
-};
-
-class bytes;
-
-class str : public object {
-public:
-    PYBIND11_OBJECT_CVT(str, object, PYBIND11_STR_CHECK_FUN, raw_str)
-
-    template <typename SzType, detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
-    str(const char *c, const SzType &n)
-        : object(PyUnicode_FromStringAndSize(c, ssize_t_cast(n)), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate string object!");
-        }
-    }
-
-    // 'explicit' is explicitly omitted from the following constructors to allow implicit
-    // conversion to py::str from C++ string-like objects
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    str(const char *c = "") : object(PyUnicode_FromString(c), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate string object!");
-        }
-    }
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    str(const std::string &s) : str(s.data(), s.size()) {}
-
-#ifdef PYBIND11_HAS_STRING_VIEW
-    // enable_if is needed to avoid "ambiguous conversion" errors (see PR #3521).
-    template <typename T, detail::enable_if_t<std::is_same<T, std::string_view>::value, int> = 0>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    str(T s) : str(s.data(), s.size()) {}
-
-#    ifdef PYBIND11_HAS_U8STRING
-    // reinterpret_cast here is safe (C++20 guarantees char8_t has the same size/alignment as char)
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    str(std::u8string_view s) : str(reinterpret_cast<const char *>(s.data()), s.size()) {}
-#    endif
-
-#endif
-
-    explicit str(const bytes &b);
-
-    /** \rst
-        Return a string representation of the object. This is analogous to
-        the ``str()`` function in Python.
-    \endrst */
-    explicit str(handle h) : object(raw_str(h.ptr()), stolen_t{}) {
-        if (!m_ptr) {
-            throw error_already_set();
-        }
-    }
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator std::string() const {
-        object temp = *this;
-        if (PyUnicode_Check(m_ptr)) {
-            temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(m_ptr));
-            if (!temp) {
-                throw error_already_set();
-            }
-        }
-        char *buffer = nullptr;
-        ssize_t length = 0;
-        if (PyBytes_AsStringAndSize(temp.ptr(), &buffer, &length) != 0) {
-            throw error_already_set();
-        }
-        return std::string(buffer, (size_t) length);
-    }
-
-    template <typename... Args>
-    str format(Args &&...args) const {
-        return attr("format")(std::forward<Args>(args)...);
-    }
-
-private:
-    /// Return string representation -- always returns a new reference, even if already a str
-    static PyObject *raw_str(PyObject *op) {
-        PyObject *str_value = PyObject_Str(op);
-        return str_value;
-    }
-};
-/// @} pytypes
-
-inline namespace literals {
-/** \rst
-    String literal version of `str`
- \endrst */
-inline str operator"" _s(const char *s, size_t size) { return {s, size}; }
-} // namespace literals
-
-/// \addtogroup pytypes
-/// @{
-class bytes : public object {
-public:
-    PYBIND11_OBJECT(bytes, object, PYBIND11_BYTES_CHECK)
-
-    // Allow implicit conversion:
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    bytes(const char *c = "") : object(PYBIND11_BYTES_FROM_STRING(c), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate bytes object!");
-        }
-    }
-
-    template <typename SzType, detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
-    bytes(const char *c, const SzType &n)
-        : object(PYBIND11_BYTES_FROM_STRING_AND_SIZE(c, ssize_t_cast(n)), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate bytes object!");
-        }
-    }
-
-    // Allow implicit conversion:
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    bytes(const std::string &s) : bytes(s.data(), s.size()) {}
-
-    explicit bytes(const pybind11::str &s);
-
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator std::string() const { return string_op<std::string>(); }
-
-#ifdef PYBIND11_HAS_STRING_VIEW
-    // enable_if is needed to avoid "ambiguous conversion" errors (see PR #3521).
-    template <typename T, detail::enable_if_t<std::is_same<T, std::string_view>::value, int> = 0>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    bytes(T s) : bytes(s.data(), s.size()) {}
-
-    // Obtain a string view that views the current `bytes` buffer value.  Note that this is only
-    // valid so long as the `bytes` instance remains alive and so generally should not outlive the
-    // lifetime of the `bytes` instance.
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator std::string_view() const { return string_op<std::string_view>(); }
-#endif
-private:
-    template <typename T>
-    T string_op() const {
-        char *buffer = nullptr;
-        ssize_t length = 0;
-        if (PyBytes_AsStringAndSize(m_ptr, &buffer, &length) != 0) {
-            throw error_already_set();
-        }
-        return {buffer, static_cast<size_t>(length)};
-    }
-};
-// Note: breathe >= 4.17.0 will fail to build docs if the below two constructors
-// are included in the doxygen group; close here and reopen after as a workaround
-/// @} pytypes
-
-inline bytes::bytes(const pybind11::str &s) {
-    object temp = s;
-    if (PyUnicode_Check(s.ptr())) {
-        temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(s.ptr()));
-        if (!temp) {
-            throw error_already_set();
-        }
-    }
-    char *buffer = nullptr;
-    ssize_t length = 0;
-    if (PyBytes_AsStringAndSize(temp.ptr(), &buffer, &length) != 0) {
-        throw error_already_set();
-    }
-    auto obj = reinterpret_steal<object>(PYBIND11_BYTES_FROM_STRING_AND_SIZE(buffer, length));
-    if (!obj) {
-        pybind11_fail("Could not allocate bytes object!");
-    }
-    m_ptr = obj.release().ptr();
-}
-
-inline str::str(const bytes &b) {
-    char *buffer = nullptr;
-    ssize_t length = 0;
-    if (PyBytes_AsStringAndSize(b.ptr(), &buffer, &length) != 0) {
-        throw error_already_set();
-    }
-    auto obj = reinterpret_steal<object>(PyUnicode_FromStringAndSize(buffer, length));
-    if (!obj) {
-        pybind11_fail("Could not allocate string object!");
-    }
-    m_ptr = obj.release().ptr();
-}
-
-/// \addtogroup pytypes
-/// @{
-class bytearray : public object {
-public:
-    PYBIND11_OBJECT_CVT(bytearray, object, PyByteArray_Check, PyByteArray_FromObject)
-
-    template <typename SzType, detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
-    bytearray(const char *c, const SzType &n)
-        : object(PyByteArray_FromStringAndSize(c, ssize_t_cast(n)), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate bytearray object!");
-        }
-    }
-
-    bytearray() : bytearray("", 0) {}
-
-    explicit bytearray(const std::string &s) : bytearray(s.data(), s.size()) {}
-
-    size_t size() const { return static_cast<size_t>(PyByteArray_Size(m_ptr)); }
-
-    explicit operator std::string() const {
-        char *buffer = PyByteArray_AS_STRING(m_ptr);
-        ssize_t size = PyByteArray_GET_SIZE(m_ptr);
-        return std::string(buffer, static_cast<size_t>(size));
-    }
-};
-// Note: breathe >= 4.17.0 will fail to build docs if the below two constructors
-// are included in the doxygen group; close here and reopen after as a workaround
-/// @} pytypes
-
-/// \addtogroup pytypes
-/// @{
-class none : public object {
-public:
-    PYBIND11_OBJECT(none, object, detail::PyNone_Check)
-    none() : object(Py_None, borrowed_t{}) {}
-};
-
-class ellipsis : public object {
-public:
-    PYBIND11_OBJECT(ellipsis, object, detail::PyEllipsis_Check)
-    ellipsis() : object(Py_Ellipsis, borrowed_t{}) {}
-};
-
-class bool_ : public object {
-public:
-    PYBIND11_OBJECT_CVT(bool_, object, PyBool_Check, raw_bool)
-    bool_() : object(Py_False, borrowed_t{}) {}
-    // Allow implicit conversion from and to `bool`:
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    bool_(bool value) : object(value ? Py_True : Py_False, borrowed_t{}) {}
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator bool() const { return (m_ptr != nullptr) && PyLong_AsLong(m_ptr) != 0; }
-
-private:
-    /// Return the truth value of an object -- always returns a new reference
-    static PyObject *raw_bool(PyObject *op) {
-        const auto value = PyObject_IsTrue(op);
-        if (value == -1) {
-            return nullptr;
-        }
-        return handle(value != 0 ? Py_True : Py_False).inc_ref().ptr();
-    }
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-// Converts a value to the given unsigned type.  If an error occurs, you get back (Unsigned) -1;
-// otherwise you get back the unsigned long or unsigned long long value cast to (Unsigned).
-// (The distinction is critically important when casting a returned -1 error value to some other
-// unsigned type: (A)-1 != (B)-1 when A and B are unsigned types of different sizes).
-template <typename Unsigned>
-Unsigned as_unsigned(PyObject *o) {
-    if (PYBIND11_SILENCE_MSVC_C4127(sizeof(Unsigned) <= sizeof(unsigned long))) {
-        unsigned long v = PyLong_AsUnsignedLong(o);
-        return v == (unsigned long) -1 && PyErr_Occurred() ? (Unsigned) -1 : (Unsigned) v;
-    }
-    unsigned long long v = PyLong_AsUnsignedLongLong(o);
-    return v == (unsigned long long) -1 && PyErr_Occurred() ? (Unsigned) -1 : (Unsigned) v;
-}
-PYBIND11_NAMESPACE_END(detail)
-
-class int_ : public object {
-public:
-    PYBIND11_OBJECT_CVT(int_, object, PYBIND11_LONG_CHECK, PyNumber_Long)
-    int_() : object(PyLong_FromLong(0), stolen_t{}) {}
-    // Allow implicit conversion from C++ integral types:
-    template <typename T, detail::enable_if_t<std::is_integral<T>::value, int> = 0>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    int_(T value) {
-        if (PYBIND11_SILENCE_MSVC_C4127(sizeof(T) <= sizeof(long))) {
-            if (std::is_signed<T>::value) {
-                m_ptr = PyLong_FromLong((long) value);
-            } else {
-                m_ptr = PyLong_FromUnsignedLong((unsigned long) value);
-            }
-        } else {
-            if (std::is_signed<T>::value) {
-                m_ptr = PyLong_FromLongLong((long long) value);
-            } else {
-                m_ptr = PyLong_FromUnsignedLongLong((unsigned long long) value);
-            }
-        }
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate int object!");
-        }
-    }
-
-    template <typename T, detail::enable_if_t<std::is_integral<T>::value, int> = 0>
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator T() const {
-        return std::is_unsigned<T>::value  ? detail::as_unsigned<T>(m_ptr)
-               : sizeof(T) <= sizeof(long) ? (T) PyLong_AsLong(m_ptr)
-                                           : (T) PYBIND11_LONG_AS_LONGLONG(m_ptr);
-    }
-};
-
-class float_ : public object {
-public:
-    PYBIND11_OBJECT_CVT(float_, object, PyFloat_Check, PyNumber_Float)
-    // Allow implicit conversion from float/double:
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    float_(float value) : object(PyFloat_FromDouble((double) value), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate float object!");
-        }
-    }
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    float_(double value = .0) : object(PyFloat_FromDouble((double) value), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate float object!");
-        }
-    }
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator float() const { return (float) PyFloat_AsDouble(m_ptr); }
-    // NOLINTNEXTLINE(google-explicit-constructor)
-    operator double() const { return (double) PyFloat_AsDouble(m_ptr); }
-};
-
-class weakref : public object {
-public:
-    PYBIND11_OBJECT_CVT_DEFAULT(weakref, object, PyWeakref_Check, raw_weakref)
-    explicit weakref(handle obj, handle callback = {})
-        : object(PyWeakref_NewRef(obj.ptr(), callback.ptr()), stolen_t{}) {
-        if (!m_ptr) {
-            if (PyErr_Occurred()) {
-                throw error_already_set();
-            }
-            pybind11_fail("Could not allocate weak reference!");
-        }
-    }
-
-private:
-    static PyObject *raw_weakref(PyObject *o) { return PyWeakref_NewRef(o, nullptr); }
-};
-
-class slice : public object {
-public:
-    PYBIND11_OBJECT_DEFAULT(slice, object, PySlice_Check)
-    slice(handle start, handle stop, handle step)
-        : object(PySlice_New(start.ptr(), stop.ptr(), step.ptr()), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate slice object!");
-        }
-    }
-
-#ifdef PYBIND11_HAS_OPTIONAL
-    slice(std::optional<ssize_t> start, std::optional<ssize_t> stop, std::optional<ssize_t> step)
-        : slice(index_to_object(start), index_to_object(stop), index_to_object(step)) {}
-#else
-    slice(ssize_t start_, ssize_t stop_, ssize_t step_)
-        : slice(int_(start_), int_(stop_), int_(step_)) {}
-#endif
-
-    bool
-    compute(size_t length, size_t *start, size_t *stop, size_t *step, size_t *slicelength) const {
-        return PySlice_GetIndicesEx((PYBIND11_SLICE_OBJECT *) m_ptr,
-                                    (ssize_t) length,
-                                    (ssize_t *) start,
-                                    (ssize_t *) stop,
-                                    (ssize_t *) step,
-                                    (ssize_t *) slicelength)
-               == 0;
-    }
-    bool compute(
-        ssize_t length, ssize_t *start, ssize_t *stop, ssize_t *step, ssize_t *slicelength) const {
-        return PySlice_GetIndicesEx(
-                   (PYBIND11_SLICE_OBJECT *) m_ptr, length, start, stop, step, slicelength)
-               == 0;
-    }
-
-private:
-    template <typename T>
-    static object index_to_object(T index) {
-        return index ? object(int_(*index)) : object(none());
-    }
-};
-
-class capsule : public object {
-public:
-    PYBIND11_OBJECT_DEFAULT(capsule, object, PyCapsule_CheckExact)
-    PYBIND11_DEPRECATED("Use reinterpret_borrow<capsule>() or reinterpret_steal<capsule>()")
-    capsule(PyObject *ptr, bool is_borrowed)
-        : object(is_borrowed ? object(ptr, borrowed_t{}) : object(ptr, stolen_t{})) {}
-
-    explicit capsule(const void *value,
-                     const char *name = nullptr,
-                     void (*destructor)(PyObject *) = nullptr)
-        : object(PyCapsule_New(const_cast<void *>(value), name, destructor), stolen_t{}) {
-        if (!m_ptr) {
-            throw error_already_set();
-        }
-    }
-
-    PYBIND11_DEPRECATED("Please pass a destructor that takes a void pointer as input")
-    capsule(const void *value, void (*destruct)(PyObject *))
-        : object(PyCapsule_New(const_cast<void *>(value), nullptr, destruct), stolen_t{}) {
-        if (!m_ptr) {
-            throw error_already_set();
-        }
-    }
-
-    capsule(const void *value, void (*destructor)(void *)) {
-        m_ptr = PyCapsule_New(const_cast<void *>(value), nullptr, [](PyObject *o) {
-            // guard if destructor called while err indicator is set
-            error_scope error_guard;
-            auto destructor = reinterpret_cast<void (*)(void *)>(PyCapsule_GetContext(o));
-            if (destructor == nullptr) {
-                if (PyErr_Occurred()) {
-                    throw error_already_set();
-                }
-                pybind11_fail("Unable to get capsule context");
-            }
-            const char *name = get_name_in_error_scope(o);
-            void *ptr = PyCapsule_GetPointer(o, name);
-            if (ptr == nullptr) {
-                throw error_already_set();
-            }
-            destructor(ptr);
-        });
-
-        if (!m_ptr || PyCapsule_SetContext(m_ptr, (void *) destructor) != 0) {
-            throw error_already_set();
-        }
-    }
-
-    explicit capsule(void (*destructor)()) {
-        m_ptr = PyCapsule_New(reinterpret_cast<void *>(destructor), nullptr, [](PyObject *o) {
-            const char *name = get_name_in_error_scope(o);
-            auto destructor = reinterpret_cast<void (*)()>(PyCapsule_GetPointer(o, name));
-            if (destructor == nullptr) {
-                throw error_already_set();
-            }
-            destructor();
-        });
-
-        if (!m_ptr) {
-            throw error_already_set();
-        }
-    }
-
-    template <typename T>
-    operator T *() const { // NOLINT(google-explicit-constructor)
-        return get_pointer<T>();
-    }
-
-    /// Get the pointer the capsule holds.
-    template <typename T = void>
-    T *get_pointer() const {
-        const auto *name = this->name();
-        T *result = static_cast<T *>(PyCapsule_GetPointer(m_ptr, name));
-        if (!result) {
-            throw error_already_set();
-        }
-        return result;
-    }
-
-    /// Replaces a capsule's pointer *without* calling the destructor on the existing one.
-    void set_pointer(const void *value) {
-        if (PyCapsule_SetPointer(m_ptr, const_cast<void *>(value)) != 0) {
-            throw error_already_set();
-        }
-    }
-
-    const char *name() const {
-        const char *name = PyCapsule_GetName(m_ptr);
-        if ((name == nullptr) && PyErr_Occurred()) {
-            throw error_already_set();
-        }
-        return name;
-    }
-
-    /// Replaces a capsule's name *without* calling the destructor on the existing one.
-    void set_name(const char *new_name) {
-        if (PyCapsule_SetName(m_ptr, new_name) != 0) {
-            throw error_already_set();
-        }
-    }
-
-private:
-    static const char *get_name_in_error_scope(PyObject *o) {
-        error_scope error_guard;
-
-        const char *name = PyCapsule_GetName(o);
-        if ((name == nullptr) && PyErr_Occurred()) {
-            // write out and consume error raised by call to PyCapsule_GetName
-            PyErr_WriteUnraisable(o);
-        }
-
-        return name;
-    }
-};
-
-class tuple : public object {
-public:
-    PYBIND11_OBJECT_CVT(tuple, object, PyTuple_Check, PySequence_Tuple)
-    template <typename SzType = ssize_t,
-              detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
-    // Some compilers generate link errors when using `const SzType &` here:
-    explicit tuple(SzType size = 0) : object(PyTuple_New(ssize_t_cast(size)), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate tuple object!");
-        }
-    }
-    size_t size() const { return (size_t) PyTuple_Size(m_ptr); }
-    bool empty() const { return size() == 0; }
-    detail::tuple_accessor operator[](size_t index) const { return {*this, index}; }
-    template <typename T, detail::enable_if_t<detail::is_pyobject<T>::value, int> = 0>
-    detail::item_accessor operator[](T &&o) const {
-        return object::operator[](std::forward<T>(o));
-    }
-    detail::tuple_iterator begin() const { return {*this, 0}; }
-    detail::tuple_iterator end() const { return {*this, PyTuple_GET_SIZE(m_ptr)}; }
-};
-
-// We need to put this into a separate function because the Intel compiler
-// fails to compile enable_if_t<all_of<is_keyword_or_ds<Args>...>::value> part below
-// (tested with ICC 2021.1 Beta 20200827).
-template <typename... Args>
-constexpr bool args_are_all_keyword_or_ds() {
-    return detail::all_of<detail::is_keyword_or_ds<Args>...>::value;
-}
-
-class dict : public object {
-public:
-    PYBIND11_OBJECT_CVT(dict, object, PyDict_Check, raw_dict)
-    dict() : object(PyDict_New(), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate dict object!");
-        }
-    }
-    template <typename... Args,
-              typename = detail::enable_if_t<args_are_all_keyword_or_ds<Args...>()>,
-              // MSVC workaround: it can't compile an out-of-line definition, so defer the
-              // collector
-              typename collector = detail::deferred_t<detail::unpacking_collector<>, Args...>>
-    explicit dict(Args &&...args) : dict(collector(std::forward<Args>(args)...).kwargs()) {}
-
-    size_t size() const { return (size_t) PyDict_Size(m_ptr); }
-    bool empty() const { return size() == 0; }
-    detail::dict_iterator begin() const { return {*this, 0}; }
-    detail::dict_iterator end() const { return {}; }
-    void clear() /* py-non-const */ { PyDict_Clear(ptr()); }
-    template <typename T>
-    bool contains(T &&key) const {
-        return PyDict_Contains(m_ptr, detail::object_or_cast(std::forward<T>(key)).ptr()) == 1;
-    }
-
-private:
-    /// Call the `dict` Python type -- always returns a new reference
-    static PyObject *raw_dict(PyObject *op) {
-        if (PyDict_Check(op)) {
-            return handle(op).inc_ref().ptr();
-        }
-        return PyObject_CallFunctionObjArgs((PyObject *) &PyDict_Type, op, nullptr);
-    }
-};
-
-class sequence : public object {
-public:
-    PYBIND11_OBJECT_DEFAULT(sequence, object, PySequence_Check)
-    size_t size() const {
-        ssize_t result = PySequence_Size(m_ptr);
-        if (result == -1) {
-            throw error_already_set();
-        }
-        return (size_t) result;
-    }
-    bool empty() const { return size() == 0; }
-    detail::sequence_accessor operator[](size_t index) const { return {*this, index}; }
-    template <typename T, detail::enable_if_t<detail::is_pyobject<T>::value, int> = 0>
-    detail::item_accessor operator[](T &&o) const {
-        return object::operator[](std::forward<T>(o));
-    }
-    detail::sequence_iterator begin() const { return {*this, 0}; }
-    detail::sequence_iterator end() const { return {*this, PySequence_Size(m_ptr)}; }
-};
-
-class list : public object {
-public:
-    PYBIND11_OBJECT_CVT(list, object, PyList_Check, PySequence_List)
-    template <typename SzType = ssize_t,
-              detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
-    // Some compilers generate link errors when using `const SzType &` here:
-    explicit list(SzType size = 0) : object(PyList_New(ssize_t_cast(size)), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate list object!");
-        }
-    }
-    size_t size() const { return (size_t) PyList_Size(m_ptr); }
-    bool empty() const { return size() == 0; }
-    detail::list_accessor operator[](size_t index) const { return {*this, index}; }
-    template <typename T, detail::enable_if_t<detail::is_pyobject<T>::value, int> = 0>
-    detail::item_accessor operator[](T &&o) const {
-        return object::operator[](std::forward<T>(o));
-    }
-    detail::list_iterator begin() const { return {*this, 0}; }
-    detail::list_iterator end() const { return {*this, PyList_GET_SIZE(m_ptr)}; }
-    template <typename T>
-    void append(T &&val) /* py-non-const */ {
-        PyList_Append(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr());
-    }
-    template <typename IdxType,
-              typename ValType,
-              detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
-    void insert(const IdxType &index, ValType &&val) /* py-non-const */ {
-        PyList_Insert(
-            m_ptr, ssize_t_cast(index), detail::object_or_cast(std::forward<ValType>(val)).ptr());
-    }
-};
-
-class args : public tuple {
-    PYBIND11_OBJECT_DEFAULT(args, tuple, PyTuple_Check)
-};
-class kwargs : public dict {
-    PYBIND11_OBJECT_DEFAULT(kwargs, dict, PyDict_Check)
-};
-
-class anyset : public object {
-public:
-    PYBIND11_OBJECT(anyset, object, PyAnySet_Check)
-    size_t size() const { return static_cast<size_t>(PySet_Size(m_ptr)); }
-    bool empty() const { return size() == 0; }
-    template <typename T>
-    bool contains(T &&val) const {
-        return PySet_Contains(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr()) == 1;
-    }
-};
-
-class set : public anyset {
-public:
-    PYBIND11_OBJECT_CVT(set, anyset, PySet_Check, PySet_New)
-    set() : anyset(PySet_New(nullptr), stolen_t{}) {
-        if (!m_ptr) {
-            pybind11_fail("Could not allocate set object!");
-        }
-    }
-    template <typename T>
-    bool add(T &&val) /* py-non-const */ {
-        return PySet_Add(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr()) == 0;
-    }
-    void clear() /* py-non-const */ { PySet_Clear(m_ptr); }
-};
-
-class frozenset : public anyset {
-public:
-    PYBIND11_OBJECT_CVT(frozenset, anyset, PyFrozenSet_Check, PyFrozenSet_New)
-};
-
-class function : public object {
-public:
-    PYBIND11_OBJECT_DEFAULT(function, object, PyCallable_Check)
-    handle cpp_function() const {
-        handle fun = detail::get_function(m_ptr);
-        if (fun && PyCFunction_Check(fun.ptr())) {
-            return fun;
-        }
-        return handle();
-    }
-    bool is_cpp_function() const { return (bool) cpp_function(); }
-};
-
-class staticmethod : public object {
-public:
-    PYBIND11_OBJECT_CVT(staticmethod, object, detail::PyStaticMethod_Check, PyStaticMethod_New)
-};
-
-class buffer : public object {
-public:
-    PYBIND11_OBJECT_DEFAULT(buffer, object, PyObject_CheckBuffer)
-
-    buffer_info request(bool writable = false) const {
-        int flags = PyBUF_STRIDES | PyBUF_FORMAT;
-        if (writable) {
-            flags |= PyBUF_WRITABLE;
-        }
-        auto *view = new Py_buffer();
-        if (PyObject_GetBuffer(m_ptr, view, flags) != 0) {
-            delete view;
-            throw error_already_set();
-        }
-        return buffer_info(view);
-    }
-};
-
-class memoryview : public object {
-public:
-    PYBIND11_OBJECT_CVT(memoryview, object, PyMemoryView_Check, PyMemoryView_FromObject)
-
-    /** \rst
-        Creates ``memoryview`` from ``buffer_info``.
-
-        ``buffer_info`` must be created from ``buffer::request()``. Otherwise
-        throws an exception.
-
-        For creating a ``memoryview`` from objects that support buffer protocol,
-        use ``memoryview(const object& obj)`` instead of this constructor.
-     \endrst */
-    explicit memoryview(const buffer_info &info) {
-        if (!info.view()) {
-            pybind11_fail("Prohibited to create memoryview without Py_buffer");
-        }
-        // Note: PyMemoryView_FromBuffer never increments obj reference.
-        m_ptr = (info.view()->obj) ? PyMemoryView_FromObject(info.view()->obj)
-                                   : PyMemoryView_FromBuffer(info.view());
-        if (!m_ptr) {
-            pybind11_fail("Unable to create memoryview from buffer descriptor");
-        }
-    }
-
-    /** \rst
-        Creates ``memoryview`` from static buffer.
-
-        This method is meant for providing a ``memoryview`` for C/C++ buffer not
-        managed by Python. The caller is responsible for managing the lifetime
-        of ``ptr`` and ``format``, which MUST outlive the memoryview constructed
-        here.
-
-        See also: Python C API documentation for `PyMemoryView_FromBuffer`_.
-
-        .. _PyMemoryView_FromBuffer:
-           https://docs.python.org/c-api/memoryview.html#c.PyMemoryView_FromBuffer
-
-        :param ptr: Pointer to the buffer.
-        :param itemsize: Byte size of an element.
-        :param format: Pointer to the null-terminated format string. For
-            homogeneous Buffers, this should be set to
-            ``format_descriptor<T>::value``.
-        :param shape: Shape of the tensor (1 entry per dimension).
-        :param strides: Number of bytes between adjacent entries (for each
-            per dimension).
-        :param readonly: Flag to indicate if the underlying storage may be
-            written to.
-     \endrst */
-    static memoryview from_buffer(void *ptr,
-                                  ssize_t itemsize,
-                                  const char *format,
-                                  detail::any_container<ssize_t> shape,
-                                  detail::any_container<ssize_t> strides,
-                                  bool readonly = false);
-
-    static memoryview from_buffer(const void *ptr,
-                                  ssize_t itemsize,
-                                  const char *format,
-                                  detail::any_container<ssize_t> shape,
-                                  detail::any_container<ssize_t> strides) {
-        return memoryview::from_buffer(
-            const_cast<void *>(ptr), itemsize, format, std::move(shape), std::move(strides), true);
-    }
-
-    template <typename T>
-    static memoryview from_buffer(T *ptr,
-                                  detail::any_container<ssize_t> shape,
-                                  detail::any_container<ssize_t> strides,
-                                  bool readonly = false) {
-        return memoryview::from_buffer(reinterpret_cast<void *>(ptr),
-                                       sizeof(T),
-                                       format_descriptor<T>::value,
-                                       std::move(shape),
-                                       std::move(strides),
-                                       readonly);
-    }
-
-    template <typename T>
-    static memoryview from_buffer(const T *ptr,
-                                  detail::any_container<ssize_t> shape,
-                                  detail::any_container<ssize_t> strides) {
-        return memoryview::from_buffer(
-            const_cast<T *>(ptr), std::move(shape), std::move(strides), true);
-    }
-
-    /** \rst
-        Creates ``memoryview`` from static memory.
-
-        This method is meant for providing a ``memoryview`` for C/C++ buffer not
-        managed by Python. The caller is responsible for managing the lifetime
-        of ``mem``, which MUST outlive the memoryview constructed here.
-
-        See also: Python C API documentation for `PyMemoryView_FromBuffer`_.
-
-        .. _PyMemoryView_FromMemory:
-           https://docs.python.org/c-api/memoryview.html#c.PyMemoryView_FromMemory
-     \endrst */
-    static memoryview from_memory(void *mem, ssize_t size, bool readonly = false) {
-        PyObject *ptr = PyMemoryView_FromMemory(
-            reinterpret_cast<char *>(mem), size, (readonly) ? PyBUF_READ : PyBUF_WRITE);
-        if (!ptr) {
-            pybind11_fail("Could not allocate memoryview object!");
-        }
-        return memoryview(object(ptr, stolen_t{}));
-    }
-
-    static memoryview from_memory(const void *mem, ssize_t size) {
-        return memoryview::from_memory(const_cast<void *>(mem), size, true);
-    }
-
-#ifdef PYBIND11_HAS_STRING_VIEW
-    static memoryview from_memory(std::string_view mem) {
-        return from_memory(const_cast<char *>(mem.data()), static_cast<ssize_t>(mem.size()), true);
-    }
-#endif
-};
-
-/// @cond DUPLICATE
-inline memoryview memoryview::from_buffer(void *ptr,
-                                          ssize_t itemsize,
-                                          const char *format,
-                                          detail::any_container<ssize_t> shape,
-                                          detail::any_container<ssize_t> strides,
-                                          bool readonly) {
-    size_t ndim = shape->size();
-    if (ndim != strides->size()) {
-        pybind11_fail("memoryview: shape length doesn't match strides length");
-    }
-    ssize_t size = ndim != 0u ? 1 : 0;
-    for (size_t i = 0; i < ndim; ++i) {
-        size *= (*shape)[i];
-    }
-    Py_buffer view;
-    view.buf = ptr;
-    view.obj = nullptr;
-    view.len = size * itemsize;
-    view.readonly = static_cast<int>(readonly);
-    view.itemsize = itemsize;
-    view.format = const_cast<char *>(format);
-    view.ndim = static_cast<int>(ndim);
-    view.shape = shape->data();
-    view.strides = strides->data();
-    view.suboffsets = nullptr;
-    view.internal = nullptr;
-    PyObject *obj = PyMemoryView_FromBuffer(&view);
-    if (!obj) {
-        throw error_already_set();
-    }
-    return memoryview(object(obj, stolen_t{}));
-}
-/// @endcond
-/// @} pytypes
-
-/// \addtogroup python_builtins
-/// @{
-
-/// Get the length of a Python object.
-inline size_t len(handle h) {
-    ssize_t result = PyObject_Length(h.ptr());
-    if (result < 0) {
-        throw error_already_set();
-    }
-    return (size_t) result;
-}
-
-/// Get the length hint of a Python object.
-/// Returns 0 when this cannot be determined.
-inline size_t len_hint(handle h) {
-    ssize_t result = PyObject_LengthHint(h.ptr(), 0);
-    if (result < 0) {
-        // Sometimes a length can't be determined at all (eg generators)
-        // In which case simply return 0
-        PyErr_Clear();
-        return 0;
-    }
-    return (size_t) result;
-}
-
-inline str repr(handle h) {
-    PyObject *str_value = PyObject_Repr(h.ptr());
-    if (!str_value) {
-        throw error_already_set();
-    }
-    return reinterpret_steal<str>(str_value);
-}
-
-inline iterator iter(handle obj) {
-    PyObject *result = PyObject_GetIter(obj.ptr());
-    if (!result) {
-        throw error_already_set();
-    }
-    return reinterpret_steal<iterator>(result);
-}
-/// @} python_builtins
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-template <typename D>
-iterator object_api<D>::begin() const {
-    return iter(derived());
-}
-template <typename D>
-iterator object_api<D>::end() const {
-    return iterator::sentinel();
-}
-template <typename D>
-item_accessor object_api<D>::operator[](handle key) const {
-    return {derived(), reinterpret_borrow<object>(key)};
-}
-template <typename D>
-item_accessor object_api<D>::operator[](object &&key) const {
-    return {derived(), std::move(key)};
-}
-template <typename D>
-item_accessor object_api<D>::operator[](const char *key) const {
-    return {derived(), pybind11::str(key)};
-}
-template <typename D>
-obj_attr_accessor object_api<D>::attr(handle key) const {
-    return {derived(), reinterpret_borrow<object>(key)};
-}
-template <typename D>
-obj_attr_accessor object_api<D>::attr(object &&key) const {
-    return {derived(), std::move(key)};
-}
-template <typename D>
-str_attr_accessor object_api<D>::attr(const char *key) const {
-    return {derived(), key};
-}
-template <typename D>
-args_proxy object_api<D>::operator*() const {
-    return args_proxy(derived().ptr());
-}
-template <typename D>
-template <typename T>
-bool object_api<D>::contains(T &&item) const {
-    return attr("__contains__")(std::forward<T>(item)).template cast<bool>();
-}
-
-template <typename D>
-pybind11::str object_api<D>::str() const {
-    return pybind11::str(derived());
-}
-
-template <typename D>
-str_attr_accessor object_api<D>::doc() const {
-    return attr("__doc__");
-}
-
-template <typename D>
-handle object_api<D>::get_type() const {
-    return type::handle_of(derived());
-}
-
-template <typename D>
-bool object_api<D>::rich_compare(object_api const &other, int value) const {
-    int rv = PyObject_RichCompareBool(derived().ptr(), other.derived().ptr(), value);
-    if (rv == -1) {
-        throw error_already_set();
-    }
-    return rv == 1;
-}
-
-#define PYBIND11_MATH_OPERATOR_UNARY(op, fn)                                                      \
-    template <typename D>                                                                         \
-    object object_api<D>::op() const {                                                            \
-        object result = reinterpret_steal<object>(fn(derived().ptr()));                           \
-        if (!result.ptr())                                                                        \
-            throw error_already_set();                                                            \
-        return result;                                                                            \
-    }
-
-#define PYBIND11_MATH_OPERATOR_BINARY(op, fn)                                                     \
-    template <typename D>                                                                         \
-    object object_api<D>::op(object_api const &other) const {                                     \
-        object result = reinterpret_steal<object>(fn(derived().ptr(), other.derived().ptr()));    \
-        if (!result.ptr())                                                                        \
-            throw error_already_set();                                                            \
-        return result;                                                                            \
-    }
-
-#define PYBIND11_MATH_OPERATOR_BINARY_INPLACE(iop, fn)                                            \
-    template <typename D>                                                                         \
-    object object_api<D>::iop(object_api const &other) {                                          \
-        object result = reinterpret_steal<object>(fn(derived().ptr(), other.derived().ptr()));    \
-        if (!result.ptr())                                                                        \
-            throw error_already_set();                                                            \
-        return result;                                                                            \
-    }
-
-PYBIND11_MATH_OPERATOR_UNARY(operator~, PyNumber_Invert)
-PYBIND11_MATH_OPERATOR_UNARY(operator-, PyNumber_Negative)
-PYBIND11_MATH_OPERATOR_BINARY(operator+, PyNumber_Add)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator+=, PyNumber_InPlaceAdd)
-PYBIND11_MATH_OPERATOR_BINARY(operator-, PyNumber_Subtract)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator-=, PyNumber_InPlaceSubtract)
-PYBIND11_MATH_OPERATOR_BINARY(operator*, PyNumber_Multiply)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator*=, PyNumber_InPlaceMultiply)
-PYBIND11_MATH_OPERATOR_BINARY(operator/, PyNumber_TrueDivide)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator/=, PyNumber_InPlaceTrueDivide)
-PYBIND11_MATH_OPERATOR_BINARY(operator|, PyNumber_Or)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator|=, PyNumber_InPlaceOr)
-PYBIND11_MATH_OPERATOR_BINARY(operator&, PyNumber_And)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator&=, PyNumber_InPlaceAnd)
-PYBIND11_MATH_OPERATOR_BINARY(operator^, PyNumber_Xor)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator^=, PyNumber_InPlaceXor)
-PYBIND11_MATH_OPERATOR_BINARY(operator<<, PyNumber_Lshift)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator<<=, PyNumber_InPlaceLshift)
-PYBIND11_MATH_OPERATOR_BINARY(operator>>, PyNumber_Rshift)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator>>=, PyNumber_InPlaceRshift)
-
-#undef PYBIND11_MATH_OPERATOR_UNARY
-#undef PYBIND11_MATH_OPERATOR_BINARY
-#undef PYBIND11_MATH_OPERATOR_BINARY_INPLACE
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/stl.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/stl.h
deleted file mode 100644
index ab30ecac0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/stl.h
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
-    pybind11/stl.h: Transparent conversion for STL data types
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-#include "detail/common.h"
-
-#include <deque>
-#include <list>
-#include <map>
-#include <ostream>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-#include <valarray>
-
-// See `detail/common.h` for implementation of these guards.
-#if defined(PYBIND11_HAS_OPTIONAL)
-#    include <optional>
-#elif defined(PYBIND11_HAS_EXP_OPTIONAL)
-#    include <experimental/optional>
-#endif
-
-#if defined(PYBIND11_HAS_VARIANT)
-#    include <variant>
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/// Extracts an const lvalue reference or rvalue reference for U based on the type of T (e.g. for
-/// forwarding a container element).  Typically used indirect via forwarded_type(), below.
-template <typename T, typename U>
-using forwarded_type = conditional_t<std::is_lvalue_reference<T>::value,
-                                     remove_reference_t<U> &,
-                                     remove_reference_t<U> &&>;
-
-/// Forwards a value U as rvalue or lvalue according to whether T is rvalue or lvalue; typically
-/// used for forwarding a container's elements.
-template <typename T, typename U>
-forwarded_type<T, U> forward_like(U &&u) {
-    return std::forward<detail::forwarded_type<T, U>>(std::forward<U>(u));
-}
-
-template <typename Type, typename Key>
-struct set_caster {
-    using type = Type;
-    using key_conv = make_caster<Key>;
-
-    bool load(handle src, bool convert) {
-        if (!isinstance<anyset>(src)) {
-            return false;
-        }
-        auto s = reinterpret_borrow<anyset>(src);
-        value.clear();
-        for (auto entry : s) {
-            key_conv conv;
-            if (!conv.load(entry, convert)) {
-                return false;
-            }
-            value.insert(cast_op<Key &&>(std::move(conv)));
-        }
-        return true;
-    }
-
-    template <typename T>
-    static handle cast(T &&src, return_value_policy policy, handle parent) {
-        if (!std::is_lvalue_reference<T>::value) {
-            policy = return_value_policy_override<Key>::policy(policy);
-        }
-        pybind11::set s;
-        for (auto &&value : src) {
-            auto value_ = reinterpret_steal<object>(
-                key_conv::cast(forward_like<T>(value), policy, parent));
-            if (!value_ || !s.add(std::move(value_))) {
-                return handle();
-            }
-        }
-        return s.release();
-    }
-
-    PYBIND11_TYPE_CASTER(type, const_name("Set[") + key_conv::name + const_name("]"));
-};
-
-template <typename Type, typename Key, typename Value>
-struct map_caster {
-    using key_conv = make_caster<Key>;
-    using value_conv = make_caster<Value>;
-
-    bool load(handle src, bool convert) {
-        if (!isinstance<dict>(src)) {
-            return false;
-        }
-        auto d = reinterpret_borrow<dict>(src);
-        value.clear();
-        for (auto it : d) {
-            key_conv kconv;
-            value_conv vconv;
-            if (!kconv.load(it.first.ptr(), convert) || !vconv.load(it.second.ptr(), convert)) {
-                return false;
-            }
-            value.emplace(cast_op<Key &&>(std::move(kconv)), cast_op<Value &&>(std::move(vconv)));
-        }
-        return true;
-    }
-
-    template <typename T>
-    static handle cast(T &&src, return_value_policy policy, handle parent) {
-        dict d;
-        return_value_policy policy_key = policy;
-        return_value_policy policy_value = policy;
-        if (!std::is_lvalue_reference<T>::value) {
-            policy_key = return_value_policy_override<Key>::policy(policy_key);
-            policy_value = return_value_policy_override<Value>::policy(policy_value);
-        }
-        for (auto &&kv : src) {
-            auto key = reinterpret_steal<object>(
-                key_conv::cast(forward_like<T>(kv.first), policy_key, parent));
-            auto value = reinterpret_steal<object>(
-                value_conv::cast(forward_like<T>(kv.second), policy_value, parent));
-            if (!key || !value) {
-                return handle();
-            }
-            d[std::move(key)] = std::move(value);
-        }
-        return d.release();
-    }
-
-    PYBIND11_TYPE_CASTER(Type,
-                         const_name("Dict[") + key_conv::name + const_name(", ") + value_conv::name
-                             + const_name("]"));
-};
-
-template <typename Type, typename Value>
-struct list_caster {
-    using value_conv = make_caster<Value>;
-
-    bool load(handle src, bool convert) {
-        if (!isinstance<sequence>(src) || isinstance<bytes>(src) || isinstance<str>(src)) {
-            return false;
-        }
-        auto s = reinterpret_borrow<sequence>(src);
-        value.clear();
-        reserve_maybe(s, &value);
-        for (auto it : s) {
-            value_conv conv;
-            if (!conv.load(it, convert)) {
-                return false;
-            }
-            value.push_back(cast_op<Value &&>(std::move(conv)));
-        }
-        return true;
-    }
-
-private:
-    template <
-        typename T = Type,
-        enable_if_t<std::is_same<decltype(std::declval<T>().reserve(0)), void>::value, int> = 0>
-    void reserve_maybe(const sequence &s, Type *) {
-        value.reserve(s.size());
-    }
-    void reserve_maybe(const sequence &, void *) {}
-
-public:
-    template <typename T>
-    static handle cast(T &&src, return_value_policy policy, handle parent) {
-        if (!std::is_lvalue_reference<T>::value) {
-            policy = return_value_policy_override<Value>::policy(policy);
-        }
-        list l(src.size());
-        ssize_t index = 0;
-        for (auto &&value : src) {
-            auto value_ = reinterpret_steal<object>(
-                value_conv::cast(forward_like<T>(value), policy, parent));
-            if (!value_) {
-                return handle();
-            }
-            PyList_SET_ITEM(l.ptr(), index++, value_.release().ptr()); // steals a reference
-        }
-        return l.release();
-    }
-
-    PYBIND11_TYPE_CASTER(Type, const_name("List[") + value_conv::name + const_name("]"));
-};
-
-template <typename Type, typename Alloc>
-struct type_caster<std::vector<Type, Alloc>> : list_caster<std::vector<Type, Alloc>, Type> {};
-
-template <typename Type, typename Alloc>
-struct type_caster<std::deque<Type, Alloc>> : list_caster<std::deque<Type, Alloc>, Type> {};
-
-template <typename Type, typename Alloc>
-struct type_caster<std::list<Type, Alloc>> : list_caster<std::list<Type, Alloc>, Type> {};
-
-template <typename ArrayType, typename Value, bool Resizable, size_t Size = 0>
-struct array_caster {
-    using value_conv = make_caster<Value>;
-
-private:
-    template <bool R = Resizable>
-    bool require_size(enable_if_t<R, size_t> size) {
-        if (value.size() != size) {
-            value.resize(size);
-        }
-        return true;
-    }
-    template <bool R = Resizable>
-    bool require_size(enable_if_t<!R, size_t> size) {
-        return size == Size;
-    }
-
-public:
-    bool load(handle src, bool convert) {
-        if (!isinstance<sequence>(src)) {
-            return false;
-        }
-        auto l = reinterpret_borrow<sequence>(src);
-        if (!require_size(l.size())) {
-            return false;
-        }
-        size_t ctr = 0;
-        for (auto it : l) {
-            value_conv conv;
-            if (!conv.load(it, convert)) {
-                return false;
-            }
-            value[ctr++] = cast_op<Value &&>(std::move(conv));
-        }
-        return true;
-    }
-
-    template <typename T>
-    static handle cast(T &&src, return_value_policy policy, handle parent) {
-        list l(src.size());
-        ssize_t index = 0;
-        for (auto &&value : src) {
-            auto value_ = reinterpret_steal<object>(
-                value_conv::cast(forward_like<T>(value), policy, parent));
-            if (!value_) {
-                return handle();
-            }
-            PyList_SET_ITEM(l.ptr(), index++, value_.release().ptr()); // steals a reference
-        }
-        return l.release();
-    }
-
-    PYBIND11_TYPE_CASTER(ArrayType,
-                         const_name("List[") + value_conv::name
-                             + const_name<Resizable>(const_name(""),
-                                                     const_name("[") + const_name<Size>()
-                                                         + const_name("]"))
-                             + const_name("]"));
-};
-
-template <typename Type, size_t Size>
-struct type_caster<std::array<Type, Size>>
-    : array_caster<std::array<Type, Size>, Type, false, Size> {};
-
-template <typename Type>
-struct type_caster<std::valarray<Type>> : array_caster<std::valarray<Type>, Type, true> {};
-
-template <typename Key, typename Compare, typename Alloc>
-struct type_caster<std::set<Key, Compare, Alloc>>
-    : set_caster<std::set<Key, Compare, Alloc>, Key> {};
-
-template <typename Key, typename Hash, typename Equal, typename Alloc>
-struct type_caster<std::unordered_set<Key, Hash, Equal, Alloc>>
-    : set_caster<std::unordered_set<Key, Hash, Equal, Alloc>, Key> {};
-
-template <typename Key, typename Value, typename Compare, typename Alloc>
-struct type_caster<std::map<Key, Value, Compare, Alloc>>
-    : map_caster<std::map<Key, Value, Compare, Alloc>, Key, Value> {};
-
-template <typename Key, typename Value, typename Hash, typename Equal, typename Alloc>
-struct type_caster<std::unordered_map<Key, Value, Hash, Equal, Alloc>>
-    : map_caster<std::unordered_map<Key, Value, Hash, Equal, Alloc>, Key, Value> {};
-
-// This type caster is intended to be used for std::optional and std::experimental::optional
-template <typename Type, typename Value = typename Type::value_type>
-struct optional_caster {
-    using value_conv = make_caster<Value>;
-
-    template <typename T>
-    static handle cast(T &&src, return_value_policy policy, handle parent) {
-        if (!src) {
-            return none().inc_ref();
-        }
-        if (!std::is_lvalue_reference<T>::value) {
-            policy = return_value_policy_override<Value>::policy(policy);
-        }
-        return value_conv::cast(*std::forward<T>(src), policy, parent);
-    }
-
-    bool load(handle src, bool convert) {
-        if (!src) {
-            return false;
-        }
-        if (src.is_none()) {
-            return true; // default-constructed value is already empty
-        }
-        value_conv inner_caster;
-        if (!inner_caster.load(src, convert)) {
-            return false;
-        }
-
-        value.emplace(cast_op<Value &&>(std::move(inner_caster)));
-        return true;
-    }
-
-    PYBIND11_TYPE_CASTER(Type, const_name("Optional[") + value_conv::name + const_name("]"));
-};
-
-#if defined(PYBIND11_HAS_OPTIONAL)
-template <typename T>
-struct type_caster<std::optional<T>> : public optional_caster<std::optional<T>> {};
-
-template <>
-struct type_caster<std::nullopt_t> : public void_caster<std::nullopt_t> {};
-#endif
-
-#if defined(PYBIND11_HAS_EXP_OPTIONAL)
-template <typename T>
-struct type_caster<std::experimental::optional<T>>
-    : public optional_caster<std::experimental::optional<T>> {};
-
-template <>
-struct type_caster<std::experimental::nullopt_t>
-    : public void_caster<std::experimental::nullopt_t> {};
-#endif
-
-/// Visit a variant and cast any found type to Python
-struct variant_caster_visitor {
-    return_value_policy policy;
-    handle parent;
-
-    using result_type = handle; // required by boost::variant in C++11
-
-    template <typename T>
-    result_type operator()(T &&src) const {
-        return make_caster<T>::cast(std::forward<T>(src), policy, parent);
-    }
-};
-
-/// Helper class which abstracts away variant's `visit` function. `std::variant` and similar
-/// `namespace::variant` types which provide a `namespace::visit()` function are handled here
-/// automatically using argument-dependent lookup. Users can provide specializations for other
-/// variant-like classes, e.g. `boost::variant` and `boost::apply_visitor`.
-template <template <typename...> class Variant>
-struct visit_helper {
-    template <typename... Args>
-    static auto call(Args &&...args) -> decltype(visit(std::forward<Args>(args)...)) {
-        return visit(std::forward<Args>(args)...);
-    }
-};
-
-/// Generic variant caster
-template <typename Variant>
-struct variant_caster;
-
-template <template <typename...> class V, typename... Ts>
-struct variant_caster<V<Ts...>> {
-    static_assert(sizeof...(Ts) > 0, "Variant must consist of at least one alternative.");
-
-    template <typename U, typename... Us>
-    bool load_alternative(handle src, bool convert, type_list<U, Us...>) {
-        auto caster = make_caster<U>();
-        if (caster.load(src, convert)) {
-            value = cast_op<U>(std::move(caster));
-            return true;
-        }
-        return load_alternative(src, convert, type_list<Us...>{});
-    }
-
-    bool load_alternative(handle, bool, type_list<>) { return false; }
-
-    bool load(handle src, bool convert) {
-        // Do a first pass without conversions to improve constructor resolution.
-        // E.g. `py::int_(1).cast<variant<double, int>>()` needs to fill the `int`
-        // slot of the variant. Without two-pass loading `double` would be filled
-        // because it appears first and a conversion is possible.
-        if (convert && load_alternative(src, false, type_list<Ts...>{})) {
-            return true;
-        }
-        return load_alternative(src, convert, type_list<Ts...>{});
-    }
-
-    template <typename Variant>
-    static handle cast(Variant &&src, return_value_policy policy, handle parent) {
-        return visit_helper<V>::call(variant_caster_visitor{policy, parent},
-                                     std::forward<Variant>(src));
-    }
-
-    using Type = V<Ts...>;
-    PYBIND11_TYPE_CASTER(Type,
-                         const_name("Union[") + detail::concat(make_caster<Ts>::name...)
-                             + const_name("]"));
-};
-
-#if defined(PYBIND11_HAS_VARIANT)
-template <typename... Ts>
-struct type_caster<std::variant<Ts...>> : variant_caster<std::variant<Ts...>> {};
-
-template <>
-struct type_caster<std::monostate> : public void_caster<std::monostate> {};
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-
-inline std::ostream &operator<<(std::ostream &os, const handle &obj) {
-#ifdef PYBIND11_HAS_STRING_VIEW
-    os << str(obj).cast<std::string_view>();
-#else
-    os << (std::string) str(obj);
-#endif
-    return os;
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/stl/filesystem.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/stl/filesystem.h
deleted file mode 100644
index e26f42177..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/stl/filesystem.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) 2021 The Pybind Development Team.
-// All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-#pragma once
-
-#include "../pybind11.h"
-#include "../detail/common.h"
-#include "../detail/descr.h"
-#include "../cast.h"
-#include "../pytypes.h"
-
-#include <string>
-
-#ifdef __has_include
-#    if defined(PYBIND11_CPP17)
-#        if __has_include(<filesystem>) && \
-          PY_VERSION_HEX >= 0x03060000
-#            include <filesystem>
-#            define PYBIND11_HAS_FILESYSTEM 1
-#        elif __has_include(<experimental/filesystem>)
-#            include <experimental/filesystem>
-#            define PYBIND11_HAS_EXPERIMENTAL_FILESYSTEM 1
-#        endif
-#    endif
-#endif
-
-#if !defined(PYBIND11_HAS_FILESYSTEM) && !defined(PYBIND11_HAS_EXPERIMENTAL_FILESYSTEM)           \
-    && !defined(PYBIND11_HAS_FILESYSTEM_IS_OPTIONAL)
-#    error                                                                                        \
-        "Neither #include <filesystem> nor #include <experimental/filesystem is available. (Use -DPYBIND11_HAS_FILESYSTEM_IS_OPTIONAL to ignore.)"
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-#if defined(PYBIND11_HAS_FILESYSTEM) || defined(PYBIND11_HAS_EXPERIMENTAL_FILESYSTEM)
-template <typename T>
-struct path_caster {
-
-private:
-    static PyObject *unicode_from_fs_native(const std::string &w) {
-#    if !defined(PYPY_VERSION)
-        return PyUnicode_DecodeFSDefaultAndSize(w.c_str(), ssize_t(w.size()));
-#    else
-        // PyPy mistakenly declares the first parameter as non-const.
-        return PyUnicode_DecodeFSDefaultAndSize(const_cast<char *>(w.c_str()), ssize_t(w.size()));
-#    endif
-    }
-
-    static PyObject *unicode_from_fs_native(const std::wstring &w) {
-        return PyUnicode_FromWideChar(w.c_str(), ssize_t(w.size()));
-    }
-
-public:
-    static handle cast(const T &path, return_value_policy, handle) {
-        if (auto py_str = unicode_from_fs_native(path.native())) {
-            return module_::import("pathlib")
-                .attr("Path")(reinterpret_steal<object>(py_str))
-                .release();
-        }
-        return nullptr;
-    }
-
-    bool load(handle handle, bool) {
-        // PyUnicode_FSConverter and PyUnicode_FSDecoder normally take care of
-        // calling PyOS_FSPath themselves, but that's broken on PyPy (PyPy
-        // issue #3168) so we do it ourselves instead.
-        PyObject *buf = PyOS_FSPath(handle.ptr());
-        if (!buf) {
-            PyErr_Clear();
-            return false;
-        }
-        PyObject *native = nullptr;
-        if constexpr (std::is_same_v<typename T::value_type, char>) {
-            if (PyUnicode_FSConverter(buf, &native) != 0) {
-                if (auto *c_str = PyBytes_AsString(native)) {
-                    // AsString returns a pointer to the internal buffer, which
-                    // must not be free'd.
-                    value = c_str;
-                }
-            }
-        } else if constexpr (std::is_same_v<typename T::value_type, wchar_t>) {
-            if (PyUnicode_FSDecoder(buf, &native) != 0) {
-                if (auto *c_str = PyUnicode_AsWideCharString(native, nullptr)) {
-                    // AsWideCharString returns a new string that must be free'd.
-                    value = c_str; // Copies the string.
-                    PyMem_Free(c_str);
-                }
-            }
-        }
-        Py_XDECREF(native);
-        Py_DECREF(buf);
-        if (PyErr_Occurred()) {
-            PyErr_Clear();
-            return false;
-        }
-        return true;
-    }
-
-    PYBIND11_TYPE_CASTER(T, const_name("os.PathLike"));
-};
-
-#endif // PYBIND11_HAS_FILESYSTEM || defined(PYBIND11_HAS_EXPERIMENTAL_FILESYSTEM)
-
-#if defined(PYBIND11_HAS_FILESYSTEM)
-template <>
-struct type_caster<std::filesystem::path> : public path_caster<std::filesystem::path> {};
-#elif defined(PYBIND11_HAS_EXPERIMENTAL_FILESYSTEM)
-template <>
-struct type_caster<std::experimental::filesystem::path>
-    : public path_caster<std::experimental::filesystem::path> {};
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/stl_bind.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/stl_bind.h
deleted file mode 100644
index 22a29b476..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/include/pybind11/stl_bind.h
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
-    pybind11/std_bind.h: Binding generators for STL data types
-
-    Copyright (c) 2016 Sergey Lyskov and Wenzel Jakob
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
-
-#pragma once
-
-#include "detail/common.h"
-#include "operators.h"
-
-#include <algorithm>
-#include <sstream>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/* SFINAE helper class used by 'is_comparable */
-template <typename T>
-struct container_traits {
-    template <typename T2>
-    static std::true_type
-    test_comparable(decltype(std::declval<const T2 &>() == std::declval<const T2 &>()) *);
-    template <typename T2>
-    static std::false_type test_comparable(...);
-    template <typename T2>
-    static std::true_type test_value(typename T2::value_type *);
-    template <typename T2>
-    static std::false_type test_value(...);
-    template <typename T2>
-    static std::true_type test_pair(typename T2::first_type *, typename T2::second_type *);
-    template <typename T2>
-    static std::false_type test_pair(...);
-
-    static constexpr const bool is_comparable
-        = std::is_same<std::true_type, decltype(test_comparable<T>(nullptr))>::value;
-    static constexpr const bool is_pair
-        = std::is_same<std::true_type, decltype(test_pair<T>(nullptr, nullptr))>::value;
-    static constexpr const bool is_vector
-        = std::is_same<std::true_type, decltype(test_value<T>(nullptr))>::value;
-    static constexpr const bool is_element = !is_pair && !is_vector;
-};
-
-/* Default: is_comparable -> std::false_type */
-template <typename T, typename SFINAE = void>
-struct is_comparable : std::false_type {};
-
-/* For non-map data structures, check whether operator== can be instantiated */
-template <typename T>
-struct is_comparable<
-    T,
-    enable_if_t<container_traits<T>::is_element && container_traits<T>::is_comparable>>
-    : std::true_type {};
-
-/* For a vector/map data structure, recursively check the value type
-   (which is std::pair for maps) */
-template <typename T>
-struct is_comparable<T, enable_if_t<container_traits<T>::is_vector>> {
-    static constexpr const bool value = is_comparable<typename T::value_type>::value;
-};
-
-/* For pairs, recursively check the two data types */
-template <typename T>
-struct is_comparable<T, enable_if_t<container_traits<T>::is_pair>> {
-    static constexpr const bool value = is_comparable<typename T::first_type>::value
-                                        && is_comparable<typename T::second_type>::value;
-};
-
-/* Fallback functions */
-template <typename, typename, typename... Args>
-void vector_if_copy_constructible(const Args &...) {}
-template <typename, typename, typename... Args>
-void vector_if_equal_operator(const Args &...) {}
-template <typename, typename, typename... Args>
-void vector_if_insertion_operator(const Args &...) {}
-template <typename, typename, typename... Args>
-void vector_modifiers(const Args &...) {}
-
-template <typename Vector, typename Class_>
-void vector_if_copy_constructible(enable_if_t<is_copy_constructible<Vector>::value, Class_> &cl) {
-    cl.def(init<const Vector &>(), "Copy constructor");
-}
-
-template <typename Vector, typename Class_>
-void vector_if_equal_operator(enable_if_t<is_comparable<Vector>::value, Class_> &cl) {
-    using T = typename Vector::value_type;
-
-    cl.def(self == self);
-    cl.def(self != self);
-
-    cl.def(
-        "count",
-        [](const Vector &v, const T &x) { return std::count(v.begin(), v.end(), x); },
-        arg("x"),
-        "Return the number of times ``x`` appears in the list");
-
-    cl.def(
-        "remove",
-        [](Vector &v, const T &x) {
-            auto p = std::find(v.begin(), v.end(), x);
-            if (p != v.end()) {
-                v.erase(p);
-            } else {
-                throw value_error();
-            }
-        },
-        arg("x"),
-        "Remove the first item from the list whose value is x. "
-        "It is an error if there is no such item.");
-
-    cl.def(
-        "__contains__",
-        [](const Vector &v, const T &x) { return std::find(v.begin(), v.end(), x) != v.end(); },
-        arg("x"),
-        "Return true the container contains ``x``");
-}
-
-// Vector modifiers -- requires a copyable vector_type:
-// (Technically, some of these (pop and __delitem__) don't actually require copyability, but it
-// seems silly to allow deletion but not insertion, so include them here too.)
-template <typename Vector, typename Class_>
-void vector_modifiers(
-    enable_if_t<is_copy_constructible<typename Vector::value_type>::value, Class_> &cl) {
-    using T = typename Vector::value_type;
-    using SizeType = typename Vector::size_type;
-    using DiffType = typename Vector::difference_type;
-
-    auto wrap_i = [](DiffType i, SizeType n) {
-        if (i < 0) {
-            i += n;
-        }
-        if (i < 0 || (SizeType) i >= n) {
-            throw index_error();
-        }
-        return i;
-    };
-
-    cl.def(
-        "append",
-        [](Vector &v, const T &value) { v.push_back(value); },
-        arg("x"),
-        "Add an item to the end of the list");
-
-    cl.def(init([](const iterable &it) {
-        auto v = std::unique_ptr<Vector>(new Vector());
-        v->reserve(len_hint(it));
-        for (handle h : it) {
-            v->push_back(h.cast<T>());
-        }
-        return v.release();
-    }));
-
-    cl.def(
-        "clear", [](Vector &v) { v.clear(); }, "Clear the contents");
-
-    cl.def(
-        "extend",
-        [](Vector &v, const Vector &src) { v.insert(v.end(), src.begin(), src.end()); },
-        arg("L"),
-        "Extend the list by appending all the items in the given list");
-
-    cl.def(
-        "extend",
-        [](Vector &v, const iterable &it) {
-            const size_t old_size = v.size();
-            v.reserve(old_size + len_hint(it));
-            try {
-                for (handle h : it) {
-                    v.push_back(h.cast<T>());
-                }
-            } catch (const cast_error &) {
-                v.erase(v.begin() + static_cast<typename Vector::difference_type>(old_size),
-                        v.end());
-                try {
-                    v.shrink_to_fit();
-                } catch (const std::exception &) {
-                    // Do nothing
-                }
-                throw;
-            }
-        },
-        arg("L"),
-        "Extend the list by appending all the items in the given list");
-
-    cl.def(
-        "insert",
-        [](Vector &v, DiffType i, const T &x) {
-            // Can't use wrap_i; i == v.size() is OK
-            if (i < 0) {
-                i += v.size();
-            }
-            if (i < 0 || (SizeType) i > v.size()) {
-                throw index_error();
-            }
-            v.insert(v.begin() + i, x);
-        },
-        arg("i"),
-        arg("x"),
-        "Insert an item at a given position.");
-
-    cl.def(
-        "pop",
-        [](Vector &v) {
-            if (v.empty()) {
-                throw index_error();
-            }
-            T t = std::move(v.back());
-            v.pop_back();
-            return t;
-        },
-        "Remove and return the last item");
-
-    cl.def(
-        "pop",
-        [wrap_i](Vector &v, DiffType i) {
-            i = wrap_i(i, v.size());
-            T t = std::move(v[(SizeType) i]);
-            v.erase(std::next(v.begin(), i));
-            return t;
-        },
-        arg("i"),
-        "Remove and return the item at index ``i``");
-
-    cl.def("__setitem__", [wrap_i](Vector &v, DiffType i, const T &t) {
-        i = wrap_i(i, v.size());
-        v[(SizeType) i] = t;
-    });
-
-    /// Slicing protocol
-    cl.def(
-        "__getitem__",
-        [](const Vector &v, const slice &slice) -> Vector * {
-            size_t start = 0, stop = 0, step = 0, slicelength = 0;
-
-            if (!slice.compute(v.size(), &start, &stop, &step, &slicelength)) {
-                throw error_already_set();
-            }
-
-            auto *seq = new Vector();
-            seq->reserve((size_t) slicelength);
-
-            for (size_t i = 0; i < slicelength; ++i) {
-                seq->push_back(v[start]);
-                start += step;
-            }
-            return seq;
-        },
-        arg("s"),
-        "Retrieve list elements using a slice object");
-
-    cl.def(
-        "__setitem__",
-        [](Vector &v, const slice &slice, const Vector &value) {
-            size_t start = 0, stop = 0, step = 0, slicelength = 0;
-            if (!slice.compute(v.size(), &start, &stop, &step, &slicelength)) {
-                throw error_already_set();
-            }
-
-            if (slicelength != value.size()) {
-                throw std::runtime_error(
-                    "Left and right hand size of slice assignment have different sizes!");
-            }
-
-            for (size_t i = 0; i < slicelength; ++i) {
-                v[start] = value[i];
-                start += step;
-            }
-        },
-        "Assign list elements using a slice object");
-
-    cl.def(
-        "__delitem__",
-        [wrap_i](Vector &v, DiffType i) {
-            i = wrap_i(i, v.size());
-            v.erase(v.begin() + i);
-        },
-        "Delete the list elements at index ``i``");
-
-    cl.def(
-        "__delitem__",
-        [](Vector &v, const slice &slice) {
-            size_t start = 0, stop = 0, step = 0, slicelength = 0;
-
-            if (!slice.compute(v.size(), &start, &stop, &step, &slicelength)) {
-                throw error_already_set();
-            }
-
-            if (step == 1 && false) {
-                v.erase(v.begin() + (DiffType) start, v.begin() + DiffType(start + slicelength));
-            } else {
-                for (size_t i = 0; i < slicelength; ++i) {
-                    v.erase(v.begin() + DiffType(start));
-                    start += step - 1;
-                }
-            }
-        },
-        "Delete list elements using a slice object");
-}
-
-// If the type has an operator[] that doesn't return a reference (most notably std::vector<bool>),
-// we have to access by copying; otherwise we return by reference.
-template <typename Vector>
-using vector_needs_copy
-    = negation<std::is_same<decltype(std::declval<Vector>()[typename Vector::size_type()]),
-                            typename Vector::value_type &>>;
-
-// The usual case: access and iterate by reference
-template <typename Vector, typename Class_>
-void vector_accessor(enable_if_t<!vector_needs_copy<Vector>::value, Class_> &cl) {
-    using T = typename Vector::value_type;
-    using SizeType = typename Vector::size_type;
-    using DiffType = typename Vector::difference_type;
-    using ItType = typename Vector::iterator;
-
-    auto wrap_i = [](DiffType i, SizeType n) {
-        if (i < 0) {
-            i += n;
-        }
-        if (i < 0 || (SizeType) i >= n) {
-            throw index_error();
-        }
-        return i;
-    };
-
-    cl.def(
-        "__getitem__",
-        [wrap_i](Vector &v, DiffType i) -> T & {
-            i = wrap_i(i, v.size());
-            return v[(SizeType) i];
-        },
-        return_value_policy::reference_internal // ref + keepalive
-    );
-
-    cl.def(
-        "__iter__",
-        [](Vector &v) {
-            return make_iterator<return_value_policy::reference_internal, ItType, ItType, T &>(
-                v.begin(), v.end());
-        },
-        keep_alive<0, 1>() /* Essential: keep list alive while iterator exists */
-    );
-}
-
-// The case for special objects, like std::vector<bool>, that have to be returned-by-copy:
-template <typename Vector, typename Class_>
-void vector_accessor(enable_if_t<vector_needs_copy<Vector>::value, Class_> &cl) {
-    using T = typename Vector::value_type;
-    using SizeType = typename Vector::size_type;
-    using DiffType = typename Vector::difference_type;
-    using ItType = typename Vector::iterator;
-    cl.def("__getitem__", [](const Vector &v, DiffType i) -> T {
-        if (i < 0 && (i += v.size()) < 0) {
-            throw index_error();
-        }
-        if ((SizeType) i >= v.size()) {
-            throw index_error();
-        }
-        return v[(SizeType) i];
-    });
-
-    cl.def(
-        "__iter__",
-        [](Vector &v) {
-            return make_iterator<return_value_policy::copy, ItType, ItType, T>(v.begin(), v.end());
-        },
-        keep_alive<0, 1>() /* Essential: keep list alive while iterator exists */
-    );
-}
-
-template <typename Vector, typename Class_>
-auto vector_if_insertion_operator(Class_ &cl, std::string const &name)
-    -> decltype(std::declval<std::ostream &>() << std::declval<typename Vector::value_type>(),
-                void()) {
-    using size_type = typename Vector::size_type;
-
-    cl.def(
-        "__repr__",
-        [name](Vector &v) {
-            std::ostringstream s;
-            s << name << '[';
-            for (size_type i = 0; i < v.size(); ++i) {
-                s << v[i];
-                if (i != v.size() - 1) {
-                    s << ", ";
-                }
-            }
-            s << ']';
-            return s.str();
-        },
-        "Return the canonical string representation of this list.");
-}
-
-// Provide the buffer interface for vectors if we have data() and we have a format for it
-// GCC seems to have "void std::vector<bool>::data()" - doing SFINAE on the existence of data()
-// is insufficient, we need to check it returns an appropriate pointer
-template <typename Vector, typename = void>
-struct vector_has_data_and_format : std::false_type {};
-template <typename Vector>
-struct vector_has_data_and_format<
-    Vector,
-    enable_if_t<std::is_same<decltype(format_descriptor<typename Vector::value_type>::format(),
-                                      std::declval<Vector>().data()),
-                             typename Vector::value_type *>::value>> : std::true_type {};
-
-// [workaround(intel)] Separate function required here
-// Workaround as the Intel compiler does not compile the enable_if_t part below
-// (tested with icc (ICC) 2021.1 Beta 20200827)
-template <typename... Args>
-constexpr bool args_any_are_buffer() {
-    return detail::any_of<std::is_same<Args, buffer_protocol>...>::value;
-}
-
-// [workaround(intel)] Separate function required here
-// [workaround(msvc)] Can't use constexpr bool in return type
-
-// Add the buffer interface to a vector
-template <typename Vector, typename Class_, typename... Args>
-void vector_buffer_impl(Class_ &cl, std::true_type) {
-    using T = typename Vector::value_type;
-
-    static_assert(vector_has_data_and_format<Vector>::value,
-                  "There is not an appropriate format descriptor for this vector");
-
-    // numpy.h declares this for arbitrary types, but it may raise an exception and crash hard
-    // at runtime if PYBIND11_NUMPY_DTYPE hasn't been called, so check here
-    format_descriptor<T>::format();
-
-    cl.def_buffer([](Vector &v) -> buffer_info {
-        return buffer_info(v.data(),
-                           static_cast<ssize_t>(sizeof(T)),
-                           format_descriptor<T>::format(),
-                           1,
-                           {v.size()},
-                           {sizeof(T)});
-    });
-
-    cl.def(init([](const buffer &buf) {
-        auto info = buf.request();
-        if (info.ndim != 1 || info.strides[0] % static_cast<ssize_t>(sizeof(T))) {
-            throw type_error("Only valid 1D buffers can be copied to a vector");
-        }
-        if (!detail::compare_buffer_info<T>::compare(info)
-            || (ssize_t) sizeof(T) != info.itemsize) {
-            throw type_error("Format mismatch (Python: " + info.format
-                             + " C++: " + format_descriptor<T>::format() + ")");
-        }
-
-        T *p = static_cast<T *>(info.ptr);
-        ssize_t step = info.strides[0] / static_cast<ssize_t>(sizeof(T));
-        T *end = p + info.shape[0] * step;
-        if (step == 1) {
-            return Vector(p, end);
-        }
-        Vector vec;
-        vec.reserve((size_t) info.shape[0]);
-        for (; p != end; p += step) {
-            vec.push_back(*p);
-        }
-        return vec;
-    }));
-
-    return;
-}
-
-template <typename Vector, typename Class_, typename... Args>
-void vector_buffer_impl(Class_ &, std::false_type) {}
-
-template <typename Vector, typename Class_, typename... Args>
-void vector_buffer(Class_ &cl) {
-    vector_buffer_impl<Vector, Class_, Args...>(
-        cl, detail::any_of<std::is_same<Args, buffer_protocol>...>{});
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-//
-// std::vector
-//
-template <typename Vector, typename holder_type = std::unique_ptr<Vector>, typename... Args>
-class_<Vector, holder_type> bind_vector(handle scope, std::string const &name, Args &&...args) {
-    using Class_ = class_<Vector, holder_type>;
-
-    // If the value_type is unregistered (e.g. a converting type) or is itself registered
-    // module-local then make the vector binding module-local as well:
-    using vtype = typename Vector::value_type;
-    auto *vtype_info = detail::get_type_info(typeid(vtype));
-    bool local = !vtype_info || vtype_info->module_local;
-
-    Class_ cl(scope, name.c_str(), pybind11::module_local(local), std::forward<Args>(args)...);
-
-    // Declare the buffer interface if a buffer_protocol() is passed in
-    detail::vector_buffer<Vector, Class_, Args...>(cl);
-
-    cl.def(init<>());
-
-    // Register copy constructor (if possible)
-    detail::vector_if_copy_constructible<Vector, Class_>(cl);
-
-    // Register comparison-related operators and functions (if possible)
-    detail::vector_if_equal_operator<Vector, Class_>(cl);
-
-    // Register stream insertion operator (if possible)
-    detail::vector_if_insertion_operator<Vector, Class_>(cl, name);
-
-    // Modifiers require copyable vector value type
-    detail::vector_modifiers<Vector, Class_>(cl);
-
-    // Accessor and iterator; return by value if copyable, otherwise we return by ref + keep-alive
-    detail::vector_accessor<Vector, Class_>(cl);
-
-    cl.def(
-        "__bool__",
-        [](const Vector &v) -> bool { return !v.empty(); },
-        "Check whether the list is nonempty");
-
-    cl.def("__len__", &Vector::size);
-
-#if 0
-    // C++ style functions deprecated, leaving it here as an example
-    cl.def(init<size_type>());
-
-    cl.def("resize",
-         (void (Vector::*) (size_type count)) & Vector::resize,
-         "changes the number of elements stored");
-
-    cl.def("erase",
-        [](Vector &v, SizeType i) {
-        if (i >= v.size())
-            throw index_error();
-        v.erase(v.begin() + i);
-    }, "erases element at index ``i``");
-
-    cl.def("empty",         &Vector::empty,         "checks whether the container is empty");
-    cl.def("size",          &Vector::size,          "returns the number of elements");
-    cl.def("push_back", (void (Vector::*)(const T&)) &Vector::push_back, "adds an element to the end");
-    cl.def("pop_back",                               &Vector::pop_back, "removes the last element");
-
-    cl.def("max_size",      &Vector::max_size,      "returns the maximum possible number of elements");
-    cl.def("reserve",       &Vector::reserve,       "reserves storage");
-    cl.def("capacity",      &Vector::capacity,      "returns the number of elements that can be held in currently allocated storage");
-    cl.def("shrink_to_fit", &Vector::shrink_to_fit, "reduces memory usage by freeing unused memory");
-
-    cl.def("clear", &Vector::clear, "clears the contents");
-    cl.def("swap",   &Vector::swap, "swaps the contents");
-
-    cl.def("front", [](Vector &v) {
-        if (v.size()) return v.front();
-        else throw index_error();
-    }, "access the first element");
-
-    cl.def("back", [](Vector &v) {
-        if (v.size()) return v.back();
-        else throw index_error();
-    }, "access the last element ");
-
-#endif
-
-    return cl;
-}
-
-//
-// std::map, std::unordered_map
-//
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-/* Fallback functions */
-template <typename, typename, typename... Args>
-void map_if_insertion_operator(const Args &...) {}
-template <typename, typename, typename... Args>
-void map_assignment(const Args &...) {}
-
-// Map assignment when copy-assignable: just copy the value
-template <typename Map, typename Class_>
-void map_assignment(
-    enable_if_t<is_copy_assignable<typename Map::mapped_type>::value, Class_> &cl) {
-    using KeyType = typename Map::key_type;
-    using MappedType = typename Map::mapped_type;
-
-    cl.def("__setitem__", [](Map &m, const KeyType &k, const MappedType &v) {
-        auto it = m.find(k);
-        if (it != m.end()) {
-            it->second = v;
-        } else {
-            m.emplace(k, v);
-        }
-    });
-}
-
-// Not copy-assignable, but still copy-constructible: we can update the value by erasing and
-// reinserting
-template <typename Map, typename Class_>
-void map_assignment(enable_if_t<!is_copy_assignable<typename Map::mapped_type>::value
-                                    && is_copy_constructible<typename Map::mapped_type>::value,
-                                Class_> &cl) {
-    using KeyType = typename Map::key_type;
-    using MappedType = typename Map::mapped_type;
-
-    cl.def("__setitem__", [](Map &m, const KeyType &k, const MappedType &v) {
-        // We can't use m[k] = v; because value type might not be default constructable
-        auto r = m.emplace(k, v);
-        if (!r.second) {
-            // value type is not copy assignable so the only way to insert it is to erase it
-            // first...
-            m.erase(r.first);
-            m.emplace(k, v);
-        }
-    });
-}
-
-template <typename Map, typename Class_>
-auto map_if_insertion_operator(Class_ &cl, std::string const &name)
-    -> decltype(std::declval<std::ostream &>() << std::declval<typename Map::key_type>()
-                                               << std::declval<typename Map::mapped_type>(),
-                void()) {
-
-    cl.def(
-        "__repr__",
-        [name](Map &m) {
-            std::ostringstream s;
-            s << name << '{';
-            bool f = false;
-            for (auto const &kv : m) {
-                if (f) {
-                    s << ", ";
-                }
-                s << kv.first << ": " << kv.second;
-                f = true;
-            }
-            s << '}';
-            return s.str();
-        },
-        "Return the canonical string representation of this map.");
-}
-
-template <typename Map>
-struct keys_view {
-    Map &map;
-};
-
-template <typename Map>
-struct values_view {
-    Map &map;
-};
-
-template <typename Map>
-struct items_view {
-    Map &map;
-};
-
-PYBIND11_NAMESPACE_END(detail)
-
-template <typename Map, typename holder_type = std::unique_ptr<Map>, typename... Args>
-class_<Map, holder_type> bind_map(handle scope, const std::string &name, Args &&...args) {
-    using KeyType = typename Map::key_type;
-    using MappedType = typename Map::mapped_type;
-    using KeysView = detail::keys_view<Map>;
-    using ValuesView = detail::values_view<Map>;
-    using ItemsView = detail::items_view<Map>;
-    using Class_ = class_<Map, holder_type>;
-
-    // If either type is a non-module-local bound type then make the map binding non-local as well;
-    // otherwise (e.g. both types are either module-local or converting) the map will be
-    // module-local.
-    auto *tinfo = detail::get_type_info(typeid(MappedType));
-    bool local = !tinfo || tinfo->module_local;
-    if (local) {
-        tinfo = detail::get_type_info(typeid(KeyType));
-        local = !tinfo || tinfo->module_local;
-    }
-
-    Class_ cl(scope, name.c_str(), pybind11::module_local(local), std::forward<Args>(args)...);
-    class_<KeysView> keys_view(
-        scope, ("KeysView[" + name + "]").c_str(), pybind11::module_local(local));
-    class_<ValuesView> values_view(
-        scope, ("ValuesView[" + name + "]").c_str(), pybind11::module_local(local));
-    class_<ItemsView> items_view(
-        scope, ("ItemsView[" + name + "]").c_str(), pybind11::module_local(local));
-
-    cl.def(init<>());
-
-    // Register stream insertion operator (if possible)
-    detail::map_if_insertion_operator<Map, Class_>(cl, name);
-
-    cl.def(
-        "__bool__",
-        [](const Map &m) -> bool { return !m.empty(); },
-        "Check whether the map is nonempty");
-
-    cl.def(
-        "__iter__",
-        [](Map &m) { return make_key_iterator(m.begin(), m.end()); },
-        keep_alive<0, 1>() /* Essential: keep map alive while iterator exists */
-    );
-
-    cl.def(
-        "keys",
-        [](Map &m) { return KeysView{m}; },
-        keep_alive<0, 1>() /* Essential: keep map alive while view exists */
-    );
-
-    cl.def(
-        "values",
-        [](Map &m) { return ValuesView{m}; },
-        keep_alive<0, 1>() /* Essential: keep map alive while view exists */
-    );
-
-    cl.def(
-        "items",
-        [](Map &m) { return ItemsView{m}; },
-        keep_alive<0, 1>() /* Essential: keep map alive while view exists */
-    );
-
-    cl.def(
-        "__getitem__",
-        [](Map &m, const KeyType &k) -> MappedType & {
-            auto it = m.find(k);
-            if (it == m.end()) {
-                throw key_error();
-            }
-            return it->second;
-        },
-        return_value_policy::reference_internal // ref + keepalive
-    );
-
-    cl.def("__contains__", [](Map &m, const KeyType &k) -> bool {
-        auto it = m.find(k);
-        if (it == m.end()) {
-            return false;
-        }
-        return true;
-    });
-    // Fallback for when the object is not of the key type
-    cl.def("__contains__", [](Map &, const object &) -> bool { return false; });
-
-    // Assignment provided only if the type is copyable
-    detail::map_assignment<Map, Class_>(cl);
-
-    cl.def("__delitem__", [](Map &m, const KeyType &k) {
-        auto it = m.find(k);
-        if (it == m.end()) {
-            throw key_error();
-        }
-        m.erase(it);
-    });
-
-    cl.def("__len__", &Map::size);
-
-    keys_view.def("__len__", [](KeysView &view) { return view.map.size(); });
-    keys_view.def(
-        "__iter__",
-        [](KeysView &view) { return make_key_iterator(view.map.begin(), view.map.end()); },
-        keep_alive<0, 1>() /* Essential: keep view alive while iterator exists */
-    );
-    keys_view.def("__contains__", [](KeysView &view, const KeyType &k) -> bool {
-        auto it = view.map.find(k);
-        if (it == view.map.end()) {
-            return false;
-        }
-        return true;
-    });
-    // Fallback for when the object is not of the key type
-    keys_view.def("__contains__", [](KeysView &, const object &) -> bool { return false; });
-
-    values_view.def("__len__", [](ValuesView &view) { return view.map.size(); });
-    values_view.def(
-        "__iter__",
-        [](ValuesView &view) { return make_value_iterator(view.map.begin(), view.map.end()); },
-        keep_alive<0, 1>() /* Essential: keep view alive while iterator exists */
-    );
-
-    items_view.def("__len__", [](ItemsView &view) { return view.map.size(); });
-    items_view.def(
-        "__iter__",
-        [](ItemsView &view) { return make_iterator(view.map.begin(), view.map.end()); },
-        keep_alive<0, 1>() /* Essential: keep view alive while iterator exists */
-    );
-
-    return cl;
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/FindCatch.cmake b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/FindCatch.cmake
deleted file mode 100644
index 57bba58b3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/FindCatch.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
-# - Find the Catch test framework or download it (single header)
-#
-# This is a quick module for internal use. It assumes that Catch is
-# REQUIRED and that a minimum version is provided (not EXACT). If
-# a suitable version isn't found locally, the single header file
-# will be downloaded and placed in the build dir: PROJECT_BINARY_DIR.
-#
-# This code sets the following variables:
-#  CATCH_INCLUDE_DIR      - path to catch.hpp
-#  CATCH_VERSION          - version number
-
-option(DOWNLOAD_CATCH "Download catch2 if not found")
-
-if(NOT Catch_FIND_VERSION)
-  message(FATAL_ERROR "A version number must be specified.")
-elseif(Catch_FIND_REQUIRED)
-  message(FATAL_ERROR "This module assumes Catch is not required.")
-elseif(Catch_FIND_VERSION_EXACT)
-  message(FATAL_ERROR "Exact version numbers are not supported, only minimum.")
-endif()
-
-# Extract the version number from catch.hpp
-function(_get_catch_version)
-  file(
-    STRINGS "${CATCH_INCLUDE_DIR}/catch.hpp" version_line
-    REGEX "Catch v.*"
-    LIMIT_COUNT 1)
-  if(version_line MATCHES "Catch v([0-9]+)\\.([0-9]+)\\.([0-9]+)")
-    set(CATCH_VERSION
-        "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}"
-        PARENT_SCOPE)
-  endif()
-endfunction()
-
-# Download the single-header version of Catch
-function(_download_catch version destination_dir)
-  message(STATUS "Downloading catch v${version}...")
-  set(url https://github.com/philsquared/Catch/releases/download/v${version}/catch.hpp)
-  file(DOWNLOAD ${url} "${destination_dir}/catch.hpp" STATUS status)
-  list(GET status 0 error)
-  if(error)
-    message(FATAL_ERROR "Could not download ${url}")
-  endif()
-  set(CATCH_INCLUDE_DIR
-      "${destination_dir}"
-      CACHE INTERNAL "")
-endfunction()
-
-# Look for catch locally
-find_path(
-  CATCH_INCLUDE_DIR
-  NAMES catch.hpp
-  PATH_SUFFIXES catch2)
-if(CATCH_INCLUDE_DIR)
-  _get_catch_version()
-endif()
-
-# Download the header if it wasn't found or if it's outdated
-if(NOT CATCH_VERSION OR CATCH_VERSION VERSION_LESS ${Catch_FIND_VERSION})
-  if(DOWNLOAD_CATCH)
-    _download_catch(${Catch_FIND_VERSION} "${PROJECT_BINARY_DIR}/catch/")
-    _get_catch_version()
-  else()
-    set(CATCH_FOUND FALSE)
-    return()
-  endif()
-endif()
-
-add_library(Catch2::Catch2 IMPORTED INTERFACE)
-set_property(TARGET Catch2::Catch2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CATCH_INCLUDE_DIR}")
-
-set(CATCH_FOUND TRUE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/FindEigen3.cmake b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/FindEigen3.cmake
deleted file mode 100644
index 83625d92e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/FindEigen3.cmake
+++ /dev/null
@@ -1,86 +0,0 @@
-# - Try to find Eigen3 lib
-#
-# This module supports requiring a minimum version, e.g. you can do
-#   find_package(Eigen3 3.1.2)
-# to require version 3.1.2 or newer of Eigen3.
-#
-# Once done this will define
-#
-#  EIGEN3_FOUND - system has eigen lib with correct version
-#  EIGEN3_INCLUDE_DIR - the eigen include directory
-#  EIGEN3_VERSION - eigen version
-
-# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
-# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
-# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
-# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
-
-if(NOT Eigen3_FIND_VERSION)
-  if(NOT Eigen3_FIND_VERSION_MAJOR)
-    set(Eigen3_FIND_VERSION_MAJOR 2)
-  endif(NOT Eigen3_FIND_VERSION_MAJOR)
-  if(NOT Eigen3_FIND_VERSION_MINOR)
-    set(Eigen3_FIND_VERSION_MINOR 91)
-  endif(NOT Eigen3_FIND_VERSION_MINOR)
-  if(NOT Eigen3_FIND_VERSION_PATCH)
-    set(Eigen3_FIND_VERSION_PATCH 0)
-  endif(NOT Eigen3_FIND_VERSION_PATCH)
-
-  set(Eigen3_FIND_VERSION
-      "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
-endif(NOT Eigen3_FIND_VERSION)
-
-macro(_eigen3_check_version)
-  file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
-
-  string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match
-               "${_eigen3_version_header}")
-  set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
-  string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match
-               "${_eigen3_version_header}")
-  set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
-  string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match
-               "${_eigen3_version_header}")
-  set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
-
-  set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
-  if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
-    set(EIGEN3_VERSION_OK FALSE)
-  else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
-    set(EIGEN3_VERSION_OK TRUE)
-  endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
-
-  if(NOT EIGEN3_VERSION_OK)
-
-    message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
-                   "but at least version ${Eigen3_FIND_VERSION} is required")
-  endif(NOT EIGEN3_VERSION_OK)
-endmacro(_eigen3_check_version)
-
-if(EIGEN3_INCLUDE_DIR)
-
-  # in cache already
-  _eigen3_check_version()
-  set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
-
-else(EIGEN3_INCLUDE_DIR)
-  if(NOT DEFINED KDE4_INCLUDE_DIR)
-    set(KDE4_INCLUDE_DIR "")
-  endif()
-
-  find_path(
-    EIGEN3_INCLUDE_DIR
-    NAMES signature_of_eigen3_matrix_library
-    PATHS ${CMAKE_INSTALL_PREFIX}/include ${KDE4_INCLUDE_DIR}
-    PATH_SUFFIXES eigen3 eigen)
-
-  if(EIGEN3_INCLUDE_DIR)
-    _eigen3_check_version()
-  endif(EIGEN3_INCLUDE_DIR)
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
-
-  mark_as_advanced(EIGEN3_INCLUDE_DIR)
-
-endif(EIGEN3_INCLUDE_DIR)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/FindPythonLibsNew.cmake b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/FindPythonLibsNew.cmake
deleted file mode 100644
index a5a628fd7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/FindPythonLibsNew.cmake
+++ /dev/null
@@ -1,281 +0,0 @@
-# - Find python libraries
-# This module finds the libraries corresponding to the Python interpreter
-# FindPythonInterp provides.
-# This code sets the following variables:
-#
-#  PYTHONLIBS_FOUND           - have the Python libs been found
-#  PYTHON_PREFIX              - path to the Python installation
-#  PYTHON_LIBRARIES           - path to the python library
-#  PYTHON_INCLUDE_DIRS        - path to where Python.h is found
-#  PYTHON_MODULE_EXTENSION    - lib extension, e.g. '.so' or '.pyd'
-#  PYTHON_MODULE_PREFIX       - lib name prefix: usually an empty string
-#  PYTHON_SITE_PACKAGES       - path to installation site-packages
-#  PYTHON_IS_DEBUG            - whether the Python interpreter is a debug build
-#
-# Thanks to talljimbo for the patch adding the 'LDVERSION' config
-# variable usage.
-
-#=============================================================================
-# Copyright 2001-2009 Kitware, Inc.
-# Copyright 2012 Continuum Analytics, Inc.
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-# nor the names of their contributors may be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-# Checking for the extension makes sure that `LibsNew` was found and not just `Libs`.
-if(PYTHONLIBS_FOUND AND PYTHON_MODULE_EXTENSION)
-  return()
-endif()
-
-if(PythonLibsNew_FIND_QUIETLY)
-  set(_pythonlibs_quiet QUIET)
-else()
-  set(_pythonlibs_quiet "")
-endif()
-
-if(PythonLibsNew_FIND_REQUIRED)
-  set(_pythonlibs_required REQUIRED)
-endif()
-
-# Check to see if the `python` command is present and from a virtual
-# environment, conda, or GHA activation - if it is, try to use that.
-
-if(NOT DEFINED PYTHON_EXECUTABLE)
-  if(DEFINED ENV{VIRTUAL_ENV})
-    find_program(
-      PYTHON_EXECUTABLE python
-      PATHS "$ENV{VIRTUAL_ENV}" "$ENV{VIRTUAL_ENV}/bin"
-      NO_DEFAULT_PATH)
-  elseif(DEFINED ENV{CONDA_PREFIX})
-    find_program(
-      PYTHON_EXECUTABLE python
-      PATHS "$ENV{CONDA_PREFIX}" "$ENV{CONDA_PREFIX}/bin"
-      NO_DEFAULT_PATH)
-  elseif(DEFINED ENV{pythonLocation})
-    find_program(
-      PYTHON_EXECUTABLE python
-      PATHS "$ENV{pythonLocation}" "$ENV{pythonLocation}/bin"
-      NO_DEFAULT_PATH)
-  endif()
-  if(NOT PYTHON_EXECUTABLE)
-    unset(PYTHON_EXECUTABLE)
-  endif()
-endif()
-
-# Use the Python interpreter to find the libs.
-if(NOT PythonLibsNew_FIND_VERSION)
-  set(PythonLibsNew_FIND_VERSION "3.6")
-endif()
-
-find_package(PythonInterp ${PythonLibsNew_FIND_VERSION} ${_pythonlibs_required}
-             ${_pythonlibs_quiet})
-
-if(NOT PYTHONINTERP_FOUND)
-  set(PYTHONLIBS_FOUND FALSE)
-  set(PythonLibsNew_FOUND FALSE)
-  return()
-endif()
-
-# According to https://stackoverflow.com/questions/646518/python-how-to-detect-debug-interpreter
-# testing whether sys has the gettotalrefcount function is a reliable, cross-platform
-# way to detect a CPython debug interpreter.
-#
-# The library suffix is from the config var LDVERSION sometimes, otherwise
-# VERSION. VERSION will typically be like "2.7" on unix, and "27" on windows.
-execute_process(
-  COMMAND
-    "${PYTHON_EXECUTABLE}" "-c" "
-import sys;import struct;
-import sysconfig as s
-USE_SYSCONFIG = sys.version_info >= (3, 10)
-if not USE_SYSCONFIG:
-    from distutils import sysconfig as ds
-print('.'.join(str(v) for v in sys.version_info));
-print(sys.prefix);
-if USE_SYSCONFIG:
-    scheme = s.get_default_scheme()
-    if scheme == 'posix_local':
-        # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
-        scheme = 'posix_prefix'
-    print(s.get_path('platinclude', scheme))
-    print(s.get_path('platlib'))
-    print(s.get_config_var('EXT_SUFFIX') or s.get_config_var('SO'))
-else:
-    print(ds.get_python_inc(plat_specific=True));
-    print(ds.get_python_lib(plat_specific=True));
-    print(ds.get_config_var('EXT_SUFFIX') or ds.get_config_var('SO'));
-print(hasattr(sys, 'gettotalrefcount')+0);
-print(struct.calcsize('@P'));
-print(s.get_config_var('LDVERSION') or s.get_config_var('VERSION'));
-print(s.get_config_var('LIBDIR') or '');
-print(s.get_config_var('MULTIARCH') or '');
-"
-  RESULT_VARIABLE _PYTHON_SUCCESS
-  OUTPUT_VARIABLE _PYTHON_VALUES
-  ERROR_VARIABLE _PYTHON_ERROR_VALUE)
-
-if(NOT _PYTHON_SUCCESS MATCHES 0)
-  if(PythonLibsNew_FIND_REQUIRED)
-    message(FATAL_ERROR "Python config failure:\n${_PYTHON_ERROR_VALUE}")
-  endif()
-  set(PYTHONLIBS_FOUND FALSE)
-  set(PythonLibsNew_FOUND FALSE)
-  return()
-endif()
-
-# Can manually set values when cross-compiling
-macro(_PYBIND11_GET_IF_UNDEF lst index name)
-  if(NOT DEFINED "${name}")
-    list(GET "${lst}" "${index}" "${name}")
-  endif()
-endmacro()
-
-# Convert the process output into a list
-if(WIN32)
-  string(REGEX REPLACE "\\\\" "/" _PYTHON_VALUES ${_PYTHON_VALUES})
-endif()
-string(REGEX REPLACE ";" "\\\\;" _PYTHON_VALUES ${_PYTHON_VALUES})
-string(REGEX REPLACE "\n" ";" _PYTHON_VALUES ${_PYTHON_VALUES})
-_pybind11_get_if_undef(_PYTHON_VALUES 0 _PYTHON_VERSION_LIST)
-_pybind11_get_if_undef(_PYTHON_VALUES 1 PYTHON_PREFIX)
-_pybind11_get_if_undef(_PYTHON_VALUES 2 PYTHON_INCLUDE_DIR)
-_pybind11_get_if_undef(_PYTHON_VALUES 3 PYTHON_SITE_PACKAGES)
-_pybind11_get_if_undef(_PYTHON_VALUES 4 PYTHON_MODULE_EXTENSION)
-_pybind11_get_if_undef(_PYTHON_VALUES 5 PYTHON_IS_DEBUG)
-_pybind11_get_if_undef(_PYTHON_VALUES 6 PYTHON_SIZEOF_VOID_P)
-_pybind11_get_if_undef(_PYTHON_VALUES 7 PYTHON_LIBRARY_SUFFIX)
-_pybind11_get_if_undef(_PYTHON_VALUES 8 PYTHON_LIBDIR)
-_pybind11_get_if_undef(_PYTHON_VALUES 9 PYTHON_MULTIARCH)
-
-# Make sure the Python has the same pointer-size as the chosen compiler
-# Skip if CMAKE_SIZEOF_VOID_P is not defined
-# This should be skipped for (non-Apple) cross-compiles (like EMSCRIPTEN)
-if(NOT CMAKE_CROSSCOMPILING
-   AND CMAKE_SIZEOF_VOID_P
-   AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}"))
-  if(PythonLibsNew_FIND_REQUIRED)
-    math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8")
-    math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
-    message(FATAL_ERROR "Python config failure: Python is ${_PYTHON_BITS}-bit, "
-                        "chosen compiler is  ${_CMAKE_BITS}-bit")
-  endif()
-  set(PYTHONLIBS_FOUND FALSE)
-  set(PythonLibsNew_FOUND FALSE)
-  return()
-endif()
-
-# The built-in FindPython didn't always give the version numbers
-string(REGEX REPLACE "\\." ";" _PYTHON_VERSION_LIST ${_PYTHON_VERSION_LIST})
-list(GET _PYTHON_VERSION_LIST 0 PYTHON_VERSION_MAJOR)
-list(GET _PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR)
-list(GET _PYTHON_VERSION_LIST 2 PYTHON_VERSION_PATCH)
-set(PYTHON_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}")
-
-# Make sure all directory separators are '/'
-string(REGEX REPLACE "\\\\" "/" PYTHON_PREFIX "${PYTHON_PREFIX}")
-string(REGEX REPLACE "\\\\" "/" PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR}")
-string(REGEX REPLACE "\\\\" "/" PYTHON_SITE_PACKAGES "${PYTHON_SITE_PACKAGES}")
-
-if(CMAKE_HOST_WIN32)
-  set(PYTHON_LIBRARY "${PYTHON_PREFIX}/libs/python${PYTHON_LIBRARY_SUFFIX}.lib")
-
-  # when run in a venv, PYTHON_PREFIX points to it. But the libraries remain in the
-  # original python installation. They may be found relative to PYTHON_INCLUDE_DIR.
-  if(NOT EXISTS "${PYTHON_LIBRARY}")
-    get_filename_component(_PYTHON_ROOT ${PYTHON_INCLUDE_DIR} DIRECTORY)
-    set(PYTHON_LIBRARY "${_PYTHON_ROOT}/libs/python${PYTHON_LIBRARY_SUFFIX}.lib")
-  endif()
-
-  # if we are in MSYS & MINGW, and we didn't find windows python lib, look for system python lib
-  if(DEFINED ENV{MSYSTEM}
-     AND MINGW
-     AND NOT EXISTS "${PYTHON_LIBRARY}")
-    if(PYTHON_MULTIARCH)
-      set(_PYTHON_LIBS_SEARCH "${PYTHON_LIBDIR}/${PYTHON_MULTIARCH}" "${PYTHON_LIBDIR}")
-    else()
-      set(_PYTHON_LIBS_SEARCH "${PYTHON_LIBDIR}")
-    endif()
-    unset(PYTHON_LIBRARY)
-    find_library(
-      PYTHON_LIBRARY
-      NAMES "python${PYTHON_LIBRARY_SUFFIX}"
-      PATHS ${_PYTHON_LIBS_SEARCH}
-      NO_DEFAULT_PATH)
-  endif()
-
-  # raise an error if the python libs are still not found.
-  if(NOT EXISTS "${PYTHON_LIBRARY}")
-    message(FATAL_ERROR "Python libraries not found")
-  endif()
-
-else()
-  if(PYTHON_MULTIARCH)
-    set(_PYTHON_LIBS_SEARCH "${PYTHON_LIBDIR}/${PYTHON_MULTIARCH}" "${PYTHON_LIBDIR}")
-  else()
-    set(_PYTHON_LIBS_SEARCH "${PYTHON_LIBDIR}")
-  endif()
-  #message(STATUS "Searching for Python libs in ${_PYTHON_LIBS_SEARCH}")
-  # Probably this needs to be more involved. It would be nice if the config
-  # information the python interpreter itself gave us were more complete.
-  find_library(
-    PYTHON_LIBRARY
-    NAMES "python${PYTHON_LIBRARY_SUFFIX}"
-    PATHS ${_PYTHON_LIBS_SEARCH}
-    NO_DEFAULT_PATH)
-
-  # If all else fails, just set the name/version and let the linker figure out the path.
-  if(NOT PYTHON_LIBRARY)
-    set(PYTHON_LIBRARY python${PYTHON_LIBRARY_SUFFIX})
-  endif()
-endif()
-
-mark_as_advanced(PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
-
-# We use PYTHON_INCLUDE_DIR, PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the
-# cache entries because they are meant to specify the location of a single
-# library. We now set the variables listed by the documentation for this
-# module.
-set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
-set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
-if(NOT PYTHON_DEBUG_LIBRARY)
-  set(PYTHON_DEBUG_LIBRARY "")
-endif()
-set(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
-
-find_package_message(PYTHON "Found PythonLibs: ${PYTHON_LIBRARY}"
-                     "${PYTHON_EXECUTABLE}${PYTHON_VERSION_STRING}")
-
-set(PYTHONLIBS_FOUND TRUE)
-set(PythonLibsNew_FOUND TRUE)
-
-if(NOT PYTHON_MODULE_PREFIX)
-  set(PYTHON_MODULE_PREFIX "")
-endif()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/check-style.sh b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/check-style.sh
deleted file mode 100644
index 6d832523a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/check-style.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# Script to check include/test code for common pybind11 code style errors.
-#
-# This script currently checks for
-#
-# 1. missing space between keyword and parenthesis, e.g.: for(, if(, while(
-# 2. Missing space between right parenthesis and brace, e.g. 'for (...){'
-# 3. opening brace on its own line. It should always be on the same line as the
-#    if/while/for/do statement.
-#
-# Invoke as: tools/check-style.sh <filenames>
-#
-
-check_style_errors=0
-IFS=$'\n'
-
-
-found="$(grep '\<\(if\|for\|while\|catch\)(\|){' "$@" -rn --color=always)"
-if [ -n "$found" ]; then
-    echo -e '\033[31;01mError: found the following coding style problems:\033[0m'
-    check_style_errors=1
-    echo "${found//^/    /}"
-fi
-
-found="$(awk '
-function prefix(filename, lineno) {
-    return "    \033[35m" filename "\033[36m:\033[32m" lineno "\033[36m:\033[0m"
-}
-function mark(pattern, string) { sub(pattern, "\033[01;31m&\033[0m", string); return string }
-last && /^\s*{/ {
-    print prefix(FILENAME, FNR-1) mark("\\)\\s*$", last)
-    print prefix(FILENAME, FNR)   mark("^\\s*{", $0)
-    last=""
-}
-{ last = /(if|for|while|catch|switch)\s*\(.*\)\s*$/ ? $0 : "" }
-' "$(find include -type f)" "$@")"
-if [ -n "$found" ]; then
-    check_style_errors=1
-    echo -e '\033[31;01mError: braces should occur on the same line as the if/while/.. statement. Found issues in the following files:\033[0m'
-    echo "$found"
-fi
-
-exit $check_style_errors
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/cmake_uninstall.cmake.in b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/cmake_uninstall.cmake.in
deleted file mode 100644
index 1e5d2bb87..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# Source: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake
-
-if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
-endif()
-
-file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach(file ${files})
-  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
-  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    exec_program(
-      "@CMAKE_COMMAND@" ARGS
-      "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval)
-    if(NOT "${rm_retval}" STREQUAL 0)
-      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
-    endif()
-  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
-  endif()
-endforeach()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/libsize.py b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/libsize.py
deleted file mode 100644
index 1ac9afbe8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/libsize.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import os
-import sys
-
-# Internal build script for generating debugging test .so size.
-# Usage:
-#     python libsize.py file.so save.txt -- displays the size of file.so and, if save.txt exists, compares it to the
-#                                           size in it, then overwrites save.txt with the new size for future runs.
-
-if len(sys.argv) != 3:
-    sys.exit("Invalid arguments: usage: python libsize.py file.so save.txt")
-
-lib = sys.argv[1]
-save = sys.argv[2]
-
-if not os.path.exists(lib):
-    sys.exit(f"Error: requested file ({lib}) does not exist")
-
-libsize = os.path.getsize(lib)
-
-print("------", os.path.basename(lib), "file size:", libsize, end="")
-
-if os.path.exists(save):
-    with open(save) as sf:
-        oldsize = int(sf.readline())
-
-    if oldsize > 0:
-        change = libsize - oldsize
-        if change == 0:
-            print(" (no change)")
-        else:
-            print(f" (change of {change:+} bytes = {change / oldsize:+.2%})")
-else:
-    print()
-
-with open(save, "w") as sf:
-    sf.write(str(libsize))
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/make_changelog.py b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/make_changelog.py
deleted file mode 100644
index 839040a93..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/make_changelog.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python3
-
-import re
-
-import ghapi.all
-from rich import print
-from rich.syntax import Syntax
-
-ENTRY = re.compile(
-    r"""
-    Suggested \s changelog \s entry:
-    .*
-    ```rst
-    \s*
-    (.*?)
-    \s*
-    ```
-""",
-    re.DOTALL | re.VERBOSE,
-)
-
-print()
-
-
-api = ghapi.all.GhApi(owner="pybind", repo="pybind11")
-
-issues_pages = ghapi.page.paged(
-    api.issues.list_for_repo, labels="needs changelog", state="closed"
-)
-issues = (issue for page in issues_pages for issue in page)
-missing = []
-
-for issue in issues:
-    changelog = ENTRY.findall(issue.body)
-    if changelog:
-        (msg,) = changelog
-        if not msg.startswith("* "):
-            msg = "* " + msg
-        if not msg.endswith("."):
-            msg += "."
-
-        msg += f"\n  `#{issue.number} <{issue.html_url}>`_"
-
-        print(Syntax(msg, "rst", theme="ansi_light", word_wrap=True))
-        print()
-
-    else:
-        missing.append(issue)
-
-if missing:
-    print()
-    print("[blue]" + "-" * 30)
-    print()
-
-    for issue in missing:
-        print(f"[red bold]Missing:[/red bold][red] {issue.title}")
-        print(f"[red]  {issue.html_url}\n")
-
-    print("[bold]Template:\n")
-    msg = "## Suggested changelog entry:\n\n```rst\n\n```"
-    print(Syntax(msg, "md", theme="ansi_light"))
-
-print()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11Common.cmake b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11Common.cmake
deleted file mode 100644
index e1fb601ac..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11Common.cmake
+++ /dev/null
@@ -1,385 +0,0 @@
-#[======================================================[.rst
-
-Adds the following targets::
-
-    pybind11::pybind11 - link to headers and pybind11
-    pybind11::module - Adds module links
-    pybind11::embed - Adds embed links
-    pybind11::lto - Link time optimizations (manual selection)
-    pybind11::thin_lto - Link time optimizations (manual selection)
-    pybind11::python_link_helper - Adds link to Python libraries
-    pybind11::windows_extras - MSVC bigobj and mp for building multithreaded
-    pybind11::opt_size - avoid optimizations that increase code size
-
-Adds the following functions::
-
-    pybind11_strip(target) - strip target after building on linux/macOS
-    pybind11_find_import(module) - See if a module is installed.
-
-#]======================================================]
-
-# CMake 3.10 has an include_guard command, but we can't use that yet
-# include_guard(global) (pre-CMake 3.10)
-if(TARGET pybind11::lto)
-  return()
-endif()
-
-# If we are in subdirectory mode, all IMPORTED targets must be GLOBAL. If we
-# are in CONFIG mode, they should be "normal" targets instead.
-# In CMake 3.11+ you can promote a target to global after you create it,
-# which might be simpler than this check.
-get_property(
-  is_config
-  TARGET pybind11::headers
-  PROPERTY IMPORTED)
-if(NOT is_config)
-  set(optional_global GLOBAL)
-endif()
-
-# If not run in Python mode, we still would like this to at least
-# include pybind11's include directory:
-set(pybind11_INCLUDE_DIRS
-    "${pybind11_INCLUDE_DIR}"
-    CACHE INTERNAL "Include directory for pybind11 (Python not requested)")
-
-# --------------------- Shared targets ----------------------------
-
-# Build an interface library target:
-add_library(pybind11::pybind11 IMPORTED INTERFACE ${optional_global})
-set_property(
-  TARGET pybind11::pybind11
-  APPEND
-  PROPERTY INTERFACE_LINK_LIBRARIES pybind11::headers)
-
-# Build a module target:
-add_library(pybind11::module IMPORTED INTERFACE ${optional_global})
-set_property(
-  TARGET pybind11::module
-  APPEND
-  PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11)
-
-# Build an embed library target:
-add_library(pybind11::embed IMPORTED INTERFACE ${optional_global})
-set_property(
-  TARGET pybind11::embed
-  APPEND
-  PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11)
-
-# --------------------------- link helper ---------------------------
-
-add_library(pybind11::python_link_helper IMPORTED INTERFACE ${optional_global})
-
-if(CMAKE_VERSION VERSION_LESS 3.13)
-  # In CMake 3.11+, you can set INTERFACE properties via the normal methods, and
-  # this would be simpler.
-  set_property(
-    TARGET pybind11::python_link_helper
-    APPEND
-    PROPERTY INTERFACE_LINK_LIBRARIES "$<$<PLATFORM_ID:Darwin>:-undefined dynamic_lookup>")
-else()
-  # link_options was added in 3.13+
-  # This is safer, because you are ensured the deduplication pass in CMake will not consider
-  # these separate and remove one but not the other.
-  set_property(
-    TARGET pybind11::python_link_helper
-    APPEND
-    PROPERTY INTERFACE_LINK_OPTIONS "$<$<PLATFORM_ID:Darwin>:LINKER:-undefined,dynamic_lookup>")
-endif()
-
-# ------------------------ Windows extras -------------------------
-
-add_library(pybind11::windows_extras IMPORTED INTERFACE ${optional_global})
-
-if(MSVC) # That's also clang-cl
-  # /bigobj is needed for bigger binding projects due to the limit to 64k
-  # addressable sections
-  set_property(
-    TARGET pybind11::windows_extras
-    APPEND
-    PROPERTY INTERFACE_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:/bigobj>)
-
-  # /MP enables multithreaded builds (relevant when there are many files) for MSVC
-  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") # no Clang no Intel
-    if(CMAKE_VERSION VERSION_LESS 3.11)
-      set_property(
-        TARGET pybind11::windows_extras
-        APPEND
-        PROPERTY INTERFACE_COMPILE_OPTIONS $<$<NOT:$<CONFIG:Debug>>:/MP>)
-    else()
-      # Only set these options for C++ files.  This is important so that, for
-      # instance, projects that include other types of source files like CUDA
-      # .cu files don't get these options propagated to nvcc since that would
-      # cause the build to fail.
-      set_property(
-        TARGET pybind11::windows_extras
-        APPEND
-        PROPERTY INTERFACE_COMPILE_OPTIONS
-                 $<$<NOT:$<CONFIG:Debug>>:$<$<COMPILE_LANGUAGE:CXX>:/MP>>)
-    endif()
-  endif()
-endif()
-
-# ----------------------- Optimize binary size --------------------------
-
-add_library(pybind11::opt_size IMPORTED INTERFACE ${optional_global})
-
-if(MSVC)
-  set(PYBIND11_OPT_SIZE /Os)
-else()
-  set(PYBIND11_OPT_SIZE -Os)
-endif()
-
-set_property(
-  TARGET pybind11::opt_size
-  APPEND
-  PROPERTY INTERFACE_COMPILE_OPTIONS $<$<CONFIG:Release>:${PYBIND11_OPT_SIZE}>
-           $<$<CONFIG:MinSizeRel>:${PYBIND11_OPT_SIZE}>
-           $<$<CONFIG:RelWithDebInfo>:${PYBIND11_OPT_SIZE}>)
-
-# ----------------------- Legacy option --------------------------
-
-# Warn or error if old variable name used
-if(PYBIND11_CPP_STANDARD)
-  string(REGEX MATCH [[..$]] VAL "${PYBIND11_CPP_STANDARD}")
-  if(CMAKE_CXX_STANDARD)
-    if(NOT CMAKE_CXX_STANDARD STREQUAL VAL)
-      message(WARNING "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} does not match "
-                      "PYBIND11_CPP_STANDARD=${PYBIND11_CPP_STANDARD}, "
-                      "please remove PYBIND11_CPP_STANDARD from your cache")
-    endif()
-  else()
-    set(supported_standards 11 14 17 20)
-    if("${VAL}" IN_LIST supported_standards)
-      message(WARNING "USE -DCMAKE_CXX_STANDARD=${VAL} instead of PYBIND11_CPP_STANDARD")
-      set(CMAKE_CXX_STANDARD
-          ${VAL}
-          CACHE STRING "From PYBIND11_CPP_STANDARD")
-    else()
-      message(FATAL_ERROR "PYBIND11_CPP_STANDARD should be replaced with CMAKE_CXX_STANDARD "
-                          "(last two chars: ${VAL} not understood as a valid CXX std)")
-    endif()
-  endif()
-endif()
-
-# --------------------- Python specifics -------------------------
-
-# Check to see which Python mode we are in, new, old, or no python
-if(PYBIND11_NOPYTHON)
-  set(_pybind11_nopython ON)
-elseif(
-  PYBIND11_FINDPYTHON
-  OR Python_FOUND
-  OR Python2_FOUND
-  OR Python3_FOUND)
-  # New mode
-  include("${CMAKE_CURRENT_LIST_DIR}/pybind11NewTools.cmake")
-
-else()
-
-  # Classic mode
-  include("${CMAKE_CURRENT_LIST_DIR}/pybind11Tools.cmake")
-
-endif()
-
-# --------------------- pybind11_find_import -------------------------------
-
-if(NOT _pybind11_nopython)
-  # Check to see if modules are importable. Use REQUIRED to force an error if
-  # one of the modules is not found. <package_name>_FOUND will be set if the
-  # package was found (underscores replace dashes if present). QUIET will hide
-  # the found message, and VERSION will require a minimum version. A successful
-  # find will cache the result.
-  function(pybind11_find_import PYPI_NAME)
-    # CMake variables need underscores (PyPI doesn't care)
-    string(REPLACE "-" "_" NORM_PYPI_NAME "${PYPI_NAME}")
-
-    # Return if found previously
-    if(${NORM_PYPI_NAME}_FOUND)
-      return()
-    endif()
-
-    set(options "REQUIRED;QUIET")
-    set(oneValueArgs "VERSION")
-    cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "" ${ARGN})
-
-    if(ARG_REQUIRED)
-      set(status_level FATAL_ERROR)
-    else()
-      set(status_level WARNING)
-    endif()
-
-    execute_process(
-      COMMAND
-        ${${_Python}_EXECUTABLE} -c
-        "from pkg_resources import get_distribution; print(get_distribution('${PYPI_NAME}').version)"
-      RESULT_VARIABLE RESULT_PRESENT
-      OUTPUT_VARIABLE PKG_VERSION
-      ERROR_QUIET)
-
-    string(STRIP "${PKG_VERSION}" PKG_VERSION)
-
-    # If a result is present, this failed
-    if(RESULT_PRESENT)
-      set(${NORM_PYPI_NAME}_FOUND
-          ${NORM_PYPI_NAME}-NOTFOUND
-          CACHE INTERNAL "")
-      # Always warn or error
-      message(
-        ${status_level}
-        "Missing: ${PYPI_NAME} ${ARG_VERSION}\nTry: ${${_Python}_EXECUTABLE} -m pip install ${PYPI_NAME}"
-      )
-    else()
-      if(ARG_VERSION AND PKG_VERSION VERSION_LESS ARG_VERSION)
-        message(
-          ${status_level}
-          "Version incorrect: ${PYPI_NAME} ${PKG_VERSION} found, ${ARG_VERSION} required - try upgrading"
-        )
-      else()
-        set(${NORM_PYPI_NAME}_FOUND
-            YES
-            CACHE INTERNAL "")
-        set(${NORM_PYPI_NAME}_VERSION
-            ${PKG_VERSION}
-            CACHE INTERNAL "")
-      endif()
-      if(NOT ARG_QUIET)
-        message(STATUS "Found ${PYPI_NAME} ${PKG_VERSION}")
-      endif()
-    endif()
-    if(NOT ARG_VERSION OR (NOT PKG_VERSION VERSION_LESS ARG_VERSION))
-      # We have successfully found a good version, cache to avoid calling again.
-    endif()
-  endfunction()
-endif()
-
-# --------------------- LTO -------------------------------
-
-include(CheckCXXCompilerFlag)
-
-# Checks whether the given CXX/linker flags can compile and link a cxx file.
-# cxxflags and linkerflags are lists of flags to use.  The result variable is a
-# unique variable name for each set of flags: the compilation result will be
-# cached base on the result variable.  If the flags work, sets them in
-# cxxflags_out/linkerflags_out internal cache variables (in addition to
-# ${result}).
-function(_pybind11_return_if_cxx_and_linker_flags_work result cxxflags linkerflags cxxflags_out
-         linkerflags_out)
-  set(CMAKE_REQUIRED_LIBRARIES ${linkerflags})
-  check_cxx_compiler_flag("${cxxflags}" ${result})
-  if(${result})
-    set(${cxxflags_out}
-        "${cxxflags}"
-        PARENT_SCOPE)
-    set(${linkerflags_out}
-        "${linkerflags}"
-        PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(_pybind11_generate_lto target prefer_thin_lto)
-  if(MINGW)
-    message(STATUS "${target} disabled (problems with undefined symbols for MinGW for now)")
-    return()
-  endif()
-
-  if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    set(cxx_append "")
-    set(linker_append "")
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT APPLE)
-      # Clang Gold plugin does not support -Os; append -O3 to MinSizeRel builds to override it
-      set(linker_append ";$<$<CONFIG:MinSizeRel>:-O3>")
-    elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT MINGW)
-      set(cxx_append ";-fno-fat-lto-objects")
-    endif()
-
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "mips64")
-      set(NO_FLTO_ARCH TRUE)
-    else()
-      set(NO_FLTO_ARCH FALSE)
-    endif()
-
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang"
-       AND prefer_thin_lto
-       AND NOT NO_FLTO_ARCH)
-      _pybind11_return_if_cxx_and_linker_flags_work(
-        HAS_FLTO_THIN "-flto=thin${cxx_append}" "-flto=thin${linker_append}"
-        PYBIND11_LTO_CXX_FLAGS PYBIND11_LTO_LINKER_FLAGS)
-    endif()
-
-    if(NOT HAS_FLTO_THIN AND NOT NO_FLTO_ARCH)
-      _pybind11_return_if_cxx_and_linker_flags_work(
-        HAS_FLTO "-flto${cxx_append}" "-flto${linker_append}" PYBIND11_LTO_CXX_FLAGS
-        PYBIND11_LTO_LINKER_FLAGS)
-    endif()
-  elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    # Intel equivalent to LTO is called IPO
-    _pybind11_return_if_cxx_and_linker_flags_work(HAS_INTEL_IPO "-ipo" "-ipo"
-                                                  PYBIND11_LTO_CXX_FLAGS PYBIND11_LTO_LINKER_FLAGS)
-  elseif(MSVC)
-    # cmake only interprets libraries as linker flags when they start with a - (otherwise it
-    # converts /LTCG to \LTCG as if it was a Windows path).  Luckily MSVC supports passing flags
-    # with - instead of /, even if it is a bit non-standard:
-    _pybind11_return_if_cxx_and_linker_flags_work(HAS_MSVC_GL_LTCG "/GL" "-LTCG"
-                                                  PYBIND11_LTO_CXX_FLAGS PYBIND11_LTO_LINKER_FLAGS)
-  endif()
-
-  # Enable LTO flags if found, except for Debug builds
-  if(PYBIND11_LTO_CXX_FLAGS)
-    # CONFIG takes multiple values in CMake 3.19+, until then we have to use OR
-    set(is_debug "$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>")
-    set(not_debug "$<NOT:${is_debug}>")
-    set(cxx_lang "$<COMPILE_LANGUAGE:CXX>")
-    if(MSVC AND CMAKE_VERSION VERSION_LESS 3.11)
-      set(genex "${not_debug}")
-    else()
-      set(genex "$<AND:${not_debug},${cxx_lang}>")
-    endif()
-    set_property(
-      TARGET ${target}
-      APPEND
-      PROPERTY INTERFACE_COMPILE_OPTIONS "$<${genex}:${PYBIND11_LTO_CXX_FLAGS}>")
-    if(CMAKE_PROJECT_NAME STREQUAL "pybind11")
-      message(STATUS "${target} enabled")
-    endif()
-  else()
-    if(CMAKE_PROJECT_NAME STREQUAL "pybind11")
-      message(STATUS "${target} disabled (not supported by the compiler and/or linker)")
-    endif()
-  endif()
-
-  if(PYBIND11_LTO_LINKER_FLAGS)
-    if(CMAKE_VERSION VERSION_LESS 3.11)
-      set_property(
-        TARGET ${target}
-        APPEND
-        PROPERTY INTERFACE_LINK_LIBRARIES "$<${not_debug}:${PYBIND11_LTO_LINKER_FLAGS}>")
-    else()
-      set_property(
-        TARGET ${target}
-        APPEND
-        PROPERTY INTERFACE_LINK_OPTIONS "$<${not_debug}:${PYBIND11_LTO_LINKER_FLAGS}>")
-    endif()
-  endif()
-endfunction()
-
-add_library(pybind11::lto IMPORTED INTERFACE ${optional_global})
-_pybind11_generate_lto(pybind11::lto FALSE)
-
-add_library(pybind11::thin_lto IMPORTED INTERFACE ${optional_global})
-_pybind11_generate_lto(pybind11::thin_lto TRUE)
-
-# ---------------------- pybind11_strip -----------------------------
-
-function(pybind11_strip target_name)
-  # Strip unnecessary sections of the binary on Linux/macOS
-  if(CMAKE_STRIP)
-    if(APPLE)
-      set(x_opt -x)
-    endif()
-
-    add_custom_command(
-      TARGET ${target_name}
-      POST_BUILD
-      COMMAND ${CMAKE_STRIP} ${x_opt} $<TARGET_FILE:${target_name}>)
-  endif()
-endfunction()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11Config.cmake.in b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11Config.cmake.in
deleted file mode 100644
index 9383e8c67..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11Config.cmake.in
+++ /dev/null
@@ -1,231 +0,0 @@
-#[=============================================================================[.rst:
-
-pybind11Config.cmake
-####################
-
-Exported variables
-==================
-
-This module sets the following variables in your project:
-
-``pybind11_FOUND``
-  true if pybind11 and all required components found on the system
-``pybind11_VERSION``
-  pybind11 version in format Major.Minor.Release
-``pybind11_VERSION_TYPE``
-  pybind11 version type (``dev*`` or empty for a release)
-``pybind11_INCLUDE_DIRS``
-  Directories where pybind11 and python headers are located.
-``pybind11_INCLUDE_DIR``
-  Directory where pybind11 headers are located.
-``pybind11_DEFINITIONS``
-  Definitions necessary to use pybind11, namely USING_pybind11.
-``pybind11_LIBRARIES``
-  Compile flags and python libraries (as needed) to link against.
-``pybind11_LIBRARY``
-  Empty.
-
-Available components: None
-
-
-Exported targets
-================
-
-If pybind11 is found, this module defines the following ``IMPORTED``
-interface library targets:
-
-``pybind11::module``
-  for extension modules.
-``pybind11::embed``
-  for embedding the Python interpreter.
-
-Python headers, libraries (as needed by platform), and the C++ standard
-are attached to the target.
-
-Advanced targets are also supplied - these are primary for users building
-complex applications, and they are available in all modes:
-
-``pybind11::headers``
-  Just the pybind11 headers and minimum compile requirements.
-``pybind11::pybind11``
-  Python headers too.
-``pybind11::python_link_helper``
-  Just the "linking" part of ``pybind11:module``, for CMake < 3.15.
-``pybind11::thin_lto``
-  An alternative to ``INTERPROCEDURAL_OPTIMIZATION``.
-``pybind11::lto``
-  An alternative to ``INTERPROCEDURAL_OPTIMIZATION`` (also avoids thin LTO on clang).
-``pybind11::windows_extras``
-  Adds bigobj and mp for MSVC.
-
-Modes
-=====
-
-There are two modes provided; classic, which is built on the old Python
-discovery packages in CMake, or the new FindPython mode, which uses FindPython
-from 3.12+ forward (3.15+ _highly_ recommended).
-
-New FindPython mode
-^^^^^^^^^^^^^^^^^^^
-
-To activate this mode, either call ``find_package(Python COMPONENTS Interpreter Development)``
-before finding this package, or set the ``PYBIND11_FINDPYTHON`` variable to ON. In this mode,
-you can either use the basic targets, or use the FindPython tools:
-
-.. code-block:: cmake
-
-  find_package(Python COMPONENTS Interpreter Development)
-  find_package(pybind11 CONFIG)
-
-  # pybind11 method:
-  pybind11_add_module(MyModule1 src1.cpp)
-
-  # Python method:
-  Python_add_library(MyModule2 src2.cpp)
-  target_link_libraries(MyModule2 pybind11::headers)
-  set_target_properties(MyModule2 PROPERTIES
-                                  INTERPROCEDURAL_OPTIMIZATION ON
-                                  CXX_VISIBILITY_PRESET ON
-                                  VISIBILITY_INLINES_HIDDEN ON)
-
-If you build targets yourself, you may be interested in stripping the output
-for reduced size; this is the one other feature that the helper function gives you.
-
-Classic mode
-^^^^^^^^^^^^
-
-Set PythonLibsNew variables to influence python detection and
-CMAKE_CXX_STANDARD to influence standard setting.
-
-.. code-block:: cmake
-
-  find_package(pybind11 CONFIG REQUIRED)
-
-  # Create an extension module
-  add_library(mylib MODULE main.cpp)
-  target_link_libraries(mylib PUBLIC pybind11::module)
-
-  # Or embed the Python interpreter into an executable
-  add_executable(myexe main.cpp)
-  target_link_libraries(myexe PUBLIC pybind11::embed)
-
-
-Hints
-=====
-
-The following variables can be set to guide the search for this package:
-
-``pybind11_DIR``
-  CMake variable, set to directory containing this Config file.
-``CMAKE_PREFIX_PATH``
-  CMake variable, set to root directory of this package.
-``PATH``
-  Environment variable, set to bin directory of this package.
-``CMAKE_DISABLE_FIND_PACKAGE_pybind11``
-  CMake variable, disables ``find_package(pybind11)`` when not ``REQUIRED``,
-  perhaps to force internal build.
-
-Commands
-========
-
-pybind11_add_module
-^^^^^^^^^^^^^^^^^^^
-
-This module defines the following commands to assist with creating Python modules:
-
-.. code-block:: cmake
-
-  pybind11_add_module(<target>
-    [STATIC|SHARED|MODULE]
-    [THIN_LTO] [OPT_SIZE] [NO_EXTRAS] [WITHOUT_SOABI]
-    <files>...
-    )
-
-Add a module and setup all helpers. You can select the type of the library; the
-default is ``MODULE``. There are several options:
-
-``OPT_SIZE``
-  Optimize for size, even if the ``CMAKE_BUILD_TYPE`` is not ``MinSizeRel``.
-``THIN_LTO``
-  Use thin TLO instead of regular if there's a choice (pybind11's selection
-  is disabled if ``CMAKE_INTERPROCEDURAL_OPTIMIZATIONS`` is set).
-``WITHOUT_SOABI``
-  Disable the SOABI component (``PYBIND11_NEWPYTHON`` mode only).
-``NO_EXTRAS``
-  Disable all extras, exit immediately after making the module.
-
-pybind11_strip
-^^^^^^^^^^^^^^
-
-.. code-block:: cmake
-
-  pybind11_strip(<target>)
-
-Strip a target after building it (linux/macOS), called by ``pybind11_add_module``.
-
-pybind11_extension
-^^^^^^^^^^^^^^^^^^
-
-.. code-block:: cmake
-
-    pybind11_extension(<target>)
-
-Sets the Python extension name correctly for Python on your platform, called by
-``pybind11_add_module``.
-
-pybind11_find_import(module)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. code-block:: cmake
-
-    pybind11_find_import(<module> [VERSION <number>] [REQUIRED] [QUIET])
-
-See if a module is installed. Use the registered name (the one on PyPI). You
-can specify a ``VERSION``, and you can specify ``REQUIRED`` or ``QUIET``. Only available if
-``NOPYTHON`` mode is not active.  Sets ``module_VERSION`` and ``module_FOUND``. Caches the
-result once a valid install is found.
-
-Suggested usage
-===============
-
-Using ``find_package`` with version info is not recommended except for release versions.
-
-.. code-block:: cmake
-
-  find_package(pybind11 CONFIG)
-  find_package(pybind11 2.9 EXACT CONFIG REQUIRED)
-
-#]=============================================================================]
-@PACKAGE_INIT@
-
-# Location of pybind11/pybind11.h
-# This will be relative unless explicitly set as absolute
-set(pybind11_INCLUDE_DIR "@pybind11_INCLUDEDIR@")
-
-set(pybind11_LIBRARY "")
-set(pybind11_DEFINITIONS USING_pybind11)
-set(pybind11_VERSION_TYPE "@pybind11_VERSION_TYPE@")
-
-check_required_components(pybind11)
-
-if(TARGET pybind11::python_link_helper)
-  # This has already been setup elsewhere, such as with a previous call or
-  # add_subdirectory
-  return()
-endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/pybind11Targets.cmake")
-
-# Easier to use / remember
-add_library(pybind11::headers IMPORTED INTERFACE)
-set_target_properties(pybind11::headers PROPERTIES INTERFACE_LINK_LIBRARIES
-                                                   pybind11::pybind11_headers)
-
-include("${CMAKE_CURRENT_LIST_DIR}/pybind11Common.cmake")
-
-if(NOT pybind11_FIND_QUIETLY)
-  message(
-    STATUS
-      "Found pybind11: ${pybind11_INCLUDE_DIR} (found version \"${pybind11_VERSION}${pybind11_VERSION_TYPE}\")"
-  )
-endif()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11NewTools.cmake b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11NewTools.cmake
deleted file mode 100644
index 9e13daf1a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11NewTools.cmake
+++ /dev/null
@@ -1,256 +0,0 @@
-# tools/pybind11NewTools.cmake -- Build system for the pybind11 modules
-#
-# Copyright (c) 2020 Wenzel Jakob <wenzel@inf.ethz.ch> and Henry Schreiner
-#
-# All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-if(CMAKE_VERSION VERSION_LESS 3.12)
-  message(FATAL_ERROR "You cannot use the new FindPython module with CMake < 3.12")
-endif()
-
-include_guard(GLOBAL)
-
-get_property(
-  is_config
-  TARGET pybind11::headers
-  PROPERTY IMPORTED)
-
-if(pybind11_FIND_QUIETLY)
-  set(_pybind11_quiet QUIET)
-else()
-  set(_pybind11_quiet "")
-endif()
-
-if(NOT Python_FOUND AND NOT Python3_FOUND)
-  if(NOT DEFINED Python_FIND_IMPLEMENTATIONS)
-    set(Python_FIND_IMPLEMENTATIONS CPython PyPy)
-  endif()
-
-  # GitHub Actions like activation
-  if(NOT DEFINED Python_ROOT_DIR AND DEFINED ENV{pythonLocation})
-    set(Python_ROOT_DIR "$ENV{pythonLocation}")
-  endif()
-
-  find_package(Python 3.6 REQUIRED COMPONENTS Interpreter Development ${_pybind11_quiet})
-
-  # If we are in submodule mode, export the Python targets to global targets.
-  # If this behavior is not desired, FindPython _before_ pybind11.
-  if(NOT is_config)
-    set_property(TARGET Python::Python PROPERTY IMPORTED_GLOBAL TRUE)
-    set_property(TARGET Python::Interpreter PROPERTY IMPORTED_GLOBAL TRUE)
-    if(TARGET Python::Module)
-      set_property(TARGET Python::Module PROPERTY IMPORTED_GLOBAL TRUE)
-    endif()
-  endif()
-endif()
-
-if(Python_FOUND)
-  set(_Python
-      Python
-      CACHE INTERNAL "" FORCE)
-elseif(Python3_FOUND)
-  set(_Python
-      Python3
-      CACHE INTERNAL "" FORCE)
-endif()
-
-if(PYBIND11_MASTER_PROJECT)
-  if(${_Python}_INTERPRETER_ID MATCHES "PyPy")
-    message(STATUS "PyPy ${${_Python}_PyPy_VERSION} (Py ${${_Python}_VERSION})")
-  else()
-    message(STATUS "${_Python} ${${_Python}_VERSION}")
-  endif()
-endif()
-
-# If a user finds Python, they may forget to include the Interpreter component
-# and the following two steps require it. It is highly recommended by CMake
-# when finding development libraries anyway, so we will require it.
-if(NOT DEFINED ${_Python}_EXECUTABLE)
-  message(
-    FATAL_ERROR
-      "${_Python} was found without the Interpreter component. Pybind11 requires this component.")
-
-endif()
-
-if(NOT ${_Python}_EXECUTABLE STREQUAL PYBIND11_PYTHON_EXECUTABLE_LAST)
-  # Detect changes to the Python version/binary in subsequent CMake runs, and refresh config if needed
-  unset(PYTHON_IS_DEBUG CACHE)
-  unset(PYTHON_MODULE_EXTENSION CACHE)
-  set(PYBIND11_PYTHON_EXECUTABLE_LAST
-      "${${_Python}_EXECUTABLE}"
-      CACHE INTERNAL "Python executable during the last CMake run")
-endif()
-
-if(NOT DEFINED PYTHON_IS_DEBUG)
-  # Debug check - see https://stackoverflow.com/questions/646518/python-how-to-detect-debug-Interpreter
-  execute_process(
-    COMMAND "${${_Python}_EXECUTABLE}" "-c"
-            "import sys; sys.exit(hasattr(sys, 'gettotalrefcount'))"
-    RESULT_VARIABLE _PYTHON_IS_DEBUG)
-  set(PYTHON_IS_DEBUG
-      "${_PYTHON_IS_DEBUG}"
-      CACHE INTERNAL "Python debug status")
-endif()
-
-# Get the suffix - SO is deprecated, should use EXT_SUFFIX, but this is
-# required for PyPy3 (as of 7.3.1)
-if(NOT DEFINED PYTHON_MODULE_EXTENSION)
-  execute_process(
-    COMMAND
-      "${${_Python}_EXECUTABLE}" "-c"
-      "import sys, importlib; s = importlib.import_module('distutils.sysconfig' if sys.version_info < (3, 10) else 'sysconfig'); print(s.get_config_var('EXT_SUFFIX') or s.get_config_var('SO'))"
-    OUTPUT_VARIABLE _PYTHON_MODULE_EXTENSION
-    ERROR_VARIABLE _PYTHON_MODULE_EXTENSION_ERR
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  if(_PYTHON_MODULE_EXTENSION STREQUAL "")
-    message(
-      FATAL_ERROR "pybind11 could not query the module file extension, likely the 'distutils'"
-                  "package is not installed. Full error message:\n${_PYTHON_MODULE_EXTENSION_ERR}")
-  endif()
-
-  # This needs to be available for the pybind11_extension function
-  set(PYTHON_MODULE_EXTENSION
-      "${_PYTHON_MODULE_EXTENSION}"
-      CACHE INTERNAL "")
-endif()
-
-# Python debug libraries expose slightly different objects before 3.8
-# https://docs.python.org/3.6/c-api/intro.html#debugging-builds
-# https://stackoverflow.com/questions/39161202/how-to-work-around-missing-pymodule-create2-in-amd64-win-python35-d-lib
-if(PYTHON_IS_DEBUG)
-  set_property(
-    TARGET pybind11::pybind11
-    APPEND
-    PROPERTY INTERFACE_COMPILE_DEFINITIONS Py_DEBUG)
-endif()
-
-# Check on every access - since Python can change - do nothing in that case.
-
-if(DEFINED ${_Python}_INCLUDE_DIRS)
-  # Only add Python for build - must be added during the import for config
-  # since it has to be re-discovered.
-  #
-  # This needs to be a target to be included after the local pybind11
-  # directory, just in case there there is an installed pybind11 sitting
-  # next to Python's includes. It also ensures Python is a SYSTEM library.
-  add_library(pybind11::python_headers INTERFACE IMPORTED)
-  set_property(
-    TARGET pybind11::python_headers PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-                                             "$<BUILD_INTERFACE:${${_Python}_INCLUDE_DIRS}>")
-  set_property(
-    TARGET pybind11::pybind11
-    APPEND
-    PROPERTY INTERFACE_LINK_LIBRARIES pybind11::python_headers)
-  set(pybind11_INCLUDE_DIRS
-      "${pybind11_INCLUDE_DIR}" "${${_Python}_INCLUDE_DIRS}"
-      CACHE INTERNAL "Directories where pybind11 and possibly Python headers are located")
-endif()
-
-# In CMake 3.18+, you can find these separately, so include an if
-if(TARGET ${_Python}::Python)
-  set_property(
-    TARGET pybind11::embed
-    APPEND
-    PROPERTY INTERFACE_LINK_LIBRARIES ${_Python}::Python)
-endif()
-
-# CMake 3.15+ has this
-if(TARGET ${_Python}::Module)
-  set_property(
-    TARGET pybind11::module
-    APPEND
-    PROPERTY INTERFACE_LINK_LIBRARIES ${_Python}::Module)
-else()
-  set_property(
-    TARGET pybind11::module
-    APPEND
-    PROPERTY INTERFACE_LINK_LIBRARIES pybind11::python_link_helper)
-endif()
-
-# WITHOUT_SOABI and WITH_SOABI will disable the custom extension handling used by pybind11.
-# WITH_SOABI is passed on to python_add_library.
-function(pybind11_add_module target_name)
-  cmake_parse_arguments(PARSE_ARGV 1 ARG
-                        "STATIC;SHARED;MODULE;THIN_LTO;OPT_SIZE;NO_EXTRAS;WITHOUT_SOABI" "" "")
-
-  if(ARG_STATIC)
-    set(lib_type STATIC)
-  elseif(ARG_SHARED)
-    set(lib_type SHARED)
-  else()
-    set(lib_type MODULE)
-  endif()
-
-  if("${_Python}" STREQUAL "Python")
-    python_add_library(${target_name} ${lib_type} ${ARG_UNPARSED_ARGUMENTS})
-  elseif("${_Python}" STREQUAL "Python3")
-    python3_add_library(${target_name} ${lib_type} ${ARG_UNPARSED_ARGUMENTS})
-  else()
-    message(FATAL_ERROR "Cannot detect FindPython version: ${_Python}")
-  endif()
-
-  target_link_libraries(${target_name} PRIVATE pybind11::headers)
-
-  if(lib_type STREQUAL "MODULE")
-    target_link_libraries(${target_name} PRIVATE pybind11::module)
-  else()
-    target_link_libraries(${target_name} PRIVATE pybind11::embed)
-  endif()
-
-  if(MSVC)
-    target_link_libraries(${target_name} PRIVATE pybind11::windows_extras)
-  endif()
-
-  # -fvisibility=hidden is required to allow multiple modules compiled against
-  # different pybind versions to work properly, and for some features (e.g.
-  # py::module_local).  We force it on everything inside the `pybind11`
-  # namespace; also turning it on for a pybind module compilation here avoids
-  # potential warnings or issues from having mixed hidden/non-hidden types.
-  if(NOT DEFINED CMAKE_CXX_VISIBILITY_PRESET)
-    set_target_properties(${target_name} PROPERTIES CXX_VISIBILITY_PRESET "hidden")
-  endif()
-
-  if(NOT DEFINED CMAKE_CUDA_VISIBILITY_PRESET)
-    set_target_properties(${target_name} PROPERTIES CUDA_VISIBILITY_PRESET "hidden")
-  endif()
-
-  # If we don't pass a WITH_SOABI or WITHOUT_SOABI, use our own default handling of extensions
-  if(NOT ARG_WITHOUT_SOABI AND NOT "WITH_SOABI" IN_LIST ARG_UNPARSED_ARGUMENTS)
-    pybind11_extension(${target_name})
-  endif()
-
-  if(ARG_NO_EXTRAS)
-    return()
-  endif()
-
-  if(NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-    if(ARG_THIN_LTO)
-      target_link_libraries(${target_name} PRIVATE pybind11::thin_lto)
-    else()
-      target_link_libraries(${target_name} PRIVATE pybind11::lto)
-    endif()
-  endif()
-
-  # Use case-insensitive comparison to match the result of $<CONFIG:cfgs>
-  string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-  if(NOT MSVC AND NOT ${uppercase_CMAKE_BUILD_TYPE} MATCHES DEBUG|RELWITHDEBINFO)
-    # Strip unnecessary sections of the binary on Linux/macOS
-    pybind11_strip(${target_name})
-  endif()
-
-  if(MSVC)
-    target_link_libraries(${target_name} PRIVATE pybind11::windows_extras)
-  endif()
-
-  if(ARG_OPT_SIZE)
-    target_link_libraries(${target_name} PRIVATE pybind11::opt_size)
-  endif()
-endfunction()
-
-function(pybind11_extension name)
-  # The extension is precomputed
-  set_target_properties(${name} PROPERTIES PREFIX "" SUFFIX "${PYTHON_MODULE_EXTENSION}")
-
-endfunction()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11Tools.cmake b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11Tools.cmake
deleted file mode 100644
index 1b6045b70..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pybind11Tools.cmake
+++ /dev/null
@@ -1,229 +0,0 @@
-# tools/pybind11Tools.cmake -- Build system for the pybind11 modules
-#
-# Copyright (c) 2020 Wenzel Jakob <wenzel.jakob@epfl.ch>
-#
-# All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-# include_guard(global) (pre-CMake 3.10)
-if(TARGET pybind11::python_headers)
-  return()
-endif()
-
-# Built-in in CMake 3.5+
-include(CMakeParseArguments)
-
-if(pybind11_FIND_QUIETLY)
-  set(_pybind11_quiet QUIET)
-else()
-  set(_pybind11_quiet "")
-endif()
-
-# If this is the first run, PYTHON_VERSION can stand in for PYBIND11_PYTHON_VERSION
-if(NOT DEFINED PYBIND11_PYTHON_VERSION AND DEFINED PYTHON_VERSION)
-  message(WARNING "Set PYBIND11_PYTHON_VERSION to search for a specific version, not "
-                  "PYTHON_VERSION (which is an output). Assuming that is what you "
-                  "meant to do and continuing anyway.")
-  set(PYBIND11_PYTHON_VERSION
-      "${PYTHON_VERSION}"
-      CACHE STRING "Python version to use for compiling modules")
-  unset(PYTHON_VERSION)
-  unset(PYTHON_VERSION CACHE)
-elseif(DEFINED PYBIND11_PYTHON_VERSION)
-  # If this is set as a normal variable, promote it
-  set(PYBIND11_PYTHON_VERSION
-      "${PYBIND11_PYTHON_VERSION}"
-      CACHE STRING "Python version to use for compiling modules")
-else()
-  # Make an empty cache variable.
-  set(PYBIND11_PYTHON_VERSION
-      ""
-      CACHE STRING "Python version to use for compiling modules")
-endif()
-
-# A user can set versions manually too
-set(Python_ADDITIONAL_VERSIONS
-    "3.11;3.10;3.9;3.8;3.7;3.6"
-    CACHE INTERNAL "")
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} MODULE REQUIRED ${_pybind11_quiet})
-list(REMOVE_AT CMAKE_MODULE_PATH -1)
-
-# Makes a normal variable a cached variable
-macro(_PYBIND11_PROMOTE_TO_CACHE NAME)
-  set(_tmp_ptc "${${NAME}}")
-  # CMake 3.21 complains if a cached variable is shadowed by a normal one
-  unset(${NAME})
-  set(${NAME}
-      "${_tmp_ptc}"
-      CACHE INTERNAL "")
-endmacro()
-
-# Cache variables so pybind11_add_module can be used in parent projects
-_pybind11_promote_to_cache(PYTHON_INCLUDE_DIRS)
-_pybind11_promote_to_cache(PYTHON_LIBRARIES)
-_pybind11_promote_to_cache(PYTHON_MODULE_PREFIX)
-_pybind11_promote_to_cache(PYTHON_MODULE_EXTENSION)
-_pybind11_promote_to_cache(PYTHON_VERSION_MAJOR)
-_pybind11_promote_to_cache(PYTHON_VERSION_MINOR)
-_pybind11_promote_to_cache(PYTHON_VERSION)
-_pybind11_promote_to_cache(PYTHON_IS_DEBUG)
-
-if(PYBIND11_MASTER_PROJECT)
-  if(PYTHON_MODULE_EXTENSION MATCHES "pypy")
-    if(NOT DEFINED PYPY_VERSION)
-      execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} -c
-                [=[import sys; sys.stdout.write(".".join(map(str, sys.pypy_version_info[:3])))]=]
-        OUTPUT_VARIABLE pypy_version)
-      set(PYPY_VERSION
-          ${pypy_version}
-          CACHE INTERNAL "")
-    endif()
-    message(STATUS "PYPY ${PYPY_VERSION} (Py ${PYTHON_VERSION})")
-  else()
-    message(STATUS "PYTHON ${PYTHON_VERSION}")
-  endif()
-endif()
-
-# Only add Python for build - must be added during the import for config since
-# it has to be re-discovered.
-#
-# This needs to be an target to it is included after the local pybind11
-# directory, just in case there are multiple versions of pybind11, we want the
-# one we expect.
-add_library(pybind11::python_headers INTERFACE IMPORTED)
-set_property(TARGET pybind11::python_headers PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-                                                      "$<BUILD_INTERFACE:${PYTHON_INCLUDE_DIRS}>")
-set_property(
-  TARGET pybind11::pybind11
-  APPEND
-  PROPERTY INTERFACE_LINK_LIBRARIES pybind11::python_headers)
-
-set(pybind11_INCLUDE_DIRS
-    "${pybind11_INCLUDE_DIR}" "${PYTHON_INCLUDE_DIRS}"
-    CACHE INTERNAL "Directories where pybind11 and possibly Python headers are located")
-
-# Python debug libraries expose slightly different objects before 3.8
-# https://docs.python.org/3.6/c-api/intro.html#debugging-builds
-# https://stackoverflow.com/questions/39161202/how-to-work-around-missing-pymodule-create2-in-amd64-win-python35-d-lib
-if(PYTHON_IS_DEBUG)
-  set_property(
-    TARGET pybind11::pybind11
-    APPEND
-    PROPERTY INTERFACE_COMPILE_DEFINITIONS Py_DEBUG)
-endif()
-
-if(CMAKE_VERSION VERSION_LESS 3.11)
-  set_property(
-    TARGET pybind11::module
-    APPEND
-    PROPERTY
-      INTERFACE_LINK_LIBRARIES
-      pybind11::python_link_helper
-      "$<$<OR:$<PLATFORM_ID:Windows>,$<PLATFORM_ID:Cygwin>>:$<BUILD_INTERFACE:${PYTHON_LIBRARIES}>>"
-  )
-
-  set_property(
-    TARGET pybind11::embed
-    APPEND
-    PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11 $<BUILD_INTERFACE:${PYTHON_LIBRARIES}>)
-else()
-  target_link_libraries(
-    pybind11::module
-    INTERFACE
-      pybind11::python_link_helper
-      "$<$<OR:$<PLATFORM_ID:Windows>,$<PLATFORM_ID:Cygwin>>:$<BUILD_INTERFACE:${PYTHON_LIBRARIES}>>"
-  )
-
-  target_link_libraries(pybind11::embed INTERFACE pybind11::pybind11
-                                                  $<BUILD_INTERFACE:${PYTHON_LIBRARIES}>)
-
-endif()
-
-function(pybind11_extension name)
-  # The prefix and extension are provided by FindPythonLibsNew.cmake
-  set_target_properties(${name} PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}"
-                                           SUFFIX "${PYTHON_MODULE_EXTENSION}")
-endfunction()
-
-# Build a Python extension module:
-# pybind11_add_module(<name> [MODULE | SHARED] [EXCLUDE_FROM_ALL]
-#                     [NO_EXTRAS] [THIN_LTO] [OPT_SIZE] source1 [source2 ...])
-#
-function(pybind11_add_module target_name)
-  set(options "MODULE;SHARED;EXCLUDE_FROM_ALL;NO_EXTRAS;SYSTEM;THIN_LTO;OPT_SIZE")
-  cmake_parse_arguments(ARG "${options}" "" "" ${ARGN})
-
-  if(ARG_MODULE AND ARG_SHARED)
-    message(FATAL_ERROR "Can't be both MODULE and SHARED")
-  elseif(ARG_SHARED)
-    set(lib_type SHARED)
-  else()
-    set(lib_type MODULE)
-  endif()
-
-  if(ARG_EXCLUDE_FROM_ALL)
-    set(exclude_from_all EXCLUDE_FROM_ALL)
-  else()
-    set(exclude_from_all "")
-  endif()
-
-  add_library(${target_name} ${lib_type} ${exclude_from_all} ${ARG_UNPARSED_ARGUMENTS})
-
-  target_link_libraries(${target_name} PRIVATE pybind11::module)
-
-  if(ARG_SYSTEM)
-    message(
-      STATUS
-        "Warning: this does not have an effect - use NO_SYSTEM_FROM_IMPORTED if using imported targets"
-    )
-  endif()
-
-  pybind11_extension(${target_name})
-
-  # -fvisibility=hidden is required to allow multiple modules compiled against
-  # different pybind versions to work properly, and for some features (e.g.
-  # py::module_local).  We force it on everything inside the `pybind11`
-  # namespace; also turning it on for a pybind module compilation here avoids
-  # potential warnings or issues from having mixed hidden/non-hidden types.
-  if(NOT DEFINED CMAKE_CXX_VISIBILITY_PRESET)
-    set_target_properties(${target_name} PROPERTIES CXX_VISIBILITY_PRESET "hidden")
-  endif()
-
-  if(NOT DEFINED CMAKE_CUDA_VISIBILITY_PRESET)
-    set_target_properties(${target_name} PROPERTIES CUDA_VISIBILITY_PRESET "hidden")
-  endif()
-
-  if(ARG_NO_EXTRAS)
-    return()
-  endif()
-
-  if(NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
-    if(ARG_THIN_LTO)
-      target_link_libraries(${target_name} PRIVATE pybind11::thin_lto)
-    else()
-      target_link_libraries(${target_name} PRIVATE pybind11::lto)
-    endif()
-  endif()
-
-  # Use case-insensitive comparison to match the result of $<CONFIG:cfgs>
-  string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-  if(NOT MSVC AND NOT ${uppercase_CMAKE_BUILD_TYPE} MATCHES DEBUG|RELWITHDEBINFO)
-    pybind11_strip(${target_name})
-  endif()
-
-  if(MSVC)
-    target_link_libraries(${target_name} PRIVATE pybind11::windows_extras)
-  endif()
-
-  if(ARG_OPT_SIZE)
-    target_link_libraries(${target_name} PRIVATE pybind11::opt_size)
-  endif()
-endfunction()
-
-# Provide general way to call common Python commands in "common" file.
-set(_Python
-    PYTHON
-    CACHE INTERNAL "" FORCE)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pyproject.toml b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pyproject.toml
deleted file mode 100644
index 8fe2f47af..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/pyproject.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools>=42", "wheel"]
-build-backend = "setuptools.build_meta"
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/setup_global.py.in b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/setup_global.py.in
deleted file mode 100644
index 8aa387178..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/setup_global.py.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env python3
-
-# Setup script for pybind11-global (in the sdist or in tools/setup_global.py in the repository)
-# This package is targeted for easy use from CMake.
-
-import glob
-import os
-import re
-
-# Setuptools has to be before distutils
-from setuptools import setup
-
-from distutils.command.install_headers import install_headers
-
-class InstallHeadersNested(install_headers):
-    def run(self):
-        headers = self.distribution.headers or []
-        for header in headers:
-            # Remove pybind11/include/
-            short_header = header.split("/", 2)[-1]
-
-            dst = os.path.join(self.install_dir, os.path.dirname(short_header))
-            self.mkpath(dst)
-            (out, _) = self.copy_file(header, dst)
-            self.outfiles.append(out)
-
-
-main_headers = glob.glob("pybind11/include/pybind11/*.h")
-detail_headers = glob.glob("pybind11/include/pybind11/detail/*.h")
-stl_headers = glob.glob("pybind11/include/pybind11/stl/*.h")
-cmake_files = glob.glob("pybind11/share/cmake/pybind11/*.cmake")
-headers = main_headers + detail_headers + stl_headers
-
-cmdclass = {"install_headers": InstallHeadersNested}
-$extra_cmd
-
-# This will _not_ affect installing from wheels,
-# only building wheels or installing from SDist.
-# Primarily intended on Windows, where this is sometimes
-# customized (for example, conda-forge uses Library/)
-base = os.environ.get("PYBIND11_GLOBAL_PREFIX", "")
-
-# Must have a separator
-if base and not base.endswith("/"):
-    base += "/"
-
-setup(
-    name="pybind11_global",
-    version="$version",
-    packages=[],
-    headers=headers,
-    data_files=[
-        (base + "share/cmake/pybind11", cmake_files),
-        (base + "include/pybind11", main_headers),
-        (base + "include/pybind11/detail", detail_headers),
-        (base + "include/pybind11/stl", stl_headers),
-    ],
-    cmdclass=cmdclass,
-)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/setup_main.py.in b/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/setup_main.py.in
deleted file mode 100644
index 738d73faa..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pybind11/tools/setup_main.py.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-
-# Setup script (in the sdist or in tools/setup_main.py in the repository)
-
-from setuptools import setup
-
-cmdclass = {}
-$extra_cmd
-
-setup(
-    name="pybind11",
-    version="$version",
-    download_url='https://github.com/pybind/pybind11/tarball/v$version',
-    packages=[
-        "pybind11",
-        "pybind11.include.pybind11",
-        "pybind11.include.pybind11.detail",
-        "pybind11.include.pybind11.stl",
-        "pybind11.share.cmake.pybind11",
-    ],
-    package_data={
-        "pybind11": ["py.typed"],
-        "pybind11.include.pybind11": ["*.h"],
-        "pybind11.include.pybind11.detail": ["*.h"],
-        "pybind11.include.pybind11.stl": ["*.h"],
-        "pybind11.share.cmake.pybind11": ["*.cmake"],
-    },
-    extras_require={
-        "global": ["pybind11_global==$version"]
-        },
-    entry_points={
-        "console_scripts": [
-             "pybind11-config = pybind11.__main__:main",
-        ],
-        "pipx.run": [
-             "pybind11 = pybind11.__main__:main",
-        ]
-    },
-    cmdclass=cmdclass
-)
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pystring.LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/pystring.LICENSE
deleted file mode 100644
index 8269a9a22..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pystring.LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2008-present Contributors to the Pystring project.
-All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pystring.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/pystring.cpp
deleted file mode 100644
index dfc5e0962..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pystring.cpp
+++ /dev/null
@@ -1,1647 +0,0 @@
-// Copyright Contributors to the Pystring project.
-// SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/imageworks/pystring/blob/master/LICENSE
-
-
-#include "pystring.h"
-
-#include <algorithm>
-#include <cctype>
-#include <cstring>
-#include <iostream>
-#include <sstream>
-
-namespace pystring
-{
-
-#if defined(_WIN32) || defined(_WIN64) || defined(_WINDOWS) || defined(_MSC_VER)
-#ifndef WINDOWS
-#define WINDOWS
-#endif
-#endif
-
-// This definition codes from configure.in in the python src.
-// Strictly speaking this limits us to str sizes of 2**31.
-// Should we wish to handle this limit, we could use an architecture
-// specific #defines and read from ssize_t (unistd.h) if the header exists.
-// But in the meantime, the use of int assures maximum arch compatibility.
-// This must also equal the size used in the end = MAX_32BIT_INT default arg.
-
-typedef int Py_ssize_t;
-const std::string forward_slash = "/";
-const std::string double_forward_slash = "//";
-const std::string triple_forward_slash = "///";
-const std::string double_back_slash = "\\";
-const std::string empty_string = "";
-const std::string dot = ".";
-const std::string double_dot = "..";
-const std::string colon = ":";
-
-
-/* helper macro to fixup start/end slice values */
-#define ADJUST_INDICES(start, end, len)         \
-    if (end > len)                          \
-        end = len;                          \
-    else if (end < 0) {                     \
-        end += len;                         \
-        if (end < 0)                        \
-        end = 0;                        \
-    }                                       \
-    if (start < 0) {                        \
-        start += len;                       \
-        if (start < 0)                      \
-        start = 0;                      \
-    }
-
-
-	namespace {
-
-		//////////////////////////////////////////////////////////////////////////////////////////////
-		/// why doesn't the std::reverse work?
-		///
-		void reverse_strings( std::vector< std::string > & result)
-		{
-			for (std::vector< std::string >::size_type i = 0; i < result.size() / 2; i++ )
-			{
-				std::swap(result[i], result[result.size() - 1 - i]);
-			}
-		}
-
-		//////////////////////////////////////////////////////////////////////////////////////////////
-		///
-		///
-		void split_whitespace( const std::string & str, std::vector< std::string > & result, int maxsplit )
-		{
-			std::string::size_type i, j, len = str.size();
-			for (i = j = 0; i < len; )
-			{
-
-				while ( i < len && ::isspace( str[i] ) ) i++;
-				j = i;
-
-				while ( i < len && ! ::isspace( str[i]) ) i++;
-
-
-
-				if (j < i)
-				{
-					if ( maxsplit-- <= 0 ) break;
-
-					result.push_back( str.substr( j, i - j ));
-
-					while ( i < len && ::isspace( str[i])) i++;
-					j = i;
-				}
-			}
-			if (j < len)
-			{
-				result.push_back( str.substr( j, len - j ));
-			}
-		}
-
-
-		//////////////////////////////////////////////////////////////////////////////////////////////
-		///
-		///
-		void rsplit_whitespace( const std::string & str, std::vector< std::string > & result, int maxsplit )
-		{
-			std::string::size_type len = str.size();
-			std::string::size_type i, j;
-			for (i = j = len; i > 0; )
-			{
-
-				while ( i > 0 && ::isspace( str[i - 1] ) ) i--;
-				j = i;
-
-				while ( i > 0 && ! ::isspace( str[i - 1]) ) i--;
-
-
-
-				if (j > i)
-				{
-					if ( maxsplit-- <= 0 ) break;
-
-					result.push_back( str.substr( i, j - i ));
-
-					while ( i > 0 && ::isspace( str[i - 1])) i--;
-					j = i;
-				}
-			}
-			if (j > 0)
-			{
-				result.push_back( str.substr( 0, j ));
-			}
-			//std::reverse( result, result.begin(), result.end() );
-			reverse_strings( result );
-		}
-
-	} //anonymous namespace
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void split( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
-    {
-        result.clear();
-
-        if ( maxsplit < 0 ) maxsplit = MAX_32BIT_INT;//result.max_size();
-
-
-        if ( sep.size() == 0 )
-        {
-            split_whitespace( str, result, maxsplit );
-            return;
-        }
-
-        std::string::size_type i,j, len = str.size(), n = sep.size();
-
-        i = j = 0;
-
-        while ( i+n <= len )
-        {
-            if ( str[i] == sep[0] && str.substr( i, n ) == sep )
-            {
-                if ( maxsplit-- <= 0 ) break;
-
-                result.push_back( str.substr( j, i - j ) );
-                i = j = i + n;
-            }
-            else
-            {
-                i++;
-            }
-        }
-
-        result.push_back( str.substr( j, len-j ) );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void rsplit( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
-    {
-        if ( maxsplit < 0 )
-        {
-            split( str, result, sep, maxsplit );
-            return;
-        }
-
-        result.clear();
-
-        if ( sep.size() == 0 )
-        {
-            rsplit_whitespace( str, result, maxsplit );
-            return;
-        }
-
-        Py_ssize_t i,j, len = (Py_ssize_t) str.size(), n = (Py_ssize_t) sep.size();
-
-        i = j = len;
-
-        while ( i >= n )
-        {
-            if ( str[i - 1] == sep[n - 1] && str.substr( i - n, n ) == sep )
-            {
-                if ( maxsplit-- <= 0 ) break;
-
-                result.push_back( str.substr( i, j - i ) );
-                i = j = i - n;
-            }
-            else
-            {
-                i--;
-            }
-        }
-
-        result.push_back( str.substr( 0, j ) );
-        reverse_strings( result );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    #define LEFTSTRIP 0
-    #define RIGHTSTRIP 1
-    #define BOTHSTRIP 2
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string do_strip( const std::string & str, int striptype, const std::string & chars  )
-    {
-        Py_ssize_t len = (Py_ssize_t) str.size(), i, j, charslen = (Py_ssize_t) chars.size();
-
-        if ( charslen == 0 )
-        {
-            i = 0;
-            if ( striptype != RIGHTSTRIP )
-            {
-                while ( i < len && ::isspace( str[i] ) )
-                {
-                    i++;
-                }
-            }
-
-            j = len;
-            if ( striptype != LEFTSTRIP )
-            {
-                do
-                {
-                    j--;
-                }
-                while (j >= i && ::isspace(str[j]));
-
-                j++;
-            }
-
-
-        }
-        else
-        {
-            const char * sep = chars.c_str();
-
-            i = 0;
-            if ( striptype != RIGHTSTRIP )
-            {
-                while ( i < len && memchr(sep, str[i], charslen) )
-                {
-                    i++;
-                }
-            }
-
-            j = len;
-            if (striptype != LEFTSTRIP)
-            {
-                do
-                {
-                    j--;
-                }
-                while (j >= i &&  memchr(sep, str[j], charslen)  );
-                j++;
-            }
-
-
-        }
-
-        if ( i == 0 && j == len )
-        {
-            return str;
-        }
-        else
-        {
-            return str.substr( i, j - i );
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void partition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
-    {
-        result.resize(3);
-        int index = find( str, sep );
-        if ( index < 0 )
-        {
-            result[0] = str;
-            result[1] = empty_string;
-            result[2] = empty_string;
-        }
-        else
-        {
-            result[0] = str.substr( 0, index );
-            result[1] = sep;
-            result[2] = str.substr( index + sep.size(), str.size() );
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void rpartition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
-    {
-        result.resize(3);
-        int index = rfind( str, sep );
-        if ( index < 0 )
-        {
-            result[0] = empty_string;
-            result[1] = empty_string;
-            result[2] = str;
-        }
-        else
-        {
-            result[0] = str.substr( 0, index );
-            result[1] = sep;
-            result[2] = str.substr( index + sep.size(), str.size() );
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string strip( const std::string & str, const std::string & chars )
-    {
-        return do_strip( str, BOTHSTRIP, chars );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string lstrip( const std::string & str, const std::string & chars )
-    {
-        return do_strip( str, LEFTSTRIP, chars );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string rstrip( const std::string & str, const std::string & chars )
-    {
-        return do_strip( str, RIGHTSTRIP, chars );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string join( const std::string & str, const std::vector< std::string > & seq )
-    {
-        std::vector< std::string >::size_type seqlen = seq.size(), i;
-
-        if ( seqlen == 0 ) return empty_string;
-        if ( seqlen == 1 ) return seq[0];
-
-        std::string result( seq[0] );
-
-        for ( i = 1; i < seqlen; ++i )
-        {
-            result += str + seq[i];
-
-        }
-
-
-        return result;
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    
-    namespace
-    {
-        /* Matches the end (direction >= 0) or start (direction < 0) of self
-         * against substr, using the start and end arguments. Returns
-         * -1 on error, 0 if not found and 1 if found.
-         */
-        
-        int _string_tailmatch(const std::string & self, const std::string & substr,
-                              Py_ssize_t start, Py_ssize_t end,
-                              int direction)
-        {
-            Py_ssize_t len = (Py_ssize_t) self.size();
-            Py_ssize_t slen = (Py_ssize_t) substr.size();
-            
-            const char* sub = substr.c_str();
-            const char* str = self.c_str();
-            
-            ADJUST_INDICES(start, end, len);
-            
-            if (direction < 0) {
-                // startswith
-                if (start+slen > len)
-                    return 0;
-            } else {
-                // endswith
-                if (end-start < slen || start > len)
-                    return 0;
-                if (end-slen > start)
-                    start = end - slen;
-            }
-            if (end-start >= slen)
-                return (!std::memcmp(str+start, sub, slen));
-            
-            return 0;
-        }
-    }
-    
-    bool endswith( const std::string & str, const std::string & suffix, int start, int end )
-    {
-        int result = _string_tailmatch(str, suffix,
-                                       (Py_ssize_t) start, (Py_ssize_t) end, +1);
-        //if (result == -1) // TODO: Error condition
-        
-        return static_cast<bool>(result);
-    }
-    
-    
-    bool startswith( const std::string & str, const std::string & prefix, int start, int end )
-    {
-        int result = _string_tailmatch(str, prefix,
-                                       (Py_ssize_t) start, (Py_ssize_t) end, -1);
-        //if (result == -1) // TODO: Error condition
-        
-        return static_cast<bool>(result);
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    bool isalnum( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-
-
-        if( len == 1 )
-        {
-            return ::isalnum( str[0] );
-        }
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( !::isalnum( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isalpha( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isalpha( (int) str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::isalpha( (int) str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isdigit( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isdigit( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( ! ::isdigit( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool islower( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::islower( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::islower( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isspace( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isspace( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::isspace( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool istitle( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-
-        if ( len == 0 ) return false;
-        if ( len == 1 ) return ::isupper( str[0] );
-
-        bool cased = false, previous_is_cased = false;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::isupper( str[i] ) )
-            {
-                if ( previous_is_cased )
-                {
-                    return false;
-                }
-
-                previous_is_cased = true;
-                cased = true;
-            }
-            else if ( ::islower( str[i] ) )
-            {
-                if (!previous_is_cased)
-                {
-                    return false;
-                }
-
-                previous_is_cased = true;
-                cased = true;
-
-            }
-            else
-            {
-                previous_is_cased = false;
-            }
-        }
-
-        return cased;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isupper( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isupper( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::isupper( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string capitalize( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-
-        if ( len > 0)
-        {
-            if (::islower(s[0])) s[0] = (char) ::toupper( s[0] );
-        }
-
-        for ( i = 1; i < len; ++i )
-        {
-            if (::isupper(s[i])) s[i] = (char) ::tolower( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string lower( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string upper( const std::string & str )
-    {
-        std::string s( str ) ;
-        std::string::size_type len = s.size(), i;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string swapcase( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
-            else if (::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string title( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-        bool previous_is_cased = false;
-
-        for ( i = 0; i < len; ++i )
-        {
-            int c = s[i];
-            if ( ::islower(c) )
-            {
-                if ( !previous_is_cased )
-                {
-                    s[i] = (char) ::toupper(c);
-                }
-                previous_is_cased = true;
-            }
-            else if ( ::isupper(c) )
-            {
-                if ( previous_is_cased )
-                {
-                    s[i] = (char) ::tolower(c);
-                }
-                previous_is_cased = true;
-            }
-            else
-            {
-                previous_is_cased = false;
-            }
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string translate( const std::string & str, const std::string & table, const std::string & deletechars )
-    {
-        std::string s;
-        std::string::size_type len = str.size(), dellen = deletechars.size();
-
-        if ( table.size() != 256 )
-        {
-            // TODO : raise exception instead
-            return str;
-        }
-
-        //if nothing is deleted, use faster code
-        if ( dellen == 0 )
-        {
-            s = str;
-            for ( std::string::size_type i = 0; i < len; ++i )
-            {
-                s[i] = table[ s[i] ];
-            }
-            return s;
-        }
-
-
-        int trans_table[256];
-        for ( int i = 0; i < 256; i++)
-        {
-            trans_table[i] = table[i];
-        }
-
-        for ( std::string::size_type i = 0; i < dellen; i++)
-        {
-            trans_table[(int) deletechars[i] ] = -1;
-        }
-
-        for ( std::string::size_type i = 0; i < len; ++i )
-        {
-            if ( trans_table[ (int) str[i] ] != -1 )
-            {
-                s += table[ str[i] ];
-            }
-        }
-
-        return s;
-
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string zfill( const std::string & str, int width )
-    {
-        int len = (int)str.size();
-
-        if ( len >= width )
-        {
-            return str;
-        }
-
-        std::string s( str );
-
-        int fill = width - len;
-
-        s = std::string( fill, '0' ) + s;
-
-
-        if ( s[fill] == '+' || s[fill] == '-' )
-        {
-            s[0] = s[fill];
-            s[fill] = '0';
-        }
-
-        return s;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string ljust( const std::string & str, int width )
-    {
-        std::string::size_type len = str.size();
-        if ( (( int ) len ) >= width ) return str;
-        return str + std::string( width - len, ' ' );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string rjust( const std::string & str, int width )
-    {
-        std::string::size_type len = str.size();
-        if ( (( int ) len ) >= width ) return str;
-        return std::string( width - len, ' ' ) + str;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string center( const std::string & str, int width )
-    {
-        int len = (int) str.size();
-        int marg, left;
-
-        if ( len >= width ) return str;
-
-        marg = width - len;
-        left = marg / 2 + (marg & width & 1);
-
-        return std::string( left, ' ' ) + str + std::string( marg - left, ' ' );
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string slice( const std::string & str, int start, int end )
-    {
-        ADJUST_INDICES(start, end, (int) str.size());
-        if ( start >= end ) return empty_string;
-        return str.substr( start, end - start );
-    }
-    
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int find( const std::string & str, const std::string & sub, int start, int end  )
-    {
-        ADJUST_INDICES(start, end, (int) str.size());
-        
-        std::string::size_type result = str.find( sub, start );
-        
-        // If we cannot find the string, or if the end-point of our found substring is past
-        // the allowed end limit, return that it can't be found.
-        if( result == std::string::npos || 
-           (result + sub.size() > (std::string::size_type)end) )
-        {
-            return -1;
-        }
-        
-        return (int) result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int index( const std::string & str, const std::string & sub, int start, int end  )
-    {
-        return find( str, sub, start, end );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int rfind( const std::string & str, const std::string & sub, int start, int end )
-    {
-        ADJUST_INDICES(start, end, (int) str.size());
-        
-        std::string::size_type result = str.rfind( sub, end );
-        
-        if( result == std::string::npos || 
-            result < (std::string::size_type)start  || 
-           (result + sub.size() > (std::string::size_type)end))
-            return -1;
-        
-        return (int)result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int rindex( const std::string & str, const std::string & sub, int start, int end )
-    {
-        return rfind( str, sub, start, end );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string expandtabs( const std::string & str, int tabsize )
-    {
-        std::string s( str );
-
-        std::string::size_type len = str.size(), i = 0;
-        int offset = 0;
-
-        int j = 0;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( str[i] == '\t' )
-            {
-
-                if ( tabsize > 0 )
-                {
-                    int fillsize = tabsize - (j % tabsize);
-                    j += fillsize;
-                    s.replace( i + offset, 1, std::string( fillsize, ' ' ));
-                    offset += fillsize - 1;
-                }
-                else
-                {
-                    s.replace( i + offset, 1, empty_string );
-                    offset -= 1;
-                }
-
-            }
-            else
-            {
-                j++;
-
-                if (str[i] == '\n' || str[i] == '\r')
-                {
-                    j = 0;
-                }
-            }
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int count( const std::string & str, const std::string & substr, int start, int end )
-    {
-        int nummatches = 0;
-        int cursor = start;
-
-        while ( 1 )
-        {
-            cursor = find( str, substr, cursor, end );
-
-            if ( cursor < 0 ) break;
-
-            cursor += (int) substr.size();
-            nummatches += 1;
-        }
-
-        return nummatches;
-
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    
-    std::string replace( const std::string & str, const std::string & oldstr, const std::string & newstr, int count )
-    {
-        int sofar = 0;
-        int cursor = 0;
-        std::string s( str );
-
-        std::string::size_type oldlen = oldstr.size(), newlen = newstr.size();
-        
-        cursor = find( s, oldstr, cursor );
-
-        while ( cursor != -1 && cursor <= (int)s.size() )
-        {
-            if ( count > -1 && sofar >= count )
-            {
-                break;
-            }
-
-            s.replace( cursor, oldlen, newstr );
-            cursor += (int) newlen;
-
-            if ( oldlen != 0)
-            {
-                cursor = find( s, oldstr, cursor );
-            }
-            else
-            {
-                ++cursor;
-            }
-
-            ++sofar;
-        }
-
-        return s;
-
-    }
-    
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void splitlines(  const std::string & str, std::vector< std::string > & result, bool keepends )
-    {
-        result.clear();
-        std::string::size_type len = str.size(), i, j, eol;
-
-         for (i = j = 0; i < len; )
-         {
-            while (i < len && str[i] != '\n' && str[i] != '\r') i++;
-
-            eol = i;
-            if (i < len)
-            {
-                if (str[i] == '\r' && i + 1 < len && str[i+1] == '\n')
-                {
-                    i += 2;
-                }
-                else
-                {
-                    i++;
-                }
-                if (keepends)
-                eol = i;
-
-            }
-
-            result.push_back( str.substr( j, eol - j ) );
-            j = i;
-
-        }
-
-        if (j < len)
-        {
-            result.push_back( str.substr( j, len - j ) );
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string mul( const std::string & str, int n )
-    {
-        // Early exits
-        if (n <= 0) return empty_string;
-        if (n == 1) return str;
-        
-        std::ostringstream os;
-        for(int i=0; i<n; ++i)
-        {
-            os << str;
-        }
-        return os.str();
-    }
-
-
-
-namespace os
-{
-namespace path
-{
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    /// These functions are C++ ports of the python2.6 versions of os.path,
-    /// and come from genericpath.py, ntpath.py, posixpath.py
-
-    /// Split a pathname into drive and path specifiers.
-    /// Returns drivespec, pathspec. Either part may be empty.
-    void splitdrive_nt(std::string & drivespec, std::string & pathspec,
-                       const std::string & p)
-    {
-        if (p.size() >= 2 && p[1] == ':')
-        {
-            std::string path = p; // In case drivespec == p
-            drivespec = pystring::slice(path, 0, 2);
-            pathspec = pystring::slice(path, 2);
-        }
-        else
-        {
-            drivespec = empty_string;
-            pathspec = p;
-        }
-    }
-
-    // On Posix, drive is always empty
-    void splitdrive_posix(std::string & drivespec, std::string & pathspec,
-                          const std::string & path)
-    {
-        drivespec = empty_string;
-        pathspec = path;
-    }
-
-    void splitdrive(std::string & drivespec, std::string & pathspec,
-                    const std::string & path)
-    {
-#ifdef WINDOWS
-        return splitdrive_nt(drivespec, pathspec, path);
-#else
-        return splitdrive_posix(drivespec, pathspec, path);
-#endif
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    // Test whether a path is absolute
-    // In windows, if the character to the right of the colon
-    // is a forward or backslash it's absolute.
-    bool isabs_nt(const std::string & path)
-    {
-        std::string drivespec, pathspec;
-        splitdrive_nt(drivespec, pathspec, path);
-        if(pathspec.empty()) return false;
-        return ((pathspec[0] == '/') || (pathspec[0] == '\\'));
-    }
-
-    bool isabs_posix(const std::string & s)
-    {
-        return pystring::startswith(s, forward_slash);
-    }
-
-    bool isabs(const std::string & path)
-    {
-#ifdef WINDOWS
-        return isabs_nt(path);
-#else
-        return isabs_posix(path);
-#endif
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    
-    std::string abspath_nt(const std::string & path, const std::string & cwd)
-    {
-        std::string p = path;
-        if(!isabs_nt(p)) p = join_nt(cwd, p);
-        return normpath_nt(p);
-    }
-    
-    std::string abspath_posix(const std::string & path, const std::string & cwd)
-    {
-        std::string p = path;
-        if(!isabs_posix(p)) p = join_posix(cwd, p);
-        return normpath_posix(p);
-    }
-    
-    std::string abspath(const std::string & path, const std::string & cwd)
-    {
-#ifdef WINDOWS
-        return abspath_nt(path, cwd);
-#else
-        return abspath_posix(path, cwd);
-#endif
-    }
-    
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    std::string join_nt(const std::vector< std::string > & paths)
-    {
-        if(paths.empty()) return empty_string;
-        if(paths.size() == 1) return paths[0];
-        
-        std::string path = paths[0];
-        
-        for(unsigned int i=1; i<paths.size(); ++i)
-        {
-            std::string b = paths[i];
-            
-            bool b_nts = false;
-            if(path.empty())
-            {
-                b_nts = true;
-            }
-            else if(isabs_nt(b))
-            {
-                // This probably wipes out path so far.  However, it's more
-                // complicated if path begins with a drive letter:
-                //     1. join('c:', '/a') == 'c:/a'
-                //     2. join('c:/', '/a') == 'c:/a'
-                // But
-                //     3. join('c:/a', '/b') == '/b'
-                //     4. join('c:', 'd:/') = 'd:/'
-                //     5. join('c:/', 'd:/') = 'd:/'
-                
-
-                if ((path.size() >= 2 && path[1] != ':') || (b.size() >= 2 && b[1] == ':'))
-                {
-                    // Path doesnt start with a drive letter
-                    b_nts = true;
-                }
-                // Else path has a drive letter, and b doesn't but is absolute.
-                else if((path.size()>3) || 
-                        ((path.size()==3) && !pystring::endswith(path, forward_slash) && !pystring::endswith(path, double_back_slash)))
-                {
-                    b_nts = true;
-                }
-            }
-            
-            if(b_nts)
-            {
-                path = b;
-            }
-            else
-            {
-                // Join, and ensure there's a separator.
-                // assert len(path) > 0
-                if( pystring::endswith(path, forward_slash) || pystring::endswith(path, double_back_slash))
-                {
-                    if(pystring::startswith(b,forward_slash) || pystring::startswith(b,double_back_slash))
-                    {
-                        path += pystring::slice(b, 1);
-                    }
-                    else
-                    {
-                        path += b;
-                    }
-                }
-                else if(pystring::endswith(path, colon))
-                {
-                    path += b;
-                }
-                else if(!b.empty())
-                {
-                    if(pystring::startswith(b, forward_slash) || pystring::startswith(b,double_back_slash))
-                    {
-                        path += b;
-                    }
-                    else
-                    {
-                        path += double_back_slash + b;
-                    }
-                }
-                else
-                {
-                    // path is not empty and does not end with a backslash,
-                    // but b is empty; since, e.g., split('a/') produces
-                    // ('a', ''), it's best if join() adds a backslash in
-                    // this case.
-                    path += double_back_slash;
-                }
-            }
-        }
-        
-        return path;
-    }
-    
-    // Join two or more pathname components, inserting double_back_slash as needed.
-    std::string join_nt(const std::string & a, const std::string & b)
-    {
-        std::vector< std::string > paths(2);
-        paths[0] = a;
-        paths[1] = b;
-        return join_nt(paths);
-    }
-
-    // Join pathnames.
-    // If any component is an absolute path, all previous path components
-    // will be discarded.
-    // Ignore the previous parts if a part is absolute.
-    // Insert a '/' unless the first part is empty or already ends in '/'.
-
-    std::string join_posix(const std::vector< std::string > & paths)
-    {
-        if(paths.empty()) return empty_string;
-        if(paths.size() == 1) return paths[0];
-        
-        std::string path = paths[0];
-        
-        for(unsigned int i=1; i<paths.size(); ++i)
-        {
-            std::string b = paths[i];
-            if(pystring::startswith(b, forward_slash))
-            {
-                path = b;
-            }
-            else if(path.empty() || pystring::endswith(path, forward_slash))
-            {
-                path += b;
-            }
-            else
-            {
-                path += forward_slash + b;
-            }
-        }
-        
-        return path;
-    }
-
-    std::string join_posix(const std::string & a, const std::string & b)
-    {
-        std::vector< std::string > paths(2);
-        paths[0] = a;
-        paths[1] = b;
-        return join_posix(paths);
-    }
-    
-    std::string join(const std::string & path1, const std::string & path2)
-    {
-#ifdef WINDOWS
-        return join_nt(path1, path2);
-#else
-        return join_posix(path1, path2);
-#endif
-    }
-
-
-    std::string join(const std::vector< std::string > & paths)
-    {
-#ifdef WINDOWS
-        return join_nt(paths);
-#else
-        return join_posix(paths);
-#endif
-    }
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-        
-    // Split a pathname.
-    // Return (head, tail) where tail is everything after the final slash.
-    // Either part may be empty
-
-    void split_nt(std::string & head, std::string & tail, const std::string & path)
-    {
-        std::string d, p;
-        splitdrive_nt(d, p, path);
-        
-        // set i to index beyond p's last slash
-        int i = (int)p.size();
-
-        // walk back to find the index of the first slash from the end       
-        while(i>0 && (p[i-1] != '\\') && (p[i-1] != '/'))
-        {
-            i = i - 1;
-        }
-
-        head = pystring::slice(p,0,i);
-        tail = pystring::slice(p,i); // now tail has no slashes
-        
-        // remove trailing slashes from head, unless it's all slashes
-        std::string head2 = head;
-        while(!head2.empty() && ((pystring::slice(head2,-1) == forward_slash) ||
-                                 (pystring::slice(head2,-1) == double_back_slash)))
-        {
-            head2 = pystring::slice(head2,0,-1);
-        }
-        
-        if(!head2.empty()) head = head2;
-        head = d + head;
-    }
-
-
-    // Split a path in head (everything up to the last '/') and tail (the
-    // rest).  If the path ends in '/', tail will be empty.  If there is no
-    // '/' in the path, head  will be empty.
-    // Trailing '/'es are stripped from head unless it is the root.
-
-    void split_posix(std::string & head, std::string & tail, const std::string & p)
-    {
-        int i = pystring::rfind(p, forward_slash) + 1;
-        
-        head = pystring::slice(p,0,i);
-        tail = pystring::slice(p,i);
-        
-        if(!head.empty() && (head != pystring::mul(forward_slash, (int) head.size())))
-        {
-            head = pystring::rstrip(head, forward_slash);
-        }
-    }
-
-    void split(std::string & head, std::string & tail, const std::string & path)
-    {
-#ifdef WINDOWS
-        return split_nt(head, tail, path);
-#else
-        return split_posix(head, tail, path);
-#endif
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    std::string basename_nt(const std::string & path)
-    {
-        std::string head, tail;
-        split_nt(head, tail, path);
-        return tail;
-    }
-
-    std::string basename_posix(const std::string & path)
-    {
-        std::string head, tail;
-        split_posix(head, tail, path);
-        return tail;
-    }
-
-    std::string basename(const std::string & path)
-    {
-#ifdef WINDOWS
-        return basename_nt(path);
-#else
-        return basename_posix(path);
-#endif
-    }
-
-    std::string dirname_nt(const std::string & path)
-    {
-        std::string head, tail;
-        split_nt(head, tail, path);
-        return head;
-    }
-    
-    std::string dirname_posix(const std::string & path)
-    {
-        std::string head, tail;
-        split_posix(head, tail, path);
-        return head;
-    }
-    
-    std::string dirname(const std::string & path)
-    {
-#ifdef WINDOWS
-        return dirname_nt(path);
-#else
-        return dirname_posix(path);
-#endif
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    // Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A\B.
-    std::string normpath_nt(const std::string & p)
-    {
-        std::string path = p;
-        path = pystring::replace(path, forward_slash,double_back_slash);
-        
-        std::string prefix;
-        splitdrive_nt(prefix, path, path);
-        
-        // We need to be careful here. If the prefix is empty, and the path starts
-        // with a backslash, it could either be an absolute path on the current
-        // drive (\dir1\dir2\file) or a UNC filename (\\server\mount\dir1\file). It
-        // is therefore imperative NOT to collapse multiple backslashes blindly in
-        // that case.
-        // The code below preserves multiple backslashes when there is no drive
-        // letter. This means that the invalid filename \\\a\b is preserved
-        // unchanged, where a\\\b is normalised to a\b. It's not clear that there
-        // is any better behaviour for such edge cases.
-        
-        if(prefix.empty())
-        {
-            // No drive letter - preserve initial backslashes
-            while(pystring::slice(path,0,1) == double_back_slash)
-            {
-                prefix = prefix + double_back_slash;
-                path = pystring::slice(path,1);
-            }
-        }
-        else
-        {
-            // We have a drive letter - collapse initial backslashes
-            if(pystring::startswith(path, double_back_slash))
-            {
-                prefix = prefix + double_back_slash;
-                path = pystring::lstrip(path, double_back_slash);
-            }
-        }
-        
-        std::vector<std::string> comps;
-        pystring::split(path, comps, double_back_slash);
-        
-        int i = 0;
-        
-        while(i<(int)comps.size())
-        {
-            if(comps[i].empty() || comps[i] == dot)
-            {
-                comps.erase(comps.begin()+i);
-            }
-            else if(comps[i] == double_dot)
-            {
-                if(i>0 && comps[i-1] != double_dot)
-                {
-                    comps.erase(comps.begin()+i-1, comps.begin()+i+1);
-                    i -= 1;
-                }
-                else if(i == 0 && pystring::endswith(prefix, double_back_slash))
-                {
-                    comps.erase(comps.begin()+i);
-                }
-                else
-                {
-                    i += 1;
-                }
-            }
-            else
-            {
-                i += 1;
-            }
-        }
-        
-        // If the path is now empty, substitute '.'
-        if(prefix.empty() && comps.empty())
-        {
-            comps.push_back(dot);
-        }
-        
-        return prefix + pystring::join(double_back_slash, comps);
-    }
-
-    // Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
-    // It should be understood that this may change the meaning of the path
-    // if it contains symbolic links!
-    // Normalize path, eliminating double slashes, etc.
-
-    std::string normpath_posix(const std::string & p)
-    {
-        if(p.empty()) return dot;
-        
-        std::string path = p;
-        
-        int initial_slashes = pystring::startswith(path, forward_slash) ? 1 : 0;
-        
-        // POSIX allows one or two initial slashes, but treats three or more
-        // as single slash.
-        
-        if (initial_slashes && pystring::startswith(path, double_forward_slash)
-            && !pystring::startswith(path, triple_forward_slash))
-            initial_slashes = 2;
-        
-        std::vector<std::string> comps, new_comps;
-        pystring::split(path, comps, forward_slash);
-        
-        for(unsigned int i=0; i<comps.size(); ++i)
-        {
-            std::string comp = comps[i];
-            if(comp.empty() || comp == dot)
-                continue;
-            
-            if( (comp != double_dot) || ((initial_slashes == 0) && new_comps.empty()) ||
-                (!new_comps.empty() && new_comps[new_comps.size()-1] == double_dot))
-            {
-                new_comps.push_back(comp);
-            }
-            else if (!new_comps.empty())
-            {
-                new_comps.pop_back();
-            }
-        }
-        
-        path = pystring::join(forward_slash, new_comps);
-        
-        if (initial_slashes > 0)
-            path = pystring::mul(forward_slash, initial_slashes) + path;
-        
-        if(path.empty()) return dot;
-        return path;
-    }
-    
-    std::string normpath(const std::string & path)
-    {
-#ifdef WINDOWS
-        return normpath_nt(path);
-#else
-        return normpath_posix(path);
-#endif
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    // Split the extension from a pathname.
-    // Extension is everything from the last dot to the end, ignoring
-    // leading dots.  Returns "(root, ext)"; ext may be empty.
-    // It is always true that root + ext == p
-
-    void splitext_generic(std::string & root, std::string & ext,
-                          const std::string & p,
-                          const std::string & sep,
-                          const std::string & altsep,
-                          const std::string & extsep)
-    {
-        int sepIndex = pystring::rfind(p, sep);
-        if(!altsep.empty())
-        {
-            int altsepIndex = pystring::rfind(p, altsep);
-            sepIndex = std::max(sepIndex, altsepIndex);
-        }
-
-        int dotIndex = pystring::rfind(p, extsep);
-        if(dotIndex > sepIndex)
-        {
-            // Skip all leading dots
-            int filenameIndex = sepIndex + 1;
-
-            while(filenameIndex < dotIndex)
-            {
-                if(pystring::slice(p,filenameIndex) != extsep)
-                {
-                    root = pystring::slice(p, 0, dotIndex);
-                    ext = pystring::slice(p, dotIndex);
-                    return;
-                }
-
-                filenameIndex += 1;
-            }
-        }
-
-        root = p;
-        ext = empty_string;
-    }
-
-    void splitext_nt(std::string & root, std::string & ext, const std::string & path)
-    {
-        return splitext_generic(root, ext, path,
-                                double_back_slash, forward_slash, dot);
-    }
-
-    void splitext_posix(std::string & root, std::string & ext, const std::string & path)
-    {
-        return splitext_generic(root, ext, path,
-                                forward_slash, empty_string, dot);
-    }
-
-    void splitext(std::string & root, std::string & ext, const std::string & path)
-    {
-#ifdef WINDOWS
-        return splitext_nt(root, ext, path);
-#else
-        return splitext_posix(root, ext, path);
-#endif
-    }
-
-} // namespace path
-} // namespace os
-
-
-}//namespace pystring
-
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/pystring.h b/contrib/tinyusdz/tinyusdz_repo/src/external/pystring.h
deleted file mode 100644
index 35b64165e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/pystring.h
+++ /dev/null
@@ -1,431 +0,0 @@
-// Copyright Contributors to the Pystring project.
-// SPDX-License-Identifier: BSD-3-Clause
-// https://github.com/imageworks/pystring/blob/master/LICENSE
-
-
-#ifndef INCLUDED_PYSTRING_H
-#define INCLUDED_PYSTRING_H
-
-#include <string>
-#include <vector>
-
-namespace pystring
-{
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @mainpage pystring
-    ///
-    /// This is a set of functions matching the interface and behaviors of python string methods
-    /// (as of python 2.3) using std::string.
-    ///
-    /// Overlapping functionality ( such as index and slice/substr ) of std::string is included
-    /// to match python interfaces.
-    ///
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @defgroup functions pystring
-    /// @{
-
-
-    #define MAX_32BIT_INT 2147483647
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string with only its first character capitalized.
-    ///
-    std::string capitalize( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return centered in a string of length width. Padding is done using spaces.
-    ///
-    std::string center( const std::string & str, int width );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return the number of occurrences of substring sub in string S[start:end]. Optional
-    /// arguments start and end are interpreted as in slice notation.
-    ///
-    int count( const std::string & str, const std::string & substr, int start = 0, int end = MAX_32BIT_INT);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return True if the string ends with the specified suffix, otherwise return False. With
-    /// optional start, test beginning at that position. With optional end, stop comparing at that position.
-    ///
-    bool endswith( const std::string & str, const std::string & suffix, int start = 0, int end = MAX_32BIT_INT );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string where all tab characters are expanded using spaces. If tabsize
-    /// is not given, a tab size of 8 characters is assumed.
-    ///
-    std::string expandtabs( const std::string & str, int tabsize = 8);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return the lowest index in the string where substring sub is found, such that sub is
-    /// contained in the range [start, end). Optional arguments start and end are interpreted as
-    /// in slice notation. Return -1 if sub is not found.
-    ///
-    int find( const std::string & str, const std::string & sub, int start = 0, int end = MAX_32BIT_INT  );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Synonym of find right now. Python version throws exceptions. This one currently doesn't
-    ///
-    int index( const std::string & str, const std::string & sub, int start = 0, int end = MAX_32BIT_INT  );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return true if all characters in the string are alphanumeric and there is at least one
-    /// character, false otherwise.
-    ///
-    bool isalnum( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return true if all characters in the string are alphabetic and there is at least one
-    /// character, false otherwise
-    ///
-    bool isalpha( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return true if all characters in the string are digits and there is at least one
-    /// character, false otherwise.
-    ///
-    bool isdigit( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return true if all cased characters in the string are lowercase and there is at least one
-    /// cased character, false otherwise.
-    ///
-    bool islower( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return true if there are only whitespace characters in the string and there is at least
-    /// one character, false otherwise.
-    ///
-    bool isspace( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return true if the string is a titlecased string and there is at least one character,
-    /// i.e. uppercase characters may only follow uncased characters and lowercase characters only
-    /// cased ones. Return false otherwise.
-    ///
-    bool istitle( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return true if all cased characters in the string are uppercase and there is at least one
-    /// cased character, false otherwise.
-    ///
-    bool isupper( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a string which is the concatenation of the strings in the sequence seq.
-    /// The separator between elements is the str argument
-    ///
-    std::string join( const std::string & str, const std::vector< std::string > & seq );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return the string left justified in a string of length width. Padding is done using
-    /// spaces. The original string is returned if width is less than str.size().
-    ///
-    std::string ljust( const std::string & str, int width );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string converted to lowercase.
-    ///
-    std::string lower( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string with leading characters removed. If chars is omitted or None,
-    /// whitespace characters are removed. If given and not "", chars must be a string; the
-    /// characters in the string will be stripped from the beginning of the string this method
-    /// is called on (argument "str" ).
-    ///
-    std::string lstrip( const std::string & str, const std::string & chars = "" );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string, concatenated N times, together.
-    /// Corresponds to the __mul__ operator.
-    /// 
-    std::string mul( const std::string & str, int n);
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Split the string around first occurance of sep.
-    /// Three strings will always placed into result. If sep is found, the strings will
-    /// be the text before sep, sep itself, and the remaining text. If sep is
-    /// not found, the original string will be returned with two empty strings.
-    ///
-    void partition( const std::string & str, const std::string & sep, std::vector< std::string > & result );
-    inline std::vector< std::string > partition( const std::string & str, const std::string & sep )
-    {
-        std::vector< std::string > result;
-        partition( str, sep, result );
-        return result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string with all occurrences of substring old replaced by new. If
-    /// the optional argument count is given, only the first count occurrences are replaced.
-    ///
-    std::string replace( const std::string & str, const std::string & oldstr, const std::string & newstr, int count = -1);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return the highest index in the string where substring sub is found, such that sub is
-    /// contained within s[start,end]. Optional arguments start and end are interpreted as in
-    /// slice notation. Return -1 on failure.
-    ///
-    int rfind( const std::string & str, const std::string & sub, int start = 0, int end = MAX_32BIT_INT );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Currently a synonym of rfind. The python version raises exceptions. This one currently
-    /// does not
-    ///
-    int rindex( const std::string & str, const std::string & sub, int start = 0, int end = MAX_32BIT_INT );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return the string right justified in a string of length width. Padding is done using
-    /// spaces. The original string is returned if width is less than str.size().
-    ///
-    std::string rjust( const std::string & str, int width);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Split the string around last occurance of sep.
-    /// Three strings will always placed into result. If sep is found, the strings will
-    /// be the text before sep, sep itself, and the remaining text. If sep is
-    /// not found, the original string will be returned with two empty strings.
-    ///
-    void rpartition( const std::string & str, const std::string & sep, std::vector< std::string > & result );
-    inline std::vector< std::string > rpartition ( const std::string & str, const std::string & sep )
-    {
-        std::vector< std::string > result;
-        rpartition( str, sep, result );
-        return result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string with trailing characters removed. If chars is "", whitespace
-    /// characters are removed. If not "", the characters in the string will be stripped from the
-    /// end of the string this method is called on.
-    ///
-    std::string rstrip( const std::string & str, const std::string & chars = "" );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Fills the "result" list with the words in the string, using sep as the delimiter string.
-    /// If maxsplit is > -1, at most maxsplit splits are done. If sep is "",
-    /// any whitespace string is a separator.
-    ///
-    void split( const std::string & str, std::vector< std::string > & result, const std::string & sep = "", int maxsplit = -1);
-    inline std::vector< std::string > split( const std::string & str, const std::string & sep = "", int maxsplit = -1)
-    {
-        std::vector< std::string >  result;
-        split( str, result, sep, maxsplit );
-        return result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Fills the "result" list with the words in the string, using sep as the delimiter string.
-    /// Does a number of splits starting at the end of the string, the result still has the
-    /// split strings in their original order.
-    /// If maxsplit is > -1, at most maxsplit splits are done. If sep is "",
-    /// any whitespace string is a separator.
-    ///
-    void rsplit( const std::string & str, std::vector< std::string > & result, const std::string & sep = "", int maxsplit = -1);
-    inline std::vector< std::string > rsplit( const std::string & str, const std::string & sep = "", int maxsplit = -1)
-    {
-        std::vector< std::string > result;
-        rsplit( str, result, sep, maxsplit);
-        return result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a list of the lines in the string, breaking at line boundaries. Line breaks
-    /// are not included in the resulting list unless keepends is given and true.
-    ///
-    void splitlines(  const std::string & str, std::vector< std::string > & result, bool keepends = false );
-    inline std::vector< std::string > splitlines(  const std::string & str, bool keepends = false )
-    {
-        std::vector< std::string > result;
-        splitlines( str, result, keepends);
-        return result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return True if string starts with the prefix, otherwise return False. With optional start,
-    /// test string beginning at that position. With optional end, stop comparing string at that
-    /// position
-    ///
-    bool startswith( const std::string & str, const std::string & prefix, int start = 0, int end = MAX_32BIT_INT );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string with leading and trailing characters removed. If chars is "",
-    /// whitespace characters are removed. If given not "",  the characters in the string will be
-    /// stripped from the both ends of the string this method is called on.
-    ///
-    std::string strip( const std::string & str, const std::string & chars = "" );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string with uppercase characters converted to lowercase and vice versa.
-    ///
-    std::string swapcase( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a titlecased version of the string: words start with uppercase characters,
-    /// all remaining cased characters are lowercase.
-    ///
-    std::string title( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string where all characters occurring in the optional argument
-    /// deletechars are removed, and the remaining characters have been mapped through the given
-    /// translation table, which must be a string of length 256.
-    ///
-    std::string translate( const std::string & str, const std::string & table, const std::string & deletechars = "");
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a copy of the string converted to uppercase.
-    ///
-    std::string upper( const std::string & str );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return the numeric string left filled with zeros in a string of length width. The original
-    /// string is returned if width is less than str.size().
-    ///
-    std::string zfill( const std::string & str, int width );
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief function matching python's slice functionality.
-    ///
-    std::string slice( const std::string & str, int start = 0, int end = MAX_32BIT_INT);
-
-    ///
-    /// @ }
-    ///
-
-
-namespace os
-{
-namespace path
-{
-    // All of the function below have three versions.
-    // Example:
-    //   join(...)
-    //   join_nt(...)
-    //   join_posix(...)
-    //
-    // The regular function dispatches to the other versions - based on the OS
-    // at compile time - to match the result you'd get from the python
-    // interepreter on the same operating system
-    // 
-    // Should you want to 'lock off' to a particular version of the string
-    // manipulation across *all* operating systems, use the version with the
-    // _OS you are interested in.  I.e., you can use posix style path joining,
-    // even on Windows, with join_posix.
-    //
-    // The naming, (nt, posix) matches the cpython source implementation.
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @defgroup functions pystring::os::path
-    /// @{
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return the base name of pathname path. This is the second half of the pair returned
-    /// by split(path). Note that the result of this function is different from the Unix basename
-    /// program; where basename for '/foo/bar/' returns 'bar', the basename() function returns an
-    /// empty string ('').
-    
-    std::string basename(const std::string & path);
-    std::string basename_nt(const std::string & path);
-    std::string basename_posix(const std::string & path);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return the directory name of pathname path. This is the first half of the pair
-    /// returned by split(path).
-    
-    std::string dirname(const std::string & path);
-    std::string dirname_nt(const std::string & path);
-    std::string dirname_posix(const std::string & path);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return True if path is an absolute pathname. On Unix, that means it begins with a
-    /// slash, on Windows that it begins with a (back)slash after chopping off a potential drive
-    /// letter.
-
-    bool isabs(const std::string & path);
-    bool isabs_nt(const std::string & path);
-    bool isabs_posix(const std::string & s);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Return a normalized absolutized version of the pathname path.
-    /// 
-    /// NOTE: This differs from the interface of the python equivalent in that it requires you
-    /// to pass in the current working directory as an argument.
-    
-    std::string abspath(const std::string & path, const std::string & cwd);
-    std::string abspath_nt(const std::string & path, const std::string & cwd);
-    std::string abspath_posix(const std::string & path, const std::string & cwd);
-    
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Join one or more path components intelligently. If any component is an absolute
-    /// path, all previous components (on Windows, including the previous drive letter, if there
-    /// was one) are thrown away, and joining continues. The return value is the concatenation of
-    /// path1, and optionally path2, etc., with exactly one directory separator (os.sep) inserted
-    /// between components, unless path2 is empty. Note that on Windows, since there is a current
-    /// directory for each drive, os.path.join("c:", "foo") represents a path relative to the
-    /// current directory on drive C: (c:foo), not c:\foo.
-    
-    /// This dispatches based on the compilation OS
-    std::string join(const std::string & path1, const std::string & path2);
-    std::string join_nt(const std::string & path1, const std::string & path2);
-    std::string join_posix(const std::string & path1, const std::string & path2);
-    
-    std::string join(const std::vector< std::string > & paths);
-    std::string join_nt(const std::vector< std::string > & paths);
-    std::string join_posix(const std::vector< std::string > & paths);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Normalize a pathname. This collapses redundant separators and up-level references
-    /// so that A//B, A/B/, A/./B and A/foo/../B all become A/B. It does not normalize the case
-    /// (use normcase() for that). On Windows, it converts forward slashes to backward slashes.
-    /// It should be understood that this may change the meaning of the path if it contains
-    /// symbolic links!
-
-    std::string normpath(const std::string & path);
-    std::string normpath_nt(const std::string & path);
-    std::string normpath_posix(const std::string & path);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Split the pathname path into a pair, (head, tail) where tail is the last pathname
-    /// component and head is everything leading up to that. The tail part will never contain a
-    /// slash; if path ends in a slash, tail will be empty. If there is no slash in path, head
-    /// will be empty. If path is empty, both head and tail are empty. Trailing slashes are
-    /// stripped from head unless it is the root (one or more slashes only). In all cases,
-    /// join(head, tail) returns a path to the same location as path (but the strings may
-    /// differ).
-
-    void split(std::string & head, std::string & tail, const std::string & path);
-    void split_nt(std::string & head, std::string & tail, const std::string & path);
-    void split_posix(std::string & head, std::string & tail, const std::string & path);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Split the pathname path into a pair (drive, tail) where drive is either a drive
-    /// specification or the empty string. On systems which do not use drive specifications,
-    /// drive will always be the empty string. In all cases, drive + tail will be the same as
-    /// path.
-    
-    void splitdrive(std::string & drivespec, std::string & pathspec, const std::string & path);
-    void splitdrive_nt(std::string & drivespec, std::string & pathspec, const std::string & p);
-    void splitdrive_posix(std::string & drivespec, std::string & pathspec, const std::string & path);
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    /// @brief Split the pathname path into a pair (root, ext) such that root + ext == path, and
-    /// ext is empty or begins with a period and contains at most one period. Leading periods on
-    /// the basename are ignored; splitext('.cshrc') returns ('.cshrc', '').
-
-    void splitext(std::string & root, std::string & ext, const std::string & path);
-    void splitext_nt(std::string & root, std::string & ext, const std::string & path);
-    void splitext_posix(std::string & root, std::string & ext, const std::string & path);
-    
-    ///
-    /// @ }
-    ///
-} // namespace path
-} // namespace os
-
-} // namespace pystring
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/LICENSE_1_0.txt b/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/LICENSE_1_0.txt
deleted file mode 100644
index 36b7cd93c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/LICENSE_1_0.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/README.md b/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/README.md
deleted file mode 100644
index 6c118d3cf..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/README.md
+++ /dev/null
@@ -1,371 +0,0 @@
-# Simple, Extensible C++ Pattern Matching Library
-
-I have recently been looking at Haskell and Rust. One of the things I wanted in C++ from those languages is pattern matching.
-
-Here is an example from the Rustlang Book (http://static.rust-lang.org/doc/master/book/match.html)
-
-```rust
-match x {
-    1 => println!("one"),
-    2 => println!("two"),
-    3 => println!("three"),
-    4 => println!("four"),
-    5 => println!("five"),
-    _ => println!("something else"),
-}
-```
-There is currently a C++ Library Mach7 that does pattern matching (https://github.com/solodon4/Mach7), however it is big, complicated, and uses a lot of macros. I wanted to see if I could use C++14 to write a simple implementation without macros.
-
-This library is the result of that effort. If you are familiar with C++14 especially variadic templates, forwarding, and tuples, this library and implementation should be easy for you to understand and extend.
-
-## Usage
-You will need a C++14 compiler. I have used the latest Visual C++ 2015 CTP, GCC 4.9.2, and Clang 3.5 to test this library.
-
-The library consists of 2 headers. `simple_match.hpp` which is the core of the library, and `some_none.hpp` which contains code that lets you match on raw pointers, and unique_ptr, and shared_ptr.
-
-Here is a simple excerpt. Assume you have included simple_match.hpp
-
-```cpp
-using namespace simple_match;
-using namespace simple_match::placeholders;
-
-int x = 0;
-
-while (true) {
-	std::cin >> x;
-	match(x,
-		1, []() {std::cout << "The answer is one\n"; },
-		2, []() {std::cout << "The answer is two\n"; },
-		_x < 10, [](auto&& a) {std::cout << "The answer " << a << " is less than 10\n"; },
-		10 < _x < 20,	[](auto&& a) {std::cout << "The answer " << a  << " is between 10 and 20 exclusive\n"; },
-		_, []() {std::cout << "Did not match\n"; }
-	);
-}
-```
-
-## Example Files
-There are 2 files under the test directory: `test.cpp` and `cppcon-matching.cpp`. `test.cpp` contains just some simple tests of matching. `cppcon-matching.cpp`contains the example from Mach7 that was presented at cppcon.
-
-## Extending
-There are 2 points of customization provided in namespace `simple_matcher::customization`. They are
-```cpp
-template<class T, class U>
-struct matcher;
-```
-
-and
-
-```cpp
-template<class Type>
-struct tuple_adapter;
-```
-## License
-Licensed under the Boost Software License.
-
-## Tutorial
-
-We are going to assume you have the following at the top of your file
-
-```cpp
-#include "simple_match/simple_match.hpp"
-
-
-using namespace simple_match;
-using namespace simple_match::placeholders;
-```
-
-Here is how to match exactly
-
-```cpp
-int i = 0;
-match(i,
-	1, [](){std::cout << "The answer is one";}
-	2, [](){std::cout << "The answer is two";}
-	otherwise, [](){std::cout << "Did not match"}
-);
-```
-The match function will try matching from top to bottom and run the lamba corresponding to the first successful match. `otherwise` always matches, and therefore you should have it at the end. If you find `otherwise` too long, you can also use `_`. It is located in the namespace `simple_match::placeholders`
-
-Match also works for strings.
-```
-std::string s = "";
-
-match(s,
-	"Hello", [](){ std::cout << " You said hello\n";},
-	_, [](){std::cout << "I do not know what you said\n";} // _ is the same as otherwise
-);
-
-```
-
-
-You can even return values from a match
-
-```cpp
-char digit = '0';
-
-int value = match(digit,
-	'0', [](){return 0;},
-	'1', [](){return 1;},
-	'2', [](){return 2;},
-	'3', [](){return 3;},
-	'4', [](){return 4;},
-	'5', [](){return 5;},
-// and so on
-);
-```
-
-We can also do comparisons, and ranges. To do so use `_x` from the `simple_match::placeholders` namespace.
-
-```cpp
-int i = 0;
-match(i,
-	_x < 0, [](int x){std::cout << x << " is a negative number\n";},
-	1 < _x < 10, [](int z){std::cout << z << " is between 1 and 10\n"},
-	_x, [](int x){std::cout << x << " is the value\n";}
-);
-
-```
-There are a some items of interest in the above example. When `_x` is used, it passes its value to the lambda. If `_x` is used without any comparison, it will pass the value to the lambda. Also, because of the way it is overloaded, it is very easy to make ranges using the `<` or `<=` operator as seen in the match above.
-
-### Tuples
-
-Now we can even have more fun! Let's represent a 2d point as a tuple.
-
-```cpp
-std::tuple<int,int> p(0,0);
-
-match(p,
-	ds(0,0), [](){std::cout << "Point is at the origin";},
-	ds(0,_), [](){std::cout << "Point is on the horizontal axis";},
-	ds(_,0), [](){std::cout << "Point is on the vertical axis";}.
-	ds(_x < 10,_), [](int x){std::cout << x << " is less than 10";},
-	ds(_x,_x), [](int x, int y){ std::cout << x << "," << y << " Is not on an axis";}
-);
-```
-
-`ds` stands for de-structure and splits a tuple into its parts. Notice you can use the same expressions as you could without tuples. As before `_x` results in a value being passed to the lambda. `_` matches anything and ignores it, so no corresponding variable is passed to the lambda.
-
-We can actually use `ds` to deconstruct our own `struct`s and `class`es .
-First we have to specialize `simple_match::customization::tuple_adapter` for our type.
-
-```cpp
-struct point {
-	int x;
-	int y;
-	point(int x_,int y_):x(x_),y(y_){}
-};
-
-// Adapting point to be used with ds
-namespace simple_match {
-	namespace customization {
-		template<>
-		struct tuple_adapter<point>{
-
-			enum { tuple_len = 2 };
-
-			template<size_t I, class T>
-			static decltype(auto) get(T&& t) {
-				return std::get<I>(std::tie(t.x,t.y));
-			}
-		};
-	}
-}
-```
-
-Then we can use `ds` like we did with a tuple.
-
-```cpp
-point p{0,0};
-
-match(p,
-	ds(0,0), [](){std::cout << "Point is at the origin";},
-	ds(0,_), [](){std::cout << "Point is on the horizontal axis";},
-	ds(_,0), [](){std::cout << "Point is on the vertical axis";}.
-	ds(_x < 10,_), [](int x){std::cout << x << " is less than 10";},
-	ds(_x,_x), [](int x, int y){ std::cout << x << "," << y << " Is not on an axis";}
-);
-```
-
-### Pointers as option types
-Sometimes we have pointer that we want to get a value safely out of. To do this we can use `some` and `none` . To do this we have to include `simple_match/some_none.hpp`
-
-Let us use the same `point` as before
-
-```cpp
-point* pp = new point(0,0);
-
-match(pp,
-	some(), [](point& p){std::cout << p.x << " is the x-value";}
-	none(), [](){std::cout << "Null pointer\n";}
-);
-```
-
-Notice how `some()` converted the pointer to a reference and passed it to us.
-
-Now, that is now how we should allocate memory with a naked new. We would probably use a `std::unique_ptr`. `some` has built in support for `unique_ptr` and `shared_ptr`. So we can write it like this.
-
-```cpp
-auto pp = std::make_unique<point>(0,0);
-
-match(pp,
-	some(), [](point& p){std::cout << p.x << " is the x-value";}
-	none(), [](){std::cout << "Null pointer\n";}
-);
-```
-Notice, how our match code did not change.
-
-We can do better because `some` composes. Since we specialized `tuple_adapter` we can use `ds` with `point`.
-
-```cpp
-auto pp = std::make_unique<point>(0,0);
-
-match(pp,
-	some(ds(0,0)), [](){std::cout << "Point is at the origin";},
-	some(ds(0,_)), [](){std::cout << "Point is on the horizontal axis";},
-	some(ds(_,0)), [](){std::cout << "Point is on the vertical axis";}.
-	some(ds(_x < 10,_)), [](int x){std::cout << x << " is less than 10";},
-	some(ds(_x,_x)), [](int x, int y){ std::cout << x << "," << y << " Is not on an axis";},
-	none(), [](){std::cout << "Null pointer";}
-);
-```
-Notice how `some` and `ds` compose. If we wanted to to, we could have pointers in tuples, and tuples in pointers and it would just work.
-
-`some` can also use RTTI to do downcasting.
-
-Here is an example. We will now make `point` a base class and have point2d, and point3d as subclasses, and adapt them.
-
-```cpp
-struct point{
-	virtual ~point(){}
-};
-
-struct point2d:point{
-	int x;
-	int y;
-	point2d(int x_,int y_):x(x_),y(y_){}
-};
-
-struct point3d:point{
-	int x;
-	int y;
-	int z;
-	point3d(int x_,int y_, int z_):x(x_),y(y_),z(z_){}
-};
-
-// Adapting point2d and point3d to be used with ds
-namespace simple_match {
-	namespace customization {
-		template<>
-		struct tuple_adapter<point2d>{
-
-			enum { tuple_len = 2 };
-
-			template<size_t I, class T>
-			static decltype(auto) get(T&& t) {
-				return std::get<I>(std::tie(t.x,t.y));
-			}
-		};
-		template<>
-		struct tuple_adapter<point3d>{
-
-			enum { tuple_len = 3 };
-
-			template<size_t I, class T>
-			static decltype(auto) get(T&& t) {
-				return std::get<I>(std::tie(t.x,t.y,t.z));
-			}
-		};
-	}
-}
-```
-
-Then we can use it like this
-
-```cpp
-std::unique_ptr<point> pp(new point2d(0,0));
-
-match(pp,
-	some<point2d>(ds(_x,_x)), [](int x, int y){std::cout << x << "," << y;},
-	some<point3d>(ds(_x,_x,_x)), [](int x, int y, int z){std::cout << x << "," << y << "," << z;},
-	some(), [](point& p){std::cout << "Unknown point type\n"},
-	none(), [](){std::cout << "Null pointer\n"}
-);
-
-```
-
-Notice how we can safely downcast, and use `ds` to destructure the `point`. Everything composes nicely.
-
-# Implementation Details
-
-simple_match actually was easier to implement than I thought it would be. I used the apply sample implementation from http://isocpp.org/files/papers/N3915.pdf to call a function with a tuple as arguments.
-
-Here is the core of the implementation
-
-```cpp
-template<class T, class U>
-bool match_check(T&& t, U&& u) {
-	using namespace customization;
-	using m = matcher<std::decay_t<T>, std::decay_t<U>>;
-	return m::check(std::forward<T>(t), std::forward<U>(u));
-}
-
-
-template<class T, class U>
-auto match_get(T&& t, U&& u) {
-	using namespace customization;
-	using m = matcher<std::decay_t<T>, std::decay_t<U>>;
-	return m::get(std::forward<T>(t), std::forward<U>(u));
-}
-
-template<class T, class A1, class F1>
-auto match(T&& t, A1&& a, F1&& f) {
-	if (match_check(std::forward<T>(t), std::forward<A1>(a))) {
-		return detail::apply(f, match_get(std::forward<T>(t), std::forward<A1>(a)));
-	}
-	else {
-		throw std::logic_error("No match");
-	}
-}
-
-
-template<class T, class A1, class F1, class A2, class F2, class... Args>
-auto match(T&& t, A1&& a, F1&& f, A2&& a2, F2&& f2, Args&&... args) {
-	if (match_check(t, a)) {
-		return detail::apply(f, match_get(std::forward<T>(t), std::forward<A1>(a)));
-	}
-	else {
-		return match(t, std::forward<A2>(a2), std::forward<F2>(f2), std::forward<Args>(args)...);
-	}
-}
-```
-
-`match` is a variadic function that takes the value to be matched, and then parameters for the match criteria, and lambda to be executed if the criteria succeeds. It goes through calling `match_check` until it returns true. Then it calls `match_get` to get a tuple of the values that need to be forwarded to the lambda, and uses apply to call the lambda.
-
-The match types are implemented by specializing `simple_match::customization::matcher`
-```cpp
-namespace customization {
-	template<class T, class U>
-	struct matcher;
-}
-```
-
-For an example, here is how the matcher that matches to values is implemented. Note, that it does not pass any values to the lambda and so returns an empty tuple.
-
-```cpp
-// Match same type
-template<class T>
-struct matcher<T, T> {
-	static bool check(const T& t, const T& v) {
-		return t == v;
-	}
-	static auto get(const T&, const T&) {
-		return std::tie();
-	}
-}
-```
-
-I hope you enjoy using this code, as much as I have enjoyed writing it. Please give me any feedback you may have.
-
--- John R. Bandela, MD
-
-> Written with [StackEdit](https://stackedit.io/).
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/include/simple_match/implementation/some_none.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/include/simple_match/implementation/some_none.hpp
deleted file mode 100644
index f43bb7918..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/include/simple_match/implementation/some_none.hpp
+++ /dev/null
@@ -1,369 +0,0 @@
-// Copyright 2015 John R. Bandela
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-#ifndef SIMPLE_MATCH_SOME_NONE_HPP_JRB_2015_03_21
-#define SIMPLE_MATCH_SOME_NONE_HPP_JRB_2015_03_21
-#include <memory>
-#include <type_traits>
-
-namespace simple_match {
-
-	namespace customization {
-
-		template<class Type>
-		struct pointer_getter {};
-
-
-	}
-
-	namespace detail {
-
-		template<class T, class C>
-		struct cv_helper_imp;
-
-		template<class T, class C>
-		struct cv_helper_imp<T*, C> {
-			using type = std::add_pointer_t<C>;
-		};
-
-		template<class T, class C>
-		struct cv_helper_imp<const T*, C> {
-			using type = std::add_pointer_t<std::add_const_t<C>>;
-		};
-
-		template<class T, class C>
-		struct cv_helper_imp<volatile T*, C> {
-			using type = std::add_pointer_t<std::add_volatile_t<C>>;
-		};
-
-		template<class T, class C>
-		struct cv_helper_imp<const volatile T*, C> {
-			using type = std::add_pointer_t<std::add_cv_t<C>>;
-		};
-
-	}
-	namespace utils {
-		template<class T, class C>
-		using cv_helper = typename detail::cv_helper_imp<T, C>::type;
-
-	}
-
-	namespace detail{
-
-
-		template<class Class, class Matcher>
-		struct some_t{
-			Matcher m_;
-
-			template<class T>
-			bool check(T&& t) {
-				auto ptr = customization::pointer_getter<std::decay_t<T>>::template get_pointer<Class>(std::forward<T>(t));
-				if (!ptr) {
-					return false;
-				}
-				return match_check(*ptr, m_);
-
-			}
-
-			template<class T>
-			auto get(T&& t) {
-				auto ptr = customization::pointer_getter<std::decay_t<T>>::template get_pointer<Class>(std::forward<T>(t));
-				return match_get(*ptr, m_);
-			}
-
-
-		};
-
-		template<class Matcher>
-		struct some_t<void,Matcher> {
-			Matcher m_;
-
-			template<class T>
-			bool check(T&& t) {
-				// If you get an error here, this means that some() without a type is not supported
-				// Examples of this are variants and boost::any
-				auto ptr = customization::pointer_getter<std::decay_t<T>>::get_pointer_no_cast(std::forward<T>(t));
-				if (!ptr) {
-					return false;
-				}
-				return match_check(*ptr, m_);
-
-			}
-
-			template<class T>
-			auto get(T&& t) {
-				auto ptr = (customization::pointer_getter<std::decay_t<T>>::get_pointer_no_cast(std::forward<T>(t)));
-				return match_get(*ptr, m_);
-			}
-
-
-		};
-
-		template<class Class>
-		struct some_t<Class,void> {
-
-			template<class T>
-			bool check(T&& t) {
-				auto ptr = customization::pointer_getter<std::decay_t<T>>::template get_pointer<Class>(std::forward<T>(t));
-				if (!ptr) {
-					return false;
-				}
-				return true;
-
-			}
-
-			template<class T>
-			auto get(T&& t) {
-				auto ptr = customization::pointer_getter<std::decay_t<T>>::template get_pointer<Class>(std::forward<T>(t));
-				return std::tie(*ptr);
-			}
-
-
-		};
-
-		template<>
-		struct some_t<void, void> {
-
-			template<class T>
-			bool check(T&& t) {
-				// If you get an error here, this means that some() without a type is not supported
-				// Examples of this are variants and boost::any
-				auto ptr = customization::pointer_getter<std::decay_t<T>>::get_pointer_no_cast(std::forward<T>(t));
-				if (!ptr) {
-					return false;
-				}
-				return true;
-
-			}
-
-			template<class T>
-			auto get(T&& t) {
-				auto ptr = customization::pointer_getter<std::decay_t<T>>::get_pointer_no_cast(std::forward<T>(t));
-				return std::tie(*ptr);
-			}
-
-
-		};
-
-
-		struct none_t{
-			template<class T>
-			bool check(T&& t) {
-				// If you get an error here, this means that none() is not supported
-				// Example is boost::variant which has a never empty guarantee
-				return customization::pointer_getter<std::decay_t<T>>::is_null(std::forward<T>(t));
-			}
-
-			template<class T>
-			auto get(T&&) {
-				return std::tie();
-			}
-		};
-
-	}
-	namespace customization {
-
-		template<class Type, class Class, class Matcher>
-		struct matcher<Type,detail::some_t<Class,Matcher>> {
-			template<class T, class U>
-			static bool check(T&& t, U&& u) {
-				return u.check(std::forward<T>(t));
-			}
-			template<class T, class U>
-			static auto get(T&& t, U&& u) {
-				return u.get(std::forward<T>(t));
-			}
-
-		};
-
-		template<class Type>
-		struct matcher<Type,detail::none_t> {
-			template<class T, class U>
-			static bool check(T&& t, U&& u) {
-				return u.check(std::forward<T>(t));
-			}
-			template<class T, class U>
-			static auto get(T&& t, U&& u) {
-				return u.get(std::forward<T>(t));
-			}
-
-		};
-	}
-	namespace customization {
-		template<class Type>
-		struct pointer_getter<Type*> {
-			template<class To>
-			static auto get_pointer(Type* t) {
-				return dynamic_cast<utils::cv_helper<decltype(t),To>>(t);
-			}
-			static auto get_pointer_no_cast(Type* t) {
-				return t;
-			}
-			static auto is_null(Type* t) {
-				return !t;
-			}
-		};
-
-
-		template<class Type>
-		struct pointer_getter<std::shared_ptr<Type>> {
-
-			template<class To, class T>
-			static auto get_pointer(T&& t) {
-				return dynamic_cast<utils::cv_helper<decltype(t.get()),To>>(t.get());
-			}
-			template<class T>
-			static auto get_pointer_no_cast(T&& t) {
-				return t.get();
-			}
-			template<class T>
-			static auto is_null(T&& t) {
-				return !t;
-			}
-		};
-
-		template<class Type, class D>
-		struct pointer_getter<std::unique_ptr<Type, D>> {
-			template<class To, class T>
-			static auto get_pointer(T&& t) {
-				return dynamic_cast<utils::cv_helper<decltype(t.get()),To>>(t.get());
-			}
-			template<class T>
-			static auto get_pointer_no_cast(T&& t) {
-				return t.get();
-			}
-			template<class T>
-			static auto is_null(T&& t) {
-				return !t;
-			}
-		};
-
-	}
-
-
-	inline detail::none_t none() { return detail::none_t{}; }
-
-	inline detail::some_t<void, void> some() { return detail::some_t<void, void>{}; }
-
-    // Make Matcher... a variadic template so it is a worse match than some<T>(T())
-	template<class... Matcher>
-	detail::some_t<void, Matcher...> some(Matcher&&... m) { return detail::some_t<void, Matcher...> { std::forward<Matcher>(m)... }; }
-
-	template<class Class, class Matcher>
-	detail::some_t<Class, Matcher> some(Matcher&& m) {
-		return detail::some_t<Class, Matcher> { std::forward<Matcher>(m) };
-	}
-	template<class Class>
-	detail::some_t<Class, void> some() {
-		return detail::some_t<Class, void>{ };
-	}
-
-
-	// exhaustiveness
-
-	namespace detail {
-
-		template<class T, class Tuple>
-		struct type_in_tuple {
-			static const bool value = false;
-		};
-		template<class T, class First, class... Rest>
-		struct type_in_tuple<T, std::tuple<First, Rest...>> {
-			static const bool value = type_in_tuple<T, std::tuple<Rest...>>::value;
-		};
-		template<class T, class... Rest>
-		struct type_in_tuple<T, std::tuple<T, Rest...>> {
-			static const bool value = true;
-		};
-		template<class T>
-		struct type_in_tuple<T, std::tuple<>> {
-			static const bool value = false;
-		};
-
-		template<class ArgTypes>
-		struct has_otherwise {
-			static const bool value = type_in_tuple<otherwise_t, ArgTypes>::value;
-		};
-
-		template<bool, class ArgTypes,class... RequiredTypes>
-		struct some_exhaustiveness_helper {
-			static const bool value = true;
-		};
-
-		template<class Tuple>
-		struct get_some_classes {};
-
-		template<>
-		struct get_some_classes<std::tuple<>> {
-			using type = std::tuple<>;
-		};
-
-		template<class First, class...Rest>
-		struct get_some_classes<std::tuple<First, Rest...>> {
-			using type = typename get_some_classes<std::tuple<Rest...>>::type;
-
-		};
-		template<class Class, class Matcher, class...Rest>
-		struct get_some_classes<std::tuple<some_t<Class,Matcher>, Rest...>> {
-			using type = cat_tuple_t<std::tuple<Class>, typename get_some_classes<std::tuple<Rest...>>::type>;
-
-		};
-
-		template<class SomeClasses, class... Required>
-		struct all_in {};
-
-		template<bool b, class Type>
-		struct not_in_match_asserter {
-			static const bool value = b;
-			static_assert(value, "This type is not in the match");
-		};
-
-		template<class SomeClasses, class First, class... Rest>
-		struct all_in<SomeClasses,First,Rest...> {
-			static const bool myvalue = type_in_tuple<First, SomeClasses>::value;
-			static const bool value = not_in_match_asserter<myvalue, First>::value&& all_in<SomeClasses, Rest...>::value;
-
-		};
-		template<class SomeClasses, class First>
-		struct all_in<SomeClasses,First> {
-			static const bool myvalue = type_in_tuple<First, SomeClasses>::value;
-//			static_assert(type_in_tuple<First, SomeClasses>::value, "This classes is not in the match");
-			static const bool value = not_in_match_asserter<myvalue, First>::value;
-
-		};
-
-
-
-		template<class ArgTypes, class... RequiredTypes>
-		struct some_exhaustiveness_helper<false,ArgTypes,RequiredTypes...> {
-			using some_classes = typename get_some_classes<ArgTypes>::type;
-			using a = all_in<some_classes, RequiredTypes...>;
-			static const bool value = a::value;
-		
-		
-		};
-
-
-
-
-
-
-	}
-
-	template<class... Types>
-	struct some_exhaustiveness {
-		template<class ArgTypes>
-		struct type {
-			static const bool v = detail::has_otherwise<ArgTypes>::value;
-			using seh = detail::some_exhaustiveness_helper<v, ArgTypes, Types...>;
-			static const bool value = seh::value;
-		};
-	};
-}
-
-
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/include/simple_match/simple_match.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/include/simple_match/simple_match.hpp
deleted file mode 100644
index fb79f2c9a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/include/simple_match/simple_match.hpp
+++ /dev/null
@@ -1,404 +0,0 @@
-// Copyright 2015 John R. Bandela
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-#ifndef SIMPLE_MATCH_HPP_JRB_2015_03_21
-#define SIMPLE_MATCH_HPP_JRB_2015_03_21
-
-//#include <stdexcept>
-#include <tuple>
-
-namespace simple_match {
-	using std::size_t;
-	namespace customization {
-		template<class T, class U>
-		struct matcher;
-
-	}
-
-	// Apply adapted from http://isocpp.org/files/papers/N3915.pdf
-	namespace detail {
-		template <typename F, typename Tuple, size_t... I>
-		decltype(auto) apply_impl(F&& f, Tuple&& t, std::integer_sequence<size_t, I...>) {
-			using namespace std;
-			return std::forward<F>(f)(get<I>(std::forward<Tuple>(t))...);
-		}
-		template <typename F, typename Tuple>
-		decltype(auto) apply(F&& f, Tuple&& t) {
-			using namespace std;
-			using Indices = make_index_sequence<tuple_size<decay_t<Tuple>>::value>;
-			return apply_impl(std::forward<F>(f), std::forward<Tuple>(t), Indices{});
-		}
-
-
-	}
-
-	// exhaustiveness
-	namespace detail {
-		template<class TA, class TB>
-		struct cat_tuple {};
-
-		template<class... A, class... B>
-		struct cat_tuple<std::tuple<A...>,std::tuple<B...>> {
-			using type = std::tuple<A..., B...>;
-
-		};
-
-		template<class TA, class TB>
-		using cat_tuple_t = typename cat_tuple<TA, TB>::type;
-
-		template<class... A>
-		struct arg_types {
-
-		};
-
-		template<class A, class F>
-		struct arg_types<A,F> {
-			using type = std::tuple<std::decay_t<A>>;
-		};
-
-
-		template<class A1, class F1, class A2, class F2, class... Args>
-		struct arg_types<A1, F1, A2, F2, Args...>{
-			using type = cat_tuple_t<std::tuple<std::decay_t<A1>, std::decay_t<A2>>, typename arg_types<Args...>::type>;
-
-		};
-
-		template<>
-		struct arg_types<>{
-			using type = std::tuple<>;
-
-		};
-
-
-	}
-	struct empty_exhaustiveness {
-		template<class ArgTypes>
-		struct type{
-			static const bool value = true;
-		};
-	};
-	namespace customization {
-
-		template<class T>
-		struct exhaustiveness_checker {
-			using type = empty_exhaustiveness;
-		};
-	}
-
-	// end exhaustiveness
-
-	template<class T, class U>
-	bool match_check(T&& t, U&& u) {
-		using namespace customization;
-		using m = matcher<std::decay_t<T>, std::decay_t<U>>;
-		return m::check(std::forward<T>(t), std::forward<U>(u));
-	}
-
-
-	template<class T, class U>
-	auto match_get(T&& t, U&& u) {
-		using namespace customization;
-		using m = matcher<std::decay_t<T>, std::decay_t<U>>;
-		return m::get(std::forward<T>(t), std::forward<U>(u));
-	}
-
-
-    //struct no_match :std::logic_error {
-    //    no_match() :logic_error{ "simple_match did not match" } {}
-    //};
-
-	namespace detail {
-
-		template<class T, class A1, class F1>
-		auto match_helper(T&& t, A1&& a, F1&& f) {
-			if (match_check(std::forward<T>(t), std::forward<A1>(a))) {
-				return detail::apply(f, match_get(std::forward<T>(t), std::forward<A1>(a)));
-			}
-			else {
-                //throw no_match{};
-                // tinyusdz: todo: report an error in another way.
-			}
-		}
-
-
-		template<class T, class A1, class F1, class A2, class F2, class... Args>
-		auto match_helper(T&& t, A1&& a, F1&& f, A2&& a2, F2&& f2, Args&&... args) {
-			if (match_check(t, a)) {
-				return detail::apply(f, match_get(std::forward<T>(t), std::forward<A1>(a)));
-			}
-			else {
-				return match_helper(t, std::forward<A2>(a2), std::forward<F2>(f2), std::forward<Args>(args)...);
-			}
-		}
-
-	}
-
-	template<class T, class... Args>
-	auto match(T&& t, Args&&... a) {
-		using atypes = typename detail::arg_types<Args...>::type;
-		using ec = typename customization::exhaustiveness_checker<std::decay_t<T>>::type;
-		using ctypes = typename ec::template type<atypes>;
-		static_assert(ctypes::value, "Not all types are tested for in match");
-		return detail::match_helper(std::forward<T>(t), std::forward<Args>(a)...);
-	}
-
-
-
-
-	struct otherwise_t {};
-
-	namespace placeholders {
-		const otherwise_t otherwise{};
-		const otherwise_t _{};
-	}
-
-	namespace customization {
-
-		// Match same type
-		template<class T>
-		struct matcher<T, T> {
-			static bool check(const T& t, const T& v) {
-				return t == v;
-			}
-			static auto get(const T&, const T&) {
-				return std::tie();
-			}
-
-		};
-		// Match string literals
-		template<class T>
-		struct matcher<T, const char*> {
-			static bool check(const T& t, const char* str) {
-				return t == str;
-			}
-			static auto get(const T&, const T&) {
-				return std::tie();
-			}
-		};
-
-
-
-
-		// Match otherwise
-		template<class Type>
-		struct matcher<Type, otherwise_t> {
-			template<class T>
-			static bool check(T&&, otherwise_t) {
-				return true;
-			}
-			template<class T>
-			static auto get(T&&, otherwise_t) {
-				return std::tie();
-			}
-
-		};
-
-
-
-	}
-	template<class F>
-	struct matcher_predicate {
-		F f_;
-	};
-
-	template<class F>
-	matcher_predicate<F> make_matcher_predicate(F&& f) {
-		return matcher_predicate<F>{std::forward<F>(f)};
-	}
-
-
-	namespace customization {
-
-
-		template<class Type, class F>
-		struct matcher<Type, matcher_predicate<F>> {
-			template<class T, class U>
-			static bool check(T&& t, U&& u) {
-				return u.f_(std::forward<T>(t));
-			}
-			template<class T, class U>
-			static auto get(T&& t, U&&) {
-				return std::tie(std::forward<T>(t));
-			}
-
-		};
-
-	}
-
-	namespace placeholders {
-		const auto _u = make_matcher_predicate([](auto&&) {return true; });
-		const auto _v = make_matcher_predicate([](auto&&) {return true; });
-		const auto _w = make_matcher_predicate([](auto&&) {return true; });
-		const auto _x = make_matcher_predicate([](auto&&) {return true; });
-		const auto _y = make_matcher_predicate([](auto&&) {return true; });
-		const auto _z = make_matcher_predicate([](auto&&) {return true; });
-
-		// relational operators
-		template<class F, class T>
-		auto operator==(const matcher_predicate<F>& m, const T& t) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && x == t; });
-		}
-
-		template<class F, class T>
-		auto operator!=(const matcher_predicate<F>& m, const T& t) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && x != t; });
-		}
-
-		template<class F, class T>
-		auto operator<=(const matcher_predicate<F>& m, const T& t) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && x <= t; });
-		}
-		template<class F, class T>
-		auto operator>=(const matcher_predicate<F>& m, const T& t) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && x >= t; });
-		}
-		template<class F, class T>
-		auto operator<(const matcher_predicate<F>& m, const T& t) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && x < t; });
-		}
-		template<class F, class T>
-		auto operator>(const matcher_predicate<F>& m, const T& t) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && x > t; });
-		}
-		template<class F>
-		auto operator!(const matcher_predicate<F>& m) {
-			return make_matcher_predicate([m](const auto& x) {return !m.f_(x); });
-		}
-
-		template<class F, class F2>
-		auto operator&&(const matcher_predicate<F>& m, const matcher_predicate<F2>& m2) {
-			return make_matcher_predicate([m, m2](const auto& x) {return m.f_(x) && m2.f_(x); });
-		}
-
-		template<class F, class F2>
-		auto operator||(const matcher_predicate<F>& m, const matcher_predicate<F2>& m2) {
-			return make_matcher_predicate([m, m2](const auto& x) {return m.f_(x) || m2.f_(x); });
-		}
-
-		template<class F, class T>
-		auto operator==(const T& t, const matcher_predicate<F>& m) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && t == x; });
-		}
-
-		template<class F, class T>
-		auto operator!=(const T& t, const matcher_predicate<F>& m) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && t != x; });
-		}
-
-		template<class F, class T>
-		auto operator<=(const T& t, const matcher_predicate<F>& m) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && t <= x; });
-		}
-		template<class F, class T>
-		auto operator>=(const T& t, const matcher_predicate<F>& m) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && t >= x; });
-		}
-		template<class F, class T>
-		auto operator<(const T& t, const matcher_predicate<F>& m) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && t < x; });
-		}
-		template<class F, class T>
-		auto operator>(const T& t, const matcher_predicate<F>& m) {
-			return make_matcher_predicate([m, &t](const auto& x) {return m.f_(x) && t > x; });
-		}
-
-	}
-
-	namespace detail {
-		// We use this class, so we can differentiate between matcher <T,T> and matchter <T,std::tuple<T...>
-		struct tuple_ignorer {};
-	}
-
-	namespace customization {
-
-		template<class... A>
-		const std::tuple<A...>& simple_match_get_tuple(const std::tuple<A...>& t) {
-			return t;
-		}
-
-        template<class... A>
-        std::tuple<A...>& simple_match_get_tuple(std::tuple<A...>& t) {
-            return t;
-        }
-
-		template<class Type>
-		struct tuple_adapter {
-
-
-			template<size_t I, class T>
-			static decltype(auto) get(T&& t) {
-				using namespace simple_match::customization;
-				return std::get<I>(simple_match_get_tuple(std::forward<T>(t)));
-			}
-		};
-
-		template<class Type, class... Args>
-		struct matcher<Type, std::tuple<Args...>> {
-			using tu = tuple_adapter<Type>;
-			enum { tuple_len = sizeof... (Args) - 1};
-			template<size_t pos, size_t last>
-			struct helper {
-				template<class T, class A>
-				static bool check(T&& t, A&& a) {
-					return match_check(tu::template get<pos>(std::forward<T>(t)), std::get<pos>(std::forward<A>(a)))
-						&& helper<pos + 1, last>::check(std::forward<T>(t), std::forward<A>(a));
-
-				}
-
-				template<class T, class A>
-				static auto get(T&& t, A&& a) {
-					return std::tuple_cat(match_get(tu::template get<pos>(std::forward<T>(t)), std::get<pos>(std::forward<A>(a))),
-						helper<pos + 1, last>::get(std::forward<T>(t), std::forward<A>(a)));
-
-				}
-			};
-
-			template<size_t pos>
-			struct helper<pos, pos> {
-				template<class T, class A>
-				static bool check(T&& t, A&& a) {
-					return match_check(tu::template get<pos>(std::forward<T>(t)), std::get<pos>(std::forward<A>(a)));
-
-				}
-				template<class T, class A>
-				static auto get(T&& t, A&& a) {
-					return match_get(tu::template get<pos>(std::forward<T>(t)), std::get<pos>(std::forward<A>(a)));
-
-				}
-			};
-
-
-			template<class T, class A>
-			static bool check(T&& t, A&& a) {
-				return helper<0, tuple_len - 1>::check(std::forward<T>(t), std::forward<A>(a));
-
-			}
-			template<class T, class A>
-			static auto get(T&& t, A&& a) {
-				return helper<0, tuple_len - 1>::get(std::forward<T>(t), std::forward<A>(a));
-
-			}
-
-		};
-
-
-	}
-
-	// destructure a tuple or other adapted structure
-	template<class... A>
-	auto ds(A&& ... a) {
-		return std::make_tuple(std::forward<A>(a)..., detail::tuple_ignorer{});
-	}
-
-
-}
-
-
-#include "implementation/some_none.hpp"
-
-
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/include/simple_match/utility.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/include/simple_match/utility.hpp
deleted file mode 100644
index 4549808fc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/simple_match/include/simple_match/utility.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-// Copyright 2015 John R. Bandela
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#pragma once
-
-#ifndef SIMPLE_MATCH_UTILITY_HPP_JRB_2015_09_11
-#define SIMPLE_MATCH_UTILITY_HPP_JRB_2015_09_11
-#include "simple_match.hpp"
-namespace simple_match {
-	// tagged_tuple
-
-	template<class Type, class... Args>
-	struct tagged_tuple :std::tuple<Args...> {
-		using base = std::tuple<Args...>;
-		template<class... A>
-		tagged_tuple(A&&... a) :base{ std::forward<A>(a)... } {}
-	};
-	
-	// inheriting_tagged_tuple
-
-	template<class Base, class Type, class... Args>
-	struct inheriting_tagged_tuple :Base,tagged_tuple<Type,Args...> {
-		using base = tagged_tuple<Type,Args...>;
-		template<class... A>
-		inheriting_tagged_tuple(A&&... a) :base{ std::forward<A>(a)... } {}
-	};
-
-
-}
-
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/stb_truetype.h b/contrib/tinyusdz/tinyusdz_repo/src/external/stb_truetype.h
deleted file mode 100644
index bbf2284b1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/stb_truetype.h
+++ /dev/null
@@ -1,5077 +0,0 @@
-// stb_truetype.h - v1.26 - public domain
-// authored from 2009-2021 by Sean Barrett / RAD Game Tools
-//
-// =======================================================================
-//
-//    NO SECURITY GUARANTEE -- DO NOT USE THIS ON UNTRUSTED FONT FILES
-//
-// This library does no range checking of the offsets found in the file,
-// meaning an attacker can use it to read arbitrary memory.
-//
-// =======================================================================
-//
-//   This library processes TrueType files:
-//        parse files
-//        extract glyph metrics
-//        extract glyph shapes
-//        render glyphs to one-channel bitmaps with antialiasing (box filter)
-//        render glyphs to one-channel SDF bitmaps (signed-distance field/function)
-//
-//   Todo:
-//        non-MS cmaps
-//        crashproof on bad data
-//        hinting? (no longer patented)
-//        cleartype-style AA?
-//        optimize: use simple memory allocator for intermediates
-//        optimize: build edge-list directly from curves
-//        optimize: rasterize directly from curves?
-//
-// ADDITIONAL CONTRIBUTORS
-//
-//   Mikko Mononen: compound shape support, more cmap formats
-//   Tor Andersson: kerning, subpixel rendering
-//   Dougall Johnson: OpenType / Type 2 font handling
-//   Daniel Ribeiro Maciel: basic GPOS-based kerning
-//
-//   Misc other:
-//       Ryan Gordon
-//       Simon Glass
-//       github:IntellectualKitty
-//       Imanol Celaya
-//       Daniel Ribeiro Maciel
-//
-//   Bug/warning reports/fixes:
-//       "Zer" on mollyrocket       Fabian "ryg" Giesen   github:NiLuJe
-//       Cass Everitt               Martins Mozeiko       github:aloucks
-//       stoiko (Haemimont Games)   Cap Petschulat        github:oyvindjam
-//       Brian Hook                 Omar Cornut           github:vassvik
-//       Walter van Niftrik         Ryan Griege
-//       David Gow                  Peter LaValle
-//       David Given                Sergey Popov
-//       Ivan-Assen Ivanov          Giumo X. Clanjor
-//       Anthony Pesch              Higor Euripedes
-//       Johan Duparc               Thomas Fields
-//       Hou Qiming                 Derek Vinyard
-//       Rob Loach                  Cort Stratton
-//       Kenney Phillis Jr.         Brian Costabile
-//       Ken Voskuil (kaesve)
-//
-// VERSION HISTORY
-//
-//   1.26 (2021-08-28) fix broken rasterizer
-//   1.25 (2021-07-11) many fixes
-//   1.24 (2020-02-05) fix warning
-//   1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS)
-//   1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined
-//   1.21 (2019-02-25) fix warning
-//   1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics()
-//   1.19 (2018-02-11) GPOS kerning, STBTT_fmod
-//   1.18 (2018-01-29) add missing function
-//   1.17 (2017-07-23) make more arguments const; doc fix
-//   1.16 (2017-07-12) SDF support
-//   1.15 (2017-03-03) make more arguments const
-//   1.14 (2017-01-16) num-fonts-in-TTC function
-//   1.13 (2017-01-02) support OpenType fonts, certain Apple fonts
-//   1.12 (2016-10-25) suppress warnings about casting away const with -Wcast-qual
-//   1.11 (2016-04-02) fix unused-variable warning
-//   1.10 (2016-04-02) user-defined fabs(); rare memory leak; remove duplicate typedef
-//   1.09 (2016-01-16) warning fix; avoid crash on outofmem; use allocation userdata properly
-//   1.08 (2015-09-13) document stbtt_Rasterize(); fixes for vertical & horizontal edges
-//   1.07 (2015-08-01) allow PackFontRanges to accept arrays of sparse codepoints;
-//                     variant PackFontRanges to pack and render in separate phases;
-//                     fix stbtt_GetFontOFfsetForIndex (never worked for non-0 input?);
-//                     fixed an assert() bug in the new rasterizer
-//                     replace assert() with STBTT_assert() in new rasterizer
-//
-//   Full history can be found at the end of this file.
-//
-// LICENSE
-//
-//   See end of file for license information.
-//
-// USAGE
-//
-//   Include this file in whatever places need to refer to it. In ONE C/C++
-//   file, write:
-//      #define STB_TRUETYPE_IMPLEMENTATION
-//   before the #include of this file. This expands out the actual
-//   implementation into that C/C++ file.
-//
-//   To make the implementation private to the file that generates the implementation,
-//      #define STBTT_STATIC
-//
-//   Simple 3D API (don't ship this, but it's fine for tools and quick start)
-//           stbtt_BakeFontBitmap()               -- bake a font to a bitmap for use as texture
-//           stbtt_GetBakedQuad()                 -- compute quad to draw for a given char
-//
-//   Improved 3D API (more shippable):
-//           #include "stb_rect_pack.h"           -- optional, but you really want it
-//           stbtt_PackBegin()
-//           stbtt_PackSetOversampling()          -- for improved quality on small fonts
-//           stbtt_PackFontRanges()               -- pack and renders
-//           stbtt_PackEnd()
-//           stbtt_GetPackedQuad()
-//
-//   "Load" a font file from a memory buffer (you have to keep the buffer loaded)
-//           stbtt_InitFont()
-//           stbtt_GetFontOffsetForIndex()        -- indexing for TTC font collections
-//           stbtt_GetNumberOfFonts()             -- number of fonts for TTC font collections
-//
-//   Render a unicode codepoint to a bitmap
-//           stbtt_GetCodepointBitmap()           -- allocates and returns a bitmap
-//           stbtt_MakeCodepointBitmap()          -- renders into bitmap you provide
-//           stbtt_GetCodepointBitmapBox()        -- how big the bitmap must be
-//
-//   Character advance/positioning
-//           stbtt_GetCodepointHMetrics()
-//           stbtt_GetFontVMetrics()
-//           stbtt_GetFontVMetricsOS2()
-//           stbtt_GetCodepointKernAdvance()
-//
-//   Starting with version 1.06, the rasterizer was replaced with a new,
-//   faster and generally-more-precise rasterizer. The new rasterizer more
-//   accurately measures pixel coverage for anti-aliasing, except in the case
-//   where multiple shapes overlap, in which case it overestimates the AA pixel
-//   coverage. Thus, anti-aliasing of intersecting shapes may look wrong. If
-//   this turns out to be a problem, you can re-enable the old rasterizer with
-//        #define STBTT_RASTERIZER_VERSION 1
-//   which will incur about a 15% speed hit.
-//
-// ADDITIONAL DOCUMENTATION
-//
-//   Immediately after this block comment are a series of sample programs.
-//
-//   After the sample programs is the "header file" section. This section
-//   includes documentation for each API function.
-//
-//   Some important concepts to understand to use this library:
-//
-//      Codepoint
-//         Characters are defined by unicode codepoints, e.g. 65 is
-//         uppercase A, 231 is lowercase c with a cedilla, 0x7e30 is
-//         the hiragana for "ma".
-//
-//      Glyph
-//         A visual character shape (every codepoint is rendered as
-//         some glyph)
-//
-//      Glyph index
-//         A font-specific integer ID representing a glyph
-//
-//      Baseline
-//         Glyph shapes are defined relative to a baseline, which is the
-//         bottom of uppercase characters. Characters extend both above
-//         and below the baseline.
-//
-//      Current Point
-//         As you draw text to the screen, you keep track of a "current point"
-//         which is the origin of each character. The current point's vertical
-//         position is the baseline. Even "baked fonts" use this model.
-//
-//      Vertical Font Metrics
-//         The vertical qualities of the font, used to vertically position
-//         and space the characters. See docs for stbtt_GetFontVMetrics.
-//
-//      Font Size in Pixels or Points
-//         The preferred interface for specifying font sizes in stb_truetype
-//         is to specify how tall the font's vertical extent should be in pixels.
-//         If that sounds good enough, skip the next paragraph.
-//
-//         Most font APIs instead use "points", which are a common typographic
-//         measurement for describing font size, defined as 72 points per inch.
-//         stb_truetype provides a point API for compatibility. However, true
-//         "per inch" conventions don't make much sense on computer displays
-//         since different monitors have different number of pixels per
-//         inch. For example, Windows traditionally uses a convention that
-//         there are 96 pixels per inch, thus making 'inch' measurements have
-//         nothing to do with inches, and thus effectively defining a point to
-//         be 1.333 pixels. Additionally, the TrueType font data provides
-//         an explicit scale factor to scale a given font's glyphs to points,
-//         but the author has observed that this scale factor is often wrong
-//         for non-commercial fonts, thus making fonts scaled in points
-//         according to the TrueType spec incoherently sized in practice.
-//
-// DETAILED USAGE:
-//
-//  Scale:
-//    Select how high you want the font to be, in points or pixels.
-//    Call ScaleForPixelHeight or ScaleForMappingEmToPixels to compute
-//    a scale factor SF that will be used by all other functions.
-//
-//  Baseline:
-//    You need to select a y-coordinate that is the baseline of where
-//    your text will appear. Call GetFontBoundingBox to get the baseline-relative
-//    bounding box for all characters. SF*-y0 will be the distance in pixels
-//    that the worst-case character could extend above the baseline, so if
-//    you want the top edge of characters to appear at the top of the
-//    screen where y=0, then you would set the baseline to SF*-y0.
-//
-//  Current point:
-//    Set the current point where the first character will appear. The
-//    first character could extend left of the current point; this is font
-//    dependent. You can either choose a current point that is the leftmost
-//    point and hope, or add some padding, or check the bounding box or
-//    left-side-bearing of the first character to be displayed and set
-//    the current point based on that.
-//
-//  Displaying a character:
-//    Compute the bounding box of the character. It will contain signed values
-//    relative to <current_point, baseline>. I.e. if it returns x0,y0,x1,y1,
-//    then the character should be displayed in the rectangle from
-//    <current_point+SF*x0, baseline+SF*y0> to <current_point+SF*x1,baseline+SF*y1).
-//
-//  Advancing for the next character:
-//    Call GlyphHMetrics, and compute 'current_point += SF * advance'.
-//
-//
-// ADVANCED USAGE
-//
-//   Quality:
-//
-//    - Use the functions with Subpixel at the end to allow your characters
-//      to have subpixel positioning. Since the font is anti-aliased, not
-//      hinted, this is very import for quality. (This is not possible with
-//      baked fonts.)
-//
-//    - Kerning is now supported, and if you're supporting subpixel rendering
-//      then kerning is worth using to give your text a polished look.
-//
-//   Performance:
-//
-//    - Convert Unicode codepoints to glyph indexes and operate on the glyphs;
-//      if you don't do this, stb_truetype is forced to do the conversion on
-//      every call.
-//
-//    - There are a lot of memory allocations. We should modify it to take
-//      a temp buffer and allocate from the temp buffer (without freeing),
-//      should help performance a lot.
-//
-// NOTES
-//
-//   The system uses the raw data found in the .ttf file without changing it
-//   and without building auxiliary data structures. This is a bit inefficient
-//   on little-endian systems (the data is big-endian), but assuming you're
-//   caching the bitmaps or glyph shapes this shouldn't be a big deal.
-//
-//   It appears to be very hard to programmatically determine what font a
-//   given file is in a general way. I provide an API for this, but I don't
-//   recommend it.
-//
-//
-// PERFORMANCE MEASUREMENTS FOR 1.06:
-//
-//                      32-bit     64-bit
-//   Previous release:  8.83 s     7.68 s
-//   Pool allocations:  7.72 s     6.34 s
-//   Inline sort     :  6.54 s     5.65 s
-//   New rasterizer  :  5.63 s     5.00 s
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-////
-////  SAMPLE PROGRAMS
-////
-//
-//  Incomplete text-in-3d-api example, which draws quads properly aligned to be lossless.
-//  See "tests/truetype_demo_win32.c" for a complete version.
-#if 0
-#define STB_TRUETYPE_IMPLEMENTATION  // force following include to generate implementation
-#include "stb_truetype.h"
-
-unsigned char ttf_buffer[1<<20];
-unsigned char temp_bitmap[512*512];
-
-stbtt_bakedchar cdata[96]; // ASCII 32..126 is 95 glyphs
-GLuint ftex;
-
-void my_stbtt_initfont(void)
-{
-   fread(ttf_buffer, 1, 1<<20, fopen("c:/windows/fonts/times.ttf", "rb"));
-   stbtt_BakeFontBitmap(ttf_buffer,0, 32.0, temp_bitmap,512,512, 32,96, cdata); // no guarantee this fits!
-   // can free ttf_buffer at this point
-   glGenTextures(1, &ftex);
-   glBindTexture(GL_TEXTURE_2D, ftex);
-   glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 512,512, 0, GL_ALPHA, GL_UNSIGNED_BYTE, temp_bitmap);
-   // can free temp_bitmap at this point
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-}
-
-void my_stbtt_print(float x, float y, char *text)
-{
-   // assume orthographic projection with units = screen pixels, origin at top left
-   glEnable(GL_BLEND);
-   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-   glEnable(GL_TEXTURE_2D);
-   glBindTexture(GL_TEXTURE_2D, ftex);
-   glBegin(GL_QUADS);
-   while (*text) {
-      if (*text >= 32 && *text < 128) {
-         stbtt_aligned_quad q;
-         stbtt_GetBakedQuad(cdata, 512,512, *text-32, &x,&y,&q,1);//1=opengl & d3d10+,0=d3d9
-         glTexCoord2f(q.s0,q.t0); glVertex2f(q.x0,q.y0);
-         glTexCoord2f(q.s1,q.t0); glVertex2f(q.x1,q.y0);
-         glTexCoord2f(q.s1,q.t1); glVertex2f(q.x1,q.y1);
-         glTexCoord2f(q.s0,q.t1); glVertex2f(q.x0,q.y1);
-      }
-      ++text;
-   }
-   glEnd();
-}
-#endif
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-// Complete program (this compiles): get a single bitmap, print as ASCII art
-//
-#if 0
-#include <stdio.h>
-#define STB_TRUETYPE_IMPLEMENTATION  // force following include to generate implementation
-#include "stb_truetype.h"
-
-char ttf_buffer[1<<25];
-
-int main(int argc, char **argv)
-{
-   stbtt_fontinfo font;
-   unsigned char *bitmap;
-   int w,h,i,j,c = (argc > 1 ? atoi(argv[1]) : 'a'), s = (argc > 2 ? atoi(argv[2]) : 20);
-
-   fread(ttf_buffer, 1, 1<<25, fopen(argc > 3 ? argv[3] : "c:/windows/fonts/arialbd.ttf", "rb"));
-
-   stbtt_InitFont(&font, ttf_buffer, stbtt_GetFontOffsetForIndex(ttf_buffer,0));
-   bitmap = stbtt_GetCodepointBitmap(&font, 0,stbtt_ScaleForPixelHeight(&font, s), c, &w, &h, 0,0);
-
-   for (j=0; j < h; ++j) {
-      for (i=0; i < w; ++i)
-         putchar(" .:ioVM@"[bitmap[j*w+i]>>5]);
-      putchar('\n');
-   }
-   return 0;
-}
-#endif
-//
-// Output:
-//
-//     .ii.
-//    @@@@@@.
-//   V@Mio@@o
-//   :i.  V@V
-//     :oM@@M
-//   :@@@MM@M
-//   @@o  o@M
-//  :@@.  M@M
-//   @@@o@@@@
-//   :M@@V:@@.
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-// Complete program: print "Hello World!" banner, with bugs
-//
-#if 0
-char buffer[24<<20];
-unsigned char screen[20][79];
-
-int main(int arg, char **argv)
-{
-   stbtt_fontinfo font;
-   int i,j,ascent,baseline,ch=0;
-   float scale, xpos=2; // leave a little padding in case the character extends left
-   char *text = "Heljo World!"; // intentionally misspelled to show 'lj' brokenness
-
-   fread(buffer, 1, 1000000, fopen("c:/windows/fonts/arialbd.ttf", "rb"));
-   stbtt_InitFont(&font, buffer, 0);
-
-   scale = stbtt_ScaleForPixelHeight(&font, 15);
-   stbtt_GetFontVMetrics(&font, &ascent,0,0);
-   baseline = (int) (ascent*scale);
-
-   while (text[ch]) {
-      int advance,lsb,x0,y0,x1,y1;
-      float x_shift = xpos - (float) floor(xpos);
-      stbtt_GetCodepointHMetrics(&font, text[ch], &advance, &lsb);
-      stbtt_GetCodepointBitmapBoxSubpixel(&font, text[ch], scale,scale,x_shift,0, &x0,&y0,&x1,&y1);
-      stbtt_MakeCodepointBitmapSubpixel(&font, &screen[baseline + y0][(int) xpos + x0], x1-x0,y1-y0, 79, scale,scale,x_shift,0, text[ch]);
-      // note that this stomps the old data, so where character boxes overlap (e.g. 'lj') it's wrong
-      // because this API is really for baking character bitmaps into textures. if you want to render
-      // a sequence of characters, you really need to render each bitmap to a temp buffer, then
-      // "alpha blend" that into the working buffer
-      xpos += (advance * scale);
-      if (text[ch+1])
-         xpos += scale*stbtt_GetCodepointKernAdvance(&font, text[ch],text[ch+1]);
-      ++ch;
-   }
-
-   for (j=0; j < 20; ++j) {
-      for (i=0; i < 78; ++i)
-         putchar(" .:ioVM@"[screen[j][i]>>5]);
-      putchar('\n');
-   }
-
-   return 0;
-}
-#endif
-
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-////
-////   INTEGRATION WITH YOUR CODEBASE
-////
-////   The following sections allow you to supply alternate definitions
-////   of C library functions used by stb_truetype, e.g. if you don't
-////   link with the C runtime library.
-
-#ifdef STB_TRUETYPE_IMPLEMENTATION
-   // #define your own (u)stbtt_int8/16/32 before including to override this
-   #ifndef stbtt_uint8
-   typedef unsigned char   stbtt_uint8;
-   typedef signed   char   stbtt_int8;
-   typedef unsigned short  stbtt_uint16;
-   typedef signed   short  stbtt_int16;
-   typedef unsigned int    stbtt_uint32;
-   typedef signed   int    stbtt_int32;
-   #endif
-
-   typedef char stbtt__check_size32[sizeof(stbtt_int32)==4 ? 1 : -1];
-   typedef char stbtt__check_size16[sizeof(stbtt_int16)==2 ? 1 : -1];
-
-   // e.g. #define your own STBTT_ifloor/STBTT_iceil() to avoid math.h
-   #ifndef STBTT_ifloor
-   #include <math.h>
-   #define STBTT_ifloor(x)   ((int) floor(x))
-   #define STBTT_iceil(x)    ((int) ceil(x))
-   #endif
-
-   #ifndef STBTT_sqrt
-   #include <math.h>
-   #define STBTT_sqrt(x)      sqrt(x)
-   #define STBTT_pow(x,y)     pow(x,y)
-   #endif
-
-   #ifndef STBTT_fmod
-   #include <math.h>
-   #define STBTT_fmod(x,y)    fmod(x,y)
-   #endif
-
-   #ifndef STBTT_cos
-   #include <math.h>
-   #define STBTT_cos(x)       cos(x)
-   #define STBTT_acos(x)      acos(x)
-   #endif
-
-   #ifndef STBTT_fabs
-   #include <math.h>
-   #define STBTT_fabs(x)      fabs(x)
-   #endif
-
-   // #define your own functions "STBTT_malloc" / "STBTT_free" to avoid malloc.h
-   #ifndef STBTT_malloc
-   #include <stdlib.h>
-   #define STBTT_malloc(x,u)  ((void)(u),malloc(x))
-   #define STBTT_free(x,u)    ((void)(u),free(x))
-   #endif
-
-   #ifndef STBTT_assert
-   #include <assert.h>
-   #define STBTT_assert(x)    assert(x)
-   #endif
-
-   #ifndef STBTT_strlen
-   #include <string.h>
-   #define STBTT_strlen(x)    strlen(x)
-   #endif
-
-   #ifndef STBTT_memcpy
-   #include <string.h>
-   #define STBTT_memcpy       memcpy
-   #define STBTT_memset       memset
-   #endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-////
-////   INTERFACE
-////
-////
-
-#ifndef __STB_INCLUDE_STB_TRUETYPE_H__
-#define __STB_INCLUDE_STB_TRUETYPE_H__
-
-#ifdef STBTT_STATIC
-#define STBTT_DEF static
-#else
-#define STBTT_DEF extern
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// private structure
-typedef struct
-{
-   unsigned char *data;
-   int cursor;
-   int size;
-} stbtt__buf;
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// TEXTURE BAKING API
-//
-// If you use this API, you only have to call two functions ever.
-//
-
-typedef struct
-{
-   unsigned short x0,y0,x1,y1; // coordinates of bbox in bitmap
-   float xoff,yoff,xadvance;
-} stbtt_bakedchar;
-
-STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset,  // font location (use offset=0 for plain .ttf)
-                                float pixel_height,                     // height of font in pixels
-                                unsigned char *pixels, int pw, int ph,  // bitmap to be filled in
-                                int first_char, int num_chars,          // characters to bake
-                                stbtt_bakedchar *chardata);             // you allocate this, it's num_chars long
-// if return is positive, the first unused row of the bitmap
-// if return is negative, returns the negative of the number of characters that fit
-// if return is 0, no characters fit and no rows were used
-// This uses a very crappy packing.
-
-typedef struct
-{
-   float x0,y0,s0,t0; // top-left
-   float x1,y1,s1,t1; // bottom-right
-} stbtt_aligned_quad;
-
-STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar *chardata, int pw, int ph,  // same data as above
-                               int char_index,             // character to display
-                               float *xpos, float *ypos,   // pointers to current position in screen pixel space
-                               stbtt_aligned_quad *q,      // output: quad to draw
-                               int opengl_fillrule);       // true if opengl fill rule; false if DX9 or earlier
-// Call GetBakedQuad with char_index = 'character - first_char', and it
-// creates the quad you need to draw and advances the current position.
-//
-// The coordinate system used assumes y increases downwards.
-//
-// Characters will extend both above and below the current position;
-// see discussion of "BASELINE" above.
-//
-// It's inefficient; you might want to c&p it and optimize it.
-
-STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap);
-// Query the font vertical metrics without having to create a font first.
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// NEW TEXTURE BAKING API
-//
-// This provides options for packing multiple fonts into one atlas, not
-// perfectly but better than nothing.
-
-typedef struct
-{
-   unsigned short x0,y0,x1,y1; // coordinates of bbox in bitmap
-   float xoff,yoff,xadvance;
-   float xoff2,yoff2;
-} stbtt_packedchar;
-
-typedef struct stbtt_pack_context stbtt_pack_context;
-typedef struct stbtt_fontinfo stbtt_fontinfo;
-#ifndef STB_RECT_PACK_VERSION
-typedef struct stbrp_rect stbrp_rect;
-#endif
-
-STBTT_DEF int  stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, int width, int height, int stride_in_bytes, int padding, void *alloc_context);
-// Initializes a packing context stored in the passed-in stbtt_pack_context.
-// Future calls using this context will pack characters into the bitmap passed
-// in here: a 1-channel bitmap that is width * height. stride_in_bytes is
-// the distance from one row to the next (or 0 to mean they are packed tightly
-// together). "padding" is the amount of padding to leave between each
-// character (normally you want '1' for bitmaps you'll use as textures with
-// bilinear filtering).
-//
-// Returns 0 on failure, 1 on success.
-
-STBTT_DEF void stbtt_PackEnd  (stbtt_pack_context *spc);
-// Cleans up the packing context and frees all memory.
-
-#define STBTT_POINT_SIZE(x)   (-(x))
-
-STBTT_DEF int  stbtt_PackFontRange(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, float font_size,
-                                int first_unicode_char_in_range, int num_chars_in_range, stbtt_packedchar *chardata_for_range);
-// Creates character bitmaps from the font_index'th font found in fontdata (use
-// font_index=0 if you don't know what that is). It creates num_chars_in_range
-// bitmaps for characters with unicode values starting at first_unicode_char_in_range
-// and increasing. Data for how to render them is stored in chardata_for_range;
-// pass these to stbtt_GetPackedQuad to get back renderable quads.
-//
-// font_size is the full height of the character from ascender to descender,
-// as computed by stbtt_ScaleForPixelHeight. To use a point size as computed
-// by stbtt_ScaleForMappingEmToPixels, wrap the point size in STBTT_POINT_SIZE()
-// and pass that result as 'font_size':
-//       ...,                  20 , ... // font max minus min y is 20 pixels tall
-//       ..., STBTT_POINT_SIZE(20), ... // 'M' is 20 pixels tall
-
-typedef struct
-{
-   float font_size;
-   int first_unicode_codepoint_in_range;  // if non-zero, then the chars are continuous, and this is the first codepoint
-   int *array_of_unicode_codepoints;       // if non-zero, then this is an array of unicode codepoints
-   int num_chars;
-   stbtt_packedchar *chardata_for_range; // output
-   unsigned char h_oversample, v_oversample; // don't set these, they're used internally
-} stbtt_pack_range;
-
-STBTT_DEF int  stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, stbtt_pack_range *ranges, int num_ranges);
-// Creates character bitmaps from multiple ranges of characters stored in
-// ranges. This will usually create a better-packed bitmap than multiple
-// calls to stbtt_PackFontRange. Note that you can call this multiple
-// times within a single PackBegin/PackEnd.
-
-STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h_oversample, unsigned int v_oversample);
-// Oversampling a font increases the quality by allowing higher-quality subpixel
-// positioning, and is especially valuable at smaller text sizes.
-//
-// This function sets the amount of oversampling for all following calls to
-// stbtt_PackFontRange(s) or stbtt_PackFontRangesGatherRects for a given
-// pack context. The default (no oversampling) is achieved by h_oversample=1
-// and v_oversample=1. The total number of pixels required is
-// h_oversample*v_oversample larger than the default; for example, 2x2
-// oversampling requires 4x the storage of 1x1. For best results, render
-// oversampled textures with bilinear filtering. Look at the readme in
-// stb/tests/oversample for information about oversampled fonts
-//
-// To use with PackFontRangesGather etc., you must set it before calls
-// call to PackFontRangesGatherRects.
-
-STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip);
-// If skip != 0, this tells stb_truetype to skip any codepoints for which
-// there is no corresponding glyph. If skip=0, which is the default, then
-// codepoints without a glyph recived the font's "missing character" glyph,
-// typically an empty box by convention.
-
-STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph,  // same data as above
-                               int char_index,             // character to display
-                               float *xpos, float *ypos,   // pointers to current position in screen pixel space
-                               stbtt_aligned_quad *q,      // output: quad to draw
-                               int align_to_integer);
-
-STBTT_DEF int  stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects);
-STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context *spc, stbrp_rect *rects, int num_rects);
-STBTT_DEF int  stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects);
-// Calling these functions in sequence is roughly equivalent to calling
-// stbtt_PackFontRanges(). If you more control over the packing of multiple
-// fonts, or if you want to pack custom data into a font texture, take a look
-// at the source to of stbtt_PackFontRanges() and create a custom version
-// using these functions, e.g. call GatherRects multiple times,
-// building up a single array of rects, then call PackRects once,
-// then call RenderIntoRects repeatedly. This may result in a
-// better packing than calling PackFontRanges multiple times
-// (or it may not).
-
-// this is an opaque structure that you shouldn't mess with which holds
-// all the context needed from PackBegin to PackEnd.
-struct stbtt_pack_context {
-   void *user_allocator_context;
-   void *pack_info;
-   int   width;
-   int   height;
-   int   stride_in_bytes;
-   int   padding;
-   int   skip_missing;
-   unsigned int   h_oversample, v_oversample;
-   unsigned char *pixels;
-   void  *nodes;
-};
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// FONT LOADING
-//
-//
-
-STBTT_DEF int stbtt_GetNumberOfFonts(const unsigned char *data);
-// This function will determine the number of fonts in a font file.  TrueType
-// collection (.ttc) files may contain multiple fonts, while TrueType font
-// (.ttf) files only contain one font. The number of fonts can be used for
-// indexing with the previous function where the index is between zero and one
-// less than the total fonts. If an error occurs, -1 is returned.
-
-STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index);
-// Each .ttf/.ttc file may have more than one font. Each font has a sequential
-// index number starting from 0. Call this function to get the font offset for
-// a given index; it returns -1 if the index is out of range. A regular .ttf
-// file will only define one font and it always be at offset 0, so it will
-// return '0' for index 0, and -1 for all other indices.
-
-// The following structure is defined publicly so you can declare one on
-// the stack or as a global or etc, but you should treat it as opaque.
-struct stbtt_fontinfo
-{
-   void           * userdata;
-   unsigned char  * data;              // pointer to .ttf file
-   int              fontstart;         // offset of start of font
-
-   int numGlyphs;                     // number of glyphs, needed for range checking
-
-   int loca,head,glyf,hhea,hmtx,kern,gpos,svg; // table locations as offset from start of .ttf
-   int index_map;                     // a cmap mapping for our chosen character encoding
-   int indexToLocFormat;              // format needed to map from glyph index to glyph
-
-   stbtt__buf cff;                    // cff font data
-   stbtt__buf charstrings;            // the charstring index
-   stbtt__buf gsubrs;                 // global charstring subroutines index
-   stbtt__buf subrs;                  // private charstring subroutines index
-   stbtt__buf fontdicts;              // array of font dicts
-   stbtt__buf fdselect;               // map from glyph to fontdict
-};
-
-STBTT_DEF int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data, int offset);
-// Given an offset into the file that defines a font, this function builds
-// the necessary cached info for the rest of the system. You must allocate
-// the stbtt_fontinfo yourself, and stbtt_InitFont will fill it out. You don't
-// need to do anything special to free it, because the contents are pure
-// value data with no additional data structures. Returns 0 on failure.
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// CHARACTER TO GLYPH-INDEX CONVERSIOn
-
-STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint);
-// If you're going to perform multiple operations on the same character
-// and you want a speed-up, call this function with the character you're
-// going to process, then use glyph-based functions instead of the
-// codepoint-based functions.
-// Returns 0 if the character codepoint is not defined in the font.
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// CHARACTER PROPERTIES
-//
-
-STBTT_DEF float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float pixels);
-// computes a scale factor to produce a font whose "height" is 'pixels' tall.
-// Height is measured as the distance from the highest ascender to the lowest
-// descender; in other words, it's equivalent to calling stbtt_GetFontVMetrics
-// and computing:
-//       scale = pixels / (ascent - descent)
-// so if you prefer to measure height by the ascent only, use a similar calculation.
-
-STBTT_DEF float stbtt_ScaleForMappingEmToPixels(const stbtt_fontinfo *info, float pixels);
-// computes a scale factor to produce a font whose EM size is mapped to
-// 'pixels' tall. This is probably what traditional APIs compute, but
-// I'm not positive.
-
-STBTT_DEF void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap);
-// ascent is the coordinate above the baseline the font extends; descent
-// is the coordinate below the baseline the font extends (i.e. it is typically negative)
-// lineGap is the spacing between one row's descent and the next row's ascent...
-// so you should advance the vertical position by "*ascent - *descent + *lineGap"
-//   these are expressed in unscaled coordinates, so you must multiply by
-//   the scale factor for a given size
-
-STBTT_DEF int  stbtt_GetFontVMetricsOS2(const stbtt_fontinfo *info, int *typoAscent, int *typoDescent, int *typoLineGap);
-// analogous to GetFontVMetrics, but returns the "typographic" values from the OS/2
-// table (specific to MS/Windows TTF files).
-//
-// Returns 1 on success (table present), 0 on failure.
-
-STBTT_DEF void stbtt_GetFontBoundingBox(const stbtt_fontinfo *info, int *x0, int *y0, int *x1, int *y1);
-// the bounding box around all possible characters
-
-STBTT_DEF void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing);
-// leftSideBearing is the offset from the current horizontal position to the left edge of the character
-// advanceWidth is the offset from the current horizontal position to the next horizontal position
-//   these are expressed in unscaled coordinates
-
-STBTT_DEF int  stbtt_GetCodepointKernAdvance(const stbtt_fontinfo *info, int ch1, int ch2);
-// an additional amount to add to the 'advance' value between ch1 and ch2
-
-STBTT_DEF int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1);
-// Gets the bounding box of the visible part of the glyph, in unscaled coordinates
-
-STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing);
-STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2);
-STBTT_DEF int  stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1);
-// as above, but takes one or more glyph indices for greater efficiency
-
-typedef struct stbtt_kerningentry
-{
-   int glyph1; // use stbtt_FindGlyphIndex
-   int glyph2;
-   int advance;
-} stbtt_kerningentry;
-
-STBTT_DEF int  stbtt_GetKerningTableLength(const stbtt_fontinfo *info);
-STBTT_DEF int  stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length);
-// Retrieves a complete list of all of the kerning pairs provided by the font
-// stbtt_GetKerningTable never writes more than table_length entries and returns how many entries it did write.
-// The table will be sorted by (a.glyph1 == b.glyph1)?(a.glyph2 < b.glyph2):(a.glyph1 < b.glyph1)
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// GLYPH SHAPES (you probably don't need these, but they have to go before
-// the bitmaps for C declaration-order reasons)
-//
-
-#ifndef STBTT_vmove // you can predefine these to use different values (but why?)
-   enum {
-      STBTT_vmove=1,
-      STBTT_vline,
-      STBTT_vcurve,
-      STBTT_vcubic
-   };
-#endif
-
-#ifndef stbtt_vertex // you can predefine this to use different values
-                   // (we share this with other code at RAD)
-   #define stbtt_vertex_type short // can't use stbtt_int16 because that's not visible in the header file
-   typedef struct
-   {
-      stbtt_vertex_type x,y,cx,cy,cx1,cy1;
-      unsigned char type,padding;
-   } stbtt_vertex;
-#endif
-
-STBTT_DEF int stbtt_IsGlyphEmpty(const stbtt_fontinfo *info, int glyph_index);
-// returns non-zero if nothing is drawn for this glyph
-
-STBTT_DEF int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices);
-STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **vertices);
-// returns # of vertices and fills *vertices with the pointer to them
-//   these are expressed in "unscaled" coordinates
-//
-// The shape is a series of contours. Each one starts with
-// a STBTT_moveto, then consists of a series of mixed
-// STBTT_lineto and STBTT_curveto segments. A lineto
-// draws a line from previous endpoint to its x,y; a curveto
-// draws a quadratic bezier from previous endpoint to
-// its x,y, using cx,cy as the bezier control point.
-
-STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *vertices);
-// frees the data allocated above
-
-STBTT_DEF unsigned char *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl);
-STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg);
-STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg);
-// fills svg with the character's SVG data.
-// returns data size or 0 if SVG not found.
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// BITMAP RENDERING
-//
-
-STBTT_DEF void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata);
-// frees the bitmap allocated below
-
-STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff);
-// allocates a large-enough single-channel 8bpp bitmap and renders the
-// specified character/glyph at the specified scale into it, with
-// antialiasing. 0 is no coverage (transparent), 255 is fully covered (opaque).
-// *width & *height are filled out with the width & height of the bitmap,
-// which is stored left-to-right, top-to-bottom.
-//
-// xoff/yoff are the offset it pixel space from the glyph origin to the top-left of the bitmap
-
-STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff);
-// the same as stbtt_GetCodepoitnBitmap, but you can specify a subpixel
-// shift for the character
-
-STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint);
-// the same as stbtt_GetCodepointBitmap, but you pass in storage for the bitmap
-// in the form of 'output', with row spacing of 'out_stride' bytes. the bitmap
-// is clipped to out_w/out_h bytes. Call stbtt_GetCodepointBitmapBox to get the
-// width and height and positioning info for it first.
-
-STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint);
-// same as stbtt_MakeCodepointBitmap, but you can specify a subpixel
-// shift for the character
-
-STBTT_DEF void stbtt_MakeCodepointBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int codepoint);
-// same as stbtt_MakeCodepointBitmapSubpixel, but prefiltering
-// is performed (see stbtt_PackSetOversampling)
-
-STBTT_DEF void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1);
-// get the bbox of the bitmap centered around the glyph origin; so the
-// bitmap width is ix1-ix0, height is iy1-iy0, and location to place
-// the bitmap top left is (leftSideBearing*scale,iy0).
-// (Note that the bitmap uses y-increases-down, but the shape uses
-// y-increases-up, so CodepointBitmapBox and CodepointBox are inverted.)
-
-STBTT_DEF void stbtt_GetCodepointBitmapBoxSubpixel(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1);
-// same as stbtt_GetCodepointBitmapBox, but you can specify a subpixel
-// shift for the character
-
-// the following functions are equivalent to the above functions, but operate
-// on glyph indices instead of Unicode codepoints (for efficiency)
-STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff);
-STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int glyph, int *width, int *height, int *xoff, int *yoff);
-STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph);
-STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int glyph);
-STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int glyph);
-STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1);
-STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1);
-
-
-// @TODO: don't expose this structure
-typedef struct
-{
-   int w,h,stride;
-   unsigned char *pixels;
-} stbtt__bitmap;
-
-// rasterize a shape with quadratic beziers into a bitmap
-STBTT_DEF void stbtt_Rasterize(stbtt__bitmap *result,        // 1-channel bitmap to draw into
-                               float flatness_in_pixels,     // allowable error of curve in pixels
-                               stbtt_vertex *vertices,       // array of vertices defining shape
-                               int num_verts,                // number of vertices in above array
-                               float scale_x, float scale_y, // scale applied to input vertices
-                               float shift_x, float shift_y, // translation applied to input vertices
-                               int x_off, int y_off,         // another translation applied to input
-                               int invert,                   // if non-zero, vertically flip shape
-                               void *userdata);              // context for to STBTT_MALLOC
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Signed Distance Function (or Field) rendering
-
-STBTT_DEF void stbtt_FreeSDF(unsigned char *bitmap, void *userdata);
-// frees the SDF bitmap allocated below
-
-STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float scale, int glyph, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff);
-STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff);
-// These functions compute a discretized SDF field for a single character, suitable for storing
-// in a single-channel texture, sampling with bilinear filtering, and testing against
-// larger than some threshold to produce scalable fonts.
-//        info              --  the font
-//        scale             --  controls the size of the resulting SDF bitmap, same as it would be creating a regular bitmap
-//        glyph/codepoint   --  the character to generate the SDF for
-//        padding           --  extra "pixels" around the character which are filled with the distance to the character (not 0),
-//                                 which allows effects like bit outlines
-//        onedge_value      --  value 0-255 to test the SDF against to reconstruct the character (i.e. the isocontour of the character)
-//        pixel_dist_scale  --  what value the SDF should increase by when moving one SDF "pixel" away from the edge (on the 0..255 scale)
-//                                 if positive, > onedge_value is inside; if negative, < onedge_value is inside
-//        width,height      --  output height & width of the SDF bitmap (including padding)
-//        xoff,yoff         --  output origin of the character
-//        return value      --  a 2D array of bytes 0..255, width*height in size
-//
-// pixel_dist_scale & onedge_value are a scale & bias that allows you to make
-// optimal use of the limited 0..255 for your application, trading off precision
-// and special effects. SDF values outside the range 0..255 are clamped to 0..255.
-//
-// Example:
-//      scale = stbtt_ScaleForPixelHeight(22)
-//      padding = 5
-//      onedge_value = 180
-//      pixel_dist_scale = 180/5.0 = 36.0
-//
-//      This will create an SDF bitmap in which the character is about 22 pixels
-//      high but the whole bitmap is about 22+5+5=32 pixels high. To produce a filled
-//      shape, sample the SDF at each pixel and fill the pixel if the SDF value
-//      is greater than or equal to 180/255. (You'll actually want to antialias,
-//      which is beyond the scope of this example.) Additionally, you can compute
-//      offset outlines (e.g. to stroke the character border inside & outside,
-//      or only outside). For example, to fill outside the character up to 3 SDF
-//      pixels, you would compare against (180-36.0*3)/255 = 72/255. The above
-//      choice of variables maps a range from 5 pixels outside the shape to
-//      2 pixels inside the shape to 0..255; this is intended primarily for apply
-//      outside effects only (the interior range is needed to allow proper
-//      antialiasing of the font at *smaller* sizes)
-//
-// The function computes the SDF analytically at each SDF pixel, not by e.g.
-// building a higher-res bitmap and approximating it. In theory the quality
-// should be as high as possible for an SDF of this size & representation, but
-// unclear if this is true in practice (perhaps building a higher-res bitmap
-// and computing from that can allow drop-out prevention).
-//
-// The algorithm has not been optimized at all, so expect it to be slow
-// if computing lots of characters or very large sizes.
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Finding the right font...
-//
-// You should really just solve this offline, keep your own tables
-// of what font is what, and don't try to get it out of the .ttf file.
-// That's because getting it out of the .ttf file is really hard, because
-// the names in the file can appear in many possible encodings, in many
-// possible languages, and e.g. if you need a case-insensitive comparison,
-// the details of that depend on the encoding & language in a complex way
-// (actually underspecified in truetype, but also gigantic).
-//
-// But you can use the provided functions in two possible ways:
-//     stbtt_FindMatchingFont() will use *case-sensitive* comparisons on
-//             unicode-encoded names to try to find the font you want;
-//             you can run this before calling stbtt_InitFont()
-//
-//     stbtt_GetFontNameString() lets you get any of the various strings
-//             from the file yourself and do your own comparisons on them.
-//             You have to have called stbtt_InitFont() first.
-
-
-STBTT_DEF int stbtt_FindMatchingFont(const unsigned char *fontdata, const char *name, int flags);
-// returns the offset (not index) of the font that matches, or -1 if none
-//   if you use STBTT_MACSTYLE_DONTCARE, use a font name like "Arial Bold".
-//   if you use any other flag, use a font name like "Arial"; this checks
-//     the 'macStyle' header field; i don't know if fonts set this consistently
-#define STBTT_MACSTYLE_DONTCARE     0
-#define STBTT_MACSTYLE_BOLD         1
-#define STBTT_MACSTYLE_ITALIC       2
-#define STBTT_MACSTYLE_UNDERSCORE   4
-#define STBTT_MACSTYLE_NONE         8   // <= not same as 0, this makes us check the bitfield is 0
-
-STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2);
-// returns 1/0 whether the first string interpreted as utf8 is identical to
-// the second string interpreted as big-endian utf16... useful for strings from next func
-
-STBTT_DEF const char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID);
-// returns the string (which may be big-endian double byte, e.g. for unicode)
-// and puts the length in bytes in *length.
-//
-// some of the values for the IDs are below; for more see the truetype spec:
-//     http://developer.apple.com/textfonts/TTRefMan/RM06/Chap6name.html
-//     http://www.microsoft.com/typography/otspec/name.htm
-
-enum { // platformID
-   STBTT_PLATFORM_ID_UNICODE   =0,
-   STBTT_PLATFORM_ID_MAC       =1,
-   STBTT_PLATFORM_ID_ISO       =2,
-   STBTT_PLATFORM_ID_MICROSOFT =3
-};
-
-enum { // encodingID for STBTT_PLATFORM_ID_UNICODE
-   STBTT_UNICODE_EID_UNICODE_1_0    =0,
-   STBTT_UNICODE_EID_UNICODE_1_1    =1,
-   STBTT_UNICODE_EID_ISO_10646      =2,
-   STBTT_UNICODE_EID_UNICODE_2_0_BMP=3,
-   STBTT_UNICODE_EID_UNICODE_2_0_FULL=4
-};
-
-enum { // encodingID for STBTT_PLATFORM_ID_MICROSOFT
-   STBTT_MS_EID_SYMBOL        =0,
-   STBTT_MS_EID_UNICODE_BMP   =1,
-   STBTT_MS_EID_SHIFTJIS      =2,
-   STBTT_MS_EID_UNICODE_FULL  =10
-};
-
-enum { // encodingID for STBTT_PLATFORM_ID_MAC; same as Script Manager codes
-   STBTT_MAC_EID_ROMAN        =0,   STBTT_MAC_EID_ARABIC       =4,
-   STBTT_MAC_EID_JAPANESE     =1,   STBTT_MAC_EID_HEBREW       =5,
-   STBTT_MAC_EID_CHINESE_TRAD =2,   STBTT_MAC_EID_GREEK        =6,
-   STBTT_MAC_EID_KOREAN       =3,   STBTT_MAC_EID_RUSSIAN      =7
-};
-
-enum { // languageID for STBTT_PLATFORM_ID_MICROSOFT; same as LCID...
-       // problematic because there are e.g. 16 english LCIDs and 16 arabic LCIDs
-   STBTT_MS_LANG_ENGLISH     =0x0409,   STBTT_MS_LANG_ITALIAN     =0x0410,
-   STBTT_MS_LANG_CHINESE     =0x0804,   STBTT_MS_LANG_JAPANESE    =0x0411,
-   STBTT_MS_LANG_DUTCH       =0x0413,   STBTT_MS_LANG_KOREAN      =0x0412,
-   STBTT_MS_LANG_FRENCH      =0x040c,   STBTT_MS_LANG_RUSSIAN     =0x0419,
-   STBTT_MS_LANG_GERMAN      =0x0407,   STBTT_MS_LANG_SPANISH     =0x0409,
-   STBTT_MS_LANG_HEBREW      =0x040d,   STBTT_MS_LANG_SWEDISH     =0x041D
-};
-
-enum { // languageID for STBTT_PLATFORM_ID_MAC
-   STBTT_MAC_LANG_ENGLISH      =0 ,   STBTT_MAC_LANG_JAPANESE     =11,
-   STBTT_MAC_LANG_ARABIC       =12,   STBTT_MAC_LANG_KOREAN       =23,
-   STBTT_MAC_LANG_DUTCH        =4 ,   STBTT_MAC_LANG_RUSSIAN      =32,
-   STBTT_MAC_LANG_FRENCH       =1 ,   STBTT_MAC_LANG_SPANISH      =6 ,
-   STBTT_MAC_LANG_GERMAN       =2 ,   STBTT_MAC_LANG_SWEDISH      =5 ,
-   STBTT_MAC_LANG_HEBREW       =10,   STBTT_MAC_LANG_CHINESE_SIMPLIFIED =33,
-   STBTT_MAC_LANG_ITALIAN      =3 ,   STBTT_MAC_LANG_CHINESE_TRAD =19
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __STB_INCLUDE_STB_TRUETYPE_H__
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-////
-////   IMPLEMENTATION
-////
-////
-
-#ifdef STB_TRUETYPE_IMPLEMENTATION
-
-#ifndef STBTT_MAX_OVERSAMPLE
-#define STBTT_MAX_OVERSAMPLE   8
-#endif
-
-#if STBTT_MAX_OVERSAMPLE > 255
-#error "STBTT_MAX_OVERSAMPLE cannot be > 255"
-#endif
-
-typedef int stbtt__test_oversample_pow2[(STBTT_MAX_OVERSAMPLE & (STBTT_MAX_OVERSAMPLE-1)) == 0 ? 1 : -1];
-
-#ifndef STBTT_RASTERIZER_VERSION
-#define STBTT_RASTERIZER_VERSION 2
-#endif
-
-#ifdef _MSC_VER
-#define STBTT__NOTUSED(v)  (void)(v)
-#else
-#define STBTT__NOTUSED(v)  (void)sizeof(v)
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-//
-// stbtt__buf helpers to parse data from file
-//
-
-static stbtt_uint8 stbtt__buf_get8(stbtt__buf *b)
-{
-   if (b->cursor >= b->size)
-      return 0;
-   return b->data[b->cursor++];
-}
-
-static stbtt_uint8 stbtt__buf_peek8(stbtt__buf *b)
-{
-   if (b->cursor >= b->size)
-      return 0;
-   return b->data[b->cursor];
-}
-
-static void stbtt__buf_seek(stbtt__buf *b, int o)
-{
-   STBTT_assert(!(o > b->size || o < 0));
-   b->cursor = (o > b->size || o < 0) ? b->size : o;
-}
-
-static void stbtt__buf_skip(stbtt__buf *b, int o)
-{
-   stbtt__buf_seek(b, b->cursor + o);
-}
-
-static stbtt_uint32 stbtt__buf_get(stbtt__buf *b, int n)
-{
-   stbtt_uint32 v = 0;
-   int i;
-   STBTT_assert(n >= 1 && n <= 4);
-   for (i = 0; i < n; i++)
-      v = (v << 8) | stbtt__buf_get8(b);
-   return v;
-}
-
-static stbtt__buf stbtt__new_buf(const void *p, size_t size)
-{
-   stbtt__buf r;
-   STBTT_assert(size < 0x40000000);
-   r.data = (stbtt_uint8*) p;
-   r.size = (int) size;
-   r.cursor = 0;
-   return r;
-}
-
-#define stbtt__buf_get16(b)  stbtt__buf_get((b), 2)
-#define stbtt__buf_get32(b)  stbtt__buf_get((b), 4)
-
-static stbtt__buf stbtt__buf_range(const stbtt__buf *b, int o, int s)
-{
-   stbtt__buf r = stbtt__new_buf(NULL, 0);
-   if (o < 0 || s < 0 || o > b->size || s > b->size - o) return r;
-   r.data = b->data + o;
-   r.size = s;
-   return r;
-}
-
-static stbtt__buf stbtt__cff_get_index(stbtt__buf *b)
-{
-   int count, start, offsize;
-   start = b->cursor;
-   count = stbtt__buf_get16(b);
-   if (count) {
-      offsize = stbtt__buf_get8(b);
-      STBTT_assert(offsize >= 1 && offsize <= 4);
-      stbtt__buf_skip(b, offsize * count);
-      stbtt__buf_skip(b, stbtt__buf_get(b, offsize) - 1);
-   }
-   return stbtt__buf_range(b, start, b->cursor - start);
-}
-
-static stbtt_uint32 stbtt__cff_int(stbtt__buf *b)
-{
-   int b0 = stbtt__buf_get8(b);
-   if (b0 >= 32 && b0 <= 246)       return b0 - 139;
-   else if (b0 >= 247 && b0 <= 250) return (b0 - 247)*256 + stbtt__buf_get8(b) + 108;
-   else if (b0 >= 251 && b0 <= 254) return -(b0 - 251)*256 - stbtt__buf_get8(b) - 108;
-   else if (b0 == 28)               return stbtt__buf_get16(b);
-   else if (b0 == 29)               return stbtt__buf_get32(b);
-   STBTT_assert(0);
-   return 0;
-}
-
-static void stbtt__cff_skip_operand(stbtt__buf *b) {
-   int v, b0 = stbtt__buf_peek8(b);
-   STBTT_assert(b0 >= 28);
-   if (b0 == 30) {
-      stbtt__buf_skip(b, 1);
-      while (b->cursor < b->size) {
-         v = stbtt__buf_get8(b);
-         if ((v & 0xF) == 0xF || (v >> 4) == 0xF)
-            break;
-      }
-   } else {
-      stbtt__cff_int(b);
-   }
-}
-
-static stbtt__buf stbtt__dict_get(stbtt__buf *b, int key)
-{
-   stbtt__buf_seek(b, 0);
-   while (b->cursor < b->size) {
-      int start = b->cursor, end, op;
-      while (stbtt__buf_peek8(b) >= 28)
-         stbtt__cff_skip_operand(b);
-      end = b->cursor;
-      op = stbtt__buf_get8(b);
-      if (op == 12)  op = stbtt__buf_get8(b) | 0x100;
-      if (op == key) return stbtt__buf_range(b, start, end-start);
-   }
-   return stbtt__buf_range(b, 0, 0);
-}
-
-static void stbtt__dict_get_ints(stbtt__buf *b, int key, int outcount, stbtt_uint32 *out)
-{
-   int i;
-   stbtt__buf operands = stbtt__dict_get(b, key);
-   for (i = 0; i < outcount && operands.cursor < operands.size; i++)
-      out[i] = stbtt__cff_int(&operands);
-}
-
-static int stbtt__cff_index_count(stbtt__buf *b)
-{
-   stbtt__buf_seek(b, 0);
-   return stbtt__buf_get16(b);
-}
-
-static stbtt__buf stbtt__cff_index_get(stbtt__buf b, int i)
-{
-   int count, offsize, start, end;
-   stbtt__buf_seek(&b, 0);
-   count = stbtt__buf_get16(&b);
-   offsize = stbtt__buf_get8(&b);
-   STBTT_assert(i >= 0 && i < count);
-   STBTT_assert(offsize >= 1 && offsize <= 4);
-   stbtt__buf_skip(&b, i*offsize);
-   start = stbtt__buf_get(&b, offsize);
-   end = stbtt__buf_get(&b, offsize);
-   return stbtt__buf_range(&b, 2+(count+1)*offsize+start, end - start);
-}
-
-//////////////////////////////////////////////////////////////////////////
-//
-// accessors to parse data from file
-//
-
-// on platforms that don't allow misaligned reads, if we want to allow
-// truetype fonts that aren't padded to alignment, define ALLOW_UNALIGNED_TRUETYPE
-
-#define ttBYTE(p)     (* (stbtt_uint8 *) (p))
-#define ttCHAR(p)     (* (stbtt_int8 *) (p))
-#define ttFixed(p)    ttLONG(p)
-
-static stbtt_uint16 ttUSHORT(stbtt_uint8 *p) { return p[0]*256 + p[1]; }
-static stbtt_int16 ttSHORT(stbtt_uint8 *p)   { return p[0]*256 + p[1]; }
-static stbtt_uint32 ttULONG(stbtt_uint8 *p)  { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; }
-static stbtt_int32 ttLONG(stbtt_uint8 *p)    { return (p[0]<<24) + (p[1]<<16) + (p[2]<<8) + p[3]; }
-
-#define stbtt_tag4(p,c0,c1,c2,c3) ((p)[0] == (c0) && (p)[1] == (c1) && (p)[2] == (c2) && (p)[3] == (c3))
-#define stbtt_tag(p,str)           stbtt_tag4(p,str[0],str[1],str[2],str[3])
-
-static int stbtt__isfont(stbtt_uint8 *font)
-{
-   // check the version number
-   if (stbtt_tag4(font, '1',0,0,0))  return 1; // TrueType 1
-   if (stbtt_tag(font, "typ1"))   return 1; // TrueType with type 1 font -- we don't support this!
-   if (stbtt_tag(font, "OTTO"))   return 1; // OpenType with CFF
-   if (stbtt_tag4(font, 0,1,0,0)) return 1; // OpenType 1.0
-   if (stbtt_tag(font, "true"))   return 1; // Apple specification for TrueType fonts
-   return 0;
-}
-
-// @OPTIMIZE: binary search
-static stbtt_uint32 stbtt__find_table(stbtt_uint8 *data, stbtt_uint32 fontstart, const char *tag)
-{
-   stbtt_int32 num_tables = ttUSHORT(data+fontstart+4);
-   stbtt_uint32 tabledir = fontstart + 12;
-   stbtt_int32 i;
-   for (i=0; i < num_tables; ++i) {
-      stbtt_uint32 loc = tabledir + 16*i;
-      if (stbtt_tag(data+loc+0, tag))
-         return ttULONG(data+loc+8);
-   }
-   return 0;
-}
-
-static int stbtt_GetFontOffsetForIndex_internal(unsigned char *font_collection, int index)
-{
-   // if it's just a font, there's only one valid index
-   if (stbtt__isfont(font_collection))
-      return index == 0 ? 0 : -1;
-
-   // check if it's a TTC
-   if (stbtt_tag(font_collection, "ttcf")) {
-      // version 1?
-      if (ttULONG(font_collection+4) == 0x00010000 || ttULONG(font_collection+4) == 0x00020000) {
-         stbtt_int32 n = ttLONG(font_collection+8);
-         if (index >= n)
-            return -1;
-         return ttULONG(font_collection+12+index*4);
-      }
-   }
-   return -1;
-}
-
-static int stbtt_GetNumberOfFonts_internal(unsigned char *font_collection)
-{
-   // if it's just a font, there's only one valid font
-   if (stbtt__isfont(font_collection))
-      return 1;
-
-   // check if it's a TTC
-   if (stbtt_tag(font_collection, "ttcf")) {
-      // version 1?
-      if (ttULONG(font_collection+4) == 0x00010000 || ttULONG(font_collection+4) == 0x00020000) {
-         return ttLONG(font_collection+8);
-      }
-   }
-   return 0;
-}
-
-static stbtt__buf stbtt__get_subrs(stbtt__buf cff, stbtt__buf fontdict)
-{
-   stbtt_uint32 subrsoff = 0, private_loc[2] = { 0, 0 };
-   stbtt__buf pdict;
-   stbtt__dict_get_ints(&fontdict, 18, 2, private_loc);
-   if (!private_loc[1] || !private_loc[0]) return stbtt__new_buf(NULL, 0);
-   pdict = stbtt__buf_range(&cff, private_loc[1], private_loc[0]);
-   stbtt__dict_get_ints(&pdict, 19, 1, &subrsoff);
-   if (!subrsoff) return stbtt__new_buf(NULL, 0);
-   stbtt__buf_seek(&cff, private_loc[1]+subrsoff);
-   return stbtt__cff_get_index(&cff);
-}
-
-// since most people won't use this, find this table the first time it's needed
-static int stbtt__get_svg(stbtt_fontinfo *info)
-{
-   stbtt_uint32 t;
-   if (info->svg < 0) {
-      t = stbtt__find_table(info->data, info->fontstart, "SVG ");
-      if (t) {
-         stbtt_uint32 offset = ttULONG(info->data + t + 2);
-         info->svg = t + offset;
-      } else {
-         info->svg = 0;
-      }
-   }
-   return info->svg;
-}
-
-static int stbtt_InitFont_internal(stbtt_fontinfo *info, unsigned char *data, int fontstart)
-{
-   stbtt_uint32 cmap, t;
-   stbtt_int32 i,numTables;
-
-   info->data = data;
-   info->fontstart = fontstart;
-   info->cff = stbtt__new_buf(NULL, 0);
-
-   cmap = stbtt__find_table(data, fontstart, "cmap");       // required
-   info->loca = stbtt__find_table(data, fontstart, "loca"); // required
-   info->head = stbtt__find_table(data, fontstart, "head"); // required
-   info->glyf = stbtt__find_table(data, fontstart, "glyf"); // required
-   info->hhea = stbtt__find_table(data, fontstart, "hhea"); // required
-   info->hmtx = stbtt__find_table(data, fontstart, "hmtx"); // required
-   info->kern = stbtt__find_table(data, fontstart, "kern"); // not required
-   info->gpos = stbtt__find_table(data, fontstart, "GPOS"); // not required
-
-   if (!cmap || !info->head || !info->hhea || !info->hmtx)
-      return 0;
-   if (info->glyf) {
-      // required for truetype
-      if (!info->loca) return 0;
-   } else {
-      // initialization for CFF / Type2 fonts (OTF)
-      stbtt__buf b, topdict, topdictidx;
-      stbtt_uint32 cstype = 2, charstrings = 0, fdarrayoff = 0, fdselectoff = 0;
-      stbtt_uint32 cff;
-
-      cff = stbtt__find_table(data, fontstart, "CFF ");
-      if (!cff) return 0;
-
-      info->fontdicts = stbtt__new_buf(NULL, 0);
-      info->fdselect = stbtt__new_buf(NULL, 0);
-
-      // @TODO this should use size from table (not 512MB)
-      info->cff = stbtt__new_buf(data+cff, 512*1024*1024);
-      b = info->cff;
-
-      // read the header
-      stbtt__buf_skip(&b, 2);
-      stbtt__buf_seek(&b, stbtt__buf_get8(&b)); // hdrsize
-
-      // @TODO the name INDEX could list multiple fonts,
-      // but we just use the first one.
-      stbtt__cff_get_index(&b);  // name INDEX
-      topdictidx = stbtt__cff_get_index(&b);
-      topdict = stbtt__cff_index_get(topdictidx, 0);
-      stbtt__cff_get_index(&b);  // string INDEX
-      info->gsubrs = stbtt__cff_get_index(&b);
-
-      stbtt__dict_get_ints(&topdict, 17, 1, &charstrings);
-      stbtt__dict_get_ints(&topdict, 0x100 | 6, 1, &cstype);
-      stbtt__dict_get_ints(&topdict, 0x100 | 36, 1, &fdarrayoff);
-      stbtt__dict_get_ints(&topdict, 0x100 | 37, 1, &fdselectoff);
-      info->subrs = stbtt__get_subrs(b, topdict);
-
-      // we only support Type 2 charstrings
-      if (cstype != 2) return 0;
-      if (charstrings == 0) return 0;
-
-      if (fdarrayoff) {
-         // looks like a CID font
-         if (!fdselectoff) return 0;
-         stbtt__buf_seek(&b, fdarrayoff);
-         info->fontdicts = stbtt__cff_get_index(&b);
-         info->fdselect = stbtt__buf_range(&b, fdselectoff, b.size-fdselectoff);
-      }
-
-      stbtt__buf_seek(&b, charstrings);
-      info->charstrings = stbtt__cff_get_index(&b);
-   }
-
-   t = stbtt__find_table(data, fontstart, "maxp");
-   if (t)
-      info->numGlyphs = ttUSHORT(data+t+4);
-   else
-      info->numGlyphs = 0xffff;
-
-   info->svg = -1;
-
-   // find a cmap encoding table we understand *now* to avoid searching
-   // later. (todo: could make this installable)
-   // the same regardless of glyph.
-   numTables = ttUSHORT(data + cmap + 2);
-   info->index_map = 0;
-   for (i=0; i < numTables; ++i) {
-      stbtt_uint32 encoding_record = cmap + 4 + 8 * i;
-      // find an encoding we understand:
-      switch(ttUSHORT(data+encoding_record)) {
-         case STBTT_PLATFORM_ID_MICROSOFT:
-            switch (ttUSHORT(data+encoding_record+2)) {
-               case STBTT_MS_EID_UNICODE_BMP:
-               case STBTT_MS_EID_UNICODE_FULL:
-                  // MS/Unicode
-                  info->index_map = cmap + ttULONG(data+encoding_record+4);
-                  break;
-            }
-            break;
-        case STBTT_PLATFORM_ID_UNICODE:
-            // Mac/iOS has these
-            // all the encodingIDs are unicode, so we don't bother to check it
-            info->index_map = cmap + ttULONG(data+encoding_record+4);
-            break;
-      }
-   }
-   if (info->index_map == 0)
-      return 0;
-
-   info->indexToLocFormat = ttUSHORT(data+info->head + 50);
-   return 1;
-}
-
-STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codepoint)
-{
-   stbtt_uint8 *data = info->data;
-   stbtt_uint32 index_map = info->index_map;
-
-   stbtt_uint16 format = ttUSHORT(data + index_map + 0);
-   if (format == 0) { // apple byte encoding
-      stbtt_int32 bytes = ttUSHORT(data + index_map + 2);
-      if (unicode_codepoint < bytes-6)
-         return ttBYTE(data + index_map + 6 + unicode_codepoint);
-      return 0;
-   } else if (format == 6) {
-      stbtt_uint32 first = ttUSHORT(data + index_map + 6);
-      stbtt_uint32 count = ttUSHORT(data + index_map + 8);
-      if ((stbtt_uint32) unicode_codepoint >= first && (stbtt_uint32) unicode_codepoint < first+count)
-         return ttUSHORT(data + index_map + 10 + (unicode_codepoint - first)*2);
-      return 0;
-   } else if (format == 2) {
-      STBTT_assert(0); // @TODO: high-byte mapping for japanese/chinese/korean
-      return 0;
-   } else if (format == 4) { // standard mapping for windows fonts: binary search collection of ranges
-      stbtt_uint16 segcount = ttUSHORT(data+index_map+6) >> 1;
-      stbtt_uint16 searchRange = ttUSHORT(data+index_map+8) >> 1;
-      stbtt_uint16 entrySelector = ttUSHORT(data+index_map+10);
-      stbtt_uint16 rangeShift = ttUSHORT(data+index_map+12) >> 1;
-
-      // do a binary search of the segments
-      stbtt_uint32 endCount = index_map + 14;
-      stbtt_uint32 search = endCount;
-
-      if (unicode_codepoint > 0xffff)
-         return 0;
-
-      // they lie from endCount .. endCount + segCount
-      // but searchRange is the nearest power of two, so...
-      if (unicode_codepoint >= ttUSHORT(data + search + rangeShift*2))
-         search += rangeShift*2;
-
-      // now decrement to bias correctly to find smallest
-      search -= 2;
-      while (entrySelector) {
-         stbtt_uint16 end;
-         searchRange >>= 1;
-         end = ttUSHORT(data + search + searchRange*2);
-         if (unicode_codepoint > end)
-            search += searchRange*2;
-         --entrySelector;
-      }
-      search += 2;
-
-      {
-         stbtt_uint16 offset, start, last;
-         stbtt_uint16 item = (stbtt_uint16) ((search - endCount) >> 1);
-
-         start = ttUSHORT(data + index_map + 14 + segcount*2 + 2 + 2*item);
-         last = ttUSHORT(data + endCount + 2*item);
-         if (unicode_codepoint < start || unicode_codepoint > last)
-            return 0;
-
-         offset = ttUSHORT(data + index_map + 14 + segcount*6 + 2 + 2*item);
-         if (offset == 0)
-            return (stbtt_uint16) (unicode_codepoint + ttSHORT(data + index_map + 14 + segcount*4 + 2 + 2*item));
-
-         return ttUSHORT(data + offset + (unicode_codepoint-start)*2 + index_map + 14 + segcount*6 + 2 + 2*item);
-      }
-   } else if (format == 12 || format == 13) {
-      stbtt_uint32 ngroups = ttULONG(data+index_map+12);
-      stbtt_int32 low,high;
-      low = 0; high = (stbtt_int32)ngroups;
-      // Binary search the right group.
-      while (low < high) {
-         stbtt_int32 mid = low + ((high-low) >> 1); // rounds down, so low <= mid < high
-         stbtt_uint32 start_char = ttULONG(data+index_map+16+mid*12);
-         stbtt_uint32 end_char = ttULONG(data+index_map+16+mid*12+4);
-         if ((stbtt_uint32) unicode_codepoint < start_char)
-            high = mid;
-         else if ((stbtt_uint32) unicode_codepoint > end_char)
-            low = mid+1;
-         else {
-            stbtt_uint32 start_glyph = ttULONG(data+index_map+16+mid*12+8);
-            if (format == 12)
-               return start_glyph + unicode_codepoint-start_char;
-            else // format == 13
-               return start_glyph;
-         }
-      }
-      return 0; // not found
-   }
-   // @TODO
-   STBTT_assert(0);
-   return 0;
-}
-
-STBTT_DEF int stbtt_GetCodepointShape(const stbtt_fontinfo *info, int unicode_codepoint, stbtt_vertex **vertices)
-{
-   return stbtt_GetGlyphShape(info, stbtt_FindGlyphIndex(info, unicode_codepoint), vertices);
-}
-
-static void stbtt_setvertex(stbtt_vertex *v, stbtt_uint8 type, stbtt_int32 x, stbtt_int32 y, stbtt_int32 cx, stbtt_int32 cy)
-{
-   v->type = type;
-   v->x = (stbtt_int16) x;
-   v->y = (stbtt_int16) y;
-   v->cx = (stbtt_int16) cx;
-   v->cy = (stbtt_int16) cy;
-}
-
-static int stbtt__GetGlyfOffset(const stbtt_fontinfo *info, int glyph_index)
-{
-   int g1,g2;
-
-   STBTT_assert(!info->cff.size);
-
-   if (glyph_index >= info->numGlyphs) return -1; // glyph index out of range
-   if (info->indexToLocFormat >= 2)    return -1; // unknown index->glyph map format
-
-   if (info->indexToLocFormat == 0) {
-      g1 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2) * 2;
-      g2 = info->glyf + ttUSHORT(info->data + info->loca + glyph_index * 2 + 2) * 2;
-   } else {
-      g1 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4);
-      g2 = info->glyf + ttULONG (info->data + info->loca + glyph_index * 4 + 4);
-   }
-
-   return g1==g2 ? -1 : g1; // if length is 0, return -1
-}
-
-static int stbtt__GetGlyphInfoT2(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1);
-
-STBTT_DEF int stbtt_GetGlyphBox(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1)
-{
-   if (info->cff.size) {
-      stbtt__GetGlyphInfoT2(info, glyph_index, x0, y0, x1, y1);
-   } else {
-      int g = stbtt__GetGlyfOffset(info, glyph_index);
-      if (g < 0) return 0;
-
-      if (x0) *x0 = ttSHORT(info->data + g + 2);
-      if (y0) *y0 = ttSHORT(info->data + g + 4);
-      if (x1) *x1 = ttSHORT(info->data + g + 6);
-      if (y1) *y1 = ttSHORT(info->data + g + 8);
-   }
-   return 1;
-}
-
-STBTT_DEF int stbtt_GetCodepointBox(const stbtt_fontinfo *info, int codepoint, int *x0, int *y0, int *x1, int *y1)
-{
-   return stbtt_GetGlyphBox(info, stbtt_FindGlyphIndex(info,codepoint), x0,y0,x1,y1);
-}
-
-STBTT_DEF int stbtt_IsGlyphEmpty(const stbtt_fontinfo *info, int glyph_index)
-{
-   stbtt_int16 numberOfContours;
-   int g;
-   if (info->cff.size)
-      return stbtt__GetGlyphInfoT2(info, glyph_index, NULL, NULL, NULL, NULL) == 0;
-   g = stbtt__GetGlyfOffset(info, glyph_index);
-   if (g < 0) return 1;
-   numberOfContours = ttSHORT(info->data + g);
-   return numberOfContours == 0;
-}
-
-static int stbtt__close_shape(stbtt_vertex *vertices, int num_vertices, int was_off, int start_off,
-    stbtt_int32 sx, stbtt_int32 sy, stbtt_int32 scx, stbtt_int32 scy, stbtt_int32 cx, stbtt_int32 cy)
-{
-   if (start_off) {
-      if (was_off)
-         stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, (cx+scx)>>1, (cy+scy)>>1, cx,cy);
-      stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, sx,sy,scx,scy);
-   } else {
-      if (was_off)
-         stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve,sx,sy,cx,cy);
-      else
-         stbtt_setvertex(&vertices[num_vertices++], STBTT_vline,sx,sy,0,0);
-   }
-   return num_vertices;
-}
-
-static int stbtt__GetGlyphShapeTT(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
-{
-   stbtt_int16 numberOfContours;
-   stbtt_uint8 *endPtsOfContours;
-   stbtt_uint8 *data = info->data;
-   stbtt_vertex *vertices=0;
-   int num_vertices=0;
-   int g = stbtt__GetGlyfOffset(info, glyph_index);
-
-   *pvertices = NULL;
-
-   if (g < 0) return 0;
-
-   numberOfContours = ttSHORT(data + g);
-
-   if (numberOfContours > 0) {
-      stbtt_uint8 flags=0,flagcount;
-      stbtt_int32 ins, i,j=0,m,n, next_move, was_off=0, off, start_off=0;
-      stbtt_int32 x,y,cx,cy,sx,sy, scx,scy;
-      stbtt_uint8 *points;
-      endPtsOfContours = (data + g + 10);
-      ins = ttUSHORT(data + g + 10 + numberOfContours * 2);
-      points = data + g + 10 + numberOfContours * 2 + 2 + ins;
-
-      n = 1+ttUSHORT(endPtsOfContours + numberOfContours*2-2);
-
-      m = n + 2*numberOfContours;  // a loose bound on how many vertices we might need
-      vertices = (stbtt_vertex *) STBTT_malloc(m * sizeof(vertices[0]), info->userdata);
-      if (vertices == 0)
-         return 0;
-
-      next_move = 0;
-      flagcount=0;
-
-      // in first pass, we load uninterpreted data into the allocated array
-      // above, shifted to the end of the array so we won't overwrite it when
-      // we create our final data starting from the front
-
-      off = m - n; // starting offset for uninterpreted data, regardless of how m ends up being calculated
-
-      // first load flags
-
-      for (i=0; i < n; ++i) {
-         if (flagcount == 0) {
-            flags = *points++;
-            if (flags & 8)
-               flagcount = *points++;
-         } else
-            --flagcount;
-         vertices[off+i].type = flags;
-      }
-
-      // now load x coordinates
-      x=0;
-      for (i=0; i < n; ++i) {
-         flags = vertices[off+i].type;
-         if (flags & 2) {
-            stbtt_int16 dx = *points++;
-            x += (flags & 16) ? dx : -dx; // ???
-         } else {
-            if (!(flags & 16)) {
-               x = x + (stbtt_int16) (points[0]*256 + points[1]);
-               points += 2;
-            }
-         }
-         vertices[off+i].x = (stbtt_int16) x;
-      }
-
-      // now load y coordinates
-      y=0;
-      for (i=0; i < n; ++i) {
-         flags = vertices[off+i].type;
-         if (flags & 4) {
-            stbtt_int16 dy = *points++;
-            y += (flags & 32) ? dy : -dy; // ???
-         } else {
-            if (!(flags & 32)) {
-               y = y + (stbtt_int16) (points[0]*256 + points[1]);
-               points += 2;
-            }
-         }
-         vertices[off+i].y = (stbtt_int16) y;
-      }
-
-      // now convert them to our format
-      num_vertices=0;
-      sx = sy = cx = cy = scx = scy = 0;
-      for (i=0; i < n; ++i) {
-         flags = vertices[off+i].type;
-         x     = (stbtt_int16) vertices[off+i].x;
-         y     = (stbtt_int16) vertices[off+i].y;
-
-         if (next_move == i) {
-            if (i != 0)
-               num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy);
-
-            // now start the new one
-            start_off = !(flags & 1);
-            if (start_off) {
-               // if we start off with an off-curve point, then when we need to find a point on the curve
-               // where we can start, and we need to save some state for when we wraparound.
-               scx = x;
-               scy = y;
-               if (!(vertices[off+i+1].type & 1)) {
-                  // next point is also a curve point, so interpolate an on-point curve
-                  sx = (x + (stbtt_int32) vertices[off+i+1].x) >> 1;
-                  sy = (y + (stbtt_int32) vertices[off+i+1].y) >> 1;
-               } else {
-                  // otherwise just use the next point as our start point
-                  sx = (stbtt_int32) vertices[off+i+1].x;
-                  sy = (stbtt_int32) vertices[off+i+1].y;
-                  ++i; // we're using point i+1 as the starting point, so skip it
-               }
-            } else {
-               sx = x;
-               sy = y;
-            }
-            stbtt_setvertex(&vertices[num_vertices++], STBTT_vmove,sx,sy,0,0);
-            was_off = 0;
-            next_move = 1 + ttUSHORT(endPtsOfContours+j*2);
-            ++j;
-         } else {
-            if (!(flags & 1)) { // if it's a curve
-               if (was_off) // two off-curve control points in a row means interpolate an on-curve midpoint
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, (cx+x)>>1, (cy+y)>>1, cx, cy);
-               cx = x;
-               cy = y;
-               was_off = 1;
-            } else {
-               if (was_off)
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vcurve, x,y, cx, cy);
-               else
-                  stbtt_setvertex(&vertices[num_vertices++], STBTT_vline, x,y,0,0);
-               was_off = 0;
-            }
-         }
-      }
-      num_vertices = stbtt__close_shape(vertices, num_vertices, was_off, start_off, sx,sy,scx,scy,cx,cy);
-   } else if (numberOfContours < 0) {
-      // Compound shapes.
-      int more = 1;
-      stbtt_uint8 *comp = data + g + 10;
-      num_vertices = 0;
-      vertices = 0;
-      while (more) {
-         stbtt_uint16 flags, gidx;
-         int comp_num_verts = 0, i;
-         stbtt_vertex *comp_verts = 0, *tmp = 0;
-         float mtx[6] = {1,0,0,1,0,0}, m, n;
-
-         flags = ttSHORT(comp); comp+=2;
-         gidx = ttSHORT(comp); comp+=2;
-
-         if (flags & 2) { // XY values
-            if (flags & 1) { // shorts
-               mtx[4] = ttSHORT(comp); comp+=2;
-               mtx[5] = ttSHORT(comp); comp+=2;
-            } else {
-               mtx[4] = ttCHAR(comp); comp+=1;
-               mtx[5] = ttCHAR(comp); comp+=1;
-            }
-         }
-         else {
-            // @TODO handle matching point
-            STBTT_assert(0);
-         }
-         if (flags & (1<<3)) { // WE_HAVE_A_SCALE
-            mtx[0] = mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[1] = mtx[2] = 0;
-         } else if (flags & (1<<6)) { // WE_HAVE_AN_X_AND_YSCALE
-            mtx[0] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[1] = mtx[2] = 0;
-            mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
-         } else if (flags & (1<<7)) { // WE_HAVE_A_TWO_BY_TWO
-            mtx[0] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[1] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[2] = ttSHORT(comp)/16384.0f; comp+=2;
-            mtx[3] = ttSHORT(comp)/16384.0f; comp+=2;
-         }
-
-         // Find transformation scales.
-         m = (float) STBTT_sqrt(mtx[0]*mtx[0] + mtx[1]*mtx[1]);
-         n = (float) STBTT_sqrt(mtx[2]*mtx[2] + mtx[3]*mtx[3]);
-
-         // Get indexed glyph.
-         comp_num_verts = stbtt_GetGlyphShape(info, gidx, &comp_verts);
-         if (comp_num_verts > 0) {
-            // Transform vertices.
-            for (i = 0; i < comp_num_verts; ++i) {
-               stbtt_vertex* v = &comp_verts[i];
-               stbtt_vertex_type x,y;
-               x=v->x; y=v->y;
-               v->x = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
-               v->y = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
-               x=v->cx; y=v->cy;
-               v->cx = (stbtt_vertex_type)(m * (mtx[0]*x + mtx[2]*y + mtx[4]));
-               v->cy = (stbtt_vertex_type)(n * (mtx[1]*x + mtx[3]*y + mtx[5]));
-            }
-            // Append vertices.
-            tmp = (stbtt_vertex*)STBTT_malloc((num_vertices+comp_num_verts)*sizeof(stbtt_vertex), info->userdata);
-            if (!tmp) {
-               if (vertices) STBTT_free(vertices, info->userdata);
-               if (comp_verts) STBTT_free(comp_verts, info->userdata);
-               return 0;
-            }
-            if (num_vertices > 0 && vertices) STBTT_memcpy(tmp, vertices, num_vertices*sizeof(stbtt_vertex));
-            STBTT_memcpy(tmp+num_vertices, comp_verts, comp_num_verts*sizeof(stbtt_vertex));
-            if (vertices) STBTT_free(vertices, info->userdata);
-            vertices = tmp;
-            STBTT_free(comp_verts, info->userdata);
-            num_vertices += comp_num_verts;
-         }
-         // More components ?
-         more = flags & (1<<5);
-      }
-   } else {
-      // numberOfCounters == 0, do nothing
-   }
-
-   *pvertices = vertices;
-   return num_vertices;
-}
-
-typedef struct
-{
-   int bounds;
-   int started;
-   float first_x, first_y;
-   float x, y;
-   stbtt_int32 min_x, max_x, min_y, max_y;
-
-   stbtt_vertex *pvertices;
-   int num_vertices;
-} stbtt__csctx;
-
-#define STBTT__CSCTX_INIT(bounds) {bounds,0, 0,0, 0,0, 0,0,0,0, NULL, 0}
-
-static void stbtt__track_vertex(stbtt__csctx *c, stbtt_int32 x, stbtt_int32 y)
-{
-   if (x > c->max_x || !c->started) c->max_x = x;
-   if (y > c->max_y || !c->started) c->max_y = y;
-   if (x < c->min_x || !c->started) c->min_x = x;
-   if (y < c->min_y || !c->started) c->min_y = y;
-   c->started = 1;
-}
-
-static void stbtt__csctx_v(stbtt__csctx *c, stbtt_uint8 type, stbtt_int32 x, stbtt_int32 y, stbtt_int32 cx, stbtt_int32 cy, stbtt_int32 cx1, stbtt_int32 cy1)
-{
-   if (c->bounds) {
-      stbtt__track_vertex(c, x, y);
-      if (type == STBTT_vcubic) {
-         stbtt__track_vertex(c, cx, cy);
-         stbtt__track_vertex(c, cx1, cy1);
-      }
-   } else {
-      stbtt_setvertex(&c->pvertices[c->num_vertices], type, x, y, cx, cy);
-      c->pvertices[c->num_vertices].cx1 = (stbtt_int16) cx1;
-      c->pvertices[c->num_vertices].cy1 = (stbtt_int16) cy1;
-   }
-   c->num_vertices++;
-}
-
-static void stbtt__csctx_close_shape(stbtt__csctx *ctx)
-{
-   if (ctx->first_x != ctx->x || ctx->first_y != ctx->y)
-      stbtt__csctx_v(ctx, STBTT_vline, (int)ctx->first_x, (int)ctx->first_y, 0, 0, 0, 0);
-}
-
-static void stbtt__csctx_rmove_to(stbtt__csctx *ctx, float dx, float dy)
-{
-   stbtt__csctx_close_shape(ctx);
-   ctx->first_x = ctx->x = ctx->x + dx;
-   ctx->first_y = ctx->y = ctx->y + dy;
-   stbtt__csctx_v(ctx, STBTT_vmove, (int)ctx->x, (int)ctx->y, 0, 0, 0, 0);
-}
-
-static void stbtt__csctx_rline_to(stbtt__csctx *ctx, float dx, float dy)
-{
-   ctx->x += dx;
-   ctx->y += dy;
-   stbtt__csctx_v(ctx, STBTT_vline, (int)ctx->x, (int)ctx->y, 0, 0, 0, 0);
-}
-
-static void stbtt__csctx_rccurve_to(stbtt__csctx *ctx, float dx1, float dy1, float dx2, float dy2, float dx3, float dy3)
-{
-   float cx1 = ctx->x + dx1;
-   float cy1 = ctx->y + dy1;
-   float cx2 = cx1 + dx2;
-   float cy2 = cy1 + dy2;
-   ctx->x = cx2 + dx3;
-   ctx->y = cy2 + dy3;
-   stbtt__csctx_v(ctx, STBTT_vcubic, (int)ctx->x, (int)ctx->y, (int)cx1, (int)cy1, (int)cx2, (int)cy2);
-}
-
-static stbtt__buf stbtt__get_subr(stbtt__buf idx, int n)
-{
-   int count = stbtt__cff_index_count(&idx);
-   int bias = 107;
-   if (count >= 33900)
-      bias = 32768;
-   else if (count >= 1240)
-      bias = 1131;
-   n += bias;
-   if (n < 0 || n >= count)
-      return stbtt__new_buf(NULL, 0);
-   return stbtt__cff_index_get(idx, n);
-}
-
-static stbtt__buf stbtt__cid_get_glyph_subrs(const stbtt_fontinfo *info, int glyph_index)
-{
-   stbtt__buf fdselect = info->fdselect;
-   int nranges, start, end, v, fmt, fdselector = -1, i;
-
-   stbtt__buf_seek(&fdselect, 0);
-   fmt = stbtt__buf_get8(&fdselect);
-   if (fmt == 0) {
-      // untested
-      stbtt__buf_skip(&fdselect, glyph_index);
-      fdselector = stbtt__buf_get8(&fdselect);
-   } else if (fmt == 3) {
-      nranges = stbtt__buf_get16(&fdselect);
-      start = stbtt__buf_get16(&fdselect);
-      for (i = 0; i < nranges; i++) {
-         v = stbtt__buf_get8(&fdselect);
-         end = stbtt__buf_get16(&fdselect);
-         if (glyph_index >= start && glyph_index < end) {
-            fdselector = v;
-            break;
-         }
-         start = end;
-      }
-   }
-   if (fdselector == -1) stbtt__new_buf(NULL, 0);
-   return stbtt__get_subrs(info->cff, stbtt__cff_index_get(info->fontdicts, fdselector));
-}
-
-static int stbtt__run_charstring(const stbtt_fontinfo *info, int glyph_index, stbtt__csctx *c)
-{
-   int in_header = 1, maskbits = 0, subr_stack_height = 0, sp = 0, v, i, b0;
-   int has_subrs = 0, clear_stack;
-   float s[48];
-   stbtt__buf subr_stack[10], subrs = info->subrs, b;
-   float f;
-
-#define STBTT__CSERR(s) (0)
-
-   // this currently ignores the initial width value, which isn't needed if we have hmtx
-   b = stbtt__cff_index_get(info->charstrings, glyph_index);
-   while (b.cursor < b.size) {
-      i = 0;
-      clear_stack = 1;
-      b0 = stbtt__buf_get8(&b);
-      switch (b0) {
-      // @TODO implement hinting
-      case 0x13: // hintmask
-      case 0x14: // cntrmask
-         if (in_header)
-            maskbits += (sp / 2); // implicit "vstem"
-         in_header = 0;
-         stbtt__buf_skip(&b, (maskbits + 7) / 8);
-         break;
-
-      case 0x01: // hstem
-      case 0x03: // vstem
-      case 0x12: // hstemhm
-      case 0x17: // vstemhm
-         maskbits += (sp / 2);
-         break;
-
-      case 0x15: // rmoveto
-         in_header = 0;
-         if (sp < 2) return STBTT__CSERR("rmoveto stack");
-         stbtt__csctx_rmove_to(c, s[sp-2], s[sp-1]);
-         break;
-      case 0x04: // vmoveto
-         in_header = 0;
-         if (sp < 1) return STBTT__CSERR("vmoveto stack");
-         stbtt__csctx_rmove_to(c, 0, s[sp-1]);
-         break;
-      case 0x16: // hmoveto
-         in_header = 0;
-         if (sp < 1) return STBTT__CSERR("hmoveto stack");
-         stbtt__csctx_rmove_to(c, s[sp-1], 0);
-         break;
-
-      case 0x05: // rlineto
-         if (sp < 2) return STBTT__CSERR("rlineto stack");
-         for (; i + 1 < sp; i += 2)
-            stbtt__csctx_rline_to(c, s[i], s[i+1]);
-         break;
-
-      // hlineto/vlineto and vhcurveto/hvcurveto alternate horizontal and vertical
-      // starting from a different place.
-
-      case 0x07: // vlineto
-         if (sp < 1) return STBTT__CSERR("vlineto stack");
-         goto vlineto;
-      case 0x06: // hlineto
-         if (sp < 1) return STBTT__CSERR("hlineto stack");
-         for (;;) {
-            if (i >= sp) break;
-            stbtt__csctx_rline_to(c, s[i], 0);
-            i++;
-      vlineto:
-            if (i >= sp) break;
-            stbtt__csctx_rline_to(c, 0, s[i]);
-            i++;
-         }
-         break;
-
-      case 0x1F: // hvcurveto
-         if (sp < 4) return STBTT__CSERR("hvcurveto stack");
-         goto hvcurveto;
-      case 0x1E: // vhcurveto
-         if (sp < 4) return STBTT__CSERR("vhcurveto stack");
-         for (;;) {
-            if (i + 3 >= sp) break;
-            stbtt__csctx_rccurve_to(c, 0, s[i], s[i+1], s[i+2], s[i+3], (sp - i == 5) ? s[i + 4] : 0.0f);
-            i += 4;
-      hvcurveto:
-            if (i + 3 >= sp) break;
-            stbtt__csctx_rccurve_to(c, s[i], 0, s[i+1], s[i+2], (sp - i == 5) ? s[i+4] : 0.0f, s[i+3]);
-            i += 4;
-         }
-         break;
-
-      case 0x08: // rrcurveto
-         if (sp < 6) return STBTT__CSERR("rcurveline stack");
-         for (; i + 5 < sp; i += 6)
-            stbtt__csctx_rccurve_to(c, s[i], s[i+1], s[i+2], s[i+3], s[i+4], s[i+5]);
-         break;
-
-      case 0x18: // rcurveline
-         if (sp < 8) return STBTT__CSERR("rcurveline stack");
-         for (; i + 5 < sp - 2; i += 6)
-            stbtt__csctx_rccurve_to(c, s[i], s[i+1], s[i+2], s[i+3], s[i+4], s[i+5]);
-         if (i + 1 >= sp) return STBTT__CSERR("rcurveline stack");
-         stbtt__csctx_rline_to(c, s[i], s[i+1]);
-         break;
-
-      case 0x19: // rlinecurve
-         if (sp < 8) return STBTT__CSERR("rlinecurve stack");
-         for (; i + 1 < sp - 6; i += 2)
-            stbtt__csctx_rline_to(c, s[i], s[i+1]);
-         if (i + 5 >= sp) return STBTT__CSERR("rlinecurve stack");
-         stbtt__csctx_rccurve_to(c, s[i], s[i+1], s[i+2], s[i+3], s[i+4], s[i+5]);
-         break;
-
-      case 0x1A: // vvcurveto
-      case 0x1B: // hhcurveto
-         if (sp < 4) return STBTT__CSERR("(vv|hh)curveto stack");
-         f = 0.0;
-         if (sp & 1) { f = s[i]; i++; }
-         for (; i + 3 < sp; i += 4) {
-            if (b0 == 0x1B)
-               stbtt__csctx_rccurve_to(c, s[i], f, s[i+1], s[i+2], s[i+3], 0.0);
-            else
-               stbtt__csctx_rccurve_to(c, f, s[i], s[i+1], s[i+2], 0.0, s[i+3]);
-            f = 0.0;
-         }
-         break;
-
-      case 0x0A: // callsubr
-         if (!has_subrs) {
-            if (info->fdselect.size)
-               subrs = stbtt__cid_get_glyph_subrs(info, glyph_index);
-            has_subrs = 1;
-         }
-         // FALLTHROUGH
-      case 0x1D: // callgsubr
-         if (sp < 1) return STBTT__CSERR("call(g|)subr stack");
-         v = (int) s[--sp];
-         if (subr_stack_height >= 10) return STBTT__CSERR("recursion limit");
-         subr_stack[subr_stack_height++] = b;
-         b = stbtt__get_subr(b0 == 0x0A ? subrs : info->gsubrs, v);
-         if (b.size == 0) return STBTT__CSERR("subr not found");
-         b.cursor = 0;
-         clear_stack = 0;
-         break;
-
-      case 0x0B: // return
-         if (subr_stack_height <= 0) return STBTT__CSERR("return outside subr");
-         b = subr_stack[--subr_stack_height];
-         clear_stack = 0;
-         break;
-
-      case 0x0E: // endchar
-         stbtt__csctx_close_shape(c);
-         return 1;
-
-      case 0x0C: { // two-byte escape
-         float dx1, dx2, dx3, dx4, dx5, dx6, dy1, dy2, dy3, dy4, dy5, dy6;
-         float dx, dy;
-         int b1 = stbtt__buf_get8(&b);
-         switch (b1) {
-         // @TODO These "flex" implementations ignore the flex-depth and resolution,
-         // and always draw beziers.
-         case 0x22: // hflex
-            if (sp < 7) return STBTT__CSERR("hflex stack");
-            dx1 = s[0];
-            dx2 = s[1];
-            dy2 = s[2];
-            dx3 = s[3];
-            dx4 = s[4];
-            dx5 = s[5];
-            dx6 = s[6];
-            stbtt__csctx_rccurve_to(c, dx1, 0, dx2, dy2, dx3, 0);
-            stbtt__csctx_rccurve_to(c, dx4, 0, dx5, -dy2, dx6, 0);
-            break;
-
-         case 0x23: // flex
-            if (sp < 13) return STBTT__CSERR("flex stack");
-            dx1 = s[0];
-            dy1 = s[1];
-            dx2 = s[2];
-            dy2 = s[3];
-            dx3 = s[4];
-            dy3 = s[5];
-            dx4 = s[6];
-            dy4 = s[7];
-            dx5 = s[8];
-            dy5 = s[9];
-            dx6 = s[10];
-            dy6 = s[11];
-            //fd is s[12]
-            stbtt__csctx_rccurve_to(c, dx1, dy1, dx2, dy2, dx3, dy3);
-            stbtt__csctx_rccurve_to(c, dx4, dy4, dx5, dy5, dx6, dy6);
-            break;
-
-         case 0x24: // hflex1
-            if (sp < 9) return STBTT__CSERR("hflex1 stack");
-            dx1 = s[0];
-            dy1 = s[1];
-            dx2 = s[2];
-            dy2 = s[3];
-            dx3 = s[4];
-            dx4 = s[5];
-            dx5 = s[6];
-            dy5 = s[7];
-            dx6 = s[8];
-            stbtt__csctx_rccurve_to(c, dx1, dy1, dx2, dy2, dx3, 0);
-            stbtt__csctx_rccurve_to(c, dx4, 0, dx5, dy5, dx6, -(dy1+dy2+dy5));
-            break;
-
-         case 0x25: // flex1
-            if (sp < 11) return STBTT__CSERR("flex1 stack");
-            dx1 = s[0];
-            dy1 = s[1];
-            dx2 = s[2];
-            dy2 = s[3];
-            dx3 = s[4];
-            dy3 = s[5];
-            dx4 = s[6];
-            dy4 = s[7];
-            dx5 = s[8];
-            dy5 = s[9];
-            dx6 = dy6 = s[10];
-            dx = dx1+dx2+dx3+dx4+dx5;
-            dy = dy1+dy2+dy3+dy4+dy5;
-            if (STBTT_fabs(dx) > STBTT_fabs(dy))
-               dy6 = -dy;
-            else
-               dx6 = -dx;
-            stbtt__csctx_rccurve_to(c, dx1, dy1, dx2, dy2, dx3, dy3);
-            stbtt__csctx_rccurve_to(c, dx4, dy4, dx5, dy5, dx6, dy6);
-            break;
-
-         default:
-            return STBTT__CSERR("unimplemented");
-         }
-      } break;
-
-      default:
-         if (b0 != 255 && b0 != 28 && b0 < 32)
-            return STBTT__CSERR("reserved operator");
-
-         // push immediate
-         if (b0 == 255) {
-            f = (float)(stbtt_int32)stbtt__buf_get32(&b) / 0x10000;
-         } else {
-            stbtt__buf_skip(&b, -1);
-            f = (float)(stbtt_int16)stbtt__cff_int(&b);
-         }
-         if (sp >= 48) return STBTT__CSERR("push stack overflow");
-         s[sp++] = f;
-         clear_stack = 0;
-         break;
-      }
-      if (clear_stack) sp = 0;
-   }
-   return STBTT__CSERR("no endchar");
-
-#undef STBTT__CSERR
-}
-
-static int stbtt__GetGlyphShapeT2(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
-{
-   // runs the charstring twice, once to count and once to output (to avoid realloc)
-   stbtt__csctx count_ctx = STBTT__CSCTX_INIT(1);
-   stbtt__csctx output_ctx = STBTT__CSCTX_INIT(0);
-   if (stbtt__run_charstring(info, glyph_index, &count_ctx)) {
-      *pvertices = (stbtt_vertex*)STBTT_malloc(count_ctx.num_vertices*sizeof(stbtt_vertex), info->userdata);
-      output_ctx.pvertices = *pvertices;
-      if (stbtt__run_charstring(info, glyph_index, &output_ctx)) {
-         STBTT_assert(output_ctx.num_vertices == count_ctx.num_vertices);
-         return output_ctx.num_vertices;
-      }
-   }
-   *pvertices = NULL;
-   return 0;
-}
-
-static int stbtt__GetGlyphInfoT2(const stbtt_fontinfo *info, int glyph_index, int *x0, int *y0, int *x1, int *y1)
-{
-   stbtt__csctx c = STBTT__CSCTX_INIT(1);
-   int r = stbtt__run_charstring(info, glyph_index, &c);
-   if (x0)  *x0 = r ? c.min_x : 0;
-   if (y0)  *y0 = r ? c.min_y : 0;
-   if (x1)  *x1 = r ? c.max_x : 0;
-   if (y1)  *y1 = r ? c.max_y : 0;
-   return r ? c.num_vertices : 0;
-}
-
-STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, stbtt_vertex **pvertices)
-{
-   if (!info->cff.size)
-      return stbtt__GetGlyphShapeTT(info, glyph_index, pvertices);
-   else
-      return stbtt__GetGlyphShapeT2(info, glyph_index, pvertices);
-}
-
-STBTT_DEF void stbtt_GetGlyphHMetrics(const stbtt_fontinfo *info, int glyph_index, int *advanceWidth, int *leftSideBearing)
-{
-   stbtt_uint16 numOfLongHorMetrics = ttUSHORT(info->data+info->hhea + 34);
-   if (glyph_index < numOfLongHorMetrics) {
-      if (advanceWidth)     *advanceWidth    = ttSHORT(info->data + info->hmtx + 4*glyph_index);
-      if (leftSideBearing)  *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*glyph_index + 2);
-   } else {
-      if (advanceWidth)     *advanceWidth    = ttSHORT(info->data + info->hmtx + 4*(numOfLongHorMetrics-1));
-      if (leftSideBearing)  *leftSideBearing = ttSHORT(info->data + info->hmtx + 4*numOfLongHorMetrics + 2*(glyph_index - numOfLongHorMetrics));
-   }
-}
-
-STBTT_DEF int  stbtt_GetKerningTableLength(const stbtt_fontinfo *info)
-{
-   stbtt_uint8 *data = info->data + info->kern;
-
-   // we only look at the first table. it must be 'horizontal' and format 0.
-   if (!info->kern)
-      return 0;
-   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
-      return 0;
-   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
-      return 0;
-
-   return ttUSHORT(data+10);
-}
-
-STBTT_DEF int stbtt_GetKerningTable(const stbtt_fontinfo *info, stbtt_kerningentry* table, int table_length)
-{
-   stbtt_uint8 *data = info->data + info->kern;
-   int k, length;
-
-   // we only look at the first table. it must be 'horizontal' and format 0.
-   if (!info->kern)
-      return 0;
-   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
-      return 0;
-   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
-      return 0;
-
-   length = ttUSHORT(data+10);
-   if (table_length < length)
-      length = table_length;
-
-   for (k = 0; k < length; k++)
-   {
-      table[k].glyph1 = ttUSHORT(data+18+(k*6));
-      table[k].glyph2 = ttUSHORT(data+20+(k*6));
-      table[k].advance = ttSHORT(data+22+(k*6));
-   }
-
-   return length;
-}
-
-static int stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
-{
-   stbtt_uint8 *data = info->data + info->kern;
-   stbtt_uint32 needle, straw;
-   int l, r, m;
-
-   // we only look at the first table. it must be 'horizontal' and format 0.
-   if (!info->kern)
-      return 0;
-   if (ttUSHORT(data+2) < 1) // number of tables, need at least 1
-      return 0;
-   if (ttUSHORT(data+8) != 1) // horizontal flag must be set in format
-      return 0;
-
-   l = 0;
-   r = ttUSHORT(data+10) - 1;
-   needle = glyph1 << 16 | glyph2;
-   while (l <= r) {
-      m = (l + r) >> 1;
-      straw = ttULONG(data+18+(m*6)); // note: unaligned read
-      if (needle < straw)
-         r = m - 1;
-      else if (needle > straw)
-         l = m + 1;
-      else
-         return ttSHORT(data+22+(m*6));
-   }
-   return 0;
-}
-
-static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph)
-{
-   stbtt_uint16 coverageFormat = ttUSHORT(coverageTable);
-   switch (coverageFormat) {
-      case 1: {
-         stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2);
-
-         // Binary search.
-         stbtt_int32 l=0, r=glyphCount-1, m;
-         int straw, needle=glyph;
-         while (l <= r) {
-            stbtt_uint8 *glyphArray = coverageTable + 4;
-            stbtt_uint16 glyphID;
-            m = (l + r) >> 1;
-            glyphID = ttUSHORT(glyphArray + 2 * m);
-            straw = glyphID;
-            if (needle < straw)
-               r = m - 1;
-            else if (needle > straw)
-               l = m + 1;
-            else {
-               return m;
-            }
-         }
-         break;
-      }
-
-      case 2: {
-         stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2);
-         stbtt_uint8 *rangeArray = coverageTable + 4;
-
-         // Binary search.
-         stbtt_int32 l=0, r=rangeCount-1, m;
-         int strawStart, strawEnd, needle=glyph;
-         while (l <= r) {
-            stbtt_uint8 *rangeRecord;
-            m = (l + r) >> 1;
-            rangeRecord = rangeArray + 6 * m;
-            strawStart = ttUSHORT(rangeRecord);
-            strawEnd = ttUSHORT(rangeRecord + 2);
-            if (needle < strawStart)
-               r = m - 1;
-            else if (needle > strawEnd)
-               l = m + 1;
-            else {
-               stbtt_uint16 startCoverageIndex = ttUSHORT(rangeRecord + 4);
-               return startCoverageIndex + glyph - strawStart;
-            }
-         }
-         break;
-      }
-
-      default: return -1; // unsupported
-   }
-
-   return -1;
-}
-
-static stbtt_int32  stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph)
-{
-   stbtt_uint16 classDefFormat = ttUSHORT(classDefTable);
-   switch (classDefFormat)
-   {
-      case 1: {
-         stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2);
-         stbtt_uint16 glyphCount = ttUSHORT(classDefTable + 4);
-         stbtt_uint8 *classDef1ValueArray = classDefTable + 6;
-
-         if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount)
-            return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID));
-         break;
-      }
-
-      case 2: {
-         stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2);
-         stbtt_uint8 *classRangeRecords = classDefTable + 4;
-
-         // Binary search.
-         stbtt_int32 l=0, r=classRangeCount-1, m;
-         int strawStart, strawEnd, needle=glyph;
-         while (l <= r) {
-            stbtt_uint8 *classRangeRecord;
-            m = (l + r) >> 1;
-            classRangeRecord = classRangeRecords + 6 * m;
-            strawStart = ttUSHORT(classRangeRecord);
-            strawEnd = ttUSHORT(classRangeRecord + 2);
-            if (needle < strawStart)
-               r = m - 1;
-            else if (needle > strawEnd)
-               l = m + 1;
-            else
-               return (stbtt_int32)ttUSHORT(classRangeRecord + 4);
-         }
-         break;
-      }
-
-      default:
-         return -1; // Unsupported definition type, return an error.
-   }
-
-   // "All glyphs not assigned to a class fall into class 0". (OpenType spec)
-   return 0;
-}
-
-// Define to STBTT_assert(x) if you want to break on unimplemented formats.
-#define STBTT_GPOS_TODO_assert(x)
-
-static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, int glyph1, int glyph2)
-{
-   stbtt_uint16 lookupListOffset;
-   stbtt_uint8 *lookupList;
-   stbtt_uint16 lookupCount;
-   stbtt_uint8 *data;
-   stbtt_int32 i, sti;
-
-   if (!info->gpos) return 0;
-
-   data = info->data + info->gpos;
-
-   if (ttUSHORT(data+0) != 1) return 0; // Major version 1
-   if (ttUSHORT(data+2) != 0) return 0; // Minor version 0
-
-   lookupListOffset = ttUSHORT(data+8);
-   lookupList = data + lookupListOffset;
-   lookupCount = ttUSHORT(lookupList);
-
-   for (i=0; i<lookupCount; ++i) {
-      stbtt_uint16 lookupOffset = ttUSHORT(lookupList + 2 + 2 * i);
-      stbtt_uint8 *lookupTable = lookupList + lookupOffset;
-
-      stbtt_uint16 lookupType = ttUSHORT(lookupTable);
-      stbtt_uint16 subTableCount = ttUSHORT(lookupTable + 4);
-      stbtt_uint8 *subTableOffsets = lookupTable + 6;
-      if (lookupType != 2) // Pair Adjustment Positioning Subtable
-         continue;
-
-      for (sti=0; sti<subTableCount; sti++) {
-         stbtt_uint16 subtableOffset = ttUSHORT(subTableOffsets + 2 * sti);
-         stbtt_uint8 *table = lookupTable + subtableOffset;
-         stbtt_uint16 posFormat = ttUSHORT(table);
-         stbtt_uint16 coverageOffset = ttUSHORT(table + 2);
-         stbtt_int32 coverageIndex = stbtt__GetCoverageIndex(table + coverageOffset, glyph1);
-         if (coverageIndex == -1) continue;
-
-         switch (posFormat) {
-            case 1: {
-               stbtt_int32 l, r, m;
-               int straw, needle;
-               stbtt_uint16 valueFormat1 = ttUSHORT(table + 4);
-               stbtt_uint16 valueFormat2 = ttUSHORT(table + 6);
-               if (valueFormat1 == 4 && valueFormat2 == 0) { // Support more formats?
-                  stbtt_int32 valueRecordPairSizeInBytes = 2;
-                  stbtt_uint16 pairSetCount = ttUSHORT(table + 8);
-                  stbtt_uint16 pairPosOffset = ttUSHORT(table + 10 + 2 * coverageIndex);
-                  stbtt_uint8 *pairValueTable = table + pairPosOffset;
-                  stbtt_uint16 pairValueCount = ttUSHORT(pairValueTable);
-                  stbtt_uint8 *pairValueArray = pairValueTable + 2;
-
-                  if (coverageIndex >= pairSetCount) return 0;
-
-                  needle=glyph2;
-                  r=pairValueCount-1;
-                  l=0;
-
-                  // Binary search.
-                  while (l <= r) {
-                     stbtt_uint16 secondGlyph;
-                     stbtt_uint8 *pairValue;
-                     m = (l + r) >> 1;
-                     pairValue = pairValueArray + (2 + valueRecordPairSizeInBytes) * m;
-                     secondGlyph = ttUSHORT(pairValue);
-                     straw = secondGlyph;
-                     if (needle < straw)
-                        r = m - 1;
-                     else if (needle > straw)
-                        l = m + 1;
-                     else {
-                        stbtt_int16 xAdvance = ttSHORT(pairValue + 2);
-                        return xAdvance;
-                     }
-                  }
-               } else
-                  return 0;
-               break;
-            }
-
-            case 2: {
-               stbtt_uint16 valueFormat1 = ttUSHORT(table + 4);
-               stbtt_uint16 valueFormat2 = ttUSHORT(table + 6);
-               if (valueFormat1 == 4 && valueFormat2 == 0) { // Support more formats?
-                  stbtt_uint16 classDef1Offset = ttUSHORT(table + 8);
-                  stbtt_uint16 classDef2Offset = ttUSHORT(table + 10);
-                  int glyph1class = stbtt__GetGlyphClass(table + classDef1Offset, glyph1);
-                  int glyph2class = stbtt__GetGlyphClass(table + classDef2Offset, glyph2);
-
-                  stbtt_uint16 class1Count = ttUSHORT(table + 12);
-                  stbtt_uint16 class2Count = ttUSHORT(table + 14);
-                  stbtt_uint8 *class1Records, *class2Records;
-                  stbtt_int16 xAdvance;
-
-                  if (glyph1class < 0 || glyph1class >= class1Count) return 0; // malformed
-                  if (glyph2class < 0 || glyph2class >= class2Count) return 0; // malformed
-
-                  class1Records = table + 16;
-                  class2Records = class1Records + 2 * (glyph1class * class2Count);
-                  xAdvance = ttSHORT(class2Records + 2 * glyph2class);
-                  return xAdvance;
-               } else
-                  return 0;
-               break;
-            }
-
-            default:
-               return 0; // Unsupported position format
-         }
-      }
-   }
-
-   return 0;
-}
-
-STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int g2)
-{
-   int xAdvance = 0;
-
-   if (info->gpos)
-      xAdvance += stbtt__GetGlyphGPOSInfoAdvance(info, g1, g2);
-   else if (info->kern)
-      xAdvance += stbtt__GetGlyphKernInfoAdvance(info, g1, g2);
-
-   return xAdvance;
-}
-
-STBTT_DEF int  stbtt_GetCodepointKernAdvance(const stbtt_fontinfo *info, int ch1, int ch2)
-{
-   if (!info->kern && !info->gpos) // if no kerning table, don't waste time looking up both codepoint->glyphs
-      return 0;
-   return stbtt_GetGlyphKernAdvance(info, stbtt_FindGlyphIndex(info,ch1), stbtt_FindGlyphIndex(info,ch2));
-}
-
-STBTT_DEF void stbtt_GetCodepointHMetrics(const stbtt_fontinfo *info, int codepoint, int *advanceWidth, int *leftSideBearing)
-{
-   stbtt_GetGlyphHMetrics(info, stbtt_FindGlyphIndex(info,codepoint), advanceWidth, leftSideBearing);
-}
-
-STBTT_DEF void stbtt_GetFontVMetrics(const stbtt_fontinfo *info, int *ascent, int *descent, int *lineGap)
-{
-   if (ascent ) *ascent  = ttSHORT(info->data+info->hhea + 4);
-   if (descent) *descent = ttSHORT(info->data+info->hhea + 6);
-   if (lineGap) *lineGap = ttSHORT(info->data+info->hhea + 8);
-}
-
-STBTT_DEF int  stbtt_GetFontVMetricsOS2(const stbtt_fontinfo *info, int *typoAscent, int *typoDescent, int *typoLineGap)
-{
-   int tab = stbtt__find_table(info->data, info->fontstart, "OS/2");
-   if (!tab)
-      return 0;
-   if (typoAscent ) *typoAscent  = ttSHORT(info->data+tab + 68);
-   if (typoDescent) *typoDescent = ttSHORT(info->data+tab + 70);
-   if (typoLineGap) *typoLineGap = ttSHORT(info->data+tab + 72);
-   return 1;
-}
-
-STBTT_DEF void stbtt_GetFontBoundingBox(const stbtt_fontinfo *info, int *x0, int *y0, int *x1, int *y1)
-{
-   *x0 = ttSHORT(info->data + info->head + 36);
-   *y0 = ttSHORT(info->data + info->head + 38);
-   *x1 = ttSHORT(info->data + info->head + 40);
-   *y1 = ttSHORT(info->data + info->head + 42);
-}
-
-STBTT_DEF float stbtt_ScaleForPixelHeight(const stbtt_fontinfo *info, float height)
-{
-   int fheight = ttSHORT(info->data + info->hhea + 4) - ttSHORT(info->data + info->hhea + 6);
-   return (float) height / fheight;
-}
-
-STBTT_DEF float stbtt_ScaleForMappingEmToPixels(const stbtt_fontinfo *info, float pixels)
-{
-   int unitsPerEm = ttUSHORT(info->data + info->head + 18);
-   return pixels / unitsPerEm;
-}
-
-STBTT_DEF void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *v)
-{
-   STBTT_free(v, info->userdata);
-}
-
-STBTT_DEF stbtt_uint8 *stbtt_FindSVGDoc(const stbtt_fontinfo *info, int gl)
-{
-   int i;
-   stbtt_uint8 *data = info->data;
-   stbtt_uint8 *svg_doc_list = data + stbtt__get_svg((stbtt_fontinfo *) info);
-
-   int numEntries = ttUSHORT(svg_doc_list);
-   stbtt_uint8 *svg_docs = svg_doc_list + 2;
-
-   for(i=0; i<numEntries; i++) {
-      stbtt_uint8 *svg_doc = svg_docs + (12 * i);
-      if ((gl >= ttUSHORT(svg_doc)) && (gl <= ttUSHORT(svg_doc + 2)))
-         return svg_doc;
-   }
-   return 0;
-}
-
-STBTT_DEF int stbtt_GetGlyphSVG(const stbtt_fontinfo *info, int gl, const char **svg)
-{
-   stbtt_uint8 *data = info->data;
-   stbtt_uint8 *svg_doc;
-
-   if (info->svg == 0)
-      return 0;
-
-   svg_doc = stbtt_FindSVGDoc(info, gl);
-   if (svg_doc != NULL) {
-      *svg = (char *) data + info->svg + ttULONG(svg_doc + 4);
-      return ttULONG(svg_doc + 8);
-   } else {
-      return 0;
-   }
-}
-
-STBTT_DEF int stbtt_GetCodepointSVG(const stbtt_fontinfo *info, int unicode_codepoint, const char **svg)
-{
-   return stbtt_GetGlyphSVG(info, stbtt_FindGlyphIndex(info, unicode_codepoint), svg);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// antialiasing software rasterizer
-//
-
-STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   int x0=0,y0=0,x1,y1; // =0 suppresses compiler warning
-   if (!stbtt_GetGlyphBox(font, glyph, &x0,&y0,&x1,&y1)) {
-      // e.g. space character
-      if (ix0) *ix0 = 0;
-      if (iy0) *iy0 = 0;
-      if (ix1) *ix1 = 0;
-      if (iy1) *iy1 = 0;
-   } else {
-      // move to integral bboxes (treating pixels as little squares, what pixels get touched)?
-      if (ix0) *ix0 = STBTT_ifloor( x0 * scale_x + shift_x);
-      if (iy0) *iy0 = STBTT_ifloor(-y1 * scale_y + shift_y);
-      if (ix1) *ix1 = STBTT_iceil ( x1 * scale_x + shift_x);
-      if (iy1) *iy1 = STBTT_iceil (-y0 * scale_y + shift_y);
-   }
-}
-
-STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   stbtt_GetGlyphBitmapBoxSubpixel(font, glyph, scale_x, scale_y,0.0f,0.0f, ix0, iy0, ix1, iy1);
-}
-
-STBTT_DEF void stbtt_GetCodepointBitmapBoxSubpixel(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   stbtt_GetGlyphBitmapBoxSubpixel(font, stbtt_FindGlyphIndex(font,codepoint), scale_x, scale_y,shift_x,shift_y, ix0,iy0,ix1,iy1);
-}
-
-STBTT_DEF void stbtt_GetCodepointBitmapBox(const stbtt_fontinfo *font, int codepoint, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1)
-{
-   stbtt_GetCodepointBitmapBoxSubpixel(font, codepoint, scale_x, scale_y,0.0f,0.0f, ix0,iy0,ix1,iy1);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  Rasterizer
-
-typedef struct stbtt__hheap_chunk
-{
-   struct stbtt__hheap_chunk *next;
-} stbtt__hheap_chunk;
-
-typedef struct stbtt__hheap
-{
-   struct stbtt__hheap_chunk *head;
-   void   *first_free;
-   int    num_remaining_in_head_chunk;
-} stbtt__hheap;
-
-static void *stbtt__hheap_alloc(stbtt__hheap *hh, size_t size, void *userdata)
-{
-   if (hh->first_free) {
-      void *p = hh->first_free;
-      hh->first_free = * (void **) p;
-      return p;
-   } else {
-      if (hh->num_remaining_in_head_chunk == 0) {
-         int count = (size < 32 ? 2000 : size < 128 ? 800 : 100);
-         stbtt__hheap_chunk *c = (stbtt__hheap_chunk *) STBTT_malloc(sizeof(stbtt__hheap_chunk) + size * count, userdata);
-         if (c == NULL)
-            return NULL;
-         c->next = hh->head;
-         hh->head = c;
-         hh->num_remaining_in_head_chunk = count;
-      }
-      --hh->num_remaining_in_head_chunk;
-      return (char *) (hh->head) + sizeof(stbtt__hheap_chunk) + size * hh->num_remaining_in_head_chunk;
-   }
-}
-
-static void stbtt__hheap_free(stbtt__hheap *hh, void *p)
-{
-   *(void **) p = hh->first_free;
-   hh->first_free = p;
-}
-
-static void stbtt__hheap_cleanup(stbtt__hheap *hh, void *userdata)
-{
-   stbtt__hheap_chunk *c = hh->head;
-   while (c) {
-      stbtt__hheap_chunk *n = c->next;
-      STBTT_free(c, userdata);
-      c = n;
-   }
-}
-
-typedef struct stbtt__edge {
-   float x0,y0, x1,y1;
-   int invert;
-} stbtt__edge;
-
-
-typedef struct stbtt__active_edge
-{
-   struct stbtt__active_edge *next;
-   #if STBTT_RASTERIZER_VERSION==1
-   int x,dx;
-   float ey;
-   int direction;
-   #elif STBTT_RASTERIZER_VERSION==2
-   float fx,fdx,fdy;
-   float direction;
-   float sy;
-   float ey;
-   #else
-   #error "Unrecognized value of STBTT_RASTERIZER_VERSION"
-   #endif
-} stbtt__active_edge;
-
-#if STBTT_RASTERIZER_VERSION == 1
-#define STBTT_FIXSHIFT   10
-#define STBTT_FIX        (1 << STBTT_FIXSHIFT)
-#define STBTT_FIXMASK    (STBTT_FIX-1)
-
-static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata)
-{
-   stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata);
-   float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
-   STBTT_assert(z != NULL);
-   if (!z) return z;
-
-   // round dx down to avoid overshooting
-   if (dxdy < 0)
-      z->dx = -STBTT_ifloor(STBTT_FIX * -dxdy);
-   else
-      z->dx = STBTT_ifloor(STBTT_FIX * dxdy);
-
-   z->x = STBTT_ifloor(STBTT_FIX * e->x0 + z->dx * (start_point - e->y0)); // use z->dx so when we offset later it's by the same amount
-   z->x -= off_x * STBTT_FIX;
-
-   z->ey = e->y1;
-   z->next = 0;
-   z->direction = e->invert ? 1 : -1;
-   return z;
-}
-#elif STBTT_RASTERIZER_VERSION == 2
-static stbtt__active_edge *stbtt__new_active(stbtt__hheap *hh, stbtt__edge *e, int off_x, float start_point, void *userdata)
-{
-   stbtt__active_edge *z = (stbtt__active_edge *) stbtt__hheap_alloc(hh, sizeof(*z), userdata);
-   float dxdy = (e->x1 - e->x0) / (e->y1 - e->y0);
-   STBTT_assert(z != NULL);
-   //STBTT_assert(e->y0 <= start_point);
-   if (!z) return z;
-   z->fdx = dxdy;
-   z->fdy = dxdy != 0.0f ? (1.0f/dxdy) : 0.0f;
-   z->fx = e->x0 + dxdy * (start_point - e->y0);
-   z->fx -= off_x;
-   z->direction = e->invert ? 1.0f : -1.0f;
-   z->sy = e->y0;
-   z->ey = e->y1;
-   z->next = 0;
-   return z;
-}
-#else
-#error "Unrecognized value of STBTT_RASTERIZER_VERSION"
-#endif
-
-#if STBTT_RASTERIZER_VERSION == 1
-// note: this routine clips fills that extend off the edges... ideally this
-// wouldn't happen, but it could happen if the truetype glyph bounding boxes
-// are wrong, or if the user supplies a too-small bitmap
-static void stbtt__fill_active_edges(unsigned char *scanline, int len, stbtt__active_edge *e, int max_weight)
-{
-   // non-zero winding fill
-   int x0=0, w=0;
-
-   while (e) {
-      if (w == 0) {
-         // if we're currently at zero, we need to record the edge start point
-         x0 = e->x; w += e->direction;
-      } else {
-         int x1 = e->x; w += e->direction;
-         // if we went to zero, we need to draw
-         if (w == 0) {
-            int i = x0 >> STBTT_FIXSHIFT;
-            int j = x1 >> STBTT_FIXSHIFT;
-
-            if (i < len && j >= 0) {
-               if (i == j) {
-                  // x0,x1 are the same pixel, so compute combined coverage
-                  scanline[i] = scanline[i] + (stbtt_uint8) ((x1 - x0) * max_weight >> STBTT_FIXSHIFT);
-               } else {
-                  if (i >= 0) // add antialiasing for x0
-                     scanline[i] = scanline[i] + (stbtt_uint8) (((STBTT_FIX - (x0 & STBTT_FIXMASK)) * max_weight) >> STBTT_FIXSHIFT);
-                  else
-                     i = -1; // clip
-
-                  if (j < len) // add antialiasing for x1
-                     scanline[j] = scanline[j] + (stbtt_uint8) (((x1 & STBTT_FIXMASK) * max_weight) >> STBTT_FIXSHIFT);
-                  else
-                     j = len; // clip
-
-                  for (++i; i < j; ++i) // fill pixels between x0 and x1
-                     scanline[i] = scanline[i] + (stbtt_uint8) max_weight;
-               }
-            }
-         }
-      }
-
-      e = e->next;
-   }
-}
-
-static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int n, int vsubsample, int off_x, int off_y, void *userdata)
-{
-   stbtt__hheap hh = { 0, 0, 0 };
-   stbtt__active_edge *active = NULL;
-   int y,j=0;
-   int max_weight = (255 / vsubsample);  // weight per vertical scanline
-   int s; // vertical subsample index
-   unsigned char scanline_data[512], *scanline;
-
-   if (result->w > 512)
-      scanline = (unsigned char *) STBTT_malloc(result->w, userdata);
-   else
-      scanline = scanline_data;
-
-   y = off_y * vsubsample;
-   e[n].y0 = (off_y + result->h) * (float) vsubsample + 1;
-
-   while (j < result->h) {
-      STBTT_memset(scanline, 0, result->w);
-      for (s=0; s < vsubsample; ++s) {
-         // find center of pixel for this scanline
-         float scan_y = y + 0.5f;
-         stbtt__active_edge **step = &active;
-
-         // update all active edges;
-         // remove all active edges that terminate before the center of this scanline
-         while (*step) {
-            stbtt__active_edge * z = *step;
-            if (z->ey <= scan_y) {
-               *step = z->next; // delete from list
-               STBTT_assert(z->direction);
-               z->direction = 0;
-               stbtt__hheap_free(&hh, z);
-            } else {
-               z->x += z->dx; // advance to position for current scanline
-               step = &((*step)->next); // advance through list
-            }
-         }
-
-         // resort the list if needed
-         for(;;) {
-            int changed=0;
-            step = &active;
-            while (*step && (*step)->next) {
-               if ((*step)->x > (*step)->next->x) {
-                  stbtt__active_edge *t = *step;
-                  stbtt__active_edge *q = t->next;
-
-                  t->next = q->next;
-                  q->next = t;
-                  *step = q;
-                  changed = 1;
-               }
-               step = &(*step)->next;
-            }
-            if (!changed) break;
-         }
-
-         // insert all edges that start before the center of this scanline -- omit ones that also end on this scanline
-         while (e->y0 <= scan_y) {
-            if (e->y1 > scan_y) {
-               stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y, userdata);
-               if (z != NULL) {
-                  // find insertion point
-                  if (active == NULL)
-                     active = z;
-                  else if (z->x < active->x) {
-                     // insert at front
-                     z->next = active;
-                     active = z;
-                  } else {
-                     // find thing to insert AFTER
-                     stbtt__active_edge *p = active;
-                     while (p->next && p->next->x < z->x)
-                        p = p->next;
-                     // at this point, p->next->x is NOT < z->x
-                     z->next = p->next;
-                     p->next = z;
-                  }
-               }
-            }
-            ++e;
-         }
-
-         // now process all active edges in XOR fashion
-         if (active)
-            stbtt__fill_active_edges(scanline, result->w, active, max_weight);
-
-         ++y;
-      }
-      STBTT_memcpy(result->pixels + j * result->stride, scanline, result->w);
-      ++j;
-   }
-
-   stbtt__hheap_cleanup(&hh, userdata);
-
-   if (scanline != scanline_data)
-      STBTT_free(scanline, userdata);
-}
-
-#elif STBTT_RASTERIZER_VERSION == 2
-
-// the edge passed in here does not cross the vertical line at x or the vertical line at x+1
-// (i.e. it has already been clipped to those)
-static void stbtt__handle_clipped_edge(float *scanline, int x, stbtt__active_edge *e, float x0, float y0, float x1, float y1)
-{
-   if (y0 == y1) return;
-   STBTT_assert(y0 < y1);
-   STBTT_assert(e->sy <= e->ey);
-   if (y0 > e->ey) return;
-   if (y1 < e->sy) return;
-   if (y0 < e->sy) {
-      x0 += (x1-x0) * (e->sy - y0) / (y1-y0);
-      y0 = e->sy;
-   }
-   if (y1 > e->ey) {
-      x1 += (x1-x0) * (e->ey - y1) / (y1-y0);
-      y1 = e->ey;
-   }
-
-   if (x0 == x)
-      STBTT_assert(x1 <= x+1);
-   else if (x0 == x+1)
-      STBTT_assert(x1 >= x);
-   else if (x0 <= x)
-      STBTT_assert(x1 <= x);
-   else if (x0 >= x+1)
-      STBTT_assert(x1 >= x+1);
-   else
-      STBTT_assert(x1 >= x && x1 <= x+1);
-
-   if (x0 <= x && x1 <= x)
-      scanline[x] += e->direction * (y1-y0);
-   else if (x0 >= x+1 && x1 >= x+1)
-      ;
-   else {
-      STBTT_assert(x0 >= x && x0 <= x+1 && x1 >= x && x1 <= x+1);
-      scanline[x] += e->direction * (y1-y0) * (1-((x0-x)+(x1-x))/2); // coverage = 1 - average x position
-   }
-}
-
-static float stbtt__sized_trapezoid_area(float height, float top_width, float bottom_width)
-{
-   STBTT_assert(top_width >= 0);
-   STBTT_assert(bottom_width >= 0);
-   return (top_width + bottom_width) / 2.0f * height;
-}
-
-static float stbtt__position_trapezoid_area(float height, float tx0, float tx1, float bx0, float bx1)
-{
-   return stbtt__sized_trapezoid_area(height, tx1 - tx0, bx1 - bx0);
-}
-
-static float stbtt__sized_triangle_area(float height, float width)
-{
-   return height * width / 2;
-}
-
-static void stbtt__fill_active_edges_new(float *scanline, float *scanline_fill, int len, stbtt__active_edge *e, float y_top)
-{
-   float y_bottom = y_top+1;
-
-   while (e) {
-      // brute force every pixel
-
-      // compute intersection points with top & bottom
-      STBTT_assert(e->ey >= y_top);
-
-      if (e->fdx == 0) {
-         float x0 = e->fx;
-         if (x0 < len) {
-            if (x0 >= 0) {
-               stbtt__handle_clipped_edge(scanline,(int) x0,e, x0,y_top, x0,y_bottom);
-               stbtt__handle_clipped_edge(scanline_fill-1,(int) x0+1,e, x0,y_top, x0,y_bottom);
-            } else {
-               stbtt__handle_clipped_edge(scanline_fill-1,0,e, x0,y_top, x0,y_bottom);
-            }
-         }
-      } else {
-         float x0 = e->fx;
-         float dx = e->fdx;
-         float xb = x0 + dx;
-         float x_top, x_bottom;
-         float sy0,sy1;
-         float dy = e->fdy;
-         STBTT_assert(e->sy <= y_bottom && e->ey >= y_top);
-
-         // compute endpoints of line segment clipped to this scanline (if the
-         // line segment starts on this scanline. x0 is the intersection of the
-         // line with y_top, but that may be off the line segment.
-         if (e->sy > y_top) {
-            x_top = x0 + dx * (e->sy - y_top);
-            sy0 = e->sy;
-         } else {
-            x_top = x0;
-            sy0 = y_top;
-         }
-         if (e->ey < y_bottom) {
-            x_bottom = x0 + dx * (e->ey - y_top);
-            sy1 = e->ey;
-         } else {
-            x_bottom = xb;
-            sy1 = y_bottom;
-         }
-
-         if (x_top >= 0 && x_bottom >= 0 && x_top < len && x_bottom < len) {
-            // from here on, we don't have to range check x values
-
-            if ((int) x_top == (int) x_bottom) {
-               float height;
-               // simple case, only spans one pixel
-               int x = (int) x_top;
-               height = (sy1 - sy0) * e->direction;
-               STBTT_assert(x >= 0 && x < len);
-               scanline[x]      += stbtt__position_trapezoid_area(height, x_top, x+1.0f, x_bottom, x+1.0f);
-               scanline_fill[x] += height; // everything right of this pixel is filled
-            } else {
-               int x,x1,x2;
-               float y_crossing, y_final, step, sign, area;
-               // covers 2+ pixels
-               if (x_top > x_bottom) {
-                  // flip scanline vertically; signed area is the same
-                  float t;
-                  sy0 = y_bottom - (sy0 - y_top);
-                  sy1 = y_bottom - (sy1 - y_top);
-                  t = sy0, sy0 = sy1, sy1 = t;
-                  t = x_bottom, x_bottom = x_top, x_top = t;
-                  dx = -dx;
-                  dy = -dy;
-                  t = x0, x0 = xb, xb = t;
-               }
-               STBTT_assert(dy >= 0);
-               STBTT_assert(dx >= 0);
-
-               x1 = (int) x_top;
-               x2 = (int) x_bottom;
-               // compute intersection with y axis at x1+1
-               y_crossing = y_top + dy * (x1+1 - x0);
-
-               // compute intersection with y axis at x2
-               y_final = y_top + dy * (x2 - x0);
-
-               //           x1    x_top                            x2    x_bottom
-               //     y_top  +------|-----+------------+------------+--------|---+------------+
-               //            |            |            |            |            |            |
-               //            |            |            |            |            |            |
-               //       sy0  |      Txxxxx|............|............|............|............|
-               // y_crossing |            *xxxxx.......|............|............|............|
-               //            |            |     xxxxx..|............|............|............|
-               //            |            |     /-   xx*xxxx........|............|............|
-               //            |            | dy <       |    xxxxxx..|............|............|
-               //   y_final  |            |     \-     |          xx*xxx.........|............|
-               //       sy1  |            |            |            |   xxxxxB...|............|
-               //            |            |            |            |            |            |
-               //            |            |            |            |            |            |
-               //  y_bottom  +------------+------------+------------+------------+------------+
-               //
-               // goal is to measure the area covered by '.' in each pixel
-
-               // if x2 is right at the right edge of x1, y_crossing can blow up, github #1057
-               // @TODO: maybe test against sy1 rather than y_bottom?
-               if (y_crossing > y_bottom)
-                  y_crossing = y_bottom;
-
-               sign = e->direction;
-
-               // area of the rectangle covered from sy0..y_crossing
-               area = sign * (y_crossing-sy0);
-
-               // area of the triangle (x_top,sy0), (x1+1,sy0), (x1+1,y_crossing)
-               scanline[x1] += stbtt__sized_triangle_area(area, x1+1 - x_top);
-
-               // check if final y_crossing is blown up; no test case for this
-               if (y_final > y_bottom) {
-                  y_final = y_bottom;
-                  dy = (y_final - y_crossing ) / (x2 - (x1+1)); // if denom=0, y_final = y_crossing, so y_final <= y_bottom
-               }
-
-               // in second pixel, area covered by line segment found in first pixel
-               // is always a rectangle 1 wide * the height of that line segment; this
-               // is exactly what the variable 'area' stores. it also gets a contribution
-               // from the line segment within it. the THIRD pixel will get the first
-               // pixel's rectangle contribution, the second pixel's rectangle contribution,
-               // and its own contribution. the 'own contribution' is the same in every pixel except
-               // the leftmost and rightmost, a trapezoid that slides down in each pixel.
-               // the second pixel's contribution to the third pixel will be the
-               // rectangle 1 wide times the height change in the second pixel, which is dy.
-
-               step = sign * dy * 1; // dy is dy/dx, change in y for every 1 change in x,
-               // which multiplied by 1-pixel-width is how much pixel area changes for each step in x
-               // so the area advances by 'step' every time
-
-               for (x = x1+1; x < x2; ++x) {
-                  scanline[x] += area + step/2; // area of trapezoid is 1*step/2
-                  area += step;
-               }
-               STBTT_assert(STBTT_fabs(area) <= 1.01f); // accumulated error from area += step unless we round step down
-               STBTT_assert(sy1 > y_final-0.01f);
-
-               // area covered in the last pixel is the rectangle from all the pixels to the left,
-               // plus the trapezoid filled by the line segment in this pixel all the way to the right edge
-               scanline[x2] += area + sign * stbtt__position_trapezoid_area(sy1-y_final, (float) x2, x2+1.0f, x_bottom, x2+1.0f);
-
-               // the rest of the line is filled based on the total height of the line segment in this pixel
-               scanline_fill[x2] += sign * (sy1-sy0);
-            }
-         } else {
-            // if edge goes outside of box we're drawing, we require
-            // clipping logic. since this does not match the intended use
-            // of this library, we use a different, very slow brute
-            // force implementation
-            // note though that this does happen some of the time because
-            // x_top and x_bottom can be extrapolated at the top & bottom of
-            // the shape and actually lie outside the bounding box
-            int x;
-            for (x=0; x < len; ++x) {
-               // cases:
-               //
-               // there can be up to two intersections with the pixel. any intersection
-               // with left or right edges can be handled by splitting into two (or three)
-               // regions. intersections with top & bottom do not necessitate case-wise logic.
-               //
-               // the old way of doing this found the intersections with the left & right edges,
-               // then used some simple logic to produce up to three segments in sorted order
-               // from top-to-bottom. however, this had a problem: if an x edge was epsilon
-               // across the x border, then the corresponding y position might not be distinct
-               // from the other y segment, and it might ignored as an empty segment. to avoid
-               // that, we need to explicitly produce segments based on x positions.
-
-               // rename variables to clearly-defined pairs
-               float y0 = y_top;
-               float x1 = (float) (x);
-               float x2 = (float) (x+1);
-               float x3 = xb;
-               float y3 = y_bottom;
-
-               // x = e->x + e->dx * (y-y_top)
-               // (y-y_top) = (x - e->x) / e->dx
-               // y = (x - e->x) / e->dx + y_top
-               float y1 = (x - x0) / dx + y_top;
-               float y2 = (x+1 - x0) / dx + y_top;
-
-               if (x0 < x1 && x3 > x2) {         // three segments descending down-right
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
-               } else if (x3 < x1 && x0 > x2) {  // three segments descending down-left
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
-               } else if (x0 < x1 && x3 > x1) {  // two segments across x, down-right
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
-               } else if (x3 < x1 && x0 > x1) {  // two segments across x, down-left
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x1,y1);
-                  stbtt__handle_clipped_edge(scanline,x,e, x1,y1, x3,y3);
-               } else if (x0 < x2 && x3 > x2) {  // two segments across x+1, down-right
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
-               } else if (x3 < x2 && x0 > x2) {  // two segments across x+1, down-left
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x2,y2);
-                  stbtt__handle_clipped_edge(scanline,x,e, x2,y2, x3,y3);
-               } else {  // one segment
-                  stbtt__handle_clipped_edge(scanline,x,e, x0,y0, x3,y3);
-               }
-            }
-         }
-      }
-      e = e->next;
-   }
-}
-
-// directly AA rasterize edges w/o supersampling
-static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, int n, int vsubsample, int off_x, int off_y, void *userdata)
-{
-   stbtt__hheap hh = { 0, 0, 0 };
-   stbtt__active_edge *active = NULL;
-   int y,j=0, i;
-   float scanline_data[129], *scanline, *scanline2;
-
-   STBTT__NOTUSED(vsubsample);
-
-   if (result->w > 64)
-      scanline = (float *) STBTT_malloc((result->w*2+1) * sizeof(float), userdata);
-   else
-      scanline = scanline_data;
-
-   scanline2 = scanline + result->w;
-
-   y = off_y;
-   e[n].y0 = (float) (off_y + result->h) + 1;
-
-   while (j < result->h) {
-      // find center of pixel for this scanline
-      float scan_y_top    = y + 0.0f;
-      float scan_y_bottom = y + 1.0f;
-      stbtt__active_edge **step = &active;
-
-      STBTT_memset(scanline , 0, result->w*sizeof(scanline[0]));
-      STBTT_memset(scanline2, 0, (result->w+1)*sizeof(scanline[0]));
-
-      // update all active edges;
-      // remove all active edges that terminate before the top of this scanline
-      while (*step) {
-         stbtt__active_edge * z = *step;
-         if (z->ey <= scan_y_top) {
-            *step = z->next; // delete from list
-            STBTT_assert(z->direction);
-            z->direction = 0;
-            stbtt__hheap_free(&hh, z);
-         } else {
-            step = &((*step)->next); // advance through list
-         }
-      }
-
-      // insert all edges that start before the bottom of this scanline
-      while (e->y0 <= scan_y_bottom) {
-         if (e->y0 != e->y1) {
-            stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y_top, userdata);
-            if (z != NULL) {
-               if (j == 0 && off_y != 0) {
-                  if (z->ey < scan_y_top) {
-                     // this can happen due to subpixel positioning and some kind of fp rounding error i think
-                     z->ey = scan_y_top;
-                  }
-               }
-               STBTT_assert(z->ey >= scan_y_top); // if we get really unlucky a tiny bit of an edge can be out of bounds
-               // insert at front
-               z->next = active;
-               active = z;
-            }
-         }
-         ++e;
-      }
-
-      // now process all active edges
-      if (active)
-         stbtt__fill_active_edges_new(scanline, scanline2+1, result->w, active, scan_y_top);
-
-      {
-         float sum = 0;
-         for (i=0; i < result->w; ++i) {
-            float k;
-            int m;
-            sum += scanline2[i];
-            k = scanline[i] + sum;
-            k = (float) STBTT_fabs(k)*255 + 0.5f;
-            m = (int) k;
-            if (m > 255) m = 255;
-            result->pixels[j*result->stride + i] = (unsigned char) m;
-         }
-      }
-      // advance all the edges
-      step = &active;
-      while (*step) {
-         stbtt__active_edge *z = *step;
-         z->fx += z->fdx; // advance to position for current scanline
-         step = &((*step)->next); // advance through list
-      }
-
-      ++y;
-      ++j;
-   }
-
-   stbtt__hheap_cleanup(&hh, userdata);
-
-   if (scanline != scanline_data)
-      STBTT_free(scanline, userdata);
-}
-#else
-#error "Unrecognized value of STBTT_RASTERIZER_VERSION"
-#endif
-
-#define STBTT__COMPARE(a,b)  ((a)->y0 < (b)->y0)
-
-static void stbtt__sort_edges_ins_sort(stbtt__edge *p, int n)
-{
-   int i,j;
-   for (i=1; i < n; ++i) {
-      stbtt__edge t = p[i], *a = &t;
-      j = i;
-      while (j > 0) {
-         stbtt__edge *b = &p[j-1];
-         int c = STBTT__COMPARE(a,b);
-         if (!c) break;
-         p[j] = p[j-1];
-         --j;
-      }
-      if (i != j)
-         p[j] = t;
-   }
-}
-
-static void stbtt__sort_edges_quicksort(stbtt__edge *p, int n)
-{
-   /* threshold for transitioning to insertion sort */
-   while (n > 12) {
-      stbtt__edge t;
-      int c01,c12,c,m,i,j;
-
-      /* compute median of three */
-      m = n >> 1;
-      c01 = STBTT__COMPARE(&p[0],&p[m]);
-      c12 = STBTT__COMPARE(&p[m],&p[n-1]);
-      /* if 0 >= mid >= end, or 0 < mid < end, then use mid */
-      if (c01 != c12) {
-         /* otherwise, we'll need to swap something else to middle */
-         int z;
-         c = STBTT__COMPARE(&p[0],&p[n-1]);
-         /* 0>mid && mid<n:  0>n => n; 0<n => 0 */
-         /* 0<mid && mid>n:  0>n => 0; 0<n => n */
-         z = (c == c12) ? 0 : n-1;
-         t = p[z];
-         p[z] = p[m];
-         p[m] = t;
-      }
-      /* now p[m] is the median-of-three */
-      /* swap it to the beginning so it won't move around */
-      t = p[0];
-      p[0] = p[m];
-      p[m] = t;
-
-      /* partition loop */
-      i=1;
-      j=n-1;
-      for(;;) {
-         /* handling of equality is crucial here */
-         /* for sentinels & efficiency with duplicates */
-         for (;;++i) {
-            if (!STBTT__COMPARE(&p[i], &p[0])) break;
-         }
-         for (;;--j) {
-            if (!STBTT__COMPARE(&p[0], &p[j])) break;
-         }
-         /* make sure we haven't crossed */
-         if (i >= j) break;
-         t = p[i];
-         p[i] = p[j];
-         p[j] = t;
-
-         ++i;
-         --j;
-      }
-      /* recurse on smaller side, iterate on larger */
-      if (j < (n-i)) {
-         stbtt__sort_edges_quicksort(p,j);
-         p = p+i;
-         n = n-i;
-      } else {
-         stbtt__sort_edges_quicksort(p+i, n-i);
-         n = j;
-      }
-   }
-}
-
-static void stbtt__sort_edges(stbtt__edge *p, int n)
-{
-   stbtt__sort_edges_quicksort(p, n);
-   stbtt__sort_edges_ins_sort(p, n);
-}
-
-typedef struct
-{
-   float x,y;
-} stbtt__point;
-
-static void stbtt__rasterize(stbtt__bitmap *result, stbtt__point *pts, int *wcount, int windings, float scale_x, float scale_y, float shift_x, float shift_y, int off_x, int off_y, int invert, void *userdata)
-{
-   float y_scale_inv = invert ? -scale_y : scale_y;
-   stbtt__edge *e;
-   int n,i,j,k,m;
-#if STBTT_RASTERIZER_VERSION == 1
-   int vsubsample = result->h < 8 ? 15 : 5;
-#elif STBTT_RASTERIZER_VERSION == 2
-   int vsubsample = 1;
-#else
-   #error "Unrecognized value of STBTT_RASTERIZER_VERSION"
-#endif
-   // vsubsample should divide 255 evenly; otherwise we won't reach full opacity
-
-   // now we have to blow out the windings into explicit edge lists
-   n = 0;
-   for (i=0; i < windings; ++i)
-      n += wcount[i];
-
-   e = (stbtt__edge *) STBTT_malloc(sizeof(*e) * (n+1), userdata); // add an extra one as a sentinel
-   if (e == 0) return;
-   n = 0;
-
-   m=0;
-   for (i=0; i < windings; ++i) {
-      stbtt__point *p = pts + m;
-      m += wcount[i];
-      j = wcount[i]-1;
-      for (k=0; k < wcount[i]; j=k++) {
-         int a=k,b=j;
-         // skip the edge if horizontal
-         if (p[j].y == p[k].y)
-            continue;
-         // add edge from j to k to the list
-         e[n].invert = 0;
-         if (invert ? p[j].y > p[k].y : p[j].y < p[k].y) {
-            e[n].invert = 1;
-            a=j,b=k;
-         }
-         e[n].x0 = p[a].x * scale_x + shift_x;
-         e[n].y0 = (p[a].y * y_scale_inv + shift_y) * vsubsample;
-         e[n].x1 = p[b].x * scale_x + shift_x;
-         e[n].y1 = (p[b].y * y_scale_inv + shift_y) * vsubsample;
-         ++n;
-      }
-   }
-
-   // now sort the edges by their highest point (should snap to integer, and then by x)
-   //STBTT_sort(e, n, sizeof(e[0]), stbtt__edge_compare);
-   stbtt__sort_edges(e, n);
-
-   // now, traverse the scanlines and find the intersections on each scanline, use xor winding rule
-   stbtt__rasterize_sorted_edges(result, e, n, vsubsample, off_x, off_y, userdata);
-
-   STBTT_free(e, userdata);
-}
-
-static void stbtt__add_point(stbtt__point *points, int n, float x, float y)
-{
-   if (!points) return; // during first pass, it's unallocated
-   points[n].x = x;
-   points[n].y = y;
-}
-
-// tessellate until threshold p is happy... @TODO warped to compensate for non-linear stretching
-static int stbtt__tesselate_curve(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float objspace_flatness_squared, int n)
-{
-   // midpoint
-   float mx = (x0 + 2*x1 + x2)/4;
-   float my = (y0 + 2*y1 + y2)/4;
-   // versus directly drawn line
-   float dx = (x0+x2)/2 - mx;
-   float dy = (y0+y2)/2 - my;
-   if (n > 16) // 65536 segments on one curve better be enough!
-      return 1;
-   if (dx*dx+dy*dy > objspace_flatness_squared) { // half-pixel error allowed... need to be smaller if AA
-      stbtt__tesselate_curve(points, num_points, x0,y0, (x0+x1)/2.0f,(y0+y1)/2.0f, mx,my, objspace_flatness_squared,n+1);
-      stbtt__tesselate_curve(points, num_points, mx,my, (x1+x2)/2.0f,(y1+y2)/2.0f, x2,y2, objspace_flatness_squared,n+1);
-   } else {
-      stbtt__add_point(points, *num_points,x2,y2);
-      *num_points = *num_points+1;
-   }
-   return 1;
-}
-
-static void stbtt__tesselate_cubic(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3, float objspace_flatness_squared, int n)
-{
-   // @TODO this "flatness" calculation is just made-up nonsense that seems to work well enough
-   float dx0 = x1-x0;
-   float dy0 = y1-y0;
-   float dx1 = x2-x1;
-   float dy1 = y2-y1;
-   float dx2 = x3-x2;
-   float dy2 = y3-y2;
-   float dx = x3-x0;
-   float dy = y3-y0;
-   float longlen = (float) (STBTT_sqrt(dx0*dx0+dy0*dy0)+STBTT_sqrt(dx1*dx1+dy1*dy1)+STBTT_sqrt(dx2*dx2+dy2*dy2));
-   float shortlen = (float) STBTT_sqrt(dx*dx+dy*dy);
-   float flatness_squared = longlen*longlen-shortlen*shortlen;
-
-   if (n > 16) // 65536 segments on one curve better be enough!
-      return;
-
-   if (flatness_squared > objspace_flatness_squared) {
-      float x01 = (x0+x1)/2;
-      float y01 = (y0+y1)/2;
-      float x12 = (x1+x2)/2;
-      float y12 = (y1+y2)/2;
-      float x23 = (x2+x3)/2;
-      float y23 = (y2+y3)/2;
-
-      float xa = (x01+x12)/2;
-      float ya = (y01+y12)/2;
-      float xb = (x12+x23)/2;
-      float yb = (y12+y23)/2;
-
-      float mx = (xa+xb)/2;
-      float my = (ya+yb)/2;
-
-      stbtt__tesselate_cubic(points, num_points, x0,y0, x01,y01, xa,ya, mx,my, objspace_flatness_squared,n+1);
-      stbtt__tesselate_cubic(points, num_points, mx,my, xb,yb, x23,y23, x3,y3, objspace_flatness_squared,n+1);
-   } else {
-      stbtt__add_point(points, *num_points,x3,y3);
-      *num_points = *num_points+1;
-   }
-}
-
-// returns number of contours
-static stbtt__point *stbtt_FlattenCurves(stbtt_vertex *vertices, int num_verts, float objspace_flatness, int **contour_lengths, int *num_contours, void *userdata)
-{
-   stbtt__point *points=0;
-   int num_points=0;
-
-   float objspace_flatness_squared = objspace_flatness * objspace_flatness;
-   int i,n=0,start=0, pass;
-
-   // count how many "moves" there are to get the contour count
-   for (i=0; i < num_verts; ++i)
-      if (vertices[i].type == STBTT_vmove)
-         ++n;
-
-   *num_contours = n;
-   if (n == 0) return 0;
-
-   *contour_lengths = (int *) STBTT_malloc(sizeof(**contour_lengths) * n, userdata);
-
-   if (*contour_lengths == 0) {
-      *num_contours = 0;
-      return 0;
-   }
-
-   // make two passes through the points so we don't need to realloc
-   for (pass=0; pass < 2; ++pass) {
-      float x=0,y=0;
-      if (pass == 1) {
-         points = (stbtt__point *) STBTT_malloc(num_points * sizeof(points[0]), userdata);
-         if (points == NULL) goto error;
-      }
-      num_points = 0;
-      n= -1;
-      for (i=0; i < num_verts; ++i) {
-         switch (vertices[i].type) {
-            case STBTT_vmove:
-               // start the next contour
-               if (n >= 0)
-                  (*contour_lengths)[n] = num_points - start;
-               ++n;
-               start = num_points;
-
-               x = vertices[i].x, y = vertices[i].y;
-               stbtt__add_point(points, num_points++, x,y);
-               break;
-            case STBTT_vline:
-               x = vertices[i].x, y = vertices[i].y;
-               stbtt__add_point(points, num_points++, x, y);
-               break;
-            case STBTT_vcurve:
-               stbtt__tesselate_curve(points, &num_points, x,y,
-                                        vertices[i].cx, vertices[i].cy,
-                                        vertices[i].x,  vertices[i].y,
-                                        objspace_flatness_squared, 0);
-               x = vertices[i].x, y = vertices[i].y;
-               break;
-            case STBTT_vcubic:
-               stbtt__tesselate_cubic(points, &num_points, x,y,
-                                        vertices[i].cx, vertices[i].cy,
-                                        vertices[i].cx1, vertices[i].cy1,
-                                        vertices[i].x,  vertices[i].y,
-                                        objspace_flatness_squared, 0);
-               x = vertices[i].x, y = vertices[i].y;
-               break;
-         }
-      }
-      (*contour_lengths)[n] = num_points - start;
-   }
-
-   return points;
-error:
-   STBTT_free(points, userdata);
-   STBTT_free(*contour_lengths, userdata);
-   *contour_lengths = 0;
-   *num_contours = 0;
-   return NULL;
-}
-
-STBTT_DEF void stbtt_Rasterize(stbtt__bitmap *result, float flatness_in_pixels, stbtt_vertex *vertices, int num_verts, float scale_x, float scale_y, float shift_x, float shift_y, int x_off, int y_off, int invert, void *userdata)
-{
-   float scale            = scale_x > scale_y ? scale_y : scale_x;
-   int winding_count      = 0;
-   int *winding_lengths   = NULL;
-   stbtt__point *windings = stbtt_FlattenCurves(vertices, num_verts, flatness_in_pixels / scale, &winding_lengths, &winding_count, userdata);
-   if (windings) {
-      stbtt__rasterize(result, windings, winding_lengths, winding_count, scale_x, scale_y, shift_x, shift_y, x_off, y_off, invert, userdata);
-      STBTT_free(winding_lengths, userdata);
-      STBTT_free(windings, userdata);
-   }
-}
-
-STBTT_DEF void stbtt_FreeBitmap(unsigned char *bitmap, void *userdata)
-{
-   STBTT_free(bitmap, userdata);
-}
-
-STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int glyph, int *width, int *height, int *xoff, int *yoff)
-{
-   int ix0,iy0,ix1,iy1;
-   stbtt__bitmap gbm;
-   stbtt_vertex *vertices;
-   int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
-
-   if (scale_x == 0) scale_x = scale_y;
-   if (scale_y == 0) {
-      if (scale_x == 0) {
-         STBTT_free(vertices, info->userdata);
-         return NULL;
-      }
-      scale_y = scale_x;
-   }
-
-   stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,&ix1,&iy1);
-
-   // now we get the size
-   gbm.w = (ix1 - ix0);
-   gbm.h = (iy1 - iy0);
-   gbm.pixels = NULL; // in case we error
-
-   if (width ) *width  = gbm.w;
-   if (height) *height = gbm.h;
-   if (xoff  ) *xoff   = ix0;
-   if (yoff  ) *yoff   = iy0;
-
-   if (gbm.w && gbm.h) {
-      gbm.pixels = (unsigned char *) STBTT_malloc(gbm.w * gbm.h, info->userdata);
-      if (gbm.pixels) {
-         gbm.stride = gbm.w;
-
-         stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, shift_x, shift_y, ix0, iy0, 1, info->userdata);
-      }
-   }
-   STBTT_free(vertices, info->userdata);
-   return gbm.pixels;
-}
-
-STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff)
-{
-   return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y, 0.0f, 0.0f, glyph, width, height, xoff, yoff);
-}
-
-STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int glyph)
-{
-   int ix0,iy0;
-   stbtt_vertex *vertices;
-   int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices);
-   stbtt__bitmap gbm;
-
-   stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,0,0);
-   gbm.pixels = output;
-   gbm.w = out_w;
-   gbm.h = out_h;
-   gbm.stride = out_stride;
-
-   if (gbm.w && gbm.h)
-      stbtt_Rasterize(&gbm, 0.35f, vertices, num_verts, scale_x, scale_y, shift_x, shift_y, ix0,iy0, 1, info->userdata);
-
-   STBTT_free(vertices, info->userdata);
-}
-
-STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int glyph)
-{
-   stbtt_MakeGlyphBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, 0.0f,0.0f, glyph);
-}
-
-STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff)
-{
-   return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y,shift_x,shift_y, stbtt_FindGlyphIndex(info,codepoint), width,height,xoff,yoff);
-}
-
-STBTT_DEF void stbtt_MakeCodepointBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int oversample_x, int oversample_y, float *sub_x, float *sub_y, int codepoint)
-{
-   stbtt_MakeGlyphBitmapSubpixelPrefilter(info, output, out_w, out_h, out_stride, scale_x, scale_y, shift_x, shift_y, oversample_x, oversample_y, sub_x, sub_y, stbtt_FindGlyphIndex(info,codepoint));
-}
-
-STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint)
-{
-   stbtt_MakeGlyphBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, shift_x, shift_y, stbtt_FindGlyphIndex(info,codepoint));
-}
-
-STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff)
-{
-   return stbtt_GetCodepointBitmapSubpixel(info, scale_x, scale_y, 0.0f,0.0f, codepoint, width,height,xoff,yoff);
-}
-
-STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint)
-{
-   stbtt_MakeCodepointBitmapSubpixel(info, output, out_w, out_h, out_stride, scale_x, scale_y, 0.0f,0.0f, codepoint);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// bitmap baking
-//
-// This is SUPER-CRAPPY packing to keep source code small
-
-static int stbtt_BakeFontBitmap_internal(unsigned char *data, int offset,  // font location (use offset=0 for plain .ttf)
-                                float pixel_height,                     // height of font in pixels
-                                unsigned char *pixels, int pw, int ph,  // bitmap to be filled in
-                                int first_char, int num_chars,          // characters to bake
-                                stbtt_bakedchar *chardata)
-{
-   float scale;
-   int x,y,bottom_y, i;
-   stbtt_fontinfo f;
-   f.userdata = NULL;
-   if (!stbtt_InitFont(&f, data, offset))
-      return -1;
-   STBTT_memset(pixels, 0, pw*ph); // background of 0 around pixels
-   x=y=1;
-   bottom_y = 1;
-
-   scale = stbtt_ScaleForPixelHeight(&f, pixel_height);
-
-   for (i=0; i < num_chars; ++i) {
-      int advance, lsb, x0,y0,x1,y1,gw,gh;
-      int g = stbtt_FindGlyphIndex(&f, first_char + i);
-      stbtt_GetGlyphHMetrics(&f, g, &advance, &lsb);
-      stbtt_GetGlyphBitmapBox(&f, g, scale,scale, &x0,&y0,&x1,&y1);
-      gw = x1-x0;
-      gh = y1-y0;
-      if (x + gw + 1 >= pw)
-         y = bottom_y, x = 1; // advance to next row
-      if (y + gh + 1 >= ph) // check if it fits vertically AFTER potentially moving to next row
-         return -i;
-      STBTT_assert(x+gw < pw);
-      STBTT_assert(y+gh < ph);
-      stbtt_MakeGlyphBitmap(&f, pixels+x+y*pw, gw,gh,pw, scale,scale, g);
-      chardata[i].x0 = (stbtt_int16) x;
-      chardata[i].y0 = (stbtt_int16) y;
-      chardata[i].x1 = (stbtt_int16) (x + gw);
-      chardata[i].y1 = (stbtt_int16) (y + gh);
-      chardata[i].xadvance = scale * advance;
-      chardata[i].xoff     = (float) x0;
-      chardata[i].yoff     = (float) y0;
-      x = x + gw + 1;
-      if (y+gh+1 > bottom_y)
-         bottom_y = y+gh+1;
-   }
-   return bottom_y;
-}
-
-STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int opengl_fillrule)
-{
-   float d3d_bias = opengl_fillrule ? 0 : -0.5f;
-   float ipw = 1.0f / pw, iph = 1.0f / ph;
-   const stbtt_bakedchar *b = chardata + char_index;
-   int round_x = STBTT_ifloor((*xpos + b->xoff) + 0.5f);
-   int round_y = STBTT_ifloor((*ypos + b->yoff) + 0.5f);
-
-   q->x0 = round_x + d3d_bias;
-   q->y0 = round_y + d3d_bias;
-   q->x1 = round_x + b->x1 - b->x0 + d3d_bias;
-   q->y1 = round_y + b->y1 - b->y0 + d3d_bias;
-
-   q->s0 = b->x0 * ipw;
-   q->t0 = b->y0 * iph;
-   q->s1 = b->x1 * ipw;
-   q->t1 = b->y1 * iph;
-
-   *xpos += b->xadvance;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// rectangle packing replacement routines if you don't have stb_rect_pack.h
-//
-
-#ifndef STB_RECT_PACK_VERSION
-
-typedef int stbrp_coord;
-
-////////////////////////////////////////////////////////////////////////////////////
-//                                                                                //
-//                                                                                //
-// COMPILER WARNING ?!?!?                                                         //
-//                                                                                //
-//                                                                                //
-// if you get a compile warning due to these symbols being defined more than      //
-// once, move #include "stb_rect_pack.h" before #include "stb_truetype.h"         //
-//                                                                                //
-////////////////////////////////////////////////////////////////////////////////////
-
-typedef struct
-{
-   int width,height;
-   int x,y,bottom_y;
-} stbrp_context;
-
-typedef struct
-{
-   unsigned char x;
-} stbrp_node;
-
-struct stbrp_rect
-{
-   stbrp_coord x,y;
-   int id,w,h,was_packed;
-};
-
-static void stbrp_init_target(stbrp_context *con, int pw, int ph, stbrp_node *nodes, int num_nodes)
-{
-   con->width  = pw;
-   con->height = ph;
-   con->x = 0;
-   con->y = 0;
-   con->bottom_y = 0;
-   STBTT__NOTUSED(nodes);
-   STBTT__NOTUSED(num_nodes);
-}
-
-static void stbrp_pack_rects(stbrp_context *con, stbrp_rect *rects, int num_rects)
-{
-   int i;
-   for (i=0; i < num_rects; ++i) {
-      if (con->x + rects[i].w > con->width) {
-         con->x = 0;
-         con->y = con->bottom_y;
-      }
-      if (con->y + rects[i].h > con->height)
-         break;
-      rects[i].x = con->x;
-      rects[i].y = con->y;
-      rects[i].was_packed = 1;
-      con->x += rects[i].w;
-      if (con->y + rects[i].h > con->bottom_y)
-         con->bottom_y = con->y + rects[i].h;
-   }
-   for (   ; i < num_rects; ++i)
-      rects[i].was_packed = 0;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// bitmap baking
-//
-// This is SUPER-AWESOME (tm Ryan Gordon) packing using stb_rect_pack.h. If
-// stb_rect_pack.h isn't available, it uses the BakeFontBitmap strategy.
-
-STBTT_DEF int stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, int pw, int ph, int stride_in_bytes, int padding, void *alloc_context)
-{
-   stbrp_context *context = (stbrp_context *) STBTT_malloc(sizeof(*context)            ,alloc_context);
-   int            num_nodes = pw - padding;
-   stbrp_node    *nodes   = (stbrp_node    *) STBTT_malloc(sizeof(*nodes  ) * num_nodes,alloc_context);
-
-   if (context == NULL || nodes == NULL) {
-      if (context != NULL) STBTT_free(context, alloc_context);
-      if (nodes   != NULL) STBTT_free(nodes  , alloc_context);
-      return 0;
-   }
-
-   spc->user_allocator_context = alloc_context;
-   spc->width = pw;
-   spc->height = ph;
-   spc->pixels = pixels;
-   spc->pack_info = context;
-   spc->nodes = nodes;
-   spc->padding = padding;
-   spc->stride_in_bytes = stride_in_bytes != 0 ? stride_in_bytes : pw;
-   spc->h_oversample = 1;
-   spc->v_oversample = 1;
-   spc->skip_missing = 0;
-
-   stbrp_init_target(context, pw-padding, ph-padding, nodes, num_nodes);
-
-   if (pixels)
-      STBTT_memset(pixels, 0, pw*ph); // background of 0 around pixels
-
-   return 1;
-}
-
-STBTT_DEF void stbtt_PackEnd  (stbtt_pack_context *spc)
-{
-   STBTT_free(spc->nodes    , spc->user_allocator_context);
-   STBTT_free(spc->pack_info, spc->user_allocator_context);
-}
-
-STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h_oversample, unsigned int v_oversample)
-{
-   STBTT_assert(h_oversample <= STBTT_MAX_OVERSAMPLE);
-   STBTT_assert(v_oversample <= STBTT_MAX_OVERSAMPLE);
-   if (h_oversample <= STBTT_MAX_OVERSAMPLE)
-      spc->h_oversample = h_oversample;
-   if (v_oversample <= STBTT_MAX_OVERSAMPLE)
-      spc->v_oversample = v_oversample;
-}
-
-STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip)
-{
-   spc->skip_missing = skip;
-}
-
-#define STBTT__OVER_MASK  (STBTT_MAX_OVERSAMPLE-1)
-
-static void stbtt__h_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width)
-{
-   unsigned char buffer[STBTT_MAX_OVERSAMPLE];
-   int safe_w = w - kernel_width;
-   int j;
-   STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE); // suppress bogus warning from VS2013 -analyze
-   for (j=0; j < h; ++j) {
-      int i;
-      unsigned int total;
-      STBTT_memset(buffer, 0, kernel_width);
-
-      total = 0;
-
-      // make kernel_width a constant in common cases so compiler can optimize out the divide
-      switch (kernel_width) {
-         case 2:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / 2);
-            }
-            break;
-         case 3:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / 3);
-            }
-            break;
-         case 4:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / 4);
-            }
-            break;
-         case 5:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / 5);
-            }
-            break;
-         default:
-            for (i=0; i <= safe_w; ++i) {
-               total += pixels[i] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i];
-               pixels[i] = (unsigned char) (total / kernel_width);
-            }
-            break;
-      }
-
-      for (; i < w; ++i) {
-         STBTT_assert(pixels[i] == 0);
-         total -= buffer[i & STBTT__OVER_MASK];
-         pixels[i] = (unsigned char) (total / kernel_width);
-      }
-
-      pixels += stride_in_bytes;
-   }
-}
-
-static void stbtt__v_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width)
-{
-   unsigned char buffer[STBTT_MAX_OVERSAMPLE];
-   int safe_h = h - kernel_width;
-   int j;
-   STBTT_memset(buffer, 0, STBTT_MAX_OVERSAMPLE); // suppress bogus warning from VS2013 -analyze
-   for (j=0; j < w; ++j) {
-      int i;
-      unsigned int total;
-      STBTT_memset(buffer, 0, kernel_width);
-
-      total = 0;
-
-      // make kernel_width a constant in common cases so compiler can optimize out the divide
-      switch (kernel_width) {
-         case 2:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / 2);
-            }
-            break;
-         case 3:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / 3);
-            }
-            break;
-         case 4:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / 4);
-            }
-            break;
-         case 5:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / 5);
-            }
-            break;
-         default:
-            for (i=0; i <= safe_h; ++i) {
-               total += pixels[i*stride_in_bytes] - buffer[i & STBTT__OVER_MASK];
-               buffer[(i+kernel_width) & STBTT__OVER_MASK] = pixels[i*stride_in_bytes];
-               pixels[i*stride_in_bytes] = (unsigned char) (total / kernel_width);
-            }
-            break;
-      }
-
-      for (; i < h; ++i) {
-         STBTT_assert(pixels[i*stride_in_bytes] == 0);
-         total -= buffer[i & STBTT__OVER_MASK];
-         pixels[i*stride_in_bytes] = (unsigned char) (total / kernel_width);
-      }
-
-      pixels += 1;
-   }
-}
-
-static float stbtt__oversample_shift(int oversample)
-{
-   if (!oversample)
-      return 0.0f;
-
-   // The prefilter is a box filter of width "oversample",
-   // which shifts phase by (oversample - 1)/2 pixels in
-   // oversampled space. We want to shift in the opposite
-   // direction to counter this.
-   return (float)-(oversample - 1) / (2.0f * (float)oversample);
-}
-
-// rects array must be big enough to accommodate all characters in the given ranges
-STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
-{
-   int i,j,k;
-   int missing_glyph_added = 0;
-
-   k=0;
-   for (i=0; i < num_ranges; ++i) {
-      float fh = ranges[i].font_size;
-      float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
-      ranges[i].h_oversample = (unsigned char) spc->h_oversample;
-      ranges[i].v_oversample = (unsigned char) spc->v_oversample;
-      for (j=0; j < ranges[i].num_chars; ++j) {
-         int x0,y0,x1,y1;
-         int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
-         int glyph = stbtt_FindGlyphIndex(info, codepoint);
-         if (glyph == 0 && (spc->skip_missing || missing_glyph_added)) {
-            rects[k].w = rects[k].h = 0;
-         } else {
-            stbtt_GetGlyphBitmapBoxSubpixel(info,glyph,
-                                            scale * spc->h_oversample,
-                                            scale * spc->v_oversample,
-                                            0,0,
-                                            &x0,&y0,&x1,&y1);
-            rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1);
-            rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1);
-            if (glyph == 0)
-               missing_glyph_added = 1;
-         }
-         ++k;
-      }
-   }
-
-   return k;
-}
-
-STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int prefilter_x, int prefilter_y, float *sub_x, float *sub_y, int glyph)
-{
-   stbtt_MakeGlyphBitmapSubpixel(info,
-                                 output,
-                                 out_w - (prefilter_x - 1),
-                                 out_h - (prefilter_y - 1),
-                                 out_stride,
-                                 scale_x,
-                                 scale_y,
-                                 shift_x,
-                                 shift_y,
-                                 glyph);
-
-   if (prefilter_x > 1)
-      stbtt__h_prefilter(output, out_w, out_h, out_stride, prefilter_x);
-
-   if (prefilter_y > 1)
-      stbtt__v_prefilter(output, out_w, out_h, out_stride, prefilter_y);
-
-   *sub_x = stbtt__oversample_shift(prefilter_x);
-   *sub_y = stbtt__oversample_shift(prefilter_y);
-}
-
-// rects array must be big enough to accommodate all characters in the given ranges
-STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
-{
-   int i,j,k, missing_glyph = -1, return_value = 1;
-
-   // save current values
-   int old_h_over = spc->h_oversample;
-   int old_v_over = spc->v_oversample;
-
-   k = 0;
-   for (i=0; i < num_ranges; ++i) {
-      float fh = ranges[i].font_size;
-      float scale = fh > 0 ? stbtt_ScaleForPixelHeight(info, fh) : stbtt_ScaleForMappingEmToPixels(info, -fh);
-      float recip_h,recip_v,sub_x,sub_y;
-      spc->h_oversample = ranges[i].h_oversample;
-      spc->v_oversample = ranges[i].v_oversample;
-      recip_h = 1.0f / spc->h_oversample;
-      recip_v = 1.0f / spc->v_oversample;
-      sub_x = stbtt__oversample_shift(spc->h_oversample);
-      sub_y = stbtt__oversample_shift(spc->v_oversample);
-      for (j=0; j < ranges[i].num_chars; ++j) {
-         stbrp_rect *r = &rects[k];
-         if (r->was_packed && r->w != 0 && r->h != 0) {
-            stbtt_packedchar *bc = &ranges[i].chardata_for_range[j];
-            int advance, lsb, x0,y0,x1,y1;
-            int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
-            int glyph = stbtt_FindGlyphIndex(info, codepoint);
-            stbrp_coord pad = (stbrp_coord) spc->padding;
-
-            // pad on left and top
-            r->x += pad;
-            r->y += pad;
-            r->w -= pad;
-            r->h -= pad;
-            stbtt_GetGlyphHMetrics(info, glyph, &advance, &lsb);
-            stbtt_GetGlyphBitmapBox(info, glyph,
-                                    scale * spc->h_oversample,
-                                    scale * spc->v_oversample,
-                                    &x0,&y0,&x1,&y1);
-            stbtt_MakeGlyphBitmapSubpixel(info,
-                                          spc->pixels + r->x + r->y*spc->stride_in_bytes,
-                                          r->w - spc->h_oversample+1,
-                                          r->h - spc->v_oversample+1,
-                                          spc->stride_in_bytes,
-                                          scale * spc->h_oversample,
-                                          scale * spc->v_oversample,
-                                          0,0,
-                                          glyph);
-
-            if (spc->h_oversample > 1)
-               stbtt__h_prefilter(spc->pixels + r->x + r->y*spc->stride_in_bytes,
-                                  r->w, r->h, spc->stride_in_bytes,
-                                  spc->h_oversample);
-
-            if (spc->v_oversample > 1)
-               stbtt__v_prefilter(spc->pixels + r->x + r->y*spc->stride_in_bytes,
-                                  r->w, r->h, spc->stride_in_bytes,
-                                  spc->v_oversample);
-
-            bc->x0       = (stbtt_int16)  r->x;
-            bc->y0       = (stbtt_int16)  r->y;
-            bc->x1       = (stbtt_int16) (r->x + r->w);
-            bc->y1       = (stbtt_int16) (r->y + r->h);
-            bc->xadvance =                scale * advance;
-            bc->xoff     =       (float)  x0 * recip_h + sub_x;
-            bc->yoff     =       (float)  y0 * recip_v + sub_y;
-            bc->xoff2    =                (x0 + r->w) * recip_h + sub_x;
-            bc->yoff2    =                (y0 + r->h) * recip_v + sub_y;
-
-            if (glyph == 0)
-               missing_glyph = j;
-         } else if (spc->skip_missing) {
-            return_value = 0;
-         } else if (r->was_packed && r->w == 0 && r->h == 0 && missing_glyph >= 0) {
-            ranges[i].chardata_for_range[j] = ranges[i].chardata_for_range[missing_glyph];
-         } else {
-            return_value = 0; // if any fail, report failure
-         }
-
-         ++k;
-      }
-   }
-
-   // restore original values
-   spc->h_oversample = old_h_over;
-   spc->v_oversample = old_v_over;
-
-   return return_value;
-}
-
-STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context *spc, stbrp_rect *rects, int num_rects)
-{
-   stbrp_pack_rects((stbrp_context *) spc->pack_info, rects, num_rects);
-}
-
-STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, stbtt_pack_range *ranges, int num_ranges)
-{
-   stbtt_fontinfo info;
-   int i,j,n, return_value = 1;
-   //stbrp_context *context = (stbrp_context *) spc->pack_info;
-   stbrp_rect    *rects;
-
-   // flag all characters as NOT packed
-   for (i=0; i < num_ranges; ++i)
-      for (j=0; j < ranges[i].num_chars; ++j)
-         ranges[i].chardata_for_range[j].x0 =
-         ranges[i].chardata_for_range[j].y0 =
-         ranges[i].chardata_for_range[j].x1 =
-         ranges[i].chardata_for_range[j].y1 = 0;
-
-   n = 0;
-   for (i=0; i < num_ranges; ++i)
-      n += ranges[i].num_chars;
-
-   rects = (stbrp_rect *) STBTT_malloc(sizeof(*rects) * n, spc->user_allocator_context);
-   if (rects == NULL)
-      return 0;
-
-   info.userdata = spc->user_allocator_context;
-   stbtt_InitFont(&info, fontdata, stbtt_GetFontOffsetForIndex(fontdata,font_index));
-
-   n = stbtt_PackFontRangesGatherRects(spc, &info, ranges, num_ranges, rects);
-
-   stbtt_PackFontRangesPackRects(spc, rects, n);
-
-   return_value = stbtt_PackFontRangesRenderIntoRects(spc, &info, ranges, num_ranges, rects);
-
-   STBTT_free(rects, spc->user_allocator_context);
-   return return_value;
-}
-
-STBTT_DEF int stbtt_PackFontRange(stbtt_pack_context *spc, const unsigned char *fontdata, int font_index, float font_size,
-            int first_unicode_codepoint_in_range, int num_chars_in_range, stbtt_packedchar *chardata_for_range)
-{
-   stbtt_pack_range range;
-   range.first_unicode_codepoint_in_range = first_unicode_codepoint_in_range;
-   range.array_of_unicode_codepoints = NULL;
-   range.num_chars                   = num_chars_in_range;
-   range.chardata_for_range          = chardata_for_range;
-   range.font_size                   = font_size;
-   return stbtt_PackFontRanges(spc, fontdata, font_index, &range, 1);
-}
-
-STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap)
-{
-   int i_ascent, i_descent, i_lineGap;
-   float scale;
-   stbtt_fontinfo info;
-   stbtt_InitFont(&info, fontdata, stbtt_GetFontOffsetForIndex(fontdata, index));
-   scale = size > 0 ? stbtt_ScaleForPixelHeight(&info, size) : stbtt_ScaleForMappingEmToPixels(&info, -size);
-   stbtt_GetFontVMetrics(&info, &i_ascent, &i_descent, &i_lineGap);
-   *ascent  = (float) i_ascent  * scale;
-   *descent = (float) i_descent * scale;
-   *lineGap = (float) i_lineGap * scale;
-}
-
-STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int align_to_integer)
-{
-   float ipw = 1.0f / pw, iph = 1.0f / ph;
-   const stbtt_packedchar *b = chardata + char_index;
-
-   if (align_to_integer) {
-      float x = (float) STBTT_ifloor((*xpos + b->xoff) + 0.5f);
-      float y = (float) STBTT_ifloor((*ypos + b->yoff) + 0.5f);
-      q->x0 = x;
-      q->y0 = y;
-      q->x1 = x + b->xoff2 - b->xoff;
-      q->y1 = y + b->yoff2 - b->yoff;
-   } else {
-      q->x0 = *xpos + b->xoff;
-      q->y0 = *ypos + b->yoff;
-      q->x1 = *xpos + b->xoff2;
-      q->y1 = *ypos + b->yoff2;
-   }
-
-   q->s0 = b->x0 * ipw;
-   q->t0 = b->y0 * iph;
-   q->s1 = b->x1 * ipw;
-   q->t1 = b->y1 * iph;
-
-   *xpos += b->xadvance;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// sdf computation
-//
-
-#define STBTT_min(a,b)  ((a) < (b) ? (a) : (b))
-#define STBTT_max(a,b)  ((a) < (b) ? (b) : (a))
-
-static int stbtt__ray_intersect_bezier(float orig[2], float ray[2], float q0[2], float q1[2], float q2[2], float hits[2][2])
-{
-   float q0perp = q0[1]*ray[0] - q0[0]*ray[1];
-   float q1perp = q1[1]*ray[0] - q1[0]*ray[1];
-   float q2perp = q2[1]*ray[0] - q2[0]*ray[1];
-   float roperp = orig[1]*ray[0] - orig[0]*ray[1];
-
-   float a = q0perp - 2*q1perp + q2perp;
-   float b = q1perp - q0perp;
-   float c = q0perp - roperp;
-
-   float s0 = 0., s1 = 0.;
-   int num_s = 0;
-
-   if (a != 0.0) {
-      float discr = b*b - a*c;
-      if (discr > 0.0) {
-         float rcpna = -1 / a;
-         float d = (float) STBTT_sqrt(discr);
-         s0 = (b+d) * rcpna;
-         s1 = (b-d) * rcpna;
-         if (s0 >= 0.0 && s0 <= 1.0)
-            num_s = 1;
-         if (d > 0.0 && s1 >= 0.0 && s1 <= 1.0) {
-            if (num_s == 0) s0 = s1;
-            ++num_s;
-         }
-      }
-   } else {
-      // 2*b*s + c = 0
-      // s = -c / (2*b)
-      s0 = c / (-2 * b);
-      if (s0 >= 0.0 && s0 <= 1.0)
-         num_s = 1;
-   }
-
-   if (num_s == 0)
-      return 0;
-   else {
-      float rcp_len2 = 1 / (ray[0]*ray[0] + ray[1]*ray[1]);
-      float rayn_x = ray[0] * rcp_len2, rayn_y = ray[1] * rcp_len2;
-
-      float q0d =   q0[0]*rayn_x +   q0[1]*rayn_y;
-      float q1d =   q1[0]*rayn_x +   q1[1]*rayn_y;
-      float q2d =   q2[0]*rayn_x +   q2[1]*rayn_y;
-      float rod = orig[0]*rayn_x + orig[1]*rayn_y;
-
-      float q10d = q1d - q0d;
-      float q20d = q2d - q0d;
-      float q0rd = q0d - rod;
-
-      hits[0][0] = q0rd + s0*(2.0f - 2.0f*s0)*q10d + s0*s0*q20d;
-      hits[0][1] = a*s0+b;
-
-      if (num_s > 1) {
-         hits[1][0] = q0rd + s1*(2.0f - 2.0f*s1)*q10d + s1*s1*q20d;
-         hits[1][1] = a*s1+b;
-         return 2;
-      } else {
-         return 1;
-      }
-   }
-}
-
-static int equal(float *a, float *b)
-{
-   return (a[0] == b[0] && a[1] == b[1]);
-}
-
-static int stbtt__compute_crossings_x(float x, float y, int nverts, stbtt_vertex *verts)
-{
-   int i;
-   float orig[2], ray[2] = { 1, 0 };
-   float y_frac;
-   int winding = 0;
-
-   // make sure y never passes through a vertex of the shape
-   y_frac = (float) STBTT_fmod(y, 1.0f);
-   if (y_frac < 0.01f)
-      y += 0.01f;
-   else if (y_frac > 0.99f)
-      y -= 0.01f;
-
-   orig[0] = x;
-   orig[1] = y;
-
-   // test a ray from (-infinity,y) to (x,y)
-   for (i=0; i < nverts; ++i) {
-      if (verts[i].type == STBTT_vline) {
-         int x0 = (int) verts[i-1].x, y0 = (int) verts[i-1].y;
-         int x1 = (int) verts[i  ].x, y1 = (int) verts[i  ].y;
-         if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
-            float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
-            if (x_inter < x)
-               winding += (y0 < y1) ? 1 : -1;
-         }
-      }
-      if (verts[i].type == STBTT_vcurve) {
-         int x0 = (int) verts[i-1].x , y0 = (int) verts[i-1].y ;
-         int x1 = (int) verts[i  ].cx, y1 = (int) verts[i  ].cy;
-         int x2 = (int) verts[i  ].x , y2 = (int) verts[i  ].y ;
-         int ax = STBTT_min(x0,STBTT_min(x1,x2)), ay = STBTT_min(y0,STBTT_min(y1,y2));
-         int by = STBTT_max(y0,STBTT_max(y1,y2));
-         if (y > ay && y < by && x > ax) {
-            float q0[2],q1[2],q2[2];
-            float hits[2][2];
-            q0[0] = (float)x0;
-            q0[1] = (float)y0;
-            q1[0] = (float)x1;
-            q1[1] = (float)y1;
-            q2[0] = (float)x2;
-            q2[1] = (float)y2;
-            if (equal(q0,q1) || equal(q1,q2)) {
-               x0 = (int)verts[i-1].x;
-               y0 = (int)verts[i-1].y;
-               x1 = (int)verts[i  ].x;
-               y1 = (int)verts[i  ].y;
-               if (y > STBTT_min(y0,y1) && y < STBTT_max(y0,y1) && x > STBTT_min(x0,x1)) {
-                  float x_inter = (y - y0) / (y1 - y0) * (x1-x0) + x0;
-                  if (x_inter < x)
-                     winding += (y0 < y1) ? 1 : -1;
-               }
-            } else {
-               int num_hits = stbtt__ray_intersect_bezier(orig, ray, q0, q1, q2, hits);
-               if (num_hits >= 1)
-                  if (hits[0][0] < 0)
-                     winding += (hits[0][1] < 0 ? -1 : 1);
-               if (num_hits >= 2)
-                  if (hits[1][0] < 0)
-                     winding += (hits[1][1] < 0 ? -1 : 1);
-            }
-         }
-      }
-   }
-   return winding;
-}
-
-static float stbtt__cuberoot( float x )
-{
-   if (x<0)
-      return -(float) STBTT_pow(-x,1.0f/3.0f);
-   else
-      return  (float) STBTT_pow( x,1.0f/3.0f);
-}
-
-// x^3 + a*x^2 + b*x + c = 0
-static int stbtt__solve_cubic(float a, float b, float c, float* r)
-{
-   float s = -a / 3;
-   float p = b - a*a / 3;
-   float q = a * (2*a*a - 9*b) / 27 + c;
-   float p3 = p*p*p;
-   float d = q*q + 4*p3 / 27;
-   if (d >= 0) {
-      float z = (float) STBTT_sqrt(d);
-      float u = (-q + z) / 2;
-      float v = (-q - z) / 2;
-      u = stbtt__cuberoot(u);
-      v = stbtt__cuberoot(v);
-      r[0] = s + u + v;
-      return 1;
-   } else {
-      float u = (float) STBTT_sqrt(-p/3);
-      float v = (float) STBTT_acos(-STBTT_sqrt(-27/p3) * q / 2) / 3; // p3 must be negative, since d is negative
-      float m = (float) STBTT_cos(v);
-      float n = (float) STBTT_cos(v-3.141592/2)*1.732050808f;
-      r[0] = s + u * 2 * m;
-      r[1] = s - u * (m + n);
-      r[2] = s - u * (m - n);
-
-      //STBTT_assert( STBTT_fabs(((r[0]+a)*r[0]+b)*r[0]+c) < 0.05f);  // these asserts may not be safe at all scales, though they're in bezier t parameter units so maybe?
-      //STBTT_assert( STBTT_fabs(((r[1]+a)*r[1]+b)*r[1]+c) < 0.05f);
-      //STBTT_assert( STBTT_fabs(((r[2]+a)*r[2]+b)*r[2]+c) < 0.05f);
-      return 3;
-   }
-}
-
-STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float scale, int glyph, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff)
-{
-   float scale_x = scale, scale_y = scale;
-   int ix0,iy0,ix1,iy1;
-   int w,h;
-   unsigned char *data;
-
-   if (scale == 0) return NULL;
-
-   stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale, scale, 0.0f,0.0f, &ix0,&iy0,&ix1,&iy1);
-
-   // if empty, return NULL
-   if (ix0 == ix1 || iy0 == iy1)
-      return NULL;
-
-   ix0 -= padding;
-   iy0 -= padding;
-   ix1 += padding;
-   iy1 += padding;
-
-   w = (ix1 - ix0);
-   h = (iy1 - iy0);
-
-   if (width ) *width  = w;
-   if (height) *height = h;
-   if (xoff  ) *xoff   = ix0;
-   if (yoff  ) *yoff   = iy0;
-
-   // invert for y-downwards bitmaps
-   scale_y = -scale_y;
-
-   {
-      int x,y,i,j;
-      float *precompute;
-      stbtt_vertex *verts;
-      int num_verts = stbtt_GetGlyphShape(info, glyph, &verts);
-      data = (unsigned char *) STBTT_malloc(w * h, info->userdata);
-      precompute = (float *) STBTT_malloc(num_verts * sizeof(float), info->userdata);
-
-      for (i=0,j=num_verts-1; i < num_verts; j=i++) {
-         if (verts[i].type == STBTT_vline) {
-            float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y;
-            float x1 = verts[j].x*scale_x, y1 = verts[j].y*scale_y;
-            float dist = (float) STBTT_sqrt((x1-x0)*(x1-x0) + (y1-y0)*(y1-y0));
-            precompute[i] = (dist == 0) ? 0.0f : 1.0f / dist;
-         } else if (verts[i].type == STBTT_vcurve) {
-            float x2 = verts[j].x *scale_x, y2 = verts[j].y *scale_y;
-            float x1 = verts[i].cx*scale_x, y1 = verts[i].cy*scale_y;
-            float x0 = verts[i].x *scale_x, y0 = verts[i].y *scale_y;
-            float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2;
-            float len2 = bx*bx + by*by;
-            if (len2 != 0.0f)
-               precompute[i] = 1.0f / (bx*bx + by*by);
-            else
-               precompute[i] = 0.0f;
-         } else
-            precompute[i] = 0.0f;
-      }
-
-      for (y=iy0; y < iy1; ++y) {
-         for (x=ix0; x < ix1; ++x) {
-            float val;
-            float min_dist = 999999.0f;
-            float sx = (float) x + 0.5f;
-            float sy = (float) y + 0.5f;
-            float x_gspace = (sx / scale_x);
-            float y_gspace = (sy / scale_y);
-
-            int winding = stbtt__compute_crossings_x(x_gspace, y_gspace, num_verts, verts); // @OPTIMIZE: this could just be a rasterization, but needs to be line vs. non-tesselated curves so a new path
-
-            for (i=0; i < num_verts; ++i) {
-               float x0 = verts[i].x*scale_x, y0 = verts[i].y*scale_y;
-
-               if (verts[i].type == STBTT_vline && precompute[i] != 0.0f) {
-                  float x1 = verts[i-1].x*scale_x, y1 = verts[i-1].y*scale_y;
-
-                  float dist,dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy);
-                  if (dist2 < min_dist*min_dist)
-                     min_dist = (float) STBTT_sqrt(dist2);
-
-                  // coarse culling against bbox
-                  //if (sx > STBTT_min(x0,x1)-min_dist && sx < STBTT_max(x0,x1)+min_dist &&
-                  //    sy > STBTT_min(y0,y1)-min_dist && sy < STBTT_max(y0,y1)+min_dist)
-                  dist = (float) STBTT_fabs((x1-x0)*(y0-sy) - (y1-y0)*(x0-sx)) * precompute[i];
-                  STBTT_assert(i != 0);
-                  if (dist < min_dist) {
-                     // check position along line
-                     // x' = x0 + t*(x1-x0), y' = y0 + t*(y1-y0)
-                     // minimize (x'-sx)*(x'-sx)+(y'-sy)*(y'-sy)
-                     float dx = x1-x0, dy = y1-y0;
-                     float px = x0-sx, py = y0-sy;
-                     // minimize (px+t*dx)^2 + (py+t*dy)^2 = px*px + 2*px*dx*t + t^2*dx*dx + py*py + 2*py*dy*t + t^2*dy*dy
-                     // derivative: 2*px*dx + 2*py*dy + (2*dx*dx+2*dy*dy)*t, set to 0 and solve
-                     float t = -(px*dx + py*dy) / (dx*dx + dy*dy);
-                     if (t >= 0.0f && t <= 1.0f)
-                        min_dist = dist;
-                  }
-               } else if (verts[i].type == STBTT_vcurve) {
-                  float x2 = verts[i-1].x *scale_x, y2 = verts[i-1].y *scale_y;
-                  float x1 = verts[i  ].cx*scale_x, y1 = verts[i  ].cy*scale_y;
-                  float box_x0 = STBTT_min(STBTT_min(x0,x1),x2);
-                  float box_y0 = STBTT_min(STBTT_min(y0,y1),y2);
-                  float box_x1 = STBTT_max(STBTT_max(x0,x1),x2);
-                  float box_y1 = STBTT_max(STBTT_max(y0,y1),y2);
-                  // coarse culling against bbox to avoid computing cubic unnecessarily
-                  if (sx > box_x0-min_dist && sx < box_x1+min_dist && sy > box_y0-min_dist && sy < box_y1+min_dist) {
-                     int num=0;
-                     float ax = x1-x0, ay = y1-y0;
-                     float bx = x0 - 2*x1 + x2, by = y0 - 2*y1 + y2;
-                     float mx = x0 - sx, my = y0 - sy;
-                     float res[3] = {0.f,0.f,0.f};
-                     float px,py,t,it,dist2;
-                     float a_inv = precompute[i];
-                     if (a_inv == 0.0) { // if a_inv is 0, it's 2nd degree so use quadratic formula
-                        float a = 3*(ax*bx + ay*by);
-                        float b = 2*(ax*ax + ay*ay) + (mx*bx+my*by);
-                        float c = mx*ax+my*ay;
-                        if (a == 0.0) { // if a is 0, it's linear
-                           if (b != 0.0) {
-                              res[num++] = -c/b;
-                           }
-                        } else {
-                           float discriminant = b*b - 4*a*c;
-                           if (discriminant < 0)
-                              num = 0;
-                           else {
-                              float root = (float) STBTT_sqrt(discriminant);
-                              res[0] = (-b - root)/(2*a);
-                              res[1] = (-b + root)/(2*a);
-                              num = 2; // don't bother distinguishing 1-solution case, as code below will still work
-                           }
-                        }
-                     } else {
-                        float b = 3*(ax*bx + ay*by) * a_inv; // could precompute this as it doesn't depend on sample point
-                        float c = (2*(ax*ax + ay*ay) + (mx*bx+my*by)) * a_inv;
-                        float d = (mx*ax+my*ay) * a_inv;
-                        num = stbtt__solve_cubic(b, c, d, res);
-                     }
-                     dist2 = (x0-sx)*(x0-sx) + (y0-sy)*(y0-sy);
-                     if (dist2 < min_dist*min_dist)
-                        min_dist = (float) STBTT_sqrt(dist2);
-
-                     if (num >= 1 && res[0] >= 0.0f && res[0] <= 1.0f) {
-                        t = res[0], it = 1.0f - t;
-                        px = it*it*x0 + 2*t*it*x1 + t*t*x2;
-                        py = it*it*y0 + 2*t*it*y1 + t*t*y2;
-                        dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
-                        if (dist2 < min_dist * min_dist)
-                           min_dist = (float) STBTT_sqrt(dist2);
-                     }
-                     if (num >= 2 && res[1] >= 0.0f && res[1] <= 1.0f) {
-                        t = res[1], it = 1.0f - t;
-                        px = it*it*x0 + 2*t*it*x1 + t*t*x2;
-                        py = it*it*y0 + 2*t*it*y1 + t*t*y2;
-                        dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
-                        if (dist2 < min_dist * min_dist)
-                           min_dist = (float) STBTT_sqrt(dist2);
-                     }
-                     if (num >= 3 && res[2] >= 0.0f && res[2] <= 1.0f) {
-                        t = res[2], it = 1.0f - t;
-                        px = it*it*x0 + 2*t*it*x1 + t*t*x2;
-                        py = it*it*y0 + 2*t*it*y1 + t*t*y2;
-                        dist2 = (px-sx)*(px-sx) + (py-sy)*(py-sy);
-                        if (dist2 < min_dist * min_dist)
-                           min_dist = (float) STBTT_sqrt(dist2);
-                     }
-                  }
-               }
-            }
-            if (winding == 0)
-               min_dist = -min_dist;  // if outside the shape, value is negative
-            val = onedge_value + pixel_dist_scale * min_dist;
-            if (val < 0)
-               val = 0;
-            else if (val > 255)
-               val = 255;
-            data[(y-iy0)*w+(x-ix0)] = (unsigned char) val;
-         }
-      }
-      STBTT_free(precompute, info->userdata);
-      STBTT_free(verts, info->userdata);
-   }
-   return data;
-}
-
-STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff)
-{
-   return stbtt_GetGlyphSDF(info, scale, stbtt_FindGlyphIndex(info, codepoint), padding, onedge_value, pixel_dist_scale, width, height, xoff, yoff);
-}
-
-STBTT_DEF void stbtt_FreeSDF(unsigned char *bitmap, void *userdata)
-{
-   STBTT_free(bitmap, userdata);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// font name matching -- recommended not to use this
-//
-
-// check if a utf8 string contains a prefix which is the utf16 string; if so return length of matching utf8 string
-static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(stbtt_uint8 *s1, stbtt_int32 len1, stbtt_uint8 *s2, stbtt_int32 len2)
-{
-   stbtt_int32 i=0;
-
-   // convert utf16 to utf8 and compare the results while converting
-   while (len2) {
-      stbtt_uint16 ch = s2[0]*256 + s2[1];
-      if (ch < 0x80) {
-         if (i >= len1) return -1;
-         if (s1[i++] != ch) return -1;
-      } else if (ch < 0x800) {
-         if (i+1 >= len1) return -1;
-         if (s1[i++] != 0xc0 + (ch >> 6)) return -1;
-         if (s1[i++] != 0x80 + (ch & 0x3f)) return -1;
-      } else if (ch >= 0xd800 && ch < 0xdc00) {
-         stbtt_uint32 c;
-         stbtt_uint16 ch2 = s2[2]*256 + s2[3];
-         if (i+3 >= len1) return -1;
-         c = ((ch - 0xd800) << 10) + (ch2 - 0xdc00) + 0x10000;
-         if (s1[i++] != 0xf0 + (c >> 18)) return -1;
-         if (s1[i++] != 0x80 + ((c >> 12) & 0x3f)) return -1;
-         if (s1[i++] != 0x80 + ((c >>  6) & 0x3f)) return -1;
-         if (s1[i++] != 0x80 + ((c      ) & 0x3f)) return -1;
-         s2 += 2; // plus another 2 below
-         len2 -= 2;
-      } else if (ch >= 0xdc00 && ch < 0xe000) {
-         return -1;
-      } else {
-         if (i+2 >= len1) return -1;
-         if (s1[i++] != 0xe0 + (ch >> 12)) return -1;
-         if (s1[i++] != 0x80 + ((ch >> 6) & 0x3f)) return -1;
-         if (s1[i++] != 0x80 + ((ch     ) & 0x3f)) return -1;
-      }
-      s2 += 2;
-      len2 -= 2;
-   }
-   return i;
-}
-
-static int stbtt_CompareUTF8toUTF16_bigendian_internal(char *s1, int len1, char *s2, int len2)
-{
-   return len1 == stbtt__CompareUTF8toUTF16_bigendian_prefix((stbtt_uint8*) s1, len1, (stbtt_uint8*) s2, len2);
-}
-
-// returns results in whatever encoding you request... but note that 2-byte encodings
-// will be BIG-ENDIAN... use stbtt_CompareUTF8toUTF16_bigendian() to compare
-STBTT_DEF const char *stbtt_GetFontNameString(const stbtt_fontinfo *font, int *length, int platformID, int encodingID, int languageID, int nameID)
-{
-   stbtt_int32 i,count,stringOffset;
-   stbtt_uint8 *fc = font->data;
-   stbtt_uint32 offset = font->fontstart;
-   stbtt_uint32 nm = stbtt__find_table(fc, offset, "name");
-   if (!nm) return NULL;
-
-   count = ttUSHORT(fc+nm+2);
-   stringOffset = nm + ttUSHORT(fc+nm+4);
-   for (i=0; i < count; ++i) {
-      stbtt_uint32 loc = nm + 6 + 12 * i;
-      if (platformID == ttUSHORT(fc+loc+0) && encodingID == ttUSHORT(fc+loc+2)
-          && languageID == ttUSHORT(fc+loc+4) && nameID == ttUSHORT(fc+loc+6)) {
-         *length = ttUSHORT(fc+loc+8);
-         return (const char *) (fc+stringOffset+ttUSHORT(fc+loc+10));
-      }
-   }
-   return NULL;
-}
-
-static int stbtt__matchpair(stbtt_uint8 *fc, stbtt_uint32 nm, stbtt_uint8 *name, stbtt_int32 nlen, stbtt_int32 target_id, stbtt_int32 next_id)
-{
-   stbtt_int32 i;
-   stbtt_int32 count = ttUSHORT(fc+nm+2);
-   stbtt_int32 stringOffset = nm + ttUSHORT(fc+nm+4);
-
-   for (i=0; i < count; ++i) {
-      stbtt_uint32 loc = nm + 6 + 12 * i;
-      stbtt_int32 id = ttUSHORT(fc+loc+6);
-      if (id == target_id) {
-         // find the encoding
-         stbtt_int32 platform = ttUSHORT(fc+loc+0), encoding = ttUSHORT(fc+loc+2), language = ttUSHORT(fc+loc+4);
-
-         // is this a Unicode encoding?
-         if (platform == 0 || (platform == 3 && encoding == 1) || (platform == 3 && encoding == 10)) {
-            stbtt_int32 slen = ttUSHORT(fc+loc+8);
-            stbtt_int32 off = ttUSHORT(fc+loc+10);
-
-            // check if there's a prefix match
-            stbtt_int32 matchlen = stbtt__CompareUTF8toUTF16_bigendian_prefix(name, nlen, fc+stringOffset+off,slen);
-            if (matchlen >= 0) {
-               // check for target_id+1 immediately following, with same encoding & language
-               if (i+1 < count && ttUSHORT(fc+loc+12+6) == next_id && ttUSHORT(fc+loc+12) == platform && ttUSHORT(fc+loc+12+2) == encoding && ttUSHORT(fc+loc+12+4) == language) {
-                  slen = ttUSHORT(fc+loc+12+8);
-                  off = ttUSHORT(fc+loc+12+10);
-                  if (slen == 0) {
-                     if (matchlen == nlen)
-                        return 1;
-                  } else if (matchlen < nlen && name[matchlen] == ' ') {
-                     ++matchlen;
-                     if (stbtt_CompareUTF8toUTF16_bigendian_internal((char*) (name+matchlen), nlen-matchlen, (char*)(fc+stringOffset+off),slen))
-                        return 1;
-                  }
-               } else {
-                  // if nothing immediately following
-                  if (matchlen == nlen)
-                     return 1;
-               }
-            }
-         }
-
-         // @TODO handle other encodings
-      }
-   }
-   return 0;
-}
-
-static int stbtt__matches(stbtt_uint8 *fc, stbtt_uint32 offset, stbtt_uint8 *name, stbtt_int32 flags)
-{
-   stbtt_int32 nlen = (stbtt_int32) STBTT_strlen((char *) name);
-   stbtt_uint32 nm,hd;
-   if (!stbtt__isfont(fc+offset)) return 0;
-
-   // check italics/bold/underline flags in macStyle...
-   if (flags) {
-      hd = stbtt__find_table(fc, offset, "head");
-      if ((ttUSHORT(fc+hd+44) & 7) != (flags & 7)) return 0;
-   }
-
-   nm = stbtt__find_table(fc, offset, "name");
-   if (!nm) return 0;
-
-   if (flags) {
-      // if we checked the macStyle flags, then just check the family and ignore the subfamily
-      if (stbtt__matchpair(fc, nm, name, nlen, 16, -1))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  1, -1))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  3, -1))  return 1;
-   } else {
-      if (stbtt__matchpair(fc, nm, name, nlen, 16, 17))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  1,  2))  return 1;
-      if (stbtt__matchpair(fc, nm, name, nlen,  3, -1))  return 1;
-   }
-
-   return 0;
-}
-
-static int stbtt_FindMatchingFont_internal(unsigned char *font_collection, char *name_utf8, stbtt_int32 flags)
-{
-   stbtt_int32 i;
-   for (i=0;;++i) {
-      stbtt_int32 off = stbtt_GetFontOffsetForIndex(font_collection, i);
-      if (off < 0) return off;
-      if (stbtt__matches((stbtt_uint8 *) font_collection, off, (stbtt_uint8*) name_utf8, flags))
-         return off;
-   }
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-
-STBTT_DEF int stbtt_BakeFontBitmap(const unsigned char *data, int offset,
-                                float pixel_height, unsigned char *pixels, int pw, int ph,
-                                int first_char, int num_chars, stbtt_bakedchar *chardata)
-{
-   return stbtt_BakeFontBitmap_internal((unsigned char *) data, offset, pixel_height, pixels, pw, ph, first_char, num_chars, chardata);
-}
-
-STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index)
-{
-   return stbtt_GetFontOffsetForIndex_internal((unsigned char *) data, index);
-}
-
-STBTT_DEF int stbtt_GetNumberOfFonts(const unsigned char *data)
-{
-   return stbtt_GetNumberOfFonts_internal((unsigned char *) data);
-}
-
-STBTT_DEF int stbtt_InitFont(stbtt_fontinfo *info, const unsigned char *data, int offset)
-{
-   return stbtt_InitFont_internal(info, (unsigned char *) data, offset);
-}
-
-STBTT_DEF int stbtt_FindMatchingFont(const unsigned char *fontdata, const char *name, int flags)
-{
-   return stbtt_FindMatchingFont_internal((unsigned char *) fontdata, (char *) name, flags);
-}
-
-STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2)
-{
-   return stbtt_CompareUTF8toUTF16_bigendian_internal((char *) s1, len1, (char *) s2, len2);
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
-#endif // STB_TRUETYPE_IMPLEMENTATION
-
-
-// FULL VERSION HISTORY
-//
-//   1.25 (2021-07-11) many fixes
-//   1.24 (2020-02-05) fix warning
-//   1.23 (2020-02-02) query SVG data for glyphs; query whole kerning table (but only kern not GPOS)
-//   1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined
-//   1.21 (2019-02-25) fix warning
-//   1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics()
-//   1.19 (2018-02-11) OpenType GPOS kerning (horizontal only), STBTT_fmod
-//   1.18 (2018-01-29) add missing function
-//   1.17 (2017-07-23) make more arguments const; doc fix
-//   1.16 (2017-07-12) SDF support
-//   1.15 (2017-03-03) make more arguments const
-//   1.14 (2017-01-16) num-fonts-in-TTC function
-//   1.13 (2017-01-02) support OpenType fonts, certain Apple fonts
-//   1.12 (2016-10-25) suppress warnings about casting away const with -Wcast-qual
-//   1.11 (2016-04-02) fix unused-variable warning
-//   1.10 (2016-04-02) allow user-defined fabs() replacement
-//                     fix memory leak if fontsize=0.0
-//                     fix warning from duplicate typedef
-//   1.09 (2016-01-16) warning fix; avoid crash on outofmem; use alloc userdata for PackFontRanges
-//   1.08 (2015-09-13) document stbtt_Rasterize(); fixes for vertical & horizontal edges
-//   1.07 (2015-08-01) allow PackFontRanges to accept arrays of sparse codepoints;
-//                     allow PackFontRanges to pack and render in separate phases;
-//                     fix stbtt_GetFontOFfsetForIndex (never worked for non-0 input?);
-//                     fixed an assert() bug in the new rasterizer
-//                     replace assert() with STBTT_assert() in new rasterizer
-//   1.06 (2015-07-14) performance improvements (~35% faster on x86 and x64 on test machine)
-//                     also more precise AA rasterizer, except if shapes overlap
-//                     remove need for STBTT_sort
-//   1.05 (2015-04-15) fix misplaced definitions for STBTT_STATIC
-//   1.04 (2015-04-15) typo in example
-//   1.03 (2015-04-12) STBTT_STATIC, fix memory leak in new packing, various fixes
-//   1.02 (2014-12-10) fix various warnings & compile issues w/ stb_rect_pack, C++
-//   1.01 (2014-12-08) fix subpixel position when oversampling to exactly match
-//                        non-oversampled; STBTT_POINT_SIZE for packed case only
-//   1.00 (2014-12-06) add new PackBegin etc. API, w/ support for oversampling
-//   0.99 (2014-09-18) fix multiple bugs with subpixel rendering (ryg)
-//   0.9  (2014-08-07) support certain mac/iOS fonts without an MS platformID
-//   0.8b (2014-07-07) fix a warning
-//   0.8  (2014-05-25) fix a few more warnings
-//   0.7  (2013-09-25) bugfix: subpixel glyph bug fixed in 0.5 had come back
-//   0.6c (2012-07-24) improve documentation
-//   0.6b (2012-07-20) fix a few more warnings
-//   0.6  (2012-07-17) fix warnings; added stbtt_ScaleForMappingEmToPixels,
-//                        stbtt_GetFontBoundingBox, stbtt_IsGlyphEmpty
-//   0.5  (2011-12-09) bugfixes:
-//                        subpixel glyph renderer computed wrong bounding box
-//                        first vertex of shape can be off-curve (FreeSans)
-//   0.4b (2011-12-03) fixed an error in the font baking example
-//   0.4  (2011-12-01) kerning, subpixel rendering (tor)
-//                    bugfixes for:
-//                        codepoint-to-glyph conversion using table fmt=12
-//                        codepoint-to-glyph conversion using table fmt=4
-//                        stbtt_GetBakedQuad with non-square texture (Zer)
-//                    updated Hello World! sample to use kerning and subpixel
-//                    fixed some warnings
-//   0.3  (2009-06-24) cmap fmt=12, compound shapes (MM)
-//                    userdata, malloc-from-userdata, non-zero fill (stb)
-//   0.2  (2009-03-11) Fix unsigned/signed char warnings
-//   0.1  (2009-03-09) First public release
-//
-
-/*
-------------------------------------------------------------------------------
-This software is available under 2 licenses -- choose whichever you prefer.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2017 Sean Barrett
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------
-*/
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/LICENSE
deleted file mode 100644
index 935e282f0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-
-This software is provided 'as-is', without any express or
-implied warranty. In no event will the authors be held
-liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute
-it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented;
-   you must not claim that you wrote the original software.
-   If you use this software in a product, an acknowledgment
-   in the product documentation would be appreciated but
-   is not required.
-
-2. Altered source versions must be plainly marked as such,
-   and must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any
-   source distribution.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/README.md b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/README.md
deleted file mode 100644
index 675447a5a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-string id
-=========
-
-![Project Status](https://img.shields.io/endpoint?url=https%3A%2F%2Fwww.jonathanmueller.dev%2Fproject%2Fstring_id%2Findex.json)
-
-Motivation
-----------
-It is often useful for logging purposes in real-time applications like games to give each entity a name. This makes tracking down errors easier because finding entities via unique names is easier than looking at unique numbers or other forms of identifiers. But strings are huge and copying and comparing them is slow, so they often can't be used in performance critical code.
-
-One solution are hashed strings which are only integers and thus small, fast to copy and compare. But hashes don't allow retrieving the original string value which is exactly what is needed for logging and debugging purposes! In addition, there is a chance of collisions, so equal hash code doesn't necessarily mean equal strings. This chance is small, but a source for hard to find bugs.
-
-Another solution is string interning. String interning uses a global look-up table where each string is stored only once and is referenced via an index or something similar. Copying and comparing is fast, too, but they are still not perfect: You can only access them at runtime. Getting the value at compile-time e.g. for a switch is not possible.
-
-So on the one hand we want fast and lightweight identifiers but on the other hand also methods to get the name back. 
-
-
-string_id
----------
-This open source library provides a mix between the two solutions in the form of the class *string_id*. Each object stores a hashed string value and a pointer to the database in which the original string value is stored. This allows retrieving the string value when needed while also getting the performance benefits from hashed strings. In addition, the database can detect collisions which can be handled via a custom collision handler. There is a user-defined literal to create a compile-time hashed string value to use it as a constant expression.
-
-The database can be any user-defined type derived from a certain interface class. There are several pre-defined databases. This includes a dummy database that does not store anything, a adapter for other databases to make them threadsafe and a highly optimized database for efficient storing and retrieving of strings. A typedef *default_database* is one of those databases and can be set via the following CMake options:
-
-* *FOONATHAN_STRING_ID_DATABASE* - if *OFF*, the database is disabled completely, e.g. the dummy database is used. This does not allow retrieving strings or collision checking but does not need that much memory. It is *ON* by default.
-
-* *FOONATHAN_STRING_ID_MULTITHREADED* - if *ON*, database access will be synchronized via a mutex, e.g. the thread safe adapter will be used. It has no effect if database is disabled. Default value is *ON*.
-
-There are special generator classes. They have a similar interface to the random number generators in the standard libraries, but generate string identifiers. This is used to generate a bunch of identifiers in an automated fashion. The generators also take care that there are always new identifiers generated. This can be controlled via a handler similar to the collision handling, too.
-
-See example/main.cpp for an example.
-
-Hashing and Databases
----------------------
-It currently uses a FNV-1a 64bit hash. Collisions are really rare, I have tested 219,606 English words (in lowercase) mixed with a bunch of numbers and didn't encounter a single collision. Since this is the normal use case for identifiers, the hash function is pretty good. In addition, there is a good distribution of the hashed values and it is easy to calculate.
-
-The database uses a specialized hash table. Collisions of the bucket index are resolved via separate chaining with single linked list. Each node contains the string directly without additional memory allocation. The nodes on the linked list are sorted using the hash value. This allows efficient retrieving and checking whether there is already a string with the same hash value stored. This makes it very efficient and faster than the std::unordered_map that was used before (at least faster than libstdc++ implementation I have used for the benchmarks).
-
-Compiler Support
-----------------
-This library has been compiled under the following compilers:
-* GCC 4.6-4.9 on Linux
-* clang 3.4-3.5 on Linux
-* Visual Studio 12 on Windows
-
-There are the compatibility options and replacement marcos for constexpr, noexcept, override and literal operators. Atomic handler functions can be disabled optionally and are off for GCC 4.6 by default since it does not support them.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/README.mod.txt b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/README.mod.txt
deleted file mode 100644
index 14482285f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/README.mod.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Removed C++ excection.
-
-EoL.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/basic_database.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/basic_database.hpp
deleted file mode 100644
index 4dcd38425..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/basic_database.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#ifndef FOONATHAN_STRING_ID_BASIC_DATABASE_HPP_INCLUDED
-#define FOONATHAN_STRING_ID_BASIC_DATABASE_HPP_INCLUDED
-
-#include "config.hpp"
-#include "hash.hpp"
-
-namespace foonathan { namespace string_id
-{
-	/// \brief The interface for all databases.
-    /// \detail You can derive own databases from it.
-    class basic_database
-    {
-    public:        
-        /// @{
-        /// \brief Databases are not copy- or moveable.
-        /// \detail You must not write a swap function either!<br>
-        /// This has implementation reasons.
-        basic_database(const basic_database &) = delete;
-        basic_database(basic_database &&) = delete;
-        /// @}
-
-        virtual ~basic_database() = default;
-        
-        /// \brief The status of an insert operation.
-        enum insert_status
-        {
-            /// \brief Two different strings collide on the same value.
-            collision,
-            /// \brief A new string was inserted.
-            new_string,
-            /// \brief The string already existed inside the database.
-            old_string
-        };
-        
-        /// \brief Should insert a new hash-string-pair with prefix (optional) into the internal database.
-        /// \detail The string must be copied prior to storing, it may not stay valid.
-        /// \arg \c hash is the hash of the string.
-        /// \arg \c str is the string which does not need to be null-terminated.
-        /// \arg \c length is the length of the string.
-        /// \return The \ref insert_status.
-        virtual insert_status insert(hash_type hash, const char* str, std::size_t length) = 0;
-        
-        /// \brief Inserts a hash-string-pair with given prefix into the internal database.
-        /// \detail The default implementation performs a lookup of the prefix string and appends it,
-        /// then it calls \ref insert.<br>
-        /// Override it if you can do it more efficiently.
-        /// \arg \c hash is the hash of the string plus prefix.
-        /// \arg \c prefix is the hash of the prefix-string.
-        /// \arg \c str is the suffix which does not need to be null-terminated.
-        /// \arg \c length is the length of the suffix.
-        /// \return The \ref insert_status.
-        virtual insert_status insert_prefix(hash_type hash, hash_type prefix,
-                                            const char *str, std::size_t length);
-        
-        /// \brief Should return the string stored with a given hash.
-        /// \detail It is guaranteed that the hash value has been inserted before.
-        /// \return A null-terminated string belonging to the hash code or
-        /// an error message if the database does not store anything.<br>
-        /// The return value must stay valid as long as the database exists.
-        virtual const char* lookup(hash_type hash) const FOONATHAN_NOEXCEPT = 0;
-        
-    protected:
-        basic_database() = default;
-    };
-}} // foonathan::string_id
-
-#endif // FOONATHAN_STRING_ID_BASIC_DATABASE_HPP_INCLUDED
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/config.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/config.hpp
deleted file mode 100644
index a8fb924f0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/config.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-// dummy header including the real config file from the CMake binary dir
-
-#ifndef FOONATHAN_STRING_ID_CONFIG_HPP_INCLUDED
-#define FOONATHAN_STRING_ID_CONFIG_HPP_INCLUDED
-
-#include "config_impl.hpp"
-
-#endif // FOONATHAN_STRING_ID_CONFIG_HPP_INCLUDED
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/config.hpp.in b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/config.hpp.in
deleted file mode 100644
index 0a929f754..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/config.hpp.in
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-//=== version ===//
-/// \brief Major version.
-#define FOONATHAN_STRING_ID_VERSION_MAJOR ${version_major}
-
-/// \brief Minor version.
-#define FOONATHAN_STRING_ID_VERSION_MINOR ${version_minor}
-
-/// \brief Total version number.
-#define FOONATHAN_STRING_ID_VERSION (${version_major} * 100 + ${version_minor})
-
-//=== database ===//
-/// \brief Whether or not the database for string ids is active.
-/// \detail This is \c true by default, change it via CMake option \c FOONATHAN_STRING_ID_DATABASE.
-#cmakedefine01 FOONATHAN_STRING_ID_DATABASE
-
-/// \brief Whether or not the database should thread safe.
-/// \detail This is \c true by default, change it via CMake option \c FOONATHAN_STRING_ID_MULTITHREADED.
-#cmakedefine01 FOONATHAN_STRING_ID_MULTITHREADED
-
-//=== compatibility ===//
-#cmakedefine01 FOONATHAN_IMPL_HAS_NOEXCEPT
-#cmakedefine01 FOONATHAN_IMPL_HAS_CONSTEXPR
-#cmakedefine01 FOONATHAN_IMPL_HAS_LITERAL
-#cmakedefine01 FOONATHAN_IMPL_HAS_OVERRIDE
-
-#ifndef FOONATHAN_NOEXCEPT
-    #if FOONATHAN_IMPL_HAS_NOEXCEPT
-        #define FOONATHAN_NOEXCEPT noexcept
-    #else
-        #define FOONATHAN_NOEXCEPT
-    #endif
-#endif
-
-#ifndef FOONATHAN_CONSTEXPR
-    #if FOONATHAN_IMPL_HAS_CONSTEXPR
-        #define FOONATHAN_CONSTEXPR constexpr
-    #else
-        #define FOONATHAN_CONSTEXPR const
-    #endif
-#endif
-
-#ifndef FOONATHAN_CONSTEXPR_FNC
-    #if FOONATHAN_IMPL_HAS_CONSTEXPR
-        #define FOONATHAN_CONSTEXPR_FNC constexpr
-    #else
-        #define FOONATHAN_CONSTEXPR_FNC inline
-    #endif
-#endif
-
-#ifndef FOONATHAN_OVERRIDE
-    #if FOONATHAN_IMPL_HAS_OVERRIDE
-        #define FOONATHAN_OVERRIDE override
-    #else
-        #define FOONATHAN_OVERRIDE
-    #endif
-#endif
-
-/// \brief Whether or not the \c constexpr literal operators are availble.
-/// \detail If this is \c false, there is only the \ref id() function which can't be used inside switch cases.
-#define FOONATHAN_STRING_ID_HAS_LITERAL (FOONATHAN_IMPL_HAS_LITERAL && FOONATHAN_IMPL_HAS_CONSTEXPR)
-
-/// \brief Whether or not the handler functions are atomic.
-#cmakedefine01 FOONATHAN_STRING_ID_ATOMIC_HANDLER
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/config_impl.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/config_impl.hpp
deleted file mode 100644
index ecd97a3f4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/config_impl.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-//=== version ===//
-/// \brief Major version.
-#define FOONATHAN_STRING_ID_VERSION_MAJOR 2
-
-/// \brief Minor version.
-#define FOONATHAN_STRING_ID_VERSION_MINOR 0
-
-/// \brief Total version number.
-#define FOONATHAN_STRING_ID_VERSION (2 * 100 + 0)
-
-//=== database ===//
-/// \brief Whether or not the database for string ids is active.
-/// \detail This is \c true by default, change it via CMake option \c FOONATHAN_STRING_ID_DATABASE.
-#define FOONATHAN_STRING_ID_DATABASE 1
-
-/// \brief Whether or not the database should thread safe.
-/// \detail This is \c true by default, change it via CMake option \c FOONATHAN_STRING_ID_MULTITHREADED.
-#ifdef __wasi__
-#else
-#define FOONATHAN_STRING_ID_MULTITHREADED 1
-#endif
-
-//=== compatibility ===//
-#define FOONATHAN_IMPL_HAS_NOEXCEPT 0
-#define FOONATHAN_IMPL_HAS_CONSTEXPR 1
-#define FOONATHAN_IMPL_HAS_LITERAL 1
-#define FOONATHAN_IMPL_HAS_OVERRIDE 1
-
-#ifndef FOONATHAN_NOEXCEPT
-    #if FOONATHAN_IMPL_HAS_NOEXCEPT
-        #define FOONATHAN_NOEXCEPT noexcept
-    #else
-        #define FOONATHAN_NOEXCEPT
-    #endif
-#endif
-
-#ifndef FOONATHAN_CONSTEXPR
-    #if FOONATHAN_IMPL_HAS_CONSTEXPR
-        #define FOONATHAN_CONSTEXPR constexpr
-    #else
-        #define FOONATHAN_CONSTEXPR const
-    #endif
-#endif
-
-#ifndef FOONATHAN_CONSTEXPR_FNC
-    #if FOONATHAN_IMPL_HAS_CONSTEXPR
-        #define FOONATHAN_CONSTEXPR_FNC constexpr
-    #else
-        #define FOONATHAN_CONSTEXPR_FNC inline
-    #endif
-#endif
-
-#ifndef FOONATHAN_OVERRIDE
-    #if FOONATHAN_IMPL_HAS_OVERRIDE
-        #define FOONATHAN_OVERRIDE override
-    #else
-        #define FOONATHAN_OVERRIDE
-    #endif
-#endif
-
-/// \brief Whether or not the \c constexpr literal operators are availble.
-/// \detail If this is \c false, there is only the \ref id() function which can't be used inside switch cases.
-#define FOONATHAN_STRING_ID_HAS_LITERAL (FOONATHAN_IMPL_HAS_LITERAL && FOONATHAN_IMPL_HAS_CONSTEXPR)
-
-/// \brief Whether or not the handler functions are atomic.
-#define FOONATHAN_STRING_ID_ATOMIC_HANDLER 1
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/database.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/database.cpp
deleted file mode 100644
index 9318d13fd..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/database.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#include "database.hpp"
-
-#include <cassert>
-#include <cmath>
-#include <cstring>
-#include <string>
-
-namespace sid = foonathan::string_id;
-
-sid::basic_database::insert_status sid::basic_database::insert_prefix(hash_type hash, hash_type prefix,
-                                                                      const char *str, std::size_t length)
-{
-    std::string prefix_str = lookup(prefix);
-    return insert(hash, (prefix_str + str).c_str(), prefix_str.size() + length);
-}
-
-namespace
-{
-    // equivalent to prefix + str == other_str for std::string
-    // prefix and other_str are null-terminated
-    bool strequal(const char *prefix,
-                  const char *str, std::size_t length, const char *other_str) FOONATHAN_NOEXCEPT
-    {
-        assert(prefix);
-        while (*prefix)
-            if (*prefix++ != *other_str++)
-                return false;
-        return std::strncmp(str, other_str, length) == 0;
-    }
-}
-
-/// \cond impl
-class sid::map_database::node_list
-{    
-    struct node
-    {
-        std::size_t length; // length of string
-        hash_type hash;
-        node *next;
-        
-        node(const char *str, std::size_t length,
-             hash_type h, node *next) FOONATHAN_NOEXCEPT
-        : length(length), hash(h), next(next)
-        {
-            void* mem = this;
-            auto dest = static_cast<char*>(mem) + sizeof(node);
-            std::strncpy(dest, str, length);
-            dest[length] = 0;
-        }
-        
-        node(const char *prefix, std::size_t length_prefix,
-             const char *str, std::size_t length_string,
-             hash_type h, node *next) FOONATHAN_NOEXCEPT
-        : length(length_prefix + length_string), hash(h), next(next)
-        {
-            void* mem = this;
-            auto dest = static_cast<char*>(mem) + sizeof(node);
-            std::strncpy(dest, prefix, length_prefix);
-            dest += length_prefix;
-            std::strncpy(dest, str, length_string);
-            dest[length_string] = 0;
-        }
-        
-        const char* get_str() const FOONATHAN_NOEXCEPT
-        {
-            const void *mem = this;
-            return static_cast<const char*>(mem) + sizeof(node);
-        }
-    };
-    
-    struct insert_pos_t
-    {        
-        bool exists; // if true: cur set, else: prev and next set
-        
-        node*& prev;
-        node* next;
-        
-        node* cur;
-        
-        insert_pos_t(node*& prev, node *next) FOONATHAN_NOEXCEPT
-        : exists(false), prev(prev), next(next), cur(nullptr) {}
-        
-        insert_pos_t(node *cur) FOONATHAN_NOEXCEPT
-        : exists(true), prev(this->cur), next(nullptr), cur(cur) {}
-    };
-    
-public:
-    node_list() FOONATHAN_NOEXCEPT
-    : head_(nullptr) {}
-    
-    ~node_list() FOONATHAN_NOEXCEPT
-    {
-        auto cur = head_;
-        while (cur)
-        {
-            auto next = cur->next;
-            ::operator delete(cur);
-            cur = next;
-        }
-    }
-    
-    basic_database::insert_status insert(hash_type hash, const char *str, std::size_t length)
-    {
-        auto pos = insert_pos(hash);
-        if (pos.exists)
-            return std::strncmp(str, pos.cur->get_str(), length) == 0 ?
-                   basic_database::old_string : basic_database::collision;
-        auto mem = ::operator new(sizeof(node) + length + 1);
-        auto n = ::new(mem) node(str, length, hash, pos.next);
-        pos.prev = n;
-        return basic_database::new_string;
-    }
-    
-    basic_database::insert_status insert_prefix(node_list &prefix_bucket, hash_type prefix,
-                                                hash_type hash, const char *str, std::size_t length)
-    {
-        auto prefix_node = prefix_bucket.find_node(prefix);
-        auto pos = insert_pos(hash);
-        if (pos.exists)
-            return strequal(prefix_node->get_str(), str, length, pos.cur->get_str()) ?
-                   basic_database::old_string : basic_database::collision;
-        auto mem = ::operator new(sizeof(node) + prefix_node->length + length + 1);
-        auto n = ::new(mem) node(prefix_node->get_str(), prefix_node->length,
-                                 str, length, hash, pos.next);
-        pos.prev = n;
-        return basic_database::new_string;
-    }
-    
-    // inserts all nodes into new buckets, this list is empty afterwards
-    void rehash(node_list *buckets, std::size_t size) FOONATHAN_NOEXCEPT
-    {
-        auto cur = head_;
-        while (cur)
-        {
-            auto next = cur->next;
-            auto pos = buckets[cur->hash % size].insert_pos(cur->hash);
-            assert(!pos.exists && "element can't be there already");
-            pos.prev = cur;
-            cur->next = pos.next;
-            cur = next;
-        }
-        head_ = nullptr;
-    }
-    
-    // returns element with hash, there must be one
-    const char* lookup(hash_type h) const FOONATHAN_NOEXCEPT
-    {
-        return find_node(h)->get_str();
-    }
-    
-private:
-    node* find_node(hash_type h) const FOONATHAN_NOEXCEPT
-    {
-        assert(head_ && "hash not inserted");
-        auto cur = head_;
-        while (cur->hash < h)
-        {
-            cur = cur->next;
-            assert(cur && "hash not inserted");
-        }
-        assert(cur->hash == h && "hash not inserted");
-        return cur;
-    }
-    
-    insert_pos_t insert_pos(hash_type hash) FOONATHAN_NOEXCEPT
-    {
-        node *cur = head_, *prev = nullptr;
-        while (cur && cur->hash <= hash)
-        {
-            if (cur->hash < hash)
-            {
-                prev = cur;
-                cur = cur->next;
-            }
-            else if (cur->hash == hash)
-                return {cur};
-        }
-        return {prev ? prev->next : head_, cur};
-    }
-    
-    node *head_;
-};
-/// \endcond
-
-sid::map_database::map_database(std::size_t size, double max_load_factor)
-: buckets_(new node_list[size]),
-  no_items_(0u), no_buckets_(size),
-  max_load_factor_(max_load_factor),
-  next_resize_(static_cast<std::size_t>(std::floor(no_buckets_ * max_load_factor_)))
-{}
-
-sid::map_database::~map_database() FOONATHAN_NOEXCEPT {}
-
-sid::basic_database::insert_status sid::map_database::insert(hash_type hash, const char *str, std::size_t length)
-{
-    if (no_items_ + 1 >= next_resize_)
-        rehash();
-    auto status = buckets_[hash % no_buckets_].insert(hash, str, length);
-    if (status == insert_status::new_string)
-        ++no_items_;
-    return status;
-}
-
-sid::basic_database::insert_status sid::map_database::insert_prefix(hash_type hash, hash_type prefix,
-                                                                    const char *str, std::size_t length)
-{
-    if (no_items_ + 1 >= next_resize_)
-        rehash();
-    auto status = buckets_[hash % no_buckets_].insert_prefix(buckets_[prefix % no_buckets_], prefix,
-                                                             hash, str, length);
-    if (status == insert_status::new_string)
-        ++no_items_;
-    return status;
-}
-
-const char* sid::map_database::lookup(hash_type hash) const FOONATHAN_NOEXCEPT
-{
-    return buckets_[hash % no_buckets_].lookup(hash);
-}
-
-void sid::map_database::rehash()
-{
-    static FOONATHAN_CONSTEXPR auto growth_factor = 2;
-    auto new_size = growth_factor * no_buckets_;
-    auto buckets = new node_list[new_size]();
-    auto end = buckets_.get() + no_buckets_;
-    for (auto list = buckets_.get(); list != end; ++list)
-        list->rehash(buckets, new_size);
-    buckets_.reset(buckets);
-    no_buckets_ = new_size;
-    next_resize_ = static_cast<std::size_t>(std::floor(no_buckets_ * max_load_factor_));
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/database.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/database.hpp
deleted file mode 100644
index 47b5bd301..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/database.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#ifndef FOONATHAN_STRING_ID_DATABASE_HPP_INCLUDED
-#define FOONATHAN_STRING_ID_DATABASE_HPP_INCLUDED
-
-#include <memory>
-
-#ifdef __wasi__
-#else
-#include <mutex>
-#endif
-
-#include "basic_database.hpp"
-#include "config.hpp"
-
-namespace foonathan { namespace string_id
-{
-    /// \brief A database that doesn't store the string-values.
-    /// \detail It does not detect collisions or allows retrieving,
-    /// \c lookup() returns "string_id database disabled".
-    class dummy_database : public basic_database
-    {
-    public:
-        insert_status insert(hash_type, const char *, std::size_t) FOONATHAN_OVERRIDE
-        {
-            return new_string;
-        }
-
-        insert_status insert_prefix(hash_type, hash_type, const char *, std::size_t) FOONATHAN_OVERRIDE
-        {
-            return new_string;
-        }
-
-        const char* lookup(hash_type) const FOONATHAN_NOEXCEPT FOONATHAN_OVERRIDE
-        {
-            return "string_id database disabled";
-        }
-    };
-
-    /// \brief A database that uses a highly optimized hash table.
-    class map_database : public basic_database
-    {
-    public:
-        /// \brief Creates a new database with given number of buckets and maximum load factor.
-        explicit map_database(std::size_t size = 1024, double max_load_factor = 1.0);
-        ~map_database() FOONATHAN_NOEXCEPT;
-
-        insert_status insert(hash_type hash, const char *str, std::size_t length) FOONATHAN_OVERRIDE;
-        insert_status insert_prefix(hash_type hash, hash_type prefix,
-                                    const char *str, std::size_t length) FOONATHAN_OVERRIDE;
-        const char* lookup(hash_type hash) const FOONATHAN_NOEXCEPT FOONATHAN_OVERRIDE;
-
-    private:
-        void rehash();
-
-        class node_list;
-        std::unique_ptr<node_list[]> buckets_;
-        std::size_t no_items_, no_buckets_;
-        double max_load_factor_;
-        std::size_t next_resize_;
-    };
-
-    /// \brief A thread-safe database adapter.
-    /// \detail It derives from any database type and synchronizes access via \c std::mutex.
-    template <class Database>
-    class thread_safe_database : public Database
-    {
-    public:
-        /// \brief The base database.
-        typedef Database base_database;
-
-        // workaround of lacking inheriting constructors
-		template <typename ... Args>
-        explicit thread_safe_database(Args&&... args)
-		: base_database(std::forward<Args>(args)...) {}
-
-        typename Database::insert_status
-            insert(hash_type hash, const char *str, std::size_t length) FOONATHAN_OVERRIDE
-        {
-#ifdef __wasi__
-#else
-            std::lock_guard<std::mutex> lock(mutex_);
-#endif
-
-            return Database::insert(hash, str, length);
-        }
-
-        typename Database::insert_status
-            insert_prefix(hash_type hash, hash_type prefix, const char *str, std::size_t length) FOONATHAN_OVERRIDE
-        {
-#ifdef __wasi__
-#else
-            std::lock_guard<std::mutex> lock(mutex_);
-#endif
-            return Database::insert_prefix(hash, prefix, str, length);
-        }
-
-        const char* lookup(hash_type hash) const FOONATHAN_NOEXCEPT FOONATHAN_OVERRIDE
-        {
-#ifdef __wasi__
-#else
-            std::lock_guard<std::mutex> lock(mutex_);
-#endif
-            return Database::lookup(hash);
-        }
-
-    private:
-#ifdef __wasi__
-#else
-        mutable std::mutex mutex_;
-#endif
-    };
-
-    /// \brief The default database where the strings are stored.
-    /// \detail Its exact type is one of the previous listed databases.
-    /// You can control its selection via the macros listed in config.hpp.in.
-#if FOONATHAN_STRING_ID_DATABASE && FOONATHAN_STRING_ID_MULTITHREADED
-    typedef thread_safe_database<map_database> default_database;
-#elif FOONATHAN_STRING_ID_DATABASE
-    typedef map_database default_database;
-#else
-    typedef dummy_database default_database;
-#endif
-}} // namespace foonathan::string_id
-
-#endif // FOONATHAN_STRING_ID_DATABASE_HPP_INCLUDED
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/error.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/error.cpp
deleted file mode 100644
index 36ae13aa6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/error.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#include "error.hpp"
-
-#include <atomic>
-#include <sstream>
-
-namespace sid = foonathan::string_id;
-
-namespace
-{    
-    void default_collision_handler(sid::hash_type hash, const char *a, const char *b)
-    {
-        auto ret = sid::collision_error(hash, a, b);
-        // TODO
-        (void)ret;
-
-        //throw sid::collision_error(hash, a, b);
-    }
-    
-#if FOONATHAN_STRING_ID_ATOMIC_HANDLER
-    std::atomic<sid::collision_handler> collision_h(default_collision_handler);
-#else
-    sid::collision_handler collision_h(default_collision_handler);
-#endif
-}
-
-sid::collision_handler sid::set_collision_handler(collision_handler h)
-{
-#if FOONATHAN_STRING_ID_ATOMIC_HANDLER
-    return collision_h.exchange(h);
-#else
-    auto val = collision_h;
-    collision_h = h;
-    return val;
-#endif
-}
-
-sid::collision_handler sid::get_collision_handler()
-{
-    return collision_h;
-}
-
-#if 0
-const char* sid::collision_error::what() const FOONATHAN_NOEXCEPT try
-{
-    return what_.c_str();
-}
-catch (...)
-{
-    return "foonathan::string_id::collision_error: two different strings are producing the same value";
-}
-#else
-const char* sid::collision_error::what() const FOONATHAN_NOEXCEPT
-{
-    return what_.c_str();
-}
-#endif
-
-namespace
-{
-    FOONATHAN_CONSTEXPR auto no_tries_generation = 8u;
-    
-    bool default_generation_error_handler(std::size_t no, const char *generator_name,
-                                          sid::hash_type, const char *)
-    {
-        if (no >= no_tries_generation) {
-            //throw sid::generation_error(generator_name);
-            return false;
-        }
-        return true;
-    }
-    
-#if FOONATHAN_STRING_ID_ATOMIC_HANDLER
-    std::atomic<sid::generation_error_handler> generation_error_h(default_generation_error_handler);
-#else
-    sid::generation_error_handler generation_error_h(default_generation_error_handler);
-#endif
-}
-
-sid::generation_error_handler sid::set_generation_error_handler(generation_error_handler h)
-{
-#if FOONATHAN_STRING_ID_ATOMIC_HANDLER
-    return generation_error_h.exchange(h);
-#else
-    auto val = generation_error_h;
-    generation_error_h = h;
-    return val;
-#endif
-}
-
-sid::generation_error_handler sid::get_generation_error_handler()
-{
-    return generation_error_h;
-}
-
-#if 0
-const char* sid::generation_error::what() const FOONATHAN_NOEXCEPT try
-{
-    return what_.c_str();
-}
-catch (...)
-{
-    return "foonathan::string_id::generation_error: unable to generate new string id.";
-}
-#else
-const char* sid::generation_error::what() const FOONATHAN_NOEXCEPT
-{
-    return what_.c_str();
-}
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/error.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/error.hpp
deleted file mode 100644
index c4a819fd9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/error.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#ifndef FOONATHAN_STRING_ID_ERROR_HPP_INCLUDED
-#define FOONATHAN_STRING_ID_ERROR_HPP_INCLUDED
-
-//#include <exception>
-#include <string>
-
-#include "config.hpp"
-#include "hash.hpp"
-
-namespace foonathan { namespace string_id
-{
-    /// \brief The base class for all custom exception classes of this library.
-    //class error : public std::exception
-    class error 
-    {
-    protected:
-        error() = default;
-    };
-    
-    /// \brief The type of the collision handler.
-    /// \detail It will be called when a string hashing results in a collision giving it the two strings collided.
-    /// The default handler throws an exception of type \ref collision_error.
-    typedef void(*collision_handler)(hash_type hash, const char *a, const char *b);
-    
-    /// \brief Exchanges the \ref collision_handler.
-    /// \detail This function is thread safe if \ref FOONATHAN_STRING_ID_ATOMIC_HANDLER is \c true.
-    collision_handler set_collision_handler(collision_handler h);
-    
-    /// \brief Returns the current \ref collision_handler.
-    collision_handler get_collision_handler();
-    
-    /// \brief The exception class thrown by the default \ref collision_handler.
-    class collision_error : public error
-    {
-    public:
-        //=== constructor/destructor ===//
-        /// \brief Creates a new exception, same parameter as \ref collision_handler.
-        collision_error(hash_type hash, const char *a, const char *b)
-        : a_(a), b_(b),
-          what_(R"(foonathan::string_id::collision_error: strings ")" + a_ + R"(" and ")" + b_ +
-                R"(") are both producing the value )" + std::to_string(hash)), hash_(hash) {}
-        
-        //~collision_error() FOONATHAN_NOEXCEPT FOONATHAN_OVERRIDE {}
-        ~collision_error() FOONATHAN_NOEXCEPT {}
-        
-        //=== accessors ===//
-        //const char* what() const FOONATHAN_NOEXCEPT FOONATHAN_OVERRIDE;
-        const char* what() const FOONATHAN_NOEXCEPT;
-        
-        /// @{
-        /// \brief Returns one of the two strings that colllided.
-        const char* first_string() const FOONATHAN_NOEXCEPT
-        {
-            return a_.c_str();
-        }
-        
-        const char* second_string() const FOONATHAN_NOEXCEPT
-        {
-            return b_.c_str();
-        }
-        /// @}
-        
-        /// \brief Returns the hash code of the collided strings.
-        hash_type hash_code() const FOONATHAN_NOEXCEPT
-        {
-            return hash_;
-        }
-        
-    private:
-        std::string a_, b_, what_;
-        hash_type hash_;
-    };
-    
-    /// \brief The type of the generator error handler.
-    /// \detail It will be called when a generator would generate a \ref string_id that already was generated.
-    /// The generator will try again until the handler returns \c false in which case it just returns the old \c string_id.
-    /// It passes the number of tries, the name of the generator and the hash and string of the generated \c string_id.<br>
-    /// The default handler allows 8 tries and then throws an exception of type \ref generation_error.
-    typedef bool(*generation_error_handler)(std::size_t no, const char *generator_name,
-                                             hash_type hash, const char *str);
-    
-    /// \brief Exchanges the \ref generation_error_handler.
-    /// \detail This function is thread safe if \ref FOONATHAN_STRING_ID_ATOMIC_HANDLER is \c true.
-    generation_error_handler set_generation_error_handler(generation_error_handler h);
-    
-    /// \brief Returns the current \ref generation_error_handler.
-    generation_error_handler get_generation_error_handler();
-    
-    /// \brief The exception class thrown by the default \ref generation_error_handler.
-    class generation_error : public error
-    {
-    public:
-        //=== constructor/destructor ===//
-        /// \brief Creates it by giving it the name of the generator.
-        generation_error(const char *generator_name)
-        : name_(generator_name), what_("foonathan::string_id::generation_error: Generator \"" + name_ +
-                                       "\" was unable to generate new string id.") {}
-        
-        //~generation_error() FOONATHAN_NOEXCEPT FOONATHAN_OVERRIDE {}
-        ~generation_error() FOONATHAN_NOEXCEPT {}
-        
-        //=== accessors ===//
-        //const char* what() const FOONATHAN_NOEXCEPT FOONATHAN_OVERRIDE;
-        const char* what() const FOONATHAN_NOEXCEPT;
-        
-        /// \brief Returns the name of the generator.
-        const char* generator_name() const FOONATHAN_NOEXCEPT
-        {
-            return name_.c_str();
-        }
-        
-    private:
-        std::string name_, what_;
-    };
-}} // namespace foonathan::string_id
-
-#endif // FOONATHAN_STRING_ID_ERROR_HPP_INCLUDED
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/generator.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/generator.cpp
deleted file mode 100644
index edef7ac40..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/generator.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#include "generator.hpp"
-
-#include <cassert>
-#include <cstring>
-#include <utility>
-
-#include "error.hpp"
-
-namespace sid = foonathan::string_id;
-
-bool sid::detail::handle_generation_error(std::size_t counter, const char *name, const string_id &result)
-{
-    return get_generation_error_handler()(counter, name, result.hash_code(), result.string());
-}
-
-namespace
-{    
-    sid::string_info to_string(sid::counter_generator::state s, char *begin, char *end,
-                               std::size_t length)
-    {
-        auto cur = end;
-        std::size_t i = 0;
-        
-        do
-        {
-            *--cur = '0' + (s % 10);
-            s /= 10;
-            ++i;
-        } while (s != 0u);
-        
-        if (i < length)
-            for (; cur - 1 != begin && i < length; ++i)
-                *--cur = '0';
-        else if (length && i > length)
-            cur += i - length;
-            
-        return sid::string_info(cur, end - cur);
-    }
-}
-
-sid::string_id sid::counter_generator::operator()()
-{
-    // 4 times sizeof(state) is enough for the integer representation
-    static FOONATHAN_CONSTEXPR auto max_size = 4 * sizeof(state);
-    char string[max_size];
-    return detail::try_generate("foonathan::string_id::counter_generator",
-                                [&]()
-                                {
-                                    return to_string(counter_++, string, string + max_size, length_);
-                                }, prefix_);
-}
-
-void sid::counter_generator::discard(unsigned long long n) FOONATHAN_NOEXCEPT
-{
-    counter_ += n;
-}
-
-namespace
-{
-    static FOONATHAN_CONSTEXPR char table[]
-    = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxzy0123456789";
-}
-
-sid::character_table sid::character_table::alnum() FOONATHAN_NOEXCEPT
-{
-    return {table, sizeof(table) - 1};
-}
-
-sid::character_table sid::character_table::alpha() FOONATHAN_NOEXCEPT
-{
-    return {table, sizeof(table) - 1 - 10};
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/generator.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/generator.hpp
deleted file mode 100644
index 1fc344061..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/generator.hpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#ifndef FOONATHAN_STRING_ID_GENERATOR_HPP_INCLUDED
-#define FOONATHAN_STRING_ID_GENERATOR_HPP_INCLUDED
-
-#include <atomic>
-#include <random>
-
-#include "config.hpp"
-#include "string_id.hpp"
-
-namespace foonathan { namespace string_id
-{
-    namespace detail
-    {
-        bool handle_generation_error(std::size_t counter, const char *name, const string_id &result);
-        
-        template <typename Generator>
-        string_id try_generate(const char *name, Generator generator, const string_id &prefix)
-        {
-            basic_database::insert_status status;
-            auto result = string_id(prefix, generator(), status);
-            for (std::size_t counter = 1;
-                 status != basic_database::new_string &&
-                 handle_generation_error(counter, name, result);
-                 ++counter)
-                result = string_id(prefix, generator(), status);
-            return result;
-        }
-    }
-    
-    /// \brief A generator that generates string ids with a prefix followed by a number.
-    /// \detail It can be used by multiple threads at the same time.
-    class counter_generator
-    {
-    public:
-        /// \brief The type of the internal state, an unsigned integer.
-        typedef unsigned long long state;
-        
-        /// \brief Creates a new generator with given prefix.
-        /// \arg \c counter is the start value for the counter.
-        /// \arg \c length is the length of the number appended.If it is \c 0,
-        /// there are no restrictions. Else it will either prepend zeros to the number
-        /// or cut the number to \c length digits. 
-        /// \note For implementation reasons, \c length can't be higher than a certain value.
-        /// If it is, it behaves as if \c length has this certain value.
-        explicit counter_generator(const string_id &prefix,
-                                   state counter = 0, std::size_t length = 0)
-        : prefix_(prefix), counter_(counter), length_(length) {}
-        
-        /// \brief Generates a new \ref string_id.
-        /// \detail If it was already generated previously, the \ref generator_error_handler will be called in a loop as described there.
-        string_id operator()();
-        
-        /// \brief Discards a number of states by advancing the counter.
-        void discard(unsigned long long n) FOONATHAN_NOEXCEPT;
-        
-    private:
-        string_id prefix_;
-        std::atomic<state> counter_;
-        std::size_t length_;
-    };
-    
-    /// \brief Information about the characters used by \ref random_generator.
-    struct character_table
-    {
-        /// \brief A pointer to an array of characters.
-        const char* characters;
-        /// \brief The length of it.
-        std::size_t no_characters;
-        
-        /// \brief Creates a new table.
-        character_table(const char* chars, std::size_t no) FOONATHAN_NOEXCEPT
-        : characters(chars), no_characters(no) {}
-        
-        /// \brief A table with all English letters (both cases) and digits.
-        static character_table alnum() FOONATHAN_NOEXCEPT;
-        
-        /// \brief A table with all English letters (both cases).
-        static character_table alpha() FOONATHAN_NOEXCEPT;
-    };
-    
-    /// \brief A generator that generates string ids by appendending random characters to a prefix.
-    /// \detail This class is thread safe if the random number generator is thread safe.
-    template <class RandomNumberGenerator, std::size_t Length>
-    class random_generator
-    {        
-    public:        
-        /// \brief The state of generator, a random number generator like \c std::mt19937.
-        typedef RandomNumberGenerator state;
-        
-        /// \brief The number of characters appended.
-        static FOONATHAN_CONSTEXPR_FNC std::size_t length() FOONATHAN_NOEXCEPT
-        {
-            return Length;
-        }
-        
-        /// \brief Creates a new generator with given prefix, random number generator and character table.
-        /// \detail By default is uses the table \ref character_table::alnum().
-        explicit random_generator(const string_id &prefix,
-                                  state s = state(),
-                                  character_table table = character_table::alnum())
-        : prefix_(prefix), state_(std::move(s)),
-          table_(table) {}
-        
-        /// \brief Generates a new \ref string_id.
-        /// \detail If it was already generated previously, the \ref generator_error_handler will be called in a loop as described there.
-        string_id operator()()
-        {
-            std::uniform_int_distribution<std::size_t>
-                dist(0, table_.no_characters - 1);
-            char random[Length];
-            return detail::try_generate("foonathan::string_id::random_generator",
-                    [&]()
-                    {
-                        for (std::size_t i = 0u; i != Length; ++i)
-                            random[i] = table_.characters[dist(state_)];
-                        return string_info(random, Length);
-                    }, prefix_);
-        }
-        
-        /// \brief Discards a certain number of states, this forwards to the random number generator.
-        void discard(unsigned long long n)
-        {
-            state_.discard(n);
-        }
-        
-    private:
-        string_id prefix_;
-        state state_;
-        character_table table_;
-    };
-}} // namespace foonathan::string_id
-
-#endif // FOONATHAN_STRING_ID_GENERATOR_HPP_INCLUDED
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/hash.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/hash.hpp
deleted file mode 100644
index a56c1e295..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/hash.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#ifndef FOONATHAN_STRING_ID_HASH_HPP_INCLUDED
-#define FOONATHAN_STRING_ID_HASH_HPP_INCLUDED
-
-#include <cstdint>
-
-#include "config.hpp"
-
-namespace foonathan { namespace string_id
-{
-    /// \brief The type of a hashed string.
-    /// \details This is an unsigned integral type.
-    typedef std::uint64_t hash_type;
-
-    namespace detail
-    {
-        FOONATHAN_CONSTEXPR hash_type fnv_basis = 14695981039346656037ull;
-        FOONATHAN_CONSTEXPR hash_type fnv_prime = 1099511628211ull;
-
-        // FNV-1a 64 bit hash
-        FOONATHAN_CONSTEXPR_FNC hash_type sid_hash(const char *str, hash_type hash = fnv_basis)
-        {
-            return *str ? sid_hash(str + 1, (hash ^ *str) * fnv_prime) : hash;
-        }
-    } // namespace detail
-}} // foonathan::string_id
-
-#endif // FOONATHAN_STRING_ID_DETAIL_HASH_HPP_INCLUDED
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/string_id.cpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/string_id.cpp
deleted file mode 100644
index 51cec9ad9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/string_id.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#include "string_id.hpp"
-
-#include "error.hpp"
-
-namespace sid = foonathan::string_id;
-
-namespace
-{
-    void handle_collision(sid::basic_database &db, sid::hash_type hash, const char *str)
-    {
-        auto handler = sid::get_collision_handler();
-        auto second = db.lookup(hash);
-        handler(hash, str, second);
-    }
-}
-
-sid::string_id::string_id(string_info str, basic_database &db)
-{
-    basic_database::insert_status status;
-    *this = string_id(str, db, status);
-    if (!status)
-        handle_collision(*db_, id_, str.string);
-}
-
-sid::string_id::string_id(string_info str, basic_database &db,
-                          basic_database::insert_status &status)
-: id_(detail::sid_hash(str.string)), db_(&db)
-{
-    status = db_->insert(id_, str.string, str.length);
-}
-
-sid::string_id::string_id(const string_id &prefix, string_info str)
-{
-    basic_database::insert_status status;
-    *this = string_id(prefix, str, status);
-    if (!status)
-        handle_collision(*db_, id_, str.string);
-}
-
-sid::string_id::string_id(const string_id &prefix, string_info str,
-                          basic_database::insert_status &status)
-: id_(detail::sid_hash(str.string, prefix.hash_code())), db_(prefix.db_)
-{
-    status = db_->insert_prefix(id_, prefix.hash_code(), str.string, str.length);
-}
-
-const char* sid::string_id::string() const FOONATHAN_NOEXCEPT
-{
-    return db_->lookup(id_);
-}
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/string_id.hpp b/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/string_id.hpp
deleted file mode 100644
index bf0007d74..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/string_id/string_id.hpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (C) 2014-2015 Jonathan Müller <jonathanmueller.dev@gmail.com>
-// This file is subject to the license terms in the LICENSE file
-// found in the top-level directory of this distribution.
-
-#ifndef FOONATHAN_STRING_ID_HPP_INCLUDED
-#define FOONATHAN_STRING_ID_HPP_INCLUDED
-
-#include <cstring>
-#include <functional>
-
-#include "basic_database.hpp"
-#include "config.hpp"
-#include "hash.hpp"
-
-namespace foonathan { namespace string_id
-{
-    /// \brief Information about a string.
-    /// \detail It is used to reduce the number of constructors of \ref string_id.
-    struct string_info
-    {
-        /// \brief A pointer to a null-terminated string.
-        const char *string;
-        /// \brief The length of this string.
-        std::size_t length;
-        
-        /// \brief Creates it from a null-terminated string (implicit conversion).
-        string_info(const char *str) FOONATHAN_NOEXCEPT
-        : string(str), length(std::strlen(str)) {}
-        
-        /// \brief Creates it from a string with given length.
-        /// \arg \c str does not need to be null-terminated.
-        string_info(const char *str, std::size_t length)
-        : string(str), length(length) {}
-    };
-    
-    /// \brief The string identifier class.
-    /// \detail This is a lightweight class to store strings.<br>
-    /// It only stores a hash of the string allowing fast copying and comparisons.
-    class string_id
-    {
-    public:
-        //=== constructors ===//
-        /// \brief Creates a new id by hashing a given string.
-        /// \detail It will insert the string into the given \ref database which will copy it.<br>
-        /// If it encounters a collision, the \ref collision_handler will be called.
-        string_id(string_info str, basic_database &db);
-        
-        /// \brief Creates a new id with a given prefix.
-        /// \detail The new id will be inserted into the same database as the prefix.<br>
-        //// Otherwise the same as other constructor.
-        string_id(const string_id &prefix, string_info str);
-        
-        /// @{
-        /// \brief Sames as other constructor versions but instead of calling the \ref collision_handler,
-        /// they set the output parameter to the appropriate status.
-        /// \detail This also allows information whether or not the string was already stored inside the database.
-        string_id(string_info str, basic_database &db,
-                 basic_database::insert_status &status);
-                 
-        string_id(const string_id &prefix, string_info str,
-                  basic_database::insert_status &status);
-        /// @}
-        
-        //=== accessors ===//
-        /// \brief Returns the hashed value of the string.
-        hash_type hash_code() const FOONATHAN_NOEXCEPT
-        {
-            return id_;
-        }
-        
-        /// \brief Returns a reference to the database.
-        basic_database& database() const FOONATHAN_NOEXCEPT
-        {
-            return *db_;
-        }
-        
-        /// \brief Returns the string value itself.
-        /// \detail This calls the \c lookup function on the database.
-        const char* string() const FOONATHAN_NOEXCEPT;
-        
-        //=== comparision ===//
-        /// @{
-        /// \brief Compares string ids with another or hashed values.
-        /// \detail Two string ids are equal if they are from the same database and they have the same value.<br>
-        /// A hashed value is equal to a string id if it is the same value.
-        friend bool operator==(string_id a, string_id b) FOONATHAN_NOEXCEPT
-        {
-            return a.db_ == b.db_ && a.id_ == b.id_;
-        }
-        
-        friend bool operator==(hash_type a, const string_id &b) FOONATHAN_NOEXCEPT
-        {
-            return a == b.id_;
-        }
-        
-        friend bool operator==(const string_id &a, hash_type b) FOONATHAN_NOEXCEPT
-        {
-            return a.id_ == b;
-        }
-        
-        friend bool operator!=(const string_id &a, const string_id &b) FOONATHAN_NOEXCEPT
-        {
-            return !(a == b);
-        }
-        
-        friend bool operator!=(hash_type a, const string_id &b) FOONATHAN_NOEXCEPT
-        {
-            return !(a == b);
-        }
-        
-        friend bool operator!=(const string_id &a, hash_type b) FOONATHAN_NOEXCEPT
-        {
-            return !(a == b);
-        }
-        /// @}
-        
-    private:
-        hash_type id_;
-        basic_database *db_;
-    };
-    
-    namespace literals
-    {
-        /// \brief Same as the literal version, additional replacement if not supported.
-        FOONATHAN_CONSTEXPR_FNC hash_type id(const char *str)
-        {
-            return detail::sid_hash(str);
-        }
-        
-        /// \brief A useful literal to hash a string.
-        /// \detail Since this function does not check for collisions only use it to compare a \ref string_id.<br>
-        /// It is also useful in places where a compile-time constant is needed.
-    #if FOONATHAN_STRING_ID_HAS_LITERAL
-        FOONATHAN_CONSTEXPR_FNC hash_type operator""_id(const char *str, std::size_t)
-        {
-            return detail::sid_hash(str);
-        }
-    #endif
-    } // namespace literals
-}} // namespace foonathan::string_id
-
-namespace std
-{
-    /// \brief \c std::hash support for \ref string_id.
-    template <>
-    struct hash<foonathan::string_id::string_id>
-    {
-        typedef foonathan::string_id::string_id argument_type;
-        typedef size_t result_type;        
- 
-        result_type operator()(const argument_type &arg) const FOONATHAN_NOEXCEPT
-        {
-            return static_cast<result_type>(arg.hash_code());
-        }
-    };
-} // namspace std
-
-#endif // FOONATHAN_STRING_ID_HPP_INCLUDED 
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny-color-io.h b/contrib/tinyusdz/tinyusdz_repo/src/external/tiny-color-io.h
deleted file mode 100644
index 0fb6c6426..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny-color-io.h
+++ /dev/null
@@ -1,172 +0,0 @@
-#ifndef TINY_COLOR_IO_H_
-#define TINY_COLOR_IO_H_
-
-#include <cstdint>
-#include <cstdlib>
-#include <string>
-#include <vector>
-
-namespace tinycolorio {
-
-template <typename T>
-class LUT3D {
- public:
-  LUT3D() : x_dim_(0), y_dim_(0), z_dim_(0) {}
-
-  ~LUT3D() {}
-
-  void create(size_t x_dim, size_t y_dim, size_t z_dim) {
-    size_t len = x_dim * y_dim * z_dim;
-    data_.resize(3 * len);
-
-    x_dim_ = x_dim;
-    y_dim_ = y_dim;
-    z_dim_ = z_dim;
-  }
-
-  void set(size_t x, size_t y, size_t z, const T val[3]) {
-    if ((x < x_dim_) && (y < y_dim_) && (z < z_dim_)) {
-      size_t idx = (x_dim_ * y_dim_) * z + x_dim_ * y + x;
-      data_[3 * idx + 0] = val[0];
-      data_[3 * idx + 1] = val[1];
-      data_[3 * idx + 2] = val[2];
-    }
-  }
-
-  void set(size_t x, size_t y, size_t z, const T r_val, const T g_val,
-           const T b_val) {
-    if ((x < x_dim_) && (y < y_dim_) && (z < z_dim_)) {
-      size_t idx = (x_dim_ * y_dim_) * z + x_dim_ * y + x;
-      data_[3 * idx + 0] = r_val;
-      data_[3 * idx + 1] = g_val;
-      data_[3 * idx + 2] = b_val;
-    }
-  }
-
-  void get(size_t x, size_t y, size_t z, T val[3]) const {
-    if ((x < x_dim_) && (y < y_dim_) && (z < z_dim_)) {
-      size_t idx = (x_dim_ * y_dim_) * z + x_dim_ * y + x;
-      val[0] = data_[3 * idx + 0];
-      val[1] = data_[3 * idx + 1];
-      val[2] = data_[3 * idx + 2];
-    }
-  }
-
-  size_t x_dim() { return x_dim_; }
-
-  size_t y_dim() { return y_dim_; }
-
-  size_t z_dim() { return z_dim_; }
-
-  size_t x_dim_;
-  size_t y_dim_;
-  size_t z_dim_;
-
-  std::vector<T> data_;  // RGB
-};
-
-using LUT3Df = LUT3D<float>;
-
-///
-/// Loads SPI3D LUT data(ASCII) from a file
-///
-/// @param[in] filename spi3d LUT filename.
-/// @param[out] lut 3D LUT table.
-/// @param[out] err Error message(when failed to load a LUT).
-/// @return true upon succes.
-///
-bool LoadSPI3DFromFile(const std::string &filename, LUT3Df *lut,
-                       std::string *err = nullptr);
-
-///
-/// Loads SPI3D LUT data(ASCII) from memory
-///
-/// @param[in] addr Buffer address
-/// @param[in] sz Buffer size
-/// @param[out] lut 3D LUT table.
-/// @param[out] err Error message(when failed to load a LUT).
-/// @return true upon succes.
-///
-bool LoadSPI3DFromMemory(const uint8_t *addr, const size_t sz, LUT3Df *lut,
-                       std::string *err = nullptr);
-
-}  // namespace tinycolorio
-
-#endif  // TINY_COLOR_IO_H_
-
-#ifdef TINY_COLOR_IO_IMPLEMENTATION
-
-#include <algorithm>
-#include <cstdio>
-#include <fstream>
-#include <iostream>
-
-namespace tinycolorio {
-
-bool LoadSPI3DFromFile(const std::string &filename, LUT3Df *lut,
-                       std::string *err) {
-  std::ifstream ifs(filename);
-
-  if (!ifs) {
-    if (err) {
-      (*err) = "Failed to open file : " + filename;
-    }
-    return false;
-  }
-
-  // header
-  std::string line;
-  std::getline(ifs, line);
-
-  std::string buf;
-
-  // lower string.
-  for (auto c : line) {
-    buf.push_back(static_cast<char>(std::tolower(c)));
-  }
-  // std::transform(line.begin(), line.end(), buf.begin(), std::tolower);
-
-  if (buf.find("spilut") == std::string::npos) {
-    if (err) {
-      (*err) = "Not a SPILUT format. header = " + line;
-    }
-    return false;
-  }
-
-  // ignore 2nd line(assuming 3 3)
-  std::getline(ifs, line);
-
-  // lut size
-  std::getline(ifs, line);
-
-  int x_size = 0, y_size = 0, z_size = 0;
-  if (3 != sscanf(line.c_str(), "%d %d %d", &x_size, &y_size, &z_size)) {
-    if (err) {
-      (*err) = "Error while reading lut size";
-    }
-    return false;
-  }
-
-  lut->create(size_t(x_size), size_t(y_size), size_t(z_size));
-
-  int read_count = x_size * y_size * z_size;
-
-  while (ifs.good() && read_count > 0) {
-    std::getline(ifs, line);
-
-    int x_idx = 0, y_idx = 0, z_idx = 0;
-    float r_value = 0.0f, g_value = 0.0f, b_value = 0.0f;
-
-    if (sscanf(line.c_str(), "%d %d %d %f %f %f", &x_idx, &y_idx, &z_idx,
-               &r_value, &g_value, &b_value) == 6) {
-      lut->set(size_t(x_idx), size_t(y_idx), size_t(z_idx), r_value, g_value,
-               b_value);
-    }
-  }
-
-  return true;
-}
-
-}  // namespace tinycolorio
-
-#endif  // TINY_COLOR_IO_IMPLEMENTATION
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_dng_loader.h b/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_dng_loader.h
deleted file mode 100644
index 777d03530..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_dng_loader.h
+++ /dev/null
@@ -1,6197 +0,0 @@
-//
-// TinyDNGLoader, single header only DNG/TIFF loader.
-//
-
-/*
-The MIT License (MIT)
-
-Copyright (c) 2016 - Present, Syoyo Fujita and many contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-#ifndef TINY_DNG_LOADER_H_
-#define TINY_DNG_LOADER_H_
-
-// @note {
-// https://www.adobe.com/content/dam/Adobe/en/products/photoshop/pdfs/dng_spec_1.4.0.0.pdf
-// }
-
-#include <string>
-#include <vector>
-
-namespace tinydng {
-
-// TODO: Deal with out-of-memory error
-// e.g. limit maximum images in one DNG/TIFF file
-const size_t kMaxImages = 10240;
-
-// TODO: Set max allowed size in loader option.
-const size_t kMaxImageSizeInMB = 64*1024; // 64 GB
-
-// Avoid stack-overflow of recursive Sub IFD parsing.
-const uint32_t kMaxRecursiveIFDParse = 1024;
-
-typedef enum {
-  LIGHTSOURCE_UNKNOWN = 0,
-  LIGHTSOURCE_DAYLIGHT = 1,
-  LIGHTSOURCE_FLUORESCENT = 2,
-  LIGHTSOURCE_TUNGSTEN = 3,
-  LIGHTSOURCE_FLASH = 4,
-  LIGHTSOURCE_FINE_WEATHER = 9,
-  LIGHTSOURCE_CLOUDY_WEATHER = 10,
-  LIGHTSOURCE_SHADE = 11,
-  LIGHTSOURCE_DAYLIGHT_FLUORESCENT = 12,
-  LIGHTSOURCE_DAY_WHITE_FLUORESCENT = 13,
-  LIGHTSOURCE_COOL_WHITE_FLUORESCENT = 14,
-  LIGHTSOURCE_WHITE_FLUORESCENT = 15,
-  LIGHTSOURCE_STANDARD_LIGHT_A = 17,
-  LIGHTSOURCE_STANDARD_LIGHT_B = 18,
-  LIGHTSOURCE_STANDARD_LIGHT_C = 19,
-  LIGHTSOURCE_D55 = 20,
-  LIGHTSOURCE_D65 = 21,
-  LIGHTSOURCE_D75 = 22,
-  LIGHTSOURCE_D50 = 23,
-  LIGHTSOURCE_ISO_STUDIO_TUNGSTEN = 24,
-  LIGHTSOURCE_OTHER_LIGHT_SOURCE = 255
-} LightSource;
-
-typedef enum {
-  COMPRESSION_NONE = 1,
-  COMPRESSION_LZW = 5,        // LZW
-  COMPRESSION_OLD_JPEG = 6,   // JPEG or lossless JPEG
-  COMPRESSION_NEW_JPEG = 7,   // Usually lossles JPEG, may be JPEG
-  COMPRESSION_ZIP = 8,        // ZIP
-  COMPRESSION_LOSSY = 34892,  // Lossy JPEG(usually 8-bit standard JPEG)
-  COMPRESSION_NEF = 34713     // NIKON RAW
-} Compression;
-
-typedef enum {
-  TYPE_NOTYPE = 0,
-  TYPE_BYTE = 1,
-  TYPE_ASCII = 2,  // null-terminated string
-  TYPE_SHORT = 3,
-  TYPE_LONG = 4,
-  TYPE_RATIONAL = 5,  // 64-bit unsigned fraction
-  TYPE_SBYTE = 6,
-  TYPE_UNDEFINED = 7,  // 8-bit untyped data */
-  TYPE_SSHORT = 8,
-  TYPE_SLONG = 9,
-  TYPE_SRATIONAL = 10,  // 64-bit signed fraction
-  TYPE_FLOAT = 11,
-  TYPE_DOUBLE = 12,
-  TYPE_IFD = 13,     // 32-bit unsigned integer (offset)
-  TYPE_LONG8 = 16,   // BigTIFF 64-bit unsigned
-  TYPE_SLONG8 = 17,  // BigTIFF 64-bit signed
-  TYPE_IFD8 = 18     // BigTIFF 64-bit unsigned integer (offset)
-} DataType;
-
-typedef enum {
-  SAMPLEFORMAT_UINT = 1,
-  SAMPLEFORMAT_INT = 2,
-  SAMPLEFORMAT_IEEEFP = 3,  // floating point
-  SAMPLEFORMAT_VOID = 4,
-  SAMPLEFORMAT_COMPLEXINT = 5,
-  SAMPLEFORMAT_COMPLEXIEEEFP = 6
-} SampleFormat;
-
-struct FieldInfo {
-  int tag;
-  short read_count;
-  short write_count;
-  DataType type;
-  unsigned short bit;
-  unsigned char ok_to_change;
-  unsigned char pass_count;
-  std::string name;
-
-  FieldInfo()
-      : tag(0),
-        read_count(-1),
-        write_count(-1),
-        type(TYPE_NOTYPE),
-        bit(0),
-        ok_to_change(0),
-        pass_count(0) {}
-};
-
-struct FieldData {
-  int tag;
-  DataType type;
-  std::string name;
-  std::vector<unsigned char> data;
-
-  FieldData() : tag(0), type(TYPE_NOTYPE) {}
-};
-
-struct GainMap {
-  unsigned int idx; // 1, 2 or 3: OpCodeListN. 0 = invalid
-  unsigned int top, left, bottom, right;
-  unsigned int plane, planes;
-  unsigned int row_pitch, col_pitch;
-  unsigned int map_points_v, map_points_h;
-  int _pad0;
-  double map_spacing_v, map_spacing_h;
-  double map_origin_v, map_origin_h;
-  unsigned int map_planes;
-
-  int _pad1;
-  std::vector<float> pixels; // size = map_points_v * map_points_h * map_planes
-
-  GainMap() : idx(0) {
-  }
-};
-
-struct DNGImage {
-  int black_level[4];  // for each spp(up to 4)
-  int white_level[4];  // for each spp(up to 4)
-  int version{0};         // DNG version
-
-  int samples_per_pixel{0};
-  int rows_per_strip{0};
-
-  int bits_per_sample_original{0};  // BitsPerSample in stored file.
-  int bits_per_sample{0};  // Bits per sample after reading(decoding) DNG image.
-
-  char cfa_plane_color[4];  // 0:red, 1:green, 2:blue, 3:cyan, 4:magenta,
-                            // 5:yellow, 6:white
-  int cfa_pattern[2][2];    // @fixme { Support non 2x2 CFA pattern. }
-  short cfa_pattern_dim;
-  short _pad_cfa_patern_dim;
-  int cfa_layout;
-  int active_area[4];  // top, left, bottom, right
-  bool has_active_area;
-  unsigned char pad_has_active_area[3];
-
-  int tile_width;
-  int tile_length;
-  unsigned int tile_offset;
-  unsigned int tile_byte_count;  // (compressed) size
-
-  int pad0;
-  double analog_balance[3];
-  bool has_analog_balance;
-  unsigned char pad1[7];
-
-  double as_shot_neutral[3];
-  int pad3;
-  bool has_as_shot_neutral;
-  unsigned char pad4[7];
-
-  int pad5;
-  double color_matrix1[3][3];
-  double color_matrix2[3][3];
-
-  double forward_matrix1[3][3];
-  double forward_matrix2[3][3];
-
-  double camera_calibration1[3][3];
-  double camera_calibration2[3][3];
-
-  LightSource calibration_illuminant1;
-  LightSource calibration_illuminant2;
-
-  int width;
-  int height;
-  int compression;
-  unsigned int offset;
-  short orientation;
-  short _pad0;
-  int strip_byte_count;
-  int jpeg_byte_count;
-  short planar_configuration;  // 1: chunky, 2: planar
-  short predictor;  // tag 317. 1 = no prediction, 2 = horizontal differencing,
-                    // 3 = floating point horizontal differencing
-
-  SampleFormat sample_format;
-
-  // For an image with multiple strips.
-  int strips_per_image;
-  std::vector<unsigned int> strip_byte_counts;
-  std::vector<unsigned int> strip_offsets;
-
-  // Color profile
-  std::string profile_name; // UTF-8 string
-  // An array of flattened the pair of input/output value.
-  // [(0.0, 0.0), (0.1, 0.1), ... (1.0, 1.0)]
-  // First two item must be 0.0, Last two item must be 1.0
-  std::vector<float> profile_tone_curve;  
-  int profile_embed_policy{-1}; // 0 = "allow copying", 1 = "embed if used", 2 = "embed never"
-
-  // Noise profile
-  std::vector<double> noise_profile; // 2 or 2 * ColorPlanes
-
-  // CR2(Canon RAW) specific
-  unsigned short cr2_slices[3];
-  unsigned short pad_c;
-
-  // Apple ProRAW
-  std::string semantic_name;
-
-  // GainMap
-  std::vector<GainMap> opcodelist1_gainmap;
-  std::vector<GainMap> opcodelist2_gainmap;
-  std::vector<GainMap> opcodelist3_gainmap;
-
-  std::vector<unsigned char>
-      data;  // Decoded pixel data(len = spp * width * height * bps / 8)
-
-  // Custom fields
-  std::vector<FieldData> custom_fields;
-};
-
-///
-/// Loads DNG image and store it to `images`
-///
-/// If DNG contains multiple images(e.g. full-res image + thumnail image),
-/// The function creates `DNGImage` data strucure for each images.
-///
-/// @param[in] filename DNG filename.
-/// @param[in] custom_fields List of custom fields to parse(optional. can pass
-/// empty array).
-/// @param[out] images Loaded DNG images.
-/// @param[out] warn Warning message.
-/// @param[out] err Error message.
-///
-/// @return true upon success.
-/// @return false upon failure and store error message into `err`.
-///
-bool LoadDNG(const char* filename, std::vector<FieldInfo>& custom_fields,
-             std::vector<DNGImage>* images, std::string* warn,
-             std::string* err);
-
-///
-/// Check if a file is DNG(TIFF) or not.
-/// Extra message will be stored `msg`.
-///
-bool IsDNG(const char* filename, std::string* msg);
-
-///
-/// A variant of `LoadDNG` which loads DNG image from memory.
-/// Up to 2GB DNG data.
-///
-bool LoadDNGFromMemory(const char* mem, unsigned int size,
-                       std::vector<FieldInfo>& custom_fields,
-                       std::vector<DNGImage>* images, std::string* warn,
-                       std::string* err);
-
-///
-/// A variant of `IsDNG` which checks if a data is DNG image.
-///
-bool IsDNGFromMemory(const char* mem, unsigned int size, std::string* msg);
-
-}  // namespace tinydng
-
-#ifdef TINY_DNG_LOADER_IMPLEMENTATION
-
-#if defined(_WIN32)
-#if defined(__MINGW32__)
-#include <windows.h>  // wchar apis
-#else
-#include <Windows.h>
-#endif
-#endif
-
-#include <stdint.h>  // for lj92
-
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
-#include <iterator>
-#include <map>
-#include <sstream>
-#include <limits>
-
-#if defined(TINY_DNG_LOADER_NO_STDIO)
-#else
-#include <cstdio>
-#include <cassert>
-#include <iostream>
-#endif
-
-// #include <iostream> // dbg
-
-#ifdef TINY_DNG_LOADER_PROFILING
-// Requires C++11 feature
-#include <chrono>
-#endif
-
-#if __cplusplus > 199911L
-
-#ifdef TINY_DNG_LOADER_USE_THREAD
-#include <atomic>
-#include <thread>
-#include <mutex>
-#endif
-
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-#define TINY_DNG_LOADER_DEBUG
-#ifdef TINY_DNG_LOADER_DEBUG
-#define TINY_DNG_DPRINTF(...) printf(__VA_ARGS__)
-#else
-#define TINY_DNG_DPRINTF(...)
-#endif
-
-#if 0 // DBG
-
-#define TINY_DNG_DEBUG_SAVEIMAGE
-#if defined(TINY_DNG_DEBUG_SAVEIMAGE)
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "examples/common/stb_image_write.h"
-#endif
-
-#endif
-
-// msg: std::string
-// err: std::string*
-#define TINY_DNG_ERROR_AND_RETURN(msg, err) \
-  do { \
-    if (err) { \
-      std::ostringstream ss_e; \
-      ss_e << "[TinyDNG error]: " << __func__ << "():" << __LINE__ << " " ; \
-      ss_e << msg << "\n"; \
-      (*err) += ss_e.str(); \
-    } \
-    return false; \
-  } while (0)
-
-// check cond, set error message and return false when cond failed.
-#define TINY_DNG_CHECK_AND_RETURN(cond, msg, err) \
-  do { \
-    if (!(cond)) { \
-      if (err) { \
-        std::ostringstream ss_e; \
-        ss_e << "[TinyDNG error]: " << __func__ << "():" << __LINE__ << " " ; \
-        ss_e << msg << "\n"; \
-        (*err) += ss_e.str(); \
-      } \
-      return false; \
-    } \
-  } while (0)
-
-#define TINY_DNG_CHECK_AND_RETURN_C(cond, retcode) \
-  do { \
-    if (!(cond)) { \
-      return (retcode); \
-    } \
-  } while (0)
-
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wall"
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#pragma warning(disable : 4334)
-#pragma warning(disable : 4244)
-#endif
-
-#ifdef TINY_DNG_LOADER_ENABLE_ZIP
-#ifndef TINY_DNG_LOADER_USE_SYSTEM_ZLIB
-#include "miniz.h"
-#endif
-#endif
-
-#if defined(TINY_DNG_LOADER_NO_STB_IMAGE_INCLUDE)
-#else
-
-// STB image to decode jpeg image.
-// Assume STB_IMAGE_IMPLEMENTATION is defined elsewhere
-#include "stb_image.h"
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-namespace tinydng {
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-extensions"
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#pragma clang diagnostic ignored "-Wconversion"
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#pragma clang diagnostic ignored "-Wcast-align"
-#pragma clang diagnostic ignored "-Wconditional-uninitialized"
-#pragma clang diagnostic ignored "-Wunused-function"
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
-#pragma clang diagnostic ignored "-Wreserved-id-macro"
-#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
-#pragma clang diagnostic ignored "-Wdouble-promotion"
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#if __has_warning("-Wcomma")
-#pragma clang diagnostic ignored "-Wcomma"
-#endif
-#if __has_warning("-Wcast-qual")
-#pragma clang diagnostic ignored "-Wcast-qual"
-#endif
-#if __has_warning("-Wzero-as-null-pointer-constant")
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#pragma warning(disable : 4334)
-#pragma warning(disable : 4244)
-#endif
-
-namespace {
-// Begin liblj92, Lossless JPEG decode/encoder ------------------------------
-//
-// With fixes: https://github.com/ilia3101/MLV-App/pull/151
-
-/*
-lj92.c
-(c) Andrew Baldwin 2014
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-enum LJ92_ERRORS {
-  LJ92_ERROR_NONE = 0,
-  LJ92_ERROR_CORRUPT = -1,
-  LJ92_ERROR_NO_MEMORY = -2,
-  LJ92_ERROR_BAD_HANDLE = -3,
-  LJ92_ERROR_TOO_WIDE = -4
-};
-
-typedef struct _ljp* lj92;
-
-/* Parse a lossless JPEG (1992) structure returning
- * - a handle that can be used to decode the data
- * - width/height/bitdepth of the data
- * Returns status code.
- * If status == LJ92_ERROR_NONE, handle must be closed with lj92_close
- */
-int lj92_open(lj92* lj,                          // Return handle here
-              const uint8_t* data, int datalen,  // The encoded data
-              int* width, int* height,
-              int* bitdepth);  // Width, height and bitdepth
-
-/* Release a decoder object */
-void lj92_close(lj92 lj);
-
-/*
- * Decode previously opened lossless JPEG (1992) into a 2D tile of memory
- * Starting at target, write writeLength 16bit values, then skip 16bit
- * skipLength value before writing again
- * If linearize is not NULL, use table at linearize to convert data values from
- * output value to target value
- * Data is only correct if LJ92_ERROR_NONE is returned
- */
-int lj92_decode(
-    lj92 lj, uint16_t* target, int writeLength,
-    int skipLength,  // The image is written to target as a tile
-    uint16_t* linearize,
-    int linearizeLength);  // If not null, linearize the data using this table
-
-#if 0
-/*
- * Encode a grayscale image supplied as 16bit values within the given bitdepth
- * Read from tile in the image
- * Apply delinearization if given
- * Return the encoded lossless JPEG stream
- */
-int lj92_encode(uint16_t* image, int width, int height, int bitdepth,
-                       int readLength, int skipLength, uint16_t* delinearize,
-                       int delinearizeLength, uint8_t** encoded,
-                       int* encodedLength);
-#endif
-
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-
-//#define SLOW_HUFF
-//#define LJ92_DEBUG
-
-#define LJ92_MAX_COMPONENTS (16)
-
-typedef struct _ljp {
-  u8* data;
-  u8* dataend;
-  int datalen;
-  int scanstart;
-  int ix;
-  int x;           // Width
-  int y;           // Height
-  int bits;        // Bit depth
-  int components;  // Components(Nf)
-  int writelen;    // Write rows this long
-  int skiplen;     // Skip this many values after each row
-  u16* linearize;  // Linearization table
-  int linlen;
-  int sssshist[16];
-
-// Huffman table - only one supported, and probably needed
-#ifdef SLOW_HUFF
-  // NOTE: Huffman table for each components is not supported for SLOW_HUFF code
-  // path.
-  int* maxcode;
-  int* mincode;
-  int* valptr;
-  u8* huffval;
-  int* huffsize;
-  int* huffcode;
-#else
-  // Huffman table for each components
-  u16* hufflut[LJ92_MAX_COMPONENTS];
-  int huffbits[LJ92_MAX_COMPONENTS];
-  int num_huff_idx;
-#endif
-  // Parse state
-  int cnt;
-  u32 b;
-  u16* image;
-  u16* rowcache;
-  u16* outrow[2];
-} ljp;
-
-static int find(ljp* self) {
-  int ix = self->ix;
-  u8* data = self->data;
-  while (data[ix] != 0xFF && ix < (self->datalen - 1)) {
-    ix += 1;
-  }
-  ix += 2;
-  if (ix >= self->datalen) {
-    // TINY_DNG_DPRINTF("idx = %d, datalen = %\d\n", ix, self->datalen);
-    return -1;
-  }
-  self->ix = ix;
-  // TINY_DNG_DPRINTF("ix = %d, data = %d\n", ix, data[ix - 1]);
-  return data[ix - 1];
-}
-
-// swap endian
-#define BEH(ptr) ((((int)(*&ptr)) << 8) | (*(&ptr + 1)))
-
-static int parseHuff(ljp* self) {
-  int ret = LJ92_ERROR_CORRUPT;
-  u8* huffhead =
-      &self->data
-           [self->ix];  // xstruct.unpack('>HB16B',self.data[self.ix:self.ix+19])
-  u8* bits = &huffhead[2];
-  bits[0] = 0;  // Because table starts from 1
-  int hufflen = BEH(huffhead[0]);
-  if ((self->ix + hufflen) >= self->datalen) return ret;
-#ifdef SLOW_HUFF
-  u8* huffval = calloc(hufflen - 19, sizeof(u8));
-  if (huffval == NULL) return LJ92_ERROR_NO_MEMORY;
-  self->huffval = huffval;
-  for (int hix = 0; hix < (hufflen - 19); hix++) {
-    huffval[hix] = self->data[self->ix + 19 + hix];
-#ifdef LJ92_DEBUG
-    TINY_DNG_DPRINTF("huffval[%d]=%d\n", hix, huffval[hix]);
-#endif
-  }
-  self->ix += hufflen;
-  // Generate huffman table
-  int k = 0;
-  int i = 1;
-  int j = 1;
-  int huffsize_needed = 1;
-  // First calculate how long huffsize needs to be
-  while (i <= 16) {
-    while (j <= bits[i]) {
-      huffsize_needed++;
-      k = k + 1;
-      j = j + 1;
-    }
-    i = i + 1;
-    j = 1;
-  }
-  // Now allocate and do it
-  int* huffsize = calloc(huffsize_needed, sizeof(int));
-  if (huffsize == NULL) return LJ92_ERROR_NO_MEMORY;
-  self->huffsize = huffsize;
-  k = 0;
-  i = 1;
-  j = 1;
-  // First calculate how long huffsize needs to be
-  int hsix = 0;
-  while (i <= 16) {
-    while (j <= bits[i]) {
-      huffsize[hsix++] = i;
-      k = k + 1;
-      j = j + 1;
-    }
-    i = i + 1;
-    j = 1;
-  }
-  huffsize[hsix++] = 0;
-
-  // Calculate the size of huffcode array
-  int huffcode_needed = 0;
-  k = 0;
-  int code = 0;
-  int si = huffsize[0];
-  while (1) {
-    while (huffsize[k] == si) {
-      huffcode_needed++;
-      code = code + 1;
-      k = k + 1;
-    }
-    if (huffsize[k] == 0) break;
-    while (huffsize[k] != si) {
-      code = code << 1;
-      si = si + 1;
-    }
-  }
-  // Now fill it
-  int* huffcode = calloc(huffcode_needed, sizeof(int));
-  if (huffcode == NULL) return LJ92_ERROR_NO_MEMORY;
-  self->huffcode = huffcode;
-  int hcix = 0;
-  k = 0;
-  code = 0;
-  si = huffsize[0];
-  while (1) {
-    while (huffsize[k] == si) {
-      huffcode[hcix++] = code;
-      code = code + 1;
-      k = k + 1;
-    }
-    if (huffsize[k] == 0) break;
-    while (huffsize[k] != si) {
-      code = code << 1;
-      si = si + 1;
-    }
-  }
-
-  i = 0;
-  j = 0;
-
-  int* maxcode = calloc(17, sizeof(int));
-  if (maxcode == NULL) return LJ92_ERROR_NO_MEMORY;
-  self->maxcode = maxcode;
-  int* mincode = calloc(17, sizeof(int));
-  if (mincode == NULL) return LJ92_ERROR_NO_MEMORY;
-  self->mincode = mincode;
-  int* valptr = calloc(17, sizeof(int));
-  if (valptr == NULL) return LJ92_ERROR_NO_MEMORY;
-  self->valptr = valptr;
-
-  while (1) {
-    while (1) {
-      i++;
-      if (i > 16) break;
-      if (bits[i] != 0) break;
-      maxcode[i] = -1;
-    }
-    if (i > 16) break;
-    valptr[i] = j;
-    mincode[i] = huffcode[j];
-    j = j + bits[i] - 1;
-    maxcode[i] = huffcode[j];
-    j++;
-  }
-  free(huffsize);
-  self->huffsize = NULL;
-  free(huffcode);
-  self->huffcode = NULL;
-  ret = LJ92_ERROR_NONE;
-#else
-  /* Calculate huffman direct lut */
-  // How many bits in the table - find highest entry
-  u8* huffvals = &self->data[self->ix + 19];
-  int maxbits = 16;
-  while (maxbits > 0) {
-    if (bits[maxbits]) break;
-    maxbits--;
-  }
-  self->huffbits[self->num_huff_idx] = maxbits;
-  TINY_DNG_DPRINTF("huffbuts[%d] = %d\n", self->num_huff_idx, maxbits);
-
-  /* Now fill the lut */
-  u16* hufflut = (u16*)malloc((1 << maxbits) * sizeof(u16));
-  // TINY_DNG_DPRINTF("maxbits = %d\n", maxbits);
-  if (hufflut == NULL) return LJ92_ERROR_NO_MEMORY;
-  self->hufflut[self->num_huff_idx] = hufflut;
-  int i = 0;
-  int hv = 0;
-  int rv = 0;
-  int vl = 0;  // i
-  int hcode;
-  int bitsused = 1;
-#ifdef LJ92_DEBUG
-  TINY_DNG_DPRINTF("%04x:%x:%d:%x\n", i, huffvals[hv], bitsused,
-                   1 << (maxbits - bitsused));
-#endif
-  while (i < 1 << maxbits) {
-    if (bitsused > maxbits) {
-      break;  // Done. Should never get here!
-    }
-    if (vl >= bits[bitsused]) {
-      bitsused++;
-      vl = 0;
-      continue;
-    }
-    if (rv == 1 << (maxbits - bitsused)) {
-      rv = 0;
-      vl++;
-      hv++;
-#ifdef LJ92_DEBUG
-      TINY_DNG_DPRINTF("%04x:%x:%d:%x\n", i, huffvals[hv], bitsused,
-                       1 << (maxbits - bitsused));
-#endif
-      continue;
-    }
-    hcode = huffvals[hv];
-    hufflut[i] = hcode << 8 | bitsused;
-    TINY_DNG_DPRINTF("idx[%d] hufflut[%d] = %d(bitsused = %d, hcode = %d\n",self->num_huff_idx, i, hufflut[i], bitsused,hcode);
-    i++;
-    rv++;
-  }
-  ret = LJ92_ERROR_NONE;
-#endif
-  self->num_huff_idx++;
-
-  return ret;
-}
-
-static int parseSof3(ljp* self) {
-  if (self->ix + 6 >= self->datalen) return LJ92_ERROR_CORRUPT;
-  self->y = BEH(self->data[self->ix + 3]);
-  self->x = BEH(self->data[self->ix + 5]);
-  self->bits = self->data[self->ix + 2];
-  self->components = self->data[self->ix + 7];
-  self->ix += BEH(self->data[self->ix]);
-
-  if ((self->components >= 1) && (self->components < 6)) {
-    // ok
-  } else {
-    // Invalid number of components.
-    return LJ92_ERROR_CORRUPT;
-  }
-  //TINY_DNG_ASSERT(self->components >= 1 && self->components < 6,
-  //                "Invalid number of components.");
-
-  return LJ92_ERROR_NONE;
-}
-
-static int parseBlock(ljp* self, int marker) {
-  (void)marker;
-  self->ix += BEH(self->data[self->ix]);
-  if (self->ix >= self->datalen) {
-    TINY_DNG_DPRINTF("parseBlock: ix %d, datalen %d\n", self->ix,
-                     self->datalen);
-    return LJ92_ERROR_CORRUPT;
-  }
-  return LJ92_ERROR_NONE;
-}
-
-#ifdef SLOW_HUFF
-static int nextbit(ljp* self) {
-  u32 b = self->b;
-  if (self->cnt == 0) {
-    u8* data = &self->data[self->ix];
-    u32 next = *data++;
-    b = next;
-    if (next == 0xff) {
-      data++;
-      self->ix++;
-    }
-    self->ix++;
-    self->cnt = 8;
-  }
-  int bit = b >> 7;
-  self->cnt--;
-  self->b = (b << 1) & 0xFF;
-  return bit;
-}
-
-static int decode(ljp* self) {
-  int i = 1;
-  int code = nextbit(self);
-  while (code > self->maxcode[i]) {
-    i++;
-    code = (code << 1) + nextbit(self);
-  }
-  int j = self->valptr[i];
-  j = j + code - self->mincode[i];
-  int value = self->huffval[j];
-  return value;
-}
-
-static int receive(ljp* self, int ssss) {
-  int i = 0;
-  int v = 0;
-  while (i != ssss) {
-    i++;
-    v = (v << 1) + nextbit(self);
-  }
-  return v;
-}
-
-static int extend(ljp* self, int v, int t) {
-  int vt = 1 << (t - 1);
-  if (v < vt) {
-    vt = (-1 << t) + 1;
-    v = v + vt;
-  }
-  return v;
-}
-#endif
-
-inline static int nextdiff(ljp* self, int component_idx, int Px, int *errcode) {
-  (void)Px;
-#ifdef SLOW_HUFF
-  int t = decode(self);
-  int diff = receive(self, t);
-  diff = extend(self, diff, t);
-// TINY_DNG_DPRINTF("%d %d %d %x\n",Px+diff,Px,diff,t);//,index,usedbits);
-#else
-  if (component_idx <= self->num_huff_idx) {
-    // OK
-  } else {
-    // "Invalid huff index.");
-    if (errcode) {
-      (*errcode) = LJ92_ERROR_CORRUPT;
-    }
-    return 0;
-  }
-
-  //TINY_DNG_ASSERT(component_idx <= self->num_huff_idx, "Invalid huff index.");
-  u32 b = self->b;
-  int cnt = self->cnt;
-  int huffbits = self->huffbits[component_idx];
-  int ix = self->ix;
-  int next;
-  while (cnt < huffbits) {
-    next = *(u16*)&self->data[ix];
-    int one = next & 0xFF;
-    int two = next >> 8;
-    b = (b << 16) | (one << 8) | two;
-    cnt += 16;
-    ix += 2;
-    if (one == 0xFF) {
-      // TINY_DNG_DPRINTF("%x %x %x %x %d\n",one,two,b,b>>8,cnt);
-      b >>= 8;
-      cnt -= 8;
-    } else if (two == 0xFF)
-      ix++;
-  }
-  int index = b >> (cnt - huffbits);
-  // TINY_DNG_DPRINTF("component_idx = %d / %d, index = %d\n", component_idx,
-  // self->components, index);
-
-  u16 ssssused = self->hufflut[component_idx][index];
-  int usedbits = ssssused & 0xFF;
-  int t = ssssused >> 8;
-  self->sssshist[t]++;
-  cnt -= usedbits;
-  int keepbitsmask = (1 << cnt) - 1;
-  b &= keepbitsmask;
-  while (cnt < t) {
-    next = *(u16*)&self->data[ix];
-    int one = next & 0xFF;
-    int two = next >> 8;
-    b = (b << 16) | (one << 8) | two;
-    cnt += 16;
-    ix += 2;
-    if (one == 0xFF) {
-      b >>= 8;
-      cnt -= 8;
-    } else if (two == 0xFF)
-      ix++;
-  }
-  cnt -= t;
-  int diff = b >> cnt;
-  int vt = 1 << (t - 1);
-  if (diff < vt) {
-    vt = (-1 << t) + 1;
-    diff += vt;
-  }
-  keepbitsmask = (1 << cnt) - 1;
-  self->b = b & keepbitsmask;
-  self->cnt = cnt;
-  self->ix = ix;
-// TINY_DNG_DPRINTF("%d %d\n",t,diff);
-// TINY_DNG_DPRINTF("%d %d %d %x %x %d\n",Px+diff,Px,diff,t,index,usedbits);
-#ifdef LJ92_DEBUG
-#endif
-#endif
-  return diff;
-}
-
-#if 0 // not used
-static int parsePred6(ljp* self) {
-  // TODO: Consider self->components
-  TINY_DNG_DPRINTF("parsePred6\n");
-  int ret = LJ92_ERROR_CORRUPT;
-  self->ix = self->scanstart;
-  // int compcount = self->data[self->ix+2];
-  self->ix += BEH(self->data[self->ix]);
-  self->cnt = 0;
-  self->b = 0;
-  int write = self->writelen;
-  // Now need to decode huffman coded values
-  int c = 0;
-  int pixels = self->y * self->x;
-  u16* out = self->image;
-  u16* temprow;
-  u16* thisrow = self->outrow[0];
-  u16* lastrow = self->outrow[1];
-
-  // First pixel predicted from base value
-  int diff;
-  int Px;
-  int col = 0;
-  int row = 0;
-  int left = 0;
-  int linear;
-  if (self->num_huff_idx <= self->components) {
-    // ok
-  } else {
-    //TINY_DNG_ASSERT(self->num_huff_idx <= self->components,
-    //                "Invalid number of huff indices.");
-    return LJ92_ERROR_CORRUPT;
-  }
-  int errcode = LJ92_ERROR_NONE;
-  // First pixel
-  diff = nextdiff(self, self->num_huff_idx - 1,
-                  0, &errcode);  // FIXME(syoyo): Is using (self->num_huff_idx-1) correct?
-  if (errcode != LJ92_ERROR_NONE) {
-    return errcode;
-  }
-
-  Px = 1 << (self->bits - 1);
-  left = Px + diff;
-  left = (u16)(left % 65536);
-  if (self->linearize)
-    linear = self->linearize[left];
-  else
-    linear = left;
-  thisrow[col++] = left;
-  out[c++] = linear;
-  if (self->ix >= self->datalen) {
-    TINY_DNG_DPRINTF("ix = %d, datalen = %d\n", self->ix, self->datalen);
-    return ret;
-  }
-  --write;
-  int rowcount = self->x - 1;
-  while (rowcount--) {
-    int _errcode = LJ92_ERROR_NONE;
-    diff = nextdiff(self, self->num_huff_idx - 1, 0, &_errcode);
-    if (_errcode != LJ92_ERROR_NONE) {
-      return _errcode;
-    }
-    Px = left;
-    left = Px + diff;
-    left = (u16)(left % 65536);
-    if (self->linearize)
-      linear = self->linearize[left];
-    else
-      linear = left;
-    thisrow[col++] = left;
-    out[c++] = linear;
-    // TINY_DNG_DPRINTF("%d %d %d %d
-    // %x\n",col-1,diff,left,thisrow[col-1],&thisrow[col-1]);
-    if (self->ix >= self->datalen) {
-      TINY_DNG_DPRINTF("a: self->ix = %d, datalen = %d\n", self->ix,
-                       self->datalen);
-      return ret;
-    }
-    if (--write == 0) {
-      out += self->skiplen;
-      write = self->writelen;
-    }
-  }
-  temprow = lastrow;
-  lastrow = thisrow;
-  thisrow = temprow;
-  row++;
-  // TINY_DNG_DPRINTF("%x %x\n",thisrow,lastrow);
-  while (c < pixels) {
-    col = 0;
-    int _errcode = LJ92_ERROR_NONE;
-    diff = nextdiff(self, self->num_huff_idx - 1, 0, &_errcode);
-    if (_errcode != LJ92_ERROR_NONE) {
-      return _errcode;
-    }
-    Px = lastrow[col];  // Use value above for first pixel in row
-    left = Px + diff;
-    left = (u16)(left % 65536);
-    if (self->linearize) {
-      if (left > self->linlen) return LJ92_ERROR_CORRUPT;
-      linear = self->linearize[left];
-    } else
-      linear = left;
-    thisrow[col++] = left;
-    // TINY_DNG_DPRINTF("%d %d %d %d\n",col,diff,left,lastrow[col]);
-    out[c++] = linear;
-    if (self->ix >= self->datalen) break;
-    rowcount = self->x - 1;
-    if (--write == 0) {
-      out += self->skiplen;
-      write = self->writelen;
-    }
-    while (rowcount--) {
-      int errcode_d2 = LJ92_ERROR_NONE;
-      diff = nextdiff(self, self->num_huff_idx - 1, 0, &errcode_d2);
-      if (errcode_d2 != LJ92_ERROR_NONE) {
-        return errcode_d2;
-      }
-
-      Px = lastrow[col] + ((left - lastrow[col - 1]) >> 1);
-      left = Px + diff;
-      left = (u16)(left % 65536);
-      // TINY_DNG_DPRINTF("%d %d %d %d %d
-      // %x\n",col,diff,left,lastrow[col],lastrow[col-1],&lastrow[col]);
-      if (self->linearize) {
-        if (left > self->linlen) return LJ92_ERROR_CORRUPT;
-        linear = self->linearize[left];
-      } else
-        linear = left;
-      thisrow[col++] = left;
-      out[c++] = linear;
-      if (--write == 0) {
-        out += self->skiplen;
-        write = self->writelen;
-      }
-    }
-    temprow = lastrow;
-    lastrow = thisrow;
-    thisrow = temprow;
-    if (self->ix >= self->datalen) break;
-  }
-  if (c >= pixels) ret = LJ92_ERROR_NONE;
-  return ret;
-}
-#endif
-
-static int parseScan(ljp* self) {
-  int ret = LJ92_ERROR_CORRUPT;
-  memset(self->sssshist, 0, sizeof(self->sssshist));
-  self->ix = self->scanstart;
-  int compcount = self->data[self->ix + 2];
-  TINY_DNG_DPRINTF("comp count = %d\n", compcount);
-  int pred = self->data[self->ix + 3 + 2 * compcount];
-  TINY_DNG_DPRINTF("predicator %d\n", pred);
-
-  if (pred < 0 || pred > 7) return ret;
-
-  // Disable until parsePred6() consideres self->components.
-  // if (pred == 6) return parsePred6(self);  // Fast path
-
-  // TINY_DNG_DPRINTF("pref = %d\n", pred);
-  self->ix += BEH(self->data[self->ix]);
-  self->cnt = 0;
-  self->b = 0;
-  // int write = self->writelen;
-  // Now need to decode huffman coded values
-  // int c = 0;
-  // int pixels = self->y * self->x * self->components;
-  u16* out = self->image;
-  u16* thisrow = self->outrow[0];
-  u16* lastrow = self->outrow[1];
-
-  // First pixel predicted from base value
-  int diff;
-  int Px = 0;
-  // int col = 0;
-  // int row = 0;
-  int left = 0;
-  // TINY_DNG_DPRINTF("w = %d, h = %d, components = %d, skiplen = %d\n",
-  // self->x,
-  // self->y,
-  //       self->components, self->skiplen);
-  for (int row = 0; row < self->y; row++) {
-    // TINY_DNG_DPRINTF("row = %d / %d\n", row, self->y);
-    // TINY_DNG_DPRINTF("thisrow %p, lastrow %p\n", thisrow, lastrow);
-    for (int col = 0; col < self->x; col++) {
-      int colx = col * self->components;
-
-      //
-      // NOTE: pixel data is stored in interleaved manner(RGBRGBRGB...)
-      //
-      for (int c = 0; c < self->components; c++) {
-        // TINY_DNG_DPRINTF("c = %d, col = %d, row = %d\n", c, col, row);
-        if ((col == 0) && (row == 0)) {
-          Px = 1 << (self->bits - 1);
-        } else if (row == 0) {
-          // Px = left;
-          if (col > 0) {
-            // ok
-          } else {
-            //TINY_DNG_ASSERT(col > 0, "Unexpected col.");
-            return LJ92_ERROR_CORRUPT;
-          }
-          Px = thisrow[(col - 1) * self->components + c];
-        } else if (col == 0) {
-          Px = lastrow[c];  // Use value above for first pixel in row
-        } else {
-          int prev_colx = (col - 1) * self->components;
-
-          // previous pixel
-          left = thisrow[prev_colx + c];
-
-          // TINY_DNG_DPRINTF("pred = %d\n", pred);
-          switch (pred) {
-            case 0:
-              Px = 0;
-              break;  // No prediction... should not be used
-            case 1:
-              Px = thisrow[prev_colx + c];
-              break;
-            case 2:
-              Px = lastrow[colx + c];
-              break;
-            case 3:
-              Px = lastrow[prev_colx + c];
-              break;
-            case 4:
-              Px = left + lastrow[colx + c] - lastrow[prev_colx + c];
-              break;
-            case 5:
-              Px = left + ((lastrow[colx + c] - lastrow[prev_colx + c]) >> 1);
-              break;
-            case 6:
-              Px = lastrow[colx + c] + ((left - lastrow[prev_colx + c]) >> 1);
-              break;
-            case 7:
-              Px = (left + lastrow[colx + c]) >> 1;
-              // printf("Px = %d, left = %d, lastrow[colx + c] = %d\n", Px,
-              // left, lastrow[colx + c]);
-              break;
-          }
-        }
-
-        int huff_idx = c;
-        if (c >= self->num_huff_idx) {
-          // Invalid huffman table index.
-          // Currently we assume # of huffman tables is 1.
-          TINY_DNG_CHECK_AND_RETURN_C(self->num_huff_idx == 1, LJ92_ERROR_CORRUPT);
-          huff_idx = 0;  // Look up the first huffman table.
-        }
-
-        int errcode = LJ92_ERROR_NONE;
-        diff = nextdiff(self, huff_idx, Px, &errcode);
-        if (errcode != LJ92_ERROR_NONE) {
-          return errcode;
-        }
-
-        left = Px + diff;
-
-        // issue https://github.com/syoyo/tinydng/issues/37
-        // The spec says the prediction(left) is calculated by adding the difference, then take a modulo(2^16)
-        // (`left` could be negative or 65536+ before taking a modulo)
-        left = (u16)(left % 65536);
-
-        // TINY_DNG_DPRINTF("row[%d] col[%d] c[%d] Px = %d, diff = %d, left =
-        // %d\n", row, col, c, Px, diff, left);
-        // Apple ProRAW gives -1 for `left`(=65535?), so uncommented negative
-        // left value check.
-        // TINY_DNG_ASSERT(left >= 0 && left < (1 << self->bits),
-        //                "Error huffman decoding.");
-        // TINY_DNG_DPRINTF("pix = %d\n", left);
-        // TINY_DNG_DPRINTF("%d %d %d\n",c,diff,left);
-        int linear;  // TODO: use u16?
-        if (self->linearize) {
-          if (left > self->linlen) return LJ92_ERROR_CORRUPT;
-          linear = self->linearize[u16(left)];
-        } else {
-          linear = left;
-        }
-
-        // TINY_DNG_DPRINTF("linear = %d\n", linear);
-        thisrow[colx + c] = left;
-        out[colx + c] = linear;
-      }  // c
-    }    // col
-
-    // Swap pointers for input and working row buffer
-    u16* temprow = lastrow;
-    lastrow = thisrow;
-    thisrow = temprow;
-
-    // Advance row of output buffer.
-    // NOTE: multiply
-    out += self->x * self->components + self->skiplen;
-    // TINY_DNG_DPRINTF("out = %p, %p, diff = %lld\n", out, self->image, out -
-    // self->image);
-
-  }  // row
-
-  ret = LJ92_ERROR_NONE;
-
-  // TINY_DNG_DPRINTF("out written = %d\n", int(out - self->image));
-
-  // if (++col == self->x) {
-  //	col = 0;
-  //	row++;
-  //}
-  // if (--write == 0) {
-  //	out += self->skiplen;
-  //	write = self->writelen;
-  //}
-  // if (self->ix >= self->datalen + 2) break;
-
-  // if (c >= pixels) ret = LJ92_ERROR_NONE;
-  /*for (int h=0;h<17;h++) {
-      TINY_DNG_DPRINTF("ssss:%d=%d
-  (%f)\n",h,self->sssshist[h],(float)self->sssshist[h]/(float)(pixels));
-  }*/
-  return ret;
-}
-
-static int parseImage(ljp* self) {
-  // TINY_DNG_DPRINTF("parseImage\n");
-  int ret = LJ92_ERROR_NONE;
-  while (1) {
-    int nextMarker = find(self);
-    TINY_DNG_DPRINTF("marker = 0x%08x\n", nextMarker);
-    if (nextMarker == 0xc4) {
-      TINY_DNG_DPRINTF("Parse huffman table.\n");
-      ret = parseHuff(self);
-    } else if (nextMarker == 0xc3) {
-      ret = parseSof3(self);
-    } else if (nextMarker == 0xfe) {  // Comment
-      ret = parseBlock(self, nextMarker);
-    } else if (nextMarker == 0xd9) {  // End of image
-      break;
-    } else if (nextMarker == 0xda) {
-      self->scanstart = self->ix;
-      ret = LJ92_ERROR_NONE;
-      break;
-    } else if (nextMarker == -1) {
-      ret = LJ92_ERROR_CORRUPT;
-      break;
-    } else
-      ret = parseBlock(self, nextMarker);
-    if (ret != LJ92_ERROR_NONE) break;
-  }
-  return ret;
-}
-
-static int findSoI(ljp* self) {
-  int ret = LJ92_ERROR_CORRUPT;
-  if (find(self) == 0xd8) {
-    ret = parseImage(self);
-  } else {
-    TINY_DNG_DPRINTF("findSoI: corrupt\n");
-  }
-  return ret;
-}
-
-static void free_memory(ljp* self) {
-#ifdef SLOW_HUFF
-  free(self->maxcode);
-  self->maxcode = NULL;
-  free(self->mincode);
-  self->mincode = NULL;
-  free(self->valptr);
-  self->valptr = NULL;
-  free(self->huffval);
-  self->huffval = NULL;
-  free(self->huffsize);
-  self->huffsize = NULL;
-  free(self->huffcode);
-  self->huffcode = NULL;
-#else
-  for (int i = 0; i < self->num_huff_idx; i++) {
-    free(self->hufflut[i]);
-    self->hufflut[i] = NULL;
-  }
-#endif
-  free(self->rowcache);
-  self->rowcache = NULL;
-}
-
-int lj92_open(lj92* lj, const uint8_t* data, int datalen, int* width,
-              int* height, int* bitdepth) {
-  ljp* self = (ljp*)calloc(sizeof(ljp), 1);
-  if (self == NULL) return LJ92_ERROR_NO_MEMORY;
-
-  self->data = (u8*)data;
-  self->dataend = self->data + datalen;
-  self->datalen = datalen;
-  self->num_huff_idx = 0;
-
-  int ret = findSoI(self);
-
-  if (ret == LJ92_ERROR_NONE) {
-    u16* rowcache = (u16*)calloc(self->x * self->components * 2, sizeof(u16));
-    if (rowcache == NULL)
-      ret = LJ92_ERROR_NO_MEMORY;
-    else {
-      self->rowcache = rowcache;
-      self->outrow[0] = rowcache;
-      self->outrow[1] = &rowcache[self->x * self->components];
-    }
-  }
-
-  if (ret != LJ92_ERROR_NONE) {  // Failed, clean up
-    *lj = NULL;
-    free_memory(self);
-    free(self);
-  } else {
-    *width = self->x;
-    *height = self->y;
-    *bitdepth = self->bits;
-    *lj = self;
-  }
-  return ret;
-}
-
-int lj92_decode(lj92 lj, uint16_t* target, int writeLength, int skipLength,
-                uint16_t* linearize, int linearizeLength) {
-  int ret = LJ92_ERROR_NONE;
-  ljp* self = lj;
-  if (self == NULL) return LJ92_ERROR_BAD_HANDLE;
-  self->image = target;
-  self->writelen = writeLength;
-  self->skiplen = skipLength;
-  self->linearize = linearize;
-  self->linlen = linearizeLength;
-  ret = parseScan(self);
-  return ret;
-}
-
-void lj92_close(lj92 lj) {
-  ljp* self = lj;
-  if (self != NULL) free_memory(self);
-  free(self);
-}
-
-#if 0  // not used in tinydngloader at the moment.
-// Fix of https://github.com/ilia3101/MLV-App/pull/151/files is not reflected here fully.
-/* Encoder implementation */
-
-// Very simple count leading zero implementation.
-static int clz32(unsigned int x) {
-  int n;
-  if (x == 0) return 32;
-  for (n = 0; ((x & 0x80000000) == 0); n++, x <<= 1)
-    ;
-  return n;
-}
-
-typedef struct _lje {
-  uint16_t* image;
-  int width;
-  int height;
-  int bitdepth;
-  int components;
-  int readLength;
-  int skipLength;
-  uint16_t* delinearize;
-  int delinearizeLength;
-  uint8_t* encoded;
-  int encodedWritten;
-  int encodedLength;
-  int hist[18];  // SSSS frequency histogram
-  int bits[18];
-  int huffval[18];
-  u16 huffenc[18];
-  u16 huffbits[18];
-  int huffsym[18];
-} lje;
-
-int frequencyScan(lje* self) {
-  // Scan through the tile using the standard type 6 prediction
-  // Need to cache the previous 2 row in target coordinates because of tiling
-  uint16_t* pixel = self->image;
-  int pixcount = self->width * self->height;
-  int scan = self->readLength;
-  uint16_t* rowcache = (uint16_t*)calloc(1, self->width * self->components * 4);
-  uint16_t* rows[2];
-  rows[0] = rowcache;
-  rows[1] = &rowcache[self->width * self->components];
-
-  int col = 0;
-  int row = 0;
-  int Px = 0;
-  int32_t diff = 0;
-  int maxval = (1 << self->bitdepth);
-
-  // TODO: consider self->components
-  while (pixcount--) {
-    uint16_t p = *pixel;
-    if (self->delinearize) {
-      if (p >= self->delinearizeLength) {
-        free(rowcache);
-        return LJ92_ERROR_TOO_WIDE;
-      }
-      p = self->delinearize[p];
-    }
-    if (p >= maxval) {
-      free(rowcache);
-      return LJ92_ERROR_TOO_WIDE;
-    }
-    rows[1][col] = p;
-
-    if ((row == 0) && (col == 0))
-      Px = 1 << (self->bitdepth - 1);
-    else if (row == 0)
-      Px = rows[1][col - 1];
-    else if (col == 0)
-      Px = rows[0][col];
-    else
-      Px = rows[0][col] + ((rows[1][col - 1] - rows[0][col - 1]) >> 1);
-    diff = rows[1][col] - Px;
-    diff = diff%65536;
-    // int ssss = 32 - __builtin_clz(abs(diff));
-    int ssss = 32 - clz32(abs(diff));
-    if (diff == 0) ssss = 0;
-    self->hist[ssss]++;
-    // TINY_DNG_DPRINTF("%d %d %d %d %d %d\n",col,row,p,Px,diff,ssss);
-    pixel++;
-    scan--;
-    col++;
-    if (scan == 0) {
-      pixel += self->skipLength;
-      scan = self->readLength;
-    }
-    if (col == self->width) {
-      uint16_t* tmprow = rows[1];
-      rows[1] = rows[0];
-      rows[0] = tmprow;
-      col = 0;
-      row++;
-    }
-  }
-#ifdef LJ92_DEBUG
-  int sort[17];
-  for (int h = 0; h < 17; h++) {
-    sort[h] = h;
-    TINY_DNG_DPRINTF("%d:%d\n", h, self->hist[h]);
-  }
-#endif
-  free(rowcache);
-  return LJ92_ERROR_NONE;
-}
-
-void createEncodeTable(lje* self) {
-  float freq[18];
-  int codesize[18];
-  int others[18];
-
-  // Calculate frequencies
-  float totalpixels = self->width * self->height;
-  for (int i = 0; i < 17; i++) {
-    freq[i] = (float)(self->hist[i]) / totalpixels;
-#ifdef LJ92_DEBUG
-    TINY_DNG_DPRINTF("%d:%f\n", i, freq[i]);
-#endif
-    codesize[i] = 0;
-    others[i] = -1;
-  }
-  codesize[17] = 0;
-  others[17] = -1;
-  freq[17] = 1.0f;
-
-  float v1f, v2f;
-  int v1, v2;
-
-  while (1) {
-    v1f = 3.0f;
-    v1 = -1;
-    for (int i = 0; i < 18; i++) {
-      if ((freq[i] <= v1f) && (freq[i] > 0.0f)) {
-        v1f = freq[i];
-        v1 = i;
-      }
-    }
-#ifdef LJ92_DEBUG
-    TINY_DNG_DPRINTF("v1:%d,%f\n", v1, v1f);
-#endif
-    v2f = 3.0f;
-    v2 = -1;
-    for (int i = 0; i < 18; i++) {
-      if (i == v1) continue;
-      if ((freq[i] < v2f) && (freq[i] > 0.0f)) {
-        v2f = freq[i];
-        v2 = i;
-      }
-    }
-    if (v2 == -1) break;  // Done
-
-    freq[v1] += freq[v2];
-    freq[v2] = 0.0f;
-
-    while (1) {
-      codesize[v1]++;
-      if (others[v1] == -1) break;
-      v1 = others[v1];
-    }
-    others[v1] = v2;
-    while (1) {
-      codesize[v2]++;
-      if (others[v2] == -1) break;
-      v2 = others[v2];
-    }
-  }
-  int* bits = self->bits;
-  memset(bits, 0, sizeof(self->bits));
-  for (int i = 0; i < 18; i++) {
-    if (codesize[i] != 0) {
-      bits[codesize[i]]++;
-    }
-  }
-#ifdef LJ92_DEBUG
-  for (int i = 0; i < 17; i++) {
-    TINY_DNG_DPRINTF("bits:%d,%d,%d\n", i, bits[i], codesize[i]);
-  }
-#endif
-  int* huffval = self->huffval;
-  int i = 1;
-  int k = 0;
-  int j;
-  memset(huffval, 0, sizeof(self->huffval));
-  while (i <= 32) {
-    j = 0;
-    while (j < 17) {
-      if (codesize[j] == i) {
-        huffval[k++] = j;
-      }
-      j++;
-    }
-    i++;
-  }
-#ifdef LJ92_DEBUG
-  for (i = 0; i < 17; i++) {
-    TINY_DNG_DPRINTF("i=%d,huffval[i]=%x\n", i, huffval[i]);
-  }
-#endif
-  int maxbits = 16;
-  while (maxbits > 0) {
-    if (bits[maxbits]) break;
-    maxbits--;
-  }
-  u16* huffenc = self->huffenc;
-  u16* huffbits = self->huffbits;
-  int* huffsym = self->huffsym;
-  memset(huffenc, 0, sizeof(self->huffenc));
-  memset(huffbits, 0, sizeof(self->huffbits));
-  memset(self->huffsym, 0, sizeof(self->huffsym));
-  i = 0;
-  int hv = 0;
-  int rv = 0;
-  int vl = 0;  // i
-  // int hcode;
-  int bitsused = 1;
-  int sym = 0;
-  // TINY_DNG_DPRINTF("%04x:%x:%d:%x\n",i,huffvals[hv],bitsused,1<<(maxbits-bitsused));
-  while (i < 1 << maxbits) {
-    if (bitsused > maxbits) {
-      break;  // Done. Should never get here!
-    }
-    if (vl >= bits[bitsused]) {
-      bitsused++;
-      vl = 0;
-      continue;
-    }
-    if (rv == 1 << (maxbits - bitsused)) {
-      rv = 0;
-      vl++;
-      hv++;
-      // TINY_DNG_DPRINTF("%04x:%x:%d:%x\n",i,huffvals[hv],bitsused,1<<(maxbits-bitsused));
-      continue;
-    }
-    huffbits[sym] = bitsused;
-    huffenc[sym++] = i >> (maxbits - bitsused);
-    // TINY_DNG_DPRINTF("%d %d %d\n",i,bitsused,hcode);
-    i += (1 << (maxbits - bitsused));
-    rv = 1 << (maxbits - bitsused);
-  }
-  for (i = 0; i < 17; i++) {
-    if (huffbits[i] > 0) {
-      huffsym[huffval[i]] = i;
-    }
-#ifdef LJ92_DEBUG
-    TINY_DNG_DPRINTF("huffval[%d]=%d,huffenc[%d]=%x,bits=%d\n", i, huffval[i],
-                     i, huffenc[i], huffbits[i]);
-#endif
-    if (huffbits[i] > 0) {
-      huffsym[huffval[i]] = i;
-    }
-  }
-#ifdef LJ92_DEBUG
-  for (i = 0; i < 17; i++) {
-    TINY_DNG_DPRINTF("huffsym[%d]=%d\n", i, huffsym[i]);
-  }
-#endif
-}
-
-// TODO: Support components of 2>
-void writeHeader(lje* self) {
-  int w = self->encodedWritten;
-  uint8_t* e = self->encoded;
-  e[w++] = 0xff;
-  e[w++] = 0xd8;  // SOI
-  e[w++] = 0xff;
-  e[w++] = 0xc3;  // SOF3
-  // Write SOF
-  e[w++] = 0x0;
-  e[w++] = 11;  // Lf, frame header length
-  e[w++] = self->bitdepth;
-  e[w++] = self->height >> 8;
-  e[w++] = self->height & 0xFF;
-  e[w++] = self->width >> 8;
-  e[w++] = self->width & 0xFF;
-  e[w++] = 1;     // Components
-  e[w++] = 0;     // Component ID
-  e[w++] = 0x11;  // Component X/Y
-  e[w++] = 0;     // Unused (Quantisation)
-  e[w++] = 0xff;
-  e[w++] = 0xc4;  // HUFF
-  // Write HUFF
-  int count = 0;
-  for (int i = 0; i < 17; i++) {
-    count += self->bits[i];
-  }
-  e[w++] = 0x0;
-  e[w++] = 17 + 2 + count;  // Lf, frame header length
-  e[w++] = 0;               // Table ID
-  for (int i = 1; i < 17; i++) {
-    e[w++] = self->bits[i];
-  }
-  for (int i = 0; i < count; i++) {
-    e[w++] = self->huffval[i];
-  }
-  e[w++] = 0xff;
-  e[w++] = 0xda;  // SCAN
-  // Write SCAN
-  e[w++] = 0x0;
-  e[w++] = 8;  // Ls, scan header length
-  e[w++] = 1;  // Components
-  e[w++] = 0;  //
-  e[w++] = 0;  //
-  e[w++] = 6;  // Predictor
-  e[w++] = 0;  //
-  e[w++] = 0;  //
-  self->encodedWritten = w;
-}
-
-void writePost(lje* self) {
-  int w = self->encodedWritten;
-  uint8_t* e = self->encoded;
-  e[w++] = 0xff;
-  e[w++] = 0xd9;  // EOI
-  self->encodedWritten = w;
-}
-
-void writeBody(lje* self) {
-  // Scan through the tile using the standard type 6 prediction
-  // Need to cache the previous 2 row in target coordinates because of tiling
-  uint16_t* pixel = self->image;
-  int pixcount = self->width * self->height;
-  int scan = self->readLength;
-  uint16_t* rowcache = (uint16_t*)calloc(1, self->width * self->components * 4);
-  uint16_t* rows[2];
-  rows[0] = rowcache;
-  rows[1] = &rowcache[self->width];
-
-  int col = 0;
-  int row = 0;
-  int Px = 0;
-  int32_t diff = 0;
-  int bitcount = 0;
-  uint8_t* out = self->encoded;
-  int w = self->encodedWritten;
-  uint8_t next = 0;
-  uint8_t nextbits = 8;
-  while (pixcount--) {
-    uint16_t p = *pixel;
-    if (self->delinearize) p = self->delinearize[p];
-    rows[1][col] = p;
-
-    if ((row == 0) && (col == 0))
-      Px = 1 << (self->bitdepth - 1);
-    else if (row == 0)
-      Px = rows[1][col - 1];
-    else if (col == 0)
-      Px = rows[0][col];
-    else
-      Px = rows[0][col] + ((rows[1][col - 1] - rows[0][col - 1]) >> 1);
-    diff = rows[1][col] - Px;
-    // int ssss = 32 - __builtin_clz(abs(diff));
-    int ssss = 32 - clz32(abs(diff));
-    if (diff == 0) ssss = 0;
-    // TINY_DNG_DPRINTF("%d %d %d %d %d\n",col,row,Px,diff,ssss);
-
-    // Write the huffman code for the ssss value
-    int huffcode = self->huffsym[ssss];
-    int huffenc = self->huffenc[huffcode];
-    int huffbits = self->huffbits[huffcode];
-    bitcount += huffbits + ssss;
-
-    int vt = ssss > 0 ? (1 << (ssss - 1)) : 0;
-// TINY_DNG_DPRINTF("%d %d %d %d\n",rows[1][col],Px,diff,Px+diff);
-#ifdef LJ92_DEBUG
-#endif
-    if (diff < vt) diff += (1 << (ssss)) - 1;
-
-    // Write the ssss
-    while (huffbits > 0) {
-      int usebits = huffbits > nextbits ? nextbits : huffbits;
-      // Add top usebits from huffval to next usebits of nextbits
-      int tophuff = huffenc >> (huffbits - usebits);
-      next |= (tophuff << (nextbits - usebits));
-      nextbits -= usebits;
-      huffbits -= usebits;
-      huffenc &= (1 << huffbits) - 1;
-      if (nextbits == 0) {
-        out[w++] = next;
-        if (next == 0xff) out[w++] = 0x0;
-        next = 0;
-        nextbits = 8;
-      }
-    }
-    // Write the rest of the bits for the value
-
-    while (ssss > 0) {
-      int usebits = ssss > nextbits ? nextbits : ssss;
-      // Add top usebits from huffval to next usebits of nextbits
-      int tophuff = diff >> (ssss - usebits);
-      next |= (tophuff << (nextbits - usebits));
-      nextbits -= usebits;
-      ssss -= usebits;
-      diff &= (1 << ssss) - 1;
-      if (nextbits == 0) {
-        out[w++] = next;
-        if (next == 0xff) out[w++] = 0x0;
-        next = 0;
-        nextbits = 8;
-      }
-    }
-
-    // TINY_DNG_DPRINTF("%d %d\n",diff,ssss);
-    pixel++;
-    scan--;
-    col++;
-    if (scan == 0) {
-      pixel += self->skipLength;
-      scan = self->readLength;
-    }
-    if (col == self->width) {
-      uint16_t* tmprow = rows[1];
-      rows[1] = rows[0];
-      rows[0] = tmprow;
-      col = 0;
-      row++;
-    }
-  }
-  // Flush the final bits
-  if (nextbits < 8) {
-    out[w++] = next;
-    if (next == 0xff) out[w++] = 0x0;
-  }
-#ifdef LJ92_DEBUG
-  int sort[17];
-  for (int h = 0; h < 17; h++) {
-    sort[h] = h;
-    TINY_DNG_DPRINTF("%d:%d\n", h, self->hist[h]);
-  }
-  TINY_DNG_DPRINTF("Total bytes: %d\n", bitcount >> 3);
-#endif
-  free(rowcache);
-  self->encodedWritten = w;
-}
-
-/* Encoder
- * Read tile from an image and encode in one shot
- * Return the encoded data
- */
-int lj92_encode(uint16_t* image, int width, int height, int bitdepth,
-                int readLength, int skipLength, uint16_t* delinearize,
-                int delinearizeLength, uint8_t** encoded, int* encodedLength) {
-  int ret = LJ92_ERROR_NONE;
-
-  lje* self = (lje*)calloc(sizeof(lje), 1);
-  if (self == NULL) return LJ92_ERROR_NO_MEMORY;
-  self->image = image;
-  self->width = width;
-  self->height = height;
-  self->bitdepth = bitdepth;
-  self->readLength = readLength;
-  self->skipLength = skipLength;
-  self->delinearize = delinearize;
-  self->delinearizeLength = delinearizeLength;
-  self->encodedLength = width * height * 3 + 200;
-  self->encoded = (uint8_t*)malloc(self->encodedLength);
-  if (self->encoded == NULL) {
-    free(self);
-    return LJ92_ERROR_NO_MEMORY;
-  }
-  // Scan through data to gather frequencies of ssss prefixes
-  ret = frequencyScan(self);
-  if (ret != LJ92_ERROR_NONE) {
-    free(self->encoded);
-    free(self);
-    return ret;
-  }
-  // Create encoded table based on frequencies
-  createEncodeTable(self);
-  // Write JPEG head and scan header
-  writeHeader(self);
-  // Scan through and do the compression
-  writeBody(self);
-  // Finish
-  writePost(self);
-#ifdef LJ92_DEBUG
-  TINY_DNG_DPRINTF("written:%d\n", self->encodedWritten);
-#endif
-  self->encoded = (uint8_t*)realloc(self->encoded, self->encodedWritten);
-  self->encodedLength = self->encodedWritten;
-  *encoded = self->encoded;
-  *encodedLength = self->encodedLength;
-
-  free(self);
-
-  return ret;
-}
-#endif
-
-// End liblj92 ---------------------------------------------------------
-}  // namespace
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#if __has_warning("-Wzero-as-null-pointer-constant")
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
-#endif
-
-typedef enum {
-  TAG_NEW_SUBFILE_TYPE = 254,
-  TAG_SUBFILE_TYPE = 255,
-  TAG_IMAGE_WIDTH = 256,
-  TAG_IMAGE_HEIGHT = 257,
-  TAG_BITS_PER_SAMPLE = 258,
-  TAG_COMPRESSION = 259,
-  TAG_STRIP_OFFSET = 273,
-  TAG_ORIENTATION = 274,
-  TAG_SAMPLES_PER_PIXEL = 277,
-  TAG_ROWS_PER_STRIP = 278,
-  TAG_STRIP_BYTE_COUNTS = 279,
-  TAG_PLANAR_CONFIGURATION = 284,
-  TAG_PREDICTOR = 317,
-  TAG_SUB_IFDS = 330,
-  TAG_TILE_WIDTH = 322,
-  TAG_TILE_LENGTH = 323,
-  TAG_TILE_OFFSETS = 324,
-  TAG_TILE_BYTE_COUNTS = 325,
-  TAG_SAMPLE_FORMAT = 339,
-  TAG_JPEG_IF_OFFSET = 513,
-  TAG_JPEG_IF_BYTE_COUNT = 514,
-  TAG_CFA_PATTERN_DIM = 33421,
-  TAG_CFA_PATTERN = 33422,
-  TAG_CFA_PLANE_COLOR = 50710,
-  TAG_CFA_LAYOUT = 50711,
-  TAG_BLACK_LEVEL = 50714,
-  TAG_WHITE_LEVEL = 50717,
-  TAG_COLOR_MATRIX1 = 50721,
-  TAG_COLOR_MATRIX2 = 50722,
-  TAG_CAMERA_CALIBRATION1 = 50723,
-  TAG_CAMERA_CALIBRATION2 = 50724,
-  TAG_DNG_VERSION = 50706,
-  TAG_ANALOG_BALANCE = 50727,
-  TAG_AS_SHOT_NEUTRAL = 50728,
-  TAG_CALIBRATION_ILLUMINANT1 = 50778,
-  TAG_CALIBRATION_ILLUMINANT2 = 50779,
-  TAG_ACTIVE_AREA = 50829,
-  TAG_PROFILE_NAME = 50936,
-  TAG_PROFILE_TONE_CURVE = 50940,
-  TAG_PROFILE_EMBED_POLICY = 50941,
-  TAG_FORWARD_MATRIX1 = 50964,
-  TAG_FORWARD_MATRIX2 = 50965,
-
-  // CR2 extension
-  // http://lclevy.free.fr/cr2/
-  TAG_CR2_META0 = 50648,
-  TAG_CR2_META1 = 50656,
-  TAG_CR2_SLICES = 50752,
-  TAG_CR2_META2 = 50885,
-
-  //
-  // OpCodeList
-  //
-  TAG_OPCODE_LIST1 = 0xc740,
-  TAG_OPCODE_LIST2 = 0xc741,
-  TAG_OPCODE_LIST3 = 0xc742,
-
-  TAG_NOISE_PROFILE = 51041,
-
-  // DNG 1.6(Apple ProRAW)
-  // ahttps://helpx.adobe.com/photoshop/kb/dng-specification-tags.html
-  TAG_SEMANTIC_NAME = 52526,  // Type: ASCII, Count: String length including
-                              // null, Value: null-terminated string
-
-  TAG_INVALID = 65535
-} TiffTag;
-
-typedef enum {
-  OPCODE_LIST_WARP_RECTILINEAR = 1,
-  OPCODE_LIST_WARP_FISHEYE = 2,
-  OPCODE_LIST_FIX_VIGNETTE_RADIAL = 3,
-  OPCODE_LIST_FIX_BAD_PIXELS_CONSTANT = 4,
-  OPCODE_LIST_FIX_BAD_PIXELS_LIST = 5,
-  OPCODE_LIST_TRIM_BOUNDS = 6,
-  OPCODE_LIST_MAP_TABLE = 7,
-  OPCODE_LIST_MAP_POLYNOMIAL = 8,
-  OPCODE_LIST_GAIN_MAP = 9,
-  OPCODE_LIST_DELTA_PER_ROW = 10,
-  OPCODE_LIST_DELTA_PER_COLUMN = 11,
-  OPCODE_LIST_SCALE_PER_ROW = 12,
-  OPCODE_LIST_SCALE_PER_COLUMN = 13
-} OpCodeListValue;
-
-static bool IsBigEndian();
-
-static void swap2(unsigned short* val) {
-  unsigned short tmp = *val;
-  unsigned char* dst = reinterpret_cast<unsigned char*>(val);
-  unsigned char* src = reinterpret_cast<unsigned char*>(&tmp);
-
-  dst[0] = src[1];
-  dst[1] = src[0];
-}
-
-static void swap4(unsigned int* val) {
-  unsigned int tmp = *val;
-  unsigned char* dst = reinterpret_cast<unsigned char*>(val);
-  unsigned char* src = reinterpret_cast<unsigned char*>(&tmp);
-
-  dst[0] = src[3];
-  dst[1] = src[2];
-  dst[2] = src[1];
-  dst[3] = src[0];
-}
-
-static inline void swap4(int* val) {
-  int tmp = *val;
-  unsigned char* dst = reinterpret_cast<unsigned char*>(val);
-  unsigned char* src = reinterpret_cast<unsigned char*>(&tmp);
-
-  dst[0] = src[3];
-  dst[1] = src[2];
-  dst[2] = src[1];
-  dst[3] = src[0];
-}
-
-static inline void swap8(uint64_t* val) {
-  uint64_t tmp = (*val);
-  unsigned char* dst = reinterpret_cast<unsigned char*>(val);
-  unsigned char* src = reinterpret_cast<unsigned char*>(&tmp);
-
-  dst[0] = src[7];
-  dst[1] = src[6];
-  dst[2] = src[5];
-  dst[3] = src[4];
-  dst[4] = src[3];
-  dst[5] = src[2];
-  dst[6] = src[1];
-  dst[7] = src[0];
-}
-
-static inline void swap8(int64_t* val) {
-  int64_t tmp = (*val);
-  unsigned char* dst = reinterpret_cast<unsigned char*>(val);
-  unsigned char* src = reinterpret_cast<unsigned char*>(&tmp);
-
-  dst[0] = src[7];
-  dst[1] = src[6];
-  dst[2] = src[5];
-  dst[3] = src[4];
-  dst[4] = src[3];
-  dst[5] = src[2];
-  dst[6] = src[1];
-  dst[7] = src[0];
-}
-
-// For unaligned read
-
-static void cpy2(unsigned short* dst_val, const unsigned short* src_val) {
-  unsigned char* dst = reinterpret_cast<unsigned char*>(dst_val);
-  const unsigned char* src = reinterpret_cast<const unsigned char*>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-}
-
-static void cpy2(short* dst_val, const short* src_val) {
-  unsigned char* dst = reinterpret_cast<unsigned char*>(dst_val);
-  const unsigned char* src = reinterpret_cast<const unsigned char*>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-}
-
-static void cpy4(unsigned int* dst_val, const unsigned int* src_val) {
-  unsigned char* dst = reinterpret_cast<unsigned char*>(dst_val);
-  const unsigned char* src = reinterpret_cast<const unsigned char*>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-  dst[2] = src[2];
-  dst[3] = src[3];
-}
-
-static void cpy4(int* dst_val, const int* src_val) {
-  unsigned char* dst = reinterpret_cast<unsigned char*>(dst_val);
-  const unsigned char* src = reinterpret_cast<const unsigned char*>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-  dst[2] = src[2];
-  dst[3] = src[3];
-}
-
-static void cpy8(uint64_t* dst_val, const uint64_t* src_val) {
-  unsigned char* dst = reinterpret_cast<unsigned char*>(dst_val);
-  const unsigned char* src = reinterpret_cast<const unsigned char*>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-  dst[2] = src[2];
-  dst[3] = src[3];
-  dst[4] = src[4];
-  dst[5] = src[5];
-  dst[6] = src[6];
-  dst[7] = src[7];
-}
-
-static void cpy8(int64_t* dst_val, const int64_t* src_val) {
-  unsigned char* dst = reinterpret_cast<unsigned char*>(dst_val);
-  const unsigned char* src = reinterpret_cast<const unsigned char*>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-  dst[2] = src[2];
-  dst[3] = src[3];
-  dst[4] = src[4];
-  dst[5] = src[5];
-  dst[6] = src[6];
-  dst[7] = src[7];
-}
-
-
-///
-/// Simple stream reader
-///
-class StreamReader {
- public:
-  explicit StreamReader(const uint8_t* binary, const size_t length,
-                        const bool swap_endian)
-      : binary_(binary), length_(length), swap_endian_(swap_endian), idx_(0) {
-    (void)pad_;
-  }
-
-  bool seek_set(const uint64_t offset) const {
-    if (offset > length_) {
-      return false;
-    }
-
-    idx_ = offset;
-    return true;
-  }
-
-  bool seek_from_currect(const int64_t offset) const {
-    if ((int64_t(idx_) + offset) < 0) {
-      return false;
-    }
-
-    if (size_t((int64_t(idx_) + offset)) > length_) {
-      return false;
-    }
-
-    idx_ = size_t(int64_t(idx_) + offset);
-    return true;
-  }
-
-  size_t read(const size_t n, const uint64_t dst_len,
-              unsigned char* dst) const {
-    size_t len = n;
-    if ((idx_ + len) > length_) {
-      len = length_ - idx_;
-    }
-
-    if (len > 0) {
-      if (dst_len < len) {
-        // dst does not have enough space. return 0 for a while.
-        return 0;
-      }
-
-      memcpy(dst, &binary_[idx_], len);
-      idx_ += len;
-      return len;
-
-    } else {
-      return 0;
-    }
-  }
-
-  bool read1(unsigned char* ret) const {
-    if ((idx_ + 1) > length_) {
-      return false;
-    }
-
-    const unsigned char val = binary_[idx_];
-
-    (*ret) = val;
-    idx_ += 1;
-
-    return true;
-  }
-
-  bool read_bool(bool* ret) const {
-    if ((idx_ + 1) > length_) {
-      return false;
-    }
-
-    const char val = static_cast<const char>(binary_[idx_]);
-
-    (*ret) = bool(val);
-    idx_ += 1;
-
-    return true;
-  }
-
-  bool read1(char* ret) const {
-    if ((idx_ + 1) > length_) {
-      return false;
-    }
-
-    const char val = static_cast<const char>(binary_[idx_]);
-
-    (*ret) = val;
-    idx_ += 1;
-
-    return true;
-  }
-
-  bool read2(unsigned short* ret) const {
-    if ((idx_ + 2) > length_) {
-      return false;
-    }
-
-    unsigned short val = 0;
-    cpy2(&val, reinterpret_cast<const unsigned short*>(&binary_[idx_]));
-
-    if (swap_endian_) {
-      swap2(&val);
-    }
-
-    (*ret) = val;
-    idx_ += 2;
-
-    return true;
-  }
-
-  bool read2(short* ret) const {
-    if ((idx_ + 2) > length_) {
-      return false;
-    }
-
-    short val = 0;
-    cpy2(&val, reinterpret_cast<const short*>(&binary_[idx_]));
-
-    if (swap_endian_) {
-      swap2(reinterpret_cast<unsigned short*>(&val));
-    }
-
-    (*ret) = val;
-    idx_ += 2;
-
-    return true;
-  }
-
-  bool read4(unsigned int* ret) const {
-    if ((idx_ + 4) > length_) {
-      return false;
-    }
-
-    unsigned int val = 0;
-    cpy4(&val, reinterpret_cast<const unsigned int*>(&binary_[idx_]));
-
-    if (swap_endian_) {
-      swap4(&val);
-    }
-
-    (*ret) = val;
-    idx_ += 4;
-
-    return true;
-  }
-
-  bool read4(int* ret) const {
-    if ((idx_ + 4) > length_) {
-      return false;
-    }
-
-    int val = 0;
-    cpy4(&val, reinterpret_cast<const int*>(&binary_[idx_]));
-
-    if (swap_endian_) {
-      swap4(&val);
-    }
-
-    (*ret) = val;
-    idx_ += 4;
-
-    return true;
-  }
-
-  bool read8(uint64_t* ret) const {
-    if ((idx_ + 8) > length_) {
-      return false;
-    }
-
-    uint64_t val = 0;
-    cpy8(&val, reinterpret_cast<const uint64_t*>(&binary_[idx_]));
-
-    if (swap_endian_) {
-      swap8(&val);
-    }
-
-    (*ret) = val;
-    idx_ += 8;
-
-    return true;
-  }
-
-  bool read8(int64_t* ret) const {
-    if ((idx_ + 8) > length_) {
-      return false;
-    }
-
-    int64_t val = 0;
-    cpy8(&val, reinterpret_cast<const int64_t*>(&binary_[idx_]));
-
-    if (swap_endian_) {
-      swap8(&val);
-    }
-
-    (*ret) = val;
-    idx_ += 8;
-
-    return true;
-  }
-
-  bool read_float(float* ret) const {
-    if (!ret) {
-      return false;
-    }
-
-    float value = 0.0f;
-    if (!read4(reinterpret_cast<int*>(&value))) {
-      return false;
-    }
-
-    (*ret) = value;
-
-    return true;
-  }
-
-  bool read_double(double* ret) const {
-    if (!ret) {
-      return false;
-    }
-
-    double value = 0.0;
-    if (!read8(reinterpret_cast<uint64_t*>(&value))) {
-      return false;
-    }
-
-    (*ret) = value;
-
-    return true;
-  }
-
-  bool read_uint(int type, unsigned int* ret) const {
-    // @todo {8, 9, 10, 11, 12}
-    if (type == 3) {
-      unsigned short val;
-      if (!read2(&val)) {
-        return false;
-      }
-      (*ret) = static_cast<unsigned int>(val);
-      return true;
-    } else if (type == 5) {
-      unsigned int val0;
-      if (!read4(&val0)) {
-        return false;
-      }
-
-      unsigned int val1;
-      if (!read4(&val1)) {
-        return false;
-      }
-
-      if (val1 == 0) {
-        // Seems invalid
-        return false;
-      }
-
-      (*ret) = static_cast<unsigned int>(val0 / val1);
-      return true;
-
-    } else if (type == 4) {
-      unsigned int val;
-      if (!read4(&val)) {
-        return false;
-      }
-      (*ret) = val;
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  bool read_real(int type, double* ret) const {
-    // @todo { Support more types. }
-
-    if (type == TYPE_RATIONAL) {
-      unsigned int num;
-      if (!read4(&num)) {
-        return false;
-      }
-      unsigned int denom;
-      if (!read4(&denom)) {
-        return false;
-      }
-
-      (*ret) = static_cast<double>(num) / static_cast<double>(denom);
-      return true;
-    } else if (type == TYPE_SRATIONAL) {
-      int num;
-      if (!read4(&num)) {
-        return false;
-      }
-      int denom;
-      if (!read4(&denom)) {
-        return false;
-      }
-
-      (*ret) = static_cast<double>(num) / static_cast<double>(denom);
-      return true;
-    } else {
-      return false;
-    }
-    // never come here.
-  }
-
-  //
-  // Returns a memory address. The begining of address is computed in
-  // relative(based on current seek pos). This function is useful when you just
-  // want to access the content in read-only mode.
-  //
-  // Note that the function does not change seek position after the call.
-  // This function does the bound check.
-  //
-  // @param[in] offset Extra byte offset. 0 = use current seek position.
-  // @param[in] length Byte length to map.
-  //
-  // @return nullptr when failed to map address.
-  //
-  const uint8_t* map_addr(size_t offset, const size_t length) {
-    if (length == 0) {
-      return NULL;
-    }
-
-    if ((idx_ + offset) > length_) {
-      return NULL;
-    }
-
-    if ((idx_ + offset + length) > length_) {
-      return NULL;
-    }
-
-    return &binary_[idx_ + offset];
-  }
-
-  //
-  // Returns a memory address. The begining of address is specified by
-  // absolute(ignores current seek pos). This function is useful when you just
-  // want to access the content in read-only mode.
-  //
-  // Note that the function does not change seek position after the call.
-  // This function does the bound check.
-  //
-  // @param[in] pos Absolute position in bytes.
-  // @param[in] length Byte length to map.
-  //
-  // @return nullptr when failed to map address.
-  //
-  const uint8_t* map_abs_addr(size_t pos, const size_t length) {
-    if (length == 0) {
-      return NULL;
-    }
-
-    if (pos > length_) {
-      return NULL;
-    }
-
-    if ((pos + length) > length_) {
-      return NULL;
-    }
-
-    return &binary_[pos];
-  }
-
-  size_t tell() const { return idx_; }
-
-  const uint8_t* data() const { return binary_; }
-
-  bool swap_endian() const { return swap_endian_; }
-
-  size_t size() const { return length_; }
-
- private:
-  const uint8_t* binary_;
-  const size_t length_;
-  bool swap_endian_;
-  char pad_[7];
-  mutable uint64_t idx_;
-};
-
-static bool GetTIFFTag(const StreamReader& sr, unsigned short* tag,
-                       unsigned short* type, unsigned int* len,
-                       unsigned int* saved_offt) {
-  if (!sr.read2(tag)) {
-    return false;
-  }
-
-  if (!sr.read2(type)) {
-    return false;
-  }
-
-  if (!sr.read4(len)) {
-    return false;
-  }
-
-  (*saved_offt) = static_cast<unsigned int>(sr.tell()) + 4;
-
-  size_t typesize_table[] = {1, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 4};
-
-  if ((*len) * (typesize_table[(*type) < 14 ? (*type) : 0]) > 4) {
-    unsigned int base = 0;  // fixme
-    unsigned int offt = 0;
-    if (!sr.read4(&offt)) {
-      return false;
-    }
-    if (!sr.seek_set(offt + base)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-static void InitializeDNGImage(tinydng::DNGImage* image) {
-  image->version = 0;
-
-  image->color_matrix1[0][0] = 1.0;
-  image->color_matrix1[0][1] = 0.0;
-  image->color_matrix1[0][2] = 0.0;
-  image->color_matrix1[1][0] = 0.0;
-  image->color_matrix1[1][1] = 1.0;
-  image->color_matrix1[1][2] = 0.0;
-  image->color_matrix1[2][0] = 0.0;
-  image->color_matrix1[2][1] = 0.0;
-  image->color_matrix1[2][2] = 1.0;
-
-  image->color_matrix2[0][0] = 1.0;
-  image->color_matrix2[0][1] = 0.0;
-  image->color_matrix2[0][2] = 0.0;
-  image->color_matrix2[1][0] = 0.0;
-  image->color_matrix2[1][1] = 1.0;
-  image->color_matrix2[1][2] = 0.0;
-  image->color_matrix2[2][0] = 0.0;
-  image->color_matrix2[2][1] = 0.0;
-  image->color_matrix2[2][2] = 1.0;
-
-  image->forward_matrix1[0][0] = 1.0;
-  image->forward_matrix1[0][1] = 0.0;
-  image->forward_matrix1[0][2] = 0.0;
-  image->forward_matrix1[1][0] = 0.0;
-  image->forward_matrix1[1][1] = 1.0;
-  image->forward_matrix1[1][2] = 0.0;
-  image->forward_matrix1[2][0] = 0.0;
-  image->forward_matrix1[2][1] = 0.0;
-  image->forward_matrix1[2][2] = 1.0;
-
-  image->forward_matrix2[0][0] = 1.0;
-  image->forward_matrix2[0][1] = 0.0;
-  image->forward_matrix2[0][2] = 0.0;
-  image->forward_matrix2[1][0] = 0.0;
-  image->forward_matrix2[1][1] = 1.0;
-  image->forward_matrix2[1][2] = 0.0;
-  image->forward_matrix2[2][0] = 0.0;
-  image->forward_matrix2[2][1] = 0.0;
-  image->forward_matrix2[2][2] = 1.0;
-
-  image->camera_calibration1[0][0] = 1.0;
-  image->camera_calibration1[0][1] = 0.0;
-  image->camera_calibration1[0][2] = 0.0;
-  image->camera_calibration1[1][0] = 0.0;
-  image->camera_calibration1[1][1] = 1.0;
-  image->camera_calibration1[1][2] = 0.0;
-  image->camera_calibration1[2][0] = 0.0;
-  image->camera_calibration1[2][1] = 0.0;
-  image->camera_calibration1[2][2] = 1.0;
-
-  image->camera_calibration2[0][0] = 1.0;
-  image->camera_calibration2[0][1] = 0.0;
-  image->camera_calibration2[0][2] = 0.0;
-  image->camera_calibration2[1][0] = 0.0;
-  image->camera_calibration2[1][1] = 1.0;
-  image->camera_calibration2[1][2] = 0.0;
-  image->camera_calibration2[2][0] = 0.0;
-  image->camera_calibration2[2][1] = 0.0;
-  image->camera_calibration2[2][2] = 1.0;
-
-  image->calibration_illuminant1 = LIGHTSOURCE_UNKNOWN;
-  image->calibration_illuminant2 = LIGHTSOURCE_UNKNOWN;
-
-  image->white_level[0] = -1;  // White level will be set after parsing TAG.
-                               // The spec says: The default value for this
-                               // tag is (2 ** BitsPerSample)
-                               // -1 for unsigned integer images, and 1.0 for
-                               // floating point images.
-
-  image->white_level[1] = -1;
-  image->white_level[2] = -1;
-  image->white_level[3] = -1;
-  image->black_level[0] = 0;
-  image->black_level[1] = 0;
-  image->black_level[2] = 0;
-  image->black_level[3] = 0;
-
-  image->bits_per_sample = 0;
-
-  image->has_active_area = false;
-  image->active_area[0] = -1;
-  image->active_area[1] = -1;
-  image->active_area[2] = -1;
-  image->active_area[3] = -1;
-
-  image->cfa_plane_color[0] = 0;
-  image->cfa_plane_color[1] = 1;
-  image->cfa_plane_color[2] = 2;
-  image->cfa_plane_color[3] = 0;  // optional?
-
-  image->cfa_pattern_dim = 2;
-
-  // The spec says default is None, thus fill with -1(=invalid).
-  image->cfa_pattern[0][0] = -1;
-  image->cfa_pattern[0][1] = -1;
-  image->cfa_pattern[1][0] = -1;
-  image->cfa_pattern[1][1] = -1;
-
-  image->cfa_layout = 1;
-
-  image->offset = 0;
-
-  image->tile_width = -1;
-  image->tile_length = -1;
-  image->tile_offset = 0;
-
-  image->planar_configuration = 1;  // chunky
-
-  image->predictor = 1;  // no prediction scheme
-
-  image->has_analog_balance = false;
-  image->has_as_shot_neutral = false;
-
-  image->jpeg_byte_count = -1;
-  image->strip_byte_count = -1;
-
-  image->samples_per_pixel = 1;
-  image->rows_per_strip = -1;  // 2^32 - 1
-  image->bits_per_sample_original = -1;
-
-  image->sample_format = SAMPLEFORMAT_UINT;
-
-  image->compression = COMPRESSION_NONE;
-
-  image->orientation = 1;
-
-  image->strips_per_image = -1;  // 2^32 - 1
-
-  image->profile_embed_policy = -1;
-
-  // CR2 specific
-  image->cr2_slices[0] = 0;
-  image->cr2_slices[1] = 0;
-  image->cr2_slices[2] = 0;
-}
-
-// Check if JPEG data is lossless JPEG or not(baseline JPEG)
-static bool IsLosslessJPEG(const uint8_t* header_addr, int data_len, int* width,
-                           int* height, int* bits, int* components) {
-  TINY_DNG_DPRINTF("islossless jpeg\n");
-  int lj_width = 0;
-  int lj_height = 0;
-  int lj_bits = 0;
-  lj92 ljp;
-  int ret =
-      lj92_open(&ljp, header_addr, data_len, &lj_width, &lj_height, &lj_bits);
-  if (ret == LJ92_ERROR_NONE) {
-    // TINY_DNG_DPRINTF("w = %d, h = %d, bits = %d, components = %d\n",
-    // lj_width,
-    // lj_height, lj_bits, ljp->components);
-
-    if ((lj_width == 0) || (lj_height == 0) || (lj_bits == 0) ||
-        (lj_bits == 8)) {
-      // Looks like baseline JPEG
-      lj92_close(ljp);
-      return false;
-    }
-
-    if (components) (*components) = ljp->components;
-
-    lj92_close(ljp);
-
-    if (width) (*width) = lj_width;
-    if (height) (*height) = lj_height;
-    if (bits) (*bits) = lj_bits;
-  }
-  return (ret == LJ92_ERROR_NONE) ? true : false;
-}
-
-#ifdef TINY_DNG_LOADER_ENABLE_ZIP
-
-static bool DecompressZIP(unsigned char* dst,
-                          unsigned long* uncompressed_size /* inout */,
-                          const unsigned char* src, unsigned long src_size,
-                          std::string* err) {
-  std::vector<unsigned char> tmpBuf(*uncompressed_size);
-
-#ifdef TINY_DNG_LOADER_USE_SYSTEM_ZLIB
-  int ret = uncompress(&tmpBuf.at(0), uncompressed_size, src, src_size);
-  if (Z_OK != ret) {
-    if (err) {
-      std::stringstream ss;
-      ss << "zlib uncompress failed. code = " << ret << "\n";
-      (*err) += ss.str();
-    }
-    return false;
-  }
-#else
-  int ret = mz_uncompress(&tmpBuf.at(0), uncompressed_size, src, src_size);
-  if (MZ_OK != ret) {
-    if (err) {
-      std::stringstream ss;
-      ss << "mz_uncompress failed. code = " << ret << "\n";
-      (*err) += ss.str();
-    }
-    return false;
-  }
-#endif
-
-  memcpy(dst, tmpBuf.data(), (*uncompressed_size));
-
-  return true;
-}
-
-// Assume T = uint8 or uint16
-static bool UnpredictImageU8(std::vector<uint8_t>& dst,  // inout
-                             int predictor, const size_t width,
-                             const size_t rows, const size_t spp) {
-  if (predictor == 1) {
-    // no prediction shceme
-    return true;
-  } else if (predictor == 2) {
-    // horizontal diff
-    const size_t stride = size_t(width * spp);
-    for (size_t row = 0; row < rows; row++) {
-      for (size_t c = 0; c < spp; c++) {
-        unsigned int b = dst[row * stride + c];
-        for (size_t col = 1; col < width; col++) {
-          // value may overflow(wrap over), but its expected behavior.
-          b += dst[stride * row + spp * col + c];
-          dst[stride * row + spp * col + c] =
-              static_cast<unsigned char>(b & 0xFF);
-        }
-      }
-    }
-    return true;
-  } else {
-    // TODO
-    return false;
-  }
-}
-
-static bool DecompressZIPedTile(const StreamReader& sr, unsigned char* dst_data,
-                                int dst_width, const DNGImage& image_info,
-                                std::string* err) {
-  unsigned int tiff_h = 0, tiff_w = 0;
-  int offset = 0;
-
-  (void)dst_data;
-  (void)dst_width;
-
-#ifdef TINY_DNG_LOADER_PROFILING
-  auto start_t = std::chrono::system_clock::now();
-#endif
-
-  TINY_DNG_DPRINTF("tile_offset = %d\n", int(image_info.tile_offset));
-
-  if ((image_info.tile_width > 0) && (image_info.tile_length > 0)) {
-    // Assume ZIP is stored in tiled format.
-    //TINY_DNG_ASSERT(image_info.tile_width > 0, "Invalid tile width.");
-    //TINY_DNG_ASSERT(image_info.tile_length > 0, "Invalid tile length.");
-
-    // <-       image width(skip len)           ->
-    // +-----------------------------------------+
-    // |                                         |
-    // |              <- tile w  ->              |
-    // |              +-----------+              |
-    // |              |           | \            |
-    // |              |           | |            |
-    // |              |           | | tile h     |
-    // |              |           | |            |
-    // |              |           | /            |
-    // |              +-----------+              |
-    // |                                         |
-    // |                                         |
-    // +-----------------------------------------+
-
-    TINY_DNG_DPRINTF("tile = %d, %d\n", image_info.tile_width,
-                     image_info.tile_length);
-    TINY_DNG_DPRINTF("w, h = %d, %d\n", image_info.width, image_info.height);
-
-    // Currently we only support tile data for tile.length == tiff.height.
-    // assert(image_info.tile_length == image_info.height);
-
-    size_t column_step = 0; // debug
-    (void)column_step;
-
-    while (tiff_h < static_cast<unsigned int>(image_info.height)) {
-      TINY_DNG_DPRINTF("sr tell = %d\n", int(sr.tell()));
-
-      if ((image_info.width <= image_info.tile_width) &&
-          (image_info.height <= image_info.tile_length)) {
-        // Only 1 tile in the image and tile size is larger than image size.
-        // Use image_info.tile_offset
-        // FIXME(syoyo): Record tag len in somewhere and lookup it to count the
-        // number of tiles in the image.
-        offset = int(image_info.tile_offset);
-      } else {
-        // Read offset to data location.
-        if (!sr.read4(&offset)) {
-          if (err) {
-            (*err) +=
-                "Failed to read offset to image data location in "
-                "DecompressZip.\n";
-          }
-          return false;
-        }
-        TINY_DNG_DPRINTF("offt = %d\n", offset);
-      }
-
-      size_t input_len = sr.size() - static_cast<size_t>(offset);
-      unsigned long uncompressed_size =
-          static_cast<unsigned long>(
-              image_info.samples_per_pixel * image_info.tile_width *
-              image_info.tile_length * image_info.bits_per_sample) /
-          static_cast<unsigned long>(8);
-
-      std::vector<uint8_t> tmp_buf;
-      tmp_buf.resize(uncompressed_size);
-
-      if (!DecompressZIP(tmp_buf.data(), &uncompressed_size, sr.data() + offset,
-                         static_cast<unsigned long>(input_len), err)) {
-        if (err) {
-          (*err) += "Failed to decode ZIP data.\n";
-        }
-        return false;
-      }
-
-      if (!UnpredictImageU8(tmp_buf, image_info.predictor,
-                            size_t(image_info.tile_width),
-                            size_t(image_info.tile_length),
-                            size_t(image_info.samples_per_pixel))) {
-        if (err) {
-          (*err) += "Failed to unpredict ZIP-ed tile image.\n";
-        }
-        return false;
-      }
-
-      // Copy to dest buffer.
-      // NOTE: For some DNG file, tiled image may exceed the extent of target
-      // image resolution.
-      const size_t spp = size_t(image_info.samples_per_pixel);
-
-      for (unsigned int y = 0;
-           y < static_cast<unsigned int>(image_info.tile_length); y++) {
-        unsigned int y_offset = y + tiff_h;
-        if (y_offset >= static_cast<unsigned int>(image_info.height)) {
-          continue;
-        }
-
-        size_t dst_offset =
-            tiff_w + static_cast<unsigned int>(dst_width) * y_offset;
-
-        size_t x_len = static_cast<size_t>(image_info.tile_width);
-        if ((tiff_w + static_cast<unsigned int>(image_info.tile_width)) >=
-            static_cast<unsigned int>(dst_width)) {
-          x_len = static_cast<size_t>(dst_width) - tiff_w;
-        }
-
-        for (size_t x = 0; x < x_len; x++) {
-          for (size_t c = 0; c < spp; c++) {
-            dst_data[spp * (dst_offset + x) + c] =
-                tmp_buf[spp * (y * static_cast<size_t>(image_info.tile_width) +
-                               x) +
-                        c];
-          }
-        }
-      }
-
-      tiff_w += static_cast<unsigned int>(image_info.tile_width);
-      column_step++;
-      // TINY_DNG_DPRINTF("col = %d, tiff_w = %d / %d\n", column_step, tiff_w,
-      // image_info.width);
-      if (tiff_w >= static_cast<unsigned int>(image_info.width)) {
-        // tiff_h += static_cast<unsigned int>(image_info.tile_length);
-        tiff_h += static_cast<unsigned int>(image_info.tile_length);
-        // TINY_DNG_DPRINTF("tiff_h = %d\n", tiff_h);
-        tiff_w = 0;
-        column_step = 0;
-      }
-    }
-  } else {
-    // Assume ZIP data is not stored in tiled format.
-
-    TINY_DNG_DPRINTF("width = %d", int(image_info.width));
-    TINY_DNG_DPRINTF("height = %d", int(image_info.height));
-
-    TINY_DNG_CHECK_AND_RETURN(image_info.offset > 0, "Invalid ZIPed data offset.", err);
-    offset = static_cast<int>(image_info.offset);
-
-    size_t input_len = sr.size() - static_cast<size_t>(offset);
-    unsigned long uncompressed_size =
-        static_cast<unsigned long>(image_info.samples_per_pixel *
-                                   image_info.width * image_info.height *
-                                   image_info.bits_per_sample) /
-        static_cast<unsigned long>(8);
-
-    std::vector<uint8_t> tmp_buf;
-    tmp_buf.resize(uncompressed_size);
-
-    if (!DecompressZIP(tmp_buf.data(), &uncompressed_size, sr.data() + offset,
-                       static_cast<unsigned long>(input_len), err)) {
-      if (err) {
-        (*err) += "Failed to decode non-tiled ZIP data.\n";
-      }
-      return false;
-    }
-
-    if (!UnpredictImageU8(tmp_buf, image_info.predictor,
-                          size_t(image_info.tile_width),
-                          size_t(image_info.tile_length),
-                          size_t(image_info.samples_per_pixel))) {
-      if (err) {
-        (*err) += "Failed to unpredict ZIP-ed tile image.\n";
-      }
-      return false;
-    }
-
-    memcpy(dst_data, tmp_buf.data(), tmp_buf.size());
-  }
-
-#ifdef TINY_DNG_LOADER_PROFILING
-  auto end_t = std::chrono::system_clock::now();
-  auto ms =
-      std::chrono::duration_cast<std::chrono::milliseconds>(end_t - start_t);
-
-  std::cout << "DecompressZIP : " << ms.count() << " [ms]" << std::endl;
-#endif
-
-  return true;
-}
-#endif
-
-// Decompress LosslesJPEG adta.
-static bool DecompressLosslessJPEG(const StreamReader& sr,
-                                   unsigned short* dst_data, int dst_width,
-                                   const DNGImage& image_info, int* ljbits_out,
-                                   std::string* err) {
-  unsigned int tiff_h = 0, tiff_w = 0;
-  int offset = 0;
-
-#ifdef TINY_DNG_LOADER_PROFILING
-  auto start_t = std::chrono::system_clock::now();
-#endif
-
-  TINY_DNG_DPRINTF("tile_width %d, tile_length %d\n", image_info.tile_width,
-                   image_info.tile_length);
-
-  if ((image_info.tile_width > 0) && (image_info.tile_length > 0)) {
-    // Assume Lossless JPEG data is stored in tiled format.
-    if (image_info.tile_width <= 0) {
-      if (err) {
-        (*err) += "Invalid tile width.\n";
-      }
-      return false;
-    }
-    if (image_info.tile_length <= 0) {
-      if (err) {
-        (*err) += "Invalid tile length.\n";
-      }
-      return false;
-    }
-    //TINY_DNG_ASSERT(image_info.tile_width > 0, "Invalid tile width.");
-    //TINY_DNG_ASSERT(image_info.tile_length > 0, "Invalid tile length.");
-
-    // <-       image width(skip len)           ->
-    // +-----------------------------------------+
-    // |                                         |
-    // |              <- tile w  ->              |
-    // |              +-----------+              |
-    // |              |           | \            |
-    // |              |           | |            |
-    // |              |           | | tile h     |
-    // |              |           | |            |
-    // |              |           | /            |
-    // |              +-----------+              |
-    // |                                         |
-    // |                                         |
-    // +-----------------------------------------+
-
-    // TINY_DNG_DPRINTF("tile = %d, %d\n", image_info.tile_width,
-    // image_info.tile_length);
-
-    // Currently we only support tile data for tile.length == tiff.height.
-    // assert(image_info.tile_length == image_info.height);
-
-    size_t column_step = 0; // debug
-    (void)column_step;
-
-    while (tiff_h < static_cast<unsigned int>(image_info.height)) {
-      // Read offset to JPEG data location.
-      if (!sr.read4(&offset)) {
-        if (err) {
-          (*err) +=
-              "Failed to read offset to JPEG data location in "
-              "DecompressLosslessJPEG.\n";
-        }
-        return false;
-      }
-      TINY_DNG_DPRINTF("tile offt = %d\n", offset);
-
-      int lj_width = 0;
-      int lj_height = 0;
-      int lj_bits = 0;
-
-      lj92 ljp;
-
-      size_t input_len = sr.size() - static_cast<size_t>(offset);
-
-      // @fixme { Parse LJPEG header first and set exact compressed LJPEG data
-      // length to `data_len` arg. }
-      int ret =
-          lj92_open(&ljp, reinterpret_cast<const uint8_t*>(sr.data() + offset),
-                    /* data_len */ static_cast<int>(input_len), &lj_width,
-                    &lj_height, &lj_bits);
-      TINY_DNG_DPRINTF("ret = %d\n", ret);
-      TINY_DNG_CHECK_AND_RETURN(ret == LJ92_ERROR_NONE, "Error opening JPEG stream.", err);
-
-      TINY_DNG_DPRINTF("lj %d, %d, %d\n", lj_width, lj_height, lj_bits);
-      TINY_DNG_DPRINTF("ljp x %d, y %d, c %d\n", ljp->x, ljp->y,
-      ljp->components);
-      TINY_DNG_DPRINTF("tile width = %d\n", image_info.tile_width);
-      TINY_DNG_DPRINTF("tile height = %d\n", image_info.tile_length);
-      TINY_DNG_DPRINTF("col = %d, tiff_w = %d / %d\n", int(column_step), tiff_w,
-      image_info.width);
-
-      TINY_DNG_CHECK_AND_RETURN(lj_width <= image_info.tile_width, "Unexpected JPEG tile width size.", err);
-      TINY_DNG_CHECK_AND_RETURN(lj_height <= image_info.tile_length, "Unexpected JPEG tile length size.", err);
-
-      //TINY_DNG_ASSERT((lj_width * lj_height) ==
-      //                    image_info.tile_width * image_info.tile_length,
-      //                "Unexpected JPEG tile size.");
-
-      TINY_DNG_DPRINTF("lj.components %d, samples_per_pixel %d\n", ljp->components, image_info.samples_per_pixel);
-      //TINY_DNG_ASSERT(ljp->components == image_info.samples_per_pixel,
-      //                "# of color channels does not match.");
-
-      // int write_length = image_info.tile_width;
-      // int skip_length = dst_width - image_info.tile_width;
-      // TINY_DNG_DPRINTF("write_len = %d, skip_len = %d\n", write_length,
-      // skip_length);
-
-      // size_t dst_offset =
-      //    column_step * static_cast<size_t>(image_info.tile_width) +
-      //    static_cast<unsigned int>(dst_width) * tiff_h;
-
-      // Decode into temporary buffer.
-
-      std::vector<uint16_t> tmpbuf;
-      tmpbuf.resize(
-          static_cast<size_t>(lj_width * lj_height * ljp->components));
-
-      // TODO: ljp->components > image_info.samples_per_pixel
-      ret = lj92_decode(ljp, tmpbuf.data(), image_info.tile_width, 0, NULL, 0);
-      // ret = lj92_decode(ljp, tmpbuf.data(), write_length, skip_length, NULL,
-      // 0);
-      TINY_DNG_CHECK_AND_RETURN(ret == LJ92_ERROR_NONE, "Error decoding JPEG stream.", err);
-      // ret = lj92_decode(ljp, dst_data + dst_offset, write_length,
-      // skip_length,
-      //                  NULL, 0);
-
-      // Copy to dest buffer.
-      // NOTE: For some DNG file, tiled image may exceed the extent of target
-      // image resolution.
-
-#if 0  // TODO: remove
-      for (unsigned int y = 0;
-           y < static_cast<unsigned int>(image_info.tile_length); y++) {
-        unsigned int y_offset = y + tiff_h;
-        if (y_offset >= static_cast<unsigned int>(image_info.height)) {
-          continue;
-        }
-
-        size_t dst_offset =
-            tiff_w + static_cast<unsigned int>(dst_width) * y_offset;
-
-        size_t x_len = static_cast<size_t>(image_info.tile_width);
-        if ((tiff_w + static_cast<unsigned int>(image_info.tile_width)) >=
-            static_cast<unsigned int>(dst_width)) {
-          x_len = static_cast<size_t>(dst_width) - tiff_w;
-        }
-        for (size_t x = 0; x < x_len; x++) {
-          dst_data[dst_offset + x] =
-              tmpbuf[y * static_cast<size_t>(image_info.tile_width) + x];
-        }
-      }
-#endif
-
-      const size_t spp = size_t(image_info.samples_per_pixel);
-
-      // const size_t tile_size =
-      //    size_t(image_info.tile_width) * size_t(image_info.tile_length);
-      for (unsigned int y = 0;
-           y < static_cast<unsigned int>(image_info.tile_length); y++) {
-        unsigned int y_offset = y + tiff_h;
-        if (y_offset >= static_cast<unsigned int>(image_info.height)) {
-          continue;
-        }
-
-        size_t dst_offset =
-            tiff_w + static_cast<unsigned int>(dst_width) * y_offset;
-
-        size_t x_len = static_cast<size_t>(image_info.tile_width);
-        if ((tiff_w + static_cast<unsigned int>(image_info.tile_width)) >=
-            static_cast<unsigned int>(dst_width)) {
-          x_len = static_cast<size_t>(dst_width) - tiff_w;
-        }
-
-        // Decoded ljpeg data is already channel first(RGBRGBRGB...)
-        for (size_t x = 0; x < x_len; x++) {
-          for (size_t c = 0; c < spp; c++) {
-            dst_data[spp * (dst_offset + x) + c] =
-                tmpbuf[spp * (y * static_cast<size_t>(image_info.tile_width) +
-                              x) +
-                       c];
-          }
-        }
-      }
-
-      TINY_DNG_CHECK_AND_RETURN(ret == LJ92_ERROR_NONE,
-                      "Error opening JPEG stream.", err);  // @fixme: redundant?
-
-      if (ljbits_out && (lj_bits > 0)) {
-        // Assume all tiles have same lj_bits value.
-        (*ljbits_out) = lj_bits;
-      }
-
-      lj92_close(ljp);
-
-      tiff_w += static_cast<unsigned int>(image_info.tile_width);
-      column_step++;
-      // TINY_DNG_DPRINTF("col = %d, tiff_w = %d / %d\n", column_step, tiff_w,
-      // image_info.width);
-      if (tiff_w >= static_cast<unsigned int>(image_info.width)) {
-        // tiff_h += static_cast<unsigned int>(image_info.tile_length);
-        tiff_h += static_cast<unsigned int>(image_info.tile_length);
-        // TINY_DNG_DPRINTF("tiff_h = %d\n", tiff_h);
-        tiff_w = 0;
-        column_step = 0;
-      }
-    }
-  } else {
-    // Assume LJPEG data is not stored in tiled format.
-
-    // Read offset to JPEG data location.
-    // offset = static_cast<int>(Read4(fp, swap_endian));
-
-    if (image_info.offset <= 0) {
-      TINY_DNG_ERROR_AND_RETURN("Invalid JPEG data offset.", err);
-    }
-
-    offset = static_cast<int>(image_info.offset);
-
-    TINY_DNG_DPRINTF("LJPEG offset %d\n", offset);
-
-    int lj_width = 0;
-    int lj_height = 0;
-    int lj_bits = 0;
-    lj92 ljp;
-
-    size_t input_len = sr.size() - static_cast<size_t>(offset);
-
-    // @fixme { Parse LJPEG header first and set exact compressed LJPEG data
-    // length to `data_len` arg. }
-    int ret =
-        lj92_open(&ljp, reinterpret_cast<const uint8_t*>(sr.data() + offset),
-                  /* data_len */ static_cast<int>(input_len), &lj_width,
-                  &lj_height, &lj_bits);
-
-    // TINY_DNG_DPRINTF("ret = %d\n", ret);
-    if (ret != LJ92_ERROR_NONE) {
-      TINY_DNG_ERROR_AND_RETURN("Error opening JPEG stream.", err);
-    }
-
-    // TINY_DNG_DPRINTF("lj %d, %d, %d\n", lj_width, lj_height, lj_bits);
-
-    int write_length = image_info.width;
-    int skip_length = 0;
-
-    ret = lj92_decode(ljp, dst_data, write_length, skip_length, NULL, 0);
-    // TINY_DNG_DPRINTF("ret = %d\n", ret);
-
-    if (ret != LJ92_ERROR_NONE) {
-      TINY_DNG_ERROR_AND_RETURN("Error decoding JPEG stream.", err);
-    }
-
-    lj92_close(ljp);
-
-    if (ljbits_out && (lj_bits > 0)) {
-      (*ljbits_out) = lj_bits;
-    }
-  }
-
-#ifdef TINY_DNG_LOADER_PROFILING
-  auto end_t = std::chrono::system_clock::now();
-  auto ms =
-      std::chrono::duration_cast<std::chrono::milliseconds>(end_t - start_t);
-
-  std::cout << "DecompressLosslessJPEG : " << ms.count() << " [ms]"
-            << std::endl;
-#endif
-
-  return true;
-}
-
-// Currently we only support parsing GainMap
-static bool ParseOpcodeList(unsigned short tag, const uint8_t *data, size_t dataSize,
-  std::vector<GainMap> *gainmaps_out)
-{
-  const size_t kMaxSize = 1024*1024*512;
-
-  // OpCode data is always store in big-endian byte order.
-  // First 32bit uint: The number of opcodes.
-  // For each opcode:
-  //   32bit uint for OpCodeID
-  //   32bit uint for DNG version
-  //   32bit uint for various flag bits.
-  //   32bit uint for the number of bytes of opcode data.
-  //
-  // Value range of processed Image data after OpCode processing(not implemented in TinyDNG)
-  //   Opcode1 : 0 to 2^32 - 1
-  //   Opcode2 : 0 to 2^16 - 1
-  //   Opcode3 : 0.0 to 1.0
-
-  // TODO: Clip image data range according with `tag`
-  (void)tag;
-
-  if (dataSize <= (4 * 5)) {
-    // Too small
-    return false;
-  }
-
-  bool swap_endian = !IsBigEndian();
-  StreamReader sr(data, dataSize, swap_endian);
-
-  uint32_t num_opcodes = 0;
-
-  if (!sr.read4(&num_opcodes)) {
-    return false;
-  }
-
-  const size_t kMaxNumOpcodes = 16;
-  if (num_opcodes > kMaxNumOpcodes) {
-    // too many opcodes.
-    return false;
-  }
-
-  //TINY_DNG_DPRINTF("# of opcodes = %d\n", num_opcodes);
-
-  for (size_t i = 0; i < num_opcodes; i++) {
-    uint32_t opcode_id = 0;
-    uint32_t dng_version = 0;
-    uint32_t flags = 0;
-    uint32_t num_bytes = 0;
-
-    if (!sr.read4(&opcode_id)) {
-      return false;
-    }
-    if (!sr.read4(&dng_version)) {
-      return false;
-    }
-    if (!sr.read4(&flags)) {
-      return false;
-    }
-    if (!sr.read4(&num_bytes)) {
-      return false;
-    }
-
-    TINY_DNG_DPRINTF("opcode %d, dng ver %d, flags %d, num_bytes %d\n", opcode_id, dng_version, flags, num_bytes);
-
-    if (num_bytes < 4) {
-      return false;
-    }
-
-    if (opcode_id == OPCODE_LIST_GAIN_MAP) {
-      const size_t kMaxItems = 1024*1024;
-
-      uint32_t saved_loc = uint32_t(sr.tell());
-
-      // Top, Left, Bottom, Right, Plane, Planes, RowPitch, ColPitch, MapPointsV, MapPointsH (LONG)
-      // MapSpacingV, MapSpacingH, MapOriginV, MapOriginH (DOUBLE)
-      // MapPlanes (LONG)
-      // For each MapPointsV
-      //   For each MapPointsH
-      //     For each MapPlanes
-      //       MapGain (FLOAT)
-
-      uint32_t top, left, bottom, right, plane, planes, row_pitch, col_pitch, map_points_v, map_points_h;
-      double map_spacing_v, map_spacing_h, map_origin_v, map_origin_h;
-      uint32_t map_planes;
-
-      if (!sr.read4(&top)) {
-        return false;
-      }
-
-      if (!sr.read4(&left)) {
-        return false;
-      }
-
-      if (!sr.read4(&bottom)) {
-        return false;
-      }
-
-      if (!sr.read4(&right)) {
-        return false;
-      }
-
-      if (!sr.read4(&plane)) {
-        return false;
-      }
-
-      if (!sr.read4(&planes)) {
-        return false;
-      }
-
-      if (!sr.read4(&row_pitch)) {
-        return false;
-      }
-
-      if (!sr.read4(&col_pitch)) {
-        return false;
-      }
-
-      if (!sr.read4(&map_points_v)) {
-        return false;
-      }
-
-      if (!sr.read4(&map_points_h)) {
-        return false;
-      }
-
-      if (!sr.read_double(&map_spacing_v)) {
-        return false;
-      }
-
-      if (!sr.read_double(&map_spacing_h)) {
-        return false;
-      }
-
-      if (!sr.read_double(&map_origin_v)) {
-        return false;
-      }
-
-      if (!sr.read_double(&map_origin_h)) {
-        return false;
-      }
-
-      if (!sr.read4(&map_planes)) {
-        return false;
-      }
-
-      size_t num_items = map_points_v * map_points_h * map_planes;
-
-      //TINY_DNG_DPRINTF("top %d, left %d, bottom %d, right %d\n", top, left, bottom, right);
-      //TINY_DNG_DPRINTF("plane %d, planes %d\n", plane, planes);
-      //TINY_DNG_DPRINTF("row_pitch %d, col_pitch %d\n", row_pitch, col_pitch);
-      //TINY_DNG_DPRINTF("map_points_v %d, map_points_h %d\n", map_points_v, map_points_h);
-      //TINY_DNG_DPRINTF("map_spacing_v %f, map_spacing_h %f\n", map_spacing_v, map_spacing_h);
-      //TINY_DNG_DPRINTF("map_origin_v %f, map_origin_h %f\n", map_origin_v, map_origin_h);
-      //TINY_DNG_DPRINTF("map_planes %d\n", map_planes);
-      //TINY_DNG_DPRINTF("num_items %d\n", int(num_items));
-
-      // Read gain values.
-
-      if (num_items > kMaxItems) {
-        return false;
-      }
-
-      std::vector<float> gainmap_pixels(num_items);
-      for (size_t k = 0; k < num_items; k++) {
-
-        if (!sr.read_float(&gainmap_pixels[k])) {
-          return false;
-        }
-
-        //TINY_DNG_DPRINTF("values = %f\n", double(gainmap_pixels[k]));
-      }
-
-      GainMap gmap;
-      gmap.idx = (tag - TAG_OPCODE_LIST1) + 1;
-      //TINY_DNG_DPRINTF("idx = %d\n", gmap.idx);
-      gmap.top = top;
-      gmap.left = left;
-      gmap.bottom = bottom;
-      gmap.right = right;
-      gmap.plane = plane;
-      gmap.planes = planes;
-      gmap.row_pitch = row_pitch;
-      gmap.col_pitch = col_pitch;
-      gmap.map_points_v = map_points_v;
-      gmap.map_points_h = map_points_h;
-      gmap.map_origin_v = map_origin_v;
-      gmap.map_origin_h = map_origin_h;
-      gmap.map_spacing_v = map_spacing_v;
-      gmap.map_spacing_h = map_spacing_h;
-      gmap.map_planes = map_planes;
-      gmap.pixels = gainmap_pixels;
-
-      gainmaps_out->push_back(gmap);
-
-      // Go to next OpCode data
-      // TODO: Ensure read bytes == num_bytes
-      if (!sr.seek_set(saved_loc + num_bytes)) {
-        return false;
-      }
-
-    } else {
-
-      if (num_bytes > kMaxSize) {
-        // Too large bytes. Guess invalid OpCode data.
-        return false;
-      }
-
-      // Unimplemented
-      std::vector<uint8_t> op_data(num_bytes);
-      if (!sr.read(num_bytes, num_bytes, reinterpret_cast<unsigned char *>(op_data.data()))) {
-        return false;
-      }
-
-    }
-
-  }
-
-  return true;
-}
-
-// Parse custom TIFF field
-// returns -1 when error.
-// returns 0 when not found.
-// returns 1 when success.
-static int ParseCustomField(const StreamReader& sr,
-                            const std::vector<FieldInfo>& field_lists,
-                            const unsigned short tag, const unsigned short type,
-                            const unsigned int len, FieldData* data,
-                            std::string* err) {
-  bool found = false;
-
-  (void)len;
-
-  // Simple linear search.
-  // TODO(syoyo): Use binary search for faster procesing.
-  for (size_t i = 0; i < field_lists.size(); i++) {
-    if ((field_lists[i].tag > TAG_NEW_SUBFILE_TYPE) &&
-        (field_lists[i].tag == tag) && (field_lists[i].type == type)) {
-      if ((type == TYPE_BYTE) || (type == TYPE_SBYTE)) {
-        data->name = field_lists[i].name;
-        data->type = static_cast<DataType>(type);
-        unsigned char val;
-        if (!sr.read1(&val)) {
-          if (err) {
-            (*err) += "Failed tp parse custom field.\n";
-          }
-          return -1;
-        }
-
-        data->data.resize(1);
-        data->data[0] = val;
-        found = true;
-      } else if ((type == TYPE_SHORT) || (type == TYPE_SSHORT)) {
-        data->name = field_lists[i].name;
-        data->type = static_cast<DataType>(type);
-        unsigned short val;
-        if (!sr.read2(&val)) {
-          if (err) {
-            (*err) += "Failed tp parse custom field.\n";
-          }
-          return -1;
-        }
-        data->data.resize(sizeof(short));
-        memcpy(data->data.data(), &val, sizeof(short));
-        found = true;
-      } else if ((type == TYPE_LONG) || (type == TYPE_SLONG) ||
-                 (type == TYPE_FLOAT)) {
-        data->name = field_lists[i].name;
-        data->type = static_cast<DataType>(type);
-        unsigned int val;
-        if (!sr.read4(&val)) {
-          if (err) {
-            (*err) += "Failed tp parse custom field.\n";
-          }
-          return -1;
-        }
-        data->data.resize(sizeof(int));
-        memcpy(data->data.data(), &val, sizeof(int));
-        found = true;
-      } else if ((type == TYPE_RATIONAL) || (type == TYPE_SRATIONAL)) {
-        data->name = field_lists[i].name;
-        data->type = static_cast<DataType>(type);
-        unsigned int num, denom;
-
-        if (!sr.read4(&num)) {
-          if (err) {
-            (*err) += "Failed tp parse custom field.\n";
-          }
-          return -1;
-        }
-
-        if (!sr.read4(&denom)) {
-          if (err) {
-            (*err) += "Failed tp parse custom field.\n";
-          }
-          return -1;
-        }
-
-        data->data.resize(sizeof(int) * 2);
-
-        // Store rational value as is.
-        memcpy(&data->data[0], &num, 4);
-        memcpy(&data->data[4], &denom, 4);
-        found = true;
-      } else {
-        // TODO(syoyo): Support more data types.
-      }
-    }
-  }
-
-  return found ? 1 : 0;
-}
-
-// Parse TIFF IFD.
-// Returns true upon success, false if failed to parse.
-static bool ParseTIFFIFD(const StreamReader& sr,
-                         const std::vector<FieldInfo>& custom_field_lists,
-                         std::vector<tinydng::DNGImage>* images,
-                         std::string* warn, std::string* err, uint32_t call_depth = 0) {
-  if (!images) {
-    if (err) {
-      (*err) += "`images` argument is null.\n";
-    }
-    return false;
-  }
-
-  tinydng::DNGImage image;
-  InitializeDNGImage(&image);
-
-  // TINY_DNG_DPRINTF("id = %d\n", idx);
-  unsigned short num_entries = 0;
-  if (!sr.read2(&num_entries)) {
-    if (err) {
-      (*err) += "Faild to read the number of entries in TIFF IFD.\n";
-    }
-    return false;
-  }
-
-  if (num_entries == 0) {
-    if (err) {
-      (*err) += "TIFF IFD cannot have 0 entries.\n";
-    }
-    return false;
-  }
-
-  TINY_DNG_DPRINTF("----------\n");
-  TINY_DNG_DPRINTF("num entries %d\n", num_entries);
-
-  // For delayed reading of strip offsets and strip byte counts.
-  long offt_strip_offset = 0;
-  long offt_strip_byte_counts = 0;
-
-  while (num_entries--) {
-    unsigned short tag, type;
-    unsigned int len;
-    unsigned int saved_offt;
-    if (!GetTIFFTag(sr, &tag, &type, &len, &saved_offt)) {
-      if (err) {
-        (*err) += "Failed to read TIFF Tag.\n";
-      }
-      return false;
-    }
-
-    TINY_DNG_DPRINTF("tag %d\n", tag);
-    TINY_DNG_DPRINTF("saved_offt %d\n", saved_offt);
-    if (tag < TAG_NEW_SUBFILE_TYPE) {
-      if (err) {
-        (*err) += "Invalid tag ID.\n";
-      }
-      return false;
-    }
-
-    // TINY_DNG_DPRINTF("tag = %d\n", tag);
-
-    switch (tag) {
-      case 2:
-      case TAG_IMAGE_WIDTH:
-      case 61441:  // ImageWidth
-        if (!sr.read_uint(type,
-                          reinterpret_cast<unsigned int*>(&(image.width)))) {
-          if (err) {
-            (*err) += "Failed to read ImageWidth Tag.\n";
-          }
-          return false;
-        }
-        // TINY_DNG_DPRINTF("[%d] width = %d\n", idx, info.width);
-        break;
-
-      case 3:
-      case TAG_IMAGE_HEIGHT:
-      case 61442:  // ImageHeight
-        if (!sr.read_uint(type,
-                          reinterpret_cast<unsigned int*>(&(image.height)))) {
-          if (err) {
-            (*err) += "Failed to read ImageHeight Tag.\n";
-          }
-          return false;
-        }
-        // TINY_DNG_DPRINTF("height = %d\n", image.height);
-        break;
-
-      case TAG_BITS_PER_SAMPLE:
-      case 61443:  // BitsPerSample
-        // image->samples = len & 7;
-        if (!sr.read_uint(type, reinterpret_cast<unsigned int*>(
-                                    &(image.bits_per_sample_original)))) {
-          if (err) {
-            (*err) += "Failed to read BitsPerSample Tag.\n";
-          }
-          return false;
-        }
-        break;
-
-      case TAG_SAMPLES_PER_PIXEL: {
-        short spp = 0;
-        if (!sr.read2(&spp)) {
-          if (err) {
-            (*err) += "Failed to read SamplesPerPixel Tag.\n";
-          }
-          return false;
-        }
-
-        if (spp < 1) {
-          if (err) {
-            (*err) += "SamplesPerPixel must be 1 ~ 4, but got " + std::to_string(spp) + ".\n";
-          }
-          return false;
-        }
-
-        if (spp > 4) {
-          if (err) {
-            (*err) += "SamplesPerPixel must be less than or equal to 4.\n";
-          }
-          return false;
-        }
-
-        image.samples_per_pixel = static_cast<int>(spp);
-
-        // TINY_DNG_DPRINTF("spp = %d\n", image.samples_per_pixel);
-      } break;
-
-      case TAG_ROWS_PER_STRIP: {
-        // The TIFF Spec says data type may be SHORT, but assume LONG for a
-        // while.
-        if (!sr.read4(&image.rows_per_strip)) {
-          if (err) {
-            (*err) += "Failed to parse RowsPerStrip Tag.\n";
-          }
-          return false;
-        }
-        // NOTE: Compute strip_per_image in later since image.height is required
-        // to compute strips_per_image.
-      } break;
-
-      case TAG_COMPRESSION:
-        if (!sr.read_uint(
-                type, reinterpret_cast<unsigned int*>(&image.compression))) {
-          if (err) {
-            (*err) += "Failed to parse Compression Tag.\n";
-          }
-          return false;
-        }
-
-        // TINY_DNG_DPRINTF("tag-compression = %d\n", image.compression);
-        break;
-
-      case TAG_STRIP_OFFSET:
-      case TAG_JPEG_IF_OFFSET:
-        offt_strip_offset = static_cast<long>(sr.tell());
-        if (!sr.read4(&image.offset)) {
-          if (err) {
-            (*err) += "Failed to parse Compression Tag.\n";
-          }
-          return false;
-        }
-        // TINY_DNG_DPRINTF("strip_offset = %d\n", image.offset);
-        break;
-
-      case TAG_JPEG_IF_BYTE_COUNT:
-        if (!sr.read4(&image.jpeg_byte_count)) {
-          if (err) {
-            (*err) = "Failed to parse JpegIfByteCount Tag.\n";
-          }
-          return false;
-        }
-        break;
-
-      case TAG_ORIENTATION:
-        if (!sr.read2(&image.orientation)) {
-          if (err) {
-            (*err) = "Failed to parse Orientation Tag.\n";
-          }
-          return false;
-        }
-        break;
-
-      case TAG_STRIP_BYTE_COUNTS:
-        offt_strip_byte_counts = static_cast<long>(sr.tell());
-        if (!sr.read4(&image.strip_byte_count)) {
-          if (err) {
-            (*err) = "Failed to parse StripByteCount Tag.\n";
-          }
-          return false;
-        }
-        TINY_DNG_DPRINTF("strip_byte_count = %d\n", image.strip_byte_count);
-        break;
-
-      case TAG_PLANAR_CONFIGURATION:
-        if (!sr.read2(&image.planar_configuration)) {
-          if (err) {
-            (*err) = "Failed to parse PlanarConfiguration Tag.\n";
-          }
-          return false;
-        }
-        break;
-
-      case TAG_PREDICTOR:
-        if (!sr.read2(&image.predictor)) {
-          if (err) {
-            (*err) = "Failed to parse Predictor Tag.\n";
-          }
-          return false;
-        }
-
-        if ((image.predictor < 1) || (image.predictor > 3)) {
-          if (err) {
-            (*err) = "Predictor value must be 1, 2 or 3.\n";
-          }
-          return false;
-        }
-        break;
-
-      case TAG_SAMPLE_FORMAT: {
-        short format;
-        if (!sr.read2(&format)) {
-          if (err) {
-            (*err) = "Failed to parse SampleFormat.\n";
-          }
-          return false;
-        }
-
-        if ((format == SAMPLEFORMAT_INT) || (format == SAMPLEFORMAT_UINT) ||
-            (format == SAMPLEFORMAT_IEEEFP)) {
-          image.sample_format = static_cast<SampleFormat>(format);
-        }
-      } break;
-
-      case TAG_SUB_IFDS:
-
-      {
-        // TINY_DNG_DPRINTF("sub_ifds = %d\n", len);
-        for (size_t k = 0; k < len; k++) {
-          unsigned int i = static_cast<unsigned int>(sr.tell());
-          unsigned int offt;
-          if (!sr.read4(&offt)) {
-            if (err) {
-              (*err) += "Failed to parse SubIFDs Tag.\n";
-            }
-            return false;
-          }
-
-          unsigned int base = 0;  // @fixme
-          if (!sr.seek_set(offt + base)) {
-            if (err) {
-              (*err) += "Failed to seek to SubIFD Tag.\n";
-            }
-            return false;
-          }
-
-          // recursive call
-          if (call_depth > kMaxRecursiveIFDParse) {
-            if (err) {
-              (*err) += "Too many nested SUB_IFDS. Input DNG seems invalid or malcious.\n";
-            }
-            return false;
-          }
-
-          if (!ParseTIFFIFD(sr, custom_field_lists, images, warn, err, call_depth+1)) {
-            if (err) {
-              (*err) += "Failed to Parse SubIFD Tag.\n";
-            }
-            return false;
-          }
-
-          if (!sr.seek_set(i + 4)) {
-            if (err) {
-              (*err) += "Failed to rewind to SubIFD Tag position.\n";
-            }
-            return false;
-          }
-        }
-        // TINY_DNG_DPRINTF("sub_ifds DONE\n");
-      }
-
-      break;
-
-      case TAG_TILE_WIDTH:
-        if (!sr.read_uint(type,
-                          reinterpret_cast<unsigned int*>(&image.tile_width))) {
-          if (err) {
-            (*err) += "Failed to parse TileWidth Tag.\n";
-          }
-        }
-        // TINY_DNG_DPRINTF("tile_width = %d\n", image.tile_width);
-        break;
-
-      case TAG_TILE_LENGTH:
-        // TINY_DNG_DPRINTF("tile_length = %d\n", image.tile_length);
-        if (!sr.read_uint(
-                type, reinterpret_cast<unsigned int*>(&image.tile_length))) {
-          if (err) {
-            (*err) += "Failed to parse TileLength Tag.\n";
-          }
-        }
-        break;
-
-      case TAG_TILE_OFFSETS:
-        if (len > 1) {
-          image.tile_offset = static_cast<unsigned int>(sr.tell());
-        } else {
-          if (!sr.read4(&image.tile_offset)) {
-            if (err) {
-              (*err) += "Failed to parse TileOffsets Tag.\n";
-            }
-          }
-        }
-        TINY_DNG_DPRINTF("tile_offt = %d\n", int(image.tile_offset));
-        break;
-
-      case TAG_TILE_BYTE_COUNTS:
-        if (len > 1) {
-          image.tile_byte_count = static_cast<unsigned int>(sr.tell());
-        } else {
-          if (!sr.read4(&image.tile_byte_count)) {
-            if (err) {
-              (*err) += "Failed to parse TileByteCounts Tag.\n";
-            }
-          }
-        }
-        break;
-
-      case TAG_CFA_PATTERN_DIM:
-        if (!sr.read2(&image.cfa_pattern_dim)) {
-          if (err) {
-            (*err) = "Failed to parse CFA PatternDim Tag.\n";
-          }
-          return false;
-        }
-        break;
-
-      case TAG_CFA_PATTERN: {
-        char buf[16];
-        size_t readLen = len;
-        if (readLen > 16) readLen = 16;
-
-        if (!sr.read(readLen, 16, reinterpret_cast<unsigned char*>(buf))) {
-          if (err) {
-            (*err) = "Failed to parse CFA Pattern Tag.\n";
-          }
-          return false;
-        }
-
-        // Only 2x2 CFAPattern is supported at the moment.
-        if (readLen == 4) {
-          image.cfa_pattern[0][0] = buf[0];
-          image.cfa_pattern[0][1] = buf[1];
-          image.cfa_pattern[1][0] = buf[2];
-          image.cfa_pattern[1][1] = buf[3];
-        } else {
-          if (err) {
-            (*err) =
-                "Length of CFA pattern other than 4(2x2) is not supported "
-                "yet.\n";
-          }
-          return false;
-        }
-      } break;
-
-      case TAG_DNG_VERSION: {
-        char data[4];
-        {
-          for (int i = 0; i < 4; i++) {
-            if (!sr.read1(&data[i])) {
-              if (err) {
-                (*err) += "Failed to parse DNGVersion Tag.\n";
-              }
-              return false;
-            }
-          }
-        }
-
-        image.version =
-            (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | data[0];
-      } break;
-
-      case TAG_CFA_PLANE_COLOR: {
-        char buf[4];
-        size_t readLen = len;
-        if (readLen > 4) readLen = 4;
-
-        if (!sr.read(readLen, readLen, reinterpret_cast<unsigned char*>(buf))) {
-          if (err) {
-            (*err) += "Failed to parse CFALayout Tag.\n";
-          }
-          return false;
-        }
-
-        for (size_t i = 0; i < readLen; i++) {
-          image.cfa_plane_color[i] = buf[i];
-        }
-      } break;
-
-      case TAG_CFA_LAYOUT: {
-        if (!sr.read4(&image.cfa_layout)) {
-          if (err) {
-            (*err) += "Failed to parse CFALayout Tag.\n";
-          }
-          return false;
-        }
-      } break;
-
-      case TAG_ACTIVE_AREA: {
-
-        for (size_t c = 0; c < 4; c++) {
-          if (!sr.read_uint(type, reinterpret_cast<unsigned int*>(
-                                      &image.active_area[c]))) {
-            if (err) {
-              (*err) += "Failed to parse ActiveArea Tag.\n";
-            }
-            return false;
-          }
-        }
-
-        image.has_active_area = true;
-
-      }  break;
-
-      case TAG_PROFILE_NAME: {
-
-        size_t readLen = len;
-        if (readLen < 1) {
-          if (err) {
-            (*err) += "Null string for ProfileName Tag.\n";
-          }
-
-          return false;
-        }
-
-        const size_t kMaxNameSize = 1024 * 1024;
-
-        if (readLen > kMaxNameSize) {
-          if (err) {
-            (*err) += "The length of ProfileName string too large.\n";
-          }
-          return false;
-        }
-
-        std::vector<uint8_t> buf(readLen);  // readLen includes null char
-        if (!sr.read(readLen, readLen,
-                     reinterpret_cast<unsigned char*>(buf.data()))) {
-          if (err) {
-            (*err) += "Failed to parse ProfileName Tag.\n";
-          }
-          return false;
-        }
-
-        // TODO: Validate UTF-8 string.
-        image.profile_name = std::string(buf.begin(), buf.end());
-
-        TINY_DNG_DPRINTF("profile_name = %s\n", image.profile_name.c_str());
-
-      }  break;
-
-      case TAG_PROFILE_TONE_CURVE: {
-
-        TINY_DNG_DPRINTF("tone curve datalen = %d\n", len);
-
-        // len = samples * 2.
-        // It seems single channel tone curve only. 
-        if ((len % 2) != 0) {
-          if (err) {
-            (*err) += "Invalid data size for ProfileToneCurve Tag.\n";
-          }
-
-          return false;
-        }
-        size_t readLen = len * sizeof(float);
-
-        const size_t kMaxSamples = 1024 * 1024;
-
-        if (len > (kMaxSamples * 2)) {
-          if (err) {
-            (*err) += "The count of ProfileToneCurve too large.\n";
-          }
-          return false;
-        }
-
-        std::vector<float> buf(len);
-
-        for (size_t k = 0; k < len; k++) {
-          if (!sr.read_float(&buf[k])) {
-            if (err) {
-              (*err) += "Failed to parse ProfileToneCurve Tag.\n";
-            }
-            return false;
-          }
-        }
-
-        // TODO: Validate curve data.
-        image.profile_tone_curve = buf;
-
-        TINY_DNG_DPRINTF("profile_tone_curve.count = %d\n", int(image.profile_tone_curve.size()));
-
-      }  break;
-
-      case TAG_PROFILE_EMBED_POLICY: {
-        int policy;
-        if (!sr.read4(&policy)) {
-          if (err) {
-            (*err) += "Failed to parse ProfileEmbedPolicy Tag.\n";
-          }
-          return false;
-        }
-
-        if ((policy < 0) || (policy > 2)) {
-          if (err) {
-            (*err) += "ProfileEmbedPolicy value must be 0, 1 or 2.\n";
-          }
-          return false;
-        }
-
-        image.profile_embed_policy = policy;
-
-      } break;
-
-      case TAG_NOISE_PROFILE: {
-
-        TINY_DNG_DPRINTF("noise profile datalen = %d\n", len);
-
-        // DOUBLE * 2.
-        // or
-        // DOUBLE * 2 * colorPlanes
-
-        // It seems single channel tone curve only. 
-        if ((len % 2) != 0) {
-          if (err) {
-            (*err) += "Invalid data size for ProfileToneCurve Tag.\n";
-          }
-
-          return false;
-        }
-
-        if (len > 2) {
-          if ((image.samples_per_pixel < 1) || (image.samples_per_pixel > 4)) {
-            if (err) {
-              (*err) += "SamplesPerPixel Tag must exist before NoiseProfile Tag.\n";
-            }
-          }
-
-          if (len != (image.samples_per_pixel * 2)) {
-            if (err) {
-              (*err) += "Counts in NoisProfile must be 2 * SamplesPerPixel.\n";
-            }
-          }
-        }
-
-        const size_t kMaxSamples = 1024;
-
-        if (len > kMaxSamples) {
-          if (err) {
-            (*err) += "The count of NoiseProfile too large.\n";
-          }
-          return false;
-        }
-
-        std::vector<double> buf(len);
-
-        for (size_t k = 0; k < len; k++) {
-          if (!sr.read_double(&buf[k])) {
-            if (err) {
-              (*err) += "Failed to parse NoiseProfile Tag.\n";
-            }
-            return false;
-          }
-        }
-    
-        // TODO: Validate noise profile data.
-        image.noise_profile = buf;
-
-        TINY_DNG_DPRINTF("noise_profile.samples = %d\n", int(image.noise_profile.size()));
-
-      }  break;
-
-      case TAG_BLACK_LEVEL: {
-        // Assume TAG_SAMPLES_PER_PIXEL is read before
-        // FIXME(syoyo): scan TAG_SAMPLES_PER_PIXEL in IFD table in advance.
-        for (int s = 0; s < image.samples_per_pixel; s++) {
-          if (!sr.read_uint(type, reinterpret_cast<unsigned int*>(
-                                      &image.black_level[s]))) {
-            if (err) {
-              (*err) += "Failed to parse BlackLevel Tag.\n";
-            }
-            return false;
-          }
-        }
-      } break;
-
-      case TAG_WHITE_LEVEL: {
-        // Assume TAG_SAMPLES_PER_PIXEL is read before
-        // FIXME(syoyo): scan TAG_SAMPLES_PER_PIXEL in IFD table in advance.
-        for (int s = 0; s < image.samples_per_pixel; s++) {
-          if (!sr.read_uint(type, reinterpret_cast<unsigned int*>(
-                                      &image.white_level[s]))) {
-            if (err) {
-              (*err) += "Failed to parse WhiteLevel Tag.\n";
-            }
-            return false;
-          }
-        }
-      } break;
-
-      case TAG_ANALOG_BALANCE:
-        // Assume RGB
-        if (!sr.read_real(type, &image.analog_balance[0])) {
-          if (err) {
-            (*err) += "Failed to parse analog balance.\n";
-          }
-          return false;
-        }
-        if (!sr.read_real(type, &image.analog_balance[1])) {
-          if (err) {
-            (*err) += "Failed to parse analog balance.\n";
-          }
-          return false;
-        }
-        if (!sr.read_real(type, &image.analog_balance[2])) {
-          if (err) {
-            (*err) += "Failed to parse analog balance.\n";
-          }
-          return false;
-        }
-
-        image.has_analog_balance = true;
-        break;
-
-      case TAG_AS_SHOT_NEUTRAL:
-        // Assume RGB
-        // TINY_DNG_DPRINTF("ty = %d\n", type);
-        for (size_t c = 0; c < 3; c++) {
-          if (!sr.read_real(type, &image.as_shot_neutral[c])) {
-            if (err) {
-              (*err) += "Failed to parse AsShotNeutral Tag.\n";
-            }
-            return false;
-          }
-        }
-
-        image.has_as_shot_neutral = true;
-        break;
-
-      case TAG_CALIBRATION_ILLUMINANT1: {
-        unsigned short val;
-        if (!sr.read2(&val)) {
-          if (err) {
-            (*err) += "Failed to parse CalibrartionIlluminant1 Tag.\n";
-          }
-          return false;
-        }
-
-        image.calibration_illuminant1 = static_cast<LightSource>(val);
-      } break;
-
-      case TAG_CALIBRATION_ILLUMINANT2: {
-        unsigned short val;
-        if (!sr.read2(&val)) {
-          if (err) {
-            (*err) += "Failed to parse CalibrartionIlluminant2 Tag.\n";
-          }
-          return false;
-        }
-        image.calibration_illuminant2 = static_cast<LightSource>(val);
-      } break;
-
-      case TAG_COLOR_MATRIX1: {
-        for (int c = 0; c < 3; c++) {
-          for (int k = 0; k < 3; k++) {
-            double val;
-            if (!sr.read_real(type, &val)) {
-              if (err) {
-                (*err) += "Failed to parse ColorMatrix1 Tag.\n";
-              }
-              return false;
-            }
-
-            image.color_matrix1[c][k] = val;
-          }
-        }
-      } break;
-
-      case TAG_COLOR_MATRIX2: {
-        for (int c = 0; c < 3; c++) {
-          for (int k = 0; k < 3; k++) {
-            double val;
-            if (!sr.read_real(type, &val)) {
-              if (err) {
-                (*err) += "Failed to parse ColorMatrix2 Tag.\n";
-              }
-              return false;
-            }
-            image.color_matrix2[c][k] = val;
-          }
-        }
-      } break;
-
-      case TAG_FORWARD_MATRIX1: {
-        for (int c = 0; c < 3; c++) {
-          for (int k = 0; k < 3; k++) {
-            double val;
-            if (!sr.read_real(type, &val)) {
-              if (err) {
-                (*err) += "Failed to parse ForwardMatrix1 Tag.\n";
-              }
-              return false;
-            }
-            image.forward_matrix1[c][k] = val;
-          }
-        }
-      } break;
-
-      case TAG_FORWARD_MATRIX2: {
-        for (int c = 0; c < 3; c++) {
-          for (int k = 0; k < 3; k++) {
-            double val;
-            if (!sr.read_real(type, &val)) {
-              if (err) {
-                (*err) += "Failed to parse ForwardMatrix2 Tag.\n";
-              }
-              return false;
-            }
-            image.forward_matrix2[c][k] = val;
-          }
-        }
-      } break;
-
-      case TAG_CAMERA_CALIBRATION1: {
-        for (int c = 0; c < 3; c++) {
-          for (int k = 0; k < 3; k++) {
-            double val;
-            if (!sr.read_real(type, &val)) {
-              if (err) {
-                (*err) += "Failed to parse CameraCalibration1 Tag.\n";
-              }
-              return false;
-            }
-            image.camera_calibration1[c][k] = val;
-          }
-        }
-      } break;
-
-      case TAG_CAMERA_CALIBRATION2: {
-        for (int c = 0; c < 3; c++) {
-          for (int k = 0; k < 3; k++) {
-            double val;
-            if (!sr.read_real(type, &val)) {
-              if (err) {
-                (*err) += "Failed to parse CameraCalibration2 Tag.\n";
-              }
-              return false;
-            }
-            image.camera_calibration2[c][k] = val;
-          }
-        }
-      } break;
-
-      case TAG_CR2_SLICES: {
-        // Assume 3 ushorts;
-        for (size_t c = 0; c < 3; c++) {
-          if (!sr.read2(&image.cr2_slices[c])) {
-            if (err) {
-              (*err) += "Failed to parse CR2Slices Tag.\n";
-            }
-            return false;
-          }
-        }
-        // TINY_DNG_DPRINTF("cr2_slices = %d, %d, %d\n",
-        //  image.cr2_slices[0],
-        //  image.cr2_slices[1],
-        //  image.cr2_slices[2]);
-      } break;
-
-      case TAG_SEMANTIC_NAME: {
-        size_t readLen = len;
-        if (readLen < 1) {
-          if (err) {
-            (*err) += "Null string for SemanticName Tag.\n";
-          }
-
-          return false;
-        }
-
-        const size_t kMaxNameSize = 1024 * 1024;
-
-        if (readLen > kMaxNameSize) {
-          if (err) {
-            (*err) += "The length of SemanticName string too large.\n";
-          }
-          return false;
-        }
-
-        std::vector<uint8_t> buf(readLen);  // readLen includes null char
-        if (!sr.read(readLen, readLen,
-                     reinterpret_cast<unsigned char*>(buf.data()))) {
-          if (err) {
-            (*err) += "Failed to parse SemanticName Tag.\n";
-          }
-          return false;
-        }
-
-        image.semantic_name = std::string(buf.begin(), buf.end());
-
-        TINY_DNG_DPRINTF("semantic_name = %s\n", image.semantic_name.c_str());
-      } break;
-
-      case TAG_OPCODE_LIST1:
-      case TAG_OPCODE_LIST2:
-      case TAG_OPCODE_LIST3: {
-        const size_t kMaxOpcodeDataSize = 1024*1024*256;
-
-        TINY_DNG_DPRINTF("opcodelist %d\n", tag);
-        size_t readLen = len;
-        if (readLen < 1) {
-          if (err) {
-            (*err) += "Empty data for OpCodeList Tag.\n";
-          }
-
-          return false;
-        }
-
-        if (readLen > kMaxOpcodeDataSize) {
-          if (err) {
-            (*err) += "OpCodeList data too large.\n";
-          }
-
-          return false;
-        }
-        std::vector<uint8_t> buf(readLen);
-        if (!sr.read(readLen, readLen,
-                     reinterpret_cast<unsigned char*>(buf.data()))) {
-          if (err) {
-            (*err) += "Failed to read OpCodeList data.\n";
-          }
-          return false;
-        }
-
-        std::vector<GainMap> *gainmaps = NULL;
-        if (tag == TAG_OPCODE_LIST1) {
-          gainmaps = &image.opcodelist1_gainmap;
-        } else if (tag == TAG_OPCODE_LIST2) {
-          gainmaps = &image.opcodelist2_gainmap;
-        } else if (tag == TAG_OPCODE_LIST3) {
-          gainmaps = &image.opcodelist3_gainmap;
-        }
-
-        if (!ParseOpcodeList(tag, buf.data(), buf.size(), gainmaps)) {
-          if (err) {
-            (*err) += "Failed to parse OpCodeList Tag.\n";
-          }
-          return false;
-        }
-
-        TINY_DNG_DPRINTF("opcodelist %d, dataLen = %d\n", tag, int(readLen));
-
-      } break;
-
-      default: {
-        FieldData data;
-        int ret = ParseCustomField(sr, custom_field_lists, tag, type, len,
-                                   &data, err);
-        if (ret == -1) {
-          return false;
-        }
-
-        if (ret > 0) {
-          image.custom_fields.push_back(data);
-        }
-        // TINY_DNG_DPRINTF("unknown or unsupported tag = %d\n", tag);
-      }
-    }
-
-    sr.seek_set(saved_offt);
-  }
-
-  if (image.rows_per_strip > 0) {
-    if (image.height == -1) {
-      if (err) {
-        (*err) = "image height tag is required to compute StripsPerImage.\n";
-      }
-      return false;
-    }
-
-    // http://www.awaresystems.be/imaging/tiff/tifftags/rowsperstrip.html
-    image.strips_per_image =
-        static_cast<int>(floor(double(image.height + image.rows_per_strip - 1) /
-                               double(image.rows_per_strip)));
-    TINY_DNG_DPRINTF("rows_per_strip = %d\n", image.samples_per_pixel);
-    TINY_DNG_DPRINTF("strips_per_image = %d\n", image.strips_per_image);
-  }
-
-  // Delayed read of strip offsets and strip byte counts
-  if (image.strips_per_image > 0) {
-    image.strip_byte_counts.clear();
-    image.strip_offsets.clear();
-
-    long curr_offt = static_cast<long>(sr.tell());
-
-    if (offt_strip_byte_counts > 0) {
-      if (!sr.seek_set(uint64_t(offt_strip_byte_counts))) {
-        if (err) {
-          (*err) = "Failed to seek.\n";
-        }
-        return false;
-      }
-
-      for (int k = 0; k < image.strips_per_image; k++) {
-        unsigned int strip_byte_count;
-        if (!sr.read4(&strip_byte_count)) {
-          if (err) {
-            (*err) += "Failed to read StripByteCount value.\n";
-          }
-          return false;
-        }
-        TINY_DNG_DPRINTF("strip_byte_counts[%d] = %u\n", k, strip_byte_count);
-        image.strip_byte_counts.push_back(strip_byte_count);
-      }
-    }
-
-    if (offt_strip_offset > 0) {
-      if (!sr.seek_set(uint64_t(offt_strip_offset))) {
-        if (err) {
-          (*err) = "Failed to seek.\n";
-        }
-        return false;
-      }
-
-      for (int k = 0; k < image.strips_per_image; k++) {
-        unsigned int strip_offset;
-        if (!sr.read4(&strip_offset)) {
-          if (err) {
-            (*err) += "Failed to read StripOffset value.";
-          }
-          return false;
-        }
-
-        TINY_DNG_DPRINTF("strip_offset[%d] = %u\n", k, strip_offset);
-        image.strip_offsets.push_back(strip_offset);
-      }
-    }
-
-    if (!sr.seek_set(uint64_t(curr_offt))) {
-      if (err) {
-        (*err) = "Failed to seek.\n";
-      }
-      return false;
-    }
-  }
-  //
-
-  // Add to images.
-  if (images->size() < kMaxImages) {
-    images->push_back(image);
-  } else {
-    if (warn) {
-      (*warn) = "Too many images in one DNG file. Skipped some images\n";
-    }
-  }
-
-  // TINY_DNG_DPRINTF("DONE ---------\n");
-
-  return true;
-}
-
-static bool ParseDNGFromMemory(const StreamReader& sr,
-                               const std::vector<FieldInfo>& custom_fields,
-                               std::vector<tinydng::DNGImage>* images,
-                               std::string* warn, std::string* err) {
-  if (!images) {
-    if (err) {
-      (*err) += "Invalid `images` argument.\n";
-    }
-    return false;
-  }
-
-  unsigned int offt;
-  if (!sr.read4(&offt)) {
-    if (err) {
-      (*err) += "Failed to read offset.\n";
-    }
-    return false;
-  }
-
-  TINY_DNG_DPRINTF("First IFD offt: %d\n", offt);
-
-  size_t count = 0;
-
-  while (offt) {
-    if (!sr.seek_set(offt)) {
-      if (err) {
-        (*err) += "Failed to seek to TIFF IFD.\n";
-      }
-      return false;
-    }
-
-    // TINY_DNG_DPRINTF("Parse TIFF IFD\n");
-    if (!ParseTIFFIFD(sr, custom_fields, images, warn, err)) {
-      break;
-    }
-    // Get next IFD offset(0 = end of file).
-    if (!sr.read4(&offt)) {
-      if (err) {
-        (*err) += "Failed to read next IDF offset.\n";
-      }
-      return false;
-    }
-
-    TINY_DNG_DPRINTF("Next IFD offset = %d\n", offt);
-
-    // Avoid infinite loop
-    count++;
-    if (count > kMaxImages) {
-      if (warn) {
-        (*warn) += "Too many IFDs. IFD offset seems invalid.\n";
-      }
-      break;
-    }
-  }
-
-  return true;
-}
-
-static bool IsBigEndian() {
-  uint32_t i = 0x01020304;
-  char c[4];
-  memcpy(c, &i, 4);
-  return (c[0] == 1);
-}
-
-// C++03 and tiff lzw port of https://github.com/glampert/compression-algorithms
-// =============================================================================
-//
-// File: lzw.hpp
-// Author: Guilherme R. Lampert
-// Created on: 17/02/16
-// Brief: LZW encoder/decoder in C++11 with varying length dictionary codes.
-//
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-namespace lzw {
-
-class Dictionary {
- public:
-  struct Entry {
-    int code;
-    int value;
-  };
-
-  // Dictionary entries 0-255 are always reserved to the byte/ASCII range.
-  int size_;
-  Entry entries_[4096];
-
-  Dictionary();
-  int findIndex(int code, int value) const;
-  bool add(int code, int value);
-  bool flush(int& codeBitsWidth);
-  void init();
-  int size() { return size_; }
-};
-
-// ========================================================
-// class Dictionary:
-// ========================================================
-
-Dictionary::Dictionary() { init(); }
-
-void Dictionary::init() {
-  // First 256 dictionary entries are reserved to the byte/ASCII
-  // range. Additional entries follow for the character sequences
-  // found in the input. Up to 4096 - 256 (MaxDictEntries - FirstCode).
-  size_ = 256;
-  for (int i = 0; i < size_; ++i) {
-    entries_[i].code = -1;
-    entries_[i].value = i;
-  }
-
-  // 256 is reserved for ClearCode, 257 is reserved for end of stream, thus
-  // FistCode starts with 258
-  size_ = 258;  // = 256 + 2
-}
-
-int Dictionary::findIndex(const int code, const int value) const {
-  if (code == -1) {
-    return value;
-  }
-
-  // Linear search for now.
-  // TODO: Worth optimizing with a proper hash-table?
-  for (int i = 0; i < size_; ++i) {
-    if (entries_[i].code == code && entries_[i].value == value) {
-      return i;
-    }
-  }
-
-  return -1;
-}
-
-bool Dictionary::add(const int code, const int value) {
-  //TINY_DNG_ASSERT(code <= size_,
-  //                "`code' must be less than or equal to dictionary size.");
-  TINY_DNG_CHECK_AND_RETURN_C(code <= size_, false);
-  if (size_ == 4096) {
-    TINY_DNG_DPRINTF("Dictionary overflowed!");
-    return false;
-  }
-
-  TINY_DNG_DPRINTF("add[%d].code = %d\n", size_, code);
-  TINY_DNG_DPRINTF("add[%d].value = %d\n", size_, value);
-  entries_[size_].code = code;
-  entries_[size_].value = value;
-  ++size_;
-  return true;
-}
-
-bool Dictionary::flush(int& codeBitsWidth) {
-  if (size_ == ((1 << codeBitsWidth) - 1)) {
-    ++codeBitsWidth;
-    TINY_DNG_DPRINTF("expand: bits %d\n", codeBitsWidth);
-    if (codeBitsWidth > 12)  // MaxDictBits
-    {
-      // Clear the dictionary (except the first 256 byte entries).
-      codeBitsWidth = 9;  // StartBits
-      size_ = 256 + 2;    // 256 is reserved for ClearCode, 257 is reserved for
-                          // end of stream, thus FistCode starts with 258
-      return true;
-    }
-  }
-  return false;
-}
-
-class BitStreamReader {
- public:
-  // No copy/assignment.
-  // BitStreamReader(const BitStreamReader &) = delete;
-  // BitStreamReader & operator = (const BitStreamReader &) = delete;
-
-  // BitStreamReader(const BitStreamWriter & bitStreamWriter);
-  BitStreamReader(const uint8_t* bitStream, int byteCount, int bitCount);
-
-  bool isEndOfStream() const;
-  bool readNextBitLE(int& bitOut);       // little endian
-  bool readNextBitBE(int& bitOut);       // big endian
-  uint64_t readBitsU64LE(int bitCount);  // little endian
-  uint64_t readBitsU64BE(int bitCount);  // big endian
-  void reset();
-
- private:
-  const uint8_t*
-      stream;  // Pointer to the external bit stream. Not owned by the reader.
-  const int
-      sizeInBytes;  // Size of the stream *in bytes*. Might include padding.
-  const int sizeInBits;  // Size of the stream *in bits*, padding *not* include.
-  int currBytePos;       // Current byte being read in the stream.
-  int nextBitPos;   // Bit position within the current byte to access next. 0 to
-                    // 7.
-  int numBitsRead;  // Total bits read from the stream so far. Never includes
-                    // byte-rounding padding.
-};
-
-// BitStreamReader::BitStreamReader(const BitStreamWriter & bitStreamWriter)
-//    : stream(bitStreamWriter.getBitStream())
-//    , sizeInBytes(bitStreamWriter.getByteCount())
-//    , sizeInBits(bitStreamWriter.getBitCount())
-//{
-//    reset();
-//}
-
-BitStreamReader::BitStreamReader(const unsigned char* bitStream,
-                                 const int byteCount, const int bitCount)
-    : stream(bitStream), sizeInBytes(byteCount), sizeInBits(bitCount) {
-  (void)sizeInBytes;
-  reset();
-}
-
-bool BitStreamReader::readNextBitLE(int& bitOut) {
-  if (numBitsRead >= sizeInBits) {
-    return false;  // We are done.
-  }
-
-  const uint32_t mask = uint32_t(1) << nextBitPos;
-  bitOut = !!(stream[currBytePos] & mask);
-  ++numBitsRead;
-
-  if (++nextBitPos == 8) {
-    nextBitPos = 0;
-    ++currBytePos;
-  }
-  return true;
-}
-
-bool BitStreamReader::readNextBitBE(int& bitOut) {
-  if (numBitsRead >= sizeInBits) {
-    return false;  // We are done.
-  }
-
-  const uint32_t mask = uint32_t(1) << (7 - nextBitPos);
-  bitOut = !!(stream[currBytePos] & mask);
-  ++numBitsRead;
-
-  if (++nextBitPos == 8) {
-    nextBitPos = 0;
-    ++currBytePos;
-  }
-  return true;
-}
-
-uint64_t BitStreamReader::readBitsU64LE(const int bitCount) {
-  //TINY_DNG_ASSERT(bitCount <= 64,
-  //                "`bitCount' must be less than or equal to 64.");
-  TINY_DNG_CHECK_AND_RETURN_C(bitCount <= 64, 0);
-
-  uint64_t num = 0;
-  for (int b = 0; b < bitCount; ++b) {
-    int bit;
-    if (!readNextBitLE(bit)) {
-      TINY_DNG_DPRINTF(
-          "LE: Failed to read bits from stream! Unexpected end.\n");
-      break;
-    }
-
-    // Based on a "Stanford bit-hack":
-    // http://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching
-    const uint64_t mask = uint64_t(1) << b;
-    num = (num & ~mask) | (uint64_t(-bit) & mask);
-  }
-
-  return num;
-}
-
-uint64_t BitStreamReader::readBitsU64BE(const int bitCount) {
-  //TINY_DNG_ASSERT(bitCount <= 64,
-  //                "`bitCount' must be less than or equal to 64.");
-  TINY_DNG_CHECK_AND_RETURN_C(bitCount <= 64, 0);
-
-  uint64_t num = 0;
-  for (int b = 0; b < bitCount; ++b) {
-    int bit;
-    if (!readNextBitBE(bit)) {
-      TINY_DNG_DPRINTF("BE: Failed to read bits from stream! Unexpected end.");
-      break;
-    }
-
-    TINY_DNG_DPRINTF("bit[%d](count %d) = %d\n", b, bitCount, bit);
-
-    // Based on a "Stanford bit-hack":
-    // http://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching
-    const uint64_t mask = uint64_t(1) << (bitCount - b - 1);
-    num = (num & ~mask) | (uint64_t(-bit) & mask);
-  }
-
-  TINY_DNG_DPRINTF("num = %d\n", int(num));
-  return num;
-}
-
-void BitStreamReader::reset() {
-  currBytePos = 0;
-  nextBitPos = 0;
-  numBitsRead = 0;
-}
-
-bool BitStreamReader::isEndOfStream() const {
-  return numBitsRead >= sizeInBits;
-}
-
-// ========================================================
-// easyDecode() and helpers:
-// ========================================================
-
-static bool outputByte(int code, unsigned char*& output, int outputSizeBytes,
-                       int& bytesDecodedSoFar) {
-  if (bytesDecodedSoFar >= outputSizeBytes) {
-    // LZW_ERROR("Decoder output buffer too small!");
-    return false;
-  }
-
-  //TINY_DNG_ASSERT(code >= 0 && code < 256, "`code' must be within [0, 255].");
-  TINY_DNG_CHECK_AND_RETURN_C(code >= 0 && code < 256, false);
-  *output++ = static_cast<unsigned char>(code);
-  ++bytesDecodedSoFar;
-  return true;
-}
-
-static bool outputSequence(const Dictionary& dict, int code,
-                           unsigned char*& output, int outputSizeBytes,
-                           int& bytesDecodedSoFar, int& firstByte) {
-  const int MaxDictEntries = 4096;
-  (void)MaxDictEntries;
-
-  // A sequence is stored backwards, so we have to write
-  // it to a temp then output the buffer in reverse.
-  int i = 0;
-  unsigned char sequence[4096];
-  do {
-    //TINY_DNG_ASSERT(i < MaxDictEntries - 1 && code >= 0,
-    //                "Invalid value for `i' or `code'.");
-    TINY_DNG_CHECK_AND_RETURN_C(i < MaxDictEntries - 1 && code >= 0, false);
-    TINY_DNG_DPRINTF("i = %d, ent[%d].value = %d\n", i, code,
-                     dict.entries_[code].value);
-    sequence[i++] = static_cast<unsigned char>(dict.entries_[code].value);
-    code = dict.entries_[code].code;
-  } while (code >= 0);
-
-  firstByte = sequence[--i];
-  for (; i >= 0; --i) {
-    if (!outputByte(sequence[i], output, outputSizeBytes, bytesDecodedSoFar)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-static int easyDecode(const unsigned char* compressed,
-                      const int compressedSizeBytes,
-                      const int compressedSizeBits, unsigned char* uncompressed,
-                      const int uncompressedSizeBytes, const bool swap_endian) {
-  const int Nil = -1;
-  const int MaxDictBits = 12;
-  const int StartBits = 9;
-
-  // TIFF specific values
-  const int ClearCode = 256;
-  const int EndOfInformation = 257;
-
-  if (compressed == NULL || uncompressed == NULL) {
-    TINY_DNG_DPRINTF("lzw::easyDecode(): Null data pointer(s)!\n");
-    return 0;
-  }
-
-  if (compressedSizeBytes <= 0 || compressedSizeBits <= 0 ||
-      uncompressedSizeBytes <= 0) {
-    TINY_DNG_DPRINTF("lzw::easyDecode(): Bad in/out sizes!n");
-    return 0;
-  }
-
-  int code = Nil;
-  int prevCode = Nil;
-  int firstByte = 0;
-  int bytesDecoded = 0;
-  int codeBitsWidth = StartBits;
-
-  // We'll reconstruct the dictionary based on the
-  // bit stream codes. Unlike Huffman encoding, we
-  // don't store the dictionary as a prefix to the data.
-  Dictionary dictionary;
-  BitStreamReader bitStream(compressed, compressedSizeBytes,
-                            compressedSizeBits);
-
-  // We check to avoid an overflow of the user buffer.
-  // If the buffer is smaller than the decompressed size,
-  // TINY_DNG_DPRINTF() is called. If that doesn't throw or
-  // terminate we break the loop and return the current
-  // decompression count.
-  while (!bitStream.isEndOfStream()) {
-    //TINY_DNG_ASSERT(
-    //    codeBitsWidth <= MaxDictBits,
-    //    "`codeBitsWidth must be less than or equal to `MaxDictBits'.");
-    TINY_DNG_CHECK_AND_RETURN_C(codeBitsWidth <= MaxDictBits, 0);
-    (void)MaxDictBits;
-
-    if (!swap_endian) {  // TODO(syoyo): Detect BE or LE depending on endianness
-                         // in stored format and host endian
-      code = static_cast<int>(bitStream.readBitsU64BE(codeBitsWidth));
-    } else {
-      code = static_cast<int>(bitStream.readBitsU64LE(codeBitsWidth));
-    }
-
-    TINY_DNG_DPRINTF("code = %d(swap_endian = %d)\n", code, swap_endian);
-
-    // if (code >= dictionary.size()) {
-    //  std::cerr << "code = " << code << "dict.size = " << dictionary.size() <<
-    //  std::endl;
-    //}
-
-    // TINY_DNG_ASSERT(code <= dictionary.size(),
-    //                "`code' must be less than or equal to dictionary size.");
-
-    if (code == EndOfInformation) {
-      TINY_DNG_DPRINTF("EoI\n");
-      break;
-    }
-
-    if (code == ClearCode) {
-      // Initialize dict.
-      dictionary.init();
-      codeBitsWidth = StartBits;
-
-      if (!swap_endian) {
-        code = static_cast<int>(bitStream.readBitsU64BE(codeBitsWidth));
-      } else {
-        code = static_cast<int>(bitStream.readBitsU64LE(codeBitsWidth));
-      }
-
-      if (code == EndOfInformation) {
-        TINY_DNG_DPRINTF("EoI\n");
-        break;
-      }
-
-      if (!outputByte(code, uncompressed, uncompressedSizeBytes,
-                      bytesDecoded)) {
-        break;
-      }
-
-      prevCode = code;
-      continue;
-    }
-
-    if (prevCode == Nil) {
-      if (!outputByte(code, uncompressed, uncompressedSizeBytes,
-                      bytesDecoded)) {
-        break;
-      }
-      firstByte = code;
-      prevCode = code;
-      continue;
-    }
-
-    if (code >= dictionary.size()) {
-      if (!outputSequence(dictionary, prevCode, uncompressed,
-                          uncompressedSizeBytes, bytesDecoded, firstByte)) {
-        break;
-      }
-      if (!outputByte(firstByte, uncompressed, uncompressedSizeBytes,
-                      bytesDecoded)) {
-        break;
-      }
-    } else {
-      if (!outputSequence(dictionary, code, uncompressed, uncompressedSizeBytes,
-                          bytesDecoded, firstByte)) {
-        break;
-      }
-    }
-
-    dictionary.add(prevCode, firstByte);
-    if (dictionary.flush(codeBitsWidth)) {
-      TINY_DNG_DPRINTF("flush\n");
-      prevCode = Nil;
-    } else {
-      prevCode = code;
-    }
-  }
-
-  return bytesDecoded;
-}
-
-// =============================================================================
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-}  // namespace lzw
-
-#if defined(_WIN32)
-namespace {
-
-static inline std::wstring UTF8ToWchar(const std::string& str) {
-  int wstr_size =
-      MultiByteToWideChar(CP_UTF8, 0, str.data(), int(str.size()), NULL, 0);
-  if (wstr_size < 0) {
-    // ??? wstr_size must be positive
-    return std::wstring();
-  }
-  std::wstring wstr(size_t(wstr_size), 0);
-  MultiByteToWideChar(CP_UTF8, 0, str.data(), int(str.size()), &wstr[0],
-                      int(wstr.size()));
-  return wstr;
-}
-
-}  // namespace
-#endif
-
-bool LoadDNG(const char* filename, std::vector<FieldInfo>& custom_fields,
-             std::vector<DNGImage>* images, std::string* warn,
-             std::string* err) {
-  (void)warn;
-  std::stringstream ss;
-
-  if (!images) {
-    if (err) {
-      (*err) += "Invalid `images` pointer.\n";
-    }
-    return false;
-  }
-
-  FILE* fp;
-#if defined(_WIN32)
-
-#if defined(_MSC_VER) || defined(__MINGW32__)  // MSVC, MinGW gcc or clang
-  errno_t errcode = _wfopen_s(&fp, UTF8ToWchar(filename).c_str(), L"rb");
-  if (errcode != 0) {
-    if (err) {
-      (*err) += "Error opening file: " + std::string(filename) + "(errno " +
-                std::to_string(errcode) + ")\n";
-    }
-    return false;
-  }
-#else
-  // Unknown compiler
-  fp = fopen(filename, "rb");
-#endif
-
-#else
-  fp = fopen(filename, "rb");
-#endif
-
-  if (!fp) {
-    ss << "File not found or cannot open file " << filename << std::endl;
-    if (err) {
-      (*err) = ss.str();
-    }
-    return false;
-  }
-
-  if (0 != fseek(fp, 0, SEEK_END)) {
-    if (err) {
-      (*err) = "Error seeking.\n";
-    }
-    return false;
-  }
-
-  size_t file_size = static_cast<size_t>(ftell(fp));
-
-  std::vector<unsigned char> whole_data;
-  {
-    whole_data.resize(file_size);
-    fseek(fp, 0, SEEK_SET);
-    size_t read_len = fread(whole_data.data(), 1, file_size, fp);
-    if (read_len != file_size) {
-      if (err) {
-        (*err) += "Unexpected file size.\n";
-      }
-      return false;
-    }
-
-    fseek(fp, 0, SEEK_SET);
-  }
-  fclose(fp);
-
-  return LoadDNGFromMemory(reinterpret_cast<const char*>(whole_data.data()),
-                           static_cast<unsigned int>(whole_data.size()),
-                           custom_fields, images, warn, err);
-}
-
-bool LoadDNGFromMemory(const char* mem, unsigned int size,
-                       std::vector<FieldInfo>& custom_fields,
-                       std::vector<DNGImage>* images, std::string* warn,
-                       std::string* err) {
-  (void)warn;
-
-  if ((mem == NULL) || (size < 32) || (!images)) {
-    if (err) {
-      (*err) = "Invalid argument. argument is null or invalid.\n";
-    }
-    return false;
-  }
-
-  bool is_dng_big_endian = false;
-
-  const unsigned short magic = *(reinterpret_cast<const unsigned short*>(mem));
-
-  if (magic == 0x4949) {
-    // might be TIFF(DNG).
-  } else if (magic == 0x4d4d) {
-    // might be TIFF(DNG, bigendian).
-    is_dng_big_endian = true;
-    TINY_DNG_DPRINTF("DNG is big endian\n");
-  } else {
-    std::stringstream ss;
-    ss << "Seems the data is not a DNG format." << std::endl;
-    if (err) {
-      (*err) = ss.str();
-    }
-
-    return false;
-  }
-
-  const bool swap_endian = (is_dng_big_endian && (!IsBigEndian()));
-  StreamReader sr(reinterpret_cast<const uint8_t*>(mem), size, swap_endian);
-
-  char header[32];
-
-  if (32 != sr.read(32, 32, reinterpret_cast<unsigned char*>(header))) {
-    if (err) {
-      (*err) = "Error reading header.\n";
-    }
-    return false;
-  }
-
-  // skip magic header
-  if (!sr.seek_set(4)) {
-    if (err) {
-      (*err) += "Failed to seek to offset 4.\n";
-    }
-    return false;
-  }
-
-  bool ret = ParseDNGFromMemory(sr, custom_fields, images, warn, err);
-
-  if (!ret) {
-    if (err) {
-      (*err) += "Failed to parse DNG data.\n";
-    }
-    return false;
-  }
-
-  //
-  // Decode image data.
-  //
-  for (size_t i = 0; i < images->size(); i++) {
-    tinydng::DNGImage* image = &((*images)[i]);
-
-    const size_t data_offset =
-        (image->offset > 0) ? image->offset : image->tile_offset;
-    TINY_DNG_DPRINTF("data_offset = %d\n", int(data_offset));
-    if ((data_offset == 0) || (data_offset > sr.size())) {
-      if (err) {
-        std::stringstream ss;
-        ss << i << "'th image data offset is zero or invalid.\n";
-        (*err) += ss.str();
-      }
-      return false;
-    }
-
-    // std::cout << "offt =\n" << image->offset << std::endl;
-    // std::cout << "tile_offt = \n" << image->tile_offset << std::endl;
-    // std::cout << "data_offset = " << data_offset << std::endl;
-
-    TINY_DNG_DPRINTF("image[%d].compression = %d\n", int(i),
-                     image->compression);
-
-    if (image->compression == COMPRESSION_NONE) {  // no compression
-
-      if (image->jpeg_byte_count > 0) {
-        // Looks like CR2 IFD#1(thumbnail jpeg image)
-        // Currently skip parsing jpeg data.
-        // TODO(syoyo): Decode jpeg data.
-        image->width = 0;
-        image->height = 0;
-
-        if (image->bits_per_sample_original < 0) {
-          // Assume 8bit
-          image->bits_per_sample_original = 8;
-        }
-
-        image->bits_per_sample = image->bits_per_sample_original;
-
-      } else {
-
-        const size_t kMaxImageSize = size_t(1024)*size_t(1024)*size_t(1024)*size_t(2); // 2GB
-
-        if (image->bits_per_sample_original <= 0) {
-          if (err) {
-            (*err) += "bits_per_sample information not found in the tag.\n";
-          }
-          return false;
-        }
-
-        image->bits_per_sample = image->bits_per_sample_original;
-        // std::cout << "sample_per_pixel " << image->samples_per_pixel << "\n";
-        // std::cout << "width " << image->width << "\n";
-        // std::cout << "height " << image->height << "\n";
-        // std::cout << "bps " << image->bits_per_sample << "\n";
-
-        if (((image->width * image->height * image->bits_per_sample) % 8) ==
-            0) {
-          // OK
-        } else {
-          if (err) {
-            (*err) += "Image size must be multiple of 8.";
-          }
-          return false;
-        }
-
-        const size_t len = size_t(image->samples_per_pixel) *
-                           size_t(image->width) * size_t(image->height) *
-                           size_t(image->bits_per_sample) / size_t(8);
-
-        if (len == 0) {
-          if (err) {
-            (*err) += "Unexpected length.";
-          }
-          return false;
-        }
-
-        if (len > kMaxImageSize) {
-          if (err) {
-            std::stringstream ss;
-            ss << "Image byte size too large. " << len << "bytes in file, but hard-limit is set to " << kMaxImageSize << " bytes.\n";
-            (*err) += ss.str();
-          }
-          return false;
-        }
-
-        image->data.resize(len);
-        if (!sr.seek_set(data_offset)) {
-          if (err) {
-            (*err) += "Failed to seek to uncompressed image data position.\n";
-          }
-          return false;
-        }
-
-        if (!sr.read(len, len, image->data.data())) {
-          if (err) {
-            (*err) += "Failed to read image data.\n";
-          }
-          return false;
-        }
-      }
-    } else if (image->compression == COMPRESSION_LZW) {  // lzw compression
-
-      if (image->bits_per_sample_original <= 0) {
-        if (err) {
-          (*err) += "bits_per_sample information not found in the tag.\n";
-        }
-        return false;
-      }
-
-      image->bits_per_sample = image->bits_per_sample_original;
-      TINY_DNG_DPRINTF("bps = %d\n", image->bits_per_sample);
-      TINY_DNG_DPRINTF("counts = %d\n", int(image->strip_byte_counts.size()));
-      TINY_DNG_DPRINTF("offsets = %d\n", int(image->strip_offsets.size()));
-
-      image->data.clear();
-
-      if ((image->strip_byte_counts.size() > 0) &&
-          (image->strip_byte_counts.size() == image->strip_offsets.size())) {
-#if (__cplusplus > 199711L) && defined(TINY_DNG_LOADER_USE_THREAD)
-
-        const int num_strips = int(image->strip_byte_counts.size());
-
-        std::vector<std::thread> workers;
-        std::atomic<size_t> strip_count(0);
-        std::mutex err_mtx_;
-
-        int num_threads = (std::max)(1, int(std::thread::hardware_concurrency()));
-        if (num_threads > num_strips) {
-          num_threads = num_strips;
-        }
-
-        bool failed = false;
-
-        const size_t dst_strip_len = static_cast<size_t>(
-            (image->samples_per_pixel * image->width * image->rows_per_strip *
-             image->bits_per_sample) /
-            8);
-
-        image->data.resize(dst_strip_len * size_t(num_strips));
-
-        for (int t = 0; t < num_threads; t++) {
-          workers.emplace_back(std::thread([&]() {
-            size_t k = 0;
-            while ((k = strip_count++) < size_t(num_strips)) {
-              std::vector<unsigned char> src(image->strip_byte_counts[k]);
-              size_t strip_offset = image->strip_offsets[k];
-              size_t strip_bytesize = image->strip_byte_counts[k];
-
-              std::vector<unsigned char> dst(dst_strip_len);
-
-              const uint8_t* src_addr =
-                  sr.map_abs_addr(strip_offset, strip_bytesize);
-
-              if (!src_addr) {
-                // Atomic update
-                {
-                  std::lock_guard<std::mutex> lock(err_mtx_);
-                  if (err) {
-                    (*err) +=
-                        "Cannot read strip_byte_counts bytes from a memory.\n";
-                  }
-                }
-
-                failed = true;
-                break;
-              }
-
-              TINY_DNG_DPRINTF("easyDecode begin\n");
-              int decoded_bytes = lzw::easyDecode(
-                  src_addr, int(strip_bytesize),
-                  int(strip_bytesize) *
-                      image
-                          ->bits_per_sample /* FIXME(syoyo): Is this correct? */
-                  ,
-                  dst.data(), int(dst_strip_len), swap_endian);
-              TINY_DNG_DPRINTF("easyDecode done\n");
-              if (decoded_bytes <= 0) {
-                {
-                  std::lock_guard<std::mutex> lock(err_mtx_);
-                  if (err) {
-                    (*err) +=
-                        "lzw decode failed.\n";
-                  }
-                }
-
-                failed = true;
-                break;
-              }
-
-              if (image->predictor == 1) {
-                // no prediction shceme
-              } else if (image->predictor == 2) {
-                // horizontal diff
-
-                const size_t stride =
-                    size_t(image->width * image->samples_per_pixel);
-                const size_t spp = size_t(image->samples_per_pixel);
-                for (size_t row = 0; row < size_t(image->rows_per_strip);
-                     row++) {
-                  for (size_t c = 0; c < size_t(image->samples_per_pixel);
-                       c++) {
-                    unsigned int b = dst[row * stride + c];
-                    for (size_t col = 1; col < size_t(image->width); col++) {
-                      // value may overflow(wrap over), but its expected
-                      // behavior.
-                      b += dst[stride * row + spp * col + c];
-                      dst[stride * row + spp * col + c] =
-                          static_cast<unsigned char>(b & 0xFF);
-                    }
-                  }
-                }
-
-              } else if (image->predictor == 3) {
-                // fp horizontal diff.
-                //TINY_DNG_ABORT("[TODO] FP horizontal differencing predictor.");
-                {
-                  std::lock_guard<std::mutex> lock(err_mtx_);
-                  if (err) {
-                    (*err) +=
-                        "[TODO] FP horizontal differencing predictor(3)\n";
-                  }
-                }
-                failed = true;
-                break;
-              } else {
-                //TINY_DNG_ABORT("Invalid predictor value.");
-                {
-                  std::lock_guard<std::mutex> lock(err_mtx_);
-                  if (err) {
-                    (*err) +=
-                        "Invalid predictor value.\n";
-                  }
-                }
-                failed = true;
-                break;
-              }
-
-              memcpy(&image->data[k * dst_strip_len], dst.data(),
-                     dst_strip_len);
-            }
-          }));
-        }
-
-        for (auto& t : workers) {
-          t.join();
-        }
-
-        // something failed in a thread.
-        if (failed) {
-          return false;
-        }
-
-#else
-        for (size_t k = 0; k < image->strip_byte_counts.size(); k++) {
-          std::vector<unsigned char> src(image->strip_byte_counts[k]);
-          if (!sr.seek_set(image->strip_offsets[k])) {
-            if (err) {
-              (*err) += "Failed to seek to strip offset.\n";
-            }
-            return false;
-          }
-
-          const uint64_t dst_len = uint64_t(image->samples_per_pixel) * uint64_t(image->width) * uint64_t(image->rows_per_strip) *
-               uint64_t(image->bits_per_sample) / 8ull;
-          if (dst_len == 0) {
-            if (err) {
-              (*err) += "Image data size is zero. Something is wrong in Image parameter:\n";
-              (*err) += "  samples_per_pixel " + std::to_string(image->samples_per_pixel) + "\n";
-              (*err) += "  width " + std::to_string(image->width) + "\n";
-              (*err) += "  rows_per_strip " + std::to_string(image->rows_per_strip) + "\n";
-              (*err) += "  bits_per_sample " + std::to_string(image->bits_per_sample) + "\n";
-            }
-            return false;
-          }
-
-          if (dst_len > (kMaxImageSizeInMB * 1024ull * 1024ull)) {
-            if (err) {
-              (*err) += "Image data size too large. Exceeds " + std::to_string(kMaxImageSizeInMB) + " MB.\n";
-            }
-            return false;
-          }
-          std::vector<unsigned char> dst(dst_len);
-
-          if (!sr.read(image->strip_byte_counts[k], image->strip_byte_counts[k],
-                       src.data())) {
-            if (err) {
-              (*err) += "Cannot read strip_byte_counts bytes from stream.\n";
-            }
-            return false;
-          }
-          TINY_DNG_DPRINTF("easyDecode begin\n");
-          int decoded_bytes = lzw::easyDecode(
-              src.data(), int(image->strip_byte_counts[k]),
-              int(image->strip_byte_counts[k]) *
-                  image->bits_per_sample /* FIXME(syoyo): Is this correct? */,
-              dst.data(), int(dst_len), swap_endian);
-          TINY_DNG_DPRINTF("easyDecode done\n");
-          if (decoded_bytes <= 0) {
-            TINY_DNG_ERROR_AND_RETURN("decoded_ bytes must be non-zero positive.", err);
-          }
-
-          if (image->predictor == 1) {
-            // no prediction shceme
-          } else if (image->predictor == 2) {
-            // horizontal diff
-
-            const size_t stride =
-                size_t(image->width * image->samples_per_pixel);
-            const size_t spp = size_t(image->samples_per_pixel);
-            for (size_t row = 0; row < size_t(image->rows_per_strip); row++) {
-              for (size_t c = 0; c < size_t(image->samples_per_pixel); c++) {
-                unsigned int b = dst[row * stride + c];
-                for (size_t col = 1; col < size_t(image->width); col++) {
-                  // value may overflow(wrap over), but its expected behavior.
-                  b += dst[stride * row + spp * col + c];
-                  dst[stride * row + spp * col + c] =
-                      static_cast<unsigned char>(b & 0xFF);
-                }
-              }
-            }
-
-          } else if (image->predictor == 3) {
-            // fp horizontal diff.
-            TINY_DNG_ERROR_AND_RETURN("[TODO} FP horizontal differencing predictor(3).", err);
-          } else {
-            TINY_DNG_ERROR_AND_RETURN("Invalid predictor value.", err);
-          }
-
-          std::copy(dst.begin(), dst.end(), std::back_inserter(image->data));
-        }
-
-#endif
-      } else {
-        TINY_DNG_ERROR_AND_RETURN("Unsupported image strip configuration.", err);
-      }
-    } else if (image->compression ==
-               COMPRESSION_OLD_JPEG) {  // old jpeg compression
-
-      // std::cout << "IFD " << i << std::endl;
-
-      // First check if JPEG is lossless JPEG
-      // TODO(syoyo): Compure conservative data_len.
-      if (sr.size() < data_offset) {
-        if (err) {
-          (*err) += "Unexpected data offset.\n";
-        }
-        return false;
-      }
-      size_t data_len = sr.size() - data_offset;
-      int lj_width = -1, lj_height = -1, lj_bits = -1, lj_components = -1;
-      if (IsLosslessJPEG(sr.data() + data_offset, static_cast<int>(data_len),
-                         &lj_width, &lj_height, &lj_bits, &lj_components)) {
-        // std::cout << "IFD " << i << " is LJPEG" << std::endl;
-        TINY_DNG_DPRINTF("IFD[%d] is LJPEG\n", int(i));
-
-        TINY_DNG_CHECK_AND_RETURN(
-            lj_width > 0 && lj_height > 0 && lj_bits > 0 && lj_components > 0,
-            "Image dimensions must be > 0.", err);
-
-        // Assume not in tiled format.
-        TINY_DNG_CHECK_AND_RETURN(image->tile_width == -1 && image->tile_length == -1,
-                        "Tiled format not supported tile size.", err);
-
-        image->height = lj_height;
-
-        // Is Canon CR2?
-        const bool is_cr2 = (image->cr2_slices[0] != 0) ? true : false;
-
-        if (is_cr2) {
-          // For CR2 RAW, slices[0] * slices[1] + slices[2] = image width
-          image->width = image->cr2_slices[0] * image->cr2_slices[1] +
-                         image->cr2_slices[2];
-        } else {
-          image->width = lj_width;
-        }
-
-        image->bits_per_sample_original = lj_bits;
-
-        // lj92 decodes data into 16bits, so modify bps.
-        image->bits_per_sample = 16;
-
-        TINY_DNG_CHECK_AND_RETURN(
-            ((image->width * image->height * image->bits_per_sample) % 8) == 0,
-            "Image size must be multiple of 8.", err);
-        const size_t len =
-            static_cast<size_t>((image->samples_per_pixel * image->width *
-                                 image->height * image->bits_per_sample) /
-                                8);
-        // std::cout << "spp = " << image->samples_per_pixel;
-        // std::cout << ", w = " << image->width << ", h = " << image->height <<
-        // ", bps = " << image->bits_per_sample << std::endl;
-        TINY_DNG_CHECK_AND_RETURN(len > 0, "Invalid length.", err);
-        image->data.resize(len);
-
-        if (sr.size() < data_offset) {
-          if (err) {
-            (*err) += "Unexpected file size or data offset.\n";
-          }
-          return false;
-        }
-
-        std::vector<unsigned short> buf;
-        buf.resize(static_cast<size_t>(image->width * image->height *
-                                       image->samples_per_pixel));
-
-        bool ok = DecompressLosslessJPEG(sr, &buf.at(0), image->width, (*image),
-                                         NULL, err);
-        if (!ok) {
-          if (err) {
-            std::stringstream ss;
-            ss << "Failed to decompress LJPEG." << std::endl;
-            (*err) = ss.str();
-          }
-          return false;
-        }
-
-        if (is_cr2) {
-          // CR2 stores image in tiled format(image slices. left to right).
-          // Convert it to scanline format.
-          int nslices = image->cr2_slices[0];
-          int slice_width = image->cr2_slices[1];
-          int slice_remainder_width = image->cr2_slices[2];
-          size_t src_offset = 0;
-
-          unsigned short* dst_ptr =
-              reinterpret_cast<unsigned short*>(image->data.data());
-
-          for (int slice = 0; slice < nslices; slice++) {
-            int x_offset = slice * slice_width;
-            for (int y = 0; y < image->height; y++) {
-              size_t dst_offset =
-                  static_cast<size_t>(y * image->width + x_offset);
-              memcpy(&dst_ptr[dst_offset], &buf[src_offset],
-                     sizeof(unsigned short) * static_cast<size_t>(slice_width));
-              src_offset += static_cast<size_t>(slice_width);
-            }
-          }
-
-          // remainder(the last slice).
-          {
-            int x_offset = nslices * slice_width;
-            for (int y = 0; y < image->height; y++) {
-              size_t dst_offset =
-                  static_cast<size_t>(y * image->width + x_offset);
-              // std::cout << "y = " << y << ", dst = " << dst_offset << ", src
-              // = " << src_offset << ", len = " << buf.size() << std::endl;
-              memcpy(&dst_ptr[dst_offset], &buf[src_offset],
-                     sizeof(unsigned short) *
-                         static_cast<size_t>(slice_remainder_width));
-              src_offset += static_cast<size_t>(slice_remainder_width);
-            }
-          }
-
-        } else {
-          memcpy(image->data.data(), static_cast<void*>(&(buf.at(0))), len);
-        }
-
-      } else {
-        // Baseline 8bit JPEG
-
-        image->bits_per_sample_original = 8;
-        image->bits_per_sample = 8;
-
-        size_t jpeg_len = static_cast<size_t>(image->jpeg_byte_count);
-        if (image->jpeg_byte_count == -1) {
-          // No jpeg datalen. Set to the size of file - offset.
-          if (sr.size() < data_offset) {
-            if (err) {
-              (*err) += "Unexpected file size or data offset.\n";
-            }
-            return false;
-          }
-          jpeg_len = sr.size() - data_offset;
-        }
-
-        if (jpeg_len == 0) {
-          if (err) {
-            (*err) += "Invalid jpeg data length.\n";
-          }
-          return false;
-        }
-
-        // Assume RGB jpeg
-        //
-        // First check the header.
-        int w_info = 0, h_info = 0, components_info = 0;
-        int is_jpeg = stbi_info_from_memory(sr.data() + data_offset,
-                                            static_cast<int>(jpeg_len), &w_info,
-                                            &h_info, &components_info);
-        if (is_jpeg != 1) {
-          if (err) {
-            (*err) += "Not a JPEG data.\n";
-          }
-          return false;
-        }
-
-        if ((components_info != 1) && (components_info != 3)) {
-          if (err) {
-            (*err) += "Unsupported channels in JPEG data.\n";
-          }
-          return false;
-        }
-
-        if ((w_info < 1) || (h_info < 1)) {
-          if (err) {
-            (*err) += "Invalid JPEG image resolution.\n";
-          }
-          return false;
-        }
-
-        int w = 0, h = 0, components = 0;
-
-        // Check if data is in valid range.
-        if ((sr.tell() + data_offset + static_cast<uint32_t>(jpeg_len)) >= sr.size()) {
-          if (err) {
-            (*err) += "Invalid JPEG image data size.\n";
-          }
-          return false;
-        }
-
-        unsigned char* decoded_image = stbi_load_from_memory(
-            sr.data() + data_offset, static_cast<uint32_t>(jpeg_len), &w, &h,
-            &components, /* desired_channels */ components_info);
-        TINY_DNG_CHECK_AND_RETURN(decoded_image, "Could not decode JPEG image.", err);
-
-        // Currently we just discard JPEG image(since JPEG image would be just a
-        // thumbnail or LDR image of RAW).
-        // TODO(syoyo): Do not discard JPEG image.
-        free(decoded_image);
-
-        // std::cout << "w = " << w << std::endl;
-        // std::cout << "h = " << w << std::endl;
-        // std::cout << "c = " << components << std::endl;
-
-        TINY_DNG_CHECK_AND_RETURN(w > 0 && h > 0, "Image dimensions must be > 0.", err);
-
-        image->width = w;
-        image->height = h;
-      }
-
-    } else if (image->compression ==
-               COMPRESSION_NEW_JPEG) {  //  new JPEG(baseline DCT JPEG or
-                                        //  lossless JPEG)
-
-      bool decoded = false;
-
-      if (image->bits_per_sample_original == 8) {
-        // bps TAG exists. probably ordinal JPEG
-
-        size_t jpeg_len = static_cast<size_t>(image->jpeg_byte_count);
-        if (image->jpeg_byte_count == -1) {
-          // No jpeg datalen. Set to the size of file - offset.
-          if (sr.size() < data_offset) {
-            if (err) {
-              (*err) += "Unexpected file size or data offset.\n";
-            }
-            return false;
-          }
-          jpeg_len = sr.size() - data_offset;
-        }
-
-        int w_info = 0, h_info = 0, components_info = 0;
-        int is_jpeg = stbi_info_from_memory(sr.data() + data_offset,
-                                            static_cast<int>(jpeg_len), &w_info,
-                                            &h_info, &components_info);
-
-        if (is_jpeg != 1) {
-          // Try to decode image as lossless JPEG.
-        } else {
-          int w = 0, h = 0, components = 0;
-          unsigned char* decoded_image = stbi_load_from_memory(
-              sr.data() + data_offset, static_cast<int>(jpeg_len), &w, &h,
-              &components, /* desired_channels */ components_info);
-
-          if (!decoded_image) {
-            // Try to decode image as lossless JPEG.
-          } else {
-            decoded = true;
-
-            image->width = w;
-            image->height = h;
-            image->samples_per_pixel = components;
-            image->bits_per_sample = image->bits_per_sample_original;
-
-            const uint64_t len = uint64_t(image->samples_per_pixel) * uint64_t(image->width) * uint64_t(image->height) * uint64_t(image->bits_per_sample / 8);
-            // For 32bit
-            if (sizeof(void *) == 4) {
-              // Use 2GB as a max
-              if (len > uint64_t((std::numeric_limits<int32_t>::max)())) {
-                if (err) {
-                  (*err) += "Decoded image size exceeds 2GB.\n";
-                }
-                return false;
-              }
-            }
-
-            if (len > (kMaxImageSizeInMB * 1024ull * 1024ull)) {
-              if (err) {
-                (*err) += "Image data size too large. Exceeds " + std::to_string(kMaxImageSizeInMB) + " MB.\n";
-              }
-              return false;
-            }
-
-            if (len == 0) {
-                if (err) {
-                  std::stringstream ss;
-                  ss << "Image size is 0. Something is wrong in Image parameter:\n";
-                  ss << "  width = " << image->width << "\n";
-                  ss << "  height = " << image->height << "\n";
-                  ss << "  spp = " << image->samples_per_pixel << "\n";
-                  ss << "  bps = " << image->bits_per_sample << "\n";
-
-                  (*err) += ss.str();
-                }
-                return false;
-            }
-
-            image->data.resize(len);
-
-            memcpy(image->data.data(), decoded_image, len);
-
-            free(decoded_image);
-          }
-        }
-      }
-
-      if (!decoded) {
-        // Try to decode as lossless JPEG.
-
-        // lj92 decodes data into 16bits, so modify bps.
-        image->bits_per_sample = 16;
-
-        // std::cout << "w = " << image->width << ", h = " << image->height <<
-        // std::endl;
-
-        TINY_DNG_DPRINTF("image.width = %d\n", image->width);
-        TINY_DNG_DPRINTF("image.height = %d\n", image->height);
-        TINY_DNG_DPRINTF("image.bps = %d\n", image->bits_per_sample);
-        TINY_DNG_DPRINTF("image.spp = %d\n", image->samples_per_pixel);
-
-        TINY_DNG_CHECK_AND_RETURN(
-            ((image->width * image->height * image->bits_per_sample) % 8) == 0,
-            "Image must be multiple of 8.", err);
-        const uint64_t len = uint64_t(image->samples_per_pixel) * uint64_t(image->width) * uint64_t(image->height) * uint64_t(image->bits_per_sample / 8);
-        // For 32bit
-        if (sizeof(void *) == 4) {
-          // Use 2GB as a max
-          if (len > uint64_t((std::numeric_limits<int32_t>::max)())) {
-            if (err) {
-              (*err) += "Decoded image size exceeds 2GB.\n";
-            }
-            return false;
-          }
-        }
-
-        if (len > (kMaxImageSizeInMB * 1024ull * 1024ull)) {
-          if (err) {
-            (*err) += "Image data size too large. Exceeds " + std::to_string(kMaxImageSizeInMB) + " MB.\n";
-          }
-          return false;
-        }
-
-        if (len == 0) {
-          if (err) {
-            (*err) += "Invalid jpeg data length.\n";
-          }
-          return false;
-        }
-        TINY_DNG_DPRINTF("image.data.size = %lld\n", len);
-
-        image->data.resize(len);
-        TINY_DNG_DPRINTF("image.data.size = %d\n", int(len));
-
-        if (sr.size() < data_offset) {
-          if (err) {
-            (*err) += "Unexpected file size or data offset.\n";
-          }
-          return false;
-        }
-
-        if (!sr.seek_set(data_offset)) {
-          if (err) {
-            (*err) += "Failed to seek to data offset(NewJpeg).\n";
-          }
-          return false;
-        }
-
-        int lj_bits = 0;
-
-        bool ok = DecompressLosslessJPEG(
-            sr, reinterpret_cast<unsigned short*>(&(image->data.at(0))),
-            image->width, (*image), &lj_bits, err);
-        if (!ok) {
-          if (err) {
-            std::stringstream ss;
-            ss << "Failed to decompress LJPEG." << std::endl;
-            (*err) = ss.str();
-          }
-          return false;
-        }
-
-        if (image->bits_per_sample_original <= 0) {
-          image->bits_per_sample_original = lj_bits;
-        }
-      }
-
-    } else if (image->compression == COMPRESSION_ZIP) {  // ZIP
-#ifdef TINY_DNG_LOADER_ENABLE_ZIP
-      TINY_DNG_CHECK_AND_RETURN(image->bits_per_sample_original > 0,
-                      "bits_per_sample information not found in the tag.", err);
-      image->bits_per_sample = image->bits_per_sample_original;
-      TINY_DNG_DPRINTF("bps = %d\n", image->bits_per_sample);
-      TINY_DNG_DPRINTF("data_offset = %d\n", int(data_offset));
-
-      TINY_DNG_DPRINTF("width %d\n", image->width);
-      TINY_DNG_DPRINTF("height %d\n", image->height);
-      TINY_DNG_DPRINTF("samples_per_pixel %d\n", image->samples_per_pixel);
-      TINY_DNG_DPRINTF("bits_per_sample %d\n", image->bits_per_sample);
-
-      const size_t len =
-          static_cast<size_t>((image->samples_per_pixel * image->width *
-                               image->height * image->bits_per_sample) /
-                              8);
-      if (len == 0) {
-        if (err) {
-          (*err) += "Invalid length. in ZIP compressed data.\n";
-        }
-        return false;
-      }
-
-      image->data.resize(len);
-
-      if (sr.size() < data_offset) {
-        if (err) {
-          (*err) +=
-              "Unexpected file size or data offset in ZIP compressed data.\n";
-        }
-        return false;
-      }
-
-      if (!sr.seek_set(data_offset)) {
-        if (err) {
-          (*err) += "Failed to seek to data offset(ZIP).\n";
-        }
-        return false;
-      }
-
-      bool ok = DecompressZIPedTile(sr, &(image->data.at(0)), image->width,
-                                    (*image), err);
-      if (!ok) {
-        if (err) {
-          std::stringstream ss;
-          ss << "Failed to decompress ZIP." << std::endl;
-          (*err) += ss.str();
-        }
-        return false;
-      }
-#else
-      if (err) {
-        std::stringstream ss;
-        ss << "ZIP compression is not supported." << std::endl;
-        (*err) = ss.str();
-      }
-#endif
-    } else if (image->compression == COMPRESSION_LOSSY) {  // lossy JPEG
-
-      // TOOD: Check bps and photometric_interpretation.
-
-      size_t jpeg_len = static_cast<size_t>(image->jpeg_byte_count);
-      if (image->jpeg_byte_count == -1) {
-        // No jpeg datalen. Set to the size of file - offset.
-        if (sr.size() < data_offset) {
-          if (err) {
-            (*err) += "Unexpected file size or data offset.\n";
-          }
-          return false;
-        }
-        jpeg_len = sr.size() - data_offset;
-      }
-
-      int w_info = 0, h_info = 0, components_info = 0;
-      int is_jpeg = stbi_info_from_memory(sr.data() + data_offset,
-                                          static_cast<int>(jpeg_len), &w_info,
-                                          &h_info, &components_info);
-
-      if (is_jpeg != 1) {
-        if (err) {
-          (*err) +=
-              "Currently We only supports Standard JPEG data for Lossy "
-              "compression(34892).\n";
-        }
-        return false;
-      }
-
-      if ((components_info != 1) && (components_info != 3)) {
-        if (err) {
-          (*err) += "Unsupported channels in JPEG data.\n";
-        }
-        return false;
-      }
-
-      if ((w_info < 1) || (h_info < 1)) {
-        if (err) {
-          (*err) += "Invalid JPEG image resolution.\n";
-        }
-        return false;
-      }
-
-      int w = 0, h = 0, components = 0;
-      unsigned char* decoded_image = stbi_load_from_memory(
-          sr.data() + data_offset, static_cast<int>(jpeg_len), &w, &h,
-          &components, /* desired_channels */ components_info);
-
-
-      if (!decoded_image) {
-        // Probably 16bit JPEG?
-        image->bits_per_sample_original = 1;  // FIXME
-        image->bits_per_sample = 1;           // FIXME
-
-        if (err) {
-          std::stringstream ss;
-          ss << "Unsupported lossy JPEG compression(16bit JPEG?)." << std::endl;
-          (*err) = ss.str();
-        }
-
-      } else {
-        image->width = w;
-        image->height = h;
-        image->samples_per_pixel = components;
-        image->bits_per_sample = 8;
-
-        const size_t len =
-            static_cast<size_t>((image->samples_per_pixel * image->width *
-                                 image->height * image->bits_per_sample) /
-                                8);
-        image->data.resize(len);
-
-        memcpy(image->data.data(), decoded_image, len);
-
-#if defined(TINY_DNG_DEBUG_SAVEIMAGE)
-        std::string output_filename = "layer-" + std::to_string(i) + ".png";
-        stbi_write_png(output_filename.c_str(), w, h, components,
-                       reinterpret_cast<const void*>(decoded_image),
-                       /* stride */ 0);
-#endif
-        free(decoded_image);
-      }
-
-    } else if (image->compression == 34713) {  // NEF lossless?
-
-      image->bits_per_sample_original = 1;  // FIXME
-      image->bits_per_sample = 1;           // FIXME
-
-      if (err) {
-        std::stringstream ss;
-        ss << "Seems a NEF RAW. This compression is not supported."
-           << std::endl;
-        (*err) = ss.str();
-      }
-    } else {
-      if (err) {
-        std::stringstream ss;
-        ss << "IFD [" << i << "] "
-           << " Unsupported compression type : " << image->compression
-           << std::endl;
-        (*err) = ss.str();
-      }
-      return false;
-    }
-  }
-
-  //
-  // Postprocessing. Calculate while_level.
-  //
-  for (size_t i = 0; i < images->size(); i++) {
-    tinydng::DNGImage* image = &((*images)[i]);
-
-    if (image->samples_per_pixel > 4) {
-      if (err) {
-        (*err) += "Cannot handle > 4 samples per pixel.\n";
-      }
-      return false;
-    }
-    for (int s = 0; s < image->samples_per_pixel; s++) {
-      if (image->white_level[s] == -1) {
-        // Set white level with (2 ** BitsPerSample) according to the DNG spec.
-        if (image->bits_per_sample_original == 0) {
-          if (err) {
-            (*err) += "Bits per sample of image has to be > 0.\n";
-          }
-          return false;
-        }
-
-        if (image->bits_per_sample_original >=
-            32) {  // workaround for 32bit floating point TIFF.
-          image->white_level[s] = -1;
-        } else {
-          if (image->bits_per_sample_original >= 32) {
-            if (err) {
-              (*err) += "Cannot handle >= 32 bits per sample.\n";
-            }
-            return false;
-          }
-
-          image->white_level[s] = (1 << image->bits_per_sample_original) - 1;
-        }
-      }
-
-      // Shrink value when TIFF tag white level is larger than (2**bps)
-      // e.g. Set to 4096 if TIFF white_balance tag has 65535 but bps == 12
-      // FIXME: Is this ok according to DNG spec?
-      if ((image->bits_per_sample_original > 0) &&
-          (image->bits_per_sample_original < 30)) {
-        if (image->white_level[s] >= (1 << image->bits_per_sample_original)) {
-          image->white_level[s] = (1 << image->bits_per_sample_original) - 1;
-        }
-      }
-    }
-  }
-
-  return ret ? true : false;
-}
-
-bool IsDNGFromMemory(const char* mem, unsigned int size, std::string* msg) {
-  if ((mem == NULL) || (size < 32)) {
-    if (msg) {
-      (*msg) = "Invalid argument. argument is null or invalid.\n";
-    }
-    return false;
-  }
-
-  const unsigned short magic = *(reinterpret_cast<const unsigned short*>(mem));
-
-  if (magic == 0x4949) {
-    // might be TIFF(DNG).
-  } else if (magic == 0x4d4d) {
-    // might be TIFF(DNG, bigendian).
-    if (msg) {
-      (*msg) = "DNG is big endian";
-    }
-  } else {
-    return false;
-  }
-
-  return true;
-}
-
-bool IsDNG(const char* filename, std::string* msg) {
-  std::stringstream ss;
-
-  FILE* fp = NULL;
-#if defined(_WIN32)
-
-#if defined(_MSC_VER) || defined(__MINGW32__)  // MSVC, MinGW gcc or clang
-  errno_t errcode = _wfopen_s(&fp, UTF8ToWchar(filename).c_str(), L"rb");
-  if (errcode != 0) {
-    if (msg) {
-      (*msg) += "Error opening file: " + std::string(filename) + "(errno " +
-                std::to_string(errcode) + ")\n";
-    }
-    return false;
-  }
-#else
-  // Unknown compiler
-  fp = fopen(filename, "rb");
-#endif
-
-#else
-  fp = fopen(filename, "rb");
-#endif
-  if (!fp) {
-    ss << "File not found or cannot open file " << filename << std::endl;
-    if (msg) {
-      (*msg) = ss.str();
-    }
-    return false;
-  }
-
-  if (0 != fseek(fp, 0, SEEK_END)) {
-    if (msg) {
-      (*msg) = "Error seeking.\n";
-    }
-    return false;
-  }
-
-  size_t file_size = static_cast<size_t>(ftell(fp));
-
-  std::vector<unsigned char> whole_data;
-  {
-    whole_data.resize(file_size);
-    fseek(fp, 0, SEEK_SET);
-    size_t read_len = fread(whole_data.data(), 1, file_size, fp);
-    if (read_len != file_size) {
-      if (msg) {
-        (*msg) += "Unexpected file size.\n";
-      }
-      return false;
-    }
-
-    fseek(fp, 0, SEEK_SET);
-  }
-  fclose(fp);
-
-  return IsDNGFromMemory(reinterpret_cast<const char*>(whole_data.data()),
-                         static_cast<unsigned int>(whole_data.size()), msg);
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-}  // namespace tinydng
-
-#endif
-
-#endif  // TINY_DNG_LOADER_H_
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_dng_writer.h b/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_dng_writer.h
deleted file mode 100644
index 27dfd8d4d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_dng_writer.h
+++ /dev/null
@@ -1,2581 +0,0 @@
-//
-// TinyDNGWriter, single header only DNG writer in C++11.
-//
-
-/*
-The MIT License (MIT)
-
-Copyright (c) 2016 - 2020 Syoyo Fujita.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#ifndef TINY_DNG_WRITER_H_
-#define TINY_DNG_WRITER_H_
-
-#include <sstream>
-#include <vector>
-#include <cstring>
-
-namespace tinydngwriter {
-
-typedef enum {
-  TIFFTAG_SUB_FILETYPE = 254,
-  TIFFTAG_IMAGE_WIDTH = 256,
-  TIFFTAG_IMAGE_LENGTH = 257,
-  TIFFTAG_BITS_PER_SAMPLE = 258,
-  TIFFTAG_COMPRESSION = 259,
-  TIFFTAG_PHOTOMETRIC = 262,
-  TIFFTAG_IMAGEDESCRIPTION = 270,
-  TIFFTAG_STRIP_OFFSET = 273,
-  TIFFTAG_SAMPLES_PER_PIXEL = 277,
-  TIFFTAG_ROWS_PER_STRIP = 278,
-  TIFFTAG_STRIP_BYTE_COUNTS = 279,
-  TIFFTAG_PLANAR_CONFIG = 284,
-  TIFFTAG_ORIENTATION = 274,
-
-  TIFFTAG_XRESOLUTION = 282,  // rational
-  TIFFTAG_YRESOLUTION = 283,  // rational
-  TIFFTAG_RESOLUTION_UNIT = 296,
-
-  TIFFTAG_SOFTWARE = 305,
-
-  TIFFTAG_SAMPLEFORMAT = 339,
-
-  // DNG extension
-  TIFFTAG_CFA_REPEAT_PATTERN_DIM = 33421,
-  TIFFTAG_CFA_PATTERN = 33422,
-
-  TIFFTAG_DNG_VERSION = 50706,
-  TIFFTAG_DNG_BACKWARD_VERSION = 50707,
-  TIFFTAG_UNIQUE_CAMERA_MODEL = 50708,
-  TIFFTAG_CHRROMA_BLUR_RADIUS = 50703,
-  TIFFTAG_BLACK_LEVEL_REPEAT_DIM = 50713,
-  TIFFTAG_BLACK_LEVEL = 50714,
-  TIFFTAG_WHITE_LEVEL = 50717,
-  TIFFTAG_COLOR_MATRIX1 = 50721,
-  TIFFTAG_COLOR_MATRIX2 = 50722,
-  TIFFTAG_CAMERA_CALIBRATION1 = 50723,
-  TIFFTAG_CAMERA_CALIBRATION2 = 50724,
-  TIFFTAG_ANALOG_BALANCE = 50727,
-  TIFFTAG_AS_SHOT_NEUTRAL = 50728,
-  TIFFTAG_AS_SHOT_WHITE_XY = 50729,
-  TIFFTAG_CALIBRATION_ILLUMINANT1 = 50778,
-  TIFFTAG_CALIBRATION_ILLUMINANT2 = 50779,
-  TIFFTAG_EXTRA_CAMERA_PROFILES = 50933,
-  TIFFTAG_PROFILE_NAME = 50936,
-  TIFFTAG_AS_SHOT_PROFILE_NAME = 50934,
-  TIFFTAG_DEFAULT_BLACK_RENDER = 51110,
-  TIFFTAG_ACTIVE_AREA = 50829,
-  TIFFTAG_FORWARD_MATRIX1 = 50964,
-  TIFFTAG_FORWARD_MATRIX2 = 50965
-} Tag;
-
-// SUBFILETYPE(bit field)
-static const int FILETYPE_REDUCEDIMAGE = 1;
-static const int FILETYPE_PAGE = 2;
-static const int FILETYPE_MASK = 4;
-
-// PLANARCONFIG
-static const int PLANARCONFIG_CONTIG = 1;
-static const int PLANARCONFIG_SEPARATE = 2;
-
-// COMPRESSION
-// TODO(syoyo) more compressin types.
-static const int COMPRESSION_NONE = 1;
-static const int COMPRESSION_NEW_JPEG = 7;
-
-// ORIENTATION
-static const int ORIENTATION_TOPLEFT = 1;
-static const int ORIENTATION_TOPRIGHT = 2;
-static const int ORIENTATION_BOTRIGHT = 3;
-static const int ORIENTATION_BOTLEFT = 4;
-static const int ORIENTATION_LEFTTOP = 5;
-static const int ORIENTATION_RIGHTTOP = 6;
-static const int ORIENTATION_RIGHTBOT = 7;
-static const int ORIENTATION_LEFTBOT = 8;
-
-// RESOLUTIONUNIT
-static const int RESUNIT_NONE = 1;
-static const int RESUNIT_INCH = 2;
-static const int RESUNIT_CENTIMETER = 2;
-
-// PHOTOMETRIC
-// TODO(syoyo): more photometric types.
-static const int PHOTOMETRIC_WHITE_IS_ZERO = 0;  // For bilevel and grayscale
-static const int PHOTOMETRIC_BLACK_IS_ZERO = 1;  // For bilevel and grayscale
-static const int PHOTOMETRIC_RGB = 2;            // Default
-static const int PHOTOMETRIC_CFA = 32803;        // DNG ext
-static const int PHOTOMETRIC_LINEARRAW = 34892;  // DNG ext
-
-// Sample format
-static const int SAMPLEFORMAT_UINT = 1;  // Default
-static const int SAMPLEFORMAT_INT = 2;
-static const int SAMPLEFORMAT_IEEEFP = 3;  // floating point
-
-struct IFDTag {
-  unsigned short tag;
-  unsigned short type;
-  unsigned int count;
-  unsigned int offset_or_value;
-};
-// 12 bytes.
-
-class DNGImage {
- public:
-  DNGImage();
-  ~DNGImage() {}
-
-  ///
-  /// Optional: Explicitly specify endian.
-  /// Must be called before calling other Set methods.
-  ///
-  void SetBigEndian(bool big_endian);
-
-  ///
-  /// Default = 0
-  ///
-  bool SetSubfileType(bool reduced_image = false, bool page = false,
-                      bool mask = false);
-
-  bool SetImageWidth(unsigned int value);
-  bool SetImageLength(unsigned int value);
-  bool SetRowsPerStrip(unsigned int value);
-  bool SetSamplesPerPixel(unsigned short value);
-  // Set bits for each samples
-  bool SetBitsPerSample(const unsigned int num_samples,
-                        const unsigned short *values);
-  bool SetPhotometric(unsigned short value);
-  bool SetPlanarConfig(unsigned short value);
-  bool SetOrientation(unsigned short value);
-  bool SetCompression(unsigned short value);
-  bool SetSampleFormat(const unsigned int num_samples,
-                       const unsigned short *values);
-  bool SetXResolution(double value);
-  bool SetYResolution(double value);
-  bool SetResolutionUnit(const unsigned short value);
-
-  ///
-  /// Set arbitrary string for image description.
-  /// Currently we limit to 1024*1024 chars at max.
-  ///
-  bool SetImageDescription(const std::string &ascii);
-
-  ///
-  /// Set arbitrary string for unique camera model name (not localized!).
-  /// Currently we limit to 1024*1024 chars at max.
-  ///
-  bool SetUniqueCameraModel(const std::string &ascii);
-
-  ///
-  /// Set software description(string).
-  /// Currently we limit to 4095 chars at max.
-  ///
-  bool SetSoftware(const std::string &ascii);
-
-  bool SetActiveArea(const unsigned int values[4]);
-
-  bool SetChromaBlurRadius(double value);
-
-  /// Specify black level per sample.
-  bool SetBlackLevel(const unsigned int num_samples, const unsigned short *values);
-
-  /// Specify black level per sample (as rational values).
-  bool SetBlackLevelRational(unsigned int num_samples, const double *values);
-
-  /// Specify white level per sample.
-  bool SetWhiteLevelRational(unsigned int num_samples, const double *values);
-
-  /// Specify analog white balance from camera for raw values.
-  bool SetAnalogBalance(const unsigned int plane_count, const double *matrix_values);
-
-  /// Specify CFA repeating pattern dimensions.
-  bool SetCFARepeatPatternDim(const unsigned short width, const unsigned short height);
-
-  /// Specify black level repeating pattern dimensions.
-  bool SetBlackLevelRepeatDim(const unsigned short width, const unsigned short height);
-
-  bool SetCalibrationIlluminant1(const unsigned short value);
-  bool SetCalibrationIlluminant2(const unsigned short value);
-
-  /// Specify DNG version.
-  bool SetDNGVersion(const unsigned char a, const unsigned char b, const unsigned char c, const unsigned char d);
-
-  /// Specify transformation matrix (XYZ to reference camera native color space values, under the first calibration illuminant).
-  bool SetColorMatrix1(const unsigned int plane_count, const double *matrix_values);
-
-  /// Specify transformation matrix (XYZ to reference camera native color space values, under the second calibration illuminant).
-  bool SetColorMatrix2(const unsigned int plane_count, const double *matrix_values);
-
-  bool SetForwardMatrix1(const unsigned int plane_count, const double *matrix_values);
-  bool SetForwardMatrix2(const unsigned int plane_count, const double *matrix_values);
-
-  bool SetCameraCalibration1(const unsigned int plane_count, const double *matrix_values);
-  bool SetCameraCalibration2(const unsigned int plane_count, const double *matrix_values);
-
-  /// Specify CFA geometric pattern (left-to-right, top-to-bottom).
-  bool SetCFAPattern(const unsigned int num_components, const unsigned char *values);
-
-  /// Specify the selected white balance at time of capture, encoded as the coordinates of a perfectly neutral color in linear reference space values.
-  bool SetAsShotNeutral(const unsigned int plane_count, const double *matrix_values);
-
-  /// Specify the the selected white balance at time of capture, encoded as x-y chromaticity coordinates.
-  bool SetAsShotWhiteXY(const double x, const double y);
-
-  /// Set image data with packing (take 16-bit values and pack them to input_bpp values).
-  bool SetImageDataPacked(const unsigned short *input_buffer, const int input_count, const unsigned int input_bpp, bool big_endian);
-
-  /// Set image data.
-  bool SetImageData(const unsigned char *data, const size_t data_len);
-
-  /// Set image data.
-  bool SetImageDataJpeg(const unsigned short *data, unsigned int width, unsigned int height, unsigned int bpp);
-
-  /// Set custom field.
-  bool SetCustomFieldLong(const unsigned short tag, const int value);
-  bool SetCustomFieldULong(const unsigned short tag, const unsigned int value);
-
-  size_t GetDataSize() const { return data_os_.str().length(); }
-
-  size_t GetStripOffset() const { return data_strip_offset_; }
-  size_t GetStripBytes() const { return data_strip_bytes_; }
-
-  /// Write aux IFD data and strip image data to stream.
-  bool WriteDataToStream(std::ostream *ofs) const;
-
-  ///
-  /// Write IFD to stream.
-  ///
-  /// @param[in] data_base_offset : Byte offset to data
-  /// @param[in] strip_offset : Byte offset to image strip data
-  ///
-  /// TODO(syoyo): Support multiple strips
-  ///
-  bool WriteIFDToStream(const unsigned int data_base_offset,
-                        const unsigned int strip_offset, std::ostream *ofs) const;
-
-  std::string Error() const { return err_; }
-
- private:
-  std::ostringstream data_os_;
-  bool swap_endian_;
-  bool dng_big_endian_;
-  unsigned short num_fields_;
-  unsigned int samples_per_pixels_;
-  std::vector<unsigned short> bits_per_samples_;
-
-  // TODO(syoyo): Support multiple strips
-  size_t data_strip_offset_{0};
-  size_t data_strip_bytes_{0};
-
-  mutable std::string err_;  // Error message
-
-  std::vector<IFDTag> ifd_tags_;
-};
-
-class DNGWriter {
- public:
-  // TODO(syoyo): Use same endian setting with DNGImage.
-  DNGWriter(bool big_endian);
-  ~DNGWriter() {}
-
-  ///
-  /// Add DNGImage.
-  /// It just retains the pointer of the image, thus
-  /// application must not free resources until `WriteToFile` has been called.
-  ///
-  bool AddImage(const DNGImage *image) {
-    images_.push_back(image);
-
-    return true;
-  }
-
-  /// Write DNG to a file.
-  /// Return error string to `err` when Write() returns false.
-  /// Returns true upon success.
-  bool WriteToFile(const char *filename, std::string *err) const;
-
- private:
-  bool swap_endian_;
-  bool dng_big_endian_;  // Endianness of DNG file.
-
-  std::vector<const DNGImage *> images_;
-};
-
-}  // namespace tinydngwriter
-
-#endif  // TINY_DNG_WRITER_H_
-
-#ifdef TINY_DNG_WRITER_IMPLEMENTATION
-
-//
-// TIFF format resources.
-//
-// http://c0de517e.blogspot.jp/2013/07/tiny-hdr-writer.html
-// http://paulbourke.net/dataformats/tiff/ and
-// http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf
-//
-
-#include <algorithm>
-#include <cassert>
-#include <cfloat>
-#include <cmath>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <limits>
-
-// Undef if you want to use builtin function for clz
-#if 0
-#ifdef _MSC_VER
-#include <intrin.h>
-#endif
-#endif
-
-
-namespace tinydngwriter {
-
-namespace detail {
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-// Begin liblj92, Lossless JPEG decode/encoder ------------------------------
-//
-// With fixes: https://github.com/ilia3101/MLV-App/pull/151
-
-/*
-lj92.c
-(c) Andrew Baldwin 2014
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-enum LJ92_ERRORS {
-  LJ92_ERROR_NONE = 0,
-  LJ92_ERROR_CORRUPT = -1,
-  LJ92_ERROR_NO_MEMORY = -2,
-  LJ92_ERROR_BAD_HANDLE = -3,
-  LJ92_ERROR_TOO_WIDE = -4
-};
-
-/*
- * Encode a grayscale image supplied as 16bit values within the given bitdepth
- * Read from tile in the image
- * Apply delinearization if given
- * Return the encoded lossless JPEG stream
- */
-int lj92_encode(uint16_t *image, int width, int height, int bitdepth,
-                int readLength, int skipLength, uint16_t *delinearize,
-                int delinearizeLength, uint8_t **encoded, int *encodedLength);
-
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-
-//#define LJ92_DEBUG
-
-/* Encoder implementation */
-
-#if 0
-uint32_t __inline clz32(uint32_t value) {
-  unsigned long leading_zero = 0;
-
-  if (_BitScanReverse(&leading_zero, value)) {
-    return 31 - leading_zero;
-  } else {
-    // Same remarks as above
-    return 32;
-  }
-}
-#endif
-
-// Very simple count leading zero implementation.
-static int clz32(unsigned int x) {
-  int n;
-  if (x == 0) return 32;
-  for (n = 0; ((x & 0x80000000) == 0); n++, x <<= 1)
-    ;
-  return n;
-}
-
-typedef struct _lje {
-  uint16_t *image;
-  int width;
-  int height;
-  int bitdepth;
-  int readLength;
-  int skipLength;
-  uint16_t *delinearize;
-  int delinearizeLength;
-  uint8_t *encoded;
-  int encodedWritten;
-  int encodedLength;
-  int hist[17];  // SSSS frequency histogram
-  int bits[17];
-  int huffval[17];
-  u16 huffenc[17];
-  u16 huffbits[17];
-  int huffsym[17];
-} lje;
-
-int frequencyScan(lje *self) {
-  // Scan through the tile using the standard type 6 prediction
-  // Need to cache the previous 2 row in target coordinates because of tiling
-  uint16_t *pixel = self->image;
-  int pixcount = self->width * self->height;
-  int scan = self->readLength;
-  uint16_t *rowcache = (uint16_t *)calloc(1, self->width * 4);
-  uint16_t *rows[2];
-  rows[0] = rowcache;
-  rows[1] = &rowcache[self->width];
-
-  int col = 0;
-  int row = 0;
-  int Px = 0;
-  int32_t diff = 0;
-  int maxval = (1 << self->bitdepth);
-  while (pixcount--) {
-    uint16_t p = *pixel;
-    if (self->delinearize) {
-      if (p >= self->delinearizeLength) {
-        free(rowcache);
-        return LJ92_ERROR_TOO_WIDE;
-      }
-      p = self->delinearize[p];
-    }
-    if (p >= maxval) {
-      free(rowcache);
-      return LJ92_ERROR_TOO_WIDE;
-    }
-    rows[1][col] = p;
-
-    if ((row == 0) && (col == 0))
-      Px = 1 << (self->bitdepth - 1);
-    else if (row == 0)
-      Px = rows[1][col - 1];
-    else if (col == 0)
-      Px = rows[0][col];
-    else
-      Px = rows[0][col] + ((rows[1][col - 1] - rows[0][col - 1]) >> 1);
-    diff = rows[1][col] - Px;
-    int ssss = 32 - clz32(abs(diff));
-    if (diff == 0) ssss = 0;
-    self->hist[ssss]++;
-    // printf("%d %d %d %d %d %d\n",col,row,p,Px,diff,ssss);
-    pixel++;
-    scan--;
-    col++;
-    if (scan == 0) {
-      pixel += self->skipLength;
-      scan = self->readLength;
-    }
-    if (col == self->width) {
-      uint16_t *tmprow = rows[1];
-      rows[1] = rows[0];
-      rows[0] = tmprow;
-      col = 0;
-      row++;
-    }
-  }
-#ifdef DEBUG
-  int sort[17];
-  for (int h = 0; h < 17; h++) {
-    sort[h] = h;
-    printf("%d:%d\n", h, self->hist[h]);
-  }
-#endif
-  free(rowcache);
-  return LJ92_ERROR_NONE;
-}
-
-void createEncodeTable(lje *self) {
-  float freq[18];
-  int codesize[18];
-  int others[18];
-
-  // Calculate frequencies
-  float totalpixels = self->width * self->height;
-  for (int i = 0; i < 17; i++) {
-    freq[i] = (float)(self->hist[i]) / totalpixels;
-#ifdef DEBUG
-    printf("%d:%f\n", i, freq[i]);
-#endif
-    codesize[i] = 0;
-    others[i] = -1;
-  }
-  codesize[17] = 0;
-  others[17] = -1;
-  freq[17] = 1.0f;
-
-  float v1f, v2f;
-  int v1, v2;
-
-  while (1) {
-    v1f = 3.0f;
-    v1 = -1;
-    for (int i = 0; i < 18; i++) {
-      if ((freq[i] <= v1f) && (freq[i] > 0.0f)) {
-        v1f = freq[i];
-        v1 = i;
-      }
-    }
-#ifdef DEBUG
-    printf("v1:%d,%f\n", v1, v1f);
-#endif
-    v2f = 3.0f;
-    v2 = -1;
-    for (int i = 0; i < 18; i++) {
-      if (i == v1) continue;
-      if ((freq[i] < v2f) && (freq[i] > 0.0f)) {
-        v2f = freq[i];
-        v2 = i;
-      }
-    }
-    if (v2 == -1) break;  // Done
-
-    freq[v1] += freq[v2];
-    freq[v2] = 0.0f;
-
-    while (1) {
-      codesize[v1]++;
-      if (others[v1] == -1) break;
-      v1 = others[v1];
-    }
-    others[v1] = v2;
-    while (1) {
-      codesize[v2]++;
-      if (others[v2] == -1) break;
-      v2 = others[v2];
-    }
-  }
-  int *bits = self->bits;
-  memset(bits, 0, sizeof(self->bits));
-  for (int i = 0; i < 18; i++) {
-    if (codesize[i] != 0) {
-      bits[codesize[i]]++;
-    }
-  }
-#ifdef DEBUG
-  for (int i = 0; i < 17; i++) {
-    printf("bits:%d,%d,%d\n", i, bits[i], codesize[i]);
-  }
-#endif
-  int *huffval = self->huffval;
-  int i = 1;
-  int k = 0;
-  int j;
-  memset(huffval, 0, sizeof(self->huffval));
-  while (i <= 32) {
-    j = 0;
-    while (j < 17) {
-      if (codesize[j] == i) {
-        huffval[k++] = j;
-      }
-      j++;
-    }
-    i++;
-  }
-#ifdef DEBUG
-  for (i = 0; i < 17; i++) {
-    printf("i=%d,huffval[i]=%x\n", i, huffval[i]);
-  }
-#endif
-  int maxbits = 16;
-  while (maxbits > 0) {
-    if (bits[maxbits]) break;
-    maxbits--;
-  }
-  u16 *huffenc = self->huffenc;
-  u16 *huffbits = self->huffbits;
-  int *huffsym = self->huffsym;
-  memset(huffenc, 0, sizeof(self->huffenc));
-  memset(huffbits, 0, sizeof(self->huffbits));
-  memset(self->huffsym, 0, sizeof(self->huffsym));
-  i = 0;
-  int hv = 0;
-  int rv = 0;
-  int vl = 0;  // i
-  // int hcode;
-  int bitsused = 1;
-  int sym = 0;
-  // printf("%04x:%x:%d:%x\n",i,huffvals[hv],bitsused,1<<(maxbits-bitsused));
-  while (i < 1 << maxbits) {
-    if (bitsused > maxbits) {
-      break;  // Done. Should never get here!
-    }
-    if (vl >= bits[bitsused]) {
-      bitsused++;
-      vl = 0;
-      continue;
-    }
-    if (rv == 1 << (maxbits - bitsused)) {
-      rv = 0;
-      vl++;
-      hv++;
-      // printf("%04x:%x:%d:%x\n",i,huffvals[hv],bitsused,1<<(maxbits-bitsused));
-      continue;
-    }
-    huffbits[sym] = bitsused;
-    huffenc[sym++] = i >> (maxbits - bitsused);
-    // printf("%d %d %d\n",i,bitsused,hcode);
-    i += (1 << (maxbits - bitsused));
-    rv = 1 << (maxbits - bitsused);
-  }
-  for (i = 0; i < 17; i++) {
-    if (huffbits[i] > 0) {
-      huffsym[huffval[i]] = i;
-    }
-#ifdef DEBUG
-    printf("huffval[%d]=%d,huffenc[%d]=%x,bits=%d\n", i, huffval[i], i,
-           huffenc[i], huffbits[i]);
-#endif
-    if (huffbits[i] > 0) {
-      huffsym[huffval[i]] = i;
-    }
-  }
-#ifdef DEBUG
-  for (i = 0; i < 17; i++) {
-    printf("huffsym[%d]=%d\n", i, huffsym[i]);
-  }
-#endif
-}
-
-void writeHeader(lje *self) {
-  int w = self->encodedWritten;
-  uint8_t *e = self->encoded;
-  e[w++] = 0xff;
-  e[w++] = 0xd8;  // SOI
-  e[w++] = 0xff;
-  e[w++] = 0xc3;  // SOF3
-  // Write SOF
-  e[w++] = 0x0;
-  e[w++] = 11;  // Lf, frame header length
-  e[w++] = self->bitdepth;
-  e[w++] = self->height >> 8;
-  e[w++] = self->height & 0xFF;
-  e[w++] = self->width >> 8;
-  e[w++] = self->width & 0xFF;
-  e[w++] = 1;     // Components
-  e[w++] = 0;     // Component ID
-  e[w++] = 0x11;  // Component X/Y
-  e[w++] = 0;     // Unused (Quantisation)
-  e[w++] = 0xff;
-  e[w++] = 0xc4;  // HUFF
-  // Write HUFF
-  int count = 0;
-  for (int i = 0; i < 17; i++) {
-    count += self->bits[i];
-  }
-  e[w++] = 0x0;
-  e[w++] = 17 + 2 + count;  // Lf, frame header length
-  e[w++] = 0;               // Table ID
-  for (int i = 1; i < 17; i++) {
-    e[w++] = self->bits[i];
-  }
-  for (int i = 0; i < count; i++) {
-    e[w++] = self->huffval[i];
-  }
-  e[w++] = 0xff;
-  e[w++] = 0xda;  // SCAN
-  // Write SCAN
-  e[w++] = 0x0;
-  e[w++] = 8;  // Ls, scan header length
-  e[w++] = 1;  // Components
-  e[w++] = 0;  //
-  e[w++] = 0;  //
-  e[w++] = 6;  // Predictor
-  e[w++] = 0;  //
-  e[w++] = 0;  //
-  self->encodedWritten = w;
-}
-
-void writePost(lje *self) {
-  int w = self->encodedWritten;
-  uint8_t *e = self->encoded;
-  e[w++] = 0xff;
-  e[w++] = 0xd9;  // EOI
-  self->encodedWritten = w;
-}
-
-void writeBody(lje *self) {
-  // Scan through the tile using the standard type 6 prediction
-  // Need to cache the previous 2 row in target coordinates because of tiling
-  uint16_t *pixel = self->image;
-  int pixcount = self->width * self->height;
-  int scan = self->readLength;
-  uint16_t *rowcache = (uint16_t *)calloc(1, self->width * 4);
-  uint16_t *rows[2];
-  rows[0] = rowcache;
-  rows[1] = &rowcache[self->width];
-
-  int col = 0;
-  int row = 0;
-  int Px = 0;
-  int32_t diff = 0;
-  int bitcount = 0;
-  uint8_t *out = self->encoded;
-  int w = self->encodedWritten;
-  uint8_t next = 0;
-  uint8_t nextbits = 8;
-  while (pixcount--) {
-    uint16_t p = *pixel;
-    if (self->delinearize) p = self->delinearize[p];
-    rows[1][col] = p;
-
-    if ((row == 0) && (col == 0))
-      Px = 1 << (self->bitdepth - 1);
-    else if (row == 0)
-      Px = rows[1][col - 1];
-    else if (col == 0)
-      Px = rows[0][col];
-    else
-      Px = rows[0][col] + ((rows[1][col - 1] - rows[0][col - 1]) >> 1);
-    diff = rows[1][col] - Px;
-    int ssss = 32 - clz32(abs(diff));
-    if (diff == 0) ssss = 0;
-    // printf("%d %d %d %d %d\n",col,row,Px,diff,ssss);
-
-    // Write the huffman code for the ssss value
-    int huffcode = self->huffsym[ssss];
-    int huffenc = self->huffenc[huffcode];
-    int huffbits = self->huffbits[huffcode];
-    bitcount += huffbits + ssss;
-
-    int vt = ssss > 0 ? (1 << (ssss - 1)) : 0;
-    // printf("%d %d %d %d\n",rows[1][col],Px,diff,Px+diff);
-#ifdef DEBUG
-#endif
-    if (diff < vt) diff += (1 << (ssss)) - 1;
-
-    // Write the ssss
-    while (huffbits > 0) {
-      int usebits = huffbits > nextbits ? nextbits : huffbits;
-      // Add top usebits from huffval to next usebits of nextbits
-      int tophuff = huffenc >> (huffbits - usebits);
-      next |= (tophuff << (nextbits - usebits));
-      nextbits -= usebits;
-      huffbits -= usebits;
-      huffenc &= (1 << huffbits) - 1;
-      if (nextbits == 0) {
-        out[w++] = next;
-        if (next == 0xff) out[w++] = 0x0;
-        next = 0;
-        nextbits = 8;
-      }
-    }
-    // Write the rest of the bits for the value
-
-    while (ssss > 0) {
-      int usebits = ssss > nextbits ? nextbits : ssss;
-      // Add top usebits from huffval to next usebits of nextbits
-      int tophuff = diff >> (ssss - usebits);
-      next |= (tophuff << (nextbits - usebits));
-      nextbits -= usebits;
-      ssss -= usebits;
-      diff &= (1 << ssss) - 1;
-      if (nextbits == 0) {
-        out[w++] = next;
-        if (next == 0xff) out[w++] = 0x0;
-        next = 0;
-        nextbits = 8;
-      }
-    }
-
-    // printf("%d %d\n",diff,ssss);
-    pixel++;
-    scan--;
-    col++;
-    if (scan == 0) {
-      pixel += self->skipLength;
-      scan = self->readLength;
-    }
-    if (col == self->width) {
-      uint16_t *tmprow = rows[1];
-      rows[1] = rows[0];
-      rows[0] = tmprow;
-      col = 0;
-      row++;
-    }
-  }
-  // Flush the final bits
-  if (nextbits < 8) {
-    out[w++] = next;
-    if (next == 0xff) out[w++] = 0x0;
-  }
-#ifdef DEBUG
-  int sort[17];
-  for (int h = 0; h < 17; h++) {
-    sort[h] = h;
-    printf("%d:%d\n", h, self->hist[h]);
-  }
-  printf("Total bytes: %d\n", bitcount >> 3);
-#endif
-  free(rowcache);
-  self->encodedWritten = w;
-}
-
-/* Encoder
- * Read tile from an image and encode in one shot
- * Return the encoded data
- */
-int lj92_encode(uint16_t *image, int width, int height, int bitdepth,
-                int readLength, int skipLength, uint16_t *delinearize,
-                int delinearizeLength, uint8_t **encoded, int *encodedLength) {
-  int ret = LJ92_ERROR_NONE;
-
-  lje *self = (lje *)calloc(sizeof(lje), 1);
-  if (self == NULL) return LJ92_ERROR_NO_MEMORY;
-  self->image = image;
-  self->width = width;
-  self->height = height;
-  self->bitdepth = bitdepth;
-  self->readLength = readLength;
-  self->skipLength = skipLength;
-  self->delinearize = delinearize;
-  self->delinearizeLength = delinearizeLength;
-  self->encodedLength = width * height * 3 + 200;
-  self->encoded = (uint8_t*)malloc(self->encodedLength);
-  if (self->encoded == NULL) {
-    free(self);
-    return LJ92_ERROR_NO_MEMORY;
-  }
-  // Scan through data to gather frequencies of ssss prefixes
-  ret = frequencyScan(self);
-  if (ret != LJ92_ERROR_NONE) {
-    free(self->encoded);
-    free(self);
-    return ret;
-  }
-  // Create encoded table based on frequencies
-  createEncodeTable(self);
-  // Write JPEG head and scan header
-  writeHeader(self);
-  // Scan through and do the compression
-  writeBody(self);
-  // Finish
-  writePost(self);
-#ifdef DEBUG
-  printf("written:%d\n", self->encodedWritten);
-#endif
-  self->encoded = (uint8_t*)realloc(self->encoded, self->encodedWritten);
-  self->encodedLength = self->encodedWritten;
-  *encoded = self->encoded;
-  *encodedLength = self->encodedLength;
-
-  free(self);
-
-  return ret;
-}
-
-// End liblj92 ---------------------------------------------------------
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-}  // namespace detail
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#if __has_warning("-Wzero-as-null-pointer-constant")
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
-#endif
-
-//
-// TinyDNGWriter stores IFD table in the end of file so that offset to
-// image data can be easily computed.
-//
-// +----------------------+
-// |    header            |
-// +----------------------+
-// |                      |
-// |  image & meta 0      |
-// |                      |
-// +----------------------+
-// |                      |
-// |  image & meta 1      |
-// |                      |
-// +----------------------+
-//    ...
-// +----------------------+
-// |                      |
-// |  image & meta N      |
-// |                      |
-// +----------------------+
-// |                      |
-// |  IFD 0               |
-// |                      |
-// +----------------------+
-// |                      |
-// |  IFD 1               |
-// |                      |
-// +----------------------+
-//    ...
-// +----------------------+
-// |                      |
-// |  IFD 2               |
-// |                      |
-// +----------------------+
-//
-
-// From tiff.h
-typedef enum {
-  TIFF_NOTYPE = 0,     /* placeholder */
-  TIFF_BYTE = 1,       /* 8-bit unsigned integer */
-  TIFF_ASCII = 2,      /* 8-bit bytes w/ last byte null */
-  TIFF_SHORT = 3,      /* 16-bit unsigned integer */
-  TIFF_LONG = 4,       /* 32-bit unsigned integer */
-  TIFF_RATIONAL = 5,   /* 64-bit unsigned fraction */
-  TIFF_SBYTE = 6,      /* !8-bit signed integer */
-  TIFF_UNDEFINED = 7,  /* !8-bit untyped data */
-  TIFF_SSHORT = 8,     /* !16-bit signed integer */
-  TIFF_SLONG = 9,      /* !32-bit signed integer */
-  TIFF_SRATIONAL = 10, /* !64-bit signed fraction */
-  TIFF_FLOAT = 11,     /* !32-bit IEEE floating point */
-  TIFF_DOUBLE = 12,    /* !64-bit IEEE floating point */
-  TIFF_IFD = 13,       /* %32-bit unsigned integer (offset) */
-  TIFF_LONG8 = 16,     /* BigTIFF 64-bit unsigned integer */
-  TIFF_SLONG8 = 17,    /* BigTIFF 64-bit signed integer */
-  TIFF_IFD8 = 18       /* BigTIFF 64-bit unsigned integer (offset) */
-} DataType;
-
-const static int kHeaderSize = 8;  // TIFF header size.
-
-// floating point to integer rational value conversion
-// https://stackoverflow.com/questions/51142275/exact-value-of-a-floating-point-number-as-a-rational
-//
-// Return error flag
-static int DoubleToRational(double x, double *numerator, double *denominator) {
-  if (!std::isfinite(x)) {
-    *numerator = *denominator = 0.0;
-    if (x > 0.0) *numerator = 1.0;
-    if (x < 0.0) *numerator = -1.0;
-    return 1;
-  }
-
-  // TIFF Rational use two uint32's, so reduce the bits
-  int bdigits = FLT_MANT_DIG;
-  int expo;
-  *denominator = 1.0;
-  *numerator = std::frexp(x, &expo) * std::pow(2.0, bdigits);
-  expo -= bdigits;
-  if (expo > 0) {
-    *numerator *= std::pow(2.0, expo);
-  } else if (expo < 0) {
-    expo = -expo;
-    if (expo >= FLT_MAX_EXP - 1) {
-      *numerator /= std::pow(2.0, expo - (FLT_MAX_EXP - 1));
-      *denominator *= std::pow(2.0, FLT_MAX_EXP - 1);
-      return fabs(*numerator) < 1.0;
-    } else {
-      *denominator *= std::pow(2.0, expo);
-    }
-  }
-
-  while ((std::fabs(*numerator) > 0.0) &&
-         (std::fabs(std::fmod(*numerator, 2)) <
-          std::numeric_limits<double>::epsilon()) &&
-         (std::fabs(std::fmod(*denominator, 2)) <
-          std::numeric_limits<double>::epsilon())) {
-    *numerator /= 2.0;
-    *denominator /= 2.0;
-  }
-  return 0;
-}
-
-static inline bool IsBigEndian() {
-  unsigned int i = 0x01020304;
-  char c[4];
-  memcpy(c, &i, 4);
-  return (c[0] == 1);
-}
-
-static void swap2(unsigned short *val) {
-  unsigned short tmp = *val;
-  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
-  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
-
-  dst[0] = src[1];
-  dst[1] = src[0];
-}
-
-static void swap4(unsigned int *val) {
-  unsigned int tmp = *val;
-  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
-  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
-
-  dst[0] = src[3];
-  dst[1] = src[2];
-  dst[2] = src[1];
-  dst[3] = src[0];
-}
-
-static void swap8(uint64_t *val) {
-  uint64_t tmp = *val;
-  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
-  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
-
-  dst[0] = src[7];
-  dst[1] = src[6];
-  dst[2] = src[5];
-  dst[3] = src[4];
-  dst[4] = src[3];
-  dst[5] = src[2];
-  dst[6] = src[1];
-  dst[7] = src[0];
-}
-
-static void Write1(const unsigned char c, std::ostringstream *out) {
-  unsigned char value = c;
-  out->write(reinterpret_cast<const char *>(&value), 1);
-}
-
-static void Write2(const unsigned short c, std::ostringstream *out,
-                   const bool swap_endian) {
-  unsigned short value = c;
-  if (swap_endian) {
-    swap2(&value);
-  }
-
-  out->write(reinterpret_cast<const char *>(&value), 2);
-}
-
-static void Write4(const unsigned int c, std::ostringstream *out,
-                   const bool swap_endian) {
-  unsigned int value = c;
-  if (swap_endian) {
-    swap4(&value);
-  }
-
-  out->write(reinterpret_cast<const char *>(&value), 4);
-}
-
-static bool WriteTIFFTag(const unsigned short tag, const unsigned short type,
-                         const unsigned int count, const unsigned char *data,
-                         std::vector<IFDTag> *tags_out,
-                         std::ostringstream *data_out) {
-  assert(sizeof(IFDTag) ==
-         12);  // FIXME(syoyo): Use static_assert for C++11 compiler
-
-  IFDTag ifd;
-  ifd.tag = tag;
-  ifd.type = type;
-  ifd.count = count;
-
-  size_t typesize_table[] = {1, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 4};
-
-  size_t len = count * (typesize_table[(type) < 14 ? (type) : 0]);
-  if (len > 4) {
-    assert(data_out);
-    if (!data_out) {
-      return false;
-    }
-
-    // Store offset value.
-
-    unsigned int offset =
-        static_cast<unsigned int>(data_out->tellp()) + kHeaderSize;
-    ifd.offset_or_value = offset;
-
-    data_out->write(reinterpret_cast<const char *>(data),
-                    static_cast<std::streamsize>(len));
-
-  } else {
-    ifd.offset_or_value = 0;
-
-    // less than 4 bytes = store data itself.
-    if (len == 1) {
-      unsigned char value = *(data);
-      memcpy(&(ifd.offset_or_value), &value, sizeof(unsigned char));
-    } else if (len == 2) {
-      unsigned short value = *(reinterpret_cast<const unsigned short *>(data));
-      memcpy(&(ifd.offset_or_value), &value, sizeof(unsigned short));
-    } else if (len == 4) {
-      unsigned int value = *(reinterpret_cast<const unsigned int *>(data));
-      ifd.offset_or_value = value;
-    } else {
-      assert(0);
-    }
-  }
-
-  tags_out->push_back(ifd);
-
-  return true;
-}
-
-static bool WriteTIFFVersionHeader(std::ostringstream *out, bool big_endian) {
-  // TODO(syoyo): Support BigTIFF?
-
-  // 4d 4d = Big endian. 49 49 = Little endian.
-  if (big_endian) {
-    Write1(0x4d, out);
-    Write1(0x4d, out);
-    Write1(0x0, out);
-    Write1(0x2a, out);  // Tiff version ID
-  } else {
-    Write1(0x49, out);
-    Write1(0x49, out);
-    Write1(0x2a, out);  // Tiff version ID
-    Write1(0x0, out);
-  }
-
-  return true;
-}
-
-DNGImage::DNGImage()
-    : dng_big_endian_(true),
-      num_fields_(0),
-      samples_per_pixels_(0),
-      data_strip_offset_{0},
-      data_strip_bytes_{0} {
-  swap_endian_ = (IsBigEndian() != dng_big_endian_);
-}
-
-void DNGImage::SetBigEndian(bool big_endian) {
-  dng_big_endian_ = big_endian;
-  swap_endian_ = (IsBigEndian() != dng_big_endian_);
-}
-
-bool DNGImage::SetSubfileType(bool reduced_image, bool page, bool mask) {
-  unsigned int count = 1;
-
-  unsigned int bits = 0;
-  if (reduced_image) {
-    bits |= FILETYPE_REDUCEDIMAGE;
-  }
-  if (page) {
-    bits |= FILETYPE_PAGE;
-  }
-  if (mask) {
-    bits |= FILETYPE_MASK;
-  }
-
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_SUB_FILETYPE), TIFF_LONG, count,
-      reinterpret_cast<const unsigned char *>(&bits), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetImageWidth(const unsigned int width) {
-  unsigned int count = 1;
-
-  unsigned int data = width;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_IMAGE_WIDTH), TIFF_LONG, count,
-      reinterpret_cast<const unsigned char *>(&data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetImageLength(const unsigned int length) {
-  unsigned int count = 1;
-
-  const unsigned int data = length;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_IMAGE_LENGTH), TIFF_LONG, count,
-      reinterpret_cast<const unsigned char *>(&data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetRowsPerStrip(const unsigned int rows) {
-  if (rows == 0) {
-    return false;
-  }
-
-  unsigned int count = 1;
-
-  const unsigned int data = rows;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_ROWS_PER_STRIP), TIFF_LONG, count,
-      reinterpret_cast<const unsigned char *>(&data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetSamplesPerPixel(const unsigned short value) {
-  if (value > 4) {
-    {
-      std::stringstream ss;
-      ss << "Samples per pixel must be less than or equal to 4, but got " << value << ".\n";
-      err_ += ss.str();
-    }
-    return false;
-  }
-
-  unsigned int count = 1;
-
-  const unsigned short data = value;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_SAMPLES_PER_PIXEL), TIFF_SHORT, count,
-      reinterpret_cast<const unsigned char *>(&data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    err_ += "Failed to write `TIFFTAG_SAMPLES_PER_PIXEL` tag.\n";
-    return false;
-  }
-
-  samples_per_pixels_ = value;  // Store SPP for later use.
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetBitsPerSample(const unsigned int num_samples,
-                                const unsigned short *values) {
-  // `SetSamplesPerPixel()` must be called in advance and SPP shoud be equal to
-  // `num_samples`.
-
-  if (samples_per_pixels_ == 0) {
-    err_ += "SetSamplesPerPixel() must be called before SetBitsPerSample().\n";
-    return false;
-  }
-
-  if ((num_samples == 0) || (num_samples > 4)) {
-    std::stringstream ss;
-    ss << "Invalid number of samples: " << num_samples << "\n";
-    err_ += ss.str();
-    return false;
-  } else if (num_samples != samples_per_pixels_) {
-    std::stringstream ss;
-    ss << "Samples per pixel mismatch. " << num_samples << " is given for SetBitsPerSample(), but SamplesPerPixel is set to " << samples_per_pixels_ << "\n";
-    err_ += ss.str();
-    return false;
-  } else {
-    // ok
-  }
-
-  unsigned short bps = values[0];
-
-  std::vector<unsigned short> vs(num_samples);
-  for (size_t i = 0; i < vs.size(); i++) {
-    // FIXME(syoyo): Currently bps must be same for all samples
-    if (bps != values[i]) {
-      err_ += "BitsPerSample must be same among samples at the moment.\n";
-      return false;
-    }
-
-    vs[i] = values[i];
-
-    // TODO(syoyo): Swap values when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap2(&vs[i]);
-    }
-  }
-
-  unsigned int count = num_samples;
-
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_BITS_PER_SAMPLE),
-                          TIFF_SHORT, count,
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  // Store BPS for later use.
-  bits_per_samples_.resize(num_samples);
-  for (size_t i = 0; i < num_samples; i++) {
-    bits_per_samples_[i] = values[i];
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetPhotometric(const unsigned short value) {
-  if ((value == PHOTOMETRIC_LINEARRAW) ||
-      (value == PHOTOMETRIC_CFA) ||
-      (value == PHOTOMETRIC_RGB) ||
-      (value == PHOTOMETRIC_WHITE_IS_ZERO) ||
-      (value == PHOTOMETRIC_BLACK_IS_ZERO)) {
-    // OK
-  } else {
-    return false;
-  }
-
-  unsigned int count = 1;
-
-  const unsigned short data = value;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_PHOTOMETRIC), TIFF_SHORT, count,
-      reinterpret_cast<const unsigned char *>(&data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetPlanarConfig(const unsigned short value) {
-  unsigned int count = 1;
-
-  if ((value == PLANARCONFIG_CONTIG) || (value == PLANARCONFIG_SEPARATE)) {
-    // OK
-  } else {
-    return false;
-  }
-
-  const unsigned short data = value;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_PLANAR_CONFIG), TIFF_SHORT, count,
-      reinterpret_cast<const unsigned char *>(&data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetCompression(const unsigned short value) {
-  unsigned int count = 1;
-
-  const unsigned short data = value;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_COMPRESSION), TIFF_SHORT, count,
-      reinterpret_cast<const unsigned char *>(&data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetSampleFormat(const unsigned int num_samples,
-                               const unsigned short *values) {
-  // `SetSamplesPerPixel()` must be called in advance
-  if ((num_samples > 0) && (num_samples == samples_per_pixels_)) {
-    // OK
-  } else {
-    err_ += "SetSamplesPerPixel() must be called before SetSampleFormat().\n";
-    return false;
-  }
-
-  unsigned short format = values[0];
-
-  std::vector<unsigned short> vs(num_samples);
-  for (size_t i = 0; i < vs.size(); i++) {
-    // FIXME(syoyo): Currently format must be same for all samples
-    if (format != values[i]) {
-      err_ += "SampleFormat must be same among samples at the moment.\n";
-      return false;
-    }
-
-    if ((format == SAMPLEFORMAT_UINT) || (format == SAMPLEFORMAT_INT) ||
-        (format == SAMPLEFORMAT_IEEEFP)) {
-      // OK
-    } else {
-      err_ += "Invalid format value specified for SetSampleFormat().\n";
-      return false;
-    }
-
-    vs[i] = values[i];
-
-    // TODO(syoyo): Swap values when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap2(&vs[i]);
-    }
-  }
-
-  unsigned int count = num_samples;
-
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_SAMPLEFORMAT),
-                          TIFF_SHORT, count,
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetOrientation(const unsigned short value) {
-  unsigned int count = 1;
-
-  if ((value == ORIENTATION_TOPLEFT) || (value == ORIENTATION_TOPRIGHT) ||
-      (value == ORIENTATION_BOTRIGHT) || (value == ORIENTATION_BOTLEFT) ||
-      (value == ORIENTATION_LEFTTOP) || (value == ORIENTATION_RIGHTTOP) ||
-      (value == ORIENTATION_RIGHTBOT) || (value == ORIENTATION_LEFTBOT)) {
-    // OK
-  } else {
-    return false;
-  }
-
-  const unsigned int data = value;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_ORIENTATION), TIFF_SHORT, count,
-      reinterpret_cast<const unsigned char *>(&data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetBlackLevel(const unsigned int num_components,
-                             const unsigned short *values) {
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_BLACK_LEVEL), TIFF_SHORT, num_components,
-      reinterpret_cast<const unsigned char *>(values), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetBlackLevelRational(unsigned int num_samples,
-                                     const double *values) {
-  // `SetSamplesPerPixel()` must be called in advance and SPP shoud be equal to
-  // `num_samples`.
-  if ((num_samples > 0) && (num_samples == samples_per_pixels_)) {
-    // OK
-  } else {
-    return false;
-  }
-
-  std::vector<unsigned int> vs(num_samples * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-
-  unsigned int count = num_samples;
-
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_BLACK_LEVEL),
-                          TIFF_RATIONAL, count,
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetWhiteLevelRational(unsigned int num_samples,
-                                     const double *values) {
-  // `SetSamplesPerPixel()` must be called in advance and SPP shoud be equal to
-  // `num_samples`.
-  if ((num_samples > 0) && (num_samples == samples_per_pixels_)) {
-    // OK
-  } else {
-    return false;
-  }
-
-  std::vector<unsigned int> vs(num_samples * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-
-  unsigned int count = num_samples;
-
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_WHITE_LEVEL),
-                          TIFF_RATIONAL, count,
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetXResolution(const double value) {
-  double numerator, denominator;
-  if (DoubleToRational(value, &numerator, &denominator) != 0) {
-    // Couldn't represent fp value as integer rational value.
-    return false;
-  }
-
-  unsigned int data[2];
-  data[0] = static_cast<unsigned int>(numerator);
-  data[1] = static_cast<unsigned int>(denominator);
-
-  // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-  if (swap_endian_) {
-    swap4(&data[0]);
-    swap4(&data[1]);
-  }
-
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_XRESOLUTION), TIFF_RATIONAL, 1,
-      reinterpret_cast<const unsigned char *>(data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetYResolution(const double value) {
-  double numerator, denominator;
-  if (DoubleToRational(value, &numerator, &denominator) != 0) {
-    // Couldn't represent fp value as integer rational value.
-    return false;
-  }
-
-  unsigned int data[2];
-  data[0] = static_cast<unsigned int>(numerator);
-  data[1] = static_cast<unsigned int>(denominator);
-
-  // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-  if (swap_endian_) {
-    swap4(&data[0]);
-    swap4(&data[1]);
-  }
-
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_YRESOLUTION), TIFF_RATIONAL, 1,
-      reinterpret_cast<const unsigned char *>(data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetResolutionUnit(const unsigned short value) {
-  unsigned int count = 1;
-
-  if ((value == RESUNIT_NONE) || (value == RESUNIT_INCH) ||
-      (value == RESUNIT_CENTIMETER)) {
-    // OK
-  } else {
-    return false;
-  }
-
-  const unsigned short data = value;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_RESOLUTION_UNIT), TIFF_SHORT, count,
-      reinterpret_cast<const unsigned char *>(&data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetImageDescription(const std::string &ascii) {
-  unsigned int count =
-      static_cast<unsigned int>(ascii.length() + 1);  // +1 for '\0'
-
-  if (count < 2) {
-    // empty string
-    return false;
-  }
-
-  if (count > (1024 * 1024)) {
-    // too large
-    return false;
-  }
-
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_IMAGEDESCRIPTION),
-                          TIFF_ASCII, count,
-                          reinterpret_cast<const unsigned char *>(ascii.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetUniqueCameraModel(const std::string &ascii) {
-  unsigned int count =
-      static_cast<unsigned int>(ascii.length() + 1);  // +1 for '\0'
-
-  if (count < 2) {
-    // empty string
-    return false;
-  }
-
-  if (count > (1024 * 1024)) {
-    // too large
-    return false;
-  }
-
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_UNIQUE_CAMERA_MODEL),
-                          TIFF_ASCII, count,
-                          reinterpret_cast<const unsigned char *>(ascii.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetSoftware(const std::string &ascii) {
-  unsigned int count =
-      static_cast<unsigned int>(ascii.length() + 1);  // +1 for '\0'
-
-  if (count < 2) {
-    // empty string
-    return false;
-  }
-
-  if (count > 4096) {
-    // too large
-    return false;
-  }
-
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_SOFTWARE),
-                          TIFF_ASCII, count,
-                          reinterpret_cast<const unsigned char *>(ascii.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-
-bool DNGImage::SetActiveArea(const unsigned int values[4]) {
-  unsigned int count = 4;
-
-  const unsigned int *data = values;
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_ACTIVE_AREA), TIFF_LONG, count,
-      reinterpret_cast<const unsigned char *>(data), &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetDNGVersion(const unsigned char a,
-                             const unsigned char b,
-                             const unsigned char c,
-                             const unsigned char d) {
-  unsigned char data[4] = {a, b, c, d};
-
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_DNG_VERSION), TIFF_BYTE, 4,
-      reinterpret_cast<const unsigned char *>(data),
-      &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetColorMatrix1(const unsigned int plane_count,
-                               const double *matrix_values) {
-  std::vector<unsigned int> vs(plane_count * 3 * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(matrix_values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_COLOR_MATRIX1),
-                          TIFF_SRATIONAL, uint32_t(vs.size() / 2),
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetColorMatrix2(const unsigned int plane_count,
-                               const double *matrix_values) {
-  std::vector<unsigned int> vs(plane_count * 3 * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(matrix_values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_COLOR_MATRIX2),
-                          TIFF_SRATIONAL, uint32_t(vs.size() / 2),
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetForwardMatrix1(const unsigned int plane_count,
-                                 const double *matrix_values) {
-  std::vector<unsigned int> vs(plane_count * 3 * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(matrix_values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_FORWARD_MATRIX1),
-                          TIFF_SRATIONAL, uint32_t(vs.size() / 2),
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetForwardMatrix2(const unsigned int plane_count,
-                                 const double *matrix_values) {
-  std::vector<unsigned int> vs(plane_count * 3 * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(matrix_values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_FORWARD_MATRIX2),
-                          TIFF_SRATIONAL, uint32_t(vs.size() / 2),
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetCameraCalibration1(const unsigned int plane_count,
-                                     const double *matrix_values) {
-  std::vector<unsigned int> vs(plane_count * plane_count * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(matrix_values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_CAMERA_CALIBRATION1),
-                          TIFF_SRATIONAL, uint32_t(vs.size() / 2),
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetCameraCalibration2(const unsigned int plane_count,
-                                     const double *matrix_values) {
-  std::vector<unsigned int> vs(plane_count * plane_count * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(matrix_values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_CAMERA_CALIBRATION2),
-                          TIFF_SRATIONAL, uint32_t(vs.size() / 2),
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetAnalogBalance(const unsigned int plane_count,
-                                const double *matrix_values) {
-  std::vector<unsigned int> vs(plane_count * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(matrix_values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_ANALOG_BALANCE),
-                          TIFF_RATIONAL, uint32_t(vs.size() / 2),
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetCFARepeatPatternDim(const unsigned short width,
-                                      const unsigned short height) {
-  unsigned short data[2] = {width, height};
-
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_CFA_REPEAT_PATTERN_DIM), TIFF_SHORT, 2,
-      reinterpret_cast<const unsigned char *>(data),
-      &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetBlackLevelRepeatDim(const unsigned short width,
-                                      const unsigned short height) {
-  unsigned short data[2] = {width, height};
-
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_BLACK_LEVEL_REPEAT_DIM), TIFF_SHORT, 2,
-      reinterpret_cast<const unsigned char *>(data),
-      &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetCalibrationIlluminant1(const unsigned short value) {
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_CALIBRATION_ILLUMINANT1), TIFF_SHORT, 1,
-      reinterpret_cast<const unsigned char *>(&value),
-      &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetCalibrationIlluminant2(const unsigned short value) {
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_CALIBRATION_ILLUMINANT2), TIFF_SHORT, 1,
-      reinterpret_cast<const unsigned char *>(&value),
-      &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetCFAPattern(const unsigned int num_components,
-                             const unsigned char *values) {
-  if ((values == NULL) || (num_components < 1)) {
-    return false;
-  }
-
-  bool ret = WriteTIFFTag(
-      static_cast<unsigned short>(TIFFTAG_CFA_PATTERN), TIFF_BYTE, num_components,
-      reinterpret_cast<const unsigned char *>(values),
-      &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetAsShotNeutral(const unsigned int plane_count,
-                                const double *matrix_values) {
-  std::vector<unsigned int> vs(plane_count * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(matrix_values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_AS_SHOT_NEUTRAL),
-                          TIFF_RATIONAL, uint32_t(vs.size() / 2),
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetAsShotWhiteXY(const double x, const double y) {
-  const double values[2] = {x, y};
-  std::vector<unsigned int> vs(2 * 2);
-  for (size_t i = 0; i * 2 < vs.size(); i++) {
-    double numerator, denominator;
-    if (DoubleToRational(values[i], &numerator, &denominator) != 0) {
-      // Couldn't represent fp value as integer rational value.
-      return false;
-    }
-
-    vs[2 * i + 0] = static_cast<unsigned int>(numerator);
-    vs[2 * i + 1] = static_cast<unsigned int>(denominator);
-
-    // TODO(syoyo): Swap rational value(8 bytes) when writing IFD tag, not here.
-    if (swap_endian_) {
-      swap4(&vs[2 * i + 0]);
-      swap4(&vs[2 * i + 1]);
-    }
-  }
-  bool ret = WriteTIFFTag(static_cast<unsigned short>(TIFFTAG_AS_SHOT_WHITE_XY),
-                          TIFF_RATIONAL, uint32_t(vs.size() / 2),
-                          reinterpret_cast<const unsigned char *>(vs.data()),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetImageDataPacked(const unsigned short *input_buffer, const int input_count, const unsigned int input_bpp, bool big_endian)
-{
-
-#ifndef ROL32
-#define ROL32(v,a) ((v) << (a) | (v) >> (32-(a)))
-#endif
-
-#ifndef ROL16
-#define ROL16(v,a) ((v) << (a) | (v) >> (16-(a)))
-#endif
-
-  if (input_count <= 0) {
-    return false;
-  }
-
-  if (input_bpp > 16)
-    return false;
-
-  unsigned int bits_free = 16 - input_bpp;
-  const unsigned short *unpacked_bits = input_buffer;
-
-  std::vector<unsigned short> output(static_cast<size_t>(input_count));
-  unsigned short *packed_bits = output.data();
-
-  packed_bits[0] = static_cast<unsigned short>(unpacked_bits[0] << bits_free);
-  for (unsigned int pixel_index = 1; pixel_index < static_cast<unsigned int>(input_count); pixel_index++)
-  {
-    unsigned int bits_offset = (pixel_index * bits_free) % 16;
-    unsigned int bits_to_rol = bits_free + bits_offset + (bits_offset > 0) * 16;
-
-    unsigned int data = ROL32(static_cast<unsigned int>(unpacked_bits[pixel_index]), bits_to_rol);
-    *(reinterpret_cast<unsigned int *>(packed_bits)) = (*(reinterpret_cast<unsigned int *>(packed_bits)) & 0x0000FFFF) | data;
-
-    if(bits_offset > 0 && bits_offset <= input_bpp)
-    {
-      if(big_endian)
-        *(reinterpret_cast<unsigned short *>(packed_bits)) = static_cast<unsigned short>(ROL16(*(reinterpret_cast<unsigned short *>(packed_bits)), 8));
-
-      ++packed_bits;
-    }
-  }
-
-  return SetImageData(reinterpret_cast<unsigned char*>(output.data()), output.size() * sizeof(unsigned short));
-
-#undef ROL32
-#undef ROL16
-}
-
-bool DNGImage::SetImageData(const unsigned char *data, const size_t data_len) {
-  if ((data == NULL) || (data_len < 1)) {
-    return false;
-  }
-
-  data_strip_offset_ = size_t(data_os_.tellp());
-  data_strip_bytes_ = data_len;
-
-  data_os_.write(reinterpret_cast<const char *>(data),
-                 static_cast<std::streamsize>(data_len));
-
-  // NOTE: STRIP_OFFSET tag will be written at `WriteIFDToStream()`.
-
-  {
-    unsigned int count = 1;
-    unsigned int bytes = static_cast<unsigned int>(data_len);
-
-    bool ret = WriteTIFFTag(
-        static_cast<unsigned short>(TIFFTAG_STRIP_BYTE_COUNTS), TIFF_LONG,
-        count, reinterpret_cast<const unsigned char *>(&bytes), &ifd_tags_,
-        NULL);
-
-    if (!ret) {
-      return false;
-    }
-
-    num_fields_++;
-  }
-
-  return true;
-}
-
-bool DNGImage::SetImageDataJpeg(const unsigned short *data, unsigned int width,
-                                unsigned int height, unsigned int bpp) {
-  if ((data == NULL) || (height % 2 == 1) || (width % 2 == 1)) {
-    return false;
-  }
-
-  uint8_t *compressed = NULL;
-  int output_buffer_size = 0;
-
-  // Width x2 to move each second line
-  // -----------
-  // Before:
-  //
-  // GRGRGR...
-  // BGBGBG...
-  // GRGRGR...
-  // BGBGBG...
-  // -----------
-  // After:
-  //
-  // GRGRGR...BGBGBG...
-  // GRGRGR...BGBGBG...
-  // -----------
-  int new_width = int(width * 2);
-  int new_height = int(height / 2);
-
-  // Encode image
-  int ret = detail::lj92_encode(const_cast<unsigned short *>(data), new_width, new_height, int(bpp),
-                        new_width * new_height, 0, NULL, 0, &compressed,
-                        &output_buffer_size);
-
-  if (ret != detail::LJ92_ERROR_NONE)
-	  return false;
-
-  bool sid_res = SetImageData(compressed, size_t(output_buffer_size));
-
-  if (compressed)
-	  free(compressed);
-
-  return sid_res;
-}
-
-bool DNGImage::SetCustomFieldLong(const unsigned short tag, const int value) {
-  unsigned int count = 1;
-
-  // TODO(syoyo): Check if `tag` value does not conflict with existing TIFF tag
-  // value.
-
-  bool ret = WriteTIFFTag(tag, TIFF_SLONG, count,
-                          reinterpret_cast<const unsigned char *>(&value),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-bool DNGImage::SetCustomFieldULong(const unsigned short tag,
-                                   const unsigned int value) {
-  unsigned int count = 1;
-
-  // TODO(syoyo): Check if `tag` value does not conflict with existing TIFF tag
-  // value.
-
-  bool ret = WriteTIFFTag(tag, TIFF_LONG, count,
-                          reinterpret_cast<const unsigned char *>(&value),
-                          &ifd_tags_, &data_os_);
-
-  if (!ret) {
-    return false;
-  }
-
-  num_fields_++;
-  return true;
-}
-
-static bool IFDComparator(const IFDTag &a, const IFDTag &b) {
-  return (a.tag < b.tag);
-}
-
-bool DNGImage::WriteDataToStream(std::ostream *ofs) const {
-  if ((data_os_.str().length() == 0)) {
-    err_ += "Empty IFD data and image data.\n";
-    return false;
-  }
-
-  if (bits_per_samples_.empty()) {
-    err_ += "BitsPerSample is not set\n";
-    return false;
-  }
-
-  for (size_t i = 0; i < bits_per_samples_.size(); i++) {
-    if (bits_per_samples_[i] == 0) {
-      err_ += std::to_string(i) + "'th BitsPerSample is zero";
-      return false;
-    }
-  }
-
-  if (samples_per_pixels_ == 0) {
-    err_ += "SamplesPerPixels is not set or zero.";
-    return false;
-  }
-
-  std::vector<uint8_t> data(data_os_.str().length());
-  memcpy(data.data(), data_os_.str().data(), data.size());
-
-  if (data_strip_bytes_ == 0) {
-    // May ok?.
-  } else {
-    // FIXME(syoyo): Assume all channels use sample bps
-    uint32_t bps = bits_per_samples_[0];
-
-    // We may need to swap endian for pixel data.
-    if (swap_endian_) {
-      if (bps == 16) {
-        size_t n = data_strip_bytes_ / sizeof(uint16_t);
-        uint16_t *ptr =
-            reinterpret_cast<uint16_t *>(data.data() + data_strip_offset_);
-
-        for (size_t i = 0; i < n; i++) {
-          swap2(&ptr[i]);
-        }
-
-      } else if (bps == 32) {
-        size_t n = data_strip_bytes_ / sizeof(uint32_t);
-        uint32_t *ptr =
-            reinterpret_cast<uint32_t *>(data.data() + data_strip_offset_);
-
-        for (size_t i = 0; i < n; i++) {
-          swap4(&ptr[i]);
-        }
-
-      } else if (bps == 64) {
-        size_t n = data_strip_bytes_ / sizeof(uint64_t);
-        uint64_t *ptr =
-            reinterpret_cast<uint64_t *>(data.data() + data_strip_offset_);
-
-        for (size_t i = 0; i < n; i++) {
-          swap8(&ptr[i]);
-        }
-      }
-    }
-  }
-
-  ofs->write(reinterpret_cast<const char *>(data.data()),
-             static_cast<std::streamsize>(data.size()));
-
-  return true;
-}
-
-bool DNGImage::WriteIFDToStream(const unsigned int data_base_offset,
-                                const unsigned int strip_offset,
-                                std::ostream *ofs) const {
-  if ((num_fields_ == 0) || (ifd_tags_.size() < 1)) {
-    err_ += "No TIFF Tags.\n";
-    return false;
-  }
-
-  // add STRIP_OFFSET tag and sort IFD tags.
-  std::vector<IFDTag> tags = ifd_tags_;
-  {
-    // For STRIP_OFFSET we need the actual offset value to data(image),
-    // thus write STRIP_OFFSET here.
-    unsigned int offset = strip_offset + kHeaderSize;
-    IFDTag ifd;
-    ifd.tag = TIFFTAG_STRIP_OFFSET;
-    ifd.type = TIFF_LONG;
-    ifd.count = 1;
-    ifd.offset_or_value = offset;
-    tags.push_back(ifd);
-  }
-
-  // TIFF expects IFD tags are sorted.
-  std::sort(tags.begin(), tags.end(), IFDComparator);
-
-  std::ostringstream ifd_os;
-
-  unsigned short num_fields = static_cast<unsigned short>(tags.size());
-
-  Write2(num_fields, &ifd_os, swap_endian_);
-
-  {
-    size_t typesize_table[] = {1, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8, 4};
-
-    for (size_t i = 0; i < tags.size(); i++) {
-      const IFDTag &ifd = tags[i];
-      Write2(ifd.tag, &ifd_os, swap_endian_);
-      Write2(ifd.type, &ifd_os, swap_endian_);
-      Write4(ifd.count, &ifd_os, swap_endian_);
-
-      size_t len =
-          ifd.count * (typesize_table[(ifd.type) < 14 ? (ifd.type) : 0]);
-      if (len > 4) {
-        // Store offset value.
-        unsigned int ifd_offt = ifd.offset_or_value + data_base_offset;
-        Write4(ifd_offt, &ifd_os, swap_endian_);
-      } else {
-        // less than 4 bytes = store data itself.
-
-        if (len == 1) {
-          const unsigned char value =
-              *(reinterpret_cast<const unsigned char *>(&ifd.offset_or_value));
-          Write1(value, &ifd_os);
-          unsigned char pad = 0;
-          Write1(pad, &ifd_os);
-          Write1(pad, &ifd_os);
-          Write1(pad, &ifd_os);
-        } else if (len == 2) {
-          const unsigned short value =
-              *(reinterpret_cast<const unsigned short *>(&ifd.offset_or_value));
-          Write2(value, &ifd_os, swap_endian_);
-          const unsigned short pad = 0;
-          Write2(pad, &ifd_os, swap_endian_);
-        } else if (len == 4) {
-          const unsigned int value =
-              *(reinterpret_cast<const unsigned int *>(&ifd.offset_or_value));
-          Write4(value, &ifd_os, swap_endian_);
-        } else {
-          assert(0);
-        }
-      }
-    }
-
-    ofs->write(ifd_os.str().c_str(),
-               static_cast<std::streamsize>(ifd_os.str().length()));
-  }
-
-  return true;
-}
-
-// -------------------------------------------
-
-DNGWriter::DNGWriter(bool big_endian) : dng_big_endian_(big_endian) {
-  swap_endian_ = (IsBigEndian() != dng_big_endian_);
-}
-
-bool DNGWriter::WriteToFile(const char *filename, std::string *err) const {
-  std::ofstream ofs(filename, std::ostream::binary);
-
-  if (!ofs) {
-    if (err) {
-      (*err) = "Failed to open file.\n";
-    }
-
-    return false;
-  }
-
-  std::ostringstream header;
-  bool ret = WriteTIFFVersionHeader(&header, dng_big_endian_);
-  if (!ret) {
-    if (err) {
-      (*err) = "Failed to write TIFF version header.\n";
-    }
-    return false;
-  }
-
-  if (images_.size() == 0) {
-    if (err) {
-      (*err) = "No image added for writing.\n";
-    }
-
-    return false;
-  }
-
-  // 1. Compute offset and data size(exclude TIFF header bytes)
-  size_t data_len = 0;
-  size_t strip_offset = 0;
-  std::vector<size_t> data_offset_table;
-  std::vector<size_t> strip_offset_table;
-  for (size_t i = 0; i < images_.size(); i++) {
-    strip_offset = data_len + images_[i]->GetStripOffset();
-    data_offset_table.push_back(data_len);
-    strip_offset_table.push_back(strip_offset);
-    data_len += images_[i]->GetDataSize();
-  }
-
-  // 2. Write offset to ifd table.
-  const unsigned int ifd_offset =
-      kHeaderSize + static_cast<unsigned int>(data_len);
-  Write4(ifd_offset, &header, swap_endian_);
-
-  assert(header.str().length() == 8);
-
-  // std::cout << "ifd_offset " << ifd_offset << std::endl;
-  // std::cout << "data_len " << data_os_.str().length() << std::endl;
-  // std::cout << "ifd_len " << ifd_os_.str().length() << std::endl;
-  // std::cout << "swap endian " << swap_endian_ << std::endl;
-
-  // 3. Write header
-  ofs.write(header.str().c_str(),
-            static_cast<std::streamsize>(header.str().length()));
-
-  // 4. Write image and meta data
-  // TODO(syoyo): Write IFD first, then image/meta data
-  for (size_t i = 0; i < images_.size(); i++) {
-    bool ok = images_[i]->WriteDataToStream(&ofs);
-    if (!ok) {
-      if (err) {
-        std::stringstream ss;
-        ss << "Failed to write data at image[" << i << "]. err = " << images_[i]->Error() << "\n";
-        (*err) += ss.str();
-      }
-      return false;
-    }
-  }
-
-  // 5. Write IFD entries;
-  for (size_t i = 0; i < images_.size(); i++) {
-    bool ok = images_[i]->WriteIFDToStream(
-        static_cast<unsigned int>(data_offset_table[i]),
-        static_cast<unsigned int>(strip_offset_table[i]), &ofs);
-    if (!ok) {
-      if (err) {
-        std::stringstream ss;
-        ss << "Failed to write IFD at image[" << i << "]. err = " << images_[i]->Error() << "\n";
-        (*err) += ss.str();
-      }
-      return false;
-    }
-
-    unsigned int next_ifd_offset =
-        static_cast<unsigned int>(ofs.tellp()) + sizeof(unsigned int);
-
-    if (i == (images_.size() - 1)) {
-      // Write zero as IFD offset(= end of data)
-      next_ifd_offset = 0;
-    }
-
-    if (swap_endian_) {
-      swap4(&next_ifd_offset);
-    }
-
-    ofs.write(reinterpret_cast<const char *>(&next_ifd_offset), 4);
-  }
-
-  return true;
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-}  // namespace tinydngwriter
-
-#endif  // TINY_DNG_WRITER_IMPLEMENTATION
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_gltf.cc b/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_gltf.cc
deleted file mode 100644
index 3f2791520..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_gltf.cc
+++ /dev/null
@@ -1,4 +0,0 @@
-#define TINYGLTF_IMPLEMENTATION
-#define STB_IMAGE_IMPLEMENTATION
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "tiny_gltf.h"
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_gltf.h b/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_gltf.h
deleted file mode 100644
index 4f8fcd2b9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_gltf.h
+++ /dev/null
@@ -1,7905 +0,0 @@
-//
-// Header-only tiny glTF 2.0 loader and serializer.
-//
-//
-// The MIT License (MIT)
-//
-// Copyright (c) 2015 - Present Syoyo Fujita, Aurélien Chatelain and many
-// contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-// Version:
-//  - v2.6.3 Fix GLB file with empty BIN chunk was not handled. PR#382 and PR#383.
-//  - v2.6.2 Fix out-of-bounds access of accessors. PR#379.
-//  - v2.6.1 Better GLB validation check when loading.
-//  - v2.6.0 Support serializing sparse accessor(Thanks to @fynv).
-//           Disable expanding file path for security(no use of awkward `wordexp` anymore).
-//  - v2.5.0 Add SetPreserveImageChannels() option to load image data as is.
-//  - v2.4.3 Fix null object output when when material has all default
-//  parameters.
-//  - v2.4.2 Decode percent-encoded URI.
-//  - v2.4.1 Fix some glTF object class does not have `extensions` and/or
-//  `extras` property.
-//  - v2.4.0 Experimental RapidJSON and C++14 support(Thanks to @jrkoone).
-//  - v2.3.1 Set default value of minFilter and magFilter in Sampler to -1.
-//  - v2.3.0 Modified Material representation according to glTF 2.0 schema
-//           (and introduced TextureInfo class)
-//           Change the behavior of `Value::IsNumber`. It return true either the
-//           value is int or real.
-//  - v2.2.0 Add loading 16bit PNG support. Add Sparse accessor support(Thanks
-//  to @Ybalrid)
-//  - v2.1.0 Add draco compression.
-//  - v2.0.1 Add comparsion feature(Thanks to @Selmar).
-//  - v2.0.0 glTF 2.0!.
-//
-// Tiny glTF loader is using following third party libraries:
-//
-//  - jsonhpp: C++ JSON library.
-//  - base64: base64 decode/encode library.
-//  - stb_image: Image loading library.
-//
-#ifndef TINY_GLTF_H_
-#define TINY_GLTF_H_
-
-#include <array>
-#include <cassert>
-#include <cmath>  // std::fabs
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <limits>
-#include <map>
-#include <string>
-#include <vector>
-
-//Auto-detect C++14 standard version
-#if !defined(TINYGLTF_USE_CPP14) && defined(__cplusplus) && (__cplusplus >= 201402L)
-#define TINYGLTF_USE_CPP14
-#endif
-
-#ifndef TINYGLTF_USE_CPP14
-#include <functional>
-#endif
-
-#ifdef __ANDROID__
-#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
-#include <android/asset_manager.h>
-#endif
-#endif
-
-#ifdef __GNUC__
-#if (__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 8))
-#define TINYGLTF_NOEXCEPT
-#else
-#define TINYGLTF_NOEXCEPT noexcept
-#endif
-#else
-#define TINYGLTF_NOEXCEPT noexcept
-#endif
-
-#define DEFAULT_METHODS(x)             \
-  ~x() = default;                      \
-  x(const x &) = default;              \
-  x(x &&) TINYGLTF_NOEXCEPT = default; \
-  x &operator=(const x &) = default;   \
-  x &operator=(x &&) TINYGLTF_NOEXCEPT = default;
-
-namespace tinygltf {
-
-#define TINYGLTF_MODE_POINTS (0)
-#define TINYGLTF_MODE_LINE (1)
-#define TINYGLTF_MODE_LINE_LOOP (2)
-#define TINYGLTF_MODE_LINE_STRIP (3)
-#define TINYGLTF_MODE_TRIANGLES (4)
-#define TINYGLTF_MODE_TRIANGLE_STRIP (5)
-#define TINYGLTF_MODE_TRIANGLE_FAN (6)
-
-#define TINYGLTF_COMPONENT_TYPE_BYTE (5120)
-#define TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE (5121)
-#define TINYGLTF_COMPONENT_TYPE_SHORT (5122)
-#define TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT (5123)
-#define TINYGLTF_COMPONENT_TYPE_INT (5124)
-#define TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT (5125)
-#define TINYGLTF_COMPONENT_TYPE_FLOAT (5126)
-#define TINYGLTF_COMPONENT_TYPE_DOUBLE \
-  (5130)  // OpenGL double type. Note that some of glTF 2.0 validator does not
-          // support double type even the schema seems allow any value of
-          // integer:
-          // https://github.com/KhronosGroup/glTF/blob/b9884a2fd45130b4d673dd6c8a706ee21ee5c5f7/specification/2.0/schema/accessor.schema.json#L22
-
-#define TINYGLTF_TEXTURE_FILTER_NEAREST (9728)
-#define TINYGLTF_TEXTURE_FILTER_LINEAR (9729)
-#define TINYGLTF_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST (9984)
-#define TINYGLTF_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST (9985)
-#define TINYGLTF_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR (9986)
-#define TINYGLTF_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR (9987)
-
-#define TINYGLTF_TEXTURE_WRAP_REPEAT (10497)
-#define TINYGLTF_TEXTURE_WRAP_CLAMP_TO_EDGE (33071)
-#define TINYGLTF_TEXTURE_WRAP_MIRRORED_REPEAT (33648)
-
-// Redeclarations of the above for technique.parameters.
-#define TINYGLTF_PARAMETER_TYPE_BYTE (5120)
-#define TINYGLTF_PARAMETER_TYPE_UNSIGNED_BYTE (5121)
-#define TINYGLTF_PARAMETER_TYPE_SHORT (5122)
-#define TINYGLTF_PARAMETER_TYPE_UNSIGNED_SHORT (5123)
-#define TINYGLTF_PARAMETER_TYPE_INT (5124)
-#define TINYGLTF_PARAMETER_TYPE_UNSIGNED_INT (5125)
-#define TINYGLTF_PARAMETER_TYPE_FLOAT (5126)
-
-#define TINYGLTF_PARAMETER_TYPE_FLOAT_VEC2 (35664)
-#define TINYGLTF_PARAMETER_TYPE_FLOAT_VEC3 (35665)
-#define TINYGLTF_PARAMETER_TYPE_FLOAT_VEC4 (35666)
-
-#define TINYGLTF_PARAMETER_TYPE_INT_VEC2 (35667)
-#define TINYGLTF_PARAMETER_TYPE_INT_VEC3 (35668)
-#define TINYGLTF_PARAMETER_TYPE_INT_VEC4 (35669)
-
-#define TINYGLTF_PARAMETER_TYPE_BOOL (35670)
-#define TINYGLTF_PARAMETER_TYPE_BOOL_VEC2 (35671)
-#define TINYGLTF_PARAMETER_TYPE_BOOL_VEC3 (35672)
-#define TINYGLTF_PARAMETER_TYPE_BOOL_VEC4 (35673)
-
-#define TINYGLTF_PARAMETER_TYPE_FLOAT_MAT2 (35674)
-#define TINYGLTF_PARAMETER_TYPE_FLOAT_MAT3 (35675)
-#define TINYGLTF_PARAMETER_TYPE_FLOAT_MAT4 (35676)
-
-#define TINYGLTF_PARAMETER_TYPE_SAMPLER_2D (35678)
-
-// End parameter types
-
-#define TINYGLTF_TYPE_VEC2 (2)
-#define TINYGLTF_TYPE_VEC3 (3)
-#define TINYGLTF_TYPE_VEC4 (4)
-#define TINYGLTF_TYPE_MAT2 (32 + 2)
-#define TINYGLTF_TYPE_MAT3 (32 + 3)
-#define TINYGLTF_TYPE_MAT4 (32 + 4)
-#define TINYGLTF_TYPE_SCALAR (64 + 1)
-#define TINYGLTF_TYPE_VECTOR (64 + 4)
-#define TINYGLTF_TYPE_MATRIX (64 + 16)
-
-#define TINYGLTF_IMAGE_FORMAT_JPEG (0)
-#define TINYGLTF_IMAGE_FORMAT_PNG (1)
-#define TINYGLTF_IMAGE_FORMAT_BMP (2)
-#define TINYGLTF_IMAGE_FORMAT_GIF (3)
-
-#define TINYGLTF_TEXTURE_FORMAT_ALPHA (6406)
-#define TINYGLTF_TEXTURE_FORMAT_RGB (6407)
-#define TINYGLTF_TEXTURE_FORMAT_RGBA (6408)
-#define TINYGLTF_TEXTURE_FORMAT_LUMINANCE (6409)
-#define TINYGLTF_TEXTURE_FORMAT_LUMINANCE_ALPHA (6410)
-
-#define TINYGLTF_TEXTURE_TARGET_TEXTURE2D (3553)
-#define TINYGLTF_TEXTURE_TYPE_UNSIGNED_BYTE (5121)
-
-#define TINYGLTF_TARGET_ARRAY_BUFFER (34962)
-#define TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER (34963)
-
-#define TINYGLTF_SHADER_TYPE_VERTEX_SHADER (35633)
-#define TINYGLTF_SHADER_TYPE_FRAGMENT_SHADER (35632)
-
-#define TINYGLTF_DOUBLE_EPS (1.e-12)
-#define TINYGLTF_DOUBLE_EQUAL(a, b) (std::fabs((b) - (a)) < TINYGLTF_DOUBLE_EPS)
-
-#ifdef __ANDROID__
-#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
-AAssetManager *asset_manager = nullptr;
-#endif
-#endif
-
-typedef enum {
-  NULL_TYPE,
-  REAL_TYPE,
-  INT_TYPE,
-  BOOL_TYPE,
-  STRING_TYPE,
-  ARRAY_TYPE,
-  BINARY_TYPE,
-  OBJECT_TYPE
-} Type;
-
-static inline int32_t GetComponentSizeInBytes(uint32_t componentType) {
-  if (componentType == TINYGLTF_COMPONENT_TYPE_BYTE) {
-    return 1;
-  } else if (componentType == TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE) {
-    return 1;
-  } else if (componentType == TINYGLTF_COMPONENT_TYPE_SHORT) {
-    return 2;
-  } else if (componentType == TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT) {
-    return 2;
-  } else if (componentType == TINYGLTF_COMPONENT_TYPE_INT) {
-    return 4;
-  } else if (componentType == TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT) {
-    return 4;
-  } else if (componentType == TINYGLTF_COMPONENT_TYPE_FLOAT) {
-    return 4;
-  } else if (componentType == TINYGLTF_COMPONENT_TYPE_DOUBLE) {
-    return 8;
-  } else {
-    // Unknown componenty type
-    return -1;
-  }
-}
-
-static inline int32_t GetNumComponentsInType(uint32_t ty) {
-  if (ty == TINYGLTF_TYPE_SCALAR) {
-    return 1;
-  } else if (ty == TINYGLTF_TYPE_VEC2) {
-    return 2;
-  } else if (ty == TINYGLTF_TYPE_VEC3) {
-    return 3;
-  } else if (ty == TINYGLTF_TYPE_VEC4) {
-    return 4;
-  } else if (ty == TINYGLTF_TYPE_MAT2) {
-    return 4;
-  } else if (ty == TINYGLTF_TYPE_MAT3) {
-    return 9;
-  } else if (ty == TINYGLTF_TYPE_MAT4) {
-    return 16;
-  } else {
-    // Unknown componenty type
-    return -1;
-  }
-}
-
-// TODO(syoyo): Move these functions to TinyGLTF class
-bool IsDataURI(const std::string &in);
-bool DecodeDataURI(std::vector<unsigned char> *out, std::string &mime_type,
-                   const std::string &in, size_t reqBytes, bool checkSize);
-
-#ifdef __clang__
-#pragma clang diagnostic push
-// Suppress warning for : static Value null_value
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// Simple class to represent JSON object
-class Value {
- public:
-  typedef std::vector<Value> Array;
-  typedef std::map<std::string, Value> Object;
-
-  Value()
-      : type_(NULL_TYPE),
-        int_value_(0),
-        real_value_(0.0),
-        boolean_value_(false) {}
-
-  explicit Value(bool b) : type_(BOOL_TYPE) { boolean_value_ = b; }
-  explicit Value(int i) : type_(INT_TYPE) {
-    int_value_ = i;
-    real_value_ = i;
-  }
-  explicit Value(double n) : type_(REAL_TYPE) { real_value_ = n; }
-  explicit Value(const std::string &s) : type_(STRING_TYPE) {
-    string_value_ = s;
-  }
-  explicit Value(std::string &&s)
-      : type_(STRING_TYPE), string_value_(std::move(s)) {}
-  explicit Value(const unsigned char *p, size_t n) : type_(BINARY_TYPE) {
-    binary_value_.resize(n);
-    memcpy(binary_value_.data(), p, n);
-  }
-  explicit Value(std::vector<unsigned char> &&v) noexcept
-      : type_(BINARY_TYPE),
-        binary_value_(std::move(v)) {}
-  explicit Value(const Array &a) : type_(ARRAY_TYPE) { array_value_ = a; }
-  explicit Value(Array &&a) noexcept : type_(ARRAY_TYPE),
-                                       array_value_(std::move(a)) {}
-
-  explicit Value(const Object &o) : type_(OBJECT_TYPE) { object_value_ = o; }
-  explicit Value(Object &&o) noexcept : type_(OBJECT_TYPE),
-                                        object_value_(std::move(o)) {}
-
-  DEFAULT_METHODS(Value)
-
-  char Type() const { return static_cast<char>(type_); }
-
-  bool IsBool() const { return (type_ == BOOL_TYPE); }
-
-  bool IsInt() const { return (type_ == INT_TYPE); }
-
-  bool IsNumber() const { return (type_ == REAL_TYPE) || (type_ == INT_TYPE); }
-
-  bool IsReal() const { return (type_ == REAL_TYPE); }
-
-  bool IsString() const { return (type_ == STRING_TYPE); }
-
-  bool IsBinary() const { return (type_ == BINARY_TYPE); }
-
-  bool IsArray() const { return (type_ == ARRAY_TYPE); }
-
-  bool IsObject() const { return (type_ == OBJECT_TYPE); }
-
-  // Use this function if you want to have number value as double.
-  double GetNumberAsDouble() const {
-    if (type_ == INT_TYPE) {
-      return double(int_value_);
-    } else {
-      return real_value_;
-    }
-  }
-
-  // Use this function if you want to have number value as int.
-  // TODO(syoyo): Support int value larger than 32 bits
-  int GetNumberAsInt() const {
-    if (type_ == REAL_TYPE) {
-      return int(real_value_);
-    } else {
-      return int_value_;
-    }
-  }
-
-  // Accessor
-  template <typename T>
-  const T &Get() const;
-  template <typename T>
-  T &Get();
-
-  // Lookup value from an array
-  const Value &Get(int idx) const {
-    static Value null_value;
-    assert(IsArray());
-    assert(idx >= 0);
-    return (static_cast<size_t>(idx) < array_value_.size())
-               ? array_value_[static_cast<size_t>(idx)]
-               : null_value;
-  }
-
-  // Lookup value from a key-value pair
-  const Value &Get(const std::string &key) const {
-    static Value null_value;
-    assert(IsObject());
-    Object::const_iterator it = object_value_.find(key);
-    return (it != object_value_.end()) ? it->second : null_value;
-  }
-
-  size_t ArrayLen() const {
-    if (!IsArray()) return 0;
-    return array_value_.size();
-  }
-
-  // Valid only for object type.
-  bool Has(const std::string &key) const {
-    if (!IsObject()) return false;
-    Object::const_iterator it = object_value_.find(key);
-    return (it != object_value_.end()) ? true : false;
-  }
-
-  // List keys
-  std::vector<std::string> Keys() const {
-    std::vector<std::string> keys;
-    if (!IsObject()) return keys;  // empty
-
-    for (Object::const_iterator it = object_value_.begin();
-         it != object_value_.end(); ++it) {
-      keys.push_back(it->first);
-    }
-
-    return keys;
-  }
-
-  size_t Size() const { return (IsArray() ? ArrayLen() : Keys().size()); }
-
-  bool operator==(const tinygltf::Value &other) const;
-
- protected:
-  int type_ = NULL_TYPE;
-
-  int int_value_ = 0;
-  double real_value_ = 0.0;
-  std::string string_value_;
-  std::vector<unsigned char> binary_value_;
-  Array array_value_;
-  Object object_value_;
-  bool boolean_value_ = false;
-};
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#define TINYGLTF_VALUE_GET(ctype, var)            \
-  template <>                                     \
-  inline const ctype &Value::Get<ctype>() const { \
-    return var;                                   \
-  }                                               \
-  template <>                                     \
-  inline ctype &Value::Get<ctype>() {             \
-    return var;                                   \
-  }
-TINYGLTF_VALUE_GET(bool, boolean_value_)
-TINYGLTF_VALUE_GET(double, real_value_)
-TINYGLTF_VALUE_GET(int, int_value_)
-TINYGLTF_VALUE_GET(std::string, string_value_)
-TINYGLTF_VALUE_GET(std::vector<unsigned char>, binary_value_)
-TINYGLTF_VALUE_GET(Value::Array, array_value_)
-TINYGLTF_VALUE_GET(Value::Object, object_value_)
-#undef TINYGLTF_VALUE_GET
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-/// Agregate object for representing a color
-using ColorValue = std::array<double, 4>;
-
-// === legacy interface ====
-// TODO(syoyo): Deprecate `Parameter` class.
-struct Parameter {
-  bool bool_value = false;
-  bool has_number_value = false;
-  std::string string_value;
-  std::vector<double> number_array;
-  std::map<std::string, double> json_double_value;
-  double number_value = 0.0;
-
-  // context sensitive methods. depending the type of the Parameter you are
-  // accessing, these are either valid or not
-  // If this parameter represent a texture map in a material, will return the
-  // texture index
-
-  /// Return the index of a texture if this Parameter is a texture map.
-  /// Returned value is only valid if the parameter represent a texture from a
-  /// material
-  int TextureIndex() const {
-    const auto it = json_double_value.find("index");
-    if (it != std::end(json_double_value)) {
-      return int(it->second);
-    }
-    return -1;
-  }
-
-  /// Return the index of a texture coordinate set if this Parameter is a
-  /// texture map. Returned value is only valid if the parameter represent a
-  /// texture from a material
-  int TextureTexCoord() const {
-    const auto it = json_double_value.find("texCoord");
-    if (it != std::end(json_double_value)) {
-      return int(it->second);
-    }
-    // As per the spec, if texCoord is ommited, this parameter is 0
-    return 0;
-  }
-
-  /// Return the scale of a texture if this Parameter is a normal texture map.
-  /// Returned value is only valid if the parameter represent a normal texture
-  /// from a material
-  double TextureScale() const {
-    const auto it = json_double_value.find("scale");
-    if (it != std::end(json_double_value)) {
-      return it->second;
-    }
-    // As per the spec, if scale is ommited, this paramter is 1
-    return 1;
-  }
-
-  /// Return the strength of a texture if this Parameter is a an occlusion map.
-  /// Returned value is only valid if the parameter represent an occlusion map
-  /// from a material
-  double TextureStrength() const {
-    const auto it = json_double_value.find("strength");
-    if (it != std::end(json_double_value)) {
-      return it->second;
-    }
-    // As per the spec, if strenghth is ommited, this parameter is 1
-    return 1;
-  }
-
-  /// Material factor, like the roughness or metalness of a material
-  /// Returned value is only valid if the parameter represent a texture from a
-  /// material
-  double Factor() const { return number_value; }
-
-  /// Return the color of a material
-  /// Returned value is only valid if the parameter represent a texture from a
-  /// material
-  ColorValue ColorFactor() const {
-    return {
-        {// this agregate intialize the std::array object, and uses C++11 RVO.
-         number_array[0], number_array[1], number_array[2],
-         (number_array.size() > 3 ? number_array[3] : 1.0)}};
-  }
-
-  Parameter() = default;
-  DEFAULT_METHODS(Parameter)
-  bool operator==(const Parameter &) const;
-};
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-typedef std::map<std::string, Parameter> ParameterMap;
-typedef std::map<std::string, Value> ExtensionMap;
-
-struct AnimationChannel {
-  int sampler;              // required
-  int target_node;          // required (index of the node to target)
-  std::string target_path;  // required in ["translation", "rotation", "scale",
-                            // "weights"]
-  Value extras;
-  ExtensionMap extensions;
-  ExtensionMap target_extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-  std::string target_extensions_json_string;
-
-  AnimationChannel() : sampler(-1), target_node(-1) {}
-  DEFAULT_METHODS(AnimationChannel)
-  bool operator==(const AnimationChannel &) const;
-};
-
-struct AnimationSampler {
-  int input;                  // required
-  int output;                 // required
-  std::string interpolation;  // "LINEAR", "STEP","CUBICSPLINE" or user defined
-                              // string. default "LINEAR"
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  AnimationSampler() : input(-1), output(-1), interpolation("LINEAR") {}
-  DEFAULT_METHODS(AnimationSampler)
-  bool operator==(const AnimationSampler &) const;
-};
-
-struct Animation {
-  std::string name;
-  std::vector<AnimationChannel> channels;
-  std::vector<AnimationSampler> samplers;
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Animation() = default;
-  DEFAULT_METHODS(Animation)
-  bool operator==(const Animation &) const;
-};
-
-struct Skin {
-  std::string name;
-  int inverseBindMatrices;  // required here but not in the spec
-  int skeleton;             // The index of the node used as a skeleton root
-  std::vector<int> joints;  // Indices of skeleton nodes
-
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Skin() {
-    inverseBindMatrices = -1;
-    skeleton = -1;
-  }
-  DEFAULT_METHODS(Skin)
-  bool operator==(const Skin &) const;
-};
-
-struct Sampler {
-  std::string name;
-  // glTF 2.0 spec does not define default value for `minFilter` and
-  // `magFilter`. Set -1 in TinyGLTF(issue #186)
-  int minFilter =
-      -1;  // optional. -1 = no filter defined. ["NEAREST", "LINEAR",
-           // "NEAREST_MIPMAP_NEAREST", "LINEAR_MIPMAP_NEAREST",
-           // "NEAREST_MIPMAP_LINEAR", "LINEAR_MIPMAP_LINEAR"]
-  int magFilter =
-      -1;  // optional. -1 = no filter defined. ["NEAREST", "LINEAR"]
-  int wrapS =
-      TINYGLTF_TEXTURE_WRAP_REPEAT;  // ["CLAMP_TO_EDGE", "MIRRORED_REPEAT",
-                                     // "REPEAT"], default "REPEAT"
-  int wrapT =
-      TINYGLTF_TEXTURE_WRAP_REPEAT;  // ["CLAMP_TO_EDGE", "MIRRORED_REPEAT",
-                                     // "REPEAT"], default "REPEAT"
-  // int wrapR = TINYGLTF_TEXTURE_WRAP_REPEAT;  // TinyGLTF extension. currently
-  // not used.
-
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Sampler()
-      : minFilter(-1),
-        magFilter(-1),
-        wrapS(TINYGLTF_TEXTURE_WRAP_REPEAT),
-        wrapT(TINYGLTF_TEXTURE_WRAP_REPEAT) {}
-  DEFAULT_METHODS(Sampler)
-  bool operator==(const Sampler &) const;
-};
-
-struct Image {
-  std::string name;
-  int width;
-  int height;
-  int component;
-  int bits;        // bit depth per channel. 8(byte), 16 or 32.
-  int pixel_type;  // pixel type(TINYGLTF_COMPONENT_TYPE_***). usually
-                   // UBYTE(bits = 8) or USHORT(bits = 16)
-  std::vector<unsigned char> image;
-  int bufferView;        // (required if no uri)
-  std::string mimeType;  // (required if no uri) ["image/jpeg", "image/png",
-                         // "image/bmp", "image/gif"]
-  std::string uri;       // (required if no mimeType) uri is not decoded(e.g.
-                         // whitespace may be represented as %20)
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  // When this flag is true, data is stored to `image` in as-is format(e.g. jpeg
-  // compressed for "image/jpeg" mime) This feature is good if you use custom
-  // image loader function. (e.g. delayed decoding of images for faster glTF
-  // parsing) Default parser for Image does not provide as-is loading feature at
-  // the moment. (You can manipulate this by providing your own LoadImageData
-  // function)
-  bool as_is;
-
-  Image() : as_is(false) {
-    bufferView = -1;
-    width = -1;
-    height = -1;
-    component = -1;
-    bits = -1;
-    pixel_type = -1;
-  }
-  DEFAULT_METHODS(Image)
-
-  bool operator==(const Image &) const;
-};
-
-struct Texture {
-  std::string name;
-
-  int sampler;
-  int source;
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Texture() : sampler(-1), source(-1) {}
-  DEFAULT_METHODS(Texture)
-
-  bool operator==(const Texture &) const;
-};
-
-struct TextureInfo {
-  int index = -1;  // required.
-  int texCoord;    // The set index of texture's TEXCOORD attribute used for
-                   // texture coordinate mapping.
-
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  TextureInfo() : index(-1), texCoord(0) {}
-  DEFAULT_METHODS(TextureInfo)
-  bool operator==(const TextureInfo &) const;
-};
-
-struct NormalTextureInfo {
-  int index = -1;  // required
-  int texCoord;    // The set index of texture's TEXCOORD attribute used for
-                   // texture coordinate mapping.
-  double scale;    // scaledNormal = normalize((<sampled normal texture value>
-                   // * 2.0 - 1.0) * vec3(<normal scale>, <normal scale>, 1.0))
-
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  NormalTextureInfo() : index(-1), texCoord(0), scale(1.0) {}
-  DEFAULT_METHODS(NormalTextureInfo)
-  bool operator==(const NormalTextureInfo &) const;
-};
-
-struct OcclusionTextureInfo {
-  int index = -1;   // required
-  int texCoord;     // The set index of texture's TEXCOORD attribute used for
-                    // texture coordinate mapping.
-  double strength;  // occludedColor = lerp(color, color * <sampled occlusion
-                    // texture value>, <occlusion strength>)
-
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  OcclusionTextureInfo() : index(-1), texCoord(0), strength(1.0) {}
-  DEFAULT_METHODS(OcclusionTextureInfo)
-  bool operator==(const OcclusionTextureInfo &) const;
-};
-
-// pbrMetallicRoughness class defined in glTF 2.0 spec.
-struct PbrMetallicRoughness {
-  std::vector<double> baseColorFactor;  // len = 4. default [1,1,1,1]
-  TextureInfo baseColorTexture;
-  double metallicFactor;   // default 1
-  double roughnessFactor;  // default 1
-  TextureInfo metallicRoughnessTexture;
-
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  PbrMetallicRoughness()
-      : baseColorFactor(std::vector<double>{1.0, 1.0, 1.0, 1.0}),
-        metallicFactor(1.0),
-        roughnessFactor(1.0) {}
-  DEFAULT_METHODS(PbrMetallicRoughness)
-  bool operator==(const PbrMetallicRoughness &) const;
-};
-
-// Each extension should be stored in a ParameterMap.
-// members not in the values could be included in the ParameterMap
-// to keep a single material model
-struct Material {
-  std::string name;
-
-  std::vector<double> emissiveFactor;  // length 3. default [0, 0, 0]
-  std::string alphaMode;               // default "OPAQUE"
-  double alphaCutoff;                  // default 0.5
-  bool doubleSided;                    // default false;
-
-  PbrMetallicRoughness pbrMetallicRoughness;
-
-  NormalTextureInfo normalTexture;
-  OcclusionTextureInfo occlusionTexture;
-  TextureInfo emissiveTexture;
-
-  // For backward compatibility
-  // TODO(syoyo): Remove `values` and `additionalValues` in the next release.
-  ParameterMap values;
-  ParameterMap additionalValues;
-
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Material() : alphaMode("OPAQUE"), alphaCutoff(0.5), doubleSided(false) {}
-  DEFAULT_METHODS(Material)
-
-  bool operator==(const Material &) const;
-};
-
-struct BufferView {
-  std::string name;
-  int buffer{-1};        // Required
-  size_t byteOffset{0};  // minimum 0, default 0
-  size_t byteLength{0};  // required, minimum 1. 0 = invalid
-  size_t byteStride{0};  // minimum 4, maximum 252 (multiple of 4), default 0 =
-                         // understood to be tightly packed
-  int target{0};  // ["ARRAY_BUFFER", "ELEMENT_ARRAY_BUFFER"] for vertex indices
-                  // or atttribs. Could be 0 for other data
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  bool dracoDecoded{false};  // Flag indicating this has been draco decoded
-
-  BufferView()
-      : buffer(-1),
-        byteOffset(0),
-        byteLength(0),
-        byteStride(0),
-        target(0),
-        dracoDecoded(false) {}
-  DEFAULT_METHODS(BufferView)
-  bool operator==(const BufferView &) const;
-};
-
-struct Accessor {
-  int bufferView;  // optional in spec but required here since sparse accessor
-                   // are not supported
-  std::string name;
-  size_t byteOffset;
-  bool normalized;    // optional.
-  int componentType;  // (required) One of TINYGLTF_COMPONENT_TYPE_***
-  size_t count;       // required
-  int type;           // (required) One of TINYGLTF_TYPE_***   ..
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  std::vector<double>
-      minValues;  // optional. integer value is promoted to double
-  std::vector<double>
-      maxValues;  // optional. integer value is promoted to double
-
-  struct {
-    int count;
-    bool isSparse;
-    struct {
-      int byteOffset;
-      int bufferView;
-      int componentType;  // a TINYGLTF_COMPONENT_TYPE_ value
-    } indices;
-    struct {
-      int bufferView;
-      int byteOffset;
-    } values;
-  } sparse;
-
-  ///
-  /// Utility function to compute byteStride for a given bufferView object.
-  /// Returns -1 upon invalid glTF value or parameter configuration.
-  ///
-  int ByteStride(const BufferView &bufferViewObject) const {
-    if (bufferViewObject.byteStride == 0) {
-      // Assume data is tightly packed.
-      int componentSizeInBytes =
-          GetComponentSizeInBytes(static_cast<uint32_t>(componentType));
-      if (componentSizeInBytes <= 0) {
-        return -1;
-      }
-
-      int numComponents = GetNumComponentsInType(static_cast<uint32_t>(type));
-      if (numComponents <= 0) {
-        return -1;
-      }
-
-      return componentSizeInBytes * numComponents;
-    } else {
-      // Check if byteStride is a mulple of the size of the accessor's component
-      // type.
-      int componentSizeInBytes =
-          GetComponentSizeInBytes(static_cast<uint32_t>(componentType));
-      if (componentSizeInBytes <= 0) {
-        return -1;
-      }
-
-      if ((bufferViewObject.byteStride % uint32_t(componentSizeInBytes)) != 0) {
-        return -1;
-      }
-      return static_cast<int>(bufferViewObject.byteStride);
-    }
-
-    // unreachable return 0;
-  }
-
-  Accessor()
-      : bufferView(-1),
-        byteOffset(0),
-        normalized(false),
-        componentType(-1),
-        count(0),
-        type(-1) {
-    sparse.isSparse = false;
-  }
-  DEFAULT_METHODS(Accessor)
-  bool operator==(const tinygltf::Accessor &) const;
-};
-
-struct PerspectiveCamera {
-  double aspectRatio;  // min > 0
-  double yfov;         // required. min > 0
-  double zfar;         // min > 0
-  double znear;        // required. min > 0
-
-  PerspectiveCamera()
-      : aspectRatio(0.0),
-        yfov(0.0),
-        zfar(0.0)  // 0 = use infinite projecton matrix
-        ,
-        znear(0.0) {}
-  DEFAULT_METHODS(PerspectiveCamera)
-  bool operator==(const PerspectiveCamera &) const;
-
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-};
-
-struct OrthographicCamera {
-  double xmag;   // required. must not be zero.
-  double ymag;   // required. must not be zero.
-  double zfar;   // required. `zfar` must be greater than `znear`.
-  double znear;  // required
-
-  OrthographicCamera() : xmag(0.0), ymag(0.0), zfar(0.0), znear(0.0) {}
-  DEFAULT_METHODS(OrthographicCamera)
-  bool operator==(const OrthographicCamera &) const;
-
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-};
-
-struct Camera {
-  std::string type;  // required. "perspective" or "orthographic"
-  std::string name;
-
-  PerspectiveCamera perspective;
-  OrthographicCamera orthographic;
-
-  Camera() {}
-  DEFAULT_METHODS(Camera)
-  bool operator==(const Camera &) const;
-
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-};
-
-struct Primitive {
-  std::map<std::string, int> attributes;  // (required) A dictionary object of
-                                          // integer, where each integer
-                                          // is the index of the accessor
-                                          // containing an attribute.
-  int material;  // The index of the material to apply to this primitive
-                 // when rendering.
-  int indices;   // The index of the accessor that contains the indices.
-  int mode;      // one of TINYGLTF_MODE_***
-  std::vector<std::map<std::string, int> > targets;  // array of morph targets,
-  // where each target is a dict with attribues in ["POSITION, "NORMAL",
-  // "TANGENT"] pointing
-  // to their corresponding accessors
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Primitive() {
-    material = -1;
-    indices = -1;
-    mode = -1;
-  }
-  DEFAULT_METHODS(Primitive)
-  bool operator==(const Primitive &) const;
-};
-
-struct Mesh {
-  std::string name;
-  std::vector<Primitive> primitives;
-  std::vector<double> weights;  // weights to be applied to the Morph Targets
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Mesh() = default;
-  DEFAULT_METHODS(Mesh)
-  bool operator==(const Mesh &) const;
-};
-
-class Node {
- public:
-  Node() : camera(-1), skin(-1), mesh(-1) {}
-
-  DEFAULT_METHODS(Node)
-
-  bool operator==(const Node &) const;
-
-  int camera;  // the index of the camera referenced by this node
-
-  std::string name;
-  int skin;
-  int mesh;
-  std::vector<int> children;
-  std::vector<double> rotation;     // length must be 0 or 4
-  std::vector<double> scale;        // length must be 0 or 3
-  std::vector<double> translation;  // length must be 0 or 3
-  std::vector<double> matrix;       // length must be 0 or 16
-  std::vector<double> weights;  // The weights of the instantiated Morph Target
-
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-};
-
-struct Buffer {
-  std::string name;
-  std::vector<unsigned char> data;
-  std::string
-      uri;  // considered as required here but not in the spec (need to clarify)
-            // uri is not decoded(e.g. whitespace may be represented as %20)
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Buffer() = default;
-  DEFAULT_METHODS(Buffer)
-  bool operator==(const Buffer &) const;
-};
-
-struct Asset {
-  std::string version = "2.0";  // required
-  std::string generator;
-  std::string minVersion;
-  std::string copyright;
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Asset() = default;
-  DEFAULT_METHODS(Asset)
-  bool operator==(const Asset &) const;
-};
-
-struct Scene {
-  std::string name;
-  std::vector<int> nodes;
-
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-
-  Scene() = default;
-  DEFAULT_METHODS(Scene)
-  bool operator==(const Scene &) const;
-};
-
-struct SpotLight {
-  double innerConeAngle;
-  double outerConeAngle;
-
-  SpotLight() : innerConeAngle(0.0), outerConeAngle(0.7853981634) {}
-  DEFAULT_METHODS(SpotLight)
-  bool operator==(const SpotLight &) const;
-
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-};
-
-struct Light {
-  std::string name;
-  std::vector<double> color;
-  double intensity{1.0};
-  std::string type;
-  double range{0.0};  // 0.0 = inifinite
-  SpotLight spot;
-
-  Light() : intensity(1.0), range(0.0) {}
-  DEFAULT_METHODS(Light)
-
-  bool operator==(const Light &) const;
-
-  ExtensionMap extensions;
-  Value extras;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-};
-
-class Model {
- public:
-  Model() = default;
-  DEFAULT_METHODS(Model)
-
-  bool operator==(const Model &) const;
-
-  std::vector<Accessor> accessors;
-  std::vector<Animation> animations;
-  std::vector<Buffer> buffers;
-  std::vector<BufferView> bufferViews;
-  std::vector<Material> materials;
-  std::vector<Mesh> meshes;
-  std::vector<Node> nodes;
-  std::vector<Texture> textures;
-  std::vector<Image> images;
-  std::vector<Skin> skins;
-  std::vector<Sampler> samplers;
-  std::vector<Camera> cameras;
-  std::vector<Scene> scenes;
-  std::vector<Light> lights;
-
-  int defaultScene = -1;
-  std::vector<std::string> extensionsUsed;
-  std::vector<std::string> extensionsRequired;
-
-  Asset asset;
-
-  Value extras;
-  ExtensionMap extensions;
-
-  // Filled when SetStoreOriginalJSONForExtrasAndExtensions is enabled.
-  std::string extras_json_string;
-  std::string extensions_json_string;
-};
-
-enum SectionCheck {
-  NO_REQUIRE = 0x00,
-  REQUIRE_VERSION = 0x01,
-  REQUIRE_SCENE = 0x02,
-  REQUIRE_SCENES = 0x04,
-  REQUIRE_NODES = 0x08,
-  REQUIRE_ACCESSORS = 0x10,
-  REQUIRE_BUFFERS = 0x20,
-  REQUIRE_BUFFER_VIEWS = 0x40,
-  REQUIRE_ALL = 0x7f
-};
-
-///
-/// LoadImageDataFunction type. Signature for custom image loading callbacks.
-///
-typedef bool (*LoadImageDataFunction)(Image *, const int, std::string *,
-                                      std::string *, int, int,
-                                      const unsigned char *, int,
-                                      void *user_pointer);
-
-///
-/// WriteImageDataFunction type. Signature for custom image writing callbacks.
-///
-typedef bool (*WriteImageDataFunction)(const std::string *, const std::string *,
-                                       Image *, bool, void *);
-
-#ifndef TINYGLTF_NO_STB_IMAGE
-// Declaration of default image loader callback
-bool LoadImageData(Image *image, const int image_idx, std::string *err,
-                   std::string *warn, int req_width, int req_height,
-                   const unsigned char *bytes, int size, void *);
-#endif
-
-#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
-// Declaration of default image writer callback
-bool WriteImageData(const std::string *basepath, const std::string *filename,
-                    Image *image, bool embedImages, void *);
-#endif
-
-///
-/// FilExistsFunction type. Signature for custom filesystem callbacks.
-///
-typedef bool (*FileExistsFunction)(const std::string &abs_filename, void *);
-
-///
-/// ExpandFilePathFunction type. Signature for custom filesystem callbacks.
-///
-typedef std::string (*ExpandFilePathFunction)(const std::string &, void *);
-
-///
-/// ReadWholeFileFunction type. Signature for custom filesystem callbacks.
-///
-typedef bool (*ReadWholeFileFunction)(std::vector<unsigned char> *,
-                                      std::string *, const std::string &,
-                                      void *);
-
-///
-/// WriteWholeFileFunction type. Signature for custom filesystem callbacks.
-///
-typedef bool (*WriteWholeFileFunction)(std::string *, const std::string &,
-                                       const std::vector<unsigned char> &,
-                                       void *);
-
-///
-/// A structure containing all required filesystem callbacks and a pointer to
-/// their user data.
-///
-struct FsCallbacks {
-  FileExistsFunction FileExists;
-  ExpandFilePathFunction ExpandFilePath;
-  ReadWholeFileFunction ReadWholeFile;
-  WriteWholeFileFunction WriteWholeFile;
-
-  void *user_data;  // An argument that is passed to all fs callbacks
-};
-
-#ifndef TINYGLTF_NO_FS
-// Declaration of default filesystem callbacks
-
-bool FileExists(const std::string &abs_filename, void *);
-
-///
-/// Expand file path(e.g. `~` to home directory on posix, `%APPDATA%` to
-/// `C:\\Users\\tinygltf\\AppData`)
-///
-/// @param[in] filepath File path string. Assume UTF-8
-/// @param[in] userdata User data. Set to `nullptr` if you don't need it.
-///
-std::string ExpandFilePath(const std::string &filepath, void *userdata);
-
-bool ReadWholeFile(std::vector<unsigned char> *out, std::string *err,
-                   const std::string &filepath, void *);
-
-bool WriteWholeFile(std::string *err, const std::string &filepath,
-                    const std::vector<unsigned char> &contents, void *);
-#endif
-
-///
-/// glTF Parser/Serialier context.
-///
-class TinyGLTF {
- public:
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#endif
-
-  TinyGLTF() : bin_data_(nullptr), bin_size_(0), is_binary_(false) {}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-  ~TinyGLTF() {}
-
-  ///
-  /// Loads glTF ASCII asset from a file.
-  /// Set warning message to `warn` for example it fails to load asserts.
-  /// Returns false and set error string to `err` if there's an error.
-  ///
-  bool LoadASCIIFromFile(Model *model, std::string *err, std::string *warn,
-                         const std::string &filename,
-                         unsigned int check_sections = REQUIRE_VERSION);
-
-  ///
-  /// Loads glTF ASCII asset from string(memory).
-  /// `length` = strlen(str);
-  /// `base_dir` is a search path of glTF asset(e.g. images). Path Must be an
-  /// expanded path (e.g. no tilde(`~`), no environment variables). Set warning
-  /// message to `warn` for example it fails to load asserts. Returns false and
-  /// set error string to `err` if there's an error.
-  ///
-  bool LoadASCIIFromString(Model *model, std::string *err, std::string *warn,
-                           const char *str, const unsigned int length,
-                           const std::string &base_dir,
-                           unsigned int check_sections = REQUIRE_VERSION);
-
-  ///
-  /// Loads glTF binary asset from a file.
-  /// Set warning message to `warn` for example it fails to load asserts.
-  /// Returns false and set error string to `err` if there's an error.
-  ///
-  bool LoadBinaryFromFile(Model *model, std::string *err, std::string *warn,
-                          const std::string &filename,
-                          unsigned int check_sections = REQUIRE_VERSION);
-
-  ///
-  /// Loads glTF binary asset from memory.
-  /// `length` = strlen(str);
-  /// `base_dir` is a search path of glTF asset(e.g. images). Path Must be an
-  /// expanded path (e.g. no tilde(`~`), no environment variables).
-  /// Set warning message to `warn` for example it fails to load asserts.
-  /// Returns false and set error string to `err` if there's an error.
-  ///
-  bool LoadBinaryFromMemory(Model *model, std::string *err, std::string *warn,
-                            const unsigned char *bytes,
-                            const unsigned int length,
-                            const std::string &base_dir = "",
-                            unsigned int check_sections = REQUIRE_VERSION);
-
-  ///
-  /// Write glTF to stream, buffers and images will be embeded
-  ///
-  bool WriteGltfSceneToStream(Model *model, std::ostream &stream,
-                              bool prettyPrint, bool writeBinary);
-
-  ///
-  /// Write glTF to file.
-  ///
-  bool WriteGltfSceneToFile(Model *model, const std::string &filename,
-                            bool embedImages, bool embedBuffers,
-                            bool prettyPrint, bool writeBinary);
-
-  ///
-  /// Set callback to use for loading image data
-  ///
-  void SetImageLoader(LoadImageDataFunction LoadImageData, void *user_data);
-
-  ///
-  /// Unset(remove) callback of loading image data
-  ///
-  void RemoveImageLoader();
-
-  ///
-  /// Set callback to use for writing image data
-  ///
-  void SetImageWriter(WriteImageDataFunction WriteImageData, void *user_data);
-
-  ///
-  /// Set callbacks to use for filesystem (fs) access and their user data
-  ///
-  void SetFsCallbacks(FsCallbacks callbacks);
-
-  ///
-  /// Set serializing default values(default = false).
-  /// When true, default values are force serialized to .glTF.
-  /// This may be helpfull if you want to serialize a full description of glTF
-  /// data.
-  ///
-  /// TODO(LTE): Supply parsing option as function arguments to
-  /// `LoadASCIIFromFile()` and others, not by a class method
-  ///
-  void SetSerializeDefaultValues(const bool enabled) {
-    serialize_default_values_ = enabled;
-  }
-
-  bool GetSerializeDefaultValues() const { return serialize_default_values_; }
-
-  ///
-  /// Store original JSON string for `extras` and `extensions`.
-  /// This feature will be useful when the user want to reconstruct custom data
-  /// structure from JSON string.
-  ///
-  void SetStoreOriginalJSONForExtrasAndExtensions(const bool enabled) {
-    store_original_json_for_extras_and_extensions_ = enabled;
-  }
-
-  bool GetStoreOriginalJSONForExtrasAndExtensions() const {
-    return store_original_json_for_extras_and_extensions_;
-  }
-
-  ///
-  /// Specify whether preserve image channales when loading images or not.
-  /// (Not effective when the user suppy their own LoadImageData callbacks)
-  ///
-  void SetPreserveImageChannels(bool onoff) {
-    preserve_image_channels_ = onoff;
-  }
-
-  bool GetPreserveImageChannels() const { return preserve_image_channels_; }
-
- private:
-  ///
-  /// Loads glTF asset from string(memory).
-  /// `length` = strlen(str);
-  /// Set warning message to `warn` for example it fails to load asserts
-  /// Returns false and set error string to `err` if there's an error.
-  ///
-  bool LoadFromString(Model *model, std::string *err, std::string *warn,
-                      const char *str, const unsigned int length,
-                      const std::string &base_dir, unsigned int check_sections);
-
-  const unsigned char *bin_data_ = nullptr;
-  size_t bin_size_ = 0;
-  bool is_binary_ = false;
-
-  bool serialize_default_values_ = false;  ///< Serialize default values?
-
-  bool store_original_json_for_extras_and_extensions_ = false;
-
-  bool preserve_image_channels_ = false;  /// Default false(expand channels to
-                                          /// RGBA) for backward compatibility.
-
-  // Warning & error messages
-  std::string warn_;
-  std::string err_;
-
-  FsCallbacks fs = {
-#ifndef TINYGLTF_NO_FS
-      &tinygltf::FileExists, &tinygltf::ExpandFilePath,
-      &tinygltf::ReadWholeFile, &tinygltf::WriteWholeFile,
-
-      nullptr  // Fs callback user data
-#else
-      nullptr, nullptr, nullptr, nullptr,
-
-      nullptr  // Fs callback user data
-#endif
-  };
-
-  LoadImageDataFunction LoadImageData =
-#ifndef TINYGLTF_NO_STB_IMAGE
-      &tinygltf::LoadImageData;
-#else
-      nullptr;
-#endif
-  void *load_image_user_data_{nullptr};
-  bool user_image_loader_{false};
-
-  WriteImageDataFunction WriteImageData =
-#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
-      &tinygltf::WriteImageData;
-#else
-      nullptr;
-#endif
-  void *write_image_user_data_{nullptr};
-};
-
-#ifdef __clang__
-#pragma clang diagnostic pop  // -Wpadded
-#endif
-
-}  // namespace tinygltf
-
-#endif  // TINY_GLTF_H_
-
-#if defined(TINYGLTF_IMPLEMENTATION) || defined(__INTELLISENSE__)
-#include <algorithm>
-//#include <cassert>
-#ifndef TINYGLTF_NO_FS
-#include <cstdio>
-#include <fstream>
-#endif
-#include <sstream>
-
-#ifdef __clang__
-// Disable some warnings for external files.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wfloat-equal"
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wconversion"
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#pragma clang diagnostic ignored "-Wglobal-constructors"
-#if __has_warning("-Wreserved-id-macro")
-#pragma clang diagnostic ignored "-Wreserved-id-macro"
-#endif
-#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
-#pragma clang diagnostic ignored "-Wswitch-enum"
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#pragma clang diagnostic ignored "-Wcovered-switch-default"
-#if __has_warning("-Wdouble-promotion")
-#pragma clang diagnostic ignored "-Wdouble-promotion"
-#endif
-#if __has_warning("-Wcomma")
-#pragma clang diagnostic ignored "-Wcomma"
-#endif
-#if __has_warning("-Wzero-as-null-pointer-constant")
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
-#if __has_warning("-Wcast-qual")
-#pragma clang diagnostic ignored "-Wcast-qual"
-#endif
-#if __has_warning("-Wmissing-variable-declarations")
-#pragma clang diagnostic ignored "-Wmissing-variable-declarations"
-#endif
-#if __has_warning("-Wmissing-prototypes")
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
-#endif
-#if __has_warning("-Wcast-align")
-#pragma clang diagnostic ignored "-Wcast-align"
-#endif
-#if __has_warning("-Wnewline-eof")
-#pragma clang diagnostic ignored "-Wnewline-eof"
-#endif
-#if __has_warning("-Wunused-parameter")
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#endif
-#if __has_warning("-Wmismatched-tags")
-#pragma clang diagnostic ignored "-Wmismatched-tags"
-#endif
-#if __has_warning("-Wextra-semi-stmt")
-#pragma clang diagnostic ignored "-Wextra-semi-stmt"
-#endif
-#endif
-
-// Disable GCC warnigs
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"
-#endif  // __GNUC__
-
-#ifndef TINYGLTF_NO_INCLUDE_JSON
-#ifndef TINYGLTF_USE_RAPIDJSON
-#include "json.hpp"
-#else
-#ifndef TINYGLTF_NO_INCLUDE_RAPIDJSON
-#include "document.h"
-#include "prettywriter.h"
-#include "rapidjson.h"
-#include "stringbuffer.h"
-#include "writer.h"
-#endif
-#endif
-#endif
-
-#ifdef TINYGLTF_ENABLE_DRACO
-#include "draco/compression/decode.h"
-#include "draco/core/decoder_buffer.h"
-#endif
-
-#ifndef TINYGLTF_NO_STB_IMAGE
-#ifndef TINYGLTF_NO_INCLUDE_STB_IMAGE
-#include "stb_image.h"
-#endif
-#endif
-
-#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
-#ifndef TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE
-#include "stb_image_write.h"
-#endif
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef _WIN32
-
-// issue 143.
-// Define NOMINMAX to avoid min/max defines,
-// but undef it after included windows.h
-#ifndef NOMINMAX
-#define TINYGLTF_INTERNAL_NOMINMAX
-#define NOMINMAX
-#endif
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#define TINYGLTF_INTERNAL_WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>  // include API for expanding a file path
-
-#ifdef TINYGLTF_INTERNAL_WIN32_LEAN_AND_MEAN
-#undef WIN32_LEAN_AND_MEAN
-#endif
-
-#if defined(TINYGLTF_INTERNAL_NOMINMAX)
-#undef NOMINMAX
-#endif
-
-#if defined(__GLIBCXX__)  // mingw
-
-#include <fcntl.h>  // _O_RDONLY
-
-#include <ext/stdio_filebuf.h>  // fstream (all sorts of IO stuff) + stdio_filebuf (=streambuf)
-
-#endif
-
-#elif !defined(__ANDROID__) && !defined(__OpenBSD__)
-//#include <wordexp.h>
-#endif
-
-#if defined(__sparcv9) || defined(__powerpc__)
-// Big endian
-#else
-#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU
-#define TINYGLTF_LITTLE_ENDIAN 1
-#endif
-#endif
-
-namespace {
-#ifdef TINYGLTF_USE_RAPIDJSON
-
-#ifdef TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR
-// This uses the RapidJSON CRTAllocator.  It is thread safe and multiple
-// documents may be active at once.
-using json =
-    rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAllocator>;
-using json_const_iterator = json::ConstMemberIterator;
-using json_const_array_iterator = json const *;
-using JsonDocument =
-    rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator>;
-rapidjson::CrtAllocator s_CrtAllocator;  // stateless and thread safe
-rapidjson::CrtAllocator &GetAllocator() { return s_CrtAllocator; }
-#else
-// This uses the default RapidJSON MemoryPoolAllocator.  It is very fast, but
-// not thread safe. Only a single JsonDocument may be active at any one time,
-// meaning only a single gltf load/save can be active any one time.
-using json = rapidjson::Value;
-using json_const_iterator = json::ConstMemberIterator;
-using json_const_array_iterator = json const *;
-rapidjson::Document *s_pActiveDocument = nullptr;
-rapidjson::Document::AllocatorType &GetAllocator() {
-  assert(s_pActiveDocument);  // Root json node must be JsonDocument type
-  return s_pActiveDocument->GetAllocator();
-}
-
-#ifdef __clang__
-#pragma clang diagnostic push
-// Suppress JsonDocument(JsonDocument &&rhs) noexcept
-#pragma clang diagnostic ignored "-Wunused-member-function"
-#endif
-
-struct JsonDocument : public rapidjson::Document {
-  JsonDocument() {
-    assert(s_pActiveDocument ==
-           nullptr);  // When using default allocator, only one document can be
-                      // active at a time, if you need multiple active at once,
-                      // define TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR
-    s_pActiveDocument = this;
-  }
-  JsonDocument(const JsonDocument &) = delete;
-  JsonDocument(JsonDocument &&rhs) noexcept
-      : rapidjson::Document(std::move(rhs)) {
-    s_pActiveDocument = this;
-    rhs.isNil = true;
-  }
-  ~JsonDocument() {
-    if (!isNil) {
-      s_pActiveDocument = nullptr;
-    }
-  }
-
- private:
-  bool isNil = false;
-};
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#endif  // TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR
-
-#else
-using nlohmann::json;
-using json_const_iterator = json::const_iterator;
-using json_const_array_iterator = json_const_iterator;
-using JsonDocument = json;
-#endif
-
-void JsonParse(JsonDocument &doc, const char *str, size_t length,
-               bool throwExc = false) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  (void)throwExc;
-  doc.Parse(str, length);
-#else
-  doc = json::parse(str, str + length, nullptr, throwExc);
-#endif
-}
-}  // namespace
-
-#ifdef __APPLE__
-#include "TargetConditionals.h"
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#endif
-
-namespace tinygltf {
-
-///
-/// Internal LoadImageDataOption struct.
-/// This struct is passed through `user_pointer` in LoadImageData.
-/// The struct is not passed when the user supply their own LoadImageData
-/// callbacks.
-///
-struct LoadImageDataOption {
-  // true: preserve image channels(e.g. load as RGB image if the image has RGB
-  // channels) default `false`(channels are expanded to RGBA for backward
-  // compatiblity).
-  bool preserve_channels{false};
-};
-
-// Equals function for Value, for recursivity
-static bool Equals(const tinygltf::Value &one, const tinygltf::Value &other) {
-  if (one.Type() != other.Type()) return false;
-
-  switch (one.Type()) {
-    case NULL_TYPE:
-      return true;
-    case BOOL_TYPE:
-      return one.Get<bool>() == other.Get<bool>();
-    case REAL_TYPE:
-      return TINYGLTF_DOUBLE_EQUAL(one.Get<double>(), other.Get<double>());
-    case INT_TYPE:
-      return one.Get<int>() == other.Get<int>();
-    case OBJECT_TYPE: {
-      auto oneObj = one.Get<tinygltf::Value::Object>();
-      auto otherObj = other.Get<tinygltf::Value::Object>();
-      if (oneObj.size() != otherObj.size()) return false;
-      for (auto &it : oneObj) {
-        auto otherIt = otherObj.find(it.first);
-        if (otherIt == otherObj.end()) return false;
-
-        if (!Equals(it.second, otherIt->second)) return false;
-      }
-      return true;
-    }
-    case ARRAY_TYPE: {
-      if (one.Size() != other.Size()) return false;
-      for (int i = 0; i < int(one.Size()); ++i)
-        if (!Equals(one.Get(i), other.Get(i))) return false;
-      return true;
-    }
-    case STRING_TYPE:
-      return one.Get<std::string>() == other.Get<std::string>();
-    case BINARY_TYPE:
-      return one.Get<std::vector<unsigned char> >() ==
-             other.Get<std::vector<unsigned char> >();
-    default: {
-      // unhandled type
-      return false;
-    }
-  }
-}
-
-// Equals function for std::vector<double> using TINYGLTF_DOUBLE_EPSILON
-static bool Equals(const std::vector<double> &one,
-                   const std::vector<double> &other) {
-  if (one.size() != other.size()) return false;
-  for (int i = 0; i < int(one.size()); ++i) {
-    if (!TINYGLTF_DOUBLE_EQUAL(one[size_t(i)], other[size_t(i)])) return false;
-  }
-  return true;
-}
-
-bool Accessor::operator==(const Accessor &other) const {
-  return this->bufferView == other.bufferView &&
-         this->byteOffset == other.byteOffset &&
-         this->componentType == other.componentType &&
-         this->count == other.count && this->extensions == other.extensions &&
-         this->extras == other.extras &&
-         Equals(this->maxValues, other.maxValues) &&
-         Equals(this->minValues, other.minValues) && this->name == other.name &&
-         this->normalized == other.normalized && this->type == other.type;
-}
-bool Animation::operator==(const Animation &other) const {
-  return this->channels == other.channels &&
-         this->extensions == other.extensions && this->extras == other.extras &&
-         this->name == other.name && this->samplers == other.samplers;
-}
-bool AnimationChannel::operator==(const AnimationChannel &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         this->target_node == other.target_node &&
-         this->target_path == other.target_path &&
-         this->sampler == other.sampler;
-}
-bool AnimationSampler::operator==(const AnimationSampler &other) const {
-  return this->extras == other.extras && this->extensions == other.extensions &&
-         this->input == other.input &&
-         this->interpolation == other.interpolation &&
-         this->output == other.output;
-}
-bool Asset::operator==(const Asset &other) const {
-  return this->copyright == other.copyright &&
-         this->extensions == other.extensions && this->extras == other.extras &&
-         this->generator == other.generator &&
-         this->minVersion == other.minVersion && this->version == other.version;
-}
-bool Buffer::operator==(const Buffer &other) const {
-  return this->data == other.data && this->extensions == other.extensions &&
-         this->extras == other.extras && this->name == other.name &&
-         this->uri == other.uri;
-}
-bool BufferView::operator==(const BufferView &other) const {
-  return this->buffer == other.buffer && this->byteLength == other.byteLength &&
-         this->byteOffset == other.byteOffset &&
-         this->byteStride == other.byteStride && this->name == other.name &&
-         this->target == other.target && this->extensions == other.extensions &&
-         this->extras == other.extras &&
-         this->dracoDecoded == other.dracoDecoded;
-}
-bool Camera::operator==(const Camera &other) const {
-  return this->name == other.name && this->extensions == other.extensions &&
-         this->extras == other.extras &&
-         this->orthographic == other.orthographic &&
-         this->perspective == other.perspective && this->type == other.type;
-}
-bool Image::operator==(const Image &other) const {
-  return this->bufferView == other.bufferView &&
-         this->component == other.component &&
-         this->extensions == other.extensions && this->extras == other.extras &&
-         this->height == other.height && this->image == other.image &&
-         this->mimeType == other.mimeType && this->name == other.name &&
-         this->uri == other.uri && this->width == other.width;
-}
-bool Light::operator==(const Light &other) const {
-  return Equals(this->color, other.color) && this->name == other.name &&
-         this->type == other.type;
-}
-bool Material::operator==(const Material &other) const {
-  return (this->pbrMetallicRoughness == other.pbrMetallicRoughness) &&
-         (this->normalTexture == other.normalTexture) &&
-         (this->occlusionTexture == other.occlusionTexture) &&
-         (this->emissiveTexture == other.emissiveTexture) &&
-         Equals(this->emissiveFactor, other.emissiveFactor) &&
-         (this->alphaMode == other.alphaMode) &&
-         TINYGLTF_DOUBLE_EQUAL(this->alphaCutoff, other.alphaCutoff) &&
-         (this->doubleSided == other.doubleSided) &&
-         (this->extensions == other.extensions) &&
-         (this->extras == other.extras) && (this->values == other.values) &&
-         (this->additionalValues == other.additionalValues) &&
-         (this->name == other.name);
-}
-bool Mesh::operator==(const Mesh &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         this->name == other.name && Equals(this->weights, other.weights) &&
-         this->primitives == other.primitives;
-}
-bool Model::operator==(const Model &other) const {
-  return this->accessors == other.accessors &&
-         this->animations == other.animations && this->asset == other.asset &&
-         this->buffers == other.buffers &&
-         this->bufferViews == other.bufferViews &&
-         this->cameras == other.cameras &&
-         this->defaultScene == other.defaultScene &&
-         this->extensions == other.extensions &&
-         this->extensionsRequired == other.extensionsRequired &&
-         this->extensionsUsed == other.extensionsUsed &&
-         this->extras == other.extras && this->images == other.images &&
-         this->lights == other.lights && this->materials == other.materials &&
-         this->meshes == other.meshes && this->nodes == other.nodes &&
-         this->samplers == other.samplers && this->scenes == other.scenes &&
-         this->skins == other.skins && this->textures == other.textures;
-}
-bool Node::operator==(const Node &other) const {
-  return this->camera == other.camera && this->children == other.children &&
-         this->extensions == other.extensions && this->extras == other.extras &&
-         Equals(this->matrix, other.matrix) && this->mesh == other.mesh &&
-         this->name == other.name && Equals(this->rotation, other.rotation) &&
-         Equals(this->scale, other.scale) && this->skin == other.skin &&
-         Equals(this->translation, other.translation) &&
-         Equals(this->weights, other.weights);
-}
-bool SpotLight::operator==(const SpotLight &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         TINYGLTF_DOUBLE_EQUAL(this->innerConeAngle, other.innerConeAngle) &&
-         TINYGLTF_DOUBLE_EQUAL(this->outerConeAngle, other.outerConeAngle);
-}
-bool OrthographicCamera::operator==(const OrthographicCamera &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         TINYGLTF_DOUBLE_EQUAL(this->xmag, other.xmag) &&
-         TINYGLTF_DOUBLE_EQUAL(this->ymag, other.ymag) &&
-         TINYGLTF_DOUBLE_EQUAL(this->zfar, other.zfar) &&
-         TINYGLTF_DOUBLE_EQUAL(this->znear, other.znear);
-}
-bool Parameter::operator==(const Parameter &other) const {
-  if (this->bool_value != other.bool_value ||
-      this->has_number_value != other.has_number_value)
-    return false;
-
-  if (!TINYGLTF_DOUBLE_EQUAL(this->number_value, other.number_value))
-    return false;
-
-  if (this->json_double_value.size() != other.json_double_value.size())
-    return false;
-  for (auto &it : this->json_double_value) {
-    auto otherIt = other.json_double_value.find(it.first);
-    if (otherIt == other.json_double_value.end()) return false;
-
-    if (!TINYGLTF_DOUBLE_EQUAL(it.second, otherIt->second)) return false;
-  }
-
-  if (!Equals(this->number_array, other.number_array)) return false;
-
-  if (this->string_value != other.string_value) return false;
-
-  return true;
-}
-bool PerspectiveCamera::operator==(const PerspectiveCamera &other) const {
-  return TINYGLTF_DOUBLE_EQUAL(this->aspectRatio, other.aspectRatio) &&
-         this->extensions == other.extensions && this->extras == other.extras &&
-         TINYGLTF_DOUBLE_EQUAL(this->yfov, other.yfov) &&
-         TINYGLTF_DOUBLE_EQUAL(this->zfar, other.zfar) &&
-         TINYGLTF_DOUBLE_EQUAL(this->znear, other.znear);
-}
-bool Primitive::operator==(const Primitive &other) const {
-  return this->attributes == other.attributes && this->extras == other.extras &&
-         this->indices == other.indices && this->material == other.material &&
-         this->mode == other.mode && this->targets == other.targets;
-}
-bool Sampler::operator==(const Sampler &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         this->magFilter == other.magFilter &&
-         this->minFilter == other.minFilter && this->name == other.name &&
-         this->wrapS == other.wrapS && this->wrapT == other.wrapT;
-
-  // this->wrapR == other.wrapR
-}
-bool Scene::operator==(const Scene &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         this->name == other.name && this->nodes == other.nodes;
-}
-bool Skin::operator==(const Skin &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         this->inverseBindMatrices == other.inverseBindMatrices &&
-         this->joints == other.joints && this->name == other.name &&
-         this->skeleton == other.skeleton;
-}
-bool Texture::operator==(const Texture &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         this->name == other.name && this->sampler == other.sampler &&
-         this->source == other.source;
-}
-bool TextureInfo::operator==(const TextureInfo &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         this->index == other.index && this->texCoord == other.texCoord;
-}
-bool NormalTextureInfo::operator==(const NormalTextureInfo &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         this->index == other.index && this->texCoord == other.texCoord &&
-         TINYGLTF_DOUBLE_EQUAL(this->scale, other.scale);
-}
-bool OcclusionTextureInfo::operator==(const OcclusionTextureInfo &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         this->index == other.index && this->texCoord == other.texCoord &&
-         TINYGLTF_DOUBLE_EQUAL(this->strength, other.strength);
-}
-bool PbrMetallicRoughness::operator==(const PbrMetallicRoughness &other) const {
-  return this->extensions == other.extensions && this->extras == other.extras &&
-         (this->baseColorTexture == other.baseColorTexture) &&
-         (this->metallicRoughnessTexture == other.metallicRoughnessTexture) &&
-         Equals(this->baseColorFactor, other.baseColorFactor) &&
-         TINYGLTF_DOUBLE_EQUAL(this->metallicFactor, other.metallicFactor) &&
-         TINYGLTF_DOUBLE_EQUAL(this->roughnessFactor, other.roughnessFactor);
-}
-bool Value::operator==(const Value &other) const {
-  return Equals(*this, other);
-}
-
-static void swap4(unsigned int *val) {
-#ifdef TINYGLTF_LITTLE_ENDIAN
-  (void)val;
-#else
-  unsigned int tmp = *val;
-  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
-  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
-
-  dst[0] = src[3];
-  dst[1] = src[2];
-  dst[2] = src[1];
-  dst[3] = src[0];
-#endif
-}
-
-static std::string JoinPath(const std::string &path0,
-                            const std::string &path1) {
-  if (path0.empty()) {
-    return path1;
-  } else {
-    // check '/'
-    char lastChar = *path0.rbegin();
-    if (lastChar != '/') {
-      return path0 + std::string("/") + path1;
-    } else {
-      return path0 + path1;
-    }
-  }
-}
-
-static std::string FindFile(const std::vector<std::string> &paths,
-                            const std::string &filepath, FsCallbacks *fs) {
-  if (fs == nullptr || fs->ExpandFilePath == nullptr ||
-      fs->FileExists == nullptr) {
-    // Error, fs callback[s] missing
-    return std::string();
-  }
-
-  for (size_t i = 0; i < paths.size(); i++) {
-    std::string absPath =
-        fs->ExpandFilePath(JoinPath(paths[i], filepath), fs->user_data);
-    if (fs->FileExists(absPath, fs->user_data)) {
-      return absPath;
-    }
-  }
-
-  return std::string();
-}
-
-static std::string GetFilePathExtension(const std::string &FileName) {
-  if (FileName.find_last_of(".") != std::string::npos)
-    return FileName.substr(FileName.find_last_of(".") + 1);
-  return "";
-}
-
-static std::string GetBaseDir(const std::string &filepath) {
-  if (filepath.find_last_of("/\\") != std::string::npos)
-    return filepath.substr(0, filepath.find_last_of("/\\"));
-  return "";
-}
-
-static std::string GetBaseFilename(const std::string &filepath) {
-  auto idx = filepath.find_last_of("/\\");
-  if (idx != std::string::npos) return filepath.substr(idx + 1);
-  return filepath;
-}
-
-std::string base64_encode(unsigned char const *, unsigned int len);
-std::string base64_decode(std::string const &s);
-
-/*
-   base64.cpp and base64.h
-
-   Copyright (C) 2004-2008 René Nyffenegger
-
-   This source code is provided 'as-is', without any express or implied
-   warranty. In no event will the author be held liable for any damages
-   arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any purpose,
-   including commercial applications, and to alter it and redistribute it
-   freely, subject to the following restrictions:
-
-   1. The origin of this source code must not be misrepresented; you must not
-      claim that you wrote the original source code. If you use this source code
-      in a product, an acknowledgment in the product documentation would be
-      appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and must not be
-      misrepresented as being the original source code.
-
-   3. This notice may not be removed or altered from any source distribution.
-
-   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
-
-*/
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wsign-conversion"
-#pragma clang diagnostic ignored "-Wconversion"
-#endif
-
-static inline bool is_base64(unsigned char c) {
-  return (isalnum(c) || (c == '+') || (c == '/'));
-}
-
-std::string base64_encode(unsigned char const *bytes_to_encode,
-                          unsigned int in_len) {
-  std::string ret;
-  int i = 0;
-  int j = 0;
-  unsigned char char_array_3[3];
-  unsigned char char_array_4[4];
-
-  const char *base64_chars =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-      "abcdefghijklmnopqrstuvwxyz"
-      "0123456789+/";
-
-  while (in_len--) {
-    char_array_3[i++] = *(bytes_to_encode++);
-    if (i == 3) {
-      char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-      char_array_4[1] =
-          ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
-      char_array_4[2] =
-          ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
-      char_array_4[3] = char_array_3[2] & 0x3f;
-
-      for (i = 0; (i < 4); i++) ret += base64_chars[char_array_4[i]];
-      i = 0;
-    }
-  }
-
-  if (i) {
-    for (j = i; j < 3; j++) char_array_3[j] = '\0';
-
-    char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-    char_array_4[1] =
-        ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
-    char_array_4[2] =
-        ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
-
-    for (j = 0; (j < i + 1); j++) ret += base64_chars[char_array_4[j]];
-
-    while ((i++ < 3)) ret += '=';
-  }
-
-  return ret;
-}
-
-std::string base64_decode(std::string const &encoded_string) {
-  int in_len = static_cast<int>(encoded_string.size());
-  int i = 0;
-  int j = 0;
-  int in_ = 0;
-  unsigned char char_array_4[4], char_array_3[3];
-  std::string ret;
-
-  const std::string base64_chars =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-      "abcdefghijklmnopqrstuvwxyz"
-      "0123456789+/";
-
-  while (in_len-- && (encoded_string[in_] != '=') &&
-         is_base64(encoded_string[in_])) {
-    char_array_4[i++] = encoded_string[in_];
-    in_++;
-    if (i == 4) {
-      for (i = 0; i < 4; i++)
-        char_array_4[i] =
-            static_cast<unsigned char>(base64_chars.find(char_array_4[i]));
-
-      char_array_3[0] =
-          (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-      char_array_3[1] =
-          ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-      char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-      for (i = 0; (i < 3); i++) ret += char_array_3[i];
-      i = 0;
-    }
-  }
-
-  if (i) {
-    for (j = i; j < 4; j++) char_array_4[j] = 0;
-
-    for (j = 0; j < 4; j++)
-      char_array_4[j] =
-          static_cast<unsigned char>(base64_chars.find(char_array_4[j]));
-
-    char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-    char_array_3[1] =
-        ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-    char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-    for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
-  }
-
-  return ret;
-}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// https://github.com/syoyo/tinygltf/issues/228
-// TODO(syoyo): Use uriparser https://uriparser.github.io/ for stricter Uri
-// decoding?
-//
-// Uri Decoding from DLIB
-// http://dlib.net/dlib/server/server_http.cpp.html
-// --- dlib begin ------------------------------------------------------------
-// Copyright (C) 2003  Davis E. King (davis@dlib.net)
-// License: Boost Software License
-// Boost Software License - Version 1.0 - August 17th, 2003
-
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-namespace dlib {
-
-inline unsigned char from_hex(unsigned char ch) {
-  if (ch <= '9' && ch >= '0')
-    ch -= '0';
-  else if (ch <= 'f' && ch >= 'a')
-    ch -= 'a' - 10;
-  else if (ch <= 'F' && ch >= 'A')
-    ch -= 'A' - 10;
-  else
-    ch = 0;
-  return ch;
-}
-
-static const std::string urldecode(const std::string &str) {
-  using namespace std;
-  string result;
-  string::size_type i;
-  for (i = 0; i < str.size(); ++i) {
-    if (str[i] == '+') {
-      result += ' ';
-    } else if (str[i] == '%' && str.size() > i + 2) {
-      const unsigned char ch1 =
-          from_hex(static_cast<unsigned char>(str[i + 1]));
-      const unsigned char ch2 =
-          from_hex(static_cast<unsigned char>(str[i + 2]));
-      const unsigned char ch = static_cast<unsigned char>((ch1 << 4) | ch2);
-      result += static_cast<char>(ch);
-      i += 2;
-    } else {
-      result += str[i];
-    }
-  }
-  return result;
-}
-
-}  // namespace dlib
-// --- dlib end --------------------------------------------------------------
-
-static bool LoadExternalFile(std::vector<unsigned char> *out, std::string *err,
-                             std::string *warn, const std::string &filename,
-                             const std::string &basedir, bool required,
-                             size_t reqBytes, bool checkSize, FsCallbacks *fs) {
-  if (fs == nullptr || fs->FileExists == nullptr ||
-      fs->ExpandFilePath == nullptr || fs->ReadWholeFile == nullptr) {
-    // This is a developer error, assert() ?
-    if (err) {
-      (*err) += "FS callback[s] not set\n";
-    }
-    return false;
-  }
-
-  std::string *failMsgOut = required ? err : warn;
-
-  out->clear();
-
-  std::vector<std::string> paths;
-  paths.push_back(basedir);
-  paths.push_back(".");
-
-  std::string filepath = FindFile(paths, filename, fs);
-  if (filepath.empty() || filename.empty()) {
-    if (failMsgOut) {
-      (*failMsgOut) += "File not found : " + filename + "\n";
-    }
-    return false;
-  }
-
-  std::vector<unsigned char> buf;
-  std::string fileReadErr;
-  bool fileRead =
-      fs->ReadWholeFile(&buf, &fileReadErr, filepath, fs->user_data);
-  if (!fileRead) {
-    if (failMsgOut) {
-      (*failMsgOut) +=
-          "File read error : " + filepath + " : " + fileReadErr + "\n";
-    }
-    return false;
-  }
-
-  size_t sz = buf.size();
-  if (sz == 0) {
-    if (failMsgOut) {
-      (*failMsgOut) += "File is empty : " + filepath + "\n";
-    }
-    return false;
-  }
-
-  if (checkSize) {
-    if (reqBytes == sz) {
-      out->swap(buf);
-      return true;
-    } else {
-      std::stringstream ss;
-      ss << "File size mismatch : " << filepath << ", requestedBytes "
-         << reqBytes << ", but got " << sz << std::endl;
-      if (failMsgOut) {
-        (*failMsgOut) += ss.str();
-      }
-      return false;
-    }
-  }
-
-  out->swap(buf);
-  return true;
-}
-
-void TinyGLTF::SetImageLoader(LoadImageDataFunction func, void *user_data) {
-  LoadImageData = func;
-  load_image_user_data_ = user_data;
-  user_image_loader_ = true;
-}
-
-void TinyGLTF::RemoveImageLoader() {
-  LoadImageData =
-#ifndef TINYGLTF_NO_STB_IMAGE
-      &tinygltf::LoadImageData;
-#else
-      nullptr;
-#endif
-
-  load_image_user_data_ = nullptr;
-  user_image_loader_ = false;
-}
-
-#ifndef TINYGLTF_NO_STB_IMAGE
-bool LoadImageData(Image *image, const int image_idx, std::string *err,
-                   std::string *warn, int req_width, int req_height,
-                   const unsigned char *bytes, int size, void *user_data) {
-  (void)warn;
-
-  LoadImageDataOption option;
-  if (user_data) {
-    option = *reinterpret_cast<LoadImageDataOption *>(user_data);
-  }
-
-  int w = 0, h = 0, comp = 0, req_comp = 0;
-
-  unsigned char *data = nullptr;
-
-  // preserve_channels true: Use channels stored in the image file.
-  // false: force 32-bit textures for common Vulkan compatibility. It appears
-  // that some GPU drivers do not support 24-bit images for Vulkan
-  req_comp = option.preserve_channels ? 0 : 4;
-  int bits = 8;
-  int pixel_type = TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE;
-
-  // It is possible that the image we want to load is a 16bit per channel image
-  // We are going to attempt to load it as 16bit per channel, and if it worked,
-  // set the image data accodingly. We are casting the returned pointer into
-  // unsigned char, because we are representing "bytes". But we are updating
-  // the Image metadata to signal that this image uses 2 bytes (16bits) per
-  // channel:
-  if (stbi_is_16_bit_from_memory(bytes, size)) {
-    data = reinterpret_cast<unsigned char *>(
-        stbi_load_16_from_memory(bytes, size, &w, &h, &comp, req_comp));
-    if (data) {
-      bits = 16;
-      pixel_type = TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT;
-    }
-  }
-
-  // at this point, if data is still NULL, it means that the image wasn't
-  // 16bit per channel, we are going to load it as a normal 8bit per channel
-  // mage as we used to do:
-  // if image cannot be decoded, ignore parsing and keep it by its path
-  // don't break in this case
-  // FIXME we should only enter this function if the image is embedded. If
-  // image->uri references
-  // an image file, it should be left as it is. Image loading should not be
-  // mandatory (to support other formats)
-  if (!data) data = stbi_load_from_memory(bytes, size, &w, &h, &comp, req_comp);
-  if (!data) {
-    // NOTE: you can use `warn` instead of `err`
-    if (err) {
-      (*err) +=
-          "Unknown image format. STB cannot decode image data for image[" +
-          std::to_string(image_idx) + "] name = \"" + image->name + "\".\n";
-    }
-    return false;
-  }
-
-  if ((w < 1) || (h < 1)) {
-    stbi_image_free(data);
-    if (err) {
-      (*err) += "Invalid image data for image[" + std::to_string(image_idx) +
-                "] name = \"" + image->name + "\"\n";
-    }
-    return false;
-  }
-
-  if (req_width > 0) {
-    if (req_width != w) {
-      stbi_image_free(data);
-      if (err) {
-        (*err) += "Image width mismatch for image[" +
-                  std::to_string(image_idx) + "] name = \"" + image->name +
-                  "\"\n";
-      }
-      return false;
-    }
-  }
-
-  if (req_height > 0) {
-    if (req_height != h) {
-      stbi_image_free(data);
-      if (err) {
-        (*err) += "Image height mismatch. for image[" +
-                  std::to_string(image_idx) + "] name = \"" + image->name +
-                  "\"\n";
-      }
-      return false;
-    }
-  }
-
-  if (req_comp != 0) {
-    // loaded data has `req_comp` channels(components)
-    comp = req_comp;
-  }
-
-  image->width = w;
-  image->height = h;
-  image->component = comp;
-  image->bits = bits;
-  image->pixel_type = pixel_type;
-  image->image.resize(static_cast<size_t>(w * h * comp) * size_t(bits / 8));
-  std::copy(data, data + w * h * comp * (bits / 8), image->image.begin());
-  stbi_image_free(data);
-
-  return true;
-}
-#endif
-
-void TinyGLTF::SetImageWriter(WriteImageDataFunction func, void *user_data) {
-  WriteImageData = func;
-  write_image_user_data_ = user_data;
-}
-
-#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
-static void WriteToMemory_stbi(void *context, void *data, int size) {
-  std::vector<unsigned char> *buffer =
-      reinterpret_cast<std::vector<unsigned char> *>(context);
-
-  unsigned char *pData = reinterpret_cast<unsigned char *>(data);
-
-  buffer->insert(buffer->end(), pData, pData + size);
-}
-
-bool WriteImageData(const std::string *basepath, const std::string *filename,
-                    Image *image, bool embedImages, void *fsPtr) {
-  const std::string ext = GetFilePathExtension(*filename);
-
-  // Write image to temporary buffer
-  std::string header;
-  std::vector<unsigned char> data;
-
-  if (ext == "png") {
-    if ((image->bits != 8) ||
-        (image->pixel_type != TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE)) {
-      // Unsupported pixel format
-      return false;
-    }
-
-    if (!stbi_write_png_to_func(WriteToMemory_stbi, &data, image->width,
-                                image->height, image->component,
-                                &image->image[0], 0)) {
-      return false;
-    }
-    header = "data:image/png;base64,";
-  } else if (ext == "jpg") {
-    if (!stbi_write_jpg_to_func(WriteToMemory_stbi, &data, image->width,
-                                image->height, image->component,
-                                &image->image[0], 100)) {
-      return false;
-    }
-    header = "data:image/jpeg;base64,";
-  } else if (ext == "bmp") {
-    if (!stbi_write_bmp_to_func(WriteToMemory_stbi, &data, image->width,
-                                image->height, image->component,
-                                &image->image[0])) {
-      return false;
-    }
-    header = "data:image/bmp;base64,";
-  } else if (!embedImages) {
-    // Error: can't output requested format to file
-    return false;
-  }
-
-  if (embedImages) {
-    // Embed base64-encoded image into URI
-    if (data.size()) {
-      image->uri =
-          header +
-          base64_encode(&data[0], static_cast<unsigned int>(data.size()));
-    } else {
-      // Throw error?
-    }
-  } else {
-    // Write image to disc
-    FsCallbacks *fs = reinterpret_cast<FsCallbacks *>(fsPtr);
-    if ((fs != nullptr) && (fs->WriteWholeFile != nullptr)) {
-      const std::string imagefilepath = JoinPath(*basepath, *filename);
-      std::string writeError;
-      if (!fs->WriteWholeFile(&writeError, imagefilepath, data,
-                              fs->user_data)) {
-        // Could not write image file to disc; Throw error ?
-        return false;
-      }
-    } else {
-      // Throw error?
-    }
-    image->uri = *filename;
-  }
-
-  return true;
-}
-#endif
-
-void TinyGLTF::SetFsCallbacks(FsCallbacks callbacks) { fs = callbacks; }
-
-#ifdef _WIN32
-static inline std::wstring UTF8ToWchar(const std::string &str) {
-  int wstr_size =
-      MultiByteToWideChar(CP_UTF8, 0, str.data(), (int)str.size(), nullptr, 0);
-  std::wstring wstr(wstr_size, 0);
-  MultiByteToWideChar(CP_UTF8, 0, str.data(), (int)str.size(), &wstr[0],
-                      (int)wstr.size());
-  return wstr;
-}
-
-static inline std::string WcharToUTF8(const std::wstring &wstr) {
-  int str_size = WideCharToMultiByte(CP_UTF8, 0, wstr.data(), (int)wstr.size(),
-                                     nullptr, 0, NULL, NULL);
-  std::string str(str_size, 0);
-  WideCharToMultiByte(CP_UTF8, 0, wstr.data(), (int)wstr.size(), &str[0],
-                      (int)str.size(), NULL, NULL);
-  return str;
-}
-#endif
-
-#ifndef TINYGLTF_NO_FS
-// Default implementations of filesystem functions
-
-bool FileExists(const std::string &abs_filename, void *) {
-  bool ret;
-#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
-  if (asset_manager) {
-    AAsset *asset = AAssetManager_open(asset_manager, abs_filename.c_str(),
-                                       AASSET_MODE_STREAMING);
-    if (!asset) {
-      return false;
-    }
-    AAsset_close(asset);
-    ret = true;
-  } else {
-    return false;
-  }
-#else
-#ifdef _WIN32
-#if defined(_MSC_VER) || defined(__GLIBCXX__) || defined(_LIBCPP_VERSION)
-  FILE *fp = nullptr;
-  errno_t err = _wfopen_s(&fp, UTF8ToWchar(abs_filename).c_str(), L"rb");
-  if (err != 0) {
-    return false;
-  }
-#else
-  FILE *fp = nullptr;
-  errno_t err = fopen_s(&fp, abs_filename.c_str(), "rb");
-  if (err != 0) {
-    return false;
-  }
-#endif
-
-#else
-  FILE *fp = fopen(abs_filename.c_str(), "rb");
-#endif
-  if (fp) {
-    ret = true;
-    fclose(fp);
-  } else {
-    ret = false;
-  }
-#endif
-
-  return ret;
-}
-
-std::string ExpandFilePath(const std::string &filepath, void *) {
-  // https://github.com/syoyo/tinygltf/issues/368
-  //
-  // No file path expansion in built-in FS function anymore, since glTF URI
-  // should not contain tilde('~') and environment variables, and for security
-  // reason(`wordexp`).
-  //
-  // Users need to supply `base_dir`(in `LoadASCIIFromString`,
-  // `LoadBinaryFromMemory`) in expanded absolute path.
-
-  return filepath;
-
-#if 0
-#ifdef _WIN32
-  // Assume input `filepath` is encoded in UTF-8
-  std::wstring wfilepath = UTF8ToWchar(filepath);
-  DWORD wlen = ExpandEnvironmentStringsW(wfilepath.c_str(), nullptr, 0);
-  wchar_t *wstr = new wchar_t[wlen];
-  ExpandEnvironmentStringsW(wfilepath.c_str(), wstr, wlen);
-
-  std::wstring ws(wstr);
-  delete[] wstr;
-  return WcharToUTF8(ws);
-
-#else
-
-#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) || \
-    defined(__ANDROID__) || defined(__EMSCRIPTEN__) || defined(__OpenBSD__)
-  // no expansion
-  std::string s = filepath;
-#else
-  std::string s;
-  wordexp_t p;
-
-  if (filepath.empty()) {
-    return "";
-  }
-
-  // Quote the string to keep any spaces in filepath intact.
-  std::string quoted_path = "\"" + filepath + "\"";
-  // char** w;
-  int ret = wordexp(quoted_path.c_str(), &p, 0);
-  if (ret) {
-    // err
-    s = filepath;
-    return s;
-  }
-
-  // Use first element only.
-  if (p.we_wordv) {
-    s = std::string(p.we_wordv[0]);
-    wordfree(&p);
-  } else {
-    s = filepath;
-  }
-
-#endif
-
-  return s;
-#endif
-#endif
-}
-
-bool ReadWholeFile(std::vector<unsigned char> *out, std::string *err,
-                   const std::string &filepath, void *) {
-#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
-  if (asset_manager) {
-    AAsset *asset = AAssetManager_open(asset_manager, filepath.c_str(),
-                                       AASSET_MODE_STREAMING);
-    if (!asset) {
-      if (err) {
-        (*err) += "File open error : " + filepath + "\n";
-      }
-      return false;
-    }
-    size_t size = AAsset_getLength(asset);
-    if (size == 0) {
-      if (err) {
-        (*err) += "Invalid file size : " + filepath +
-                  " (does the path point to a directory?)";
-      }
-      return false;
-    }
-    out->resize(size);
-    AAsset_read(asset, reinterpret_cast<char *>(&out->at(0)), size);
-    AAsset_close(asset);
-    return true;
-  } else {
-    if (err) {
-      (*err) += "No asset manager specified : " + filepath + "\n";
-    }
-    return false;
-  }
-#else
-#ifdef _WIN32
-#if defined(__GLIBCXX__)  // mingw
-  int file_descriptor =
-      _wopen(UTF8ToWchar(filepath).c_str(), _O_RDONLY | _O_BINARY);
-  __gnu_cxx::stdio_filebuf<char> wfile_buf(file_descriptor, std::ios_base::in);
-  std::istream f(&wfile_buf);
-#elif defined(_MSC_VER) || defined(_LIBCPP_VERSION)
-  // For libcxx, assume _LIBCPP_HAS_OPEN_WITH_WCHAR is defined to accept
-  // `wchar_t *`
-  std::ifstream f(UTF8ToWchar(filepath).c_str(), std::ifstream::binary);
-#else
-  // Unknown compiler/runtime
-  std::ifstream f(filepath.c_str(), std::ifstream::binary);
-#endif
-#else
-  std::ifstream f(filepath.c_str(), std::ifstream::binary);
-#endif
-  if (!f) {
-    if (err) {
-      (*err) += "File open error : " + filepath + "\n";
-    }
-    return false;
-  }
-
-  f.seekg(0, f.end);
-  size_t sz = static_cast<size_t>(f.tellg());
-  f.seekg(0, f.beg);
-
-  if (int64_t(sz) < 0) {
-    if (err) {
-      (*err) += "Invalid file size : " + filepath +
-                " (does the path point to a directory?)";
-    }
-    return false;
-  } else if (sz == 0) {
-    if (err) {
-      (*err) += "File is empty : " + filepath + "\n";
-    }
-    return false;
-  }
-
-  out->resize(sz);
-  f.read(reinterpret_cast<char *>(&out->at(0)),
-         static_cast<std::streamsize>(sz));
-
-  return true;
-#endif
-}
-
-bool WriteWholeFile(std::string *err, const std::string &filepath,
-                    const std::vector<unsigned char> &contents, void *) {
-#ifdef _WIN32
-#if defined(__GLIBCXX__)  // mingw
-  int file_descriptor = _wopen(UTF8ToWchar(filepath).c_str(),
-                               _O_CREAT | _O_WRONLY | _O_TRUNC | _O_BINARY);
-  __gnu_cxx::stdio_filebuf<char> wfile_buf(
-      file_descriptor, std::ios_base::out | std::ios_base::binary);
-  std::ostream f(&wfile_buf);
-#elif defined(_MSC_VER)
-  std::ofstream f(UTF8ToWchar(filepath).c_str(), std::ofstream::binary);
-#else  // clang?
-  std::ofstream f(filepath.c_str(), std::ofstream::binary);
-#endif
-#else
-  std::ofstream f(filepath.c_str(), std::ofstream::binary);
-#endif
-  if (!f) {
-    if (err) {
-      (*err) += "File open error for writing : " + filepath + "\n";
-    }
-    return false;
-  }
-
-  f.write(reinterpret_cast<const char *>(&contents.at(0)),
-          static_cast<std::streamsize>(contents.size()));
-  if (!f) {
-    if (err) {
-      (*err) += "File write error: " + filepath + "\n";
-    }
-    return false;
-  }
-
-  return true;
-}
-
-#endif  // TINYGLTF_NO_FS
-
-static std::string MimeToExt(const std::string &mimeType) {
-  if (mimeType == "image/jpeg") {
-    return "jpg";
-  } else if (mimeType == "image/png") {
-    return "png";
-  } else if (mimeType == "image/bmp") {
-    return "bmp";
-  } else if (mimeType == "image/gif") {
-    return "gif";
-  }
-
-  return "";
-}
-
-static void UpdateImageObject(Image &image, std::string &baseDir, int index,
-                              bool embedImages,
-                              WriteImageDataFunction *WriteImageData = nullptr,
-                              void *user_data = nullptr) {
-  std::string filename;
-  std::string ext;
-  // If image has uri, use it it as a filename
-  if (image.uri.size()) {
-    filename = GetBaseFilename(image.uri);
-    ext = GetFilePathExtension(filename);
-  } else if (image.bufferView != -1) {
-    // If there's no URI and the data exists in a buffer,
-    // don't change properties or write images
-  } else if (image.name.size()) {
-    ext = MimeToExt(image.mimeType);
-    // Otherwise use name as filename
-    filename = image.name + "." + ext;
-  } else {
-    ext = MimeToExt(image.mimeType);
-    // Fallback to index of image as filename
-    filename = std::to_string(index) + "." + ext;
-  }
-
-  // If callback is set, modify image data object
-  if (*WriteImageData != nullptr && !filename.empty()) {
-    std::string uri;
-    (*WriteImageData)(&baseDir, &filename, &image, embedImages, user_data);
-  }
-}
-
-bool IsDataURI(const std::string &in) {
-  std::string header = "data:application/octet-stream;base64,";
-  if (in.find(header) == 0) {
-    return true;
-  }
-
-  header = "data:image/jpeg;base64,";
-  if (in.find(header) == 0) {
-    return true;
-  }
-
-  header = "data:image/png;base64,";
-  if (in.find(header) == 0) {
-    return true;
-  }
-
-  header = "data:image/bmp;base64,";
-  if (in.find(header) == 0) {
-    return true;
-  }
-
-  header = "data:image/gif;base64,";
-  if (in.find(header) == 0) {
-    return true;
-  }
-
-  header = "data:text/plain;base64,";
-  if (in.find(header) == 0) {
-    return true;
-  }
-
-  header = "data:application/gltf-buffer;base64,";
-  if (in.find(header) == 0) {
-    return true;
-  }
-
-  return false;
-}
-
-bool DecodeDataURI(std::vector<unsigned char> *out, std::string &mime_type,
-                   const std::string &in, size_t reqBytes, bool checkSize) {
-  std::string header = "data:application/octet-stream;base64,";
-  std::string data;
-  if (in.find(header) == 0) {
-    data = base64_decode(in.substr(header.size()));  // cut mime string.
-  }
-
-  if (data.empty()) {
-    header = "data:image/jpeg;base64,";
-    if (in.find(header) == 0) {
-      mime_type = "image/jpeg";
-      data = base64_decode(in.substr(header.size()));  // cut mime string.
-    }
-  }
-
-  if (data.empty()) {
-    header = "data:image/png;base64,";
-    if (in.find(header) == 0) {
-      mime_type = "image/png";
-      data = base64_decode(in.substr(header.size()));  // cut mime string.
-    }
-  }
-
-  if (data.empty()) {
-    header = "data:image/bmp;base64,";
-    if (in.find(header) == 0) {
-      mime_type = "image/bmp";
-      data = base64_decode(in.substr(header.size()));  // cut mime string.
-    }
-  }
-
-  if (data.empty()) {
-    header = "data:image/gif;base64,";
-    if (in.find(header) == 0) {
-      mime_type = "image/gif";
-      data = base64_decode(in.substr(header.size()));  // cut mime string.
-    }
-  }
-
-  if (data.empty()) {
-    header = "data:text/plain;base64,";
-    if (in.find(header) == 0) {
-      mime_type = "text/plain";
-      data = base64_decode(in.substr(header.size()));
-    }
-  }
-
-  if (data.empty()) {
-    header = "data:application/gltf-buffer;base64,";
-    if (in.find(header) == 0) {
-      data = base64_decode(in.substr(header.size()));
-    }
-  }
-
-  // TODO(syoyo): Allow empty buffer? #229
-  if (data.empty()) {
-    return false;
-  }
-
-  if (checkSize) {
-    if (data.size() != reqBytes) {
-      return false;
-    }
-    out->resize(reqBytes);
-  } else {
-    out->resize(data.size());
-  }
-  std::copy(data.begin(), data.end(), out->begin());
-  return true;
-}
-
-namespace {
-bool GetInt(const json &o, int &val) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  if (!o.IsDouble()) {
-    if (o.IsInt()) {
-      val = o.GetInt();
-      return true;
-    } else if (o.IsUint()) {
-      val = static_cast<int>(o.GetUint());
-      return true;
-    } else if (o.IsInt64()) {
-      val = static_cast<int>(o.GetInt64());
-      return true;
-    } else if (o.IsUint64()) {
-      val = static_cast<int>(o.GetUint64());
-      return true;
-    }
-  }
-
-  return false;
-#else
-  auto type = o.type();
-
-  if ((type == json::value_t::number_integer) ||
-      (type == json::value_t::number_unsigned)) {
-    val = static_cast<int>(o.get<int64_t>());
-    return true;
-  }
-
-  return false;
-#endif
-}
-
-#ifdef TINYGLTF_USE_RAPIDJSON
-bool GetDouble(const json &o, double &val) {
-  if (o.IsDouble()) {
-    val = o.GetDouble();
-    return true;
-  }
-
-  return false;
-}
-#endif
-
-bool GetNumber(const json &o, double &val) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  if (o.IsNumber()) {
-    val = o.GetDouble();
-    return true;
-  }
-
-  return false;
-#else
-  if (o.is_number()) {
-    val = o.get<double>();
-    return true;
-  }
-
-  return false;
-#endif
-}
-
-bool GetString(const json &o, std::string &val) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  if (o.IsString()) {
-    val = o.GetString();
-    return true;
-  }
-
-  return false;
-#else
-  if (o.type() == json::value_t::string) {
-    val = o.get<std::string>();
-    return true;
-  }
-
-  return false;
-#endif
-}
-
-bool IsArray(const json &o) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return o.IsArray();
-#else
-  return o.is_array();
-#endif
-}
-
-json_const_array_iterator ArrayBegin(const json &o) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return o.Begin();
-#else
-  return o.begin();
-#endif
-}
-
-json_const_array_iterator ArrayEnd(const json &o) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return o.End();
-#else
-  return o.end();
-#endif
-}
-
-bool IsObject(const json &o) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return o.IsObject();
-#else
-  return o.is_object();
-#endif
-}
-
-json_const_iterator ObjectBegin(const json &o) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return o.MemberBegin();
-#else
-  return o.begin();
-#endif
-}
-
-json_const_iterator ObjectEnd(const json &o) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return o.MemberEnd();
-#else
-  return o.end();
-#endif
-}
-
-// Making this a const char* results in a pointer to a temporary when
-// TINYGLTF_USE_RAPIDJSON is off.
-std::string GetKey(json_const_iterator &it) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return it->name.GetString();
-#else
-  return it.key().c_str();
-#endif
-}
-
-bool FindMember(const json &o, const char *member, json_const_iterator &it) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  if (!o.IsObject()) {
-    return false;
-  }
-  it = o.FindMember(member);
-  return it != o.MemberEnd();
-#else
-  it = o.find(member);
-  return it != o.end();
-#endif
-}
-
-const json &GetValue(json_const_iterator &it) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return it->value;
-#else
-  return it.value();
-#endif
-}
-
-std::string JsonToString(const json &o, int spacing = -1) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  using namespace rapidjson;
-  StringBuffer buffer;
-  if (spacing == -1) {
-    Writer<StringBuffer> writer(buffer);
-    // TODO: Better error handling.
-    // https://github.com/syoyo/tinygltf/issues/332
-    if (!o.Accept(writer)) {
-      return "tiny_gltf::JsonToString() failed rapidjson conversion";
-    }
-  } else {
-    PrettyWriter<StringBuffer> writer(buffer);
-    writer.SetIndent(' ', uint32_t(spacing));
-    if (!o.Accept(writer)) {
-      return "tiny_gltf::JsonToString() failed rapidjson conversion";
-    }
-  }
-  return buffer.GetString();
-#else
-  return o.dump(spacing);
-#endif
-}
-
-}  // namespace
-
-static bool ParseJsonAsValue(Value *ret, const json &o) {
-  Value val{};
-#ifdef TINYGLTF_USE_RAPIDJSON
-  using rapidjson::Type;
-  switch (o.GetType()) {
-    case Type::kObjectType: {
-      Value::Object value_object;
-      for (auto it = o.MemberBegin(); it != o.MemberEnd(); ++it) {
-        Value entry;
-        ParseJsonAsValue(&entry, it->value);
-        if (entry.Type() != NULL_TYPE)
-          value_object.emplace(GetKey(it), std::move(entry));
-      }
-      if (value_object.size() > 0) val = Value(std::move(value_object));
-    } break;
-    case Type::kArrayType: {
-      Value::Array value_array;
-      value_array.reserve(o.Size());
-      for (auto it = o.Begin(); it != o.End(); ++it) {
-        Value entry;
-        ParseJsonAsValue(&entry, *it);
-        if (entry.Type() != NULL_TYPE)
-          value_array.emplace_back(std::move(entry));
-      }
-      if (value_array.size() > 0) val = Value(std::move(value_array));
-    } break;
-    case Type::kStringType:
-      val = Value(std::string(o.GetString()));
-      break;
-    case Type::kFalseType:
-    case Type::kTrueType:
-      val = Value(o.GetBool());
-      break;
-    case Type::kNumberType:
-      if (!o.IsDouble()) {
-        int i = 0;
-        GetInt(o, i);
-        val = Value(i);
-      } else {
-        double d = 0.0;
-        GetDouble(o, d);
-        val = Value(d);
-      }
-      break;
-    case Type::kNullType:
-      break;
-      // all types are covered, so no `case default`
-  }
-#else
-  switch (o.type()) {
-    case json::value_t::object: {
-      Value::Object value_object;
-      for (auto it = o.begin(); it != o.end(); it++) {
-        Value entry;
-        ParseJsonAsValue(&entry, it.value());
-        if (entry.Type() != NULL_TYPE)
-          value_object.emplace(it.key(), std::move(entry));
-      }
-      if (value_object.size() > 0) val = Value(std::move(value_object));
-    } break;
-    case json::value_t::array: {
-      Value::Array value_array;
-      value_array.reserve(o.size());
-      for (auto it = o.begin(); it != o.end(); it++) {
-        Value entry;
-        ParseJsonAsValue(&entry, it.value());
-        if (entry.Type() != NULL_TYPE)
-          value_array.emplace_back(std::move(entry));
-      }
-      if (value_array.size() > 0) val = Value(std::move(value_array));
-    } break;
-    case json::value_t::string:
-      val = Value(o.get<std::string>());
-      break;
-    case json::value_t::boolean:
-      val = Value(o.get<bool>());
-      break;
-    case json::value_t::number_integer:
-    case json::value_t::number_unsigned:
-      val = Value(static_cast<int>(o.get<int64_t>()));
-      break;
-    case json::value_t::number_float:
-      val = Value(o.get<double>());
-      break;
-    case json::value_t::null:
-    case json::value_t::discarded:
-    case json::value_t::binary:
-      // default:
-      break;
-  }
-#endif
-  const bool isNotNull = val.Type() != NULL_TYPE;
-
-  if (ret) *ret = std::move(val);
-
-  return isNotNull;
-}
-
-static bool ParseExtrasProperty(Value *ret, const json &o) {
-  json_const_iterator it;
-  if (!FindMember(o, "extras", it)) {
-    return false;
-  }
-
-  return ParseJsonAsValue(ret, GetValue(it));
-}
-
-static bool ParseBooleanProperty(bool *ret, std::string *err, const json &o,
-                                 const std::string &property,
-                                 const bool required,
-                                 const std::string &parent_node = "") {
-  json_const_iterator it;
-  if (!FindMember(o, property.c_str(), it)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is missing";
-        if (!parent_node.empty()) {
-          (*err) += " in " + parent_node;
-        }
-        (*err) += ".\n";
-      }
-    }
-    return false;
-  }
-
-  auto &value = GetValue(it);
-
-  bool isBoolean;
-  bool boolValue = false;
-#ifdef TINYGLTF_USE_RAPIDJSON
-  isBoolean = value.IsBool();
-  if (isBoolean) {
-    boolValue = value.GetBool();
-  }
-#else
-  isBoolean = value.is_boolean();
-  if (isBoolean) {
-    boolValue = value.get<bool>();
-  }
-#endif
-  if (!isBoolean) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is not a bool type.\n";
-      }
-    }
-    return false;
-  }
-
-  if (ret) {
-    (*ret) = boolValue;
-  }
-
-  return true;
-}
-
-static bool ParseIntegerProperty(int *ret, std::string *err, const json &o,
-                                 const std::string &property,
-                                 const bool required,
-                                 const std::string &parent_node = "") {
-  json_const_iterator it;
-  if (!FindMember(o, property.c_str(), it)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is missing";
-        if (!parent_node.empty()) {
-          (*err) += " in " + parent_node;
-        }
-        (*err) += ".\n";
-      }
-    }
-    return false;
-  }
-
-  int intValue;
-  bool isInt = GetInt(GetValue(it), intValue);
-  if (!isInt) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is not an integer type.\n";
-      }
-    }
-    return false;
-  }
-
-  if (ret) {
-    (*ret) = intValue;
-  }
-
-  return true;
-}
-
-static bool ParseUnsignedProperty(size_t *ret, std::string *err, const json &o,
-                                  const std::string &property,
-                                  const bool required,
-                                  const std::string &parent_node = "") {
-  json_const_iterator it;
-  if (!FindMember(o, property.c_str(), it)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is missing";
-        if (!parent_node.empty()) {
-          (*err) += " in " + parent_node;
-        }
-        (*err) += ".\n";
-      }
-    }
-    return false;
-  }
-
-  auto &value = GetValue(it);
-
-  size_t uValue = 0;
-  bool isUValue;
-#ifdef TINYGLTF_USE_RAPIDJSON
-  isUValue = false;
-  if (value.IsUint()) {
-    uValue = value.GetUint();
-    isUValue = true;
-  } else if (value.IsUint64()) {
-    uValue = value.GetUint64();
-    isUValue = true;
-  }
-#else
-  isUValue = value.is_number_unsigned();
-  if (isUValue) {
-    uValue = value.get<size_t>();
-  }
-#endif
-  if (!isUValue) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is not a positive integer.\n";
-      }
-    }
-    return false;
-  }
-
-  if (ret) {
-    (*ret) = uValue;
-  }
-
-  return true;
-}
-
-static bool ParseNumberProperty(double *ret, std::string *err, const json &o,
-                                const std::string &property,
-                                const bool required,
-                                const std::string &parent_node = "") {
-  json_const_iterator it;
-
-  if (!FindMember(o, property.c_str(), it)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is missing";
-        if (!parent_node.empty()) {
-          (*err) += " in " + parent_node;
-        }
-        (*err) += ".\n";
-      }
-    }
-    return false;
-  }
-
-  double numberValue;
-  bool isNumber = GetNumber(GetValue(it), numberValue);
-
-  if (!isNumber) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is not a number type.\n";
-      }
-    }
-    return false;
-  }
-
-  if (ret) {
-    (*ret) = numberValue;
-  }
-
-  return true;
-}
-
-static bool ParseNumberArrayProperty(std::vector<double> *ret, std::string *err,
-                                     const json &o, const std::string &property,
-                                     bool required,
-                                     const std::string &parent_node = "") {
-  json_const_iterator it;
-  if (!FindMember(o, property.c_str(), it)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is missing";
-        if (!parent_node.empty()) {
-          (*err) += " in " + parent_node;
-        }
-        (*err) += ".\n";
-      }
-    }
-    return false;
-  }
-
-  if (!IsArray(GetValue(it))) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is not an array";
-        if (!parent_node.empty()) {
-          (*err) += " in " + parent_node;
-        }
-        (*err) += ".\n";
-      }
-    }
-    return false;
-  }
-
-  ret->clear();
-  auto end = ArrayEnd(GetValue(it));
-  for (auto i = ArrayBegin(GetValue(it)); i != end; ++i) {
-    double numberValue;
-    const bool isNumber = GetNumber(*i, numberValue);
-    if (!isNumber) {
-      if (required) {
-        if (err) {
-          (*err) += "'" + property + "' property is not a number.\n";
-          if (!parent_node.empty()) {
-            (*err) += " in " + parent_node;
-          }
-          (*err) += ".\n";
-        }
-      }
-      return false;
-    }
-    ret->push_back(numberValue);
-  }
-
-  return true;
-}
-
-static bool ParseIntegerArrayProperty(std::vector<int> *ret, std::string *err,
-                                      const json &o,
-                                      const std::string &property,
-                                      bool required,
-                                      const std::string &parent_node = "") {
-  json_const_iterator it;
-  if (!FindMember(o, property.c_str(), it)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is missing";
-        if (!parent_node.empty()) {
-          (*err) += " in " + parent_node;
-        }
-        (*err) += ".\n";
-      }
-    }
-    return false;
-  }
-
-  if (!IsArray(GetValue(it))) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is not an array";
-        if (!parent_node.empty()) {
-          (*err) += " in " + parent_node;
-        }
-        (*err) += ".\n";
-      }
-    }
-    return false;
-  }
-
-  ret->clear();
-  auto end = ArrayEnd(GetValue(it));
-  for (auto i = ArrayBegin(GetValue(it)); i != end; ++i) {
-    int numberValue;
-    bool isNumber = GetInt(*i, numberValue);
-    if (!isNumber) {
-      if (required) {
-        if (err) {
-          (*err) += "'" + property + "' property is not an integer type.\n";
-          if (!parent_node.empty()) {
-            (*err) += " in " + parent_node;
-          }
-          (*err) += ".\n";
-        }
-      }
-      return false;
-    }
-    ret->push_back(numberValue);
-  }
-
-  return true;
-}
-
-static bool ParseStringProperty(
-    std::string *ret, std::string *err, const json &o,
-    const std::string &property, bool required,
-    const std::string &parent_node = std::string()) {
-  json_const_iterator it;
-  if (!FindMember(o, property.c_str(), it)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is missing";
-        if (parent_node.empty()) {
-          (*err) += ".\n";
-        } else {
-          (*err) += " in `" + parent_node + "'.\n";
-        }
-      }
-    }
-    return false;
-  }
-
-  std::string strValue;
-  if (!GetString(GetValue(it), strValue)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is not a string type.\n";
-      }
-    }
-    return false;
-  }
-
-  if (ret) {
-    (*ret) = std::move(strValue);
-  }
-
-  return true;
-}
-
-static bool ParseStringIntegerProperty(std::map<std::string, int> *ret,
-                                       std::string *err, const json &o,
-                                       const std::string &property,
-                                       bool required,
-                                       const std::string &parent = "") {
-  json_const_iterator it;
-  if (!FindMember(o, property.c_str(), it)) {
-    if (required) {
-      if (err) {
-        if (!parent.empty()) {
-          (*err) +=
-              "'" + property + "' property is missing in " + parent + ".\n";
-        } else {
-          (*err) += "'" + property + "' property is missing.\n";
-        }
-      }
-    }
-    return false;
-  }
-
-  const json &dict = GetValue(it);
-
-  // Make sure we are dealing with an object / dictionary.
-  if (!IsObject(dict)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is not an object.\n";
-      }
-    }
-    return false;
-  }
-
-  ret->clear();
-
-  json_const_iterator dictIt(ObjectBegin(dict));
-  json_const_iterator dictItEnd(ObjectEnd(dict));
-
-  for (; dictIt != dictItEnd; ++dictIt) {
-    int intVal;
-    if (!GetInt(GetValue(dictIt), intVal)) {
-      if (required) {
-        if (err) {
-          (*err) += "'" + property + "' value is not an integer type.\n";
-        }
-      }
-      return false;
-    }
-
-    // Insert into the list.
-    (*ret)[GetKey(dictIt)] = intVal;
-  }
-  return true;
-}
-
-static bool ParseJSONProperty(std::map<std::string, double> *ret,
-                              std::string *err, const json &o,
-                              const std::string &property, bool required) {
-  json_const_iterator it;
-  if (!FindMember(o, property.c_str(), it)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is missing. \n'";
-      }
-    }
-    return false;
-  }
-
-  const json &obj = GetValue(it);
-
-  if (!IsObject(obj)) {
-    if (required) {
-      if (err) {
-        (*err) += "'" + property + "' property is not a JSON object.\n";
-      }
-    }
-    return false;
-  }
-
-  ret->clear();
-
-  json_const_iterator it2(ObjectBegin(obj));
-  json_const_iterator itEnd(ObjectEnd(obj));
-  for (; it2 != itEnd; ++it2) {
-    double numVal;
-    if (GetNumber(GetValue(it2), numVal))
-      ret->emplace(std::string(GetKey(it2)), numVal);
-  }
-
-  return true;
-}
-
-static bool ParseParameterProperty(Parameter *param, std::string *err,
-                                   const json &o, const std::string &prop,
-                                   bool required) {
-  // A parameter value can either be a string or an array of either a boolean or
-  // a number. Booleans of any kind aren't supported here. Granted, it
-  // complicates the Parameter structure and breaks it semantically in the sense
-  // that the client probably works off the assumption that if the string is
-  // empty the vector is used, etc. Would a tagged union work?
-  if (ParseStringProperty(&param->string_value, err, o, prop, false)) {
-    // Found string property.
-    return true;
-  } else if (ParseNumberArrayProperty(&param->number_array, err, o, prop,
-                                      false)) {
-    // Found a number array.
-    return true;
-  } else if (ParseNumberProperty(&param->number_value, err, o, prop, false)) {
-    param->has_number_value = true;
-    return true;
-  } else if (ParseJSONProperty(&param->json_double_value, err, o, prop,
-                               false)) {
-    return true;
-  } else if (ParseBooleanProperty(&param->bool_value, err, o, prop, false)) {
-    return true;
-  } else {
-    if (required) {
-      if (err) {
-        (*err) += "parameter must be a string or number / number array.\n";
-      }
-    }
-    return false;
-  }
-}
-
-static bool ParseExtensionsProperty(ExtensionMap *ret, std::string *err,
-                                    const json &o) {
-  (void)err;
-
-  json_const_iterator it;
-  if (!FindMember(o, "extensions", it)) {
-    return false;
-  }
-
-  auto &obj = GetValue(it);
-  if (!IsObject(obj)) {
-    return false;
-  }
-  ExtensionMap extensions;
-  json_const_iterator extIt = ObjectBegin(obj);  // it.value().begin();
-  json_const_iterator extEnd = ObjectEnd(obj);
-  for (; extIt != extEnd; ++extIt) {
-    auto &itObj = GetValue(extIt);
-    if (!IsObject(itObj)) continue;
-    std::string key(GetKey(extIt));
-    if (!ParseJsonAsValue(&extensions[key], itObj)) {
-      if (!key.empty()) {
-        // create empty object so that an extension object is still of type
-        // object
-        extensions[key] = Value{Value::Object{}};
-      }
-    }
-  }
-  if (ret) {
-    (*ret) = std::move(extensions);
-  }
-  return true;
-}
-
-static bool ParseAsset(Asset *asset, std::string *err, const json &o,
-                       bool store_original_json_for_extras_and_extensions) {
-  ParseStringProperty(&asset->version, err, o, "version", true, "Asset");
-  ParseStringProperty(&asset->generator, err, o, "generator", false, "Asset");
-  ParseStringProperty(&asset->minVersion, err, o, "minVersion", false, "Asset");
-  ParseStringProperty(&asset->copyright, err, o, "copyright", false, "Asset");
-
-  ParseExtensionsProperty(&asset->extensions, err, o);
-
-  // Unity exporter version is added as extra here
-  ParseExtrasProperty(&(asset->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        asset->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        asset->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseImage(Image *image, const int image_idx, std::string *err,
-                       std::string *warn, const json &o,
-                       bool store_original_json_for_extras_and_extensions,
-                       const std::string &basedir, FsCallbacks *fs,
-                       LoadImageDataFunction *LoadImageData = nullptr,
-                       void *load_image_user_data = nullptr) {
-  // A glTF image must either reference a bufferView or an image uri
-
-  // schema says oneOf [`bufferView`, `uri`]
-  // TODO(syoyo): Check the type of each parameters.
-  json_const_iterator it;
-  bool hasBufferView = FindMember(o, "bufferView", it);
-  bool hasURI = FindMember(o, "uri", it);
-
-  ParseStringProperty(&image->name, err, o, "name", false);
-
-  if (hasBufferView && hasURI) {
-    // Should not both defined.
-    if (err) {
-      (*err) +=
-          "Only one of `bufferView` or `uri` should be defined, but both are "
-          "defined for image[" +
-          std::to_string(image_idx) + "] name = \"" + image->name + "\"\n";
-    }
-    return false;
-  }
-
-  if (!hasBufferView && !hasURI) {
-    if (err) {
-      (*err) += "Neither required `bufferView` nor `uri` defined for image[" +
-                std::to_string(image_idx) + "] name = \"" + image->name +
-                "\"\n";
-    }
-    return false;
-  }
-
-  ParseExtensionsProperty(&image->extensions, err, o);
-  ParseExtrasProperty(&image->extras, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator eit;
-      if (FindMember(o, "extensions", eit)) {
-        image->extensions_json_string = JsonToString(GetValue(eit));
-      }
-    }
-    {
-      json_const_iterator eit;
-      if (FindMember(o, "extras", eit)) {
-        image->extras_json_string = JsonToString(GetValue(eit));
-      }
-    }
-  }
-
-  if (hasBufferView) {
-    int bufferView = -1;
-    if (!ParseIntegerProperty(&bufferView, err, o, "bufferView", true)) {
-      if (err) {
-        (*err) += "Failed to parse `bufferView` for image[" +
-                  std::to_string(image_idx) + "] name = \"" + image->name +
-                  "\"\n";
-      }
-      return false;
-    }
-
-    std::string mime_type;
-    ParseStringProperty(&mime_type, err, o, "mimeType", false);
-
-    int width = 0;
-    ParseIntegerProperty(&width, err, o, "width", false);
-
-    int height = 0;
-    ParseIntegerProperty(&height, err, o, "height", false);
-
-    // Just only save some information here. Loading actual image data from
-    // bufferView is done after this `ParseImage` function.
-    image->bufferView = bufferView;
-    image->mimeType = mime_type;
-    image->width = width;
-    image->height = height;
-
-    return true;
-  }
-
-  // Parse URI & Load image data.
-
-  std::string uri;
-  std::string tmp_err;
-  if (!ParseStringProperty(&uri, &tmp_err, o, "uri", true)) {
-    if (err) {
-      (*err) += "Failed to parse `uri` for image[" + std::to_string(image_idx) +
-                "] name = \"" + image->name + "\".\n";
-    }
-    return false;
-  }
-
-  std::vector<unsigned char> img;
-
-  if (IsDataURI(uri)) {
-    if (!DecodeDataURI(&img, image->mimeType, uri, 0, false)) {
-      if (err) {
-        (*err) += "Failed to decode 'uri' for image[" +
-                  std::to_string(image_idx) + "] name = [" + image->name +
-                  "]\n";
-      }
-      return false;
-    }
-  } else {
-    // Assume external file
-    // Keep texture path (for textures that cannot be decoded)
-    image->uri = uri;
-#ifdef TINYGLTF_NO_EXTERNAL_IMAGE
-    return true;
-#else
-    std::string decoded_uri = dlib::urldecode(uri);
-    if (!LoadExternalFile(&img, err, warn, decoded_uri, basedir,
-                          /* required */ false, /* required bytes */ 0,
-                          /* checksize */ false, fs)) {
-      if (warn) {
-        (*warn) += "Failed to load external 'uri' for image[" +
-                   std::to_string(image_idx) + "] name = [" + image->name +
-                   "]\n";
-      }
-      // If the image cannot be loaded, keep uri as image->uri.
-      return true;
-    }
-
-    if (img.empty()) {
-      if (warn) {
-        (*warn) += "Image data is empty for image[" +
-                   std::to_string(image_idx) + "] name = [" + image->name +
-                   "] \n";
-      }
-      return false;
-    }
-#endif
-  }
-
-  if (*LoadImageData == nullptr) {
-    if (err) {
-      (*err) += "No LoadImageData callback specified.\n";
-    }
-    return false;
-  }
-  return (*LoadImageData)(image, image_idx, err, warn, 0, 0, &img.at(0),
-                          static_cast<int>(img.size()), load_image_user_data);
-}
-
-static bool ParseTexture(Texture *texture, std::string *err, const json &o,
-                         bool store_original_json_for_extras_and_extensions,
-                         const std::string &basedir) {
-  (void)basedir;
-  int sampler = -1;
-  int source = -1;
-  ParseIntegerProperty(&sampler, err, o, "sampler", false);
-
-  ParseIntegerProperty(&source, err, o, "source", false);
-
-  texture->sampler = sampler;
-  texture->source = source;
-
-  ParseExtensionsProperty(&texture->extensions, err, o);
-  ParseExtrasProperty(&texture->extras, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        texture->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        texture->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  ParseStringProperty(&texture->name, err, o, "name", false);
-
-  return true;
-}
-
-static bool ParseTextureInfo(
-    TextureInfo *texinfo, std::string *err, const json &o,
-    bool store_original_json_for_extras_and_extensions) {
-  if (texinfo == nullptr) {
-    return false;
-  }
-
-  if (!ParseIntegerProperty(&texinfo->index, err, o, "index",
-                            /* required */ true, "TextureInfo")) {
-    return false;
-  }
-
-  ParseIntegerProperty(&texinfo->texCoord, err, o, "texCoord", false);
-
-  ParseExtensionsProperty(&texinfo->extensions, err, o);
-  ParseExtrasProperty(&texinfo->extras, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        texinfo->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        texinfo->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseNormalTextureInfo(
-    NormalTextureInfo *texinfo, std::string *err, const json &o,
-    bool store_original_json_for_extras_and_extensions) {
-  if (texinfo == nullptr) {
-    return false;
-  }
-
-  if (!ParseIntegerProperty(&texinfo->index, err, o, "index",
-                            /* required */ true, "NormalTextureInfo")) {
-    return false;
-  }
-
-  ParseIntegerProperty(&texinfo->texCoord, err, o, "texCoord", false);
-  ParseNumberProperty(&texinfo->scale, err, o, "scale", false);
-
-  ParseExtensionsProperty(&texinfo->extensions, err, o);
-  ParseExtrasProperty(&texinfo->extras, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        texinfo->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        texinfo->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseOcclusionTextureInfo(
-    OcclusionTextureInfo *texinfo, std::string *err, const json &o,
-    bool store_original_json_for_extras_and_extensions) {
-  if (texinfo == nullptr) {
-    return false;
-  }
-
-  if (!ParseIntegerProperty(&texinfo->index, err, o, "index",
-                            /* required */ true, "NormalTextureInfo")) {
-    return false;
-  }
-
-  ParseIntegerProperty(&texinfo->texCoord, err, o, "texCoord", false);
-  ParseNumberProperty(&texinfo->strength, err, o, "strength", false);
-
-  ParseExtensionsProperty(&texinfo->extensions, err, o);
-  ParseExtrasProperty(&texinfo->extras, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        texinfo->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        texinfo->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseBuffer(Buffer *buffer, std::string *err, const json &o,
-                        bool store_original_json_for_extras_and_extensions,
-                        FsCallbacks *fs, const std::string &basedir,
-                        bool is_binary = false,
-                        const unsigned char *bin_data = nullptr,
-                        size_t bin_size = 0) {
-  size_t byteLength;
-  if (!ParseUnsignedProperty(&byteLength, err, o, "byteLength", true,
-                             "Buffer")) {
-    return false;
-  }
-
-  // In glTF 2.0, uri is not mandatory anymore
-  buffer->uri.clear();
-  ParseStringProperty(&buffer->uri, err, o, "uri", false, "Buffer");
-
-  // having an empty uri for a non embedded image should not be valid
-  if (!is_binary && buffer->uri.empty()) {
-    if (err) {
-      (*err) += "'uri' is missing from non binary glTF file buffer.\n";
-    }
-  }
-
-  json_const_iterator type;
-  if (FindMember(o, "type", type)) {
-    std::string typeStr;
-    if (GetString(GetValue(type), typeStr)) {
-      if (typeStr.compare("arraybuffer") == 0) {
-        // buffer.type = "arraybuffer";
-      }
-    }
-  }
-
-  if (is_binary) {
-    // Still binary glTF accepts external dataURI.
-    if (!buffer->uri.empty()) {
-      // First try embedded data URI.
-      if (IsDataURI(buffer->uri)) {
-        std::string mime_type;
-        if (!DecodeDataURI(&buffer->data, mime_type, buffer->uri, byteLength,
-                           true)) {
-          if (err) {
-            (*err) +=
-                "Failed to decode 'uri' : " + buffer->uri + " in Buffer\n";
-          }
-          return false;
-        }
-      } else {
-        // External .bin file.
-        std::string decoded_uri = dlib::urldecode(buffer->uri);
-        if (!LoadExternalFile(&buffer->data, err, /* warn */ nullptr,
-                              decoded_uri, basedir, /* required */ true,
-                              byteLength, /* checkSize */ true, fs)) {
-          return false;
-        }
-      }
-    } else {
-      // load data from (embedded) binary data
-
-      if ((bin_size == 0) || (bin_data == nullptr)) {
-        if (err) {
-          (*err) += "Invalid binary data in `Buffer', or GLB with empty BIN chunk.\n";
-        }
-        return false;
-      }
-
-      if (byteLength > bin_size) {
-        if (err) {
-          std::stringstream ss;
-          ss << "Invalid `byteLength'. Must be equal or less than binary size: "
-                "`byteLength' = "
-             << byteLength << ", binary size = " << bin_size << std::endl;
-          (*err) += ss.str();
-        }
-        return false;
-      }
-
-      // Read buffer data
-      buffer->data.resize(static_cast<size_t>(byteLength));
-      memcpy(&(buffer->data.at(0)), bin_data, static_cast<size_t>(byteLength));
-    }
-
-  } else {
-    if (IsDataURI(buffer->uri)) {
-      std::string mime_type;
-      if (!DecodeDataURI(&buffer->data, mime_type, buffer->uri, byteLength,
-                         true)) {
-        if (err) {
-          (*err) += "Failed to decode 'uri' : " + buffer->uri + " in Buffer\n";
-        }
-        return false;
-      }
-    } else {
-      // Assume external .bin file.
-      std::string decoded_uri = dlib::urldecode(buffer->uri);
-      if (!LoadExternalFile(&buffer->data, err, /* warn */ nullptr, decoded_uri,
-                            basedir, /* required */ true, byteLength,
-                            /* checkSize */ true, fs)) {
-        return false;
-      }
-    }
-  }
-
-  ParseStringProperty(&buffer->name, err, o, "name", false);
-
-  ParseExtensionsProperty(&buffer->extensions, err, o);
-  ParseExtrasProperty(&buffer->extras, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        buffer->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        buffer->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseBufferView(
-    BufferView *bufferView, std::string *err, const json &o,
-    bool store_original_json_for_extras_and_extensions) {
-  int buffer = -1;
-  if (!ParseIntegerProperty(&buffer, err, o, "buffer", true, "BufferView")) {
-    return false;
-  }
-
-  size_t byteOffset = 0;
-  ParseUnsignedProperty(&byteOffset, err, o, "byteOffset", false);
-
-  size_t byteLength = 1;
-  if (!ParseUnsignedProperty(&byteLength, err, o, "byteLength", true,
-                             "BufferView")) {
-    return false;
-  }
-
-  size_t byteStride = 0;
-  if (!ParseUnsignedProperty(&byteStride, err, o, "byteStride", false)) {
-    // Spec says: When byteStride of referenced bufferView is not defined, it
-    // means that accessor elements are tightly packed, i.e., effective stride
-    // equals the size of the element.
-    // We cannot determine the actual byteStride until Accessor are parsed, thus
-    // set 0(= tightly packed) here(as done in OpenGL's VertexAttribPoiner)
-    byteStride = 0;
-  }
-
-  if ((byteStride > 252) || ((byteStride % 4) != 0)) {
-    if (err) {
-      std::stringstream ss;
-      ss << "Invalid `byteStride' value. `byteStride' must be the multiple of "
-            "4 : "
-         << byteStride << std::endl;
-
-      (*err) += ss.str();
-    }
-    return false;
-  }
-
-  int target = 0;
-  ParseIntegerProperty(&target, err, o, "target", false);
-  if ((target == TINYGLTF_TARGET_ARRAY_BUFFER) ||
-      (target == TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER)) {
-    // OK
-  } else {
-    target = 0;
-  }
-  bufferView->target = target;
-
-  ParseStringProperty(&bufferView->name, err, o, "name", false);
-
-  ParseExtensionsProperty(&bufferView->extensions, err, o);
-  ParseExtrasProperty(&bufferView->extras, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        bufferView->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        bufferView->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  bufferView->buffer = buffer;
-  bufferView->byteOffset = byteOffset;
-  bufferView->byteLength = byteLength;
-  bufferView->byteStride = byteStride;
-  return true;
-}
-
-static bool ParseSparseAccessor(Accessor *accessor, std::string *err,
-                                const json &o) {
-  accessor->sparse.isSparse = true;
-
-  int count = 0;
-  if (!ParseIntegerProperty(&count, err, o, "count", true, "SparseAccessor")) {
-    return false;
-  }
-
-  json_const_iterator indices_iterator;
-  json_const_iterator values_iterator;
-  if (!FindMember(o, "indices", indices_iterator)) {
-    (*err) = "the sparse object of this accessor doesn't have indices";
-    return false;
-  }
-
-  if (!FindMember(o, "values", values_iterator)) {
-    (*err) = "the sparse object ob ths accessor doesn't have values";
-    return false;
-  }
-
-  const json &indices_obj = GetValue(indices_iterator);
-  const json &values_obj = GetValue(values_iterator);
-
-  int indices_buffer_view = 0, indices_byte_offset = 0, component_type = 0;
-  if (!ParseIntegerProperty(&indices_buffer_view, err, indices_obj,
-                            "bufferView", true, "SparseAccessor")) {
-    return false;
-  }
-  ParseIntegerProperty(&indices_byte_offset, err, indices_obj, "byteOffset",
-                       false);
-  if (!ParseIntegerProperty(&component_type, err, indices_obj, "componentType",
-                            true, "SparseAccessor")) {
-    return false;
-  }
-
-  int values_buffer_view = 0, values_byte_offset = 0;
-  if (!ParseIntegerProperty(&values_buffer_view, err, values_obj, "bufferView",
-                            true, "SparseAccessor")) {
-    return false;
-  }
-  ParseIntegerProperty(&values_byte_offset, err, values_obj, "byteOffset",
-                       false);
-
-  accessor->sparse.count = count;
-  accessor->sparse.indices.bufferView = indices_buffer_view;
-  accessor->sparse.indices.byteOffset = indices_byte_offset;
-  accessor->sparse.indices.componentType = component_type;
-  accessor->sparse.values.bufferView = values_buffer_view;
-  accessor->sparse.values.byteOffset = values_byte_offset;
-
-  return true;
-}
-
-static bool ParseAccessor(Accessor *accessor, std::string *err, const json &o,
-                          bool store_original_json_for_extras_and_extensions) {
-  int bufferView = -1;
-  ParseIntegerProperty(&bufferView, err, o, "bufferView", false, "Accessor");
-
-  size_t byteOffset = 0;
-  ParseUnsignedProperty(&byteOffset, err, o, "byteOffset", false, "Accessor");
-
-  bool normalized = false;
-  ParseBooleanProperty(&normalized, err, o, "normalized", false, "Accessor");
-
-  size_t componentType = 0;
-  if (!ParseUnsignedProperty(&componentType, err, o, "componentType", true,
-                             "Accessor")) {
-    return false;
-  }
-
-  size_t count = 0;
-  if (!ParseUnsignedProperty(&count, err, o, "count", true, "Accessor")) {
-    return false;
-  }
-
-  std::string type;
-  if (!ParseStringProperty(&type, err, o, "type", true, "Accessor")) {
-    return false;
-  }
-
-  if (type.compare("SCALAR") == 0) {
-    accessor->type = TINYGLTF_TYPE_SCALAR;
-  } else if (type.compare("VEC2") == 0) {
-    accessor->type = TINYGLTF_TYPE_VEC2;
-  } else if (type.compare("VEC3") == 0) {
-    accessor->type = TINYGLTF_TYPE_VEC3;
-  } else if (type.compare("VEC4") == 0) {
-    accessor->type = TINYGLTF_TYPE_VEC4;
-  } else if (type.compare("MAT2") == 0) {
-    accessor->type = TINYGLTF_TYPE_MAT2;
-  } else if (type.compare("MAT3") == 0) {
-    accessor->type = TINYGLTF_TYPE_MAT3;
-  } else if (type.compare("MAT4") == 0) {
-    accessor->type = TINYGLTF_TYPE_MAT4;
-  } else {
-    std::stringstream ss;
-    ss << "Unsupported `type` for accessor object. Got \"" << type << "\"\n";
-    if (err) {
-      (*err) += ss.str();
-    }
-    return false;
-  }
-
-  ParseStringProperty(&accessor->name, err, o, "name", false);
-
-  accessor->minValues.clear();
-  accessor->maxValues.clear();
-  ParseNumberArrayProperty(&accessor->minValues, err, o, "min", false,
-                           "Accessor");
-
-  ParseNumberArrayProperty(&accessor->maxValues, err, o, "max", false,
-                           "Accessor");
-
-  accessor->count = count;
-  accessor->bufferView = bufferView;
-  accessor->byteOffset = byteOffset;
-  accessor->normalized = normalized;
-  {
-    if (componentType >= TINYGLTF_COMPONENT_TYPE_BYTE &&
-        componentType <= TINYGLTF_COMPONENT_TYPE_DOUBLE) {
-      // OK
-      accessor->componentType = int(componentType);
-    } else {
-      std::stringstream ss;
-      ss << "Invalid `componentType` in accessor. Got " << componentType
-         << "\n";
-      if (err) {
-        (*err) += ss.str();
-      }
-      return false;
-    }
-  }
-
-  ParseExtensionsProperty(&(accessor->extensions), err, o);
-  ParseExtrasProperty(&(accessor->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        accessor->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        accessor->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  // check if accessor has a "sparse" object:
-  json_const_iterator iterator;
-  if (FindMember(o, "sparse", iterator)) {
-    // here this accessor has a "sparse" subobject
-    return ParseSparseAccessor(accessor, err, GetValue(iterator));
-  }
-
-  return true;
-}
-
-#ifdef TINYGLTF_ENABLE_DRACO
-
-static void DecodeIndexBuffer(draco::Mesh *mesh, size_t componentSize,
-                              std::vector<uint8_t> &outBuffer) {
-  if (componentSize == 4) {
-    assert(sizeof(mesh->face(draco::FaceIndex(0))[0]) == componentSize);
-    memcpy(outBuffer.data(), &mesh->face(draco::FaceIndex(0))[0],
-           outBuffer.size());
-  } else {
-    size_t faceStride = componentSize * 3;
-    for (draco::FaceIndex f(0); f < mesh->num_faces(); ++f) {
-      const draco::Mesh::Face &face = mesh->face(f);
-      if (componentSize == 2) {
-        uint16_t indices[3] = {(uint16_t)face[0].value(),
-                               (uint16_t)face[1].value(),
-                               (uint16_t)face[2].value()};
-        memcpy(outBuffer.data() + f.value() * faceStride, &indices[0],
-               faceStride);
-      } else {
-        uint8_t indices[3] = {(uint8_t)face[0].value(),
-                              (uint8_t)face[1].value(),
-                              (uint8_t)face[2].value()};
-        memcpy(outBuffer.data() + f.value() * faceStride, &indices[0],
-               faceStride);
-      }
-    }
-  }
-}
-
-template <typename T>
-static bool GetAttributeForAllPoints(draco::Mesh *mesh,
-                                     const draco::PointAttribute *pAttribute,
-                                     std::vector<uint8_t> &outBuffer) {
-  size_t byteOffset = 0;
-  T values[4] = {0, 0, 0, 0};
-  for (draco::PointIndex i(0); i < mesh->num_points(); ++i) {
-    const draco::AttributeValueIndex val_index = pAttribute->mapped_index(i);
-    if (!pAttribute->ConvertValue<T>(val_index, pAttribute->num_components(),
-                                     values))
-      return false;
-
-    memcpy(outBuffer.data() + byteOffset, &values[0],
-           sizeof(T) * pAttribute->num_components());
-    byteOffset += sizeof(T) * pAttribute->num_components();
-  }
-
-  return true;
-}
-
-static bool GetAttributeForAllPoints(uint32_t componentType, draco::Mesh *mesh,
-                                     const draco::PointAttribute *pAttribute,
-                                     std::vector<uint8_t> &outBuffer) {
-  bool decodeResult = false;
-  switch (componentType) {
-    case TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE:
-      decodeResult =
-          GetAttributeForAllPoints<uint8_t>(mesh, pAttribute, outBuffer);
-      break;
-    case TINYGLTF_COMPONENT_TYPE_BYTE:
-      decodeResult =
-          GetAttributeForAllPoints<int8_t>(mesh, pAttribute, outBuffer);
-      break;
-    case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
-      decodeResult =
-          GetAttributeForAllPoints<uint16_t>(mesh, pAttribute, outBuffer);
-      break;
-    case TINYGLTF_COMPONENT_TYPE_SHORT:
-      decodeResult =
-          GetAttributeForAllPoints<int16_t>(mesh, pAttribute, outBuffer);
-      break;
-    case TINYGLTF_COMPONENT_TYPE_INT:
-      decodeResult =
-          GetAttributeForAllPoints<int32_t>(mesh, pAttribute, outBuffer);
-      break;
-    case TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT:
-      decodeResult =
-          GetAttributeForAllPoints<uint32_t>(mesh, pAttribute, outBuffer);
-      break;
-    case TINYGLTF_COMPONENT_TYPE_FLOAT:
-      decodeResult =
-          GetAttributeForAllPoints<float>(mesh, pAttribute, outBuffer);
-      break;
-    case TINYGLTF_COMPONENT_TYPE_DOUBLE:
-      decodeResult =
-          GetAttributeForAllPoints<double>(mesh, pAttribute, outBuffer);
-      break;
-    default:
-      return false;
-  }
-
-  return decodeResult;
-}
-
-static bool ParseDracoExtension(Primitive *primitive, Model *model,
-                                std::string *err,
-                                const Value &dracoExtensionValue) {
-  (void)err;
-  auto bufferViewValue = dracoExtensionValue.Get("bufferView");
-  if (!bufferViewValue.IsInt()) return false;
-  auto attributesValue = dracoExtensionValue.Get("attributes");
-  if (!attributesValue.IsObject()) return false;
-
-  auto attributesObject = attributesValue.Get<Value::Object>();
-  int bufferView = bufferViewValue.Get<int>();
-
-  BufferView &view = model->bufferViews[bufferView];
-  Buffer &buffer = model->buffers[view.buffer];
-  // BufferView has already been decoded
-  if (view.dracoDecoded) return true;
-  view.dracoDecoded = true;
-
-  const char *bufferViewData =
-      reinterpret_cast<const char *>(buffer.data.data() + view.byteOffset);
-  size_t bufferViewSize = view.byteLength;
-
-  // decode draco
-  draco::DecoderBuffer decoderBuffer;
-  decoderBuffer.Init(bufferViewData, bufferViewSize);
-  draco::Decoder decoder;
-  auto decodeResult = decoder.DecodeMeshFromBuffer(&decoderBuffer);
-  if (!decodeResult.ok()) {
-    return false;
-  }
-  const std::unique_ptr<draco::Mesh> &mesh = decodeResult.value();
-
-  // create new bufferView for indices
-  if (primitive->indices >= 0) {
-    int32_t componentSize = GetComponentSizeInBytes(
-        model->accessors[primitive->indices].componentType);
-    Buffer decodedIndexBuffer;
-    decodedIndexBuffer.data.resize(mesh->num_faces() * 3 * componentSize);
-
-    DecodeIndexBuffer(mesh.get(), componentSize, decodedIndexBuffer.data);
-
-    model->buffers.emplace_back(std::move(decodedIndexBuffer));
-
-    BufferView decodedIndexBufferView;
-    decodedIndexBufferView.buffer = int(model->buffers.size() - 1);
-    decodedIndexBufferView.byteLength =
-        int(mesh->num_faces() * 3 * componentSize);
-    decodedIndexBufferView.byteOffset = 0;
-    decodedIndexBufferView.byteStride = 0;
-    decodedIndexBufferView.target = TINYGLTF_TARGET_ARRAY_BUFFER;
-    model->bufferViews.emplace_back(std::move(decodedIndexBufferView));
-
-    model->accessors[primitive->indices].bufferView =
-        int(model->bufferViews.size() - 1);
-    model->accessors[primitive->indices].count = int(mesh->num_faces() * 3);
-  }
-
-  for (const auto &attribute : attributesObject) {
-    if (!attribute.second.IsInt()) return false;
-    auto primitiveAttribute = primitive->attributes.find(attribute.first);
-    if (primitiveAttribute == primitive->attributes.end()) return false;
-
-    int dracoAttributeIndex = attribute.second.Get<int>();
-    const auto pAttribute = mesh->GetAttributeByUniqueId(dracoAttributeIndex);
-    const auto componentType =
-        model->accessors[primitiveAttribute->second].componentType;
-
-    // Create a new buffer for this decoded buffer
-    Buffer decodedBuffer;
-    size_t bufferSize = mesh->num_points() * pAttribute->num_components() *
-                        GetComponentSizeInBytes(componentType);
-    decodedBuffer.data.resize(bufferSize);
-
-    if (!GetAttributeForAllPoints(componentType, mesh.get(), pAttribute,
-                                  decodedBuffer.data))
-      return false;
-
-    model->buffers.emplace_back(std::move(decodedBuffer));
-
-    BufferView decodedBufferView;
-    decodedBufferView.buffer = int(model->buffers.size() - 1);
-    decodedBufferView.byteLength = bufferSize;
-    decodedBufferView.byteOffset = pAttribute->byte_offset();
-    decodedBufferView.byteStride = pAttribute->byte_stride();
-    decodedBufferView.target = primitive->indices >= 0
-                                   ? TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER
-                                   : TINYGLTF_TARGET_ARRAY_BUFFER;
-    model->bufferViews.emplace_back(std::move(decodedBufferView));
-
-    model->accessors[primitiveAttribute->second].bufferView =
-        int(model->bufferViews.size() - 1);
-    model->accessors[primitiveAttribute->second].count =
-        int(mesh->num_points());
-  }
-
-  return true;
-}
-#endif
-
-static bool ParsePrimitive(Primitive *primitive, Model *model, std::string *err,
-                           const json &o,
-                           bool store_original_json_for_extras_and_extensions) {
-  int material = -1;
-  ParseIntegerProperty(&material, err, o, "material", false);
-  primitive->material = material;
-
-  int mode = TINYGLTF_MODE_TRIANGLES;
-  ParseIntegerProperty(&mode, err, o, "mode", false);
-  primitive->mode = mode;  // Why only triangled were supported ?
-
-  int indices = -1;
-  ParseIntegerProperty(&indices, err, o, "indices", false);
-  primitive->indices = indices;
-  if (!ParseStringIntegerProperty(&primitive->attributes, err, o, "attributes",
-                                  true, "Primitive")) {
-    return false;
-  }
-
-  // Look for morph targets
-  json_const_iterator targetsObject;
-  if (FindMember(o, "targets", targetsObject) &&
-      IsArray(GetValue(targetsObject))) {
-    auto targetsObjectEnd = ArrayEnd(GetValue(targetsObject));
-    for (json_const_array_iterator i = ArrayBegin(GetValue(targetsObject));
-         i != targetsObjectEnd; ++i) {
-      std::map<std::string, int> targetAttribues;
-
-      const json &dict = *i;
-      if (IsObject(dict)) {
-        json_const_iterator dictIt(ObjectBegin(dict));
-        json_const_iterator dictItEnd(ObjectEnd(dict));
-
-        for (; dictIt != dictItEnd; ++dictIt) {
-          int iVal;
-          if (GetInt(GetValue(dictIt), iVal))
-            targetAttribues[GetKey(dictIt)] = iVal;
-        }
-        primitive->targets.emplace_back(std::move(targetAttribues));
-      }
-    }
-  }
-
-  ParseExtrasProperty(&(primitive->extras), o);
-  ParseExtensionsProperty(&primitive->extensions, err, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        primitive->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        primitive->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-#ifdef TINYGLTF_ENABLE_DRACO
-  auto dracoExtension =
-      primitive->extensions.find("KHR_draco_mesh_compression");
-  if (dracoExtension != primitive->extensions.end()) {
-    ParseDracoExtension(primitive, model, err, dracoExtension->second);
-  }
-#else
-  (void)model;
-#endif
-
-  return true;
-}
-
-static bool ParseMesh(Mesh *mesh, Model *model, std::string *err, const json &o,
-                      bool store_original_json_for_extras_and_extensions) {
-  ParseStringProperty(&mesh->name, err, o, "name", false);
-
-  mesh->primitives.clear();
-  json_const_iterator primObject;
-  if (FindMember(o, "primitives", primObject) &&
-      IsArray(GetValue(primObject))) {
-    json_const_array_iterator primEnd = ArrayEnd(GetValue(primObject));
-    for (json_const_array_iterator i = ArrayBegin(GetValue(primObject));
-         i != primEnd; ++i) {
-      Primitive primitive;
-      if (ParsePrimitive(&primitive, model, err, *i,
-                         store_original_json_for_extras_and_extensions)) {
-        // Only add the primitive if the parsing succeeds.
-        mesh->primitives.emplace_back(std::move(primitive));
-      }
-    }
-  }
-
-  // Should probably check if has targets and if dimensions fit
-  ParseNumberArrayProperty(&mesh->weights, err, o, "weights", false);
-
-  ParseExtensionsProperty(&mesh->extensions, err, o);
-  ParseExtrasProperty(&(mesh->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        mesh->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        mesh->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseNode(Node *node, std::string *err, const json &o,
-                      bool store_original_json_for_extras_and_extensions) {
-  ParseStringProperty(&node->name, err, o, "name", false);
-
-  int skin = -1;
-  ParseIntegerProperty(&skin, err, o, "skin", false);
-  node->skin = skin;
-
-  // Matrix and T/R/S are exclusive
-  if (!ParseNumberArrayProperty(&node->matrix, err, o, "matrix", false)) {
-    ParseNumberArrayProperty(&node->rotation, err, o, "rotation", false);
-    ParseNumberArrayProperty(&node->scale, err, o, "scale", false);
-    ParseNumberArrayProperty(&node->translation, err, o, "translation", false);
-  }
-
-  int camera = -1;
-  ParseIntegerProperty(&camera, err, o, "camera", false);
-  node->camera = camera;
-
-  int mesh = -1;
-  ParseIntegerProperty(&mesh, err, o, "mesh", false);
-  node->mesh = mesh;
-
-  node->children.clear();
-  ParseIntegerArrayProperty(&node->children, err, o, "children", false);
-
-  ParseNumberArrayProperty(&node->weights, err, o, "weights", false);
-
-  ParseExtensionsProperty(&node->extensions, err, o);
-  ParseExtrasProperty(&(node->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        node->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        node->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParsePbrMetallicRoughness(
-    PbrMetallicRoughness *pbr, std::string *err, const json &o,
-    bool store_original_json_for_extras_and_extensions) {
-  if (pbr == nullptr) {
-    return false;
-  }
-
-  std::vector<double> baseColorFactor;
-  if (ParseNumberArrayProperty(&baseColorFactor, err, o, "baseColorFactor",
-                               /* required */ false)) {
-    if (baseColorFactor.size() != 4) {
-      if (err) {
-        (*err) +=
-            "Array length of `baseColorFactor` parameter in "
-            "pbrMetallicRoughness must be 4, but got " +
-            std::to_string(baseColorFactor.size()) + "\n";
-      }
-      return false;
-    }
-    pbr->baseColorFactor = baseColorFactor;
-  }
-
-  {
-    json_const_iterator it;
-    if (FindMember(o, "baseColorTexture", it)) {
-      ParseTextureInfo(&pbr->baseColorTexture, err, GetValue(it),
-                       store_original_json_for_extras_and_extensions);
-    }
-  }
-
-  {
-    json_const_iterator it;
-    if (FindMember(o, "metallicRoughnessTexture", it)) {
-      ParseTextureInfo(&pbr->metallicRoughnessTexture, err, GetValue(it),
-                       store_original_json_for_extras_and_extensions);
-    }
-  }
-
-  ParseNumberProperty(&pbr->metallicFactor, err, o, "metallicFactor", false);
-  ParseNumberProperty(&pbr->roughnessFactor, err, o, "roughnessFactor", false);
-
-  ParseExtensionsProperty(&pbr->extensions, err, o);
-  ParseExtrasProperty(&pbr->extras, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        pbr->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        pbr->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseMaterial(Material *material, std::string *err, const json &o,
-                          bool store_original_json_for_extras_and_extensions) {
-  ParseStringProperty(&material->name, err, o, "name", /* required */ false);
-
-  if (ParseNumberArrayProperty(&material->emissiveFactor, err, o,
-                               "emissiveFactor",
-                               /* required */ false)) {
-    if (material->emissiveFactor.size() != 3) {
-      if (err) {
-        (*err) +=
-            "Array length of `emissiveFactor` parameter in "
-            "material must be 3, but got " +
-            std::to_string(material->emissiveFactor.size()) + "\n";
-      }
-      return false;
-    }
-  } else {
-    // fill with default values
-    material->emissiveFactor = {0.0, 0.0, 0.0};
-  }
-
-  ParseStringProperty(&material->alphaMode, err, o, "alphaMode",
-                      /* required */ false);
-  ParseNumberProperty(&material->alphaCutoff, err, o, "alphaCutoff",
-                      /* required */ false);
-  ParseBooleanProperty(&material->doubleSided, err, o, "doubleSided",
-                       /* required */ false);
-
-  {
-    json_const_iterator it;
-    if (FindMember(o, "pbrMetallicRoughness", it)) {
-      ParsePbrMetallicRoughness(&material->pbrMetallicRoughness, err,
-                                GetValue(it),
-                                store_original_json_for_extras_and_extensions);
-    }
-  }
-
-  {
-    json_const_iterator it;
-    if (FindMember(o, "normalTexture", it)) {
-      ParseNormalTextureInfo(&material->normalTexture, err, GetValue(it),
-                             store_original_json_for_extras_and_extensions);
-    }
-  }
-
-  {
-    json_const_iterator it;
-    if (FindMember(o, "occlusionTexture", it)) {
-      ParseOcclusionTextureInfo(&material->occlusionTexture, err, GetValue(it),
-                                store_original_json_for_extras_and_extensions);
-    }
-  }
-
-  {
-    json_const_iterator it;
-    if (FindMember(o, "emissiveTexture", it)) {
-      ParseTextureInfo(&material->emissiveTexture, err, GetValue(it),
-                       store_original_json_for_extras_and_extensions);
-    }
-  }
-
-  // Old code path. For backward compatibility, we still store material values
-  // as Parameter. This will create duplicated information for
-  // example(pbrMetallicRoughness), but should be neglible in terms of memory
-  // consumption.
-  // TODO(syoyo): Remove in the next major release.
-  material->values.clear();
-  material->additionalValues.clear();
-
-  json_const_iterator it(ObjectBegin(o));
-  json_const_iterator itEnd(ObjectEnd(o));
-
-  for (; it != itEnd; ++it) {
-    std::string key(GetKey(it));
-    if (key == "pbrMetallicRoughness") {
-      if (IsObject(GetValue(it))) {
-        const json &values_object = GetValue(it);
-
-        json_const_iterator itVal(ObjectBegin(values_object));
-        json_const_iterator itValEnd(ObjectEnd(values_object));
-
-        for (; itVal != itValEnd; ++itVal) {
-          Parameter param;
-          if (ParseParameterProperty(&param, err, values_object, GetKey(itVal),
-                                     false)) {
-            material->values.emplace(GetKey(itVal), std::move(param));
-          }
-        }
-      }
-    } else if (key == "extensions" || key == "extras") {
-      // done later, skip, otherwise poorly parsed contents will be saved in the
-      // parametermap and serialized again later
-    } else {
-      Parameter param;
-      if (ParseParameterProperty(&param, err, o, key, false)) {
-        // names of materials have already been parsed. Putting it in this map
-        // doesn't correctly reflext the glTF specification
-        if (key != "name")
-          material->additionalValues.emplace(std::move(key), std::move(param));
-      }
-    }
-  }
-
-  material->extensions.clear();
-  ParseExtensionsProperty(&material->extensions, err, o);
-  ParseExtrasProperty(&(material->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator eit;
-      if (FindMember(o, "extensions", eit)) {
-        material->extensions_json_string = JsonToString(GetValue(eit));
-      }
-    }
-    {
-      json_const_iterator eit;
-      if (FindMember(o, "extras", eit)) {
-        material->extras_json_string = JsonToString(GetValue(eit));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseAnimationChannel(
-    AnimationChannel *channel, std::string *err, const json &o,
-    bool store_original_json_for_extras_and_extensions) {
-  int samplerIndex = -1;
-  int targetIndex = -1;
-  if (!ParseIntegerProperty(&samplerIndex, err, o, "sampler", true,
-                            "AnimationChannel")) {
-    if (err) {
-      (*err) += "`sampler` field is missing in animation channels\n";
-    }
-    return false;
-  }
-
-  json_const_iterator targetIt;
-  if (FindMember(o, "target", targetIt) && IsObject(GetValue(targetIt))) {
-    const json &target_object = GetValue(targetIt);
-
-    if (!ParseIntegerProperty(&targetIndex, err, target_object, "node", true)) {
-      if (err) {
-        (*err) += "`node` field is missing in animation.channels.target\n";
-      }
-      return false;
-    }
-
-    if (!ParseStringProperty(&channel->target_path, err, target_object, "path",
-                             true)) {
-      if (err) {
-        (*err) += "`path` field is missing in animation.channels.target\n";
-      }
-      return false;
-    }
-    ParseExtensionsProperty(&channel->target_extensions, err, target_object);
-    if (store_original_json_for_extras_and_extensions) {
-      json_const_iterator it;
-      if (FindMember(target_object, "extensions", it)) {
-        channel->target_extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  channel->sampler = samplerIndex;
-  channel->target_node = targetIndex;
-
-  ParseExtensionsProperty(&channel->extensions, err, o);
-  ParseExtrasProperty(&(channel->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        channel->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        channel->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseAnimation(Animation *animation, std::string *err,
-                           const json &o,
-                           bool store_original_json_for_extras_and_extensions) {
-  {
-    json_const_iterator channelsIt;
-    if (FindMember(o, "channels", channelsIt) &&
-        IsArray(GetValue(channelsIt))) {
-      json_const_array_iterator channelEnd = ArrayEnd(GetValue(channelsIt));
-      for (json_const_array_iterator i = ArrayBegin(GetValue(channelsIt));
-           i != channelEnd; ++i) {
-        AnimationChannel channel;
-        if (ParseAnimationChannel(
-                &channel, err, *i,
-                store_original_json_for_extras_and_extensions)) {
-          // Only add the channel if the parsing succeeds.
-          animation->channels.emplace_back(std::move(channel));
-        }
-      }
-    }
-  }
-
-  {
-    json_const_iterator samplerIt;
-    if (FindMember(o, "samplers", samplerIt) && IsArray(GetValue(samplerIt))) {
-      const json &sampler_array = GetValue(samplerIt);
-
-      json_const_array_iterator it = ArrayBegin(sampler_array);
-      json_const_array_iterator itEnd = ArrayEnd(sampler_array);
-
-      for (; it != itEnd; ++it) {
-        const json &s = *it;
-
-        AnimationSampler sampler;
-        int inputIndex = -1;
-        int outputIndex = -1;
-        if (!ParseIntegerProperty(&inputIndex, err, s, "input", true)) {
-          if (err) {
-            (*err) += "`input` field is missing in animation.sampler\n";
-          }
-          return false;
-        }
-        ParseStringProperty(&sampler.interpolation, err, s, "interpolation",
-                            false);
-        if (!ParseIntegerProperty(&outputIndex, err, s, "output", true)) {
-          if (err) {
-            (*err) += "`output` field is missing in animation.sampler\n";
-          }
-          return false;
-        }
-        sampler.input = inputIndex;
-        sampler.output = outputIndex;
-        ParseExtensionsProperty(&(sampler.extensions), err, o);
-        ParseExtrasProperty(&(sampler.extras), s);
-
-        if (store_original_json_for_extras_and_extensions) {
-          {
-            json_const_iterator eit;
-            if (FindMember(o, "extensions", eit)) {
-              sampler.extensions_json_string = JsonToString(GetValue(eit));
-            }
-          }
-          {
-            json_const_iterator eit;
-            if (FindMember(o, "extras", eit)) {
-              sampler.extras_json_string = JsonToString(GetValue(eit));
-            }
-          }
-        }
-
-        animation->samplers.emplace_back(std::move(sampler));
-      }
-    }
-  }
-
-  ParseStringProperty(&animation->name, err, o, "name", false);
-
-  ParseExtensionsProperty(&animation->extensions, err, o);
-  ParseExtrasProperty(&(animation->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        animation->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        animation->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseSampler(Sampler *sampler, std::string *err, const json &o,
-                         bool store_original_json_for_extras_and_extensions) {
-  ParseStringProperty(&sampler->name, err, o, "name", false);
-
-  int minFilter = -1;
-  int magFilter = -1;
-  int wrapS = TINYGLTF_TEXTURE_WRAP_REPEAT;
-  int wrapT = TINYGLTF_TEXTURE_WRAP_REPEAT;
-  // int wrapR = TINYGLTF_TEXTURE_WRAP_REPEAT;
-  ParseIntegerProperty(&minFilter, err, o, "minFilter", false);
-  ParseIntegerProperty(&magFilter, err, o, "magFilter", false);
-  ParseIntegerProperty(&wrapS, err, o, "wrapS", false);
-  ParseIntegerProperty(&wrapT, err, o, "wrapT", false);
-  // ParseIntegerProperty(&wrapR, err, o, "wrapR", false);  // tinygltf
-  // extension
-
-  // TODO(syoyo): Check the value is alloed one.
-  // (e.g. we allow 9728(NEAREST), but don't allow 9727)
-
-  sampler->minFilter = minFilter;
-  sampler->magFilter = magFilter;
-  sampler->wrapS = wrapS;
-  sampler->wrapT = wrapT;
-  // sampler->wrapR = wrapR;
-
-  ParseExtensionsProperty(&(sampler->extensions), err, o);
-  ParseExtrasProperty(&(sampler->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        sampler->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        sampler->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseSkin(Skin *skin, std::string *err, const json &o,
-                      bool store_original_json_for_extras_and_extensions) {
-  ParseStringProperty(&skin->name, err, o, "name", false, "Skin");
-
-  std::vector<int> joints;
-  if (!ParseIntegerArrayProperty(&joints, err, o, "joints", false, "Skin")) {
-    return false;
-  }
-  skin->joints = std::move(joints);
-
-  int skeleton = -1;
-  ParseIntegerProperty(&skeleton, err, o, "skeleton", false, "Skin");
-  skin->skeleton = skeleton;
-
-  int invBind = -1;
-  ParseIntegerProperty(&invBind, err, o, "inverseBindMatrices", true, "Skin");
-  skin->inverseBindMatrices = invBind;
-
-  ParseExtensionsProperty(&(skin->extensions), err, o);
-  ParseExtrasProperty(&(skin->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        skin->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        skin->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParsePerspectiveCamera(
-    PerspectiveCamera *camera, std::string *err, const json &o,
-    bool store_original_json_for_extras_and_extensions) {
-  double yfov = 0.0;
-  if (!ParseNumberProperty(&yfov, err, o, "yfov", true, "OrthographicCamera")) {
-    return false;
-  }
-
-  double znear = 0.0;
-  if (!ParseNumberProperty(&znear, err, o, "znear", true,
-                           "PerspectiveCamera")) {
-    return false;
-  }
-
-  double aspectRatio = 0.0;  // = invalid
-  ParseNumberProperty(&aspectRatio, err, o, "aspectRatio", false,
-                      "PerspectiveCamera");
-
-  double zfar = 0.0;  // = invalid
-  ParseNumberProperty(&zfar, err, o, "zfar", false, "PerspectiveCamera");
-
-  camera->aspectRatio = aspectRatio;
-  camera->zfar = zfar;
-  camera->yfov = yfov;
-  camera->znear = znear;
-
-  ParseExtensionsProperty(&camera->extensions, err, o);
-  ParseExtrasProperty(&(camera->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        camera->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        camera->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  // TODO(syoyo): Validate parameter values.
-
-  return true;
-}
-
-static bool ParseSpotLight(SpotLight *light, std::string *err, const json &o,
-                           bool store_original_json_for_extras_and_extensions) {
-  ParseNumberProperty(&light->innerConeAngle, err, o, "innerConeAngle", false);
-  ParseNumberProperty(&light->outerConeAngle, err, o, "outerConeAngle", false);
-
-  ParseExtensionsProperty(&light->extensions, err, o);
-  ParseExtrasProperty(&light->extras, o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        light->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        light->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  // TODO(syoyo): Validate parameter values.
-
-  return true;
-}
-
-static bool ParseOrthographicCamera(
-    OrthographicCamera *camera, std::string *err, const json &o,
-    bool store_original_json_for_extras_and_extensions) {
-  double xmag = 0.0;
-  if (!ParseNumberProperty(&xmag, err, o, "xmag", true, "OrthographicCamera")) {
-    return false;
-  }
-
-  double ymag = 0.0;
-  if (!ParseNumberProperty(&ymag, err, o, "ymag", true, "OrthographicCamera")) {
-    return false;
-  }
-
-  double zfar = 0.0;
-  if (!ParseNumberProperty(&zfar, err, o, "zfar", true, "OrthographicCamera")) {
-    return false;
-  }
-
-  double znear = 0.0;
-  if (!ParseNumberProperty(&znear, err, o, "znear", true,
-                           "OrthographicCamera")) {
-    return false;
-  }
-
-  ParseExtensionsProperty(&camera->extensions, err, o);
-  ParseExtrasProperty(&(camera->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        camera->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        camera->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  camera->xmag = xmag;
-  camera->ymag = ymag;
-  camera->zfar = zfar;
-  camera->znear = znear;
-
-  // TODO(syoyo): Validate parameter values.
-
-  return true;
-}
-
-static bool ParseCamera(Camera *camera, std::string *err, const json &o,
-                        bool store_original_json_for_extras_and_extensions) {
-  if (!ParseStringProperty(&camera->type, err, o, "type", true, "Camera")) {
-    return false;
-  }
-
-  if (camera->type.compare("orthographic") == 0) {
-    json_const_iterator orthoIt;
-    if (!FindMember(o, "orthographic", orthoIt)) {
-      if (err) {
-        std::stringstream ss;
-        ss << "Orhographic camera description not found." << std::endl;
-        (*err) += ss.str();
-      }
-      return false;
-    }
-
-    const json &v = GetValue(orthoIt);
-    if (!IsObject(v)) {
-      if (err) {
-        std::stringstream ss;
-        ss << "\"orthographic\" is not a JSON object." << std::endl;
-        (*err) += ss.str();
-      }
-      return false;
-    }
-
-    if (!ParseOrthographicCamera(
-            &camera->orthographic, err, v,
-            store_original_json_for_extras_and_extensions)) {
-      return false;
-    }
-  } else if (camera->type.compare("perspective") == 0) {
-    json_const_iterator perspIt;
-    if (!FindMember(o, "perspective", perspIt)) {
-      if (err) {
-        std::stringstream ss;
-        ss << "Perspective camera description not found." << std::endl;
-        (*err) += ss.str();
-      }
-      return false;
-    }
-
-    const json &v = GetValue(perspIt);
-    if (!IsObject(v)) {
-      if (err) {
-        std::stringstream ss;
-        ss << "\"perspective\" is not a JSON object." << std::endl;
-        (*err) += ss.str();
-      }
-      return false;
-    }
-
-    if (!ParsePerspectiveCamera(
-            &camera->perspective, err, v,
-            store_original_json_for_extras_and_extensions)) {
-      return false;
-    }
-  } else {
-    if (err) {
-      std::stringstream ss;
-      ss << "Invalid camera type: \"" << camera->type
-         << "\". Must be \"perspective\" or \"orthographic\"" << std::endl;
-      (*err) += ss.str();
-    }
-    return false;
-  }
-
-  ParseStringProperty(&camera->name, err, o, "name", false);
-
-  ParseExtensionsProperty(&camera->extensions, err, o);
-  ParseExtrasProperty(&(camera->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        camera->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        camera->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool ParseLight(Light *light, std::string *err, const json &o,
-                       bool store_original_json_for_extras_and_extensions) {
-  if (!ParseStringProperty(&light->type, err, o, "type", true)) {
-    return false;
-  }
-
-  if (light->type == "spot") {
-    json_const_iterator spotIt;
-    if (!FindMember(o, "spot", spotIt)) {
-      if (err) {
-        std::stringstream ss;
-        ss << "Spot light description not found." << std::endl;
-        (*err) += ss.str();
-      }
-      return false;
-    }
-
-    const json &v = GetValue(spotIt);
-    if (!IsObject(v)) {
-      if (err) {
-        std::stringstream ss;
-        ss << "\"spot\" is not a JSON object." << std::endl;
-        (*err) += ss.str();
-      }
-      return false;
-    }
-
-    if (!ParseSpotLight(&light->spot, err, v,
-                        store_original_json_for_extras_and_extensions)) {
-      return false;
-    }
-  }
-
-  ParseStringProperty(&light->name, err, o, "name", false);
-  ParseNumberArrayProperty(&light->color, err, o, "color", false);
-  ParseNumberProperty(&light->range, err, o, "range", false);
-  ParseNumberProperty(&light->intensity, err, o, "intensity", false);
-  ParseExtensionsProperty(&light->extensions, err, o);
-  ParseExtrasProperty(&(light->extras), o);
-
-  if (store_original_json_for_extras_and_extensions) {
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        light->extensions_json_string = JsonToString(GetValue(it));
-      }
-    }
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extras", it)) {
-        light->extras_json_string = JsonToString(GetValue(it));
-      }
-    }
-  }
-
-  return true;
-}
-
-bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
-                              const char *json_str,
-                              unsigned int json_str_length,
-                              const std::string &base_dir,
-                              unsigned int check_sections) {
-  if (json_str_length < 4) {
-    if (err) {
-      (*err) = "JSON string too short.\n";
-    }
-    return false;
-  }
-
-  JsonDocument v;
-
-#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || \
-     defined(_CPPUNWIND)) &&                               \
-    !defined(TINYGLTF_NOEXCEPTION)
-  try {
-    JsonParse(v, json_str, json_str_length, true);
-
-  } catch (const std::exception &e) {
-    if (err) {
-      (*err) = e.what();
-    }
-    return false;
-  }
-#else
-  {
-    JsonParse(v, json_str, json_str_length);
-
-    if (!IsObject(v)) {
-      // Assume parsing was failed.
-      if (err) {
-        (*err) = "Failed to parse JSON object\n";
-      }
-      return false;
-    }
-  }
-#endif
-
-  if (!IsObject(v)) {
-    // root is not an object.
-    if (err) {
-      (*err) = "Root element is not a JSON object\n";
-    }
-    return false;
-  }
-
-  {
-    bool version_found = false;
-    json_const_iterator it;
-    if (FindMember(v, "asset", it) && IsObject(GetValue(it))) {
-      auto &itObj = GetValue(it);
-      json_const_iterator version_it;
-      std::string versionStr;
-      if (FindMember(itObj, "version", version_it) &&
-          GetString(GetValue(version_it), versionStr)) {
-        version_found = true;
-      }
-    }
-    if (version_found) {
-      // OK
-    } else if (check_sections & REQUIRE_VERSION) {
-      if (err) {
-        (*err) += "\"asset\" object not found in .gltf or not an object type\n";
-      }
-      return false;
-    }
-  }
-
-  // scene is not mandatory.
-  // FIXME Maybe a better way to handle it than removing the code
-
-  auto IsArrayMemberPresent = [](const json &_v, const char *name) -> bool {
-    json_const_iterator it;
-    return FindMember(_v, name, it) && IsArray(GetValue(it));
-  };
-
-  {
-    if ((check_sections & REQUIRE_SCENES) &&
-        !IsArrayMemberPresent(v, "scenes")) {
-      if (err) {
-        (*err) += "\"scenes\" object not found in .gltf or not an array type\n";
-      }
-      return false;
-    }
-  }
-
-  {
-    if ((check_sections & REQUIRE_NODES) && !IsArrayMemberPresent(v, "nodes")) {
-      if (err) {
-        (*err) += "\"nodes\" object not found in .gltf\n";
-      }
-      return false;
-    }
-  }
-
-  {
-    if ((check_sections & REQUIRE_ACCESSORS) &&
-        !IsArrayMemberPresent(v, "accessors")) {
-      if (err) {
-        (*err) += "\"accessors\" object not found in .gltf\n";
-      }
-      return false;
-    }
-  }
-
-  {
-    if ((check_sections & REQUIRE_BUFFERS) &&
-        !IsArrayMemberPresent(v, "buffers")) {
-      if (err) {
-        (*err) += "\"buffers\" object not found in .gltf\n";
-      }
-      return false;
-    }
-  }
-
-  {
-    if ((check_sections & REQUIRE_BUFFER_VIEWS) &&
-        !IsArrayMemberPresent(v, "bufferViews")) {
-      if (err) {
-        (*err) += "\"bufferViews\" object not found in .gltf\n";
-      }
-      return false;
-    }
-  }
-
-  model->buffers.clear();
-  model->bufferViews.clear();
-  model->accessors.clear();
-  model->meshes.clear();
-  model->cameras.clear();
-  model->nodes.clear();
-  model->extensionsUsed.clear();
-  model->extensionsRequired.clear();
-  model->extensions.clear();
-  model->defaultScene = -1;
-
-  // 1. Parse Asset
-  {
-    json_const_iterator it;
-    if (FindMember(v, "asset", it) && IsObject(GetValue(it))) {
-      const json &root = GetValue(it);
-
-      ParseAsset(&model->asset, err, root,
-                 store_original_json_for_extras_and_extensions_);
-    }
-  }
-
-#ifdef TINYGLTF_USE_CPP14
-  auto ForEachInArray = [](const json &_v, const char *member,
-                           const auto &cb) -> bool
-#else
-  // The std::function<> implementation can be less efficient because it will
-  // allocate heap when the size of the captured lambda is above 16 bytes with
-  // clang and gcc, but it does not require C++14.
-  auto ForEachInArray = [](const json &_v, const char *member,
-                           const std::function<bool(const json &)> &cb) -> bool
-#endif
-  {
-    json_const_iterator itm;
-    if (FindMember(_v, member, itm) && IsArray(GetValue(itm))) {
-      const json &root = GetValue(itm);
-      auto it = ArrayBegin(root);
-      auto end = ArrayEnd(root);
-      for (; it != end; ++it) {
-        if (!cb(*it)) return false;
-      }
-    }
-    return true;
-  };
-
-  // 2. Parse extensionUsed
-  {
-    ForEachInArray(v, "extensionsUsed", [&](const json &o) {
-      std::string str;
-      GetString(o, str);
-      model->extensionsUsed.emplace_back(std::move(str));
-      return true;
-    });
-  }
-
-  {
-    ForEachInArray(v, "extensionsRequired", [&](const json &o) {
-      std::string str;
-      GetString(o, str);
-      model->extensionsRequired.emplace_back(std::move(str));
-      return true;
-    });
-  }
-
-  // 3. Parse Buffer
-  {
-    bool success = ForEachInArray(v, "buffers", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`buffers' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Buffer buffer;
-      if (!ParseBuffer(&buffer, err, o,
-                       store_original_json_for_extras_and_extensions_, &fs,
-                       base_dir, is_binary_, bin_data_, bin_size_)) {
-        return false;
-      }
-
-      model->buffers.emplace_back(std::move(buffer));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-  // 4. Parse BufferView
-  {
-    bool success = ForEachInArray(v, "bufferViews", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`bufferViews' does not contain an JSON object.";
-        }
-        return false;
-      }
-      BufferView bufferView;
-      if (!ParseBufferView(&bufferView, err, o,
-                           store_original_json_for_extras_and_extensions_)) {
-        return false;
-      }
-
-      model->bufferViews.emplace_back(std::move(bufferView));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 5. Parse Accessor
-  {
-    bool success = ForEachInArray(v, "accessors", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`accessors' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Accessor accessor;
-      if (!ParseAccessor(&accessor, err, o,
-                         store_original_json_for_extras_and_extensions_)) {
-        return false;
-      }
-
-      model->accessors.emplace_back(std::move(accessor));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 6. Parse Mesh
-  {
-    bool success = ForEachInArray(v, "meshes", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`meshes' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Mesh mesh;
-      if (!ParseMesh(&mesh, model, err, o,
-                     store_original_json_for_extras_and_extensions_)) {
-        return false;
-      }
-
-      model->meshes.emplace_back(std::move(mesh));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // Assign missing bufferView target types
-  // - Look for missing Mesh indices
-  // - Look for missing Mesh attributes
-  for (auto &mesh : model->meshes) {
-    for (auto &primitive : mesh.primitives) {
-      if (primitive.indices >
-          -1)  // has indices from parsing step, must be Element Array Buffer
-      {
-        if (size_t(primitive.indices) >= model->accessors.size()) {
-          if (err) {
-            (*err) += "primitive indices accessor out of bounds";
-          }
-          return false;
-        }
-
-        auto bufferView =
-            model->accessors[size_t(primitive.indices)].bufferView;
-        if (bufferView < 0 || size_t(bufferView) >= model->bufferViews.size()) {
-          if (err) {
-            (*err) += "accessor[" + std::to_string(primitive.indices) +
-                      "] invalid bufferView";
-          }
-          return false;
-        }
-
-        model->bufferViews[size_t(bufferView)].target =
-            TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER;
-        // we could optionally check if acessors' bufferView type is Scalar, as
-        // it should be
-      }
-
-      for (auto &attribute : primitive.attributes) {
-        const auto accessorsIndex = size_t(attribute.second);
-        if (accessorsIndex < model->accessors.size()) {
-          const auto bufferView = model->accessors[accessorsIndex].bufferView;
-          // bufferView could be null(-1) for sparse morph target
-          if (bufferView >= 0 && bufferView < model->bufferViews.size()) {
-            model->bufferViews[size_t(bufferView)].target =
-                TINYGLTF_TARGET_ARRAY_BUFFER;
-          }
-        }
-      }
-
-      for (auto &target : primitive.targets) {
-        for (auto &attribute : target) {
-          const auto accessorsIndex = size_t(attribute.second);
-          if (accessorsIndex < model->accessors.size()) {
-            const auto bufferView = model->accessors[accessorsIndex].bufferView;
-            // bufferView could be null(-1) for sparse morph target
-            if (bufferView >= 0 && bufferView < model->bufferViews.size()) {
-              model->bufferViews[size_t(bufferView)].target =
-                  TINYGLTF_TARGET_ARRAY_BUFFER;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // 7. Parse Node
-  {
-    bool success = ForEachInArray(v, "nodes", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`nodes' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Node node;
-      if (!ParseNode(&node, err, o,
-                     store_original_json_for_extras_and_extensions_)) {
-        return false;
-      }
-
-      model->nodes.emplace_back(std::move(node));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 8. Parse scenes.
-  {
-    bool success = ForEachInArray(v, "scenes", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`scenes' does not contain an JSON object.";
-        }
-        return false;
-      }
-      std::vector<int> nodes;
-      ParseIntegerArrayProperty(&nodes, err, o, "nodes", false);
-
-      Scene scene;
-      scene.nodes = std::move(nodes);
-
-      ParseStringProperty(&scene.name, err, o, "name", false);
-
-      ParseExtensionsProperty(&scene.extensions, err, o);
-      ParseExtrasProperty(&scene.extras, o);
-
-      if (store_original_json_for_extras_and_extensions_) {
-        {
-          json_const_iterator it;
-          if (FindMember(o, "extensions", it)) {
-            scene.extensions_json_string = JsonToString(GetValue(it));
-          }
-        }
-        {
-          json_const_iterator it;
-          if (FindMember(o, "extras", it)) {
-            scene.extras_json_string = JsonToString(GetValue(it));
-          }
-        }
-      }
-
-      model->scenes.emplace_back(std::move(scene));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 9. Parse default scenes.
-  {
-    json_const_iterator rootIt;
-    int iVal;
-    if (FindMember(v, "scene", rootIt) && GetInt(GetValue(rootIt), iVal)) {
-      model->defaultScene = iVal;
-    }
-  }
-
-  // 10. Parse Material
-  {
-    bool success = ForEachInArray(v, "materials", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`materials' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Material material;
-      ParseStringProperty(&material.name, err, o, "name", false);
-
-      if (!ParseMaterial(&material, err, o,
-                         store_original_json_for_extras_and_extensions_)) {
-        return false;
-      }
-
-      model->materials.emplace_back(std::move(material));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 11. Parse Image
-  void *load_image_user_data{nullptr};
-
-  LoadImageDataOption load_image_option;
-
-  if (user_image_loader_) {
-    // Use user supplied pointer
-    load_image_user_data = load_image_user_data_;
-  } else {
-    load_image_option.preserve_channels = preserve_image_channels_;
-    load_image_user_data = reinterpret_cast<void *>(&load_image_option);
-  }
-
-  {
-    int idx = 0;
-    bool success = ForEachInArray(v, "images", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "image[" + std::to_string(idx) + "] is not a JSON object.";
-        }
-        return false;
-      }
-      Image image;
-      if (!ParseImage(&image, idx, err, warn, o,
-                      store_original_json_for_extras_and_extensions_, base_dir,
-                      &fs, &this->LoadImageData, load_image_user_data)) {
-        return false;
-      }
-
-      if (image.bufferView != -1) {
-        // Load image from the buffer view.
-        if (size_t(image.bufferView) >= model->bufferViews.size()) {
-          if (err) {
-            std::stringstream ss;
-            ss << "image[" << idx << "] bufferView \"" << image.bufferView
-               << "\" not found in the scene." << std::endl;
-            (*err) += ss.str();
-          }
-          return false;
-        }
-
-        const BufferView &bufferView =
-            model->bufferViews[size_t(image.bufferView)];
-        if (size_t(bufferView.buffer) >= model->buffers.size()) {
-          if (err) {
-            std::stringstream ss;
-            ss << "image[" << idx << "] buffer \"" << bufferView.buffer
-               << "\" not found in the scene." << std::endl;
-            (*err) += ss.str();
-          }
-          return false;
-        }
-        const Buffer &buffer = model->buffers[size_t(bufferView.buffer)];
-
-        if (*LoadImageData == nullptr) {
-          if (err) {
-            (*err) += "No LoadImageData callback specified.\n";
-          }
-          return false;
-        }
-        bool ret = LoadImageData(
-            &image, idx, err, warn, image.width, image.height,
-            &buffer.data[bufferView.byteOffset],
-            static_cast<int>(bufferView.byteLength), load_image_user_data);
-        if (!ret) {
-          return false;
-        }
-      }
-
-      model->images.emplace_back(std::move(image));
-      ++idx;
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 12. Parse Texture
-  {
-    bool success = ForEachInArray(v, "textures", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`textures' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Texture texture;
-      if (!ParseTexture(&texture, err, o,
-                        store_original_json_for_extras_and_extensions_,
-                        base_dir)) {
-        return false;
-      }
-
-      model->textures.emplace_back(std::move(texture));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 13. Parse Animation
-  {
-    bool success = ForEachInArray(v, "animations", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`animations' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Animation animation;
-      if (!ParseAnimation(&animation, err, o,
-                          store_original_json_for_extras_and_extensions_)) {
-        return false;
-      }
-
-      model->animations.emplace_back(std::move(animation));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 14. Parse Skin
-  {
-    bool success = ForEachInArray(v, "skins", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`skins' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Skin skin;
-      if (!ParseSkin(&skin, err, o,
-                     store_original_json_for_extras_and_extensions_)) {
-        return false;
-      }
-
-      model->skins.emplace_back(std::move(skin));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 15. Parse Sampler
-  {
-    bool success = ForEachInArray(v, "samplers", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`samplers' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Sampler sampler;
-      if (!ParseSampler(&sampler, err, o,
-                        store_original_json_for_extras_and_extensions_)) {
-        return false;
-      }
-
-      model->samplers.emplace_back(std::move(sampler));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 16. Parse Camera
-  {
-    bool success = ForEachInArray(v, "cameras", [&](const json &o) {
-      if (!IsObject(o)) {
-        if (err) {
-          (*err) += "`cameras' does not contain an JSON object.";
-        }
-        return false;
-      }
-      Camera camera;
-      if (!ParseCamera(&camera, err, o,
-                       store_original_json_for_extras_and_extensions_)) {
-        return false;
-      }
-
-      model->cameras.emplace_back(std::move(camera));
-      return true;
-    });
-
-    if (!success) {
-      return false;
-    }
-  }
-
-  // 17. Parse Extensions
-  ParseExtensionsProperty(&model->extensions, err, v);
-
-  // 18. Specific extension implementations
-  {
-    json_const_iterator rootIt;
-    if (FindMember(v, "extensions", rootIt) && IsObject(GetValue(rootIt))) {
-      const json &root = GetValue(rootIt);
-
-      json_const_iterator it(ObjectBegin(root));
-      json_const_iterator itEnd(ObjectEnd(root));
-      for (; it != itEnd; ++it) {
-        // parse KHR_lights_punctual extension
-        std::string key(GetKey(it));
-        if ((key == "KHR_lights_punctual") && IsObject(GetValue(it))) {
-          const json &object = GetValue(it);
-          json_const_iterator itLight;
-          if (FindMember(object, "lights", itLight)) {
-            const json &lights = GetValue(itLight);
-            if (!IsArray(lights)) {
-              continue;
-            }
-
-            auto arrayIt(ArrayBegin(lights));
-            auto arrayItEnd(ArrayEnd(lights));
-            for (; arrayIt != arrayItEnd; ++arrayIt) {
-              Light light;
-              if (!ParseLight(&light, err, *arrayIt,
-                              store_original_json_for_extras_and_extensions_)) {
-                return false;
-              }
-              model->lights.emplace_back(std::move(light));
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // 19. Parse Extras
-  ParseExtrasProperty(&model->extras, v);
-
-  if (store_original_json_for_extras_and_extensions_) {
-    model->extras_json_string = JsonToString(v["extras"]);
-    model->extensions_json_string = JsonToString(v["extensions"]);
-  }
-
-  return true;
-}
-
-bool TinyGLTF::LoadASCIIFromString(Model *model, std::string *err,
-                                   std::string *warn, const char *str,
-                                   unsigned int length,
-                                   const std::string &base_dir,
-                                   unsigned int check_sections) {
-  is_binary_ = false;
-  bin_data_ = nullptr;
-  bin_size_ = 0;
-
-  return LoadFromString(model, err, warn, str, length, base_dir,
-                        check_sections);
-}
-
-bool TinyGLTF::LoadASCIIFromFile(Model *model, std::string *err,
-                                 std::string *warn, const std::string &filename,
-                                 unsigned int check_sections) {
-  std::stringstream ss;
-
-  if (fs.ReadWholeFile == nullptr) {
-    // Programmer error, assert() ?
-    ss << "Failed to read file: " << filename
-       << ": one or more FS callback not set" << std::endl;
-    if (err) {
-      (*err) = ss.str();
-    }
-    return false;
-  }
-
-  std::vector<unsigned char> data;
-  std::string fileerr;
-  bool fileread = fs.ReadWholeFile(&data, &fileerr, filename, fs.user_data);
-  if (!fileread) {
-    ss << "Failed to read file: " << filename << ": " << fileerr << std::endl;
-    if (err) {
-      (*err) = ss.str();
-    }
-    return false;
-  }
-
-  size_t sz = data.size();
-  if (sz == 0) {
-    if (err) {
-      (*err) = "Empty file.";
-    }
-    return false;
-  }
-
-  std::string basedir = GetBaseDir(filename);
-
-  bool ret = LoadASCIIFromString(
-      model, err, warn, reinterpret_cast<const char *>(&data.at(0)),
-      static_cast<unsigned int>(data.size()), basedir, check_sections);
-
-  return ret;
-}
-
-bool TinyGLTF::LoadBinaryFromMemory(Model *model, std::string *err,
-                                    std::string *warn,
-                                    const unsigned char *bytes,
-                                    unsigned int size,
-                                    const std::string &base_dir,
-                                    unsigned int check_sections) {
-  if (size < 20) {
-    if (err) {
-      (*err) = "Too short data size for glTF Binary.";
-    }
-    return false;
-  }
-
-  if (bytes[0] == 'g' && bytes[1] == 'l' && bytes[2] == 'T' &&
-      bytes[3] == 'F') {
-    // ok
-  } else {
-    if (err) {
-      (*err) = "Invalid magic.";
-    }
-    return false;
-  }
-
-  unsigned int version;       // 4 bytes
-  unsigned int length;        // 4 bytes
-  unsigned int chunk0_length;  // 4 bytes
-  unsigned int chunk0_format;  // 4 bytes;
-
-  memcpy(&version, bytes + 4, 4);
-  swap4(&version);
-  memcpy(&length, bytes + 8, 4);
-  swap4(&length);
-  memcpy(&chunk0_length, bytes + 12, 4); // JSON data length
-  swap4(&chunk0_length);
-  memcpy(&chunk0_format, bytes + 16, 4);
-  swap4(&chunk0_format);
-
-  // https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#binary-gltf-layout
-  //
-  // In case the Bin buffer is not present, the size is exactly 20 + size of
-  // JSON contents,
-  // so use "greater than" operator.
-  //
-  // https://github.com/syoyo/tinygltf/issues/372
-  // Use 64bit uint to avoid integer overflow.
-  uint64_t header_and_json_size = 20ull + uint64_t(chunk0_length);
-
-  if (header_and_json_size > std::numeric_limits<uint32_t>::max()) {
-    // Do not allow 4GB or more GLB data.
-   (*err) = "Invalid glTF binary. GLB data exceeds 4GB.";
-  }
-
-  if ((header_and_json_size > uint64_t(size)) || (chunk0_length < 1) || (length > size) ||
-      (header_and_json_size > uint64_t(length)) ||
-      (chunk0_format != 0x4E4F534A)) {  // 0x4E4F534A = JSON format.
-    if (err) {
-      (*err) = "Invalid glTF binary.";
-    }
-    return false;
-  }
-
-  // Padding check
-  // The start and the end of each chunk must be aligned to a 4-byte boundary.
-  // No padding check for chunk0 start since its 4byte-boundary is ensured.
-  if ((header_and_json_size % 4) != 0) {
-    if (err) {
-      (*err) = "JSON Chunk end does not aligned to a 4-byte boundary.";
-    }
-  }
-
-  //std::cout << "header_and_json_size = " << header_and_json_size << "\n";
-  //std::cout << "length = " << length << "\n";
-
-  // Chunk1(BIN) data
-  // The spec says: When the binary buffer is empty or when it is stored by other means, this chunk SHOULD be omitted.
-  // So when header + JSON data == binary size, Chunk1 is omitted.
-  if (header_and_json_size == uint64_t(length)) {
-
-    bin_data_ = nullptr;
-    bin_size_ = 0;
-  } else {
-    // Read Chunk1 info(BIN data)
-    // At least Chunk1 should have 12 bytes(8 bytes(header) + 4 bytes(bin payload could be 1~3 bytes, but need to be aliged to 4 bytes)
-    if ((header_and_json_size + 12ull) > uint64_t(length)) {
-      if (err) {
-        (*err) = "Insufficient storage space for Chunk1(BIN data). At least Chunk1 Must have 4 bytes or more bytes, but got " + std::to_string((header_and_json_size + 12ull) - uint64_t(length)) + ".\n";
-      }
-      return false;
-    }
-
-    unsigned int chunk1_length;  // 4 bytes
-    unsigned int chunk1_format;  // 4 bytes;
-    memcpy(&chunk1_length, bytes + header_and_json_size, 4); // JSON data length
-    swap4(&chunk1_length);
-    memcpy(&chunk1_format, bytes + header_and_json_size + 4, 4);
-    swap4(&chunk1_format);
-
-    //std::cout << "chunk1_length = " << chunk1_length << "\n";
-
-    if (chunk1_length < 4) {
-      if (err) {
-        (*err) = "Insufficient Chunk1(BIN) data size.";
-      }
-      return false;
-    }
-
-    if ((chunk1_length % 4) != 0) {
-      if (err) {
-        (*err) = "BIN Chunk end does not aligned to a 4-byte boundary.";
-      }
-      return false;
-    }
-
-    if (uint64_t(chunk1_length) + header_and_json_size > uint64_t(length)) {
-      if (err) {
-        (*err) = "BIN Chunk data length exceeds the GLB size.";
-      }
-      return false;
-    }
-
-    if (chunk1_format != 0x004e4942) {
-      if (err) {
-        (*err) = "Invlid type for chunk1 data.";
-      }
-      return false;
-    }
-
-    //std::cout << "chunk1_length = " << chunk1_length << "\n";
-
-    bin_data_ = bytes + header_and_json_size +
-                8;  // 4 bytes (bin_buffer_length) + 4 bytes(bin_buffer_format)
-
-    bin_size_ = size_t(chunk1_length);
-  }
-
-  // Extract JSON string.
-  std::string jsonString(reinterpret_cast<const char *>(&bytes[20]),
-                         chunk0_length);
-
-  is_binary_ = true;
-
-  bool ret = LoadFromString(model, err, warn,
-                            reinterpret_cast<const char *>(&bytes[20]),
-                            chunk0_length, base_dir, check_sections);
-  if (!ret) {
-    return ret;
-  }
-
-  return true;
-}
-
-bool TinyGLTF::LoadBinaryFromFile(Model *model, std::string *err,
-                                  std::string *warn,
-                                  const std::string &filename,
-                                  unsigned int check_sections) {
-  std::stringstream ss;
-
-  if (fs.ReadWholeFile == nullptr) {
-    // Programmer error, assert() ?
-    ss << "Failed to read file: " << filename
-       << ": one or more FS callback not set" << std::endl;
-    if (err) {
-      (*err) = ss.str();
-    }
-    return false;
-  }
-
-  std::vector<unsigned char> data;
-  std::string fileerr;
-  bool fileread = fs.ReadWholeFile(&data, &fileerr, filename, fs.user_data);
-  if (!fileread) {
-    ss << "Failed to read file: " << filename << ": " << fileerr << std::endl;
-    if (err) {
-      (*err) = ss.str();
-    }
-    return false;
-  }
-
-  std::string basedir = GetBaseDir(filename);
-
-  bool ret = LoadBinaryFromMemory(model, err, warn, &data.at(0),
-                                  static_cast<unsigned int>(data.size()),
-                                  basedir, check_sections);
-
-  return ret;
-}
-
-///////////////////////
-// GLTF Serialization
-///////////////////////
-namespace {
-json JsonFromString(const char *s) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return json(s, GetAllocator());
-#else
-  return json(s);
-#endif
-}
-
-void JsonAssign(json &dest, const json &src) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  dest.CopyFrom(src, GetAllocator());
-#else
-  dest = src;
-#endif
-}
-
-void JsonAddMember(json &o, const char *key, json &&value) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  if (!o.IsObject()) {
-    o.SetObject();
-  }
-  o.AddMember(json(key, GetAllocator()), std::move(value), GetAllocator());
-#else
-  o[key] = std::move(value);
-#endif
-}
-
-void JsonPushBack(json &o, json &&value) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  o.PushBack(std::move(value), GetAllocator());
-#else
-  o.push_back(std::move(value));
-#endif
-}
-
-bool JsonIsNull(const json &o) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  return o.IsNull();
-#else
-  return o.is_null();
-#endif
-}
-
-void JsonSetObject(json &o) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  o.SetObject();
-#else
-  o = o.object({});
-#endif
-}
-
-void JsonReserveArray(json &o, size_t s) {
-#ifdef TINYGLTF_USE_RAPIDJSON
-  o.SetArray();
-  o.Reserve(static_cast<rapidjson::SizeType>(s), GetAllocator());
-#endif
-  (void)(o);
-  (void)(s);
-}
-}  // namespace
-
-// typedef std::pair<std::string, json> json_object_pair;
-
-template <typename T>
-static void SerializeNumberProperty(const std::string &key, T number,
-                                    json &obj) {
-  // obj.insert(
-  //    json_object_pair(key, json(static_cast<double>(number))));
-  // obj[key] = static_cast<double>(number);
-  JsonAddMember(obj, key.c_str(), json(number));
-}
-
-#ifdef TINYGLTF_USE_RAPIDJSON
-template <>
-void SerializeNumberProperty(const std::string &key, size_t number, json &obj) {
-  JsonAddMember(obj, key.c_str(), json(static_cast<uint64_t>(number)));
-}
-#endif
-
-template <typename T>
-static void SerializeNumberArrayProperty(const std::string &key,
-                                         const std::vector<T> &value,
-                                         json &obj) {
-  if (value.empty()) return;
-
-  json ary;
-  JsonReserveArray(ary, value.size());
-  for (const auto &s : value) {
-    JsonPushBack(ary, json(s));
-  }
-  JsonAddMember(obj, key.c_str(), std::move(ary));
-}
-
-static void SerializeStringProperty(const std::string &key,
-                                    const std::string &value, json &obj) {
-  JsonAddMember(obj, key.c_str(), JsonFromString(value.c_str()));
-}
-
-static void SerializeStringArrayProperty(const std::string &key,
-                                         const std::vector<std::string> &value,
-                                         json &obj) {
-  json ary;
-  JsonReserveArray(ary, value.size());
-  for (auto &s : value) {
-    JsonPushBack(ary, JsonFromString(s.c_str()));
-  }
-  JsonAddMember(obj, key.c_str(), std::move(ary));
-}
-
-static bool ValueToJson(const Value &value, json *ret) {
-  json obj;
-#ifdef TINYGLTF_USE_RAPIDJSON
-  switch (value.Type()) {
-    case REAL_TYPE:
-      obj.SetDouble(value.Get<double>());
-      break;
-    case INT_TYPE:
-      obj.SetInt(value.Get<int>());
-      break;
-    case BOOL_TYPE:
-      obj.SetBool(value.Get<bool>());
-      break;
-    case STRING_TYPE:
-      obj.SetString(value.Get<std::string>().c_str(), GetAllocator());
-      break;
-    case ARRAY_TYPE: {
-      obj.SetArray();
-      obj.Reserve(static_cast<rapidjson::SizeType>(value.ArrayLen()),
-                  GetAllocator());
-      for (unsigned int i = 0; i < value.ArrayLen(); ++i) {
-        Value elementValue = value.Get(int(i));
-        json elementJson;
-        if (ValueToJson(value.Get(int(i)), &elementJson))
-          obj.PushBack(std::move(elementJson), GetAllocator());
-      }
-      break;
-    }
-    case BINARY_TYPE:
-      // TODO
-      // obj = json(value.Get<std::vector<unsigned char>>());
-      return false;
-      break;
-    case OBJECT_TYPE: {
-      obj.SetObject();
-      Value::Object objMap = value.Get<Value::Object>();
-      for (auto &it : objMap) {
-        json elementJson;
-        if (ValueToJson(it.second, &elementJson)) {
-          obj.AddMember(json(it.first.c_str(), GetAllocator()),
-                        std::move(elementJson), GetAllocator());
-        }
-      }
-      break;
-    }
-    case NULL_TYPE:
-    default:
-      return false;
-  }
-#else
-  switch (value.Type()) {
-    case REAL_TYPE:
-      obj = json(value.Get<double>());
-      break;
-    case INT_TYPE:
-      obj = json(value.Get<int>());
-      break;
-    case BOOL_TYPE:
-      obj = json(value.Get<bool>());
-      break;
-    case STRING_TYPE:
-      obj = json(value.Get<std::string>());
-      break;
-    case ARRAY_TYPE: {
-      for (unsigned int i = 0; i < value.ArrayLen(); ++i) {
-        Value elementValue = value.Get(int(i));
-        json elementJson;
-        if (ValueToJson(value.Get(int(i)), &elementJson))
-          obj.push_back(elementJson);
-      }
-      break;
-    }
-    case BINARY_TYPE:
-      // TODO
-      // obj = json(value.Get<std::vector<unsigned char>>());
-      return false;
-      break;
-    case OBJECT_TYPE: {
-      Value::Object objMap = value.Get<Value::Object>();
-      for (auto &it : objMap) {
-        json elementJson;
-        if (ValueToJson(it.second, &elementJson)) obj[it.first] = elementJson;
-      }
-      break;
-    }
-    case NULL_TYPE:
-    default:
-      return false;
-  }
-#endif
-  if (ret) *ret = std::move(obj);
-  return true;
-}
-
-static void SerializeValue(const std::string &key, const Value &value,
-                           json &obj) {
-  json ret;
-  if (ValueToJson(value, &ret)) {
-    JsonAddMember(obj, key.c_str(), std::move(ret));
-  }
-}
-
-static void SerializeGltfBufferData(const std::vector<unsigned char> &data,
-                                    json &o) {
-  std::string header = "data:application/octet-stream;base64,";
-  if (data.size() > 0) {
-    std::string encodedData =
-        base64_encode(&data[0], static_cast<unsigned int>(data.size()));
-    SerializeStringProperty("uri", header + encodedData, o);
-  } else {
-    // Issue #229
-    // size 0 is allowd. Just emit mime header.
-    SerializeStringProperty("uri", header, o);
-  }
-}
-
-static bool SerializeGltfBufferData(const std::vector<unsigned char> &data,
-                                    const std::string &binFilename) {
-#ifdef _WIN32
-#if defined(__GLIBCXX__)  // mingw
-  int file_descriptor = _wopen(UTF8ToWchar(binFilename).c_str(),
-                               _O_CREAT | _O_WRONLY | _O_TRUNC | _O_BINARY);
-  __gnu_cxx::stdio_filebuf<char> wfile_buf(
-      file_descriptor, std::ios_base::out | std::ios_base::binary);
-  std::ostream output(&wfile_buf);
-  if (!wfile_buf.is_open()) return false;
-#elif defined(_MSC_VER)
-  std::ofstream output(UTF8ToWchar(binFilename).c_str(), std::ofstream::binary);
-  if (!output.is_open()) return false;
-#else
-  std::ofstream output(binFilename.c_str(), std::ofstream::binary);
-  if (!output.is_open()) return false;
-#endif
-#else
-  std::ofstream output(binFilename.c_str(), std::ofstream::binary);
-  if (!output.is_open()) return false;
-#endif
-  if (data.size() > 0) {
-    output.write(reinterpret_cast<const char *>(&data[0]),
-                 std::streamsize(data.size()));
-  } else {
-    // Issue #229
-    // size 0 will be still valid buffer data.
-    // write empty file.
-  }
-  return true;
-}
-
-#if 0  // FIXME(syoyo): not used. will be removed in the future release.
-static void SerializeParameterMap(ParameterMap &param, json &o) {
-  for (ParameterMap::iterator paramIt = param.begin(); paramIt != param.end();
-       ++paramIt) {
-    if (paramIt->second.number_array.size()) {
-      SerializeNumberArrayProperty<double>(paramIt->first,
-                                           paramIt->second.number_array, o);
-    } else if (paramIt->second.json_double_value.size()) {
-      json json_double_value;
-      for (std::map<std::string, double>::iterator it =
-               paramIt->second.json_double_value.begin();
-           it != paramIt->second.json_double_value.end(); ++it) {
-        if (it->first == "index") {
-          json_double_value[it->first] = paramIt->second.TextureIndex();
-        } else {
-          json_double_value[it->first] = it->second;
-        }
-      }
-
-      o[paramIt->first] = json_double_value;
-    } else if (!paramIt->second.string_value.empty()) {
-      SerializeStringProperty(paramIt->first, paramIt->second.string_value, o);
-    } else if (paramIt->second.has_number_value) {
-      o[paramIt->first] = paramIt->second.number_value;
-    } else {
-      o[paramIt->first] = paramIt->second.bool_value;
-    }
-  }
-}
-#endif
-
-static void SerializeExtensionMap(const ExtensionMap &extensions, json &o) {
-  if (!extensions.size()) return;
-
-  json extMap;
-  for (ExtensionMap::const_iterator extIt = extensions.begin();
-       extIt != extensions.end(); ++extIt) {
-    // Allow an empty object for extension(#97)
-    json ret;
-    bool isNull = true;
-    if (ValueToJson(extIt->second, &ret)) {
-      isNull = JsonIsNull(ret);
-      JsonAddMember(extMap, extIt->first.c_str(), std::move(ret));
-    }
-    if (isNull) {
-      if (!(extIt->first.empty())) {  // name should not be empty, but for sure
-        // create empty object so that an extension name is still included in
-        // json.
-        json empty;
-        JsonSetObject(empty);
-        JsonAddMember(extMap, extIt->first.c_str(), std::move(empty));
-      }
-    }
-  }
-  JsonAddMember(o, "extensions", std::move(extMap));
-}
-
-static void SerializeGltfAccessor(Accessor &accessor, json &o) {
-  if (accessor.bufferView >= 0)
-    SerializeNumberProperty<int>("bufferView", accessor.bufferView, o);
-
-  if (accessor.byteOffset != 0)
-    SerializeNumberProperty<int>("byteOffset", int(accessor.byteOffset), o);
-
-  SerializeNumberProperty<int>("componentType", accessor.componentType, o);
-  SerializeNumberProperty<size_t>("count", accessor.count, o);
-
-  if ((accessor.componentType == TINYGLTF_COMPONENT_TYPE_FLOAT) ||
-      (accessor.componentType == TINYGLTF_COMPONENT_TYPE_DOUBLE)) {
-    SerializeNumberArrayProperty<double>("min", accessor.minValues, o);
-    SerializeNumberArrayProperty<double>("max", accessor.maxValues, o);
-  } else {
-    // Issue #301. Serialize as integer.
-    // Assume int value is within [-2**31-1, 2**31-1]
-    {
-      std::vector<int> values;
-      std::transform(accessor.minValues.begin(), accessor.minValues.end(),
-                     std::back_inserter(values),
-                     [](double v) { return static_cast<int>(v); });
-
-      SerializeNumberArrayProperty<int>("min", values, o);
-    }
-
-    {
-      std::vector<int> values;
-      std::transform(accessor.maxValues.begin(), accessor.maxValues.end(),
-                     std::back_inserter(values),
-                     [](double v) { return static_cast<int>(v); });
-
-      SerializeNumberArrayProperty<int>("max", values, o);
-    }
-  }
-
-  if (accessor.normalized)
-    SerializeValue("normalized", Value(accessor.normalized), o);
-  std::string type;
-  switch (accessor.type) {
-    case TINYGLTF_TYPE_SCALAR:
-      type = "SCALAR";
-      break;
-    case TINYGLTF_TYPE_VEC2:
-      type = "VEC2";
-      break;
-    case TINYGLTF_TYPE_VEC3:
-      type = "VEC3";
-      break;
-    case TINYGLTF_TYPE_VEC4:
-      type = "VEC4";
-      break;
-    case TINYGLTF_TYPE_MAT2:
-      type = "MAT2";
-      break;
-    case TINYGLTF_TYPE_MAT3:
-      type = "MAT3";
-      break;
-    case TINYGLTF_TYPE_MAT4:
-      type = "MAT4";
-      break;
-  }
-
-  SerializeStringProperty("type", type, o);
-  if (!accessor.name.empty()) SerializeStringProperty("name", accessor.name, o);
-
-  if (accessor.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", accessor.extras, o);
-  }
-
-  // sparse
-  if (accessor.sparse.isSparse)
-  {
-      json sparse;
-      SerializeNumberProperty<int>("count", accessor.sparse.count, sparse);
-      {
-          json indices;
-          SerializeNumberProperty<int>("bufferView", accessor.sparse.indices.bufferView, indices);
-          SerializeNumberProperty<int>("byteOffset", accessor.sparse.indices.byteOffset, indices);
-          SerializeNumberProperty<int>("componentType", accessor.sparse.indices.componentType, indices);
-          JsonAddMember(sparse, "indices", std::move(indices));
-      }
-      {
-          json values;
-          SerializeNumberProperty<int>("bufferView", accessor.sparse.values.bufferView, values);
-          SerializeNumberProperty<int>("byteOffset", accessor.sparse.values.byteOffset, values);
-          JsonAddMember(sparse, "values", std::move(values));
-      }
-      JsonAddMember(o, "sparse", std::move(sparse));
-  }
-}
-
-static void SerializeGltfAnimationChannel(AnimationChannel &channel, json &o) {
-  SerializeNumberProperty("sampler", channel.sampler, o);
-  {
-    json target;
-    SerializeNumberProperty("node", channel.target_node, target);
-    SerializeStringProperty("path", channel.target_path, target);
-
-    SerializeExtensionMap(channel.target_extensions, target);
-
-    JsonAddMember(o, "target", std::move(target));
-  }
-
-  if (channel.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", channel.extras, o);
-  }
-
-  SerializeExtensionMap(channel.extensions, o);
-}
-
-static void SerializeGltfAnimationSampler(AnimationSampler &sampler, json &o) {
-  SerializeNumberProperty("input", sampler.input, o);
-  SerializeNumberProperty("output", sampler.output, o);
-  SerializeStringProperty("interpolation", sampler.interpolation, o);
-
-  if (sampler.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", sampler.extras, o);
-  }
-}
-
-static void SerializeGltfAnimation(Animation &animation, json &o) {
-  if (!animation.name.empty())
-    SerializeStringProperty("name", animation.name, o);
-
-  {
-    json channels;
-    JsonReserveArray(channels, animation.channels.size());
-    for (unsigned int i = 0; i < animation.channels.size(); ++i) {
-      json channel;
-      AnimationChannel gltfChannel = animation.channels[i];
-      SerializeGltfAnimationChannel(gltfChannel, channel);
-      JsonPushBack(channels, std::move(channel));
-    }
-
-    JsonAddMember(o, "channels", std::move(channels));
-  }
-
-  {
-    json samplers;
-    JsonReserveArray(samplers, animation.samplers.size());
-    for (unsigned int i = 0; i < animation.samplers.size(); ++i) {
-      json sampler;
-      AnimationSampler gltfSampler = animation.samplers[i];
-      SerializeGltfAnimationSampler(gltfSampler, sampler);
-      JsonPushBack(samplers, std::move(sampler));
-    }
-    JsonAddMember(o, "samplers", std::move(samplers));
-  }
-
-  if (animation.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", animation.extras, o);
-  }
-
-  SerializeExtensionMap(animation.extensions, o);
-}
-
-static void SerializeGltfAsset(Asset &asset, json &o) {
-  if (!asset.generator.empty()) {
-    SerializeStringProperty("generator", asset.generator, o);
-  }
-
-  if (!asset.copyright.empty()) {
-    SerializeStringProperty("copyright", asset.copyright, o);
-  }
-
-  if (asset.version.empty()) {
-    // Just in case
-    // `version` must be defined
-    asset.version = "2.0";
-  }
-
-  // TODO(syoyo): Do we need to check if `version` is greater or equal to 2.0?
-  SerializeStringProperty("version", asset.version, o);
-
-  if (asset.extras.Keys().size()) {
-    SerializeValue("extras", asset.extras, o);
-  }
-
-  SerializeExtensionMap(asset.extensions, o);
-}
-
-static void SerializeGltfBufferBin(Buffer &buffer, json &o,
-                                   std::vector<unsigned char> &binBuffer) {
-  SerializeNumberProperty("byteLength", buffer.data.size(), o);
-  binBuffer = buffer.data;
-
-  if (buffer.name.size()) SerializeStringProperty("name", buffer.name, o);
-
-  if (buffer.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", buffer.extras, o);
-  }
-}
-
-static void SerializeGltfBuffer(Buffer &buffer, json &o) {
-  SerializeNumberProperty("byteLength", buffer.data.size(), o);
-  SerializeGltfBufferData(buffer.data, o);
-
-  if (buffer.name.size()) SerializeStringProperty("name", buffer.name, o);
-
-  if (buffer.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", buffer.extras, o);
-  }
-}
-
-static bool SerializeGltfBuffer(Buffer &buffer, json &o,
-                                const std::string &binFilename,
-                                const std::string &binBaseFilename) {
-  if (!SerializeGltfBufferData(buffer.data, binFilename)) return false;
-  SerializeNumberProperty("byteLength", buffer.data.size(), o);
-  SerializeStringProperty("uri", binBaseFilename, o);
-
-  if (buffer.name.size()) SerializeStringProperty("name", buffer.name, o);
-
-  if (buffer.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", buffer.extras, o);
-  }
-  return true;
-}
-
-static void SerializeGltfBufferView(BufferView &bufferView, json &o) {
-  SerializeNumberProperty("buffer", bufferView.buffer, o);
-  SerializeNumberProperty<size_t>("byteLength", bufferView.byteLength, o);
-
-  // byteStride is optional, minimum allowed is 4
-  if (bufferView.byteStride >= 4) {
-    SerializeNumberProperty<size_t>("byteStride", bufferView.byteStride, o);
-  }
-  // byteOffset is optional, default is 0
-  if (bufferView.byteOffset > 0) {
-    SerializeNumberProperty<size_t>("byteOffset", bufferView.byteOffset, o);
-  }
-  // Target is optional, check if it contains a valid value
-  if (bufferView.target == TINYGLTF_TARGET_ARRAY_BUFFER ||
-      bufferView.target == TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER) {
-    SerializeNumberProperty("target", bufferView.target, o);
-  }
-  if (bufferView.name.size()) {
-    SerializeStringProperty("name", bufferView.name, o);
-  }
-
-  if (bufferView.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", bufferView.extras, o);
-  }
-}
-
-static void SerializeGltfImage(Image &image, json &o) {
-  // if uri empty, the mimeType and bufferview should be set
-  if (image.uri.empty()) {
-    SerializeStringProperty("mimeType", image.mimeType, o);
-    SerializeNumberProperty<int>("bufferView", image.bufferView, o);
-  } else {
-    // TODO(syoyo): dlib::urilencode?
-    SerializeStringProperty("uri", image.uri, o);
-  }
-
-  if (image.name.size()) {
-    SerializeStringProperty("name", image.name, o);
-  }
-
-  if (image.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", image.extras, o);
-  }
-
-  SerializeExtensionMap(image.extensions, o);
-}
-
-static void SerializeGltfTextureInfo(TextureInfo &texinfo, json &o) {
-  SerializeNumberProperty("index", texinfo.index, o);
-
-  if (texinfo.texCoord != 0) {
-    SerializeNumberProperty("texCoord", texinfo.texCoord, o);
-  }
-
-  if (texinfo.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", texinfo.extras, o);
-  }
-
-  SerializeExtensionMap(texinfo.extensions, o);
-}
-
-static void SerializeGltfNormalTextureInfo(NormalTextureInfo &texinfo,
-                                           json &o) {
-  SerializeNumberProperty("index", texinfo.index, o);
-
-  if (texinfo.texCoord != 0) {
-    SerializeNumberProperty("texCoord", texinfo.texCoord, o);
-  }
-
-  if (!TINYGLTF_DOUBLE_EQUAL(texinfo.scale, 1.0)) {
-    SerializeNumberProperty("scale", texinfo.scale, o);
-  }
-
-  if (texinfo.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", texinfo.extras, o);
-  }
-
-  SerializeExtensionMap(texinfo.extensions, o);
-}
-
-static void SerializeGltfOcclusionTextureInfo(OcclusionTextureInfo &texinfo,
-                                              json &o) {
-  SerializeNumberProperty("index", texinfo.index, o);
-
-  if (texinfo.texCoord != 0) {
-    SerializeNumberProperty("texCoord", texinfo.texCoord, o);
-  }
-
-  if (!TINYGLTF_DOUBLE_EQUAL(texinfo.strength, 1.0)) {
-    SerializeNumberProperty("strength", texinfo.strength, o);
-  }
-
-  if (texinfo.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", texinfo.extras, o);
-  }
-
-  SerializeExtensionMap(texinfo.extensions, o);
-}
-
-static void SerializeGltfPbrMetallicRoughness(PbrMetallicRoughness &pbr,
-                                              json &o) {
-  std::vector<double> default_baseColorFactor = {1.0, 1.0, 1.0, 1.0};
-  if (!Equals(pbr.baseColorFactor, default_baseColorFactor)) {
-    SerializeNumberArrayProperty<double>("baseColorFactor", pbr.baseColorFactor,
-                                         o);
-  }
-
-  if (!TINYGLTF_DOUBLE_EQUAL(pbr.metallicFactor, 1.0)) {
-    SerializeNumberProperty("metallicFactor", pbr.metallicFactor, o);
-  }
-
-  if (!TINYGLTF_DOUBLE_EQUAL(pbr.roughnessFactor, 1.0)) {
-    SerializeNumberProperty("roughnessFactor", pbr.roughnessFactor, o);
-  }
-
-  if (pbr.baseColorTexture.index > -1) {
-    json texinfo;
-    SerializeGltfTextureInfo(pbr.baseColorTexture, texinfo);
-    JsonAddMember(o, "baseColorTexture", std::move(texinfo));
-  }
-
-  if (pbr.metallicRoughnessTexture.index > -1) {
-    json texinfo;
-    SerializeGltfTextureInfo(pbr.metallicRoughnessTexture, texinfo);
-    JsonAddMember(o, "metallicRoughnessTexture", std::move(texinfo));
-  }
-
-  SerializeExtensionMap(pbr.extensions, o);
-
-  if (pbr.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", pbr.extras, o);
-  }
-}
-
-static void SerializeGltfMaterial(Material &material, json &o) {
-  if (material.name.size()) {
-    SerializeStringProperty("name", material.name, o);
-  }
-
-  // QUESTION(syoyo): Write material parameters regardless of its default value?
-
-  if (!TINYGLTF_DOUBLE_EQUAL(material.alphaCutoff, 0.5)) {
-    SerializeNumberProperty("alphaCutoff", material.alphaCutoff, o);
-  }
-
-  if (material.alphaMode.compare("OPAQUE") != 0) {
-    SerializeStringProperty("alphaMode", material.alphaMode, o);
-  }
-
-  if (material.doubleSided != false)
-    JsonAddMember(o, "doubleSided", json(material.doubleSided));
-
-  if (material.normalTexture.index > -1) {
-    json texinfo;
-    SerializeGltfNormalTextureInfo(material.normalTexture, texinfo);
-    JsonAddMember(o, "normalTexture", std::move(texinfo));
-  }
-
-  if (material.occlusionTexture.index > -1) {
-    json texinfo;
-    SerializeGltfOcclusionTextureInfo(material.occlusionTexture, texinfo);
-    JsonAddMember(o, "occlusionTexture", std::move(texinfo));
-  }
-
-  if (material.emissiveTexture.index > -1) {
-    json texinfo;
-    SerializeGltfTextureInfo(material.emissiveTexture, texinfo);
-    JsonAddMember(o, "emissiveTexture", std::move(texinfo));
-  }
-
-  std::vector<double> default_emissiveFactor = {0.0, 0.0, 0.0};
-  if (!Equals(material.emissiveFactor, default_emissiveFactor)) {
-    SerializeNumberArrayProperty<double>("emissiveFactor",
-                                         material.emissiveFactor, o);
-  }
-
-  {
-    json pbrMetallicRoughness;
-    SerializeGltfPbrMetallicRoughness(material.pbrMetallicRoughness,
-                                      pbrMetallicRoughness);
-    // Issue 204
-    // Do not serialize `pbrMetallicRoughness` if pbrMetallicRoughness has all
-    // default values(json is null). Otherwise it will serialize to
-    // `pbrMetallicRoughness : null`, which cannot be read by other glTF
-    // importers(and validators).
-    //
-    if (!JsonIsNull(pbrMetallicRoughness)) {
-      JsonAddMember(o, "pbrMetallicRoughness", std::move(pbrMetallicRoughness));
-    }
-  }
-
-#if 0  // legacy way. just for the record.
-  if (material.values.size()) {
-    json pbrMetallicRoughness;
-    SerializeParameterMap(material.values, pbrMetallicRoughness);
-    JsonAddMember(o, "pbrMetallicRoughness", std::move(pbrMetallicRoughness));
-  }
-
-  SerializeParameterMap(material.additionalValues, o);
-#else
-
-#endif
-
-  SerializeExtensionMap(material.extensions, o);
-
-  if (material.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", material.extras, o);
-  }
-}
-
-static void SerializeGltfMesh(Mesh &mesh, json &o) {
-  json primitives;
-  JsonReserveArray(primitives, mesh.primitives.size());
-  for (unsigned int i = 0; i < mesh.primitives.size(); ++i) {
-    json primitive;
-    const Primitive &gltfPrimitive = mesh.primitives[i];  // don't make a copy
-    {
-      json attributes;
-      for (auto attrIt = gltfPrimitive.attributes.begin();
-           attrIt != gltfPrimitive.attributes.end(); ++attrIt) {
-        SerializeNumberProperty<int>(attrIt->first, attrIt->second, attributes);
-      }
-
-      JsonAddMember(primitive, "attributes", std::move(attributes));
-    }
-
-    // Indicies is optional
-    if (gltfPrimitive.indices > -1) {
-      SerializeNumberProperty<int>("indices", gltfPrimitive.indices, primitive);
-    }
-    // Material is optional
-    if (gltfPrimitive.material > -1) {
-      SerializeNumberProperty<int>("material", gltfPrimitive.material,
-                                   primitive);
-    }
-    SerializeNumberProperty<int>("mode", gltfPrimitive.mode, primitive);
-
-    // Morph targets
-    if (gltfPrimitive.targets.size()) {
-      json targets;
-      JsonReserveArray(targets, gltfPrimitive.targets.size());
-      for (unsigned int k = 0; k < gltfPrimitive.targets.size(); ++k) {
-        json targetAttributes;
-        std::map<std::string, int> targetData = gltfPrimitive.targets[k];
-        for (std::map<std::string, int>::iterator attrIt = targetData.begin();
-             attrIt != targetData.end(); ++attrIt) {
-          SerializeNumberProperty<int>(attrIt->first, attrIt->second,
-                                       targetAttributes);
-        }
-        JsonPushBack(targets, std::move(targetAttributes));
-      }
-      JsonAddMember(primitive, "targets", std::move(targets));
-    }
-
-    SerializeExtensionMap(gltfPrimitive.extensions, primitive);
-
-    if (gltfPrimitive.extras.Type() != NULL_TYPE) {
-      SerializeValue("extras", gltfPrimitive.extras, primitive);
-    }
-
-    JsonPushBack(primitives, std::move(primitive));
-  }
-
-  JsonAddMember(o, "primitives", std::move(primitives));
-
-  if (mesh.weights.size()) {
-    SerializeNumberArrayProperty<double>("weights", mesh.weights, o);
-  }
-
-  if (mesh.name.size()) {
-    SerializeStringProperty("name", mesh.name, o);
-  }
-
-  SerializeExtensionMap(mesh.extensions, o);
-  if (mesh.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", mesh.extras, o);
-  }
-}
-
-static void SerializeSpotLight(SpotLight &spot, json &o) {
-  SerializeNumberProperty("innerConeAngle", spot.innerConeAngle, o);
-  SerializeNumberProperty("outerConeAngle", spot.outerConeAngle, o);
-  SerializeExtensionMap(spot.extensions, o);
-  if (spot.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", spot.extras, o);
-  }
-}
-
-static void SerializeGltfLight(Light &light, json &o) {
-  if (!light.name.empty()) SerializeStringProperty("name", light.name, o);
-  SerializeNumberProperty("intensity", light.intensity, o);
-  if (light.range > 0.0) {
-    SerializeNumberProperty("range", light.range, o);
-  }
-  SerializeNumberArrayProperty("color", light.color, o);
-  SerializeStringProperty("type", light.type, o);
-  if (light.type == "spot") {
-    json spot;
-    SerializeSpotLight(light.spot, spot);
-    JsonAddMember(o, "spot", std::move(spot));
-  }
-  SerializeExtensionMap(light.extensions, o);
-  if (light.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", light.extras, o);
-  }
-}
-
-static void SerializeGltfNode(Node &node, json &o) {
-  if (node.translation.size() > 0) {
-    SerializeNumberArrayProperty<double>("translation", node.translation, o);
-  }
-  if (node.rotation.size() > 0) {
-    SerializeNumberArrayProperty<double>("rotation", node.rotation, o);
-  }
-  if (node.scale.size() > 0) {
-    SerializeNumberArrayProperty<double>("scale", node.scale, o);
-  }
-  if (node.matrix.size() > 0) {
-    SerializeNumberArrayProperty<double>("matrix", node.matrix, o);
-  }
-  if (node.mesh != -1) {
-    SerializeNumberProperty<int>("mesh", node.mesh, o);
-  }
-
-  if (node.skin != -1) {
-    SerializeNumberProperty<int>("skin", node.skin, o);
-  }
-
-  if (node.camera != -1) {
-    SerializeNumberProperty<int>("camera", node.camera, o);
-  }
-
-  if (node.weights.size() > 0) {
-    SerializeNumberArrayProperty<double>("weights", node.weights, o);
-  }
-
-  if (node.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", node.extras, o);
-  }
-
-  SerializeExtensionMap(node.extensions, o);
-  if (!node.name.empty()) SerializeStringProperty("name", node.name, o);
-  SerializeNumberArrayProperty<int>("children", node.children, o);
-}
-
-static void SerializeGltfSampler(Sampler &sampler, json &o) {
-  if (sampler.magFilter != -1) {
-    SerializeNumberProperty("magFilter", sampler.magFilter, o);
-  }
-  if (sampler.minFilter != -1) {
-    SerializeNumberProperty("minFilter", sampler.minFilter, o);
-  }
-  // SerializeNumberProperty("wrapR", sampler.wrapR, o);
-  SerializeNumberProperty("wrapS", sampler.wrapS, o);
-  SerializeNumberProperty("wrapT", sampler.wrapT, o);
-
-  if (sampler.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", sampler.extras, o);
-  }
-}
-
-static void SerializeGltfOrthographicCamera(const OrthographicCamera &camera,
-                                            json &o) {
-  SerializeNumberProperty("zfar", camera.zfar, o);
-  SerializeNumberProperty("znear", camera.znear, o);
-  SerializeNumberProperty("xmag", camera.xmag, o);
-  SerializeNumberProperty("ymag", camera.ymag, o);
-
-  if (camera.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", camera.extras, o);
-  }
-}
-
-static void SerializeGltfPerspectiveCamera(const PerspectiveCamera &camera,
-                                           json &o) {
-  SerializeNumberProperty("zfar", camera.zfar, o);
-  SerializeNumberProperty("znear", camera.znear, o);
-  if (camera.aspectRatio > 0) {
-    SerializeNumberProperty("aspectRatio", camera.aspectRatio, o);
-  }
-
-  if (camera.yfov > 0) {
-    SerializeNumberProperty("yfov", camera.yfov, o);
-  }
-
-  if (camera.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", camera.extras, o);
-  }
-}
-
-static void SerializeGltfCamera(const Camera &camera, json &o) {
-  SerializeStringProperty("type", camera.type, o);
-  if (!camera.name.empty()) {
-    SerializeStringProperty("name", camera.name, o);
-  }
-
-  if (camera.type.compare("orthographic") == 0) {
-    json orthographic;
-    SerializeGltfOrthographicCamera(camera.orthographic, orthographic);
-    JsonAddMember(o, "orthographic", std::move(orthographic));
-  } else if (camera.type.compare("perspective") == 0) {
-    json perspective;
-    SerializeGltfPerspectiveCamera(camera.perspective, perspective);
-    JsonAddMember(o, "perspective", std::move(perspective));
-  } else {
-    // ???
-  }
-
-  if (camera.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", camera.extras, o);
-  }
-  SerializeExtensionMap(camera.extensions, o);
-}
-
-static void SerializeGltfScene(Scene &scene, json &o) {
-  SerializeNumberArrayProperty<int>("nodes", scene.nodes, o);
-
-  if (scene.name.size()) {
-    SerializeStringProperty("name", scene.name, o);
-  }
-  if (scene.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", scene.extras, o);
-  }
-  SerializeExtensionMap(scene.extensions, o);
-}
-
-static void SerializeGltfSkin(Skin &skin, json &o) {
-  // required
-  SerializeNumberArrayProperty<int>("joints", skin.joints, o);
-
-  if (skin.inverseBindMatrices >= 0) {
-    SerializeNumberProperty("inverseBindMatrices", skin.inverseBindMatrices, o);
-  }
-
-  if (skin.skeleton >= 0) {
-    SerializeNumberProperty("skeleton", skin.skeleton, o);
-  }
-
-  if (skin.name.size()) {
-    SerializeStringProperty("name", skin.name, o);
-  }
-}
-
-static void SerializeGltfTexture(Texture &texture, json &o) {
-  if (texture.sampler > -1) {
-    SerializeNumberProperty("sampler", texture.sampler, o);
-  }
-  if (texture.source > -1) {
-    SerializeNumberProperty("source", texture.source, o);
-  }
-  if (texture.name.size()) {
-    SerializeStringProperty("name", texture.name, o);
-  }
-  if (texture.extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", texture.extras, o);
-  }
-  SerializeExtensionMap(texture.extensions, o);
-}
-
-///
-/// Serialize all properties except buffers and images.
-///
-static void SerializeGltfModel(Model *model, json &o) {
-  // ACCESSORS
-  if (model->accessors.size()) {
-    json accessors;
-    JsonReserveArray(accessors, model->accessors.size());
-    for (unsigned int i = 0; i < model->accessors.size(); ++i) {
-      json accessor;
-      SerializeGltfAccessor(model->accessors[i], accessor);
-      JsonPushBack(accessors, std::move(accessor));
-    }
-    JsonAddMember(o, "accessors", std::move(accessors));
-  }
-
-  // ANIMATIONS
-  if (model->animations.size()) {
-    json animations;
-    JsonReserveArray(animations, model->animations.size());
-    for (unsigned int i = 0; i < model->animations.size(); ++i) {
-      if (model->animations[i].channels.size()) {
-        json animation;
-        SerializeGltfAnimation(model->animations[i], animation);
-        JsonPushBack(animations, std::move(animation));
-      }
-    }
-
-    JsonAddMember(o, "animations", std::move(animations));
-  }
-
-  // ASSET
-  json asset;
-  SerializeGltfAsset(model->asset, asset);
-  JsonAddMember(o, "asset", std::move(asset));
-
-  // BUFFERVIEWS
-  if (model->bufferViews.size()) {
-    json bufferViews;
-    JsonReserveArray(bufferViews, model->bufferViews.size());
-    for (unsigned int i = 0; i < model->bufferViews.size(); ++i) {
-      json bufferView;
-      SerializeGltfBufferView(model->bufferViews[i], bufferView);
-      JsonPushBack(bufferViews, std::move(bufferView));
-    }
-    JsonAddMember(o, "bufferViews", std::move(bufferViews));
-  }
-
-  // Extensions required
-  if (model->extensionsRequired.size()) {
-    SerializeStringArrayProperty("extensionsRequired",
-                                 model->extensionsRequired, o);
-  }
-
-  // MATERIALS
-  if (model->materials.size()) {
-    json materials;
-    JsonReserveArray(materials, model->materials.size());
-    for (unsigned int i = 0; i < model->materials.size(); ++i) {
-      json material;
-      SerializeGltfMaterial(model->materials[i], material);
-
-      if (JsonIsNull(material)) {
-        // Issue 294.
-        // `material` does not have any required parameters
-        // so the result may be null(unmodified) when all material parameters
-        // have default value.
-        //
-        // null is not allowed thus we create an empty JSON object.
-        JsonSetObject(material);
-      }
-      JsonPushBack(materials, std::move(material));
-    }
-    JsonAddMember(o, "materials", std::move(materials));
-  }
-
-  // MESHES
-  if (model->meshes.size()) {
-    json meshes;
-    JsonReserveArray(meshes, model->meshes.size());
-    for (unsigned int i = 0; i < model->meshes.size(); ++i) {
-      json mesh;
-      SerializeGltfMesh(model->meshes[i], mesh);
-      JsonPushBack(meshes, std::move(mesh));
-    }
-    JsonAddMember(o, "meshes", std::move(meshes));
-  }
-
-  // NODES
-  if (model->nodes.size()) {
-    json nodes;
-    JsonReserveArray(nodes, model->nodes.size());
-    for (unsigned int i = 0; i < model->nodes.size(); ++i) {
-      json node;
-      SerializeGltfNode(model->nodes[i], node);
-      JsonPushBack(nodes, std::move(node));
-    }
-    JsonAddMember(o, "nodes", std::move(nodes));
-  }
-
-  // SCENE
-  if (model->defaultScene > -1) {
-    SerializeNumberProperty<int>("scene", model->defaultScene, o);
-  }
-
-  // SCENES
-  if (model->scenes.size()) {
-    json scenes;
-    JsonReserveArray(scenes, model->scenes.size());
-    for (unsigned int i = 0; i < model->scenes.size(); ++i) {
-      json currentScene;
-      SerializeGltfScene(model->scenes[i], currentScene);
-      JsonPushBack(scenes, std::move(currentScene));
-    }
-    JsonAddMember(o, "scenes", std::move(scenes));
-  }
-
-  // SKINS
-  if (model->skins.size()) {
-    json skins;
-    JsonReserveArray(skins, model->skins.size());
-    for (unsigned int i = 0; i < model->skins.size(); ++i) {
-      json skin;
-      SerializeGltfSkin(model->skins[i], skin);
-      JsonPushBack(skins, std::move(skin));
-    }
-    JsonAddMember(o, "skins", std::move(skins));
-  }
-
-  // TEXTURES
-  if (model->textures.size()) {
-    json textures;
-    JsonReserveArray(textures, model->textures.size());
-    for (unsigned int i = 0; i < model->textures.size(); ++i) {
-      json texture;
-      SerializeGltfTexture(model->textures[i], texture);
-      JsonPushBack(textures, std::move(texture));
-    }
-    JsonAddMember(o, "textures", std::move(textures));
-  }
-
-  // SAMPLERS
-  if (model->samplers.size()) {
-    json samplers;
-    JsonReserveArray(samplers, model->samplers.size());
-    for (unsigned int i = 0; i < model->samplers.size(); ++i) {
-      json sampler;
-      SerializeGltfSampler(model->samplers[i], sampler);
-      JsonPushBack(samplers, std::move(sampler));
-    }
-    JsonAddMember(o, "samplers", std::move(samplers));
-  }
-
-  // CAMERAS
-  if (model->cameras.size()) {
-    json cameras;
-    JsonReserveArray(cameras, model->cameras.size());
-    for (unsigned int i = 0; i < model->cameras.size(); ++i) {
-      json camera;
-      SerializeGltfCamera(model->cameras[i], camera);
-      JsonPushBack(cameras, std::move(camera));
-    }
-    JsonAddMember(o, "cameras", std::move(cameras));
-  }
-
-  // EXTENSIONS
-  SerializeExtensionMap(model->extensions, o);
-
-  auto extensionsUsed = model->extensionsUsed;
-
-  // LIGHTS as KHR_lights_punctual
-  if (model->lights.size()) {
-    json lights;
-    JsonReserveArray(lights, model->lights.size());
-    for (unsigned int i = 0; i < model->lights.size(); ++i) {
-      json light;
-      SerializeGltfLight(model->lights[i], light);
-      JsonPushBack(lights, std::move(light));
-    }
-    json khr_lights_cmn;
-    JsonAddMember(khr_lights_cmn, "lights", std::move(lights));
-    json ext_j;
-
-    {
-      json_const_iterator it;
-      if (FindMember(o, "extensions", it)) {
-        JsonAssign(ext_j, GetValue(it));
-      }
-    }
-
-    JsonAddMember(ext_j, "KHR_lights_punctual", std::move(khr_lights_cmn));
-
-    JsonAddMember(o, "extensions", std::move(ext_j));
-
-    // Also add "KHR_lights_punctual" to `extensionsUsed`
-    {
-      auto has_khr_lights_punctual =
-          std::find_if(extensionsUsed.begin(), extensionsUsed.end(),
-                       [](const std::string &s) {
-                         return (s.compare("KHR_lights_punctual") == 0);
-                       });
-
-      if (has_khr_lights_punctual == extensionsUsed.end()) {
-        extensionsUsed.push_back("KHR_lights_punctual");
-      }
-    }
-  }
-
-  // Extensions used
-  if (extensionsUsed.size()) {
-    SerializeStringArrayProperty("extensionsUsed", extensionsUsed, o);
-  }
-
-  // EXTRAS
-  if (model->extras.Type() != NULL_TYPE) {
-    SerializeValue("extras", model->extras, o);
-  }
-}
-
-static bool WriteGltfStream(std::ostream &stream, const std::string &content) {
-  stream << content << std::endl;
-  return true;
-}
-
-static bool WriteGltfFile(const std::string &output,
-                          const std::string &content) {
-#ifdef _WIN32
-#if defined(_MSC_VER)
-  std::ofstream gltfFile(UTF8ToWchar(output).c_str());
-#elif defined(__GLIBCXX__)
-  int file_descriptor = _wopen(UTF8ToWchar(output).c_str(),
-                               _O_CREAT | _O_WRONLY | _O_TRUNC | _O_BINARY);
-  __gnu_cxx::stdio_filebuf<char> wfile_buf(
-      file_descriptor, std::ios_base::out | std::ios_base::binary);
-  std::ostream gltfFile(&wfile_buf);
-  if (!wfile_buf.is_open()) return false;
-#else
-  std::ofstream gltfFile(output.c_str());
-  if (!gltfFile.is_open()) return false;
-#endif
-#else
-  std::ofstream gltfFile(output.c_str());
-  if (!gltfFile.is_open()) return false;
-#endif
-  return WriteGltfStream(gltfFile, content);
-}
-
-static bool WriteBinaryGltfStream(std::ostream &stream,
-                                  const std::string &content,
-                                  const std::vector<unsigned char> &binBuffer) {
-  const std::string header = "glTF";
-  const int version = 2;
-
-  const uint32_t content_size = uint32_t(content.size());
-  const uint32_t binBuffer_size = uint32_t(binBuffer.size());
-  // determine number of padding bytes required to ensure 4 byte alignment
-  const uint32_t content_padding_size =
-      content_size % 4 == 0 ? 0 : 4 - content_size % 4;
-  const uint32_t bin_padding_size =
-      binBuffer_size % 4 == 0 ? 0 : 4 - binBuffer_size % 4;
-
-  // 12 bytes for header, JSON content length, 8 bytes for JSON chunk info.
-  // Chunk data must be located at 4-byte boundary, which may require padding
-  const uint32_t length =
-      12 + 8 + content_size + content_padding_size +
-      (binBuffer_size ? (8 + binBuffer_size + bin_padding_size) : 0);
-
-  stream.write(header.c_str(), std::streamsize(header.size()));
-  stream.write(reinterpret_cast<const char *>(&version), sizeof(version));
-  stream.write(reinterpret_cast<const char *>(&length), sizeof(length));
-
-  // JSON chunk info, then JSON data
-  const uint32_t model_length = uint32_t(content.size()) + content_padding_size;
-  const uint32_t model_format = 0x4E4F534A;
-  stream.write(reinterpret_cast<const char *>(&model_length),
-               sizeof(model_length));
-  stream.write(reinterpret_cast<const char *>(&model_format),
-               sizeof(model_format));
-  stream.write(content.c_str(), std::streamsize(content.size()));
-
-  // Chunk must be multiplies of 4, so pad with spaces
-  if (content_padding_size > 0) {
-    const std::string padding = std::string(size_t(content_padding_size), ' ');
-    stream.write(padding.c_str(), std::streamsize(padding.size()));
-  }
-  if (binBuffer.size() > 0) {
-    // BIN chunk info, then BIN data
-    const uint32_t bin_length = uint32_t(binBuffer.size()) + bin_padding_size;
-    const uint32_t bin_format = 0x004e4942;
-    stream.write(reinterpret_cast<const char *>(&bin_length),
-                 sizeof(bin_length));
-    stream.write(reinterpret_cast<const char *>(&bin_format),
-                 sizeof(bin_format));
-    stream.write(reinterpret_cast<const char *>(binBuffer.data()),
-                 std::streamsize(binBuffer.size()));
-    // Chunksize must be multiplies of 4, so pad with zeroes
-    if (bin_padding_size > 0) {
-      const std::vector<unsigned char> padding =
-          std::vector<unsigned char>(size_t(bin_padding_size), 0);
-      stream.write(reinterpret_cast<const char *>(padding.data()),
-                   std::streamsize(padding.size()));
-    }
-  }
-
-  // TODO: Check error on stream.write
-  return true;
-}
-
-static bool WriteBinaryGltfFile(const std::string &output,
-                                const std::string &content,
-                                const std::vector<unsigned char> &binBuffer) {
-#ifdef _WIN32
-#if defined(_MSC_VER)
-  std::ofstream gltfFile(UTF8ToWchar(output).c_str(), std::ios::binary);
-#elif defined(__GLIBCXX__)
-  int file_descriptor = _wopen(UTF8ToWchar(output).c_str(),
-                               _O_CREAT | _O_WRONLY | _O_TRUNC | _O_BINARY);
-  __gnu_cxx::stdio_filebuf<char> wfile_buf(
-      file_descriptor, std::ios_base::out | std::ios_base::binary);
-  std::ostream gltfFile(&wfile_buf);
-#else
-  std::ofstream gltfFile(output.c_str(), std::ios::binary);
-#endif
-#else
-  std::ofstream gltfFile(output.c_str(), std::ios::binary);
-#endif
-  return WriteBinaryGltfStream(gltfFile, content, binBuffer);
-}
-
-bool TinyGLTF::WriteGltfSceneToStream(Model *model, std::ostream &stream,
-                                      bool prettyPrint = true,
-                                      bool writeBinary = false) {
-  JsonDocument output;
-
-  /// Serialize all properties except buffers and images.
-  SerializeGltfModel(model, output);
-
-  // BUFFERS
-  std::vector<unsigned char> binBuffer;
-  if (model->buffers.size()) {
-    json buffers;
-    JsonReserveArray(buffers, model->buffers.size());
-    for (unsigned int i = 0; i < model->buffers.size(); ++i) {
-      json buffer;
-      if (writeBinary && i == 0 && model->buffers[i].uri.empty()) {
-        SerializeGltfBufferBin(model->buffers[i], buffer, binBuffer);
-      } else {
-        SerializeGltfBuffer(model->buffers[i], buffer);
-      }
-      JsonPushBack(buffers, std::move(buffer));
-    }
-    JsonAddMember(output, "buffers", std::move(buffers));
-  }
-
-  // IMAGES
-  if (model->images.size()) {
-    json images;
-    JsonReserveArray(images, model->images.size());
-    for (unsigned int i = 0; i < model->images.size(); ++i) {
-      json image;
-
-      std::string dummystring = "";
-      // UpdateImageObject need baseDir but only uses it if embeddedImages is
-      // enabled, since we won't write separate images when writing to a stream
-      // we
-      UpdateImageObject(model->images[i], dummystring, int(i), true,
-                        &this->WriteImageData, this->write_image_user_data_);
-      SerializeGltfImage(model->images[i], image);
-      JsonPushBack(images, std::move(image));
-    }
-    JsonAddMember(output, "images", std::move(images));
-  }
-
-  if (writeBinary) {
-    return WriteBinaryGltfStream(stream, JsonToString(output), binBuffer);
-  } else {
-    return WriteGltfStream(stream, JsonToString(output, prettyPrint ? 2 : -1));
-  }
-
-}
-
-bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
-                                    bool embedImages = false,
-                                    bool embedBuffers = false,
-                                    bool prettyPrint = true,
-                                    bool writeBinary = false) {
-  JsonDocument output;
-  std::string defaultBinFilename = GetBaseFilename(filename);
-  std::string defaultBinFileExt = ".bin";
-  std::string::size_type pos =
-      defaultBinFilename.rfind('.', defaultBinFilename.length());
-
-  if (pos != std::string::npos) {
-    defaultBinFilename = defaultBinFilename.substr(0, pos);
-  }
-  std::string baseDir = GetBaseDir(filename);
-  if (baseDir.empty()) {
-    baseDir = "./";
-  }
-  /// Serialize all properties except buffers and images.
-  SerializeGltfModel(model, output);
-
-  // BUFFERS
-  std::vector<std::string> usedUris;
-  std::vector<unsigned char> binBuffer;
-  if (model->buffers.size()) {
-    json buffers;
-    JsonReserveArray(buffers, model->buffers.size());
-    for (unsigned int i = 0; i < model->buffers.size(); ++i) {
-      json buffer;
-      if (writeBinary && i == 0 && model->buffers[i].uri.empty()) {
-        SerializeGltfBufferBin(model->buffers[i], buffer, binBuffer);
-      } else if (embedBuffers) {
-        SerializeGltfBuffer(model->buffers[i], buffer);
-      } else {
-        std::string binSavePath;
-        std::string binUri;
-        if (!model->buffers[i].uri.empty() &&
-            !IsDataURI(model->buffers[i].uri)) {
-          binUri = model->buffers[i].uri;
-        } else {
-          binUri = defaultBinFilename + defaultBinFileExt;
-          bool inUse = true;
-          int numUsed = 0;
-          while (inUse) {
-            inUse = false;
-            for (const std::string &usedName : usedUris) {
-              if (binUri.compare(usedName) != 0) continue;
-              inUse = true;
-              binUri = defaultBinFilename + std::to_string(numUsed++) +
-                       defaultBinFileExt;
-              break;
-            }
-          }
-        }
-        usedUris.push_back(binUri);
-        binSavePath = JoinPath(baseDir, binUri);
-        if (!SerializeGltfBuffer(model->buffers[i], buffer, binSavePath,
-                                 binUri)) {
-          return false;
-        }
-      }
-      JsonPushBack(buffers, std::move(buffer));
-    }
-    JsonAddMember(output, "buffers", std::move(buffers));
-  }
-
-  // IMAGES
-  if (model->images.size()) {
-    json images;
-    JsonReserveArray(images, model->images.size());
-    for (unsigned int i = 0; i < model->images.size(); ++i) {
-      json image;
-
-      UpdateImageObject(model->images[i], baseDir, int(i), embedImages,
-                        &this->WriteImageData, this->write_image_user_data_);
-      SerializeGltfImage(model->images[i], image);
-      JsonPushBack(images, std::move(image));
-    }
-    JsonAddMember(output, "images", std::move(images));
-  }
-
-  if (writeBinary) {
-    return WriteBinaryGltfFile(filename, JsonToString(output), binBuffer);
-  } else {
-    return WriteGltfFile(filename, JsonToString(output, (prettyPrint ? 2 : -1)));
-  }
-
-}
-
-}  // namespace tinygltf
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#endif  // TINYGLTF_IMPLEMENTATION
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_obj_loader.cc b/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_obj_loader.cc
deleted file mode 100644
index e57d0444b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_obj_loader.cc
+++ /dev/null
@@ -1,2 +0,0 @@
-#define TINYOBJLOADER_IMPLEMENTATION
-#include "tiny_obj_loader.h"
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_obj_loader.h b/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_obj_loader.h
deleted file mode 100644
index c23acc0db..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tiny_obj_loader.h
+++ /dev/null
@@ -1,3499 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2012-Present, Syoyo Fujita and many contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-//
-// version 2.0.0 : Add new object oriented API. 1.x API is still provided.
-//                 * Add python binding.
-//                 * Support line primitive.
-//                 * Support points primitive.
-//                 * Support multiple search path for .mtl(v1 API).
-//                 * Support vertex skinning weight `vw`(as an tinyobj
-//                 extension). Note that this differs vertex weight([w]
-//                 component in `v` line)
-//                 * Support escaped whitespece in mtllib
-//                 * Add robust triangulation using Mapbox
-//                 earcut(TINYOBJLOADER_USE_MAPBOX_EARCUT).
-// version 1.4.0 : Modifed ParseTextureNameAndOption API
-// version 1.3.1 : Make ParseTextureNameAndOption API public
-// version 1.3.0 : Separate warning and error message(breaking API of LoadObj)
-// version 1.2.3 : Added color space extension('-colorspace') to tex opts.
-// version 1.2.2 : Parse multiple group names.
-// version 1.2.1 : Added initial support for line('l') primitive(PR #178)
-// version 1.2.0 : Hardened implementation(#175)
-// version 1.1.1 : Support smoothing groups(#162)
-// version 1.1.0 : Support parsing vertex color(#144)
-// version 1.0.8 : Fix parsing `g` tag just after `usemtl`(#138)
-// version 1.0.7 : Support multiple tex options(#126)
-// version 1.0.6 : Add TINYOBJLOADER_USE_DOUBLE option(#124)
-// version 1.0.5 : Ignore `Tr` when `d` exists in MTL(#43)
-// version 1.0.4 : Support multiple filenames for 'mtllib'(#112)
-// version 1.0.3 : Support parsing texture options(#85)
-// version 1.0.2 : Improve parsing speed by about a factor of 2 for large
-// files(#105)
-// version 1.0.1 : Fixes a shape is lost if obj ends with a 'usemtl'(#104)
-// version 1.0.0 : Change data structure. Change license from BSD to MIT.
-//
-
-//
-// Use this in *one* .cc
-//   #define TINYOBJLOADER_IMPLEMENTATION
-//   #include "tiny_obj_loader.h"
-//
-
-#ifndef TINY_OBJ_LOADER_H_
-#define TINY_OBJ_LOADER_H_
-
-#include <map>
-#include <string>
-#include <vector>
-
-namespace tinyobj {
-
-// TODO(syoyo): Better C++11 detection for older compiler
-#if __cplusplus > 199711L
-#define TINYOBJ_OVERRIDE override
-#else
-#define TINYOBJ_OVERRIDE
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#if __has_warning("-Wzero-as-null-pointer-constant")
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
-
-#pragma clang diagnostic ignored "-Wpadded"
-
-#endif
-
-// https://en.wikipedia.org/wiki/Wavefront_.obj_file says ...
-//
-//  -blendu on | off                       # set horizontal texture blending
-//  (default on)
-//  -blendv on | off                       # set vertical texture blending
-//  (default on)
-//  -boost real_value                      # boost mip-map sharpness
-//  -mm base_value gain_value              # modify texture map values (default
-//  0 1)
-//                                         #     base_value = brightness,
-//                                         gain_value = contrast
-//  -o u [v [w]]                           # Origin offset             (default
-//  0 0 0)
-//  -s u [v [w]]                           # Scale                     (default
-//  1 1 1)
-//  -t u [v [w]]                           # Turbulence                (default
-//  0 0 0)
-//  -texres resolution                     # texture resolution to create
-//  -clamp on | off                        # only render texels in the clamped
-//  0-1 range (default off)
-//                                         #   When unclamped, textures are
-//                                         repeated across a surface,
-//                                         #   when clamped, only texels which
-//                                         fall within the 0-1
-//                                         #   range are rendered.
-//  -bm mult_value                         # bump multiplier (for bump maps
-//  only)
-//
-//  -imfchan r | g | b | m | l | z         # specifies which channel of the file
-//  is used to
-//                                         # create a scalar or bump texture.
-//                                         r:red, g:green,
-//                                         # b:blue, m:matte, l:luminance,
-//                                         z:z-depth..
-//                                         # (the default for bump is 'l' and
-//                                         for decal is 'm')
-//  bump -imfchan r bumpmap.tga            # says to use the red channel of
-//  bumpmap.tga as the bumpmap
-//
-// For reflection maps...
-//
-//   -type sphere                           # specifies a sphere for a "refl"
-//   reflection map
-//   -type cube_top    | cube_bottom |      # when using a cube map, the texture
-//   file for each
-//         cube_front  | cube_back   |      # side of the cube is specified
-//         separately
-//         cube_left   | cube_right
-//
-// TinyObjLoader extension.
-//
-//   -colorspace SPACE                      # Color space of the texture. e.g.
-//   'sRGB` or 'linear'
-//
-
-#ifdef TINYOBJLOADER_USE_DOUBLE
-//#pragma message "using double"
-typedef double real_t;
-#else
-//#pragma message "using float"
-typedef float real_t;
-#endif
-
-typedef enum {
-  TEXTURE_TYPE_NONE,  // default
-  TEXTURE_TYPE_SPHERE,
-  TEXTURE_TYPE_CUBE_TOP,
-  TEXTURE_TYPE_CUBE_BOTTOM,
-  TEXTURE_TYPE_CUBE_FRONT,
-  TEXTURE_TYPE_CUBE_BACK,
-  TEXTURE_TYPE_CUBE_LEFT,
-  TEXTURE_TYPE_CUBE_RIGHT
-} texture_type_t;
-
-struct texture_option_t {
-  texture_type_t type;      // -type (default TEXTURE_TYPE_NONE)
-  real_t sharpness;         // -boost (default 1.0?)
-  real_t brightness;        // base_value in -mm option (default 0)
-  real_t contrast;          // gain_value in -mm option (default 1)
-  real_t origin_offset[3];  // -o u [v [w]] (default 0 0 0)
-  real_t scale[3];          // -s u [v [w]] (default 1 1 1)
-  real_t turbulence[3];     // -t u [v [w]] (default 0 0 0)
-  int texture_resolution;   // -texres resolution (No default value in the spec.
-                            // We'll use -1)
-  bool clamp;               // -clamp (default false)
-  char imfchan;  // -imfchan (the default for bump is 'l' and for decal is 'm')
-  bool blendu;   // -blendu (default on)
-  bool blendv;   // -blendv (default on)
-  real_t bump_multiplier;  // -bm (for bump maps only, default 1.0)
-
-  // extension
-  std::string colorspace;  // Explicitly specify color space of stored texel
-                           // value. Usually `sRGB` or `linear` (default empty).
-};
-
-struct material_t {
-  std::string name;
-
-  real_t ambient[3];
-  real_t diffuse[3];
-  real_t specular[3];
-  real_t transmittance[3];
-  real_t emission[3];
-  real_t shininess;
-  real_t ior;       // index of refraction
-  real_t dissolve;  // 1 == opaque; 0 == fully transparent
-  // illumination model (see http://www.fileformat.info/format/material/)
-  int illum;
-
-  int dummy;  // Suppress padding warning.
-
-  std::string ambient_texname;   // map_Ka. For ambient or ambient occlusion.
-  std::string diffuse_texname;   // map_Kd
-  std::string specular_texname;  // map_Ks
-  std::string specular_highlight_texname;  // map_Ns
-  std::string bump_texname;                // map_bump, map_Bump, bump
-  std::string displacement_texname;        // disp
-  std::string alpha_texname;               // map_d
-  std::string reflection_texname;          // refl
-
-  texture_option_t ambient_texopt;
-  texture_option_t diffuse_texopt;
-  texture_option_t specular_texopt;
-  texture_option_t specular_highlight_texopt;
-  texture_option_t bump_texopt;
-  texture_option_t displacement_texopt;
-  texture_option_t alpha_texopt;
-  texture_option_t reflection_texopt;
-
-  // PBR extension
-  // http://exocortex.com/blog/extending_wavefront_mtl_to_support_pbr
-  real_t roughness;            // [0, 1] default 0
-  real_t metallic;             // [0, 1] default 0
-  real_t sheen;                // [0, 1] default 0
-  real_t clearcoat_thickness;  // [0, 1] default 0
-  real_t clearcoat_roughness;  // [0, 1] default 0
-  real_t anisotropy;           // aniso. [0, 1] default 0
-  real_t anisotropy_rotation;  // anisor. [0, 1] default 0
-  real_t pad0;
-  std::string roughness_texname;  // map_Pr
-  std::string metallic_texname;   // map_Pm
-  std::string sheen_texname;      // map_Ps
-  std::string emissive_texname;   // map_Ke
-  std::string normal_texname;     // norm. For normal mapping.
-
-  texture_option_t roughness_texopt;
-  texture_option_t metallic_texopt;
-  texture_option_t sheen_texopt;
-  texture_option_t emissive_texopt;
-  texture_option_t normal_texopt;
-
-  int pad2;
-
-  std::map<std::string, std::string> unknown_parameter;
-
-#ifdef TINY_OBJ_LOADER_PYTHON_BINDING
-  // For pybind11
-  std::array<double, 3> GetDiffuse() {
-    std::array<double, 3> values;
-    values[0] = double(diffuse[0]);
-    values[1] = double(diffuse[1]);
-    values[2] = double(diffuse[2]);
-
-    return values;
-  }
-
-  std::array<double, 3> GetSpecular() {
-    std::array<double, 3> values;
-    values[0] = double(specular[0]);
-    values[1] = double(specular[1]);
-    values[2] = double(specular[2]);
-
-    return values;
-  }
-
-  std::array<double, 3> GetTransmittance() {
-    std::array<double, 3> values;
-    values[0] = double(transmittance[0]);
-    values[1] = double(transmittance[1]);
-    values[2] = double(transmittance[2]);
-
-    return values;
-  }
-
-  std::array<double, 3> GetEmission() {
-    std::array<double, 3> values;
-    values[0] = double(emission[0]);
-    values[1] = double(emission[1]);
-    values[2] = double(emission[2]);
-
-    return values;
-  }
-
-  std::array<double, 3> GetAmbient() {
-    std::array<double, 3> values;
-    values[0] = double(ambient[0]);
-    values[1] = double(ambient[1]);
-    values[2] = double(ambient[2]);
-
-    return values;
-  }
-
-  void SetDiffuse(std::array<double, 3> &a) {
-    diffuse[0] = real_t(a[0]);
-    diffuse[1] = real_t(a[1]);
-    diffuse[2] = real_t(a[2]);
-  }
-
-  void SetAmbient(std::array<double, 3> &a) {
-    ambient[0] = real_t(a[0]);
-    ambient[1] = real_t(a[1]);
-    ambient[2] = real_t(a[2]);
-  }
-
-  void SetSpecular(std::array<double, 3> &a) {
-    specular[0] = real_t(a[0]);
-    specular[1] = real_t(a[1]);
-    specular[2] = real_t(a[2]);
-  }
-
-  void SetTransmittance(std::array<double, 3> &a) {
-    transmittance[0] = real_t(a[0]);
-    transmittance[1] = real_t(a[1]);
-    transmittance[2] = real_t(a[2]);
-  }
-
-  std::string GetCustomParameter(const std::string &key) {
-    std::map<std::string, std::string>::const_iterator it =
-        unknown_parameter.find(key);
-
-    if (it != unknown_parameter.end()) {
-      return it->second;
-    }
-    return std::string();
-  }
-
-#endif
-};
-
-struct tag_t {
-  std::string name;
-
-  std::vector<int> intValues;
-  std::vector<real_t> floatValues;
-  std::vector<std::string> stringValues;
-};
-
-struct joint_and_weight_t {
-  int joint_id;
-  real_t weight;
-};
-
-struct skin_weight_t {
-  int vertex_id;  // Corresponding vertex index in `attrib_t::vertices`.
-                  // Compared to `index_t`, this index must be positive and
-                  // start with 0(does not allow relative indexing)
-  std::vector<joint_and_weight_t> weightValues;
-};
-
-// Index struct to support different indices for vtx/normal/texcoord.
-// -1 means not used.
-struct index_t {
-  int vertex_index;
-  int normal_index;
-  int texcoord_index;
-};
-
-struct mesh_t {
-  std::vector<index_t> indices;
-  std::vector<unsigned int>
-      num_face_vertices;          // The number of vertices per
-                                  // face. 3 = triangle, 4 = quad, ...
-  std::vector<int> material_ids;  // per-face material ID
-  std::vector<unsigned int> smoothing_group_ids;  // per-face smoothing group
-                                                  // ID(0 = off. positive value
-                                                  // = group id)
-  std::vector<tag_t> tags;                        // SubD tag
-};
-
-// struct path_t {
-//  std::vector<int> indices;  // pairs of indices for lines
-//};
-
-struct lines_t {
-  // Linear flattened indices.
-  std::vector<index_t> indices;        // indices for vertices(poly lines)
-  std::vector<int> num_line_vertices;  // The number of vertices per line.
-};
-
-struct points_t {
-  std::vector<index_t> indices;  // indices for points
-};
-
-struct shape_t {
-  std::string name;
-  mesh_t mesh;
-  lines_t lines;
-  points_t points;
-};
-
-// Vertex attributes
-struct attrib_t {
-  std::vector<real_t> vertices;  // 'v'(xyz)
-
-  // For backward compatibility, we store vertex weight in separate array.
-  std::vector<real_t> vertex_weights;  // 'v'(w)
-  std::vector<real_t> normals;         // 'vn'
-  std::vector<real_t> texcoords;       // 'vt'(uv)
-
-  // For backward compatibility, we store texture coordinate 'w' in separate
-  // array.
-  std::vector<real_t> texcoord_ws;  // 'vt'(w)
-  std::vector<real_t> colors;       // extension: vertex colors
-
-  //
-  // TinyObj extension.
-  //
-
-  // NOTE(syoyo): array index is based on the appearance order.
-  // To get a corresponding skin weight for a specific vertex id `vid`,
-  // Need to reconstruct a look up table: `skin_weight_t::vertex_id` == `vid`
-  // (e.g. using std::map, std::unordered_map)
-  std::vector<skin_weight_t> skin_weights;
-
-  attrib_t() {}
-
-  //
-  // For pybind11
-  //
-  const std::vector<real_t> &GetVertices() const { return vertices; }
-
-  const std::vector<real_t> &GetVertexWeights() const { return vertex_weights; }
-};
-
-struct callback_t {
-  // W is optional and set to 1 if there is no `w` item in `v` line
-  void (*vertex_cb)(void *user_data, real_t x, real_t y, real_t z, real_t w);
-  void (*vertex_color_cb)(void *user_data, real_t x, real_t y, real_t z,
-                          real_t r, real_t g, real_t b, bool has_color);
-  void (*normal_cb)(void *user_data, real_t x, real_t y, real_t z);
-
-  // y and z are optional and set to 0 if there is no `y` and/or `z` item(s) in
-  // `vt` line.
-  void (*texcoord_cb)(void *user_data, real_t x, real_t y, real_t z);
-
-  // called per 'f' line. num_indices is the number of face indices(e.g. 3 for
-  // triangle, 4 for quad)
-  // 0 will be passed for undefined index in index_t members.
-  void (*index_cb)(void *user_data, index_t *indices, int num_indices);
-  // `name` material name, `material_id` = the array index of material_t[]. -1
-  // if
-  // a material not found in .mtl
-  void (*usemtl_cb)(void *user_data, const char *name, int material_id);
-  // `materials` = parsed material data.
-  void (*mtllib_cb)(void *user_data, const material_t *materials,
-                    int num_materials);
-  // There may be multiple group names
-  void (*group_cb)(void *user_data, const char **names, int num_names);
-  void (*object_cb)(void *user_data, const char *name);
-
-  callback_t()
-      : vertex_cb(NULL),
-        vertex_color_cb(NULL),
-        normal_cb(NULL),
-        texcoord_cb(NULL),
-        index_cb(NULL),
-        usemtl_cb(NULL),
-        mtllib_cb(NULL),
-        group_cb(NULL),
-        object_cb(NULL) {}
-};
-
-class MaterialReader {
- public:
-  MaterialReader() {}
-  virtual ~MaterialReader();
-
-  virtual bool operator()(const std::string &matId,
-                          std::vector<material_t> *materials,
-                          std::map<std::string, int> *matMap, std::string *warn,
-                          std::string *err) = 0;
-};
-
-///
-/// Read .mtl from a file.
-///
-class MaterialFileReader : public MaterialReader {
- public:
-  // Path could contain separator(';' in Windows, ':' in Posix)
-  explicit MaterialFileReader(const std::string &mtl_basedir)
-      : m_mtlBaseDir(mtl_basedir) {}
-  virtual ~MaterialFileReader() TINYOBJ_OVERRIDE {}
-  virtual bool operator()(const std::string &matId,
-                          std::vector<material_t> *materials,
-                          std::map<std::string, int> *matMap, std::string *warn,
-                          std::string *err) TINYOBJ_OVERRIDE;
-
- private:
-  std::string m_mtlBaseDir;
-};
-
-///
-/// Read .mtl from a stream.
-///
-class MaterialStreamReader : public MaterialReader {
- public:
-  explicit MaterialStreamReader(std::istream &inStream)
-      : m_inStream(inStream) {}
-  virtual ~MaterialStreamReader() TINYOBJ_OVERRIDE {}
-  virtual bool operator()(const std::string &matId,
-                          std::vector<material_t> *materials,
-                          std::map<std::string, int> *matMap, std::string *warn,
-                          std::string *err) TINYOBJ_OVERRIDE;
-
- private:
-  std::istream &m_inStream;
-};
-
-// v2 API
-struct ObjReaderConfig {
-  bool triangulate;  // triangulate polygon?
-
-  // Currently not used.
-  // "simple" or empty: Create triangle fan
-  // "earcut": Use the algorithm based on Ear clipping
-  std::string triangulation_method;
-
-  /// Parse vertex color.
-  /// If vertex color is not present, its filled with default value.
-  /// false = no vertex color
-  /// This will increase memory of parsed .obj
-  bool vertex_color;
-
-  ///
-  /// Search path to .mtl file.
-  /// Default = "" = search from the same directory of .obj file.
-  /// Valid only when loading .obj from a file.
-  ///
-  std::string mtl_search_path;
-
-  ObjReaderConfig()
-      : triangulate(true), triangulation_method("simple"), vertex_color(true) {}
-};
-
-///
-/// Wavefront .obj reader class(v2 API)
-///
-class ObjReader {
- public:
-  ObjReader() : valid_(false) {}
-
-  ///
-  /// Load .obj and .mtl from a file.
-  ///
-  /// @param[in] filename wavefront .obj filename
-  /// @param[in] config Reader configuration
-  ///
-  bool ParseFromFile(const std::string &filename,
-                     const ObjReaderConfig &config = ObjReaderConfig());
-
-  ///
-  /// Parse .obj from a text string.
-  /// Need to supply .mtl text string by `mtl_text`.
-  /// This function ignores `mtllib` line in .obj text.
-  ///
-  /// @param[in] obj_text wavefront .obj filename
-  /// @param[in] mtl_text wavefront .mtl filename
-  /// @param[in] config Reader configuration
-  ///
-  bool ParseFromString(const std::string &obj_text, const std::string &mtl_text,
-                       const ObjReaderConfig &config = ObjReaderConfig());
-
-  ///
-  /// .obj was loaded or parsed correctly.
-  ///
-  bool Valid() const { return valid_; }
-
-  const attrib_t &GetAttrib() const { return attrib_; }
-
-  const std::vector<shape_t> &GetShapes() const { return shapes_; }
-
-  const std::vector<material_t> &GetMaterials() const { return materials_; }
-
-  ///
-  /// Warning message(may be filled after `Load` or `Parse`)
-  ///
-  const std::string &Warning() const { return warning_; }
-
-  ///
-  /// Error message(filled when `Load` or `Parse` failed)
-  ///
-  const std::string &Error() const { return error_; }
-
- private:
-  bool valid_;
-
-  attrib_t attrib_;
-  std::vector<shape_t> shapes_;
-  std::vector<material_t> materials_;
-
-  std::string warning_;
-  std::string error_;
-};
-
-/// ==>>========= Legacy v1 API =============================================
-
-/// Loads .obj from a file.
-/// 'attrib', 'shapes' and 'materials' will be filled with parsed shape data
-/// 'shapes' will be filled with parsed shape data
-/// Returns true when loading .obj become success.
-/// Returns warning message into `warn`, and error message into `err`
-/// 'mtl_basedir' is optional, and used for base directory for .mtl file.
-/// In default(`NULL'), .mtl file is searched from an application's working
-/// directory.
-/// 'triangulate' is optional, and used whether triangulate polygon face in .obj
-/// or not.
-/// Option 'default_vcols_fallback' specifies whether vertex colors should
-/// always be defined, even if no colors are given (fallback to white).
-bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
-             std::vector<material_t> *materials, std::string *warn,
-             std::string *err, const char *filename,
-             const char *mtl_basedir = NULL, bool triangulate = true,
-             bool default_vcols_fallback = true);
-
-/// Loads .obj from a file with custom user callback.
-/// .mtl is loaded as usual and parsed material_t data will be passed to
-/// `callback.mtllib_cb`.
-/// Returns true when loading .obj/.mtl become success.
-/// Returns warning message into `warn`, and error message into `err`
-/// See `examples/callback_api/` for how to use this function.
-bool LoadObjWithCallback(std::istream &inStream, const callback_t &callback,
-                         void *user_data = NULL,
-                         MaterialReader *readMatFn = NULL,
-                         std::string *warn = NULL, std::string *err = NULL);
-
-/// Loads object from a std::istream, uses `readMatFn` to retrieve
-/// std::istream for materials.
-/// Returns true when loading .obj become success.
-/// Returns warning and error message into `err`
-bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
-             std::vector<material_t> *materials, std::string *warn,
-             std::string *err, std::istream *inStream,
-             MaterialReader *readMatFn = NULL, bool triangulate = true,
-             bool default_vcols_fallback = true);
-
-/// Loads materials into std::map
-void LoadMtl(std::map<std::string, int> *material_map,
-             std::vector<material_t> *materials, std::istream *inStream,
-             std::string *warning, std::string *err);
-
-///
-/// Parse texture name and texture option for custom texture parameter through
-/// material::unknown_parameter
-///
-/// @param[out] texname Parsed texture name
-/// @param[out] texopt Parsed texopt
-/// @param[in] linebuf Input string
-///
-bool ParseTextureNameAndOption(std::string *texname, texture_option_t *texopt,
-                               const char *linebuf);
-
-/// =<<========== Legacy v1 API =============================================
-
-}  // namespace tinyobj
-
-#endif  // TINY_OBJ_LOADER_H_
-
-#ifdef TINYOBJLOADER_IMPLEMENTATION
-#include <cassert>
-#include <cctype>
-#include <cmath>
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <limits>
-#include <set>
-#include <sstream>
-#include <utility>
-
-#ifdef TINYOBJLOADER_USE_MAPBOX_EARCUT
-
-#ifdef TINYOBJLOADER_DONOT_INCLUDE_MAPBOX_EARCUT
-// Assume earcut.hpp is included outside of tiny_obj_loader.h
-#else
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-#include <array>
-
-#include "mapbox/earcut.hpp"
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#endif
-
-#endif  // TINYOBJLOADER_USE_MAPBOX_EARCUT
-
-namespace tinyobj {
-
-MaterialReader::~MaterialReader() {}
-
-struct vertex_index_t {
-  int v_idx, vt_idx, vn_idx;
-  vertex_index_t() : v_idx(-1), vt_idx(-1), vn_idx(-1) {}
-  explicit vertex_index_t(int idx) : v_idx(idx), vt_idx(idx), vn_idx(idx) {}
-  vertex_index_t(int vidx, int vtidx, int vnidx)
-      : v_idx(vidx), vt_idx(vtidx), vn_idx(vnidx) {}
-};
-
-// Internal data structure for face representation
-// index + smoothing group.
-struct face_t {
-  unsigned int
-      smoothing_group_id;  // smoothing group id. 0 = smoothing groupd is off.
-  int pad_;
-  std::vector<vertex_index_t> vertex_indices;  // face vertex indices.
-
-  face_t() : smoothing_group_id(0), pad_(0) {}
-};
-
-// Internal data structure for line representation
-struct __line_t {
-  // l v1/vt1 v2/vt2 ...
-  // In the specification, line primitrive does not have normal index, but
-  // TinyObjLoader allow it
-  std::vector<vertex_index_t> vertex_indices;
-};
-
-// Internal data structure for points representation
-struct __points_t {
-  // p v1 v2 ...
-  // In the specification, point primitrive does not have normal index and
-  // texture coord index, but TinyObjLoader allow it.
-  std::vector<vertex_index_t> vertex_indices;
-};
-
-struct tag_sizes {
-  tag_sizes() : num_ints(0), num_reals(0), num_strings(0) {}
-  int num_ints;
-  int num_reals;
-  int num_strings;
-};
-
-struct obj_shape {
-  std::vector<real_t> v;
-  std::vector<real_t> vn;
-  std::vector<real_t> vt;
-};
-
-//
-// Manages group of primitives(face, line, points, ...)
-struct PrimGroup {
-  std::vector<face_t> faceGroup;
-  std::vector<__line_t> lineGroup;
-  std::vector<__points_t> pointsGroup;
-
-  void clear() {
-    faceGroup.clear();
-    lineGroup.clear();
-    pointsGroup.clear();
-  }
-
-  bool IsEmpty() const {
-    return faceGroup.empty() && lineGroup.empty() && pointsGroup.empty();
-  }
-
-  // TODO(syoyo): bspline, surface, ...
-};
-
-// See
-// http://stackoverflow.com/questions/6089231/getting-std-ifstream-to-handle-lf-cr-and-crlf
-static std::istream &safeGetline(std::istream &is, std::string &t) {
-  t.clear();
-
-  // The characters in the stream are read one-by-one using a std::streambuf.
-  // That is faster than reading them one-by-one using the std::istream.
-  // Code that uses streambuf this way must be guarded by a sentry object.
-  // The sentry object performs various tasks,
-  // such as thread synchronization and updating the stream state.
-
-  std::istream::sentry se(is, true);
-  std::streambuf *sb = is.rdbuf();
-
-  if (se) {
-    for (;;) {
-      int c = sb->sbumpc();
-      switch (c) {
-        case '\n':
-          return is;
-        case '\r':
-          if (sb->sgetc() == '\n') sb->sbumpc();
-          return is;
-        case EOF:
-          // Also handle the case when the last line has no line ending
-          if (t.empty()) is.setstate(std::ios::eofbit);
-          return is;
-        default:
-          t += static_cast<char>(c);
-      }
-    }
-  }
-
-  return is;
-}
-
-#define IS_SPACE(x) (((x) == ' ') || ((x) == '\t'))
-#define IS_DIGIT(x) \
-  (static_cast<unsigned int>((x) - '0') < static_cast<unsigned int>(10))
-#define IS_NEW_LINE(x) (((x) == '\r') || ((x) == '\n') || ((x) == '\0'))
-
-template <typename T>
-static inline std::string toString(const T &t) {
-  std::stringstream ss;
-  ss << t;
-  return ss.str();
-}
-
-struct warning_context {
-  std::string *warn;
-  size_t line_number;
-};
-
-// Make index zero-base, and also support relative index.
-static inline bool fixIndex(int idx, int n, int *ret, bool allow_zero,
-                            const warning_context &context) {
-  if (!ret) {
-    return false;
-  }
-
-  if (idx > 0) {
-    (*ret) = idx - 1;
-    return true;
-  }
-
-  if (idx == 0) {
-    // zero is not allowed according to the spec.
-    if (context.warn) {
-      (*context.warn) +=
-          "A zero value index found (will have a value of -1 for normal and "
-          "tex indices. Line " +
-          toString(context.line_number) + ").\n";
-    }
-
-    (*ret) = idx - 1;
-    return allow_zero;
-  }
-
-  if (idx < 0) {
-    (*ret) = n + idx;  // negative value = relative
-    if ((*ret) < 0) {
-      return false;  // invalid relative index
-    }
-    return true;
-  }
-
-  return false;  // never reach here.
-}
-
-static inline std::string parseString(const char **token) {
-  std::string s;
-  (*token) += strspn((*token), " \t");
-  size_t e = strcspn((*token), " \t\r");
-  s = std::string((*token), &(*token)[e]);
-  (*token) += e;
-  return s;
-}
-
-static inline int parseInt(const char **token) {
-  (*token) += strspn((*token), " \t");
-  int i = atoi((*token));
-  (*token) += strcspn((*token), " \t\r");
-  return i;
-}
-
-// Tries to parse a floating point number located at s.
-//
-// s_end should be a location in the string where reading should absolutely
-// stop. For example at the end of the string, to prevent buffer overflows.
-//
-// Parses the following EBNF grammar:
-//   sign    = "+" | "-" ;
-//   END     = ? anything not in digit ?
-//   digit   = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
-//   integer = [sign] , digit , {digit} ;
-//   decimal = integer , ["." , integer] ;
-//   float   = ( decimal , END ) | ( decimal , ("E" | "e") , integer , END ) ;
-//
-//  Valid strings are for example:
-//   -0  +3.1417e+2  -0.0E-3  1.0324  -1.41   11e2
-//
-// If the parsing is a success, result is set to the parsed value and true
-// is returned.
-//
-// The function is greedy and will parse until any of the following happens:
-//  - a non-conforming character is encountered.
-//  - s_end is reached.
-//
-// The following situations triggers a failure:
-//  - s >= s_end.
-//  - parse failure.
-//
-static bool tryParseDouble(const char *s, const char *s_end, double *result) {
-  if (s >= s_end) {
-    return false;
-  }
-
-  double mantissa = 0.0;
-  // This exponent is base 2 rather than 10.
-  // However the exponent we parse is supposed to be one of ten,
-  // thus we must take care to convert the exponent/and or the
-  // mantissa to a * 2^E, where a is the mantissa and E is the
-  // exponent.
-  // To get the final double we will use ldexp, it requires the
-  // exponent to be in base 2.
-  int exponent = 0;
-
-  // NOTE: THESE MUST BE DECLARED HERE SINCE WE ARE NOT ALLOWED
-  // TO JUMP OVER DEFINITIONS.
-  char sign = '+';
-  char exp_sign = '+';
-  char const *curr = s;
-
-  // How many characters were read in a loop.
-  int read = 0;
-  // Tells whether a loop terminated due to reaching s_end.
-  bool end_not_reached = false;
-  bool leading_decimal_dots = false;
-
-  /*
-          BEGIN PARSING.
-  */
-
-  // Find out what sign we've got.
-  if (*curr == '+' || *curr == '-') {
-    sign = *curr;
-    curr++;
-    if ((curr != s_end) && (*curr == '.')) {
-      // accept. Somethig like `.7e+2`, `-.5234`
-      leading_decimal_dots = true;
-    }
-  } else if (IS_DIGIT(*curr)) { /* Pass through. */
-  } else if (*curr == '.') {
-    // accept. Somethig like `.7e+2`, `-.5234`
-    leading_decimal_dots = true;
-  } else {
-    goto fail;
-  }
-
-  // Read the integer part.
-  end_not_reached = (curr != s_end);
-  if (!leading_decimal_dots) {
-    while (end_not_reached && IS_DIGIT(*curr)) {
-      mantissa *= 10;
-      mantissa += static_cast<int>(*curr - 0x30);
-      curr++;
-      read++;
-      end_not_reached = (curr != s_end);
-    }
-
-    // We must make sure we actually got something.
-    if (read == 0) goto fail;
-  }
-
-  // We allow numbers of form "#", "###" etc.
-  if (!end_not_reached) goto assemble;
-
-  // Read the decimal part.
-  if (*curr == '.') {
-    curr++;
-    read = 1;
-    end_not_reached = (curr != s_end);
-    while (end_not_reached && IS_DIGIT(*curr)) {
-      static const double pow_lut[] = {
-          1.0, 0.1, 0.01, 0.001, 0.0001, 0.00001, 0.000001, 0.0000001,
-      };
-      const int lut_entries = sizeof pow_lut / sizeof pow_lut[0];
-
-      // NOTE: Don't use powf here, it will absolutely murder precision.
-      mantissa += static_cast<int>(*curr - 0x30) *
-                  (read < lut_entries ? pow_lut[read] : std::pow(10.0, -read));
-      read++;
-      curr++;
-      end_not_reached = (curr != s_end);
-    }
-  } else if (*curr == 'e' || *curr == 'E') {
-  } else {
-    goto assemble;
-  }
-
-  if (!end_not_reached) goto assemble;
-
-  // Read the exponent part.
-  if (*curr == 'e' || *curr == 'E') {
-    curr++;
-    // Figure out if a sign is present and if it is.
-    end_not_reached = (curr != s_end);
-    if (end_not_reached && (*curr == '+' || *curr == '-')) {
-      exp_sign = *curr;
-      curr++;
-    } else if (IS_DIGIT(*curr)) { /* Pass through. */
-    } else {
-      // Empty E is not allowed.
-      goto fail;
-    }
-
-    read = 0;
-    end_not_reached = (curr != s_end);
-    while (end_not_reached && IS_DIGIT(*curr)) {
-      // To avoid annoying MSVC's min/max macro definiton,
-      // Use hardcoded int max value
-      if (exponent >
-          (2147483647 / 10)) {  // 2147483647 = std::numeric_limits<int>::max()
-        // Integer overflow
-        goto fail;
-      }
-      exponent *= 10;
-      exponent += static_cast<int>(*curr - 0x30);
-      curr++;
-      read++;
-      end_not_reached = (curr != s_end);
-    }
-    exponent *= (exp_sign == '+' ? 1 : -1);
-    if (read == 0) goto fail;
-  }
-
-assemble:
-  *result = (sign == '+' ? 1 : -1) *
-            (exponent ? std::ldexp(mantissa * std::pow(5.0, exponent), exponent)
-                      : mantissa);
-  return true;
-fail:
-  return false;
-}
-
-static inline real_t parseReal(const char **token, double default_value = 0.0) {
-  (*token) += strspn((*token), " \t");
-  const char *end = (*token) + strcspn((*token), " \t\r");
-  double val = default_value;
-  tryParseDouble((*token), end, &val);
-  real_t f = static_cast<real_t>(val);
-  (*token) = end;
-  return f;
-}
-
-static inline bool parseReal(const char **token, real_t *out) {
-  (*token) += strspn((*token), " \t");
-  const char *end = (*token) + strcspn((*token), " \t\r");
-  double val;
-  bool ret = tryParseDouble((*token), end, &val);
-  if (ret) {
-    real_t f = static_cast<real_t>(val);
-    (*out) = f;
-  }
-  (*token) = end;
-  return ret;
-}
-
-static inline void parseReal2(real_t *x, real_t *y, const char **token,
-                              const double default_x = 0.0,
-                              const double default_y = 0.0) {
-  (*x) = parseReal(token, default_x);
-  (*y) = parseReal(token, default_y);
-}
-
-static inline void parseReal3(real_t *x, real_t *y, real_t *z,
-                              const char **token, const double default_x = 0.0,
-                              const double default_y = 0.0,
-                              const double default_z = 0.0) {
-  (*x) = parseReal(token, default_x);
-  (*y) = parseReal(token, default_y);
-  (*z) = parseReal(token, default_z);
-}
-
-#if 0  // not used
-static inline void parseV(real_t *x, real_t *y, real_t *z, real_t *w,
-                          const char **token, const double default_x = 0.0,
-                          const double default_y = 0.0,
-                          const double default_z = 0.0,
-                          const double default_w = 1.0) {
-  (*x) = parseReal(token, default_x);
-  (*y) = parseReal(token, default_y);
-  (*z) = parseReal(token, default_z);
-  (*w) = parseReal(token, default_w);
-}
-#endif
-
-// Extension: parse vertex with colors(6 items)
-// Return 3: xyz, 4: xyzw, 6: xyzrgb
-// `r`: red(case 6) or [w](case 4)
-static inline int parseVertexWithColor(real_t *x, real_t *y, real_t *z,
-                                       real_t *r, real_t *g, real_t *b,
-                                       const char **token,
-                                       const double default_x = 0.0,
-                                       const double default_y = 0.0,
-                                       const double default_z = 0.0) {
-  // TODO: Check error
-  (*x) = parseReal(token, default_x);
-  (*y) = parseReal(token, default_y);
-  (*z) = parseReal(token, default_z);
-
-  // - 4 components(x, y, z, w) ot 6 components
-  bool has_r = parseReal(token, r);
-
-  if (!has_r) {
-    (*r) = (*g) = (*b) = 1.0;
-    return 3;
-  }
-
-  bool has_g = parseReal(token, g);
-
-  if (!has_g) {
-    (*g) = (*b) = 1.0;
-    return 4;
-  }
-
-  bool has_b = parseReal(token, b);
-
-  if (!has_b) {
-    (*r) = (*g) = (*b) = 1.0;
-    return 3;  // treated as xyz
-  }
-
-  return 6;
-}
-
-static inline bool parseOnOff(const char **token, bool default_value = true) {
-  (*token) += strspn((*token), " \t");
-  const char *end = (*token) + strcspn((*token), " \t\r");
-
-  bool ret = default_value;
-  if ((0 == strncmp((*token), "on", 2))) {
-    ret = true;
-  } else if ((0 == strncmp((*token), "off", 3))) {
-    ret = false;
-  }
-
-  (*token) = end;
-  return ret;
-}
-
-static inline texture_type_t parseTextureType(
-    const char **token, texture_type_t default_value = TEXTURE_TYPE_NONE) {
-  (*token) += strspn((*token), " \t");
-  const char *end = (*token) + strcspn((*token), " \t\r");
-  texture_type_t ty = default_value;
-
-  if ((0 == strncmp((*token), "cube_top", strlen("cube_top")))) {
-    ty = TEXTURE_TYPE_CUBE_TOP;
-  } else if ((0 == strncmp((*token), "cube_bottom", strlen("cube_bottom")))) {
-    ty = TEXTURE_TYPE_CUBE_BOTTOM;
-  } else if ((0 == strncmp((*token), "cube_left", strlen("cube_left")))) {
-    ty = TEXTURE_TYPE_CUBE_LEFT;
-  } else if ((0 == strncmp((*token), "cube_right", strlen("cube_right")))) {
-    ty = TEXTURE_TYPE_CUBE_RIGHT;
-  } else if ((0 == strncmp((*token), "cube_front", strlen("cube_front")))) {
-    ty = TEXTURE_TYPE_CUBE_FRONT;
-  } else if ((0 == strncmp((*token), "cube_back", strlen("cube_back")))) {
-    ty = TEXTURE_TYPE_CUBE_BACK;
-  } else if ((0 == strncmp((*token), "sphere", strlen("sphere")))) {
-    ty = TEXTURE_TYPE_SPHERE;
-  }
-
-  (*token) = end;
-  return ty;
-}
-
-static tag_sizes parseTagTriple(const char **token) {
-  tag_sizes ts;
-
-  (*token) += strspn((*token), " \t");
-  ts.num_ints = atoi((*token));
-  (*token) += strcspn((*token), "/ \t\r");
-  if ((*token)[0] != '/') {
-    return ts;
-  }
-
-  (*token)++;  // Skip '/'
-
-  (*token) += strspn((*token), " \t");
-  ts.num_reals = atoi((*token));
-  (*token) += strcspn((*token), "/ \t\r");
-  if ((*token)[0] != '/') {
-    return ts;
-  }
-  (*token)++;  // Skip '/'
-
-  ts.num_strings = parseInt(token);
-
-  return ts;
-}
-
-// Parse triples with index offsets: i, i/j/k, i//k, i/j
-static bool parseTriple(const char **token, int vsize, int vnsize, int vtsize,
-                        vertex_index_t *ret, const warning_context &context) {
-  if (!ret) {
-    return false;
-  }
-
-  vertex_index_t vi(-1);
-
-  if (!fixIndex(atoi((*token)), vsize, &vi.v_idx, false, context)) {
-    return false;
-  }
-
-  (*token) += strcspn((*token), "/ \t\r");
-  if ((*token)[0] != '/') {
-    (*ret) = vi;
-    return true;
-  }
-  (*token)++;
-
-  // i//k
-  if ((*token)[0] == '/') {
-    (*token)++;
-    if (!fixIndex(atoi((*token)), vnsize, &vi.vn_idx, true, context)) {
-      return false;
-    }
-    (*token) += strcspn((*token), "/ \t\r");
-    (*ret) = vi;
-    return true;
-  }
-
-  // i/j/k or i/j
-  if (!fixIndex(atoi((*token)), vtsize, &vi.vt_idx, true, context)) {
-    return false;
-  }
-
-  (*token) += strcspn((*token), "/ \t\r");
-  if ((*token)[0] != '/') {
-    (*ret) = vi;
-    return true;
-  }
-
-  // i/j/k
-  (*token)++;  // skip '/'
-  if (!fixIndex(atoi((*token)), vnsize, &vi.vn_idx, true, context)) {
-    return false;
-  }
-  (*token) += strcspn((*token), "/ \t\r");
-
-  (*ret) = vi;
-
-  return true;
-}
-
-// Parse raw triples: i, i/j/k, i//k, i/j
-static vertex_index_t parseRawTriple(const char **token) {
-  vertex_index_t vi(static_cast<int>(0));  // 0 is an invalid index in OBJ
-
-  vi.v_idx = atoi((*token));
-  (*token) += strcspn((*token), "/ \t\r");
-  if ((*token)[0] != '/') {
-    return vi;
-  }
-  (*token)++;
-
-  // i//k
-  if ((*token)[0] == '/') {
-    (*token)++;
-    vi.vn_idx = atoi((*token));
-    (*token) += strcspn((*token), "/ \t\r");
-    return vi;
-  }
-
-  // i/j/k or i/j
-  vi.vt_idx = atoi((*token));
-  (*token) += strcspn((*token), "/ \t\r");
-  if ((*token)[0] != '/') {
-    return vi;
-  }
-
-  // i/j/k
-  (*token)++;  // skip '/'
-  vi.vn_idx = atoi((*token));
-  (*token) += strcspn((*token), "/ \t\r");
-  return vi;
-}
-
-bool ParseTextureNameAndOption(std::string *texname, texture_option_t *texopt,
-                               const char *linebuf) {
-  // @todo { write more robust lexer and parser. }
-  bool found_texname = false;
-  std::string texture_name;
-
-  const char *token = linebuf;  // Assume line ends with NULL
-
-  while (!IS_NEW_LINE((*token))) {
-    token += strspn(token, " \t");  // skip space
-    if ((0 == strncmp(token, "-blendu", 7)) && IS_SPACE((token[7]))) {
-      token += 8;
-      texopt->blendu = parseOnOff(&token, /* default */ true);
-    } else if ((0 == strncmp(token, "-blendv", 7)) && IS_SPACE((token[7]))) {
-      token += 8;
-      texopt->blendv = parseOnOff(&token, /* default */ true);
-    } else if ((0 == strncmp(token, "-clamp", 6)) && IS_SPACE((token[6]))) {
-      token += 7;
-      texopt->clamp = parseOnOff(&token, /* default */ true);
-    } else if ((0 == strncmp(token, "-boost", 6)) && IS_SPACE((token[6]))) {
-      token += 7;
-      texopt->sharpness = parseReal(&token, 1.0);
-    } else if ((0 == strncmp(token, "-bm", 3)) && IS_SPACE((token[3]))) {
-      token += 4;
-      texopt->bump_multiplier = parseReal(&token, 1.0);
-    } else if ((0 == strncmp(token, "-o", 2)) && IS_SPACE((token[2]))) {
-      token += 3;
-      parseReal3(&(texopt->origin_offset[0]), &(texopt->origin_offset[1]),
-                 &(texopt->origin_offset[2]), &token);
-    } else if ((0 == strncmp(token, "-s", 2)) && IS_SPACE((token[2]))) {
-      token += 3;
-      parseReal3(&(texopt->scale[0]), &(texopt->scale[1]), &(texopt->scale[2]),
-                 &token, 1.0, 1.0, 1.0);
-    } else if ((0 == strncmp(token, "-t", 2)) && IS_SPACE((token[2]))) {
-      token += 3;
-      parseReal3(&(texopt->turbulence[0]), &(texopt->turbulence[1]),
-                 &(texopt->turbulence[2]), &token);
-    } else if ((0 == strncmp(token, "-type", 5)) && IS_SPACE((token[5]))) {
-      token += 5;
-      texopt->type = parseTextureType((&token), TEXTURE_TYPE_NONE);
-    } else if ((0 == strncmp(token, "-texres", 7)) && IS_SPACE((token[7]))) {
-      token += 7;
-      // TODO(syoyo): Check if arg is int type.
-      texopt->texture_resolution = parseInt(&token);
-    } else if ((0 == strncmp(token, "-imfchan", 8)) && IS_SPACE((token[8]))) {
-      token += 9;
-      token += strspn(token, " \t");
-      const char *end = token + strcspn(token, " \t\r");
-      if ((end - token) == 1) {  // Assume one char for -imfchan
-        texopt->imfchan = (*token);
-      }
-      token = end;
-    } else if ((0 == strncmp(token, "-mm", 3)) && IS_SPACE((token[3]))) {
-      token += 4;
-      parseReal2(&(texopt->brightness), &(texopt->contrast), &token, 0.0, 1.0);
-    } else if ((0 == strncmp(token, "-colorspace", 11)) &&
-               IS_SPACE((token[11]))) {
-      token += 12;
-      texopt->colorspace = parseString(&token);
-    } else {
-// Assume texture filename
-#if 0
-      size_t len = strcspn(token, " \t\r");  // untile next space
-      texture_name = std::string(token, token + len);
-      token += len;
-
-      token += strspn(token, " \t");  // skip space
-#else
-      // Read filename until line end to parse filename containing whitespace
-      // TODO(syoyo): Support parsing texture option flag after the filename.
-      texture_name = std::string(token);
-      token += texture_name.length();
-#endif
-
-      found_texname = true;
-    }
-  }
-
-  if (found_texname) {
-    (*texname) = texture_name;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-static void InitTexOpt(texture_option_t *texopt, const bool is_bump) {
-  if (is_bump) {
-    texopt->imfchan = 'l';
-  } else {
-    texopt->imfchan = 'm';
-  }
-  texopt->bump_multiplier = static_cast<real_t>(1.0);
-  texopt->clamp = false;
-  texopt->blendu = true;
-  texopt->blendv = true;
-  texopt->sharpness = static_cast<real_t>(1.0);
-  texopt->brightness = static_cast<real_t>(0.0);
-  texopt->contrast = static_cast<real_t>(1.0);
-  texopt->origin_offset[0] = static_cast<real_t>(0.0);
-  texopt->origin_offset[1] = static_cast<real_t>(0.0);
-  texopt->origin_offset[2] = static_cast<real_t>(0.0);
-  texopt->scale[0] = static_cast<real_t>(1.0);
-  texopt->scale[1] = static_cast<real_t>(1.0);
-  texopt->scale[2] = static_cast<real_t>(1.0);
-  texopt->turbulence[0] = static_cast<real_t>(0.0);
-  texopt->turbulence[1] = static_cast<real_t>(0.0);
-  texopt->turbulence[2] = static_cast<real_t>(0.0);
-  texopt->texture_resolution = -1;
-  texopt->type = TEXTURE_TYPE_NONE;
-}
-
-static void InitMaterial(material_t *material) {
-  InitTexOpt(&material->ambient_texopt, /* is_bump */ false);
-  InitTexOpt(&material->diffuse_texopt, /* is_bump */ false);
-  InitTexOpt(&material->specular_texopt, /* is_bump */ false);
-  InitTexOpt(&material->specular_highlight_texopt, /* is_bump */ false);
-  InitTexOpt(&material->bump_texopt, /* is_bump */ true);
-  InitTexOpt(&material->displacement_texopt, /* is_bump */ false);
-  InitTexOpt(&material->alpha_texopt, /* is_bump */ false);
-  InitTexOpt(&material->reflection_texopt, /* is_bump */ false);
-  InitTexOpt(&material->roughness_texopt, /* is_bump */ false);
-  InitTexOpt(&material->metallic_texopt, /* is_bump */ false);
-  InitTexOpt(&material->sheen_texopt, /* is_bump */ false);
-  InitTexOpt(&material->emissive_texopt, /* is_bump */ false);
-  InitTexOpt(&material->normal_texopt,
-             /* is_bump */ false);  // @fixme { is_bump will be true? }
-  material->name = "";
-  material->ambient_texname = "";
-  material->diffuse_texname = "";
-  material->specular_texname = "";
-  material->specular_highlight_texname = "";
-  material->bump_texname = "";
-  material->displacement_texname = "";
-  material->reflection_texname = "";
-  material->alpha_texname = "";
-  for (int i = 0; i < 3; i++) {
-    material->ambient[i] = static_cast<real_t>(0.0);
-    material->diffuse[i] = static_cast<real_t>(0.0);
-    material->specular[i] = static_cast<real_t>(0.0);
-    material->transmittance[i] = static_cast<real_t>(0.0);
-    material->emission[i] = static_cast<real_t>(0.0);
-  }
-  material->illum = 0;
-  material->dissolve = static_cast<real_t>(1.0);
-  material->shininess = static_cast<real_t>(1.0);
-  material->ior = static_cast<real_t>(1.0);
-
-  material->roughness = static_cast<real_t>(0.0);
-  material->metallic = static_cast<real_t>(0.0);
-  material->sheen = static_cast<real_t>(0.0);
-  material->clearcoat_thickness = static_cast<real_t>(0.0);
-  material->clearcoat_roughness = static_cast<real_t>(0.0);
-  material->anisotropy_rotation = static_cast<real_t>(0.0);
-  material->anisotropy = static_cast<real_t>(0.0);
-  material->roughness_texname = "";
-  material->metallic_texname = "";
-  material->sheen_texname = "";
-  material->emissive_texname = "";
-  material->normal_texname = "";
-
-  material->unknown_parameter.clear();
-}
-
-// code from https://wrf.ecse.rpi.edu//Research/Short_Notes/pnpoly.html
-template <typename T>
-static int pnpoly(int nvert, T *vertx, T *verty, T testx, T testy) {
-  int i, j, c = 0;
-  for (i = 0, j = nvert - 1; i < nvert; j = i++) {
-    if (((verty[i] > testy) != (verty[j] > testy)) &&
-        (testx <
-         (vertx[j] - vertx[i]) * (testy - verty[i]) / (verty[j] - verty[i]) +
-             vertx[i]))
-      c = !c;
-  }
-  return c;
-}
-
-struct TinyObjPoint {
-  real_t x, y, z;
-  TinyObjPoint() : x(0), y(0), z(0) {}
-  TinyObjPoint(real_t x_, real_t y_, real_t z_) : x(x_), y(y_), z(z_) {}
-};
-
-inline TinyObjPoint cross(const TinyObjPoint &v1, const TinyObjPoint &v2) {
-  return TinyObjPoint(v1.y * v2.z - v1.z * v2.y, v1.z * v2.x - v1.x * v2.z,
-                      v1.x * v2.y - v1.y * v2.x);
-}
-
-inline real_t dot(const TinyObjPoint &v1, const TinyObjPoint &v2) {
-  return (v1.x * v2.x + v1.y * v2.y + v1.z * v2.z);
-}
-
-inline real_t GetLength(TinyObjPoint &e) {
-  return std::sqrt(e.x * e.x + e.y * e.y + e.z * e.z);
-}
-
-inline TinyObjPoint Normalize(TinyObjPoint e) {
-  real_t inv_length = real_t(1) / GetLength(e);
-  return TinyObjPoint(e.x * inv_length, e.y * inv_length, e.z * inv_length);
-}
-
-inline TinyObjPoint WorldToLocal(const TinyObjPoint &a, const TinyObjPoint &u,
-                                 const TinyObjPoint &v, const TinyObjPoint &w) {
-  return TinyObjPoint(dot(a, u), dot(a, v), dot(a, w));
-}
-
-// TODO(syoyo): refactor function.
-static bool exportGroupsToShape(shape_t *shape, const PrimGroup &prim_group,
-                                const std::vector<tag_t> &tags,
-                                const int material_id, const std::string &name,
-                                bool triangulate, const std::vector<real_t> &v,
-                                std::string *warn) {
-  if (prim_group.IsEmpty()) {
-    return false;
-  }
-
-  shape->name = name;
-
-  // polygon
-  if (!prim_group.faceGroup.empty()) {
-    // Flatten vertices and indices
-    for (size_t i = 0; i < prim_group.faceGroup.size(); i++) {
-      const face_t &face = prim_group.faceGroup[i];
-
-      size_t npolys = face.vertex_indices.size();
-
-      if (npolys < 3) {
-        // Face must have 3+ vertices.
-        if (warn) {
-          (*warn) += "Degenerated face found\n.";
-        }
-        continue;
-      }
-
-      if (triangulate && npolys != 3) {
-        if (npolys == 4) {
-          vertex_index_t i0 = face.vertex_indices[0];
-          vertex_index_t i1 = face.vertex_indices[1];
-          vertex_index_t i2 = face.vertex_indices[2];
-          vertex_index_t i3 = face.vertex_indices[3];
-
-          size_t vi0 = size_t(i0.v_idx);
-          size_t vi1 = size_t(i1.v_idx);
-          size_t vi2 = size_t(i2.v_idx);
-          size_t vi3 = size_t(i3.v_idx);
-
-          if (((3 * vi0 + 2) >= v.size()) || ((3 * vi1 + 2) >= v.size()) ||
-              ((3 * vi2 + 2) >= v.size()) || ((3 * vi3 + 2) >= v.size())) {
-            // Invalid triangle.
-            // FIXME(syoyo): Is it ok to simply skip this invalid triangle?
-            if (warn) {
-              (*warn) += "Face with invalid vertex index found.\n";
-            }
-            continue;
-          }
-
-          real_t v0x = v[vi0 * 3 + 0];
-          real_t v0y = v[vi0 * 3 + 1];
-          real_t v0z = v[vi0 * 3 + 2];
-          real_t v1x = v[vi1 * 3 + 0];
-          real_t v1y = v[vi1 * 3 + 1];
-          real_t v1z = v[vi1 * 3 + 2];
-          real_t v2x = v[vi2 * 3 + 0];
-          real_t v2y = v[vi2 * 3 + 1];
-          real_t v2z = v[vi2 * 3 + 2];
-          real_t v3x = v[vi3 * 3 + 0];
-          real_t v3y = v[vi3 * 3 + 1];
-          real_t v3z = v[vi3 * 3 + 2];
-
-          // There are two candidates to split the quad into two triangles.
-          //
-          // Choose the shortest edge.
-          // TODO: Is it better to determine the edge to split by calculating
-          // the area of each triangle?
-          //
-          // +---+
-          // |\  |
-          // | \ |
-          // |  \|
-          // +---+
-          //
-          // +---+
-          // |  /|
-          // | / |
-          // |/  |
-          // +---+
-
-          real_t e02x = v2x - v0x;
-          real_t e02y = v2y - v0y;
-          real_t e02z = v2z - v0z;
-          real_t e13x = v3x - v1x;
-          real_t e13y = v3y - v1y;
-          real_t e13z = v3z - v1z;
-
-          real_t sqr02 = e02x * e02x + e02y * e02y + e02z * e02z;
-          real_t sqr13 = e13x * e13x + e13y * e13y + e13z * e13z;
-
-          index_t idx0, idx1, idx2, idx3;
-
-          idx0.vertex_index = i0.v_idx;
-          idx0.normal_index = i0.vn_idx;
-          idx0.texcoord_index = i0.vt_idx;
-          idx1.vertex_index = i1.v_idx;
-          idx1.normal_index = i1.vn_idx;
-          idx1.texcoord_index = i1.vt_idx;
-          idx2.vertex_index = i2.v_idx;
-          idx2.normal_index = i2.vn_idx;
-          idx2.texcoord_index = i2.vt_idx;
-          idx3.vertex_index = i3.v_idx;
-          idx3.normal_index = i3.vn_idx;
-          idx3.texcoord_index = i3.vt_idx;
-
-          if (sqr02 < sqr13) {
-            // [0, 1, 2], [0, 2, 3]
-            shape->mesh.indices.push_back(idx0);
-            shape->mesh.indices.push_back(idx1);
-            shape->mesh.indices.push_back(idx2);
-
-            shape->mesh.indices.push_back(idx0);
-            shape->mesh.indices.push_back(idx2);
-            shape->mesh.indices.push_back(idx3);
-          } else {
-            // [0, 1, 3], [1, 2, 3]
-            shape->mesh.indices.push_back(idx0);
-            shape->mesh.indices.push_back(idx1);
-            shape->mesh.indices.push_back(idx3);
-
-            shape->mesh.indices.push_back(idx1);
-            shape->mesh.indices.push_back(idx2);
-            shape->mesh.indices.push_back(idx3);
-          }
-
-          // Two triangle faces
-          shape->mesh.num_face_vertices.push_back(3);
-          shape->mesh.num_face_vertices.push_back(3);
-
-          shape->mesh.material_ids.push_back(material_id);
-          shape->mesh.material_ids.push_back(material_id);
-
-          shape->mesh.smoothing_group_ids.push_back(face.smoothing_group_id);
-          shape->mesh.smoothing_group_ids.push_back(face.smoothing_group_id);
-
-        } else {
-#ifdef TINYOBJLOADER_USE_MAPBOX_EARCUT
-          vertex_index_t i0 = face.vertex_indices[0];
-          vertex_index_t i0_2 = i0;
-
-          // TMW change: Find the normal axis of the polygon using Newell's
-          // method
-          TinyObjPoint n;
-          for (size_t k = 0; k < npolys; ++k) {
-            i0 = face.vertex_indices[k % npolys];
-            size_t vi0 = size_t(i0.v_idx);
-
-            size_t j = (k + 1) % npolys;
-            i0_2 = face.vertex_indices[j];
-            size_t vi0_2 = size_t(i0_2.v_idx);
-
-            real_t v0x = v[vi0 * 3 + 0];
-            real_t v0y = v[vi0 * 3 + 1];
-            real_t v0z = v[vi0 * 3 + 2];
-
-            real_t v0x_2 = v[vi0_2 * 3 + 0];
-            real_t v0y_2 = v[vi0_2 * 3 + 1];
-            real_t v0z_2 = v[vi0_2 * 3 + 2];
-
-            const TinyObjPoint point1(v0x, v0y, v0z);
-            const TinyObjPoint point2(v0x_2, v0y_2, v0z_2);
-
-            TinyObjPoint a(point1.x - point2.x, point1.y - point2.y,
-                           point1.z - point2.z);
-            TinyObjPoint b(point1.x + point2.x, point1.y + point2.y,
-                           point1.z + point2.z);
-
-            n.x += (a.y * b.z);
-            n.y += (a.z * b.x);
-            n.z += (a.x * b.y);
-          }
-          real_t length_n = GetLength(n);
-          // Check if zero length normal
-          if (length_n <= 0) {
-            continue;
-          }
-          // Negative is to flip the normal to the correct direction
-          real_t inv_length = -real_t(1.0) / length_n;
-          n.x *= inv_length;
-          n.y *= inv_length;
-          n.z *= inv_length;
-
-          TinyObjPoint axis_w, axis_v, axis_u;
-          axis_w = n;
-          TinyObjPoint a;
-          if (std::fabs(axis_w.x) > real_t(0.9999999)) {
-            a = TinyObjPoint(0, 1, 0);
-          } else {
-            a = TinyObjPoint(1, 0, 0);
-          }
-          axis_v = Normalize(cross(axis_w, a));
-          axis_u = cross(axis_w, axis_v);
-          using Point = std::array<real_t, 2>;
-
-          // first polyline define the main polygon.
-          // following polylines define holes(not used in tinyobj).
-          std::vector<std::vector<Point> > polygon;
-
-          std::vector<Point> polyline;
-
-          // TMW change: Find best normal and project v0x and v0y to those
-          // coordinates, instead of picking a plane aligned with an axis (which
-          // can flip polygons).
-
-          // Fill polygon data(facevarying vertices).
-          for (size_t k = 0; k < npolys; k++) {
-            i0 = face.vertex_indices[k];
-            size_t vi0 = size_t(i0.v_idx);
-
-            assert(((3 * vi0 + 2) < v.size()));
-
-            real_t v0x = v[vi0 * 3 + 0];
-            real_t v0y = v[vi0 * 3 + 1];
-            real_t v0z = v[vi0 * 3 + 2];
-
-            TinyObjPoint polypoint(v0x, v0y, v0z);
-            TinyObjPoint loc = WorldToLocal(polypoint, axis_u, axis_v, axis_w);
-
-            polyline.push_back({loc.x, loc.y});
-          }
-
-          polygon.push_back(polyline);
-          std::vector<uint32_t> indices = mapbox::earcut<uint32_t>(polygon);
-          // => result = 3 * faces, clockwise
-
-          assert(indices.size() % 3 == 0);
-
-          // Reconstruct vertex_index_t
-          for (size_t k = 0; k < indices.size() / 3; k++) {
-            {
-              index_t idx0, idx1, idx2;
-              idx0.vertex_index = face.vertex_indices[indices[3 * k + 0]].v_idx;
-              idx0.normal_index =
-                  face.vertex_indices[indices[3 * k + 0]].vn_idx;
-              idx0.texcoord_index =
-                  face.vertex_indices[indices[3 * k + 0]].vt_idx;
-              idx1.vertex_index = face.vertex_indices[indices[3 * k + 1]].v_idx;
-              idx1.normal_index =
-                  face.vertex_indices[indices[3 * k + 1]].vn_idx;
-              idx1.texcoord_index =
-                  face.vertex_indices[indices[3 * k + 1]].vt_idx;
-              idx2.vertex_index = face.vertex_indices[indices[3 * k + 2]].v_idx;
-              idx2.normal_index =
-                  face.vertex_indices[indices[3 * k + 2]].vn_idx;
-              idx2.texcoord_index =
-                  face.vertex_indices[indices[3 * k + 2]].vt_idx;
-
-              shape->mesh.indices.push_back(idx0);
-              shape->mesh.indices.push_back(idx1);
-              shape->mesh.indices.push_back(idx2);
-
-              shape->mesh.num_face_vertices.push_back(3);
-              shape->mesh.material_ids.push_back(material_id);
-              shape->mesh.smoothing_group_ids.push_back(
-                  face.smoothing_group_id);
-            }
-          }
-
-#else  // Built-in ear clipping triangulation
-          vertex_index_t i0 = face.vertex_indices[0];
-          vertex_index_t i1(-1);
-          vertex_index_t i2 = face.vertex_indices[1];
-
-          // find the two axes to work in
-          size_t axes[2] = {1, 2};
-          for (size_t k = 0; k < npolys; ++k) {
-            i0 = face.vertex_indices[(k + 0) % npolys];
-            i1 = face.vertex_indices[(k + 1) % npolys];
-            i2 = face.vertex_indices[(k + 2) % npolys];
-            size_t vi0 = size_t(i0.v_idx);
-            size_t vi1 = size_t(i1.v_idx);
-            size_t vi2 = size_t(i2.v_idx);
-
-            if (((3 * vi0 + 2) >= v.size()) || ((3 * vi1 + 2) >= v.size()) ||
-                ((3 * vi2 + 2) >= v.size())) {
-              // Invalid triangle.
-              // FIXME(syoyo): Is it ok to simply skip this invalid triangle?
-              continue;
-            }
-            real_t v0x = v[vi0 * 3 + 0];
-            real_t v0y = v[vi0 * 3 + 1];
-            real_t v0z = v[vi0 * 3 + 2];
-            real_t v1x = v[vi1 * 3 + 0];
-            real_t v1y = v[vi1 * 3 + 1];
-            real_t v1z = v[vi1 * 3 + 2];
-            real_t v2x = v[vi2 * 3 + 0];
-            real_t v2y = v[vi2 * 3 + 1];
-            real_t v2z = v[vi2 * 3 + 2];
-            real_t e0x = v1x - v0x;
-            real_t e0y = v1y - v0y;
-            real_t e0z = v1z - v0z;
-            real_t e1x = v2x - v1x;
-            real_t e1y = v2y - v1y;
-            real_t e1z = v2z - v1z;
-            real_t cx = std::fabs(e0y * e1z - e0z * e1y);
-            real_t cy = std::fabs(e0z * e1x - e0x * e1z);
-            real_t cz = std::fabs(e0x * e1y - e0y * e1x);
-            const real_t epsilon = std::numeric_limits<real_t>::epsilon();
-            // std::cout << "cx " << cx << ", cy " << cy << ", cz " << cz <<
-            // "\n";
-            if (cx > epsilon || cy > epsilon || cz > epsilon) {
-              // std::cout << "corner\n";
-              // found a corner
-              if (cx > cy && cx > cz) {
-                // std::cout << "pattern0\n";
-              } else {
-                // std::cout << "axes[0] = 0\n";
-                axes[0] = 0;
-                if (cz > cx && cz > cy) {
-                  // std::cout << "axes[1] = 1\n";
-                  axes[1] = 1;
-                }
-              }
-              break;
-            }
-          }
-
-          face_t remainingFace = face;  // copy
-          size_t guess_vert = 0;
-          vertex_index_t ind[3];
-          real_t vx[3];
-          real_t vy[3];
-
-          // How many iterations can we do without decreasing the remaining
-          // vertices.
-          size_t remainingIterations = face.vertex_indices.size();
-          size_t previousRemainingVertices =
-              remainingFace.vertex_indices.size();
-
-          while (remainingFace.vertex_indices.size() > 3 &&
-                 remainingIterations > 0) {
-            // std::cout << "remainingIterations " << remainingIterations <<
-            // "\n";
-
-            npolys = remainingFace.vertex_indices.size();
-            if (guess_vert >= npolys) {
-              guess_vert -= npolys;
-            }
-
-            if (previousRemainingVertices != npolys) {
-              // The number of remaining vertices decreased. Reset counters.
-              previousRemainingVertices = npolys;
-              remainingIterations = npolys;
-            } else {
-              // We didn't consume a vertex on previous iteration, reduce the
-              // available iterations.
-              remainingIterations--;
-            }
-
-            for (size_t k = 0; k < 3; k++) {
-              ind[k] = remainingFace.vertex_indices[(guess_vert + k) % npolys];
-              size_t vi = size_t(ind[k].v_idx);
-              if (((vi * 3 + axes[0]) >= v.size()) ||
-                  ((vi * 3 + axes[1]) >= v.size())) {
-                // ???
-                vx[k] = static_cast<real_t>(0.0);
-                vy[k] = static_cast<real_t>(0.0);
-              } else {
-                vx[k] = v[vi * 3 + axes[0]];
-                vy[k] = v[vi * 3 + axes[1]];
-              }
-            }
-
-            //
-            // area is calculated per face
-            //
-            real_t e0x = vx[1] - vx[0];
-            real_t e0y = vy[1] - vy[0];
-            real_t e1x = vx[2] - vx[1];
-            real_t e1y = vy[2] - vy[1];
-            real_t cross = e0x * e1y - e0y * e1x;
-            // std::cout << "axes = " << axes[0] << ", " << axes[1] << "\n";
-            // std::cout << "e0x, e0y, e1x, e1y " << e0x << ", " << e0y << ", "
-            // << e1x << ", " << e1y << "\n";
-
-            real_t area =
-                (vx[0] * vy[1] - vy[0] * vx[1]) * static_cast<real_t>(0.5);
-            // std::cout << "cross " << cross << ", area " << area << "\n";
-            // if an internal angle
-            if (cross * area < static_cast<real_t>(0.0)) {
-              // std::cout << "internal \n";
-              guess_vert += 1;
-              // std::cout << "guess vert : " << guess_vert << "\n";
-              continue;
-            }
-
-            // check all other verts in case they are inside this triangle
-            bool overlap = false;
-            for (size_t otherVert = 3; otherVert < npolys; ++otherVert) {
-              size_t idx = (guess_vert + otherVert) % npolys;
-
-              if (idx >= remainingFace.vertex_indices.size()) {
-                // std::cout << "???0\n";
-                // ???
-                continue;
-              }
-
-              size_t ovi = size_t(remainingFace.vertex_indices[idx].v_idx);
-
-              if (((ovi * 3 + axes[0]) >= v.size()) ||
-                  ((ovi * 3 + axes[1]) >= v.size())) {
-                // std::cout << "???1\n";
-                // ???
-                continue;
-              }
-              real_t tx = v[ovi * 3 + axes[0]];
-              real_t ty = v[ovi * 3 + axes[1]];
-              if (pnpoly(3, vx, vy, tx, ty)) {
-                // std::cout << "overlap\n";
-                overlap = true;
-                break;
-              }
-            }
-
-            if (overlap) {
-              // std::cout << "overlap2\n";
-              guess_vert += 1;
-              continue;
-            }
-
-            // this triangle is an ear
-            {
-              index_t idx0, idx1, idx2;
-              idx0.vertex_index = ind[0].v_idx;
-              idx0.normal_index = ind[0].vn_idx;
-              idx0.texcoord_index = ind[0].vt_idx;
-              idx1.vertex_index = ind[1].v_idx;
-              idx1.normal_index = ind[1].vn_idx;
-              idx1.texcoord_index = ind[1].vt_idx;
-              idx2.vertex_index = ind[2].v_idx;
-              idx2.normal_index = ind[2].vn_idx;
-              idx2.texcoord_index = ind[2].vt_idx;
-
-              shape->mesh.indices.push_back(idx0);
-              shape->mesh.indices.push_back(idx1);
-              shape->mesh.indices.push_back(idx2);
-
-              shape->mesh.num_face_vertices.push_back(3);
-              shape->mesh.material_ids.push_back(material_id);
-              shape->mesh.smoothing_group_ids.push_back(
-                  face.smoothing_group_id);
-            }
-
-            // remove v1 from the list
-            size_t removed_vert_index = (guess_vert + 1) % npolys;
-            while (removed_vert_index + 1 < npolys) {
-              remainingFace.vertex_indices[removed_vert_index] =
-                  remainingFace.vertex_indices[removed_vert_index + 1];
-              removed_vert_index += 1;
-            }
-            remainingFace.vertex_indices.pop_back();
-          }
-
-          // std::cout << "remainingFace.vi.size = " <<
-          // remainingFace.vertex_indices.size() << "\n";
-          if (remainingFace.vertex_indices.size() == 3) {
-            i0 = remainingFace.vertex_indices[0];
-            i1 = remainingFace.vertex_indices[1];
-            i2 = remainingFace.vertex_indices[2];
-            {
-              index_t idx0, idx1, idx2;
-              idx0.vertex_index = i0.v_idx;
-              idx0.normal_index = i0.vn_idx;
-              idx0.texcoord_index = i0.vt_idx;
-              idx1.vertex_index = i1.v_idx;
-              idx1.normal_index = i1.vn_idx;
-              idx1.texcoord_index = i1.vt_idx;
-              idx2.vertex_index = i2.v_idx;
-              idx2.normal_index = i2.vn_idx;
-              idx2.texcoord_index = i2.vt_idx;
-
-              shape->mesh.indices.push_back(idx0);
-              shape->mesh.indices.push_back(idx1);
-              shape->mesh.indices.push_back(idx2);
-
-              shape->mesh.num_face_vertices.push_back(3);
-              shape->mesh.material_ids.push_back(material_id);
-              shape->mesh.smoothing_group_ids.push_back(
-                  face.smoothing_group_id);
-            }
-          }
-#endif
-        }  // npolys
-      } else {
-        for (size_t k = 0; k < npolys; k++) {
-          index_t idx;
-          idx.vertex_index = face.vertex_indices[k].v_idx;
-          idx.normal_index = face.vertex_indices[k].vn_idx;
-          idx.texcoord_index = face.vertex_indices[k].vt_idx;
-          shape->mesh.indices.push_back(idx);
-        }
-
-        shape->mesh.num_face_vertices.push_back(
-            static_cast<unsigned int>(npolys));
-        shape->mesh.material_ids.push_back(material_id);  // per face
-        shape->mesh.smoothing_group_ids.push_back(
-            face.smoothing_group_id);  // per face
-      }
-    }
-
-    shape->mesh.tags = tags;
-  }
-
-  // line
-  if (!prim_group.lineGroup.empty()) {
-    // Flatten indices
-    for (size_t i = 0; i < prim_group.lineGroup.size(); i++) {
-      for (size_t j = 0; j < prim_group.lineGroup[i].vertex_indices.size();
-           j++) {
-        const vertex_index_t &vi = prim_group.lineGroup[i].vertex_indices[j];
-
-        index_t idx;
-        idx.vertex_index = vi.v_idx;
-        idx.normal_index = vi.vn_idx;
-        idx.texcoord_index = vi.vt_idx;
-
-        shape->lines.indices.push_back(idx);
-      }
-
-      shape->lines.num_line_vertices.push_back(
-          int(prim_group.lineGroup[i].vertex_indices.size()));
-    }
-  }
-
-  // points
-  if (!prim_group.pointsGroup.empty()) {
-    // Flatten & convert indices
-    for (size_t i = 0; i < prim_group.pointsGroup.size(); i++) {
-      for (size_t j = 0; j < prim_group.pointsGroup[i].vertex_indices.size();
-           j++) {
-        const vertex_index_t &vi = prim_group.pointsGroup[i].vertex_indices[j];
-
-        index_t idx;
-        idx.vertex_index = vi.v_idx;
-        idx.normal_index = vi.vn_idx;
-        idx.texcoord_index = vi.vt_idx;
-
-        shape->points.indices.push_back(idx);
-      }
-    }
-  }
-
-  return true;
-}
-
-// Split a string with specified delimiter character and escape character.
-// https://rosettacode.org/wiki/Tokenize_a_string_with_escaping#C.2B.2B
-static void SplitString(const std::string &s, char delim, char escape,
-                        std::vector<std::string> &elems) {
-  std::string token;
-
-  bool escaping = false;
-  for (size_t i = 0; i < s.size(); ++i) {
-    char ch = s[i];
-    if (escaping) {
-      escaping = false;
-    } else if (ch == escape) {
-      escaping = true;
-      continue;
-    } else if (ch == delim) {
-      if (!token.empty()) {
-        elems.push_back(token);
-      }
-      token.clear();
-      continue;
-    }
-    token += ch;
-  }
-
-  elems.push_back(token);
-}
-
-static std::string JoinPath(const std::string &dir,
-                            const std::string &filename) {
-  if (dir.empty()) {
-    return filename;
-  } else {
-    // check '/'
-    char lastChar = *dir.rbegin();
-    if (lastChar != '/') {
-      return dir + std::string("/") + filename;
-    } else {
-      return dir + filename;
-    }
-  }
-}
-
-void LoadMtl(std::map<std::string, int> *material_map,
-             std::vector<material_t> *materials, std::istream *inStream,
-             std::string *warning, std::string *err) {
-  (void)err;
-
-  // Create a default material anyway.
-  material_t material;
-  InitMaterial(&material);
-
-  // Issue 43. `d` wins against `Tr` since `Tr` is not in the MTL specification.
-  bool has_d = false;
-  bool has_tr = false;
-
-  // has_kd is used to set a default diffuse value when map_Kd is present
-  // and Kd is not.
-  bool has_kd = false;
-
-  std::stringstream warn_ss;
-
-  size_t line_no = 0;
-  std::string linebuf;
-  while (inStream->peek() != -1) {
-    safeGetline(*inStream, linebuf);
-    line_no++;
-
-    // Trim trailing whitespace.
-    if (linebuf.size() > 0) {
-      linebuf = linebuf.substr(0, linebuf.find_last_not_of(" \t") + 1);
-    }
-
-    // Trim newline '\r\n' or '\n'
-    if (linebuf.size() > 0) {
-      if (linebuf[linebuf.size() - 1] == '\n')
-        linebuf.erase(linebuf.size() - 1);
-    }
-    if (linebuf.size() > 0) {
-      if (linebuf[linebuf.size() - 1] == '\r')
-        linebuf.erase(linebuf.size() - 1);
-    }
-
-    // Skip if empty line.
-    if (linebuf.empty()) {
-      continue;
-    }
-
-    // Skip leading space.
-    const char *token = linebuf.c_str();
-    token += strspn(token, " \t");
-
-    assert(token);
-    if (token[0] == '\0') continue;  // empty line
-
-    if (token[0] == '#') continue;  // comment line
-
-    // new mtl
-    if ((0 == strncmp(token, "newmtl", 6)) && IS_SPACE((token[6]))) {
-      // flush previous material.
-      if (!material.name.empty()) {
-        material_map->insert(std::pair<std::string, int>(
-            material.name, static_cast<int>(materials->size())));
-        materials->push_back(material);
-      }
-
-      // initial temporary material
-      InitMaterial(&material);
-
-      has_d = false;
-      has_tr = false;
-
-      // set new mtl name
-      token += 7;
-      {
-        std::string namebuf = parseString(&token);
-        // TODO: empty name check?
-        if (namebuf.empty()) {
-          if (warning) {
-            (*warning) += "empty material name in `newmtl`\n";
-          }
-        }
-        material.name = namebuf;
-      }
-      continue;
-    }
-
-    // ambient
-    if (token[0] == 'K' && token[1] == 'a' && IS_SPACE((token[2]))) {
-      token += 2;
-      real_t r, g, b;
-      parseReal3(&r, &g, &b, &token);
-      material.ambient[0] = r;
-      material.ambient[1] = g;
-      material.ambient[2] = b;
-      continue;
-    }
-
-    // diffuse
-    if (token[0] == 'K' && token[1] == 'd' && IS_SPACE((token[2]))) {
-      token += 2;
-      real_t r, g, b;
-      parseReal3(&r, &g, &b, &token);
-      material.diffuse[0] = r;
-      material.diffuse[1] = g;
-      material.diffuse[2] = b;
-      has_kd = true;
-      continue;
-    }
-
-    // specular
-    if (token[0] == 'K' && token[1] == 's' && IS_SPACE((token[2]))) {
-      token += 2;
-      real_t r, g, b;
-      parseReal3(&r, &g, &b, &token);
-      material.specular[0] = r;
-      material.specular[1] = g;
-      material.specular[2] = b;
-      continue;
-    }
-
-    // transmittance
-    if ((token[0] == 'K' && token[1] == 't' && IS_SPACE((token[2]))) ||
-        (token[0] == 'T' && token[1] == 'f' && IS_SPACE((token[2])))) {
-      token += 2;
-      real_t r, g, b;
-      parseReal3(&r, &g, &b, &token);
-      material.transmittance[0] = r;
-      material.transmittance[1] = g;
-      material.transmittance[2] = b;
-      continue;
-    }
-
-    // ior(index of refraction)
-    if (token[0] == 'N' && token[1] == 'i' && IS_SPACE((token[2]))) {
-      token += 2;
-      material.ior = parseReal(&token);
-      continue;
-    }
-
-    // emission
-    if (token[0] == 'K' && token[1] == 'e' && IS_SPACE(token[2])) {
-      token += 2;
-      real_t r, g, b;
-      parseReal3(&r, &g, &b, &token);
-      material.emission[0] = r;
-      material.emission[1] = g;
-      material.emission[2] = b;
-      continue;
-    }
-
-    // shininess
-    if (token[0] == 'N' && token[1] == 's' && IS_SPACE(token[2])) {
-      token += 2;
-      material.shininess = parseReal(&token);
-      continue;
-    }
-
-    // illum model
-    if (0 == strncmp(token, "illum", 5) && IS_SPACE(token[5])) {
-      token += 6;
-      material.illum = parseInt(&token);
-      continue;
-    }
-
-    // dissolve
-    if ((token[0] == 'd' && IS_SPACE(token[1]))) {
-      token += 1;
-      material.dissolve = parseReal(&token);
-
-      if (has_tr) {
-        warn_ss << "Both `d` and `Tr` parameters defined for \""
-                << material.name
-                << "\". Use the value of `d` for dissolve (line " << line_no
-                << " in .mtl.)\n";
-      }
-      has_d = true;
-      continue;
-    }
-    if (token[0] == 'T' && token[1] == 'r' && IS_SPACE(token[2])) {
-      token += 2;
-      if (has_d) {
-        // `d` wins. Ignore `Tr` value.
-        warn_ss << "Both `d` and `Tr` parameters defined for \""
-                << material.name
-                << "\". Use the value of `d` for dissolve (line " << line_no
-                << " in .mtl.)\n";
-      } else {
-        // We invert value of Tr(assume Tr is in range [0, 1])
-        // NOTE: Interpretation of Tr is application(exporter) dependent. For
-        // some application(e.g. 3ds max obj exporter), Tr = d(Issue 43)
-        material.dissolve = static_cast<real_t>(1.0) - parseReal(&token);
-      }
-      has_tr = true;
-      continue;
-    }
-
-    // PBR: roughness
-    if (token[0] == 'P' && token[1] == 'r' && IS_SPACE(token[2])) {
-      token += 2;
-      material.roughness = parseReal(&token);
-      continue;
-    }
-
-    // PBR: metallic
-    if (token[0] == 'P' && token[1] == 'm' && IS_SPACE(token[2])) {
-      token += 2;
-      material.metallic = parseReal(&token);
-      continue;
-    }
-
-    // PBR: sheen
-    if (token[0] == 'P' && token[1] == 's' && IS_SPACE(token[2])) {
-      token += 2;
-      material.sheen = parseReal(&token);
-      continue;
-    }
-
-    // PBR: clearcoat thickness
-    if (token[0] == 'P' && token[1] == 'c' && IS_SPACE(token[2])) {
-      token += 2;
-      material.clearcoat_thickness = parseReal(&token);
-      continue;
-    }
-
-    // PBR: clearcoat roughness
-    if ((0 == strncmp(token, "Pcr", 3)) && IS_SPACE(token[3])) {
-      token += 4;
-      material.clearcoat_roughness = parseReal(&token);
-      continue;
-    }
-
-    // PBR: anisotropy
-    if ((0 == strncmp(token, "aniso", 5)) && IS_SPACE(token[5])) {
-      token += 6;
-      material.anisotropy = parseReal(&token);
-      continue;
-    }
-
-    // PBR: anisotropy rotation
-    if ((0 == strncmp(token, "anisor", 6)) && IS_SPACE(token[6])) {
-      token += 7;
-      material.anisotropy_rotation = parseReal(&token);
-      continue;
-    }
-
-    // ambient or ambient occlusion texture
-    if ((0 == strncmp(token, "map_Ka", 6)) && IS_SPACE(token[6])) {
-      token += 7;
-      ParseTextureNameAndOption(&(material.ambient_texname),
-                                &(material.ambient_texopt), token);
-      continue;
-    }
-
-    // diffuse texture
-    if ((0 == strncmp(token, "map_Kd", 6)) && IS_SPACE(token[6])) {
-      token += 7;
-      ParseTextureNameAndOption(&(material.diffuse_texname),
-                                &(material.diffuse_texopt), token);
-
-      // Set a decent diffuse default value if a diffuse texture is specified
-      // without a matching Kd value.
-      if (!has_kd) {
-        material.diffuse[0] = static_cast<real_t>(0.6);
-        material.diffuse[1] = static_cast<real_t>(0.6);
-        material.diffuse[2] = static_cast<real_t>(0.6);
-      }
-
-      continue;
-    }
-
-    // specular texture
-    if ((0 == strncmp(token, "map_Ks", 6)) && IS_SPACE(token[6])) {
-      token += 7;
-      ParseTextureNameAndOption(&(material.specular_texname),
-                                &(material.specular_texopt), token);
-      continue;
-    }
-
-    // specular highlight texture
-    if ((0 == strncmp(token, "map_Ns", 6)) && IS_SPACE(token[6])) {
-      token += 7;
-      ParseTextureNameAndOption(&(material.specular_highlight_texname),
-                                &(material.specular_highlight_texopt), token);
-      continue;
-    }
-
-    // bump texture
-    if (((0 == strncmp(token, "map_bump", 8)) ||
-         (0 == strncmp(token, "map_Bump", 8))) &&
-        IS_SPACE(token[8])) {
-      token += 9;
-      ParseTextureNameAndOption(&(material.bump_texname),
-                                &(material.bump_texopt), token);
-      continue;
-    }
-
-    // bump texture
-    if ((0 == strncmp(token, "bump", 4)) && IS_SPACE(token[4])) {
-      token += 5;
-      ParseTextureNameAndOption(&(material.bump_texname),
-                                &(material.bump_texopt), token);
-      continue;
-    }
-
-    // alpha texture
-    if ((0 == strncmp(token, "map_d", 5)) && IS_SPACE(token[5])) {
-      token += 6;
-      material.alpha_texname = token;
-      ParseTextureNameAndOption(&(material.alpha_texname),
-                                &(material.alpha_texopt), token);
-      continue;
-    }
-
-    // displacement texture
-    if (((0 == strncmp(token, "map_disp", 8)) ||
-         (0 == strncmp(token, "map_Disp", 8))) &&
-        IS_SPACE(token[8])) {
-      token += 9;
-      ParseTextureNameAndOption(&(material.displacement_texname),
-                                &(material.displacement_texopt), token);
-      continue;
-    }
-
-    // displacement texture
-    if ((0 == strncmp(token, "disp", 4)) && IS_SPACE(token[4])) {
-      token += 5;
-      ParseTextureNameAndOption(&(material.displacement_texname),
-                                &(material.displacement_texopt), token);
-      continue;
-    }
-
-    // reflection map
-    if ((0 == strncmp(token, "refl", 4)) && IS_SPACE(token[4])) {
-      token += 5;
-      ParseTextureNameAndOption(&(material.reflection_texname),
-                                &(material.reflection_texopt), token);
-      continue;
-    }
-
-    // PBR: roughness texture
-    if ((0 == strncmp(token, "map_Pr", 6)) && IS_SPACE(token[6])) {
-      token += 7;
-      ParseTextureNameAndOption(&(material.roughness_texname),
-                                &(material.roughness_texopt), token);
-      continue;
-    }
-
-    // PBR: metallic texture
-    if ((0 == strncmp(token, "map_Pm", 6)) && IS_SPACE(token[6])) {
-      token += 7;
-      ParseTextureNameAndOption(&(material.metallic_texname),
-                                &(material.metallic_texopt), token);
-      continue;
-    }
-
-    // PBR: sheen texture
-    if ((0 == strncmp(token, "map_Ps", 6)) && IS_SPACE(token[6])) {
-      token += 7;
-      ParseTextureNameAndOption(&(material.sheen_texname),
-                                &(material.sheen_texopt), token);
-      continue;
-    }
-
-    // PBR: emissive texture
-    if ((0 == strncmp(token, "map_Ke", 6)) && IS_SPACE(token[6])) {
-      token += 7;
-      ParseTextureNameAndOption(&(material.emissive_texname),
-                                &(material.emissive_texopt), token);
-      continue;
-    }
-
-    // PBR: normal map texture
-    if ((0 == strncmp(token, "norm", 4)) && IS_SPACE(token[4])) {
-      token += 5;
-      ParseTextureNameAndOption(&(material.normal_texname),
-                                &(material.normal_texopt), token);
-      continue;
-    }
-
-    // unknown parameter
-    const char *_space = strchr(token, ' ');
-    if (!_space) {
-      _space = strchr(token, '\t');
-    }
-    if (_space) {
-      std::ptrdiff_t len = _space - token;
-      std::string key(token, static_cast<size_t>(len));
-      std::string value = _space + 1;
-      material.unknown_parameter.insert(
-          std::pair<std::string, std::string>(key, value));
-    }
-  }
-  // flush last material.
-  material_map->insert(std::pair<std::string, int>(
-      material.name, static_cast<int>(materials->size())));
-  materials->push_back(material);
-
-  if (warning) {
-    (*warning) = warn_ss.str();
-  }
-}
-
-bool MaterialFileReader::operator()(const std::string &matId,
-                                    std::vector<material_t> *materials,
-                                    std::map<std::string, int> *matMap,
-                                    std::string *warn, std::string *err) {
-  if (!m_mtlBaseDir.empty()) {
-#ifdef _WIN32
-    char sep = ';';
-#else
-    char sep = ':';
-#endif
-
-    // https://stackoverflow.com/questions/5167625/splitting-a-c-stdstring-using-tokens-e-g
-    std::vector<std::string> paths;
-    std::istringstream f(m_mtlBaseDir);
-
-    std::string s;
-    while (getline(f, s, sep)) {
-      paths.push_back(s);
-    }
-
-    for (size_t i = 0; i < paths.size(); i++) {
-      std::string filepath = JoinPath(paths[i], matId);
-
-      std::ifstream matIStream(filepath.c_str());
-      if (matIStream) {
-        LoadMtl(matMap, materials, &matIStream, warn, err);
-
-        return true;
-      }
-    }
-
-    std::stringstream ss;
-    ss << "Material file [ " << matId
-       << " ] not found in a path : " << m_mtlBaseDir << "\n";
-    if (warn) {
-      (*warn) += ss.str();
-    }
-    return false;
-
-  } else {
-    std::string filepath = matId;
-    std::ifstream matIStream(filepath.c_str());
-    if (matIStream) {
-      LoadMtl(matMap, materials, &matIStream, warn, err);
-
-      return true;
-    }
-
-    std::stringstream ss;
-    ss << "Material file [ " << filepath
-       << " ] not found in a path : " << m_mtlBaseDir << "\n";
-    if (warn) {
-      (*warn) += ss.str();
-    }
-
-    return false;
-  }
-}
-
-bool MaterialStreamReader::operator()(const std::string &matId,
-                                      std::vector<material_t> *materials,
-                                      std::map<std::string, int> *matMap,
-                                      std::string *warn, std::string *err) {
-  (void)err;
-  (void)matId;
-  if (!m_inStream) {
-    std::stringstream ss;
-    ss << "Material stream in error state. \n";
-    if (warn) {
-      (*warn) += ss.str();
-    }
-    return false;
-  }
-
-  LoadMtl(matMap, materials, &m_inStream, warn, err);
-
-  return true;
-}
-
-bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
-             std::vector<material_t> *materials, std::string *warn,
-             std::string *err, const char *filename, const char *mtl_basedir,
-             bool triangulate, bool default_vcols_fallback) {
-  attrib->vertices.clear();
-  attrib->normals.clear();
-  attrib->texcoords.clear();
-  attrib->colors.clear();
-  shapes->clear();
-
-  std::stringstream errss;
-
-  std::ifstream ifs(filename);
-  if (!ifs) {
-    errss << "Cannot open file [" << filename << "]\n";
-    if (err) {
-      (*err) = errss.str();
-    }
-    return false;
-  }
-
-  std::string baseDir = mtl_basedir ? mtl_basedir : "";
-  if (!baseDir.empty()) {
-#ifndef _WIN32
-    const char dirsep = '/';
-#else
-    const char dirsep = '\\';
-#endif
-    if (baseDir[baseDir.length() - 1] != dirsep) baseDir += dirsep;
-  }
-  MaterialFileReader matFileReader(baseDir);
-
-  return LoadObj(attrib, shapes, materials, warn, err, &ifs, &matFileReader,
-                 triangulate, default_vcols_fallback);
-}
-
-bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
-             std::vector<material_t> *materials, std::string *warn,
-             std::string *err, std::istream *inStream,
-             MaterialReader *readMatFn /*= NULL*/, bool triangulate,
-             bool default_vcols_fallback) {
-  std::stringstream errss;
-
-  std::vector<real_t> v;
-  std::vector<real_t> vertex_weights;  // optional [w] component in `v`
-  std::vector<real_t> vn;
-  std::vector<real_t> vt;
-  std::vector<real_t> vc;
-  std::vector<skin_weight_t> vw;  // tinyobj extension: vertex skin weights
-  std::vector<tag_t> tags;
-  PrimGroup prim_group;
-  std::string name;
-
-  // material
-  std::set<std::string> material_filenames;
-  std::map<std::string, int> material_map;
-  int material = -1;
-
-  // smoothing group id
-  unsigned int current_smoothing_id =
-      0;  // Initial value. 0 means no smoothing.
-
-  int greatest_v_idx = -1;
-  int greatest_vn_idx = -1;
-  int greatest_vt_idx = -1;
-
-  shape_t shape;
-
-  bool found_all_colors = true;  // check if all 'v' line has color info
-
-  size_t line_num = 0;
-  std::string linebuf;
-  while (inStream->peek() != -1) {
-    safeGetline(*inStream, linebuf);
-
-    line_num++;
-
-    // Trim newline '\r\n' or '\n'
-    if (linebuf.size() > 0) {
-      if (linebuf[linebuf.size() - 1] == '\n')
-        linebuf.erase(linebuf.size() - 1);
-    }
-    if (linebuf.size() > 0) {
-      if (linebuf[linebuf.size() - 1] == '\r')
-        linebuf.erase(linebuf.size() - 1);
-    }
-
-    // Skip if empty line.
-    if (linebuf.empty()) {
-      continue;
-    }
-
-    // Skip leading space.
-    const char *token = linebuf.c_str();
-    token += strspn(token, " \t");
-
-    assert(token);
-    if (token[0] == '\0') continue;  // empty line
-
-    if (token[0] == '#') continue;  // comment line
-
-    // vertex
-    if (token[0] == 'v' && IS_SPACE((token[1]))) {
-      token += 2;
-      real_t x, y, z;
-      real_t r, g, b;
-
-      int num_components = parseVertexWithColor(&x, &y, &z, &r, &g, &b, &token);
-      found_all_colors &= (num_components == 6);
-
-      v.push_back(x);
-      v.push_back(y);
-      v.push_back(z);
-
-      vertex_weights.push_back(
-          r);  // r = w, and initialized to 1.0 when `w` component is not found.
-
-      if ((num_components == 6) || default_vcols_fallback) {
-        vc.push_back(r);
-        vc.push_back(g);
-        vc.push_back(b);
-      }
-
-      continue;
-    }
-
-    // normal
-    if (token[0] == 'v' && token[1] == 'n' && IS_SPACE((token[2]))) {
-      token += 3;
-      real_t x, y, z;
-      parseReal3(&x, &y, &z, &token);
-      vn.push_back(x);
-      vn.push_back(y);
-      vn.push_back(z);
-      continue;
-    }
-
-    // texcoord
-    if (token[0] == 'v' && token[1] == 't' && IS_SPACE((token[2]))) {
-      token += 3;
-      real_t x, y;
-      parseReal2(&x, &y, &token);
-      vt.push_back(x);
-      vt.push_back(y);
-      continue;
-    }
-
-    // skin weight. tinyobj extension
-    if (token[0] == 'v' && token[1] == 'w' && IS_SPACE((token[2]))) {
-      token += 3;
-
-      // vw <vid> <joint_0> <weight_0> <joint_1> <weight_1> ...
-      // example:
-      // vw 0 0 0.25 1 0.25 2 0.5
-
-      // TODO(syoyo): Add syntax check
-      int vid = 0;
-      vid = parseInt(&token);
-
-      skin_weight_t sw;
-
-      sw.vertex_id = vid;
-
-      while (!IS_NEW_LINE(token[0])) {
-        real_t j, w;
-        // joint_id should not be negative, weight may be negative
-        // TODO(syoyo): # of elements check
-        parseReal2(&j, &w, &token, -1.0);
-
-        if (j < static_cast<real_t>(0)) {
-          if (err) {
-            std::stringstream ss;
-            ss << "Failed parse `vw' line. joint_id is negative. "
-                  "line "
-               << line_num << ".)\n";
-            (*err) += ss.str();
-          }
-          return false;
-        }
-
-        joint_and_weight_t jw;
-
-        jw.joint_id = int(j);
-        jw.weight = w;
-
-        sw.weightValues.push_back(jw);
-
-        size_t n = strspn(token, " \t\r");
-        token += n;
-      }
-
-      vw.push_back(sw);
-    }
-
-    warning_context context;
-    context.warn = warn;
-    context.line_number = line_num;
-
-    // line
-    if (token[0] == 'l' && IS_SPACE((token[1]))) {
-      token += 2;
-
-      __line_t line;
-
-      while (!IS_NEW_LINE(token[0])) {
-        vertex_index_t vi;
-        if (!parseTriple(&token, static_cast<int>(v.size() / 3),
-                         static_cast<int>(vn.size() / 3),
-                         static_cast<int>(vt.size() / 2), &vi, context)) {
-          if (err) {
-            (*err) +=
-                "Failed to parse `l' line (e.g. a zero value for vertex index. "
-                "Line " +
-                toString(line_num) + ").\n";
-          }
-          return false;
-        }
-
-        line.vertex_indices.push_back(vi);
-
-        size_t n = strspn(token, " \t\r");
-        token += n;
-      }
-
-      prim_group.lineGroup.push_back(line);
-
-      continue;
-    }
-
-    // points
-    if (token[0] == 'p' && IS_SPACE((token[1]))) {
-      token += 2;
-
-      __points_t pts;
-
-      while (!IS_NEW_LINE(token[0])) {
-        vertex_index_t vi;
-        if (!parseTriple(&token, static_cast<int>(v.size() / 3),
-                         static_cast<int>(vn.size() / 3),
-                         static_cast<int>(vt.size() / 2), &vi, context)) {
-          if (err) {
-            (*err) +=
-                "Failed to parse `p' line (e.g. a zero value for vertex index. "
-                "Line " +
-                toString(line_num) + ").\n";
-          }
-          return false;
-        }
-
-        pts.vertex_indices.push_back(vi);
-
-        size_t n = strspn(token, " \t\r");
-        token += n;
-      }
-
-      prim_group.pointsGroup.push_back(pts);
-
-      continue;
-    }
-
-    // face
-    if (token[0] == 'f' && IS_SPACE((token[1]))) {
-      token += 2;
-      token += strspn(token, " \t");
-
-      face_t face;
-
-      face.smoothing_group_id = current_smoothing_id;
-      face.vertex_indices.reserve(3);
-
-      while (!IS_NEW_LINE(token[0])) {
-        vertex_index_t vi;
-        if (!parseTriple(&token, static_cast<int>(v.size() / 3),
-                         static_cast<int>(vn.size() / 3),
-                         static_cast<int>(vt.size() / 2), &vi, context)) {
-          if (err) {
-            (*err) +=
-                "Failed to parse `f' line (e.g. a zero value for vertex index "
-                "or invalid relative vertex index). Line " +
-                toString(line_num) + ").\n";
-          }
-          return false;
-        }
-
-        greatest_v_idx = greatest_v_idx > vi.v_idx ? greatest_v_idx : vi.v_idx;
-        greatest_vn_idx =
-            greatest_vn_idx > vi.vn_idx ? greatest_vn_idx : vi.vn_idx;
-        greatest_vt_idx =
-            greatest_vt_idx > vi.vt_idx ? greatest_vt_idx : vi.vt_idx;
-
-        face.vertex_indices.push_back(vi);
-        size_t n = strspn(token, " \t\r");
-        token += n;
-      }
-
-      // replace with emplace_back + std::move on C++11
-      prim_group.faceGroup.push_back(face);
-
-      continue;
-    }
-
-    // use mtl
-    if ((0 == strncmp(token, "usemtl", 6))) {
-      token += 6;
-      std::string namebuf = parseString(&token);
-
-      int newMaterialId = -1;
-      std::map<std::string, int>::const_iterator it =
-          material_map.find(namebuf);
-      if (it != material_map.end()) {
-        newMaterialId = it->second;
-      } else {
-        // { error!! material not found }
-        if (warn) {
-          (*warn) += "material [ '" + namebuf + "' ] not found in .mtl\n";
-        }
-      }
-
-      if (newMaterialId != material) {
-        // Create per-face material. Thus we don't add `shape` to `shapes` at
-        // this time.
-        // just clear `faceGroup` after `exportGroupsToShape()` call.
-        exportGroupsToShape(&shape, prim_group, tags, material, name,
-                            triangulate, v, warn);
-        prim_group.faceGroup.clear();
-        material = newMaterialId;
-      }
-
-      continue;
-    }
-
-    // load mtl
-    if ((0 == strncmp(token, "mtllib", 6)) && IS_SPACE((token[6]))) {
-      if (readMatFn) {
-        token += 7;
-
-        std::vector<std::string> filenames;
-        SplitString(std::string(token), ' ', '\\', filenames);
-
-        if (filenames.empty()) {
-          if (warn) {
-            std::stringstream ss;
-            ss << "Looks like empty filename for mtllib. Use default "
-                  "material (line "
-               << line_num << ".)\n";
-
-            (*warn) += ss.str();
-          }
-        } else {
-          bool found = false;
-          for (size_t s = 0; s < filenames.size(); s++) {
-            if (material_filenames.count(filenames[s]) > 0) {
-              found = true;
-              continue;
-            }
-
-            std::string warn_mtl;
-            std::string err_mtl;
-            bool ok = (*readMatFn)(filenames[s].c_str(), materials,
-                                   &material_map, &warn_mtl, &err_mtl);
-            if (warn && (!warn_mtl.empty())) {
-              (*warn) += warn_mtl;
-            }
-
-            if (err && (!err_mtl.empty())) {
-              (*err) += err_mtl;
-            }
-
-            if (ok) {
-              found = true;
-              material_filenames.insert(filenames[s]);
-              break;
-            }
-          }
-
-          if (!found) {
-            if (warn) {
-              (*warn) +=
-                  "Failed to load material file(s). Use default "
-                  "material.\n";
-            }
-          }
-        }
-      }
-
-      continue;
-    }
-
-    // group name
-    if (token[0] == 'g' && IS_SPACE((token[1]))) {
-      // flush previous face group.
-      bool ret = exportGroupsToShape(&shape, prim_group, tags, material, name,
-                                     triangulate, v, warn);
-      (void)ret;  // return value not used.
-
-      if (shape.mesh.indices.size() > 0) {
-        shapes->push_back(shape);
-      }
-
-      shape = shape_t();
-
-      // material = -1;
-      prim_group.clear();
-
-      std::vector<std::string> names;
-
-      while (!IS_NEW_LINE(token[0])) {
-        std::string str = parseString(&token);
-        names.push_back(str);
-        token += strspn(token, " \t\r");  // skip tag
-      }
-
-      // names[0] must be 'g'
-
-      if (names.size() < 2) {
-        // 'g' with empty names
-        if (warn) {
-          std::stringstream ss;
-          ss << "Empty group name. line: " << line_num << "\n";
-          (*warn) += ss.str();
-          name = "";
-        }
-      } else {
-        std::stringstream ss;
-        ss << names[1];
-
-        // tinyobjloader does not support multiple groups for a primitive.
-        // Currently we concatinate multiple group names with a space to get
-        // single group name.
-
-        for (size_t i = 2; i < names.size(); i++) {
-          ss << " " << names[i];
-        }
-
-        name = ss.str();
-      }
-
-      continue;
-    }
-
-    // object name
-    if (token[0] == 'o' && IS_SPACE((token[1]))) {
-      // flush previous face group.
-      bool ret = exportGroupsToShape(&shape, prim_group, tags, material, name,
-                                     triangulate, v, warn);
-      (void)ret;  // return value not used.
-
-      if (shape.mesh.indices.size() > 0 || shape.lines.indices.size() > 0 ||
-          shape.points.indices.size() > 0) {
-        shapes->push_back(shape);
-      }
-
-      // material = -1;
-      prim_group.clear();
-      shape = shape_t();
-
-      // @todo { multiple object name? }
-      token += 2;
-      std::stringstream ss;
-      ss << token;
-      name = ss.str();
-
-      continue;
-    }
-
-    if (token[0] == 't' && IS_SPACE(token[1])) {
-      const int max_tag_nums = 8192;  // FIXME(syoyo): Parameterize.
-      tag_t tag;
-
-      token += 2;
-
-      tag.name = parseString(&token);
-
-      tag_sizes ts = parseTagTriple(&token);
-
-      if (ts.num_ints < 0) {
-        ts.num_ints = 0;
-      }
-      if (ts.num_ints > max_tag_nums) {
-        ts.num_ints = max_tag_nums;
-      }
-
-      if (ts.num_reals < 0) {
-        ts.num_reals = 0;
-      }
-      if (ts.num_reals > max_tag_nums) {
-        ts.num_reals = max_tag_nums;
-      }
-
-      if (ts.num_strings < 0) {
-        ts.num_strings = 0;
-      }
-      if (ts.num_strings > max_tag_nums) {
-        ts.num_strings = max_tag_nums;
-      }
-
-      tag.intValues.resize(static_cast<size_t>(ts.num_ints));
-
-      for (size_t i = 0; i < static_cast<size_t>(ts.num_ints); ++i) {
-        tag.intValues[i] = parseInt(&token);
-      }
-
-      tag.floatValues.resize(static_cast<size_t>(ts.num_reals));
-      for (size_t i = 0; i < static_cast<size_t>(ts.num_reals); ++i) {
-        tag.floatValues[i] = parseReal(&token);
-      }
-
-      tag.stringValues.resize(static_cast<size_t>(ts.num_strings));
-      for (size_t i = 0; i < static_cast<size_t>(ts.num_strings); ++i) {
-        tag.stringValues[i] = parseString(&token);
-      }
-
-      tags.push_back(tag);
-
-      continue;
-    }
-
-    if (token[0] == 's' && IS_SPACE(token[1])) {
-      // smoothing group id
-      token += 2;
-
-      // skip space.
-      token += strspn(token, " \t");  // skip space
-
-      if (token[0] == '\0') {
-        continue;
-      }
-
-      if (token[0] == '\r' || token[1] == '\n') {
-        continue;
-      }
-
-      if (strlen(token) >= 3 && token[0] == 'o' && token[1] == 'f' &&
-          token[2] == 'f') {
-        current_smoothing_id = 0;
-      } else {
-        // assume number
-        int smGroupId = parseInt(&token);
-        if (smGroupId < 0) {
-          // parse error. force set to 0.
-          // FIXME(syoyo): Report warning.
-          current_smoothing_id = 0;
-        } else {
-          current_smoothing_id = static_cast<unsigned int>(smGroupId);
-        }
-      }
-
-      continue;
-    }  // smoothing group id
-
-    // Ignore unknown command.
-  }
-
-  // not all vertices have colors, no default colors desired? -> clear colors
-  if (!found_all_colors && !default_vcols_fallback) {
-    vc.clear();
-  }
-
-  if (greatest_v_idx >= static_cast<int>(v.size() / 3)) {
-    if (warn) {
-      std::stringstream ss;
-      ss << "Vertex indices out of bounds (line " << line_num << ".)\n\n";
-      (*warn) += ss.str();
-    }
-  }
-  if (greatest_vn_idx >= static_cast<int>(vn.size() / 3)) {
-    if (warn) {
-      std::stringstream ss;
-      ss << "Vertex normal indices out of bounds (line " << line_num
-         << ".)\n\n";
-      (*warn) += ss.str();
-    }
-  }
-  if (greatest_vt_idx >= static_cast<int>(vt.size() / 2)) {
-    if (warn) {
-      std::stringstream ss;
-      ss << "Vertex texcoord indices out of bounds (line " << line_num
-         << ".)\n\n";
-      (*warn) += ss.str();
-    }
-  }
-
-  bool ret = exportGroupsToShape(&shape, prim_group, tags, material, name,
-                                 triangulate, v, warn);
-  // exportGroupsToShape return false when `usemtl` is called in the last
-  // line.
-  // we also add `shape` to `shapes` when `shape.mesh` has already some
-  // faces(indices)
-  if (ret || shape.mesh.indices
-                 .size()) {  // FIXME(syoyo): Support other prims(e.g. lines)
-    shapes->push_back(shape);
-  }
-  prim_group.clear();  // for safety
-
-  if (err) {
-    (*err) += errss.str();
-  }
-
-  attrib->vertices.swap(v);
-  attrib->vertex_weights.swap(vertex_weights);
-  attrib->normals.swap(vn);
-  attrib->texcoords.swap(vt);
-  attrib->texcoord_ws.swap(vt);
-  attrib->colors.swap(vc);
-  attrib->skin_weights.swap(vw);
-
-  return true;
-}
-
-bool LoadObjWithCallback(std::istream &inStream, const callback_t &callback,
-                         void *user_data /*= NULL*/,
-                         MaterialReader *readMatFn /*= NULL*/,
-                         std::string *warn, /* = NULL*/
-                         std::string *err /*= NULL*/) {
-  std::stringstream errss;
-
-  // material
-  std::set<std::string> material_filenames;
-  std::map<std::string, int> material_map;
-  int material_id = -1;  // -1 = invalid
-
-  std::vector<index_t> indices;
-  std::vector<material_t> materials;
-  std::vector<std::string> names;
-  names.reserve(2);
-  std::vector<const char *> names_out;
-
-  std::string linebuf;
-  while (inStream.peek() != -1) {
-    safeGetline(inStream, linebuf);
-
-    // Trim newline '\r\n' or '\n'
-    if (linebuf.size() > 0) {
-      if (linebuf[linebuf.size() - 1] == '\n')
-        linebuf.erase(linebuf.size() - 1);
-    }
-    if (linebuf.size() > 0) {
-      if (linebuf[linebuf.size() - 1] == '\r')
-        linebuf.erase(linebuf.size() - 1);
-    }
-
-    // Skip if empty line.
-    if (linebuf.empty()) {
-      continue;
-    }
-
-    // Skip leading space.
-    const char *token = linebuf.c_str();
-    token += strspn(token, " \t");
-
-    assert(token);
-    if (token[0] == '\0') continue;  // empty line
-
-    if (token[0] == '#') continue;  // comment line
-
-    // vertex
-    if (token[0] == 'v' && IS_SPACE((token[1]))) {
-      token += 2;
-      real_t x, y, z;
-      real_t r, g, b;
-
-      int num_components = parseVertexWithColor(&x, &y, &z, &r, &g, &b, &token);
-      if (callback.vertex_cb) {
-        callback.vertex_cb(user_data, x, y, z, r);  // r=w is optional
-      }
-      if (callback.vertex_color_cb) {
-        bool found_color = (num_components == 6);
-        callback.vertex_color_cb(user_data, x, y, z, r, g, b, found_color);
-      }
-      continue;
-    }
-
-    // normal
-    if (token[0] == 'v' && token[1] == 'n' && IS_SPACE((token[2]))) {
-      token += 3;
-      real_t x, y, z;
-      parseReal3(&x, &y, &z, &token);
-      if (callback.normal_cb) {
-        callback.normal_cb(user_data, x, y, z);
-      }
-      continue;
-    }
-
-    // texcoord
-    if (token[0] == 'v' && token[1] == 't' && IS_SPACE((token[2]))) {
-      token += 3;
-      real_t x, y, z;  // y and z are optional. default = 0.0
-      parseReal3(&x, &y, &z, &token);
-      if (callback.texcoord_cb) {
-        callback.texcoord_cb(user_data, x, y, z);
-      }
-      continue;
-    }
-
-    // face
-    if (token[0] == 'f' && IS_SPACE((token[1]))) {
-      token += 2;
-      token += strspn(token, " \t");
-
-      indices.clear();
-      while (!IS_NEW_LINE(token[0])) {
-        vertex_index_t vi = parseRawTriple(&token);
-
-        index_t idx;
-        idx.vertex_index = vi.v_idx;
-        idx.normal_index = vi.vn_idx;
-        idx.texcoord_index = vi.vt_idx;
-
-        indices.push_back(idx);
-        size_t n = strspn(token, " \t\r");
-        token += n;
-      }
-
-      if (callback.index_cb && indices.size() > 0) {
-        callback.index_cb(user_data, &indices.at(0),
-                          static_cast<int>(indices.size()));
-      }
-
-      continue;
-    }
-
-    // use mtl
-    if ((0 == strncmp(token, "usemtl", 6)) && IS_SPACE((token[6]))) {
-      token += 7;
-      std::stringstream ss;
-      ss << token;
-      std::string namebuf = ss.str();
-
-      int newMaterialId = -1;
-      std::map<std::string, int>::const_iterator it =
-          material_map.find(namebuf);
-      if (it != material_map.end()) {
-        newMaterialId = it->second;
-      } else {
-        // { warn!! material not found }
-        if (warn && (!callback.usemtl_cb)) {
-          (*warn) += "material [ " + namebuf + " ] not found in .mtl\n";
-        }
-      }
-
-      if (newMaterialId != material_id) {
-        material_id = newMaterialId;
-      }
-
-      if (callback.usemtl_cb) {
-        callback.usemtl_cb(user_data, namebuf.c_str(), material_id);
-      }
-
-      continue;
-    }
-
-    // load mtl
-    if ((0 == strncmp(token, "mtllib", 6)) && IS_SPACE((token[6]))) {
-      if (readMatFn) {
-        token += 7;
-
-        std::vector<std::string> filenames;
-        SplitString(std::string(token), ' ', '\\', filenames);
-
-        if (filenames.empty()) {
-          if (warn) {
-            (*warn) +=
-                "Looks like empty filename for mtllib. Use default "
-                "material. \n";
-          }
-        } else {
-          bool found = false;
-          for (size_t s = 0; s < filenames.size(); s++) {
-            if (material_filenames.count(filenames[s]) > 0) {
-              found = true;
-              continue;
-            }
-
-            std::string warn_mtl;
-            std::string err_mtl;
-            bool ok = (*readMatFn)(filenames[s].c_str(), &materials,
-                                   &material_map, &warn_mtl, &err_mtl);
-
-            if (warn && (!warn_mtl.empty())) {
-              (*warn) += warn_mtl;  // This should be warn message.
-            }
-
-            if (err && (!err_mtl.empty())) {
-              (*err) += err_mtl;
-            }
-
-            if (ok) {
-              found = true;
-              material_filenames.insert(filenames[s]);
-              break;
-            }
-          }
-
-          if (!found) {
-            if (warn) {
-              (*warn) +=
-                  "Failed to load material file(s). Use default "
-                  "material.\n";
-            }
-          } else {
-            if (callback.mtllib_cb) {
-              callback.mtllib_cb(user_data, &materials.at(0),
-                                 static_cast<int>(materials.size()));
-            }
-          }
-        }
-      }
-
-      continue;
-    }
-
-    // group name
-    if (token[0] == 'g' && IS_SPACE((token[1]))) {
-      names.clear();
-
-      while (!IS_NEW_LINE(token[0])) {
-        std::string str = parseString(&token);
-        names.push_back(str);
-        token += strspn(token, " \t\r");  // skip tag
-      }
-
-      assert(names.size() > 0);
-
-      if (callback.group_cb) {
-        if (names.size() > 1) {
-          // create const char* array.
-          names_out.resize(names.size() - 1);
-          for (size_t j = 0; j < names_out.size(); j++) {
-            names_out[j] = names[j + 1].c_str();
-          }
-          callback.group_cb(user_data, &names_out.at(0),
-                            static_cast<int>(names_out.size()));
-
-        } else {
-          callback.group_cb(user_data, NULL, 0);
-        }
-      }
-
-      continue;
-    }
-
-    // object name
-    if (token[0] == 'o' && IS_SPACE((token[1]))) {
-      // @todo { multiple object name? }
-      token += 2;
-
-      std::stringstream ss;
-      ss << token;
-      std::string object_name = ss.str();
-
-      if (callback.object_cb) {
-        callback.object_cb(user_data, object_name.c_str());
-      }
-
-      continue;
-    }
-
-#if 0  // @todo
-    if (token[0] == 't' && IS_SPACE(token[1])) {
-      tag_t tag;
-
-      token += 2;
-      std::stringstream ss;
-      ss << token;
-      tag.name = ss.str();
-
-      token += tag.name.size() + 1;
-
-      tag_sizes ts = parseTagTriple(&token);
-
-      tag.intValues.resize(static_cast<size_t>(ts.num_ints));
-
-      for (size_t i = 0; i < static_cast<size_t>(ts.num_ints); ++i) {
-        tag.intValues[i] = atoi(token);
-        token += strcspn(token, "/ \t\r") + 1;
-      }
-
-      tag.floatValues.resize(static_cast<size_t>(ts.num_reals));
-      for (size_t i = 0; i < static_cast<size_t>(ts.num_reals); ++i) {
-        tag.floatValues[i] = parseReal(&token);
-        token += strcspn(token, "/ \t\r") + 1;
-      }
-
-      tag.stringValues.resize(static_cast<size_t>(ts.num_strings));
-      for (size_t i = 0; i < static_cast<size_t>(ts.num_strings); ++i) {
-        std::stringstream ss;
-        ss << token;
-        tag.stringValues[i] = ss.str();
-        token += tag.stringValues[i].size() + 1;
-      }
-
-      tags.push_back(tag);
-    }
-#endif
-
-    // Ignore unknown command.
-  }
-
-  if (err) {
-    (*err) += errss.str();
-  }
-
-  return true;
-}
-
-bool ObjReader::ParseFromFile(const std::string &filename,
-                              const ObjReaderConfig &config) {
-  std::string mtl_search_path;
-
-  if (config.mtl_search_path.empty()) {
-    //
-    // split at last '/'(for unixish system) or '\\'(for windows) to get
-    // the base directory of .obj file
-    //
-    size_t pos = filename.find_last_of("/\\");
-    if (pos != std::string::npos) {
-      mtl_search_path = filename.substr(0, pos);
-    }
-  } else {
-    mtl_search_path = config.mtl_search_path;
-  }
-
-  valid_ = LoadObj(&attrib_, &shapes_, &materials_, &warning_, &error_,
-                   filename.c_str(), mtl_search_path.c_str(),
-                   config.triangulate, config.vertex_color);
-
-  return valid_;
-}
-
-bool ObjReader::ParseFromString(const std::string &obj_text,
-                                const std::string &mtl_text,
-                                const ObjReaderConfig &config) {
-  std::stringbuf obj_buf(obj_text);
-  std::stringbuf mtl_buf(mtl_text);
-
-  std::istream obj_ifs(&obj_buf);
-  std::istream mtl_ifs(&mtl_buf);
-
-  MaterialStreamReader mtl_ss(mtl_ifs);
-
-  valid_ = LoadObj(&attrib_, &shapes_, &materials_, &warning_, &error_,
-                   &obj_ifs, &mtl_ss, config.triangulate, config.vertex_color);
-
-  return valid_;
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-}  // namespace tinyobj
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tinycolorio.LICENSE b/contrib/tinyusdz/tinyusdz_repo/src/external/tinycolorio.LICENSE
deleted file mode 100644
index 515c3fa92..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tinycolorio.LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Syoyo Fujita.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tinyexr.cc b/contrib/tinyusdz/tinyusdz_repo/src/external/tinyexr.cc
deleted file mode 100644
index 3d65b14ea..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tinyexr.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-#if defined(TINYEXR_USE_MINIZ) && (!TINYEXR_USE_MINIZ)
-// Use system's zlib
-#include <zlib.h>
-#endif
-
-#define TINYEXR_IMPLEMENTATION
-#include "tinyexr.h"
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/tinyexr.h b/contrib/tinyusdz/tinyusdz_repo/src/external/tinyexr.h
deleted file mode 100644
index 43d77f374..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/tinyexr.h
+++ /dev/null
@@ -1,9307 +0,0 @@
-#ifndef TINYEXR_H_
-#define TINYEXR_H_
-/*
-Copyright (c) 2014 - 2021, Syoyo Fujita and many contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Syoyo Fujita nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-// TinyEXR contains some OpenEXR code, which is licensed under ------------
-
-///////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2002, Industrial Light & Magic, a division of Lucas
-// Digital Ltd. LLC
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-// *       Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// *       Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// *       Neither the name of Industrial Light & Magic nor the names of
-// its contributors may be used to endorse or promote products derived
-// from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////
-
-// End of OpenEXR license -------------------------------------------------
-
-
-//
-//
-//   Do this:
-//    #define TINYEXR_IMPLEMENTATION
-//   before you include this file in *one* C or C++ file to create the
-//   implementation.
-//
-//   // i.e. it should look like this:
-//   #include ...
-//   #include ...
-//   #include ...
-//   #define TINYEXR_IMPLEMENTATION
-//   #include "tinyexr.h"
-//
-//
-
-#include <stddef.h>  // for size_t
-#include <stdint.h>  // guess stdint.h is available(C99)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || \
-    defined(__i386) || defined(__i486__) || defined(__i486) ||  \
-    defined(i386) || defined(__ia64__) || defined(__x86_64__)
-#define TINYEXR_X86_OR_X64_CPU 1
-#else
-#define TINYEXR_X86_OR_X64_CPU 0
-#endif
-
-#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || TINYEXR_X86_OR_X64_CPU
-#define TINYEXR_LITTLE_ENDIAN 1
-#else
-#define TINYEXR_LITTLE_ENDIAN 0
-#endif
-
-// Use miniz or not to decode ZIP format pixel. Linking with zlib
-// required if this flag is 0 and TINYEXR_USE_STB_ZLIB is 0.
-#ifndef TINYEXR_USE_MINIZ
-#define TINYEXR_USE_MINIZ (1)
-#endif
-
-// Use the ZIP implementation of stb_image.h and stb_image_write.h.
-#ifndef TINYEXR_USE_STB_ZLIB
-#define TINYEXR_USE_STB_ZLIB (0)
-#endif
-
-// Use nanozlib.
-#ifndef TINYEXR_USE_NANOZLIB
-#define TINYEXR_USE_NANOZLIB (0)
-#endif
-
-// Disable PIZ compression when applying cpplint.
-#ifndef TINYEXR_USE_PIZ
-#define TINYEXR_USE_PIZ (1)
-#endif
-
-#ifndef TINYEXR_USE_ZFP
-#define TINYEXR_USE_ZFP (0)  // TinyEXR extension.
-// http://computation.llnl.gov/projects/floating-point-compression
-#endif
-
-#ifndef TINYEXR_USE_THREAD
-#define TINYEXR_USE_THREAD (0)  // No threaded loading.
-// http://computation.llnl.gov/projects/floating-point-compression
-#endif
-
-#ifndef TINYEXR_USE_OPENMP
-#ifdef _OPENMP
-#define TINYEXR_USE_OPENMP (1)
-#else
-#define TINYEXR_USE_OPENMP (0)
-#endif
-#endif
-
-#define TINYEXR_SUCCESS (0)
-#define TINYEXR_ERROR_INVALID_MAGIC_NUMBER (-1)
-#define TINYEXR_ERROR_INVALID_EXR_VERSION (-2)
-#define TINYEXR_ERROR_INVALID_ARGUMENT (-3)
-#define TINYEXR_ERROR_INVALID_DATA (-4)
-#define TINYEXR_ERROR_INVALID_FILE (-5)
-#define TINYEXR_ERROR_INVALID_PARAMETER (-6)
-#define TINYEXR_ERROR_CANT_OPEN_FILE (-7)
-#define TINYEXR_ERROR_UNSUPPORTED_FORMAT (-8)
-#define TINYEXR_ERROR_INVALID_HEADER (-9)
-#define TINYEXR_ERROR_UNSUPPORTED_FEATURE (-10)
-#define TINYEXR_ERROR_CANT_WRITE_FILE (-11)
-#define TINYEXR_ERROR_SERIALIZATION_FAILED (-12)
-#define TINYEXR_ERROR_LAYER_NOT_FOUND (-13)
-#define TINYEXR_ERROR_DATA_TOO_LARGE (-14)
-
-// @note { OpenEXR file format: http://www.openexr.com/openexrfilelayout.pdf }
-
-// pixel type: possible values are: UINT = 0 HALF = 1 FLOAT = 2
-#define TINYEXR_PIXELTYPE_UINT (0)
-#define TINYEXR_PIXELTYPE_HALF (1)
-#define TINYEXR_PIXELTYPE_FLOAT (2)
-
-#define TINYEXR_MAX_HEADER_ATTRIBUTES (1024)
-#define TINYEXR_MAX_CUSTOM_ATTRIBUTES (128)
-
-#define TINYEXR_COMPRESSIONTYPE_NONE (0)
-#define TINYEXR_COMPRESSIONTYPE_RLE (1)
-#define TINYEXR_COMPRESSIONTYPE_ZIPS (2)
-#define TINYEXR_COMPRESSIONTYPE_ZIP (3)
-#define TINYEXR_COMPRESSIONTYPE_PIZ (4)
-#define TINYEXR_COMPRESSIONTYPE_ZFP (128)  // TinyEXR extension
-
-#define TINYEXR_ZFP_COMPRESSIONTYPE_RATE (0)
-#define TINYEXR_ZFP_COMPRESSIONTYPE_PRECISION (1)
-#define TINYEXR_ZFP_COMPRESSIONTYPE_ACCURACY (2)
-
-#define TINYEXR_TILE_ONE_LEVEL (0)
-#define TINYEXR_TILE_MIPMAP_LEVELS (1)
-#define TINYEXR_TILE_RIPMAP_LEVELS (2)
-
-#define TINYEXR_TILE_ROUND_DOWN (0)
-#define TINYEXR_TILE_ROUND_UP (1)
-
-typedef struct TEXRVersion {
-  int version;    // this must be 2
-  // tile format image;
-  // not zero for only a single-part "normal" tiled file (according to spec.)
-  int tiled;
-  int long_name;  // long name attribute
-  // deep image(EXR 2.0);
-  // for a multi-part file, indicates that at least one part is of type deep* (according to spec.)
-  int non_image;
-  int multipart;  // multi-part(EXR 2.0)
-} EXRVersion;
-
-typedef struct TEXRAttribute {
-  char name[256];  // name and type are up to 255 chars long.
-  char type[256];
-  unsigned char *value;  // uint8_t*
-  int size;
-  int pad0;
-} EXRAttribute;
-
-typedef struct TEXRChannelInfo {
-  char name[256];  // less than 255 bytes long
-  int pixel_type;
-  int x_sampling;
-  int y_sampling;
-  unsigned char p_linear;
-  unsigned char pad[3];
-} EXRChannelInfo;
-
-typedef struct TEXRTile {
-  int offset_x;
-  int offset_y;
-  int level_x;
-  int level_y;
-
-  int width;   // actual width in a tile.
-  int height;  // actual height int a tile.
-
-  unsigned char **images;  // image[channels][pixels]
-} EXRTile;
-
-typedef struct TEXRBox2i {
-  int min_x;
-  int min_y;
-  int max_x;
-  int max_y;
-} EXRBox2i;
-
-typedef struct TEXRHeader {
-  float pixel_aspect_ratio;
-  int line_order;
-  EXRBox2i data_window;
-  EXRBox2i display_window;
-  float screen_window_center[2];
-  float screen_window_width;
-
-  int chunk_count;
-
-  // Properties for tiled format(`tiledesc`).
-  int tiled;
-  int tile_size_x;
-  int tile_size_y;
-  int tile_level_mode;
-  int tile_rounding_mode;
-
-  int long_name;
-  // for a single-part file, agree with the version field bit 11
-  // for a multi-part file, it is consistent with the type of part
-  int non_image;
-  int multipart;
-  unsigned int header_len;
-
-  // Custom attributes(exludes required attributes(e.g. `channels`,
-  // `compression`, etc)
-  int num_custom_attributes;
-  EXRAttribute *custom_attributes;  // array of EXRAttribute. size =
-                                    // `num_custom_attributes`.
-
-  EXRChannelInfo *channels;  // [num_channels]
-
-  int *pixel_types;  // Loaded pixel type(TINYEXR_PIXELTYPE_*) of `images` for
-  // each channel. This is overwritten with `requested_pixel_types` when
-  // loading.
-  int num_channels;
-
-  int compression_type;        // compression type(TINYEXR_COMPRESSIONTYPE_*)
-  int *requested_pixel_types;  // Filled initially by
-                               // ParseEXRHeaderFrom(Meomory|File), then users
-                               // can edit it(only valid for HALF pixel type
-                               // channel)
-  // name attribute required for multipart files;
-  // must be unique and non empty (according to spec.);
-  // use EXRSetNameAttr for setting value;
-  // max 255 character allowed - excluding terminating zero
-  char name[256];
-} EXRHeader;
-
-typedef struct TEXRMultiPartHeader {
-  int num_headers;
-  EXRHeader *headers;
-
-} EXRMultiPartHeader;
-
-typedef struct TEXRImage {
-  EXRTile *tiles;  // Tiled pixel data. The application must reconstruct image
-                   // from tiles manually. NULL if scanline format.
-  struct TEXRImage* next_level; // NULL if scanline format or image is the last level.
-  int level_x; // x level index
-  int level_y; // y level index
-
-  unsigned char **images;  // image[channels][pixels]. NULL if tiled format.
-
-  int width;
-  int height;
-  int num_channels;
-
-  // Properties for tile format.
-  int num_tiles;
-
-} EXRImage;
-
-typedef struct TEXRMultiPartImage {
-  int num_images;
-  EXRImage *images;
-
-} EXRMultiPartImage;
-
-typedef struct TDeepImage {
-  const char **channel_names;
-  float ***image;      // image[channels][scanlines][samples]
-  int **offset_table;  // offset_table[scanline][offsets]
-  int num_channels;
-  int width;
-  int height;
-  int pad0;
-} DeepImage;
-
-// @deprecated { For backward compatibility. Not recommended to use. }
-// Loads single-frame OpenEXR image. Assume EXR image contains A(single channel
-// alpha) or RGB(A) channels.
-// Application must free image data as returned by `out_rgba`
-// Result image format is: float x RGBA x width x hight
-// Returns negative value and may set error string in `err` when there's an
-// error
-extern int LoadEXR(float **out_rgba, int *width, int *height,
-                   const char *filename, const char **err);
-
-// Loads single-frame OpenEXR image by specifying layer name. Assume EXR image
-// contains A(single channel alpha) or RGB(A) channels. Application must free
-// image data as returned by `out_rgba` Result image format is: float x RGBA x
-// width x hight Returns negative value and may set error string in `err` when
-// there's an error When the specified layer name is not found in the EXR file,
-// the function will return `TINYEXR_ERROR_LAYER_NOT_FOUND`.
-extern int LoadEXRWithLayer(float **out_rgba, int *width, int *height,
-                            const char *filename, const char *layer_name,
-                            const char **err);
-
-//
-// Get layer infos from EXR file.
-//
-// @param[out] layer_names List of layer names. Application must free memory
-// after using this.
-// @param[out] num_layers The number of layers
-// @param[out] err Error string(will be filled when the function returns error
-// code). Free it using FreeEXRErrorMessage after using this value.
-//
-// @return TINYEXR_SUCCEES upon success.
-//
-extern int EXRLayers(const char *filename, const char **layer_names[],
-                     int *num_layers, const char **err);
-
-// @deprecated
-// Simple wrapper API for ParseEXRHeaderFromFile.
-// checking given file is a EXR file(by just look up header)
-// @return TINYEXR_SUCCEES for EXR image, TINYEXR_ERROR_INVALID_HEADER for
-// others
-extern int IsEXR(const char *filename);
-
-// Simple wrapper API for ParseEXRHeaderFromMemory.
-// Check if given data is a EXR image(by just looking up a header section)
-// @return TINYEXR_SUCCEES for EXR image, TINYEXR_ERROR_INVALID_HEADER for
-// others
-extern int IsEXRFromMemory(const unsigned char *memory, size_t size);
-
-// @deprecated
-// Saves single-frame OpenEXR image to a buffer. Assume EXR image contains RGB(A) channels.
-// components must be 1(Grayscale), 3(RGB) or 4(RGBA).
-// Input image format is: `float x width x height`, or `float x RGB(A) x width x
-// hight`
-// Save image as fp16(HALF) format when `save_as_fp16` is positive non-zero
-// value.
-// Save image as fp32(FLOAT) format when `save_as_fp16` is 0.
-// Use ZIP compression by default.
-// `buffer` is the pointer to write EXR data.
-// Memory for `buffer` is allocated internally in SaveEXRToMemory.
-// Returns the data size of EXR file when the value is positive(up to 2GB EXR data).
-// Returns negative value and may set error string in `err` when there's an
-// error
-extern int SaveEXRToMemory(const float *data, const int width, const int height,
-                   const int components, const int save_as_fp16,
-                   const unsigned char **buffer, const char **err);
-
-// @deprecated { Not recommended, but handy to use. }
-// Saves single-frame OpenEXR image to a buffer. Assume EXR image contains RGB(A) channels.
-// components must be 1(Grayscale), 3(RGB) or 4(RGBA).
-// Input image format is: `float x width x height`, or `float x RGB(A) x width x
-// hight`
-// Save image as fp16(HALF) format when `save_as_fp16` is positive non-zero
-// value.
-// Save image as fp32(FLOAT) format when `save_as_fp16` is 0.
-// Use ZIP compression by default.
-// Returns TINYEXR_SUCCEES(0) when success.
-// Returns negative value and may set error string in `err` when there's an
-// error
-extern int SaveEXR(const float *data, const int width, const int height,
-                   const int components, const int save_as_fp16,
-                   const char *filename, const char **err);
-
-// Returns the number of resolution levels of the image (including the base)
-extern int EXRNumLevels(const EXRImage* exr_image);
-
-// Initialize EXRHeader struct
-extern void InitEXRHeader(EXRHeader *exr_header);
-
-// Set name attribute of EXRHeader struct (it makes a copy)
-extern void EXRSetNameAttr(EXRHeader *exr_header, const char* name);
-
-// Initialize EXRImage struct
-extern void InitEXRImage(EXRImage *exr_image);
-
-// Frees internal data of EXRHeader struct
-extern int FreeEXRHeader(EXRHeader *exr_header);
-
-// Frees internal data of EXRImage struct
-extern int FreeEXRImage(EXRImage *exr_image);
-
-// Frees error message
-extern void FreeEXRErrorMessage(const char *msg);
-
-// Parse EXR version header of a file.
-extern int ParseEXRVersionFromFile(EXRVersion *version, const char *filename);
-
-// Parse EXR version header from memory-mapped EXR data.
-extern int ParseEXRVersionFromMemory(EXRVersion *version,
-                                     const unsigned char *memory, size_t size);
-
-// Parse single-part OpenEXR header from a file and initialize `EXRHeader`.
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int ParseEXRHeaderFromFile(EXRHeader *header, const EXRVersion *version,
-                                  const char *filename, const char **err);
-
-// Parse single-part OpenEXR header from a memory and initialize `EXRHeader`.
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int ParseEXRHeaderFromMemory(EXRHeader *header,
-                                    const EXRVersion *version,
-                                    const unsigned char *memory, size_t size,
-                                    const char **err);
-
-// Parse multi-part OpenEXR headers from a file and initialize `EXRHeader*`
-// array.
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int ParseEXRMultipartHeaderFromFile(EXRHeader ***headers,
-                                           int *num_headers,
-                                           const EXRVersion *version,
-                                           const char *filename,
-                                           const char **err);
-
-// Parse multi-part OpenEXR headers from a memory and initialize `EXRHeader*`
-// array
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int ParseEXRMultipartHeaderFromMemory(EXRHeader ***headers,
-                                             int *num_headers,
-                                             const EXRVersion *version,
-                                             const unsigned char *memory,
-                                             size_t size, const char **err);
-
-// Loads single-part OpenEXR image from a file.
-// Application must setup `ParseEXRHeaderFromFile` before calling this function.
-// Application can free EXRImage using `FreeEXRImage`
-// Returns negative value and may set error string in `err` when there's an
-// error
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int LoadEXRImageFromFile(EXRImage *image, const EXRHeader *header,
-                                const char *filename, const char **err);
-
-// Loads single-part OpenEXR image from a memory.
-// Application must setup `EXRHeader` with
-// `ParseEXRHeaderFromMemory` before calling this function.
-// Application can free EXRImage using `FreeEXRImage`
-// Returns negative value and may set error string in `err` when there's an
-// error
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int LoadEXRImageFromMemory(EXRImage *image, const EXRHeader *header,
-                                  const unsigned char *memory,
-                                  const size_t size, const char **err);
-
-// Loads multi-part OpenEXR image from a file.
-// Application must setup `ParseEXRMultipartHeaderFromFile` before calling this
-// function.
-// Application can free EXRImage using `FreeEXRImage`
-// Returns negative value and may set error string in `err` when there's an
-// error
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int LoadEXRMultipartImageFromFile(EXRImage *images,
-                                         const EXRHeader **headers,
-                                         unsigned int num_parts,
-                                         const char *filename,
-                                         const char **err);
-
-// Loads multi-part OpenEXR image from a memory.
-// Application must setup `EXRHeader*` array with
-// `ParseEXRMultipartHeaderFromMemory` before calling this function.
-// Application can free EXRImage using `FreeEXRImage`
-// Returns negative value and may set error string in `err` when there's an
-// error
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int LoadEXRMultipartImageFromMemory(EXRImage *images,
-                                           const EXRHeader **headers,
-                                           unsigned int num_parts,
-                                           const unsigned char *memory,
-                                           const size_t size, const char **err);
-
-// Saves multi-channel, single-frame OpenEXR image to a file.
-// Returns negative value and may set error string in `err` when there's an
-// error
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int SaveEXRImageToFile(const EXRImage *image,
-                              const EXRHeader *exr_header, const char *filename,
-                              const char **err);
-
-// Saves multi-channel, single-frame OpenEXR image to a memory.
-// Image is compressed using EXRImage.compression value.
-// Return the number of bytes if success.
-// Return zero and will set error string in `err` when there's an
-// error.
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern size_t SaveEXRImageToMemory(const EXRImage *image,
-                                   const EXRHeader *exr_header,
-                                   unsigned char **memory, const char **err);
-
-// Saves multi-channel, multi-frame OpenEXR image to a memory.
-// Image is compressed using EXRImage.compression value.
-// File global attributes (eg. display_window) must be set in the first header.
-// Returns negative value and may set error string in `err` when there's an
-// error
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int SaveEXRMultipartImageToFile(const EXRImage *images,
-                                       const EXRHeader **exr_headers,
-                                       unsigned int num_parts,
-                                       const char *filename, const char **err);
-
-// Saves multi-channel, multi-frame OpenEXR image to a memory.
-// Image is compressed using EXRImage.compression value.
-// File global attributes (eg. display_window) must be set in the first header.
-// Return the number of bytes if success.
-// Return zero and will set error string in `err` when there's an
-// error.
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern size_t SaveEXRMultipartImageToMemory(const EXRImage *images,
-                                            const EXRHeader **exr_headers,
-                                            unsigned int num_parts,
-                                            unsigned char **memory, const char **err);
-// Loads single-frame OpenEXR deep image.
-// Application must free memory of variables in DeepImage(image, offset_table)
-// Returns negative value and may set error string in `err` when there's an
-// error
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int LoadDeepEXR(DeepImage *out_image, const char *filename,
-                       const char **err);
-
-// NOT YET IMPLEMENTED:
-// Saves single-frame OpenEXR deep image.
-// Returns negative value and may set error string in `err` when there's an
-// error
-// extern int SaveDeepEXR(const DeepImage *in_image, const char *filename,
-//                       const char **err);
-
-// NOT YET IMPLEMENTED:
-// Loads multi-part OpenEXR deep image.
-// Application must free memory of variables in DeepImage(image, offset_table)
-// extern int LoadMultiPartDeepEXR(DeepImage **out_image, int num_parts, const
-// char *filename,
-//                       const char **err);
-
-// For emscripten.
-// Loads single-frame OpenEXR image from memory. Assume EXR image contains
-// RGB(A) channels.
-// Returns negative value and may set error string in `err` when there's an
-// error
-// When there was an error message, Application must free `err` with
-// FreeEXRErrorMessage()
-extern int LoadEXRFromMemory(float **out_rgba, int *width, int *height,
-                             const unsigned char *memory, size_t size,
-                             const char **err);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // TINYEXR_H_
-
-#ifdef TINYEXR_IMPLEMENTATION
-#ifndef TINYEXR_IMPLEMENTATION_DEFINED
-#define TINYEXR_IMPLEMENTATION_DEFINED
-
-#ifdef _WIN32
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>  // for UTF-8 and memory-mapping
-
-#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
-#define TINYEXR_USE_WIN32_MMAP (1)
-#endif
-
-#elif defined(__linux__) || defined(__unix__)
-#include <fcntl.h>     // for open()
-#include <sys/mman.h>  // for memory-mapping
-#include <sys/stat.h>  // for stat
-#include <unistd.h>    // for close()
-#define TINYEXR_USE_POSIX_MMAP (1)
-#endif
-
-#include <algorithm>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <sstream>
-
-//#include <iostream> // debug
-
-#include <limits>
-#include <string>
-#include <vector>
-#include <set>
-
-// https://stackoverflow.com/questions/5047971/how-do-i-check-for-c11-support
-#if __cplusplus > 199711L || (defined(_MSC_VER) && _MSC_VER >= 1900)
-#define TINYEXR_HAS_CXX11 (1)
-// C++11
-#include <cstdint>
-
-#if TINYEXR_USE_THREAD
-#include <atomic>
-#include <thread>
-#endif
-
-#else  // __cplusplus > 199711L
-#define TINYEXR_HAS_CXX11 (0)
-#endif  // __cplusplus > 199711L
-
-#if TINYEXR_USE_OPENMP
-#include <omp.h>
-#endif
-
-#if defined(TINYEXR_USE_MINIZ) && (TINYEXR_USE_MINIZ==1)
-#include "miniz.h"
-#else
-//  Issue #46. Please include your own zlib-compatible API header before
-//  including `tinyexr.h`
-//#include "zlib.h"
-#endif
-
-#if defined(TINYEXR_USE_NANOZLIB) && (TINYEXR_USE_NANOZLIB==1)
-#define NANOZLIB_IMPLEMENTATION
-#include "nanozlib.h"
-#endif
-
-#if TINYEXR_USE_STB_ZLIB
-// Since we don't know where a project has stb_image.h and stb_image_write.h
-// and whether they are in the include path, we don't include them here, and
-// instead declare the two relevant functions manually.
-// from stb_image.h:
-extern "C" int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
-// from stb_image_write.h:
-extern "C" unsigned char *stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality);
-#endif
-
-
-#if TINYEXR_USE_ZFP
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-#include "zfp.h"
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#endif
-
-// cond: conditional expression
-// msg: std::string
-// err: std::string*
-#define TINYEXR_CHECK_AND_RETURN_MSG(cond, msg, err) do { \
-  if (!(cond)) { \
-    if (!err) { \
-      std::ostringstream ss_e; \
-      ss_e << __func__ << "():" << __LINE__ << msg << "\n"; \
-      (*err) += ss_e.str(); \
-    } \
-    return false;\
-  } \
-  } while(0)
-
-// no error message.
-#define TINYEXR_CHECK_AND_RETURN_C(cond, retcode) do { \
-  if (!(cond)) { \
-    return retcode; \
-  } \
-  } while(0)
-
-namespace tinyexr {
-
-#if __cplusplus > 199711L
-// C++11
-typedef uint64_t tinyexr_uint64;
-typedef int64_t tinyexr_int64;
-#else
-// Although `long long` is not a standard type pre C++11, assume it is defined
-// as a compiler's extension.
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-long-long"
-#endif
-typedef unsigned long long tinyexr_uint64;
-typedef long long tinyexr_int64;
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-#endif
-
-// static bool IsBigEndian(void) {
-//  union {
-//    unsigned int i;
-//    char c[4];
-//  } bint = {0x01020304};
-//
-//  return bint.c[0] == 1;
-//}
-
-static void SetErrorMessage(const std::string &msg, const char **err) {
-  if (err) {
-#ifdef _WIN32
-    (*err) = _strdup(msg.c_str());
-#else
-    (*err) = strdup(msg.c_str());
-#endif
-  }
-}
-
-#if 0
-static void SetWarningMessage(const std::string &msg, const char **warn) {
-  if (warn) {
-#ifdef _WIN32
-    (*warn) = _strdup(msg.c_str());
-#else
-    (*warn) = strdup(msg.c_str());
-#endif
-  }
-}
-#endif
-
-static const int kEXRVersionSize = 8;
-
-static void cpy2(unsigned short *dst_val, const unsigned short *src_val) {
-  unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
-  const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-}
-
-static void swap2(unsigned short *val) {
-#if TINYEXR_LITTLE_ENDIAN
-  (void)val;
-#else
-  unsigned short tmp = *val;
-  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
-  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
-
-  dst[0] = src[1];
-  dst[1] = src[0];
-#endif
-}
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-static void cpy4(int *dst_val, const int *src_val) {
-  unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
-  const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-  dst[2] = src[2];
-  dst[3] = src[3];
-}
-
-static void cpy4(unsigned int *dst_val, const unsigned int *src_val) {
-  unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
-  const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-  dst[2] = src[2];
-  dst[3] = src[3];
-}
-
-static void cpy4(float *dst_val, const float *src_val) {
-  unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
-  const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-  dst[2] = src[2];
-  dst[3] = src[3];
-}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-static void swap4(unsigned int *val) {
-#if TINYEXR_LITTLE_ENDIAN
-  (void)val;
-#else
-  unsigned int tmp = *val;
-  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
-  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
-
-  dst[0] = src[3];
-  dst[1] = src[2];
-  dst[2] = src[1];
-  dst[3] = src[0];
-#endif
-}
-
-static void swap4(int *val) {
-#if TINYEXR_LITTLE_ENDIAN
-  (void)val;
-#else
-  int tmp = *val;
-  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
-  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
-
-  dst[0] = src[3];
-  dst[1] = src[2];
-  dst[2] = src[1];
-  dst[3] = src[0];
-#endif
-}
-
-static void swap4(float *val) {
-#if TINYEXR_LITTLE_ENDIAN
-  (void)val;
-#else
-  float tmp = *val;
-  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
-  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
-
-  dst[0] = src[3];
-  dst[1] = src[2];
-  dst[2] = src[1];
-  dst[3] = src[0];
-#endif
-}
-
-#if 0
-static void cpy8(tinyexr::tinyexr_uint64 *dst_val, const tinyexr::tinyexr_uint64 *src_val) {
-  unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val);
-  const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val);
-
-  dst[0] = src[0];
-  dst[1] = src[1];
-  dst[2] = src[2];
-  dst[3] = src[3];
-  dst[4] = src[4];
-  dst[5] = src[5];
-  dst[6] = src[6];
-  dst[7] = src[7];
-}
-#endif
-
-static void swap8(tinyexr::tinyexr_uint64 *val) {
-#if TINYEXR_LITTLE_ENDIAN
-  (void)val;
-#else
-  tinyexr::tinyexr_uint64 tmp = (*val);
-  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
-  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
-
-  dst[0] = src[7];
-  dst[1] = src[6];
-  dst[2] = src[5];
-  dst[3] = src[4];
-  dst[4] = src[3];
-  dst[5] = src[2];
-  dst[6] = src[1];
-  dst[7] = src[0];
-#endif
-}
-
-// https://gist.github.com/rygorous/2156668
-union FP32 {
-  unsigned int u;
-  float f;
-  struct {
-#if TINYEXR_LITTLE_ENDIAN
-    unsigned int Mantissa : 23;
-    unsigned int Exponent : 8;
-    unsigned int Sign : 1;
-#else
-    unsigned int Sign : 1;
-    unsigned int Exponent : 8;
-    unsigned int Mantissa : 23;
-#endif
-  } s;
-};
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-union FP16 {
-  unsigned short u;
-  struct {
-#if TINYEXR_LITTLE_ENDIAN
-    unsigned int Mantissa : 10;
-    unsigned int Exponent : 5;
-    unsigned int Sign : 1;
-#else
-    unsigned int Sign : 1;
-    unsigned int Exponent : 5;
-    unsigned int Mantissa : 10;
-#endif
-  } s;
-};
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-static FP32 half_to_float(FP16 h) {
-  static const FP32 magic = {113 << 23};
-  static const unsigned int shifted_exp = 0x7c00
-                                          << 13;  // exponent mask after shift
-  FP32 o;
-
-  o.u = (h.u & 0x7fffU) << 13U;           // exponent/mantissa bits
-  unsigned int exp_ = shifted_exp & o.u;  // just the exponent
-  o.u += (127 - 15) << 23;                // exponent adjust
-
-  // handle exponent special cases
-  if (exp_ == shifted_exp)    // Inf/NaN?
-    o.u += (128 - 16) << 23;  // extra exp adjust
-  else if (exp_ == 0)         // Zero/Denormal?
-  {
-    o.u += 1 << 23;  // extra exp adjust
-    o.f -= magic.f;  // renormalize
-  }
-
-  o.u |= (h.u & 0x8000U) << 16U;  // sign bit
-  return o;
-}
-
-static FP16 float_to_half_full(FP32 f) {
-  FP16 o = {0};
-
-  // Based on ISPC reference code (with minor modifications)
-  if (f.s.Exponent == 0)  // Signed zero/denormal (which will underflow)
-    o.s.Exponent = 0;
-  else if (f.s.Exponent == 255)  // Inf or NaN (all exponent bits set)
-  {
-    o.s.Exponent = 31;
-    o.s.Mantissa = f.s.Mantissa ? 0x200 : 0;  // NaN->qNaN and Inf->Inf
-  } else                                      // Normalized number
-  {
-    // Exponent unbias the single, then bias the halfp
-    int newexp = f.s.Exponent - 127 + 15;
-    if (newexp >= 31)  // Overflow, return signed infinity
-      o.s.Exponent = 31;
-    else if (newexp <= 0)  // Underflow
-    {
-      if ((14 - newexp) <= 24)  // Mantissa might be non-zero
-      {
-        unsigned int mant = f.s.Mantissa | 0x800000;  // Hidden 1 bit
-        o.s.Mantissa = mant >> (14 - newexp);
-        if ((mant >> (13 - newexp)) & 1)  // Check for rounding
-          o.u++;  // Round, might overflow into exp bit, but this is OK
-      }
-    } else {
-      o.s.Exponent = static_cast<unsigned int>(newexp);
-      o.s.Mantissa = f.s.Mantissa >> 13;
-      if (f.s.Mantissa & 0x1000)  // Check for rounding
-        o.u++;                    // Round, might overflow to inf, this is OK
-    }
-  }
-
-  o.s.Sign = f.s.Sign;
-  return o;
-}
-
-// NOTE: From OpenEXR code
-// #define IMF_INCREASING_Y  0
-// #define IMF_DECREASING_Y  1
-// #define IMF_RAMDOM_Y    2
-//
-// #define IMF_NO_COMPRESSION  0
-// #define IMF_RLE_COMPRESSION 1
-// #define IMF_ZIPS_COMPRESSION  2
-// #define IMF_ZIP_COMPRESSION 3
-// #define IMF_PIZ_COMPRESSION 4
-// #define IMF_PXR24_COMPRESSION 5
-// #define IMF_B44_COMPRESSION 6
-// #define IMF_B44A_COMPRESSION  7
-
-#ifdef __clang__
-#pragma clang diagnostic push
-
-#if __has_warning("-Wzero-as-null-pointer-constant")
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
-
-#endif
-
-static const char *ReadString(std::string *s, const char *ptr, size_t len) {
-  // Read untile NULL(\0).
-  const char *p = ptr;
-  const char *q = ptr;
-  while ((size_t(q - ptr) < len) && (*q) != 0) {
-    q++;
-  }
-
-  if (size_t(q - ptr) >= len) {
-    (*s).clear();
-    return NULL;
-  }
-
-  (*s) = std::string(p, q);
-
-  return q + 1;  // skip '\0'
-}
-
-static bool ReadAttribute(std::string *name, std::string *type,
-                          std::vector<unsigned char> *data, size_t *marker_size,
-                          const char *marker, size_t size) {
-  size_t name_len = strnlen(marker, size);
-  if (name_len == size) {
-    // String does not have a terminating character.
-    return false;
-  }
-  *name = std::string(marker, name_len);
-
-  marker += name_len + 1;
-  size -= name_len + 1;
-
-  size_t type_len = strnlen(marker, size);
-  if (type_len == size) {
-    return false;
-  }
-  *type = std::string(marker, type_len);
-
-  marker += type_len + 1;
-  size -= type_len + 1;
-
-  if (size < sizeof(uint32_t)) {
-    return false;
-  }
-
-  uint32_t data_len;
-  memcpy(&data_len, marker, sizeof(uint32_t));
-  tinyexr::swap4(reinterpret_cast<unsigned int *>(&data_len));
-
-  if (data_len == 0) {
-    if ((*type).compare("string") == 0) {
-      // Accept empty string attribute.
-
-      marker += sizeof(uint32_t);
-      size -= sizeof(uint32_t);
-
-      *marker_size = name_len + 1 + type_len + 1 + sizeof(uint32_t);
-
-      data->resize(1);
-      (*data)[0] = '\0';
-
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  marker += sizeof(uint32_t);
-  size -= sizeof(uint32_t);
-
-  if (size < data_len) {
-    return false;
-  }
-
-  data->resize(static_cast<size_t>(data_len));
-  memcpy(&data->at(0), marker, static_cast<size_t>(data_len));
-
-  *marker_size = name_len + 1 + type_len + 1 + sizeof(uint32_t) + data_len;
-  return true;
-}
-
-static void WriteAttributeToMemory(std::vector<unsigned char> *out,
-                                   const char *name, const char *type,
-                                   const unsigned char *data, int len) {
-  out->insert(out->end(), name, name + strlen(name) + 1);
-  out->insert(out->end(), type, type + strlen(type) + 1);
-
-  int outLen = len;
-  tinyexr::swap4(&outLen);
-  out->insert(out->end(), reinterpret_cast<unsigned char *>(&outLen),
-              reinterpret_cast<unsigned char *>(&outLen) + sizeof(int));
-  out->insert(out->end(), data, data + len);
-}
-
-typedef struct TChannelInfo {
-  std::string name;  // less than 255 bytes long
-  int pixel_type;
-  int requested_pixel_type;
-  int x_sampling;
-  int y_sampling;
-  unsigned char p_linear;
-  unsigned char pad[3];
-} ChannelInfo;
-
-typedef struct {
-  int min_x;
-  int min_y;
-  int max_x;
-  int max_y;
-} Box2iInfo;
-
-struct HeaderInfo {
-  std::vector<tinyexr::ChannelInfo> channels;
-  std::vector<EXRAttribute> attributes;
-
-  Box2iInfo data_window;
-  int line_order;
-  Box2iInfo display_window;
-  float screen_window_center[2];
-  float screen_window_width;
-  float pixel_aspect_ratio;
-
-  int chunk_count;
-
-  // Tiled format
-  int tiled; // Non-zero if the part is tiled.
-  int tile_size_x;
-  int tile_size_y;
-  int tile_level_mode;
-  int tile_rounding_mode;
-
-  unsigned int header_len;
-
-  int compression_type;
-
-  // required for multi-part or non-image files
-  std::string name;
-  // required for multi-part or non-image files
-  std::string type;
-
-  void clear() {
-    channels.clear();
-    attributes.clear();
-
-    data_window.min_x = 0;
-    data_window.min_y = 0;
-    data_window.max_x = 0;
-    data_window.max_y = 0;
-    line_order = 0;
-    display_window.min_x = 0;
-    display_window.min_y = 0;
-    display_window.max_x = 0;
-    display_window.max_y = 0;
-    screen_window_center[0] = 0.0f;
-    screen_window_center[1] = 0.0f;
-    screen_window_width = 0.0f;
-    pixel_aspect_ratio = 0.0f;
-
-    chunk_count = 0;
-
-    // Tiled format
-    tiled = 0;
-    tile_size_x = 0;
-    tile_size_y = 0;
-    tile_level_mode = 0;
-    tile_rounding_mode = 0;
-
-    header_len = 0;
-    compression_type = 0;
-
-    name.clear();
-    type.clear();
-  }
-};
-
-static bool ReadChannelInfo(std::vector<ChannelInfo> &channels,
-                            const std::vector<unsigned char> &data) {
-  const char *p = reinterpret_cast<const char *>(&data.at(0));
-
-  for (;;) {
-    if ((*p) == 0) {
-      break;
-    }
-    ChannelInfo info;
-    info.requested_pixel_type = 0;
-
-    tinyexr_int64 data_len = static_cast<tinyexr_int64>(data.size()) -
-                             (p - reinterpret_cast<const char *>(data.data()));
-    if (data_len < 0) {
-      return false;
-    }
-
-    p = ReadString(&info.name, p, size_t(data_len));
-    if ((p == NULL) && (info.name.empty())) {
-      // Buffer overrun. Issue #51.
-      return false;
-    }
-
-    const unsigned char *data_end =
-        reinterpret_cast<const unsigned char *>(p) + 16;
-    if (data_end >= (data.data() + data.size())) {
-      return false;
-    }
-
-    memcpy(&info.pixel_type, p, sizeof(int));
-    p += 4;
-    info.p_linear = static_cast<unsigned char>(p[0]);  // uchar
-    p += 1 + 3;                                        // reserved: uchar[3]
-    memcpy(&info.x_sampling, p, sizeof(int));          // int
-    p += 4;
-    memcpy(&info.y_sampling, p, sizeof(int));  // int
-    p += 4;
-
-    tinyexr::swap4(&info.pixel_type);
-    tinyexr::swap4(&info.x_sampling);
-    tinyexr::swap4(&info.y_sampling);
-
-    channels.push_back(info);
-  }
-
-  return true;
-}
-
-static void WriteChannelInfo(std::vector<unsigned char> &data,
-                             const std::vector<ChannelInfo> &channels) {
-  size_t sz = 0;
-
-  // Calculate total size.
-  for (size_t c = 0; c < channels.size(); c++) {
-    sz += channels[c].name.length() + 1;  // +1 for \0
-    sz += 16;                                    // 4 * int
-  }
-  data.resize(sz + 1);
-
-  unsigned char *p = &data.at(0);
-
-  for (size_t c = 0; c < channels.size(); c++) {
-    memcpy(p, channels[c].name.c_str(), channels[c].name.length());
-    p += channels[c].name.length();
-    (*p) = '\0';
-    p++;
-
-    int pixel_type = channels[c].requested_pixel_type;
-    int x_sampling = channels[c].x_sampling;
-    int y_sampling = channels[c].y_sampling;
-    tinyexr::swap4(&pixel_type);
-    tinyexr::swap4(&x_sampling);
-    tinyexr::swap4(&y_sampling);
-
-    memcpy(p, &pixel_type, sizeof(int));
-    p += sizeof(int);
-
-    (*p) = channels[c].p_linear;
-    p += 4;
-
-    memcpy(p, &x_sampling, sizeof(int));
-    p += sizeof(int);
-
-    memcpy(p, &y_sampling, sizeof(int));
-    p += sizeof(int);
-  }
-
-  (*p) = '\0';
-}
-
-static bool CompressZip(unsigned char *dst,
-                        tinyexr::tinyexr_uint64 &compressedSize,
-                        const unsigned char *src, unsigned long src_size) {
-  std::vector<unsigned char> tmpBuf(src_size);
-
-  //
-  // Apply EXR-specific? postprocess. Grabbed from OpenEXR's
-  // ImfZipCompressor.cpp
-  //
-
-  //
-  // Reorder the pixel data.
-  //
-
-  const char *srcPtr = reinterpret_cast<const char *>(src);
-
-  {
-    char *t1 = reinterpret_cast<char *>(&tmpBuf.at(0));
-    char *t2 = reinterpret_cast<char *>(&tmpBuf.at(0)) + (src_size + 1) / 2;
-    const char *stop = srcPtr + src_size;
-
-    for (;;) {
-      if (srcPtr < stop)
-        *(t1++) = *(srcPtr++);
-      else
-        break;
-
-      if (srcPtr < stop)
-        *(t2++) = *(srcPtr++);
-      else
-        break;
-    }
-  }
-
-  //
-  // Predictor.
-  //
-
-  {
-    unsigned char *t = &tmpBuf.at(0) + 1;
-    unsigned char *stop = &tmpBuf.at(0) + src_size;
-    int p = t[-1];
-
-    while (t < stop) {
-      int d = int(t[0]) - p + (128 + 256);
-      p = t[0];
-      t[0] = static_cast<unsigned char>(d);
-      ++t;
-    }
-  }
-
-#if defined(TINYEXR_USE_MINIZ) && (TINYEXR_USE_MINIZ==1)
-  //
-  // Compress the data using miniz
-  //
-
-  mz_ulong outSize = mz_compressBound(src_size);
-  int ret = mz_compress(
-      dst, &outSize, static_cast<const unsigned char *>(&tmpBuf.at(0)),
-      src_size);
-  if (ret != MZ_OK) {
-    return false;
-  }
-
-  compressedSize = outSize;
-#elif defined(TINYEXR_USE_STB_ZLIB) && (TINYEXR_USE_STB_ZLIB==1)
-  int outSize;
-  unsigned char* ret = stbi_zlib_compress(const_cast<unsigned char*>(&tmpBuf.at(0)), src_size, &outSize, 8);
-  if (!ret) {
-    return false;
-  }
-  memcpy(dst, ret, outSize);
-  free(ret);
-
-  compressedSize = outSize;
-#elif defined(TINYEXR_USE_NANOZLIB) && (TINYEXR_USE_NANOZLIB==1)
-  uint64_t dstSize = nanoz_compressBound(static_cast<uint64_t>(src_size));
-  int outSize{0};
-  unsigned char *ret = nanoz_compress(&tmpBuf.at(0), src_size, &outSize, /* quality */8);
-  if (!ret) {
-    return false;
-  }
-
-  memcpy(dst, ret, outSize);
-  free(ret);
-  
-  compressedSize = outSize;
-#else
-  uLong outSize = compressBound(static_cast<uLong>(src_size));
-  int ret = compress(dst, &outSize, static_cast<const Bytef *>(&tmpBuf.at(0)),
-                     src_size);
-  if (ret != Z_OK) {
-    return false;
-  }
-
-  compressedSize = outSize;
-#endif
-
-  // Use uncompressed data when compressed data is larger than uncompressed.
-  // (Issue 40)
-  if (compressedSize >= src_size) {
-    compressedSize = src_size;
-    memcpy(dst, src, src_size);
-  }
-
-  return true;
-}
-
-static bool DecompressZip(unsigned char *dst,
-                          unsigned long *uncompressed_size /* inout */,
-                          const unsigned char *src, unsigned long src_size) {
-  if ((*uncompressed_size) == src_size) {
-    // Data is not compressed(Issue 40).
-    memcpy(dst, src, src_size);
-    return true;
-  }
-  std::vector<unsigned char> tmpBuf(*uncompressed_size);
-
-#if defined(TINYEXR_USE_MINIZ) && (TINYEXR_USE_MINIZ==1)
-  int ret =
-      mz_uncompress(&tmpBuf.at(0), uncompressed_size, src, src_size);
-  if (MZ_OK != ret) {
-    return false;
-  }
-#elif TINYEXR_USE_STB_ZLIB
-  int ret = stbi_zlib_decode_buffer(reinterpret_cast<char*>(&tmpBuf.at(0)),
-      *uncompressed_size, reinterpret_cast<const char*>(src), src_size);
-  if (ret < 0) {
-    return false;
-  }
-#elif defined(TINYEXR_USE_NANOZLIB) && (TINYEXR_USE_NANOZLIB==1)
-  uint64_t dest_size = (*uncompressed_size);
-  uint64_t uncomp_size{0};
-  nanoz_status_t ret =
-      nanoz_uncompress(src, src_size, dest_size, &tmpBuf.at(0), &uncomp_size);
-  if (NANOZ_SUCCESS != ret) {
-    return false;
-  }
-  if ((*uncompressed_size) != uncomp_size) {
-    return false;
-  }
-#else
-  int ret = uncompress(&tmpBuf.at(0), uncompressed_size, src, src_size);
-  if (Z_OK != ret) {
-    return false;
-  }
-#endif
-
-  //
-  // Apply EXR-specific? postprocess. Grabbed from OpenEXR's
-  // ImfZipCompressor.cpp
-  //
-
-  // Predictor.
-  {
-    unsigned char *t = &tmpBuf.at(0) + 1;
-    unsigned char *stop = &tmpBuf.at(0) + (*uncompressed_size);
-
-    while (t < stop) {
-      int d = int(t[-1]) + int(t[0]) - 128;
-      t[0] = static_cast<unsigned char>(d);
-      ++t;
-    }
-  }
-
-  // Reorder the pixel data.
-  {
-    const char *t1 = reinterpret_cast<const char *>(&tmpBuf.at(0));
-    const char *t2 = reinterpret_cast<const char *>(&tmpBuf.at(0)) +
-                     (*uncompressed_size + 1) / 2;
-    char *s = reinterpret_cast<char *>(dst);
-    char *stop = s + (*uncompressed_size);
-
-    for (;;) {
-      if (s < stop)
-        *(s++) = *(t1++);
-      else
-        break;
-
-      if (s < stop)
-        *(s++) = *(t2++);
-      else
-        break;
-    }
-  }
-
-  return true;
-}
-
-// RLE code from OpenEXR --------------------------------------
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wsign-conversion"
-#if __has_warning("-Wextra-semi-stmt")
-#pragma clang diagnostic ignored "-Wextra-semi-stmt"
-#endif
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4204)  // nonstandard extension used : non-constant
-                                 // aggregate initializer (also supported by GNU
-                                 // C and C99, so no big deal)
-#pragma warning(disable : 4244)  // 'initializing': conversion from '__int64' to
-                                 // 'int', possible loss of data
-#pragma warning(disable : 4267)  // 'argument': conversion from '__int64' to
-                                 // 'int', possible loss of data
-#pragma warning(disable : 4996)  // 'strdup': The POSIX name for this item is
-                                 // deprecated. Instead, use the ISO C and C++
-                                 // conformant name: _strdup.
-#endif
-
-const int MIN_RUN_LENGTH = 3;
-const int MAX_RUN_LENGTH = 127;
-
-//
-// Compress an array of bytes, using run-length encoding,
-// and return the length of the compressed data.
-//
-
-static int rleCompress(int inLength, const char in[], signed char out[]) {
-  const char *inEnd = in + inLength;
-  const char *runStart = in;
-  const char *runEnd = in + 1;
-  signed char *outWrite = out;
-
-  while (runStart < inEnd) {
-    while (runEnd < inEnd && *runStart == *runEnd &&
-           runEnd - runStart - 1 < MAX_RUN_LENGTH) {
-      ++runEnd;
-    }
-
-    if (runEnd - runStart >= MIN_RUN_LENGTH) {
-      //
-      // Compressible run
-      //
-
-      *outWrite++ = static_cast<char>(runEnd - runStart) - 1;
-      *outWrite++ = *(reinterpret_cast<const signed char *>(runStart));
-      runStart = runEnd;
-    } else {
-      //
-      // Uncompressable run
-      //
-
-      while (runEnd < inEnd &&
-             ((runEnd + 1 >= inEnd || *runEnd != *(runEnd + 1)) ||
-              (runEnd + 2 >= inEnd || *(runEnd + 1) != *(runEnd + 2))) &&
-             runEnd - runStart < MAX_RUN_LENGTH) {
-        ++runEnd;
-      }
-
-      *outWrite++ = static_cast<char>(runStart - runEnd);
-
-      while (runStart < runEnd) {
-        *outWrite++ = *(reinterpret_cast<const signed char *>(runStart++));
-      }
-    }
-
-    ++runEnd;
-  }
-
-  return static_cast<int>(outWrite - out);
-}
-
-//
-// Uncompress an array of bytes compressed with rleCompress().
-// Returns the length of the uncompressed data, or 0 if the
-// length of the uncompressed data would be more than maxLength.
-//
-
-static int rleUncompress(int inLength, int maxLength, const signed char in[],
-                         char out[]) {
-  char *outStart = out;
-
-  while (inLength > 0) {
-    if (*in < 0) {
-      int count = -(static_cast<int>(*in++));
-      inLength -= count + 1;
-
-      // Fixes #116: Add bounds check to in buffer.
-      if ((0 > (maxLength -= count)) || (inLength < 0)) return 0;
-
-      memcpy(out, in, count);
-      out += count;
-      in += count;
-    } else {
-      int count = *in++;
-      inLength -= 2;
-
-      if ((0 > (maxLength -= count + 1)) || (inLength < 0)) return 0;
-
-      memset(out, *reinterpret_cast<const char *>(in), count + 1);
-      out += count + 1;
-
-      in++;
-    }
-  }
-
-  return static_cast<int>(out - outStart);
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// End of RLE code from OpenEXR -----------------------------------
-
-static bool CompressRle(unsigned char *dst,
-                        tinyexr::tinyexr_uint64 &compressedSize,
-                        const unsigned char *src, unsigned long src_size) {
-  std::vector<unsigned char> tmpBuf(src_size);
-
-  //
-  // Apply EXR-specific? postprocess. Grabbed from OpenEXR's
-  // ImfRleCompressor.cpp
-  //
-
-  //
-  // Reorder the pixel data.
-  //
-
-  const char *srcPtr = reinterpret_cast<const char *>(src);
-
-  {
-    char *t1 = reinterpret_cast<char *>(&tmpBuf.at(0));
-    char *t2 = reinterpret_cast<char *>(&tmpBuf.at(0)) + (src_size + 1) / 2;
-    const char *stop = srcPtr + src_size;
-
-    for (;;) {
-      if (srcPtr < stop)
-        *(t1++) = *(srcPtr++);
-      else
-        break;
-
-      if (srcPtr < stop)
-        *(t2++) = *(srcPtr++);
-      else
-        break;
-    }
-  }
-
-  //
-  // Predictor.
-  //
-
-  {
-    unsigned char *t = &tmpBuf.at(0) + 1;
-    unsigned char *stop = &tmpBuf.at(0) + src_size;
-    int p = t[-1];
-
-    while (t < stop) {
-      int d = int(t[0]) - p + (128 + 256);
-      p = t[0];
-      t[0] = static_cast<unsigned char>(d);
-      ++t;
-    }
-  }
-
-  // outSize will be (srcSiz * 3) / 2 at max.
-  int outSize = rleCompress(static_cast<int>(src_size),
-                            reinterpret_cast<const char *>(&tmpBuf.at(0)),
-                            reinterpret_cast<signed char *>(dst));
-  TINYEXR_CHECK_AND_RETURN_C(outSize > 0, false);
-
-  compressedSize = static_cast<tinyexr::tinyexr_uint64>(outSize);
-
-  // Use uncompressed data when compressed data is larger than uncompressed.
-  // (Issue 40)
-  if (compressedSize >= src_size) {
-    compressedSize = src_size;
-    memcpy(dst, src, src_size);
-  }
-
-  return true;
-}
-
-static bool DecompressRle(unsigned char *dst,
-                          const unsigned long uncompressed_size,
-                          const unsigned char *src, unsigned long src_size) {
-  if (uncompressed_size == src_size) {
-    // Data is not compressed(Issue 40).
-    memcpy(dst, src, src_size);
-    return true;
-  }
-
-  // Workaround for issue #112.
-  // TODO(syoyo): Add more robust out-of-bounds check in `rleUncompress`.
-  if (src_size <= 2) {
-    return false;
-  }
-
-  std::vector<unsigned char> tmpBuf(uncompressed_size);
-
-  int ret = rleUncompress(static_cast<int>(src_size),
-                          static_cast<int>(uncompressed_size),
-                          reinterpret_cast<const signed char *>(src),
-                          reinterpret_cast<char *>(&tmpBuf.at(0)));
-  if (ret != static_cast<int>(uncompressed_size)) {
-    return false;
-  }
-
-  //
-  // Apply EXR-specific? postprocess. Grabbed from OpenEXR's
-  // ImfRleCompressor.cpp
-  //
-
-  // Predictor.
-  {
-    unsigned char *t = &tmpBuf.at(0) + 1;
-    unsigned char *stop = &tmpBuf.at(0) + uncompressed_size;
-
-    while (t < stop) {
-      int d = int(t[-1]) + int(t[0]) - 128;
-      t[0] = static_cast<unsigned char>(d);
-      ++t;
-    }
-  }
-
-  // Reorder the pixel data.
-  {
-    const char *t1 = reinterpret_cast<const char *>(&tmpBuf.at(0));
-    const char *t2 = reinterpret_cast<const char *>(&tmpBuf.at(0)) +
-                     (uncompressed_size + 1) / 2;
-    char *s = reinterpret_cast<char *>(dst);
-    char *stop = s + uncompressed_size;
-
-    for (;;) {
-      if (s < stop)
-        *(s++) = *(t1++);
-      else
-        break;
-
-      if (s < stop)
-        *(s++) = *(t2++);
-      else
-        break;
-    }
-  }
-
-  return true;
-}
-
-#if TINYEXR_USE_PIZ
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++11-long-long"
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wsign-conversion"
-#pragma clang diagnostic ignored "-Wc++11-extensions"
-#pragma clang diagnostic ignored "-Wconversion"
-#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-
-#if __has_warning("-Wcast-qual")
-#pragma clang diagnostic ignored "-Wcast-qual"
-#endif
-
-#if __has_warning("-Wextra-semi-stmt")
-#pragma clang diagnostic ignored "-Wextra-semi-stmt"
-#endif
-
-#endif
-
-//
-// PIZ compress/uncompress, based on OpenEXR's ImfPizCompressor.cpp
-//
-// -----------------------------------------------------------------
-// Copyright (c) 2004, Industrial Light & Magic, a division of Lucas
-// Digital Ltd. LLC)
-// (3 clause BSD license)
-//
-
-struct PIZChannelData {
-  unsigned short *start;
-  unsigned short *end;
-  int nx;
-  int ny;
-  int ys;
-  int size;
-};
-
-//-----------------------------------------------------------------------------
-//
-//  16-bit Haar Wavelet encoding and decoding
-//
-//  The source code in this file is derived from the encoding
-//  and decoding routines written by Christian Rouet for his
-//  PIZ image file format.
-//
-//-----------------------------------------------------------------------------
-
-//
-// Wavelet basis functions without modulo arithmetic; they produce
-// the best compression ratios when the wavelet-transformed data are
-// Huffman-encoded, but the wavelet transform works only for 14-bit
-// data (untransformed data values must be less than (1 << 14)).
-//
-
-inline void wenc14(unsigned short a, unsigned short b, unsigned short &l,
-                   unsigned short &h) {
-  short as = static_cast<short>(a);
-  short bs = static_cast<short>(b);
-
-  short ms = (as + bs) >> 1;
-  short ds = as - bs;
-
-  l = static_cast<unsigned short>(ms);
-  h = static_cast<unsigned short>(ds);
-}
-
-inline void wdec14(unsigned short l, unsigned short h, unsigned short &a,
-                   unsigned short &b) {
-  short ls = static_cast<short>(l);
-  short hs = static_cast<short>(h);
-
-  int hi = hs;
-  int ai = ls + (hi & 1) + (hi >> 1);
-
-  short as = static_cast<short>(ai);
-  short bs = static_cast<short>(ai - hi);
-
-  a = static_cast<unsigned short>(as);
-  b = static_cast<unsigned short>(bs);
-}
-
-//
-// Wavelet basis functions with modulo arithmetic; they work with full
-// 16-bit data, but Huffman-encoding the wavelet-transformed data doesn't
-// compress the data quite as well.
-//
-
-const int NBITS = 16;
-const int A_OFFSET = 1 << (NBITS - 1);
-const int M_OFFSET = 1 << (NBITS - 1);
-const int MOD_MASK = (1 << NBITS) - 1;
-
-inline void wenc16(unsigned short a, unsigned short b, unsigned short &l,
-                   unsigned short &h) {
-  int ao = (a + A_OFFSET) & MOD_MASK;
-  int m = ((ao + b) >> 1);
-  int d = ao - b;
-
-  if (d < 0) m = (m + M_OFFSET) & MOD_MASK;
-
-  d &= MOD_MASK;
-
-  l = static_cast<unsigned short>(m);
-  h = static_cast<unsigned short>(d);
-}
-
-inline void wdec16(unsigned short l, unsigned short h, unsigned short &a,
-                   unsigned short &b) {
-  int m = l;
-  int d = h;
-  int bb = (m - (d >> 1)) & MOD_MASK;
-  int aa = (d + bb - A_OFFSET) & MOD_MASK;
-  b = static_cast<unsigned short>(bb);
-  a = static_cast<unsigned short>(aa);
-}
-
-//
-// 2D Wavelet encoding:
-//
-
-static void wav2Encode(
-    unsigned short *in,  // io: values are transformed in place
-    int nx,              // i : x size
-    int ox,              // i : x offset
-    int ny,              // i : y size
-    int oy,              // i : y offset
-    unsigned short mx)   // i : maximum in[x][y] value
-{
-  bool w14 = (mx < (1 << 14));
-  int n = (nx > ny) ? ny : nx;
-  int p = 1;   // == 1 <<  level
-  int p2 = 2;  // == 1 << (level+1)
-
-  //
-  // Hierarchical loop on smaller dimension n
-  //
-
-  while (p2 <= n) {
-    unsigned short *py = in;
-    unsigned short *ey = in + oy * (ny - p2);
-    int oy1 = oy * p;
-    int oy2 = oy * p2;
-    int ox1 = ox * p;
-    int ox2 = ox * p2;
-    unsigned short i00, i01, i10, i11;
-
-    //
-    // Y loop
-    //
-
-    for (; py <= ey; py += oy2) {
-      unsigned short *px = py;
-      unsigned short *ex = py + ox * (nx - p2);
-
-      //
-      // X loop
-      //
-
-      for (; px <= ex; px += ox2) {
-        unsigned short *p01 = px + ox1;
-        unsigned short *p10 = px + oy1;
-        unsigned short *p11 = p10 + ox1;
-
-        //
-        // 2D wavelet encoding
-        //
-
-        if (w14) {
-          wenc14(*px, *p01, i00, i01);
-          wenc14(*p10, *p11, i10, i11);
-          wenc14(i00, i10, *px, *p10);
-          wenc14(i01, i11, *p01, *p11);
-        } else {
-          wenc16(*px, *p01, i00, i01);
-          wenc16(*p10, *p11, i10, i11);
-          wenc16(i00, i10, *px, *p10);
-          wenc16(i01, i11, *p01, *p11);
-        }
-      }
-
-      //
-      // Encode (1D) odd column (still in Y loop)
-      //
-
-      if (nx & p) {
-        unsigned short *p10 = px + oy1;
-
-        if (w14)
-          wenc14(*px, *p10, i00, *p10);
-        else
-          wenc16(*px, *p10, i00, *p10);
-
-        *px = i00;
-      }
-    }
-
-    //
-    // Encode (1D) odd line (must loop in X)
-    //
-
-    if (ny & p) {
-      unsigned short *px = py;
-      unsigned short *ex = py + ox * (nx - p2);
-
-      for (; px <= ex; px += ox2) {
-        unsigned short *p01 = px + ox1;
-
-        if (w14)
-          wenc14(*px, *p01, i00, *p01);
-        else
-          wenc16(*px, *p01, i00, *p01);
-
-        *px = i00;
-      }
-    }
-
-    //
-    // Next level
-    //
-
-    p = p2;
-    p2 <<= 1;
-  }
-}
-
-//
-// 2D Wavelet decoding:
-//
-
-static void wav2Decode(
-    unsigned short *in,  // io: values are transformed in place
-    int nx,              // i : x size
-    int ox,              // i : x offset
-    int ny,              // i : y size
-    int oy,              // i : y offset
-    unsigned short mx)   // i : maximum in[x][y] value
-{
-  bool w14 = (mx < (1 << 14));
-  int n = (nx > ny) ? ny : nx;
-  int p = 1;
-  int p2;
-
-  //
-  // Search max level
-  //
-
-  while (p <= n) p <<= 1;
-
-  p >>= 1;
-  p2 = p;
-  p >>= 1;
-
-  //
-  // Hierarchical loop on smaller dimension n
-  //
-
-  while (p >= 1) {
-    unsigned short *py = in;
-    unsigned short *ey = in + oy * (ny - p2);
-    int oy1 = oy * p;
-    int oy2 = oy * p2;
-    int ox1 = ox * p;
-    int ox2 = ox * p2;
-    unsigned short i00, i01, i10, i11;
-
-    //
-    // Y loop
-    //
-
-    for (; py <= ey; py += oy2) {
-      unsigned short *px = py;
-      unsigned short *ex = py + ox * (nx - p2);
-
-      //
-      // X loop
-      //
-
-      for (; px <= ex; px += ox2) {
-        unsigned short *p01 = px + ox1;
-        unsigned short *p10 = px + oy1;
-        unsigned short *p11 = p10 + ox1;
-
-        //
-        // 2D wavelet decoding
-        //
-
-        if (w14) {
-          wdec14(*px, *p10, i00, i10);
-          wdec14(*p01, *p11, i01, i11);
-          wdec14(i00, i01, *px, *p01);
-          wdec14(i10, i11, *p10, *p11);
-        } else {
-          wdec16(*px, *p10, i00, i10);
-          wdec16(*p01, *p11, i01, i11);
-          wdec16(i00, i01, *px, *p01);
-          wdec16(i10, i11, *p10, *p11);
-        }
-      }
-
-      //
-      // Decode (1D) odd column (still in Y loop)
-      //
-
-      if (nx & p) {
-        unsigned short *p10 = px + oy1;
-
-        if (w14)
-          wdec14(*px, *p10, i00, *p10);
-        else
-          wdec16(*px, *p10, i00, *p10);
-
-        *px = i00;
-      }
-    }
-
-    //
-    // Decode (1D) odd line (must loop in X)
-    //
-
-    if (ny & p) {
-      unsigned short *px = py;
-      unsigned short *ex = py + ox * (nx - p2);
-
-      for (; px <= ex; px += ox2) {
-        unsigned short *p01 = px + ox1;
-
-        if (w14)
-          wdec14(*px, *p01, i00, *p01);
-        else
-          wdec16(*px, *p01, i00, *p01);
-
-        *px = i00;
-      }
-    }
-
-    //
-    // Next level
-    //
-
-    p2 = p;
-    p >>= 1;
-  }
-}
-
-//-----------------------------------------------------------------------------
-//
-//  16-bit Huffman compression and decompression.
-//
-//  The source code in this file is derived from the 8-bit
-//  Huffman compression and decompression routines written
-//  by Christian Rouet for his PIZ image file format.
-//
-//-----------------------------------------------------------------------------
-
-// Adds some modification for tinyexr.
-
-const int HUF_ENCBITS = 16;  // literal (value) bit length
-const int HUF_DECBITS = 14;  // decoding bit size (>= 8)
-
-const int HUF_ENCSIZE = (1 << HUF_ENCBITS) + 1;  // encoding table size
-const int HUF_DECSIZE = 1 << HUF_DECBITS;        // decoding table size
-const int HUF_DECMASK = HUF_DECSIZE - 1;
-
-struct HufDec {  // short code    long code
-  //-------------------------------
-  unsigned int len : 8;   // code length    0
-  unsigned int lit : 24;  // lit      p size
-  unsigned int *p;        // 0      lits
-};
-
-inline long long hufLength(long long code) { return code & 63; }
-
-inline long long hufCode(long long code) { return code >> 6; }
-
-inline void outputBits(int nBits, long long bits, long long &c, int &lc,
-                       char *&out) {
-  c <<= nBits;
-  lc += nBits;
-
-  c |= bits;
-
-  while (lc >= 8) *out++ = static_cast<char>((c >> (lc -= 8)));
-}
-
-inline long long getBits(int nBits, long long &c, int &lc, const char *&in) {
-  while (lc < nBits) {
-    c = (c << 8) | *(reinterpret_cast<const unsigned char *>(in++));
-    lc += 8;
-  }
-
-  lc -= nBits;
-  return (c >> lc) & ((1 << nBits) - 1);
-}
-
-//
-// ENCODING TABLE BUILDING & (UN)PACKING
-//
-
-//
-// Build a "canonical" Huffman code table:
-//  - for each (uncompressed) symbol, hcode contains the length
-//    of the corresponding code (in the compressed data)
-//  - canonical codes are computed and stored in hcode
-//  - the rules for constructing canonical codes are as follows:
-//    * shorter codes (if filled with zeroes to the right)
-//      have a numerically higher value than longer codes
-//    * for codes with the same length, numerical values
-//      increase with numerical symbol values
-//  - because the canonical code table can be constructed from
-//    symbol lengths alone, the code table can be transmitted
-//    without sending the actual code values
-//  - see http://www.compressconsult.com/huffman/
-//
-
-static void hufCanonicalCodeTable(long long hcode[HUF_ENCSIZE]) {
-  long long n[59];
-
-  //
-  // For each i from 0 through 58, count the
-  // number of different codes of length i, and
-  // store the count in n[i].
-  //
-
-  for (int i = 0; i <= 58; ++i) n[i] = 0;
-
-  for (int i = 0; i < HUF_ENCSIZE; ++i) n[hcode[i]] += 1;
-
-  //
-  // For each i from 58 through 1, compute the
-  // numerically lowest code with length i, and
-  // store that code in n[i].
-  //
-
-  long long c = 0;
-
-  for (int i = 58; i > 0; --i) {
-    long long nc = ((c + n[i]) >> 1);
-    n[i] = c;
-    c = nc;
-  }
-
-  //
-  // hcode[i] contains the length, l, of the
-  // code for symbol i.  Assign the next available
-  // code of length l to the symbol and store both
-  // l and the code in hcode[i].
-  //
-
-  for (int i = 0; i < HUF_ENCSIZE; ++i) {
-    int l = static_cast<int>(hcode[i]);
-
-    if (l > 0) hcode[i] = l | (n[l]++ << 6);
-  }
-}
-
-//
-// Compute Huffman codes (based on frq input) and store them in frq:
-//  - code structure is : [63:lsb - 6:msb] | [5-0: bit length];
-//  - max code length is 58 bits;
-//  - codes outside the range [im-iM] have a null length (unused values);
-//  - original frequencies are destroyed;
-//  - encoding tables are used by hufEncode() and hufBuildDecTable();
-//
-
-struct FHeapCompare {
-  bool operator()(long long *a, long long *b) { return *a > *b; }
-};
-
-static bool hufBuildEncTable(
-    long long *frq,  // io: input frequencies [HUF_ENCSIZE], output table
-    int *im,         //  o: min frq index
-    int *iM)         //  o: max frq index
-{
-  //
-  // This function assumes that when it is called, array frq
-  // indicates the frequency of all possible symbols in the data
-  // that are to be Huffman-encoded.  (frq[i] contains the number
-  // of occurrences of symbol i in the data.)
-  //
-  // The loop below does three things:
-  //
-  // 1) Finds the minimum and maximum indices that point
-  //    to non-zero entries in frq:
-  //
-  //     frq[im] != 0, and frq[i] == 0 for all i < im
-  //     frq[iM] != 0, and frq[i] == 0 for all i > iM
-  //
-  // 2) Fills array fHeap with pointers to all non-zero
-  //    entries in frq.
-  //
-  // 3) Initializes array hlink such that hlink[i] == i
-  //    for all array entries.
-  //
-
-  std::vector<int> hlink(HUF_ENCSIZE);
-  std::vector<long long *> fHeap(HUF_ENCSIZE);
-
-  *im = 0;
-
-  while (!frq[*im]) (*im)++;
-
-  int nf = 0;
-
-  for (int i = *im; i < HUF_ENCSIZE; i++) {
-    hlink[i] = i;
-
-    if (frq[i]) {
-      fHeap[nf] = &frq[i];
-      nf++;
-      *iM = i;
-    }
-  }
-
-  //
-  // Add a pseudo-symbol, with a frequency count of 1, to frq;
-  // adjust the fHeap and hlink array accordingly.  Function
-  // hufEncode() uses the pseudo-symbol for run-length encoding.
-  //
-
-  (*iM)++;
-  frq[*iM] = 1;
-  fHeap[nf] = &frq[*iM];
-  nf++;
-
-  //
-  // Build an array, scode, such that scode[i] contains the number
-  // of bits assigned to symbol i.  Conceptually this is done by
-  // constructing a tree whose leaves are the symbols with non-zero
-  // frequency:
-  //
-  //     Make a heap that contains all symbols with a non-zero frequency,
-  //     with the least frequent symbol on top.
-  //
-  //     Repeat until only one symbol is left on the heap:
-  //
-  //         Take the two least frequent symbols off the top of the heap.
-  //         Create a new node that has first two nodes as children, and
-  //         whose frequency is the sum of the frequencies of the first
-  //         two nodes.  Put the new node back into the heap.
-  //
-  // The last node left on the heap is the root of the tree.  For each
-  // leaf node, the distance between the root and the leaf is the length
-  // of the code for the corresponding symbol.
-  //
-  // The loop below doesn't actually build the tree; instead we compute
-  // the distances of the leaves from the root on the fly.  When a new
-  // node is added to the heap, then that node's descendants are linked
-  // into a single linear list that starts at the new node, and the code
-  // lengths of the descendants (that is, their distance from the root
-  // of the tree) are incremented by one.
-  //
-
-  std::make_heap(&fHeap[0], &fHeap[nf], FHeapCompare());
-
-  std::vector<long long> scode(HUF_ENCSIZE);
-  memset(scode.data(), 0, sizeof(long long) * HUF_ENCSIZE);
-
-  while (nf > 1) {
-    //
-    // Find the indices, mm and m, of the two smallest non-zero frq
-    // values in fHeap, add the smallest frq to the second-smallest
-    // frq, and remove the smallest frq value from fHeap.
-    //
-
-    int mm = fHeap[0] - frq;
-    std::pop_heap(&fHeap[0], &fHeap[nf], FHeapCompare());
-    --nf;
-
-    int m = fHeap[0] - frq;
-    std::pop_heap(&fHeap[0], &fHeap[nf], FHeapCompare());
-
-    frq[m] += frq[mm];
-    std::push_heap(&fHeap[0], &fHeap[nf], FHeapCompare());
-
-    //
-    // The entries in scode are linked into lists with the
-    // entries in hlink serving as "next" pointers and with
-    // the end of a list marked by hlink[j] == j.
-    //
-    // Traverse the lists that start at scode[m] and scode[mm].
-    // For each element visited, increment the length of the
-    // corresponding code by one bit. (If we visit scode[j]
-    // during the traversal, then the code for symbol j becomes
-    // one bit longer.)
-    //
-    // Merge the lists that start at scode[m] and scode[mm]
-    // into a single list that starts at scode[m].
-    //
-
-    //
-    // Add a bit to all codes in the first list.
-    //
-
-    for (int j = m;; j = hlink[j]) {
-      scode[j]++;
-
-      TINYEXR_CHECK_AND_RETURN_C(scode[j] <= 58, false);
-
-      if (hlink[j] == j) {
-        //
-        // Merge the two lists.
-        //
-
-        hlink[j] = mm;
-        break;
-      }
-    }
-
-    //
-    // Add a bit to all codes in the second list
-    //
-
-    for (int j = mm;; j = hlink[j]) {
-      scode[j]++;
-
-      TINYEXR_CHECK_AND_RETURN_C(scode[j] <= 58, false);
-
-      if (hlink[j] == j) break;
-    }
-  }
-
-  //
-  // Build a canonical Huffman code table, replacing the code
-  // lengths in scode with (code, code length) pairs.  Copy the
-  // code table from scode into frq.
-  //
-
-  hufCanonicalCodeTable(scode.data());
-  memcpy(frq, scode.data(), sizeof(long long) * HUF_ENCSIZE);
-
-  return true;
-}
-
-//
-// Pack an encoding table:
-//  - only code lengths, not actual codes, are stored
-//  - runs of zeroes are compressed as follows:
-//
-//    unpacked    packed
-//    --------------------------------
-//    1 zero    0  (6 bits)
-//    2 zeroes    59
-//    3 zeroes    60
-//    4 zeroes    61
-//    5 zeroes    62
-//    n zeroes (6 or more)  63 n-6  (6 + 8 bits)
-//
-
-const int SHORT_ZEROCODE_RUN = 59;
-const int LONG_ZEROCODE_RUN = 63;
-const int SHORTEST_LONG_RUN = 2 + LONG_ZEROCODE_RUN - SHORT_ZEROCODE_RUN;
-const int LONGEST_LONG_RUN = 255 + SHORTEST_LONG_RUN;
-
-static void hufPackEncTable(
-    const long long *hcode,  // i : encoding table [HUF_ENCSIZE]
-    int im,                  // i : min hcode index
-    int iM,                  // i : max hcode index
-    char **pcode)            //  o: ptr to packed table (updated)
-{
-  char *p = *pcode;
-  long long c = 0;
-  int lc = 0;
-
-  for (; im <= iM; im++) {
-    int l = hufLength(hcode[im]);
-
-    if (l == 0) {
-      int zerun = 1;
-
-      while ((im < iM) && (zerun < LONGEST_LONG_RUN)) {
-        if (hufLength(hcode[im + 1]) > 0) break;
-        im++;
-        zerun++;
-      }
-
-      if (zerun >= 2) {
-        if (zerun >= SHORTEST_LONG_RUN) {
-          outputBits(6, LONG_ZEROCODE_RUN, c, lc, p);
-          outputBits(8, zerun - SHORTEST_LONG_RUN, c, lc, p);
-        } else {
-          outputBits(6, SHORT_ZEROCODE_RUN + zerun - 2, c, lc, p);
-        }
-        continue;
-      }
-    }
-
-    outputBits(6, l, c, lc, p);
-  }
-
-  if (lc > 0) *p++ = (unsigned char)(c << (8 - lc));
-
-  *pcode = p;
-}
-
-//
-// Unpack an encoding table packed by hufPackEncTable():
-//
-
-static bool hufUnpackEncTable(
-    const char **pcode,  // io: ptr to packed table (updated)
-    int ni,              // i : input size (in bytes)
-    int im,              // i : min hcode index
-    int iM,              // i : max hcode index
-    long long *hcode)    //  o: encoding table [HUF_ENCSIZE]
-{
-  memset(hcode, 0, sizeof(long long) * HUF_ENCSIZE);
-
-  const char *p = *pcode;
-  long long c = 0;
-  int lc = 0;
-
-  for (; im <= iM; im++) {
-    if (p - *pcode >= ni) {
-      return false;
-    }
-
-    long long l = hcode[im] = getBits(6, c, lc, p);  // code length
-
-    if (l == (long long)LONG_ZEROCODE_RUN) {
-      if (p - *pcode > ni) {
-        return false;
-      }
-
-      int zerun = getBits(8, c, lc, p) + SHORTEST_LONG_RUN;
-
-      if (im + zerun > iM + 1) {
-        return false;
-      }
-
-      while (zerun--) hcode[im++] = 0;
-
-      im--;
-    } else if (l >= (long long)SHORT_ZEROCODE_RUN) {
-      int zerun = l - SHORT_ZEROCODE_RUN + 2;
-
-      if (im + zerun > iM + 1) {
-        return false;
-      }
-
-      while (zerun--) hcode[im++] = 0;
-
-      im--;
-    }
-  }
-
-  *pcode = const_cast<char *>(p);
-
-  hufCanonicalCodeTable(hcode);
-
-  return true;
-}
-
-//
-// DECODING TABLE BUILDING
-//
-
-//
-// Clear a newly allocated decoding table so that it contains only zeroes.
-//
-
-static void hufClearDecTable(HufDec *hdecod)  // io: (allocated by caller)
-//     decoding table [HUF_DECSIZE]
-{
-  for (int i = 0; i < HUF_DECSIZE; i++) {
-    hdecod[i].len = 0;
-    hdecod[i].lit = 0;
-    hdecod[i].p = NULL;
-  }
-  // memset(hdecod, 0, sizeof(HufDec) * HUF_DECSIZE);
-}
-
-//
-// Build a decoding hash table based on the encoding table hcode:
-//  - short codes (<= HUF_DECBITS) are resolved with a single table access;
-//  - long code entry allocations are not optimized, because long codes are
-//    unfrequent;
-//  - decoding tables are used by hufDecode();
-//
-
-static bool hufBuildDecTable(const long long *hcode,  // i : encoding table
-                             int im,                  // i : min index in hcode
-                             int iM,                  // i : max index in hcode
-                             HufDec *hdecod)  //  o: (allocated by caller)
-//     decoding table [HUF_DECSIZE]
-{
-  //
-  // Init hashtable & loop on all codes.
-  // Assumes that hufClearDecTable(hdecod) has already been called.
-  //
-
-  for (; im <= iM; im++) {
-    long long c = hufCode(hcode[im]);
-    int l = hufLength(hcode[im]);
-
-    if (c >> l) {
-      //
-      // Error: c is supposed to be an l-bit code,
-      // but c contains a value that is greater
-      // than the largest l-bit number.
-      //
-
-      // invalidTableEntry();
-      return false;
-    }
-
-    if (l > HUF_DECBITS) {
-      //
-      // Long code: add a secondary entry
-      //
-
-      HufDec *pl = hdecod + (c >> (l - HUF_DECBITS));
-
-      if (pl->len) {
-        //
-        // Error: a short code has already
-        // been stored in table entry *pl.
-        //
-
-        // invalidTableEntry();
-        return false;
-      }
-
-      pl->lit++;
-
-      if (pl->p) {
-        unsigned int *p = pl->p;
-        pl->p = new unsigned int[pl->lit];
-
-        for (unsigned int i = 0; i < pl->lit - 1u; ++i) pl->p[i] = p[i];
-
-        delete[] p;
-      } else {
-        pl->p = new unsigned int[1];
-      }
-
-      pl->p[pl->lit - 1] = im;
-    } else if (l) {
-      //
-      // Short code: init all primary entries
-      //
-
-      HufDec *pl = hdecod + (c << (HUF_DECBITS - l));
-
-      for (long long i = 1ULL << (HUF_DECBITS - l); i > 0; i--, pl++) {
-        if (pl->len || pl->p) {
-          //
-          // Error: a short code or a long code has
-          // already been stored in table entry *pl.
-          //
-
-          // invalidTableEntry();
-          return false;
-        }
-
-        pl->len = l;
-        pl->lit = im;
-      }
-    }
-  }
-
-  return true;
-}
-
-//
-// Free the long code entries of a decoding table built by hufBuildDecTable()
-//
-
-static void hufFreeDecTable(HufDec *hdecod)  // io: Decoding table
-{
-  for (int i = 0; i < HUF_DECSIZE; i++) {
-    if (hdecod[i].p) {
-      delete[] hdecod[i].p;
-      hdecod[i].p = 0;
-    }
-  }
-}
-
-//
-// ENCODING
-//
-
-inline void outputCode(long long code, long long &c, int &lc, char *&out) {
-  outputBits(hufLength(code), hufCode(code), c, lc, out);
-}
-
-inline void sendCode(long long sCode, int runCount, long long runCode,
-                     long long &c, int &lc, char *&out) {
-  //
-  // Output a run of runCount instances of the symbol sCount.
-  // Output the symbols explicitly, or if that is shorter, output
-  // the sCode symbol once followed by a runCode symbol and runCount
-  // expressed as an 8-bit number.
-  //
-
-  if (hufLength(sCode) + hufLength(runCode) + 8 < hufLength(sCode) * runCount) {
-    outputCode(sCode, c, lc, out);
-    outputCode(runCode, c, lc, out);
-    outputBits(8, runCount, c, lc, out);
-  } else {
-    while (runCount-- >= 0) outputCode(sCode, c, lc, out);
-  }
-}
-
-//
-// Encode (compress) ni values based on the Huffman encoding table hcode:
-//
-
-static int hufEncode            // return: output size (in bits)
-    (const long long *hcode,    // i : encoding table
-     const unsigned short *in,  // i : uncompressed input buffer
-     const int ni,              // i : input buffer size (in bytes)
-     int rlc,                   // i : rl code
-     char *out)                 //  o: compressed output buffer
-{
-  char *outStart = out;
-  long long c = 0;  // bits not yet written to out
-  int lc = 0;       // number of valid bits in c (LSB)
-  int s = in[0];
-  int cs = 0;
-
-  //
-  // Loop on input values
-  //
-
-  for (int i = 1; i < ni; i++) {
-    //
-    // Count same values or send code
-    //
-
-    if (s == in[i] && cs < 255) {
-      cs++;
-    } else {
-      sendCode(hcode[s], cs, hcode[rlc], c, lc, out);
-      cs = 0;
-    }
-
-    s = in[i];
-  }
-
-  //
-  // Send remaining code
-  //
-
-  sendCode(hcode[s], cs, hcode[rlc], c, lc, out);
-
-  if (lc) *out = (c << (8 - lc)) & 0xff;
-
-  return (out - outStart) * 8 + lc;
-}
-
-//
-// DECODING
-//
-
-//
-// In order to force the compiler to inline them,
-// getChar() and getCode() are implemented as macros
-// instead of "inline" functions.
-//
-
-#define getChar(c, lc, in)                   \
-  {                                          \
-    c = (c << 8) | *(unsigned char *)(in++); \
-    lc += 8;                                 \
-  }
-
-#if 0
-#define getCode(po, rlc, c, lc, in, out, ob, oe) \
-  {                                              \
-    if (po == rlc) {                             \
-      if (lc < 8) getChar(c, lc, in);            \
-                                                 \
-      lc -= 8;                                   \
-                                                 \
-      unsigned char cs = (c >> lc);              \
-                                                 \
-      if (out + cs > oe) return false;           \
-                                                 \
-      /* TinyEXR issue 78 */                     \
-      unsigned short s = out[-1];                \
-                                                 \
-      while (cs-- > 0) *out++ = s;               \
-    } else if (out < oe) {                       \
-      *out++ = po;                               \
-    } else {                                     \
-      return false;                              \
-    }                                            \
-  }
-#else
-static bool getCode(int po, int rlc, long long &c, int &lc, const char *&in,
-                    const char *in_end, unsigned short *&out,
-                    const unsigned short *ob, const unsigned short *oe) {
-  (void)ob;
-  if (po == rlc) {
-    if (lc < 8) {
-      /* TinyEXR issue 78 */
-      /* TinyEXR issue 160. in + 1 -> in */
-      if (in >= in_end) {
-        return false;
-      }
-
-      getChar(c, lc, in);
-    }
-
-    lc -= 8;
-
-    unsigned char cs = (c >> lc);
-
-    if (out + cs > oe) return false;
-
-    // Bounds check for safety
-    // Issue 100.
-    if ((out - 1) < ob) return false;
-    unsigned short s = out[-1];
-
-    while (cs-- > 0) *out++ = s;
-  } else if (out < oe) {
-    *out++ = po;
-  } else {
-    return false;
-  }
-  return true;
-}
-#endif
-
-//
-// Decode (uncompress) ni bits based on encoding & decoding tables:
-//
-
-static bool hufDecode(const long long *hcode,  // i : encoding table
-                      const HufDec *hdecod,    // i : decoding table
-                      const char *in,          // i : compressed input buffer
-                      int ni,                  // i : input size (in bits)
-                      int rlc,                 // i : run-length code
-                      int no,  // i : expected output size (in bytes)
-                      unsigned short *out)  //  o: uncompressed output buffer
-{
-  long long c = 0;
-  int lc = 0;
-  unsigned short *outb = out;          // begin
-  unsigned short *oe = out + no;       // end
-  const char *ie = in + (ni + 7) / 8;  // input byte size
-
-  //
-  // Loop on input bytes
-  //
-
-  while (in < ie) {
-    getChar(c, lc, in);
-
-    //
-    // Access decoding table
-    //
-
-    while (lc >= HUF_DECBITS) {
-      const HufDec pl = hdecod[(c >> (lc - HUF_DECBITS)) & HUF_DECMASK];
-
-      if (pl.len) {
-        //
-        // Get short code
-        //
-
-        lc -= pl.len;
-        // std::cout << "lit = " << pl.lit << std::endl;
-        // std::cout << "rlc = " << rlc << std::endl;
-        // std::cout << "c = " << c << std::endl;
-        // std::cout << "lc = " << lc << std::endl;
-        // std::cout << "in = " << in << std::endl;
-        // std::cout << "out = " << out << std::endl;
-        // std::cout << "oe = " << oe << std::endl;
-        if (!getCode(pl.lit, rlc, c, lc, in, ie, out, outb, oe)) {
-          return false;
-        }
-      } else {
-        if (!pl.p) {
-          return false;
-        }
-        // invalidCode(); // wrong code
-
-        //
-        // Search long code
-        //
-
-        unsigned int j;
-
-        for (j = 0; j < pl.lit; j++) {
-          int l = hufLength(hcode[pl.p[j]]);
-
-          while (lc < l && in < ie)  // get more bits
-            getChar(c, lc, in);
-
-          if (lc >= l) {
-            if (hufCode(hcode[pl.p[j]]) ==
-                ((c >> (lc - l)) & (((long long)(1) << l) - 1))) {
-              //
-              // Found : get long code
-              //
-
-              lc -= l;
-              if (!getCode(pl.p[j], rlc, c, lc, in, ie, out, outb, oe)) {
-                return false;
-              }
-              break;
-            }
-          }
-        }
-
-        if (j == pl.lit) {
-          return false;
-          // invalidCode(); // Not found
-        }
-      }
-    }
-  }
-
-  //
-  // Get remaining (short) codes
-  //
-
-  int i = (8 - ni) & 7;
-  c >>= i;
-  lc -= i;
-
-  while (lc > 0) {
-    const HufDec pl = hdecod[(c << (HUF_DECBITS - lc)) & HUF_DECMASK];
-
-    if (pl.len) {
-      lc -= pl.len;
-      if (!getCode(pl.lit, rlc, c, lc, in, ie, out, outb, oe)) {
-        return false;
-      }
-    } else {
-      return false;
-      // invalidCode(); // wrong (long) code
-    }
-  }
-
-  if (out - outb != no) {
-    return false;
-  }
-  // notEnoughData ();
-
-  return true;
-}
-
-static void countFrequencies(std::vector<long long> &freq,
-                             const unsigned short data[/*n*/], int n) {
-  for (int i = 0; i < HUF_ENCSIZE; ++i) freq[i] = 0;
-
-  for (int i = 0; i < n; ++i) ++freq[data[i]];
-}
-
-static void writeUInt(char buf[4], unsigned int i) {
-  unsigned char *b = (unsigned char *)buf;
-
-  b[0] = i;
-  b[1] = i >> 8;
-  b[2] = i >> 16;
-  b[3] = i >> 24;
-}
-
-static unsigned int readUInt(const char buf[4]) {
-  const unsigned char *b = (const unsigned char *)buf;
-
-  return (b[0] & 0x000000ff) | ((b[1] << 8) & 0x0000ff00) |
-         ((b[2] << 16) & 0x00ff0000) | ((b[3] << 24) & 0xff000000);
-}
-
-//
-// EXTERNAL INTERFACE
-//
-
-static int hufCompress(const unsigned short raw[], int nRaw,
-                       char compressed[]) {
-  if (nRaw == 0) return 0;
-
-  std::vector<long long> freq(HUF_ENCSIZE);
-
-  countFrequencies(freq, raw, nRaw);
-
-  int im = 0;
-  int iM = 0;
-  hufBuildEncTable(freq.data(), &im, &iM);
-
-  char *tableStart = compressed + 20;
-  char *tableEnd = tableStart;
-  hufPackEncTable(freq.data(), im, iM, &tableEnd);
-  int tableLength = tableEnd - tableStart;
-
-  char *dataStart = tableEnd;
-  int nBits = hufEncode(freq.data(), raw, nRaw, iM, dataStart);
-  int data_length = (nBits + 7) / 8;
-
-  writeUInt(compressed, im);
-  writeUInt(compressed + 4, iM);
-  writeUInt(compressed + 8, tableLength);
-  writeUInt(compressed + 12, nBits);
-  writeUInt(compressed + 16, 0);  // room for future extensions
-
-  return dataStart + data_length - compressed;
-}
-
-static bool hufUncompress(const char compressed[], int nCompressed,
-                          std::vector<unsigned short> *raw) {
-  if (nCompressed == 0) {
-    if (raw->size() != 0) return false;
-
-    return false;
-  }
-
-  int im = readUInt(compressed);
-  int iM = readUInt(compressed + 4);
-  // int tableLength = readUInt (compressed + 8);
-  int nBits = readUInt(compressed + 12);
-
-  if (im < 0 || im >= HUF_ENCSIZE || iM < 0 || iM >= HUF_ENCSIZE) return false;
-
-  const char *ptr = compressed + 20;
-
-  //
-  // Fast decoder needs at least 2x64-bits of compressed data, and
-  // needs to be run-able on this platform. Otherwise, fall back
-  // to the original decoder
-  //
-
-  // if (FastHufDecoder::enabled() && nBits > 128)
-  //{
-  //    FastHufDecoder fhd (ptr, nCompressed - (ptr - compressed), im, iM, iM);
-  //    fhd.decode ((unsigned char*)ptr, nBits, raw, nRaw);
-  //}
-  // else
-  {
-    std::vector<long long> freq(HUF_ENCSIZE);
-    std::vector<HufDec> hdec(HUF_DECSIZE);
-
-    hufClearDecTable(&hdec.at(0));
-
-    hufUnpackEncTable(&ptr, nCompressed - (ptr - compressed), im, iM,
-                      &freq.at(0));
-
-    {
-      if (nBits > 8 * (nCompressed - (ptr - compressed))) {
-        return false;
-      }
-
-      hufBuildDecTable(&freq.at(0), im, iM, &hdec.at(0));
-      hufDecode(&freq.at(0), &hdec.at(0), ptr, nBits, iM, raw->size(),
-                raw->data());
-    }
-    // catch (...)
-    //{
-    //    hufFreeDecTable (hdec);
-    //    throw;
-    //}
-
-    hufFreeDecTable(&hdec.at(0));
-  }
-
-  return true;
-}
-
-//
-// Functions to compress the range of values in the pixel data
-//
-
-const int USHORT_RANGE = (1 << 16);
-const int BITMAP_SIZE = (USHORT_RANGE >> 3);
-
-static void bitmapFromData(const unsigned short data[/*nData*/], int nData,
-                           unsigned char bitmap[BITMAP_SIZE],
-                           unsigned short &minNonZero,
-                           unsigned short &maxNonZero) {
-  for (int i = 0; i < BITMAP_SIZE; ++i) bitmap[i] = 0;
-
-  for (int i = 0; i < nData; ++i) bitmap[data[i] >> 3] |= (1 << (data[i] & 7));
-
-  bitmap[0] &= ~1;  // zero is not explicitly stored in
-                    // the bitmap; we assume that the
-                    // data always contain zeroes
-  minNonZero = BITMAP_SIZE - 1;
-  maxNonZero = 0;
-
-  for (int i = 0; i < BITMAP_SIZE; ++i) {
-    if (bitmap[i]) {
-      if (minNonZero > i) minNonZero = i;
-      if (maxNonZero < i) maxNonZero = i;
-    }
-  }
-}
-
-static unsigned short forwardLutFromBitmap(
-    const unsigned char bitmap[BITMAP_SIZE], unsigned short lut[USHORT_RANGE]) {
-  int k = 0;
-
-  for (int i = 0; i < USHORT_RANGE; ++i) {
-    if ((i == 0) || (bitmap[i >> 3] & (1 << (i & 7))))
-      lut[i] = k++;
-    else
-      lut[i] = 0;
-  }
-
-  return k - 1;  // maximum value stored in lut[],
-}  // i.e. number of ones in bitmap minus 1
-
-static unsigned short reverseLutFromBitmap(
-    const unsigned char bitmap[BITMAP_SIZE], unsigned short lut[USHORT_RANGE]) {
-  int k = 0;
-
-  for (int i = 0; i < USHORT_RANGE; ++i) {
-    if ((i == 0) || (bitmap[i >> 3] & (1 << (i & 7)))) lut[k++] = i;
-  }
-
-  int n = k - 1;
-
-  while (k < USHORT_RANGE) lut[k++] = 0;
-
-  return n;  // maximum k where lut[k] is non-zero,
-}  // i.e. number of ones in bitmap minus 1
-
-static void applyLut(const unsigned short lut[USHORT_RANGE],
-                     unsigned short data[/*nData*/], int nData) {
-  for (int i = 0; i < nData; ++i) data[i] = lut[data[i]];
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif  // __clang__
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-static bool CompressPiz(unsigned char *outPtr, unsigned int *outSize,
-                        const unsigned char *inPtr, size_t inSize,
-                        const std::vector<ChannelInfo> &channelInfo,
-                        int data_width, int num_lines) {
-  std::vector<unsigned char> bitmap(BITMAP_SIZE);
-  unsigned short minNonZero;
-  unsigned short maxNonZero;
-
-#if !TINYEXR_LITTLE_ENDIAN
-  // @todo { PIZ compression on BigEndian architecture. }
-  return false;
-#endif
-
-  // Assume `inSize` is multiple of 2 or 4.
-  std::vector<unsigned short> tmpBuffer(inSize / sizeof(unsigned short));
-
-  std::vector<PIZChannelData> channelData(channelInfo.size());
-  unsigned short *tmpBufferEnd = &tmpBuffer.at(0);
-
-  for (size_t c = 0; c < channelData.size(); c++) {
-    PIZChannelData &cd = channelData[c];
-
-    cd.start = tmpBufferEnd;
-    cd.end = cd.start;
-
-    cd.nx = data_width;
-    cd.ny = num_lines;
-    // cd.ys = c.channel().ySampling;
-
-    size_t pixelSize = sizeof(int);  // UINT and FLOAT
-    if (channelInfo[c].requested_pixel_type == TINYEXR_PIXELTYPE_HALF) {
-      pixelSize = sizeof(short);
-    }
-
-    cd.size = static_cast<int>(pixelSize / sizeof(short));
-
-    tmpBufferEnd += cd.nx * cd.ny * cd.size;
-  }
-
-  const unsigned char *ptr = inPtr;
-  for (int y = 0; y < num_lines; ++y) {
-    for (size_t i = 0; i < channelData.size(); ++i) {
-      PIZChannelData &cd = channelData[i];
-
-      // if (modp (y, cd.ys) != 0)
-      //    continue;
-
-      size_t n = static_cast<size_t>(cd.nx * cd.size);
-      memcpy(cd.end, ptr, n * sizeof(unsigned short));
-      ptr += n * sizeof(unsigned short);
-      cd.end += n;
-    }
-  }
-
-  bitmapFromData(&tmpBuffer.at(0), static_cast<int>(tmpBuffer.size()),
-                 bitmap.data(), minNonZero, maxNonZero);
-
-  std::vector<unsigned short> lut(USHORT_RANGE);
-  unsigned short maxValue = forwardLutFromBitmap(bitmap.data(), lut.data());
-  applyLut(lut.data(), &tmpBuffer.at(0), static_cast<int>(tmpBuffer.size()));
-
-  //
-  // Store range compression info in _outBuffer
-  //
-
-  char *buf = reinterpret_cast<char *>(outPtr);
-
-  memcpy(buf, &minNonZero, sizeof(unsigned short));
-  buf += sizeof(unsigned short);
-  memcpy(buf, &maxNonZero, sizeof(unsigned short));
-  buf += sizeof(unsigned short);
-
-  if (minNonZero <= maxNonZero) {
-    memcpy(buf, reinterpret_cast<char *>(&bitmap[0] + minNonZero),
-           maxNonZero - minNonZero + 1);
-    buf += maxNonZero - minNonZero + 1;
-  }
-
-  //
-  // Apply wavelet encoding
-  //
-
-  for (size_t i = 0; i < channelData.size(); ++i) {
-    PIZChannelData &cd = channelData[i];
-
-    for (int j = 0; j < cd.size; ++j) {
-      wav2Encode(cd.start + j, cd.nx, cd.size, cd.ny, cd.nx * cd.size,
-                 maxValue);
-    }
-  }
-
-  //
-  // Apply Huffman encoding; append the result to _outBuffer
-  //
-
-  // length header(4byte), then huff data. Initialize length header with zero,
-  // then later fill it by `length`.
-  char *lengthPtr = buf;
-  int zero = 0;
-  memcpy(buf, &zero, sizeof(int));
-  buf += sizeof(int);
-
-  int length =
-      hufCompress(&tmpBuffer.at(0), static_cast<int>(tmpBuffer.size()), buf);
-  memcpy(lengthPtr, &length, sizeof(int));
-
-  (*outSize) = static_cast<unsigned int>(
-      (reinterpret_cast<unsigned char *>(buf) - outPtr) +
-      static_cast<unsigned int>(length));
-
-  // Use uncompressed data when compressed data is larger than uncompressed.
-  // (Issue 40)
-  if ((*outSize) >= inSize) {
-    (*outSize) = static_cast<unsigned int>(inSize);
-    memcpy(outPtr, inPtr, inSize);
-  }
-  return true;
-}
-
-static bool DecompressPiz(unsigned char *outPtr, const unsigned char *inPtr,
-                          size_t tmpBufSizeInBytes, size_t inLen, int num_channels,
-                          const EXRChannelInfo *channels, int data_width,
-                          int num_lines) {
-  if (inLen == tmpBufSizeInBytes) {
-    // Data is not compressed(Issue 40).
-    memcpy(outPtr, inPtr, inLen);
-    return true;
-  }
-
-  std::vector<unsigned char> bitmap(BITMAP_SIZE);
-  unsigned short minNonZero;
-  unsigned short maxNonZero;
-
-#if !TINYEXR_LITTLE_ENDIAN
-  // @todo { PIZ compression on BigEndian architecture. }
-  return false;
-#endif
-
-  memset(bitmap.data(), 0, BITMAP_SIZE);
-
-  if (inLen < 4) {
-    return false;
-  }
-
-  size_t readLen = 0;
-
-  const unsigned char *ptr = inPtr;
-  // minNonZero = *(reinterpret_cast<const unsigned short *>(ptr));
-  tinyexr::cpy2(&minNonZero, reinterpret_cast<const unsigned short *>(ptr));
-  // maxNonZero = *(reinterpret_cast<const unsigned short *>(ptr + 2));
-  tinyexr::cpy2(&maxNonZero, reinterpret_cast<const unsigned short *>(ptr + 2));
-  ptr += 4;
-  readLen += 4;
-
-  if (maxNonZero >= BITMAP_SIZE) {
-    return false;
-  }
-
-  //printf("maxNonZero = %d\n", maxNonZero);
-  //printf("minNonZero = %d\n", minNonZero);
-  //printf("len = %d\n", (maxNonZero - minNonZero + 1));
-  //printf("BITMAPSIZE - min = %d\n", (BITMAP_SIZE - minNonZero));
-
-  if (minNonZero <= maxNonZero) {
-    if (((maxNonZero - minNonZero + 1) + readLen) > inLen) {
-      // Input too short
-      return false;
-    }
-
-    memcpy(reinterpret_cast<char *>(&bitmap[0] + minNonZero), ptr,
-           maxNonZero - minNonZero + 1);
-    ptr += maxNonZero - minNonZero + 1;
-    readLen += maxNonZero - minNonZero + 1;
-  } else {
-    // Issue 194
-    if ((minNonZero == (BITMAP_SIZE - 1)) && (maxNonZero == 0)) {
-      // OK. all pixels are zero. And no need to read `bitmap` data.
-    } else {
-      // invalid minNonZero/maxNonZero combination.
-      return false;
-    }
-  }
-
-  std::vector<unsigned short> lut(USHORT_RANGE);
-  memset(lut.data(), 0, sizeof(unsigned short) * USHORT_RANGE);
-  unsigned short maxValue = reverseLutFromBitmap(bitmap.data(), lut.data());
-
-  //
-  // Huffman decoding
-  //
-
-  if ((readLen + 4) > inLen) {
-    return false;
-  }
-
-  int length=0;
-
-  // length = *(reinterpret_cast<const int *>(ptr));
-  tinyexr::cpy4(&length, reinterpret_cast<const int *>(ptr));
-  ptr += sizeof(int);
-
-  if (size_t((ptr - inPtr) + length) > inLen) {
-    return false;
-  }
-
-  std::vector<unsigned short> tmpBuffer(tmpBufSizeInBytes / sizeof(unsigned short));
-  hufUncompress(reinterpret_cast<const char *>(ptr), length, &tmpBuffer);
-
-  //
-  // Wavelet decoding
-  //
-
-  std::vector<PIZChannelData> channelData(static_cast<size_t>(num_channels));
-
-  unsigned short *tmpBufferEnd = &tmpBuffer.at(0);
-
-  for (size_t i = 0; i < static_cast<size_t>(num_channels); ++i) {
-    const EXRChannelInfo &chan = channels[i];
-
-    size_t pixelSize = sizeof(int);  // UINT and FLOAT
-    if (chan.pixel_type == TINYEXR_PIXELTYPE_HALF) {
-      pixelSize = sizeof(short);
-    }
-
-    channelData[i].start = tmpBufferEnd;
-    channelData[i].end = channelData[i].start;
-    channelData[i].nx = data_width;
-    channelData[i].ny = num_lines;
-    // channelData[i].ys = 1;
-    channelData[i].size = static_cast<int>(pixelSize / sizeof(short));
-
-    tmpBufferEnd += channelData[i].nx * channelData[i].ny * channelData[i].size;
-  }
-
-  for (size_t i = 0; i < channelData.size(); ++i) {
-    PIZChannelData &cd = channelData[i];
-
-    for (int j = 0; j < cd.size; ++j) {
-      wav2Decode(cd.start + j, cd.nx, cd.size, cd.ny, cd.nx * cd.size,
-                 maxValue);
-    }
-  }
-
-  //
-  // Expand the pixel data to their original range
-  //
-
-  applyLut(lut.data(), &tmpBuffer.at(0), static_cast<int>(tmpBufSizeInBytes / sizeof(unsigned short)));
-
-  for (int y = 0; y < num_lines; y++) {
-    for (size_t i = 0; i < channelData.size(); ++i) {
-      PIZChannelData &cd = channelData[i];
-
-      // if (modp (y, cd.ys) != 0)
-      //    continue;
-
-      size_t n = static_cast<size_t>(cd.nx * cd.size);
-      memcpy(outPtr, cd.end, static_cast<size_t>(n * sizeof(unsigned short)));
-      outPtr += n * sizeof(unsigned short);
-      cd.end += n;
-    }
-  }
-
-  return true;
-}
-#endif  // TINYEXR_USE_PIZ
-
-#if TINYEXR_USE_ZFP
-
-struct ZFPCompressionParam {
-  double rate;
-  unsigned int precision;
-  unsigned int __pad0;
-  double tolerance;
-  int type;  // TINYEXR_ZFP_COMPRESSIONTYPE_*
-  unsigned int __pad1;
-
-  ZFPCompressionParam() {
-    type = TINYEXR_ZFP_COMPRESSIONTYPE_RATE;
-    rate = 2.0;
-    precision = 0;
-    tolerance = 0.0;
-  }
-};
-
-static bool FindZFPCompressionParam(ZFPCompressionParam *param,
-                                    const EXRAttribute *attributes,
-                                    int num_attributes, std::string *err) {
-  bool foundType = false;
-
-  for (int i = 0; i < num_attributes; i++) {
-    if ((strcmp(attributes[i].name, "zfpCompressionType") == 0)) {
-      if (attributes[i].size == 1) {
-        param->type = static_cast<int>(attributes[i].value[0]);
-        foundType = true;
-        break;
-      } else {
-        if (err) {
-          (*err) +=
-              "zfpCompressionType attribute must be uchar(1 byte) type.\n";
-        }
-        return false;
-      }
-    }
-  }
-
-  if (!foundType) {
-    if (err) {
-      (*err) += "`zfpCompressionType` attribute not found.\n";
-    }
-    return false;
-  }
-
-  if (param->type == TINYEXR_ZFP_COMPRESSIONTYPE_RATE) {
-    for (int i = 0; i < num_attributes; i++) {
-      if ((strcmp(attributes[i].name, "zfpCompressionRate") == 0) &&
-          (attributes[i].size == 8)) {
-        param->rate = *(reinterpret_cast<double *>(attributes[i].value));
-        return true;
-      }
-    }
-
-    if (err) {
-      (*err) += "`zfpCompressionRate` attribute not found.\n";
-    }
-
-  } else if (param->type == TINYEXR_ZFP_COMPRESSIONTYPE_PRECISION) {
-    for (int i = 0; i < num_attributes; i++) {
-      if ((strcmp(attributes[i].name, "zfpCompressionPrecision") == 0) &&
-          (attributes[i].size == 4)) {
-        param->rate = *(reinterpret_cast<int *>(attributes[i].value));
-        return true;
-      }
-    }
-
-    if (err) {
-      (*err) += "`zfpCompressionPrecision` attribute not found.\n";
-    }
-
-  } else if (param->type == TINYEXR_ZFP_COMPRESSIONTYPE_ACCURACY) {
-    for (int i = 0; i < num_attributes; i++) {
-      if ((strcmp(attributes[i].name, "zfpCompressionTolerance") == 0) &&
-          (attributes[i].size == 8)) {
-        param->tolerance = *(reinterpret_cast<double *>(attributes[i].value));
-        return true;
-      }
-    }
-
-    if (err) {
-      (*err) += "`zfpCompressionTolerance` attribute not found.\n";
-    }
-  } else {
-    if (err) {
-      (*err) += "Unknown value specified for `zfpCompressionType`.\n";
-    }
-  }
-
-  return false;
-}
-
-// Assume pixel format is FLOAT for all channels.
-static bool DecompressZfp(float *dst, int dst_width, int dst_num_lines,
-                          size_t num_channels, const unsigned char *src,
-                          unsigned long src_size,
-                          const ZFPCompressionParam &param) {
-  size_t uncompressed_size =
-      size_t(dst_width) * size_t(dst_num_lines) * num_channels;
-
-  if (uncompressed_size == src_size) {
-    // Data is not compressed(Issue 40).
-    memcpy(dst, src, src_size);
-  }
-
-  zfp_stream *zfp = NULL;
-  zfp_field *field = NULL;
-
-  TINYEXR_CHECK_AND_RETURN_C((dst_width % 4) == 0, false);
-  TINYEXR_CHECK_AND_RETURN_C((dst_num_lines % 4) == 0, false);
-
-  if ((size_t(dst_width) & 3U) || (size_t(dst_num_lines) & 3U)) {
-    return false;
-  }
-
-  field =
-      zfp_field_2d(reinterpret_cast<void *>(const_cast<unsigned char *>(src)),
-                   zfp_type_float, static_cast<unsigned int>(dst_width),
-                   static_cast<unsigned int>(dst_num_lines) *
-                       static_cast<unsigned int>(num_channels));
-  zfp = zfp_stream_open(NULL);
-
-  if (param.type == TINYEXR_ZFP_COMPRESSIONTYPE_RATE) {
-    zfp_stream_set_rate(zfp, param.rate, zfp_type_float, /* dimension */ 2,
-                        /* write random access */ 0);
-  } else if (param.type == TINYEXR_ZFP_COMPRESSIONTYPE_PRECISION) {
-    zfp_stream_set_precision(zfp, param.precision);
-  } else if (param.type == TINYEXR_ZFP_COMPRESSIONTYPE_ACCURACY) {
-    zfp_stream_set_accuracy(zfp, param.tolerance);
-  } else {
-    return false;
-  }
-
-  size_t buf_size = zfp_stream_maximum_size(zfp, field);
-  std::vector<unsigned char> buf(buf_size);
-  memcpy(&buf.at(0), src, src_size);
-
-  bitstream *stream = stream_open(&buf.at(0), buf_size);
-  zfp_stream_set_bit_stream(zfp, stream);
-  zfp_stream_rewind(zfp);
-
-  size_t image_size = size_t(dst_width) * size_t(dst_num_lines);
-
-  for (size_t c = 0; c < size_t(num_channels); c++) {
-    // decompress 4x4 pixel block.
-    for (size_t y = 0; y < size_t(dst_num_lines); y += 4) {
-      for (size_t x = 0; x < size_t(dst_width); x += 4) {
-        float fblock[16];
-        zfp_decode_block_float_2(zfp, fblock);
-        for (size_t j = 0; j < 4; j++) {
-          for (size_t i = 0; i < 4; i++) {
-            dst[c * image_size + ((y + j) * size_t(dst_width) + (x + i))] =
-                fblock[j * 4 + i];
-          }
-        }
-      }
-    }
-  }
-
-  zfp_field_free(field);
-  zfp_stream_close(zfp);
-  stream_close(stream);
-
-  return true;
-}
-
-// Assume pixel format is FLOAT for all channels.
-static bool CompressZfp(std::vector<unsigned char> *outBuf,
-                        unsigned int *outSize, const float *inPtr, int width,
-                        int num_lines, int num_channels,
-                        const ZFPCompressionParam &param) {
-  zfp_stream *zfp = NULL;
-  zfp_field *field = NULL;
-
-  TINYEXR_CHECK_AND_RETURN_C((width % 4) == 0, false);
-  TINYEXR_CHECK_AND_RETURN_C((num_lines % 4) == 0, false);
-
-  if ((size_t(width) & 3U) || (size_t(num_lines) & 3U)) {
-    return false;
-  }
-
-  // create input array.
-  field = zfp_field_2d(reinterpret_cast<void *>(const_cast<float *>(inPtr)),
-                       zfp_type_float, static_cast<unsigned int>(width),
-                       static_cast<unsigned int>(num_lines * num_channels));
-
-  zfp = zfp_stream_open(NULL);
-
-  if (param.type == TINYEXR_ZFP_COMPRESSIONTYPE_RATE) {
-    zfp_stream_set_rate(zfp, param.rate, zfp_type_float, 2, 0);
-  } else if (param.type == TINYEXR_ZFP_COMPRESSIONTYPE_PRECISION) {
-    zfp_stream_set_precision(zfp, param.precision);
-  } else if (param.type == TINYEXR_ZFP_COMPRESSIONTYPE_ACCURACY) {
-    zfp_stream_set_accuracy(zfp, param.tolerance);
-  } else {
-    return false;
-  }
-
-  size_t buf_size = zfp_stream_maximum_size(zfp, field);
-
-  outBuf->resize(buf_size);
-
-  bitstream *stream = stream_open(&outBuf->at(0), buf_size);
-  zfp_stream_set_bit_stream(zfp, stream);
-  zfp_field_free(field);
-
-  size_t image_size = size_t(width) * size_t(num_lines);
-
-  for (size_t c = 0; c < size_t(num_channels); c++) {
-    // compress 4x4 pixel block.
-    for (size_t y = 0; y < size_t(num_lines); y += 4) {
-      for (size_t x = 0; x < size_t(width); x += 4) {
-        float fblock[16];
-        for (size_t j = 0; j < 4; j++) {
-          for (size_t i = 0; i < 4; i++) {
-            fblock[j * 4 + i] =
-                inPtr[c * image_size + ((y + j) * size_t(width) + (x + i))];
-          }
-        }
-        zfp_encode_block_float_2(zfp, fblock);
-      }
-    }
-  }
-
-  zfp_stream_flush(zfp);
-  (*outSize) = static_cast<unsigned int>(zfp_stream_compressed_size(zfp));
-
-  zfp_stream_close(zfp);
-
-  return true;
-}
-
-#endif
-
-//
-// -----------------------------------------------------------------
-//
-
-// heuristics
-#define TINYEXR_DIMENSION_THRESHOLD (1024 * 8192)
-
-// TODO(syoyo): Refactor function arguments.
-static bool DecodePixelData(/* out */ unsigned char **out_images,
-                            const int *requested_pixel_types,
-                            const unsigned char *data_ptr, size_t data_len,
-                            int compression_type, int line_order, int width,
-                            int height, int x_stride, int y, int line_no,
-                            int num_lines, size_t pixel_data_size,
-                            size_t num_attributes,
-                            const EXRAttribute *attributes, size_t num_channels,
-                            const EXRChannelInfo *channels,
-                            const std::vector<size_t> &channel_offset_list) {
-  if (compression_type == TINYEXR_COMPRESSIONTYPE_PIZ) {  // PIZ
-#if TINYEXR_USE_PIZ
-    if ((width == 0) || (num_lines == 0) || (pixel_data_size == 0)) {
-      // Invalid input #90
-      return false;
-    }
-
-    // Allocate original data size.
-    std::vector<unsigned char> outBuf(static_cast<size_t>(
-        static_cast<size_t>(width * num_lines) * pixel_data_size));
-    size_t tmpBufLen = outBuf.size();
-
-    bool ret = tinyexr::DecompressPiz(
-        reinterpret_cast<unsigned char *>(&outBuf.at(0)), data_ptr, tmpBufLen,
-        data_len, static_cast<int>(num_channels), channels, width, num_lines);
-
-    if (!ret) {
-      return false;
-    }
-
-    // For PIZ_COMPRESSION:
-    //   pixel sample data for channel 0 for scanline 0
-    //   pixel sample data for channel 1 for scanline 0
-    //   pixel sample data for channel ... for scanline 0
-    //   pixel sample data for channel n for scanline 0
-    //   pixel sample data for channel 0 for scanline 1
-    //   pixel sample data for channel 1 for scanline 1
-    //   pixel sample data for channel ... for scanline 1
-    //   pixel sample data for channel n for scanline 1
-    //   ...
-    for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-      if (channels[c].pixel_type == TINYEXR_PIXELTYPE_HALF) {
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const unsigned short *line_ptr = reinterpret_cast<unsigned short *>(
-              &outBuf.at(v * pixel_data_size * static_cast<size_t>(width) +
-                         channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            FP16 hf;
-
-            // hf.u = line_ptr[u];
-            // use `cpy` to avoid unaligned memory access when compiler's
-            // optimization is on.
-            tinyexr::cpy2(&(hf.u), line_ptr + u);
-
-            tinyexr::swap2(reinterpret_cast<unsigned short *>(&hf.u));
-
-            if (requested_pixel_types[c] == TINYEXR_PIXELTYPE_HALF) {
-              unsigned short *image =
-                  reinterpret_cast<unsigned short **>(out_images)[c];
-              if (line_order == 0) {
-                image += (static_cast<size_t>(line_no) + v) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              } else {
-                image += static_cast<size_t>(
-                             (height - 1 - (line_no + static_cast<int>(v)))) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              }
-              *image = hf.u;
-            } else {  // HALF -> FLOAT
-              FP32 f32 = half_to_float(hf);
-              float *image = reinterpret_cast<float **>(out_images)[c];
-              size_t offset = 0;
-              if (line_order == 0) {
-                offset = (static_cast<size_t>(line_no) + v) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              } else {
-                offset = static_cast<size_t>(
-                             (height - 1 - (line_no + static_cast<int>(v)))) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              }
-              image += offset;
-              *image = f32.f;
-            }
-          }
-        }
-      } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_UINT) {
-        TINYEXR_CHECK_AND_RETURN_C(requested_pixel_types[c] == TINYEXR_PIXELTYPE_UINT, false);
-
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const unsigned int *line_ptr = reinterpret_cast<unsigned int *>(
-              &outBuf.at(v * pixel_data_size * static_cast<size_t>(width) +
-                         channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            unsigned int val;
-            // val = line_ptr[u];
-            tinyexr::cpy4(&val, line_ptr + u);
-
-            tinyexr::swap4(&val);
-
-            unsigned int *image =
-                reinterpret_cast<unsigned int **>(out_images)[c];
-            if (line_order == 0) {
-              image += (static_cast<size_t>(line_no) + v) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            } else {
-              image += static_cast<size_t>(
-                           (height - 1 - (line_no + static_cast<int>(v)))) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            }
-            *image = val;
-          }
-        }
-      } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-        TINYEXR_CHECK_AND_RETURN_C(requested_pixel_types[c] == TINYEXR_PIXELTYPE_FLOAT, false);
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const float *line_ptr = reinterpret_cast<float *>(&outBuf.at(
-              v * pixel_data_size * static_cast<size_t>(width) +
-              channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            float val;
-            // val = line_ptr[u];
-            tinyexr::cpy4(&val, line_ptr + u);
-
-            tinyexr::swap4(reinterpret_cast<unsigned int *>(&val));
-
-            float *image = reinterpret_cast<float **>(out_images)[c];
-            if (line_order == 0) {
-              image += (static_cast<size_t>(line_no) + v) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            } else {
-              image += static_cast<size_t>(
-                           (height - 1 - (line_no + static_cast<int>(v)))) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            }
-            *image = val;
-          }
-        }
-      } else {
-        return false;
-      }
-    }
-#else
-    return false;
-#endif
-
-  } else if (compression_type == TINYEXR_COMPRESSIONTYPE_ZIPS ||
-             compression_type == TINYEXR_COMPRESSIONTYPE_ZIP) {
-    // Allocate original data size.
-    std::vector<unsigned char> outBuf(static_cast<size_t>(width) *
-                                      static_cast<size_t>(num_lines) *
-                                      pixel_data_size);
-
-    unsigned long dstLen = static_cast<unsigned long>(outBuf.size());
-    TINYEXR_CHECK_AND_RETURN_C(dstLen > 0, false);
-    if (!tinyexr::DecompressZip(
-            reinterpret_cast<unsigned char *>(&outBuf.at(0)), &dstLen, data_ptr,
-            static_cast<unsigned long>(data_len))) {
-      return false;
-    }
-
-    // For ZIP_COMPRESSION:
-    //   pixel sample data for channel 0 for scanline 0
-    //   pixel sample data for channel 1 for scanline 0
-    //   pixel sample data for channel ... for scanline 0
-    //   pixel sample data for channel n for scanline 0
-    //   pixel sample data for channel 0 for scanline 1
-    //   pixel sample data for channel 1 for scanline 1
-    //   pixel sample data for channel ... for scanline 1
-    //   pixel sample data for channel n for scanline 1
-    //   ...
-    for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-      if (channels[c].pixel_type == TINYEXR_PIXELTYPE_HALF) {
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const unsigned short *line_ptr = reinterpret_cast<unsigned short *>(
-              &outBuf.at(v * static_cast<size_t>(pixel_data_size) *
-                             static_cast<size_t>(width) +
-                         channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            tinyexr::FP16 hf;
-
-            // hf.u = line_ptr[u];
-            tinyexr::cpy2(&(hf.u), line_ptr + u);
-
-            tinyexr::swap2(reinterpret_cast<unsigned short *>(&hf.u));
-
-            if (requested_pixel_types[c] == TINYEXR_PIXELTYPE_HALF) {
-              unsigned short *image =
-                  reinterpret_cast<unsigned short **>(out_images)[c];
-              if (line_order == 0) {
-                image += (static_cast<size_t>(line_no) + v) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              } else {
-                image += (static_cast<size_t>(height) - 1U -
-                          (static_cast<size_t>(line_no) + v)) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              }
-              *image = hf.u;
-            } else {  // HALF -> FLOAT
-              tinyexr::FP32 f32 = half_to_float(hf);
-              float *image = reinterpret_cast<float **>(out_images)[c];
-              size_t offset = 0;
-              if (line_order == 0) {
-                offset = (static_cast<size_t>(line_no) + v) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              } else {
-                offset = (static_cast<size_t>(height) - 1U -
-                          (static_cast<size_t>(line_no) + v)) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              }
-              image += offset;
-
-              *image = f32.f;
-            }
-          }
-        }
-      } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_UINT) {
-        TINYEXR_CHECK_AND_RETURN_C(requested_pixel_types[c] == TINYEXR_PIXELTYPE_UINT, false);
-
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const unsigned int *line_ptr = reinterpret_cast<unsigned int *>(
-              &outBuf.at(v * pixel_data_size * static_cast<size_t>(width) +
-                         channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            unsigned int val;
-            // val = line_ptr[u];
-            tinyexr::cpy4(&val, line_ptr + u);
-
-            tinyexr::swap4(&val);
-
-            unsigned int *image =
-                reinterpret_cast<unsigned int **>(out_images)[c];
-            if (line_order == 0) {
-              image += (static_cast<size_t>(line_no) + v) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            } else {
-              image += (static_cast<size_t>(height) - 1U -
-                        (static_cast<size_t>(line_no) + v)) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            }
-            *image = val;
-          }
-        }
-      } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-        TINYEXR_CHECK_AND_RETURN_C(requested_pixel_types[c] == TINYEXR_PIXELTYPE_FLOAT, false);
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const float *line_ptr = reinterpret_cast<float *>(
-              &outBuf.at(v * pixel_data_size * static_cast<size_t>(width) +
-                         channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            float val;
-            // val = line_ptr[u];
-            tinyexr::cpy4(&val, line_ptr + u);
-
-            tinyexr::swap4(reinterpret_cast<unsigned int *>(&val));
-
-            float *image = reinterpret_cast<float **>(out_images)[c];
-            if (line_order == 0) {
-              image += (static_cast<size_t>(line_no) + v) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            } else {
-              image += (static_cast<size_t>(height) - 1U -
-                        (static_cast<size_t>(line_no) + v)) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            }
-            *image = val;
-          }
-        }
-      } else {
-        return false;
-      }
-    }
-  } else if (compression_type == TINYEXR_COMPRESSIONTYPE_RLE) {
-    // Allocate original data size.
-    std::vector<unsigned char> outBuf(static_cast<size_t>(width) *
-                                      static_cast<size_t>(num_lines) *
-                                      pixel_data_size);
-
-    unsigned long dstLen = static_cast<unsigned long>(outBuf.size());
-    if (dstLen == 0) {
-      return false;
-    }
-
-    if (!tinyexr::DecompressRle(
-            reinterpret_cast<unsigned char *>(&outBuf.at(0)), dstLen, data_ptr,
-            static_cast<unsigned long>(data_len))) {
-      return false;
-    }
-
-    // For RLE_COMPRESSION:
-    //   pixel sample data for channel 0 for scanline 0
-    //   pixel sample data for channel 1 for scanline 0
-    //   pixel sample data for channel ... for scanline 0
-    //   pixel sample data for channel n for scanline 0
-    //   pixel sample data for channel 0 for scanline 1
-    //   pixel sample data for channel 1 for scanline 1
-    //   pixel sample data for channel ... for scanline 1
-    //   pixel sample data for channel n for scanline 1
-    //   ...
-    for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-      if (channels[c].pixel_type == TINYEXR_PIXELTYPE_HALF) {
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const unsigned short *line_ptr = reinterpret_cast<unsigned short *>(
-              &outBuf.at(v * static_cast<size_t>(pixel_data_size) *
-                             static_cast<size_t>(width) +
-                         channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            tinyexr::FP16 hf;
-
-            // hf.u = line_ptr[u];
-            tinyexr::cpy2(&(hf.u), line_ptr + u);
-
-            tinyexr::swap2(reinterpret_cast<unsigned short *>(&hf.u));
-
-            if (requested_pixel_types[c] == TINYEXR_PIXELTYPE_HALF) {
-              unsigned short *image =
-                  reinterpret_cast<unsigned short **>(out_images)[c];
-              if (line_order == 0) {
-                image += (static_cast<size_t>(line_no) + v) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              } else {
-                image += (static_cast<size_t>(height) - 1U -
-                          (static_cast<size_t>(line_no) + v)) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              }
-              *image = hf.u;
-            } else {  // HALF -> FLOAT
-              tinyexr::FP32 f32 = half_to_float(hf);
-              float *image = reinterpret_cast<float **>(out_images)[c];
-              if (line_order == 0) {
-                image += (static_cast<size_t>(line_no) + v) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              } else {
-                image += (static_cast<size_t>(height) - 1U -
-                          (static_cast<size_t>(line_no) + v)) *
-                             static_cast<size_t>(x_stride) +
-                         u;
-              }
-              *image = f32.f;
-            }
-          }
-        }
-      } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_UINT) {
-        TINYEXR_CHECK_AND_RETURN_C(requested_pixel_types[c] == TINYEXR_PIXELTYPE_UINT, false);
-
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const unsigned int *line_ptr = reinterpret_cast<unsigned int *>(
-              &outBuf.at(v * pixel_data_size * static_cast<size_t>(width) +
-                         channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            unsigned int val;
-            // val = line_ptr[u];
-            tinyexr::cpy4(&val, line_ptr + u);
-
-            tinyexr::swap4(&val);
-
-            unsigned int *image =
-                reinterpret_cast<unsigned int **>(out_images)[c];
-            if (line_order == 0) {
-              image += (static_cast<size_t>(line_no) + v) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            } else {
-              image += (static_cast<size_t>(height) - 1U -
-                        (static_cast<size_t>(line_no) + v)) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            }
-            *image = val;
-          }
-        }
-      } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-        TINYEXR_CHECK_AND_RETURN_C(requested_pixel_types[c] == TINYEXR_PIXELTYPE_FLOAT, false);
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const float *line_ptr = reinterpret_cast<float *>(
-              &outBuf.at(v * pixel_data_size * static_cast<size_t>(width) +
-                         channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            float val;
-            // val = line_ptr[u];
-            tinyexr::cpy4(&val, line_ptr + u);
-
-            tinyexr::swap4(reinterpret_cast<unsigned int *>(&val));
-
-            float *image = reinterpret_cast<float **>(out_images)[c];
-            if (line_order == 0) {
-              image += (static_cast<size_t>(line_no) + v) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            } else {
-              image += (static_cast<size_t>(height) - 1U -
-                        (static_cast<size_t>(line_no) + v)) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            }
-            *image = val;
-          }
-        }
-      } else {
-        return false;
-      }
-    }
-  } else if (compression_type == TINYEXR_COMPRESSIONTYPE_ZFP) {
-#if TINYEXR_USE_ZFP
-    tinyexr::ZFPCompressionParam zfp_compression_param;
-    std::string e;
-    if (!tinyexr::FindZFPCompressionParam(&zfp_compression_param, attributes,
-                                          int(num_attributes), &e)) {
-      // This code path should not be reachable.
-      return false;
-    }
-
-    // Allocate original data size.
-    std::vector<unsigned char> outBuf(static_cast<size_t>(width) *
-                                      static_cast<size_t>(num_lines) *
-                                      pixel_data_size);
-
-    unsigned long dstLen = outBuf.size();
-    TINYEXR_CHECK_AND_RETURN_C(dstLen > 0, false);
-    tinyexr::DecompressZfp(reinterpret_cast<float *>(&outBuf.at(0)), width,
-                           num_lines, num_channels, data_ptr,
-                           static_cast<unsigned long>(data_len),
-                           zfp_compression_param);
-
-    // For ZFP_COMPRESSION:
-    //   pixel sample data for channel 0 for scanline 0
-    //   pixel sample data for channel 1 for scanline 0
-    //   pixel sample data for channel ... for scanline 0
-    //   pixel sample data for channel n for scanline 0
-    //   pixel sample data for channel 0 for scanline 1
-    //   pixel sample data for channel 1 for scanline 1
-    //   pixel sample data for channel ... for scanline 1
-    //   pixel sample data for channel n for scanline 1
-    //   ...
-    for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-      TINYEXR_CHECK_AND_RETURN_C(channels[c].pixel_type == TINYEXR_PIXELTYPE_FLOAT, false);
-      if (channels[c].pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-        TINYEXR_CHECK_AND_RETURN_C(requested_pixel_types[c] == TINYEXR_PIXELTYPE_FLOAT, false);
-        for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-          const float *line_ptr = reinterpret_cast<float *>(
-              &outBuf.at(v * pixel_data_size * static_cast<size_t>(width) +
-                         channel_offset_list[c] * static_cast<size_t>(width)));
-          for (size_t u = 0; u < static_cast<size_t>(width); u++) {
-            float val;
-            tinyexr::cpy4(&val, line_ptr + u);
-
-            tinyexr::swap4(reinterpret_cast<unsigned int *>(&val));
-
-            float *image = reinterpret_cast<float **>(out_images)[c];
-            if (line_order == 0) {
-              image += (static_cast<size_t>(line_no) + v) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            } else {
-              image += (static_cast<size_t>(height) - 1U -
-                        (static_cast<size_t>(line_no) + v)) *
-                           static_cast<size_t>(x_stride) +
-                       u;
-            }
-            *image = val;
-          }
-        }
-      } else {
-        return false;
-      }
-    }
-#else
-    (void)attributes;
-    (void)num_attributes;
-    (void)num_channels;
-    return false;
-#endif
-  } else if (compression_type == TINYEXR_COMPRESSIONTYPE_NONE) {
-    for (size_t c = 0; c < num_channels; c++) {
-      for (size_t v = 0; v < static_cast<size_t>(num_lines); v++) {
-        if (channels[c].pixel_type == TINYEXR_PIXELTYPE_HALF) {
-          const unsigned short *line_ptr =
-              reinterpret_cast<const unsigned short *>(
-                  data_ptr + v * pixel_data_size * size_t(width) +
-                  channel_offset_list[c] * static_cast<size_t>(width));
-
-          if (requested_pixel_types[c] == TINYEXR_PIXELTYPE_HALF) {
-            unsigned short *outLine =
-                reinterpret_cast<unsigned short *>(out_images[c]);
-            if (line_order == 0) {
-              outLine += (size_t(y) + v) * size_t(x_stride);
-            } else {
-              outLine +=
-                  (size_t(height) - 1 - (size_t(y) + v)) * size_t(x_stride);
-            }
-
-            for (int u = 0; u < width; u++) {
-              tinyexr::FP16 hf;
-
-              // hf.u = line_ptr[u];
-              tinyexr::cpy2(&(hf.u), line_ptr + u);
-
-              tinyexr::swap2(reinterpret_cast<unsigned short *>(&hf.u));
-
-              outLine[u] = hf.u;
-            }
-          } else if (requested_pixel_types[c] == TINYEXR_PIXELTYPE_FLOAT) {
-            float *outLine = reinterpret_cast<float *>(out_images[c]);
-            if (line_order == 0) {
-              outLine += (size_t(y) + v) * size_t(x_stride);
-            } else {
-              outLine +=
-                  (size_t(height) - 1 - (size_t(y) + v)) * size_t(x_stride);
-            }
-
-            if (reinterpret_cast<const unsigned char *>(line_ptr + width) >
-                (data_ptr + data_len)) {
-              // Insufficient data size
-              return false;
-            }
-
-            for (int u = 0; u < width; u++) {
-              tinyexr::FP16 hf;
-
-              // address may not be aligned. use byte-wise copy for safety.#76
-              // hf.u = line_ptr[u];
-              tinyexr::cpy2(&(hf.u), line_ptr + u);
-
-              tinyexr::swap2(reinterpret_cast<unsigned short *>(&hf.u));
-
-              tinyexr::FP32 f32 = half_to_float(hf);
-
-              outLine[u] = f32.f;
-            }
-          } else {
-            return false;
-          }
-        } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-          const float *line_ptr = reinterpret_cast<const float *>(
-              data_ptr + v * pixel_data_size * size_t(width) +
-              channel_offset_list[c] * static_cast<size_t>(width));
-
-          float *outLine = reinterpret_cast<float *>(out_images[c]);
-          if (line_order == 0) {
-            outLine += (size_t(y) + v) * size_t(x_stride);
-          } else {
-            outLine +=
-                (size_t(height) - 1 - (size_t(y) + v)) * size_t(x_stride);
-          }
-
-          if (reinterpret_cast<const unsigned char *>(line_ptr + width) >
-              (data_ptr + data_len)) {
-            // Insufficient data size
-            return false;
-          }
-
-          for (int u = 0; u < width; u++) {
-            float val;
-            tinyexr::cpy4(&val, line_ptr + u);
-
-            tinyexr::swap4(reinterpret_cast<unsigned int *>(&val));
-
-            outLine[u] = val;
-          }
-        } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_UINT) {
-          const unsigned int *line_ptr = reinterpret_cast<const unsigned int *>(
-              data_ptr + v * pixel_data_size * size_t(width) +
-              channel_offset_list[c] * static_cast<size_t>(width));
-
-          unsigned int *outLine =
-              reinterpret_cast<unsigned int *>(out_images[c]);
-          if (line_order == 0) {
-            outLine += (size_t(y) + v) * size_t(x_stride);
-          } else {
-            outLine +=
-                (size_t(height) - 1 - (size_t(y) + v)) * size_t(x_stride);
-          }
-
-          if (reinterpret_cast<const unsigned char *>(line_ptr + width) >
-              (data_ptr + data_len)) {
-            // Corrupted data
-            return false;
-          }
-
-          for (int u = 0; u < width; u++) {
-
-            unsigned int val;
-            tinyexr::cpy4(&val, line_ptr + u);
-
-            tinyexr::swap4(reinterpret_cast<unsigned int *>(&val));
-
-            outLine[u] = val;
-          }
-        }
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool DecodeTiledPixelData(
-    unsigned char **out_images, int *width, int *height,
-    const int *requested_pixel_types, const unsigned char *data_ptr,
-    size_t data_len, int compression_type, int line_order, int data_width,
-    int data_height, int tile_offset_x, int tile_offset_y, int tile_size_x,
-    int tile_size_y, size_t pixel_data_size, size_t num_attributes,
-    const EXRAttribute *attributes, size_t num_channels,
-    const EXRChannelInfo *channels,
-    const std::vector<size_t> &channel_offset_list) {
-  // Here, data_width and data_height are the dimensions of the current (sub)level.
-  if (tile_size_x * tile_offset_x > data_width ||
-      tile_size_y * tile_offset_y > data_height) {
-    return false;
-  }
-
-  // Compute actual image size in a tile.
-  if ((tile_offset_x + 1) * tile_size_x >= data_width) {
-    (*width) = data_width - (tile_offset_x * tile_size_x);
-  } else {
-    (*width) = tile_size_x;
-  }
-
-  if ((tile_offset_y + 1) * tile_size_y >= data_height) {
-    (*height) = data_height - (tile_offset_y * tile_size_y);
-  } else {
-    (*height) = tile_size_y;
-  }
-
-  // Image size = tile size.
-  return DecodePixelData(out_images, requested_pixel_types, data_ptr, data_len,
-                         compression_type, line_order, (*width), tile_size_y,
-                         /* stride */ tile_size_x, /* y */ 0, /* line_no */ 0,
-                         (*height), pixel_data_size, num_attributes, attributes,
-                         num_channels, channels, channel_offset_list);
-}
-
-static bool ComputeChannelLayout(std::vector<size_t> *channel_offset_list,
-                                 int *pixel_data_size, size_t *channel_offset,
-                                 int num_channels,
-                                 const EXRChannelInfo *channels) {
-  channel_offset_list->resize(static_cast<size_t>(num_channels));
-
-  (*pixel_data_size) = 0;
-  (*channel_offset) = 0;
-
-  for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-    (*channel_offset_list)[c] = (*channel_offset);
-    if (channels[c].pixel_type == TINYEXR_PIXELTYPE_HALF) {
-      (*pixel_data_size) += sizeof(unsigned short);
-      (*channel_offset) += sizeof(unsigned short);
-    } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-      (*pixel_data_size) += sizeof(float);
-      (*channel_offset) += sizeof(float);
-    } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_UINT) {
-      (*pixel_data_size) += sizeof(unsigned int);
-      (*channel_offset) += sizeof(unsigned int);
-    } else {
-      // ???
-      return false;
-    }
-  }
-  return true;
-}
-
-// TODO: Simply return nullptr when failed to allocate?
-static unsigned char **AllocateImage(int num_channels,
-                                     const EXRChannelInfo *channels,
-                                     const int *requested_pixel_types,
-                                     int data_width, int data_height, bool *success) {
-  unsigned char **images =
-      reinterpret_cast<unsigned char **>(static_cast<float **>(
-          malloc(sizeof(float *) * static_cast<size_t>(num_channels))));
-
-  for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-    images[c] = NULL;
-  }
-
-  bool valid = true;
-
-  for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-    size_t data_len =
-        static_cast<size_t>(data_width) * static_cast<size_t>(data_height);
-    if (channels[c].pixel_type == TINYEXR_PIXELTYPE_HALF) {
-      // pixel_data_size += sizeof(unsigned short);
-      // channel_offset += sizeof(unsigned short);
-      // Alloc internal image for half type.
-      if (requested_pixel_types[c] == TINYEXR_PIXELTYPE_HALF) {
-        images[c] =
-            reinterpret_cast<unsigned char *>(static_cast<unsigned short *>(
-                malloc(sizeof(unsigned short) * data_len)));
-      } else if (requested_pixel_types[c] == TINYEXR_PIXELTYPE_FLOAT) {
-        images[c] = reinterpret_cast<unsigned char *>(
-            static_cast<float *>(malloc(sizeof(float) * data_len)));
-      } else {
-        images[c] = NULL; // just in case.
-        valid = false;
-        break;
-      }
-    } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-      // pixel_data_size += sizeof(float);
-      // channel_offset += sizeof(float);
-      images[c] = reinterpret_cast<unsigned char *>(
-          static_cast<float *>(malloc(sizeof(float) * data_len)));
-    } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_UINT) {
-      // pixel_data_size += sizeof(unsigned int);
-      // channel_offset += sizeof(unsigned int);
-      images[c] = reinterpret_cast<unsigned char *>(
-          static_cast<unsigned int *>(malloc(sizeof(unsigned int) * data_len)));
-    } else {
-      images[c] = NULL; // just in case.
-      valid = false;
-      break;
-    }
-  }
-
-  if (!valid) {
-    for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-      if (images[c]) {
-        free(images[c]);
-        images[c] = NULL;
-      }
-    }
-
-    if (success) {
-      (*success) = false;
-    }
-  } else {
-    if (success) {
-      (*success) = true;
-    }
-  }
-
-  return images;
-}
-
-#ifdef _WIN32
-static inline std::wstring UTF8ToWchar(const std::string &str) {
-  int wstr_size =
-      MultiByteToWideChar(CP_UTF8, 0, str.data(), (int)str.size(), NULL, 0);
-  std::wstring wstr(wstr_size, 0);
-  MultiByteToWideChar(CP_UTF8, 0, str.data(), (int)str.size(), &wstr[0],
-                      (int)wstr.size());
-  return wstr;
-}
-#endif
-
-
-static int ParseEXRHeader(HeaderInfo *info, bool *empty_header,
-                          const EXRVersion *version, std::string *err,
-                          const unsigned char *buf, size_t size) {
-  const char *marker = reinterpret_cast<const char *>(&buf[0]);
-
-  if (empty_header) {
-    (*empty_header) = false;
-  }
-
-  if (version->multipart) {
-    if (size > 0 && marker[0] == '\0') {
-      // End of header list.
-      if (empty_header) {
-        (*empty_header) = true;
-      }
-      return TINYEXR_SUCCESS;
-    }
-  }
-
-  // According to the spec, the header of every OpenEXR file must contain at
-  // least the following attributes:
-  //
-  // channels chlist
-  // compression compression
-  // dataWindow box2i
-  // displayWindow box2i
-  // lineOrder lineOrder
-  // pixelAspectRatio float
-  // screenWindowCenter v2f
-  // screenWindowWidth float
-  bool has_channels = false;
-  bool has_compression = false;
-  bool has_data_window = false;
-  bool has_display_window = false;
-  bool has_line_order = false;
-  bool has_pixel_aspect_ratio = false;
-  bool has_screen_window_center = false;
-  bool has_screen_window_width = false;
-  bool has_name = false;
-  bool has_type = false;
-
-  info->name.clear();
-  info->type.clear();
-
-  info->data_window.min_x = 0;
-  info->data_window.min_y = 0;
-  info->data_window.max_x = 0;
-  info->data_window.max_y = 0;
-  info->line_order = 0;  // @fixme
-  info->display_window.min_x = 0;
-  info->display_window.min_y = 0;
-  info->display_window.max_x = 0;
-  info->display_window.max_y = 0;
-  info->screen_window_center[0] = 0.0f;
-  info->screen_window_center[1] = 0.0f;
-  info->screen_window_width = -1.0f;
-  info->pixel_aspect_ratio = -1.0f;
-
-  info->tiled = 0;
-  info->tile_size_x = -1;
-  info->tile_size_y = -1;
-  info->tile_level_mode = -1;
-  info->tile_rounding_mode = -1;
-
-  info->attributes.clear();
-
-  // Read attributes
-  size_t orig_size = size;
-  for (size_t nattr = 0; nattr < TINYEXR_MAX_HEADER_ATTRIBUTES; nattr++) {
-    if (0 == size) {
-      if (err) {
-        (*err) += "Insufficient data size for attributes.\n";
-      }
-      return TINYEXR_ERROR_INVALID_DATA;
-    } else if (marker[0] == '\0') {
-      size--;
-      break;
-    }
-
-    std::string attr_name;
-    std::string attr_type;
-    std::vector<unsigned char> data;
-    size_t marker_size;
-    if (!tinyexr::ReadAttribute(&attr_name, &attr_type, &data, &marker_size,
-                                marker, size)) {
-      if (err) {
-        (*err) += "Failed to read attribute.\n";
-      }
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-    marker += marker_size;
-    size -= marker_size;
-
-    // For a multipart file, the version field 9th bit is 0.
-    if ((version->tiled || version->multipart || version->non_image) && attr_name.compare("tiles") == 0) {
-      unsigned int x_size, y_size;
-      unsigned char tile_mode;
-      if (data.size() != 9) {
-        if (err) {
-          (*err) += "(ParseEXRHeader) Invalid attribute data size. Attribute data size must be 9.\n";
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-      memcpy(&x_size, &data.at(0), sizeof(int));
-      memcpy(&y_size, &data.at(4), sizeof(int));
-      tile_mode = data[8];
-      tinyexr::swap4(&x_size);
-      tinyexr::swap4(&y_size);
-
-      if (x_size > static_cast<unsigned int>(std::numeric_limits<int>::max()) ||
-          y_size > static_cast<unsigned int>(std::numeric_limits<int>::max())) {
-        if (err) {
-          (*err) = "Tile sizes were invalid.";
-        }
-        return TINYEXR_ERROR_UNSUPPORTED_FORMAT;
-      }
-
-      info->tile_size_x = static_cast<int>(x_size);
-      info->tile_size_y = static_cast<int>(y_size);
-
-      // mode = levelMode + roundingMode * 16
-      info->tile_level_mode = tile_mode & 0x3;
-      info->tile_rounding_mode = (tile_mode >> 4) & 0x1;
-      info->tiled = 1;
-    } else if (attr_name.compare("compression") == 0) {
-      bool ok = false;
-      if (data[0] < TINYEXR_COMPRESSIONTYPE_PIZ) {
-        ok = true;
-      }
-
-      if (data[0] == TINYEXR_COMPRESSIONTYPE_PIZ) {
-#if TINYEXR_USE_PIZ
-        ok = true;
-#else
-        if (err) {
-          (*err) = "PIZ compression is not supported.";
-        }
-        return TINYEXR_ERROR_UNSUPPORTED_FORMAT;
-#endif
-      }
-
-      if (data[0] == TINYEXR_COMPRESSIONTYPE_ZFP) {
-#if TINYEXR_USE_ZFP
-        ok = true;
-#else
-        if (err) {
-          (*err) = "ZFP compression is not supported.";
-        }
-        return TINYEXR_ERROR_UNSUPPORTED_FORMAT;
-#endif
-      }
-
-      if (!ok) {
-        if (err) {
-          (*err) = "Unknown compression type.";
-        }
-        return TINYEXR_ERROR_UNSUPPORTED_FORMAT;
-      }
-
-      info->compression_type = static_cast<int>(data[0]);
-      has_compression = true;
-
-    } else if (attr_name.compare("channels") == 0) {
-      // name: zero-terminated string, from 1 to 255 bytes long
-      // pixel type: int, possible values are: UINT = 0 HALF = 1 FLOAT = 2
-      // pLinear: unsigned char, possible values are 0 and 1
-      // reserved: three chars, should be zero
-      // xSampling: int
-      // ySampling: int
-
-      if (!ReadChannelInfo(info->channels, data)) {
-        if (err) {
-          (*err) += "Failed to parse channel info.\n";
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-      if (info->channels.size() < 1) {
-        if (err) {
-          (*err) += "# of channels is zero.\n";
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-      has_channels = true;
-
-    } else if (attr_name.compare("dataWindow") == 0) {
-      if (data.size() >= 16) {
-        memcpy(&info->data_window.min_x, &data.at(0), sizeof(int));
-        memcpy(&info->data_window.min_y, &data.at(4), sizeof(int));
-        memcpy(&info->data_window.max_x, &data.at(8), sizeof(int));
-        memcpy(&info->data_window.max_y, &data.at(12), sizeof(int));
-        tinyexr::swap4(&info->data_window.min_x);
-        tinyexr::swap4(&info->data_window.min_y);
-        tinyexr::swap4(&info->data_window.max_x);
-        tinyexr::swap4(&info->data_window.max_y);
-        has_data_window = true;
-      }
-    } else if (attr_name.compare("displayWindow") == 0) {
-      if (data.size() >= 16) {
-        memcpy(&info->display_window.min_x, &data.at(0), sizeof(int));
-        memcpy(&info->display_window.min_y, &data.at(4), sizeof(int));
-        memcpy(&info->display_window.max_x, &data.at(8), sizeof(int));
-        memcpy(&info->display_window.max_y, &data.at(12), sizeof(int));
-        tinyexr::swap4(&info->display_window.min_x);
-        tinyexr::swap4(&info->display_window.min_y);
-        tinyexr::swap4(&info->display_window.max_x);
-        tinyexr::swap4(&info->display_window.max_y);
-
-        has_display_window = true;
-      }
-    } else if (attr_name.compare("lineOrder") == 0) {
-      if (data.size() >= 1) {
-        info->line_order = static_cast<int>(data[0]);
-        has_line_order = true;
-      }
-    } else if (attr_name.compare("pixelAspectRatio") == 0) {
-      if (data.size() >= sizeof(float)) {
-        memcpy(&info->pixel_aspect_ratio, &data.at(0), sizeof(float));
-        tinyexr::swap4(&info->pixel_aspect_ratio);
-        has_pixel_aspect_ratio = true;
-      }
-    } else if (attr_name.compare("screenWindowCenter") == 0) {
-      if (data.size() >= 8) {
-        memcpy(&info->screen_window_center[0], &data.at(0), sizeof(float));
-        memcpy(&info->screen_window_center[1], &data.at(4), sizeof(float));
-        tinyexr::swap4(&info->screen_window_center[0]);
-        tinyexr::swap4(&info->screen_window_center[1]);
-        has_screen_window_center = true;
-      }
-    } else if (attr_name.compare("screenWindowWidth") == 0) {
-      if (data.size() >= sizeof(float)) {
-        memcpy(&info->screen_window_width, &data.at(0), sizeof(float));
-        tinyexr::swap4(&info->screen_window_width);
-
-        has_screen_window_width = true;
-      }
-    } else if (attr_name.compare("chunkCount") == 0) {
-      if (data.size() >= sizeof(int)) {
-        memcpy(&info->chunk_count, &data.at(0), sizeof(int));
-        tinyexr::swap4(&info->chunk_count);
-      }
-    } else if (attr_name.compare("name") == 0) {
-      if (!data.empty() && data[0]) {
-        data.push_back(0);
-        size_t len = strlen(reinterpret_cast<const char*>(&data[0]));
-        info->name.resize(len);
-        info->name.assign(reinterpret_cast<const char*>(&data[0]), len);
-        has_name = true;
-      }
-    } else if (attr_name.compare("type") == 0) {
-      if (!data.empty() && data[0]) {
-        data.push_back(0);
-        size_t len = strlen(reinterpret_cast<const char*>(&data[0]));
-        info->type.resize(len);
-        info->type.assign(reinterpret_cast<const char*>(&data[0]), len);
-        has_type = true;
-      }
-    } else {
-      // Custom attribute(up to TINYEXR_MAX_CUSTOM_ATTRIBUTES)
-      if (info->attributes.size() < TINYEXR_MAX_CUSTOM_ATTRIBUTES) {
-        EXRAttribute attrib;
-#ifdef _MSC_VER
-        strncpy_s(attrib.name, attr_name.c_str(), 255);
-        strncpy_s(attrib.type, attr_type.c_str(), 255);
-#else
-        strncpy(attrib.name, attr_name.c_str(), 255);
-        strncpy(attrib.type, attr_type.c_str(), 255);
-#endif
-        attrib.name[255] = '\0';
-        attrib.type[255] = '\0';
-        //std::cout << "i = " << info->attributes.size() << ", dsize = " << data.size() << "\n";
-        attrib.size = static_cast<int>(data.size());
-        attrib.value = static_cast<unsigned char *>(malloc(data.size()));
-        memcpy(reinterpret_cast<char *>(attrib.value), &data.at(0),
-               data.size());
-        info->attributes.push_back(attrib);
-      }
-    }
-  }
-
-  // Check if required attributes exist
-  {
-    std::stringstream ss_err;
-
-    if (!has_compression) {
-      ss_err << "\"compression\" attribute not found in the header."
-             << std::endl;
-    }
-
-    if (!has_channels) {
-      ss_err << "\"channels\" attribute not found in the header." << std::endl;
-    }
-
-    if (!has_line_order) {
-      ss_err << "\"lineOrder\" attribute not found in the header." << std::endl;
-    }
-
-    if (!has_display_window) {
-      ss_err << "\"displayWindow\" attribute not found in the header."
-             << std::endl;
-    }
-
-    if (!has_data_window) {
-      ss_err << "\"dataWindow\" attribute not found in the header or invalid."
-             << std::endl;
-    }
-
-    if (!has_pixel_aspect_ratio) {
-      ss_err << "\"pixelAspectRatio\" attribute not found in the header."
-             << std::endl;
-    }
-
-    if (!has_screen_window_width) {
-      ss_err << "\"screenWindowWidth\" attribute not found in the header."
-             << std::endl;
-    }
-
-    if (!has_screen_window_center) {
-      ss_err << "\"screenWindowCenter\" attribute not found in the header."
-             << std::endl;
-    }
-
-    if (version->multipart || version->non_image) {
-      if (!has_name) {
-        ss_err << "\"name\" attribute not found in the header."
-          << std::endl;
-      }
-      if (!has_type) {
-        ss_err << "\"type\" attribute not found in the header."
-          << std::endl;
-      }
-    }
-
-    if (!(ss_err.str().empty())) {
-      if (err) {
-        (*err) += ss_err.str();
-      }
-
-      return TINYEXR_ERROR_INVALID_HEADER;
-    }
-  }
-
-  info->header_len = static_cast<unsigned int>(orig_size - size);
-
-  return TINYEXR_SUCCESS;
-}
-
-// C++ HeaderInfo to C EXRHeader conversion.
-static bool ConvertHeader(EXRHeader *exr_header, const HeaderInfo &info, std::string *warn, std::string *err) {
-  exr_header->pixel_aspect_ratio = info.pixel_aspect_ratio;
-  exr_header->screen_window_center[0] = info.screen_window_center[0];
-  exr_header->screen_window_center[1] = info.screen_window_center[1];
-  exr_header->screen_window_width = info.screen_window_width;
-  exr_header->chunk_count = info.chunk_count;
-  exr_header->display_window.min_x = info.display_window.min_x;
-  exr_header->display_window.min_y = info.display_window.min_y;
-  exr_header->display_window.max_x = info.display_window.max_x;
-  exr_header->display_window.max_y = info.display_window.max_y;
-  exr_header->data_window.min_x = info.data_window.min_x;
-  exr_header->data_window.min_y = info.data_window.min_y;
-  exr_header->data_window.max_x = info.data_window.max_x;
-  exr_header->data_window.max_y = info.data_window.max_y;
-  exr_header->line_order = info.line_order;
-  exr_header->compression_type = info.compression_type;
-  exr_header->tiled = info.tiled;
-  exr_header->tile_size_x = info.tile_size_x;
-  exr_header->tile_size_y = info.tile_size_y;
-  exr_header->tile_level_mode = info.tile_level_mode;
-  exr_header->tile_rounding_mode = info.tile_rounding_mode;
-
-  EXRSetNameAttr(exr_header, info.name.c_str());
-
-
-  if (!info.type.empty()) {
-    bool valid = true;
-    if (info.type == "scanlineimage") {
-      if (exr_header->tiled) {
-        if (err) {
-          (*err) += "(ConvertHeader) tiled bit must be off for `scanlineimage` type.\n";
-        }
-        valid = false;
-      }
-    } else if (info.type == "tiledimage") {
-      if (!exr_header->tiled) {
-        if (err) {
-          (*err) += "(ConvertHeader) tiled bit must be on for `tiledimage` type.\n";
-        }
-        valid = false;
-      }
-    } else if (info.type == "deeptile") {
-      exr_header->non_image = 1;
-      if (!exr_header->tiled) {
-        if (err) {
-          (*err) += "(ConvertHeader) tiled bit must be on for `deeptile` type.\n";
-        }
-        valid = false;
-      }
-    } else if (info.type == "deepscanline") {
-      exr_header->non_image = 1;
-      if (exr_header->tiled) {
-        if (err) {
-          (*err) += "(ConvertHeader) tiled bit must be off for `deepscanline` type.\n";
-        }
-        //valid = false;
-      }
-    } else {
-      if (warn) {
-        std::stringstream ss;
-        ss << "(ConvertHeader) Unsupported or unknown info.type: " << info.type << "\n";
-        (*warn) += ss.str();
-      }
-    }
-
-    if (!valid) {
-      return false;
-    }
-  }
-
-  exr_header->num_channels = static_cast<int>(info.channels.size());
-
-  exr_header->channels = static_cast<EXRChannelInfo *>(malloc(
-      sizeof(EXRChannelInfo) * static_cast<size_t>(exr_header->num_channels)));
-  for (size_t c = 0; c < static_cast<size_t>(exr_header->num_channels); c++) {
-#ifdef _MSC_VER
-    strncpy_s(exr_header->channels[c].name, info.channels[c].name.c_str(), 255);
-#else
-    strncpy(exr_header->channels[c].name, info.channels[c].name.c_str(), 255);
-#endif
-    // manually add '\0' for safety.
-    exr_header->channels[c].name[255] = '\0';
-
-    exr_header->channels[c].pixel_type = info.channels[c].pixel_type;
-    exr_header->channels[c].p_linear = info.channels[c].p_linear;
-    exr_header->channels[c].x_sampling = info.channels[c].x_sampling;
-    exr_header->channels[c].y_sampling = info.channels[c].y_sampling;
-  }
-
-  exr_header->pixel_types = static_cast<int *>(
-      malloc(sizeof(int) * static_cast<size_t>(exr_header->num_channels)));
-  for (size_t c = 0; c < static_cast<size_t>(exr_header->num_channels); c++) {
-    exr_header->pixel_types[c] = info.channels[c].pixel_type;
-  }
-
-  // Initially fill with values of `pixel_types`
-  exr_header->requested_pixel_types = static_cast<int *>(
-      malloc(sizeof(int) * static_cast<size_t>(exr_header->num_channels)));
-  for (size_t c = 0; c < static_cast<size_t>(exr_header->num_channels); c++) {
-    exr_header->requested_pixel_types[c] = info.channels[c].pixel_type;
-  }
-
-  exr_header->num_custom_attributes = static_cast<int>(info.attributes.size());
-
-  if (exr_header->num_custom_attributes > 0) {
-    // TODO(syoyo): Report warning when # of attributes exceeds
-    // `TINYEXR_MAX_CUSTOM_ATTRIBUTES`
-    if (exr_header->num_custom_attributes > TINYEXR_MAX_CUSTOM_ATTRIBUTES) {
-      exr_header->num_custom_attributes = TINYEXR_MAX_CUSTOM_ATTRIBUTES;
-    }
-
-    exr_header->custom_attributes = static_cast<EXRAttribute *>(malloc(
-        sizeof(EXRAttribute) * size_t(exr_header->num_custom_attributes)));
-
-    for (size_t i = 0; i < size_t(exr_header->num_custom_attributes); i++) {
-      memcpy(exr_header->custom_attributes[i].name, info.attributes[i].name,
-             256);
-      memcpy(exr_header->custom_attributes[i].type, info.attributes[i].type,
-             256);
-      exr_header->custom_attributes[i].size = info.attributes[i].size;
-      // Just copy pointer
-      exr_header->custom_attributes[i].value = info.attributes[i].value;
-    }
-
-  } else {
-    exr_header->custom_attributes = NULL;
-  }
-
-  exr_header->header_len = info.header_len;
-
-  return true;
-}
-
-struct OffsetData {
-  OffsetData() : num_x_levels(0), num_y_levels(0) {}
-  std::vector<std::vector<std::vector <tinyexr::tinyexr_uint64> > > offsets;
-  int num_x_levels;
-  int num_y_levels;
-};
-
-// -1 = error
-static int LevelIndex(int lx, int ly, int tile_level_mode, int num_x_levels) {
-  switch (tile_level_mode) {
-  case TINYEXR_TILE_ONE_LEVEL:
-    return 0;
-
-  case TINYEXR_TILE_MIPMAP_LEVELS:
-    return lx;
-
-  case TINYEXR_TILE_RIPMAP_LEVELS:
-    return lx + ly * num_x_levels;
-
-  default:
-    return -1;
-  }
-  return 0;
-}
-
-static int LevelSize(int toplevel_size, int level, int tile_rounding_mode) {
-  if (level < 0) {
-    return -1;
-  }
-
-  int b = static_cast<int>(1u << static_cast<unsigned int>(level));
-  int level_size = toplevel_size / b;
-
-  if (tile_rounding_mode == TINYEXR_TILE_ROUND_UP && level_size * b < toplevel_size)
-    level_size += 1;
-
-  return std::max(level_size, 1);
-}
-
-static int DecodeTiledLevel(EXRImage* exr_image, const EXRHeader* exr_header,
-  const OffsetData& offset_data,
-  const std::vector<size_t>& channel_offset_list,
-  int pixel_data_size,
-  const unsigned char* head, const size_t size,
-  std::string* err) {
-  int num_channels = exr_header->num_channels;
-
-  int level_index = LevelIndex(exr_image->level_x, exr_image->level_y, exr_header->tile_level_mode, offset_data.num_x_levels);
-  int num_y_tiles = int(offset_data.offsets[size_t(level_index)].size());
-  if (num_y_tiles < 1) {
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-  int num_x_tiles = int(offset_data.offsets[size_t(level_index)][0].size());
-  if (num_x_tiles < 1) {
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-  int num_tiles = num_x_tiles * num_y_tiles;
-
-  int err_code = TINYEXR_SUCCESS;
-
-  enum {
-    EF_SUCCESS = 0,
-    EF_INVALID_DATA = 1,
-    EF_INSUFFICIENT_DATA = 2,
-    EF_FAILED_TO_DECODE = 4
-  };
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-  std::atomic<unsigned> error_flag(EF_SUCCESS);
-#else
-  unsigned error_flag(EF_SUCCESS);
-#endif
-
-  // Although the spec says : "...the data window is subdivided into an array of smaller rectangles...",
-  // the IlmImf library allows the dimensions of the tile to be larger (or equal) than the dimensions of the data window.
-#if 0
-  if ((exr_header->tile_size_x > exr_image->width || exr_header->tile_size_y > exr_image->height) &&
-    exr_image->level_x == 0 && exr_image->level_y == 0) {
-    if (err) {
-      (*err) += "Failed to decode tile data.\n";
-    }
-    err_code = TINYEXR_ERROR_INVALID_DATA;
-  }
-#endif
-  exr_image->tiles = static_cast<EXRTile*>(
-    calloc(sizeof(EXRTile), static_cast<size_t>(num_tiles)));
-
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-  std::vector<std::thread> workers;
-  std::atomic<int> tile_count(0);
-
-  int num_threads = std::max(1, int(std::thread::hardware_concurrency()));
-  if (num_threads > int(num_tiles)) {
-    num_threads = int(num_tiles);
-  }
-
-  for (int t = 0; t < num_threads; t++) {
-    workers.emplace_back(std::thread([&]()
-      {
-        int tile_idx = 0;
-        while ((tile_idx = tile_count++) < num_tiles) {
-
-#else
-#if TINYEXR_USE_OPENMP
-#pragma omp parallel for
-#endif
-  for (int tile_idx = 0; tile_idx < num_tiles; tile_idx++) {
-#endif
-    // Allocate memory for each tile.
-    bool alloc_success = false;
-    exr_image->tiles[tile_idx].images = tinyexr::AllocateImage(
-      num_channels, exr_header->channels,
-      exr_header->requested_pixel_types, exr_header->tile_size_x,
-      exr_header->tile_size_y, &alloc_success);
-
-    if (!alloc_success) {
-      error_flag |= EF_INVALID_DATA;
-      continue;
-    }
-
-    int x_tile = tile_idx % num_x_tiles;
-    int y_tile = tile_idx / num_x_tiles;
-    // 16 byte: tile coordinates
-    // 4 byte : data size
-    // ~      : data(uncompressed or compressed)
-    tinyexr::tinyexr_uint64 offset = offset_data.offsets[size_t(level_index)][size_t(y_tile)][size_t(x_tile)];
-    if (offset + sizeof(int) * 5 > size) {
-      // Insufficient data size.
-      error_flag |= EF_INSUFFICIENT_DATA;
-      continue;
-    }
-
-    size_t data_size =
-      size_t(size - (offset + sizeof(int) * 5));
-    const unsigned char* data_ptr =
-      reinterpret_cast<const unsigned char*>(head + offset);
-
-    int tile_coordinates[4];
-    memcpy(tile_coordinates, data_ptr, sizeof(int) * 4);
-    tinyexr::swap4(&tile_coordinates[0]);
-    tinyexr::swap4(&tile_coordinates[1]);
-    tinyexr::swap4(&tile_coordinates[2]);
-    tinyexr::swap4(&tile_coordinates[3]);
-
-    if (tile_coordinates[2] != exr_image->level_x) {
-      // Invalid data.
-      error_flag |= EF_INVALID_DATA;
-      continue;
-    }
-    if (tile_coordinates[3] != exr_image->level_y) {
-      // Invalid data.
-      error_flag |= EF_INVALID_DATA;
-      continue;
-    }
-
-    int data_len;
-    memcpy(&data_len, data_ptr + 16,
-      sizeof(int));  // 16 = sizeof(tile_coordinates)
-    tinyexr::swap4(&data_len);
-
-    if (data_len < 2 || size_t(data_len) > data_size) {
-      // Insufficient data size.
-      error_flag |= EF_INSUFFICIENT_DATA;
-      continue;
-    }
-
-    // Move to data addr: 20 = 16 + 4;
-    data_ptr += 20;
-    bool ret = tinyexr::DecodeTiledPixelData(
-      exr_image->tiles[tile_idx].images,
-      &(exr_image->tiles[tile_idx].width),
-      &(exr_image->tiles[tile_idx].height),
-      exr_header->requested_pixel_types, data_ptr,
-      static_cast<size_t>(data_len), exr_header->compression_type,
-      exr_header->line_order,
-      exr_image->width, exr_image->height,
-      tile_coordinates[0], tile_coordinates[1], exr_header->tile_size_x,
-      exr_header->tile_size_y, static_cast<size_t>(pixel_data_size),
-      static_cast<size_t>(exr_header->num_custom_attributes),
-      exr_header->custom_attributes,
-      static_cast<size_t>(exr_header->num_channels),
-      exr_header->channels, channel_offset_list);
-
-    if (!ret) {
-      // Failed to decode tile data.
-      error_flag |= EF_FAILED_TO_DECODE;
-    }
-
-    exr_image->tiles[tile_idx].offset_x = tile_coordinates[0];
-    exr_image->tiles[tile_idx].offset_y = tile_coordinates[1];
-    exr_image->tiles[tile_idx].level_x = tile_coordinates[2];
-    exr_image->tiles[tile_idx].level_y = tile_coordinates[3];
-
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-  }
-        }));
-    }  // num_thread loop
-
-    for (auto& t : workers) {
-      t.join();
-    }
-
-#else
-  } // parallel for
-#endif
-
-  // Even in the event of an error, the reserved memory may be freed.
-  exr_image->num_channels = num_channels;
-  exr_image->num_tiles = static_cast<int>(num_tiles);
-
-  if (error_flag)  err_code = TINYEXR_ERROR_INVALID_DATA;
-  if (err) {
-    if (error_flag & EF_INSUFFICIENT_DATA) {
-      (*err) += "Insufficient data length.\n";
-    }
-    if (error_flag & EF_FAILED_TO_DECODE) {
-      (*err) += "Failed to decode tile data.\n";
-    }
-  }
-  return err_code;
-}
-
-static int DecodeChunk(EXRImage *exr_image, const EXRHeader *exr_header,
-                       const OffsetData& offset_data,
-                       const unsigned char *head, const size_t size,
-                       std::string *err) {
-  int num_channels = exr_header->num_channels;
-
-  int num_scanline_blocks = 1;
-  if (exr_header->compression_type == TINYEXR_COMPRESSIONTYPE_ZIP) {
-    num_scanline_blocks = 16;
-  } else if (exr_header->compression_type == TINYEXR_COMPRESSIONTYPE_PIZ) {
-    num_scanline_blocks = 32;
-  } else if (exr_header->compression_type == TINYEXR_COMPRESSIONTYPE_ZFP) {
-    num_scanline_blocks = 16;
-
-#if TINYEXR_USE_ZFP
-    tinyexr::ZFPCompressionParam zfp_compression_param;
-    if (!FindZFPCompressionParam(&zfp_compression_param,
-                                 exr_header->custom_attributes,
-                                 int(exr_header->num_custom_attributes), err)) {
-      return TINYEXR_ERROR_INVALID_HEADER;
-    }
-#endif
-  }
-
-  if (exr_header->data_window.max_x < exr_header->data_window.min_x ||
-      exr_header->data_window.max_y < exr_header->data_window.min_y) {
-    if (err) {
-      (*err) += "Invalid data window.\n";
-    }
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  tinyexr_int64 data_width =
-      static_cast<tinyexr_int64>(exr_header->data_window.max_x) - static_cast<tinyexr_int64>(exr_header->data_window.min_x) + static_cast<tinyexr_int64>(1);
-  tinyexr_int64 data_height =
-      static_cast<tinyexr_int64>(exr_header->data_window.max_y) - static_cast<tinyexr_int64>(exr_header->data_window.min_y) + static_cast<tinyexr_int64>(1);
-
-  if (data_width <= 0) {
-    if (err) {
-      (*err) += "Invalid data window width.\n";
-    }
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  if (data_height <= 0) {
-    if (err) {
-      (*err) += "Invalid data window height.\n";
-    }
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  // Do not allow too large data_width and data_height. header invalid?
-  {
-    if ((data_width > TINYEXR_DIMENSION_THRESHOLD) || (data_height > TINYEXR_DIMENSION_THRESHOLD)) {
-      if (err) {
-        std::stringstream ss;
-        ss << "data_with or data_height too large. data_width: " << data_width
-           << ", "
-           << "data_height = " << data_height << std::endl;
-        (*err) += ss.str();
-      }
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-    if (exr_header->tiled) {
-      if ((exr_header->tile_size_x > TINYEXR_DIMENSION_THRESHOLD) || (exr_header->tile_size_y > TINYEXR_DIMENSION_THRESHOLD)) {
-        if (err) {
-          std::stringstream ss;
-          ss << "tile with or tile height too large. tile width: " << exr_header->tile_size_x
-            << ", "
-            << "tile height = " << exr_header->tile_size_y << std::endl;
-          (*err) += ss.str();
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-    }
-  }
-
-  const std::vector<tinyexr::tinyexr_uint64>& offsets = offset_data.offsets[0][0];
-  size_t num_blocks = offsets.size();
-
-  std::vector<size_t> channel_offset_list;
-  int pixel_data_size = 0;
-  size_t channel_offset = 0;
-  if (!tinyexr::ComputeChannelLayout(&channel_offset_list, &pixel_data_size,
-                                     &channel_offset, num_channels,
-                                     exr_header->channels)) {
-    if (err) {
-      (*err) += "Failed to compute channel layout.\n";
-    }
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-  std::atomic<bool> invalid_data(false);
-#else
-  bool invalid_data(false);
-#endif
-
-  if (exr_header->tiled) {
-    // value check
-    if (exr_header->tile_size_x < 0) {
-      if (err) {
-        std::stringstream ss;
-        ss << "Invalid tile size x : " << exr_header->tile_size_x << "\n";
-        (*err) += ss.str();
-      }
-      return TINYEXR_ERROR_INVALID_HEADER;
-    }
-
-    if (exr_header->tile_size_y < 0) {
-      if (err) {
-        std::stringstream ss;
-        ss << "Invalid tile size y : " << exr_header->tile_size_y << "\n";
-        (*err) += ss.str();
-      }
-      return TINYEXR_ERROR_INVALID_HEADER;
-    }
-    if (exr_header->tile_level_mode != TINYEXR_TILE_RIPMAP_LEVELS) {
-      EXRImage* level_image = NULL;
-      for (int level = 0; level < offset_data.num_x_levels; ++level) {
-        if (!level_image) {
-          level_image = exr_image;
-        } else {
-          level_image->next_level = new EXRImage;
-          InitEXRImage(level_image->next_level);
-          level_image = level_image->next_level;
-        }
-        level_image->width =
-          LevelSize(exr_header->data_window.max_x - exr_header->data_window.min_x + 1, level, exr_header->tile_rounding_mode);
-        if (level_image->width < 1) {
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-
-        level_image->height =
-          LevelSize(exr_header->data_window.max_y - exr_header->data_window.min_y + 1, level, exr_header->tile_rounding_mode);
-
-        if (level_image->height < 1) {
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-
-        level_image->level_x = level;
-        level_image->level_y = level;
-
-        int ret = DecodeTiledLevel(level_image, exr_header,
-          offset_data,
-          channel_offset_list,
-          pixel_data_size,
-          head, size,
-          err);
-        if (ret != TINYEXR_SUCCESS) return ret;
-      }
-    } else {
-      EXRImage* level_image = NULL;
-      for (int level_y = 0; level_y < offset_data.num_y_levels; ++level_y)
-        for (int level_x = 0; level_x < offset_data.num_x_levels; ++level_x) {
-          if (!level_image) {
-            level_image = exr_image;
-          } else {
-            level_image->next_level = new EXRImage;
-            InitEXRImage(level_image->next_level);
-            level_image = level_image->next_level;
-          }
-
-          level_image->width =
-            LevelSize(exr_header->data_window.max_x - exr_header->data_window.min_x + 1, level_x, exr_header->tile_rounding_mode);
-          if (level_image->width < 1) {
-            return TINYEXR_ERROR_INVALID_DATA;
-          }
-
-          level_image->height =
-            LevelSize(exr_header->data_window.max_y - exr_header->data_window.min_y + 1, level_y, exr_header->tile_rounding_mode);
-          if (level_image->height < 1) {
-            return TINYEXR_ERROR_INVALID_DATA;
-          }
-
-          level_image->level_x = level_x;
-          level_image->level_y = level_y;
-
-          int ret = DecodeTiledLevel(level_image, exr_header,
-            offset_data,
-            channel_offset_list,
-            pixel_data_size,
-            head, size,
-            err);
-          if (ret != TINYEXR_SUCCESS) return ret;
-        }
-    }
-  } else {  // scanline format
-    // Don't allow too large image(256GB * pixel_data_size or more). Workaround
-    // for #104.
-    size_t total_data_len =
-        size_t(data_width) * size_t(data_height) * size_t(num_channels);
-    const bool total_data_len_overflown =
-        sizeof(void *) == 8 ? (total_data_len >= 0x4000000000) : false;
-    if ((total_data_len == 0) || total_data_len_overflown) {
-      if (err) {
-        std::stringstream ss;
-        ss << "Image data size is zero or too large: width = " << data_width
-           << ", height = " << data_height << ", channels = " << num_channels
-           << std::endl;
-        (*err) += ss.str();
-      }
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-    bool alloc_success = false;
-    exr_image->images = tinyexr::AllocateImage(
-        num_channels, exr_header->channels, exr_header->requested_pixel_types,
-        int(data_width), int(data_height), &alloc_success);
-
-    if (!alloc_success) {
-      if (err) {
-        std::stringstream ss;
-        ss << "Failed to allocate memory for Images. Maybe EXR header is corrupted or Image data size is too large: width = " << data_width
-           << ", height = " << data_height << ", channels = " << num_channels
-           << std::endl;
-        (*err) += ss.str();
-      }
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-    std::vector<std::thread> workers;
-    std::atomic<int> y_count(0);
-
-    int num_threads = std::max(1, int(std::thread::hardware_concurrency()));
-    if (num_threads > int(num_blocks)) {
-      num_threads = int(num_blocks);
-    }
-
-    for (int t = 0; t < num_threads; t++) {
-      workers.emplace_back(std::thread([&]() {
-        int y = 0;
-        while ((y = y_count++) < int(num_blocks)) {
-
-#else
-
-#if TINYEXR_USE_OPENMP
-#pragma omp parallel for
-#endif
-    for (int y = 0; y < static_cast<int>(num_blocks); y++) {
-
-#endif
-          size_t y_idx = static_cast<size_t>(y);
-
-          if (offsets[y_idx] + sizeof(int) * 2 > size) {
-            invalid_data = true;
-          } else {
-            // 4 byte: scan line
-            // 4 byte: data size
-            // ~     : pixel data(uncompressed or compressed)
-            size_t data_size =
-                size_t(size - (offsets[y_idx] + sizeof(int) * 2));
-            const unsigned char *data_ptr =
-                reinterpret_cast<const unsigned char *>(head + offsets[y_idx]);
-
-            int line_no;
-            memcpy(&line_no, data_ptr, sizeof(int));
-            int data_len;
-            memcpy(&data_len, data_ptr + 4, sizeof(int));
-            tinyexr::swap4(&line_no);
-            tinyexr::swap4(&data_len);
-
-            if (size_t(data_len) > data_size) {
-              invalid_data = true;
-
-            } else if ((line_no > (2 << 20)) || (line_no < -(2 << 20))) {
-              // Too large value. Assume this is invalid
-              // 2**20 = 1048576 = heuristic value.
-              invalid_data = true;
-            } else if (data_len == 0) {
-              // TODO(syoyo): May be ok to raise the threshold for example
-              // `data_len < 4`
-              invalid_data = true;
-            } else {
-              // line_no may be negative.
-              int end_line_no = (std::min)(line_no + num_scanline_blocks,
-                                           (exr_header->data_window.max_y + 1));
-
-              int num_lines = end_line_no - line_no;
-
-              if (num_lines <= 0) {
-                invalid_data = true;
-              } else {
-                // Move to data addr: 8 = 4 + 4;
-                data_ptr += 8;
-
-                // Adjust line_no with data_window.bmin.y
-
-                // overflow check
-                tinyexr_int64 lno =
-                    static_cast<tinyexr_int64>(line_no) -
-                    static_cast<tinyexr_int64>(exr_header->data_window.min_y);
-                if (lno > std::numeric_limits<int>::max()) {
-                  line_no = -1;  // invalid
-                } else if (lno < -std::numeric_limits<int>::max()) {
-                  line_no = -1;  // invalid
-                } else {
-                  line_no -= exr_header->data_window.min_y;
-                }
-
-                if (line_no < 0) {
-                  invalid_data = true;
-                } else {
-                  if (!tinyexr::DecodePixelData(
-                          exr_image->images, exr_header->requested_pixel_types,
-                          data_ptr, static_cast<size_t>(data_len),
-                          exr_header->compression_type, exr_header->line_order,
-                          int(data_width), int(data_height), int(data_width), y, line_no,
-                          num_lines, static_cast<size_t>(pixel_data_size),
-                          static_cast<size_t>(
-                              exr_header->num_custom_attributes),
-                          exr_header->custom_attributes,
-                          static_cast<size_t>(exr_header->num_channels),
-                          exr_header->channels, channel_offset_list)) {
-                    invalid_data = true;
-                  }
-                }
-              }
-            }
-          }
-
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-        }
-      }));
-    }
-
-    for (auto &t : workers) {
-      t.join();
-    }
-#else
-    }  // omp parallel
-#endif
-  }
-
-  if (invalid_data) {
-    if (err) {
-      (*err) += "Invalid/Corrupted data found when decoding pixels.\n";
-    }
-
-    // free alloced image.
-    for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-      if (exr_image->images[c]) {
-        free(exr_image->images[c]);
-        exr_image->images[c] = NULL;
-      }
-    }
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  // Overwrite `pixel_type` with `requested_pixel_type`.
-  {
-    for (int c = 0; c < exr_header->num_channels; c++) {
-      exr_header->pixel_types[c] = exr_header->requested_pixel_types[c];
-    }
-  }
-
-  {
-    exr_image->num_channels = num_channels;
-
-    exr_image->width = int(data_width);
-    exr_image->height = int(data_height);
-  }
-
-  return TINYEXR_SUCCESS;
-}
-
-static bool ReconstructLineOffsets(
-    std::vector<tinyexr::tinyexr_uint64> *offsets, size_t n,
-    const unsigned char *head, const unsigned char *marker, const size_t size) {
-  if (head >= marker) {
-    return false;
-  }
-  if (offsets->size() != n) {
-    return false;
-  }
-
-  for (size_t i = 0; i < n; i++) {
-    size_t offset = static_cast<size_t>(marker - head);
-    // Offset should not exceed whole EXR file/data size.
-    if ((offset + sizeof(tinyexr::tinyexr_uint64)) >= size) {
-      return false;
-    }
-
-    int y;
-    unsigned int data_len;
-
-    memcpy(&y, marker, sizeof(int));
-    memcpy(&data_len, marker + 4, sizeof(unsigned int));
-
-    if (data_len >= size) {
-      return false;
-    }
-
-    tinyexr::swap4(&y);
-    tinyexr::swap4(&data_len);
-
-    (*offsets)[i] = offset;
-
-    marker += data_len + 8;  // 8 = 4 bytes(y) + 4 bytes(data_len)
-  }
-
-  return true;
-}
-
-
-static int FloorLog2(unsigned x) {
-  //
-  // For x > 0, floorLog2(y) returns floor(log(x)/log(2)).
-  //
-  int y = 0;
-  while (x > 1) {
-    y += 1;
-    x >>= 1u;
-  }
-  return y;
-}
-
-
-static int CeilLog2(unsigned x) {
-  //
-  // For x > 0, ceilLog2(y) returns ceil(log(x)/log(2)).
-  //
-  int y = 0;
-  int r = 0;
-  while (x > 1) {
-    if (x & 1)
-      r = 1;
-
-    y += 1;
-    x >>= 1u;
-  }
-  return y + r;
-}
-
-static int RoundLog2(int x, int tile_rounding_mode) {
-  return (tile_rounding_mode == TINYEXR_TILE_ROUND_DOWN) ? FloorLog2(static_cast<unsigned>(x)) : CeilLog2(static_cast<unsigned>(x));
-}
-
-static int CalculateNumXLevels(const EXRHeader* exr_header) {
-  int min_x = exr_header->data_window.min_x;
-  int max_x = exr_header->data_window.max_x;
-  int min_y = exr_header->data_window.min_y;
-  int max_y = exr_header->data_window.max_y;
-
-  int num = 0;
-  switch (exr_header->tile_level_mode) {
-  case TINYEXR_TILE_ONE_LEVEL:
-
-    num = 1;
-    break;
-
-  case TINYEXR_TILE_MIPMAP_LEVELS:
-
-  {
-    int w = max_x - min_x + 1;
-    int h = max_y - min_y + 1;
-    num = RoundLog2(std::max(w, h), exr_header->tile_rounding_mode) + 1;
-  }
-  break;
-
-  case TINYEXR_TILE_RIPMAP_LEVELS:
-
-  {
-    int w = max_x - min_x + 1;
-    num = RoundLog2(w, exr_header->tile_rounding_mode) + 1;
-  }
-  break;
-
-  default:
-
-    return -1;
-  }
-
-  return num;
-}
-
-static int CalculateNumYLevels(const EXRHeader* exr_header) {
-  int min_x = exr_header->data_window.min_x;
-  int max_x = exr_header->data_window.max_x;
-  int min_y = exr_header->data_window.min_y;
-  int max_y = exr_header->data_window.max_y;
-  int num = 0;
-
-  switch (exr_header->tile_level_mode) {
-  case TINYEXR_TILE_ONE_LEVEL:
-
-    num = 1;
-    break;
-
-  case TINYEXR_TILE_MIPMAP_LEVELS:
-
-  {
-    int w = max_x - min_x + 1;
-    int h = max_y - min_y + 1;
-    num = RoundLog2(std::max(w, h), exr_header->tile_rounding_mode) + 1;
-  }
-  break;
-
-  case TINYEXR_TILE_RIPMAP_LEVELS:
-
-  {
-    int h = max_y - min_y + 1;
-    num = RoundLog2(h, exr_header->tile_rounding_mode) + 1;
-  }
-  break;
-
-  default:
-
-    return -1;
-  }
-
-  return num;
-}
-
-static bool CalculateNumTiles(std::vector<int>& numTiles,
-  int toplevel_size,
-  int size,
-  int tile_rounding_mode) {
-  for (unsigned i = 0; i < numTiles.size(); i++) {
-    int l = LevelSize(toplevel_size, int(i), tile_rounding_mode);
-    if (l < 0) {
-      return false;
-    }
-    TINYEXR_CHECK_AND_RETURN_C(l <= std::numeric_limits<int>::max() - size + 1, false);
-
-    numTiles[i] = (l + size - 1) / size;
-  }
-  return true;
-}
-
-static bool PrecalculateTileInfo(std::vector<int>& num_x_tiles,
-  std::vector<int>& num_y_tiles,
-  const EXRHeader* exr_header) {
-  int min_x = exr_header->data_window.min_x;
-  int max_x = exr_header->data_window.max_x;
-  int min_y = exr_header->data_window.min_y;
-  int max_y = exr_header->data_window.max_y;
-
-  int num_x_levels = CalculateNumXLevels(exr_header);
-
-  if (num_x_levels < 0) {
-    return false;
-  }
-
-  int num_y_levels = CalculateNumYLevels(exr_header);
-
-  if (num_y_levels < 0) {
-    return false;
-  }
-
-  num_x_tiles.resize(size_t(num_x_levels));
-  num_y_tiles.resize(size_t(num_y_levels));
-
-  if (!CalculateNumTiles(num_x_tiles,
-    max_x - min_x + 1,
-    exr_header->tile_size_x,
-    exr_header->tile_rounding_mode)) {
-    return false;
-  }
-
-  if (!CalculateNumTiles(num_y_tiles,
-    max_y - min_y + 1,
-    exr_header->tile_size_y,
-    exr_header->tile_rounding_mode)) {
-    return false;
-  }
-
-  return true;
-}
-
-static void InitSingleResolutionOffsets(OffsetData& offset_data, size_t num_blocks) {
-  offset_data.offsets.resize(1);
-  offset_data.offsets[0].resize(1);
-  offset_data.offsets[0][0].resize(num_blocks);
-  offset_data.num_x_levels = 1;
-  offset_data.num_y_levels = 1;
-}
-
-// Return sum of tile blocks.
-// 0 = error
-static int InitTileOffsets(OffsetData& offset_data,
-  const EXRHeader* exr_header,
-  const std::vector<int>& num_x_tiles,
-  const std::vector<int>& num_y_tiles) {
-  int num_tile_blocks = 0;
-  offset_data.num_x_levels = static_cast<int>(num_x_tiles.size());
-  offset_data.num_y_levels = static_cast<int>(num_y_tiles.size());
-  switch (exr_header->tile_level_mode) {
-  case TINYEXR_TILE_ONE_LEVEL:
-  case TINYEXR_TILE_MIPMAP_LEVELS:
-    TINYEXR_CHECK_AND_RETURN_C(offset_data.num_x_levels == offset_data.num_y_levels, 0);
-    offset_data.offsets.resize(size_t(offset_data.num_x_levels));
-
-    for (unsigned int l = 0; l < offset_data.offsets.size(); ++l) {
-      offset_data.offsets[l].resize(size_t(num_y_tiles[l]));
-
-      for (unsigned int dy = 0; dy < offset_data.offsets[l].size(); ++dy) {
-        offset_data.offsets[l][dy].resize(size_t(num_x_tiles[l]));
-        num_tile_blocks += num_x_tiles[l];
-      }
-    }
-    break;
-
-  case TINYEXR_TILE_RIPMAP_LEVELS:
-
-    offset_data.offsets.resize(static_cast<size_t>(offset_data.num_x_levels) * static_cast<size_t>(offset_data.num_y_levels));
-
-    for (int ly = 0; ly < offset_data.num_y_levels; ++ly) {
-      for (int lx = 0; lx < offset_data.num_x_levels; ++lx) {
-        int l = ly * offset_data.num_x_levels + lx;
-        offset_data.offsets[size_t(l)].resize(size_t(num_y_tiles[size_t(ly)]));
-
-        for (size_t dy = 0; dy < offset_data.offsets[size_t(l)].size(); ++dy) {
-          offset_data.offsets[size_t(l)][dy].resize(size_t(num_x_tiles[size_t(lx)]));
-          num_tile_blocks += num_x_tiles[size_t(lx)];
-        }
-      }
-    }
-    break;
-
-  default:
-    return 0;
-  }
-  return num_tile_blocks;
-}
-
-static bool IsAnyOffsetsAreInvalid(const OffsetData& offset_data) {
-  for (unsigned int l = 0; l < offset_data.offsets.size(); ++l)
-    for (unsigned int dy = 0; dy < offset_data.offsets[l].size(); ++dy)
-      for (unsigned int dx = 0; dx < offset_data.offsets[l][dy].size(); ++dx)
-        if (reinterpret_cast<const tinyexr::tinyexr_int64&>(offset_data.offsets[l][dy][dx]) <= 0)
-          return true;
-
-  return false;
-}
-
-static bool isValidTile(const EXRHeader* exr_header,
-                        const OffsetData& offset_data,
-                        int dx, int dy, int lx, int ly) {
-  if (lx < 0 || ly < 0 || dx < 0 || dy < 0) return false;
-  int num_x_levels = offset_data.num_x_levels;
-  int num_y_levels = offset_data.num_y_levels;
-  switch (exr_header->tile_level_mode) {
-  case TINYEXR_TILE_ONE_LEVEL:
-
-    if (lx == 0 &&
-        ly == 0 &&
-        offset_data.offsets.size() > 0 &&
-        offset_data.offsets[0].size() > static_cast<size_t>(dy) &&
-        offset_data.offsets[0][size_t(dy)].size() > static_cast<size_t>(dx)) {
-      return true;
-    }
-
-    break;
-
-  case TINYEXR_TILE_MIPMAP_LEVELS:
-
-    if (lx < num_x_levels &&
-        ly < num_y_levels &&
-        offset_data.offsets.size() > static_cast<size_t>(lx) &&
-        offset_data.offsets[size_t(lx)].size() > static_cast<size_t>(dy) &&
-        offset_data.offsets[size_t(lx)][size_t(dy)].size() > static_cast<size_t>(dx)) {
-      return true;
-    }
-
-    break;
-
-  case TINYEXR_TILE_RIPMAP_LEVELS:
-  {
-    size_t idx = static_cast<size_t>(lx) + static_cast<size_t>(ly)* static_cast<size_t>(num_x_levels);
-    if (lx < num_x_levels &&
-       ly < num_y_levels &&
-       (offset_data.offsets.size() > idx) &&
-       offset_data.offsets[idx].size() > static_cast<size_t>(dy) &&
-       offset_data.offsets[idx][size_t(dy)].size() > static_cast<size_t>(dx)) {
-      return true;
-    }
-  }
-
-    break;
-
-  default:
-
-    return false;
-  }
-
-  return false;
-}
-
-static bool ReconstructTileOffsets(OffsetData& offset_data,
-                                   const EXRHeader* exr_header,
-                                   const unsigned char* head, const unsigned char* marker, const size_t size,
-                                   bool isMultiPartFile,
-                                   bool isDeep) {
-  int numXLevels = offset_data.num_x_levels;
-  for (unsigned int l = 0; l < offset_data.offsets.size(); ++l) {
-    for (unsigned int dy = 0; dy < offset_data.offsets[l].size(); ++dy) {
-      for (unsigned int dx = 0; dx < offset_data.offsets[l][dy].size(); ++dx) {
-        tinyexr::tinyexr_uint64 tileOffset = tinyexr::tinyexr_uint64(marker - head);
-
-
-        if (isMultiPartFile) {
-          if ((marker + sizeof(int)) >= (head + size)) {
-            return false;
-          }
-
-          //int partNumber;
-          marker += sizeof(int);
-        }
-
-        if ((marker + 4 * sizeof(int)) >= (head + size)) {
-          return false;
-        }
-
-        int tileX;
-        memcpy(&tileX, marker, sizeof(int));
-        tinyexr::swap4(&tileX);
-        marker += sizeof(int);
-
-        int tileY;
-        memcpy(&tileY, marker, sizeof(int));
-        tinyexr::swap4(&tileY);
-        marker += sizeof(int);
-
-        int levelX;
-        memcpy(&levelX, marker, sizeof(int));
-        tinyexr::swap4(&levelX);
-        marker += sizeof(int);
-
-        int levelY;
-        memcpy(&levelY, marker, sizeof(int));
-        tinyexr::swap4(&levelY);
-        marker += sizeof(int);
-
-        if (isDeep) {
-          if ((marker + 2 * sizeof(tinyexr::tinyexr_int64)) >= (head + size)) {
-            return false;
-          }
-          tinyexr::tinyexr_int64 packed_offset_table_size;
-          memcpy(&packed_offset_table_size, marker, sizeof(tinyexr::tinyexr_int64));
-          tinyexr::swap8(reinterpret_cast<tinyexr::tinyexr_uint64*>(&packed_offset_table_size));
-          marker += sizeof(tinyexr::tinyexr_int64);
-
-          tinyexr::tinyexr_int64 packed_sample_size;
-          memcpy(&packed_sample_size, marker, sizeof(tinyexr::tinyexr_int64));
-          tinyexr::swap8(reinterpret_cast<tinyexr::tinyexr_uint64*>(&packed_sample_size));
-          marker += sizeof(tinyexr::tinyexr_int64);
-
-          // next Int64 is unpacked sample size - skip that too
-          marker += packed_offset_table_size + packed_sample_size + 8;
-
-          if (marker >= (head + size)) {
-            return false;
-          }
-
-        } else {
-
-          if ((marker + sizeof(uint32_t)) >= (head + size)) {
-            return false;
-          }
-
-          uint32_t dataSize;
-          memcpy(&dataSize, marker, sizeof(uint32_t));
-          tinyexr::swap4(&dataSize);
-          marker += sizeof(uint32_t);
-
-          marker += dataSize;
-
-          if (marker >= (head + size)) {
-            return false;
-          }
-        }
-
-        if (!isValidTile(exr_header, offset_data,
-          tileX, tileY, levelX, levelY)) {
-          return false;
-        }
-
-        int level_idx = LevelIndex(levelX, levelY, exr_header->tile_level_mode, numXLevels);
-        if (level_idx < 0) {
-          return false;
-        }
-
-        if (size_t(level_idx) >= offset_data.offsets.size()) {
-          return false;
-        }
-
-        if (size_t(tileY) >= offset_data.offsets[size_t(level_idx)].size()) {
-          return false;
-        }
-
-        if (size_t(tileX) >= offset_data.offsets[size_t(level_idx)][size_t(tileY)].size()) {
-          return false;
-        }
-        
-        offset_data.offsets[size_t(level_idx)][size_t(tileY)][size_t(tileX)] = tileOffset;
-      }
-    }
-  }
-  return true;
-}
-
-// marker output is also
-static int ReadOffsets(OffsetData& offset_data,
-                       const unsigned char* head,
-                       const unsigned char*& marker,
-                       const size_t size,
-                       const char** err) {
-  for (unsigned int l = 0; l < offset_data.offsets.size(); ++l) {
-    for (unsigned int dy = 0; dy < offset_data.offsets[l].size(); ++dy) {
-      for (unsigned int dx = 0; dx < offset_data.offsets[l][dy].size(); ++dx) {
-        tinyexr::tinyexr_uint64 offset;
-        if ((marker + sizeof(tinyexr_uint64)) >= (head + size)) {
-          tinyexr::SetErrorMessage("Insufficient data size in offset table.", err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-
-        memcpy(&offset, marker, sizeof(tinyexr::tinyexr_uint64));
-        tinyexr::swap8(&offset);
-        if (offset >= size) {
-          tinyexr::SetErrorMessage("Invalid offset value in DecodeEXRImage.", err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-        marker += sizeof(tinyexr::tinyexr_uint64);  // = 8
-        offset_data.offsets[l][dy][dx] = offset;
-      }
-    }
-  }
-  return TINYEXR_SUCCESS;
-}
-
-static int DecodeEXRImage(EXRImage *exr_image, const EXRHeader *exr_header,
-                          const unsigned char *head,
-                          const unsigned char *marker, const size_t size,
-                          const char **err) {
-  if (exr_image == NULL || exr_header == NULL || head == NULL ||
-      marker == NULL || (size <= tinyexr::kEXRVersionSize)) {
-    tinyexr::SetErrorMessage("Invalid argument for DecodeEXRImage().", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  int num_scanline_blocks = 1;
-  if (exr_header->compression_type == TINYEXR_COMPRESSIONTYPE_ZIP) {
-    num_scanline_blocks = 16;
-  } else if (exr_header->compression_type == TINYEXR_COMPRESSIONTYPE_PIZ) {
-    num_scanline_blocks = 32;
-  } else if (exr_header->compression_type == TINYEXR_COMPRESSIONTYPE_ZFP) {
-    num_scanline_blocks = 16;
-  }
-
-  if (exr_header->data_window.max_x < exr_header->data_window.min_x ||
-      exr_header->data_window.max_x - exr_header->data_window.min_x ==
-          std::numeric_limits<int>::max()) {
-    // Issue 63
-    tinyexr::SetErrorMessage("Invalid data width value", err);
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-  tinyexr_int64 data_width =
-      static_cast<tinyexr_int64>(exr_header->data_window.max_x) - static_cast<tinyexr_int64>(exr_header->data_window.min_x) + static_cast<tinyexr_int64>(1);
-  if (data_width <= 0) {
-    tinyexr::SetErrorMessage("Invalid data window width value", err);
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  if (exr_header->data_window.max_y < exr_header->data_window.min_y ||
-      exr_header->data_window.max_y - exr_header->data_window.min_y ==
-          std::numeric_limits<int>::max()) {
-    tinyexr::SetErrorMessage("Invalid data height value", err);
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-  tinyexr_int64 data_height =
-      static_cast<tinyexr_int64>(exr_header->data_window.max_y) - static_cast<tinyexr_int64>(exr_header->data_window.min_y) + static_cast<tinyexr_int64>(1);
-
-  if (data_height <= 0) {
-    tinyexr::SetErrorMessage("Invalid data window height value", err);
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  // Do not allow too large data_width and data_height. header invalid?
-  {
-    if (data_width > TINYEXR_DIMENSION_THRESHOLD) {
-      tinyexr::SetErrorMessage("data width too large.", err);
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-    if (data_height > TINYEXR_DIMENSION_THRESHOLD) {
-      tinyexr::SetErrorMessage("data height too large.", err);
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-  }
-
-  if (exr_header->tiled) {
-    if (exr_header->tile_size_x > TINYEXR_DIMENSION_THRESHOLD) {
-      tinyexr::SetErrorMessage("tile width too large.", err);
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-    if (exr_header->tile_size_y > TINYEXR_DIMENSION_THRESHOLD) {
-      tinyexr::SetErrorMessage("tile height too large.", err);
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-  }
-
-  // Read offset tables.
-  OffsetData offset_data;
-  size_t num_blocks = 0;
-  // For a multi-resolution image, the size of the offset table will be calculated from the other attributes of the header.
-  // If chunk_count > 0 then chunk_count must be equal to the calculated tile count.
-  if (exr_header->tiled) {
-    {
-      std::vector<int> num_x_tiles, num_y_tiles;
-      if (!PrecalculateTileInfo(num_x_tiles, num_y_tiles, exr_header)) {
-        tinyexr::SetErrorMessage("Failed to precalculate tile info.", err);
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-      num_blocks = size_t(InitTileOffsets(offset_data, exr_header, num_x_tiles, num_y_tiles));
-      if (exr_header->chunk_count > 0) {
-        if (exr_header->chunk_count != static_cast<int>(num_blocks)) {
-          tinyexr::SetErrorMessage("Invalid offset table size.", err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-      }
-    }
-
-    int ret = ReadOffsets(offset_data, head, marker, size, err);
-    if (ret != TINYEXR_SUCCESS) return ret;
-    if (IsAnyOffsetsAreInvalid(offset_data)) {
-      if (!ReconstructTileOffsets(offset_data, exr_header,
-        head, marker, size,
-        exr_header->multipart, exr_header->non_image)) {
-
-          tinyexr::SetErrorMessage("Invalid Tile Offsets data.", err);
-          return TINYEXR_ERROR_INVALID_DATA;
-      }
-    }
-  } else if (exr_header->chunk_count > 0) {
-    // Use `chunkCount` attribute.
-    num_blocks = static_cast<size_t>(exr_header->chunk_count);
-    InitSingleResolutionOffsets(offset_data, num_blocks);
-  } else {
-    num_blocks = static_cast<size_t>(data_height) /
-      static_cast<size_t>(num_scanline_blocks);
-    if (num_blocks * static_cast<size_t>(num_scanline_blocks) <
-      static_cast<size_t>(data_height)) {
-      num_blocks++;
-    }
-
-    InitSingleResolutionOffsets(offset_data, num_blocks);
-  }
-
-  if (!exr_header->tiled) {
-    std::vector<tinyexr::tinyexr_uint64>& offsets = offset_data.offsets[0][0];
-    for (size_t y = 0; y < num_blocks; y++) {
-      tinyexr::tinyexr_uint64 offset;
-      // Issue #81
-      if ((marker + sizeof(tinyexr_uint64)) >= (head + size)) {
-        tinyexr::SetErrorMessage("Insufficient data size in offset table.", err);
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-      memcpy(&offset, marker, sizeof(tinyexr::tinyexr_uint64));
-      tinyexr::swap8(&offset);
-      if (offset >= size) {
-        tinyexr::SetErrorMessage("Invalid offset value in DecodeEXRImage.", err);
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-      marker += sizeof(tinyexr::tinyexr_uint64);  // = 8
-      offsets[y] = offset;
-    }
-
-    // If line offsets are invalid, we try to reconstruct it.
-    // See OpenEXR/IlmImf/ImfScanLineInputFile.cpp::readLineOffsets() for details.
-    for (size_t y = 0; y < num_blocks; y++) {
-      if (offsets[y] <= 0) {
-        // TODO(syoyo) Report as warning?
-        // if (err) {
-        //  stringstream ss;
-        //  ss << "Incomplete lineOffsets." << std::endl;
-        //  (*err) += ss.str();
-        //}
-        bool ret =
-          ReconstructLineOffsets(&offsets, num_blocks, head, marker, size);
-        if (ret) {
-          // OK
-          break;
-        } else {
-          tinyexr::SetErrorMessage(
-            "Cannot reconstruct lineOffset table in DecodeEXRImage.", err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-      }
-    }
-  }
-
-  {
-    std::string e;
-    int ret = DecodeChunk(exr_image, exr_header, offset_data, head, size, &e);
-
-    if (ret != TINYEXR_SUCCESS) {
-      if (!e.empty()) {
-        tinyexr::SetErrorMessage(e, err);
-      }
-
-#if 1
-      FreeEXRImage(exr_image);
-#else
-      // release memory(if exists)
-      if ((exr_header->num_channels > 0) && exr_image && exr_image->images) {
-        for (size_t c = 0; c < size_t(exr_header->num_channels); c++) {
-          if (exr_image->images[c]) {
-            free(exr_image->images[c]);
-            exr_image->images[c] = NULL;
-          }
-        }
-        free(exr_image->images);
-        exr_image->images = NULL;
-      }
-#endif
-    }
-
-    return ret;
-  }
-}
-
-static void GetLayers(const EXRHeader &exr_header,
-                      std::vector<std::string> &layer_names) {
-  // Naive implementation
-  // Group channels by layers
-  // go over all channel names, split by periods
-  // collect unique names
-  layer_names.clear();
-  for (int c = 0; c < exr_header.num_channels; c++) {
-    std::string full_name(exr_header.channels[c].name);
-    const size_t pos = full_name.find_last_of('.');
-    if (pos != std::string::npos && pos != 0 && pos + 1 < full_name.size()) {
-      full_name.erase(pos);
-      if (std::find(layer_names.begin(), layer_names.end(), full_name) ==
-          layer_names.end())
-        layer_names.push_back(full_name);
-    }
-  }
-}
-
-struct LayerChannel {
-  explicit LayerChannel(size_t i, std::string n) : index(i), name(n) {}
-  size_t index;
-  std::string name;
-};
-
-static void ChannelsInLayer(const EXRHeader &exr_header,
-                            const std::string &layer_name,
-                            std::vector<LayerChannel> &channels) {
-  channels.clear();
-  //std::cout << "layer_name = " << layer_name << "\n";
-  for (int c = 0; c < exr_header.num_channels; c++) {
-    //std::cout << "chan[" << c << "] = " << exr_header.channels[c].name << "\n";
-    std::string ch_name(exr_header.channels[c].name);
-    if (layer_name.empty()) {
-      const size_t pos = ch_name.find_last_of('.');
-      if (pos != std::string::npos && pos < ch_name.size()) {
-        if (pos != 0) continue;
-        ch_name = ch_name.substr(pos + 1);
-      }
-    } else {
-      const size_t pos = ch_name.find(layer_name + '.');
-      if (pos == std::string::npos) continue;
-      if (pos == 0) {
-        ch_name = ch_name.substr(layer_name.size() + 1);
-      }
-    }
-    LayerChannel ch(size_t(c), ch_name);
-    channels.push_back(ch);
-  }
-}
-
-}  // namespace tinyexr
-
-int EXRLayers(const char *filename, const char **layer_names[], int *num_layers,
-              const char **err) {
-  EXRVersion exr_version;
-  EXRHeader exr_header;
-  InitEXRHeader(&exr_header);
-
-  {
-    int ret = ParseEXRVersionFromFile(&exr_version, filename);
-    if (ret != TINYEXR_SUCCESS) {
-      tinyexr::SetErrorMessage("Invalid EXR header.", err);
-      return ret;
-    }
-
-    if (exr_version.multipart || exr_version.non_image) {
-      tinyexr::SetErrorMessage(
-          "Loading multipart or DeepImage is not supported  in LoadEXR() API",
-          err);
-      return TINYEXR_ERROR_INVALID_DATA;  // @fixme.
-    }
-  }
-
-  int ret = ParseEXRHeaderFromFile(&exr_header, &exr_version, filename, err);
-  if (ret != TINYEXR_SUCCESS) {
-    FreeEXRHeader(&exr_header);
-    return ret;
-  }
-
-  std::vector<std::string> layer_vec;
-  tinyexr::GetLayers(exr_header, layer_vec);
-
-  (*num_layers) = int(layer_vec.size());
-  (*layer_names) = static_cast<const char **>(
-      malloc(sizeof(const char *) * static_cast<size_t>(layer_vec.size())));
-  for (size_t c = 0; c < static_cast<size_t>(layer_vec.size()); c++) {
-#ifdef _MSC_VER
-    (*layer_names)[c] = _strdup(layer_vec[c].c_str());
-#else
-    (*layer_names)[c] = strdup(layer_vec[c].c_str());
-#endif
-  }
-
-  FreeEXRHeader(&exr_header);
-  return TINYEXR_SUCCESS;
-}
-
-int LoadEXR(float **out_rgba, int *width, int *height, const char *filename,
-            const char **err) {
-  return LoadEXRWithLayer(out_rgba, width, height, filename,
-                          /* layername */ NULL, err);
-}
-
-int LoadEXRWithLayer(float **out_rgba, int *width, int *height,
-                     const char *filename, const char *layername,
-                     const char **err) {
-  if (out_rgba == NULL) {
-    tinyexr::SetErrorMessage("Invalid argument for LoadEXR()", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  EXRVersion exr_version;
-  EXRImage exr_image;
-  EXRHeader exr_header;
-  InitEXRHeader(&exr_header);
-  InitEXRImage(&exr_image);
-
-  {
-    int ret = ParseEXRVersionFromFile(&exr_version, filename);
-    if (ret != TINYEXR_SUCCESS) {
-      std::stringstream ss;
-      ss << "Failed to open EXR file or read version info from EXR file. code("
-         << ret << ")";
-      tinyexr::SetErrorMessage(ss.str(), err);
-      return ret;
-    }
-
-    if (exr_version.multipart || exr_version.non_image) {
-      tinyexr::SetErrorMessage(
-          "Loading multipart or DeepImage is not supported  in LoadEXR() API",
-          err);
-      return TINYEXR_ERROR_INVALID_DATA;  // @fixme.
-    }
-  }
-
-  {
-    int ret = ParseEXRHeaderFromFile(&exr_header, &exr_version, filename, err);
-    if (ret != TINYEXR_SUCCESS) {
-      FreeEXRHeader(&exr_header);
-      return ret;
-    }
-  }
-
-  // Read HALF channel as FLOAT.
-  for (int i = 0; i < exr_header.num_channels; i++) {
-    if (exr_header.pixel_types[i] == TINYEXR_PIXELTYPE_HALF) {
-      exr_header.requested_pixel_types[i] = TINYEXR_PIXELTYPE_FLOAT;
-    }
-  }
-
-  // TODO: Probably limit loading to layers (channels) selected by layer index
-  {
-    int ret = LoadEXRImageFromFile(&exr_image, &exr_header, filename, err);
-    if (ret != TINYEXR_SUCCESS) {
-      FreeEXRHeader(&exr_header);
-      return ret;
-    }
-  }
-
-  // RGBA
-  int idxR = -1;
-  int idxG = -1;
-  int idxB = -1;
-  int idxA = -1;
-
-  std::vector<std::string> layer_names;
-  tinyexr::GetLayers(exr_header, layer_names);
-
-  std::vector<tinyexr::LayerChannel> channels;
-  tinyexr::ChannelsInLayer(
-      exr_header, layername == NULL ? "" : std::string(layername), channels);
-
-
-  if (channels.size() < 1) {
-    if (layername == NULL) {
-      tinyexr::SetErrorMessage("Layer Not Found. Seems EXR contains channels with layer(e.g. `diffuse.R`). if you are using LoadEXR(), please try LoadEXRWithLayer(). LoadEXR() cannot load EXR having channels with layer.", err);
-
-    } else {
-      tinyexr::SetErrorMessage("Layer Not Found", err);
-    }
-    FreeEXRHeader(&exr_header);
-    FreeEXRImage(&exr_image);
-    return TINYEXR_ERROR_LAYER_NOT_FOUND;
-  }
-
-  size_t ch_count = channels.size() < 4 ? channels.size() : 4;
-  for (size_t c = 0; c < ch_count; c++) {
-    const tinyexr::LayerChannel &ch = channels[c];
-
-    if (ch.name == "R") {
-      idxR = int(ch.index);
-    } else if (ch.name == "G") {
-      idxG = int(ch.index);
-    } else if (ch.name == "B") {
-      idxB = int(ch.index);
-    } else if (ch.name == "A") {
-      idxA = int(ch.index);
-    }
-  }
-
-  if (channels.size() == 1) {
-    int chIdx = int(channels.front().index);
-    // Grayscale channel only.
-
-    (*out_rgba) = reinterpret_cast<float *>(
-        malloc(4 * sizeof(float) * static_cast<size_t>(exr_image.width) *
-               static_cast<size_t>(exr_image.height)));
-
-    if (exr_header.tiled) {
-      const size_t tile_size_x = static_cast<size_t>(exr_header.tile_size_x);
-      const size_t tile_size_y = static_cast<size_t>(exr_header.tile_size_y);
-      for (int it = 0; it < exr_image.num_tiles; it++) {
-        for (size_t j = 0; j < tile_size_y; j++) {
-          for (size_t i = 0; i < tile_size_x; i++) {
-            const size_t ii =
-              static_cast<size_t>(exr_image.tiles[it].offset_x) * tile_size_x +
-              i;
-            const size_t jj =
-              static_cast<size_t>(exr_image.tiles[it].offset_y) * tile_size_y +
-              j;
-            const size_t idx = ii + jj * static_cast<size_t>(exr_image.width);
-
-            // out of region check.
-            if (ii >= static_cast<size_t>(exr_image.width)) {
-              continue;
-            }
-            if (jj >= static_cast<size_t>(exr_image.height)) {
-              continue;
-            }
-            const size_t srcIdx = i + j * tile_size_x;
-            unsigned char **src = exr_image.tiles[it].images;
-            (*out_rgba)[4 * idx + 0] =
-                reinterpret_cast<float **>(src)[chIdx][srcIdx];
-            (*out_rgba)[4 * idx + 1] =
-                reinterpret_cast<float **>(src)[chIdx][srcIdx];
-            (*out_rgba)[4 * idx + 2] =
-                reinterpret_cast<float **>(src)[chIdx][srcIdx];
-            (*out_rgba)[4 * idx + 3] =
-                reinterpret_cast<float **>(src)[chIdx][srcIdx];
-          }
-        }
-      }
-    } else {
-      const size_t pixel_size = static_cast<size_t>(exr_image.width) *
-        static_cast<size_t>(exr_image.height);
-      for (size_t i = 0; i < pixel_size; i++) {
-        const float val =
-            reinterpret_cast<float **>(exr_image.images)[chIdx][i];
-        (*out_rgba)[4 * i + 0] = val;
-        (*out_rgba)[4 * i + 1] = val;
-        (*out_rgba)[4 * i + 2] = val;
-        (*out_rgba)[4 * i + 3] = val;
-      }
-    }
-  } else {
-    // Assume RGB(A)
-
-    if (idxR == -1) {
-      tinyexr::SetErrorMessage("R channel not found", err);
-
-      FreeEXRHeader(&exr_header);
-      FreeEXRImage(&exr_image);
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-    if (idxG == -1) {
-      tinyexr::SetErrorMessage("G channel not found", err);
-      FreeEXRHeader(&exr_header);
-      FreeEXRImage(&exr_image);
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-    if (idxB == -1) {
-      tinyexr::SetErrorMessage("B channel not found", err);
-      FreeEXRHeader(&exr_header);
-      FreeEXRImage(&exr_image);
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-    (*out_rgba) = reinterpret_cast<float *>(
-        malloc(4 * sizeof(float) * static_cast<size_t>(exr_image.width) *
-               static_cast<size_t>(exr_image.height)));
-    if (exr_header.tiled) {
-      const size_t tile_size_x = static_cast<size_t>(exr_header.tile_size_x);
-      const size_t tile_size_y = static_cast<size_t>(exr_header.tile_size_y);
-      for (int it = 0; it < exr_image.num_tiles; it++) {
-        for (size_t j = 0; j < tile_size_y; j++) {
-          for (size_t i = 0; i < tile_size_x; i++) {
-            const size_t ii =
-                static_cast<size_t>(exr_image.tiles[it].offset_x) *
-                    tile_size_x +
-                i;
-            const size_t jj =
-                static_cast<size_t>(exr_image.tiles[it].offset_y) *
-                    tile_size_y +
-                j;
-            const size_t idx = ii + jj * static_cast<size_t>(exr_image.width);
-
-            // out of region check.
-            if (ii >= static_cast<size_t>(exr_image.width)) {
-              continue;
-            }
-            if (jj >= static_cast<size_t>(exr_image.height)) {
-              continue;
-            }
-            const size_t srcIdx = i + j * tile_size_x;
-            unsigned char **src = exr_image.tiles[it].images;
-            (*out_rgba)[4 * idx + 0] =
-                reinterpret_cast<float **>(src)[idxR][srcIdx];
-            (*out_rgba)[4 * idx + 1] =
-                reinterpret_cast<float **>(src)[idxG][srcIdx];
-            (*out_rgba)[4 * idx + 2] =
-                reinterpret_cast<float **>(src)[idxB][srcIdx];
-            if (idxA != -1) {
-              (*out_rgba)[4 * idx + 3] =
-                  reinterpret_cast<float **>(src)[idxA][srcIdx];
-            } else {
-              (*out_rgba)[4 * idx + 3] = 1.0;
-            }
-          }
-        }
-      }
-    } else {
-      const size_t pixel_size = static_cast<size_t>(exr_image.width) *
-        static_cast<size_t>(exr_image.height);
-      for (size_t i = 0; i < pixel_size; i++) {
-        (*out_rgba)[4 * i + 0] =
-            reinterpret_cast<float **>(exr_image.images)[idxR][i];
-        (*out_rgba)[4 * i + 1] =
-            reinterpret_cast<float **>(exr_image.images)[idxG][i];
-        (*out_rgba)[4 * i + 2] =
-            reinterpret_cast<float **>(exr_image.images)[idxB][i];
-        if (idxA != -1) {
-          (*out_rgba)[4 * i + 3] =
-              reinterpret_cast<float **>(exr_image.images)[idxA][i];
-        } else {
-          (*out_rgba)[4 * i + 3] = 1.0;
-        }
-      }
-    }
-  }
-
-  (*width) = exr_image.width;
-  (*height) = exr_image.height;
-
-  FreeEXRHeader(&exr_header);
-  FreeEXRImage(&exr_image);
-
-  return TINYEXR_SUCCESS;
-}
-
-int IsEXR(const char *filename) {
-  EXRVersion exr_version;
-
-  int ret = ParseEXRVersionFromFile(&exr_version, filename);
-  if (ret != TINYEXR_SUCCESS) {
-    return ret;
-  }
-
-  return TINYEXR_SUCCESS;
-}
-
-int IsEXRFromMemory(const unsigned char *memory, size_t size) {
-  EXRVersion exr_version;
-
-  int ret = ParseEXRVersionFromMemory(&exr_version, memory, size);
-  if (ret != TINYEXR_SUCCESS) {
-    return ret;
-  }
-
-  return TINYEXR_SUCCESS;
-}
-
-int ParseEXRHeaderFromMemory(EXRHeader *exr_header, const EXRVersion *version,
-                             const unsigned char *memory, size_t size,
-                             const char **err) {
-  if (memory == NULL || exr_header == NULL) {
-    tinyexr::SetErrorMessage(
-        "Invalid argument. `memory` or `exr_header` argument is null in "
-        "ParseEXRHeaderFromMemory()",
-        err);
-
-    // Invalid argument
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (size < tinyexr::kEXRVersionSize) {
-    tinyexr::SetErrorMessage("Insufficient header/data size.\n", err);
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  const unsigned char *marker = memory + tinyexr::kEXRVersionSize;
-  size_t marker_size = size - tinyexr::kEXRVersionSize;
-
-  tinyexr::HeaderInfo info;
-  info.clear();
-
-  int ret;
-  {
-    std::string err_str;
-    ret = ParseEXRHeader(&info, NULL, version, &err_str, marker, marker_size);
-
-    if (ret != TINYEXR_SUCCESS) {
-      if (err && !err_str.empty()) {
-        tinyexr::SetErrorMessage(err_str, err);
-      }
-    }
-  }
-
-  {
-    std::string warn;
-    std::string err_str;
-
-    if (!ConvertHeader(exr_header, info, &warn, &err_str)) {
-      // release mem
-      for (size_t i = 0; i < info.attributes.size(); i++) {
-        if (info.attributes[i].value) {
-          free(info.attributes[i].value);
-        }
-      }
-      if (err && !err_str.empty()) {
-        tinyexr::SetErrorMessage(err_str, err);
-      }
-      ret = TINYEXR_ERROR_INVALID_HEADER;
-    }
-  }
-
-  exr_header->multipart = version->multipart ? 1 : 0;
-  exr_header->non_image = version->non_image ? 1 : 0;
-
-  return ret;
-}
-
-int LoadEXRFromMemory(float **out_rgba, int *width, int *height,
-                      const unsigned char *memory, size_t size,
-                      const char **err) {
-  if (out_rgba == NULL || memory == NULL) {
-    tinyexr::SetErrorMessage("Invalid argument for LoadEXRFromMemory", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  EXRVersion exr_version;
-  EXRImage exr_image;
-  EXRHeader exr_header;
-
-  InitEXRHeader(&exr_header);
-
-  int ret = ParseEXRVersionFromMemory(&exr_version, memory, size);
-  if (ret != TINYEXR_SUCCESS) {
-    std::stringstream ss;
-    ss << "Failed to parse EXR version. code(" << ret << ")";
-    tinyexr::SetErrorMessage(ss.str(), err);
-    return ret;
-  }
-
-  ret = ParseEXRHeaderFromMemory(&exr_header, &exr_version, memory, size, err);
-  if (ret != TINYEXR_SUCCESS) {
-    return ret;
-  }
-
-  // Read HALF channel as FLOAT.
-  for (int i = 0; i < exr_header.num_channels; i++) {
-    if (exr_header.pixel_types[i] == TINYEXR_PIXELTYPE_HALF) {
-      exr_header.requested_pixel_types[i] = TINYEXR_PIXELTYPE_FLOAT;
-    }
-  }
-
-  InitEXRImage(&exr_image);
-  ret = LoadEXRImageFromMemory(&exr_image, &exr_header, memory, size, err);
-  if (ret != TINYEXR_SUCCESS) {
-    return ret;
-  }
-
-  // RGBA
-  int idxR = -1;
-  int idxG = -1;
-  int idxB = -1;
-  int idxA = -1;
-  for (int c = 0; c < exr_header.num_channels; c++) {
-    if (strcmp(exr_header.channels[c].name, "R") == 0) {
-      idxR = c;
-    } else if (strcmp(exr_header.channels[c].name, "G") == 0) {
-      idxG = c;
-    } else if (strcmp(exr_header.channels[c].name, "B") == 0) {
-      idxB = c;
-    } else if (strcmp(exr_header.channels[c].name, "A") == 0) {
-      idxA = c;
-    }
-  }
-
-  // TODO(syoyo): Refactor removing same code as used in LoadEXR().
-  if (exr_header.num_channels == 1) {
-    // Grayscale channel only.
-
-    (*out_rgba) = reinterpret_cast<float *>(
-        malloc(4 * sizeof(float) * static_cast<size_t>(exr_image.width) *
-               static_cast<size_t>(exr_image.height)));
-
-    if (exr_header.tiled) {
-      const size_t tile_size_x = static_cast<size_t>(exr_header.tile_size_x);
-      const size_t tile_size_y = static_cast<size_t>(exr_header.tile_size_y);
-      for (int it = 0; it < exr_image.num_tiles; it++) {
-        for (size_t j = 0; j < tile_size_y; j++) {
-          for (size_t i = 0; i < tile_size_x; i++) {
-            const size_t ii =
-                static_cast<size_t>(exr_image.tiles[it].offset_x) *
-                    tile_size_x +
-                i;
-            const size_t jj =
-                static_cast<size_t>(exr_image.tiles[it].offset_y) *
-                    tile_size_y +
-                j;
-            const size_t idx = ii + jj * static_cast<size_t>(exr_image.width);
-
-            // out of region check.
-            if (ii >= static_cast<size_t>(exr_image.width)) {
-              continue;
-            }
-            if (jj >= static_cast<size_t>(exr_image.height)) {
-              continue;
-            }
-            const size_t srcIdx = i + j * tile_size_x;
-            unsigned char **src = exr_image.tiles[it].images;
-            (*out_rgba)[4 * idx + 0] =
-                reinterpret_cast<float **>(src)[0][srcIdx];
-            (*out_rgba)[4 * idx + 1] =
-                reinterpret_cast<float **>(src)[0][srcIdx];
-            (*out_rgba)[4 * idx + 2] =
-                reinterpret_cast<float **>(src)[0][srcIdx];
-            (*out_rgba)[4 * idx + 3] =
-                reinterpret_cast<float **>(src)[0][srcIdx];
-          }
-        }
-      }
-    } else {
-      const size_t pixel_size = static_cast<size_t>(exr_image.width) *
-        static_cast<size_t>(exr_image.height);
-      for (size_t i = 0; i < pixel_size; i++) {
-        const float val = reinterpret_cast<float **>(exr_image.images)[0][i];
-        (*out_rgba)[4 * i + 0] = val;
-        (*out_rgba)[4 * i + 1] = val;
-        (*out_rgba)[4 * i + 2] = val;
-        (*out_rgba)[4 * i + 3] = val;
-      }
-    }
-
-  } else {
-    // TODO(syoyo): Support non RGBA image.
-
-    if (idxR == -1) {
-      tinyexr::SetErrorMessage("R channel not found", err);
-
-      // @todo { free exr_image }
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-    if (idxG == -1) {
-      tinyexr::SetErrorMessage("G channel not found", err);
-      // @todo { free exr_image }
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-    if (idxB == -1) {
-      tinyexr::SetErrorMessage("B channel not found", err);
-      // @todo { free exr_image }
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-    (*out_rgba) = reinterpret_cast<float *>(
-        malloc(4 * sizeof(float) * static_cast<size_t>(exr_image.width) *
-               static_cast<size_t>(exr_image.height)));
-
-    if (exr_header.tiled) {
-      const size_t tile_size_x = static_cast<size_t>(exr_header.tile_size_x);
-      const size_t tile_size_y = static_cast<size_t>(exr_header.tile_size_y);
-      for (int it = 0; it < exr_image.num_tiles; it++) {
-        for (size_t j = 0; j < tile_size_y; j++)
-          for (size_t i = 0; i < tile_size_x; i++) {
-            const size_t ii =
-                static_cast<size_t>(exr_image.tiles[it].offset_x) *
-                    tile_size_x +
-                i;
-            const size_t jj =
-                static_cast<size_t>(exr_image.tiles[it].offset_y) *
-                    tile_size_y +
-                j;
-            const size_t idx = ii + jj * static_cast<size_t>(exr_image.width);
-
-            // out of region check.
-            if (ii >= static_cast<size_t>(exr_image.width)) {
-              continue;
-            }
-            if (jj >= static_cast<size_t>(exr_image.height)) {
-              continue;
-            }
-            const size_t srcIdx = i + j * tile_size_x;
-            unsigned char **src = exr_image.tiles[it].images;
-            (*out_rgba)[4 * idx + 0] =
-                reinterpret_cast<float **>(src)[idxR][srcIdx];
-            (*out_rgba)[4 * idx + 1] =
-                reinterpret_cast<float **>(src)[idxG][srcIdx];
-            (*out_rgba)[4 * idx + 2] =
-                reinterpret_cast<float **>(src)[idxB][srcIdx];
-            if (idxA != -1) {
-              (*out_rgba)[4 * idx + 3] =
-                  reinterpret_cast<float **>(src)[idxA][srcIdx];
-            } else {
-              (*out_rgba)[4 * idx + 3] = 1.0;
-            }
-          }
-      }
-    } else {
-      const size_t pixel_size = static_cast<size_t>(exr_image.width) *
-        static_cast<size_t>(exr_image.height);
-      for (size_t i = 0; i < pixel_size; i++) {
-        (*out_rgba)[4 * i + 0] =
-            reinterpret_cast<float **>(exr_image.images)[idxR][i];
-        (*out_rgba)[4 * i + 1] =
-            reinterpret_cast<float **>(exr_image.images)[idxG][i];
-        (*out_rgba)[4 * i + 2] =
-            reinterpret_cast<float **>(exr_image.images)[idxB][i];
-        if (idxA != -1) {
-          (*out_rgba)[4 * i + 3] =
-              reinterpret_cast<float **>(exr_image.images)[idxA][i];
-        } else {
-          (*out_rgba)[4 * i + 3] = 1.0;
-        }
-      }
-    }
-  }
-
-  (*width) = exr_image.width;
-  (*height) = exr_image.height;
-
-  FreeEXRHeader(&exr_header);
-  FreeEXRImage(&exr_image);
-
-  return TINYEXR_SUCCESS;
-}
-
-// Represents a read-only file mapped to an address space in memory.
-// If no memory-mapping API is available, falls back to allocating a buffer
-// with a copy of the file's data.
-struct MemoryMappedFile {
-  unsigned char *data;  // To the start of the file's data.
-  size_t size;          // The size of the file in bytes.
-#ifdef TINYEXR_USE_WIN32_MMAP
-  HANDLE windows_file;
-  HANDLE windows_file_mapping;
-#elif defined(TINYEXR_USE_POSIX_MMAP)
-  int posix_descriptor;
-#endif
-
-  // MemoryMappedFile's constructor tries to map memory to a file.
-  // If this succeeds, valid() will return true and all fields
-  // are usable; otherwise, valid() will return false.
-  MemoryMappedFile(const char *filename) {
-    data = NULL;
-    size = 0;
-#ifdef TINYEXR_USE_WIN32_MMAP
-    windows_file_mapping = NULL;
-    windows_file =
-        CreateFileW(tinyexr::UTF8ToWchar(filename).c_str(),  // lpFileName
-                    GENERIC_READ,                            // dwDesiredAccess
-                    FILE_SHARE_READ,                         // dwShareMode
-                    NULL,                     // lpSecurityAttributes
-                    OPEN_EXISTING,            // dwCreationDisposition
-                    FILE_ATTRIBUTE_READONLY,  // dwFlagsAndAttributes
-                    NULL);                    // hTemplateFile
-    if (windows_file == INVALID_HANDLE_VALUE) {
-      return;
-    }
-
-    windows_file_mapping = CreateFileMapping(windows_file,  // hFile
-                                             NULL,  // lpFileMappingAttributes
-                                             PAGE_READONLY,  // flProtect
-                                             0,      // dwMaximumSizeHigh
-                                             0,      // dwMaximumSizeLow
-                                             NULL);  // lpName
-    if (windows_file_mapping == NULL) {
-      return;
-    }
-
-    data = reinterpret_cast<unsigned char *>(
-        MapViewOfFile(windows_file_mapping,  // hFileMappingObject
-                      FILE_MAP_READ,         // dwDesiredAccess
-                      0,                     // dwFileOffsetHigh
-                      0,                     // dwFileOffsetLow
-                      0));                   // dwNumberOfBytesToMap
-    if (!data) {
-      return;
-    }
-
-    LARGE_INTEGER windows_file_size = {};
-    if (!GetFileSizeEx(windows_file, &windows_file_size) ||
-        static_cast<ULONGLONG>(windows_file_size.QuadPart) >
-            std::numeric_limits<size_t>::max()) {
-      UnmapViewOfFile(data);
-      data = NULL;
-      return;
-    }
-    size = static_cast<size_t>(windows_file_size.QuadPart);
-#elif defined(TINYEXR_USE_POSIX_MMAP)
-    posix_descriptor = open(filename, O_RDONLY);
-    if (posix_descriptor == -1) {
-      return;
-    }
-
-    struct stat info;
-    if (fstat(posix_descriptor, &info) < 0) {
-      return;
-    }
-    // Make sure st_size is in the valid range for a size_t. The second case
-    // can only fail if a POSIX implementation defines off_t to be a larger
-    // type than size_t - for instance, compiling with _FILE_OFFSET_BITS=64
-    // on a 32-bit system. On current 64-bit systems, this check can never
-    // fail, so we turn off clang's Wtautological-type-limit-compare warning
-    // around this code.
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wtautological-type-limit-compare"
-#endif
-    if (info.st_size < 0 ||
-        info.st_size > std::numeric_limits<ssize_t>::max()) {
-      return;
-    }
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-    size = static_cast<size_t>(info.st_size);
-
-    data = reinterpret_cast<unsigned char *>(
-        mmap(0, size, PROT_READ, MAP_SHARED, posix_descriptor, 0));
-    if (data == MAP_FAILED) {
-      data = nullptr;
-      return;
-    }
-#else
-    FILE *fp = fopen(filename, "rb");
-    if (!fp) {
-      return;
-    }
-
-    // Calling fseek(fp, 0, SEEK_END) isn't strictly-conforming C code, but
-    // since neither the WIN32 nor POSIX APIs are available in this branch, this
-    // is a reasonable fallback option.
-    if (fseek(fp, 0, SEEK_END) != 0) {
-      fclose(fp);
-      return;
-    }
-    const long ftell_result = ftell(fp);
-    if (ftell_result < 0) {
-      // Error from ftell
-      fclose(fp);
-      return;
-    }
-    size = static_cast<size_t>(ftell_result);
-    if (fseek(fp, 0, SEEK_SET) != 0) {
-      fclose(fp);
-      size = 0;
-      return;
-    }
-
-    data = reinterpret_cast<unsigned char *>(malloc(size));
-    if (!data) {
-      size = 0;
-      fclose(fp);
-      return;
-    }
-    size_t read_bytes = fread(data, 1, size, fp);
-    if (read_bytes != size) {
-      // TODO: Try to read data until reading `size` bytes.
-      fclose(fp);
-      size = 0; 
-      data = nullptr;
-      return;
-    }
-    fclose(fp);
-#endif
-  }
-
-  // MemoryMappedFile's destructor closes all its handles.
-  ~MemoryMappedFile() {
-#ifdef TINYEXR_USE_WIN32_MMAP
-    if (data) {
-      (void)UnmapViewOfFile(data);
-      data = NULL;
-    }
-
-    if (windows_file_mapping != NULL) {
-      (void)CloseHandle(windows_file_mapping);
-    }
-
-    if (windows_file != INVALID_HANDLE_VALUE) {
-      (void)CloseHandle(windows_file);
-    }
-#elif defined(TINYEXR_USE_POSIX_MMAP)
-    if (data) {
-      (void)munmap(data, size);
-      data = NULL;
-    }
-
-    if (posix_descriptor != -1) {
-      (void)close(posix_descriptor);
-    }
-#else
-    if (data) {
-      (void)free(data);
-    }
-    data = NULL;
-#endif
-  }
-
-  // A MemoryMappedFile cannot be copied or moved.
-  // Only check for this when compiling with C++11 or higher, since deleted
-  // function definitions were added then.
-#if TINYEXR_HAS_CXX11
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#endif
-  MemoryMappedFile(const MemoryMappedFile &) = delete;
-  MemoryMappedFile &operator=(const MemoryMappedFile &) = delete;
-  MemoryMappedFile(MemoryMappedFile &&other) noexcept = delete;
-  MemoryMappedFile &operator=(MemoryMappedFile &&other) noexcept = delete;
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-#endif
-
-  // Returns whether this was successfully opened.
-  bool valid() const { return data; }
-};
-
-int LoadEXRImageFromFile(EXRImage *exr_image, const EXRHeader *exr_header,
-                         const char *filename, const char **err) {
-  if (exr_image == NULL) {
-    tinyexr::SetErrorMessage("Invalid argument for LoadEXRImageFromFile", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  MemoryMappedFile file(filename);
-  if (!file.valid()) {
-    tinyexr::SetErrorMessage("Cannot read file " + std::string(filename), err);
-    return TINYEXR_ERROR_CANT_OPEN_FILE;
-  }
-
-  if (file.size < 16) {
-    tinyexr::SetErrorMessage("File size too short : " + std::string(filename),
-                             err);
-    return TINYEXR_ERROR_INVALID_FILE;
-  }
-
-  return LoadEXRImageFromMemory(exr_image, exr_header, file.data, file.size,
-                                err);
-}
-
-int LoadEXRImageFromMemory(EXRImage *exr_image, const EXRHeader *exr_header,
-                           const unsigned char *memory, const size_t size,
-                           const char **err) {
-  if (exr_image == NULL || memory == NULL ||
-      (size < tinyexr::kEXRVersionSize)) {
-    tinyexr::SetErrorMessage("Invalid argument for LoadEXRImageFromMemory",
-                             err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (exr_header->header_len == 0) {
-    tinyexr::SetErrorMessage("EXRHeader variable is not initialized.", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  const unsigned char *head = memory;
-  const unsigned char *marker = reinterpret_cast<const unsigned char *>(
-      memory + exr_header->header_len +
-      8);  // +8 for magic number + version header.
-  return tinyexr::DecodeEXRImage(exr_image, exr_header, head, marker, size,
-                                 err);
-}
-
-namespace tinyexr
-{
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wsign-conversion"
-#endif
-
-// out_data must be allocated initially with the block-header size
-// of the current image(-part) type
-static bool EncodePixelData(/* out */ std::vector<unsigned char>& out_data,
-                            const unsigned char* const* images,
-                            int compression_type,
-                            int /*line_order*/,
-                            int width, // for tiled : tile.width
-                            int /*height*/, // for tiled : header.tile_size_y
-                            int x_stride, // for tiled : header.tile_size_x
-                            int line_no, // for tiled : 0
-                            int num_lines, // for tiled : tile.height
-                            size_t pixel_data_size,
-                            const std::vector<ChannelInfo>& channels,
-                            const std::vector<size_t>& channel_offset_list,
-                            std::string *err,
-                            const void* compression_param = 0) // zfp compression param
-{
-  size_t buf_size = static_cast<size_t>(width) *
-                  static_cast<size_t>(num_lines) *
-                  static_cast<size_t>(pixel_data_size);
-  //int last2bit = (buf_size & 3);
-  // buf_size must be multiple of four
-  //if(last2bit) buf_size += 4 - last2bit;
-  std::vector<unsigned char> buf(buf_size);
-
-  size_t start_y = static_cast<size_t>(line_no);
-  for (size_t c = 0; c < channels.size(); c++) {
-    if (channels[c].pixel_type == TINYEXR_PIXELTYPE_HALF) {
-      if (channels[c].requested_pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-        for (int y = 0; y < num_lines; y++) {
-          // Assume increasing Y
-          float *line_ptr = reinterpret_cast<float *>(&buf.at(
-            static_cast<size_t>(pixel_data_size * size_t(y) * size_t(width)) +
-            channel_offset_list[c] *
-            static_cast<size_t>(width)));
-          for (int x = 0; x < width; x++) {
-            tinyexr::FP16 h16;
-            h16.u = reinterpret_cast<const unsigned short * const *>(
-              images)[c][(y + start_y) * size_t(x_stride) + size_t(x)];
-
-            tinyexr::FP32 f32 = half_to_float(h16);
-
-            tinyexr::swap4(&f32.f);
-
-            // line_ptr[x] = f32.f;
-            tinyexr::cpy4(line_ptr + x, &(f32.f));
-          }
-        }
-      } else if (channels[c].requested_pixel_type == TINYEXR_PIXELTYPE_HALF) {
-        for (int y = 0; y < num_lines; y++) {
-          // Assume increasing Y
-          unsigned short *line_ptr = reinterpret_cast<unsigned short *>(
-            &buf.at(static_cast<size_t>(pixel_data_size * y *
-                                        width) +
-                    channel_offset_list[c] *
-                    static_cast<size_t>(width)));
-          for (int x = 0; x < width; x++) {
-            unsigned short val = reinterpret_cast<const unsigned short * const *>(
-              images)[c][(y + start_y) * x_stride + x];
-
-            tinyexr::swap2(&val);
-
-            // line_ptr[x] = val;
-            tinyexr::cpy2(line_ptr + x, &val);
-          }
-        }
-      } else {
-        if (err) {
-          (*err) += "Invalid requested_pixel_type.\n";
-        }
-        return false;
-      }
-
-    } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-      if (channels[c].requested_pixel_type == TINYEXR_PIXELTYPE_HALF) {
-        for (int y = 0; y < num_lines; y++) {
-          // Assume increasing Y
-          unsigned short *line_ptr = reinterpret_cast<unsigned short *>(
-            &buf.at(static_cast<size_t>(pixel_data_size * y *
-                                        width) +
-                    channel_offset_list[c] *
-                    static_cast<size_t>(width)));
-          for (int x = 0; x < width; x++) {
-            tinyexr::FP32 f32;
-            f32.f = reinterpret_cast<const float * const *>(
-              images)[c][(y + start_y) * x_stride + x];
-
-            tinyexr::FP16 h16;
-            h16 = float_to_half_full(f32);
-
-            tinyexr::swap2(reinterpret_cast<unsigned short *>(&h16.u));
-
-            // line_ptr[x] = h16.u;
-            tinyexr::cpy2(line_ptr + x, &(h16.u));
-          }
-        }
-      } else if (channels[c].requested_pixel_type == TINYEXR_PIXELTYPE_FLOAT) {
-        for (int y = 0; y < num_lines; y++) {
-          // Assume increasing Y
-          float *line_ptr = reinterpret_cast<float *>(&buf.at(
-            static_cast<size_t>(pixel_data_size * y * width) +
-            channel_offset_list[c] *
-            static_cast<size_t>(width)));
-          for (int x = 0; x < width; x++) {
-            float val = reinterpret_cast<const float * const *>(
-              images)[c][(y + start_y) * x_stride + x];
-
-            tinyexr::swap4(&val);
-
-            // line_ptr[x] = val;
-            tinyexr::cpy4(line_ptr + x, &val);
-          }
-        }
-      } else {
-        if (err) {
-          (*err) += "Invalid requested_pixel_type.\n";
-        }
-        return false;
-      }
-    } else if (channels[c].pixel_type == TINYEXR_PIXELTYPE_UINT) {
-      for (int y = 0; y < num_lines; y++) {
-        // Assume increasing Y
-        unsigned int *line_ptr = reinterpret_cast<unsigned int *>(&buf.at(
-          static_cast<size_t>(pixel_data_size * y * width) +
-          channel_offset_list[c] * static_cast<size_t>(width)));
-        for (int x = 0; x < width; x++) {
-          unsigned int val = reinterpret_cast<const unsigned int * const *>(
-            images)[c][(y + start_y) * x_stride + x];
-
-          tinyexr::swap4(&val);
-
-          // line_ptr[x] = val;
-          tinyexr::cpy4(line_ptr + x, &val);
-        }
-      }
-    }
-  }
-
-  if (compression_type == TINYEXR_COMPRESSIONTYPE_NONE) {
-    // 4 byte: scan line
-    // 4 byte: data size
-    // ~     : pixel data(uncompressed)
-    out_data.insert(out_data.end(), buf.begin(), buf.end());
-
-  } else if ((compression_type == TINYEXR_COMPRESSIONTYPE_ZIPS) ||
-    (compression_type == TINYEXR_COMPRESSIONTYPE_ZIP)) {
-#if defined(TINYEXR_USE_MINIZ) && (TINYEXR_USE_MINIZ==1)
-    std::vector<unsigned char> block(mz_compressBound(
-      static_cast<unsigned long>(buf.size())));
-#elif TINYEXR_USE_STB_ZLIB
-    // there is no compressBound() function, so we use a value that
-    // is grossly overestimated, but should always work
-    std::vector<unsigned char> block(256 + 2 * buf.size());
-#elif defined(TINYEXR_USE_NANOZLIB) && (TINYEXR_USE_NANOZLIB == 1)
-    std::vector<unsigned char> block(nanoz_compressBound(
-      static_cast<unsigned long>(buf.size())));
-#else
-    std::vector<unsigned char> block(
-      compressBound(static_cast<uLong>(buf.size())));
-#endif
-    tinyexr::tinyexr_uint64 outSize = block.size();
-
-    if (!tinyexr::CompressZip(&block.at(0), outSize,
-                         reinterpret_cast<const unsigned char *>(&buf.at(0)),
-                         static_cast<unsigned long>(buf.size()))) {
-      if (err) {
-        (*err) += "Zip compresssion failed.\n";
-      }
-      return false;
-    }
-
-    // 4 byte: scan line
-    // 4 byte: data size
-    // ~     : pixel data(compressed)
-    unsigned int data_len = static_cast<unsigned int>(outSize);  // truncate
-
-    out_data.insert(out_data.end(), block.begin(), block.begin() + data_len);
-
-  } else if (compression_type == TINYEXR_COMPRESSIONTYPE_RLE) {
-    // (buf.size() * 3) / 2 would be enough.
-    std::vector<unsigned char> block((buf.size() * 3) / 2);
-
-    tinyexr::tinyexr_uint64 outSize = block.size();
-
-    if (!tinyexr::CompressRle(&block.at(0), outSize,
-                         reinterpret_cast<const unsigned char *>(&buf.at(0)),
-                         static_cast<unsigned long>(buf.size()))) {
-      if (err) {
-        (*err) += "RLE compresssion failed.\n";
-      }
-      return false;
-    }
-
-    // 4 byte: scan line
-    // 4 byte: data size
-    // ~     : pixel data(compressed)
-    unsigned int data_len = static_cast<unsigned int>(outSize);  // truncate
-    out_data.insert(out_data.end(), block.begin(), block.begin() + data_len);
-
-  } else if (compression_type == TINYEXR_COMPRESSIONTYPE_PIZ) {
-#if TINYEXR_USE_PIZ
-    unsigned int bufLen =
-      8192 + static_cast<unsigned int>(
-        2 * static_cast<unsigned int>(
-          buf.size()));  // @fixme { compute good bound. }
-    std::vector<unsigned char> block(bufLen);
-    unsigned int outSize = static_cast<unsigned int>(block.size());
-
-    if (!CompressPiz(&block.at(0), &outSize,
-                reinterpret_cast<const unsigned char *>(&buf.at(0)),
-                buf.size(), channels, width, num_lines)) {
-      if (err) {
-        (*err) += "PIZ compresssion failed.\n";
-      }
-      return false;
-    }
-
-    // 4 byte: scan line
-    // 4 byte: data size
-    // ~     : pixel data(compressed)
-    unsigned int data_len = outSize;
-    out_data.insert(out_data.end(), block.begin(), block.begin() + data_len);
-
-#else
-    if (err) {
-      (*err) += "PIZ compression is disabled in this build.\n";
-    }
-    return false;
-#endif
-  } else if (compression_type == TINYEXR_COMPRESSIONTYPE_ZFP) {
-#if TINYEXR_USE_ZFP
-    const ZFPCompressionParam* zfp_compression_param = reinterpret_cast<const ZFPCompressionParam*>(compression_param);
-    std::vector<unsigned char> block;
-    unsigned int outSize;
-
-    tinyexr::CompressZfp(
-      &block, &outSize, reinterpret_cast<const float *>(&buf.at(0)),
-      width, num_lines, static_cast<int>(channels.size()), *zfp_compression_param);
-
-    // 4 byte: scan line
-    // 4 byte: data size
-    // ~     : pixel data(compressed)
-    unsigned int data_len = outSize;
-    out_data.insert(out_data.end(), block.begin(), block.begin() + data_len);
-
-#else
-    if (err) {
-      (*err) += "ZFP compression is disabled in this build.\n";
-    }
-    (void)compression_param;
-    return false;
-#endif
-  } else {
-    return false;
-  }
-
-  return true;
-}
-
-static int EncodeTiledLevel(const EXRImage* level_image, const EXRHeader* exr_header,
-                            const std::vector<tinyexr::ChannelInfo>& channels,
-                            std::vector<std::vector<unsigned char> >& data_list,
-                            size_t start_index, // for data_list
-                            int num_x_tiles, int num_y_tiles,
-                            const std::vector<size_t>& channel_offset_list,
-                            int pixel_data_size,
-                            const void* compression_param, // must be set if zfp compression is enabled
-                            std::string* err) {
-  int num_tiles = num_x_tiles * num_y_tiles;
-  if (num_tiles != level_image->num_tiles) {
-    if (err) {
-      (*err) += "Invalid number of tiles in argument.\n";
-    }
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  if ((exr_header->tile_size_x > level_image->width || exr_header->tile_size_y > level_image->height) &&
-      level_image->level_x == 0 && level_image->level_y == 0) {
-      if (err) {
-        (*err) += "Failed to encode tile data.\n";
-      }
-      return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-  std::atomic<bool> invalid_data(false);
-#else
-  bool invalid_data(false);
-#endif
-
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-  std::vector<std::thread> workers;
-  std::atomic<int> tile_count(0);
-
-  int num_threads = std::max(1, int(std::thread::hardware_concurrency()));
-  if (num_threads > int(num_tiles)) {
-    num_threads = int(num_tiles);
-  }
-
-  for (int t = 0; t < num_threads; t++) {
-    workers.emplace_back(std::thread([&]() {
-      int i = 0;
-      while ((i = tile_count++) < num_tiles) {
-
-#else
-  // Use signed int since some OpenMP compiler doesn't allow unsigned type for
-  // `parallel for`
-#if TINYEXR_USE_OPENMP
-#pragma omp parallel for
-#endif
-  for (int i = 0; i < num_tiles; i++) {
-
-#endif
-    size_t tile_idx = static_cast<size_t>(i);
-    size_t data_idx = tile_idx + start_index;
-
-    int x_tile = i % num_x_tiles;
-    int y_tile = i / num_x_tiles;
-
-    EXRTile& tile = level_image->tiles[tile_idx];
-
-    const unsigned char* const* images =
-      static_cast<const unsigned char* const*>(tile.images);
-
-    data_list[data_idx].resize(5*sizeof(int));
-    size_t data_header_size = data_list[data_idx].size();
-    bool ret = EncodePixelData(data_list[data_idx],
-                               images,
-                               exr_header->compression_type,
-                               0, // increasing y
-                               tile.width,
-                               exr_header->tile_size_y,
-                               exr_header->tile_size_x,
-                               0,
-                               tile.height,
-                               pixel_data_size,
-                               channels,
-                               channel_offset_list,
-                               err, compression_param);
-    if (!ret) {
-      invalid_data = true;
-      continue;
-    }
-    if (data_list[data_idx].size() <= data_header_size) {
-      invalid_data = true;
-      continue;
-    }
-
-    int data_len = static_cast<int>(data_list[data_idx].size() - data_header_size);
-    //tileX, tileY, levelX, levelY // pixel_data_size(int)
-    memcpy(&data_list[data_idx][0], &x_tile, sizeof(int));
-    memcpy(&data_list[data_idx][4], &y_tile, sizeof(int));
-    memcpy(&data_list[data_idx][8], &level_image->level_x, sizeof(int));
-    memcpy(&data_list[data_idx][12], &level_image->level_y, sizeof(int));
-    memcpy(&data_list[data_idx][16], &data_len, sizeof(int));
-
-    swap4(reinterpret_cast<int*>(&data_list[data_idx][0]));
-    swap4(reinterpret_cast<int*>(&data_list[data_idx][4]));
-    swap4(reinterpret_cast<int*>(&data_list[data_idx][8]));
-    swap4(reinterpret_cast<int*>(&data_list[data_idx][12]));
-    swap4(reinterpret_cast<int*>(&data_list[data_idx][16]));
-
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-  }
-}));
-    }
-
-    for (auto &t : workers) {
-      t.join();
-    }
-#else
-    }  // omp parallel
-#endif
-
-  if (invalid_data) {
-    if (err) {
-      (*err) += "Failed to encode tile data.\n";
-    }
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-  return TINYEXR_SUCCESS;
-}
-
-static int NumScanlines(int compression_type) {
-  int num_scanlines = 1;
-  if (compression_type == TINYEXR_COMPRESSIONTYPE_ZIP) {
-    num_scanlines = 16;
-  } else if (compression_type == TINYEXR_COMPRESSIONTYPE_PIZ) {
-    num_scanlines = 32;
-  } else if (compression_type == TINYEXR_COMPRESSIONTYPE_ZFP) {
-    num_scanlines = 16;
-  }
-  return num_scanlines;
-}
-
-static int EncodeChunk(const EXRImage* exr_image, const EXRHeader* exr_header,
-                       const std::vector<ChannelInfo>& channels,
-                       int num_blocks,
-                       tinyexr_uint64 chunk_offset, // starting offset of current chunk
-                       bool is_multipart,
-                       OffsetData& offset_data, // output block offsets, must be initialized
-                       std::vector<std::vector<unsigned char> >& data_list, // output
-                       tinyexr_uint64& total_size, // output: ending offset of current chunk
-                       std::string* err) {
-  int num_scanlines = NumScanlines(exr_header->compression_type);
-
-  data_list.resize(num_blocks);
-
-  std::vector<size_t> channel_offset_list(
-    static_cast<size_t>(exr_header->num_channels));
-
-  int pixel_data_size = 0;
-  {
-    size_t channel_offset = 0;
-    for (size_t c = 0; c < static_cast<size_t>(exr_header->num_channels); c++) {
-      channel_offset_list[c] = channel_offset;
-      if (channels[c].requested_pixel_type == TINYEXR_PIXELTYPE_HALF) {
-        pixel_data_size += sizeof(unsigned short);
-        channel_offset += sizeof(unsigned short);
-      } else if (channels[c].requested_pixel_type ==
-                 TINYEXR_PIXELTYPE_FLOAT) {
-        pixel_data_size += sizeof(float);
-        channel_offset += sizeof(float);
-      } else if (channels[c].requested_pixel_type == TINYEXR_PIXELTYPE_UINT) {
-        pixel_data_size += sizeof(unsigned int);
-        channel_offset += sizeof(unsigned int);
-      } else {
-        if (err) {
-          (*err) += "Invalid requested_pixel_type.\n";
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-    }
-  }
-
-  const void* compression_param = 0;
-#if TINYEXR_USE_ZFP
-  tinyexr::ZFPCompressionParam zfp_compression_param;
-
-  // Use ZFP compression parameter from custom attributes(if such a parameter
-  // exists)
-  {
-    std::string e;
-    bool ret = tinyexr::FindZFPCompressionParam(
-      &zfp_compression_param, exr_header->custom_attributes,
-      exr_header->num_custom_attributes, &e);
-
-    if (!ret) {
-      // Use predefined compression parameter.
-      zfp_compression_param.type = 0;
-      zfp_compression_param.rate = 2;
-    }
-    compression_param = &zfp_compression_param;
-  }
-#endif
-
-  tinyexr_uint64 offset = chunk_offset;
-  tinyexr_uint64 doffset = is_multipart ? 4u : 0u;
-
-  if (exr_image->tiles) {
-    const EXRImage* level_image = exr_image;
-    size_t block_idx = 0;
-    //tinyexr::tinyexr_uint64 block_data_size = 0;
-    int num_levels = (exr_header->tile_level_mode != TINYEXR_TILE_RIPMAP_LEVELS) ?
-      offset_data.num_x_levels : (offset_data.num_x_levels * offset_data.num_y_levels);
-    for (int level_index = 0; level_index < num_levels; ++level_index) {
-      if (!level_image) {
-        if (err) {
-          (*err) += "Invalid number of tiled levels for EncodeChunk\n";
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-      int level_index_from_image = LevelIndex(level_image->level_x, level_image->level_y,
-                                    exr_header->tile_level_mode, offset_data.num_x_levels);
-      if (level_index_from_image < 0) {
-        if (err) {
-          (*err) += "Invalid tile level mode\n";
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-      if (level_index_from_image != level_index) {
-        if (err) {
-          (*err) += "Incorrect level ordering in tiled image\n";
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-      int num_y_tiles = int(offset_data.offsets[level_index].size());
-      if (num_y_tiles <= 0) {
-        if (err) {
-          (*err) += "Invalid Y tile size\n";
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-      int num_x_tiles = int(offset_data.offsets[level_index][0].size());
-      if (num_x_tiles <= 0) {
-        if (err) {
-          (*err) += "Invalid X tile size\n";
-        }
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-      std::string e;
-      int ret = EncodeTiledLevel(level_image,
-                                  exr_header,
-                                  channels,
-                                  data_list,
-                                  block_idx,
-                                  num_x_tiles,
-                                  num_y_tiles,
-                                  channel_offset_list,
-                                  pixel_data_size,
-                                  compression_param,
-                                  &e);
-      if (ret != TINYEXR_SUCCESS) {
-        if (!e.empty() && err) {
-          (*err) += e;
-        }
-        return ret;
-      }
-
-      for (size_t j = 0; j < static_cast<size_t>(num_y_tiles); ++j)
-        for (size_t i = 0; i < static_cast<size_t>(num_x_tiles); ++i) {
-          offset_data.offsets[level_index][j][i] = offset;
-          swap8(reinterpret_cast<tinyexr_uint64*>(&offset_data.offsets[level_index][j][i]));
-          offset += data_list[block_idx].size() + doffset;
-          //block_data_size += data_list[block_idx].size();
-          ++block_idx;
-        }
-      level_image = level_image->next_level;
-    }
-    TINYEXR_CHECK_AND_RETURN_C(static_cast<int>(block_idx) == num_blocks, TINYEXR_ERROR_INVALID_DATA);
-    total_size = offset;
-  } else { // scanlines
-    std::vector<tinyexr::tinyexr_uint64>& offsets = offset_data.offsets[0][0];
-
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-    std::atomic<bool> invalid_data(false);
-    std::vector<std::thread> workers;
-    std::atomic<int> block_count(0);
-
-    int num_threads = std::min(std::max(1, int(std::thread::hardware_concurrency())), num_blocks);
-
-    for (int t = 0; t < num_threads; t++) {
-      workers.emplace_back(std::thread([&]() {
-        int i = 0;
-        while ((i = block_count++) < num_blocks) {
-
-#else
-    bool invalid_data(false);
-#if TINYEXR_USE_OPENMP
-#pragma omp parallel for
-#endif
-    for (int i = 0; i < num_blocks; i++) {
-
-#endif
-      int start_y = num_scanlines * i;
-      int end_Y = (std::min)(num_scanlines * (i + 1), exr_image->height);
-      int num_lines = end_Y - start_y;
-
-      const unsigned char* const* images =
-        static_cast<const unsigned char* const*>(exr_image->images);
-
-      data_list[i].resize(2*sizeof(int));
-      size_t data_header_size = data_list[i].size();
-
-      bool ret = EncodePixelData(data_list[i],
-                                 images,
-                                 exr_header->compression_type,
-                                 0, // increasing y
-                                 exr_image->width,
-                                 exr_image->height,
-                                 exr_image->width,
-                                 start_y,
-                                 num_lines,
-                                 pixel_data_size,
-                                 channels,
-                                 channel_offset_list,
-                                 err,
-                                 compression_param);
-      if (!ret) {
-        invalid_data = true;
-        continue; // "break" cannot be used with OpenMP
-      }
-      if (data_list[i].size() <= data_header_size) {
-        invalid_data = true;
-        continue; // "break" cannot be used with OpenMP
-      }
-      int data_len = static_cast<int>(data_list[i].size() - data_header_size);
-      memcpy(&data_list[i][0], &start_y, sizeof(int));
-      memcpy(&data_list[i][4], &data_len, sizeof(int));
-
-      swap4(reinterpret_cast<int*>(&data_list[i][0]));
-      swap4(reinterpret_cast<int*>(&data_list[i][4]));
-#if TINYEXR_HAS_CXX11 && (TINYEXR_USE_THREAD > 0)
-        }
-                                       }));
-    }
-
-    for (auto &t : workers) {
-      t.join();
-    }
-#else
-    }  // omp parallel
-#endif
-
-    if (invalid_data) {
-      if (err) {
-        (*err) += "Failed to encode scanline data.\n";
-      }
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-    for (size_t i = 0; i < static_cast<size_t>(num_blocks); i++) {
-      offsets[i] = offset;
-      tinyexr::swap8(reinterpret_cast<tinyexr::tinyexr_uint64 *>(&offsets[i]));
-      offset += data_list[i].size() + doffset;
-    }
-
-    total_size = static_cast<size_t>(offset);
-  }
-  return TINYEXR_SUCCESS;
-}
-
-// can save a single or multi-part image (no deep* formats)
-static size_t SaveEXRNPartImageToMemory(const EXRImage* exr_images,
-                                        const EXRHeader** exr_headers,
-                                        unsigned int num_parts,
-                                        unsigned char** memory_out, const char** err) {
-  if (exr_images == NULL || exr_headers == NULL || num_parts == 0 ||
-      memory_out == NULL) {
-    SetErrorMessage("Invalid argument for SaveEXRNPartImageToMemory",
-                    err);
-    return 0;
-  }
-  {
-    for (unsigned int i = 0; i < num_parts; ++i) {
-      if (exr_headers[i]->compression_type < 0) {
-        SetErrorMessage("Invalid argument for SaveEXRNPartImageToMemory",
-                        err);
-        return 0;
-      }
-#if !TINYEXR_USE_PIZ
-      if (exr_headers[i]->compression_type == TINYEXR_COMPRESSIONTYPE_PIZ) {
-        SetErrorMessage("PIZ compression is not supported in this build",
-                        err);
-        return 0;
-      }
-#endif
-      if (exr_headers[i]->compression_type == TINYEXR_COMPRESSIONTYPE_ZFP) {
-#if !TINYEXR_USE_ZFP
-        SetErrorMessage("ZFP compression is not supported in this build",
-                        err);
-        return 0;
-#else
-        // All channels must be fp32.
-        // No fp16 support in ZFP atm(as of 2023 June)
-        // https://github.com/LLNL/fpzip/issues/2
-        for (int c = 0; c < exr_headers[i]->num_channels; ++c) {
-          if (exr_headers[i]->requested_pixel_types[c] != TINYEXR_PIXELTYPE_FLOAT) {
-            SetErrorMessage("Pixel type must be FLOAT for ZFP compression",
-                            err);
-            return 0;
-          }
-        }
-#endif
-      }
-    }
-  }
-
-  std::vector<unsigned char> memory;
-
-  // Header
-  {
-    const char header[] = { 0x76, 0x2f, 0x31, 0x01 };
-    memory.insert(memory.end(), header, header + 4);
-  }
-
-  // Version
-  // using value from the first header
-  int long_name = exr_headers[0]->long_name;
-  {
-    char marker[] = { 2, 0, 0, 0 };
-    /* @todo
-    if (exr_header->non_image) {
-    marker[1] |= 0x8;
-    }
-    */
-    // tiled
-    if (num_parts == 1 && exr_images[0].tiles) {
-      marker[1] |= 0x2;
-    }
-    // long_name
-    if (long_name) {
-      marker[1] |= 0x4;
-    }
-    // multipart
-    if (num_parts > 1) {
-      marker[1] |= 0x10;
-    }
-    memory.insert(memory.end(), marker, marker + 4);
-  }
-
-  int total_chunk_count = 0;
-  std::vector<int> chunk_count(num_parts);
-  std::vector<OffsetData> offset_data(num_parts);
-  for (unsigned int i = 0; i < num_parts; ++i) {
-    if (!exr_images[i].tiles) {
-      int num_scanlines = NumScanlines(exr_headers[i]->compression_type);
-      chunk_count[i] =
-        (exr_images[i].height + num_scanlines - 1) / num_scanlines;
-      InitSingleResolutionOffsets(offset_data[i], chunk_count[i]);
-      total_chunk_count += chunk_count[i];
-    } else {
-      {
-        std::vector<int> num_x_tiles, num_y_tiles;
-        if (!PrecalculateTileInfo(num_x_tiles, num_y_tiles, exr_headers[i])) {
-          SetErrorMessage("Failed to precalculate Tile info",
-                          err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-        int ntiles = InitTileOffsets(offset_data[i], exr_headers[i], num_x_tiles, num_y_tiles);
-        if (ntiles > 0) {
-          chunk_count[i] = ntiles;
-        } else {
-          SetErrorMessage("Failed to compute Tile offsets",
-                          err);
-          return TINYEXR_ERROR_INVALID_DATA;
-          
-        }
-        total_chunk_count += chunk_count[i];
-      }
-    }
-  }
-  // Write attributes to memory buffer.
-  std::vector< std::vector<tinyexr::ChannelInfo> > channels(num_parts);
-  {
-    std::set<std::string> partnames;
-    for (unsigned int i = 0; i < num_parts; ++i) {
-      //channels
-      {
-        std::vector<unsigned char> data;
-
-        for (int c = 0; c < exr_headers[i]->num_channels; c++) {
-          tinyexr::ChannelInfo info;
-          info.p_linear = 0;
-          info.pixel_type = exr_headers[i]->pixel_types[c];
-          info.requested_pixel_type = exr_headers[i]->requested_pixel_types[c];
-          info.x_sampling = 1;
-          info.y_sampling = 1;
-          info.name = std::string(exr_headers[i]->channels[c].name);
-          channels[i].push_back(info);
-        }
-
-        tinyexr::WriteChannelInfo(data, channels[i]);
-
-        tinyexr::WriteAttributeToMemory(&memory, "channels", "chlist", &data.at(0),
-                                        static_cast<int>(data.size()));
-      }
-
-      {
-        int comp = exr_headers[i]->compression_type;
-        swap4(&comp);
-        WriteAttributeToMemory(
-          &memory, "compression", "compression",
-          reinterpret_cast<const unsigned char*>(&comp), 1);
-      }
-
-      {
-        int data[4] = { 0, 0, exr_images[i].width - 1, exr_images[i].height - 1 };
-        swap4(&data[0]);
-        swap4(&data[1]);
-        swap4(&data[2]);
-        swap4(&data[3]);
-        WriteAttributeToMemory(
-          &memory, "dataWindow", "box2i",
-          reinterpret_cast<const unsigned char*>(data), sizeof(int) * 4);
-
-        int data0[4] = { 0, 0, exr_images[0].width - 1, exr_images[0].height - 1 };
-        swap4(&data0[0]);
-        swap4(&data0[1]);
-        swap4(&data0[2]);
-        swap4(&data0[3]);
-        // Note: must be the same across parts (currently, using value from the first header)
-        WriteAttributeToMemory(
-          &memory, "displayWindow", "box2i",
-          reinterpret_cast<const unsigned char*>(data0), sizeof(int) * 4);
-      }
-
-      {
-        unsigned char line_order = 0;  // @fixme { read line_order from EXRHeader }
-        WriteAttributeToMemory(&memory, "lineOrder", "lineOrder",
-                               &line_order, 1);
-      }
-
-      {
-        // Note: must be the same across parts
-        float aspectRatio = 1.0f;
-        swap4(&aspectRatio);
-        WriteAttributeToMemory(
-          &memory, "pixelAspectRatio", "float",
-          reinterpret_cast<const unsigned char*>(&aspectRatio), sizeof(float));
-      }
-
-      {
-        float center[2] = { 0.0f, 0.0f };
-        swap4(&center[0]);
-        swap4(&center[1]);
-        WriteAttributeToMemory(
-          &memory, "screenWindowCenter", "v2f",
-          reinterpret_cast<const unsigned char*>(center), 2 * sizeof(float));
-      }
-
-      {
-        float w = 1.0f;
-        swap4(&w);
-        WriteAttributeToMemory(&memory, "screenWindowWidth", "float",
-                               reinterpret_cast<const unsigned char*>(&w),
-                               sizeof(float));
-      }
-
-      if (exr_images[i].tiles) {
-        unsigned char tile_mode = static_cast<unsigned char>(exr_headers[i]->tile_level_mode & 0x3);
-        if (exr_headers[i]->tile_rounding_mode) tile_mode |= (1u << 4u);
-        //unsigned char data[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        unsigned int datai[3] = { 0, 0, 0 };
-        unsigned char* data = reinterpret_cast<unsigned char*>(&datai[0]);
-        datai[0] = static_cast<unsigned int>(exr_headers[i]->tile_size_x);
-        datai[1] = static_cast<unsigned int>(exr_headers[i]->tile_size_y);
-        data[8] = tile_mode;
-        swap4(reinterpret_cast<unsigned int*>(&data[0]));
-        swap4(reinterpret_cast<unsigned int*>(&data[4]));
-        WriteAttributeToMemory(
-          &memory, "tiles", "tiledesc",
-          reinterpret_cast<const unsigned char*>(data), 9);
-      }
-
-      // must be present for multi-part files - according to spec.
-      if (num_parts > 1) {
-        // name
-        {
-          size_t len = 0;
-          if ((len = strlen(exr_headers[i]->name)) > 0) {
-#if TINYEXR_HAS_CXX11
-            partnames.emplace(exr_headers[i]->name);
-#else
-            partnames.insert(std::string(exr_headers[i]->name));
-#endif
-            if (partnames.size() != i + 1) {
-              SetErrorMessage("'name' attributes must be unique for a multi-part file", err);
-              return 0;
-            }
-            WriteAttributeToMemory(
-              &memory, "name", "string",
-              reinterpret_cast<const unsigned char*>(exr_headers[i]->name),
-              static_cast<int>(len));
-          } else {
-            SetErrorMessage("Invalid 'name' attribute for a multi-part file", err);
-            return 0;
-          }
-        }
-        // type
-        {
-          const char* type = "scanlineimage";
-          if (exr_images[i].tiles) type = "tiledimage";
-          WriteAttributeToMemory(
-            &memory, "type", "string",
-            reinterpret_cast<const unsigned char*>(type),
-            static_cast<int>(strlen(type)));
-        }
-        // chunkCount
-        {
-          WriteAttributeToMemory(
-            &memory, "chunkCount", "int",
-            reinterpret_cast<const unsigned char*>(&chunk_count[i]),
-            4);
-        }
-      }
-
-      // Custom attributes
-      if (exr_headers[i]->num_custom_attributes > 0) {
-        for (int j = 0; j < exr_headers[i]->num_custom_attributes; j++) {
-          tinyexr::WriteAttributeToMemory(
-            &memory, exr_headers[i]->custom_attributes[j].name,
-            exr_headers[i]->custom_attributes[j].type,
-            reinterpret_cast<const unsigned char*>(
-              exr_headers[i]->custom_attributes[j].value),
-            exr_headers[i]->custom_attributes[j].size);
-        }
-      }
-
-      {  // end of header
-        memory.push_back(0);
-      }
-    }
-  }
-  if (num_parts > 1) {
-    // end of header list
-    memory.push_back(0);
-  }
-
-  tinyexr_uint64 chunk_offset = memory.size() + size_t(total_chunk_count) * sizeof(tinyexr_uint64);
-
-  tinyexr_uint64 total_size = 0;
-  std::vector< std::vector< std::vector<unsigned char> > > data_lists(num_parts);
-  for (unsigned int i = 0; i < num_parts; ++i) {
-    std::string e;
-    int ret = EncodeChunk(&exr_images[i], exr_headers[i],
-                          channels[i],
-                          chunk_count[i],
-                          // starting offset of current chunk after part-number
-                          chunk_offset,
-                          num_parts > 1,
-                          offset_data[i], // output: block offsets, must be initialized
-                          data_lists[i], // output
-                          total_size, // output
-                          &e);
-    if (ret != TINYEXR_SUCCESS) {
-      if (!e.empty()) {
-        tinyexr::SetErrorMessage(e, err);
-      }
-      return 0;
-    }
-    chunk_offset = total_size;
-  }
-
-  // Allocating required memory
-  if (total_size == 0) { // something went wrong
-    tinyexr::SetErrorMessage("Output memory size is zero", err);
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-  (*memory_out) = static_cast<unsigned char*>(malloc(size_t(total_size)));
-
-  // Writing header
-  memcpy((*memory_out), &memory[0], memory.size());
-  unsigned char* memory_ptr = *memory_out + memory.size();
-  size_t sum = memory.size();
-
-  // Writing offset data for chunks
-  for (unsigned int i = 0; i < num_parts; ++i) {
-    if (exr_images[i].tiles) {
-      const EXRImage* level_image = &exr_images[i];
-      int num_levels = (exr_headers[i]->tile_level_mode != TINYEXR_TILE_RIPMAP_LEVELS) ?
-        offset_data[i].num_x_levels : (offset_data[i].num_x_levels * offset_data[i].num_y_levels);
-      for (int level_index = 0; level_index < num_levels; ++level_index) {
-        for (size_t j = 0; j < offset_data[i].offsets[level_index].size(); ++j) {
-          size_t num_bytes = sizeof(tinyexr_uint64) * offset_data[i].offsets[level_index][j].size();
-          sum += num_bytes;
-          if (sum > total_size) {
-            tinyexr::SetErrorMessage("Invalid offset bytes in Tiled Part image.", err);
-            return TINYEXR_ERROR_INVALID_DATA;
-          }
-
-          memcpy(memory_ptr,
-                 reinterpret_cast<unsigned char*>(&offset_data[i].offsets[level_index][j][0]),
-                 num_bytes);
-          memory_ptr += num_bytes;
-        }
-        level_image = level_image->next_level;
-      }
-    } else {
-      size_t num_bytes = sizeof(tinyexr::tinyexr_uint64) * static_cast<size_t>(chunk_count[i]);
-      sum += num_bytes;
-      if (sum > total_size) {
-        tinyexr::SetErrorMessage("Invalid offset bytes in Part image.", err);
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-      std::vector<tinyexr::tinyexr_uint64>& offsets = offset_data[i].offsets[0][0];
-      memcpy(memory_ptr, reinterpret_cast<unsigned char*>(&offsets[0]), num_bytes);
-      memory_ptr += num_bytes;
-    }
-  }
-
-  // Writing chunk data
-  for (unsigned int i = 0; i < num_parts; ++i) {
-    for (size_t j = 0; j < static_cast<size_t>(chunk_count[i]); ++j) {
-      if (num_parts > 1) {
-        sum += 4;
-        if (sum > total_size) {
-          tinyexr::SetErrorMessage("Buffer overrun in reading Part image chunk data.", err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-        unsigned int part_number = i;
-        swap4(&part_number);
-        memcpy(memory_ptr, &part_number, 4);
-        memory_ptr += 4;
-      }
-      sum += data_lists[i][j].size();
-      if (sum > total_size) {
-        tinyexr::SetErrorMessage("Buffer overrun in reading Part image chunk data.", err);
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-      memcpy(memory_ptr, &data_lists[i][j][0], data_lists[i][j].size());
-      memory_ptr += data_lists[i][j].size();
-    }
-  }
-
-  if (sum != total_size) {
-    tinyexr::SetErrorMessage("Corrupted Part image chunk data.", err);
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  return size_t(total_size);  // OK
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-} // tinyexr
-
-size_t SaveEXRImageToMemory(const EXRImage* exr_image,
-                             const EXRHeader* exr_header,
-                             unsigned char** memory_out, const char** err) {
-  return tinyexr::SaveEXRNPartImageToMemory(exr_image, &exr_header, 1, memory_out, err);
-}
-
-int SaveEXRImageToFile(const EXRImage *exr_image, const EXRHeader *exr_header,
-                       const char *filename, const char **err) {
-  if (exr_image == NULL || filename == NULL ||
-      exr_header->compression_type < 0) {
-    tinyexr::SetErrorMessage("Invalid argument for SaveEXRImageToFile", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-#if !TINYEXR_USE_PIZ
-  if (exr_header->compression_type == TINYEXR_COMPRESSIONTYPE_PIZ) {
-    tinyexr::SetErrorMessage("PIZ compression is not supported in this build",
-                             err);
-    return TINYEXR_ERROR_UNSUPPORTED_FEATURE;
-  }
-#endif
-
-#if !TINYEXR_USE_ZFP
-  if (exr_header->compression_type == TINYEXR_COMPRESSIONTYPE_ZFP) {
-    tinyexr::SetErrorMessage("ZFP compression is not supported in this build",
-                             err);
-    return TINYEXR_ERROR_UNSUPPORTED_FEATURE;
-  }
-#endif
-
-  FILE *fp = NULL;
-#ifdef _WIN32
-#if defined(_MSC_VER) || (defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API) // MSVC, MinGW GCC, or Clang
-  errno_t errcode =
-      _wfopen_s(&fp, tinyexr::UTF8ToWchar(filename).c_str(), L"wb");
-  if (errcode != 0) {
-    tinyexr::SetErrorMessage("Cannot write a file: " + std::string(filename),
-                             err);
-    return TINYEXR_ERROR_CANT_WRITE_FILE;
-  }
-#else
-  // Unknown compiler or MinGW without MINGW_HAS_SECURE_API.
-  fp = fopen(filename, "wb");
-#endif
-#else
-  fp = fopen(filename, "wb");
-#endif
-  if (!fp) {
-    tinyexr::SetErrorMessage("Cannot write a file: " + std::string(filename),
-                             err);
-    return TINYEXR_ERROR_CANT_WRITE_FILE;
-  }
-
-  unsigned char *mem = NULL;
-  size_t mem_size = SaveEXRImageToMemory(exr_image, exr_header, &mem, err);
-  if (mem_size == 0) {
-    fclose(fp);
-    return TINYEXR_ERROR_SERIALIZATION_FAILED;
-  }
-
-  size_t written_size = 0;
-  if ((mem_size > 0) && mem) {
-    written_size = fwrite(mem, 1, mem_size, fp);
-  }
-  free(mem);
-
-  fclose(fp);
-
-  if (written_size != mem_size) {
-    tinyexr::SetErrorMessage("Cannot write a file", err);
-    return TINYEXR_ERROR_CANT_WRITE_FILE;
-  }
-
-  return TINYEXR_SUCCESS;
-}
-
-size_t SaveEXRMultipartImageToMemory(const EXRImage* exr_images,
-                                     const EXRHeader** exr_headers,
-                                     unsigned int num_parts,
-                                     unsigned char** memory_out, const char** err) {
-  if (exr_images == NULL || exr_headers == NULL || num_parts < 2 ||
-      memory_out == NULL) {
-    tinyexr::SetErrorMessage("Invalid argument for SaveEXRNPartImageToMemory",
-                              err);
-    return 0;
-  }
-  return tinyexr::SaveEXRNPartImageToMemory(exr_images, exr_headers, num_parts, memory_out, err);
-}
-
-int SaveEXRMultipartImageToFile(const EXRImage* exr_images,
-                                const EXRHeader** exr_headers,
-                                unsigned int num_parts,
-                                const char* filename,
-                                const char** err) {
-  if (exr_images == NULL || exr_headers == NULL || num_parts < 2) {
-    tinyexr::SetErrorMessage("Invalid argument for SaveEXRMultipartImageToFile",
-                              err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  FILE *fp = NULL;
-#ifdef _WIN32
-#if defined(_MSC_VER) || (defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API) // MSVC, MinGW GCC, or Clang.
-  errno_t errcode =
-    _wfopen_s(&fp, tinyexr::UTF8ToWchar(filename).c_str(), L"wb");
-  if (errcode != 0) {
-    tinyexr::SetErrorMessage("Cannot write a file: " + std::string(filename),
-                             err);
-    return TINYEXR_ERROR_CANT_WRITE_FILE;
-  }
-#else
-  // Unknown compiler or MinGW without MINGW_HAS_SECURE_API.
-  fp = fopen(filename, "wb");
-#endif
-#else
-  fp = fopen(filename, "wb");
-#endif
-  if (!fp) {
-    tinyexr::SetErrorMessage("Cannot write a file: " + std::string(filename),
-                             err);
-    return TINYEXR_ERROR_CANT_WRITE_FILE;
-  }
-
-  unsigned char *mem = NULL;
-  size_t mem_size = SaveEXRMultipartImageToMemory(exr_images, exr_headers, num_parts, &mem, err);
-  if (mem_size == 0) {
-    fclose(fp);
-    return TINYEXR_ERROR_SERIALIZATION_FAILED;
-  }
-
-  size_t written_size = 0;
-  if ((mem_size > 0) && mem) {
-    written_size = fwrite(mem, 1, mem_size, fp);
-  }
-  free(mem);
-
-  fclose(fp);
-
-  if (written_size != mem_size) {
-    tinyexr::SetErrorMessage("Cannot write a file", err);
-    return TINYEXR_ERROR_CANT_WRITE_FILE;
-  }
-
-  return TINYEXR_SUCCESS;
-}
-
-int LoadDeepEXR(DeepImage *deep_image, const char *filename, const char **err) {
-  if (deep_image == NULL) {
-    tinyexr::SetErrorMessage("Invalid argument for LoadDeepEXR", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  MemoryMappedFile file(filename);
-  if (!file.valid()) {
-    tinyexr::SetErrorMessage("Cannot read file " + std::string(filename), err);
-    return TINYEXR_ERROR_CANT_OPEN_FILE;
-  }
-
-  if (file.size == 0) {
-    tinyexr::SetErrorMessage("File size is zero : " + std::string(filename),
-                             err);
-    return TINYEXR_ERROR_INVALID_FILE;
-  }
-
-  const char *head = reinterpret_cast<const char *>(file.data);
-  const char *marker = reinterpret_cast<const char *>(file.data);
-
-  // Header check.
-  {
-    const char header[] = {0x76, 0x2f, 0x31, 0x01};
-
-    if (memcmp(marker, header, 4) != 0) {
-      tinyexr::SetErrorMessage("Invalid magic number", err);
-      return TINYEXR_ERROR_INVALID_MAGIC_NUMBER;
-    }
-    marker += 4;
-  }
-
-  // Version, scanline.
-  {
-    // ver 2.0, scanline, deep bit on(0x800)
-    // must be [2, 0, 0, 0]
-    if (marker[0] != 2 || marker[1] != 8 || marker[2] != 0 || marker[3] != 0) {
-      tinyexr::SetErrorMessage("Unsupported version or scanline", err);
-      return TINYEXR_ERROR_UNSUPPORTED_FORMAT;
-    }
-
-    marker += 4;
-  }
-
-  int dx = -1;
-  int dy = -1;
-  int dw = -1;
-  int dh = -1;
-  int num_scanline_blocks = 1;  // 16 for ZIP compression.
-  int compression_type = -1;
-  int num_channels = -1;
-  std::vector<tinyexr::ChannelInfo> channels;
-
-  // Read attributes
-  size_t size = file.size - tinyexr::kEXRVersionSize;
-  for (;;) {
-    if (0 == size) {
-      return TINYEXR_ERROR_INVALID_DATA;
-    } else if (marker[0] == '\0') {
-      marker++;
-      size--;
-      break;
-    }
-
-    std::string attr_name;
-    std::string attr_type;
-    std::vector<unsigned char> data;
-    size_t marker_size;
-    if (!tinyexr::ReadAttribute(&attr_name, &attr_type, &data, &marker_size,
-                                marker, size)) {
-      std::stringstream ss;
-      ss << "Failed to parse attribute\n";
-      tinyexr::SetErrorMessage(ss.str(), err);
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-    marker += marker_size;
-    size -= marker_size;
-
-    if (attr_name.compare("compression") == 0) {
-      compression_type = data[0];
-      if (compression_type > TINYEXR_COMPRESSIONTYPE_PIZ) {
-        std::stringstream ss;
-        ss << "Unsupported compression type : " << compression_type;
-        tinyexr::SetErrorMessage(ss.str(), err);
-        return TINYEXR_ERROR_UNSUPPORTED_FORMAT;
-      }
-
-      if (compression_type == TINYEXR_COMPRESSIONTYPE_ZIP) {
-        num_scanline_blocks = 16;
-      }
-
-    } else if (attr_name.compare("channels") == 0) {
-      // name: zero-terminated string, from 1 to 255 bytes long
-      // pixel type: int, possible values are: UINT = 0 HALF = 1 FLOAT = 2
-      // pLinear: unsigned char, possible values are 0 and 1
-      // reserved: three chars, should be zero
-      // xSampling: int
-      // ySampling: int
-
-      if (!tinyexr::ReadChannelInfo(channels, data)) {
-        tinyexr::SetErrorMessage("Failed to parse channel info", err);
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-      num_channels = static_cast<int>(channels.size());
-
-      if (num_channels < 1) {
-        tinyexr::SetErrorMessage("Invalid channels format", err);
-        return TINYEXR_ERROR_INVALID_DATA;
-      }
-
-    } else if (attr_name.compare("dataWindow") == 0) {
-      memcpy(&dx, &data.at(0), sizeof(int));
-      memcpy(&dy, &data.at(4), sizeof(int));
-      memcpy(&dw, &data.at(8), sizeof(int));
-      memcpy(&dh, &data.at(12), sizeof(int));
-      tinyexr::swap4(&dx);
-      tinyexr::swap4(&dy);
-      tinyexr::swap4(&dw);
-      tinyexr::swap4(&dh);
-
-    } else if (attr_name.compare("displayWindow") == 0) {
-      int x;
-      int y;
-      int w;
-      int h;
-      memcpy(&x, &data.at(0), sizeof(int));
-      memcpy(&y, &data.at(4), sizeof(int));
-      memcpy(&w, &data.at(8), sizeof(int));
-      memcpy(&h, &data.at(12), sizeof(int));
-      tinyexr::swap4(&x);
-      tinyexr::swap4(&y);
-      tinyexr::swap4(&w);
-      tinyexr::swap4(&h);
-    }
-  }
-
-  TINYEXR_CHECK_AND_RETURN_C(dx >= 0, TINYEXR_ERROR_INVALID_DATA);
-  TINYEXR_CHECK_AND_RETURN_C(dy >= 0, TINYEXR_ERROR_INVALID_DATA);
-  TINYEXR_CHECK_AND_RETURN_C(dw >= 0, TINYEXR_ERROR_INVALID_DATA);
-  TINYEXR_CHECK_AND_RETURN_C(dh >= 0, TINYEXR_ERROR_INVALID_DATA);
-  TINYEXR_CHECK_AND_RETURN_C(num_channels >= 1, TINYEXR_ERROR_INVALID_DATA);
-
-  int data_width = dw - dx + 1;
-  int data_height = dh - dy + 1;
-
-  // Read offset tables.
-  int num_blocks = data_height / num_scanline_blocks;
-  if (num_blocks * num_scanline_blocks < data_height) {
-    num_blocks++;
-  }
-
-  std::vector<tinyexr::tinyexr_int64> offsets(static_cast<size_t>(num_blocks));
-
-  for (size_t y = 0; y < static_cast<size_t>(num_blocks); y++) {
-    tinyexr::tinyexr_int64 offset;
-    memcpy(&offset, marker, sizeof(tinyexr::tinyexr_int64));
-    tinyexr::swap8(reinterpret_cast<tinyexr::tinyexr_uint64 *>(&offset));
-    marker += sizeof(tinyexr::tinyexr_int64);  // = 8
-    offsets[y] = offset;
-  }
-
-#if TINYEXR_USE_PIZ
-  if ((compression_type == TINYEXR_COMPRESSIONTYPE_NONE) ||
-      (compression_type == TINYEXR_COMPRESSIONTYPE_RLE) ||
-      (compression_type == TINYEXR_COMPRESSIONTYPE_ZIPS) ||
-      (compression_type == TINYEXR_COMPRESSIONTYPE_ZIP) ||
-      (compression_type == TINYEXR_COMPRESSIONTYPE_PIZ)) {
-#else
-  if ((compression_type == TINYEXR_COMPRESSIONTYPE_NONE) ||
-      (compression_type == TINYEXR_COMPRESSIONTYPE_RLE) ||
-      (compression_type == TINYEXR_COMPRESSIONTYPE_ZIPS) ||
-      (compression_type == TINYEXR_COMPRESSIONTYPE_ZIP)) {
-#endif
-    // OK
-  } else {
-    tinyexr::SetErrorMessage("Unsupported compression format", err);
-    return TINYEXR_ERROR_UNSUPPORTED_FORMAT;
-  }
-
-  deep_image->image = static_cast<float ***>(
-      malloc(sizeof(float **) * static_cast<size_t>(num_channels)));
-  for (int c = 0; c < num_channels; c++) {
-    deep_image->image[c] = static_cast<float **>(
-        malloc(sizeof(float *) * static_cast<size_t>(data_height)));
-    for (int y = 0; y < data_height; y++) {
-    }
-  }
-
-  deep_image->offset_table = static_cast<int **>(
-      malloc(sizeof(int *) * static_cast<size_t>(data_height)));
-  for (int y = 0; y < data_height; y++) {
-    deep_image->offset_table[y] = static_cast<int *>(
-        malloc(sizeof(int) * static_cast<size_t>(data_width)));
-  }
-
-  for (size_t y = 0; y < static_cast<size_t>(num_blocks); y++) {
-    const unsigned char *data_ptr =
-        reinterpret_cast<const unsigned char *>(head + offsets[y]);
-
-    // int: y coordinate
-    // int64: packed size of pixel offset table
-    // int64: packed size of sample data
-    // int64: unpacked size of sample data
-    // compressed pixel offset table
-    // compressed sample data
-    int line_no;
-    tinyexr::tinyexr_int64 packedOffsetTableSize;
-    tinyexr::tinyexr_int64 packedSampleDataSize;
-    tinyexr::tinyexr_int64 unpackedSampleDataSize;
-    memcpy(&line_no, data_ptr, sizeof(int));
-    memcpy(&packedOffsetTableSize, data_ptr + 4,
-           sizeof(tinyexr::tinyexr_int64));
-    memcpy(&packedSampleDataSize, data_ptr + 12,
-           sizeof(tinyexr::tinyexr_int64));
-    memcpy(&unpackedSampleDataSize, data_ptr + 20,
-           sizeof(tinyexr::tinyexr_int64));
-
-    tinyexr::swap4(&line_no);
-    tinyexr::swap8(
-        reinterpret_cast<tinyexr::tinyexr_uint64 *>(&packedOffsetTableSize));
-    tinyexr::swap8(
-        reinterpret_cast<tinyexr::tinyexr_uint64 *>(&packedSampleDataSize));
-    tinyexr::swap8(
-        reinterpret_cast<tinyexr::tinyexr_uint64 *>(&unpackedSampleDataSize));
-
-    std::vector<int> pixelOffsetTable(static_cast<size_t>(data_width));
-
-    // decode pixel offset table.
-    {
-      unsigned long dstLen =
-          static_cast<unsigned long>(pixelOffsetTable.size() * sizeof(int));
-      if (!tinyexr::DecompressZip(
-              reinterpret_cast<unsigned char *>(&pixelOffsetTable.at(0)),
-              &dstLen, data_ptr + 28,
-              static_cast<unsigned long>(packedOffsetTableSize))) {
-        return false;
-      }
-
-      TINYEXR_CHECK_AND_RETURN_C(dstLen == pixelOffsetTable.size() * sizeof(int), TINYEXR_ERROR_INVALID_DATA);
-      for (size_t i = 0; i < static_cast<size_t>(data_width); i++) {
-        deep_image->offset_table[y][i] = pixelOffsetTable[i];
-      }
-    }
-
-    std::vector<unsigned char> sample_data(
-        static_cast<size_t>(unpackedSampleDataSize));
-
-    // decode sample data.
-    {
-      unsigned long dstLen = static_cast<unsigned long>(unpackedSampleDataSize);
-      if (dstLen) {
-        if (!tinyexr::DecompressZip(
-                reinterpret_cast<unsigned char *>(&sample_data.at(0)), &dstLen,
-                data_ptr + 28 + packedOffsetTableSize,
-                static_cast<unsigned long>(packedSampleDataSize))) {
-          return false;
-        }
-        TINYEXR_CHECK_AND_RETURN_C(dstLen == static_cast<unsigned long>(unpackedSampleDataSize), TINYEXR_ERROR_INVALID_DATA);
-      }
-    }
-
-    // decode sample
-    int sampleSize = -1;
-    std::vector<int> channel_offset_list(static_cast<size_t>(num_channels));
-    {
-      int channel_offset = 0;
-      for (size_t i = 0; i < static_cast<size_t>(num_channels); i++) {
-        channel_offset_list[i] = channel_offset;
-        if (channels[i].pixel_type == TINYEXR_PIXELTYPE_UINT) {  // UINT
-          channel_offset += 4;
-        } else if (channels[i].pixel_type == TINYEXR_PIXELTYPE_HALF) {  // half
-          channel_offset += 2;
-        } else if (channels[i].pixel_type ==
-                   TINYEXR_PIXELTYPE_FLOAT) {  // float
-          channel_offset += 4;
-        } else {
-          tinyexr::SetErrorMessage("Invalid pixel_type in chnnels.", err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-      }
-      sampleSize = channel_offset;
-    }
-    TINYEXR_CHECK_AND_RETURN_C(sampleSize >= 2, TINYEXR_ERROR_INVALID_DATA);
-
-    TINYEXR_CHECK_AND_RETURN_C(static_cast<size_t>(
-               pixelOffsetTable[static_cast<size_t>(data_width - 1)] *
-               sampleSize) == sample_data.size(), TINYEXR_ERROR_INVALID_DATA);
-    int samples_per_line = static_cast<int>(sample_data.size()) / sampleSize;
-
-    //
-    // Alloc memory
-    //
-
-    //
-    // pixel data is stored as image[channels][pixel_samples]
-    //
-    {
-      tinyexr::tinyexr_uint64 data_offset = 0;
-      for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-        deep_image->image[c][y] = static_cast<float *>(
-            malloc(sizeof(float) * static_cast<size_t>(samples_per_line)));
-
-        if (channels[c].pixel_type == 0) {  // UINT
-          for (size_t x = 0; x < static_cast<size_t>(samples_per_line); x++) {
-            unsigned int ui;
-            unsigned int *src_ptr = reinterpret_cast<unsigned int *>(
-                &sample_data.at(size_t(data_offset) + x * sizeof(int)));
-            tinyexr::cpy4(&ui, src_ptr);
-            deep_image->image[c][y][x] = static_cast<float>(ui);  // @fixme
-          }
-          data_offset +=
-              sizeof(unsigned int) * static_cast<size_t>(samples_per_line);
-        } else if (channels[c].pixel_type == 1) {  // half
-          for (size_t x = 0; x < static_cast<size_t>(samples_per_line); x++) {
-            tinyexr::FP16 f16;
-            const unsigned short *src_ptr = reinterpret_cast<unsigned short *>(
-                &sample_data.at(size_t(data_offset) + x * sizeof(short)));
-            tinyexr::cpy2(&(f16.u), src_ptr);
-            tinyexr::FP32 f32 = half_to_float(f16);
-            deep_image->image[c][y][x] = f32.f;
-          }
-          data_offset += sizeof(short) * static_cast<size_t>(samples_per_line);
-        } else {  // float
-          for (size_t x = 0; x < static_cast<size_t>(samples_per_line); x++) {
-            float f;
-            const float *src_ptr = reinterpret_cast<float *>(
-                &sample_data.at(size_t(data_offset) + x * sizeof(float)));
-            tinyexr::cpy4(&f, src_ptr);
-            deep_image->image[c][y][x] = f;
-          }
-          data_offset += sizeof(float) * static_cast<size_t>(samples_per_line);
-        }
-      }
-    }
-  }  // y
-
-  deep_image->width = data_width;
-  deep_image->height = data_height;
-
-  deep_image->channel_names = static_cast<const char **>(
-      malloc(sizeof(const char *) * static_cast<size_t>(num_channels)));
-  for (size_t c = 0; c < static_cast<size_t>(num_channels); c++) {
-#ifdef _WIN32
-    deep_image->channel_names[c] = _strdup(channels[c].name.c_str());
-#else
-    deep_image->channel_names[c] = strdup(channels[c].name.c_str());
-#endif
-  }
-  deep_image->num_channels = num_channels;
-
-  return TINYEXR_SUCCESS;
-}
-
-void InitEXRImage(EXRImage *exr_image) {
-  if (exr_image == NULL) {
-    return;
-  }
-
-  exr_image->width = 0;
-  exr_image->height = 0;
-  exr_image->num_channels = 0;
-
-  exr_image->images = NULL;
-  exr_image->tiles = NULL;
-  exr_image->next_level = NULL;
-  exr_image->level_x = 0;
-  exr_image->level_y = 0;
-
-  exr_image->num_tiles = 0;
-}
-
-void FreeEXRErrorMessage(const char *msg) {
-  if (msg) {
-    free(reinterpret_cast<void *>(const_cast<char *>(msg)));
-  }
-  return;
-}
-
-void InitEXRHeader(EXRHeader *exr_header) {
-  if (exr_header == NULL) {
-    return;
-  }
-
-  memset(exr_header, 0, sizeof(EXRHeader));
-}
-
-int FreeEXRHeader(EXRHeader *exr_header) {
-  if (exr_header == NULL) {
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (exr_header->channels) {
-    free(exr_header->channels);
-  }
-
-  if (exr_header->pixel_types) {
-    free(exr_header->pixel_types);
-  }
-
-  if (exr_header->requested_pixel_types) {
-    free(exr_header->requested_pixel_types);
-  }
-
-  for (int i = 0; i < exr_header->num_custom_attributes; i++) {
-    if (exr_header->custom_attributes[i].value) {
-      free(exr_header->custom_attributes[i].value);
-    }
-  }
-
-  if (exr_header->custom_attributes) {
-    free(exr_header->custom_attributes);
-  }
-
-  EXRSetNameAttr(exr_header, NULL);
-
-  return TINYEXR_SUCCESS;
-}
-
-void EXRSetNameAttr(EXRHeader* exr_header, const char* name) {
-  if (exr_header == NULL) {
-    return;
-  }
-  memset(exr_header->name, 0, 256);
-  if (name != NULL) {
-    size_t len = std::min(strlen(name), size_t(255));
-    if (len) {
-      memcpy(exr_header->name, name, len);
-    }
-  }
-}
-
-int EXRNumLevels(const EXRImage* exr_image) {
-  if (exr_image == NULL) return 0;
-  if(exr_image->images) return 1; // scanlines
-  int levels = 1;
-  const EXRImage* level_image = exr_image;
-  while((level_image = level_image->next_level)) ++levels;
-  return levels;
-}
-
-int FreeEXRImage(EXRImage *exr_image) {
-  if (exr_image == NULL) {
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (exr_image->next_level) {
-    FreeEXRImage(exr_image->next_level);
-    delete exr_image->next_level;
-  }
-
-  for (int i = 0; i < exr_image->num_channels; i++) {
-    if (exr_image->images && exr_image->images[i]) {
-      free(exr_image->images[i]);
-    }
-  }
-
-  if (exr_image->images) {
-    free(exr_image->images);
-  }
-
-  if (exr_image->tiles) {
-    for (int tid = 0; tid < exr_image->num_tiles; tid++) {
-      for (int i = 0; i < exr_image->num_channels; i++) {
-        if (exr_image->tiles[tid].images && exr_image->tiles[tid].images[i]) {
-          free(exr_image->tiles[tid].images[i]);
-        }
-      }
-      if (exr_image->tiles[tid].images) {
-        free(exr_image->tiles[tid].images);
-      }
-    }
-    free(exr_image->tiles);
-  }
-
-  return TINYEXR_SUCCESS;
-}
-
-int ParseEXRHeaderFromFile(EXRHeader *exr_header, const EXRVersion *exr_version,
-                           const char *filename, const char **err) {
-  if (exr_header == NULL || exr_version == NULL || filename == NULL) {
-    tinyexr::SetErrorMessage("Invalid argument for ParseEXRHeaderFromFile",
-                             err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  MemoryMappedFile file(filename);
-  if (!file.valid()) {
-    tinyexr::SetErrorMessage("Cannot read file " + std::string(filename), err);
-    return TINYEXR_ERROR_CANT_OPEN_FILE;
-  }
-
-  return ParseEXRHeaderFromMemory(exr_header, exr_version, file.data, file.size,
-                                  err);
-}
-
-int ParseEXRMultipartHeaderFromMemory(EXRHeader ***exr_headers,
-                                      int *num_headers,
-                                      const EXRVersion *exr_version,
-                                      const unsigned char *memory, size_t size,
-                                      const char **err) {
-  if (memory == NULL || exr_headers == NULL || num_headers == NULL ||
-      exr_version == NULL) {
-    // Invalid argument
-    tinyexr::SetErrorMessage(
-        "Invalid argument for ParseEXRMultipartHeaderFromMemory", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (size < tinyexr::kEXRVersionSize) {
-    tinyexr::SetErrorMessage("Data size too short", err);
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  const unsigned char *marker = memory + tinyexr::kEXRVersionSize;
-  size_t marker_size = size - tinyexr::kEXRVersionSize;
-
-  std::vector<tinyexr::HeaderInfo> infos;
-
-  for (;;) {
-    tinyexr::HeaderInfo info;
-    info.clear();
-
-    std::string err_str;
-    bool empty_header = false;
-    int ret = ParseEXRHeader(&info, &empty_header, exr_version, &err_str,
-                             marker, marker_size);
-
-    if (ret != TINYEXR_SUCCESS) {
-
-      // Free malloc-allocated memory here.
-      for (size_t i = 0; i < info.attributes.size(); i++) {
-        if (info.attributes[i].value) {
-          free(info.attributes[i].value);
-        }
-      }
-
-      tinyexr::SetErrorMessage(err_str, err);
-      return ret;
-    }
-
-    if (empty_header) {
-      marker += 1;  // skip '\0'
-      break;
-    }
-
-    // `chunkCount` must exist in the header.
-    if (info.chunk_count == 0) {
-
-      // Free malloc-allocated memory here.
-      for (size_t i = 0; i < info.attributes.size(); i++) {
-        if (info.attributes[i].value) {
-          free(info.attributes[i].value);
-        }
-      }
-
-      tinyexr::SetErrorMessage(
-          "`chunkCount' attribute is not found in the header.", err);
-      return TINYEXR_ERROR_INVALID_DATA;
-    }
-
-    infos.push_back(info);
-
-    // move to next header.
-    marker += info.header_len;
-    size -= info.header_len;
-  }
-
-  // allocate memory for EXRHeader and create array of EXRHeader pointers.
-  (*exr_headers) =
-      static_cast<EXRHeader **>(malloc(sizeof(EXRHeader *) * infos.size()));
-
-
-  int retcode = TINYEXR_SUCCESS;
-
-  for (size_t i = 0; i < infos.size(); i++) {
-    EXRHeader *exr_header = static_cast<EXRHeader *>(malloc(sizeof(EXRHeader)));
-    memset(exr_header, 0, sizeof(EXRHeader));
-
-    std::string warn;
-    std::string _err;
-    if (!ConvertHeader(exr_header, infos[i], &warn, &_err)) {
-
-      // Free malloc-allocated memory here.
-      for (size_t k = 0; k < infos[i].attributes.size(); k++) {
-        if (infos[i].attributes[k].value) {
-          free(infos[i].attributes[k].value);
-        }
-      }
-
-      if (!_err.empty()) {
-        tinyexr::SetErrorMessage(
-            _err, err);
-      }
-      // continue to converting headers
-      retcode = TINYEXR_ERROR_INVALID_HEADER;
-    }
-
-    exr_header->multipart = exr_version->multipart ? 1 : 0;
-
-    (*exr_headers)[i] = exr_header;
-  }
-
-  (*num_headers) = static_cast<int>(infos.size());
-
-  return retcode;
-}
-
-int ParseEXRMultipartHeaderFromFile(EXRHeader ***exr_headers, int *num_headers,
-                                    const EXRVersion *exr_version,
-                                    const char *filename, const char **err) {
-  if (exr_headers == NULL || num_headers == NULL || exr_version == NULL ||
-      filename == NULL) {
-    tinyexr::SetErrorMessage(
-        "Invalid argument for ParseEXRMultipartHeaderFromFile()", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  MemoryMappedFile file(filename);
-  if (!file.valid()) {
-    tinyexr::SetErrorMessage("Cannot read file " + std::string(filename), err);
-    return TINYEXR_ERROR_CANT_OPEN_FILE;
-  }
-
-  return ParseEXRMultipartHeaderFromMemory(
-      exr_headers, num_headers, exr_version, file.data, file.size, err);
-}
-
-int ParseEXRVersionFromMemory(EXRVersion *version, const unsigned char *memory,
-                              size_t size) {
-  if (version == NULL || memory == NULL) {
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  if (size < tinyexr::kEXRVersionSize) {
-    return TINYEXR_ERROR_INVALID_DATA;
-  }
-
-  const unsigned char *marker = memory;
-
-  // Header check.
-  {
-    const char header[] = {0x76, 0x2f, 0x31, 0x01};
-
-    if (memcmp(marker, header, 4) != 0) {
-      return TINYEXR_ERROR_INVALID_MAGIC_NUMBER;
-    }
-    marker += 4;
-  }
-
-  version->tiled = false;
-  version->long_name = false;
-  version->non_image = false;
-  version->multipart = false;
-
-  // Parse version header.
-  {
-    // must be 2
-    if (marker[0] != 2) {
-      return TINYEXR_ERROR_INVALID_EXR_VERSION;
-    }
-
-    if (version == NULL) {
-      return TINYEXR_SUCCESS;  // May OK
-    }
-
-    version->version = 2;
-
-    if (marker[1] & 0x2) {  // 9th bit
-      version->tiled = true;
-    }
-    if (marker[1] & 0x4) {  // 10th bit
-      version->long_name = true;
-    }
-    if (marker[1] & 0x8) {        // 11th bit
-      version->non_image = true;  // (deep image)
-    }
-    if (marker[1] & 0x10) {  // 12th bit
-      version->multipart = true;
-    }
-  }
-
-  return TINYEXR_SUCCESS;
-}
-
-int ParseEXRVersionFromFile(EXRVersion *version, const char *filename) {
-  if (filename == NULL) {
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  FILE *fp = NULL;
-#ifdef _WIN32
-#if defined(_MSC_VER) || (defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API) // MSVC, MinGW GCC, or Clang.
-  errno_t err = _wfopen_s(&fp, tinyexr::UTF8ToWchar(filename).c_str(), L"rb");
-  if (err != 0) {
-    // TODO(syoyo): return wfopen_s erro code
-    return TINYEXR_ERROR_CANT_OPEN_FILE;
-  }
-#else
-  // Unknown compiler or MinGW without MINGW_HAS_SECURE_API.
-  fp = fopen(filename, "rb");
-#endif
-#else
-  fp = fopen(filename, "rb");
-#endif
-  if (!fp) {
-    return TINYEXR_ERROR_CANT_OPEN_FILE;
-  }
-
-  // Try to read kEXRVersionSize bytes; if the file is shorter than
-  // kEXRVersionSize, this will produce an error. This avoids a call to
-  // fseek(fp, 0, SEEK_END), which is not required to be supported by C
-  // implementations.
-  unsigned char buf[tinyexr::kEXRVersionSize];
-  size_t ret = fread(&buf[0], 1, tinyexr::kEXRVersionSize, fp);
-  fclose(fp);
-
-  if (ret != tinyexr::kEXRVersionSize) {
-    return TINYEXR_ERROR_INVALID_FILE;
-  }
-
-  return ParseEXRVersionFromMemory(version, buf, tinyexr::kEXRVersionSize);
-}
-
-int LoadEXRMultipartImageFromMemory(EXRImage *exr_images,
-                                    const EXRHeader **exr_headers,
-                                    unsigned int num_parts,
-                                    const unsigned char *memory,
-                                    const size_t size, const char **err) {
-  if (exr_images == NULL || exr_headers == NULL || num_parts == 0 ||
-      memory == NULL || (size <= tinyexr::kEXRVersionSize)) {
-    tinyexr::SetErrorMessage(
-        "Invalid argument for LoadEXRMultipartImageFromMemory()", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  // compute total header size.
-  size_t total_header_size = 0;
-  for (unsigned int i = 0; i < num_parts; i++) {
-    if (exr_headers[i]->header_len == 0) {
-      tinyexr::SetErrorMessage("EXRHeader variable is not initialized.", err);
-      return TINYEXR_ERROR_INVALID_ARGUMENT;
-    }
-
-    total_header_size += exr_headers[i]->header_len;
-  }
-
-  const char *marker = reinterpret_cast<const char *>(
-      memory + total_header_size + 4 +
-      4);  // +8 for magic number and version header.
-
-  marker += 1;  // Skip empty header.
-
-  // NOTE 1:
-  //   In multipart image, There is 'part number' before chunk data.
-  //   4 byte : part number
-  //   4+     : chunk
-  //
-  // NOTE 2:
-  //   EXR spec says 'part number' is 'unsigned long' but actually this is
-  //   'unsigned int(4 bytes)' in OpenEXR implementation...
-  //   http://www.openexr.com/openexrfilelayout.pdf
-
-  // Load chunk offset table.
-  std::vector<tinyexr::OffsetData> chunk_offset_table_list;
-  chunk_offset_table_list.reserve(num_parts);
-  for (size_t i = 0; i < static_cast<size_t>(num_parts); i++) {
-    chunk_offset_table_list.resize(chunk_offset_table_list.size() + 1);
-    tinyexr::OffsetData& offset_data = chunk_offset_table_list.back();
-    if (!exr_headers[i]->tiled || exr_headers[i]->tile_level_mode == TINYEXR_TILE_ONE_LEVEL) {
-      tinyexr::InitSingleResolutionOffsets(offset_data, size_t(exr_headers[i]->chunk_count));
-      std::vector<tinyexr::tinyexr_uint64>& offset_table = offset_data.offsets[0][0];
-
-      for (size_t c = 0; c < offset_table.size(); c++) {
-        tinyexr::tinyexr_uint64 offset;
-        memcpy(&offset, marker, 8);
-        tinyexr::swap8(&offset);
-
-        if (offset >= size) {
-          tinyexr::SetErrorMessage("Invalid offset size in EXR header chunks.",
-                                   err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-
-        offset_table[c] = offset + 4;  // +4 to skip 'part number'
-        marker += 8;
-      }
-    } else {
-      {
-        std::vector<int> num_x_tiles, num_y_tiles;
-        if (!tinyexr::PrecalculateTileInfo(num_x_tiles, num_y_tiles, exr_headers[i])) {
-          tinyexr::SetErrorMessage("Invalid tile info.", err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-        int num_blocks = InitTileOffsets(offset_data, exr_headers[i], num_x_tiles, num_y_tiles);
-        if (num_blocks != exr_headers[i]->chunk_count) {
-          tinyexr::SetErrorMessage("Invalid offset table size.", err);
-          return TINYEXR_ERROR_INVALID_DATA;
-        }
-      }
-      for (unsigned int l = 0; l < offset_data.offsets.size(); ++l) {
-        for (unsigned int dy = 0; dy < offset_data.offsets[l].size(); ++dy) {
-          for (unsigned int dx = 0; dx < offset_data.offsets[l][dy].size(); ++dx) {
-            tinyexr::tinyexr_uint64 offset;
-            memcpy(&offset, marker, sizeof(tinyexr::tinyexr_uint64));
-            tinyexr::swap8(&offset);
-            if (offset >= size) {
-              tinyexr::SetErrorMessage("Invalid offset size in EXR header chunks.",
-                err);
-              return TINYEXR_ERROR_INVALID_DATA;
-            }
-            offset_data.offsets[l][dy][dx] = offset + 4; // +4 to skip 'part number'
-            marker += sizeof(tinyexr::tinyexr_uint64);  // = 8
-          }
-        }
-      }
-    }
-  }
-
-  // Decode image.
-  for (size_t i = 0; i < static_cast<size_t>(num_parts); i++) {
-    tinyexr::OffsetData &offset_data = chunk_offset_table_list[i];
-
-    // First check 'part number' is identical to 'i'
-    for (unsigned int l = 0; l < offset_data.offsets.size(); ++l)
-      for (unsigned int dy = 0; dy < offset_data.offsets[l].size(); ++dy)
-        for (unsigned int dx = 0; dx < offset_data.offsets[l][dy].size(); ++dx) {
-
-          const unsigned char *part_number_addr =
-              memory + offset_data.offsets[l][dy][dx] - 4;  // -4 to move to 'part number' field.
-          unsigned int part_no;
-          memcpy(&part_no, part_number_addr, sizeof(unsigned int));  // 4
-          tinyexr::swap4(&part_no);
-
-          if (part_no != i) {
-            tinyexr::SetErrorMessage("Invalid `part number' in EXR header chunks.",
-                                     err);
-            return TINYEXR_ERROR_INVALID_DATA;
-          }
-        }
-
-    std::string e;
-    int ret = tinyexr::DecodeChunk(&exr_images[i], exr_headers[i], offset_data,
-                                   memory, size, &e);
-    if (ret != TINYEXR_SUCCESS) {
-      if (!e.empty()) {
-        tinyexr::SetErrorMessage(e, err);
-      }
-      return ret;
-    }
-  }
-
-  return TINYEXR_SUCCESS;
-}
-
-int LoadEXRMultipartImageFromFile(EXRImage *exr_images,
-                                  const EXRHeader **exr_headers,
-                                  unsigned int num_parts, const char *filename,
-                                  const char **err) {
-  if (exr_images == NULL || exr_headers == NULL || num_parts == 0) {
-    tinyexr::SetErrorMessage(
-        "Invalid argument for LoadEXRMultipartImageFromFile", err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  MemoryMappedFile file(filename);
-  if (!file.valid()) {
-    tinyexr::SetErrorMessage("Cannot read file " + std::string(filename), err);
-    return TINYEXR_ERROR_CANT_OPEN_FILE;
-  }
-
-  return LoadEXRMultipartImageFromMemory(exr_images, exr_headers, num_parts,
-                                         file.data, file.size, err);
-}
-
-int SaveEXRToMemory(const float *data, int width, int height, int components,
-            const int save_as_fp16, const unsigned char **outbuf, const char **err) {
-
-  if ((components == 1) || components == 3 || components == 4) {
-    // OK
-  } else {
-    std::stringstream ss;
-    ss << "Unsupported component value : " << components << std::endl;
-
-    tinyexr::SetErrorMessage(ss.str(), err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  EXRHeader header;
-  InitEXRHeader(&header);
-
-  if ((width < 16) && (height < 16)) {
-    // No compression for small image.
-    header.compression_type = TINYEXR_COMPRESSIONTYPE_NONE;
-  } else {
-    header.compression_type = TINYEXR_COMPRESSIONTYPE_ZIP;
-  }
-
-  EXRImage image;
-  InitEXRImage(&image);
-
-  image.num_channels = components;
-
-  std::vector<float> images[4];
-
-  if (components == 1) {
-    images[0].resize(static_cast<size_t>(width * height));
-    memcpy(images[0].data(), data, sizeof(float) * size_t(width * height));
-  } else {
-    images[0].resize(static_cast<size_t>(width * height));
-    images[1].resize(static_cast<size_t>(width * height));
-    images[2].resize(static_cast<size_t>(width * height));
-    images[3].resize(static_cast<size_t>(width * height));
-
-    // Split RGB(A)RGB(A)RGB(A)... into R, G and B(and A) layers
-    for (size_t i = 0; i < static_cast<size_t>(width * height); i++) {
-      images[0][i] = data[static_cast<size_t>(components) * i + 0];
-      images[1][i] = data[static_cast<size_t>(components) * i + 1];
-      images[2][i] = data[static_cast<size_t>(components) * i + 2];
-      if (components == 4) {
-        images[3][i] = data[static_cast<size_t>(components) * i + 3];
-      }
-    }
-  }
-
-  float *image_ptr[4] = {0, 0, 0, 0};
-  if (components == 4) {
-    image_ptr[0] = &(images[3].at(0));  // A
-    image_ptr[1] = &(images[2].at(0));  // B
-    image_ptr[2] = &(images[1].at(0));  // G
-    image_ptr[3] = &(images[0].at(0));  // R
-  } else if (components == 3) {
-    image_ptr[0] = &(images[2].at(0));  // B
-    image_ptr[1] = &(images[1].at(0));  // G
-    image_ptr[2] = &(images[0].at(0));  // R
-  } else if (components == 1) {
-    image_ptr[0] = &(images[0].at(0));  // A
-  }
-
-  image.images = reinterpret_cast<unsigned char **>(image_ptr);
-  image.width = width;
-  image.height = height;
-
-  header.num_channels = components;
-  header.channels = static_cast<EXRChannelInfo *>(malloc(
-      sizeof(EXRChannelInfo) * static_cast<size_t>(header.num_channels)));
-  // Must be (A)BGR order, since most of EXR viewers expect this channel order.
-  if (components == 4) {
-#ifdef _MSC_VER
-    strncpy_s(header.channels[0].name, "A", 255);
-    strncpy_s(header.channels[1].name, "B", 255);
-    strncpy_s(header.channels[2].name, "G", 255);
-    strncpy_s(header.channels[3].name, "R", 255);
-#else
-    strncpy(header.channels[0].name, "A", 255);
-    strncpy(header.channels[1].name, "B", 255);
-    strncpy(header.channels[2].name, "G", 255);
-    strncpy(header.channels[3].name, "R", 255);
-#endif
-    header.channels[0].name[strlen("A")] = '\0';
-    header.channels[1].name[strlen("B")] = '\0';
-    header.channels[2].name[strlen("G")] = '\0';
-    header.channels[3].name[strlen("R")] = '\0';
-  } else if (components == 3) {
-#ifdef _MSC_VER
-    strncpy_s(header.channels[0].name, "B", 255);
-    strncpy_s(header.channels[1].name, "G", 255);
-    strncpy_s(header.channels[2].name, "R", 255);
-#else
-    strncpy(header.channels[0].name, "B", 255);
-    strncpy(header.channels[1].name, "G", 255);
-    strncpy(header.channels[2].name, "R", 255);
-#endif
-    header.channels[0].name[strlen("B")] = '\0';
-    header.channels[1].name[strlen("G")] = '\0';
-    header.channels[2].name[strlen("R")] = '\0';
-  } else {
-#ifdef _MSC_VER
-    strncpy_s(header.channels[0].name, "A", 255);
-#else
-    strncpy(header.channels[0].name, "A", 255);
-#endif
-    header.channels[0].name[strlen("A")] = '\0';
-  }
-
-  header.pixel_types = static_cast<int *>(
-      malloc(sizeof(int) * static_cast<size_t>(header.num_channels)));
-  header.requested_pixel_types = static_cast<int *>(
-      malloc(sizeof(int) * static_cast<size_t>(header.num_channels)));
-  for (int i = 0; i < header.num_channels; i++) {
-    header.pixel_types[i] =
-        TINYEXR_PIXELTYPE_FLOAT;  // pixel type of input image
-
-    if (save_as_fp16 > 0) {
-      header.requested_pixel_types[i] =
-          TINYEXR_PIXELTYPE_HALF;  // save with half(fp16) pixel format
-    } else {
-      header.requested_pixel_types[i] =
-          TINYEXR_PIXELTYPE_FLOAT;  // save with float(fp32) pixel format(i.e.
-                                    // no precision reduction)
-    }
-  }
-
-
-  unsigned char *mem_buf;
-  size_t mem_size = SaveEXRImageToMemory(&image, &header, &mem_buf, err);
-
-  if (mem_size == 0) {
-    return TINYEXR_ERROR_SERIALIZATION_FAILED;
-  }
-
-  free(header.channels);
-  free(header.pixel_types);
-  free(header.requested_pixel_types);
-
-  if (mem_size > size_t(std::numeric_limits<int>::max())) {
-    free(mem_buf);
-    return TINYEXR_ERROR_DATA_TOO_LARGE;
-  }
-
-  (*outbuf) = mem_buf;
-
-  return int(mem_size);
-}
-
-int SaveEXR(const float *data, int width, int height, int components,
-            const int save_as_fp16, const char *outfilename, const char **err) {
-  if ((components == 1) || components == 3 || components == 4) {
-    // OK
-  } else {
-    std::stringstream ss;
-    ss << "Unsupported component value : " << components << std::endl;
-
-    tinyexr::SetErrorMessage(ss.str(), err);
-    return TINYEXR_ERROR_INVALID_ARGUMENT;
-  }
-
-  EXRHeader header;
-  InitEXRHeader(&header);
-
-  if ((width < 16) && (height < 16)) {
-    // No compression for small image.
-    header.compression_type = TINYEXR_COMPRESSIONTYPE_NONE;
-  } else {
-    header.compression_type = TINYEXR_COMPRESSIONTYPE_ZIP;
-  }
-
-  EXRImage image;
-  InitEXRImage(&image);
-
-  image.num_channels = components;
-
-  std::vector<float> images[4];
-  const size_t pixel_count =
-      static_cast<size_t>(width) * static_cast<size_t>(height);
-
-  if (components == 1) {
-    images[0].resize(pixel_count);
-    memcpy(images[0].data(), data, sizeof(float) * pixel_count);
-  } else {
-    images[0].resize(pixel_count);
-    images[1].resize(pixel_count);
-    images[2].resize(pixel_count);
-    images[3].resize(pixel_count);
-
-    // Split RGB(A)RGB(A)RGB(A)... into R, G and B(and A) layers
-    for (size_t i = 0; i < pixel_count; i++) {
-      images[0][i] = data[static_cast<size_t>(components) * i + 0];
-      images[1][i] = data[static_cast<size_t>(components) * i + 1];
-      images[2][i] = data[static_cast<size_t>(components) * i + 2];
-      if (components == 4) {
-        images[3][i] = data[static_cast<size_t>(components) * i + 3];
-      }
-    }
-  }
-
-  float *image_ptr[4] = {0, 0, 0, 0};
-  if (components == 4) {
-    image_ptr[0] = &(images[3].at(0));  // A
-    image_ptr[1] = &(images[2].at(0));  // B
-    image_ptr[2] = &(images[1].at(0));  // G
-    image_ptr[3] = &(images[0].at(0));  // R
-  } else if (components == 3) {
-    image_ptr[0] = &(images[2].at(0));  // B
-    image_ptr[1] = &(images[1].at(0));  // G
-    image_ptr[2] = &(images[0].at(0));  // R
-  } else if (components == 1) {
-    image_ptr[0] = &(images[0].at(0));  // A
-  }
-
-  image.images = reinterpret_cast<unsigned char **>(image_ptr);
-  image.width = width;
-  image.height = height;
-
-  header.num_channels = components;
-  header.channels = static_cast<EXRChannelInfo *>(malloc(
-      sizeof(EXRChannelInfo) * static_cast<size_t>(header.num_channels)));
-  // Must be (A)BGR order, since most of EXR viewers expect this channel order.
-  if (components == 4) {
-#ifdef _MSC_VER
-    strncpy_s(header.channels[0].name, "A", 255);
-    strncpy_s(header.channels[1].name, "B", 255);
-    strncpy_s(header.channels[2].name, "G", 255);
-    strncpy_s(header.channels[3].name, "R", 255);
-#else
-    strncpy(header.channels[0].name, "A", 255);
-    strncpy(header.channels[1].name, "B", 255);
-    strncpy(header.channels[2].name, "G", 255);
-    strncpy(header.channels[3].name, "R", 255);
-#endif
-    header.channels[0].name[strlen("A")] = '\0';
-    header.channels[1].name[strlen("B")] = '\0';
-    header.channels[2].name[strlen("G")] = '\0';
-    header.channels[3].name[strlen("R")] = '\0';
-  } else if (components == 3) {
-#ifdef _MSC_VER
-    strncpy_s(header.channels[0].name, "B", 255);
-    strncpy_s(header.channels[1].name, "G", 255);
-    strncpy_s(header.channels[2].name, "R", 255);
-#else
-    strncpy(header.channels[0].name, "B", 255);
-    strncpy(header.channels[1].name, "G", 255);
-    strncpy(header.channels[2].name, "R", 255);
-#endif
-    header.channels[0].name[strlen("B")] = '\0';
-    header.channels[1].name[strlen("G")] = '\0';
-    header.channels[2].name[strlen("R")] = '\0';
-  } else {
-#ifdef _MSC_VER
-    strncpy_s(header.channels[0].name, "A", 255);
-#else
-    strncpy(header.channels[0].name, "A", 255);
-#endif
-    header.channels[0].name[strlen("A")] = '\0';
-  }
-
-  header.pixel_types = static_cast<int *>(
-      malloc(sizeof(int) * static_cast<size_t>(header.num_channels)));
-  header.requested_pixel_types = static_cast<int *>(
-      malloc(sizeof(int) * static_cast<size_t>(header.num_channels)));
-  for (int i = 0; i < header.num_channels; i++) {
-    header.pixel_types[i] =
-        TINYEXR_PIXELTYPE_FLOAT;  // pixel type of input image
-
-    if (save_as_fp16 > 0) {
-      header.requested_pixel_types[i] =
-          TINYEXR_PIXELTYPE_HALF;  // save with half(fp16) pixel format
-    } else {
-      header.requested_pixel_types[i] =
-          TINYEXR_PIXELTYPE_FLOAT;  // save with float(fp32) pixel format(i.e.
-                                    // no precision reduction)
-    }
-  }
-
-  int ret = SaveEXRImageToFile(&image, &header, outfilename, err);
-  if (ret != TINYEXR_SUCCESS) {
-    return ret;
-  }
-
-  free(header.channels);
-  free(header.pixel_types);
-  free(header.requested_pixel_types);
-
-  return ret;
-}
-
-#ifdef __clang__
-// zero-as-null-pointer-constant
-#pragma clang diagnostic pop
-#endif
-
-#endif  // TINYEXR_IMPLEMENTATION_DEFINED
-#endif  // TINYEXR_IMPLEMENTATION
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/external/wuffs-unsupported-snapshot.c b/contrib/tinyusdz/tinyusdz_repo/src/external/wuffs-unsupported-snapshot.c
deleted file mode 100644
index 3254b4dd3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/external/wuffs-unsupported-snapshot.c
+++ /dev/null
@@ -1,61452 +0,0 @@
-#ifndef WUFFS_INCLUDE_GUARD
-#define WUFFS_INCLUDE_GUARD
-
-// Wuffs ships as a "single file C library" or "header file library" as per
-// https://github.com/nothings/stb/blob/master/docs/stb_howto.txt
-//
-// To use that single file as a "foo.c"-like implementation, instead of a
-// "foo.h"-like header, #define WUFFS_IMPLEMENTATION before #include'ing or
-// compiling it.
-
-// Wuffs' C code is generated automatically, not hand-written. These warnings'
-// costs outweigh the benefits.
-//
-// The "elif defined(__clang__)" isn't redundant. While vanilla clang defines
-// __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#pragma GCC diagnostic ignored "-Wunreachable-code"
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#if defined(__cplusplus)
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#pragma clang diagnostic ignored "-Wunused-function"
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#if defined(__cplusplus)
-#pragma clang diagnostic ignored "-Wold-style-cast"
-#endif
-#endif
-
-// Copyright 2017 The Wuffs Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __cplusplus
-#if (__cplusplus >= 201103L) || defined(_MSC_VER)
-#include <memory>
-#define WUFFS_BASE__HAVE_EQ_DELETE
-#define WUFFS_BASE__HAVE_UNIQUE_PTR
-// The "defined(__clang__)" isn't redundant. While vanilla clang defines
-// __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
-#elif defined(__GNUC__) || defined(__clang__)
-#warning "Wuffs' C++ code expects -std=c++11 or later"
-#endif
-
-extern "C" {
-#endif
-
-// ---------------- Version
-
-// WUFFS_VERSION is the major.minor.patch version, as per https://semver.org/,
-// as a uint64_t. The major number is the high 32 bits. The minor number is the
-// middle 16 bits. The patch number is the low 16 bits. The pre-release label
-// and build metadata are part of the string representation (such as
-// "1.2.3-beta+456.20181231") but not the uint64_t representation.
-//
-// WUFFS_VERSION_PRE_RELEASE_LABEL (such as "", "beta" or "rc.1") being
-// non-empty denotes a developer preview, not a release version, and has no
-// backwards or forwards compatibility guarantees.
-//
-// WUFFS_VERSION_BUILD_METADATA_XXX, if non-zero, are the number of commits and
-// the last commit date in the repository used to build this library. Within
-// each major.minor branch, the commit count should increase monotonically.
-//
-// ¡ Some code generation programs can override WUFFS_VERSION.
-#define WUFFS_VERSION 0
-#define WUFFS_VERSION_MAJOR 0
-#define WUFFS_VERSION_MINOR 0
-#define WUFFS_VERSION_PATCH 0
-#define WUFFS_VERSION_PRE_RELEASE_LABEL "unsupported.snapshot"
-#define WUFFS_VERSION_BUILD_METADATA_COMMIT_COUNT 0
-#define WUFFS_VERSION_BUILD_METADATA_COMMIT_DATE 0
-#define WUFFS_VERSION_STRING "0.0.0+0.00000000"
-
-// ---------------- Configuration
-
-// Define WUFFS_CONFIG__AVOID_CPU_ARCH to avoid any code tied to a specific CPU
-// architecture, such as SSE SIMD for the x86 CPU family.
-#if defined(WUFFS_CONFIG__AVOID_CPU_ARCH)  // (#if-chain ref AVOID_CPU_ARCH_0)
-// No-op.
-#else  // (#if-chain ref AVOID_CPU_ARCH_0)
-
-// The "defined(__clang__)" isn't redundant. While vanilla clang defines
-// __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
-#if defined(__GNUC__) || defined(__clang__)
-#define WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET(arg) __attribute__((target(arg)))
-#else
-#define WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET(arg)
-#endif  // defined(__GNUC__) || defined(__clang__)
-
-#if defined(__GNUC__)  // (#if-chain ref AVOID_CPU_ARCH_1)
-
-// To simplify Wuffs code, "cpu_arch >= arm_xxx" requires xxx but also
-// unaligned little-endian load/stores.
-#if defined(__ARM_FEATURE_UNALIGNED) && !defined(__native_client__) && \
-    defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-// Not all gcc versions define __ARM_ACLE, even if they support crc32
-// intrinsics. Look for __ARM_FEATURE_CRC32 instead.
-#if defined(__ARM_FEATURE_CRC32)
-#include <arm_acle.h>
-#define WUFFS_BASE__CPU_ARCH__ARM_CRC32
-#endif  // defined(__ARM_FEATURE_CRC32)
-#if defined(__ARM_NEON)
-#include <arm_neon.h>
-#define WUFFS_BASE__CPU_ARCH__ARM_NEON
-#endif  // defined(__ARM_NEON)
-#endif  // defined(__ARM_FEATURE_UNALIGNED) etc
-
-// Similarly, "cpu_arch >= x86_sse42" requires SSE4.2 but also PCLMUL and
-// POPCNT. This is checked at runtime via cpuid, not at compile time.
-//
-// Likewise, "cpu_arch >= x86_avx2" also requires PCLMUL, POPCNT and SSE4.2.
-#if defined(__i386__) || defined(__x86_64__)
-#if !defined(__native_client__)
-#include <cpuid.h>
-#include <x86intrin.h>
-// X86_FAMILY means X86 (32-bit) or X86_64 (64-bit, obviously).
-#define WUFFS_BASE__CPU_ARCH__X86_FAMILY
-#if defined(__x86_64__)
-#define WUFFS_BASE__CPU_ARCH__X86_64
-#endif  // defined(__x86_64__)
-#endif  // !defined(__native_client__)
-#endif  // defined(__i386__) || defined(__x86_64__)
-
-#elif defined(_MSC_VER)  // (#if-chain ref AVOID_CPU_ARCH_1)
-
-#if defined(_M_IX86) || defined(_M_X64)
-#if defined(__AVX__) || defined(__clang__)
-
-// We need <intrin.h> for the __cpuid function.
-#include <intrin.h>
-// That's not enough for X64 SIMD, with clang-cl, if we want to use
-// "__attribute__((target(arg)))" without e.g. "/arch:AVX".
-//
-// Some web pages suggest that <immintrin.h> is all you need, as it pulls in
-// the earlier SIMD families like SSE4.2, but that doesn't seem to work in
-// practice, possibly for the same reason that just <intrin.h> doesn't work.
-#include <immintrin.h>  // AVX, AVX2, FMA, POPCNT
-#include <nmmintrin.h>  // SSE4.2
-#include <wmmintrin.h>  // AES, PCLMUL
-// X86_FAMILY means X86 (32-bit) or X86_64 (64-bit, obviously).
-#define WUFFS_BASE__CPU_ARCH__X86_FAMILY
-#if defined(_M_X64)
-#define WUFFS_BASE__CPU_ARCH__X86_64
-#endif  // defined(_M_X64)
-
-#else  // defined(__AVX__) || defined(__clang__)
-
-// clang-cl (which defines both __clang__ and _MSC_VER) supports
-// "__attribute__((target(arg)))".
-//
-// For MSVC's cl.exe (unlike clang or gcc), SIMD capability is a compile-time
-// property of the source file (e.g. a /arch:AVX or -mavx compiler flag), not
-// of individual functions (that can be conditionally selected at runtime).
-#pragma message("Wuffs with MSVC+IX86/X64 needs /arch:AVX for best performance")
-
-#endif  // defined(__AVX__) || defined(__clang__)
-#endif  // defined(_M_IX86) || defined(_M_X64)
-
-#endif  // (#if-chain ref AVOID_CPU_ARCH_1)
-#endif  // (#if-chain ref AVOID_CPU_ARCH_0)
-
-// --------
-
-// Define WUFFS_CONFIG__STATIC_FUNCTIONS (combined with WUFFS_IMPLEMENTATION)
-// to make all of Wuffs' functions have static storage.
-//
-// This can help the compiler ignore or discard unused code, which can produce
-// faster compiles and smaller binaries. Other motivations are discussed in the
-// "ALLOW STATIC IMPLEMENTATION" section of
-// https://raw.githubusercontent.com/nothings/stb/master/docs/stb_howto.txt
-#if defined(WUFFS_CONFIG__STATIC_FUNCTIONS)
-#define WUFFS_BASE__MAYBE_STATIC static
-#else
-#define WUFFS_BASE__MAYBE_STATIC
-#endif  // defined(WUFFS_CONFIG__STATIC_FUNCTIONS)
-
-// ---------------- CPU Architecture
-
-static inline bool  //
-wuffs_base__cpu_arch__have_arm_crc32() {
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)
-  return true;
-#else
-  return false;
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)
-}
-
-static inline bool  //
-wuffs_base__cpu_arch__have_arm_neon() {
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-  return true;
-#else
-  return false;
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-}
-
-static inline bool  //
-wuffs_base__cpu_arch__have_x86_avx2() {
-#if defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__) && \
-    defined(__AVX2__)
-  return true;
-#else
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-  // GCC defines these macros but MSVC does not.
-  //  - bit_AVX2 = (1 <<  5)
-  const unsigned int avx2_ebx7 = 0x00000020;
-  // GCC defines these macros but MSVC does not.
-  //  - bit_PCLMUL = (1 <<  1)
-  //  - bit_POPCNT = (1 << 23)
-  //  - bit_SSE4_2 = (1 << 20)
-  const unsigned int avx2_ecx1 = 0x00900002;
-
-  // clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).
-#if defined(__GNUC__)
-  unsigned int eax7 = 0;
-  unsigned int ebx7 = 0;
-  unsigned int ecx7 = 0;
-  unsigned int edx7 = 0;
-  if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7) &&
-      ((ebx7 & avx2_ebx7) == avx2_ebx7)) {
-    unsigned int eax1 = 0;
-    unsigned int ebx1 = 0;
-    unsigned int ecx1 = 0;
-    unsigned int edx1 = 0;
-    if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1) &&
-        ((ecx1 & avx2_ecx1) == avx2_ecx1)) {
-      return true;
-    }
-  }
-#elif defined(_MSC_VER)  // defined(__GNUC__)
-  int x7[4];
-  __cpuidex(x7, 7, 0);
-  if ((((unsigned int)(x7[1])) & avx2_ebx7) == avx2_ebx7) {
-    int x1[4];
-    __cpuid(x1, 1);
-    if ((((unsigned int)(x1[2])) & avx2_ecx1) == avx2_ecx1) {
-      return true;
-    }
-  }
-#else
-#error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler"
-#endif  // defined(__GNUC__); defined(_MSC_VER)
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_64)
-  return false;
-#endif  // defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__) &&
-        // defined(__AVX2__)
-}
-
-static inline bool  //
-wuffs_base__cpu_arch__have_x86_bmi2() {
-#if defined(__BMI2__)
-  return true;
-#else
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-  // GCC defines these macros but MSVC does not.
-  //  - bit_BMI2 = (1 <<  8)
-  const unsigned int bmi2_ebx7 = 0x00000100;
-
-  // clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).
-#if defined(__GNUC__)
-  unsigned int eax7 = 0;
-  unsigned int ebx7 = 0;
-  unsigned int ecx7 = 0;
-  unsigned int edx7 = 0;
-  if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7) &&
-      ((ebx7 & bmi2_ebx7) == bmi2_ebx7)) {
-    return true;
-  }
-#elif defined(_MSC_VER)  // defined(__GNUC__)
-  int x7[4];
-  __cpuidex(x7, 7, 0);
-  if ((((unsigned int)(x7[1])) & bmi2_ebx7) == bmi2_ebx7) {
-    return true;
-  }
-#else
-#error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler"
-#endif  // defined(__GNUC__); defined(_MSC_VER)
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-  return false;
-#endif  // defined(__BMI2__)
-}
-
-static inline bool  //
-wuffs_base__cpu_arch__have_x86_sse42() {
-#if defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__)
-  return true;
-#else
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-  // GCC defines these macros but MSVC does not.
-  //  - bit_PCLMUL = (1 <<  1)
-  //  - bit_POPCNT = (1 << 23)
-  //  - bit_SSE4_2 = (1 << 20)
-  const unsigned int sse42_ecx1 = 0x00900002;
-
-  // clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).
-#if defined(__GNUC__)
-  unsigned int eax1 = 0;
-  unsigned int ebx1 = 0;
-  unsigned int ecx1 = 0;
-  unsigned int edx1 = 0;
-  if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1) &&
-      ((ecx1 & sse42_ecx1) == sse42_ecx1)) {
-    return true;
-  }
-#elif defined(_MSC_VER)  // defined(__GNUC__)
-  int x1[4];
-  __cpuid(x1, 1);
-  if ((((unsigned int)(x1[2])) & sse42_ecx1) == sse42_ecx1) {
-    return true;
-  }
-#else
-#error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler"
-#endif  // defined(__GNUC__); defined(_MSC_VER)
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-  return false;
-#endif  // defined(__PCLMUL__) && defined(__POPCNT__) && defined(__SSE4_2__)
-}
-
-// ---------------- Fundamentals
-
-// Wuffs assumes that:
-//  - converting a uint32_t to a size_t will never overflow.
-//  - converting a size_t to a uint64_t will never overflow.
-#if defined(__WORDSIZE)
-#if (__WORDSIZE != 32) && (__WORDSIZE != 64)
-#error "Wuffs requires a word size of either 32 or 64 bits"
-#endif
-#endif
-
-// The "defined(__clang__)" isn't redundant. While vanilla clang defines
-// __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
-#if defined(__GNUC__) || defined(__clang__)
-#define WUFFS_BASE__POTENTIALLY_UNUSED __attribute__((unused))
-#define WUFFS_BASE__WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-#else
-#define WUFFS_BASE__POTENTIALLY_UNUSED
-#define WUFFS_BASE__WARN_UNUSED_RESULT
-#endif
-
-// Clang's "-fsanitize=integer" checks for "unsigned-integer-overflow" even
-// though, for *unsigned* integers, it is *not* undefined behavior. The check
-// is still made because unsigned integer overflow "is often unintentional".
-// https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html
-//
-// However, for Wuffs' generated C code, unsigned overflow is intentional. The
-// programmer has to use "~mod+" instead of a plain "+" operator in Wuffs code.
-// Further runtime checks for unsigned integer overflow can add performance
-// overhead (fuzzers can then time out) and can raise false negatives, without
-// generating much benefits. We disable the "unsigned-integer-overflow" check.
-#if defined(__has_feature)
-#if __has_feature(undefined_behavior_sanitizer)
-#define WUFFS_BASE__GENERATED_C_CODE \
-  __attribute__((no_sanitize("unsigned-integer-overflow")))
-#endif
-#endif
-#if !defined(WUFFS_BASE__GENERATED_C_CODE)
-#define WUFFS_BASE__GENERATED_C_CODE
-#endif
-
-// --------
-
-// Options (bitwise or'ed together) for wuffs_foo__bar__initialize functions.
-
-#define WUFFS_INITIALIZE__DEFAULT_OPTIONS ((uint32_t)0x00000000)
-
-// WUFFS_INITIALIZE__ALREADY_ZEROED means that the "self" receiver struct value
-// has already been set to all zeroes.
-#define WUFFS_INITIALIZE__ALREADY_ZEROED ((uint32_t)0x00000001)
-
-// WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED means that, absent
-// WUFFS_INITIALIZE__ALREADY_ZEROED, only some of the "self" receiver struct
-// value will be set to all zeroes. Internal buffers, which tend to be a large
-// proportion of the struct's size, will be left uninitialized. Internal means
-// that the buffer is contained by the receiver struct, as opposed to being
-// passed as a separately allocated "work buffer".
-//
-// For more detail, see:
-// https://github.com/google/wuffs/blob/main/doc/note/initialization.md
-#define WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED \
-  ((uint32_t)0x00000002)
-
-// --------
-
-// wuffs_base__empty_struct is used when a Wuffs function returns an empty
-// struct. In C, if a function f returns void, you can't say "x = f()", but in
-// Wuffs, if a function g returns empty, you can say "y = g()".
-typedef struct wuffs_base__empty_struct__struct {
-  // private_impl is a placeholder field. It isn't explicitly used, except that
-  // without it, the sizeof a struct with no fields can differ across C/C++
-  // compilers, and it is undefined behavior in C99. For example, gcc says that
-  // the sizeof an empty struct is 0, and g++ says that it is 1. This leads to
-  // ABI incompatibility if a Wuffs .c file is processed by one compiler and
-  // its .h file with another compiler.
-  //
-  // Instead, we explicitly insert an otherwise unused field, so that the
-  // sizeof this struct is always 1.
-  uint8_t private_impl;
-} wuffs_base__empty_struct;
-
-static inline wuffs_base__empty_struct  //
-wuffs_base__make_empty_struct() {
-  wuffs_base__empty_struct ret;
-  ret.private_impl = 0;
-  return ret;
-}
-
-// wuffs_base__utility is a placeholder receiver type. It enables what Java
-// calls static methods, as opposed to regular methods.
-typedef struct wuffs_base__utility__struct {
-  // private_impl is a placeholder field. It isn't explicitly used, except that
-  // without it, the sizeof a struct with no fields can differ across C/C++
-  // compilers, and it is undefined behavior in C99. For example, gcc says that
-  // the sizeof an empty struct is 0, and g++ says that it is 1. This leads to
-  // ABI incompatibility if a Wuffs .c file is processed by one compiler and
-  // its .h file with another compiler.
-  //
-  // Instead, we explicitly insert an otherwise unused field, so that the
-  // sizeof this struct is always 1.
-  uint8_t private_impl;
-} wuffs_base__utility;
-
-typedef struct wuffs_base__vtable__struct {
-  const char* vtable_name;
-  const void* function_pointers;
-} wuffs_base__vtable;
-
-// --------
-
-// See https://github.com/google/wuffs/blob/main/doc/note/statuses.md
-typedef struct wuffs_base__status__struct {
-  const char* repr;
-
-#ifdef __cplusplus
-  inline bool is_complete() const;
-  inline bool is_error() const;
-  inline bool is_note() const;
-  inline bool is_ok() const;
-  inline bool is_suspension() const;
-  inline bool is_truncated_input_error() const;
-  inline const char* message() const;
-#endif  // __cplusplus
-
-} wuffs_base__status;
-
-extern const char wuffs_base__note__i_o_redirect[];
-extern const char wuffs_base__note__end_of_data[];
-extern const char wuffs_base__note__metadata_reported[];
-extern const char wuffs_base__suspension__even_more_information[];
-extern const char wuffs_base__suspension__mispositioned_read[];
-extern const char wuffs_base__suspension__mispositioned_write[];
-extern const char wuffs_base__suspension__short_read[];
-extern const char wuffs_base__suspension__short_write[];
-extern const char wuffs_base__error__bad_i_o_position[];
-extern const char wuffs_base__error__bad_argument_length_too_short[];
-extern const char wuffs_base__error__bad_argument[];
-extern const char wuffs_base__error__bad_call_sequence[];
-extern const char wuffs_base__error__bad_data[];
-extern const char wuffs_base__error__bad_receiver[];
-extern const char wuffs_base__error__bad_restart[];
-extern const char wuffs_base__error__bad_sizeof_receiver[];
-extern const char wuffs_base__error__bad_vtable[];
-extern const char wuffs_base__error__bad_workbuf_length[];
-extern const char wuffs_base__error__bad_wuffs_version[];
-extern const char wuffs_base__error__cannot_return_a_suspension[];
-extern const char wuffs_base__error__disabled_by_previous_error[];
-extern const char wuffs_base__error__initialize_falsely_claimed_already_zeroed[];
-extern const char wuffs_base__error__initialize_not_called[];
-extern const char wuffs_base__error__interleaved_coroutine_calls[];
-extern const char wuffs_base__error__no_more_information[];
-extern const char wuffs_base__error__not_enough_data[];
-extern const char wuffs_base__error__out_of_bounds[];
-extern const char wuffs_base__error__unsupported_image_dimension[];
-extern const char wuffs_base__error__unsupported_method[];
-extern const char wuffs_base__error__unsupported_option[];
-extern const char wuffs_base__error__unsupported_pixel_swizzler_option[];
-extern const char wuffs_base__error__too_much_data[];
-
-static inline wuffs_base__status  //
-wuffs_base__make_status(const char* repr) {
-  wuffs_base__status z;
-  z.repr = repr;
-  return z;
-}
-
-static inline bool  //
-wuffs_base__status__is_complete(const wuffs_base__status* z) {
-  return (z->repr == NULL) || ((*z->repr != '$') && (*z->repr != '#'));
-}
-
-static inline bool  //
-wuffs_base__status__is_error(const wuffs_base__status* z) {
-  return z->repr && (*z->repr == '#');
-}
-
-static inline bool  //
-wuffs_base__status__is_note(const wuffs_base__status* z) {
-  return z->repr && (*z->repr != '$') && (*z->repr != '#');
-}
-
-static inline bool  //
-wuffs_base__status__is_ok(const wuffs_base__status* z) {
-  return z->repr == NULL;
-}
-
-static inline bool  //
-wuffs_base__status__is_suspension(const wuffs_base__status* z) {
-  return z->repr && (*z->repr == '$');
-}
-
-static inline bool  //
-wuffs_base__status__is_truncated_input_error(const wuffs_base__status* z) {
-  const char* p = z->repr;
-  if (!p || (*p != '#')) {
-    return false;
-  }
-  p++;
-  while (1) {
-    if (*p == 0) {
-      return false;
-    } else if (*p++ == ':') {
-      break;
-    }
-  }
-  return strcmp(p, " truncated input") == 0;
-}
-
-// wuffs_base__status__message strips the leading '$', '#' or '@'.
-static inline const char*  //
-wuffs_base__status__message(const wuffs_base__status* z) {
-  if (z->repr) {
-    if ((*z->repr == '$') || (*z->repr == '#') || (*z->repr == '@')) {
-      return z->repr + 1;
-    }
-  }
-  return z->repr;
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__status::is_complete() const {
-  return wuffs_base__status__is_complete(this);
-}
-
-inline bool  //
-wuffs_base__status::is_error() const {
-  return wuffs_base__status__is_error(this);
-}
-
-inline bool  //
-wuffs_base__status::is_note() const {
-  return wuffs_base__status__is_note(this);
-}
-
-inline bool  //
-wuffs_base__status::is_ok() const {
-  return wuffs_base__status__is_ok(this);
-}
-
-inline bool  //
-wuffs_base__status::is_suspension() const {
-  return wuffs_base__status__is_suspension(this);
-}
-
-inline bool  //
-wuffs_base__status::is_truncated_input_error() const {
-  return wuffs_base__status__is_truncated_input_error(this);
-}
-
-inline const char*  //
-wuffs_base__status::message() const {
-  return wuffs_base__status__message(this);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-// WUFFS_BASE__RESULT is a result type: either a status (an error) or a value.
-//
-// A result with all fields NULL or zero is as valid as a zero-valued T.
-#define WUFFS_BASE__RESULT(T)  \
-  struct {                     \
-    wuffs_base__status status; \
-    T value;                   \
-  }
-
-typedef WUFFS_BASE__RESULT(double) wuffs_base__result_f64;
-typedef WUFFS_BASE__RESULT(int64_t) wuffs_base__result_i64;
-typedef WUFFS_BASE__RESULT(uint64_t) wuffs_base__result_u64;
-
-// --------
-
-// wuffs_base__transform__output is the result of transforming from a src slice
-// to a dst slice.
-typedef struct wuffs_base__transform__output__struct {
-  wuffs_base__status status;
-  size_t num_dst;
-  size_t num_src;
-} wuffs_base__transform__output;
-
-// --------
-
-// FourCC constants. Four Character Codes are literally four ASCII characters
-// (sometimes padded with ' ' spaces) that pack neatly into a signed or
-// unsigned 32-bit integer. ASCII letters are conventionally upper case.
-//
-// They are often used to identify video codecs (e.g. "H265") and pixel formats
-// (e.g. "YV12"). Wuffs uses them for that but also generally for naming
-// various things: compression formats (e.g. "BZ2 "), image metadata (e.g.
-// "EXIF"), file formats (e.g. "HTML"), etc.
-//
-// Wuffs' u32 values are big-endian ("JPEG" is 0x4A504547 not 0x4745504A) to
-// preserve ordering: "JPEG" < "MP3 " and 0x4A504547 < 0x4D503320.
-
-// Background Color.
-#define WUFFS_BASE__FOURCC__BGCL 0x4247434C
-
-// Bitmap.
-#define WUFFS_BASE__FOURCC__BMP 0x424D5020
-
-// Brotli.
-#define WUFFS_BASE__FOURCC__BRTL 0x4252544C
-
-// Bzip2.
-#define WUFFS_BASE__FOURCC__BZ2 0x425A3220
-
-// Concise Binary Object Representation.
-#define WUFFS_BASE__FOURCC__CBOR 0x43424F52
-
-// Primary Chromaticities and White Point.
-#define WUFFS_BASE__FOURCC__CHRM 0x4348524D
-
-// Cascading Style Sheets.
-#define WUFFS_BASE__FOURCC__CSS 0x43535320
-
-// Encapsulated PostScript.
-#define WUFFS_BASE__FOURCC__EPS 0x45505320
-
-// Exchangeable Image File Format.
-#define WUFFS_BASE__FOURCC__EXIF 0x45584946
-
-// Free Lossless Audio Codec.
-#define WUFFS_BASE__FOURCC__FLAC 0x464C4143
-
-// Gamma Correction.
-#define WUFFS_BASE__FOURCC__GAMA 0x47414D41
-
-// Graphics Interchange Format.
-#define WUFFS_BASE__FOURCC__GIF 0x47494620
-
-// GNU Zip.
-#define WUFFS_BASE__FOURCC__GZ 0x475A2020
-
-// High Efficiency Image File.
-#define WUFFS_BASE__FOURCC__HEIF 0x48454946
-
-// Hypertext Markup Language.
-#define WUFFS_BASE__FOURCC__HTML 0x48544D4C
-
-// International Color Consortium Profile.
-#define WUFFS_BASE__FOURCC__ICCP 0x49434350
-
-// Icon.
-#define WUFFS_BASE__FOURCC__ICO 0x49434F20
-
-// Icon Vector Graphics.
-#define WUFFS_BASE__FOURCC__ICVG 0x49435647
-
-// Initialization.
-#define WUFFS_BASE__FOURCC__INI 0x494E4920
-
-// Joint Photographic Experts Group.
-#define WUFFS_BASE__FOURCC__JPEG 0x4A504547
-
-// JavaScript.
-#define WUFFS_BASE__FOURCC__JS 0x4A532020
-
-// JavaScript Object Notation.
-#define WUFFS_BASE__FOURCC__JSON 0x4A534F4E
-
-// JSON With Commas and Comments.
-#define WUFFS_BASE__FOURCC__JWCC 0x4A574343
-
-// Key-Value Pair.
-#define WUFFS_BASE__FOURCC__KVP 0x4B565020
-
-// Key-Value Pair (Key).
-#define WUFFS_BASE__FOURCC__KVPK 0x4B56504B
-
-// Key-Value Pair (Value).
-#define WUFFS_BASE__FOURCC__KVPV 0x4B565056
-
-// Lempel–Ziv 4.
-#define WUFFS_BASE__FOURCC__LZ4 0x4C5A3420
-
-// Markdown.
-#define WUFFS_BASE__FOURCC__MD 0x4D442020
-
-// Modification Time.
-#define WUFFS_BASE__FOURCC__MTIM 0x4D54494D
-
-// MPEG-1 Audio Layer III.
-#define WUFFS_BASE__FOURCC__MP3 0x4D503320
-
-// Naive Image.
-#define WUFFS_BASE__FOURCC__NIE 0x4E494520
-
-// Netpbm (Portable Anymap).
-#define WUFFS_BASE__FOURCC__NPBM 0x4E50424D
-
-// Offset (2-Dimensional).
-#define WUFFS_BASE__FOURCC__OFS2 0x4F465332
-
-// Open Type Format.
-#define WUFFS_BASE__FOURCC__OTF 0x4F544620
-
-// Portable Document Format.
-#define WUFFS_BASE__FOURCC__PDF 0x50444620
-
-// Physical Dimensions.
-#define WUFFS_BASE__FOURCC__PHYD 0x50485944
-
-// Portable Network Graphics.
-#define WUFFS_BASE__FOURCC__PNG 0x504E4720
-
-// PostScript.
-#define WUFFS_BASE__FOURCC__PS 0x50532020
-
-// Quite OK Image.
-#define WUFFS_BASE__FOURCC__QOI 0x514F4920
-
-// Random Access Compression.
-#define WUFFS_BASE__FOURCC__RAC 0x52414320
-
-// Raw.
-#define WUFFS_BASE__FOURCC__RAW 0x52415720
-
-// Resource Interchange File Format.
-#define WUFFS_BASE__FOURCC__RIFF 0x52494646
-
-// Riegeli Records.
-#define WUFFS_BASE__FOURCC__RIGL 0x5249474C
-
-// Snappy.
-#define WUFFS_BASE__FOURCC__SNPY 0x534E5059
-
-// Standard Red Green Blue (Rendering Intent).
-#define WUFFS_BASE__FOURCC__SRGB 0x53524742
-
-// Scalable Vector Graphics.
-#define WUFFS_BASE__FOURCC__SVG 0x53564720
-
-// Tape Archive.
-#define WUFFS_BASE__FOURCC__TAR 0x54415220
-
-// Text.
-#define WUFFS_BASE__FOURCC__TEXT 0x54455854
-
-// Truevision Advanced Raster Graphics Adapter.
-#define WUFFS_BASE__FOURCC__TGA 0x54474120
-
-// Tagged Image File Format.
-#define WUFFS_BASE__FOURCC__TIFF 0x54494646
-
-// Tom's Obvious Minimal Language.
-#define WUFFS_BASE__FOURCC__TOML 0x544F4D4C
-
-// Waveform.
-#define WUFFS_BASE__FOURCC__WAVE 0x57415645
-
-// Wireless Bitmap.
-#define WUFFS_BASE__FOURCC__WBMP 0x57424D50
-
-// Web Picture.
-#define WUFFS_BASE__FOURCC__WEBP 0x57454250
-
-// Web Open Font Format.
-#define WUFFS_BASE__FOURCC__WOFF 0x574F4646
-
-// Extensible Markup Language.
-#define WUFFS_BASE__FOURCC__XML 0x584D4C20
-
-// Extensible Metadata Platform.
-#define WUFFS_BASE__FOURCC__XMP 0x584D5020
-
-// Xz.
-#define WUFFS_BASE__FOURCC__XZ 0x585A2020
-
-// Zip.
-#define WUFFS_BASE__FOURCC__ZIP 0x5A495020
-
-// Zlib.
-#define WUFFS_BASE__FOURCC__ZLIB 0x5A4C4942
-
-// Zstandard.
-#define WUFFS_BASE__FOURCC__ZSTD 0x5A535444
-
-// --------
-
-// Quirks.
-
-#define WUFFS_BASE__QUIRK_IGNORE_CHECKSUM 1
-
-// --------
-
-// Flicks are a unit of time. One flick (frame-tick) is 1 / 705_600_000 of a
-// second. See https://github.com/OculusVR/Flicks
-typedef int64_t wuffs_base__flicks;
-
-#define WUFFS_BASE__FLICKS_PER_SECOND ((uint64_t)705600000)
-#define WUFFS_BASE__FLICKS_PER_MILLISECOND ((uint64_t)705600)
-
-// ---------------- Numeric Types
-
-// The helpers below are functions, instead of macros, because their arguments
-// can be an expression that we shouldn't evaluate more than once.
-//
-// They are static, so that linking multiple wuffs .o files won't complain about
-// duplicate function definitions.
-//
-// They are explicitly marked inline, even if modern compilers don't use the
-// inline attribute to guide optimizations such as inlining, to avoid the
-// -Wunused-function warning, and we like to compile with -Wall -Werror.
-
-static inline int8_t  //
-wuffs_base__i8__min(int8_t x, int8_t y) {
-  return x < y ? x : y;
-}
-
-static inline int8_t  //
-wuffs_base__i8__max(int8_t x, int8_t y) {
-  return x > y ? x : y;
-}
-
-static inline int16_t  //
-wuffs_base__i16__min(int16_t x, int16_t y) {
-  return x < y ? x : y;
-}
-
-static inline int16_t  //
-wuffs_base__i16__max(int16_t x, int16_t y) {
-  return x > y ? x : y;
-}
-
-static inline int32_t  //
-wuffs_base__i32__min(int32_t x, int32_t y) {
-  return x < y ? x : y;
-}
-
-static inline int32_t  //
-wuffs_base__i32__max(int32_t x, int32_t y) {
-  return x > y ? x : y;
-}
-
-static inline int64_t  //
-wuffs_base__i64__min(int64_t x, int64_t y) {
-  return x < y ? x : y;
-}
-
-static inline int64_t  //
-wuffs_base__i64__max(int64_t x, int64_t y) {
-  return x > y ? x : y;
-}
-
-static inline uint8_t  //
-wuffs_base__u8__min(uint8_t x, uint8_t y) {
-  return x < y ? x : y;
-}
-
-static inline uint8_t  //
-wuffs_base__u8__max(uint8_t x, uint8_t y) {
-  return x > y ? x : y;
-}
-
-static inline uint16_t  //
-wuffs_base__u16__min(uint16_t x, uint16_t y) {
-  return x < y ? x : y;
-}
-
-static inline uint16_t  //
-wuffs_base__u16__max(uint16_t x, uint16_t y) {
-  return x > y ? x : y;
-}
-
-static inline uint32_t  //
-wuffs_base__u32__min(uint32_t x, uint32_t y) {
-  return x < y ? x : y;
-}
-
-static inline uint32_t  //
-wuffs_base__u32__max(uint32_t x, uint32_t y) {
-  return x > y ? x : y;
-}
-
-static inline uint64_t  //
-wuffs_base__u64__min(uint64_t x, uint64_t y) {
-  return x < y ? x : y;
-}
-
-static inline uint64_t  //
-wuffs_base__u64__max(uint64_t x, uint64_t y) {
-  return x > y ? x : y;
-}
-
-// --------
-
-static inline uint8_t  //
-wuffs_base__u8__rotate_left(uint8_t x, uint32_t n) {
-  n &= 7;
-  return ((uint8_t)(x << n)) | ((uint8_t)(x >> (8 - n)));
-}
-
-static inline uint8_t  //
-wuffs_base__u8__rotate_right(uint8_t x, uint32_t n) {
-  n &= 7;
-  return ((uint8_t)(x >> n)) | ((uint8_t)(x << (8 - n)));
-}
-
-static inline uint16_t  //
-wuffs_base__u16__rotate_left(uint16_t x, uint32_t n) {
-  n &= 15;
-  return ((uint16_t)(x << n)) | ((uint16_t)(x >> (16 - n)));
-}
-
-static inline uint16_t  //
-wuffs_base__u16__rotate_right(uint16_t x, uint32_t n) {
-  n &= 15;
-  return ((uint16_t)(x >> n)) | ((uint16_t)(x << (16 - n)));
-}
-
-static inline uint32_t  //
-wuffs_base__u32__rotate_left(uint32_t x, uint32_t n) {
-  n &= 31;
-  return ((uint32_t)(x << n)) | ((uint32_t)(x >> (32 - n)));
-}
-
-static inline uint32_t  //
-wuffs_base__u32__rotate_right(uint32_t x, uint32_t n) {
-  n &= 31;
-  return ((uint32_t)(x >> n)) | ((uint32_t)(x << (32 - n)));
-}
-
-static inline uint64_t  //
-wuffs_base__u64__rotate_left(uint64_t x, uint32_t n) {
-  n &= 63;
-  return ((uint64_t)(x << n)) | ((uint64_t)(x >> (64 - n)));
-}
-
-static inline uint64_t  //
-wuffs_base__u64__rotate_right(uint64_t x, uint32_t n) {
-  n &= 63;
-  return ((uint64_t)(x >> n)) | ((uint64_t)(x << (64 - n)));
-}
-
-// --------
-
-// Saturating arithmetic (sat_add, sat_sub) branchless bit-twiddling algorithms
-// are per https://locklessinc.com/articles/sat_arithmetic/
-//
-// It is important that the underlying types are unsigned integers, as signed
-// integer arithmetic overflow is undefined behavior in C.
-
-static inline uint8_t  //
-wuffs_base__u8__sat_add(uint8_t x, uint8_t y) {
-  uint8_t res = (uint8_t)(x + y);
-  res |= (uint8_t)(-(res < x));
-  return res;
-}
-
-static inline uint8_t  //
-wuffs_base__u8__sat_sub(uint8_t x, uint8_t y) {
-  uint8_t res = (uint8_t)(x - y);
-  res &= (uint8_t)(-(res <= x));
-  return res;
-}
-
-static inline uint16_t  //
-wuffs_base__u16__sat_add(uint16_t x, uint16_t y) {
-  uint16_t res = (uint16_t)(x + y);
-  res |= (uint16_t)(-(res < x));
-  return res;
-}
-
-static inline uint16_t  //
-wuffs_base__u16__sat_sub(uint16_t x, uint16_t y) {
-  uint16_t res = (uint16_t)(x - y);
-  res &= (uint16_t)(-(res <= x));
-  return res;
-}
-
-static inline uint32_t  //
-wuffs_base__u32__sat_add(uint32_t x, uint32_t y) {
-  uint32_t res = (uint32_t)(x + y);
-  res |= (uint32_t)(-(res < x));
-  return res;
-}
-
-static inline uint32_t  //
-wuffs_base__u32__sat_sub(uint32_t x, uint32_t y) {
-  uint32_t res = (uint32_t)(x - y);
-  res &= (uint32_t)(-(res <= x));
-  return res;
-}
-
-static inline uint64_t  //
-wuffs_base__u64__sat_add(uint64_t x, uint64_t y) {
-  uint64_t res = (uint64_t)(x + y);
-  res |= (uint64_t)(-(res < x));
-  return res;
-}
-
-static inline uint64_t  //
-wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) {
-  uint64_t res = (uint64_t)(x - y);
-  res &= (uint64_t)(-(res <= x));
-  return res;
-}
-
-// --------
-
-typedef struct wuffs_base__multiply_u64__output__struct {
-  uint64_t lo;
-  uint64_t hi;
-} wuffs_base__multiply_u64__output;
-
-// wuffs_base__multiply_u64 returns x*y as a 128-bit value.
-//
-// The maximum inclusive output hi_lo is 0xFFFFFFFFFFFFFFFE_0000000000000001.
-static inline wuffs_base__multiply_u64__output  //
-wuffs_base__multiply_u64(uint64_t x, uint64_t y) {
-#if defined(__SIZEOF_INT128__)
-  __uint128_t z = ((__uint128_t)x) * ((__uint128_t)y);
-  wuffs_base__multiply_u64__output o;
-  o.lo = ((uint64_t)(z));
-  o.hi = ((uint64_t)(z >> 64));
-  return o;
-#else
-  // TODO: consider using the _mul128 intrinsic if defined(_MSC_VER).
-  uint64_t x0 = x & 0xFFFFFFFF;
-  uint64_t x1 = x >> 32;
-  uint64_t y0 = y & 0xFFFFFFFF;
-  uint64_t y1 = y >> 32;
-  uint64_t w0 = x0 * y0;
-  uint64_t t = (x1 * y0) + (w0 >> 32);
-  uint64_t w1 = t & 0xFFFFFFFF;
-  uint64_t w2 = t >> 32;
-  w1 += x0 * y1;
-  wuffs_base__multiply_u64__output o;
-  o.lo = x * y;
-  o.hi = (x1 * y1) + w2 + (w1 >> 32);
-  return o;
-#endif
-}
-
-// --------
-
-// The "defined(__clang__)" isn't redundant. While vanilla clang defines
-// __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
-#if (defined(__GNUC__) || defined(__clang__)) && (__SIZEOF_LONG__ == 8)
-
-static inline uint32_t  //
-wuffs_base__count_leading_zeroes_u64(uint64_t u) {
-  return u ? ((uint32_t)(__builtin_clzl(u))) : 64u;
-}
-
-#else
-// TODO: consider using the _BitScanReverse intrinsic if defined(_MSC_VER).
-
-static inline uint32_t  //
-wuffs_base__count_leading_zeroes_u64(uint64_t u) {
-  if (u == 0) {
-    return 64;
-  }
-
-  uint32_t n = 0;
-  if ((u >> 32) == 0) {
-    n |= 32;
-    u <<= 32;
-  }
-  if ((u >> 48) == 0) {
-    n |= 16;
-    u <<= 16;
-  }
-  if ((u >> 56) == 0) {
-    n |= 8;
-    u <<= 8;
-  }
-  if ((u >> 60) == 0) {
-    n |= 4;
-    u <<= 4;
-  }
-  if ((u >> 62) == 0) {
-    n |= 2;
-    u <<= 2;
-  }
-  if ((u >> 63) == 0) {
-    n |= 1;
-    u <<= 1;
-  }
-  return n;
-}
-
-#endif  // (defined(__GNUC__) || defined(__clang__)) && (__SIZEOF_LONG__ == 8)
-
-// --------
-
-// Normally, the wuffs_base__peek_etc and wuffs_base__poke_etc implementations
-// are both (1) correct regardless of CPU endianness and (2) very fast (e.g. an
-// inlined wuffs_base__peek_u32le__no_bounds_check call, in an optimized clang
-// or gcc build, is a single MOV instruction on x86_64).
-//
-// However, the endian-agnostic implementations are slow on Microsoft's C
-// compiler (MSC). Alternative memcpy-based implementations restore speed, but
-// they are only correct on little-endian CPU architectures. Defining
-// WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE opts in to these implementations.
-//
-// https://godbolt.org/z/q4MfjzTPh
-#if defined(_MSC_VER) && !defined(__clang__) && \
-    (defined(_M_ARM64) || defined(_M_X64))
-#define WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE
-#endif
-
-#define wuffs_base__peek_u8be__no_bounds_check \
-  wuffs_base__peek_u8__no_bounds_check
-#define wuffs_base__peek_u8le__no_bounds_check \
-  wuffs_base__peek_u8__no_bounds_check
-
-static inline uint8_t  //
-wuffs_base__peek_u8__no_bounds_check(const uint8_t* p) {
-  return p[0];
-}
-
-static inline uint16_t  //
-wuffs_base__peek_u16be__no_bounds_check(const uint8_t* p) {
-#if defined(WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE)
-  uint16_t x;
-  memcpy(&x, p, 2);
-  return _byteswap_ushort(x);
-#else
-  return (uint16_t)(((uint16_t)(p[0]) << 8) | ((uint16_t)(p[1]) << 0));
-#endif
-}
-
-static inline uint16_t  //
-wuffs_base__peek_u16le__no_bounds_check(const uint8_t* p) {
-#if defined(WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE)
-  uint16_t x;
-  memcpy(&x, p, 2);
-  return x;
-#else
-  return (uint16_t)(((uint16_t)(p[0]) << 0) | ((uint16_t)(p[1]) << 8));
-#endif
-}
-
-static inline uint32_t  //
-wuffs_base__peek_u24be__no_bounds_check(const uint8_t* p) {
-  return ((uint32_t)(p[0]) << 16) | ((uint32_t)(p[1]) << 8) |
-         ((uint32_t)(p[2]) << 0);
-}
-
-static inline uint32_t  //
-wuffs_base__peek_u24le__no_bounds_check(const uint8_t* p) {
-  return ((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) |
-         ((uint32_t)(p[2]) << 16);
-}
-
-static inline uint32_t  //
-wuffs_base__peek_u32be__no_bounds_check(const uint8_t* p) {
-#if defined(WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE)
-  uint32_t x;
-  memcpy(&x, p, 4);
-  return _byteswap_ulong(x);
-#else
-  return ((uint32_t)(p[0]) << 24) | ((uint32_t)(p[1]) << 16) |
-         ((uint32_t)(p[2]) << 8) | ((uint32_t)(p[3]) << 0);
-#endif
-}
-
-static inline uint32_t  //
-wuffs_base__peek_u32le__no_bounds_check(const uint8_t* p) {
-#if defined(WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE)
-  uint32_t x;
-  memcpy(&x, p, 4);
-  return x;
-#else
-  return ((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) |
-         ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24);
-#endif
-}
-
-static inline uint64_t  //
-wuffs_base__peek_u40be__no_bounds_check(const uint8_t* p) {
-  return ((uint64_t)(p[0]) << 32) | ((uint64_t)(p[1]) << 24) |
-         ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 8) |
-         ((uint64_t)(p[4]) << 0);
-}
-
-static inline uint64_t  //
-wuffs_base__peek_u40le__no_bounds_check(const uint8_t* p) {
-  return ((uint64_t)(p[0]) << 0) | ((uint64_t)(p[1]) << 8) |
-         ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 24) |
-         ((uint64_t)(p[4]) << 32);
-}
-
-static inline uint64_t  //
-wuffs_base__peek_u48be__no_bounds_check(const uint8_t* p) {
-  return ((uint64_t)(p[0]) << 40) | ((uint64_t)(p[1]) << 32) |
-         ((uint64_t)(p[2]) << 24) | ((uint64_t)(p[3]) << 16) |
-         ((uint64_t)(p[4]) << 8) | ((uint64_t)(p[5]) << 0);
-}
-
-static inline uint64_t  //
-wuffs_base__peek_u48le__no_bounds_check(const uint8_t* p) {
-  return ((uint64_t)(p[0]) << 0) | ((uint64_t)(p[1]) << 8) |
-         ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 24) |
-         ((uint64_t)(p[4]) << 32) | ((uint64_t)(p[5]) << 40);
-}
-
-static inline uint64_t  //
-wuffs_base__peek_u56be__no_bounds_check(const uint8_t* p) {
-  return ((uint64_t)(p[0]) << 48) | ((uint64_t)(p[1]) << 40) |
-         ((uint64_t)(p[2]) << 32) | ((uint64_t)(p[3]) << 24) |
-         ((uint64_t)(p[4]) << 16) | ((uint64_t)(p[5]) << 8) |
-         ((uint64_t)(p[6]) << 0);
-}
-
-static inline uint64_t  //
-wuffs_base__peek_u56le__no_bounds_check(const uint8_t* p) {
-  return ((uint64_t)(p[0]) << 0) | ((uint64_t)(p[1]) << 8) |
-         ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 24) |
-         ((uint64_t)(p[4]) << 32) | ((uint64_t)(p[5]) << 40) |
-         ((uint64_t)(p[6]) << 48);
-}
-
-static inline uint64_t  //
-wuffs_base__peek_u64be__no_bounds_check(const uint8_t* p) {
-#if defined(WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE)
-  uint64_t x;
-  memcpy(&x, p, 8);
-  return _byteswap_uint64(x);
-#else
-  return ((uint64_t)(p[0]) << 56) | ((uint64_t)(p[1]) << 48) |
-         ((uint64_t)(p[2]) << 40) | ((uint64_t)(p[3]) << 32) |
-         ((uint64_t)(p[4]) << 24) | ((uint64_t)(p[5]) << 16) |
-         ((uint64_t)(p[6]) << 8) | ((uint64_t)(p[7]) << 0);
-#endif
-}
-
-static inline uint64_t  //
-wuffs_base__peek_u64le__no_bounds_check(const uint8_t* p) {
-#if defined(WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE)
-  uint64_t x;
-  memcpy(&x, p, 8);
-  return x;
-#else
-  return ((uint64_t)(p[0]) << 0) | ((uint64_t)(p[1]) << 8) |
-         ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 24) |
-         ((uint64_t)(p[4]) << 32) | ((uint64_t)(p[5]) << 40) |
-         ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56);
-#endif
-}
-
-// --------
-
-#define wuffs_base__poke_u8be__no_bounds_check \
-  wuffs_base__poke_u8__no_bounds_check
-#define wuffs_base__poke_u8le__no_bounds_check \
-  wuffs_base__poke_u8__no_bounds_check
-
-static inline void  //
-wuffs_base__poke_u8__no_bounds_check(uint8_t* p, uint8_t x) {
-  p[0] = x;
-}
-
-static inline void  //
-wuffs_base__poke_u16be__no_bounds_check(uint8_t* p, uint16_t x) {
-  p[0] = (uint8_t)(x >> 8);
-  p[1] = (uint8_t)(x >> 0);
-}
-
-static inline void  //
-wuffs_base__poke_u16le__no_bounds_check(uint8_t* p, uint16_t x) {
-#if defined(WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE) || \
-    (defined(__GNUC__) && !defined(__clang__) && defined(__x86_64__))
-  // This seems to perform better on gcc 10 (but not clang 9). Clang also
-  // defines "__GNUC__".
-  memcpy(p, &x, 2);
-#else
-  p[0] = (uint8_t)(x >> 0);
-  p[1] = (uint8_t)(x >> 8);
-#endif
-}
-
-static inline void  //
-wuffs_base__poke_u24be__no_bounds_check(uint8_t* p, uint32_t x) {
-  p[0] = (uint8_t)(x >> 16);
-  p[1] = (uint8_t)(x >> 8);
-  p[2] = (uint8_t)(x >> 0);
-}
-
-static inline void  //
-wuffs_base__poke_u24le__no_bounds_check(uint8_t* p, uint32_t x) {
-  p[0] = (uint8_t)(x >> 0);
-  p[1] = (uint8_t)(x >> 8);
-  p[2] = (uint8_t)(x >> 16);
-}
-
-static inline void  //
-wuffs_base__poke_u32be__no_bounds_check(uint8_t* p, uint32_t x) {
-  p[0] = (uint8_t)(x >> 24);
-  p[1] = (uint8_t)(x >> 16);
-  p[2] = (uint8_t)(x >> 8);
-  p[3] = (uint8_t)(x >> 0);
-}
-
-static inline void  //
-wuffs_base__poke_u32le__no_bounds_check(uint8_t* p, uint32_t x) {
-#if defined(WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE) || \
-    (defined(__GNUC__) && !defined(__clang__) && defined(__x86_64__))
-  // This seems to perform better on gcc 10 (but not clang 9). Clang also
-  // defines "__GNUC__".
-  memcpy(p, &x, 4);
-#else
-  p[0] = (uint8_t)(x >> 0);
-  p[1] = (uint8_t)(x >> 8);
-  p[2] = (uint8_t)(x >> 16);
-  p[3] = (uint8_t)(x >> 24);
-#endif
-}
-
-static inline void  //
-wuffs_base__poke_u40be__no_bounds_check(uint8_t* p, uint64_t x) {
-  p[0] = (uint8_t)(x >> 32);
-  p[1] = (uint8_t)(x >> 24);
-  p[2] = (uint8_t)(x >> 16);
-  p[3] = (uint8_t)(x >> 8);
-  p[4] = (uint8_t)(x >> 0);
-}
-
-static inline void  //
-wuffs_base__poke_u40le__no_bounds_check(uint8_t* p, uint64_t x) {
-  p[0] = (uint8_t)(x >> 0);
-  p[1] = (uint8_t)(x >> 8);
-  p[2] = (uint8_t)(x >> 16);
-  p[3] = (uint8_t)(x >> 24);
-  p[4] = (uint8_t)(x >> 32);
-}
-
-static inline void  //
-wuffs_base__poke_u48be__no_bounds_check(uint8_t* p, uint64_t x) {
-  p[0] = (uint8_t)(x >> 40);
-  p[1] = (uint8_t)(x >> 32);
-  p[2] = (uint8_t)(x >> 24);
-  p[3] = (uint8_t)(x >> 16);
-  p[4] = (uint8_t)(x >> 8);
-  p[5] = (uint8_t)(x >> 0);
-}
-
-static inline void  //
-wuffs_base__poke_u48le__no_bounds_check(uint8_t* p, uint64_t x) {
-  p[0] = (uint8_t)(x >> 0);
-  p[1] = (uint8_t)(x >> 8);
-  p[2] = (uint8_t)(x >> 16);
-  p[3] = (uint8_t)(x >> 24);
-  p[4] = (uint8_t)(x >> 32);
-  p[5] = (uint8_t)(x >> 40);
-}
-
-static inline void  //
-wuffs_base__poke_u56be__no_bounds_check(uint8_t* p, uint64_t x) {
-  p[0] = (uint8_t)(x >> 48);
-  p[1] = (uint8_t)(x >> 40);
-  p[2] = (uint8_t)(x >> 32);
-  p[3] = (uint8_t)(x >> 24);
-  p[4] = (uint8_t)(x >> 16);
-  p[5] = (uint8_t)(x >> 8);
-  p[6] = (uint8_t)(x >> 0);
-}
-
-static inline void  //
-wuffs_base__poke_u56le__no_bounds_check(uint8_t* p, uint64_t x) {
-  p[0] = (uint8_t)(x >> 0);
-  p[1] = (uint8_t)(x >> 8);
-  p[2] = (uint8_t)(x >> 16);
-  p[3] = (uint8_t)(x >> 24);
-  p[4] = (uint8_t)(x >> 32);
-  p[5] = (uint8_t)(x >> 40);
-  p[6] = (uint8_t)(x >> 48);
-}
-
-static inline void  //
-wuffs_base__poke_u64be__no_bounds_check(uint8_t* p, uint64_t x) {
-  p[0] = (uint8_t)(x >> 56);
-  p[1] = (uint8_t)(x >> 48);
-  p[2] = (uint8_t)(x >> 40);
-  p[3] = (uint8_t)(x >> 32);
-  p[4] = (uint8_t)(x >> 24);
-  p[5] = (uint8_t)(x >> 16);
-  p[6] = (uint8_t)(x >> 8);
-  p[7] = (uint8_t)(x >> 0);
-}
-
-static inline void  //
-wuffs_base__poke_u64le__no_bounds_check(uint8_t* p, uint64_t x) {
-#if defined(WUFFS_BASE__USE_MEMCPY_LE_PEEK_POKE) || \
-    (defined(__GNUC__) && !defined(__clang__) && defined(__x86_64__))
-  // This seems to perform better on gcc 10 (but not clang 9). Clang also
-  // defines "__GNUC__".
-  memcpy(p, &x, 8);
-#else
-  p[0] = (uint8_t)(x >> 0);
-  p[1] = (uint8_t)(x >> 8);
-  p[2] = (uint8_t)(x >> 16);
-  p[3] = (uint8_t)(x >> 24);
-  p[4] = (uint8_t)(x >> 32);
-  p[5] = (uint8_t)(x >> 40);
-  p[6] = (uint8_t)(x >> 48);
-  p[7] = (uint8_t)(x >> 56);
-#endif
-}
-
-// ---------------- Slices and Tables
-
-// WUFFS_BASE__SLICE is a 1-dimensional buffer.
-//
-// len measures a number of elements, not necessarily a size in bytes.
-//
-// A value with all fields NULL or zero is a valid, empty slice.
-#define WUFFS_BASE__SLICE(T) \
-  struct {                   \
-    T* ptr;                  \
-    size_t len;              \
-  }
-
-// WUFFS_BASE__TABLE is a 2-dimensional buffer.
-//
-// width, height and stride measure a number of elements, not necessarily a
-// size in bytes.
-//
-// A value with all fields NULL or zero is a valid, empty table.
-#define WUFFS_BASE__TABLE(T) \
-  struct {                   \
-    T* ptr;                  \
-    size_t width;            \
-    size_t height;           \
-    size_t stride;           \
-  }
-
-typedef WUFFS_BASE__SLICE(uint8_t) wuffs_base__slice_u8;
-typedef WUFFS_BASE__SLICE(uint16_t) wuffs_base__slice_u16;
-typedef WUFFS_BASE__SLICE(uint32_t) wuffs_base__slice_u32;
-typedef WUFFS_BASE__SLICE(uint64_t) wuffs_base__slice_u64;
-
-typedef WUFFS_BASE__TABLE(uint8_t) wuffs_base__table_u8;
-typedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16;
-typedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32;
-typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64;
-
-static inline wuffs_base__slice_u8  //
-wuffs_base__make_slice_u8(uint8_t* ptr, size_t len) {
-  wuffs_base__slice_u8 ret;
-  ret.ptr = ptr;
-  ret.len = len;
-  return ret;
-}
-
-static inline wuffs_base__slice_u16  //
-wuffs_base__make_slice_u16(uint16_t* ptr, size_t len) {
-  wuffs_base__slice_u16 ret;
-  ret.ptr = ptr;
-  ret.len = len;
-  return ret;
-}
-
-static inline wuffs_base__slice_u32  //
-wuffs_base__make_slice_u32(uint32_t* ptr, size_t len) {
-  wuffs_base__slice_u32 ret;
-  ret.ptr = ptr;
-  ret.len = len;
-  return ret;
-}
-
-static inline wuffs_base__slice_u64  //
-wuffs_base__make_slice_u64(uint64_t* ptr, size_t len) {
-  wuffs_base__slice_u64 ret;
-  ret.ptr = ptr;
-  ret.len = len;
-  return ret;
-}
-
-static inline wuffs_base__slice_u8  //
-wuffs_base__make_slice_u8_ij(uint8_t* ptr, size_t i, size_t j) {
-  wuffs_base__slice_u8 ret;
-  ret.ptr = ptr + i;
-  ret.len = (j >= i) ? (j - i) : 0;
-  return ret;
-}
-
-static inline wuffs_base__slice_u16  //
-wuffs_base__make_slice_u16_ij(uint16_t* ptr, size_t i, size_t j) {
-  wuffs_base__slice_u16 ret;
-  ret.ptr = ptr + i;
-  ret.len = (j >= i) ? (j - i) : 0;
-  return ret;
-}
-
-static inline wuffs_base__slice_u32  //
-wuffs_base__make_slice_u32_ij(uint32_t* ptr, size_t i, size_t j) {
-  wuffs_base__slice_u32 ret;
-  ret.ptr = ptr + i;
-  ret.len = (j >= i) ? (j - i) : 0;
-  return ret;
-}
-
-static inline wuffs_base__slice_u64  //
-wuffs_base__make_slice_u64_ij(uint64_t* ptr, size_t i, size_t j) {
-  wuffs_base__slice_u64 ret;
-  ret.ptr = ptr + i;
-  ret.len = (j >= i) ? (j - i) : 0;
-  return ret;
-}
-
-static inline wuffs_base__slice_u8  //
-wuffs_base__empty_slice_u8() {
-  wuffs_base__slice_u8 ret;
-  ret.ptr = NULL;
-  ret.len = 0;
-  return ret;
-}
-
-static inline wuffs_base__slice_u16  //
-wuffs_base__empty_slice_u16() {
-  wuffs_base__slice_u16 ret;
-  ret.ptr = NULL;
-  ret.len = 0;
-  return ret;
-}
-
-static inline wuffs_base__slice_u32  //
-wuffs_base__empty_slice_u32() {
-  wuffs_base__slice_u32 ret;
-  ret.ptr = NULL;
-  ret.len = 0;
-  return ret;
-}
-
-static inline wuffs_base__slice_u64  //
-wuffs_base__empty_slice_u64() {
-  wuffs_base__slice_u64 ret;
-  ret.ptr = NULL;
-  ret.len = 0;
-  return ret;
-}
-
-static inline wuffs_base__table_u8  //
-wuffs_base__make_table_u8(uint8_t* ptr,
-                          size_t width,
-                          size_t height,
-                          size_t stride) {
-  wuffs_base__table_u8 ret;
-  ret.ptr = ptr;
-  ret.width = width;
-  ret.height = height;
-  ret.stride = stride;
-  return ret;
-}
-
-static inline wuffs_base__table_u16  //
-wuffs_base__make_table_u16(uint16_t* ptr,
-                           size_t width,
-                           size_t height,
-                           size_t stride) {
-  wuffs_base__table_u16 ret;
-  ret.ptr = ptr;
-  ret.width = width;
-  ret.height = height;
-  ret.stride = stride;
-  return ret;
-}
-
-static inline wuffs_base__table_u32  //
-wuffs_base__make_table_u32(uint32_t* ptr,
-                           size_t width,
-                           size_t height,
-                           size_t stride) {
-  wuffs_base__table_u32 ret;
-  ret.ptr = ptr;
-  ret.width = width;
-  ret.height = height;
-  ret.stride = stride;
-  return ret;
-}
-
-static inline wuffs_base__table_u64  //
-wuffs_base__make_table_u64(uint64_t* ptr,
-                           size_t width,
-                           size_t height,
-                           size_t stride) {
-  wuffs_base__table_u64 ret;
-  ret.ptr = ptr;
-  ret.width = width;
-  ret.height = height;
-  ret.stride = stride;
-  return ret;
-}
-
-static inline wuffs_base__table_u8  //
-wuffs_base__empty_table_u8() {
-  wuffs_base__table_u8 ret;
-  ret.ptr = NULL;
-  ret.width = 0;
-  ret.height = 0;
-  ret.stride = 0;
-  return ret;
-}
-
-static inline wuffs_base__table_u16  //
-wuffs_base__empty_table_u16() {
-  wuffs_base__table_u16 ret;
-  ret.ptr = NULL;
-  ret.width = 0;
-  ret.height = 0;
-  ret.stride = 0;
-  return ret;
-}
-
-static inline wuffs_base__table_u32  //
-wuffs_base__empty_table_u32() {
-  wuffs_base__table_u32 ret;
-  ret.ptr = NULL;
-  ret.width = 0;
-  ret.height = 0;
-  ret.stride = 0;
-  return ret;
-}
-
-static inline wuffs_base__table_u64  //
-wuffs_base__empty_table_u64() {
-  wuffs_base__table_u64 ret;
-  ret.ptr = NULL;
-  ret.width = 0;
-  ret.height = 0;
-  ret.stride = 0;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__slice_u8__overlaps(wuffs_base__slice_u8 s, wuffs_base__slice_u8 t) {
-  return ((s.ptr <= t.ptr) && (t.ptr < (s.ptr + s.len))) ||
-         ((t.ptr <= s.ptr) && (s.ptr < (t.ptr + t.len)));
-}
-
-// wuffs_base__slice_u8__subslice_i returns s[i:].
-//
-// It returns an empty slice if i is out of bounds.
-static inline wuffs_base__slice_u8  //
-wuffs_base__slice_u8__subslice_i(wuffs_base__slice_u8 s, uint64_t i) {
-  if ((i <= SIZE_MAX) && (i <= s.len)) {
-    return wuffs_base__make_slice_u8(s.ptr + i, ((size_t)(s.len - i)));
-  }
-  return wuffs_base__make_slice_u8(NULL, 0);
-}
-
-// wuffs_base__slice_u8__subslice_j returns s[:j].
-//
-// It returns an empty slice if j is out of bounds.
-static inline wuffs_base__slice_u8  //
-wuffs_base__slice_u8__subslice_j(wuffs_base__slice_u8 s, uint64_t j) {
-  if ((j <= SIZE_MAX) && (j <= s.len)) {
-    return wuffs_base__make_slice_u8(s.ptr, ((size_t)j));
-  }
-  return wuffs_base__make_slice_u8(NULL, 0);
-}
-
-// wuffs_base__slice_u8__subslice_ij returns s[i:j].
-//
-// It returns an empty slice if i or j is out of bounds.
-static inline wuffs_base__slice_u8  //
-wuffs_base__slice_u8__subslice_ij(wuffs_base__slice_u8 s,
-                                  uint64_t i,
-                                  uint64_t j) {
-  if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {
-    return wuffs_base__make_slice_u8(s.ptr + i, ((size_t)(j - i)));
-  }
-  return wuffs_base__make_slice_u8(NULL, 0);
-}
-
-// wuffs_base__table_u8__subtable_ij returns t[ix:jx, iy:jy].
-//
-// It returns an empty table if i or j is out of bounds.
-static inline wuffs_base__table_u8  //
-wuffs_base__table_u8__subtable_ij(wuffs_base__table_u8 t,
-                                  uint64_t ix,
-                                  uint64_t iy,
-                                  uint64_t jx,
-                                  uint64_t jy) {
-  if ((ix <= jx) && (jx <= SIZE_MAX) && (jx <= t.width) &&  //
-      (iy <= jy) && (jy <= SIZE_MAX) && (jy <= t.height)) {
-    return wuffs_base__make_table_u8(t.ptr + ix + (iy * t.stride),  //
-                                     ((size_t)(jx - ix)),           //
-                                     ((size_t)(jy - iy)),           //
-                                     t.stride);                     //
-  }
-  return wuffs_base__make_table_u8(NULL, 0, 0, 0);
-}
-
-// wuffs_base__table__flattened_length returns the number of elements covered
-// by the 1-dimensional span that backs a 2-dimensional table. This counts the
-// elements inside the table and, when width != stride, the elements outside
-// the table but between its rows.
-//
-// For example, consider a width 10, height 4, stride 10 table. Mark its first
-// and last (inclusive) elements with 'a' and 'z'. This function returns 40.
-//
-//    a123456789
-//    0123456789
-//    0123456789
-//    012345678z
-//
-// Now consider the sub-table of that from (2, 1) inclusive to (8, 4) exclusive.
-//
-//    a123456789
-//    01iiiiiioo
-//    ooiiiiiioo
-//    ooiiiiii8z
-//
-// This function (called with width 6, height 3, stride 10) returns 26: 18 'i'
-// inside elements plus 8 'o' outside elements. Note that 26 is less than a
-// naive (height * stride = 30) computation. Indeed, advancing 29 elements from
-// the first 'i' would venture past 'z', out of bounds of the original table.
-//
-// It does not check for overflow, but if the arguments come from a table that
-// exists in memory and each element occupies a positive number of bytes then
-// the result should be bounded by the amount of allocatable memory (which
-// shouldn't overflow SIZE_MAX).
-static inline size_t  //
-wuffs_base__table__flattened_length(size_t width,
-                                    size_t height,
-                                    size_t stride) {
-  if (height == 0) {
-    return 0;
-  }
-  return ((height - 1) * stride) + width;
-}
-
-// ---------------- Magic Numbers
-
-// wuffs_base__magic_number_guess_fourcc guesses the file format of some data,
-// given its starting bytes (the prefix_data argument) and whether or not there
-// may be further bytes (the prefix_closed argument; true means that
-// prefix_data is the entire data).
-//
-// It returns a positive FourCC value on success.
-//
-// It returns zero if nothing matches its hard-coded list of 'magic numbers'.
-//
-// It returns a negative value if prefix_closed is false and a longer prefix is
-// required for a conclusive result. For example, a single 'B' byte (without
-// further data) is not enough to discriminate the BMP and BPG image file
-// formats. Similarly, a single '\xFF' byte might be the start of JPEG data or
-// it might be the start of some other binary data.
-//
-// It does not do a full validity check. Like any guess made from a short
-// prefix of the data, it may return false positives. Data that starts with 99
-// bytes of valid JPEG followed by corruption or truncation is an invalid JPEG
-// image overall, but this function will still return WUFFS_BASE__FOURCC__JPEG.
-//
-// Another source of false positives is that some 'magic numbers' are valid
-// ASCII data. A file starting with "GIF87a and GIF89a are the two versions of
-// GIF" will match GIF's 'magic number' even if it's plain text, not an image.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__MAGIC sub-module, not just
-// WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC int32_t  //
-wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix_data,
-                                      bool prefix_closed);
-
-// ---------------- Ranges and Rects
-
-// See https://github.com/google/wuffs/blob/main/doc/note/ranges-and-rects.md
-
-typedef struct wuffs_base__range_ii_u32__struct {
-  uint32_t min_incl;
-  uint32_t max_incl;
-
-#ifdef __cplusplus
-  inline bool is_empty() const;
-  inline bool equals(wuffs_base__range_ii_u32__struct s) const;
-  inline wuffs_base__range_ii_u32__struct intersect(
-      wuffs_base__range_ii_u32__struct s) const;
-  inline wuffs_base__range_ii_u32__struct unite(
-      wuffs_base__range_ii_u32__struct s) const;
-  inline bool contains(uint32_t x) const;
-  inline bool contains_range(wuffs_base__range_ii_u32__struct s) const;
-#endif  // __cplusplus
-
-} wuffs_base__range_ii_u32;
-
-static inline wuffs_base__range_ii_u32  //
-wuffs_base__empty_range_ii_u32() {
-  wuffs_base__range_ii_u32 ret;
-  ret.min_incl = 0;
-  ret.max_incl = 0;
-  return ret;
-}
-
-static inline wuffs_base__range_ii_u32  //
-wuffs_base__make_range_ii_u32(uint32_t min_incl, uint32_t max_incl) {
-  wuffs_base__range_ii_u32 ret;
-  ret.min_incl = min_incl;
-  ret.max_incl = max_incl;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__range_ii_u32__is_empty(const wuffs_base__range_ii_u32* r) {
-  return r->min_incl > r->max_incl;
-}
-
-static inline bool  //
-wuffs_base__range_ii_u32__equals(const wuffs_base__range_ii_u32* r,
-                                 wuffs_base__range_ii_u32 s) {
-  return (r->min_incl == s.min_incl && r->max_incl == s.max_incl) ||
-         (wuffs_base__range_ii_u32__is_empty(r) &&
-          wuffs_base__range_ii_u32__is_empty(&s));
-}
-
-static inline wuffs_base__range_ii_u32  //
-wuffs_base__range_ii_u32__intersect(const wuffs_base__range_ii_u32* r,
-                                    wuffs_base__range_ii_u32 s) {
-  wuffs_base__range_ii_u32 t;
-  t.min_incl = wuffs_base__u32__max(r->min_incl, s.min_incl);
-  t.max_incl = wuffs_base__u32__min(r->max_incl, s.max_incl);
-  return t;
-}
-
-static inline wuffs_base__range_ii_u32  //
-wuffs_base__range_ii_u32__unite(const wuffs_base__range_ii_u32* r,
-                                wuffs_base__range_ii_u32 s) {
-  if (wuffs_base__range_ii_u32__is_empty(r)) {
-    return s;
-  }
-  if (wuffs_base__range_ii_u32__is_empty(&s)) {
-    return *r;
-  }
-  wuffs_base__range_ii_u32 t;
-  t.min_incl = wuffs_base__u32__min(r->min_incl, s.min_incl);
-  t.max_incl = wuffs_base__u32__max(r->max_incl, s.max_incl);
-  return t;
-}
-
-static inline bool  //
-wuffs_base__range_ii_u32__contains(const wuffs_base__range_ii_u32* r,
-                                   uint32_t x) {
-  return (r->min_incl <= x) && (x <= r->max_incl);
-}
-
-static inline bool  //
-wuffs_base__range_ii_u32__contains_range(const wuffs_base__range_ii_u32* r,
-                                         wuffs_base__range_ii_u32 s) {
-  return wuffs_base__range_ii_u32__equals(
-      &s, wuffs_base__range_ii_u32__intersect(r, s));
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__range_ii_u32::is_empty() const {
-  return wuffs_base__range_ii_u32__is_empty(this);
-}
-
-inline bool  //
-wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) const {
-  return wuffs_base__range_ii_u32__equals(this, s);
-}
-
-inline wuffs_base__range_ii_u32  //
-wuffs_base__range_ii_u32::intersect(wuffs_base__range_ii_u32 s) const {
-  return wuffs_base__range_ii_u32__intersect(this, s);
-}
-
-inline wuffs_base__range_ii_u32  //
-wuffs_base__range_ii_u32::unite(wuffs_base__range_ii_u32 s) const {
-  return wuffs_base__range_ii_u32__unite(this, s);
-}
-
-inline bool  //
-wuffs_base__range_ii_u32::contains(uint32_t x) const {
-  return wuffs_base__range_ii_u32__contains(this, x);
-}
-
-inline bool  //
-wuffs_base__range_ii_u32::contains_range(wuffs_base__range_ii_u32 s) const {
-  return wuffs_base__range_ii_u32__contains_range(this, s);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef struct wuffs_base__range_ie_u32__struct {
-  uint32_t min_incl;
-  uint32_t max_excl;
-
-#ifdef __cplusplus
-  inline bool is_empty() const;
-  inline bool equals(wuffs_base__range_ie_u32__struct s) const;
-  inline wuffs_base__range_ie_u32__struct intersect(
-      wuffs_base__range_ie_u32__struct s) const;
-  inline wuffs_base__range_ie_u32__struct unite(
-      wuffs_base__range_ie_u32__struct s) const;
-  inline bool contains(uint32_t x) const;
-  inline bool contains_range(wuffs_base__range_ie_u32__struct s) const;
-  inline uint32_t length() const;
-#endif  // __cplusplus
-
-} wuffs_base__range_ie_u32;
-
-static inline wuffs_base__range_ie_u32  //
-wuffs_base__empty_range_ie_u32() {
-  wuffs_base__range_ie_u32 ret;
-  ret.min_incl = 0;
-  ret.max_excl = 0;
-  return ret;
-}
-
-static inline wuffs_base__range_ie_u32  //
-wuffs_base__make_range_ie_u32(uint32_t min_incl, uint32_t max_excl) {
-  wuffs_base__range_ie_u32 ret;
-  ret.min_incl = min_incl;
-  ret.max_excl = max_excl;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__range_ie_u32__is_empty(const wuffs_base__range_ie_u32* r) {
-  return r->min_incl >= r->max_excl;
-}
-
-static inline bool  //
-wuffs_base__range_ie_u32__equals(const wuffs_base__range_ie_u32* r,
-                                 wuffs_base__range_ie_u32 s) {
-  return (r->min_incl == s.min_incl && r->max_excl == s.max_excl) ||
-         (wuffs_base__range_ie_u32__is_empty(r) &&
-          wuffs_base__range_ie_u32__is_empty(&s));
-}
-
-static inline wuffs_base__range_ie_u32  //
-wuffs_base__range_ie_u32__intersect(const wuffs_base__range_ie_u32* r,
-                                    wuffs_base__range_ie_u32 s) {
-  wuffs_base__range_ie_u32 t;
-  t.min_incl = wuffs_base__u32__max(r->min_incl, s.min_incl);
-  t.max_excl = wuffs_base__u32__min(r->max_excl, s.max_excl);
-  return t;
-}
-
-static inline wuffs_base__range_ie_u32  //
-wuffs_base__range_ie_u32__unite(const wuffs_base__range_ie_u32* r,
-                                wuffs_base__range_ie_u32 s) {
-  if (wuffs_base__range_ie_u32__is_empty(r)) {
-    return s;
-  }
-  if (wuffs_base__range_ie_u32__is_empty(&s)) {
-    return *r;
-  }
-  wuffs_base__range_ie_u32 t;
-  t.min_incl = wuffs_base__u32__min(r->min_incl, s.min_incl);
-  t.max_excl = wuffs_base__u32__max(r->max_excl, s.max_excl);
-  return t;
-}
-
-static inline bool  //
-wuffs_base__range_ie_u32__contains(const wuffs_base__range_ie_u32* r,
-                                   uint32_t x) {
-  return (r->min_incl <= x) && (x < r->max_excl);
-}
-
-static inline bool  //
-wuffs_base__range_ie_u32__contains_range(const wuffs_base__range_ie_u32* r,
-                                         wuffs_base__range_ie_u32 s) {
-  return wuffs_base__range_ie_u32__equals(
-      &s, wuffs_base__range_ie_u32__intersect(r, s));
-}
-
-static inline uint32_t  //
-wuffs_base__range_ie_u32__length(const wuffs_base__range_ie_u32* r) {
-  return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl);
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__range_ie_u32::is_empty() const {
-  return wuffs_base__range_ie_u32__is_empty(this);
-}
-
-inline bool  //
-wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) const {
-  return wuffs_base__range_ie_u32__equals(this, s);
-}
-
-inline wuffs_base__range_ie_u32  //
-wuffs_base__range_ie_u32::intersect(wuffs_base__range_ie_u32 s) const {
-  return wuffs_base__range_ie_u32__intersect(this, s);
-}
-
-inline wuffs_base__range_ie_u32  //
-wuffs_base__range_ie_u32::unite(wuffs_base__range_ie_u32 s) const {
-  return wuffs_base__range_ie_u32__unite(this, s);
-}
-
-inline bool  //
-wuffs_base__range_ie_u32::contains(uint32_t x) const {
-  return wuffs_base__range_ie_u32__contains(this, x);
-}
-
-inline bool  //
-wuffs_base__range_ie_u32::contains_range(wuffs_base__range_ie_u32 s) const {
-  return wuffs_base__range_ie_u32__contains_range(this, s);
-}
-
-inline uint32_t  //
-wuffs_base__range_ie_u32::length() const {
-  return wuffs_base__range_ie_u32__length(this);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef struct wuffs_base__range_ii_u64__struct {
-  uint64_t min_incl;
-  uint64_t max_incl;
-
-#ifdef __cplusplus
-  inline bool is_empty() const;
-  inline bool equals(wuffs_base__range_ii_u64__struct s) const;
-  inline wuffs_base__range_ii_u64__struct intersect(
-      wuffs_base__range_ii_u64__struct s) const;
-  inline wuffs_base__range_ii_u64__struct unite(
-      wuffs_base__range_ii_u64__struct s) const;
-  inline bool contains(uint64_t x) const;
-  inline bool contains_range(wuffs_base__range_ii_u64__struct s) const;
-#endif  // __cplusplus
-
-} wuffs_base__range_ii_u64;
-
-static inline wuffs_base__range_ii_u64  //
-wuffs_base__empty_range_ii_u64() {
-  wuffs_base__range_ii_u64 ret;
-  ret.min_incl = 0;
-  ret.max_incl = 0;
-  return ret;
-}
-
-static inline wuffs_base__range_ii_u64  //
-wuffs_base__make_range_ii_u64(uint64_t min_incl, uint64_t max_incl) {
-  wuffs_base__range_ii_u64 ret;
-  ret.min_incl = min_incl;
-  ret.max_incl = max_incl;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__range_ii_u64__is_empty(const wuffs_base__range_ii_u64* r) {
-  return r->min_incl > r->max_incl;
-}
-
-static inline bool  //
-wuffs_base__range_ii_u64__equals(const wuffs_base__range_ii_u64* r,
-                                 wuffs_base__range_ii_u64 s) {
-  return (r->min_incl == s.min_incl && r->max_incl == s.max_incl) ||
-         (wuffs_base__range_ii_u64__is_empty(r) &&
-          wuffs_base__range_ii_u64__is_empty(&s));
-}
-
-static inline wuffs_base__range_ii_u64  //
-wuffs_base__range_ii_u64__intersect(const wuffs_base__range_ii_u64* r,
-                                    wuffs_base__range_ii_u64 s) {
-  wuffs_base__range_ii_u64 t;
-  t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl);
-  t.max_incl = wuffs_base__u64__min(r->max_incl, s.max_incl);
-  return t;
-}
-
-static inline wuffs_base__range_ii_u64  //
-wuffs_base__range_ii_u64__unite(const wuffs_base__range_ii_u64* r,
-                                wuffs_base__range_ii_u64 s) {
-  if (wuffs_base__range_ii_u64__is_empty(r)) {
-    return s;
-  }
-  if (wuffs_base__range_ii_u64__is_empty(&s)) {
-    return *r;
-  }
-  wuffs_base__range_ii_u64 t;
-  t.min_incl = wuffs_base__u64__min(r->min_incl, s.min_incl);
-  t.max_incl = wuffs_base__u64__max(r->max_incl, s.max_incl);
-  return t;
-}
-
-static inline bool  //
-wuffs_base__range_ii_u64__contains(const wuffs_base__range_ii_u64* r,
-                                   uint64_t x) {
-  return (r->min_incl <= x) && (x <= r->max_incl);
-}
-
-static inline bool  //
-wuffs_base__range_ii_u64__contains_range(const wuffs_base__range_ii_u64* r,
-                                         wuffs_base__range_ii_u64 s) {
-  return wuffs_base__range_ii_u64__equals(
-      &s, wuffs_base__range_ii_u64__intersect(r, s));
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__range_ii_u64::is_empty() const {
-  return wuffs_base__range_ii_u64__is_empty(this);
-}
-
-inline bool  //
-wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) const {
-  return wuffs_base__range_ii_u64__equals(this, s);
-}
-
-inline wuffs_base__range_ii_u64  //
-wuffs_base__range_ii_u64::intersect(wuffs_base__range_ii_u64 s) const {
-  return wuffs_base__range_ii_u64__intersect(this, s);
-}
-
-inline wuffs_base__range_ii_u64  //
-wuffs_base__range_ii_u64::unite(wuffs_base__range_ii_u64 s) const {
-  return wuffs_base__range_ii_u64__unite(this, s);
-}
-
-inline bool  //
-wuffs_base__range_ii_u64::contains(uint64_t x) const {
-  return wuffs_base__range_ii_u64__contains(this, x);
-}
-
-inline bool  //
-wuffs_base__range_ii_u64::contains_range(wuffs_base__range_ii_u64 s) const {
-  return wuffs_base__range_ii_u64__contains_range(this, s);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef struct wuffs_base__range_ie_u64__struct {
-  uint64_t min_incl;
-  uint64_t max_excl;
-
-#ifdef __cplusplus
-  inline bool is_empty() const;
-  inline bool equals(wuffs_base__range_ie_u64__struct s) const;
-  inline wuffs_base__range_ie_u64__struct intersect(
-      wuffs_base__range_ie_u64__struct s) const;
-  inline wuffs_base__range_ie_u64__struct unite(
-      wuffs_base__range_ie_u64__struct s) const;
-  inline bool contains(uint64_t x) const;
-  inline bool contains_range(wuffs_base__range_ie_u64__struct s) const;
-  inline uint64_t length() const;
-#endif  // __cplusplus
-
-} wuffs_base__range_ie_u64;
-
-static inline wuffs_base__range_ie_u64  //
-wuffs_base__empty_range_ie_u64() {
-  wuffs_base__range_ie_u64 ret;
-  ret.min_incl = 0;
-  ret.max_excl = 0;
-  return ret;
-}
-
-static inline wuffs_base__range_ie_u64  //
-wuffs_base__make_range_ie_u64(uint64_t min_incl, uint64_t max_excl) {
-  wuffs_base__range_ie_u64 ret;
-  ret.min_incl = min_incl;
-  ret.max_excl = max_excl;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__range_ie_u64__is_empty(const wuffs_base__range_ie_u64* r) {
-  return r->min_incl >= r->max_excl;
-}
-
-static inline bool  //
-wuffs_base__range_ie_u64__equals(const wuffs_base__range_ie_u64* r,
-                                 wuffs_base__range_ie_u64 s) {
-  return (r->min_incl == s.min_incl && r->max_excl == s.max_excl) ||
-         (wuffs_base__range_ie_u64__is_empty(r) &&
-          wuffs_base__range_ie_u64__is_empty(&s));
-}
-
-static inline wuffs_base__range_ie_u64  //
-wuffs_base__range_ie_u64__intersect(const wuffs_base__range_ie_u64* r,
-                                    wuffs_base__range_ie_u64 s) {
-  wuffs_base__range_ie_u64 t;
-  t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl);
-  t.max_excl = wuffs_base__u64__min(r->max_excl, s.max_excl);
-  return t;
-}
-
-static inline wuffs_base__range_ie_u64  //
-wuffs_base__range_ie_u64__unite(const wuffs_base__range_ie_u64* r,
-                                wuffs_base__range_ie_u64 s) {
-  if (wuffs_base__range_ie_u64__is_empty(r)) {
-    return s;
-  }
-  if (wuffs_base__range_ie_u64__is_empty(&s)) {
-    return *r;
-  }
-  wuffs_base__range_ie_u64 t;
-  t.min_incl = wuffs_base__u64__min(r->min_incl, s.min_incl);
-  t.max_excl = wuffs_base__u64__max(r->max_excl, s.max_excl);
-  return t;
-}
-
-static inline bool  //
-wuffs_base__range_ie_u64__contains(const wuffs_base__range_ie_u64* r,
-                                   uint64_t x) {
-  return (r->min_incl <= x) && (x < r->max_excl);
-}
-
-static inline bool  //
-wuffs_base__range_ie_u64__contains_range(const wuffs_base__range_ie_u64* r,
-                                         wuffs_base__range_ie_u64 s) {
-  return wuffs_base__range_ie_u64__equals(
-      &s, wuffs_base__range_ie_u64__intersect(r, s));
-}
-
-static inline uint64_t  //
-wuffs_base__range_ie_u64__length(const wuffs_base__range_ie_u64* r) {
-  return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl);
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__range_ie_u64::is_empty() const {
-  return wuffs_base__range_ie_u64__is_empty(this);
-}
-
-inline bool  //
-wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) const {
-  return wuffs_base__range_ie_u64__equals(this, s);
-}
-
-inline wuffs_base__range_ie_u64  //
-wuffs_base__range_ie_u64::intersect(wuffs_base__range_ie_u64 s) const {
-  return wuffs_base__range_ie_u64__intersect(this, s);
-}
-
-inline wuffs_base__range_ie_u64  //
-wuffs_base__range_ie_u64::unite(wuffs_base__range_ie_u64 s) const {
-  return wuffs_base__range_ie_u64__unite(this, s);
-}
-
-inline bool  //
-wuffs_base__range_ie_u64::contains(uint64_t x) const {
-  return wuffs_base__range_ie_u64__contains(this, x);
-}
-
-inline bool  //
-wuffs_base__range_ie_u64::contains_range(wuffs_base__range_ie_u64 s) const {
-  return wuffs_base__range_ie_u64__contains_range(this, s);
-}
-
-inline uint64_t  //
-wuffs_base__range_ie_u64::length() const {
-  return wuffs_base__range_ie_u64__length(this);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef struct wuffs_base__rect_ii_u32__struct {
-  uint32_t min_incl_x;
-  uint32_t min_incl_y;
-  uint32_t max_incl_x;
-  uint32_t max_incl_y;
-
-#ifdef __cplusplus
-  inline bool is_empty() const;
-  inline bool equals(wuffs_base__rect_ii_u32__struct s) const;
-  inline wuffs_base__rect_ii_u32__struct intersect(
-      wuffs_base__rect_ii_u32__struct s) const;
-  inline wuffs_base__rect_ii_u32__struct unite(
-      wuffs_base__rect_ii_u32__struct s) const;
-  inline bool contains(uint32_t x, uint32_t y) const;
-  inline bool contains_rect(wuffs_base__rect_ii_u32__struct s) const;
-#endif  // __cplusplus
-
-} wuffs_base__rect_ii_u32;
-
-static inline wuffs_base__rect_ii_u32  //
-wuffs_base__empty_rect_ii_u32() {
-  wuffs_base__rect_ii_u32 ret;
-  ret.min_incl_x = 0;
-  ret.min_incl_y = 0;
-  ret.max_incl_x = 0;
-  ret.max_incl_y = 0;
-  return ret;
-}
-
-static inline wuffs_base__rect_ii_u32  //
-wuffs_base__make_rect_ii_u32(uint32_t min_incl_x,
-                             uint32_t min_incl_y,
-                             uint32_t max_incl_x,
-                             uint32_t max_incl_y) {
-  wuffs_base__rect_ii_u32 ret;
-  ret.min_incl_x = min_incl_x;
-  ret.min_incl_y = min_incl_y;
-  ret.max_incl_x = max_incl_x;
-  ret.max_incl_y = max_incl_y;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__rect_ii_u32__is_empty(const wuffs_base__rect_ii_u32* r) {
-  return (r->min_incl_x > r->max_incl_x) || (r->min_incl_y > r->max_incl_y);
-}
-
-static inline bool  //
-wuffs_base__rect_ii_u32__equals(const wuffs_base__rect_ii_u32* r,
-                                wuffs_base__rect_ii_u32 s) {
-  return (r->min_incl_x == s.min_incl_x && r->min_incl_y == s.min_incl_y &&
-          r->max_incl_x == s.max_incl_x && r->max_incl_y == s.max_incl_y) ||
-         (wuffs_base__rect_ii_u32__is_empty(r) &&
-          wuffs_base__rect_ii_u32__is_empty(&s));
-}
-
-static inline wuffs_base__rect_ii_u32  //
-wuffs_base__rect_ii_u32__intersect(const wuffs_base__rect_ii_u32* r,
-                                   wuffs_base__rect_ii_u32 s) {
-  wuffs_base__rect_ii_u32 t;
-  t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x);
-  t.min_incl_y = wuffs_base__u32__max(r->min_incl_y, s.min_incl_y);
-  t.max_incl_x = wuffs_base__u32__min(r->max_incl_x, s.max_incl_x);
-  t.max_incl_y = wuffs_base__u32__min(r->max_incl_y, s.max_incl_y);
-  return t;
-}
-
-static inline wuffs_base__rect_ii_u32  //
-wuffs_base__rect_ii_u32__unite(const wuffs_base__rect_ii_u32* r,
-                               wuffs_base__rect_ii_u32 s) {
-  if (wuffs_base__rect_ii_u32__is_empty(r)) {
-    return s;
-  }
-  if (wuffs_base__rect_ii_u32__is_empty(&s)) {
-    return *r;
-  }
-  wuffs_base__rect_ii_u32 t;
-  t.min_incl_x = wuffs_base__u32__min(r->min_incl_x, s.min_incl_x);
-  t.min_incl_y = wuffs_base__u32__min(r->min_incl_y, s.min_incl_y);
-  t.max_incl_x = wuffs_base__u32__max(r->max_incl_x, s.max_incl_x);
-  t.max_incl_y = wuffs_base__u32__max(r->max_incl_y, s.max_incl_y);
-  return t;
-}
-
-static inline bool  //
-wuffs_base__rect_ii_u32__contains(const wuffs_base__rect_ii_u32* r,
-                                  uint32_t x,
-                                  uint32_t y) {
-  return (r->min_incl_x <= x) && (x <= r->max_incl_x) && (r->min_incl_y <= y) &&
-         (y <= r->max_incl_y);
-}
-
-static inline bool  //
-wuffs_base__rect_ii_u32__contains_rect(const wuffs_base__rect_ii_u32* r,
-                                       wuffs_base__rect_ii_u32 s) {
-  return wuffs_base__rect_ii_u32__equals(
-      &s, wuffs_base__rect_ii_u32__intersect(r, s));
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__rect_ii_u32::is_empty() const {
-  return wuffs_base__rect_ii_u32__is_empty(this);
-}
-
-inline bool  //
-wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) const {
-  return wuffs_base__rect_ii_u32__equals(this, s);
-}
-
-inline wuffs_base__rect_ii_u32  //
-wuffs_base__rect_ii_u32::intersect(wuffs_base__rect_ii_u32 s) const {
-  return wuffs_base__rect_ii_u32__intersect(this, s);
-}
-
-inline wuffs_base__rect_ii_u32  //
-wuffs_base__rect_ii_u32::unite(wuffs_base__rect_ii_u32 s) const {
-  return wuffs_base__rect_ii_u32__unite(this, s);
-}
-
-inline bool  //
-wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) const {
-  return wuffs_base__rect_ii_u32__contains(this, x, y);
-}
-
-inline bool  //
-wuffs_base__rect_ii_u32::contains_rect(wuffs_base__rect_ii_u32 s) const {
-  return wuffs_base__rect_ii_u32__contains_rect(this, s);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef struct wuffs_base__rect_ie_u32__struct {
-  uint32_t min_incl_x;
-  uint32_t min_incl_y;
-  uint32_t max_excl_x;
-  uint32_t max_excl_y;
-
-#ifdef __cplusplus
-  inline bool is_empty() const;
-  inline bool equals(wuffs_base__rect_ie_u32__struct s) const;
-  inline wuffs_base__rect_ie_u32__struct intersect(
-      wuffs_base__rect_ie_u32__struct s) const;
-  inline wuffs_base__rect_ie_u32__struct unite(
-      wuffs_base__rect_ie_u32__struct s) const;
-  inline bool contains(uint32_t x, uint32_t y) const;
-  inline bool contains_rect(wuffs_base__rect_ie_u32__struct s) const;
-  inline uint32_t width() const;
-  inline uint32_t height() const;
-#endif  // __cplusplus
-
-} wuffs_base__rect_ie_u32;
-
-static inline wuffs_base__rect_ie_u32  //
-wuffs_base__empty_rect_ie_u32() {
-  wuffs_base__rect_ie_u32 ret;
-  ret.min_incl_x = 0;
-  ret.min_incl_y = 0;
-  ret.max_excl_x = 0;
-  ret.max_excl_y = 0;
-  return ret;
-}
-
-static inline wuffs_base__rect_ie_u32  //
-wuffs_base__make_rect_ie_u32(uint32_t min_incl_x,
-                             uint32_t min_incl_y,
-                             uint32_t max_excl_x,
-                             uint32_t max_excl_y) {
-  wuffs_base__rect_ie_u32 ret;
-  ret.min_incl_x = min_incl_x;
-  ret.min_incl_y = min_incl_y;
-  ret.max_excl_x = max_excl_x;
-  ret.max_excl_y = max_excl_y;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__rect_ie_u32__is_empty(const wuffs_base__rect_ie_u32* r) {
-  return (r->min_incl_x >= r->max_excl_x) || (r->min_incl_y >= r->max_excl_y);
-}
-
-static inline bool  //
-wuffs_base__rect_ie_u32__equals(const wuffs_base__rect_ie_u32* r,
-                                wuffs_base__rect_ie_u32 s) {
-  return (r->min_incl_x == s.min_incl_x && r->min_incl_y == s.min_incl_y &&
-          r->max_excl_x == s.max_excl_x && r->max_excl_y == s.max_excl_y) ||
-         (wuffs_base__rect_ie_u32__is_empty(r) &&
-          wuffs_base__rect_ie_u32__is_empty(&s));
-}
-
-static inline wuffs_base__rect_ie_u32  //
-wuffs_base__rect_ie_u32__intersect(const wuffs_base__rect_ie_u32* r,
-                                   wuffs_base__rect_ie_u32 s) {
-  wuffs_base__rect_ie_u32 t;
-  t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x);
-  t.min_incl_y = wuffs_base__u32__max(r->min_incl_y, s.min_incl_y);
-  t.max_excl_x = wuffs_base__u32__min(r->max_excl_x, s.max_excl_x);
-  t.max_excl_y = wuffs_base__u32__min(r->max_excl_y, s.max_excl_y);
-  return t;
-}
-
-static inline wuffs_base__rect_ie_u32  //
-wuffs_base__rect_ie_u32__unite(const wuffs_base__rect_ie_u32* r,
-                               wuffs_base__rect_ie_u32 s) {
-  if (wuffs_base__rect_ie_u32__is_empty(r)) {
-    return s;
-  }
-  if (wuffs_base__rect_ie_u32__is_empty(&s)) {
-    return *r;
-  }
-  wuffs_base__rect_ie_u32 t;
-  t.min_incl_x = wuffs_base__u32__min(r->min_incl_x, s.min_incl_x);
-  t.min_incl_y = wuffs_base__u32__min(r->min_incl_y, s.min_incl_y);
-  t.max_excl_x = wuffs_base__u32__max(r->max_excl_x, s.max_excl_x);
-  t.max_excl_y = wuffs_base__u32__max(r->max_excl_y, s.max_excl_y);
-  return t;
-}
-
-static inline bool  //
-wuffs_base__rect_ie_u32__contains(const wuffs_base__rect_ie_u32* r,
-                                  uint32_t x,
-                                  uint32_t y) {
-  return (r->min_incl_x <= x) && (x < r->max_excl_x) && (r->min_incl_y <= y) &&
-         (y < r->max_excl_y);
-}
-
-static inline bool  //
-wuffs_base__rect_ie_u32__contains_rect(const wuffs_base__rect_ie_u32* r,
-                                       wuffs_base__rect_ie_u32 s) {
-  return wuffs_base__rect_ie_u32__equals(
-      &s, wuffs_base__rect_ie_u32__intersect(r, s));
-}
-
-static inline uint32_t  //
-wuffs_base__rect_ie_u32__width(const wuffs_base__rect_ie_u32* r) {
-  return wuffs_base__u32__sat_sub(r->max_excl_x, r->min_incl_x);
-}
-
-static inline uint32_t  //
-wuffs_base__rect_ie_u32__height(const wuffs_base__rect_ie_u32* r) {
-  return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y);
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__rect_ie_u32::is_empty() const {
-  return wuffs_base__rect_ie_u32__is_empty(this);
-}
-
-inline bool  //
-wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) const {
-  return wuffs_base__rect_ie_u32__equals(this, s);
-}
-
-inline wuffs_base__rect_ie_u32  //
-wuffs_base__rect_ie_u32::intersect(wuffs_base__rect_ie_u32 s) const {
-  return wuffs_base__rect_ie_u32__intersect(this, s);
-}
-
-inline wuffs_base__rect_ie_u32  //
-wuffs_base__rect_ie_u32::unite(wuffs_base__rect_ie_u32 s) const {
-  return wuffs_base__rect_ie_u32__unite(this, s);
-}
-
-inline bool  //
-wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) const {
-  return wuffs_base__rect_ie_u32__contains(this, x, y);
-}
-
-inline bool  //
-wuffs_base__rect_ie_u32::contains_rect(wuffs_base__rect_ie_u32 s) const {
-  return wuffs_base__rect_ie_u32__contains_rect(this, s);
-}
-
-inline uint32_t  //
-wuffs_base__rect_ie_u32::width() const {
-  return wuffs_base__rect_ie_u32__width(this);
-}
-
-inline uint32_t  //
-wuffs_base__rect_ie_u32::height() const {
-  return wuffs_base__rect_ie_u32__height(this);
-}
-
-#endif  // __cplusplus
-
-// ---------------- More Information
-
-// wuffs_base__more_information holds additional fields, typically when a Wuffs
-// method returns a [note status](/doc/note/statuses.md).
-//
-// The flavor field follows the base38 namespace
-// convention](/doc/note/base38-and-fourcc.md). The other fields' semantics
-// depends on the flavor.
-typedef struct wuffs_base__more_information__struct {
-  uint32_t flavor;
-  uint32_t w;
-  uint64_t x;
-  uint64_t y;
-  uint64_t z;
-
-#ifdef __cplusplus
-  inline void set(uint32_t flavor_arg,
-                  uint32_t w_arg,
-                  uint64_t x_arg,
-                  uint64_t y_arg,
-                  uint64_t z_arg);
-  inline uint32_t io_redirect__fourcc() const;
-  inline wuffs_base__range_ie_u64 io_redirect__range() const;
-  inline uint64_t io_seek__position() const;
-  inline uint32_t metadata__fourcc() const;
-  inline wuffs_base__range_ie_u64 metadata_raw_passthrough__range() const;
-  inline int32_t metadata_parsed__chrm(uint32_t component) const;
-  inline uint32_t metadata_parsed__gama() const;
-  inline uint32_t metadata_parsed__srgb() const;
-#endif  // __cplusplus
-
-} wuffs_base__more_information;
-
-#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_REDIRECT 1
-#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_SEEK 2
-#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH 3
-#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_TRANSFORM 4
-#define WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED 5
-
-static inline wuffs_base__more_information  //
-wuffs_base__empty_more_information() {
-  wuffs_base__more_information ret;
-  ret.flavor = 0;
-  ret.w = 0;
-  ret.x = 0;
-  ret.y = 0;
-  ret.z = 0;
-  return ret;
-}
-
-static inline void  //
-wuffs_base__more_information__set(wuffs_base__more_information* m,
-                                  uint32_t flavor,
-                                  uint32_t w,
-                                  uint64_t x,
-                                  uint64_t y,
-                                  uint64_t z) {
-  if (!m) {
-    return;
-  }
-  m->flavor = flavor;
-  m->w = w;
-  m->x = x;
-  m->y = y;
-  m->z = z;
-}
-
-static inline uint32_t  //
-wuffs_base__more_information__io_redirect__fourcc(
-    const wuffs_base__more_information* m) {
-  return m->w;
-}
-
-static inline wuffs_base__range_ie_u64  //
-wuffs_base__more_information__io_redirect__range(
-    const wuffs_base__more_information* m) {
-  wuffs_base__range_ie_u64 ret;
-  ret.min_incl = m->y;
-  ret.max_excl = m->z;
-  return ret;
-}
-
-static inline uint64_t  //
-wuffs_base__more_information__io_seek__position(
-    const wuffs_base__more_information* m) {
-  return m->x;
-}
-
-static inline uint32_t  //
-wuffs_base__more_information__metadata__fourcc(
-    const wuffs_base__more_information* m) {
-  return m->w;
-}
-
-static inline wuffs_base__range_ie_u64  //
-wuffs_base__more_information__metadata_raw_passthrough__range(
-    const wuffs_base__more_information* m) {
-  wuffs_base__range_ie_u64 ret;
-  ret.min_incl = m->y;
-  ret.max_excl = m->z;
-  return ret;
-}
-
-#define WUFFS_BASE__MORE_INFORMATION__METADATA_PARSED__CHRM__WHITE_X 0
-#define WUFFS_BASE__MORE_INFORMATION__METADATA_PARSED__CHRM__WHITE_Y 1
-#define WUFFS_BASE__MORE_INFORMATION__METADATA_PARSED__CHRM__RED_X 2
-#define WUFFS_BASE__MORE_INFORMATION__METADATA_PARSED__CHRM__RED_Y 3
-#define WUFFS_BASE__MORE_INFORMATION__METADATA_PARSED__CHRM__GREEN_X 4
-#define WUFFS_BASE__MORE_INFORMATION__METADATA_PARSED__CHRM__GREEN_Y 5
-#define WUFFS_BASE__MORE_INFORMATION__METADATA_PARSED__CHRM__BLUE_X 6
-#define WUFFS_BASE__MORE_INFORMATION__METADATA_PARSED__CHRM__BLUE_Y 7
-
-// wuffs_base__more_information__metadata_parsed__chrm returns chromaticity
-// values (scaled by 100000) like the PNG "cHRM" chunk. For example, the sRGB
-// color space corresponds to:
-//  - ETC__CHRM__WHITE_X 31270
-//  - ETC__CHRM__WHITE_Y 32900
-//  - ETC__CHRM__RED_X   64000
-//  - ETC__CHRM__RED_Y   33000
-//  - ETC__CHRM__GREEN_X 30000
-//  - ETC__CHRM__GREEN_Y 60000
-//  - ETC__CHRM__BLUE_X  15000
-//  - ETC__CHRM__BLUE_Y   6000
-//
-// See
-// https://ciechanow.ski/color-spaces/#chromaticity-and-white-point-coordinates
-static inline int32_t  //
-wuffs_base__more_information__metadata_parsed__chrm(
-    const wuffs_base__more_information* m,
-    uint32_t component) {
-  // After the flavor and the w field (holding a FourCC), a
-  // wuffs_base__more_information holds 24 bytes of data in three uint64_t
-  // typed fields (x, y and z). We pack the eight chromaticity values (wx, wy,
-  // rx, ..., by), basically int24_t values, into 24 bytes like this:
-  //  -    LSB                 MSB
-  //  - x: wx wx wx wy wy wy rx rx
-  //  - y: rx ry ry ry gx gx gx gy
-  //  - z: gy gy bx bx bx by by by
-  uint32_t u = 0;
-  switch (component & 7) {
-    case 0:
-      u = ((uint32_t)(m->x >> 0));
-      break;
-    case 1:
-      u = ((uint32_t)(m->x >> 24));
-      break;
-    case 2:
-      u = ((uint32_t)((m->x >> 48) | (m->y << 16)));
-      break;
-    case 3:
-      u = ((uint32_t)(m->y >> 8));
-      break;
-    case 4:
-      u = ((uint32_t)(m->y >> 32));
-      break;
-    case 5:
-      u = ((uint32_t)((m->y >> 56) | (m->z << 8)));
-      break;
-    case 6:
-      u = ((uint32_t)(m->z >> 16));
-      break;
-    case 7:
-      u = ((uint32_t)(m->z >> 40));
-      break;
-  }
-  // The left-right shifts sign-extend from 24-bit to 32-bit integers.
-  return ((int32_t)(u << 8)) >> 8;
-}
-
-// wuffs_base__more_information__metadata_parsed__gama returns inverse gamma
-// correction values (scaled by 100000) like the PNG "gAMA" chunk. For example,
-// for gamma = 2.2, this returns 45455 (approximating 100000 / 2.2).
-static inline uint32_t  //
-wuffs_base__more_information__metadata_parsed__gama(
-    const wuffs_base__more_information* m) {
-  return ((uint32_t)(m->x));
-}
-
-#define WUFFS_BASE__SRGB_RENDERING_INTENT__PERCEPTUAL 0
-#define WUFFS_BASE__SRGB_RENDERING_INTENT__RELATIVE_COLORIMETRIC 1
-#define WUFFS_BASE__SRGB_RENDERING_INTENT__SATURATION 2
-#define WUFFS_BASE__SRGB_RENDERING_INTENT__ABSOLUTE_COLORIMETRIC 3
-
-// wuffs_base__more_information__metadata_parsed__srgb returns the sRGB
-// rendering intent like the PNG "sRGB" chunk.
-static inline uint32_t  //
-wuffs_base__more_information__metadata_parsed__srgb(
-    const wuffs_base__more_information* m) {
-  return m->x & 3;
-}
-
-#ifdef __cplusplus
-
-inline void  //
-wuffs_base__more_information::set(uint32_t flavor_arg,
-                                  uint32_t w_arg,
-                                  uint64_t x_arg,
-                                  uint64_t y_arg,
-                                  uint64_t z_arg) {
-  wuffs_base__more_information__set(this, flavor_arg, w_arg, x_arg, y_arg,
-                                    z_arg);
-}
-
-inline uint32_t  //
-wuffs_base__more_information::io_redirect__fourcc() const {
-  return wuffs_base__more_information__io_redirect__fourcc(this);
-}
-
-inline wuffs_base__range_ie_u64  //
-wuffs_base__more_information::io_redirect__range() const {
-  return wuffs_base__more_information__io_redirect__range(this);
-}
-
-inline uint64_t  //
-wuffs_base__more_information::io_seek__position() const {
-  return wuffs_base__more_information__io_seek__position(this);
-}
-
-inline uint32_t  //
-wuffs_base__more_information::metadata__fourcc() const {
-  return wuffs_base__more_information__metadata__fourcc(this);
-}
-
-inline wuffs_base__range_ie_u64  //
-wuffs_base__more_information::metadata_raw_passthrough__range() const {
-  return wuffs_base__more_information__metadata_raw_passthrough__range(this);
-}
-
-inline int32_t  //
-wuffs_base__more_information::metadata_parsed__chrm(uint32_t component) const {
-  return wuffs_base__more_information__metadata_parsed__chrm(this, component);
-}
-
-inline uint32_t  //
-wuffs_base__more_information::metadata_parsed__gama() const {
-  return wuffs_base__more_information__metadata_parsed__gama(this);
-}
-
-inline uint32_t  //
-wuffs_base__more_information::metadata_parsed__srgb() const {
-  return wuffs_base__more_information__metadata_parsed__srgb(this);
-}
-
-#endif  // __cplusplus
-
-// ---------------- I/O
-//
-// See (/doc/note/io-input-output.md).
-
-// wuffs_base__io_buffer_meta is the metadata for a wuffs_base__io_buffer's
-// data.
-typedef struct wuffs_base__io_buffer_meta__struct {
-  size_t wi;     // Write index. Invariant: wi <= len.
-  size_t ri;     // Read  index. Invariant: ri <= wi.
-  uint64_t pos;  // Buffer position (relative to the start of stream).
-  bool closed;   // No further writes are expected.
-} wuffs_base__io_buffer_meta;
-
-// wuffs_base__io_buffer is a 1-dimensional buffer (a pointer and length) plus
-// additional metadata.
-//
-// A value with all fields zero is a valid, empty buffer.
-typedef struct wuffs_base__io_buffer__struct {
-  wuffs_base__slice_u8 data;
-  wuffs_base__io_buffer_meta meta;
-
-#ifdef __cplusplus
-  inline bool is_valid() const;
-  inline void compact();
-  inline size_t reader_length() const;
-  inline uint8_t* reader_pointer() const;
-  inline uint64_t reader_position() const;
-  inline wuffs_base__slice_u8 reader_slice() const;
-  inline size_t writer_length() const;
-  inline uint8_t* writer_pointer() const;
-  inline uint64_t writer_position() const;
-  inline wuffs_base__slice_u8 writer_slice() const;
-#endif  // __cplusplus
-
-} wuffs_base__io_buffer;
-
-static inline wuffs_base__io_buffer  //
-wuffs_base__make_io_buffer(wuffs_base__slice_u8 data,
-                           wuffs_base__io_buffer_meta meta) {
-  wuffs_base__io_buffer ret;
-  ret.data = data;
-  ret.meta = meta;
-  return ret;
-}
-
-static inline wuffs_base__io_buffer_meta  //
-wuffs_base__make_io_buffer_meta(size_t wi,
-                                size_t ri,
-                                uint64_t pos,
-                                bool closed) {
-  wuffs_base__io_buffer_meta ret;
-  ret.wi = wi;
-  ret.ri = ri;
-  ret.pos = pos;
-  ret.closed = closed;
-  return ret;
-}
-
-static inline wuffs_base__io_buffer  //
-wuffs_base__ptr_u8__reader(uint8_t* ptr, size_t len, bool closed) {
-  wuffs_base__io_buffer ret;
-  ret.data.ptr = ptr;
-  ret.data.len = len;
-  ret.meta.wi = len;
-  ret.meta.ri = 0;
-  ret.meta.pos = 0;
-  ret.meta.closed = closed;
-  return ret;
-}
-
-static inline wuffs_base__io_buffer  //
-wuffs_base__ptr_u8__writer(uint8_t* ptr, size_t len) {
-  wuffs_base__io_buffer ret;
-  ret.data.ptr = ptr;
-  ret.data.len = len;
-  ret.meta.wi = 0;
-  ret.meta.ri = 0;
-  ret.meta.pos = 0;
-  ret.meta.closed = false;
-  return ret;
-}
-
-static inline wuffs_base__io_buffer  //
-wuffs_base__slice_u8__reader(wuffs_base__slice_u8 s, bool closed) {
-  wuffs_base__io_buffer ret;
-  ret.data.ptr = s.ptr;
-  ret.data.len = s.len;
-  ret.meta.wi = s.len;
-  ret.meta.ri = 0;
-  ret.meta.pos = 0;
-  ret.meta.closed = closed;
-  return ret;
-}
-
-static inline wuffs_base__io_buffer  //
-wuffs_base__slice_u8__writer(wuffs_base__slice_u8 s) {
-  wuffs_base__io_buffer ret;
-  ret.data.ptr = s.ptr;
-  ret.data.len = s.len;
-  ret.meta.wi = 0;
-  ret.meta.ri = 0;
-  ret.meta.pos = 0;
-  ret.meta.closed = false;
-  return ret;
-}
-
-static inline wuffs_base__io_buffer  //
-wuffs_base__empty_io_buffer() {
-  wuffs_base__io_buffer ret;
-  ret.data.ptr = NULL;
-  ret.data.len = 0;
-  ret.meta.wi = 0;
-  ret.meta.ri = 0;
-  ret.meta.pos = 0;
-  ret.meta.closed = false;
-  return ret;
-}
-
-static inline wuffs_base__io_buffer_meta  //
-wuffs_base__empty_io_buffer_meta() {
-  wuffs_base__io_buffer_meta ret;
-  ret.wi = 0;
-  ret.ri = 0;
-  ret.pos = 0;
-  ret.closed = false;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__io_buffer__is_valid(const wuffs_base__io_buffer* buf) {
-  if (buf) {
-    if (buf->data.ptr) {
-      return (buf->meta.ri <= buf->meta.wi) && (buf->meta.wi <= buf->data.len);
-    } else {
-      return (buf->meta.ri == 0) && (buf->meta.wi == 0) && (buf->data.len == 0);
-    }
-  }
-  return false;
-}
-
-// wuffs_base__io_buffer__compact moves any written but unread bytes to the
-// start of the buffer.
-static inline void  //
-wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
-  if (!buf || (buf->meta.ri == 0)) {
-    return;
-  }
-  buf->meta.pos = wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri);
-  size_t n = buf->meta.wi - buf->meta.ri;
-  if (n != 0) {
-    memmove(buf->data.ptr, buf->data.ptr + buf->meta.ri, n);
-  }
-  buf->meta.wi = n;
-  buf->meta.ri = 0;
-}
-
-static inline size_t  //
-wuffs_base__io_buffer__reader_length(const wuffs_base__io_buffer* buf) {
-  return buf ? buf->meta.wi - buf->meta.ri : 0;
-}
-
-static inline uint8_t*  //
-wuffs_base__io_buffer__reader_pointer(const wuffs_base__io_buffer* buf) {
-  return buf ? (buf->data.ptr + buf->meta.ri) : NULL;
-}
-
-static inline uint64_t  //
-wuffs_base__io_buffer__reader_position(const wuffs_base__io_buffer* buf) {
-  return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0;
-}
-
-static inline wuffs_base__slice_u8  //
-wuffs_base__io_buffer__reader_slice(const wuffs_base__io_buffer* buf) {
-  return buf ? wuffs_base__make_slice_u8(buf->data.ptr + buf->meta.ri,
-                                         buf->meta.wi - buf->meta.ri)
-             : wuffs_base__empty_slice_u8();
-}
-
-static inline size_t  //
-wuffs_base__io_buffer__writer_length(const wuffs_base__io_buffer* buf) {
-  return buf ? buf->data.len - buf->meta.wi : 0;
-}
-
-static inline uint8_t*  //
-wuffs_base__io_buffer__writer_pointer(const wuffs_base__io_buffer* buf) {
-  return buf ? (buf->data.ptr + buf->meta.wi) : NULL;
-}
-
-static inline uint64_t  //
-wuffs_base__io_buffer__writer_position(const wuffs_base__io_buffer* buf) {
-  return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;
-}
-
-static inline wuffs_base__slice_u8  //
-wuffs_base__io_buffer__writer_slice(const wuffs_base__io_buffer* buf) {
-  return buf ? wuffs_base__make_slice_u8(buf->data.ptr + buf->meta.wi,
-                                         buf->data.len - buf->meta.wi)
-             : wuffs_base__empty_slice_u8();
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__io_buffer::is_valid() const {
-  return wuffs_base__io_buffer__is_valid(this);
-}
-
-inline void  //
-wuffs_base__io_buffer::compact() {
-  wuffs_base__io_buffer__compact(this);
-}
-
-inline size_t  //
-wuffs_base__io_buffer::reader_length() const {
-  return wuffs_base__io_buffer__reader_length(this);
-}
-
-inline uint8_t*  //
-wuffs_base__io_buffer::reader_pointer() const {
-  return wuffs_base__io_buffer__reader_pointer(this);
-}
-
-inline uint64_t  //
-wuffs_base__io_buffer::reader_position() const {
-  return wuffs_base__io_buffer__reader_position(this);
-}
-
-inline wuffs_base__slice_u8  //
-wuffs_base__io_buffer::reader_slice() const {
-  return wuffs_base__io_buffer__reader_slice(this);
-}
-
-inline size_t  //
-wuffs_base__io_buffer::writer_length() const {
-  return wuffs_base__io_buffer__writer_length(this);
-}
-
-inline uint8_t*  //
-wuffs_base__io_buffer::writer_pointer() const {
-  return wuffs_base__io_buffer__writer_pointer(this);
-}
-
-inline uint64_t  //
-wuffs_base__io_buffer::writer_position() const {
-  return wuffs_base__io_buffer__writer_position(this);
-}
-
-inline wuffs_base__slice_u8  //
-wuffs_base__io_buffer::writer_slice() const {
-  return wuffs_base__io_buffer__writer_slice(this);
-}
-
-#endif  // __cplusplus
-
-// ---------------- Tokens
-
-// wuffs_base__token is an element of a byte stream's tokenization.
-//
-// See https://github.com/google/wuffs/blob/main/doc/note/tokens.md
-typedef struct wuffs_base__token__struct {
-  uint64_t repr;
-
-#ifdef __cplusplus
-  inline int64_t value() const;
-  inline int64_t value_extension() const;
-  inline int64_t value_major() const;
-  inline int64_t value_base_category() const;
-  inline uint64_t value_minor() const;
-  inline uint64_t value_base_detail() const;
-  inline int64_t value_base_detail__sign_extended() const;
-  inline bool continued() const;
-  inline uint64_t length() const;
-#endif  // __cplusplus
-
-} wuffs_base__token;
-
-static inline wuffs_base__token  //
-wuffs_base__make_token(uint64_t repr) {
-  wuffs_base__token ret;
-  ret.repr = repr;
-  return ret;
-}
-
-// --------
-
-#define WUFFS_BASE__TOKEN__LENGTH__MAX_INCL 0xFFFF
-
-#define WUFFS_BASE__TOKEN__VALUE__SHIFT 17
-#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT 17
-#define WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT 42
-#define WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT 17
-#define WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT 38
-#define WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT 17
-#define WUFFS_BASE__TOKEN__CONTINUED__SHIFT 16
-#define WUFFS_BASE__TOKEN__LENGTH__SHIFT 0
-
-#define WUFFS_BASE__TOKEN__VALUE_EXTENSION__NUM_BITS 46
-
-// --------
-
-#define WUFFS_BASE__TOKEN__VBC__FILLER 0
-#define WUFFS_BASE__TOKEN__VBC__STRUCTURE 1
-#define WUFFS_BASE__TOKEN__VBC__STRING 2
-#define WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT 3
-#define WUFFS_BASE__TOKEN__VBC__LITERAL 4
-#define WUFFS_BASE__TOKEN__VBC__NUMBER 5
-#define WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_SIGNED 6
-#define WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_UNSIGNED 7
-
-// --------
-
-#define WUFFS_BASE__TOKEN__VBD__FILLER__PUNCTUATION 0x00001
-#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_BLOCK 0x00002
-#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_LINE 0x00004
-
-// COMMENT_ANY is a bit-wise or of COMMENT_BLOCK AND COMMENT_LINE.
-#define WUFFS_BASE__TOKEN__VBD__FILLER__COMMENT_ANY 0x00006
-
-// --------
-
-#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH 0x00001
-#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__POP 0x00002
-#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_NONE 0x00010
-#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_LIST 0x00020
-#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_DICT 0x00040
-#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_NONE 0x01000
-#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_LIST 0x02000
-#define WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_DICT 0x04000
-
-// --------
-
-// DEFINITELY_FOO means that the destination bytes (and also the source bytes,
-// for 1_DST_1_SRC_COPY) are in the FOO format. Definitely means that the lack
-// of the bit means "maybe FOO". It does not necessarily mean "not FOO".
-//
-// CHAIN_ETC means that decoding the entire token chain forms a UTF-8 or ASCII
-// string, not just this current token. CHAIN_ETC_UTF_8 therefore distinguishes
-// Unicode (UTF-8) strings from byte strings. MUST means that the the token
-// producer (e.g. parser) must verify this. SHOULD means that the token
-// consumer (e.g. renderer) should verify this.
-//
-// When a CHAIN_ETC_UTF_8 bit is set, the parser must ensure that non-ASCII
-// code points (with multi-byte UTF-8 encodings) do not straddle token
-// boundaries. Checking UTF-8 validity can inspect each token separately.
-//
-// The lack of any particular bit is conservative: it is valid for all-ASCII
-// strings, in a single- or multi-token chain, to have none of these bits set.
-#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_UTF_8 0x00001
-#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_UTF_8 0x00002
-#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_SHOULD_BE_UTF_8 0x00004
-#define WUFFS_BASE__TOKEN__VBD__STRING__DEFINITELY_ASCII 0x00010
-#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_ASCII 0x00020
-#define WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_SHOULD_BE_ASCII 0x00040
-
-// CONVERT_D_DST_S_SRC means that multiples of S source bytes (possibly padded)
-// produces multiples of D destination bytes. For example,
-// CONVERT_1_DST_4_SRC_BACKSLASH_X means a source like "\\x23\\x67\\xAB", where
-// 12 src bytes encode 3 dst bytes.
-//
-// Post-processing may further transform those D destination bytes (e.g. treat
-// "\\xFF" as the Unicode code point U+00FF instead of the byte 0xFF), but that
-// is out of scope of this VBD's semantics.
-//
-// When src is the empty string, multiple conversion algorithms are applicable
-// (so these bits are not necessarily mutually exclusive), all producing the
-// same empty dst string.
-#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP 0x00100
-#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_1_SRC_COPY 0x00200
-#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_2_SRC_HEXADECIMAL 0x00400
-#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_4_SRC_BACKSLASH_X 0x00800
-#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_3_DST_4_SRC_BASE_64_STD 0x01000
-#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_3_DST_4_SRC_BASE_64_URL 0x02000
-#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_4_DST_5_SRC_ASCII_85 0x04000
-#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_5_DST_8_SRC_BASE_32_HEX 0x08000
-#define WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_5_DST_8_SRC_BASE_32_STD 0x10000
-
-// --------
-
-#define WUFFS_BASE__TOKEN__VBD__LITERAL__UNDEFINED 0x00001
-#define WUFFS_BASE__TOKEN__VBD__LITERAL__NULL 0x00002
-#define WUFFS_BASE__TOKEN__VBD__LITERAL__FALSE 0x00004
-#define WUFFS_BASE__TOKEN__VBD__LITERAL__TRUE 0x00008
-
-// --------
-
-// For a source string of "123" or "0x9A", it is valid for a tokenizer to
-// return any combination of:
-//  - WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT.
-//  - WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_SIGNED.
-//  - WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_UNSIGNED.
-//
-// For a source string of "+123" or "-0x9A", only the first two are valid.
-//
-// For a source string of "123.", only the first one is valid.
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT 0x00001
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_SIGNED 0x00002
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_UNSIGNED 0x00004
-
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_NEG_INF 0x00010
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_POS_INF 0x00020
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_NEG_NAN 0x00040
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_POS_NAN 0x00080
-
-// The number 300 might be represented as "\x01\x2C", "\x2C\x01\x00\x00" or
-// "300", which are big-endian, little-endian or text. For binary formats, the
-// token length (after adjusting for FORMAT_IGNORE_ETC) discriminates
-// e.g. u16 little-endian vs u32 little-endian.
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN 0x00100
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_LITTLE_ENDIAN 0x00200
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_TEXT 0x00400
-
-#define WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE 0x01000
-
-// --------
-
-// wuffs_base__token__value returns the token's high 46 bits, sign-extended. A
-// negative value means an extended token, non-negative means a simple token.
-static inline int64_t  //
-wuffs_base__token__value(const wuffs_base__token* t) {
-  return ((int64_t)(t->repr)) >> WUFFS_BASE__TOKEN__VALUE__SHIFT;
-}
-
-// wuffs_base__token__value_extension returns a negative value if the token was
-// not an extended token.
-static inline int64_t  //
-wuffs_base__token__value_extension(const wuffs_base__token* t) {
-  return (~(int64_t)(t->repr)) >> WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT;
-}
-
-// wuffs_base__token__value_major returns a negative value if the token was not
-// a simple token.
-static inline int64_t  //
-wuffs_base__token__value_major(const wuffs_base__token* t) {
-  return ((int64_t)(t->repr)) >> WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT;
-}
-
-// wuffs_base__token__value_base_category returns a negative value if the token
-// was not a simple token.
-static inline int64_t  //
-wuffs_base__token__value_base_category(const wuffs_base__token* t) {
-  return ((int64_t)(t->repr)) >> WUFFS_BASE__TOKEN__VALUE_BASE_CATEGORY__SHIFT;
-}
-
-static inline uint64_t  //
-wuffs_base__token__value_minor(const wuffs_base__token* t) {
-  return (t->repr >> WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) & 0x1FFFFFF;
-}
-
-static inline uint64_t  //
-wuffs_base__token__value_base_detail(const wuffs_base__token* t) {
-  return (t->repr >> WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT) & 0x1FFFFF;
-}
-
-static inline int64_t  //
-wuffs_base__token__value_base_detail__sign_extended(
-    const wuffs_base__token* t) {
-  // The VBD is 21 bits in the middle of t->repr. Left shift the high (64 - 21
-  // - ETC__SHIFT) bits off, then right shift (sign-extending) back down.
-  uint64_t u = t->repr << (43 - WUFFS_BASE__TOKEN__VALUE_BASE_DETAIL__SHIFT);
-  return ((int64_t)u) >> 43;
-}
-
-static inline bool  //
-wuffs_base__token__continued(const wuffs_base__token* t) {
-  return t->repr & 0x10000;
-}
-
-static inline uint64_t  //
-wuffs_base__token__length(const wuffs_base__token* t) {
-  return (t->repr >> WUFFS_BASE__TOKEN__LENGTH__SHIFT) & 0xFFFF;
-}
-
-#ifdef __cplusplus
-
-inline int64_t  //
-wuffs_base__token::value() const {
-  return wuffs_base__token__value(this);
-}
-
-inline int64_t  //
-wuffs_base__token::value_extension() const {
-  return wuffs_base__token__value_extension(this);
-}
-
-inline int64_t  //
-wuffs_base__token::value_major() const {
-  return wuffs_base__token__value_major(this);
-}
-
-inline int64_t  //
-wuffs_base__token::value_base_category() const {
-  return wuffs_base__token__value_base_category(this);
-}
-
-inline uint64_t  //
-wuffs_base__token::value_minor() const {
-  return wuffs_base__token__value_minor(this);
-}
-
-inline uint64_t  //
-wuffs_base__token::value_base_detail() const {
-  return wuffs_base__token__value_base_detail(this);
-}
-
-inline int64_t  //
-wuffs_base__token::value_base_detail__sign_extended() const {
-  return wuffs_base__token__value_base_detail__sign_extended(this);
-}
-
-inline bool  //
-wuffs_base__token::continued() const {
-  return wuffs_base__token__continued(this);
-}
-
-inline uint64_t  //
-wuffs_base__token::length() const {
-  return wuffs_base__token__length(this);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef WUFFS_BASE__SLICE(wuffs_base__token) wuffs_base__slice_token;
-
-static inline wuffs_base__slice_token  //
-wuffs_base__make_slice_token(wuffs_base__token* ptr, size_t len) {
-  wuffs_base__slice_token ret;
-  ret.ptr = ptr;
-  ret.len = len;
-  return ret;
-}
-
-static inline wuffs_base__slice_token  //
-wuffs_base__empty_slice_token() {
-  wuffs_base__slice_token ret;
-  ret.ptr = NULL;
-  ret.len = 0;
-  return ret;
-}
-
-// --------
-
-// wuffs_base__token_buffer_meta is the metadata for a
-// wuffs_base__token_buffer's data.
-typedef struct wuffs_base__token_buffer_meta__struct {
-  size_t wi;     // Write index. Invariant: wi <= len.
-  size_t ri;     // Read  index. Invariant: ri <= wi.
-  uint64_t pos;  // Position of the buffer start relative to the stream start.
-  bool closed;   // No further writes are expected.
-} wuffs_base__token_buffer_meta;
-
-// wuffs_base__token_buffer is a 1-dimensional buffer (a pointer and length)
-// plus additional metadata.
-//
-// A value with all fields zero is a valid, empty buffer.
-typedef struct wuffs_base__token_buffer__struct {
-  wuffs_base__slice_token data;
-  wuffs_base__token_buffer_meta meta;
-
-#ifdef __cplusplus
-  inline bool is_valid() const;
-  inline void compact();
-  inline uint64_t reader_length() const;
-  inline wuffs_base__token* reader_pointer() const;
-  inline wuffs_base__slice_token reader_slice() const;
-  inline uint64_t reader_token_position() const;
-  inline uint64_t writer_length() const;
-  inline uint64_t writer_token_position() const;
-  inline wuffs_base__token* writer_pointer() const;
-  inline wuffs_base__slice_token writer_slice() const;
-#endif  // __cplusplus
-
-} wuffs_base__token_buffer;
-
-static inline wuffs_base__token_buffer  //
-wuffs_base__make_token_buffer(wuffs_base__slice_token data,
-                              wuffs_base__token_buffer_meta meta) {
-  wuffs_base__token_buffer ret;
-  ret.data = data;
-  ret.meta = meta;
-  return ret;
-}
-
-static inline wuffs_base__token_buffer_meta  //
-wuffs_base__make_token_buffer_meta(size_t wi,
-                                   size_t ri,
-                                   uint64_t pos,
-                                   bool closed) {
-  wuffs_base__token_buffer_meta ret;
-  ret.wi = wi;
-  ret.ri = ri;
-  ret.pos = pos;
-  ret.closed = closed;
-  return ret;
-}
-
-static inline wuffs_base__token_buffer  //
-wuffs_base__slice_token__reader(wuffs_base__slice_token s, bool closed) {
-  wuffs_base__token_buffer ret;
-  ret.data.ptr = s.ptr;
-  ret.data.len = s.len;
-  ret.meta.wi = s.len;
-  ret.meta.ri = 0;
-  ret.meta.pos = 0;
-  ret.meta.closed = closed;
-  return ret;
-}
-
-static inline wuffs_base__token_buffer  //
-wuffs_base__slice_token__writer(wuffs_base__slice_token s) {
-  wuffs_base__token_buffer ret;
-  ret.data.ptr = s.ptr;
-  ret.data.len = s.len;
-  ret.meta.wi = 0;
-  ret.meta.ri = 0;
-  ret.meta.pos = 0;
-  ret.meta.closed = false;
-  return ret;
-}
-
-static inline wuffs_base__token_buffer  //
-wuffs_base__empty_token_buffer() {
-  wuffs_base__token_buffer ret;
-  ret.data.ptr = NULL;
-  ret.data.len = 0;
-  ret.meta.wi = 0;
-  ret.meta.ri = 0;
-  ret.meta.pos = 0;
-  ret.meta.closed = false;
-  return ret;
-}
-
-static inline wuffs_base__token_buffer_meta  //
-wuffs_base__empty_token_buffer_meta() {
-  wuffs_base__token_buffer_meta ret;
-  ret.wi = 0;
-  ret.ri = 0;
-  ret.pos = 0;
-  ret.closed = false;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__token_buffer__is_valid(const wuffs_base__token_buffer* buf) {
-  if (buf) {
-    if (buf->data.ptr) {
-      return (buf->meta.ri <= buf->meta.wi) && (buf->meta.wi <= buf->data.len);
-    } else {
-      return (buf->meta.ri == 0) && (buf->meta.wi == 0) && (buf->data.len == 0);
-    }
-  }
-  return false;
-}
-
-// wuffs_base__token_buffer__compact moves any written but unread tokens to the
-// start of the buffer.
-static inline void  //
-wuffs_base__token_buffer__compact(wuffs_base__token_buffer* buf) {
-  if (!buf || (buf->meta.ri == 0)) {
-    return;
-  }
-  buf->meta.pos = wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri);
-  size_t n = buf->meta.wi - buf->meta.ri;
-  if (n != 0) {
-    memmove(buf->data.ptr, buf->data.ptr + buf->meta.ri,
-            n * sizeof(wuffs_base__token));
-  }
-  buf->meta.wi = n;
-  buf->meta.ri = 0;
-}
-
-static inline uint64_t  //
-wuffs_base__token_buffer__reader_length(const wuffs_base__token_buffer* buf) {
-  return buf ? buf->meta.wi - buf->meta.ri : 0;
-}
-
-static inline wuffs_base__token*  //
-wuffs_base__token_buffer__reader_pointer(const wuffs_base__token_buffer* buf) {
-  return buf ? (buf->data.ptr + buf->meta.ri) : NULL;
-}
-
-static inline wuffs_base__slice_token  //
-wuffs_base__token_buffer__reader_slice(const wuffs_base__token_buffer* buf) {
-  return buf ? wuffs_base__make_slice_token(buf->data.ptr + buf->meta.ri,
-                                            buf->meta.wi - buf->meta.ri)
-             : wuffs_base__empty_slice_token();
-}
-
-static inline uint64_t  //
-wuffs_base__token_buffer__reader_token_position(
-    const wuffs_base__token_buffer* buf) {
-  return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0;
-}
-
-static inline uint64_t  //
-wuffs_base__token_buffer__writer_length(const wuffs_base__token_buffer* buf) {
-  return buf ? buf->data.len - buf->meta.wi : 0;
-}
-
-static inline wuffs_base__token*  //
-wuffs_base__token_buffer__writer_pointer(const wuffs_base__token_buffer* buf) {
-  return buf ? (buf->data.ptr + buf->meta.wi) : NULL;
-}
-
-static inline wuffs_base__slice_token  //
-wuffs_base__token_buffer__writer_slice(const wuffs_base__token_buffer* buf) {
-  return buf ? wuffs_base__make_slice_token(buf->data.ptr + buf->meta.wi,
-                                            buf->data.len - buf->meta.wi)
-             : wuffs_base__empty_slice_token();
-}
-
-static inline uint64_t  //
-wuffs_base__token_buffer__writer_token_position(
-    const wuffs_base__token_buffer* buf) {
-  return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__token_buffer::is_valid() const {
-  return wuffs_base__token_buffer__is_valid(this);
-}
-
-inline void  //
-wuffs_base__token_buffer::compact() {
-  wuffs_base__token_buffer__compact(this);
-}
-
-inline uint64_t  //
-wuffs_base__token_buffer::reader_length() const {
-  return wuffs_base__token_buffer__reader_length(this);
-}
-
-inline wuffs_base__token*  //
-wuffs_base__token_buffer::reader_pointer() const {
-  return wuffs_base__token_buffer__reader_pointer(this);
-}
-
-inline wuffs_base__slice_token  //
-wuffs_base__token_buffer::reader_slice() const {
-  return wuffs_base__token_buffer__reader_slice(this);
-}
-
-inline uint64_t  //
-wuffs_base__token_buffer::reader_token_position() const {
-  return wuffs_base__token_buffer__reader_token_position(this);
-}
-
-inline uint64_t  //
-wuffs_base__token_buffer::writer_length() const {
-  return wuffs_base__token_buffer__writer_length(this);
-}
-
-inline wuffs_base__token*  //
-wuffs_base__token_buffer::writer_pointer() const {
-  return wuffs_base__token_buffer__writer_pointer(this);
-}
-
-inline wuffs_base__slice_token  //
-wuffs_base__token_buffer::writer_slice() const {
-  return wuffs_base__token_buffer__writer_slice(this);
-}
-
-inline uint64_t  //
-wuffs_base__token_buffer::writer_token_position() const {
-  return wuffs_base__token_buffer__writer_token_position(this);
-}
-
-#endif  // __cplusplus
-
-// ---------------- Memory Allocation
-
-// The memory allocation related functions in this section aren't used by Wuffs
-// per se, but they may be helpful to the code that uses Wuffs.
-
-// wuffs_base__malloc_slice_uxx wraps calling a malloc-like function, except
-// that it takes a uint64_t number of elements instead of a size_t size in
-// bytes, and it returns a slice (a pointer and a length) instead of just a
-// pointer.
-//
-// You can pass the C stdlib's malloc as the malloc_func.
-//
-// It returns an empty slice (containing a NULL ptr field) if (num_uxx *
-// sizeof(uintxx_t)) would overflow SIZE_MAX.
-
-static inline wuffs_base__slice_u8  //
-wuffs_base__malloc_slice_u8(void* (*malloc_func)(size_t), uint64_t num_u8) {
-  if (malloc_func && (num_u8 <= (SIZE_MAX / sizeof(uint8_t)))) {
-    void* p = (*malloc_func)((size_t)(num_u8 * sizeof(uint8_t)));
-    if (p) {
-      return wuffs_base__make_slice_u8((uint8_t*)(p), (size_t)num_u8);
-    }
-  }
-  return wuffs_base__make_slice_u8(NULL, 0);
-}
-
-static inline wuffs_base__slice_u16  //
-wuffs_base__malloc_slice_u16(void* (*malloc_func)(size_t), uint64_t num_u16) {
-  if (malloc_func && (num_u16 <= (SIZE_MAX / sizeof(uint16_t)))) {
-    void* p = (*malloc_func)((size_t)(num_u16 * sizeof(uint16_t)));
-    if (p) {
-      return wuffs_base__make_slice_u16((uint16_t*)(p), (size_t)num_u16);
-    }
-  }
-  return wuffs_base__make_slice_u16(NULL, 0);
-}
-
-static inline wuffs_base__slice_u32  //
-wuffs_base__malloc_slice_u32(void* (*malloc_func)(size_t), uint64_t num_u32) {
-  if (malloc_func && (num_u32 <= (SIZE_MAX / sizeof(uint32_t)))) {
-    void* p = (*malloc_func)((size_t)(num_u32 * sizeof(uint32_t)));
-    if (p) {
-      return wuffs_base__make_slice_u32((uint32_t*)(p), (size_t)num_u32);
-    }
-  }
-  return wuffs_base__make_slice_u32(NULL, 0);
-}
-
-static inline wuffs_base__slice_u64  //
-wuffs_base__malloc_slice_u64(void* (*malloc_func)(size_t), uint64_t num_u64) {
-  if (malloc_func && (num_u64 <= (SIZE_MAX / sizeof(uint64_t)))) {
-    void* p = (*malloc_func)((size_t)(num_u64 * sizeof(uint64_t)));
-    if (p) {
-      return wuffs_base__make_slice_u64((uint64_t*)(p), (size_t)num_u64);
-    }
-  }
-  return wuffs_base__make_slice_u64(NULL, 0);
-}
-
-// ---------------- Images
-
-#define WUFFS_BASE__IMAGE__DIMENSION_MAX_INCL 0xFFFFFF
-
-// wuffs_base__color_u32_argb_premul is an 8 bit per channel premultiplied
-// Alpha, Red, Green, Blue color, as a uint32_t value. Its value is always
-// 0xAARRGGBB (Alpha most significant, Blue least), regardless of endianness.
-typedef uint32_t wuffs_base__color_u32_argb_premul;
-
-// wuffs_base__color_u32_argb_premul__is_valid returns whether c's Red, Green
-// and Blue channels are all less than or equal to its Alpha channel. c uses
-// premultiplied alpha, so 50% opaque 100% saturated red is 0x7F7F_0000 and a
-// value like 0x7F80_0000 is invalid.
-static inline bool  //
-wuffs_base__color_u32_argb_premul__is_valid(
-    wuffs_base__color_u32_argb_premul c) {
-  uint32_t a = 0xFF & (c >> 24);
-  uint32_t r = 0xFF & (c >> 16);
-  uint32_t g = 0xFF & (c >> 8);
-  uint32_t b = 0xFF & (c >> 0);
-  return (a >= r) && (a >= g) && (a >= b);
-}
-
-static inline uint16_t  //
-wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-    wuffs_base__color_u32_argb_premul c) {
-  uint32_t r5 = 0xF800 & (c >> 8);
-  uint32_t g6 = 0x07E0 & (c >> 5);
-  uint32_t b5 = 0x001F & (c >> 3);
-  return (uint16_t)(r5 | g6 | b5);
-}
-
-static inline wuffs_base__color_u32_argb_premul  //
-wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(uint16_t rgb_565) {
-  uint32_t b5 = 0x1F & (rgb_565 >> 0);
-  uint32_t b = (b5 << 3) | (b5 >> 2);
-  uint32_t g6 = 0x3F & (rgb_565 >> 5);
-  uint32_t g = (g6 << 2) | (g6 >> 4);
-  uint32_t r5 = 0x1F & (rgb_565 >> 11);
-  uint32_t r = (r5 << 3) | (r5 >> 2);
-  return 0xFF000000 | (r << 16) | (g << 8) | (b << 0);
-}
-
-static inline uint8_t  //
-wuffs_base__color_u32_argb_premul__as__color_u8_gray(
-    wuffs_base__color_u32_argb_premul c) {
-  // Work in 16-bit color.
-  uint32_t cr = 0x101 * (0xFF & (c >> 16));
-  uint32_t cg = 0x101 * (0xFF & (c >> 8));
-  uint32_t cb = 0x101 * (0xFF & (c >> 0));
-
-  // These coefficients (the fractions 0.299, 0.587 and 0.114) are the same
-  // as those given by the JFIF specification.
-  //
-  // Note that 19595 + 38470 + 7471 equals 65536, also known as (1 << 16). We
-  // shift by 24, not just by 16, because the return value is 8-bit color, not
-  // 16-bit color.
-  uint32_t weighted_average = (19595 * cr) + (38470 * cg) + (7471 * cb) + 32768;
-  return (uint8_t)(weighted_average >> 24);
-}
-
-static inline uint16_t  //
-wuffs_base__color_u32_argb_premul__as__color_u16_gray(
-    wuffs_base__color_u32_argb_premul c) {
-  // Work in 16-bit color.
-  uint32_t cr = 0x101 * (0xFF & (c >> 16));
-  uint32_t cg = 0x101 * (0xFF & (c >> 8));
-  uint32_t cb = 0x101 * (0xFF & (c >> 0));
-
-  // These coefficients (the fractions 0.299, 0.587 and 0.114) are the same
-  // as those given by the JFIF specification.
-  //
-  // Note that 19595 + 38470 + 7471 equals 65536, also known as (1 << 16).
-  uint32_t weighted_average = (19595 * cr) + (38470 * cg) + (7471 * cb) + 32768;
-  return (uint16_t)(weighted_average >> 16);
-}
-
-// wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul converts
-// from non-premultiplied alpha to premultiplied alpha.
-static inline wuffs_base__color_u32_argb_premul  //
-wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
-    uint32_t argb_nonpremul) {
-  // Multiplying by 0x101 (twice, once for alpha and once for color) converts
-  // from 8-bit to 16-bit color. Shifting right by 8 undoes that.
-  //
-  // Working in the higher bit depth can produce slightly different (and
-  // arguably slightly more accurate) results. For example, given 8-bit blue
-  // and alpha of 0x80 and 0x81:
-  //
-  //  - ((0x80   * 0x81  ) / 0xFF  )      = 0x40        = 0x40
-  //  - ((0x8080 * 0x8181) / 0xFFFF) >> 8 = 0x4101 >> 8 = 0x41
-  uint32_t a = 0xFF & (argb_nonpremul >> 24);
-  uint32_t a16 = a * (0x101 * 0x101);
-
-  uint32_t r = 0xFF & (argb_nonpremul >> 16);
-  r = ((r * a16) / 0xFFFF) >> 8;
-  uint32_t g = 0xFF & (argb_nonpremul >> 8);
-  g = ((g * a16) / 0xFFFF) >> 8;
-  uint32_t b = 0xFF & (argb_nonpremul >> 0);
-  b = ((b * a16) / 0xFFFF) >> 8;
-
-  return (a << 24) | (r << 16) | (g << 8) | (b << 0);
-}
-
-// wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul converts
-// from premultiplied alpha to non-premultiplied alpha.
-static inline uint32_t  //
-wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-    wuffs_base__color_u32_argb_premul c) {
-  uint32_t a = 0xFF & (c >> 24);
-  if (a == 0xFF) {
-    return c;
-  } else if (a == 0) {
-    return 0;
-  }
-  uint32_t a16 = a * 0x101;
-
-  uint32_t r = 0xFF & (c >> 16);
-  r = ((r * (0x101 * 0xFFFF)) / a16) >> 8;
-  uint32_t g = 0xFF & (c >> 8);
-  g = ((g * (0x101 * 0xFFFF)) / a16) >> 8;
-  uint32_t b = 0xFF & (c >> 0);
-  b = ((b * (0x101 * 0xFFFF)) / a16) >> 8;
-
-  return (a << 24) | (r << 16) | (g << 8) | (b << 0);
-}
-
-// wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul converts
-// from 4x16LE non-premultiplied alpha to 4x8 premultiplied alpha.
-static inline wuffs_base__color_u32_argb_premul  //
-wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
-    uint64_t argb_nonpremul) {
-  uint32_t a16 = ((uint32_t)(0xFFFF & (argb_nonpremul >> 48)));
-
-  uint32_t r16 = ((uint32_t)(0xFFFF & (argb_nonpremul >> 32)));
-  r16 = (r16 * a16) / 0xFFFF;
-  uint32_t g16 = ((uint32_t)(0xFFFF & (argb_nonpremul >> 16)));
-  g16 = (g16 * a16) / 0xFFFF;
-  uint32_t b16 = ((uint32_t)(0xFFFF & (argb_nonpremul >> 0)));
-  b16 = (b16 * a16) / 0xFFFF;
-
-  return ((a16 >> 8) << 24) | ((r16 >> 8) << 16) | ((g16 >> 8) << 8) |
-         ((b16 >> 8) << 0);
-}
-
-// wuffs_base__color_u32_argb_premul__as__color_u64_argb_nonpremul converts
-// from 4x8 premultiplied alpha to 4x16LE non-premultiplied alpha.
-static inline uint64_t  //
-wuffs_base__color_u32_argb_premul__as__color_u64_argb_nonpremul(
-    wuffs_base__color_u32_argb_premul c) {
-  uint32_t a = 0xFF & (c >> 24);
-  if (a == 0xFF) {
-    uint64_t r16 = 0x101 * (0xFF & (c >> 16));
-    uint64_t g16 = 0x101 * (0xFF & (c >> 8));
-    uint64_t b16 = 0x101 * (0xFF & (c >> 0));
-    return 0xFFFF000000000000u | (r16 << 32) | (g16 << 16) | (b16 << 0);
-  } else if (a == 0) {
-    return 0;
-  }
-  uint64_t a16 = a * 0x101;
-
-  uint64_t r = 0xFF & (c >> 16);
-  uint64_t r16 = (r * (0x101 * 0xFFFF)) / a16;
-  uint64_t g = 0xFF & (c >> 8);
-  uint64_t g16 = (g * (0x101 * 0xFFFF)) / a16;
-  uint64_t b = 0xFF & (c >> 0);
-  uint64_t b16 = (b * (0x101 * 0xFFFF)) / a16;
-
-  return (a16 << 48) | (r16 << 32) | (g16 << 16) | (b16 << 0);
-}
-
-static inline uint64_t  //
-wuffs_base__color_u32__as__color_u64(uint32_t c) {
-  uint64_t a16 = 0x101 * (0xFF & (c >> 24));
-  uint64_t r16 = 0x101 * (0xFF & (c >> 16));
-  uint64_t g16 = 0x101 * (0xFF & (c >> 8));
-  uint64_t b16 = 0x101 * (0xFF & (c >> 0));
-  return (a16 << 48) | (r16 << 32) | (g16 << 16) | (b16 << 0);
-}
-
-static inline uint32_t  //
-wuffs_base__color_u64__as__color_u32(uint64_t c) {
-  uint32_t a = ((uint32_t)(0xFF & (c >> 56)));
-  uint32_t r = ((uint32_t)(0xFF & (c >> 40)));
-  uint32_t g = ((uint32_t)(0xFF & (c >> 24)));
-  uint32_t b = ((uint32_t)(0xFF & (c >> 8)));
-  return (a << 24) | (r << 16) | (g << 8) | (b << 0);
-}
-
-// wuffs_base__color_ycc__as__color_u32 converts from YCbCr to 0xAARRGGBB. The
-// alpha bits are always 0xFF.
-static inline wuffs_base__color_u32_argb_premul  //
-wuffs_base__color_ycc__as__color_u32(uint8_t yy, uint8_t cb, uint8_t cr) {
-  // Work in 16.16 fixed point arithmetic (so that 'one half' is (1 << 15)) and
-  // bias the chroma values by 0x80.
-  uint32_t yy32 = (((uint32_t)yy) << 16) | (1 << 15);
-  uint32_t cb32 = (((uint32_t)cb) - 0x80);
-  uint32_t cr32 = (((uint32_t)cr) - 0x80);
-
-  // The formulae:
-  //
-  //  R = Y                + 1.40200 * Cr
-  //  G = Y - 0.34414 * Cb - 0.71414 * Cr
-  //  B = Y + 1.77200 * Cb
-  //
-  // When scaled by 1<<16:
-  //
-  //  0.34414 becomes 0x0581A =  22554.
-  //  0.71414 becomes 0x0B6D2 =  46802.
-  //  1.40200 becomes 0x166E9 =  91881.
-  //  1.77200 becomes 0x1C5A2 = 116130.
-  //
-  // Since we're working in 16.16 fixed point arithmetic, masking by 0x00FF0000
-  // (possibly followed by a shift) gives the relevant 8 bits per channel.
-  //
-  // However, we need to saturate for overflow (above 0x00FFFFFF, but not so
-  // high that the MSB Most Significant Bit is set) or for underflow (below
-  // 0x00000000 as int32_t, which means that the MSB is set as uint32_t). In
-  // both cases, some of the high 8 bits (bits 24 ..= 31) will be set.
-  //
-  // "((uint32_t)(((int32_t)x) >> 31))" just replicates x's MSB across all 32
-  // bits. Prepending that with "~" inverts those bits. Thus, "~(etc)" is
-  // either 0xFFFFFFFF (for overflow) or 0x00000000 (for underflow).
-  uint32_t rr32 = yy32 + (0x166E9 * cr32);
-  uint32_t gg32 = yy32 - (0x0581A * cb32) - (0x0B6D2 * cr32);
-  uint32_t bb32 = yy32 + (0x1C5A2 * cb32);
-  if (rr32 >> 24) {
-    rr32 = ~((uint32_t)(((int32_t)rr32) >> 31));
-  }
-  if (gg32 >> 24) {
-    gg32 = ~((uint32_t)(((int32_t)gg32) >> 31));
-  }
-  if (bb32 >> 24) {
-    bb32 = ~((uint32_t)(((int32_t)bb32) >> 31));
-  }
-  return 0xFF000000 |                  //
-         ((0x00FF0000 & rr32) >> 0) |  //
-         ((0x00FF0000 & gg32) >> 8) |  //
-         ((0x00FF0000 & bb32) >> 16);
-}
-
-// wuffs_base__color_ycc__as__color_u32_abgr is like
-// wuffs_base__color_ycc__as__color_u32 but the uint32_t returned is in
-// 0xAABBGGRR order, not 0xAARRGGBB.
-static inline uint32_t  //
-wuffs_base__color_ycc__as__color_u32_abgr(uint8_t yy, uint8_t cb, uint8_t cr) {
-  uint32_t yy32 = (((uint32_t)yy) << 16) | (1 << 15);
-  uint32_t cb32 = (((uint32_t)cb) - 0x80);
-  uint32_t cr32 = (((uint32_t)cr) - 0x80);
-  uint32_t rr32 = yy32 + (0x166E9 * cr32);
-  uint32_t gg32 = yy32 - (0x0581A * cb32) - (0x0B6D2 * cr32);
-  uint32_t bb32 = yy32 + (0x1C5A2 * cb32);
-  if (rr32 >> 24) {
-    rr32 = ~((uint32_t)(((int32_t)rr32) >> 31));
-  }
-  if (gg32 >> 24) {
-    gg32 = ~((uint32_t)(((int32_t)gg32) >> 31));
-  }
-  if (bb32 >> 24) {
-    bb32 = ~((uint32_t)(((int32_t)bb32) >> 31));
-  }
-  return 0xFF000000 |                  //
-         ((0x00FF0000 & bb32) >> 0) |  //
-         ((0x00FF0000 & gg32) >> 8) |  //
-         ((0x00FF0000 & rr32) >> 16);
-}
-
-// --------
-
-typedef uint8_t wuffs_base__pixel_blend;
-
-// wuffs_base__pixel_blend encodes how to blend source and destination pixels,
-// accounting for transparency. It encompasses the Porter-Duff compositing
-// operators as well as the other blending modes defined by PDF.
-//
-// TODO: implement the other modes.
-#define WUFFS_BASE__PIXEL_BLEND__SRC ((wuffs_base__pixel_blend)0)
-#define WUFFS_BASE__PIXEL_BLEND__SRC_OVER ((wuffs_base__pixel_blend)1)
-
-// --------
-
-// wuffs_base__pixel_alpha_transparency is a pixel format's alpha channel
-// model. It is a property of the pixel format in general, not of a specific
-// pixel. An RGBA pixel format (with alpha) can still have fully opaque pixels.
-typedef uint32_t wuffs_base__pixel_alpha_transparency;
-
-#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__OPAQUE 0
-#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__NONPREMULTIPLIED_ALPHA 1
-#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__PREMULTIPLIED_ALPHA 2
-#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__BINARY_ALPHA 3
-
-// --------
-
-// Deprecated: use WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL.
-#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX 4
-
-#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL 4
-
-#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__INDEX_PLANE 0
-#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE 3
-
-// A palette is 256 entries × 4 bytes per entry (e.g. BGRA).
-#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH 1024
-
-// wuffs_base__pixel_format encodes the format of the bytes that constitute an
-// image frame's pixel data.
-//
-// See https://github.com/google/wuffs/blob/main/doc/note/pixel-formats.md
-//
-// Do not manipulate its bits directly; they are private implementation
-// details. Use methods such as wuffs_base__pixel_format__num_planes instead.
-typedef struct wuffs_base__pixel_format__struct {
-  uint32_t repr;
-
-#ifdef __cplusplus
-  inline bool is_valid() const;
-  inline uint32_t bits_per_pixel() const;
-  inline bool is_direct() const;
-  inline bool is_indexed() const;
-  inline bool is_interleaved() const;
-  inline bool is_planar() const;
-  inline uint32_t num_planes() const;
-  inline wuffs_base__pixel_alpha_transparency transparency() const;
-#endif  // __cplusplus
-
-} wuffs_base__pixel_format;
-
-static inline wuffs_base__pixel_format  //
-wuffs_base__make_pixel_format(uint32_t repr) {
-  wuffs_base__pixel_format f;
-  f.repr = repr;
-  return f;
-}
-
-// Common 8-bit-depth pixel formats. This list is not exhaustive; not all valid
-// wuffs_base__pixel_format values are present.
-
-#define WUFFS_BASE__PIXEL_FORMAT__INVALID 0x00000000
-
-#define WUFFS_BASE__PIXEL_FORMAT__A 0x02000008
-
-#define WUFFS_BASE__PIXEL_FORMAT__Y 0x20000008
-#define WUFFS_BASE__PIXEL_FORMAT__Y_16LE 0x2000000B
-#define WUFFS_BASE__PIXEL_FORMAT__Y_16BE 0x2010000B
-#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000008
-#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000008
-
-#define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x40020888
-#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x41038888
-#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x50038888
-
-#define WUFFS_BASE__PIXEL_FORMAT__YCOCG 0x60020888
-#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x61038888
-#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x70038888
-
-#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL 0x81040008
-#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL 0x82040008
-#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY 0x83040008
-
-#define WUFFS_BASE__PIXEL_FORMAT__BGR_565 0x80000565
-#define WUFFS_BASE__PIXEL_FORMAT__BGR 0x80000888
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL 0x81008888
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE 0x8100BBBB
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x82008888
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE 0x8200BBBB
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x83008888
-#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x90008888
-
-#define WUFFS_BASE__PIXEL_FORMAT__RGB 0xA0000888
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0xA1008888
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE 0xA100BBBB
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0xA2008888
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE 0xA200BBBB
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0xA3008888
-#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0xB0008888
-
-#define WUFFS_BASE__PIXEL_FORMAT__CMY 0xC0020888
-#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0xD0038888
-
-extern const uint32_t wuffs_base__pixel_format__bits_per_channel[16];
-
-static inline bool  //
-wuffs_base__pixel_format__is_valid(const wuffs_base__pixel_format* f) {
-  return f->repr != 0;
-}
-
-// wuffs_base__pixel_format__bits_per_pixel returns the number of bits per
-// pixel for interleaved pixel formats, and returns 0 for planar pixel formats.
-static inline uint32_t  //
-wuffs_base__pixel_format__bits_per_pixel(const wuffs_base__pixel_format* f) {
-  if (((f->repr >> 16) & 0x03) != 0) {
-    return 0;
-  }
-  return wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 0)] +
-         wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 4)] +
-         wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 8)] +
-         wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 12)];
-}
-
-static inline bool  //
-wuffs_base__pixel_format__is_direct(const wuffs_base__pixel_format* f) {
-  return ((f->repr >> 18) & 0x01) == 0;
-}
-
-static inline bool  //
-wuffs_base__pixel_format__is_indexed(const wuffs_base__pixel_format* f) {
-  return ((f->repr >> 18) & 0x01) != 0;
-}
-
-static inline bool  //
-wuffs_base__pixel_format__is_interleaved(const wuffs_base__pixel_format* f) {
-  return ((f->repr >> 16) & 0x03) == 0;
-}
-
-static inline bool  //
-wuffs_base__pixel_format__is_planar(const wuffs_base__pixel_format* f) {
-  return ((f->repr >> 16) & 0x03) != 0;
-}
-
-static inline uint32_t  //
-wuffs_base__pixel_format__num_planes(const wuffs_base__pixel_format* f) {
-  return ((f->repr >> 16) & 0x03) + 1;
-}
-
-static inline wuffs_base__pixel_alpha_transparency  //
-wuffs_base__pixel_format__transparency(const wuffs_base__pixel_format* f) {
-  return (wuffs_base__pixel_alpha_transparency)((f->repr >> 24) & 0x03);
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__pixel_format::is_valid() const {
-  return wuffs_base__pixel_format__is_valid(this);
-}
-
-inline uint32_t  //
-wuffs_base__pixel_format::bits_per_pixel() const {
-  return wuffs_base__pixel_format__bits_per_pixel(this);
-}
-
-inline bool  //
-wuffs_base__pixel_format::is_direct() const {
-  return wuffs_base__pixel_format__is_direct(this);
-}
-
-inline bool  //
-wuffs_base__pixel_format::is_indexed() const {
-  return wuffs_base__pixel_format__is_indexed(this);
-}
-
-inline bool  //
-wuffs_base__pixel_format::is_interleaved() const {
-  return wuffs_base__pixel_format__is_interleaved(this);
-}
-
-inline bool  //
-wuffs_base__pixel_format::is_planar() const {
-  return wuffs_base__pixel_format__is_planar(this);
-}
-
-inline uint32_t  //
-wuffs_base__pixel_format::num_planes() const {
-  return wuffs_base__pixel_format__num_planes(this);
-}
-
-inline wuffs_base__pixel_alpha_transparency  //
-wuffs_base__pixel_format::transparency() const {
-  return wuffs_base__pixel_format__transparency(this);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-// wuffs_base__pixel_subsampling encodes whether sample values cover one pixel
-// or cover multiple pixels.
-//
-// See https://github.com/google/wuffs/blob/main/doc/note/pixel-subsampling.md
-//
-// Do not manipulate its bits directly; they are private implementation
-// details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead.
-typedef struct wuffs_base__pixel_subsampling__struct {
-  uint32_t repr;
-
-#ifdef __cplusplus
-  inline uint32_t bias_x(uint32_t plane) const;
-  inline uint32_t denominator_x(uint32_t plane) const;
-  inline uint32_t bias_y(uint32_t plane) const;
-  inline uint32_t denominator_y(uint32_t plane) const;
-#endif  // __cplusplus
-
-} wuffs_base__pixel_subsampling;
-
-static inline wuffs_base__pixel_subsampling  //
-wuffs_base__make_pixel_subsampling(uint32_t repr) {
-  wuffs_base__pixel_subsampling s;
-  s.repr = repr;
-  return s;
-}
-
-#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE 0x00000000
-
-#define WUFFS_BASE__PIXEL_SUBSAMPLING__444 0x000000
-#define WUFFS_BASE__PIXEL_SUBSAMPLING__440 0x010100
-#define WUFFS_BASE__PIXEL_SUBSAMPLING__422 0x101000
-#define WUFFS_BASE__PIXEL_SUBSAMPLING__420 0x111100
-#define WUFFS_BASE__PIXEL_SUBSAMPLING__411 0x303000
-#define WUFFS_BASE__PIXEL_SUBSAMPLING__410 0x313100
-
-static inline uint32_t  //
-wuffs_base__pixel_subsampling__bias_x(const wuffs_base__pixel_subsampling* s,
-                                      uint32_t plane) {
-  uint32_t shift = ((plane & 0x03) * 8) + 6;
-  return (s->repr >> shift) & 0x03;
-}
-
-static inline uint32_t  //
-wuffs_base__pixel_subsampling__denominator_x(
-    const wuffs_base__pixel_subsampling* s,
-    uint32_t plane) {
-  uint32_t shift = ((plane & 0x03) * 8) + 4;
-  return ((s->repr >> shift) & 0x03) + 1;
-}
-
-static inline uint32_t  //
-wuffs_base__pixel_subsampling__bias_y(const wuffs_base__pixel_subsampling* s,
-                                      uint32_t plane) {
-  uint32_t shift = ((plane & 0x03) * 8) + 2;
-  return (s->repr >> shift) & 0x03;
-}
-
-static inline uint32_t  //
-wuffs_base__pixel_subsampling__denominator_y(
-    const wuffs_base__pixel_subsampling* s,
-    uint32_t plane) {
-  uint32_t shift = ((plane & 0x03) * 8) + 0;
-  return ((s->repr >> shift) & 0x03) + 1;
-}
-
-#ifdef __cplusplus
-
-inline uint32_t  //
-wuffs_base__pixel_subsampling::bias_x(uint32_t plane) const {
-  return wuffs_base__pixel_subsampling__bias_x(this, plane);
-}
-
-inline uint32_t  //
-wuffs_base__pixel_subsampling::denominator_x(uint32_t plane) const {
-  return wuffs_base__pixel_subsampling__denominator_x(this, plane);
-}
-
-inline uint32_t  //
-wuffs_base__pixel_subsampling::bias_y(uint32_t plane) const {
-  return wuffs_base__pixel_subsampling__bias_y(this, plane);
-}
-
-inline uint32_t  //
-wuffs_base__pixel_subsampling::denominator_y(uint32_t plane) const {
-  return wuffs_base__pixel_subsampling__denominator_y(this, plane);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef struct wuffs_base__pixel_config__struct {
-  // Do not access the private_impl's fields directly. There is no API/ABI
-  // compatibility or safety guarantee if you do so.
-  struct {
-    wuffs_base__pixel_format pixfmt;
-    wuffs_base__pixel_subsampling pixsub;
-    uint32_t width;
-    uint32_t height;
-  } private_impl;
-
-#ifdef __cplusplus
-  inline void set(uint32_t pixfmt_repr,
-                  uint32_t pixsub_repr,
-                  uint32_t width,
-                  uint32_t height);
-  inline void invalidate();
-  inline bool is_valid() const;
-  inline wuffs_base__pixel_format pixel_format() const;
-  inline wuffs_base__pixel_subsampling pixel_subsampling() const;
-  inline wuffs_base__rect_ie_u32 bounds() const;
-  inline uint32_t width() const;
-  inline uint32_t height() const;
-  inline uint64_t pixbuf_len() const;
-#endif  // __cplusplus
-
-} wuffs_base__pixel_config;
-
-static inline wuffs_base__pixel_config  //
-wuffs_base__null_pixel_config() {
-  wuffs_base__pixel_config ret;
-  ret.private_impl.pixfmt.repr = 0;
-  ret.private_impl.pixsub.repr = 0;
-  ret.private_impl.width = 0;
-  ret.private_impl.height = 0;
-  return ret;
-}
-
-// TODO: Should this function return bool? An error type?
-static inline void  //
-wuffs_base__pixel_config__set(wuffs_base__pixel_config* c,
-                              uint32_t pixfmt_repr,
-                              uint32_t pixsub_repr,
-                              uint32_t width,
-                              uint32_t height) {
-  if (!c) {
-    return;
-  }
-  if (pixfmt_repr) {
-    uint64_t wh = ((uint64_t)width) * ((uint64_t)height);
-    // TODO: handle things other than 1 byte per pixel.
-    if (wh <= ((uint64_t)SIZE_MAX)) {
-      c->private_impl.pixfmt.repr = pixfmt_repr;
-      c->private_impl.pixsub.repr = pixsub_repr;
-      c->private_impl.width = width;
-      c->private_impl.height = height;
-      return;
-    }
-  }
-
-  c->private_impl.pixfmt.repr = 0;
-  c->private_impl.pixsub.repr = 0;
-  c->private_impl.width = 0;
-  c->private_impl.height = 0;
-}
-
-static inline void  //
-wuffs_base__pixel_config__invalidate(wuffs_base__pixel_config* c) {
-  if (c) {
-    c->private_impl.pixfmt.repr = 0;
-    c->private_impl.pixsub.repr = 0;
-    c->private_impl.width = 0;
-    c->private_impl.height = 0;
-  }
-}
-
-static inline bool  //
-wuffs_base__pixel_config__is_valid(const wuffs_base__pixel_config* c) {
-  return c && c->private_impl.pixfmt.repr;
-}
-
-static inline wuffs_base__pixel_format  //
-wuffs_base__pixel_config__pixel_format(const wuffs_base__pixel_config* c) {
-  return c ? c->private_impl.pixfmt : wuffs_base__make_pixel_format(0);
-}
-
-static inline wuffs_base__pixel_subsampling  //
-wuffs_base__pixel_config__pixel_subsampling(const wuffs_base__pixel_config* c) {
-  return c ? c->private_impl.pixsub : wuffs_base__make_pixel_subsampling(0);
-}
-
-static inline wuffs_base__rect_ie_u32  //
-wuffs_base__pixel_config__bounds(const wuffs_base__pixel_config* c) {
-  if (c) {
-    wuffs_base__rect_ie_u32 ret;
-    ret.min_incl_x = 0;
-    ret.min_incl_y = 0;
-    ret.max_excl_x = c->private_impl.width;
-    ret.max_excl_y = c->private_impl.height;
-    return ret;
-  }
-
-  wuffs_base__rect_ie_u32 ret;
-  ret.min_incl_x = 0;
-  ret.min_incl_y = 0;
-  ret.max_excl_x = 0;
-  ret.max_excl_y = 0;
-  return ret;
-}
-
-static inline uint32_t  //
-wuffs_base__pixel_config__width(const wuffs_base__pixel_config* c) {
-  return c ? c->private_impl.width : 0;
-}
-
-static inline uint32_t  //
-wuffs_base__pixel_config__height(const wuffs_base__pixel_config* c) {
-  return c ? c->private_impl.height : 0;
-}
-
-// TODO: this is the right API for planar (not interleaved) pixbufs? Should it
-// allow decoding into a color model different from the format's intrinsic one?
-// For example, decoding a JPEG image straight to RGBA instead of to YCbCr?
-static inline uint64_t  //
-wuffs_base__pixel_config__pixbuf_len(const wuffs_base__pixel_config* c) {
-  if (!c) {
-    return 0;
-  }
-  if (wuffs_base__pixel_format__is_planar(&c->private_impl.pixfmt)) {
-    // TODO: support planar pixel formats, concious of pixel subsampling.
-    return 0;
-  }
-  uint32_t bits_per_pixel =
-      wuffs_base__pixel_format__bits_per_pixel(&c->private_impl.pixfmt);
-  if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {
-    // TODO: support fraction-of-byte pixels, e.g. 1 bit per pixel?
-    return 0;
-  }
-  uint64_t bytes_per_pixel = bits_per_pixel / 8;
-
-  uint64_t n =
-      ((uint64_t)c->private_impl.width) * ((uint64_t)c->private_impl.height);
-  if (n > (UINT64_MAX / bytes_per_pixel)) {
-    return 0;
-  }
-  n *= bytes_per_pixel;
-
-  if (wuffs_base__pixel_format__is_indexed(&c->private_impl.pixfmt)) {
-    if (n >
-        (UINT64_MAX - WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH)) {
-      return 0;
-    }
-    n += WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH;
-  }
-
-  return n;
-}
-
-#ifdef __cplusplus
-
-inline void  //
-wuffs_base__pixel_config::set(uint32_t pixfmt_repr,
-                              uint32_t pixsub_repr,
-                              uint32_t width,
-                              uint32_t height) {
-  wuffs_base__pixel_config__set(this, pixfmt_repr, pixsub_repr, width, height);
-}
-
-inline void  //
-wuffs_base__pixel_config::invalidate() {
-  wuffs_base__pixel_config__invalidate(this);
-}
-
-inline bool  //
-wuffs_base__pixel_config::is_valid() const {
-  return wuffs_base__pixel_config__is_valid(this);
-}
-
-inline wuffs_base__pixel_format  //
-wuffs_base__pixel_config::pixel_format() const {
-  return wuffs_base__pixel_config__pixel_format(this);
-}
-
-inline wuffs_base__pixel_subsampling  //
-wuffs_base__pixel_config::pixel_subsampling() const {
-  return wuffs_base__pixel_config__pixel_subsampling(this);
-}
-
-inline wuffs_base__rect_ie_u32  //
-wuffs_base__pixel_config::bounds() const {
-  return wuffs_base__pixel_config__bounds(this);
-}
-
-inline uint32_t  //
-wuffs_base__pixel_config::width() const {
-  return wuffs_base__pixel_config__width(this);
-}
-
-inline uint32_t  //
-wuffs_base__pixel_config::height() const {
-  return wuffs_base__pixel_config__height(this);
-}
-
-inline uint64_t  //
-wuffs_base__pixel_config::pixbuf_len() const {
-  return wuffs_base__pixel_config__pixbuf_len(this);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef struct wuffs_base__image_config__struct {
-  wuffs_base__pixel_config pixcfg;
-
-  // Do not access the private_impl's fields directly. There is no API/ABI
-  // compatibility or safety guarantee if you do so.
-  struct {
-    uint64_t first_frame_io_position;
-    bool first_frame_is_opaque;
-  } private_impl;
-
-#ifdef __cplusplus
-  inline void set(uint32_t pixfmt_repr,
-                  uint32_t pixsub_repr,
-                  uint32_t width,
-                  uint32_t height,
-                  uint64_t first_frame_io_position,
-                  bool first_frame_is_opaque);
-  inline void invalidate();
-  inline bool is_valid() const;
-  inline uint64_t first_frame_io_position() const;
-  inline bool first_frame_is_opaque() const;
-#endif  // __cplusplus
-
-} wuffs_base__image_config;
-
-static inline wuffs_base__image_config  //
-wuffs_base__null_image_config() {
-  wuffs_base__image_config ret;
-  ret.pixcfg = wuffs_base__null_pixel_config();
-  ret.private_impl.first_frame_io_position = 0;
-  ret.private_impl.first_frame_is_opaque = false;
-  return ret;
-}
-
-// TODO: Should this function return bool? An error type?
-static inline void  //
-wuffs_base__image_config__set(wuffs_base__image_config* c,
-                              uint32_t pixfmt_repr,
-                              uint32_t pixsub_repr,
-                              uint32_t width,
-                              uint32_t height,
-                              uint64_t first_frame_io_position,
-                              bool first_frame_is_opaque) {
-  if (!c) {
-    return;
-  }
-  if (pixfmt_repr) {
-    c->pixcfg.private_impl.pixfmt.repr = pixfmt_repr;
-    c->pixcfg.private_impl.pixsub.repr = pixsub_repr;
-    c->pixcfg.private_impl.width = width;
-    c->pixcfg.private_impl.height = height;
-    c->private_impl.first_frame_io_position = first_frame_io_position;
-    c->private_impl.first_frame_is_opaque = first_frame_is_opaque;
-    return;
-  }
-
-  c->pixcfg.private_impl.pixfmt.repr = 0;
-  c->pixcfg.private_impl.pixsub.repr = 0;
-  c->pixcfg.private_impl.width = 0;
-  c->pixcfg.private_impl.height = 0;
-  c->private_impl.first_frame_io_position = 0;
-  c->private_impl.first_frame_is_opaque = 0;
-}
-
-static inline void  //
-wuffs_base__image_config__invalidate(wuffs_base__image_config* c) {
-  if (c) {
-    c->pixcfg.private_impl.pixfmt.repr = 0;
-    c->pixcfg.private_impl.pixsub.repr = 0;
-    c->pixcfg.private_impl.width = 0;
-    c->pixcfg.private_impl.height = 0;
-    c->private_impl.first_frame_io_position = 0;
-    c->private_impl.first_frame_is_opaque = 0;
-  }
-}
-
-static inline bool  //
-wuffs_base__image_config__is_valid(const wuffs_base__image_config* c) {
-  return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));
-}
-
-static inline uint64_t  //
-wuffs_base__image_config__first_frame_io_position(
-    const wuffs_base__image_config* c) {
-  return c ? c->private_impl.first_frame_io_position : 0;
-}
-
-static inline bool  //
-wuffs_base__image_config__first_frame_is_opaque(
-    const wuffs_base__image_config* c) {
-  return c ? c->private_impl.first_frame_is_opaque : false;
-}
-
-#ifdef __cplusplus
-
-inline void  //
-wuffs_base__image_config::set(uint32_t pixfmt_repr,
-                              uint32_t pixsub_repr,
-                              uint32_t width,
-                              uint32_t height,
-                              uint64_t first_frame_io_position,
-                              bool first_frame_is_opaque) {
-  wuffs_base__image_config__set(this, pixfmt_repr, pixsub_repr, width, height,
-                                first_frame_io_position, first_frame_is_opaque);
-}
-
-inline void  //
-wuffs_base__image_config::invalidate() {
-  wuffs_base__image_config__invalidate(this);
-}
-
-inline bool  //
-wuffs_base__image_config::is_valid() const {
-  return wuffs_base__image_config__is_valid(this);
-}
-
-inline uint64_t  //
-wuffs_base__image_config::first_frame_io_position() const {
-  return wuffs_base__image_config__first_frame_io_position(this);
-}
-
-inline bool  //
-wuffs_base__image_config::first_frame_is_opaque() const {
-  return wuffs_base__image_config__first_frame_is_opaque(this);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-// wuffs_base__animation_disposal encodes, for an animated image, how to
-// dispose of a frame after displaying it:
-//  - None means to draw the next frame on top of this one.
-//  - Restore Background means to clear the frame's dirty rectangle to "the
-//    background color" (in practice, this means transparent black) before
-//    drawing the next frame.
-//  - Restore Previous means to undo the current frame, so that the next frame
-//    is drawn on top of the previous one.
-typedef uint8_t wuffs_base__animation_disposal;
-
-#define WUFFS_BASE__ANIMATION_DISPOSAL__NONE ((wuffs_base__animation_disposal)0)
-#define WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_BACKGROUND \
-  ((wuffs_base__animation_disposal)1)
-#define WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_PREVIOUS \
-  ((wuffs_base__animation_disposal)2)
-
-// --------
-
-typedef struct wuffs_base__frame_config__struct {
-  // Do not access the private_impl's fields directly. There is no API/ABI
-  // compatibility or safety guarantee if you do so.
-  struct {
-    wuffs_base__rect_ie_u32 bounds;
-    wuffs_base__flicks duration;
-    uint64_t index;
-    uint64_t io_position;
-    wuffs_base__animation_disposal disposal;
-    bool opaque_within_bounds;
-    bool overwrite_instead_of_blend;
-    wuffs_base__color_u32_argb_premul background_color;
-  } private_impl;
-
-#ifdef __cplusplus
-  inline void set(wuffs_base__rect_ie_u32 bounds,
-                  wuffs_base__flicks duration,
-                  uint64_t index,
-                  uint64_t io_position,
-                  wuffs_base__animation_disposal disposal,
-                  bool opaque_within_bounds,
-                  bool overwrite_instead_of_blend,
-                  wuffs_base__color_u32_argb_premul background_color);
-  inline wuffs_base__rect_ie_u32 bounds() const;
-  inline uint32_t width() const;
-  inline uint32_t height() const;
-  inline wuffs_base__flicks duration() const;
-  inline uint64_t index() const;
-  inline uint64_t io_position() const;
-  inline wuffs_base__animation_disposal disposal() const;
-  inline bool opaque_within_bounds() const;
-  inline bool overwrite_instead_of_blend() const;
-  inline wuffs_base__color_u32_argb_premul background_color() const;
-#endif  // __cplusplus
-
-} wuffs_base__frame_config;
-
-static inline wuffs_base__frame_config  //
-wuffs_base__null_frame_config() {
-  wuffs_base__frame_config ret;
-  ret.private_impl.bounds = wuffs_base__make_rect_ie_u32(0, 0, 0, 0);
-  ret.private_impl.duration = 0;
-  ret.private_impl.index = 0;
-  ret.private_impl.io_position = 0;
-  ret.private_impl.disposal = 0;
-  ret.private_impl.opaque_within_bounds = false;
-  ret.private_impl.overwrite_instead_of_blend = false;
-  return ret;
-}
-
-static inline void  //
-wuffs_base__frame_config__set(
-    wuffs_base__frame_config* c,
-    wuffs_base__rect_ie_u32 bounds,
-    wuffs_base__flicks duration,
-    uint64_t index,
-    uint64_t io_position,
-    wuffs_base__animation_disposal disposal,
-    bool opaque_within_bounds,
-    bool overwrite_instead_of_blend,
-    wuffs_base__color_u32_argb_premul background_color) {
-  if (!c) {
-    return;
-  }
-
-  c->private_impl.bounds = bounds;
-  c->private_impl.duration = duration;
-  c->private_impl.index = index;
-  c->private_impl.io_position = io_position;
-  c->private_impl.disposal = disposal;
-  c->private_impl.opaque_within_bounds = opaque_within_bounds;
-  c->private_impl.overwrite_instead_of_blend = overwrite_instead_of_blend;
-  c->private_impl.background_color = background_color;
-}
-
-static inline wuffs_base__rect_ie_u32  //
-wuffs_base__frame_config__bounds(const wuffs_base__frame_config* c) {
-  if (c) {
-    return c->private_impl.bounds;
-  }
-
-  wuffs_base__rect_ie_u32 ret;
-  ret.min_incl_x = 0;
-  ret.min_incl_y = 0;
-  ret.max_excl_x = 0;
-  ret.max_excl_y = 0;
-  return ret;
-}
-
-static inline uint32_t  //
-wuffs_base__frame_config__width(const wuffs_base__frame_config* c) {
-  return c ? wuffs_base__rect_ie_u32__width(&c->private_impl.bounds) : 0;
-}
-
-static inline uint32_t  //
-wuffs_base__frame_config__height(const wuffs_base__frame_config* c) {
-  return c ? wuffs_base__rect_ie_u32__height(&c->private_impl.bounds) : 0;
-}
-
-// wuffs_base__frame_config__duration returns the amount of time to display
-// this frame. Zero means to display forever - a still (non-animated) image.
-static inline wuffs_base__flicks  //
-wuffs_base__frame_config__duration(const wuffs_base__frame_config* c) {
-  return c ? c->private_impl.duration : 0;
-}
-
-// wuffs_base__frame_config__index returns the index of this frame. The first
-// frame in an image has index 0, the second frame has index 1, and so on.
-static inline uint64_t  //
-wuffs_base__frame_config__index(const wuffs_base__frame_config* c) {
-  return c ? c->private_impl.index : 0;
-}
-
-// wuffs_base__frame_config__io_position returns the I/O stream position before
-// the frame config.
-static inline uint64_t  //
-wuffs_base__frame_config__io_position(const wuffs_base__frame_config* c) {
-  return c ? c->private_impl.io_position : 0;
-}
-
-// wuffs_base__frame_config__disposal returns, for an animated image, how to
-// dispose of this frame after displaying it.
-static inline wuffs_base__animation_disposal  //
-wuffs_base__frame_config__disposal(const wuffs_base__frame_config* c) {
-  return c ? c->private_impl.disposal : 0;
-}
-
-// wuffs_base__frame_config__opaque_within_bounds returns whether all pixels
-// within the frame's bounds are fully opaque. It makes no claim about pixels
-// outside the frame bounds but still inside the overall image. The two
-// bounding rectangles can differ for animated images.
-//
-// Its semantics are conservative. It is valid for a fully opaque frame to have
-// this value be false: a false negative.
-//
-// If true, drawing the frame with WUFFS_BASE__PIXEL_BLEND__SRC and
-// WUFFS_BASE__PIXEL_BLEND__SRC_OVER should be equivalent, in terms of
-// resultant pixels, but the former may be faster.
-static inline bool  //
-wuffs_base__frame_config__opaque_within_bounds(
-    const wuffs_base__frame_config* c) {
-  return c && c->private_impl.opaque_within_bounds;
-}
-
-// wuffs_base__frame_config__overwrite_instead_of_blend returns, for an
-// animated image, whether to ignore the previous image state (within the frame
-// bounds) when drawing this incremental frame. Equivalently, whether to use
-// WUFFS_BASE__PIXEL_BLEND__SRC instead of WUFFS_BASE__PIXEL_BLEND__SRC_OVER.
-//
-// The WebP spec (https://developers.google.com/speed/webp/docs/riff_container)
-// calls this the "Blending method" bit. WebP's "Do not blend" corresponds to
-// Wuffs' "overwrite_instead_of_blend".
-static inline bool  //
-wuffs_base__frame_config__overwrite_instead_of_blend(
-    const wuffs_base__frame_config* c) {
-  return c && c->private_impl.overwrite_instead_of_blend;
-}
-
-static inline wuffs_base__color_u32_argb_premul  //
-wuffs_base__frame_config__background_color(const wuffs_base__frame_config* c) {
-  return c ? c->private_impl.background_color : 0;
-}
-
-#ifdef __cplusplus
-
-inline void  //
-wuffs_base__frame_config::set(
-    wuffs_base__rect_ie_u32 bounds,
-    wuffs_base__flicks duration,
-    uint64_t index,
-    uint64_t io_position,
-    wuffs_base__animation_disposal disposal,
-    bool opaque_within_bounds,
-    bool overwrite_instead_of_blend,
-    wuffs_base__color_u32_argb_premul background_color) {
-  wuffs_base__frame_config__set(this, bounds, duration, index, io_position,
-                                disposal, opaque_within_bounds,
-                                overwrite_instead_of_blend, background_color);
-}
-
-inline wuffs_base__rect_ie_u32  //
-wuffs_base__frame_config::bounds() const {
-  return wuffs_base__frame_config__bounds(this);
-}
-
-inline uint32_t  //
-wuffs_base__frame_config::width() const {
-  return wuffs_base__frame_config__width(this);
-}
-
-inline uint32_t  //
-wuffs_base__frame_config::height() const {
-  return wuffs_base__frame_config__height(this);
-}
-
-inline wuffs_base__flicks  //
-wuffs_base__frame_config::duration() const {
-  return wuffs_base__frame_config__duration(this);
-}
-
-inline uint64_t  //
-wuffs_base__frame_config::index() const {
-  return wuffs_base__frame_config__index(this);
-}
-
-inline uint64_t  //
-wuffs_base__frame_config::io_position() const {
-  return wuffs_base__frame_config__io_position(this);
-}
-
-inline wuffs_base__animation_disposal  //
-wuffs_base__frame_config::disposal() const {
-  return wuffs_base__frame_config__disposal(this);
-}
-
-inline bool  //
-wuffs_base__frame_config::opaque_within_bounds() const {
-  return wuffs_base__frame_config__opaque_within_bounds(this);
-}
-
-inline bool  //
-wuffs_base__frame_config::overwrite_instead_of_blend() const {
-  return wuffs_base__frame_config__overwrite_instead_of_blend(this);
-}
-
-inline wuffs_base__color_u32_argb_premul  //
-wuffs_base__frame_config::background_color() const {
-  return wuffs_base__frame_config__background_color(this);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef struct wuffs_base__pixel_buffer__struct {
-  wuffs_base__pixel_config pixcfg;
-
-  // Do not access the private_impl's fields directly. There is no API/ABI
-  // compatibility or safety guarantee if you do so.
-  struct {
-    wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL];
-    // TODO: color spaces.
-  } private_impl;
-
-#ifdef __cplusplus
-  inline wuffs_base__status set_interleaved(
-      const wuffs_base__pixel_config* pixcfg,
-      wuffs_base__table_u8 primary_memory,
-      wuffs_base__slice_u8 palette_memory);
-  inline wuffs_base__status set_from_slice(
-      const wuffs_base__pixel_config* pixcfg,
-      wuffs_base__slice_u8 pixbuf_memory);
-  inline wuffs_base__slice_u8 palette();
-  inline wuffs_base__slice_u8 palette_or_else(wuffs_base__slice_u8 fallback);
-  inline wuffs_base__pixel_format pixel_format() const;
-  inline wuffs_base__table_u8 plane(uint32_t p);
-  inline wuffs_base__color_u32_argb_premul color_u32_at(uint32_t x,
-                                                        uint32_t y) const;
-  inline wuffs_base__status set_color_u32_at(
-      uint32_t x,
-      uint32_t y,
-      wuffs_base__color_u32_argb_premul color);
-  inline wuffs_base__status set_color_u32_fill_rect(
-      wuffs_base__rect_ie_u32 rect,
-      wuffs_base__color_u32_argb_premul color);
-#endif  // __cplusplus
-
-} wuffs_base__pixel_buffer;
-
-static inline wuffs_base__pixel_buffer  //
-wuffs_base__null_pixel_buffer() {
-  wuffs_base__pixel_buffer ret;
-  ret.pixcfg = wuffs_base__null_pixel_config();
-  ret.private_impl.planes[0] = wuffs_base__empty_table_u8();
-  ret.private_impl.planes[1] = wuffs_base__empty_table_u8();
-  ret.private_impl.planes[2] = wuffs_base__empty_table_u8();
-  ret.private_impl.planes[3] = wuffs_base__empty_table_u8();
-  return ret;
-}
-
-static inline wuffs_base__status  //
-wuffs_base__pixel_buffer__set_interleaved(
-    wuffs_base__pixel_buffer* pb,
-    const wuffs_base__pixel_config* pixcfg,
-    wuffs_base__table_u8 primary_memory,
-    wuffs_base__slice_u8 palette_memory) {
-  if (!pb) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  memset(pb, 0, sizeof(*pb));
-  if (!pixcfg ||
-      wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if (wuffs_base__pixel_format__is_indexed(&pixcfg->private_impl.pixfmt) &&
-      (palette_memory.len <
-       WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH)) {
-    return wuffs_base__make_status(
-        wuffs_base__error__bad_argument_length_too_short);
-  }
-  uint32_t bits_per_pixel =
-      wuffs_base__pixel_format__bits_per_pixel(&pixcfg->private_impl.pixfmt);
-  if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {
-    // TODO: support fraction-of-byte pixels, e.g. 1 bit per pixel?
-    return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-  uint64_t bytes_per_pixel = bits_per_pixel / 8;
-
-  uint64_t width_in_bytes =
-      ((uint64_t)pixcfg->private_impl.width) * bytes_per_pixel;
-  if ((width_in_bytes > primary_memory.width) ||
-      (pixcfg->private_impl.height > primary_memory.height)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-
-  pb->pixcfg = *pixcfg;
-  pb->private_impl.planes[0] = primary_memory;
-  if (wuffs_base__pixel_format__is_indexed(&pixcfg->private_impl.pixfmt)) {
-    wuffs_base__table_u8* tab =
-        &pb->private_impl
-             .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];
-    tab->ptr = palette_memory.ptr;
-    tab->width = WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH;
-    tab->height = 1;
-    tab->stride = WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH;
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-static inline wuffs_base__status  //
-wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* pb,
-                                         const wuffs_base__pixel_config* pixcfg,
-                                         wuffs_base__slice_u8 pixbuf_memory) {
-  if (!pb) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  memset(pb, 0, sizeof(*pb));
-  if (!pixcfg) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if (wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) {
-    // TODO: support planar pixel formats, concious of pixel subsampling.
-    return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-  uint32_t bits_per_pixel =
-      wuffs_base__pixel_format__bits_per_pixel(&pixcfg->private_impl.pixfmt);
-  if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {
-    // TODO: support fraction-of-byte pixels, e.g. 1 bit per pixel?
-    return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-  uint64_t bytes_per_pixel = bits_per_pixel / 8;
-
-  uint8_t* ptr = pixbuf_memory.ptr;
-  uint64_t len = pixbuf_memory.len;
-  if (wuffs_base__pixel_format__is_indexed(&pixcfg->private_impl.pixfmt)) {
-    // Split a WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH byte
-    // chunk (1024 bytes = 256 palette entries × 4 bytes per entry) from the
-    // start of pixbuf_memory. We split from the start, not the end, so that
-    // the both chunks' pointers have the same alignment as the original
-    // pointer, up to an alignment of 1024.
-    if (len < WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-      return wuffs_base__make_status(
-          wuffs_base__error__bad_argument_length_too_short);
-    }
-    wuffs_base__table_u8* tab =
-        &pb->private_impl
-             .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];
-    tab->ptr = ptr;
-    tab->width = WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH;
-    tab->height = 1;
-    tab->stride = WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH;
-    ptr += WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH;
-    len -= WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH;
-  }
-
-  uint64_t wh = ((uint64_t)pixcfg->private_impl.width) *
-                ((uint64_t)pixcfg->private_impl.height);
-  size_t width = (size_t)(pixcfg->private_impl.width);
-  if ((wh > (UINT64_MAX / bytes_per_pixel)) ||
-      (width > (SIZE_MAX / bytes_per_pixel))) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  wh *= bytes_per_pixel;
-  width = ((size_t)(width * bytes_per_pixel));
-  if (wh > len) {
-    return wuffs_base__make_status(
-        wuffs_base__error__bad_argument_length_too_short);
-  }
-
-  pb->pixcfg = *pixcfg;
-  wuffs_base__table_u8* tab = &pb->private_impl.planes[0];
-  tab->ptr = ptr;
-  tab->width = width;
-  tab->height = pixcfg->private_impl.height;
-  tab->stride = width;
-  return wuffs_base__make_status(NULL);
-}
-
-// wuffs_base__pixel_buffer__palette returns the palette color data. If
-// non-empty, it will have length
-// WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH.
-static inline wuffs_base__slice_u8  //
-wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* pb) {
-  if (pb &&
-      wuffs_base__pixel_format__is_indexed(&pb->pixcfg.private_impl.pixfmt)) {
-    wuffs_base__table_u8* tab =
-        &pb->private_impl
-             .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];
-    if ((tab->width ==
-         WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) &&
-        (tab->height == 1)) {
-      return wuffs_base__make_slice_u8(
-          tab->ptr, WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH);
-    }
-  }
-  return wuffs_base__make_slice_u8(NULL, 0);
-}
-
-static inline wuffs_base__slice_u8  //
-wuffs_base__pixel_buffer__palette_or_else(wuffs_base__pixel_buffer* pb,
-                                          wuffs_base__slice_u8 fallback) {
-  if (pb &&
-      wuffs_base__pixel_format__is_indexed(&pb->pixcfg.private_impl.pixfmt)) {
-    wuffs_base__table_u8* tab =
-        &pb->private_impl
-             .planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];
-    if ((tab->width ==
-         WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) &&
-        (tab->height == 1)) {
-      return wuffs_base__make_slice_u8(
-          tab->ptr, WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH);
-    }
-  }
-  return fallback;
-}
-
-static inline wuffs_base__pixel_format  //
-wuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* pb) {
-  if (pb) {
-    return pb->pixcfg.private_impl.pixfmt;
-  }
-  return wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__INVALID);
-}
-
-static inline wuffs_base__table_u8  //
-wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* pb, uint32_t p) {
-  if (pb && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL)) {
-    return pb->private_impl.planes[p];
-  }
-
-  wuffs_base__table_u8 ret;
-  ret.ptr = NULL;
-  ret.width = 0;
-  ret.height = 0;
-  ret.stride = 0;
-  return ret;
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__color_u32_argb_premul  //
-wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb,
-                                       uint32_t x,
-                                       uint32_t y);
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
-wuffs_base__pixel_buffer__set_color_u32_at(
-    wuffs_base__pixel_buffer* pb,
-    uint32_t x,
-    uint32_t y,
-    wuffs_base__color_u32_argb_premul color);
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect(
-    wuffs_base__pixel_buffer* pb,
-    wuffs_base__rect_ie_u32 rect,
-    wuffs_base__color_u32_argb_premul color);
-
-#ifdef __cplusplus
-
-inline wuffs_base__status  //
-wuffs_base__pixel_buffer::set_interleaved(
-    const wuffs_base__pixel_config* pixcfg_arg,
-    wuffs_base__table_u8 primary_memory,
-    wuffs_base__slice_u8 palette_memory) {
-  return wuffs_base__pixel_buffer__set_interleaved(
-      this, pixcfg_arg, primary_memory, palette_memory);
-}
-
-inline wuffs_base__status  //
-wuffs_base__pixel_buffer::set_from_slice(
-    const wuffs_base__pixel_config* pixcfg_arg,
-    wuffs_base__slice_u8 pixbuf_memory) {
-  return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg_arg,
-                                                  pixbuf_memory);
-}
-
-inline wuffs_base__slice_u8  //
-wuffs_base__pixel_buffer::palette() {
-  return wuffs_base__pixel_buffer__palette(this);
-}
-
-inline wuffs_base__slice_u8  //
-wuffs_base__pixel_buffer::palette_or_else(wuffs_base__slice_u8 fallback) {
-  return wuffs_base__pixel_buffer__palette_or_else(this, fallback);
-}
-
-inline wuffs_base__pixel_format  //
-wuffs_base__pixel_buffer::pixel_format() const {
-  return wuffs_base__pixel_buffer__pixel_format(this);
-}
-
-inline wuffs_base__table_u8  //
-wuffs_base__pixel_buffer::plane(uint32_t p) {
-  return wuffs_base__pixel_buffer__plane(this, p);
-}
-
-inline wuffs_base__color_u32_argb_premul  //
-wuffs_base__pixel_buffer::color_u32_at(uint32_t x, uint32_t y) const {
-  return wuffs_base__pixel_buffer__color_u32_at(this, x, y);
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect(
-    wuffs_base__pixel_buffer* pb,
-    wuffs_base__rect_ie_u32 rect,
-    wuffs_base__color_u32_argb_premul color);
-
-inline wuffs_base__status  //
-wuffs_base__pixel_buffer::set_color_u32_at(
-    uint32_t x,
-    uint32_t y,
-    wuffs_base__color_u32_argb_premul color) {
-  return wuffs_base__pixel_buffer__set_color_u32_at(this, x, y, color);
-}
-
-inline wuffs_base__status  //
-wuffs_base__pixel_buffer::set_color_u32_fill_rect(
-    wuffs_base__rect_ie_u32 rect,
-    wuffs_base__color_u32_argb_premul color) {
-  return wuffs_base__pixel_buffer__set_color_u32_fill_rect(this, rect, color);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-typedef struct wuffs_base__decode_frame_options__struct {
-  // Do not access the private_impl's fields directly. There is no API/ABI
-  // compatibility or safety guarantee if you do so.
-  struct {
-    uint8_t TODO;
-  } private_impl;
-
-#ifdef __cplusplus
-#endif  // __cplusplus
-
-} wuffs_base__decode_frame_options;
-
-#ifdef __cplusplus
-
-#endif  // __cplusplus
-
-// --------
-
-// wuffs_base__pixel_palette__closest_element returns the index of the palette
-// element that minimizes the sum of squared differences of the four ARGB
-// channels, working in premultiplied alpha. Ties favor the smaller index.
-//
-// The palette_slice.len may equal (N*4), for N less than 256, which means that
-// only the first N palette elements are considered. It returns 0 when N is 0.
-//
-// Applying this function on a per-pixel basis will not produce whole-of-image
-// dithering.
-WUFFS_BASE__MAYBE_STATIC uint8_t  //
-wuffs_base__pixel_palette__closest_element(
-    wuffs_base__slice_u8 palette_slice,
-    wuffs_base__pixel_format palette_format,
-    wuffs_base__color_u32_argb_premul c);
-
-// --------
-
-// TODO: should the func type take restrict pointers?
-typedef uint64_t (*wuffs_base__pixel_swizzler__func)(uint8_t* dst_ptr,
-                                                     size_t dst_len,
-                                                     uint8_t* dst_palette_ptr,
-                                                     size_t dst_palette_len,
-                                                     const uint8_t* src_ptr,
-                                                     size_t src_len);
-
-typedef uint64_t (*wuffs_base__pixel_swizzler__transparent_black_func)(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    uint64_t num_pixels,
-    uint32_t dst_pixfmt_bytes_per_pixel);
-
-typedef struct wuffs_base__pixel_swizzler__struct {
-  // Do not access the private_impl's fields directly. There is no API/ABI
-  // compatibility or safety guarantee if you do so.
-  struct {
-    wuffs_base__pixel_swizzler__func func;
-    wuffs_base__pixel_swizzler__transparent_black_func transparent_black_func;
-    uint32_t dst_pixfmt_bytes_per_pixel;
-    uint32_t src_pixfmt_bytes_per_pixel;
-  } private_impl;
-
-#ifdef __cplusplus
-  inline wuffs_base__status prepare(wuffs_base__pixel_format dst_pixfmt,
-                                    wuffs_base__slice_u8 dst_palette,
-                                    wuffs_base__pixel_format src_pixfmt,
-                                    wuffs_base__slice_u8 src_palette,
-                                    wuffs_base__pixel_blend blend);
-  inline uint64_t swizzle_interleaved_from_slice(
-      wuffs_base__slice_u8 dst,
-      wuffs_base__slice_u8 dst_palette,
-      wuffs_base__slice_u8 src) const;
-#endif  // __cplusplus
-
-} wuffs_base__pixel_swizzler;
-
-// wuffs_base__pixel_swizzler__prepare readies the pixel swizzler so that its
-// other methods may be called.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__PIXCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
-wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
-                                    wuffs_base__pixel_format dst_pixfmt,
-                                    wuffs_base__slice_u8 dst_palette,
-                                    wuffs_base__pixel_format src_pixfmt,
-                                    wuffs_base__slice_u8 src_palette,
-                                    wuffs_base__pixel_blend blend);
-
-// wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice converts pixels
-// from a source format to a destination format.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__PIXCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC uint64_t  //
-wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(
-    const wuffs_base__pixel_swizzler* p,
-    wuffs_base__slice_u8 dst,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src);
-
-#ifdef __cplusplus
-
-inline wuffs_base__status  //
-wuffs_base__pixel_swizzler::prepare(wuffs_base__pixel_format dst_pixfmt,
-                                    wuffs_base__slice_u8 dst_palette,
-                                    wuffs_base__pixel_format src_pixfmt,
-                                    wuffs_base__slice_u8 src_palette,
-                                    wuffs_base__pixel_blend blend) {
-  return wuffs_base__pixel_swizzler__prepare(this, dst_pixfmt, dst_palette,
-                                             src_pixfmt, src_palette, blend);
-}
-
-uint64_t  //
-wuffs_base__pixel_swizzler::swizzle_interleaved_from_slice(
-    wuffs_base__slice_u8 dst,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src) const {
-  return wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(
-      this, dst, dst_palette, src);
-}
-
-#endif  // __cplusplus
-
-// ---------------- String Conversions
-
-// Options (bitwise or'ed together) for wuffs_base__parse_number_xxx
-// functions. The XXX options apply to both integer and floating point. The FXX
-// options apply only to floating point.
-
-#define WUFFS_BASE__PARSE_NUMBER_XXX__DEFAULT_OPTIONS ((uint32_t)0x00000000)
-
-// WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_MULTIPLE_LEADING_ZEROES means to accept
-// inputs like "00", "0644" and "00.7". By default, they are rejected.
-#define WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_MULTIPLE_LEADING_ZEROES \
-  ((uint32_t)0x00000001)
-
-// WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES means to accept inputs like
-// "1__2" and "_3.141_592". By default, they are rejected.
-#define WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES ((uint32_t)0x00000002)
-
-// WUFFS_BASE__PARSE_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA means to accept
-// "1,5" and not "1.5" as one-and-a-half.
-//
-// If the caller wants to accept either, it is responsible for canonicalizing
-// the input before calling wuffs_base__parse_number_fxx. The caller also has
-// more context on e.g. exactly how to treat something like "$1,234".
-#define WUFFS_BASE__PARSE_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA \
-  ((uint32_t)0x00000010)
-
-// WUFFS_BASE__PARSE_NUMBER_FXX__REJECT_INF_AND_NAN means to reject inputs that
-// would lead to infinite or Not-a-Number floating point values. By default,
-// they are accepted.
-//
-// This affects the literal "inf" as input, but also affects inputs like
-// "1e999" that would overflow double-precision floating point.
-#define WUFFS_BASE__PARSE_NUMBER_FXX__REJECT_INF_AND_NAN ((uint32_t)0x00000020)
-
-// --------
-
-// Options (bitwise or'ed together) for wuffs_base__render_number_xxx
-// functions. The XXX options apply to both integer and floating point. The FXX
-// options apply only to floating point.
-
-#define WUFFS_BASE__RENDER_NUMBER_XXX__DEFAULT_OPTIONS ((uint32_t)0x00000000)
-
-// WUFFS_BASE__RENDER_NUMBER_XXX__ALIGN_RIGHT means to render to the right side
-// (higher indexes) of the destination slice, leaving any untouched bytes on
-// the left side (lower indexes). The default is vice versa: rendering on the
-// left with slack on the right.
-#define WUFFS_BASE__RENDER_NUMBER_XXX__ALIGN_RIGHT ((uint32_t)0x00000100)
-
-// WUFFS_BASE__RENDER_NUMBER_XXX__LEADING_PLUS_SIGN means to render the leading
-// "+" for non-negative numbers: "+0" and "+12.3" instead of "0" and "12.3".
-#define WUFFS_BASE__RENDER_NUMBER_XXX__LEADING_PLUS_SIGN ((uint32_t)0x00000200)
-
-// WUFFS_BASE__RENDER_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA means to render
-// one-and-a-half as "1,5" instead of "1.5".
-#define WUFFS_BASE__RENDER_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA \
-  ((uint32_t)0x00001000)
-
-// WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_ETC means whether to never
-// (EXPONENT_ABSENT, equivalent to printf's "%f") or to always
-// (EXPONENT_PRESENT, equivalent to printf's "%e") render a floating point
-// number as "1.23e+05" instead of "123000".
-//
-// Having both bits set is the same has having neither bit set, where the
-// notation used depends on whether the exponent is sufficiently large: "0.5"
-// is preferred over "5e-01" but "5e-09" is preferred over "0.000000005".
-#define WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_ABSENT ((uint32_t)0x00002000)
-#define WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_PRESENT ((uint32_t)0x00004000)
-
-// WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION means to render the
-// smallest number of digits so that parsing the resultant string will recover
-// the same double-precision floating point number.
-//
-// For example, double-precision cannot distinguish between 0.3 and
-// 0.299999999999999988897769753748434595763683319091796875, so when this bit
-// is set, rendering the latter will produce "0.3" but rendering
-// 0.3000000000000000444089209850062616169452667236328125 will produce
-// "0.30000000000000004".
-#define WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION \
-  ((uint32_t)0x00008000)
-
-// ---------------- IEEE 754 Floating Point
-
-// wuffs_base__ieee_754_bit_representation__etc converts between a double
-// precision numerical value and its IEEE 754 representations:
-//  - 16-bit: 1 sign bit,  5 exponent bits, 10 explicit significand bits.
-//  - 32-bit: 1 sign bit,  8 exponent bits, 23 explicit significand bits.
-//  - 64-bit: 1 sign bit, 11 exponent bits, 52 explicit significand bits.
-//
-// For example, it converts between:
-//  - +1.0 and 0x3C00, 0x3F80_0000 or 0x3FF0_0000_0000_0000.
-//  - +5.5 and 0x4580, 0x40B0_0000 or 0x4016_0000_0000_0000.
-//  - -inf and 0xFC00, 0xFF80_0000 or 0xFFF0_0000_0000_0000.
-//
-// Converting from f64 to shorter formats (f16 or f32, represented in C as
-// uint16_t and uint32_t) may be lossy. Such functions have names that look
-// like etc_truncate, as converting finite numbers produce equal or smaller
-// (closer-to-zero) finite numbers. For example, 1048576.0 is a perfectly valid
-// f64 number, but converting it to a f16 (with truncation) produces 65504.0,
-// the largest finite f16 number. Truncating a f64-typed value d to f32 does
-// not always produce the same result as the C-style cast ((float)d), as
-// casting can convert from finite numbers to infinite ones.
-//
-// Converting infinities or NaNs produces infinities or NaNs and always report
-// no loss, even though there a multiple NaN representations so that round-
-// tripping a f64-typed NaN may produce a different 64 bits. Nonetheless, the
-// etc_truncate functions preserve a NaN's "quiet vs signaling" bit.
-//
-// See https://en.wikipedia.org/wiki/Double-precision_floating-point_format
-
-typedef struct wuffs_base__lossy_value_u16__struct {
-  uint16_t value;
-  bool lossy;
-} wuffs_base__lossy_value_u16;
-
-typedef struct wuffs_base__lossy_value_u32__struct {
-  uint32_t value;
-  bool lossy;
-} wuffs_base__lossy_value_u32;
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__lossy_value_u16  //
-wuffs_base__ieee_754_bit_representation__from_f64_to_u16_truncate(double f);
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__lossy_value_u32  //
-wuffs_base__ieee_754_bit_representation__from_f64_to_u32_truncate(double f);
-
-static inline uint64_t  //
-wuffs_base__ieee_754_bit_representation__from_f64_to_u64(double f) {
-  uint64_t u = 0;
-  if (sizeof(uint64_t) == sizeof(double)) {
-    memcpy(&u, &f, sizeof(uint64_t));
-  }
-  return u;
-}
-
-static inline double  //
-wuffs_base__ieee_754_bit_representation__from_u16_to_f64(uint16_t u) {
-  uint64_t v = ((uint64_t)(u & 0x8000)) << 48;
-
-  do {
-    uint64_t exp = (u >> 10) & 0x1F;
-    uint64_t man = u & 0x3FF;
-    if (exp == 0x1F) {  // Infinity or NaN.
-      exp = 2047;
-    } else if (exp != 0) {  // Normal.
-      exp += 1008;          // 1008 = 1023 - 15, the difference in biases.
-    } else if (man != 0) {  // Subnormal but non-zero.
-      uint32_t clz = wuffs_base__count_leading_zeroes_u64(man);
-      exp = 1062 - clz;  // 1062 = 1008 + 64 - 10.
-      man = 0x3FF & (man << (clz - 53));
-    } else {  // Zero.
-      break;
-    }
-    v |= (exp << 52) | (man << 42);
-  } while (0);
-
-  double f = 0;
-  if (sizeof(uint64_t) == sizeof(double)) {
-    memcpy(&f, &v, sizeof(uint64_t));
-  }
-  return f;
-}
-
-static inline double  //
-wuffs_base__ieee_754_bit_representation__from_u32_to_f64(uint32_t u) {
-  float f = 0;
-  if (sizeof(uint32_t) == sizeof(float)) {
-    memcpy(&f, &u, sizeof(uint32_t));
-  }
-  return (double)f;
-}
-
-static inline double  //
-wuffs_base__ieee_754_bit_representation__from_u64_to_f64(uint64_t u) {
-  double f = 0;
-  if (sizeof(uint64_t) == sizeof(double)) {
-    memcpy(&f, &u, sizeof(uint64_t));
-  }
-  return f;
-}
-
-// ---------------- Parsing and Rendering Numbers
-
-// wuffs_base__parse_number_f64 parses the floating point number in s. For
-// example, if s contains the bytes "1.5" then it will return the double 1.5.
-//
-// It returns an error if s does not contain a floating point number.
-//
-// It does not necessarily return an error if the conversion is lossy, e.g. if
-// s is "0.3", which double-precision floating point cannot represent exactly.
-//
-// Similarly, the returned value may be infinite (and no error returned) even
-// if s was not "inf", when the input is nominally finite but sufficiently
-// larger than DBL_MAX, about 1.8e+308.
-//
-// It is similar to the C standard library's strtod function, but:
-//  - Errors are returned in-band (in a result type), not out-of-band (errno).
-//  - It takes a slice (a pointer and length), not a NUL-terminated C string.
-//  - It does not take an optional endptr argument. It does not allow a partial
-//    parse: it returns an error unless all of s is consumed.
-//  - It does not allow whitespace, leading or otherwise.
-//  - It does not allow hexadecimal floating point numbers.
-//  - It is not affected by i18n / l10n settings such as environment variables.
-//
-// The options argument can change these, but by default, it:
-//  - Allows "inf", "+Infinity" and "-NAN", case insensitive. Similarly,
-//    without an explicit opt-out, it would successfully parse "1e999" as
-//    infinity, even though it overflows double-precision floating point.
-//  - Rejects underscores. With an explicit opt-in, "_3.141_592" would
-//    successfully parse as an approximation to π.
-//  - Rejects unnecessary leading zeroes: "00", "0644" and "00.7".
-//  - Uses a dot '1.5' instead of a comma '1,5' for the decimal separator.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__FLOATCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__result_f64  //
-wuffs_base__parse_number_f64(wuffs_base__slice_u8 s, uint32_t options);
-
-// wuffs_base__parse_number_i64 parses the ASCII integer in s. For example, if
-// s contains the bytes "-123" then it will return the int64_t -123.
-//
-// It returns an error if s does not contain an integer or if the integer
-// within would overflow an int64_t.
-//
-// It is similar to wuffs_base__parse_number_u64 but it returns a signed
-// integer, not an unsigned integer. It also allows a leading '+' or '-'.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__result_i64  //
-wuffs_base__parse_number_i64(wuffs_base__slice_u8 s, uint32_t options);
-
-// wuffs_base__parse_number_u64 parses the ASCII integer in s. For example, if
-// s contains the bytes "123" then it will return the uint64_t 123.
-//
-// It returns an error if s does not contain an integer or if the integer
-// within would overflow a uint64_t.
-//
-// It is similar to the C standard library's strtoull function, but:
-//  - Errors are returned in-band (in a result type), not out-of-band (errno).
-//  - It takes a slice (a pointer and length), not a NUL-terminated C string.
-//  - It does not take an optional endptr argument. It does not allow a partial
-//    parse: it returns an error unless all of s is consumed.
-//  - It does not allow whitespace, leading or otherwise.
-//  - It does not allow a leading '+' or '-'.
-//  - It does not take a base argument (e.g. base 10 vs base 16). Instead, it
-//    always accepts both decimal (e.g "1234", "0d5678") and hexadecimal (e.g.
-//    "0x9aBC"). The caller is responsible for prior filtering of e.g. hex
-//    numbers if they are unwanted. For example, Wuffs' JSON decoder will only
-//    produce a wuffs_base__token for decimal numbers, not hexadecimal.
-//  - It is not affected by i18n / l10n settings such as environment variables.
-//
-// The options argument can change these, but by default, it:
-//  - Rejects underscores. With an explicit opt-in, "__0D_1_002" would
-//    successfully parse as "one thousand and two". Underscores are still
-//    rejected inside the optional 2-byte opening "0d" or "0X" that denotes
-//    base-10 or base-16.
-//  - Rejects unnecessary leading zeroes: "00" and "0644".
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__result_u64  //
-wuffs_base__parse_number_u64(wuffs_base__slice_u8 s, uint32_t options);
-
-// --------
-
-// WUFFS_BASE__I64__BYTE_LENGTH__MAX_INCL is the string length of
-// "-9223372036854775808" and "+9223372036854775807", INT64_MIN and INT64_MAX.
-#define WUFFS_BASE__I64__BYTE_LENGTH__MAX_INCL 20
-
-// WUFFS_BASE__U64__BYTE_LENGTH__MAX_INCL is the string length of
-// "+18446744073709551615", UINT64_MAX.
-#define WUFFS_BASE__U64__BYTE_LENGTH__MAX_INCL 21
-
-// wuffs_base__render_number_f64 writes the decimal encoding of x to dst and
-// returns the number of bytes written. If dst is shorter than the entire
-// encoding, it returns 0 (and no bytes are written).
-//
-// For those familiar with C's printf or Go's fmt.Printf functions:
-//  - "%e" means the WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_PRESENT option.
-//  - "%f" means the WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_ABSENT  option.
-//  - "%g" means neither or both bits are set.
-//
-// The precision argument controls the number of digits rendered, excluding the
-// exponent (the "e+05" in "1.23e+05"):
-//  - for "%e" and "%f" it is the number of digits after the decimal separator,
-//  - for "%g" it is the number of significant digits (and trailing zeroes are
-//    removed).
-//
-// A precision of 6 gives similar output to printf's defaults.
-//
-// A precision greater than 4095 is equivalent to 4095.
-//
-// The precision argument is ignored when the
-// WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION option is set. This is
-// similar to Go's strconv.FormatFloat with a negative (i.e. non-sensical)
-// precision, but there is no corresponding feature in C's printf.
-//
-// Extreme values of x will be rendered as "NaN", "Inf" (or "+Inf" if the
-// WUFFS_BASE__RENDER_NUMBER_XXX__LEADING_PLUS_SIGN option is set) or "-Inf".
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__FLOATCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__render_number_f64(wuffs_base__slice_u8 dst,
-                              double x,
-                              uint32_t precision,
-                              uint32_t options);
-
-// wuffs_base__render_number_i64 writes the decimal encoding of x to dst and
-// returns the number of bytes written. If dst is shorter than the entire
-// encoding, it returns 0 (and no bytes are written).
-//
-// dst will never be too short if its length is at least 20, also known as
-// WUFFS_BASE__I64__BYTE_LENGTH__MAX_INCL.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__render_number_i64(wuffs_base__slice_u8 dst,
-                              int64_t x,
-                              uint32_t options);
-
-// wuffs_base__render_number_u64 writes the decimal encoding of x to dst and
-// returns the number of bytes written. If dst is shorter than the entire
-// encoding, it returns 0 (and no bytes are written).
-//
-// dst will never be too short if its length is at least 21, also known as
-// WUFFS_BASE__U64__BYTE_LENGTH__MAX_INCL.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__render_number_u64(wuffs_base__slice_u8 dst,
-                              uint64_t x,
-                              uint32_t options);
-
-// ---------------- Base-16
-
-// Options (bitwise or'ed together) for wuffs_base__base_16__xxx functions.
-
-#define WUFFS_BASE__BASE_16__DEFAULT_OPTIONS ((uint32_t)0x00000000)
-
-// wuffs_base__base_16__decode2 converts "6A6b" to "jk", where e.g. 'j' is
-// U+006A. There are 2 src bytes for every dst byte.
-//
-// It assumes that the src bytes are two hexadecimal digits (0-9, A-F, a-f),
-// repeated. It may write nonsense bytes if not, although it will not read or
-// write out of bounds.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_16__decode2(wuffs_base__slice_u8 dst,
-                             wuffs_base__slice_u8 src,
-                             bool src_closed,
-                             uint32_t options);
-
-// wuffs_base__base_16__decode4 converts both "\\x6A\\x6b" and "??6a??6B" to
-// "jk", where e.g. 'j' is U+006A. There are 4 src bytes for every dst byte.
-//
-// It assumes that the src bytes are two ignored bytes and then two hexadecimal
-// digits (0-9, A-F, a-f), repeated. It may write nonsense bytes if not,
-// although it will not read or write out of bounds.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_16__decode4(wuffs_base__slice_u8 dst,
-                             wuffs_base__slice_u8 src,
-                             bool src_closed,
-                             uint32_t options);
-
-// wuffs_base__base_16__encode2 converts "jk" to "6A6B", where e.g. 'j' is
-// U+006A. There are 2 dst bytes for every src byte.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_16__encode2(wuffs_base__slice_u8 dst,
-                             wuffs_base__slice_u8 src,
-                             bool src_closed,
-                             uint32_t options);
-
-// wuffs_base__base_16__encode4 converts "jk" to "\\x6A\\x6B", where e.g. 'j'
-// is U+006A. There are 4 dst bytes for every src byte.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_16__encode2(wuffs_base__slice_u8 dst,
-                             wuffs_base__slice_u8 src,
-                             bool src_closed,
-                             uint32_t options);
-
-// ---------------- Base-64
-
-// Options (bitwise or'ed together) for wuffs_base__base_64__xxx functions.
-
-#define WUFFS_BASE__BASE_64__DEFAULT_OPTIONS ((uint32_t)0x00000000)
-
-// WUFFS_BASE__BASE_64__DECODE_ALLOW_PADDING means that, when decoding base-64,
-// the input may (but does not need to) be padded with '=' bytes so that the
-// overall encoded length in bytes is a multiple of 4. A successful decoding
-// will return a num_src that includes those padding bytes.
-//
-// Excess padding (e.g. three final '='s) will be rejected as bad data.
-#define WUFFS_BASE__BASE_64__DECODE_ALLOW_PADDING ((uint32_t)0x00000001)
-
-// WUFFS_BASE__BASE_64__ENCODE_EMIT_PADDING means that, when encoding base-64,
-// the output will be padded with '=' bytes so that the overall encoded length
-// in bytes is a multiple of 4.
-#define WUFFS_BASE__BASE_64__ENCODE_EMIT_PADDING ((uint32_t)0x00000002)
-
-// WUFFS_BASE__BASE_64__URL_ALPHABET means that, for base-64, the URL-friendly
-// and file-name-friendly alphabet be used, as per RFC 4648 section 5. When
-// this option bit is off, the standard alphabet from section 4 is used.
-#define WUFFS_BASE__BASE_64__URL_ALPHABET ((uint32_t)0x00000100)
-
-// wuffs_base__base_64__decode transforms base-64 encoded bytes from src to
-// arbitrary bytes in dst.
-//
-// It will not permit line breaks or other whitespace in src. Filtering those
-// out is the responsibility of the caller.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_64__decode(wuffs_base__slice_u8 dst,
-                            wuffs_base__slice_u8 src,
-                            bool src_closed,
-                            uint32_t options);
-
-// wuffs_base__base_64__encode transforms arbitrary bytes from src to base-64
-// encoded bytes in dst.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_64__encode(wuffs_base__slice_u8 dst,
-                            wuffs_base__slice_u8 src,
-                            bool src_closed,
-                            uint32_t options);
-
-// ---------------- Unicode and UTF-8
-
-#define WUFFS_BASE__UNICODE_CODE_POINT__MIN_INCL 0x00000000
-#define WUFFS_BASE__UNICODE_CODE_POINT__MAX_INCL 0x0010FFFF
-
-#define WUFFS_BASE__UNICODE_REPLACEMENT_CHARACTER 0x0000FFFD
-
-#define WUFFS_BASE__UNICODE_SURROGATE__MIN_INCL 0x0000D800
-#define WUFFS_BASE__UNICODE_SURROGATE__MAX_INCL 0x0000DFFF
-
-#define WUFFS_BASE__ASCII__MIN_INCL 0x00
-#define WUFFS_BASE__ASCII__MAX_INCL 0x7F
-
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH__MIN_INCL 1
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH__MAX_INCL 4
-
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH_1__CODE_POINT__MIN_INCL 0x00000000
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH_1__CODE_POINT__MAX_INCL 0x0000007F
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH_2__CODE_POINT__MIN_INCL 0x00000080
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH_2__CODE_POINT__MAX_INCL 0x000007FF
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH_3__CODE_POINT__MIN_INCL 0x00000800
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH_3__CODE_POINT__MAX_INCL 0x0000FFFF
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH_4__CODE_POINT__MIN_INCL 0x00010000
-#define WUFFS_BASE__UTF_8__BYTE_LENGTH_4__CODE_POINT__MAX_INCL 0x0010FFFF
-
-// --------
-
-// wuffs_base__utf_8__next__output is the type returned by
-// wuffs_base__utf_8__next.
-typedef struct wuffs_base__utf_8__next__output__struct {
-  uint32_t code_point;
-  uint32_t byte_length;
-
-#ifdef __cplusplus
-  inline bool is_valid() const;
-#endif  // __cplusplus
-
-} wuffs_base__utf_8__next__output;
-
-static inline wuffs_base__utf_8__next__output  //
-wuffs_base__make_utf_8__next__output(uint32_t code_point,
-                                     uint32_t byte_length) {
-  wuffs_base__utf_8__next__output ret;
-  ret.code_point = code_point;
-  ret.byte_length = byte_length;
-  return ret;
-}
-
-static inline bool  //
-wuffs_base__utf_8__next__output__is_valid(
-    const wuffs_base__utf_8__next__output* o) {
-  if (o) {
-    uint32_t cp = o->code_point;
-    switch (o->byte_length) {
-      case 1:
-        return (cp <= 0x7F);
-      case 2:
-        return (0x080 <= cp) && (cp <= 0x7FF);
-      case 3:
-        // Avoid the 0xD800 ..= 0xDFFF surrogate range.
-        return ((0x0800 <= cp) && (cp <= 0xD7FF)) ||
-               ((0xE000 <= cp) && (cp <= 0xFFFF));
-      case 4:
-        return (0x00010000 <= cp) && (cp <= 0x0010FFFF);
-    }
-  }
-  return false;
-}
-
-#ifdef __cplusplus
-
-inline bool  //
-wuffs_base__utf_8__next__output::is_valid() const {
-  return wuffs_base__utf_8__next__output__is_valid(this);
-}
-
-#endif  // __cplusplus
-
-// --------
-
-// wuffs_base__utf_8__encode writes the UTF-8 encoding of code_point to s and
-// returns the number of bytes written. If code_point is invalid, or if s is
-// shorter than the entire encoding, it returns 0 (and no bytes are written).
-//
-// s will never be too short if its length is at least 4, also known as
-// WUFFS_BASE__UTF_8__BYTE_LENGTH__MAX_INCL.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__UTF8 sub-module, not just
-// WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__utf_8__encode(wuffs_base__slice_u8 dst, uint32_t code_point);
-
-// wuffs_base__utf_8__next returns the next UTF-8 code point (and that code
-// point's byte length) at the start of the read-only slice (s_ptr, s_len).
-//
-// There are exactly two cases in which this function returns something where
-// wuffs_base__utf_8__next__output__is_valid is false:
-//  - If s is empty then it returns {.code_point=0, .byte_length=0}.
-//  - If s is non-empty and starts with invalid UTF-8 then it returns
-//    {.code_point=WUFFS_BASE__UNICODE_REPLACEMENT_CHARACTER, .byte_length=1}.
-//
-// Otherwise, it returns something where
-// wuffs_base__utf_8__next__output__is_valid is true.
-//
-// In any case, it always returns an output that satisfies both of:
-//  - (output.code_point  <= WUFFS_BASE__UNICODE_CODE_POINT__MAX_INCL).
-//  - (output.byte_length <= s_len).
-//
-// If s is a sub-slice of a larger slice of valid UTF-8, but that sub-slice
-// boundary occurs in the middle of a multi-byte UTF-8 encoding of a single
-// code point, then this function may return something invalid. It is the
-// caller's responsibility to split on or otherwise manage UTF-8 boundaries.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__UTF8 sub-module, not just
-// WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__utf_8__next__output  //
-wuffs_base__utf_8__next(const uint8_t* s_ptr, size_t s_len);
-
-// wuffs_base__utf_8__next_from_end is like wuffs_base__utf_8__next except that
-// it looks at the end of (s_ptr, s_len) instead of the start.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__UTF8 sub-module, not just
-// WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC wuffs_base__utf_8__next__output  //
-wuffs_base__utf_8__next_from_end(const uint8_t* s_ptr, size_t s_len);
-
-// wuffs_base__utf_8__longest_valid_prefix returns the largest n such that the
-// sub-slice s[..n] is valid UTF-8, where s is the read-only slice (s_ptr,
-// s_len).
-//
-// In particular, it returns s_len if and only if all of s is valid UTF-8.
-//
-// If s is a sub-slice of a larger slice of valid UTF-8, but that sub-slice
-// boundary occurs in the middle of a multi-byte UTF-8 encoding of a single
-// code point, then this function will return less than s_len. It is the
-// caller's responsibility to split on or otherwise manage UTF-8 boundaries.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__UTF8 sub-module, not just
-// WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__utf_8__longest_valid_prefix(const uint8_t* s_ptr, size_t s_len);
-
-// wuffs_base__ascii__longest_valid_prefix returns the largest n such that the
-// sub-slice s[..n] is valid ASCII, where s is the read-only slice (s_ptr,
-// s_len).
-//
-// In particular, it returns s_len if and only if all of s is valid ASCII.
-// Equivalently, when none of the bytes in s have the 0x80 high bit set.
-//
-// For modular builds that divide the base module into sub-modules, using this
-// function requires the WUFFS_CONFIG__MODULE__BASE__UTF8 sub-module, not just
-// WUFFS_CONFIG__MODULE__BASE__CORE.
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__ascii__longest_valid_prefix(const uint8_t* s_ptr, size_t s_len);
-
-// ---------------- Interface Declarations.
-
-// For modular builds that divide the base module into sub-modules, using these
-// functions require the WUFFS_CONFIG__MODULE__BASE__INTERFACES sub-module, not
-// just WUFFS_CONFIG__MODULE__BASE__CORE.
-
-// --------
-
-extern const char wuffs_base__hasher_u32__vtable_name[];
-
-typedef struct wuffs_base__hasher_u32__func_ptrs__struct {
-  uint64_t (*get_quirk)(
-    const void* self,
-    uint32_t a_key);
-  wuffs_base__status (*set_quirk)(
-    void* self,
-    uint32_t a_key,
-    uint64_t a_value);
-  uint32_t (*update_u32)(
-    void* self,
-    wuffs_base__slice_u8 a_x);
-} wuffs_base__hasher_u32__func_ptrs;
-
-typedef struct wuffs_base__hasher_u32__struct wuffs_base__hasher_u32;
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__hasher_u32__get_quirk(
-    const wuffs_base__hasher_u32* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__hasher_u32__set_quirk(
-    wuffs_base__hasher_u32* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_base__hasher_u32__update_u32(
-    wuffs_base__hasher_u32* self,
-    wuffs_base__slice_u8 a_x);
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_base__hasher_u32__struct {
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable first_vtable;
-  } private_impl;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_base__hasher_u32, decltype(&free)>;
-#endif
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_base__hasher_u32__get_quirk(
-        this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_base__hasher_u32__set_quirk(
-        this, a_key, a_value);
-  }
-
-  inline uint32_t
-  update_u32(
-      wuffs_base__slice_u8 a_x) {
-    return wuffs_base__hasher_u32__update_u32(
-        this, a_x);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_base__hasher_u32__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-// --------
-
-extern const char wuffs_base__image_decoder__vtable_name[];
-
-typedef struct wuffs_base__image_decoder__func_ptrs__struct {
-  wuffs_base__status (*decode_frame)(
-    void* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-  wuffs_base__status (*decode_frame_config)(
-    void* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-  wuffs_base__status (*decode_image_config)(
-    void* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-  wuffs_base__rect_ie_u32 (*frame_dirty_rect)(
-    const void* self);
-  uint64_t (*get_quirk)(
-    const void* self,
-    uint32_t a_key);
-  uint32_t (*num_animation_loops)(
-    const void* self);
-  uint64_t (*num_decoded_frame_configs)(
-    const void* self);
-  uint64_t (*num_decoded_frames)(
-    const void* self);
-  wuffs_base__status (*restart_frame)(
-    void* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-  wuffs_base__status (*set_quirk)(
-    void* self,
-    uint32_t a_key,
-    uint64_t a_value);
-  wuffs_base__empty_struct (*set_report_metadata)(
-    void* self,
-    uint32_t a_fourcc,
-    bool a_report);
-  wuffs_base__status (*tell_me_more)(
-    void* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-  wuffs_base__range_ii_u64 (*workbuf_len)(
-    const void* self);
-} wuffs_base__image_decoder__func_ptrs;
-
-typedef struct wuffs_base__image_decoder__struct wuffs_base__image_decoder;
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__decode_frame(
-    wuffs_base__image_decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__decode_frame_config(
-    wuffs_base__image_decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__decode_image_config(
-    wuffs_base__image_decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_base__image_decoder__frame_dirty_rect(
-    const wuffs_base__image_decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__image_decoder__get_quirk(
-    const wuffs_base__image_decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_base__image_decoder__num_animation_loops(
-    const wuffs_base__image_decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__image_decoder__num_decoded_frame_configs(
-    const wuffs_base__image_decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__image_decoder__num_decoded_frames(
-    const wuffs_base__image_decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__restart_frame(
-    wuffs_base__image_decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__set_quirk(
-    wuffs_base__image_decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_base__image_decoder__set_report_metadata(
-    wuffs_base__image_decoder* self,
-    uint32_t a_fourcc,
-    bool a_report);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__tell_me_more(
-    wuffs_base__image_decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_base__image_decoder__workbuf_len(
-    const wuffs_base__image_decoder* self);
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_base__image_decoder__struct {
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable first_vtable;
-  } private_impl;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_base__image_decoder, decltype(&free)>;
-#endif
-
-  inline wuffs_base__status
-  decode_frame(
-      wuffs_base__pixel_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__pixel_blend a_blend,
-      wuffs_base__slice_u8 a_workbuf,
-      wuffs_base__decode_frame_options* a_opts) {
-    return wuffs_base__image_decoder__decode_frame(
-        this, a_dst, a_src, a_blend, a_workbuf, a_opts);
-  }
-
-  inline wuffs_base__status
-  decode_frame_config(
-      wuffs_base__frame_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_base__image_decoder__decode_frame_config(
-        this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_image_config(
-      wuffs_base__image_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_base__image_decoder__decode_image_config(
-        this, a_dst, a_src);
-  }
-
-  inline wuffs_base__rect_ie_u32
-  frame_dirty_rect() const {
-    return wuffs_base__image_decoder__frame_dirty_rect(this);
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_base__image_decoder__get_quirk(
-        this, a_key);
-  }
-
-  inline uint32_t
-  num_animation_loops() const {
-    return wuffs_base__image_decoder__num_animation_loops(this);
-  }
-
-  inline uint64_t
-  num_decoded_frame_configs() const {
-    return wuffs_base__image_decoder__num_decoded_frame_configs(this);
-  }
-
-  inline uint64_t
-  num_decoded_frames() const {
-    return wuffs_base__image_decoder__num_decoded_frames(this);
-  }
-
-  inline wuffs_base__status
-  restart_frame(
-      uint64_t a_index,
-      uint64_t a_io_position) {
-    return wuffs_base__image_decoder__restart_frame(
-        this, a_index, a_io_position);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_base__image_decoder__set_quirk(
-        this, a_key, a_value);
-  }
-
-  inline wuffs_base__empty_struct
-  set_report_metadata(
-      uint32_t a_fourcc,
-      bool a_report) {
-    return wuffs_base__image_decoder__set_report_metadata(
-        this, a_fourcc, a_report);
-  }
-
-  inline wuffs_base__status
-  tell_me_more(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_base__image_decoder__tell_me_more(
-        this, a_dst, a_minfo, a_src);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_base__image_decoder__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_base__image_decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-// --------
-
-extern const char wuffs_base__io_transformer__vtable_name[];
-
-typedef struct wuffs_base__io_transformer__func_ptrs__struct {
-  uint64_t (*get_quirk)(
-    const void* self,
-    uint32_t a_key);
-  wuffs_base__status (*set_quirk)(
-    void* self,
-    uint32_t a_key,
-    uint64_t a_value);
-  wuffs_base__status (*transform_io)(
-    void* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-  wuffs_base__range_ii_u64 (*workbuf_len)(
-    const void* self);
-} wuffs_base__io_transformer__func_ptrs;
-
-typedef struct wuffs_base__io_transformer__struct wuffs_base__io_transformer;
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__io_transformer__get_quirk(
-    const wuffs_base__io_transformer* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__io_transformer__set_quirk(
-    wuffs_base__io_transformer* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__io_transformer__transform_io(
-    wuffs_base__io_transformer* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_base__io_transformer__workbuf_len(
-    const wuffs_base__io_transformer* self);
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_base__io_transformer__struct {
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable first_vtable;
-  } private_impl;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_base__io_transformer, decltype(&free)>;
-#endif
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_base__io_transformer__get_quirk(
-        this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_base__io_transformer__set_quirk(
-        this, a_key, a_value);
-  }
-
-  inline wuffs_base__status
-  transform_io(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__slice_u8 a_workbuf) {
-    return wuffs_base__io_transformer__transform_io(
-        this, a_dst, a_src, a_workbuf);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_base__io_transformer__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_base__io_transformer__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-// --------
-
-extern const char wuffs_base__token_decoder__vtable_name[];
-
-typedef struct wuffs_base__token_decoder__func_ptrs__struct {
-  uint64_t (*get_quirk)(
-    const void* self,
-    uint32_t a_key);
-  wuffs_base__status (*decode_tokens)(
-    void* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-  wuffs_base__status (*set_quirk)(
-    void* self,
-    uint32_t a_key,
-    uint64_t a_value);
-  wuffs_base__range_ii_u64 (*workbuf_len)(
-    const void* self);
-} wuffs_base__token_decoder__func_ptrs;
-
-typedef struct wuffs_base__token_decoder__struct wuffs_base__token_decoder;
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__token_decoder__get_quirk(
-    const wuffs_base__token_decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__token_decoder__decode_tokens(
-    wuffs_base__token_decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__token_decoder__set_quirk(
-    wuffs_base__token_decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_base__token_decoder__workbuf_len(
-    const wuffs_base__token_decoder* self);
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_base__token_decoder__struct {
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable first_vtable;
-  } private_impl;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_base__token_decoder, decltype(&free)>;
-#endif
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_base__token_decoder__get_quirk(
-        this, a_key);
-  }
-
-  inline wuffs_base__status
-  decode_tokens(
-      wuffs_base__token_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__slice_u8 a_workbuf) {
-    return wuffs_base__token_decoder__decode_tokens(
-        this, a_dst, a_src, a_workbuf);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_base__token_decoder__set_quirk(
-        this, a_key, a_value);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_base__token_decoder__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_base__token_decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-// ----------------
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ADLER32) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-// ---------------- Public Consts
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_adler32__hasher__struct wuffs_adler32__hasher;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_adler32__hasher__initialize(
-    wuffs_adler32__hasher* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_adler32__hasher();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_adler32__hasher*
-wuffs_adler32__hasher__alloc();
-
-static inline wuffs_base__hasher_u32*
-wuffs_adler32__hasher__alloc_as__wuffs_base__hasher_u32() {
-  return (wuffs_base__hasher_u32*)(wuffs_adler32__hasher__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__hasher_u32*
-wuffs_adler32__hasher__upcast_as__wuffs_base__hasher_u32(
-    wuffs_adler32__hasher* p) {
-  return (wuffs_base__hasher_u32*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_adler32__hasher__get_quirk(
-    const wuffs_adler32__hasher* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_adler32__hasher__set_quirk(
-    wuffs_adler32__hasher* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_adler32__hasher__update_u32(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_adler32__hasher__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__hasher_u32;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_state;
-    bool f_started;
-
-    wuffs_base__empty_struct (*choosy_up)(
-        wuffs_adler32__hasher* self,
-        wuffs_base__slice_u8 a_x);
-  } private_impl;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_adler32__hasher, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_adler32__hasher__alloc(), &free);
-  }
-
-  static inline wuffs_base__hasher_u32::unique_ptr
-  alloc_as__wuffs_base__hasher_u32() {
-    return wuffs_base__hasher_u32::unique_ptr(
-        wuffs_adler32__hasher__alloc_as__wuffs_base__hasher_u32(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_adler32__hasher__struct() = delete;
-  wuffs_adler32__hasher__struct(const wuffs_adler32__hasher__struct&) = delete;
-  wuffs_adler32__hasher__struct& operator=(
-      const wuffs_adler32__hasher__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_adler32__hasher__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__hasher_u32*
-  upcast_as__wuffs_base__hasher_u32() {
-    return (wuffs_base__hasher_u32*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_adler32__hasher__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_adler32__hasher__set_quirk(this, a_key, a_value);
-  }
-
-  inline uint32_t
-  update_u32(
-      wuffs_base__slice_u8 a_x) {
-    return wuffs_adler32__hasher__update_u32(this, a_x);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_adler32__hasher__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ADLER32) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BMP) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_bmp__error__bad_header[];
-extern const char wuffs_bmp__error__bad_rle_compression[];
-extern const char wuffs_bmp__error__truncated_input[];
-extern const char wuffs_bmp__error__unsupported_bmp_file[];
-
-// ---------------- Public Consts
-
-#define WUFFS_BMP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_bmp__decoder__struct wuffs_bmp__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_bmp__decoder__initialize(
-    wuffs_bmp__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_bmp__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_bmp__decoder*
-wuffs_bmp__decoder__alloc();
-
-static inline wuffs_base__image_decoder*
-wuffs_bmp__decoder__alloc_as__wuffs_base__image_decoder() {
-  return (wuffs_base__image_decoder*)(wuffs_bmp__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__image_decoder*
-wuffs_bmp__decoder__upcast_as__wuffs_base__image_decoder(
-    wuffs_bmp__decoder* p) {
-  return (wuffs_base__image_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bmp__decoder__get_quirk(
-    const wuffs_bmp__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__set_quirk(
-    wuffs_bmp__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__decode_image_config(
-    wuffs_bmp__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__decode_frame_config(
-    wuffs_bmp__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__decode_frame(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_bmp__decoder__frame_dirty_rect(
-    const wuffs_bmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_bmp__decoder__num_animation_loops(
-    const wuffs_bmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bmp__decoder__num_decoded_frame_configs(
-    const wuffs_bmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bmp__decoder__num_decoded_frames(
-    const wuffs_bmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__restart_frame(
-    wuffs_bmp__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_bmp__decoder__set_report_metadata(
-    wuffs_bmp__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__tell_me_more(
-    wuffs_bmp__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_bmp__decoder__workbuf_len(
-    const wuffs_bmp__decoder* self);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_bmp__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__image_decoder;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_width;
-    uint32_t f_height;
-    uint8_t f_call_sequence;
-    bool f_top_down;
-    uint32_t f_pad_per_row;
-    uint32_t f_src_pixfmt;
-    uint32_t f_io_redirect_fourcc;
-    uint64_t f_io_redirect_pos;
-    uint64_t f_frame_config_io_position;
-    uint32_t f_bitmap_info_len;
-    uint32_t f_padding;
-    uint32_t f_bits_per_pixel;
-    uint32_t f_compression;
-    uint32_t f_channel_masks[4];
-    uint8_t f_channel_shifts[4];
-    uint8_t f_channel_num_bits[4];
-    uint32_t f_dst_x;
-    uint32_t f_dst_y;
-    uint32_t f_dst_y_inc;
-    uint32_t f_pending_pad;
-    uint32_t f_rle_state;
-    uint32_t f_rle_length;
-    uint8_t f_rle_delta_x;
-    bool f_rle_padded;
-    wuffs_base__pixel_swizzler f_swizzler;
-
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-    uint32_t p_tell_me_more[1];
-    uint32_t p_read_palette[1];
-  } private_impl;
-
-  struct {
-    uint8_t f_scratch[2048];
-    uint8_t f_src_palette[1024];
-
-    struct {
-      uint64_t scratch;
-    } s_do_decode_image_config[1];
-    struct {
-      uint64_t scratch;
-    } s_do_decode_frame[1];
-    struct {
-      uint32_t v_i;
-      uint64_t scratch;
-    } s_read_palette[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_bmp__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_bmp__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__image_decoder::unique_ptr
-  alloc_as__wuffs_base__image_decoder() {
-    return wuffs_base__image_decoder::unique_ptr(
-        wuffs_bmp__decoder__alloc_as__wuffs_base__image_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_bmp__decoder__struct() = delete;
-  wuffs_bmp__decoder__struct(const wuffs_bmp__decoder__struct&) = delete;
-  wuffs_bmp__decoder__struct& operator=(
-      const wuffs_bmp__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_bmp__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__image_decoder*
-  upcast_as__wuffs_base__image_decoder() {
-    return (wuffs_base__image_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_bmp__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_bmp__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__status
-  decode_image_config(
-      wuffs_base__image_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_bmp__decoder__decode_image_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame_config(
-      wuffs_base__frame_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_bmp__decoder__decode_frame_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame(
-      wuffs_base__pixel_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__pixel_blend a_blend,
-      wuffs_base__slice_u8 a_workbuf,
-      wuffs_base__decode_frame_options* a_opts) {
-    return wuffs_bmp__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts);
-  }
-
-  inline wuffs_base__rect_ie_u32
-  frame_dirty_rect() const {
-    return wuffs_bmp__decoder__frame_dirty_rect(this);
-  }
-
-  inline uint32_t
-  num_animation_loops() const {
-    return wuffs_bmp__decoder__num_animation_loops(this);
-  }
-
-  inline uint64_t
-  num_decoded_frame_configs() const {
-    return wuffs_bmp__decoder__num_decoded_frame_configs(this);
-  }
-
-  inline uint64_t
-  num_decoded_frames() const {
-    return wuffs_bmp__decoder__num_decoded_frames(this);
-  }
-
-  inline wuffs_base__status
-  restart_frame(
-      uint64_t a_index,
-      uint64_t a_io_position) {
-    return wuffs_bmp__decoder__restart_frame(this, a_index, a_io_position);
-  }
-
-  inline wuffs_base__empty_struct
-  set_report_metadata(
-      uint32_t a_fourcc,
-      bool a_report) {
-    return wuffs_bmp__decoder__set_report_metadata(this, a_fourcc, a_report);
-  }
-
-  inline wuffs_base__status
-  tell_me_more(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_bmp__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_bmp__decoder__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_bmp__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BMP) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BZIP2) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_bzip2__error__bad_huffman_code_over_subscribed[];
-extern const char wuffs_bzip2__error__bad_huffman_code_under_subscribed[];
-extern const char wuffs_bzip2__error__bad_block_header[];
-extern const char wuffs_bzip2__error__bad_block_length[];
-extern const char wuffs_bzip2__error__bad_checksum[];
-extern const char wuffs_bzip2__error__bad_header[];
-extern const char wuffs_bzip2__error__bad_number_of_sections[];
-extern const char wuffs_bzip2__error__truncated_input[];
-extern const char wuffs_bzip2__error__unsupported_block_randomization[];
-
-// ---------------- Public Consts
-
-#define WUFFS_BZIP2__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_bzip2__decoder__struct wuffs_bzip2__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_bzip2__decoder__initialize(
-    wuffs_bzip2__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_bzip2__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_bzip2__decoder*
-wuffs_bzip2__decoder__alloc();
-
-static inline wuffs_base__io_transformer*
-wuffs_bzip2__decoder__alloc_as__wuffs_base__io_transformer() {
-  return (wuffs_base__io_transformer*)(wuffs_bzip2__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__io_transformer*
-wuffs_bzip2__decoder__upcast_as__wuffs_base__io_transformer(
-    wuffs_bzip2__decoder* p) {
-  return (wuffs_base__io_transformer*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bzip2__decoder__get_quirk(
-    const wuffs_bzip2__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bzip2__decoder__set_quirk(
-    wuffs_bzip2__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_bzip2__decoder__workbuf_len(
-    const wuffs_bzip2__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bzip2__decoder__transform_io(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_bzip2__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_bits;
-    uint32_t f_n_bits;
-    uint32_t f_max_incl_block_size;
-    uint32_t f_block_size;
-    bool f_decode_huffman_finished;
-    uint8_t f_decode_huffman_which;
-    uint32_t f_decode_huffman_ticks;
-    uint32_t f_decode_huffman_section;
-    uint32_t f_decode_huffman_run_shift;
-    uint32_t f_flush_pointer;
-    uint32_t f_flush_repeat_count;
-    uint8_t f_flush_prev;
-    bool f_ignore_checksum;
-    uint32_t f_final_checksum_have;
-    uint32_t f_block_checksum_have;
-    uint32_t f_block_checksum_want;
-    uint32_t f_original_pointer;
-    uint32_t f_num_symbols;
-    uint32_t f_num_huffman_codes;
-    uint32_t f_num_sections;
-    uint32_t f_code_lengths_bitmask;
-
-    uint32_t p_transform_io[1];
-    uint32_t p_do_transform_io[1];
-    uint32_t p_prepare_block[1];
-    uint32_t p_read_code_lengths[1];
-    uint32_t p_flush_slow[1];
-    uint32_t p_decode_huffman_slow[1];
-  } private_impl;
-
-  struct {
-    uint32_t f_scratch;
-    uint32_t f_letter_counts[256];
-    uint8_t f_presence[256];
-    uint8_t f_mtft[256];
-    uint8_t f_huffman_selectors[32768];
-    uint16_t f_huffman_trees[6][257][2];
-    uint16_t f_huffman_tables[6][256];
-    uint32_t f_bwt[1048576];
-
-    struct {
-      uint32_t v_i;
-      uint64_t v_tag;
-      uint32_t v_final_checksum_want;
-    } s_do_transform_io[1];
-    struct {
-      uint32_t v_i;
-      uint32_t v_selector;
-    } s_prepare_block[1];
-    struct {
-      uint32_t v_i;
-      uint32_t v_code_length;
-    } s_read_code_lengths[1];
-    struct {
-      uint32_t v_flush_pointer;
-      uint32_t v_flush_repeat_count;
-      uint8_t v_flush_prev;
-      uint32_t v_block_checksum_have;
-      uint32_t v_block_size;
-      uint8_t v_curr;
-      uint64_t scratch;
-    } s_flush_slow[1];
-    struct {
-      uint32_t v_node_index;
-    } s_decode_huffman_slow[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_bzip2__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_bzip2__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__io_transformer::unique_ptr
-  alloc_as__wuffs_base__io_transformer() {
-    return wuffs_base__io_transformer::unique_ptr(
-        wuffs_bzip2__decoder__alloc_as__wuffs_base__io_transformer(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_bzip2__decoder__struct() = delete;
-  wuffs_bzip2__decoder__struct(const wuffs_bzip2__decoder__struct&) = delete;
-  wuffs_bzip2__decoder__struct& operator=(
-      const wuffs_bzip2__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_bzip2__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__io_transformer*
-  upcast_as__wuffs_base__io_transformer() {
-    return (wuffs_base__io_transformer*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_bzip2__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_bzip2__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_bzip2__decoder__workbuf_len(this);
-  }
-
-  inline wuffs_base__status
-  transform_io(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__slice_u8 a_workbuf) {
-    return wuffs_bzip2__decoder__transform_io(this, a_dst, a_src, a_workbuf);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_bzip2__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BZIP2) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CBOR) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_cbor__error__bad_input[];
-extern const char wuffs_cbor__error__unsupported_recursion_depth[];
-
-// ---------------- Public Consts
-
-#define WUFFS_CBOR__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_CBOR__DECODER_DEPTH_MAX_INCL 1024
-
-#define WUFFS_CBOR__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL 2
-
-#define WUFFS_CBOR__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 9
-
-#define WUFFS_CBOR__TOKEN_VALUE_MAJOR 787997
-
-#define WUFFS_CBOR__TOKEN_VALUE_MINOR__DETAIL_MASK 262143
-
-#define WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X 16777216
-
-#define WUFFS_CBOR__TOKEN_VALUE_MINOR__SIMPLE_VALUE 8388608
-
-#define WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG 4194304
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_cbor__decoder__struct wuffs_cbor__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_cbor__decoder__initialize(
-    wuffs_cbor__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_cbor__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_cbor__decoder*
-wuffs_cbor__decoder__alloc();
-
-static inline wuffs_base__token_decoder*
-wuffs_cbor__decoder__alloc_as__wuffs_base__token_decoder() {
-  return (wuffs_base__token_decoder*)(wuffs_cbor__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__token_decoder*
-wuffs_cbor__decoder__upcast_as__wuffs_base__token_decoder(
-    wuffs_cbor__decoder* p) {
-  return (wuffs_base__token_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_cbor__decoder__get_quirk(
-    const wuffs_cbor__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_cbor__decoder__set_quirk(
-    wuffs_cbor__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_cbor__decoder__workbuf_len(
-    const wuffs_cbor__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_cbor__decoder__decode_tokens(
-    wuffs_cbor__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_cbor__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__token_decoder;
-    wuffs_base__vtable null_vtable;
-
-    bool f_end_of_data;
-
-    uint32_t p_decode_tokens[1];
-  } private_impl;
-
-  struct {
-    uint32_t f_stack[64];
-    uint64_t f_container_num_remaining[1024];
-
-    struct {
-      uint64_t v_string_length;
-      uint32_t v_depth;
-      bool v_tagged;
-      uint8_t v_indefinite_string_major_type;
-    } s_decode_tokens[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_cbor__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_cbor__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__token_decoder::unique_ptr
-  alloc_as__wuffs_base__token_decoder() {
-    return wuffs_base__token_decoder::unique_ptr(
-        wuffs_cbor__decoder__alloc_as__wuffs_base__token_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_cbor__decoder__struct() = delete;
-  wuffs_cbor__decoder__struct(const wuffs_cbor__decoder__struct&) = delete;
-  wuffs_cbor__decoder__struct& operator=(
-      const wuffs_cbor__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_cbor__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__token_decoder*
-  upcast_as__wuffs_base__token_decoder() {
-    return (wuffs_base__token_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_cbor__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_cbor__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_cbor__decoder__workbuf_len(this);
-  }
-
-  inline wuffs_base__status
-  decode_tokens(
-      wuffs_base__token_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__slice_u8 a_workbuf) {
-    return wuffs_cbor__decoder__decode_tokens(this, a_dst, a_src, a_workbuf);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_cbor__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CBOR) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-// ---------------- Public Consts
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_crc32__ieee_hasher__struct wuffs_crc32__ieee_hasher;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_crc32__ieee_hasher__initialize(
-    wuffs_crc32__ieee_hasher* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_crc32__ieee_hasher();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_crc32__ieee_hasher*
-wuffs_crc32__ieee_hasher__alloc();
-
-static inline wuffs_base__hasher_u32*
-wuffs_crc32__ieee_hasher__alloc_as__wuffs_base__hasher_u32() {
-  return (wuffs_base__hasher_u32*)(wuffs_crc32__ieee_hasher__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__hasher_u32*
-wuffs_crc32__ieee_hasher__upcast_as__wuffs_base__hasher_u32(
-    wuffs_crc32__ieee_hasher* p) {
-  return (wuffs_base__hasher_u32*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_crc32__ieee_hasher__get_quirk(
-    const wuffs_crc32__ieee_hasher* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_crc32__ieee_hasher__set_quirk(
-    wuffs_crc32__ieee_hasher* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_crc32__ieee_hasher__update_u32(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_crc32__ieee_hasher__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__hasher_u32;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_state;
-
-    wuffs_base__empty_struct (*choosy_up)(
-        wuffs_crc32__ieee_hasher* self,
-        wuffs_base__slice_u8 a_x);
-  } private_impl;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_crc32__ieee_hasher, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_crc32__ieee_hasher__alloc(), &free);
-  }
-
-  static inline wuffs_base__hasher_u32::unique_ptr
-  alloc_as__wuffs_base__hasher_u32() {
-    return wuffs_base__hasher_u32::unique_ptr(
-        wuffs_crc32__ieee_hasher__alloc_as__wuffs_base__hasher_u32(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_crc32__ieee_hasher__struct() = delete;
-  wuffs_crc32__ieee_hasher__struct(const wuffs_crc32__ieee_hasher__struct&) = delete;
-  wuffs_crc32__ieee_hasher__struct& operator=(
-      const wuffs_crc32__ieee_hasher__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_crc32__ieee_hasher__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__hasher_u32*
-  upcast_as__wuffs_base__hasher_u32() {
-    return (wuffs_base__hasher_u32*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_crc32__ieee_hasher__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_crc32__ieee_hasher__set_quirk(this, a_key, a_value);
-  }
-
-  inline uint32_t
-  update_u32(
-      wuffs_base__slice_u8 a_x) {
-    return wuffs_crc32__ieee_hasher__update_u32(this, a_x);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_crc32__ieee_hasher__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__DEFLATE) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_deflate__error__bad_huffman_code_over_subscribed[];
-extern const char wuffs_deflate__error__bad_huffman_code_under_subscribed[];
-extern const char wuffs_deflate__error__bad_huffman_code_length_count[];
-extern const char wuffs_deflate__error__bad_huffman_code_length_repetition[];
-extern const char wuffs_deflate__error__bad_huffman_code[];
-extern const char wuffs_deflate__error__bad_huffman_minimum_code_length[];
-extern const char wuffs_deflate__error__bad_block[];
-extern const char wuffs_deflate__error__bad_distance[];
-extern const char wuffs_deflate__error__bad_distance_code_count[];
-extern const char wuffs_deflate__error__bad_literal_length_code_count[];
-extern const char wuffs_deflate__error__inconsistent_stored_block_length[];
-extern const char wuffs_deflate__error__missing_end_of_block_code[];
-extern const char wuffs_deflate__error__no_huffman_codes[];
-extern const char wuffs_deflate__error__truncated_input[];
-
-// ---------------- Public Consts
-
-#define WUFFS_DEFLATE__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_deflate__decoder__struct wuffs_deflate__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_deflate__decoder__initialize(
-    wuffs_deflate__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_deflate__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_deflate__decoder*
-wuffs_deflate__decoder__alloc();
-
-static inline wuffs_base__io_transformer*
-wuffs_deflate__decoder__alloc_as__wuffs_base__io_transformer() {
-  return (wuffs_base__io_transformer*)(wuffs_deflate__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__io_transformer*
-wuffs_deflate__decoder__upcast_as__wuffs_base__io_transformer(
-    wuffs_deflate__decoder* p) {
-  return (wuffs_base__io_transformer*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_deflate__decoder__add_history(
-    wuffs_deflate__decoder* self,
-    wuffs_base__slice_u8 a_hist);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_deflate__decoder__get_quirk(
-    const wuffs_deflate__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_deflate__decoder__set_quirk(
-    wuffs_deflate__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_deflate__decoder__workbuf_len(
-    const wuffs_deflate__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_deflate__decoder__transform_io(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_deflate__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_bits;
-    uint32_t f_n_bits;
-    uint64_t f_transformed_history_count;
-    uint32_t f_history_index;
-    uint32_t f_n_huffs_bits[2];
-    bool f_end_of_block;
-
-    uint32_t p_transform_io[1];
-    uint32_t p_do_transform_io[1];
-    uint32_t p_decode_blocks[1];
-    uint32_t p_decode_uncompressed[1];
-    uint32_t p_init_dynamic_huffman[1];
-    wuffs_base__status (*choosy_decode_huffman_fast64)(
-        wuffs_deflate__decoder* self,
-        wuffs_base__io_buffer* a_dst,
-        wuffs_base__io_buffer* a_src);
-    uint32_t p_decode_huffman_slow[1];
-  } private_impl;
-
-  struct {
-    uint32_t f_huffs[2][1024];
-    uint8_t f_history[33025];
-    uint8_t f_code_lengths[320];
-
-    struct {
-      uint32_t v_final;
-    } s_decode_blocks[1];
-    struct {
-      uint32_t v_length;
-      uint64_t scratch;
-    } s_decode_uncompressed[1];
-    struct {
-      uint32_t v_bits;
-      uint32_t v_n_bits;
-      uint32_t v_n_lit;
-      uint32_t v_n_dist;
-      uint32_t v_n_clen;
-      uint32_t v_i;
-      uint32_t v_mask;
-      uint32_t v_n_extra_bits;
-      uint8_t v_rep_symbol;
-      uint32_t v_rep_count;
-    } s_init_dynamic_huffman[1];
-    struct {
-      uint32_t v_bits;
-      uint32_t v_n_bits;
-      uint32_t v_table_entry_n_bits;
-      uint32_t v_lmask;
-      uint32_t v_dmask;
-      uint32_t v_redir_top;
-      uint32_t v_redir_mask;
-      uint32_t v_length;
-      uint32_t v_dist_minus_1;
-      uint64_t scratch;
-    } s_decode_huffman_slow[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_deflate__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_deflate__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__io_transformer::unique_ptr
-  alloc_as__wuffs_base__io_transformer() {
-    return wuffs_base__io_transformer::unique_ptr(
-        wuffs_deflate__decoder__alloc_as__wuffs_base__io_transformer(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_deflate__decoder__struct() = delete;
-  wuffs_deflate__decoder__struct(const wuffs_deflate__decoder__struct&) = delete;
-  wuffs_deflate__decoder__struct& operator=(
-      const wuffs_deflate__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_deflate__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__io_transformer*
-  upcast_as__wuffs_base__io_transformer() {
-    return (wuffs_base__io_transformer*)this;
-  }
-
-  inline wuffs_base__empty_struct
-  add_history(
-      wuffs_base__slice_u8 a_hist) {
-    return wuffs_deflate__decoder__add_history(this, a_hist);
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_deflate__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_deflate__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_deflate__decoder__workbuf_len(this);
-  }
-
-  inline wuffs_base__status
-  transform_io(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__slice_u8 a_workbuf) {
-    return wuffs_deflate__decoder__transform_io(this, a_dst, a_src, a_workbuf);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_deflate__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__DEFLATE) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_lzw__error__bad_code[];
-extern const char wuffs_lzw__error__truncated_input[];
-
-// ---------------- Public Consts
-
-#define WUFFS_LZW__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_LZW__QUIRK_LITERAL_WIDTH_PLUS_ONE 1348378624
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_lzw__decoder__struct wuffs_lzw__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_lzw__decoder__initialize(
-    wuffs_lzw__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_lzw__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_lzw__decoder*
-wuffs_lzw__decoder__alloc();
-
-static inline wuffs_base__io_transformer*
-wuffs_lzw__decoder__alloc_as__wuffs_base__io_transformer() {
-  return (wuffs_base__io_transformer*)(wuffs_lzw__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__io_transformer*
-wuffs_lzw__decoder__upcast_as__wuffs_base__io_transformer(
-    wuffs_lzw__decoder* p) {
-  return (wuffs_base__io_transformer*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_lzw__decoder__get_quirk(
-    const wuffs_lzw__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_lzw__decoder__set_quirk(
-    wuffs_lzw__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_lzw__decoder__workbuf_len(
-    const wuffs_lzw__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_lzw__decoder__transform_io(
-    wuffs_lzw__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__slice_u8
-wuffs_lzw__decoder__flush(
-    wuffs_lzw__decoder* self);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_lzw__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_pending_literal_width_plus_one;
-    uint32_t f_literal_width;
-    uint32_t f_clear_code;
-    uint32_t f_end_code;
-    uint32_t f_save_code;
-    uint32_t f_prev_code;
-    uint32_t f_width;
-    uint32_t f_bits;
-    uint32_t f_n_bits;
-    uint32_t f_output_ri;
-    uint32_t f_output_wi;
-    uint32_t f_read_from_return_value;
-    uint16_t f_prefixes[4096];
-
-    uint32_t p_transform_io[1];
-    uint32_t p_write_to[1];
-  } private_impl;
-
-  struct {
-    uint8_t f_suffixes[4096][8];
-    uint16_t f_lm1s[4096];
-    uint8_t f_output[8199];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_lzw__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_lzw__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__io_transformer::unique_ptr
-  alloc_as__wuffs_base__io_transformer() {
-    return wuffs_base__io_transformer::unique_ptr(
-        wuffs_lzw__decoder__alloc_as__wuffs_base__io_transformer(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_lzw__decoder__struct() = delete;
-  wuffs_lzw__decoder__struct(const wuffs_lzw__decoder__struct&) = delete;
-  wuffs_lzw__decoder__struct& operator=(
-      const wuffs_lzw__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_lzw__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__io_transformer*
-  upcast_as__wuffs_base__io_transformer() {
-    return (wuffs_base__io_transformer*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_lzw__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_lzw__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_lzw__decoder__workbuf_len(this);
-  }
-
-  inline wuffs_base__status
-  transform_io(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__slice_u8 a_workbuf) {
-    return wuffs_lzw__decoder__transform_io(this, a_dst, a_src, a_workbuf);
-  }
-
-  inline wuffs_base__slice_u8
-  flush() {
-    return wuffs_lzw__decoder__flush(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_lzw__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GIF) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_gif__error__bad_extension_label[];
-extern const char wuffs_gif__error__bad_frame_size[];
-extern const char wuffs_gif__error__bad_graphic_control[];
-extern const char wuffs_gif__error__bad_header[];
-extern const char wuffs_gif__error__bad_literal_width[];
-extern const char wuffs_gif__error__bad_palette[];
-extern const char wuffs_gif__error__truncated_input[];
-
-// ---------------- Public Consts
-
-#define WUFFS_GIF__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_GIF__QUIRK_DELAY_NUM_DECODED_FRAMES 1041635328
-
-#define WUFFS_GIF__QUIRK_FIRST_FRAME_LOCAL_PALETTE_MEANS_BLACK_BACKGROUND 1041635329
-
-#define WUFFS_GIF__QUIRK_HONOR_BACKGROUND_COLOR 1041635330
-
-#define WUFFS_GIF__QUIRK_IGNORE_TOO_MUCH_PIXEL_DATA 1041635331
-
-#define WUFFS_GIF__QUIRK_IMAGE_BOUNDS_ARE_STRICT 1041635332
-
-#define WUFFS_GIF__QUIRK_REJECT_EMPTY_FRAME 1041635333
-
-#define WUFFS_GIF__QUIRK_REJECT_EMPTY_PALETTE 1041635334
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_gif__decoder__struct wuffs_gif__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_gif__decoder__initialize(
-    wuffs_gif__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_gif__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_gif__decoder*
-wuffs_gif__decoder__alloc();
-
-static inline wuffs_base__image_decoder*
-wuffs_gif__decoder__alloc_as__wuffs_base__image_decoder() {
-  return (wuffs_base__image_decoder*)(wuffs_gif__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__image_decoder*
-wuffs_gif__decoder__upcast_as__wuffs_base__image_decoder(
-    wuffs_gif__decoder* p) {
-  return (wuffs_base__image_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gif__decoder__get_quirk(
-    const wuffs_gif__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__set_quirk(
-    wuffs_gif__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__decode_image_config(
-    wuffs_gif__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_gif__decoder__set_report_metadata(
-    wuffs_gif__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__tell_me_more(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_gif__decoder__num_animation_loops(
-    const wuffs_gif__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gif__decoder__num_decoded_frame_configs(
-    const wuffs_gif__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gif__decoder__num_decoded_frames(
-    const wuffs_gif__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_gif__decoder__frame_dirty_rect(
-    const wuffs_gif__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_gif__decoder__workbuf_len(
-    const wuffs_gif__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__restart_frame(
-    wuffs_gif__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__decode_frame_config(
-    wuffs_gif__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__decode_frame(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_gif__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__image_decoder;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_width;
-    uint32_t f_height;
-    uint8_t f_call_sequence;
-    bool f_report_metadata_iccp;
-    bool f_report_metadata_xmp;
-    uint32_t f_metadata_fourcc;
-    uint64_t f_metadata_io_position;
-    bool f_quirks[7];
-    bool f_delayed_num_decoded_frames;
-    bool f_previous_lzw_decode_ended_abruptly;
-    bool f_seen_header;
-    bool f_has_global_palette;
-    uint8_t f_interlace;
-    bool f_seen_num_animation_loops_value;
-    uint32_t f_num_animation_loops_value;
-    uint32_t f_background_color_u32_argb_premul;
-    uint32_t f_black_color_u32_argb_premul;
-    bool f_gc_has_transparent_index;
-    uint8_t f_gc_transparent_index;
-    uint8_t f_gc_disposal;
-    uint64_t f_gc_duration;
-    uint64_t f_frame_config_io_position;
-    uint64_t f_num_decoded_frame_configs_value;
-    uint64_t f_num_decoded_frames_value;
-    uint32_t f_frame_rect_x0;
-    uint32_t f_frame_rect_y0;
-    uint32_t f_frame_rect_x1;
-    uint32_t f_frame_rect_y1;
-    uint32_t f_dst_x;
-    uint32_t f_dst_y;
-    uint32_t f_dirty_max_excl_y;
-    uint64_t f_compressed_ri;
-    uint64_t f_compressed_wi;
-    wuffs_base__pixel_swizzler f_swizzler;
-
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_tell_me_more[1];
-    uint32_t p_do_tell_me_more[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_skip_frame[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-    uint32_t p_decode_up_to_id_part1[1];
-    uint32_t p_decode_header[1];
-    uint32_t p_decode_lsd[1];
-    uint32_t p_decode_extension[1];
-    uint32_t p_skip_blocks[1];
-    uint32_t p_decode_ae[1];
-    uint32_t p_decode_gc[1];
-    uint32_t p_decode_id_part0[1];
-    uint32_t p_decode_id_part1[1];
-    uint32_t p_decode_id_part2[1];
-  } private_impl;
-
-  struct {
-    uint8_t f_compressed[4096];
-    uint8_t f_palettes[2][1024];
-    uint8_t f_dst_palette[1024];
-    wuffs_lzw__decoder f_lzw;
-
-    struct {
-      uint32_t v_background_color;
-    } s_do_decode_frame_config[1];
-    struct {
-      uint64_t scratch;
-    } s_skip_frame[1];
-    struct {
-      uint8_t v_c[6];
-      uint32_t v_i;
-    } s_decode_header[1];
-    struct {
-      uint8_t v_flags;
-      uint8_t v_background_color_index;
-      uint32_t v_num_palette_entries;
-      uint32_t v_i;
-      uint64_t scratch;
-    } s_decode_lsd[1];
-    struct {
-      uint64_t scratch;
-    } s_skip_blocks[1];
-    struct {
-      uint8_t v_block_size;
-      bool v_is_animexts;
-      bool v_is_netscape;
-      bool v_is_iccp;
-      bool v_is_xmp;
-      uint64_t scratch;
-    } s_decode_ae[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_gc[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_id_part0[1];
-    struct {
-      uint8_t v_which_palette;
-      uint32_t v_num_palette_entries;
-      uint32_t v_i;
-      uint64_t scratch;
-    } s_decode_id_part1[1];
-    struct {
-      uint64_t v_block_size;
-      bool v_need_block_size;
-      uint64_t scratch;
-    } s_decode_id_part2[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_gif__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_gif__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__image_decoder::unique_ptr
-  alloc_as__wuffs_base__image_decoder() {
-    return wuffs_base__image_decoder::unique_ptr(
-        wuffs_gif__decoder__alloc_as__wuffs_base__image_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_gif__decoder__struct() = delete;
-  wuffs_gif__decoder__struct(const wuffs_gif__decoder__struct&) = delete;
-  wuffs_gif__decoder__struct& operator=(
-      const wuffs_gif__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_gif__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__image_decoder*
-  upcast_as__wuffs_base__image_decoder() {
-    return (wuffs_base__image_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_gif__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_gif__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__status
-  decode_image_config(
-      wuffs_base__image_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_gif__decoder__decode_image_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__empty_struct
-  set_report_metadata(
-      uint32_t a_fourcc,
-      bool a_report) {
-    return wuffs_gif__decoder__set_report_metadata(this, a_fourcc, a_report);
-  }
-
-  inline wuffs_base__status
-  tell_me_more(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_gif__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
-  }
-
-  inline uint32_t
-  num_animation_loops() const {
-    return wuffs_gif__decoder__num_animation_loops(this);
-  }
-
-  inline uint64_t
-  num_decoded_frame_configs() const {
-    return wuffs_gif__decoder__num_decoded_frame_configs(this);
-  }
-
-  inline uint64_t
-  num_decoded_frames() const {
-    return wuffs_gif__decoder__num_decoded_frames(this);
-  }
-
-  inline wuffs_base__rect_ie_u32
-  frame_dirty_rect() const {
-    return wuffs_gif__decoder__frame_dirty_rect(this);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_gif__decoder__workbuf_len(this);
-  }
-
-  inline wuffs_base__status
-  restart_frame(
-      uint64_t a_index,
-      uint64_t a_io_position) {
-    return wuffs_gif__decoder__restart_frame(this, a_index, a_io_position);
-  }
-
-  inline wuffs_base__status
-  decode_frame_config(
-      wuffs_base__frame_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_gif__decoder__decode_frame_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame(
-      wuffs_base__pixel_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__pixel_blend a_blend,
-      wuffs_base__slice_u8 a_workbuf,
-      wuffs_base__decode_frame_options* a_opts) {
-    return wuffs_gif__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_gif__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GIF) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GZIP) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_gzip__error__bad_checksum[];
-extern const char wuffs_gzip__error__bad_compression_method[];
-extern const char wuffs_gzip__error__bad_encoding_flags[];
-extern const char wuffs_gzip__error__bad_header[];
-extern const char wuffs_gzip__error__truncated_input[];
-
-// ---------------- Public Consts
-
-#define WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_gzip__decoder__struct wuffs_gzip__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_gzip__decoder__initialize(
-    wuffs_gzip__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_gzip__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_gzip__decoder*
-wuffs_gzip__decoder__alloc();
-
-static inline wuffs_base__io_transformer*
-wuffs_gzip__decoder__alloc_as__wuffs_base__io_transformer() {
-  return (wuffs_base__io_transformer*)(wuffs_gzip__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__io_transformer*
-wuffs_gzip__decoder__upcast_as__wuffs_base__io_transformer(
-    wuffs_gzip__decoder* p) {
-  return (wuffs_base__io_transformer*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gzip__decoder__get_quirk(
-    const wuffs_gzip__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gzip__decoder__set_quirk(
-    wuffs_gzip__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_gzip__decoder__workbuf_len(
-    const wuffs_gzip__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gzip__decoder__transform_io(
-    wuffs_gzip__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_gzip__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
-    wuffs_base__vtable null_vtable;
-
-    bool f_ignore_checksum;
-
-    uint32_t p_transform_io[1];
-    uint32_t p_do_transform_io[1];
-  } private_impl;
-
-  struct {
-    wuffs_crc32__ieee_hasher f_checksum;
-    wuffs_deflate__decoder f_flate;
-
-    struct {
-      uint8_t v_flags;
-      uint32_t v_checksum_got;
-      uint32_t v_decoded_length_got;
-      uint32_t v_checksum_want;
-      uint64_t scratch;
-    } s_do_transform_io[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_gzip__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_gzip__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__io_transformer::unique_ptr
-  alloc_as__wuffs_base__io_transformer() {
-    return wuffs_base__io_transformer::unique_ptr(
-        wuffs_gzip__decoder__alloc_as__wuffs_base__io_transformer(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_gzip__decoder__struct() = delete;
-  wuffs_gzip__decoder__struct(const wuffs_gzip__decoder__struct&) = delete;
-  wuffs_gzip__decoder__struct& operator=(
-      const wuffs_gzip__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_gzip__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__io_transformer*
-  upcast_as__wuffs_base__io_transformer() {
-    return (wuffs_base__io_transformer*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_gzip__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_gzip__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_gzip__decoder__workbuf_len(this);
-  }
-
-  inline wuffs_base__status
-  transform_io(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__slice_u8 a_workbuf) {
-    return wuffs_gzip__decoder__transform_io(this, a_dst, a_src, a_workbuf);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_gzip__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GZIP) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JPEG) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_jpeg__error__bad_dht_marker[];
-extern const char wuffs_jpeg__error__bad_dqt_marker[];
-extern const char wuffs_jpeg__error__bad_dri_marker[];
-extern const char wuffs_jpeg__error__bad_sof_marker[];
-extern const char wuffs_jpeg__error__bad_sos_marker[];
-extern const char wuffs_jpeg__error__bad_header[];
-extern const char wuffs_jpeg__error__bad_marker[];
-extern const char wuffs_jpeg__error__missing_huffman_table[];
-extern const char wuffs_jpeg__error__missing_quantization_table[];
-extern const char wuffs_jpeg__error__truncated_input[];
-extern const char wuffs_jpeg__error__unsupported_arithmetic_coding[];
-extern const char wuffs_jpeg__error__unsupported_color_model[];
-extern const char wuffs_jpeg__error__unsupported_fractional_sampling[];
-extern const char wuffs_jpeg__error__unsupported_hierarchical_coding[];
-extern const char wuffs_jpeg__error__unsupported_implicit_height[];
-extern const char wuffs_jpeg__error__unsupported_lossless_coding[];
-extern const char wuffs_jpeg__error__unsupported_marker[];
-extern const char wuffs_jpeg__error__unsupported_precision_12_bits[];
-extern const char wuffs_jpeg__error__unsupported_precision_16_bits[];
-extern const char wuffs_jpeg__error__unsupported_precision[];
-extern const char wuffs_jpeg__error__unsupported_scan_count[];
-
-// ---------------- Public Consts
-
-#define WUFFS_JPEG__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 51552191232
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_jpeg__decoder__struct wuffs_jpeg__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_jpeg__decoder__initialize(
-    wuffs_jpeg__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_jpeg__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_jpeg__decoder*
-wuffs_jpeg__decoder__alloc();
-
-static inline wuffs_base__image_decoder*
-wuffs_jpeg__decoder__alloc_as__wuffs_base__image_decoder() {
-  return (wuffs_base__image_decoder*)(wuffs_jpeg__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__image_decoder*
-wuffs_jpeg__decoder__upcast_as__wuffs_base__image_decoder(
-    wuffs_jpeg__decoder* p) {
-  return (wuffs_base__image_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_jpeg__decoder__get_quirk(
-    const wuffs_jpeg__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__set_quirk(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__decode_image_config(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__decode_frame_config(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__decode_frame(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_jpeg__decoder__frame_dirty_rect(
-    const wuffs_jpeg__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_jpeg__decoder__num_animation_loops(
-    const wuffs_jpeg__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_jpeg__decoder__num_decoded_frame_configs(
-    const wuffs_jpeg__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_jpeg__decoder__num_decoded_frames(
-    const wuffs_jpeg__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__restart_frame(
-    wuffs_jpeg__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_jpeg__decoder__set_report_metadata(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__tell_me_more(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_jpeg__decoder__workbuf_len(
-    const wuffs_jpeg__decoder* self);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_jpeg__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__image_decoder;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_width;
-    uint32_t f_height;
-    uint32_t f_width_in_mcus;
-    uint32_t f_height_in_mcus;
-    uint8_t f_call_sequence;
-    bool f_test_only_interrupt_decode_mcu;
-    bool f_is_jfif;
-    uint8_t f_is_adobe;
-    bool f_is_rgb_or_cmyk;
-    uint8_t f_sof_marker;
-    uint8_t f_next_restart_marker;
-    uint8_t f_max_incl_components_h;
-    uint8_t f_max_incl_components_v;
-    uint32_t f_num_components;
-    uint8_t f_components_c[4];
-    uint8_t f_components_h[4];
-    uint8_t f_components_v[4];
-    uint8_t f_components_tq[4];
-    uint32_t f_components_workbuf_widths[4];
-    uint32_t f_components_workbuf_heights[4];
-    uint64_t f_components_workbuf_offsets[9];
-    uint32_t f_scan_count;
-    uint32_t f_scan_num_components;
-    uint8_t f_scan_comps_cselector[4];
-    uint8_t f_scan_comps_td[4];
-    uint8_t f_scan_comps_ta[4];
-    uint8_t f_scan_ss;
-    uint8_t f_scan_se;
-    uint8_t f_scan_ah;
-    uint8_t f_scan_al;
-    uint32_t f_scan_width_in_mcus;
-    uint32_t f_scan_height_in_mcus;
-    uint8_t f_scan_comps_bx_offset[16];
-    uint8_t f_scan_comps_by_offset[16];
-    uint32_t f_mcu_num_blocks;
-    uint32_t f_mcu_current_block;
-    uint32_t f_mcu_zig_index;
-    uint8_t f_mcu_blocks_sselector[16];
-    uint64_t f_mcu_blocks_offset[10];
-    uint32_t f_mcu_blocks_mx_mul[10];
-    uint32_t f_mcu_blocks_my_mul[10];
-    uint8_t f_mcu_blocks_dc_hselector[10];
-    uint8_t f_mcu_blocks_ac_hselector[10];
-    uint16_t f_mcu_previous_dc_values[4];
-    uint8_t f_block_smoothing_lowest_scan_al[4][10];
-    uint16_t f_block_smoothing_dc_values[5][5];
-    uint32_t f_block_smoothing_mx_max_incl;
-    uint32_t f_block_smoothing_my_max_incl;
-    uint16_t f_restart_interval;
-    uint16_t f_saved_restart_interval;
-    uint16_t f_restarts_remaining;
-    uint16_t f_eob_run;
-    uint64_t f_frame_config_io_position;
-    uint32_t f_payload_length;
-    bool f_seen_dqt[4];
-    bool f_saved_seen_dqt[4];
-    bool f_seen_dht[8];
-    uint64_t f_bitstream_bits;
-    uint32_t f_bitstream_n_bits;
-    uint32_t f_bitstream_ri;
-    uint32_t f_bitstream_wi;
-    bool f_bitstream_is_closed;
-    uint32_t f_bitstream_padding;
-    uint16_t f_quant_tables[4][64];
-    uint16_t f_saved_quant_tables[4][64];
-    uint8_t f_huff_tables_symbols[8][256];
-    uint32_t f_huff_tables_slow[8][16];
-    uint16_t f_huff_tables_fast[8][256];
-    wuffs_base__pixel_swizzler f_swizzler;
-
-    wuffs_base__empty_struct (*choosy_decode_idct)(
-        wuffs_jpeg__decoder* self,
-        wuffs_base__slice_u8 a_dst_buffer,
-        uint64_t a_dst_stride,
-        uint32_t a_q);
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_dqt[1];
-    uint32_t p_decode_dri[1];
-    uint32_t p_decode_appn[1];
-    uint32_t p_decode_sof[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-    uint32_t p_decode_dht[1];
-    uint32_t p_decode_sos[1];
-    uint32_t p_prepare_scan[1];
-    wuffs_base__empty_struct (*choosy_load_mcu_blocks_for_single_component)(
-        wuffs_jpeg__decoder* self,
-        uint32_t a_mx,
-        uint32_t a_my,
-        wuffs_base__slice_u8 a_workbuf,
-        uint32_t a_csel);
-    uint32_t p_skip_past_the_next_restart_marker[1];
-    uint32_t (*choosy_decode_mcu)(
-        wuffs_jpeg__decoder* self,
-        wuffs_base__slice_u8 a_workbuf,
-        uint32_t a_mx,
-        uint32_t a_my);
-  } private_impl;
-
-  struct {
-    uint8_t f_bitstream_buffer[2048];
-    uint16_t f_mcu_blocks[10][64];
-    uint8_t f_swizzle_ycck_scratch_buffer_2k[2048];
-    uint8_t f_dht_temp_counts[16];
-    uint8_t f_dht_temp_bit_lengths[256];
-    uint16_t f_dht_temp_bit_strings[256];
-    uint8_t f_dst_palette[1024];
-
-    struct {
-      uint8_t v_marker;
-      uint64_t scratch;
-    } s_do_decode_image_config[1];
-    struct {
-      uint8_t v_q;
-      uint32_t v_i;
-    } s_decode_dqt[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_dri[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_appn[1];
-    struct {
-      uint32_t v_i;
-      uint64_t scratch;
-    } s_decode_sof[1];
-    struct {
-      uint8_t v_marker;
-      uint64_t scratch;
-    } s_do_decode_frame[1];
-    struct {
-      uint8_t v_tc4_th;
-      uint32_t v_total_count;
-      uint32_t v_i;
-    } s_decode_dht[1];
-    struct {
-      uint32_t v_my;
-      uint32_t v_mx;
-    } s_decode_sos[1];
-    struct {
-      uint32_t v_i;
-      uint64_t scratch;
-    } s_prepare_scan[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_jpeg__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_jpeg__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__image_decoder::unique_ptr
-  alloc_as__wuffs_base__image_decoder() {
-    return wuffs_base__image_decoder::unique_ptr(
-        wuffs_jpeg__decoder__alloc_as__wuffs_base__image_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_jpeg__decoder__struct() = delete;
-  wuffs_jpeg__decoder__struct(const wuffs_jpeg__decoder__struct&) = delete;
-  wuffs_jpeg__decoder__struct& operator=(
-      const wuffs_jpeg__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_jpeg__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__image_decoder*
-  upcast_as__wuffs_base__image_decoder() {
-    return (wuffs_base__image_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_jpeg__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_jpeg__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__status
-  decode_image_config(
-      wuffs_base__image_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_jpeg__decoder__decode_image_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame_config(
-      wuffs_base__frame_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_jpeg__decoder__decode_frame_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame(
-      wuffs_base__pixel_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__pixel_blend a_blend,
-      wuffs_base__slice_u8 a_workbuf,
-      wuffs_base__decode_frame_options* a_opts) {
-    return wuffs_jpeg__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts);
-  }
-
-  inline wuffs_base__rect_ie_u32
-  frame_dirty_rect() const {
-    return wuffs_jpeg__decoder__frame_dirty_rect(this);
-  }
-
-  inline uint32_t
-  num_animation_loops() const {
-    return wuffs_jpeg__decoder__num_animation_loops(this);
-  }
-
-  inline uint64_t
-  num_decoded_frame_configs() const {
-    return wuffs_jpeg__decoder__num_decoded_frame_configs(this);
-  }
-
-  inline uint64_t
-  num_decoded_frames() const {
-    return wuffs_jpeg__decoder__num_decoded_frames(this);
-  }
-
-  inline wuffs_base__status
-  restart_frame(
-      uint64_t a_index,
-      uint64_t a_io_position) {
-    return wuffs_jpeg__decoder__restart_frame(this, a_index, a_io_position);
-  }
-
-  inline wuffs_base__empty_struct
-  set_report_metadata(
-      uint32_t a_fourcc,
-      bool a_report) {
-    return wuffs_jpeg__decoder__set_report_metadata(this, a_fourcc, a_report);
-  }
-
-  inline wuffs_base__status
-  tell_me_more(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_jpeg__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_jpeg__decoder__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_jpeg__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JPEG) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JSON) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_json__error__bad_c0_control_code[];
-extern const char wuffs_json__error__bad_utf_8[];
-extern const char wuffs_json__error__bad_backslash_escape[];
-extern const char wuffs_json__error__bad_input[];
-extern const char wuffs_json__error__bad_new_line_in_a_string[];
-extern const char wuffs_json__error__bad_quirk_combination[];
-extern const char wuffs_json__error__unsupported_number_length[];
-extern const char wuffs_json__error__unsupported_recursion_depth[];
-
-// ---------------- Public Consts
-
-#define WUFFS_JSON__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_JSON__DECODER_DEPTH_MAX_INCL 1024
-
-#define WUFFS_JSON__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL 1
-
-#define WUFFS_JSON__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 100
-
-#define WUFFS_JSON__QUIRK_ALLOW_ASCII_CONTROL_CODES 1225364480
-
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_A 1225364481
-
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_CAPITAL_U 1225364482
-
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_E 1225364483
-
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_NEW_LINE 1225364484
-
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_QUESTION_MARK 1225364485
-
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_SINGLE_QUOTE 1225364486
-
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_V 1225364487
-
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_X_AS_CODE_POINTS 1225364489
-
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_ZERO 1225364490
-
-#define WUFFS_JSON__QUIRK_ALLOW_COMMENT_BLOCK 1225364491
-
-#define WUFFS_JSON__QUIRK_ALLOW_COMMENT_LINE 1225364492
-
-#define WUFFS_JSON__QUIRK_ALLOW_EXTRA_COMMA 1225364493
-
-#define WUFFS_JSON__QUIRK_ALLOW_INF_NAN_NUMBERS 1225364494
-
-#define WUFFS_JSON__QUIRK_ALLOW_LEADING_ASCII_RECORD_SEPARATOR 1225364495
-
-#define WUFFS_JSON__QUIRK_ALLOW_LEADING_UNICODE_BYTE_ORDER_MARK 1225364496
-
-#define WUFFS_JSON__QUIRK_ALLOW_TRAILING_FILLER 1225364497
-
-#define WUFFS_JSON__QUIRK_EXPECT_TRAILING_NEW_LINE_OR_EOF 1225364498
-
-#define WUFFS_JSON__QUIRK_JSON_POINTER_ALLOW_TILDE_N_TILDE_R_TILDE_T 1225364499
-
-#define WUFFS_JSON__QUIRK_REPLACE_INVALID_UNICODE 1225364500
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_json__decoder__struct wuffs_json__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_json__decoder__initialize(
-    wuffs_json__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_json__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_json__decoder*
-wuffs_json__decoder__alloc();
-
-static inline wuffs_base__token_decoder*
-wuffs_json__decoder__alloc_as__wuffs_base__token_decoder() {
-  return (wuffs_base__token_decoder*)(wuffs_json__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__token_decoder*
-wuffs_json__decoder__upcast_as__wuffs_base__token_decoder(
-    wuffs_json__decoder* p) {
-  return (wuffs_base__token_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_json__decoder__get_quirk(
-    const wuffs_json__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_json__decoder__set_quirk(
-    wuffs_json__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_json__decoder__workbuf_len(
-    const wuffs_json__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_json__decoder__decode_tokens(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_json__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__token_decoder;
-    wuffs_base__vtable null_vtable;
-
-    bool f_quirks[21];
-    bool f_allow_leading_ars;
-    bool f_allow_leading_ubom;
-    bool f_end_of_data;
-    uint8_t f_trailer_stop;
-    uint8_t f_comment_type;
-
-    uint32_t p_decode_tokens[1];
-    uint32_t p_decode_leading[1];
-    uint32_t p_decode_comment[1];
-    uint32_t p_decode_inf_nan[1];
-    uint32_t p_decode_trailer[1];
-  } private_impl;
-
-  struct {
-    uint32_t f_stack[32];
-
-    struct {
-      uint32_t v_depth;
-      uint32_t v_expect;
-      uint32_t v_expect_after_value;
-    } s_decode_tokens[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_json__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_json__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__token_decoder::unique_ptr
-  alloc_as__wuffs_base__token_decoder() {
-    return wuffs_base__token_decoder::unique_ptr(
-        wuffs_json__decoder__alloc_as__wuffs_base__token_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_json__decoder__struct() = delete;
-  wuffs_json__decoder__struct(const wuffs_json__decoder__struct&) = delete;
-  wuffs_json__decoder__struct& operator=(
-      const wuffs_json__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_json__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__token_decoder*
-  upcast_as__wuffs_base__token_decoder() {
-    return (wuffs_base__token_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_json__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_json__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_json__decoder__workbuf_len(this);
-  }
-
-  inline wuffs_base__status
-  decode_tokens(
-      wuffs_base__token_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__slice_u8 a_workbuf) {
-    return wuffs_json__decoder__decode_tokens(this, a_dst, a_src, a_workbuf);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_json__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JSON) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NETPBM) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_netpbm__error__bad_header[];
-extern const char wuffs_netpbm__error__truncated_input[];
-extern const char wuffs_netpbm__error__unsupported_netpbm_file[];
-
-// ---------------- Public Consts
-
-#define WUFFS_NETPBM__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_netpbm__decoder__struct wuffs_netpbm__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_netpbm__decoder__initialize(
-    wuffs_netpbm__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_netpbm__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_netpbm__decoder*
-wuffs_netpbm__decoder__alloc();
-
-static inline wuffs_base__image_decoder*
-wuffs_netpbm__decoder__alloc_as__wuffs_base__image_decoder() {
-  return (wuffs_base__image_decoder*)(wuffs_netpbm__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__image_decoder*
-wuffs_netpbm__decoder__upcast_as__wuffs_base__image_decoder(
-    wuffs_netpbm__decoder* p) {
-  return (wuffs_base__image_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_netpbm__decoder__get_quirk(
-    const wuffs_netpbm__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__set_quirk(
-    wuffs_netpbm__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__decode_image_config(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__decode_frame_config(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__decode_frame(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_netpbm__decoder__frame_dirty_rect(
-    const wuffs_netpbm__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_netpbm__decoder__num_animation_loops(
-    const wuffs_netpbm__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_netpbm__decoder__num_decoded_frame_configs(
-    const wuffs_netpbm__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_netpbm__decoder__num_decoded_frames(
-    const wuffs_netpbm__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__restart_frame(
-    wuffs_netpbm__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_netpbm__decoder__set_report_metadata(
-    wuffs_netpbm__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__tell_me_more(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_netpbm__decoder__workbuf_len(
-    const wuffs_netpbm__decoder* self);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_netpbm__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__image_decoder;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_pixfmt;
-    uint32_t f_width;
-    uint32_t f_height;
-    uint32_t f_max_value;
-    uint8_t f_call_sequence;
-    uint64_t f_frame_config_io_position;
-    uint32_t f_dst_x;
-    uint32_t f_dst_y;
-    wuffs_base__pixel_swizzler f_swizzler;
-
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-  } private_impl;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_netpbm__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_netpbm__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__image_decoder::unique_ptr
-  alloc_as__wuffs_base__image_decoder() {
-    return wuffs_base__image_decoder::unique_ptr(
-        wuffs_netpbm__decoder__alloc_as__wuffs_base__image_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_netpbm__decoder__struct() = delete;
-  wuffs_netpbm__decoder__struct(const wuffs_netpbm__decoder__struct&) = delete;
-  wuffs_netpbm__decoder__struct& operator=(
-      const wuffs_netpbm__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_netpbm__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__image_decoder*
-  upcast_as__wuffs_base__image_decoder() {
-    return (wuffs_base__image_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_netpbm__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_netpbm__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__status
-  decode_image_config(
-      wuffs_base__image_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_netpbm__decoder__decode_image_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame_config(
-      wuffs_base__frame_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_netpbm__decoder__decode_frame_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame(
-      wuffs_base__pixel_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__pixel_blend a_blend,
-      wuffs_base__slice_u8 a_workbuf,
-      wuffs_base__decode_frame_options* a_opts) {
-    return wuffs_netpbm__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts);
-  }
-
-  inline wuffs_base__rect_ie_u32
-  frame_dirty_rect() const {
-    return wuffs_netpbm__decoder__frame_dirty_rect(this);
-  }
-
-  inline uint32_t
-  num_animation_loops() const {
-    return wuffs_netpbm__decoder__num_animation_loops(this);
-  }
-
-  inline uint64_t
-  num_decoded_frame_configs() const {
-    return wuffs_netpbm__decoder__num_decoded_frame_configs(this);
-  }
-
-  inline uint64_t
-  num_decoded_frames() const {
-    return wuffs_netpbm__decoder__num_decoded_frames(this);
-  }
-
-  inline wuffs_base__status
-  restart_frame(
-      uint64_t a_index,
-      uint64_t a_io_position) {
-    return wuffs_netpbm__decoder__restart_frame(this, a_index, a_io_position);
-  }
-
-  inline wuffs_base__empty_struct
-  set_report_metadata(
-      uint32_t a_fourcc,
-      bool a_report) {
-    return wuffs_netpbm__decoder__set_report_metadata(this, a_fourcc, a_report);
-  }
-
-  inline wuffs_base__status
-  tell_me_more(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_netpbm__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_netpbm__decoder__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_netpbm__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NETPBM) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NIE) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_nie__error__bad_header[];
-extern const char wuffs_nie__error__truncated_input[];
-extern const char wuffs_nie__error__unsupported_nie_file[];
-
-// ---------------- Public Consts
-
-#define WUFFS_NIE__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_nie__decoder__struct wuffs_nie__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_nie__decoder__initialize(
-    wuffs_nie__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_nie__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_nie__decoder*
-wuffs_nie__decoder__alloc();
-
-static inline wuffs_base__image_decoder*
-wuffs_nie__decoder__alloc_as__wuffs_base__image_decoder() {
-  return (wuffs_base__image_decoder*)(wuffs_nie__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__image_decoder*
-wuffs_nie__decoder__upcast_as__wuffs_base__image_decoder(
-    wuffs_nie__decoder* p) {
-  return (wuffs_base__image_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_nie__decoder__get_quirk(
-    const wuffs_nie__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__set_quirk(
-    wuffs_nie__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__decode_image_config(
-    wuffs_nie__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__decode_frame_config(
-    wuffs_nie__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__decode_frame(
-    wuffs_nie__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_nie__decoder__frame_dirty_rect(
-    const wuffs_nie__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_nie__decoder__num_animation_loops(
-    const wuffs_nie__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_nie__decoder__num_decoded_frame_configs(
-    const wuffs_nie__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_nie__decoder__num_decoded_frames(
-    const wuffs_nie__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__restart_frame(
-    wuffs_nie__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_nie__decoder__set_report_metadata(
-    wuffs_nie__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__tell_me_more(
-    wuffs_nie__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_nie__decoder__workbuf_len(
-    const wuffs_nie__decoder* self);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_nie__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__image_decoder;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_pixfmt;
-    uint32_t f_width;
-    uint32_t f_height;
-    uint8_t f_call_sequence;
-    uint32_t f_dst_x;
-    uint32_t f_dst_y;
-    wuffs_base__pixel_swizzler f_swizzler;
-
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-  } private_impl;
-
-  struct {
-    struct {
-      uint64_t scratch;
-    } s_do_decode_image_config[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_nie__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_nie__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__image_decoder::unique_ptr
-  alloc_as__wuffs_base__image_decoder() {
-    return wuffs_base__image_decoder::unique_ptr(
-        wuffs_nie__decoder__alloc_as__wuffs_base__image_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_nie__decoder__struct() = delete;
-  wuffs_nie__decoder__struct(const wuffs_nie__decoder__struct&) = delete;
-  wuffs_nie__decoder__struct& operator=(
-      const wuffs_nie__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_nie__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__image_decoder*
-  upcast_as__wuffs_base__image_decoder() {
-    return (wuffs_base__image_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_nie__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_nie__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__status
-  decode_image_config(
-      wuffs_base__image_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_nie__decoder__decode_image_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame_config(
-      wuffs_base__frame_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_nie__decoder__decode_frame_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame(
-      wuffs_base__pixel_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__pixel_blend a_blend,
-      wuffs_base__slice_u8 a_workbuf,
-      wuffs_base__decode_frame_options* a_opts) {
-    return wuffs_nie__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts);
-  }
-
-  inline wuffs_base__rect_ie_u32
-  frame_dirty_rect() const {
-    return wuffs_nie__decoder__frame_dirty_rect(this);
-  }
-
-  inline uint32_t
-  num_animation_loops() const {
-    return wuffs_nie__decoder__num_animation_loops(this);
-  }
-
-  inline uint64_t
-  num_decoded_frame_configs() const {
-    return wuffs_nie__decoder__num_decoded_frame_configs(this);
-  }
-
-  inline uint64_t
-  num_decoded_frames() const {
-    return wuffs_nie__decoder__num_decoded_frames(this);
-  }
-
-  inline wuffs_base__status
-  restart_frame(
-      uint64_t a_index,
-      uint64_t a_io_position) {
-    return wuffs_nie__decoder__restart_frame(this, a_index, a_io_position);
-  }
-
-  inline wuffs_base__empty_struct
-  set_report_metadata(
-      uint32_t a_fourcc,
-      bool a_report) {
-    return wuffs_nie__decoder__set_report_metadata(this, a_fourcc, a_report);
-  }
-
-  inline wuffs_base__status
-  tell_me_more(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_nie__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_nie__decoder__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_nie__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NIE) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ZLIB) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_zlib__note__dictionary_required[];
-extern const char wuffs_zlib__error__bad_checksum[];
-extern const char wuffs_zlib__error__bad_compression_method[];
-extern const char wuffs_zlib__error__bad_compression_window_size[];
-extern const char wuffs_zlib__error__bad_parity_check[];
-extern const char wuffs_zlib__error__incorrect_dictionary[];
-extern const char wuffs_zlib__error__truncated_input[];
-
-// ---------------- Public Consts
-
-#define WUFFS_ZLIB__QUIRK_JUST_RAW_DEFLATE 2113790976
-
-#define WUFFS_ZLIB__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_zlib__decoder__struct wuffs_zlib__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_zlib__decoder__initialize(
-    wuffs_zlib__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_zlib__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_zlib__decoder*
-wuffs_zlib__decoder__alloc();
-
-static inline wuffs_base__io_transformer*
-wuffs_zlib__decoder__alloc_as__wuffs_base__io_transformer() {
-  return (wuffs_base__io_transformer*)(wuffs_zlib__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__io_transformer*
-wuffs_zlib__decoder__upcast_as__wuffs_base__io_transformer(
-    wuffs_zlib__decoder* p) {
-  return (wuffs_base__io_transformer*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_zlib__decoder__dictionary_id(
-    const wuffs_zlib__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_zlib__decoder__add_dictionary(
-    wuffs_zlib__decoder* self,
-    wuffs_base__slice_u8 a_dict);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_zlib__decoder__get_quirk(
-    const wuffs_zlib__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_zlib__decoder__set_quirk(
-    wuffs_zlib__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_zlib__decoder__workbuf_len(
-    const wuffs_zlib__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_zlib__decoder__transform_io(
-    wuffs_zlib__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_zlib__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
-    wuffs_base__vtable null_vtable;
-
-    bool f_bad_call_sequence;
-    bool f_header_complete;
-    bool f_got_dictionary;
-    bool f_want_dictionary;
-    bool f_quirks[1];
-    bool f_ignore_checksum;
-    uint32_t f_dict_id_got;
-    uint32_t f_dict_id_want;
-
-    uint32_t p_transform_io[1];
-    uint32_t p_do_transform_io[1];
-  } private_impl;
-
-  struct {
-    wuffs_adler32__hasher f_checksum;
-    wuffs_adler32__hasher f_dict_id_hasher;
-    wuffs_deflate__decoder f_flate;
-
-    struct {
-      uint32_t v_checksum_got;
-      uint64_t scratch;
-    } s_do_transform_io[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_zlib__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_zlib__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__io_transformer::unique_ptr
-  alloc_as__wuffs_base__io_transformer() {
-    return wuffs_base__io_transformer::unique_ptr(
-        wuffs_zlib__decoder__alloc_as__wuffs_base__io_transformer(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_zlib__decoder__struct() = delete;
-  wuffs_zlib__decoder__struct(const wuffs_zlib__decoder__struct&) = delete;
-  wuffs_zlib__decoder__struct& operator=(
-      const wuffs_zlib__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_zlib__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__io_transformer*
-  upcast_as__wuffs_base__io_transformer() {
-    return (wuffs_base__io_transformer*)this;
-  }
-
-  inline uint32_t
-  dictionary_id() const {
-    return wuffs_zlib__decoder__dictionary_id(this);
-  }
-
-  inline wuffs_base__empty_struct
-  add_dictionary(
-      wuffs_base__slice_u8 a_dict) {
-    return wuffs_zlib__decoder__add_dictionary(this, a_dict);
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_zlib__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_zlib__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_zlib__decoder__workbuf_len(this);
-  }
-
-  inline wuffs_base__status
-  transform_io(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__slice_u8 a_workbuf) {
-    return wuffs_zlib__decoder__transform_io(this, a_dst, a_src, a_workbuf);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_zlib__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ZLIB) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__PNG) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_png__error__bad_animation_sequence_number[];
-extern const char wuffs_png__error__bad_checksum[];
-extern const char wuffs_png__error__bad_chunk[];
-extern const char wuffs_png__error__bad_filter[];
-extern const char wuffs_png__error__bad_header[];
-extern const char wuffs_png__error__bad_text_chunk_not_latin_1[];
-extern const char wuffs_png__error__missing_palette[];
-extern const char wuffs_png__error__truncated_input[];
-extern const char wuffs_png__error__unsupported_cgbi_extension[];
-extern const char wuffs_png__error__unsupported_png_compression_method[];
-extern const char wuffs_png__error__unsupported_png_file[];
-
-// ---------------- Public Consts
-
-#define WUFFS_PNG__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 2251799562027015
-
-#define WUFFS_PNG__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 8
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_png__decoder__struct wuffs_png__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_png__decoder__initialize(
-    wuffs_png__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_png__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_png__decoder*
-wuffs_png__decoder__alloc();
-
-static inline wuffs_base__image_decoder*
-wuffs_png__decoder__alloc_as__wuffs_base__image_decoder() {
-  return (wuffs_base__image_decoder*)(wuffs_png__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__image_decoder*
-wuffs_png__decoder__upcast_as__wuffs_base__image_decoder(
-    wuffs_png__decoder* p) {
-  return (wuffs_base__image_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_png__decoder__get_quirk(
-    const wuffs_png__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__set_quirk(
-    wuffs_png__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__decode_image_config(
-    wuffs_png__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__decode_frame_config(
-    wuffs_png__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__decode_frame(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_png__decoder__frame_dirty_rect(
-    const wuffs_png__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_png__decoder__num_animation_loops(
-    const wuffs_png__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_png__decoder__num_decoded_frame_configs(
-    const wuffs_png__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_png__decoder__num_decoded_frames(
-    const wuffs_png__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__restart_frame(
-    wuffs_png__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_png__decoder__set_report_metadata(
-    wuffs_png__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__tell_me_more(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_png__decoder__workbuf_len(
-    const wuffs_png__decoder* self);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_png__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__image_decoder;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_width;
-    uint32_t f_height;
-    uint64_t f_pass_bytes_per_row;
-    uint64_t f_workbuf_wi;
-    uint64_t f_workbuf_hist_pos_base;
-    uint64_t f_overall_workbuf_length;
-    uint64_t f_pass_workbuf_length;
-    uint8_t f_call_sequence;
-    bool f_report_metadata_chrm;
-    bool f_report_metadata_exif;
-    bool f_report_metadata_gama;
-    bool f_report_metadata_iccp;
-    bool f_report_metadata_kvp;
-    bool f_report_metadata_srgb;
-    bool f_ignore_checksum;
-    uint8_t f_depth;
-    uint8_t f_color_type;
-    uint8_t f_filter_distance;
-    uint8_t f_interlace_pass;
-    bool f_seen_actl;
-    bool f_seen_chrm;
-    bool f_seen_fctl;
-    bool f_seen_exif;
-    bool f_seen_gama;
-    bool f_seen_iccp;
-    bool f_seen_idat;
-    bool f_seen_ihdr;
-    bool f_seen_plte;
-    bool f_seen_srgb;
-    bool f_seen_trns;
-    bool f_metadata_is_zlib_compressed;
-    bool f_zlib_is_dirty;
-    uint32_t f_chunk_type;
-    uint8_t f_chunk_type_array[4];
-    uint32_t f_chunk_length;
-    uint64_t f_remap_transparency;
-    uint32_t f_dst_pixfmt;
-    uint32_t f_src_pixfmt;
-    uint32_t f_num_animation_frames_value;
-    uint32_t f_num_animation_loops_value;
-    uint32_t f_num_decoded_frame_configs_value;
-    uint32_t f_num_decoded_frames_value;
-    uint32_t f_frame_rect_x0;
-    uint32_t f_frame_rect_y0;
-    uint32_t f_frame_rect_x1;
-    uint32_t f_frame_rect_y1;
-    uint32_t f_first_rect_x0;
-    uint32_t f_first_rect_y0;
-    uint32_t f_first_rect_x1;
-    uint32_t f_first_rect_y1;
-    uint64_t f_frame_config_io_position;
-    uint64_t f_first_config_io_position;
-    uint64_t f_frame_duration;
-    uint64_t f_first_duration;
-    uint8_t f_frame_disposal;
-    uint8_t f_first_disposal;
-    bool f_frame_overwrite_instead_of_blend;
-    bool f_first_overwrite_instead_of_blend;
-    uint32_t f_next_animation_seq_num;
-    uint32_t f_metadata_flavor;
-    uint32_t f_metadata_fourcc;
-    uint64_t f_metadata_x;
-    uint64_t f_metadata_y;
-    uint64_t f_metadata_z;
-    uint32_t f_ztxt_ri;
-    uint32_t f_ztxt_wi;
-    uint64_t f_ztxt_hist_pos;
-    wuffs_base__pixel_swizzler f_swizzler;
-
-    wuffs_base__empty_struct (*choosy_filter_1)(
-        wuffs_png__decoder* self,
-        wuffs_base__slice_u8 a_curr);
-    wuffs_base__empty_struct (*choosy_filter_3)(
-        wuffs_png__decoder* self,
-        wuffs_base__slice_u8 a_curr,
-        wuffs_base__slice_u8 a_prev);
-    wuffs_base__empty_struct (*choosy_filter_4)(
-        wuffs_png__decoder* self,
-        wuffs_base__slice_u8 a_curr,
-        wuffs_base__slice_u8 a_prev);
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_ihdr[1];
-    uint32_t p_decode_other_chunk[1];
-    uint32_t p_decode_actl[1];
-    uint32_t p_decode_chrm[1];
-    uint32_t p_decode_fctl[1];
-    uint32_t p_decode_gama[1];
-    uint32_t p_decode_iccp[1];
-    uint32_t p_decode_plte[1];
-    uint32_t p_decode_srgb[1];
-    uint32_t p_decode_trns[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_skip_frame[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-    uint32_t p_decode_pass[1];
-    uint32_t p_tell_me_more[1];
-    uint32_t p_do_tell_me_more[1];
-    wuffs_base__status (*choosy_filter_and_swizzle)(
-        wuffs_png__decoder* self,
-        wuffs_base__pixel_buffer* a_dst,
-        wuffs_base__slice_u8 a_workbuf);
-  } private_impl;
-
-  struct {
-    wuffs_crc32__ieee_hasher f_crc32;
-    wuffs_zlib__decoder f_zlib;
-    uint8_t f_dst_palette[1024];
-    uint8_t f_src_palette[1024];
-
-    struct {
-      uint32_t v_checksum_have;
-      uint64_t scratch;
-    } s_do_decode_image_config[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_ihdr[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_other_chunk[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_actl[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_chrm[1];
-    struct {
-      uint32_t v_x0;
-      uint32_t v_x1;
-      uint32_t v_y1;
-      uint64_t scratch;
-    } s_decode_fctl[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_gama[1];
-    struct {
-      uint32_t v_num_entries;
-      uint32_t v_i;
-      uint64_t scratch;
-    } s_decode_plte[1];
-    struct {
-      uint32_t v_i;
-      uint32_t v_n;
-      uint64_t scratch;
-    } s_decode_trns[1];
-    struct {
-      uint64_t scratch;
-    } s_do_decode_frame_config[1];
-    struct {
-      uint64_t scratch;
-    } s_skip_frame[1];
-    struct {
-      uint64_t scratch;
-    } s_do_decode_frame[1];
-    struct {
-      uint64_t scratch;
-    } s_decode_pass[1];
-    struct {
-      wuffs_base__status v_zlib_status;
-      uint64_t scratch;
-    } s_do_tell_me_more[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_png__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_png__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__image_decoder::unique_ptr
-  alloc_as__wuffs_base__image_decoder() {
-    return wuffs_base__image_decoder::unique_ptr(
-        wuffs_png__decoder__alloc_as__wuffs_base__image_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_png__decoder__struct() = delete;
-  wuffs_png__decoder__struct(const wuffs_png__decoder__struct&) = delete;
-  wuffs_png__decoder__struct& operator=(
-      const wuffs_png__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_png__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__image_decoder*
-  upcast_as__wuffs_base__image_decoder() {
-    return (wuffs_base__image_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_png__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_png__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__status
-  decode_image_config(
-      wuffs_base__image_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_png__decoder__decode_image_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame_config(
-      wuffs_base__frame_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_png__decoder__decode_frame_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame(
-      wuffs_base__pixel_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__pixel_blend a_blend,
-      wuffs_base__slice_u8 a_workbuf,
-      wuffs_base__decode_frame_options* a_opts) {
-    return wuffs_png__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts);
-  }
-
-  inline wuffs_base__rect_ie_u32
-  frame_dirty_rect() const {
-    return wuffs_png__decoder__frame_dirty_rect(this);
-  }
-
-  inline uint32_t
-  num_animation_loops() const {
-    return wuffs_png__decoder__num_animation_loops(this);
-  }
-
-  inline uint64_t
-  num_decoded_frame_configs() const {
-    return wuffs_png__decoder__num_decoded_frame_configs(this);
-  }
-
-  inline uint64_t
-  num_decoded_frames() const {
-    return wuffs_png__decoder__num_decoded_frames(this);
-  }
-
-  inline wuffs_base__status
-  restart_frame(
-      uint64_t a_index,
-      uint64_t a_io_position) {
-    return wuffs_png__decoder__restart_frame(this, a_index, a_io_position);
-  }
-
-  inline wuffs_base__empty_struct
-  set_report_metadata(
-      uint32_t a_fourcc,
-      bool a_report) {
-    return wuffs_png__decoder__set_report_metadata(this, a_fourcc, a_report);
-  }
-
-  inline wuffs_base__status
-  tell_me_more(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_png__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_png__decoder__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_png__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__PNG) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_tga__error__bad_header[];
-extern const char wuffs_tga__error__bad_run_length_encoding[];
-extern const char wuffs_tga__error__truncated_input[];
-extern const char wuffs_tga__error__unsupported_tga_file[];
-
-// ---------------- Public Consts
-
-#define WUFFS_TGA__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_tga__decoder__struct wuffs_tga__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_tga__decoder__initialize(
-    wuffs_tga__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_tga__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_tga__decoder*
-wuffs_tga__decoder__alloc();
-
-static inline wuffs_base__image_decoder*
-wuffs_tga__decoder__alloc_as__wuffs_base__image_decoder() {
-  return (wuffs_base__image_decoder*)(wuffs_tga__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__image_decoder*
-wuffs_tga__decoder__upcast_as__wuffs_base__image_decoder(
-    wuffs_tga__decoder* p) {
-  return (wuffs_base__image_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_tga__decoder__get_quirk(
-    const wuffs_tga__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__set_quirk(
-    wuffs_tga__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__decode_image_config(
-    wuffs_tga__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__decode_frame_config(
-    wuffs_tga__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__decode_frame(
-    wuffs_tga__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_tga__decoder__frame_dirty_rect(
-    const wuffs_tga__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_tga__decoder__num_animation_loops(
-    const wuffs_tga__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_tga__decoder__num_decoded_frame_configs(
-    const wuffs_tga__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_tga__decoder__num_decoded_frames(
-    const wuffs_tga__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__restart_frame(
-    wuffs_tga__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_tga__decoder__set_report_metadata(
-    wuffs_tga__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__tell_me_more(
-    wuffs_tga__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_tga__decoder__workbuf_len(
-    const wuffs_tga__decoder* self);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_tga__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__image_decoder;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_width;
-    uint32_t f_height;
-    uint8_t f_call_sequence;
-    uint8_t f_header_id_length;
-    uint8_t f_header_color_map_type;
-    uint8_t f_header_image_type;
-    uint16_t f_header_color_map_first_entry_index;
-    uint16_t f_header_color_map_length;
-    uint8_t f_header_color_map_entry_size;
-    uint8_t f_header_pixel_depth;
-    uint8_t f_header_image_descriptor;
-    bool f_opaque;
-    uint32_t f_scratch_bytes_per_pixel;
-    uint32_t f_src_bytes_per_pixel;
-    uint32_t f_src_pixfmt;
-    uint64_t f_frame_config_io_position;
-    wuffs_base__pixel_swizzler f_swizzler;
-
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-  } private_impl;
-
-  struct {
-    uint8_t f_dst_palette[1024];
-    uint8_t f_src_palette[1024];
-    uint8_t f_scratch[4];
-
-    struct {
-      uint32_t v_i;
-      uint64_t scratch;
-    } s_do_decode_image_config[1];
-    struct {
-      uint64_t v_dst_bytes_per_pixel;
-      uint32_t v_dst_x;
-      uint32_t v_dst_y;
-      uint64_t v_mark;
-      uint32_t v_num_pixels32;
-      uint32_t v_lit_length;
-      uint32_t v_run_length;
-      uint64_t v_num_dst_bytes;
-      uint64_t scratch;
-    } s_do_decode_frame[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_tga__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_tga__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__image_decoder::unique_ptr
-  alloc_as__wuffs_base__image_decoder() {
-    return wuffs_base__image_decoder::unique_ptr(
-        wuffs_tga__decoder__alloc_as__wuffs_base__image_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_tga__decoder__struct() = delete;
-  wuffs_tga__decoder__struct(const wuffs_tga__decoder__struct&) = delete;
-  wuffs_tga__decoder__struct& operator=(
-      const wuffs_tga__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_tga__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__image_decoder*
-  upcast_as__wuffs_base__image_decoder() {
-    return (wuffs_base__image_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_tga__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_tga__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__status
-  decode_image_config(
-      wuffs_base__image_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_tga__decoder__decode_image_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame_config(
-      wuffs_base__frame_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_tga__decoder__decode_frame_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame(
-      wuffs_base__pixel_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__pixel_blend a_blend,
-      wuffs_base__slice_u8 a_workbuf,
-      wuffs_base__decode_frame_options* a_opts) {
-    return wuffs_tga__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts);
-  }
-
-  inline wuffs_base__rect_ie_u32
-  frame_dirty_rect() const {
-    return wuffs_tga__decoder__frame_dirty_rect(this);
-  }
-
-  inline uint32_t
-  num_animation_loops() const {
-    return wuffs_tga__decoder__num_animation_loops(this);
-  }
-
-  inline uint64_t
-  num_decoded_frame_configs() const {
-    return wuffs_tga__decoder__num_decoded_frame_configs(this);
-  }
-
-  inline uint64_t
-  num_decoded_frames() const {
-    return wuffs_tga__decoder__num_decoded_frames(this);
-  }
-
-  inline wuffs_base__status
-  restart_frame(
-      uint64_t a_index,
-      uint64_t a_io_position) {
-    return wuffs_tga__decoder__restart_frame(this, a_index, a_io_position);
-  }
-
-  inline wuffs_base__empty_struct
-  set_report_metadata(
-      uint32_t a_fourcc,
-      bool a_report) {
-    return wuffs_tga__decoder__set_report_metadata(this, a_fourcc, a_report);
-  }
-
-  inline wuffs_base__status
-  tell_me_more(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_tga__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_tga__decoder__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_tga__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) || defined(WUFFS_NONMONOLITHIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__WBMP) || defined(WUFFS_NONMONOLITHIC)
-
-// ---------------- Status Codes
-
-extern const char wuffs_wbmp__error__bad_header[];
-extern const char wuffs_wbmp__error__truncated_input[];
-
-// ---------------- Public Consts
-
-#define WUFFS_WBMP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
-
-// ---------------- Struct Declarations
-
-typedef struct wuffs_wbmp__decoder__struct wuffs_wbmp__decoder;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Public Initializer Prototypes
-
-// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
-// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
-//
-// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
-// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_wbmp__decoder__initialize(
-    wuffs_wbmp__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options);
-
-size_t
-sizeof__wuffs_wbmp__decoder();
-
-// ---------------- Allocs
-
-// These functions allocate and initialize Wuffs structs. They return NULL if
-// memory allocation fails. If they return non-NULL, there is no need to call
-// wuffs_foo__bar__initialize, but the caller is responsible for eventually
-// calling free on the returned pointer. That pointer is effectively a C++
-// std::unique_ptr<T, decltype(&free)>.
-
-wuffs_wbmp__decoder*
-wuffs_wbmp__decoder__alloc();
-
-static inline wuffs_base__image_decoder*
-wuffs_wbmp__decoder__alloc_as__wuffs_base__image_decoder() {
-  return (wuffs_base__image_decoder*)(wuffs_wbmp__decoder__alloc());
-}
-
-// ---------------- Upcasts
-
-static inline wuffs_base__image_decoder*
-wuffs_wbmp__decoder__upcast_as__wuffs_base__image_decoder(
-    wuffs_wbmp__decoder* p) {
-  return (wuffs_base__image_decoder*)p;
-}
-
-// ---------------- Public Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_wbmp__decoder__get_quirk(
-    const wuffs_wbmp__decoder* self,
-    uint32_t a_key);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__set_quirk(
-    wuffs_wbmp__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__decode_image_config(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__decode_frame_config(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__decode_frame(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_wbmp__decoder__frame_dirty_rect(
-    const wuffs_wbmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_wbmp__decoder__num_animation_loops(
-    const wuffs_wbmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_wbmp__decoder__num_decoded_frame_configs(
-    const wuffs_wbmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_wbmp__decoder__num_decoded_frames(
-    const wuffs_wbmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__restart_frame(
-    wuffs_wbmp__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_wbmp__decoder__set_report_metadata(
-    wuffs_wbmp__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__tell_me_more(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_wbmp__decoder__workbuf_len(
-    const wuffs_wbmp__decoder* self);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-// ---------------- Struct Definitions
-
-// These structs' fields, and the sizeof them, are private implementation
-// details that aren't guaranteed to be stable across Wuffs versions.
-//
-// See https://en.wikipedia.org/wiki/Opaque_pointer#C
-
-#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-struct wuffs_wbmp__decoder__struct {
-  // Do not access the private_impl's or private_data's fields directly. There
-  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
-  // the wuffs_foo__bar__baz functions.
-  //
-  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
-  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
-
-  struct {
-    uint32_t magic;
-    uint32_t active_coroutine;
-    wuffs_base__vtable vtable_for__wuffs_base__image_decoder;
-    wuffs_base__vtable null_vtable;
-
-    uint32_t f_width;
-    uint32_t f_height;
-    uint8_t f_call_sequence;
-    uint64_t f_frame_config_io_position;
-    wuffs_base__pixel_swizzler f_swizzler;
-
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-  } private_impl;
-
-  struct {
-    struct {
-      uint32_t v_i;
-      uint32_t v_p;
-    } s_do_decode_image_config[1];
-    struct {
-      uint64_t v_dst_bytes_per_pixel;
-      uint32_t v_dst_x;
-      uint32_t v_dst_y;
-      uint8_t v_src[1];
-      uint8_t v_c;
-    } s_do_decode_frame[1];
-  } private_data;
-
-#ifdef __cplusplus
-#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-  using unique_ptr = std::unique_ptr<wuffs_wbmp__decoder, decltype(&free)>;
-
-  // On failure, the alloc_etc functions return nullptr. They don't throw.
-
-  static inline unique_ptr
-  alloc() {
-    return unique_ptr(wuffs_wbmp__decoder__alloc(), &free);
-  }
-
-  static inline wuffs_base__image_decoder::unique_ptr
-  alloc_as__wuffs_base__image_decoder() {
-    return wuffs_base__image_decoder::unique_ptr(
-        wuffs_wbmp__decoder__alloc_as__wuffs_base__image_decoder(), &free);
-  }
-#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-  // Disallow constructing or copying an object via standard C++ mechanisms,
-  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
-  // size and field layout is not part of the public, stable, memory-safe API.
-  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
-  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
-  // their first argument) rather than tweaking bar.private_impl.qux fields.
-  //
-  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
-  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
-  // order to provide convenience methods. These forward on "this", so that you
-  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
-  wuffs_wbmp__decoder__struct() = delete;
-  wuffs_wbmp__decoder__struct(const wuffs_wbmp__decoder__struct&) = delete;
-  wuffs_wbmp__decoder__struct& operator=(
-      const wuffs_wbmp__decoder__struct&) = delete;
-#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
-
-#if !defined(WUFFS_IMPLEMENTATION)
-  // As above, the size of the struct is not part of the public API, and unless
-  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
-  // allocated, not stack allocated. Its size is not intended to be known at
-  // compile time, but it is unfortunately divulged as a side effect of
-  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
-  // instead of "sizeof T", invoking the operator. To make the two values
-  // different, so that passing the latter will be rejected by the initialize
-  // function, we add an arbitrary amount of dead weight.
-  uint8_t dead_weight[123000000];  // 123 MB.
-#endif  // !defined(WUFFS_IMPLEMENTATION)
-
-  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-  initialize(
-      size_t sizeof_star_self,
-      uint64_t wuffs_version,
-      uint32_t options) {
-    return wuffs_wbmp__decoder__initialize(
-        this, sizeof_star_self, wuffs_version, options);
-  }
-
-  inline wuffs_base__image_decoder*
-  upcast_as__wuffs_base__image_decoder() {
-    return (wuffs_base__image_decoder*)this;
-  }
-
-  inline uint64_t
-  get_quirk(
-      uint32_t a_key) const {
-    return wuffs_wbmp__decoder__get_quirk(this, a_key);
-  }
-
-  inline wuffs_base__status
-  set_quirk(
-      uint32_t a_key,
-      uint64_t a_value) {
-    return wuffs_wbmp__decoder__set_quirk(this, a_key, a_value);
-  }
-
-  inline wuffs_base__status
-  decode_image_config(
-      wuffs_base__image_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_wbmp__decoder__decode_image_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame_config(
-      wuffs_base__frame_config* a_dst,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_wbmp__decoder__decode_frame_config(this, a_dst, a_src);
-  }
-
-  inline wuffs_base__status
-  decode_frame(
-      wuffs_base__pixel_buffer* a_dst,
-      wuffs_base__io_buffer* a_src,
-      wuffs_base__pixel_blend a_blend,
-      wuffs_base__slice_u8 a_workbuf,
-      wuffs_base__decode_frame_options* a_opts) {
-    return wuffs_wbmp__decoder__decode_frame(this, a_dst, a_src, a_blend, a_workbuf, a_opts);
-  }
-
-  inline wuffs_base__rect_ie_u32
-  frame_dirty_rect() const {
-    return wuffs_wbmp__decoder__frame_dirty_rect(this);
-  }
-
-  inline uint32_t
-  num_animation_loops() const {
-    return wuffs_wbmp__decoder__num_animation_loops(this);
-  }
-
-  inline uint64_t
-  num_decoded_frame_configs() const {
-    return wuffs_wbmp__decoder__num_decoded_frame_configs(this);
-  }
-
-  inline uint64_t
-  num_decoded_frames() const {
-    return wuffs_wbmp__decoder__num_decoded_frames(this);
-  }
-
-  inline wuffs_base__status
-  restart_frame(
-      uint64_t a_index,
-      uint64_t a_io_position) {
-    return wuffs_wbmp__decoder__restart_frame(this, a_index, a_io_position);
-  }
-
-  inline wuffs_base__empty_struct
-  set_report_metadata(
-      uint32_t a_fourcc,
-      bool a_report) {
-    return wuffs_wbmp__decoder__set_report_metadata(this, a_fourcc, a_report);
-  }
-
-  inline wuffs_base__status
-  tell_me_more(
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-    return wuffs_wbmp__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
-  }
-
-  inline wuffs_base__range_ii_u64
-  workbuf_len() const {
-    return wuffs_wbmp__decoder__workbuf_len(this);
-  }
-
-#endif  // __cplusplus
-};  // struct wuffs_wbmp__decoder__struct
-
-#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__WBMP) || defined(WUFFS_NONMONOLITHIC)
-
-#if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-// ---------------- Auxiliary - Base
-
-// Auxiliary code is discussed at
-// https://github.com/google/wuffs/blob/main/doc/note/auxiliary-code.md
-
-#include <stdio.h>
-
-#include <string>
-
-namespace wuffs_aux {
-
-using IOBuffer = wuffs_base__io_buffer;
-
-// MemOwner represents ownership of some memory. Dynamically allocated memory
-// (e.g. from malloc or new) is typically paired with free or delete, invoked
-// when the std::unique_ptr is destroyed. Statically allocated memory might use
-// MemOwner(nullptr, &free), even if that statically allocated memory is not
-// nullptr, since calling free(nullptr) is a no-op.
-using MemOwner = std::unique_ptr<void, decltype(&free)>;
-
-namespace sync_io {
-
-// --------
-
-// DynIOBuffer is an IOBuffer that is backed by a dynamically sized byte array.
-// It owns that backing array and will free it in its destructor.
-//
-// The array size can be explicitly extended (by calling the grow method) but,
-// unlike a C++ std::vector, there is no implicit extension (e.g. by calling
-// std::vector::insert) and its maximum size is capped by the max_incl
-// constructor argument.
-//
-// It contains an IOBuffer-typed field whose reader side provides access to
-// previously written bytes and whose writer side provides access to the
-// allocated but not-yet-written-to slack space. For Go programmers, this slack
-// space is roughly analogous to the s[len(s):cap(s)] space of a slice s.
-class DynIOBuffer {
- public:
-  enum GrowResult {
-    OK = 0,
-    FailedMaxInclExceeded = 1,
-    FailedOutOfMemory = 2,
-  };
-
-  // m_buf holds the dynamically sized byte array and its read/write indexes:
-  //  - m_buf.meta.wi  is roughly analogous to a Go slice's length.
-  //  - m_buf.data.len is roughly analogous to a Go slice's capacity. It is
-  //    also equal to the m_buf.data.ptr malloc/realloc size.
-  //
-  // Users should not modify the m_buf.data.ptr or m_buf.data.len fields (as
-  // they are conceptually private to this class), but they can modify the
-  // bytes referenced by that pointer-length pair (e.g. compactions).
-  IOBuffer m_buf;
-
-  // m_max_incl is an inclusive upper bound on the backing array size.
-  const uint64_t m_max_incl;
-
-  // Constructor and destructor.
-  explicit DynIOBuffer(uint64_t max_incl);
-  ~DynIOBuffer();
-
-  // Drop frees the byte array and resets m_buf. The DynIOBuffer can still be
-  // used after a drop call. It just restarts from zero.
-  void drop();
-
-  // grow ensures that the byte array size is at least min_incl and at most
-  // max_incl. It returns FailedMaxInclExceeded if that would require
-  // allocating more than max_incl bytes, including the case where (min_incl >
-  // max_incl). It returns FailedOutOfMemory if memory allocation failed.
-  GrowResult grow(uint64_t min_incl);
-
- private:
-  // Delete the copy and assign constructors.
-  DynIOBuffer(const DynIOBuffer&) = delete;
-  DynIOBuffer& operator=(const DynIOBuffer&) = delete;
-
-  static uint64_t round_up(uint64_t min_incl, uint64_t max_incl);
-};
-
-// --------
-
-class Input {
- public:
-  virtual ~Input();
-
-  virtual IOBuffer* BringsItsOwnIOBuffer();
-  virtual std::string CopyIn(IOBuffer* dst) = 0;
-};
-
-// --------
-
-// FileInput is an Input that reads from a file source.
-//
-// It does not take responsibility for closing the file when done.
-class FileInput : public Input {
- public:
-  FileInput(FILE* f);
-
-  virtual std::string CopyIn(IOBuffer* dst);
-
- private:
-  FILE* m_f;
-
-  // Delete the copy and assign constructors.
-  FileInput(const FileInput&) = delete;
-  FileInput& operator=(const FileInput&) = delete;
-};
-
-// --------
-
-// MemoryInput is an Input that reads from an in-memory source.
-//
-// It does not take responsibility for freeing the memory when done.
-class MemoryInput : public Input {
- public:
-  MemoryInput(const char* ptr, size_t len);
-  MemoryInput(const uint8_t* ptr, size_t len);
-
-  virtual IOBuffer* BringsItsOwnIOBuffer();
-  virtual std::string CopyIn(IOBuffer* dst);
-
- private:
-  IOBuffer m_io;
-
-  // Delete the copy and assign constructors.
-  MemoryInput(const MemoryInput&) = delete;
-  MemoryInput& operator=(const MemoryInput&) = delete;
-};
-
-// --------
-
-}  // namespace sync_io
-
-}  // namespace wuffs_aux
-
-// ---------------- Auxiliary - CBOR
-
-namespace wuffs_aux {
-
-struct DecodeCborResult {
-  DecodeCborResult(std::string&& error_message0, uint64_t cursor_position0);
-
-  std::string error_message;
-  uint64_t cursor_position;
-};
-
-class DecodeCborCallbacks {
- public:
-  virtual ~DecodeCborCallbacks();
-
-  // AppendXxx are called for leaf nodes: literals, numbers, strings, etc.
-
-  virtual std::string AppendNull() = 0;
-  virtual std::string AppendUndefined() = 0;
-  virtual std::string AppendBool(bool val) = 0;
-  virtual std::string AppendF64(double val) = 0;
-  virtual std::string AppendI64(int64_t val) = 0;
-  virtual std::string AppendU64(uint64_t val) = 0;
-  virtual std::string AppendByteString(std::string&& val) = 0;
-  virtual std::string AppendTextString(std::string&& val) = 0;
-  virtual std::string AppendMinus1MinusX(uint64_t val) = 0;
-  virtual std::string AppendCborSimpleValue(uint8_t val) = 0;
-  virtual std::string AppendCborTag(uint64_t val) = 0;
-
-  // Push and Pop are called for container nodes: CBOR arrays (lists) and CBOR
-  // maps (dictionaries).
-  //
-  // The flags bits combine exactly one of:
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_NONE
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_LIST
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_DICT
-  // and exactly one of:
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_NONE
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_LIST
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_DICT
-
-  virtual std::string Push(uint32_t flags) = 0;
-  virtual std::string Pop(uint32_t flags) = 0;
-
-  // Done is always the last Callback method called by DecodeCbor, whether or
-  // not parsing the input as CBOR encountered an error. Even when successful,
-  // trailing data may remain in input and buffer.
-  //
-  // Do not keep a reference to buffer or buffer.data.ptr after Done returns,
-  // as DecodeCbor may then de-allocate the backing array.
-  //
-  // The default Done implementation is a no-op.
-  virtual void  //
-  Done(DecodeCborResult& result, sync_io::Input& input, IOBuffer& buffer);
-};
-
-// The FooArgBar types add structure to Foo's optional arguments. They wrap
-// inner representations for several reasons:
-//  - It provides a home for the DefaultValue static method, for Foo callers
-//    that want to override some but not all optional arguments.
-//  - It provides the "Bar" name at Foo call sites, which can help self-
-//    document Foo calls with many arguemnts.
-//  - It provides some type safety against accidentally transposing or omitting
-//    adjacent fundamentally-numeric-typed optional arguments.
-
-// DecodeCborArgQuirks wraps an optional argument to DecodeCbor.
-struct DecodeCborArgQuirks {
-  explicit DecodeCborArgQuirks(wuffs_base__slice_u32 repr0);
-  explicit DecodeCborArgQuirks(uint32_t* ptr, size_t len);
-
-  // DefaultValue returns an empty slice.
-  static DecodeCborArgQuirks DefaultValue();
-
-  wuffs_base__slice_u32 repr;
-};
-
-// DecodeCbor calls callbacks based on the CBOR-formatted data in input.
-//
-// On success, the returned error_message is empty and cursor_position counts
-// the number of bytes consumed. On failure, error_message is non-empty and
-// cursor_position is the location of the error. That error may be a content
-// error (invalid CBOR) or an input error (e.g. network failure).
-DecodeCborResult  //
-DecodeCbor(DecodeCborCallbacks& callbacks,
-           sync_io::Input& input,
-           DecodeCborArgQuirks quirks = DecodeCborArgQuirks::DefaultValue());
-
-}  // namespace wuffs_aux
-
-// ---------------- Auxiliary - Image
-
-namespace wuffs_aux {
-
-struct DecodeImageResult {
-  DecodeImageResult(MemOwner&& pixbuf_mem_owner0,
-                    wuffs_base__pixel_buffer pixbuf0,
-                    std::string&& error_message0);
-  DecodeImageResult(std::string&& error_message0);
-
-  MemOwner pixbuf_mem_owner;
-  wuffs_base__pixel_buffer pixbuf;
-  std::string error_message;
-};
-
-// DecodeImageCallbacks are the callbacks given to DecodeImage. They are always
-// called in this order:
-//  1. SelectDecoder
-//  2. HandleMetadata
-//  3. SelectPixfmt
-//  4. AllocPixbuf
-//  5. AllocWorkbuf
-//  6. Done
-//
-// It may return early - the third callback might not be invoked if the second
-// one fails - but the final callback (Done) is always invoked.
-class DecodeImageCallbacks {
- public:
-  // AllocPixbufResult holds a memory allocation (the result of malloc or new,
-  // a statically allocated pointer, etc), or an error message. The memory is
-  // de-allocated when mem_owner goes out of scope and is destroyed.
-  struct AllocPixbufResult {
-    AllocPixbufResult(MemOwner&& mem_owner0, wuffs_base__pixel_buffer pixbuf0);
-    AllocPixbufResult(std::string&& error_message0);
-
-    MemOwner mem_owner;
-    wuffs_base__pixel_buffer pixbuf;
-    std::string error_message;
-  };
-
-  // AllocWorkbufResult holds a memory allocation (the result of malloc or new,
-  // a statically allocated pointer, etc), or an error message. The memory is
-  // de-allocated when mem_owner goes out of scope and is destroyed.
-  struct AllocWorkbufResult {
-    AllocWorkbufResult(MemOwner&& mem_owner0, wuffs_base__slice_u8 workbuf0);
-    AllocWorkbufResult(std::string&& error_message0);
-
-    MemOwner mem_owner;
-    wuffs_base__slice_u8 workbuf;
-    std::string error_message;
-  };
-
-  virtual ~DecodeImageCallbacks();
-
-  // SelectDecoder returns the image decoder for the input data's file format.
-  // Returning a nullptr means failure (DecodeImage_UnsupportedImageFormat).
-  //
-  // Common formats will have a FourCC value in the range [1 ..= 0x7FFF_FFFF],
-  // such as WUFFS_BASE__FOURCC__JPEG. A zero FourCC value means that Wuffs'
-  // standard library did not recognize the image format but if SelectDecoder
-  // was overridden, it may examine the input data's starting bytes and still
-  // provide its own image decoder, e.g. for an exotic image file format that's
-  // not in Wuffs' standard library. The prefix_etc fields have the same
-  // meaning as wuffs_base__magic_number_guess_fourcc arguments. SelectDecoder
-  // implementations should not modify prefix_data's contents.
-  //
-  // SelectDecoder might be called more than once, since some image file
-  // formats can wrap others. For example, a nominal BMP file can actually
-  // contain a JPEG or a PNG.
-  //
-  // The default SelectDecoder accepts the FOURCC codes listed below. For
-  // modular builds (i.e. when #define'ing WUFFS_CONFIG__MODULES), acceptance
-  // of the ETC file format is optional (for each value of ETC) and depends on
-  // the corresponding module to be enabled at compile time (i.e. #define'ing
-  // WUFFS_CONFIG__MODULE__ETC).
-  //  - WUFFS_BASE__FOURCC__BMP
-  //  - WUFFS_BASE__FOURCC__GIF
-  //  - WUFFS_BASE__FOURCC__JPEG
-  //  - WUFFS_BASE__FOURCC__NIE
-  //  - WUFFS_BASE__FOURCC__NPBM
-  //  - WUFFS_BASE__FOURCC__PNG
-  //  - WUFFS_BASE__FOURCC__TGA
-  //  - WUFFS_BASE__FOURCC__WBMP
-  virtual wuffs_base__image_decoder::unique_ptr  //
-  SelectDecoder(uint32_t fourcc,
-                wuffs_base__slice_u8 prefix_data,
-                bool prefix_closed);
-
-  // HandleMetadata acknowledges image metadata. minfo.flavor will be one of:
-  //  - WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH
-  //  - WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED
-  // If it is ETC__METADATA_RAW_ETC then raw contains the metadata bytes. Those
-  // bytes should not be retained beyond the the HandleMetadata call.
-  //
-  // minfo.metadata__fourcc() will typically match one of the
-  // DecodeImageArgFlags bits. For example, if (REPORT_METADATA_CHRM |
-  // REPORT_METADATA_GAMA) was passed to DecodeImage then the metadata FourCC
-  // will be either WUFFS_BASE__FOURCC__CHRM or WUFFS_BASE__FOURCC__GAMA.
-  //
-  // It returns an error message, or an empty string on success.
-  virtual std::string  //
-  HandleMetadata(const wuffs_base__more_information& minfo,
-                 wuffs_base__slice_u8 raw);
-
-  // SelectPixfmt returns the destination pixel format for AllocPixbuf. It
-  // should return wuffs_base__make_pixel_format(etc) called with one of:
-  //  - WUFFS_BASE__PIXEL_FORMAT__BGR_565
-  //  - WUFFS_BASE__PIXEL_FORMAT__BGR
-  //  - WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL
-  //  - WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE
-  //  - WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL
-  //  - WUFFS_BASE__PIXEL_FORMAT__RGB
-  //  - WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL
-  //  - WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL
-  // or return image_config.pixcfg.pixel_format(). The latter means to use the
-  // image file's natural pixel format. For example, GIF images' natural pixel
-  // format is an indexed one.
-  //
-  // Returning otherwise means failure (DecodeImage_UnsupportedPixelFormat).
-  //
-  // The default SelectPixfmt implementation returns
-  // wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL) which
-  // is 4 bytes per pixel (8 bits per channel × 4 channels).
-  virtual wuffs_base__pixel_format  //
-  SelectPixfmt(const wuffs_base__image_config& image_config);
-
-  // AllocPixbuf allocates the pixel buffer.
-  //
-  // allow_uninitialized_memory will be true if a valid background_color was
-  // passed to DecodeImage, since the pixel buffer's contents will be
-  // overwritten with that color after AllocPixbuf returns.
-  //
-  // The default AllocPixbuf implementation allocates either uninitialized or
-  // zeroed memory. Zeroed memory typically corresponds to filling with opaque
-  // black or transparent black, depending on the pixel format.
-  virtual AllocPixbufResult  //
-  AllocPixbuf(const wuffs_base__image_config& image_config,
-              bool allow_uninitialized_memory);
-
-  // AllocWorkbuf allocates the work buffer. The allocated buffer's length
-  // should be at least len_range.min_incl, but larger allocations (up to
-  // len_range.max_incl) may have better performance (by using more memory).
-  //
-  // The default AllocWorkbuf implementation allocates len_range.max_incl bytes
-  // of either uninitialized or zeroed memory.
-  virtual AllocWorkbufResult  //
-  AllocWorkbuf(wuffs_base__range_ii_u64 len_range,
-               bool allow_uninitialized_memory);
-
-  // Done is always the last Callback method called by DecodeImage, whether or
-  // not parsing the input encountered an error. Even when successful, trailing
-  // data may remain in input and buffer.
-  //
-  // The image_decoder is the one returned by SelectDecoder (if SelectDecoder
-  // was successful), or a no-op unique_ptr otherwise. Like any unique_ptr,
-  // ownership moves to the Done implementation.
-  //
-  // Do not keep a reference to buffer or buffer.data.ptr after Done returns,
-  // as DecodeImage may then de-allocate the backing array.
-  //
-  // The default Done implementation is a no-op, other than running the
-  // image_decoder unique_ptr destructor.
-  virtual void  //
-  Done(DecodeImageResult& result,
-       sync_io::Input& input,
-       IOBuffer& buffer,
-       wuffs_base__image_decoder::unique_ptr image_decoder);
-};
-
-extern const char DecodeImage_BufferIsTooShort[];
-extern const char DecodeImage_MaxInclDimensionExceeded[];
-extern const char DecodeImage_MaxInclMetadataLengthExceeded[];
-extern const char DecodeImage_OutOfMemory[];
-extern const char DecodeImage_UnexpectedEndOfFile[];
-extern const char DecodeImage_UnsupportedImageFormat[];
-extern const char DecodeImage_UnsupportedMetadata[];
-extern const char DecodeImage_UnsupportedPixelBlend[];
-extern const char DecodeImage_UnsupportedPixelConfiguration[];
-extern const char DecodeImage_UnsupportedPixelFormat[];
-
-// The FooArgBar types add structure to Foo's optional arguments. They wrap
-// inner representations for several reasons:
-//  - It provides a home for the DefaultValue static method, for Foo callers
-//    that want to override some but not all optional arguments.
-//  - It provides the "Bar" name at Foo call sites, which can help self-
-//    document Foo calls with many arguemnts.
-//  - It provides some type safety against accidentally transposing or omitting
-//    adjacent fundamentally-numeric-typed optional arguments.
-
-// DecodeImageArgQuirks wraps an optional argument to DecodeImage.
-struct DecodeImageArgQuirks {
-  explicit DecodeImageArgQuirks(wuffs_base__slice_u32 repr0);
-  explicit DecodeImageArgQuirks(uint32_t* ptr, size_t len);
-
-  // DefaultValue returns an empty slice.
-  static DecodeImageArgQuirks DefaultValue();
-
-  wuffs_base__slice_u32 repr;
-};
-
-// DecodeImageArgFlags wraps an optional argument to DecodeImage.
-struct DecodeImageArgFlags {
-  explicit DecodeImageArgFlags(uint64_t repr0);
-
-  // DefaultValue returns 0.
-  static DecodeImageArgFlags DefaultValue();
-
-  // TODO: support all of the REPORT_METADATA_ETC flags, not just CHRM, EXIF,
-  // GAMA, ICCP, KVP, SRGB and XMP.
-
-  // Background Color.
-  static constexpr uint64_t REPORT_METADATA_BGCL = 0x0001;
-  // Primary Chromaticities and White Point.
-  static constexpr uint64_t REPORT_METADATA_CHRM = 0x0002;
-  // Exchangeable Image File Format.
-  static constexpr uint64_t REPORT_METADATA_EXIF = 0x0004;
-  // Gamma Correction.
-  static constexpr uint64_t REPORT_METADATA_GAMA = 0x0008;
-  // International Color Consortium Profile.
-  static constexpr uint64_t REPORT_METADATA_ICCP = 0x0010;
-  // Key-Value Pair.
-  //
-  // For PNG files, this includes iTXt, tEXt and zTXt chunks. In the
-  // HandleMetadata callback, the raw argument contains UTF-8 strings.
-  static constexpr uint64_t REPORT_METADATA_KVP = 0x0020;
-  // Modification Time.
-  static constexpr uint64_t REPORT_METADATA_MTIM = 0x0040;
-  // Offset (2-Dimensional).
-  static constexpr uint64_t REPORT_METADATA_OFS2 = 0x0080;
-  // Physical Dimensions.
-  static constexpr uint64_t REPORT_METADATA_PHYD = 0x0100;
-  // Standard Red Green Blue (Rendering Intent).
-  static constexpr uint64_t REPORT_METADATA_SRGB = 0x0200;
-  // Extensible Metadata Platform.
-  static constexpr uint64_t REPORT_METADATA_XMP = 0x0400;
-
-  uint64_t repr;
-};
-
-// DecodeImageArgPixelBlend wraps an optional argument to DecodeImage.
-struct DecodeImageArgPixelBlend {
-  explicit DecodeImageArgPixelBlend(wuffs_base__pixel_blend repr0);
-
-  // DefaultValue returns WUFFS_BASE__PIXEL_BLEND__SRC.
-  static DecodeImageArgPixelBlend DefaultValue();
-
-  wuffs_base__pixel_blend repr;
-};
-
-// DecodeImageArgBackgroundColor wraps an optional argument to DecodeImage.
-struct DecodeImageArgBackgroundColor {
-  explicit DecodeImageArgBackgroundColor(
-      wuffs_base__color_u32_argb_premul repr0);
-
-  // DefaultValue returns 1, an invalid wuffs_base__color_u32_argb_premul.
-  static DecodeImageArgBackgroundColor DefaultValue();
-
-  wuffs_base__color_u32_argb_premul repr;
-};
-
-// DecodeImageArgMaxInclDimension wraps an optional argument to DecodeImage.
-struct DecodeImageArgMaxInclDimension {
-  explicit DecodeImageArgMaxInclDimension(uint32_t repr0);
-
-  // DefaultValue returns 1048575 = 0x000F_FFFF, more than 1 million pixels.
-  static DecodeImageArgMaxInclDimension DefaultValue();
-
-  uint32_t repr;
-};
-
-// DecodeImageArgMaxInclMetadataLength wraps an optional argument to
-// DecodeImage.
-struct DecodeImageArgMaxInclMetadataLength {
-  explicit DecodeImageArgMaxInclMetadataLength(uint64_t repr0);
-
-  // DefaultValue returns 16777215 = 0x00FF_FFFF, one less than 16 MiB.
-  static DecodeImageArgMaxInclMetadataLength DefaultValue();
-
-  uint64_t repr;
-};
-
-// DecodeImage decodes the image data in input. A variety of image file formats
-// can be decoded, depending on what callbacks.SelectDecoder returns.
-//
-// For animated formats, only the first frame is returned, since the API is
-// simpler for synchronous I/O and having DecodeImage only return when
-// completely done, but rendering animation often involves handling other
-// events in between animation frames. To decode multiple frames of animated
-// images, or for asynchronous I/O (e.g. when decoding an image streamed over
-// the network), use Wuffs' lower level C API instead of its higher level,
-// simplified C++ API (the wuffs_aux API).
-//
-// The DecodeImageResult's fields depend on whether decoding succeeded:
-//  - On total success, the error_message is empty and pixbuf.pixcfg.is_valid()
-//    is true.
-//  - On partial success (e.g. the input file was truncated but we are still
-//    able to decode some of the pixels), error_message is non-empty but
-//    pixbuf.pixcfg.is_valid() is still true. It is up to the caller whether to
-//    accept or reject partial success.
-//  - On failure, the error_message is non_empty and pixbuf.pixcfg.is_valid()
-//    is false.
-//
-// The callbacks allocate the pixel buffer memory and work buffer memory. On
-// success, pixel buffer memory ownership is passed to the DecodeImage caller
-// as the returned pixbuf_mem_owner. Regardless of success or failure, the work
-// buffer memory is deleted.
-//
-// The pixel_blend (one of the constants listed below) determines how to
-// composite the decoded image over the pixel buffer's original pixels (as
-// returned by callbacks.AllocPixbuf):
-//  - WUFFS_BASE__PIXEL_BLEND__SRC
-//  - WUFFS_BASE__PIXEL_BLEND__SRC_OVER
-//
-// The background_color is used to fill the pixel buffer after
-// callbacks.AllocPixbuf returns, if it is valid in the
-// wuffs_base__color_u32_argb_premul__is_valid sense. The default value,
-// 0x0000_0001, is not valid since its Blue channel value (0x01) is greater
-// than its Alpha channel value (0x00). A valid background_color will typically
-// be overwritten when pixel_blend is WUFFS_BASE__PIXEL_BLEND__SRC, but might
-// still be visible on partial (not total) success or when pixel_blend is
-// WUFFS_BASE__PIXEL_BLEND__SRC_OVER and the decoded image is not fully opaque.
-//
-// Decoding fails (with DecodeImage_MaxInclDimensionExceeded) if the image's
-// width or height is greater than max_incl_dimension or if any opted-in (via
-// flags bits) metadata is longer than max_incl_metadata_length.
-DecodeImageResult  //
-DecodeImage(DecodeImageCallbacks& callbacks,
-            sync_io::Input& input,
-            DecodeImageArgQuirks quirks = DecodeImageArgQuirks::DefaultValue(),
-            DecodeImageArgFlags flags = DecodeImageArgFlags::DefaultValue(),
-            DecodeImageArgPixelBlend pixel_blend =
-                DecodeImageArgPixelBlend::DefaultValue(),
-            DecodeImageArgBackgroundColor background_color =
-                DecodeImageArgBackgroundColor::DefaultValue(),
-            DecodeImageArgMaxInclDimension max_incl_dimension =
-                DecodeImageArgMaxInclDimension::DefaultValue(),
-            DecodeImageArgMaxInclMetadataLength max_incl_metadata_length =
-                DecodeImageArgMaxInclMetadataLength::DefaultValue());
-
-}  // namespace wuffs_aux
-
-// ---------------- Auxiliary - JSON
-
-namespace wuffs_aux {
-
-struct DecodeJsonResult {
-  DecodeJsonResult(std::string&& error_message0, uint64_t cursor_position0);
-
-  std::string error_message;
-  uint64_t cursor_position;
-};
-
-class DecodeJsonCallbacks {
- public:
-  virtual ~DecodeJsonCallbacks();
-
-  // AppendXxx are called for leaf nodes: literals, numbers and strings. For
-  // strings, the Callbacks implementation is responsible for tracking map keys
-  // versus other values.
-
-  virtual std::string AppendNull() = 0;
-  virtual std::string AppendBool(bool val) = 0;
-  virtual std::string AppendF64(double val) = 0;
-  virtual std::string AppendI64(int64_t val) = 0;
-  virtual std::string AppendTextString(std::string&& val) = 0;
-
-  // Push and Pop are called for container nodes: JSON arrays (lists) and JSON
-  // objects (dictionaries).
-  //
-  // The flags bits combine exactly one of:
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_NONE
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_LIST
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__FROM_DICT
-  // and exactly one of:
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_NONE
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_LIST
-  //  - WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_DICT
-
-  virtual std::string Push(uint32_t flags) = 0;
-  virtual std::string Pop(uint32_t flags) = 0;
-
-  // Done is always the last Callback method called by DecodeJson, whether or
-  // not parsing the input as JSON encountered an error. Even when successful,
-  // trailing data may remain in input and buffer. See "Unintuitive JSON
-  // Parsing" (https://nullprogram.com/blog/2019/12/28/) which discusses JSON
-  // parsing and when it stops.
-  //
-  // Do not keep a reference to buffer or buffer.data.ptr after Done returns,
-  // as DecodeJson may then de-allocate the backing array.
-  //
-  // The default Done implementation is a no-op.
-  virtual void  //
-  Done(DecodeJsonResult& result, sync_io::Input& input, IOBuffer& buffer);
-};
-
-extern const char DecodeJson_BadJsonPointer[];
-extern const char DecodeJson_NoMatch[];
-
-// The FooArgBar types add structure to Foo's optional arguments. They wrap
-// inner representations for several reasons:
-//  - It provides a home for the DefaultValue static method, for Foo callers
-//    that want to override some but not all optional arguments.
-//  - It provides the "Bar" name at Foo call sites, which can help self-
-//    document Foo calls with many arguemnts.
-//  - It provides some type safety against accidentally transposing or omitting
-//    adjacent fundamentally-numeric-typed optional arguments.
-
-// DecodeJsonArgQuirks wraps an optional argument to DecodeJson.
-struct DecodeJsonArgQuirks {
-  explicit DecodeJsonArgQuirks(wuffs_base__slice_u32 repr0);
-  explicit DecodeJsonArgQuirks(uint32_t* ptr, size_t len);
-
-  // DefaultValue returns an empty slice.
-  static DecodeJsonArgQuirks DefaultValue();
-
-  wuffs_base__slice_u32 repr;
-};
-
-// DecodeJsonArgJsonPointer wraps an optional argument to DecodeJson.
-struct DecodeJsonArgJsonPointer {
-  explicit DecodeJsonArgJsonPointer(std::string repr0);
-
-  // DefaultValue returns an empty string.
-  static DecodeJsonArgJsonPointer DefaultValue();
-
-  std::string repr;
-};
-
-// DecodeJson calls callbacks based on the JSON-formatted data in input.
-//
-// On success, the returned error_message is empty and cursor_position counts
-// the number of bytes consumed. On failure, error_message is non-empty and
-// cursor_position is the location of the error. That error may be a content
-// error (invalid JSON) or an input error (e.g. network failure).
-//
-// json_pointer is a query in the JSON Pointer (RFC 6901) syntax. The callbacks
-// run for the input's sub-node that matches the query. DecodeJson_NoMatch is
-// returned if no matching sub-node was found. The empty query matches the
-// input's root node, consistent with JSON Pointer semantics.
-//
-// The JSON Pointer implementation is greedy: duplicate keys are not rejected
-// but only the first match for each '/'-separated fragment is followed.
-DecodeJsonResult  //
-DecodeJson(DecodeJsonCallbacks& callbacks,
-           sync_io::Input& input,
-           DecodeJsonArgQuirks quirks = DecodeJsonArgQuirks::DefaultValue(),
-           DecodeJsonArgJsonPointer json_pointer =
-               DecodeJsonArgJsonPointer::DefaultValue());
-
-}  // namespace wuffs_aux
-
-#endif  // defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-// ‼ WUFFS C HEADER ENDS HERE.
-#ifdef WUFFS_IMPLEMENTATION
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ---------------- Fundamentals
-
-// WUFFS_BASE__MAGIC is a magic number to check that initializers are called.
-// It's not foolproof, given C doesn't automatically zero memory before use,
-// but it should catch 99.99% of cases.
-//
-// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
-#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
-
-// WUFFS_BASE__DISABLED is a magic number to indicate that a non-recoverable
-// error was previously encountered.
-//
-// Its (non-zero) value is arbitrary, based on md5sum("disabled").
-#define WUFFS_BASE__DISABLED ((uint32_t)0x075AE3D2)
-
-// Use switch cases for coroutine suspension points, similar to the technique
-// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
-//
-// The implicit fallthrough is intentional.
-//
-// We use trivial macros instead of an explicit assignment and case statement
-// so that clang-format doesn't get confused by the unusual "case"s.
-#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0 case 0:;
-#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT(n) \
-  coro_susp_point = n;                            \
-  case n:;
-
-#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(n) \
-  if (!status.repr) {                                           \
-    goto ok;                                                    \
-  } else if (*status.repr != '$') {                             \
-    goto exit;                                                  \
-  }                                                             \
-  coro_susp_point = n;                                          \
-  goto suspend;                                                 \
-  case n:;
-
-// The "defined(__clang__)" isn't redundant. While vanilla clang defines
-// __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
-#if defined(__GNUC__) || defined(__clang__)
-#define WUFFS_BASE__LIKELY(expr) (__builtin_expect(!!(expr), 1))
-#define WUFFS_BASE__UNLIKELY(expr) (__builtin_expect(!!(expr), 0))
-#else
-#define WUFFS_BASE__LIKELY(expr) (expr)
-#define WUFFS_BASE__UNLIKELY(expr) (expr)
-#endif
-
-// --------
-
-static inline wuffs_base__empty_struct  //
-wuffs_base__ignore_status(wuffs_base__status z) {
-  return wuffs_base__make_empty_struct();
-}
-
-static inline wuffs_base__status  //
-wuffs_base__status__ensure_not_a_suspension(wuffs_base__status z) {
-  if (z.repr && (*z.repr == '$')) {
-    z.repr = wuffs_base__error__cannot_return_a_suspension;
-  }
-  return z;
-}
-
-// --------
-
-// wuffs_base__iterate_total_advance returns the exclusive pointer-offset at
-// which iteration should stop. The overall slice has length total_len, each
-// iteration's sub-slice has length iter_len and are placed iter_advance apart.
-//
-// The iter_advance may not be larger than iter_len. The iter_advance may be
-// smaller than iter_len, in which case the sub-slices will overlap.
-//
-// The return value r satisfies ((0 <= r) && (r <= total_len)).
-//
-// For example, if total_len = 15, iter_len = 5 and iter_advance = 3, there are
-// four iterations at offsets 0, 3, 6 and 9. This function returns 12.
-//
-// 0123456789012345
-// [....]
-//    [....]
-//       [....]
-//          [....]
-//             $
-// 0123456789012345
-//
-// For example, if total_len = 15, iter_len = 5 and iter_advance = 5, there are
-// three iterations at offsets 0, 5 and 10. This function returns 15.
-//
-// 0123456789012345
-// [....]
-//      [....]
-//           [....]
-//                $
-// 0123456789012345
-static inline size_t  //
-wuffs_base__iterate_total_advance(size_t total_len,
-                                  size_t iter_len,
-                                  size_t iter_advance) {
-  if (total_len >= iter_len) {
-    size_t n = total_len - iter_len;
-    return ((n / iter_advance) * iter_advance) + iter_advance;
-  }
-  return 0;
-}
-
-// ---------------- Numeric Types
-
-extern const uint8_t wuffs_base__low_bits_mask__u8[8];
-extern const uint16_t wuffs_base__low_bits_mask__u16[16];
-extern const uint32_t wuffs_base__low_bits_mask__u32[32];
-extern const uint64_t wuffs_base__low_bits_mask__u64[64];
-
-#define WUFFS_BASE__LOW_BITS_MASK__U8(n) (wuffs_base__low_bits_mask__u8[n])
-#define WUFFS_BASE__LOW_BITS_MASK__U16(n) (wuffs_base__low_bits_mask__u16[n])
-#define WUFFS_BASE__LOW_BITS_MASK__U32(n) (wuffs_base__low_bits_mask__u32[n])
-#define WUFFS_BASE__LOW_BITS_MASK__U64(n) (wuffs_base__low_bits_mask__u64[n])
-
-// --------
-
-static inline void  //
-wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) {
-  *x = wuffs_base__u8__sat_add(*x, y);
-}
-
-static inline void  //
-wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) {
-  *x = wuffs_base__u8__sat_sub(*x, y);
-}
-
-static inline void  //
-wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) {
-  *x = wuffs_base__u16__sat_add(*x, y);
-}
-
-static inline void  //
-wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) {
-  *x = wuffs_base__u16__sat_sub(*x, y);
-}
-
-static inline void  //
-wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) {
-  *x = wuffs_base__u32__sat_add(*x, y);
-}
-
-static inline void  //
-wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) {
-  *x = wuffs_base__u32__sat_sub(*x, y);
-}
-
-static inline void  //
-wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) {
-  *x = wuffs_base__u64__sat_add(*x, y);
-}
-
-static inline void  //
-wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) {
-  *x = wuffs_base__u64__sat_sub(*x, y);
-}
-
-// ---------------- Numeric Types (Utility)
-
-#define wuffs_base__utility__sign_extend_convert_u16_u32(a) \
-  ((uint32_t)(int32_t)(int16_t)(a))
-
-#define wuffs_base__utility__sign_extend_rshift_u32(a, n) \
-  ((uint32_t)(((int32_t)(a)) >> (n)))
-
-#define wuffs_base__utility__sign_extend_rshift_u64(a, n) \
-  ((uint64_t)(((int64_t)(a)) >> (n)))
-
-// ---------------- Slices and Tables
-
-// wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s.
-static inline wuffs_base__slice_u8  //
-wuffs_base__slice_u8__prefix(wuffs_base__slice_u8 s, uint64_t up_to) {
-  if (((uint64_t)(s.len)) > up_to) {
-    s.len = ((size_t)up_to);
-  }
-  return s;
-}
-
-// wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s.
-static inline wuffs_base__slice_u8  //
-wuffs_base__slice_u8__suffix(wuffs_base__slice_u8 s, uint64_t up_to) {
-  if (((uint64_t)(s.len)) > up_to) {
-    s.ptr += ((uint64_t)(s.len)) - up_to;
-    s.len = ((size_t)up_to);
-  }
-  return s;
-}
-
-// wuffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr, len)
-// where len is the minimum of dst.len and src.len.
-//
-// Passing a wuffs_base__slice_u8 with all fields NULL or zero (a valid, empty
-// slice) is valid and results in a no-op.
-static inline uint64_t  //
-wuffs_base__slice_u8__copy_from_slice(wuffs_base__slice_u8 dst,
-                                      wuffs_base__slice_u8 src) {
-  size_t len = dst.len < src.len ? dst.len : src.len;
-  if (len > 0) {
-    memmove(dst.ptr, src.ptr, len);
-  }
-  return len;
-}
-
-static inline wuffs_base__empty_struct  //
-wuffs_base__bulk_load_host_endian(void* ptr,
-                                  size_t len,
-                                  wuffs_base__slice_u8 src) {
-  if (len && (len <= src.len)) {
-    memmove(ptr, src.ptr, len);
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-static inline wuffs_base__empty_struct  //
-wuffs_base__bulk_memset(void* ptr, size_t len, uint8_t byte_value) {
-  if (len) {
-    memset(ptr, byte_value, len);
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-static inline wuffs_base__empty_struct  //
-wuffs_base__bulk_save_host_endian(void* ptr,
-                                  size_t len,
-                                  wuffs_base__slice_u8 dst) {
-  if (len && (len <= dst.len)) {
-    memmove(dst.ptr, ptr, len);
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// --------
-
-static inline wuffs_base__slice_u8  //
-wuffs_base__table_u8__row_u32(wuffs_base__table_u8 t, uint32_t y) {
-  if (y < t.height) {
-    return wuffs_base__make_slice_u8(t.ptr + (t.stride * y), t.width);
-  }
-  return wuffs_base__make_slice_u8(NULL, 0);
-}
-
-// ---------------- Slices and Tables (Utility)
-
-#define wuffs_base__utility__empty_slice_u8 wuffs_base__empty_slice_u8
-
-// ---------------- Ranges and Rects
-
-static inline uint32_t  //
-wuffs_base__range_ii_u32__get_min_incl(const wuffs_base__range_ii_u32* r) {
-  return r->min_incl;
-}
-
-static inline uint32_t  //
-wuffs_base__range_ii_u32__get_max_incl(const wuffs_base__range_ii_u32* r) {
-  return r->max_incl;
-}
-
-static inline uint32_t  //
-wuffs_base__range_ie_u32__get_min_incl(const wuffs_base__range_ie_u32* r) {
-  return r->min_incl;
-}
-
-static inline uint32_t  //
-wuffs_base__range_ie_u32__get_max_excl(const wuffs_base__range_ie_u32* r) {
-  return r->max_excl;
-}
-
-static inline uint64_t  //
-wuffs_base__range_ii_u64__get_min_incl(const wuffs_base__range_ii_u64* r) {
-  return r->min_incl;
-}
-
-static inline uint64_t  //
-wuffs_base__range_ii_u64__get_max_incl(const wuffs_base__range_ii_u64* r) {
-  return r->max_incl;
-}
-
-static inline uint64_t  //
-wuffs_base__range_ie_u64__get_min_incl(const wuffs_base__range_ie_u64* r) {
-  return r->min_incl;
-}
-
-static inline uint64_t  //
-wuffs_base__range_ie_u64__get_max_excl(const wuffs_base__range_ie_u64* r) {
-  return r->max_excl;
-}
-
-// ---------------- Ranges and Rects (Utility)
-
-#define wuffs_base__utility__empty_range_ii_u32 wuffs_base__empty_range_ii_u32
-#define wuffs_base__utility__empty_range_ie_u32 wuffs_base__empty_range_ie_u32
-#define wuffs_base__utility__empty_range_ii_u64 wuffs_base__empty_range_ii_u64
-#define wuffs_base__utility__empty_range_ie_u64 wuffs_base__empty_range_ie_u64
-#define wuffs_base__utility__empty_rect_ii_u32 wuffs_base__empty_rect_ii_u32
-#define wuffs_base__utility__empty_rect_ie_u32 wuffs_base__empty_rect_ie_u32
-#define wuffs_base__utility__make_range_ii_u32 wuffs_base__make_range_ii_u32
-#define wuffs_base__utility__make_range_ie_u32 wuffs_base__make_range_ie_u32
-#define wuffs_base__utility__make_range_ii_u64 wuffs_base__make_range_ii_u64
-#define wuffs_base__utility__make_range_ie_u64 wuffs_base__make_range_ie_u64
-#define wuffs_base__utility__make_rect_ii_u32 wuffs_base__make_rect_ii_u32
-#define wuffs_base__utility__make_rect_ie_u32 wuffs_base__make_rect_ie_u32
-
-// ---------------- I/O
-
-static inline uint64_t  //
-wuffs_base__io__count_since(uint64_t mark, uint64_t index) {
-  if (index >= mark) {
-    return index - mark;
-  }
-  return 0;
-}
-
-// TODO: drop the "const" in "const uint8_t* ptr". Some though required about
-// the base.io_reader.since method returning a mutable "slice base.u8".
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-static inline wuffs_base__slice_u8  //
-wuffs_base__io__since(uint64_t mark, uint64_t index, const uint8_t* ptr) {
-  if (index >= mark) {
-    return wuffs_base__make_slice_u8(((uint8_t*)ptr) + mark,
-                                     ((size_t)(index - mark)));
-  }
-  return wuffs_base__make_slice_u8(NULL, 0);
-}
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-// --------
-
-static inline void  //
-wuffs_base__io_reader__limit(const uint8_t** ptr_io2_r,
-                             const uint8_t* iop_r,
-                             uint64_t limit) {
-  if (((uint64_t)(*ptr_io2_r - iop_r)) > limit) {
-    *ptr_io2_r = iop_r + limit;
-  }
-}
-
-static inline uint32_t  //
-wuffs_base__io_reader__limited_copy_u32_to_slice(const uint8_t** ptr_iop_r,
-                                                 const uint8_t* io2_r,
-                                                 uint32_t length,
-                                                 wuffs_base__slice_u8 dst) {
-  const uint8_t* iop_r = *ptr_iop_r;
-  size_t n = dst.len;
-  if (n > length) {
-    n = length;
-  }
-  if (n > ((size_t)(io2_r - iop_r))) {
-    n = (size_t)(io2_r - iop_r);
-  }
-  if (n > 0) {
-    memmove(dst.ptr, iop_r, n);
-    *ptr_iop_r += n;
-  }
-  return (uint32_t)(n);
-}
-
-// wuffs_base__io_reader__match7 returns whether the io_reader's upcoming bytes
-// start with the given prefix (up to 7 bytes long). It is peek-like, not
-// read-like, in that there are no side-effects.
-//
-// The low 3 bits of a hold the prefix length, n.
-//
-// The high 56 bits of a hold the prefix itself, in little-endian order. The
-// first prefix byte is in bits 8..=15, the second prefix byte is in bits
-// 16..=23, etc. The high (8 * (7 - n)) bits are ignored.
-//
-// There are three possible return values:
-//  - 0 means success.
-//  - 1 means inconclusive, equivalent to "$short read".
-//  - 2 means failure.
-static inline uint32_t  //
-wuffs_base__io_reader__match7(const uint8_t* iop_r,
-                              const uint8_t* io2_r,
-                              wuffs_base__io_buffer* r,
-                              uint64_t a) {
-  uint32_t n = a & 7;
-  a >>= 8;
-  if ((io2_r - iop_r) >= 8) {
-    uint64_t x = wuffs_base__peek_u64le__no_bounds_check(iop_r);
-    uint32_t shift = 8 * (8 - n);
-    return ((a << shift) == (x << shift)) ? 0 : 2;
-  }
-  for (; n > 0; n--) {
-    if (iop_r >= io2_r) {
-      return (r && r->meta.closed) ? 2 : 1;
-    } else if (*iop_r != ((uint8_t)(a))) {
-      return 2;
-    }
-    iop_r++;
-    a >>= 8;
-  }
-  return 0;
-}
-
-static inline wuffs_base__io_buffer*  //
-wuffs_base__io_reader__set(wuffs_base__io_buffer* b,
-                           const uint8_t** ptr_iop_r,
-                           const uint8_t** ptr_io0_r,
-                           const uint8_t** ptr_io1_r,
-                           const uint8_t** ptr_io2_r,
-                           wuffs_base__slice_u8 data,
-                           uint64_t history_position) {
-  b->data = data;
-  b->meta.wi = data.len;
-  b->meta.ri = 0;
-  b->meta.pos = history_position;
-  b->meta.closed = false;
-
-  *ptr_iop_r = data.ptr;
-  *ptr_io0_r = data.ptr;
-  *ptr_io1_r = data.ptr;
-  *ptr_io2_r = data.ptr + data.len;
-
-  return b;
-}
-
-// --------
-
-static inline uint64_t  //
-wuffs_base__io_writer__copy_from_slice(uint8_t** ptr_iop_w,
-                                       uint8_t* io2_w,
-                                       wuffs_base__slice_u8 src) {
-  uint8_t* iop_w = *ptr_iop_w;
-  size_t n = src.len;
-  if (n > ((size_t)(io2_w - iop_w))) {
-    n = (size_t)(io2_w - iop_w);
-  }
-  if (n > 0) {
-    memmove(iop_w, src.ptr, n);
-    *ptr_iop_w += n;
-  }
-  return (uint64_t)(n);
-}
-
-static inline void  //
-wuffs_base__io_writer__limit(uint8_t** ptr_io2_w,
-                             uint8_t* iop_w,
-                             uint64_t limit) {
-  if (((uint64_t)(*ptr_io2_w - iop_w)) > limit) {
-    *ptr_io2_w = iop_w + limit;
-  }
-}
-
-static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_history(uint8_t** ptr_iop_w,
-                                                     uint8_t* io0_w,
-                                                     uint8_t* io2_w,
-                                                     uint32_t length,
-                                                     uint32_t distance) {
-  if (!distance) {
-    return 0;
-  }
-  uint8_t* p = *ptr_iop_w;
-  if ((size_t)(p - io0_w) < (size_t)(distance)) {
-    return 0;
-  }
-  uint8_t* q = p - distance;
-  size_t n = (size_t)(io2_w - p);
-  if ((size_t)(length) > n) {
-    length = (uint32_t)(n);
-  } else {
-    n = (size_t)(length);
-  }
-  // TODO: unrolling by 3 seems best for the std/deflate benchmarks, but that
-  // is mostly because 3 is the minimum length for the deflate format. This
-  // function implementation shouldn't overfit to that one format. Perhaps the
-  // limited_copy_u32_from_history Wuffs method should also take an unroll hint
-  // argument, and the cgen can look if that argument is the constant
-  // expression '3'.
-  //
-  // See also wuffs_base__io_writer__limited_copy_u32_from_history_fast below.
-  for (; n >= 3; n -= 3) {
-    *p++ = *q++;
-    *p++ = *q++;
-    *p++ = *q++;
-  }
-  for (; n; n--) {
-    *p++ = *q++;
-  }
-  *ptr_iop_w = p;
-  return length;
-}
-
-// wuffs_base__io_writer__limited_copy_u32_from_history_fast is like the
-// wuffs_base__io_writer__limited_copy_u32_from_history function above, but has
-// stronger pre-conditions.
-//
-// The caller needs to prove that:
-//  - length   <= (io2_w      - *ptr_iop_w)
-//  - distance >= 1
-//  - distance <= (*ptr_iop_w - io0_w)
-static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_history_fast(uint8_t** ptr_iop_w,
-                                                          uint8_t* io0_w,
-                                                          uint8_t* io2_w,
-                                                          uint32_t length,
-                                                          uint32_t distance) {
-  uint8_t* p = *ptr_iop_w;
-  uint8_t* q = p - distance;
-  uint32_t n = length;
-  for (; n >= 3; n -= 3) {
-    *p++ = *q++;
-    *p++ = *q++;
-    *p++ = *q++;
-  }
-  for (; n; n--) {
-    *p++ = *q++;
-  }
-  *ptr_iop_w = p;
-  return length;
-}
-
-// wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast
-// copies the previous byte (the one immediately before *ptr_iop_w), copying 8
-// byte chunks at a time. Each chunk contains 8 repetitions of the same byte.
-//
-// In terms of number of bytes copied, length is rounded up to a multiple of 8.
-// As a special case, a zero length rounds up to 8 (even though 0 is already a
-// multiple of 8), since there is always at least one 8 byte chunk copied.
-//
-// In terms of advancing *ptr_iop_w, length is not rounded up.
-//
-// The caller needs to prove that:
-//  - (length + 8) <= (io2_w      - *ptr_iop_w)
-//  - distance     == 1
-//  - distance     <= (*ptr_iop_w - io0_w)
-static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast(
-    uint8_t** ptr_iop_w,
-    uint8_t* io0_w,
-    uint8_t* io2_w,
-    uint32_t length,
-    uint32_t distance) {
-  uint8_t* p = *ptr_iop_w;
-  uint64_t x = p[-1];
-  x |= x << 8;
-  x |= x << 16;
-  x |= x << 32;
-  uint32_t n = length;
-  while (1) {
-    wuffs_base__poke_u64le__no_bounds_check(p, x);
-    if (n <= 8) {
-      p += n;
-      break;
-    }
-    p += 8;
-    n -= 8;
-  }
-  *ptr_iop_w = p;
-  return length;
-}
-
-// wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast is
-// like the wuffs_base__io_writer__limited_copy_u32_from_history_fast function
-// above, but copies 8 byte chunks at a time.
-//
-// In terms of number of bytes copied, length is rounded up to a multiple of 8.
-// As a special case, a zero length rounds up to 8 (even though 0 is already a
-// multiple of 8), since there is always at least one 8 byte chunk copied.
-//
-// In terms of advancing *ptr_iop_w, length is not rounded up.
-//
-// The caller needs to prove that:
-//  - (length + 8) <= (io2_w      - *ptr_iop_w)
-//  - distance     >= 8
-//  - distance     <= (*ptr_iop_w - io0_w)
-static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast(
-    uint8_t** ptr_iop_w,
-    uint8_t* io0_w,
-    uint8_t* io2_w,
-    uint32_t length,
-    uint32_t distance) {
-  uint8_t* p = *ptr_iop_w;
-  uint8_t* q = p - distance;
-  uint32_t n = length;
-  while (1) {
-    memcpy(p, q, 8);
-    if (n <= 8) {
-      p += n;
-      break;
-    }
-    p += 8;
-    q += 8;
-    n -= 8;
-  }
-  *ptr_iop_w = p;
-  return length;
-}
-
-static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_reader(uint8_t** ptr_iop_w,
-                                                    uint8_t* io2_w,
-                                                    uint32_t length,
-                                                    const uint8_t** ptr_iop_r,
-                                                    const uint8_t* io2_r) {
-  uint8_t* iop_w = *ptr_iop_w;
-  size_t n = length;
-  if (n > ((size_t)(io2_w - iop_w))) {
-    n = (size_t)(io2_w - iop_w);
-  }
-  const uint8_t* iop_r = *ptr_iop_r;
-  if (n > ((size_t)(io2_r - iop_r))) {
-    n = (size_t)(io2_r - iop_r);
-  }
-  if (n > 0) {
-    memmove(iop_w, iop_r, n);
-    *ptr_iop_w += n;
-    *ptr_iop_r += n;
-  }
-  return (uint32_t)(n);
-}
-
-static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_slice(uint8_t** ptr_iop_w,
-                                                   uint8_t* io2_w,
-                                                   uint32_t length,
-                                                   wuffs_base__slice_u8 src) {
-  uint8_t* iop_w = *ptr_iop_w;
-  size_t n = src.len;
-  if (n > length) {
-    n = length;
-  }
-  if (n > ((size_t)(io2_w - iop_w))) {
-    n = (size_t)(io2_w - iop_w);
-  }
-  if (n > 0) {
-    memmove(iop_w, src.ptr, n);
-    *ptr_iop_w += n;
-  }
-  return (uint32_t)(n);
-}
-
-static inline wuffs_base__io_buffer*  //
-wuffs_base__io_writer__set(wuffs_base__io_buffer* b,
-                           uint8_t** ptr_iop_w,
-                           uint8_t** ptr_io0_w,
-                           uint8_t** ptr_io1_w,
-                           uint8_t** ptr_io2_w,
-                           wuffs_base__slice_u8 data,
-                           uint64_t history_position) {
-  b->data = data;
-  b->meta.wi = 0;
-  b->meta.ri = 0;
-  b->meta.pos = history_position;
-  b->meta.closed = false;
-
-  *ptr_iop_w = data.ptr;
-  *ptr_io0_w = data.ptr;
-  *ptr_io1_w = data.ptr;
-  *ptr_io2_w = data.ptr + data.len;
-
-  return b;
-}
-
-// ---------------- I/O (Utility)
-
-#define wuffs_base__utility__empty_io_reader wuffs_base__empty_io_reader
-#define wuffs_base__utility__empty_io_writer wuffs_base__empty_io_writer
-
-// ---------------- Tokens
-
-// ---------------- Tokens (Utility)
-
-// ---------------- Memory Allocation
-
-// ---------------- Images
-
-WUFFS_BASE__MAYBE_STATIC uint64_t  //
-wuffs_base__pixel_swizzler__limited_swizzle_u32_interleaved_from_reader(
-    const wuffs_base__pixel_swizzler* p,
-    uint32_t up_to_num_pixels,
-    wuffs_base__slice_u8 dst,
-    wuffs_base__slice_u8 dst_palette,
-    const uint8_t** ptr_iop_r,
-    const uint8_t* io2_r);
-
-WUFFS_BASE__MAYBE_STATIC uint64_t  //
-wuffs_base__pixel_swizzler__swizzle_interleaved_from_reader(
-    const wuffs_base__pixel_swizzler* p,
-    wuffs_base__slice_u8 dst,
-    wuffs_base__slice_u8 dst_palette,
-    const uint8_t** ptr_iop_r,
-    const uint8_t* io2_r);
-
-WUFFS_BASE__MAYBE_STATIC uint64_t  //
-wuffs_base__pixel_swizzler__swizzle_interleaved_transparent_black(
-    const wuffs_base__pixel_swizzler* p,
-    wuffs_base__slice_u8 dst,
-    wuffs_base__slice_u8 dst_palette,
-    uint64_t num_pixels);
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
-wuffs_base__pixel_swizzler__swizzle_ycck(
-    const wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_buffer* dst,
-    wuffs_base__slice_u8 dst_palette,
-    uint32_t width,
-    uint32_t height,
-    wuffs_base__slice_u8 src0,
-    wuffs_base__slice_u8 src1,
-    wuffs_base__slice_u8 src2,
-    wuffs_base__slice_u8 src3,
-    uint32_t width0,
-    uint32_t width1,
-    uint32_t width2,
-    uint32_t width3,
-    uint32_t height0,
-    uint32_t height1,
-    uint32_t height2,
-    uint32_t height3,
-    uint32_t stride0,
-    uint32_t stride1,
-    uint32_t stride2,
-    uint32_t stride3,
-    uint8_t h0,
-    uint8_t h1,
-    uint8_t h2,
-    uint8_t h3,
-    uint8_t v0,
-    uint8_t v1,
-    uint8_t v2,
-    uint8_t v3,
-    bool is_rgb_or_cmyk,
-    bool triangle_filter_for_2to1,
-    wuffs_base__slice_u8 scratch_buffer_2k);
-
-// ---------------- Images (Utility)
-
-#define wuffs_base__utility__make_pixel_format wuffs_base__make_pixel_format
-
-// ---------------- String Conversions
-
-// ---------------- Unicode and UTF-8
-
-// ----------------
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) || \
-    defined(WUFFS_CONFIG__MODULE__BASE__CORE)
-
-const uint8_t wuffs_base__low_bits_mask__u8[8] = {
-    0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F,
-};
-
-const uint16_t wuffs_base__low_bits_mask__u16[16] = {
-    0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F,
-    0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF,
-};
-
-const uint32_t wuffs_base__low_bits_mask__u32[32] = {
-    0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000F, 0x0000001F,
-    0x0000003F, 0x0000007F, 0x000000FF, 0x000001FF, 0x000003FF, 0x000007FF,
-    0x00000FFF, 0x00001FFF, 0x00003FFF, 0x00007FFF, 0x0000FFFF, 0x0001FFFF,
-    0x0003FFFF, 0x0007FFFF, 0x000FFFFF, 0x001FFFFF, 0x003FFFFF, 0x007FFFFF,
-    0x00FFFFFF, 0x01FFFFFF, 0x03FFFFFF, 0x07FFFFFF, 0x0FFFFFFF, 0x1FFFFFFF,
-    0x3FFFFFFF, 0x7FFFFFFF,
-};
-
-const uint64_t wuffs_base__low_bits_mask__u64[64] = {
-    0x0000000000000000, 0x0000000000000001, 0x0000000000000003,
-    0x0000000000000007, 0x000000000000000F, 0x000000000000001F,
-    0x000000000000003F, 0x000000000000007F, 0x00000000000000FF,
-    0x00000000000001FF, 0x00000000000003FF, 0x00000000000007FF,
-    0x0000000000000FFF, 0x0000000000001FFF, 0x0000000000003FFF,
-    0x0000000000007FFF, 0x000000000000FFFF, 0x000000000001FFFF,
-    0x000000000003FFFF, 0x000000000007FFFF, 0x00000000000FFFFF,
-    0x00000000001FFFFF, 0x00000000003FFFFF, 0x00000000007FFFFF,
-    0x0000000000FFFFFF, 0x0000000001FFFFFF, 0x0000000003FFFFFF,
-    0x0000000007FFFFFF, 0x000000000FFFFFFF, 0x000000001FFFFFFF,
-    0x000000003FFFFFFF, 0x000000007FFFFFFF, 0x00000000FFFFFFFF,
-    0x00000001FFFFFFFF, 0x00000003FFFFFFFF, 0x00000007FFFFFFFF,
-    0x0000000FFFFFFFFF, 0x0000001FFFFFFFFF, 0x0000003FFFFFFFFF,
-    0x0000007FFFFFFFFF, 0x000000FFFFFFFFFF, 0x000001FFFFFFFFFF,
-    0x000003FFFFFFFFFF, 0x000007FFFFFFFFFF, 0x00000FFFFFFFFFFF,
-    0x00001FFFFFFFFFFF, 0x00003FFFFFFFFFFF, 0x00007FFFFFFFFFFF,
-    0x0000FFFFFFFFFFFF, 0x0001FFFFFFFFFFFF, 0x0003FFFFFFFFFFFF,
-    0x0007FFFFFFFFFFFF, 0x000FFFFFFFFFFFFF, 0x001FFFFFFFFFFFFF,
-    0x003FFFFFFFFFFFFF, 0x007FFFFFFFFFFFFF, 0x00FFFFFFFFFFFFFF,
-    0x01FFFFFFFFFFFFFF, 0x03FFFFFFFFFFFFFF, 0x07FFFFFFFFFFFFFF,
-    0x0FFFFFFFFFFFFFFF, 0x1FFFFFFFFFFFFFFF, 0x3FFFFFFFFFFFFFFF,
-    0x7FFFFFFFFFFFFFFF,
-};
-
-const uint32_t wuffs_base__pixel_format__bits_per_channel[16] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x0A, 0x0C, 0x10, 0x18, 0x20, 0x30, 0x40,
-};
-
-const char wuffs_base__note__i_o_redirect[] = "@base: I/O redirect";
-const char wuffs_base__note__end_of_data[] = "@base: end of data";
-const char wuffs_base__note__metadata_reported[] = "@base: metadata reported";
-const char wuffs_base__suspension__even_more_information[] = "$base: even more information";
-const char wuffs_base__suspension__mispositioned_read[] = "$base: mispositioned read";
-const char wuffs_base__suspension__mispositioned_write[] = "$base: mispositioned write";
-const char wuffs_base__suspension__short_read[] = "$base: short read";
-const char wuffs_base__suspension__short_write[] = "$base: short write";
-const char wuffs_base__error__bad_i_o_position[] = "#base: bad I/O position";
-const char wuffs_base__error__bad_argument_length_too_short[] = "#base: bad argument (length too short)";
-const char wuffs_base__error__bad_argument[] = "#base: bad argument";
-const char wuffs_base__error__bad_call_sequence[] = "#base: bad call sequence";
-const char wuffs_base__error__bad_data[] = "#base: bad data";
-const char wuffs_base__error__bad_receiver[] = "#base: bad receiver";
-const char wuffs_base__error__bad_restart[] = "#base: bad restart";
-const char wuffs_base__error__bad_sizeof_receiver[] = "#base: bad sizeof receiver";
-const char wuffs_base__error__bad_vtable[] = "#base: bad vtable";
-const char wuffs_base__error__bad_workbuf_length[] = "#base: bad workbuf length";
-const char wuffs_base__error__bad_wuffs_version[] = "#base: bad wuffs version";
-const char wuffs_base__error__cannot_return_a_suspension[] = "#base: cannot return a suspension";
-const char wuffs_base__error__disabled_by_previous_error[] = "#base: disabled by previous error";
-const char wuffs_base__error__initialize_falsely_claimed_already_zeroed[] = "#base: initialize falsely claimed already zeroed";
-const char wuffs_base__error__initialize_not_called[] = "#base: initialize not called";
-const char wuffs_base__error__interleaved_coroutine_calls[] = "#base: interleaved coroutine calls";
-const char wuffs_base__error__no_more_information[] = "#base: no more information";
-const char wuffs_base__error__not_enough_data[] = "#base: not enough data";
-const char wuffs_base__error__out_of_bounds[] = "#base: out of bounds";
-const char wuffs_base__error__unsupported_image_dimension[] = "#base: unsupported image dimension";
-const char wuffs_base__error__unsupported_method[] = "#base: unsupported method";
-const char wuffs_base__error__unsupported_option[] = "#base: unsupported option";
-const char wuffs_base__error__unsupported_pixel_swizzler_option[] = "#base: unsupported pixel swizzler option";
-const char wuffs_base__error__too_much_data[] = "#base: too much data";
-
-const char wuffs_base__hasher_u32__vtable_name[] = "{vtable}wuffs_base__hasher_u32";
-const char wuffs_base__image_decoder__vtable_name[] = "{vtable}wuffs_base__image_decoder";
-const char wuffs_base__io_transformer__vtable_name[] = "{vtable}wuffs_base__io_transformer";
-const char wuffs_base__token_decoder__vtable_name[] = "{vtable}wuffs_base__token_decoder";
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE)  ||
-        // defined(WUFFS_CONFIG__MODULE__BASE__CORE)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) || \
-    defined(WUFFS_CONFIG__MODULE__BASE__INTERFACES)
-
-// ---------------- Interface Definitions.
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__hasher_u32__get_quirk(
-    const wuffs_base__hasher_u32* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__hasher_u32__vtable_name) {
-      const wuffs_base__hasher_u32__func_ptrs* func_ptrs =
-          (const wuffs_base__hasher_u32__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->get_quirk)(self, a_key);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__hasher_u32__set_quirk(
-    wuffs_base__hasher_u32* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__hasher_u32__vtable_name) {
-      const wuffs_base__hasher_u32__func_ptrs* func_ptrs =
-          (const wuffs_base__hasher_u32__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->set_quirk)(self, a_key, a_value);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_base__hasher_u32__update_u32(
-    wuffs_base__hasher_u32* self,
-    wuffs_base__slice_u8 a_x) {
-  if (!self) {
-    return 0;
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__hasher_u32__vtable_name) {
-      const wuffs_base__hasher_u32__func_ptrs* func_ptrs =
-          (const wuffs_base__hasher_u32__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->update_u32)(self, a_x);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-// --------
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__decode_frame(
-    wuffs_base__image_decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->decode_frame)(self, a_dst, a_src, a_blend, a_workbuf, a_opts);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__decode_frame_config(
-    wuffs_base__image_decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->decode_frame_config)(self, a_dst, a_src);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__decode_image_config(
-    wuffs_base__image_decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->decode_image_config)(self, a_dst, a_src);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_base__image_decoder__frame_dirty_rect(
-    const wuffs_base__image_decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->frame_dirty_rect)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__utility__empty_rect_ie_u32();
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__image_decoder__get_quirk(
-    const wuffs_base__image_decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->get_quirk)(self, a_key);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_base__image_decoder__num_animation_loops(
-    const wuffs_base__image_decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->num_animation_loops)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__image_decoder__num_decoded_frame_configs(
-    const wuffs_base__image_decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->num_decoded_frame_configs)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__image_decoder__num_decoded_frames(
-    const wuffs_base__image_decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->num_decoded_frames)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__restart_frame(
-    wuffs_base__image_decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->restart_frame)(self, a_index, a_io_position);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__set_quirk(
-    wuffs_base__image_decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->set_quirk)(self, a_key, a_value);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_base__image_decoder__set_report_metadata(
-    wuffs_base__image_decoder* self,
-    uint32_t a_fourcc,
-    bool a_report) {
-  if (!self) {
-    return wuffs_base__make_empty_struct();
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_empty_struct();
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->set_report_metadata)(self, a_fourcc, a_report);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_empty_struct();
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__image_decoder__tell_me_more(
-    wuffs_base__image_decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->tell_me_more)(self, a_dst, a_minfo, a_src);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_base__image_decoder__workbuf_len(
-    const wuffs_base__image_decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->workbuf_len)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__utility__empty_range_ii_u64();
-}
-
-// --------
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__io_transformer__get_quirk(
-    const wuffs_base__io_transformer* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__io_transformer__vtable_name) {
-      const wuffs_base__io_transformer__func_ptrs* func_ptrs =
-          (const wuffs_base__io_transformer__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->get_quirk)(self, a_key);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__io_transformer__set_quirk(
-    wuffs_base__io_transformer* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__io_transformer__vtable_name) {
-      const wuffs_base__io_transformer__func_ptrs* func_ptrs =
-          (const wuffs_base__io_transformer__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->set_quirk)(self, a_key, a_value);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__io_transformer__transform_io(
-    wuffs_base__io_transformer* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__io_transformer__vtable_name) {
-      const wuffs_base__io_transformer__func_ptrs* func_ptrs =
-          (const wuffs_base__io_transformer__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->transform_io)(self, a_dst, a_src, a_workbuf);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_base__io_transformer__workbuf_len(
-    const wuffs_base__io_transformer* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__io_transformer__vtable_name) {
-      const wuffs_base__io_transformer__func_ptrs* func_ptrs =
-          (const wuffs_base__io_transformer__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->workbuf_len)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__utility__empty_range_ii_u64();
-}
-
-// --------
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__token_decoder__get_quirk(
-    const wuffs_base__token_decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__token_decoder__vtable_name) {
-      const wuffs_base__token_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__token_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->get_quirk)(self, a_key);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__token_decoder__decode_tokens(
-    wuffs_base__token_decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__token_decoder__vtable_name) {
-      const wuffs_base__token_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__token_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->decode_tokens)(self, a_dst, a_src, a_workbuf);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_base__token_decoder__set_quirk(
-    wuffs_base__token_decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-            ? wuffs_base__error__disabled_by_previous_error
-            : wuffs_base__error__initialize_not_called);
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__token_decoder__vtable_name) {
-      const wuffs_base__token_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__token_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->set_quirk)(self, a_key, a_value);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_base__token_decoder__workbuf_len(
-    const wuffs_base__token_decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__token_decoder__vtable_name) {
-      const wuffs_base__token_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__token_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->workbuf_len)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return wuffs_base__utility__empty_range_ii_u64();
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE__INTERFACES)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) || \
-    defined(WUFFS_CONFIG__MODULE__BASE__FLOATCONV)
-
-// ---------------- IEEE 754 Floating Point
-
-// The etc__hpd_left_shift and etc__powers_of_5 tables were printed by
-// script/print-hpd-left-shift.go. That script has an optional -comments flag,
-// whose output is not copied here, which prints further detail.
-//
-// These tables are used in
-// wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits.
-
-// wuffs_base__private_implementation__hpd_left_shift[i] encodes the number of
-// new digits created after multiplying a positive integer by (1 << i): the
-// additional length in the decimal representation. For example, shifting "234"
-// by 3 (equivalent to multiplying by 8) will produce "1872". Going from a
-// 3-length string to a 4-length string means that 1 new digit was added (and
-// existing digits may have changed).
-//
-// Shifting by i can add either N or N-1 new digits, depending on whether the
-// original positive integer compares >= or < to the i'th power of 5 (as 10
-// equals 2 * 5). Comparison is lexicographic, not numerical.
-//
-// For example, shifting by 4 (i.e. multiplying by 16) can add 1 or 2 new
-// digits, depending on a lexicographic comparison to (5 ** 4), i.e. "625":
-//  - ("1"      << 4) is "16",       which adds 1 new digit.
-//  - ("5678"   << 4) is "90848",    which adds 1 new digit.
-//  - ("624"    << 4) is "9984",     which adds 1 new digit.
-//  - ("62498"  << 4) is "999968",   which adds 1 new digit.
-//  - ("625"    << 4) is "10000",    which adds 2 new digits.
-//  - ("625001" << 4) is "10000016", which adds 2 new digits.
-//  - ("7008"   << 4) is "112128",   which adds 2 new digits.
-//  - ("99"     << 4) is "1584",     which adds 2 new digits.
-//
-// Thus, when i is 4, N is 2 and (5 ** i) is "625". This etc__hpd_left_shift
-// array encodes this as:
-//  - etc__hpd_left_shift[4] is 0x1006 = (2 << 11) | 0x0006.
-//  - etc__hpd_left_shift[5] is 0x1009 = (? << 11) | 0x0009.
-// where the ? isn't relevant for i == 4.
-//
-// The high 5 bits of etc__hpd_left_shift[i] is N, the higher of the two
-// possible number of new digits. The low 11 bits are an offset into the
-// etc__powers_of_5 array (of length 0x051C, so offsets fit in 11 bits). When i
-// is 4, its offset and the next one is 6 and 9, and etc__powers_of_5[6 .. 9]
-// is the string "\x06\x02\x05", so the relevant power of 5 is "625".
-//
-// Thanks to Ken Thompson for the original idea.
-static const uint16_t wuffs_base__private_implementation__hpd_left_shift[65] = {
-    0x0000, 0x0800, 0x0801, 0x0803, 0x1006, 0x1009, 0x100D, 0x1812, 0x1817,
-    0x181D, 0x2024, 0x202B, 0x2033, 0x203C, 0x2846, 0x2850, 0x285B, 0x3067,
-    0x3073, 0x3080, 0x388E, 0x389C, 0x38AB, 0x38BB, 0x40CC, 0x40DD, 0x40EF,
-    0x4902, 0x4915, 0x4929, 0x513E, 0x5153, 0x5169, 0x5180, 0x5998, 0x59B0,
-    0x59C9, 0x61E3, 0x61FD, 0x6218, 0x6A34, 0x6A50, 0x6A6D, 0x6A8B, 0x72AA,
-    0x72C9, 0x72E9, 0x7B0A, 0x7B2B, 0x7B4D, 0x8370, 0x8393, 0x83B7, 0x83DC,
-    0x8C02, 0x8C28, 0x8C4F, 0x9477, 0x949F, 0x94C8, 0x9CF2, 0x051C, 0x051C,
-    0x051C, 0x051C,
-};
-
-// wuffs_base__private_implementation__powers_of_5 contains the powers of 5,
-// concatenated together: "5", "25", "125", "625", "3125", etc.
-static const uint8_t wuffs_base__private_implementation__powers_of_5[0x051C] = {
-    5, 2, 5, 1, 2, 5, 6, 2, 5, 3, 1, 2, 5, 1, 5, 6, 2, 5, 7, 8, 1, 2, 5, 3, 9,
-    0, 6, 2, 5, 1, 9, 5, 3, 1, 2, 5, 9, 7, 6, 5, 6, 2, 5, 4, 8, 8, 2, 8, 1, 2,
-    5, 2, 4, 4, 1, 4, 0, 6, 2, 5, 1, 2, 2, 0, 7, 0, 3, 1, 2, 5, 6, 1, 0, 3, 5,
-    1, 5, 6, 2, 5, 3, 0, 5, 1, 7, 5, 7, 8, 1, 2, 5, 1, 5, 2, 5, 8, 7, 8, 9, 0,
-    6, 2, 5, 7, 6, 2, 9, 3, 9, 4, 5, 3, 1, 2, 5, 3, 8, 1, 4, 6, 9, 7, 2, 6, 5,
-    6, 2, 5, 1, 9, 0, 7, 3, 4, 8, 6, 3, 2, 8, 1, 2, 5, 9, 5, 3, 6, 7, 4, 3, 1,
-    6, 4, 0, 6, 2, 5, 4, 7, 6, 8, 3, 7, 1, 5, 8, 2, 0, 3, 1, 2, 5, 2, 3, 8, 4,
-    1, 8, 5, 7, 9, 1, 0, 1, 5, 6, 2, 5, 1, 1, 9, 2, 0, 9, 2, 8, 9, 5, 5, 0, 7,
-    8, 1, 2, 5, 5, 9, 6, 0, 4, 6, 4, 4, 7, 7, 5, 3, 9, 0, 6, 2, 5, 2, 9, 8, 0,
-    2, 3, 2, 2, 3, 8, 7, 6, 9, 5, 3, 1, 2, 5, 1, 4, 9, 0, 1, 1, 6, 1, 1, 9, 3,
-    8, 4, 7, 6, 5, 6, 2, 5, 7, 4, 5, 0, 5, 8, 0, 5, 9, 6, 9, 2, 3, 8, 2, 8, 1,
-    2, 5, 3, 7, 2, 5, 2, 9, 0, 2, 9, 8, 4, 6, 1, 9, 1, 4, 0, 6, 2, 5, 1, 8, 6,
-    2, 6, 4, 5, 1, 4, 9, 2, 3, 0, 9, 5, 7, 0, 3, 1, 2, 5, 9, 3, 1, 3, 2, 2, 5,
-    7, 4, 6, 1, 5, 4, 7, 8, 5, 1, 5, 6, 2, 5, 4, 6, 5, 6, 6, 1, 2, 8, 7, 3, 0,
-    7, 7, 3, 9, 2, 5, 7, 8, 1, 2, 5, 2, 3, 2, 8, 3, 0, 6, 4, 3, 6, 5, 3, 8, 6,
-    9, 6, 2, 8, 9, 0, 6, 2, 5, 1, 1, 6, 4, 1, 5, 3, 2, 1, 8, 2, 6, 9, 3, 4, 8,
-    1, 4, 4, 5, 3, 1, 2, 5, 5, 8, 2, 0, 7, 6, 6, 0, 9, 1, 3, 4, 6, 7, 4, 0, 7,
-    2, 2, 6, 5, 6, 2, 5, 2, 9, 1, 0, 3, 8, 3, 0, 4, 5, 6, 7, 3, 3, 7, 0, 3, 6,
-    1, 3, 2, 8, 1, 2, 5, 1, 4, 5, 5, 1, 9, 1, 5, 2, 2, 8, 3, 6, 6, 8, 5, 1, 8,
-    0, 6, 6, 4, 0, 6, 2, 5, 7, 2, 7, 5, 9, 5, 7, 6, 1, 4, 1, 8, 3, 4, 2, 5, 9,
-    0, 3, 3, 2, 0, 3, 1, 2, 5, 3, 6, 3, 7, 9, 7, 8, 8, 0, 7, 0, 9, 1, 7, 1, 2,
-    9, 5, 1, 6, 6, 0, 1, 5, 6, 2, 5, 1, 8, 1, 8, 9, 8, 9, 4, 0, 3, 5, 4, 5, 8,
-    5, 6, 4, 7, 5, 8, 3, 0, 0, 7, 8, 1, 2, 5, 9, 0, 9, 4, 9, 4, 7, 0, 1, 7, 7,
-    2, 9, 2, 8, 2, 3, 7, 9, 1, 5, 0, 3, 9, 0, 6, 2, 5, 4, 5, 4, 7, 4, 7, 3, 5,
-    0, 8, 8, 6, 4, 6, 4, 1, 1, 8, 9, 5, 7, 5, 1, 9, 5, 3, 1, 2, 5, 2, 2, 7, 3,
-    7, 3, 6, 7, 5, 4, 4, 3, 2, 3, 2, 0, 5, 9, 4, 7, 8, 7, 5, 9, 7, 6, 5, 6, 2,
-    5, 1, 1, 3, 6, 8, 6, 8, 3, 7, 7, 2, 1, 6, 1, 6, 0, 2, 9, 7, 3, 9, 3, 7, 9,
-    8, 8, 2, 8, 1, 2, 5, 5, 6, 8, 4, 3, 4, 1, 8, 8, 6, 0, 8, 0, 8, 0, 1, 4, 8,
-    6, 9, 6, 8, 9, 9, 4, 1, 4, 0, 6, 2, 5, 2, 8, 4, 2, 1, 7, 0, 9, 4, 3, 0, 4,
-    0, 4, 0, 0, 7, 4, 3, 4, 8, 4, 4, 9, 7, 0, 7, 0, 3, 1, 2, 5, 1, 4, 2, 1, 0,
-    8, 5, 4, 7, 1, 5, 2, 0, 2, 0, 0, 3, 7, 1, 7, 4, 2, 2, 4, 8, 5, 3, 5, 1, 5,
-    6, 2, 5, 7, 1, 0, 5, 4, 2, 7, 3, 5, 7, 6, 0, 1, 0, 0, 1, 8, 5, 8, 7, 1, 1,
-    2, 4, 2, 6, 7, 5, 7, 8, 1, 2, 5, 3, 5, 5, 2, 7, 1, 3, 6, 7, 8, 8, 0, 0, 5,
-    0, 0, 9, 2, 9, 3, 5, 5, 6, 2, 1, 3, 3, 7, 8, 9, 0, 6, 2, 5, 1, 7, 7, 6, 3,
-    5, 6, 8, 3, 9, 4, 0, 0, 2, 5, 0, 4, 6, 4, 6, 7, 7, 8, 1, 0, 6, 6, 8, 9, 4,
-    5, 3, 1, 2, 5, 8, 8, 8, 1, 7, 8, 4, 1, 9, 7, 0, 0, 1, 2, 5, 2, 3, 2, 3, 3,
-    8, 9, 0, 5, 3, 3, 4, 4, 7, 2, 6, 5, 6, 2, 5, 4, 4, 4, 0, 8, 9, 2, 0, 9, 8,
-    5, 0, 0, 6, 2, 6, 1, 6, 1, 6, 9, 4, 5, 2, 6, 6, 7, 2, 3, 6, 3, 2, 8, 1, 2,
-    5, 2, 2, 2, 0, 4, 4, 6, 0, 4, 9, 2, 5, 0, 3, 1, 3, 0, 8, 0, 8, 4, 7, 2, 6,
-    3, 3, 3, 6, 1, 8, 1, 6, 4, 0, 6, 2, 5, 1, 1, 1, 0, 2, 2, 3, 0, 2, 4, 6, 2,
-    5, 1, 5, 6, 5, 4, 0, 4, 2, 3, 6, 3, 1, 6, 6, 8, 0, 9, 0, 8, 2, 0, 3, 1, 2,
-    5, 5, 5, 5, 1, 1, 1, 5, 1, 2, 3, 1, 2, 5, 7, 8, 2, 7, 0, 2, 1, 1, 8, 1, 5,
-    8, 3, 4, 0, 4, 5, 4, 1, 0, 1, 5, 6, 2, 5, 2, 7, 7, 5, 5, 5, 7, 5, 6, 1, 5,
-    6, 2, 8, 9, 1, 3, 5, 1, 0, 5, 9, 0, 7, 9, 1, 7, 0, 2, 2, 7, 0, 5, 0, 7, 8,
-    1, 2, 5, 1, 3, 8, 7, 7, 7, 8, 7, 8, 0, 7, 8, 1, 4, 4, 5, 6, 7, 5, 5, 2, 9,
-    5, 3, 9, 5, 8, 5, 1, 1, 3, 5, 2, 5, 3, 9, 0, 6, 2, 5, 6, 9, 3, 8, 8, 9, 3,
-    9, 0, 3, 9, 0, 7, 2, 2, 8, 3, 7, 7, 6, 4, 7, 6, 9, 7, 9, 2, 5, 5, 6, 7, 6,
-    2, 6, 9, 5, 3, 1, 2, 5, 3, 4, 6, 9, 4, 4, 6, 9, 5, 1, 9, 5, 3, 6, 1, 4, 1,
-    8, 8, 8, 2, 3, 8, 4, 8, 9, 6, 2, 7, 8, 3, 8, 1, 3, 4, 7, 6, 5, 6, 2, 5, 1,
-    7, 3, 4, 7, 2, 3, 4, 7, 5, 9, 7, 6, 8, 0, 7, 0, 9, 4, 4, 1, 1, 9, 2, 4, 4,
-    8, 1, 3, 9, 1, 9, 0, 6, 7, 3, 8, 2, 8, 1, 2, 5, 8, 6, 7, 3, 6, 1, 7, 3, 7,
-    9, 8, 8, 4, 0, 3, 5, 4, 7, 2, 0, 5, 9, 6, 2, 2, 4, 0, 6, 9, 5, 9, 5, 3, 3,
-    6, 9, 1, 4, 0, 6, 2, 5,
-};
-
-// --------
-
-// wuffs_base__private_implementation__powers_of_10 contains truncated
-// approximations to the powers of 10, ranging from 1e-307 to 1e+288 inclusive,
-// as 596 pairs of uint64_t values (a 128-bit mantissa).
-//
-// There's also an implicit third column (implied by a linear formula involving
-// the base-10 exponent) that is the base-2 exponent, biased by a magic
-// constant. That constant (1214 or 0x04BE) equals 1023 + 191. 1023 is the bias
-// for IEEE 754 double-precision floating point. 191 is ((3 * 64) - 1) and
-// wuffs_base__private_implementation__parse_number_f64_eisel_lemire works with
-// multiples-of-64-bit mantissas.
-//
-// For example, the third row holds the approximation to 1e-305:
-//   0xE0B62E29_29ABA83C_331ACDAB_FE94DE87 * (2 ** (0x0049 - 0x04BE))
-//
-// Similarly, 1e+4 is approximated by:
-//   0x9C400000_00000000_00000000_00000000 * (2 ** (0x044C - 0x04BE))
-//
-// Similarly, 1e+68 is approximated by:
-//   0xED63A231_D4C4FB27_4CA7AAA8_63EE4BDD * (2 ** (0x0520 - 0x04BE))
-//
-// This table was generated by by script/print-mpb-powers-of-10.go
-static const uint64_t wuffs_base__private_implementation__powers_of_10[596][2] =
-    {
-        {0xA5D3B6D479F8E056, 0x8FD0C16206306BAB},  // 1e-307
-        {0x8F48A4899877186C, 0xB3C4F1BA87BC8696},  // 1e-306
-        {0x331ACDABFE94DE87, 0xE0B62E2929ABA83C},  // 1e-305
-        {0x9FF0C08B7F1D0B14, 0x8C71DCD9BA0B4925},  // 1e-304
-        {0x07ECF0AE5EE44DD9, 0xAF8E5410288E1B6F},  // 1e-303
-        {0xC9E82CD9F69D6150, 0xDB71E91432B1A24A},  // 1e-302
-        {0xBE311C083A225CD2, 0x892731AC9FAF056E},  // 1e-301
-        {0x6DBD630A48AAF406, 0xAB70FE17C79AC6CA},  // 1e-300
-        {0x092CBBCCDAD5B108, 0xD64D3D9DB981787D},  // 1e-299
-        {0x25BBF56008C58EA5, 0x85F0468293F0EB4E},  // 1e-298
-        {0xAF2AF2B80AF6F24E, 0xA76C582338ED2621},  // 1e-297
-        {0x1AF5AF660DB4AEE1, 0xD1476E2C07286FAA},  // 1e-296
-        {0x50D98D9FC890ED4D, 0x82CCA4DB847945CA},  // 1e-295
-        {0xE50FF107BAB528A0, 0xA37FCE126597973C},  // 1e-294
-        {0x1E53ED49A96272C8, 0xCC5FC196FEFD7D0C},  // 1e-293
-        {0x25E8E89C13BB0F7A, 0xFF77B1FCBEBCDC4F},  // 1e-292
-        {0x77B191618C54E9AC, 0x9FAACF3DF73609B1},  // 1e-291
-        {0xD59DF5B9EF6A2417, 0xC795830D75038C1D},  // 1e-290
-        {0x4B0573286B44AD1D, 0xF97AE3D0D2446F25},  // 1e-289
-        {0x4EE367F9430AEC32, 0x9BECCE62836AC577},  // 1e-288
-        {0x229C41F793CDA73F, 0xC2E801FB244576D5},  // 1e-287
-        {0x6B43527578C1110F, 0xF3A20279ED56D48A},  // 1e-286
-        {0x830A13896B78AAA9, 0x9845418C345644D6},  // 1e-285
-        {0x23CC986BC656D553, 0xBE5691EF416BD60C},  // 1e-284
-        {0x2CBFBE86B7EC8AA8, 0xEDEC366B11C6CB8F},  // 1e-283
-        {0x7BF7D71432F3D6A9, 0x94B3A202EB1C3F39},  // 1e-282
-        {0xDAF5CCD93FB0CC53, 0xB9E08A83A5E34F07},  // 1e-281
-        {0xD1B3400F8F9CFF68, 0xE858AD248F5C22C9},  // 1e-280
-        {0x23100809B9C21FA1, 0x91376C36D99995BE},  // 1e-279
-        {0xABD40A0C2832A78A, 0xB58547448FFFFB2D},  // 1e-278
-        {0x16C90C8F323F516C, 0xE2E69915B3FFF9F9},  // 1e-277
-        {0xAE3DA7D97F6792E3, 0x8DD01FAD907FFC3B},  // 1e-276
-        {0x99CD11CFDF41779C, 0xB1442798F49FFB4A},  // 1e-275
-        {0x40405643D711D583, 0xDD95317F31C7FA1D},  // 1e-274
-        {0x482835EA666B2572, 0x8A7D3EEF7F1CFC52},  // 1e-273
-        {0xDA3243650005EECF, 0xAD1C8EAB5EE43B66},  // 1e-272
-        {0x90BED43E40076A82, 0xD863B256369D4A40},  // 1e-271
-        {0x5A7744A6E804A291, 0x873E4F75E2224E68},  // 1e-270
-        {0x711515D0A205CB36, 0xA90DE3535AAAE202},  // 1e-269
-        {0x0D5A5B44CA873E03, 0xD3515C2831559A83},  // 1e-268
-        {0xE858790AFE9486C2, 0x8412D9991ED58091},  // 1e-267
-        {0x626E974DBE39A872, 0xA5178FFF668AE0B6},  // 1e-266
-        {0xFB0A3D212DC8128F, 0xCE5D73FF402D98E3},  // 1e-265
-        {0x7CE66634BC9D0B99, 0x80FA687F881C7F8E},  // 1e-264
-        {0x1C1FFFC1EBC44E80, 0xA139029F6A239F72},  // 1e-263
-        {0xA327FFB266B56220, 0xC987434744AC874E},  // 1e-262
-        {0x4BF1FF9F0062BAA8, 0xFBE9141915D7A922},  // 1e-261
-        {0x6F773FC3603DB4A9, 0x9D71AC8FADA6C9B5},  // 1e-260
-        {0xCB550FB4384D21D3, 0xC4CE17B399107C22},  // 1e-259
-        {0x7E2A53A146606A48, 0xF6019DA07F549B2B},  // 1e-258
-        {0x2EDA7444CBFC426D, 0x99C102844F94E0FB},  // 1e-257
-        {0xFA911155FEFB5308, 0xC0314325637A1939},  // 1e-256
-        {0x793555AB7EBA27CA, 0xF03D93EEBC589F88},  // 1e-255
-        {0x4BC1558B2F3458DE, 0x96267C7535B763B5},  // 1e-254
-        {0x9EB1AAEDFB016F16, 0xBBB01B9283253CA2},  // 1e-253
-        {0x465E15A979C1CADC, 0xEA9C227723EE8BCB},  // 1e-252
-        {0x0BFACD89EC191EC9, 0x92A1958A7675175F},  // 1e-251
-        {0xCEF980EC671F667B, 0xB749FAED14125D36},  // 1e-250
-        {0x82B7E12780E7401A, 0xE51C79A85916F484},  // 1e-249
-        {0xD1B2ECB8B0908810, 0x8F31CC0937AE58D2},  // 1e-248
-        {0x861FA7E6DCB4AA15, 0xB2FE3F0B8599EF07},  // 1e-247
-        {0x67A791E093E1D49A, 0xDFBDCECE67006AC9},  // 1e-246
-        {0xE0C8BB2C5C6D24E0, 0x8BD6A141006042BD},  // 1e-245
-        {0x58FAE9F773886E18, 0xAECC49914078536D},  // 1e-244
-        {0xAF39A475506A899E, 0xDA7F5BF590966848},  // 1e-243
-        {0x6D8406C952429603, 0x888F99797A5E012D},  // 1e-242
-        {0xC8E5087BA6D33B83, 0xAAB37FD7D8F58178},  // 1e-241
-        {0xFB1E4A9A90880A64, 0xD5605FCDCF32E1D6},  // 1e-240
-        {0x5CF2EEA09A55067F, 0x855C3BE0A17FCD26},  // 1e-239
-        {0xF42FAA48C0EA481E, 0xA6B34AD8C9DFC06F},  // 1e-238
-        {0xF13B94DAF124DA26, 0xD0601D8EFC57B08B},  // 1e-237
-        {0x76C53D08D6B70858, 0x823C12795DB6CE57},  // 1e-236
-        {0x54768C4B0C64CA6E, 0xA2CB1717B52481ED},  // 1e-235
-        {0xA9942F5DCF7DFD09, 0xCB7DDCDDA26DA268},  // 1e-234
-        {0xD3F93B35435D7C4C, 0xFE5D54150B090B02},  // 1e-233
-        {0xC47BC5014A1A6DAF, 0x9EFA548D26E5A6E1},  // 1e-232
-        {0x359AB6419CA1091B, 0xC6B8E9B0709F109A},  // 1e-231
-        {0xC30163D203C94B62, 0xF867241C8CC6D4C0},  // 1e-230
-        {0x79E0DE63425DCF1D, 0x9B407691D7FC44F8},  // 1e-229
-        {0x985915FC12F542E4, 0xC21094364DFB5636},  // 1e-228
-        {0x3E6F5B7B17B2939D, 0xF294B943E17A2BC4},  // 1e-227
-        {0xA705992CEECF9C42, 0x979CF3CA6CEC5B5A},  // 1e-226
-        {0x50C6FF782A838353, 0xBD8430BD08277231},  // 1e-225
-        {0xA4F8BF5635246428, 0xECE53CEC4A314EBD},  // 1e-224
-        {0x871B7795E136BE99, 0x940F4613AE5ED136},  // 1e-223
-        {0x28E2557B59846E3F, 0xB913179899F68584},  // 1e-222
-        {0x331AEADA2FE589CF, 0xE757DD7EC07426E5},  // 1e-221
-        {0x3FF0D2C85DEF7621, 0x9096EA6F3848984F},  // 1e-220
-        {0x0FED077A756B53A9, 0xB4BCA50B065ABE63},  // 1e-219
-        {0xD3E8495912C62894, 0xE1EBCE4DC7F16DFB},  // 1e-218
-        {0x64712DD7ABBBD95C, 0x8D3360F09CF6E4BD},  // 1e-217
-        {0xBD8D794D96AACFB3, 0xB080392CC4349DEC},  // 1e-216
-        {0xECF0D7A0FC5583A0, 0xDCA04777F541C567},  // 1e-215
-        {0xF41686C49DB57244, 0x89E42CAAF9491B60},  // 1e-214
-        {0x311C2875C522CED5, 0xAC5D37D5B79B6239},  // 1e-213
-        {0x7D633293366B828B, 0xD77485CB25823AC7},  // 1e-212
-        {0xAE5DFF9C02033197, 0x86A8D39EF77164BC},  // 1e-211
-        {0xD9F57F830283FDFC, 0xA8530886B54DBDEB},  // 1e-210
-        {0xD072DF63C324FD7B, 0xD267CAA862A12D66},  // 1e-209
-        {0x4247CB9E59F71E6D, 0x8380DEA93DA4BC60},  // 1e-208
-        {0x52D9BE85F074E608, 0xA46116538D0DEB78},  // 1e-207
-        {0x67902E276C921F8B, 0xCD795BE870516656},  // 1e-206
-        {0x00BA1CD8A3DB53B6, 0x806BD9714632DFF6},  // 1e-205
-        {0x80E8A40ECCD228A4, 0xA086CFCD97BF97F3},  // 1e-204
-        {0x6122CD128006B2CD, 0xC8A883C0FDAF7DF0},  // 1e-203
-        {0x796B805720085F81, 0xFAD2A4B13D1B5D6C},  // 1e-202
-        {0xCBE3303674053BB0, 0x9CC3A6EEC6311A63},  // 1e-201
-        {0xBEDBFC4411068A9C, 0xC3F490AA77BD60FC},  // 1e-200
-        {0xEE92FB5515482D44, 0xF4F1B4D515ACB93B},  // 1e-199
-        {0x751BDD152D4D1C4A, 0x991711052D8BF3C5},  // 1e-198
-        {0xD262D45A78A0635D, 0xBF5CD54678EEF0B6},  // 1e-197
-        {0x86FB897116C87C34, 0xEF340A98172AACE4},  // 1e-196
-        {0xD45D35E6AE3D4DA0, 0x9580869F0E7AAC0E},  // 1e-195
-        {0x8974836059CCA109, 0xBAE0A846D2195712},  // 1e-194
-        {0x2BD1A438703FC94B, 0xE998D258869FACD7},  // 1e-193
-        {0x7B6306A34627DDCF, 0x91FF83775423CC06},  // 1e-192
-        {0x1A3BC84C17B1D542, 0xB67F6455292CBF08},  // 1e-191
-        {0x20CABA5F1D9E4A93, 0xE41F3D6A7377EECA},  // 1e-190
-        {0x547EB47B7282EE9C, 0x8E938662882AF53E},  // 1e-189
-        {0xE99E619A4F23AA43, 0xB23867FB2A35B28D},  // 1e-188
-        {0x6405FA00E2EC94D4, 0xDEC681F9F4C31F31},  // 1e-187
-        {0xDE83BC408DD3DD04, 0x8B3C113C38F9F37E},  // 1e-186
-        {0x9624AB50B148D445, 0xAE0B158B4738705E},  // 1e-185
-        {0x3BADD624DD9B0957, 0xD98DDAEE19068C76},  // 1e-184
-        {0xE54CA5D70A80E5D6, 0x87F8A8D4CFA417C9},  // 1e-183
-        {0x5E9FCF4CCD211F4C, 0xA9F6D30A038D1DBC},  // 1e-182
-        {0x7647C3200069671F, 0xD47487CC8470652B},  // 1e-181
-        {0x29ECD9F40041E073, 0x84C8D4DFD2C63F3B},  // 1e-180
-        {0xF468107100525890, 0xA5FB0A17C777CF09},  // 1e-179
-        {0x7182148D4066EEB4, 0xCF79CC9DB955C2CC},  // 1e-178
-        {0xC6F14CD848405530, 0x81AC1FE293D599BF},  // 1e-177
-        {0xB8ADA00E5A506A7C, 0xA21727DB38CB002F},  // 1e-176
-        {0xA6D90811F0E4851C, 0xCA9CF1D206FDC03B},  // 1e-175
-        {0x908F4A166D1DA663, 0xFD442E4688BD304A},  // 1e-174
-        {0x9A598E4E043287FE, 0x9E4A9CEC15763E2E},  // 1e-173
-        {0x40EFF1E1853F29FD, 0xC5DD44271AD3CDBA},  // 1e-172
-        {0xD12BEE59E68EF47C, 0xF7549530E188C128},  // 1e-171
-        {0x82BB74F8301958CE, 0x9A94DD3E8CF578B9},  // 1e-170
-        {0xE36A52363C1FAF01, 0xC13A148E3032D6E7},  // 1e-169
-        {0xDC44E6C3CB279AC1, 0xF18899B1BC3F8CA1},  // 1e-168
-        {0x29AB103A5EF8C0B9, 0x96F5600F15A7B7E5},  // 1e-167
-        {0x7415D448F6B6F0E7, 0xBCB2B812DB11A5DE},  // 1e-166
-        {0x111B495B3464AD21, 0xEBDF661791D60F56},  // 1e-165
-        {0xCAB10DD900BEEC34, 0x936B9FCEBB25C995},  // 1e-164
-        {0x3D5D514F40EEA742, 0xB84687C269EF3BFB},  // 1e-163
-        {0x0CB4A5A3112A5112, 0xE65829B3046B0AFA},  // 1e-162
-        {0x47F0E785EABA72AB, 0x8FF71A0FE2C2E6DC},  // 1e-161
-        {0x59ED216765690F56, 0xB3F4E093DB73A093},  // 1e-160
-        {0x306869C13EC3532C, 0xE0F218B8D25088B8},  // 1e-159
-        {0x1E414218C73A13FB, 0x8C974F7383725573},  // 1e-158
-        {0xE5D1929EF90898FA, 0xAFBD2350644EEACF},  // 1e-157
-        {0xDF45F746B74ABF39, 0xDBAC6C247D62A583},  // 1e-156
-        {0x6B8BBA8C328EB783, 0x894BC396CE5DA772},  // 1e-155
-        {0x066EA92F3F326564, 0xAB9EB47C81F5114F},  // 1e-154
-        {0xC80A537B0EFEFEBD, 0xD686619BA27255A2},  // 1e-153
-        {0xBD06742CE95F5F36, 0x8613FD0145877585},  // 1e-152
-        {0x2C48113823B73704, 0xA798FC4196E952E7},  // 1e-151
-        {0xF75A15862CA504C5, 0xD17F3B51FCA3A7A0},  // 1e-150
-        {0x9A984D73DBE722FB, 0x82EF85133DE648C4},  // 1e-149
-        {0xC13E60D0D2E0EBBA, 0xA3AB66580D5FDAF5},  // 1e-148
-        {0x318DF905079926A8, 0xCC963FEE10B7D1B3},  // 1e-147
-        {0xFDF17746497F7052, 0xFFBBCFE994E5C61F},  // 1e-146
-        {0xFEB6EA8BEDEFA633, 0x9FD561F1FD0F9BD3},  // 1e-145
-        {0xFE64A52EE96B8FC0, 0xC7CABA6E7C5382C8},  // 1e-144
-        {0x3DFDCE7AA3C673B0, 0xF9BD690A1B68637B},  // 1e-143
-        {0x06BEA10CA65C084E, 0x9C1661A651213E2D},  // 1e-142
-        {0x486E494FCFF30A62, 0xC31BFA0FE5698DB8},  // 1e-141
-        {0x5A89DBA3C3EFCCFA, 0xF3E2F893DEC3F126},  // 1e-140
-        {0xF89629465A75E01C, 0x986DDB5C6B3A76B7},  // 1e-139
-        {0xF6BBB397F1135823, 0xBE89523386091465},  // 1e-138
-        {0x746AA07DED582E2C, 0xEE2BA6C0678B597F},  // 1e-137
-        {0xA8C2A44EB4571CDC, 0x94DB483840B717EF},  // 1e-136
-        {0x92F34D62616CE413, 0xBA121A4650E4DDEB},  // 1e-135
-        {0x77B020BAF9C81D17, 0xE896A0D7E51E1566},  // 1e-134
-        {0x0ACE1474DC1D122E, 0x915E2486EF32CD60},  // 1e-133
-        {0x0D819992132456BA, 0xB5B5ADA8AAFF80B8},  // 1e-132
-        {0x10E1FFF697ED6C69, 0xE3231912D5BF60E6},  // 1e-131
-        {0xCA8D3FFA1EF463C1, 0x8DF5EFABC5979C8F},  // 1e-130
-        {0xBD308FF8A6B17CB2, 0xB1736B96B6FD83B3},  // 1e-129
-        {0xAC7CB3F6D05DDBDE, 0xDDD0467C64BCE4A0},  // 1e-128
-        {0x6BCDF07A423AA96B, 0x8AA22C0DBEF60EE4},  // 1e-127
-        {0x86C16C98D2C953C6, 0xAD4AB7112EB3929D},  // 1e-126
-        {0xE871C7BF077BA8B7, 0xD89D64D57A607744},  // 1e-125
-        {0x11471CD764AD4972, 0x87625F056C7C4A8B},  // 1e-124
-        {0xD598E40D3DD89BCF, 0xA93AF6C6C79B5D2D},  // 1e-123
-        {0x4AFF1D108D4EC2C3, 0xD389B47879823479},  // 1e-122
-        {0xCEDF722A585139BA, 0x843610CB4BF160CB},  // 1e-121
-        {0xC2974EB4EE658828, 0xA54394FE1EEDB8FE},  // 1e-120
-        {0x733D226229FEEA32, 0xCE947A3DA6A9273E},  // 1e-119
-        {0x0806357D5A3F525F, 0x811CCC668829B887},  // 1e-118
-        {0xCA07C2DCB0CF26F7, 0xA163FF802A3426A8},  // 1e-117
-        {0xFC89B393DD02F0B5, 0xC9BCFF6034C13052},  // 1e-116
-        {0xBBAC2078D443ACE2, 0xFC2C3F3841F17C67},  // 1e-115
-        {0xD54B944B84AA4C0D, 0x9D9BA7832936EDC0},  // 1e-114
-        {0x0A9E795E65D4DF11, 0xC5029163F384A931},  // 1e-113
-        {0x4D4617B5FF4A16D5, 0xF64335BCF065D37D},  // 1e-112
-        {0x504BCED1BF8E4E45, 0x99EA0196163FA42E},  // 1e-111
-        {0xE45EC2862F71E1D6, 0xC06481FB9BCF8D39},  // 1e-110
-        {0x5D767327BB4E5A4C, 0xF07DA27A82C37088},  // 1e-109
-        {0x3A6A07F8D510F86F, 0x964E858C91BA2655},  // 1e-108
-        {0x890489F70A55368B, 0xBBE226EFB628AFEA},  // 1e-107
-        {0x2B45AC74CCEA842E, 0xEADAB0ABA3B2DBE5},  // 1e-106
-        {0x3B0B8BC90012929D, 0x92C8AE6B464FC96F},  // 1e-105
-        {0x09CE6EBB40173744, 0xB77ADA0617E3BBCB},  // 1e-104
-        {0xCC420A6A101D0515, 0xE55990879DDCAABD},  // 1e-103
-        {0x9FA946824A12232D, 0x8F57FA54C2A9EAB6},  // 1e-102
-        {0x47939822DC96ABF9, 0xB32DF8E9F3546564},  // 1e-101
-        {0x59787E2B93BC56F7, 0xDFF9772470297EBD},  // 1e-100
-        {0x57EB4EDB3C55B65A, 0x8BFBEA76C619EF36},  // 1e-99
-        {0xEDE622920B6B23F1, 0xAEFAE51477A06B03},  // 1e-98
-        {0xE95FAB368E45ECED, 0xDAB99E59958885C4},  // 1e-97
-        {0x11DBCB0218EBB414, 0x88B402F7FD75539B},  // 1e-96
-        {0xD652BDC29F26A119, 0xAAE103B5FCD2A881},  // 1e-95
-        {0x4BE76D3346F0495F, 0xD59944A37C0752A2},  // 1e-94
-        {0x6F70A4400C562DDB, 0x857FCAE62D8493A5},  // 1e-93
-        {0xCB4CCD500F6BB952, 0xA6DFBD9FB8E5B88E},  // 1e-92
-        {0x7E2000A41346A7A7, 0xD097AD07A71F26B2},  // 1e-91
-        {0x8ED400668C0C28C8, 0x825ECC24C873782F},  // 1e-90
-        {0x728900802F0F32FA, 0xA2F67F2DFA90563B},  // 1e-89
-        {0x4F2B40A03AD2FFB9, 0xCBB41EF979346BCA},  // 1e-88
-        {0xE2F610C84987BFA8, 0xFEA126B7D78186BC},  // 1e-87
-        {0x0DD9CA7D2DF4D7C9, 0x9F24B832E6B0F436},  // 1e-86
-        {0x91503D1C79720DBB, 0xC6EDE63FA05D3143},  // 1e-85
-        {0x75A44C6397CE912A, 0xF8A95FCF88747D94},  // 1e-84
-        {0xC986AFBE3EE11ABA, 0x9B69DBE1B548CE7C},  // 1e-83
-        {0xFBE85BADCE996168, 0xC24452DA229B021B},  // 1e-82
-        {0xFAE27299423FB9C3, 0xF2D56790AB41C2A2},  // 1e-81
-        {0xDCCD879FC967D41A, 0x97C560BA6B0919A5},  // 1e-80
-        {0x5400E987BBC1C920, 0xBDB6B8E905CB600F},  // 1e-79
-        {0x290123E9AAB23B68, 0xED246723473E3813},  // 1e-78
-        {0xF9A0B6720AAF6521, 0x9436C0760C86E30B},  // 1e-77
-        {0xF808E40E8D5B3E69, 0xB94470938FA89BCE},  // 1e-76
-        {0xB60B1D1230B20E04, 0xE7958CB87392C2C2},  // 1e-75
-        {0xB1C6F22B5E6F48C2, 0x90BD77F3483BB9B9},  // 1e-74
-        {0x1E38AEB6360B1AF3, 0xB4ECD5F01A4AA828},  // 1e-73
-        {0x25C6DA63C38DE1B0, 0xE2280B6C20DD5232},  // 1e-72
-        {0x579C487E5A38AD0E, 0x8D590723948A535F},  // 1e-71
-        {0x2D835A9DF0C6D851, 0xB0AF48EC79ACE837},  // 1e-70
-        {0xF8E431456CF88E65, 0xDCDB1B2798182244},  // 1e-69
-        {0x1B8E9ECB641B58FF, 0x8A08F0F8BF0F156B},  // 1e-68
-        {0xE272467E3D222F3F, 0xAC8B2D36EED2DAC5},  // 1e-67
-        {0x5B0ED81DCC6ABB0F, 0xD7ADF884AA879177},  // 1e-66
-        {0x98E947129FC2B4E9, 0x86CCBB52EA94BAEA},  // 1e-65
-        {0x3F2398D747B36224, 0xA87FEA27A539E9A5},  // 1e-64
-        {0x8EEC7F0D19A03AAD, 0xD29FE4B18E88640E},  // 1e-63
-        {0x1953CF68300424AC, 0x83A3EEEEF9153E89},  // 1e-62
-        {0x5FA8C3423C052DD7, 0xA48CEAAAB75A8E2B},  // 1e-61
-        {0x3792F412CB06794D, 0xCDB02555653131B6},  // 1e-60
-        {0xE2BBD88BBEE40BD0, 0x808E17555F3EBF11},  // 1e-59
-        {0x5B6ACEAEAE9D0EC4, 0xA0B19D2AB70E6ED6},  // 1e-58
-        {0xF245825A5A445275, 0xC8DE047564D20A8B},  // 1e-57
-        {0xEED6E2F0F0D56712, 0xFB158592BE068D2E},  // 1e-56
-        {0x55464DD69685606B, 0x9CED737BB6C4183D},  // 1e-55
-        {0xAA97E14C3C26B886, 0xC428D05AA4751E4C},  // 1e-54
-        {0xD53DD99F4B3066A8, 0xF53304714D9265DF},  // 1e-53
-        {0xE546A8038EFE4029, 0x993FE2C6D07B7FAB},  // 1e-52
-        {0xDE98520472BDD033, 0xBF8FDB78849A5F96},  // 1e-51
-        {0x963E66858F6D4440, 0xEF73D256A5C0F77C},  // 1e-50
-        {0xDDE7001379A44AA8, 0x95A8637627989AAD},  // 1e-49
-        {0x5560C018580D5D52, 0xBB127C53B17EC159},  // 1e-48
-        {0xAAB8F01E6E10B4A6, 0xE9D71B689DDE71AF},  // 1e-47
-        {0xCAB3961304CA70E8, 0x9226712162AB070D},  // 1e-46
-        {0x3D607B97C5FD0D22, 0xB6B00D69BB55C8D1},  // 1e-45
-        {0x8CB89A7DB77C506A, 0xE45C10C42A2B3B05},  // 1e-44
-        {0x77F3608E92ADB242, 0x8EB98A7A9A5B04E3},  // 1e-43
-        {0x55F038B237591ED3, 0xB267ED1940F1C61C},  // 1e-42
-        {0x6B6C46DEC52F6688, 0xDF01E85F912E37A3},  // 1e-41
-        {0x2323AC4B3B3DA015, 0x8B61313BBABCE2C6},  // 1e-40
-        {0xABEC975E0A0D081A, 0xAE397D8AA96C1B77},  // 1e-39
-        {0x96E7BD358C904A21, 0xD9C7DCED53C72255},  // 1e-38
-        {0x7E50D64177DA2E54, 0x881CEA14545C7575},  // 1e-37
-        {0xDDE50BD1D5D0B9E9, 0xAA242499697392D2},  // 1e-36
-        {0x955E4EC64B44E864, 0xD4AD2DBFC3D07787},  // 1e-35
-        {0xBD5AF13BEF0B113E, 0x84EC3C97DA624AB4},  // 1e-34
-        {0xECB1AD8AEACDD58E, 0xA6274BBDD0FADD61},  // 1e-33
-        {0x67DE18EDA5814AF2, 0xCFB11EAD453994BA},  // 1e-32
-        {0x80EACF948770CED7, 0x81CEB32C4B43FCF4},  // 1e-31
-        {0xA1258379A94D028D, 0xA2425FF75E14FC31},  // 1e-30
-        {0x096EE45813A04330, 0xCAD2F7F5359A3B3E},  // 1e-29
-        {0x8BCA9D6E188853FC, 0xFD87B5F28300CA0D},  // 1e-28
-        {0x775EA264CF55347D, 0x9E74D1B791E07E48},  // 1e-27
-        {0x95364AFE032A819D, 0xC612062576589DDA},  // 1e-26
-        {0x3A83DDBD83F52204, 0xF79687AED3EEC551},  // 1e-25
-        {0xC4926A9672793542, 0x9ABE14CD44753B52},  // 1e-24
-        {0x75B7053C0F178293, 0xC16D9A0095928A27},  // 1e-23
-        {0x5324C68B12DD6338, 0xF1C90080BAF72CB1},  // 1e-22
-        {0xD3F6FC16EBCA5E03, 0x971DA05074DA7BEE},  // 1e-21
-        {0x88F4BB1CA6BCF584, 0xBCE5086492111AEA},  // 1e-20
-        {0x2B31E9E3D06C32E5, 0xEC1E4A7DB69561A5},  // 1e-19
-        {0x3AFF322E62439FCF, 0x9392EE8E921D5D07},  // 1e-18
-        {0x09BEFEB9FAD487C2, 0xB877AA3236A4B449},  // 1e-17
-        {0x4C2EBE687989A9B3, 0xE69594BEC44DE15B},  // 1e-16
-        {0x0F9D37014BF60A10, 0x901D7CF73AB0ACD9},  // 1e-15
-        {0x538484C19EF38C94, 0xB424DC35095CD80F},  // 1e-14
-        {0x2865A5F206B06FB9, 0xE12E13424BB40E13},  // 1e-13
-        {0xF93F87B7442E45D3, 0x8CBCCC096F5088CB},  // 1e-12
-        {0xF78F69A51539D748, 0xAFEBFF0BCB24AAFE},  // 1e-11
-        {0xB573440E5A884D1B, 0xDBE6FECEBDEDD5BE},  // 1e-10
-        {0x31680A88F8953030, 0x89705F4136B4A597},  // 1e-9
-        {0xFDC20D2B36BA7C3D, 0xABCC77118461CEFC},  // 1e-8
-        {0x3D32907604691B4C, 0xD6BF94D5E57A42BC},  // 1e-7
-        {0xA63F9A49C2C1B10F, 0x8637BD05AF6C69B5},  // 1e-6
-        {0x0FCF80DC33721D53, 0xA7C5AC471B478423},  // 1e-5
-        {0xD3C36113404EA4A8, 0xD1B71758E219652B},  // 1e-4
-        {0x645A1CAC083126E9, 0x83126E978D4FDF3B},  // 1e-3
-        {0x3D70A3D70A3D70A3, 0xA3D70A3D70A3D70A},  // 1e-2
-        {0xCCCCCCCCCCCCCCCC, 0xCCCCCCCCCCCCCCCC},  // 1e-1
-        {0x0000000000000000, 0x8000000000000000},  // 1e0
-        {0x0000000000000000, 0xA000000000000000},  // 1e1
-        {0x0000000000000000, 0xC800000000000000},  // 1e2
-        {0x0000000000000000, 0xFA00000000000000},  // 1e3
-        {0x0000000000000000, 0x9C40000000000000},  // 1e4
-        {0x0000000000000000, 0xC350000000000000},  // 1e5
-        {0x0000000000000000, 0xF424000000000000},  // 1e6
-        {0x0000000000000000, 0x9896800000000000},  // 1e7
-        {0x0000000000000000, 0xBEBC200000000000},  // 1e8
-        {0x0000000000000000, 0xEE6B280000000000},  // 1e9
-        {0x0000000000000000, 0x9502F90000000000},  // 1e10
-        {0x0000000000000000, 0xBA43B74000000000},  // 1e11
-        {0x0000000000000000, 0xE8D4A51000000000},  // 1e12
-        {0x0000000000000000, 0x9184E72A00000000},  // 1e13
-        {0x0000000000000000, 0xB5E620F480000000},  // 1e14
-        {0x0000000000000000, 0xE35FA931A0000000},  // 1e15
-        {0x0000000000000000, 0x8E1BC9BF04000000},  // 1e16
-        {0x0000000000000000, 0xB1A2BC2EC5000000},  // 1e17
-        {0x0000000000000000, 0xDE0B6B3A76400000},  // 1e18
-        {0x0000000000000000, 0x8AC7230489E80000},  // 1e19
-        {0x0000000000000000, 0xAD78EBC5AC620000},  // 1e20
-        {0x0000000000000000, 0xD8D726B7177A8000},  // 1e21
-        {0x0000000000000000, 0x878678326EAC9000},  // 1e22
-        {0x0000000000000000, 0xA968163F0A57B400},  // 1e23
-        {0x0000000000000000, 0xD3C21BCECCEDA100},  // 1e24
-        {0x0000000000000000, 0x84595161401484A0},  // 1e25
-        {0x0000000000000000, 0xA56FA5B99019A5C8},  // 1e26
-        {0x0000000000000000, 0xCECB8F27F4200F3A},  // 1e27
-        {0x4000000000000000, 0x813F3978F8940984},  // 1e28
-        {0x5000000000000000, 0xA18F07D736B90BE5},  // 1e29
-        {0xA400000000000000, 0xC9F2C9CD04674EDE},  // 1e30
-        {0x4D00000000000000, 0xFC6F7C4045812296},  // 1e31
-        {0xF020000000000000, 0x9DC5ADA82B70B59D},  // 1e32
-        {0x6C28000000000000, 0xC5371912364CE305},  // 1e33
-        {0xC732000000000000, 0xF684DF56C3E01BC6},  // 1e34
-        {0x3C7F400000000000, 0x9A130B963A6C115C},  // 1e35
-        {0x4B9F100000000000, 0xC097CE7BC90715B3},  // 1e36
-        {0x1E86D40000000000, 0xF0BDC21ABB48DB20},  // 1e37
-        {0x1314448000000000, 0x96769950B50D88F4},  // 1e38
-        {0x17D955A000000000, 0xBC143FA4E250EB31},  // 1e39
-        {0x5DCFAB0800000000, 0xEB194F8E1AE525FD},  // 1e40
-        {0x5AA1CAE500000000, 0x92EFD1B8D0CF37BE},  // 1e41
-        {0xF14A3D9E40000000, 0xB7ABC627050305AD},  // 1e42
-        {0x6D9CCD05D0000000, 0xE596B7B0C643C719},  // 1e43
-        {0xE4820023A2000000, 0x8F7E32CE7BEA5C6F},  // 1e44
-        {0xDDA2802C8A800000, 0xB35DBF821AE4F38B},  // 1e45
-        {0xD50B2037AD200000, 0xE0352F62A19E306E},  // 1e46
-        {0x4526F422CC340000, 0x8C213D9DA502DE45},  // 1e47
-        {0x9670B12B7F410000, 0xAF298D050E4395D6},  // 1e48
-        {0x3C0CDD765F114000, 0xDAF3F04651D47B4C},  // 1e49
-        {0xA5880A69FB6AC800, 0x88D8762BF324CD0F},  // 1e50
-        {0x8EEA0D047A457A00, 0xAB0E93B6EFEE0053},  // 1e51
-        {0x72A4904598D6D880, 0xD5D238A4ABE98068},  // 1e52
-        {0x47A6DA2B7F864750, 0x85A36366EB71F041},  // 1e53
-        {0x999090B65F67D924, 0xA70C3C40A64E6C51},  // 1e54
-        {0xFFF4B4E3F741CF6D, 0xD0CF4B50CFE20765},  // 1e55
-        {0xBFF8F10E7A8921A4, 0x82818F1281ED449F},  // 1e56
-        {0xAFF72D52192B6A0D, 0xA321F2D7226895C7},  // 1e57
-        {0x9BF4F8A69F764490, 0xCBEA6F8CEB02BB39},  // 1e58
-        {0x02F236D04753D5B4, 0xFEE50B7025C36A08},  // 1e59
-        {0x01D762422C946590, 0x9F4F2726179A2245},  // 1e60
-        {0x424D3AD2B7B97EF5, 0xC722F0EF9D80AAD6},  // 1e61
-        {0xD2E0898765A7DEB2, 0xF8EBAD2B84E0D58B},  // 1e62
-        {0x63CC55F49F88EB2F, 0x9B934C3B330C8577},  // 1e63
-        {0x3CBF6B71C76B25FB, 0xC2781F49FFCFA6D5},  // 1e64
-        {0x8BEF464E3945EF7A, 0xF316271C7FC3908A},  // 1e65
-        {0x97758BF0E3CBB5AC, 0x97EDD871CFDA3A56},  // 1e66
-        {0x3D52EEED1CBEA317, 0xBDE94E8E43D0C8EC},  // 1e67
-        {0x4CA7AAA863EE4BDD, 0xED63A231D4C4FB27},  // 1e68
-        {0x8FE8CAA93E74EF6A, 0x945E455F24FB1CF8},  // 1e69
-        {0xB3E2FD538E122B44, 0xB975D6B6EE39E436},  // 1e70
-        {0x60DBBCA87196B616, 0xE7D34C64A9C85D44},  // 1e71
-        {0xBC8955E946FE31CD, 0x90E40FBEEA1D3A4A},  // 1e72
-        {0x6BABAB6398BDBE41, 0xB51D13AEA4A488DD},  // 1e73
-        {0xC696963C7EED2DD1, 0xE264589A4DCDAB14},  // 1e74
-        {0xFC1E1DE5CF543CA2, 0x8D7EB76070A08AEC},  // 1e75
-        {0x3B25A55F43294BCB, 0xB0DE65388CC8ADA8},  // 1e76
-        {0x49EF0EB713F39EBE, 0xDD15FE86AFFAD912},  // 1e77
-        {0x6E3569326C784337, 0x8A2DBF142DFCC7AB},  // 1e78
-        {0x49C2C37F07965404, 0xACB92ED9397BF996},  // 1e79
-        {0xDC33745EC97BE906, 0xD7E77A8F87DAF7FB},  // 1e80
-        {0x69A028BB3DED71A3, 0x86F0AC99B4E8DAFD},  // 1e81
-        {0xC40832EA0D68CE0C, 0xA8ACD7C0222311BC},  // 1e82
-        {0xF50A3FA490C30190, 0xD2D80DB02AABD62B},  // 1e83
-        {0x792667C6DA79E0FA, 0x83C7088E1AAB65DB},  // 1e84
-        {0x577001B891185938, 0xA4B8CAB1A1563F52},  // 1e85
-        {0xED4C0226B55E6F86, 0xCDE6FD5E09ABCF26},  // 1e86
-        {0x544F8158315B05B4, 0x80B05E5AC60B6178},  // 1e87
-        {0x696361AE3DB1C721, 0xA0DC75F1778E39D6},  // 1e88
-        {0x03BC3A19CD1E38E9, 0xC913936DD571C84C},  // 1e89
-        {0x04AB48A04065C723, 0xFB5878494ACE3A5F},  // 1e90
-        {0x62EB0D64283F9C76, 0x9D174B2DCEC0E47B},  // 1e91
-        {0x3BA5D0BD324F8394, 0xC45D1DF942711D9A},  // 1e92
-        {0xCA8F44EC7EE36479, 0xF5746577930D6500},  // 1e93
-        {0x7E998B13CF4E1ECB, 0x9968BF6ABBE85F20},  // 1e94
-        {0x9E3FEDD8C321A67E, 0xBFC2EF456AE276E8},  // 1e95
-        {0xC5CFE94EF3EA101E, 0xEFB3AB16C59B14A2},  // 1e96
-        {0xBBA1F1D158724A12, 0x95D04AEE3B80ECE5},  // 1e97
-        {0x2A8A6E45AE8EDC97, 0xBB445DA9CA61281F},  // 1e98
-        {0xF52D09D71A3293BD, 0xEA1575143CF97226},  // 1e99
-        {0x593C2626705F9C56, 0x924D692CA61BE758},  // 1e100
-        {0x6F8B2FB00C77836C, 0xB6E0C377CFA2E12E},  // 1e101
-        {0x0B6DFB9C0F956447, 0xE498F455C38B997A},  // 1e102
-        {0x4724BD4189BD5EAC, 0x8EDF98B59A373FEC},  // 1e103
-        {0x58EDEC91EC2CB657, 0xB2977EE300C50FE7},  // 1e104
-        {0x2F2967B66737E3ED, 0xDF3D5E9BC0F653E1},  // 1e105
-        {0xBD79E0D20082EE74, 0x8B865B215899F46C},  // 1e106
-        {0xECD8590680A3AA11, 0xAE67F1E9AEC07187},  // 1e107
-        {0xE80E6F4820CC9495, 0xDA01EE641A708DE9},  // 1e108
-        {0x3109058D147FDCDD, 0x884134FE908658B2},  // 1e109
-        {0xBD4B46F0599FD415, 0xAA51823E34A7EEDE},  // 1e110
-        {0x6C9E18AC7007C91A, 0xD4E5E2CDC1D1EA96},  // 1e111
-        {0x03E2CF6BC604DDB0, 0x850FADC09923329E},  // 1e112
-        {0x84DB8346B786151C, 0xA6539930BF6BFF45},  // 1e113
-        {0xE612641865679A63, 0xCFE87F7CEF46FF16},  // 1e114
-        {0x4FCB7E8F3F60C07E, 0x81F14FAE158C5F6E},  // 1e115
-        {0xE3BE5E330F38F09D, 0xA26DA3999AEF7749},  // 1e116
-        {0x5CADF5BFD3072CC5, 0xCB090C8001AB551C},  // 1e117
-        {0x73D9732FC7C8F7F6, 0xFDCB4FA002162A63},  // 1e118
-        {0x2867E7FDDCDD9AFA, 0x9E9F11C4014DDA7E},  // 1e119
-        {0xB281E1FD541501B8, 0xC646D63501A1511D},  // 1e120
-        {0x1F225A7CA91A4226, 0xF7D88BC24209A565},  // 1e121
-        {0x3375788DE9B06958, 0x9AE757596946075F},  // 1e122
-        {0x0052D6B1641C83AE, 0xC1A12D2FC3978937},  // 1e123
-        {0xC0678C5DBD23A49A, 0xF209787BB47D6B84},  // 1e124
-        {0xF840B7BA963646E0, 0x9745EB4D50CE6332},  // 1e125
-        {0xB650E5A93BC3D898, 0xBD176620A501FBFF},  // 1e126
-        {0xA3E51F138AB4CEBE, 0xEC5D3FA8CE427AFF},  // 1e127
-        {0xC66F336C36B10137, 0x93BA47C980E98CDF},  // 1e128
-        {0xB80B0047445D4184, 0xB8A8D9BBE123F017},  // 1e129
-        {0xA60DC059157491E5, 0xE6D3102AD96CEC1D},  // 1e130
-        {0x87C89837AD68DB2F, 0x9043EA1AC7E41392},  // 1e131
-        {0x29BABE4598C311FB, 0xB454E4A179DD1877},  // 1e132
-        {0xF4296DD6FEF3D67A, 0xE16A1DC9D8545E94},  // 1e133
-        {0x1899E4A65F58660C, 0x8CE2529E2734BB1D},  // 1e134
-        {0x5EC05DCFF72E7F8F, 0xB01AE745B101E9E4},  // 1e135
-        {0x76707543F4FA1F73, 0xDC21A1171D42645D},  // 1e136
-        {0x6A06494A791C53A8, 0x899504AE72497EBA},  // 1e137
-        {0x0487DB9D17636892, 0xABFA45DA0EDBDE69},  // 1e138
-        {0x45A9D2845D3C42B6, 0xD6F8D7509292D603},  // 1e139
-        {0x0B8A2392BA45A9B2, 0x865B86925B9BC5C2},  // 1e140
-        {0x8E6CAC7768D7141E, 0xA7F26836F282B732},  // 1e141
-        {0x3207D795430CD926, 0xD1EF0244AF2364FF},  // 1e142
-        {0x7F44E6BD49E807B8, 0x8335616AED761F1F},  // 1e143
-        {0x5F16206C9C6209A6, 0xA402B9C5A8D3A6E7},  // 1e144
-        {0x36DBA887C37A8C0F, 0xCD036837130890A1},  // 1e145
-        {0xC2494954DA2C9789, 0x802221226BE55A64},  // 1e146
-        {0xF2DB9BAA10B7BD6C, 0xA02AA96B06DEB0FD},  // 1e147
-        {0x6F92829494E5ACC7, 0xC83553C5C8965D3D},  // 1e148
-        {0xCB772339BA1F17F9, 0xFA42A8B73ABBF48C},  // 1e149
-        {0xFF2A760414536EFB, 0x9C69A97284B578D7},  // 1e150
-        {0xFEF5138519684ABA, 0xC38413CF25E2D70D},  // 1e151
-        {0x7EB258665FC25D69, 0xF46518C2EF5B8CD1},  // 1e152
-        {0xEF2F773FFBD97A61, 0x98BF2F79D5993802},  // 1e153
-        {0xAAFB550FFACFD8FA, 0xBEEEFB584AFF8603},  // 1e154
-        {0x95BA2A53F983CF38, 0xEEAABA2E5DBF6784},  // 1e155
-        {0xDD945A747BF26183, 0x952AB45CFA97A0B2},  // 1e156
-        {0x94F971119AEEF9E4, 0xBA756174393D88DF},  // 1e157
-        {0x7A37CD5601AAB85D, 0xE912B9D1478CEB17},  // 1e158
-        {0xAC62E055C10AB33A, 0x91ABB422CCB812EE},  // 1e159
-        {0x577B986B314D6009, 0xB616A12B7FE617AA},  // 1e160
-        {0xED5A7E85FDA0B80B, 0xE39C49765FDF9D94},  // 1e161
-        {0x14588F13BE847307, 0x8E41ADE9FBEBC27D},  // 1e162
-        {0x596EB2D8AE258FC8, 0xB1D219647AE6B31C},  // 1e163
-        {0x6FCA5F8ED9AEF3BB, 0xDE469FBD99A05FE3},  // 1e164
-        {0x25DE7BB9480D5854, 0x8AEC23D680043BEE},  // 1e165
-        {0xAF561AA79A10AE6A, 0xADA72CCC20054AE9},  // 1e166
-        {0x1B2BA1518094DA04, 0xD910F7FF28069DA4},  // 1e167
-        {0x90FB44D2F05D0842, 0x87AA9AFF79042286},  // 1e168
-        {0x353A1607AC744A53, 0xA99541BF57452B28},  // 1e169
-        {0x42889B8997915CE8, 0xD3FA922F2D1675F2},  // 1e170
-        {0x69956135FEBADA11, 0x847C9B5D7C2E09B7},  // 1e171
-        {0x43FAB9837E699095, 0xA59BC234DB398C25},  // 1e172
-        {0x94F967E45E03F4BB, 0xCF02B2C21207EF2E},  // 1e173
-        {0x1D1BE0EEBAC278F5, 0x8161AFB94B44F57D},  // 1e174
-        {0x6462D92A69731732, 0xA1BA1BA79E1632DC},  // 1e175
-        {0x7D7B8F7503CFDCFE, 0xCA28A291859BBF93},  // 1e176
-        {0x5CDA735244C3D43E, 0xFCB2CB35E702AF78},  // 1e177
-        {0x3A0888136AFA64A7, 0x9DEFBF01B061ADAB},  // 1e178
-        {0x088AAA1845B8FDD0, 0xC56BAEC21C7A1916},  // 1e179
-        {0x8AAD549E57273D45, 0xF6C69A72A3989F5B},  // 1e180
-        {0x36AC54E2F678864B, 0x9A3C2087A63F6399},  // 1e181
-        {0x84576A1BB416A7DD, 0xC0CB28A98FCF3C7F},  // 1e182
-        {0x656D44A2A11C51D5, 0xF0FDF2D3F3C30B9F},  // 1e183
-        {0x9F644AE5A4B1B325, 0x969EB7C47859E743},  // 1e184
-        {0x873D5D9F0DDE1FEE, 0xBC4665B596706114},  // 1e185
-        {0xA90CB506D155A7EA, 0xEB57FF22FC0C7959},  // 1e186
-        {0x09A7F12442D588F2, 0x9316FF75DD87CBD8},  // 1e187
-        {0x0C11ED6D538AEB2F, 0xB7DCBF5354E9BECE},  // 1e188
-        {0x8F1668C8A86DA5FA, 0xE5D3EF282A242E81},  // 1e189
-        {0xF96E017D694487BC, 0x8FA475791A569D10},  // 1e190
-        {0x37C981DCC395A9AC, 0xB38D92D760EC4455},  // 1e191
-        {0x85BBE253F47B1417, 0xE070F78D3927556A},  // 1e192
-        {0x93956D7478CCEC8E, 0x8C469AB843B89562},  // 1e193
-        {0x387AC8D1970027B2, 0xAF58416654A6BABB},  // 1e194
-        {0x06997B05FCC0319E, 0xDB2E51BFE9D0696A},  // 1e195
-        {0x441FECE3BDF81F03, 0x88FCF317F22241E2},  // 1e196
-        {0xD527E81CAD7626C3, 0xAB3C2FDDEEAAD25A},  // 1e197
-        {0x8A71E223D8D3B074, 0xD60B3BD56A5586F1},  // 1e198
-        {0xF6872D5667844E49, 0x85C7056562757456},  // 1e199
-        {0xB428F8AC016561DB, 0xA738C6BEBB12D16C},  // 1e200
-        {0xE13336D701BEBA52, 0xD106F86E69D785C7},  // 1e201
-        {0xECC0024661173473, 0x82A45B450226B39C},  // 1e202
-        {0x27F002D7F95D0190, 0xA34D721642B06084},  // 1e203
-        {0x31EC038DF7B441F4, 0xCC20CE9BD35C78A5},  // 1e204
-        {0x7E67047175A15271, 0xFF290242C83396CE},  // 1e205
-        {0x0F0062C6E984D386, 0x9F79A169BD203E41},  // 1e206
-        {0x52C07B78A3E60868, 0xC75809C42C684DD1},  // 1e207
-        {0xA7709A56CCDF8A82, 0xF92E0C3537826145},  // 1e208
-        {0x88A66076400BB691, 0x9BBCC7A142B17CCB},  // 1e209
-        {0x6ACFF893D00EA435, 0xC2ABF989935DDBFE},  // 1e210
-        {0x0583F6B8C4124D43, 0xF356F7EBF83552FE},  // 1e211
-        {0xC3727A337A8B704A, 0x98165AF37B2153DE},  // 1e212
-        {0x744F18C0592E4C5C, 0xBE1BF1B059E9A8D6},  // 1e213
-        {0x1162DEF06F79DF73, 0xEDA2EE1C7064130C},  // 1e214
-        {0x8ADDCB5645AC2BA8, 0x9485D4D1C63E8BE7},  // 1e215
-        {0x6D953E2BD7173692, 0xB9A74A0637CE2EE1},  // 1e216
-        {0xC8FA8DB6CCDD0437, 0xE8111C87C5C1BA99},  // 1e217
-        {0x1D9C9892400A22A2, 0x910AB1D4DB9914A0},  // 1e218
-        {0x2503BEB6D00CAB4B, 0xB54D5E4A127F59C8},  // 1e219
-        {0x2E44AE64840FD61D, 0xE2A0B5DC971F303A},  // 1e220
-        {0x5CEAECFED289E5D2, 0x8DA471A9DE737E24},  // 1e221
-        {0x7425A83E872C5F47, 0xB10D8E1456105DAD},  // 1e222
-        {0xD12F124E28F77719, 0xDD50F1996B947518},  // 1e223
-        {0x82BD6B70D99AAA6F, 0x8A5296FFE33CC92F},  // 1e224
-        {0x636CC64D1001550B, 0xACE73CBFDC0BFB7B},  // 1e225
-        {0x3C47F7E05401AA4E, 0xD8210BEFD30EFA5A},  // 1e226
-        {0x65ACFAEC34810A71, 0x8714A775E3E95C78},  // 1e227
-        {0x7F1839A741A14D0D, 0xA8D9D1535CE3B396},  // 1e228
-        {0x1EDE48111209A050, 0xD31045A8341CA07C},  // 1e229
-        {0x934AED0AAB460432, 0x83EA2B892091E44D},  // 1e230
-        {0xF81DA84D5617853F, 0xA4E4B66B68B65D60},  // 1e231
-        {0x36251260AB9D668E, 0xCE1DE40642E3F4B9},  // 1e232
-        {0xC1D72B7C6B426019, 0x80D2AE83E9CE78F3},  // 1e233
-        {0xB24CF65B8612F81F, 0xA1075A24E4421730},  // 1e234
-        {0xDEE033F26797B627, 0xC94930AE1D529CFC},  // 1e235
-        {0x169840EF017DA3B1, 0xFB9B7CD9A4A7443C},  // 1e236
-        {0x8E1F289560EE864E, 0x9D412E0806E88AA5},  // 1e237
-        {0xF1A6F2BAB92A27E2, 0xC491798A08A2AD4E},  // 1e238
-        {0xAE10AF696774B1DB, 0xF5B5D7EC8ACB58A2},  // 1e239
-        {0xACCA6DA1E0A8EF29, 0x9991A6F3D6BF1765},  // 1e240
-        {0x17FD090A58D32AF3, 0xBFF610B0CC6EDD3F},  // 1e241
-        {0xDDFC4B4CEF07F5B0, 0xEFF394DCFF8A948E},  // 1e242
-        {0x4ABDAF101564F98E, 0x95F83D0A1FB69CD9},  // 1e243
-        {0x9D6D1AD41ABE37F1, 0xBB764C4CA7A4440F},  // 1e244
-        {0x84C86189216DC5ED, 0xEA53DF5FD18D5513},  // 1e245
-        {0x32FD3CF5B4E49BB4, 0x92746B9BE2F8552C},  // 1e246
-        {0x3FBC8C33221DC2A1, 0xB7118682DBB66A77},  // 1e247
-        {0x0FABAF3FEAA5334A, 0xE4D5E82392A40515},  // 1e248
-        {0x29CB4D87F2A7400E, 0x8F05B1163BA6832D},  // 1e249
-        {0x743E20E9EF511012, 0xB2C71D5BCA9023F8},  // 1e250
-        {0x914DA9246B255416, 0xDF78E4B2BD342CF6},  // 1e251
-        {0x1AD089B6C2F7548E, 0x8BAB8EEFB6409C1A},  // 1e252
-        {0xA184AC2473B529B1, 0xAE9672ABA3D0C320},  // 1e253
-        {0xC9E5D72D90A2741E, 0xDA3C0F568CC4F3E8},  // 1e254
-        {0x7E2FA67C7A658892, 0x8865899617FB1871},  // 1e255
-        {0xDDBB901B98FEEAB7, 0xAA7EEBFB9DF9DE8D},  // 1e256
-        {0x552A74227F3EA565, 0xD51EA6FA85785631},  // 1e257
-        {0xD53A88958F87275F, 0x8533285C936B35DE},  // 1e258
-        {0x8A892ABAF368F137, 0xA67FF273B8460356},  // 1e259
-        {0x2D2B7569B0432D85, 0xD01FEF10A657842C},  // 1e260
-        {0x9C3B29620E29FC73, 0x8213F56A67F6B29B},  // 1e261
-        {0x8349F3BA91B47B8F, 0xA298F2C501F45F42},  // 1e262
-        {0x241C70A936219A73, 0xCB3F2F7642717713},  // 1e263
-        {0xED238CD383AA0110, 0xFE0EFB53D30DD4D7},  // 1e264
-        {0xF4363804324A40AA, 0x9EC95D1463E8A506},  // 1e265
-        {0xB143C6053EDCD0D5, 0xC67BB4597CE2CE48},  // 1e266
-        {0xDD94B7868E94050A, 0xF81AA16FDC1B81DA},  // 1e267
-        {0xCA7CF2B4191C8326, 0x9B10A4E5E9913128},  // 1e268
-        {0xFD1C2F611F63A3F0, 0xC1D4CE1F63F57D72},  // 1e269
-        {0xBC633B39673C8CEC, 0xF24A01A73CF2DCCF},  // 1e270
-        {0xD5BE0503E085D813, 0x976E41088617CA01},  // 1e271
-        {0x4B2D8644D8A74E18, 0xBD49D14AA79DBC82},  // 1e272
-        {0xDDF8E7D60ED1219E, 0xEC9C459D51852BA2},  // 1e273
-        {0xCABB90E5C942B503, 0x93E1AB8252F33B45},  // 1e274
-        {0x3D6A751F3B936243, 0xB8DA1662E7B00A17},  // 1e275
-        {0x0CC512670A783AD4, 0xE7109BFBA19C0C9D},  // 1e276
-        {0x27FB2B80668B24C5, 0x906A617D450187E2},  // 1e277
-        {0xB1F9F660802DEDF6, 0xB484F9DC9641E9DA},  // 1e278
-        {0x5E7873F8A0396973, 0xE1A63853BBD26451},  // 1e279
-        {0xDB0B487B6423E1E8, 0x8D07E33455637EB2},  // 1e280
-        {0x91CE1A9A3D2CDA62, 0xB049DC016ABC5E5F},  // 1e281
-        {0x7641A140CC7810FB, 0xDC5C5301C56B75F7},  // 1e282
-        {0xA9E904C87FCB0A9D, 0x89B9B3E11B6329BA},  // 1e283
-        {0x546345FA9FBDCD44, 0xAC2820D9623BF429},  // 1e284
-        {0xA97C177947AD4095, 0xD732290FBACAF133},  // 1e285
-        {0x49ED8EABCCCC485D, 0x867F59A9D4BED6C0},  // 1e286
-        {0x5C68F256BFFF5A74, 0xA81F301449EE8C70},  // 1e287
-        {0x73832EEC6FFF3111, 0xD226FC195C6A2F8C},  // 1e288
-};
-
-// wuffs_base__private_implementation__f64_powers_of_10 holds powers of 10 that
-// can be exactly represented by a float64 (what C calls a double).
-static const double wuffs_base__private_implementation__f64_powers_of_10[23] = {
-    1e0,  1e1,  1e2,  1e3,  1e4,  1e5,  1e6,  1e7,  1e8,  1e9,  1e10, 1e11,
-    1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22,
-};
-
-// ---------------- IEEE 754 Floating Point
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__lossy_value_u16  //
-wuffs_base__ieee_754_bit_representation__from_f64_to_u16_truncate(double f) {
-  uint64_t u = 0;
-  if (sizeof(uint64_t) == sizeof(double)) {
-    memcpy(&u, &f, sizeof(uint64_t));
-  }
-  uint16_t neg = ((uint16_t)((u >> 63) << 15));
-  u &= 0x7FFFFFFFFFFFFFFF;
-  uint64_t exp = u >> 52;
-  uint64_t man = u & 0x000FFFFFFFFFFFFF;
-
-  if (exp == 0x7FF) {
-    if (man == 0) {  // Infinity.
-      wuffs_base__lossy_value_u16 ret;
-      ret.value = neg | 0x7C00;
-      ret.lossy = false;
-      return ret;
-    }
-    // NaN. Shift the 52 mantissa bits to 10 mantissa bits, keeping the most
-    // significant mantissa bit (quiet vs signaling NaNs). Also set the low 9
-    // bits of ret.value so that the 10-bit mantissa is non-zero.
-    wuffs_base__lossy_value_u16 ret;
-    ret.value = neg | 0x7DFF | ((uint16_t)(man >> 42));
-    ret.lossy = false;
-    return ret;
-
-  } else if (exp > 0x40E) {  // Truncate to the largest finite f16.
-    wuffs_base__lossy_value_u16 ret;
-    ret.value = neg | 0x7BFF;
-    ret.lossy = true;
-    return ret;
-
-  } else if (exp <= 0x3E6) {  // Truncate to zero.
-    wuffs_base__lossy_value_u16 ret;
-    ret.value = neg;
-    ret.lossy = (u != 0);
-    return ret;
-
-  } else if (exp <= 0x3F0) {  // Normal f64, subnormal f16.
-    // Convert from a 53-bit mantissa (after realizing the implicit bit) to a
-    // 10-bit mantissa and then adjust for the exponent.
-    man |= 0x0010000000000000;
-    uint32_t shift = ((uint32_t)(1051 - exp));  // 1051 = 0x3F0 + 53 - 10.
-    uint64_t shifted_man = man >> shift;
-    wuffs_base__lossy_value_u16 ret;
-    ret.value = neg | ((uint16_t)shifted_man);
-    ret.lossy = (shifted_man << shift) != man;
-    return ret;
-  }
-
-  // Normal f64, normal f16.
-
-  // Re-bias from 1023 to 15 and shift above f16's 10 mantissa bits.
-  exp = (exp - 1008) << 10;  // 1008 = 1023 - 15 = 0x3FF - 0xF.
-
-  // Convert from a 52-bit mantissa (excluding the implicit bit) to a 10-bit
-  // mantissa (again excluding the implicit bit). We lose some information if
-  // any of the bottom 42 bits are non-zero.
-  wuffs_base__lossy_value_u16 ret;
-  ret.value = neg | ((uint16_t)exp) | ((uint16_t)(man >> 42));
-  ret.lossy = (man << 22) != 0;
-  return ret;
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__lossy_value_u32  //
-wuffs_base__ieee_754_bit_representation__from_f64_to_u32_truncate(double f) {
-  uint64_t u = 0;
-  if (sizeof(uint64_t) == sizeof(double)) {
-    memcpy(&u, &f, sizeof(uint64_t));
-  }
-  uint32_t neg = ((uint32_t)(u >> 63)) << 31;
-  u &= 0x7FFFFFFFFFFFFFFF;
-  uint64_t exp = u >> 52;
-  uint64_t man = u & 0x000FFFFFFFFFFFFF;
-
-  if (exp == 0x7FF) {
-    if (man == 0) {  // Infinity.
-      wuffs_base__lossy_value_u32 ret;
-      ret.value = neg | 0x7F800000;
-      ret.lossy = false;
-      return ret;
-    }
-    // NaN. Shift the 52 mantissa bits to 23 mantissa bits, keeping the most
-    // significant mantissa bit (quiet vs signaling NaNs). Also set the low 22
-    // bits of ret.value so that the 23-bit mantissa is non-zero.
-    wuffs_base__lossy_value_u32 ret;
-    ret.value = neg | 0x7FBFFFFF | ((uint32_t)(man >> 29));
-    ret.lossy = false;
-    return ret;
-
-  } else if (exp > 0x47E) {  // Truncate to the largest finite f32.
-    wuffs_base__lossy_value_u32 ret;
-    ret.value = neg | 0x7F7FFFFF;
-    ret.lossy = true;
-    return ret;
-
-  } else if (exp <= 0x369) {  // Truncate to zero.
-    wuffs_base__lossy_value_u32 ret;
-    ret.value = neg;
-    ret.lossy = (u != 0);
-    return ret;
-
-  } else if (exp <= 0x380) {  // Normal f64, subnormal f32.
-    // Convert from a 53-bit mantissa (after realizing the implicit bit) to a
-    // 23-bit mantissa and then adjust for the exponent.
-    man |= 0x0010000000000000;
-    uint32_t shift = ((uint32_t)(926 - exp));  // 926 = 0x380 + 53 - 23.
-    uint64_t shifted_man = man >> shift;
-    wuffs_base__lossy_value_u32 ret;
-    ret.value = neg | ((uint32_t)shifted_man);
-    ret.lossy = (shifted_man << shift) != man;
-    return ret;
-  }
-
-  // Normal f64, normal f32.
-
-  // Re-bias from 1023 to 127 and shift above f32's 23 mantissa bits.
-  exp = (exp - 896) << 23;  // 896 = 1023 - 127 = 0x3FF - 0x7F.
-
-  // Convert from a 52-bit mantissa (excluding the implicit bit) to a 23-bit
-  // mantissa (again excluding the implicit bit). We lose some information if
-  // any of the bottom 29 bits are non-zero.
-  wuffs_base__lossy_value_u32 ret;
-  ret.value = neg | ((uint32_t)exp) | ((uint32_t)(man >> 29));
-  ret.lossy = (man << 35) != 0;
-  return ret;
-}
-
-// --------
-
-#define WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE 2047
-#define WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION 800
-
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL is the largest N
-// such that ((10 << N) < (1 << 64)).
-#define WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL 60
-
-// wuffs_base__private_implementation__high_prec_dec (abbreviated as HPD) is a
-// fixed precision floating point decimal number, augmented with ±infinity
-// values, but it cannot represent NaN (Not a Number).
-//
-// "High precision" means that the mantissa holds 800 decimal digits. 800 is
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION.
-//
-// An HPD isn't for general purpose arithmetic, only for conversions to and
-// from IEEE 754 double-precision floating point, where the largest and
-// smallest positive, finite values are approximately 1.8e+308 and 4.9e-324.
-// HPD exponents above +2047 mean infinity, below -2047 mean zero. The ±2047
-// bounds are further away from zero than ±(324 + 800), where 800 and 2047 is
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION and
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE.
-//
-// digits[.. num_digits] are the number's digits in big-endian order. The
-// uint8_t values are in the range [0 ..= 9], not ['0' ..= '9'], where e.g. '7'
-// is the ASCII value 0x37.
-//
-// decimal_point is the index (within digits) of the decimal point. It may be
-// negative or be larger than num_digits, in which case the explicit digits are
-// padded with implicit zeroes.
-//
-// For example, if num_digits is 3 and digits is "\x07\x08\x09":
-//  - A decimal_point of -2 means ".00789"
-//  - A decimal_point of -1 means ".0789"
-//  - A decimal_point of +0 means ".789"
-//  - A decimal_point of +1 means "7.89"
-//  - A decimal_point of +2 means "78.9"
-//  - A decimal_point of +3 means "789."
-//  - A decimal_point of +4 means "7890."
-//  - A decimal_point of +5 means "78900."
-//
-// As above, a decimal_point higher than +2047 means that the overall value is
-// infinity, lower than -2047 means zero.
-//
-// negative is a sign bit. An HPD can distinguish positive and negative zero.
-//
-// truncated is whether there are more than
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION digits, and at
-// least one of those extra digits are non-zero. The existence of long-tail
-// digits can affect rounding.
-//
-// The "all fields are zero" value is valid, and represents the number +0.
-typedef struct wuffs_base__private_implementation__high_prec_dec__struct {
-  uint32_t num_digits;
-  int32_t decimal_point;
-  bool negative;
-  bool truncated;
-  uint8_t digits[WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION];
-} wuffs_base__private_implementation__high_prec_dec;
-
-// wuffs_base__private_implementation__high_prec_dec__trim trims trailing
-// zeroes from the h->digits[.. h->num_digits] slice. They have no benefit,
-// since we explicitly track h->decimal_point.
-//
-// Preconditions:
-//  - h is non-NULL.
-static inline void  //
-wuffs_base__private_implementation__high_prec_dec__trim(
-    wuffs_base__private_implementation__high_prec_dec* h) {
-  while ((h->num_digits > 0) && (h->digits[h->num_digits - 1] == 0)) {
-    h->num_digits--;
-  }
-}
-
-// wuffs_base__private_implementation__high_prec_dec__assign sets h to
-// represent the number x.
-//
-// Preconditions:
-//  - h is non-NULL.
-static void  //
-wuffs_base__private_implementation__high_prec_dec__assign(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    uint64_t x,
-    bool negative) {
-  uint32_t n = 0;
-
-  // Set h->digits.
-  if (x > 0) {
-    // Calculate the digits, working right-to-left. After we determine n (how
-    // many digits there are), copy from buf to h->digits.
-    //
-    // UINT64_MAX, 18446744073709551615, is 20 digits long. It can be faster to
-    // copy a constant number of bytes than a variable number (20 instead of
-    // n). Make buf large enough (and start writing to it from the middle) so
-    // that can we always copy 20 bytes: the slice buf[(20-n) .. (40-n)].
-    uint8_t buf[40] = {0};
-    uint8_t* ptr = &buf[20];
-    do {
-      uint64_t remaining = x / 10;
-      x -= remaining * 10;
-      ptr--;
-      *ptr = (uint8_t)x;
-      n++;
-      x = remaining;
-    } while (x > 0);
-    memcpy(h->digits, ptr, 20);
-  }
-
-  // Set h's other fields.
-  h->num_digits = n;
-  h->decimal_point = (int32_t)n;
-  h->negative = negative;
-  h->truncated = false;
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
-}
-
-static wuffs_base__status  //
-wuffs_base__private_implementation__high_prec_dec__parse(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    wuffs_base__slice_u8 s,
-    uint32_t options) {
-  if (!h) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  h->num_digits = 0;
-  h->decimal_point = 0;
-  h->negative = false;
-  h->truncated = false;
-
-  uint8_t* p = s.ptr;
-  uint8_t* q = s.ptr + s.len;
-
-  if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
-    for (;; p++) {
-      if (p >= q) {
-        return wuffs_base__make_status(wuffs_base__error__bad_argument);
-      } else if (*p != '_') {
-        break;
-      }
-    }
-  }
-
-  // Parse sign.
-  do {
-    if (*p == '+') {
-      p++;
-    } else if (*p == '-') {
-      h->negative = true;
-      p++;
-    } else {
-      break;
-    }
-    if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
-      for (;; p++) {
-        if (p >= q) {
-          return wuffs_base__make_status(wuffs_base__error__bad_argument);
-        } else if (*p != '_') {
-          break;
-        }
-      }
-    }
-  } while (0);
-
-  // Parse digits, up to (and including) a '.', 'E' or 'e'. Examples for each
-  // limb in this if-else chain:
-  //  - "0.789"
-  //  - "1002.789"
-  //  - ".789"
-  //  - Other (invalid input).
-  uint32_t nd = 0;
-  int32_t dp = 0;
-  bool no_digits_before_separator = false;
-  if (('0' == *p) &&
-      !(options &
-        WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_MULTIPLE_LEADING_ZEROES)) {
-    p++;
-    for (;; p++) {
-      if (p >= q) {
-        goto after_all;
-      } else if (*p ==
-                 ((options &
-                   WUFFS_BASE__PARSE_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA)
-                      ? ','
-                      : '.')) {
-        p++;
-        goto after_sep;
-      } else if ((*p == 'E') || (*p == 'e')) {
-        p++;
-        goto after_exp;
-      } else if ((*p != '_') ||
-                 !(options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
-        return wuffs_base__make_status(wuffs_base__error__bad_argument);
-      }
-    }
-
-  } else if (('0' <= *p) && (*p <= '9')) {
-    if (*p == '0') {
-      for (; (p < q) && (*p == '0'); p++) {
-      }
-    } else {
-      h->digits[nd++] = (uint8_t)(*p - '0');
-      dp = (int32_t)nd;
-      p++;
-    }
-
-    for (;; p++) {
-      if (p >= q) {
-        goto after_all;
-      } else if (('0' <= *p) && (*p <= '9')) {
-        if (nd < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
-          h->digits[nd++] = (uint8_t)(*p - '0');
-          dp = (int32_t)nd;
-        } else if ('0' != *p) {
-          // Long-tail non-zeroes set the truncated bit.
-          h->truncated = true;
-        }
-      } else if (*p ==
-                 ((options &
-                   WUFFS_BASE__PARSE_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA)
-                      ? ','
-                      : '.')) {
-        p++;
-        goto after_sep;
-      } else if ((*p == 'E') || (*p == 'e')) {
-        p++;
-        goto after_exp;
-      } else if ((*p != '_') ||
-                 !(options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
-        return wuffs_base__make_status(wuffs_base__error__bad_argument);
-      }
-    }
-
-  } else if (*p == ((options &
-                     WUFFS_BASE__PARSE_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA)
-                        ? ','
-                        : '.')) {
-    p++;
-    no_digits_before_separator = true;
-
-  } else {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-
-after_sep:
-  for (;; p++) {
-    if (p >= q) {
-      goto after_all;
-    } else if ('0' == *p) {
-      if (nd == 0) {
-        // Track leading zeroes implicitly.
-        dp--;
-      } else if (nd <
-                 WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
-        h->digits[nd++] = (uint8_t)(*p - '0');
-      }
-    } else if (('0' < *p) && (*p <= '9')) {
-      if (nd < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
-        h->digits[nd++] = (uint8_t)(*p - '0');
-      } else {
-        // Long-tail non-zeroes set the truncated bit.
-        h->truncated = true;
-      }
-    } else if ((*p == 'E') || (*p == 'e')) {
-      p++;
-      goto after_exp;
-    } else if ((*p != '_') ||
-               !(options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
-      return wuffs_base__make_status(wuffs_base__error__bad_argument);
-    }
-  }
-
-after_exp:
-  do {
-    if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
-      for (;; p++) {
-        if (p >= q) {
-          return wuffs_base__make_status(wuffs_base__error__bad_argument);
-        } else if (*p != '_') {
-          break;
-        }
-      }
-    }
-
-    int32_t exp_sign = +1;
-    if (*p == '+') {
-      p++;
-    } else if (*p == '-') {
-      exp_sign = -1;
-      p++;
-    }
-
-    int32_t exp = 0;
-    const int32_t exp_large =
-        WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE +
-        WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION;
-    bool saw_exp_digits = false;
-    for (; p < q; p++) {
-      if ((*p == '_') &&
-          (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
-        // No-op.
-      } else if (('0' <= *p) && (*p <= '9')) {
-        saw_exp_digits = true;
-        if (exp < exp_large) {
-          exp = (10 * exp) + ((int32_t)(*p - '0'));
-        }
-      } else {
-        break;
-      }
-    }
-    if (!saw_exp_digits) {
-      return wuffs_base__make_status(wuffs_base__error__bad_argument);
-    }
-    dp += exp_sign * exp;
-  } while (0);
-
-after_all:
-  if (p != q) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  h->num_digits = nd;
-  if (nd == 0) {
-    if (no_digits_before_separator) {
-      return wuffs_base__make_status(wuffs_base__error__bad_argument);
-    }
-    h->decimal_point = 0;
-  } else if (dp <
-             -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
-    h->decimal_point =
-        -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE - 1;
-  } else if (dp >
-             +WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
-    h->decimal_point =
-        +WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE + 1;
-  } else {
-    h->decimal_point = dp;
-  }
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
-  return wuffs_base__make_status(NULL);
-}
-
-// --------
-
-// wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits
-// returns the number of additional decimal digits when left-shifting by shift.
-//
-// See below for preconditions.
-static uint32_t  //
-wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    uint32_t shift) {
-  // Masking with 0x3F should be unnecessary (assuming the preconditions) but
-  // it's cheap and ensures that we don't overflow the
-  // wuffs_base__private_implementation__hpd_left_shift array.
-  shift &= 63;
-
-  uint32_t x_a = wuffs_base__private_implementation__hpd_left_shift[shift];
-  uint32_t x_b = wuffs_base__private_implementation__hpd_left_shift[shift + 1];
-  uint32_t num_new_digits = x_a >> 11;
-  uint32_t pow5_a = 0x7FF & x_a;
-  uint32_t pow5_b = 0x7FF & x_b;
-
-  const uint8_t* pow5 =
-      &wuffs_base__private_implementation__powers_of_5[pow5_a];
-  uint32_t i = 0;
-  uint32_t n = pow5_b - pow5_a;
-  for (; i < n; i++) {
-    if (i >= h->num_digits) {
-      return num_new_digits - 1;
-    } else if (h->digits[i] == pow5[i]) {
-      continue;
-    } else if (h->digits[i] < pow5[i]) {
-      return num_new_digits - 1;
-    } else {
-      return num_new_digits;
-    }
-  }
-  return num_new_digits;
-}
-
-// --------
-
-// wuffs_base__private_implementation__high_prec_dec__rounded_integer returns
-// the integral (non-fractional) part of h, provided that it is 18 or fewer
-// decimal digits. For 19 or more digits, it returns UINT64_MAX. Note that:
-//  - (1 << 53) is    9007199254740992, which has 16 decimal digits.
-//  - (1 << 56) is   72057594037927936, which has 17 decimal digits.
-//  - (1 << 59) is  576460752303423488, which has 18 decimal digits.
-//  - (1 << 63) is 9223372036854775808, which has 19 decimal digits.
-// and that IEEE 754 double precision has 52 mantissa bits.
-//
-// That integral part is rounded-to-even: rounding 7.5 or 8.5 both give 8.
-//
-// h's negative bit is ignored: rounding -8.6 returns 9.
-//
-// See below for preconditions.
-static uint64_t  //
-wuffs_base__private_implementation__high_prec_dec__rounded_integer(
-    wuffs_base__private_implementation__high_prec_dec* h) {
-  if ((h->num_digits == 0) || (h->decimal_point < 0)) {
-    return 0;
-  } else if (h->decimal_point > 18) {
-    return UINT64_MAX;
-  }
-
-  uint32_t dp = (uint32_t)(h->decimal_point);
-  uint64_t n = 0;
-  uint32_t i = 0;
-  for (; i < dp; i++) {
-    n = (10 * n) + ((i < h->num_digits) ? h->digits[i] : 0);
-  }
-
-  bool round_up = false;
-  if (dp < h->num_digits) {
-    round_up = h->digits[dp] >= 5;
-    if ((h->digits[dp] == 5) && (dp + 1 == h->num_digits)) {
-      // We are exactly halfway. If we're truncated, round up, otherwise round
-      // to even.
-      round_up = h->truncated ||  //
-                 ((dp > 0) && (1 & h->digits[dp - 1]));
-    }
-  }
-  if (round_up) {
-    n++;
-  }
-
-  return n;
-}
-
-// wuffs_base__private_implementation__high_prec_dec__small_xshift shifts h's
-// number (where 'x' is 'l' or 'r' for left or right) by a small shift value.
-//
-// Preconditions:
-//  - h is non-NULL.
-//  - h->decimal_point is "not extreme".
-//  - shift is non-zero.
-//  - shift is "a small shift".
-//
-// "Not extreme" means within
-// ±WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE.
-//
-// "A small shift" means not more than
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL.
-//
-// wuffs_base__private_implementation__high_prec_dec__rounded_integer and
-// wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits
-// have the same preconditions.
-//
-// wuffs_base__private_implementation__high_prec_dec__lshift keeps the first
-// two preconditions but not the last two. Its shift argument is signed and
-// does not need to be "small": zero is a no-op, positive means left shift and
-// negative means right shift.
-
-static void  //
-wuffs_base__private_implementation__high_prec_dec__small_lshift(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    uint32_t shift) {
-  if (h->num_digits == 0) {
-    return;
-  }
-  uint32_t num_new_digits =
-      wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits(
-          h, shift);
-  uint32_t rx = h->num_digits - 1;                   // Read  index.
-  uint32_t wx = h->num_digits - 1 + num_new_digits;  // Write index.
-  uint64_t n = 0;
-
-  // Repeat: pick up a digit, put down a digit, right to left.
-  while (((int32_t)rx) >= 0) {
-    n += ((uint64_t)(h->digits[rx])) << shift;
-    uint64_t quo = n / 10;
-    uint64_t rem = n - (10 * quo);
-    if (wx < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
-      h->digits[wx] = (uint8_t)rem;
-    } else if (rem > 0) {
-      h->truncated = true;
-    }
-    n = quo;
-    wx--;
-    rx--;
-  }
-
-  // Put down leading digits, right to left.
-  while (n > 0) {
-    uint64_t quo = n / 10;
-    uint64_t rem = n - (10 * quo);
-    if (wx < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
-      h->digits[wx] = (uint8_t)rem;
-    } else if (rem > 0) {
-      h->truncated = true;
-    }
-    n = quo;
-    wx--;
-  }
-
-  // Finish.
-  h->num_digits += num_new_digits;
-  if (h->num_digits >
-      WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
-    h->num_digits = WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION;
-  }
-  h->decimal_point += (int32_t)num_new_digits;
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
-}
-
-static void  //
-wuffs_base__private_implementation__high_prec_dec__small_rshift(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    uint32_t shift) {
-  uint32_t rx = 0;  // Read  index.
-  uint32_t wx = 0;  // Write index.
-  uint64_t n = 0;
-
-  // Pick up enough leading digits to cover the first shift.
-  while ((n >> shift) == 0) {
-    if (rx < h->num_digits) {
-      // Read a digit.
-      n = (10 * n) + h->digits[rx++];
-    } else if (n == 0) {
-      // h's number used to be zero and remains zero.
-      return;
-    } else {
-      // Read sufficient implicit trailing zeroes.
-      while ((n >> shift) == 0) {
-        n = 10 * n;
-        rx++;
-      }
-      break;
-    }
-  }
-  h->decimal_point -= ((int32_t)(rx - 1));
-  if (h->decimal_point <
-      -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
-    // After the shift, h's number is effectively zero.
-    h->num_digits = 0;
-    h->decimal_point = 0;
-    h->truncated = false;
-    return;
-  }
-
-  // Repeat: pick up a digit, put down a digit, left to right.
-  uint64_t mask = (((uint64_t)(1)) << shift) - 1;
-  while (rx < h->num_digits) {
-    uint8_t new_digit = ((uint8_t)(n >> shift));
-    n = (10 * (n & mask)) + h->digits[rx++];
-    h->digits[wx++] = new_digit;
-  }
-
-  // Put down trailing digits, left to right.
-  while (n > 0) {
-    uint8_t new_digit = ((uint8_t)(n >> shift));
-    n = 10 * (n & mask);
-    if (wx < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
-      h->digits[wx++] = new_digit;
-    } else if (new_digit > 0) {
-      h->truncated = true;
-    }
-  }
-
-  // Finish.
-  h->num_digits = wx;
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
-}
-
-static void  //
-wuffs_base__private_implementation__high_prec_dec__lshift(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    int32_t shift) {
-  if (shift > 0) {
-    while (shift > +WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL) {
-      wuffs_base__private_implementation__high_prec_dec__small_lshift(
-          h, WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL);
-      shift -= WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
-    }
-    wuffs_base__private_implementation__high_prec_dec__small_lshift(
-        h, ((uint32_t)(+shift)));
-  } else if (shift < 0) {
-    while (shift < -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL) {
-      wuffs_base__private_implementation__high_prec_dec__small_rshift(
-          h, WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL);
-      shift += WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
-    }
-    wuffs_base__private_implementation__high_prec_dec__small_rshift(
-        h, ((uint32_t)(-shift)));
-  }
-}
-
-// --------
-
-// wuffs_base__private_implementation__high_prec_dec__round_etc rounds h's
-// number. For those functions that take an n argument, rounding produces at
-// most n digits (which is not necessarily at most n decimal places). Negative
-// n values are ignored, as well as any n greater than or equal to h's number
-// of digits. The etc__round_just_enough function implicitly chooses an n to
-// implement WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION.
-//
-// Preconditions:
-//  - h is non-NULL.
-//  - h->decimal_point is "not extreme".
-//
-// "Not extreme" means within
-// ±WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE.
-
-static void  //
-wuffs_base__private_implementation__high_prec_dec__round_down(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    int32_t n) {
-  if ((n < 0) || (h->num_digits <= (uint32_t)n)) {
-    return;
-  }
-  h->num_digits = (uint32_t)(n);
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
-}
-
-static void  //
-wuffs_base__private_implementation__high_prec_dec__round_up(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    int32_t n) {
-  if ((n < 0) || (h->num_digits <= (uint32_t)n)) {
-    return;
-  }
-
-  for (n--; n >= 0; n--) {
-    if (h->digits[n] < 9) {
-      h->digits[n]++;
-      h->num_digits = (uint32_t)(n + 1);
-      return;
-    }
-  }
-
-  // The number is all 9s. Change to a single 1 and adjust the decimal point.
-  h->digits[0] = 1;
-  h->num_digits = 1;
-  h->decimal_point++;
-}
-
-static void  //
-wuffs_base__private_implementation__high_prec_dec__round_nearest(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    int32_t n) {
-  if ((n < 0) || (h->num_digits <= (uint32_t)n)) {
-    return;
-  }
-  bool up = h->digits[n] >= 5;
-  if ((h->digits[n] == 5) && ((n + 1) == ((int32_t)(h->num_digits)))) {
-    up = h->truncated ||  //
-         ((n > 0) && ((h->digits[n - 1] & 1) != 0));
-  }
-
-  if (up) {
-    wuffs_base__private_implementation__high_prec_dec__round_up(h, n);
-  } else {
-    wuffs_base__private_implementation__high_prec_dec__round_down(h, n);
-  }
-}
-
-static void  //
-wuffs_base__private_implementation__high_prec_dec__round_just_enough(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    int32_t exp2,
-    uint64_t mantissa) {
-  // The magic numbers 52 and 53 in this function are because IEEE 754 double
-  // precision has 52 mantissa bits.
-  //
-  // Let f be the floating point number represented by exp2 and mantissa (and
-  // also the number in h): the number (mantissa * (2 ** (exp2 - 52))).
-  //
-  // If f is zero or a small integer, we can return early.
-  if ((mantissa == 0) ||
-      ((exp2 < 53) && (h->decimal_point >= ((int32_t)(h->num_digits))))) {
-    return;
-  }
-
-  // The smallest normal f has an exp2 of -1022 and a mantissa of (1 << 52).
-  // Subnormal numbers have the same exp2 but a smaller mantissa.
-  static const int32_t min_incl_normal_exp2 = -1022;
-  static const uint64_t min_incl_normal_mantissa = 0x0010000000000000ul;
-
-  // Compute lower and upper bounds such that any number between them (possibly
-  // inclusive) will round to f. First, the lower bound. Our number f is:
-  //   ((mantissa + 0)         * (2 ** (  exp2 - 52)))
-  //
-  // The next lowest floating point number is:
-  //   ((mantissa - 1)         * (2 ** (  exp2 - 52)))
-  // unless (mantissa - 1) drops the (1 << 52) bit and exp2 is not the
-  // min_incl_normal_exp2. Either way, call it:
-  //   ((l_mantissa)           * (2 ** (l_exp2 - 52)))
-  //
-  // The lower bound is halfway between them (noting that 52 became 53):
-  //   (((2 * l_mantissa) + 1) * (2 ** (l_exp2 - 53)))
-  int32_t l_exp2 = exp2;
-  uint64_t l_mantissa = mantissa - 1;
-  if ((exp2 > min_incl_normal_exp2) && (mantissa <= min_incl_normal_mantissa)) {
-    l_exp2 = exp2 - 1;
-    l_mantissa = (2 * mantissa) - 1;
-  }
-  wuffs_base__private_implementation__high_prec_dec lower;
-  wuffs_base__private_implementation__high_prec_dec__assign(
-      &lower, (2 * l_mantissa) + 1, false);
-  wuffs_base__private_implementation__high_prec_dec__lshift(&lower,
-                                                            l_exp2 - 53);
-
-  // Next, the upper bound. Our number f is:
-  //   ((mantissa + 0)       * (2 ** (exp2 - 52)))
-  //
-  // The next highest floating point number is:
-  //   ((mantissa + 1)       * (2 ** (exp2 - 52)))
-  //
-  // The upper bound is halfway between them (noting that 52 became 53):
-  //   (((2 * mantissa) + 1) * (2 ** (exp2 - 53)))
-  wuffs_base__private_implementation__high_prec_dec upper;
-  wuffs_base__private_implementation__high_prec_dec__assign(
-      &upper, (2 * mantissa) + 1, false);
-  wuffs_base__private_implementation__high_prec_dec__lshift(&upper, exp2 - 53);
-
-  // The lower and upper bounds are possible outputs only if the original
-  // mantissa is even, so that IEEE round-to-even would round to the original
-  // mantissa and not its neighbors.
-  bool inclusive = (mantissa & 1) == 0;
-
-  // As we walk the digits, we want to know whether rounding up would fall
-  // within the upper bound. This is tracked by upper_delta:
-  //  - When -1, the digits of h and upper are the same so far.
-  //  - When +0, we saw a difference of 1 between h and upper on a previous
-  //    digit and subsequently only 9s for h and 0s for upper. Thus, rounding
-  //    up may fall outside of the bound if !inclusive.
-  //  - When +1, the difference is greater than 1 and we know that rounding up
-  //    falls within the bound.
-  //
-  // This is a state machine with three states. The numerical value for each
-  // state (-1, +0 or +1) isn't important, other than their order.
-  int upper_delta = -1;
-
-  // We can now figure out the shortest number of digits required. Walk the
-  // digits until h has distinguished itself from lower or upper.
-  //
-  // The zi and zd variables are indexes and digits, for z in l (lower), h (the
-  // number) and u (upper).
-  //
-  // The lower, h and upper numbers may have their decimal points at different
-  // places. In this case, upper is the longest, so we iterate ui starting from
-  // 0 and iterate li and hi starting from either 0 or -1.
-  int32_t ui = 0;
-  for (;; ui++) {
-    // Calculate hd, the middle number's digit.
-    int32_t hi = ui - upper.decimal_point + h->decimal_point;
-    if (hi >= ((int32_t)(h->num_digits))) {
-      break;
-    }
-    uint8_t hd = (((uint32_t)hi) < h->num_digits) ? h->digits[hi] : 0;
-
-    // Calculate ld, the lower bound's digit.
-    int32_t li = ui - upper.decimal_point + lower.decimal_point;
-    uint8_t ld = (((uint32_t)li) < lower.num_digits) ? lower.digits[li] : 0;
-
-    // We can round down (truncate) if lower has a different digit than h or if
-    // lower is inclusive and is exactly the result of rounding down (i.e. we
-    // have reached the final digit of lower).
-    bool can_round_down =
-        (ld != hd) ||  //
-        (inclusive && ((li + 1) == ((int32_t)(lower.num_digits))));
-
-    // Calculate ud, the upper bound's digit, and update upper_delta.
-    uint8_t ud = (((uint32_t)ui) < upper.num_digits) ? upper.digits[ui] : 0;
-    if (upper_delta < 0) {
-      if ((hd + 1) < ud) {
-        // For example:
-        // h     = 12345???
-        // upper = 12347???
-        upper_delta = +1;
-      } else if (hd != ud) {
-        // For example:
-        // h     = 12345???
-        // upper = 12346???
-        upper_delta = +0;
-      }
-    } else if (upper_delta == 0) {
-      if ((hd != 9) || (ud != 0)) {
-        // For example:
-        // h     = 1234598?
-        // upper = 1234600?
-        upper_delta = +1;
-      }
-    }
-
-    // We can round up if upper has a different digit than h and either upper
-    // is inclusive or upper is bigger than the result of rounding up.
-    bool can_round_up =
-        (upper_delta > 0) ||    //
-        ((upper_delta == 0) &&  //
-         (inclusive || ((ui + 1) < ((int32_t)(upper.num_digits)))));
-
-    // If we can round either way, round to nearest. If we can round only one
-    // way, do it. If we can't round, continue the loop.
-    if (can_round_down) {
-      if (can_round_up) {
-        wuffs_base__private_implementation__high_prec_dec__round_nearest(
-            h, hi + 1);
-        return;
-      } else {
-        wuffs_base__private_implementation__high_prec_dec__round_down(h,
-                                                                      hi + 1);
-        return;
-      }
-    } else {
-      if (can_round_up) {
-        wuffs_base__private_implementation__high_prec_dec__round_up(h, hi + 1);
-        return;
-      }
-    }
-  }
-}
-
-// --------
-
-// wuffs_base__private_implementation__parse_number_f64_eisel_lemire produces
-// the IEEE 754 double-precision value for an exact mantissa and base-10
-// exponent. For example:
-//  - when parsing "12345.678e+02", man is 12345678 and exp10 is -1.
-//  - when parsing "-12", man is 12 and exp10 is 0. Processing the leading
-//    minus sign is the responsibility of the caller, not this function.
-//
-// On success, it returns a non-negative int64_t such that the low 63 bits hold
-// the 11-bit exponent and 52-bit mantissa.
-//
-// On failure, it returns a negative value.
-//
-// The algorithm is based on an original idea by Michael Eisel that was refined
-// by Daniel Lemire. See
-// https://lemire.me/blog/2020/03/10/fast-float-parsing-in-practice/
-// and
-// https://nigeltao.github.io/blog/2020/eisel-lemire.html
-//
-// Preconditions:
-//  - man is non-zero.
-//  - exp10 is in the range [-307 ..= 288], the same range of the
-//    wuffs_base__private_implementation__powers_of_10 array.
-//
-// The exp10 range (and the fact that man is in the range [1 ..= UINT64_MAX],
-// approximately [1 ..= 1.85e+19]) means that (man * (10 ** exp10)) is in the
-// range [1e-307 ..= 1.85e+307]. This is entirely within the range of normal
-// (neither subnormal nor non-finite) f64 values: DBL_MIN and DBL_MAX are
-// approximately 2.23e–308 and 1.80e+308.
-static int64_t  //
-wuffs_base__private_implementation__parse_number_f64_eisel_lemire(
-    uint64_t man,
-    int32_t exp10) {
-  // Look up the (possibly truncated) base-2 representation of (10 ** exp10).
-  // The look-up table was constructed so that it is already normalized: the
-  // table entry's mantissa's MSB (most significant bit) is on.
-  const uint64_t* po10 =
-      &wuffs_base__private_implementation__powers_of_10[exp10 + 307][0];
-
-  // Normalize the man argument. The (man != 0) precondition means that a
-  // non-zero bit exists.
-  uint32_t clz = wuffs_base__count_leading_zeroes_u64(man);
-  man <<= clz;
-
-  // Calculate the return value's base-2 exponent. We might tweak it by ±1
-  // later, but its initial value comes from a linear scaling of exp10,
-  // converting from power-of-10 to power-of-2, and adjusting by clz.
-  //
-  // The magic constants are:
-  //  - 1087 = 1023 + 64. The 1023 is the f64 exponent bias. The 64 is because
-  //    the look-up table uses 64-bit mantissas.
-  //  - 217706 is such that the ratio 217706 / 65536 ≈ 3.321930 is close enough
-  //    (over the practical range of exp10) to log(10) / log(2) ≈ 3.321928.
-  //  - 65536 = 1<<16 is arbitrary but a power of 2, so division is a shift.
-  //
-  // Equality of the linearly-scaled value and the actual power-of-2, over the
-  // range of exp10 arguments that this function accepts, is confirmed by
-  // script/print-mpb-powers-of-10.go
-  uint64_t ret_exp2 =
-      ((uint64_t)(((217706 * exp10) >> 16) + 1087)) - ((uint64_t)clz);
-
-  // Multiply the two mantissas. Normalization means that both mantissas are at
-  // least (1<<63), so the 128-bit product must be at least (1<<126). The high
-  // 64 bits of the product, x_hi, must therefore be at least (1<<62).
-  //
-  // As a consequence, x_hi has either 0 or 1 leading zeroes. Shifting x_hi
-  // right by either 9 or 10 bits (depending on x_hi's MSB) will therefore
-  // leave the top 10 MSBs (bits 54 ..= 63) off and the 11th MSB (bit 53) on.
-  wuffs_base__multiply_u64__output x = wuffs_base__multiply_u64(man, po10[1]);
-  uint64_t x_hi = x.hi;
-  uint64_t x_lo = x.lo;
-
-  // Before we shift right by at least 9 bits, recall that the look-up table
-  // entry was possibly truncated. We have so far only calculated a lower bound
-  // for the product (man * e), where e is (10 ** exp10). The upper bound would
-  // add a further (man * 1) to the 128-bit product, which overflows the lower
-  // 64-bit limb if ((x_lo + man) < man).
-  //
-  // If overflow occurs, that adds 1 to x_hi. Since we're about to shift right
-  // by at least 9 bits, that carried 1 can be ignored unless the higher 64-bit
-  // limb's low 9 bits are all on.
-  //
-  // For example, parsing "9999999999999999999" will take the if-true branch
-  // here, since:
-  //  - x_hi = 0x4563918244F3FFFF
-  //  - x_lo = 0x8000000000000000
-  //  - man  = 0x8AC7230489E7FFFF
-  if (((x_hi & 0x1FF) == 0x1FF) && ((x_lo + man) < man)) {
-    // Refine our calculation of (man * e). Before, our approximation of e used
-    // a "low resolution" 64-bit mantissa. Now use a "high resolution" 128-bit
-    // mantissa. We've already calculated x = (man * bits_0_to_63_incl_of_e).
-    // Now calculate y = (man * bits_64_to_127_incl_of_e).
-    wuffs_base__multiply_u64__output y = wuffs_base__multiply_u64(man, po10[0]);
-    uint64_t y_hi = y.hi;
-    uint64_t y_lo = y.lo;
-
-    // Merge the 128-bit x and 128-bit y, which overlap by 64 bits, to
-    // calculate the 192-bit product of the 64-bit man by the 128-bit e.
-    // As we exit this if-block, we only care about the high 128 bits
-    // (merged_hi and merged_lo) of that 192-bit product.
-    //
-    // For example, parsing "1.234e-45" will take the if-true branch here,
-    // since:
-    //  - x_hi = 0x70B7E3696DB29FFF
-    //  - x_lo = 0xE040000000000000
-    //  - y_hi = 0x33718BBEAB0E0D7A
-    //  - y_lo = 0xA880000000000000
-    uint64_t merged_hi = x_hi;
-    uint64_t merged_lo = x_lo + y_hi;
-    if (merged_lo < x_lo) {
-      merged_hi++;  // Carry the overflow bit.
-    }
-
-    // The "high resolution" approximation of e is still a lower bound. Once
-    // again, see if the upper bound is large enough to produce a different
-    // result. This time, if it does, give up instead of reaching for an even
-    // more precise approximation to e.
-    //
-    // This three-part check is similar to the two-part check that guarded the
-    // if block that we're now in, but it has an extra term for the middle 64
-    // bits (checking that adding 1 to merged_lo would overflow).
-    //
-    // For example, parsing "5.9604644775390625e-8" will take the if-true
-    // branch here, since:
-    //  - merged_hi = 0x7FFFFFFFFFFFFFFF
-    //  - merged_lo = 0xFFFFFFFFFFFFFFFF
-    //  - y_lo      = 0x4DB3FFC120988200
-    //  - man       = 0xD3C21BCECCEDA100
-    if (((merged_hi & 0x1FF) == 0x1FF) && ((merged_lo + 1) == 0) &&
-        (y_lo + man < man)) {
-      return -1;
-    }
-
-    // Replace the 128-bit x with merged.
-    x_hi = merged_hi;
-    x_lo = merged_lo;
-  }
-
-  // As mentioned above, shifting x_hi right by either 9 or 10 bits will leave
-  // the top 10 MSBs (bits 54 ..= 63) off and the 11th MSB (bit 53) on. If the
-  // MSB (before shifting) was on, adjust ret_exp2 for the larger shift.
-  //
-  // Having bit 53 on (and higher bits off) means that ret_mantissa is a 54-bit
-  // number.
-  uint64_t msb = x_hi >> 63;
-  uint64_t ret_mantissa = x_hi >> (msb + 9);
-  ret_exp2 -= 1 ^ msb;
-
-  // IEEE 754 rounds to-nearest with ties rounded to-even. Rounding to-even can
-  // be tricky. If we're half-way between two exactly representable numbers
-  // (x's low 73 bits are zero and the next 2 bits that matter are "01"), give
-  // up instead of trying to pick the winner.
-  //
-  // Technically, we could tighten the condition by changing "73" to "73 or 74,
-  // depending on msb", but a flat "73" is simpler.
-  //
-  // For example, parsing "1e+23" will take the if-true branch here, since:
-  //  - x_hi          = 0x54B40B1F852BDA00
-  //  - ret_mantissa  = 0x002A5A058FC295ED
-  if ((x_lo == 0) && ((x_hi & 0x1FF) == 0) && ((ret_mantissa & 3) == 1)) {
-    return -1;
-  }
-
-  // If we're not halfway then it's rounding to-nearest. Starting with a 54-bit
-  // number, carry the lowest bit (bit 0) up if it's on. Regardless of whether
-  // it was on or off, shifting right by one then produces a 53-bit number. If
-  // carrying up overflowed, shift again.
-  ret_mantissa += ret_mantissa & 1;
-  ret_mantissa >>= 1;
-  // This if block is equivalent to (but benchmarks slightly faster than) the
-  // following branchless form:
-  //    uint64_t overflow_adjustment = ret_mantissa >> 53;
-  //    ret_mantissa >>= overflow_adjustment;
-  //    ret_exp2 += overflow_adjustment;
-  //
-  // For example, parsing "7.2057594037927933e+16" will take the if-true
-  // branch here, since:
-  //  - x_hi          = 0x7FFFFFFFFFFFFE80
-  //  - ret_mantissa  = 0x0020000000000000
-  if ((ret_mantissa >> 53) > 0) {
-    ret_mantissa >>= 1;
-    ret_exp2++;
-  }
-
-  // Starting with a 53-bit number, IEEE 754 double-precision normal numbers
-  // have an implicit mantissa bit. Mask that away and keep the low 52 bits.
-  ret_mantissa &= 0x000FFFFFFFFFFFFF;
-
-  // Pack the bits and return.
-  return ((int64_t)(ret_mantissa | (ret_exp2 << 52)));
-}
-
-// --------
-
-static wuffs_base__result_f64  //
-wuffs_base__private_implementation__parse_number_f64_special(
-    wuffs_base__slice_u8 s,
-    uint32_t options) {
-  do {
-    if (options & WUFFS_BASE__PARSE_NUMBER_FXX__REJECT_INF_AND_NAN) {
-      goto fail;
-    }
-
-    uint8_t* p = s.ptr;
-    uint8_t* q = s.ptr + s.len;
-
-    for (; (p < q) && (*p == '_'); p++) {
-    }
-    if (p >= q) {
-      goto fail;
-    }
-
-    // Parse sign.
-    bool negative = false;
-    do {
-      if (*p == '+') {
-        p++;
-      } else if (*p == '-') {
-        negative = true;
-        p++;
-      } else {
-        break;
-      }
-      for (; (p < q) && (*p == '_'); p++) {
-      }
-    } while (0);
-    if (p >= q) {
-      goto fail;
-    }
-
-    bool nan = false;
-    switch (p[0]) {
-      case 'I':
-      case 'i':
-        if (((q - p) < 3) ||                     //
-            ((p[1] != 'N') && (p[1] != 'n')) ||  //
-            ((p[2] != 'F') && (p[2] != 'f'))) {
-          goto fail;
-        }
-        p += 3;
-
-        if ((p >= q) || (*p == '_')) {
-          break;
-        } else if (((q - p) < 5) ||                     //
-                   ((p[0] != 'I') && (p[0] != 'i')) ||  //
-                   ((p[1] != 'N') && (p[1] != 'n')) ||  //
-                   ((p[2] != 'I') && (p[2] != 'i')) ||  //
-                   ((p[3] != 'T') && (p[3] != 't')) ||  //
-                   ((p[4] != 'Y') && (p[4] != 'y'))) {
-          goto fail;
-        }
-        p += 5;
-
-        if ((p >= q) || (*p == '_')) {
-          break;
-        }
-        goto fail;
-
-      case 'N':
-      case 'n':
-        if (((q - p) < 3) ||                     //
-            ((p[1] != 'A') && (p[1] != 'a')) ||  //
-            ((p[2] != 'N') && (p[2] != 'n'))) {
-          goto fail;
-        }
-        p += 3;
-
-        if ((p >= q) || (*p == '_')) {
-          nan = true;
-          break;
-        }
-        goto fail;
-
-      default:
-        goto fail;
-    }
-
-    // Finish.
-    for (; (p < q) && (*p == '_'); p++) {
-    }
-    if (p != q) {
-      goto fail;
-    }
-    wuffs_base__result_f64 ret;
-    ret.status.repr = NULL;
-    ret.value = wuffs_base__ieee_754_bit_representation__from_u64_to_f64(
-        (nan ? 0x7FFFFFFFFFFFFFFF : 0x7FF0000000000000) |
-        (negative ? 0x8000000000000000 : 0));
-    return ret;
-  } while (0);
-
-fail:
-  do {
-    wuffs_base__result_f64 ret;
-    ret.status.repr = wuffs_base__error__bad_argument;
-    ret.value = 0;
-    return ret;
-  } while (0);
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__result_f64  //
-wuffs_base__private_implementation__high_prec_dec__to_f64(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    uint32_t options) {
-  do {
-    // powers converts decimal powers of 10 to binary powers of 2. For example,
-    // (10000 >> 13) is 1. It stops before the elements exceed 60, also known
-    // as WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL.
-    //
-    // This rounds down (1<<13 is a lower bound for 1e4). Adding 1 to the array
-    // element value rounds up (1<<14 is an upper bound for 1e4) while staying
-    // at or below WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL.
-    //
-    // When starting in the range [1e+1 .. 1e+2] (i.e. h->decimal_point == +2),
-    // powers[2] == 6 and so:
-    //  - Right shifting by 6+0 produces the range [10/64 .. 100/64] =
-    //    [0.156250 .. 1.56250]. The resultant h->decimal_point is +0 or +1.
-    //  - Right shifting by 6+1 produces the range [10/128 .. 100/128] =
-    //    [0.078125 .. 0.78125]. The resultant h->decimal_point is -1 or -0.
-    //
-    // When starting in the range [1e-3 .. 1e-2] (i.e. h->decimal_point == -2),
-    // powers[2] == 6 and so:
-    //  - Left shifting by 6+0 produces the range [0.001*64 .. 0.01*64] =
-    //    [0.064 .. 0.64]. The resultant h->decimal_point is -1 or -0.
-    //  - Left shifting by 6+1 produces the range [0.001*128 .. 0.01*128] =
-    //    [0.128 .. 1.28]. The resultant h->decimal_point is +0 or +1.
-    //
-    // Thus, when targeting h->decimal_point being +0 or +1, use (powers[n]+0)
-    // when right shifting but (powers[n]+1) when left shifting.
-    static const uint32_t num_powers = 19;
-    static const uint8_t powers[19] = {
-        0,  3,  6,  9,  13, 16, 19, 23, 26, 29,  //
-        33, 36, 39, 43, 46, 49, 53, 56, 59,      //
-    };
-
-    // Handle zero and obvious extremes. The largest and smallest positive
-    // finite f64 values are approximately 1.8e+308 and 4.9e-324.
-    if ((h->num_digits == 0) || (h->decimal_point < -326)) {
-      goto zero;
-    } else if (h->decimal_point > 310) {
-      goto infinity;
-    }
-
-    // Try the fast Eisel-Lemire algorithm again. Calculating the (man, exp10)
-    // pair from the high_prec_dec h is more correct but slower than the
-    // approach taken in wuffs_base__parse_number_f64. The latter is optimized
-    // for the common cases (e.g. assuming no underscores or a leading '+'
-    // sign) rather than the full set of cases allowed by the Wuffs API.
-    //
-    // When we have 19 or fewer mantissa digits, run Eisel-Lemire once (trying
-    // for an exact result). When we have more than 19 mantissa digits, run it
-    // twice to get a lower and upper bound. We still have an exact result
-    // (within f64's rounding margin) if both bounds are equal (and valid).
-    uint32_t i_max = h->num_digits;
-    if (i_max > 19) {
-      i_max = 19;
-    }
-    int32_t exp10 = h->decimal_point - ((int32_t)i_max);
-    if ((-307 <= exp10) && (exp10 <= 288)) {
-      uint64_t man = 0;
-      uint32_t i;
-      for (i = 0; i < i_max; i++) {
-        man = (10 * man) + h->digits[i];
-      }
-      while (man != 0) {  // The 'while' is just an 'if' that we can 'break'.
-        int64_t r0 =
-            wuffs_base__private_implementation__parse_number_f64_eisel_lemire(
-                man + 0, exp10);
-        if (r0 < 0) {
-          break;
-        } else if (h->num_digits > 19) {
-          int64_t r1 =
-              wuffs_base__private_implementation__parse_number_f64_eisel_lemire(
-                  man + 1, exp10);
-          if (r1 != r0) {
-            break;
-          }
-        }
-        wuffs_base__result_f64 ret;
-        ret.status.repr = NULL;
-        ret.value = wuffs_base__ieee_754_bit_representation__from_u64_to_f64(
-            ((uint64_t)r0) | (((uint64_t)(h->negative)) << 63));
-        return ret;
-      }
-    }
-
-    // When Eisel-Lemire fails, fall back to Simple Decimal Conversion. See
-    // https://nigeltao.github.io/blog/2020/parse-number-f64-simple.html
-    //
-    // Scale by powers of 2 until we're in the range [0.1 .. 10]. Equivalently,
-    // that h->decimal_point is +0 or +1.
-    //
-    // First we shift right while at or above 10...
-    const int32_t f64_bias = -1023;
-    int32_t exp2 = 0;
-    while (h->decimal_point > 1) {
-      uint32_t n = (uint32_t)(+h->decimal_point);
-      uint32_t shift =
-          (n < num_powers)
-              ? powers[n]
-              : WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
-
-      wuffs_base__private_implementation__high_prec_dec__small_rshift(h, shift);
-      if (h->decimal_point <
-          -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
-        goto zero;
-      }
-      exp2 += (int32_t)shift;
-    }
-    // ...then we shift left while below 0.1.
-    while (h->decimal_point < 0) {
-      uint32_t shift;
-      uint32_t n = (uint32_t)(-h->decimal_point);
-      shift = (n < num_powers)
-                  // The +1 is per "when targeting h->decimal_point being +0 or
-                  // +1... when left shifting" in the powers comment above.
-                  ? (powers[n] + 1)
-                  : WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
-
-      wuffs_base__private_implementation__high_prec_dec__small_lshift(h, shift);
-      if (h->decimal_point >
-          +WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
-        goto infinity;
-      }
-      exp2 -= (int32_t)shift;
-    }
-
-    // To get from "in the range [0.1 .. 10]" to "in the range [1 .. 2]" (which
-    // will give us our exponent in base-2), the mantissa's first 3 digits will
-    // determine the final left shift, equal to 52 (the number of explicit f64
-    // bits) plus an additional adjustment.
-    int man3 = (100 * h->digits[0]) +
-               ((h->num_digits > 1) ? (10 * h->digits[1]) : 0) +
-               ((h->num_digits > 2) ? h->digits[2] : 0);
-    int32_t additional_lshift = 0;
-    if (h->decimal_point == 0) {  // The value is in [0.1 .. 1].
-      if (man3 < 125) {
-        additional_lshift = +4;
-      } else if (man3 < 250) {
-        additional_lshift = +3;
-      } else if (man3 < 500) {
-        additional_lshift = +2;
-      } else {
-        additional_lshift = +1;
-      }
-    } else {  // The value is in [1 .. 10].
-      if (man3 < 200) {
-        additional_lshift = -0;
-      } else if (man3 < 400) {
-        additional_lshift = -1;
-      } else if (man3 < 800) {
-        additional_lshift = -2;
-      } else {
-        additional_lshift = -3;
-      }
-    }
-    exp2 -= additional_lshift;
-    uint32_t final_lshift = (uint32_t)(52 + additional_lshift);
-
-    // The minimum normal exponent is (f64_bias + 1).
-    while ((f64_bias + 1) > exp2) {
-      uint32_t n = (uint32_t)((f64_bias + 1) - exp2);
-      if (n > WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL) {
-        n = WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
-      }
-      wuffs_base__private_implementation__high_prec_dec__small_rshift(h, n);
-      exp2 += (int32_t)n;
-    }
-
-    // Check for overflow.
-    if ((exp2 - f64_bias) >= 0x07FF) {  // (1 << 11) - 1.
-      goto infinity;
-    }
-
-    // Extract 53 bits for the mantissa (in base-2).
-    wuffs_base__private_implementation__high_prec_dec__small_lshift(
-        h, final_lshift);
-    uint64_t man2 =
-        wuffs_base__private_implementation__high_prec_dec__rounded_integer(h);
-
-    // Rounding might have added one bit. If so, shift and re-check overflow.
-    if ((man2 >> 53) != 0) {
-      man2 >>= 1;
-      exp2++;
-      if ((exp2 - f64_bias) >= 0x07FF) {  // (1 << 11) - 1.
-        goto infinity;
-      }
-    }
-
-    // Handle subnormal numbers.
-    if ((man2 >> 52) == 0) {
-      exp2 = f64_bias;
-    }
-
-    // Pack the bits and return.
-    uint64_t exp2_bits =
-        (uint64_t)((exp2 - f64_bias) & 0x07FF);              // (1 << 11) - 1.
-    uint64_t bits = (man2 & 0x000FFFFFFFFFFFFF) |            // (1 << 52) - 1.
-                    (exp2_bits << 52) |                      //
-                    (h->negative ? 0x8000000000000000 : 0);  // (1 << 63).
-
-    wuffs_base__result_f64 ret;
-    ret.status.repr = NULL;
-    ret.value = wuffs_base__ieee_754_bit_representation__from_u64_to_f64(bits);
-    return ret;
-  } while (0);
-
-zero:
-  do {
-    uint64_t bits = h->negative ? 0x8000000000000000 : 0;
-
-    wuffs_base__result_f64 ret;
-    ret.status.repr = NULL;
-    ret.value = wuffs_base__ieee_754_bit_representation__from_u64_to_f64(bits);
-    return ret;
-  } while (0);
-
-infinity:
-  do {
-    if (options & WUFFS_BASE__PARSE_NUMBER_FXX__REJECT_INF_AND_NAN) {
-      wuffs_base__result_f64 ret;
-      ret.status.repr = wuffs_base__error__bad_argument;
-      ret.value = 0;
-      return ret;
-    }
-
-    uint64_t bits = h->negative ? 0xFFF0000000000000 : 0x7FF0000000000000;
-
-    wuffs_base__result_f64 ret;
-    ret.status.repr = NULL;
-    ret.value = wuffs_base__ieee_754_bit_representation__from_u64_to_f64(bits);
-    return ret;
-  } while (0);
-}
-
-static inline bool  //
-wuffs_base__private_implementation__is_decimal_digit(uint8_t c) {
-  return ('0' <= c) && (c <= '9');
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__result_f64  //
-wuffs_base__parse_number_f64(wuffs_base__slice_u8 s, uint32_t options) {
-  // In practice, almost all "dd.ddddE±xxx" numbers can be represented
-  // losslessly by a uint64_t mantissa "dddddd" and an int32_t base-10
-  // exponent, adjusting "xxx" for the position (if present) of the decimal
-  // separator '.' or ','.
-  //
-  // This (u64 man, i32 exp10) data structure is superficially similar to the
-  // "Do It Yourself Floating Point" type from Loitsch (†), but the exponent
-  // here is base-10, not base-2.
-  //
-  // If s's number fits in a (man, exp10), parse that pair with the
-  // Eisel-Lemire algorithm. If not, or if Eisel-Lemire fails, parsing s with
-  // the fallback algorithm is slower but comprehensive.
-  //
-  // † "Printing Floating-Point Numbers Quickly and Accurately with Integers"
-  // (https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf).
-  // Florian Loitsch is also the primary contributor to
-  // https://github.com/google/double-conversion
-  do {
-    // Calculating that (man, exp10) pair needs to stay within s's bounds.
-    // Provided that s isn't extremely long, work on a NUL-terminated copy of
-    // s's contents. The NUL byte isn't a valid part of "±dd.ddddE±xxx".
-    //
-    // As the pointer p walks the contents, it's faster to repeatedly check "is
-    // *p a valid digit" than "is p within bounds and *p a valid digit".
-    if (s.len >= 256) {
-      goto fallback;
-    }
-    uint8_t z[256];
-    memcpy(&z[0], s.ptr, s.len);
-    z[s.len] = 0;
-    const uint8_t* p = &z[0];
-
-    // Look for a leading minus sign. Technically, we could also look for an
-    // optional plus sign, but the "script/process-json-numbers.c with -p"
-    // benchmark is noticably slower if we do. It's optional and, in practice,
-    // usually absent. Let the fallback catch it.
-    bool negative = (*p == '-');
-    if (negative) {
-      p++;
-    }
-
-    // After walking "dd.dddd", comparing p later with p now will produce the
-    // number of "d"s and "."s.
-    const uint8_t* const start_of_digits_ptr = p;
-
-    // Walk the "d"s before a '.', 'E', NUL byte, etc. If it starts with '0',
-    // it must be a single '0'. If it starts with a non-zero decimal digit, it
-    // can be a sequence of decimal digits.
-    //
-    // Update the man variable during the walk. It's OK if man overflows now.
-    // We'll detect that later.
-    uint64_t man;
-    if (*p == '0') {
-      man = 0;
-      p++;
-      if (wuffs_base__private_implementation__is_decimal_digit(*p)) {
-        goto fallback;
-      }
-    } else if (wuffs_base__private_implementation__is_decimal_digit(*p)) {
-      man = ((uint8_t)(*p - '0'));
-      p++;
-      for (; wuffs_base__private_implementation__is_decimal_digit(*p); p++) {
-        man = (10 * man) + ((uint8_t)(*p - '0'));
-      }
-    } else {
-      goto fallback;
-    }
-
-    // Walk the "d"s after the optional decimal separator ('.' or ','),
-    // updating the man and exp10 variables.
-    int32_t exp10 = 0;
-    if (*p ==
-        ((options & WUFFS_BASE__PARSE_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA)
-             ? ','
-             : '.')) {
-      p++;
-      const uint8_t* first_after_separator_ptr = p;
-      if (!wuffs_base__private_implementation__is_decimal_digit(*p)) {
-        goto fallback;
-      }
-      man = (10 * man) + ((uint8_t)(*p - '0'));
-      p++;
-      for (; wuffs_base__private_implementation__is_decimal_digit(*p); p++) {
-        man = (10 * man) + ((uint8_t)(*p - '0'));
-      }
-      exp10 = ((int32_t)(first_after_separator_ptr - p));
-    }
-
-    // Count the number of digits:
-    //  - for an input of "314159",  digit_count is 6.
-    //  - for an input of "3.14159", digit_count is 7.
-    //
-    // This is off-by-one if there is a decimal separator. That's OK for now.
-    // We'll correct for that later. The "script/process-json-numbers.c with
-    // -p" benchmark is noticably slower if we try to correct for that now.
-    uint32_t digit_count = (uint32_t)(p - start_of_digits_ptr);
-
-    // Update exp10 for the optional exponent, starting with 'E' or 'e'.
-    if ((*p | 0x20) == 'e') {
-      p++;
-      int32_t exp_sign = +1;
-      if (*p == '-') {
-        p++;
-        exp_sign = -1;
-      } else if (*p == '+') {
-        p++;
-      }
-      if (!wuffs_base__private_implementation__is_decimal_digit(*p)) {
-        goto fallback;
-      }
-      int32_t exp_num = ((uint8_t)(*p - '0'));
-      p++;
-      // The rest of the exp_num walking has a peculiar control flow but, once
-      // again, the "script/process-json-numbers.c with -p" benchmark is
-      // sensitive to alternative formulations.
-      if (wuffs_base__private_implementation__is_decimal_digit(*p)) {
-        exp_num = (10 * exp_num) + ((uint8_t)(*p - '0'));
-        p++;
-      }
-      if (wuffs_base__private_implementation__is_decimal_digit(*p)) {
-        exp_num = (10 * exp_num) + ((uint8_t)(*p - '0'));
-        p++;
-      }
-      while (wuffs_base__private_implementation__is_decimal_digit(*p)) {
-        if (exp_num > 0x1000000) {
-          goto fallback;
-        }
-        exp_num = (10 * exp_num) + ((uint8_t)(*p - '0'));
-        p++;
-      }
-      exp10 += exp_sign * exp_num;
-    }
-
-    // The Wuffs API is that the original slice has no trailing data. It also
-    // allows underscores, which we don't catch here but the fallback should.
-    if (p != &z[s.len]) {
-      goto fallback;
-    }
-
-    // Check that the uint64_t typed man variable has not overflowed, based on
-    // digit_count.
-    //
-    // For reference:
-    //   - (1 << 63) is  9223372036854775808, which has 19 decimal digits.
-    //   - (1 << 64) is 18446744073709551616, which has 20 decimal digits.
-    //   - 19 nines,  9999999999999999999, is  0x8AC7230489E7FFFF, which has 64
-    //     bits and 16 hexadecimal digits.
-    //   - 20 nines, 99999999999999999999, is 0x56BC75E2D630FFFFF, which has 67
-    //     bits and 17 hexadecimal digits.
-    if (digit_count > 19) {
-      // Even if we have more than 19 pseudo-digits, it's not yet definitely an
-      // overflow. Recall that digit_count might be off-by-one (too large) if
-      // there's a decimal separator. It will also over-report the number of
-      // meaningful digits if the input looks something like "0.000dddExxx".
-      //
-      // We adjust by the number of leading '0's and '.'s and re-compare to 19.
-      // Once again, technically, we could skip ','s too, but that perturbs the
-      // "script/process-json-numbers.c with -p" benchmark.
-      const uint8_t* q = start_of_digits_ptr;
-      for (; (*q == '0') || (*q == '.'); q++) {
-      }
-      digit_count -= (uint32_t)(q - start_of_digits_ptr);
-      if (digit_count > 19) {
-        goto fallback;
-      }
-    }
-
-    // The wuffs_base__private_implementation__parse_number_f64_eisel_lemire
-    // preconditions include that exp10 is in the range [-307 ..= 288].
-    if ((exp10 < -307) || (288 < exp10)) {
-      goto fallback;
-    }
-
-    // If both man and (10 ** exp10) are exactly representable by a double, we
-    // don't need to run the Eisel-Lemire algorithm.
-    if ((-22 <= exp10) && (exp10 <= 22) && ((man >> 53) == 0)) {
-      double d = (double)man;
-      if (exp10 >= 0) {
-        d *= wuffs_base__private_implementation__f64_powers_of_10[+exp10];
-      } else {
-        d /= wuffs_base__private_implementation__f64_powers_of_10[-exp10];
-      }
-      wuffs_base__result_f64 ret;
-      ret.status.repr = NULL;
-      ret.value = negative ? -d : +d;
-      return ret;
-    }
-
-    // The wuffs_base__private_implementation__parse_number_f64_eisel_lemire
-    // preconditions include that man is non-zero. Parsing "0" should be caught
-    // by the "If both man and (10 ** exp10)" above, but "0e99" might not.
-    if (man == 0) {
-      goto fallback;
-    }
-
-    // Our man and exp10 are in range. Run the Eisel-Lemire algorithm.
-    int64_t r =
-        wuffs_base__private_implementation__parse_number_f64_eisel_lemire(
-            man, exp10);
-    if (r < 0) {
-      goto fallback;
-    }
-    wuffs_base__result_f64 ret;
-    ret.status.repr = NULL;
-    ret.value = wuffs_base__ieee_754_bit_representation__from_u64_to_f64(
-        ((uint64_t)r) | (((uint64_t)negative) << 63));
-    return ret;
-  } while (0);
-
-fallback:
-  do {
-    wuffs_base__private_implementation__high_prec_dec h;
-    wuffs_base__status status =
-        wuffs_base__private_implementation__high_prec_dec__parse(&h, s,
-                                                                 options);
-    if (status.repr) {
-      return wuffs_base__private_implementation__parse_number_f64_special(
-          s, options);
-    }
-    return wuffs_base__private_implementation__high_prec_dec__to_f64(&h,
-                                                                     options);
-  } while (0);
-}
-
-// --------
-
-static inline size_t  //
-wuffs_base__private_implementation__render_inf(wuffs_base__slice_u8 dst,
-                                               bool neg,
-                                               uint32_t options) {
-  if (neg) {
-    if (dst.len < 4) {
-      return 0;
-    }
-    wuffs_base__poke_u32le__no_bounds_check(dst.ptr, 0x666E492D);  // '-Inf'le.
-    return 4;
-  }
-
-  if (options & WUFFS_BASE__RENDER_NUMBER_XXX__LEADING_PLUS_SIGN) {
-    if (dst.len < 4) {
-      return 0;
-    }
-    wuffs_base__poke_u32le__no_bounds_check(dst.ptr, 0x666E492B);  // '+Inf'le.
-    return 4;
-  }
-
-  if (dst.len < 3) {
-    return 0;
-  }
-  wuffs_base__poke_u24le__no_bounds_check(dst.ptr, 0x666E49);  // 'Inf'le.
-  return 3;
-}
-
-static inline size_t  //
-wuffs_base__private_implementation__render_nan(wuffs_base__slice_u8 dst) {
-  if (dst.len < 3) {
-    return 0;
-  }
-  wuffs_base__poke_u24le__no_bounds_check(dst.ptr, 0x4E614E);  // 'NaN'le.
-  return 3;
-}
-
-static size_t  //
-wuffs_base__private_implementation__high_prec_dec__render_exponent_absent(
-    wuffs_base__slice_u8 dst,
-    wuffs_base__private_implementation__high_prec_dec* h,
-    uint32_t precision,
-    uint32_t options) {
-  size_t n = (h->negative ||
-              (options & WUFFS_BASE__RENDER_NUMBER_XXX__LEADING_PLUS_SIGN))
-                 ? 1
-                 : 0;
-  if (h->decimal_point <= 0) {
-    n += 1;
-  } else {
-    n += (size_t)(h->decimal_point);
-  }
-  if (precision > 0) {
-    n += precision + 1;  // +1 for the '.'.
-  }
-
-  // Don't modify dst if the formatted number won't fit.
-  if (n > dst.len) {
-    return 0;
-  }
-
-  // Align-left or align-right.
-  uint8_t* ptr = (options & WUFFS_BASE__RENDER_NUMBER_XXX__ALIGN_RIGHT)
-                     ? &dst.ptr[dst.len - n]
-                     : &dst.ptr[0];
-
-  // Leading "±".
-  if (h->negative) {
-    *ptr++ = '-';
-  } else if (options & WUFFS_BASE__RENDER_NUMBER_XXX__LEADING_PLUS_SIGN) {
-    *ptr++ = '+';
-  }
-
-  // Integral digits.
-  if (h->decimal_point <= 0) {
-    *ptr++ = '0';
-  } else {
-    uint32_t m =
-        wuffs_base__u32__min(h->num_digits, (uint32_t)(h->decimal_point));
-    uint32_t i = 0;
-    for (; i < m; i++) {
-      *ptr++ = (uint8_t)('0' | h->digits[i]);
-    }
-    for (; i < (uint32_t)(h->decimal_point); i++) {
-      *ptr++ = '0';
-    }
-  }
-
-  // Separator and then fractional digits.
-  if (precision > 0) {
-    *ptr++ =
-        (options & WUFFS_BASE__RENDER_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA)
-            ? ','
-            : '.';
-    uint32_t i = 0;
-    for (; i < precision; i++) {
-      uint32_t j = ((uint32_t)(h->decimal_point)) + i;
-      *ptr++ = (uint8_t)('0' | ((j < h->num_digits) ? h->digits[j] : 0));
-    }
-  }
-
-  return n;
-}
-
-static size_t  //
-wuffs_base__private_implementation__high_prec_dec__render_exponent_present(
-    wuffs_base__slice_u8 dst,
-    wuffs_base__private_implementation__high_prec_dec* h,
-    uint32_t precision,
-    uint32_t options) {
-  int32_t exp = 0;
-  if (h->num_digits > 0) {
-    exp = h->decimal_point - 1;
-  }
-  bool negative_exp = exp < 0;
-  if (negative_exp) {
-    exp = -exp;
-  }
-
-  size_t n = (h->negative ||
-              (options & WUFFS_BASE__RENDER_NUMBER_XXX__LEADING_PLUS_SIGN))
-                 ? 4
-                 : 3;  // Mininum 3 bytes: first digit and then "e±".
-  if (precision > 0) {
-    n += precision + 1;  // +1 for the '.'.
-  }
-  n += (exp < 100) ? 2 : 3;
-
-  // Don't modify dst if the formatted number won't fit.
-  if (n > dst.len) {
-    return 0;
-  }
-
-  // Align-left or align-right.
-  uint8_t* ptr = (options & WUFFS_BASE__RENDER_NUMBER_XXX__ALIGN_RIGHT)
-                     ? &dst.ptr[dst.len - n]
-                     : &dst.ptr[0];
-
-  // Leading "±".
-  if (h->negative) {
-    *ptr++ = '-';
-  } else if (options & WUFFS_BASE__RENDER_NUMBER_XXX__LEADING_PLUS_SIGN) {
-    *ptr++ = '+';
-  }
-
-  // Integral digit.
-  if (h->num_digits > 0) {
-    *ptr++ = (uint8_t)('0' | h->digits[0]);
-  } else {
-    *ptr++ = '0';
-  }
-
-  // Separator and then fractional digits.
-  if (precision > 0) {
-    *ptr++ =
-        (options & WUFFS_BASE__RENDER_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA)
-            ? ','
-            : '.';
-    uint32_t i = 1;
-    uint32_t j = wuffs_base__u32__min(h->num_digits, precision + 1);
-    for (; i < j; i++) {
-      *ptr++ = (uint8_t)('0' | h->digits[i]);
-    }
-    for (; i <= precision; i++) {
-      *ptr++ = '0';
-    }
-  }
-
-  // Exponent: "e±" and then 2 or 3 digits.
-  *ptr++ = 'e';
-  *ptr++ = negative_exp ? '-' : '+';
-  if (exp < 10) {
-    *ptr++ = '0';
-    *ptr++ = (uint8_t)('0' | exp);
-  } else if (exp < 100) {
-    *ptr++ = (uint8_t)('0' | (exp / 10));
-    *ptr++ = (uint8_t)('0' | (exp % 10));
-  } else {
-    int32_t e = exp / 100;
-    exp -= e * 100;
-    *ptr++ = (uint8_t)('0' | e);
-    *ptr++ = (uint8_t)('0' | (exp / 10));
-    *ptr++ = (uint8_t)('0' | (exp % 10));
-  }
-
-  return n;
-}
-
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__render_number_f64(wuffs_base__slice_u8 dst,
-                              double x,
-                              uint32_t precision,
-                              uint32_t options) {
-  // Decompose x (64 bits) into negativity (1 bit), base-2 exponent (11 bits
-  // with a -1023 bias) and mantissa (52 bits).
-  uint64_t bits = wuffs_base__ieee_754_bit_representation__from_f64_to_u64(x);
-  bool neg = (bits >> 63) != 0;
-  int32_t exp2 = ((int32_t)(bits >> 52)) & 0x7FF;
-  uint64_t man = bits & 0x000FFFFFFFFFFFFFul;
-
-  // Apply the exponent bias and set the implicit top bit of the mantissa,
-  // unless x is subnormal. Also take care of Inf and NaN.
-  if (exp2 == 0x7FF) {
-    if (man != 0) {
-      return wuffs_base__private_implementation__render_nan(dst);
-    }
-    return wuffs_base__private_implementation__render_inf(dst, neg, options);
-  } else if (exp2 == 0) {
-    exp2 = -1022;
-  } else {
-    exp2 -= 1023;
-    man |= 0x0010000000000000ul;
-  }
-
-  // Ensure that precision isn't too large.
-  if (precision > 4095) {
-    precision = 4095;
-  }
-
-  // Convert from the (neg, exp2, man) tuple to an HPD.
-  wuffs_base__private_implementation__high_prec_dec h;
-  wuffs_base__private_implementation__high_prec_dec__assign(&h, man, neg);
-  if (h.num_digits > 0) {
-    wuffs_base__private_implementation__high_prec_dec__lshift(
-        &h, exp2 - 52);  // 52 mantissa bits.
-  }
-
-  // Handle the "%e" and "%f" formats.
-  switch (options & (WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_ABSENT |
-                     WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_PRESENT)) {
-    case WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_ABSENT:  // The "%"f" format.
-      if (options & WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION) {
-        wuffs_base__private_implementation__high_prec_dec__round_just_enough(
-            &h, exp2, man);
-        int32_t p = ((int32_t)(h.num_digits)) - h.decimal_point;
-        precision = ((uint32_t)(wuffs_base__i32__max(0, p)));
-      } else {
-        wuffs_base__private_implementation__high_prec_dec__round_nearest(
-            &h, ((int32_t)precision) + h.decimal_point);
-      }
-      return wuffs_base__private_implementation__high_prec_dec__render_exponent_absent(
-          dst, &h, precision, options);
-
-    case WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_PRESENT:  // The "%e" format.
-      if (options & WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION) {
-        wuffs_base__private_implementation__high_prec_dec__round_just_enough(
-            &h, exp2, man);
-        precision = (h.num_digits > 0) ? (h.num_digits - 1) : 0;
-      } else {
-        wuffs_base__private_implementation__high_prec_dec__round_nearest(
-            &h, ((int32_t)precision) + 1);
-      }
-      return wuffs_base__private_implementation__high_prec_dec__render_exponent_present(
-          dst, &h, precision, options);
-  }
-
-  // We have the "%g" format and so precision means the number of significant
-  // digits, not the number of digits after the decimal separator. Perform
-  // rounding and determine whether to use "%e" or "%f".
-  int32_t e_threshold = 0;
-  if (options & WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION) {
-    wuffs_base__private_implementation__high_prec_dec__round_just_enough(
-        &h, exp2, man);
-    precision = h.num_digits;
-    e_threshold = 6;
-  } else {
-    if (precision == 0) {
-      precision = 1;
-    }
-    wuffs_base__private_implementation__high_prec_dec__round_nearest(
-        &h, ((int32_t)precision));
-    e_threshold = ((int32_t)precision);
-    int32_t nd = ((int32_t)(h.num_digits));
-    if ((e_threshold > nd) && (nd >= h.decimal_point)) {
-      e_threshold = nd;
-    }
-  }
-
-  // Use the "%e" format if the exponent is large.
-  int32_t e = h.decimal_point - 1;
-  if ((e < -4) || (e_threshold <= e)) {
-    uint32_t p = wuffs_base__u32__min(precision, h.num_digits);
-    return wuffs_base__private_implementation__high_prec_dec__render_exponent_present(
-        dst, &h, (p > 0) ? (p - 1) : 0, options);
-  }
-
-  // Use the "%f" format otherwise.
-  int32_t p = ((int32_t)precision);
-  if (p > h.decimal_point) {
-    p = ((int32_t)(h.num_digits));
-  }
-  precision = ((uint32_t)(wuffs_base__i32__max(0, p - h.decimal_point)));
-  return wuffs_base__private_implementation__high_prec_dec__render_exponent_absent(
-      dst, &h, precision, options);
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE__FLOATCONV)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) || \
-    defined(WUFFS_CONFIG__MODULE__BASE__INTCONV)
-
-// ---------------- Integer
-
-// wuffs_base__parse_number__foo_digits entries are 0x00 for invalid digits,
-// and (0x80 | v) for valid digits, where v is the 4 bit value.
-
-static const uint8_t wuffs_base__parse_number__decimal_digits[256] = {
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x00 ..= 0x07.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x08 ..= 0x0F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x10 ..= 0x17.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x18 ..= 0x1F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x20 ..= 0x27.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x28 ..= 0x2F.
-    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,  // 0x30 ..= 0x37. '0'-'7'.
-    0x88, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x38 ..= 0x3F. '8'-'9'.
-
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x40 ..= 0x47.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x48 ..= 0x4F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x50 ..= 0x57.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x58 ..= 0x5F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x60 ..= 0x67.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x68 ..= 0x6F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x70 ..= 0x77.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x78 ..= 0x7F.
-
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x80 ..= 0x87.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x88 ..= 0x8F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x90 ..= 0x97.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x98 ..= 0x9F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xA0 ..= 0xA7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xA8 ..= 0xAF.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xB0 ..= 0xB7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xB8 ..= 0xBF.
-
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xC0 ..= 0xC7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xC8 ..= 0xCF.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xD0 ..= 0xD7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xD8 ..= 0xDF.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xE0 ..= 0xE7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xE8 ..= 0xEF.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xF0 ..= 0xF7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xF8 ..= 0xFF.
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-};
-
-static const uint8_t wuffs_base__parse_number__hexadecimal_digits[256] = {
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x00 ..= 0x07.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x08 ..= 0x0F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x10 ..= 0x17.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x18 ..= 0x1F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x20 ..= 0x27.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x28 ..= 0x2F.
-    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,  // 0x30 ..= 0x37. '0'-'7'.
-    0x88, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x38 ..= 0x3F. '8'-'9'.
-
-    0x00, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x00,  // 0x40 ..= 0x47. 'A'-'F'.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x48 ..= 0x4F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x50 ..= 0x57.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x58 ..= 0x5F.
-    0x00, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x00,  // 0x60 ..= 0x67. 'a'-'f'.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x68 ..= 0x6F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x70 ..= 0x77.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x78 ..= 0x7F.
-
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x80 ..= 0x87.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x88 ..= 0x8F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x90 ..= 0x97.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x98 ..= 0x9F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xA0 ..= 0xA7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xA8 ..= 0xAF.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xB0 ..= 0xB7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xB8 ..= 0xBF.
-
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xC0 ..= 0xC7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xC8 ..= 0xCF.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xD0 ..= 0xD7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xD8 ..= 0xDF.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xE0 ..= 0xE7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xE8 ..= 0xEF.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xF0 ..= 0xF7.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0xF8 ..= 0xFF.
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-};
-
-static const uint8_t wuffs_base__private_implementation__encode_base16[16] = {
-    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,  // 0x00 ..= 0x07.
-    0x38, 0x39, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46,  // 0x08 ..= 0x0F.
-};
-
-// --------
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__result_i64  //
-wuffs_base__parse_number_i64(wuffs_base__slice_u8 s, uint32_t options) {
-  uint8_t* p = s.ptr;
-  uint8_t* q = s.ptr + s.len;
-
-  if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
-    for (; (p < q) && (*p == '_'); p++) {
-    }
-  }
-
-  bool negative = false;
-  if (p >= q) {
-    goto fail_bad_argument;
-  } else if (*p == '-') {
-    p++;
-    negative = true;
-  } else if (*p == '+') {
-    p++;
-  }
-
-  do {
-    wuffs_base__result_u64 r = wuffs_base__parse_number_u64(
-        wuffs_base__make_slice_u8(p, (size_t)(q - p)), options);
-    if (r.status.repr != NULL) {
-      wuffs_base__result_i64 ret;
-      ret.status.repr = r.status.repr;
-      ret.value = 0;
-      return ret;
-    } else if (negative) {
-      if (r.value < 0x8000000000000000) {
-        wuffs_base__result_i64 ret;
-        ret.status.repr = NULL;
-        ret.value = -(int64_t)(r.value);
-        return ret;
-      } else if (r.value == 0x8000000000000000) {
-        wuffs_base__result_i64 ret;
-        ret.status.repr = NULL;
-        ret.value = INT64_MIN;
-        return ret;
-      }
-      goto fail_out_of_bounds;
-    } else if (r.value > 0x7FFFFFFFFFFFFFFF) {
-      goto fail_out_of_bounds;
-    } else {
-      wuffs_base__result_i64 ret;
-      ret.status.repr = NULL;
-      ret.value = +(int64_t)(r.value);
-      return ret;
-    }
-  } while (0);
-
-fail_bad_argument:
-  do {
-    wuffs_base__result_i64 ret;
-    ret.status.repr = wuffs_base__error__bad_argument;
-    ret.value = 0;
-    return ret;
-  } while (0);
-
-fail_out_of_bounds:
-  do {
-    wuffs_base__result_i64 ret;
-    ret.status.repr = wuffs_base__error__out_of_bounds;
-    ret.value = 0;
-    return ret;
-  } while (0);
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__result_u64  //
-wuffs_base__parse_number_u64(wuffs_base__slice_u8 s, uint32_t options) {
-  uint8_t* p = s.ptr;
-  uint8_t* q = s.ptr + s.len;
-
-  if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
-    for (; (p < q) && (*p == '_'); p++) {
-    }
-  }
-
-  if (p >= q) {
-    goto fail_bad_argument;
-
-  } else if (*p == '0') {
-    p++;
-    if (p >= q) {
-      goto ok_zero;
-    }
-    if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
-      if (*p == '_') {
-        p++;
-        for (; p < q; p++) {
-          if (*p != '_') {
-            if (options &
-                WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_MULTIPLE_LEADING_ZEROES) {
-              goto decimal;
-            }
-            goto fail_bad_argument;
-          }
-        }
-        goto ok_zero;
-      }
-    }
-
-    if ((*p == 'x') || (*p == 'X')) {
-      p++;
-      if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
-        for (; (p < q) && (*p == '_'); p++) {
-        }
-      }
-      if (p < q) {
-        goto hexadecimal;
-      }
-
-    } else if ((*p == 'd') || (*p == 'D')) {
-      p++;
-      if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES) {
-        for (; (p < q) && (*p == '_'); p++) {
-        }
-      }
-      if (p < q) {
-        goto decimal;
-      }
-    }
-
-    if (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_MULTIPLE_LEADING_ZEROES) {
-      goto decimal;
-    }
-    goto fail_bad_argument;
-  }
-
-decimal:
-  do {
-    uint64_t v = wuffs_base__parse_number__decimal_digits[*p++];
-    if (v == 0) {
-      goto fail_bad_argument;
-    }
-    v &= 0x0F;
-
-    // UINT64_MAX is 18446744073709551615, which is ((10 * max10) + max1).
-    const uint64_t max10 = 1844674407370955161u;
-    const uint8_t max1 = 5;
-
-    for (; p < q; p++) {
-      if ((*p == '_') &&
-          (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
-        continue;
-      }
-      uint8_t digit = wuffs_base__parse_number__decimal_digits[*p];
-      if (digit == 0) {
-        goto fail_bad_argument;
-      }
-      digit &= 0x0F;
-      if ((v > max10) || ((v == max10) && (digit > max1))) {
-        goto fail_out_of_bounds;
-      }
-      v = (10 * v) + ((uint64_t)(digit));
-    }
-
-    wuffs_base__result_u64 ret;
-    ret.status.repr = NULL;
-    ret.value = v;
-    return ret;
-  } while (0);
-
-hexadecimal:
-  do {
-    uint64_t v = wuffs_base__parse_number__hexadecimal_digits[*p++];
-    if (v == 0) {
-      goto fail_bad_argument;
-    }
-    v &= 0x0F;
-
-    for (; p < q; p++) {
-      if ((*p == '_') &&
-          (options & WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES)) {
-        continue;
-      }
-      uint8_t digit = wuffs_base__parse_number__hexadecimal_digits[*p];
-      if (digit == 0) {
-        goto fail_bad_argument;
-      }
-      digit &= 0x0F;
-      if ((v >> 60) != 0) {
-        goto fail_out_of_bounds;
-      }
-      v = (v << 4) | ((uint64_t)(digit));
-    }
-
-    wuffs_base__result_u64 ret;
-    ret.status.repr = NULL;
-    ret.value = v;
-    return ret;
-  } while (0);
-
-ok_zero:
-  do {
-    wuffs_base__result_u64 ret;
-    ret.status.repr = NULL;
-    ret.value = 0;
-    return ret;
-  } while (0);
-
-fail_bad_argument:
-  do {
-    wuffs_base__result_u64 ret;
-    ret.status.repr = wuffs_base__error__bad_argument;
-    ret.value = 0;
-    return ret;
-  } while (0);
-
-fail_out_of_bounds:
-  do {
-    wuffs_base__result_u64 ret;
-    ret.status.repr = wuffs_base__error__out_of_bounds;
-    ret.value = 0;
-    return ret;
-  } while (0);
-}
-
-// --------
-
-// wuffs_base__render_number__first_hundred contains the decimal encodings of
-// the first one hundred numbers [0 ..= 99].
-static const uint8_t wuffs_base__render_number__first_hundred[200] = {
-    '0', '0', '0', '1', '0', '2', '0', '3', '0', '4',  //
-    '0', '5', '0', '6', '0', '7', '0', '8', '0', '9',  //
-    '1', '0', '1', '1', '1', '2', '1', '3', '1', '4',  //
-    '1', '5', '1', '6', '1', '7', '1', '8', '1', '9',  //
-    '2', '0', '2', '1', '2', '2', '2', '3', '2', '4',  //
-    '2', '5', '2', '6', '2', '7', '2', '8', '2', '9',  //
-    '3', '0', '3', '1', '3', '2', '3', '3', '3', '4',  //
-    '3', '5', '3', '6', '3', '7', '3', '8', '3', '9',  //
-    '4', '0', '4', '1', '4', '2', '4', '3', '4', '4',  //
-    '4', '5', '4', '6', '4', '7', '4', '8', '4', '9',  //
-    '5', '0', '5', '1', '5', '2', '5', '3', '5', '4',  //
-    '5', '5', '5', '6', '5', '7', '5', '8', '5', '9',  //
-    '6', '0', '6', '1', '6', '2', '6', '3', '6', '4',  //
-    '6', '5', '6', '6', '6', '7', '6', '8', '6', '9',  //
-    '7', '0', '7', '1', '7', '2', '7', '3', '7', '4',  //
-    '7', '5', '7', '6', '7', '7', '7', '8', '7', '9',  //
-    '8', '0', '8', '1', '8', '2', '8', '3', '8', '4',  //
-    '8', '5', '8', '6', '8', '7', '8', '8', '8', '9',  //
-    '9', '0', '9', '1', '9', '2', '9', '3', '9', '4',  //
-    '9', '5', '9', '6', '9', '7', '9', '8', '9', '9',  //
-};
-
-static size_t  //
-wuffs_base__private_implementation__render_number_u64(wuffs_base__slice_u8 dst,
-                                                      uint64_t x,
-                                                      uint32_t options,
-                                                      bool neg) {
-  uint8_t buf[WUFFS_BASE__U64__BYTE_LENGTH__MAX_INCL];
-  uint8_t* ptr = &buf[0] + sizeof(buf);
-
-  while (x >= 100) {
-    size_t index = ((size_t)((x % 100) * 2));
-    x /= 100;
-    uint8_t s0 = wuffs_base__render_number__first_hundred[index + 0];
-    uint8_t s1 = wuffs_base__render_number__first_hundred[index + 1];
-    ptr -= 2;
-    ptr[0] = s0;
-    ptr[1] = s1;
-  }
-
-  if (x < 10) {
-    ptr -= 1;
-    ptr[0] = (uint8_t)('0' + x);
-  } else {
-    size_t index = ((size_t)(x * 2));
-    uint8_t s0 = wuffs_base__render_number__first_hundred[index + 0];
-    uint8_t s1 = wuffs_base__render_number__first_hundred[index + 1];
-    ptr -= 2;
-    ptr[0] = s0;
-    ptr[1] = s1;
-  }
-
-  if (neg) {
-    ptr -= 1;
-    ptr[0] = '-';
-  } else if (options & WUFFS_BASE__RENDER_NUMBER_XXX__LEADING_PLUS_SIGN) {
-    ptr -= 1;
-    ptr[0] = '+';
-  }
-
-  size_t n = sizeof(buf) - ((size_t)(ptr - &buf[0]));
-  if (n > dst.len) {
-    return 0;
-  }
-  memcpy(dst.ptr + ((options & WUFFS_BASE__RENDER_NUMBER_XXX__ALIGN_RIGHT)
-                        ? (dst.len - n)
-                        : 0),
-         ptr, n);
-  return n;
-}
-
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__render_number_i64(wuffs_base__slice_u8 dst,
-                              int64_t x,
-                              uint32_t options) {
-  uint64_t u = (uint64_t)x;
-  bool neg = x < 0;
-  if (neg) {
-    u = 1 + ~u;
-  }
-  return wuffs_base__private_implementation__render_number_u64(dst, u, options,
-                                                               neg);
-}
-
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__render_number_u64(wuffs_base__slice_u8 dst,
-                              uint64_t x,
-                              uint32_t options) {
-  return wuffs_base__private_implementation__render_number_u64(dst, x, options,
-                                                               false);
-}
-
-// ---------------- Base-16
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_16__decode2(wuffs_base__slice_u8 dst,
-                             wuffs_base__slice_u8 src,
-                             bool src_closed,
-                             uint32_t options) {
-  wuffs_base__transform__output o;
-  size_t src_len2 = src.len / 2;
-  size_t len;
-  if (dst.len < src_len2) {
-    len = dst.len;
-    o.status.repr = wuffs_base__suspension__short_write;
-  } else {
-    len = src_len2;
-    if (!src_closed) {
-      o.status.repr = wuffs_base__suspension__short_read;
-    } else if (src.len & 1) {
-      o.status.repr = wuffs_base__error__bad_data;
-    } else {
-      o.status.repr = NULL;
-    }
-  }
-
-  uint8_t* d = dst.ptr;
-  uint8_t* s = src.ptr;
-  size_t n = len;
-
-  while (n--) {
-    *d = (uint8_t)((wuffs_base__parse_number__hexadecimal_digits[s[0]] << 4) |
-                   (wuffs_base__parse_number__hexadecimal_digits[s[1]] & 0x0F));
-    d += 1;
-    s += 2;
-  }
-
-  o.num_dst = len;
-  o.num_src = len * 2;
-  return o;
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_16__decode4(wuffs_base__slice_u8 dst,
-                             wuffs_base__slice_u8 src,
-                             bool src_closed,
-                             uint32_t options) {
-  wuffs_base__transform__output o;
-  size_t src_len4 = src.len / 4;
-  size_t len = dst.len < src_len4 ? dst.len : src_len4;
-  if (dst.len < src_len4) {
-    len = dst.len;
-    o.status.repr = wuffs_base__suspension__short_write;
-  } else {
-    len = src_len4;
-    if (!src_closed) {
-      o.status.repr = wuffs_base__suspension__short_read;
-    } else if (src.len & 1) {
-      o.status.repr = wuffs_base__error__bad_data;
-    } else {
-      o.status.repr = NULL;
-    }
-  }
-
-  uint8_t* d = dst.ptr;
-  uint8_t* s = src.ptr;
-  size_t n = len;
-
-  while (n--) {
-    *d = (uint8_t)((wuffs_base__parse_number__hexadecimal_digits[s[2]] << 4) |
-                   (wuffs_base__parse_number__hexadecimal_digits[s[3]] & 0x0F));
-    d += 1;
-    s += 4;
-  }
-
-  o.num_dst = len;
-  o.num_src = len * 4;
-  return o;
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_16__encode2(wuffs_base__slice_u8 dst,
-                             wuffs_base__slice_u8 src,
-                             bool src_closed,
-                             uint32_t options) {
-  wuffs_base__transform__output o;
-  size_t dst_len2 = dst.len / 2;
-  size_t len;
-  if (dst_len2 < src.len) {
-    len = dst_len2;
-    o.status.repr = wuffs_base__suspension__short_write;
-  } else {
-    len = src.len;
-    if (!src_closed) {
-      o.status.repr = wuffs_base__suspension__short_read;
-    } else {
-      o.status.repr = NULL;
-    }
-  }
-
-  uint8_t* d = dst.ptr;
-  uint8_t* s = src.ptr;
-  size_t n = len;
-
-  while (n--) {
-    uint8_t c = *s;
-    d[0] = wuffs_base__private_implementation__encode_base16[c >> 4];
-    d[1] = wuffs_base__private_implementation__encode_base16[c & 0x0F];
-    d += 2;
-    s += 1;
-  }
-
-  o.num_dst = len * 2;
-  o.num_src = len;
-  return o;
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_16__encode4(wuffs_base__slice_u8 dst,
-                             wuffs_base__slice_u8 src,
-                             bool src_closed,
-                             uint32_t options) {
-  wuffs_base__transform__output o;
-  size_t dst_len4 = dst.len / 4;
-  size_t len;
-  if (dst_len4 < src.len) {
-    len = dst_len4;
-    o.status.repr = wuffs_base__suspension__short_write;
-  } else {
-    len = src.len;
-    if (!src_closed) {
-      o.status.repr = wuffs_base__suspension__short_read;
-    } else {
-      o.status.repr = NULL;
-    }
-  }
-
-  uint8_t* d = dst.ptr;
-  uint8_t* s = src.ptr;
-  size_t n = len;
-
-  while (n--) {
-    uint8_t c = *s;
-    d[0] = '\\';
-    d[1] = 'x';
-    d[2] = wuffs_base__private_implementation__encode_base16[c >> 4];
-    d[3] = wuffs_base__private_implementation__encode_base16[c & 0x0F];
-    d += 4;
-    s += 1;
-  }
-
-  o.num_dst = len * 4;
-  o.num_src = len;
-  return o;
-}
-
-// ---------------- Base-64
-
-// The two base-64 alphabets, std and url, differ only in the last two codes.
-//  - std: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-//  - url: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
-
-static const uint8_t wuffs_base__base_64__decode_std[256] = {
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x00 ..= 0x07.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x08 ..= 0x0F.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x10 ..= 0x17.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x18 ..= 0x1F.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x20 ..= 0x27.
-    0x80, 0x80, 0x80, 0x3E, 0x80, 0x80, 0x80, 0x3F,  // 0x28 ..= 0x2F.
-    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,  // 0x30 ..= 0x37.
-    0x3C, 0x3D, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x38 ..= 0x3F.
-
-    0x80, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // 0x40 ..= 0x47.
-    0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,  // 0x48 ..= 0x4F.
-    0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,  // 0x50 ..= 0x57.
-    0x17, 0x18, 0x19, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x58 ..= 0x5F.
-    0x80, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,  // 0x60 ..= 0x67.
-    0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,  // 0x68 ..= 0x6F.
-    0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30,  // 0x70 ..= 0x77.
-    0x31, 0x32, 0x33, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x78 ..= 0x7F.
-
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x80 ..= 0x87.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x88 ..= 0x8F.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x90 ..= 0x97.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x98 ..= 0x9F.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xA0 ..= 0xA7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xA8 ..= 0xAF.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xB0 ..= 0xB7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xB8 ..= 0xBF.
-
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xC0 ..= 0xC7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xC8 ..= 0xCF.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xD0 ..= 0xD7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xD8 ..= 0xDF.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xE0 ..= 0xE7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xE8 ..= 0xEF.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xF0 ..= 0xF7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xF8 ..= 0xFF.
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-};
-
-static const uint8_t wuffs_base__base_64__decode_url[256] = {
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x00 ..= 0x07.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x08 ..= 0x0F.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x10 ..= 0x17.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x18 ..= 0x1F.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x20 ..= 0x27.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x3E, 0x80, 0x80,  // 0x28 ..= 0x2F.
-    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,  // 0x30 ..= 0x37.
-    0x3C, 0x3D, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x38 ..= 0x3F.
-
-    0x80, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // 0x40 ..= 0x47.
-    0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,  // 0x48 ..= 0x4F.
-    0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,  // 0x50 ..= 0x57.
-    0x17, 0x18, 0x19, 0x80, 0x80, 0x80, 0x80, 0x3F,  // 0x58 ..= 0x5F.
-    0x80, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,  // 0x60 ..= 0x67.
-    0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,  // 0x68 ..= 0x6F.
-    0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30,  // 0x70 ..= 0x77.
-    0x31, 0x32, 0x33, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x78 ..= 0x7F.
-
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x80 ..= 0x87.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x88 ..= 0x8F.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x90 ..= 0x97.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0x98 ..= 0x9F.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xA0 ..= 0xA7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xA8 ..= 0xAF.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xB0 ..= 0xB7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xB8 ..= 0xBF.
-
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xC0 ..= 0xC7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xC8 ..= 0xCF.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xD0 ..= 0xD7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xD8 ..= 0xDF.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xE0 ..= 0xE7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xE8 ..= 0xEF.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xF0 ..= 0xF7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xF8 ..= 0xFF.
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-};
-
-static const uint8_t wuffs_base__base_64__encode_std[64] = {
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,  // 0x00 ..= 0x07.
-    0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,  // 0x08 ..= 0x0F.
-    0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,  // 0x10 ..= 0x17.
-    0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,  // 0x18 ..= 0x1F.
-    0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E,  // 0x20 ..= 0x27.
-    0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76,  // 0x28 ..= 0x2F.
-    0x77, 0x78, 0x79, 0x7A, 0x30, 0x31, 0x32, 0x33,  // 0x30 ..= 0x37.
-    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2B, 0x2F,  // 0x38 ..= 0x3F.
-};
-
-static const uint8_t wuffs_base__base_64__encode_url[64] = {
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,  // 0x00 ..= 0x07.
-    0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,  // 0x08 ..= 0x0F.
-    0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,  // 0x10 ..= 0x17.
-    0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,  // 0x18 ..= 0x1F.
-    0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E,  // 0x20 ..= 0x27.
-    0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76,  // 0x28 ..= 0x2F.
-    0x77, 0x78, 0x79, 0x7A, 0x30, 0x31, 0x32, 0x33,  // 0x30 ..= 0x37.
-    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2D, 0x5F,  // 0x38 ..= 0x3F.
-};
-
-// --------
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_64__decode(wuffs_base__slice_u8 dst,
-                            wuffs_base__slice_u8 src,
-                            bool src_closed,
-                            uint32_t options) {
-  const uint8_t* alphabet = (options & WUFFS_BASE__BASE_64__URL_ALPHABET)
-                                ? wuffs_base__base_64__decode_url
-                                : wuffs_base__base_64__decode_std;
-  wuffs_base__transform__output o;
-  uint8_t* d_ptr = dst.ptr;
-  size_t d_len = dst.len;
-  const uint8_t* s_ptr = src.ptr;
-  size_t s_len = src.len;
-  bool pad = false;
-
-  while (s_len >= 4) {
-    uint32_t s = wuffs_base__peek_u32le__no_bounds_check(s_ptr);
-    uint32_t s0 = alphabet[0xFF & (s >> 0)];
-    uint32_t s1 = alphabet[0xFF & (s >> 8)];
-    uint32_t s2 = alphabet[0xFF & (s >> 16)];
-    uint32_t s3 = alphabet[0xFF & (s >> 24)];
-
-    if (((s0 | s1 | s2 | s3) & 0xC0) != 0) {
-      if (s_len > 4) {
-        o.status.repr = wuffs_base__error__bad_data;
-        goto done;
-      } else if (!src_closed) {
-        o.status.repr = wuffs_base__suspension__short_read;
-        goto done;
-      } else if ((options & WUFFS_BASE__BASE_64__DECODE_ALLOW_PADDING) &&
-                 (s_ptr[3] == '=')) {
-        pad = true;
-        if (s_ptr[2] == '=') {
-          goto src2;
-        }
-        goto src3;
-      }
-      o.status.repr = wuffs_base__error__bad_data;
-      goto done;
-    }
-
-    if (d_len < 3) {
-      o.status.repr = wuffs_base__suspension__short_write;
-      goto done;
-    }
-
-    s_ptr += 4;
-    s_len -= 4;
-    s = (s0 << 18) | (s1 << 12) | (s2 << 6) | (s3 << 0);
-    *d_ptr++ = (uint8_t)(s >> 16);
-    *d_ptr++ = (uint8_t)(s >> 8);
-    *d_ptr++ = (uint8_t)(s >> 0);
-    d_len -= 3;
-  }
-
-  if (!src_closed) {
-    o.status.repr = wuffs_base__suspension__short_read;
-    goto done;
-  }
-
-  if (s_len == 0) {
-    o.status.repr = NULL;
-    goto done;
-  } else if (s_len == 1) {
-    o.status.repr = wuffs_base__error__bad_data;
-    goto done;
-  } else if (s_len == 2) {
-    goto src2;
-  }
-
-src3:
-  do {
-    uint32_t s = wuffs_base__peek_u24le__no_bounds_check(s_ptr);
-    uint32_t s0 = alphabet[0xFF & (s >> 0)];
-    uint32_t s1 = alphabet[0xFF & (s >> 8)];
-    uint32_t s2 = alphabet[0xFF & (s >> 16)];
-    if ((s0 & 0xC0) || (s1 & 0xC0) || (s2 & 0xC3)) {
-      o.status.repr = wuffs_base__error__bad_data;
-      goto done;
-    }
-    if (d_len < 2) {
-      o.status.repr = wuffs_base__suspension__short_write;
-      goto done;
-    }
-    s_ptr += pad ? 4 : 3;
-    s = (s0 << 18) | (s1 << 12) | (s2 << 6);
-    *d_ptr++ = (uint8_t)(s >> 16);
-    *d_ptr++ = (uint8_t)(s >> 8);
-    o.status.repr = NULL;
-    goto done;
-  } while (0);
-
-src2:
-  do {
-    uint32_t s = wuffs_base__peek_u16le__no_bounds_check(s_ptr);
-    uint32_t s0 = alphabet[0xFF & (s >> 0)];
-    uint32_t s1 = alphabet[0xFF & (s >> 8)];
-    if ((s0 & 0xC0) || (s1 & 0xCF)) {
-      o.status.repr = wuffs_base__error__bad_data;
-      goto done;
-    }
-    if (d_len < 1) {
-      o.status.repr = wuffs_base__suspension__short_write;
-      goto done;
-    }
-    s_ptr += pad ? 4 : 2;
-    s = (s0 << 18) | (s1 << 12);
-    *d_ptr++ = (uint8_t)(s >> 16);
-    o.status.repr = NULL;
-    goto done;
-  } while (0);
-
-done:
-  o.num_dst = (size_t)(d_ptr - dst.ptr);
-  o.num_src = (size_t)(s_ptr - src.ptr);
-  return o;
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output  //
-wuffs_base__base_64__encode(wuffs_base__slice_u8 dst,
-                            wuffs_base__slice_u8 src,
-                            bool src_closed,
-                            uint32_t options) {
-  const uint8_t* alphabet = (options & WUFFS_BASE__BASE_64__URL_ALPHABET)
-                                ? wuffs_base__base_64__encode_url
-                                : wuffs_base__base_64__encode_std;
-  wuffs_base__transform__output o;
-  uint8_t* d_ptr = dst.ptr;
-  size_t d_len = dst.len;
-  const uint8_t* s_ptr = src.ptr;
-  size_t s_len = src.len;
-
-  do {
-    while (s_len >= 3) {
-      if (d_len < 4) {
-        o.status.repr = wuffs_base__suspension__short_write;
-        goto done;
-      }
-      uint32_t s = wuffs_base__peek_u24be__no_bounds_check(s_ptr);
-      s_ptr += 3;
-      s_len -= 3;
-      *d_ptr++ = alphabet[0x3F & (s >> 18)];
-      *d_ptr++ = alphabet[0x3F & (s >> 12)];
-      *d_ptr++ = alphabet[0x3F & (s >> 6)];
-      *d_ptr++ = alphabet[0x3F & (s >> 0)];
-      d_len -= 4;
-    }
-
-    if (!src_closed) {
-      o.status.repr = wuffs_base__suspension__short_read;
-      goto done;
-    }
-
-    if (s_len == 2) {
-      if (d_len <
-          ((options & WUFFS_BASE__BASE_64__ENCODE_EMIT_PADDING) ? 4 : 3)) {
-        o.status.repr = wuffs_base__suspension__short_write;
-        goto done;
-      }
-      uint32_t s = ((uint32_t)(wuffs_base__peek_u16be__no_bounds_check(s_ptr)))
-                   << 8;
-      s_ptr += 2;
-      *d_ptr++ = alphabet[0x3F & (s >> 18)];
-      *d_ptr++ = alphabet[0x3F & (s >> 12)];
-      *d_ptr++ = alphabet[0x3F & (s >> 6)];
-      if (options & WUFFS_BASE__BASE_64__ENCODE_EMIT_PADDING) {
-        *d_ptr++ = '=';
-      }
-      o.status.repr = NULL;
-      goto done;
-
-    } else if (s_len == 1) {
-      if (d_len <
-          ((options & WUFFS_BASE__BASE_64__ENCODE_EMIT_PADDING) ? 4 : 2)) {
-        o.status.repr = wuffs_base__suspension__short_write;
-        goto done;
-      }
-      uint32_t s = ((uint32_t)(wuffs_base__peek_u8__no_bounds_check(s_ptr)))
-                   << 16;
-      s_ptr += 1;
-      *d_ptr++ = alphabet[0x3F & (s >> 18)];
-      *d_ptr++ = alphabet[0x3F & (s >> 12)];
-      if (options & WUFFS_BASE__BASE_64__ENCODE_EMIT_PADDING) {
-        *d_ptr++ = '=';
-        *d_ptr++ = '=';
-      }
-      o.status.repr = NULL;
-      goto done;
-
-    } else {
-      o.status.repr = NULL;
-      goto done;
-    }
-  } while (0);
-
-done:
-  o.num_dst = (size_t)(d_ptr - dst.ptr);
-  o.num_src = (size_t)(s_ptr - src.ptr);
-  return o;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE__INTCONV)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) || \
-    defined(WUFFS_CONFIG__MODULE__BASE__MAGIC)
-
-// ---------------- Magic Numbers
-
-// ICO doesn't start with a magic identifier. Instead, see if the opening bytes
-// are plausibly ICO.
-//
-// Callers should have already verified that (prefix_data.len >= 2) and the
-// first two bytes are 0x00.
-//
-// See:
-//  - https://docs.fileformat.com/image/ico/
-static int32_t  //
-wuffs_base__magic_number_guess_fourcc__maybe_ico(
-    wuffs_base__slice_u8 prefix_data,
-    bool prefix_closed) {
-  // Allow-list for the Image Type field.
-  if (prefix_data.len < 4) {
-    return prefix_closed ? 0 : -1;
-  } else if (prefix_data.ptr[3] != 0) {
-    return 0;
-  }
-  switch (prefix_data.ptr[2]) {
-    case 0x01:  // ICO
-    case 0x02:  // CUR
-      break;
-    default:
-      return 0;
-  }
-
-  // The Number Of Images should be positive.
-  if (prefix_data.len < 6) {
-    return prefix_closed ? 0 : -1;
-  } else if ((prefix_data.ptr[4] == 0) && (prefix_data.ptr[5] == 0)) {
-    return 0;
-  }
-
-  // The first ICONDIRENTRY's fourth byte should be zero.
-  if (prefix_data.len < 10) {
-    return prefix_closed ? 0 : -1;
-  } else if (prefix_data.ptr[9] != 0) {
-    return 0;
-  }
-
-  // TODO: have a separate FourCC for CUR?
-  return 0x49434F20;  // 'ICO 'be
-}
-
-// TGA doesn't start with a magic identifier. Instead, see if the opening bytes
-// are plausibly TGA.
-//
-// Callers should have already verified that (prefix_data.len >= 2) and the
-// second byte (prefix_data.ptr[1], the Color Map Type byte), is either 0x00 or
-// 0x01.
-//
-// See:
-//  - https://docs.fileformat.com/image/tga/
-//  - https://www.dca.fee.unicamp.br/~martino/disciplinas/ea978/tgaffs.pdf
-static int32_t  //
-wuffs_base__magic_number_guess_fourcc__maybe_tga(
-    wuffs_base__slice_u8 prefix_data,
-    bool prefix_closed) {
-  // Allow-list for the Image Type field.
-  if (prefix_data.len < 3) {
-    return prefix_closed ? 0 : -1;
-  }
-  switch (prefix_data.ptr[2]) {
-    case 0x01:
-    case 0x02:
-    case 0x03:
-    case 0x09:
-    case 0x0A:
-    case 0x0B:
-      break;
-    default:
-      // TODO: 0x20 and 0x21 are invalid, according to the spec, but are
-      // apparently unofficial extensions.
-      return 0;
-  }
-
-  // Allow-list for the Color Map Entry Size field (if the Color Map Type field
-  // is non-zero) or else all the Color Map fields should be zero.
-  if (prefix_data.len < 8) {
-    return prefix_closed ? 0 : -1;
-  } else if (prefix_data.ptr[1] != 0x00) {
-    switch (prefix_data.ptr[7]) {
-      case 0x0F:
-      case 0x10:
-      case 0x18:
-      case 0x20:
-        break;
-      default:
-        return 0;
-    }
-  } else if ((prefix_data.ptr[3] | prefix_data.ptr[4] | prefix_data.ptr[5] |
-              prefix_data.ptr[6] | prefix_data.ptr[7]) != 0x00) {
-    return 0;
-  }
-
-  // Allow-list for the Pixel Depth field.
-  if (prefix_data.len < 17) {
-    return prefix_closed ? 0 : -1;
-  }
-  switch (prefix_data.ptr[16]) {
-    case 0x01:
-    case 0x08:
-    case 0x0F:
-    case 0x10:
-    case 0x18:
-    case 0x20:
-      break;
-    default:
-      return 0;
-  }
-
-  return 0x54474120;  // 'TGA 'be
-}
-
-WUFFS_BASE__MAYBE_STATIC int32_t  //
-wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix_data,
-                                      bool prefix_closed) {
-  // This is similar to (but different from):
-  //  - the magic/Magdir tables under https://github.com/file/file
-  //  - the MIME Sniffing algorithm at https://mimesniff.spec.whatwg.org/
-
-  // table holds the 'magic numbers' (which are actually variable length
-  // strings). The strings may contain NUL bytes, so the "const char* magic"
-  // value starts with the length-minus-1 of the 'magic number'.
-  //
-  // Keep it sorted by magic[1], then magic[0] descending (prioritizing longer
-  // matches) and finally by magic[2:]. When multiple entries match, the
-  // longest one wins.
-  //
-  // The fourcc field might be negated, in which case there's further
-  // specialization (see § below).
-  static struct {
-    int32_t fourcc;
-    const char* magic;
-  } table[] = {
-      {-0x30302020, "\x01\x00\x00"},          // '00  'be
-      {+0x475A2020, "\x02\x1F\x8B\x08"},      // GZ
-      {+0x5A535444, "\x03\x28\xB5\x2F\xFD"},  // ZSTD
-      {+0x425A3220, "\x02\x42\x5A\x68"},      // BZ2
-      {+0x424D5020, "\x01\x42\x4D"},          // BMP
-      {+0x47494620, "\x03\x47\x49\x46\x38"},  // GIF
-      {+0x54494646, "\x03\x49\x49\x2A\x00"},  // TIFF (little-endian)
-      {+0x54494646, "\x03\x4D\x4D\x00\x2A"},  // TIFF (big-endian)
-      {+0x4E50424D, "\x02\x50\x35\x0A"},      // NPBM (P5; *.pgm)
-      {+0x4E50424D, "\x02\x50\x36\x0A"},      // NPBM (P6; *.ppm)
-      {-0x52494646, "\x03\x52\x49\x46\x46"},  // RIFF
-      {+0x4E494520, "\x02\x6E\xC3\xAF"},      // NIE
-      {+0x514F4920, "\x03\x71\x6F\x69\x66"},  // QOI
-      {+0x5A4C4942, "\x01\x78\x9C"},          // ZLIB
-      {+0x504E4720, "\x03\x89\x50\x4E\x47"},  // PNG
-      {+0x4A504547, "\x01\xFF\xD8"},          // JPEG
-  };
-  static const size_t table_len = sizeof(table) / sizeof(table[0]);
-
-  if (prefix_data.len == 0) {
-    return prefix_closed ? 0 : -1;
-  }
-  uint8_t pre_first_byte = prefix_data.ptr[0];
-
-  int32_t fourcc = 0;
-  size_t i;
-  for (i = 0; i < table_len; i++) {
-    uint8_t mag_first_byte = ((uint8_t)(table[i].magic[1]));
-    if (pre_first_byte < mag_first_byte) {
-      break;
-    } else if (pre_first_byte > mag_first_byte) {
-      continue;
-    }
-    fourcc = table[i].fourcc;
-
-    uint8_t mag_remaining_len = ((uint8_t)(table[i].magic[0]));
-    if (mag_remaining_len == 0) {
-      goto match;
-    }
-
-    const char* mag_remaining_ptr = table[i].magic + 2;
-    uint8_t* pre_remaining_ptr = prefix_data.ptr + 1;
-    size_t pre_remaining_len = prefix_data.len - 1;
-    if (pre_remaining_len < mag_remaining_len) {
-      if (!memcmp(pre_remaining_ptr, mag_remaining_ptr, pre_remaining_len)) {
-        return prefix_closed ? 0 : -1;
-      }
-    } else {
-      if (!memcmp(pre_remaining_ptr, mag_remaining_ptr, mag_remaining_len)) {
-        goto match;
-      }
-    }
-  }
-
-  if (prefix_data.len < 2) {
-    return prefix_closed ? 0 : -1;
-  } else if ((prefix_data.ptr[1] == 0x00) || (prefix_data.ptr[1] == 0x01)) {
-    return wuffs_base__magic_number_guess_fourcc__maybe_tga(prefix_data,
-                                                            prefix_closed);
-  }
-
-  return 0;
-
-match:
-  // Negative FourCC values (see § above) are further specialized.
-  if (fourcc < 0) {
-    fourcc = -fourcc;
-
-    if (fourcc == 0x52494646) {  // 'RIFF'be
-      if (prefix_data.len < 12) {
-        return prefix_closed ? 0 : -1;
-      }
-      uint32_t x = wuffs_base__peek_u32be__no_bounds_check(prefix_data.ptr + 8);
-      if (x == 0x57454250) {  // 'WEBP'be
-        return 0x57454250;    // 'WEBP'be
-      }
-
-    } else if (fourcc == 0x30302020) {  // '00  'be
-      // Binary data starting with multiple 0x00 NUL bytes is quite common.
-      // Unfortunately, some file formats also don't start with a magic
-      // identifier, so we have to use heuristics (where the order matters, the
-      // same as /usr/bin/file's magic/Magdir tables) as best we can. Maybe
-      // it's TGA, ICO/CUR, etc. Maybe it's something else.
-      int32_t tga = wuffs_base__magic_number_guess_fourcc__maybe_tga(
-          prefix_data, prefix_closed);
-      if (tga != 0) {
-        return tga;
-      }
-      int32_t ico = wuffs_base__magic_number_guess_fourcc__maybe_ico(
-          prefix_data, prefix_closed);
-      if (ico != 0) {
-        return ico;
-      }
-      if (prefix_data.len < 4) {
-        return prefix_closed ? 0 : -1;
-      } else if ((prefix_data.ptr[2] != 0x00) &&
-                 ((prefix_data.ptr[2] >= 0x80) ||
-                  (prefix_data.ptr[3] != 0x00))) {
-        // Roughly speaking, this could be a non-degenerate (non-0-width and
-        // non-0-height) WBMP image.
-        return 0x57424D50;  // 'WBMP'be
-      }
-      return 0;
-    }
-  }
-  return fourcc;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE__MAGIC)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) || \
-    defined(WUFFS_CONFIG__MODULE__BASE__PIXCONV)
-
-// ---------------- Pixel Swizzler
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42(uint8_t* dst_ptr,
-                                                 size_t dst_len,
-                                                 uint8_t* dst_palette_ptr,
-                                                 size_t dst_palette_len,
-                                                 const uint8_t* src_ptr,
-                                                 size_t src_len);
-
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-static uint64_t  //
-wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr,
-                                                      size_t dst_len,
-                                                      uint8_t* dst_palette_ptr,
-                                                      size_t dst_palette_len,
-                                                      const uint8_t* src_ptr,
-                                                      size_t src_len);
-
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__y__x86_sse42(uint8_t* dst_ptr,
-                                               size_t dst_len,
-                                               uint8_t* dst_palette_ptr,
-                                               size_t dst_palette_len,
-                                               const uint8_t* src_ptr,
-                                               size_t src_len);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-
-// --------
-
-static inline uint32_t  //
-wuffs_base__swap_u32_argb_abgr(uint32_t u) {
-  uint32_t o = u & 0xFF00FF00ul;
-  uint32_t r = u & 0x00FF0000ul;
-  uint32_t b = u & 0x000000FFul;
-  return o | (r >> 16) | (b << 16);
-}
-
-static inline uint64_t  //
-wuffs_base__swap_u64_argb_abgr(uint64_t u) {
-  uint64_t o = u & 0xFFFF0000FFFF0000ull;
-  uint64_t r = u & 0x0000FFFF00000000ull;
-  uint64_t b = u & 0x000000000000FFFFull;
-  return o | (r >> 32) | (b << 32);
-}
-
-static inline uint32_t  //
-wuffs_base__color_u64__as__color_u32__swap_u32_argb_abgr(uint64_t c) {
-  uint32_t a = ((uint32_t)(0xFF & (c >> 56)));
-  uint32_t r = ((uint32_t)(0xFF & (c >> 40)));
-  uint32_t g = ((uint32_t)(0xFF & (c >> 24)));
-  uint32_t b = ((uint32_t)(0xFF & (c >> 8)));
-  return (a << 24) | (b << 16) | (g << 8) | (r << 0);
-}
-
-// --------
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__color_u32_argb_premul  //
-wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb,
-                                       uint32_t x,
-                                       uint32_t y) {
-  if (!pb || (x >= pb->pixcfg.private_impl.width) ||
-      (y >= pb->pixcfg.private_impl.height)) {
-    return 0;
-  }
-
-  if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) {
-    // TODO: support planar formats.
-    return 0;
-  }
-
-  size_t stride = pb->private_impl.planes[0].stride;
-  const uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y));
-
-  switch (pb->pixcfg.private_impl.pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-      return wuffs_base__peek_u32le__no_bounds_check(row + (4 * ((size_t)x)));
-
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: {
-      uint8_t* palette = pb->private_impl.planes[3].ptr;
-      return wuffs_base__peek_u32le__no_bounds_check(palette +
-                                                     (4 * ((size_t)row[x])));
-    }
-
-      // Common formats above. Rarer formats below.
-
-    case WUFFS_BASE__PIXEL_FORMAT__Y:
-      return 0xFF000000 | (0x00010101 * ((uint32_t)(row[x])));
-    case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
-      return 0xFF000000 | (0x00010101 * ((uint32_t)(row[(2 * x) + 1])));
-    case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
-      return 0xFF000000 | (0x00010101 * ((uint32_t)(row[(2 * x) + 0])));
-
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: {
-      uint8_t* palette = pb->private_impl.planes[3].ptr;
-      return wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
-          wuffs_base__peek_u32le__no_bounds_check(palette +
-                                                  (4 * ((size_t)row[x]))));
-    }
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
-          wuffs_base__peek_u16le__no_bounds_check(row + (2 * ((size_t)x))));
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      return 0xFF000000 |
-             wuffs_base__peek_u24le__no_bounds_check(row + (3 * ((size_t)x)));
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      return wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
-          wuffs_base__peek_u32le__no_bounds_check(row + (4 * ((size_t)x))));
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      return wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
-          wuffs_base__peek_u64le__no_bounds_check(row + (8 * ((size_t)x))));
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      return 0xFF000000 |
-             wuffs_base__peek_u32le__no_bounds_check(row + (4 * ((size_t)x)));
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__swap_u32_argb_abgr(
-          0xFF000000 |
-          wuffs_base__peek_u24le__no_bounds_check(row + (3 * ((size_t)x))));
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      return wuffs_base__swap_u32_argb_abgr(
-          wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
-              wuffs_base__peek_u32le__no_bounds_check(row +
-                                                      (4 * ((size_t)x)))));
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-      return wuffs_base__swap_u32_argb_abgr(
-          wuffs_base__peek_u32le__no_bounds_check(row + (4 * ((size_t)x))));
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__swap_u32_argb_abgr(
-          0xFF000000 |
-          wuffs_base__peek_u32le__no_bounds_check(row + (4 * ((size_t)x))));
-
-    default:
-      // TODO: support more formats.
-      break;
-  }
-
-  return 0;
-}
-
-// --------
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
-wuffs_base__pixel_buffer__set_color_u32_at(
-    wuffs_base__pixel_buffer* pb,
-    uint32_t x,
-    uint32_t y,
-    wuffs_base__color_u32_argb_premul color) {
-  if (!pb) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if ((x >= pb->pixcfg.private_impl.width) ||
-      (y >= pb->pixcfg.private_impl.height)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-
-  if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) {
-    // TODO: support planar formats.
-    return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-
-  size_t stride = pb->private_impl.planes[0].stride;
-  uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y));
-
-  switch (pb->pixcfg.private_impl.pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      wuffs_base__poke_u32le__no_bounds_check(row + (4 * ((size_t)x)), color);
-      break;
-
-      // Common formats above. Rarer formats below.
-
-    case WUFFS_BASE__PIXEL_FORMAT__Y:
-      wuffs_base__poke_u8__no_bounds_check(
-          row + ((size_t)x),
-          wuffs_base__color_u32_argb_premul__as__color_u8_gray(color));
-      break;
-    case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
-      wuffs_base__poke_u16le__no_bounds_check(
-          row + (2 * ((size_t)x)),
-          wuffs_base__color_u32_argb_premul__as__color_u16_gray(color));
-      break;
-    case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
-      wuffs_base__poke_u16be__no_bounds_check(
-          row + (2 * ((size_t)x)),
-          wuffs_base__color_u32_argb_premul__as__color_u16_gray(color));
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:
-      wuffs_base__poke_u8__no_bounds_check(
-          row + ((size_t)x), wuffs_base__pixel_palette__closest_element(
-                                 wuffs_base__pixel_buffer__palette(pb),
-                                 pb->pixcfg.private_impl.pixfmt, color));
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      wuffs_base__poke_u16le__no_bounds_check(
-          row + (2 * ((size_t)x)),
-          wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(color));
-      break;
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      wuffs_base__poke_u24le__no_bounds_check(row + (3 * ((size_t)x)), color);
-      break;
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      wuffs_base__poke_u32le__no_bounds_check(
-          row + (4 * ((size_t)x)),
-          wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-              color));
-      break;
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      wuffs_base__poke_u64le__no_bounds_check(
-          row + (8 * ((size_t)x)),
-          wuffs_base__color_u32_argb_premul__as__color_u64_argb_nonpremul(
-              color));
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      wuffs_base__poke_u24le__no_bounds_check(
-          row + (3 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));
-      break;
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      wuffs_base__poke_u32le__no_bounds_check(
-          row + (4 * ((size_t)x)),
-          wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-              wuffs_base__swap_u32_argb_abgr(color)));
-      break;
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      wuffs_base__poke_u32le__no_bounds_check(
-          row + (4 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));
-      break;
-
-    default:
-      // TODO: support more formats.
-      return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-
-  return wuffs_base__make_status(NULL);
-}
-
-// --------
-
-static inline void  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect__xx(
-    wuffs_base__pixel_buffer* pb,
-    wuffs_base__rect_ie_u32 rect,
-    uint16_t color) {
-  size_t stride = pb->private_impl.planes[0].stride;
-  uint32_t width = wuffs_base__rect_ie_u32__width(&rect);
-  if ((stride == (2 * ((uint64_t)width))) && (rect.min_incl_x == 0)) {
-    uint8_t* ptr =
-        pb->private_impl.planes[0].ptr + (stride * ((size_t)rect.min_incl_y));
-    uint32_t height = wuffs_base__rect_ie_u32__height(&rect);
-    size_t n;
-    for (n = ((size_t)width) * ((size_t)height); n > 0; n--) {
-      wuffs_base__poke_u16le__no_bounds_check(ptr, color);
-      ptr += 2;
-    }
-    return;
-  }
-
-  uint32_t y;
-  for (y = rect.min_incl_y; y < rect.max_excl_y; y++) {
-    uint8_t* ptr = pb->private_impl.planes[0].ptr + (stride * ((size_t)y)) +
-                   (2 * ((size_t)rect.min_incl_x));
-    uint32_t n;
-    for (n = width; n > 0; n--) {
-      wuffs_base__poke_u16le__no_bounds_check(ptr, color);
-      ptr += 2;
-    }
-  }
-}
-
-static inline void  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxx(
-    wuffs_base__pixel_buffer* pb,
-    wuffs_base__rect_ie_u32 rect,
-    uint32_t color) {
-  size_t stride = pb->private_impl.planes[0].stride;
-  uint32_t width = wuffs_base__rect_ie_u32__width(&rect);
-  if ((stride == (3 * ((uint64_t)width))) && (rect.min_incl_x == 0)) {
-    uint8_t* ptr =
-        pb->private_impl.planes[0].ptr + (stride * ((size_t)rect.min_incl_y));
-    uint32_t height = wuffs_base__rect_ie_u32__height(&rect);
-    size_t n;
-    for (n = ((size_t)width) * ((size_t)height); n > 0; n--) {
-      wuffs_base__poke_u24le__no_bounds_check(ptr, color);
-      ptr += 3;
-    }
-    return;
-  }
-
-  uint32_t y;
-  for (y = rect.min_incl_y; y < rect.max_excl_y; y++) {
-    uint8_t* ptr = pb->private_impl.planes[0].ptr + (stride * ((size_t)y)) +
-                   (3 * ((size_t)rect.min_incl_x));
-    uint32_t n;
-    for (n = width; n > 0; n--) {
-      wuffs_base__poke_u24le__no_bounds_check(ptr, color);
-      ptr += 3;
-    }
-  }
-}
-
-static inline void  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(
-    wuffs_base__pixel_buffer* pb,
-    wuffs_base__rect_ie_u32 rect,
-    uint32_t color) {
-  size_t stride = pb->private_impl.planes[0].stride;
-  uint32_t width = wuffs_base__rect_ie_u32__width(&rect);
-  if ((stride == (4 * ((uint64_t)width))) && (rect.min_incl_x == 0)) {
-    uint8_t* ptr =
-        pb->private_impl.planes[0].ptr + (stride * ((size_t)rect.min_incl_y));
-    uint32_t height = wuffs_base__rect_ie_u32__height(&rect);
-    size_t n;
-    for (n = ((size_t)width) * ((size_t)height); n > 0; n--) {
-      wuffs_base__poke_u32le__no_bounds_check(ptr, color);
-      ptr += 4;
-    }
-    return;
-  }
-
-  uint32_t y;
-  for (y = rect.min_incl_y; y < rect.max_excl_y; y++) {
-    uint8_t* ptr = pb->private_impl.planes[0].ptr + (stride * ((size_t)y)) +
-                   (4 * ((size_t)rect.min_incl_x));
-    uint32_t n;
-    for (n = width; n > 0; n--) {
-      wuffs_base__poke_u32le__no_bounds_check(ptr, color);
-      ptr += 4;
-    }
-  }
-}
-
-static inline void  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxxxxxx(
-    wuffs_base__pixel_buffer* pb,
-    wuffs_base__rect_ie_u32 rect,
-    uint64_t color) {
-  size_t stride = pb->private_impl.planes[0].stride;
-  uint32_t width = wuffs_base__rect_ie_u32__width(&rect);
-  if ((stride == (8 * ((uint64_t)width))) && (rect.min_incl_x == 0)) {
-    uint8_t* ptr =
-        pb->private_impl.planes[0].ptr + (stride * ((size_t)rect.min_incl_y));
-    uint32_t height = wuffs_base__rect_ie_u32__height(&rect);
-    size_t n;
-    for (n = ((size_t)width) * ((size_t)height); n > 0; n--) {
-      wuffs_base__poke_u64le__no_bounds_check(ptr, color);
-      ptr += 8;
-    }
-    return;
-  }
-
-  uint32_t y;
-  for (y = rect.min_incl_y; y < rect.max_excl_y; y++) {
-    uint8_t* ptr = pb->private_impl.planes[0].ptr + (stride * ((size_t)y)) +
-                   (8 * ((size_t)rect.min_incl_x));
-    uint32_t n;
-    for (n = width; n > 0; n--) {
-      wuffs_base__poke_u64le__no_bounds_check(ptr, color);
-      ptr += 8;
-    }
-  }
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect(
-    wuffs_base__pixel_buffer* pb,
-    wuffs_base__rect_ie_u32 rect,
-    wuffs_base__color_u32_argb_premul color) {
-  if (!pb) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  } else if (wuffs_base__rect_ie_u32__is_empty(&rect)) {
-    return wuffs_base__make_status(NULL);
-  }
-  wuffs_base__rect_ie_u32 bounds =
-      wuffs_base__pixel_config__bounds(&pb->pixcfg);
-  if (!wuffs_base__rect_ie_u32__contains_rect(&bounds, rect)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-
-  if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) {
-    // TODO: support planar formats.
-    return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-
-  switch (pb->pixcfg.private_impl.pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(pb, rect, color);
-      return wuffs_base__make_status(NULL);
-
-      // Common formats above. Rarer formats below.
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xx(
-          pb, rect,
-          wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(color));
-      return wuffs_base__make_status(NULL);
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxx(pb, rect, color);
-      return wuffs_base__make_status(NULL);
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(
-          pb, rect,
-          wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-              color));
-      return wuffs_base__make_status(NULL);
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxxxxxx(
-          pb, rect,
-          wuffs_base__color_u32_argb_premul__as__color_u64_argb_nonpremul(
-              color));
-      return wuffs_base__make_status(NULL);
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(
-          pb, rect,
-          wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-              wuffs_base__swap_u32_argb_abgr(color)));
-      return wuffs_base__make_status(NULL);
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(
-          pb, rect, wuffs_base__swap_u32_argb_abgr(color));
-      return wuffs_base__make_status(NULL);
-  }
-
-  uint32_t y;
-  for (y = rect.min_incl_y; y < rect.max_excl_y; y++) {
-    uint32_t x;
-    for (x = rect.min_incl_x; x < rect.max_excl_x; x++) {
-      wuffs_base__pixel_buffer__set_color_u32_at(pb, x, y, color);
-    }
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-// --------
-
-WUFFS_BASE__MAYBE_STATIC uint8_t  //
-wuffs_base__pixel_palette__closest_element(
-    wuffs_base__slice_u8 palette_slice,
-    wuffs_base__pixel_format palette_format,
-    wuffs_base__color_u32_argb_premul c) {
-  size_t n = palette_slice.len / 4;
-  if (n > (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-    n = (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4);
-  }
-  size_t best_index = 0;
-  uint64_t best_score = 0xFFFFFFFFFFFFFFFF;
-
-  // Work in 16-bit color.
-  uint32_t ca = 0x101 * (0xFF & (c >> 24));
-  uint32_t cr = 0x101 * (0xFF & (c >> 16));
-  uint32_t cg = 0x101 * (0xFF & (c >> 8));
-  uint32_t cb = 0x101 * (0xFF & (c >> 0));
-
-  switch (palette_format.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: {
-      bool nonpremul = palette_format.repr ==
-                       WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL;
-
-      size_t i;
-      for (i = 0; i < n; i++) {
-        // Work in 16-bit color.
-        uint32_t pb = 0x101 * ((uint32_t)(palette_slice.ptr[(4 * i) + 0]));
-        uint32_t pg = 0x101 * ((uint32_t)(palette_slice.ptr[(4 * i) + 1]));
-        uint32_t pr = 0x101 * ((uint32_t)(palette_slice.ptr[(4 * i) + 2]));
-        uint32_t pa = 0x101 * ((uint32_t)(palette_slice.ptr[(4 * i) + 3]));
-
-        // Convert to premultiplied alpha.
-        if (nonpremul && (pa != 0xFFFF)) {
-          pb = (pb * pa) / 0xFFFF;
-          pg = (pg * pa) / 0xFFFF;
-          pr = (pr * pa) / 0xFFFF;
-        }
-
-        // These deltas are conceptually int32_t (signed) but after squaring,
-        // it's equivalent to work in uint32_t (unsigned).
-        pb -= cb;
-        pg -= cg;
-        pr -= cr;
-        pa -= ca;
-        uint64_t score = ((uint64_t)(pb * pb)) + ((uint64_t)(pg * pg)) +
-                         ((uint64_t)(pr * pr)) + ((uint64_t)(pa * pa));
-        if (best_score > score) {
-          best_score = score;
-          best_index = i;
-        }
-      }
-      break;
-    }
-  }
-
-  return (uint8_t)best_index;
-}
-
-// --------
-
-static inline uint32_t  //
-wuffs_base__composite_nonpremul_nonpremul_u32_axxx(uint32_t dst_nonpremul,
-                                                   uint32_t src_nonpremul) {
-  // Extract 16-bit color components.
-  //
-  // If the destination is transparent then SRC_OVER is equivalent to SRC: just
-  // return src_nonpremul. This isn't just an optimization (skipping the rest
-  // of the function's computation). It also preserves the nonpremul
-  // distinction between e.g. transparent red and transparent blue that would
-  // otherwise be lost by converting from nonpremul to premul and back.
-  uint32_t da = 0x101 * (0xFF & (dst_nonpremul >> 24));
-  if (da == 0) {
-    return src_nonpremul;
-  }
-  uint32_t dr = 0x101 * (0xFF & (dst_nonpremul >> 16));
-  uint32_t dg = 0x101 * (0xFF & (dst_nonpremul >> 8));
-  uint32_t db = 0x101 * (0xFF & (dst_nonpremul >> 0));
-  uint32_t sa = 0x101 * (0xFF & (src_nonpremul >> 24));
-  uint32_t sr = 0x101 * (0xFF & (src_nonpremul >> 16));
-  uint32_t sg = 0x101 * (0xFF & (src_nonpremul >> 8));
-  uint32_t sb = 0x101 * (0xFF & (src_nonpremul >> 0));
-
-  // Convert dst from nonpremul to premul.
-  dr = (dr * da) / 0xFFFF;
-  dg = (dg * da) / 0xFFFF;
-  db = (db * da) / 0xFFFF;
-
-  // Calculate the inverse of the src-alpha: how much of the dst to keep.
-  uint32_t ia = 0xFFFF - sa;
-
-  // Composite src (nonpremul) over dst (premul).
-  da = sa + ((da * ia) / 0xFFFF);
-  dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-  dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-  db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-  // Convert dst from premul to nonpremul.
-  if (da != 0) {
-    dr = (dr * 0xFFFF) / da;
-    dg = (dg * 0xFFFF) / da;
-    db = (db * 0xFFFF) / da;
-  }
-
-  // Convert from 16-bit color to 8-bit color.
-  da >>= 8;
-  dr >>= 8;
-  dg >>= 8;
-  db >>= 8;
-
-  // Combine components.
-  return (db << 0) | (dg << 8) | (dr << 16) | (da << 24);
-}
-
-static inline uint64_t  //
-wuffs_base__composite_nonpremul_nonpremul_u64_axxx(uint64_t dst_nonpremul,
-                                                   uint64_t src_nonpremul) {
-  // Extract components.
-  //
-  // If the destination is transparent then SRC_OVER is equivalent to SRC: just
-  // return src_nonpremul. This isn't just an optimization (skipping the rest
-  // of the function's computation). It also preserves the nonpremul
-  // distinction between e.g. transparent red and transparent blue that would
-  // otherwise be lost by converting from nonpremul to premul and back.
-  uint64_t da = 0xFFFF & (dst_nonpremul >> 48);
-  if (da == 0) {
-    return src_nonpremul;
-  }
-  uint64_t dr = 0xFFFF & (dst_nonpremul >> 32);
-  uint64_t dg = 0xFFFF & (dst_nonpremul >> 16);
-  uint64_t db = 0xFFFF & (dst_nonpremul >> 0);
-  uint64_t sa = 0xFFFF & (src_nonpremul >> 48);
-  uint64_t sr = 0xFFFF & (src_nonpremul >> 32);
-  uint64_t sg = 0xFFFF & (src_nonpremul >> 16);
-  uint64_t sb = 0xFFFF & (src_nonpremul >> 0);
-
-  // Convert dst from nonpremul to premul.
-  dr = (dr * da) / 0xFFFF;
-  dg = (dg * da) / 0xFFFF;
-  db = (db * da) / 0xFFFF;
-
-  // Calculate the inverse of the src-alpha: how much of the dst to keep.
-  uint64_t ia = 0xFFFF - sa;
-
-  // Composite src (nonpremul) over dst (premul).
-  da = sa + ((da * ia) / 0xFFFF);
-  dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-  dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-  db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-  // Convert dst from premul to nonpremul.
-  if (da != 0) {
-    dr = (dr * 0xFFFF) / da;
-    dg = (dg * 0xFFFF) / da;
-    db = (db * 0xFFFF) / da;
-  }
-
-  // Combine components.
-  return (db << 0) | (dg << 16) | (dr << 32) | (da << 48);
-}
-
-static inline uint32_t  //
-wuffs_base__composite_nonpremul_premul_u32_axxx(uint32_t dst_nonpremul,
-                                                uint32_t src_premul) {
-  // Extract 16-bit color components.
-  uint32_t da = 0x101 * (0xFF & (dst_nonpremul >> 24));
-  uint32_t dr = 0x101 * (0xFF & (dst_nonpremul >> 16));
-  uint32_t dg = 0x101 * (0xFF & (dst_nonpremul >> 8));
-  uint32_t db = 0x101 * (0xFF & (dst_nonpremul >> 0));
-  uint32_t sa = 0x101 * (0xFF & (src_premul >> 24));
-  uint32_t sr = 0x101 * (0xFF & (src_premul >> 16));
-  uint32_t sg = 0x101 * (0xFF & (src_premul >> 8));
-  uint32_t sb = 0x101 * (0xFF & (src_premul >> 0));
-
-  // Convert dst from nonpremul to premul.
-  dr = (dr * da) / 0xFFFF;
-  dg = (dg * da) / 0xFFFF;
-  db = (db * da) / 0xFFFF;
-
-  // Calculate the inverse of the src-alpha: how much of the dst to keep.
-  uint32_t ia = 0xFFFF - sa;
-
-  // Composite src (premul) over dst (premul).
-  da = sa + ((da * ia) / 0xFFFF);
-  dr = sr + ((dr * ia) / 0xFFFF);
-  dg = sg + ((dg * ia) / 0xFFFF);
-  db = sb + ((db * ia) / 0xFFFF);
-
-  // Convert dst from premul to nonpremul.
-  if (da != 0) {
-    dr = (dr * 0xFFFF) / da;
-    dg = (dg * 0xFFFF) / da;
-    db = (db * 0xFFFF) / da;
-  }
-
-  // Convert from 16-bit color to 8-bit color.
-  da >>= 8;
-  dr >>= 8;
-  dg >>= 8;
-  db >>= 8;
-
-  // Combine components.
-  return (db << 0) | (dg << 8) | (dr << 16) | (da << 24);
-}
-
-static inline uint64_t  //
-wuffs_base__composite_nonpremul_premul_u64_axxx(uint64_t dst_nonpremul,
-                                                uint64_t src_premul) {
-  // Extract components.
-  uint64_t da = 0xFFFF & (dst_nonpremul >> 48);
-  uint64_t dr = 0xFFFF & (dst_nonpremul >> 32);
-  uint64_t dg = 0xFFFF & (dst_nonpremul >> 16);
-  uint64_t db = 0xFFFF & (dst_nonpremul >> 0);
-  uint64_t sa = 0xFFFF & (src_premul >> 48);
-  uint64_t sr = 0xFFFF & (src_premul >> 32);
-  uint64_t sg = 0xFFFF & (src_premul >> 16);
-  uint64_t sb = 0xFFFF & (src_premul >> 0);
-
-  // Convert dst from nonpremul to premul.
-  dr = (dr * da) / 0xFFFF;
-  dg = (dg * da) / 0xFFFF;
-  db = (db * da) / 0xFFFF;
-
-  // Calculate the inverse of the src-alpha: how much of the dst to keep.
-  uint64_t ia = 0xFFFF - sa;
-
-  // Composite src (premul) over dst (premul).
-  da = sa + ((da * ia) / 0xFFFF);
-  dr = sr + ((dr * ia) / 0xFFFF);
-  dg = sg + ((dg * ia) / 0xFFFF);
-  db = sb + ((db * ia) / 0xFFFF);
-
-  // Convert dst from premul to nonpremul.
-  if (da != 0) {
-    dr = (dr * 0xFFFF) / da;
-    dg = (dg * 0xFFFF) / da;
-    db = (db * 0xFFFF) / da;
-  }
-
-  // Combine components.
-  return (db << 0) | (dg << 16) | (dr << 32) | (da << 48);
-}
-
-static inline uint32_t  //
-wuffs_base__composite_premul_nonpremul_u32_axxx(uint32_t dst_premul,
-                                                uint32_t src_nonpremul) {
-  // Extract 16-bit color components.
-  uint32_t da = 0x101 * (0xFF & (dst_premul >> 24));
-  uint32_t dr = 0x101 * (0xFF & (dst_premul >> 16));
-  uint32_t dg = 0x101 * (0xFF & (dst_premul >> 8));
-  uint32_t db = 0x101 * (0xFF & (dst_premul >> 0));
-  uint32_t sa = 0x101 * (0xFF & (src_nonpremul >> 24));
-  uint32_t sr = 0x101 * (0xFF & (src_nonpremul >> 16));
-  uint32_t sg = 0x101 * (0xFF & (src_nonpremul >> 8));
-  uint32_t sb = 0x101 * (0xFF & (src_nonpremul >> 0));
-
-  // Calculate the inverse of the src-alpha: how much of the dst to keep.
-  uint32_t ia = 0xFFFF - sa;
-
-  // Composite src (nonpremul) over dst (premul).
-  da = sa + ((da * ia) / 0xFFFF);
-  dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-  dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-  db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-  // Convert from 16-bit color to 8-bit color.
-  da >>= 8;
-  dr >>= 8;
-  dg >>= 8;
-  db >>= 8;
-
-  // Combine components.
-  return (db << 0) | (dg << 8) | (dr << 16) | (da << 24);
-}
-
-static inline uint64_t  //
-wuffs_base__composite_premul_nonpremul_u64_axxx(uint64_t dst_premul,
-                                                uint64_t src_nonpremul) {
-  // Extract components.
-  uint64_t da = 0xFFFF & (dst_premul >> 48);
-  uint64_t dr = 0xFFFF & (dst_premul >> 32);
-  uint64_t dg = 0xFFFF & (dst_premul >> 16);
-  uint64_t db = 0xFFFF & (dst_premul >> 0);
-  uint64_t sa = 0xFFFF & (src_nonpremul >> 48);
-  uint64_t sr = 0xFFFF & (src_nonpremul >> 32);
-  uint64_t sg = 0xFFFF & (src_nonpremul >> 16);
-  uint64_t sb = 0xFFFF & (src_nonpremul >> 0);
-
-  // Calculate the inverse of the src-alpha: how much of the dst to keep.
-  uint64_t ia = 0xFFFF - sa;
-
-  // Composite src (nonpremul) over dst (premul).
-  da = sa + ((da * ia) / 0xFFFF);
-  dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-  dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-  db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-  // Combine components.
-  return (db << 0) | (dg << 16) | (dr << 32) | (da << 48);
-}
-
-static inline uint32_t  //
-wuffs_base__composite_premul_premul_u32_axxx(uint32_t dst_premul,
-                                             uint32_t src_premul) {
-  // Extract 16-bit color components.
-  uint32_t da = 0x101 * (0xFF & (dst_premul >> 24));
-  uint32_t dr = 0x101 * (0xFF & (dst_premul >> 16));
-  uint32_t dg = 0x101 * (0xFF & (dst_premul >> 8));
-  uint32_t db = 0x101 * (0xFF & (dst_premul >> 0));
-  uint32_t sa = 0x101 * (0xFF & (src_premul >> 24));
-  uint32_t sr = 0x101 * (0xFF & (src_premul >> 16));
-  uint32_t sg = 0x101 * (0xFF & (src_premul >> 8));
-  uint32_t sb = 0x101 * (0xFF & (src_premul >> 0));
-
-  // Calculate the inverse of the src-alpha: how much of the dst to keep.
-  uint32_t ia = 0xFFFF - sa;
-
-  // Composite src (premul) over dst (premul).
-  da = sa + ((da * ia) / 0xFFFF);
-  dr = sr + ((dr * ia) / 0xFFFF);
-  dg = sg + ((dg * ia) / 0xFFFF);
-  db = sb + ((db * ia) / 0xFFFF);
-
-  // Convert from 16-bit color to 8-bit color.
-  da >>= 8;
-  dr >>= 8;
-  dg >>= 8;
-  db >>= 8;
-
-  // Combine components.
-  return (db << 0) | (dg << 8) | (dr << 16) | (da << 24);
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__squash_align4_bgr_565_8888(uint8_t* dst_ptr,
-                                                       size_t dst_len,
-                                                       const uint8_t* src_ptr,
-                                                       size_t src_len,
-                                                       bool nonpremul) {
-  size_t len = (dst_len < src_len ? dst_len : src_len) / 4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n--) {
-    uint32_t argb = wuffs_base__peek_u32le__no_bounds_check(s);
-    if (nonpremul) {
-      argb =
-          wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(argb);
-    }
-    uint32_t b5 = 0x1F & (argb >> (8 - 5));
-    uint32_t g6 = 0x3F & (argb >> (16 - 6));
-    uint32_t r5 = 0x1F & (argb >> (24 - 5));
-    uint32_t alpha = argb & 0xFF000000;
-    wuffs_base__poke_u32le__no_bounds_check(
-        d, alpha | (r5 << 11) | (g6 << 5) | (b5 << 0));
-    s += 4;
-    d += 4;
-  }
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__swap_rgb_bgr(uint8_t* dst_ptr,
-                                         size_t dst_len,
-                                         uint8_t* dst_palette_ptr,
-                                         size_t dst_palette_len,
-                                         const uint8_t* src_ptr,
-                                         size_t src_len) {
-  size_t len = (dst_len < src_len ? dst_len : src_len) / 3;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n--) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    d[0] = s2;
-    d[1] = s1;
-    d[2] = s0;
-    s += 3;
-    d += 3;
-  }
-  return len;
-}
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_sse42
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-static uint64_t  //
-wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr,
-                                                      size_t dst_len,
-                                                      uint8_t* dst_palette_ptr,
-                                                      size_t dst_palette_len,
-                                                      const uint8_t* src_ptr,
-                                                      size_t src_len) {
-  size_t len = (dst_len < src_len ? dst_len : src_len) / 4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  __m128i shuffle = _mm_set_epi8(+0x0F, +0x0C, +0x0D, +0x0E,  //
-                                 +0x0B, +0x08, +0x09, +0x0A,  //
-                                 +0x07, +0x04, +0x05, +0x06,  //
-                                 +0x03, +0x00, +0x01, +0x02);
-
-  while (n >= 4) {
-    __m128i x;
-    x = _mm_lddqu_si128((const __m128i*)(const void*)s);
-    x = _mm_shuffle_epi8(x, shuffle);
-    _mm_storeu_si128((__m128i*)(void*)d, x);
-
-    s += 4 * 4;
-    d += 4 * 4;
-    n -= 4;
-  }
-
-  while (n--) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    uint8_t s3 = s[3];
-    d[0] = s2;
-    d[1] = s1;
-    d[2] = s0;
-    d[3] = s3;
-    s += 4;
-    d += 4;
-  }
-  return len;
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_sse42
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__swap_rgbx_bgrx(uint8_t* dst_ptr,
-                                           size_t dst_len,
-                                           uint8_t* dst_palette_ptr,
-                                           size_t dst_palette_len,
-                                           const uint8_t* src_ptr,
-                                           size_t src_len) {
-  size_t len = (dst_len < src_len ? dst_len : src_len) / 4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n--) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    uint8_t s3 = s[3];
-    d[0] = s2;
-    d[1] = s1;
-    d[2] = s0;
-    d[3] = s3;
-    s += 4;
-    d += 4;
-  }
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__copy_1_1(uint8_t* dst_ptr,
-                                     size_t dst_len,
-                                     uint8_t* dst_palette_ptr,
-                                     size_t dst_palette_len,
-                                     const uint8_t* src_ptr,
-                                     size_t src_len) {
-  size_t len = (dst_len < src_len) ? dst_len : src_len;
-  if (len > 0) {
-    memmove(dst_ptr, src_ptr, len);
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__copy_2_2(uint8_t* dst_ptr,
-                                     size_t dst_len,
-                                     uint8_t* dst_palette_ptr,
-                                     size_t dst_palette_len,
-                                     const uint8_t* src_ptr,
-                                     size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len2 < src_len2) ? dst_len2 : src_len2;
-  if (len > 0) {
-    memmove(dst_ptr, src_ptr, len * 2);
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__copy_3_3(uint8_t* dst_ptr,
-                                     size_t dst_len,
-                                     uint8_t* dst_palette_ptr,
-                                     size_t dst_palette_len,
-                                     const uint8_t* src_ptr,
-                                     size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len3 = src_len / 3;
-  size_t len = (dst_len3 < src_len3) ? dst_len3 : src_len3;
-  if (len > 0) {
-    memmove(dst_ptr, src_ptr, len * 3);
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__copy_4_4(uint8_t* dst_ptr,
-                                     size_t dst_len,
-                                     uint8_t* dst_palette_ptr,
-                                     size_t dst_palette_len,
-                                     const uint8_t* src_ptr,
-                                     size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  if (len > 0) {
-    memmove(dst_ptr, src_ptr, len * 4);
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__copy_8_8(uint8_t* dst_ptr,
-                                     size_t dst_len,
-                                     uint8_t* dst_palette_ptr,
-                                     size_t dst_palette_len,
-                                     const uint8_t* src_ptr,
-                                     size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len8 < src_len8) ? dst_len8 : src_len8;
-  if (len > 0) {
-    memmove(dst_ptr, src_ptr, len * 8);
-  }
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgr(uint8_t* dst_ptr,
-                                         size_t dst_len,
-                                         uint8_t* dst_palette_ptr,
-                                         size_t dst_palette_len,
-                                         const uint8_t* src_ptr,
-                                         size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len3 = src_len / 3;
-  size_t len = (dst_len2 < src_len3) ? dst_len2 : src_len3;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t b5 = s[0] >> 3;
-    uint32_t g6 = s[1] >> 2;
-    uint32_t r5 = s[2] >> 3;
-    uint32_t rgb_565 = (r5 << 11) | (g6 << 5) | (b5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
-
-    s += 1 * 3;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgrx(uint8_t* dst_ptr,
-                                          size_t dst_len,
-                                          uint8_t* dst_palette_ptr,
-                                          size_t dst_palette_len,
-                                          const uint8_t* src_ptr,
-                                          size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len2 < src_len4) ? dst_len2 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t b5 = s[0] >> 3;
-    uint32_t g6 = s[1] >> 2;
-    uint32_t r5 = s[2] >> 3;
-    uint32_t rgb_565 = (r5 << 11) | (g6 << 5) | (b5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
-
-    s += 1 * 4;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len2 < src_len4) ? dst_len2 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (0 * 2),
-        wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-            wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
-                wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)))));
-
-    s += 1 * 4;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul_4x16le__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len2 < src_len8) ? dst_len2 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (0 * 2),
-        wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-            wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
-                wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8)))));
-
-    s += 1 * 8;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len2 < src_len4) ? dst_len2 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t sa = 0x101 * ((uint32_t)s[3]);
-    uint32_t sr = 0x101 * ((uint32_t)s[2]);
-    uint32_t sg = 0x101 * ((uint32_t)s[1]);
-    uint32_t sb = 0x101 * ((uint32_t)s[0]);
-
-    // Convert from 565 color to 16-bit color.
-    uint32_t old_rgb_565 = wuffs_base__peek_u16le__no_bounds_check(d + (0 * 2));
-    uint32_t old_r5 = 0x1F & (old_rgb_565 >> 11);
-    uint32_t dr = (0x8421 * old_r5) >> 4;
-    uint32_t old_g6 = 0x3F & (old_rgb_565 >> 5);
-    uint32_t dg = (0x1041 * old_g6) >> 2;
-    uint32_t old_b5 = 0x1F & (old_rgb_565 >> 0);
-    uint32_t db = (0x8421 * old_b5) >> 4;
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (nonpremul) over dst (premul).
-    dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-    dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-    db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-    // Convert from 16-bit color to 565 color and combine the components.
-    uint32_t new_r5 = 0x1F & (dr >> 11);
-    uint32_t new_g6 = 0x3F & (dg >> 10);
-    uint32_t new_b5 = 0x1F & (db >> 11);
-    uint32_t new_rgb_565 = (new_r5 << 11) | (new_g6 << 5) | (new_b5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)new_rgb_565);
-
-    s += 1 * 4;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul_4x16le__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len2 < src_len8) ? dst_len2 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t sa = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 6));
-    uint32_t sr = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 4));
-    uint32_t sg = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 2));
-    uint32_t sb = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 0));
-
-    // Convert from 565 color to 16-bit color.
-    uint32_t old_rgb_565 = wuffs_base__peek_u16le__no_bounds_check(d + (0 * 2));
-    uint32_t old_r5 = 0x1F & (old_rgb_565 >> 11);
-    uint32_t dr = (0x8421 * old_r5) >> 4;
-    uint32_t old_g6 = 0x3F & (old_rgb_565 >> 5);
-    uint32_t dg = (0x1041 * old_g6) >> 2;
-    uint32_t old_b5 = 0x1F & (old_rgb_565 >> 0);
-    uint32_t db = (0x8421 * old_b5) >> 4;
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (nonpremul) over dst (premul).
-    dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-    dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-    db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-    // Convert from 16-bit color to 565 color and combine the components.
-    uint32_t new_r5 = 0x1F & (dr >> 11);
-    uint32_t new_g6 = 0x3F & (dg >> 10);
-    uint32_t new_b5 = 0x1F & (db >> 11);
-    uint32_t new_rgb_565 = (new_r5 << 11) | (new_g6 << 5) | (new_b5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)new_rgb_565);
-
-    s += 1 * 8;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_premul__src(uint8_t* dst_ptr,
-                                                      size_t dst_len,
-                                                      uint8_t* dst_palette_ptr,
-                                                      size_t dst_palette_len,
-                                                      const uint8_t* src_ptr,
-                                                      size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len2 < src_len4) ? dst_len2 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (0 * 2), wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-                         wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))));
-
-    s += 1 * 4;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_premul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len2 < src_len4) ? dst_len2 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t sa = 0x101 * ((uint32_t)s[3]);
-    uint32_t sr = 0x101 * ((uint32_t)s[2]);
-    uint32_t sg = 0x101 * ((uint32_t)s[1]);
-    uint32_t sb = 0x101 * ((uint32_t)s[0]);
-
-    // Convert from 565 color to 16-bit color.
-    uint32_t old_rgb_565 = wuffs_base__peek_u16le__no_bounds_check(d + (0 * 2));
-    uint32_t old_r5 = 0x1F & (old_rgb_565 >> 11);
-    uint32_t dr = (0x8421 * old_r5) >> 4;
-    uint32_t old_g6 = 0x3F & (old_rgb_565 >> 5);
-    uint32_t dg = (0x1041 * old_g6) >> 2;
-    uint32_t old_b5 = 0x1F & (old_rgb_565 >> 0);
-    uint32_t db = (0x8421 * old_b5) >> 4;
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (premul) over dst (premul).
-    dr = sr + ((dr * ia) / 0xFFFF);
-    dg = sg + ((dg * ia) / 0xFFFF);
-    db = sb + ((db * ia) / 0xFFFF);
-
-    // Convert from 16-bit color to 565 color and combine the components.
-    uint32_t new_r5 = 0x1F & (dr >> 11);
-    uint32_t new_g6 = 0x3F & (dg >> 10);
-    uint32_t new_b5 = 0x1F & (db >> 11);
-    uint32_t new_rgb_565 = (new_r5 << 11) | (new_g6 << 5) | (new_b5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)new_rgb_565);
-
-    s += 1 * 4;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgb(uint8_t* dst_ptr,
-                                         size_t dst_len,
-                                         uint8_t* dst_palette_ptr,
-                                         size_t dst_palette_len,
-                                         const uint8_t* src_ptr,
-                                         size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len3 = src_len / 3;
-  size_t len = (dst_len2 < src_len3) ? dst_len2 : src_len3;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t r5 = s[0] >> 3;
-    uint32_t g6 = s[1] >> 2;
-    uint32_t b5 = s[2] >> 3;
-    uint32_t rgb_565 = (r5 << 11) | (g6 << 5) | (b5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
-
-    s += 1 * 3;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgba_nonpremul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len2 < src_len4) ? dst_len2 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (0 * 2),
-        wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-            wuffs_base__swap_u32_argb_abgr(
-                wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
-                    wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))))));
-
-    s += 1 * 4;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgba_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len2 < src_len4) ? dst_len2 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t sa = 0x101 * ((uint32_t)s[3]);
-    uint32_t sb = 0x101 * ((uint32_t)s[2]);
-    uint32_t sg = 0x101 * ((uint32_t)s[1]);
-    uint32_t sr = 0x101 * ((uint32_t)s[0]);
-
-    // Convert from 565 color to 16-bit color.
-    uint32_t old_rgb_565 = wuffs_base__peek_u16le__no_bounds_check(d + (0 * 2));
-    uint32_t old_r5 = 0x1F & (old_rgb_565 >> 11);
-    uint32_t dr = (0x8421 * old_r5) >> 4;
-    uint32_t old_g6 = 0x3F & (old_rgb_565 >> 5);
-    uint32_t dg = (0x1041 * old_g6) >> 2;
-    uint32_t old_b5 = 0x1F & (old_rgb_565 >> 0);
-    uint32_t db = (0x8421 * old_b5) >> 4;
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (nonpremul) over dst (premul).
-    dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-    dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-    db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-    // Convert from 16-bit color to 565 color and combine the components.
-    uint32_t new_r5 = 0x1F & (dr >> 11);
-    uint32_t new_g6 = 0x3F & (dg >> 10);
-    uint32_t new_b5 = 0x1F & (db >> 11);
-    uint32_t new_rgb_565 = (new_r5 << 11) | (new_g6 << 5) | (new_b5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)new_rgb_565);
-
-    s += 1 * 4;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgba_premul__src(uint8_t* dst_ptr,
-                                                      size_t dst_len,
-                                                      uint8_t* dst_palette_ptr,
-                                                      size_t dst_palette_len,
-                                                      const uint8_t* src_ptr,
-                                                      size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len2 < src_len4) ? dst_len2 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (0 * 2),
-        wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-            wuffs_base__swap_u32_argb_abgr(
-                wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)))));
-
-    s += 1 * 4;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgba_premul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len2 < src_len4) ? dst_len2 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t sa = 0x101 * ((uint32_t)s[3]);
-    uint32_t sb = 0x101 * ((uint32_t)s[2]);
-    uint32_t sg = 0x101 * ((uint32_t)s[1]);
-    uint32_t sr = 0x101 * ((uint32_t)s[0]);
-
-    // Convert from 565 color to 16-bit color.
-    uint32_t old_rgb_565 = wuffs_base__peek_u16le__no_bounds_check(d + (0 * 2));
-    uint32_t old_r5 = 0x1F & (old_rgb_565 >> 11);
-    uint32_t dr = (0x8421 * old_r5) >> 4;
-    uint32_t old_g6 = 0x3F & (old_rgb_565 >> 5);
-    uint32_t dg = (0x1041 * old_g6) >> 2;
-    uint32_t old_b5 = 0x1F & (old_rgb_565 >> 0);
-    uint32_t db = (0x8421 * old_b5) >> 4;
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (premul) over dst (premul).
-    dr = sr + ((dr * ia) / 0xFFFF);
-    dg = sg + ((dg * ia) / 0xFFFF);
-    db = sb + ((db * ia) / 0xFFFF);
-
-    // Convert from 16-bit color to 565 color and combine the components.
-    uint32_t new_r5 = 0x1F & (dr >> 11);
-    uint32_t new_g6 = 0x3F & (dg >> 10);
-    uint32_t new_b5 = 0x1F & (db >> 11);
-    uint32_t new_rgb_565 = (new_r5 << 11) | (new_g6 << 5) | (new_b5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)new_rgb_565);
-
-    s += 1 * 4;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__y(uint8_t* dst_ptr,
-                                       size_t dst_len,
-                                       uint8_t* dst_palette_ptr,
-                                       size_t dst_palette_len,
-                                       const uint8_t* src_ptr,
-                                       size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t len = (dst_len2 < src_len) ? dst_len2 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t y5 = s[0] >> 3;
-    uint32_t y6 = s[0] >> 2;
-    uint32_t rgb_565 = (y5 << 11) | (y6 << 5) | (y5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
-
-    s += 1 * 1;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__y_16be(uint8_t* dst_ptr,
-                                            size_t dst_len,
-                                            uint8_t* dst_palette_ptr,
-                                            size_t dst_palette_len,
-                                            const uint8_t* src_ptr,
-                                            size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len2 < src_len2) ? dst_len2 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t y5 = s[0] >> 3;
-    uint32_t y6 = s[0] >> 2;
-    uint32_t rgb_565 = (y5 << 11) | (y6 << 5) | (y5 << 0);
-    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
-
-    s += 1 * 2;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__index__src(uint8_t* dst_ptr,
-                                                size_t dst_len,
-                                                uint8_t* dst_palette_ptr,
-                                                size_t dst_palette_len,
-                                                const uint8_t* src_ptr,
-                                                size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len2 = dst_len / 2;
-  size_t len = (dst_len2 < src_len) ? dst_len2 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  const size_t loop_unroll_count = 4;
-
-  while (n >= loop_unroll_count) {
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (0 * 2), wuffs_base__peek_u16le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[0] * 4)));
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (1 * 2), wuffs_base__peek_u16le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[1] * 4)));
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (2 * 2), wuffs_base__peek_u16le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[2] * 4)));
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (3 * 2), wuffs_base__peek_u16le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[3] * 4)));
-
-    s += loop_unroll_count * 1;
-    d += loop_unroll_count * 2;
-    n -= loop_unroll_count;
-  }
-
-  while (n >= 1) {
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (0 * 2), wuffs_base__peek_u16le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[0] * 4)));
-
-    s += 1 * 1;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__index_bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len2 = dst_len / 2;
-  size_t len = (dst_len2 < src_len) ? dst_len2 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
-        wuffs_base__peek_u16le__no_bounds_check(d + (0 * 2)));
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    wuffs_base__poke_u16le__no_bounds_check(
-        d + (0 * 2),
-        wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-            wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0)));
-
-    s += 1 * 1;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__index_binary_alpha__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len2 = dst_len / 2;
-  size_t len = (dst_len2 < src_len) ? dst_len2 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    if (s0) {
-      wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)s0);
-    }
-
-    s += 1 * 1;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgr_565(uint8_t* dst_ptr,
-                                         size_t dst_len,
-                                         uint8_t* dst_palette_ptr,
-                                         size_t dst_palette_len,
-                                         const uint8_t* src_ptr,
-                                         size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len3 < src_len2) ? dst_len3 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
-        wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2)));
-    wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
-
-    s += 1 * 2;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src(uint8_t* dst_ptr,
-                                                     size_t dst_len,
-                                                     uint8_t* dst_palette_ptr,
-                                                     size_t dst_palette_len,
-                                                     const uint8_t* src_ptr,
-                                                     size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t s0 =
-        wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
-            wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-    wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_nonpremul_4x16le__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len3 < src_len8) ? dst_len3 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t s0 =
-        wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
-            wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8)));
-    wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
-
-    s += 1 * 8;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t dr = 0x101 * ((uint32_t)d[2]);
-    uint32_t dg = 0x101 * ((uint32_t)d[1]);
-    uint32_t db = 0x101 * ((uint32_t)d[0]);
-    uint32_t sa = 0x101 * ((uint32_t)s[3]);
-    uint32_t sr = 0x101 * ((uint32_t)s[2]);
-    uint32_t sg = 0x101 * ((uint32_t)s[1]);
-    uint32_t sb = 0x101 * ((uint32_t)s[0]);
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (nonpremul) over dst (premul).
-    dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-    dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-    db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-    // Convert from 16-bit color to 8-bit color.
-    d[0] = (uint8_t)(db >> 8);
-    d[1] = (uint8_t)(dg >> 8);
-    d[2] = (uint8_t)(dr >> 8);
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_nonpremul_4x16le__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len3 < src_len8) ? dst_len3 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t dr = 0x101 * ((uint32_t)d[2]);
-    uint32_t dg = 0x101 * ((uint32_t)d[1]);
-    uint32_t db = 0x101 * ((uint32_t)d[0]);
-    uint32_t sa = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 6));
-    uint32_t sr = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 4));
-    uint32_t sg = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 2));
-    uint32_t sb = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 0));
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (nonpremul) over dst (premul).
-    dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-    dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-    db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-    // Convert from 16-bit color to 8-bit color.
-    d[0] = (uint8_t)(db >> 8);
-    d[1] = (uint8_t)(dg >> 8);
-    d[2] = (uint8_t)(dr >> 8);
-
-    s += 1 * 8;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_premul__src(uint8_t* dst_ptr,
-                                                  size_t dst_len,
-                                                  uint8_t* dst_palette_ptr,
-                                                  size_t dst_palette_len,
-                                                  const uint8_t* src_ptr,
-                                                  size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    d[0] = s0;
-    d[1] = s1;
-    d[2] = s2;
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_premul__src_over(uint8_t* dst_ptr,
-                                                       size_t dst_len,
-                                                       uint8_t* dst_palette_ptr,
-                                                       size_t dst_palette_len,
-                                                       const uint8_t* src_ptr,
-                                                       size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t dr = 0x101 * ((uint32_t)d[2]);
-    uint32_t dg = 0x101 * ((uint32_t)d[1]);
-    uint32_t db = 0x101 * ((uint32_t)d[0]);
-    uint32_t sa = 0x101 * ((uint32_t)s[3]);
-    uint32_t sr = 0x101 * ((uint32_t)s[2]);
-    uint32_t sg = 0x101 * ((uint32_t)s[1]);
-    uint32_t sb = 0x101 * ((uint32_t)s[0]);
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (premul) over dst (premul).
-    dr = sr + ((dr * ia) / 0xFFFF);
-    dg = sg + ((dg * ia) / 0xFFFF);
-    db = sb + ((db * ia) / 0xFFFF);
-
-    // Convert from 16-bit color to 8-bit color.
-    d[0] = (uint8_t)(db >> 8);
-    d[1] = (uint8_t)(dg >> 8);
-    d[2] = (uint8_t)(dr >> 8);
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src(uint8_t* dst_ptr,
-                                                     size_t dst_len,
-                                                     uint8_t* dst_palette_ptr,
-                                                     size_t dst_palette_len,
-                                                     const uint8_t* src_ptr,
-                                                     size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
-        wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
-            wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))));
-    wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len3 < src_len8) ? dst_len3 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
-        wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
-            wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8))));
-    wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
-
-    s += 1 * 8;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t dr = 0x101 * ((uint32_t)d[2]);
-    uint32_t dg = 0x101 * ((uint32_t)d[1]);
-    uint32_t db = 0x101 * ((uint32_t)d[0]);
-    uint32_t sa = 0x101 * ((uint32_t)s[3]);
-    uint32_t sb = 0x101 * ((uint32_t)s[2]);
-    uint32_t sg = 0x101 * ((uint32_t)s[1]);
-    uint32_t sr = 0x101 * ((uint32_t)s[0]);
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (nonpremul) over dst (premul).
-    dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-    dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-    db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-    // Convert from 16-bit color to 8-bit color.
-    d[0] = (uint8_t)(db >> 8);
-    d[1] = (uint8_t)(dg >> 8);
-    d[2] = (uint8_t)(dr >> 8);
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len3 < src_len8) ? dst_len3 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t dr = 0x101 * ((uint32_t)d[2]);
-    uint32_t dg = 0x101 * ((uint32_t)d[1]);
-    uint32_t db = 0x101 * ((uint32_t)d[0]);
-    uint32_t sa = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 6));
-    uint32_t sb = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 4));
-    uint32_t sg = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 2));
-    uint32_t sr = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 0));
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (nonpremul) over dst (premul).
-    dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
-    dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
-    db = ((sb * sa) + (db * ia)) / 0xFFFF;
-
-    // Convert from 16-bit color to 8-bit color.
-    d[0] = (uint8_t)(db >> 8);
-    d[1] = (uint8_t)(dg >> 8);
-    d[2] = (uint8_t)(dr >> 8);
-
-    s += 1 * 8;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_premul__src(uint8_t* dst_ptr,
-                                                  size_t dst_len,
-                                                  uint8_t* dst_palette_ptr,
-                                                  size_t dst_palette_len,
-                                                  const uint8_t* src_ptr,
-                                                  size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    d[0] = s2;
-    d[1] = s1;
-    d[2] = s0;
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over(uint8_t* dst_ptr,
-                                                       size_t dst_len,
-                                                       uint8_t* dst_palette_ptr,
-                                                       size_t dst_palette_len,
-                                                       const uint8_t* src_ptr,
-                                                       size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    // Extract 16-bit color components.
-    uint32_t dr = 0x101 * ((uint32_t)d[2]);
-    uint32_t dg = 0x101 * ((uint32_t)d[1]);
-    uint32_t db = 0x101 * ((uint32_t)d[0]);
-    uint32_t sa = 0x101 * ((uint32_t)s[3]);
-    uint32_t sb = 0x101 * ((uint32_t)s[2]);
-    uint32_t sg = 0x101 * ((uint32_t)s[1]);
-    uint32_t sr = 0x101 * ((uint32_t)s[0]);
-
-    // Calculate the inverse of the src-alpha: how much of the dst to keep.
-    uint32_t ia = 0xFFFF - sa;
-
-    // Composite src (premul) over dst (premul).
-    dr = sr + ((dr * ia) / 0xFFFF);
-    dg = sg + ((dg * ia) / 0xFFFF);
-    db = sb + ((db * ia) / 0xFFFF);
-
-    // Convert from 16-bit color to 8-bit color.
-    d[0] = (uint8_t)(db >> 8);
-    d[1] = (uint8_t)(dg >> 8);
-    d[2] = (uint8_t)(dr >> 8);
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgbx(uint8_t* dst_ptr,
-                                      size_t dst_len,
-                                      uint8_t* dst_palette_ptr,
-                                      size_t dst_palette_len,
-                                      const uint8_t* src_ptr,
-                                      size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint8_t b0 = s[0];
-    uint8_t b1 = s[1];
-    uint8_t b2 = s[2];
-    d[0] = b2;
-    d[1] = b1;
-    d[2] = b0;
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul_4x16le__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len4 < src_len8) ? dst_len4 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__color_u64__as__color_u32(
-                         wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8))));
-
-    s += 1 * 8;
-    d += 1 * 4;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul_4x16le__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len4 < src_len8) ? dst_len4 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__color_u32__as__color_u64(
-        wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4)));
-    uint64_t s0 = wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__color_u64__as__color_u32(
-            wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0)));
-
-    s += 1 * 8;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_nonpremul_premul_u32_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__index_bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len4 = dst_len / 4;
-  size_t len = (dst_len4 < src_len) ? dst_len4 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
-
-    s += 1 * 1;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
-        wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
-        wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
-        wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_nonpremul_premul_u32_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len8 < src_len4) ? dst_len8 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    uint8_t s3 = s[3];
-    d[0] = s0;
-    d[1] = s0;
-    d[2] = s1;
-    d[3] = s1;
-    d[4] = s2;
-    d[5] = s2;
-    d[6] = s3;
-    d[7] = s3;
-
-    s += 1 * 4;
-    d += 1 * 8;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len8 < src_len4) ? dst_len8 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__peek_u64le__no_bounds_check(d + (0 * 8));
-    uint64_t s0 = wuffs_base__color_u32__as__color_u64(
-        wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8),
-        wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 8;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul_4x16le__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len8 < src_len8) ? dst_len8 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__peek_u64le__no_bounds_check(d + (0 * 8));
-    uint64_t s0 = wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8));
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8),
-        wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
-
-    s += 1 * 8;
-    d += 1 * 8;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_premul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len8 < src_len4) ? dst_len8 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    uint64_t s0 = wuffs_base__color_u32__as__color_u64(
-        wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-            wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))));
-    wuffs_base__poke_u64le__no_bounds_check(d + (0 * 8), s0);
-
-    s += 1 * 4;
-    d += 1 * 8;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_premul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len8 < src_len4) ? dst_len8 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__peek_u64le__no_bounds_check(d + (0 * 8));
-    uint64_t s0 = wuffs_base__color_u32__as__color_u64(
-        wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8), wuffs_base__composite_nonpremul_premul_u64_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 8;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__index_bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len8 = dst_len / 8;
-  size_t len = (dst_len8 < src_len) ? dst_len8 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__peek_u64le__no_bounds_check(d + (0 * 8));
-    uint64_t s0 = wuffs_base__color_u32__as__color_u64(
-        wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                ((size_t)s[0] * 4)));
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8),
-        wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
-
-    s += 1 * 1;
-    d += 1 * 8;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_nonpremul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len8 < src_len4) ? dst_len8 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    uint8_t s3 = s[3];
-    d[0] = s2;
-    d[1] = s2;
-    d[2] = s1;
-    d[3] = s1;
-    d[4] = s0;
-    d[5] = s0;
-    d[6] = s3;
-    d[7] = s3;
-
-    s += 1 * 4;
-    d += 1 * 8;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len8 < src_len4) ? dst_len8 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__peek_u64le__no_bounds_check(d + (0 * 8));
-    uint64_t s0 =
-        wuffs_base__color_u32__as__color_u64(wuffs_base__swap_u32_argb_abgr(
-            wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))));
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8),
-        wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 8;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_premul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len8 < src_len4) ? dst_len8 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    uint64_t s0 = wuffs_base__color_u32__as__color_u64(
-        wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-            wuffs_base__swap_u32_argb_abgr(
-                wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)))));
-    wuffs_base__poke_u64le__no_bounds_check(d + (0 * 8), s0);
-
-    s += 1 * 4;
-    d += 1 * 8;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_premul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len8 < src_len4) ? dst_len8 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__peek_u64le__no_bounds_check(d + (0 * 8));
-    uint64_t s0 =
-        wuffs_base__color_u32__as__color_u64(wuffs_base__swap_u32_argb_abgr(
-            wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))));
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8), wuffs_base__composite_nonpremul_premul_u64_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 8;
-    n -= 1;
-  }
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul_4x16le__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len4 < src_len8) ? dst_len4 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint64_t s0 = wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(s0));
-
-    s += 1 * 8;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul_4x16le__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len4 < src_len8) ? dst_len4 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__color_u32__as__color_u64(
-        wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4)));
-    uint64_t s0 = wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__color_u64__as__color_u32(
-            wuffs_base__composite_premul_nonpremul_u64_axxx(d0, s0)));
-
-    s += 1 * 8;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_premul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_premul_u32_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__index_bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len4 = dst_len / 4;
-  size_t len = (dst_len4 < src_len) ? dst_len4 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));
-
-    s += 1 * 1;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
-        wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
-        wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul_4x16le__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len4 < src_len8) ? dst_len4 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint64_t s0 = wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__swap_u32_argb_abgr(
-            wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
-                s0)));
-
-    s += 1 * 8;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul_4x16le__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len4 < src_len8) ? dst_len4 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__color_u32__as__color_u64(
-        wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4)));
-    uint64_t s0 = wuffs_base__swap_u64_argb_abgr(
-        wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__color_u64__as__color_u32(
-            wuffs_base__composite_premul_nonpremul_u64_axxx(d0, s0)));
-
-    s += 1 * 8;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_premul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
-        wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_premul_u32_axxx(d0, s0));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__bgr(uint8_t* dst_ptr,
-                                      size_t dst_len,
-                                      uint8_t* dst_palette_ptr,
-                                      size_t dst_palette_len,
-                                      const uint8_t* src_ptr,
-                                      size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len3 = src_len / 3;
-  size_t len = (dst_len4 < src_len3) ? dst_len4 : src_len3;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        0xFF000000 | wuffs_base__peek_u24le__no_bounds_check(s + (0 * 3)));
-
-    s += 1 * 3;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__bgr_565(uint8_t* dst_ptr,
-                                          size_t dst_len,
-                                          uint8_t* dst_palette_ptr,
-                                          size_t dst_palette_len,
-                                          const uint8_t* src_ptr,
-                                          size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len4 < src_len2) ? dst_len4 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
-                         wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2))));
-
-    s += 1 * 2;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__bgrx(uint8_t* dst_ptr,
-                                       size_t dst_len,
-                                       uint8_t* dst_palette_ptr,
-                                       size_t dst_palette_len,
-                                       const uint8_t* src_ptr,
-                                       size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        0xFF000000 | wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_sse42
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42(uint8_t* dst_ptr,
-                                                 size_t dst_len,
-                                                 uint8_t* dst_palette_ptr,
-                                                 size_t dst_palette_len,
-                                                 const uint8_t* src_ptr,
-                                                 size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len3 = src_len / 3;
-  size_t len = (dst_len4 < src_len3) ? dst_len4 : src_len3;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  __m128i shuffle = _mm_set_epi8(+0x00, +0x09, +0x0A, +0x0B,  //
-                                 +0x00, +0x06, +0x07, +0x08,  //
-                                 +0x00, +0x03, +0x04, +0x05,  //
-                                 +0x00, +0x00, +0x01, +0x02);
-  __m128i or_ff = _mm_set_epi8(-0x01, +0x00, +0x00, +0x00,  //
-                               -0x01, +0x00, +0x00, +0x00,  //
-                               -0x01, +0x00, +0x00, +0x00,  //
-                               -0x01, +0x00, +0x00, +0x00);
-
-  while (n >= 6) {
-    __m128i x;
-    x = _mm_lddqu_si128((const __m128i*)(const void*)s);
-    x = _mm_shuffle_epi8(x, shuffle);
-    x = _mm_or_si128(x, or_ff);
-    _mm_storeu_si128((__m128i*)(void*)d, x);
-
-    s += 4 * 3;
-    d += 4 * 4;
-    n -= 4;
-  }
-
-  while (n >= 1) {
-    uint8_t b0 = s[0];
-    uint8_t b1 = s[1];
-    uint8_t b2 = s[2];
-    d[0] = b2;
-    d[1] = b1;
-    d[2] = b0;
-    d[3] = 0xFF;
-
-    s += 1 * 3;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_sse42
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__rgb(uint8_t* dst_ptr,
-                                      size_t dst_len,
-                                      uint8_t* dst_palette_ptr,
-                                      size_t dst_palette_len,
-                                      const uint8_t* src_ptr,
-                                      size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len3 = src_len / 3;
-  size_t len = (dst_len4 < src_len3) ? dst_len4 : src_len3;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint8_t b0 = s[0];
-    uint8_t b1 = s[1];
-    uint8_t b2 = s[2];
-    d[0] = b2;
-    d[1] = b1;
-    d[2] = b0;
-    d[3] = 0xFF;
-
-    s += 1 * 3;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__rgbx(uint8_t* dst_ptr,
-                                       size_t dst_len,
-                                       uint8_t* dst_palette_ptr,
-                                       size_t dst_palette_len,
-                                       const uint8_t* src_ptr,
-                                       size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len4 < src_len4) ? dst_len4 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint8_t b0 = s[0];
-    uint8_t b1 = s[1];
-    uint8_t b2 = s[2];
-    d[0] = b2;
-    d[1] = b1;
-    d[2] = b0;
-    d[3] = 0xFF;
-
-    s += 1 * 4;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw_4x16le__bgr(uint8_t* dst_ptr,
-                                             size_t dst_len,
-                                             uint8_t* dst_palette_ptr,
-                                             size_t dst_palette_len,
-                                             const uint8_t* src_ptr,
-                                             size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len3 = src_len / 3;
-  size_t len = (dst_len8 < src_len3) ? dst_len8 : src_len3;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    d[0] = s0;
-    d[1] = s0;
-    d[2] = s1;
-    d[3] = s1;
-    d[4] = s2;
-    d[5] = s2;
-    d[6] = 0xFF;
-    d[7] = 0xFF;
-
-    s += 1 * 3;
-    d += 1 * 8;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw_4x16le__bgr_565(uint8_t* dst_ptr,
-                                                 size_t dst_len,
-                                                 uint8_t* dst_palette_ptr,
-                                                 size_t dst_palette_len,
-                                                 const uint8_t* src_ptr,
-                                                 size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len8 < src_len2) ? dst_len8 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8),
-        wuffs_base__color_u32__as__color_u64(
-            wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
-                wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2)))));
-
-    s += 1 * 2;
-    d += 1 * 8;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw_4x16le__bgrx(uint8_t* dst_ptr,
-                                              size_t dst_len,
-                                              uint8_t* dst_palette_ptr,
-                                              size_t dst_palette_len,
-                                              const uint8_t* src_ptr,
-                                              size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len8 < src_len4) ? dst_len8 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    d[0] = s0;
-    d[1] = s0;
-    d[2] = s1;
-    d[3] = s1;
-    d[4] = s2;
-    d[5] = s2;
-    d[6] = 0xFF;
-    d[7] = 0xFF;
-
-    s += 1 * 4;
-    d += 1 * 8;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw_4x16le__rgb(uint8_t* dst_ptr,
-                                             size_t dst_len,
-                                             uint8_t* dst_palette_ptr,
-                                             size_t dst_palette_len,
-                                             const uint8_t* src_ptr,
-                                             size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len3 = src_len / 3;
-  size_t len = (dst_len8 < src_len3) ? dst_len8 : src_len3;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    uint8_t s2 = s[2];
-    d[0] = s2;
-    d[1] = s2;
-    d[2] = s1;
-    d[3] = s1;
-    d[4] = s0;
-    d[5] = s0;
-    d[6] = 0xFF;
-    d[7] = 0xFF;
-
-    s += 1 * 3;
-    d += 1 * 8;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__rgb__bgr_565(uint8_t* dst_ptr,
-                                         size_t dst_len,
-                                         uint8_t* dst_palette_ptr,
-                                         size_t dst_palette_len,
-                                         const uint8_t* src_ptr,
-                                         size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len3 < src_len2) ? dst_len3 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u24le__no_bounds_check(
-        d + (0 * 3),
-        wuffs_base__swap_u32_argb_abgr(
-            wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
-                wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2)))));
-
-    s += 1 * 2;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len4 < src_len8) ? dst_len4 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-
-  size_t n = len;
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__color_u64__as__color_u32__swap_u32_argb_abgr(
-                         wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8))));
-
-    s += 1 * 8;
-    d += 1 * 4;
-    n -= 1;
-  }
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len8 = src_len / 8;
-  size_t len = (dst_len4 < src_len8) ? dst_len4 : src_len8;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint64_t d0 = wuffs_base__color_u32__as__color_u64(
-        wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4)));
-    uint64_t s0 = wuffs_base__swap_u64_argb_abgr(
-        wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__color_u64__as__color_u32(
-            wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0)));
-
-    s += 1 * 8;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__rgbw__bgr_565(uint8_t* dst_ptr,
-                                          size_t dst_len,
-                                          uint8_t* dst_palette_ptr,
-                                          size_t dst_palette_len,
-                                          const uint8_t* src_ptr,
-                                          size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len4 < src_len2) ? dst_len4 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4),
-        wuffs_base__swap_u32_argb_abgr(
-            wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
-                wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2)))));
-
-    s += 1 * 2;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__index__src(uint8_t* dst_ptr,
-                                            size_t dst_len,
-                                            uint8_t* dst_palette_ptr,
-                                            size_t dst_palette_len,
-                                            const uint8_t* src_ptr,
-                                            size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len3 = dst_len / 3;
-  size_t len = (dst_len3 < src_len) ? dst_len3 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  const size_t loop_unroll_count = 4;
-
-  // The comparison in the while condition is ">", not ">=", because with
-  // ">=", the last 4-byte store could write past the end of the dst slice.
-  //
-  // Each 4-byte store writes one too many bytes, but a subsequent store
-  // will overwrite that with the correct byte. There is always another
-  // store, whether a 4-byte store in this loop or a 1-byte store in the
-  // next loop.
-  while (n > loop_unroll_count) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 3), wuffs_base__peek_u32le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[0] * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (1 * 3), wuffs_base__peek_u32le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[1] * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (2 * 3), wuffs_base__peek_u32le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[2] * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (3 * 3), wuffs_base__peek_u32le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[3] * 4)));
-
-    s += loop_unroll_count * 1;
-    d += loop_unroll_count * 3;
-    n -= loop_unroll_count;
-  }
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
-
-    s += 1 * 1;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__index_bgra_nonpremul__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len3 = dst_len / 3;
-  size_t len = (dst_len3 < src_len) ? dst_len3 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint32_t d0 =
-        wuffs_base__peek_u24le__no_bounds_check(d + (0 * 3)) | 0xFF000000;
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    wuffs_base__poke_u24le__no_bounds_check(
-        d + (0 * 3), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));
-
-    s += 1 * 1;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len3 = dst_len / 3;
-  size_t len = (dst_len3 < src_len) ? dst_len3 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  const size_t loop_unroll_count = 4;
-
-  while (n >= loop_unroll_count) {
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    if (s0) {
-      wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
-    }
-    uint32_t s1 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[1] * 4));
-    if (s1) {
-      wuffs_base__poke_u24le__no_bounds_check(d + (1 * 3), s1);
-    }
-    uint32_t s2 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[2] * 4));
-    if (s2) {
-      wuffs_base__poke_u24le__no_bounds_check(d + (2 * 3), s2);
-    }
-    uint32_t s3 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[3] * 4));
-    if (s3) {
-      wuffs_base__poke_u24le__no_bounds_check(d + (3 * 3), s3);
-    }
-
-    s += loop_unroll_count * 1;
-    d += loop_unroll_count * 3;
-    n -= loop_unroll_count;
-  }
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    if (s0) {
-      wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
-    }
-
-    s += 1 * 1;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__xxxx(uint8_t* dst_ptr,
-                                      size_t dst_len,
-                                      uint8_t* dst_palette_ptr,
-                                      size_t dst_palette_len,
-                                      const uint8_t* src_ptr,
-                                      size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len4 = src_len / 4;
-  size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    wuffs_base__poke_u24le__no_bounds_check(
-        d + (0 * 3), wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
-
-    s += 1 * 4;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__y(uint8_t* dst_ptr,
-                                   size_t dst_len,
-                                   uint8_t* dst_palette_ptr,
-                                   size_t dst_palette_len,
-                                   const uint8_t* src_ptr,
-                                   size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t len = (dst_len3 < src_len) ? dst_len3 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    d[0] = s0;
-    d[1] = s0;
-    d[2] = s0;
-
-    s += 1 * 1;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__y_16be(uint8_t* dst_ptr,
-                                        size_t dst_len,
-                                        uint8_t* dst_palette_ptr,
-                                        size_t dst_palette_len,
-                                        const uint8_t* src_ptr,
-                                        size_t src_len) {
-  size_t dst_len3 = dst_len / 3;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len3 < src_len2) ? dst_len3 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  // TODO: unroll.
-
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    d[0] = s0;
-    d[1] = s0;
-    d[2] = s0;
-
-    s += 1 * 2;
-    d += 1 * 3;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__index__src(uint8_t* dst_ptr,
-                                             size_t dst_len,
-                                             uint8_t* dst_palette_ptr,
-                                             size_t dst_palette_len,
-                                             const uint8_t* src_ptr,
-                                             size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len4 = dst_len / 4;
-  size_t len = (dst_len4 < src_len) ? dst_len4 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  const size_t loop_unroll_count = 4;
-
-  while (n >= loop_unroll_count) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__peek_u32le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[0] * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (1 * 4), wuffs_base__peek_u32le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[1] * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (2 * 4), wuffs_base__peek_u32le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[2] * 4)));
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (3 * 4), wuffs_base__peek_u32le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[3] * 4)));
-
-    s += loop_unroll_count * 1;
-    d += loop_unroll_count * 4;
-    n -= loop_unroll_count;
-  }
-
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__peek_u32le__no_bounds_check(
-                         dst_palette_ptr + ((size_t)s[0] * 4)));
-
-    s += 1 * 1;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len4 = dst_len / 4;
-  size_t len = (dst_len4 < src_len) ? dst_len4 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  const size_t loop_unroll_count = 4;
-
-  while (n >= loop_unroll_count) {
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    if (s0) {
-      wuffs_base__poke_u32le__no_bounds_check(d + (0 * 4), s0);
-    }
-    uint32_t s1 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[1] * 4));
-    if (s1) {
-      wuffs_base__poke_u32le__no_bounds_check(d + (1 * 4), s1);
-    }
-    uint32_t s2 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[2] * 4));
-    if (s2) {
-      wuffs_base__poke_u32le__no_bounds_check(d + (2 * 4), s2);
-    }
-    uint32_t s3 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[3] * 4));
-    if (s3) {
-      wuffs_base__poke_u32le__no_bounds_check(d + (3 * 4), s3);
-    }
-
-    s += loop_unroll_count * 1;
-    d += loop_unroll_count * 4;
-    n -= loop_unroll_count;
-  }
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    if (s0) {
-      wuffs_base__poke_u32le__no_bounds_check(d + (0 * 4), s0);
-    }
-
-    s += 1 * 1;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_sse42
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__y__x86_sse42(uint8_t* dst_ptr,
-                                               size_t dst_len,
-                                               uint8_t* dst_palette_ptr,
-                                               size_t dst_palette_len,
-                                               const uint8_t* src_ptr,
-                                               size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t len = (dst_len4 < src_len) ? dst_len4 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  __m128i shuffle = _mm_set_epi8(+0x03, +0x03, +0x03, +0x03,  //
-                                 +0x02, +0x02, +0x02, +0x02,  //
-                                 +0x01, +0x01, +0x01, +0x01,  //
-                                 +0x00, +0x00, +0x00, +0x00);
-  __m128i or_ff = _mm_set_epi8(-0x01, +0x00, +0x00, +0x00,  //
-                               -0x01, +0x00, +0x00, +0x00,  //
-                               -0x01, +0x00, +0x00, +0x00,  //
-                               -0x01, +0x00, +0x00, +0x00);
-
-  while (n >= 4) {
-    __m128i x;
-    x = _mm_cvtsi32_si128((int)(wuffs_base__peek_u32le__no_bounds_check(s)));
-    x = _mm_shuffle_epi8(x, shuffle);
-    x = _mm_or_si128(x, or_ff);
-    _mm_storeu_si128((__m128i*)(void*)d, x);
-
-    s += 4 * 1;
-    d += 4 * 4;
-    n -= 4;
-  }
-
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), 0xFF000000 | (0x010101 * (uint32_t)s[0]));
-
-    s += 1 * 1;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_sse42
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__y(uint8_t* dst_ptr,
-                                    size_t dst_len,
-                                    uint8_t* dst_palette_ptr,
-                                    size_t dst_palette_len,
-                                    const uint8_t* src_ptr,
-                                    size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t len = (dst_len4 < src_len) ? dst_len4 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), 0xFF000000 | (0x010101 * (uint32_t)s[0]));
-
-    s += 1 * 1;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__y_16be(uint8_t* dst_ptr,
-                                         size_t dst_len,
-                                         uint8_t* dst_palette_ptr,
-                                         size_t dst_palette_len,
-                                         const uint8_t* src_ptr,
-                                         size_t src_len) {
-  size_t dst_len4 = dst_len / 4;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len4 < src_len2) ? dst_len4 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), 0xFF000000 | (0x010101 * (uint32_t)s[0]));
-
-    s += 1 * 2;
-    d += 1 * 4;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxxxxxx__index__src(uint8_t* dst_ptr,
-                                                 size_t dst_len,
-                                                 uint8_t* dst_palette_ptr,
-                                                 size_t dst_palette_len,
-                                                 const uint8_t* src_ptr,
-                                                 size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len8 = dst_len / 8;
-  size_t len = (dst_len8 < src_len) ? dst_len8 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8), wuffs_base__color_u32__as__color_u64(
-                         wuffs_base__peek_u32le__no_bounds_check(
-                             dst_palette_ptr + ((size_t)s[0] * 4))));
-
-    s += 1 * 1;
-    d += 1 * 8;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxxxxxx__index_binary_alpha__src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    const uint8_t* src_ptr,
-    size_t src_len) {
-  if (dst_palette_len !=
-      WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-    return 0;
-  }
-  size_t dst_len8 = dst_len / 8;
-  size_t len = (dst_len8 < src_len) ? dst_len8 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
-                                                          ((size_t)s[0] * 4));
-    if (s0) {
-      wuffs_base__poke_u64le__no_bounds_check(
-          d + (0 * 8), wuffs_base__color_u32__as__color_u64(s0));
-    }
-
-    s += 1 * 1;
-    d += 1 * 8;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxxxxxx__y(uint8_t* dst_ptr,
-                                        size_t dst_len,
-                                        uint8_t* dst_palette_ptr,
-                                        size_t dst_palette_len,
-                                        const uint8_t* src_ptr,
-                                        size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t len = (dst_len8 < src_len) ? dst_len8 : src_len;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8), 0xFFFF000000000000 | (0x010101010101 * (uint64_t)s[0]));
-
-    s += 1 * 1;
-    d += 1 * 8;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__xxxxxxxx__y_16be(uint8_t* dst_ptr,
-                                             size_t dst_len,
-                                             uint8_t* dst_palette_ptr,
-                                             size_t dst_palette_len,
-                                             const uint8_t* src_ptr,
-                                             size_t src_len) {
-  size_t dst_len8 = dst_len / 8;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len8 < src_len2) ? dst_len8 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint64_t s0 =
-        ((uint64_t)(wuffs_base__peek_u16be__no_bounds_check(s + (0 * 2))));
-    wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8), 0xFFFF000000000000 | (0x000100010001 * s0));
-
-    s += 1 * 2;
-    d += 1 * 8;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__y__y_16be(uint8_t* dst_ptr,
-                                      size_t dst_len,
-                                      uint8_t* dst_palette_ptr,
-                                      size_t dst_palette_len,
-                                      const uint8_t* src_ptr,
-                                      size_t src_len) {
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len < src_len2) ? dst_len : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    d[0] = s[0];
-
-    s += 1 * 2;
-    d += 1 * 1;
-    n -= 1;
-  }
-
-  return len;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__y_16le__y_16be(uint8_t* dst_ptr,
-                                           size_t dst_len,
-                                           uint8_t* dst_palette_ptr,
-                                           size_t dst_palette_len,
-                                           const uint8_t* src_ptr,
-                                           size_t src_len) {
-  size_t dst_len2 = dst_len / 2;
-  size_t src_len2 = src_len / 2;
-  size_t len = (dst_len2 < src_len2) ? dst_len2 : src_len2;
-  uint8_t* d = dst_ptr;
-  const uint8_t* s = src_ptr;
-  size_t n = len;
-
-  while (n >= 1) {
-    uint8_t s0 = s[0];
-    uint8_t s1 = s[1];
-    d[0] = s1;
-    d[1] = s0;
-
-    s += 1 * 2;
-    d += 1 * 2;
-    n -= 1;
-  }
-
-  return len;
-}
-
-// --------
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__transparent_black_src(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    uint64_t num_pixels,
-    uint32_t dst_pixfmt_bytes_per_pixel) {
-  uint64_t n = ((uint64_t)dst_len) / dst_pixfmt_bytes_per_pixel;
-  if (n > num_pixels) {
-    n = num_pixels;
-  }
-  memset(dst_ptr, 0, ((size_t)(n * dst_pixfmt_bytes_per_pixel)));
-  return n;
-}
-
-static uint64_t  //
-wuffs_base__pixel_swizzler__transparent_black_src_over(
-    uint8_t* dst_ptr,
-    size_t dst_len,
-    uint8_t* dst_palette_ptr,
-    size_t dst_palette_len,
-    uint64_t num_pixels,
-    uint32_t dst_pixfmt_bytes_per_pixel) {
-  uint64_t n = ((uint64_t)dst_len) / dst_pixfmt_bytes_per_pixel;
-  if (n > num_pixels) {
-    n = num_pixels;
-  }
-  return n;
-}
-
-// --------
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p,
-                                       wuffs_base__pixel_format dst_pixfmt,
-                                       wuffs_base__slice_u8 dst_palette,
-                                       wuffs_base__slice_u8 src_palette,
-                                       wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__Y:
-      return wuffs_base__pixel_swizzler__copy_1_1;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__y;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__xxx__y;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-      if (wuffs_base__cpu_arch__have_x86_sse42()) {
-        return wuffs_base__pixel_swizzler__xxxx__y__x86_sse42;
-      }
-#endif
-      return wuffs_base__pixel_swizzler__xxxx__y;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__xxxxxxxx__y;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__y_16be(wuffs_base__pixel_swizzler* p,
-                                            wuffs_base__pixel_format dst_pixfmt,
-                                            wuffs_base__slice_u8 dst_palette,
-                                            wuffs_base__slice_u8 src_palette,
-                                            wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__Y:
-      return wuffs_base__pixel_swizzler__y__y_16be;
-
-    case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
-      return wuffs_base__pixel_swizzler__y_16le__y_16be;
-
-    case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
-      return wuffs_base__pixel_swizzler__copy_2_2;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__y_16be;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__xxx__y_16be;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__pixel_swizzler__xxxx__y_16be;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__xxxxxxxx__y_16be;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__indexed__bgra_nonpremul(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-          WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_1_1;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__squash_align4_bgr_565_8888(
-                  dst_palette.ptr, dst_palette.len, src_palette.ptr,
-                  src_palette.len, true) !=
-              (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__bgr_565__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-              WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__bgr_565__index_bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src(
-                  dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
-                  src_palette.len) !=
-              (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__xxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-              WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__xxx__index_bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-          WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__index_bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-          WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxxxxxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__index_bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src(
-                  dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
-                  src_palette.len) !=
-              (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-              WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__bgra_premul__index_bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src(
-                  dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
-                  src_palette.len) !=
-              (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__xxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
-                  dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
-                  src_palette.len) !=
-              (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__xxx__index_bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
-              dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
-              src_palette.len) !=
-          (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__index_bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src(
-                  dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
-                  src_palette.len) !=
-              (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
-                  dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
-                  src_palette.len) !=
-              (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-            return NULL;
-          }
-          return wuffs_base__pixel_swizzler__bgra_premul__index_bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      // TODO.
-      break;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-          WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_1_1;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      if (wuffs_base__pixel_swizzler__squash_align4_bgr_565_8888(
-              dst_palette.ptr, dst_palette.len, src_palette.ptr,
-              src_palette.len, false) !=
-          (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__index_binary_alpha__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-          WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-          WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
-          WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxxxxxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxxxxxxx__index_binary_alpha__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
-              dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
-              src_palette.len) !=
-          (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-      if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
-              dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
-              src_palette.len) !=
-          (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
-        return NULL;
-      }
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;
-      }
-      return NULL;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgr_565(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__copy_2_2;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      return wuffs_base__pixel_swizzler__bgr__bgr_565;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      return wuffs_base__pixel_swizzler__bgrw__bgr_565;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__bgrw_4x16le__bgr_565;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__rgb__bgr_565;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__pixel_swizzler__rgbw__bgr_565;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p,
-                                         wuffs_base__pixel_format dst_pixfmt,
-                                         wuffs_base__slice_u8 dst_palette,
-                                         wuffs_base__slice_u8 src_palette,
-                                         wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__bgr;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      return wuffs_base__pixel_swizzler__copy_3_3;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      return wuffs_base__pixel_swizzler__bgrw__bgr;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__bgrw_4x16le__bgr;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__swap_rgb_bgr;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-      if (wuffs_base__cpu_arch__have_x86_sse42()) {
-        return wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42;
-      }
-#endif
-      return wuffs_base__pixel_swizzler__bgrw__rgb;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgra_nonpremul(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_4_4;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      // TODO.
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-          if (wuffs_base__cpu_arch__have_x86_sse42()) {
-            return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42;
-          }
-#endif
-          return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      // TODO.
-      break;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgra_nonpremul_4x16le(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_8_8;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      // TODO.
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src_over;
-      }
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      // TODO.
-      break;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgra_premul(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_4_4;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-          if (wuffs_base__cpu_arch__have_x86_sse42()) {
-            return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42;
-          }
-#endif
-          return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_premul__src_over;
-      }
-      return NULL;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgrx(wuffs_base__pixel_swizzler* p,
-                                          wuffs_base__pixel_format dst_pixfmt,
-                                          wuffs_base__slice_u8 dst_palette,
-                                          wuffs_base__slice_u8 src_palette,
-                                          wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__bgrx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      return wuffs_base__pixel_swizzler__xxx__xxxx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-      return wuffs_base__pixel_swizzler__bgrw__bgrx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__bgrw_4x16le__bgrx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      return wuffs_base__pixel_swizzler__copy_4_4;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__bgr__rgbx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__pixel_swizzler__bgrw__rgbx;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__rgb(wuffs_base__pixel_swizzler* p,
-                                         wuffs_base__pixel_format dst_pixfmt,
-                                         wuffs_base__slice_u8 dst_palette,
-                                         wuffs_base__slice_u8 src_palette,
-                                         wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__rgb;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      return wuffs_base__pixel_swizzler__swap_rgb_bgr;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-      if (wuffs_base__cpu_arch__have_x86_sse42()) {
-        return wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42;
-      }
-#endif
-      return wuffs_base__pixel_swizzler__bgrw__rgb;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__bgrw_4x16le__rgb;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__copy_3_3;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__pixel_swizzler__bgrw__bgr;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__rgba_nonpremul(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__rgba_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-          if (wuffs_base__cpu_arch__have_x86_sse42()) {
-            return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42;
-          }
-#endif
-          return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      // TODO.
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_4_4;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      // TODO.
-      break;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__rgba_premul(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__rgba_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__rgba_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-          if (wuffs_base__cpu_arch__have_x86_sse42()) {
-            return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42;
-          }
-#endif
-          return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_4_4;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_premul__src_over;
-      }
-      return NULL;
-  }
-  return NULL;
-}
-
-// --------
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
-wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
-                                    wuffs_base__pixel_format dst_pixfmt,
-                                    wuffs_base__slice_u8 dst_palette,
-                                    wuffs_base__pixel_format src_pixfmt,
-                                    wuffs_base__slice_u8 src_palette,
-                                    wuffs_base__pixel_blend blend) {
-  if (!p) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  p->private_impl.func = NULL;
-  p->private_impl.transparent_black_func = NULL;
-  p->private_impl.dst_pixfmt_bytes_per_pixel = 0;
-  p->private_impl.src_pixfmt_bytes_per_pixel = 0;
-
-  wuffs_base__pixel_swizzler__func func = NULL;
-  wuffs_base__pixel_swizzler__transparent_black_func transparent_black_func =
-      NULL;
-
-  uint32_t dst_pixfmt_bits_per_pixel =
-      wuffs_base__pixel_format__bits_per_pixel(&dst_pixfmt);
-  if ((dst_pixfmt_bits_per_pixel == 0) ||
-      ((dst_pixfmt_bits_per_pixel & 7) != 0)) {
-    return wuffs_base__make_status(
-        wuffs_base__error__unsupported_pixel_swizzler_option);
-  }
-
-  uint32_t src_pixfmt_bits_per_pixel =
-      wuffs_base__pixel_format__bits_per_pixel(&src_pixfmt);
-  if ((src_pixfmt_bits_per_pixel == 0) ||
-      ((src_pixfmt_bits_per_pixel & 7) != 0)) {
-    return wuffs_base__make_status(
-        wuffs_base__error__unsupported_pixel_swizzler_option);
-  }
-
-  // TODO: support many more formats.
-
-  switch (blend) {
-    case WUFFS_BASE__PIXEL_BLEND__SRC:
-      transparent_black_func =
-          wuffs_base__pixel_swizzler__transparent_black_src;
-      break;
-
-    case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-      transparent_black_func =
-          wuffs_base__pixel_swizzler__transparent_black_src_over;
-      break;
-  }
-
-  switch (src_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__Y:
-      func = wuffs_base__pixel_swizzler__prepare__y(p, dst_pixfmt, dst_palette,
-                                                    src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
-      func = wuffs_base__pixel_swizzler__prepare__y_16be(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__indexed__bgra_nonpremul(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:
-      func = wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      func = wuffs_base__pixel_swizzler__prepare__bgr_565(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      func = wuffs_base__pixel_swizzler__prepare__bgr(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__bgra_nonpremul(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      func = wuffs_base__pixel_swizzler__prepare__bgra_nonpremul_4x16le(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__bgra_premul(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      func = wuffs_base__pixel_swizzler__prepare__bgrx(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      func = wuffs_base__pixel_swizzler__prepare__rgb(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__rgba_nonpremul(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__rgba_premul(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
-      break;
-  }
-
-  p->private_impl.func = func;
-  p->private_impl.transparent_black_func = transparent_black_func;
-  p->private_impl.dst_pixfmt_bytes_per_pixel = dst_pixfmt_bits_per_pixel / 8;
-  p->private_impl.src_pixfmt_bytes_per_pixel = src_pixfmt_bits_per_pixel / 8;
-  return wuffs_base__make_status(
-      func ? NULL : wuffs_base__error__unsupported_pixel_swizzler_option);
-}
-
-WUFFS_BASE__MAYBE_STATIC uint64_t  //
-wuffs_base__pixel_swizzler__limited_swizzle_u32_interleaved_from_reader(
-    const wuffs_base__pixel_swizzler* p,
-    uint32_t up_to_num_pixels,
-    wuffs_base__slice_u8 dst,
-    wuffs_base__slice_u8 dst_palette,
-    const uint8_t** ptr_iop_r,
-    const uint8_t* io2_r) {
-  if (p && p->private_impl.func) {
-    const uint8_t* iop_r = *ptr_iop_r;
-    uint64_t src_len = wuffs_base__u64__min(
-        ((uint64_t)up_to_num_pixels) *
-            ((uint64_t)p->private_impl.src_pixfmt_bytes_per_pixel),
-        ((uint64_t)(io2_r - iop_r)));
-    uint64_t n =
-        (*p->private_impl.func)(dst.ptr, dst.len, dst_palette.ptr,
-                                dst_palette.len, iop_r, (size_t)src_len);
-    *ptr_iop_r += n * p->private_impl.src_pixfmt_bytes_per_pixel;
-    return n;
-  }
-  return 0;
-}
-
-WUFFS_BASE__MAYBE_STATIC uint64_t  //
-wuffs_base__pixel_swizzler__swizzle_interleaved_from_reader(
-    const wuffs_base__pixel_swizzler* p,
-    wuffs_base__slice_u8 dst,
-    wuffs_base__slice_u8 dst_palette,
-    const uint8_t** ptr_iop_r,
-    const uint8_t* io2_r) {
-  if (p && p->private_impl.func) {
-    const uint8_t* iop_r = *ptr_iop_r;
-    uint64_t src_len = ((uint64_t)(io2_r - iop_r));
-    uint64_t n =
-        (*p->private_impl.func)(dst.ptr, dst.len, dst_palette.ptr,
-                                dst_palette.len, iop_r, (size_t)src_len);
-    *ptr_iop_r += n * p->private_impl.src_pixfmt_bytes_per_pixel;
-    return n;
-  }
-  return 0;
-}
-
-WUFFS_BASE__MAYBE_STATIC uint64_t  //
-wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(
-    const wuffs_base__pixel_swizzler* p,
-    wuffs_base__slice_u8 dst,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src) {
-  if (p && p->private_impl.func) {
-    return (*p->private_impl.func)(dst.ptr, dst.len, dst_palette.ptr,
-                                   dst_palette.len, src.ptr, src.len);
-  }
-  return 0;
-}
-
-WUFFS_BASE__MAYBE_STATIC uint64_t  //
-wuffs_base__pixel_swizzler__swizzle_interleaved_transparent_black(
-    const wuffs_base__pixel_swizzler* p,
-    wuffs_base__slice_u8 dst,
-    wuffs_base__slice_u8 dst_palette,
-    uint64_t num_pixels) {
-  if (p && p->private_impl.transparent_black_func) {
-    return (*p->private_impl.transparent_black_func)(
-        dst.ptr, dst.len, dst_palette.ptr, dst_palette.len, num_pixels,
-        p->private_impl.dst_pixfmt_bytes_per_pixel);
-  }
-  return 0;
-}
-
-// --------
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2);
-
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2);
-
-#if defined(__GNUC__) && !defined(__clang__)
-// No-op.
-#else
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
-static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,
-    const uint8_t* src_ptr_minor,
-    size_t src_len,
-    uint32_t h1v2_bias_ignored,
-    bool first_column,
-    bool last_column);
-#endif
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_64)
-
-// --------
-
-static inline uint32_t  //
-wuffs_base__u32__max_of_4(uint32_t a, uint32_t b, uint32_t c, uint32_t d) {
-  return wuffs_base__u32__max(     //
-      wuffs_base__u32__max(a, b),  //
-      wuffs_base__u32__max(c, d));
-}
-
-static inline uint32_t  //
-wuffs_base__u32__min_of_5(uint32_t a,
-                          uint32_t b,
-                          uint32_t c,
-                          uint32_t d,
-                          uint32_t e) {
-  return wuffs_base__u32__min(          //
-      wuffs_base__u32__min(             //
-          wuffs_base__u32__min(a, b),   //
-          wuffs_base__u32__min(c, d)),  //
-      e);
-}
-
-// --------
-
-typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_4_func)(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2,
-    const uint8_t* up3);
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_cmyk__convert_4_general(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2,
-    const uint8_t* up3) {
-  for (; x < x_end; x++) {
-    // It's called CMYK but, but for Adobe CMYK JPEG images in practice, it's
-    // RGBW: 0xFFu means no ink instead of full ink. Note that a double
-    // inversion is a no-op, so inversions might be implicit in the code below.
-    uint32_t r = ((uint32_t)(*up0++));
-    uint32_t g = ((uint32_t)(*up1++));
-    uint32_t b = ((uint32_t)(*up2++));
-    uint32_t w = ((uint32_t)(*up3++));
-    r = ((r * w) + 0x7Fu) / 0xFFu;
-    g = ((g * w) + 0x7Fu) / 0xFFu;
-    b = ((b * w) + 0x7Fu) / 0xFFu;
-    wuffs_base__pixel_buffer__set_color_u32_at(
-        dst, x, y, 0xFF000000u | (r << 16u) | (g << 8u) | (b << 0u));
-  }
-}
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycck__convert_4_general(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2,
-    const uint8_t* up3) {
-  for (; x < x_end; x++) {
-    // We invert once again: 0xFFu means no ink instead of full ink.
-    uint32_t color =                           //
-        wuffs_base__color_ycc__as__color_u32(  //
-            *up0++, *up1++, *up2++);
-    uint32_t r = 0xFFu - (0xFFu & (color >> 16u));
-    uint32_t g = 0xFFu - (0xFFu & (color >> 8u));
-    uint32_t b = 0xFFu - (0xFFu & (color >> 0u));
-    uint32_t w = ((uint32_t)(*up3++));
-    r = ((r * w) + 0x7Fu) / 0xFFu;
-    g = ((g * w) + 0x7Fu) / 0xFFu;
-    b = ((b * w) + 0x7Fu) / 0xFFu;
-    wuffs_base__pixel_buffer__set_color_u32_at(
-        dst, x, y, 0xFF000000u | (r << 16u) | (g << 8u) | (b << 0u));
-  }
-}
-
-// --------
-
-typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func)(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2);
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_rgb__convert_3_general(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2) {
-  for (; x < x_end; x++) {
-    uint32_t color = 0xFF000000u |                    //
-                     (((uint32_t)(*up0++)) << 16u) |  //
-                     (((uint32_t)(*up1++)) << 8u) |   //
-                     (((uint32_t)(*up2++)) << 0u);
-    wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color);
-  }
-}
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_general(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2) {
-  for (; x < x_end; x++) {
-    uint32_t color =                           //
-        wuffs_base__color_ycc__as__color_u32(  //
-            *up0++, *up1++, *up2++);
-    wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color);
-  }
-}
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2) {
-  size_t dst_stride = dst->private_impl.planes[0].stride;
-  uint8_t* dst_iter = dst->private_impl.planes[0].ptr +
-                      (dst_stride * ((size_t)y)) + (4u * ((size_t)x));
-
-  for (; x < x_end; x++) {
-    uint32_t color =                           //
-        wuffs_base__color_ycc__as__color_u32(  //
-            *up0++, *up1++, *up2++);
-    wuffs_base__poke_u32le__no_bounds_check(dst_iter, color);
-    dst_iter += 4u;
-  }
-}
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2) {
-  size_t dst_stride = dst->private_impl.planes[0].stride;
-  uint8_t* dst_iter = dst->private_impl.planes[0].ptr +
-                      (dst_stride * ((size_t)y)) + (4u * ((size_t)x));
-
-  for (; x < x_end; x++) {
-    uint32_t color =                                //
-        wuffs_base__color_ycc__as__color_u32_abgr(  //
-            *up0++, *up1++, *up2++);
-    wuffs_base__poke_u32le__no_bounds_check(dst_iter, color);
-    dst_iter += 4u;
-  }
-}
-
-// --------
-
-// wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upsamples to a
-// destination slice at least 480 (YCCK) or 672 (YCC) bytes long and whose
-// src_len (multiplied by 1, 2, 3 or 4) is positive but no more than that. This
-// 480 or 672 length is just under 1/4 or 1/3 of the scratch_buffer_2k slice
-// length. Both (480 * 4) = 1920 and (672 * 3) = 2016 are less than 2048.
-//
-// 480 and 672 are nice round numbers because a JPEG MCU is 1, 2, 3 or 4 blocks
-// wide and each block is 8 pixels wide. We have:
-//   480 = 1 * 8 * 60,   672 = 1 * 8 * 84
-//   480 = 2 * 8 * 30,   672 = 2 * 8 * 42
-//   480 = 3 * 8 * 20,   672 = 3 * 8 * 28
-//   480 = 4 * 8 * 15,   672 = 4 * 8 * 21
-//
-// Box filters are equivalent to nearest neighbor upsampling. These ignore the
-// src_ptr_minor, h1v2_bias, first_column and last_column arguments.
-//
-// Triangle filters use a 3:1 ratio (in 1 dimension), or 9:3:3:1 (in 2
-// dimensions), which is higher quality (less blocky) but also higher
-// computational effort.
-//
-// In theory, we could use triangle filters for any (inv_h, inv_v) combination.
-// In practice, matching libjpeg-turbo, we only implement it for the common
-// chroma subsampling ratios (YCC420, YCC422 or YCC440), corresponding to an
-// (inv_h, inv_v) pair of (2, 2), (2, 1) or (1, 2).
-typedef const uint8_t* (
-    *wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func)(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,  // Nearest row.
-    const uint8_t* src_ptr_minor,  // Adjacent row, alternating above or below.
-    size_t src_len,
-    uint32_t h1v2_bias,
-    bool first_column,
-    bool last_column);
-
-static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,
-    const uint8_t* src_ptr_minor_ignored,
-    size_t src_len,
-    uint32_t h1v2_bias_ignored,
-    bool first_column_ignored,
-    bool last_column_ignored) {
-  return src_ptr_major;
-}
-
-static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,
-    const uint8_t* src_ptr_minor_ignored,
-    size_t src_len,
-    uint32_t h1v2_bias_ignored,
-    bool first_column_ignored,
-    bool last_column_ignored) {
-  uint8_t* dp = dst_ptr;
-  const uint8_t* sp = src_ptr_major;
-  while (src_len--) {
-    uint8_t sv = *sp++;
-    *dp++ = sv;
-    *dp++ = sv;
-  }
-  return dst_ptr;
-}
-
-static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,
-    const uint8_t* src_ptr_minor_ignored,
-    size_t src_len,
-    uint32_t h1v2_bias_ignored,
-    bool first_column_ignored,
-    bool last_column_ignored) {
-  uint8_t* dp = dst_ptr;
-  const uint8_t* sp = src_ptr_major;
-  while (src_len--) {
-    uint8_t sv = *sp++;
-    *dp++ = sv;
-    *dp++ = sv;
-    *dp++ = sv;
-  }
-  return dst_ptr;
-}
-
-static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,
-    const uint8_t* src_ptr_minor_ignored,
-    size_t src_len,
-    uint32_t h1v2_bias_ignored,
-    bool first_column_ignored,
-    bool last_column_ignored) {
-  uint8_t* dp = dst_ptr;
-  const uint8_t* sp = src_ptr_major;
-  while (src_len--) {
-    uint8_t sv = *sp++;
-    *dp++ = sv;
-    *dp++ = sv;
-    *dp++ = sv;
-    *dp++ = sv;
-  }
-  return dst_ptr;
-}
-
-static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1v2_triangle(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,
-    const uint8_t* src_ptr_minor,
-    size_t src_len,
-    uint32_t h1v2_bias,
-    bool first_column,
-    bool last_column) {
-  uint8_t* dp = dst_ptr;
-  const uint8_t* sp_major = src_ptr_major;
-  const uint8_t* sp_minor = src_ptr_minor;
-  while (src_len--) {
-    *dp++ = (uint8_t)(((3u * ((uint32_t)(*sp_major++))) +  //
-                       (1u * ((uint32_t)(*sp_minor++))) +  //
-                       h1v2_bias) >>
-                      2u);
-  }
-  return dst_ptr;
-}
-
-static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v1_triangle(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,
-    const uint8_t* src_ptr_minor,
-    size_t src_len,
-    uint32_t h1v2_bias_ignored,
-    bool first_column,
-    bool last_column) {
-  uint8_t* dp = dst_ptr;
-  const uint8_t* sp = src_ptr_major;
-
-  if (first_column) {
-    src_len--;
-    if ((src_len <= 0u) && last_column) {
-      uint8_t sv = *sp++;
-      *dp++ = sv;
-      *dp++ = sv;
-      return dst_ptr;
-    }
-    uint32_t svp1 = sp[+1];
-    uint8_t sv = *sp++;
-    *dp++ = sv;
-    *dp++ = (uint8_t)(((3u * (uint32_t)sv) + svp1 + 2u) >> 2u);
-    if (src_len <= 0u) {
-      return dst_ptr;
-    }
-  }
-
-  if (last_column) {
-    src_len--;
-  }
-
-  for (; src_len > 0u; src_len--) {
-    uint32_t svm1 = sp[-1];
-    uint32_t svp1 = sp[+1];
-    uint32_t sv3 = 3u * (uint32_t)(*sp++);
-    *dp++ = (uint8_t)((sv3 + svm1 + 1u) >> 2u);
-    *dp++ = (uint8_t)((sv3 + svp1 + 2u) >> 2u);
-  }
-
-  if (last_column) {
-    uint32_t svm1 = sp[-1];
-    uint8_t sv = *sp++;
-    *dp++ = (uint8_t)(((3u * (uint32_t)sv) + svm1 + 1u) >> 2u);
-    *dp++ = sv;
-  }
-
-  return dst_ptr;
-}
-
-static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,
-    const uint8_t* src_ptr_minor,
-    size_t src_len,
-    uint32_t h1v2_bias_ignored,
-    bool first_column,
-    bool last_column) {
-  uint8_t* dp = dst_ptr;
-  const uint8_t* sp_major = src_ptr_major;
-  const uint8_t* sp_minor = src_ptr_minor;
-
-  if (first_column) {
-    src_len--;
-    if ((src_len <= 0u) && last_column) {
-      uint32_t sv = (12u * ((uint32_t)(*sp_major++))) +  //
-                    (4u * ((uint32_t)(*sp_minor++)));
-      *dp++ = (uint8_t)((sv + 8u) >> 4u);
-      *dp++ = (uint8_t)((sv + 7u) >> 4u);
-      return dst_ptr;
-    }
-
-    uint32_t sv_major_m1 = sp_major[-0];  // Clamp offset to zero.
-    uint32_t sv_minor_m1 = sp_minor[-0];  // Clamp offset to zero.
-    uint32_t sv_major_p1 = sp_major[+1];
-    uint32_t sv_minor_p1 = sp_minor[+1];
-
-    uint32_t sv = (9u * ((uint32_t)(*sp_major++))) +  //
-                  (3u * ((uint32_t)(*sp_minor++)));
-    *dp++ = (uint8_t)((sv + (3u * sv_major_m1) + (sv_minor_m1) + 8u) >> 4u);
-    *dp++ = (uint8_t)((sv + (3u * sv_major_p1) + (sv_minor_p1) + 7u) >> 4u);
-    if (src_len <= 0u) {
-      return dst_ptr;
-    }
-  }
-
-  if (last_column) {
-    src_len--;
-  }
-
-  for (; src_len > 0u; src_len--) {
-    uint32_t sv_major_m1 = sp_major[-1];
-    uint32_t sv_minor_m1 = sp_minor[-1];
-    uint32_t sv_major_p1 = sp_major[+1];
-    uint32_t sv_minor_p1 = sp_minor[+1];
-
-    uint32_t sv = (9u * ((uint32_t)(*sp_major++))) +  //
-                  (3u * ((uint32_t)(*sp_minor++)));
-    *dp++ = (uint8_t)((sv + (3u * sv_major_m1) + (sv_minor_m1) + 8u) >> 4u);
-    *dp++ = (uint8_t)((sv + (3u * sv_major_p1) + (sv_minor_p1) + 7u) >> 4u);
-  }
-
-  if (last_column) {
-    uint32_t sv_major_m1 = sp_major[-1];
-    uint32_t sv_minor_m1 = sp_minor[-1];
-    uint32_t sv_major_p1 = sp_major[+0];  // Clamp offset to zero.
-    uint32_t sv_minor_p1 = sp_minor[+0];  // Clamp offset to zero.
-
-    uint32_t sv = (9u * ((uint32_t)(*sp_major++))) +  //
-                  (3u * ((uint32_t)(*sp_minor++)));
-    *dp++ = (uint8_t)((sv + (3u * sv_major_m1) + (sv_minor_m1) + 8u) >> 4u);
-    *dp++ = (uint8_t)((sv + (3u * sv_major_p1) + (sv_minor_p1) + 7u) >> 4u);
-  }
-
-  return dst_ptr;
-}
-
-// wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs is indexed by inv_h
-// and then inv_v.
-static const wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs[4][4] = {
-        {
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box,
-        },
-        {
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box,
-        },
-        {
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box,
-        },
-        {
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box,
-        },
-};
-
-static inline uint32_t  //
-wuffs_base__pixel_swizzler__has_triangle_upsampler(uint32_t inv_h,
-                                                   uint32_t inv_v) {
-  if (inv_h == 1u) {
-    return inv_v == 2u;
-  } else if (inv_h == 2u) {
-    return (inv_v == 1u) || (inv_v == 2u);
-  }
-  return false;
-}
-
-// --------
-
-// All of the wuffs_base__pixel_swizzler__swizzle_ycc__etc functions have
-// preconditions. See all of the checks made in
-// wuffs_base__pixel_swizzler__swizzle_ycck before calling these functions. For
-// example, (width > 0) is a precondition, but there are many more.
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter_edge_row(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t width,
-    uint32_t y,
-    const uint8_t* src_ptr0,
-    const uint8_t* src_ptr1,
-    const uint8_t* src_ptr2,
-    const uint8_t* src_ptr3,
-    uint32_t stride0,
-    uint32_t stride1,
-    uint32_t stride2,
-    uint32_t stride3,
-    uint32_t inv_h0,
-    uint32_t inv_h1,
-    uint32_t inv_h2,
-    uint32_t inv_h3,
-    uint32_t inv_v0,
-    uint32_t inv_v1,
-    uint32_t inv_v2,
-    uint32_t inv_v3,
-    uint32_t half_width_for_2to1,
-    uint32_t h1v2_bias,
-    uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc3,
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_4_func conv4func) {
-  const uint8_t* src0 = src_ptr0 + ((y / inv_v0) * (size_t)stride0);
-  const uint8_t* src1 = src_ptr1 + ((y / inv_v1) * (size_t)stride1);
-  const uint8_t* src2 = src_ptr2 + ((y / inv_v2) * (size_t)stride2);
-  const uint8_t* src3 = src_ptr3 + ((y / inv_v3) * (size_t)stride3);
-  uint32_t total_src_len0 = 0u;
-  uint32_t total_src_len1 = 0u;
-  uint32_t total_src_len2 = 0u;
-  uint32_t total_src_len3 = 0u;
-
-  uint32_t x = 0u;
-  while (x < width) {
-    bool first_column = x == 0u;
-    uint32_t end = x + 480u;
-    if (end > width) {
-      end = width;
-    }
-
-    uint32_t src_len0 = ((end - x) + inv_h0 - 1u) / inv_h0;
-    uint32_t src_len1 = ((end - x) + inv_h1 - 1u) / inv_h1;
-    uint32_t src_len2 = ((end - x) + inv_h2 - 1u) / inv_h2;
-    uint32_t src_len3 = ((end - x) + inv_h3 - 1u) / inv_h3;
-    total_src_len0 += src_len0;
-    total_src_len1 += src_len1;
-    total_src_len2 += src_len2;
-    total_src_len3 += src_len3;
-
-    const uint8_t* src_ptr_x0 = src0 + (x / inv_h0);
-    const uint8_t* up0 = (*upfunc0)(          //
-        scratch_buffer_2k_ptr + (0u * 480u),  //
-        src_ptr_x0,                           //
-        src_ptr_x0,                           //
-        src_len0,                             //
-        h1v2_bias,                            //
-        first_column,                         //
-        (total_src_len0 >= half_width_for_2to1));
-
-    const uint8_t* src_ptr_x1 = src1 + (x / inv_h1);
-    const uint8_t* up1 = (*upfunc1)(          //
-        scratch_buffer_2k_ptr + (1u * 480u),  //
-        src_ptr_x1,                           //
-        src_ptr_x1,                           //
-        src_len1,                             //
-        h1v2_bias,                            //
-        first_column,                         //
-        (total_src_len1 >= half_width_for_2to1));
-
-    const uint8_t* src_ptr_x2 = src2 + (x / inv_h2);
-    const uint8_t* up2 = (*upfunc2)(          //
-        scratch_buffer_2k_ptr + (2u * 480u),  //
-        src_ptr_x2,                           //
-        src_ptr_x2,                           //
-        src_len2,                             //
-        h1v2_bias,                            //
-        first_column,                         //
-        (total_src_len2 >= half_width_for_2to1));
-
-    const uint8_t* src_ptr_x3 = src3 + (x / inv_h3);
-    const uint8_t* up3 = (*upfunc3)(          //
-        scratch_buffer_2k_ptr + (3u * 480u),  //
-        src_ptr_x3,                           //
-        src_ptr_x3,                           //
-        src_len3,                             //
-        h1v2_bias,                            //
-        first_column,                         //
-        (total_src_len3 >= half_width_for_2to1));
-
-    (*conv4func)(dst, x, end, y, up0, up1, up2, up3);
-    x = end;
-  }
-}
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t width,
-    uint32_t height,
-    const uint8_t* src_ptr0,
-    const uint8_t* src_ptr1,
-    const uint8_t* src_ptr2,
-    const uint8_t* src_ptr3,
-    uint32_t stride0,
-    uint32_t stride1,
-    uint32_t stride2,
-    uint32_t stride3,
-    uint32_t inv_h0,
-    uint32_t inv_h1,
-    uint32_t inv_h2,
-    uint32_t inv_h3,
-    uint32_t inv_v0,
-    uint32_t inv_v1,
-    uint32_t inv_v2,
-    uint32_t inv_v3,
-    uint32_t half_width_for_2to1,
-    uint32_t half_height_for_2to1,
-    uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4],
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_4_func conv4func) {
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 =
-      (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 =
-      (*upfuncs)[(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 =
-      (*upfuncs)[(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc3 =
-      (*upfuncs)[(inv_h3 - 1u) & 3u][(inv_v3 - 1u) & 3u];
-
-  // First row.
-  uint32_t h1v2_bias = 1u;
-  wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter_edge_row(
-      dst, width, 0u,                          //
-      src_ptr0, src_ptr1, src_ptr2, src_ptr3,  //
-      stride0, stride1, stride2, stride3,      //
-      inv_h0, inv_h1, inv_h2, inv_h3,          //
-      inv_v0, inv_v1, inv_v2, inv_v3,          //
-      half_width_for_2to1,                     //
-      h1v2_bias,                               //
-      scratch_buffer_2k_ptr,                   //
-      upfunc0, upfunc1, upfunc2, upfunc3, conv4func);
-  h1v2_bias = 2u;
-
-  // Middle rows.
-  bool last_row = height == 2u * half_height_for_2to1;
-  uint32_t y_max_excl = last_row ? (height - 1u) : height;
-  uint32_t y;
-  for (y = 1u; y < y_max_excl; y++) {
-    const uint8_t* src0_major = src_ptr0 + ((y / inv_v0) * (size_t)stride0);
-    const uint8_t* src0_minor =
-        (inv_v0 != 2u)
-            ? src0_major
-            : ((y & 1u) ? (src0_major + stride0) : (src0_major - stride0));
-    const uint8_t* src1_major = src_ptr1 + ((y / inv_v1) * (size_t)stride1);
-    const uint8_t* src1_minor =
-        (inv_v1 != 2u)
-            ? src1_major
-            : ((y & 1u) ? (src1_major + stride1) : (src1_major - stride1));
-    const uint8_t* src2_major = src_ptr2 + ((y / inv_v2) * (size_t)stride2);
-    const uint8_t* src2_minor =
-        (inv_v2 != 2u)
-            ? src2_major
-            : ((y & 1u) ? (src2_major + stride2) : (src2_major - stride2));
-    const uint8_t* src3_major = src_ptr3 + ((y / inv_v3) * (size_t)stride3);
-    const uint8_t* src3_minor =
-        (inv_v3 != 2u)
-            ? src3_major
-            : ((y & 1u) ? (src3_major + stride3) : (src3_major - stride3));
-    uint32_t total_src_len0 = 0u;
-    uint32_t total_src_len1 = 0u;
-    uint32_t total_src_len2 = 0u;
-    uint32_t total_src_len3 = 0u;
-
-    uint32_t x = 0u;
-    while (x < width) {
-      bool first_column = x == 0u;
-      uint32_t end = x + 480u;
-      if (end > width) {
-        end = width;
-      }
-
-      uint32_t src_len0 = ((end - x) + inv_h0 - 1u) / inv_h0;
-      uint32_t src_len1 = ((end - x) + inv_h1 - 1u) / inv_h1;
-      uint32_t src_len2 = ((end - x) + inv_h2 - 1u) / inv_h2;
-      uint32_t src_len3 = ((end - x) + inv_h3 - 1u) / inv_h3;
-      total_src_len0 += src_len0;
-      total_src_len1 += src_len1;
-      total_src_len2 += src_len2;
-      total_src_len3 += src_len3;
-
-      const uint8_t* up0 = (*upfunc0)(          //
-          scratch_buffer_2k_ptr + (0u * 480u),  //
-          src0_major + (x / inv_h0),            //
-          src0_minor + (x / inv_h0),            //
-          src_len0,                             //
-          h1v2_bias,                            //
-          first_column,                         //
-          (total_src_len0 >= half_width_for_2to1));
-
-      const uint8_t* up1 = (*upfunc1)(          //
-          scratch_buffer_2k_ptr + (1u * 480u),  //
-          src1_major + (x / inv_h1),            //
-          src1_minor + (x / inv_h1),            //
-          src_len1,                             //
-          h1v2_bias,                            //
-          first_column,                         //
-          (total_src_len1 >= half_width_for_2to1));
-
-      const uint8_t* up2 = (*upfunc2)(          //
-          scratch_buffer_2k_ptr + (2u * 480u),  //
-          src2_major + (x / inv_h2),            //
-          src2_minor + (x / inv_h2),            //
-          src_len2,                             //
-          h1v2_bias,                            //
-          first_column,                         //
-          (total_src_len2 >= half_width_for_2to1));
-
-      const uint8_t* up3 = (*upfunc3)(          //
-          scratch_buffer_2k_ptr + (3u * 480u),  //
-          src3_major + (x / inv_h3),            //
-          src3_minor + (x / inv_h3),            //
-          src_len3,                             //
-          h1v2_bias,                            //
-          first_column,                         //
-          (total_src_len3 >= half_width_for_2to1));
-
-      (*conv4func)(dst, x, end, y, up0, up1, up2, up3);
-      x = end;
-    }
-
-    h1v2_bias ^= 3u;
-  }
-
-  // Last row.
-  if (y_max_excl != height) {
-    wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter_edge_row(
-        dst, width, height - 1u,                 //
-        src_ptr0, src_ptr1, src_ptr2, src_ptr3,  //
-        stride0, stride1, stride2, stride3,      //
-        inv_h0, inv_h1, inv_h2, inv_h3,          //
-        inv_v0, inv_v1, inv_v2, inv_v3,          //
-        half_width_for_2to1,                     //
-        h1v2_bias,                               //
-        scratch_buffer_2k_ptr,                   //
-        upfunc0, upfunc1, upfunc2, upfunc3, conv4func);
-  }
-}
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t width,
-    uint32_t y,
-    const uint8_t* src_ptr0,
-    const uint8_t* src_ptr1,
-    const uint8_t* src_ptr2,
-    uint32_t stride0,
-    uint32_t stride1,
-    uint32_t stride2,
-    uint32_t inv_h0,
-    uint32_t inv_h1,
-    uint32_t inv_h2,
-    uint32_t inv_v0,
-    uint32_t inv_v1,
-    uint32_t inv_v2,
-    uint32_t half_width_for_2to1,
-    uint32_t h1v2_bias,
-    uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2,
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) {
-  const uint8_t* src0 = src_ptr0 + ((y / inv_v0) * (size_t)stride0);
-  const uint8_t* src1 = src_ptr1 + ((y / inv_v1) * (size_t)stride1);
-  const uint8_t* src2 = src_ptr2 + ((y / inv_v2) * (size_t)stride2);
-  uint32_t total_src_len0 = 0u;
-  uint32_t total_src_len1 = 0u;
-  uint32_t total_src_len2 = 0u;
-
-  uint32_t x = 0u;
-  while (x < width) {
-    bool first_column = x == 0u;
-    uint32_t end = x + 672u;
-    if (end > width) {
-      end = width;
-    }
-
-    uint32_t src_len0 = ((end - x) + inv_h0 - 1u) / inv_h0;
-    uint32_t src_len1 = ((end - x) + inv_h1 - 1u) / inv_h1;
-    uint32_t src_len2 = ((end - x) + inv_h2 - 1u) / inv_h2;
-    total_src_len0 += src_len0;
-    total_src_len1 += src_len1;
-    total_src_len2 += src_len2;
-
-    const uint8_t* src_ptr_x0 = src0 + (x / inv_h0);
-    const uint8_t* up0 = (*upfunc0)(          //
-        scratch_buffer_2k_ptr + (0u * 672u),  //
-        src_ptr_x0,                           //
-        src_ptr_x0,                           //
-        src_len0,                             //
-        h1v2_bias,                            //
-        first_column,                         //
-        (total_src_len0 >= half_width_for_2to1));
-
-    const uint8_t* src_ptr_x1 = src1 + (x / inv_h1);
-    const uint8_t* up1 = (*upfunc1)(          //
-        scratch_buffer_2k_ptr + (1u * 672u),  //
-        src_ptr_x1,                           //
-        src_ptr_x1,                           //
-        src_len1,                             //
-        h1v2_bias,                            //
-        first_column,                         //
-        (total_src_len1 >= half_width_for_2to1));
-
-    const uint8_t* src_ptr_x2 = src2 + (x / inv_h2);
-    const uint8_t* up2 = (*upfunc2)(          //
-        scratch_buffer_2k_ptr + (2u * 672u),  //
-        src_ptr_x2,                           //
-        src_ptr_x2,                           //
-        src_len2,                             //
-        h1v2_bias,                            //
-        first_column,                         //
-        (total_src_len2 >= half_width_for_2to1));
-
-    (*conv3func)(dst, x, end, y, up0, up1, up2);
-    x = end;
-  }
-}
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t width,
-    uint32_t height,
-    const uint8_t* src_ptr0,
-    const uint8_t* src_ptr1,
-    const uint8_t* src_ptr2,
-    uint32_t stride0,
-    uint32_t stride1,
-    uint32_t stride2,
-    uint32_t inv_h0,
-    uint32_t inv_h1,
-    uint32_t inv_h2,
-    uint32_t inv_v0,
-    uint32_t inv_v1,
-    uint32_t inv_v2,
-    uint32_t half_width_for_2to1,
-    uint32_t half_height_for_2to1,
-    uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4],
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) {
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 =
-      (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 =
-      (*upfuncs)[(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 =
-      (*upfuncs)[(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u];
-
-  // First row.
-  uint32_t h1v2_bias = 1u;
-  wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row(
-      dst, width, 0u,                //
-      src_ptr0, src_ptr1, src_ptr2,  //
-      stride0, stride1, stride2,     //
-      inv_h0, inv_h1, inv_h2,        //
-      inv_v0, inv_v1, inv_v2,        //
-      half_width_for_2to1,           //
-      h1v2_bias,                     //
-      scratch_buffer_2k_ptr,         //
-      upfunc0, upfunc1, upfunc2, conv3func);
-  h1v2_bias = 2u;
-
-  // Middle rows.
-  bool last_row = height == 2u * half_height_for_2to1;
-  uint32_t y_max_excl = last_row ? (height - 1u) : height;
-  uint32_t y;
-  for (y = 1u; y < y_max_excl; y++) {
-    const uint8_t* src0_major = src_ptr0 + ((y / inv_v0) * (size_t)stride0);
-    const uint8_t* src0_minor =
-        (inv_v0 != 2u)
-            ? src0_major
-            : ((y & 1u) ? (src0_major + stride0) : (src0_major - stride0));
-    const uint8_t* src1_major = src_ptr1 + ((y / inv_v1) * (size_t)stride1);
-    const uint8_t* src1_minor =
-        (inv_v1 != 2u)
-            ? src1_major
-            : ((y & 1u) ? (src1_major + stride1) : (src1_major - stride1));
-    const uint8_t* src2_major = src_ptr2 + ((y / inv_v2) * (size_t)stride2);
-    const uint8_t* src2_minor =
-        (inv_v2 != 2u)
-            ? src2_major
-            : ((y & 1u) ? (src2_major + stride2) : (src2_major - stride2));
-    uint32_t total_src_len0 = 0u;
-    uint32_t total_src_len1 = 0u;
-    uint32_t total_src_len2 = 0u;
-
-    uint32_t x = 0u;
-    while (x < width) {
-      bool first_column = x == 0u;
-      uint32_t end = x + 672u;
-      if (end > width) {
-        end = width;
-      }
-
-      uint32_t src_len0 = ((end - x) + inv_h0 - 1u) / inv_h0;
-      uint32_t src_len1 = ((end - x) + inv_h1 - 1u) / inv_h1;
-      uint32_t src_len2 = ((end - x) + inv_h2 - 1u) / inv_h2;
-      total_src_len0 += src_len0;
-      total_src_len1 += src_len1;
-      total_src_len2 += src_len2;
-
-      const uint8_t* up0 = (*upfunc0)(          //
-          scratch_buffer_2k_ptr + (0u * 672u),  //
-          src0_major + (x / inv_h0),            //
-          src0_minor + (x / inv_h0),            //
-          src_len0,                             //
-          h1v2_bias,                            //
-          first_column,                         //
-          (total_src_len0 >= half_width_for_2to1));
-
-      const uint8_t* up1 = (*upfunc1)(          //
-          scratch_buffer_2k_ptr + (1u * 672u),  //
-          src1_major + (x / inv_h1),            //
-          src1_minor + (x / inv_h1),            //
-          src_len1,                             //
-          h1v2_bias,                            //
-          first_column,                         //
-          (total_src_len1 >= half_width_for_2to1));
-
-      const uint8_t* up2 = (*upfunc2)(          //
-          scratch_buffer_2k_ptr + (2u * 672u),  //
-          src2_major + (x / inv_h2),            //
-          src2_minor + (x / inv_h2),            //
-          src_len2,                             //
-          h1v2_bias,                            //
-          first_column,                         //
-          (total_src_len2 >= half_width_for_2to1));
-
-      (*conv3func)(dst, x, end, y, up0, up1, up2);
-      x = end;
-    }
-
-    h1v2_bias ^= 3u;
-  }
-
-  // Last row.
-  if (y_max_excl != height) {
-    wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row(
-        dst, width, height - 1u,       //
-        src_ptr0, src_ptr1, src_ptr2,  //
-        stride0, stride1, stride2,     //
-        inv_h0, inv_h1, inv_h2,        //
-        inv_v0, inv_v1, inv_v2,        //
-        half_width_for_2to1,           //
-        h1v2_bias,                     //
-        scratch_buffer_2k_ptr,         //
-        upfunc0, upfunc1, upfunc2, conv3func);
-  }
-}
-
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t width,
-    uint32_t height,
-    const uint8_t* src_ptr0,
-    const uint8_t* src_ptr1,
-    const uint8_t* src_ptr2,
-    uint32_t stride0,
-    uint32_t stride1,
-    uint32_t stride2,
-    uint32_t inv_h0,
-    uint32_t inv_h1,
-    uint32_t inv_h2,
-    uint32_t inv_v0,
-    uint32_t inv_v1,
-    uint32_t inv_v2,
-    uint32_t half_width_for_2to1,
-    uint32_t half_height_for_2to1,
-    uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4],
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) {
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 =
-      (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 =
-      (*upfuncs)[(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 =
-      (*upfuncs)[(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u];
-
-  uint32_t y;
-  for (y = 0u; y < height; y++) {
-    const uint8_t* src0_major = src_ptr0 + ((y / inv_v0) * (size_t)stride0);
-    const uint8_t* src1_major = src_ptr1 + ((y / inv_v1) * (size_t)stride1);
-    const uint8_t* src2_major = src_ptr2 + ((y / inv_v2) * (size_t)stride2);
-
-    uint32_t x = 0u;
-    while (x < width) {
-      uint32_t end = x + 672u;
-      if (end > width) {
-        end = width;
-      }
-
-      uint32_t src_len0 = ((end - x) + inv_h0 - 1u) / inv_h0;
-      uint32_t src_len1 = ((end - x) + inv_h1 - 1u) / inv_h1;
-      uint32_t src_len2 = ((end - x) + inv_h2 - 1u) / inv_h2;
-
-      const uint8_t* up0 = (*upfunc0)(          //
-          scratch_buffer_2k_ptr + (0u * 672u),  //
-          src0_major + (x / inv_h0),            //
-          src0_major + (x / inv_h0),            //
-          src_len0,                             //
-          0u, false, false);
-
-      const uint8_t* up1 = (*upfunc1)(          //
-          scratch_buffer_2k_ptr + (1u * 672u),  //
-          src1_major + (x / inv_h1),            //
-          src1_major + (x / inv_h1),            //
-          src_len1,                             //
-          0u, false, false);
-
-      const uint8_t* up2 = (*upfunc2)(          //
-          scratch_buffer_2k_ptr + (2u * 672u),  //
-          src2_major + (x / inv_h2),            //
-          src2_major + (x / inv_h2),            //
-          src_len2,                             //
-          0u, false, false);
-
-      (*conv3func)(dst, x, end, y, up0, up1, up2);
-      x = end;
-    }
-  }
-}
-
-// --------
-
-// wuffs_base__pixel_swizzler__flattened_length is like
-// wuffs_base__table__flattened_length but returns uint64_t (not size_t) and
-// also accounts for subsampling.
-static uint64_t  //
-wuffs_base__pixel_swizzler__flattened_length(uint32_t width,
-                                             uint32_t height,
-                                             uint32_t stride,
-                                             uint32_t inv_h,
-                                             uint32_t inv_v) {
-  uint64_t scaled_width = (((uint64_t)width) + (inv_h - 1u)) / inv_h;
-  uint64_t scaled_height = (((uint64_t)height) + (inv_v - 1u)) / inv_v;
-  if (scaled_height <= 0u) {
-    return 0u;
-  }
-  return ((scaled_height - 1u) * stride) + scaled_width;
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status  //
-wuffs_base__pixel_swizzler__swizzle_ycck(
-    const wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_buffer* dst,
-    wuffs_base__slice_u8 dst_palette,
-    uint32_t width,
-    uint32_t height,
-    wuffs_base__slice_u8 src0,
-    wuffs_base__slice_u8 src1,
-    wuffs_base__slice_u8 src2,
-    wuffs_base__slice_u8 src3,
-    uint32_t width0,
-    uint32_t width1,
-    uint32_t width2,
-    uint32_t width3,
-    uint32_t height0,
-    uint32_t height1,
-    uint32_t height2,
-    uint32_t height3,
-    uint32_t stride0,
-    uint32_t stride1,
-    uint32_t stride2,
-    uint32_t stride3,
-    uint8_t h0,
-    uint8_t h1,
-    uint8_t h2,
-    uint8_t h3,
-    uint8_t v0,
-    uint8_t v1,
-    uint8_t v2,
-    uint8_t v3,
-    bool is_rgb_or_cmyk,
-    bool triangle_filter_for_2to1,
-    wuffs_base__slice_u8 scratch_buffer_2k) {
-  if (!p) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  } else if (!dst || (width > 0xFFFFu) || (height > 0xFFFFu) ||  //
-             (4u <= ((unsigned int)h0 - 1u)) ||                  //
-             (4u <= ((unsigned int)h1 - 1u)) ||                  //
-             (4u <= ((unsigned int)h2 - 1u)) ||                  //
-             (4u <= ((unsigned int)v0 - 1u)) ||                  //
-             (4u <= ((unsigned int)v1 - 1u)) ||                  //
-             (4u <= ((unsigned int)v2 - 1u)) ||                  //
-             (scratch_buffer_2k.len < 2048u)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((h3 != 0u) || (v3 != 0u)) {
-    if ((4u <= ((unsigned int)h3 - 1u)) ||  //
-        (4u <= ((unsigned int)v3 - 1u))) {
-      return wuffs_base__make_status(wuffs_base__error__bad_argument);
-    }
-  }
-
-  uint32_t max_incl_h = wuffs_base__u32__max_of_4(h0, h1, h2, h3);
-  uint32_t max_incl_v = wuffs_base__u32__max_of_4(v0, v1, v2, v3);
-
-  // Calculate the inverse h and v ratios.
-  //
-  // It also canonicalizes (h=2 and max_incl_h=4) as equivalent to (h=1 and
-  // max_incl_h=2). In both cases, the inv_h value is 2.
-  uint32_t inv_h0 = max_incl_h / h0;
-  uint32_t inv_h1 = max_incl_h / h1;
-  uint32_t inv_h2 = max_incl_h / h2;
-  uint32_t inv_h3 = h3 ? (max_incl_h / h3) : 0u;
-  uint32_t inv_v0 = max_incl_v / v0;
-  uint32_t inv_v1 = max_incl_v / v1;
-  uint32_t inv_v2 = max_incl_v / v2;
-  uint32_t inv_v3 = v3 ? (max_incl_v / v3) : 0u;
-
-  uint32_t half_width_for_2to1 = (width + 1u) / 2u;
-  uint32_t half_height_for_2to1 = (height + 1u) / 2u;
-
-  width = wuffs_base__u32__min_of_5(  //
-      width,                          //
-      width0 * inv_h0,                //
-      width1 * inv_h1,                //
-      width2 * inv_h2,                //
-      wuffs_base__pixel_config__width(&dst->pixcfg));
-  height = wuffs_base__u32__min_of_5(  //
-      height,                          //
-      height0 * inv_v0,                //
-      height1 * inv_v1,                //
-      height2 * inv_v2,                //
-      wuffs_base__pixel_config__height(&dst->pixcfg));
-
-  if (((h0 * inv_h0) != max_incl_h) ||  //
-      ((h1 * inv_h1) != max_incl_h) ||  //
-      ((h2 * inv_h2) != max_incl_h) ||  //
-      ((v0 * inv_v0) != max_incl_v) ||  //
-      ((v1 * inv_v1) != max_incl_v) ||  //
-      ((v2 * inv_v2) != max_incl_v) ||  //
-      (src0.len < wuffs_base__pixel_swizzler__flattened_length(
-                      width, height, stride0, inv_h0, inv_v0)) ||
-      (src1.len < wuffs_base__pixel_swizzler__flattened_length(
-                      width, height, stride1, inv_h1, inv_v1)) ||
-      (src2.len < wuffs_base__pixel_swizzler__flattened_length(
-                      width, height, stride2, inv_h2, inv_v2))) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((h3 != 0u) || (v3 != 0u)) {
-    if (((h3 * inv_h3) != max_incl_h) ||  //
-        ((v3 * inv_v3) != max_incl_v) ||  //
-        (src3.len < wuffs_base__pixel_swizzler__flattened_length(
-                        width, height, stride3, inv_h3, inv_v3))) {
-      return wuffs_base__make_status(wuffs_base__error__bad_argument);
-    }
-  }
-
-  if (wuffs_base__pixel_format__is_planar(&dst->pixcfg.private_impl.pixfmt)) {
-    // TODO: see wuffs_base__pixel_buffer__set_color_u32_at's TODO.
-    return wuffs_base__make_status(
-        wuffs_base__error__unsupported_pixel_swizzler_option);
-  }
-
-  switch (dst->pixcfg.private_impl.pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__Y:
-    case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      break;
-
-    default:
-      // TODO: see wuffs_base__pixel_buffer__set_color_u32_at's TODO.
-      return wuffs_base__make_status(
-          wuffs_base__error__unsupported_pixel_swizzler_option);
-  }
-
-  if ((width <= 0u) || (height <= 0u)) {
-    return wuffs_base__make_status(NULL);
-  }
-
-  wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func = NULL;
-
-  if (is_rgb_or_cmyk) {
-    conv3func = &wuffs_base__pixel_swizzler__swizzle_rgb__convert_3_general;
-  } else {
-    switch (dst->pixcfg.private_impl.pixfmt.repr) {
-      case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-        if (wuffs_base__cpu_arch__have_x86_avx2()) {
-          conv3func =
-              &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2;
-          break;
-        }
-#endif
-        conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx;
-        break;
-      case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-        if (wuffs_base__cpu_arch__have_x86_avx2()) {
-          conv3func =
-              &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2;
-          break;
-        }
-#endif
-        conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx;
-        break;
-      default:
-        conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_general;
-        break;
-    }
-  }
-
-  void (*func)(
-      wuffs_base__pixel_buffer * dst,  //
-      uint32_t width,                  //
-      uint32_t height,                 //
-      const uint8_t* src_ptr0,         //
-      const uint8_t* src_ptr1,         //
-      const uint8_t* src_ptr2,         //
-      uint32_t stride0,                //
-      uint32_t stride1,                //
-      uint32_t stride2,                //
-      uint32_t inv_h0,                 //
-      uint32_t inv_h1,                 //
-      uint32_t inv_h2,                 //
-      uint32_t inv_v0,                 //
-      uint32_t inv_v1,                 //
-      uint32_t inv_v2,                 //
-      uint32_t half_width_for_2to1,    //
-      uint32_t half_height_for_2to1,   //
-      uint8_t* scratch_buffer_2k_ptr,  //
-      wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func(*upfuncs)[4][4],
-      wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) =
-      &wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter;
-
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfuncs[4][4];
-  memcpy(&upfuncs, &wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs,
-         sizeof upfuncs);
-
-  if (triangle_filter_for_2to1 &&
-      (wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h0, inv_v0) ||
-       wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h1, inv_v1) ||
-       wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) {
-    func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter;
-
-    upfuncs[0][1] =
-        wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1v2_triangle;
-    upfuncs[1][0] =
-        wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v1_triangle;
-    upfuncs[1][1] =
-        wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle;
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-#if defined(__GNUC__) && !defined(__clang__)
-    // Don't use our AVX2 implementation for GCC (but do use it for clang). For
-    // some unknown reason, GCC performs noticably better on the non-SIMD
-    // version. Possibly because GCC's auto-vectorizer is smarter (just with
-    // SSE2, not AVX2) than our hand-written code, but that's just a guess.
-    //
-    // See commits 51bc60ef9298cb2efc1b29a9681191f66d49820d and
-    // cd769a0cdf1b5affee13f6089b995f3d39569cb4 for benchmark numbers.
-    //
-    // See also https://godbolt.org/z/MbhbPGEz4 for Debian Bullseye's clang 11
-    // versus gcc 10, where only gcc auto-vectorizes, although later clang
-    // versions will also auto-vectorize.
-#else
-    if (wuffs_base__cpu_arch__have_x86_avx2()) {
-      upfuncs[1][1] =
-          wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2;
-    }
-#endif
-#endif
-  }
-
-  if ((h3 != 0u) || (v3 != 0u)) {
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_4_func conv4func =
-        is_rgb_or_cmyk
-            ? &wuffs_base__pixel_swizzler__swizzle_cmyk__convert_4_general
-            : &wuffs_base__pixel_swizzler__swizzle_ycck__convert_4_general;
-    wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter(  //
-        dst, width, height,                                              //
-        src0.ptr, src1.ptr, src2.ptr, src3.ptr,                          //
-        stride0, stride1, stride2, stride3,                              //
-        inv_h0, inv_h1, inv_h2, inv_h3,                                  //
-        inv_v0, inv_v1, inv_v2, inv_v3,                                  //
-        half_width_for_2to1, half_height_for_2to1,                       //
-        scratch_buffer_2k.ptr, &upfuncs, conv4func);
-
-  } else {
-    (*func)(                                        //
-        dst, width, height,                         //
-        src0.ptr, src1.ptr, src2.ptr,               //
-        stride0, stride1, stride2,                  //
-        inv_h0, inv_h1, inv_h2,                     //
-        inv_v0, inv_v1, inv_v2,                     //
-        half_width_for_2to1, half_height_for_2to1,  //
-        scratch_buffer_2k.ptr, &upfuncs, conv3func);
-  }
-
-  return wuffs_base__make_status(NULL);
-}
-
-// --------
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_avx2
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2) {
-  if ((x + 32u) > x_end) {
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx(  //
-        dst, x, x_end, y, up0, up1, up2);
-    return;
-  }
-
-  size_t dst_stride = dst->private_impl.planes[0].stride;
-  uint8_t* dst_iter = dst->private_impl.planes[0].ptr +
-                      (dst_stride * ((size_t)y)) + (4u * ((size_t)x));
-
-  // u0001 = u16x16 [0x0001 .. 0x0001]
-  // u00FF = u16x16 [0x00FF .. 0x00FF]
-  // uFF80 = u16x16 [0xFF80 .. 0xFF80]
-  // uFFFF = u16x16 [0xFFFF .. 0xFFFF]
-  const __m256i u0001 = _mm256_set1_epi16(+0x0001);
-  const __m256i u00FF = _mm256_set1_epi16(+0x00FF);
-  const __m256i uFF80 = _mm256_set1_epi16(-0x0080);
-  const __m256i uFFFF = _mm256_set1_epi16(-0x0001);
-
-  // p8000_p0000 = u16x16 [0x8000 0x0000 .. 0x8000 0x0000]
-  const __m256i p8000_p0000 = _mm256_set_epi16(  //
-      +0x0000, -0x8000, +0x0000, -0x8000,        //
-      +0x0000, -0x8000, +0x0000, -0x8000,        //
-      +0x0000, -0x8000, +0x0000, -0x8000,        //
-      +0x0000, -0x8000, +0x0000, -0x8000);
-
-  // Per wuffs_base__color_ycc__as__color_u32, the formulae:
-  //
-  //  R = Y                + 1.40200 * Cr
-  //  G = Y - 0.34414 * Cb - 0.71414 * Cr
-  //  B = Y + 1.77200 * Cb
-  //
-  // When scaled by 1<<16:
-  //
-  //  0.34414 becomes 0x0581A =  22554.
-  //  0.71414 becomes 0x0B6D2 =  46802.
-  //  1.40200 becomes 0x166E9 =  91881.
-  //  1.77200 becomes 0x1C5A2 = 116130.
-  //
-  // Separate the integer and fractional parts, since we work with signed
-  // 16-bit SIMD lanes. The fractional parts range from -0.5 .. +0.5 (as
-  // floating-point) which is from -0x8000 .. +0x8000 (as fixed-point).
-  //
-  //  -0x3A5E = -0x20000 + 0x1C5A2     The B:Cb factor.
-  //  +0x66E9 = -0x10000 + 0x166E9     The R:Cr factor.
-  //  -0x581A = +0x00000 - 0x0581A     The G:Cb factor.
-  //  +0x492E = +0x10000 - 0x0B6D2     The G:Cr factor.
-  const __m256i m3A5E = _mm256_set1_epi16(-0x3A5E);
-  const __m256i p66E9 = _mm256_set1_epi16(+0x66E9);
-  const __m256i m581A_p492E = _mm256_set_epi16(  //
-      +0x492E, -0x581A, +0x492E, -0x581A,        //
-      +0x492E, -0x581A, +0x492E, -0x581A,        //
-      +0x492E, -0x581A, +0x492E, -0x581A,        //
-      +0x492E, -0x581A, +0x492E, -0x581A);
-
-  while (x < x_end) {
-    // Load chroma values in even and odd columns (the high 8 bits of each
-    // u16x16 element are zero) and then subtract 0x0080.
-    //
-    // cb_all = u8x32  [cb.00 cb.01 cb.02 cb.03 .. cb.1C cb.1D cb.1E cb.1F]
-    // cb_eve = i16x16 [cb.00-0x80  cb.02-0x80  .. cb.1C-0x80  cb.1E-0x80 ]
-    // cb_odd = i16x16 [cb.01-0x80  cb.03-0x80  .. cb.1D-0x80  cb.1F-0x80 ]
-    //
-    // Ditto for the cr_xxx Chroma-Red values.
-    __m256i cb_all = _mm256_lddqu_si256((const __m256i*)(const void*)up1);
-    __m256i cr_all = _mm256_lddqu_si256((const __m256i*)(const void*)up2);
-    __m256i cb_eve = _mm256_add_epi16(uFF80, _mm256_and_si256(cb_all, u00FF));
-    __m256i cr_eve = _mm256_add_epi16(uFF80, _mm256_and_si256(cr_all, u00FF));
-    __m256i cb_odd = _mm256_add_epi16(uFF80, _mm256_srli_epi16(cb_all, 8));
-    __m256i cr_odd = _mm256_add_epi16(uFF80, _mm256_srli_epi16(cr_all, 8));
-
-    // ----
-
-    // Calculate:
-    //
-    //  B-Y = (+1.77200 * Cb)                 as floating-point
-    //  R-Y = (+1.40200 * Cr)                 as floating-point
-    //
-    //  B-Y = ((0x2_0000 - 0x3A5E) * Cb)      as fixed-point
-    //  R-Y = ((0x1_0000 + 0x66E9) * Cr)      as fixed-point
-    //
-    //  B-Y = ((-0x3A5E * Cb) + ("2.0" * Cb))
-    //  R-Y = ((+0x66E9 * Cr) + ("1.0" * Cr))
-
-    // Multiply by m3A5E or p66E9, taking the high 16 bits. There's also a
-    // doubling (add x to itself), adding-of-1 and halving (shift right by 1).
-    // That makes multiply-and-take-high round to nearest (instead of down).
-    __m256i tmp_by_eve = _mm256_srai_epi16(
-        _mm256_add_epi16(
-            _mm256_mulhi_epi16(_mm256_add_epi16(cb_eve, cb_eve), m3A5E), u0001),
-        1);
-    __m256i tmp_by_odd = _mm256_srai_epi16(
-        _mm256_add_epi16(
-            _mm256_mulhi_epi16(_mm256_add_epi16(cb_odd, cb_odd), m3A5E), u0001),
-        1);
-    __m256i tmp_ry_eve = _mm256_srai_epi16(
-        _mm256_add_epi16(
-            _mm256_mulhi_epi16(_mm256_add_epi16(cr_eve, cr_eve), p66E9), u0001),
-        1);
-    __m256i tmp_ry_odd = _mm256_srai_epi16(
-        _mm256_add_epi16(
-            _mm256_mulhi_epi16(_mm256_add_epi16(cr_odd, cr_odd), p66E9), u0001),
-        1);
-
-    // Add (2 * Cb) and (1 * Cr).
-    __m256i by_eve =
-        _mm256_add_epi16(tmp_by_eve, _mm256_add_epi16(cb_eve, cb_eve));
-    __m256i by_odd =
-        _mm256_add_epi16(tmp_by_odd, _mm256_add_epi16(cb_odd, cb_odd));
-    __m256i ry_eve = _mm256_add_epi16(tmp_ry_eve, cr_eve);
-    __m256i ry_odd = _mm256_add_epi16(tmp_ry_odd, cr_odd);
-
-    // ----
-
-    // Calculate:
-    //
-    //  G-Y = (-0.34414 * Cb) +
-    //        (-0.71414 * Cr)                 as floating-point
-    //
-    //  G-Y = ((+0x0_0000 - 0x581A) * Cb) +
-    //        ((-0x1_0000 + 0x492E) * Cr)     as fixed-point
-    //
-    //  G-Y =  (-0x581A * Cb) +
-    //         (+0x492E * Cr) - ("1.0" * Cr)
-
-    // Multiply-add to get ((-0x581A * Cb) + (+0x492E * Cr)).
-    __m256i tmp0_gy_eve_lo = _mm256_madd_epi16(  //
-        _mm256_unpacklo_epi16(cb_eve, cr_eve), m581A_p492E);
-    __m256i tmp0_gy_eve_hi = _mm256_madd_epi16(  //
-        _mm256_unpackhi_epi16(cb_eve, cr_eve), m581A_p492E);
-    __m256i tmp0_gy_odd_lo = _mm256_madd_epi16(  //
-        _mm256_unpacklo_epi16(cb_odd, cr_odd), m581A_p492E);
-    __m256i tmp0_gy_odd_hi = _mm256_madd_epi16(  //
-        _mm256_unpackhi_epi16(cb_odd, cr_odd), m581A_p492E);
-
-    // Divide the i32x8 vectors by (1 << 16), rounding to nearest.
-    __m256i tmp1_gy_eve_lo =
-        _mm256_srai_epi32(_mm256_add_epi32(tmp0_gy_eve_lo, p8000_p0000), 16);
-    __m256i tmp1_gy_eve_hi =
-        _mm256_srai_epi32(_mm256_add_epi32(tmp0_gy_eve_hi, p8000_p0000), 16);
-    __m256i tmp1_gy_odd_lo =
-        _mm256_srai_epi32(_mm256_add_epi32(tmp0_gy_odd_lo, p8000_p0000), 16);
-    __m256i tmp1_gy_odd_hi =
-        _mm256_srai_epi32(_mm256_add_epi32(tmp0_gy_odd_hi, p8000_p0000), 16);
-
-    // Pack the ((-0x581A * Cb) + (+0x492E * Cr)) as i16x16 and subtract Cr.
-    __m256i gy_eve = _mm256_sub_epi16(
-        _mm256_packs_epi32(tmp1_gy_eve_lo, tmp1_gy_eve_hi), cr_eve);
-    __m256i gy_odd = _mm256_sub_epi16(
-        _mm256_packs_epi32(tmp1_gy_odd_lo, tmp1_gy_odd_hi), cr_odd);
-
-    // ----
-
-    // Add Y to (B-Y), (G-Y) and (R-Y) to produce B, G and R.
-    //
-    // For the resultant packed_x_xxx vectors, only elements 0 ..= 7 and 16 ..=
-    // 23 of the 32-element vectors matter (since we'll unpacklo but not
-    // unpackhi them). Let … denote 8 ignored consecutive u8 values and let %
-    // denote 0xFF. We'll end this section with:
-    //
-    // packed_b_eve = u8x32 [b00 b02 .. b0C b0E  …  b10 b12 .. b1C b1E  …]
-    // packed_b_odd = u8x32 [b01 b03 .. b0D b0F  …  b11 b13 .. b1D b1F  …]
-    // packed_g_eve = u8x32 [g00 g02 .. g0C g0E  …  g10 g12 .. g1C g1E  …]
-    // packed_g_odd = u8x32 [g01 g03 .. g0D g0F  …  g11 g13 .. g1D g1F  …]
-    // packed_r_eve = u8x32 [r00 r02 .. r0C r0E  …  r10 r12 .. r1C r1E  …]
-    // packed_r_odd = u8x32 [r01 r03 .. r0D r0F  …  r11 r13 .. r1D r1F  …]
-    // uFFFF        = u8x32 [  %   % ..   %   %  …    %   % ..   %   %  …]
-
-    __m256i yy_all = _mm256_lddqu_si256((const __m256i*)(const void*)up0);
-    __m256i yy_eve = _mm256_and_si256(yy_all, u00FF);
-    __m256i yy_odd = _mm256_srli_epi16(yy_all, 8);
-
-    __m256i loose_b_eve = _mm256_add_epi16(by_eve, yy_eve);
-    __m256i loose_b_odd = _mm256_add_epi16(by_odd, yy_odd);
-    __m256i packed_b_eve = _mm256_packus_epi16(loose_b_eve, loose_b_eve);
-    __m256i packed_b_odd = _mm256_packus_epi16(loose_b_odd, loose_b_odd);
-
-    __m256i loose_g_eve = _mm256_add_epi16(gy_eve, yy_eve);
-    __m256i loose_g_odd = _mm256_add_epi16(gy_odd, yy_odd);
-    __m256i packed_g_eve = _mm256_packus_epi16(loose_g_eve, loose_g_eve);
-    __m256i packed_g_odd = _mm256_packus_epi16(loose_g_odd, loose_g_odd);
-
-    __m256i loose_r_eve = _mm256_add_epi16(ry_eve, yy_eve);
-    __m256i loose_r_odd = _mm256_add_epi16(ry_odd, yy_odd);
-    __m256i packed_r_eve = _mm256_packus_epi16(loose_r_eve, loose_r_eve);
-    __m256i packed_r_odd = _mm256_packus_epi16(loose_r_odd, loose_r_odd);
-
-    // ----
-
-    // Mix those values (unpacking in 8, 16 and then 32 bit units) to get the
-    // desired BGRX/RGBX order.
-    //
-    // From here onwards, all of our __m256i registers are u8x32.
-
-    // mix00 = [b00 g00 b02 g02 .. b0E g0E b10 g10 .. b1C g1C b1E g1E]
-    // mix01 = [b01 g01 b03 g03 .. b0F g0F b11 g11 .. b1D g1D b1F g1F]
-    // mix02 = [r00   % r02   % .. r0E   % r10   % .. r1C   % r1E   %]
-    // mix03 = [r01   % r03   % .. r0F   % r11   % .. r1D   % r1F   %]
-    //
-    // See also § below.
-    __m256i mix00 = _mm256_unpacklo_epi8(packed_b_eve, packed_g_eve);
-    __m256i mix01 = _mm256_unpacklo_epi8(packed_b_odd, packed_g_odd);
-    __m256i mix02 = _mm256_unpacklo_epi8(packed_r_eve, uFFFF);
-    __m256i mix03 = _mm256_unpacklo_epi8(packed_r_odd, uFFFF);
-
-    // mix10 = [b00 g00 r00 %  b02 g02 r02 %  b04 g04 r04 %  b06 g06 r06 %
-    //          b10 g10 r10 %  b12 g12 r12 %  b14 g14 r14 %  b16 g16 r16 %]
-    // mix11 = [b01 g01 r01 %  b03 g03 r03 %  b05 g05 r05 %  b07 g07 r07 %
-    //          b11 g11 r11 %  b13 g13 r13 %  b15 g15 r15 %  b17 g17 r17 %]
-    // mix12 = [b08 g08 r08 %  b0A g0A r0A %  b0C g0C r0C %  b0E g0E r0E %
-    //          b18 g18 r18 %  b1A g1A r1A %  b1C g1C r1C %  b1E g1E r1E %]
-    // mix13 = [b09 g09 r09 %  b0B g0B r0B %  b0D g0D r0D %  b0F g0F r0F %
-    //          b19 g19 r19 %  b1B g1B r1B %  b1D g1D r1D %  b1F g1F r1F %]
-    __m256i mix10 = _mm256_unpacklo_epi16(mix00, mix02);
-    __m256i mix11 = _mm256_unpacklo_epi16(mix01, mix03);
-    __m256i mix12 = _mm256_unpackhi_epi16(mix00, mix02);
-    __m256i mix13 = _mm256_unpackhi_epi16(mix01, mix03);
-
-    // mix20 = [b00 g00 r00 %  b01 g01 r01 %  b02 g02 r02 %  b03 g03 r03 %
-    //          b10 g10 r10 %  b11 g11 r11 %  b12 g12 r12 %  b13 g13 r13 %]
-    // mix21 = [b04 g04 r04 %  b05 g05 r05 %  b06 g06 r06 %  b07 g07 r07 %
-    //          b14 g14 r14 %  b15 g15 r15 %  b16 g16 r16 %  b17 g17 r17 %]
-    // mix22 = [b08 g08 r08 %  b09 g09 r09 %  b0A g0A r0A %  b0B g0B r0B %
-    //          b18 g18 r18 %  b19 g19 r19 %  b1A g1A r1A %  b1B g1B r1B %]
-    // mix23 = [b0C g0C r0C %  b0D g0D r0D %  b0E g0E r0E %  b0F g0F r0F %
-    //          b1C g1C r1C %  b1D g1D r1D %  b1E g1E r1E %  b1F g1F r1F %]
-    __m256i mix20 = _mm256_unpacklo_epi32(mix10, mix11);
-    __m256i mix21 = _mm256_unpackhi_epi32(mix10, mix11);
-    __m256i mix22 = _mm256_unpacklo_epi32(mix12, mix13);
-    __m256i mix23 = _mm256_unpackhi_epi32(mix12, mix13);
-
-    // mix30 = [b00 g00 r00 %  b01 g01 r01 %  b02 g02 r02 %  b03 g03 r03 %
-    //          b04 g04 r04 %  b05 g05 r05 %  b06 g06 r06 %  b07 g07 r07 %]
-    // mix31 = [b08 g08 r08 %  b09 g09 r09 %  b0A g0A r0A %  b0B g0B r0B %
-    //          b0C g0C r0C %  b0D g0D r0D %  b0E g0E r0E %  b0F g0F r0F %]
-    // mix32 = [b10 g10 r10 %  b11 g11 r11 %  b12 g12 r12 %  b13 g13 r13 %
-    //          b14 g14 r14 %  b15 g15 r15 %  b16 g16 r16 %  b17 g17 r17 %]
-    // mix33 = [b18 g18 r18 %  b19 g19 r19 %  b1A g1A r1A %  b1B g1B r1B %
-    //          b1C g1C r1C %  b1D g1D r1D %  b1E g1E r1E %  b1F g1F r1F %]
-    __m256i mix30 = _mm256_permute2x128_si256(mix20, mix21, 0x20);
-    __m256i mix31 = _mm256_permute2x128_si256(mix22, mix23, 0x20);
-    __m256i mix32 = _mm256_permute2x128_si256(mix20, mix21, 0x31);
-    __m256i mix33 = _mm256_permute2x128_si256(mix22, mix23, 0x31);
-
-    // Write out four u8x32 SIMD registers (128 bytes, 32 BGRX/RGBX pixels).
-    _mm256_storeu_si256((__m256i*)(void*)(dst_iter + 0x00), mix30);
-    _mm256_storeu_si256((__m256i*)(void*)(dst_iter + 0x20), mix31);
-    _mm256_storeu_si256((__m256i*)(void*)(dst_iter + 0x40), mix32);
-    _mm256_storeu_si256((__m256i*)(void*)(dst_iter + 0x60), mix33);
-
-    // Advance by up to 32 pixels. The first iteration might be smaller than 32
-    // so that all of the remaining steps are exactly 32.
-    uint32_t n = 32u - (31u & (x - x_end));
-    dst_iter += 4u * n;
-    up0 += n;
-    up1 += n;
-    up2 += n;
-    x += n;
-  }
-}
-
-// The rgbx flavor (below) is exactly the same as the bgrx flavor (above)
-// except for the lines marked with a § and that comments were stripped.
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
-static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2) {
-  if ((x + 32u) > x_end) {
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx(  //
-        dst, x, x_end, y, up0, up1, up2);
-    return;
-  }
-
-  size_t dst_stride = dst->private_impl.planes[0].stride;
-  uint8_t* dst_iter = dst->private_impl.planes[0].ptr +
-                      (dst_stride * ((size_t)y)) + (4u * ((size_t)x));
-
-  const __m256i u0001 = _mm256_set1_epi16(+0x0001);
-  const __m256i u00FF = _mm256_set1_epi16(+0x00FF);
-  const __m256i uFF80 = _mm256_set1_epi16(-0x0080);
-  const __m256i uFFFF = _mm256_set1_epi16(-0x0001);
-
-  const __m256i p8000_p0000 = _mm256_set_epi16(  //
-      +0x0000, -0x8000, +0x0000, -0x8000,        //
-      +0x0000, -0x8000, +0x0000, -0x8000,        //
-      +0x0000, -0x8000, +0x0000, -0x8000,        //
-      +0x0000, -0x8000, +0x0000, -0x8000);
-
-  const __m256i m3A5E = _mm256_set1_epi16(-0x3A5E);
-  const __m256i p66E9 = _mm256_set1_epi16(+0x66E9);
-  const __m256i m581A_p492E = _mm256_set_epi16(  //
-      +0x492E, -0x581A, +0x492E, -0x581A,        //
-      +0x492E, -0x581A, +0x492E, -0x581A,        //
-      +0x492E, -0x581A, +0x492E, -0x581A,        //
-      +0x492E, -0x581A, +0x492E, -0x581A);
-
-  while (x < x_end) {
-    __m256i cb_all = _mm256_lddqu_si256((const __m256i*)(const void*)up1);
-    __m256i cr_all = _mm256_lddqu_si256((const __m256i*)(const void*)up2);
-    __m256i cb_eve = _mm256_add_epi16(uFF80, _mm256_and_si256(cb_all, u00FF));
-    __m256i cr_eve = _mm256_add_epi16(uFF80, _mm256_and_si256(cr_all, u00FF));
-    __m256i cb_odd = _mm256_add_epi16(uFF80, _mm256_srli_epi16(cb_all, 8));
-    __m256i cr_odd = _mm256_add_epi16(uFF80, _mm256_srli_epi16(cr_all, 8));
-
-    __m256i tmp_by_eve = _mm256_srai_epi16(
-        _mm256_add_epi16(
-            _mm256_mulhi_epi16(_mm256_add_epi16(cb_eve, cb_eve), m3A5E), u0001),
-        1);
-    __m256i tmp_by_odd = _mm256_srai_epi16(
-        _mm256_add_epi16(
-            _mm256_mulhi_epi16(_mm256_add_epi16(cb_odd, cb_odd), m3A5E), u0001),
-        1);
-    __m256i tmp_ry_eve = _mm256_srai_epi16(
-        _mm256_add_epi16(
-            _mm256_mulhi_epi16(_mm256_add_epi16(cr_eve, cr_eve), p66E9), u0001),
-        1);
-    __m256i tmp_ry_odd = _mm256_srai_epi16(
-        _mm256_add_epi16(
-            _mm256_mulhi_epi16(_mm256_add_epi16(cr_odd, cr_odd), p66E9), u0001),
-        1);
-
-    __m256i by_eve =
-        _mm256_add_epi16(tmp_by_eve, _mm256_add_epi16(cb_eve, cb_eve));
-    __m256i by_odd =
-        _mm256_add_epi16(tmp_by_odd, _mm256_add_epi16(cb_odd, cb_odd));
-    __m256i ry_eve = _mm256_add_epi16(tmp_ry_eve, cr_eve);
-    __m256i ry_odd = _mm256_add_epi16(tmp_ry_odd, cr_odd);
-
-    __m256i tmp0_gy_eve_lo = _mm256_madd_epi16(  //
-        _mm256_unpacklo_epi16(cb_eve, cr_eve), m581A_p492E);
-    __m256i tmp0_gy_eve_hi = _mm256_madd_epi16(  //
-        _mm256_unpackhi_epi16(cb_eve, cr_eve), m581A_p492E);
-    __m256i tmp0_gy_odd_lo = _mm256_madd_epi16(  //
-        _mm256_unpacklo_epi16(cb_odd, cr_odd), m581A_p492E);
-    __m256i tmp0_gy_odd_hi = _mm256_madd_epi16(  //
-        _mm256_unpackhi_epi16(cb_odd, cr_odd), m581A_p492E);
-
-    __m256i tmp1_gy_eve_lo =
-        _mm256_srai_epi32(_mm256_add_epi32(tmp0_gy_eve_lo, p8000_p0000), 16);
-    __m256i tmp1_gy_eve_hi =
-        _mm256_srai_epi32(_mm256_add_epi32(tmp0_gy_eve_hi, p8000_p0000), 16);
-    __m256i tmp1_gy_odd_lo =
-        _mm256_srai_epi32(_mm256_add_epi32(tmp0_gy_odd_lo, p8000_p0000), 16);
-    __m256i tmp1_gy_odd_hi =
-        _mm256_srai_epi32(_mm256_add_epi32(tmp0_gy_odd_hi, p8000_p0000), 16);
-
-    __m256i gy_eve = _mm256_sub_epi16(
-        _mm256_packs_epi32(tmp1_gy_eve_lo, tmp1_gy_eve_hi), cr_eve);
-    __m256i gy_odd = _mm256_sub_epi16(
-        _mm256_packs_epi32(tmp1_gy_odd_lo, tmp1_gy_odd_hi), cr_odd);
-
-    __m256i yy_all = _mm256_lddqu_si256((const __m256i*)(const void*)up0);
-    __m256i yy_eve = _mm256_and_si256(yy_all, u00FF);
-    __m256i yy_odd = _mm256_srli_epi16(yy_all, 8);
-
-    __m256i loose_b_eve = _mm256_add_epi16(by_eve, yy_eve);
-    __m256i loose_b_odd = _mm256_add_epi16(by_odd, yy_odd);
-    __m256i packed_b_eve = _mm256_packus_epi16(loose_b_eve, loose_b_eve);
-    __m256i packed_b_odd = _mm256_packus_epi16(loose_b_odd, loose_b_odd);
-
-    __m256i loose_g_eve = _mm256_add_epi16(gy_eve, yy_eve);
-    __m256i loose_g_odd = _mm256_add_epi16(gy_odd, yy_odd);
-    __m256i packed_g_eve = _mm256_packus_epi16(loose_g_eve, loose_g_eve);
-    __m256i packed_g_odd = _mm256_packus_epi16(loose_g_odd, loose_g_odd);
-
-    __m256i loose_r_eve = _mm256_add_epi16(ry_eve, yy_eve);
-    __m256i loose_r_odd = _mm256_add_epi16(ry_odd, yy_odd);
-    __m256i packed_r_eve = _mm256_packus_epi16(loose_r_eve, loose_r_eve);
-    __m256i packed_r_odd = _mm256_packus_epi16(loose_r_odd, loose_r_odd);
-
-    // § Note the swapped B and R channels.
-    __m256i mix00 = _mm256_unpacklo_epi8(packed_r_eve, packed_g_eve);
-    __m256i mix01 = _mm256_unpacklo_epi8(packed_r_odd, packed_g_odd);
-    __m256i mix02 = _mm256_unpacklo_epi8(packed_b_eve, uFFFF);
-    __m256i mix03 = _mm256_unpacklo_epi8(packed_b_odd, uFFFF);
-
-    __m256i mix10 = _mm256_unpacklo_epi16(mix00, mix02);
-    __m256i mix11 = _mm256_unpacklo_epi16(mix01, mix03);
-    __m256i mix12 = _mm256_unpackhi_epi16(mix00, mix02);
-    __m256i mix13 = _mm256_unpackhi_epi16(mix01, mix03);
-
-    __m256i mix20 = _mm256_unpacklo_epi32(mix10, mix11);
-    __m256i mix21 = _mm256_unpackhi_epi32(mix10, mix11);
-    __m256i mix22 = _mm256_unpacklo_epi32(mix12, mix13);
-    __m256i mix23 = _mm256_unpackhi_epi32(mix12, mix13);
-
-    __m256i mix30 = _mm256_permute2x128_si256(mix20, mix21, 0x20);
-    __m256i mix31 = _mm256_permute2x128_si256(mix22, mix23, 0x20);
-    __m256i mix32 = _mm256_permute2x128_si256(mix20, mix21, 0x31);
-    __m256i mix33 = _mm256_permute2x128_si256(mix22, mix23, 0x31);
-
-    _mm256_storeu_si256((__m256i*)(void*)(dst_iter + 0x00), mix30);
-    _mm256_storeu_si256((__m256i*)(void*)(dst_iter + 0x20), mix31);
-    _mm256_storeu_si256((__m256i*)(void*)(dst_iter + 0x40), mix32);
-    _mm256_storeu_si256((__m256i*)(void*)(dst_iter + 0x60), mix33);
-
-    uint32_t n = 32u - (31u & (x - x_end));
-    dst_iter += 4u * n;
-    up0 += n;
-    up1 += n;
-    up2 += n;
-    x += n;
-  }
-}
-
-#if defined(__GNUC__) && !defined(__clang__)
-// No-op.
-#else
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
-static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2(
-    uint8_t* dst_ptr,
-    const uint8_t* src_ptr_major,
-    const uint8_t* src_ptr_minor,
-    size_t src_len,
-    uint32_t h1v2_bias_ignored,
-    bool first_column,
-    bool last_column) {
-  uint8_t* dp = dst_ptr;
-  const uint8_t* sp_major = src_ptr_major;
-  const uint8_t* sp_minor = src_ptr_minor;
-
-  if (first_column) {
-    src_len--;
-    if ((src_len <= 0u) && last_column) {
-      uint32_t sv = (12u * ((uint32_t)(*sp_major++))) +  //
-                    (4u * ((uint32_t)(*sp_minor++)));
-      *dp++ = (uint8_t)((sv + 8u) >> 4u);
-      *dp++ = (uint8_t)((sv + 7u) >> 4u);
-      return dst_ptr;
-    }
-
-    uint32_t sv_major_m1 = sp_major[-0];  // Clamp offset to zero.
-    uint32_t sv_minor_m1 = sp_minor[-0];  // Clamp offset to zero.
-    uint32_t sv_major_p1 = sp_major[+1];
-    uint32_t sv_minor_p1 = sp_minor[+1];
-
-    uint32_t sv = (9u * ((uint32_t)(*sp_major++))) +  //
-                  (3u * ((uint32_t)(*sp_minor++)));
-    *dp++ = (uint8_t)((sv + (3u * sv_major_m1) + (sv_minor_m1) + 8u) >> 4u);
-    *dp++ = (uint8_t)((sv + (3u * sv_major_p1) + (sv_minor_p1) + 7u) >> 4u);
-    if (src_len <= 0u) {
-      return dst_ptr;
-    }
-  }
-
-  if (last_column) {
-    src_len--;
-  }
-
-  if (src_len < 32) {
-    // This fallback is the same as the non-SIMD-capable code path.
-    for (; src_len > 0u; src_len--) {
-      uint32_t sv_major_m1 = sp_major[-1];
-      uint32_t sv_minor_m1 = sp_minor[-1];
-      uint32_t sv_major_p1 = sp_major[+1];
-      uint32_t sv_minor_p1 = sp_minor[+1];
-
-      uint32_t sv = (9u * ((uint32_t)(*sp_major++))) +  //
-                    (3u * ((uint32_t)(*sp_minor++)));
-      *dp++ = (uint8_t)((sv + (3u * sv_major_m1) + (sv_minor_m1) + 8u) >> 4u);
-      *dp++ = (uint8_t)((sv + (3u * sv_major_p1) + (sv_minor_p1) + 7u) >> 4u);
-    }
-
-  } else {
-    while (src_len > 0u) {
-      // Load 1+32+1 samples (six u8x32 vectors) from the major (jxx) and minor
-      // (nxx) rows.
-      //
-      // major_p0 = [j00 j01 j02 j03 .. j28 j29 j30 j31]   // p0 = "plus  0"
-      // minor_p0 = [n00 n01 n02 n03 .. n28 n29 n30 n31]   // p0 = "plus  0"
-      // major_m1 = [jm1 j00 j01 j02 .. j27 j28 j29 j30]   // m1 = "minus 1"
-      // minor_m1 = [nm1 n00 n01 n02 .. n27 n28 n29 n30]   // m1 = "minus 1"
-      // major_p1 = [j01 j02 j03 j04 .. j29 j30 j31 j32]   // p1 = "plus  1"
-      // minor_p1 = [n01 n02 n03 n04 .. n29 n30 n31 n32]   // p1 = "plus  1"
-      __m256i major_p0 =
-          _mm256_lddqu_si256((const __m256i*)(const void*)(sp_major + 0));
-      __m256i minor_p0 =
-          _mm256_lddqu_si256((const __m256i*)(const void*)(sp_minor + 0));
-      __m256i major_m1 =
-          _mm256_lddqu_si256((const __m256i*)(const void*)(sp_major - 1));
-      __m256i minor_m1 =
-          _mm256_lddqu_si256((const __m256i*)(const void*)(sp_minor - 1));
-      __m256i major_p1 =
-          _mm256_lddqu_si256((const __m256i*)(const void*)(sp_major + 1));
-      __m256i minor_p1 =
-          _mm256_lddqu_si256((const __m256i*)(const void*)(sp_minor + 1));
-
-      // Unpack, staying with u8x32 vectors.
-      //
-      // step1_p0_lo = [j00 n00 j01 n01 .. j07 n07  j16 n16 j17 n17 .. j23 n23]
-      // step1_p0_hi = [j08 n08 j09 n09 .. j15 n15  j24 n24 j25 n25 .. j31 n31]
-      // step1_m1_lo = [jm1 nm1 j00 n00 .. j06 n06  j15 n15 j16 n16 .. j22 n22]
-      // step1_m1_hi = [j07 n07 j08 n08 .. j14 n14  j23 n23 j24 n24 .. j30 n30]
-      // step1_p1_lo = [j01 n01 j02 n02 .. j08 n08  j17 n17 j18 n18 .. j24 n24]
-      // step1_p1_hi = [j09 n09 j10 n10 .. j16 n16  j25 n25 j26 n26 .. j32 n32]
-      __m256i step1_p0_lo = _mm256_unpacklo_epi8(major_p0, minor_p0);
-      __m256i step1_p0_hi = _mm256_unpackhi_epi8(major_p0, minor_p0);
-      __m256i step1_m1_lo = _mm256_unpacklo_epi8(major_m1, minor_m1);
-      __m256i step1_m1_hi = _mm256_unpackhi_epi8(major_m1, minor_m1);
-      __m256i step1_p1_lo = _mm256_unpacklo_epi8(major_p1, minor_p1);
-      __m256i step1_p1_hi = _mm256_unpackhi_epi8(major_p1, minor_p1);
-
-      // Multiply-add to get u16x16 vectors.
-      //
-      // step2_p0_lo = [9*j00+3*n00 9*j01+3*n01 .. 9*j23+3*n23]
-      // step2_p0_hi = [9*j08+3*n08 9*j09+3*n09 .. 9*j31+3*n31]
-      // step2_m1_lo = [3*jm1+1*nm1 3*j00+1*n00 .. 3*j22+1*n22]
-      // step2_m1_hi = [3*j07+1*n07 3*j08+1*n08 .. 3*j30+1*n30]
-      // step2_p1_lo = [3*j01+1*n01 3*j02+1*n02 .. 3*j24+1*n24]
-      // step2_p1_hi = [3*j09+1*n09 3*j10+1*n10 .. 3*j32+1*n32]
-      const __m256i k0309 = _mm256_set1_epi16(0x0309);
-      const __m256i k0103 = _mm256_set1_epi16(0x0103);
-      __m256i step2_p0_lo = _mm256_maddubs_epi16(step1_p0_lo, k0309);
-      __m256i step2_p0_hi = _mm256_maddubs_epi16(step1_p0_hi, k0309);
-      __m256i step2_m1_lo = _mm256_maddubs_epi16(step1_m1_lo, k0103);
-      __m256i step2_m1_hi = _mm256_maddubs_epi16(step1_m1_hi, k0103);
-      __m256i step2_p1_lo = _mm256_maddubs_epi16(step1_p1_lo, k0103);
-      __m256i step2_p1_hi = _mm256_maddubs_epi16(step1_p1_hi, k0103);
-
-      // Compute the weighted sums of (p0, m1) and (p0, p1). For example:
-      //
-      // step3_m1_lo[00] = ((9*j00) + (3*n00) + (3*jm1) + (1*nm1)) as u16
-      // step3_p1_hi[15] = ((9*j31) + (3*n31) + (3*j32) + (1*n32)) as u16
-      __m256i step3_m1_lo = _mm256_add_epi16(step2_p0_lo, step2_m1_lo);
-      __m256i step3_m1_hi = _mm256_add_epi16(step2_p0_hi, step2_m1_hi);
-      __m256i step3_p1_lo = _mm256_add_epi16(step2_p0_lo, step2_p1_lo);
-      __m256i step3_p1_hi = _mm256_add_epi16(step2_p0_hi, step2_p1_hi);
-
-      // Bias by 8 (on the left) or 7 (on the right) and then divide by 16
-      // (which is 9+3+3+1) to get a weighted average. On the left (m1), shift
-      // the u16 right value by 4. On the right (p1), shift right by 4 and then
-      // shift left by 8 so that, when still in the u16x16 little-endian
-      // interpretation, we have:
-      //  - m1_element =  (etcetera + 8) >> 4
-      //  - p1_element = ((etcetera + 7) >> 4) << 8
-      //
-      // step4_m1_lo = [0x00?? 0x00?? ... 0x00?? 0x00??]
-      // step4_p1_lo = [0x??00 0x??00 ... 0x??00 0x??00]
-      // step4_m1_hi = [0x00?? 0x00?? ... 0x00?? 0x00??]
-      // step4_p1_hi = [0x??00 0x??00 ... 0x??00 0x??00]
-      __m256i step4_m1_lo = _mm256_srli_epi16(
-          _mm256_add_epi16(step3_m1_lo, _mm256_set1_epi16(8)), 4);
-      __m256i step4_p1_lo = _mm256_slli_epi16(
-          _mm256_srli_epi16(_mm256_add_epi16(step3_p1_lo, _mm256_set1_epi16(7)),
-                            4),
-          8);
-      __m256i step4_m1_hi = _mm256_srli_epi16(
-          _mm256_add_epi16(step3_m1_hi, _mm256_set1_epi16(8)), 4);
-      __m256i step4_p1_hi = _mm256_slli_epi16(
-          _mm256_srli_epi16(_mm256_add_epi16(step3_p1_hi, _mm256_set1_epi16(7)),
-                            4),
-          8);
-
-      // Bitwise-or two "0x00"-rich u16x16 vectors to get a u8x32 vector. Do
-      // that twice. Once for the low columns and once for the high columns.
-      //
-      // In terms of jxx (major row) or nxx (minor row) source samples:
-      //  - low  columns means ( 0 ..  8; 16 .. 24).
-      //  - high columns means ( 8 .. 16; 24 .. 32).
-      //
-      // In terms of dxx destination samples (there are twice as many):
-      //  - low  columns means ( 0 .. 16; 32 .. 48).
-      //  - high columns means (16 .. 32; 48 .. 64).
-      //
-      // step5_lo = [d00 d01 .. d14 d15  d32 d33 .. d46 d47]
-      // step5_hi = [d16 d17 .. d30 d31  d48 d49 .. d62 d63]
-      //
-      // The d00, d02 ... d62 even elements come from (p0, m1) weighted sums.
-      // The d01, d03 ... d63 odd  elements come from (p0, p1) weighted sums.
-      __m256i step5_lo = _mm256_or_si256(step4_m1_lo, step4_p1_lo);
-      __m256i step5_hi = _mm256_or_si256(step4_m1_hi, step4_p1_hi);
-
-      // Permute and store.
-      //
-      // step6_00_31 = [d00 d01 .. d14 d15  d16 d17 .. d30 d31]
-      // step6_32_63 = [d32 d33 .. d46 d47  d48 d49 .. d62 d63]
-      __m256i step6_00_31 = _mm256_permute2x128_si256(step5_lo, step5_hi, 0x20);
-      __m256i step6_32_63 = _mm256_permute2x128_si256(step5_lo, step5_hi, 0x31);
-      _mm256_storeu_si256((__m256i*)(void*)(dp + 0x00), step6_00_31);
-      _mm256_storeu_si256((__m256i*)(void*)(dp + 0x20), step6_32_63);
-
-      // Advance by up to 32 source samples (64 destination samples). The first
-      // iteration might be smaller than 32 so that all of the remaining steps
-      // are exactly 32.
-      size_t n = 32u - (31u & (0u - src_len));
-      dp += 2u * n;
-      sp_major += n;
-      sp_minor += n;
-      src_len -= n;
-    }
-  }
-
-  if (last_column) {
-    uint32_t sv_major_m1 = sp_major[-1];
-    uint32_t sv_minor_m1 = sp_minor[-1];
-    uint32_t sv_major_p1 = sp_major[+0];  // Clamp offset to zero.
-    uint32_t sv_minor_p1 = sp_minor[+0];  // Clamp offset to zero.
-
-    uint32_t sv = (9u * ((uint32_t)(*sp_major++))) +  //
-                  (3u * ((uint32_t)(*sp_minor++)));
-    *dp++ = (uint8_t)((sv + (3u * sv_major_m1) + (sv_minor_m1) + 8u) >> 4u);
-    *dp++ = (uint8_t)((sv + (3u * sv_major_p1) + (sv_minor_p1) + 7u) >> 4u);
-  }
-
-  return dst_ptr;
-}
-#endif
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_64)
-// ‼ WUFFS MULTI-FILE SECTION -x86_avx2
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE__PIXCONV)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) || \
-    defined(WUFFS_CONFIG__MODULE__BASE__UTF8)
-
-// ---------------- Unicode and UTF-8
-
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__utf_8__encode(wuffs_base__slice_u8 dst, uint32_t code_point) {
-  if (code_point <= 0x7F) {
-    if (dst.len >= 1) {
-      dst.ptr[0] = (uint8_t)(code_point);
-      return 1;
-    }
-
-  } else if (code_point <= 0x07FF) {
-    if (dst.len >= 2) {
-      dst.ptr[0] = (uint8_t)(0xC0 | ((code_point >> 6)));
-      dst.ptr[1] = (uint8_t)(0x80 | ((code_point >> 0) & 0x3F));
-      return 2;
-    }
-
-  } else if (code_point <= 0xFFFF) {
-    if ((dst.len >= 3) && ((code_point < 0xD800) || (0xDFFF < code_point))) {
-      dst.ptr[0] = (uint8_t)(0xE0 | ((code_point >> 12)));
-      dst.ptr[1] = (uint8_t)(0x80 | ((code_point >> 6) & 0x3F));
-      dst.ptr[2] = (uint8_t)(0x80 | ((code_point >> 0) & 0x3F));
-      return 3;
-    }
-
-  } else if (code_point <= 0x10FFFF) {
-    if (dst.len >= 4) {
-      dst.ptr[0] = (uint8_t)(0xF0 | ((code_point >> 18)));
-      dst.ptr[1] = (uint8_t)(0x80 | ((code_point >> 12) & 0x3F));
-      dst.ptr[2] = (uint8_t)(0x80 | ((code_point >> 6) & 0x3F));
-      dst.ptr[3] = (uint8_t)(0x80 | ((code_point >> 0) & 0x3F));
-      return 4;
-    }
-  }
-
-  return 0;
-}
-
-// wuffs_base__utf_8__byte_length_minus_1 is the byte length (minus 1) of a
-// UTF-8 encoded code point, based on the encoding's initial byte.
-//  - 0x00 is 1-byte UTF-8 (ASCII).
-//  - 0x01 is the start of 2-byte UTF-8.
-//  - 0x02 is the start of 3-byte UTF-8.
-//  - 0x03 is the start of 4-byte UTF-8.
-//  - 0x40 is a UTF-8 tail byte.
-//  - 0x80 is invalid UTF-8.
-//
-// RFC 3629 (UTF-8) gives this grammar for valid UTF-8:
-//    UTF8-1      = %x00-7F
-//    UTF8-2      = %xC2-DF UTF8-tail
-//    UTF8-3      = %xE0 %xA0-BF UTF8-tail / %xE1-EC 2( UTF8-tail ) /
-//                  %xED %x80-9F UTF8-tail / %xEE-EF 2( UTF8-tail )
-//    UTF8-4      = %xF0 %x90-BF 2( UTF8-tail ) / %xF1-F3 3( UTF8-tail ) /
-//                  %xF4 %x80-8F 2( UTF8-tail )
-//    UTF8-tail   = %x80-BF
-static const uint8_t wuffs_base__utf_8__byte_length_minus_1[256] = {
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x00 ..= 0x07.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x08 ..= 0x0F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x10 ..= 0x17.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x18 ..= 0x1F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x20 ..= 0x27.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x28 ..= 0x2F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x30 ..= 0x37.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x38 ..= 0x3F.
-
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x40 ..= 0x47.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x48 ..= 0x4F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x50 ..= 0x57.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x58 ..= 0x5F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x60 ..= 0x67.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x68 ..= 0x6F.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x70 ..= 0x77.
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // 0x78 ..= 0x7F.
-
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x80 ..= 0x87.
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x88 ..= 0x8F.
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x90 ..= 0x97.
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0x98 ..= 0x9F.
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0xA0 ..= 0xA7.
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0xA8 ..= 0xAF.
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0xB0 ..= 0xB7.
-    0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,  // 0xB8 ..= 0xBF.
-
-    0x80, 0x80, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,  // 0xC0 ..= 0xC7.
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,  // 0xC8 ..= 0xCF.
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,  // 0xD0 ..= 0xD7.
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,  // 0xD8 ..= 0xDF.
-    0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,  // 0xE0 ..= 0xE7.
-    0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,  // 0xE8 ..= 0xEF.
-    0x03, 0x03, 0x03, 0x03, 0x03, 0x80, 0x80, 0x80,  // 0xF0 ..= 0xF7.
-    0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  // 0xF8 ..= 0xFF.
-    // 0     1     2     3     4     5     6     7
-    // 8     9     A     B     C     D     E     F
-};
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__utf_8__next__output  //
-wuffs_base__utf_8__next(const uint8_t* s_ptr, size_t s_len) {
-  if (s_len == 0) {
-    return wuffs_base__make_utf_8__next__output(0, 0);
-  }
-  uint32_t c = s_ptr[0];
-  switch (wuffs_base__utf_8__byte_length_minus_1[c & 0xFF]) {
-    case 0:
-      return wuffs_base__make_utf_8__next__output(c, 1);
-
-    case 1:
-      if (s_len < 2) {
-        break;
-      }
-      c = wuffs_base__peek_u16le__no_bounds_check(s_ptr);
-      if ((c & 0xC000) != 0x8000) {
-        break;
-      }
-      c = (0x0007C0 & (c << 6)) | (0x00003F & (c >> 8));
-      return wuffs_base__make_utf_8__next__output(c, 2);
-
-    case 2:
-      if (s_len < 3) {
-        break;
-      }
-      c = wuffs_base__peek_u24le__no_bounds_check(s_ptr);
-      if ((c & 0xC0C000) != 0x808000) {
-        break;
-      }
-      c = (0x00F000 & (c << 12)) | (0x000FC0 & (c >> 2)) |
-          (0x00003F & (c >> 16));
-      if ((c <= 0x07FF) || ((0xD800 <= c) && (c <= 0xDFFF))) {
-        break;
-      }
-      return wuffs_base__make_utf_8__next__output(c, 3);
-
-    case 3:
-      if (s_len < 4) {
-        break;
-      }
-      c = wuffs_base__peek_u32le__no_bounds_check(s_ptr);
-      if ((c & 0xC0C0C000) != 0x80808000) {
-        break;
-      }
-      c = (0x1C0000 & (c << 18)) | (0x03F000 & (c << 4)) |
-          (0x000FC0 & (c >> 10)) | (0x00003F & (c >> 24));
-      if ((c <= 0xFFFF) || (0x110000 <= c)) {
-        break;
-      }
-      return wuffs_base__make_utf_8__next__output(c, 4);
-  }
-
-  return wuffs_base__make_utf_8__next__output(
-      WUFFS_BASE__UNICODE_REPLACEMENT_CHARACTER, 1);
-}
-
-WUFFS_BASE__MAYBE_STATIC wuffs_base__utf_8__next__output  //
-wuffs_base__utf_8__next_from_end(const uint8_t* s_ptr, size_t s_len) {
-  if (s_len == 0) {
-    return wuffs_base__make_utf_8__next__output(0, 0);
-  }
-  const uint8_t* ptr = &s_ptr[s_len - 1];
-  if (*ptr < 0x80) {
-    return wuffs_base__make_utf_8__next__output(*ptr, 1);
-
-  } else if (*ptr < 0xC0) {
-    const uint8_t* too_far = &s_ptr[(s_len > 4) ? (s_len - 4) : 0];
-    uint32_t n = 1;
-    while (ptr != too_far) {
-      ptr--;
-      n++;
-      if (*ptr < 0x80) {
-        break;
-      } else if (*ptr < 0xC0) {
-        continue;
-      }
-      wuffs_base__utf_8__next__output o = wuffs_base__utf_8__next(ptr, n);
-      if (o.byte_length != n) {
-        break;
-      }
-      return o;
-    }
-  }
-
-  return wuffs_base__make_utf_8__next__output(
-      WUFFS_BASE__UNICODE_REPLACEMENT_CHARACTER, 1);
-}
-
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__utf_8__longest_valid_prefix(const uint8_t* s_ptr, size_t s_len) {
-  // TODO: possibly optimize the all-ASCII case (4 or 8 bytes at a time).
-  //
-  // TODO: possibly optimize this by manually inlining the
-  // wuffs_base__utf_8__next calls.
-  size_t original_len = s_len;
-  while (s_len > 0) {
-    wuffs_base__utf_8__next__output o = wuffs_base__utf_8__next(s_ptr, s_len);
-    if ((o.code_point > 0x7F) && (o.byte_length == 1)) {
-      break;
-    }
-    s_ptr += o.byte_length;
-    s_len -= o.byte_length;
-  }
-  return original_len - s_len;
-}
-
-WUFFS_BASE__MAYBE_STATIC size_t  //
-wuffs_base__ascii__longest_valid_prefix(const uint8_t* s_ptr, size_t s_len) {
-  // TODO: possibly optimize this by checking 4 or 8 bytes at a time.
-  const uint8_t* original_ptr = s_ptr;
-  const uint8_t* p = s_ptr;
-  const uint8_t* q = s_ptr + s_len;
-  for (; (p != q) && ((*p & 0x80) == 0); p++) {
-  }
-  return (size_t)(p - original_ptr);
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE) ||
-        // defined(WUFFS_CONFIG__MODULE__BASE__UTF8)
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ADLER32)
-
-// ---------------- Status Codes Implementations
-
-// ---------------- Private Consts
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_adler32__hasher__up(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_adler32__hasher__up__choosy_default(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x);
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_adler32__hasher__up_arm_neon(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_adler32__hasher__up_x86_sse42(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-
-// ---------------- VTables
-
-const wuffs_base__hasher_u32__func_ptrs
-wuffs_adler32__hasher__func_ptrs_for__wuffs_base__hasher_u32 = {
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_adler32__hasher__get_quirk),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_adler32__hasher__set_quirk),
-  (uint32_t(*)(void*,
-      wuffs_base__slice_u8))(&wuffs_adler32__hasher__update_u32),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_adler32__hasher__initialize(
-    wuffs_adler32__hasher* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.choosy_up = &wuffs_adler32__hasher__up__choosy_default;
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__hasher_u32.vtable_name =
-      wuffs_base__hasher_u32__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__hasher_u32.function_pointers =
-      (const void*)(&wuffs_adler32__hasher__func_ptrs_for__wuffs_base__hasher_u32);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_adler32__hasher*
-wuffs_adler32__hasher__alloc() {
-  wuffs_adler32__hasher* x =
-      (wuffs_adler32__hasher*)(calloc(sizeof(wuffs_adler32__hasher), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_adler32__hasher__initialize(
-      x, sizeof(wuffs_adler32__hasher), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_adler32__hasher() {
-  return sizeof(wuffs_adler32__hasher);
-}
-
-// ---------------- Function Implementations
-
-// -------- func adler32.hasher.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_adler32__hasher__get_quirk(
-    const wuffs_adler32__hasher* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func adler32.hasher.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_adler32__hasher__set_quirk(
-    wuffs_adler32__hasher* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func adler32.hasher.update_u32
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_adler32__hasher__update_u32(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  if (!self) {
-    return 0;
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return 0;
-  }
-
-  if ( ! self->private_impl.f_started) {
-    self->private_impl.f_started = true;
-    self->private_impl.f_state = 1u;
-    self->private_impl.choosy_up = (
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-        wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_adler32__hasher__up_arm_neon :
-#endif
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-        wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_adler32__hasher__up_x86_sse42 :
-#endif
-        self->private_impl.choosy_up);
-  }
-  wuffs_adler32__hasher__up(self, a_x);
-  return self->private_impl.f_state;
-}
-
-// -------- func adler32.hasher.up
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_adler32__hasher__up(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  return (*self->private_impl.choosy_up)(self, a_x);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_adler32__hasher__up__choosy_default(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  uint32_t v_s1 = 0;
-  uint32_t v_s2 = 0;
-  wuffs_base__slice_u8 v_remaining = {0};
-  wuffs_base__slice_u8 v_p = {0};
-
-  v_s1 = ((self->private_impl.f_state) & 0xFFFFu);
-  v_s2 = ((self->private_impl.f_state) >> (32u - 16u));
-  while (((uint64_t)(a_x.len)) > 0u) {
-    v_remaining = wuffs_base__slice_u8__subslice_j(a_x, 0u);
-    if (((uint64_t)(a_x.len)) > 5552u) {
-      v_remaining = wuffs_base__slice_u8__subslice_i(a_x, 5552u);
-      a_x = wuffs_base__slice_u8__subslice_j(a_x, 5552u);
-    }
-    {
-      wuffs_base__slice_u8 i_slice_p = a_x;
-      v_p.ptr = i_slice_p.ptr;
-      v_p.len = 1;
-      uint8_t* i_end0_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 8) * 8);
-      while (v_p.ptr < i_end0_p) {
-        v_s1 += ((uint32_t)(v_p.ptr[0u]));
-        v_s2 += v_s1;
-        v_p.ptr += 1;
-        v_s1 += ((uint32_t)(v_p.ptr[0u]));
-        v_s2 += v_s1;
-        v_p.ptr += 1;
-        v_s1 += ((uint32_t)(v_p.ptr[0u]));
-        v_s2 += v_s1;
-        v_p.ptr += 1;
-        v_s1 += ((uint32_t)(v_p.ptr[0u]));
-        v_s2 += v_s1;
-        v_p.ptr += 1;
-        v_s1 += ((uint32_t)(v_p.ptr[0u]));
-        v_s2 += v_s1;
-        v_p.ptr += 1;
-        v_s1 += ((uint32_t)(v_p.ptr[0u]));
-        v_s2 += v_s1;
-        v_p.ptr += 1;
-        v_s1 += ((uint32_t)(v_p.ptr[0u]));
-        v_s2 += v_s1;
-        v_p.ptr += 1;
-        v_s1 += ((uint32_t)(v_p.ptr[0u]));
-        v_s2 += v_s1;
-        v_p.ptr += 1;
-      }
-      v_p.len = 1;
-      uint8_t* i_end1_p = i_slice_p.ptr + i_slice_p.len;
-      while (v_p.ptr < i_end1_p) {
-        v_s1 += ((uint32_t)(v_p.ptr[0u]));
-        v_s2 += v_s1;
-        v_p.ptr += 1;
-      }
-      v_p.len = 0;
-    }
-    v_s1 %= 65521u;
-    v_s2 %= 65521u;
-    a_x = v_remaining;
-  }
-  self->private_impl.f_state = (((v_s2 & 65535u) << 16u) | (v_s1 & 65535u));
-  return wuffs_base__make_empty_struct();
-}
-
-// ‼ WUFFS MULTI-FILE SECTION +arm_neon
-// -------- func adler32.hasher.up_arm_neon
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_adler32__hasher__up_arm_neon(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  uint32_t v_s1 = 0;
-  uint32_t v_s2 = 0;
-  wuffs_base__slice_u8 v_remaining = {0};
-  wuffs_base__slice_u8 v_p = {0};
-  uint8x16_t v_p__left = {0};
-  uint8x16_t v_p_right = {0};
-  uint32x4_t v_v1 = {0};
-  uint32x4_t v_v2 = {0};
-  uint16x8_t v_col0 = {0};
-  uint16x8_t v_col1 = {0};
-  uint16x8_t v_col2 = {0};
-  uint16x8_t v_col3 = {0};
-  uint32x2_t v_sum1 = {0};
-  uint32x2_t v_sum2 = {0};
-  uint32x2_t v_sum12 = {0};
-  uint32_t v_num_iterate_bytes = 0;
-  uint64_t v_tail_index = 0;
-
-  v_s1 = ((self->private_impl.f_state) & 0xFFFFu);
-  v_s2 = ((self->private_impl.f_state) >> (32u - 16u));
-  while ((((uint64_t)(a_x.len)) > 0u) && ((15u & ((uint32_t)(0xFFFu & (uintptr_t)(a_x.ptr)))) != 0u)) {
-    v_s1 += ((uint32_t)(a_x.ptr[0u]));
-    v_s2 += v_s1;
-    a_x = wuffs_base__slice_u8__subslice_i(a_x, 1u);
-  }
-  v_s1 %= 65521u;
-  v_s2 %= 65521u;
-  while (((uint64_t)(a_x.len)) > 0u) {
-    v_remaining = wuffs_base__slice_u8__subslice_j(a_x, 0u);
-    if (((uint64_t)(a_x.len)) > 5536u) {
-      v_remaining = wuffs_base__slice_u8__subslice_i(a_x, 5536u);
-      a_x = wuffs_base__slice_u8__subslice_j(a_x, 5536u);
-    }
-    v_num_iterate_bytes = ((uint32_t)((((uint64_t)(a_x.len)) & 4294967264u)));
-    v_s2 += ((uint32_t)(v_s1 * v_num_iterate_bytes));
-    v_v1 = vdupq_n_u32(0u);
-    v_v2 = vdupq_n_u32(0u);
-    v_col0 = vdupq_n_u16(0u);
-    v_col1 = vdupq_n_u16(0u);
-    v_col2 = vdupq_n_u16(0u);
-    v_col3 = vdupq_n_u16(0u);
-    {
-      wuffs_base__slice_u8 i_slice_p = a_x;
-      v_p.ptr = i_slice_p.ptr;
-      v_p.len = 32;
-      uint8_t* i_end0_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 32) * 32);
-      while (v_p.ptr < i_end0_p) {
-        v_p__left = vld1q_u8(v_p.ptr);
-        v_p_right = vld1q_u8(v_p.ptr + 16u);
-        v_v2 = vaddq_u32(v_v2, v_v1);
-        v_v1 = vpadalq_u16(v_v1, vpadalq_u8(vpaddlq_u8(v_p__left), v_p_right));
-        v_col0 = vaddw_u8(v_col0, vget_low_u8(v_p__left));
-        v_col1 = vaddw_u8(v_col1, vget_high_u8(v_p__left));
-        v_col2 = vaddw_u8(v_col2, vget_low_u8(v_p_right));
-        v_col3 = vaddw_u8(v_col3, vget_high_u8(v_p_right));
-        v_p.ptr += 32;
-      }
-      v_p.len = 0;
-    }
-    v_v2 = vshlq_n_u32(v_v2, 5u);
-    v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col0), ((uint16x4_t){32u, 31u, 30u, 29u}));
-    v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col0), ((uint16x4_t){28u, 27u, 26u, 25u}));
-    v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col1), ((uint16x4_t){24u, 23u, 22u, 21u}));
-    v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col1), ((uint16x4_t){20u, 19u, 18u, 17u}));
-    v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col2), ((uint16x4_t){16u, 15u, 14u, 13u}));
-    v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col2), ((uint16x4_t){12u, 11u, 10u, 9u}));
-    v_v2 = vmlal_u16(v_v2, vget_low_u16(v_col3), ((uint16x4_t){8u, 7u, 6u, 5u}));
-    v_v2 = vmlal_u16(v_v2, vget_high_u16(v_col3), ((uint16x4_t){4u, 3u, 2u, 1u}));
-    v_sum1 = vpadd_u32(vget_low_u32(v_v1), vget_high_u32(v_v1));
-    v_sum2 = vpadd_u32(vget_low_u32(v_v2), vget_high_u32(v_v2));
-    v_sum12 = vpadd_u32(v_sum1, v_sum2);
-    v_s1 += vget_lane_u32(v_sum12, 0u);
-    v_s2 += vget_lane_u32(v_sum12, 1u);
-    v_tail_index = (((uint64_t)(a_x.len)) & 18446744073709551584u);
-    if (v_tail_index < ((uint64_t)(a_x.len))) {
-      {
-        wuffs_base__slice_u8 i_slice_p = wuffs_base__slice_u8__subslice_i(a_x, v_tail_index);
-        v_p.ptr = i_slice_p.ptr;
-        v_p.len = 1;
-        uint8_t* i_end0_p = i_slice_p.ptr + i_slice_p.len;
-        while (v_p.ptr < i_end0_p) {
-          v_s1 += ((uint32_t)(v_p.ptr[0u]));
-          v_s2 += v_s1;
-          v_p.ptr += 1;
-        }
-        v_p.len = 0;
-      }
-    }
-    v_s1 %= 65521u;
-    v_s2 %= 65521u;
-    a_x = v_remaining;
-  }
-  self->private_impl.f_state = (((v_s2 & 65535u) << 16u) | (v_s1 & 65535u));
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-// ‼ WUFFS MULTI-FILE SECTION -arm_neon
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_sse42
-// -------- func adler32.hasher.up_x86_sse42
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_adler32__hasher__up_x86_sse42(
-    wuffs_adler32__hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  uint32_t v_s1 = 0;
-  uint32_t v_s2 = 0;
-  wuffs_base__slice_u8 v_remaining = {0};
-  wuffs_base__slice_u8 v_p = {0};
-  __m128i v_zeroes = {0};
-  __m128i v_ones = {0};
-  __m128i v_weights__left = {0};
-  __m128i v_weights_right = {0};
-  __m128i v_q__left = {0};
-  __m128i v_q_right = {0};
-  __m128i v_v1 = {0};
-  __m128i v_v2 = {0};
-  __m128i v_v2j = {0};
-  __m128i v_v2k = {0};
-  uint32_t v_num_iterate_bytes = 0;
-  uint64_t v_tail_index = 0;
-
-  v_zeroes = _mm_set1_epi16((int16_t)(0u));
-  v_ones = _mm_set1_epi16((int16_t)(1u));
-  v_weights__left = _mm_set_epi8((int8_t)(17u), (int8_t)(18u), (int8_t)(19u), (int8_t)(20u), (int8_t)(21u), (int8_t)(22u), (int8_t)(23u), (int8_t)(24u), (int8_t)(25u), (int8_t)(26u), (int8_t)(27u), (int8_t)(28u), (int8_t)(29u), (int8_t)(30u), (int8_t)(31u), (int8_t)(32u));
-  v_weights_right = _mm_set_epi8((int8_t)(1u), (int8_t)(2u), (int8_t)(3u), (int8_t)(4u), (int8_t)(5u), (int8_t)(6u), (int8_t)(7u), (int8_t)(8u), (int8_t)(9u), (int8_t)(10u), (int8_t)(11u), (int8_t)(12u), (int8_t)(13u), (int8_t)(14u), (int8_t)(15u), (int8_t)(16u));
-  v_s1 = ((self->private_impl.f_state) & 0xFFFFu);
-  v_s2 = ((self->private_impl.f_state) >> (32u - 16u));
-  while (((uint64_t)(a_x.len)) > 0u) {
-    v_remaining = wuffs_base__slice_u8__subslice_j(a_x, 0u);
-    if (((uint64_t)(a_x.len)) > 5536u) {
-      v_remaining = wuffs_base__slice_u8__subslice_i(a_x, 5536u);
-      a_x = wuffs_base__slice_u8__subslice_j(a_x, 5536u);
-    }
-    v_num_iterate_bytes = ((uint32_t)((((uint64_t)(a_x.len)) & 4294967264u)));
-    v_s2 += ((uint32_t)(v_s1 * v_num_iterate_bytes));
-    v_v1 = _mm_setzero_si128();
-    v_v2j = _mm_setzero_si128();
-    v_v2k = _mm_setzero_si128();
-    {
-      wuffs_base__slice_u8 i_slice_p = a_x;
-      v_p.ptr = i_slice_p.ptr;
-      v_p.len = 32;
-      uint8_t* i_end0_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 32) * 32);
-      while (v_p.ptr < i_end0_p) {
-        v_q__left = _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr));
-        v_q_right = _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr + 16u));
-        v_v2j = _mm_add_epi32(v_v2j, v_v1);
-        v_v1 = _mm_add_epi32(v_v1, _mm_sad_epu8(v_q__left, v_zeroes));
-        v_v1 = _mm_add_epi32(v_v1, _mm_sad_epu8(v_q_right, v_zeroes));
-        v_v2k = _mm_add_epi32(v_v2k, _mm_madd_epi16(v_ones, _mm_maddubs_epi16(v_q__left, v_weights__left)));
-        v_v2k = _mm_add_epi32(v_v2k, _mm_madd_epi16(v_ones, _mm_maddubs_epi16(v_q_right, v_weights_right)));
-        v_p.ptr += 32;
-      }
-      v_p.len = 0;
-    }
-    v_v1 = _mm_add_epi32(v_v1, _mm_shuffle_epi32(v_v1, (int32_t)(177u)));
-    v_v1 = _mm_add_epi32(v_v1, _mm_shuffle_epi32(v_v1, (int32_t)(78u)));
-    v_s1 += ((uint32_t)(_mm_cvtsi128_si32(v_v1)));
-    v_v2 = _mm_add_epi32(v_v2k, _mm_slli_epi32(v_v2j, (int32_t)(5u)));
-    v_v2 = _mm_add_epi32(v_v2, _mm_shuffle_epi32(v_v2, (int32_t)(177u)));
-    v_v2 = _mm_add_epi32(v_v2, _mm_shuffle_epi32(v_v2, (int32_t)(78u)));
-    v_s2 += ((uint32_t)(_mm_cvtsi128_si32(v_v2)));
-    v_tail_index = (((uint64_t)(a_x.len)) & 18446744073709551584u);
-    if (v_tail_index < ((uint64_t)(a_x.len))) {
-      {
-        wuffs_base__slice_u8 i_slice_p = wuffs_base__slice_u8__subslice_i(a_x, v_tail_index);
-        v_p.ptr = i_slice_p.ptr;
-        v_p.len = 1;
-        uint8_t* i_end0_p = i_slice_p.ptr + i_slice_p.len;
-        while (v_p.ptr < i_end0_p) {
-          v_s1 += ((uint32_t)(v_p.ptr[0u]));
-          v_s2 += v_s1;
-          v_p.ptr += 1;
-        }
-        v_p.len = 0;
-      }
-    }
-    v_s1 %= 65521u;
-    v_s2 %= 65521u;
-    a_x = v_remaining;
-  }
-  self->private_impl.f_state = (((v_s2 & 65535u) << 16u) | (v_s1 & 65535u));
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_sse42
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ADLER32)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BMP)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_bmp__error__bad_header[] = "#bmp: bad header";
-const char wuffs_bmp__error__bad_rle_compression[] = "#bmp: bad RLE compression";
-const char wuffs_bmp__error__truncated_input[] = "#bmp: truncated input";
-const char wuffs_bmp__error__unsupported_bmp_file[] = "#bmp: unsupported BMP file";
-const char wuffs_bmp__note__internal_note_short_read[] = "@bmp: internal note: short read";
-
-// ---------------- Private Consts
-
-#define WUFFS_BMP__COMPRESSION_NONE 0
-
-#define WUFFS_BMP__COMPRESSION_RLE8 1
-
-#define WUFFS_BMP__COMPRESSION_RLE4 2
-
-#define WUFFS_BMP__COMPRESSION_BITFIELDS 3
-
-#define WUFFS_BMP__COMPRESSION_JPEG 4
-
-#define WUFFS_BMP__COMPRESSION_PNG 5
-
-#define WUFFS_BMP__COMPRESSION_ALPHABITFIELDS 6
-
-#define WUFFS_BMP__COMPRESSION_LOW_BIT_DEPTH 256
-
-#define WUFFS_BMP__RLE_STATE_NEUTRAL 0
-
-#define WUFFS_BMP__RLE_STATE_RUN 1
-
-#define WUFFS_BMP__RLE_STATE_ESCAPE 2
-
-#define WUFFS_BMP__RLE_STATE_LITERAL 3
-
-#define WUFFS_BMP__RLE_STATE_DELTA_X 4
-
-#define WUFFS_BMP__RLE_STATE_DELTA_Y 5
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__do_decode_image_config(
-    wuffs_bmp__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__do_decode_frame_config(
-    wuffs_bmp__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__do_decode_frame(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__swizzle_none(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__swizzle_rle(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__swizzle_bitfields(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__swizzle_low_bit_depth(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__do_tell_me_more(
-    wuffs_bmp__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__read_palette(
-    wuffs_bmp__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__process_masks(
-    wuffs_bmp__decoder* self);
-
-// ---------------- VTables
-
-const wuffs_base__image_decoder__func_ptrs
-wuffs_bmp__decoder__func_ptrs_for__wuffs_base__image_decoder = {
-  (wuffs_base__status(*)(void*,
-      wuffs_base__pixel_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__pixel_blend,
-      wuffs_base__slice_u8,
-      wuffs_base__decode_frame_options*))(&wuffs_bmp__decoder__decode_frame),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__frame_config*,
-      wuffs_base__io_buffer*))(&wuffs_bmp__decoder__decode_frame_config),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__image_config*,
-      wuffs_base__io_buffer*))(&wuffs_bmp__decoder__decode_image_config),
-  (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_bmp__decoder__frame_dirty_rect),
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_bmp__decoder__get_quirk),
-  (uint32_t(*)(const void*))(&wuffs_bmp__decoder__num_animation_loops),
-  (uint64_t(*)(const void*))(&wuffs_bmp__decoder__num_decoded_frame_configs),
-  (uint64_t(*)(const void*))(&wuffs_bmp__decoder__num_decoded_frames),
-  (wuffs_base__status(*)(void*,
-      uint64_t,
-      uint64_t))(&wuffs_bmp__decoder__restart_frame),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_bmp__decoder__set_quirk),
-  (wuffs_base__empty_struct(*)(void*,
-      uint32_t,
-      bool))(&wuffs_bmp__decoder__set_report_metadata),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__more_information*,
-      wuffs_base__io_buffer*))(&wuffs_bmp__decoder__tell_me_more),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_bmp__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_bmp__decoder__initialize(
-    wuffs_bmp__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.vtable_name =
-      wuffs_base__image_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.function_pointers =
-      (const void*)(&wuffs_bmp__decoder__func_ptrs_for__wuffs_base__image_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_bmp__decoder*
-wuffs_bmp__decoder__alloc() {
-  wuffs_bmp__decoder* x =
-      (wuffs_bmp__decoder*)(calloc(sizeof(wuffs_bmp__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_bmp__decoder__initialize(
-      x, sizeof(wuffs_bmp__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_bmp__decoder() {
-  return sizeof(wuffs_bmp__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func bmp.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bmp__decoder__get_quirk(
-    const wuffs_bmp__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func bmp.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__set_quirk(
-    wuffs_bmp__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func bmp.decoder.decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__decode_image_config(
-    wuffs_bmp__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_bmp__decoder__do_decode_image_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_bmp__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func bmp.decoder.do_decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__do_decode_image_config(
-    wuffs_bmp__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_magic = 0;
-  uint32_t v_width = 0;
-  uint32_t v_height = 0;
-  uint32_t v_planes = 0;
-  uint32_t v_dst_pixfmt = 0;
-  uint32_t v_byte_width = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_call_sequence != 0u) || (self->private_impl.f_io_redirect_fourcc == 1u)) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    } else if (self->private_impl.f_io_redirect_fourcc != 0u) {
-      status = wuffs_base__make_status(wuffs_base__note__i_o_redirect);
-      goto ok;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint32_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_0 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0;
-          if (num_bits_0 == 8) {
-            t_0 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0)) << 56;
-        }
-      }
-      v_magic = t_0;
-    }
-    if (v_magic != 19778u) {
-      status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-      goto exit;
-    }
-    self->private_data.s_do_decode_image_config[0].scratch = 8u;
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-    if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-      self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-      iop_a_src = io2_a_src;
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      goto suspend;
-    }
-    iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-      uint32_t t_1;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_1 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_1 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1;
-          if (num_bits_1 == 24) {
-            t_1 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_1 += 8u;
-          *scratch |= ((uint64_t)(num_bits_1)) << 56;
-        }
-      }
-      self->private_impl.f_padding = t_1;
-    }
-    if (self->private_impl.f_padding < 14u) {
-      status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-      goto exit;
-    }
-    self->private_impl.f_padding -= 14u;
-    self->private_impl.f_io_redirect_pos = wuffs_base__u64__sat_add(((uint64_t)(self->private_impl.f_padding)), wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src))));
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-      uint32_t t_2;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_2 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_2 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2;
-          if (num_bits_2 == 24) {
-            t_2 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_2 += 8u;
-          *scratch |= ((uint64_t)(num_bits_2)) << 56;
-        }
-      }
-      self->private_impl.f_bitmap_info_len = t_2;
-    }
-    if (self->private_impl.f_padding < self->private_impl.f_bitmap_info_len) {
-      status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-      goto exit;
-    }
-    self->private_impl.f_padding -= self->private_impl.f_bitmap_info_len;
-    if (self->private_impl.f_bitmap_info_len == 12u) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-        uint32_t t_3;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_3 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_3 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_3;
-            if (num_bits_3 == 8) {
-              t_3 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_3 += 8u;
-            *scratch |= ((uint64_t)(num_bits_3)) << 56;
-          }
-        }
-        self->private_impl.f_width = t_3;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-        uint32_t t_4;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_4 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_4 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_4;
-            if (num_bits_4 == 8) {
-              t_4 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_4 += 8u;
-            *scratch |= ((uint64_t)(num_bits_4)) << 56;
-          }
-        }
-        self->private_impl.f_height = t_4;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12);
-        uint32_t t_5;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_5 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_5 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_5;
-            if (num_bits_5 == 8) {
-              t_5 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_5 += 8u;
-            *scratch |= ((uint64_t)(num_bits_5)) << 56;
-          }
-        }
-        v_planes = t_5;
-      }
-      if (v_planes != 1u) {
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14);
-        uint32_t t_6;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_6 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_6 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_6;
-            if (num_bits_6 == 8) {
-              t_6 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_6 += 8u;
-            *scratch |= ((uint64_t)(num_bits_6)) << 56;
-          }
-        }
-        self->private_impl.f_bits_per_pixel = t_6;
-      }
-    } else if (self->private_impl.f_bitmap_info_len == 16u) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16);
-        uint32_t t_7;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-          t_7 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-          iop_a_src += 4;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(17);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_7 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_7;
-            if (num_bits_7 == 24) {
-              t_7 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_7 += 8u;
-            *scratch |= ((uint64_t)(num_bits_7)) << 56;
-          }
-        }
-        v_width = t_7;
-      }
-      if (v_width > 2147483647u) {
-        status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-        goto exit;
-      } else if (v_width > 16777215u) {
-        status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-        goto exit;
-      }
-      self->private_impl.f_width = v_width;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(18);
-        uint32_t t_8;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-          t_8 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-          iop_a_src += 4;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(19);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_8 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_8;
-            if (num_bits_8 == 24) {
-              t_8 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_8 += 8u;
-            *scratch |= ((uint64_t)(num_bits_8)) << 56;
-          }
-        }
-        v_height = t_8;
-      }
-      if (v_height > 2147483647u) {
-        status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-        goto exit;
-      } else if (v_height > 16777215u) {
-        status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-        goto exit;
-      }
-      self->private_impl.f_height = v_height;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(20);
-        uint32_t t_9;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_9 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(21);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_9 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_9;
-            if (num_bits_9 == 8) {
-              t_9 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_9 += 8u;
-            *scratch |= ((uint64_t)(num_bits_9)) << 56;
-          }
-        }
-        v_planes = t_9;
-      }
-      if (v_planes != 1u) {
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(22);
-        uint32_t t_10;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_10 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(23);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_10 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_10;
-            if (num_bits_10 == 8) {
-              t_10 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_10 += 8u;
-            *scratch |= ((uint64_t)(num_bits_10)) << 56;
-          }
-        }
-        self->private_impl.f_bits_per_pixel = t_10;
-      }
-    } else {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(24);
-        uint32_t t_11;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-          t_11 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-          iop_a_src += 4;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(25);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_11 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_11;
-            if (num_bits_11 == 24) {
-              t_11 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_11 += 8u;
-            *scratch |= ((uint64_t)(num_bits_11)) << 56;
-          }
-        }
-        v_width = t_11;
-      }
-      if (v_width > 2147483647u) {
-        status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-        goto exit;
-      } else if (v_width > 16777215u) {
-        status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-        goto exit;
-      }
-      self->private_impl.f_width = v_width;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(26);
-        uint32_t t_12;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-          t_12 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-          iop_a_src += 4;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(27);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_12 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_12;
-            if (num_bits_12 == 24) {
-              t_12 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_12 += 8u;
-            *scratch |= ((uint64_t)(num_bits_12)) << 56;
-          }
-        }
-        v_height = t_12;
-      }
-      if (v_height == 2147483648u) {
-        status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-        goto exit;
-      } else if (v_height > 2147483648u) {
-        v_height = ((uint32_t)(0u - v_height));
-        if (v_height > 16777215u) {
-          status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-          goto exit;
-        }
-        self->private_impl.f_height = v_height;
-        self->private_impl.f_top_down = true;
-      } else if (v_height > 16777215u) {
-        status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-        goto exit;
-      } else {
-        self->private_impl.f_height = v_height;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(28);
-        uint32_t t_13;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_13 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(29);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_13 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_13;
-            if (num_bits_13 == 8) {
-              t_13 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_13 += 8u;
-            *scratch |= ((uint64_t)(num_bits_13)) << 56;
-          }
-        }
-        v_planes = t_13;
-      }
-      if (v_planes != 1u) {
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(30);
-        uint32_t t_14;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_14 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(31);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_14 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_14;
-            if (num_bits_14 == 8) {
-              t_14 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_14 += 8u;
-            *scratch |= ((uint64_t)(num_bits_14)) << 56;
-          }
-        }
-        self->private_impl.f_bits_per_pixel = t_14;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(32);
-        uint32_t t_15;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-          t_15 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-          iop_a_src += 4;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(33);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_15 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_15;
-            if (num_bits_15 == 24) {
-              t_15 = ((uint32_t)(*scratch));
-              break;
-            }
-            num_bits_15 += 8u;
-            *scratch |= ((uint64_t)(num_bits_15)) << 56;
-          }
-        }
-        self->private_impl.f_compression = t_15;
-      }
-      if (self->private_impl.f_bits_per_pixel == 0u) {
-        if (self->private_impl.f_compression == 4u) {
-          self->private_impl.f_io_redirect_fourcc = 1246774599u;
-          status = wuffs_base__make_status(wuffs_base__note__i_o_redirect);
-          goto ok;
-        } else if (self->private_impl.f_compression == 5u) {
-          self->private_impl.f_io_redirect_fourcc = 1347307296u;
-          status = wuffs_base__make_status(wuffs_base__note__i_o_redirect);
-          goto ok;
-        }
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-      self->private_data.s_do_decode_image_config[0].scratch = 20u;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(34);
-      if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
-      if (self->private_impl.f_bitmap_info_len == 40u) {
-        if (self->private_impl.f_bits_per_pixel >= 16u) {
-          if (self->private_impl.f_padding >= 16u) {
-            self->private_impl.f_bitmap_info_len = 56u;
-            self->private_impl.f_padding -= 16u;
-          } else if (self->private_impl.f_padding >= 12u) {
-            self->private_impl.f_bitmap_info_len = 52u;
-            self->private_impl.f_padding -= 12u;
-          }
-        }
-      } else if ((self->private_impl.f_bitmap_info_len != 52u) &&
-          (self->private_impl.f_bitmap_info_len != 56u) &&
-          (self->private_impl.f_bitmap_info_len != 64u) &&
-          (self->private_impl.f_bitmap_info_len != 108u) &&
-          (self->private_impl.f_bitmap_info_len != 124u)) {
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-      if (self->private_impl.f_compression == 6u) {
-        self->private_impl.f_compression = 3u;
-      }
-      if (self->private_impl.f_compression == 3u) {
-        if (self->private_impl.f_bitmap_info_len >= 52u) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(35);
-            uint32_t t_16;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_16 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_do_decode_image_config[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(36);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-                uint32_t num_bits_16 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_16;
-                if (num_bits_16 == 24) {
-                  t_16 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_16 += 8u;
-                *scratch |= ((uint64_t)(num_bits_16)) << 56;
-              }
-            }
-            self->private_impl.f_channel_masks[2u] = t_16;
-          }
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(37);
-            uint32_t t_17;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_17 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_do_decode_image_config[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(38);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-                uint32_t num_bits_17 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_17;
-                if (num_bits_17 == 24) {
-                  t_17 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_17 += 8u;
-                *scratch |= ((uint64_t)(num_bits_17)) << 56;
-              }
-            }
-            self->private_impl.f_channel_masks[1u] = t_17;
-          }
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(39);
-            uint32_t t_18;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_18 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_do_decode_image_config[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(40);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-                uint32_t num_bits_18 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_18;
-                if (num_bits_18 == 24) {
-                  t_18 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_18 += 8u;
-                *scratch |= ((uint64_t)(num_bits_18)) << 56;
-              }
-            }
-            self->private_impl.f_channel_masks[0u] = t_18;
-          }
-          if (self->private_impl.f_bitmap_info_len >= 56u) {
-            {
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(41);
-              uint32_t t_19;
-              if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-                t_19 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-                iop_a_src += 4;
-              } else {
-                self->private_data.s_do_decode_image_config[0].scratch = 0;
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT(42);
-                while (true) {
-                  if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                    status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                    goto suspend;
-                  }
-                  uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-                  uint32_t num_bits_19 = ((uint32_t)(*scratch >> 56));
-                  *scratch <<= 8;
-                  *scratch >>= 8;
-                  *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_19;
-                  if (num_bits_19 == 24) {
-                    t_19 = ((uint32_t)(*scratch));
-                    break;
-                  }
-                  num_bits_19 += 8u;
-                  *scratch |= ((uint64_t)(num_bits_19)) << 56;
-                }
-              }
-              self->private_impl.f_channel_masks[3u] = t_19;
-            }
-            self->private_data.s_do_decode_image_config[0].scratch = ((uint32_t)(self->private_impl.f_bitmap_info_len - 56u));
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(43);
-            if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-              self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-              iop_a_src = io2_a_src;
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
-          }
-          if ((self->private_impl.f_channel_masks[0u] == 255u) && (self->private_impl.f_channel_masks[1u] == 65280u) && (self->private_impl.f_channel_masks[2u] == 16711680u)) {
-            if (self->private_impl.f_bits_per_pixel == 24u) {
-              self->private_impl.f_compression = 0u;
-            } else if (self->private_impl.f_bits_per_pixel == 32u) {
-              if ((self->private_impl.f_channel_masks[3u] == 0u) || (self->private_impl.f_channel_masks[3u] == 4278190080u)) {
-                self->private_impl.f_compression = 0u;
-              }
-            }
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(44);
-          status = wuffs_bmp__decoder__process_masks(self);
-          if (status.repr) {
-            goto suspend;
-          }
-        }
-      } else if (self->private_impl.f_bitmap_info_len >= 40u) {
-        self->private_data.s_do_decode_image_config[0].scratch = (self->private_impl.f_bitmap_info_len - 40u);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(45);
-        if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-          self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-          iop_a_src = io2_a_src;
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
-      } else {
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-    }
-    if (self->private_impl.f_compression != 3u) {
-      if (self->private_impl.f_bits_per_pixel < 16u) {
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(46);
-        status = wuffs_bmp__decoder__read_palette(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-      }
-    }
-    if (self->private_impl.f_compression == 0u) {
-      if ((self->private_impl.f_bits_per_pixel == 1u) || (self->private_impl.f_bits_per_pixel == 2u) || (self->private_impl.f_bits_per_pixel == 4u)) {
-        self->private_impl.f_src_pixfmt = 2198077448u;
-        self->private_impl.f_compression = 256u;
-      } else if (self->private_impl.f_bits_per_pixel == 8u) {
-        self->private_impl.f_src_pixfmt = 2198077448u;
-      } else if (self->private_impl.f_bits_per_pixel == 16u) {
-        self->private_impl.f_compression = 3u;
-        self->private_impl.f_channel_masks[0u] = 31u;
-        self->private_impl.f_channel_masks[1u] = 992u;
-        self->private_impl.f_channel_masks[2u] = 31744u;
-        self->private_impl.f_channel_masks[3u] = 0u;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(47);
-        status = wuffs_bmp__decoder__process_masks(self);
-        if (status.repr) {
-          goto suspend;
-        }
-        self->private_impl.f_src_pixfmt = 2164308923u;
-      } else if (self->private_impl.f_bits_per_pixel == 24u) {
-        self->private_impl.f_src_pixfmt = 2147485832u;
-      } else if (self->private_impl.f_bits_per_pixel == 32u) {
-        if (self->private_impl.f_channel_masks[3u] == 0u) {
-          self->private_impl.f_src_pixfmt = 2415954056u;
-        } else {
-          self->private_impl.f_src_pixfmt = 2164295816u;
-        }
-      } else {
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-    } else if (self->private_impl.f_compression == 1u) {
-      if (self->private_impl.f_bits_per_pixel == 8u) {
-        self->private_impl.f_src_pixfmt = 2198077448u;
-      } else {
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-    } else if (self->private_impl.f_compression == 2u) {
-      if (self->private_impl.f_bits_per_pixel == 4u) {
-        self->private_impl.f_src_pixfmt = 2198077448u;
-      } else {
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-    } else if (self->private_impl.f_compression == 3u) {
-      if ((self->private_impl.f_bits_per_pixel == 16u) || (self->private_impl.f_bits_per_pixel == 32u)) {
-        self->private_impl.f_src_pixfmt = 2164308923u;
-      } else {
-        status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-        goto exit;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-      goto exit;
-    }
-    if (((self->private_impl.f_bitmap_info_len < 40u) || (self->private_impl.f_bitmap_info_len == 64u)) &&
-        (self->private_impl.f_bits_per_pixel != 1u) &&
-        (self->private_impl.f_bits_per_pixel != 4u) &&
-        (self->private_impl.f_bits_per_pixel != 8u) &&
-        (self->private_impl.f_bits_per_pixel != 24u)) {
-      status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-      goto exit;
-    }
-    if (self->private_impl.f_bits_per_pixel == 1u) {
-      v_byte_width = ((self->private_impl.f_width >> 3u) + (((self->private_impl.f_width & 7u) + 7u) >> 3u));
-      self->private_impl.f_pad_per_row = ((4u - (v_byte_width & 3u)) & 3u);
-    } else if (self->private_impl.f_bits_per_pixel == 2u) {
-      v_byte_width = ((self->private_impl.f_width >> 2u) + (((self->private_impl.f_width & 3u) + 3u) >> 2u));
-      self->private_impl.f_pad_per_row = ((4u - (v_byte_width & 3u)) & 3u);
-    } else if (self->private_impl.f_bits_per_pixel == 4u) {
-      v_byte_width = ((self->private_impl.f_width >> 1u) + (self->private_impl.f_width & 1u));
-      self->private_impl.f_pad_per_row = ((4u - (v_byte_width & 3u)) & 3u);
-    } else if (self->private_impl.f_bits_per_pixel == 8u) {
-      self->private_impl.f_pad_per_row = ((4u - (self->private_impl.f_width & 3u)) & 3u);
-    } else if (self->private_impl.f_bits_per_pixel == 16u) {
-      self->private_impl.f_pad_per_row = ((self->private_impl.f_width & 1u) * 2u);
-    } else if (self->private_impl.f_bits_per_pixel == 24u) {
-      self->private_impl.f_pad_per_row = (self->private_impl.f_width & 3u);
-    } else if (self->private_impl.f_bits_per_pixel == 32u) {
-      self->private_impl.f_pad_per_row = 0u;
-    }
-    self->private_impl.f_frame_config_io_position = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-    if (a_dst != NULL) {
-      v_dst_pixfmt = 2164295816u;
-      if ((self->private_impl.f_channel_num_bits[0u] > 8u) ||
-          (self->private_impl.f_channel_num_bits[1u] > 8u) ||
-          (self->private_impl.f_channel_num_bits[2u] > 8u) ||
-          (self->private_impl.f_channel_num_bits[3u] > 8u)) {
-        v_dst_pixfmt = 2164308923u;
-      }
-      wuffs_base__image_config__set(
-          a_dst,
-          v_dst_pixfmt,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height,
-          self->private_impl.f_frame_config_io_position,
-          (self->private_impl.f_channel_masks[3u] == 0u));
-    }
-    self->private_impl.f_call_sequence = 32u;
-
-    ok:
-    self->private_impl.p_do_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bmp.decoder.decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__decode_frame_config(
-    wuffs_bmp__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 2)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_bmp__decoder__do_decode_frame_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_bmp__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 2 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func bmp.decoder.do_decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__do_decode_frame_config(
-    wuffs_bmp__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 32u) {
-    } else if (self->private_impl.f_call_sequence < 32u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_bmp__decoder__do_decode_image_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else if (self->private_impl.f_call_sequence == 40u) {
-      if (self->private_impl.f_frame_config_io_position != wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)))) {
-        status = wuffs_base__make_status(wuffs_base__error__bad_restart);
-        goto exit;
-      }
-    } else if (self->private_impl.f_call_sequence == 64u) {
-      self->private_impl.f_call_sequence = 96u;
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (a_dst != NULL) {
-      wuffs_base__frame_config__set(
-          a_dst,
-          wuffs_base__utility__make_rect_ie_u32(
-          0u,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height),
-          ((wuffs_base__flicks)(0u)),
-          0u,
-          self->private_impl.f_frame_config_io_position,
-          0u,
-          true,
-          false,
-          4278190080u);
-    }
-    self->private_impl.f_call_sequence = 64u;
-
-    ok:
-    self->private_impl.p_do_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bmp.decoder.decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__decode_frame(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 3)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_bmp__decoder__do_decode_frame(self,
-            a_dst,
-            a_src,
-            a_blend,
-            a_workbuf,
-            a_opts);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_bmp__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 3 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func bmp.decoder.do_decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__do_decode_frame(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 64u) {
-    } else if (self->private_impl.f_call_sequence < 64u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_bmp__decoder__do_decode_frame_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    self->private_data.s_do_decode_frame[0].scratch = self->private_impl.f_padding;
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-    if (self->private_data.s_do_decode_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-      self->private_data.s_do_decode_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-      iop_a_src = io2_a_src;
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      goto suspend;
-    }
-    iop_a_src += self->private_data.s_do_decode_frame[0].scratch;
-    if ((self->private_impl.f_width > 0u) && (self->private_impl.f_height > 0u)) {
-      self->private_impl.f_dst_x = 0u;
-      if (self->private_impl.f_top_down) {
-        self->private_impl.f_dst_y = 0u;
-        self->private_impl.f_dst_y_inc = 1u;
-      } else {
-        self->private_impl.f_dst_y = ((uint32_t)(self->private_impl.f_height - 1u));
-        self->private_impl.f_dst_y_inc = 4294967295u;
-      }
-      v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler,
-          wuffs_base__pixel_buffer__pixel_format(a_dst),
-          wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8_ij(self->private_data.f_scratch, 1024, 2048)),
-          wuffs_base__utility__make_pixel_format(self->private_impl.f_src_pixfmt),
-          wuffs_base__make_slice_u8(self->private_data.f_src_palette, 1024),
-          a_blend);
-      if ( ! wuffs_base__status__is_ok(&v_status)) {
-        status = v_status;
-        if (wuffs_base__status__is_error(&status)) {
-          goto exit;
-        } else if (wuffs_base__status__is_suspension(&status)) {
-          status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-          goto exit;
-        }
-        goto ok;
-      }
-      while (true) {
-        if (self->private_impl.f_compression == 0u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          v_status = wuffs_bmp__decoder__swizzle_none(self, a_dst, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-        } else if (self->private_impl.f_compression < 3u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          v_status = wuffs_bmp__decoder__swizzle_rle(self, a_dst, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-        } else if (self->private_impl.f_compression == 3u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          v_status = wuffs_bmp__decoder__swizzle_bitfields(self, a_dst, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-        } else {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          v_status = wuffs_bmp__decoder__swizzle_low_bit_depth(self, a_dst, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-        }
-        if (wuffs_base__status__is_ok(&v_status)) {
-          break;
-        } else if (v_status.repr != wuffs_bmp__note__internal_note_short_read) {
-          status = v_status;
-          if (wuffs_base__status__is_error(&status)) {
-            goto exit;
-          } else if (wuffs_base__status__is_suspension(&status)) {
-            status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-            goto exit;
-          }
-          goto ok;
-        }
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-      }
-      self->private_data.s_do_decode_frame[0].scratch = self->private_impl.f_pending_pad;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-      if (self->private_data.s_do_decode_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_do_decode_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_do_decode_frame[0].scratch;
-      self->private_impl.f_pending_pad = 0u;
-    }
-    self->private_impl.f_call_sequence = 96u;
-
-    ok:
-    self->private_impl.p_do_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bmp.decoder.swizzle_none
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__swizzle_none(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint32_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_bytes_per_row = 0;
-  uint32_t v_src_bytes_per_pixel = 0;
-  wuffs_base__slice_u8 v_dst_palette = {0};
-  wuffs_base__table_u8 v_tab = {0};
-  wuffs_base__slice_u8 v_dst = {0};
-  uint64_t v_i = 0;
-  uint64_t v_j = 0;
-  uint64_t v_n = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-  v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-  if ((v_dst_bits_per_pixel & 7u) != 0u) {
-    status = wuffs_base__make_status(wuffs_base__error__unsupported_option);
-    goto exit;
-  }
-  v_dst_bytes_per_pixel = (v_dst_bits_per_pixel / 8u);
-  v_dst_bytes_per_row = ((uint64_t)((self->private_impl.f_width * v_dst_bytes_per_pixel)));
-  v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8_ij(self->private_data.f_scratch, 1024, 2048));
-  v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-  label__outer__continue:;
-  while (true) {
-    while (self->private_impl.f_pending_pad > 0u) {
-      if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-        status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
-        goto ok;
-      }
-      self->private_impl.f_pending_pad -= 1u;
-      iop_a_src += 1u;
-    }
-    while (true) {
-      if (self->private_impl.f_dst_x == self->private_impl.f_width) {
-        self->private_impl.f_dst_x = 0u;
-        self->private_impl.f_dst_y += self->private_impl.f_dst_y_inc;
-        if (self->private_impl.f_dst_y >= self->private_impl.f_height) {
-          if (self->private_impl.f_height > 0u) {
-            self->private_impl.f_pending_pad = self->private_impl.f_pad_per_row;
-          }
-          goto label__outer__break;
-        } else if (self->private_impl.f_pad_per_row != 0u) {
-          self->private_impl.f_pending_pad = self->private_impl.f_pad_per_row;
-          goto label__outer__continue;
-        }
-      }
-      v_dst = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-      if (v_dst_bytes_per_row < ((uint64_t)(v_dst.len))) {
-        v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row);
-      }
-      v_i = (((uint64_t)(self->private_impl.f_dst_x)) * ((uint64_t)(v_dst_bytes_per_pixel)));
-      if (v_i >= ((uint64_t)(v_dst.len))) {
-        if (self->private_impl.f_bits_per_pixel > 32u) {
-          status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-          goto exit;
-        }
-        v_src_bytes_per_pixel = (self->private_impl.f_bits_per_pixel / 8u);
-        if (v_src_bytes_per_pixel == 0u) {
-          status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
-          goto exit;
-        }
-        v_n = (((uint64_t)(io2_a_src - iop_a_src)) / ((uint64_t)(v_src_bytes_per_pixel)));
-        v_n = wuffs_base__u64__min(v_n, ((uint64_t)(((uint32_t)(self->private_impl.f_width - self->private_impl.f_dst_x)))));
-        v_j = v_n;
-        while (v_j >= 8u) {
-          if (((uint64_t)(io2_a_src - iop_a_src)) >= ((uint64_t)((v_src_bytes_per_pixel * 8u)))) {
-            iop_a_src += (v_src_bytes_per_pixel * 8u);
-          }
-          v_j -= 8u;
-        }
-        while (v_j > 0u) {
-          if (((uint64_t)(io2_a_src - iop_a_src)) >= ((uint64_t)((v_src_bytes_per_pixel * 1u)))) {
-            iop_a_src += (v_src_bytes_per_pixel * 1u);
-          }
-          v_j -= 1u;
-        }
-      } else {
-        v_n = wuffs_base__pixel_swizzler__swizzle_interleaved_from_reader(
-            &self->private_impl.f_swizzler,
-            wuffs_base__slice_u8__subslice_i(v_dst, v_i),
-            v_dst_palette,
-            &iop_a_src,
-            io2_a_src);
-      }
-      if (v_n == 0u) {
-        status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
-        goto ok;
-      }
-      wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
-    }
-  }
-  label__outer__break:;
-  status = wuffs_base__make_status(NULL);
-  goto ok;
-
-  ok:
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bmp.decoder.swizzle_rle
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__swizzle_rle(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint32_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_bytes_per_row = 0;
-  wuffs_base__slice_u8 v_dst_palette = {0};
-  wuffs_base__table_u8 v_tab = {0};
-  wuffs_base__slice_u8 v_row = {0};
-  wuffs_base__slice_u8 v_dst = {0};
-  uint64_t v_i = 0;
-  uint64_t v_n = 0;
-  uint32_t v_p0 = 0;
-  uint8_t v_code = 0;
-  uint8_t v_indexes[2] = {0};
-  uint32_t v_rle_state = 0;
-  uint32_t v_chunk_bits = 0;
-  uint32_t v_chunk_count = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-  v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-  if ((v_dst_bits_per_pixel & 7u) != 0u) {
-    status = wuffs_base__make_status(wuffs_base__error__unsupported_option);
-    goto exit;
-  }
-  v_dst_bytes_per_pixel = (v_dst_bits_per_pixel / 8u);
-  v_dst_bytes_per_row = ((uint64_t)((self->private_impl.f_width * v_dst_bytes_per_pixel)));
-  v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8_ij(self->private_data.f_scratch, 1024, 2048));
-  v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-  v_rle_state = self->private_impl.f_rle_state;
-  label__outer__continue:;
-  while (true) {
-    v_row = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-    if (v_dst_bytes_per_row < ((uint64_t)(v_row.len))) {
-      v_row = wuffs_base__slice_u8__subslice_j(v_row, v_dst_bytes_per_row);
-    }
-    label__middle__continue:;
-    while (true) {
-      v_i = (((uint64_t)(self->private_impl.f_dst_x)) * ((uint64_t)(v_dst_bytes_per_pixel)));
-      if (v_i <= ((uint64_t)(v_row.len))) {
-        v_dst = wuffs_base__slice_u8__subslice_i(v_row, v_i);
-      } else {
-        v_dst = wuffs_base__utility__empty_slice_u8();
-      }
-      while (true) {
-        while (true) {
-          if (v_rle_state == 0u) {
-            if (((uint64_t)(io2_a_src - iop_a_src)) < 1u) {
-              goto label__goto_suspend__break;
-            }
-            v_code = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-            iop_a_src += 1u;
-            if (v_code == 0u) {
-              v_rle_state = 2u;
-              continue;
-            }
-            self->private_impl.f_rle_length = ((uint32_t)(v_code));
-            v_rle_state = 1u;
-            continue;
-          } else if (v_rle_state == 1u) {
-            if (((uint64_t)(io2_a_src - iop_a_src)) < 1u) {
-              goto label__goto_suspend__break;
-            }
-            v_code = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-            iop_a_src += 1u;
-            if (self->private_impl.f_bits_per_pixel == 8u) {
-              v_p0 = 0u;
-              while (v_p0 < self->private_impl.f_rle_length) {
-                self->private_data.f_scratch[v_p0] = v_code;
-                v_p0 += 1u;
-              }
-            } else {
-              v_indexes[0u] = ((uint8_t)((v_code >> 4u)));
-              v_indexes[1u] = (v_code & 15u);
-              v_p0 = 0u;
-              while (v_p0 < self->private_impl.f_rle_length) {
-                self->private_data.f_scratch[(v_p0 + 0u)] = v_indexes[0u];
-                self->private_data.f_scratch[(v_p0 + 1u)] = v_indexes[1u];
-                v_p0 += 2u;
-              }
-            }
-            wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, wuffs_base__make_slice_u8(self->private_data.f_scratch, self->private_impl.f_rle_length));
-            wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, self->private_impl.f_rle_length);
-            v_rle_state = 0u;
-            goto label__middle__continue;
-          } else if (v_rle_state == 2u) {
-            if (((uint64_t)(io2_a_src - iop_a_src)) < 1u) {
-              goto label__goto_suspend__break;
-            }
-            v_code = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-            iop_a_src += 1u;
-            if (v_code < 2u) {
-              if ((self->private_impl.f_dst_y >= self->private_impl.f_height) && (v_code == 0u)) {
-                status = wuffs_base__make_status(wuffs_bmp__error__bad_rle_compression);
-                goto exit;
-              }
-              wuffs_base__pixel_swizzler__swizzle_interleaved_transparent_black(&self->private_impl.f_swizzler, v_dst, v_dst_palette, 18446744073709551615u);
-              self->private_impl.f_dst_x = 0u;
-              self->private_impl.f_dst_y += self->private_impl.f_dst_y_inc;
-              if (v_code > 0u) {
-                goto label__outer__break;
-              }
-              v_rle_state = 0u;
-              goto label__outer__continue;
-            } else if (v_code == 2u) {
-              v_rle_state = 4u;
-              continue;
-            }
-            self->private_impl.f_rle_length = ((uint32_t)(v_code));
-            self->private_impl.f_rle_padded = ((self->private_impl.f_bits_per_pixel == 8u) && ((v_code & 1u) != 0u));
-            v_rle_state = 3u;
-            continue;
-          } else if (v_rle_state == 3u) {
-            if (self->private_impl.f_bits_per_pixel == 8u) {
-              v_n = wuffs_base__pixel_swizzler__limited_swizzle_u32_interleaved_from_reader(
-                  &self->private_impl.f_swizzler,
-                  self->private_impl.f_rle_length,
-                  v_dst,
-                  v_dst_palette,
-                  &iop_a_src,
-                  io2_a_src);
-              wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
-              wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_rle_length, ((uint32_t)(v_n)));
-            } else {
-              v_chunk_count = ((self->private_impl.f_rle_length + 3u) / 4u);
-              v_p0 = 0u;
-              while ((v_chunk_count > 0u) && (((uint64_t)(io2_a_src - iop_a_src)) >= 2u)) {
-                v_chunk_bits = ((uint32_t)(wuffs_base__peek_u16be__no_bounds_check(iop_a_src)));
-                iop_a_src += 2u;
-                self->private_data.f_scratch[(v_p0 + 0u)] = ((uint8_t)((15u & (v_chunk_bits >> 12u))));
-                self->private_data.f_scratch[(v_p0 + 1u)] = ((uint8_t)((15u & (v_chunk_bits >> 8u))));
-                self->private_data.f_scratch[(v_p0 + 2u)] = ((uint8_t)((15u & (v_chunk_bits >> 4u))));
-                self->private_data.f_scratch[(v_p0 + 3u)] = ((uint8_t)((15u & (v_chunk_bits >> 0u))));
-                v_p0 = ((v_p0 & 255u) + 4u);
-                v_chunk_count -= 1u;
-              }
-              v_p0 = wuffs_base__u32__min(v_p0, self->private_impl.f_rle_length);
-              wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, wuffs_base__make_slice_u8(self->private_data.f_scratch, v_p0));
-              wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, v_p0);
-              wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_rle_length, v_p0);
-            }
-            if (self->private_impl.f_rle_length > 0u) {
-              goto label__goto_suspend__break;
-            }
-            if (self->private_impl.f_rle_padded) {
-              if (((uint64_t)(io2_a_src - iop_a_src)) < 1u) {
-                goto label__goto_suspend__break;
-              }
-              iop_a_src += 1u;
-              self->private_impl.f_rle_padded = false;
-            }
-            v_rle_state = 0u;
-            goto label__middle__continue;
-          } else if (v_rle_state == 4u) {
-            if (((uint64_t)(io2_a_src - iop_a_src)) < 1u) {
-              goto label__goto_suspend__break;
-            }
-            self->private_impl.f_rle_delta_x = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-            iop_a_src += 1u;
-            v_rle_state = 5u;
-            continue;
-          }
-          if (((uint64_t)(io2_a_src - iop_a_src)) < 1u) {
-            goto label__goto_suspend__break;
-          }
-          v_code = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-          iop_a_src += 1u;
-          if (self->private_impl.f_rle_delta_x > 0u) {
-            wuffs_base__pixel_swizzler__swizzle_interleaved_transparent_black(&self->private_impl.f_swizzler, v_dst, v_dst_palette, ((uint64_t)(self->private_impl.f_rle_delta_x)));
-            wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(self->private_impl.f_rle_delta_x)));
-            self->private_impl.f_rle_delta_x = 0u;
-            if (self->private_impl.f_dst_x > self->private_impl.f_width) {
-              status = wuffs_base__make_status(wuffs_bmp__error__bad_rle_compression);
-              goto exit;
-            }
-          }
-          if (v_code > 0u) {
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-            v_code -= 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-            while (true) {
-              self->private_impl.f_dst_y += self->private_impl.f_dst_y_inc;
-              if (self->private_impl.f_dst_y >= self->private_impl.f_height) {
-                status = wuffs_base__make_status(wuffs_bmp__error__bad_rle_compression);
-                goto exit;
-              }
-              v_row = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-              if (v_dst_bytes_per_row < ((uint64_t)(v_row.len))) {
-                v_row = wuffs_base__slice_u8__subslice_j(v_row, v_dst_bytes_per_row);
-              }
-              if (v_code <= 0u) {
-                wuffs_base__pixel_swizzler__swizzle_interleaved_transparent_black(&self->private_impl.f_swizzler, v_row, v_dst_palette, ((uint64_t)(self->private_impl.f_dst_x)));
-                break;
-              }
-              wuffs_base__pixel_swizzler__swizzle_interleaved_transparent_black(&self->private_impl.f_swizzler, v_row, v_dst_palette, 18446744073709551615u);
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-              v_code -= 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-            }
-          }
-          v_rle_state = 0u;
-          goto label__middle__continue;
-        }
-      }
-      label__goto_suspend__break:;
-      self->private_impl.f_rle_state = v_rle_state;
-      status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
-      goto ok;
-    }
-  }
-  label__outer__break:;
-  while (self->private_impl.f_dst_y < self->private_impl.f_height) {
-    v_row = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-    if (v_dst_bytes_per_row < ((uint64_t)(v_row.len))) {
-      v_row = wuffs_base__slice_u8__subslice_j(v_row, v_dst_bytes_per_row);
-    }
-    wuffs_base__pixel_swizzler__swizzle_interleaved_transparent_black(&self->private_impl.f_swizzler, v_row, v_dst_palette, 18446744073709551615u);
-    self->private_impl.f_dst_y += self->private_impl.f_dst_y_inc;
-  }
-  status = wuffs_base__make_status(NULL);
-  goto ok;
-
-  ok:
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bmp.decoder.swizzle_bitfields
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__swizzle_bitfields(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint32_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_bytes_per_row = 0;
-  wuffs_base__slice_u8 v_dst_palette = {0};
-  wuffs_base__table_u8 v_tab = {0};
-  wuffs_base__slice_u8 v_dst = {0};
-  uint64_t v_i = 0;
-  uint64_t v_n = 0;
-  uint32_t v_p0 = 0;
-  uint32_t v_p1 = 0;
-  uint32_t v_p1_temp = 0;
-  uint32_t v_num_bits = 0;
-  uint32_t v_c = 0;
-  uint32_t v_c32 = 0;
-  uint32_t v_channel = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-  v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-  if ((v_dst_bits_per_pixel & 7u) != 0u) {
-    status = wuffs_base__make_status(wuffs_base__error__unsupported_option);
-    goto exit;
-  }
-  v_dst_bytes_per_pixel = (v_dst_bits_per_pixel / 8u);
-  v_dst_bytes_per_row = ((uint64_t)((self->private_impl.f_width * v_dst_bytes_per_pixel)));
-  v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8_ij(self->private_data.f_scratch, 1024, 2048));
-  v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-  label__outer__continue:;
-  while (true) {
-    while (self->private_impl.f_pending_pad > 0u) {
-      if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-        status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
-        goto ok;
-      }
-      self->private_impl.f_pending_pad -= 1u;
-      iop_a_src += 1u;
-    }
-    while (true) {
-      if (self->private_impl.f_dst_x == self->private_impl.f_width) {
-        self->private_impl.f_dst_x = 0u;
-        self->private_impl.f_dst_y += self->private_impl.f_dst_y_inc;
-        if (self->private_impl.f_dst_y >= self->private_impl.f_height) {
-          if (self->private_impl.f_height > 0u) {
-            self->private_impl.f_pending_pad = self->private_impl.f_pad_per_row;
-          }
-          goto label__outer__break;
-        } else if (self->private_impl.f_pad_per_row != 0u) {
-          self->private_impl.f_pending_pad = self->private_impl.f_pad_per_row;
-          goto label__outer__continue;
-        }
-      }
-      v_p1_temp = ((uint32_t)(self->private_impl.f_width - self->private_impl.f_dst_x));
-      v_p1 = wuffs_base__u32__min(v_p1_temp, 256u);
-      v_p0 = 0u;
-      while (v_p0 < v_p1) {
-        if (self->private_impl.f_bits_per_pixel == 16u) {
-          if (((uint64_t)(io2_a_src - iop_a_src)) < 2u) {
-            break;
-          }
-          v_c32 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-          iop_a_src += 2u;
-        } else {
-          if (((uint64_t)(io2_a_src - iop_a_src)) < 4u) {
-            break;
-          }
-          v_c32 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-          iop_a_src += 4u;
-        }
-        v_channel = 0u;
-        while (v_channel < 4u) {
-          if (self->private_impl.f_channel_num_bits[v_channel] == 0u) {
-            self->private_data.f_scratch[((8u * v_p0) + (2u * v_channel) + 0u)] = 255u;
-            self->private_data.f_scratch[((8u * v_p0) + (2u * v_channel) + 1u)] = 255u;
-          } else {
-            v_c = ((v_c32 & self->private_impl.f_channel_masks[v_channel]) >> self->private_impl.f_channel_shifts[v_channel]);
-            v_num_bits = ((uint32_t)(self->private_impl.f_channel_num_bits[v_channel]));
-            while (v_num_bits < 16u) {
-              v_c |= ((uint32_t)(v_c << v_num_bits));
-              v_num_bits *= 2u;
-            }
-            v_c >>= (v_num_bits - 16u);
-            self->private_data.f_scratch[((8u * v_p0) + (2u * v_channel) + 0u)] = ((uint8_t)((v_c >> 0u)));
-            self->private_data.f_scratch[((8u * v_p0) + (2u * v_channel) + 1u)] = ((uint8_t)((v_c >> 8u)));
-          }
-          v_channel += 1u;
-        }
-        v_p0 += 1u;
-      }
-      v_dst = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-      if (v_dst_bytes_per_row < ((uint64_t)(v_dst.len))) {
-        v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row);
-      }
-      v_i = (((uint64_t)(self->private_impl.f_dst_x)) * ((uint64_t)(v_dst_bytes_per_pixel)));
-      if (v_i >= ((uint64_t)(v_dst.len))) {
-        v_n = ((uint64_t)(v_p0));
-      } else {
-        v_n = wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, wuffs_base__slice_u8__subslice_i(v_dst, v_i), v_dst_palette, wuffs_base__make_slice_u8(self->private_data.f_scratch, (8u * v_p0)));
-      }
-      if (v_n == 0u) {
-        status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
-        goto ok;
-      }
-      wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
-    }
-  }
-  label__outer__break:;
-  status = wuffs_base__make_status(NULL);
-  goto ok;
-
-  ok:
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bmp.decoder.swizzle_low_bit_depth
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__swizzle_low_bit_depth(
-    wuffs_bmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint32_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_bytes_per_row = 0;
-  wuffs_base__slice_u8 v_dst_palette = {0};
-  wuffs_base__table_u8 v_tab = {0};
-  wuffs_base__slice_u8 v_dst = {0};
-  uint64_t v_i = 0;
-  uint64_t v_n = 0;
-  uint32_t v_p0 = 0;
-  uint32_t v_chunk_bits = 0;
-  uint32_t v_chunk_count = 0;
-  uint32_t v_pixels_per_chunk = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-  v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-  if ((v_dst_bits_per_pixel & 7u) != 0u) {
-    status = wuffs_base__make_status(wuffs_base__error__unsupported_option);
-    goto exit;
-  }
-  v_dst_bytes_per_pixel = (v_dst_bits_per_pixel / 8u);
-  v_dst_bytes_per_row = ((uint64_t)((self->private_impl.f_width * v_dst_bytes_per_pixel)));
-  v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8_ij(self->private_data.f_scratch, 1024, 2048));
-  v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-  while (true) {
-    if (self->private_impl.f_dst_x == self->private_impl.f_width) {
-      self->private_impl.f_dst_x = 0u;
-      self->private_impl.f_dst_y += self->private_impl.f_dst_y_inc;
-      if (self->private_impl.f_dst_y >= self->private_impl.f_height) {
-        break;
-      }
-    }
-    v_dst = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-    if (v_dst_bytes_per_row < ((uint64_t)(v_dst.len))) {
-      v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row);
-    }
-    v_i = (((uint64_t)(self->private_impl.f_dst_x)) * ((uint64_t)(v_dst_bytes_per_pixel)));
-    if (v_i >= ((uint64_t)(v_dst.len))) {
-      if (self->private_impl.f_bits_per_pixel == 1u) {
-        v_chunk_count = ((wuffs_base__u32__sat_sub(self->private_impl.f_width, self->private_impl.f_dst_x) + 31u) / 32u);
-        v_pixels_per_chunk = 32u;
-      } else if (self->private_impl.f_bits_per_pixel == 2u) {
-        v_chunk_count = ((wuffs_base__u32__sat_sub(self->private_impl.f_width, self->private_impl.f_dst_x) + 15u) / 16u);
-        v_pixels_per_chunk = 16u;
-      } else {
-        v_chunk_count = ((wuffs_base__u32__sat_sub(self->private_impl.f_width, self->private_impl.f_dst_x) + 7u) / 8u);
-        v_pixels_per_chunk = 8u;
-      }
-      while ((v_chunk_count >= 64u) && (((uint64_t)(io2_a_src - iop_a_src)) >= 256u)) {
-        iop_a_src += 256u;
-        self->private_impl.f_dst_x = wuffs_base__u32__min(self->private_impl.f_width, ((uint32_t)(self->private_impl.f_dst_x + (v_pixels_per_chunk * 64u))));
-        v_chunk_count -= 64u;
-      }
-      while ((v_chunk_count >= 8u) && (((uint64_t)(io2_a_src - iop_a_src)) >= 32u)) {
-        iop_a_src += 32u;
-        self->private_impl.f_dst_x = wuffs_base__u32__min(self->private_impl.f_width, ((uint32_t)(self->private_impl.f_dst_x + (v_pixels_per_chunk * 8u))));
-        v_chunk_count -= 8u;
-      }
-      while (v_chunk_count > 0u) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) < 4u) {
-          status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
-          goto ok;
-        }
-        iop_a_src += 4u;
-        self->private_impl.f_dst_x = wuffs_base__u32__min(self->private_impl.f_width, ((uint32_t)(self->private_impl.f_dst_x + (v_pixels_per_chunk * 1u))));
-        v_chunk_count -= 1u;
-      }
-      continue;
-    }
-    v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_i);
-    v_p0 = 0u;
-    if (self->private_impl.f_bits_per_pixel == 1u) {
-      v_chunk_count = ((wuffs_base__u32__sat_sub(self->private_impl.f_width, self->private_impl.f_dst_x) + 31u) / 32u);
-      v_chunk_count = wuffs_base__u32__min(v_chunk_count, 16u);
-      while ((v_chunk_count > 0u) && (((uint64_t)(io2_a_src - iop_a_src)) >= 4u)) {
-        v_chunk_bits = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4u;
-        self->private_data.f_scratch[(v_p0 + 0u)] = ((uint8_t)((1u & (v_chunk_bits >> 31u))));
-        self->private_data.f_scratch[(v_p0 + 1u)] = ((uint8_t)((1u & (v_chunk_bits >> 30u))));
-        self->private_data.f_scratch[(v_p0 + 2u)] = ((uint8_t)((1u & (v_chunk_bits >> 29u))));
-        self->private_data.f_scratch[(v_p0 + 3u)] = ((uint8_t)((1u & (v_chunk_bits >> 28u))));
-        self->private_data.f_scratch[(v_p0 + 4u)] = ((uint8_t)((1u & (v_chunk_bits >> 27u))));
-        self->private_data.f_scratch[(v_p0 + 5u)] = ((uint8_t)((1u & (v_chunk_bits >> 26u))));
-        self->private_data.f_scratch[(v_p0 + 6u)] = ((uint8_t)((1u & (v_chunk_bits >> 25u))));
-        self->private_data.f_scratch[(v_p0 + 7u)] = ((uint8_t)((1u & (v_chunk_bits >> 24u))));
-        self->private_data.f_scratch[(v_p0 + 8u)] = ((uint8_t)((1u & (v_chunk_bits >> 23u))));
-        self->private_data.f_scratch[(v_p0 + 9u)] = ((uint8_t)((1u & (v_chunk_bits >> 22u))));
-        self->private_data.f_scratch[(v_p0 + 10u)] = ((uint8_t)((1u & (v_chunk_bits >> 21u))));
-        self->private_data.f_scratch[(v_p0 + 11u)] = ((uint8_t)((1u & (v_chunk_bits >> 20u))));
-        self->private_data.f_scratch[(v_p0 + 12u)] = ((uint8_t)((1u & (v_chunk_bits >> 19u))));
-        self->private_data.f_scratch[(v_p0 + 13u)] = ((uint8_t)((1u & (v_chunk_bits >> 18u))));
-        self->private_data.f_scratch[(v_p0 + 14u)] = ((uint8_t)((1u & (v_chunk_bits >> 17u))));
-        self->private_data.f_scratch[(v_p0 + 15u)] = ((uint8_t)((1u & (v_chunk_bits >> 16u))));
-        self->private_data.f_scratch[(v_p0 + 16u)] = ((uint8_t)((1u & (v_chunk_bits >> 15u))));
-        self->private_data.f_scratch[(v_p0 + 17u)] = ((uint8_t)((1u & (v_chunk_bits >> 14u))));
-        self->private_data.f_scratch[(v_p0 + 18u)] = ((uint8_t)((1u & (v_chunk_bits >> 13u))));
-        self->private_data.f_scratch[(v_p0 + 19u)] = ((uint8_t)((1u & (v_chunk_bits >> 12u))));
-        self->private_data.f_scratch[(v_p0 + 20u)] = ((uint8_t)((1u & (v_chunk_bits >> 11u))));
-        self->private_data.f_scratch[(v_p0 + 21u)] = ((uint8_t)((1u & (v_chunk_bits >> 10u))));
-        self->private_data.f_scratch[(v_p0 + 22u)] = ((uint8_t)((1u & (v_chunk_bits >> 9u))));
-        self->private_data.f_scratch[(v_p0 + 23u)] = ((uint8_t)((1u & (v_chunk_bits >> 8u))));
-        self->private_data.f_scratch[(v_p0 + 24u)] = ((uint8_t)((1u & (v_chunk_bits >> 7u))));
-        self->private_data.f_scratch[(v_p0 + 25u)] = ((uint8_t)((1u & (v_chunk_bits >> 6u))));
-        self->private_data.f_scratch[(v_p0 + 26u)] = ((uint8_t)((1u & (v_chunk_bits >> 5u))));
-        self->private_data.f_scratch[(v_p0 + 27u)] = ((uint8_t)((1u & (v_chunk_bits >> 4u))));
-        self->private_data.f_scratch[(v_p0 + 28u)] = ((uint8_t)((1u & (v_chunk_bits >> 3u))));
-        self->private_data.f_scratch[(v_p0 + 29u)] = ((uint8_t)((1u & (v_chunk_bits >> 2u))));
-        self->private_data.f_scratch[(v_p0 + 30u)] = ((uint8_t)((1u & (v_chunk_bits >> 1u))));
-        self->private_data.f_scratch[(v_p0 + 31u)] = ((uint8_t)((1u & (v_chunk_bits >> 0u))));
-        v_p0 = ((v_p0 & 511u) + 32u);
-        v_chunk_count -= 1u;
-      }
-    } else if (self->private_impl.f_bits_per_pixel == 2u) {
-      v_chunk_count = ((wuffs_base__u32__sat_sub(self->private_impl.f_width, self->private_impl.f_dst_x) + 15u) / 16u);
-      v_chunk_count = wuffs_base__u32__min(v_chunk_count, 32u);
-      while ((v_chunk_count > 0u) && (((uint64_t)(io2_a_src - iop_a_src)) >= 4u)) {
-        v_chunk_bits = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4u;
-        self->private_data.f_scratch[(v_p0 + 0u)] = ((uint8_t)((3u & (v_chunk_bits >> 30u))));
-        self->private_data.f_scratch[(v_p0 + 1u)] = ((uint8_t)((3u & (v_chunk_bits >> 28u))));
-        self->private_data.f_scratch[(v_p0 + 2u)] = ((uint8_t)((3u & (v_chunk_bits >> 26u))));
-        self->private_data.f_scratch[(v_p0 + 3u)] = ((uint8_t)((3u & (v_chunk_bits >> 24u))));
-        self->private_data.f_scratch[(v_p0 + 4u)] = ((uint8_t)((3u & (v_chunk_bits >> 22u))));
-        self->private_data.f_scratch[(v_p0 + 5u)] = ((uint8_t)((3u & (v_chunk_bits >> 20u))));
-        self->private_data.f_scratch[(v_p0 + 6u)] = ((uint8_t)((3u & (v_chunk_bits >> 18u))));
-        self->private_data.f_scratch[(v_p0 + 7u)] = ((uint8_t)((3u & (v_chunk_bits >> 16u))));
-        self->private_data.f_scratch[(v_p0 + 8u)] = ((uint8_t)((3u & (v_chunk_bits >> 14u))));
-        self->private_data.f_scratch[(v_p0 + 9u)] = ((uint8_t)((3u & (v_chunk_bits >> 12u))));
-        self->private_data.f_scratch[(v_p0 + 10u)] = ((uint8_t)((3u & (v_chunk_bits >> 10u))));
-        self->private_data.f_scratch[(v_p0 + 11u)] = ((uint8_t)((3u & (v_chunk_bits >> 8u))));
-        self->private_data.f_scratch[(v_p0 + 12u)] = ((uint8_t)((3u & (v_chunk_bits >> 6u))));
-        self->private_data.f_scratch[(v_p0 + 13u)] = ((uint8_t)((3u & (v_chunk_bits >> 4u))));
-        self->private_data.f_scratch[(v_p0 + 14u)] = ((uint8_t)((3u & (v_chunk_bits >> 2u))));
-        self->private_data.f_scratch[(v_p0 + 15u)] = ((uint8_t)((3u & (v_chunk_bits >> 0u))));
-        v_p0 = ((v_p0 & 511u) + 16u);
-        v_chunk_count -= 1u;
-      }
-    } else {
-      v_chunk_count = ((wuffs_base__u32__sat_sub(self->private_impl.f_width, self->private_impl.f_dst_x) + 7u) / 8u);
-      v_chunk_count = wuffs_base__u32__min(v_chunk_count, 64u);
-      while ((v_chunk_count > 0u) && (((uint64_t)(io2_a_src - iop_a_src)) >= 4u)) {
-        v_chunk_bits = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4u;
-        self->private_data.f_scratch[(v_p0 + 0u)] = ((uint8_t)((15u & (v_chunk_bits >> 28u))));
-        self->private_data.f_scratch[(v_p0 + 1u)] = ((uint8_t)((15u & (v_chunk_bits >> 24u))));
-        self->private_data.f_scratch[(v_p0 + 2u)] = ((uint8_t)((15u & (v_chunk_bits >> 20u))));
-        self->private_data.f_scratch[(v_p0 + 3u)] = ((uint8_t)((15u & (v_chunk_bits >> 16u))));
-        self->private_data.f_scratch[(v_p0 + 4u)] = ((uint8_t)((15u & (v_chunk_bits >> 12u))));
-        self->private_data.f_scratch[(v_p0 + 5u)] = ((uint8_t)((15u & (v_chunk_bits >> 8u))));
-        self->private_data.f_scratch[(v_p0 + 6u)] = ((uint8_t)((15u & (v_chunk_bits >> 4u))));
-        self->private_data.f_scratch[(v_p0 + 7u)] = ((uint8_t)((15u & (v_chunk_bits >> 0u))));
-        v_p0 = ((v_p0 & 511u) + 8u);
-        v_chunk_count -= 1u;
-      }
-    }
-    v_p0 = wuffs_base__u32__min(v_p0, wuffs_base__u32__sat_sub(self->private_impl.f_width, self->private_impl.f_dst_x));
-    v_n = wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, wuffs_base__make_slice_u8(self->private_data.f_scratch, v_p0));
-    if (v_n == 0u) {
-      status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
-      goto ok;
-    }
-    wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
-  }
-  status = wuffs_base__make_status(NULL);
-  goto ok;
-
-  ok:
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bmp.decoder.frame_dirty_rect
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_bmp__decoder__frame_dirty_rect(
-    const wuffs_bmp__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-
-  return wuffs_base__utility__make_rect_ie_u32(
-      0u,
-      0u,
-      self->private_impl.f_width,
-      self->private_impl.f_height);
-}
-
-// -------- func bmp.decoder.num_animation_loops
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_bmp__decoder__num_animation_loops(
-    const wuffs_bmp__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func bmp.decoder.num_decoded_frame_configs
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bmp__decoder__num_decoded_frame_configs(
-    const wuffs_bmp__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 32u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func bmp.decoder.num_decoded_frames
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bmp__decoder__num_decoded_frames(
-    const wuffs_bmp__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 64u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func bmp.decoder.restart_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__restart_frame(
-    wuffs_bmp__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (self->private_impl.f_call_sequence < 32u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-  }
-  if (a_index != 0u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  self->private_impl.f_call_sequence = 40u;
-  self->private_impl.f_frame_config_io_position = a_io_position;
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func bmp.decoder.set_report_metadata
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_bmp__decoder__set_report_metadata(
-    wuffs_bmp__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report) {
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func bmp.decoder.tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bmp__decoder__tell_me_more(
-    wuffs_bmp__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 4)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_tell_me_more[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_bmp__decoder__do_tell_me_more(self, a_dst, a_minfo, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_bmp__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_tell_me_more[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_tell_me_more[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 4 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func bmp.decoder.do_tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__do_tell_me_more(
-    wuffs_bmp__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  if (self->private_impl.f_io_redirect_fourcc <= 1u) {
-    status = wuffs_base__make_status(wuffs_base__error__no_more_information);
-    goto exit;
-  }
-  if (a_minfo != NULL) {
-    wuffs_base__more_information__set(a_minfo,
-        1u,
-        self->private_impl.f_io_redirect_fourcc,
-        0u,
-        self->private_impl.f_io_redirect_pos,
-        18446744073709551615u);
-  }
-  self->private_impl.f_io_redirect_fourcc = 1u;
-
-  goto ok;
-  ok:
-  goto exit;
-  exit:
-  return status;
-}
-
-// -------- func bmp.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_bmp__decoder__workbuf_len(
-    const wuffs_bmp__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(0u, 0u);
-}
-
-// -------- func bmp.decoder.read_palette
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__read_palette(
-    wuffs_bmp__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_i = 0;
-  uint32_t v_argb = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_read_palette[0];
-  if (coro_susp_point) {
-    v_i = self->private_data.s_read_palette[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_bitmap_info_len == 12u) {
-      while ((v_i < 256u) && (self->private_impl.f_padding >= 3u)) {
-        self->private_impl.f_padding -= 3u;
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-          uint32_t t_0;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 3)) {
-            t_0 = ((uint32_t)(wuffs_base__peek_u24le__no_bounds_check(iop_a_src)));
-            iop_a_src += 3;
-          } else {
-            self->private_data.s_read_palette[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_read_palette[0].scratch;
-              uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
-              *scratch <<= 8;
-              *scratch >>= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0;
-              if (num_bits_0 == 16) {
-                t_0 = ((uint32_t)(*scratch));
-                break;
-              }
-              num_bits_0 += 8u;
-              *scratch |= ((uint64_t)(num_bits_0)) << 56;
-            }
-          }
-          v_argb = t_0;
-        }
-        v_argb |= 4278190080u;
-        self->private_data.f_src_palette[((4u * v_i) + 0u)] = ((uint8_t)((v_argb >> 0u)));
-        self->private_data.f_src_palette[((4u * v_i) + 1u)] = ((uint8_t)((v_argb >> 8u)));
-        self->private_data.f_src_palette[((4u * v_i) + 2u)] = ((uint8_t)((v_argb >> 16u)));
-        self->private_data.f_src_palette[((4u * v_i) + 3u)] = ((uint8_t)((v_argb >> 24u)));
-        v_i += 1u;
-      }
-    } else {
-      while ((v_i < 256u) && (self->private_impl.f_padding >= 4u)) {
-        self->private_impl.f_padding -= 4u;
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          uint32_t t_1;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_1 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_read_palette[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_read_palette[0].scratch;
-              uint32_t num_bits_1 = ((uint32_t)(*scratch >> 56));
-              *scratch <<= 8;
-              *scratch >>= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1;
-              if (num_bits_1 == 24) {
-                t_1 = ((uint32_t)(*scratch));
-                break;
-              }
-              num_bits_1 += 8u;
-              *scratch |= ((uint64_t)(num_bits_1)) << 56;
-            }
-          }
-          v_argb = t_1;
-        }
-        v_argb |= 4278190080u;
-        self->private_data.f_src_palette[((4u * v_i) + 0u)] = ((uint8_t)((v_argb >> 0u)));
-        self->private_data.f_src_palette[((4u * v_i) + 1u)] = ((uint8_t)((v_argb >> 8u)));
-        self->private_data.f_src_palette[((4u * v_i) + 2u)] = ((uint8_t)((v_argb >> 16u)));
-        self->private_data.f_src_palette[((4u * v_i) + 3u)] = ((uint8_t)((v_argb >> 24u)));
-        v_i += 1u;
-      }
-    }
-    while (v_i < 256u) {
-      self->private_data.f_src_palette[((4u * v_i) + 0u)] = 0u;
-      self->private_data.f_src_palette[((4u * v_i) + 1u)] = 0u;
-      self->private_data.f_src_palette[((4u * v_i) + 2u)] = 0u;
-      self->private_data.f_src_palette[((4u * v_i) + 3u)] = 255u;
-      v_i += 1u;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_read_palette[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_read_palette[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_read_palette[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bmp.decoder.process_masks
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bmp__decoder__process_masks(
-    wuffs_bmp__decoder* self) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_i = 0;
-  uint32_t v_mask = 0;
-  uint32_t v_n = 0;
-
-  while (v_i < 4u) {
-    v_mask = self->private_impl.f_channel_masks[v_i];
-    if (v_mask != 0u) {
-      v_n = 0u;
-      while ((v_mask & 1u) == 0u) {
-        v_n += 1u;
-        v_mask >>= 1u;
-      }
-      self->private_impl.f_channel_shifts[v_i] = ((uint8_t)((v_n & 31u)));
-      v_n = 0u;
-      while ((v_mask & 1u) == 1u) {
-        v_n += 1u;
-        v_mask >>= 1u;
-      }
-      if ((v_mask != 0u) || (v_n > 32u)) {
-        status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-        goto exit;
-      }
-      self->private_impl.f_channel_num_bits[v_i] = ((uint8_t)(v_n));
-    } else if (v_i != 3u) {
-      status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
-      goto exit;
-    }
-    v_i += 1u;
-  }
-
-  goto ok;
-  ok:
-  goto exit;
-  exit:
-  return status;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BMP)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BZIP2)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_bzip2__error__bad_huffman_code_over_subscribed[] = "#bzip2: bad Huffman code (over-subscribed)";
-const char wuffs_bzip2__error__bad_huffman_code_under_subscribed[] = "#bzip2: bad Huffman code (under-subscribed)";
-const char wuffs_bzip2__error__bad_block_header[] = "#bzip2: bad block header";
-const char wuffs_bzip2__error__bad_block_length[] = "#bzip2: bad block length";
-const char wuffs_bzip2__error__bad_checksum[] = "#bzip2: bad checksum";
-const char wuffs_bzip2__error__bad_header[] = "#bzip2: bad header";
-const char wuffs_bzip2__error__bad_number_of_sections[] = "#bzip2: bad number of sections";
-const char wuffs_bzip2__error__truncated_input[] = "#bzip2: truncated input";
-const char wuffs_bzip2__error__unsupported_block_randomization[] = "#bzip2: unsupported block randomization";
-const char wuffs_bzip2__error__internal_error_inconsistent_huffman_decoder_state[] = "#bzip2: internal error: inconsistent Huffman decoder state";
-
-// ---------------- Private Consts
-
-static const uint8_t
-WUFFS_BZIP2__CLAMP_TO_5[8] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 1, 2, 3, 4, 5, 5, 5,
-};
-
-static const uint32_t
-WUFFS_BZIP2__REV_CRC32_TABLE[256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 79764919, 159529838, 222504665, 319059676, 398814059, 445009330, 507990021,
-  638119352, 583659535, 797628118, 726387553, 890018660, 835552979, 1015980042, 944750013,
-  1276238704, 1221641927, 1167319070, 1095957929, 1595256236, 1540665371, 1452775106, 1381403509,
-  1780037320, 1859660671, 1671105958, 1733955601, 2031960084, 2111593891, 1889500026, 1952343757,
-  2552477408, 2632100695, 2443283854, 2506133561, 2334638140, 2414271883, 2191915858, 2254759653,
-  3190512472, 3135915759, 3081330742, 3009969537, 2905550212, 2850959411, 2762807018, 2691435357,
-  3560074640, 3505614887, 3719321342, 3648080713, 3342211916, 3287746299, 3467911202, 3396681109,
-  4063920168, 4143685023, 4223187782, 4286162673, 3779000052, 3858754371, 3904687514, 3967668269,
-  881225847, 809987520, 1023691545, 969234094, 662832811, 591600412, 771767749, 717299826,
-  311336399, 374308984, 453813921, 533576470, 25881363, 88864420, 134795389, 214552010,
-  2023205639, 2086057648, 1897238633, 1976864222, 1804852699, 1867694188, 1645340341, 1724971778,
-  1587496639, 1516133128, 1461550545, 1406951526, 1302016099, 1230646740, 1142491917, 1087903418,
-  2896545431, 2825181984, 2770861561, 2716262478, 3215044683, 3143675388, 3055782693, 3001194130,
-  2326604591, 2389456536, 2200899649, 2280525302, 2578013683, 2640855108, 2418763421, 2498394922,
-  3769900519, 3832873040, 3912640137, 3992402750, 4088425275, 4151408268, 4197601365, 4277358050,
-  3334271071, 3263032808, 3476998961, 3422541446, 3585640067, 3514407732, 3694837229, 3640369242,
-  1762451694, 1842216281, 1619975040, 1682949687, 2047383090, 2127137669, 1938468188, 2001449195,
-  1325665622, 1271206113, 1183200824, 1111960463, 1543535498, 1489069629, 1434599652, 1363369299,
-  622672798, 568075817, 748617968, 677256519, 907627842, 853037301, 1067152940, 995781531,
-  51762726, 131386257, 177728840, 240578815, 269590778, 349224269, 429104020, 491947555,
-  4046411278, 4126034873, 4172115296, 4234965207, 3794477266, 3874110821, 3953728444, 4016571915,
-  3609705398, 3555108353, 3735388376, 3664026991, 3290680682, 3236090077, 3449943556, 3378572211,
-  3174993278, 3120533705, 3032266256, 2961025959, 2923101090, 2868635157, 2813903052, 2742672763,
-  2604032198, 2683796849, 2461293480, 2524268063, 2284983834, 2364738477, 2175806836, 2238787779,
-  1569362073, 1498123566, 1409854455, 1355396672, 1317987909, 1246755826, 1192025387, 1137557660,
-  2072149281, 2135122070, 1912620623, 1992383480, 1753615357, 1816598090, 1627664531, 1707420964,
-  295390185, 358241886, 404320391, 483945776, 43990325, 106832002, 186451547, 266083308,
-  932423249, 861060070, 1041341759, 986742920, 613929101, 542559546, 756411363, 701822548,
-  3316196985, 3244833742, 3425377559, 3370778784, 3601682597, 3530312978, 3744426955, 3689838204,
-  3819031489, 3881883254, 3928223919, 4007849240, 4037393693, 4100235434, 4180117107, 4259748804,
-  2310601993, 2373574846, 2151335527, 2231098320, 2596047829, 2659030626, 2470359227, 2550115596,
-  2947551409, 2876312838, 2788305887, 2733848168, 3165939309, 3094707162, 3040238851, 2985771188,
-};
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__do_transform_io(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__prepare_block(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__read_code_lengths(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__build_huffman_tree(
-    wuffs_bzip2__decoder* self,
-    uint32_t a_which);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_bzip2__decoder__build_huffman_table(
-    wuffs_bzip2__decoder* self,
-    uint32_t a_which);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_bzip2__decoder__invert_bwt(
-    wuffs_bzip2__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_bzip2__decoder__flush_fast(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_dst);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__flush_slow(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_dst);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__decode_huffman_fast(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__decode_huffman_slow(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-// ---------------- VTables
-
-const wuffs_base__io_transformer__func_ptrs
-wuffs_bzip2__decoder__func_ptrs_for__wuffs_base__io_transformer = {
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_bzip2__decoder__get_quirk),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_bzip2__decoder__set_quirk),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__slice_u8))(&wuffs_bzip2__decoder__transform_io),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_bzip2__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_bzip2__decoder__initialize(
-    wuffs_bzip2__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.vtable_name =
-      wuffs_base__io_transformer__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.function_pointers =
-      (const void*)(&wuffs_bzip2__decoder__func_ptrs_for__wuffs_base__io_transformer);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_bzip2__decoder*
-wuffs_bzip2__decoder__alloc() {
-  wuffs_bzip2__decoder* x =
-      (wuffs_bzip2__decoder*)(calloc(sizeof(wuffs_bzip2__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_bzip2__decoder__initialize(
-      x, sizeof(wuffs_bzip2__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_bzip2__decoder() {
-  return sizeof(wuffs_bzip2__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func bzip2.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bzip2__decoder__get_quirk(
-    const wuffs_bzip2__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func bzip2.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bzip2__decoder__set_quirk(
-    wuffs_bzip2__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (a_key == 1u) {
-    self->private_impl.f_ignore_checksum = (a_value > 0u);
-    return wuffs_base__make_status(NULL);
-  }
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func bzip2.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_bzip2__decoder__workbuf_len(
-    const wuffs_bzip2__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(0u, 0u);
-}
-
-// -------- func bzip2.decoder.transform_io
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_bzip2__decoder__transform_io(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_transform_io[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_bzip2__decoder__do_transform_io(self, a_dst, a_src, a_workbuf);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_bzip2__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_transform_io[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func bzip2.decoder.do_transform_io
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__do_transform_io(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint32_t v_i = 0;
-  uint64_t v_tag = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-  uint32_t v_final_checksum_want = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_transform_io[0];
-  if (coro_susp_point) {
-    v_i = self->private_data.s_do_transform_io[0].v_i;
-    v_tag = self->private_data.s_do_transform_io[0].v_tag;
-    v_final_checksum_want = self->private_data.s_do_transform_io[0].v_final_checksum_want;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_c = t_0;
-    }
-    if (v_c != 66u) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_1 = *iop_a_src++;
-      v_c = t_1;
-    }
-    if (v_c != 90u) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_2 = *iop_a_src++;
-      v_c = t_2;
-    }
-    if (v_c != 104u) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_3 = *iop_a_src++;
-      v_c = t_3;
-    }
-    if ((v_c < 49u) || (57u < v_c)) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_header);
-      goto exit;
-    }
-    self->private_impl.f_max_incl_block_size = (((uint32_t)((v_c - 48u))) * 100000u);
-    while (true) {
-      v_tag = 0u;
-      v_i = 0u;
-      while (v_i < 48u) {
-        if (self->private_impl.f_n_bits <= 0u) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_4 = *iop_a_src++;
-            v_c = t_4;
-          }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-          self->private_impl.f_n_bits = 8u;
-        }
-        v_tag <<= 1u;
-        v_tag |= ((uint64_t)((self->private_impl.f_bits >> 31u)));
-        self->private_impl.f_bits <<= 1u;
-        self->private_impl.f_n_bits -= 1u;
-        v_i += 1u;
-      }
-      if (v_tag == 25779555029136u) {
-        break;
-      } else if (v_tag != 54156738319193u) {
-        status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_header);
-        goto exit;
-      }
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-      status = wuffs_bzip2__decoder__prepare_block(self, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-      self->private_impl.f_block_size = 0u;
-      self->private_impl.f_decode_huffman_finished = false;
-      self->private_impl.f_decode_huffman_which = WUFFS_BZIP2__CLAMP_TO_5[(self->private_data.f_huffman_selectors[0u] & 7u)];
-      self->private_impl.f_decode_huffman_ticks = 50u;
-      self->private_impl.f_decode_huffman_section = 0u;
-      self->private_impl.f_decode_huffman_run_shift = 0u;
-      while ( ! self->private_impl.f_decode_huffman_finished) {
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        v_status = wuffs_bzip2__decoder__decode_huffman_fast(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (wuffs_base__status__is_error(&v_status)) {
-          status = v_status;
-          goto exit;
-        } else if (self->private_impl.f_decode_huffman_finished) {
-          break;
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-        status = wuffs_bzip2__decoder__decode_huffman_slow(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-      }
-      wuffs_bzip2__decoder__invert_bwt(self);
-      self->private_impl.f_block_checksum_have = 4294967295u;
-      if (self->private_impl.f_original_pointer >= self->private_impl.f_block_size) {
-        status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_length);
-        goto exit;
-      }
-      self->private_impl.f_flush_pointer = (self->private_data.f_bwt[self->private_impl.f_original_pointer] >> 12u);
-      self->private_impl.f_flush_repeat_count = 0u;
-      self->private_impl.f_flush_prev = 0u;
-      while (self->private_impl.f_block_size > 0u) {
-        wuffs_bzip2__decoder__flush_fast(self, a_dst);
-        if (self->private_impl.f_block_size <= 0u) {
-          break;
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-        status = wuffs_bzip2__decoder__flush_slow(self, a_dst);
-        if (status.repr) {
-          goto suspend;
-        }
-      }
-      self->private_impl.f_block_checksum_have ^= 4294967295u;
-      if ( ! self->private_impl.f_ignore_checksum && (self->private_impl.f_block_checksum_have != self->private_impl.f_block_checksum_want)) {
-        status = wuffs_base__make_status(wuffs_bzip2__error__bad_checksum);
-        goto exit;
-      }
-      self->private_impl.f_final_checksum_have = (self->private_impl.f_block_checksum_have ^ ((self->private_impl.f_final_checksum_have >> 31u) | ((uint32_t)(self->private_impl.f_final_checksum_have << 1u))));
-    }
-    v_final_checksum_want = 0u;
-    v_i = 0u;
-    while (v_i < 32u) {
-      if (self->private_impl.f_n_bits <= 0u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_5 = *iop_a_src++;
-          v_c = t_5;
-        }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-        self->private_impl.f_n_bits = 8u;
-      }
-      v_final_checksum_want <<= 1u;
-      v_final_checksum_want |= (self->private_impl.f_bits >> 31u);
-      self->private_impl.f_bits <<= 1u;
-      self->private_impl.f_n_bits -= 1u;
-      v_i += 1u;
-    }
-    if ( ! self->private_impl.f_ignore_checksum && (self->private_impl.f_final_checksum_have != v_final_checksum_want)) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_checksum);
-      goto exit;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_do_transform_io[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_transform_io[0].v_i = v_i;
-  self->private_data.s_do_transform_io[0].v_tag = v_tag;
-  self->private_data.s_do_transform_io[0].v_final_checksum_want = v_final_checksum_want;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bzip2.decoder.prepare_block
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__prepare_block(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint32_t v_i = 0;
-  uint32_t v_j = 0;
-  uint32_t v_selector = 0;
-  uint32_t v_sel_ff = 0;
-  uint8_t v_movee = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_prepare_block[0];
-  if (coro_susp_point) {
-    v_i = self->private_data.s_prepare_block[0].v_i;
-    v_selector = self->private_data.s_prepare_block[0].v_selector;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    self->private_impl.f_block_checksum_want = 0u;
-    v_i = 0u;
-    while (v_i < 32u) {
-      if (self->private_impl.f_n_bits <= 0u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_0 = *iop_a_src++;
-          v_c = t_0;
-        }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-        self->private_impl.f_n_bits = 8u;
-      }
-      self->private_impl.f_block_checksum_want <<= 1u;
-      self->private_impl.f_block_checksum_want |= (self->private_impl.f_bits >> 31u);
-      self->private_impl.f_bits <<= 1u;
-      self->private_impl.f_n_bits -= 1u;
-      v_i += 1u;
-    }
-    if (self->private_impl.f_n_bits <= 0u) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_1 = *iop_a_src++;
-        v_c = t_1;
-      }
-      self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-      self->private_impl.f_n_bits = 8u;
-    }
-    if ((self->private_impl.f_bits >> 31u) != 0u) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__unsupported_block_randomization);
-      goto exit;
-    }
-    self->private_impl.f_bits <<= 1u;
-    self->private_impl.f_n_bits -= 1u;
-    self->private_impl.f_original_pointer = 0u;
-    v_i = 0u;
-    while (v_i < 24u) {
-      if (self->private_impl.f_n_bits <= 0u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_2 = *iop_a_src++;
-          v_c = t_2;
-        }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-        self->private_impl.f_n_bits = 8u;
-      }
-      self->private_impl.f_original_pointer <<= 1u;
-      self->private_impl.f_original_pointer |= (self->private_impl.f_bits >> 31u);
-      self->private_impl.f_bits <<= 1u;
-      self->private_impl.f_n_bits -= 1u;
-      v_i += 1u;
-    }
-    v_i = 0u;
-    while (v_i < 256u) {
-      self->private_data.f_presence[v_i] = 0u;
-      v_i += 1u;
-    }
-    v_i = 0u;
-    while (v_i < 256u) {
-      if (self->private_impl.f_n_bits <= 0u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_3 = *iop_a_src++;
-          v_c = t_3;
-        }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-        self->private_impl.f_n_bits = 8u;
-      }
-      if ((self->private_impl.f_bits >> 31u) != 0u) {
-        self->private_data.f_presence[v_i] = 1u;
-      }
-      self->private_impl.f_bits <<= 1u;
-      self->private_impl.f_n_bits -= 1u;
-      v_i += 16u;
-    }
-    self->private_data.f_scratch = 0u;
-    v_i = 0u;
-    while (v_i < 256u) {
-      if (self->private_data.f_presence[v_i] == 0u) {
-        v_i += 16u;
-        continue;
-      }
-      while (true) {
-        if (self->private_impl.f_n_bits <= 0u) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_4 = *iop_a_src++;
-            v_c = t_4;
-          }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-          self->private_impl.f_n_bits = 8u;
-        }
-        self->private_data.f_scratch += (self->private_impl.f_bits >> 31u);
-        self->private_data.f_presence[(v_i & 255u)] = ((uint8_t)((self->private_impl.f_bits >> 31u)));
-        self->private_impl.f_bits <<= 1u;
-        self->private_impl.f_n_bits -= 1u;
-        v_i += 1u;
-        if ((v_i & 15u) == 0u) {
-          break;
-        }
-      }
-    }
-    if ((self->private_data.f_scratch < 1u) || (256u < self->private_data.f_scratch)) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_header);
-      goto exit;
-    }
-    self->private_impl.f_num_symbols = (self->private_data.f_scratch + 2u);
-    self->private_data.f_scratch = 0u;
-    v_i = 0u;
-    while (v_i < 3u) {
-      if (self->private_impl.f_n_bits <= 0u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_5 = *iop_a_src++;
-          v_c = t_5;
-        }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-        self->private_impl.f_n_bits = 8u;
-      }
-      self->private_data.f_scratch <<= 1u;
-      self->private_data.f_scratch |= (self->private_impl.f_bits >> 31u);
-      self->private_impl.f_bits <<= 1u;
-      self->private_impl.f_n_bits -= 1u;
-      v_i += 1u;
-    }
-    if ((self->private_data.f_scratch < 2u) || (6u < self->private_data.f_scratch)) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_header);
-      goto exit;
-    }
-    self->private_impl.f_num_huffman_codes = self->private_data.f_scratch;
-    self->private_data.f_scratch = 0u;
-    v_i = 0u;
-    while (v_i < 15u) {
-      if (self->private_impl.f_n_bits <= 0u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_6 = *iop_a_src++;
-          v_c = t_6;
-        }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-        self->private_impl.f_n_bits = 8u;
-      }
-      self->private_data.f_scratch <<= 1u;
-      self->private_data.f_scratch |= (self->private_impl.f_bits >> 31u);
-      self->private_impl.f_bits <<= 1u;
-      self->private_impl.f_n_bits -= 1u;
-      v_i += 1u;
-    }
-    if ((self->private_data.f_scratch < 1u) || (18001u < self->private_data.f_scratch)) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_header);
-      goto exit;
-    }
-    self->private_impl.f_num_sections = self->private_data.f_scratch;
-    v_i = 0u;
-    while (v_i < self->private_impl.f_num_huffman_codes) {
-      self->private_data.f_mtft[v_i] = ((uint8_t)(v_i));
-      v_i += 1u;
-    }
-    v_i = 0u;
-    while (v_i < self->private_impl.f_num_sections) {
-      v_selector = 0u;
-      while (true) {
-        if (self->private_impl.f_n_bits <= 0u) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_7 = *iop_a_src++;
-            v_c = t_7;
-          }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-          self->private_impl.f_n_bits = 8u;
-        }
-        if ((self->private_impl.f_bits >> 31u) == 0u) {
-          self->private_impl.f_bits <<= 1u;
-          self->private_impl.f_n_bits -= 1u;
-          break;
-        }
-        self->private_impl.f_bits <<= 1u;
-        self->private_impl.f_n_bits -= 1u;
-        v_selector += 1u;
-        if (v_selector >= self->private_impl.f_num_huffman_codes) {
-          status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_header);
-          goto exit;
-        }
-      }
-      if (v_selector == 0u) {
-        self->private_data.f_huffman_selectors[v_i] = self->private_data.f_mtft[0u];
-      } else {
-        v_sel_ff = (v_selector & 255u);
-        v_movee = self->private_data.f_mtft[v_sel_ff];
-        wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_mtft, 1, (1u + v_sel_ff)), wuffs_base__make_slice_u8(self->private_data.f_mtft, v_sel_ff));
-        self->private_data.f_mtft[0u] = v_movee;
-        self->private_data.f_huffman_selectors[v_i] = v_movee;
-      }
-      v_i += 1u;
-    }
-    v_i = 0u;
-    while (v_i < self->private_impl.f_num_huffman_codes) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-      status = wuffs_bzip2__decoder__read_code_lengths(self, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-      v_status = wuffs_bzip2__decoder__build_huffman_tree(self, v_i);
-      if (wuffs_base__status__is_error(&v_status)) {
-        status = v_status;
-        goto exit;
-      }
-      wuffs_bzip2__decoder__build_huffman_table(self, v_i);
-      v_i += 1u;
-    }
-    v_i = 0u;
-    v_j = 0u;
-    while (v_i < 256u) {
-      if (self->private_data.f_presence[v_i] != 0u) {
-        self->private_data.f_mtft[(v_j & 255u)] = ((uint8_t)(v_i));
-        v_j += 1u;
-      }
-      v_i += 1u;
-    }
-    v_i = 0u;
-    while (v_i < 256u) {
-      self->private_data.f_letter_counts[v_i] = 0u;
-      v_i += 1u;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_prepare_block[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_prepare_block[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_prepare_block[0].v_i = v_i;
-  self->private_data.s_prepare_block[0].v_selector = v_selector;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bzip2.decoder.read_code_lengths
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__read_code_lengths(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint32_t v_i = 0;
-  uint32_t v_code_length = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_read_code_lengths[0];
-  if (coro_susp_point) {
-    v_i = self->private_data.s_read_code_lengths[0].v_i;
-    v_code_length = self->private_data.s_read_code_lengths[0].v_code_length;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    self->private_impl.f_code_lengths_bitmask = 0u;
-    v_i = 0u;
-    while (v_i < 5u) {
-      if (self->private_impl.f_n_bits <= 0u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_0 = *iop_a_src++;
-          v_c = t_0;
-        }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-        self->private_impl.f_n_bits = 8u;
-      }
-      v_code_length <<= 1u;
-      v_code_length |= (self->private_impl.f_bits >> 31u);
-      self->private_impl.f_bits <<= 1u;
-      self->private_impl.f_n_bits -= 1u;
-      v_i += 1u;
-    }
-    v_i = 0u;
-    while (v_i < self->private_impl.f_num_symbols) {
-      while (true) {
-        if ((v_code_length < 1u) || (20u < v_code_length)) {
-          status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_header);
-          goto exit;
-        }
-        if (self->private_impl.f_n_bits <= 0u) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_1 = *iop_a_src++;
-            v_c = t_1;
-          }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-          self->private_impl.f_n_bits = 8u;
-        }
-        if ((self->private_impl.f_bits >> 31u) == 0u) {
-          self->private_impl.f_bits <<= 1u;
-          self->private_impl.f_n_bits -= 1u;
-          break;
-        }
-        self->private_impl.f_bits <<= 1u;
-        self->private_impl.f_n_bits -= 1u;
-        if (self->private_impl.f_n_bits <= 0u) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_2 = *iop_a_src++;
-            v_c = t_2;
-          }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-          self->private_impl.f_n_bits = 8u;
-        }
-        if ((self->private_impl.f_bits >> 31u) == 0u) {
-          v_code_length += 1u;
-        } else {
-          v_code_length -= 1u;
-        }
-        self->private_impl.f_bits <<= 1u;
-        self->private_impl.f_n_bits -= 1u;
-      }
-      self->private_impl.f_code_lengths_bitmask |= (((uint32_t)(1u)) << (v_code_length & 31u));
-      self->private_data.f_bwt[v_i] = v_code_length;
-      v_i += 1u;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_read_code_lengths[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_read_code_lengths[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_read_code_lengths[0].v_i = v_i;
-  self->private_data.s_read_code_lengths[0].v_code_length = v_code_length;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bzip2.decoder.build_huffman_tree
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__build_huffman_tree(
-    wuffs_bzip2__decoder* self,
-    uint32_t a_which) {
-  uint32_t v_code_length = 0;
-  uint32_t v_symbol_index = 0;
-  uint32_t v_num_branch_nodes = 0;
-  uint32_t v_stack_height = 0;
-  uint32_t v_stack_values[21] = {0};
-  uint32_t v_node_index = 0;
-  uint16_t v_leaf_value = 0;
-
-  self->private_data.f_huffman_trees[a_which][0u][0u] = 0u;
-  self->private_data.f_huffman_trees[a_which][0u][1u] = 0u;
-  v_num_branch_nodes = 1u;
-  v_stack_height = 1u;
-  v_stack_values[0u] = 0u;
-  v_code_length = 1u;
-  while (v_code_length <= 20u) {
-    if ((self->private_impl.f_code_lengths_bitmask & (((uint32_t)(1u)) << v_code_length)) == 0u) {
-      v_code_length += 1u;
-      continue;
-    }
-    v_symbol_index = 0u;
-    while (v_symbol_index < self->private_impl.f_num_symbols) {
-      if (self->private_data.f_bwt[v_symbol_index] != v_code_length) {
-        v_symbol_index += 1u;
-        continue;
-      }
-      while (true) {
-        if (v_stack_height <= 0u) {
-          return wuffs_base__make_status(wuffs_bzip2__error__bad_huffman_code_over_subscribed);
-        } else if (v_stack_height >= v_code_length) {
-          break;
-        }
-        v_node_index = v_stack_values[(v_stack_height - 1u)];
-        if (self->private_data.f_huffman_trees[a_which][v_node_index][0u] == 0u) {
-          self->private_data.f_huffman_trees[a_which][v_node_index][0u] = ((uint16_t)(v_num_branch_nodes));
-        } else {
-          self->private_data.f_huffman_trees[a_which][v_node_index][1u] = ((uint16_t)(v_num_branch_nodes));
-        }
-        if (v_num_branch_nodes >= 257u) {
-          return wuffs_base__make_status(wuffs_bzip2__error__bad_huffman_code_under_subscribed);
-        }
-        v_stack_values[v_stack_height] = v_num_branch_nodes;
-        self->private_data.f_huffman_trees[a_which][v_num_branch_nodes][0u] = 0u;
-        self->private_data.f_huffman_trees[a_which][v_num_branch_nodes][1u] = 0u;
-        v_num_branch_nodes += 1u;
-        v_stack_height += 1u;
-      }
-      v_node_index = v_stack_values[(v_stack_height - 1u)];
-      if (v_symbol_index < 2u) {
-        v_leaf_value = ((uint16_t)((769u + v_symbol_index)));
-      } else if ((v_symbol_index + 1u) < self->private_impl.f_num_symbols) {
-        v_leaf_value = ((uint16_t)((511u + v_symbol_index)));
-      } else {
-        v_leaf_value = 768u;
-      }
-      if (self->private_data.f_huffman_trees[a_which][v_node_index][0u] == 0u) {
-        self->private_data.f_huffman_trees[a_which][v_node_index][0u] = v_leaf_value;
-      } else {
-        self->private_data.f_huffman_trees[a_which][v_node_index][1u] = v_leaf_value;
-        v_stack_height -= 1u;
-        while (v_stack_height > 0u) {
-          v_node_index = v_stack_values[(v_stack_height - 1u)];
-          if (self->private_data.f_huffman_trees[a_which][v_node_index][1u] == 0u) {
-            break;
-          }
-          v_stack_height -= 1u;
-        }
-      }
-      v_symbol_index += 1u;
-    }
-    v_code_length += 1u;
-  }
-  if (v_stack_height != 0u) {
-    return wuffs_base__make_status(wuffs_bzip2__error__bad_huffman_code_under_subscribed);
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func bzip2.decoder.build_huffman_table
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_bzip2__decoder__build_huffman_table(
-    wuffs_bzip2__decoder* self,
-    uint32_t a_which) {
-  uint32_t v_i = 0;
-  uint32_t v_bits = 0;
-  uint16_t v_n_bits = 0;
-  uint16_t v_child = 0;
-
-  while (v_i < 256u) {
-    v_bits = (v_i << 24u);
-    v_n_bits = 0u;
-    v_child = 0u;
-    while ((v_child < 257u) && (v_n_bits < 8u)) {
-      v_child = self->private_data.f_huffman_trees[a_which][v_child][(v_bits >> 31u)];
-      v_bits <<= 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-      v_n_bits += 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-    }
-    self->private_data.f_huffman_tables[a_which][v_i] = ((uint16_t)((v_child | (v_n_bits << 12u))));
-    v_i += 1u;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func bzip2.decoder.invert_bwt
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_bzip2__decoder__invert_bwt(
-    wuffs_bzip2__decoder* self) {
-  uint32_t v_i = 0;
-  uint32_t v_letter = 0;
-  uint32_t v_sum = 0;
-  uint32_t v_old_sum = 0;
-
-  v_sum = 0u;
-  v_i = 0u;
-  while (v_i < 256u) {
-    v_old_sum = v_sum;
-    v_sum += self->private_data.f_letter_counts[v_i];
-    self->private_data.f_letter_counts[v_i] = v_old_sum;
-    v_i += 1u;
-  }
-  v_i = 0u;
-  while (v_i < self->private_impl.f_block_size) {
-    v_letter = (self->private_data.f_bwt[v_i] & 255u);
-    self->private_data.f_bwt[(self->private_data.f_letter_counts[v_letter] & 1048575u)] |= (v_i << 12u);
-    self->private_data.f_letter_counts[v_letter] += 1u;
-    v_i += 1u;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func bzip2.decoder.flush_fast
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_bzip2__decoder__flush_fast(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_dst) {
-  uint32_t v_flush_pointer = 0;
-  uint32_t v_flush_repeat_count = 0;
-  uint8_t v_flush_prev = 0;
-  uint32_t v_block_checksum_have = 0;
-  uint32_t v_block_size = 0;
-  uint32_t v_entry = 0;
-  uint8_t v_curr = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-
-  v_flush_pointer = self->private_impl.f_flush_pointer;
-  v_flush_repeat_count = self->private_impl.f_flush_repeat_count;
-  v_flush_prev = self->private_impl.f_flush_prev;
-  v_block_checksum_have = self->private_impl.f_block_checksum_have;
-  v_block_size = self->private_impl.f_block_size;
-  while ((v_block_size > 0u) && (((uint64_t)(io2_a_dst - iop_a_dst)) >= 255u)) {
-    if (v_flush_repeat_count < 4u) {
-      v_entry = self->private_data.f_bwt[v_flush_pointer];
-      v_curr = ((uint8_t)(v_entry));
-      v_flush_pointer = (v_entry >> 12u);
-      if (v_curr == v_flush_prev) {
-        v_flush_repeat_count += 1u;
-      } else {
-        v_flush_repeat_count = 1u;
-      }
-      v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_curr)] ^ ((uint32_t)(v_block_checksum_have << 8u)));
-      (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, v_curr), iop_a_dst += 1);
-      v_flush_prev = v_curr;
-      v_block_size -= 1u;
-    } else {
-      v_entry = self->private_data.f_bwt[v_flush_pointer];
-      v_curr = ((uint8_t)(v_entry));
-      v_flush_pointer = (v_entry >> 12u);
-      v_flush_repeat_count = ((uint32_t)(v_curr));
-      while (v_flush_repeat_count > 0u) {
-        v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_flush_prev)] ^ ((uint32_t)(v_block_checksum_have << 8u)));
-        if (((uint64_t)(io2_a_dst - iop_a_dst)) > 0u) {
-          (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, v_flush_prev), iop_a_dst += 1);
-        }
-        v_flush_repeat_count -= 1u;
-      }
-      v_flush_repeat_count = 0u;
-      v_flush_prev = v_curr;
-      v_block_size -= 1u;
-    }
-  }
-  self->private_impl.f_flush_pointer = v_flush_pointer;
-  self->private_impl.f_flush_repeat_count = v_flush_repeat_count;
-  self->private_impl.f_flush_prev = v_flush_prev;
-  self->private_impl.f_block_checksum_have = v_block_checksum_have;
-  if (v_block_size <= 900000u) {
-    self->private_impl.f_block_size = v_block_size;
-  }
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func bzip2.decoder.flush_slow
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__flush_slow(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_dst) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_flush_pointer = 0;
-  uint32_t v_flush_repeat_count = 0;
-  uint8_t v_flush_prev = 0;
-  uint32_t v_block_checksum_have = 0;
-  uint32_t v_block_size = 0;
-  uint32_t v_entry = 0;
-  uint8_t v_curr = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_flush_slow[0];
-  if (coro_susp_point) {
-    v_flush_pointer = self->private_data.s_flush_slow[0].v_flush_pointer;
-    v_flush_repeat_count = self->private_data.s_flush_slow[0].v_flush_repeat_count;
-    v_flush_prev = self->private_data.s_flush_slow[0].v_flush_prev;
-    v_block_checksum_have = self->private_data.s_flush_slow[0].v_block_checksum_have;
-    v_block_size = self->private_data.s_flush_slow[0].v_block_size;
-    v_curr = self->private_data.s_flush_slow[0].v_curr;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    v_flush_pointer = self->private_impl.f_flush_pointer;
-    v_flush_repeat_count = self->private_impl.f_flush_repeat_count;
-    v_flush_prev = self->private_impl.f_flush_prev;
-    v_block_checksum_have = self->private_impl.f_block_checksum_have;
-    v_block_size = self->private_impl.f_block_size;
-    while ((v_block_size > 0u) &&  ! (self->private_impl.p_flush_slow[0] != 0)) {
-      if (v_flush_repeat_count < 4u) {
-        v_entry = self->private_data.f_bwt[v_flush_pointer];
-        v_curr = ((uint8_t)(v_entry));
-        v_flush_pointer = (v_entry >> 12u);
-        if (v_curr == v_flush_prev) {
-          v_flush_repeat_count += 1u;
-        } else {
-          v_flush_repeat_count = 1u;
-        }
-        v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_curr)] ^ ((uint32_t)(v_block_checksum_have << 8u)));
-        self->private_data.s_flush_slow[0].scratch = v_curr;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (iop_a_dst == io2_a_dst) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-          goto suspend;
-        }
-        *iop_a_dst++ = ((uint8_t)(self->private_data.s_flush_slow[0].scratch));
-        v_flush_prev = v_curr;
-        v_block_size -= 1u;
-      } else {
-        v_entry = self->private_data.f_bwt[v_flush_pointer];
-        v_curr = ((uint8_t)(v_entry));
-        v_flush_pointer = (v_entry >> 12u);
-        v_flush_repeat_count = ((uint32_t)(v_curr));
-        while (v_flush_repeat_count > 0u) {
-          v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_flush_prev)] ^ ((uint32_t)(v_block_checksum_have << 8u)));
-          self->private_data.s_flush_slow[0].scratch = v_flush_prev;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          if (iop_a_dst == io2_a_dst) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-            goto suspend;
-          }
-          *iop_a_dst++ = ((uint8_t)(self->private_data.s_flush_slow[0].scratch));
-          v_flush_repeat_count -= 1u;
-        }
-        v_flush_repeat_count = 0u;
-        v_flush_prev = v_curr;
-        v_block_size -= 1u;
-      }
-    }
-    self->private_impl.f_flush_pointer = v_flush_pointer;
-    self->private_impl.f_flush_repeat_count = v_flush_repeat_count;
-    self->private_impl.f_flush_prev = v_flush_prev;
-    self->private_impl.f_block_checksum_have = v_block_checksum_have;
-    if (v_block_size <= 900000u) {
-      self->private_impl.f_block_size = v_block_size;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_flush_slow[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_flush_slow[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_flush_slow[0].v_flush_pointer = v_flush_pointer;
-  self->private_data.s_flush_slow[0].v_flush_repeat_count = v_flush_repeat_count;
-  self->private_data.s_flush_slow[0].v_flush_prev = v_flush_prev;
-  self->private_data.s_flush_slow[0].v_block_checksum_have = v_block_checksum_have;
-  self->private_data.s_flush_slow[0].v_block_size = v_block_size;
-  self->private_data.s_flush_slow[0].v_curr = v_curr;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bzip2.decoder.decode_huffman_fast
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__decode_huffman_fast(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint32_t v_block_size = 0;
-  uint8_t v_which = 0;
-  uint32_t v_ticks = 0;
-  uint32_t v_section = 0;
-  uint32_t v_run_shift = 0;
-  uint16_t v_table_entry = 0;
-  uint16_t v_child = 0;
-  uint32_t v_child_ff = 0;
-  uint32_t v_i = 0;
-  uint32_t v_j = 0;
-  uint32_t v_output = 0;
-  uint32_t v_run = 0;
-  uint32_t v_mtft0 = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  v_bits = self->private_impl.f_bits;
-  v_n_bits = self->private_impl.f_n_bits;
-  v_block_size = self->private_impl.f_block_size;
-  v_which = self->private_impl.f_decode_huffman_which;
-  v_ticks = self->private_impl.f_decode_huffman_ticks;
-  v_section = self->private_impl.f_decode_huffman_section;
-  v_run_shift = self->private_impl.f_decode_huffman_run_shift;
-  while (((uint64_t)(io2_a_src - iop_a_src)) >= 4u) {
-    if (v_ticks > 0u) {
-      v_ticks -= 1u;
-    } else {
-      v_ticks = 49u;
-      v_section += 1u;
-      if (v_section >= self->private_impl.f_num_sections) {
-        status = wuffs_base__make_status(wuffs_bzip2__error__bad_number_of_sections);
-        goto exit;
-      }
-      v_which = WUFFS_BZIP2__CLAMP_TO_5[(self->private_data.f_huffman_selectors[(v_section & 32767u)] & 7u)];
-    }
-    v_bits |= (wuffs_base__peek_u32be__no_bounds_check(iop_a_src) >> v_n_bits);
-    iop_a_src += ((31u - v_n_bits) >> 3u);
-    v_n_bits |= 24u;
-    v_table_entry = self->private_data.f_huffman_tables[v_which][(v_bits >> 24u)];
-    v_bits <<= (v_table_entry >> 12u);
-    v_n_bits -= ((uint32_t)((v_table_entry >> 12u)));
-    v_child = (v_table_entry & 1023u);
-    while (v_child < 257u) {
-      v_child = self->private_data.f_huffman_trees[v_which][v_child][(v_bits >> 31u)];
-      v_bits <<= 1u;
-      if (v_n_bits <= 0u) {
-        status = wuffs_base__make_status(wuffs_bzip2__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      }
-      v_n_bits -= 1u;
-    }
-    if (v_child < 768u) {
-      v_child_ff = ((uint32_t)((v_child & 255u)));
-      v_output = ((uint32_t)(self->private_data.f_mtft[v_child_ff]));
-      wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_mtft, 1, (1u + v_child_ff)), wuffs_base__make_slice_u8(self->private_data.f_mtft, v_child_ff));
-      self->private_data.f_mtft[0u] = ((uint8_t)(v_output));
-      self->private_data.f_letter_counts[v_output] += 1u;
-      self->private_data.f_bwt[v_block_size] = v_output;
-      if (v_block_size >= self->private_impl.f_max_incl_block_size) {
-        status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_length);
-        goto exit;
-      }
-      v_block_size += 1u;
-      v_run_shift = 0u;
-      continue;
-    } else if (v_child == 768u) {
-      self->private_impl.f_decode_huffman_finished = true;
-      break;
-    }
-    if (v_run_shift >= 23u) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_length);
-      goto exit;
-    }
-    v_run = ((((uint32_t)(v_child)) & 3u) << v_run_shift);
-    v_run_shift += 1u;
-    v_i = v_block_size;
-    v_j = (v_run + v_block_size);
-    if (v_j > self->private_impl.f_max_incl_block_size) {
-      status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_length);
-      goto exit;
-    }
-    v_block_size = v_j;
-    v_mtft0 = ((uint32_t)(self->private_data.f_mtft[0u]));
-    self->private_data.f_letter_counts[v_mtft0] += v_run;
-    while (v_i < v_j) {
-      self->private_data.f_bwt[v_i] = v_mtft0;
-      v_i += 1u;
-    }
-  }
-  self->private_impl.f_bits = v_bits;
-  self->private_impl.f_n_bits = v_n_bits;
-  self->private_impl.f_block_size = v_block_size;
-  self->private_impl.f_decode_huffman_which = v_which;
-  self->private_impl.f_decode_huffman_ticks = v_ticks;
-  self->private_impl.f_decode_huffman_section = v_section;
-  self->private_impl.f_decode_huffman_run_shift = v_run_shift;
-  status = wuffs_base__make_status(NULL);
-  goto ok;
-
-  ok:
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func bzip2.decoder.decode_huffman_slow
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_bzip2__decoder__decode_huffman_slow(
-    wuffs_bzip2__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint32_t v_node_index = 0;
-  uint16_t v_child = 0;
-  uint32_t v_child_ff = 0;
-  uint32_t v_i = 0;
-  uint32_t v_j = 0;
-  uint32_t v_output = 0;
-  uint32_t v_run = 0;
-  uint32_t v_mtft0 = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_huffman_slow[0];
-  if (coro_susp_point) {
-    v_node_index = self->private_data.s_decode_huffman_slow[0].v_node_index;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while ( ! (self->private_impl.p_decode_huffman_slow[0] != 0)) {
-      if (self->private_impl.f_decode_huffman_ticks > 0u) {
-        self->private_impl.f_decode_huffman_ticks -= 1u;
-      } else {
-        self->private_impl.f_decode_huffman_ticks = 49u;
-        self->private_impl.f_decode_huffman_section += 1u;
-        if (self->private_impl.f_decode_huffman_section >= self->private_impl.f_num_sections) {
-          status = wuffs_base__make_status(wuffs_bzip2__error__bad_number_of_sections);
-          goto exit;
-        }
-        self->private_impl.f_decode_huffman_which = WUFFS_BZIP2__CLAMP_TO_5[(self->private_data.f_huffman_selectors[(self->private_impl.f_decode_huffman_section & 32767u)] & 7u)];
-      }
-      v_node_index = 0u;
-      while (true) {
-        if (self->private_impl.f_n_bits <= 0u) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_0 = *iop_a_src++;
-            v_c = t_0;
-          }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
-          self->private_impl.f_n_bits = 8u;
-        }
-        v_child = self->private_data.f_huffman_trees[self->private_impl.f_decode_huffman_which][v_node_index][(self->private_impl.f_bits >> 31u)];
-        self->private_impl.f_bits <<= 1u;
-        self->private_impl.f_n_bits -= 1u;
-        if (v_child < 257u) {
-          v_node_index = ((uint32_t)(v_child));
-          continue;
-        } else if (v_child < 768u) {
-          v_child_ff = ((uint32_t)((v_child & 255u)));
-          v_output = ((uint32_t)(self->private_data.f_mtft[v_child_ff]));
-          wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_mtft, 1, (1u + v_child_ff)), wuffs_base__make_slice_u8(self->private_data.f_mtft, v_child_ff));
-          self->private_data.f_mtft[0u] = ((uint8_t)(v_output));
-          self->private_data.f_letter_counts[v_output] += 1u;
-          self->private_data.f_bwt[self->private_impl.f_block_size] = v_output;
-          if (self->private_impl.f_block_size >= self->private_impl.f_max_incl_block_size) {
-            status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_length);
-            goto exit;
-          }
-          self->private_impl.f_block_size += 1u;
-          self->private_impl.f_decode_huffman_run_shift = 0u;
-          break;
-        } else if (v_child == 768u) {
-          self->private_impl.f_decode_huffman_finished = true;
-          goto label__outer__break;
-        }
-        if (self->private_impl.f_decode_huffman_run_shift >= 23u) {
-          status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_length);
-          goto exit;
-        }
-        v_run = ((((uint32_t)(v_child)) & 3u) << self->private_impl.f_decode_huffman_run_shift);
-        self->private_impl.f_decode_huffman_run_shift += 1u;
-        v_i = self->private_impl.f_block_size;
-        v_j = (v_run + self->private_impl.f_block_size);
-        if (v_j > self->private_impl.f_max_incl_block_size) {
-          status = wuffs_base__make_status(wuffs_bzip2__error__bad_block_length);
-          goto exit;
-        }
-        self->private_impl.f_block_size = v_j;
-        v_mtft0 = ((uint32_t)(self->private_data.f_mtft[0u]));
-        self->private_data.f_letter_counts[v_mtft0] += v_run;
-        while (v_i < v_j) {
-          self->private_data.f_bwt[v_i] = v_mtft0;
-          v_i += 1u;
-        }
-        break;
-      }
-    }
-    label__outer__break:;
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_huffman_slow[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_huffman_slow[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_huffman_slow[0].v_node_index = v_node_index;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BZIP2)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CBOR)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_cbor__error__bad_input[] = "#cbor: bad input";
-const char wuffs_cbor__error__unsupported_recursion_depth[] = "#cbor: unsupported recursion depth";
-const char wuffs_cbor__error__internal_error_inconsistent_i_o[] = "#cbor: internal error: inconsistent I/O";
-const char wuffs_cbor__error__internal_error_inconsistent_token_length[] = "#cbor: internal error: inconsistent token length";
-
-// ---------------- Private Consts
-
-static const uint32_t
-WUFFS_CBOR__LITERALS[4] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  8388612, 8388616, 8388610, 8388609,
-};
-
-static const uint8_t
-WUFFS_CBOR__TOKEN_LENGTHS[32] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1,
-  2, 3, 5, 9, 0, 0, 0, 1,
-};
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-// ---------------- VTables
-
-const wuffs_base__token_decoder__func_ptrs
-wuffs_cbor__decoder__func_ptrs_for__wuffs_base__token_decoder = {
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_cbor__decoder__get_quirk),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__token_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__slice_u8))(&wuffs_cbor__decoder__decode_tokens),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_cbor__decoder__set_quirk),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_cbor__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_cbor__decoder__initialize(
-    wuffs_cbor__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__token_decoder.vtable_name =
-      wuffs_base__token_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__token_decoder.function_pointers =
-      (const void*)(&wuffs_cbor__decoder__func_ptrs_for__wuffs_base__token_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_cbor__decoder*
-wuffs_cbor__decoder__alloc() {
-  wuffs_cbor__decoder* x =
-      (wuffs_cbor__decoder*)(calloc(sizeof(wuffs_cbor__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_cbor__decoder__initialize(
-      x, sizeof(wuffs_cbor__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_cbor__decoder() {
-  return sizeof(wuffs_cbor__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func cbor.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_cbor__decoder__get_quirk(
-    const wuffs_cbor__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func cbor.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_cbor__decoder__set_quirk(
-    wuffs_cbor__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func cbor.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_cbor__decoder__workbuf_len(
-    const wuffs_cbor__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__empty_range_ii_u64();
-}
-
-// -------- func cbor.decoder.decode_tokens
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_cbor__decoder__decode_tokens(
-    wuffs_cbor__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint64_t v_string_length = 0;
-  uint64_t v_n64 = 0;
-  uint32_t v_depth = 0;
-  uint32_t v_stack_byte = 0;
-  uint32_t v_stack_bit = 0;
-  uint32_t v_stack_val = 0;
-  uint32_t v_token_length = 0;
-  uint32_t v_vminor = 0;
-  uint32_t v_vminor_alt = 0;
-  uint32_t v_continued = 0;
-  uint8_t v_c = 0;
-  uint8_t v_c_major = 0;
-  uint8_t v_c_minor = 0;
-  bool v_tagged = false;
-  uint8_t v_indefinite_string_major_type = 0;
-
-  wuffs_base__token* iop_a_dst = NULL;
-  wuffs_base__token* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_tokens[0];
-  if (coro_susp_point) {
-    v_string_length = self->private_data.s_decode_tokens[0].v_string_length;
-    v_depth = self->private_data.s_decode_tokens[0].v_depth;
-    v_tagged = self->private_data.s_decode_tokens[0].v_tagged;
-    v_indefinite_string_major_type = self->private_data.s_decode_tokens[0].v_indefinite_string_major_type;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_end_of_data) {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    label__outer__continue:;
-    while (true) {
-      while (true) {
-        do {
-          if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 1u) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-            goto label__outer__continue;
-          }
-          if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-            if (a_src && a_src->meta.closed) {
-              status = wuffs_base__make_status(wuffs_cbor__error__bad_input);
-              goto exit;
-            }
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-            goto label__outer__continue;
-          }
-          v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-          if ((v_indefinite_string_major_type != 0u) && (v_indefinite_string_major_type != (v_c >> 5u))) {
-            if (v_c != 255u) {
-              status = wuffs_base__make_status(wuffs_cbor__error__bad_input);
-              goto exit;
-            }
-            v_vminor = 4194560u;
-            if (v_indefinite_string_major_type == 3u) {
-              v_vminor |= 19u;
-            }
-            v_indefinite_string_major_type = 0u;
-            iop_a_src += 1u;
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(v_vminor)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            goto label__goto_parsed_a_leaf_value__break;
-          }
-          iop_a_src += 1u;
-          v_c_major = ((uint8_t)((v_c >> 5u)));
-          v_c_minor = (v_c & 31u);
-          if (v_c_minor < 24u) {
-            v_string_length = ((uint64_t)(v_c_minor));
-          } else {
-            while (true) {
-              if (v_c_minor == 24u) {
-                if (((uint64_t)(io2_a_src - iop_a_src)) >= 1u) {
-                  v_string_length = ((uint64_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src)));
-                  iop_a_src += 1u;
-                  break;
-                }
-              } else if (v_c_minor == 25u) {
-                if (((uint64_t)(io2_a_src - iop_a_src)) >= 2u) {
-                  v_string_length = ((uint64_t)(wuffs_base__peek_u16be__no_bounds_check(iop_a_src)));
-                  iop_a_src += 2u;
-                  break;
-                }
-              } else if (v_c_minor == 26u) {
-                if (((uint64_t)(io2_a_src - iop_a_src)) >= 4u) {
-                  v_string_length = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-                  iop_a_src += 4u;
-                  break;
-                }
-              } else if (v_c_minor == 27u) {
-                if (((uint64_t)(io2_a_src - iop_a_src)) >= 8u) {
-                  v_string_length = wuffs_base__peek_u64be__no_bounds_check(iop_a_src);
-                  iop_a_src += 8u;
-                  break;
-                }
-              } else {
-                v_string_length = 0u;
-                break;
-              }
-              if (iop_a_src > io1_a_src) {
-                iop_a_src--;
-                if (a_src && a_src->meta.closed) {
-                  status = wuffs_base__make_status(wuffs_cbor__error__bad_input);
-                  goto exit;
-                }
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-                goto label__outer__continue;
-              }
-              status = wuffs_base__make_status(wuffs_cbor__error__internal_error_inconsistent_i_o);
-              goto exit;
-            }
-          }
-          if (v_c_major == 0u) {
-            if (v_c_minor < 26u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)((14680064u | ((uint32_t)((v_string_length & 65535u)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            } else if (v_c_minor < 28u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)((14680064u | ((uint32_t)((v_string_length >> 46u)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                  (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (~(v_string_length & 70368744177663u) << WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT) |
-                  (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            }
-          } else if (v_c_major == 1u) {
-            if (v_c_minor < 26u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)((12582912u | (2097151u - ((uint32_t)((v_string_length & 65535u))))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            } else if (v_c_minor < 28u) {
-              if (v_string_length < 9223372036854775808u) {
-                *iop_a_dst++ = wuffs_base__make_token(
-                    (((uint64_t)((12582912u | (2097151u - ((uint32_t)((v_string_length >> 46u))))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                    (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                    (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                *iop_a_dst++ = wuffs_base__make_token(
-                    (~((18446744073709551615u - v_string_length) & 70368744177663u) << WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT) |
-                    (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              } else {
-                *iop_a_dst++ = wuffs_base__make_token(
-                    (((uint64_t)(787997u)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) |
-                    (((uint64_t)(16777216u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                    (((uint64_t)(9u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              }
-              goto label__goto_parsed_a_leaf_value__break;
-            }
-          } else if (v_c_major == 2u) {
-            if (v_c_minor < 28u) {
-              if (v_string_length == 0u) {
-                *iop_a_dst++ = wuffs_base__make_token(
-                    (((uint64_t)(4194560u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                    (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                goto label__goto_parsed_a_leaf_value__break;
-              }
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(4194560u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                  (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            } else if (v_c_minor == 31u) {
-              if (v_indefinite_string_major_type != 0u) {
-                break;
-              }
-              v_indefinite_string_major_type = 2u;
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(4194560u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__outer__continue;
-            } else {
-              break;
-            }
-            while (true) {
-              if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
-                continue;
-              }
-              v_n64 = wuffs_base__u64__min(v_string_length, ((uint64_t)(io2_a_src - iop_a_src)));
-              v_token_length = ((uint32_t)((v_n64 & 65535u)));
-              if (v_n64 > 65535u) {
-                v_token_length = 65535u;
-              } else if (v_token_length <= 0u) {
-                if (a_src && a_src->meta.closed) {
-                  status = wuffs_base__make_status(wuffs_cbor__error__bad_input);
-                  goto exit;
-                }
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
-                continue;
-              }
-              if (((uint64_t)(io2_a_src - iop_a_src)) < ((uint64_t)(v_token_length))) {
-                status = wuffs_base__make_status(wuffs_cbor__error__internal_error_inconsistent_token_length);
-                goto exit;
-              }
-              v_string_length -= ((uint64_t)(v_token_length));
-              v_continued = 0u;
-              if ((v_string_length > 0u) || (v_indefinite_string_major_type > 0u)) {
-                v_continued = 1u;
-              }
-              iop_a_src += v_token_length;
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(4194816u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(v_continued)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                  (((uint64_t)(v_token_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              if (v_string_length > 0u) {
-                continue;
-              } else if (v_indefinite_string_major_type > 0u) {
-                goto label__outer__continue;
-              }
-              goto label__goto_parsed_a_leaf_value__break;
-            }
-          } else if (v_c_major == 3u) {
-            if (v_c_minor < 28u) {
-              if (v_string_length == 0u) {
-                *iop_a_dst++ = wuffs_base__make_token(
-                    (((uint64_t)(4194579u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                    (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                goto label__goto_parsed_a_leaf_value__break;
-              }
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(4194579u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                  (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            } else if (v_c_minor == 31u) {
-              if (v_indefinite_string_major_type != 0u) {
-                break;
-              }
-              v_indefinite_string_major_type = 3u;
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(4194579u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__outer__continue;
-            } else {
-              break;
-            }
-            while (true) {
-              if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
-                continue;
-              }
-              v_n64 = wuffs_base__u64__min(v_string_length, 65535u);
-              v_n64 = ((uint64_t)(wuffs_base__utf_8__longest_valid_prefix(iop_a_src,
-                  ((size_t)(wuffs_base__u64__min(((uint64_t)(io2_a_src - iop_a_src)), v_n64))))));
-              v_token_length = ((uint32_t)((v_n64 & 65535u)));
-              if (v_token_length <= 0u) {
-                if ((a_src && a_src->meta.closed) || (((uint64_t)(io2_a_src - iop_a_src)) >= 4u)) {
-                  status = wuffs_base__make_status(wuffs_cbor__error__bad_input);
-                  goto exit;
-                }
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
-                continue;
-              }
-              if (((uint64_t)(io2_a_src - iop_a_src)) < ((uint64_t)(v_token_length))) {
-                status = wuffs_base__make_status(wuffs_cbor__error__internal_error_inconsistent_token_length);
-                goto exit;
-              }
-              v_string_length -= ((uint64_t)(v_token_length));
-              v_continued = 0u;
-              if ((v_string_length > 0u) || (v_indefinite_string_major_type > 0u)) {
-                v_continued = 1u;
-              }
-              iop_a_src += v_token_length;
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(v_continued)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                  (((uint64_t)(v_token_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              if (v_string_length > 0u) {
-                continue;
-              } else if (v_indefinite_string_major_type > 0u) {
-                goto label__outer__continue;
-              }
-              goto label__goto_parsed_a_leaf_value__break;
-            }
-          } else if (v_c_major == 4u) {
-            if (WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor] == 0u) {
-              break;
-            } else if (v_depth >= 1024u) {
-              v_token_length = ((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor]));
-              while ((v_token_length > 0u) && (iop_a_src > io1_a_src)) {
-                iop_a_src--;
-                v_token_length -= 1u;
-              }
-              status = wuffs_base__make_status(wuffs_cbor__error__unsupported_recursion_depth);
-              goto exit;
-            }
-            v_vminor = 2105361u;
-            v_vminor_alt = 2101282u;
-            if (v_depth > 0u) {
-              v_stack_byte = ((v_depth - 1u) / 16u);
-              v_stack_bit = (((v_depth - 1u) & 15u) * 2u);
-              if (0u == (self->private_data.f_stack[v_stack_byte] & (((uint32_t)(1u)) << v_stack_bit))) {
-                v_vminor = 2105377u;
-                v_vminor_alt = 2105378u;
-              } else {
-                v_vminor = 2105409u;
-                v_vminor_alt = 2113570u;
-              }
-            }
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(v_vminor)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            if (v_c_minor == 0u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(v_vminor_alt)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            }
-            v_stack_byte = (v_depth / 16u);
-            v_stack_bit = ((v_depth & 15u) * 2u);
-            self->private_data.f_stack[v_stack_byte] &= (4294967295u ^ (((uint32_t)(3u)) << v_stack_bit));
-            self->private_data.f_container_num_remaining[v_depth] = v_string_length;
-            v_depth += 1u;
-            v_tagged = false;
-            goto label__outer__continue;
-          } else if (v_c_major == 5u) {
-            if (WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor] == 0u) {
-              break;
-            } else if (v_depth >= 1024u) {
-              v_token_length = ((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor]));
-              while ((v_token_length > 0u) && (iop_a_src > io1_a_src)) {
-                iop_a_src--;
-                v_token_length -= 1u;
-              }
-              status = wuffs_base__make_status(wuffs_cbor__error__unsupported_recursion_depth);
-              goto exit;
-            }
-            v_vminor = 2113553u;
-            v_vminor_alt = 2101314u;
-            if (v_depth > 0u) {
-              v_stack_byte = ((v_depth - 1u) / 16u);
-              v_stack_bit = (((v_depth - 1u) & 15u) * 2u);
-              if (0u == (self->private_data.f_stack[v_stack_byte] & (((uint32_t)(1u)) << v_stack_bit))) {
-                v_vminor = 2113569u;
-                v_vminor_alt = 2105410u;
-              } else {
-                v_vminor = 2113601u;
-                v_vminor_alt = 2113602u;
-              }
-            }
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(v_vminor)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            if (v_c_minor == 0u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(v_vminor_alt)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            }
-            v_stack_byte = (v_depth / 16u);
-            v_stack_bit = ((v_depth & 15u) * 2u);
-            self->private_data.f_stack[v_stack_byte] |= (((uint32_t)(3u)) << v_stack_bit);
-            self->private_data.f_container_num_remaining[v_depth] = v_string_length;
-            v_depth += 1u;
-            v_tagged = false;
-            goto label__outer__continue;
-          } else if (v_c_major == 6u) {
-            if (v_c_minor >= 28u) {
-              break;
-            }
-            if (v_string_length < 262144u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(787997u)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) |
-                  (((uint64_t)((4194304u | ((uint32_t)(v_string_length))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            } else {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(787997u)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) |
-                  (((uint64_t)((4194304u | ((uint32_t)((v_string_length >> 46u)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                  (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (~(v_string_length & 70368744177663u) << WUFFS_BASE__TOKEN__VALUE_EXTENSION__SHIFT) |
-                  (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            }
-            v_tagged = true;
-            goto label__outer__continue;
-          } else if (v_c_major == 7u) {
-            if (v_c_minor < 20u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(787997u)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) |
-                  (((uint64_t)((8388608u | ((uint32_t)((v_string_length & 255u)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            } else if (v_c_minor < 24u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(WUFFS_CBOR__LITERALS[(v_c_minor & 3u)])) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            } else if (v_c_minor == 24u) {
-              if (v_string_length < 24u) {
-                if ( ! (iop_a_src > io1_a_src)) {
-                  status = wuffs_base__make_status(wuffs_cbor__error__internal_error_inconsistent_i_o);
-                  goto exit;
-                }
-                iop_a_src--;
-                break;
-              }
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(787997u)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) |
-                  (((uint64_t)((8388608u | ((uint32_t)((v_string_length & 255u)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(2u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            } else if (v_c_minor < 28u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(10490113u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            } else if (v_c_minor == 31u) {
-              if (v_tagged || (v_depth <= 0u)) {
-                break;
-              }
-              v_depth -= 1u;
-              if (self->private_data.f_container_num_remaining[v_depth] != 0u) {
-                break;
-              }
-              v_stack_byte = (v_depth / 16u);
-              v_stack_bit = ((v_depth & 15u) * 2u);
-              v_stack_val = (3u & (self->private_data.f_stack[v_stack_byte] >> v_stack_bit));
-              if (v_stack_val == 1u) {
-                break;
-              }
-              if (v_stack_val != 3u) {
-                v_vminor_alt = 2097186u;
-              } else {
-                v_vminor_alt = 2097218u;
-              }
-              if (v_depth <= 0u) {
-                v_vminor_alt |= 4096u;
-              } else {
-                v_stack_byte = ((v_depth - 1u) / 16u);
-                v_stack_bit = (((v_depth - 1u) & 15u) * 2u);
-                if (0u == (self->private_data.f_stack[v_stack_byte] & (((uint32_t)(1u)) << v_stack_bit))) {
-                  v_vminor_alt |= 8192u;
-                } else {
-                  v_vminor_alt |= 16384u;
-                }
-              }
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(v_vminor_alt)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              goto label__goto_parsed_a_leaf_value__break;
-            }
-          }
-        } while (0);
-        if (iop_a_src > io1_a_src) {
-          iop_a_src--;
-          status = wuffs_base__make_status(wuffs_cbor__error__bad_input);
-          goto exit;
-        }
-        status = wuffs_base__make_status(wuffs_cbor__error__internal_error_inconsistent_i_o);
-        goto exit;
-      }
-      label__goto_parsed_a_leaf_value__break:;
-      v_tagged = false;
-      while (v_depth > 0u) {
-        v_stack_byte = ((v_depth - 1u) / 16u);
-        v_stack_bit = (((v_depth - 1u) & 15u) * 2u);
-        self->private_data.f_stack[v_stack_byte] ^= (((uint32_t)(1u)) << (v_stack_bit + 1u));
-        if (1u == (3u & (self->private_data.f_stack[v_stack_byte] >> v_stack_bit))) {
-          goto label__outer__continue;
-        }
-        if (self->private_data.f_container_num_remaining[(v_depth - 1u)] <= 0u) {
-          goto label__outer__continue;
-        }
-        self->private_data.f_container_num_remaining[(v_depth - 1u)] -= 1u;
-        if (self->private_data.f_container_num_remaining[(v_depth - 1u)] > 0u) {
-          goto label__outer__continue;
-        }
-        while (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
-          continue;
-        }
-        v_depth -= 1u;
-        v_stack_byte = (v_depth / 16u);
-        v_stack_bit = ((v_depth & 15u) * 2u);
-        if (0u == (self->private_data.f_stack[v_stack_byte] & (((uint32_t)(1u)) << v_stack_bit))) {
-          v_vminor_alt = 2097186u;
-        } else {
-          v_vminor_alt = 2097218u;
-        }
-        if (v_depth <= 0u) {
-          v_vminor_alt |= 4096u;
-        } else {
-          v_stack_byte = ((v_depth - 1u) / 16u);
-          v_stack_bit = (((v_depth - 1u) & 15u) * 2u);
-          if (0u == (self->private_data.f_stack[v_stack_byte] & (((uint32_t)(1u)) << v_stack_bit))) {
-            v_vminor_alt |= 8192u;
-          } else {
-            v_vminor_alt |= 16384u;
-          }
-        }
-        *iop_a_dst++ = wuffs_base__make_token(
-            (((uint64_t)(v_vminor_alt)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-            (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-      }
-      break;
-    }
-    self->private_impl.f_end_of_data = true;
-
-    ok:
-    self->private_impl.p_decode_tokens[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_tokens[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-  self->private_data.s_decode_tokens[0].v_string_length = v_string_length;
-  self->private_data.s_decode_tokens[0].v_depth = v_depth;
-  self->private_data.s_decode_tokens[0].v_tagged = v_tagged;
-  self->private_data.s_decode_tokens[0].v_indefinite_string_major_type = v_indefinite_string_major_type;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CBOR)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32)
-
-// ---------------- Status Codes Implementations
-
-// ---------------- Private Consts
-
-static const uint32_t
-WUFFS_CRC32__IEEE_TABLE[16][256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  {
-    0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615, 3915621685, 2657392035,
-    249268274, 2044508324, 3772115230, 2547177864, 162941995, 2125561021, 3887607047, 2428444049,
-    498536548, 1789927666, 4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639,
-    325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465, 4195302755, 2366115317,
-    997073096, 1281953886, 3579855332, 2724688242, 1006888145, 1258607687, 3524101629, 2768942443,
-    901097722, 1119000684, 3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665,
-    651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731, 3485111705, 3099436303,
-    671266974, 1594198024, 3322730930, 2970347812, 795835527, 1483230225, 3244367275, 3060149565,
-    1994146192, 31158534, 2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059,
-    2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813, 2439277719, 3865271297,
-    1802195444, 476864866, 2238001368, 4066508878, 1812370925, 453092731, 2181625025, 4111451223,
-    1706088902, 314042704, 2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405,
-    1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311, 2765210733, 3554079995,
-    1131014506, 879679996, 2909243462, 3663771856, 1141124467, 855842277, 2852801631, 3708648649,
-    1342533948, 654459306, 3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015,
-    1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873, 3082640443, 3233442989,
-    3988292384, 2596254646, 62317068, 1957810842, 3939845945, 2647816111, 81470997, 1943803523,
-    3814918930, 2489596804, 225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377,
-    4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355, 426522225, 1852507879,
-    4275313526, 2312317920, 282753626, 1742555852, 4189708143, 2394877945, 397917763, 1622183637,
-    3604390888, 2714866558, 953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859,
-    3624741850, 2936675148, 906185462, 1090812512, 3747672003, 2825379669, 829329135, 1181335161,
-    3412177804, 3160834842, 628085408, 1382605366, 3423369109, 3138078467, 570562233, 1426400815,
-    3317316542, 2998733608, 733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221,
-    2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151, 1913087877, 83908371,
-    2512341634, 3803740692, 2075208622, 213261112, 2463272603, 3855990285, 2094854071, 198958881,
-    2262029012, 4057260610, 1759359992, 534414190, 2176718541, 4139329115, 1873836001, 414664567,
-    2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745, 1634467795, 376229701,
-    2685067896, 3608007406, 1308918612, 956543938, 2808555105, 3495958263, 1231636301, 1047427035,
-    2932959818, 3654703836, 1088359270, 936918000, 2847714899, 3736837829, 1202900863, 817233897,
-    3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203, 1423857449, 601450431,
-    3009837614, 3294710456, 1567103746, 711928724, 3020668471, 3272380065, 1510334235, 755167117,
-  }, {
-    0, 421212481, 842424962, 724390851, 1684849924, 2105013317, 1448781702, 1329698503,
-    3369699848, 3519200073, 4210026634, 3824474571, 2897563404, 3048111693, 2659397006, 2274893007,
-    1254232657, 1406739216, 2029285587, 1643069842, 783210325, 934667796, 479770071, 92505238,
-    2182846553, 2600511768, 2955803355, 2838940570, 3866582365, 4285295644, 3561045983, 3445231262,
-    2508465314, 2359236067, 2813478432, 3198777185, 4058571174, 3908292839, 3286139684, 3670389349,
-    1566420650, 1145479147, 1869335592, 1987116393, 959540142, 539646703, 185010476, 303839341,
-    3745920755, 3327985586, 3983561841, 4100678960, 3140154359, 2721170102, 2300350837, 2416418868,
-    396344571, 243568058, 631889529, 1018359608, 1945336319, 1793607870, 1103436669, 1490954812,
-    4034481925, 3915546180, 3259968903, 3679722694, 2484439553, 2366552896, 2787371139, 3208174018,
-    950060301, 565965900, 177645455, 328046286, 1556873225, 1171730760, 1861902987, 2011255754,
-    3132841300, 2745199637, 2290958294, 2442530455, 3738671184, 3352078609, 3974232786, 4126854035,
-    1919080284, 1803150877, 1079293406, 1498383519, 370020952, 253043481, 607678682, 1025720731,
-    1711106983, 2095471334, 1472923941, 1322268772, 26324643, 411738082, 866634785, 717028704,
-    2904875439, 3024081134, 2668790573, 2248782444, 3376948395, 3495106026, 4219356713, 3798300520,
-    792689142, 908347575, 487136116, 68299317, 1263779058, 1380486579, 2036719216, 1618931505,
-    3890672638, 4278043327, 3587215740, 3435896893, 2206873338, 2593195963, 2981909624, 2829542713,
-    998479947, 580430090, 162921161, 279890824, 1609522511, 1190423566, 1842954189, 1958874764,
-    4082766403, 3930137346, 3245109441, 3631694208, 2536953671, 2385372678, 2768287173, 3155920004,
-    1900120602, 1750776667, 1131931800, 1517083097, 355290910, 204897887, 656092572, 1040194781,
-    3113746450, 2692952403, 2343461520, 2461357009, 3723805974, 3304059991, 4022511508, 4141455061,
-    2919742697, 3072101800, 2620513899, 2234183466, 3396041197, 3547351212, 4166851439, 3779471918,
-    1725839073, 2143618976, 1424512099, 1307796770, 45282277, 464110244, 813994343, 698327078,
-    3838160568, 4259225593, 3606301754, 3488152955, 2158586812, 2578602749, 2996767038, 2877569151,
-    740041904, 889656817, 506086962, 120682355, 1215357364, 1366020341, 2051441462, 1667084919,
-    3422213966, 3538019855, 4190942668, 3772220557, 2945847882, 3062702859, 2644537544, 2226864521,
-    52649286, 439905287, 823476164, 672009861, 1733269570, 2119477507, 1434057408, 1281543041,
-    2167981343, 2552493150, 3004082077, 2853541596, 3847487515, 4233048410, 3613549209, 3464057816,
-    1239502615, 1358593622, 2077699477, 1657543892, 764250643, 882293586, 532408465, 111204816,
-    1585378284, 1197851309, 1816695150, 1968414767, 974272232, 587794345, 136598634, 289367339,
-    2527558116, 2411481253, 2760973158, 3179948583, 4073438432, 3956313505, 3237863010, 3655790371,
-    347922877, 229101820, 646611775, 1066513022, 1892689081, 1774917112, 1122387515, 1543337850,
-    3697634229, 3313392372, 3998419255, 4148705398, 3087642289, 2702352368, 2319436851, 2468674930,
-  }, {
-    0, 29518391, 59036782, 38190681, 118073564, 114017003, 76381362, 89069189,
-    236147128, 265370511, 228034006, 206958561, 152762724, 148411219, 178138378, 190596925,
-    472294256, 501532999, 530741022, 509615401, 456068012, 451764635, 413917122, 426358261,
-    305525448, 334993663, 296822438, 275991697, 356276756, 352202787, 381193850, 393929805,
-    944588512, 965684439, 1003065998, 973863097, 1061482044, 1049003019, 1019230802, 1023561829,
-    912136024, 933002607, 903529270, 874031361, 827834244, 815125939, 852716522, 856752605,
-    611050896, 631869351, 669987326, 640506825, 593644876, 580921211, 551983394, 556069653,
-    712553512, 733666847, 704405574, 675154545, 762387700, 749958851, 787859610, 792175277,
-    1889177024, 1901651959, 1931368878, 1927033753, 2006131996, 1985040171, 1947726194, 1976933189,
-    2122964088, 2135668303, 2098006038, 2093965857, 2038461604, 2017599123, 2047123658, 2076625661,
-    1824272048, 1836991623, 1866005214, 1861914857, 1807058540, 1786244187, 1748062722, 1777547317,
-    1655668488, 1668093247, 1630251878, 1625932113, 1705433044, 1684323811, 1713505210, 1742760333,
-    1222101792, 1226154263, 1263738702, 1251046777, 1339974652, 1310460363, 1281013650, 1301863845,
-    1187289752, 1191637167, 1161842422, 1149379777, 1103966788, 1074747507, 1112139306, 1133218845,
-    1425107024, 1429406311, 1467333694, 1454888457, 1408811148, 1379576507, 1350309090, 1371438805,
-    1524775400, 1528845279, 1499917702, 1487177649, 1575719220, 1546255107, 1584350554, 1605185389,
-    3778354048, 3774312887, 3803303918, 3816007129, 3862737756, 3892238699, 3854067506, 3833203973,
-    4012263992, 4007927823, 3970080342, 3982554209, 3895452388, 3924658387, 3953866378, 3932773565,
-    4245928176, 4241609415, 4271336606, 4283762345, 4196012076, 4225268251, 4187931714, 4166823541,
-    4076923208, 4072833919, 4035198246, 4047918865, 4094247316, 4123732899, 4153251322, 4132437965,
-    3648544096, 3636082519, 3673983246, 3678331705, 3732010428, 3753090955, 3723829714, 3694611429,
-    3614117080, 3601426159, 3572488374, 3576541825, 3496125444, 3516976691, 3555094634, 3525581405,
-    3311336976, 3298595879, 3336186494, 3340255305, 3260503756, 3281337595, 3251864226, 3222399125,
-    3410866088, 3398419871, 3368647622, 3372945905, 3427010420, 3448139075, 3485520666, 3456284973,
-    2444203584, 2423127159, 2452308526, 2481530905, 2527477404, 2539934891, 2502093554, 2497740997,
-    2679949304, 2659102159, 2620920726, 2650438049, 2562027300, 2574714131, 2603727690, 2599670141,
-    2374579504, 2353749767, 2383274334, 2412743529, 2323684844, 2336421851, 2298759554, 2294686645,
-    2207933576, 2186809023, 2149495014, 2178734801, 2224278612, 2236720739, 2266437690, 2262135309,
-    2850214048, 2820717207, 2858812622, 2879680249, 2934667388, 2938704459, 2909776914, 2897069605,
-    2817622296, 2788420399, 2759153014, 2780249921, 2700618180, 2704950259, 2742877610, 2730399645,
-    3049550800, 3020298727, 3057690558, 3078802825, 2999835404, 3004150075, 2974355298, 2961925461,
-    3151438440, 3121956959, 3092510214, 3113327665, 3168701108, 3172786307, 3210370778, 3197646061,
-  }, {
-    0, 3099354981, 2852767883, 313896942, 2405603159, 937357362, 627793884, 2648127673,
-    3316918511, 2097696650, 1874714724, 3607201537, 1255587768, 4067088605, 3772741427, 1482887254,
-    1343838111, 3903140090, 4195393300, 1118632049, 3749429448, 1741137837, 1970407491, 3452858150,
-    2511175536, 756094997, 1067759611, 2266550430, 449832999, 2725482306, 2965774508, 142231497,
-    2687676222, 412010587, 171665333, 2995192016, 793786473, 2548850444, 2237264098, 1038456711,
-    1703315409, 3711623348, 3482275674, 1999841343, 3940814982, 1381529571, 1089329165, 4166106984,
-    4029413537, 1217896388, 1512189994, 3802027855, 2135519222, 3354724499, 3577784189, 1845280792,
-    899665998, 2367928107, 2677414085, 657096608, 3137160985, 37822588, 284462994, 2823350519,
-    2601801789, 598228824, 824021174, 2309093331, 343330666, 2898962447, 3195996129, 113467524,
-    1587572946, 3860600759, 4104763481, 1276501820, 3519211397, 1769898208, 2076913422, 3279374443,
-    3406630818, 1941006535, 1627703081, 3652755532, 1148164341, 4241751952, 3999682686, 1457141531,
-    247015245, 3053797416, 2763059142, 470583459, 2178658330, 963106687, 735213713, 2473467892,
-    992409347, 2207944806, 2435792776, 697522413, 3024379988, 217581361, 508405983, 2800865210,
-    4271038444, 1177467017, 1419450215, 3962007554, 1911572667, 3377213406, 3690561584, 1665525589,
-    1799331996, 3548628985, 3241568279, 2039091058, 3831314379, 1558270126, 1314193216, 4142438437,
-    2928380019, 372764438, 75645176, 3158189981, 568925988, 2572515393, 2346768303, 861712586,
-    3982079547, 1441124702, 1196457648, 4293663189, 1648042348, 3666298377, 3358779879, 1888390786,
-    686661332, 2421291441, 2196002399, 978858298, 2811169155, 523464422, 226935048, 3040519789,
-    3175145892, 100435649, 390670639, 2952089162, 841119475, 2325614998, 2553003640, 546822429,
-    2029308235, 3225988654, 3539796416, 1782671013, 4153826844, 1328167289, 1570739863, 3844338162,
-    1298864389, 4124540512, 3882013070, 1608431339, 3255406162, 2058742071, 1744848601, 3501990332,
-    2296328682, 811816591, 584513889, 2590678532, 129869501, 3204563416, 2914283062, 352848211,
-    494030490, 2781751807, 3078325777, 264757620, 2450577869, 715964072, 941166918, 2158327331,
-    3636881013, 1618608400, 1926213374, 3396585883, 1470427426, 4011365959, 4255988137, 1158766284,
-    1984818694, 3471935843, 3695453837, 1693991400, 4180638033, 1100160564, 1395044826, 3952793279,
-    3019491049, 189112716, 435162722, 2706139399, 1016811966, 2217162459, 2526189877, 774831696,
-    643086745, 2666061564, 2354934034, 887166583, 2838900430, 294275499, 54519365, 3145957664,
-    3823145334, 1532818963, 1240029693, 4048895640, 1820460577, 3560857924, 3331051178, 2117577167,
-    3598663992, 1858283101, 2088143283, 3301633750, 1495127663, 3785470218, 4078182116, 1269332353,
-    332098007, 2876706482, 3116540252, 25085497, 2628386432, 605395429, 916469259, 2384220526,
-    2254837415, 1054503362, 745528876, 2496903497, 151290352, 2981684885, 2735556987, 464596510,
-    1137851976, 4218313005, 3923506883, 1365741990, 3434129695, 1946996346, 1723425172, 3724871409,
-  }, {
-    0, 1029712304, 2059424608, 1201699536, 4118849216, 3370159984, 2403399072, 2988497936,
-    812665793, 219177585, 1253054625, 2010132753, 3320900865, 4170237105, 3207642721, 2186319825,
-    1625331586, 1568718386, 438355170, 658566482, 2506109250, 2818578674, 4020265506, 3535817618,
-    1351670851, 1844508147, 709922595, 389064339, 2769320579, 2557498163, 3754961379, 3803185235,
-    3250663172, 4238411444, 3137436772, 2254525908, 876710340, 153198708, 1317132964, 1944187668,
-    4054934725, 3436268917, 2339452837, 3054575125, 70369797, 961670069, 2129760613, 1133623509,
-    2703341702, 2621542710, 3689016294, 3867263574, 1419845190, 1774270454, 778128678, 318858390,
-    2438067015, 2888948471, 3952189479, 3606153623, 1691440519, 1504803895, 504432359, 594620247,
-    1492342857, 1704161785, 573770537, 525542041, 2910060169, 2417219385, 3618876905, 3939730521,
-    1753420680, 1440954936, 306397416, 790849880, 2634265928, 2690882808, 3888375336, 3668168600,
-    940822475, 91481723, 1121164459, 2142483739, 3448989963, 4042473659, 3075684971, 2318603227,
-    140739594, 889433530, 1923340138, 1338244826, 4259521226, 3229813626, 2267247018, 3124975642,
-    2570221389, 2756861693, 3824297005, 3734113693, 1823658381, 1372780605, 376603373, 722643805,
-    2839690380, 2485261628, 3548540908, 4007806556, 1556257356, 1638052860, 637716780, 459464860,
-    4191346895, 3300051327, 2199040943, 3195181599, 206718479, 825388991, 1989285231, 1274166495,
-    3382881038, 4106388158, 3009607790, 2382549470, 1008864718, 21111934, 1189240494, 2072147742,
-    2984685714, 2357631266, 3408323570, 4131834434, 1147541074, 2030452706, 1051084082, 63335554,
-    2174155603, 3170292451, 4216760371, 3325460867, 1947622803, 1232499747, 248909555, 867575619,
-    3506841360, 3966111392, 2881909872, 2527485376, 612794832, 434546784, 1581699760, 1663499008,
-    3782634705, 3692447073, 2612412337, 2799048193, 351717905, 697754529, 1849071985, 1398190273,
-    1881644950, 1296545318, 182963446, 931652934, 2242328918, 3100053734, 4284967478, 3255255942,
-    1079497815, 2100821479, 983009079, 133672583, 3050795671, 2293717799, 3474399735, 4067887175,
-    281479188, 765927844, 1778867060, 1466397380, 3846680276, 3626469220, 2676489652, 2733102084,
-    548881365, 500656741, 1517752501, 1729575173, 3577210133, 3898068133, 2952246901, 2459410373,
-    3910527195, 3564487019, 2480257979, 2931134987, 479546907, 569730987, 1716854139, 1530213579,
-    3647316762, 3825568426, 2745561210, 2663766474, 753206746, 293940330, 1445287610, 1799716618,
-    2314567513, 3029685993, 4080348217, 3461678473, 2088098201, 1091956777, 112560889, 1003856713,
-    3112514712, 2229607720, 3276105720, 4263857736, 1275433560, 1902492648, 918929720, 195422344,
-    685033439, 364179055, 1377080511, 1869921551, 3713294623, 3761522863, 2811507327, 2599689167,
-    413436958, 633644462, 1650777982, 1594160846, 3978570462, 3494118254, 2548332990, 2860797966,
-    1211387997, 1968470509, 854852413, 261368461, 3182753437, 2161434413, 3346310653, 4195650637,
-    2017729436, 1160000044, 42223868, 1071931724, 2378480988, 2963576044, 4144295484, 3395602316,
-  }, {
-    0, 3411858341, 1304994059, 2257875630, 2609988118, 1355649459, 3596215069, 486879416,
-    3964895853, 655315400, 2711298918, 1791488195, 2009251963, 3164476382, 973758832, 4048990933,
-    64357019, 3364540734, 1310630800, 2235723829, 2554806413, 1394316072, 3582976390, 517157411,
-    4018503926, 618222419, 2722963965, 1762783832, 1947517664, 3209171269, 970744811, 4068520014,
-    128714038, 3438335635, 1248109629, 2167961496, 2621261600, 1466012805, 3522553387, 447296910,
-    3959392091, 547575038, 2788632144, 1835791861, 1886307661, 3140622056, 1034314822, 4143626211,
-    75106221, 3475428360, 1236444838, 2196665603, 2682996155, 1421317662, 3525567664, 427767573,
-    3895035328, 594892389, 2782995659, 1857943406, 1941489622, 3101955187, 1047553757, 4113347960,
-    257428076, 3288652233, 1116777319, 2311878850, 2496219258, 1603640287, 3640781169, 308099796,
-    3809183745, 676813732, 2932025610, 1704983215, 2023410199, 3016104370, 894593820, 4262377657,
-    210634999, 3352484690, 1095150076, 2316991065, 2535410401, 1547934020, 3671583722, 294336591,
-    3772615322, 729897279, 2903845777, 1716123700, 2068629644, 2953845545, 914647431, 4258839074,
-    150212442, 3282623743, 1161604689, 2388688372, 2472889676, 1480171241, 3735940167, 368132066,
-    3836185911, 805002898, 2842635324, 1647574937, 2134298401, 3026852996, 855535146, 4188192143,
-    186781121, 3229539940, 1189784778, 2377547631, 2427670487, 1542429810, 3715886812, 371670393,
-    3882979244, 741170185, 2864262823, 1642462466, 2095107514, 3082559007, 824732849, 4201955092,
-    514856152, 3589064573, 1400419795, 2552522358, 2233554638, 1316849003, 3370776517, 62202976,
-    4075001525, 968836368, 3207280574, 1954014235, 1769133219, 2720925446, 616199592, 4024870413,
-    493229635, 3594175974, 1353627464, 2616354029, 2264355925, 1303087088, 3409966430, 6498043,
-    4046820398, 979978123, 3170710821, 2007099008, 1789187640, 2717386141, 661419827, 3962610838,
-    421269998, 3527459403, 1423225061, 2676515648, 2190300152, 1238466653, 3477467891, 68755798,
-    4115633027, 1041448998, 3095868040, 1943789869, 1860096405, 2776760880, 588673182, 3897205563,
-    449450869, 3516317904, 1459794558, 2623431131, 2170245475, 1242006214, 3432247400, 131015629,
-    4137259288, 1036337853, 3142660115, 1879958454, 1829294862, 2790523051, 549483013, 3952910752,
-    300424884, 3669282065, 1545650111, 2541513754, 2323209378, 1092980487, 3350330793, 216870412,
-    4256931033, 921128828, 2960342482, 2066738807, 1714085583, 2910195050, 736264132, 3770592353,
-    306060335, 3647131530, 1610005796, 2494197377, 2309971513, 1123257756, 3295149874, 255536279,
-    4268596802, 892423655, 3013951305, 2029645036, 1711070292, 2929725425, 674528607, 3815288570,
-    373562242, 3709388839, 1535949449, 2429577516, 2379569556, 1183418929, 3223189663, 188820282,
-    4195850735, 827017802, 3084859620, 2089020225, 1636228089, 2866415708, 743340786, 3876759895,
-    361896217, 3738094268, 1482340370, 2466671543, 2382584591, 1163888810, 3284924932, 144124321,
-    4190215028, 849168593, 3020503679, 2136336858, 1649465698, 2836138695, 798521449, 3838094284,
-  }, {
-    0, 2792819636, 2543784233, 837294749, 4098827283, 1379413927, 1674589498, 3316072078,
-    871321191, 2509784531, 2758827854, 34034938, 3349178996, 1641505216, 1346337629, 4131942633,
-    1742642382, 3249117050, 4030828007, 1446413907, 2475800797, 904311657, 68069876, 2725880384,
-    1412551337, 4064729373, 3283010432, 1708771380, 2692675258, 101317902, 937551763, 2442587175,
-    3485284764, 1774858792, 1478633653, 4266992385, 1005723023, 2642744891, 2892827814, 169477906,
-    4233263099, 1512406095, 1808623314, 3451546982, 136139752, 2926205020, 2676114113, 972376437,
-    2825102674, 236236518, 1073525883, 2576072655, 1546420545, 4200303349, 3417542760, 1841601500,
-    2609703733, 1039917185, 202635804, 2858742184, 1875103526, 3384067218, 4166835727, 1579931067,
-    1141601657, 3799809741, 3549717584, 1977839588, 2957267306, 372464350, 668680259, 2175552503,
-    2011446046, 3516084394, 3766168119, 1175200131, 2209029901, 635180217, 338955812, 2990736784,
-    601221559, 2242044419, 3024812190, 306049834, 3617246628, 1911408144, 1074125965, 3866285881,
-    272279504, 3058543716, 2275784441, 567459149, 3832906691, 1107462263, 1944752874, 3583875422,
-    2343980261, 767641425, 472473036, 3126744696, 2147051766, 3649987394, 3899029983, 1309766251,
-    3092841090, 506333494, 801510315, 2310084639, 1276520081, 3932237093, 3683203000, 2113813516,
-    3966292011, 1243601823, 2079834370, 3716205238, 405271608, 3192979340, 2411259153, 701492901,
-    3750207052, 2045810168, 1209569125, 4000285905, 734575199, 2378150379, 3159862134, 438345922,
-    2283203314, 778166598, 529136603, 3120492655, 2086260449, 3660498261, 3955679176, 1303499900,
-    3153699989, 495890209, 744928700, 2316418568, 1337360518, 3921775410, 3626602927, 2120129051,
-    4022892092, 1237286280, 2018993941, 3726666913, 461853231, 3186645403, 2350400262, 711936178,
-    3693557851, 2052076527, 1270360434, 3989775046, 677911624, 2384402428, 3220639073, 427820757,
-    1202443118, 3789347034, 3493118535, 1984154099, 3018127229, 362020041, 612099668, 2181885408,
-    1950653705, 3526596285, 3822816288, 1168934804, 2148251930, 645706414, 395618355, 2984485767,
-    544559008, 2248295444, 3085590153, 295523645, 3560598451, 1917673479, 1134918298, 3855773998,
-    328860103, 3052210803, 2214924526, 577903450, 3889505748, 1101147744, 1883911421, 3594338121,
-    3424493451, 1785369663, 1535282850, 4260726038, 944946072, 2653270060, 2949491377, 163225861,
-    4294103532, 1501944408, 1752023237, 3457862513, 196998655, 2915761739, 2619532502, 978710370,
-    2881684293, 229902577, 1012666988, 2586515928, 1603020630, 4193987810, 3356702335, 1852063179,
-    2553040162, 1046169238, 263412747, 2848217023, 1818454321, 3390333573, 4227627032, 1569420204,
-    60859927, 2782375331, 2487203646, 843627658, 4159668740, 1368951216, 1617990445, 3322386585,
-    810543216, 2520310724, 2815490393, 27783917, 3288386659, 1652017111, 1402985802, 4125677310,
-    1685994201, 3255382381, 4091620336, 1435902020, 2419138250, 910562686, 128847843, 2715354199,
-    1469150398, 4058414858, 3222168983, 1719234083, 2749255853, 94984985, 876691844, 2453031472,
-  }, {
-    0, 3433693342, 1109723005, 2391738339, 2219446010, 1222643300, 3329165703, 180685081,
-    3555007413, 525277995, 2445286600, 1567235158, 1471092047, 2600801745, 361370162, 3642757804,
-    2092642603, 2953916853, 1050555990, 4063508168, 4176560081, 878395215, 3134470316, 1987983410,
-    2942184094, 1676945920, 3984272867, 567356797, 722740324, 3887998202, 1764827929, 2778407815,
-    4185285206, 903635656, 3142804779, 2012833205, 2101111980, 2979425330, 1058630609, 4088621903,
-    714308067, 3862526333, 1756790430, 2753330688, 2933487385, 1651734407, 3975966820, 542535930,
-    2244825981, 1231508451, 3353891840, 188896414, 25648519, 3442302233, 1134713594, 2399689316,
-    1445480648, 2592229462, 336416693, 3634843435, 3529655858, 516441772, 2420588879, 1559052753,
-    698204909, 3845636723, 1807271312, 2803025166, 2916600855, 1635634313, 4025666410, 593021940,
-    4202223960, 919787974, 3093159461, 1962401467, 2117261218, 2996361020, 1008193759, 4038971457,
-    1428616134, 2576151384, 386135227, 3685348389, 3513580860, 499580322, 2471098945, 1608776415,
-    2260985971, 1248454893, 3303468814, 139259792, 42591881, 3458459159, 1085071860, 2349261162,
-    3505103035, 474062885, 2463016902, 1583654744, 1419882049, 2550902495, 377792828, 3660491170,
-    51297038, 3483679632, 1093385331, 2374089965, 2269427188, 1273935210, 3311514249, 164344343,
-    2890961296, 1627033870, 4000683757, 585078387, 672833386, 3836780532, 1782552599, 2794821769,
-    2142603813, 3005188795, 1032883544, 4047146438, 4227826911, 928351297, 3118105506, 1970307900,
-    1396409818, 2677114180, 287212199, 3719594553, 3614542624, 467372990, 2505346141, 1509854403,
-    2162073199, 1282711281, 3271268626, 240228748, 76845205, 3359543307, 1186043880, 2317064054,
-    796964081, 3811226735, 1839575948, 2702160658, 2882189835, 1734392469, 3924802934, 625327592,
-    4234522436, 818917338, 3191908409, 1927981223, 2016387518, 3028656416, 973776579, 4137723485,
-    2857232268, 1726474002, 3899187441, 616751215, 772270454, 3803048424, 1814228491, 2693328533,
-    2041117753, 3036871847, 999160644, 4146592730, 4259508931, 826864221, 3217552830, 1936586016,
-    3606501031, 442291769, 2496909786, 1484378436, 1388107869, 2652297411, 278519584, 3694387134,
-    85183762, 3384397196, 1194773103, 2342308593, 2170143720, 1307820918, 3279733909, 265733131,
-    2057717559, 3054258089, 948125770, 4096344276, 4276898253, 843467091, 3167309488, 1885556270,
-    2839764098, 1709792284, 3949353983, 667704161, 755585656, 3785577190, 1865176325, 2743489947,
-    102594076, 3401021058, 1144549729, 2291298815, 2186770662, 1325234296, 3228729243, 215514885,
-    3589828009, 424832311, 2547870420, 1534552650, 1370645331, 2635621325, 328688686, 3745342640,
-    2211456353, 1333405183, 3254067740, 224338562, 127544219, 3408931589, 1170156774, 2299866232,
-    1345666772, 2627681866, 303053225, 3736746295, 3565105198, 416624816, 2522494803, 1525692365,
-    4285207626, 868291796, 3176010551, 1910772649, 2065767088, 3079346734, 956571085, 4121828691,
-    747507711, 3760459617, 1856702594, 2717976604, 2831417605, 1684930971, 3940615800, 642451174,
-  },
-  {
-    0, 393942083, 787884166, 965557445, 1575768332, 1251427663, 1931114890, 1684106697,
-    3151536664, 2896410203, 2502855326, 2186649309, 3862229780, 4048545623, 3368213394, 3753496529,
-    2898281073, 3149616690, 2184604407, 2504883892, 4046197629, 3864463166, 3755621371, 3366006712,
-    387506281, 6550570, 971950319, 781573292, 1257550181, 1569695014, 1677892067, 1937345952,
-    2196865699, 2508887776, 2886183461, 3145514598, 3743273903, 3362179052, 4058774313, 3868258154,
-    958996667, 777139448, 400492605, 10755198, 1690661303, 1941857780, 1244879153, 1565019506,
-    775012562, 961205393, 13101140, 398261271, 1943900638, 1688634781, 1563146584, 1246801179,
-    2515100362, 2190636681, 3139390028, 2892258831, 3355784134, 3749586821, 3874691904, 4052225795,
-    3734110983, 3387496260, 4033096577, 3877584834, 2206093835, 2483373640, 2911402637, 3136515790,
-    1699389727, 1915860316, 1270647193, 1556585946, 950464531, 803071056, 374397077, 19647702,
-    1917993334, 1697207605, 1554278896, 1272937907, 800985210, 952435769, 21510396, 372452543,
-    3381322606, 3740399405, 3883715560, 4027047851, 2489758306, 2199758369, 3130039012, 2917895847,
-    1550025124, 1259902439, 1922410786, 1710144865, 26202280, 385139947, 796522542, 939715693,
-    3887801276, 4039129087, 3377269562, 3728088953, 3126293168, 2905368307, 2493602358, 2212122229,
-    4037264341, 3889747862, 3730172755, 3375300368, 2907673305, 3124004506, 2209987167, 2495786524,
-    1266377165, 1543533966, 1703758155, 1928748296, 379007169, 32253058, 945887303, 790236164,
-    1716846671, 1898845196, 1218652361, 1608006794, 1002000707, 750929152, 357530053, 36990342,
-    3717046871, 3405166100, 4084959953, 3825245842, 2153902939, 2535122712, 2929187805, 3119304606,
-    3398779454, 3723384445, 3831720632, 4078468859, 2541294386, 2147616625, 3113171892, 2935238647,
-    1900929062, 1714877541, 1606142112, 1220599011, 748794154, 1004184937, 39295404, 355241455,
-    3835986668, 4091516591, 3394415210, 3710500393, 3108557792, 2922629027, 2545875814, 2160455461,
-    1601970420, 1208431799, 1904871538, 1727077425, 43020792, 367748539, 744905086, 991776061,
-    1214562461, 1595921630, 1720903707, 1911159896, 361271697, 49513938, 998160663, 738569556,
-    4089209477, 3838277318, 3712633347, 3392233024, 2924491657, 3106613194, 2158369551, 2547846988,
-    3100050248, 2948339467, 2519804878, 2169126797, 3844821572, 4065347079, 3420289730, 3701894785,
-    52404560, 342144275, 770279894, 982687125, 1593045084, 1233708063, 1879431386, 1736363161,
-    336019769, 58479994, 988899775, 764050940, 1240141877, 1586496630, 1729968307, 1885744368,
-    2950685473, 3097818978, 2166999975, 2522013668, 4063474221, 3846743662, 3703937707, 3418263272,
-    976650731, 760059304, 348170605, 62635310, 1742393575, 1889649828, 1227683937, 1582820386,
-    2179867635, 2526361520, 2937588597, 3093503798, 3691148031, 3413731004, 4076100217, 3851374138,
-    2532754330, 2173556697, 3087067932, 2944139103, 3407516310, 3697379029, 3857496592, 4070026835,
-    758014338, 978679233, 64506116, 346250567, 1891774606, 1740186829, 1580472328, 1229917259,
-  }, {
-    0, 4022496062, 83218493, 3946298115, 166436986, 3861498692, 220098631, 3806075769,
-    332873972, 4229245898, 388141257, 4175494135, 440197262, 4127099824, 516501683, 4044053389,
-    665747944, 3362581206, 593187285, 3432594155, 776282514, 3246869164, 716239279, 3312622225,
-    880394524, 3686509090, 814485793, 3746462239, 1033003366, 3528460888, 963096923, 3601193573,
-    1331495888, 2694801646, 1269355501, 2758457555, 1186374570, 2843003028, 1111716759, 2910918825,
-    1552565028, 3007850522, 1484755737, 3082680359, 1432478558, 3131279456, 1368666979, 3193329757,
-    1760789048, 2268195078, 1812353541, 2210675003, 1628971586, 2396670332, 1710092927, 2318375233,
-    2066006732, 2498144754, 2144408305, 2417195471, 1926193846, 2634877320, 1983558283, 2583222709,
-    2662991776, 1903717534, 2588923805, 1972223139, 2538711002, 2022952164, 2477029351, 2087066841,
-    2372749140, 1655647338, 2308478825, 1717238871, 2223433518, 1799654416, 2155034387, 1873894445,
-    3105130056, 1456926070, 3185661557, 1378041163, 2969511474, 1597852940, 3020617231, 1539874097,
-    2864957116, 1157737858, 2922780289, 1106542015, 2737333958, 1290407416, 2816325371, 1210047941,
-    3521578096, 1042640718, 3574781005, 986759027, 3624707082, 936300340, 3707335735, 859512585,
-    3257943172, 770846650, 3334837433, 688390023, 3420185854, 605654976, 3475911875, 552361981,
-    4132013464, 428600998, 4072428965, 494812827, 4288816610, 274747100, 4216845791, 345349857,
-    3852387692, 173846098, 3781891409, 245988975, 3967116566, 62328360, 3900749099, 121822741,
-    3859089665, 164061759, 3807435068, 221426178, 4025395579, 2933317, 3944446278, 81334904,
-    4124199413, 437265099, 4045904328, 518386422, 4231653775, 335250097, 4174133682, 386814604,
-    3249244393, 778691543, 3311294676, 714879978, 3359647891, 662848429, 3434477742, 595039120,
-    3531393053, 1035903779, 3599308832, 961245982, 3684132967, 877986649, 3747788890, 815846244,
-    2841119441, 1184522735, 2913852140, 1114616274, 2696129195, 1332855189, 2756082326, 1266946472,
-    3129952805, 1431118107, 3195705880, 1371074854, 3009735263, 1554415969, 3079748194, 1481855324,
-    2398522169, 1630855175, 2315475716, 1707159610, 2266835779, 1759461501, 2213084030, 1814728768,
-    2636237773, 1927520499, 2580814832, 1981182158, 2496293815, 2064121993, 2420095882, 2147340468,
-    2025787041, 2541577631, 2085281436, 2475210146, 1901375195, 2660681189, 1973518054, 2590184920,
-    1801997909, 2225743211, 1872600680, 2153772374, 1652813359, 2369881361, 1719025170, 2310296876,
-    1594986313, 2966676599, 1541693300, 3022402634, 1459236659, 3107472397, 1376780046, 3184366640,
-    1288097725, 2734990467, 1211309952, 2817619134, 1160605639, 2867791097, 1104723962, 2920993988,
-    937561457, 3626001999, 857201996, 3704993394, 1040821515, 3519792693, 989625654, 3577615880,
-    607473029, 3421972155, 549494200, 3473077894, 769584639, 3256649409, 690699714, 3337180924,
-    273452185, 4287555495, 347692196, 4219156378, 430386403, 4133832669, 491977950, 4069562336,
-    60542061, 3965298515, 124656720, 3903616878, 175139863, 3853649705, 243645482, 3779581716,
-  }, {
-    0, 3247366080, 1483520449, 2581751297, 2967040898, 1901571138, 3904227907, 691737987,
-    3133399365, 2068659845, 3803142276, 589399876, 169513671, 3415493895, 1383475974, 2482566342,
-    2935407819, 1870142219, 4137319690, 924099274, 506443593, 3751897225, 1178799752, 2278412616,
-    339027342, 3585866318, 1280941135, 2379694991, 2766951948, 1700956620, 4236308429, 1024339981,
-    2258407383, 1192382487, 3740284438, 528411094, 910556245, 4157285269, 1848198548, 2946996820,
-    1012887186, 4258378066, 1681119059, 2780629139, 2357599504, 1292419792, 3572147409, 358906641,
-    678054684, 3924071644, 1879503581, 2978491677, 2561882270, 1497229150, 3235873119, 22109855,
-    2460592729, 1395094937, 3401913240, 189516888, 577821147, 3825075739, 2048679962, 3146956762,
-    3595049455, 398902831, 2384764974, 1336573934, 1720805997, 2803873197, 1056822188, 4285729900,
-    1821112490, 2902796138, 887570795, 4117339819, 3696397096, 500978920, 2218668777, 1169222953,
-    2025774372, 3106931428, 550659301, 3780950821, 3362238118, 166293862, 2416645991, 1367722151,
-    3262987361, 66315169, 2584839584, 1537170016, 1923370979, 3005911075, 717813282, 3947244002,
-    1356109368, 2438613496, 146288633, 3375820857, 3759007162, 562248314, 3093388411, 2045739963,
-    3927406461, 731490493, 2994458300, 1945440636, 1523451135, 2604718911, 44219710, 3274466046,
-    4263662323, 1068272947, 2790189874, 1740649714, 1325080945, 2406874801, 379033776, 3608758128,
-    1155642294, 2238671990, 479005303, 3708016055, 4097359924, 901128180, 2891217397, 1843045941,
-    2011248031, 3060787807, 797805662, 3993195422, 3342353949, 112630237, 2673147868, 1591353372,
-    3441611994, 212601626, 2504944923, 1421914843, 2113644376, 3161815192, 630660761, 3826893145,
-    3642224980, 412692116, 2172340373, 1089836885, 1775141590, 2822790422, 832715543, 4029474007,
-    1674842129, 2723860433, 1001957840, 4197873168, 3540870035, 310623315, 2338445906, 1257178514,
-    4051548744, 821257608, 2836464521, 1755307081, 1101318602, 2150241802, 432566283, 3628511179,
-    1270766349, 2318435533, 332587724, 3529260300, 4217841807, 988411727, 2735444302, 1652903566,
-    1602977411, 2651169091, 132630338, 3328776322, 4015131905, 786223809, 3074340032, 1991273216,
-    3846741958, 616972294, 3173262855, 2091579847, 1435626564, 2485072772, 234706309, 3430124101,
-    2712218736, 1613231024, 4190475697, 944458353, 292577266, 3506339890, 1226630707, 2291284467,
-    459984181, 3672380149, 1124496628, 2189994804, 2880683703, 1782407543, 4091479926, 844224694,
-    257943739, 3469817723, 1462980986, 2529005242, 3213269817, 2114471161, 3890881272, 644152632,
-    3046902270, 1947391550, 3991973951, 746483711, 88439420, 3301680572, 1563018173, 2628197501,
-    657826727, 3871046759, 2136545894, 3201811878, 2548879397, 1449267173, 3481299428, 235845156,
-    2650161890, 1551408418, 3315268387, 68429027, 758067552, 3970035360, 1967360161, 3033356129,
-    2311284588, 1213053100, 3517963949, 270598509, 958010606, 4170500910, 1635167535, 2700636911,
-    855672361, 4069415401, 1802256360, 2866995240, 2212099499, 1113008747, 3686091882, 440112042,
-  }, {
-    0, 2611301487, 3963330207, 2006897392, 50740095, 2560849680, 4013794784, 1956178319,
-    101480190, 2645113489, 3929532513, 1905435662, 84561281, 2662269422, 3912356638, 1922342769,
-    202960380, 2545787283, 3760419683, 2072395532, 253679235, 2495322860, 3810871324, 2021655667,
-    169122562, 2444351341, 3861841309, 2106214898, 152215677, 2461527058, 3844685538, 2123133581,
-    405920760, 2207553431, 4094313831, 1873742088, 456646791, 2157096168, 4144791064, 1823027831,
-    507358470, 2241388905, 4060492697, 1772322806, 490444409, 2258557462, 4043311334, 1789215881,
-    338245124, 2408348267, 4161972379, 1672996084, 388959611, 2357870868, 4212429796, 1622269835,
-    304431354, 2306870421, 4263435877, 1706791434, 287538053, 2324051946, 4246267162, 1723705717,
-    811841520, 2881944479, 3696765295, 1207788800, 862293135, 2831204576, 3747484176, 1157324415,
-    913293582, 2915732833, 3662962577, 1106318334, 896137841, 2932651550, 3646055662, 1123494017,
-    1014716940, 2816349795, 3493905555, 1273334012, 1065181555, 2765630748, 3544645612, 1222882179,
-    980888818, 2714919069, 3595350637, 1307180546, 963712909, 2731826146, 3578431762, 1324336509,
-    676490248, 3019317351, 3295277719, 1607253752, 726947703, 2968591128, 3345992168, 1556776327,
-    777919222, 3053147801, 3261432937, 1505806342, 760750473, 3070062054, 3244539670, 1522987897,
-    608862708, 3220163995, 3362856811, 1406423812, 659339915, 3169449700, 3413582868, 1355966587,
-    575076106, 3118709605, 3464325525, 1440228858, 557894773, 3135602714, 3447411434, 1457397381,
-    1623683040, 4217512847, 2365387135, 391757072, 1673614495, 4167309552, 2415577600, 341804655,
-    1724586270, 4251866481, 2331019137, 290835438, 1707942497, 4268256782, 2314648830, 307490961,
-    1826587164, 4152020595, 2162433155, 457265388, 1876539747, 4101829900, 2212636668, 407333779,
-    1792275682, 4051089549, 2263378557, 491595282, 1775619997, 4067460082, 2246988034, 508239213,
-    2029433880, 3813931127, 2496473735, 258500328, 2079362919, 3763716872, 2546668024, 208559511,
-    2130363110, 3848244873, 2462145657, 157552662, 2113730969, 3864638966, 2445764358, 174205801,
-    1961777636, 4014675339, 2564147067, 57707284, 2011718299, 3964481268, 2614361092, 7778411,
-    1927425818, 3913769845, 2665066885, 92077546, 1910772837, 3930150922, 2648673018, 108709525,
-    1352980496, 3405878399, 3164554895, 658115296, 1403183983, 3355946752, 3214507504, 607924639,
-    1453895406, 3440239233, 3130208369, 557218846, 1437504913, 3456883198, 3113552654, 573589345,
-    1555838444, 3340335491, 2961681267, 723707676, 1606028947, 3290383100, 3011612684, 673504355,
-    1521500946, 3239382909, 3062619533, 758026722, 1505130605, 3256038402, 3045975794, 774417053,
-    1217725416, 3543158663, 2762906999, 1057739032, 1267939479, 3493229816, 2812847624, 1007544935,
-    1318679830, 3577493881, 2728586121, 956803046, 1302285929, 3594125830, 2711933174, 973184153,
-    1150152212, 3743982203, 2830528651, 856898788, 1200346475, 3694041348, 2880457716, 806684571,
-    1115789546, 3643069573, 2931426933, 891243034, 1099408277, 3659722746, 2914794762, 907637093,
-  }, {
-    0, 3717650821, 1616688459, 3184159950, 3233376918, 489665299, 2699419613, 2104690264,
-    1510200173, 2274691816, 979330598, 3888758691, 2595928571, 1194090622, 4209380528, 661706037,
-    3020400346, 1771143007, 3562738577, 164481556, 1958661196, 2837976521, 350386439, 3379863682,
-    3993269687, 865250354, 2388181244, 1406015865, 784146209, 4079732388, 1323412074, 2474079215,
-    3011398645, 1860735600, 3542286014, 246687547, 1942430051, 2924607718, 328963112, 3456978349,
-    3917322392, 887832861, 2300653011, 1421341782, 700772878, 4099025803, 1234716485, 2483986112,
-    125431087, 3673109674, 1730500708, 3132326369, 3351283641, 441867836, 2812031730, 2047535991,
-    1568292418, 2163009479, 1025936137, 3769651852, 2646824148, 1079348561, 4255113631, 537475098,
-    3180171691, 1612400686, 3721471200, 4717925, 2100624189, 2694980280, 493375094, 3237910515,
-    3884860102, 974691139, 2278750093, 1514417672, 657926224, 4204917205, 1198234907, 2600289438,
-    160053105, 3558665972, 1775665722, 3024116671, 3375586791, 346391650, 2842683564, 1962488105,
-    1401545756, 2384412057, 869618007, 3997403346, 2469432970, 1319524111, 4083956673, 788193860,
-    250862174, 3546612699, 1856990997, 3006903952, 3461001416, 333211981, 2920678787, 1937824774,
-    1425017139, 2305216694, 883735672, 3912918525, 2487837605, 1239398944, 4095071982, 696455019,
-    3136584836, 1734518017, 3668494799, 121507914, 2051872274, 2816200599, 437363545, 3347544796,
-    3774328809, 1029797484, 2158697122, 1564328743, 542033279, 4258798842, 1074950196, 2642717105,
-    2691310871, 2113731730, 3224801372, 497043929, 1624461185, 3175454212, 9435850, 3709412175,
-    4201248378, 671035391, 2587181873, 1201904308, 986750188, 3880142185, 1519135143, 2266689570,
-    342721485, 3388693064, 1949382278, 2846355203, 3570723163, 155332830, 3028835344, 1763607957,
-    1315852448, 2482538789, 775087595, 4087626862, 2396469814, 1396827059, 4002123645, 857560824,
-    320106210, 3464673127, 1934154665, 2933785132, 3551331444, 238804465, 3018961215, 1852270778,
-    1226292623, 2491507722, 692783300, 4108177729, 2309936921, 1412959900, 3924976210, 879016919,
-    2803091512, 2055541181, 3343875443, 450471158, 1739236014, 3124525867, 133568485, 3663777376,
-    4245691221, 545702608, 2639048222, 1088059291, 1034514883, 3762268230, 1576387720, 2153979149,
-    501724348, 3228659001, 2109407735, 2687359090, 3713981994, 13109167, 3171052385, 1620357860,
-    1206151121, 2591211092, 666423962, 4197321503, 2271022407, 1523307714, 3875649548, 982999433,
-    2850034278, 1953942499, 3384583981, 338329256, 1767471344, 3033506165, 151375291, 3566408766,
-    4091789579, 779425934, 2478797888, 1311354309, 861580189, 4006375960, 1392910038, 2391852883,
-    2929327945, 1930372812, 3469036034, 324244359, 1847629279, 3015068762, 243015828, 3555391761,
-    4103744548, 688715169, 2496043375, 1229996266, 874727090, 3920994103, 1417671673, 2313759356,
-    446585235, 3339223062, 2059594968, 2807313757, 3660002053, 129100416, 3128657486, 1743609803,
-    1084066558, 2634765179, 549535669, 4250396208, 2149900392, 1571961325, 3765982499, 1039043750,
-  }, {
-    0, 2635063670, 3782132909, 2086741467, 430739227, 2225303149, 4173482934, 1707977408,
-    861478454, 2924937024, 3526875803, 1329085421, 720736557, 3086643291, 3415954816, 1452586230,
-    1722956908, 4223524122, 2279405761, 450042295, 2132718455, 3792785921, 2658170842, 58693292,
-    1441473114, 3370435372, 3028674295, 696911745, 1279765825, 3511176247, 2905172460, 807831706,
-    3445913816, 1349228974, 738901109, 2969918723, 3569940419, 1237784245, 900084590, 2829701656,
-    4265436910, 1664255896, 525574723, 2187084597, 3885099509, 2057177219, 117386584, 2616249390,
-    2882946228, 920233410, 1253605401, 3619119471, 2994391983, 796207833, 1393823490, 3457937012,
-    2559531650, 92322804, 2044829231, 3840835417, 2166609305, 472659183, 1615663412, 4249022530,
-    1102706673, 3702920839, 2698457948, 1037619754, 1477802218, 3306854812, 3111894087, 611605809,
-    1927342535, 4025419953, 2475568490, 243387420, 1800169180, 4131620778, 2317525617, 388842247,
-    655084445, 3120835307, 3328511792, 1533734470, 1051149446, 2745738736, 3754524715, 1120297309,
-    340972971, 2304586973, 4114354438, 1748234352, 234773168, 2431761350, 3968900637, 1906278251,
-    2363330345, 299003487, 1840466820, 4038896370, 2507210802, 142532932, 1948239007, 3910149609,
-    3213136159, 579563625, 1592415666, 3286611140, 2787646980, 992477042, 1195825833, 3662232543,
-    3933188933, 2002801203, 184645608, 2517538462, 4089658462, 1858919720, 313391347, 2409765253,
-    3644239219, 1144605701, 945318366, 2773977256, 3231326824, 1570095902, 569697989, 3170568115,
-    2205413346, 511446676, 1646078799, 4279421497, 2598330617, 131105167, 2075239508, 3871229218,
-    2955604436, 757403810, 1363424633, 3427521551, 2844163791, 881434553, 1223211618, 3588709140,
-    3854685070, 2026779384, 78583587, 2577462869, 4235025557, 1633861091, 486774840, 2148301134,
-    3600338360, 1268198606, 938871061, 2868504675, 3476308643, 1379640277, 777684494, 3008718712,
-    1310168890, 3541595724, 2943964055, 846639841, 1471879201, 3400857943, 3067468940, 735723002,
-    2102298892, 3762382970, 2619362721, 19901655, 1692534295, 4193118049, 2240594618, 411247564,
-    681945942, 3047836192, 3385552891, 1422167693, 822682701, 2886124859, 3496468704, 1298661782,
-    469546336, 2264093718, 4203901389, 1738379451, 38812283, 2673859341, 3812556502, 2117148576,
-    3268024339, 1606809957, 598006974, 3198893512, 3680933640, 1181316734, 973624229, 2802299603,
-    4052944421, 1822222163, 285065864, 2381456382, 3896478014, 1966106696, 156323219, 2489232613,
-    2759337087, 964150537, 1159127250, 3625517476, 3184831332, 551242258, 1555722185, 3249901247,
-    2535537225, 170842943, 1984954084, 3946848146, 2391651666, 327308324, 1877176831, 4075589769,
-    263086283, 2460058045, 4005602406, 1942963472, 369291216, 2332888742, 4151061373, 1784924683,
-    1022852861, 2717425547, 3717839440, 1083595558, 626782694, 3092517008, 3291821387, 1497027645,
-    1763466407, 4094934481, 2289211402, 360544636, 1890636732, 3988730570, 2447251217, 215086695,
-    1514488465, 3343557607, 3140191804, 639919946, 1139395978, 3739626748, 2726758695, 1065936977,
-  }, {
-    0, 3120290792, 2827399569, 293431929, 2323408227, 864534155, 586863858, 2600537882,
-    3481914503, 1987188591, 1729068310, 3740575486, 1173727716, 4228805132, 3983743093, 1418249117,
-    1147313999, 4254680231, 3974377182, 1428157750, 3458136620, 2011505092, 1721256893, 3747844181,
-    2347455432, 839944224, 594403929, 2593536433, 26687147, 3094146371, 2836498234, 283794642,
-    2294627998, 826205558, 541298447, 2578994407, 45702141, 3141697557, 2856315500, 331624836,
-    1196225049, 4273416689, 4023010184, 1446090848, 3442513786, 1959480466, 1706436331, 3696098563,
-    3433538001, 1968994873, 1679888448, 3722103720, 1188807858, 4280295258, 3999102243, 1470541515,
-    53374294, 3134568126, 2879970503, 307431215, 2303854645, 816436189, 567589284, 2553242188,
-    3405478781, 1929420949, 1652411116, 3682996484, 1082596894, 4185703926, 3892424591, 1375368295,
-    91404282, 3163122706, 2918450795, 336584067, 2400113305, 922028401, 663249672, 2658384096,
-    2392450098, 929185754, 639587747, 2682555979, 82149713, 3172883129, 2892181696, 362343208,
-    1091578037, 4176212829, 3918960932, 1349337804, 3412872662, 1922537022, 1676344391, 3658557359,
-    1111377379, 4224032267, 3937989746, 1396912026, 3359776896, 1908013928, 1623494929, 3644803833,
-    2377615716, 877417100, 623982837, 2630542109, 130804743, 3190831087, 2941083030, 381060734,
-    106748588, 3215393092, 2933549885, 388083925, 2350956495, 903570471, 614862430, 2640172470,
-    3386185259, 1882115523, 1632872378, 3634920530, 1135178568, 4199721120, 3945775833, 1389631793,
-    1317531835, 4152109907, 3858841898, 1610259138, 3304822232, 2097172016, 1820140617, 3582394273,
-    2165193788, 955639764, 696815021, 2423477829, 192043359, 2995356343, 2750736590, 437203750,
-    182808564, 3005133852, 2724453989, 462947725, 2157513367, 962777471, 673168134, 2447663342,
-    3312231283, 2090301595, 1844056802, 3557935370, 1326499344, 4142603768, 3885397889, 1584245865,
-    3326266917, 2142836173, 1858371508, 3611272284, 1279175494, 4123357358, 3837270743, 1564721471,
-    164299426, 2955991370, 2706223923, 414607579, 2209834945, 978107433, 724686416, 2462715320,
-    2183156074, 1004243586, 715579643, 2472360723, 140260361, 2980573153, 2698675608, 421617264,
-    1302961645, 4099032581, 3845074044, 1557460884, 3352688782, 2116952934, 1867729183, 3601371895,
-    2222754758, 1032278062, 754596439, 2499928511, 234942117, 3086693709, 2793824052, 528319708,
-    1274365761, 4061043881, 3816027856, 1518873912, 3246989858, 2020800970, 1762628531, 3505670235,
-    3223196809, 2045103969, 1754834200, 3512958704, 1247965674, 4086934018, 3806642299, 1528765331,
-    261609486, 3060532198, 2802936223, 518697591, 2246819181, 1007707781, 762121468, 2492913428,
-    213497176, 3041029808, 2755593417, 499441441, 2261110843, 1061030867, 776167850, 2545465922,
-    3274734047, 2060165687, 1807140942, 3528266662, 1229724860, 4038575956, 3788156205, 1479636677,
-    1222322711, 4045468159, 3764231046, 1504067694, 3265744756, 2069664924, 1780612837, 3554288909,
-    2270357136, 1051278712, 802445057, 2519698665, 221152243, 3033880603, 2779263586, 475261322,
-  }, {
-    0, 2926088593, 2275419491, 701019378, 3560000647, 2052709654, 1402038756, 4261017717,
-    1930665807, 3715829470, 4105419308, 1524313021, 2804077512, 155861593, 545453739, 2397726522,
-    3861331614, 1213181711, 1636244477, 3488582252, 840331801, 2625561480, 3048626042, 467584747,
-    2503254481, 995897408, 311723186, 3170637091, 1090907478, 4016929991, 3332753461, 1758288292,
-    390036349, 3109546732, 2426363422, 1056427919, 3272488954, 1835443819, 1152258713, 3938878216,
-    1680663602, 3393484195, 3817652561, 1306808512, 2954733749, 510998820, 935169494, 2580880455,
-    4044899811, 1601229938, 1991794816, 3637571857, 623446372, 2336332021, 2726898695, 216120726,
-    2181814956, 744704829, 95158223, 2881711710, 1446680107, 4166125498, 3516576584, 2146575065,
-    780072698, 2148951915, 2849952665, 129384968, 4199529085, 1411853292, 2112855838, 3548843663,
-    1567451573, 4077254692, 3670887638, 1957027143, 2304517426, 657765539, 251396177, 2694091200,
-    3361327204, 1714510325, 1341779207, 3784408214, 476611811, 2986349938, 2613617024, 899690513,
-    3142211371, 354600634, 1021997640, 2458051545, 1870338988, 3239283261, 3906682575, 1186180958,
-    960597383, 2536053782, 3202459876, 277428597, 3983589632, 1125666961, 1792074851, 3300423154,
-    1246892744, 3829039961, 3455203243, 1671079482, 2657312335, 806080478, 432241452, 3081497277,
-    3748049689, 1896751752, 1489409658, 4138600427, 190316446, 2772397583, 2365053693, 580864876,
-    2893360214, 35503559, 735381813, 2243795108, 2017747153, 3593269568, 4293150130, 1368183843,
-    1560145396, 4069882981, 3680356503, 1966430470, 2295112051, 648294626, 258769936, 2701399425,
-    804156091, 2173100842, 2823706584, 103204425, 4225711676, 1438101421, 2088704863, 3524758222,
-    3134903146, 347226875, 1031468553, 2467456920, 1860935661, 3229814396, 3914054286, 1193487135,
-    3385412645, 1738661300, 1315531078, 3758225623, 502792354, 3012596019, 2589468097, 875607120,
-    1271043721, 3853125400, 3429020650, 1644831355, 2683558414, 832261023, 408158061, 3057348348,
-    953223622, 2528745559, 3211865253, 286899508, 3974120769, 1116263632, 1799381026, 3307794867,
-    2917509143, 59586950, 709201268, 2217549029, 2043995280, 3619452161, 4269064691, 1344032866,
-    3740677976, 1889445577, 1498812987, 4148069290, 180845535, 2762992206, 2372361916, 588238637,
-    1921194766, 3706423967, 4112727661, 1531686908, 2796705673, 148555288, 554857194, 2407195515,
-    26248257, 2952271312, 2251333922, 676868275, 3584149702, 2076793175, 1375858085, 4234771508,
-    2493785488, 986493953, 319029491, 3178008930, 1083533591, 4009621638, 3342158964, 1767759333,
-    3887577823, 1239362382, 1612160956, 3464433197, 864482904, 2649647049, 3022443323, 441336490,
-    1706844275, 3419730402, 3793503504, 1282724993, 2978819316, 535149925, 908921239, 2554697734,
-    380632892, 3100077741, 2433735263, 1063734222, 3265180603, 1828069930, 1161729752, 3948283721,
-    2207997677, 770953084, 71007118, 2857626143, 1470763626, 4190274555, 3490330377, 2120394392,
-    4035494306, 1591758899, 1999168705, 3644880208, 616140069, 2328960180, 2736367686, 225524183,
-  },
-};
-
-static const uint8_t
-WUFFS_CRC32__IEEE_X86_SSE42_K1K2[16] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  212, 43, 68, 84, 1, 0, 0, 0,
-  150, 21, 228, 198, 1, 0, 0, 0,
-};
-
-static const uint8_t
-WUFFS_CRC32__IEEE_X86_SSE42_K3K4[16] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  208, 151, 25, 117, 1, 0, 0, 0,
-  158, 0, 170, 204, 0, 0, 0, 0,
-};
-
-static const uint8_t
-WUFFS_CRC32__IEEE_X86_SSE42_K5ZZ[16] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  36, 97, 205, 99, 1, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const uint8_t
-WUFFS_CRC32__IEEE_X86_SSE42_PXMU[16] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  65, 6, 113, 219, 1, 0, 0, 0,
-  65, 22, 1, 247, 1, 0, 0, 0,
-};
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up__choosy_default(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x);
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up_arm_crc32(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up_x86_avx2(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_64)
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up_x86_sse42(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-
-// ---------------- VTables
-
-const wuffs_base__hasher_u32__func_ptrs
-wuffs_crc32__ieee_hasher__func_ptrs_for__wuffs_base__hasher_u32 = {
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_crc32__ieee_hasher__get_quirk),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_crc32__ieee_hasher__set_quirk),
-  (uint32_t(*)(void*,
-      wuffs_base__slice_u8))(&wuffs_crc32__ieee_hasher__update_u32),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_crc32__ieee_hasher__initialize(
-    wuffs_crc32__ieee_hasher* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.choosy_up = &wuffs_crc32__ieee_hasher__up__choosy_default;
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__hasher_u32.vtable_name =
-      wuffs_base__hasher_u32__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__hasher_u32.function_pointers =
-      (const void*)(&wuffs_crc32__ieee_hasher__func_ptrs_for__wuffs_base__hasher_u32);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_crc32__ieee_hasher*
-wuffs_crc32__ieee_hasher__alloc() {
-  wuffs_crc32__ieee_hasher* x =
-      (wuffs_crc32__ieee_hasher*)(calloc(sizeof(wuffs_crc32__ieee_hasher), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_crc32__ieee_hasher__initialize(
-      x, sizeof(wuffs_crc32__ieee_hasher), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_crc32__ieee_hasher() {
-  return sizeof(wuffs_crc32__ieee_hasher);
-}
-
-// ---------------- Function Implementations
-
-// -------- func crc32.ieee_hasher.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_crc32__ieee_hasher__get_quirk(
-    const wuffs_crc32__ieee_hasher* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func crc32.ieee_hasher.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_crc32__ieee_hasher__set_quirk(
-    wuffs_crc32__ieee_hasher* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func crc32.ieee_hasher.update_u32
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_crc32__ieee_hasher__update_u32(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  if (!self) {
-    return 0;
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return 0;
-  }
-
-  if (self->private_impl.f_state == 0u) {
-    self->private_impl.choosy_up = (
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)
-        wuffs_base__cpu_arch__have_arm_crc32() ? &wuffs_crc32__ieee_hasher__up_arm_crc32 :
-#endif
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-        wuffs_base__cpu_arch__have_x86_avx2() ? &wuffs_crc32__ieee_hasher__up_x86_avx2 :
-#endif
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-        wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_crc32__ieee_hasher__up_x86_sse42 :
-#endif
-        self->private_impl.choosy_up);
-  }
-  wuffs_crc32__ieee_hasher__up(self, a_x);
-  return self->private_impl.f_state;
-}
-
-// -------- func crc32.ieee_hasher.up
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  return (*self->private_impl.choosy_up)(self, a_x);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up__choosy_default(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  uint32_t v_s = 0;
-  wuffs_base__slice_u8 v_p = {0};
-
-  v_s = (4294967295u ^ self->private_impl.f_state);
-  {
-    wuffs_base__slice_u8 i_slice_p = a_x;
-    v_p.ptr = i_slice_p.ptr;
-    v_p.len = 16;
-    uint8_t* i_end0_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 32) * 32);
-    while (v_p.ptr < i_end0_p) {
-      v_s ^= ((((uint32_t)(v_p.ptr[0u])) << 0u) |
-          (((uint32_t)(v_p.ptr[1u])) << 8u) |
-          (((uint32_t)(v_p.ptr[2u])) << 16u) |
-          (((uint32_t)(v_p.ptr[3u])) << 24u));
-      v_s = (WUFFS_CRC32__IEEE_TABLE[0u][v_p.ptr[15u]] ^
-          WUFFS_CRC32__IEEE_TABLE[1u][v_p.ptr[14u]] ^
-          WUFFS_CRC32__IEEE_TABLE[2u][v_p.ptr[13u]] ^
-          WUFFS_CRC32__IEEE_TABLE[3u][v_p.ptr[12u]] ^
-          WUFFS_CRC32__IEEE_TABLE[4u][v_p.ptr[11u]] ^
-          WUFFS_CRC32__IEEE_TABLE[5u][v_p.ptr[10u]] ^
-          WUFFS_CRC32__IEEE_TABLE[6u][v_p.ptr[9u]] ^
-          WUFFS_CRC32__IEEE_TABLE[7u][v_p.ptr[8u]] ^
-          WUFFS_CRC32__IEEE_TABLE[8u][v_p.ptr[7u]] ^
-          WUFFS_CRC32__IEEE_TABLE[9u][v_p.ptr[6u]] ^
-          WUFFS_CRC32__IEEE_TABLE[10u][v_p.ptr[5u]] ^
-          WUFFS_CRC32__IEEE_TABLE[11u][v_p.ptr[4u]] ^
-          WUFFS_CRC32__IEEE_TABLE[12u][(255u & (v_s >> 24u))] ^
-          WUFFS_CRC32__IEEE_TABLE[13u][(255u & (v_s >> 16u))] ^
-          WUFFS_CRC32__IEEE_TABLE[14u][(255u & (v_s >> 8u))] ^
-          WUFFS_CRC32__IEEE_TABLE[15u][(255u & (v_s >> 0u))]);
-      v_p.ptr += 16;
-      v_s ^= ((((uint32_t)(v_p.ptr[0u])) << 0u) |
-          (((uint32_t)(v_p.ptr[1u])) << 8u) |
-          (((uint32_t)(v_p.ptr[2u])) << 16u) |
-          (((uint32_t)(v_p.ptr[3u])) << 24u));
-      v_s = (WUFFS_CRC32__IEEE_TABLE[0u][v_p.ptr[15u]] ^
-          WUFFS_CRC32__IEEE_TABLE[1u][v_p.ptr[14u]] ^
-          WUFFS_CRC32__IEEE_TABLE[2u][v_p.ptr[13u]] ^
-          WUFFS_CRC32__IEEE_TABLE[3u][v_p.ptr[12u]] ^
-          WUFFS_CRC32__IEEE_TABLE[4u][v_p.ptr[11u]] ^
-          WUFFS_CRC32__IEEE_TABLE[5u][v_p.ptr[10u]] ^
-          WUFFS_CRC32__IEEE_TABLE[6u][v_p.ptr[9u]] ^
-          WUFFS_CRC32__IEEE_TABLE[7u][v_p.ptr[8u]] ^
-          WUFFS_CRC32__IEEE_TABLE[8u][v_p.ptr[7u]] ^
-          WUFFS_CRC32__IEEE_TABLE[9u][v_p.ptr[6u]] ^
-          WUFFS_CRC32__IEEE_TABLE[10u][v_p.ptr[5u]] ^
-          WUFFS_CRC32__IEEE_TABLE[11u][v_p.ptr[4u]] ^
-          WUFFS_CRC32__IEEE_TABLE[12u][(255u & (v_s >> 24u))] ^
-          WUFFS_CRC32__IEEE_TABLE[13u][(255u & (v_s >> 16u))] ^
-          WUFFS_CRC32__IEEE_TABLE[14u][(255u & (v_s >> 8u))] ^
-          WUFFS_CRC32__IEEE_TABLE[15u][(255u & (v_s >> 0u))]);
-      v_p.ptr += 16;
-    }
-    v_p.len = 16;
-    uint8_t* i_end1_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 16) * 16);
-    while (v_p.ptr < i_end1_p) {
-      v_s ^= ((((uint32_t)(v_p.ptr[0u])) << 0u) |
-          (((uint32_t)(v_p.ptr[1u])) << 8u) |
-          (((uint32_t)(v_p.ptr[2u])) << 16u) |
-          (((uint32_t)(v_p.ptr[3u])) << 24u));
-      v_s = (WUFFS_CRC32__IEEE_TABLE[0u][v_p.ptr[15u]] ^
-          WUFFS_CRC32__IEEE_TABLE[1u][v_p.ptr[14u]] ^
-          WUFFS_CRC32__IEEE_TABLE[2u][v_p.ptr[13u]] ^
-          WUFFS_CRC32__IEEE_TABLE[3u][v_p.ptr[12u]] ^
-          WUFFS_CRC32__IEEE_TABLE[4u][v_p.ptr[11u]] ^
-          WUFFS_CRC32__IEEE_TABLE[5u][v_p.ptr[10u]] ^
-          WUFFS_CRC32__IEEE_TABLE[6u][v_p.ptr[9u]] ^
-          WUFFS_CRC32__IEEE_TABLE[7u][v_p.ptr[8u]] ^
-          WUFFS_CRC32__IEEE_TABLE[8u][v_p.ptr[7u]] ^
-          WUFFS_CRC32__IEEE_TABLE[9u][v_p.ptr[6u]] ^
-          WUFFS_CRC32__IEEE_TABLE[10u][v_p.ptr[5u]] ^
-          WUFFS_CRC32__IEEE_TABLE[11u][v_p.ptr[4u]] ^
-          WUFFS_CRC32__IEEE_TABLE[12u][(255u & (v_s >> 24u))] ^
-          WUFFS_CRC32__IEEE_TABLE[13u][(255u & (v_s >> 16u))] ^
-          WUFFS_CRC32__IEEE_TABLE[14u][(255u & (v_s >> 8u))] ^
-          WUFFS_CRC32__IEEE_TABLE[15u][(255u & (v_s >> 0u))]);
-      v_p.ptr += 16;
-    }
-    v_p.len = 1;
-    uint8_t* i_end2_p = i_slice_p.ptr + i_slice_p.len;
-    while (v_p.ptr < i_end2_p) {
-      v_s = (WUFFS_CRC32__IEEE_TABLE[0u][(((uint8_t)(v_s)) ^ v_p.ptr[0u])] ^ (v_s >> 8u));
-      v_p.ptr += 1;
-    }
-    v_p.len = 0;
-  }
-  self->private_impl.f_state = (4294967295u ^ v_s);
-  return wuffs_base__make_empty_struct();
-}
-
-// ‼ WUFFS MULTI-FILE SECTION +arm_crc32
-// -------- func crc32.ieee_hasher.up_arm_crc32
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up_arm_crc32(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  wuffs_base__slice_u8 v_p = {0};
-  uint32_t v_s = 0;
-
-  v_s = (4294967295u ^ self->private_impl.f_state);
-  while ((((uint64_t)(a_x.len)) > 0u) && ((15u & ((uint32_t)(0xFFFu & (uintptr_t)(a_x.ptr)))) != 0u)) {
-    v_s = __crc32b(v_s, a_x.ptr[0u]);
-    a_x = wuffs_base__slice_u8__subslice_i(a_x, 1u);
-  }
-  {
-    wuffs_base__slice_u8 i_slice_p = a_x;
-    v_p.ptr = i_slice_p.ptr;
-    v_p.len = 8;
-    uint8_t* i_end0_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 128) * 128);
-    while (v_p.ptr < i_end0_p) {
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-    }
-    v_p.len = 8;
-    uint8_t* i_end1_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 8) * 8);
-    while (v_p.ptr < i_end1_p) {
-      v_s = __crc32d(v_s, wuffs_base__peek_u64le__no_bounds_check(v_p.ptr));
-      v_p.ptr += 8;
-    }
-    v_p.len = 1;
-    uint8_t* i_end2_p = i_slice_p.ptr + i_slice_p.len;
-    while (v_p.ptr < i_end2_p) {
-      v_s = __crc32b(v_s, v_p.ptr[0u]);
-      v_p.ptr += 1;
-    }
-    v_p.len = 0;
-  }
-  self->private_impl.f_state = (4294967295u ^ v_s);
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)
-// ‼ WUFFS MULTI-FILE SECTION -arm_crc32
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_avx2
-// -------- func crc32.ieee_hasher.up_x86_avx2
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up_x86_avx2(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  uint32_t v_s = 0;
-  wuffs_base__slice_u8 v_p = {0};
-  __m128i v_k = {0};
-  __m128i v_x0 = {0};
-  __m128i v_x1 = {0};
-  __m128i v_x2 = {0};
-  __m128i v_x3 = {0};
-  __m128i v_y0 = {0};
-  __m128i v_y1 = {0};
-  __m128i v_y2 = {0};
-  __m128i v_y3 = {0};
-  uint64_t v_tail_index = 0;
-
-  v_s = (4294967295u ^ self->private_impl.f_state);
-  while ((((uint64_t)(a_x.len)) > 0u) && ((15u & ((uint32_t)(0xFFFu & (uintptr_t)(a_x.ptr)))) != 0u)) {
-    v_s = (WUFFS_CRC32__IEEE_TABLE[0u][(((uint8_t)(v_s)) ^ a_x.ptr[0u])] ^ (v_s >> 8u));
-    a_x = wuffs_base__slice_u8__subslice_i(a_x, 1u);
-  }
-  if (((uint64_t)(a_x.len)) < 64u) {
-    {
-      wuffs_base__slice_u8 i_slice_p = a_x;
-      v_p.ptr = i_slice_p.ptr;
-      v_p.len = 1;
-      uint8_t* i_end0_p = i_slice_p.ptr + i_slice_p.len;
-      while (v_p.ptr < i_end0_p) {
-        v_s = (WUFFS_CRC32__IEEE_TABLE[0u][(((uint8_t)(v_s)) ^ v_p.ptr[0u])] ^ (v_s >> 8u));
-        v_p.ptr += 1;
-      }
-      v_p.len = 0;
-    }
-    self->private_impl.f_state = (4294967295u ^ v_s);
-    return wuffs_base__make_empty_struct();
-  }
-  v_x0 = _mm_lddqu_si128((const __m128i*)(const void*)(a_x.ptr + 0u));
-  v_x1 = _mm_lddqu_si128((const __m128i*)(const void*)(a_x.ptr + 16u));
-  v_x2 = _mm_lddqu_si128((const __m128i*)(const void*)(a_x.ptr + 32u));
-  v_x3 = _mm_lddqu_si128((const __m128i*)(const void*)(a_x.ptr + 48u));
-  v_x0 = _mm_xor_si128(v_x0, _mm_cvtsi32_si128((int32_t)(v_s)));
-  v_k = _mm_lddqu_si128((const __m128i*)(const void*)(WUFFS_CRC32__IEEE_X86_SSE42_K1K2));
-  {
-    wuffs_base__slice_u8 i_slice_p = wuffs_base__slice_u8__subslice_i(a_x, 64u);
-    v_p.ptr = i_slice_p.ptr;
-    v_p.len = 64;
-    uint8_t* i_end0_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 64) * 64);
-    while (v_p.ptr < i_end0_p) {
-      v_y0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-      v_y1 = _mm_clmulepi64_si128(v_x1, v_k, (int32_t)(0u));
-      v_y2 = _mm_clmulepi64_si128(v_x2, v_k, (int32_t)(0u));
-      v_y3 = _mm_clmulepi64_si128(v_x3, v_k, (int32_t)(0u));
-      v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(17u));
-      v_x1 = _mm_clmulepi64_si128(v_x1, v_k, (int32_t)(17u));
-      v_x2 = _mm_clmulepi64_si128(v_x2, v_k, (int32_t)(17u));
-      v_x3 = _mm_clmulepi64_si128(v_x3, v_k, (int32_t)(17u));
-      v_x0 = _mm_xor_si128(_mm_xor_si128(v_x0, v_y0), _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr + 0u)));
-      v_x1 = _mm_xor_si128(_mm_xor_si128(v_x1, v_y1), _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr + 16u)));
-      v_x2 = _mm_xor_si128(_mm_xor_si128(v_x2, v_y2), _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr + 32u)));
-      v_x3 = _mm_xor_si128(_mm_xor_si128(v_x3, v_y3), _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr + 48u)));
-      v_p.ptr += 64;
-    }
-    v_p.len = 0;
-  }
-  v_k = _mm_lddqu_si128((const __m128i*)(const void*)(WUFFS_CRC32__IEEE_X86_SSE42_K3K4));
-  v_y0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-  v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(17u));
-  v_x0 = _mm_xor_si128(v_x0, v_x1);
-  v_x0 = _mm_xor_si128(v_x0, v_y0);
-  v_y0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-  v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(17u));
-  v_x0 = _mm_xor_si128(v_x0, v_x2);
-  v_x0 = _mm_xor_si128(v_x0, v_y0);
-  v_y0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-  v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(17u));
-  v_x0 = _mm_xor_si128(v_x0, v_x3);
-  v_x0 = _mm_xor_si128(v_x0, v_y0);
-  v_x1 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(16u));
-  v_x2 = _mm_set_epi32((int32_t)(0u), (int32_t)(4294967295u), (int32_t)(0u), (int32_t)(4294967295u));
-  v_x0 = _mm_srli_si128(v_x0, (int32_t)(8u));
-  v_x0 = _mm_xor_si128(v_x0, v_x1);
-  v_k = _mm_lddqu_si128((const __m128i*)(const void*)(WUFFS_CRC32__IEEE_X86_SSE42_K5ZZ));
-  v_x1 = _mm_srli_si128(v_x0, (int32_t)(4u));
-  v_x0 = _mm_and_si128(v_x0, v_x2);
-  v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-  v_x0 = _mm_xor_si128(v_x0, v_x1);
-  v_k = _mm_lddqu_si128((const __m128i*)(const void*)(WUFFS_CRC32__IEEE_X86_SSE42_PXMU));
-  v_x1 = _mm_and_si128(v_x0, v_x2);
-  v_x1 = _mm_clmulepi64_si128(v_x1, v_k, (int32_t)(16u));
-  v_x1 = _mm_and_si128(v_x1, v_x2);
-  v_x1 = _mm_clmulepi64_si128(v_x1, v_k, (int32_t)(0u));
-  v_x0 = _mm_xor_si128(v_x0, v_x1);
-  v_s = ((uint32_t)(_mm_extract_epi32(v_x0, (int32_t)(1u))));
-  v_tail_index = (((uint64_t)(a_x.len)) & 18446744073709551552u);
-  if (v_tail_index < ((uint64_t)(a_x.len))) {
-    {
-      wuffs_base__slice_u8 i_slice_p = wuffs_base__slice_u8__subslice_i(a_x, v_tail_index);
-      v_p.ptr = i_slice_p.ptr;
-      v_p.len = 1;
-      uint8_t* i_end0_p = i_slice_p.ptr + i_slice_p.len;
-      while (v_p.ptr < i_end0_p) {
-        v_s = (WUFFS_CRC32__IEEE_TABLE[0u][(((uint8_t)(v_s)) ^ v_p.ptr[0u])] ^ (v_s >> 8u));
-        v_p.ptr += 1;
-      }
-      v_p.len = 0;
-    }
-  }
-  self->private_impl.f_state = (4294967295u ^ v_s);
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_64)
-// ‼ WUFFS MULTI-FILE SECTION -x86_avx2
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_sse42
-// -------- func crc32.ieee_hasher.up_x86_sse42
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_crc32__ieee_hasher__up_x86_sse42(
-    wuffs_crc32__ieee_hasher* self,
-    wuffs_base__slice_u8 a_x) {
-  uint32_t v_s = 0;
-  wuffs_base__slice_u8 v_p = {0};
-  __m128i v_k = {0};
-  __m128i v_x0 = {0};
-  __m128i v_x1 = {0};
-  __m128i v_x2 = {0};
-  __m128i v_x3 = {0};
-  __m128i v_y0 = {0};
-  __m128i v_y1 = {0};
-  __m128i v_y2 = {0};
-  __m128i v_y3 = {0};
-  uint64_t v_tail_index = 0;
-
-  v_s = (4294967295u ^ self->private_impl.f_state);
-  while ((((uint64_t)(a_x.len)) > 0u) && ((15u & ((uint32_t)(0xFFFu & (uintptr_t)(a_x.ptr)))) != 0u)) {
-    v_s = (WUFFS_CRC32__IEEE_TABLE[0u][(((uint8_t)(v_s)) ^ a_x.ptr[0u])] ^ (v_s >> 8u));
-    a_x = wuffs_base__slice_u8__subslice_i(a_x, 1u);
-  }
-  if (((uint64_t)(a_x.len)) < 64u) {
-    {
-      wuffs_base__slice_u8 i_slice_p = a_x;
-      v_p.ptr = i_slice_p.ptr;
-      v_p.len = 1;
-      uint8_t* i_end0_p = i_slice_p.ptr + i_slice_p.len;
-      while (v_p.ptr < i_end0_p) {
-        v_s = (WUFFS_CRC32__IEEE_TABLE[0u][(((uint8_t)(v_s)) ^ v_p.ptr[0u])] ^ (v_s >> 8u));
-        v_p.ptr += 1;
-      }
-      v_p.len = 0;
-    }
-    self->private_impl.f_state = (4294967295u ^ v_s);
-    return wuffs_base__make_empty_struct();
-  }
-  v_x0 = _mm_lddqu_si128((const __m128i*)(const void*)(a_x.ptr + 0u));
-  v_x1 = _mm_lddqu_si128((const __m128i*)(const void*)(a_x.ptr + 16u));
-  v_x2 = _mm_lddqu_si128((const __m128i*)(const void*)(a_x.ptr + 32u));
-  v_x3 = _mm_lddqu_si128((const __m128i*)(const void*)(a_x.ptr + 48u));
-  v_x0 = _mm_xor_si128(v_x0, _mm_cvtsi32_si128((int32_t)(v_s)));
-  v_k = _mm_lddqu_si128((const __m128i*)(const void*)(WUFFS_CRC32__IEEE_X86_SSE42_K1K2));
-  {
-    wuffs_base__slice_u8 i_slice_p = wuffs_base__slice_u8__subslice_i(a_x, 64u);
-    v_p.ptr = i_slice_p.ptr;
-    v_p.len = 64;
-    uint8_t* i_end0_p = v_p.ptr + (((i_slice_p.len - (size_t)(v_p.ptr - i_slice_p.ptr)) / 64) * 64);
-    while (v_p.ptr < i_end0_p) {
-      v_y0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-      v_y1 = _mm_clmulepi64_si128(v_x1, v_k, (int32_t)(0u));
-      v_y2 = _mm_clmulepi64_si128(v_x2, v_k, (int32_t)(0u));
-      v_y3 = _mm_clmulepi64_si128(v_x3, v_k, (int32_t)(0u));
-      v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(17u));
-      v_x1 = _mm_clmulepi64_si128(v_x1, v_k, (int32_t)(17u));
-      v_x2 = _mm_clmulepi64_si128(v_x2, v_k, (int32_t)(17u));
-      v_x3 = _mm_clmulepi64_si128(v_x3, v_k, (int32_t)(17u));
-      v_x0 = _mm_xor_si128(_mm_xor_si128(v_x0, v_y0), _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr + 0u)));
-      v_x1 = _mm_xor_si128(_mm_xor_si128(v_x1, v_y1), _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr + 16u)));
-      v_x2 = _mm_xor_si128(_mm_xor_si128(v_x2, v_y2), _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr + 32u)));
-      v_x3 = _mm_xor_si128(_mm_xor_si128(v_x3, v_y3), _mm_lddqu_si128((const __m128i*)(const void*)(v_p.ptr + 48u)));
-      v_p.ptr += 64;
-    }
-    v_p.len = 0;
-  }
-  v_k = _mm_lddqu_si128((const __m128i*)(const void*)(WUFFS_CRC32__IEEE_X86_SSE42_K3K4));
-  v_y0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-  v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(17u));
-  v_x0 = _mm_xor_si128(v_x0, v_x1);
-  v_x0 = _mm_xor_si128(v_x0, v_y0);
-  v_y0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-  v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(17u));
-  v_x0 = _mm_xor_si128(v_x0, v_x2);
-  v_x0 = _mm_xor_si128(v_x0, v_y0);
-  v_y0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-  v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(17u));
-  v_x0 = _mm_xor_si128(v_x0, v_x3);
-  v_x0 = _mm_xor_si128(v_x0, v_y0);
-  v_x1 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(16u));
-  v_x2 = _mm_set_epi32((int32_t)(0u), (int32_t)(4294967295u), (int32_t)(0u), (int32_t)(4294967295u));
-  v_x0 = _mm_srli_si128(v_x0, (int32_t)(8u));
-  v_x0 = _mm_xor_si128(v_x0, v_x1);
-  v_k = _mm_lddqu_si128((const __m128i*)(const void*)(WUFFS_CRC32__IEEE_X86_SSE42_K5ZZ));
-  v_x1 = _mm_srli_si128(v_x0, (int32_t)(4u));
-  v_x0 = _mm_and_si128(v_x0, v_x2);
-  v_x0 = _mm_clmulepi64_si128(v_x0, v_k, (int32_t)(0u));
-  v_x0 = _mm_xor_si128(v_x0, v_x1);
-  v_k = _mm_lddqu_si128((const __m128i*)(const void*)(WUFFS_CRC32__IEEE_X86_SSE42_PXMU));
-  v_x1 = _mm_and_si128(v_x0, v_x2);
-  v_x1 = _mm_clmulepi64_si128(v_x1, v_k, (int32_t)(16u));
-  v_x1 = _mm_and_si128(v_x1, v_x2);
-  v_x1 = _mm_clmulepi64_si128(v_x1, v_k, (int32_t)(0u));
-  v_x0 = _mm_xor_si128(v_x0, v_x1);
-  v_s = ((uint32_t)(_mm_extract_epi32(v_x0, (int32_t)(1u))));
-  v_tail_index = (((uint64_t)(a_x.len)) & 18446744073709551552u);
-  if (v_tail_index < ((uint64_t)(a_x.len))) {
-    {
-      wuffs_base__slice_u8 i_slice_p = wuffs_base__slice_u8__subslice_i(a_x, v_tail_index);
-      v_p.ptr = i_slice_p.ptr;
-      v_p.len = 1;
-      uint8_t* i_end0_p = i_slice_p.ptr + i_slice_p.len;
-      while (v_p.ptr < i_end0_p) {
-        v_s = (WUFFS_CRC32__IEEE_TABLE[0u][(((uint8_t)(v_s)) ^ v_p.ptr[0u])] ^ (v_s >> 8u));
-        v_p.ptr += 1;
-      }
-      v_p.len = 0;
-    }
-  }
-  self->private_impl.f_state = (4294967295u ^ v_s);
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_sse42
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__DEFLATE)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_deflate__error__bad_huffman_code_over_subscribed[] = "#deflate: bad Huffman code (over-subscribed)";
-const char wuffs_deflate__error__bad_huffman_code_under_subscribed[] = "#deflate: bad Huffman code (under-subscribed)";
-const char wuffs_deflate__error__bad_huffman_code_length_count[] = "#deflate: bad Huffman code length count";
-const char wuffs_deflate__error__bad_huffman_code_length_repetition[] = "#deflate: bad Huffman code length repetition";
-const char wuffs_deflate__error__bad_huffman_code[] = "#deflate: bad Huffman code";
-const char wuffs_deflate__error__bad_huffman_minimum_code_length[] = "#deflate: bad Huffman minimum code length";
-const char wuffs_deflate__error__bad_block[] = "#deflate: bad block";
-const char wuffs_deflate__error__bad_distance[] = "#deflate: bad distance";
-const char wuffs_deflate__error__bad_distance_code_count[] = "#deflate: bad distance code count";
-const char wuffs_deflate__error__bad_literal_length_code_count[] = "#deflate: bad literal/length code count";
-const char wuffs_deflate__error__inconsistent_stored_block_length[] = "#deflate: inconsistent stored block length";
-const char wuffs_deflate__error__missing_end_of_block_code[] = "#deflate: missing end-of-block code";
-const char wuffs_deflate__error__no_huffman_codes[] = "#deflate: no Huffman codes";
-const char wuffs_deflate__error__truncated_input[] = "#deflate: truncated input";
-const char wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state[] = "#deflate: internal error: inconsistent Huffman decoder state";
-const char wuffs_deflate__error__internal_error_inconsistent_i_o[] = "#deflate: internal error: inconsistent I/O";
-const char wuffs_deflate__error__internal_error_inconsistent_distance[] = "#deflate: internal error: inconsistent distance";
-const char wuffs_deflate__error__internal_error_inconsistent_n_bits[] = "#deflate: internal error: inconsistent n_bits";
-
-// ---------------- Private Consts
-
-static const uint8_t
-WUFFS_DEFLATE__CODE_ORDER[19] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  16, 17, 18, 0, 8, 7, 9, 6,
-  10, 5, 11, 4, 12, 3, 13, 2,
-  14, 1, 15,
-};
-
-static const uint8_t
-WUFFS_DEFLATE__REVERSE8[256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 128, 64, 192, 32, 160, 96, 224,
-  16, 144, 80, 208, 48, 176, 112, 240,
-  8, 136, 72, 200, 40, 168, 104, 232,
-  24, 152, 88, 216, 56, 184, 120, 248,
-  4, 132, 68, 196, 36, 164, 100, 228,
-  20, 148, 84, 212, 52, 180, 116, 244,
-  12, 140, 76, 204, 44, 172, 108, 236,
-  28, 156, 92, 220, 60, 188, 124, 252,
-  2, 130, 66, 194, 34, 162, 98, 226,
-  18, 146, 82, 210, 50, 178, 114, 242,
-  10, 138, 74, 202, 42, 170, 106, 234,
-  26, 154, 90, 218, 58, 186, 122, 250,
-  6, 134, 70, 198, 38, 166, 102, 230,
-  22, 150, 86, 214, 54, 182, 118, 246,
-  14, 142, 78, 206, 46, 174, 110, 238,
-  30, 158, 94, 222, 62, 190, 126, 254,
-  1, 129, 65, 193, 33, 161, 97, 225,
-  17, 145, 81, 209, 49, 177, 113, 241,
-  9, 137, 73, 201, 41, 169, 105, 233,
-  25, 153, 89, 217, 57, 185, 121, 249,
-  5, 133, 69, 197, 37, 165, 101, 229,
-  21, 149, 85, 213, 53, 181, 117, 245,
-  13, 141, 77, 205, 45, 173, 109, 237,
-  29, 157, 93, 221, 61, 189, 125, 253,
-  3, 131, 67, 195, 35, 163, 99, 227,
-  19, 147, 83, 211, 51, 179, 115, 243,
-  11, 139, 75, 203, 43, 171, 107, 235,
-  27, 155, 91, 219, 59, 187, 123, 251,
-  7, 135, 71, 199, 39, 167, 103, 231,
-  23, 151, 87, 215, 55, 183, 119, 247,
-  15, 143, 79, 207, 47, 175, 111, 239,
-  31, 159, 95, 223, 63, 191, 127, 255,
-};
-
-static const uint32_t
-WUFFS_DEFLATE__LCODE_MAGIC_NUMBERS[32] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  1073741824, 1073742080, 1073742336, 1073742592, 1073742848, 1073743104, 1073743360, 1073743616,
-  1073743888, 1073744400, 1073744912, 1073745424, 1073745952, 1073746976, 1073748000, 1073749024,
-  1073750064, 1073752112, 1073754160, 1073756208, 1073758272, 1073762368, 1073766464, 1073770560,
-  1073774672, 1073782864, 1073791056, 1073799248, 1073807104, 134217728, 134217728, 134217728,
-};
-
-static const uint32_t
-WUFFS_DEFLATE__DCODE_MAGIC_NUMBERS[32] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  1073741824, 1073742080, 1073742336, 1073742592, 1073742864, 1073743376, 1073743904, 1073744928,
-  1073745968, 1073748016, 1073750080, 1073754176, 1073758288, 1073766480, 1073774688, 1073791072,
-  1073807472, 1073840240, 1073873024, 1073938560, 1074004112, 1074135184, 1074266272, 1074528416,
-  1074790576, 1075314864, 1075839168, 1076887744, 1077936336, 1080033488, 134217728, 134217728,
-};
-
-#define WUFFS_DEFLATE__HUFFS_TABLE_SIZE 1024
-
-#define WUFFS_DEFLATE__HUFFS_TABLE_MASK 1023
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__do_transform_io(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_blocks(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_uncompressed(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__init_fixed_huffman(
-    wuffs_deflate__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__init_dynamic_huffman(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__init_huff(
-    wuffs_deflate__decoder* self,
-    uint32_t a_which,
-    uint32_t a_n_codes0,
-    uint32_t a_n_codes1,
-    uint32_t a_base_symbol);
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_bmi2(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_fast32(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_fast64(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_fast64__choosy_default(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_slow(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-// ---------------- VTables
-
-const wuffs_base__io_transformer__func_ptrs
-wuffs_deflate__decoder__func_ptrs_for__wuffs_base__io_transformer = {
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_deflate__decoder__get_quirk),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_deflate__decoder__set_quirk),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__slice_u8))(&wuffs_deflate__decoder__transform_io),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_deflate__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_deflate__decoder__initialize(
-    wuffs_deflate__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.choosy_decode_huffman_fast64 = &wuffs_deflate__decoder__decode_huffman_fast64__choosy_default;
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.vtable_name =
-      wuffs_base__io_transformer__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.function_pointers =
-      (const void*)(&wuffs_deflate__decoder__func_ptrs_for__wuffs_base__io_transformer);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_deflate__decoder*
-wuffs_deflate__decoder__alloc() {
-  wuffs_deflate__decoder* x =
-      (wuffs_deflate__decoder*)(calloc(sizeof(wuffs_deflate__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_deflate__decoder__initialize(
-      x, sizeof(wuffs_deflate__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_deflate__decoder() {
-  return sizeof(wuffs_deflate__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func deflate.decoder.add_history
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_deflate__decoder__add_history(
-    wuffs_deflate__decoder* self,
-    wuffs_base__slice_u8 a_hist) {
-  if (!self) {
-    return wuffs_base__make_empty_struct();
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_empty_struct();
-  }
-
-  wuffs_base__slice_u8 v_s = {0};
-  uint64_t v_n_copied = 0;
-  uint32_t v_already_full = 0;
-
-  v_s = a_hist;
-  if (((uint64_t)(v_s.len)) >= 32768u) {
-    v_s = wuffs_base__slice_u8__suffix(v_s, 32768u);
-    wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8(self->private_data.f_history, 32768), v_s);
-    self->private_impl.f_history_index = 32768u;
-  } else {
-    v_n_copied = wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_history, (self->private_impl.f_history_index & 32767u), 32768), v_s);
-    if (v_n_copied < ((uint64_t)(v_s.len))) {
-      v_s = wuffs_base__slice_u8__subslice_i(v_s, v_n_copied);
-      v_n_copied = wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8(self->private_data.f_history, 32768), v_s);
-      self->private_impl.f_history_index = (((uint32_t)((v_n_copied & 32767u))) + 32768u);
-    } else {
-      v_already_full = 0u;
-      if (self->private_impl.f_history_index >= 32768u) {
-        v_already_full = 32768u;
-      }
-      self->private_impl.f_history_index = ((self->private_impl.f_history_index & 32767u) + ((uint32_t)((v_n_copied & 32767u))) + v_already_full);
-    }
-  }
-  wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_history, 32768, 33025), wuffs_base__make_slice_u8(self->private_data.f_history, 33025));
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func deflate.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_deflate__decoder__get_quirk(
-    const wuffs_deflate__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func deflate.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_deflate__decoder__set_quirk(
-    wuffs_deflate__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func deflate.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_deflate__decoder__workbuf_len(
-    const wuffs_deflate__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(1u, 1u);
-}
-
-// -------- func deflate.decoder.transform_io
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_deflate__decoder__transform_io(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_transform_io[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_deflate__decoder__do_transform_io(self, a_dst, a_src, a_workbuf);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_deflate__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_transform_io[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func deflate.decoder.do_transform_io
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__do_transform_io(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint64_t v_mark = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_transform_io[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    self->private_impl.choosy_decode_huffman_fast64 = (
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-        wuffs_base__cpu_arch__have_x86_bmi2() ? &wuffs_deflate__decoder__decode_huffman_bmi2 :
-#endif
-        self->private_impl.choosy_decode_huffman_fast64);
-    while (true) {
-      v_mark = ((uint64_t)(iop_a_dst - io0_a_dst));
-      {
-        if (a_dst) {
-          a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-        }
-        wuffs_base__status t_0 = wuffs_deflate__decoder__decode_blocks(self, a_dst, a_src);
-        v_status = t_0;
-        if (a_dst) {
-          iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-        }
-      }
-      if ( ! wuffs_base__status__is_suspension(&v_status)) {
-        status = v_status;
-        if (wuffs_base__status__is_error(&status)) {
-          goto exit;
-        } else if (wuffs_base__status__is_suspension(&status)) {
-          status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-          goto exit;
-        }
-        goto ok;
-      }
-      wuffs_base__u64__sat_add_indirect(&self->private_impl.f_transformed_history_count, wuffs_base__io__count_since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst))));
-      wuffs_deflate__decoder__add_history(self, wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst));
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_do_transform_io[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func deflate.decoder.decode_blocks
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_blocks(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_final = 0;
-  uint32_t v_b0 = 0;
-  uint32_t v_type = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_blocks[0];
-  if (coro_susp_point) {
-    v_final = self->private_data.s_decode_blocks[0].v_final;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    label__outer__continue:;
-    while (v_final == 0u) {
-      while (self->private_impl.f_n_bits < 3u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint32_t t_0 = *iop_a_src++;
-          v_b0 = t_0;
-        }
-        self->private_impl.f_bits |= (v_b0 << (self->private_impl.f_n_bits & 3u));
-        self->private_impl.f_n_bits = ((self->private_impl.f_n_bits & 3u) + 8u);
-      }
-      v_final = (self->private_impl.f_bits & 1u);
-      v_type = ((self->private_impl.f_bits >> 1u) & 3u);
-      self->private_impl.f_bits >>= 3u;
-      self->private_impl.f_n_bits -= 3u;
-      if (v_type == 0u) {
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        status = wuffs_deflate__decoder__decode_uncompressed(self, a_dst, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-        continue;
-      } else if (v_type == 1u) {
-        v_status = wuffs_deflate__decoder__init_fixed_huffman(self);
-        if ( ! wuffs_base__status__is_ok(&v_status)) {
-          status = v_status;
-          if (wuffs_base__status__is_error(&status)) {
-            goto exit;
-          } else if (wuffs_base__status__is_suspension(&status)) {
-            status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-            goto exit;
-          }
-          goto ok;
-        }
-      } else if (v_type == 2u) {
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-        status = wuffs_deflate__decoder__init_dynamic_huffman(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-      } else {
-        status = wuffs_base__make_status(wuffs_deflate__error__bad_block);
-        goto exit;
-      }
-      self->private_impl.f_end_of_block = false;
-      while (true) {
-        if (sizeof(void*) == 4u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          v_status = wuffs_deflate__decoder__decode_huffman_fast32(self, a_dst, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-        } else {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          v_status = wuffs_deflate__decoder__decode_huffman_fast64(self, a_dst, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-        }
-        if (wuffs_base__status__is_error(&v_status)) {
-          status = v_status;
-          goto exit;
-        }
-        if (self->private_impl.f_end_of_block) {
-          goto label__outer__continue;
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        status = wuffs_deflate__decoder__decode_huffman_slow(self, a_dst, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-        if (self->private_impl.f_end_of_block) {
-          goto label__outer__continue;
-        }
-      }
-    }
-
-    ok:
-    self->private_impl.p_decode_blocks[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_blocks[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_blocks[0].v_final = v_final;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func deflate.decoder.decode_uncompressed
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_uncompressed(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_length = 0;
-  uint32_t v_n_copied = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_uncompressed[0];
-  if (coro_susp_point) {
-    v_length = self->private_data.s_decode_uncompressed[0].v_length;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_n_bits >= 8u) || ((self->private_impl.f_bits >> (self->private_impl.f_n_bits & 7u)) != 0u)) {
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-      goto exit;
-    }
-    self->private_impl.f_n_bits = 0u;
-    self->private_impl.f_bits = 0u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint32_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_0 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_uncompressed[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_uncompressed[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0;
-          if (num_bits_0 == 24) {
-            t_0 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0)) << 56;
-        }
-      }
-      v_length = t_0;
-    }
-    if ((((v_length) & 0xFFFFu) + ((v_length) >> (32u - 16u))) != 65535u) {
-      status = wuffs_base__make_status(wuffs_deflate__error__inconsistent_stored_block_length);
-      goto exit;
-    }
-    v_length = ((v_length) & 0xFFFFu);
-    while (true) {
-      v_n_copied = wuffs_base__io_writer__limited_copy_u32_from_reader(
-          &iop_a_dst, io2_a_dst,v_length, &iop_a_src, io2_a_src);
-      if (v_length <= v_n_copied) {
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      }
-      v_length -= v_n_copied;
-      if (((uint64_t)(io2_a_dst - iop_a_dst)) == 0u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-      } else {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
-      }
-    }
-
-    ok:
-    self->private_impl.p_decode_uncompressed[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_uncompressed[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_uncompressed[0].v_length = v_length;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func deflate.decoder.init_fixed_huffman
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__init_fixed_huffman(
-    wuffs_deflate__decoder* self) {
-  uint32_t v_i = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  while (v_i < 144u) {
-    self->private_data.f_code_lengths[v_i] = 8u;
-    v_i += 1u;
-  }
-  while (v_i < 256u) {
-    self->private_data.f_code_lengths[v_i] = 9u;
-    v_i += 1u;
-  }
-  while (v_i < 280u) {
-    self->private_data.f_code_lengths[v_i] = 7u;
-    v_i += 1u;
-  }
-  while (v_i < 288u) {
-    self->private_data.f_code_lengths[v_i] = 8u;
-    v_i += 1u;
-  }
-  while (v_i < 320u) {
-    self->private_data.f_code_lengths[v_i] = 5u;
-    v_i += 1u;
-  }
-  v_status = wuffs_deflate__decoder__init_huff(self,
-      0u,
-      0u,
-      288u,
-      257u);
-  if (wuffs_base__status__is_error(&v_status)) {
-    return v_status;
-  }
-  v_status = wuffs_deflate__decoder__init_huff(self,
-      1u,
-      288u,
-      320u,
-      0u);
-  if (wuffs_base__status__is_error(&v_status)) {
-    return v_status;
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func deflate.decoder.init_dynamic_huffman
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__init_dynamic_huffman(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint32_t v_b0 = 0;
-  uint32_t v_n_lit = 0;
-  uint32_t v_n_dist = 0;
-  uint32_t v_n_clen = 0;
-  uint32_t v_i = 0;
-  uint32_t v_b1 = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-  uint32_t v_mask = 0;
-  uint32_t v_table_entry = 0;
-  uint32_t v_table_entry_n_bits = 0;
-  uint32_t v_b2 = 0;
-  uint32_t v_n_extra_bits = 0;
-  uint8_t v_rep_symbol = 0;
-  uint32_t v_rep_count = 0;
-  uint32_t v_b3 = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_init_dynamic_huffman[0];
-  if (coro_susp_point) {
-    v_bits = self->private_data.s_init_dynamic_huffman[0].v_bits;
-    v_n_bits = self->private_data.s_init_dynamic_huffman[0].v_n_bits;
-    v_n_lit = self->private_data.s_init_dynamic_huffman[0].v_n_lit;
-    v_n_dist = self->private_data.s_init_dynamic_huffman[0].v_n_dist;
-    v_n_clen = self->private_data.s_init_dynamic_huffman[0].v_n_clen;
-    v_i = self->private_data.s_init_dynamic_huffman[0].v_i;
-    v_mask = self->private_data.s_init_dynamic_huffman[0].v_mask;
-    v_n_extra_bits = self->private_data.s_init_dynamic_huffman[0].v_n_extra_bits;
-    v_rep_symbol = self->private_data.s_init_dynamic_huffman[0].v_rep_symbol;
-    v_rep_count = self->private_data.s_init_dynamic_huffman[0].v_rep_count;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    v_bits = self->private_impl.f_bits;
-    v_n_bits = self->private_impl.f_n_bits;
-    while (v_n_bits < 14u) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint32_t t_0 = *iop_a_src++;
-        v_b0 = t_0;
-      }
-      v_bits |= (v_b0 << v_n_bits);
-      v_n_bits += 8u;
-    }
-    v_n_lit = (((v_bits) & 0x1Fu) + 257u);
-    if (v_n_lit > 286u) {
-      status = wuffs_base__make_status(wuffs_deflate__error__bad_literal_length_code_count);
-      goto exit;
-    }
-    v_bits >>= 5u;
-    v_n_dist = (((v_bits) & 0x1Fu) + 1u);
-    if (v_n_dist > 30u) {
-      status = wuffs_base__make_status(wuffs_deflate__error__bad_distance_code_count);
-      goto exit;
-    }
-    v_bits >>= 5u;
-    v_n_clen = (((v_bits) & 0xFu) + 4u);
-    v_bits >>= 4u;
-    v_n_bits -= 14u;
-    v_i = 0u;
-    while (v_i < v_n_clen) {
-      while (v_n_bits < 3u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint32_t t_1 = *iop_a_src++;
-          v_b1 = t_1;
-        }
-        v_bits |= (v_b1 << v_n_bits);
-        v_n_bits += 8u;
-      }
-      self->private_data.f_code_lengths[WUFFS_DEFLATE__CODE_ORDER[v_i]] = ((uint8_t)((v_bits & 7u)));
-      v_bits >>= 3u;
-      v_n_bits -= 3u;
-      v_i += 1u;
-    }
-    while (v_i < 19u) {
-      self->private_data.f_code_lengths[WUFFS_DEFLATE__CODE_ORDER[v_i]] = 0u;
-      v_i += 1u;
-    }
-    v_status = wuffs_deflate__decoder__init_huff(self,
-        0u,
-        0u,
-        19u,
-        4095u);
-    if (wuffs_base__status__is_error(&v_status)) {
-      status = v_status;
-      goto exit;
-    }
-    v_mask = ((((uint32_t)(1u)) << self->private_impl.f_n_huffs_bits[0u]) - 1u);
-    v_i = 0u;
-    while (v_i < (v_n_lit + v_n_dist)) {
-      while (true) {
-        v_table_entry = self->private_data.f_huffs[0u][(v_bits & v_mask)];
-        v_table_entry_n_bits = (v_table_entry & 15u);
-        if (v_n_bits >= v_table_entry_n_bits) {
-          v_bits >>= v_table_entry_n_bits;
-          v_n_bits -= v_table_entry_n_bits;
-          break;
-        }
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint32_t t_2 = *iop_a_src++;
-          v_b2 = t_2;
-        }
-        v_bits |= (v_b2 << v_n_bits);
-        v_n_bits += 8u;
-      }
-      if ((v_table_entry >> 24u) != 128u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      }
-      v_table_entry = ((v_table_entry >> 8u) & 255u);
-      if (v_table_entry < 16u) {
-        self->private_data.f_code_lengths[v_i] = ((uint8_t)(v_table_entry));
-        v_i += 1u;
-        continue;
-      }
-      v_n_extra_bits = 0u;
-      v_rep_symbol = 0u;
-      v_rep_count = 0u;
-      if (v_table_entry == 16u) {
-        v_n_extra_bits = 2u;
-        if (v_i <= 0u) {
-          status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code_length_repetition);
-          goto exit;
-        }
-        v_rep_symbol = (self->private_data.f_code_lengths[(v_i - 1u)] & 15u);
-        v_rep_count = 3u;
-      } else if (v_table_entry == 17u) {
-        v_n_extra_bits = 3u;
-        v_rep_symbol = 0u;
-        v_rep_count = 3u;
-      } else if (v_table_entry == 18u) {
-        v_n_extra_bits = 7u;
-        v_rep_symbol = 0u;
-        v_rep_count = 11u;
-      } else {
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      }
-      while (v_n_bits < v_n_extra_bits) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint32_t t_3 = *iop_a_src++;
-          v_b3 = t_3;
-        }
-        v_bits |= (v_b3 << v_n_bits);
-        v_n_bits += 8u;
-      }
-      v_rep_count += ((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U32(v_n_extra_bits));
-      v_bits >>= v_n_extra_bits;
-      v_n_bits -= v_n_extra_bits;
-      while (v_rep_count > 0u) {
-        if (v_i >= (v_n_lit + v_n_dist)) {
-          status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code_length_count);
-          goto exit;
-        }
-        self->private_data.f_code_lengths[v_i] = v_rep_symbol;
-        v_i += 1u;
-        v_rep_count -= 1u;
-      }
-    }
-    if (v_i != (v_n_lit + v_n_dist)) {
-      status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code_length_count);
-      goto exit;
-    }
-    if (self->private_data.f_code_lengths[256u] == 0u) {
-      status = wuffs_base__make_status(wuffs_deflate__error__missing_end_of_block_code);
-      goto exit;
-    }
-    v_status = wuffs_deflate__decoder__init_huff(self,
-        0u,
-        0u,
-        v_n_lit,
-        257u);
-    if (wuffs_base__status__is_error(&v_status)) {
-      status = v_status;
-      goto exit;
-    }
-    v_status = wuffs_deflate__decoder__init_huff(self,
-        1u,
-        v_n_lit,
-        (v_n_lit + v_n_dist),
-        0u);
-    if (wuffs_base__status__is_error(&v_status)) {
-      status = v_status;
-      goto exit;
-    }
-    self->private_impl.f_bits = v_bits;
-    self->private_impl.f_n_bits = v_n_bits;
-
-    goto ok;
-    ok:
-    self->private_impl.p_init_dynamic_huffman[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_init_dynamic_huffman[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_init_dynamic_huffman[0].v_bits = v_bits;
-  self->private_data.s_init_dynamic_huffman[0].v_n_bits = v_n_bits;
-  self->private_data.s_init_dynamic_huffman[0].v_n_lit = v_n_lit;
-  self->private_data.s_init_dynamic_huffman[0].v_n_dist = v_n_dist;
-  self->private_data.s_init_dynamic_huffman[0].v_n_clen = v_n_clen;
-  self->private_data.s_init_dynamic_huffman[0].v_i = v_i;
-  self->private_data.s_init_dynamic_huffman[0].v_mask = v_mask;
-  self->private_data.s_init_dynamic_huffman[0].v_n_extra_bits = v_n_extra_bits;
-  self->private_data.s_init_dynamic_huffman[0].v_rep_symbol = v_rep_symbol;
-  self->private_data.s_init_dynamic_huffman[0].v_rep_count = v_rep_count;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func deflate.decoder.init_huff
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__init_huff(
-    wuffs_deflate__decoder* self,
-    uint32_t a_which,
-    uint32_t a_n_codes0,
-    uint32_t a_n_codes1,
-    uint32_t a_base_symbol) {
-  uint16_t v_counts[16] = {0};
-  uint32_t v_i = 0;
-  uint32_t v_remaining = 0;
-  uint16_t v_offsets[16] = {0};
-  uint32_t v_n_symbols = 0;
-  uint32_t v_count = 0;
-  uint16_t v_symbols[320] = {0};
-  uint32_t v_min_cl = 0;
-  uint32_t v_max_cl = 0;
-  uint32_t v_initial_high_bits = 0;
-  uint32_t v_prev_cl = 0;
-  uint32_t v_prev_redirect_key = 0;
-  uint32_t v_top = 0;
-  uint32_t v_next_top = 0;
-  uint32_t v_code = 0;
-  uint32_t v_key = 0;
-  uint32_t v_value = 0;
-  uint32_t v_cl = 0;
-  uint32_t v_redirect_key = 0;
-  uint32_t v_j = 0;
-  uint32_t v_reversed_key = 0;
-  uint32_t v_symbol = 0;
-  uint32_t v_high_bits = 0;
-  uint32_t v_delta = 0;
-
-  v_i = a_n_codes0;
-  while (v_i < a_n_codes1) {
-    if (v_counts[(self->private_data.f_code_lengths[v_i] & 15u)] >= 320u) {
-      return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-    }
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    v_counts[(self->private_data.f_code_lengths[v_i] & 15u)] += 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-    v_i += 1u;
-  }
-  if ((((uint32_t)(v_counts[0u])) + a_n_codes0) == a_n_codes1) {
-    return wuffs_base__make_status(wuffs_deflate__error__no_huffman_codes);
-  }
-  v_remaining = 1u;
-  v_i = 1u;
-  while (v_i <= 15u) {
-    if (v_remaining > 1073741824u) {
-      return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-    }
-    v_remaining <<= 1u;
-    if (v_remaining < ((uint32_t)(v_counts[v_i]))) {
-      return wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code_over_subscribed);
-    }
-    v_remaining -= ((uint32_t)(v_counts[v_i]));
-    v_i += 1u;
-  }
-  if (v_remaining != 0u) {
-    if ((a_which == 1u) && (v_counts[1u] == 1u) && ((((uint32_t)(v_counts[0u])) + a_n_codes0 + 1u) == a_n_codes1)) {
-      v_i = 0u;
-      while (v_i <= 29u) {
-        if (self->private_data.f_code_lengths[(a_n_codes0 + v_i)] == 1u) {
-          self->private_impl.f_n_huffs_bits[1u] = 1u;
-          self->private_data.f_huffs[1u][0u] = (WUFFS_DEFLATE__DCODE_MAGIC_NUMBERS[v_i] | 1u);
-          self->private_data.f_huffs[1u][1u] = (WUFFS_DEFLATE__DCODE_MAGIC_NUMBERS[31u] | 1u);
-          return wuffs_base__make_status(NULL);
-        }
-        v_i += 1u;
-      }
-    }
-    return wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code_under_subscribed);
-  }
-  v_i = 1u;
-  while (v_i <= 15u) {
-    v_offsets[v_i] = ((uint16_t)(v_n_symbols));
-    v_count = ((uint32_t)(v_counts[v_i]));
-    if (v_n_symbols > (320u - v_count)) {
-      return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-    }
-    v_n_symbols = (v_n_symbols + v_count);
-    v_i += 1u;
-  }
-  if (v_n_symbols > 288u) {
-    return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-  }
-  v_i = a_n_codes0;
-  while (v_i < a_n_codes1) {
-    if (v_i < a_n_codes0) {
-      return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-    }
-    if (self->private_data.f_code_lengths[v_i] != 0u) {
-      if (v_offsets[(self->private_data.f_code_lengths[v_i] & 15u)] >= 320u) {
-        return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-      }
-      v_symbols[v_offsets[(self->private_data.f_code_lengths[v_i] & 15u)]] = ((uint16_t)((v_i - a_n_codes0)));
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-      v_offsets[(self->private_data.f_code_lengths[v_i] & 15u)] += 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-    }
-    v_i += 1u;
-  }
-  v_min_cl = 1u;
-  while (true) {
-    if (v_counts[v_min_cl] != 0u) {
-      break;
-    }
-    if (v_min_cl >= 9u) {
-      return wuffs_base__make_status(wuffs_deflate__error__bad_huffman_minimum_code_length);
-    }
-    v_min_cl += 1u;
-  }
-  v_max_cl = 15u;
-  while (true) {
-    if (v_counts[v_max_cl] != 0u) {
-      break;
-    }
-    if (v_max_cl <= 1u) {
-      return wuffs_base__make_status(wuffs_deflate__error__no_huffman_codes);
-    }
-    v_max_cl -= 1u;
-  }
-  if (v_max_cl <= 9u) {
-    self->private_impl.f_n_huffs_bits[a_which] = v_max_cl;
-  } else {
-    self->private_impl.f_n_huffs_bits[a_which] = 9u;
-  }
-  v_i = 0u;
-  if ((v_n_symbols != ((uint32_t)(v_offsets[v_max_cl]))) || (v_n_symbols != ((uint32_t)(v_offsets[15u])))) {
-    return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-  }
-  if ((a_n_codes0 + ((uint32_t)(v_symbols[0u]))) >= 320u) {
-    return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-  }
-  v_initial_high_bits = 512u;
-  if (v_max_cl < 9u) {
-    v_initial_high_bits = (((uint32_t)(1u)) << v_max_cl);
-  }
-  v_prev_cl = ((uint32_t)((self->private_data.f_code_lengths[(a_n_codes0 + ((uint32_t)(v_symbols[0u])))] & 15u)));
-  v_prev_redirect_key = 4294967295u;
-  v_top = 0u;
-  v_next_top = 512u;
-  v_code = 0u;
-  v_key = 0u;
-  v_value = 0u;
-  while (true) {
-    if ((a_n_codes0 + ((uint32_t)(v_symbols[v_i]))) >= 320u) {
-      return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-    }
-    v_cl = ((uint32_t)((self->private_data.f_code_lengths[(a_n_codes0 + ((uint32_t)(v_symbols[v_i])))] & 15u)));
-    if (v_cl > v_prev_cl) {
-      v_code <<= (v_cl - v_prev_cl);
-      if (v_code >= 32768u) {
-        return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-      }
-    }
-    v_prev_cl = v_cl;
-    v_key = v_code;
-    if (v_cl > 9u) {
-      v_cl -= 9u;
-      v_redirect_key = ((v_key >> v_cl) & 511u);
-      v_key = ((v_key) & WUFFS_BASE__LOW_BITS_MASK__U32(v_cl));
-      if (v_prev_redirect_key != v_redirect_key) {
-        v_prev_redirect_key = v_redirect_key;
-        v_remaining = (((uint32_t)(1u)) << v_cl);
-        v_j = v_prev_cl;
-        while (v_j <= 15u) {
-          if (v_remaining <= ((uint32_t)(v_counts[v_j]))) {
-            break;
-          }
-          v_remaining -= ((uint32_t)(v_counts[v_j]));
-          if (v_remaining > 1073741824u) {
-            return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-          }
-          v_remaining <<= 1u;
-          v_j += 1u;
-        }
-        if ((v_j <= 9u) || (15u < v_j)) {
-          return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        }
-        v_j -= 9u;
-        v_initial_high_bits = (((uint32_t)(1u)) << v_j);
-        v_top = v_next_top;
-        if ((v_top + (((uint32_t)(1u)) << v_j)) > 1024u) {
-          return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        }
-        v_next_top = (v_top + (((uint32_t)(1u)) << v_j));
-        v_redirect_key = (((uint32_t)(WUFFS_DEFLATE__REVERSE8[(v_redirect_key >> 1u)])) | ((v_redirect_key & 1u) << 8u));
-        self->private_data.f_huffs[a_which][v_redirect_key] = (268435465u | (v_top << 8u) | (v_j << 4u));
-      }
-    }
-    if ((v_key >= 512u) || (v_counts[v_prev_cl] <= 0u)) {
-      return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-    }
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    v_counts[v_prev_cl] -= 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-    v_reversed_key = (((uint32_t)(WUFFS_DEFLATE__REVERSE8[(v_key >> 1u)])) | ((v_key & 1u) << 8u));
-    v_reversed_key >>= (9u - v_cl);
-    v_symbol = ((uint32_t)(v_symbols[v_i]));
-    if (v_symbol == 256u) {
-      v_value = (536870912u | v_cl);
-    } else if ((v_symbol < 256u) && (a_which == 0u)) {
-      v_value = (2147483648u | (v_symbol << 8u) | v_cl);
-    } else if (v_symbol >= a_base_symbol) {
-      v_symbol -= a_base_symbol;
-      if (a_which == 0u) {
-        v_value = (WUFFS_DEFLATE__LCODE_MAGIC_NUMBERS[(v_symbol & 31u)] | v_cl);
-      } else {
-        v_value = (WUFFS_DEFLATE__DCODE_MAGIC_NUMBERS[(v_symbol & 31u)] | v_cl);
-      }
-    } else {
-      return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-    }
-    v_high_bits = v_initial_high_bits;
-    v_delta = (((uint32_t)(1u)) << v_cl);
-    while (v_high_bits >= v_delta) {
-      v_high_bits -= v_delta;
-      if ((v_top + ((v_high_bits | v_reversed_key) & 511u)) >= 1024u) {
-        return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-      }
-      self->private_data.f_huffs[a_which][(v_top + ((v_high_bits | v_reversed_key) & 511u))] = v_value;
-    }
-    v_i += 1u;
-    if (v_i >= v_n_symbols) {
-      break;
-    }
-    v_code += 1u;
-    if (v_code >= 32768u) {
-      return wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-    }
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_bmi2
-// -------- func deflate.decoder.decode_huffman_bmi2
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("bmi2")
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_bmi2(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint64_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint32_t v_table_entry = 0;
-  uint32_t v_table_entry_n_bits = 0;
-  uint64_t v_lmask = 0;
-  uint64_t v_dmask = 0;
-  uint32_t v_redir_top = 0;
-  uint32_t v_redir_mask = 0;
-  uint32_t v_length = 0;
-  uint32_t v_dist_minus_1 = 0;
-  uint32_t v_hlen = 0;
-  uint32_t v_hdist = 0;
-  uint32_t v_hdist_adjustment = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  if ((self->private_impl.f_n_bits >= 8u) || ((self->private_impl.f_bits >> (self->private_impl.f_n_bits & 7u)) != 0u)) {
-    status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-    goto exit;
-  }
-  v_bits = ((uint64_t)(self->private_impl.f_bits));
-  v_n_bits = self->private_impl.f_n_bits;
-  v_lmask = ((((uint64_t)(1u)) << self->private_impl.f_n_huffs_bits[0u]) - 1u);
-  v_dmask = ((((uint64_t)(1u)) << self->private_impl.f_n_huffs_bits[1u]) - 1u);
-  if (self->private_impl.f_transformed_history_count < (a_dst ? a_dst->meta.pos : 0u)) {
-    status = wuffs_base__make_status(wuffs_base__error__bad_i_o_position);
-    goto exit;
-  }
-  v_hdist_adjustment = ((uint32_t)((self->private_impl.f_transformed_history_count - (a_dst ? a_dst->meta.pos : 0u))));
-  label__loop__continue:;
-  while ((((uint64_t)(io2_a_dst - iop_a_dst)) >= 266u) && (((uint64_t)(io2_a_src - iop_a_src)) >= 8u)) {
-    v_bits |= ((uint64_t)(wuffs_base__peek_u64le__no_bounds_check(iop_a_src) << (v_n_bits & 63u)));
-    iop_a_src += ((63u - (v_n_bits & 63u)) >> 3u);
-    v_n_bits |= 56u;
-    v_table_entry = self->private_data.f_huffs[0u][(v_bits & v_lmask)];
-    v_table_entry_n_bits = (v_table_entry & 15u);
-    v_bits >>= v_table_entry_n_bits;
-    v_n_bits -= v_table_entry_n_bits;
-    if ((v_table_entry >> 31u) != 0u) {
-      (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, ((uint8_t)((v_table_entry >> 8u)))), iop_a_dst += 1);
-      continue;
-    } else if ((v_table_entry >> 30u) != 0u) {
-    } else if ((v_table_entry >> 29u) != 0u) {
-      self->private_impl.f_end_of_block = true;
-      break;
-    } else if ((v_table_entry >> 28u) != 0u) {
-      v_redir_top = ((v_table_entry >> 8u) & 65535u);
-      v_redir_mask = ((((uint32_t)(1u)) << ((v_table_entry >> 4u) & 15u)) - 1u);
-      v_table_entry = self->private_data.f_huffs[0u][((v_redir_top + (((uint32_t)(v_bits)) & v_redir_mask)) & 1023u)];
-      v_table_entry_n_bits = (v_table_entry & 15u);
-      v_bits >>= v_table_entry_n_bits;
-      v_n_bits -= v_table_entry_n_bits;
-      if ((v_table_entry >> 31u) != 0u) {
-        (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, ((uint8_t)((v_table_entry >> 8u)))), iop_a_dst += 1);
-        continue;
-      } else if ((v_table_entry >> 30u) != 0u) {
-      } else if ((v_table_entry >> 29u) != 0u) {
-        self->private_impl.f_end_of_block = true;
-        break;
-      } else if ((v_table_entry >> 28u) != 0u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      } else if ((v_table_entry >> 27u) != 0u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-        goto exit;
-      } else {
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      }
-    } else if ((v_table_entry >> 27u) != 0u) {
-      status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-      goto exit;
-    } else {
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-      goto exit;
-    }
-    v_length = (((v_table_entry >> 8u) & 255u) + 3u);
-    v_table_entry_n_bits = ((v_table_entry >> 4u) & 15u);
-    if (v_table_entry_n_bits > 0u) {
-      v_length = (((v_length + 253u + ((uint32_t)(((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U64(v_table_entry_n_bits))))) & 255u) + 3u);
-      v_bits >>= v_table_entry_n_bits;
-      v_n_bits -= v_table_entry_n_bits;
-    }
-    v_table_entry = self->private_data.f_huffs[1u][(v_bits & v_dmask)];
-    v_table_entry_n_bits = (v_table_entry & 15u);
-    v_bits >>= v_table_entry_n_bits;
-    v_n_bits -= v_table_entry_n_bits;
-    if ((v_table_entry >> 28u) == 1u) {
-      v_redir_top = ((v_table_entry >> 8u) & 65535u);
-      v_redir_mask = ((((uint32_t)(1u)) << ((v_table_entry >> 4u) & 15u)) - 1u);
-      v_table_entry = self->private_data.f_huffs[1u][((v_redir_top + (((uint32_t)(v_bits)) & v_redir_mask)) & 1023u)];
-      v_table_entry_n_bits = (v_table_entry & 15u);
-      v_bits >>= v_table_entry_n_bits;
-      v_n_bits -= v_table_entry_n_bits;
-    }
-    if ((v_table_entry >> 24u) != 64u) {
-      if ((v_table_entry >> 24u) == 8u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-        goto exit;
-      }
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-      goto exit;
-    }
-    v_dist_minus_1 = ((v_table_entry >> 8u) & 32767u);
-    v_table_entry_n_bits = ((v_table_entry >> 4u) & 15u);
-    v_dist_minus_1 = ((v_dist_minus_1 + ((uint32_t)(((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U64(v_table_entry_n_bits))))) & 32767u);
-    v_bits >>= v_table_entry_n_bits;
-    v_n_bits -= v_table_entry_n_bits;
-    do {
-      if (((uint64_t)((v_dist_minus_1 + 1u))) > ((uint64_t)(iop_a_dst - io0_a_dst))) {
-        v_hlen = 0u;
-        v_hdist = ((uint32_t)((((uint64_t)((v_dist_minus_1 + 1u))) - ((uint64_t)(iop_a_dst - io0_a_dst)))));
-        if (v_length > v_hdist) {
-          v_length -= v_hdist;
-          v_hlen = v_hdist;
-        } else {
-          v_hlen = v_length;
-          v_length = 0u;
-        }
-        v_hdist += v_hdist_adjustment;
-        if (self->private_impl.f_history_index < v_hdist) {
-          status = wuffs_base__make_status(wuffs_deflate__error__bad_distance);
-          goto exit;
-        }
-        wuffs_base__io_writer__limited_copy_u32_from_slice(
-            &iop_a_dst, io2_a_dst,v_hlen, wuffs_base__make_slice_u8_ij(self->private_data.f_history, ((self->private_impl.f_history_index - v_hdist) & 32767u), 33025));
-        if (v_length == 0u) {
-          goto label__loop__continue;
-        }
-        if ((((uint64_t)((v_dist_minus_1 + 1u))) > ((uint64_t)(iop_a_dst - io0_a_dst))) || (((uint64_t)(v_length)) > ((uint64_t)(io2_a_dst - iop_a_dst))) || (((uint64_t)((v_length + 8u))) > ((uint64_t)(io2_a_dst - iop_a_dst)))) {
-          status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_distance);
-          goto exit;
-        }
-      }
-      if ((v_dist_minus_1 + 1u) >= 8u) {
-        wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast(
-            &iop_a_dst, io0_a_dst, io2_a_dst, v_length, (v_dist_minus_1 + 1u));
-      } else if ((v_dist_minus_1 + 1u) == 1u) {
-        wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast(
-            &iop_a_dst, io0_a_dst, io2_a_dst, v_length, (v_dist_minus_1 + 1u));
-      } else {
-        wuffs_base__io_writer__limited_copy_u32_from_history_fast(
-            &iop_a_dst, io0_a_dst, io2_a_dst, v_length, (v_dist_minus_1 + 1u));
-      }
-    } while (0);
-  }
-  if (v_n_bits > 63u) {
-    status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-    goto exit;
-  }
-  while (v_n_bits >= 8u) {
-    v_n_bits -= 8u;
-    if (iop_a_src > io1_a_src) {
-      iop_a_src--;
-    } else {
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_i_o);
-      goto exit;
-    }
-  }
-  self->private_impl.f_bits = ((uint32_t)((v_bits & ((((uint64_t)(1u)) << v_n_bits) - 1u))));
-  self->private_impl.f_n_bits = v_n_bits;
-  if ((self->private_impl.f_n_bits >= 8u) || ((self->private_impl.f_bits >> self->private_impl.f_n_bits) != 0u)) {
-    status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-    goto exit;
-  }
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_bmi2
-
-// -------- func deflate.decoder.decode_huffman_fast32
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_fast32(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint32_t v_table_entry = 0;
-  uint32_t v_table_entry_n_bits = 0;
-  uint32_t v_lmask = 0;
-  uint32_t v_dmask = 0;
-  uint32_t v_redir_top = 0;
-  uint32_t v_redir_mask = 0;
-  uint32_t v_length = 0;
-  uint32_t v_dist_minus_1 = 0;
-  uint32_t v_hlen = 0;
-  uint32_t v_hdist = 0;
-  uint32_t v_hdist_adjustment = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  if ((self->private_impl.f_n_bits >= 8u) || ((self->private_impl.f_bits >> (self->private_impl.f_n_bits & 7u)) != 0u)) {
-    status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-    goto exit;
-  }
-  v_bits = self->private_impl.f_bits;
-  v_n_bits = self->private_impl.f_n_bits;
-  v_lmask = ((((uint32_t)(1u)) << self->private_impl.f_n_huffs_bits[0u]) - 1u);
-  v_dmask = ((((uint32_t)(1u)) << self->private_impl.f_n_huffs_bits[1u]) - 1u);
-  if (self->private_impl.f_transformed_history_count < (a_dst ? a_dst->meta.pos : 0u)) {
-    status = wuffs_base__make_status(wuffs_base__error__bad_i_o_position);
-    goto exit;
-  }
-  v_hdist_adjustment = ((uint32_t)((self->private_impl.f_transformed_history_count - (a_dst ? a_dst->meta.pos : 0u))));
-  label__loop__continue:;
-  while ((((uint64_t)(io2_a_dst - iop_a_dst)) >= 266u) && (((uint64_t)(io2_a_src - iop_a_src)) >= 12u)) {
-    if (v_n_bits < 15u) {
-      v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-      iop_a_src += 1u;
-      v_n_bits += 8u;
-      v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-      iop_a_src += 1u;
-      v_n_bits += 8u;
-    } else {
-    }
-    v_table_entry = self->private_data.f_huffs[0u][(v_bits & v_lmask)];
-    v_table_entry_n_bits = (v_table_entry & 15u);
-    v_bits >>= v_table_entry_n_bits;
-    v_n_bits -= v_table_entry_n_bits;
-    if ((v_table_entry >> 31u) != 0u) {
-      (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, ((uint8_t)((v_table_entry >> 8u)))), iop_a_dst += 1);
-      continue;
-    } else if ((v_table_entry >> 30u) != 0u) {
-    } else if ((v_table_entry >> 29u) != 0u) {
-      self->private_impl.f_end_of_block = true;
-      break;
-    } else if ((v_table_entry >> 28u) != 0u) {
-      if (v_n_bits < 15u) {
-        v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-        iop_a_src += 1u;
-        v_n_bits += 8u;
-        v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-        iop_a_src += 1u;
-        v_n_bits += 8u;
-      } else {
-      }
-      v_redir_top = ((v_table_entry >> 8u) & 65535u);
-      v_redir_mask = ((((uint32_t)(1u)) << ((v_table_entry >> 4u) & 15u)) - 1u);
-      v_table_entry = self->private_data.f_huffs[0u][((v_redir_top + (v_bits & v_redir_mask)) & 1023u)];
-      v_table_entry_n_bits = (v_table_entry & 15u);
-      v_bits >>= v_table_entry_n_bits;
-      v_n_bits -= v_table_entry_n_bits;
-      if ((v_table_entry >> 31u) != 0u) {
-        (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, ((uint8_t)((v_table_entry >> 8u)))), iop_a_dst += 1);
-        continue;
-      } else if ((v_table_entry >> 30u) != 0u) {
-      } else if ((v_table_entry >> 29u) != 0u) {
-        self->private_impl.f_end_of_block = true;
-        break;
-      } else if ((v_table_entry >> 28u) != 0u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      } else if ((v_table_entry >> 27u) != 0u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-        goto exit;
-      } else {
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      }
-    } else if ((v_table_entry >> 27u) != 0u) {
-      status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-      goto exit;
-    } else {
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-      goto exit;
-    }
-    v_length = (((v_table_entry >> 8u) & 255u) + 3u);
-    v_table_entry_n_bits = ((v_table_entry >> 4u) & 15u);
-    if (v_table_entry_n_bits > 0u) {
-      if (v_n_bits < 15u) {
-        v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-        iop_a_src += 1u;
-        v_n_bits += 8u;
-        v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-        iop_a_src += 1u;
-        v_n_bits += 8u;
-      } else {
-      }
-      v_length = (((v_length + 253u + ((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) & 255u) + 3u);
-      v_bits >>= v_table_entry_n_bits;
-      v_n_bits -= v_table_entry_n_bits;
-    } else {
-    }
-    if (v_n_bits < 15u) {
-      v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-      iop_a_src += 1u;
-      v_n_bits += 8u;
-      v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-      iop_a_src += 1u;
-      v_n_bits += 8u;
-    } else {
-    }
-    v_table_entry = self->private_data.f_huffs[1u][(v_bits & v_dmask)];
-    v_table_entry_n_bits = (v_table_entry & 15u);
-    v_bits >>= v_table_entry_n_bits;
-    v_n_bits -= v_table_entry_n_bits;
-    if ((v_table_entry >> 28u) == 1u) {
-      if (v_n_bits < 15u) {
-        v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-        iop_a_src += 1u;
-        v_n_bits += 8u;
-        v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-        iop_a_src += 1u;
-        v_n_bits += 8u;
-      } else {
-      }
-      v_redir_top = ((v_table_entry >> 8u) & 65535u);
-      v_redir_mask = ((((uint32_t)(1u)) << ((v_table_entry >> 4u) & 15u)) - 1u);
-      v_table_entry = self->private_data.f_huffs[1u][((v_redir_top + (v_bits & v_redir_mask)) & 1023u)];
-      v_table_entry_n_bits = (v_table_entry & 15u);
-      v_bits >>= v_table_entry_n_bits;
-      v_n_bits -= v_table_entry_n_bits;
-    } else {
-    }
-    if ((v_table_entry >> 24u) != 64u) {
-      if ((v_table_entry >> 24u) == 8u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-        goto exit;
-      }
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-      goto exit;
-    }
-    v_dist_minus_1 = ((v_table_entry >> 8u) & 32767u);
-    v_table_entry_n_bits = ((v_table_entry >> 4u) & 15u);
-    if (v_n_bits < v_table_entry_n_bits) {
-      v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-      iop_a_src += 1u;
-      v_n_bits += 8u;
-      v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-      iop_a_src += 1u;
-      v_n_bits += 8u;
-    }
-    v_dist_minus_1 = ((v_dist_minus_1 + ((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) & 32767u);
-    v_bits >>= v_table_entry_n_bits;
-    v_n_bits -= v_table_entry_n_bits;
-    do {
-      if (((uint64_t)((v_dist_minus_1 + 1u))) > ((uint64_t)(iop_a_dst - io0_a_dst))) {
-        v_hlen = 0u;
-        v_hdist = ((uint32_t)((((uint64_t)((v_dist_minus_1 + 1u))) - ((uint64_t)(iop_a_dst - io0_a_dst)))));
-        if (v_length > v_hdist) {
-          v_length -= v_hdist;
-          v_hlen = v_hdist;
-        } else {
-          v_hlen = v_length;
-          v_length = 0u;
-        }
-        v_hdist += v_hdist_adjustment;
-        if (self->private_impl.f_history_index < v_hdist) {
-          status = wuffs_base__make_status(wuffs_deflate__error__bad_distance);
-          goto exit;
-        }
-        wuffs_base__io_writer__limited_copy_u32_from_slice(
-            &iop_a_dst, io2_a_dst,v_hlen, wuffs_base__make_slice_u8_ij(self->private_data.f_history, ((self->private_impl.f_history_index - v_hdist) & 32767u), 33025));
-        if (v_length == 0u) {
-          goto label__loop__continue;
-        }
-        if ((((uint64_t)((v_dist_minus_1 + 1u))) > ((uint64_t)(iop_a_dst - io0_a_dst))) || (((uint64_t)(v_length)) > ((uint64_t)(io2_a_dst - iop_a_dst))) || (((uint64_t)((v_length + 8u))) > ((uint64_t)(io2_a_dst - iop_a_dst)))) {
-          status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_distance);
-          goto exit;
-        }
-      }
-      if ((v_dist_minus_1 + 1u) >= 8u) {
-        wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast(
-            &iop_a_dst, io0_a_dst, io2_a_dst, v_length, (v_dist_minus_1 + 1u));
-      } else {
-        wuffs_base__io_writer__limited_copy_u32_from_history_fast(
-            &iop_a_dst, io0_a_dst, io2_a_dst, v_length, (v_dist_minus_1 + 1u));
-      }
-    } while (0);
-  }
-  while (v_n_bits >= 8u) {
-    v_n_bits -= 8u;
-    if (iop_a_src > io1_a_src) {
-      iop_a_src--;
-    } else {
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_i_o);
-      goto exit;
-    }
-  }
-  self->private_impl.f_bits = (v_bits & ((((uint32_t)(1u)) << v_n_bits) - 1u));
-  self->private_impl.f_n_bits = v_n_bits;
-  if ((self->private_impl.f_n_bits >= 8u) || ((self->private_impl.f_bits >> self->private_impl.f_n_bits) != 0u)) {
-    status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-    goto exit;
-  }
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func deflate.decoder.decode_huffman_fast64
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_fast64(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  return (*self->private_impl.choosy_decode_huffman_fast64)(self, a_dst, a_src);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_fast64__choosy_default(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint64_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint32_t v_table_entry = 0;
-  uint32_t v_table_entry_n_bits = 0;
-  uint64_t v_lmask = 0;
-  uint64_t v_dmask = 0;
-  uint32_t v_redir_top = 0;
-  uint32_t v_redir_mask = 0;
-  uint32_t v_length = 0;
-  uint32_t v_dist_minus_1 = 0;
-  uint32_t v_hlen = 0;
-  uint32_t v_hdist = 0;
-  uint32_t v_hdist_adjustment = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  if ((self->private_impl.f_n_bits >= 8u) || ((self->private_impl.f_bits >> (self->private_impl.f_n_bits & 7u)) != 0u)) {
-    status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-    goto exit;
-  }
-  v_bits = ((uint64_t)(self->private_impl.f_bits));
-  v_n_bits = self->private_impl.f_n_bits;
-  v_lmask = ((((uint64_t)(1u)) << self->private_impl.f_n_huffs_bits[0u]) - 1u);
-  v_dmask = ((((uint64_t)(1u)) << self->private_impl.f_n_huffs_bits[1u]) - 1u);
-  if (self->private_impl.f_transformed_history_count < (a_dst ? a_dst->meta.pos : 0u)) {
-    status = wuffs_base__make_status(wuffs_base__error__bad_i_o_position);
-    goto exit;
-  }
-  v_hdist_adjustment = ((uint32_t)((self->private_impl.f_transformed_history_count - (a_dst ? a_dst->meta.pos : 0u))));
-  label__loop__continue:;
-  while ((((uint64_t)(io2_a_dst - iop_a_dst)) >= 266u) && (((uint64_t)(io2_a_src - iop_a_src)) >= 8u)) {
-    v_bits |= ((uint64_t)(wuffs_base__peek_u64le__no_bounds_check(iop_a_src) << (v_n_bits & 63u)));
-    iop_a_src += ((63u - (v_n_bits & 63u)) >> 3u);
-    v_n_bits |= 56u;
-    v_table_entry = self->private_data.f_huffs[0u][(v_bits & v_lmask)];
-    v_table_entry_n_bits = (v_table_entry & 15u);
-    v_bits >>= v_table_entry_n_bits;
-    v_n_bits -= v_table_entry_n_bits;
-    if ((v_table_entry >> 31u) != 0u) {
-      (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, ((uint8_t)((v_table_entry >> 8u)))), iop_a_dst += 1);
-      continue;
-    } else if ((v_table_entry >> 30u) != 0u) {
-    } else if ((v_table_entry >> 29u) != 0u) {
-      self->private_impl.f_end_of_block = true;
-      break;
-    } else if ((v_table_entry >> 28u) != 0u) {
-      v_redir_top = ((v_table_entry >> 8u) & 65535u);
-      v_redir_mask = ((((uint32_t)(1u)) << ((v_table_entry >> 4u) & 15u)) - 1u);
-      v_table_entry = self->private_data.f_huffs[0u][((v_redir_top + (((uint32_t)(v_bits)) & v_redir_mask)) & 1023u)];
-      v_table_entry_n_bits = (v_table_entry & 15u);
-      v_bits >>= v_table_entry_n_bits;
-      v_n_bits -= v_table_entry_n_bits;
-      if ((v_table_entry >> 31u) != 0u) {
-        (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, ((uint8_t)((v_table_entry >> 8u)))), iop_a_dst += 1);
-        continue;
-      } else if ((v_table_entry >> 30u) != 0u) {
-      } else if ((v_table_entry >> 29u) != 0u) {
-        self->private_impl.f_end_of_block = true;
-        break;
-      } else if ((v_table_entry >> 28u) != 0u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      } else if ((v_table_entry >> 27u) != 0u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-        goto exit;
-      } else {
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      }
-    } else if ((v_table_entry >> 27u) != 0u) {
-      status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-      goto exit;
-    } else {
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-      goto exit;
-    }
-    v_length = (((v_table_entry >> 8u) & 255u) + 3u);
-    v_table_entry_n_bits = ((v_table_entry >> 4u) & 15u);
-    if (v_table_entry_n_bits > 0u) {
-      v_length = (((v_length + 253u + ((uint32_t)(((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U64(v_table_entry_n_bits))))) & 255u) + 3u);
-      v_bits >>= v_table_entry_n_bits;
-      v_n_bits -= v_table_entry_n_bits;
-    }
-    v_table_entry = self->private_data.f_huffs[1u][(v_bits & v_dmask)];
-    v_table_entry_n_bits = (v_table_entry & 15u);
-    v_bits >>= v_table_entry_n_bits;
-    v_n_bits -= v_table_entry_n_bits;
-    if ((v_table_entry >> 28u) == 1u) {
-      v_redir_top = ((v_table_entry >> 8u) & 65535u);
-      v_redir_mask = ((((uint32_t)(1u)) << ((v_table_entry >> 4u) & 15u)) - 1u);
-      v_table_entry = self->private_data.f_huffs[1u][((v_redir_top + (((uint32_t)(v_bits)) & v_redir_mask)) & 1023u)];
-      v_table_entry_n_bits = (v_table_entry & 15u);
-      v_bits >>= v_table_entry_n_bits;
-      v_n_bits -= v_table_entry_n_bits;
-    }
-    if ((v_table_entry >> 24u) != 64u) {
-      if ((v_table_entry >> 24u) == 8u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-        goto exit;
-      }
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-      goto exit;
-    }
-    v_dist_minus_1 = ((v_table_entry >> 8u) & 32767u);
-    v_table_entry_n_bits = ((v_table_entry >> 4u) & 15u);
-    v_dist_minus_1 = ((v_dist_minus_1 + ((uint32_t)(((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U64(v_table_entry_n_bits))))) & 32767u);
-    v_bits >>= v_table_entry_n_bits;
-    v_n_bits -= v_table_entry_n_bits;
-    do {
-      if (((uint64_t)((v_dist_minus_1 + 1u))) > ((uint64_t)(iop_a_dst - io0_a_dst))) {
-        v_hlen = 0u;
-        v_hdist = ((uint32_t)((((uint64_t)((v_dist_minus_1 + 1u))) - ((uint64_t)(iop_a_dst - io0_a_dst)))));
-        if (v_length > v_hdist) {
-          v_length -= v_hdist;
-          v_hlen = v_hdist;
-        } else {
-          v_hlen = v_length;
-          v_length = 0u;
-        }
-        v_hdist += v_hdist_adjustment;
-        if (self->private_impl.f_history_index < v_hdist) {
-          status = wuffs_base__make_status(wuffs_deflate__error__bad_distance);
-          goto exit;
-        }
-        wuffs_base__io_writer__limited_copy_u32_from_slice(
-            &iop_a_dst, io2_a_dst,v_hlen, wuffs_base__make_slice_u8_ij(self->private_data.f_history, ((self->private_impl.f_history_index - v_hdist) & 32767u), 33025));
-        if (v_length == 0u) {
-          goto label__loop__continue;
-        }
-        if ((((uint64_t)((v_dist_minus_1 + 1u))) > ((uint64_t)(iop_a_dst - io0_a_dst))) || (((uint64_t)(v_length)) > ((uint64_t)(io2_a_dst - iop_a_dst))) || (((uint64_t)((v_length + 8u))) > ((uint64_t)(io2_a_dst - iop_a_dst)))) {
-          status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_distance);
-          goto exit;
-        }
-      }
-      if ((v_dist_minus_1 + 1u) >= 8u) {
-        wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast(
-            &iop_a_dst, io0_a_dst, io2_a_dst, v_length, (v_dist_minus_1 + 1u));
-      } else if ((v_dist_minus_1 + 1u) == 1u) {
-        wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast(
-            &iop_a_dst, io0_a_dst, io2_a_dst, v_length, (v_dist_minus_1 + 1u));
-      } else {
-        wuffs_base__io_writer__limited_copy_u32_from_history_fast(
-            &iop_a_dst, io0_a_dst, io2_a_dst, v_length, (v_dist_minus_1 + 1u));
-      }
-    } while (0);
-  }
-  if (v_n_bits > 63u) {
-    status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-    goto exit;
-  }
-  while (v_n_bits >= 8u) {
-    v_n_bits -= 8u;
-    if (iop_a_src > io1_a_src) {
-      iop_a_src--;
-    } else {
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_i_o);
-      goto exit;
-    }
-  }
-  self->private_impl.f_bits = ((uint32_t)((v_bits & ((((uint64_t)(1u)) << v_n_bits) - 1u))));
-  self->private_impl.f_n_bits = v_n_bits;
-  if ((self->private_impl.f_n_bits >= 8u) || ((self->private_impl.f_bits >> self->private_impl.f_n_bits) != 0u)) {
-    status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-    goto exit;
-  }
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func deflate.decoder.decode_huffman_slow
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_deflate__decoder__decode_huffman_slow(
-    wuffs_deflate__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint32_t v_table_entry = 0;
-  uint32_t v_table_entry_n_bits = 0;
-  uint32_t v_lmask = 0;
-  uint32_t v_dmask = 0;
-  uint32_t v_b0 = 0;
-  uint32_t v_redir_top = 0;
-  uint32_t v_redir_mask = 0;
-  uint32_t v_b1 = 0;
-  uint32_t v_length = 0;
-  uint32_t v_b2 = 0;
-  uint32_t v_b3 = 0;
-  uint32_t v_b4 = 0;
-  uint32_t v_dist_minus_1 = 0;
-  uint32_t v_b5 = 0;
-  uint32_t v_n_copied = 0;
-  uint32_t v_hlen = 0;
-  uint32_t v_hdist = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_huffman_slow[0];
-  if (coro_susp_point) {
-    v_bits = self->private_data.s_decode_huffman_slow[0].v_bits;
-    v_n_bits = self->private_data.s_decode_huffman_slow[0].v_n_bits;
-    v_table_entry_n_bits = self->private_data.s_decode_huffman_slow[0].v_table_entry_n_bits;
-    v_lmask = self->private_data.s_decode_huffman_slow[0].v_lmask;
-    v_dmask = self->private_data.s_decode_huffman_slow[0].v_dmask;
-    v_redir_top = self->private_data.s_decode_huffman_slow[0].v_redir_top;
-    v_redir_mask = self->private_data.s_decode_huffman_slow[0].v_redir_mask;
-    v_length = self->private_data.s_decode_huffman_slow[0].v_length;
-    v_dist_minus_1 = self->private_data.s_decode_huffman_slow[0].v_dist_minus_1;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_n_bits >= 8u) || ((self->private_impl.f_bits >> (self->private_impl.f_n_bits & 7u)) != 0u)) {
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-      goto exit;
-    }
-    v_bits = self->private_impl.f_bits;
-    v_n_bits = self->private_impl.f_n_bits;
-    v_lmask = ((((uint32_t)(1u)) << self->private_impl.f_n_huffs_bits[0u]) - 1u);
-    v_dmask = ((((uint32_t)(1u)) << self->private_impl.f_n_huffs_bits[1u]) - 1u);
-    label__loop__continue:;
-    while ( ! (self->private_impl.p_decode_huffman_slow[0] != 0)) {
-      while (true) {
-        v_table_entry = self->private_data.f_huffs[0u][(v_bits & v_lmask)];
-        v_table_entry_n_bits = (v_table_entry & 15u);
-        if (v_n_bits >= v_table_entry_n_bits) {
-          v_bits >>= v_table_entry_n_bits;
-          v_n_bits -= v_table_entry_n_bits;
-          break;
-        }
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint32_t t_0 = *iop_a_src++;
-          v_b0 = t_0;
-        }
-        v_bits |= (v_b0 << v_n_bits);
-        v_n_bits += 8u;
-      }
-      if ((v_table_entry >> 31u) != 0u) {
-        self->private_data.s_decode_huffman_slow[0].scratch = ((uint8_t)((v_table_entry >> 8u)));
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        if (iop_a_dst == io2_a_dst) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-          goto suspend;
-        }
-        *iop_a_dst++ = ((uint8_t)(self->private_data.s_decode_huffman_slow[0].scratch));
-        continue;
-      } else if ((v_table_entry >> 30u) != 0u) {
-      } else if ((v_table_entry >> 29u) != 0u) {
-        self->private_impl.f_end_of_block = true;
-        break;
-      } else if ((v_table_entry >> 28u) != 0u) {
-        v_redir_top = ((v_table_entry >> 8u) & 65535u);
-        v_redir_mask = ((((uint32_t)(1u)) << ((v_table_entry >> 4u) & 15u)) - 1u);
-        while (true) {
-          v_table_entry = self->private_data.f_huffs[0u][((v_redir_top + (v_bits & v_redir_mask)) & 1023u)];
-          v_table_entry_n_bits = (v_table_entry & 15u);
-          if (v_n_bits >= v_table_entry_n_bits) {
-            v_bits >>= v_table_entry_n_bits;
-            v_n_bits -= v_table_entry_n_bits;
-            break;
-          }
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint32_t t_1 = *iop_a_src++;
-            v_b1 = t_1;
-          }
-          v_bits |= (v_b1 << v_n_bits);
-          v_n_bits += 8u;
-        }
-        if ((v_table_entry >> 31u) != 0u) {
-          self->private_data.s_decode_huffman_slow[0].scratch = ((uint8_t)((v_table_entry >> 8u)));
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-          if (iop_a_dst == io2_a_dst) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-            goto suspend;
-          }
-          *iop_a_dst++ = ((uint8_t)(self->private_data.s_decode_huffman_slow[0].scratch));
-          continue;
-        } else if ((v_table_entry >> 30u) != 0u) {
-        } else if ((v_table_entry >> 29u) != 0u) {
-          self->private_impl.f_end_of_block = true;
-          break;
-        } else if ((v_table_entry >> 28u) != 0u) {
-          status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-          goto exit;
-        } else if ((v_table_entry >> 27u) != 0u) {
-          status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-          goto exit;
-        } else {
-          status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-          goto exit;
-        }
-      } else if ((v_table_entry >> 27u) != 0u) {
-        status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-        goto exit;
-      } else {
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      }
-      v_length = (((v_table_entry >> 8u) & 255u) + 3u);
-      v_table_entry_n_bits = ((v_table_entry >> 4u) & 15u);
-      if (v_table_entry_n_bits > 0u) {
-        while (v_n_bits < v_table_entry_n_bits) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint32_t t_2 = *iop_a_src++;
-            v_b2 = t_2;
-          }
-          v_bits |= (v_b2 << v_n_bits);
-          v_n_bits += 8u;
-        }
-        v_length = (((v_length + 253u + ((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) & 255u) + 3u);
-        v_bits >>= v_table_entry_n_bits;
-        v_n_bits -= v_table_entry_n_bits;
-      }
-      while (true) {
-        v_table_entry = self->private_data.f_huffs[1u][(v_bits & v_dmask)];
-        v_table_entry_n_bits = (v_table_entry & 15u);
-        if (v_n_bits >= v_table_entry_n_bits) {
-          v_bits >>= v_table_entry_n_bits;
-          v_n_bits -= v_table_entry_n_bits;
-          break;
-        }
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint32_t t_3 = *iop_a_src++;
-          v_b3 = t_3;
-        }
-        v_bits |= (v_b3 << v_n_bits);
-        v_n_bits += 8u;
-      }
-      if ((v_table_entry >> 28u) == 1u) {
-        v_redir_top = ((v_table_entry >> 8u) & 65535u);
-        v_redir_mask = ((((uint32_t)(1u)) << ((v_table_entry >> 4u) & 15u)) - 1u);
-        while (true) {
-          v_table_entry = self->private_data.f_huffs[1u][((v_redir_top + (v_bits & v_redir_mask)) & 1023u)];
-          v_table_entry_n_bits = (v_table_entry & 15u);
-          if (v_n_bits >= v_table_entry_n_bits) {
-            v_bits >>= v_table_entry_n_bits;
-            v_n_bits -= v_table_entry_n_bits;
-            break;
-          }
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint32_t t_4 = *iop_a_src++;
-            v_b4 = t_4;
-          }
-          v_bits |= (v_b4 << v_n_bits);
-          v_n_bits += 8u;
-        }
-      }
-      if ((v_table_entry >> 24u) != 64u) {
-        if ((v_table_entry >> 24u) == 8u) {
-          status = wuffs_base__make_status(wuffs_deflate__error__bad_huffman_code);
-          goto exit;
-        }
-        status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_huffman_decoder_state);
-        goto exit;
-      }
-      v_dist_minus_1 = ((v_table_entry >> 8u) & 32767u);
-      v_table_entry_n_bits = ((v_table_entry >> 4u) & 15u);
-      if (v_table_entry_n_bits > 0u) {
-        while (v_n_bits < v_table_entry_n_bits) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint32_t t_5 = *iop_a_src++;
-            v_b5 = t_5;
-          }
-          v_bits |= (v_b5 << v_n_bits);
-          v_n_bits += 8u;
-        }
-        v_dist_minus_1 = ((v_dist_minus_1 + ((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U32(v_table_entry_n_bits))) & 32767u);
-        v_bits >>= v_table_entry_n_bits;
-        v_n_bits -= v_table_entry_n_bits;
-      }
-      while (true) {
-        if (((uint64_t)((v_dist_minus_1 + 1u))) > ((uint64_t)(iop_a_dst - io0_a_dst))) {
-          v_hdist = ((uint32_t)((((uint64_t)((v_dist_minus_1 + 1u))) - ((uint64_t)(iop_a_dst - io0_a_dst)))));
-          if (v_hdist < v_length) {
-            v_hlen = v_hdist;
-          } else {
-            v_hlen = v_length;
-          }
-          v_hdist += ((uint32_t)(((uint64_t)(self->private_impl.f_transformed_history_count - (a_dst ? a_dst->meta.pos : 0u)))));
-          if (self->private_impl.f_history_index < v_hdist) {
-            status = wuffs_base__make_status(wuffs_deflate__error__bad_distance);
-            goto exit;
-          }
-          v_n_copied = wuffs_base__io_writer__limited_copy_u32_from_slice(
-              &iop_a_dst, io2_a_dst,v_hlen, wuffs_base__make_slice_u8_ij(self->private_data.f_history, ((self->private_impl.f_history_index - v_hdist) & 32767u), 33025));
-          if (v_n_copied < v_hlen) {
-            v_length -= v_n_copied;
-            status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9);
-            continue;
-          }
-          v_length -= v_hlen;
-          if (v_length == 0u) {
-            goto label__loop__continue;
-          }
-        }
-        v_n_copied = wuffs_base__io_writer__limited_copy_u32_from_history(
-            &iop_a_dst, io0_a_dst, io2_a_dst, v_length, (v_dist_minus_1 + 1u));
-        if (v_length <= v_n_copied) {
-          goto label__loop__continue;
-        }
-        v_length -= v_n_copied;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10);
-      }
-    }
-    self->private_impl.f_bits = v_bits;
-    self->private_impl.f_n_bits = v_n_bits;
-    if ((self->private_impl.f_n_bits >= 8u) || ((self->private_impl.f_bits >> (self->private_impl.f_n_bits & 7u)) != 0u)) {
-      status = wuffs_base__make_status(wuffs_deflate__error__internal_error_inconsistent_n_bits);
-      goto exit;
-    }
-
-    ok:
-    self->private_impl.p_decode_huffman_slow[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_huffman_slow[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_huffman_slow[0].v_bits = v_bits;
-  self->private_data.s_decode_huffman_slow[0].v_n_bits = v_n_bits;
-  self->private_data.s_decode_huffman_slow[0].v_table_entry_n_bits = v_table_entry_n_bits;
-  self->private_data.s_decode_huffman_slow[0].v_lmask = v_lmask;
-  self->private_data.s_decode_huffman_slow[0].v_dmask = v_dmask;
-  self->private_data.s_decode_huffman_slow[0].v_redir_top = v_redir_top;
-  self->private_data.s_decode_huffman_slow[0].v_redir_mask = v_redir_mask;
-  self->private_data.s_decode_huffman_slow[0].v_length = v_length;
-  self->private_data.s_decode_huffman_slow[0].v_dist_minus_1 = v_dist_minus_1;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__DEFLATE)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_lzw__error__bad_code[] = "#lzw: bad code";
-const char wuffs_lzw__error__truncated_input[] = "#lzw: truncated input";
-const char wuffs_lzw__error__internal_error_inconsistent_i_o[] = "#lzw: internal error: inconsistent I/O";
-
-// ---------------- Private Consts
-
-#define WUFFS_LZW__QUIRKS_BASE 1348378624
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_lzw__decoder__read_from(
-    wuffs_lzw__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_lzw__decoder__write_to(
-    wuffs_lzw__decoder* self,
-    wuffs_base__io_buffer* a_dst);
-
-// ---------------- VTables
-
-const wuffs_base__io_transformer__func_ptrs
-wuffs_lzw__decoder__func_ptrs_for__wuffs_base__io_transformer = {
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_lzw__decoder__get_quirk),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_lzw__decoder__set_quirk),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__slice_u8))(&wuffs_lzw__decoder__transform_io),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_lzw__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_lzw__decoder__initialize(
-    wuffs_lzw__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.vtable_name =
-      wuffs_base__io_transformer__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.function_pointers =
-      (const void*)(&wuffs_lzw__decoder__func_ptrs_for__wuffs_base__io_transformer);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_lzw__decoder*
-wuffs_lzw__decoder__alloc() {
-  wuffs_lzw__decoder* x =
-      (wuffs_lzw__decoder*)(calloc(sizeof(wuffs_lzw__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_lzw__decoder__initialize(
-      x, sizeof(wuffs_lzw__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_lzw__decoder() {
-  return sizeof(wuffs_lzw__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func lzw.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_lzw__decoder__get_quirk(
-    const wuffs_lzw__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (a_key == 1348378624u) {
-    return ((uint64_t)(self->private_impl.f_pending_literal_width_plus_one));
-  }
-  return 0u;
-}
-
-// -------- func lzw.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_lzw__decoder__set_quirk(
-    wuffs_lzw__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (a_key == 1348378624u) {
-    if (a_value > 9u) {
-      return wuffs_base__make_status(wuffs_base__error__bad_argument);
-    }
-    self->private_impl.f_pending_literal_width_plus_one = ((uint32_t)(a_value));
-    return wuffs_base__make_status(NULL);
-  }
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func lzw.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_lzw__decoder__workbuf_len(
-    const wuffs_lzw__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(0u, 0u);
-}
-
-// -------- func lzw.decoder.transform_io
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_lzw__decoder__transform_io(
-    wuffs_lzw__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_i = 0;
-
-  uint32_t coro_susp_point = self->private_impl.p_transform_io[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    self->private_impl.f_literal_width = 8u;
-    if (self->private_impl.f_pending_literal_width_plus_one > 0u) {
-      self->private_impl.f_literal_width = (self->private_impl.f_pending_literal_width_plus_one - 1u);
-    }
-    self->private_impl.f_clear_code = (((uint32_t)(1u)) << self->private_impl.f_literal_width);
-    self->private_impl.f_end_code = (self->private_impl.f_clear_code + 1u);
-    self->private_impl.f_save_code = self->private_impl.f_end_code;
-    self->private_impl.f_prev_code = self->private_impl.f_end_code;
-    self->private_impl.f_width = (self->private_impl.f_literal_width + 1u);
-    self->private_impl.f_bits = 0u;
-    self->private_impl.f_n_bits = 0u;
-    self->private_impl.f_output_ri = 0u;
-    self->private_impl.f_output_wi = 0u;
-    v_i = 0u;
-    while (v_i < self->private_impl.f_clear_code) {
-      self->private_data.f_lm1s[v_i] = 0u;
-      self->private_data.f_suffixes[v_i][0u] = ((uint8_t)(v_i));
-      v_i += 1u;
-    }
-    while (true) {
-      wuffs_lzw__decoder__read_from(self, a_src);
-      if (self->private_impl.f_output_wi > 0u) {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        status = wuffs_lzw__decoder__write_to(self, a_dst);
-        if (status.repr) {
-          goto suspend;
-        }
-      }
-      if (self->private_impl.f_read_from_return_value == 0u) {
-        break;
-      } else if (self->private_impl.f_read_from_return_value == 1u) {
-        continue;
-      } else if (self->private_impl.f_read_from_return_value == 2u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-      } else if (self->private_impl.f_read_from_return_value == 3u) {
-        status = wuffs_base__make_status(wuffs_lzw__error__truncated_input);
-        goto exit;
-      } else if (self->private_impl.f_read_from_return_value == 4u) {
-        status = wuffs_base__make_status(wuffs_lzw__error__bad_code);
-        goto exit;
-      } else {
-        status = wuffs_base__make_status(wuffs_lzw__error__internal_error_inconsistent_i_o);
-        goto exit;
-      }
-    }
-
-    ok:
-    self->private_impl.p_transform_io[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func lzw.decoder.read_from
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_lzw__decoder__read_from(
-    wuffs_lzw__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  uint32_t v_clear_code = 0;
-  uint32_t v_end_code = 0;
-  uint32_t v_save_code = 0;
-  uint32_t v_prev_code = 0;
-  uint32_t v_width = 0;
-  uint32_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint32_t v_output_wi = 0;
-  uint32_t v_code = 0;
-  uint32_t v_c = 0;
-  uint32_t v_o = 0;
-  uint32_t v_steps = 0;
-  uint8_t v_first_byte = 0;
-  uint16_t v_lm1_b = 0;
-  uint16_t v_lm1_a = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  v_clear_code = self->private_impl.f_clear_code;
-  v_end_code = self->private_impl.f_end_code;
-  v_save_code = self->private_impl.f_save_code;
-  v_prev_code = self->private_impl.f_prev_code;
-  v_width = self->private_impl.f_width;
-  v_bits = self->private_impl.f_bits;
-  v_n_bits = self->private_impl.f_n_bits;
-  v_output_wi = self->private_impl.f_output_wi;
-  while (true) {
-    if (v_n_bits < v_width) {
-      if (((uint64_t)(io2_a_src - iop_a_src)) >= 4u) {
-        v_bits |= ((uint32_t)(wuffs_base__peek_u32le__no_bounds_check(iop_a_src) << v_n_bits));
-        iop_a_src += ((31u - v_n_bits) >> 3u);
-        v_n_bits |= 24u;
-      } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-        if (a_src && a_src->meta.closed) {
-          self->private_impl.f_read_from_return_value = 3u;
-        } else {
-          self->private_impl.f_read_from_return_value = 2u;
-        }
-        break;
-      } else {
-        v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-        iop_a_src += 1u;
-        v_n_bits += 8u;
-        if (v_n_bits >= v_width) {
-        } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-          if (a_src && a_src->meta.closed) {
-            self->private_impl.f_read_from_return_value = 3u;
-          } else {
-            self->private_impl.f_read_from_return_value = 2u;
-          }
-          break;
-        } else {
-          v_bits |= (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) << v_n_bits);
-          iop_a_src += 1u;
-          v_n_bits += 8u;
-          if (v_n_bits < v_width) {
-            self->private_impl.f_read_from_return_value = 5u;
-            break;
-          }
-        }
-      }
-    }
-    v_code = ((v_bits) & WUFFS_BASE__LOW_BITS_MASK__U32(v_width));
-    v_bits >>= v_width;
-    v_n_bits -= v_width;
-    if (v_code < v_clear_code) {
-      self->private_data.f_output[v_output_wi] = ((uint8_t)(v_code));
-      v_output_wi = ((v_output_wi + 1u) & 8191u);
-      if (v_save_code <= 4095u) {
-        v_lm1_a = (((uint16_t)(self->private_data.f_lm1s[v_prev_code] + 1u)) & 4095u);
-        self->private_data.f_lm1s[v_save_code] = v_lm1_a;
-        if ((v_lm1_a % 8u) != 0u) {
-          self->private_impl.f_prefixes[v_save_code] = self->private_impl.f_prefixes[v_prev_code];
-          memcpy(self->private_data.f_suffixes[v_save_code],self->private_data.f_suffixes[v_prev_code], sizeof(self->private_data.f_suffixes[v_save_code]));
-          self->private_data.f_suffixes[v_save_code][(v_lm1_a % 8u)] = ((uint8_t)(v_code));
-        } else {
-          self->private_impl.f_prefixes[v_save_code] = ((uint16_t)(v_prev_code));
-          self->private_data.f_suffixes[v_save_code][0u] = ((uint8_t)(v_code));
-        }
-        v_save_code += 1u;
-        if (v_width < 12u) {
-          v_width += (1u & (v_save_code >> v_width));
-        }
-        v_prev_code = v_code;
-      }
-    } else if (v_code <= v_end_code) {
-      if (v_code == v_end_code) {
-        self->private_impl.f_read_from_return_value = 0u;
-        break;
-      }
-      v_save_code = v_end_code;
-      v_prev_code = v_end_code;
-      v_width = (self->private_impl.f_literal_width + 1u);
-    } else if (v_code <= v_save_code) {
-      v_c = v_code;
-      if (v_code == v_save_code) {
-        v_c = v_prev_code;
-      }
-      v_o = ((v_output_wi + (((uint32_t)(self->private_data.f_lm1s[v_c])) & 4294967288u)) & 8191u);
-      v_output_wi = ((v_output_wi + 1u + ((uint32_t)(self->private_data.f_lm1s[v_c]))) & 8191u);
-      v_steps = (((uint32_t)(self->private_data.f_lm1s[v_c])) >> 3u);
-      while (true) {
-        memcpy((self->private_data.f_output)+(v_o), (self->private_data.f_suffixes[v_c]), 8u);
-        if (v_steps <= 0u) {
-          break;
-        }
-        v_steps -= 1u;
-        v_o = (((uint32_t)(v_o - 8u)) & 8191u);
-        v_c = ((uint32_t)(self->private_impl.f_prefixes[v_c]));
-      }
-      v_first_byte = self->private_data.f_suffixes[v_c][0u];
-      if (v_code == v_save_code) {
-        self->private_data.f_output[v_output_wi] = v_first_byte;
-        v_output_wi = ((v_output_wi + 1u) & 8191u);
-      }
-      if (v_save_code <= 4095u) {
-        v_lm1_b = (((uint16_t)(self->private_data.f_lm1s[v_prev_code] + 1u)) & 4095u);
-        self->private_data.f_lm1s[v_save_code] = v_lm1_b;
-        if ((v_lm1_b % 8u) != 0u) {
-          self->private_impl.f_prefixes[v_save_code] = self->private_impl.f_prefixes[v_prev_code];
-          memcpy(self->private_data.f_suffixes[v_save_code],self->private_data.f_suffixes[v_prev_code], sizeof(self->private_data.f_suffixes[v_save_code]));
-          self->private_data.f_suffixes[v_save_code][(v_lm1_b % 8u)] = v_first_byte;
-        } else {
-          self->private_impl.f_prefixes[v_save_code] = ((uint16_t)(v_prev_code));
-          self->private_data.f_suffixes[v_save_code][0u] = ((uint8_t)(v_first_byte));
-        }
-        v_save_code += 1u;
-        if (v_width < 12u) {
-          v_width += (1u & (v_save_code >> v_width));
-        }
-        v_prev_code = v_code;
-      }
-    } else {
-      self->private_impl.f_read_from_return_value = 4u;
-      break;
-    }
-    if (v_output_wi > 4095u) {
-      self->private_impl.f_read_from_return_value = 1u;
-      break;
-    }
-  }
-  if (self->private_impl.f_read_from_return_value != 2u) {
-    while (v_n_bits >= 8u) {
-      v_n_bits -= 8u;
-      if (iop_a_src > io1_a_src) {
-        iop_a_src--;
-      } else {
-        self->private_impl.f_read_from_return_value = 5u;
-        break;
-      }
-    }
-  }
-  self->private_impl.f_save_code = v_save_code;
-  self->private_impl.f_prev_code = v_prev_code;
-  self->private_impl.f_width = v_width;
-  self->private_impl.f_bits = v_bits;
-  self->private_impl.f_n_bits = v_n_bits;
-  self->private_impl.f_output_wi = v_output_wi;
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func lzw.decoder.write_to
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_lzw__decoder__write_to(
-    wuffs_lzw__decoder* self,
-    wuffs_base__io_buffer* a_dst) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__slice_u8 v_s = {0};
-  uint64_t v_n = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_write_to[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (self->private_impl.f_output_wi > 0u) {
-      if (self->private_impl.f_output_ri > self->private_impl.f_output_wi) {
-        status = wuffs_base__make_status(wuffs_lzw__error__internal_error_inconsistent_i_o);
-        goto exit;
-      }
-      v_s = wuffs_base__make_slice_u8_ij(self->private_data.f_output,
-          self->private_impl.f_output_ri,
-          self->private_impl.f_output_wi);
-      v_n = wuffs_base__io_writer__copy_from_slice(&iop_a_dst, io2_a_dst,v_s);
-      if (v_n == ((uint64_t)(v_s.len))) {
-        self->private_impl.f_output_ri = 0u;
-        self->private_impl.f_output_wi = 0u;
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      }
-      self->private_impl.f_output_ri = (((uint32_t)(self->private_impl.f_output_ri + ((uint32_t)(v_n)))) & 8191u);
-      status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_write_to[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_write_to[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func lzw.decoder.flush
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__slice_u8
-wuffs_lzw__decoder__flush(
-    wuffs_lzw__decoder* self) {
-  if (!self) {
-    return wuffs_base__make_slice_u8(NULL, 0);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_slice_u8(NULL, 0);
-  }
-
-  uint32_t v_ri = 0;
-  uint32_t v_wi = 0;
-
-  v_ri = self->private_impl.f_output_ri;
-  v_wi = self->private_impl.f_output_wi;
-  self->private_impl.f_output_ri = 0u;
-  self->private_impl.f_output_wi = 0u;
-  if (v_ri <= v_wi) {
-    return wuffs_base__make_slice_u8_ij(self->private_data.f_output, v_ri, v_wi);
-  }
-  return wuffs_base__make_slice_u8(self->private_data.f_output, 0);
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GIF)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_gif__error__bad_extension_label[] = "#gif: bad extension label";
-const char wuffs_gif__error__bad_frame_size[] = "#gif: bad frame size";
-const char wuffs_gif__error__bad_graphic_control[] = "#gif: bad graphic control";
-const char wuffs_gif__error__bad_header[] = "#gif: bad header";
-const char wuffs_gif__error__bad_literal_width[] = "#gif: bad literal width";
-const char wuffs_gif__error__bad_palette[] = "#gif: bad palette";
-const char wuffs_gif__error__truncated_input[] = "#gif: truncated input";
-const char wuffs_gif__error__internal_error_inconsistent_ri_wi[] = "#gif: internal error: inconsistent ri/wi";
-
-// ---------------- Private Consts
-
-static const uint32_t
-WUFFS_GIF__INTERLACE_START[5] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  4294967295, 1, 2, 4, 0,
-};
-
-static const uint8_t
-WUFFS_GIF__INTERLACE_DELTA[5] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  1, 2, 4, 8, 8,
-};
-
-static const uint8_t
-WUFFS_GIF__INTERLACE_COUNT[5] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 1, 2, 4, 8,
-};
-
-static const uint8_t
-WUFFS_GIF__ANIMEXTS1DOT0[11] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  65, 78, 73, 77, 69, 88, 84, 83,
-  49, 46, 48,
-};
-
-static const uint8_t
-WUFFS_GIF__NETSCAPE2DOT0[11] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  78, 69, 84, 83, 67, 65, 80, 69,
-  50, 46, 48,
-};
-
-static const uint8_t
-WUFFS_GIF__ICCRGBG1012[11] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  73, 67, 67, 82, 71, 66, 71, 49,
-  48, 49, 50,
-};
-
-static const uint8_t
-WUFFS_GIF__XMPDATAXMP[11] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  88, 77, 80, 32, 68, 97, 116, 97,
-  88, 77, 80,
-};
-
-#define WUFFS_GIF__QUIRKS_BASE 1041635328
-
-#define WUFFS_GIF__QUIRKS_COUNT 7
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__do_decode_image_config(
-    wuffs_gif__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__do_tell_me_more(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__do_decode_frame_config(
-    wuffs_gif__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__skip_frame(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__do_decode_frame(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_gif__decoder__reset_gc(
-    wuffs_gif__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_up_to_id_part1(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_header(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_lsd(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_extension(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__skip_blocks(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_ae(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_gc(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_id_part0(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_id_part1(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_id_part2(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__copy_to_image_buffer(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_pb,
-    wuffs_base__slice_u8 a_src);
-
-// ---------------- VTables
-
-const wuffs_base__image_decoder__func_ptrs
-wuffs_gif__decoder__func_ptrs_for__wuffs_base__image_decoder = {
-  (wuffs_base__status(*)(void*,
-      wuffs_base__pixel_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__pixel_blend,
-      wuffs_base__slice_u8,
-      wuffs_base__decode_frame_options*))(&wuffs_gif__decoder__decode_frame),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__frame_config*,
-      wuffs_base__io_buffer*))(&wuffs_gif__decoder__decode_frame_config),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__image_config*,
-      wuffs_base__io_buffer*))(&wuffs_gif__decoder__decode_image_config),
-  (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_gif__decoder__frame_dirty_rect),
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_gif__decoder__get_quirk),
-  (uint32_t(*)(const void*))(&wuffs_gif__decoder__num_animation_loops),
-  (uint64_t(*)(const void*))(&wuffs_gif__decoder__num_decoded_frame_configs),
-  (uint64_t(*)(const void*))(&wuffs_gif__decoder__num_decoded_frames),
-  (wuffs_base__status(*)(void*,
-      uint64_t,
-      uint64_t))(&wuffs_gif__decoder__restart_frame),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_gif__decoder__set_quirk),
-  (wuffs_base__empty_struct(*)(void*,
-      uint32_t,
-      bool))(&wuffs_gif__decoder__set_report_metadata),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__more_information*,
-      wuffs_base__io_buffer*))(&wuffs_gif__decoder__tell_me_more),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_gif__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_gif__decoder__initialize(
-    wuffs_gif__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  {
-    wuffs_base__status z = wuffs_lzw__decoder__initialize(
-        &self->private_data.f_lzw, sizeof(self->private_data.f_lzw), WUFFS_VERSION, options);
-    if (z.repr) {
-      return z;
-    }
-  }
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.vtable_name =
-      wuffs_base__image_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.function_pointers =
-      (const void*)(&wuffs_gif__decoder__func_ptrs_for__wuffs_base__image_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_gif__decoder*
-wuffs_gif__decoder__alloc() {
-  wuffs_gif__decoder* x =
-      (wuffs_gif__decoder*)(calloc(sizeof(wuffs_gif__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_gif__decoder__initialize(
-      x, sizeof(wuffs_gif__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_gif__decoder() {
-  return sizeof(wuffs_gif__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func gif.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gif__decoder__get_quirk(
-    const wuffs_gif__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  uint32_t v_key = 0;
-
-  if (a_key >= 1041635328u) {
-    v_key = (a_key - 1041635328u);
-    if (v_key < 7u) {
-      if (self->private_impl.f_quirks[v_key]) {
-        return 1u;
-      }
-    }
-  }
-  return 0u;
-}
-
-// -------- func gif.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__set_quirk(
-    wuffs_gif__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if ((self->private_impl.f_call_sequence == 0u) && (a_key >= 1041635328u)) {
-    a_key -= 1041635328u;
-    if (a_key < 7u) {
-      self->private_impl.f_quirks[a_key] = (a_value > 0u);
-      return wuffs_base__make_status(NULL);
-    }
-  }
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func gif.decoder.decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__decode_image_config(
-    wuffs_gif__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_gif__decoder__do_decode_image_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_gif__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func gif.decoder.do_decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__do_decode_image_config(
-    wuffs_gif__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  bool v_ffio = false;
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    } else if ( ! self->private_impl.f_seen_header) {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_gif__decoder__decode_header(self, a_src);
-      if (status.repr) {
-        goto suspend;
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      status = wuffs_gif__decoder__decode_lsd(self, a_src);
-      if (status.repr) {
-        goto suspend;
-      }
-      self->private_impl.f_seen_header = true;
-    }
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-    status = wuffs_gif__decoder__decode_up_to_id_part1(self, a_src);
-    if (status.repr) {
-      goto suspend;
-    }
-    v_ffio =  ! self->private_impl.f_gc_has_transparent_index;
-    if ( ! self->private_impl.f_quirks[2u]) {
-      v_ffio = (v_ffio &&
-          (self->private_impl.f_frame_rect_x0 == 0u) &&
-          (self->private_impl.f_frame_rect_y0 == 0u) &&
-          (self->private_impl.f_frame_rect_x1 == self->private_impl.f_width) &&
-          (self->private_impl.f_frame_rect_y1 == self->private_impl.f_height));
-    } else if (v_ffio) {
-      self->private_impl.f_black_color_u32_argb_premul = 4278190080u;
-    }
-    if (self->private_impl.f_background_color_u32_argb_premul == 77u) {
-      self->private_impl.f_background_color_u32_argb_premul = self->private_impl.f_black_color_u32_argb_premul;
-    }
-    if (a_dst != NULL) {
-      wuffs_base__image_config__set(
-          a_dst,
-          2198077448u,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height,
-          self->private_impl.f_frame_config_io_position,
-          v_ffio);
-    }
-    if (self->private_impl.f_call_sequence == 0u) {
-      self->private_impl.f_call_sequence = 32u;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_do_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  return status;
-}
-
-// -------- func gif.decoder.set_report_metadata
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_gif__decoder__set_report_metadata(
-    wuffs_gif__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report) {
-  if (!self) {
-    return wuffs_base__make_empty_struct();
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_empty_struct();
-  }
-
-  if (a_fourcc == 1229144912u) {
-    self->private_impl.f_report_metadata_iccp = a_report;
-  } else if (a_fourcc == 1481461792u) {
-    self->private_impl.f_report_metadata_xmp = a_report;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func gif.decoder.tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__tell_me_more(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 2)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_tell_me_more[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_gif__decoder__do_tell_me_more(self, a_dst, a_minfo, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_gif__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_tell_me_more[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_tell_me_more[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 2 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func gif.decoder.do_tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__do_tell_me_more(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint64_t v_chunk_length = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_tell_me_more[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_call_sequence & 16u) == 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    }
-    if (self->private_impl.f_metadata_fourcc == 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__no_more_information);
-      goto exit;
-    }
-    while (true) {
-      while (true) {
-        if (wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src))) != self->private_impl.f_metadata_io_position) {
-          if (a_minfo != NULL) {
-            wuffs_base__more_information__set(a_minfo,
-                2u,
-                0u,
-                self->private_impl.f_metadata_io_position,
-                0u,
-                0u);
-          }
-          status = wuffs_base__make_status(wuffs_base__suspension__mispositioned_read);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-          continue;
-        }
-        if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-          if (a_minfo != NULL) {
-            wuffs_base__more_information__set(a_minfo,
-                0u,
-                0u,
-                0u,
-                0u,
-                0u);
-          }
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-          continue;
-        }
-        break;
-      }
-      v_chunk_length = ((uint64_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src)));
-      if (v_chunk_length <= 0u) {
-        iop_a_src += 1u;
-        break;
-      }
-      if (self->private_impl.f_metadata_fourcc == 1481461792u) {
-        v_chunk_length += 1u;
-      } else {
-        iop_a_src += 1u;
-      }
-      self->private_impl.f_metadata_io_position = wuffs_base__u64__sat_add(wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src))), v_chunk_length);
-      if (a_minfo != NULL) {
-        wuffs_base__more_information__set(a_minfo,
-            3u,
-            self->private_impl.f_metadata_fourcc,
-            0u,
-            wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src))),
-            self->private_impl.f_metadata_io_position);
-      }
-      status = wuffs_base__make_status(wuffs_base__suspension__even_more_information);
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-    }
-    if (a_minfo != NULL) {
-      wuffs_base__more_information__set(a_minfo,
-          3u,
-          self->private_impl.f_metadata_fourcc,
-          0u,
-          self->private_impl.f_metadata_io_position,
-          self->private_impl.f_metadata_io_position);
-    }
-    self->private_impl.f_call_sequence &= 239u;
-    self->private_impl.f_metadata_fourcc = 0u;
-    self->private_impl.f_metadata_io_position = 0u;
-    status = wuffs_base__make_status(NULL);
-    goto ok;
-
-    ok:
-    self->private_impl.p_do_tell_me_more[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_tell_me_more[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.num_animation_loops
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_gif__decoder__num_animation_loops(
-    const wuffs_gif__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_seen_num_animation_loops_value) {
-    return self->private_impl.f_num_animation_loops_value;
-  }
-  if (self->private_impl.f_num_decoded_frame_configs_value > 1u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func gif.decoder.num_decoded_frame_configs
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gif__decoder__num_decoded_frame_configs(
-    const wuffs_gif__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return self->private_impl.f_num_decoded_frame_configs_value;
-}
-
-// -------- func gif.decoder.num_decoded_frames
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gif__decoder__num_decoded_frames(
-    const wuffs_gif__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return self->private_impl.f_num_decoded_frames_value;
-}
-
-// -------- func gif.decoder.frame_dirty_rect
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_gif__decoder__frame_dirty_rect(
-    const wuffs_gif__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-
-  return wuffs_base__utility__make_rect_ie_u32(
-      wuffs_base__u32__min(self->private_impl.f_frame_rect_x0, self->private_impl.f_width),
-      wuffs_base__u32__min(self->private_impl.f_frame_rect_y0, self->private_impl.f_height),
-      wuffs_base__u32__min(self->private_impl.f_frame_rect_x1, self->private_impl.f_width),
-      wuffs_base__u32__min(self->private_impl.f_dirty_max_excl_y, self->private_impl.f_height));
-}
-
-// -------- func gif.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_gif__decoder__workbuf_len(
-    const wuffs_gif__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(0u, 0u);
-}
-
-// -------- func gif.decoder.restart_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__restart_frame(
-    wuffs_gif__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (self->private_impl.f_call_sequence < 32u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-  } else if (a_io_position == 0u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  self->private_impl.f_delayed_num_decoded_frames = false;
-  self->private_impl.f_frame_config_io_position = a_io_position;
-  self->private_impl.f_num_decoded_frame_configs_value = a_index;
-  self->private_impl.f_num_decoded_frames_value = a_index;
-  wuffs_gif__decoder__reset_gc(self);
-  self->private_impl.f_call_sequence = 40u;
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func gif.decoder.decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__decode_frame_config(
-    wuffs_gif__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 3)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_gif__decoder__do_decode_frame_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_gif__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 3 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func gif.decoder.do_decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__do_decode_frame_config(
-    wuffs_gif__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_background_color = 0;
-  uint8_t v_flags = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config[0];
-  if (coro_susp_point) {
-    v_background_color = self->private_data.s_do_decode_frame_config[0].v_background_color;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    self->private_impl.f_dirty_max_excl_y = 0u;
-    if ((self->private_impl.f_call_sequence & 16u) != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    } else if (self->private_impl.f_call_sequence == 32u) {
-    } else if (self->private_impl.f_call_sequence < 32u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_gif__decoder__do_decode_image_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else if (self->private_impl.f_call_sequence == 40u) {
-      if (self->private_impl.f_frame_config_io_position != wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)))) {
-        status = wuffs_base__make_status(wuffs_base__error__bad_restart);
-        goto exit;
-      }
-    } else if (self->private_impl.f_call_sequence == 64u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      status = wuffs_gif__decoder__skip_frame(self, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-      if (self->private_impl.f_call_sequence >= 96u) {
-        status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-        goto ok;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if ((self->private_impl.f_num_decoded_frame_configs_value > 0u) || (self->private_impl.f_call_sequence == 40u)) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      status = wuffs_gif__decoder__decode_up_to_id_part1(self, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-      if (self->private_impl.f_call_sequence >= 96u) {
-        status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-        goto ok;
-      }
-    }
-    v_background_color = self->private_impl.f_black_color_u32_argb_premul;
-    if ( ! self->private_impl.f_gc_has_transparent_index) {
-      v_background_color = self->private_impl.f_background_color_u32_argb_premul;
-      if (self->private_impl.f_quirks[1u] && (self->private_impl.f_num_decoded_frame_configs_value == 0u)) {
-        while (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
-        }
-        v_flags = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-        if ((v_flags & 128u) != 0u) {
-          v_background_color = self->private_impl.f_black_color_u32_argb_premul;
-        }
-      }
-    }
-    if (a_dst != NULL) {
-      wuffs_base__frame_config__set(
-          a_dst,
-          wuffs_base__utility__make_rect_ie_u32(
-          wuffs_base__u32__min(self->private_impl.f_frame_rect_x0, self->private_impl.f_width),
-          wuffs_base__u32__min(self->private_impl.f_frame_rect_y0, self->private_impl.f_height),
-          wuffs_base__u32__min(self->private_impl.f_frame_rect_x1, self->private_impl.f_width),
-          wuffs_base__u32__min(self->private_impl.f_frame_rect_y1, self->private_impl.f_height)),
-          ((wuffs_base__flicks)(self->private_impl.f_gc_duration)),
-          self->private_impl.f_num_decoded_frame_configs_value,
-          self->private_impl.f_frame_config_io_position,
-          self->private_impl.f_gc_disposal,
-          ! self->private_impl.f_gc_has_transparent_index,
-          false,
-          v_background_color);
-    }
-    wuffs_base__u64__sat_add_indirect(&self->private_impl.f_num_decoded_frame_configs_value, 1u);
-    self->private_impl.f_call_sequence = 64u;
-
-    ok:
-    self->private_impl.p_do_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_decode_frame_config[0].v_background_color = v_background_color;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.skip_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__skip_frame(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_flags = 0;
-  uint8_t v_lw = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_skip_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_flags = t_0;
-    }
-    if ((v_flags & 128u) != 0u) {
-      self->private_data.s_skip_frame[0].scratch = (((uint32_t)(3u)) << (1u + (v_flags & 7u)));
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      if (self->private_data.s_skip_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_skip_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_skip_frame[0].scratch;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_1 = *iop_a_src++;
-      v_lw = t_1;
-    }
-    if (v_lw > 8u) {
-      status = wuffs_base__make_status(wuffs_gif__error__bad_literal_width);
-      goto exit;
-    }
-    if (a_src) {
-      a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-    }
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-    status = wuffs_gif__decoder__skip_blocks(self, a_src);
-    if (a_src) {
-      iop_a_src = a_src->data.ptr + a_src->meta.ri;
-    }
-    if (status.repr) {
-      goto suspend;
-    }
-    if (self->private_impl.f_quirks[0u]) {
-      self->private_impl.f_delayed_num_decoded_frames = true;
-    } else {
-      wuffs_base__u64__sat_add_indirect(&self->private_impl.f_num_decoded_frames_value, 1u);
-    }
-    wuffs_gif__decoder__reset_gc(self);
-    self->private_impl.f_call_sequence = 32u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_skip_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_skip_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gif__decoder__decode_frame(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 4)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_gif__decoder__do_decode_frame(self,
-            a_dst,
-            a_src,
-            a_blend,
-            a_workbuf,
-            a_opts);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_gif__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 4 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func gif.decoder.do_decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__do_decode_frame(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 64u) {
-    } else if (self->private_impl.f_call_sequence < 64u) {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_gif__decoder__do_decode_frame_config(self, NULL, a_src);
-      if (status.repr) {
-        goto suspend;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (self->private_impl.f_quirks[5u] && ((self->private_impl.f_frame_rect_x0 == self->private_impl.f_frame_rect_x1) || (self->private_impl.f_frame_rect_y0 == self->private_impl.f_frame_rect_y1))) {
-      status = wuffs_base__make_status(wuffs_gif__error__bad_frame_size);
-      goto exit;
-    }
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-    status = wuffs_gif__decoder__decode_id_part1(self, a_dst, a_src, a_blend);
-    if (status.repr) {
-      goto suspend;
-    }
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-    status = wuffs_gif__decoder__decode_id_part2(self, a_dst, a_src, a_workbuf);
-    if (status.repr) {
-      goto suspend;
-    }
-    wuffs_base__u64__sat_add_indirect(&self->private_impl.f_num_decoded_frames_value, 1u);
-    wuffs_gif__decoder__reset_gc(self);
-    self->private_impl.f_call_sequence = 32u;
-
-    ok:
-    self->private_impl.p_do_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  return status;
-}
-
-// -------- func gif.decoder.reset_gc
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_gif__decoder__reset_gc(
-    wuffs_gif__decoder* self) {
-  self->private_impl.f_gc_has_transparent_index = false;
-  self->private_impl.f_gc_transparent_index = 0u;
-  self->private_impl.f_gc_disposal = 0u;
-  self->private_impl.f_gc_duration = 0u;
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func gif.decoder.decode_up_to_id_part1
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_up_to_id_part1(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_block_type = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_up_to_id_part1[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_frame_config_io_position == 0u) || (self->private_impl.f_num_decoded_frame_configs_value > 0u)) {
-      self->private_impl.f_frame_config_io_position = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-    }
-    while (true) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_0 = *iop_a_src++;
-        v_block_type = t_0;
-      }
-      if (v_block_type == 33u) {
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        status = wuffs_gif__decoder__decode_extension(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-      } else if (v_block_type == 44u) {
-        if (self->private_impl.f_delayed_num_decoded_frames) {
-          self->private_impl.f_delayed_num_decoded_frames = false;
-          wuffs_base__u64__sat_add_indirect(&self->private_impl.f_num_decoded_frames_value, 1u);
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-        status = wuffs_gif__decoder__decode_id_part0(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-        break;
-      } else {
-        if (self->private_impl.f_delayed_num_decoded_frames) {
-          self->private_impl.f_delayed_num_decoded_frames = false;
-          wuffs_base__u64__sat_add_indirect(&self->private_impl.f_num_decoded_frames_value, 1u);
-        }
-        self->private_impl.f_call_sequence = 96u;
-        break;
-      }
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_up_to_id_part1[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_up_to_id_part1[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.decode_header
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_header(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c[6] = {0};
-  uint32_t v_i = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_header[0];
-  if (coro_susp_point) {
-    memcpy(v_c, self->private_data.s_decode_header[0].v_c, sizeof(v_c));
-    v_i = self->private_data.s_decode_header[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (v_i < 6u) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_0 = *iop_a_src++;
-        v_c[v_i] = t_0;
-      }
-      v_i += 1u;
-    }
-    if ((v_c[0u] != 71u) ||
-        (v_c[1u] != 73u) ||
-        (v_c[2u] != 70u) ||
-        (v_c[3u] != 56u) ||
-        ((v_c[4u] != 55u) && (v_c[4u] != 57u)) ||
-        (v_c[5u] != 97u)) {
-      status = wuffs_base__make_status(wuffs_gif__error__bad_header);
-      goto exit;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_header[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_header[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  memcpy(self->private_data.s_decode_header[0].v_c, v_c, sizeof(v_c));
-  self->private_data.s_decode_header[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.decode_lsd
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_lsd(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_flags = 0;
-  uint8_t v_background_color_index = 0;
-  uint32_t v_num_palette_entries = 0;
-  uint32_t v_i = 0;
-  uint32_t v_j = 0;
-  uint32_t v_argb = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_lsd[0];
-  if (coro_susp_point) {
-    v_flags = self->private_data.s_decode_lsd[0].v_flags;
-    v_background_color_index = self->private_data.s_decode_lsd[0].v_background_color_index;
-    v_num_palette_entries = self->private_data.s_decode_lsd[0].v_num_palette_entries;
-    v_i = self->private_data.s_decode_lsd[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint32_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_0 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_lsd[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_lsd[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0;
-          if (num_bits_0 == 8) {
-            t_0 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0)) << 56;
-        }
-      }
-      self->private_impl.f_width = t_0;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      uint32_t t_1;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_1 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_lsd[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_lsd[0].scratch;
-          uint32_t num_bits_1 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1;
-          if (num_bits_1 == 8) {
-            t_1 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_1 += 8u;
-          *scratch |= ((uint64_t)(num_bits_1)) << 56;
-        }
-      }
-      self->private_impl.f_height = t_1;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_2 = *iop_a_src++;
-      v_flags = t_2;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_3 = *iop_a_src++;
-      v_background_color_index = t_3;
-    }
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-    if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      goto suspend;
-    }
-    iop_a_src++;
-    v_i = 0u;
-    self->private_impl.f_has_global_palette = ((v_flags & 128u) != 0u);
-    if (self->private_impl.f_has_global_palette) {
-      v_num_palette_entries = (((uint32_t)(1u)) << (1u + (v_flags & 7u)));
-      while (v_i < v_num_palette_entries) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-          uint32_t t_4;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 3)) {
-            t_4 = ((uint32_t)(wuffs_base__peek_u24be__no_bounds_check(iop_a_src)));
-            iop_a_src += 3;
-          } else {
-            self->private_data.s_decode_lsd[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_decode_lsd[0].scratch;
-              uint32_t num_bits_4 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_4);
-              if (num_bits_4 == 16) {
-                t_4 = ((uint32_t)(*scratch >> 40));
-                break;
-              }
-              num_bits_4 += 8u;
-              *scratch |= ((uint64_t)(num_bits_4));
-            }
-          }
-          v_argb = t_4;
-        }
-        v_argb |= 4278190080u;
-        self->private_data.f_palettes[0u][((4u * v_i) + 0u)] = ((uint8_t)((v_argb >> 0u)));
-        self->private_data.f_palettes[0u][((4u * v_i) + 1u)] = ((uint8_t)((v_argb >> 8u)));
-        self->private_data.f_palettes[0u][((4u * v_i) + 2u)] = ((uint8_t)((v_argb >> 16u)));
-        self->private_data.f_palettes[0u][((4u * v_i) + 3u)] = ((uint8_t)((v_argb >> 24u)));
-        v_i += 1u;
-      }
-      if (self->private_impl.f_quirks[2u]) {
-        if ((v_background_color_index != 0u) && (((uint32_t)(v_background_color_index)) < v_num_palette_entries)) {
-          v_j = (4u * ((uint32_t)(v_background_color_index)));
-          self->private_impl.f_background_color_u32_argb_premul = ((((uint32_t)(self->private_data.f_palettes[0u][(v_j + 0u)])) << 0u) |
-              (((uint32_t)(self->private_data.f_palettes[0u][(v_j + 1u)])) << 8u) |
-              (((uint32_t)(self->private_data.f_palettes[0u][(v_j + 2u)])) << 16u) |
-              (((uint32_t)(self->private_data.f_palettes[0u][(v_j + 3u)])) << 24u));
-        } else {
-          self->private_impl.f_background_color_u32_argb_premul = 77u;
-        }
-      }
-    }
-    while (v_i < 256u) {
-      self->private_data.f_palettes[0u][((4u * v_i) + 0u)] = 0u;
-      self->private_data.f_palettes[0u][((4u * v_i) + 1u)] = 0u;
-      self->private_data.f_palettes[0u][((4u * v_i) + 2u)] = 0u;
-      self->private_data.f_palettes[0u][((4u * v_i) + 3u)] = 255u;
-      v_i += 1u;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_lsd[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_lsd[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_lsd[0].v_flags = v_flags;
-  self->private_data.s_decode_lsd[0].v_background_color_index = v_background_color_index;
-  self->private_data.s_decode_lsd[0].v_num_palette_entries = v_num_palette_entries;
-  self->private_data.s_decode_lsd[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.decode_extension
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_extension(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_label = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_extension[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_label = t_0;
-    }
-    if (v_label == 249u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      status = wuffs_gif__decoder__decode_gc(self, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-      status = wuffs_base__make_status(NULL);
-      goto ok;
-    } else if (v_label == 255u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      status = wuffs_gif__decoder__decode_ae(self, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-      status = wuffs_base__make_status(NULL);
-      goto ok;
-    }
-    if (a_src) {
-      a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-    }
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-    status = wuffs_gif__decoder__skip_blocks(self, a_src);
-    if (a_src) {
-      iop_a_src = a_src->data.ptr + a_src->meta.ri;
-    }
-    if (status.repr) {
-      goto suspend;
-    }
-
-    ok:
-    self->private_impl.p_decode_extension[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_extension[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.skip_blocks
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__skip_blocks(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_block_size = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_skip_blocks[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_0 = *iop_a_src++;
-        v_block_size = t_0;
-      }
-      if (v_block_size == 0u) {
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      }
-      self->private_data.s_skip_blocks[0].scratch = ((uint32_t)(v_block_size));
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      if (self->private_data.s_skip_blocks[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_skip_blocks[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_skip_blocks[0].scratch;
-    }
-
-    ok:
-    self->private_impl.p_skip_blocks[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_skip_blocks[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.decode_ae
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_ae(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint8_t v_block_size = 0;
-  bool v_is_animexts = false;
-  bool v_is_netscape = false;
-  bool v_is_iccp = false;
-  bool v_is_xmp = false;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_ae[0];
-  if (coro_susp_point) {
-    v_block_size = self->private_data.s_decode_ae[0].v_block_size;
-    v_is_animexts = self->private_data.s_decode_ae[0].v_is_animexts;
-    v_is_netscape = self->private_data.s_decode_ae[0].v_is_netscape;
-    v_is_iccp = self->private_data.s_decode_ae[0].v_is_iccp;
-    v_is_xmp = self->private_data.s_decode_ae[0].v_is_xmp;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    do {
-      if (self->private_impl.f_metadata_fourcc != 0u) {
-        status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
-        goto ok;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_0 = *iop_a_src++;
-        v_block_size = t_0;
-      }
-      if (v_block_size == 0u) {
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      }
-      if (v_block_size != 11u) {
-        self->private_data.s_decode_ae[0].scratch = ((uint32_t)(v_block_size));
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        if (self->private_data.s_decode_ae[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-          self->private_data.s_decode_ae[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-          iop_a_src = io2_a_src;
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        iop_a_src += self->private_data.s_decode_ae[0].scratch;
-        break;
-      }
-      v_is_animexts = true;
-      v_is_netscape = true;
-      v_is_iccp = true;
-      v_is_xmp = true;
-      v_block_size = 0u;
-      while (v_block_size < 11u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_1 = *iop_a_src++;
-          v_c = t_1;
-        }
-        v_is_animexts = (v_is_animexts && (v_c == WUFFS_GIF__ANIMEXTS1DOT0[v_block_size]));
-        v_is_netscape = (v_is_netscape && (v_c == WUFFS_GIF__NETSCAPE2DOT0[v_block_size]));
-        v_is_iccp = (v_is_iccp && (v_c == WUFFS_GIF__ICCRGBG1012[v_block_size]));
-        v_is_xmp = (v_is_xmp && (v_c == WUFFS_GIF__XMPDATAXMP[v_block_size]));
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-        v_block_size += 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-      }
-      if (v_is_animexts || v_is_netscape) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_2 = *iop_a_src++;
-          v_block_size = t_2;
-        }
-        if (v_block_size != 3u) {
-          self->private_data.s_decode_ae[0].scratch = ((uint32_t)(v_block_size));
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-          if (self->private_data.s_decode_ae[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-            self->private_data.s_decode_ae[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-            iop_a_src = io2_a_src;
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          iop_a_src += self->private_data.s_decode_ae[0].scratch;
-          break;
-        }
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_3 = *iop_a_src++;
-          v_c = t_3;
-        }
-        if (v_c != 1u) {
-          self->private_data.s_decode_ae[0].scratch = 2u;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-          if (self->private_data.s_decode_ae[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-            self->private_data.s_decode_ae[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-            iop_a_src = io2_a_src;
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          iop_a_src += self->private_data.s_decode_ae[0].scratch;
-          break;
-        }
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-          uint32_t t_4;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-            t_4 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-            iop_a_src += 2;
-          } else {
-            self->private_data.s_decode_ae[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_decode_ae[0].scratch;
-              uint32_t num_bits_4 = ((uint32_t)(*scratch >> 56));
-              *scratch <<= 8;
-              *scratch >>= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_4;
-              if (num_bits_4 == 8) {
-                t_4 = ((uint32_t)(*scratch));
-                break;
-              }
-              num_bits_4 += 8u;
-              *scratch |= ((uint64_t)(num_bits_4)) << 56;
-            }
-          }
-          self->private_impl.f_num_animation_loops_value = t_4;
-        }
-        self->private_impl.f_seen_num_animation_loops_value = true;
-        if ((0u < self->private_impl.f_num_animation_loops_value) && (self->private_impl.f_num_animation_loops_value <= 65535u)) {
-          self->private_impl.f_num_animation_loops_value += 1u;
-        }
-      } else if (self->private_impl.f_call_sequence >= 32u) {
-      } else if (v_is_iccp && self->private_impl.f_report_metadata_iccp) {
-        self->private_impl.f_metadata_fourcc = 1229144912u;
-        self->private_impl.f_metadata_io_position = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-        self->private_impl.f_call_sequence = 16u;
-        status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
-        goto ok;
-      } else if (v_is_xmp && self->private_impl.f_report_metadata_xmp) {
-        self->private_impl.f_metadata_fourcc = 1481461792u;
-        self->private_impl.f_metadata_io_position = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-        self->private_impl.f_call_sequence = 16u;
-        status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
-        goto ok;
-      }
-    } while (0);
-    if (a_src) {
-      a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-    }
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-    status = wuffs_gif__decoder__skip_blocks(self, a_src);
-    if (a_src) {
-      iop_a_src = a_src->data.ptr + a_src->meta.ri;
-    }
-    if (status.repr) {
-      goto suspend;
-    }
-
-    ok:
-    self->private_impl.p_decode_ae[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_ae[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_ae[0].v_block_size = v_block_size;
-  self->private_data.s_decode_ae[0].v_is_animexts = v_is_animexts;
-  self->private_data.s_decode_ae[0].v_is_netscape = v_is_netscape;
-  self->private_data.s_decode_ae[0].v_is_iccp = v_is_iccp;
-  self->private_data.s_decode_ae[0].v_is_xmp = v_is_xmp;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.decode_gc
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_gc(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint8_t v_flags = 0;
-  uint16_t v_gc_duration_centiseconds = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_gc[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_c = t_0;
-    }
-    if (v_c != 4u) {
-      status = wuffs_base__make_status(wuffs_gif__error__bad_graphic_control);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_1 = *iop_a_src++;
-      v_flags = t_1;
-    }
-    self->private_impl.f_gc_has_transparent_index = ((v_flags & 1u) != 0u);
-    v_flags = ((v_flags >> 2u) & 7u);
-    if (v_flags == 2u) {
-      self->private_impl.f_gc_disposal = 1u;
-    } else if ((v_flags == 3u) || (v_flags == 4u)) {
-      self->private_impl.f_gc_disposal = 2u;
-    } else {
-      self->private_impl.f_gc_disposal = 0u;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      uint16_t t_2;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_2 = wuffs_base__peek_u16le__no_bounds_check(iop_a_src);
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_gc[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_gc[0].scratch;
-          uint32_t num_bits_2 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2;
-          if (num_bits_2 == 8) {
-            t_2 = ((uint16_t)(*scratch));
-            break;
-          }
-          num_bits_2 += 8u;
-          *scratch |= ((uint64_t)(num_bits_2)) << 56;
-        }
-      }
-      v_gc_duration_centiseconds = t_2;
-    }
-    self->private_impl.f_gc_duration = (((uint64_t)(v_gc_duration_centiseconds)) * 7056000u);
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_3 = *iop_a_src++;
-      self->private_impl.f_gc_transparent_index = t_3;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_4 = *iop_a_src++;
-      v_c = t_4;
-    }
-    if (v_c != 0u) {
-      status = wuffs_base__make_status(wuffs_gif__error__bad_graphic_control);
-      goto exit;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_gc[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_gc[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.decode_id_part0
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_id_part0(
-    wuffs_gif__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_id_part0[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint32_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_0 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_id_part0[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_id_part0[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0;
-          if (num_bits_0 == 8) {
-            t_0 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0)) << 56;
-        }
-      }
-      self->private_impl.f_frame_rect_x0 = t_0;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      uint32_t t_1;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_1 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_id_part0[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_id_part0[0].scratch;
-          uint32_t num_bits_1 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1;
-          if (num_bits_1 == 8) {
-            t_1 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_1 += 8u;
-          *scratch |= ((uint64_t)(num_bits_1)) << 56;
-        }
-      }
-      self->private_impl.f_frame_rect_y0 = t_1;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-      uint32_t t_2;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_2 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_id_part0[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_id_part0[0].scratch;
-          uint32_t num_bits_2 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2;
-          if (num_bits_2 == 8) {
-            t_2 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_2 += 8u;
-          *scratch |= ((uint64_t)(num_bits_2)) << 56;
-        }
-      }
-      self->private_impl.f_frame_rect_x1 = t_2;
-    }
-    self->private_impl.f_frame_rect_x1 += self->private_impl.f_frame_rect_x0;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-      uint32_t t_3;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_3 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_id_part0[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_id_part0[0].scratch;
-          uint32_t num_bits_3 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_3;
-          if (num_bits_3 == 8) {
-            t_3 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_3 += 8u;
-          *scratch |= ((uint64_t)(num_bits_3)) << 56;
-        }
-      }
-      self->private_impl.f_frame_rect_y1 = t_3;
-    }
-    self->private_impl.f_frame_rect_y1 += self->private_impl.f_frame_rect_y0;
-    self->private_impl.f_dst_x = self->private_impl.f_frame_rect_x0;
-    self->private_impl.f_dst_y = self->private_impl.f_frame_rect_y0;
-    if ((self->private_impl.f_num_decoded_frame_configs_value == 0u) &&  ! self->private_impl.f_quirks[4u]) {
-      self->private_impl.f_width = wuffs_base__u32__max(self->private_impl.f_width, self->private_impl.f_frame_rect_x1);
-      self->private_impl.f_height = wuffs_base__u32__max(self->private_impl.f_height, self->private_impl.f_frame_rect_y1);
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_id_part0[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_id_part0[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.decode_id_part1
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_id_part1(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_flags = 0;
-  uint8_t v_which_palette = 0;
-  uint32_t v_num_palette_entries = 0;
-  uint32_t v_i = 0;
-  uint32_t v_argb = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-  uint8_t v_lw = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_id_part1[0];
-  if (coro_susp_point) {
-    v_which_palette = self->private_data.s_decode_id_part1[0].v_which_palette;
-    v_num_palette_entries = self->private_data.s_decode_id_part1[0].v_num_palette_entries;
-    v_i = self->private_data.s_decode_id_part1[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_flags = t_0;
-    }
-    if ((v_flags & 64u) != 0u) {
-      self->private_impl.f_interlace = 4u;
-    } else {
-      self->private_impl.f_interlace = 0u;
-    }
-    v_which_palette = 1u;
-    if ((v_flags & 128u) != 0u) {
-      v_num_palette_entries = (((uint32_t)(1u)) << (1u + (v_flags & 7u)));
-      v_i = 0u;
-      while (v_i < v_num_palette_entries) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          uint32_t t_1;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 3)) {
-            t_1 = ((uint32_t)(wuffs_base__peek_u24be__no_bounds_check(iop_a_src)));
-            iop_a_src += 3;
-          } else {
-            self->private_data.s_decode_id_part1[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_decode_id_part1[0].scratch;
-              uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1);
-              if (num_bits_1 == 16) {
-                t_1 = ((uint32_t)(*scratch >> 40));
-                break;
-              }
-              num_bits_1 += 8u;
-              *scratch |= ((uint64_t)(num_bits_1));
-            }
-          }
-          v_argb = t_1;
-        }
-        v_argb |= 4278190080u;
-        self->private_data.f_palettes[1u][((4u * v_i) + 0u)] = ((uint8_t)((v_argb >> 0u)));
-        self->private_data.f_palettes[1u][((4u * v_i) + 1u)] = ((uint8_t)((v_argb >> 8u)));
-        self->private_data.f_palettes[1u][((4u * v_i) + 2u)] = ((uint8_t)((v_argb >> 16u)));
-        self->private_data.f_palettes[1u][((4u * v_i) + 3u)] = ((uint8_t)((v_argb >> 24u)));
-        v_i += 1u;
-      }
-      while (v_i < 256u) {
-        self->private_data.f_palettes[1u][((4u * v_i) + 0u)] = 0u;
-        self->private_data.f_palettes[1u][((4u * v_i) + 1u)] = 0u;
-        self->private_data.f_palettes[1u][((4u * v_i) + 2u)] = 0u;
-        self->private_data.f_palettes[1u][((4u * v_i) + 3u)] = 255u;
-        v_i += 1u;
-      }
-    } else if (self->private_impl.f_quirks[6u] &&  ! self->private_impl.f_has_global_palette) {
-      status = wuffs_base__make_status(wuffs_gif__error__bad_palette);
-      goto exit;
-    } else if (self->private_impl.f_gc_has_transparent_index) {
-      wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8(self->private_data.f_palettes[1u], 1024), wuffs_base__make_slice_u8(self->private_data.f_palettes[0u], 1024));
-    } else {
-      v_which_palette = 0u;
-    }
-    if (self->private_impl.f_gc_has_transparent_index) {
-      self->private_data.f_palettes[1u][((4u * ((uint32_t)(self->private_impl.f_gc_transparent_index))) + 0u)] = 0u;
-      self->private_data.f_palettes[1u][((4u * ((uint32_t)(self->private_impl.f_gc_transparent_index))) + 1u)] = 0u;
-      self->private_data.f_palettes[1u][((4u * ((uint32_t)(self->private_impl.f_gc_transparent_index))) + 2u)] = 0u;
-      self->private_data.f_palettes[1u][((4u * ((uint32_t)(self->private_impl.f_gc_transparent_index))) + 3u)] = 0u;
-    }
-    v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler,
-        wuffs_base__pixel_buffer__pixel_format(a_dst),
-        wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024)),
-        wuffs_base__utility__make_pixel_format(2198077448u),
-        wuffs_base__make_slice_u8(self->private_data.f_palettes[v_which_palette], 1024),
-        a_blend);
-    if ( ! wuffs_base__status__is_ok(&v_status)) {
-      status = v_status;
-      if (wuffs_base__status__is_error(&status)) {
-        goto exit;
-      } else if (wuffs_base__status__is_suspension(&status)) {
-        status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-        goto exit;
-      }
-      goto ok;
-    }
-    if (self->private_impl.f_previous_lzw_decode_ended_abruptly) {
-      wuffs_base__ignore_status(wuffs_lzw__decoder__initialize(&self->private_data.f_lzw,
-          sizeof (wuffs_lzw__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_2 = *iop_a_src++;
-      v_lw = t_2;
-    }
-    if (v_lw > 8u) {
-      status = wuffs_base__make_status(wuffs_gif__error__bad_literal_width);
-      goto exit;
-    }
-    wuffs_lzw__decoder__set_quirk(&self->private_data.f_lzw, 1348378624u, ((uint64_t)((1u + v_lw))));
-    self->private_impl.f_previous_lzw_decode_ended_abruptly = true;
-
-    ok:
-    self->private_impl.p_decode_id_part1[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_id_part1[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_id_part1[0].v_which_palette = v_which_palette;
-  self->private_data.s_decode_id_part1[0].v_num_palette_entries = v_num_palette_entries;
-  self->private_data.s_decode_id_part1[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.decode_id_part2
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__decode_id_part2(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__io_buffer empty_io_buffer = wuffs_base__empty_io_buffer();
-
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint64_t v_block_size = 0;
-  bool v_need_block_size = false;
-  uint32_t v_n_copied = 0;
-  uint64_t v_n_compressed = 0;
-  wuffs_base__io_buffer u_r = wuffs_base__empty_io_buffer();
-  wuffs_base__io_buffer* v_r = &u_r;
-  const uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint64_t v_mark = 0;
-  wuffs_base__status v_lzw_status = wuffs_base__make_status(NULL);
-  wuffs_base__status v_copy_status = wuffs_base__make_status(NULL);
-  wuffs_base__slice_u8 v_uncompressed = {0};
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_id_part2[0];
-  if (coro_susp_point) {
-    v_block_size = self->private_data.s_decode_id_part2[0].v_block_size;
-    v_need_block_size = self->private_data.s_decode_id_part2[0].v_need_block_size;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    v_need_block_size = true;
-    label__outer__continue:;
-    while (true) {
-      if (v_need_block_size) {
-        v_need_block_size = false;
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t t_0 = *iop_a_src++;
-          v_block_size = t_0;
-        }
-      }
-      if (v_block_size == 0u) {
-        break;
-      }
-      while (((uint64_t)(io2_a_src - iop_a_src)) == 0u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-      }
-      if (self->private_impl.f_compressed_ri == self->private_impl.f_compressed_wi) {
-        self->private_impl.f_compressed_ri = 0u;
-        self->private_impl.f_compressed_wi = 0u;
-      }
-      while (self->private_impl.f_compressed_wi <= 3841u) {
-        v_n_compressed = wuffs_base__u64__min(v_block_size, ((uint64_t)(io2_a_src - iop_a_src)));
-        if (v_n_compressed <= 0u) {
-          break;
-        }
-        v_n_copied = wuffs_base__io_reader__limited_copy_u32_to_slice(
-            &iop_a_src, io2_a_src,((uint32_t)(v_n_compressed)), wuffs_base__make_slice_u8_ij(self->private_data.f_compressed, self->private_impl.f_compressed_wi, 4096));
-        wuffs_base__u64__sat_add_indirect(&self->private_impl.f_compressed_wi, ((uint64_t)(v_n_copied)));
-        wuffs_base__u64__sat_sub_indirect(&v_block_size, ((uint64_t)(v_n_copied)));
-        if (v_block_size > 0u) {
-          break;
-        }
-        if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-          v_need_block_size = true;
-          break;
-        }
-        v_block_size = ((uint64_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src)));
-        iop_a_src += 1u;
-      }
-      while (true) {
-        if ((self->private_impl.f_compressed_ri > self->private_impl.f_compressed_wi) || (self->private_impl.f_compressed_wi > 4096u)) {
-          status = wuffs_base__make_status(wuffs_gif__error__internal_error_inconsistent_ri_wi);
-          goto exit;
-        }
-        {
-          wuffs_base__io_buffer* o_0_v_r = v_r;
-          const uint8_t *o_0_iop_v_r = iop_v_r;
-          const uint8_t *o_0_io0_v_r = io0_v_r;
-          const uint8_t *o_0_io1_v_r = io1_v_r;
-          const uint8_t *o_0_io2_v_r = io2_v_r;
-          v_r = wuffs_base__io_reader__set(
-              &u_r,
-              &iop_v_r,
-              &io0_v_r,
-              &io1_v_r,
-              &io2_v_r,
-              wuffs_base__make_slice_u8_ij(self->private_data.f_compressed,
-              self->private_impl.f_compressed_ri,
-              self->private_impl.f_compressed_wi),
-              0u);
-          v_mark = ((uint64_t)(iop_v_r - io0_v_r));
-          {
-            u_r.meta.ri = ((size_t)(iop_v_r - u_r.data.ptr));
-            wuffs_base__status t_1 = wuffs_lzw__decoder__transform_io(&self->private_data.f_lzw, &empty_io_buffer, v_r, wuffs_base__utility__empty_slice_u8());
-            v_lzw_status = t_1;
-            iop_v_r = u_r.data.ptr + u_r.meta.ri;
-          }
-          wuffs_base__u64__sat_add_indirect(&self->private_impl.f_compressed_ri, wuffs_base__io__count_since(v_mark, ((uint64_t)(iop_v_r - io0_v_r))));
-          v_r = o_0_v_r;
-          iop_v_r = o_0_iop_v_r;
-          io0_v_r = o_0_io0_v_r;
-          io1_v_r = o_0_io1_v_r;
-          io2_v_r = o_0_io2_v_r;
-        }
-        v_uncompressed = wuffs_lzw__decoder__flush(&self->private_data.f_lzw);
-        if (((uint64_t)(v_uncompressed.len)) > 0u) {
-          v_copy_status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst, v_uncompressed);
-          if (wuffs_base__status__is_error(&v_copy_status)) {
-            status = v_copy_status;
-            goto exit;
-          }
-        }
-        if (wuffs_base__status__is_ok(&v_lzw_status)) {
-          self->private_impl.f_previous_lzw_decode_ended_abruptly = false;
-          if (v_need_block_size || (v_block_size > 0u)) {
-            self->private_data.s_decode_id_part2[0].scratch = ((uint32_t)(v_block_size));
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-            if (self->private_data.s_decode_id_part2[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-              self->private_data.s_decode_id_part2[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-              iop_a_src = io2_a_src;
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            iop_a_src += self->private_data.s_decode_id_part2[0].scratch;
-            if (a_src) {
-              a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-            }
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-            status = wuffs_gif__decoder__skip_blocks(self, a_src);
-            if (a_src) {
-              iop_a_src = a_src->data.ptr + a_src->meta.ri;
-            }
-            if (status.repr) {
-              goto suspend;
-            }
-          }
-          goto label__outer__break;
-        } else if (v_lzw_status.repr == wuffs_base__suspension__short_read) {
-          goto label__outer__continue;
-        } else if (v_lzw_status.repr == wuffs_base__suspension__short_write) {
-          continue;
-        } else if (self->private_impl.f_quirks[3u] && (self->private_impl.f_dst_y >= self->private_impl.f_frame_rect_y1) && (self->private_impl.f_interlace == 0u)) {
-          if (v_need_block_size || (v_block_size > 0u)) {
-            self->private_data.s_decode_id_part2[0].scratch = ((uint32_t)(v_block_size));
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-            if (self->private_data.s_decode_id_part2[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-              self->private_data.s_decode_id_part2[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-              iop_a_src = io2_a_src;
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            iop_a_src += self->private_data.s_decode_id_part2[0].scratch;
-            if (a_src) {
-              a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-            }
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-            status = wuffs_gif__decoder__skip_blocks(self, a_src);
-            if (a_src) {
-              iop_a_src = a_src->data.ptr + a_src->meta.ri;
-            }
-            if (status.repr) {
-              goto suspend;
-            }
-          }
-          goto label__outer__break;
-        }
-        status = v_lzw_status;
-        if (wuffs_base__status__is_error(&status)) {
-          goto exit;
-        } else if (wuffs_base__status__is_suspension(&status)) {
-          status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-          goto exit;
-        }
-        goto ok;
-      }
-    }
-    label__outer__break:;
-    self->private_impl.f_compressed_ri = 0u;
-    self->private_impl.f_compressed_wi = 0u;
-    if ((self->private_impl.f_dst_y < self->private_impl.f_frame_rect_y1) && (self->private_impl.f_frame_rect_x0 != self->private_impl.f_frame_rect_x1) && (self->private_impl.f_frame_rect_y0 != self->private_impl.f_frame_rect_y1)) {
-      status = wuffs_base__make_status(wuffs_base__error__not_enough_data);
-      goto exit;
-    }
-
-    ok:
-    self->private_impl.p_decode_id_part2[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_id_part2[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_id_part2[0].v_block_size = v_block_size;
-  self->private_data.s_decode_id_part2[0].v_need_block_size = v_need_block_size;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func gif.decoder.copy_to_image_buffer
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gif__decoder__copy_to_image_buffer(
-    wuffs_gif__decoder* self,
-    wuffs_base__pixel_buffer* a_pb,
-    wuffs_base__slice_u8 a_src) {
-  wuffs_base__slice_u8 v_dst = {0};
-  wuffs_base__slice_u8 v_src = {0};
-  uint64_t v_width_in_bytes = 0;
-  uint64_t v_n = 0;
-  uint64_t v_src_ri = 0;
-  wuffs_base__pixel_format v_pixfmt = {0};
-  uint32_t v_bytes_per_pixel = 0;
-  uint32_t v_bits_per_pixel = 0;
-  wuffs_base__table_u8 v_tab = {0};
-  uint64_t v_i = 0;
-  uint64_t v_j = 0;
-  uint32_t v_replicate_y0 = 0;
-  uint32_t v_replicate_y1 = 0;
-  wuffs_base__slice_u8 v_replicate_dst = {0};
-  wuffs_base__slice_u8 v_replicate_src = {0};
-
-  v_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_pb);
-  v_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_pixfmt);
-  if ((v_bits_per_pixel & 7u) != 0u) {
-    return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-  v_bytes_per_pixel = (v_bits_per_pixel >> 3u);
-  v_width_in_bytes = ((uint64_t)((self->private_impl.f_width * v_bytes_per_pixel)));
-  v_tab = wuffs_base__pixel_buffer__plane(a_pb, 0u);
-  while (v_src_ri < ((uint64_t)(a_src.len))) {
-    v_src = wuffs_base__slice_u8__subslice_i(a_src, v_src_ri);
-    if (self->private_impl.f_dst_y >= self->private_impl.f_frame_rect_y1) {
-      if (self->private_impl.f_quirks[3u]) {
-        return wuffs_base__make_status(NULL);
-      }
-      return wuffs_base__make_status(wuffs_base__error__too_much_data);
-    }
-    v_dst = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-    if (self->private_impl.f_dst_y >= self->private_impl.f_height) {
-      v_dst = wuffs_base__slice_u8__subslice_j(v_dst, 0u);
-    } else if (v_width_in_bytes < ((uint64_t)(v_dst.len))) {
-      v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_width_in_bytes);
-    }
-    v_i = (((uint64_t)(self->private_impl.f_dst_x)) * ((uint64_t)(v_bytes_per_pixel)));
-    if (v_i < ((uint64_t)(v_dst.len))) {
-      v_j = (((uint64_t)(self->private_impl.f_frame_rect_x1)) * ((uint64_t)(v_bytes_per_pixel)));
-      if ((v_i <= v_j) && (v_j <= ((uint64_t)(v_dst.len)))) {
-        v_dst = wuffs_base__slice_u8__subslice_ij(v_dst, v_i, v_j);
-      } else {
-        v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_i);
-      }
-      v_n = wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024), v_src);
-      wuffs_base__u64__sat_add_indirect(&v_src_ri, v_n);
-      wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
-      self->private_impl.f_dirty_max_excl_y = wuffs_base__u32__max(self->private_impl.f_dirty_max_excl_y, wuffs_base__u32__sat_add(self->private_impl.f_dst_y, 1u));
-    }
-    if (self->private_impl.f_frame_rect_x1 <= self->private_impl.f_dst_x) {
-      self->private_impl.f_dst_x = self->private_impl.f_frame_rect_x0;
-      if (self->private_impl.f_interlace == 0u) {
-        wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_y, 1u);
-        continue;
-      }
-      if ((self->private_impl.f_num_decoded_frames_value == 0u) &&  ! self->private_impl.f_gc_has_transparent_index && (self->private_impl.f_interlace > 1u)) {
-        v_replicate_src = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-        v_replicate_y0 = wuffs_base__u32__sat_add(self->private_impl.f_dst_y, 1u);
-        v_replicate_y1 = wuffs_base__u32__sat_add(self->private_impl.f_dst_y, ((uint32_t)(WUFFS_GIF__INTERLACE_COUNT[self->private_impl.f_interlace])));
-        v_replicate_y1 = wuffs_base__u32__min(v_replicate_y1, self->private_impl.f_frame_rect_y1);
-        while (v_replicate_y0 < v_replicate_y1) {
-          v_replicate_dst = wuffs_base__table_u8__row_u32(v_tab, v_replicate_y0);
-          wuffs_base__slice_u8__copy_from_slice(v_replicate_dst, v_replicate_src);
-          v_replicate_y0 += 1u;
-        }
-        self->private_impl.f_dirty_max_excl_y = wuffs_base__u32__max(self->private_impl.f_dirty_max_excl_y, v_replicate_y1);
-      }
-      wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_y, ((uint32_t)(WUFFS_GIF__INTERLACE_DELTA[self->private_impl.f_interlace])));
-      while ((self->private_impl.f_interlace > 0u) && (self->private_impl.f_dst_y >= self->private_impl.f_frame_rect_y1)) {
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-        self->private_impl.f_interlace -= 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-        self->private_impl.f_dst_y = wuffs_base__u32__sat_add(self->private_impl.f_frame_rect_y0, WUFFS_GIF__INTERLACE_START[self->private_impl.f_interlace]);
-      }
-      continue;
-    }
-    if (((uint64_t)(a_src.len)) == v_src_ri) {
-      break;
-    } else if (((uint64_t)(a_src.len)) < v_src_ri) {
-      return wuffs_base__make_status(wuffs_gif__error__internal_error_inconsistent_ri_wi);
-    }
-    v_n = ((uint64_t)((self->private_impl.f_frame_rect_x1 - self->private_impl.f_dst_x)));
-    v_n = wuffs_base__u64__min(v_n, (((uint64_t)(a_src.len)) - v_src_ri));
-    wuffs_base__u64__sat_add_indirect(&v_src_ri, v_n);
-    wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
-    if (self->private_impl.f_frame_rect_x1 <= self->private_impl.f_dst_x) {
-      self->private_impl.f_dst_x = self->private_impl.f_frame_rect_x0;
-      wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_y, ((uint32_t)(WUFFS_GIF__INTERLACE_DELTA[self->private_impl.f_interlace])));
-      while ((self->private_impl.f_interlace > 0u) && (self->private_impl.f_dst_y >= self->private_impl.f_frame_rect_y1)) {
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-        self->private_impl.f_interlace -= 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-        self->private_impl.f_dst_y = wuffs_base__u32__sat_add(self->private_impl.f_frame_rect_y0, WUFFS_GIF__INTERLACE_START[self->private_impl.f_interlace]);
-      }
-      continue;
-    }
-    if (v_src_ri != ((uint64_t)(a_src.len))) {
-      return wuffs_base__make_status(wuffs_gif__error__internal_error_inconsistent_ri_wi);
-    }
-    break;
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GIF)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GZIP)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_gzip__error__bad_checksum[] = "#gzip: bad checksum";
-const char wuffs_gzip__error__bad_compression_method[] = "#gzip: bad compression method";
-const char wuffs_gzip__error__bad_encoding_flags[] = "#gzip: bad encoding flags";
-const char wuffs_gzip__error__bad_header[] = "#gzip: bad header";
-const char wuffs_gzip__error__truncated_input[] = "#gzip: truncated input";
-
-// ---------------- Private Consts
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gzip__decoder__do_transform_io(
-    wuffs_gzip__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-// ---------------- VTables
-
-const wuffs_base__io_transformer__func_ptrs
-wuffs_gzip__decoder__func_ptrs_for__wuffs_base__io_transformer = {
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_gzip__decoder__get_quirk),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_gzip__decoder__set_quirk),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__slice_u8))(&wuffs_gzip__decoder__transform_io),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_gzip__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_gzip__decoder__initialize(
-    wuffs_gzip__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  {
-    wuffs_base__status z = wuffs_crc32__ieee_hasher__initialize(
-        &self->private_data.f_checksum, sizeof(self->private_data.f_checksum), WUFFS_VERSION, options);
-    if (z.repr) {
-      return z;
-    }
-  }
-  {
-    wuffs_base__status z = wuffs_deflate__decoder__initialize(
-        &self->private_data.f_flate, sizeof(self->private_data.f_flate), WUFFS_VERSION, options);
-    if (z.repr) {
-      return z;
-    }
-  }
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.vtable_name =
-      wuffs_base__io_transformer__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.function_pointers =
-      (const void*)(&wuffs_gzip__decoder__func_ptrs_for__wuffs_base__io_transformer);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_gzip__decoder*
-wuffs_gzip__decoder__alloc() {
-  wuffs_gzip__decoder* x =
-      (wuffs_gzip__decoder*)(calloc(sizeof(wuffs_gzip__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_gzip__decoder__initialize(
-      x, sizeof(wuffs_gzip__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_gzip__decoder() {
-  return sizeof(wuffs_gzip__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func gzip.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gzip__decoder__get_quirk(
-    const wuffs_gzip__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if ((a_key == 1u) && self->private_impl.f_ignore_checksum) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func gzip.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gzip__decoder__set_quirk(
-    wuffs_gzip__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (a_key == 1u) {
-    self->private_impl.f_ignore_checksum = (a_value > 0u);
-    return wuffs_base__make_status(NULL);
-  }
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func gzip.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_gzip__decoder__workbuf_len(
-    const wuffs_gzip__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(1u, 1u);
-}
-
-// -------- func gzip.decoder.transform_io
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_gzip__decoder__transform_io(
-    wuffs_gzip__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_transform_io[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_gzip__decoder__do_transform_io(self, a_dst, a_src, a_workbuf);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_gzip__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_transform_io[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func gzip.decoder.do_transform_io
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_gzip__decoder__do_transform_io(
-    wuffs_gzip__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint8_t v_flags = 0;
-  uint16_t v_xlen = 0;
-  uint64_t v_mark = 0;
-  uint32_t v_checksum_got = 0;
-  uint32_t v_decoded_length_got = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-  uint32_t v_checksum_want = 0;
-  uint32_t v_decoded_length_want = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_transform_io[0];
-  if (coro_susp_point) {
-    v_flags = self->private_data.s_do_transform_io[0].v_flags;
-    v_checksum_got = self->private_data.s_do_transform_io[0].v_checksum_got;
-    v_decoded_length_got = self->private_data.s_do_transform_io[0].v_decoded_length_got;
-    v_checksum_want = self->private_data.s_do_transform_io[0].v_checksum_want;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_c = t_0;
-    }
-    if (v_c != 31u) {
-      status = wuffs_base__make_status(wuffs_gzip__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_1 = *iop_a_src++;
-      v_c = t_1;
-    }
-    if (v_c != 139u) {
-      status = wuffs_base__make_status(wuffs_gzip__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_2 = *iop_a_src++;
-      v_c = t_2;
-    }
-    if (v_c != 8u) {
-      status = wuffs_base__make_status(wuffs_gzip__error__bad_compression_method);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_3 = *iop_a_src++;
-      v_flags = t_3;
-    }
-    self->private_data.s_do_transform_io[0].scratch = 6u;
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-    if (self->private_data.s_do_transform_io[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-      self->private_data.s_do_transform_io[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-      iop_a_src = io2_a_src;
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      goto suspend;
-    }
-    iop_a_src += self->private_data.s_do_transform_io[0].scratch;
-    if ((v_flags & 4u) != 0u) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-        uint16_t t_4;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_4 = wuffs_base__peek_u16le__no_bounds_check(iop_a_src);
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_transform_io[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_transform_io[0].scratch;
-            uint32_t num_bits_4 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_4;
-            if (num_bits_4 == 8) {
-              t_4 = ((uint16_t)(*scratch));
-              break;
-            }
-            num_bits_4 += 8u;
-            *scratch |= ((uint64_t)(num_bits_4)) << 56;
-          }
-        }
-        v_xlen = t_4;
-      }
-      self->private_data.s_do_transform_io[0].scratch = ((uint32_t)(v_xlen));
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-      if (self->private_data.s_do_transform_io[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_do_transform_io[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_do_transform_io[0].scratch;
-    }
-    if ((v_flags & 8u) != 0u) {
-      while (true) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_5 = *iop_a_src++;
-          v_c = t_5;
-        }
-        if (v_c == 0u) {
-          break;
-        }
-      }
-    }
-    if ((v_flags & 16u) != 0u) {
-      while (true) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_6 = *iop_a_src++;
-          v_c = t_6;
-        }
-        if (v_c == 0u) {
-          break;
-        }
-      }
-    }
-    if ((v_flags & 2u) != 0u) {
-      self->private_data.s_do_transform_io[0].scratch = 2u;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
-      if (self->private_data.s_do_transform_io[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_do_transform_io[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_do_transform_io[0].scratch;
-    }
-    if ((v_flags & 224u) != 0u) {
-      status = wuffs_base__make_status(wuffs_gzip__error__bad_encoding_flags);
-      goto exit;
-    }
-    while (true) {
-      v_mark = ((uint64_t)(iop_a_dst - io0_a_dst));
-      {
-        if (a_dst) {
-          a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        wuffs_base__status t_7 = wuffs_deflate__decoder__transform_io(&self->private_data.f_flate, a_dst, a_src, a_workbuf);
-        v_status = t_7;
-        if (a_dst) {
-          iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-        }
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-      }
-      if ( ! self->private_impl.f_ignore_checksum) {
-        v_checksum_got = wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_checksum, wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst));
-        v_decoded_length_got += ((uint32_t)(wuffs_base__io__count_since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)))));
-      }
-      if (wuffs_base__status__is_ok(&v_status)) {
-        break;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(12);
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13);
-      uint32_t t_8;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_8 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_do_transform_io[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_transform_io[0].scratch;
-          uint32_t num_bits_8 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_8;
-          if (num_bits_8 == 24) {
-            t_8 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_8 += 8u;
-          *scratch |= ((uint64_t)(num_bits_8)) << 56;
-        }
-      }
-      v_checksum_want = t_8;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15);
-      uint32_t t_9;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_9 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_do_transform_io[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_transform_io[0].scratch;
-          uint32_t num_bits_9 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_9;
-          if (num_bits_9 == 24) {
-            t_9 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_9 += 8u;
-          *scratch |= ((uint64_t)(num_bits_9)) << 56;
-        }
-      }
-      v_decoded_length_want = t_9;
-    }
-    if ( ! self->private_impl.f_ignore_checksum && ((v_checksum_got != v_checksum_want) || (v_decoded_length_got != v_decoded_length_want))) {
-      status = wuffs_base__make_status(wuffs_gzip__error__bad_checksum);
-      goto exit;
-    }
-
-    ok:
-    self->private_impl.p_do_transform_io[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_transform_io[0].v_flags = v_flags;
-  self->private_data.s_do_transform_io[0].v_checksum_got = v_checksum_got;
-  self->private_data.s_do_transform_io[0].v_decoded_length_got = v_decoded_length_got;
-  self->private_data.s_do_transform_io[0].v_checksum_want = v_checksum_want;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GZIP)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JPEG)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_jpeg__error__bad_dht_marker[] = "#jpeg: bad DHT marker";
-const char wuffs_jpeg__error__bad_dqt_marker[] = "#jpeg: bad DQT marker";
-const char wuffs_jpeg__error__bad_dri_marker[] = "#jpeg: bad DRI marker";
-const char wuffs_jpeg__error__bad_sof_marker[] = "#jpeg: bad SOF marker";
-const char wuffs_jpeg__error__bad_sos_marker[] = "#jpeg: bad SOS marker";
-const char wuffs_jpeg__error__bad_header[] = "#jpeg: bad header";
-const char wuffs_jpeg__error__bad_marker[] = "#jpeg: bad marker";
-const char wuffs_jpeg__error__missing_huffman_table[] = "#jpeg: missing Huffman table";
-const char wuffs_jpeg__error__missing_quantization_table[] = "#jpeg: missing Quantization table";
-const char wuffs_jpeg__error__truncated_input[] = "#jpeg: truncated input";
-const char wuffs_jpeg__error__unsupported_arithmetic_coding[] = "#jpeg: unsupported arithmetic coding";
-const char wuffs_jpeg__error__unsupported_color_model[] = "#jpeg: unsupported color model";
-const char wuffs_jpeg__error__unsupported_fractional_sampling[] = "#jpeg: unsupported fractional sampling";
-const char wuffs_jpeg__error__unsupported_hierarchical_coding[] = "#jpeg: unsupported hierarchical coding";
-const char wuffs_jpeg__error__unsupported_implicit_height[] = "#jpeg: unsupported implicit height";
-const char wuffs_jpeg__error__unsupported_lossless_coding[] = "#jpeg: unsupported lossless coding";
-const char wuffs_jpeg__error__unsupported_marker[] = "#jpeg: unsupported marker";
-const char wuffs_jpeg__error__unsupported_precision_12_bits[] = "#jpeg: unsupported precision (12 bits)";
-const char wuffs_jpeg__error__unsupported_precision_16_bits[] = "#jpeg: unsupported precision (16 bits)";
-const char wuffs_jpeg__error__unsupported_precision[] = "#jpeg: unsupported precision";
-const char wuffs_jpeg__error__unsupported_scan_count[] = "#jpeg: unsupported scan count";
-const char wuffs_jpeg__error__internal_error_inconsistent_decoder_state[] = "#jpeg: internal error: inconsistent decoder state";
-
-// ---------------- Private Consts
-
-static const uint8_t
-WUFFS_JPEG__UNZIG[80] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 0, 1, 8, 16, 9, 2, 3,
-  10, 17, 24, 32, 25, 18, 11, 4,
-  5, 12, 19, 26, 33, 40, 48, 41,
-  34, 27, 20, 13, 6, 7, 14, 21,
-  28, 35, 42, 49, 56, 57, 50, 43,
-  36, 29, 22, 15, 23, 30, 37, 44,
-  51, 58, 59, 52, 45, 38, 31, 39,
-  46, 53, 60, 61, 54, 47, 55, 62,
-  63, 63, 63, 63, 63, 63, 63, 63,
-  63, 63, 63, 63, 63, 63, 63, 63,
-};
-
-static const uint8_t
-WUFFS_JPEG__BIAS_AND_CLAMP[1024] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  128, 129, 130, 131, 132, 133, 134, 135,
-  136, 137, 138, 139, 140, 141, 142, 143,
-  144, 145, 146, 147, 148, 149, 150, 151,
-  152, 153, 154, 155, 156, 157, 158, 159,
-  160, 161, 162, 163, 164, 165, 166, 167,
-  168, 169, 170, 171, 172, 173, 174, 175,
-  176, 177, 178, 179, 180, 181, 182, 183,
-  184, 185, 186, 187, 188, 189, 190, 191,
-  192, 193, 194, 195, 196, 197, 198, 199,
-  200, 201, 202, 203, 204, 205, 206, 207,
-  208, 209, 210, 211, 212, 213, 214, 215,
-  216, 217, 218, 219, 220, 221, 222, 223,
-  224, 225, 226, 227, 228, 229, 230, 231,
-  232, 233, 234, 235, 236, 237, 238, 239,
-  240, 241, 242, 243, 244, 245, 246, 247,
-  248, 249, 250, 251, 252, 253, 254, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  255, 255, 255, 255, 255, 255, 255, 255,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 1, 2, 3, 4, 5, 6, 7,
-  8, 9, 10, 11, 12, 13, 14, 15,
-  16, 17, 18, 19, 20, 21, 22, 23,
-  24, 25, 26, 27, 28, 29, 30, 31,
-  32, 33, 34, 35, 36, 37, 38, 39,
-  40, 41, 42, 43, 44, 45, 46, 47,
-  48, 49, 50, 51, 52, 53, 54, 55,
-  56, 57, 58, 59, 60, 61, 62, 63,
-  64, 65, 66, 67, 68, 69, 70, 71,
-  72, 73, 74, 75, 76, 77, 78, 79,
-  80, 81, 82, 83, 84, 85, 86, 87,
-  88, 89, 90, 91, 92, 93, 94, 95,
-  96, 97, 98, 99, 100, 101, 102, 103,
-  104, 105, 106, 107, 108, 109, 110, 111,
-  112, 113, 114, 115, 116, 117, 118, 119,
-  120, 121, 122, 123, 124, 125, 126, 127,
-};
-
-static const uint16_t
-WUFFS_JPEG__EXTEND[16] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 65535, 65533, 65529, 65521, 65505, 65473, 65409,
-  65281, 65025, 64513, 63489, 61441, 57345, 49153, 32769,
-};
-
-static const uint8_t
-WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_LUMA[29] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 0, 1, 5, 1, 1, 1, 1,
-  1, 1, 0, 0, 0, 0, 0, 0,
-  0, 0, 1, 2, 3, 4, 5, 6,
-  7, 8, 9, 10, 11,
-};
-
-static const uint8_t
-WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_CHROMA[29] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  1, 0, 3, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 0, 0, 0, 0,
-  0, 0, 1, 2, 3, 4, 5, 6,
-  7, 8, 9, 10, 11,
-};
-
-static const uint8_t
-WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_LUMA[179] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  16, 0, 2, 1, 3, 3, 2, 4,
-  3, 5, 5, 4, 4, 0, 0, 1,
-  125, 1, 2, 3, 0, 4, 17, 5,
-  18, 33, 49, 65, 6, 19, 81, 97,
-  7, 34, 113, 20, 50, 129, 145, 161,
-  8, 35, 66, 177, 193, 21, 82, 209,
-  240, 36, 51, 98, 114, 130, 9, 10,
-  22, 23, 24, 25, 26, 37, 38, 39,
-  40, 41, 42, 52, 53, 54, 55, 56,
-  57, 58, 67, 68, 69, 70, 71, 72,
-  73, 74, 83, 84, 85, 86, 87, 88,
-  89, 90, 99, 100, 101, 102, 103, 104,
-  105, 106, 115, 116, 117, 118, 119, 120,
-  121, 122, 131, 132, 133, 134, 135, 136,
-  137, 138, 146, 147, 148, 149, 150, 151,
-  152, 153, 154, 162, 163, 164, 165, 166,
-  167, 168, 169, 170, 178, 179, 180, 181,
-  182, 183, 184, 185, 186, 194, 195, 196,
-  197, 198, 199, 200, 201, 202, 210, 211,
-  212, 213, 214, 215, 216, 217, 218, 225,
-  226, 227, 228, 229, 230, 231, 232, 233,
-  234, 241, 242, 243, 244, 245, 246, 247,
-  248, 249, 250,
-};
-
-static const uint8_t
-WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_CHROMA[179] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  17, 0, 2, 1, 2, 4, 4, 3,
-  4, 7, 5, 4, 4, 0, 1, 2,
-  119, 0, 1, 2, 3, 17, 4, 5,
-  33, 49, 6, 18, 65, 81, 7, 97,
-  113, 19, 34, 50, 129, 8, 20, 66,
-  145, 161, 177, 193, 9, 35, 51, 82,
-  240, 21, 98, 114, 209, 10, 22, 36,
-  52, 225, 37, 241, 23, 24, 25, 26,
-  38, 39, 40, 41, 42, 53, 54, 55,
-  56, 57, 58, 67, 68, 69, 70, 71,
-  72, 73, 74, 83, 84, 85, 86, 87,
-  88, 89, 90, 99, 100, 101, 102, 103,
-  104, 105, 106, 115, 116, 117, 118, 119,
-  120, 121, 122, 130, 131, 132, 133, 134,
-  135, 136, 137, 138, 146, 147, 148, 149,
-  150, 151, 152, 153, 154, 162, 163, 164,
-  165, 166, 167, 168, 169, 170, 178, 179,
-  180, 181, 182, 183, 184, 185, 186, 194,
-  195, 196, 197, 198, 199, 200, 201, 202,
-  210, 211, 212, 213, 214, 215, 216, 217,
-  218, 226, 227, 228, 229, 230, 231, 232,
-  233, 234, 242, 243, 244, 245, 246, 247,
-  248, 249, 250,
-};
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__decode_idct(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_dst_buffer,
-    uint64_t a_dst_stride,
-    uint32_t a_q);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__decode_idct__choosy_default(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_dst_buffer,
-    uint64_t a_dst_stride,
-    uint32_t a_q);
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__decode_idct_x86_avx2(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_dst_buffer,
-    uint64_t a_dst_stride,
-    uint32_t a_q);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_64)
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__do_decode_image_config(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_dqt(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_dri(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_appn(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    uint8_t a_marker);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_sof(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__quantize_dimension(
-    const wuffs_jpeg__decoder* self,
-    uint32_t a_width,
-    uint8_t a_h,
-    uint8_t a_max_incl_h);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__do_decode_frame_config(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__do_decode_frame(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_dht(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static bool
-wuffs_jpeg__decoder__calculate_huff_tables(
-    wuffs_jpeg__decoder* self,
-    uint8_t a_tc4_th,
-    uint32_t a_total_count);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_sos(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__prepare_scan(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__use_default_huffman_table(
-    wuffs_jpeg__decoder* self,
-    uint8_t a_tc4_th);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__calculate_single_component_scan_fields(
-    wuffs_jpeg__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-static bool
-wuffs_jpeg__decoder__calculate_multiple_component_scan_fields(
-    wuffs_jpeg__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__fill_bitstream(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__load_mcu_blocks_for_single_component(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_csel);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__load_mcu_blocks_for_single_component__choosy_default(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_csel);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__load_mcu_blocks(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__save_mcu_blocks(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__skip_past_the_next_restart_marker(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__apply_progressive_idct(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__swizzle_gray(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__swizzle_colorful(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static bool
-wuffs_jpeg__decoder__top_left_quants_has_zero(
-    const wuffs_jpeg__decoder* self,
-    uint32_t a_q);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__load_mcu_blocks_for_single_component_smooth(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_csel);
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my);
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu__choosy_default(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my);
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my);
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu_progressive_ac_low_bit(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my);
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu_progressive_dc_high_bits(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my);
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu_progressive_dc_low_bit(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my);
-
-// ---------------- VTables
-
-const wuffs_base__image_decoder__func_ptrs
-wuffs_jpeg__decoder__func_ptrs_for__wuffs_base__image_decoder = {
-  (wuffs_base__status(*)(void*,
-      wuffs_base__pixel_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__pixel_blend,
-      wuffs_base__slice_u8,
-      wuffs_base__decode_frame_options*))(&wuffs_jpeg__decoder__decode_frame),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__frame_config*,
-      wuffs_base__io_buffer*))(&wuffs_jpeg__decoder__decode_frame_config),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__image_config*,
-      wuffs_base__io_buffer*))(&wuffs_jpeg__decoder__decode_image_config),
-  (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_jpeg__decoder__frame_dirty_rect),
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_jpeg__decoder__get_quirk),
-  (uint32_t(*)(const void*))(&wuffs_jpeg__decoder__num_animation_loops),
-  (uint64_t(*)(const void*))(&wuffs_jpeg__decoder__num_decoded_frame_configs),
-  (uint64_t(*)(const void*))(&wuffs_jpeg__decoder__num_decoded_frames),
-  (wuffs_base__status(*)(void*,
-      uint64_t,
-      uint64_t))(&wuffs_jpeg__decoder__restart_frame),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_jpeg__decoder__set_quirk),
-  (wuffs_base__empty_struct(*)(void*,
-      uint32_t,
-      bool))(&wuffs_jpeg__decoder__set_report_metadata),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__more_information*,
-      wuffs_base__io_buffer*))(&wuffs_jpeg__decoder__tell_me_more),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_jpeg__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_jpeg__decoder__initialize(
-    wuffs_jpeg__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.choosy_decode_idct = &wuffs_jpeg__decoder__decode_idct__choosy_default;
-  self->private_impl.choosy_load_mcu_blocks_for_single_component = &wuffs_jpeg__decoder__load_mcu_blocks_for_single_component__choosy_default;
-  self->private_impl.choosy_decode_mcu = &wuffs_jpeg__decoder__decode_mcu__choosy_default;
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.vtable_name =
-      wuffs_base__image_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.function_pointers =
-      (const void*)(&wuffs_jpeg__decoder__func_ptrs_for__wuffs_base__image_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_jpeg__decoder*
-wuffs_jpeg__decoder__alloc() {
-  wuffs_jpeg__decoder* x =
-      (wuffs_jpeg__decoder*)(calloc(sizeof(wuffs_jpeg__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_jpeg__decoder__initialize(
-      x, sizeof(wuffs_jpeg__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_jpeg__decoder() {
-  return sizeof(wuffs_jpeg__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func jpeg.decoder.decode_idct
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__decode_idct(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_dst_buffer,
-    uint64_t a_dst_stride,
-    uint32_t a_q) {
-  return (*self->private_impl.choosy_decode_idct)(self, a_dst_buffer, a_dst_stride, a_q);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__decode_idct__choosy_default(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_dst_buffer,
-    uint64_t a_dst_stride,
-    uint32_t a_q) {
-  uint32_t v_bq0 = 0;
-  uint32_t v_bq2 = 0;
-  uint32_t v_bq4 = 0;
-  uint32_t v_bq6 = 0;
-  uint32_t v_ca = 0;
-  uint32_t v_cb2 = 0;
-  uint32_t v_cb6 = 0;
-  uint32_t v_ccp = 0;
-  uint32_t v_ccm = 0;
-  uint32_t v_cd0 = 0;
-  uint32_t v_cd1 = 0;
-  uint32_t v_cd2 = 0;
-  uint32_t v_cd3 = 0;
-  uint32_t v_bq1 = 0;
-  uint32_t v_bq3 = 0;
-  uint32_t v_bq5 = 0;
-  uint32_t v_bq7 = 0;
-  uint32_t v_ci51 = 0;
-  uint32_t v_ci53 = 0;
-  uint32_t v_ci71 = 0;
-  uint32_t v_ci73 = 0;
-  uint32_t v_cj = 0;
-  uint32_t v_ck1 = 0;
-  uint32_t v_ck3 = 0;
-  uint32_t v_ck5 = 0;
-  uint32_t v_ck7 = 0;
-  uint32_t v_cl51 = 0;
-  uint32_t v_cl73 = 0;
-  uint32_t v_in0 = 0;
-  uint32_t v_in2 = 0;
-  uint32_t v_in4 = 0;
-  uint32_t v_in6 = 0;
-  uint32_t v_ra = 0;
-  uint32_t v_rb2 = 0;
-  uint32_t v_rb6 = 0;
-  uint32_t v_rcp = 0;
-  uint32_t v_rcm = 0;
-  uint32_t v_rd0 = 0;
-  uint32_t v_rd1 = 0;
-  uint32_t v_rd2 = 0;
-  uint32_t v_rd3 = 0;
-  uint32_t v_in1 = 0;
-  uint32_t v_in3 = 0;
-  uint32_t v_in5 = 0;
-  uint32_t v_in7 = 0;
-  uint32_t v_ri51 = 0;
-  uint32_t v_ri53 = 0;
-  uint32_t v_ri71 = 0;
-  uint32_t v_ri73 = 0;
-  uint32_t v_rj = 0;
-  uint32_t v_rk1 = 0;
-  uint32_t v_rk3 = 0;
-  uint32_t v_rk5 = 0;
-  uint32_t v_rk7 = 0;
-  uint32_t v_rl51 = 0;
-  uint32_t v_rl73 = 0;
-  uint32_t v_intermediate[64] = {0};
-
-  if (8u > a_dst_stride) {
-    return wuffs_base__make_empty_struct();
-  }
-  if (0u == (self->private_data.f_mcu_blocks[0u][8u] |
-      self->private_data.f_mcu_blocks[0u][16u] |
-      self->private_data.f_mcu_blocks[0u][24u] |
-      self->private_data.f_mcu_blocks[0u][32u] |
-      self->private_data.f_mcu_blocks[0u][40u] |
-      self->private_data.f_mcu_blocks[0u][48u] |
-      self->private_data.f_mcu_blocks[0u][56u])) {
-    v_intermediate[0u] = ((uint32_t)(((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][0u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][0u])))) << 2u));
-    v_intermediate[8u] = v_intermediate[0u];
-    v_intermediate[16u] = v_intermediate[0u];
-    v_intermediate[24u] = v_intermediate[0u];
-    v_intermediate[32u] = v_intermediate[0u];
-    v_intermediate[40u] = v_intermediate[0u];
-    v_intermediate[48u] = v_intermediate[0u];
-    v_intermediate[56u] = v_intermediate[0u];
-  } else {
-    v_bq2 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][16u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][16u]))));
-    v_bq6 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][48u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][48u]))));
-    v_ca = ((uint32_t)(((uint32_t)(v_bq2 + v_bq6)) * 4433u));
-    v_cb2 = ((uint32_t)(v_ca + ((uint32_t)(v_bq2 * 6270u))));
-    v_cb6 = ((uint32_t)(v_ca - ((uint32_t)(v_bq6 * 15137u))));
-    v_bq0 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][0u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][0u]))));
-    v_bq4 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][32u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][32u]))));
-    v_ccp = ((uint32_t)(((uint32_t)(v_bq0 + v_bq4)) << 13u));
-    v_ccm = ((uint32_t)(((uint32_t)(v_bq0 - v_bq4)) << 13u));
-    v_cd0 = ((uint32_t)(v_ccp + v_cb2));
-    v_cd1 = ((uint32_t)(v_ccm + v_cb6));
-    v_cd2 = ((uint32_t)(v_ccm - v_cb6));
-    v_cd3 = ((uint32_t)(v_ccp - v_cb2));
-    v_bq1 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][8u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][8u]))));
-    v_bq3 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][24u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][24u]))));
-    v_bq5 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][40u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][40u]))));
-    v_bq7 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][56u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][56u]))));
-    v_ci51 = ((uint32_t)(v_bq5 + v_bq1));
-    v_ci53 = ((uint32_t)(v_bq5 + v_bq3));
-    v_ci71 = ((uint32_t)(v_bq7 + v_bq1));
-    v_ci73 = ((uint32_t)(v_bq7 + v_bq3));
-    v_cj = ((uint32_t)(((uint32_t)(v_ci73 + v_ci51)) * 9633u));
-    v_ck1 = ((uint32_t)(v_bq1 * 12299u));
-    v_ck3 = ((uint32_t)(v_bq3 * 25172u));
-    v_ck5 = ((uint32_t)(v_bq5 * 16819u));
-    v_ck7 = ((uint32_t)(v_bq7 * 2446u));
-    v_ci51 *= 4294964100u;
-    v_ci53 *= 4294946301u;
-    v_ci71 *= 4294959923u;
-    v_ci73 *= 4294951227u;
-    v_cl51 = ((uint32_t)(v_ci51 + v_cj));
-    v_cl73 = ((uint32_t)(v_ci73 + v_cj));
-    v_ck1 += ((uint32_t)(v_ci71 + v_cl51));
-    v_ck3 += ((uint32_t)(v_ci53 + v_cl73));
-    v_ck5 += ((uint32_t)(v_ci53 + v_cl51));
-    v_ck7 += ((uint32_t)(v_ci71 + v_cl73));
-    v_intermediate[0u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 + v_ck1)) + 1024u)), 11u);
-    v_intermediate[56u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 - v_ck1)) + 1024u)), 11u);
-    v_intermediate[8u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 + v_ck3)) + 1024u)), 11u);
-    v_intermediate[48u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 - v_ck3)) + 1024u)), 11u);
-    v_intermediate[16u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 + v_ck5)) + 1024u)), 11u);
-    v_intermediate[40u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 - v_ck5)) + 1024u)), 11u);
-    v_intermediate[24u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 + v_ck7)) + 1024u)), 11u);
-    v_intermediate[32u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 - v_ck7)) + 1024u)), 11u);
-  }
-  if (0u == (self->private_data.f_mcu_blocks[0u][9u] |
-      self->private_data.f_mcu_blocks[0u][17u] |
-      self->private_data.f_mcu_blocks[0u][25u] |
-      self->private_data.f_mcu_blocks[0u][33u] |
-      self->private_data.f_mcu_blocks[0u][41u] |
-      self->private_data.f_mcu_blocks[0u][49u] |
-      self->private_data.f_mcu_blocks[0u][57u])) {
-    v_intermediate[1u] = ((uint32_t)(((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][1u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][1u])))) << 2u));
-    v_intermediate[9u] = v_intermediate[1u];
-    v_intermediate[17u] = v_intermediate[1u];
-    v_intermediate[25u] = v_intermediate[1u];
-    v_intermediate[33u] = v_intermediate[1u];
-    v_intermediate[41u] = v_intermediate[1u];
-    v_intermediate[49u] = v_intermediate[1u];
-    v_intermediate[57u] = v_intermediate[1u];
-  } else {
-    v_bq2 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][17u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][17u]))));
-    v_bq6 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][49u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][49u]))));
-    v_ca = ((uint32_t)(((uint32_t)(v_bq2 + v_bq6)) * 4433u));
-    v_cb2 = ((uint32_t)(v_ca + ((uint32_t)(v_bq2 * 6270u))));
-    v_cb6 = ((uint32_t)(v_ca - ((uint32_t)(v_bq6 * 15137u))));
-    v_bq0 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][1u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][1u]))));
-    v_bq4 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][33u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][33u]))));
-    v_ccp = ((uint32_t)(((uint32_t)(v_bq0 + v_bq4)) << 13u));
-    v_ccm = ((uint32_t)(((uint32_t)(v_bq0 - v_bq4)) << 13u));
-    v_cd0 = ((uint32_t)(v_ccp + v_cb2));
-    v_cd1 = ((uint32_t)(v_ccm + v_cb6));
-    v_cd2 = ((uint32_t)(v_ccm - v_cb6));
-    v_cd3 = ((uint32_t)(v_ccp - v_cb2));
-    v_bq1 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][9u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][9u]))));
-    v_bq3 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][25u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][25u]))));
-    v_bq5 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][41u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][41u]))));
-    v_bq7 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][57u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][57u]))));
-    v_ci51 = ((uint32_t)(v_bq5 + v_bq1));
-    v_ci53 = ((uint32_t)(v_bq5 + v_bq3));
-    v_ci71 = ((uint32_t)(v_bq7 + v_bq1));
-    v_ci73 = ((uint32_t)(v_bq7 + v_bq3));
-    v_cj = ((uint32_t)(((uint32_t)(v_ci73 + v_ci51)) * 9633u));
-    v_ck1 = ((uint32_t)(v_bq1 * 12299u));
-    v_ck3 = ((uint32_t)(v_bq3 * 25172u));
-    v_ck5 = ((uint32_t)(v_bq5 * 16819u));
-    v_ck7 = ((uint32_t)(v_bq7 * 2446u));
-    v_ci51 *= 4294964100u;
-    v_ci53 *= 4294946301u;
-    v_ci71 *= 4294959923u;
-    v_ci73 *= 4294951227u;
-    v_cl51 = ((uint32_t)(v_ci51 + v_cj));
-    v_cl73 = ((uint32_t)(v_ci73 + v_cj));
-    v_ck1 += ((uint32_t)(v_ci71 + v_cl51));
-    v_ck3 += ((uint32_t)(v_ci53 + v_cl73));
-    v_ck5 += ((uint32_t)(v_ci53 + v_cl51));
-    v_ck7 += ((uint32_t)(v_ci71 + v_cl73));
-    v_intermediate[1u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 + v_ck1)) + 1024u)), 11u);
-    v_intermediate[57u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 - v_ck1)) + 1024u)), 11u);
-    v_intermediate[9u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 + v_ck3)) + 1024u)), 11u);
-    v_intermediate[49u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 - v_ck3)) + 1024u)), 11u);
-    v_intermediate[17u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 + v_ck5)) + 1024u)), 11u);
-    v_intermediate[41u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 - v_ck5)) + 1024u)), 11u);
-    v_intermediate[25u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 + v_ck7)) + 1024u)), 11u);
-    v_intermediate[33u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 - v_ck7)) + 1024u)), 11u);
-  }
-  if (0u == (self->private_data.f_mcu_blocks[0u][10u] |
-      self->private_data.f_mcu_blocks[0u][18u] |
-      self->private_data.f_mcu_blocks[0u][26u] |
-      self->private_data.f_mcu_blocks[0u][34u] |
-      self->private_data.f_mcu_blocks[0u][42u] |
-      self->private_data.f_mcu_blocks[0u][50u] |
-      self->private_data.f_mcu_blocks[0u][58u])) {
-    v_intermediate[2u] = ((uint32_t)(((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][2u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][2u])))) << 2u));
-    v_intermediate[10u] = v_intermediate[2u];
-    v_intermediate[18u] = v_intermediate[2u];
-    v_intermediate[26u] = v_intermediate[2u];
-    v_intermediate[34u] = v_intermediate[2u];
-    v_intermediate[42u] = v_intermediate[2u];
-    v_intermediate[50u] = v_intermediate[2u];
-    v_intermediate[58u] = v_intermediate[2u];
-  } else {
-    v_bq2 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][18u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][18u]))));
-    v_bq6 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][50u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][50u]))));
-    v_ca = ((uint32_t)(((uint32_t)(v_bq2 + v_bq6)) * 4433u));
-    v_cb2 = ((uint32_t)(v_ca + ((uint32_t)(v_bq2 * 6270u))));
-    v_cb6 = ((uint32_t)(v_ca - ((uint32_t)(v_bq6 * 15137u))));
-    v_bq0 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][2u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][2u]))));
-    v_bq4 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][34u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][34u]))));
-    v_ccp = ((uint32_t)(((uint32_t)(v_bq0 + v_bq4)) << 13u));
-    v_ccm = ((uint32_t)(((uint32_t)(v_bq0 - v_bq4)) << 13u));
-    v_cd0 = ((uint32_t)(v_ccp + v_cb2));
-    v_cd1 = ((uint32_t)(v_ccm + v_cb6));
-    v_cd2 = ((uint32_t)(v_ccm - v_cb6));
-    v_cd3 = ((uint32_t)(v_ccp - v_cb2));
-    v_bq1 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][10u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][10u]))));
-    v_bq3 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][26u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][26u]))));
-    v_bq5 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][42u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][42u]))));
-    v_bq7 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][58u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][58u]))));
-    v_ci51 = ((uint32_t)(v_bq5 + v_bq1));
-    v_ci53 = ((uint32_t)(v_bq5 + v_bq3));
-    v_ci71 = ((uint32_t)(v_bq7 + v_bq1));
-    v_ci73 = ((uint32_t)(v_bq7 + v_bq3));
-    v_cj = ((uint32_t)(((uint32_t)(v_ci73 + v_ci51)) * 9633u));
-    v_ck1 = ((uint32_t)(v_bq1 * 12299u));
-    v_ck3 = ((uint32_t)(v_bq3 * 25172u));
-    v_ck5 = ((uint32_t)(v_bq5 * 16819u));
-    v_ck7 = ((uint32_t)(v_bq7 * 2446u));
-    v_ci51 *= 4294964100u;
-    v_ci53 *= 4294946301u;
-    v_ci71 *= 4294959923u;
-    v_ci73 *= 4294951227u;
-    v_cl51 = ((uint32_t)(v_ci51 + v_cj));
-    v_cl73 = ((uint32_t)(v_ci73 + v_cj));
-    v_ck1 += ((uint32_t)(v_ci71 + v_cl51));
-    v_ck3 += ((uint32_t)(v_ci53 + v_cl73));
-    v_ck5 += ((uint32_t)(v_ci53 + v_cl51));
-    v_ck7 += ((uint32_t)(v_ci71 + v_cl73));
-    v_intermediate[2u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 + v_ck1)) + 1024u)), 11u);
-    v_intermediate[58u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 - v_ck1)) + 1024u)), 11u);
-    v_intermediate[10u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 + v_ck3)) + 1024u)), 11u);
-    v_intermediate[50u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 - v_ck3)) + 1024u)), 11u);
-    v_intermediate[18u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 + v_ck5)) + 1024u)), 11u);
-    v_intermediate[42u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 - v_ck5)) + 1024u)), 11u);
-    v_intermediate[26u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 + v_ck7)) + 1024u)), 11u);
-    v_intermediate[34u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 - v_ck7)) + 1024u)), 11u);
-  }
-  if (0u == (self->private_data.f_mcu_blocks[0u][11u] |
-      self->private_data.f_mcu_blocks[0u][19u] |
-      self->private_data.f_mcu_blocks[0u][27u] |
-      self->private_data.f_mcu_blocks[0u][35u] |
-      self->private_data.f_mcu_blocks[0u][43u] |
-      self->private_data.f_mcu_blocks[0u][51u] |
-      self->private_data.f_mcu_blocks[0u][59u])) {
-    v_intermediate[3u] = ((uint32_t)(((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][3u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][3u])))) << 2u));
-    v_intermediate[11u] = v_intermediate[3u];
-    v_intermediate[19u] = v_intermediate[3u];
-    v_intermediate[27u] = v_intermediate[3u];
-    v_intermediate[35u] = v_intermediate[3u];
-    v_intermediate[43u] = v_intermediate[3u];
-    v_intermediate[51u] = v_intermediate[3u];
-    v_intermediate[59u] = v_intermediate[3u];
-  } else {
-    v_bq2 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][19u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][19u]))));
-    v_bq6 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][51u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][51u]))));
-    v_ca = ((uint32_t)(((uint32_t)(v_bq2 + v_bq6)) * 4433u));
-    v_cb2 = ((uint32_t)(v_ca + ((uint32_t)(v_bq2 * 6270u))));
-    v_cb6 = ((uint32_t)(v_ca - ((uint32_t)(v_bq6 * 15137u))));
-    v_bq0 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][3u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][3u]))));
-    v_bq4 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][35u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][35u]))));
-    v_ccp = ((uint32_t)(((uint32_t)(v_bq0 + v_bq4)) << 13u));
-    v_ccm = ((uint32_t)(((uint32_t)(v_bq0 - v_bq4)) << 13u));
-    v_cd0 = ((uint32_t)(v_ccp + v_cb2));
-    v_cd1 = ((uint32_t)(v_ccm + v_cb6));
-    v_cd2 = ((uint32_t)(v_ccm - v_cb6));
-    v_cd3 = ((uint32_t)(v_ccp - v_cb2));
-    v_bq1 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][11u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][11u]))));
-    v_bq3 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][27u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][27u]))));
-    v_bq5 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][43u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][43u]))));
-    v_bq7 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][59u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][59u]))));
-    v_ci51 = ((uint32_t)(v_bq5 + v_bq1));
-    v_ci53 = ((uint32_t)(v_bq5 + v_bq3));
-    v_ci71 = ((uint32_t)(v_bq7 + v_bq1));
-    v_ci73 = ((uint32_t)(v_bq7 + v_bq3));
-    v_cj = ((uint32_t)(((uint32_t)(v_ci73 + v_ci51)) * 9633u));
-    v_ck1 = ((uint32_t)(v_bq1 * 12299u));
-    v_ck3 = ((uint32_t)(v_bq3 * 25172u));
-    v_ck5 = ((uint32_t)(v_bq5 * 16819u));
-    v_ck7 = ((uint32_t)(v_bq7 * 2446u));
-    v_ci51 *= 4294964100u;
-    v_ci53 *= 4294946301u;
-    v_ci71 *= 4294959923u;
-    v_ci73 *= 4294951227u;
-    v_cl51 = ((uint32_t)(v_ci51 + v_cj));
-    v_cl73 = ((uint32_t)(v_ci73 + v_cj));
-    v_ck1 += ((uint32_t)(v_ci71 + v_cl51));
-    v_ck3 += ((uint32_t)(v_ci53 + v_cl73));
-    v_ck5 += ((uint32_t)(v_ci53 + v_cl51));
-    v_ck7 += ((uint32_t)(v_ci71 + v_cl73));
-    v_intermediate[3u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 + v_ck1)) + 1024u)), 11u);
-    v_intermediate[59u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 - v_ck1)) + 1024u)), 11u);
-    v_intermediate[11u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 + v_ck3)) + 1024u)), 11u);
-    v_intermediate[51u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 - v_ck3)) + 1024u)), 11u);
-    v_intermediate[19u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 + v_ck5)) + 1024u)), 11u);
-    v_intermediate[43u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 - v_ck5)) + 1024u)), 11u);
-    v_intermediate[27u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 + v_ck7)) + 1024u)), 11u);
-    v_intermediate[35u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 - v_ck7)) + 1024u)), 11u);
-  }
-  if (0u == (self->private_data.f_mcu_blocks[0u][12u] |
-      self->private_data.f_mcu_blocks[0u][20u] |
-      self->private_data.f_mcu_blocks[0u][28u] |
-      self->private_data.f_mcu_blocks[0u][36u] |
-      self->private_data.f_mcu_blocks[0u][44u] |
-      self->private_data.f_mcu_blocks[0u][52u] |
-      self->private_data.f_mcu_blocks[0u][60u])) {
-    v_intermediate[4u] = ((uint32_t)(((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][4u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][4u])))) << 2u));
-    v_intermediate[12u] = v_intermediate[4u];
-    v_intermediate[20u] = v_intermediate[4u];
-    v_intermediate[28u] = v_intermediate[4u];
-    v_intermediate[36u] = v_intermediate[4u];
-    v_intermediate[44u] = v_intermediate[4u];
-    v_intermediate[52u] = v_intermediate[4u];
-    v_intermediate[60u] = v_intermediate[4u];
-  } else {
-    v_bq2 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][20u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][20u]))));
-    v_bq6 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][52u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][52u]))));
-    v_ca = ((uint32_t)(((uint32_t)(v_bq2 + v_bq6)) * 4433u));
-    v_cb2 = ((uint32_t)(v_ca + ((uint32_t)(v_bq2 * 6270u))));
-    v_cb6 = ((uint32_t)(v_ca - ((uint32_t)(v_bq6 * 15137u))));
-    v_bq0 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][4u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][4u]))));
-    v_bq4 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][36u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][36u]))));
-    v_ccp = ((uint32_t)(((uint32_t)(v_bq0 + v_bq4)) << 13u));
-    v_ccm = ((uint32_t)(((uint32_t)(v_bq0 - v_bq4)) << 13u));
-    v_cd0 = ((uint32_t)(v_ccp + v_cb2));
-    v_cd1 = ((uint32_t)(v_ccm + v_cb6));
-    v_cd2 = ((uint32_t)(v_ccm - v_cb6));
-    v_cd3 = ((uint32_t)(v_ccp - v_cb2));
-    v_bq1 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][12u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][12u]))));
-    v_bq3 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][28u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][28u]))));
-    v_bq5 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][44u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][44u]))));
-    v_bq7 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][60u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][60u]))));
-    v_ci51 = ((uint32_t)(v_bq5 + v_bq1));
-    v_ci53 = ((uint32_t)(v_bq5 + v_bq3));
-    v_ci71 = ((uint32_t)(v_bq7 + v_bq1));
-    v_ci73 = ((uint32_t)(v_bq7 + v_bq3));
-    v_cj = ((uint32_t)(((uint32_t)(v_ci73 + v_ci51)) * 9633u));
-    v_ck1 = ((uint32_t)(v_bq1 * 12299u));
-    v_ck3 = ((uint32_t)(v_bq3 * 25172u));
-    v_ck5 = ((uint32_t)(v_bq5 * 16819u));
-    v_ck7 = ((uint32_t)(v_bq7 * 2446u));
-    v_ci51 *= 4294964100u;
-    v_ci53 *= 4294946301u;
-    v_ci71 *= 4294959923u;
-    v_ci73 *= 4294951227u;
-    v_cl51 = ((uint32_t)(v_ci51 + v_cj));
-    v_cl73 = ((uint32_t)(v_ci73 + v_cj));
-    v_ck1 += ((uint32_t)(v_ci71 + v_cl51));
-    v_ck3 += ((uint32_t)(v_ci53 + v_cl73));
-    v_ck5 += ((uint32_t)(v_ci53 + v_cl51));
-    v_ck7 += ((uint32_t)(v_ci71 + v_cl73));
-    v_intermediate[4u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 + v_ck1)) + 1024u)), 11u);
-    v_intermediate[60u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 - v_ck1)) + 1024u)), 11u);
-    v_intermediate[12u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 + v_ck3)) + 1024u)), 11u);
-    v_intermediate[52u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 - v_ck3)) + 1024u)), 11u);
-    v_intermediate[20u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 + v_ck5)) + 1024u)), 11u);
-    v_intermediate[44u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 - v_ck5)) + 1024u)), 11u);
-    v_intermediate[28u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 + v_ck7)) + 1024u)), 11u);
-    v_intermediate[36u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 - v_ck7)) + 1024u)), 11u);
-  }
-  if (0u == (self->private_data.f_mcu_blocks[0u][13u] |
-      self->private_data.f_mcu_blocks[0u][21u] |
-      self->private_data.f_mcu_blocks[0u][29u] |
-      self->private_data.f_mcu_blocks[0u][37u] |
-      self->private_data.f_mcu_blocks[0u][45u] |
-      self->private_data.f_mcu_blocks[0u][53u] |
-      self->private_data.f_mcu_blocks[0u][61u])) {
-    v_intermediate[5u] = ((uint32_t)(((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][5u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][5u])))) << 2u));
-    v_intermediate[13u] = v_intermediate[5u];
-    v_intermediate[21u] = v_intermediate[5u];
-    v_intermediate[29u] = v_intermediate[5u];
-    v_intermediate[37u] = v_intermediate[5u];
-    v_intermediate[45u] = v_intermediate[5u];
-    v_intermediate[53u] = v_intermediate[5u];
-    v_intermediate[61u] = v_intermediate[5u];
-  } else {
-    v_bq2 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][21u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][21u]))));
-    v_bq6 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][53u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][53u]))));
-    v_ca = ((uint32_t)(((uint32_t)(v_bq2 + v_bq6)) * 4433u));
-    v_cb2 = ((uint32_t)(v_ca + ((uint32_t)(v_bq2 * 6270u))));
-    v_cb6 = ((uint32_t)(v_ca - ((uint32_t)(v_bq6 * 15137u))));
-    v_bq0 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][5u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][5u]))));
-    v_bq4 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][37u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][37u]))));
-    v_ccp = ((uint32_t)(((uint32_t)(v_bq0 + v_bq4)) << 13u));
-    v_ccm = ((uint32_t)(((uint32_t)(v_bq0 - v_bq4)) << 13u));
-    v_cd0 = ((uint32_t)(v_ccp + v_cb2));
-    v_cd1 = ((uint32_t)(v_ccm + v_cb6));
-    v_cd2 = ((uint32_t)(v_ccm - v_cb6));
-    v_cd3 = ((uint32_t)(v_ccp - v_cb2));
-    v_bq1 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][13u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][13u]))));
-    v_bq3 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][29u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][29u]))));
-    v_bq5 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][45u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][45u]))));
-    v_bq7 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][61u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][61u]))));
-    v_ci51 = ((uint32_t)(v_bq5 + v_bq1));
-    v_ci53 = ((uint32_t)(v_bq5 + v_bq3));
-    v_ci71 = ((uint32_t)(v_bq7 + v_bq1));
-    v_ci73 = ((uint32_t)(v_bq7 + v_bq3));
-    v_cj = ((uint32_t)(((uint32_t)(v_ci73 + v_ci51)) * 9633u));
-    v_ck1 = ((uint32_t)(v_bq1 * 12299u));
-    v_ck3 = ((uint32_t)(v_bq3 * 25172u));
-    v_ck5 = ((uint32_t)(v_bq5 * 16819u));
-    v_ck7 = ((uint32_t)(v_bq7 * 2446u));
-    v_ci51 *= 4294964100u;
-    v_ci53 *= 4294946301u;
-    v_ci71 *= 4294959923u;
-    v_ci73 *= 4294951227u;
-    v_cl51 = ((uint32_t)(v_ci51 + v_cj));
-    v_cl73 = ((uint32_t)(v_ci73 + v_cj));
-    v_ck1 += ((uint32_t)(v_ci71 + v_cl51));
-    v_ck3 += ((uint32_t)(v_ci53 + v_cl73));
-    v_ck5 += ((uint32_t)(v_ci53 + v_cl51));
-    v_ck7 += ((uint32_t)(v_ci71 + v_cl73));
-    v_intermediate[5u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 + v_ck1)) + 1024u)), 11u);
-    v_intermediate[61u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 - v_ck1)) + 1024u)), 11u);
-    v_intermediate[13u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 + v_ck3)) + 1024u)), 11u);
-    v_intermediate[53u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 - v_ck3)) + 1024u)), 11u);
-    v_intermediate[21u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 + v_ck5)) + 1024u)), 11u);
-    v_intermediate[45u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 - v_ck5)) + 1024u)), 11u);
-    v_intermediate[29u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 + v_ck7)) + 1024u)), 11u);
-    v_intermediate[37u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 - v_ck7)) + 1024u)), 11u);
-  }
-  if (0u == (self->private_data.f_mcu_blocks[0u][14u] |
-      self->private_data.f_mcu_blocks[0u][22u] |
-      self->private_data.f_mcu_blocks[0u][30u] |
-      self->private_data.f_mcu_blocks[0u][38u] |
-      self->private_data.f_mcu_blocks[0u][46u] |
-      self->private_data.f_mcu_blocks[0u][54u] |
-      self->private_data.f_mcu_blocks[0u][62u])) {
-    v_intermediate[6u] = ((uint32_t)(((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][6u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][6u])))) << 2u));
-    v_intermediate[14u] = v_intermediate[6u];
-    v_intermediate[22u] = v_intermediate[6u];
-    v_intermediate[30u] = v_intermediate[6u];
-    v_intermediate[38u] = v_intermediate[6u];
-    v_intermediate[46u] = v_intermediate[6u];
-    v_intermediate[54u] = v_intermediate[6u];
-    v_intermediate[62u] = v_intermediate[6u];
-  } else {
-    v_bq2 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][22u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][22u]))));
-    v_bq6 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][54u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][54u]))));
-    v_ca = ((uint32_t)(((uint32_t)(v_bq2 + v_bq6)) * 4433u));
-    v_cb2 = ((uint32_t)(v_ca + ((uint32_t)(v_bq2 * 6270u))));
-    v_cb6 = ((uint32_t)(v_ca - ((uint32_t)(v_bq6 * 15137u))));
-    v_bq0 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][6u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][6u]))));
-    v_bq4 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][38u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][38u]))));
-    v_ccp = ((uint32_t)(((uint32_t)(v_bq0 + v_bq4)) << 13u));
-    v_ccm = ((uint32_t)(((uint32_t)(v_bq0 - v_bq4)) << 13u));
-    v_cd0 = ((uint32_t)(v_ccp + v_cb2));
-    v_cd1 = ((uint32_t)(v_ccm + v_cb6));
-    v_cd2 = ((uint32_t)(v_ccm - v_cb6));
-    v_cd3 = ((uint32_t)(v_ccp - v_cb2));
-    v_bq1 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][14u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][14u]))));
-    v_bq3 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][30u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][30u]))));
-    v_bq5 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][46u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][46u]))));
-    v_bq7 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][62u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][62u]))));
-    v_ci51 = ((uint32_t)(v_bq5 + v_bq1));
-    v_ci53 = ((uint32_t)(v_bq5 + v_bq3));
-    v_ci71 = ((uint32_t)(v_bq7 + v_bq1));
-    v_ci73 = ((uint32_t)(v_bq7 + v_bq3));
-    v_cj = ((uint32_t)(((uint32_t)(v_ci73 + v_ci51)) * 9633u));
-    v_ck1 = ((uint32_t)(v_bq1 * 12299u));
-    v_ck3 = ((uint32_t)(v_bq3 * 25172u));
-    v_ck5 = ((uint32_t)(v_bq5 * 16819u));
-    v_ck7 = ((uint32_t)(v_bq7 * 2446u));
-    v_ci51 *= 4294964100u;
-    v_ci53 *= 4294946301u;
-    v_ci71 *= 4294959923u;
-    v_ci73 *= 4294951227u;
-    v_cl51 = ((uint32_t)(v_ci51 + v_cj));
-    v_cl73 = ((uint32_t)(v_ci73 + v_cj));
-    v_ck1 += ((uint32_t)(v_ci71 + v_cl51));
-    v_ck3 += ((uint32_t)(v_ci53 + v_cl73));
-    v_ck5 += ((uint32_t)(v_ci53 + v_cl51));
-    v_ck7 += ((uint32_t)(v_ci71 + v_cl73));
-    v_intermediate[6u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 + v_ck1)) + 1024u)), 11u);
-    v_intermediate[62u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 - v_ck1)) + 1024u)), 11u);
-    v_intermediate[14u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 + v_ck3)) + 1024u)), 11u);
-    v_intermediate[54u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 - v_ck3)) + 1024u)), 11u);
-    v_intermediate[22u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 + v_ck5)) + 1024u)), 11u);
-    v_intermediate[46u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 - v_ck5)) + 1024u)), 11u);
-    v_intermediate[30u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 + v_ck7)) + 1024u)), 11u);
-    v_intermediate[38u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 - v_ck7)) + 1024u)), 11u);
-  }
-  if (0u == (self->private_data.f_mcu_blocks[0u][15u] |
-      self->private_data.f_mcu_blocks[0u][23u] |
-      self->private_data.f_mcu_blocks[0u][31u] |
-      self->private_data.f_mcu_blocks[0u][39u] |
-      self->private_data.f_mcu_blocks[0u][47u] |
-      self->private_data.f_mcu_blocks[0u][55u] |
-      self->private_data.f_mcu_blocks[0u][63u])) {
-    v_intermediate[7u] = ((uint32_t)(((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][7u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][7u])))) << 2u));
-    v_intermediate[15u] = v_intermediate[7u];
-    v_intermediate[23u] = v_intermediate[7u];
-    v_intermediate[31u] = v_intermediate[7u];
-    v_intermediate[39u] = v_intermediate[7u];
-    v_intermediate[47u] = v_intermediate[7u];
-    v_intermediate[55u] = v_intermediate[7u];
-    v_intermediate[63u] = v_intermediate[7u];
-  } else {
-    v_bq2 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][23u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][23u]))));
-    v_bq6 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][55u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][55u]))));
-    v_ca = ((uint32_t)(((uint32_t)(v_bq2 + v_bq6)) * 4433u));
-    v_cb2 = ((uint32_t)(v_ca + ((uint32_t)(v_bq2 * 6270u))));
-    v_cb6 = ((uint32_t)(v_ca - ((uint32_t)(v_bq6 * 15137u))));
-    v_bq0 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][7u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][7u]))));
-    v_bq4 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][39u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][39u]))));
-    v_ccp = ((uint32_t)(((uint32_t)(v_bq0 + v_bq4)) << 13u));
-    v_ccm = ((uint32_t)(((uint32_t)(v_bq0 - v_bq4)) << 13u));
-    v_cd0 = ((uint32_t)(v_ccp + v_cb2));
-    v_cd1 = ((uint32_t)(v_ccm + v_cb6));
-    v_cd2 = ((uint32_t)(v_ccm - v_cb6));
-    v_cd3 = ((uint32_t)(v_ccp - v_cb2));
-    v_bq1 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][15u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][15u]))));
-    v_bq3 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][31u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][31u]))));
-    v_bq5 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][47u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][47u]))));
-    v_bq7 = ((uint32_t)(wuffs_base__utility__sign_extend_convert_u16_u32(self->private_data.f_mcu_blocks[0u][63u]) * ((uint32_t)(self->private_impl.f_quant_tables[a_q][63u]))));
-    v_ci51 = ((uint32_t)(v_bq5 + v_bq1));
-    v_ci53 = ((uint32_t)(v_bq5 + v_bq3));
-    v_ci71 = ((uint32_t)(v_bq7 + v_bq1));
-    v_ci73 = ((uint32_t)(v_bq7 + v_bq3));
-    v_cj = ((uint32_t)(((uint32_t)(v_ci73 + v_ci51)) * 9633u));
-    v_ck1 = ((uint32_t)(v_bq1 * 12299u));
-    v_ck3 = ((uint32_t)(v_bq3 * 25172u));
-    v_ck5 = ((uint32_t)(v_bq5 * 16819u));
-    v_ck7 = ((uint32_t)(v_bq7 * 2446u));
-    v_ci51 *= 4294964100u;
-    v_ci53 *= 4294946301u;
-    v_ci71 *= 4294959923u;
-    v_ci73 *= 4294951227u;
-    v_cl51 = ((uint32_t)(v_ci51 + v_cj));
-    v_cl73 = ((uint32_t)(v_ci73 + v_cj));
-    v_ck1 += ((uint32_t)(v_ci71 + v_cl51));
-    v_ck3 += ((uint32_t)(v_ci53 + v_cl73));
-    v_ck5 += ((uint32_t)(v_ci53 + v_cl51));
-    v_ck7 += ((uint32_t)(v_ci71 + v_cl73));
-    v_intermediate[7u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 + v_ck1)) + 1024u)), 11u);
-    v_intermediate[63u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd0 - v_ck1)) + 1024u)), 11u);
-    v_intermediate[15u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 + v_ck3)) + 1024u)), 11u);
-    v_intermediate[55u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd1 - v_ck3)) + 1024u)), 11u);
-    v_intermediate[23u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 + v_ck5)) + 1024u)), 11u);
-    v_intermediate[47u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd2 - v_ck5)) + 1024u)), 11u);
-    v_intermediate[31u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 + v_ck7)) + 1024u)), 11u);
-    v_intermediate[39u] = wuffs_base__utility__sign_extend_rshift_u32(((uint32_t)(((uint32_t)(v_cd3 - v_ck7)) + 1024u)), 11u);
-  }
-  if (0u == (v_intermediate[1u] |
-      v_intermediate[2u] |
-      v_intermediate[3u] |
-      v_intermediate[4u] |
-      v_intermediate[5u] |
-      v_intermediate[6u] |
-      v_intermediate[7u])) {
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(v_intermediate[0u] + 16u)) >> 5u) & 1023u)];
-    a_dst_buffer.ptr[1u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[2u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[3u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[4u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[5u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[6u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[7u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  } else {
-    v_in2 = v_intermediate[2u];
-    v_in6 = v_intermediate[6u];
-    v_ra = ((uint32_t)(((uint32_t)(v_in2 + v_in6)) * 4433u));
-    v_rb2 = ((uint32_t)(v_ra + ((uint32_t)(v_in2 * 6270u))));
-    v_rb6 = ((uint32_t)(v_ra - ((uint32_t)(v_in6 * 15137u))));
-    v_in0 = v_intermediate[0u];
-    v_in4 = v_intermediate[4u];
-    v_rcp = ((uint32_t)(((uint32_t)(v_in0 + v_in4)) << 13u));
-    v_rcm = ((uint32_t)(((uint32_t)(v_in0 - v_in4)) << 13u));
-    v_rd0 = ((uint32_t)(v_rcp + v_rb2));
-    v_rd1 = ((uint32_t)(v_rcm + v_rb6));
-    v_rd2 = ((uint32_t)(v_rcm - v_rb6));
-    v_rd3 = ((uint32_t)(v_rcp - v_rb2));
-    v_in1 = v_intermediate[1u];
-    v_in3 = v_intermediate[3u];
-    v_in5 = v_intermediate[5u];
-    v_in7 = v_intermediate[7u];
-    v_ri51 = ((uint32_t)(v_in5 + v_in1));
-    v_ri53 = ((uint32_t)(v_in5 + v_in3));
-    v_ri71 = ((uint32_t)(v_in7 + v_in1));
-    v_ri73 = ((uint32_t)(v_in7 + v_in3));
-    v_rj = ((uint32_t)(((uint32_t)(v_ri73 + v_ri51)) * 9633u));
-    v_rk1 = ((uint32_t)(v_in1 * 12299u));
-    v_rk3 = ((uint32_t)(v_in3 * 25172u));
-    v_rk5 = ((uint32_t)(v_in5 * 16819u));
-    v_rk7 = ((uint32_t)(v_in7 * 2446u));
-    v_ri51 *= 4294964100u;
-    v_ri53 *= 4294946301u;
-    v_ri71 *= 4294959923u;
-    v_ri73 *= 4294951227u;
-    v_rl51 = ((uint32_t)(v_ri51 + v_rj));
-    v_rl73 = ((uint32_t)(v_ri73 + v_rj));
-    v_rk1 += ((uint32_t)(v_ri71 + v_rl51));
-    v_rk3 += ((uint32_t)(v_ri53 + v_rl73));
-    v_rk5 += ((uint32_t)(v_ri53 + v_rl51));
-    v_rk7 += ((uint32_t)(v_ri71 + v_rl73));
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 + v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[7u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 - v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[1u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 + v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[6u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 - v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[2u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 + v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[5u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 - v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[3u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 + v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[4u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 - v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  }
-  if (0u == (v_intermediate[9u] |
-      v_intermediate[10u] |
-      v_intermediate[11u] |
-      v_intermediate[12u] |
-      v_intermediate[13u] |
-      v_intermediate[14u] |
-      v_intermediate[15u])) {
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(v_intermediate[8u] + 16u)) >> 5u) & 1023u)];
-    a_dst_buffer.ptr[1u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[2u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[3u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[4u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[5u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[6u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[7u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  } else {
-    v_in2 = v_intermediate[10u];
-    v_in6 = v_intermediate[14u];
-    v_ra = ((uint32_t)(((uint32_t)(v_in2 + v_in6)) * 4433u));
-    v_rb2 = ((uint32_t)(v_ra + ((uint32_t)(v_in2 * 6270u))));
-    v_rb6 = ((uint32_t)(v_ra - ((uint32_t)(v_in6 * 15137u))));
-    v_in0 = v_intermediate[8u];
-    v_in4 = v_intermediate[12u];
-    v_rcp = ((uint32_t)(((uint32_t)(v_in0 + v_in4)) << 13u));
-    v_rcm = ((uint32_t)(((uint32_t)(v_in0 - v_in4)) << 13u));
-    v_rd0 = ((uint32_t)(v_rcp + v_rb2));
-    v_rd1 = ((uint32_t)(v_rcm + v_rb6));
-    v_rd2 = ((uint32_t)(v_rcm - v_rb6));
-    v_rd3 = ((uint32_t)(v_rcp - v_rb2));
-    v_in1 = v_intermediate[9u];
-    v_in3 = v_intermediate[11u];
-    v_in5 = v_intermediate[13u];
-    v_in7 = v_intermediate[15u];
-    v_ri51 = ((uint32_t)(v_in5 + v_in1));
-    v_ri53 = ((uint32_t)(v_in5 + v_in3));
-    v_ri71 = ((uint32_t)(v_in7 + v_in1));
-    v_ri73 = ((uint32_t)(v_in7 + v_in3));
-    v_rj = ((uint32_t)(((uint32_t)(v_ri73 + v_ri51)) * 9633u));
-    v_rk1 = ((uint32_t)(v_in1 * 12299u));
-    v_rk3 = ((uint32_t)(v_in3 * 25172u));
-    v_rk5 = ((uint32_t)(v_in5 * 16819u));
-    v_rk7 = ((uint32_t)(v_in7 * 2446u));
-    v_ri51 *= 4294964100u;
-    v_ri53 *= 4294946301u;
-    v_ri71 *= 4294959923u;
-    v_ri73 *= 4294951227u;
-    v_rl51 = ((uint32_t)(v_ri51 + v_rj));
-    v_rl73 = ((uint32_t)(v_ri73 + v_rj));
-    v_rk1 += ((uint32_t)(v_ri71 + v_rl51));
-    v_rk3 += ((uint32_t)(v_ri53 + v_rl73));
-    v_rk5 += ((uint32_t)(v_ri53 + v_rl51));
-    v_rk7 += ((uint32_t)(v_ri71 + v_rl73));
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 + v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[7u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 - v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[1u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 + v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[6u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 - v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[2u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 + v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[5u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 - v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[3u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 + v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[4u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 - v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  }
-  if (0u == (v_intermediate[17u] |
-      v_intermediate[18u] |
-      v_intermediate[19u] |
-      v_intermediate[20u] |
-      v_intermediate[21u] |
-      v_intermediate[22u] |
-      v_intermediate[23u])) {
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(v_intermediate[16u] + 16u)) >> 5u) & 1023u)];
-    a_dst_buffer.ptr[1u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[2u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[3u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[4u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[5u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[6u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[7u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  } else {
-    v_in2 = v_intermediate[18u];
-    v_in6 = v_intermediate[22u];
-    v_ra = ((uint32_t)(((uint32_t)(v_in2 + v_in6)) * 4433u));
-    v_rb2 = ((uint32_t)(v_ra + ((uint32_t)(v_in2 * 6270u))));
-    v_rb6 = ((uint32_t)(v_ra - ((uint32_t)(v_in6 * 15137u))));
-    v_in0 = v_intermediate[16u];
-    v_in4 = v_intermediate[20u];
-    v_rcp = ((uint32_t)(((uint32_t)(v_in0 + v_in4)) << 13u));
-    v_rcm = ((uint32_t)(((uint32_t)(v_in0 - v_in4)) << 13u));
-    v_rd0 = ((uint32_t)(v_rcp + v_rb2));
-    v_rd1 = ((uint32_t)(v_rcm + v_rb6));
-    v_rd2 = ((uint32_t)(v_rcm - v_rb6));
-    v_rd3 = ((uint32_t)(v_rcp - v_rb2));
-    v_in1 = v_intermediate[17u];
-    v_in3 = v_intermediate[19u];
-    v_in5 = v_intermediate[21u];
-    v_in7 = v_intermediate[23u];
-    v_ri51 = ((uint32_t)(v_in5 + v_in1));
-    v_ri53 = ((uint32_t)(v_in5 + v_in3));
-    v_ri71 = ((uint32_t)(v_in7 + v_in1));
-    v_ri73 = ((uint32_t)(v_in7 + v_in3));
-    v_rj = ((uint32_t)(((uint32_t)(v_ri73 + v_ri51)) * 9633u));
-    v_rk1 = ((uint32_t)(v_in1 * 12299u));
-    v_rk3 = ((uint32_t)(v_in3 * 25172u));
-    v_rk5 = ((uint32_t)(v_in5 * 16819u));
-    v_rk7 = ((uint32_t)(v_in7 * 2446u));
-    v_ri51 *= 4294964100u;
-    v_ri53 *= 4294946301u;
-    v_ri71 *= 4294959923u;
-    v_ri73 *= 4294951227u;
-    v_rl51 = ((uint32_t)(v_ri51 + v_rj));
-    v_rl73 = ((uint32_t)(v_ri73 + v_rj));
-    v_rk1 += ((uint32_t)(v_ri71 + v_rl51));
-    v_rk3 += ((uint32_t)(v_ri53 + v_rl73));
-    v_rk5 += ((uint32_t)(v_ri53 + v_rl51));
-    v_rk7 += ((uint32_t)(v_ri71 + v_rl73));
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 + v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[7u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 - v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[1u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 + v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[6u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 - v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[2u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 + v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[5u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 - v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[3u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 + v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[4u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 - v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  }
-  if (0u == (v_intermediate[25u] |
-      v_intermediate[26u] |
-      v_intermediate[27u] |
-      v_intermediate[28u] |
-      v_intermediate[29u] |
-      v_intermediate[30u] |
-      v_intermediate[31u])) {
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(v_intermediate[24u] + 16u)) >> 5u) & 1023u)];
-    a_dst_buffer.ptr[1u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[2u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[3u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[4u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[5u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[6u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[7u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  } else {
-    v_in2 = v_intermediate[26u];
-    v_in6 = v_intermediate[30u];
-    v_ra = ((uint32_t)(((uint32_t)(v_in2 + v_in6)) * 4433u));
-    v_rb2 = ((uint32_t)(v_ra + ((uint32_t)(v_in2 * 6270u))));
-    v_rb6 = ((uint32_t)(v_ra - ((uint32_t)(v_in6 * 15137u))));
-    v_in0 = v_intermediate[24u];
-    v_in4 = v_intermediate[28u];
-    v_rcp = ((uint32_t)(((uint32_t)(v_in0 + v_in4)) << 13u));
-    v_rcm = ((uint32_t)(((uint32_t)(v_in0 - v_in4)) << 13u));
-    v_rd0 = ((uint32_t)(v_rcp + v_rb2));
-    v_rd1 = ((uint32_t)(v_rcm + v_rb6));
-    v_rd2 = ((uint32_t)(v_rcm - v_rb6));
-    v_rd3 = ((uint32_t)(v_rcp - v_rb2));
-    v_in1 = v_intermediate[25u];
-    v_in3 = v_intermediate[27u];
-    v_in5 = v_intermediate[29u];
-    v_in7 = v_intermediate[31u];
-    v_ri51 = ((uint32_t)(v_in5 + v_in1));
-    v_ri53 = ((uint32_t)(v_in5 + v_in3));
-    v_ri71 = ((uint32_t)(v_in7 + v_in1));
-    v_ri73 = ((uint32_t)(v_in7 + v_in3));
-    v_rj = ((uint32_t)(((uint32_t)(v_ri73 + v_ri51)) * 9633u));
-    v_rk1 = ((uint32_t)(v_in1 * 12299u));
-    v_rk3 = ((uint32_t)(v_in3 * 25172u));
-    v_rk5 = ((uint32_t)(v_in5 * 16819u));
-    v_rk7 = ((uint32_t)(v_in7 * 2446u));
-    v_ri51 *= 4294964100u;
-    v_ri53 *= 4294946301u;
-    v_ri71 *= 4294959923u;
-    v_ri73 *= 4294951227u;
-    v_rl51 = ((uint32_t)(v_ri51 + v_rj));
-    v_rl73 = ((uint32_t)(v_ri73 + v_rj));
-    v_rk1 += ((uint32_t)(v_ri71 + v_rl51));
-    v_rk3 += ((uint32_t)(v_ri53 + v_rl73));
-    v_rk5 += ((uint32_t)(v_ri53 + v_rl51));
-    v_rk7 += ((uint32_t)(v_ri71 + v_rl73));
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 + v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[7u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 - v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[1u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 + v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[6u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 - v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[2u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 + v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[5u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 - v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[3u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 + v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[4u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 - v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  }
-  if (0u == (v_intermediate[33u] |
-      v_intermediate[34u] |
-      v_intermediate[35u] |
-      v_intermediate[36u] |
-      v_intermediate[37u] |
-      v_intermediate[38u] |
-      v_intermediate[39u])) {
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(v_intermediate[32u] + 16u)) >> 5u) & 1023u)];
-    a_dst_buffer.ptr[1u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[2u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[3u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[4u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[5u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[6u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[7u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  } else {
-    v_in2 = v_intermediate[34u];
-    v_in6 = v_intermediate[38u];
-    v_ra = ((uint32_t)(((uint32_t)(v_in2 + v_in6)) * 4433u));
-    v_rb2 = ((uint32_t)(v_ra + ((uint32_t)(v_in2 * 6270u))));
-    v_rb6 = ((uint32_t)(v_ra - ((uint32_t)(v_in6 * 15137u))));
-    v_in0 = v_intermediate[32u];
-    v_in4 = v_intermediate[36u];
-    v_rcp = ((uint32_t)(((uint32_t)(v_in0 + v_in4)) << 13u));
-    v_rcm = ((uint32_t)(((uint32_t)(v_in0 - v_in4)) << 13u));
-    v_rd0 = ((uint32_t)(v_rcp + v_rb2));
-    v_rd1 = ((uint32_t)(v_rcm + v_rb6));
-    v_rd2 = ((uint32_t)(v_rcm - v_rb6));
-    v_rd3 = ((uint32_t)(v_rcp - v_rb2));
-    v_in1 = v_intermediate[33u];
-    v_in3 = v_intermediate[35u];
-    v_in5 = v_intermediate[37u];
-    v_in7 = v_intermediate[39u];
-    v_ri51 = ((uint32_t)(v_in5 + v_in1));
-    v_ri53 = ((uint32_t)(v_in5 + v_in3));
-    v_ri71 = ((uint32_t)(v_in7 + v_in1));
-    v_ri73 = ((uint32_t)(v_in7 + v_in3));
-    v_rj = ((uint32_t)(((uint32_t)(v_ri73 + v_ri51)) * 9633u));
-    v_rk1 = ((uint32_t)(v_in1 * 12299u));
-    v_rk3 = ((uint32_t)(v_in3 * 25172u));
-    v_rk5 = ((uint32_t)(v_in5 * 16819u));
-    v_rk7 = ((uint32_t)(v_in7 * 2446u));
-    v_ri51 *= 4294964100u;
-    v_ri53 *= 4294946301u;
-    v_ri71 *= 4294959923u;
-    v_ri73 *= 4294951227u;
-    v_rl51 = ((uint32_t)(v_ri51 + v_rj));
-    v_rl73 = ((uint32_t)(v_ri73 + v_rj));
-    v_rk1 += ((uint32_t)(v_ri71 + v_rl51));
-    v_rk3 += ((uint32_t)(v_ri53 + v_rl73));
-    v_rk5 += ((uint32_t)(v_ri53 + v_rl51));
-    v_rk7 += ((uint32_t)(v_ri71 + v_rl73));
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 + v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[7u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 - v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[1u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 + v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[6u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 - v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[2u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 + v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[5u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 - v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[3u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 + v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[4u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 - v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  }
-  if (0u == (v_intermediate[41u] |
-      v_intermediate[42u] |
-      v_intermediate[43u] |
-      v_intermediate[44u] |
-      v_intermediate[45u] |
-      v_intermediate[46u] |
-      v_intermediate[47u])) {
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(v_intermediate[40u] + 16u)) >> 5u) & 1023u)];
-    a_dst_buffer.ptr[1u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[2u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[3u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[4u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[5u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[6u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[7u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  } else {
-    v_in2 = v_intermediate[42u];
-    v_in6 = v_intermediate[46u];
-    v_ra = ((uint32_t)(((uint32_t)(v_in2 + v_in6)) * 4433u));
-    v_rb2 = ((uint32_t)(v_ra + ((uint32_t)(v_in2 * 6270u))));
-    v_rb6 = ((uint32_t)(v_ra - ((uint32_t)(v_in6 * 15137u))));
-    v_in0 = v_intermediate[40u];
-    v_in4 = v_intermediate[44u];
-    v_rcp = ((uint32_t)(((uint32_t)(v_in0 + v_in4)) << 13u));
-    v_rcm = ((uint32_t)(((uint32_t)(v_in0 - v_in4)) << 13u));
-    v_rd0 = ((uint32_t)(v_rcp + v_rb2));
-    v_rd1 = ((uint32_t)(v_rcm + v_rb6));
-    v_rd2 = ((uint32_t)(v_rcm - v_rb6));
-    v_rd3 = ((uint32_t)(v_rcp - v_rb2));
-    v_in1 = v_intermediate[41u];
-    v_in3 = v_intermediate[43u];
-    v_in5 = v_intermediate[45u];
-    v_in7 = v_intermediate[47u];
-    v_ri51 = ((uint32_t)(v_in5 + v_in1));
-    v_ri53 = ((uint32_t)(v_in5 + v_in3));
-    v_ri71 = ((uint32_t)(v_in7 + v_in1));
-    v_ri73 = ((uint32_t)(v_in7 + v_in3));
-    v_rj = ((uint32_t)(((uint32_t)(v_ri73 + v_ri51)) * 9633u));
-    v_rk1 = ((uint32_t)(v_in1 * 12299u));
-    v_rk3 = ((uint32_t)(v_in3 * 25172u));
-    v_rk5 = ((uint32_t)(v_in5 * 16819u));
-    v_rk7 = ((uint32_t)(v_in7 * 2446u));
-    v_ri51 *= 4294964100u;
-    v_ri53 *= 4294946301u;
-    v_ri71 *= 4294959923u;
-    v_ri73 *= 4294951227u;
-    v_rl51 = ((uint32_t)(v_ri51 + v_rj));
-    v_rl73 = ((uint32_t)(v_ri73 + v_rj));
-    v_rk1 += ((uint32_t)(v_ri71 + v_rl51));
-    v_rk3 += ((uint32_t)(v_ri53 + v_rl73));
-    v_rk5 += ((uint32_t)(v_ri53 + v_rl51));
-    v_rk7 += ((uint32_t)(v_ri71 + v_rl73));
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 + v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[7u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 - v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[1u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 + v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[6u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 - v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[2u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 + v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[5u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 - v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[3u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 + v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[4u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 - v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  }
-  if (0u == (v_intermediate[49u] |
-      v_intermediate[50u] |
-      v_intermediate[51u] |
-      v_intermediate[52u] |
-      v_intermediate[53u] |
-      v_intermediate[54u] |
-      v_intermediate[55u])) {
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(v_intermediate[48u] + 16u)) >> 5u) & 1023u)];
-    a_dst_buffer.ptr[1u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[2u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[3u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[4u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[5u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[6u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[7u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  } else {
-    v_in2 = v_intermediate[50u];
-    v_in6 = v_intermediate[54u];
-    v_ra = ((uint32_t)(((uint32_t)(v_in2 + v_in6)) * 4433u));
-    v_rb2 = ((uint32_t)(v_ra + ((uint32_t)(v_in2 * 6270u))));
-    v_rb6 = ((uint32_t)(v_ra - ((uint32_t)(v_in6 * 15137u))));
-    v_in0 = v_intermediate[48u];
-    v_in4 = v_intermediate[52u];
-    v_rcp = ((uint32_t)(((uint32_t)(v_in0 + v_in4)) << 13u));
-    v_rcm = ((uint32_t)(((uint32_t)(v_in0 - v_in4)) << 13u));
-    v_rd0 = ((uint32_t)(v_rcp + v_rb2));
-    v_rd1 = ((uint32_t)(v_rcm + v_rb6));
-    v_rd2 = ((uint32_t)(v_rcm - v_rb6));
-    v_rd3 = ((uint32_t)(v_rcp - v_rb2));
-    v_in1 = v_intermediate[49u];
-    v_in3 = v_intermediate[51u];
-    v_in5 = v_intermediate[53u];
-    v_in7 = v_intermediate[55u];
-    v_ri51 = ((uint32_t)(v_in5 + v_in1));
-    v_ri53 = ((uint32_t)(v_in5 + v_in3));
-    v_ri71 = ((uint32_t)(v_in7 + v_in1));
-    v_ri73 = ((uint32_t)(v_in7 + v_in3));
-    v_rj = ((uint32_t)(((uint32_t)(v_ri73 + v_ri51)) * 9633u));
-    v_rk1 = ((uint32_t)(v_in1 * 12299u));
-    v_rk3 = ((uint32_t)(v_in3 * 25172u));
-    v_rk5 = ((uint32_t)(v_in5 * 16819u));
-    v_rk7 = ((uint32_t)(v_in7 * 2446u));
-    v_ri51 *= 4294964100u;
-    v_ri53 *= 4294946301u;
-    v_ri71 *= 4294959923u;
-    v_ri73 *= 4294951227u;
-    v_rl51 = ((uint32_t)(v_ri51 + v_rj));
-    v_rl73 = ((uint32_t)(v_ri73 + v_rj));
-    v_rk1 += ((uint32_t)(v_ri71 + v_rl51));
-    v_rk3 += ((uint32_t)(v_ri53 + v_rl73));
-    v_rk5 += ((uint32_t)(v_ri53 + v_rl51));
-    v_rk7 += ((uint32_t)(v_ri71 + v_rl73));
-    if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 + v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[7u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 - v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[1u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 + v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[6u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 - v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[2u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 + v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[5u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 - v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[3u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 + v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[4u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 - v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  }
-  if (0u == (v_intermediate[57u] |
-      v_intermediate[58u] |
-      v_intermediate[59u] |
-      v_intermediate[60u] |
-      v_intermediate[61u] |
-      v_intermediate[62u] |
-      v_intermediate[63u])) {
-    if (8u > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(v_intermediate[56u] + 16u)) >> 5u) & 1023u)];
-    a_dst_buffer.ptr[1u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[2u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[3u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[4u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[5u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[6u] = a_dst_buffer.ptr[0u];
-    a_dst_buffer.ptr[7u] = a_dst_buffer.ptr[0u];
-  } else {
-    v_in2 = v_intermediate[58u];
-    v_in6 = v_intermediate[62u];
-    v_ra = ((uint32_t)(((uint32_t)(v_in2 + v_in6)) * 4433u));
-    v_rb2 = ((uint32_t)(v_ra + ((uint32_t)(v_in2 * 6270u))));
-    v_rb6 = ((uint32_t)(v_ra - ((uint32_t)(v_in6 * 15137u))));
-    v_in0 = v_intermediate[56u];
-    v_in4 = v_intermediate[60u];
-    v_rcp = ((uint32_t)(((uint32_t)(v_in0 + v_in4)) << 13u));
-    v_rcm = ((uint32_t)(((uint32_t)(v_in0 - v_in4)) << 13u));
-    v_rd0 = ((uint32_t)(v_rcp + v_rb2));
-    v_rd1 = ((uint32_t)(v_rcm + v_rb6));
-    v_rd2 = ((uint32_t)(v_rcm - v_rb6));
-    v_rd3 = ((uint32_t)(v_rcp - v_rb2));
-    v_in1 = v_intermediate[57u];
-    v_in3 = v_intermediate[59u];
-    v_in5 = v_intermediate[61u];
-    v_in7 = v_intermediate[63u];
-    v_ri51 = ((uint32_t)(v_in5 + v_in1));
-    v_ri53 = ((uint32_t)(v_in5 + v_in3));
-    v_ri71 = ((uint32_t)(v_in7 + v_in1));
-    v_ri73 = ((uint32_t)(v_in7 + v_in3));
-    v_rj = ((uint32_t)(((uint32_t)(v_ri73 + v_ri51)) * 9633u));
-    v_rk1 = ((uint32_t)(v_in1 * 12299u));
-    v_rk3 = ((uint32_t)(v_in3 * 25172u));
-    v_rk5 = ((uint32_t)(v_in5 * 16819u));
-    v_rk7 = ((uint32_t)(v_in7 * 2446u));
-    v_ri51 *= 4294964100u;
-    v_ri53 *= 4294946301u;
-    v_ri71 *= 4294959923u;
-    v_ri73 *= 4294951227u;
-    v_rl51 = ((uint32_t)(v_ri51 + v_rj));
-    v_rl73 = ((uint32_t)(v_ri73 + v_rj));
-    v_rk1 += ((uint32_t)(v_ri71 + v_rl51));
-    v_rk3 += ((uint32_t)(v_ri53 + v_rl73));
-    v_rk5 += ((uint32_t)(v_ri53 + v_rl51));
-    v_rk7 += ((uint32_t)(v_ri71 + v_rl73));
-    if (8u > ((uint64_t)(a_dst_buffer.len))) {
-      return wuffs_base__make_empty_struct();
-    }
-    a_dst_buffer.ptr[0u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 + v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[7u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd0 - v_rk1)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[1u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 + v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[6u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd1 - v_rk3)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[2u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 + v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[5u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd2 - v_rk5)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[3u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 + v_rk7)) + 131072u)) >> 18u) & 1023u)];
-    a_dst_buffer.ptr[4u] = WUFFS_JPEG__BIAS_AND_CLAMP[((((uint32_t)(((uint32_t)(v_rd3 - v_rk7)) + 131072u)) >> 18u) & 1023u)];
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_avx2
-// -------- func jpeg.decoder.decode_idct_x86_avx2
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__decode_idct_x86_avx2(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_dst_buffer,
-    uint64_t a_dst_stride,
-    uint32_t a_q) {
-  __m256i v_k_0000 = {0};
-  __m256i v_k_8080 = {0};
-  __m256i v_k_0000_0002 = {0};
-  __m256i v_k_0001_FFFF = {0};
-  __m256i v_k_0400_0000 = {0};
-  __m256i v_k_29CF_1151_D630_1151 = {0};
-  __m256i v_k_E333_133E_ADFD_1051 = {0};
-  __m256i v_k_E6DC_25A1_1925_25A1 = {0};
-  __m256i v_k_ECC1_E333_EFB0_ADFD = {0};
-  __m128i v_az_coeffs = {0};
-  __m256i v_az_ah00 = {0};
-  __m256i v_az_ad00 = {0};
-  __m256i v_az_eh00 = {0};
-  __m256i v_az_adeh = {0};
-  __m256i v_rows01 = {0};
-  __m256i v_rows23 = {0};
-  __m256i v_rows45 = {0};
-  __m256i v_rows67 = {0};
-  __m256i v_quants01 = {0};
-  __m256i v_quants23 = {0};
-  __m256i v_quants45 = {0};
-  __m256i v_quants67 = {0};
-  __m256i v_rows04 = {0};
-  __m256i v_rows31 = {0};
-  __m256i v_rows26 = {0};
-  __m256i v_rows75 = {0};
-  __m256i v_fp_rows62 = {0};
-  __m256i v_fp_bq2662ad = {0};
-  __m256i v_fp_bq2662eh = {0};
-  __m256i v_fp_cb26ad = {0};
-  __m256i v_fp_cb26eh = {0};
-  __m256i v_fp_rows40pos = {0};
-  __m256i v_fp_rows04neg = {0};
-  __m256i v_fp_rows0pm4 = {0};
-  __m256i v_fp_ccpmad = {0};
-  __m256i v_fp_ccpmeh = {0};
-  __m256i v_fp_cd01ad = {0};
-  __m256i v_fp_cd01eh = {0};
-  __m256i v_fp_cd32ad = {0};
-  __m256i v_fp_cd32eh = {0};
-  __m256i v_fp_sums7351 = {0};
-  __m256i v_fp_sums5173 = {0};
-  __m256i v_fp_ci73515173ad = {0};
-  __m256i v_fp_ci73515173eh = {0};
-  __m256i v_fp_cl7351ad = {0};
-  __m256i v_fp_cl7351eh = {0};
-  __m256i v_fp_rows13 = {0};
-  __m256i v_fp_bq7153ad = {0};
-  __m256i v_fp_bq7153eh = {0};
-  __m256i v_fp_ck75ad = {0};
-  __m256i v_fp_ck75eh = {0};
-  __m256i v_fp_cl5173ad = {0};
-  __m256i v_fp_cl5173eh = {0};
-  __m256i v_fp_ck13ad = {0};
-  __m256i v_fp_ck13eh = {0};
-  __m256i v_intermediate01ad = {0};
-  __m256i v_intermediate01eh = {0};
-  __m256i v_intermediate01 = {0};
-  __m256i v_intermediate32ad = {0};
-  __m256i v_intermediate32eh = {0};
-  __m256i v_intermediate32 = {0};
-  __m256i v_intermediate45ad = {0};
-  __m256i v_intermediate45eh = {0};
-  __m256i v_intermediate45 = {0};
-  __m256i v_intermediate76ad = {0};
-  __m256i v_intermediate76eh = {0};
-  __m256i v_intermediate76 = {0};
-  __m256i v_ita0a1e0e1 = {0};
-  __m256i v_ita2a3e2e3 = {0};
-  __m256i v_ita4a5e4e5 = {0};
-  __m256i v_ita6a7e6e7 = {0};
-  __m256i v_ita0c0e0g0 = {0};
-  __m256i v_ita1c1e1g1 = {0};
-  __m256i v_ita4c4e4g4 = {0};
-  __m256i v_ita5c5e5g5 = {0};
-  __m256i v_ita0b0e0f0 = {0};
-  __m256i v_ita4b4e4f4 = {0};
-  __m256i v_itc0d0g0h0 = {0};
-  __m256i v_itc4d4g4h4 = {0};
-  __m256i v_intermediateae = {0};
-  __m256i v_intermediatebf = {0};
-  __m256i v_intermediatecg = {0};
-  __m256i v_intermediatedh = {0};
-  __m256i v_intermediatedb = {0};
-  __m256i v_intermediatehf = {0};
-  __m256i v_sp_cols62 = {0};
-  __m256i v_sp_bq2662ad = {0};
-  __m256i v_sp_bq2662eh = {0};
-  __m256i v_sp_rb26ad = {0};
-  __m256i v_sp_rb26eh = {0};
-  __m256i v_sp_cols40pos = {0};
-  __m256i v_sp_cols04neg = {0};
-  __m256i v_sp_cols0pm4 = {0};
-  __m256i v_sp_rcpmad = {0};
-  __m256i v_sp_rcpmeh = {0};
-  __m256i v_sp_rd01ad = {0};
-  __m256i v_sp_rd01eh = {0};
-  __m256i v_sp_rd32ad = {0};
-  __m256i v_sp_rd32eh = {0};
-  __m256i v_sp_sums7351 = {0};
-  __m256i v_sp_sums5173 = {0};
-  __m256i v_sp_ri73515173ad = {0};
-  __m256i v_sp_ri73515173eh = {0};
-  __m256i v_sp_rl7351ad = {0};
-  __m256i v_sp_rl7351eh = {0};
-  __m256i v_sp_cols13 = {0};
-  __m256i v_sp_bq7153ad = {0};
-  __m256i v_sp_bq7153eh = {0};
-  __m256i v_sp_rk75ad = {0};
-  __m256i v_sp_rk75eh = {0};
-  __m256i v_sp_rl5173ad = {0};
-  __m256i v_sp_rl5173eh = {0};
-  __m256i v_sp_rk13ad = {0};
-  __m256i v_sp_rk13eh = {0};
-  __m256i v_final01ad = {0};
-  __m256i v_final01eh = {0};
-  __m256i v_final01 = {0};
-  __m256i v_final32ad = {0};
-  __m256i v_final32eh = {0};
-  __m256i v_final32 = {0};
-  __m256i v_final45ad = {0};
-  __m256i v_final45eh = {0};
-  __m256i v_final45 = {0};
-  __m256i v_final76ad = {0};
-  __m256i v_final76eh = {0};
-  __m256i v_final76 = {0};
-  __m256i v_fta0a1e0e1 = {0};
-  __m256i v_fta2a3e2e3 = {0};
-  __m256i v_fta4a5e4e5 = {0};
-  __m256i v_fta6a7e6e7 = {0};
-  __m256i v_fta0c0e0g0 = {0};
-  __m256i v_fta1c1e1g1 = {0};
-  __m256i v_fta4c4e4g4 = {0};
-  __m256i v_fta5c5e5g5 = {0};
-  __m256i v_fta0b0e0f0 = {0};
-  __m256i v_ftc0d0g0h0 = {0};
-  __m256i v_fta4b4e4f4 = {0};
-  __m256i v_ftc4d4g4h4 = {0};
-  __m256i v_finalae = {0};
-  __m256i v_finalbf = {0};
-  __m256i v_finalcg = {0};
-  __m256i v_finaldh = {0};
-  __m256i v_final0145 = {0};
-  __m256i v_final2367 = {0};
-  uint64_t v_final0 = 0;
-  uint64_t v_final1 = 0;
-  uint64_t v_final2 = 0;
-  uint64_t v_final3 = 0;
-  uint64_t v_final4 = 0;
-  uint64_t v_final5 = 0;
-  uint64_t v_final6 = 0;
-  uint64_t v_final7 = 0;
-  wuffs_base__slice_u8 v_remaining = {0};
-
-  if (8u > a_dst_stride) {
-    return wuffs_base__make_empty_struct();
-  }
-  v_k_0000 = _mm256_set_epi16((int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u), (int16_t)(0u));
-  v_k_8080 = _mm256_set_epi16((int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u), (int16_t)(32896u));
-  v_k_0000_0002 = _mm256_set_epi16((int16_t)(2u), (int16_t)(0u), (int16_t)(2u), (int16_t)(0u), (int16_t)(2u), (int16_t)(0u), (int16_t)(2u), (int16_t)(0u), (int16_t)(2u), (int16_t)(0u), (int16_t)(2u), (int16_t)(0u), (int16_t)(2u), (int16_t)(0u), (int16_t)(2u), (int16_t)(0u));
-  v_k_0001_FFFF = _mm256_set_epi16((int16_t)(65535u), (int16_t)(65535u), (int16_t)(65535u), (int16_t)(65535u), (int16_t)(65535u), (int16_t)(65535u), (int16_t)(65535u), (int16_t)(65535u), (int16_t)(1u), (int16_t)(1u), (int16_t)(1u), (int16_t)(1u), (int16_t)(1u), (int16_t)(1u), (int16_t)(1u), (int16_t)(1u));
-  v_k_0400_0000 = _mm256_set_epi16((int16_t)(0u), (int16_t)(1024u), (int16_t)(0u), (int16_t)(1024u), (int16_t)(0u), (int16_t)(1024u), (int16_t)(0u), (int16_t)(1024u), (int16_t)(0u), (int16_t)(1024u), (int16_t)(0u), (int16_t)(1024u), (int16_t)(0u), (int16_t)(1024u), (int16_t)(0u), (int16_t)(1024u));
-  v_k_29CF_1151_D630_1151 = _mm256_set_epi16((int16_t)(4433u), (int16_t)(54832u), (int16_t)(4433u), (int16_t)(54832u), (int16_t)(4433u), (int16_t)(54832u), (int16_t)(4433u), (int16_t)(54832u), (int16_t)(4433u), (int16_t)(10703u), (int16_t)(4433u), (int16_t)(10703u), (int16_t)(4433u), (int16_t)(10703u), (int16_t)(4433u), (int16_t)(10703u));
-  v_k_E333_133E_ADFD_1051 = _mm256_set_epi16((int16_t)(4177u), (int16_t)(44541u), (int16_t)(4177u), (int16_t)(44541u), (int16_t)(4177u), (int16_t)(44541u), (int16_t)(4177u), (int16_t)(44541u), (int16_t)(4926u), (int16_t)(58163u), (int16_t)(4926u), (int16_t)(58163u), (int16_t)(4926u), (int16_t)(58163u), (int16_t)(4926u), (int16_t)(58163u));
-  v_k_E6DC_25A1_1925_25A1 = _mm256_set_epi16((int16_t)(9633u), (int16_t)(6437u), (int16_t)(9633u), (int16_t)(6437u), (int16_t)(9633u), (int16_t)(6437u), (int16_t)(9633u), (int16_t)(6437u), (int16_t)(9633u), (int16_t)(59100u), (int16_t)(9633u), (int16_t)(59100u), (int16_t)(9633u), (int16_t)(59100u), (int16_t)(9633u), (int16_t)(59100u));
-  v_k_ECC1_E333_EFB0_ADFD = _mm256_set_epi16((int16_t)(44541u), (int16_t)(61360u), (int16_t)(44541u), (int16_t)(61360u), (int16_t)(44541u), (int16_t)(61360u), (int16_t)(44541u), (int16_t)(61360u), (int16_t)(58163u), (int16_t)(60609u), (int16_t)(58163u), (int16_t)(60609u), (int16_t)(58163u), (int16_t)(60609u), (int16_t)(58163u), (int16_t)(60609u));
-  do {
-    if (0u == (wuffs_base__peek_u64le__no_bounds_check((const uint8_t*)(const void*)(self->private_data.f_mcu_blocks[0u] + 8u)) | wuffs_base__peek_u64le__no_bounds_check((const uint8_t*)(const void*)(self->private_data.f_mcu_blocks[0u] + 16u)))) {
-      v_az_coeffs = _mm_or_si128(_mm_or_si128(_mm_or_si128(_mm_or_si128(_mm_or_si128(_mm_or_si128(_mm_lddqu_si128((const __m128i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 8u)), _mm_lddqu_si128((const __m128i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 16u))), _mm_lddqu_si128((const __m128i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 24u))), _mm_lddqu_si128((const __m128i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 32u))), _mm_lddqu_si128((const __m128i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 40u))), _mm_lddqu_si128((const __m128i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 48u))), _mm_lddqu_si128((const __m128i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 56u)));
-      if (0u == ((uint64_t)(_mm_cvtsi128_si64(_mm_packs_epi16(v_az_coeffs, v_az_coeffs))))) {
-        v_rows01 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 0u));
-        v_quants01 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_impl.f_quant_tables[a_q] + 0u));
-        v_rows01 = _mm256_mullo_epi16(v_rows01, v_quants01);
-        v_az_ah00 = _mm256_slli_epi16(v_rows01, (int32_t)(2u));
-        v_az_ad00 = _mm256_unpacklo_epi16(v_az_ah00, v_az_ah00);
-        v_az_eh00 = _mm256_unpackhi_epi16(v_az_ah00, v_az_ah00);
-        v_az_adeh = _mm256_inserti128_si256(v_az_ad00, _mm256_castsi256_si128(v_az_eh00), (int32_t)(1u));
-        v_intermediateae = _mm256_shuffle_epi32(v_az_adeh, (int32_t)(0u));
-        v_intermediatebf = _mm256_shuffle_epi32(v_az_adeh, (int32_t)(85u));
-        v_intermediatecg = _mm256_shuffle_epi32(v_az_adeh, (int32_t)(170u));
-        v_intermediatedh = _mm256_shuffle_epi32(v_az_adeh, (int32_t)(255u));
-        break;
-      }
-    }
-    v_rows01 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 0u));
-    v_rows23 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 16u));
-    v_rows45 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 32u));
-    v_rows67 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_data.f_mcu_blocks[0u] + 48u));
-    v_quants01 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_impl.f_quant_tables[a_q] + 0u));
-    v_quants23 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_impl.f_quant_tables[a_q] + 16u));
-    v_quants45 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_impl.f_quant_tables[a_q] + 32u));
-    v_quants67 = _mm256_lddqu_si256((const __m256i*)(const void*)(self->private_impl.f_quant_tables[a_q] + 48u));
-    v_rows01 = _mm256_mullo_epi16(v_rows01, v_quants01);
-    v_rows23 = _mm256_mullo_epi16(v_rows23, v_quants23);
-    v_rows45 = _mm256_mullo_epi16(v_rows45, v_quants45);
-    v_rows67 = _mm256_mullo_epi16(v_rows67, v_quants67);
-    v_rows04 = _mm256_permute2x128_si256(v_rows01, v_rows45, (int32_t)(32u));
-    v_rows31 = _mm256_permute2x128_si256(v_rows23, v_rows01, (int32_t)(49u));
-    v_rows26 = _mm256_permute2x128_si256(v_rows23, v_rows67, (int32_t)(32u));
-    v_rows75 = _mm256_permute2x128_si256(v_rows67, v_rows45, (int32_t)(49u));
-    v_fp_rows62 = _mm256_permute2x128_si256(v_rows26, v_rows26, (int32_t)(1u));
-    v_fp_bq2662ad = _mm256_unpacklo_epi16(v_rows26, v_fp_rows62);
-    v_fp_bq2662eh = _mm256_unpackhi_epi16(v_rows26, v_fp_rows62);
-    v_fp_cb26ad = _mm256_madd_epi16(v_fp_bq2662ad, v_k_29CF_1151_D630_1151);
-    v_fp_cb26eh = _mm256_madd_epi16(v_fp_bq2662eh, v_k_29CF_1151_D630_1151);
-    v_fp_rows40pos = _mm256_permute2x128_si256(v_rows04, v_rows04, (int32_t)(1u));
-    v_fp_rows04neg = _mm256_sign_epi16(v_rows04, v_k_0001_FFFF);
-    v_fp_rows0pm4 = _mm256_add_epi16(v_fp_rows40pos, v_fp_rows04neg);
-    v_fp_ccpmad = _mm256_srai_epi32(_mm256_unpacklo_epi16(v_k_0000, v_fp_rows0pm4), (int32_t)(3u));
-    v_fp_ccpmeh = _mm256_srai_epi32(_mm256_unpackhi_epi16(v_k_0000, v_fp_rows0pm4), (int32_t)(3u));
-    v_fp_cd01ad = _mm256_add_epi32(v_fp_ccpmad, v_fp_cb26ad);
-    v_fp_cd01eh = _mm256_add_epi32(v_fp_ccpmeh, v_fp_cb26eh);
-    v_fp_cd32ad = _mm256_sub_epi32(v_fp_ccpmad, v_fp_cb26ad);
-    v_fp_cd32eh = _mm256_sub_epi32(v_fp_ccpmeh, v_fp_cb26eh);
-    v_fp_sums7351 = _mm256_add_epi16(v_rows75, v_rows31);
-    v_fp_sums5173 = _mm256_permute2x128_si256(v_fp_sums7351, v_fp_sums7351, (int32_t)(1u));
-    v_fp_ci73515173ad = _mm256_unpacklo_epi16(v_fp_sums7351, v_fp_sums5173);
-    v_fp_ci73515173eh = _mm256_unpackhi_epi16(v_fp_sums7351, v_fp_sums5173);
-    v_fp_cl7351ad = _mm256_madd_epi16(v_fp_ci73515173ad, v_k_E6DC_25A1_1925_25A1);
-    v_fp_cl7351eh = _mm256_madd_epi16(v_fp_ci73515173eh, v_k_E6DC_25A1_1925_25A1);
-    v_fp_rows13 = _mm256_permute2x128_si256(v_rows31, v_rows31, (int32_t)(1u));
-    v_fp_bq7153ad = _mm256_unpacklo_epi16(v_rows75, v_fp_rows13);
-    v_fp_bq7153eh = _mm256_unpackhi_epi16(v_rows75, v_fp_rows13);
-    v_fp_ck75ad = _mm256_add_epi32(_mm256_madd_epi16(v_fp_bq7153ad, v_k_ECC1_E333_EFB0_ADFD), v_fp_cl7351ad);
-    v_fp_ck75eh = _mm256_add_epi32(_mm256_madd_epi16(v_fp_bq7153eh, v_k_ECC1_E333_EFB0_ADFD), v_fp_cl7351eh);
-    v_fp_cl5173ad = _mm256_permute2x128_si256(v_fp_cl7351ad, v_fp_cl7351ad, (int32_t)(1u));
-    v_fp_cl5173eh = _mm256_permute2x128_si256(v_fp_cl7351eh, v_fp_cl7351eh, (int32_t)(1u));
-    v_fp_ck13ad = _mm256_add_epi32(v_fp_cl5173ad, _mm256_madd_epi16(v_fp_bq7153ad, v_k_E333_133E_ADFD_1051));
-    v_fp_ck13eh = _mm256_add_epi32(v_fp_cl5173eh, _mm256_madd_epi16(v_fp_bq7153eh, v_k_E333_133E_ADFD_1051));
-    v_intermediate01ad = _mm256_srai_epi32(_mm256_add_epi32(_mm256_add_epi32(v_fp_cd01ad, v_fp_ck13ad), v_k_0400_0000), (int32_t)(11u));
-    v_intermediate01eh = _mm256_srai_epi32(_mm256_add_epi32(_mm256_add_epi32(v_fp_cd01eh, v_fp_ck13eh), v_k_0400_0000), (int32_t)(11u));
-    v_intermediate01 = _mm256_packs_epi32(v_intermediate01ad, v_intermediate01eh);
-    v_intermediate32ad = _mm256_srai_epi32(_mm256_add_epi32(_mm256_add_epi32(v_fp_cd32ad, v_fp_ck75ad), v_k_0400_0000), (int32_t)(11u));
-    v_intermediate32eh = _mm256_srai_epi32(_mm256_add_epi32(_mm256_add_epi32(v_fp_cd32eh, v_fp_ck75eh), v_k_0400_0000), (int32_t)(11u));
-    v_intermediate32 = _mm256_packs_epi32(v_intermediate32ad, v_intermediate32eh);
-    v_intermediate45ad = _mm256_srai_epi32(_mm256_add_epi32(_mm256_sub_epi32(v_fp_cd32ad, v_fp_ck75ad), v_k_0400_0000), (int32_t)(11u));
-    v_intermediate45eh = _mm256_srai_epi32(_mm256_add_epi32(_mm256_sub_epi32(v_fp_cd32eh, v_fp_ck75eh), v_k_0400_0000), (int32_t)(11u));
-    v_intermediate45 = _mm256_packs_epi32(v_intermediate45ad, v_intermediate45eh);
-    v_intermediate76ad = _mm256_srai_epi32(_mm256_add_epi32(_mm256_sub_epi32(v_fp_cd01ad, v_fp_ck13ad), v_k_0400_0000), (int32_t)(11u));
-    v_intermediate76eh = _mm256_srai_epi32(_mm256_add_epi32(_mm256_sub_epi32(v_fp_cd01eh, v_fp_ck13eh), v_k_0400_0000), (int32_t)(11u));
-    v_intermediate76 = _mm256_packs_epi32(v_intermediate76ad, v_intermediate76eh);
-    v_ita0a1e0e1 = _mm256_permute4x64_epi64(v_intermediate01, (int32_t)(216u));
-    v_ita2a3e2e3 = _mm256_permute4x64_epi64(v_intermediate32, (int32_t)(114u));
-    v_ita4a5e4e5 = _mm256_permute4x64_epi64(v_intermediate45, (int32_t)(216u));
-    v_ita6a7e6e7 = _mm256_permute4x64_epi64(v_intermediate76, (int32_t)(114u));
-    v_ita0c0e0g0 = _mm256_unpacklo_epi16(v_ita0a1e0e1, v_ita2a3e2e3);
-    v_ita1c1e1g1 = _mm256_unpackhi_epi16(v_ita0a1e0e1, v_ita2a3e2e3);
-    v_ita4c4e4g4 = _mm256_unpacklo_epi16(v_ita4a5e4e5, v_ita6a7e6e7);
-    v_ita5c5e5g5 = _mm256_unpackhi_epi16(v_ita4a5e4e5, v_ita6a7e6e7);
-    v_ita0b0e0f0 = _mm256_unpacklo_epi16(v_ita0c0e0g0, v_ita1c1e1g1);
-    v_itc0d0g0h0 = _mm256_unpackhi_epi16(v_ita0c0e0g0, v_ita1c1e1g1);
-    v_ita4b4e4f4 = _mm256_unpacklo_epi16(v_ita4c4e4g4, v_ita5c5e5g5);
-    v_itc4d4g4h4 = _mm256_unpackhi_epi16(v_ita4c4e4g4, v_ita5c5e5g5);
-    v_intermediateae = _mm256_unpacklo_epi64(v_ita0b0e0f0, v_ita4b4e4f4);
-    v_intermediatebf = _mm256_unpackhi_epi64(v_ita0b0e0f0, v_ita4b4e4f4);
-    v_intermediatecg = _mm256_unpacklo_epi64(v_itc0d0g0h0, v_itc4d4g4h4);
-    v_intermediatedh = _mm256_unpackhi_epi64(v_itc0d0g0h0, v_itc4d4g4h4);
-  } while (0);
-  v_intermediatedb = _mm256_permute2x128_si256(v_intermediatedh, v_intermediatebf, (int32_t)(32u));
-  v_intermediatehf = _mm256_permute2x128_si256(v_intermediatedh, v_intermediatebf, (int32_t)(49u));
-  v_sp_cols62 = _mm256_permute2x128_si256(v_intermediatecg, v_intermediatecg, (int32_t)(1u));
-  v_sp_bq2662ad = _mm256_unpacklo_epi16(v_intermediatecg, v_sp_cols62);
-  v_sp_bq2662eh = _mm256_unpackhi_epi16(v_intermediatecg, v_sp_cols62);
-  v_sp_rb26ad = _mm256_madd_epi16(v_sp_bq2662ad, v_k_29CF_1151_D630_1151);
-  v_sp_rb26eh = _mm256_madd_epi16(v_sp_bq2662eh, v_k_29CF_1151_D630_1151);
-  v_sp_cols40pos = _mm256_permute2x128_si256(v_intermediateae, v_intermediateae, (int32_t)(1u));
-  v_sp_cols04neg = _mm256_sign_epi16(v_intermediateae, v_k_0001_FFFF);
-  v_sp_cols0pm4 = _mm256_add_epi16(v_sp_cols40pos, v_sp_cols04neg);
-  v_sp_rcpmad = _mm256_srai_epi32(_mm256_unpacklo_epi16(v_k_0000, v_sp_cols0pm4), (int32_t)(3u));
-  v_sp_rcpmeh = _mm256_srai_epi32(_mm256_unpackhi_epi16(v_k_0000, v_sp_cols0pm4), (int32_t)(3u));
-  v_sp_rd01ad = _mm256_add_epi32(v_sp_rcpmad, v_sp_rb26ad);
-  v_sp_rd01eh = _mm256_add_epi32(v_sp_rcpmeh, v_sp_rb26eh);
-  v_sp_rd32ad = _mm256_sub_epi32(v_sp_rcpmad, v_sp_rb26ad);
-  v_sp_rd32eh = _mm256_sub_epi32(v_sp_rcpmeh, v_sp_rb26eh);
-  v_sp_sums7351 = _mm256_add_epi16(v_intermediatehf, v_intermediatedb);
-  v_sp_sums5173 = _mm256_permute2x128_si256(v_sp_sums7351, v_sp_sums7351, (int32_t)(1u));
-  v_sp_ri73515173ad = _mm256_unpacklo_epi16(v_sp_sums7351, v_sp_sums5173);
-  v_sp_ri73515173eh = _mm256_unpackhi_epi16(v_sp_sums7351, v_sp_sums5173);
-  v_sp_rl7351ad = _mm256_madd_epi16(v_sp_ri73515173ad, v_k_E6DC_25A1_1925_25A1);
-  v_sp_rl7351eh = _mm256_madd_epi16(v_sp_ri73515173eh, v_k_E6DC_25A1_1925_25A1);
-  v_sp_cols13 = _mm256_permute2x128_si256(v_intermediatedb, v_intermediatedb, (int32_t)(1u));
-  v_sp_bq7153ad = _mm256_unpacklo_epi16(v_intermediatehf, v_sp_cols13);
-  v_sp_bq7153eh = _mm256_unpackhi_epi16(v_intermediatehf, v_sp_cols13);
-  v_sp_rk75ad = _mm256_add_epi32(_mm256_madd_epi16(v_sp_bq7153ad, v_k_ECC1_E333_EFB0_ADFD), v_sp_rl7351ad);
-  v_sp_rk75eh = _mm256_add_epi32(_mm256_madd_epi16(v_sp_bq7153eh, v_k_ECC1_E333_EFB0_ADFD), v_sp_rl7351eh);
-  v_sp_rl5173ad = _mm256_permute2x128_si256(v_sp_rl7351ad, v_sp_rl7351ad, (int32_t)(1u));
-  v_sp_rl5173eh = _mm256_permute2x128_si256(v_sp_rl7351eh, v_sp_rl7351eh, (int32_t)(1u));
-  v_sp_rk13ad = _mm256_add_epi32(v_sp_rl5173ad, _mm256_madd_epi16(v_sp_bq7153ad, v_k_E333_133E_ADFD_1051));
-  v_sp_rk13eh = _mm256_add_epi32(v_sp_rl5173eh, _mm256_madd_epi16(v_sp_bq7153eh, v_k_E333_133E_ADFD_1051));
-  v_final01ad = _mm256_srai_epi32(_mm256_add_epi32(_mm256_add_epi32(v_sp_rd01ad, v_sp_rk13ad), v_k_0000_0002), (int32_t)(18u));
-  v_final01eh = _mm256_srai_epi32(_mm256_add_epi32(_mm256_add_epi32(v_sp_rd01eh, v_sp_rk13eh), v_k_0000_0002), (int32_t)(18u));
-  v_final01 = _mm256_packs_epi32(v_final01ad, v_final01eh);
-  v_final32ad = _mm256_srai_epi32(_mm256_add_epi32(_mm256_add_epi32(v_sp_rd32ad, v_sp_rk75ad), v_k_0000_0002), (int32_t)(18u));
-  v_final32eh = _mm256_srai_epi32(_mm256_add_epi32(_mm256_add_epi32(v_sp_rd32eh, v_sp_rk75eh), v_k_0000_0002), (int32_t)(18u));
-  v_final32 = _mm256_packs_epi32(v_final32ad, v_final32eh);
-  v_final45ad = _mm256_srai_epi32(_mm256_add_epi32(_mm256_sub_epi32(v_sp_rd32ad, v_sp_rk75ad), v_k_0000_0002), (int32_t)(18u));
-  v_final45eh = _mm256_srai_epi32(_mm256_add_epi32(_mm256_sub_epi32(v_sp_rd32eh, v_sp_rk75eh), v_k_0000_0002), (int32_t)(18u));
-  v_final45 = _mm256_packs_epi32(v_final45ad, v_final45eh);
-  v_final76ad = _mm256_srai_epi32(_mm256_add_epi32(_mm256_sub_epi32(v_sp_rd01ad, v_sp_rk13ad), v_k_0000_0002), (int32_t)(18u));
-  v_final76eh = _mm256_srai_epi32(_mm256_add_epi32(_mm256_sub_epi32(v_sp_rd01eh, v_sp_rk13eh), v_k_0000_0002), (int32_t)(18u));
-  v_final76 = _mm256_packs_epi32(v_final76ad, v_final76eh);
-  v_fta0a1e0e1 = _mm256_permute4x64_epi64(v_final01, (int32_t)(216u));
-  v_fta2a3e2e3 = _mm256_permute4x64_epi64(v_final32, (int32_t)(114u));
-  v_fta4a5e4e5 = _mm256_permute4x64_epi64(v_final45, (int32_t)(216u));
-  v_fta6a7e6e7 = _mm256_permute4x64_epi64(v_final76, (int32_t)(114u));
-  v_fta0c0e0g0 = _mm256_unpacklo_epi16(v_fta0a1e0e1, v_fta2a3e2e3);
-  v_fta1c1e1g1 = _mm256_unpackhi_epi16(v_fta0a1e0e1, v_fta2a3e2e3);
-  v_fta4c4e4g4 = _mm256_unpacklo_epi16(v_fta4a5e4e5, v_fta6a7e6e7);
-  v_fta5c5e5g5 = _mm256_unpackhi_epi16(v_fta4a5e4e5, v_fta6a7e6e7);
-  v_fta0b0e0f0 = _mm256_unpacklo_epi16(v_fta0c0e0g0, v_fta1c1e1g1);
-  v_ftc0d0g0h0 = _mm256_unpackhi_epi16(v_fta0c0e0g0, v_fta1c1e1g1);
-  v_fta4b4e4f4 = _mm256_unpacklo_epi16(v_fta4c4e4g4, v_fta5c5e5g5);
-  v_ftc4d4g4h4 = _mm256_unpackhi_epi16(v_fta4c4e4g4, v_fta5c5e5g5);
-  v_finalae = _mm256_unpacklo_epi64(v_fta0b0e0f0, v_fta4b4e4f4);
-  v_finalbf = _mm256_unpackhi_epi64(v_fta0b0e0f0, v_fta4b4e4f4);
-  v_finalcg = _mm256_unpacklo_epi64(v_ftc0d0g0h0, v_ftc4d4g4h4);
-  v_finaldh = _mm256_unpackhi_epi64(v_ftc0d0g0h0, v_ftc4d4g4h4);
-  v_final0145 = _mm256_add_epi8(_mm256_packs_epi16(v_finalae, v_finalbf), v_k_8080);
-  v_final2367 = _mm256_add_epi8(_mm256_packs_epi16(v_finalcg, v_finaldh), v_k_8080);
-  v_final0 = ((uint64_t)(_mm256_extract_epi64(v_final0145, (int32_t)(0u))));
-  v_final1 = ((uint64_t)(_mm256_extract_epi64(v_final0145, (int32_t)(1u))));
-  v_final2 = ((uint64_t)(_mm256_extract_epi64(v_final2367, (int32_t)(0u))));
-  v_final3 = ((uint64_t)(_mm256_extract_epi64(v_final2367, (int32_t)(1u))));
-  v_final4 = ((uint64_t)(_mm256_extract_epi64(v_final0145, (int32_t)(2u))));
-  v_final5 = ((uint64_t)(_mm256_extract_epi64(v_final0145, (int32_t)(3u))));
-  v_final6 = ((uint64_t)(_mm256_extract_epi64(v_final2367, (int32_t)(2u))));
-  v_final7 = ((uint64_t)(_mm256_extract_epi64(v_final2367, (int32_t)(3u))));
-  if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-    return wuffs_base__make_empty_struct();
-  }
-  v_remaining = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  wuffs_base__poke_u64le__no_bounds_check(a_dst_buffer.ptr, v_final0);
-  a_dst_buffer = v_remaining;
-  if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-    return wuffs_base__make_empty_struct();
-  }
-  v_remaining = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  wuffs_base__poke_u64le__no_bounds_check(a_dst_buffer.ptr, v_final1);
-  a_dst_buffer = v_remaining;
-  if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-    return wuffs_base__make_empty_struct();
-  }
-  v_remaining = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  wuffs_base__poke_u64le__no_bounds_check(a_dst_buffer.ptr, v_final2);
-  a_dst_buffer = v_remaining;
-  if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-    return wuffs_base__make_empty_struct();
-  }
-  v_remaining = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  wuffs_base__poke_u64le__no_bounds_check(a_dst_buffer.ptr, v_final3);
-  a_dst_buffer = v_remaining;
-  if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-    return wuffs_base__make_empty_struct();
-  }
-  v_remaining = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  wuffs_base__poke_u64le__no_bounds_check(a_dst_buffer.ptr, v_final4);
-  a_dst_buffer = v_remaining;
-  if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-    return wuffs_base__make_empty_struct();
-  }
-  v_remaining = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  wuffs_base__poke_u64le__no_bounds_check(a_dst_buffer.ptr, v_final5);
-  a_dst_buffer = v_remaining;
-  if (a_dst_stride > ((uint64_t)(a_dst_buffer.len))) {
-    return wuffs_base__make_empty_struct();
-  }
-  v_remaining = wuffs_base__slice_u8__subslice_i(a_dst_buffer, a_dst_stride);
-  wuffs_base__poke_u64le__no_bounds_check(a_dst_buffer.ptr, v_final6);
-  a_dst_buffer = v_remaining;
-  if (8u > ((uint64_t)(a_dst_buffer.len))) {
-    return wuffs_base__make_empty_struct();
-  }
-  wuffs_base__poke_u64le__no_bounds_check(a_dst_buffer.ptr, v_final7);
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_64)
-// ‼ WUFFS MULTI-FILE SECTION -x86_avx2
-
-// -------- func jpeg.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_jpeg__decoder__get_quirk(
-    const wuffs_jpeg__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func jpeg.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__set_quirk(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func jpeg.decoder.decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__decode_image_config(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_jpeg__decoder__do_decode_image_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func jpeg.decoder.do_decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__do_decode_image_config(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint8_t v_marker = 0;
-  uint32_t v_pixfmt = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config[0];
-  if (coro_susp_point) {
-    v_marker = self->private_data.s_do_decode_image_config[0].v_marker;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_c = t_0;
-    }
-    if (v_c != 255u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_1 = *iop_a_src++;
-      v_c = t_1;
-    }
-    if (v_c != 216u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_header);
-      goto exit;
-    }
-    while (true) {
-      while (true) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_2 = *iop_a_src++;
-          v_c = t_2;
-        }
-        if (v_c == 255u) {
-          break;
-        }
-      }
-      while (true) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_3 = *iop_a_src++;
-          v_c = t_3;
-        }
-        if (v_c != 255u) {
-          v_marker = v_c;
-          break;
-        }
-      }
-      if (v_marker == 0u) {
-        continue;
-      } else if ((208u <= v_marker) && (v_marker <= 217u)) {
-        if (v_marker <= 215u) {
-          continue;
-        }
-      } else {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-          uint32_t t_4;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-            t_4 = ((uint32_t)(wuffs_base__peek_u16be__no_bounds_check(iop_a_src)));
-            iop_a_src += 2;
-          } else {
-            self->private_data.s_do_decode_image_config[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-              uint32_t num_bits_4 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_4);
-              if (num_bits_4 == 8) {
-                t_4 = ((uint32_t)(*scratch >> 48));
-                break;
-              }
-              num_bits_4 += 8u;
-              *scratch |= ((uint64_t)(num_bits_4));
-            }
-          }
-          self->private_impl.f_payload_length = t_4;
-        }
-        if (self->private_impl.f_payload_length < 2u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_marker);
-          goto exit;
-        }
-        self->private_impl.f_payload_length -= 2u;
-      }
-      if (v_marker < 192u) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_marker);
-        goto exit;
-      } else if (v_marker < 208u) {
-        if (v_marker <= 194u) {
-          if (self->private_impl.f_sof_marker != 0u) {
-            status = wuffs_base__make_status(wuffs_jpeg__error__bad_sof_marker);
-            goto exit;
-          }
-          self->private_impl.f_sof_marker = v_marker;
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-          status = wuffs_jpeg__decoder__decode_sof(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          break;
-        } else if (v_marker == 195u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_lossless_coding);
-          goto exit;
-        } else if (v_marker == 196u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_dht_marker);
-          goto exit;
-        } else if ((197u <= v_marker) && (v_marker <= 199u)) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_hierarchical_coding);
-          goto exit;
-        } else if (v_marker == 200u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_marker);
-          goto exit;
-        } else {
-          status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_arithmetic_coding);
-          goto exit;
-        }
-      } else if (v_marker < 224u) {
-        if (v_marker < 218u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_marker);
-          goto exit;
-        } else if (v_marker == 218u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-          goto exit;
-        } else if (v_marker == 219u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-          status = wuffs_jpeg__decoder__decode_dqt(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          continue;
-        } else if (v_marker == 221u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-          status = wuffs_jpeg__decoder__decode_dri(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          continue;
-        } else {
-          status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_marker);
-          goto exit;
-        }
-      } else if (v_marker < 240u) {
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-        status = wuffs_jpeg__decoder__decode_appn(self, a_src, v_marker);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-        continue;
-      } else {
-        if (v_marker == 254u) {
-        } else {
-          status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_marker);
-          goto exit;
-        }
-      }
-      self->private_data.s_do_decode_image_config[0].scratch = self->private_impl.f_payload_length;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
-      if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
-      self->private_impl.f_payload_length = 0u;
-    }
-    self->private_impl.choosy_decode_idct = (
-#if defined(WUFFS_BASE__CPU_ARCH__X86_64)
-        wuffs_base__cpu_arch__have_x86_avx2() ? &wuffs_jpeg__decoder__decode_idct_x86_avx2 :
-#endif
-        self->private_impl.choosy_decode_idct);
-    self->private_impl.f_frame_config_io_position = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-    if (a_dst != NULL) {
-      v_pixfmt = 536870920u;
-      if (self->private_impl.f_num_components > 1u) {
-        v_pixfmt = 2415954056u;
-      }
-      wuffs_base__image_config__set(
-          a_dst,
-          v_pixfmt,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height,
-          self->private_impl.f_frame_config_io_position,
-          true);
-    }
-    self->private_impl.f_call_sequence = 32u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_do_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_decode_image_config[0].v_marker = v_marker;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.decode_dqt
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_dqt(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint8_t v_q = 0;
-  uint32_t v_i = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_dqt[0];
-  if (coro_susp_point) {
-    v_q = self->private_data.s_decode_dqt[0].v_q;
-    v_i = self->private_data.s_decode_dqt[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (self->private_impl.f_payload_length > 0u) {
-      self->private_impl.f_payload_length -= 1u;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_0 = *iop_a_src++;
-        v_c = t_0;
-      }
-      if ((v_c & 15u) > 3u) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_dqt_marker);
-        goto exit;
-      }
-      v_q = (v_c & 15u);
-      if ((v_c >> 4u) == 1u) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_precision);
-        goto exit;
-      } else if (((v_c >> 4u) > 1u) || (self->private_impl.f_payload_length < 64u)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_dqt_marker);
-        goto exit;
-      }
-      self->private_impl.f_payload_length -= 64u;
-      v_i = 0u;
-      while (v_i < 64u) {
-        v_i += 1u;
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint16_t t_1 = *iop_a_src++;
-          self->private_impl.f_quant_tables[v_q][WUFFS_JPEG__UNZIG[v_i]] = t_1;
-        }
-      }
-      self->private_impl.f_seen_dqt[v_q] = true;
-      if (self->private_impl.f_sof_marker == 0u) {
-        v_i = 0u;
-        while (v_i < 64u) {
-          self->private_impl.f_saved_quant_tables[v_q][v_i] = self->private_impl.f_quant_tables[v_q][v_i];
-          v_i += 1u;
-        }
-        self->private_impl.f_saved_seen_dqt[v_q] = true;
-      }
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_dqt[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_dqt[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_dqt[0].v_q = v_q;
-  self->private_data.s_decode_dqt[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.decode_dri
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_dri(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_dri[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_payload_length != 2u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_dri_marker);
-      goto exit;
-    }
-    self->private_impl.f_payload_length = 0u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint16_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_0 = wuffs_base__peek_u16be__no_bounds_check(iop_a_src);
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_dri[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_dri[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-          if (num_bits_0 == 8) {
-            t_0 = ((uint16_t)(*scratch >> 48));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0));
-        }
-      }
-      self->private_impl.f_restart_interval = t_0;
-    }
-    if (self->private_impl.f_sof_marker == 0u) {
-      self->private_impl.f_saved_restart_interval = self->private_impl.f_restart_interval;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_dri[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_dri[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.decode_appn
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_appn(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    uint8_t a_marker) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c8 = 0;
-  uint32_t v_c32 = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_appn[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    do {
-      if (a_marker == 224u) {
-        if (self->private_impl.f_payload_length >= 5u) {
-          self->private_impl.f_payload_length -= 5u;
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-            uint32_t t_0;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_0 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_decode_appn[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_decode_appn[0].scratch;
-                uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0;
-                if (num_bits_0 == 24) {
-                  t_0 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_0 += 8u;
-                *scratch |= ((uint64_t)(num_bits_0)) << 56;
-              }
-            }
-            v_c32 = t_0;
-          }
-          if (v_c32 != 1179207242u) {
-            self->private_impl.f_payload_length = (65535u & (self->private_impl.f_payload_length + 1u));
-            break;
-          }
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_1 = *iop_a_src++;
-            v_c8 = t_1;
-          }
-          self->private_impl.f_is_jfif = (v_c8 == 0u);
-        }
-      } else if (a_marker == 238u) {
-        if (self->private_impl.f_payload_length >= 12u) {
-          self->private_impl.f_payload_length -= 12u;
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-            uint32_t t_2;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_2 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_decode_appn[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_decode_appn[0].scratch;
-                uint32_t num_bits_2 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2;
-                if (num_bits_2 == 24) {
-                  t_2 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_2 += 8u;
-                *scratch |= ((uint64_t)(num_bits_2)) << 56;
-              }
-            }
-            v_c32 = t_2;
-          }
-          if (v_c32 != 1651467329u) {
-            self->private_impl.f_payload_length = (65535u & (self->private_impl.f_payload_length + 8u));
-            break;
-          }
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-            uint32_t t_3;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_3 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_decode_appn[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_decode_appn[0].scratch;
-                uint32_t num_bits_3 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_3;
-                if (num_bits_3 == 24) {
-                  t_3 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_3 += 8u;
-                *scratch |= ((uint64_t)(num_bits_3)) << 56;
-              }
-            }
-            v_c32 = t_3;
-          }
-          if ((255u & v_c32) != 101u) {
-            self->private_impl.f_payload_length = (65535u & (self->private_impl.f_payload_length + 4u));
-            break;
-          }
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-            uint32_t t_4;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_4 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_decode_appn[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_decode_appn[0].scratch;
-                uint32_t num_bits_4 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_4;
-                if (num_bits_4 == 24) {
-                  t_4 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_4 += 8u;
-                *scratch |= ((uint64_t)(num_bits_4)) << 56;
-              }
-            }
-            v_c32 = t_4;
-          }
-          if ((v_c32 >> 24u) == 0u) {
-            self->private_impl.f_is_adobe = 1u;
-          } else {
-            self->private_impl.f_is_adobe = 2u;
-          }
-        }
-      }
-    } while (0);
-    self->private_data.s_decode_appn[0].scratch = self->private_impl.f_payload_length;
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-    if (self->private_data.s_decode_appn[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-      self->private_data.s_decode_appn[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-      iop_a_src = io2_a_src;
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      goto suspend;
-    }
-    iop_a_src += self->private_data.s_decode_appn[0].scratch;
-    self->private_impl.f_payload_length = 0u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_appn[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_appn[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.decode_sof
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_sof(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint8_t v_comp_h = 0;
-  uint8_t v_comp_v = 0;
-  uint32_t v_i = 0;
-  uint32_t v_j = 0;
-  bool v_has_h24 = false;
-  bool v_has_h3 = false;
-  bool v_has_v24 = false;
-  bool v_has_v3 = false;
-  uint32_t v_upper_bound = 0;
-  uint64_t v_wh0 = 0;
-  uint64_t v_wh1 = 0;
-  uint64_t v_wh2 = 0;
-  uint64_t v_wh3 = 0;
-  uint64_t v_progressive = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_sof[0];
-  if (coro_susp_point) {
-    v_i = self->private_data.s_decode_sof[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_payload_length < 6u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_sof_marker);
-      goto exit;
-    }
-    self->private_impl.f_payload_length -= 6u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_c = t_0;
-    }
-    if (v_c == 8u) {
-    } else if (v_c == 12u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_precision_12_bits);
-      goto exit;
-    } else if (v_c == 16u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_precision_16_bits);
-      goto exit;
-    } else {
-      status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_precision);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      uint32_t t_1;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_1 = ((uint32_t)(wuffs_base__peek_u16be__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_sof[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_sof[0].scratch;
-          uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1);
-          if (num_bits_1 == 8) {
-            t_1 = ((uint32_t)(*scratch >> 48));
-            break;
-          }
-          num_bits_1 += 8u;
-          *scratch |= ((uint64_t)(num_bits_1));
-        }
-      }
-      self->private_impl.f_height = t_1;
-    }
-    if (self->private_impl.f_height == 0u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_implicit_height);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-      uint32_t t_2;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_2 = ((uint32_t)(wuffs_base__peek_u16be__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_sof[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_sof[0].scratch;
-          uint32_t num_bits_2 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_2);
-          if (num_bits_2 == 8) {
-            t_2 = ((uint32_t)(*scratch >> 48));
-            break;
-          }
-          num_bits_2 += 8u;
-          *scratch |= ((uint64_t)(num_bits_2));
-        }
-      }
-      self->private_impl.f_width = t_2;
-    }
-    if (self->private_impl.f_width == 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_3 = *iop_a_src++;
-      v_c = t_3;
-    }
-    if ((v_c == 0u) || (v_c > 4u)) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_sof_marker);
-      goto exit;
-    } else if (v_c == 2u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_color_model);
-      goto exit;
-    }
-    self->private_impl.f_num_components = ((uint32_t)(v_c));
-    if (self->private_impl.f_payload_length != (3u * self->private_impl.f_num_components)) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_sof_marker);
-      goto exit;
-    }
-    self->private_impl.f_payload_length = 0u;
-    v_i = 0u;
-    while (v_i < self->private_impl.f_num_components) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_4 = *iop_a_src++;
-        self->private_impl.f_components_c[v_i] = t_4;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_5 = *iop_a_src++;
-        v_c = t_5;
-      }
-      v_comp_h = (v_c >> 4u);
-      v_comp_v = (v_c & 15u);
-      if ((v_comp_h == 0u) ||
-          (v_comp_h > 4u) ||
-          (v_comp_v == 0u) ||
-          (v_comp_v > 4u)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_sof_marker);
-        goto exit;
-      }
-      self->private_impl.f_components_h[v_i] = v_comp_h;
-      if (self->private_impl.f_max_incl_components_h < self->private_impl.f_components_h[v_i]) {
-        self->private_impl.f_max_incl_components_h = self->private_impl.f_components_h[v_i];
-      }
-      self->private_impl.f_components_v[v_i] = v_comp_v;
-      if (self->private_impl.f_max_incl_components_v < self->private_impl.f_components_v[v_i]) {
-        self->private_impl.f_max_incl_components_v = self->private_impl.f_components_v[v_i];
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_6 = *iop_a_src++;
-        v_c = t_6;
-      }
-      if (v_c >= 4u) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_sof_marker);
-        goto exit;
-      }
-      self->private_impl.f_components_tq[v_i] = v_c;
-      v_j = 0u;
-      while (v_j < v_i) {
-        if (self->private_impl.f_components_c[v_j] == self->private_impl.f_components_c[v_i]) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_sof_marker);
-          goto exit;
-        }
-        v_j += 1u;
-      }
-      v_i += 1u;
-    }
-    if (self->private_impl.f_num_components == 1u) {
-      self->private_impl.f_max_incl_components_h = 1u;
-      self->private_impl.f_max_incl_components_v = 1u;
-      self->private_impl.f_components_h[0u] = 1u;
-      self->private_impl.f_components_v[0u] = 1u;
-    } else {
-      v_has_h24 = false;
-      v_has_h3 = false;
-      v_has_v24 = false;
-      v_has_v3 = false;
-      v_i = 0u;
-      while (v_i < self->private_impl.f_num_components) {
-        v_has_h24 = (v_has_h24 || (self->private_impl.f_components_h[v_i] == 2u) || (self->private_impl.f_components_h[v_i] == 4u));
-        v_has_h3 = (v_has_h3 || (self->private_impl.f_components_h[v_i] == 3u));
-        v_has_v24 = (v_has_v24 || (self->private_impl.f_components_v[v_i] == 2u) || (self->private_impl.f_components_v[v_i] == 4u));
-        v_has_v3 = (v_has_v3 || (self->private_impl.f_components_v[v_i] == 3u));
-        v_i += 1u;
-      }
-      if ((v_has_h24 && v_has_h3) || (v_has_v24 && v_has_v3)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_fractional_sampling);
-        goto exit;
-      }
-      if (self->private_impl.f_num_components == 4u) {
-        self->private_impl.f_is_rgb_or_cmyk = (self->private_impl.f_is_adobe < 2u);
-      } else {
-        if (self->private_impl.f_is_jfif) {
-          self->private_impl.f_is_rgb_or_cmyk = false;
-        } else if (self->private_impl.f_is_adobe > 0u) {
-          self->private_impl.f_is_rgb_or_cmyk = (self->private_impl.f_is_adobe == 1u);
-        } else {
-          self->private_impl.f_is_rgb_or_cmyk = ((self->private_impl.f_components_c[0u] == 82u) && (self->private_impl.f_components_c[1u] == 71u) && (self->private_impl.f_components_c[2u] == 66u));
-        }
-      }
-    }
-    self->private_impl.f_width_in_mcus = wuffs_jpeg__decoder__quantize_dimension(self, self->private_impl.f_width, 1u, self->private_impl.f_max_incl_components_h);
-    self->private_impl.f_height_in_mcus = wuffs_jpeg__decoder__quantize_dimension(self, self->private_impl.f_height, 1u, self->private_impl.f_max_incl_components_v);
-    v_upper_bound = 65544u;
-    self->private_impl.f_components_workbuf_widths[0u] = wuffs_base__u32__min(v_upper_bound, (8u * self->private_impl.f_width_in_mcus * ((uint32_t)(self->private_impl.f_components_h[0u]))));
-    self->private_impl.f_components_workbuf_widths[1u] = wuffs_base__u32__min(v_upper_bound, (8u * self->private_impl.f_width_in_mcus * ((uint32_t)(self->private_impl.f_components_h[1u]))));
-    self->private_impl.f_components_workbuf_widths[2u] = wuffs_base__u32__min(v_upper_bound, (8u * self->private_impl.f_width_in_mcus * ((uint32_t)(self->private_impl.f_components_h[2u]))));
-    self->private_impl.f_components_workbuf_widths[3u] = wuffs_base__u32__min(v_upper_bound, (8u * self->private_impl.f_width_in_mcus * ((uint32_t)(self->private_impl.f_components_h[3u]))));
-    self->private_impl.f_components_workbuf_heights[0u] = wuffs_base__u32__min(v_upper_bound, (8u * self->private_impl.f_height_in_mcus * ((uint32_t)(self->private_impl.f_components_v[0u]))));
-    self->private_impl.f_components_workbuf_heights[1u] = wuffs_base__u32__min(v_upper_bound, (8u * self->private_impl.f_height_in_mcus * ((uint32_t)(self->private_impl.f_components_v[1u]))));
-    self->private_impl.f_components_workbuf_heights[2u] = wuffs_base__u32__min(v_upper_bound, (8u * self->private_impl.f_height_in_mcus * ((uint32_t)(self->private_impl.f_components_v[2u]))));
-    self->private_impl.f_components_workbuf_heights[3u] = wuffs_base__u32__min(v_upper_bound, (8u * self->private_impl.f_height_in_mcus * ((uint32_t)(self->private_impl.f_components_v[3u]))));
-    v_wh0 = (((uint64_t)(self->private_impl.f_components_workbuf_widths[0u])) * ((uint64_t)(self->private_impl.f_components_workbuf_heights[0u])));
-    v_wh1 = (((uint64_t)(self->private_impl.f_components_workbuf_widths[1u])) * ((uint64_t)(self->private_impl.f_components_workbuf_heights[1u])));
-    v_wh2 = (((uint64_t)(self->private_impl.f_components_workbuf_widths[2u])) * ((uint64_t)(self->private_impl.f_components_workbuf_heights[2u])));
-    v_wh3 = (((uint64_t)(self->private_impl.f_components_workbuf_widths[3u])) * ((uint64_t)(self->private_impl.f_components_workbuf_heights[3u])));
-    v_progressive = 0u;
-    if (self->private_impl.f_sof_marker >= 194u) {
-      v_progressive = 2u;
-      v_i = 0u;
-      while (v_i < 4u) {
-        v_j = 0u;
-        while (v_j < 10u) {
-          self->private_impl.f_block_smoothing_lowest_scan_al[v_i][v_j] = 16u;
-          v_j += 1u;
-        }
-        v_i += 1u;
-      }
-    }
-    self->private_impl.f_components_workbuf_offsets[0u] = 0u;
-    self->private_impl.f_components_workbuf_offsets[1u] = (self->private_impl.f_components_workbuf_offsets[0u] + v_wh0);
-    self->private_impl.f_components_workbuf_offsets[2u] = (self->private_impl.f_components_workbuf_offsets[1u] + v_wh1);
-    self->private_impl.f_components_workbuf_offsets[3u] = (self->private_impl.f_components_workbuf_offsets[2u] + v_wh2);
-    self->private_impl.f_components_workbuf_offsets[4u] = (self->private_impl.f_components_workbuf_offsets[3u] + v_wh3);
-    self->private_impl.f_components_workbuf_offsets[5u] = (self->private_impl.f_components_workbuf_offsets[4u] + (v_wh0 * v_progressive));
-    self->private_impl.f_components_workbuf_offsets[6u] = (self->private_impl.f_components_workbuf_offsets[5u] + (v_wh1 * v_progressive));
-    self->private_impl.f_components_workbuf_offsets[7u] = (self->private_impl.f_components_workbuf_offsets[6u] + (v_wh2 * v_progressive));
-    self->private_impl.f_components_workbuf_offsets[8u] = (self->private_impl.f_components_workbuf_offsets[7u] + (v_wh3 * v_progressive));
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_sof[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_sof[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_sof[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.quantize_dimension
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__quantize_dimension(
-    const wuffs_jpeg__decoder* self,
-    uint32_t a_width,
-    uint8_t a_h,
-    uint8_t a_max_incl_h) {
-  uint32_t v_ratio = 0;
-
-  v_ratio = 0u;
-  if (a_h > 0u) {
-    v_ratio = ((uint32_t)((a_max_incl_h / a_h)));
-  }
-  if (v_ratio == 1u) {
-    return ((a_width + 7u) / 8u);
-  } else if (v_ratio == 2u) {
-    return ((a_width + 15u) / 16u);
-  } else if (v_ratio == 3u) {
-    return ((a_width + 23u) / 24u);
-  }
-  return ((a_width + 31u) / 32u);
-}
-
-// -------- func jpeg.decoder.decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__decode_frame_config(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 2)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_jpeg__decoder__do_decode_frame_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 2 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func jpeg.decoder.do_decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__do_decode_frame_config(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 32u) {
-    } else if (self->private_impl.f_call_sequence < 32u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_jpeg__decoder__do_decode_image_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else if (self->private_impl.f_call_sequence == 40u) {
-      if (self->private_impl.f_frame_config_io_position != wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)))) {
-        status = wuffs_base__make_status(wuffs_base__error__bad_restart);
-        goto exit;
-      }
-    } else if (self->private_impl.f_call_sequence == 64u) {
-      self->private_impl.f_call_sequence = 96u;
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (a_dst != NULL) {
-      wuffs_base__frame_config__set(
-          a_dst,
-          wuffs_base__utility__make_rect_ie_u32(
-          0u,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height),
-          ((wuffs_base__flicks)(0u)),
-          0u,
-          self->private_impl.f_frame_config_io_position,
-          0u,
-          true,
-          false,
-          4278190080u);
-    }
-    self->private_impl.f_call_sequence = 64u;
-
-    ok:
-    self->private_impl.p_do_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__decode_frame(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 3)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_ddf_status = wuffs_base__make_status(NULL);
-  wuffs_base__status v_swizzle_status = wuffs_base__make_status(NULL);
-  uint32_t v_scan_count = 0;
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      v_scan_count = self->private_impl.f_scan_count;
-      {
-        wuffs_base__status t_0 = wuffs_jpeg__decoder__do_decode_frame(self,
-            a_dst,
-            a_src,
-            a_blend,
-            a_workbuf,
-            a_opts);
-        v_ddf_status = t_0;
-      }
-      if ((v_ddf_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        v_ddf_status = wuffs_base__make_status(wuffs_jpeg__error__truncated_input);
-      }
-      if (wuffs_base__status__is_error(&v_ddf_status) || (v_scan_count < self->private_impl.f_scan_count)) {
-        if (self->private_impl.f_sof_marker >= 194u) {
-          wuffs_jpeg__decoder__apply_progressive_idct(self, a_workbuf);
-        }
-        if (self->private_impl.f_num_components == 1u) {
-          v_swizzle_status = wuffs_jpeg__decoder__swizzle_gray(self, a_dst, a_workbuf);
-        } else {
-          v_swizzle_status = wuffs_jpeg__decoder__swizzle_colorful(self, a_dst, a_workbuf);
-        }
-        if (wuffs_base__status__is_error(&v_swizzle_status)) {
-          status = v_swizzle_status;
-          goto exit;
-        }
-      }
-      status = v_ddf_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 3 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func jpeg.decoder.do_decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__do_decode_frame(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_pixfmt = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-  uint8_t v_c = 0;
-  uint8_t v_marker = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame[0];
-  if (coro_susp_point) {
-    v_marker = self->private_data.s_do_decode_frame[0].v_marker;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 64u) {
-    } else if (self->private_impl.f_call_sequence < 64u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_jpeg__decoder__do_decode_frame_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    v_pixfmt = 536870920u;
-    if (self->private_impl.f_num_components > 1u) {
-      v_pixfmt = 2415954056u;
-    }
-    v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler,
-        wuffs_base__pixel_buffer__pixel_format(a_dst),
-        wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024)),
-        wuffs_base__utility__make_pixel_format(v_pixfmt),
-        wuffs_base__utility__empty_slice_u8(),
-        a_blend);
-    if ( ! wuffs_base__status__is_ok(&v_status)) {
-      status = v_status;
-      if (wuffs_base__status__is_error(&status)) {
-        goto exit;
-      } else if (wuffs_base__status__is_suspension(&status)) {
-        status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-        goto exit;
-      }
-      goto ok;
-    }
-    if (self->private_impl.f_components_workbuf_offsets[8u] > ((uint64_t)(a_workbuf.len))) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length);
-      goto exit;
-    } else if (self->private_impl.f_components_workbuf_offsets[4u] < self->private_impl.f_components_workbuf_offsets[8u]) {
-      wuffs_base__bulk_memset(a_workbuf.ptr + self->private_impl.f_components_workbuf_offsets[4u], (self->private_impl.f_components_workbuf_offsets[8u] - self->private_impl.f_components_workbuf_offsets[4u]), 0u);
-    }
-    if (self->private_impl.f_components_workbuf_offsets[4u] <= ((uint64_t)(a_workbuf.len))) {
-      wuffs_base__bulk_memset(a_workbuf.ptr, self->private_impl.f_components_workbuf_offsets[4u], 128u);
-    }
-    while (true) {
-      while (true) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_0 = *iop_a_src++;
-          v_c = t_0;
-        }
-        if (v_c == 255u) {
-          break;
-        }
-      }
-      while (true) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_1 = *iop_a_src++;
-          v_c = t_1;
-        }
-        if (v_c != 255u) {
-          v_marker = v_c;
-          break;
-        }
-      }
-      if (v_marker == 0u) {
-        continue;
-      } else if ((208u <= v_marker) && (v_marker <= 217u)) {
-        if (v_marker <= 215u) {
-          continue;
-        }
-      } else {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-          uint32_t t_2;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-            t_2 = ((uint32_t)(wuffs_base__peek_u16be__no_bounds_check(iop_a_src)));
-            iop_a_src += 2;
-          } else {
-            self->private_data.s_do_decode_frame[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_do_decode_frame[0].scratch;
-              uint32_t num_bits_2 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_2);
-              if (num_bits_2 == 8) {
-                t_2 = ((uint32_t)(*scratch >> 48));
-                break;
-              }
-              num_bits_2 += 8u;
-              *scratch |= ((uint64_t)(num_bits_2));
-            }
-          }
-          self->private_impl.f_payload_length = t_2;
-        }
-        if (self->private_impl.f_payload_length < 2u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_marker);
-          goto exit;
-        }
-        self->private_impl.f_payload_length -= 2u;
-      }
-      if (v_marker < 192u) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_marker);
-        goto exit;
-      } else if (v_marker < 208u) {
-        if (v_marker == 196u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-          status = wuffs_jpeg__decoder__decode_dht(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          continue;
-        } else if (v_marker == 200u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_marker);
-          goto exit;
-        }
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_sof_marker);
-        goto exit;
-      } else if (v_marker < 224u) {
-        if (v_marker < 217u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_marker);
-          goto exit;
-        } else if (v_marker == 217u) {
-          break;
-        } else if (v_marker == 218u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-          status = wuffs_jpeg__decoder__decode_sos(self, a_src, a_workbuf);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          continue;
-        } else if (v_marker == 219u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-          status = wuffs_jpeg__decoder__decode_dqt(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          continue;
-        } else if (v_marker == 221u) {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-          status = wuffs_jpeg__decoder__decode_dri(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          continue;
-        } else {
-          status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_marker);
-          goto exit;
-        }
-      } else if (v_marker < 240u) {
-      } else {
-        if (v_marker == 254u) {
-        } else {
-          status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_marker);
-          goto exit;
-        }
-      }
-      self->private_data.s_do_decode_frame[0].scratch = self->private_impl.f_payload_length;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-      if (self->private_data.s_do_decode_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_do_decode_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_do_decode_frame[0].scratch;
-      self->private_impl.f_payload_length = 0u;
-    }
-    self->private_impl.f_call_sequence = 96u;
-
-    ok:
-    self->private_impl.p_do_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_decode_frame[0].v_marker = v_marker;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.decode_dht
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_dht(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint8_t v_tc = 0;
-  uint8_t v_th = 0;
-  uint8_t v_tc4_th = 0;
-  uint32_t v_working_total_count = 0;
-  uint32_t v_total_count = 0;
-  uint32_t v_i = 0;
-  bool v_failed = false;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_dht[0];
-  if (coro_susp_point) {
-    v_tc4_th = self->private_data.s_decode_dht[0].v_tc4_th;
-    v_total_count = self->private_data.s_decode_dht[0].v_total_count;
-    v_i = self->private_data.s_decode_dht[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_sof_marker == 0u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_dht_marker);
-      goto exit;
-    }
-    while (self->private_impl.f_payload_length > 0u) {
-      if (self->private_impl.f_payload_length < 17u) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_dht_marker);
-        goto exit;
-      }
-      self->private_impl.f_payload_length -= 17u;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_0 = *iop_a_src++;
-        v_c = t_0;
-      }
-      if (((v_c >> 4u) > 1u) || ((v_c & 15u) > 3u)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_dht_marker);
-        goto exit;
-      }
-      v_tc = (v_c >> 4u);
-      v_th = (v_c & 15u);
-      v_tc4_th = ((uint8_t)(((v_tc * 4u) | v_th)));
-      if ((self->private_impl.f_sof_marker == 192u) && ((v_tc4_th & 3u) > 1u)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_dht_marker);
-        goto exit;
-      }
-      v_i = 0u;
-      while (v_i < 16u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_1 = *iop_a_src++;
-          self->private_data.f_dht_temp_counts[v_i] = t_1;
-        }
-        v_i += 1u;
-      }
-      v_working_total_count = 0u;
-      v_i = 0u;
-      while (v_i < 16u) {
-        v_working_total_count = ((v_working_total_count + ((uint32_t)(self->private_data.f_dht_temp_counts[v_i]))) & 65535u);
-        v_i += 1u;
-      }
-      if ((v_working_total_count <= 0u) || (256u < v_working_total_count)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_dht_marker);
-        goto exit;
-      }
-      v_total_count = v_working_total_count;
-      if (self->private_impl.f_payload_length < v_total_count) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_dht_marker);
-        goto exit;
-      }
-      self->private_impl.f_payload_length -= v_total_count;
-      v_i = 0u;
-      while (v_i < v_total_count) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_2 = *iop_a_src++;
-          self->private_impl.f_huff_tables_symbols[v_tc4_th][v_i] = t_2;
-        }
-        v_i += 1u;
-      }
-      while (v_i < 256u) {
-        self->private_impl.f_huff_tables_symbols[v_tc4_th][v_i] = 0u;
-        v_i += 1u;
-      }
-      if ((v_tc4_th & 4u) == 0u) {
-        v_i = 0u;
-        while (v_i < v_total_count) {
-          if (self->private_impl.f_huff_tables_symbols[v_tc4_th][v_i] > 15u) {
-            status = wuffs_base__make_status(wuffs_jpeg__error__bad_dht_marker);
-            goto exit;
-          }
-          v_i += 1u;
-        }
-      }
-      v_failed = wuffs_jpeg__decoder__calculate_huff_tables(self, v_tc4_th, v_total_count);
-      if (v_failed) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_dht_marker);
-        goto exit;
-      }
-      self->private_impl.f_seen_dht[v_tc4_th] = true;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_dht[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_dht[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_dht[0].v_tc4_th = v_tc4_th;
-  self->private_data.s_decode_dht[0].v_total_count = v_total_count;
-  self->private_data.s_decode_dht[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.calculate_huff_tables
-
-WUFFS_BASE__GENERATED_C_CODE
-static bool
-wuffs_jpeg__decoder__calculate_huff_tables(
-    wuffs_jpeg__decoder* self,
-    uint8_t a_tc4_th,
-    uint32_t a_total_count) {
-  uint32_t v_i = 0;
-  uint8_t v_j = 0;
-  uint8_t v_k = 0;
-  uint32_t v_bit_length_minus_one = 0;
-  uint8_t v_bit_length = 0;
-  uint32_t v_bit_string = 0;
-  uint32_t v_slow = 0;
-  uint8_t v_prefix = 0;
-  uint16_t v_fast = 0;
-  uint32_t v_reps = 0;
-
-  v_i = 0u;
-  v_k = 0u;
-  v_bit_length_minus_one = 0u;
-  while (v_i < a_total_count) {
-    while (v_k >= self->private_data.f_dht_temp_counts[v_bit_length_minus_one]) {
-      v_k = 0u;
-      v_bit_length_minus_one = ((v_bit_length_minus_one + 1u) & 15u);
-    }
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    v_k += 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-    self->private_data.f_dht_temp_bit_lengths[v_i] = ((uint8_t)((v_bit_length_minus_one + 1u)));
-    v_i += 1u;
-  }
-  v_bit_length = 0u;
-  v_bit_string = 0u;
-  v_i = 0u;
-  while (v_i < a_total_count) {
-    while (v_bit_length < self->private_data.f_dht_temp_bit_lengths[v_i]) {
-      if (v_bit_length >= 16u) {
-        return true;
-      }
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-      v_bit_length += 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-      v_bit_string <<= 1u;
-    }
-    self->private_data.f_dht_temp_bit_strings[v_i] = ((uint16_t)(v_bit_string));
-    v_bit_string += 1u;
-    if ((v_bit_string >> v_bit_length) > 0u) {
-      return true;
-    }
-    v_i += 1u;
-  }
-  v_k = 0u;
-  v_bit_length_minus_one = 0u;
-  while (true) {
-    if (self->private_data.f_dht_temp_counts[v_bit_length_minus_one] == 0u) {
-      self->private_impl.f_huff_tables_slow[a_tc4_th][v_bit_length_minus_one] = 0u;
-    } else {
-      v_slow = (255u & ((uint32_t)(((uint32_t)(v_k)) - ((uint32_t)(self->private_data.f_dht_temp_bit_strings[v_k])))));
-      v_k += self->private_data.f_dht_temp_counts[v_bit_length_minus_one];
-      self->private_impl.f_huff_tables_slow[a_tc4_th][v_bit_length_minus_one] = (v_slow | ((((uint32_t)(self->private_data.f_dht_temp_bit_strings[((uint8_t)(v_k - 1u))])) + 1u) << 8u));
-    }
-    v_bit_length_minus_one = ((v_bit_length_minus_one + 1u) & 15u);
-    if (v_bit_length_minus_one == 0u) {
-      break;
-    }
-  }
-  v_i = 0u;
-  while (v_i < 256u) {
-    self->private_impl.f_huff_tables_fast[a_tc4_th][v_i] = 65535u;
-    v_i += 1u;
-  }
-  v_j = 0u;
-  v_bit_length_minus_one = 0u;
-  while (v_bit_length_minus_one < 8u) {
-    v_k = 0u;
-    while (v_k < self->private_data.f_dht_temp_counts[v_bit_length_minus_one]) {
-      v_prefix = ((uint8_t)((((uint32_t)(self->private_data.f_dht_temp_bit_strings[v_j])) << (7u - v_bit_length_minus_one))));
-      v_fast = ((uint16_t)(((((uint32_t)((v_bit_length_minus_one + 1u))) << 8u) | ((uint32_t)(self->private_impl.f_huff_tables_symbols[a_tc4_th][v_j])))));
-      v_reps = (((uint32_t)(1u)) << (7u - v_bit_length_minus_one));
-      while (v_reps > 0u) {
-        self->private_impl.f_huff_tables_fast[a_tc4_th][v_prefix] = v_fast;
-        v_prefix += 1u;
-        v_reps -= 1u;
-      }
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-      v_k += 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-      v_j += 1u;
-    }
-    v_bit_length_minus_one += 1u;
-  }
-  return false;
-}
-
-// -------- func jpeg.decoder.decode_sos
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__decode_sos(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_my = 0;
-  uint32_t v_mx = 0;
-  uint32_t v_decode_mcu_result = 0;
-  uint32_t v_bitstream_length = 0;
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_sos[0];
-  if (coro_susp_point) {
-    v_my = self->private_data.s_decode_sos[0].v_my;
-    v_mx = self->private_data.s_decode_sos[0].v_mx;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_scan_count >= 64u) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__unsupported_scan_count);
-      goto exit;
-    }
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-    status = wuffs_jpeg__decoder__prepare_scan(self, a_src);
-    if (status.repr) {
-      goto suspend;
-    }
-    self->private_impl.f_next_restart_marker = 0u;
-    self->private_impl.f_mcu_previous_dc_values[0u] = 0u;
-    self->private_impl.f_mcu_previous_dc_values[1u] = 0u;
-    self->private_impl.f_mcu_previous_dc_values[2u] = 0u;
-    self->private_impl.f_mcu_previous_dc_values[3u] = 0u;
-    self->private_impl.f_restarts_remaining = self->private_impl.f_restart_interval;
-    self->private_impl.f_eob_run = 0u;
-    self->private_impl.f_bitstream_bits = 0u;
-    self->private_impl.f_bitstream_n_bits = 0u;
-    self->private_impl.f_bitstream_ri = 0u;
-    self->private_impl.f_bitstream_wi = 0u;
-    self->private_impl.f_bitstream_padding = 12345u;
-    wuffs_jpeg__decoder__fill_bitstream(self, a_src);
-    v_my = 0u;
-    while (v_my < self->private_impl.f_scan_height_in_mcus) {
-      v_mx = 0u;
-      while (v_mx < self->private_impl.f_scan_width_in_mcus) {
-        self->private_impl.f_mcu_current_block = 0u;
-        self->private_impl.f_mcu_zig_index = ((uint32_t)(self->private_impl.f_scan_ss));
-        if (self->private_impl.f_sof_marker >= 194u) {
-          wuffs_jpeg__decoder__load_mcu_blocks(self, v_mx, v_my, a_workbuf);
-        }
-        while (true) {
-          v_decode_mcu_result = wuffs_jpeg__decoder__decode_mcu(self, a_workbuf, v_mx, v_my);
-          if (v_decode_mcu_result == 0u) {
-            break;
-          } else if (v_decode_mcu_result != 1u) {
-            status = wuffs_base__make_status(wuffs_jpeg__error__internal_error_inconsistent_decoder_state);
-            goto exit;
-          }
-          while (true) {
-            v_bitstream_length = ((uint32_t)(self->private_impl.f_bitstream_wi - self->private_impl.f_bitstream_ri));
-            wuffs_jpeg__decoder__fill_bitstream(self, a_src);
-            if (v_bitstream_length < ((uint32_t)(self->private_impl.f_bitstream_wi - self->private_impl.f_bitstream_ri))) {
-              break;
-            } else if (self->private_impl.f_bitstream_padding == 0u) {
-              status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-              goto exit;
-            } else if ((a_src && a_src->meta.closed) &&  ! self->private_impl.f_bitstream_is_closed) {
-              if (self->private_impl.f_bitstream_wi < 1024u) {
-                wuffs_base__bulk_memset(&self->private_data.f_bitstream_buffer[self->private_impl.f_bitstream_wi], 264u, 0u);
-                self->private_impl.f_bitstream_wi += 264u;
-                self->private_impl.f_bitstream_is_closed = true;
-              }
-              break;
-            }
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-          }
-        }
-        if (self->private_impl.f_sof_marker >= 194u) {
-          wuffs_jpeg__decoder__save_mcu_blocks(self, v_mx, v_my, a_workbuf);
-        }
-        if (self->private_impl.f_restarts_remaining > 0u) {
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-          self->private_impl.f_restarts_remaining -= 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-          if (self->private_impl.f_restarts_remaining == 0u) {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-            status = wuffs_jpeg__decoder__skip_past_the_next_restart_marker(self, a_src);
-            if (status.repr) {
-              goto suspend;
-            }
-            self->private_impl.f_mcu_previous_dc_values[0u] = 0u;
-            self->private_impl.f_mcu_previous_dc_values[1u] = 0u;
-            self->private_impl.f_mcu_previous_dc_values[2u] = 0u;
-            self->private_impl.f_mcu_previous_dc_values[3u] = 0u;
-            self->private_impl.f_restarts_remaining = self->private_impl.f_restart_interval;
-            self->private_impl.f_eob_run = 0u;
-            self->private_impl.f_bitstream_bits = 0u;
-            self->private_impl.f_bitstream_n_bits = 0u;
-            self->private_impl.f_bitstream_ri = 0u;
-            self->private_impl.f_bitstream_wi = 0u;
-            self->private_impl.f_bitstream_padding = 12345u;
-          }
-        }
-        v_mx += 1u;
-      }
-      v_my += 1u;
-    }
-    wuffs_base__u32__sat_add_indirect(&self->private_impl.f_scan_count, 1u);
-
-    ok:
-    self->private_impl.p_decode_sos[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_sos[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_sos[0].v_my = v_my;
-  self->private_data.s_decode_sos[0].v_mx = v_mx;
-
-  goto exit;
-  exit:
-  return status;
-}
-
-// -------- func jpeg.decoder.prepare_scan
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__prepare_scan(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint32_t v_i = 0;
-  uint32_t v_j = 0;
-  uint32_t v_j_max_incl = 0;
-  bool v_failed = false;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_prepare_scan[0];
-  if (coro_susp_point) {
-    v_i = self->private_data.s_prepare_scan[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_payload_length < 6u) || (self->private_impl.f_payload_length > 12u)) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_c = t_0;
-    }
-    if ((v_c < 1u) || (v_c > 4u)) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-      goto exit;
-    }
-    self->private_impl.f_scan_num_components = ((uint32_t)(v_c));
-    if ((self->private_impl.f_scan_num_components > self->private_impl.f_num_components) || (self->private_impl.f_payload_length != (4u + (2u * self->private_impl.f_scan_num_components)))) {
-      status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-      goto exit;
-    }
-    self->private_impl.f_payload_length = 0u;
-    v_i = 0u;
-    while (v_i < self->private_impl.f_scan_num_components) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_1 = *iop_a_src++;
-        v_c = t_1;
-      }
-      v_j = 0u;
-      while (true) {
-        if (v_j >= self->private_impl.f_num_components) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-          goto exit;
-        }
-        if (v_c == self->private_impl.f_components_c[v_j]) {
-          if ( ! self->private_impl.f_seen_dqt[self->private_impl.f_components_tq[v_j]]) {
-            status = wuffs_base__make_status(wuffs_jpeg__error__missing_quantization_table);
-            goto exit;
-          }
-          self->private_impl.f_scan_comps_cselector[v_i] = ((uint8_t)(v_j));
-          break;
-        }
-        v_j += 1u;
-      }
-      v_j = 0u;
-      while (v_j < v_i) {
-        if (self->private_impl.f_scan_comps_cselector[v_i] == self->private_impl.f_scan_comps_cselector[v_j]) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-          goto exit;
-        }
-        v_j += 1u;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_2 = *iop_a_src++;
-        v_c = t_2;
-      }
-      if (((v_c >> 4u) > 3u) || ((v_c & 15u) > 3u)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-        goto exit;
-      }
-      self->private_impl.f_scan_comps_td[v_i] = (v_c >> 4u);
-      self->private_impl.f_scan_comps_ta[v_i] = (v_c & 15u);
-      if (self->private_impl.f_sof_marker == 192u) {
-        if ((self->private_impl.f_scan_comps_td[v_i] > 1u) || (self->private_impl.f_scan_comps_ta[v_i] > 1u)) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-          goto exit;
-        }
-      }
-      v_i += 1u;
-    }
-    if (self->private_impl.f_sof_marker < 194u) {
-      self->private_data.s_prepare_scan[0].scratch = 3u;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-      if (self->private_data.s_prepare_scan[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_prepare_scan[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_prepare_scan[0].scratch;
-      self->private_impl.f_scan_ss = 0u;
-      self->private_impl.f_scan_se = 63u;
-      self->private_impl.f_scan_ah = 0u;
-      self->private_impl.f_scan_al = 0u;
-    } else {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_3 = *iop_a_src++;
-        v_c = t_3;
-      }
-      if (v_c > 63u) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-        goto exit;
-      }
-      self->private_impl.f_scan_ss = v_c;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_4 = *iop_a_src++;
-        v_c = t_4;
-      }
-      if ((v_c > 63u) || (v_c < self->private_impl.f_scan_ss)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-        goto exit;
-      }
-      self->private_impl.f_scan_se = v_c;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_5 = *iop_a_src++;
-        v_c = t_5;
-      }
-      if (((v_c >> 4u) > 14u) || ((v_c & 15u) > 13u)) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-        goto exit;
-      }
-      self->private_impl.f_scan_ah = (v_c >> 4u);
-      self->private_impl.f_scan_al = (v_c & 15u);
-      if (self->private_impl.f_scan_ah > 0u) {
-        if ((self->private_impl.f_scan_ah - 1u) != self->private_impl.f_scan_al) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-          goto exit;
-        }
-      }
-      if (self->private_impl.f_scan_ss == 0u) {
-        if (self->private_impl.f_scan_se != 0u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-          goto exit;
-        } else if (self->private_impl.f_scan_ah == 0u) {
-          self->private_impl.choosy_decode_mcu = (
-              &wuffs_jpeg__decoder__decode_mcu_progressive_dc_high_bits);
-        } else {
-          self->private_impl.choosy_decode_mcu = (
-              &wuffs_jpeg__decoder__decode_mcu_progressive_dc_low_bit);
-        }
-      } else {
-        if (self->private_impl.f_scan_num_components != 1u) {
-          status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-          goto exit;
-        } else if (self->private_impl.f_scan_ah == 0u) {
-          self->private_impl.choosy_decode_mcu = (
-              &wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits);
-        } else {
-          self->private_impl.choosy_decode_mcu = (
-              &wuffs_jpeg__decoder__decode_mcu_progressive_ac_low_bit);
-        }
-      }
-    }
-    v_i = 0u;
-    while (v_i < self->private_impl.f_scan_num_components) {
-      if ((self->private_impl.f_scan_ss == 0u) &&  ! self->private_impl.f_seen_dht[(0u | self->private_impl.f_scan_comps_td[v_i])]) {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-        status = wuffs_jpeg__decoder__use_default_huffman_table(self, (0u | self->private_impl.f_scan_comps_td[v_i]));
-        if (status.repr) {
-          goto suspend;
-        }
-      }
-      if ((self->private_impl.f_scan_se != 0u) &&  ! self->private_impl.f_seen_dht[(4u | self->private_impl.f_scan_comps_ta[v_i])]) {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-        status = wuffs_jpeg__decoder__use_default_huffman_table(self, (4u | self->private_impl.f_scan_comps_ta[v_i]));
-        if (status.repr) {
-          goto suspend;
-        }
-      }
-      v_j = ((uint32_t)(self->private_impl.f_scan_ss));
-      v_j_max_incl = ((uint32_t)(wuffs_base__u8__min(self->private_impl.f_scan_se, 9u)));
-      while (v_j <= v_j_max_incl) {
-        self->private_impl.f_block_smoothing_lowest_scan_al[self->private_impl.f_scan_comps_cselector[v_i]][v_j] = self->private_impl.f_scan_al;
-        v_j += 1u;
-      }
-      v_i += 1u;
-    }
-    if (self->private_impl.f_scan_num_components == 1u) {
-      wuffs_jpeg__decoder__calculate_single_component_scan_fields(self);
-    } else {
-      v_failed = wuffs_jpeg__decoder__calculate_multiple_component_scan_fields(self);
-      if (v_failed) {
-        status = wuffs_base__make_status(wuffs_jpeg__error__bad_sos_marker);
-        goto exit;
-      }
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_prepare_scan[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_prepare_scan[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_prepare_scan[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.use_default_huffman_table
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__use_default_huffman_table(
-    wuffs_jpeg__decoder* self,
-    uint8_t a_tc4_th) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__slice_u8 v_data = {0};
-  wuffs_base__io_buffer u_r = wuffs_base__empty_io_buffer();
-  wuffs_base__io_buffer* v_r = &u_r;
-  const uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  if (a_tc4_th == 0u) {
-    v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_LUMA, 29);
-  } else if (a_tc4_th == 1u) {
-    v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_DC_CHROMA, 29);
-  } else if (a_tc4_th == 4u) {
-    v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_LUMA, 179);
-  } else if (a_tc4_th == 5u) {
-    v_data = wuffs_base__make_slice_u8((uint8_t*)WUFFS_JPEG__DEFAULT_HUFF_TABLE_AC_CHROMA, 179);
-  } else {
-    status = wuffs_base__make_status(wuffs_jpeg__error__missing_huffman_table);
-    goto exit;
-  }
-  {
-    wuffs_base__io_buffer* o_0_v_r = v_r;
-    const uint8_t *o_0_iop_v_r = iop_v_r;
-    const uint8_t *o_0_io0_v_r = io0_v_r;
-    const uint8_t *o_0_io1_v_r = io1_v_r;
-    const uint8_t *o_0_io2_v_r = io2_v_r;
-    v_r = wuffs_base__io_reader__set(
-        &u_r,
-        &iop_v_r,
-        &io0_v_r,
-        &io1_v_r,
-        &io2_v_r,
-        v_data,
-        0u);
-    self->private_impl.f_payload_length = ((uint32_t)((((uint64_t)(v_data.len)) & 65535u)));
-    {
-      wuffs_base__status t_0 = wuffs_jpeg__decoder__decode_dht(self, v_r);
-      v_status = t_0;
-    }
-    v_r = o_0_v_r;
-    iop_v_r = o_0_iop_v_r;
-    io0_v_r = o_0_io0_v_r;
-    io1_v_r = o_0_io1_v_r;
-    io2_v_r = o_0_io2_v_r;
-  }
-  status = v_status;
-  if (wuffs_base__status__is_error(&status)) {
-    goto exit;
-  } else if (wuffs_base__status__is_suspension(&status)) {
-    status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-    goto exit;
-  }
-  goto ok;
-
-  ok:
-  goto exit;
-  exit:
-  return status;
-}
-
-// -------- func jpeg.decoder.calculate_single_component_scan_fields
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__calculate_single_component_scan_fields(
-    wuffs_jpeg__decoder* self) {
-  uint8_t v_csel = 0;
-
-  self->private_impl.f_scan_comps_bx_offset[0u] = 0u;
-  self->private_impl.f_scan_comps_by_offset[0u] = 0u;
-  self->private_impl.f_mcu_num_blocks = 1u;
-  self->private_impl.f_mcu_blocks_sselector[0u] = 0u;
-  v_csel = self->private_impl.f_scan_comps_cselector[0u];
-  self->private_impl.f_mcu_blocks_offset[0u] = self->private_impl.f_components_workbuf_offsets[v_csel];
-  self->private_impl.f_mcu_blocks_mx_mul[0u] = 8u;
-  self->private_impl.f_mcu_blocks_my_mul[0u] = (8u * self->private_impl.f_components_workbuf_widths[v_csel]);
-  self->private_impl.f_mcu_blocks_dc_hselector[0u] = (0u | self->private_impl.f_scan_comps_td[0u]);
-  self->private_impl.f_mcu_blocks_ac_hselector[0u] = (4u | self->private_impl.f_scan_comps_ta[0u]);
-  self->private_impl.f_scan_width_in_mcus = wuffs_jpeg__decoder__quantize_dimension(self, self->private_impl.f_width, self->private_impl.f_components_h[v_csel], self->private_impl.f_max_incl_components_h);
-  self->private_impl.f_scan_height_in_mcus = wuffs_jpeg__decoder__quantize_dimension(self, self->private_impl.f_height, self->private_impl.f_components_v[v_csel], self->private_impl.f_max_incl_components_v);
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func jpeg.decoder.calculate_multiple_component_scan_fields
-
-WUFFS_BASE__GENERATED_C_CODE
-static bool
-wuffs_jpeg__decoder__calculate_multiple_component_scan_fields(
-    wuffs_jpeg__decoder* self) {
-  uint32_t v_i = 0;
-  uint32_t v_h = 0;
-  uint32_t v_v = 0;
-  uint32_t v_hv = 0;
-  uint32_t v_total_hv = 0;
-  uint32_t v_b = 0;
-  uint32_t v_bx_offset = 0;
-  uint32_t v_by_offset = 0;
-  uint8_t v_ssel = 0;
-  uint8_t v_csel = 0;
-
-  v_total_hv = 0u;
-  v_i = 0u;
-  v_b = 0u;
-  v_bx_offset = 0u;
-  v_by_offset = 0u;
-  while (v_i < self->private_impl.f_scan_num_components) {
-    v_h = ((uint32_t)(self->private_impl.f_components_h[self->private_impl.f_scan_comps_cselector[v_i]]));
-    v_v = ((uint32_t)(self->private_impl.f_components_v[self->private_impl.f_scan_comps_cselector[v_i]]));
-    v_hv = (((uint32_t)(self->private_impl.f_components_h[self->private_impl.f_scan_comps_cselector[v_i]])) * ((uint32_t)(self->private_impl.f_components_v[self->private_impl.f_scan_comps_cselector[v_i]])));
-    v_total_hv += v_hv;
-    while (v_hv > 0u) {
-      self->private_impl.f_scan_comps_bx_offset[(v_b & 15u)] = ((uint8_t)((v_bx_offset & 3u)));
-      self->private_impl.f_scan_comps_by_offset[(v_b & 15u)] = ((uint8_t)((v_by_offset & 3u)));
-      self->private_impl.f_mcu_blocks_sselector[(v_b & 15u)] = ((uint8_t)(v_i));
-      v_b += 1u;
-      v_bx_offset += 1u;
-      if (v_bx_offset == v_h) {
-        v_bx_offset = 0u;
-        v_by_offset += 1u;
-        if (v_by_offset == v_v) {
-          v_by_offset = 0u;
-        }
-      }
-      v_hv -= 1u;
-    }
-    v_i += 1u;
-  }
-  if (v_total_hv > 10u) {
-    return true;
-  }
-  self->private_impl.f_mcu_num_blocks = v_total_hv;
-  v_b = 0u;
-  while (v_b < self->private_impl.f_mcu_num_blocks) {
-    v_ssel = self->private_impl.f_mcu_blocks_sselector[v_b];
-    v_csel = self->private_impl.f_scan_comps_cselector[v_ssel];
-    self->private_impl.f_mcu_blocks_offset[v_b] = (self->private_impl.f_components_workbuf_offsets[v_csel] + (8u * ((uint64_t)(self->private_impl.f_scan_comps_bx_offset[v_b]))) + (8u * ((uint64_t)(self->private_impl.f_scan_comps_by_offset[v_b])) * ((uint64_t)(self->private_impl.f_components_workbuf_widths[v_csel]))));
-    self->private_impl.f_mcu_blocks_mx_mul[v_b] = (8u * ((uint32_t)(self->private_impl.f_components_h[v_csel])));
-    self->private_impl.f_mcu_blocks_my_mul[v_b] = (8u * ((uint32_t)(self->private_impl.f_components_v[v_csel])) * self->private_impl.f_components_workbuf_widths[v_csel]);
-    self->private_impl.f_mcu_blocks_dc_hselector[v_b] = (0u | self->private_impl.f_scan_comps_td[v_ssel]);
-    self->private_impl.f_mcu_blocks_ac_hselector[v_b] = (4u | self->private_impl.f_scan_comps_ta[v_ssel]);
-    v_b += 1u;
-  }
-  self->private_impl.f_scan_width_in_mcus = self->private_impl.f_width_in_mcus;
-  self->private_impl.f_scan_height_in_mcus = self->private_impl.f_height_in_mcus;
-  return false;
-}
-
-// -------- func jpeg.decoder.fill_bitstream
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__fill_bitstream(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  uint32_t v_wi = 0;
-  uint8_t v_c = 0;
-  uint32_t v_new_wi = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  if (self->private_impl.f_bitstream_ri <= 0u) {
-  } else if (self->private_impl.f_bitstream_ri >= self->private_impl.f_bitstream_wi) {
-    self->private_impl.f_bitstream_ri = 0u;
-    self->private_impl.f_bitstream_wi = 0u;
-  } else {
-    v_wi = (self->private_impl.f_bitstream_wi - self->private_impl.f_bitstream_ri);
-    wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8(self->private_data.f_bitstream_buffer, 2048), wuffs_base__make_slice_u8_ij(self->private_data.f_bitstream_buffer,
-        self->private_impl.f_bitstream_ri,
-        self->private_impl.f_bitstream_wi));
-    self->private_impl.f_bitstream_ri = 0u;
-    self->private_impl.f_bitstream_wi = v_wi;
-  }
-  v_wi = self->private_impl.f_bitstream_wi;
-  while ((v_wi < 2048u) && (((uint64_t)(io2_a_src - iop_a_src)) > 0u)) {
-    v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-    if (v_c < 255u) {
-      self->private_data.f_bitstream_buffer[v_wi] = v_c;
-      v_wi += 1u;
-      iop_a_src += 1u;
-      continue;
-    } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 1u) {
-      break;
-    } else if ((wuffs_base__peek_u16le__no_bounds_check(iop_a_src) >> 8u) > 0u) {
-      break;
-    } else {
-      self->private_data.f_bitstream_buffer[v_wi] = 255u;
-      v_wi += 1u;
-      iop_a_src += 2u;
-    }
-  }
-  if (((uint64_t)(io2_a_src - iop_a_src)) > 1u) {
-    if ((wuffs_base__peek_u8be__no_bounds_check(iop_a_src) >= 255u) && ((wuffs_base__peek_u16le__no_bounds_check(iop_a_src) >> 8u) > 0u)) {
-      v_new_wi = (wuffs_base__u32__min(v_wi, 1784u) + 264u);
-      v_new_wi = wuffs_base__u32__min(v_new_wi, (v_wi + self->private_impl.f_bitstream_padding));
-      if (v_wi < v_new_wi) {
-        wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_bitstream_padding, (v_new_wi - v_wi));
-        wuffs_base__bulk_memset(&self->private_data.f_bitstream_buffer[v_wi], (v_new_wi - v_wi), 0u);
-        v_wi = v_new_wi;
-      }
-    }
-  }
-  self->private_impl.f_bitstream_wi = v_wi;
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func jpeg.decoder.load_mcu_blocks_for_single_component
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__load_mcu_blocks_for_single_component(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_csel) {
-  return (*self->private_impl.choosy_load_mcu_blocks_for_single_component)(self, a_mx, a_my, a_workbuf, a_csel);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__load_mcu_blocks_for_single_component__choosy_default(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_csel) {
-  uint64_t v_stride16 = 0;
-  uint64_t v_offset = 0;
-
-  v_stride16 = ((uint64_t)((self->private_impl.f_components_workbuf_widths[a_csel] * 16u)));
-  v_offset = (self->private_impl.f_components_workbuf_offsets[(a_csel | 4u)] + (((uint64_t)(a_mx)) * 128u) + (((uint64_t)(a_my)) * v_stride16));
-  if (v_offset <= ((uint64_t)(a_workbuf.len))) {
-    wuffs_base__bulk_load_host_endian(&self->private_data.f_mcu_blocks[0], 1u * (size_t)128u, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset));
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func jpeg.decoder.load_mcu_blocks
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__load_mcu_blocks(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf) {
-  uint32_t v_b = 0;
-  uint8_t v_csel = 0;
-  uint64_t v_h = 0;
-  uint64_t v_v = 0;
-  uint64_t v_stride16 = 0;
-  uint64_t v_offset = 0;
-
-  v_h = 1u;
-  v_v = 1u;
-  v_b = 0u;
-  while (v_b < self->private_impl.f_mcu_num_blocks) {
-    v_csel = self->private_impl.f_scan_comps_cselector[self->private_impl.f_mcu_blocks_sselector[v_b]];
-    if (self->private_impl.f_scan_num_components > 1u) {
-      v_h = ((uint64_t)(self->private_impl.f_components_h[v_csel]));
-      v_v = ((uint64_t)(self->private_impl.f_components_v[v_csel]));
-    }
-    v_stride16 = ((uint64_t)((self->private_impl.f_components_workbuf_widths[v_csel] * 16u)));
-    v_offset = (self->private_impl.f_components_workbuf_offsets[(v_csel | 4u)] + (((v_h * ((uint64_t)(a_mx))) + ((uint64_t)(self->private_impl.f_scan_comps_bx_offset[v_b]))) * 128u) + (((v_v * ((uint64_t)(a_my))) + ((uint64_t)(self->private_impl.f_scan_comps_by_offset[v_b]))) * v_stride16));
-    if (v_offset <= ((uint64_t)(a_workbuf.len))) {
-      wuffs_base__bulk_load_host_endian(&self->private_data.f_mcu_blocks[v_b], 1u * (size_t)128u, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset));
-    }
-    v_b += 1u;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func jpeg.decoder.save_mcu_blocks
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__save_mcu_blocks(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf) {
-  uint32_t v_b = 0;
-  uint8_t v_csel = 0;
-  uint64_t v_h = 0;
-  uint64_t v_v = 0;
-  uint64_t v_stride16 = 0;
-  uint64_t v_offset = 0;
-
-  v_h = 1u;
-  v_v = 1u;
-  v_b = 0u;
-  while (v_b < self->private_impl.f_mcu_num_blocks) {
-    v_csel = self->private_impl.f_scan_comps_cselector[self->private_impl.f_mcu_blocks_sselector[v_b]];
-    if (self->private_impl.f_scan_num_components > 1u) {
-      v_h = ((uint64_t)(self->private_impl.f_components_h[v_csel]));
-      v_v = ((uint64_t)(self->private_impl.f_components_v[v_csel]));
-    }
-    v_stride16 = ((uint64_t)((self->private_impl.f_components_workbuf_widths[v_csel] * 16u)));
-    v_offset = (self->private_impl.f_components_workbuf_offsets[(v_csel | 4u)] + (((v_h * ((uint64_t)(a_mx))) + ((uint64_t)(self->private_impl.f_scan_comps_bx_offset[v_b]))) * 128u) + (((v_v * ((uint64_t)(a_my))) + ((uint64_t)(self->private_impl.f_scan_comps_by_offset[v_b]))) * v_stride16));
-    if (v_offset <= ((uint64_t)(a_workbuf.len))) {
-      wuffs_base__bulk_save_host_endian(&self->private_data.f_mcu_blocks[v_b], 1u * (size_t)128u, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset));
-    }
-    v_b += 1u;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func jpeg.decoder.skip_past_the_next_restart_marker
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__skip_past_the_next_restart_marker(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_skip_past_the_next_restart_marker[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      if (((uint64_t)(io2_a_src - iop_a_src)) < 2u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-        continue;
-      } else if (wuffs_base__peek_u8be__no_bounds_check(iop_a_src) < 255u) {
-        iop_a_src += 1u;
-        continue;
-      }
-      v_c = ((uint8_t)((wuffs_base__peek_u16le__no_bounds_check(iop_a_src) >> 8u)));
-      if (v_c < 192u) {
-        iop_a_src += 2u;
-        continue;
-      } else if ((v_c < 208u) || (215u < v_c)) {
-        break;
-      }
-      v_c &= 7u;
-      if ((self->private_impl.f_next_restart_marker == ((v_c + 1u) & 7u)) || (self->private_impl.f_next_restart_marker == ((v_c + 2u) & 7u))) {
-        break;
-      } else if ((self->private_impl.f_next_restart_marker == ((v_c + 7u) & 7u)) || (self->private_impl.f_next_restart_marker == ((v_c + 6u) & 7u))) {
-        iop_a_src += 2u;
-        continue;
-      } else {
-        iop_a_src += 2u;
-        break;
-      }
-    }
-    self->private_impl.f_next_restart_marker = (((uint8_t)(self->private_impl.f_next_restart_marker + 1u)) & 7u);
-
-    ok:
-    self->private_impl.p_skip_past_the_next_restart_marker[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_skip_past_the_next_restart_marker[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func jpeg.decoder.apply_progressive_idct
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__apply_progressive_idct(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf) {
-  uint32_t v_csel = 0;
-  bool v_block_smoothing_applicable = false;
-  uint32_t v_scan_width_in_mcus = 0;
-  uint32_t v_scan_height_in_mcus = 0;
-  uint32_t v_mcu_blocks_mx_mul_0 = 0;
-  uint32_t v_mcu_blocks_my_mul_0 = 0;
-  uint32_t v_my = 0;
-  uint32_t v_mx = 0;
-  uint64_t v_stride = 0;
-  uint64_t v_offset = 0;
-  uint8_t v_stashed_mcu_blocks_0[128] = {0};
-
-  wuffs_base__bulk_save_host_endian(&self->private_data.f_mcu_blocks[0], 1u * (size_t)128u, wuffs_base__make_slice_u8(v_stashed_mcu_blocks_0, 128));
-  v_block_smoothing_applicable = true;
-  v_csel = 0u;
-  while (v_csel < self->private_impl.f_num_components) {
-    if ((self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][0u] >= 16u) || wuffs_jpeg__decoder__top_left_quants_has_zero(self, ((uint32_t)(self->private_impl.f_components_tq[v_csel])))) {
-      v_block_smoothing_applicable = false;
-    }
-    v_csel += 1u;
-  }
-  v_csel = 0u;
-  while (v_csel < self->private_impl.f_num_components) {
-    v_scan_width_in_mcus = wuffs_jpeg__decoder__quantize_dimension(self, self->private_impl.f_width, self->private_impl.f_components_h[v_csel], self->private_impl.f_max_incl_components_h);
-    v_scan_height_in_mcus = wuffs_jpeg__decoder__quantize_dimension(self, self->private_impl.f_height, self->private_impl.f_components_v[v_csel], self->private_impl.f_max_incl_components_v);
-    v_mcu_blocks_mx_mul_0 = 8u;
-    v_mcu_blocks_my_mul_0 = (8u * self->private_impl.f_components_workbuf_widths[v_csel]);
-    if (v_block_smoothing_applicable && (0u != (self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][1u] |
-        self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][2u] |
-        self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][3u] |
-        self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][4u] |
-        self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][5u] |
-        self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][6u] |
-        self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][8u] |
-        self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][8u] |
-        self->private_impl.f_block_smoothing_lowest_scan_al[v_csel][9u]))) {
-      self->private_impl.choosy_load_mcu_blocks_for_single_component = (
-          &wuffs_jpeg__decoder__load_mcu_blocks_for_single_component_smooth);
-      self->private_impl.f_block_smoothing_mx_max_incl = wuffs_base__u32__sat_sub(v_scan_width_in_mcus, 1u);
-      self->private_impl.f_block_smoothing_my_max_incl = wuffs_base__u32__sat_sub(v_scan_height_in_mcus, 1u);
-    } else {
-      self->private_impl.choosy_load_mcu_blocks_for_single_component = (
-          &wuffs_jpeg__decoder__load_mcu_blocks_for_single_component__choosy_default);
-    }
-    v_my = 0u;
-    while (v_my < v_scan_height_in_mcus) {
-      v_mx = 0u;
-      while (v_mx < v_scan_width_in_mcus) {
-        wuffs_jpeg__decoder__load_mcu_blocks_for_single_component(self,
-            v_mx,
-            v_my,
-            a_workbuf,
-            v_csel);
-        v_stride = ((uint64_t)(self->private_impl.f_components_workbuf_widths[v_csel]));
-        v_offset = (self->private_impl.f_components_workbuf_offsets[v_csel] + (((uint64_t)(v_mcu_blocks_mx_mul_0)) * ((uint64_t)(v_mx))) + (((uint64_t)(v_mcu_blocks_my_mul_0)) * ((uint64_t)(v_my))));
-        if (v_offset <= ((uint64_t)(a_workbuf.len))) {
-          wuffs_jpeg__decoder__decode_idct(self, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset), v_stride, ((uint32_t)(self->private_impl.f_components_tq[v_csel])));
-        }
-        v_mx += 1u;
-      }
-      v_my += 1u;
-    }
-    v_csel += 1u;
-  }
-  wuffs_base__bulk_load_host_endian(&self->private_data.f_mcu_blocks[0], 1u * (size_t)128u, wuffs_base__make_slice_u8(v_stashed_mcu_blocks_0, 128));
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func jpeg.decoder.swizzle_gray
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__swizzle_gray(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint32_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_length = 0;
-  wuffs_base__table_u8 v_tab = {0};
-  wuffs_base__slice_u8 v_dst = {0};
-  uint32_t v_y = 0;
-  uint64_t v_stride = 0;
-
-  v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-  v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-  if ((v_dst_bits_per_pixel & 7u) != 0u) {
-    return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-  v_dst_bytes_per_pixel = (v_dst_bits_per_pixel / 8u);
-  v_dst_length = ((uint64_t)((v_dst_bytes_per_pixel * self->private_impl.f_width)));
-  v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-  v_y = 0u;
-  while (v_y < self->private_impl.f_height) {
-    v_dst = wuffs_base__table_u8__row_u32(v_tab, v_y);
-    if (v_dst_length < ((uint64_t)(v_dst.len))) {
-      v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_length);
-    }
-    wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024)), a_workbuf);
-    v_stride = ((uint64_t)(self->private_impl.f_components_workbuf_widths[0u]));
-    if (v_stride <= ((uint64_t)(a_workbuf.len))) {
-      a_workbuf = wuffs_base__slice_u8__subslice_i(a_workbuf, v_stride);
-    } else {
-      a_workbuf = wuffs_base__utility__empty_slice_u8();
-    }
-    v_y += 1u;
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func jpeg.decoder.swizzle_colorful
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_jpeg__decoder__swizzle_colorful(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__slice_u8 v_src0 = {0};
-  wuffs_base__slice_u8 v_src1 = {0};
-  wuffs_base__slice_u8 v_src2 = {0};
-  wuffs_base__slice_u8 v_src3 = {0};
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  if ((self->private_impl.f_components_workbuf_offsets[0u] <= self->private_impl.f_components_workbuf_offsets[1u]) && (self->private_impl.f_components_workbuf_offsets[1u] <= ((uint64_t)(a_workbuf.len)))) {
-    v_src0 = wuffs_base__slice_u8__subslice_ij(a_workbuf,
-        self->private_impl.f_components_workbuf_offsets[0u],
-        self->private_impl.f_components_workbuf_offsets[1u]);
-  }
-  if ((self->private_impl.f_components_workbuf_offsets[1u] <= self->private_impl.f_components_workbuf_offsets[2u]) && (self->private_impl.f_components_workbuf_offsets[2u] <= ((uint64_t)(a_workbuf.len)))) {
-    v_src1 = wuffs_base__slice_u8__subslice_ij(a_workbuf,
-        self->private_impl.f_components_workbuf_offsets[1u],
-        self->private_impl.f_components_workbuf_offsets[2u]);
-  }
-  if ((self->private_impl.f_components_workbuf_offsets[2u] <= self->private_impl.f_components_workbuf_offsets[3u]) && (self->private_impl.f_components_workbuf_offsets[3u] <= ((uint64_t)(a_workbuf.len)))) {
-    v_src2 = wuffs_base__slice_u8__subslice_ij(a_workbuf,
-        self->private_impl.f_components_workbuf_offsets[2u],
-        self->private_impl.f_components_workbuf_offsets[3u]);
-  }
-  if ((self->private_impl.f_components_workbuf_offsets[3u] <= self->private_impl.f_components_workbuf_offsets[4u]) && (self->private_impl.f_components_workbuf_offsets[4u] <= ((uint64_t)(a_workbuf.len)))) {
-    v_src3 = wuffs_base__slice_u8__subslice_ij(a_workbuf,
-        self->private_impl.f_components_workbuf_offsets[3u],
-        self->private_impl.f_components_workbuf_offsets[4u]);
-  }
-  v_status = wuffs_base__pixel_swizzler__swizzle_ycck(&self->private_impl.f_swizzler,
-      a_dst,
-      wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024)),
-      self->private_impl.f_width,
-      self->private_impl.f_height,
-      v_src0,
-      v_src1,
-      v_src2,
-      v_src3,
-      self->private_impl.f_components_workbuf_widths[0u],
-      self->private_impl.f_components_workbuf_widths[1u],
-      self->private_impl.f_components_workbuf_widths[2u],
-      self->private_impl.f_components_workbuf_widths[3u],
-      self->private_impl.f_components_workbuf_heights[0u],
-      self->private_impl.f_components_workbuf_heights[1u],
-      self->private_impl.f_components_workbuf_heights[2u],
-      self->private_impl.f_components_workbuf_heights[3u],
-      self->private_impl.f_components_workbuf_widths[0u],
-      self->private_impl.f_components_workbuf_widths[1u],
-      self->private_impl.f_components_workbuf_widths[2u],
-      self->private_impl.f_components_workbuf_widths[3u],
-      self->private_impl.f_components_h[0u],
-      self->private_impl.f_components_h[1u],
-      self->private_impl.f_components_h[2u],
-      self->private_impl.f_components_h[3u],
-      self->private_impl.f_components_v[0u],
-      self->private_impl.f_components_v[1u],
-      self->private_impl.f_components_v[2u],
-      self->private_impl.f_components_v[3u],
-      self->private_impl.f_is_rgb_or_cmyk,
-      true,
-      wuffs_base__make_slice_u8(self->private_data.f_swizzle_ycck_scratch_buffer_2k, 2048));
-  return wuffs_base__status__ensure_not_a_suspension(v_status);
-}
-
-// -------- func jpeg.decoder.frame_dirty_rect
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_jpeg__decoder__frame_dirty_rect(
-    const wuffs_jpeg__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-
-  return wuffs_base__utility__make_rect_ie_u32(
-      0u,
-      0u,
-      self->private_impl.f_width,
-      self->private_impl.f_height);
-}
-
-// -------- func jpeg.decoder.num_animation_loops
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_jpeg__decoder__num_animation_loops(
-    const wuffs_jpeg__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func jpeg.decoder.num_decoded_frame_configs
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_jpeg__decoder__num_decoded_frame_configs(
-    const wuffs_jpeg__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 32u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func jpeg.decoder.num_decoded_frames
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_jpeg__decoder__num_decoded_frames(
-    const wuffs_jpeg__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 64u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func jpeg.decoder.restart_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__restart_frame(
-    wuffs_jpeg__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  uint32_t v_i = 0;
-  uint32_t v_j = 0;
-
-  if (self->private_impl.f_call_sequence < 32u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-  }
-  if (a_index != 0u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  self->private_impl.f_call_sequence = 40u;
-  self->private_impl.f_bitstream_is_closed = false;
-  self->private_impl.f_frame_config_io_position = a_io_position;
-  self->private_impl.f_scan_count = 0u;
-  self->private_impl.f_restart_interval = self->private_impl.f_saved_restart_interval;
-  v_i = 0u;
-  while (v_i < 4u) {
-    self->private_impl.f_seen_dqt[v_i] = self->private_impl.f_saved_seen_dqt[v_i];
-    v_j = 0u;
-    while (v_j < 64u) {
-      self->private_impl.f_quant_tables[v_i][v_j] = self->private_impl.f_saved_quant_tables[v_i][v_j];
-      v_j += 1u;
-    }
-    v_i += 1u;
-  }
-  v_i = 0u;
-  while (v_i < 4u) {
-    v_j = 0u;
-    while (v_j < 10u) {
-      self->private_impl.f_block_smoothing_lowest_scan_al[v_i][v_j] = 16u;
-      v_j += 1u;
-    }
-    v_i += 1u;
-  }
-  v_i = 0u;
-  while (v_i < 8u) {
-    self->private_impl.f_seen_dht[v_i] = false;
-    v_i += 1u;
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func jpeg.decoder.set_report_metadata
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_jpeg__decoder__set_report_metadata(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report) {
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func jpeg.decoder.tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_jpeg__decoder__tell_me_more(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 4)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  status = wuffs_base__make_status(wuffs_base__error__no_more_information);
-  goto exit;
-
-  goto ok;
-  ok:
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func jpeg.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_jpeg__decoder__workbuf_len(
-    const wuffs_jpeg__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(self->private_impl.f_components_workbuf_offsets[8u], self->private_impl.f_components_workbuf_offsets[8u]);
-}
-
-// -------- func jpeg.decoder.top_left_quants_has_zero
-
-WUFFS_BASE__GENERATED_C_CODE
-static bool
-wuffs_jpeg__decoder__top_left_quants_has_zero(
-    const wuffs_jpeg__decoder* self,
-    uint32_t a_q) {
-  return ((self->private_impl.f_quant_tables[a_q][0u] == 0u) ||
-      (self->private_impl.f_quant_tables[a_q][1u] == 0u) ||
-      (self->private_impl.f_quant_tables[a_q][2u] == 0u) ||
-      (self->private_impl.f_quant_tables[a_q][3u] == 0u) ||
-      (self->private_impl.f_quant_tables[a_q][8u] == 0u) ||
-      (self->private_impl.f_quant_tables[a_q][9u] == 0u) ||
-      (self->private_impl.f_quant_tables[a_q][10u] == 0u) ||
-      (self->private_impl.f_quant_tables[a_q][16u] == 0u) ||
-      (self->private_impl.f_quant_tables[a_q][17u] == 0u) ||
-      (self->private_impl.f_quant_tables[a_q][24u] == 0u));
-}
-
-// -------- func jpeg.decoder.load_mcu_blocks_for_single_component_smooth
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_jpeg__decoder__load_mcu_blocks_for_single_component_smooth(
-    wuffs_jpeg__decoder* self,
-    uint32_t a_mx,
-    uint32_t a_my,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_csel) {
-  uint64_t v_stride16 = 0;
-  uint64_t v_offset = 0;
-  uint32_t v_dx = 0;
-  uint32_t v_dy = 0;
-  uint32_t v_mx = 0;
-  uint32_t v_my = 0;
-  uint8_t v_q = 0;
-  uint32_t v_q_00 = 0;
-  uint32_t v_q_xy = 0;
-  uint8_t v_al = 0;
-  uint32_t v_scratch = 0;
-  uint32_t v_limit = 0;
-
-  v_stride16 = ((uint64_t)((self->private_impl.f_components_workbuf_widths[a_csel] * 16u)));
-  v_offset = (self->private_impl.f_components_workbuf_offsets[(a_csel | 4u)] + (((uint64_t)(a_mx)) * 128u) + (((uint64_t)(a_my)) * v_stride16));
-  if (v_offset <= ((uint64_t)(a_workbuf.len))) {
-    wuffs_base__bulk_load_host_endian(&self->private_data.f_mcu_blocks[0], 1u * (size_t)128u, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset));
-  }
-  v_dy = 0u;
-  while (v_dy < 5u) {
-    v_my = wuffs_base__u32__min(self->private_impl.f_block_smoothing_my_max_incl, wuffs_base__u32__sat_sub((a_my + v_dy), 2u));
-    v_dx = 0u;
-    while (v_dx < 5u) {
-      v_mx = wuffs_base__u32__min(self->private_impl.f_block_smoothing_mx_max_incl, wuffs_base__u32__sat_sub((a_mx + v_dx), 2u));
-      v_offset = (self->private_impl.f_components_workbuf_offsets[(a_csel | 4u)] + (((uint64_t)(v_mx)) * 128u) + (((uint64_t)(v_my)) * v_stride16));
-      if (v_offset <= ((uint64_t)(a_workbuf.len))) {
-        wuffs_base__bulk_load_host_endian(&self->private_impl.f_block_smoothing_dc_values[v_dy][v_dx], 1u * (size_t)2u, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset));
-      }
-      v_dx += 1u;
-    }
-    v_dy += 1u;
-  }
-  v_q = self->private_impl.f_components_tq[a_csel];
-  v_q_00 = ((uint32_t)(self->private_impl.f_quant_tables[v_q][0u]));
-  if (v_q_00 <= 0u) {
-    return wuffs_base__make_empty_struct();
-  }
-  if (0u != (16u &
-      self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][1u] &
-      self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][2u] &
-      self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][3u] &
-      self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][4u] &
-      self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][5u] &
-      self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][6u] &
-      self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][7u] &
-      self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][8u] &
-      self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][9u])) {
-    v_scratch = 0u;
-    v_scratch += ((uint32_t)(4294967294u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-    v_scratch += ((uint32_t)(4294967290u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-    v_scratch += ((uint32_t)(4294967288u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-    v_scratch += ((uint32_t)(4294967290u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-    v_scratch += ((uint32_t)(4294967294u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-    v_scratch += ((uint32_t)(4294967290u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-    v_scratch += ((uint32_t)(6u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-    v_scratch += ((uint32_t)(42u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-    v_scratch += ((uint32_t)(6u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-    v_scratch += ((uint32_t)(4294967290u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-    v_scratch += ((uint32_t)(4294967288u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-    v_scratch += ((uint32_t)(42u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-    v_scratch += ((uint32_t)(152u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-    v_scratch += ((uint32_t)(42u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-    v_scratch += ((uint32_t)(4294967288u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-    v_scratch += ((uint32_t)(4294967290u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-    v_scratch += ((uint32_t)(6u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-    v_scratch += ((uint32_t)(42u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-    v_scratch += ((uint32_t)(6u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-    v_scratch += ((uint32_t)(4294967290u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-    v_scratch += ((uint32_t)(4294967294u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-    v_scratch += ((uint32_t)(4294967290u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-    v_scratch += ((uint32_t)(4294967288u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-    v_scratch += ((uint32_t)(4294967290u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-    v_scratch += ((uint32_t)(4294967294u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-    if (v_scratch < 2147483648u) {
-      v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + 128u)) / 256u)));
-    } else {
-      v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + 128u)) / 256u)));
-    }
-    self->private_data.f_mcu_blocks[0u][0u] = ((uint16_t)(v_scratch));
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][1u]));
-    if ((v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][1u] == 0u)) {
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(4294967293u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(13u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(4294967283u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(3u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(4294967293u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(38u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(4294967258u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(3u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(4294967293u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(13u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(4294967283u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(3u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      } else {
-        v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      }
-      self->private_data.f_mcu_blocks[0u][1u] = ((uint16_t)(v_scratch));
-    }
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][2u]));
-    if ((v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][2u] == 0u)) {
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(4294967291u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(7u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(4294967282u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(7u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(4294967291u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      } else {
-        v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      }
-      self->private_data.f_mcu_blocks[0u][2u] = ((uint16_t)(v_scratch));
-    }
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][3u]));
-    if ((v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][3u] == 0u)) {
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(4294967294u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      } else {
-        v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      }
-      self->private_data.f_mcu_blocks[0u][3u] = ((uint16_t)(v_scratch));
-    }
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][8u]));
-    if ((v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][8u] == 0u)) {
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(4294967293u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(4294967293u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(4294967293u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(13u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(38u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(13u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(4294967283u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(4294967258u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(4294967283u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(3u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(3u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(3u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      } else {
-        v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      }
-      self->private_data.f_mcu_blocks[0u][8u] = ((uint16_t)(v_scratch));
-    }
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][9u]));
-    if ((v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][9u] == 0u)) {
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(9u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(4294967287u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(4294967287u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(9u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      } else {
-        v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      }
-      self->private_data.f_mcu_blocks[0u][9u] = ((uint16_t)(v_scratch));
-    }
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][10u]));
-    if ((v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][10u] == 0u)) {
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(4294967293u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(3u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      } else {
-        v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      }
-      self->private_data.f_mcu_blocks[0u][10u] = ((uint16_t)(v_scratch));
-    }
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][16u]));
-    if ((v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][16u] == 0u)) {
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(7u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(4294967291u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(4294967282u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(4294967291u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(7u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      } else {
-        v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      }
-      self->private_data.f_mcu_blocks[0u][16u] = ((uint16_t)(v_scratch));
-    }
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][17u]));
-    if ((v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][17u] == 0u)) {
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(4294967293u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(3u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      } else {
-        v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      }
-      self->private_data.f_mcu_blocks[0u][17u] = ((uint16_t)(v_scratch));
-    }
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][24u]));
-    if ((v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][24u] == 0u)) {
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(2u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(4294967294u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      } else {
-        v_scratch = ((uint32_t)(0u - (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u))));
-      }
-      self->private_data.f_mcu_blocks[0u][24u] = ((uint16_t)(v_scratch));
-    }
-  } else {
-    v_al = self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][1u];
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][1u]));
-    if ((v_al > 0u) && (v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][1u] == 0u)) {
-      v_limit = ((((uint32_t)(1u)) << v_al) - 1u);
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(4294967289u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(50u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(4294967246u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(7u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      } else {
-        v_scratch = ((uint32_t)(0u - wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      }
-      self->private_data.f_mcu_blocks[0u][1u] = ((uint16_t)(v_scratch));
-    }
-    v_al = self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][5u];
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][2u]));
-    if ((v_al > 0u) && (v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][2u] == 0u)) {
-      v_limit = ((((uint32_t)(1u)) << v_al) - 1u);
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(13u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(4294967272u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(13u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      } else {
-        v_scratch = ((uint32_t)(0u - wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      }
-      self->private_data.f_mcu_blocks[0u][2u] = ((uint16_t)(v_scratch));
-    }
-    v_al = self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][2u];
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][8u]));
-    if ((v_al > 0u) && (v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][8u] == 0u)) {
-      v_limit = ((((uint32_t)(1u)) << v_al) - 1u);
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(4294967289u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(50u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(4294967246u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(7u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      } else {
-        v_scratch = ((uint32_t)(0u - wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      }
-      self->private_data.f_mcu_blocks[0u][8u] = ((uint16_t)(v_scratch));
-    }
-    v_al = self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][4u];
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][9u]));
-    if ((v_al > 0u) && (v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][9u] == 0u)) {
-      v_limit = ((((uint32_t)(1u)) << v_al) - 1u);
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(10u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(4294967286u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(4294967286u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(10u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(1u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      } else {
-        v_scratch = ((uint32_t)(0u - wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      }
-      self->private_data.f_mcu_blocks[0u][9u] = ((uint16_t)(v_scratch));
-    }
-    v_al = self->private_impl.f_block_smoothing_lowest_scan_al[a_csel][3u];
-    v_q_xy = ((uint32_t)(self->private_impl.f_quant_tables[v_q][16u]));
-    if ((v_al > 0u) && (v_q_xy > 0u) && (self->private_data.f_mcu_blocks[0u][16u] == 0u)) {
-      v_limit = ((((uint32_t)(1u)) << v_al) - 1u);
-      v_scratch = 0u;
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][1u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[0u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][1u])));
-      v_scratch += ((uint32_t)(13u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[1u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][1u])));
-      v_scratch += ((uint32_t)(4294967272u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[2u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][1u])));
-      v_scratch += ((uint32_t)(13u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[3u][4u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][0u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][1u])));
-      v_scratch += ((uint32_t)(4294967295u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][2u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][3u])));
-      v_scratch += ((uint32_t)(0u * wuffs_base__utility__sign_extend_convert_u16_u32(self->private_impl.f_block_smoothing_dc_values[4u][4u])));
-      v_scratch *= v_q_00;
-      if (v_scratch < 2147483648u) {
-        v_scratch = ((uint32_t)(0u + wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u + v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      } else {
-        v_scratch = ((uint32_t)(0u - wuffs_base__u32__min(v_limit, (((uint32_t)(((uint32_t)(0u - v_scratch)) + (v_q_xy << 7u))) / (v_q_xy << 8u)))));
-      }
-      self->private_data.f_mcu_blocks[0u][16u] = ((uint16_t)(v_scratch));
-    }
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func jpeg.decoder.decode_mcu
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my) {
-  return (*self->private_impl.choosy_decode_mcu)(self, a_workbuf, a_mx, a_my);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu__choosy_default(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my) {
-  uint32_t v_ret = 0;
-  uint64_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint8_t v_csel = 0;
-  wuffs_base__io_buffer u_r = wuffs_base__empty_io_buffer();
-  wuffs_base__io_buffer* v_r = &u_r;
-  const uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint32_t v_pos = 0;
-  uint8_t v_dc_h = 0;
-  uint32_t v_dc_symbol = 0;
-  uint32_t v_dc_ht_fast = 0;
-  uint32_t v_dc_bl = 0;
-  uint32_t v_dc_code = 0;
-  uint32_t v_dc_blm1 = 0;
-  uint32_t v_dc_ht_slow = 0;
-  uint16_t v_dc_value = 0;
-  uint16_t v_dc_extend = 0;
-  const uint16_t* v_ac_huff_table_fast = NULL;
-  uint8_t v_ac_h = 0;
-  uint32_t v_ac_symbol = 0;
-  uint32_t v_ac_ht_fast = 0;
-  uint32_t v_ac_bl = 0;
-  uint32_t v_ac_code = 0;
-  uint32_t v_ac_blm1 = 0;
-  uint32_t v_ac_ht_slow = 0;
-  uint16_t v_ac_value = 0;
-  uint16_t v_ac_extend = 0;
-  uint32_t v_ac_rrrr = 0;
-  uint32_t v_ac_ssss = 0;
-  uint32_t v_z = 0;
-  uint32_t v_mcb = 0;
-  uint64_t v_stride = 0;
-  uint64_t v_offset = 0;
-
-  v_bits = self->private_impl.f_bitstream_bits;
-  v_n_bits = self->private_impl.f_bitstream_n_bits;
-  if (self->private_impl.f_bitstream_ri > self->private_impl.f_bitstream_wi) {
-    return 2u;
-  }
-  {
-    wuffs_base__io_buffer* o_0_v_r = v_r;
-    const uint8_t *o_0_iop_v_r = iop_v_r;
-    const uint8_t *o_0_io0_v_r = io0_v_r;
-    const uint8_t *o_0_io1_v_r = io1_v_r;
-    const uint8_t *o_0_io2_v_r = io2_v_r;
-    v_r = wuffs_base__io_reader__set(
-        &u_r,
-        &iop_v_r,
-        &io0_v_r,
-        &io1_v_r,
-        &io2_v_r,
-        wuffs_base__make_slice_u8_ij(self->private_data.f_bitstream_buffer,
-        self->private_impl.f_bitstream_ri,
-        self->private_impl.f_bitstream_wi),
-        ((uint64_t)(self->private_impl.f_bitstream_ri)));
-    do {
-      while (self->private_impl.f_mcu_current_block < self->private_impl.f_mcu_num_blocks) {
-        while (self->private_impl.f_mcu_zig_index <= 0u) {
-          wuffs_base__bulk_memset(&self->private_data.f_mcu_blocks[0], 1u * (size_t)128u, 0u);
-          if (((uint64_t)(io2_v_r - iop_v_r)) < 264u) {
-            v_ret = 1u;
-            goto label__goto_done__break;
-          }
-          v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-          iop_v_r += ((63u - (v_n_bits & 63u)) >> 3u);
-          v_n_bits |= 56u;
-          v_dc_h = self->private_impl.f_mcu_blocks_dc_hselector[self->private_impl.f_mcu_current_block];
-          v_dc_ht_fast = ((uint32_t)(self->private_impl.f_huff_tables_fast[v_dc_h][(v_bits >> 56u)]));
-          v_dc_bl = (v_dc_ht_fast >> 8u);
-          if (v_n_bits >= v_dc_bl) {
-            v_dc_symbol = (15u & v_dc_ht_fast);
-            v_dc_extend = WUFFS_JPEG__EXTEND[v_dc_symbol];
-            v_bits <<= (v_dc_bl & 63u);
-            v_n_bits -= v_dc_bl;
-          } else {
-            v_dc_code = ((uint32_t)((v_bits >> 55u)));
-            v_dc_blm1 = 8u;
-            v_bits <<= 9u;
-            v_n_bits -= 9u;
-            while (true) {
-              v_dc_ht_slow = self->private_impl.f_huff_tables_slow[v_dc_h][v_dc_blm1];
-              if (v_dc_code < (v_dc_ht_slow >> 8u)) {
-                v_dc_symbol = (15u & ((uint32_t)(self->private_impl.f_huff_tables_symbols[v_dc_h][(255u & ((uint32_t)(v_dc_code + v_dc_ht_slow)))])));
-                v_dc_extend = WUFFS_JPEG__EXTEND[v_dc_symbol];
-                break;
-              }
-              v_dc_code = (((uint32_t)(v_dc_code << 1u)) | ((uint32_t)((v_bits >> 63u))));
-              v_bits <<= 1u;
-              v_n_bits -= 1u;
-              v_dc_blm1 = ((v_dc_blm1 + 1u) & 15u);
-              if (v_dc_blm1 == 0u) {
-                v_dc_symbol = 0u;
-                v_dc_extend = WUFFS_JPEG__EXTEND[v_dc_symbol];
-                break;
-              }
-            }
-          }
-          v_dc_value = ((uint16_t)(((v_bits >> 32u) >> (32u - v_dc_symbol))));
-          v_dc_value += (v_dc_extend & (((uint16_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 65535u));
-          v_bits <<= v_dc_symbol;
-          v_n_bits -= v_dc_symbol;
-          v_csel = self->private_impl.f_scan_comps_cselector[self->private_impl.f_mcu_blocks_sselector[self->private_impl.f_mcu_current_block]];
-          self->private_impl.f_mcu_previous_dc_values[v_csel] += v_dc_value;
-          self->private_data.f_mcu_blocks[0u][0u] = self->private_impl.f_mcu_previous_dc_values[v_csel];
-          self->private_impl.f_mcu_zig_index = 1u;
-          break;
-        }
-        if (((uint64_t)(io2_v_r - iop_v_r)) < 264u) {
-          v_ret = 1u;
-          goto label__goto_done__break;
-        }
-        if (v_n_bits < 16u) {
-          v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-        }
-        v_z = 1u;
-        self->private_impl.f_mcu_zig_index = 0u;
-        v_ac_h = self->private_impl.f_mcu_blocks_ac_hselector[self->private_impl.f_mcu_current_block];
-        v_ac_huff_table_fast = &self->private_impl.f_huff_tables_fast[v_ac_h][0u];
-        while (v_z < 64u) {
-          v_ac_ht_fast = ((uint32_t)(v_ac_huff_table_fast[(v_bits >> 56u)]));
-          if (((uint64_t)(io2_v_r - iop_v_r)) < 8u) {
-            v_ret = 2u;
-            goto label__goto_done__break;
-          }
-          v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-          iop_v_r += ((63u - (v_n_bits & 63u)) >> 3u);
-          v_n_bits |= 56u;
-          v_ac_bl = (v_ac_ht_fast >> 8u);
-          if (v_n_bits >= v_ac_bl) {
-            v_ac_symbol = (255u & v_ac_ht_fast);
-            v_bits <<= (v_ac_bl & 63u);
-            v_n_bits -= v_ac_bl;
-          } else {
-            v_ac_code = ((uint32_t)((v_bits >> 55u)));
-            v_ac_blm1 = 8u;
-            v_bits <<= 9u;
-            v_n_bits -= 9u;
-            while (true) {
-              v_ac_ht_slow = self->private_impl.f_huff_tables_slow[v_ac_h][v_ac_blm1];
-              if (v_ac_code < (v_ac_ht_slow >> 8u)) {
-                v_ac_symbol = ((uint32_t)(self->private_impl.f_huff_tables_symbols[v_ac_h][(255u & ((uint32_t)(v_ac_code + v_ac_ht_slow)))]));
-                break;
-              }
-              v_ac_code = (((uint32_t)(v_ac_code << 1u)) | ((uint32_t)((v_bits >> 63u))));
-              v_bits <<= 1u;
-              v_n_bits -= 1u;
-              v_ac_blm1 = ((v_ac_blm1 + 1u) & 15u);
-              if (v_ac_blm1 == 0u) {
-                v_ac_symbol = 0u;
-                break;
-              }
-            }
-          }
-          v_ac_rrrr = (v_ac_symbol >> 4u);
-          v_z += (v_ac_rrrr + 1u);
-          v_ac_ssss = (v_ac_symbol & 15u);
-          v_ac_extend = WUFFS_JPEG__EXTEND[v_ac_ssss];
-          if (v_ac_ssss > 0u) {
-            v_ac_value = ((uint16_t)((v_bits >> (64u - v_ac_ssss))));
-            v_ac_value += (v_ac_extend & (((uint16_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 65535u));
-            v_bits <<= v_ac_ssss;
-            v_n_bits -= v_ac_ssss;
-            self->private_data.f_mcu_blocks[0u][WUFFS_JPEG__UNZIG[v_z]] = v_ac_value;
-          } else if (v_ac_rrrr < 15u) {
-            break;
-          }
-        }
-        v_mcb = self->private_impl.f_mcu_current_block;
-        self->private_impl.f_mcu_current_block += 1u;
-        if (self->private_impl.f_test_only_interrupt_decode_mcu) {
-          goto label__goto_done__break;
-        }
-        v_csel = self->private_impl.f_scan_comps_cselector[self->private_impl.f_mcu_blocks_sselector[v_mcb]];
-        v_stride = ((uint64_t)(self->private_impl.f_components_workbuf_widths[v_csel]));
-        v_offset = (self->private_impl.f_mcu_blocks_offset[v_mcb] + (((uint64_t)(self->private_impl.f_mcu_blocks_mx_mul[v_mcb])) * ((uint64_t)(a_mx))) + (((uint64_t)(self->private_impl.f_mcu_blocks_my_mul[v_mcb])) * ((uint64_t)(a_my))));
-        if (v_offset <= ((uint64_t)(a_workbuf.len))) {
-          wuffs_jpeg__decoder__decode_idct(self, wuffs_base__slice_u8__subslice_i(a_workbuf, v_offset), v_stride, ((uint32_t)(self->private_impl.f_components_tq[v_csel])));
-        }
-      }
-      self->private_impl.f_mcu_current_block = 0u;
-    } while (0);
-    label__goto_done__break:;
-    v_pos = ((uint32_t)(wuffs_base__u64__sat_add((v_r ? v_r->meta.pos : 0), ((uint64_t)(iop_v_r - io0_v_r)))));
-    if (v_pos > self->private_impl.f_bitstream_wi) {
-      v_ret = 2u;
-    } else {
-      self->private_impl.f_bitstream_ri = v_pos;
-    }
-    v_r = o_0_v_r;
-    iop_v_r = o_0_iop_v_r;
-    io0_v_r = o_0_io0_v_r;
-    io1_v_r = o_0_io1_v_r;
-    io2_v_r = o_0_io2_v_r;
-  }
-  self->private_impl.f_bitstream_bits = v_bits;
-  self->private_impl.f_bitstream_n_bits = v_n_bits;
-  return v_ret;
-}
-
-// -------- func jpeg.decoder.decode_mcu_progressive_ac_high_bits
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu_progressive_ac_high_bits(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my) {
-  uint32_t v_ret = 0;
-  uint64_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  wuffs_base__io_buffer u_r = wuffs_base__empty_io_buffer();
-  wuffs_base__io_buffer* v_r = &u_r;
-  const uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint32_t v_pos = 0;
-  const uint16_t* v_ac_huff_table_fast = NULL;
-  uint8_t v_ac_h = 0;
-  uint32_t v_ac_symbol = 0;
-  uint32_t v_ac_ht_fast = 0;
-  uint32_t v_ac_bl = 0;
-  uint32_t v_ac_code = 0;
-  uint32_t v_ac_blm1 = 0;
-  uint32_t v_ac_ht_slow = 0;
-  uint16_t v_ac_value = 0;
-  uint16_t v_ac_extend = 0;
-  uint32_t v_ac_rrrr = 0;
-  uint32_t v_ac_ssss = 0;
-  uint32_t v_z = 0;
-
-  if (self->private_impl.f_eob_run > 0u) {
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-    self->private_impl.f_eob_run -= 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-    return 0u;
-  }
-  v_bits = self->private_impl.f_bitstream_bits;
-  v_n_bits = self->private_impl.f_bitstream_n_bits;
-  if (self->private_impl.f_bitstream_ri > self->private_impl.f_bitstream_wi) {
-    return 2u;
-  }
-  {
-    wuffs_base__io_buffer* o_0_v_r = v_r;
-    const uint8_t *o_0_iop_v_r = iop_v_r;
-    const uint8_t *o_0_io0_v_r = io0_v_r;
-    const uint8_t *o_0_io1_v_r = io1_v_r;
-    const uint8_t *o_0_io2_v_r = io2_v_r;
-    v_r = wuffs_base__io_reader__set(
-        &u_r,
-        &iop_v_r,
-        &io0_v_r,
-        &io1_v_r,
-        &io2_v_r,
-        wuffs_base__make_slice_u8_ij(self->private_data.f_bitstream_buffer,
-        self->private_impl.f_bitstream_ri,
-        self->private_impl.f_bitstream_wi),
-        ((uint64_t)(self->private_impl.f_bitstream_ri)));
-    do {
-      do {
-        if (((uint64_t)(io2_v_r - iop_v_r)) < 264u) {
-          v_ret = 1u;
-          goto label__goto_done__break;
-        }
-        if (v_n_bits < 16u) {
-          v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-        }
-        v_z = self->private_impl.f_mcu_zig_index;
-        self->private_impl.f_mcu_zig_index = 0u;
-        v_ac_h = self->private_impl.f_mcu_blocks_ac_hselector[0u];
-        v_ac_huff_table_fast = &self->private_impl.f_huff_tables_fast[v_ac_h][0u];
-        while (v_z <= ((uint32_t)(self->private_impl.f_scan_se))) {
-          v_ac_ht_fast = ((uint32_t)(v_ac_huff_table_fast[(v_bits >> 56u)]));
-          if (((uint64_t)(io2_v_r - iop_v_r)) < 8u) {
-            v_ret = 2u;
-            goto label__goto_done__break;
-          }
-          v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-          iop_v_r += ((63u - (v_n_bits & 63u)) >> 3u);
-          v_n_bits |= 56u;
-          v_ac_bl = (v_ac_ht_fast >> 8u);
-          if (v_n_bits >= v_ac_bl) {
-            v_ac_symbol = (255u & v_ac_ht_fast);
-            v_bits <<= (v_ac_bl & 63u);
-            v_n_bits -= v_ac_bl;
-          } else {
-            v_ac_code = ((uint32_t)((v_bits >> 55u)));
-            v_ac_blm1 = 8u;
-            v_bits <<= 9u;
-            v_n_bits -= 9u;
-            while (true) {
-              v_ac_ht_slow = self->private_impl.f_huff_tables_slow[v_ac_h][v_ac_blm1];
-              if (v_ac_code < (v_ac_ht_slow >> 8u)) {
-                v_ac_symbol = ((uint32_t)(self->private_impl.f_huff_tables_symbols[v_ac_h][(255u & ((uint32_t)(v_ac_code + v_ac_ht_slow)))]));
-                break;
-              }
-              v_ac_code = (((uint32_t)(v_ac_code << 1u)) | ((uint32_t)((v_bits >> 63u))));
-              v_bits <<= 1u;
-              v_n_bits -= 1u;
-              v_ac_blm1 = ((v_ac_blm1 + 1u) & 15u);
-              if (v_ac_blm1 == 0u) {
-                v_ac_symbol = 0u;
-                break;
-              }
-            }
-          }
-          v_ac_rrrr = (v_ac_symbol >> 4u);
-          v_z += (v_ac_rrrr + 1u);
-          v_ac_ssss = (v_ac_symbol & 15u);
-          v_ac_extend = WUFFS_JPEG__EXTEND[v_ac_ssss];
-          if (v_ac_ssss > 0u) {
-            v_ac_value = ((uint16_t)((v_bits >> (64u - v_ac_ssss))));
-            v_ac_value += (v_ac_extend & (((uint16_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 65535u));
-            v_bits <<= v_ac_ssss;
-            v_n_bits -= v_ac_ssss;
-            self->private_data.f_mcu_blocks[0u][WUFFS_JPEG__UNZIG[v_z]] = ((uint16_t)(((uint16_t)(v_ac_value << self->private_impl.f_scan_al))));
-          } else if (v_ac_rrrr < 15u) {
-            self->private_impl.f_eob_run = ((uint16_t)(((((uint16_t)(1u)) << v_ac_rrrr) - 1u)));
-            if (v_ac_rrrr > 0u) {
-              self->private_impl.f_eob_run += ((uint16_t)((v_bits >> (64u - v_ac_rrrr))));
-              v_bits <<= v_ac_rrrr;
-              v_n_bits -= v_ac_rrrr;
-            }
-            break;
-          }
-        }
-      } while (0);
-    } while (0);
-    label__goto_done__break:;
-    v_pos = ((uint32_t)(wuffs_base__u64__sat_add((v_r ? v_r->meta.pos : 0), ((uint64_t)(iop_v_r - io0_v_r)))));
-    if (v_pos > self->private_impl.f_bitstream_wi) {
-      v_ret = 2u;
-    } else {
-      self->private_impl.f_bitstream_ri = v_pos;
-    }
-    v_r = o_0_v_r;
-    iop_v_r = o_0_iop_v_r;
-    io0_v_r = o_0_io0_v_r;
-    io1_v_r = o_0_io1_v_r;
-    io2_v_r = o_0_io2_v_r;
-  }
-  self->private_impl.f_bitstream_bits = v_bits;
-  self->private_impl.f_bitstream_n_bits = v_n_bits;
-  return v_ret;
-}
-
-// -------- func jpeg.decoder.decode_mcu_progressive_ac_low_bit
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu_progressive_ac_low_bit(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my) {
-  uint32_t v_ret = 0;
-  uint64_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint16_t v_one_lshift_scan_al = 0;
-  wuffs_base__io_buffer u_r = wuffs_base__empty_io_buffer();
-  wuffs_base__io_buffer* v_r = &u_r;
-  const uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint32_t v_pos = 0;
-  const uint16_t* v_ac_huff_table_fast = NULL;
-  uint8_t v_ac_h = 0;
-  uint32_t v_ac_symbol = 0;
-  uint32_t v_ac_ht_fast = 0;
-  uint32_t v_ac_bl = 0;
-  uint32_t v_ac_code = 0;
-  uint32_t v_ac_blm1 = 0;
-  uint32_t v_ac_ht_slow = 0;
-  uint16_t v_ac_value = 0;
-  uint32_t v_ac_rrrr = 0;
-  uint32_t v_ac_ssss = 0;
-  uint8_t v_unzig = 0;
-  bool v_bit = false;
-
-  v_bits = self->private_impl.f_bitstream_bits;
-  v_n_bits = self->private_impl.f_bitstream_n_bits;
-  v_one_lshift_scan_al = (((uint16_t)(1u)) << self->private_impl.f_scan_al);
-  if (self->private_impl.f_bitstream_ri > self->private_impl.f_bitstream_wi) {
-    return 2u;
-  }
-  {
-    wuffs_base__io_buffer* o_0_v_r = v_r;
-    const uint8_t *o_0_iop_v_r = iop_v_r;
-    const uint8_t *o_0_io0_v_r = io0_v_r;
-    const uint8_t *o_0_io1_v_r = io1_v_r;
-    const uint8_t *o_0_io2_v_r = io2_v_r;
-    v_r = wuffs_base__io_reader__set(
-        &u_r,
-        &iop_v_r,
-        &io0_v_r,
-        &io1_v_r,
-        &io2_v_r,
-        wuffs_base__make_slice_u8_ij(self->private_data.f_bitstream_buffer,
-        self->private_impl.f_bitstream_ri,
-        self->private_impl.f_bitstream_wi),
-        ((uint64_t)(self->private_impl.f_bitstream_ri)));
-    do {
-      do {
-        if (((uint64_t)(io2_v_r - iop_v_r)) < 264u) {
-          v_ret = 1u;
-          goto label__goto_done__break;
-        }
-        while (true) {
-          if (self->private_impl.f_eob_run > 0u) {
-            break;
-          }
-          v_ac_h = self->private_impl.f_mcu_blocks_ac_hselector[0u];
-          v_ac_huff_table_fast = &self->private_impl.f_huff_tables_fast[v_ac_h][0u];
-          while (true) {
-            if (((uint64_t)(io2_v_r - iop_v_r)) < 8u) {
-              v_ret = 2u;
-              goto label__goto_done__break;
-            }
-            v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-            iop_v_r += ((63u - (v_n_bits & 63u)) >> 3u);
-            v_n_bits |= 56u;
-            v_ac_ht_fast = ((uint32_t)(v_ac_huff_table_fast[(v_bits >> 56u)]));
-            v_ac_bl = (v_ac_ht_fast >> 8u);
-            if (v_n_bits >= v_ac_bl) {
-              v_ac_symbol = (255u & v_ac_ht_fast);
-              v_bits <<= (v_ac_bl & 63u);
-              v_n_bits -= v_ac_bl;
-            } else {
-              v_ac_code = ((uint32_t)((v_bits >> 55u)));
-              v_ac_blm1 = 8u;
-              v_bits <<= 9u;
-              v_n_bits -= 9u;
-              while (true) {
-                v_ac_ht_slow = self->private_impl.f_huff_tables_slow[v_ac_h][v_ac_blm1];
-                if (v_ac_code < (v_ac_ht_slow >> 8u)) {
-                  v_ac_symbol = ((uint32_t)(self->private_impl.f_huff_tables_symbols[v_ac_h][(255u & ((uint32_t)(v_ac_code + v_ac_ht_slow)))]));
-                  break;
-                }
-                v_ac_code = (((uint32_t)(v_ac_code << 1u)) | ((uint32_t)((v_bits >> 63u))));
-                v_bits <<= 1u;
-                v_n_bits -= 1u;
-                v_ac_blm1 = ((v_ac_blm1 + 1u) & 15u);
-                if (v_ac_blm1 == 0u) {
-                  v_ac_symbol = 0u;
-                  break;
-                }
-              }
-            }
-            v_ac_rrrr = (v_ac_symbol >> 4u);
-            v_ac_ssss = (v_ac_symbol & 15u);
-            v_ac_value = 0u;
-            if (v_ac_ssss > 0u) {
-              v_ac_value = (((uint16_t)(1u)) << self->private_impl.f_scan_al);
-              if ((v_bits >> 63u) == 0u) {
-                v_ac_value = ((uint16_t)(((uint16_t)(65535u)) << self->private_impl.f_scan_al));
-              }
-              v_bits <<= 1u;
-              v_n_bits -= 1u;
-            } else if (v_ac_rrrr < 15u) {
-              self->private_impl.f_eob_run = (((uint16_t)(1u)) << v_ac_rrrr);
-              if (v_ac_rrrr > 0u) {
-                self->private_impl.f_eob_run += ((uint16_t)((v_bits >> (64u - v_ac_rrrr))));
-                v_bits <<= v_ac_rrrr;
-                v_n_bits -= v_ac_rrrr;
-              }
-              goto label__goto_do_eob__break;
-            }
-            while (true) {
-              v_unzig = WUFFS_JPEG__UNZIG[(1u + self->private_impl.f_mcu_zig_index)];
-              if (self->private_data.f_mcu_blocks[0u][v_unzig] != 0u) {
-                if (v_n_bits == 0u) {
-                  if (((uint64_t)(io2_v_r - iop_v_r)) < 8u) {
-                    v_ret = 2u;
-                    goto label__goto_done__break;
-                  }
-                  v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-                  iop_v_r += ((63u - (v_n_bits & 63u)) >> 3u);
-                  v_n_bits |= 56u;
-                }
-                v_bit = ((v_bits >> 63u) > 0u);
-                v_bits <<= 1u;
-                v_n_bits -= 1u;
-                if (v_bit) {
-                  if (self->private_data.f_mcu_blocks[0u][v_unzig] < 32768u) {
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-                    self->private_data.f_mcu_blocks[0u][v_unzig] += v_one_lshift_scan_al;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-                  } else {
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-                    self->private_data.f_mcu_blocks[0u][v_unzig] -= v_one_lshift_scan_al;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-                  }
-                }
-              } else if (v_ac_rrrr <= 0u) {
-                break;
-              } else {
-                v_ac_rrrr -= 1u;
-              }
-              if (self->private_impl.f_mcu_zig_index >= ((uint32_t)(self->private_impl.f_scan_se))) {
-                break;
-              }
-              self->private_impl.f_mcu_zig_index += 1u;
-            }
-            if (v_ac_value != 0u) {
-              self->private_data.f_mcu_blocks[0u][WUFFS_JPEG__UNZIG[(1u + self->private_impl.f_mcu_zig_index)]] = v_ac_value;
-            }
-            if (self->private_impl.f_mcu_zig_index >= ((uint32_t)(self->private_impl.f_scan_se))) {
-              break;
-            }
-            self->private_impl.f_mcu_zig_index += 1u;
-          }
-          goto label__block__break;
-        }
-        label__goto_do_eob__break:;
-        if (self->private_impl.f_eob_run <= 0u) {
-          v_ret = 2u;
-          goto label__goto_done__break;
-        }
-        while (true) {
-          v_unzig = WUFFS_JPEG__UNZIG[(1u + self->private_impl.f_mcu_zig_index)];
-          if (self->private_data.f_mcu_blocks[0u][v_unzig] != 0u) {
-            if (v_n_bits == 0u) {
-              if (((uint64_t)(io2_v_r - iop_v_r)) < 8u) {
-                v_ret = 2u;
-                goto label__goto_done__break;
-              }
-              v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-              iop_v_r += ((63u - (v_n_bits & 63u)) >> 3u);
-              v_n_bits |= 56u;
-            }
-            v_bit = ((v_bits >> 63u) > 0u);
-            v_bits <<= 1u;
-            v_n_bits -= 1u;
-            if (v_bit) {
-              if (self->private_data.f_mcu_blocks[0u][v_unzig] < 32768u) {
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-                self->private_data.f_mcu_blocks[0u][v_unzig] += v_one_lshift_scan_al;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-              } else {
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-                self->private_data.f_mcu_blocks[0u][v_unzig] -= v_one_lshift_scan_al;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-              }
-            }
-          }
-          if (self->private_impl.f_mcu_zig_index >= ((uint32_t)(self->private_impl.f_scan_se))) {
-            break;
-          }
-          self->private_impl.f_mcu_zig_index += 1u;
-        }
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-        self->private_impl.f_eob_run -= 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-      } while (0);
-      label__block__break:;
-    } while (0);
-    label__goto_done__break:;
-    v_pos = ((uint32_t)(wuffs_base__u64__sat_add((v_r ? v_r->meta.pos : 0), ((uint64_t)(iop_v_r - io0_v_r)))));
-    if (v_pos > self->private_impl.f_bitstream_wi) {
-      v_ret = 2u;
-    } else {
-      self->private_impl.f_bitstream_ri = v_pos;
-    }
-    v_r = o_0_v_r;
-    iop_v_r = o_0_iop_v_r;
-    io0_v_r = o_0_io0_v_r;
-    io1_v_r = o_0_io1_v_r;
-    io2_v_r = o_0_io2_v_r;
-  }
-  self->private_impl.f_bitstream_bits = v_bits;
-  self->private_impl.f_bitstream_n_bits = v_n_bits;
-  return v_ret;
-}
-
-// -------- func jpeg.decoder.decode_mcu_progressive_dc_high_bits
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu_progressive_dc_high_bits(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my) {
-  uint32_t v_ret = 0;
-  uint64_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint8_t v_csel = 0;
-  wuffs_base__io_buffer u_r = wuffs_base__empty_io_buffer();
-  wuffs_base__io_buffer* v_r = &u_r;
-  const uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint32_t v_pos = 0;
-  uint8_t v_dc_h = 0;
-  uint32_t v_dc_symbol = 0;
-  uint32_t v_dc_ht_fast = 0;
-  uint32_t v_dc_bl = 0;
-  uint32_t v_dc_code = 0;
-  uint32_t v_dc_blm1 = 0;
-  uint32_t v_dc_ht_slow = 0;
-  uint16_t v_dc_value = 0;
-  uint16_t v_dc_extend = 0;
-
-  v_bits = self->private_impl.f_bitstream_bits;
-  v_n_bits = self->private_impl.f_bitstream_n_bits;
-  if (self->private_impl.f_bitstream_ri > self->private_impl.f_bitstream_wi) {
-    return 2u;
-  }
-  {
-    wuffs_base__io_buffer* o_0_v_r = v_r;
-    const uint8_t *o_0_iop_v_r = iop_v_r;
-    const uint8_t *o_0_io0_v_r = io0_v_r;
-    const uint8_t *o_0_io1_v_r = io1_v_r;
-    const uint8_t *o_0_io2_v_r = io2_v_r;
-    v_r = wuffs_base__io_reader__set(
-        &u_r,
-        &iop_v_r,
-        &io0_v_r,
-        &io1_v_r,
-        &io2_v_r,
-        wuffs_base__make_slice_u8_ij(self->private_data.f_bitstream_buffer,
-        self->private_impl.f_bitstream_ri,
-        self->private_impl.f_bitstream_wi),
-        ((uint64_t)(self->private_impl.f_bitstream_ri)));
-    do {
-      while (self->private_impl.f_mcu_current_block < self->private_impl.f_mcu_num_blocks) {
-        if (((uint64_t)(io2_v_r - iop_v_r)) < 264u) {
-          v_ret = 1u;
-          goto label__goto_done__break;
-        }
-        do {
-          if (((uint64_t)(io2_v_r - iop_v_r)) < 8u) {
-            v_ret = 2u;
-            goto label__goto_done__break;
-          }
-          v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-          iop_v_r += ((63u - (v_n_bits & 63u)) >> 3u);
-          v_n_bits |= 56u;
-          v_dc_h = self->private_impl.f_mcu_blocks_dc_hselector[self->private_impl.f_mcu_current_block];
-          v_dc_ht_fast = ((uint32_t)(self->private_impl.f_huff_tables_fast[v_dc_h][(v_bits >> 56u)]));
-          v_dc_bl = (v_dc_ht_fast >> 8u);
-          if (v_n_bits >= v_dc_bl) {
-            v_dc_symbol = (15u & v_dc_ht_fast);
-            v_dc_extend = WUFFS_JPEG__EXTEND[v_dc_symbol];
-            v_bits <<= (v_dc_bl & 63u);
-            v_n_bits -= v_dc_bl;
-          } else {
-            v_dc_code = ((uint32_t)((v_bits >> 55u)));
-            v_dc_blm1 = 8u;
-            v_bits <<= 9u;
-            v_n_bits -= 9u;
-            while (true) {
-              v_dc_ht_slow = self->private_impl.f_huff_tables_slow[v_dc_h][v_dc_blm1];
-              if (v_dc_code < (v_dc_ht_slow >> 8u)) {
-                v_dc_symbol = (15u & ((uint32_t)(self->private_impl.f_huff_tables_symbols[v_dc_h][(255u & ((uint32_t)(v_dc_code + v_dc_ht_slow)))])));
-                v_dc_extend = WUFFS_JPEG__EXTEND[v_dc_symbol];
-                break;
-              }
-              v_dc_code = (((uint32_t)(v_dc_code << 1u)) | ((uint32_t)((v_bits >> 63u))));
-              v_bits <<= 1u;
-              v_n_bits -= 1u;
-              v_dc_blm1 = ((v_dc_blm1 + 1u) & 15u);
-              if (v_dc_blm1 == 0u) {
-                v_dc_symbol = 0u;
-                v_dc_extend = WUFFS_JPEG__EXTEND[v_dc_symbol];
-                break;
-              }
-            }
-          }
-          v_dc_value = ((uint16_t)(((v_bits >> 32u) >> (32u - v_dc_symbol))));
-          v_dc_value += (v_dc_extend & (((uint16_t)(wuffs_base__utility__sign_extend_rshift_u64(v_bits, 63u))) ^ 65535u));
-          v_bits <<= v_dc_symbol;
-          v_n_bits -= v_dc_symbol;
-          v_csel = self->private_impl.f_scan_comps_cselector[self->private_impl.f_mcu_blocks_sselector[self->private_impl.f_mcu_current_block]];
-          self->private_impl.f_mcu_previous_dc_values[v_csel] += v_dc_value;
-          self->private_data.f_mcu_blocks[self->private_impl.f_mcu_current_block][0u] = ((uint16_t)(self->private_impl.f_mcu_previous_dc_values[v_csel] << self->private_impl.f_scan_al));
-        } while (0);
-        self->private_impl.f_mcu_current_block += 1u;
-      }
-      self->private_impl.f_mcu_current_block = 0u;
-    } while (0);
-    label__goto_done__break:;
-    v_pos = ((uint32_t)(wuffs_base__u64__sat_add((v_r ? v_r->meta.pos : 0), ((uint64_t)(iop_v_r - io0_v_r)))));
-    if (v_pos > self->private_impl.f_bitstream_wi) {
-      v_ret = 2u;
-    } else {
-      self->private_impl.f_bitstream_ri = v_pos;
-    }
-    v_r = o_0_v_r;
-    iop_v_r = o_0_iop_v_r;
-    io0_v_r = o_0_io0_v_r;
-    io1_v_r = o_0_io1_v_r;
-    io2_v_r = o_0_io2_v_r;
-  }
-  self->private_impl.f_bitstream_bits = v_bits;
-  self->private_impl.f_bitstream_n_bits = v_n_bits;
-  return v_ret;
-}
-
-// -------- func jpeg.decoder.decode_mcu_progressive_dc_low_bit
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_jpeg__decoder__decode_mcu_progressive_dc_low_bit(
-    wuffs_jpeg__decoder* self,
-    wuffs_base__slice_u8 a_workbuf,
-    uint32_t a_mx,
-    uint32_t a_my) {
-  uint32_t v_ret = 0;
-  uint64_t v_bits = 0;
-  uint32_t v_n_bits = 0;
-  uint16_t v_one_lshift_scan_al = 0;
-  wuffs_base__io_buffer u_r = wuffs_base__empty_io_buffer();
-  wuffs_base__io_buffer* v_r = &u_r;
-  const uint8_t* iop_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io0_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_v_r WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint32_t v_pos = 0;
-
-  v_bits = self->private_impl.f_bitstream_bits;
-  v_n_bits = self->private_impl.f_bitstream_n_bits;
-  v_one_lshift_scan_al = (((uint16_t)(1u)) << self->private_impl.f_scan_al);
-  if (self->private_impl.f_bitstream_ri > self->private_impl.f_bitstream_wi) {
-    return 2u;
-  }
-  {
-    wuffs_base__io_buffer* o_0_v_r = v_r;
-    const uint8_t *o_0_iop_v_r = iop_v_r;
-    const uint8_t *o_0_io0_v_r = io0_v_r;
-    const uint8_t *o_0_io1_v_r = io1_v_r;
-    const uint8_t *o_0_io2_v_r = io2_v_r;
-    v_r = wuffs_base__io_reader__set(
-        &u_r,
-        &iop_v_r,
-        &io0_v_r,
-        &io1_v_r,
-        &io2_v_r,
-        wuffs_base__make_slice_u8_ij(self->private_data.f_bitstream_buffer,
-        self->private_impl.f_bitstream_ri,
-        self->private_impl.f_bitstream_wi),
-        ((uint64_t)(self->private_impl.f_bitstream_ri)));
-    do {
-      while (self->private_impl.f_mcu_current_block < self->private_impl.f_mcu_num_blocks) {
-        if (((uint64_t)(io2_v_r - iop_v_r)) < 264u) {
-          v_ret = 1u;
-          goto label__goto_done__break;
-        }
-        do {
-          if (((uint64_t)(io2_v_r - iop_v_r)) < 8u) {
-            v_ret = 2u;
-            goto label__goto_done__break;
-          }
-          v_bits |= (wuffs_base__peek_u64be__no_bounds_check(iop_v_r) >> (v_n_bits & 63u));
-          iop_v_r += ((63u - (v_n_bits & 63u)) >> 3u);
-          v_n_bits |= 56u;
-          if ((v_bits >> 63u) != 0u) {
-            self->private_data.f_mcu_blocks[self->private_impl.f_mcu_current_block][0u] |= v_one_lshift_scan_al;
-          }
-          v_bits <<= 1u;
-          v_n_bits -= 1u;
-        } while (0);
-        self->private_impl.f_mcu_current_block += 1u;
-      }
-      self->private_impl.f_mcu_current_block = 0u;
-    } while (0);
-    label__goto_done__break:;
-    v_pos = ((uint32_t)(wuffs_base__u64__sat_add((v_r ? v_r->meta.pos : 0), ((uint64_t)(iop_v_r - io0_v_r)))));
-    if (v_pos > self->private_impl.f_bitstream_wi) {
-      v_ret = 2u;
-    } else {
-      self->private_impl.f_bitstream_ri = v_pos;
-    }
-    v_r = o_0_v_r;
-    iop_v_r = o_0_iop_v_r;
-    io0_v_r = o_0_io0_v_r;
-    io1_v_r = o_0_io1_v_r;
-    io2_v_r = o_0_io2_v_r;
-  }
-  self->private_impl.f_bitstream_bits = v_bits;
-  self->private_impl.f_bitstream_n_bits = v_n_bits;
-  return v_ret;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JPEG)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JSON)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_json__error__bad_c0_control_code[] = "#json: bad C0 control code";
-const char wuffs_json__error__bad_utf_8[] = "#json: bad UTF-8";
-const char wuffs_json__error__bad_backslash_escape[] = "#json: bad backslash-escape";
-const char wuffs_json__error__bad_input[] = "#json: bad input";
-const char wuffs_json__error__bad_new_line_in_a_string[] = "#json: bad new-line in a string";
-const char wuffs_json__error__bad_quirk_combination[] = "#json: bad quirk combination";
-const char wuffs_json__error__unsupported_number_length[] = "#json: unsupported number length";
-const char wuffs_json__error__unsupported_recursion_depth[] = "#json: unsupported recursion depth";
-const char wuffs_json__error__internal_error_inconsistent_i_o[] = "#json: internal error: inconsistent I/O";
-
-// ---------------- Private Consts
-
-#define WUFFS_JSON__DECODER_NUMBER_LENGTH_MAX_INCL 99
-
-static const uint8_t
-WUFFS_JSON__LUT_BACKSLASHES[256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 3, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 162, 0, 0, 0, 0, 5,
-  0, 0, 0, 0, 0, 0, 0, 175,
-  7, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 4,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 220, 0, 0, 0,
-  0, 1, 136, 0, 0, 2, 140, 0,
-  0, 0, 0, 0, 0, 0, 138, 0,
-  0, 0, 141, 0, 137, 0, 6, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const uint8_t
-WUFFS_JSON__LUT_QUIRKY_BACKSLASHES_QUIRKS[8] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 1, 3, 4, 5, 6, 7, 10,
-};
-
-static const uint8_t
-WUFFS_JSON__LUT_QUIRKY_BACKSLASHES_CHARS[8] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 7, 27, 10, 63, 39, 11, 0,
-};
-
-static const uint8_t
-WUFFS_JSON__LUT_CHARS[256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  128, 129, 130, 131, 132, 133, 134, 135,
-  136, 137, 138, 139, 140, 141, 142, 143,
-  144, 145, 146, 147, 148, 149, 150, 151,
-  152, 153, 154, 155, 156, 157, 158, 159,
-  0, 0, 1, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 2, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  16, 16, 16, 16, 16, 16, 16, 16,
-  16, 16, 16, 16, 16, 16, 16, 16,
-  16, 16, 16, 16, 16, 16, 16, 16,
-  16, 16, 16, 16, 16, 16, 16, 16,
-  16, 16, 16, 16, 16, 16, 16, 16,
-  16, 16, 16, 16, 16, 16, 16, 16,
-  16, 16, 16, 16, 16, 16, 16, 16,
-  16, 16, 16, 16, 16, 16, 16, 16,
-  32, 32, 3, 3, 3, 3, 3, 3,
-  3, 3, 3, 3, 3, 3, 3, 3,
-  3, 3, 3, 3, 3, 3, 3, 3,
-  3, 3, 3, 3, 3, 3, 3, 3,
-  4, 4, 4, 4, 4, 4, 4, 4,
-  4, 4, 4, 4, 4, 4, 4, 4,
-  5, 5, 5, 5, 5, 32, 32, 32,
-  32, 32, 32, 32, 32, 32, 32, 32,
-};
-
-#define WUFFS_JSON__CLASS_WHITESPACE 0
-
-#define WUFFS_JSON__CLASS_STRING 1
-
-#define WUFFS_JSON__CLASS_COMMA 2
-
-#define WUFFS_JSON__CLASS_COLON 3
-
-#define WUFFS_JSON__CLASS_NUMBER 4
-
-#define WUFFS_JSON__CLASS_OPEN_CURLY_BRACE 5
-
-#define WUFFS_JSON__CLASS_CLOSE_CURLY_BRACE 6
-
-#define WUFFS_JSON__CLASS_OPEN_SQUARE_BRACKET 7
-
-#define WUFFS_JSON__CLASS_CLOSE_SQUARE_BRACKET 8
-
-#define WUFFS_JSON__CLASS_FALSE 9
-
-#define WUFFS_JSON__CLASS_TRUE 10
-
-#define WUFFS_JSON__CLASS_NULL_NAN_INF 11
-
-#define WUFFS_JSON__CLASS_COMMENT 12
-
-#define WUFFS_JSON__EXPECT_VALUE 7858
-
-#define WUFFS_JSON__EXPECT_NON_STRING_VALUE 7856
-
-#define WUFFS_JSON__EXPECT_STRING 4098
-
-#define WUFFS_JSON__EXPECT_COMMA 4100
-
-#define WUFFS_JSON__EXPECT_COLON 4104
-
-#define WUFFS_JSON__EXPECT_NUMBER 4112
-
-#define WUFFS_JSON__EXPECT_CLOSE_CURLY_BRACE 4160
-
-#define WUFFS_JSON__EXPECT_CLOSE_SQUARE_BRACKET 4352
-
-static const uint8_t
-WUFFS_JSON__LUT_CLASSES[256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 0, 0, 15, 15, 0, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  0, 15, 1, 15, 15, 15, 15, 15,
-  15, 15, 15, 11, 2, 4, 15, 12,
-  4, 4, 4, 4, 4, 4, 4, 4,
-  4, 4, 3, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 11, 15, 15, 15, 15, 11, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 7, 15, 8, 15, 15,
-  15, 15, 15, 15, 15, 15, 9, 15,
-  15, 11, 15, 15, 15, 15, 11, 15,
-  15, 15, 15, 15, 10, 15, 15, 15,
-  15, 15, 15, 5, 15, 6, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15,
-};
-
-static const uint8_t
-WUFFS_JSON__LUT_DECIMAL_DIGITS[256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  128, 129, 130, 131, 132, 133, 134, 135,
-  136, 137, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static const uint8_t
-WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  128, 129, 130, 131, 132, 133, 134, 135,
-  136, 137, 0, 0, 0, 0, 0, 0,
-  0, 138, 139, 140, 141, 142, 143, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 138, 139, 140, 141, 142, 143, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-#define WUFFS_JSON__QUIRKS_BASE 1225364480
-
-#define WUFFS_JSON__QUIRKS_COUNT 21
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_json__decoder__decode_number(
-    wuffs_json__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_json__decoder__decode_digits(
-    wuffs_json__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    uint32_t a_n);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_json__decoder__decode_leading(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_json__decoder__decode_comment(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_json__decoder__decode_inf_nan(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_json__decoder__decode_trailer(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-// ---------------- VTables
-
-const wuffs_base__token_decoder__func_ptrs
-wuffs_json__decoder__func_ptrs_for__wuffs_base__token_decoder = {
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_json__decoder__get_quirk),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__token_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__slice_u8))(&wuffs_json__decoder__decode_tokens),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_json__decoder__set_quirk),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_json__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_json__decoder__initialize(
-    wuffs_json__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__token_decoder.vtable_name =
-      wuffs_base__token_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__token_decoder.function_pointers =
-      (const void*)(&wuffs_json__decoder__func_ptrs_for__wuffs_base__token_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_json__decoder*
-wuffs_json__decoder__alloc() {
-  wuffs_json__decoder* x =
-      (wuffs_json__decoder*)(calloc(sizeof(wuffs_json__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_json__decoder__initialize(
-      x, sizeof(wuffs_json__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_json__decoder() {
-  return sizeof(wuffs_json__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func json.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_json__decoder__get_quirk(
-    const wuffs_json__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  uint32_t v_key = 0;
-
-  if (a_key >= 1225364480u) {
-    v_key = (a_key - 1225364480u);
-    if (v_key < 21u) {
-      if (self->private_impl.f_quirks[v_key]) {
-        return 1u;
-      }
-    }
-  }
-  return 0u;
-}
-
-// -------- func json.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_json__decoder__set_quirk(
-    wuffs_json__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (a_key >= 1225364480u) {
-    a_key -= 1225364480u;
-    if (a_key < 21u) {
-      self->private_impl.f_quirks[a_key] = (a_value > 0u);
-      return wuffs_base__make_status(NULL);
-    }
-  }
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func json.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_json__decoder__workbuf_len(
-    const wuffs_json__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__empty_range_ii_u64();
-}
-
-// -------- func json.decoder.decode_tokens
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_json__decoder__decode_tokens(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_vminor = 0;
-  uint32_t v_number_length = 0;
-  uint32_t v_number_status = 0;
-  uint32_t v_string_length = 0;
-  uint32_t v_whitespace_length = 0;
-  uint32_t v_depth = 0;
-  uint32_t v_stack_byte = 0;
-  uint32_t v_stack_bit = 0;
-  uint32_t v_match = 0;
-  uint32_t v_c4 = 0;
-  uint8_t v_c = 0;
-  uint8_t v_backslash = 0;
-  uint8_t v_char = 0;
-  uint8_t v_class = 0;
-  uint32_t v_multi_byte_utf8 = 0;
-  uint8_t v_backslash_x_ok = 0;
-  uint8_t v_backslash_x_value = 0;
-  uint32_t v_backslash_x_string = 0;
-  uint8_t v_uni4_ok = 0;
-  uint64_t v_uni4_string = 0;
-  uint32_t v_uni4_value = 0;
-  uint32_t v_uni4_high_surrogate = 0;
-  uint8_t v_uni8_ok = 0;
-  uint64_t v_uni8_string = 0;
-  uint32_t v_uni8_value = 0;
-  uint32_t v_expect = 0;
-  uint32_t v_expect_after_value = 0;
-
-  wuffs_base__token* iop_a_dst = NULL;
-  wuffs_base__token* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_tokens[0];
-  if (coro_susp_point) {
-    v_depth = self->private_data.s_decode_tokens[0].v_depth;
-    v_expect = self->private_data.s_decode_tokens[0].v_expect;
-    v_expect_after_value = self->private_data.s_decode_tokens[0].v_expect_after_value;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_end_of_data) {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (self->private_impl.f_quirks[18u]) {
-      if (self->private_impl.f_quirks[11u] || self->private_impl.f_quirks[12u] || self->private_impl.f_quirks[17u]) {
-        status = wuffs_base__make_status(wuffs_json__error__bad_quirk_combination);
-        goto exit;
-      }
-    }
-    if (self->private_impl.f_quirks[15u] || self->private_impl.f_quirks[16u]) {
-      if (a_dst) {
-        a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-      }
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_json__decoder__decode_leading(self, a_dst, a_src);
-      if (a_dst) {
-        iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-      }
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    }
-    v_expect = 7858u;
-    label__outer__continue:;
-    while (true) {
-      while (true) {
-        if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-          goto label__outer__continue;
-        }
-        v_whitespace_length = 0u;
-        v_c = 0u;
-        v_class = 0u;
-        while (true) {
-          if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-            if (v_whitespace_length > 0u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(v_whitespace_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              v_whitespace_length = 0u;
-            }
-            if (a_src && a_src->meta.closed) {
-              status = wuffs_base__make_status(wuffs_json__error__bad_input);
-              goto exit;
-            }
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-            goto label__outer__continue;
-          }
-          v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-          v_class = WUFFS_JSON__LUT_CLASSES[v_c];
-          if (v_class != 0u) {
-            break;
-          }
-          iop_a_src += 1u;
-          if (v_whitespace_length >= 65534u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(65535u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            v_whitespace_length = 0u;
-            goto label__outer__continue;
-          }
-          v_whitespace_length += 1u;
-        }
-        if (v_whitespace_length > 0u) {
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(v_whitespace_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          v_whitespace_length = 0u;
-          if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-            goto label__outer__continue;
-          }
-        }
-        if (0u == (v_expect & (((uint32_t)(1u)) << v_class))) {
-          status = wuffs_base__make_status(wuffs_json__error__bad_input);
-          goto exit;
-        }
-        if (v_class == 1u) {
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(4194579u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          iop_a_src += 1u;
-          label__string_loop_outer__continue:;
-          while (true) {
-            if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
-              continue;
-            }
-            v_string_length = 0u;
-            while (true) {
-              if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-                if (v_string_length > 0u) {
-                  *iop_a_dst++ = wuffs_base__make_token(
-                      (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                      (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                      (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                  v_string_length = 0u;
-                }
-                if (a_src && a_src->meta.closed) {
-                  status = wuffs_base__make_status(wuffs_json__error__bad_input);
-                  goto exit;
-                }
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
-                goto label__string_loop_outer__continue;
-              }
-              while (((uint64_t)(io2_a_src - iop_a_src)) > 4u) {
-                v_c4 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-                if (0u != (WUFFS_JSON__LUT_CHARS[(255u & (v_c4 >> 0u))] |
-                    WUFFS_JSON__LUT_CHARS[(255u & (v_c4 >> 8u))] |
-                    WUFFS_JSON__LUT_CHARS[(255u & (v_c4 >> 16u))] |
-                    WUFFS_JSON__LUT_CHARS[(255u & (v_c4 >> 24u))])) {
-                  break;
-                }
-                iop_a_src += 4u;
-                if (v_string_length > 65527u) {
-                  *iop_a_dst++ = wuffs_base__make_token(
-                      (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                      (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                      (((uint64_t)((v_string_length + 4u))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                  v_string_length = 0u;
-                  goto label__string_loop_outer__continue;
-                }
-                v_string_length += 4u;
-              }
-              v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-              v_char = WUFFS_JSON__LUT_CHARS[v_c];
-              if (v_char == 0u) {
-                iop_a_src += 1u;
-                if (v_string_length >= 65531u) {
-                  *iop_a_dst++ = wuffs_base__make_token(
-                      (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                      (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                      (((uint64_t)(65532u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                  v_string_length = 0u;
-                  goto label__string_loop_outer__continue;
-                }
-                v_string_length += 1u;
-                continue;
-              } else if (v_char == 1u) {
-                if (v_string_length != 0u) {
-                  *iop_a_dst++ = wuffs_base__make_token(
-                      (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                      (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                      (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                  v_string_length = 0u;
-                }
-                goto label__string_loop_outer__break;
-              } else if (v_char == 2u) {
-                if (v_string_length > 0u) {
-                  *iop_a_dst++ = wuffs_base__make_token(
-                      (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                      (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                      (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                  v_string_length = 0u;
-                  if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                    goto label__string_loop_outer__continue;
-                  }
-                }
-                if (((uint64_t)(io2_a_src - iop_a_src)) < 2u) {
-                  if (a_src && a_src->meta.closed) {
-                    status = wuffs_base__make_status(wuffs_json__error__bad_backslash_escape);
-                    goto exit;
-                  }
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
-                  goto label__string_loop_outer__continue;
-                }
-                v_c = ((uint8_t)((wuffs_base__peek_u16le__no_bounds_check(iop_a_src) >> 8u)));
-                v_backslash = WUFFS_JSON__LUT_BACKSLASHES[v_c];
-                if ((v_backslash & 128u) != 0u) {
-                  iop_a_src += 2u;
-                  *iop_a_dst++ = wuffs_base__make_token(
-                      (((uint64_t)((6291456u | ((uint32_t)((v_backslash & 127u)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                      (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                      (((uint64_t)(2u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                  goto label__string_loop_outer__continue;
-                } else if (v_backslash != 0u) {
-                  if (self->private_impl.f_quirks[WUFFS_JSON__LUT_QUIRKY_BACKSLASHES_QUIRKS[(v_backslash & 7u)]]) {
-                    iop_a_src += 2u;
-                    *iop_a_dst++ = wuffs_base__make_token(
-                        (((uint64_t)((6291456u | ((uint32_t)(WUFFS_JSON__LUT_QUIRKY_BACKSLASHES_CHARS[(v_backslash & 7u)]))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                        (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                        (((uint64_t)(2u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                    goto label__string_loop_outer__continue;
-                  }
-                } else if (v_c == 117u) {
-                  if (((uint64_t)(io2_a_src - iop_a_src)) < 6u) {
-                    if (a_src && a_src->meta.closed) {
-                      status = wuffs_base__make_status(wuffs_json__error__bad_backslash_escape);
-                      goto exit;
-                    }
-                    status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
-                    goto label__string_loop_outer__continue;
-                  }
-                  v_uni4_string = (((uint64_t)(wuffs_base__peek_u48le__no_bounds_check(iop_a_src))) >> 16u);
-                  v_uni4_value = 0u;
-                  v_uni4_ok = 128u;
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni4_string >> 0u))];
-                  v_uni4_ok &= v_c;
-                  v_uni4_value |= (((uint32_t)((v_c & 15u))) << 12u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni4_string >> 8u))];
-                  v_uni4_ok &= v_c;
-                  v_uni4_value |= (((uint32_t)((v_c & 15u))) << 8u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni4_string >> 16u))];
-                  v_uni4_ok &= v_c;
-                  v_uni4_value |= (((uint32_t)((v_c & 15u))) << 4u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni4_string >> 24u))];
-                  v_uni4_ok &= v_c;
-                  v_uni4_value |= (((uint32_t)((v_c & 15u))) << 0u);
-                  if (v_uni4_ok == 0u) {
-                  } else if ((v_uni4_value < 55296u) || (57343u < v_uni4_value)) {
-                    iop_a_src += 6u;
-                    *iop_a_dst++ = wuffs_base__make_token(
-                        (((uint64_t)((6291456u | v_uni4_value))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                        (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                        (((uint64_t)(6u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                    goto label__string_loop_outer__continue;
-                  } else if (v_uni4_value >= 56320u) {
-                  } else {
-                    if (((uint64_t)(io2_a_src - iop_a_src)) < 12u) {
-                      if (a_src && a_src->meta.closed) {
-                        if (self->private_impl.f_quirks[20u]) {
-                          iop_a_src += 6u;
-                          *iop_a_dst++ = wuffs_base__make_token(
-                              (((uint64_t)(6356989u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                              (((uint64_t)(6u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                          goto label__string_loop_outer__continue;
-                        }
-                        status = wuffs_base__make_status(wuffs_json__error__bad_backslash_escape);
-                        goto exit;
-                      }
-                      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
-                      goto label__string_loop_outer__continue;
-                    }
-                    v_uni4_string = (wuffs_base__peek_u64le__no_bounds_check(iop_a_src + 4u) >> 16u);
-                    if (((255u & (v_uni4_string >> 0u)) != 92u) || ((255u & (v_uni4_string >> 8u)) != 117u)) {
-                      v_uni4_high_surrogate = 0u;
-                      v_uni4_value = 0u;
-                      v_uni4_ok = 0u;
-                    } else {
-                      v_uni4_high_surrogate = (65536u + ((v_uni4_value - 55296u) << 10u));
-                      v_uni4_value = 0u;
-                      v_uni4_ok = 128u;
-                      v_uni4_string >>= 16u;
-                      v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni4_string >> 0u))];
-                      v_uni4_ok &= v_c;
-                      v_uni4_value |= (((uint32_t)((v_c & 15u))) << 12u);
-                      v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni4_string >> 8u))];
-                      v_uni4_ok &= v_c;
-                      v_uni4_value |= (((uint32_t)((v_c & 15u))) << 8u);
-                      v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni4_string >> 16u))];
-                      v_uni4_ok &= v_c;
-                      v_uni4_value |= (((uint32_t)((v_c & 15u))) << 4u);
-                      v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni4_string >> 24u))];
-                      v_uni4_ok &= v_c;
-                      v_uni4_value |= (((uint32_t)((v_c & 15u))) << 0u);
-                    }
-                    if ((v_uni4_ok != 0u) && (56320u <= v_uni4_value) && (v_uni4_value <= 57343u)) {
-                      v_uni4_value -= 56320u;
-                      iop_a_src += 12u;
-                      *iop_a_dst++ = wuffs_base__make_token(
-                          (((uint64_t)((6291456u | v_uni4_high_surrogate | v_uni4_value))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                          (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                          (((uint64_t)(12u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                      goto label__string_loop_outer__continue;
-                    }
-                  }
-                  if (self->private_impl.f_quirks[20u]) {
-                    if (((uint64_t)(io2_a_src - iop_a_src)) < 6u) {
-                      status = wuffs_base__make_status(wuffs_json__error__internal_error_inconsistent_i_o);
-                      goto exit;
-                    }
-                    iop_a_src += 6u;
-                    *iop_a_dst++ = wuffs_base__make_token(
-                        (((uint64_t)(6356989u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                        (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                        (((uint64_t)(6u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                    goto label__string_loop_outer__continue;
-                  }
-                } else if ((v_c == 85u) && self->private_impl.f_quirks[2u]) {
-                  if (((uint64_t)(io2_a_src - iop_a_src)) < 10u) {
-                    if (a_src && a_src->meta.closed) {
-                      status = wuffs_base__make_status(wuffs_json__error__bad_backslash_escape);
-                      goto exit;
-                    }
-                    status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9);
-                    goto label__string_loop_outer__continue;
-                  }
-                  v_uni8_string = wuffs_base__peek_u64le__no_bounds_check(iop_a_src + 2u);
-                  v_uni8_value = 0u;
-                  v_uni8_ok = 128u;
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni8_string >> 0u))];
-                  v_uni8_ok &= v_c;
-                  v_uni8_value |= (((uint32_t)((v_c & 15u))) << 28u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni8_string >> 8u))];
-                  v_uni8_ok &= v_c;
-                  v_uni8_value |= (((uint32_t)((v_c & 15u))) << 24u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni8_string >> 16u))];
-                  v_uni8_ok &= v_c;
-                  v_uni8_value |= (((uint32_t)((v_c & 15u))) << 20u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni8_string >> 24u))];
-                  v_uni8_ok &= v_c;
-                  v_uni8_value |= (((uint32_t)((v_c & 15u))) << 16u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni8_string >> 32u))];
-                  v_uni8_ok &= v_c;
-                  v_uni8_value |= (((uint32_t)((v_c & 15u))) << 12u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni8_string >> 40u))];
-                  v_uni8_ok &= v_c;
-                  v_uni8_value |= (((uint32_t)((v_c & 15u))) << 8u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni8_string >> 48u))];
-                  v_uni8_ok &= v_c;
-                  v_uni8_value |= (((uint32_t)((v_c & 15u))) << 4u);
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_uni8_string >> 56u))];
-                  v_uni8_ok &= v_c;
-                  v_uni8_value |= (((uint32_t)((v_c & 15u))) << 0u);
-                  if (v_uni8_ok == 0u) {
-                  } else if ((v_uni8_value < 55296u) || ((57343u < v_uni8_value) && (v_uni8_value <= 1114111u))) {
-                    iop_a_src += 10u;
-                    *iop_a_dst++ = wuffs_base__make_token(
-                        (((uint64_t)((6291456u | (v_uni8_value & 2097151u)))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                        (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                        (((uint64_t)(10u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                    goto label__string_loop_outer__continue;
-                  } else if (self->private_impl.f_quirks[20u]) {
-                    iop_a_src += 10u;
-                    *iop_a_dst++ = wuffs_base__make_token(
-                        (((uint64_t)(6356989u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                        (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                        (((uint64_t)(10u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                    goto label__string_loop_outer__continue;
-                  }
-                } else if ((v_c == 120u) && self->private_impl.f_quirks[9u]) {
-                  if (((uint64_t)(io2_a_src - iop_a_src)) < 4u) {
-                    if (a_src && a_src->meta.closed) {
-                      status = wuffs_base__make_status(wuffs_json__error__bad_backslash_escape);
-                      goto exit;
-                    }
-                    status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10);
-                    goto label__string_loop_outer__continue;
-                  }
-                  v_backslash_x_string = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-                  v_backslash_x_ok = 128u;
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_backslash_x_string >> 16u))];
-                  v_backslash_x_ok &= v_c;
-                  v_backslash_x_value = ((uint8_t)(((v_c & 15u) << 4u)));
-                  v_c = WUFFS_JSON__LUT_HEXADECIMAL_DIGITS[(255u & (v_backslash_x_string >> 24u))];
-                  v_backslash_x_ok &= v_c;
-                  v_backslash_x_value = ((uint8_t)((v_backslash_x_value | (v_c & 15u))));
-                  if ((v_backslash_x_ok == 0u) || ((v_backslash_x_string & 65535u) != 30812u)) {
-                    status = wuffs_base__make_status(wuffs_json__error__bad_backslash_escape);
-                    goto exit;
-                  }
-                  iop_a_src += 4u;
-                  *iop_a_dst++ = wuffs_base__make_token(
-                      (((uint64_t)((6291456u | ((uint32_t)(v_backslash_x_value))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                      (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                      (((uint64_t)(4u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                  goto label__string_loop_outer__continue;
-                }
-                status = wuffs_base__make_status(wuffs_json__error__bad_backslash_escape);
-                goto exit;
-              } else if (v_char == 3u) {
-                if (((uint64_t)(io2_a_src - iop_a_src)) < 2u) {
-                  if (v_string_length > 0u) {
-                    *iop_a_dst++ = wuffs_base__make_token(
-                        (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                        (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                        (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                    v_string_length = 0u;
-                    if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                      goto label__string_loop_outer__continue;
-                    }
-                  }
-                  if (a_src && a_src->meta.closed) {
-                    if (self->private_impl.f_quirks[20u]) {
-                      *iop_a_dst++ = wuffs_base__make_token(
-                          (((uint64_t)(6356989u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                          (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                          (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                      iop_a_src += 1u;
-                      goto label__string_loop_outer__continue;
-                    }
-                    status = wuffs_base__make_status(wuffs_json__error__bad_utf_8);
-                    goto exit;
-                  }
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(11);
-                  goto label__string_loop_outer__continue;
-                }
-                v_multi_byte_utf8 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-                if ((v_multi_byte_utf8 & 49152u) == 32768u) {
-                  v_multi_byte_utf8 = ((1984u & ((uint32_t)(v_multi_byte_utf8 << 6u))) | (63u & (v_multi_byte_utf8 >> 8u)));
-                  iop_a_src += 2u;
-                  if (v_string_length >= 65528u) {
-                    *iop_a_dst++ = wuffs_base__make_token(
-                        (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                        (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                        (((uint64_t)((v_string_length + 2u))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                    v_string_length = 0u;
-                    goto label__string_loop_outer__continue;
-                  }
-                  v_string_length += 2u;
-                  continue;
-                }
-              } else if (v_char == 4u) {
-                if (((uint64_t)(io2_a_src - iop_a_src)) < 3u) {
-                  if (v_string_length > 0u) {
-                    *iop_a_dst++ = wuffs_base__make_token(
-                        (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                        (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                        (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                    v_string_length = 0u;
-                    if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                      goto label__string_loop_outer__continue;
-                    }
-                  }
-                  if (a_src && a_src->meta.closed) {
-                    if (self->private_impl.f_quirks[20u]) {
-                      *iop_a_dst++ = wuffs_base__make_token(
-                          (((uint64_t)(6356989u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                          (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                          (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                      iop_a_src += 1u;
-                      goto label__string_loop_outer__continue;
-                    }
-                    status = wuffs_base__make_status(wuffs_json__error__bad_utf_8);
-                    goto exit;
-                  }
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(12);
-                  goto label__string_loop_outer__continue;
-                }
-                v_multi_byte_utf8 = ((uint32_t)(wuffs_base__peek_u24le__no_bounds_check(iop_a_src)));
-                if ((v_multi_byte_utf8 & 12632064u) == 8421376u) {
-                  v_multi_byte_utf8 = ((61440u & ((uint32_t)(v_multi_byte_utf8 << 12u))) | (4032u & (v_multi_byte_utf8 >> 2u)) | (63u & (v_multi_byte_utf8 >> 16u)));
-                  if ((2047u < v_multi_byte_utf8) && ((v_multi_byte_utf8 < 55296u) || (57343u < v_multi_byte_utf8))) {
-                    iop_a_src += 3u;
-                    if (v_string_length >= 65528u) {
-                      *iop_a_dst++ = wuffs_base__make_token(
-                          (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                          (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                          (((uint64_t)((v_string_length + 3u))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                      v_string_length = 0u;
-                      goto label__string_loop_outer__continue;
-                    }
-                    v_string_length += 3u;
-                    continue;
-                  }
-                }
-              } else if (v_char == 5u) {
-                if (((uint64_t)(io2_a_src - iop_a_src)) < 4u) {
-                  if (v_string_length > 0u) {
-                    *iop_a_dst++ = wuffs_base__make_token(
-                        (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                        (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                        (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                    v_string_length = 0u;
-                    if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                      goto label__string_loop_outer__continue;
-                    }
-                  }
-                  if (a_src && a_src->meta.closed) {
-                    if (self->private_impl.f_quirks[20u]) {
-                      *iop_a_dst++ = wuffs_base__make_token(
-                          (((uint64_t)(6356989u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                          (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                          (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                      iop_a_src += 1u;
-                      goto label__string_loop_outer__continue;
-                    }
-                    status = wuffs_base__make_status(wuffs_json__error__bad_utf_8);
-                    goto exit;
-                  }
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(13);
-                  goto label__string_loop_outer__continue;
-                }
-                v_multi_byte_utf8 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-                if ((v_multi_byte_utf8 & 3233857536u) == 2155905024u) {
-                  v_multi_byte_utf8 = ((1835008u & ((uint32_t)(v_multi_byte_utf8 << 18u))) |
-                      (258048u & ((uint32_t)(v_multi_byte_utf8 << 4u))) |
-                      (4032u & (v_multi_byte_utf8 >> 10u)) |
-                      (63u & (v_multi_byte_utf8 >> 24u)));
-                  if ((65535u < v_multi_byte_utf8) && (v_multi_byte_utf8 <= 1114111u)) {
-                    iop_a_src += 4u;
-                    if (v_string_length >= 65528u) {
-                      *iop_a_dst++ = wuffs_base__make_token(
-                          (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                          (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                          (((uint64_t)((v_string_length + 4u))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                      v_string_length = 0u;
-                      goto label__string_loop_outer__continue;
-                    }
-                    v_string_length += 4u;
-                    continue;
-                  }
-                }
-              }
-              if (v_string_length > 0u) {
-                *iop_a_dst++ = wuffs_base__make_token(
-                    (((uint64_t)(4194819u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                    (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                    (((uint64_t)(v_string_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                v_string_length = 0u;
-                if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                  goto label__string_loop_outer__continue;
-                }
-              }
-              if ((v_char & 128u) != 0u) {
-                if (self->private_impl.f_quirks[0u]) {
-                  *iop_a_dst++ = wuffs_base__make_token(
-                      (((uint64_t)((6291456u | ((uint32_t)((v_char & 127u)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                      (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                      (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                  iop_a_src += 1u;
-                  goto label__string_loop_outer__continue;
-                }
-                if (v_char == 138u) {
-                  status = wuffs_base__make_status(wuffs_json__error__bad_new_line_in_a_string);
-                  goto exit;
-                }
-                status = wuffs_base__make_status(wuffs_json__error__bad_c0_control_code);
-                goto exit;
-              }
-              if (self->private_impl.f_quirks[20u]) {
-                *iop_a_dst++ = wuffs_base__make_token(
-                    (((uint64_t)(6356989u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                    (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                    (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-                iop_a_src += 1u;
-                goto label__string_loop_outer__continue;
-              }
-              status = wuffs_base__make_status(wuffs_json__error__bad_utf_8);
-              goto exit;
-            }
-          }
-          label__string_loop_outer__break:;
-          while (true) {
-            if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-              if (a_src && a_src->meta.closed) {
-                status = wuffs_base__make_status(wuffs_json__error__bad_input);
-                goto exit;
-              }
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(14);
-              continue;
-            }
-            if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(15);
-              continue;
-            }
-            iop_a_src += 1u;
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(4194579u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            break;
-          }
-          if (0u == (v_expect & (((uint32_t)(1u)) << 4u))) {
-            v_expect = 4104u;
-            goto label__outer__continue;
-          }
-          break;
-        } else if (v_class == 2u) {
-          iop_a_src += 1u;
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          if (0u == (v_expect & (((uint32_t)(1u)) << 8u))) {
-            if (self->private_impl.f_quirks[13u]) {
-              v_expect = 4162u;
-            } else {
-              v_expect = 4098u;
-            }
-          } else {
-            if (self->private_impl.f_quirks[13u]) {
-              v_expect = 8114u;
-            } else {
-              v_expect = 7858u;
-            }
-          }
-          goto label__outer__continue;
-        } else if (v_class == 3u) {
-          iop_a_src += 1u;
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          v_expect = 7858u;
-          goto label__outer__continue;
-        } else if (v_class == 4u) {
-          while (true) {
-            if (a_src) {
-              a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-            }
-            v_number_length = wuffs_json__decoder__decode_number(self, a_src);
-            if (a_src) {
-              iop_a_src = a_src->data.ptr + a_src->meta.ri;
-            }
-            v_number_status = (v_number_length >> 8u);
-            v_vminor = 10486787u;
-            if ((v_number_length & 128u) != 0u) {
-              v_vminor = 10486785u;
-            }
-            v_number_length = (v_number_length & 127u);
-            if (v_number_status == 0u) {
-              *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(v_vminor)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                  (((uint64_t)(v_number_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-              break;
-            }
-            while (v_number_length > 0u) {
-              v_number_length -= 1u;
-              if (iop_a_src > io1_a_src) {
-                iop_a_src--;
-              } else {
-                status = wuffs_base__make_status(wuffs_json__error__internal_error_inconsistent_i_o);
-                goto exit;
-              }
-            }
-            if (v_number_status == 1u) {
-              if (self->private_impl.f_quirks[14u]) {
-                if (a_dst) {
-                  a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-                }
-                if (a_src) {
-                  a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-                }
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16);
-                status = wuffs_json__decoder__decode_inf_nan(self, a_dst, a_src);
-                if (a_dst) {
-                  iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-                }
-                if (a_src) {
-                  iop_a_src = a_src->data.ptr + a_src->meta.ri;
-                }
-                if (status.repr) {
-                  goto suspend;
-                }
-                break;
-              }
-              status = wuffs_base__make_status(wuffs_json__error__bad_input);
-              goto exit;
-            } else if (v_number_status == 2u) {
-              status = wuffs_base__make_status(wuffs_json__error__unsupported_number_length);
-              goto exit;
-            } else {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(17);
-              while (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(18);
-              }
-            }
-          }
-          break;
-        } else if (v_class == 5u) {
-          v_vminor = 2113553u;
-          if (v_depth == 0u) {
-          } else if (0u != (v_expect_after_value & (((uint32_t)(1u)) << 6u))) {
-            v_vminor = 2113601u;
-          } else {
-            v_vminor = 2113569u;
-          }
-          if (v_depth >= 1024u) {
-            status = wuffs_base__make_status(wuffs_json__error__unsupported_recursion_depth);
-            goto exit;
-          }
-          v_stack_byte = (v_depth / 32u);
-          v_stack_bit = (v_depth & 31u);
-          self->private_data.f_stack[v_stack_byte] |= (((uint32_t)(1u)) << v_stack_bit);
-          v_depth += 1u;
-          iop_a_src += 1u;
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(v_vminor)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          v_expect = 4162u;
-          v_expect_after_value = 4164u;
-          goto label__outer__continue;
-        } else if (v_class == 6u) {
-          iop_a_src += 1u;
-          if (v_depth <= 1u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(2101314u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            goto label__outer__break;
-          }
-          v_depth -= 1u;
-          v_stack_byte = ((v_depth - 1u) / 32u);
-          v_stack_bit = ((v_depth - 1u) & 31u);
-          if (0u == (self->private_data.f_stack[v_stack_byte] & (((uint32_t)(1u)) << v_stack_bit))) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(2105410u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            v_expect = 4356u;
-            v_expect_after_value = 4356u;
-          } else {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(2113602u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            v_expect = 4164u;
-            v_expect_after_value = 4164u;
-          }
-          goto label__outer__continue;
-        } else if (v_class == 7u) {
-          v_vminor = 2105361u;
-          if (v_depth == 0u) {
-          } else if (0u != (v_expect_after_value & (((uint32_t)(1u)) << 6u))) {
-            v_vminor = 2105409u;
-          } else {
-            v_vminor = 2105377u;
-          }
-          if (v_depth >= 1024u) {
-            status = wuffs_base__make_status(wuffs_json__error__unsupported_recursion_depth);
-            goto exit;
-          }
-          v_stack_byte = (v_depth / 32u);
-          v_stack_bit = (v_depth & 31u);
-          self->private_data.f_stack[v_stack_byte] &= (4294967295u ^ (((uint32_t)(1u)) << v_stack_bit));
-          v_depth += 1u;
-          iop_a_src += 1u;
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(v_vminor)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          v_expect = 8114u;
-          v_expect_after_value = 4356u;
-          goto label__outer__continue;
-        } else if (v_class == 8u) {
-          iop_a_src += 1u;
-          if (v_depth <= 1u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(2101282u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            goto label__outer__break;
-          }
-          v_depth -= 1u;
-          v_stack_byte = ((v_depth - 1u) / 32u);
-          v_stack_bit = ((v_depth - 1u) & 31u);
-          if (0u == (self->private_data.f_stack[v_stack_byte] & (((uint32_t)(1u)) << v_stack_bit))) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(2105378u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            v_expect = 4356u;
-            v_expect_after_value = 4356u;
-          } else {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(2113570u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            v_expect = 4164u;
-            v_expect_after_value = 4164u;
-          }
-          goto label__outer__continue;
-        } else if (v_class == 9u) {
-          v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, a_src, 111546413966853u);
-          if (v_match == 0u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(8388612u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(5u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            if (((uint64_t)(io2_a_src - iop_a_src)) < 5u) {
-              status = wuffs_base__make_status(wuffs_json__error__internal_error_inconsistent_i_o);
-              goto exit;
-            }
-            iop_a_src += 5u;
-            break;
-          } else if (v_match == 1u) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(19);
-            goto label__outer__continue;
-          }
-        } else if (v_class == 10u) {
-          v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, a_src, 435762131972u);
-          if (v_match == 0u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(8388616u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(4u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            if (((uint64_t)(io2_a_src - iop_a_src)) < 4u) {
-              status = wuffs_base__make_status(wuffs_json__error__internal_error_inconsistent_i_o);
-              goto exit;
-            }
-            iop_a_src += 4u;
-            break;
-          } else if (v_match == 1u) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(20);
-            goto label__outer__continue;
-          }
-        } else if (v_class == 11u) {
-          v_match = wuffs_base__io_reader__match7(iop_a_src, io2_a_src, a_src, 465676103172u);
-          if (v_match == 0u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(8388610u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(4u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            if (((uint64_t)(io2_a_src - iop_a_src)) < 4u) {
-              status = wuffs_base__make_status(wuffs_json__error__internal_error_inconsistent_i_o);
-              goto exit;
-            }
-            iop_a_src += 4u;
-            break;
-          } else if (v_match == 1u) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(21);
-            goto label__outer__continue;
-          }
-          if (self->private_impl.f_quirks[14u]) {
-            if (a_dst) {
-              a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-            }
-            if (a_src) {
-              a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-            }
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(22);
-            status = wuffs_json__decoder__decode_inf_nan(self, a_dst, a_src);
-            if (a_dst) {
-              iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-            }
-            if (a_src) {
-              iop_a_src = a_src->data.ptr + a_src->meta.ri;
-            }
-            if (status.repr) {
-              goto suspend;
-            }
-            break;
-          }
-        } else if (v_class == 12u) {
-          if (self->private_impl.f_quirks[11u] || self->private_impl.f_quirks[12u]) {
-            if (a_dst) {
-              a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-            }
-            if (a_src) {
-              a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-            }
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(23);
-            status = wuffs_json__decoder__decode_comment(self, a_dst, a_src);
-            if (a_dst) {
-              iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-            }
-            if (a_src) {
-              iop_a_src = a_src->data.ptr + a_src->meta.ri;
-            }
-            if (status.repr) {
-              goto suspend;
-            }
-            if (self->private_impl.f_comment_type > 0u) {
-              goto label__outer__continue;
-            }
-          }
-        }
-        status = wuffs_base__make_status(wuffs_json__error__bad_input);
-        goto exit;
-      }
-      if (v_depth == 0u) {
-        break;
-      }
-      v_expect = v_expect_after_value;
-    }
-    label__outer__break:;
-    if (self->private_impl.f_quirks[17u] || self->private_impl.f_quirks[18u]) {
-      if (a_dst) {
-        a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-      }
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(24);
-      status = wuffs_json__decoder__decode_trailer(self, a_dst, a_src);
-      if (a_dst) {
-        iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-      }
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    }
-    self->private_impl.f_end_of_data = true;
-
-    ok:
-    self->private_impl.p_decode_tokens[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_tokens[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-  self->private_data.s_decode_tokens[0].v_depth = v_depth;
-  self->private_data.s_decode_tokens[0].v_expect = v_expect;
-  self->private_data.s_decode_tokens[0].v_expect_after_value = v_expect_after_value;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func json.decoder.decode_number
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_json__decoder__decode_number(
-    wuffs_json__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  uint8_t v_c = 0;
-  uint32_t v_n = 0;
-  uint32_t v_floating_point = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  do {
-    v_n = 0u;
-    if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-      if ( ! (a_src && a_src->meta.closed)) {
-        v_n |= 768u;
-      }
-      break;
-    }
-    v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-    if (v_c != 45u) {
-    } else {
-      v_n += 1u;
-      iop_a_src += 1u;
-      if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-        if ( ! (a_src && a_src->meta.closed)) {
-          v_n |= 768u;
-        }
-        v_n |= 256u;
-        break;
-      }
-      v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-    }
-    if (v_c == 48u) {
-      v_n += 1u;
-      iop_a_src += 1u;
-    } else {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      v_n = wuffs_json__decoder__decode_digits(self, a_src, v_n);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (v_n > 99u) {
-        break;
-      }
-    }
-    if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-      if ( ! (a_src && a_src->meta.closed)) {
-        v_n |= 768u;
-      }
-      break;
-    }
-    v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-    if (v_c != 46u) {
-    } else {
-      if (v_n >= 99u) {
-        v_n |= 512u;
-        break;
-      }
-      v_n += 1u;
-      iop_a_src += 1u;
-      v_floating_point = 128u;
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      v_n = wuffs_json__decoder__decode_digits(self, a_src, v_n);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (v_n > 99u) {
-        break;
-      }
-      if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-        if ( ! (a_src && a_src->meta.closed)) {
-          v_n |= 768u;
-        }
-        break;
-      }
-      v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-    }
-    if ((v_c != 69u) && (v_c != 101u)) {
-      break;
-    }
-    if (v_n >= 99u) {
-      v_n |= 512u;
-      break;
-    }
-    v_n += 1u;
-    iop_a_src += 1u;
-    v_floating_point = 128u;
-    if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-      if ( ! (a_src && a_src->meta.closed)) {
-        v_n |= 768u;
-      }
-      v_n |= 256u;
-      break;
-    }
-    v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-    if ((v_c != 43u) && (v_c != 45u)) {
-    } else {
-      if (v_n >= 99u) {
-        v_n |= 512u;
-        break;
-      }
-      v_n += 1u;
-      iop_a_src += 1u;
-    }
-    if (a_src) {
-      a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-    }
-    v_n = wuffs_json__decoder__decode_digits(self, a_src, v_n);
-    if (a_src) {
-      iop_a_src = a_src->data.ptr + a_src->meta.ri;
-    }
-  } while (0);
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-  return (v_n | v_floating_point);
-}
-
-// -------- func json.decoder.decode_digits
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint32_t
-wuffs_json__decoder__decode_digits(
-    wuffs_json__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    uint32_t a_n) {
-  uint8_t v_c = 0;
-  uint32_t v_n = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  v_n = a_n;
-  while (true) {
-    if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-      if ( ! (a_src && a_src->meta.closed)) {
-        v_n |= 768u;
-      }
-      break;
-    }
-    v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-    if (0u == WUFFS_JSON__LUT_DECIMAL_DIGITS[v_c]) {
-      break;
-    }
-    if (v_n >= 99u) {
-      v_n |= 512u;
-      break;
-    }
-    v_n += 1u;
-    iop_a_src += 1u;
-  }
-  if (v_n == a_n) {
-    v_n |= 256u;
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-  return v_n;
-}
-
-// -------- func json.decoder.decode_leading
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_json__decoder__decode_leading(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint32_t v_u = 0;
-
-  wuffs_base__token* iop_a_dst = NULL;
-  wuffs_base__token* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_leading[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    self->private_impl.f_allow_leading_ars = self->private_impl.f_quirks[15u];
-    self->private_impl.f_allow_leading_ubom = self->private_impl.f_quirks[16u];
-    while (self->private_impl.f_allow_leading_ars || self->private_impl.f_allow_leading_ubom) {
-      if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-        continue;
-      }
-      if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-        if (a_src && a_src->meta.closed) {
-          break;
-        }
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-        continue;
-      }
-      v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-      if ((v_c == 30u) && self->private_impl.f_allow_leading_ars) {
-        self->private_impl.f_allow_leading_ars = false;
-        iop_a_src += 1u;
-        *iop_a_dst++ = wuffs_base__make_token(
-            (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-            (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-        continue;
-      } else if ((v_c == 239u) && self->private_impl.f_allow_leading_ubom) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) < 3u) {
-          if (a_src && a_src->meta.closed) {
-            break;
-          }
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-          continue;
-        }
-        v_u = ((uint32_t)(wuffs_base__peek_u24le__no_bounds_check(iop_a_src)));
-        if (v_u == 12565487u) {
-          self->private_impl.f_allow_leading_ubom = false;
-          iop_a_src += 3u;
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(3u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          continue;
-        }
-      }
-      break;
-    }
-
-    ok:
-    self->private_impl.p_decode_leading[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_leading[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func json.decoder.decode_comment
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_json__decoder__decode_comment(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint16_t v_c2 = 0;
-  uint32_t v_length = 0;
-
-  wuffs_base__token* iop_a_dst = NULL;
-  wuffs_base__token* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_comment[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    self->private_impl.f_comment_type = 0u;
-    while ((((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) || (((uint64_t)(io2_a_src - iop_a_src)) <= 1u)) {
-      if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-        continue;
-      }
-      if (a_src && a_src->meta.closed) {
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      }
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-    }
-    v_c2 = wuffs_base__peek_u16le__no_bounds_check(iop_a_src);
-    if ((v_c2 == 10799u) && self->private_impl.f_quirks[11u]) {
-      iop_a_src += 2u;
-      v_length = 2u;
-      while (true) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) <= 1u) {
-          if (v_length > 0u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(2u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                (((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          }
-          if (a_src && a_src->meta.closed) {
-            status = wuffs_base__make_status(wuffs_json__error__bad_input);
-            goto exit;
-          }
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-          while (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
-          }
-          v_length = 0u;
-          continue;
-        }
-        v_c2 = wuffs_base__peek_u16le__no_bounds_check(iop_a_src);
-        if (v_c2 == 12074u) {
-          iop_a_src += 2u;
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(2u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)((v_length + 2u))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          self->private_impl.f_comment_type = 1u;
-          status = wuffs_base__make_status(NULL);
-          goto ok;
-        }
-        iop_a_src += 1u;
-        if (v_length >= 65533u) {
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(2u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-              (((uint64_t)((v_length + 1u))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          while (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
-          }
-          v_length = 0u;
-          continue;
-        }
-        v_length += 1u;
-      }
-    } else if ((v_c2 == 12079u) && self->private_impl.f_quirks[12u]) {
-      iop_a_src += 2u;
-      v_length = 2u;
-      while (true) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-          if (a_src && a_src->meta.closed) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(4u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            self->private_impl.f_comment_type = 2u;
-            status = wuffs_base__make_status(NULL);
-            goto ok;
-          } else if (v_length > 0u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(4u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-                (((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          }
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
-          while (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
-          }
-          v_length = 0u;
-          continue;
-        }
-        v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-        if (v_c == 10u) {
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(4u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          self->private_impl.f_comment_type = 2u;
-          status = wuffs_base__make_status(NULL);
-          goto ok;
-        }
-        iop_a_src += 1u;
-        if (v_length >= 65533u) {
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(4u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) |
-              (((uint64_t)((v_length + 1u))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          while (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
-          }
-          v_length = 0u;
-          continue;
-        }
-        v_length += 1u;
-      }
-    }
-
-    ok:
-    self->private_impl.p_decode_comment[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_comment[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func json.decoder.decode_inf_nan
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_json__decoder__decode_inf_nan(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_c4 = 0;
-  uint32_t v_neg = 0;
-
-  wuffs_base__token* iop_a_dst = NULL;
-  wuffs_base__token* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_inf_nan[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-        continue;
-      }
-      if (((uint64_t)(io2_a_src - iop_a_src)) <= 2u) {
-        if (a_src && a_src->meta.closed) {
-          status = wuffs_base__make_status(wuffs_json__error__bad_input);
-          goto exit;
-        }
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-        continue;
-      }
-      v_c4 = ((uint32_t)(wuffs_base__peek_u24le__no_bounds_check(iop_a_src)));
-      if ((v_c4 | 2105376u) == 6712937u) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) > 7u) {
-          if ((wuffs_base__peek_u64le__no_bounds_check(iop_a_src) | 2314885530818453536u) == 8751735898823356009u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(10485792u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(8u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            iop_a_src += 8u;
-            status = wuffs_base__make_status(NULL);
-            goto ok;
-          }
-        } else if ( ! (a_src && a_src->meta.closed)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-          continue;
-        }
-        *iop_a_dst++ = wuffs_base__make_token(
-            (((uint64_t)(10485792u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-            (((uint64_t)(3u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-        iop_a_src += 3u;
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      } else if ((v_c4 | 2105376u) == 7233902u) {
-        *iop_a_dst++ = wuffs_base__make_token(
-            (((uint64_t)(10485888u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-            (((uint64_t)(3u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-        iop_a_src += 3u;
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      } else if ((v_c4 & 255u) == 43u) {
-        v_neg = 0u;
-      } else if ((v_c4 & 255u) == 45u) {
-        v_neg = 1u;
-      } else {
-        status = wuffs_base__make_status(wuffs_json__error__bad_input);
-        goto exit;
-      }
-      if (((uint64_t)(io2_a_src - iop_a_src)) <= 3u) {
-        if (a_src && a_src->meta.closed) {
-          status = wuffs_base__make_status(wuffs_json__error__bad_input);
-          goto exit;
-        }
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
-        continue;
-      }
-      v_c4 = (wuffs_base__peek_u32le__no_bounds_check(iop_a_src) >> 8u);
-      if ((v_c4 | 2105376u) == 6712937u) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) > 8u) {
-          if ((wuffs_base__peek_u64le__no_bounds_check(iop_a_src + 1u) | 2314885530818453536u) == 8751735898823356009u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)((10485760u | (((uint32_t)(32u)) >> v_neg)))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(9u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-            iop_a_src += 9u;
-            status = wuffs_base__make_status(NULL);
-            goto ok;
-          }
-        } else if ( ! (a_src && a_src->meta.closed)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
-          continue;
-        }
-        *iop_a_dst++ = wuffs_base__make_token(
-            (((uint64_t)((10485760u | (((uint32_t)(32u)) >> v_neg)))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-            (((uint64_t)(4u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-        iop_a_src += 4u;
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      } else if ((v_c4 | 2105376u) == 7233902u) {
-        *iop_a_dst++ = wuffs_base__make_token(
-            (((uint64_t)((10485760u | (((uint32_t)(128u)) >> v_neg)))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-            (((uint64_t)(4u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-        iop_a_src += 4u;
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      }
-      status = wuffs_base__make_status(wuffs_json__error__bad_input);
-      goto exit;
-    }
-
-    ok:
-    self->private_impl.p_decode_inf_nan[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_inf_nan[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func json.decoder.decode_trailer
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_json__decoder__decode_trailer(
-    wuffs_json__decoder* self,
-    wuffs_base__token_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint32_t v_whitespace_length = 0;
-
-  wuffs_base__token* iop_a_dst = NULL;
-  wuffs_base__token* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  wuffs_base__token* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_trailer[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_quirks[18u]) {
-      self->private_impl.f_trailer_stop = 10u;
-    } else {
-      self->private_impl.f_trailer_stop = 0u;
-    }
-    label__outer__continue:;
-    while (true) {
-      if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-        continue;
-      }
-      v_whitespace_length = 0u;
-      while (true) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-          if (v_whitespace_length > 0u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(v_whitespace_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          }
-          if (a_src && a_src->meta.closed) {
-            goto label__outer__break;
-          }
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-          goto label__outer__continue;
-        }
-        v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-        if (WUFFS_JSON__LUT_CLASSES[v_c] != 0u) {
-          if (v_whitespace_length > 0u) {
-            *iop_a_dst++ = wuffs_base__make_token(
-                (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-                (((uint64_t)(v_whitespace_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          }
-          if (self->private_impl.f_trailer_stop > 0u) {
-            status = wuffs_base__make_status(wuffs_json__error__bad_input);
-            goto exit;
-          }
-          if (a_dst) {
-            a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-          }
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          status = wuffs_json__decoder__decode_comment(self, a_dst, a_src);
-          if (a_dst) {
-            iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-          }
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          if (self->private_impl.f_comment_type > 0u) {
-            goto label__outer__continue;
-          }
-          status = wuffs_base__make_status(NULL);
-          goto ok;
-        }
-        iop_a_src += 1u;
-        if ((v_whitespace_length >= 65534u) || (v_c == self->private_impl.f_trailer_stop)) {
-          *iop_a_dst++ = wuffs_base__make_token(
-              (((uint64_t)(0u)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
-              (((uint64_t)((v_whitespace_length + 1u))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
-          if (v_c == self->private_impl.f_trailer_stop) {
-            status = wuffs_base__make_status(NULL);
-            goto ok;
-          }
-          goto label__outer__continue;
-        }
-        v_whitespace_length += 1u;
-      }
-    }
-    label__outer__break:;
-
-    ok:
-    self->private_impl.p_decode_trailer[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_trailer[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JSON)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NETPBM)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_netpbm__error__bad_header[] = "#netpbm: bad header";
-const char wuffs_netpbm__error__truncated_input[] = "#netpbm: truncated input";
-const char wuffs_netpbm__error__unsupported_netpbm_file[] = "#netpbm: unsupported Netpbm file";
-const char wuffs_netpbm__note__internal_note_short_read[] = "@netpbm: internal note: short read";
-
-// ---------------- Private Consts
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_netpbm__decoder__do_decode_image_config(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_netpbm__decoder__do_decode_frame_config(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_netpbm__decoder__do_decode_frame(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_netpbm__decoder__swizzle(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-// ---------------- VTables
-
-const wuffs_base__image_decoder__func_ptrs
-wuffs_netpbm__decoder__func_ptrs_for__wuffs_base__image_decoder = {
-  (wuffs_base__status(*)(void*,
-      wuffs_base__pixel_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__pixel_blend,
-      wuffs_base__slice_u8,
-      wuffs_base__decode_frame_options*))(&wuffs_netpbm__decoder__decode_frame),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__frame_config*,
-      wuffs_base__io_buffer*))(&wuffs_netpbm__decoder__decode_frame_config),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__image_config*,
-      wuffs_base__io_buffer*))(&wuffs_netpbm__decoder__decode_image_config),
-  (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_netpbm__decoder__frame_dirty_rect),
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_netpbm__decoder__get_quirk),
-  (uint32_t(*)(const void*))(&wuffs_netpbm__decoder__num_animation_loops),
-  (uint64_t(*)(const void*))(&wuffs_netpbm__decoder__num_decoded_frame_configs),
-  (uint64_t(*)(const void*))(&wuffs_netpbm__decoder__num_decoded_frames),
-  (wuffs_base__status(*)(void*,
-      uint64_t,
-      uint64_t))(&wuffs_netpbm__decoder__restart_frame),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_netpbm__decoder__set_quirk),
-  (wuffs_base__empty_struct(*)(void*,
-      uint32_t,
-      bool))(&wuffs_netpbm__decoder__set_report_metadata),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__more_information*,
-      wuffs_base__io_buffer*))(&wuffs_netpbm__decoder__tell_me_more),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_netpbm__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_netpbm__decoder__initialize(
-    wuffs_netpbm__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.vtable_name =
-      wuffs_base__image_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.function_pointers =
-      (const void*)(&wuffs_netpbm__decoder__func_ptrs_for__wuffs_base__image_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_netpbm__decoder*
-wuffs_netpbm__decoder__alloc() {
-  wuffs_netpbm__decoder* x =
-      (wuffs_netpbm__decoder*)(calloc(sizeof(wuffs_netpbm__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_netpbm__decoder__initialize(
-      x, sizeof(wuffs_netpbm__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_netpbm__decoder() {
-  return sizeof(wuffs_netpbm__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func netpbm.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_netpbm__decoder__get_quirk(
-    const wuffs_netpbm__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func netpbm.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__set_quirk(
-    wuffs_netpbm__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func netpbm.decoder.decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__decode_image_config(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_netpbm__decoder__do_decode_image_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func netpbm.decoder.do_decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_netpbm__decoder__do_decode_image_config(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint32_t v_n = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      v_c = t_0;
-    }
-    if (v_c != 80u) {
-      status = wuffs_base__make_status(wuffs_netpbm__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_1 = *iop_a_src++;
-      v_c = t_1;
-    }
-    if ((v_c < 49u) || (55u < v_c)) {
-      status = wuffs_base__make_status(wuffs_netpbm__error__bad_header);
-      goto exit;
-    } else if (v_c == 53u) {
-      self->private_impl.f_pixfmt = 536870920u;
-    } else if (v_c == 54u) {
-      self->private_impl.f_pixfmt = 2684356744u;
-    } else {
-      status = wuffs_base__make_status(wuffs_netpbm__error__unsupported_netpbm_file);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_2 = *iop_a_src++;
-      v_c = t_2;
-    }
-    if (v_c != 10u) {
-      status = wuffs_base__make_status(wuffs_netpbm__error__bad_header);
-      goto exit;
-    }
-    while (true) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_3 = *iop_a_src++;
-        v_c = t_3;
-      }
-      if ((v_c == 32u) || (v_c == 9u)) {
-        continue;
-      } else if (v_c == 35u) {
-        while (true) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_4 = *iop_a_src++;
-            v_c = t_4;
-          }
-          if (v_c == 10u) {
-            break;
-          }
-        }
-        continue;
-      } else if ((v_c < 48u) || (57u < v_c)) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__bad_header);
-        goto exit;
-      }
-      self->private_impl.f_width = ((uint32_t)((v_c - 48u)));
-      break;
-    }
-    while (true) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_5 = *iop_a_src++;
-        v_c = t_5;
-      }
-      if ((v_c == 32u) || (v_c == 9u)) {
-        break;
-      } else if ((v_c < 48u) || (57u < v_c)) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__bad_header);
-        goto exit;
-      }
-      v_n = ((10u * self->private_impl.f_width) + ((uint32_t)((v_c - 48u))));
-      if (v_n > 16777215u) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__unsupported_netpbm_file);
-        goto exit;
-      }
-      self->private_impl.f_width = v_n;
-    }
-    while (true) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_6 = *iop_a_src++;
-        v_c = t_6;
-      }
-      if ((v_c == 32u) || (v_c == 9u)) {
-        continue;
-      } else if (v_c == 35u) {
-        while (true) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_7 = *iop_a_src++;
-            v_c = t_7;
-          }
-          if (v_c == 10u) {
-            break;
-          }
-        }
-        continue;
-      } else if ((v_c < 48u) || (57u < v_c)) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__bad_header);
-        goto exit;
-      }
-      self->private_impl.f_height = ((uint32_t)((v_c - 48u)));
-      break;
-    }
-    while (true) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_8 = *iop_a_src++;
-        v_c = t_8;
-      }
-      if ((v_c == 32u) || (v_c == 9u) || (v_c == 13u)) {
-        continue;
-      } else if (v_c == 10u) {
-        break;
-      } else if ((v_c < 48u) || (57u < v_c)) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__bad_header);
-        goto exit;
-      }
-      v_n = ((10u * self->private_impl.f_height) + ((uint32_t)((v_c - 48u))));
-      if (v_n > 16777215u) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__unsupported_netpbm_file);
-        goto exit;
-      }
-      self->private_impl.f_height = v_n;
-    }
-    while (true) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_9 = *iop_a_src++;
-        v_c = t_9;
-      }
-      if ((v_c == 32u) || (v_c == 9u)) {
-        continue;
-      } else if (v_c == 35u) {
-        while (true) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_10 = *iop_a_src++;
-            v_c = t_10;
-          }
-          if (v_c == 10u) {
-            break;
-          }
-        }
-        continue;
-      } else if ((v_c < 48u) || (57u < v_c)) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__bad_header);
-        goto exit;
-      }
-      self->private_impl.f_max_value = ((uint32_t)((v_c - 48u)));
-      break;
-    }
-    while (true) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_11 = *iop_a_src++;
-        v_c = t_11;
-      }
-      if ((v_c == 32u) || (v_c == 9u) || (v_c == 13u)) {
-        continue;
-      } else if (v_c == 10u) {
-        break;
-      } else if ((v_c < 48u) || (57u < v_c)) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__bad_header);
-        goto exit;
-      }
-      v_n = ((10u * self->private_impl.f_max_value) + ((uint32_t)((v_c - 48u))));
-      if (v_n > 16777215u) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__unsupported_netpbm_file);
-        goto exit;
-      }
-      self->private_impl.f_max_value = v_n;
-    }
-    if (self->private_impl.f_max_value != 255u) {
-      status = wuffs_base__make_status(wuffs_netpbm__error__unsupported_netpbm_file);
-      goto exit;
-    }
-    self->private_impl.f_frame_config_io_position = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-    if (a_dst != NULL) {
-      wuffs_base__image_config__set(
-          a_dst,
-          self->private_impl.f_pixfmt,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height,
-          self->private_impl.f_frame_config_io_position,
-          false);
-    }
-    self->private_impl.f_call_sequence = 32u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_do_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func netpbm.decoder.decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__decode_frame_config(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 2)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_netpbm__decoder__do_decode_frame_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 2 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func netpbm.decoder.do_decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_netpbm__decoder__do_decode_frame_config(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 32u) {
-    } else if (self->private_impl.f_call_sequence < 32u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_netpbm__decoder__do_decode_image_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else if (self->private_impl.f_call_sequence == 40u) {
-      if (self->private_impl.f_frame_config_io_position != wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)))) {
-        status = wuffs_base__make_status(wuffs_base__error__bad_restart);
-        goto exit;
-      }
-    } else if (self->private_impl.f_call_sequence == 64u) {
-      self->private_impl.f_call_sequence = 96u;
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (a_dst != NULL) {
-      wuffs_base__frame_config__set(
-          a_dst,
-          wuffs_base__utility__make_rect_ie_u32(
-          0u,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height),
-          ((wuffs_base__flicks)(0u)),
-          0u,
-          self->private_impl.f_frame_config_io_position,
-          0u,
-          false,
-          false,
-          0u);
-    }
-    self->private_impl.f_call_sequence = 64u;
-
-    ok:
-    self->private_impl.p_do_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func netpbm.decoder.decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__decode_frame(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 3)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_netpbm__decoder__do_decode_frame(self,
-            a_dst,
-            a_src,
-            a_blend,
-            a_workbuf,
-            a_opts);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_netpbm__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 3 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func netpbm.decoder.do_decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_netpbm__decoder__do_decode_frame(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 64u) {
-    } else if (self->private_impl.f_call_sequence < 64u) {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_netpbm__decoder__do_decode_frame_config(self, NULL, a_src);
-      if (status.repr) {
-        goto suspend;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    self->private_impl.f_dst_x = 0u;
-    self->private_impl.f_dst_y = 0u;
-    v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler,
-        wuffs_base__pixel_buffer__pixel_format(a_dst),
-        wuffs_base__pixel_buffer__palette(a_dst),
-        wuffs_base__utility__make_pixel_format(self->private_impl.f_pixfmt),
-        wuffs_base__utility__empty_slice_u8(),
-        a_blend);
-    if ( ! wuffs_base__status__is_ok(&v_status)) {
-      status = v_status;
-      if (wuffs_base__status__is_error(&status)) {
-        goto exit;
-      } else if (wuffs_base__status__is_suspension(&status)) {
-        status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-        goto exit;
-      }
-      goto ok;
-    }
-    while (true) {
-      v_status = wuffs_netpbm__decoder__swizzle(self, a_dst, a_src);
-      if (wuffs_base__status__is_ok(&v_status)) {
-        break;
-      } else if (v_status.repr != wuffs_netpbm__note__internal_note_short_read) {
-        status = v_status;
-        if (wuffs_base__status__is_error(&status)) {
-          goto exit;
-        } else if (wuffs_base__status__is_suspension(&status)) {
-          status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-          goto exit;
-        }
-        goto ok;
-      }
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-    }
-    self->private_impl.f_call_sequence = 96u;
-
-    ok:
-    self->private_impl.p_do_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  return status;
-}
-
-// -------- func netpbm.decoder.swizzle
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_netpbm__decoder__swizzle(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint32_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_bytes_per_row = 0;
-  uint32_t v_src_bytes_per_pixel = 0;
-  wuffs_base__table_u8 v_tab = {0};
-  wuffs_base__slice_u8 v_dst = {0};
-  uint64_t v_i = 0;
-  uint64_t v_j = 0;
-  uint64_t v_n = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-  v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-  if ((v_dst_bits_per_pixel & 7u) != 0u) {
-    status = wuffs_base__make_status(wuffs_base__error__unsupported_option);
-    goto exit;
-  }
-  v_dst_bytes_per_pixel = (v_dst_bits_per_pixel / 8u);
-  v_dst_bytes_per_row = ((uint64_t)((self->private_impl.f_width * v_dst_bytes_per_pixel)));
-  v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-  while (true) {
-    if (self->private_impl.f_dst_x == self->private_impl.f_width) {
-      self->private_impl.f_dst_x = 0u;
-      self->private_impl.f_dst_y += 1u;
-      if (self->private_impl.f_dst_y >= self->private_impl.f_height) {
-        break;
-      }
-    }
-    v_dst = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-    if (v_dst_bytes_per_row < ((uint64_t)(v_dst.len))) {
-      v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row);
-    }
-    v_i = (((uint64_t)(self->private_impl.f_dst_x)) * ((uint64_t)(v_dst_bytes_per_pixel)));
-    if (v_i >= ((uint64_t)(v_dst.len))) {
-      v_src_bytes_per_pixel = 1u;
-      if (self->private_impl.f_pixfmt == 2684356744u) {
-        v_src_bytes_per_pixel = 3u;
-      }
-      v_n = (((uint64_t)(io2_a_src - iop_a_src)) / ((uint64_t)(v_src_bytes_per_pixel)));
-      v_n = wuffs_base__u64__min(v_n, ((uint64_t)(((uint32_t)(self->private_impl.f_width - self->private_impl.f_dst_x)))));
-      v_j = v_n;
-      while (v_j >= 8u) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) >= ((uint64_t)((v_src_bytes_per_pixel * 8u)))) {
-          iop_a_src += (v_src_bytes_per_pixel * 8u);
-        }
-        v_j -= 8u;
-      }
-      while (v_j > 0u) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) >= ((uint64_t)((v_src_bytes_per_pixel * 1u)))) {
-          iop_a_src += (v_src_bytes_per_pixel * 1u);
-        }
-        v_j -= 1u;
-      }
-    } else {
-      v_n = wuffs_base__pixel_swizzler__swizzle_interleaved_from_reader(
-          &self->private_impl.f_swizzler,
-          wuffs_base__slice_u8__subslice_i(v_dst, v_i),
-          wuffs_base__pixel_buffer__palette(a_dst),
-          &iop_a_src,
-          io2_a_src);
-    }
-    if (v_n == 0u) {
-      status = wuffs_base__make_status(wuffs_netpbm__note__internal_note_short_read);
-      goto ok;
-    }
-    wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
-  }
-  status = wuffs_base__make_status(NULL);
-  goto ok;
-
-  ok:
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func netpbm.decoder.frame_dirty_rect
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_netpbm__decoder__frame_dirty_rect(
-    const wuffs_netpbm__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-
-  return wuffs_base__utility__make_rect_ie_u32(
-      0u,
-      0u,
-      self->private_impl.f_width,
-      self->private_impl.f_height);
-}
-
-// -------- func netpbm.decoder.num_animation_loops
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_netpbm__decoder__num_animation_loops(
-    const wuffs_netpbm__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func netpbm.decoder.num_decoded_frame_configs
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_netpbm__decoder__num_decoded_frame_configs(
-    const wuffs_netpbm__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 32u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func netpbm.decoder.num_decoded_frames
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_netpbm__decoder__num_decoded_frames(
-    const wuffs_netpbm__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 64u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func netpbm.decoder.restart_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__restart_frame(
-    wuffs_netpbm__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (self->private_impl.f_call_sequence < 32u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-  }
-  if ((a_index != 0u) || (a_io_position != self->private_impl.f_frame_config_io_position)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  self->private_impl.f_call_sequence = 40u;
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func netpbm.decoder.set_report_metadata
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_netpbm__decoder__set_report_metadata(
-    wuffs_netpbm__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report) {
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func netpbm.decoder.tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_netpbm__decoder__tell_me_more(
-    wuffs_netpbm__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 4)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  status = wuffs_base__make_status(wuffs_base__error__no_more_information);
-  goto exit;
-
-  goto ok;
-  ok:
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func netpbm.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_netpbm__decoder__workbuf_len(
-    const wuffs_netpbm__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(0u, 0u);
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NETPBM)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NIE)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_nie__error__bad_header[] = "#nie: bad header";
-const char wuffs_nie__error__truncated_input[] = "#nie: truncated input";
-const char wuffs_nie__error__unsupported_nie_file[] = "#nie: unsupported NIE file";
-const char wuffs_nie__note__internal_note_short_read[] = "@nie: internal note: short read";
-
-// ---------------- Private Consts
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_nie__decoder__do_decode_image_config(
-    wuffs_nie__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_nie__decoder__do_decode_frame_config(
-    wuffs_nie__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_nie__decoder__do_decode_frame(
-    wuffs_nie__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_nie__decoder__swizzle(
-    wuffs_nie__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-// ---------------- VTables
-
-const wuffs_base__image_decoder__func_ptrs
-wuffs_nie__decoder__func_ptrs_for__wuffs_base__image_decoder = {
-  (wuffs_base__status(*)(void*,
-      wuffs_base__pixel_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__pixel_blend,
-      wuffs_base__slice_u8,
-      wuffs_base__decode_frame_options*))(&wuffs_nie__decoder__decode_frame),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__frame_config*,
-      wuffs_base__io_buffer*))(&wuffs_nie__decoder__decode_frame_config),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__image_config*,
-      wuffs_base__io_buffer*))(&wuffs_nie__decoder__decode_image_config),
-  (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_nie__decoder__frame_dirty_rect),
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_nie__decoder__get_quirk),
-  (uint32_t(*)(const void*))(&wuffs_nie__decoder__num_animation_loops),
-  (uint64_t(*)(const void*))(&wuffs_nie__decoder__num_decoded_frame_configs),
-  (uint64_t(*)(const void*))(&wuffs_nie__decoder__num_decoded_frames),
-  (wuffs_base__status(*)(void*,
-      uint64_t,
-      uint64_t))(&wuffs_nie__decoder__restart_frame),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_nie__decoder__set_quirk),
-  (wuffs_base__empty_struct(*)(void*,
-      uint32_t,
-      bool))(&wuffs_nie__decoder__set_report_metadata),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__more_information*,
-      wuffs_base__io_buffer*))(&wuffs_nie__decoder__tell_me_more),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_nie__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_nie__decoder__initialize(
-    wuffs_nie__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.vtable_name =
-      wuffs_base__image_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.function_pointers =
-      (const void*)(&wuffs_nie__decoder__func_ptrs_for__wuffs_base__image_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_nie__decoder*
-wuffs_nie__decoder__alloc() {
-  wuffs_nie__decoder* x =
-      (wuffs_nie__decoder*)(calloc(sizeof(wuffs_nie__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_nie__decoder__initialize(
-      x, sizeof(wuffs_nie__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_nie__decoder() {
-  return sizeof(wuffs_nie__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func nie.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_nie__decoder__get_quirk(
-    const wuffs_nie__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func nie.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__set_quirk(
-    wuffs_nie__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func nie.decoder.decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__decode_image_config(
-    wuffs_nie__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_nie__decoder__do_decode_image_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_nie__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func nie.decoder.do_decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_nie__decoder__do_decode_image_config(
-    wuffs_nie__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_a = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint32_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_0 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0;
-          if (num_bits_0 == 24) {
-            t_0 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0)) << 56;
-        }
-      }
-      v_a = t_0;
-    }
-    if (v_a != 1169146734u) {
-      status = wuffs_base__make_status(wuffs_nie__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      uint32_t t_1;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_1 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_1 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1;
-          if (num_bits_1 == 24) {
-            t_1 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_1 += 8u;
-          *scratch |= ((uint64_t)(num_bits_1)) << 56;
-        }
-      }
-      v_a = t_1;
-    }
-    if (v_a == 879649535u) {
-      self->private_impl.f_pixfmt = 2164295816u;
-    } else if (v_a == 946758399u) {
-      self->private_impl.f_pixfmt = 2164308923u;
-    } else if (v_a == 879780607u) {
-      status = wuffs_base__make_status(wuffs_nie__error__unsupported_nie_file);
-      goto exit;
-    } else if (v_a == 946889471u) {
-      status = wuffs_base__make_status(wuffs_nie__error__unsupported_nie_file);
-      goto exit;
-    } else {
-      status = wuffs_base__make_status(wuffs_nie__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-      uint32_t t_2;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_2 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_2 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2;
-          if (num_bits_2 == 24) {
-            t_2 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_2 += 8u;
-          *scratch |= ((uint64_t)(num_bits_2)) << 56;
-        }
-      }
-      v_a = t_2;
-    }
-    if (v_a > 2147483647u) {
-      status = wuffs_base__make_status(wuffs_nie__error__bad_header);
-      goto exit;
-    } else if (v_a > 16777215u) {
-      status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-      goto exit;
-    }
-    self->private_impl.f_width = v_a;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-      uint32_t t_3;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_3 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_3 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_3;
-          if (num_bits_3 == 24) {
-            t_3 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_3 += 8u;
-          *scratch |= ((uint64_t)(num_bits_3)) << 56;
-        }
-      }
-      v_a = t_3;
-    }
-    if (v_a > 2147483647u) {
-      status = wuffs_base__make_status(wuffs_nie__error__bad_header);
-      goto exit;
-    } else if (v_a > 16777215u) {
-      status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-      goto exit;
-    }
-    self->private_impl.f_height = v_a;
-    if (a_dst != NULL) {
-      wuffs_base__image_config__set(
-          a_dst,
-          self->private_impl.f_pixfmt,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height,
-          16u,
-          false);
-    }
-    self->private_impl.f_call_sequence = 32u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_do_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func nie.decoder.decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__decode_frame_config(
-    wuffs_nie__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 2)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_nie__decoder__do_decode_frame_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_nie__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 2 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func nie.decoder.do_decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_nie__decoder__do_decode_frame_config(
-    wuffs_nie__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 32u) {
-    } else if (self->private_impl.f_call_sequence < 32u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_nie__decoder__do_decode_image_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else if (self->private_impl.f_call_sequence == 40u) {
-      if (16u != wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)))) {
-        status = wuffs_base__make_status(wuffs_base__error__bad_restart);
-        goto exit;
-      }
-    } else if (self->private_impl.f_call_sequence == 64u) {
-      self->private_impl.f_call_sequence = 96u;
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (a_dst != NULL) {
-      wuffs_base__frame_config__set(
-          a_dst,
-          wuffs_base__utility__make_rect_ie_u32(
-          0u,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height),
-          ((wuffs_base__flicks)(0u)),
-          0u,
-          16u,
-          0u,
-          false,
-          false,
-          0u);
-    }
-    self->private_impl.f_call_sequence = 64u;
-
-    ok:
-    self->private_impl.p_do_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func nie.decoder.decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__decode_frame(
-    wuffs_nie__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 3)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_nie__decoder__do_decode_frame(self,
-            a_dst,
-            a_src,
-            a_blend,
-            a_workbuf,
-            a_opts);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_nie__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 3 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func nie.decoder.do_decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_nie__decoder__do_decode_frame(
-    wuffs_nie__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 64u) {
-    } else if (self->private_impl.f_call_sequence < 64u) {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_nie__decoder__do_decode_frame_config(self, NULL, a_src);
-      if (status.repr) {
-        goto suspend;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    self->private_impl.f_dst_x = 0u;
-    self->private_impl.f_dst_y = 0u;
-    v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler,
-        wuffs_base__pixel_buffer__pixel_format(a_dst),
-        wuffs_base__pixel_buffer__palette(a_dst),
-        wuffs_base__utility__make_pixel_format(self->private_impl.f_pixfmt),
-        wuffs_base__utility__empty_slice_u8(),
-        a_blend);
-    if ( ! wuffs_base__status__is_ok(&v_status)) {
-      status = v_status;
-      if (wuffs_base__status__is_error(&status)) {
-        goto exit;
-      } else if (wuffs_base__status__is_suspension(&status)) {
-        status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-        goto exit;
-      }
-      goto ok;
-    }
-    while (true) {
-      v_status = wuffs_nie__decoder__swizzle(self, a_dst, a_src);
-      if (wuffs_base__status__is_ok(&v_status)) {
-        break;
-      } else if (v_status.repr != wuffs_nie__note__internal_note_short_read) {
-        status = v_status;
-        if (wuffs_base__status__is_error(&status)) {
-          goto exit;
-        } else if (wuffs_base__status__is_suspension(&status)) {
-          status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-          goto exit;
-        }
-        goto ok;
-      }
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-    }
-    self->private_impl.f_call_sequence = 96u;
-
-    ok:
-    self->private_impl.p_do_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  return status;
-}
-
-// -------- func nie.decoder.swizzle
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_nie__decoder__swizzle(
-    wuffs_nie__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint32_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_bytes_per_row = 0;
-  uint32_t v_src_bytes_per_pixel = 0;
-  wuffs_base__table_u8 v_tab = {0};
-  wuffs_base__slice_u8 v_dst = {0};
-  uint64_t v_i = 0;
-  uint64_t v_j = 0;
-  uint64_t v_n = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-  v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-  if ((v_dst_bits_per_pixel & 7u) != 0u) {
-    status = wuffs_base__make_status(wuffs_base__error__unsupported_option);
-    goto exit;
-  }
-  v_dst_bytes_per_pixel = (v_dst_bits_per_pixel / 8u);
-  v_dst_bytes_per_row = ((uint64_t)((self->private_impl.f_width * v_dst_bytes_per_pixel)));
-  v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-  while (true) {
-    if (self->private_impl.f_dst_x == self->private_impl.f_width) {
-      self->private_impl.f_dst_x = 0u;
-      self->private_impl.f_dst_y += 1u;
-      if (self->private_impl.f_dst_y >= self->private_impl.f_height) {
-        break;
-      }
-    }
-    v_dst = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
-    if (v_dst_bytes_per_row < ((uint64_t)(v_dst.len))) {
-      v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row);
-    }
-    v_i = (((uint64_t)(self->private_impl.f_dst_x)) * ((uint64_t)(v_dst_bytes_per_pixel)));
-    if (v_i >= ((uint64_t)(v_dst.len))) {
-      v_src_bytes_per_pixel = 4u;
-      if (self->private_impl.f_pixfmt == 2164308923u) {
-        v_src_bytes_per_pixel = 8u;
-      }
-      v_n = (((uint64_t)(io2_a_src - iop_a_src)) / ((uint64_t)(v_src_bytes_per_pixel)));
-      v_n = wuffs_base__u64__min(v_n, ((uint64_t)(((uint32_t)(self->private_impl.f_width - self->private_impl.f_dst_x)))));
-      v_j = v_n;
-      while (v_j >= 8u) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) >= ((uint64_t)((v_src_bytes_per_pixel * 8u)))) {
-          iop_a_src += (v_src_bytes_per_pixel * 8u);
-        }
-        v_j -= 8u;
-      }
-      while (v_j > 0u) {
-        if (((uint64_t)(io2_a_src - iop_a_src)) >= ((uint64_t)((v_src_bytes_per_pixel * 1u)))) {
-          iop_a_src += (v_src_bytes_per_pixel * 1u);
-        }
-        v_j -= 1u;
-      }
-    } else {
-      v_n = wuffs_base__pixel_swizzler__swizzle_interleaved_from_reader(
-          &self->private_impl.f_swizzler,
-          wuffs_base__slice_u8__subslice_i(v_dst, v_i),
-          wuffs_base__pixel_buffer__palette(a_dst),
-          &iop_a_src,
-          io2_a_src);
-    }
-    if (v_n == 0u) {
-      status = wuffs_base__make_status(wuffs_nie__note__internal_note_short_read);
-      goto ok;
-    }
-    wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
-  }
-  status = wuffs_base__make_status(NULL);
-  goto ok;
-
-  ok:
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func nie.decoder.frame_dirty_rect
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_nie__decoder__frame_dirty_rect(
-    const wuffs_nie__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-
-  return wuffs_base__utility__make_rect_ie_u32(
-      0u,
-      0u,
-      self->private_impl.f_width,
-      self->private_impl.f_height);
-}
-
-// -------- func nie.decoder.num_animation_loops
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_nie__decoder__num_animation_loops(
-    const wuffs_nie__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func nie.decoder.num_decoded_frame_configs
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_nie__decoder__num_decoded_frame_configs(
-    const wuffs_nie__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 32u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func nie.decoder.num_decoded_frames
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_nie__decoder__num_decoded_frames(
-    const wuffs_nie__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 64u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func nie.decoder.restart_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__restart_frame(
-    wuffs_nie__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (self->private_impl.f_call_sequence < 32u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-  }
-  if ((a_index != 0u) || (a_io_position != 16u)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  self->private_impl.f_call_sequence = 40u;
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func nie.decoder.set_report_metadata
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_nie__decoder__set_report_metadata(
-    wuffs_nie__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report) {
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func nie.decoder.tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_nie__decoder__tell_me_more(
-    wuffs_nie__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 4)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  status = wuffs_base__make_status(wuffs_base__error__no_more_information);
-  goto exit;
-
-  goto ok;
-  ok:
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func nie.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_nie__decoder__workbuf_len(
-    const wuffs_nie__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(0u, 0u);
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NIE)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ZLIB)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_zlib__note__dictionary_required[] = "@zlib: dictionary required";
-const char wuffs_zlib__error__bad_checksum[] = "#zlib: bad checksum";
-const char wuffs_zlib__error__bad_compression_method[] = "#zlib: bad compression method";
-const char wuffs_zlib__error__bad_compression_window_size[] = "#zlib: bad compression window size";
-const char wuffs_zlib__error__bad_parity_check[] = "#zlib: bad parity check";
-const char wuffs_zlib__error__incorrect_dictionary[] = "#zlib: incorrect dictionary";
-const char wuffs_zlib__error__truncated_input[] = "#zlib: truncated input";
-
-// ---------------- Private Consts
-
-#define WUFFS_ZLIB__QUIRKS_BASE 2113790976
-
-#define WUFFS_ZLIB__QUIRKS_COUNT 1
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_zlib__decoder__do_transform_io(
-    wuffs_zlib__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-// ---------------- VTables
-
-const wuffs_base__io_transformer__func_ptrs
-wuffs_zlib__decoder__func_ptrs_for__wuffs_base__io_transformer = {
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_zlib__decoder__get_quirk),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_zlib__decoder__set_quirk),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__slice_u8))(&wuffs_zlib__decoder__transform_io),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_zlib__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_zlib__decoder__initialize(
-    wuffs_zlib__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  {
-    wuffs_base__status z = wuffs_adler32__hasher__initialize(
-        &self->private_data.f_checksum, sizeof(self->private_data.f_checksum), WUFFS_VERSION, options);
-    if (z.repr) {
-      return z;
-    }
-  }
-  {
-    wuffs_base__status z = wuffs_adler32__hasher__initialize(
-        &self->private_data.f_dict_id_hasher, sizeof(self->private_data.f_dict_id_hasher), WUFFS_VERSION, options);
-    if (z.repr) {
-      return z;
-    }
-  }
-  {
-    wuffs_base__status z = wuffs_deflate__decoder__initialize(
-        &self->private_data.f_flate, sizeof(self->private_data.f_flate), WUFFS_VERSION, options);
-    if (z.repr) {
-      return z;
-    }
-  }
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.vtable_name =
-      wuffs_base__io_transformer__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__io_transformer.function_pointers =
-      (const void*)(&wuffs_zlib__decoder__func_ptrs_for__wuffs_base__io_transformer);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_zlib__decoder*
-wuffs_zlib__decoder__alloc() {
-  wuffs_zlib__decoder* x =
-      (wuffs_zlib__decoder*)(calloc(sizeof(wuffs_zlib__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_zlib__decoder__initialize(
-      x, sizeof(wuffs_zlib__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_zlib__decoder() {
-  return sizeof(wuffs_zlib__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func zlib.decoder.dictionary_id
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_zlib__decoder__dictionary_id(
-    const wuffs_zlib__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return self->private_impl.f_dict_id_want;
-}
-
-// -------- func zlib.decoder.add_dictionary
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_zlib__decoder__add_dictionary(
-    wuffs_zlib__decoder* self,
-    wuffs_base__slice_u8 a_dict) {
-  if (!self) {
-    return wuffs_base__make_empty_struct();
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_empty_struct();
-  }
-
-  if (self->private_impl.f_header_complete) {
-    self->private_impl.f_bad_call_sequence = true;
-  } else {
-    self->private_impl.f_dict_id_got = wuffs_adler32__hasher__update_u32(&self->private_data.f_dict_id_hasher, a_dict);
-    wuffs_deflate__decoder__add_history(&self->private_data.f_flate, a_dict);
-  }
-  self->private_impl.f_got_dictionary = true;
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func zlib.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_zlib__decoder__get_quirk(
-    const wuffs_zlib__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  uint32_t v_key = 0;
-
-  if ((a_key == 1u) && self->private_impl.f_ignore_checksum) {
-    return 1u;
-  } else if (a_key >= 2113790976u) {
-    v_key = (a_key - 2113790976u);
-    if (v_key < 1u) {
-      if (self->private_impl.f_quirks[v_key]) {
-        return 1u;
-      }
-    }
-  }
-  return 0u;
-}
-
-// -------- func zlib.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_zlib__decoder__set_quirk(
-    wuffs_zlib__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (self->private_impl.f_header_complete) {
-    self->private_impl.f_bad_call_sequence = true;
-    return wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-  } else if (a_key == 1u) {
-    self->private_impl.f_ignore_checksum = (a_value > 0u);
-    return wuffs_base__make_status(NULL);
-  } else if (a_key >= 2113790976u) {
-    a_key -= 2113790976u;
-    if (a_key < 1u) {
-      self->private_impl.f_quirks[a_key] = (a_value > 0u);
-      return wuffs_base__make_status(NULL);
-    }
-  }
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func zlib.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_zlib__decoder__workbuf_len(
-    const wuffs_zlib__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(1u, 1u);
-}
-
-// -------- func zlib.decoder.transform_io
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_zlib__decoder__transform_io(
-    wuffs_zlib__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_transform_io[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_zlib__decoder__do_transform_io(self, a_dst, a_src, a_workbuf);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_zlib__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_transform_io[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func zlib.decoder.do_transform_io
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_zlib__decoder__do_transform_io(
-    wuffs_zlib__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint16_t v_x = 0;
-  uint32_t v_checksum_got = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-  uint32_t v_checksum_want = 0;
-  uint64_t v_mark = 0;
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_transform_io[0];
-  if (coro_susp_point) {
-    v_checksum_got = self->private_data.s_do_transform_io[0].v_checksum_got;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_bad_call_sequence) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    } else if (self->private_impl.f_quirks[0u]) {
-    } else if ( ! self->private_impl.f_want_dictionary) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        uint16_t t_0;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_0 = wuffs_base__peek_u16be__no_bounds_check(iop_a_src);
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_do_transform_io[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_transform_io[0].scratch;
-            uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-            *scratch >>= 8;
-            *scratch <<= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-            if (num_bits_0 == 8) {
-              t_0 = ((uint16_t)(*scratch >> 48));
-              break;
-            }
-            num_bits_0 += 8u;
-            *scratch |= ((uint64_t)(num_bits_0));
-          }
-        }
-        v_x = t_0;
-      }
-      if (((v_x >> 8u) & 15u) != 8u) {
-        status = wuffs_base__make_status(wuffs_zlib__error__bad_compression_method);
-        goto exit;
-      }
-      if ((v_x >> 12u) > 7u) {
-        status = wuffs_base__make_status(wuffs_zlib__error__bad_compression_window_size);
-        goto exit;
-      }
-      if ((v_x % 31u) != 0u) {
-        status = wuffs_base__make_status(wuffs_zlib__error__bad_parity_check);
-        goto exit;
-      }
-      self->private_impl.f_want_dictionary = ((v_x & 32u) != 0u);
-      if (self->private_impl.f_want_dictionary) {
-        self->private_impl.f_dict_id_got = 1u;
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          uint32_t t_1;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_1 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_do_transform_io[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_do_transform_io[0].scratch;
-              uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1);
-              if (num_bits_1 == 24) {
-                t_1 = ((uint32_t)(*scratch >> 32));
-                break;
-              }
-              num_bits_1 += 8u;
-              *scratch |= ((uint64_t)(num_bits_1));
-            }
-          }
-          self->private_impl.f_dict_id_want = t_1;
-        }
-        status = wuffs_base__make_status(wuffs_zlib__note__dictionary_required);
-        goto ok;
-      } else if (self->private_impl.f_got_dictionary) {
-        status = wuffs_base__make_status(wuffs_zlib__error__incorrect_dictionary);
-        goto exit;
-      }
-    } else if (self->private_impl.f_dict_id_got != self->private_impl.f_dict_id_want) {
-      if (self->private_impl.f_got_dictionary) {
-        status = wuffs_base__make_status(wuffs_zlib__error__incorrect_dictionary);
-        goto exit;
-      }
-      status = wuffs_base__make_status(wuffs_zlib__note__dictionary_required);
-      goto ok;
-    }
-    self->private_impl.f_header_complete = true;
-    while (true) {
-      v_mark = ((uint64_t)(iop_a_dst - io0_a_dst));
-      {
-        if (a_dst) {
-          a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        wuffs_base__status t_2 = wuffs_deflate__decoder__transform_io(&self->private_data.f_flate, a_dst, a_src, a_workbuf);
-        v_status = t_2;
-        if (a_dst) {
-          iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-        }
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-      }
-      if ( ! self->private_impl.f_ignore_checksum &&  ! self->private_impl.f_quirks[0u]) {
-        v_checksum_got = wuffs_adler32__hasher__update_u32(&self->private_data.f_checksum, wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_dst - io0_a_dst)), io0_a_dst));
-      }
-      if (wuffs_base__status__is_ok(&v_status)) {
-        break;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
-    }
-    if ( ! self->private_impl.f_quirks[0u]) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-        uint32_t t_3;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-          t_3 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-          iop_a_src += 4;
-        } else {
-          self->private_data.s_do_transform_io[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_transform_io[0].scratch;
-            uint32_t num_bits_3 = ((uint32_t)(*scratch & 0xFFu));
-            *scratch >>= 8;
-            *scratch <<= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_3);
-            if (num_bits_3 == 24) {
-              t_3 = ((uint32_t)(*scratch >> 32));
-              break;
-            }
-            num_bits_3 += 8u;
-            *scratch |= ((uint64_t)(num_bits_3));
-          }
-        }
-        v_checksum_want = t_3;
-      }
-      if ( ! self->private_impl.f_ignore_checksum && (v_checksum_got != v_checksum_want)) {
-        status = wuffs_base__make_status(wuffs_zlib__error__bad_checksum);
-        goto exit;
-      }
-    }
-
-    ok:
-    self->private_impl.p_do_transform_io[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_transform_io[0].v_checksum_got = v_checksum_got;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__ZLIB)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__PNG)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_png__error__bad_animation_sequence_number[] = "#png: bad animation sequence number";
-const char wuffs_png__error__bad_checksum[] = "#png: bad checksum";
-const char wuffs_png__error__bad_chunk[] = "#png: bad chunk";
-const char wuffs_png__error__bad_filter[] = "#png: bad filter";
-const char wuffs_png__error__bad_header[] = "#png: bad header";
-const char wuffs_png__error__bad_text_chunk_not_latin_1[] = "#png: bad text chunk (not Latin-1)";
-const char wuffs_png__error__missing_palette[] = "#png: missing palette";
-const char wuffs_png__error__truncated_input[] = "#png: truncated input";
-const char wuffs_png__error__unsupported_cgbi_extension[] = "#png: unsupported CgBI extension";
-const char wuffs_png__error__unsupported_png_compression_method[] = "#png: unsupported PNG compression method";
-const char wuffs_png__error__unsupported_png_file[] = "#png: unsupported PNG file";
-const char wuffs_png__error__internal_error_inconsistent_i_o[] = "#png: internal error: inconsistent I/O";
-const char wuffs_png__error__internal_error_inconsistent_chunk_type[] = "#png: internal error: inconsistent chunk type";
-const char wuffs_png__error__internal_error_inconsistent_frame_bounds[] = "#png: internal error: inconsistent frame bounds";
-const char wuffs_png__error__internal_error_inconsistent_workbuf_length[] = "#png: internal error: inconsistent workbuf length";
-const char wuffs_png__error__internal_error_zlib_decoder_did_not_exhaust_its_input[] = "#png: internal error: zlib decoder did not exhaust its input";
-
-// ---------------- Private Consts
-
-#define WUFFS_PNG__ANCILLARY_BIT 32
-
-static const uint8_t
-WUFFS_PNG__INTERLACING[8][6] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  {
-    0, 0, 0, 0, 0, 0,
-  }, {
-    3, 7, 0, 3, 7, 0,
-  }, {
-    3, 3, 4, 3, 7, 0,
-  }, {
-    2, 3, 0, 3, 3, 4,
-  }, {
-    2, 1, 2, 2, 3, 0,
-  }, {
-    1, 1, 0, 2, 1, 2,
-  }, {
-    1, 0, 1, 1, 1, 0,
-  }, {
-    0, 0, 0, 1, 0, 1,
-  },
-};
-
-static const uint8_t
-WUFFS_PNG__LOW_BIT_DEPTH_MULTIPLIERS[8] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 255, 85, 0, 17, 0, 0, 0,
-};
-
-static const uint8_t
-WUFFS_PNG__LOW_BIT_DEPTH_NUM_PACKS[8] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 8, 4, 0, 2, 0, 0, 0,
-};
-
-static const uint8_t
-WUFFS_PNG__NUM_CHANNELS[8] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  1, 0, 3, 1, 2, 0, 4, 0,
-};
-
-static const uint16_t
-WUFFS_PNG__LATIN_1[256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  32, 33, 34, 35, 36, 37, 38, 39,
-  40, 41, 42, 43, 44, 45, 46, 47,
-  48, 49, 50, 51, 52, 53, 54, 55,
-  56, 57, 58, 59, 60, 61, 62, 63,
-  64, 65, 66, 67, 68, 69, 70, 71,
-  72, 73, 74, 75, 76, 77, 78, 79,
-  80, 81, 82, 83, 84, 85, 86, 87,
-  88, 89, 90, 91, 92, 93, 94, 95,
-  96, 97, 98, 99, 100, 101, 102, 103,
-  104, 105, 106, 107, 108, 109, 110, 111,
-  112, 113, 114, 115, 116, 117, 118, 119,
-  120, 121, 122, 123, 124, 125, 126, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 41410, 41666, 41922, 42178, 42434, 42690, 42946,
-  43202, 43458, 43714, 43970, 44226, 44482, 44738, 44994,
-  45250, 45506, 45762, 46018, 46274, 46530, 46786, 47042,
-  47298, 47554, 47810, 48066, 48322, 48578, 48834, 49090,
-  32963, 33219, 33475, 33731, 33987, 34243, 34499, 34755,
-  35011, 35267, 35523, 35779, 36035, 36291, 36547, 36803,
-  37059, 37315, 37571, 37827, 38083, 38339, 38595, 38851,
-  39107, 39363, 39619, 39875, 40131, 40387, 40643, 40899,
-  41155, 41411, 41667, 41923, 42179, 42435, 42691, 42947,
-  43203, 43459, 43715, 43971, 44227, 44483, 44739, 44995,
-  45251, 45507, 45763, 46019, 46275, 46531, 46787, 47043,
-  47299, 47555, 47811, 48067, 48323, 48579, 48835, 49091,
-};
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1_distance_4_arm_neon(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3_distance_4_arm_neon(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_3_arm_neon(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_4_arm_neon(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1__choosy_default(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1_distance_3_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1_distance_4_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_2(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3__choosy_default(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3_distance_3_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3_distance_4_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4__choosy_default(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_3_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_4_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1_distance_4_x86_sse42(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3_distance_4_x86_sse42(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_3_x86_sse42(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_4_x86_sse42(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev);
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__do_decode_image_config(
-    wuffs_png__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_ihdr(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__assign_filter_distance(
-    wuffs_png__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint64_t
-wuffs_png__decoder__calculate_bytes_per_row(
-    const wuffs_png__decoder* self,
-    uint32_t a_width);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__choose_filter_implementations(
-    wuffs_png__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_other_chunk(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    bool a_framy);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_actl(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_chrm(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_exif(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_fctl(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_gama(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_iccp(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_plte(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_srgb(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_trns(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__do_decode_frame_config(
-    wuffs_png__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__skip_frame(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__do_decode_frame(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_pass(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__do_tell_me_more(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__filter_and_swizzle(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__filter_and_swizzle__choosy_default(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__filter_and_swizzle_tricky(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf);
-
-// ---------------- VTables
-
-const wuffs_base__image_decoder__func_ptrs
-wuffs_png__decoder__func_ptrs_for__wuffs_base__image_decoder = {
-  (wuffs_base__status(*)(void*,
-      wuffs_base__pixel_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__pixel_blend,
-      wuffs_base__slice_u8,
-      wuffs_base__decode_frame_options*))(&wuffs_png__decoder__decode_frame),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__frame_config*,
-      wuffs_base__io_buffer*))(&wuffs_png__decoder__decode_frame_config),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__image_config*,
-      wuffs_base__io_buffer*))(&wuffs_png__decoder__decode_image_config),
-  (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_png__decoder__frame_dirty_rect),
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_png__decoder__get_quirk),
-  (uint32_t(*)(const void*))(&wuffs_png__decoder__num_animation_loops),
-  (uint64_t(*)(const void*))(&wuffs_png__decoder__num_decoded_frame_configs),
-  (uint64_t(*)(const void*))(&wuffs_png__decoder__num_decoded_frames),
-  (wuffs_base__status(*)(void*,
-      uint64_t,
-      uint64_t))(&wuffs_png__decoder__restart_frame),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_png__decoder__set_quirk),
-  (wuffs_base__empty_struct(*)(void*,
-      uint32_t,
-      bool))(&wuffs_png__decoder__set_report_metadata),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__more_information*,
-      wuffs_base__io_buffer*))(&wuffs_png__decoder__tell_me_more),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_png__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_png__decoder__initialize(
-    wuffs_png__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.choosy_filter_1 = &wuffs_png__decoder__filter_1__choosy_default;
-  self->private_impl.choosy_filter_3 = &wuffs_png__decoder__filter_3__choosy_default;
-  self->private_impl.choosy_filter_4 = &wuffs_png__decoder__filter_4__choosy_default;
-  self->private_impl.choosy_filter_and_swizzle = &wuffs_png__decoder__filter_and_swizzle__choosy_default;
-
-  {
-    wuffs_base__status z = wuffs_crc32__ieee_hasher__initialize(
-        &self->private_data.f_crc32, sizeof(self->private_data.f_crc32), WUFFS_VERSION, options);
-    if (z.repr) {
-      return z;
-    }
-  }
-  {
-    wuffs_base__status z = wuffs_zlib__decoder__initialize(
-        &self->private_data.f_zlib, sizeof(self->private_data.f_zlib), WUFFS_VERSION, options);
-    if (z.repr) {
-      return z;
-    }
-  }
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.vtable_name =
-      wuffs_base__image_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.function_pointers =
-      (const void*)(&wuffs_png__decoder__func_ptrs_for__wuffs_base__image_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_png__decoder*
-wuffs_png__decoder__alloc() {
-  wuffs_png__decoder* x =
-      (wuffs_png__decoder*)(calloc(sizeof(wuffs_png__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_png__decoder__initialize(
-      x, sizeof(wuffs_png__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_png__decoder() {
-  return sizeof(wuffs_png__decoder);
-}
-
-// ---------------- Function Implementations
-
-// ‼ WUFFS MULTI-FILE SECTION +arm_neon
-// -------- func png.decoder.filter_1_distance_4_arm_neon
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1_distance_4_arm_neon(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr) {
-  wuffs_base__slice_u8 v_curr = {0};
-  uint8x8_t v_fa = {0};
-  uint8x8_t v_fx = {0};
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    v_curr.len = 4;
-    uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 8) * 8);
-    while (v_curr.ptr < i_end0_curr) {
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_fx = vadd_u8(v_fx, v_fa);
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_fa = v_fx;
-      v_curr.ptr += 4;
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_fx = vadd_u8(v_fx, v_fa);
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_fa = v_fx;
-      v_curr.ptr += 4;
-    }
-    v_curr.len = 4;
-    uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-    while (v_curr.ptr < i_end1_curr) {
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_fx = vadd_u8(v_fx, v_fa);
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_fa = v_fx;
-      v_curr.ptr += 4;
-    }
-    v_curr.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-// ‼ WUFFS MULTI-FILE SECTION -arm_neon
-
-// ‼ WUFFS MULTI-FILE SECTION +arm_neon
-// -------- func png.decoder.filter_3_distance_4_arm_neon
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3_distance_4_arm_neon(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  uint8x8_t v_fa = {0};
-  uint8x8_t v_fb = {0};
-  uint8x8_t v_fx = {0};
-
-  if (((uint64_t)(a_prev.len)) == 0u) {
-    {
-      wuffs_base__slice_u8 i_slice_curr = a_curr;
-      v_curr.ptr = i_slice_curr.ptr;
-      v_curr.len = 4;
-      uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 8) * 8);
-      while (v_curr.ptr < i_end0_curr) {
-        v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_fx = vadd_u8(v_fx, vhadd_u8(v_fa, v_fb));
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-        v_fa = v_fx;
-        v_curr.ptr += 4;
-        v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_fx = vadd_u8(v_fx, vhadd_u8(v_fa, v_fb));
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-        v_fa = v_fx;
-        v_curr.ptr += 4;
-      }
-      v_curr.len = 4;
-      uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-      while (v_curr.ptr < i_end1_curr) {
-        v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_fx = vadd_u8(v_fx, vhadd_u8(v_fa, v_fb));
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-        v_fa = v_fx;
-        v_curr.ptr += 4;
-      }
-      v_curr.len = 0;
-    }
-  } else {
-    {
-      wuffs_base__slice_u8 i_slice_curr = a_curr;
-      v_curr.ptr = i_slice_curr.ptr;
-      wuffs_base__slice_u8 i_slice_prev = a_prev;
-      v_prev.ptr = i_slice_prev.ptr;
-      i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-      v_curr.len = 4;
-      v_prev.len = 4;
-      uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 8) * 8);
-      while (v_curr.ptr < i_end0_curr) {
-        v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-        v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_fx = vadd_u8(v_fx, vhadd_u8(v_fa, v_fb));
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-        v_fa = v_fx;
-        v_curr.ptr += 4;
-        v_prev.ptr += 4;
-        v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-        v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_fx = vadd_u8(v_fx, vhadd_u8(v_fa, v_fb));
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-        v_fa = v_fx;
-        v_curr.ptr += 4;
-        v_prev.ptr += 4;
-      }
-      v_curr.len = 4;
-      v_prev.len = 4;
-      uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-      while (v_curr.ptr < i_end1_curr) {
-        v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-        v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_fx = vadd_u8(v_fx, vhadd_u8(v_fa, v_fb));
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-        v_fa = v_fx;
-        v_curr.ptr += 4;
-        v_prev.ptr += 4;
-      }
-      v_curr.len = 0;
-      v_prev.len = 0;
-    }
-  }
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-// ‼ WUFFS MULTI-FILE SECTION -arm_neon
-
-// ‼ WUFFS MULTI-FILE SECTION +arm_neon
-// -------- func png.decoder.filter_4_distance_3_arm_neon
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_3_arm_neon(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  uint8x8_t v_fa = {0};
-  uint8x8_t v_fb = {0};
-  uint8x8_t v_fc = {0};
-  uint8x8_t v_fx = {0};
-  uint16x8_t v_fafb = {0};
-  uint16x8_t v_fcfc = {0};
-  uint16x8_t v_pa = {0};
-  uint16x8_t v_pb = {0};
-  uint16x8_t v_pc = {0};
-  uint16x8_t v_cmpab = {0};
-  uint16x8_t v_cmpac = {0};
-  uint8x8_t v_picka = {0};
-  uint8x8_t v_pickb = {0};
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    wuffs_base__slice_u8 i_slice_prev = a_prev;
-    v_prev.ptr = i_slice_prev.ptr;
-    i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-    v_curr.len = 4;
-    v_prev.len = 4;
-    uint8_t* i_end0_curr = v_curr.ptr + wuffs_base__iterate_total_advance((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)), 7, 6);
-    while (v_curr.ptr < i_end0_curr) {
-      v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_fafb = vaddl_u8(v_fa, v_fb);
-      v_fcfc = vaddl_u8(v_fc, v_fc);
-      v_pa = vabdl_u8(v_fb, v_fc);
-      v_pb = vabdl_u8(v_fa, v_fc);
-      v_pc = vabdq_u16(v_fafb, v_fcfc);
-      v_cmpab = vcleq_u16(v_pa, v_pb);
-      v_cmpac = vcleq_u16(v_pa, v_pc);
-      v_picka = vmovn_u16(vandq_u16(v_cmpab, v_cmpac));
-      v_pickb = vmovn_u16(vcleq_u16(v_pb, v_pc));
-      v_fx = vadd_u8(v_fx, vbsl_u8(v_picka, v_fa, vbsl_u8(v_pickb, v_fb, v_fc)));
-      wuffs_base__poke_u24le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_fc = v_fb;
-      v_fa = v_fx;
-      v_curr.ptr += 3;
-      v_prev.ptr += 3;
-      v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_fafb = vaddl_u8(v_fa, v_fb);
-      v_fcfc = vaddl_u8(v_fc, v_fc);
-      v_pa = vabdl_u8(v_fb, v_fc);
-      v_pb = vabdl_u8(v_fa, v_fc);
-      v_pc = vabdq_u16(v_fafb, v_fcfc);
-      v_cmpab = vcleq_u16(v_pa, v_pb);
-      v_cmpac = vcleq_u16(v_pa, v_pc);
-      v_picka = vmovn_u16(vandq_u16(v_cmpab, v_cmpac));
-      v_pickb = vmovn_u16(vcleq_u16(v_pb, v_pc));
-      v_fx = vadd_u8(v_fx, vbsl_u8(v_picka, v_fa, vbsl_u8(v_pickb, v_fb, v_fc)));
-      wuffs_base__poke_u24le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_fc = v_fb;
-      v_fa = v_fx;
-      v_curr.ptr += 3;
-      v_prev.ptr += 3;
-    }
-    v_curr.len = 4;
-    v_prev.len = 4;
-    uint8_t* i_end1_curr = v_curr.ptr + wuffs_base__iterate_total_advance((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)), 4, 3);
-    while (v_curr.ptr < i_end1_curr) {
-      v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_fafb = vaddl_u8(v_fa, v_fb);
-      v_fcfc = vaddl_u8(v_fc, v_fc);
-      v_pa = vabdl_u8(v_fb, v_fc);
-      v_pb = vabdl_u8(v_fa, v_fc);
-      v_pc = vabdq_u16(v_fafb, v_fcfc);
-      v_cmpab = vcleq_u16(v_pa, v_pb);
-      v_cmpac = vcleq_u16(v_pa, v_pc);
-      v_picka = vmovn_u16(vandq_u16(v_cmpab, v_cmpac));
-      v_pickb = vmovn_u16(vcleq_u16(v_pb, v_pc));
-      v_fx = vadd_u8(v_fx, vbsl_u8(v_picka, v_fa, vbsl_u8(v_pickb, v_fb, v_fc)));
-      wuffs_base__poke_u24le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_fc = v_fb;
-      v_fa = v_fx;
-      v_curr.ptr += 3;
-      v_prev.ptr += 3;
-    }
-    v_curr.len = 3;
-    v_prev.len = 3;
-    uint8_t* i_end2_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 3) * 3);
-    while (v_curr.ptr < i_end2_curr) {
-      v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u24le__no_bounds_check(v_prev.ptr)));
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u24le__no_bounds_check(v_curr.ptr)));
-      v_fafb = vaddl_u8(v_fa, v_fb);
-      v_fcfc = vaddl_u8(v_fc, v_fc);
-      v_pa = vabdl_u8(v_fb, v_fc);
-      v_pb = vabdl_u8(v_fa, v_fc);
-      v_pc = vabdq_u16(v_fafb, v_fcfc);
-      v_cmpab = vcleq_u16(v_pa, v_pb);
-      v_cmpac = vcleq_u16(v_pa, v_pc);
-      v_picka = vmovn_u16(vandq_u16(v_cmpab, v_cmpac));
-      v_pickb = vmovn_u16(vcleq_u16(v_pb, v_pc));
-      v_fx = vadd_u8(v_fx, vbsl_u8(v_picka, v_fa, vbsl_u8(v_pickb, v_fb, v_fc)));
-      wuffs_base__poke_u24le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_curr.ptr += 3;
-      v_prev.ptr += 3;
-    }
-    v_curr.len = 0;
-    v_prev.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-// ‼ WUFFS MULTI-FILE SECTION -arm_neon
-
-// ‼ WUFFS MULTI-FILE SECTION +arm_neon
-// -------- func png.decoder.filter_4_distance_4_arm_neon
-
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_4_arm_neon(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  uint8x8_t v_fa = {0};
-  uint8x8_t v_fb = {0};
-  uint8x8_t v_fc = {0};
-  uint8x8_t v_fx = {0};
-  uint16x8_t v_fafb = {0};
-  uint16x8_t v_fcfc = {0};
-  uint16x8_t v_pa = {0};
-  uint16x8_t v_pb = {0};
-  uint16x8_t v_pc = {0};
-  uint16x8_t v_cmpab = {0};
-  uint16x8_t v_cmpac = {0};
-  uint8x8_t v_picka = {0};
-  uint8x8_t v_pickb = {0};
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    wuffs_base__slice_u8 i_slice_prev = a_prev;
-    v_prev.ptr = i_slice_prev.ptr;
-    i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-    v_curr.len = 4;
-    v_prev.len = 4;
-    uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 8) * 8);
-    while (v_curr.ptr < i_end0_curr) {
-      v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_fafb = vaddl_u8(v_fa, v_fb);
-      v_fcfc = vaddl_u8(v_fc, v_fc);
-      v_pa = vabdl_u8(v_fb, v_fc);
-      v_pb = vabdl_u8(v_fa, v_fc);
-      v_pc = vabdq_u16(v_fafb, v_fcfc);
-      v_cmpab = vcleq_u16(v_pa, v_pb);
-      v_cmpac = vcleq_u16(v_pa, v_pc);
-      v_picka = vmovn_u16(vandq_u16(v_cmpab, v_cmpac));
-      v_pickb = vmovn_u16(vcleq_u16(v_pb, v_pc));
-      v_fx = vadd_u8(v_fx, vbsl_u8(v_picka, v_fa, vbsl_u8(v_pickb, v_fb, v_fc)));
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_fc = v_fb;
-      v_fa = v_fx;
-      v_curr.ptr += 4;
-      v_prev.ptr += 4;
-      v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_fafb = vaddl_u8(v_fa, v_fb);
-      v_fcfc = vaddl_u8(v_fc, v_fc);
-      v_pa = vabdl_u8(v_fb, v_fc);
-      v_pb = vabdl_u8(v_fa, v_fc);
-      v_pc = vabdq_u16(v_fafb, v_fcfc);
-      v_cmpab = vcleq_u16(v_pa, v_pb);
-      v_cmpac = vcleq_u16(v_pa, v_pc);
-      v_picka = vmovn_u16(vandq_u16(v_cmpab, v_cmpac));
-      v_pickb = vmovn_u16(vcleq_u16(v_pb, v_pc));
-      v_fx = vadd_u8(v_fx, vbsl_u8(v_picka, v_fa, vbsl_u8(v_pickb, v_fb, v_fc)));
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_fc = v_fb;
-      v_fa = v_fx;
-      v_curr.ptr += 4;
-      v_prev.ptr += 4;
-    }
-    v_curr.len = 4;
-    v_prev.len = 4;
-    uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-    while (v_curr.ptr < i_end1_curr) {
-      v_fb = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_fx = vreinterpret_u8_u32(vdup_n_u32(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_fafb = vaddl_u8(v_fa, v_fb);
-      v_fcfc = vaddl_u8(v_fc, v_fc);
-      v_pa = vabdl_u8(v_fb, v_fc);
-      v_pb = vabdl_u8(v_fa, v_fc);
-      v_pc = vabdq_u16(v_fafb, v_fcfc);
-      v_cmpab = vcleq_u16(v_pa, v_pb);
-      v_cmpac = vcleq_u16(v_pa, v_pc);
-      v_picka = vmovn_u16(vandq_u16(v_cmpab, v_cmpac));
-      v_pickb = vmovn_u16(vcleq_u16(v_pb, v_pc));
-      v_fx = vadd_u8(v_fx, vbsl_u8(v_picka, v_fa, vbsl_u8(v_pickb, v_fb, v_fc)));
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, vget_lane_u32(vreinterpret_u32_u8(v_fx), 0u));
-      v_fc = v_fb;
-      v_fa = v_fx;
-      v_curr.ptr += 4;
-      v_prev.ptr += 4;
-    }
-    v_curr.len = 0;
-    v_prev.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-// ‼ WUFFS MULTI-FILE SECTION -arm_neon
-
-// -------- func png.decoder.filter_1
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr) {
-  return (*self->private_impl.choosy_filter_1)(self, a_curr);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1__choosy_default(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr) {
-  uint64_t v_filter_distance = 0;
-  uint8_t v_fa = 0;
-  uint64_t v_i_start = 0;
-  uint64_t v_i = 0;
-
-  v_filter_distance = ((uint64_t)(self->private_impl.f_filter_distance));
-  v_i_start = 0u;
-  while (v_i_start < v_filter_distance) {
-    v_fa = 0u;
-    v_i = v_i_start;
-    while (v_i < ((uint64_t)(a_curr.len))) {
-      a_curr.ptr[v_i] = ((uint8_t)(a_curr.ptr[v_i] + v_fa));
-      v_fa = a_curr.ptr[v_i];
-      v_i += v_filter_distance;
-    }
-    v_i_start += 1u;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.filter_1_distance_3_fallback
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1_distance_3_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr) {
-  wuffs_base__slice_u8 v_curr = {0};
-  uint8_t v_fa0 = 0;
-  uint8_t v_fa1 = 0;
-  uint8_t v_fa2 = 0;
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    v_curr.len = 3;
-    uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 6) * 6);
-    while (v_curr.ptr < i_end0_curr) {
-      v_fa0 = ((uint8_t)(v_fa0 + v_curr.ptr[0u]));
-      v_curr.ptr[0u] = v_fa0;
-      v_fa1 = ((uint8_t)(v_fa1 + v_curr.ptr[1u]));
-      v_curr.ptr[1u] = v_fa1;
-      v_fa2 = ((uint8_t)(v_fa2 + v_curr.ptr[2u]));
-      v_curr.ptr[2u] = v_fa2;
-      v_curr.ptr += 3;
-      v_fa0 = ((uint8_t)(v_fa0 + v_curr.ptr[0u]));
-      v_curr.ptr[0u] = v_fa0;
-      v_fa1 = ((uint8_t)(v_fa1 + v_curr.ptr[1u]));
-      v_curr.ptr[1u] = v_fa1;
-      v_fa2 = ((uint8_t)(v_fa2 + v_curr.ptr[2u]));
-      v_curr.ptr[2u] = v_fa2;
-      v_curr.ptr += 3;
-    }
-    v_curr.len = 3;
-    uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 3) * 3);
-    while (v_curr.ptr < i_end1_curr) {
-      v_fa0 = ((uint8_t)(v_fa0 + v_curr.ptr[0u]));
-      v_curr.ptr[0u] = v_fa0;
-      v_fa1 = ((uint8_t)(v_fa1 + v_curr.ptr[1u]));
-      v_curr.ptr[1u] = v_fa1;
-      v_fa2 = ((uint8_t)(v_fa2 + v_curr.ptr[2u]));
-      v_curr.ptr[2u] = v_fa2;
-      v_curr.ptr += 3;
-    }
-    v_curr.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.filter_1_distance_4_fallback
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1_distance_4_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr) {
-  wuffs_base__slice_u8 v_curr = {0};
-  uint8_t v_fa0 = 0;
-  uint8_t v_fa1 = 0;
-  uint8_t v_fa2 = 0;
-  uint8_t v_fa3 = 0;
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    v_curr.len = 4;
-    uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-    while (v_curr.ptr < i_end0_curr) {
-      v_fa0 = ((uint8_t)(v_fa0 + v_curr.ptr[0u]));
-      v_curr.ptr[0u] = v_fa0;
-      v_fa1 = ((uint8_t)(v_fa1 + v_curr.ptr[1u]));
-      v_curr.ptr[1u] = v_fa1;
-      v_fa2 = ((uint8_t)(v_fa2 + v_curr.ptr[2u]));
-      v_curr.ptr[2u] = v_fa2;
-      v_fa3 = ((uint8_t)(v_fa3 + v_curr.ptr[3u]));
-      v_curr.ptr[3u] = v_fa3;
-      v_curr.ptr += 4;
-    }
-    v_curr.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.filter_2
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_2(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  uint64_t v_n = 0;
-  uint64_t v_i = 0;
-
-  v_n = wuffs_base__u64__min(((uint64_t)(a_curr.len)), ((uint64_t)(a_prev.len)));
-  v_i = 0u;
-  while (v_i < v_n) {
-    a_curr.ptr[v_i] = ((uint8_t)(a_curr.ptr[v_i] + a_prev.ptr[v_i]));
-    v_i += 1u;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.filter_3
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  return (*self->private_impl.choosy_filter_3)(self, a_curr, a_prev);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3__choosy_default(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  uint64_t v_filter_distance = 0;
-  uint64_t v_n = 0;
-  uint64_t v_i = 0;
-
-  v_filter_distance = ((uint64_t)(self->private_impl.f_filter_distance));
-  if (((uint64_t)(a_prev.len)) == 0u) {
-    v_i = v_filter_distance;
-    while (v_i < ((uint64_t)(a_curr.len))) {
-      a_curr.ptr[v_i] = ((uint8_t)(a_curr.ptr[v_i] + (a_curr.ptr[(v_i - v_filter_distance)] / 2u)));
-      v_i += 1u;
-    }
-  } else {
-    v_n = wuffs_base__u64__min(((uint64_t)(a_curr.len)), ((uint64_t)(a_prev.len)));
-    v_i = 0u;
-    while ((v_i < v_n) && (v_i < v_filter_distance)) {
-      a_curr.ptr[v_i] = ((uint8_t)(a_curr.ptr[v_i] + (a_prev.ptr[v_i] / 2u)));
-      v_i += 1u;
-    }
-    v_i = v_filter_distance;
-    while (v_i < v_n) {
-      a_curr.ptr[v_i] = ((uint8_t)(a_curr.ptr[v_i] + ((uint8_t)(((((uint32_t)(a_curr.ptr[(v_i - v_filter_distance)])) + ((uint32_t)(a_prev.ptr[v_i]))) / 2u)))));
-      v_i += 1u;
-    }
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.filter_3_distance_3_fallback
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3_distance_3_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  uint8_t v_fa0 = 0;
-  uint8_t v_fa1 = 0;
-  uint8_t v_fa2 = 0;
-
-  if (((uint64_t)(a_prev.len)) == 0u) {
-    {
-      wuffs_base__slice_u8 i_slice_curr = a_curr;
-      v_curr.ptr = i_slice_curr.ptr;
-      v_curr.len = 3;
-      uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 6) * 6);
-      while (v_curr.ptr < i_end0_curr) {
-        v_fa0 = ((uint8_t)((v_fa0 / 2u) + v_curr.ptr[0u]));
-        v_curr.ptr[0u] = v_fa0;
-        v_fa1 = ((uint8_t)((v_fa1 / 2u) + v_curr.ptr[1u]));
-        v_curr.ptr[1u] = v_fa1;
-        v_fa2 = ((uint8_t)((v_fa2 / 2u) + v_curr.ptr[2u]));
-        v_curr.ptr[2u] = v_fa2;
-        v_curr.ptr += 3;
-        v_fa0 = ((uint8_t)((v_fa0 / 2u) + v_curr.ptr[0u]));
-        v_curr.ptr[0u] = v_fa0;
-        v_fa1 = ((uint8_t)((v_fa1 / 2u) + v_curr.ptr[1u]));
-        v_curr.ptr[1u] = v_fa1;
-        v_fa2 = ((uint8_t)((v_fa2 / 2u) + v_curr.ptr[2u]));
-        v_curr.ptr[2u] = v_fa2;
-        v_curr.ptr += 3;
-      }
-      v_curr.len = 3;
-      uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 3) * 3);
-      while (v_curr.ptr < i_end1_curr) {
-        v_fa0 = ((uint8_t)((v_fa0 / 2u) + v_curr.ptr[0u]));
-        v_curr.ptr[0u] = v_fa0;
-        v_fa1 = ((uint8_t)((v_fa1 / 2u) + v_curr.ptr[1u]));
-        v_curr.ptr[1u] = v_fa1;
-        v_fa2 = ((uint8_t)((v_fa2 / 2u) + v_curr.ptr[2u]));
-        v_curr.ptr[2u] = v_fa2;
-        v_curr.ptr += 3;
-      }
-      v_curr.len = 0;
-    }
-  } else {
-    {
-      wuffs_base__slice_u8 i_slice_curr = a_curr;
-      v_curr.ptr = i_slice_curr.ptr;
-      wuffs_base__slice_u8 i_slice_prev = a_prev;
-      v_prev.ptr = i_slice_prev.ptr;
-      i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-      v_curr.len = 3;
-      v_prev.len = 3;
-      uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 6) * 6);
-      while (v_curr.ptr < i_end0_curr) {
-        v_fa0 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa0)) + ((uint32_t)(v_prev.ptr[0u]))) / 2u))) + v_curr.ptr[0u]));
-        v_curr.ptr[0u] = v_fa0;
-        v_fa1 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa1)) + ((uint32_t)(v_prev.ptr[1u]))) / 2u))) + v_curr.ptr[1u]));
-        v_curr.ptr[1u] = v_fa1;
-        v_fa2 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa2)) + ((uint32_t)(v_prev.ptr[2u]))) / 2u))) + v_curr.ptr[2u]));
-        v_curr.ptr[2u] = v_fa2;
-        v_curr.ptr += 3;
-        v_prev.ptr += 3;
-        v_fa0 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa0)) + ((uint32_t)(v_prev.ptr[0u]))) / 2u))) + v_curr.ptr[0u]));
-        v_curr.ptr[0u] = v_fa0;
-        v_fa1 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa1)) + ((uint32_t)(v_prev.ptr[1u]))) / 2u))) + v_curr.ptr[1u]));
-        v_curr.ptr[1u] = v_fa1;
-        v_fa2 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa2)) + ((uint32_t)(v_prev.ptr[2u]))) / 2u))) + v_curr.ptr[2u]));
-        v_curr.ptr[2u] = v_fa2;
-        v_curr.ptr += 3;
-        v_prev.ptr += 3;
-      }
-      v_curr.len = 3;
-      v_prev.len = 3;
-      uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 3) * 3);
-      while (v_curr.ptr < i_end1_curr) {
-        v_fa0 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa0)) + ((uint32_t)(v_prev.ptr[0u]))) / 2u))) + v_curr.ptr[0u]));
-        v_curr.ptr[0u] = v_fa0;
-        v_fa1 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa1)) + ((uint32_t)(v_prev.ptr[1u]))) / 2u))) + v_curr.ptr[1u]));
-        v_curr.ptr[1u] = v_fa1;
-        v_fa2 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa2)) + ((uint32_t)(v_prev.ptr[2u]))) / 2u))) + v_curr.ptr[2u]));
-        v_curr.ptr[2u] = v_fa2;
-        v_curr.ptr += 3;
-        v_prev.ptr += 3;
-      }
-      v_curr.len = 0;
-      v_prev.len = 0;
-    }
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.filter_3_distance_4_fallback
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3_distance_4_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  uint8_t v_fa0 = 0;
-  uint8_t v_fa1 = 0;
-  uint8_t v_fa2 = 0;
-  uint8_t v_fa3 = 0;
-
-  if (((uint64_t)(a_prev.len)) == 0u) {
-    {
-      wuffs_base__slice_u8 i_slice_curr = a_curr;
-      v_curr.ptr = i_slice_curr.ptr;
-      v_curr.len = 4;
-      uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-      while (v_curr.ptr < i_end0_curr) {
-        v_fa0 = ((uint8_t)((v_fa0 / 2u) + v_curr.ptr[0u]));
-        v_curr.ptr[0u] = v_fa0;
-        v_fa1 = ((uint8_t)((v_fa1 / 2u) + v_curr.ptr[1u]));
-        v_curr.ptr[1u] = v_fa1;
-        v_fa2 = ((uint8_t)((v_fa2 / 2u) + v_curr.ptr[2u]));
-        v_curr.ptr[2u] = v_fa2;
-        v_fa3 = ((uint8_t)((v_fa3 / 2u) + v_curr.ptr[3u]));
-        v_curr.ptr[3u] = v_fa3;
-        v_curr.ptr += 4;
-      }
-      v_curr.len = 0;
-    }
-  } else {
-    {
-      wuffs_base__slice_u8 i_slice_curr = a_curr;
-      v_curr.ptr = i_slice_curr.ptr;
-      wuffs_base__slice_u8 i_slice_prev = a_prev;
-      v_prev.ptr = i_slice_prev.ptr;
-      i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-      v_curr.len = 4;
-      v_prev.len = 4;
-      uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-      while (v_curr.ptr < i_end0_curr) {
-        v_fa0 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa0)) + ((uint32_t)(v_prev.ptr[0u]))) / 2u))) + v_curr.ptr[0u]));
-        v_curr.ptr[0u] = v_fa0;
-        v_fa1 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa1)) + ((uint32_t)(v_prev.ptr[1u]))) / 2u))) + v_curr.ptr[1u]));
-        v_curr.ptr[1u] = v_fa1;
-        v_fa2 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa2)) + ((uint32_t)(v_prev.ptr[2u]))) / 2u))) + v_curr.ptr[2u]));
-        v_curr.ptr[2u] = v_fa2;
-        v_fa3 = ((uint8_t)(((uint8_t)(((((uint32_t)(v_fa3)) + ((uint32_t)(v_prev.ptr[3u]))) / 2u))) + v_curr.ptr[3u]));
-        v_curr.ptr[3u] = v_fa3;
-        v_curr.ptr += 4;
-        v_prev.ptr += 4;
-      }
-      v_curr.len = 0;
-      v_prev.len = 0;
-    }
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.filter_4
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  return (*self->private_impl.choosy_filter_4)(self, a_curr, a_prev);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4__choosy_default(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  uint64_t v_filter_distance = 0;
-  uint64_t v_n = 0;
-  uint64_t v_i = 0;
-  uint32_t v_fa = 0;
-  uint32_t v_fb = 0;
-  uint32_t v_fc = 0;
-  uint32_t v_pp = 0;
-  uint32_t v_pa = 0;
-  uint32_t v_pb = 0;
-  uint32_t v_pc = 0;
-
-  v_filter_distance = ((uint64_t)(self->private_impl.f_filter_distance));
-  v_n = wuffs_base__u64__min(((uint64_t)(a_curr.len)), ((uint64_t)(a_prev.len)));
-  v_i = 0u;
-  while ((v_i < v_n) && (v_i < v_filter_distance)) {
-    a_curr.ptr[v_i] = ((uint8_t)(a_curr.ptr[v_i] + a_prev.ptr[v_i]));
-    v_i += 1u;
-  }
-  v_i = v_filter_distance;
-  while (v_i < v_n) {
-    v_fa = ((uint32_t)(a_curr.ptr[(v_i - v_filter_distance)]));
-    v_fb = ((uint32_t)(a_prev.ptr[v_i]));
-    v_fc = ((uint32_t)(a_prev.ptr[(v_i - v_filter_distance)]));
-    v_pp = ((uint32_t)(((uint32_t)(v_fa + v_fb)) - v_fc));
-    v_pa = ((uint32_t)(v_pp - v_fa));
-    if (v_pa >= 2147483648u) {
-      v_pa = ((uint32_t)(0u - v_pa));
-    }
-    v_pb = ((uint32_t)(v_pp - v_fb));
-    if (v_pb >= 2147483648u) {
-      v_pb = ((uint32_t)(0u - v_pb));
-    }
-    v_pc = ((uint32_t)(v_pp - v_fc));
-    if (v_pc >= 2147483648u) {
-      v_pc = ((uint32_t)(0u - v_pc));
-    }
-    if ((v_pa <= v_pb) && (v_pa <= v_pc)) {
-    } else if (v_pb <= v_pc) {
-      v_fa = v_fb;
-    } else {
-      v_fa = v_fc;
-    }
-    a_curr.ptr[v_i] = ((uint8_t)(a_curr.ptr[v_i] + ((uint8_t)(v_fa))));
-    v_i += 1u;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.filter_4_distance_3_fallback
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_3_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  uint32_t v_fa0 = 0;
-  uint32_t v_fa1 = 0;
-  uint32_t v_fa2 = 0;
-  uint32_t v_fb0 = 0;
-  uint32_t v_fb1 = 0;
-  uint32_t v_fb2 = 0;
-  uint32_t v_fc0 = 0;
-  uint32_t v_fc1 = 0;
-  uint32_t v_fc2 = 0;
-  uint32_t v_pp0 = 0;
-  uint32_t v_pp1 = 0;
-  uint32_t v_pp2 = 0;
-  uint32_t v_pa0 = 0;
-  uint32_t v_pa1 = 0;
-  uint32_t v_pa2 = 0;
-  uint32_t v_pb0 = 0;
-  uint32_t v_pb1 = 0;
-  uint32_t v_pb2 = 0;
-  uint32_t v_pc0 = 0;
-  uint32_t v_pc1 = 0;
-  uint32_t v_pc2 = 0;
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    wuffs_base__slice_u8 i_slice_prev = a_prev;
-    v_prev.ptr = i_slice_prev.ptr;
-    i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-    v_curr.len = 3;
-    v_prev.len = 3;
-    uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 3) * 3);
-    while (v_curr.ptr < i_end0_curr) {
-      v_fb0 = ((uint32_t)(v_prev.ptr[0u]));
-      v_pp0 = ((uint32_t)(((uint32_t)(v_fa0 + v_fb0)) - v_fc0));
-      v_pa0 = ((uint32_t)(v_pp0 - v_fa0));
-      if (v_pa0 >= 2147483648u) {
-        v_pa0 = ((uint32_t)(0u - v_pa0));
-      }
-      v_pb0 = ((uint32_t)(v_pp0 - v_fb0));
-      if (v_pb0 >= 2147483648u) {
-        v_pb0 = ((uint32_t)(0u - v_pb0));
-      }
-      v_pc0 = ((uint32_t)(v_pp0 - v_fc0));
-      if (v_pc0 >= 2147483648u) {
-        v_pc0 = ((uint32_t)(0u - v_pc0));
-      }
-      if ((v_pa0 <= v_pb0) && (v_pa0 <= v_pc0)) {
-      } else if (v_pb0 <= v_pc0) {
-        v_fa0 = v_fb0;
-      } else {
-        v_fa0 = v_fc0;
-      }
-      v_curr.ptr[0u] = ((uint8_t)(v_curr.ptr[0u] + ((uint8_t)(v_fa0))));
-      v_fa0 = ((uint32_t)(v_curr.ptr[0u]));
-      v_fc0 = v_fb0;
-      v_fb1 = ((uint32_t)(v_prev.ptr[1u]));
-      v_pp1 = ((uint32_t)(((uint32_t)(v_fa1 + v_fb1)) - v_fc1));
-      v_pa1 = ((uint32_t)(v_pp1 - v_fa1));
-      if (v_pa1 >= 2147483648u) {
-        v_pa1 = ((uint32_t)(0u - v_pa1));
-      }
-      v_pb1 = ((uint32_t)(v_pp1 - v_fb1));
-      if (v_pb1 >= 2147483648u) {
-        v_pb1 = ((uint32_t)(0u - v_pb1));
-      }
-      v_pc1 = ((uint32_t)(v_pp1 - v_fc1));
-      if (v_pc1 >= 2147483648u) {
-        v_pc1 = ((uint32_t)(0u - v_pc1));
-      }
-      if ((v_pa1 <= v_pb1) && (v_pa1 <= v_pc1)) {
-      } else if (v_pb1 <= v_pc1) {
-        v_fa1 = v_fb1;
-      } else {
-        v_fa1 = v_fc1;
-      }
-      v_curr.ptr[1u] = ((uint8_t)(v_curr.ptr[1u] + ((uint8_t)(v_fa1))));
-      v_fa1 = ((uint32_t)(v_curr.ptr[1u]));
-      v_fc1 = v_fb1;
-      v_fb2 = ((uint32_t)(v_prev.ptr[2u]));
-      v_pp2 = ((uint32_t)(((uint32_t)(v_fa2 + v_fb2)) - v_fc2));
-      v_pa2 = ((uint32_t)(v_pp2 - v_fa2));
-      if (v_pa2 >= 2147483648u) {
-        v_pa2 = ((uint32_t)(0u - v_pa2));
-      }
-      v_pb2 = ((uint32_t)(v_pp2 - v_fb2));
-      if (v_pb2 >= 2147483648u) {
-        v_pb2 = ((uint32_t)(0u - v_pb2));
-      }
-      v_pc2 = ((uint32_t)(v_pp2 - v_fc2));
-      if (v_pc2 >= 2147483648u) {
-        v_pc2 = ((uint32_t)(0u - v_pc2));
-      }
-      if ((v_pa2 <= v_pb2) && (v_pa2 <= v_pc2)) {
-      } else if (v_pb2 <= v_pc2) {
-        v_fa2 = v_fb2;
-      } else {
-        v_fa2 = v_fc2;
-      }
-      v_curr.ptr[2u] = ((uint8_t)(v_curr.ptr[2u] + ((uint8_t)(v_fa2))));
-      v_fa2 = ((uint32_t)(v_curr.ptr[2u]));
-      v_fc2 = v_fb2;
-      v_curr.ptr += 3;
-      v_prev.ptr += 3;
-    }
-    v_curr.len = 0;
-    v_prev.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.filter_4_distance_4_fallback
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_4_fallback(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  uint32_t v_fa0 = 0;
-  uint32_t v_fa1 = 0;
-  uint32_t v_fa2 = 0;
-  uint32_t v_fa3 = 0;
-  uint32_t v_fb0 = 0;
-  uint32_t v_fb1 = 0;
-  uint32_t v_fb2 = 0;
-  uint32_t v_fb3 = 0;
-  uint32_t v_fc0 = 0;
-  uint32_t v_fc1 = 0;
-  uint32_t v_fc2 = 0;
-  uint32_t v_fc3 = 0;
-  uint32_t v_pp0 = 0;
-  uint32_t v_pp1 = 0;
-  uint32_t v_pp2 = 0;
-  uint32_t v_pp3 = 0;
-  uint32_t v_pa0 = 0;
-  uint32_t v_pa1 = 0;
-  uint32_t v_pa2 = 0;
-  uint32_t v_pa3 = 0;
-  uint32_t v_pb0 = 0;
-  uint32_t v_pb1 = 0;
-  uint32_t v_pb2 = 0;
-  uint32_t v_pb3 = 0;
-  uint32_t v_pc0 = 0;
-  uint32_t v_pc1 = 0;
-  uint32_t v_pc2 = 0;
-  uint32_t v_pc3 = 0;
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    wuffs_base__slice_u8 i_slice_prev = a_prev;
-    v_prev.ptr = i_slice_prev.ptr;
-    i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-    v_curr.len = 4;
-    v_prev.len = 4;
-    uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-    while (v_curr.ptr < i_end0_curr) {
-      v_fb0 = ((uint32_t)(v_prev.ptr[0u]));
-      v_pp0 = ((uint32_t)(((uint32_t)(v_fa0 + v_fb0)) - v_fc0));
-      v_pa0 = ((uint32_t)(v_pp0 - v_fa0));
-      if (v_pa0 >= 2147483648u) {
-        v_pa0 = ((uint32_t)(0u - v_pa0));
-      }
-      v_pb0 = ((uint32_t)(v_pp0 - v_fb0));
-      if (v_pb0 >= 2147483648u) {
-        v_pb0 = ((uint32_t)(0u - v_pb0));
-      }
-      v_pc0 = ((uint32_t)(v_pp0 - v_fc0));
-      if (v_pc0 >= 2147483648u) {
-        v_pc0 = ((uint32_t)(0u - v_pc0));
-      }
-      if ((v_pa0 <= v_pb0) && (v_pa0 <= v_pc0)) {
-      } else if (v_pb0 <= v_pc0) {
-        v_fa0 = v_fb0;
-      } else {
-        v_fa0 = v_fc0;
-      }
-      v_curr.ptr[0u] = ((uint8_t)(v_curr.ptr[0u] + ((uint8_t)(v_fa0))));
-      v_fa0 = ((uint32_t)(v_curr.ptr[0u]));
-      v_fc0 = v_fb0;
-      v_fb1 = ((uint32_t)(v_prev.ptr[1u]));
-      v_pp1 = ((uint32_t)(((uint32_t)(v_fa1 + v_fb1)) - v_fc1));
-      v_pa1 = ((uint32_t)(v_pp1 - v_fa1));
-      if (v_pa1 >= 2147483648u) {
-        v_pa1 = ((uint32_t)(0u - v_pa1));
-      }
-      v_pb1 = ((uint32_t)(v_pp1 - v_fb1));
-      if (v_pb1 >= 2147483648u) {
-        v_pb1 = ((uint32_t)(0u - v_pb1));
-      }
-      v_pc1 = ((uint32_t)(v_pp1 - v_fc1));
-      if (v_pc1 >= 2147483648u) {
-        v_pc1 = ((uint32_t)(0u - v_pc1));
-      }
-      if ((v_pa1 <= v_pb1) && (v_pa1 <= v_pc1)) {
-      } else if (v_pb1 <= v_pc1) {
-        v_fa1 = v_fb1;
-      } else {
-        v_fa1 = v_fc1;
-      }
-      v_curr.ptr[1u] = ((uint8_t)(v_curr.ptr[1u] + ((uint8_t)(v_fa1))));
-      v_fa1 = ((uint32_t)(v_curr.ptr[1u]));
-      v_fc1 = v_fb1;
-      v_fb2 = ((uint32_t)(v_prev.ptr[2u]));
-      v_pp2 = ((uint32_t)(((uint32_t)(v_fa2 + v_fb2)) - v_fc2));
-      v_pa2 = ((uint32_t)(v_pp2 - v_fa2));
-      if (v_pa2 >= 2147483648u) {
-        v_pa2 = ((uint32_t)(0u - v_pa2));
-      }
-      v_pb2 = ((uint32_t)(v_pp2 - v_fb2));
-      if (v_pb2 >= 2147483648u) {
-        v_pb2 = ((uint32_t)(0u - v_pb2));
-      }
-      v_pc2 = ((uint32_t)(v_pp2 - v_fc2));
-      if (v_pc2 >= 2147483648u) {
-        v_pc2 = ((uint32_t)(0u - v_pc2));
-      }
-      if ((v_pa2 <= v_pb2) && (v_pa2 <= v_pc2)) {
-      } else if (v_pb2 <= v_pc2) {
-        v_fa2 = v_fb2;
-      } else {
-        v_fa2 = v_fc2;
-      }
-      v_curr.ptr[2u] = ((uint8_t)(v_curr.ptr[2u] + ((uint8_t)(v_fa2))));
-      v_fa2 = ((uint32_t)(v_curr.ptr[2u]));
-      v_fc2 = v_fb2;
-      v_fb3 = ((uint32_t)(v_prev.ptr[3u]));
-      v_pp3 = ((uint32_t)(((uint32_t)(v_fa3 + v_fb3)) - v_fc3));
-      v_pa3 = ((uint32_t)(v_pp3 - v_fa3));
-      if (v_pa3 >= 2147483648u) {
-        v_pa3 = ((uint32_t)(0u - v_pa3));
-      }
-      v_pb3 = ((uint32_t)(v_pp3 - v_fb3));
-      if (v_pb3 >= 2147483648u) {
-        v_pb3 = ((uint32_t)(0u - v_pb3));
-      }
-      v_pc3 = ((uint32_t)(v_pp3 - v_fc3));
-      if (v_pc3 >= 2147483648u) {
-        v_pc3 = ((uint32_t)(0u - v_pc3));
-      }
-      if ((v_pa3 <= v_pb3) && (v_pa3 <= v_pc3)) {
-      } else if (v_pb3 <= v_pc3) {
-        v_fa3 = v_fb3;
-      } else {
-        v_fa3 = v_fc3;
-      }
-      v_curr.ptr[3u] = ((uint8_t)(v_curr.ptr[3u] + ((uint8_t)(v_fa3))));
-      v_fa3 = ((uint32_t)(v_curr.ptr[3u]));
-      v_fc3 = v_fb3;
-      v_curr.ptr += 4;
-      v_prev.ptr += 4;
-    }
-    v_curr.len = 0;
-    v_prev.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_sse42
-// -------- func png.decoder.filter_1_distance_4_x86_sse42
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_1_distance_4_x86_sse42(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr) {
-  wuffs_base__slice_u8 v_curr = {0};
-  __m128i v_x128 = {0};
-  __m128i v_a128 = {0};
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    v_curr.len = 4;
-    uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 8) * 8);
-    while (v_curr.ptr < i_end0_curr) {
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_add_epi8(v_x128, v_a128);
-      v_a128 = v_x128;
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 4;
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_add_epi8(v_x128, v_a128);
-      v_a128 = v_x128;
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 4;
-    }
-    v_curr.len = 4;
-    uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-    while (v_curr.ptr < i_end1_curr) {
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_add_epi8(v_x128, v_a128);
-      v_a128 = v_x128;
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 4;
-    }
-    v_curr.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_sse42
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_sse42
-// -------- func png.decoder.filter_3_distance_4_x86_sse42
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_3_distance_4_x86_sse42(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  __m128i v_x128 = {0};
-  __m128i v_a128 = {0};
-  __m128i v_b128 = {0};
-  __m128i v_p128 = {0};
-  __m128i v_k128 = {0};
-
-  if (((uint64_t)(a_prev.len)) == 0u) {
-    v_k128 = _mm_set1_epi8((int8_t)(254u));
-    {
-      wuffs_base__slice_u8 i_slice_curr = a_curr;
-      v_curr.ptr = i_slice_curr.ptr;
-      v_curr.len = 4;
-      uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 8) * 8);
-      while (v_curr.ptr < i_end0_curr) {
-        v_p128 = _mm_avg_epu8(_mm_and_si128(v_a128, v_k128), v_b128);
-        v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_x128 = _mm_add_epi8(v_x128, v_p128);
-        v_a128 = v_x128;
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-        v_curr.ptr += 4;
-        v_p128 = _mm_avg_epu8(_mm_and_si128(v_a128, v_k128), v_b128);
-        v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_x128 = _mm_add_epi8(v_x128, v_p128);
-        v_a128 = v_x128;
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-        v_curr.ptr += 4;
-      }
-      v_curr.len = 4;
-      uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-      while (v_curr.ptr < i_end1_curr) {
-        v_p128 = _mm_avg_epu8(_mm_and_si128(v_a128, v_k128), v_b128);
-        v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_x128 = _mm_add_epi8(v_x128, v_p128);
-        v_a128 = v_x128;
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-        v_curr.ptr += 4;
-      }
-      v_curr.len = 0;
-    }
-  } else {
-    v_k128 = _mm_set1_epi8((int8_t)(1u));
-    {
-      wuffs_base__slice_u8 i_slice_curr = a_curr;
-      v_curr.ptr = i_slice_curr.ptr;
-      wuffs_base__slice_u8 i_slice_prev = a_prev;
-      v_prev.ptr = i_slice_prev.ptr;
-      i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-      v_curr.len = 4;
-      v_prev.len = 4;
-      uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 8) * 8);
-      while (v_curr.ptr < i_end0_curr) {
-        v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-        v_p128 = _mm_avg_epu8(v_a128, v_b128);
-        v_p128 = _mm_sub_epi8(v_p128, _mm_and_si128(v_k128, _mm_xor_si128(v_a128, v_b128)));
-        v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_x128 = _mm_add_epi8(v_x128, v_p128);
-        v_a128 = v_x128;
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-        v_curr.ptr += 4;
-        v_prev.ptr += 4;
-        v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-        v_p128 = _mm_avg_epu8(v_a128, v_b128);
-        v_p128 = _mm_sub_epi8(v_p128, _mm_and_si128(v_k128, _mm_xor_si128(v_a128, v_b128)));
-        v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_x128 = _mm_add_epi8(v_x128, v_p128);
-        v_a128 = v_x128;
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-        v_curr.ptr += 4;
-        v_prev.ptr += 4;
-      }
-      v_curr.len = 4;
-      v_prev.len = 4;
-      uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-      while (v_curr.ptr < i_end1_curr) {
-        v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-        v_p128 = _mm_avg_epu8(v_a128, v_b128);
-        v_p128 = _mm_sub_epi8(v_p128, _mm_and_si128(v_k128, _mm_xor_si128(v_a128, v_b128)));
-        v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-        v_x128 = _mm_add_epi8(v_x128, v_p128);
-        v_a128 = v_x128;
-        wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-        v_curr.ptr += 4;
-        v_prev.ptr += 4;
-      }
-      v_curr.len = 0;
-      v_prev.len = 0;
-    }
-  }
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_sse42
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_sse42
-// -------- func png.decoder.filter_4_distance_3_x86_sse42
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_3_x86_sse42(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  __m128i v_x128 = {0};
-  __m128i v_a128 = {0};
-  __m128i v_b128 = {0};
-  __m128i v_c128 = {0};
-  __m128i v_p128 = {0};
-  __m128i v_pa128 = {0};
-  __m128i v_pb128 = {0};
-  __m128i v_pc128 = {0};
-  __m128i v_smallest128 = {0};
-  __m128i v_z128 = {0};
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    wuffs_base__slice_u8 i_slice_prev = a_prev;
-    v_prev.ptr = i_slice_prev.ptr;
-    i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-    v_curr.len = 4;
-    v_prev.len = 4;
-    uint8_t* i_end0_curr = v_curr.ptr + wuffs_base__iterate_total_advance((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)), 7, 6);
-    while (v_curr.ptr < i_end0_curr) {
-      v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_b128 = _mm_unpacklo_epi8(v_b128, v_z128);
-      v_pa128 = _mm_sub_epi16(v_b128, v_c128);
-      v_pb128 = _mm_sub_epi16(v_a128, v_c128);
-      v_pc128 = _mm_add_epi16(v_pa128, v_pb128);
-      v_pa128 = _mm_abs_epi16(v_pa128);
-      v_pb128 = _mm_abs_epi16(v_pb128);
-      v_pc128 = _mm_abs_epi16(v_pc128);
-      v_smallest128 = _mm_min_epi16(v_pc128, _mm_min_epi16(v_pb128, v_pa128));
-      v_p128 = _mm_blendv_epi8(_mm_blendv_epi8(v_c128, v_b128, _mm_cmpeq_epi16(v_smallest128, v_pb128)), v_a128, _mm_cmpeq_epi16(v_smallest128, v_pa128));
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_unpacklo_epi8(v_x128, v_z128);
-      v_x128 = _mm_add_epi8(v_x128, v_p128);
-      v_a128 = v_x128;
-      v_c128 = v_b128;
-      v_x128 = _mm_packus_epi16(v_x128, v_x128);
-      wuffs_base__poke_u24le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 3;
-      v_prev.ptr += 3;
-      v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_b128 = _mm_unpacklo_epi8(v_b128, v_z128);
-      v_pa128 = _mm_sub_epi16(v_b128, v_c128);
-      v_pb128 = _mm_sub_epi16(v_a128, v_c128);
-      v_pc128 = _mm_add_epi16(v_pa128, v_pb128);
-      v_pa128 = _mm_abs_epi16(v_pa128);
-      v_pb128 = _mm_abs_epi16(v_pb128);
-      v_pc128 = _mm_abs_epi16(v_pc128);
-      v_smallest128 = _mm_min_epi16(v_pc128, _mm_min_epi16(v_pb128, v_pa128));
-      v_p128 = _mm_blendv_epi8(_mm_blendv_epi8(v_c128, v_b128, _mm_cmpeq_epi16(v_smallest128, v_pb128)), v_a128, _mm_cmpeq_epi16(v_smallest128, v_pa128));
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_unpacklo_epi8(v_x128, v_z128);
-      v_x128 = _mm_add_epi8(v_x128, v_p128);
-      v_a128 = v_x128;
-      v_c128 = v_b128;
-      v_x128 = _mm_packus_epi16(v_x128, v_x128);
-      wuffs_base__poke_u24le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 3;
-      v_prev.ptr += 3;
-    }
-    v_curr.len = 4;
-    v_prev.len = 4;
-    uint8_t* i_end1_curr = v_curr.ptr + wuffs_base__iterate_total_advance((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)), 4, 3);
-    while (v_curr.ptr < i_end1_curr) {
-      v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_b128 = _mm_unpacklo_epi8(v_b128, v_z128);
-      v_pa128 = _mm_sub_epi16(v_b128, v_c128);
-      v_pb128 = _mm_sub_epi16(v_a128, v_c128);
-      v_pc128 = _mm_add_epi16(v_pa128, v_pb128);
-      v_pa128 = _mm_abs_epi16(v_pa128);
-      v_pb128 = _mm_abs_epi16(v_pb128);
-      v_pc128 = _mm_abs_epi16(v_pc128);
-      v_smallest128 = _mm_min_epi16(v_pc128, _mm_min_epi16(v_pb128, v_pa128));
-      v_p128 = _mm_blendv_epi8(_mm_blendv_epi8(v_c128, v_b128, _mm_cmpeq_epi16(v_smallest128, v_pb128)), v_a128, _mm_cmpeq_epi16(v_smallest128, v_pa128));
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_unpacklo_epi8(v_x128, v_z128);
-      v_x128 = _mm_add_epi8(v_x128, v_p128);
-      v_a128 = v_x128;
-      v_c128 = v_b128;
-      v_x128 = _mm_packus_epi16(v_x128, v_x128);
-      wuffs_base__poke_u24le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 3;
-      v_prev.ptr += 3;
-    }
-    v_curr.len = 3;
-    v_prev.len = 3;
-    uint8_t* i_end2_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 3) * 3);
-    while (v_curr.ptr < i_end2_curr) {
-      v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u24le__no_bounds_check(v_prev.ptr)));
-      v_b128 = _mm_unpacklo_epi8(v_b128, v_z128);
-      v_pa128 = _mm_sub_epi16(v_b128, v_c128);
-      v_pb128 = _mm_sub_epi16(v_a128, v_c128);
-      v_pc128 = _mm_add_epi16(v_pa128, v_pb128);
-      v_pa128 = _mm_abs_epi16(v_pa128);
-      v_pb128 = _mm_abs_epi16(v_pb128);
-      v_pc128 = _mm_abs_epi16(v_pc128);
-      v_smallest128 = _mm_min_epi16(v_pc128, _mm_min_epi16(v_pb128, v_pa128));
-      v_p128 = _mm_blendv_epi8(_mm_blendv_epi8(v_c128, v_b128, _mm_cmpeq_epi16(v_smallest128, v_pb128)), v_a128, _mm_cmpeq_epi16(v_smallest128, v_pa128));
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u24le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_unpacklo_epi8(v_x128, v_z128);
-      v_x128 = _mm_add_epi8(v_x128, v_p128);
-      v_x128 = _mm_packus_epi16(v_x128, v_x128);
-      wuffs_base__poke_u24le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 3;
-      v_prev.ptr += 3;
-    }
-    v_curr.len = 0;
-    v_prev.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_sse42
-
-// ‼ WUFFS MULTI-FILE SECTION +x86_sse42
-// -------- func png.decoder.filter_4_distance_4_x86_sse42
-
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__filter_4_distance_4_x86_sse42(
-    wuffs_png__decoder* self,
-    wuffs_base__slice_u8 a_curr,
-    wuffs_base__slice_u8 a_prev) {
-  wuffs_base__slice_u8 v_curr = {0};
-  wuffs_base__slice_u8 v_prev = {0};
-  __m128i v_x128 = {0};
-  __m128i v_a128 = {0};
-  __m128i v_b128 = {0};
-  __m128i v_c128 = {0};
-  __m128i v_p128 = {0};
-  __m128i v_pa128 = {0};
-  __m128i v_pb128 = {0};
-  __m128i v_pc128 = {0};
-  __m128i v_smallest128 = {0};
-  __m128i v_z128 = {0};
-
-  {
-    wuffs_base__slice_u8 i_slice_curr = a_curr;
-    v_curr.ptr = i_slice_curr.ptr;
-    wuffs_base__slice_u8 i_slice_prev = a_prev;
-    v_prev.ptr = i_slice_prev.ptr;
-    i_slice_curr.len = ((size_t)(wuffs_base__u64__min(i_slice_curr.len, i_slice_prev.len)));
-    v_curr.len = 4;
-    v_prev.len = 4;
-    uint8_t* i_end0_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 8) * 8);
-    while (v_curr.ptr < i_end0_curr) {
-      v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_b128 = _mm_unpacklo_epi8(v_b128, v_z128);
-      v_pa128 = _mm_sub_epi16(v_b128, v_c128);
-      v_pb128 = _mm_sub_epi16(v_a128, v_c128);
-      v_pc128 = _mm_add_epi16(v_pa128, v_pb128);
-      v_pa128 = _mm_abs_epi16(v_pa128);
-      v_pb128 = _mm_abs_epi16(v_pb128);
-      v_pc128 = _mm_abs_epi16(v_pc128);
-      v_smallest128 = _mm_min_epi16(v_pc128, _mm_min_epi16(v_pb128, v_pa128));
-      v_p128 = _mm_blendv_epi8(_mm_blendv_epi8(v_c128, v_b128, _mm_cmpeq_epi16(v_smallest128, v_pb128)), v_a128, _mm_cmpeq_epi16(v_smallest128, v_pa128));
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_unpacklo_epi8(v_x128, v_z128);
-      v_x128 = _mm_add_epi8(v_x128, v_p128);
-      v_a128 = v_x128;
-      v_c128 = v_b128;
-      v_x128 = _mm_packus_epi16(v_x128, v_x128);
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 4;
-      v_prev.ptr += 4;
-      v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_b128 = _mm_unpacklo_epi8(v_b128, v_z128);
-      v_pa128 = _mm_sub_epi16(v_b128, v_c128);
-      v_pb128 = _mm_sub_epi16(v_a128, v_c128);
-      v_pc128 = _mm_add_epi16(v_pa128, v_pb128);
-      v_pa128 = _mm_abs_epi16(v_pa128);
-      v_pb128 = _mm_abs_epi16(v_pb128);
-      v_pc128 = _mm_abs_epi16(v_pc128);
-      v_smallest128 = _mm_min_epi16(v_pc128, _mm_min_epi16(v_pb128, v_pa128));
-      v_p128 = _mm_blendv_epi8(_mm_blendv_epi8(v_c128, v_b128, _mm_cmpeq_epi16(v_smallest128, v_pb128)), v_a128, _mm_cmpeq_epi16(v_smallest128, v_pa128));
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_unpacklo_epi8(v_x128, v_z128);
-      v_x128 = _mm_add_epi8(v_x128, v_p128);
-      v_a128 = v_x128;
-      v_c128 = v_b128;
-      v_x128 = _mm_packus_epi16(v_x128, v_x128);
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 4;
-      v_prev.ptr += 4;
-    }
-    v_curr.len = 4;
-    v_prev.len = 4;
-    uint8_t* i_end1_curr = v_curr.ptr + (((i_slice_curr.len - (size_t)(v_curr.ptr - i_slice_curr.ptr)) / 4) * 4);
-    while (v_curr.ptr < i_end1_curr) {
-      v_b128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_prev.ptr)));
-      v_b128 = _mm_unpacklo_epi8(v_b128, v_z128);
-      v_pa128 = _mm_sub_epi16(v_b128, v_c128);
-      v_pb128 = _mm_sub_epi16(v_a128, v_c128);
-      v_pc128 = _mm_add_epi16(v_pa128, v_pb128);
-      v_pa128 = _mm_abs_epi16(v_pa128);
-      v_pb128 = _mm_abs_epi16(v_pb128);
-      v_pc128 = _mm_abs_epi16(v_pc128);
-      v_smallest128 = _mm_min_epi16(v_pc128, _mm_min_epi16(v_pb128, v_pa128));
-      v_p128 = _mm_blendv_epi8(_mm_blendv_epi8(v_c128, v_b128, _mm_cmpeq_epi16(v_smallest128, v_pb128)), v_a128, _mm_cmpeq_epi16(v_smallest128, v_pa128));
-      v_x128 = _mm_cvtsi32_si128((int32_t)(wuffs_base__peek_u32le__no_bounds_check(v_curr.ptr)));
-      v_x128 = _mm_unpacklo_epi8(v_x128, v_z128);
-      v_x128 = _mm_add_epi8(v_x128, v_p128);
-      v_a128 = v_x128;
-      v_c128 = v_b128;
-      v_x128 = _mm_packus_epi16(v_x128, v_x128);
-      wuffs_base__poke_u32le__no_bounds_check(v_curr.ptr, ((uint32_t)(_mm_cvtsi128_si32(v_x128))));
-      v_curr.ptr += 4;
-      v_prev.ptr += 4;
-    }
-    v_curr.len = 0;
-    v_prev.len = 0;
-  }
-  return wuffs_base__make_empty_struct();
-}
-#endif  // defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-// ‼ WUFFS MULTI-FILE SECTION -x86_sse42
-
-// -------- func png.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_png__decoder__get_quirk(
-    const wuffs_png__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if ((a_key == 1u) && self->private_impl.f_ignore_checksum) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func png.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__set_quirk(
-    wuffs_png__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (a_key == 1u) {
-    self->private_impl.f_ignore_checksum = (a_value > 0u);
-    wuffs_zlib__decoder__set_quirk(&self->private_data.f_zlib, a_key, a_value);
-    return wuffs_base__make_status(NULL);
-  }
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func png.decoder.decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__decode_image_config(
-    wuffs_png__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_png__decoder__do_decode_image_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_png__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func png.decoder.do_decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__do_decode_image_config(
-    wuffs_png__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint64_t v_magic = 0;
-  uint64_t v_mark = 0;
-  uint32_t v_checksum_have = 0;
-  uint32_t v_checksum_want = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config[0];
-  if (coro_susp_point) {
-    v_checksum_have = self->private_data.s_do_decode_image_config[0].v_checksum_have;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    } else if ( ! self->private_impl.f_seen_ihdr) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        uint64_t t_0;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 8)) {
-          t_0 = wuffs_base__peek_u64le__no_bounds_check(iop_a_src);
-          iop_a_src += 8;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_0;
-            if (num_bits_0 == 56) {
-              t_0 = ((uint64_t)(*scratch));
-              break;
-            }
-            num_bits_0 += 8u;
-            *scratch |= ((uint64_t)(num_bits_0)) << 56;
-          }
-        }
-        v_magic = t_0;
-      }
-      if (v_magic != 727905341920923785u) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_header);
-        goto exit;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-        uint64_t t_1;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 8)) {
-          t_1 = wuffs_base__peek_u64le__no_bounds_check(iop_a_src);
-          iop_a_src += 8;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_1 = ((uint32_t)(*scratch >> 56));
-            *scratch <<= 8;
-            *scratch >>= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1;
-            if (num_bits_1 == 56) {
-              t_1 = ((uint64_t)(*scratch));
-              break;
-            }
-            num_bits_1 += 8u;
-            *scratch |= ((uint64_t)(num_bits_1)) << 56;
-          }
-        }
-        v_magic = t_1;
-      }
-      if (v_magic != 5927942488114331648u) {
-        if (v_magic == 5278895250759221248u) {
-          status = wuffs_base__make_status(wuffs_png__error__unsupported_cgbi_extension);
-          goto exit;
-        }
-        status = wuffs_base__make_status(wuffs_png__error__bad_header);
-        goto exit;
-      }
-      self->private_impl.f_chunk_type_array[0u] = 73u;
-      self->private_impl.f_chunk_type_array[1u] = 72u;
-      self->private_impl.f_chunk_type_array[2u] = 68u;
-      self->private_impl.f_chunk_type_array[3u] = 82u;
-      wuffs_base__ignore_status(wuffs_crc32__ieee_hasher__initialize(&self->private_data.f_crc32,
-          sizeof (wuffs_crc32__ieee_hasher), WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
-      wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_crc32, wuffs_base__make_slice_u8(self->private_impl.f_chunk_type_array, 4));
-      while (true) {
-        v_mark = ((uint64_t)(iop_a_src - io0_a_src));
-        {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          wuffs_base__status t_2 = wuffs_png__decoder__decode_ihdr(self, a_src);
-          v_status = t_2;
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-        }
-        if ( ! self->private_impl.f_ignore_checksum) {
-          v_checksum_have = wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_crc32, wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_src - io0_a_src)), io0_a_src));
-        }
-        if (wuffs_base__status__is_ok(&v_status)) {
-          break;
-        }
-        status = v_status;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-        uint32_t t_3;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-          t_3 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-          iop_a_src += 4;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_3 = ((uint32_t)(*scratch & 0xFFu));
-            *scratch >>= 8;
-            *scratch <<= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_3);
-            if (num_bits_3 == 24) {
-              t_3 = ((uint32_t)(*scratch >> 32));
-              break;
-            }
-            num_bits_3 += 8u;
-            *scratch |= ((uint64_t)(num_bits_3));
-          }
-        }
-        v_checksum_want = t_3;
-      }
-      if ( ! self->private_impl.f_ignore_checksum && (v_checksum_have != v_checksum_want)) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_checksum);
-        goto exit;
-      }
-      self->private_impl.f_seen_ihdr = true;
-    } else if (self->private_impl.f_metadata_fourcc != 0u) {
-      self->private_impl.f_call_sequence = 16u;
-      status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
-      goto ok;
-    }
-    while (true) {
-      if (((uint64_t)(io2_a_src - iop_a_src)) < 8u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
-        continue;
-      }
-      self->private_impl.f_chunk_length = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-      self->private_impl.f_chunk_type = ((uint32_t)((wuffs_base__peek_u64le__no_bounds_check(iop_a_src) >> 32u)));
-      if (self->private_impl.f_chunk_type == 1413563465u) {
-        if ( ! self->private_impl.f_seen_actl || self->private_impl.f_seen_fctl) {
-          break;
-        }
-        self->private_impl.f_seen_idat = true;
-      } else if (self->private_impl.f_chunk_type == 1413571686u) {
-        if (self->private_impl.f_seen_idat && self->private_impl.f_seen_fctl) {
-          break;
-        }
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      }
-      iop_a_src += 8u;
-      if ( ! self->private_impl.f_ignore_checksum && ((self->private_impl.f_chunk_type & 32u) == 0u)) {
-        self->private_impl.f_chunk_type_array[0u] = ((uint8_t)((self->private_impl.f_chunk_type >> 0u)));
-        self->private_impl.f_chunk_type_array[1u] = ((uint8_t)((self->private_impl.f_chunk_type >> 8u)));
-        self->private_impl.f_chunk_type_array[2u] = ((uint8_t)((self->private_impl.f_chunk_type >> 16u)));
-        self->private_impl.f_chunk_type_array[3u] = ((uint8_t)((self->private_impl.f_chunk_type >> 24u)));
-        wuffs_base__ignore_status(wuffs_crc32__ieee_hasher__initialize(&self->private_data.f_crc32,
-            sizeof (wuffs_crc32__ieee_hasher), WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
-        wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_crc32, wuffs_base__make_slice_u8(self->private_impl.f_chunk_type_array, 4));
-      }
-      while (true) {
-        v_mark = ((uint64_t)(iop_a_src - io0_a_src));
-        {
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          wuffs_base__status t_4 = wuffs_png__decoder__decode_other_chunk(self, a_src, false);
-          v_status = t_4;
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-        }
-        if ( ! self->private_impl.f_ignore_checksum && ((self->private_impl.f_chunk_type & 32u) == 0u)) {
-          v_checksum_have = wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_crc32, wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_src - io0_a_src)), io0_a_src));
-        }
-        if (wuffs_base__status__is_ok(&v_status)) {
-          break;
-        }
-        status = v_status;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9);
-      }
-      if (self->private_impl.f_metadata_fourcc != 0u) {
-        self->private_impl.f_call_sequence = 16u;
-        status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
-        goto ok;
-      }
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-        uint32_t t_5;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-          t_5 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-          iop_a_src += 4;
-        } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-            uint32_t num_bits_5 = ((uint32_t)(*scratch & 0xFFu));
-            *scratch >>= 8;
-            *scratch <<= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_5);
-            if (num_bits_5 == 24) {
-              t_5 = ((uint32_t)(*scratch >> 32));
-              break;
-            }
-            num_bits_5 += 8u;
-            *scratch |= ((uint64_t)(num_bits_5));
-          }
-        }
-        v_checksum_want = t_5;
-      }
-      if ( ! self->private_impl.f_ignore_checksum && ((self->private_impl.f_chunk_type & 32u) == 0u) && (v_checksum_have != v_checksum_want)) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_checksum);
-        goto exit;
-      }
-    }
-    if ((self->private_impl.f_color_type == 3u) &&  ! self->private_impl.f_seen_plte) {
-      status = wuffs_base__make_status(wuffs_png__error__missing_palette);
-      goto exit;
-    }
-    self->private_impl.f_frame_config_io_position = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-    self->private_impl.f_first_config_io_position = self->private_impl.f_frame_config_io_position;
-    if (a_dst != NULL) {
-      wuffs_base__image_config__set(
-          a_dst,
-          self->private_impl.f_dst_pixfmt,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height,
-          self->private_impl.f_first_config_io_position,
-          ((self->private_impl.f_color_type <= 3u) &&  ! self->private_impl.f_seen_trns));
-    }
-    if ( ! self->private_impl.f_seen_actl) {
-      self->private_impl.f_num_animation_frames_value = 1u;
-      self->private_impl.f_first_rect_x0 = 0u;
-      self->private_impl.f_first_rect_y0 = 0u;
-      self->private_impl.f_first_rect_x1 = self->private_impl.f_width;
-      self->private_impl.f_first_rect_y1 = self->private_impl.f_height;
-      self->private_impl.f_first_duration = 0u;
-      self->private_impl.f_first_disposal = 0u;
-      self->private_impl.f_first_overwrite_instead_of_blend = false;
-    }
-    self->private_impl.f_call_sequence = 32u;
-
-    ok:
-    self->private_impl.p_do_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_decode_image_config[0].v_checksum_have = v_checksum_have;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_ihdr
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_ihdr(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_a32 = 0;
-  uint8_t v_a8 = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_ihdr[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint32_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_0 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_ihdr[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_ihdr[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-          if (num_bits_0 == 24) {
-            t_0 = ((uint32_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0));
-        }
-      }
-      v_a32 = t_0;
-    }
-    if ((v_a32 == 0u) || (v_a32 > 2147483647u)) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_header);
-      goto exit;
-    } else if (v_a32 > 16777215u) {
-      status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-      goto exit;
-    }
-    self->private_impl.f_width = v_a32;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      uint32_t t_1;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_1 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_ihdr[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_ihdr[0].scratch;
-          uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1);
-          if (num_bits_1 == 24) {
-            t_1 = ((uint32_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_1 += 8u;
-          *scratch |= ((uint64_t)(num_bits_1));
-        }
-      }
-      v_a32 = t_1;
-    }
-    if ((v_a32 == 0u) || (v_a32 > 2147483647u)) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_header);
-      goto exit;
-    } else if (v_a32 > 16777215u) {
-      status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-      goto exit;
-    }
-    self->private_impl.f_height = v_a32;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_2 = *iop_a_src++;
-      v_a8 = t_2;
-    }
-    if (v_a8 > 16u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_header);
-      goto exit;
-    }
-    self->private_impl.f_depth = v_a8;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_3 = *iop_a_src++;
-      v_a8 = t_3;
-    }
-    if ((v_a8 == 1u) || (v_a8 == 5u) || (v_a8 > 6u)) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_header);
-      goto exit;
-    }
-    self->private_impl.f_color_type = v_a8;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_4 = *iop_a_src++;
-      v_a8 = t_4;
-    }
-    if (v_a8 != 0u) {
-      status = wuffs_base__make_status(wuffs_png__error__unsupported_png_compression_method);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_5 = *iop_a_src++;
-      v_a8 = t_5;
-    }
-    if (v_a8 != 0u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_6 = *iop_a_src++;
-      v_a8 = t_6;
-    }
-    if (v_a8 == 0u) {
-      self->private_impl.f_interlace_pass = 0u;
-    } else if (v_a8 == 1u) {
-      self->private_impl.f_interlace_pass = 1u;
-      self->private_impl.choosy_filter_and_swizzle = (
-          &wuffs_png__decoder__filter_and_swizzle_tricky);
-    } else {
-      status = wuffs_base__make_status(wuffs_png__error__bad_header);
-      goto exit;
-    }
-    self->private_impl.f_filter_distance = 0u;
-    wuffs_png__decoder__assign_filter_distance(self);
-    if (self->private_impl.f_filter_distance == 0u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_header);
-      goto exit;
-    }
-    self->private_impl.f_overall_workbuf_length = (((uint64_t)(self->private_impl.f_height)) * (1u + wuffs_png__decoder__calculate_bytes_per_row(self, self->private_impl.f_width)));
-    wuffs_png__decoder__choose_filter_implementations(self);
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_ihdr[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_ihdr[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.assign_filter_distance
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__assign_filter_distance(
-    wuffs_png__decoder* self) {
-  if (self->private_impl.f_depth < 8u) {
-    if ((self->private_impl.f_depth != 1u) && (self->private_impl.f_depth != 2u) && (self->private_impl.f_depth != 4u)) {
-      return wuffs_base__make_empty_struct();
-    } else if (self->private_impl.f_color_type == 0u) {
-      self->private_impl.f_dst_pixfmt = 536870920u;
-      self->private_impl.f_src_pixfmt = 536870920u;
-    } else if (self->private_impl.f_color_type == 3u) {
-      self->private_impl.f_dst_pixfmt = 2198077448u;
-      self->private_impl.f_src_pixfmt = 2198077448u;
-    } else {
-      return wuffs_base__make_empty_struct();
-    }
-    self->private_impl.f_filter_distance = 1u;
-    self->private_impl.choosy_filter_and_swizzle = (
-        &wuffs_png__decoder__filter_and_swizzle_tricky);
-  } else if (self->private_impl.f_color_type == 0u) {
-    if (self->private_impl.f_depth == 8u) {
-      self->private_impl.f_dst_pixfmt = 536870920u;
-      self->private_impl.f_src_pixfmt = 536870920u;
-      self->private_impl.f_filter_distance = 1u;
-    } else if (self->private_impl.f_depth == 16u) {
-      if (self->private_impl.f_interlace_pass == 0u) {
-        self->private_impl.f_dst_pixfmt = 536870923u;
-        self->private_impl.f_src_pixfmt = 537919499u;
-      } else {
-        self->private_impl.f_dst_pixfmt = 2164308923u;
-        self->private_impl.f_src_pixfmt = 2164308923u;
-      }
-      self->private_impl.f_filter_distance = 2u;
-    }
-  } else if (self->private_impl.f_color_type == 2u) {
-    if (self->private_impl.f_depth == 8u) {
-      self->private_impl.f_dst_pixfmt = 2147485832u;
-      self->private_impl.f_src_pixfmt = 2684356744u;
-      self->private_impl.f_filter_distance = 3u;
-    } else if (self->private_impl.f_depth == 16u) {
-      self->private_impl.f_dst_pixfmt = 2164308923u;
-      self->private_impl.f_src_pixfmt = 2164308923u;
-      self->private_impl.f_filter_distance = 6u;
-      self->private_impl.choosy_filter_and_swizzle = (
-          &wuffs_png__decoder__filter_and_swizzle_tricky);
-    }
-  } else if (self->private_impl.f_color_type == 3u) {
-    if (self->private_impl.f_depth == 8u) {
-      self->private_impl.f_dst_pixfmt = 2198077448u;
-      self->private_impl.f_src_pixfmt = 2198077448u;
-      self->private_impl.f_filter_distance = 1u;
-    }
-  } else if (self->private_impl.f_color_type == 4u) {
-    if (self->private_impl.f_depth == 8u) {
-      self->private_impl.f_dst_pixfmt = 2164295816u;
-      self->private_impl.f_src_pixfmt = 2164295816u;
-      self->private_impl.f_filter_distance = 2u;
-      self->private_impl.choosy_filter_and_swizzle = (
-          &wuffs_png__decoder__filter_and_swizzle_tricky);
-    } else if (self->private_impl.f_depth == 16u) {
-      self->private_impl.f_dst_pixfmt = 2164308923u;
-      self->private_impl.f_src_pixfmt = 2164308923u;
-      self->private_impl.f_filter_distance = 4u;
-      self->private_impl.choosy_filter_and_swizzle = (
-          &wuffs_png__decoder__filter_and_swizzle_tricky);
-    }
-  } else if (self->private_impl.f_color_type == 6u) {
-    if (self->private_impl.f_depth == 8u) {
-      self->private_impl.f_dst_pixfmt = 2164295816u;
-      self->private_impl.f_src_pixfmt = 2701166728u;
-      self->private_impl.f_filter_distance = 4u;
-    } else if (self->private_impl.f_depth == 16u) {
-      self->private_impl.f_dst_pixfmt = 2164308923u;
-      self->private_impl.f_src_pixfmt = 2164308923u;
-      self->private_impl.f_filter_distance = 8u;
-      self->private_impl.choosy_filter_and_swizzle = (
-          &wuffs_png__decoder__filter_and_swizzle_tricky);
-    }
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.calculate_bytes_per_row
-
-WUFFS_BASE__GENERATED_C_CODE
-static uint64_t
-wuffs_png__decoder__calculate_bytes_per_row(
-    const wuffs_png__decoder* self,
-    uint32_t a_width) {
-  uint64_t v_bytes_per_channel = 0;
-
-  if (self->private_impl.f_depth == 1u) {
-    return ((uint64_t)(((a_width + 7u) / 8u)));
-  } else if (self->private_impl.f_depth == 2u) {
-    return ((uint64_t)(((a_width + 3u) / 4u)));
-  } else if (self->private_impl.f_depth == 4u) {
-    return ((uint64_t)(((a_width + 1u) / 2u)));
-  }
-  v_bytes_per_channel = ((uint64_t)((self->private_impl.f_depth >> 3u)));
-  return (((uint64_t)(a_width)) * v_bytes_per_channel * ((uint64_t)(WUFFS_PNG__NUM_CHANNELS[self->private_impl.f_color_type])));
-}
-
-// -------- func png.decoder.choose_filter_implementations
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__empty_struct
-wuffs_png__decoder__choose_filter_implementations(
-    wuffs_png__decoder* self) {
-  if (self->private_impl.f_filter_distance == 3u) {
-    self->private_impl.choosy_filter_1 = (
-        &wuffs_png__decoder__filter_1_distance_3_fallback);
-    self->private_impl.choosy_filter_3 = (
-        &wuffs_png__decoder__filter_3_distance_3_fallback);
-    self->private_impl.choosy_filter_4 = (
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-        wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_png__decoder__filter_4_distance_3_arm_neon :
-#endif
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-        wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_png__decoder__filter_4_distance_3_x86_sse42 :
-#endif
-        &wuffs_png__decoder__filter_4_distance_3_fallback);
-  } else if (self->private_impl.f_filter_distance == 4u) {
-    self->private_impl.choosy_filter_1 = (
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-        wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_png__decoder__filter_1_distance_4_arm_neon :
-#endif
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-        wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_png__decoder__filter_1_distance_4_x86_sse42 :
-#endif
-        &wuffs_png__decoder__filter_1_distance_4_fallback);
-    self->private_impl.choosy_filter_3 = (
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-        wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_png__decoder__filter_3_distance_4_arm_neon :
-#endif
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-        wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_png__decoder__filter_3_distance_4_x86_sse42 :
-#endif
-        &wuffs_png__decoder__filter_3_distance_4_fallback);
-    self->private_impl.choosy_filter_4 = (
-#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)
-        wuffs_base__cpu_arch__have_arm_neon() ? &wuffs_png__decoder__filter_4_distance_4_arm_neon :
-#endif
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-        wuffs_base__cpu_arch__have_x86_sse42() ? &wuffs_png__decoder__filter_4_distance_4_x86_sse42 :
-#endif
-        &wuffs_png__decoder__filter_4_distance_4_fallback);
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.decode_other_chunk
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_other_chunk(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    bool a_framy) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_other_chunk[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_chunk_type == 1163152464u) &&  ! a_framy) {
-      if (self->private_impl.f_seen_plte) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      } else if (self->private_impl.f_color_type == 3u) {
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        status = wuffs_png__decoder__decode_plte(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-      } else if ((self->private_impl.f_color_type == 2u) || (self->private_impl.f_color_type == 6u)) {
-      } else {
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      }
-      self->private_impl.f_seen_plte = true;
-    } else if ((self->private_impl.f_chunk_type & 32u) == 0u) {
-      if (self->private_impl.f_chunk_type != 1413563465u) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      }
-    }
-    if (self->private_impl.f_chunk_type == 1716082789u) {
-      if (self->private_impl.f_report_metadata_exif) {
-        if (self->private_impl.f_seen_exif) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-          goto exit;
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        status = wuffs_png__decoder__decode_exif(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-        self->private_impl.f_seen_exif = true;
-      }
-    } else if ((self->private_impl.f_chunk_type == 1951945833u) || (self->private_impl.f_chunk_type == 1951942004u) || (self->private_impl.f_chunk_type == 1951945850u)) {
-      if (self->private_impl.f_report_metadata_kvp) {
-        self->private_impl.f_metadata_flavor = 4u;
-        self->private_impl.f_metadata_fourcc = 1263947851u;
-        self->private_impl.f_metadata_x = 0u;
-        self->private_impl.f_metadata_y = 0u;
-        self->private_impl.f_metadata_z = 0u;
-      }
-    } else if ( ! a_framy) {
-      if (self->private_impl.f_chunk_type == 1280598881u) {
-        if (self->private_impl.f_seen_actl) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-          goto exit;
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-        status = wuffs_png__decoder__decode_actl(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-        self->private_impl.f_seen_actl = true;
-      } else if (self->private_impl.f_chunk_type == 1297238115u) {
-        if (self->private_impl.f_report_metadata_chrm) {
-          if (self->private_impl.f_seen_chrm) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-          status = wuffs_png__decoder__decode_chrm(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          self->private_impl.f_seen_chrm = true;
-        }
-      } else if (self->private_impl.f_chunk_type == 1280598886u) {
-        if (self->private_impl.f_seen_fctl) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-          goto exit;
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-        status = wuffs_png__decoder__decode_fctl(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-        self->private_impl.f_seen_fctl = true;
-      } else if (self->private_impl.f_chunk_type == 1095582055u) {
-        if (self->private_impl.f_report_metadata_gama) {
-          if (self->private_impl.f_seen_gama) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-          status = wuffs_png__decoder__decode_gama(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          self->private_impl.f_seen_gama = true;
-        }
-      } else if (self->private_impl.f_chunk_type == 1346585449u) {
-        if (self->private_impl.f_report_metadata_iccp) {
-          if (self->private_impl.f_seen_iccp) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-          status = wuffs_png__decoder__decode_iccp(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          self->private_impl.f_seen_iccp = true;
-        }
-      } else if (self->private_impl.f_chunk_type == 1111970419u) {
-        if (self->private_impl.f_report_metadata_srgb) {
-          if (self->private_impl.f_seen_srgb) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-          status = wuffs_png__decoder__decode_srgb(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          self->private_impl.f_seen_srgb = true;
-        }
-      } else if (self->private_impl.f_chunk_type == 1397641844u) {
-        if (self->private_impl.f_seen_trns || (self->private_impl.f_color_type > 3u) || ((self->private_impl.f_color_type == 3u) &&  ! self->private_impl.f_seen_plte)) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-          goto exit;
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-        status = wuffs_png__decoder__decode_trns(self, a_src);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-        self->private_impl.f_seen_trns = true;
-      }
-    }
-    if (self->private_impl.f_metadata_fourcc == 0u) {
-      self->private_data.s_decode_other_chunk[0].scratch = self->private_impl.f_chunk_length;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-      if (self->private_data.s_decode_other_chunk[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_decode_other_chunk[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_decode_other_chunk[0].scratch;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_other_chunk[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_other_chunk[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_actl
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_actl(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_actl[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_chunk_length != 8u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    } else if (self->private_impl.f_interlace_pass > 0u) {
-      status = wuffs_base__make_status(wuffs_png__error__unsupported_png_file);
-      goto exit;
-    }
-    self->private_impl.f_chunk_length = 0u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint32_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_0 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_actl[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_actl[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-          if (num_bits_0 == 24) {
-            t_0 = ((uint32_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0));
-        }
-      }
-      self->private_impl.f_num_animation_frames_value = t_0;
-    }
-    if (self->private_impl.f_num_animation_frames_value == 0u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      uint32_t t_1;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_1 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_actl[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_actl[0].scratch;
-          uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1);
-          if (num_bits_1 == 24) {
-            t_1 = ((uint32_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_1 += 8u;
-          *scratch |= ((uint64_t)(num_bits_1));
-        }
-      }
-      self->private_impl.f_num_animation_loops_value = t_1;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_actl[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_actl[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_chrm
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_chrm(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint64_t v_u = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_chrm[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_chunk_length != 32u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    self->private_impl.f_chunk_length = 0u;
-    self->private_impl.f_metadata_flavor = 5u;
-    self->private_impl.f_metadata_fourcc = 1128813133u;
-    self->private_impl.f_metadata_x = 0u;
-    self->private_impl.f_metadata_y = 0u;
-    self->private_impl.f_metadata_z = 0u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint64_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_0 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_chrm[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-          if (num_bits_0 == 24) {
-            t_0 = ((uint64_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0));
-        }
-      }
-      v_u = t_0;
-    }
-    self->private_impl.f_metadata_x |= ((16777215u & v_u) << 0u);
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      uint64_t t_1;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_1 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_chrm[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch;
-          uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1);
-          if (num_bits_1 == 24) {
-            t_1 = ((uint64_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_1 += 8u;
-          *scratch |= ((uint64_t)(num_bits_1));
-        }
-      }
-      v_u = t_1;
-    }
-    self->private_impl.f_metadata_x |= ((16777215u & v_u) << 24u);
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-      uint64_t t_2;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_2 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_chrm[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch;
-          uint32_t num_bits_2 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_2);
-          if (num_bits_2 == 24) {
-            t_2 = ((uint64_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_2 += 8u;
-          *scratch |= ((uint64_t)(num_bits_2));
-        }
-      }
-      v_u = t_2;
-    }
-    self->private_impl.f_metadata_x |= ((uint64_t)((16777215u & v_u) << 48u));
-    self->private_impl.f_metadata_y |= ((16777215u & v_u) >> 16u);
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-      uint64_t t_3;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_3 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_chrm[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch;
-          uint32_t num_bits_3 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_3);
-          if (num_bits_3 == 24) {
-            t_3 = ((uint64_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_3 += 8u;
-          *scratch |= ((uint64_t)(num_bits_3));
-        }
-      }
-      v_u = t_3;
-    }
-    self->private_impl.f_metadata_y |= ((16777215u & v_u) << 8u);
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-      uint64_t t_4;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_4 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_chrm[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch;
-          uint32_t num_bits_4 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_4);
-          if (num_bits_4 == 24) {
-            t_4 = ((uint64_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_4 += 8u;
-          *scratch |= ((uint64_t)(num_bits_4));
-        }
-      }
-      v_u = t_4;
-    }
-    self->private_impl.f_metadata_y |= ((16777215u & v_u) << 32u);
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
-      uint64_t t_5;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_5 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_chrm[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch;
-          uint32_t num_bits_5 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_5);
-          if (num_bits_5 == 24) {
-            t_5 = ((uint64_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_5 += 8u;
-          *scratch |= ((uint64_t)(num_bits_5));
-        }
-      }
-      v_u = t_5;
-    }
-    self->private_impl.f_metadata_y |= ((uint64_t)((16777215u & v_u) << 56u));
-    self->private_impl.f_metadata_z |= ((16777215u & v_u) >> 8u);
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13);
-      uint64_t t_6;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_6 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_chrm[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch;
-          uint32_t num_bits_6 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_6);
-          if (num_bits_6 == 24) {
-            t_6 = ((uint64_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_6 += 8u;
-          *scratch |= ((uint64_t)(num_bits_6));
-        }
-      }
-      v_u = t_6;
-    }
-    self->private_impl.f_metadata_z |= ((16777215u & v_u) << 16u);
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15);
-      uint64_t t_7;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_7 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_chrm[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_chrm[0].scratch;
-          uint32_t num_bits_7 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_7);
-          if (num_bits_7 == 24) {
-            t_7 = ((uint64_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_7 += 8u;
-          *scratch |= ((uint64_t)(num_bits_7));
-        }
-      }
-      v_u = t_7;
-    }
-    self->private_impl.f_metadata_z |= ((16777215u & v_u) << 40u);
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_chrm[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_chrm[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_exif
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_exif(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  if (self->private_impl.f_chunk_length < 4u) {
-    status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-    goto exit;
-  }
-  self->private_impl.f_metadata_flavor = 3u;
-  self->private_impl.f_metadata_fourcc = 1163413830u;
-  self->private_impl.f_metadata_x = 0u;
-  self->private_impl.f_metadata_y = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-  self->private_impl.f_metadata_z = wuffs_base__u64__sat_add(self->private_impl.f_metadata_y, ((uint64_t)(self->private_impl.f_chunk_length)));
-  self->private_impl.f_chunk_length = 0u;
-
-  goto ok;
-  ok:
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_fctl
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_fctl(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_x0 = 0;
-  uint32_t v_y0 = 0;
-  uint32_t v_x1 = 0;
-  uint32_t v_y1 = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_fctl[0];
-  if (coro_susp_point) {
-    v_x0 = self->private_data.s_decode_fctl[0].v_x0;
-    v_x1 = self->private_data.s_decode_fctl[0].v_x1;
-    v_y1 = self->private_data.s_decode_fctl[0].v_y1;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_chunk_length != 26u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    self->private_impl.f_chunk_length = 0u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint32_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_0 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_fctl[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_fctl[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-          if (num_bits_0 == 24) {
-            t_0 = ((uint32_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0));
-        }
-      }
-      v_x0 = t_0;
-    }
-    if (v_x0 != self->private_impl.f_next_animation_seq_num) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_animation_sequence_number);
-      goto exit;
-    } else if (self->private_impl.f_next_animation_seq_num >= 4294967295u) {
-      status = wuffs_base__make_status(wuffs_png__error__unsupported_png_file);
-      goto exit;
-    }
-    self->private_impl.f_next_animation_seq_num += 1u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      uint32_t t_1;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_1 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_fctl[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_fctl[0].scratch;
-          uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1);
-          if (num_bits_1 == 24) {
-            t_1 = ((uint32_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_1 += 8u;
-          *scratch |= ((uint64_t)(num_bits_1));
-        }
-      }
-      v_x1 = t_1;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-      uint32_t t_2;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_2 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_fctl[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_fctl[0].scratch;
-          uint32_t num_bits_2 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_2);
-          if (num_bits_2 == 24) {
-            t_2 = ((uint32_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_2 += 8u;
-          *scratch |= ((uint64_t)(num_bits_2));
-        }
-      }
-      v_y1 = t_2;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-      uint32_t t_3;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_3 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_fctl[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_fctl[0].scratch;
-          uint32_t num_bits_3 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_3);
-          if (num_bits_3 == 24) {
-            t_3 = ((uint32_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_3 += 8u;
-          *scratch |= ((uint64_t)(num_bits_3));
-        }
-      }
-      v_x0 = t_3;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-      uint32_t t_4;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_4 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_fctl[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_fctl[0].scratch;
-          uint32_t num_bits_4 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_4);
-          if (num_bits_4 == 24) {
-            t_4 = ((uint32_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_4 += 8u;
-          *scratch |= ((uint64_t)(num_bits_4));
-        }
-      }
-      v_y0 = t_4;
-    }
-    v_x1 += v_x0;
-    v_y1 += v_y0;
-    if ((v_x0 >= v_x1) ||
-        (v_x0 > self->private_impl.f_width) ||
-        (v_x1 > self->private_impl.f_width) ||
-        (v_y0 >= v_y1) ||
-        (v_y0 > self->private_impl.f_height) ||
-        (v_y1 > self->private_impl.f_height)) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    self->private_impl.f_frame_rect_x0 = v_x0;
-    self->private_impl.f_frame_rect_y0 = v_y0;
-    self->private_impl.f_frame_rect_x1 = v_x1;
-    self->private_impl.f_frame_rect_y1 = v_y1;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
-      uint32_t t_5;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_5 = ((uint32_t)(wuffs_base__peek_u16be__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_fctl[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_fctl[0].scratch;
-          uint32_t num_bits_5 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_5);
-          if (num_bits_5 == 8) {
-            t_5 = ((uint32_t)(*scratch >> 48));
-            break;
-          }
-          num_bits_5 += 8u;
-          *scratch |= ((uint64_t)(num_bits_5));
-        }
-      }
-      v_x0 = t_5;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13);
-      uint32_t t_6;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_6 = ((uint32_t)(wuffs_base__peek_u16be__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_decode_fctl[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_fctl[0].scratch;
-          uint32_t num_bits_6 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_6);
-          if (num_bits_6 == 8) {
-            t_6 = ((uint32_t)(*scratch >> 48));
-            break;
-          }
-          num_bits_6 += 8u;
-          *scratch |= ((uint64_t)(num_bits_6));
-        }
-      }
-      v_x1 = t_6;
-    }
-    if (v_x1 <= 0u) {
-      self->private_impl.f_frame_duration = (((uint64_t)(v_x0)) * 7056000u);
-    } else {
-      self->private_impl.f_frame_duration = ((((uint64_t)(v_x0)) * 705600000u) / ((uint64_t)(v_x1)));
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint32_t t_7 = *iop_a_src++;
-      v_x0 = t_7;
-    }
-    if (v_x0 == 0u) {
-      self->private_impl.f_frame_disposal = 0u;
-    } else if (v_x0 == 1u) {
-      self->private_impl.f_frame_disposal = 1u;
-    } else if (v_x0 == 2u) {
-      self->private_impl.f_frame_disposal = 2u;
-    } else {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint32_t t_8 = *iop_a_src++;
-      v_x0 = t_8;
-    }
-    if (v_x0 == 0u) {
-      self->private_impl.f_frame_overwrite_instead_of_blend = true;
-    } else if (v_x0 == 1u) {
-      self->private_impl.f_frame_overwrite_instead_of_blend = false;
-    } else {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    if (self->private_impl.f_num_decoded_frame_configs_value == 0u) {
-      self->private_impl.f_first_rect_x0 = self->private_impl.f_frame_rect_x0;
-      self->private_impl.f_first_rect_y0 = self->private_impl.f_frame_rect_y0;
-      self->private_impl.f_first_rect_x1 = self->private_impl.f_frame_rect_x1;
-      self->private_impl.f_first_rect_y1 = self->private_impl.f_frame_rect_y1;
-      self->private_impl.f_first_duration = self->private_impl.f_frame_duration;
-      self->private_impl.f_first_disposal = self->private_impl.f_frame_disposal;
-      self->private_impl.f_first_overwrite_instead_of_blend = self->private_impl.f_frame_overwrite_instead_of_blend;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_fctl[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_fctl[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_fctl[0].v_x0 = v_x0;
-  self->private_data.s_decode_fctl[0].v_x1 = v_x1;
-  self->private_data.s_decode_fctl[0].v_y1 = v_y1;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_gama
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_gama(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_gama[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_chunk_length != 4u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    self->private_impl.f_chunk_length = 0u;
-    self->private_impl.f_metadata_flavor = 5u;
-    self->private_impl.f_metadata_fourcc = 1195461953u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      uint64_t t_0;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-        t_0 = ((uint64_t)(wuffs_base__peek_u32be__no_bounds_check(iop_a_src)));
-        iop_a_src += 4;
-      } else {
-        self->private_data.s_decode_gama[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_decode_gama[0].scratch;
-          uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-          *scratch >>= 8;
-          *scratch <<= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-          if (num_bits_0 == 24) {
-            t_0 = ((uint64_t)(*scratch >> 32));
-            break;
-          }
-          num_bits_0 += 8u;
-          *scratch |= ((uint64_t)(num_bits_0));
-        }
-      }
-      self->private_impl.f_metadata_x = t_0;
-    }
-    self->private_impl.f_metadata_y = 0u;
-    self->private_impl.f_metadata_z = 0u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_gama[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_gama[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_iccp
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_iccp(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_iccp[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      if (self->private_impl.f_chunk_length <= 0u) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      }
-      self->private_impl.f_chunk_length -= 1u;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_0 = *iop_a_src++;
-        v_c = t_0;
-      }
-      if (v_c == 0u) {
-        break;
-      }
-    }
-    if (self->private_impl.f_chunk_length <= 0u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    self->private_impl.f_chunk_length -= 1u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_1 = *iop_a_src++;
-      v_c = t_1;
-    }
-    if (v_c != 0u) {
-      status = wuffs_base__make_status(wuffs_png__error__unsupported_png_compression_method);
-      goto exit;
-    }
-    self->private_impl.f_metadata_is_zlib_compressed = true;
-    self->private_impl.f_metadata_flavor = 4u;
-    self->private_impl.f_metadata_fourcc = 1229144912u;
-    self->private_impl.f_metadata_x = 0u;
-    self->private_impl.f_metadata_y = 0u;
-    self->private_impl.f_metadata_z = 0u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_iccp[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_iccp[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_plte
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_plte(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_num_entries = 0;
-  uint32_t v_i = 0;
-  uint32_t v_argb = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_plte[0];
-  if (coro_susp_point) {
-    v_num_entries = self->private_data.s_decode_plte[0].v_num_entries;
-    v_i = self->private_data.s_decode_plte[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_chunk_length > 768u) || ((self->private_impl.f_chunk_length % 3u) != 0u)) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    v_num_entries = (((uint32_t)(self->private_impl.f_chunk_length)) / 3u);
-    self->private_impl.f_chunk_length = 0u;
-    while (v_i < v_num_entries) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        uint32_t t_0;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 3)) {
-          t_0 = ((uint32_t)(wuffs_base__peek_u24be__no_bounds_check(iop_a_src)));
-          iop_a_src += 3;
-        } else {
-          self->private_data.s_decode_plte[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_decode_plte[0].scratch;
-            uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-            *scratch >>= 8;
-            *scratch <<= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-            if (num_bits_0 == 16) {
-              t_0 = ((uint32_t)(*scratch >> 40));
-              break;
-            }
-            num_bits_0 += 8u;
-            *scratch |= ((uint64_t)(num_bits_0));
-          }
-        }
-        v_argb = t_0;
-      }
-      v_argb |= 4278190080u;
-      self->private_data.f_src_palette[((4u * v_i) + 0u)] = ((uint8_t)((v_argb >> 0u)));
-      self->private_data.f_src_palette[((4u * v_i) + 1u)] = ((uint8_t)((v_argb >> 8u)));
-      self->private_data.f_src_palette[((4u * v_i) + 2u)] = ((uint8_t)((v_argb >> 16u)));
-      self->private_data.f_src_palette[((4u * v_i) + 3u)] = ((uint8_t)((v_argb >> 24u)));
-      v_i += 1u;
-    }
-    while (v_i < 256u) {
-      self->private_data.f_src_palette[((4u * v_i) + 0u)] = 0u;
-      self->private_data.f_src_palette[((4u * v_i) + 1u)] = 0u;
-      self->private_data.f_src_palette[((4u * v_i) + 2u)] = 0u;
-      self->private_data.f_src_palette[((4u * v_i) + 3u)] = 255u;
-      v_i += 1u;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_plte[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_plte[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_plte[0].v_num_entries = v_num_entries;
-  self->private_data.s_decode_plte[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_srgb
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_srgb(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_srgb[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_chunk_length != 1u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    self->private_impl.f_chunk_length = 0u;
-    self->private_impl.f_metadata_flavor = 5u;
-    self->private_impl.f_metadata_fourcc = 1397901122u;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint64_t t_0 = *iop_a_src++;
-      self->private_impl.f_metadata_x = t_0;
-    }
-    self->private_impl.f_metadata_y = 0u;
-    self->private_impl.f_metadata_z = 0u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_srgb[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_srgb[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_trns
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_trns(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_i = 0;
-  uint32_t v_n = 0;
-  uint64_t v_u = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_trns[0];
-  if (coro_susp_point) {
-    v_i = self->private_data.s_decode_trns[0].v_i;
-    v_n = self->private_data.s_decode_trns[0].v_n;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_color_type == 0u) {
-      self->private_impl.choosy_filter_and_swizzle = (
-          &wuffs_png__decoder__filter_and_swizzle_tricky);
-      if (self->private_impl.f_depth <= 8u) {
-        self->private_impl.f_dst_pixfmt = 2164295816u;
-        self->private_impl.f_src_pixfmt = 2164295816u;
-      } else {
-        self->private_impl.f_dst_pixfmt = 2164308923u;
-        self->private_impl.f_src_pixfmt = 2164308923u;
-      }
-      if (self->private_impl.f_chunk_length != 2u) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      }
-      self->private_impl.f_chunk_length = 0u;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        uint64_t t_0;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-          t_0 = ((uint64_t)(wuffs_base__peek_u16be__no_bounds_check(iop_a_src)));
-          iop_a_src += 2;
-        } else {
-          self->private_data.s_decode_trns[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_decode_trns[0].scratch;
-            uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-            *scratch >>= 8;
-            *scratch <<= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-            if (num_bits_0 == 8) {
-              t_0 = ((uint64_t)(*scratch >> 48));
-              break;
-            }
-            num_bits_0 += 8u;
-            *scratch |= ((uint64_t)(num_bits_0));
-          }
-        }
-        v_u = t_0;
-      }
-      if (self->private_impl.f_depth <= 1u) {
-        self->private_impl.f_remap_transparency = (((v_u & 1u) * 16777215u) | 4278190080u);
-      } else if (self->private_impl.f_depth <= 2u) {
-        self->private_impl.f_remap_transparency = (((v_u & 3u) * 5592405u) | 4278190080u);
-      } else if (self->private_impl.f_depth <= 4u) {
-        self->private_impl.f_remap_transparency = (((v_u & 15u) * 1118481u) | 4278190080u);
-      } else if (self->private_impl.f_depth <= 8u) {
-        self->private_impl.f_remap_transparency = (((v_u & 255u) * 65793u) | 4278190080u);
-      } else {
-        self->private_impl.f_remap_transparency = ((v_u * 4295032833u) | 18446462598732840960u);
-      }
-    } else if (self->private_impl.f_color_type == 2u) {
-      self->private_impl.choosy_filter_and_swizzle = (
-          &wuffs_png__decoder__filter_and_swizzle_tricky);
-      if (self->private_impl.f_depth <= 8u) {
-        self->private_impl.f_dst_pixfmt = 2164295816u;
-        self->private_impl.f_src_pixfmt = 2164295816u;
-      } else {
-        self->private_impl.f_dst_pixfmt = 2164308923u;
-        self->private_impl.f_src_pixfmt = 2164308923u;
-      }
-      if (self->private_impl.f_chunk_length != 6u) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      }
-      self->private_impl.f_chunk_length = 0u;
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-        uint64_t t_1;
-        if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 6)) {
-          t_1 = ((uint64_t)(wuffs_base__peek_u48be__no_bounds_check(iop_a_src)));
-          iop_a_src += 6;
-        } else {
-          self->private_data.s_decode_trns[0].scratch = 0;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-          while (true) {
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint64_t* scratch = &self->private_data.s_decode_trns[0].scratch;
-            uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFFu));
-            *scratch >>= 8;
-            *scratch <<= 8;
-            *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1);
-            if (num_bits_1 == 40) {
-              t_1 = ((uint64_t)(*scratch >> 16));
-              break;
-            }
-            num_bits_1 += 8u;
-            *scratch |= ((uint64_t)(num_bits_1));
-          }
-        }
-        v_u = t_1;
-      }
-      if (self->private_impl.f_depth <= 8u) {
-        self->private_impl.f_remap_transparency = ((255u & (v_u >> 0u)) |
-            (65280u & (v_u >> 8u)) |
-            (16711680u & (v_u >> 16u)) |
-            4278190080u);
-      } else {
-        self->private_impl.f_remap_transparency = (v_u | 18446462598732840960u);
-      }
-    } else if (self->private_impl.f_color_type == 3u) {
-      self->private_impl.f_dst_pixfmt = 2164523016u;
-      self->private_impl.f_src_pixfmt = 2164523016u;
-      if (self->private_impl.f_chunk_length > 256u) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      }
-      v_n = ((uint32_t)(self->private_impl.f_chunk_length));
-      self->private_impl.f_chunk_length = 0u;
-      while (v_i < v_n) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_2 = *iop_a_src++;
-          self->private_data.f_src_palette[((4u * v_i) + 3u)] = t_2;
-        }
-        v_i += 1u;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-
-    goto ok;
-    ok:
-    self->private_impl.p_decode_trns[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_trns[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_trns[0].v_i = v_i;
-  self->private_data.s_decode_trns[0].v_n = v_n;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__decode_frame_config(
-    wuffs_png__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 2)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_png__decoder__do_decode_frame_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_png__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 2 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func png.decoder.do_decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__do_decode_frame_config(
-    wuffs_png__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_checksum_have = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_call_sequence & 16u) != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    } else if (self->private_impl.f_call_sequence == 32u) {
-    } else if (self->private_impl.f_call_sequence < 32u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_png__decoder__do_decode_image_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else if (self->private_impl.f_call_sequence == 40u) {
-      if (self->private_impl.f_frame_config_io_position != wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)))) {
-        status = wuffs_base__make_status(wuffs_base__error__bad_restart);
-        goto exit;
-      }
-    } else if (self->private_impl.f_call_sequence == 64u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      status = wuffs_png__decoder__skip_frame(self, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (self->private_impl.f_metadata_fourcc != 0u) {
-      self->private_impl.f_call_sequence = 48u;
-      status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
-      goto ok;
-    }
-    if (self->private_impl.f_num_decoded_frame_configs_value == 0u) {
-      self->private_impl.f_frame_rect_x0 = self->private_impl.f_first_rect_x0;
-      self->private_impl.f_frame_rect_y0 = self->private_impl.f_first_rect_y0;
-      self->private_impl.f_frame_rect_x1 = self->private_impl.f_first_rect_x1;
-      self->private_impl.f_frame_rect_y1 = self->private_impl.f_first_rect_y1;
-      self->private_impl.f_frame_config_io_position = self->private_impl.f_first_config_io_position;
-      self->private_impl.f_frame_duration = self->private_impl.f_first_duration;
-      self->private_impl.f_frame_disposal = self->private_impl.f_first_disposal;
-      self->private_impl.f_frame_overwrite_instead_of_blend = self->private_impl.f_first_overwrite_instead_of_blend;
-    } else {
-      while (true) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          uint32_t t_0;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_0 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_do_decode_frame_config[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_do_decode_frame_config[0].scratch;
-              uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-              if (num_bits_0 == 24) {
-                t_0 = ((uint32_t)(*scratch >> 32));
-                break;
-              }
-              num_bits_0 += 8u;
-              *scratch |= ((uint64_t)(num_bits_0));
-            }
-          }
-          self->private_impl.f_chunk_length = t_0;
-        }
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-          uint32_t t_1;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_1 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_do_decode_frame_config[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_do_decode_frame_config[0].scratch;
-              uint32_t num_bits_1 = ((uint32_t)(*scratch >> 56));
-              *scratch <<= 8;
-              *scratch >>= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_1;
-              if (num_bits_1 == 24) {
-                t_1 = ((uint32_t)(*scratch));
-                break;
-              }
-              num_bits_1 += 8u;
-              *scratch |= ((uint64_t)(num_bits_1)) << 56;
-            }
-          }
-          self->private_impl.f_chunk_type = t_1;
-        }
-        if (self->private_impl.f_chunk_type == 1145980233u) {
-          if (self->private_impl.f_chunk_length != 0u) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-            uint32_t t_2;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_2 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_do_decode_frame_config[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_do_decode_frame_config[0].scratch;
-                uint32_t num_bits_2 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_2;
-                if (num_bits_2 == 24) {
-                  t_2 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_2 += 8u;
-                *scratch |= ((uint64_t)(num_bits_2)) << 56;
-              }
-            }
-            v_checksum_have = t_2;
-          }
-          if ( ! self->private_impl.f_ignore_checksum && (v_checksum_have != 2187346606u)) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_checksum);
-            goto exit;
-          }
-          self->private_impl.f_call_sequence = 96u;
-          status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-          goto ok;
-        } else if (self->private_impl.f_chunk_type == 1413571686u) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-          goto exit;
-        } else if (self->private_impl.f_chunk_type == 1280598886u) {
-          self->private_impl.f_frame_config_io_position = ((uint64_t)(wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src))) - 8u));
-          if (a_src) {
-            a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-          }
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-          status = wuffs_png__decoder__decode_fctl(self, a_src);
-          if (a_src) {
-            iop_a_src = a_src->data.ptr + a_src->meta.ri;
-          }
-          if (status.repr) {
-            goto suspend;
-          }
-          self->private_data.s_do_decode_frame_config[0].scratch = 4u;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-          if (self->private_data.s_do_decode_frame_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-            self->private_data.s_do_decode_frame_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-            iop_a_src = io2_a_src;
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          iop_a_src += self->private_data.s_do_decode_frame_config[0].scratch;
-          break;
-        }
-        if (a_src) {
-          a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-        }
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
-        status = wuffs_png__decoder__decode_other_chunk(self, a_src, true);
-        if (a_src) {
-          iop_a_src = a_src->data.ptr + a_src->meta.ri;
-        }
-        if (status.repr) {
-          goto suspend;
-        }
-        if (self->private_impl.f_metadata_fourcc != 0u) {
-          self->private_impl.f_call_sequence = 48u;
-          status = wuffs_base__make_status(wuffs_base__note__metadata_reported);
-          goto ok;
-        }
-        self->private_data.s_do_decode_frame_config[0].scratch = 4u;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12);
-        if (self->private_data.s_do_decode_frame_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-          self->private_data.s_do_decode_frame_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-          iop_a_src = io2_a_src;
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        iop_a_src += self->private_data.s_do_decode_frame_config[0].scratch;
-        self->private_impl.f_chunk_length = 0u;
-      }
-    }
-    if (a_dst != NULL) {
-      wuffs_base__frame_config__set(
-          a_dst,
-          wuffs_base__utility__make_rect_ie_u32(
-          self->private_impl.f_frame_rect_x0,
-          self->private_impl.f_frame_rect_y0,
-          self->private_impl.f_frame_rect_x1,
-          self->private_impl.f_frame_rect_y1),
-          ((wuffs_base__flicks)(self->private_impl.f_frame_duration)),
-          ((uint64_t)(self->private_impl.f_num_decoded_frame_configs_value)),
-          self->private_impl.f_frame_config_io_position,
-          self->private_impl.f_frame_disposal,
-          ((self->private_impl.f_color_type <= 3u) &&  ! self->private_impl.f_seen_trns),
-          self->private_impl.f_frame_overwrite_instead_of_blend,
-          0u);
-    }
-    wuffs_base__u32__sat_add_indirect(&self->private_impl.f_num_decoded_frame_configs_value, 1u);
-    self->private_impl.f_call_sequence = 64u;
-
-    ok:
-    self->private_impl.p_do_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.skip_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__skip_frame(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_seq_num = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_skip_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    self->private_impl.f_chunk_type_array[0u] = 0u;
-    self->private_impl.f_chunk_type_array[1u] = 0u;
-    self->private_impl.f_chunk_type_array[2u] = 0u;
-    self->private_impl.f_chunk_type_array[3u] = 0u;
-    while (true) {
-      if (((uint64_t)(io2_a_src - iop_a_src)) < 8u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-        continue;
-      }
-      self->private_impl.f_chunk_length = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-      self->private_impl.f_chunk_type = ((uint32_t)((wuffs_base__peek_u64le__no_bounds_check(iop_a_src) >> 32u)));
-      if (self->private_impl.f_chunk_type == 1413563465u) {
-        if (self->private_impl.f_chunk_type_array[0u] == 102u) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-          goto exit;
-        }
-        self->private_impl.f_chunk_type_array[0u] = 73u;
-        self->private_impl.f_chunk_type_array[1u] = 68u;
-        self->private_impl.f_chunk_type_array[2u] = 65u;
-        self->private_impl.f_chunk_type_array[3u] = 84u;
-      } else if (self->private_impl.f_chunk_type == 1413571686u) {
-        if (self->private_impl.f_chunk_type_array[0u] == 73u) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-          goto exit;
-        }
-        self->private_impl.f_chunk_type_array[0u] = 102u;
-        self->private_impl.f_chunk_type_array[1u] = 100u;
-        self->private_impl.f_chunk_type_array[2u] = 65u;
-        self->private_impl.f_chunk_type_array[3u] = 84u;
-        if (self->private_impl.f_chunk_length < 4u) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-          goto exit;
-        }
-        self->private_impl.f_chunk_length -= 4u;
-        iop_a_src += 8u;
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          uint32_t t_0;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_0 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_skip_frame[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_skip_frame[0].scratch;
-              uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-              if (num_bits_0 == 24) {
-                t_0 = ((uint32_t)(*scratch >> 32));
-                break;
-              }
-              num_bits_0 += 8u;
-              *scratch |= ((uint64_t)(num_bits_0));
-            }
-          }
-          v_seq_num = t_0;
-        }
-        if (v_seq_num != self->private_impl.f_next_animation_seq_num) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_animation_sequence_number);
-          goto exit;
-        } else if (self->private_impl.f_next_animation_seq_num >= 4294967295u) {
-          status = wuffs_base__make_status(wuffs_png__error__unsupported_png_file);
-          goto exit;
-        }
-        self->private_impl.f_next_animation_seq_num += 1u;
-        self->private_data.s_skip_frame[0].scratch = (((uint64_t)(self->private_impl.f_chunk_length)) + 4u);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-        if (self->private_data.s_skip_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-          self->private_data.s_skip_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-          iop_a_src = io2_a_src;
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        iop_a_src += self->private_data.s_skip_frame[0].scratch;
-        self->private_impl.f_chunk_length = 0u;
-        continue;
-      } else if (self->private_impl.f_chunk_type_array[0u] != 0u) {
-        break;
-      } else if (self->private_impl.f_chunk_type == 1280598886u) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      }
-      self->private_data.s_skip_frame[0].scratch = (((uint64_t)(self->private_impl.f_chunk_length)) + 12u);
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-      if (self->private_data.s_skip_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_skip_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_skip_frame[0].scratch;
-      self->private_impl.f_chunk_length = 0u;
-    }
-    wuffs_base__u32__sat_add_indirect(&self->private_impl.f_num_decoded_frames_value, 1u);
-    self->private_impl.f_call_sequence = 32u;
-
-    ok:
-    self->private_impl.p_skip_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_skip_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__decode_frame(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 3)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_png__decoder__do_decode_frame(self,
-            a_dst,
-            a_src,
-            a_blend,
-            a_workbuf,
-            a_opts);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_png__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 3 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func png.decoder.do_decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__do_decode_frame(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_seq_num = 0;
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-  uint32_t v_pass_width = 0;
-  uint32_t v_pass_height = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_call_sequence & 16u) != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    } else if (self->private_impl.f_call_sequence >= 96u) {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    } else if (self->private_impl.f_call_sequence != 64u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_png__decoder__do_decode_frame_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    }
-    while (true) {
-      if (((uint64_t)(io2_a_src - iop_a_src)) < 8u) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-        continue;
-      }
-      self->private_impl.f_chunk_length = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-      self->private_impl.f_chunk_type = ((uint32_t)((wuffs_base__peek_u64le__no_bounds_check(iop_a_src) >> 32u)));
-      if (self->private_impl.f_chunk_type == 1413563465u) {
-        self->private_impl.f_chunk_type_array[0u] = 73u;
-        self->private_impl.f_chunk_type_array[1u] = 68u;
-        self->private_impl.f_chunk_type_array[2u] = 65u;
-        self->private_impl.f_chunk_type_array[3u] = 84u;
-        iop_a_src += 8u;
-        if ( ! self->private_impl.f_ignore_checksum) {
-          wuffs_base__ignore_status(wuffs_crc32__ieee_hasher__initialize(&self->private_data.f_crc32,
-              sizeof (wuffs_crc32__ieee_hasher), WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
-          wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_crc32, wuffs_base__make_slice_u8(self->private_impl.f_chunk_type_array, 4));
-        }
-        break;
-      } else if (self->private_impl.f_chunk_type == 1413571686u) {
-        self->private_impl.f_chunk_type_array[0u] = 102u;
-        self->private_impl.f_chunk_type_array[1u] = 100u;
-        self->private_impl.f_chunk_type_array[2u] = 65u;
-        self->private_impl.f_chunk_type_array[3u] = 84u;
-        if (self->private_impl.f_chunk_length < 4u) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-          goto exit;
-        }
-        self->private_impl.f_chunk_length -= 4u;
-        iop_a_src += 8u;
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          uint32_t t_0;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_0 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_do_decode_frame[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_do_decode_frame[0].scratch;
-              uint32_t num_bits_0 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_0);
-              if (num_bits_0 == 24) {
-                t_0 = ((uint32_t)(*scratch >> 32));
-                break;
-              }
-              num_bits_0 += 8u;
-              *scratch |= ((uint64_t)(num_bits_0));
-            }
-          }
-          v_seq_num = t_0;
-        }
-        if (v_seq_num != self->private_impl.f_next_animation_seq_num) {
-          status = wuffs_base__make_status(wuffs_png__error__bad_animation_sequence_number);
-          goto exit;
-        } else if (self->private_impl.f_next_animation_seq_num >= 4294967295u) {
-          status = wuffs_base__make_status(wuffs_png__error__unsupported_png_file);
-          goto exit;
-        }
-        self->private_impl.f_next_animation_seq_num += 1u;
-        break;
-      } else if (self->private_impl.f_chunk_type == 1280598886u) {
-        status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-        goto exit;
-      }
-      self->private_data.s_do_decode_frame[0].scratch = (((uint64_t)(self->private_impl.f_chunk_length)) + 12u);
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-      if (self->private_data.s_do_decode_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_do_decode_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-        iop_a_src = io2_a_src;
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      iop_a_src += self->private_data.s_do_decode_frame[0].scratch;
-      self->private_impl.f_chunk_length = 0u;
-    }
-    if (self->private_impl.f_zlib_is_dirty) {
-      wuffs_base__ignore_status(wuffs_zlib__decoder__initialize(&self->private_data.f_zlib,
-          sizeof (wuffs_zlib__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
-      if (self->private_impl.f_ignore_checksum) {
-        wuffs_zlib__decoder__set_quirk(&self->private_data.f_zlib, 1u, 1u);
-      }
-    }
-    self->private_impl.f_zlib_is_dirty = true;
-    v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler,
-        wuffs_base__pixel_buffer__pixel_format(a_dst),
-        wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024)),
-        wuffs_base__utility__make_pixel_format(self->private_impl.f_src_pixfmt),
-        wuffs_base__make_slice_u8(self->private_data.f_src_palette, 1024),
-        a_blend);
-    if ( ! wuffs_base__status__is_ok(&v_status)) {
-      status = v_status;
-      if (wuffs_base__status__is_error(&status)) {
-        goto exit;
-      } else if (wuffs_base__status__is_suspension(&status)) {
-        status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-        goto exit;
-      }
-      goto ok;
-    }
-    self->private_impl.f_workbuf_hist_pos_base = 0u;
-    while (true) {
-      if (self->private_impl.f_chunk_type_array[0u] == 73u) {
-        v_pass_width = (16777215u & ((((uint32_t)(WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][1u])) + self->private_impl.f_width) >> WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][0u]));
-        v_pass_height = (16777215u & ((((uint32_t)(WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][4u])) + self->private_impl.f_height) >> WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][3u]));
-      } else {
-        v_pass_width = (16777215u & ((uint32_t)(self->private_impl.f_frame_rect_x1 - self->private_impl.f_frame_rect_x0)));
-        v_pass_height = (16777215u & ((uint32_t)(self->private_impl.f_frame_rect_y1 - self->private_impl.f_frame_rect_y0)));
-      }
-      if ((v_pass_width > 0u) && (v_pass_height > 0u)) {
-        self->private_impl.f_pass_bytes_per_row = wuffs_png__decoder__calculate_bytes_per_row(self, v_pass_width);
-        self->private_impl.f_pass_workbuf_length = (((uint64_t)(v_pass_height)) * (1u + self->private_impl.f_pass_bytes_per_row));
-        while (true) {
-          {
-            if (a_src) {
-              a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-            }
-            wuffs_base__status t_1 = wuffs_png__decoder__decode_pass(self, a_src, a_workbuf);
-            v_status = t_1;
-            if (a_src) {
-              iop_a_src = a_src->data.ptr + a_src->meta.ri;
-            }
-          }
-          if (wuffs_base__status__is_ok(&v_status)) {
-            break;
-          } else if (wuffs_base__status__is_error(&v_status) || ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed))) {
-            if (self->private_impl.f_workbuf_wi <= ((uint64_t)(a_workbuf.len))) {
-              wuffs_png__decoder__filter_and_swizzle(self, a_dst, wuffs_base__slice_u8__subslice_j(a_workbuf, self->private_impl.f_workbuf_wi));
-            }
-            if (v_status.repr == wuffs_base__suspension__short_read) {
-              status = wuffs_base__make_status(wuffs_png__error__truncated_input);
-              goto exit;
-            }
-          }
-          status = v_status;
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
-        }
-        v_status = wuffs_png__decoder__filter_and_swizzle(self, a_dst, a_workbuf);
-        if ( ! wuffs_base__status__is_ok(&v_status)) {
-          status = v_status;
-          if (wuffs_base__status__is_error(&status)) {
-            goto exit;
-          } else if (wuffs_base__status__is_suspension(&status)) {
-            status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-            goto exit;
-          }
-          goto ok;
-        }
-        self->private_impl.f_workbuf_hist_pos_base += self->private_impl.f_pass_workbuf_length;
-      }
-      if ((self->private_impl.f_interlace_pass == 0u) || (self->private_impl.f_interlace_pass >= 7u)) {
-        break;
-      }
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-      self->private_impl.f_interlace_pass += 1u;
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-    }
-    wuffs_base__u32__sat_add_indirect(&self->private_impl.f_num_decoded_frames_value, 1u);
-    self->private_impl.f_call_sequence = 32u;
-
-    ok:
-    self->private_impl.p_do_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.decode_pass
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__decode_pass(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__io_buffer u_w = wuffs_base__empty_io_buffer();
-  wuffs_base__io_buffer* v_w = &u_w;
-  uint8_t* iop_v_w WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io0_v_w WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_v_w WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_v_w WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint64_t v_w_mark = 0;
-  uint64_t v_r_mark = 0;
-  wuffs_base__status v_zlib_status = wuffs_base__make_status(NULL);
-  uint32_t v_checksum_have = 0;
-  uint32_t v_checksum_want = 0;
-  uint32_t v_seq_num = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_pass[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    self->private_impl.f_workbuf_wi = 0u;
-    while (true) {
-      if ((self->private_impl.f_workbuf_wi > self->private_impl.f_pass_workbuf_length) || (self->private_impl.f_pass_workbuf_length > ((uint64_t)(a_workbuf.len)))) {
-        status = wuffs_base__make_status(wuffs_base__error__bad_workbuf_length);
-        goto exit;
-      }
-      {
-        wuffs_base__io_buffer* o_0_v_w = v_w;
-        uint8_t *o_0_iop_v_w = iop_v_w;
-        uint8_t *o_0_io0_v_w = io0_v_w;
-        uint8_t *o_0_io1_v_w = io1_v_w;
-        uint8_t *o_0_io2_v_w = io2_v_w;
-        v_w = wuffs_base__io_writer__set(
-            &u_w,
-            &iop_v_w,
-            &io0_v_w,
-            &io1_v_w,
-            &io2_v_w,
-            wuffs_base__slice_u8__subslice_ij(a_workbuf,
-            self->private_impl.f_workbuf_wi,
-            self->private_impl.f_pass_workbuf_length),
-            ((uint64_t)(self->private_impl.f_workbuf_hist_pos_base + self->private_impl.f_workbuf_wi)));
-        {
-          const bool o_1_closed_a_src = a_src->meta.closed;
-          const uint8_t *o_1_io2_a_src = io2_a_src;
-          wuffs_base__io_reader__limit(&io2_a_src, iop_a_src,
-              ((uint64_t)(self->private_impl.f_chunk_length)));
-          if (a_src) {
-            size_t n = ((size_t)(io2_a_src - a_src->data.ptr));
-            a_src->meta.closed = a_src->meta.closed && (a_src->meta.wi <= n);
-            a_src->meta.wi = n;
-          }
-          v_w_mark = ((uint64_t)(iop_v_w - io0_v_w));
-          v_r_mark = ((uint64_t)(iop_a_src - io0_a_src));
-          {
-            u_w.meta.wi = ((size_t)(iop_v_w - u_w.data.ptr));
-            if (a_src) {
-              a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-            }
-            wuffs_base__status t_0 = wuffs_zlib__decoder__transform_io(&self->private_data.f_zlib, v_w, a_src, wuffs_base__utility__empty_slice_u8());
-            v_zlib_status = t_0;
-            iop_v_w = u_w.data.ptr + u_w.meta.wi;
-            if (a_src) {
-              iop_a_src = a_src->data.ptr + a_src->meta.ri;
-            }
-          }
-          if ( ! self->private_impl.f_ignore_checksum) {
-            wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_crc32, wuffs_base__io__since(v_r_mark, ((uint64_t)(iop_a_src - io0_a_src)), io0_a_src));
-          }
-          wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_chunk_length, ((uint32_t)(wuffs_base__io__count_since(v_r_mark, ((uint64_t)(iop_a_src - io0_a_src))))));
-          wuffs_base__u64__sat_add_indirect(&self->private_impl.f_workbuf_wi, wuffs_base__io__count_since(v_w_mark, ((uint64_t)(iop_v_w - io0_v_w))));
-          io2_a_src = o_1_io2_a_src;
-          if (a_src) {
-            a_src->meta.closed = o_1_closed_a_src;
-            a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
-          }
-        }
-        v_w = o_0_v_w;
-        iop_v_w = o_0_iop_v_w;
-        io0_v_w = o_0_io0_v_w;
-        io1_v_w = o_0_io1_v_w;
-        io2_v_w = o_0_io2_v_w;
-      }
-      if (wuffs_base__status__is_ok(&v_zlib_status)) {
-        if (self->private_impl.f_chunk_length > 0u) {
-          status = wuffs_base__make_status(wuffs_base__error__too_much_data);
-          goto exit;
-        }
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-          uint32_t t_1;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_1 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_decode_pass[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_decode_pass[0].scratch;
-              uint32_t num_bits_1 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_1);
-              if (num_bits_1 == 24) {
-                t_1 = ((uint32_t)(*scratch >> 32));
-                break;
-              }
-              num_bits_1 += 8u;
-              *scratch |= ((uint64_t)(num_bits_1));
-            }
-          }
-          v_checksum_want = t_1;
-        }
-        if ( ! self->private_impl.f_ignore_checksum && (self->private_impl.f_chunk_type_array[0u] == 73u)) {
-          v_checksum_have = wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_crc32, wuffs_base__utility__empty_slice_u8());
-          if (v_checksum_have != v_checksum_want) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_checksum);
-            goto exit;
-          }
-        }
-        break;
-      } else if (v_zlib_status.repr == wuffs_base__suspension__short_write) {
-        if ((1u <= self->private_impl.f_interlace_pass) && (self->private_impl.f_interlace_pass <= 6u)) {
-          break;
-        }
-        status = wuffs_base__make_status(wuffs_base__error__too_much_data);
-        goto exit;
-      } else if (v_zlib_status.repr != wuffs_base__suspension__short_read) {
-        status = v_zlib_status;
-        if (wuffs_base__status__is_error(&status)) {
-          goto exit;
-        } else if (wuffs_base__status__is_suspension(&status)) {
-          status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-          goto exit;
-        }
-        goto ok;
-      } else if (self->private_impl.f_chunk_length == 0u) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-          uint32_t t_2;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_2 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_decode_pass[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_decode_pass[0].scratch;
-              uint32_t num_bits_2 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_2);
-              if (num_bits_2 == 24) {
-                t_2 = ((uint32_t)(*scratch >> 32));
-                break;
-              }
-              num_bits_2 += 8u;
-              *scratch |= ((uint64_t)(num_bits_2));
-            }
-          }
-          v_checksum_want = t_2;
-        }
-        if ( ! self->private_impl.f_ignore_checksum && (self->private_impl.f_chunk_type_array[0u] == 73u)) {
-          v_checksum_have = wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_crc32, wuffs_base__utility__empty_slice_u8());
-          if (v_checksum_have != v_checksum_want) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_checksum);
-            goto exit;
-          }
-        }
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-          uint32_t t_3;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_3 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_decode_pass[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_decode_pass[0].scratch;
-              uint32_t num_bits_3 = ((uint32_t)(*scratch & 0xFFu));
-              *scratch >>= 8;
-              *scratch <<= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_3);
-              if (num_bits_3 == 24) {
-                t_3 = ((uint32_t)(*scratch >> 32));
-                break;
-              }
-              num_bits_3 += 8u;
-              *scratch |= ((uint64_t)(num_bits_3));
-            }
-          }
-          self->private_impl.f_chunk_length = t_3;
-        }
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-          uint32_t t_4;
-          if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-            t_4 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-            iop_a_src += 4;
-          } else {
-            self->private_data.s_decode_pass[0].scratch = 0;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-            while (true) {
-              if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              uint64_t* scratch = &self->private_data.s_decode_pass[0].scratch;
-              uint32_t num_bits_4 = ((uint32_t)(*scratch >> 56));
-              *scratch <<= 8;
-              *scratch >>= 8;
-              *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_4;
-              if (num_bits_4 == 24) {
-                t_4 = ((uint32_t)(*scratch));
-                break;
-              }
-              num_bits_4 += 8u;
-              *scratch |= ((uint64_t)(num_bits_4)) << 56;
-            }
-          }
-          self->private_impl.f_chunk_type = t_4;
-        }
-        if (self->private_impl.f_chunk_type_array[0u] == 73u) {
-          if (self->private_impl.f_chunk_type != 1413563465u) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          if ( ! self->private_impl.f_ignore_checksum) {
-            wuffs_base__ignore_status(wuffs_crc32__ieee_hasher__initialize(&self->private_data.f_crc32,
-                sizeof (wuffs_crc32__ieee_hasher), WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
-            wuffs_crc32__ieee_hasher__update_u32(&self->private_data.f_crc32, wuffs_base__make_slice_u8(self->private_impl.f_chunk_type_array, 4));
-          }
-        } else {
-          if ((self->private_impl.f_chunk_type != 1413571686u) || (self->private_impl.f_chunk_length < 4u)) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          self->private_impl.f_chunk_length -= 4u;
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-            uint32_t t_5;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_5 = wuffs_base__peek_u32be__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_decode_pass[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_decode_pass[0].scratch;
-                uint32_t num_bits_5 = ((uint32_t)(*scratch & 0xFFu));
-                *scratch >>= 8;
-                *scratch <<= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << (56 - num_bits_5);
-                if (num_bits_5 == 24) {
-                  t_5 = ((uint32_t)(*scratch >> 32));
-                  break;
-                }
-                num_bits_5 += 8u;
-                *scratch |= ((uint64_t)(num_bits_5));
-              }
-            }
-            v_seq_num = t_5;
-          }
-          if (v_seq_num != self->private_impl.f_next_animation_seq_num) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_animation_sequence_number);
-            goto exit;
-          } else if (self->private_impl.f_next_animation_seq_num >= 4294967295u) {
-            status = wuffs_base__make_status(wuffs_png__error__unsupported_png_file);
-            goto exit;
-          }
-          self->private_impl.f_next_animation_seq_num += 1u;
-        }
-        continue;
-      } else if (((uint64_t)(io2_a_src - iop_a_src)) > 0u) {
-        status = wuffs_base__make_status(wuffs_png__error__internal_error_zlib_decoder_did_not_exhaust_its_input);
-        goto exit;
-      }
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(11);
-    }
-    if (self->private_impl.f_workbuf_wi != self->private_impl.f_pass_workbuf_length) {
-      status = wuffs_base__make_status(wuffs_base__error__not_enough_data);
-      goto exit;
-    } else if (0u < ((uint64_t)(a_workbuf.len))) {
-      if (a_workbuf.ptr[0u] == 4u) {
-        a_workbuf.ptr[0u] = 1u;
-      }
-    }
-
-    ok:
-    self->private_impl.p_decode_pass[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_pass[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.frame_dirty_rect
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_png__decoder__frame_dirty_rect(
-    const wuffs_png__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-
-  return wuffs_base__utility__make_rect_ie_u32(
-      self->private_impl.f_frame_rect_x0,
-      self->private_impl.f_frame_rect_y0,
-      self->private_impl.f_frame_rect_x1,
-      self->private_impl.f_frame_rect_y1);
-}
-
-// -------- func png.decoder.num_animation_loops
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_png__decoder__num_animation_loops(
-    const wuffs_png__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return self->private_impl.f_num_animation_loops_value;
-}
-
-// -------- func png.decoder.num_decoded_frame_configs
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_png__decoder__num_decoded_frame_configs(
-    const wuffs_png__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return ((uint64_t)(self->private_impl.f_num_decoded_frame_configs_value));
-}
-
-// -------- func png.decoder.num_decoded_frames
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_png__decoder__num_decoded_frames(
-    const wuffs_png__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return ((uint64_t)(self->private_impl.f_num_decoded_frames_value));
-}
-
-// -------- func png.decoder.restart_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__restart_frame(
-    wuffs_png__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (self->private_impl.f_call_sequence < 32u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-  } else if ((a_index >= ((uint64_t)(self->private_impl.f_num_animation_frames_value))) || ((a_index == 0u) && (a_io_position != self->private_impl.f_first_config_io_position))) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  self->private_impl.f_call_sequence = 40u;
-  if (self->private_impl.f_interlace_pass >= 1u) {
-    self->private_impl.f_interlace_pass = 1u;
-  }
-  self->private_impl.f_frame_config_io_position = a_io_position;
-  self->private_impl.f_num_decoded_frame_configs_value = ((uint32_t)(a_index));
-  self->private_impl.f_num_decoded_frames_value = self->private_impl.f_num_decoded_frame_configs_value;
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func png.decoder.set_report_metadata
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_png__decoder__set_report_metadata(
-    wuffs_png__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report) {
-  if (!self) {
-    return wuffs_base__make_empty_struct();
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_empty_struct();
-  }
-
-  if (a_fourcc == 1128813133u) {
-    self->private_impl.f_report_metadata_chrm = a_report;
-  } else if (a_fourcc == 1163413830u) {
-    self->private_impl.f_report_metadata_exif = a_report;
-  } else if (a_fourcc == 1195461953u) {
-    self->private_impl.f_report_metadata_gama = a_report;
-  } else if (a_fourcc == 1229144912u) {
-    self->private_impl.f_report_metadata_iccp = a_report;
-  } else if (a_fourcc == 1263947808u) {
-    self->private_impl.f_report_metadata_kvp = a_report;
-  } else if (a_fourcc == 1397901122u) {
-    self->private_impl.f_report_metadata_srgb = a_report;
-  }
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func png.decoder.tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_png__decoder__tell_me_more(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 4)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_tell_me_more[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_png__decoder__do_tell_me_more(self, a_dst, a_minfo, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_png__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_tell_me_more[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_tell_me_more[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 4 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func png.decoder.do_tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__do_tell_me_more(
-    wuffs_png__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint16_t v_c2 = 0;
-  wuffs_base__io_buffer u_w = wuffs_base__empty_io_buffer();
-  wuffs_base__io_buffer* v_w = &u_w;
-  uint8_t* iop_v_w WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io0_v_w WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_v_w WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_v_w WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint64_t v_num_written = 0;
-  uint64_t v_w_mark = 0;
-  uint64_t v_r_mark = 0;
-  wuffs_base__status v_zlib_status = wuffs_base__make_status(NULL);
-
-  uint8_t* iop_a_dst = NULL;
-  uint8_t* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  uint8_t* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_dst && a_dst->data.ptr) {
-    io0_a_dst = a_dst->data.ptr;
-    io1_a_dst = io0_a_dst + a_dst->meta.wi;
-    iop_a_dst = io1_a_dst;
-    io2_a_dst = io0_a_dst + a_dst->data.len;
-    if (a_dst->meta.closed) {
-      io2_a_dst = iop_a_dst;
-    }
-  }
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_tell_me_more[0];
-  if (coro_susp_point) {
-    v_zlib_status = self->private_data.s_do_tell_me_more[0].v_zlib_status;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if ((self->private_impl.f_call_sequence & 16u) == 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    }
-    if (self->private_impl.f_metadata_fourcc == 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__no_more_information);
-      goto exit;
-    }
-    do {
-      if (self->private_impl.f_metadata_flavor == 3u) {
-        while (true) {
-          if (wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src))) != self->private_impl.f_metadata_y) {
-            status = wuffs_base__make_status(wuffs_base__error__bad_i_o_position);
-            goto exit;
-          } else if (a_minfo != NULL) {
-            wuffs_base__more_information__set(a_minfo,
-                self->private_impl.f_metadata_flavor,
-                self->private_impl.f_metadata_fourcc,
-                self->private_impl.f_metadata_x,
-                self->private_impl.f_metadata_y,
-                self->private_impl.f_metadata_z);
-          }
-          if (self->private_impl.f_metadata_y >= self->private_impl.f_metadata_z) {
-            goto label__goto_done__break;
-          }
-          self->private_impl.f_metadata_y = self->private_impl.f_metadata_z;
-          status = wuffs_base__make_status(wuffs_base__suspension__even_more_information);
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-        }
-      }
-      if (self->private_impl.f_metadata_is_zlib_compressed) {
-        if (self->private_impl.f_zlib_is_dirty) {
-          wuffs_base__ignore_status(wuffs_zlib__decoder__initialize(&self->private_data.f_zlib,
-              sizeof (wuffs_zlib__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
-          if (self->private_impl.f_ignore_checksum) {
-            wuffs_zlib__decoder__set_quirk(&self->private_data.f_zlib, 1u, 1u);
-          }
-        }
-        self->private_impl.f_zlib_is_dirty = true;
-        self->private_impl.f_ztxt_hist_pos = 0u;
-      }
-      label__loop__continue:;
-      while (true) {
-        if (a_minfo != NULL) {
-          wuffs_base__more_information__set(a_minfo,
-              self->private_impl.f_metadata_flavor,
-              self->private_impl.f_metadata_fourcc,
-              self->private_impl.f_metadata_x,
-              self->private_impl.f_metadata_y,
-              self->private_impl.f_metadata_z);
-        }
-        if (self->private_impl.f_metadata_flavor != 4u) {
-          break;
-        }
-        if (self->private_impl.f_metadata_is_zlib_compressed) {
-          if (self->private_impl.f_chunk_type == 1346585449u) {
-            {
-              const bool o_0_closed_a_src = a_src->meta.closed;
-              const uint8_t *o_0_io2_a_src = io2_a_src;
-              wuffs_base__io_reader__limit(&io2_a_src, iop_a_src,
-                  ((uint64_t)(self->private_impl.f_chunk_length)));
-              if (a_src) {
-                size_t n = ((size_t)(io2_a_src - a_src->data.ptr));
-                a_src->meta.closed = a_src->meta.closed && (a_src->meta.wi <= n);
-                a_src->meta.wi = n;
-              }
-              v_r_mark = ((uint64_t)(iop_a_src - io0_a_src));
-              {
-                if (a_dst) {
-                  a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-                }
-                if (a_src) {
-                  a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-                }
-                wuffs_base__status t_0 = wuffs_zlib__decoder__transform_io(&self->private_data.f_zlib, a_dst, a_src, wuffs_base__utility__empty_slice_u8());
-                v_zlib_status = t_0;
-                if (a_dst) {
-                  iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-                }
-                if (a_src) {
-                  iop_a_src = a_src->data.ptr + a_src->meta.ri;
-                }
-              }
-              wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_chunk_length, ((uint32_t)(wuffs_base__io__count_since(v_r_mark, ((uint64_t)(iop_a_src - io0_a_src))))));
-              io2_a_src = o_0_io2_a_src;
-              if (a_src) {
-                a_src->meta.closed = o_0_closed_a_src;
-                a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
-              }
-            }
-            if (wuffs_base__status__is_ok(&v_zlib_status)) {
-              self->private_impl.f_metadata_is_zlib_compressed = false;
-              break;
-            } else if ( ! wuffs_base__status__is_suspension(&v_zlib_status)) {
-              status = v_zlib_status;
-              if (wuffs_base__status__is_error(&status)) {
-                goto exit;
-              } else if (wuffs_base__status__is_suspension(&status)) {
-                status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-                goto exit;
-              }
-              goto ok;
-            }
-            status = v_zlib_status;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-          } else if (self->private_impl.f_chunk_type == 1951945833u) {
-            {
-              const bool o_1_closed_a_src = a_src->meta.closed;
-              const uint8_t *o_1_io2_a_src = io2_a_src;
-              wuffs_base__io_reader__limit(&io2_a_src, iop_a_src,
-                  ((uint64_t)(self->private_impl.f_chunk_length)));
-              if (a_src) {
-                size_t n = ((size_t)(io2_a_src - a_src->data.ptr));
-                a_src->meta.closed = a_src->meta.closed && (a_src->meta.wi <= n);
-                a_src->meta.wi = n;
-              }
-              v_r_mark = ((uint64_t)(iop_a_src - io0_a_src));
-              {
-                if (a_dst) {
-                  a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-                }
-                if (a_src) {
-                  a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-                }
-                wuffs_base__status t_1 = wuffs_zlib__decoder__transform_io(&self->private_data.f_zlib, a_dst, a_src, wuffs_base__utility__empty_slice_u8());
-                v_zlib_status = t_1;
-                if (a_dst) {
-                  iop_a_dst = a_dst->data.ptr + a_dst->meta.wi;
-                }
-                if (a_src) {
-                  iop_a_src = a_src->data.ptr + a_src->meta.ri;
-                }
-              }
-              wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_chunk_length, ((uint32_t)(wuffs_base__io__count_since(v_r_mark, ((uint64_t)(iop_a_src - io0_a_src))))));
-              io2_a_src = o_1_io2_a_src;
-              if (a_src) {
-                a_src->meta.closed = o_1_closed_a_src;
-                a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
-              }
-            }
-            if (wuffs_base__status__is_ok(&v_zlib_status)) {
-              self->private_impl.f_metadata_is_zlib_compressed = false;
-              break;
-            } else if ( ! wuffs_base__status__is_suspension(&v_zlib_status)) {
-              status = v_zlib_status;
-              if (wuffs_base__status__is_error(&status)) {
-                goto exit;
-              } else if (wuffs_base__status__is_suspension(&status)) {
-                status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-                goto exit;
-              }
-              goto ok;
-            }
-            status = v_zlib_status;
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-          } else if (self->private_impl.f_chunk_type == 1951945850u) {
-            if (self->private_impl.f_ztxt_ri == self->private_impl.f_ztxt_wi) {
-              {
-                wuffs_base__io_buffer* o_2_v_w = v_w;
-                uint8_t *o_2_iop_v_w = iop_v_w;
-                uint8_t *o_2_io0_v_w = io0_v_w;
-                uint8_t *o_2_io1_v_w = io1_v_w;
-                uint8_t *o_2_io2_v_w = io2_v_w;
-                v_w = wuffs_base__io_writer__set(
-                    &u_w,
-                    &iop_v_w,
-                    &io0_v_w,
-                    &io1_v_w,
-                    &io2_v_w,
-                    wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024),
-                    self->private_impl.f_ztxt_hist_pos);
-                {
-                  const bool o_3_closed_a_src = a_src->meta.closed;
-                  const uint8_t *o_3_io2_a_src = io2_a_src;
-                  wuffs_base__io_reader__limit(&io2_a_src, iop_a_src,
-                      ((uint64_t)(self->private_impl.f_chunk_length)));
-                  if (a_src) {
-                    size_t n = ((size_t)(io2_a_src - a_src->data.ptr));
-                    a_src->meta.closed = a_src->meta.closed && (a_src->meta.wi <= n);
-                    a_src->meta.wi = n;
-                  }
-                  v_w_mark = ((uint64_t)(iop_v_w - io0_v_w));
-                  v_r_mark = ((uint64_t)(iop_a_src - io0_a_src));
-                  {
-                    u_w.meta.wi = ((size_t)(iop_v_w - u_w.data.ptr));
-                    if (a_src) {
-                      a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-                    }
-                    wuffs_base__status t_2 = wuffs_zlib__decoder__transform_io(&self->private_data.f_zlib, v_w, a_src, wuffs_base__utility__empty_slice_u8());
-                    v_zlib_status = t_2;
-                    iop_v_w = u_w.data.ptr + u_w.meta.wi;
-                    if (a_src) {
-                      iop_a_src = a_src->data.ptr + a_src->meta.ri;
-                    }
-                  }
-                  wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_chunk_length, ((uint32_t)(wuffs_base__io__count_since(v_r_mark, ((uint64_t)(iop_a_src - io0_a_src))))));
-                  v_num_written = wuffs_base__io__count_since(v_w_mark, ((uint64_t)(iop_v_w - io0_v_w)));
-                  io2_a_src = o_3_io2_a_src;
-                  if (a_src) {
-                    a_src->meta.closed = o_3_closed_a_src;
-                    a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
-                  }
-                }
-                v_w = o_2_v_w;
-                iop_v_w = o_2_iop_v_w;
-                io0_v_w = o_2_io0_v_w;
-                io1_v_w = o_2_io1_v_w;
-                io2_v_w = o_2_io2_v_w;
-              }
-              if (v_num_written > 1024u) {
-                status = wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_i_o);
-                goto exit;
-              }
-              self->private_impl.f_ztxt_ri = 0u;
-              self->private_impl.f_ztxt_wi = ((uint32_t)(v_num_written));
-              wuffs_base__u64__sat_add_indirect(&self->private_impl.f_ztxt_hist_pos, v_num_written);
-            }
-            while (self->private_impl.f_ztxt_ri < self->private_impl.f_ztxt_wi) {
-              v_c2 = WUFFS_PNG__LATIN_1[self->private_data.f_dst_palette[self->private_impl.f_ztxt_ri]];
-              if (v_c2 == 0u) {
-                status = wuffs_base__make_status(wuffs_png__error__bad_text_chunk_not_latin_1);
-                goto exit;
-              } else if (v_c2 <= 127u) {
-                if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-                  WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
-                  goto label__loop__continue;
-                }
-                self->private_impl.f_ztxt_ri += 1u;
-                (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, ((uint8_t)(v_c2))), iop_a_dst += 1);
-              } else {
-                if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 1u) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-                  WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
-                  goto label__loop__continue;
-                }
-                self->private_impl.f_ztxt_ri += 1u;
-                (wuffs_base__poke_u16le__no_bounds_check(iop_a_dst, v_c2), iop_a_dst += 2);
-              }
-            }
-            if (wuffs_base__status__is_ok(&v_zlib_status)) {
-              self->private_impl.f_metadata_is_zlib_compressed = false;
-              break;
-            } else if ( ! wuffs_base__status__is_suspension(&v_zlib_status)) {
-              status = v_zlib_status;
-              if (wuffs_base__status__is_error(&status)) {
-                goto exit;
-              } else if (wuffs_base__status__is_suspension(&status)) {
-                status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-                goto exit;
-              }
-              goto ok;
-            } else if (v_zlib_status.repr != wuffs_base__suspension__short_write) {
-              status = v_zlib_status;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
-            }
-          } else {
-            status = wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_chunk_type);
-            goto exit;
-          }
-        } else if ((self->private_impl.f_chunk_type == 1951945833u) && (self->private_impl.f_metadata_fourcc == 1263947862u)) {
-          while (true) {
-            if (self->private_impl.f_chunk_length <= 0u) {
-              goto label__loop__break;
-            } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
-              goto label__loop__continue;
-            } else if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
-              goto label__loop__continue;
-            }
-            self->private_impl.f_chunk_length -= 1u;
-            v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-            iop_a_src += 1u;
-            (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, v_c), iop_a_dst += 1);
-          }
-        } else {
-          while (true) {
-            if (self->private_impl.f_chunk_length <= 0u) {
-              if (self->private_impl.f_metadata_fourcc == 1263947851u) {
-                status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-                goto exit;
-              }
-              goto label__loop__break;
-            } else if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9);
-              goto label__loop__continue;
-            }
-            v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-            if (v_c == 0u) {
-              self->private_impl.f_chunk_length -= 1u;
-              iop_a_src += 1u;
-              goto label__loop__break;
-            }
-            v_c2 = WUFFS_PNG__LATIN_1[v_c];
-            if (v_c2 == 0u) {
-              status = wuffs_base__make_status(wuffs_png__error__bad_text_chunk_not_latin_1);
-              goto exit;
-            } else if (v_c2 <= 127u) {
-              if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0u) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10);
-                goto label__loop__continue;
-              }
-              self->private_impl.f_chunk_length -= 1u;
-              iop_a_src += 1u;
-              (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, ((uint8_t)(v_c2))), iop_a_dst += 1);
-            } else {
-              if (((uint64_t)(io2_a_dst - iop_a_dst)) <= 1u) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_write);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(11);
-                goto label__loop__continue;
-              }
-              self->private_impl.f_chunk_length -= 1u;
-              iop_a_src += 1u;
-              (wuffs_base__poke_u16le__no_bounds_check(iop_a_dst, v_c2), iop_a_dst += 2);
-            }
-          }
-        }
-      }
-      label__loop__break:;
-      if (self->private_impl.f_metadata_fourcc == 1263947851u) {
-        self->private_impl.f_metadata_fourcc = 1263947862u;
-        if (self->private_impl.f_chunk_type == 1951945833u) {
-          if (self->private_impl.f_chunk_length <= 1u) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          self->private_impl.f_chunk_length -= 2u;
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_3 = *iop_a_src++;
-            v_c = t_3;
-          }
-          if (v_c == 0u) {
-            self->private_impl.f_metadata_is_zlib_compressed = false;
-          } else if (v_c == 1u) {
-            self->private_impl.f_metadata_is_zlib_compressed = true;
-          } else {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_4 = *iop_a_src++;
-            v_c = t_4;
-          }
-          if ((v_c != 0u) && self->private_impl.f_metadata_is_zlib_compressed) {
-            status = wuffs_base__make_status(wuffs_png__error__unsupported_png_compression_method);
-            goto exit;
-          }
-          self->private_impl.f_metadata_fourcc -= 2u;
-          while (self->private_impl.f_metadata_fourcc != 1263947862u) {
-            self->private_impl.f_metadata_fourcc += 1u;
-            while (true) {
-              if (self->private_impl.f_chunk_length <= 0u) {
-                status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-                goto exit;
-              }
-              self->private_impl.f_chunk_length -= 1u;
-              {
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14);
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint8_t t_5 = *iop_a_src++;
-                v_c = t_5;
-              }
-              if (v_c == 0u) {
-                break;
-              }
-            }
-          }
-        } else if (self->private_impl.f_chunk_type == 1951945850u) {
-          if (self->private_impl.f_chunk_length <= 0u) {
-            status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-            goto exit;
-          }
-          self->private_impl.f_chunk_length -= 1u;
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15);
-            if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              goto suspend;
-            }
-            uint8_t t_6 = *iop_a_src++;
-            v_c = t_6;
-          }
-          if (v_c != 0u) {
-            status = wuffs_base__make_status(wuffs_png__error__unsupported_png_compression_method);
-            goto exit;
-          }
-          self->private_impl.f_metadata_is_zlib_compressed = true;
-        }
-        self->private_impl.f_call_sequence &= 239u;
-        status = wuffs_base__make_status(NULL);
-        goto ok;
-      }
-    } while (0);
-    label__goto_done__break:;
-    if (self->private_impl.f_chunk_length != 0u) {
-      status = wuffs_base__make_status(wuffs_png__error__bad_chunk);
-      goto exit;
-    }
-    self->private_data.s_do_tell_me_more[0].scratch = 4u;
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16);
-    if (self->private_data.s_do_tell_me_more[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-      self->private_data.s_do_tell_me_more[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-      iop_a_src = io2_a_src;
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      goto suspend;
-    }
-    iop_a_src += self->private_data.s_do_tell_me_more[0].scratch;
-    self->private_impl.f_metadata_flavor = 0u;
-    self->private_impl.f_metadata_fourcc = 0u;
-    self->private_impl.f_metadata_x = 0u;
-    self->private_impl.f_metadata_y = 0u;
-    self->private_impl.f_metadata_z = 0u;
-    self->private_impl.f_call_sequence &= 239u;
-    status = wuffs_base__make_status(NULL);
-    goto ok;
-
-    ok:
-    self->private_impl.p_do_tell_me_more[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_tell_me_more[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_tell_me_more[0].v_zlib_status = v_zlib_status;
-
-  goto exit;
-  exit:
-  if (a_dst && a_dst->data.ptr) {
-    a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr));
-  }
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func png.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_png__decoder__workbuf_len(
-    const wuffs_png__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(self->private_impl.f_overall_workbuf_length, self->private_impl.f_overall_workbuf_length);
-}
-
-// -------- func png.decoder.filter_and_swizzle
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__filter_and_swizzle(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf) {
-  return (*self->private_impl.choosy_filter_and_swizzle)(self, a_dst, a_workbuf);
-}
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__filter_and_swizzle__choosy_default(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint64_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_bytes_per_row0 = 0;
-  uint64_t v_dst_bytes_per_row1 = 0;
-  wuffs_base__slice_u8 v_dst_palette = {0};
-  wuffs_base__table_u8 v_tab = {0};
-  uint32_t v_y = 0;
-  wuffs_base__slice_u8 v_dst = {0};
-  uint8_t v_filter = 0;
-  wuffs_base__slice_u8 v_curr_row = {0};
-  wuffs_base__slice_u8 v_prev_row = {0};
-
-  v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-  v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-  if ((v_dst_bits_per_pixel & 7u) != 0u) {
-    return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-  v_dst_bytes_per_pixel = ((uint64_t)((v_dst_bits_per_pixel / 8u)));
-  v_dst_bytes_per_row0 = (((uint64_t)(self->private_impl.f_frame_rect_x0)) * v_dst_bytes_per_pixel);
-  v_dst_bytes_per_row1 = (((uint64_t)(self->private_impl.f_frame_rect_x1)) * v_dst_bytes_per_pixel);
-  v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024));
-  v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-  if (v_dst_bytes_per_row1 < ((uint64_t)(v_tab.width))) {
-    v_tab = wuffs_base__table_u8__subtable_ij(v_tab,
-        0u,
-        0u,
-        v_dst_bytes_per_row1,
-        ((uint64_t)(v_tab.height)));
-  }
-  if (v_dst_bytes_per_row0 < ((uint64_t)(v_tab.width))) {
-    v_tab = wuffs_base__table_u8__subtable_ij(v_tab,
-        v_dst_bytes_per_row0,
-        0u,
-        ((uint64_t)(v_tab.width)),
-        ((uint64_t)(v_tab.height)));
-  } else {
-    v_tab = wuffs_base__table_u8__subtable_ij(v_tab,
-        0u,
-        0u,
-        0u,
-        0u);
-  }
-  v_y = self->private_impl.f_frame_rect_y0;
-  while (v_y < self->private_impl.f_frame_rect_y1) {
-    v_dst = wuffs_base__table_u8__row_u32(v_tab, v_y);
-    if (1u > ((uint64_t)(a_workbuf.len))) {
-      return wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_workbuf_length);
-    }
-    v_filter = a_workbuf.ptr[0u];
-    a_workbuf = wuffs_base__slice_u8__subslice_i(a_workbuf, 1u);
-    if (self->private_impl.f_pass_bytes_per_row > ((uint64_t)(a_workbuf.len))) {
-      return wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_workbuf_length);
-    }
-    v_curr_row = wuffs_base__slice_u8__subslice_j(a_workbuf, self->private_impl.f_pass_bytes_per_row);
-    a_workbuf = wuffs_base__slice_u8__subslice_i(a_workbuf, self->private_impl.f_pass_bytes_per_row);
-    if (v_filter == 0u) {
-    } else if (v_filter == 1u) {
-      wuffs_png__decoder__filter_1(self, v_curr_row);
-    } else if (v_filter == 2u) {
-      wuffs_png__decoder__filter_2(self, v_curr_row, v_prev_row);
-    } else if (v_filter == 3u) {
-      wuffs_png__decoder__filter_3(self, v_curr_row, v_prev_row);
-    } else if (v_filter == 4u) {
-      wuffs_png__decoder__filter_4(self, v_curr_row, v_prev_row);
-    } else {
-      return wuffs_base__make_status(wuffs_png__error__bad_filter);
-    }
-    wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, v_curr_row);
-    v_prev_row = v_curr_row;
-    v_y += 1u;
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func png.decoder.filter_and_swizzle_tricky
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_png__decoder__filter_and_swizzle_tricky(
-    wuffs_png__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__slice_u8 a_workbuf) {
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint64_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_bytes_per_row1 = 0;
-  wuffs_base__slice_u8 v_dst_palette = {0};
-  wuffs_base__table_u8 v_tab = {0};
-  uint64_t v_src_bytes_per_pixel = 0;
-  uint32_t v_x = 0;
-  uint32_t v_y = 0;
-  uint64_t v_i = 0;
-  wuffs_base__slice_u8 v_dst = {0};
-  uint8_t v_filter = 0;
-  wuffs_base__slice_u8 v_s = {0};
-  wuffs_base__slice_u8 v_curr_row = {0};
-  wuffs_base__slice_u8 v_prev_row = {0};
-  uint8_t v_bits_unpacked[8] = {0};
-  uint8_t v_bits_packed = 0;
-  uint8_t v_packs_remaining = 0;
-  uint8_t v_multiplier = 0;
-  uint8_t v_shift = 0;
-
-  v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-  v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-  if ((v_dst_bits_per_pixel & 7u) != 0u) {
-    return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-  }
-  v_dst_bytes_per_pixel = ((uint64_t)((v_dst_bits_per_pixel / 8u)));
-  v_dst_bytes_per_row1 = (((uint64_t)(self->private_impl.f_frame_rect_x1)) * v_dst_bytes_per_pixel);
-  v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024));
-  v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-  v_src_bytes_per_pixel = 1u;
-  if (self->private_impl.f_depth >= 8u) {
-    v_src_bytes_per_pixel = (((uint64_t)(WUFFS_PNG__NUM_CHANNELS[self->private_impl.f_color_type])) * ((uint64_t)((self->private_impl.f_depth >> 3u))));
-  }
-  if (self->private_impl.f_chunk_type_array[0u] == 73u) {
-    v_y = ((uint32_t)(WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][5u]));
-  } else {
-    v_y = self->private_impl.f_frame_rect_y0;
-  }
-  while (v_y < self->private_impl.f_frame_rect_y1) {
-    v_dst = wuffs_base__table_u8__row_u32(v_tab, v_y);
-    if (v_dst_bytes_per_row1 < ((uint64_t)(v_dst.len))) {
-      v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row1);
-    }
-    if (1u > ((uint64_t)(a_workbuf.len))) {
-      return wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_workbuf_length);
-    }
-    v_filter = a_workbuf.ptr[0u];
-    a_workbuf = wuffs_base__slice_u8__subslice_i(a_workbuf, 1u);
-    if (self->private_impl.f_pass_bytes_per_row > ((uint64_t)(a_workbuf.len))) {
-      return wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_workbuf_length);
-    }
-    v_curr_row = wuffs_base__slice_u8__subslice_j(a_workbuf, self->private_impl.f_pass_bytes_per_row);
-    a_workbuf = wuffs_base__slice_u8__subslice_i(a_workbuf, self->private_impl.f_pass_bytes_per_row);
-    if (v_filter == 0u) {
-    } else if (v_filter == 1u) {
-      wuffs_png__decoder__filter_1(self, v_curr_row);
-    } else if (v_filter == 2u) {
-      wuffs_png__decoder__filter_2(self, v_curr_row, v_prev_row);
-    } else if (v_filter == 3u) {
-      wuffs_png__decoder__filter_3(self, v_curr_row, v_prev_row);
-    } else if (v_filter == 4u) {
-      wuffs_png__decoder__filter_4(self, v_curr_row, v_prev_row);
-    } else {
-      return wuffs_base__make_status(wuffs_png__error__bad_filter);
-    }
-    v_s = v_curr_row;
-    if (self->private_impl.f_chunk_type_array[0u] == 73u) {
-      v_x = ((uint32_t)(WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][2u]));
-    } else {
-      v_x = self->private_impl.f_frame_rect_x0;
-    }
-    if (self->private_impl.f_depth == 8u) {
-      while (v_x < self->private_impl.f_frame_rect_x1) {
-        v_i = (((uint64_t)(v_x)) * v_dst_bytes_per_pixel);
-        if (v_i <= ((uint64_t)(v_dst.len))) {
-          if (self->private_impl.f_color_type == 4u) {
-            if (2u <= ((uint64_t)(v_s.len))) {
-              v_bits_unpacked[0u] = v_s.ptr[0u];
-              v_bits_unpacked[1u] = v_s.ptr[0u];
-              v_bits_unpacked[2u] = v_s.ptr[0u];
-              v_bits_unpacked[3u] = v_s.ptr[1u];
-              v_s = wuffs_base__slice_u8__subslice_i(v_s, 2u);
-              wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, wuffs_base__slice_u8__subslice_i(v_dst, v_i), v_dst_palette, wuffs_base__make_slice_u8(v_bits_unpacked, 4));
-            }
-          } else if (((uint32_t)(self->private_impl.f_remap_transparency)) != 0u) {
-            if (self->private_impl.f_color_type == 0u) {
-              if (1u <= ((uint64_t)(v_s.len))) {
-                v_bits_unpacked[0u] = v_s.ptr[0u];
-                v_bits_unpacked[1u] = v_s.ptr[0u];
-                v_bits_unpacked[2u] = v_s.ptr[0u];
-                v_bits_unpacked[3u] = 255u;
-                v_s = wuffs_base__slice_u8__subslice_i(v_s, 1u);
-                if (((uint32_t)(self->private_impl.f_remap_transparency)) == ((((uint32_t)(v_bits_unpacked[0u])) << 0u) |
-                    (((uint32_t)(v_bits_unpacked[1u])) << 8u) |
-                    (((uint32_t)(v_bits_unpacked[2u])) << 16u) |
-                    (((uint32_t)(v_bits_unpacked[3u])) << 24u))) {
-                  v_bits_unpacked[0u] = 0u;
-                  v_bits_unpacked[1u] = 0u;
-                  v_bits_unpacked[2u] = 0u;
-                  v_bits_unpacked[3u] = 0u;
-                }
-                wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, wuffs_base__slice_u8__subslice_i(v_dst, v_i), v_dst_palette, wuffs_base__make_slice_u8(v_bits_unpacked, 4));
-              }
-            } else {
-              if (3u <= ((uint64_t)(v_s.len))) {
-                v_bits_unpacked[0u] = v_s.ptr[2u];
-                v_bits_unpacked[1u] = v_s.ptr[1u];
-                v_bits_unpacked[2u] = v_s.ptr[0u];
-                v_bits_unpacked[3u] = 255u;
-                v_s = wuffs_base__slice_u8__subslice_i(v_s, 3u);
-                if (((uint32_t)(self->private_impl.f_remap_transparency)) == ((((uint32_t)(v_bits_unpacked[0u])) << 0u) |
-                    (((uint32_t)(v_bits_unpacked[1u])) << 8u) |
-                    (((uint32_t)(v_bits_unpacked[2u])) << 16u) |
-                    (((uint32_t)(v_bits_unpacked[3u])) << 24u))) {
-                  v_bits_unpacked[0u] = 0u;
-                  v_bits_unpacked[1u] = 0u;
-                  v_bits_unpacked[2u] = 0u;
-                  v_bits_unpacked[3u] = 0u;
-                }
-                wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, wuffs_base__slice_u8__subslice_i(v_dst, v_i), v_dst_palette, wuffs_base__make_slice_u8(v_bits_unpacked, 4));
-              }
-            }
-          } else if (v_src_bytes_per_pixel <= ((uint64_t)(v_s.len))) {
-            wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, wuffs_base__slice_u8__subslice_i(v_dst, v_i), v_dst_palette, wuffs_base__slice_u8__subslice_j(v_s, v_src_bytes_per_pixel));
-            v_s = wuffs_base__slice_u8__subslice_i(v_s, v_src_bytes_per_pixel);
-          }
-        }
-        v_x += (((uint32_t)(1u)) << WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][0u]);
-      }
-    } else if (self->private_impl.f_depth < 8u) {
-      v_multiplier = 1u;
-      if (self->private_impl.f_color_type == 0u) {
-        v_multiplier = WUFFS_PNG__LOW_BIT_DEPTH_MULTIPLIERS[self->private_impl.f_depth];
-      }
-      v_shift = ((8u - self->private_impl.f_depth) & 7u);
-      v_packs_remaining = 0u;
-      while (v_x < self->private_impl.f_frame_rect_x1) {
-        v_i = (((uint64_t)(v_x)) * v_dst_bytes_per_pixel);
-        if (v_i <= ((uint64_t)(v_dst.len))) {
-          if ((v_packs_remaining == 0u) && (1u <= ((uint64_t)(v_s.len)))) {
-            v_packs_remaining = WUFFS_PNG__LOW_BIT_DEPTH_NUM_PACKS[self->private_impl.f_depth];
-            v_bits_packed = v_s.ptr[0u];
-            v_s = wuffs_base__slice_u8__subslice_i(v_s, 1u);
-          }
-          v_bits_unpacked[0u] = ((uint8_t)((v_bits_packed >> v_shift) * v_multiplier));
-          v_bits_packed = ((uint8_t)(v_bits_packed << self->private_impl.f_depth));
-          v_packs_remaining = ((uint8_t)(v_packs_remaining - 1u));
-          if (((uint32_t)(self->private_impl.f_remap_transparency)) != 0u) {
-            v_bits_unpacked[1u] = v_bits_unpacked[0u];
-            v_bits_unpacked[2u] = v_bits_unpacked[0u];
-            v_bits_unpacked[3u] = 255u;
-            if (((uint32_t)(self->private_impl.f_remap_transparency)) == ((((uint32_t)(v_bits_unpacked[0u])) << 0u) |
-                (((uint32_t)(v_bits_unpacked[1u])) << 8u) |
-                (((uint32_t)(v_bits_unpacked[2u])) << 16u) |
-                (((uint32_t)(v_bits_unpacked[3u])) << 24u))) {
-              v_bits_unpacked[0u] = 0u;
-              v_bits_unpacked[1u] = 0u;
-              v_bits_unpacked[2u] = 0u;
-              v_bits_unpacked[3u] = 0u;
-            }
-            wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, wuffs_base__slice_u8__subslice_i(v_dst, v_i), v_dst_palette, wuffs_base__make_slice_u8(v_bits_unpacked, 4));
-          } else {
-            wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, wuffs_base__slice_u8__subslice_i(v_dst, v_i), v_dst_palette, wuffs_base__make_slice_u8(v_bits_unpacked, 1));
-          }
-        }
-        v_x += (((uint32_t)(1u)) << WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][0u]);
-      }
-    } else {
-      while (v_x < self->private_impl.f_frame_rect_x1) {
-        v_i = (((uint64_t)(v_x)) * v_dst_bytes_per_pixel);
-        if (v_i <= ((uint64_t)(v_dst.len))) {
-          if (self->private_impl.f_color_type == 0u) {
-            if (2u <= ((uint64_t)(v_s.len))) {
-              v_bits_unpacked[0u] = v_s.ptr[1u];
-              v_bits_unpacked[1u] = v_s.ptr[0u];
-              v_bits_unpacked[2u] = v_s.ptr[1u];
-              v_bits_unpacked[3u] = v_s.ptr[0u];
-              v_bits_unpacked[4u] = v_s.ptr[1u];
-              v_bits_unpacked[5u] = v_s.ptr[0u];
-              v_bits_unpacked[6u] = 255u;
-              v_bits_unpacked[7u] = 255u;
-              v_s = wuffs_base__slice_u8__subslice_i(v_s, 2u);
-              if (self->private_impl.f_remap_transparency == ((((uint64_t)(v_bits_unpacked[0u])) << 0u) |
-                  (((uint64_t)(v_bits_unpacked[1u])) << 8u) |
-                  (((uint64_t)(v_bits_unpacked[2u])) << 16u) |
-                  (((uint64_t)(v_bits_unpacked[3u])) << 24u) |
-                  (((uint64_t)(v_bits_unpacked[4u])) << 32u) |
-                  (((uint64_t)(v_bits_unpacked[5u])) << 40u) |
-                  (((uint64_t)(v_bits_unpacked[6u])) << 48u) |
-                  (((uint64_t)(v_bits_unpacked[7u])) << 56u))) {
-                v_bits_unpacked[0u] = 0u;
-                v_bits_unpacked[1u] = 0u;
-                v_bits_unpacked[2u] = 0u;
-                v_bits_unpacked[3u] = 0u;
-                v_bits_unpacked[4u] = 0u;
-                v_bits_unpacked[5u] = 0u;
-                v_bits_unpacked[6u] = 0u;
-                v_bits_unpacked[7u] = 0u;
-              }
-            }
-          } else if (self->private_impl.f_color_type == 2u) {
-            if (6u <= ((uint64_t)(v_s.len))) {
-              v_bits_unpacked[0u] = v_s.ptr[5u];
-              v_bits_unpacked[1u] = v_s.ptr[4u];
-              v_bits_unpacked[2u] = v_s.ptr[3u];
-              v_bits_unpacked[3u] = v_s.ptr[2u];
-              v_bits_unpacked[4u] = v_s.ptr[1u];
-              v_bits_unpacked[5u] = v_s.ptr[0u];
-              v_bits_unpacked[6u] = 255u;
-              v_bits_unpacked[7u] = 255u;
-              v_s = wuffs_base__slice_u8__subslice_i(v_s, 6u);
-              if (self->private_impl.f_remap_transparency == ((((uint64_t)(v_bits_unpacked[0u])) << 0u) |
-                  (((uint64_t)(v_bits_unpacked[1u])) << 8u) |
-                  (((uint64_t)(v_bits_unpacked[2u])) << 16u) |
-                  (((uint64_t)(v_bits_unpacked[3u])) << 24u) |
-                  (((uint64_t)(v_bits_unpacked[4u])) << 32u) |
-                  (((uint64_t)(v_bits_unpacked[5u])) << 40u) |
-                  (((uint64_t)(v_bits_unpacked[6u])) << 48u) |
-                  (((uint64_t)(v_bits_unpacked[7u])) << 56u))) {
-                v_bits_unpacked[0u] = 0u;
-                v_bits_unpacked[1u] = 0u;
-                v_bits_unpacked[2u] = 0u;
-                v_bits_unpacked[3u] = 0u;
-                v_bits_unpacked[4u] = 0u;
-                v_bits_unpacked[5u] = 0u;
-                v_bits_unpacked[6u] = 0u;
-                v_bits_unpacked[7u] = 0u;
-              }
-            }
-          } else if (self->private_impl.f_color_type == 4u) {
-            if (4u <= ((uint64_t)(v_s.len))) {
-              v_bits_unpacked[0u] = v_s.ptr[1u];
-              v_bits_unpacked[1u] = v_s.ptr[0u];
-              v_bits_unpacked[2u] = v_s.ptr[1u];
-              v_bits_unpacked[3u] = v_s.ptr[0u];
-              v_bits_unpacked[4u] = v_s.ptr[1u];
-              v_bits_unpacked[5u] = v_s.ptr[0u];
-              v_bits_unpacked[6u] = v_s.ptr[3u];
-              v_bits_unpacked[7u] = v_s.ptr[2u];
-              v_s = wuffs_base__slice_u8__subslice_i(v_s, 4u);
-            }
-          } else {
-            if (8u <= ((uint64_t)(v_s.len))) {
-              v_bits_unpacked[0u] = v_s.ptr[5u];
-              v_bits_unpacked[1u] = v_s.ptr[4u];
-              v_bits_unpacked[2u] = v_s.ptr[3u];
-              v_bits_unpacked[3u] = v_s.ptr[2u];
-              v_bits_unpacked[4u] = v_s.ptr[1u];
-              v_bits_unpacked[5u] = v_s.ptr[0u];
-              v_bits_unpacked[6u] = v_s.ptr[7u];
-              v_bits_unpacked[7u] = v_s.ptr[6u];
-              v_s = wuffs_base__slice_u8__subslice_i(v_s, 8u);
-            }
-          }
-          wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, wuffs_base__slice_u8__subslice_i(v_dst, v_i), v_dst_palette, wuffs_base__make_slice_u8(v_bits_unpacked, 8));
-        }
-        v_x += (((uint32_t)(1u)) << WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][0u]);
-      }
-    }
-    v_prev_row = v_curr_row;
-    v_y += (((uint32_t)(1u)) << WUFFS_PNG__INTERLACING[self->private_impl.f_interlace_pass][3u]);
-  }
-  return wuffs_base__make_status(NULL);
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__PNG)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_tga__error__bad_header[] = "#tga: bad header";
-const char wuffs_tga__error__bad_run_length_encoding[] = "#tga: bad run length encoding";
-const char wuffs_tga__error__truncated_input[] = "#tga: truncated input";
-const char wuffs_tga__error__unsupported_tga_file[] = "#tga: unsupported TGA file";
-
-// ---------------- Private Consts
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_tga__decoder__do_decode_image_config(
-    wuffs_tga__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_tga__decoder__do_decode_frame_config(
-    wuffs_tga__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_tga__decoder__do_decode_frame(
-    wuffs_tga__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-// ---------------- VTables
-
-const wuffs_base__image_decoder__func_ptrs
-wuffs_tga__decoder__func_ptrs_for__wuffs_base__image_decoder = {
-  (wuffs_base__status(*)(void*,
-      wuffs_base__pixel_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__pixel_blend,
-      wuffs_base__slice_u8,
-      wuffs_base__decode_frame_options*))(&wuffs_tga__decoder__decode_frame),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__frame_config*,
-      wuffs_base__io_buffer*))(&wuffs_tga__decoder__decode_frame_config),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__image_config*,
-      wuffs_base__io_buffer*))(&wuffs_tga__decoder__decode_image_config),
-  (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_tga__decoder__frame_dirty_rect),
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_tga__decoder__get_quirk),
-  (uint32_t(*)(const void*))(&wuffs_tga__decoder__num_animation_loops),
-  (uint64_t(*)(const void*))(&wuffs_tga__decoder__num_decoded_frame_configs),
-  (uint64_t(*)(const void*))(&wuffs_tga__decoder__num_decoded_frames),
-  (wuffs_base__status(*)(void*,
-      uint64_t,
-      uint64_t))(&wuffs_tga__decoder__restart_frame),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_tga__decoder__set_quirk),
-  (wuffs_base__empty_struct(*)(void*,
-      uint32_t,
-      bool))(&wuffs_tga__decoder__set_report_metadata),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__more_information*,
-      wuffs_base__io_buffer*))(&wuffs_tga__decoder__tell_me_more),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_tga__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_tga__decoder__initialize(
-    wuffs_tga__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.vtable_name =
-      wuffs_base__image_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.function_pointers =
-      (const void*)(&wuffs_tga__decoder__func_ptrs_for__wuffs_base__image_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_tga__decoder*
-wuffs_tga__decoder__alloc() {
-  wuffs_tga__decoder* x =
-      (wuffs_tga__decoder*)(calloc(sizeof(wuffs_tga__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_tga__decoder__initialize(
-      x, sizeof(wuffs_tga__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_tga__decoder() {
-  return sizeof(wuffs_tga__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func tga.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_tga__decoder__get_quirk(
-    const wuffs_tga__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func tga.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__set_quirk(
-    wuffs_tga__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func tga.decoder.decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__decode_image_config(
-    wuffs_tga__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_tga__decoder__do_decode_image_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_tga__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func tga.decoder.do_decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_tga__decoder__do_decode_image_config(
-    wuffs_tga__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint32_t v_c = 0;
-  uint32_t v_c5 = 0;
-  uint32_t v_i = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config[0];
-  if (coro_susp_point) {
-    v_i = self->private_data.s_do_decode_image_config[0].v_i;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_0 = *iop_a_src++;
-      self->private_impl.f_header_id_length = t_0;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_1 = *iop_a_src++;
-      self->private_impl.f_header_color_map_type = t_1;
-    }
-    if (self->private_impl.f_header_color_map_type > 1u) {
-      status = wuffs_base__make_status(wuffs_tga__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_2 = *iop_a_src++;
-      self->private_impl.f_header_image_type = t_2;
-    }
-    if ((self->private_impl.f_header_image_type == 1u) ||
-        (self->private_impl.f_header_image_type == 2u) ||
-        (self->private_impl.f_header_image_type == 3u) ||
-        (self->private_impl.f_header_image_type == 9u) ||
-        (self->private_impl.f_header_image_type == 10u) ||
-        (self->private_impl.f_header_image_type == 11u)) {
-    } else {
-      status = wuffs_base__make_status(wuffs_tga__error__bad_header);
-      goto exit;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-      uint16_t t_3;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_3 = wuffs_base__peek_u16le__no_bounds_check(iop_a_src);
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_3 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_3;
-          if (num_bits_3 == 8) {
-            t_3 = ((uint16_t)(*scratch));
-            break;
-          }
-          num_bits_3 += 8u;
-          *scratch |= ((uint64_t)(num_bits_3)) << 56;
-        }
-      }
-      self->private_impl.f_header_color_map_first_entry_index = t_3;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
-      uint16_t t_4;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_4 = wuffs_base__peek_u16le__no_bounds_check(iop_a_src);
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_4 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_4;
-          if (num_bits_4 == 8) {
-            t_4 = ((uint16_t)(*scratch));
-            break;
-          }
-          num_bits_4 += 8u;
-          *scratch |= ((uint64_t)(num_bits_4)) << 56;
-        }
-      }
-      self->private_impl.f_header_color_map_length = t_4;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_5 = *iop_a_src++;
-      self->private_impl.f_header_color_map_entry_size = t_5;
-    }
-    if (self->private_impl.f_header_color_map_type != 0u) {
-      if ((self->private_impl.f_header_color_map_first_entry_index != 0u) || (self->private_impl.f_header_color_map_length > 256u)) {
-        status = wuffs_base__make_status(wuffs_tga__error__unsupported_tga_file);
-        goto exit;
-      } else if ((self->private_impl.f_header_color_map_entry_size != 15u) &&
-          (self->private_impl.f_header_color_map_entry_size != 16u) &&
-          (self->private_impl.f_header_color_map_entry_size != 24u) &&
-          (self->private_impl.f_header_color_map_entry_size != 32u)) {
-        status = wuffs_base__make_status(wuffs_tga__error__bad_header);
-        goto exit;
-      }
-    } else {
-      if ((self->private_impl.f_header_color_map_first_entry_index != 0u) || (self->private_impl.f_header_color_map_length != 0u) || (self->private_impl.f_header_color_map_entry_size != 0u)) {
-        status = wuffs_base__make_status(wuffs_tga__error__bad_header);
-        goto exit;
-      }
-    }
-    self->private_data.s_do_decode_image_config[0].scratch = 4u;
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
-    if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-      self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-      iop_a_src = io2_a_src;
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      goto suspend;
-    }
-    iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10);
-      uint32_t t_6;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_6 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_6 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_6;
-          if (num_bits_6 == 8) {
-            t_6 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_6 += 8u;
-          *scratch |= ((uint64_t)(num_bits_6)) << 56;
-        }
-      }
-      self->private_impl.f_width = t_6;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12);
-      uint32_t t_7;
-      if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-        t_7 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-        iop_a_src += 2;
-      } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13);
-        while (true) {
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-          uint32_t num_bits_7 = ((uint32_t)(*scratch >> 56));
-          *scratch <<= 8;
-          *scratch >>= 8;
-          *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_7;
-          if (num_bits_7 == 8) {
-            t_7 = ((uint32_t)(*scratch));
-            break;
-          }
-          num_bits_7 += 8u;
-          *scratch |= ((uint64_t)(num_bits_7)) << 56;
-        }
-      }
-      self->private_impl.f_height = t_7;
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_8 = *iop_a_src++;
-      self->private_impl.f_header_pixel_depth = t_8;
-    }
-    if ((self->private_impl.f_header_pixel_depth != 1u) &&
-        (self->private_impl.f_header_pixel_depth != 8u) &&
-        (self->private_impl.f_header_pixel_depth != 15u) &&
-        (self->private_impl.f_header_pixel_depth != 16u) &&
-        (self->private_impl.f_header_pixel_depth != 24u) &&
-        (self->private_impl.f_header_pixel_depth != 32u)) {
-      status = wuffs_base__make_status(wuffs_tga__error__bad_header);
-      goto exit;
-    }
-    if ((self->private_impl.f_header_image_type | 8u) == 9u) {
-      self->private_impl.f_scratch_bytes_per_pixel = 1u;
-      self->private_impl.f_src_bytes_per_pixel = 1u;
-      self->private_impl.f_src_pixfmt = 2164523016u;
-      self->private_impl.f_opaque = ((self->private_impl.f_header_color_map_entry_size == 15u) || (self->private_impl.f_header_color_map_entry_size == 24u));
-    } else if ((self->private_impl.f_header_image_type | 8u) == 10u) {
-      if ((self->private_impl.f_header_pixel_depth == 15u) || (self->private_impl.f_header_pixel_depth == 16u)) {
-        self->private_impl.f_scratch_bytes_per_pixel = 4u;
-        self->private_impl.f_src_bytes_per_pixel = 0u;
-        self->private_impl.f_src_pixfmt = 2164295816u;
-      } else if (self->private_impl.f_header_pixel_depth == 24u) {
-        self->private_impl.f_scratch_bytes_per_pixel = 3u;
-        self->private_impl.f_src_bytes_per_pixel = 3u;
-        self->private_impl.f_src_pixfmt = 2147485832u;
-        self->private_impl.f_opaque = true;
-      } else if (self->private_impl.f_header_pixel_depth == 32u) {
-        self->private_impl.f_scratch_bytes_per_pixel = 4u;
-        self->private_impl.f_src_bytes_per_pixel = 4u;
-        self->private_impl.f_src_pixfmt = 2164295816u;
-      } else {
-        status = wuffs_base__make_status(wuffs_tga__error__unsupported_tga_file);
-        goto exit;
-      }
-    } else {
-      if (self->private_impl.f_header_pixel_depth == 8u) {
-        self->private_impl.f_scratch_bytes_per_pixel = 1u;
-        self->private_impl.f_src_bytes_per_pixel = 1u;
-        self->private_impl.f_src_pixfmt = 536870920u;
-        self->private_impl.f_opaque = true;
-      } else {
-        status = wuffs_base__make_status(wuffs_tga__error__unsupported_tga_file);
-        goto exit;
-      }
-    }
-    {
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15);
-      if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-        status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-        goto suspend;
-      }
-      uint8_t t_9 = *iop_a_src++;
-      self->private_impl.f_header_image_descriptor = t_9;
-    }
-    if ((self->private_impl.f_header_image_descriptor & 16u) != 0u) {
-      status = wuffs_base__make_status(wuffs_tga__error__unsupported_tga_file);
-      goto exit;
-    }
-    self->private_data.s_do_decode_image_config[0].scratch = ((uint32_t)(self->private_impl.f_header_id_length));
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16);
-    if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-      self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-      iop_a_src = io2_a_src;
-      status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-      goto suspend;
-    }
-    iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
-    if (self->private_impl.f_header_color_map_type != 0u) {
-      while (v_i < ((uint32_t)(self->private_impl.f_header_color_map_length))) {
-        if (self->private_impl.f_header_color_map_entry_size == 24u) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(17);
-            uint32_t t_10;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 3)) {
-              t_10 = ((uint32_t)(wuffs_base__peek_u24le__no_bounds_check(iop_a_src)));
-              iop_a_src += 3;
-            } else {
-              self->private_data.s_do_decode_image_config[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(18);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-                uint32_t num_bits_10 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_10;
-                if (num_bits_10 == 16) {
-                  t_10 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_10 += 8u;
-                *scratch |= ((uint64_t)(num_bits_10)) << 56;
-              }
-            }
-            v_c = t_10;
-          }
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 0u)] = ((uint8_t)((v_c >> 0u)));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 1u)] = ((uint8_t)((v_c >> 8u)));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 2u)] = ((uint8_t)((v_c >> 16u)));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 3u)] = 255u;
-        } else if (self->private_impl.f_header_color_map_entry_size == 32u) {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(19);
-            uint32_t t_11;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) {
-              t_11 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
-              iop_a_src += 4;
-            } else {
-              self->private_data.s_do_decode_image_config[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(20);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-                uint32_t num_bits_11 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_11;
-                if (num_bits_11 == 24) {
-                  t_11 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_11 += 8u;
-                *scratch |= ((uint64_t)(num_bits_11)) << 56;
-              }
-            }
-            v_c = t_11;
-          }
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 0u)] = ((uint8_t)((v_c >> 0u)));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 1u)] = ((uint8_t)((v_c >> 8u)));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 2u)] = ((uint8_t)((v_c >> 16u)));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 3u)] = ((uint8_t)((v_c >> 24u)));
-        } else {
-          {
-            WUFFS_BASE__COROUTINE_SUSPENSION_POINT(21);
-            uint32_t t_12;
-            if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 2)) {
-              t_12 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-              iop_a_src += 2;
-            } else {
-              self->private_data.s_do_decode_image_config[0].scratch = 0;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(22);
-              while (true) {
-                if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  goto suspend;
-                }
-                uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
-                uint32_t num_bits_12 = ((uint32_t)(*scratch >> 56));
-                *scratch <<= 8;
-                *scratch >>= 8;
-                *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_12;
-                if (num_bits_12 == 8) {
-                  t_12 = ((uint32_t)(*scratch));
-                  break;
-                }
-                num_bits_12 += 8u;
-                *scratch |= ((uint64_t)(num_bits_12)) << 56;
-              }
-            }
-            v_c = t_12;
-          }
-          v_c5 = (31u & (v_c >> 0u));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 0u)] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u))));
-          v_c5 = (31u & (v_c >> 5u));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 1u)] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u))));
-          v_c5 = (31u & (v_c >> 10u));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 2u)] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u))));
-          self->private_data.f_src_palette[(((v_i & 255u) * 4u) + 3u)] = 255u;
-        }
-        v_i += 1u;
-      }
-      while (v_i < 256u) {
-        self->private_data.f_src_palette[((v_i * 4u) + 0u)] = 0u;
-        self->private_data.f_src_palette[((v_i * 4u) + 1u)] = 0u;
-        self->private_data.f_src_palette[((v_i * 4u) + 2u)] = 0u;
-        self->private_data.f_src_palette[((v_i * 4u) + 3u)] = 255u;
-        v_i += 1u;
-      }
-    }
-    self->private_impl.f_frame_config_io_position = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-    if (a_dst != NULL) {
-      wuffs_base__image_config__set(
-          a_dst,
-          self->private_impl.f_src_pixfmt,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height,
-          self->private_impl.f_frame_config_io_position,
-          self->private_impl.f_opaque);
-    }
-    self->private_impl.f_call_sequence = 32u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_do_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_decode_image_config[0].v_i = v_i;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func tga.decoder.decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__decode_frame_config(
-    wuffs_tga__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 2)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_tga__decoder__do_decode_frame_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_tga__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 2 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func tga.decoder.do_decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_tga__decoder__do_decode_frame_config(
-    wuffs_tga__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 32u) {
-    } else if (self->private_impl.f_call_sequence < 32u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_tga__decoder__do_decode_image_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else if (self->private_impl.f_call_sequence == 40u) {
-      if (self->private_impl.f_frame_config_io_position != wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)))) {
-        status = wuffs_base__make_status(wuffs_base__error__bad_restart);
-        goto exit;
-      }
-    } else if (self->private_impl.f_call_sequence == 64u) {
-      self->private_impl.f_call_sequence = 96u;
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (a_dst != NULL) {
-      wuffs_base__frame_config__set(
-          a_dst,
-          wuffs_base__utility__make_rect_ie_u32(
-          0u,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height),
-          ((wuffs_base__flicks)(0u)),
-          0u,
-          self->private_impl.f_frame_config_io_position,
-          0u,
-          self->private_impl.f_opaque,
-          false,
-          4278190080u);
-    }
-    self->private_impl.f_call_sequence = 64u;
-
-    ok:
-    self->private_impl.p_do_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func tga.decoder.decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__decode_frame(
-    wuffs_tga__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 3)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_tga__decoder__do_decode_frame(self,
-            a_dst,
-            a_src,
-            a_blend,
-            a_workbuf,
-            a_opts);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_tga__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 3 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func tga.decoder.do_decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_tga__decoder__do_decode_frame(
-    wuffs_tga__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint64_t v_dst_bytes_per_pixel = 0;
-  uint32_t v_dst_x = 0;
-  uint32_t v_dst_y = 0;
-  wuffs_base__table_u8 v_tab = {0};
-  wuffs_base__slice_u8 v_dst_palette = {0};
-  wuffs_base__slice_u8 v_dst = {0};
-  uint64_t v_dst_start = 0;
-  wuffs_base__slice_u8 v_src_palette = {0};
-  uint64_t v_mark = 0;
-  uint64_t v_num_pixels64 = 0;
-  uint32_t v_num_pixels32 = 0;
-  uint32_t v_lit_length = 0;
-  uint32_t v_run_length = 0;
-  uint64_t v_num_dst_bytes = 0;
-  uint32_t v_num_src_bytes = 0;
-  uint32_t v_c = 0;
-  uint32_t v_c5 = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame[0];
-  if (coro_susp_point) {
-    v_dst_bytes_per_pixel = self->private_data.s_do_decode_frame[0].v_dst_bytes_per_pixel;
-    v_dst_x = self->private_data.s_do_decode_frame[0].v_dst_x;
-    v_dst_y = self->private_data.s_do_decode_frame[0].v_dst_y;
-    v_mark = self->private_data.s_do_decode_frame[0].v_mark;
-    v_num_pixels32 = self->private_data.s_do_decode_frame[0].v_num_pixels32;
-    v_lit_length = self->private_data.s_do_decode_frame[0].v_lit_length;
-    v_run_length = self->private_data.s_do_decode_frame[0].v_run_length;
-    v_num_dst_bytes = self->private_data.s_do_decode_frame[0].v_num_dst_bytes;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 64u) {
-    } else if (self->private_impl.f_call_sequence < 64u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_tga__decoder__do_decode_frame_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (self->private_impl.f_header_color_map_type != 0u) {
-      v_src_palette = wuffs_base__make_slice_u8(self->private_data.f_src_palette, 1024);
-    }
-    v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler,
-        wuffs_base__pixel_buffer__pixel_format(a_dst),
-        wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024)),
-        wuffs_base__utility__make_pixel_format(self->private_impl.f_src_pixfmt),
-        v_src_palette,
-        a_blend);
-    if ( ! wuffs_base__status__is_ok(&v_status)) {
-      status = v_status;
-      if (wuffs_base__status__is_error(&status)) {
-        goto exit;
-      } else if (wuffs_base__status__is_suspension(&status)) {
-        status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-        goto exit;
-      }
-      goto ok;
-    }
-    v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-    v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-    if ((v_dst_bits_per_pixel & 7u) != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__unsupported_option);
-      goto exit;
-    }
-    v_dst_bytes_per_pixel = ((uint64_t)((v_dst_bits_per_pixel / 8u)));
-    if ((self->private_impl.f_header_image_descriptor & 32u) == 0u) {
-      v_dst_y = ((uint32_t)(self->private_impl.f_height - 1u));
-    }
-    if ((self->private_impl.f_header_image_type & 8u) == 0u) {
-      v_lit_length = self->private_impl.f_width;
-    }
-    label__resume__continue:;
-    while (true) {
-      v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-      v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024));
-      while (v_dst_y < self->private_impl.f_height) {
-        v_dst = wuffs_base__table_u8__row_u32(v_tab, v_dst_y);
-        v_dst_start = (((uint64_t)(v_dst_x)) * v_dst_bytes_per_pixel);
-        if (v_dst_start <= ((uint64_t)(v_dst.len))) {
-          v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_dst_start);
-        } else {
-          v_dst = wuffs_base__utility__empty_slice_u8();
-        }
-        while (v_dst_x < self->private_impl.f_width) {
-          if (self->private_impl.f_src_bytes_per_pixel > 0u) {
-            if (v_lit_length > 0u) {
-              v_mark = ((uint64_t)(iop_a_src - io0_a_src));
-              v_num_pixels64 = (((uint64_t)(io2_a_src - iop_a_src)) / ((uint64_t)(self->private_impl.f_src_bytes_per_pixel)));
-              v_num_pixels32 = ((uint32_t)(wuffs_base__u64__min(v_num_pixels64, ((uint64_t)(v_lit_length)))));
-              v_num_dst_bytes = (((uint64_t)(v_num_pixels32)) * v_dst_bytes_per_pixel);
-              v_num_src_bytes = (v_num_pixels32 * self->private_impl.f_src_bytes_per_pixel);
-              self->private_data.s_do_decode_frame[0].scratch = v_num_src_bytes;
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-              if (self->private_data.s_do_decode_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-                self->private_data.s_do_decode_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
-                iop_a_src = io2_a_src;
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                goto suspend;
-              }
-              iop_a_src += self->private_data.s_do_decode_frame[0].scratch;
-              wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, wuffs_base__io__since(v_mark, ((uint64_t)(iop_a_src - io0_a_src)), io0_a_src));
-              if (v_num_dst_bytes <= ((uint64_t)(v_dst.len))) {
-                v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_num_dst_bytes);
-              } else {
-                v_dst = wuffs_base__utility__empty_slice_u8();
-              }
-              v_dst_x += v_num_pixels32;
-              v_lit_length = (((uint32_t)(v_lit_length - v_num_pixels32)) & 65535u);
-              if (v_lit_length > 0u) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
-                goto label__resume__continue;
-              }
-            } else if (v_run_length > 0u) {
-              v_run_length -= 1u;
-              wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, wuffs_base__make_slice_u8(self->private_data.f_scratch, self->private_impl.f_scratch_bytes_per_pixel));
-              if (v_dst_bytes_per_pixel <= ((uint64_t)(v_dst.len))) {
-                v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_dst_bytes_per_pixel);
-              }
-              v_dst_x += 1u;
-            } else {
-              if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
-                goto label__resume__continue;
-              }
-              if (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) < 128u) {
-                v_lit_length = (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) + 1u);
-                iop_a_src += 1u;
-                if ((v_lit_length + v_dst_x) > self->private_impl.f_width) {
-                  status = wuffs_base__make_status(wuffs_tga__error__bad_run_length_encoding);
-                  goto exit;
-                }
-              } else {
-                if (self->private_impl.f_src_bytes_per_pixel == 1u) {
-                  if (((uint64_t)(io2_a_src - iop_a_src)) < 2u) {
-                    status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(5);
-                    goto label__resume__continue;
-                  }
-                  v_run_length = ((((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) & 127u) + 1u);
-                  iop_a_src += 1u;
-                  self->private_data.f_scratch[0u] = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-                  iop_a_src += 1u;
-                } else if (self->private_impl.f_src_bytes_per_pixel == 3u) {
-                  if (((uint64_t)(io2_a_src - iop_a_src)) < 4u) {
-                    status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(6);
-                    goto label__resume__continue;
-                  }
-                  v_run_length = ((((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) & 127u) + 1u);
-                  iop_a_src += 1u;
-                  self->private_data.f_scratch[0u] = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-                  iop_a_src += 1u;
-                  self->private_data.f_scratch[1u] = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-                  iop_a_src += 1u;
-                  self->private_data.f_scratch[2u] = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-                  iop_a_src += 1u;
-                } else {
-                  if (((uint64_t)(io2_a_src - iop_a_src)) < 5u) {
-                    status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
-                    goto label__resume__continue;
-                  }
-                  v_run_length = ((((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) & 127u) + 1u);
-                  iop_a_src += 1u;
-                  self->private_data.f_scratch[0u] = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-                  iop_a_src += 1u;
-                  self->private_data.f_scratch[1u] = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-                  iop_a_src += 1u;
-                  self->private_data.f_scratch[2u] = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-                  iop_a_src += 1u;
-                  self->private_data.f_scratch[3u] = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-                  iop_a_src += 1u;
-                }
-                if ((v_run_length + v_dst_x) > self->private_impl.f_width) {
-                  status = wuffs_base__make_status(wuffs_tga__error__bad_run_length_encoding);
-                  goto exit;
-                }
-              }
-            }
-          } else {
-            if (v_lit_length > 0u) {
-              if (((uint64_t)(io2_a_src - iop_a_src)) < 2u) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
-                goto label__resume__continue;
-              }
-              v_c = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-              iop_a_src += 2u;
-              v_c5 = (31u & (v_c >> 0u));
-              self->private_data.f_scratch[0u] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u))));
-              v_c5 = (31u & (v_c >> 5u));
-              self->private_data.f_scratch[1u] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u))));
-              v_c5 = (31u & (v_c >> 10u));
-              self->private_data.f_scratch[2u] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u))));
-              self->private_data.f_scratch[3u] = 255u;
-              wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, wuffs_base__make_slice_u8(self->private_data.f_scratch, 4));
-              if (v_dst_bytes_per_pixel <= ((uint64_t)(v_dst.len))) {
-                v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_dst_bytes_per_pixel);
-              }
-              v_dst_x += 1u;
-              v_lit_length -= 1u;
-            } else if (v_run_length > 0u) {
-              v_run_length -= 1u;
-              wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, wuffs_base__make_slice_u8(self->private_data.f_scratch, self->private_impl.f_scratch_bytes_per_pixel));
-              if (v_dst_bytes_per_pixel <= ((uint64_t)(v_dst.len))) {
-                v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_dst_bytes_per_pixel);
-              }
-              v_dst_x += 1u;
-            } else {
-              if (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-                status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9);
-                goto label__resume__continue;
-              }
-              if (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) < 128u) {
-                v_lit_length = (((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) + 1u);
-                iop_a_src += 1u;
-                if ((v_lit_length + v_dst_x) > self->private_impl.f_width) {
-                  status = wuffs_base__make_status(wuffs_tga__error__bad_run_length_encoding);
-                  goto exit;
-                }
-              } else {
-                if (((uint64_t)(io2_a_src - iop_a_src)) < 3u) {
-                  status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-                  WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10);
-                  goto label__resume__continue;
-                }
-                v_run_length = ((((uint32_t)(wuffs_base__peek_u8be__no_bounds_check(iop_a_src))) & 127u) + 1u);
-                iop_a_src += 1u;
-                v_c = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
-                iop_a_src += 2u;
-                v_c5 = (31u & (v_c >> 0u));
-                self->private_data.f_scratch[0u] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u))));
-                v_c5 = (31u & (v_c >> 5u));
-                self->private_data.f_scratch[1u] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u))));
-                v_c5 = (31u & (v_c >> 10u));
-                self->private_data.f_scratch[2u] = ((uint8_t)(((v_c5 << 3u) | (v_c5 >> 2u))));
-                self->private_data.f_scratch[3u] = 255u;
-                if ((v_run_length + v_dst_x) > self->private_impl.f_width) {
-                  status = wuffs_base__make_status(wuffs_tga__error__bad_run_length_encoding);
-                  goto exit;
-                }
-              }
-            }
-          }
-        }
-        v_dst_x = 0u;
-        if ((self->private_impl.f_header_image_descriptor & 32u) == 0u) {
-          v_dst_y -= 1u;
-        } else {
-          v_dst_y += 1u;
-        }
-        if ((self->private_impl.f_header_image_type & 8u) == 0u) {
-          v_lit_length = self->private_impl.f_width;
-        }
-      }
-      break;
-    }
-    self->private_impl.f_call_sequence = 96u;
-
-    ok:
-    self->private_impl.p_do_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_decode_frame[0].v_dst_bytes_per_pixel = v_dst_bytes_per_pixel;
-  self->private_data.s_do_decode_frame[0].v_dst_x = v_dst_x;
-  self->private_data.s_do_decode_frame[0].v_dst_y = v_dst_y;
-  self->private_data.s_do_decode_frame[0].v_mark = v_mark;
-  self->private_data.s_do_decode_frame[0].v_num_pixels32 = v_num_pixels32;
-  self->private_data.s_do_decode_frame[0].v_lit_length = v_lit_length;
-  self->private_data.s_do_decode_frame[0].v_run_length = v_run_length;
-  self->private_data.s_do_decode_frame[0].v_num_dst_bytes = v_num_dst_bytes;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func tga.decoder.frame_dirty_rect
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_tga__decoder__frame_dirty_rect(
-    const wuffs_tga__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-
-  return wuffs_base__utility__make_rect_ie_u32(
-      0u,
-      0u,
-      self->private_impl.f_width,
-      self->private_impl.f_height);
-}
-
-// -------- func tga.decoder.num_animation_loops
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_tga__decoder__num_animation_loops(
-    const wuffs_tga__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func tga.decoder.num_decoded_frame_configs
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_tga__decoder__num_decoded_frame_configs(
-    const wuffs_tga__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 32u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func tga.decoder.num_decoded_frames
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_tga__decoder__num_decoded_frames(
-    const wuffs_tga__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 64u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func tga.decoder.restart_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__restart_frame(
-    wuffs_tga__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (self->private_impl.f_call_sequence < 32u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-  }
-  if (a_index != 0u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  self->private_impl.f_call_sequence = 40u;
-  self->private_impl.f_frame_config_io_position = a_io_position;
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func tga.decoder.set_report_metadata
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_tga__decoder__set_report_metadata(
-    wuffs_tga__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report) {
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func tga.decoder.tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_tga__decoder__tell_me_more(
-    wuffs_tga__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 4)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  status = wuffs_base__make_status(wuffs_base__error__no_more_information);
-  goto exit;
-
-  goto ok;
-  ok:
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func tga.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_tga__decoder__workbuf_len(
-    const wuffs_tga__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(0u, 0u);
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA)
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__WBMP)
-
-// ---------------- Status Codes Implementations
-
-const char wuffs_wbmp__error__bad_header[] = "#wbmp: bad header";
-const char wuffs_wbmp__error__truncated_input[] = "#wbmp: truncated input";
-
-// ---------------- Private Consts
-
-// ---------------- Private Initializer Prototypes
-
-// ---------------- Private Function Prototypes
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_wbmp__decoder__do_decode_image_config(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_wbmp__decoder__do_decode_frame_config(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src);
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_wbmp__decoder__do_decode_frame(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts);
-
-// ---------------- VTables
-
-const wuffs_base__image_decoder__func_ptrs
-wuffs_wbmp__decoder__func_ptrs_for__wuffs_base__image_decoder = {
-  (wuffs_base__status(*)(void*,
-      wuffs_base__pixel_buffer*,
-      wuffs_base__io_buffer*,
-      wuffs_base__pixel_blend,
-      wuffs_base__slice_u8,
-      wuffs_base__decode_frame_options*))(&wuffs_wbmp__decoder__decode_frame),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__frame_config*,
-      wuffs_base__io_buffer*))(&wuffs_wbmp__decoder__decode_frame_config),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__image_config*,
-      wuffs_base__io_buffer*))(&wuffs_wbmp__decoder__decode_image_config),
-  (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_wbmp__decoder__frame_dirty_rect),
-  (uint64_t(*)(const void*,
-      uint32_t))(&wuffs_wbmp__decoder__get_quirk),
-  (uint32_t(*)(const void*))(&wuffs_wbmp__decoder__num_animation_loops),
-  (uint64_t(*)(const void*))(&wuffs_wbmp__decoder__num_decoded_frame_configs),
-  (uint64_t(*)(const void*))(&wuffs_wbmp__decoder__num_decoded_frames),
-  (wuffs_base__status(*)(void*,
-      uint64_t,
-      uint64_t))(&wuffs_wbmp__decoder__restart_frame),
-  (wuffs_base__status(*)(void*,
-      uint32_t,
-      uint64_t))(&wuffs_wbmp__decoder__set_quirk),
-  (wuffs_base__empty_struct(*)(void*,
-      uint32_t,
-      bool))(&wuffs_wbmp__decoder__set_report_metadata),
-  (wuffs_base__status(*)(void*,
-      wuffs_base__io_buffer*,
-      wuffs_base__more_information*,
-      wuffs_base__io_buffer*))(&wuffs_wbmp__decoder__tell_me_more),
-  (wuffs_base__range_ii_u64(*)(const void*))(&wuffs_wbmp__decoder__workbuf_len),
-};
-
-// ---------------- Initializer Implementations
-
-wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
-wuffs_wbmp__decoder__initialize(
-    wuffs_wbmp__decoder* self,
-    size_t sizeof_star_self,
-    uint64_t wuffs_version,
-    uint32_t options){
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (sizeof(*self) != sizeof_star_self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_sizeof_receiver);
-  }
-  if (((wuffs_version >> 32) != WUFFS_VERSION_MAJOR) ||
-      (((wuffs_version >> 16) & 0xFFFF) > WUFFS_VERSION_MINOR)) {
-    return wuffs_base__make_status(wuffs_base__error__bad_wuffs_version);
-  }
-
-  if ((options & WUFFS_INITIALIZE__ALREADY_ZEROED) != 0) {
-    // The whole point of this if-check is to detect an uninitialized *self.
-    // We disable the warning on GCC. Clang-5.0 does not have this warning.
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
-    if (self->private_impl.magic != 0) {
-      return wuffs_base__make_status(wuffs_base__error__initialize_falsely_claimed_already_zeroed);
-    }
-#if !defined(__clang__) && defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-  } else {
-    if ((options & WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED) == 0) {
-      memset(self, 0, sizeof(*self));
-      options |= WUFFS_INITIALIZE__ALREADY_ZEROED;
-    } else {
-      memset(&(self->private_impl), 0, sizeof(self->private_impl));
-    }
-  }
-
-  self->private_impl.magic = WUFFS_BASE__MAGIC;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.vtable_name =
-      wuffs_base__image_decoder__vtable_name;
-  self->private_impl.vtable_for__wuffs_base__image_decoder.function_pointers =
-      (const void*)(&wuffs_wbmp__decoder__func_ptrs_for__wuffs_base__image_decoder);
-  return wuffs_base__make_status(NULL);
-}
-
-wuffs_wbmp__decoder*
-wuffs_wbmp__decoder__alloc() {
-  wuffs_wbmp__decoder* x =
-      (wuffs_wbmp__decoder*)(calloc(sizeof(wuffs_wbmp__decoder), 1));
-  if (!x) {
-    return NULL;
-  }
-  if (wuffs_wbmp__decoder__initialize(
-      x, sizeof(wuffs_wbmp__decoder), WUFFS_VERSION, WUFFS_INITIALIZE__ALREADY_ZEROED).repr) {
-    free(x);
-    return NULL;
-  }
-  return x;
-}
-
-size_t
-sizeof__wuffs_wbmp__decoder() {
-  return sizeof(wuffs_wbmp__decoder);
-}
-
-// ---------------- Function Implementations
-
-// -------- func wbmp.decoder.get_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_wbmp__decoder__get_quirk(
-    const wuffs_wbmp__decoder* self,
-    uint32_t a_key) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func wbmp.decoder.set_quirk
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__set_quirk(
-    wuffs_wbmp__decoder* self,
-    uint32_t a_key,
-    uint64_t a_value) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  return wuffs_base__make_status(wuffs_base__error__unsupported_option);
-}
-
-// -------- func wbmp.decoder.decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__decode_image_config(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 1)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_image_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_wbmp__decoder__do_decode_image_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_wbmp__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func wbmp.decoder.do_decode_image_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_wbmp__decoder__do_decode_image_config(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__image_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  uint8_t v_c = 0;
-  uint32_t v_i = 0;
-  uint32_t v_p = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config[0];
-  if (coro_susp_point) {
-    v_i = self->private_data.s_do_decode_image_config[0].v_i;
-    v_p = self->private_data.s_do_decode_image_config[0].v_p;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-      goto exit;
-    }
-    v_i = 0u;
-    while (v_i < 2u) {
-      {
-        WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-        if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-          status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-          goto suspend;
-        }
-        uint8_t t_0 = *iop_a_src++;
-        v_c = t_0;
-      }
-      if (v_c != 0u) {
-        status = wuffs_base__make_status(wuffs_wbmp__error__bad_header);
-        goto exit;
-      }
-      v_i += 1u;
-    }
-    v_i = 0u;
-    while (v_i < 2u) {
-      v_p = 0u;
-      while (true) {
-        {
-          WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-          if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
-            status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-            goto suspend;
-          }
-          uint8_t t_1 = *iop_a_src++;
-          v_c = t_1;
-        }
-        v_p |= ((uint32_t)((v_c & 127u)));
-        if ((v_c >> 7u) == 0u) {
-          break;
-        } else if (v_p > 131071u) {
-          status = wuffs_base__make_status(wuffs_base__error__unsupported_image_dimension);
-          goto exit;
-        }
-        v_p <<= 7u;
-      }
-      if (v_i == 0u) {
-        self->private_impl.f_width = v_p;
-      } else {
-        self->private_impl.f_height = v_p;
-      }
-      v_i += 1u;
-    }
-    self->private_impl.f_frame_config_io_position = wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)));
-    if (a_dst != NULL) {
-      wuffs_base__image_config__set(
-          a_dst,
-          2198077448u,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height,
-          self->private_impl.f_frame_config_io_position,
-          true);
-    }
-    self->private_impl.f_call_sequence = 32u;
-
-    goto ok;
-    ok:
-    self->private_impl.p_do_decode_image_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_decode_image_config[0].v_i = v_i;
-  self->private_data.s_do_decode_image_config[0].v_p = v_p;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func wbmp.decoder.decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__decode_frame_config(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 2)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_wbmp__decoder__do_decode_frame_config(self, a_dst, a_src);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_wbmp__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 2 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func wbmp.decoder.do_decode_frame_config
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_wbmp__decoder__do_decode_frame_config(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__frame_config* a_dst,
-    wuffs_base__io_buffer* a_src) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 32u) {
-    } else if (self->private_impl.f_call_sequence < 32u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_wbmp__decoder__do_decode_image_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else if (self->private_impl.f_call_sequence == 40u) {
-      if (self->private_impl.f_frame_config_io_position != wuffs_base__u64__sat_add((a_src ? a_src->meta.pos : 0), ((uint64_t)(iop_a_src - io0_a_src)))) {
-        status = wuffs_base__make_status(wuffs_base__error__bad_restart);
-        goto exit;
-      }
-    } else if (self->private_impl.f_call_sequence == 64u) {
-      self->private_impl.f_call_sequence = 96u;
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    if (a_dst != NULL) {
-      wuffs_base__frame_config__set(
-          a_dst,
-          wuffs_base__utility__make_rect_ie_u32(
-          0u,
-          0u,
-          self->private_impl.f_width,
-          self->private_impl.f_height),
-          ((wuffs_base__flicks)(0u)),
-          0u,
-          self->private_impl.f_frame_config_io_position,
-          0u,
-          true,
-          false,
-          4278190080u);
-    }
-    self->private_impl.f_call_sequence = 64u;
-
-    ok:
-    self->private_impl.p_do_decode_frame_config[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func wbmp.decoder.decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__decode_frame(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 3)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame[0];
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    while (true) {
-      {
-        wuffs_base__status t_0 = wuffs_wbmp__decoder__do_decode_frame(self,
-            a_dst,
-            a_src,
-            a_blend,
-            a_workbuf,
-            a_opts);
-        v_status = t_0;
-      }
-      if ((v_status.repr == wuffs_base__suspension__short_read) && (a_src && a_src->meta.closed)) {
-        status = wuffs_base__make_status(wuffs_wbmp__error__truncated_input);
-        goto exit;
-      }
-      status = v_status;
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
-    }
-
-    ok:
-    self->private_impl.p_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 3 : 0;
-
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func wbmp.decoder.do_decode_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-static wuffs_base__status
-wuffs_wbmp__decoder__do_decode_frame(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__pixel_buffer* a_dst,
-    wuffs_base__io_buffer* a_src,
-    wuffs_base__pixel_blend a_blend,
-    wuffs_base__slice_u8 a_workbuf,
-    wuffs_base__decode_frame_options* a_opts) {
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  wuffs_base__status v_status = wuffs_base__make_status(NULL);
-  wuffs_base__pixel_format v_dst_pixfmt = {0};
-  uint32_t v_dst_bits_per_pixel = 0;
-  uint64_t v_dst_bytes_per_pixel = 0;
-  uint64_t v_dst_x_in_bytes = 0;
-  uint32_t v_dst_x = 0;
-  uint32_t v_dst_y = 0;
-  wuffs_base__table_u8 v_tab = {0};
-  wuffs_base__slice_u8 v_dst = {0};
-  uint8_t v_src[1] = {0};
-  uint8_t v_c = 0;
-
-  const uint8_t* iop_a_src = NULL;
-  const uint8_t* io0_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io1_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  const uint8_t* io2_a_src WUFFS_BASE__POTENTIALLY_UNUSED = NULL;
-  if (a_src && a_src->data.ptr) {
-    io0_a_src = a_src->data.ptr;
-    io1_a_src = io0_a_src + a_src->meta.ri;
-    iop_a_src = io1_a_src;
-    io2_a_src = io0_a_src + a_src->meta.wi;
-  }
-
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame[0];
-  if (coro_susp_point) {
-    v_dst_bytes_per_pixel = self->private_data.s_do_decode_frame[0].v_dst_bytes_per_pixel;
-    v_dst_x = self->private_data.s_do_decode_frame[0].v_dst_x;
-    v_dst_y = self->private_data.s_do_decode_frame[0].v_dst_y;
-    memcpy(v_src, self->private_data.s_do_decode_frame[0].v_src, sizeof(v_src));
-    v_c = self->private_data.s_do_decode_frame[0].v_c;
-  }
-  switch (coro_susp_point) {
-    WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
-
-    if (self->private_impl.f_call_sequence == 64u) {
-    } else if (self->private_impl.f_call_sequence < 64u) {
-      if (a_src) {
-        a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-      }
-      WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
-      status = wuffs_wbmp__decoder__do_decode_frame_config(self, NULL, a_src);
-      if (a_src) {
-        iop_a_src = a_src->data.ptr + a_src->meta.ri;
-      }
-      if (status.repr) {
-        goto suspend;
-      }
-    } else {
-      status = wuffs_base__make_status(wuffs_base__note__end_of_data);
-      goto ok;
-    }
-    v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler,
-        wuffs_base__pixel_buffer__pixel_format(a_dst),
-        wuffs_base__pixel_buffer__palette(a_dst),
-        wuffs_base__utility__make_pixel_format(536870920u),
-        wuffs_base__utility__empty_slice_u8(),
-        a_blend);
-    if ( ! wuffs_base__status__is_ok(&v_status)) {
-      status = v_status;
-      if (wuffs_base__status__is_error(&status)) {
-        goto exit;
-      } else if (wuffs_base__status__is_suspension(&status)) {
-        status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension);
-        goto exit;
-      }
-      goto ok;
-    }
-    v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst);
-    v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt);
-    if ((v_dst_bits_per_pixel & 7u) != 0u) {
-      status = wuffs_base__make_status(wuffs_base__error__unsupported_option);
-      goto exit;
-    }
-    v_dst_bytes_per_pixel = ((uint64_t)((v_dst_bits_per_pixel / 8u)));
-    if (self->private_impl.f_width > 0u) {
-      v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-      while (v_dst_y < self->private_impl.f_height) {
-        v_dst = wuffs_base__table_u8__row_u32(v_tab, v_dst_y);
-        v_dst_x = 0u;
-        while (v_dst_x < self->private_impl.f_width) {
-          if ((v_dst_x & 7u) == 0u) {
-            while (((uint64_t)(io2_a_src - iop_a_src)) <= 0u) {
-              status = wuffs_base__make_status(wuffs_base__suspension__short_read);
-              WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
-              v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u);
-              v_dst = wuffs_base__table_u8__row_u32(v_tab, v_dst_y);
-              v_dst_x_in_bytes = (((uint64_t)(v_dst_x)) * v_dst_bytes_per_pixel);
-              if (v_dst_x_in_bytes <= ((uint64_t)(v_dst.len))) {
-                v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_dst_x_in_bytes);
-              }
-            }
-            v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-            iop_a_src += 1u;
-          }
-          if ((v_c & 128u) == 0u) {
-            v_src[0u] = 0u;
-          } else {
-            v_src[0u] = 255u;
-          }
-          v_c = ((uint8_t)((((uint32_t)(v_c)) << 1u)));
-          wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, wuffs_base__utility__empty_slice_u8(), wuffs_base__make_slice_u8(v_src, 1));
-          if (v_dst_bytes_per_pixel <= ((uint64_t)(v_dst.len))) {
-            v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_dst_bytes_per_pixel);
-          }
-          v_dst_x += 1u;
-        }
-        v_dst_y += 1u;
-      }
-    }
-    self->private_impl.f_call_sequence = 96u;
-
-    ok:
-    self->private_impl.p_do_decode_frame[0] = 0;
-    goto exit;
-  }
-
-  goto suspend;
-  suspend:
-  self->private_impl.p_do_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_decode_frame[0].v_dst_bytes_per_pixel = v_dst_bytes_per_pixel;
-  self->private_data.s_do_decode_frame[0].v_dst_x = v_dst_x;
-  self->private_data.s_do_decode_frame[0].v_dst_y = v_dst_y;
-  memcpy(self->private_data.s_do_decode_frame[0].v_src, v_src, sizeof(v_src));
-  self->private_data.s_do_decode_frame[0].v_c = v_c;
-
-  goto exit;
-  exit:
-  if (a_src && a_src->data.ptr) {
-    a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr));
-  }
-
-  return status;
-}
-
-// -------- func wbmp.decoder.frame_dirty_rect
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32
-wuffs_wbmp__decoder__frame_dirty_rect(
-    const wuffs_wbmp__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_rect_ie_u32();
-  }
-
-  return wuffs_base__utility__make_rect_ie_u32(
-      0u,
-      0u,
-      self->private_impl.f_width,
-      self->private_impl.f_height);
-}
-
-// -------- func wbmp.decoder.num_animation_loops
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint32_t
-wuffs_wbmp__decoder__num_animation_loops(
-    const wuffs_wbmp__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
-// -------- func wbmp.decoder.num_decoded_frame_configs
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_wbmp__decoder__num_decoded_frame_configs(
-    const wuffs_wbmp__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 32u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func wbmp.decoder.num_decoded_frames
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_wbmp__decoder__num_decoded_frames(
-    const wuffs_wbmp__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  if (self->private_impl.f_call_sequence > 64u) {
-    return 1u;
-  }
-  return 0u;
-}
-
-// -------- func wbmp.decoder.restart_frame
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__restart_frame(
-    wuffs_wbmp__decoder* self,
-    uint64_t a_index,
-    uint64_t a_io_position) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-
-  if (self->private_impl.f_call_sequence < 32u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_call_sequence);
-  }
-  if (a_index != 0u) {
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  self->private_impl.f_call_sequence = 40u;
-  self->private_impl.f_frame_config_io_position = a_io_position;
-  return wuffs_base__make_status(NULL);
-}
-
-// -------- func wbmp.decoder.set_report_metadata
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
-wuffs_wbmp__decoder__set_report_metadata(
-    wuffs_wbmp__decoder* self,
-    uint32_t a_fourcc,
-    bool a_report) {
-  return wuffs_base__make_empty_struct();
-}
-
-// -------- func wbmp.decoder.tell_me_more
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__status
-wuffs_wbmp__decoder__tell_me_more(
-    wuffs_wbmp__decoder* self,
-    wuffs_base__io_buffer* a_dst,
-    wuffs_base__more_information* a_minfo,
-    wuffs_base__io_buffer* a_src) {
-  if (!self) {
-    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
-  }
-  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
-    return wuffs_base__make_status(
-        (self->private_impl.magic == WUFFS_BASE__DISABLED)
-        ? wuffs_base__error__disabled_by_previous_error
-        : wuffs_base__error__initialize_not_called);
-  }
-  if (!a_dst || !a_src) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__bad_argument);
-  }
-  if ((self->private_impl.active_coroutine != 0) &&
-      (self->private_impl.active_coroutine != 4)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-    return wuffs_base__make_status(wuffs_base__error__interleaved_coroutine_calls);
-  }
-  self->private_impl.active_coroutine = 0;
-  wuffs_base__status status = wuffs_base__make_status(NULL);
-
-  status = wuffs_base__make_status(wuffs_base__error__no_more_information);
-  goto exit;
-
-  goto ok;
-  ok:
-  goto exit;
-  exit:
-  if (wuffs_base__status__is_error(&status)) {
-    self->private_impl.magic = WUFFS_BASE__DISABLED;
-  }
-  return status;
-}
-
-// -------- func wbmp.decoder.workbuf_len
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
-wuffs_wbmp__decoder__workbuf_len(
-    const wuffs_wbmp__decoder* self) {
-  if (!self) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return wuffs_base__utility__empty_range_ii_u64();
-  }
-
-  return wuffs_base__utility__make_range_ii_u64(0u, 0u);
-}
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__WBMP)
-
-#if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-// ---------------- Auxiliary - Base
-
-// Auxiliary code is discussed at
-// https://github.com/google/wuffs/blob/main/doc/note/auxiliary-code.md
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__AUX__BASE)
-
-namespace wuffs_aux {
-
-namespace sync_io {
-
-// --------
-
-DynIOBuffer::DynIOBuffer(uint64_t max_incl)
-    : m_buf(wuffs_base__empty_io_buffer()), m_max_incl(max_incl) {}
-
-DynIOBuffer::~DynIOBuffer() {
-  if (m_buf.data.ptr) {
-    free(m_buf.data.ptr);
-  }
-}
-
-void  //
-DynIOBuffer::drop() {
-  if (m_buf.data.ptr) {
-    free(m_buf.data.ptr);
-  }
-  m_buf = wuffs_base__empty_io_buffer();
-}
-
-DynIOBuffer::GrowResult  //
-DynIOBuffer::grow(uint64_t min_incl) {
-  uint64_t n = round_up(min_incl, m_max_incl);
-  if (n == 0) {
-    return ((min_incl == 0) && (m_max_incl == 0))
-               ? DynIOBuffer::GrowResult::OK
-               : DynIOBuffer::GrowResult::FailedMaxInclExceeded;
-  } else if (n > m_buf.data.len) {
-    uint8_t* ptr = static_cast<uint8_t*>(realloc(m_buf.data.ptr, n));
-    if (!ptr) {
-      return DynIOBuffer::GrowResult::FailedOutOfMemory;
-    }
-    m_buf.data.ptr = ptr;
-    m_buf.data.len = n;
-  }
-  return DynIOBuffer::GrowResult::OK;
-}
-
-// round_up rounds min_incl up, returning the smallest value x satisfying
-// (min_incl <= x) and (x <= max_incl) and some other constraints. It returns 0
-// if there is no such x.
-//
-// When max_incl <= 4096, the other constraints are:
-//  - (x == max_incl)
-//
-// When max_incl >  4096, the other constraints are:
-//  - (x == max_incl) or (x is a power of 2)
-//  - (x >= 4096)
-uint64_t  //
-DynIOBuffer::round_up(uint64_t min_incl, uint64_t max_incl) {
-  if (min_incl > max_incl) {
-    return 0;
-  }
-  uint64_t n = 4096;
-  if (n >= max_incl) {
-    return max_incl;
-  }
-  while (n < min_incl) {
-    if (n >= (max_incl / 2)) {
-      return max_incl;
-    }
-    n *= 2;
-  }
-  return n;
-}
-
-// --------
-
-Input::~Input() {}
-
-IOBuffer*  //
-Input::BringsItsOwnIOBuffer() {
-  return nullptr;
-}
-
-// --------
-
-FileInput::FileInput(FILE* f) : m_f(f) {}
-
-std::string  //
-FileInput::CopyIn(IOBuffer* dst) {
-  if (!m_f) {
-    return "wuffs_aux::sync_io::FileInput: nullptr file";
-  } else if (!dst) {
-    return "wuffs_aux::sync_io::FileInput: nullptr IOBuffer";
-  } else if (dst->meta.closed) {
-    return "wuffs_aux::sync_io::FileInput: end of file";
-  } else {
-    dst->compact();
-    size_t n = fread(dst->writer_pointer(), 1, dst->writer_length(), m_f);
-    dst->meta.wi += n;
-    dst->meta.closed = feof(m_f);
-    if (ferror(m_f)) {
-      return "wuffs_aux::sync_io::FileInput: error reading file";
-    }
-  }
-  return "";
-}
-
-// --------
-
-MemoryInput::MemoryInput(const char* ptr, size_t len)
-    : m_io(wuffs_base__ptr_u8__reader(
-          static_cast<uint8_t*>(static_cast<void*>(const_cast<char*>(ptr))),
-          len,
-          true)) {}
-
-MemoryInput::MemoryInput(const uint8_t* ptr, size_t len)
-    : m_io(wuffs_base__ptr_u8__reader(const_cast<uint8_t*>(ptr), len, true)) {}
-
-IOBuffer*  //
-MemoryInput::BringsItsOwnIOBuffer() {
-  return &m_io;
-}
-
-std::string  //
-MemoryInput::CopyIn(IOBuffer* dst) {
-  if (!dst) {
-    return "wuffs_aux::sync_io::MemoryInput: nullptr IOBuffer";
-  } else if (dst->meta.closed) {
-    return "wuffs_aux::sync_io::MemoryInput: end of file";
-  } else if (wuffs_base__slice_u8__overlaps(dst->data, m_io.data)) {
-    // Treat m_io's data as immutable, so don't compact dst or otherwise write
-    // to it.
-    return "wuffs_aux::sync_io::MemoryInput: overlapping buffers";
-  } else {
-    dst->compact();
-    size_t nd = dst->writer_length();
-    size_t ns = m_io.reader_length();
-    size_t n = (nd < ns) ? nd : ns;
-    memcpy(dst->writer_pointer(), m_io.reader_pointer(), n);
-    m_io.meta.ri += n;
-    dst->meta.wi += n;
-    dst->meta.closed = m_io.reader_length() == 0;
-  }
-  return "";
-}
-
-// --------
-
-}  // namespace sync_io
-
-namespace private_impl {
-
-struct ErrorMessages {
-  const char* max_incl_metadata_length_exceeded;
-  const char* out_of_memory;
-  const char* unexpected_end_of_file;
-  const char* unsupported_metadata;
-  const char* unsupported_negative_advance;
-
-  // If adding new "const char*" typed fields to this struct, either add them
-  // after existing fields or, if re-ordering fields, make sure that you update
-  // all of the "const private_impl::ErrorMessages FooBarErrorMessages" values
-  // in all of the sibling *.cc files.
-
-  static inline const char* resolve(const char* s) {
-    return s ? s : "wuffs_aux::private_impl: unknown error";
-  };
-};
-
-std::string  //
-AdvanceIOBufferTo(const ErrorMessages& error_messages,
-                  sync_io::Input& input,
-                  IOBuffer& io_buf,
-                  uint64_t absolute_position) {
-  if (absolute_position < io_buf.reader_position()) {
-    return error_messages.resolve(error_messages.unsupported_negative_advance);
-  }
-  while (true) {
-    uint64_t relative_position = absolute_position - io_buf.reader_position();
-    if (relative_position <= io_buf.reader_length()) {
-      io_buf.meta.ri += (size_t)relative_position;
-      break;
-    } else if (io_buf.meta.closed) {
-      return error_messages.resolve(error_messages.unexpected_end_of_file);
-    }
-    io_buf.meta.ri = io_buf.meta.wi;
-    if (!input.BringsItsOwnIOBuffer()) {
-      io_buf.compact();
-    }
-    std::string error_message = input.CopyIn(&io_buf);
-    if (!error_message.empty()) {
-      return error_message;
-    }
-  }
-  return "";
-}
-
-std::string  //
-HandleMetadata(
-    const ErrorMessages& error_messages,
-    sync_io::Input& input,
-    wuffs_base__io_buffer& io_buf,
-    sync_io::DynIOBuffer& raw,
-    wuffs_base__status (*tell_me_more_func)(void*,
-                                            wuffs_base__io_buffer*,
-                                            wuffs_base__more_information*,
-                                            wuffs_base__io_buffer*),
-    void* tell_me_more_receiver,
-    std::string (*handle_metadata_func)(void*,
-                                        const wuffs_base__more_information*,
-                                        wuffs_base__slice_u8),
-    void* handle_metadata_receiver) {
-  wuffs_base__more_information minfo = wuffs_base__empty_more_information();
-  // Reset raw but keep its backing array (the raw.m_buf.data slice).
-  raw.m_buf.meta = wuffs_base__empty_io_buffer_meta();
-
-  while (true) {
-    minfo = wuffs_base__empty_more_information();
-    wuffs_base__status status = (*tell_me_more_func)(
-        tell_me_more_receiver, &raw.m_buf, &minfo, &io_buf);
-    switch (minfo.flavor) {
-      case 0:
-      case WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_TRANSFORM:
-      case WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_PARSED:
-        break;
-
-      case WUFFS_BASE__MORE_INFORMATION__FLAVOR__METADATA_RAW_PASSTHROUGH: {
-        wuffs_base__range_ie_u64 r = minfo.metadata_raw_passthrough__range();
-        if (r.is_empty()) {
-          break;
-        }
-        uint64_t num_to_copy = r.length();
-        if (num_to_copy > (raw.m_max_incl - raw.m_buf.meta.wi)) {
-          return error_messages.resolve(
-              error_messages.max_incl_metadata_length_exceeded);
-        } else if (num_to_copy > (raw.m_buf.data.len - raw.m_buf.meta.wi)) {
-          switch (raw.grow(num_to_copy + raw.m_buf.meta.wi)) {
-            case sync_io::DynIOBuffer::GrowResult::OK:
-              break;
-            case sync_io::DynIOBuffer::GrowResult::FailedMaxInclExceeded:
-              return error_messages.resolve(
-                  error_messages.max_incl_metadata_length_exceeded);
-            case sync_io::DynIOBuffer::GrowResult::FailedOutOfMemory:
-              return error_messages.resolve(error_messages.out_of_memory);
-          }
-        }
-
-        if (io_buf.reader_position() > r.min_incl) {
-          return error_messages.resolve(error_messages.unsupported_metadata);
-        } else {
-          std::string error_message =
-              AdvanceIOBufferTo(error_messages, input, io_buf, r.min_incl);
-          if (!error_message.empty()) {
-            return error_message;
-          }
-        }
-
-        while (true) {
-          uint64_t n =
-              wuffs_base__u64__min(num_to_copy, io_buf.reader_length());
-          memcpy(raw.m_buf.writer_pointer(), io_buf.reader_pointer(), n);
-          raw.m_buf.meta.wi += n;
-          io_buf.meta.ri += n;
-          num_to_copy -= n;
-          if (num_to_copy == 0) {
-            break;
-          } else if (io_buf.meta.closed) {
-            return error_messages.resolve(
-                error_messages.unexpected_end_of_file);
-          } else if (!input.BringsItsOwnIOBuffer()) {
-            io_buf.compact();
-          }
-          std::string error_message = input.CopyIn(&io_buf);
-          if (!error_message.empty()) {
-            return error_message;
-          }
-        }
-        break;
-      }
-
-      default:
-        return error_messages.resolve(error_messages.unsupported_metadata);
-    }
-
-    if (status.repr == nullptr) {
-      break;
-    } else if (status.repr != wuffs_base__suspension__even_more_information) {
-      if (status.repr != wuffs_base__suspension__short_write) {
-        return status.message();
-      }
-      switch (raw.grow(wuffs_base__u64__sat_add(raw.m_buf.data.len, 1))) {
-        case sync_io::DynIOBuffer::GrowResult::OK:
-          break;
-        case sync_io::DynIOBuffer::GrowResult::FailedMaxInclExceeded:
-          return error_messages.resolve(
-              error_messages.max_incl_metadata_length_exceeded);
-        case sync_io::DynIOBuffer::GrowResult::FailedOutOfMemory:
-          return error_messages.resolve(error_messages.out_of_memory);
-      }
-    }
-  }
-
-  return (*handle_metadata_func)(handle_metadata_receiver, &minfo,
-                                 raw.m_buf.reader_slice());
-}
-
-}  // namespace private_impl
-
-}  // namespace wuffs_aux
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__AUX__BASE)
-
-// ---------------- Auxiliary - CBOR
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__AUX__CBOR)
-
-#include <utility>
-
-namespace wuffs_aux {
-
-DecodeCborResult::DecodeCborResult(std::string&& error_message0,
-                                   uint64_t cursor_position0)
-    : error_message(std::move(error_message0)),
-      cursor_position(cursor_position0) {}
-
-DecodeCborCallbacks::~DecodeCborCallbacks() {}
-
-void  //
-DecodeCborCallbacks::Done(DecodeCborResult& result,
-                          sync_io::Input& input,
-                          IOBuffer& buffer) {}
-
-DecodeCborArgQuirks::DecodeCborArgQuirks(wuffs_base__slice_u32 repr0)
-    : repr(repr0) {}
-
-DecodeCborArgQuirks::DecodeCborArgQuirks(uint32_t* ptr0, size_t len0)
-    : repr(wuffs_base__make_slice_u32(ptr0, len0)) {}
-
-DecodeCborArgQuirks  //
-DecodeCborArgQuirks::DefaultValue() {
-  return DecodeCborArgQuirks(wuffs_base__empty_slice_u32());
-}
-
-DecodeCborResult  //
-DecodeCbor(DecodeCborCallbacks& callbacks,
-           sync_io::Input& input,
-           DecodeCborArgQuirks quirks) {
-  // Prepare the wuffs_base__io_buffer and the resultant error_message.
-  wuffs_base__io_buffer* io_buf = input.BringsItsOwnIOBuffer();
-  wuffs_base__io_buffer fallback_io_buf = wuffs_base__empty_io_buffer();
-  std::unique_ptr<uint8_t[]> fallback_io_array(nullptr);
-  if (!io_buf) {
-    fallback_io_array = std::unique_ptr<uint8_t[]>(new uint8_t[4096]);
-    fallback_io_buf = wuffs_base__ptr_u8__writer(fallback_io_array.get(), 4096);
-    io_buf = &fallback_io_buf;
-  }
-  // cursor_index is discussed at
-  // https://nigeltao.github.io/blog/2020/jsonptr.html#the-cursor-index
-  size_t cursor_index = 0;
-  std::string ret_error_message;
-  std::string io_error_message;
-
-  do {
-    // Prepare the low-level CBOR decoder.
-    wuffs_cbor__decoder::unique_ptr dec = wuffs_cbor__decoder::alloc();
-    if (!dec) {
-      ret_error_message = "wuffs_aux::DecodeCbor: out of memory";
-      goto done;
-    }
-    for (size_t i = 0; i < quirks.repr.len; i++) {
-      dec->set_quirk(quirks.repr.ptr[i], 1);
-    }
-
-    // Prepare the wuffs_base__tok_buffer. 256 tokens is 2KiB.
-    wuffs_base__token tok_array[256];
-    wuffs_base__token_buffer tok_buf =
-        wuffs_base__slice_token__writer(wuffs_base__make_slice_token(
-            &tok_array[0], (sizeof(tok_array) / sizeof(tok_array[0]))));
-    wuffs_base__status tok_status = wuffs_base__make_status(nullptr);
-
-    // Prepare other state.
-    int32_t depth = 0;
-    std::string str;
-    int64_t extension_category = 0;
-    uint64_t extension_detail = 0;
-
-    // Valid token's VBCs range in 0 ..= 15. Values over that are for tokens
-    // from outside of the base package, such as the CBOR package.
-    constexpr int64_t EXT_CAT__CBOR_TAG = 16;
-
-    // Loop, doing these two things:
-    //  1. Get the next token.
-    //  2. Process that token.
-    while (true) {
-      // 1. Get the next token.
-
-      while (tok_buf.meta.ri >= tok_buf.meta.wi) {
-        if (tok_status.repr == nullptr) {
-          // No-op.
-        } else if (tok_status.repr == wuffs_base__suspension__short_write) {
-          tok_buf.compact();
-        } else if (tok_status.repr == wuffs_base__suspension__short_read) {
-          // Read from input to io_buf.
-          if (!io_error_message.empty()) {
-            ret_error_message = std::move(io_error_message);
-            goto done;
-          } else if (cursor_index != io_buf->meta.ri) {
-            ret_error_message =
-                "wuffs_aux::DecodeCbor: internal error: bad cursor_index";
-            goto done;
-          } else if (io_buf->meta.closed) {
-            ret_error_message =
-                "wuffs_aux::DecodeCbor: internal error: io_buf is closed";
-            goto done;
-          }
-          io_buf->compact();
-          if (io_buf->meta.wi >= io_buf->data.len) {
-            ret_error_message =
-                "wuffs_aux::DecodeCbor: internal error: io_buf is full";
-            goto done;
-          }
-          cursor_index = io_buf->meta.ri;
-          io_error_message = input.CopyIn(io_buf);
-        } else {
-          ret_error_message = tok_status.message();
-          goto done;
-        }
-
-        if (WUFFS_CBOR__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE != 0) {
-          ret_error_message =
-              "wuffs_aux::DecodeCbor: internal error: bad WORKBUF_LEN";
-          goto done;
-        }
-        wuffs_base__slice_u8 work_buf = wuffs_base__empty_slice_u8();
-        tok_status = dec->decode_tokens(&tok_buf, io_buf, work_buf);
-        if ((tok_buf.meta.ri > tok_buf.meta.wi) ||
-            (tok_buf.meta.wi > tok_buf.data.len) ||
-            (io_buf->meta.ri > io_buf->meta.wi) ||
-            (io_buf->meta.wi > io_buf->data.len)) {
-          ret_error_message =
-              "wuffs_aux::DecodeCbor: internal error: bad buffer indexes";
-          goto done;
-        }
-      }
-
-      wuffs_base__token token = tok_buf.data.ptr[tok_buf.meta.ri++];
-      uint64_t token_len = token.length();
-      if ((io_buf->meta.ri < cursor_index) ||
-          ((io_buf->meta.ri - cursor_index) < token_len)) {
-        ret_error_message =
-            "wuffs_aux::DecodeCbor: internal error: bad token indexes";
-        goto done;
-      }
-      uint8_t* token_ptr = io_buf->data.ptr + cursor_index;
-      cursor_index += static_cast<size_t>(token_len);
-
-      // 2. Process that token.
-
-      uint64_t vbd = token.value_base_detail();
-
-      if (extension_category != 0) {
-        int64_t ext = token.value_extension();
-        if ((ext >= 0) && !token.continued()) {
-          extension_detail = (extension_detail
-                              << WUFFS_BASE__TOKEN__VALUE_EXTENSION__NUM_BITS) |
-                             static_cast<uint64_t>(ext);
-          switch (extension_category) {
-            case WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_SIGNED:
-              extension_category = 0;
-              ret_error_message =
-                  callbacks.AppendI64(static_cast<int64_t>(extension_detail));
-              goto parsed_a_value;
-            case WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_UNSIGNED:
-              extension_category = 0;
-              ret_error_message = callbacks.AppendU64(extension_detail);
-              goto parsed_a_value;
-            case EXT_CAT__CBOR_TAG:
-              extension_category = 0;
-              ret_error_message = callbacks.AppendCborTag(extension_detail);
-              if (!ret_error_message.empty()) {
-                goto done;
-              }
-              continue;
-          }
-        }
-        ret_error_message =
-            "wuffs_aux::DecodeCbor: internal error: bad extended token";
-        goto done;
-      }
-
-      switch (token.value_base_category()) {
-        case WUFFS_BASE__TOKEN__VBC__FILLER:
-          continue;
-
-        case WUFFS_BASE__TOKEN__VBC__STRUCTURE: {
-          if (vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH) {
-            ret_error_message = callbacks.Push(static_cast<uint32_t>(vbd));
-            if (!ret_error_message.empty()) {
-              goto done;
-            }
-            depth++;
-            if (depth > WUFFS_CBOR__DECODER_DEPTH_MAX_INCL) {
-              ret_error_message =
-                  "wuffs_aux::DecodeCbor: internal error: bad depth";
-              goto done;
-            }
-            continue;
-          }
-          ret_error_message = callbacks.Pop(static_cast<uint32_t>(vbd));
-          depth--;
-          if (depth < 0) {
-            ret_error_message =
-                "wuffs_aux::DecodeCbor: internal error: bad depth";
-            goto done;
-          }
-          goto parsed_a_value;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__STRING: {
-          if (vbd & WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP) {
-            // No-op.
-          } else if (vbd &
-                     WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_1_SRC_COPY) {
-            const char* ptr =  // Convert from (uint8_t*).
-                static_cast<const char*>(static_cast<void*>(token_ptr));
-            str.append(ptr, static_cast<size_t>(token_len));
-          } else {
-            goto fail;
-          }
-          if (token.continued()) {
-            continue;
-          }
-          ret_error_message =
-              (vbd & WUFFS_BASE__TOKEN__VBD__STRING__CHAIN_MUST_BE_UTF_8)
-                  ? callbacks.AppendTextString(std::move(str))
-                  : callbacks.AppendByteString(std::move(str));
-          str.clear();
-          goto parsed_a_value;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT: {
-          uint8_t u[WUFFS_BASE__UTF_8__BYTE_LENGTH__MAX_INCL];
-          size_t n = wuffs_base__utf_8__encode(
-              wuffs_base__make_slice_u8(
-                  &u[0], WUFFS_BASE__UTF_8__BYTE_LENGTH__MAX_INCL),
-              static_cast<uint32_t>(vbd));
-          const char* ptr =  // Convert from (uint8_t*).
-              static_cast<const char*>(static_cast<void*>(&u[0]));
-          str.append(ptr, n);
-          if (token.continued()) {
-            continue;
-          }
-          goto fail;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__LITERAL: {
-          if (vbd & WUFFS_BASE__TOKEN__VBD__LITERAL__NULL) {
-            ret_error_message = callbacks.AppendNull();
-          } else if (vbd & WUFFS_BASE__TOKEN__VBD__LITERAL__UNDEFINED) {
-            ret_error_message = callbacks.AppendUndefined();
-          } else {
-            ret_error_message = callbacks.AppendBool(
-                vbd & WUFFS_BASE__TOKEN__VBD__LITERAL__TRUE);
-          }
-          goto parsed_a_value;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__NUMBER: {
-          const uint64_t cfp_fbbe_fifb =
-              WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT |
-              WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_BINARY_BIG_ENDIAN |
-              WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_IGNORE_FIRST_BYTE;
-          if ((vbd & cfp_fbbe_fifb) == cfp_fbbe_fifb) {
-            double f;
-            switch (token_len) {
-              case 3:
-                f = wuffs_base__ieee_754_bit_representation__from_u16_to_f64(
-                    wuffs_base__peek_u16be__no_bounds_check(token_ptr + 1));
-                break;
-              case 5:
-                f = wuffs_base__ieee_754_bit_representation__from_u32_to_f64(
-                    wuffs_base__peek_u32be__no_bounds_check(token_ptr + 1));
-                break;
-              case 9:
-                f = wuffs_base__ieee_754_bit_representation__from_u64_to_f64(
-                    wuffs_base__peek_u64be__no_bounds_check(token_ptr + 1));
-                break;
-              default:
-                goto fail;
-            }
-            ret_error_message = callbacks.AppendF64(f);
-            goto parsed_a_value;
-          }
-          goto fail;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_SIGNED: {
-          if (token.continued()) {
-            extension_category = WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_SIGNED;
-            extension_detail =
-                static_cast<uint64_t>(token.value_base_detail__sign_extended());
-            continue;
-          }
-          ret_error_message =
-              callbacks.AppendI64(token.value_base_detail__sign_extended());
-          goto parsed_a_value;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_UNSIGNED: {
-          if (token.continued()) {
-            extension_category =
-                WUFFS_BASE__TOKEN__VBC__INLINE_INTEGER_UNSIGNED;
-            extension_detail = vbd;
-            continue;
-          }
-          ret_error_message = callbacks.AppendU64(vbd);
-          goto parsed_a_value;
-        }
-      }
-
-      if (token.value_major() == WUFFS_CBOR__TOKEN_VALUE_MAJOR) {
-        uint64_t value_minor = token.value_minor();
-        if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X) {
-          if (token_len == 9) {
-            ret_error_message = callbacks.AppendMinus1MinusX(
-                wuffs_base__peek_u64be__no_bounds_check(token_ptr + 1));
-            goto parsed_a_value;
-          }
-        } else if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__SIMPLE_VALUE) {
-          ret_error_message =
-              callbacks.AppendCborSimpleValue(static_cast<uint8_t>(
-                  value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__DETAIL_MASK));
-          goto parsed_a_value;
-        } else if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG) {
-          if (token.continued()) {
-            extension_category = EXT_CAT__CBOR_TAG;
-            extension_detail =
-                value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__DETAIL_MASK;
-            continue;
-          }
-          ret_error_message = callbacks.AppendCborTag(
-              value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__DETAIL_MASK);
-          if (!ret_error_message.empty()) {
-            goto done;
-          }
-          continue;
-        }
-      }
-
-    fail:
-      ret_error_message =
-          "wuffs_aux::DecodeCbor: internal error: unexpected token";
-      goto done;
-
-    parsed_a_value:
-      if (!ret_error_message.empty() || (depth == 0)) {
-        goto done;
-      }
-    }
-  } while (false);
-
-done:
-  DecodeCborResult result(
-      std::move(ret_error_message),
-      wuffs_base__u64__sat_add(io_buf->meta.pos, cursor_index));
-  callbacks.Done(result, input, *io_buf);
-  return result;
-}
-
-}  // namespace wuffs_aux
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__AUX__CBOR)
-
-// ---------------- Auxiliary - Image
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__AUX__IMAGE)
-
-#include <utility>
-
-namespace wuffs_aux {
-
-DecodeImageResult::DecodeImageResult(MemOwner&& pixbuf_mem_owner0,
-                                     wuffs_base__pixel_buffer pixbuf0,
-                                     std::string&& error_message0)
-    : pixbuf_mem_owner(std::move(pixbuf_mem_owner0)),
-      pixbuf(pixbuf0),
-      error_message(std::move(error_message0)) {}
-
-DecodeImageResult::DecodeImageResult(std::string&& error_message0)
-    : pixbuf_mem_owner(nullptr, &free),
-      pixbuf(wuffs_base__null_pixel_buffer()),
-      error_message(std::move(error_message0)) {}
-
-DecodeImageCallbacks::~DecodeImageCallbacks() {}
-
-DecodeImageCallbacks::AllocPixbufResult::AllocPixbufResult(
-    MemOwner&& mem_owner0,
-    wuffs_base__pixel_buffer pixbuf0)
-    : mem_owner(std::move(mem_owner0)), pixbuf(pixbuf0), error_message("") {}
-
-DecodeImageCallbacks::AllocPixbufResult::AllocPixbufResult(
-    std::string&& error_message0)
-    : mem_owner(nullptr, &free),
-      pixbuf(wuffs_base__null_pixel_buffer()),
-      error_message(std::move(error_message0)) {}
-
-DecodeImageCallbacks::AllocWorkbufResult::AllocWorkbufResult(
-    MemOwner&& mem_owner0,
-    wuffs_base__slice_u8 workbuf0)
-    : mem_owner(std::move(mem_owner0)), workbuf(workbuf0), error_message("") {}
-
-DecodeImageCallbacks::AllocWorkbufResult::AllocWorkbufResult(
-    std::string&& error_message0)
-    : mem_owner(nullptr, &free),
-      workbuf(wuffs_base__empty_slice_u8()),
-      error_message(std::move(error_message0)) {}
-
-wuffs_base__image_decoder::unique_ptr  //
-DecodeImageCallbacks::SelectDecoder(uint32_t fourcc,
-                                    wuffs_base__slice_u8 prefix_data,
-                                    bool prefix_closed) {
-  switch (fourcc) {
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BMP)
-    case WUFFS_BASE__FOURCC__BMP:
-      return wuffs_bmp__decoder::alloc_as__wuffs_base__image_decoder();
-#endif
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__GIF)
-    case WUFFS_BASE__FOURCC__GIF:
-      return wuffs_gif__decoder::alloc_as__wuffs_base__image_decoder();
-#endif
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JPEG)
-    case WUFFS_BASE__FOURCC__JPEG:
-      return wuffs_jpeg__decoder::alloc_as__wuffs_base__image_decoder();
-#endif
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NIE)
-    case WUFFS_BASE__FOURCC__NIE:
-      return wuffs_nie__decoder::alloc_as__wuffs_base__image_decoder();
-#endif
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__NETPBM)
-    case WUFFS_BASE__FOURCC__NPBM:
-      return wuffs_netpbm__decoder::alloc_as__wuffs_base__image_decoder();
-#endif
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__PNG)
-    case WUFFS_BASE__FOURCC__PNG: {
-      auto dec = wuffs_png__decoder::alloc_as__wuffs_base__image_decoder();
-      // Favor faster decodes over rejecting invalid checksums.
-      dec->set_quirk(WUFFS_BASE__QUIRK_IGNORE_CHECKSUM, 1);
-      return dec;
-    }
-#endif
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA)
-    case WUFFS_BASE__FOURCC__TGA:
-      return wuffs_tga__decoder::alloc_as__wuffs_base__image_decoder();
-#endif
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__WBMP)
-    case WUFFS_BASE__FOURCC__WBMP:
-      return wuffs_wbmp__decoder::alloc_as__wuffs_base__image_decoder();
-#endif
-  }
-
-  return wuffs_base__image_decoder::unique_ptr(nullptr, &free);
-}
-
-std::string  //
-DecodeImageCallbacks::HandleMetadata(const wuffs_base__more_information& minfo,
-                                     wuffs_base__slice_u8 raw) {
-  return "";
-}
-
-wuffs_base__pixel_format  //
-DecodeImageCallbacks::SelectPixfmt(
-    const wuffs_base__image_config& image_config) {
-  return wuffs_base__make_pixel_format(WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL);
-}
-
-DecodeImageCallbacks::AllocPixbufResult  //
-DecodeImageCallbacks::AllocPixbuf(const wuffs_base__image_config& image_config,
-                                  bool allow_uninitialized_memory) {
-  uint32_t w = image_config.pixcfg.width();
-  uint32_t h = image_config.pixcfg.height();
-  if ((w == 0) || (h == 0)) {
-    return AllocPixbufResult("");
-  }
-  uint64_t len = image_config.pixcfg.pixbuf_len();
-  if ((len == 0) || (SIZE_MAX < len)) {
-    return AllocPixbufResult(DecodeImage_UnsupportedPixelConfiguration);
-  }
-  void* ptr =
-      allow_uninitialized_memory ? malloc((size_t)len) : calloc((size_t)len, 1);
-  if (!ptr) {
-    return AllocPixbufResult(DecodeImage_OutOfMemory);
-  }
-  wuffs_base__pixel_buffer pixbuf;
-  wuffs_base__status status = pixbuf.set_from_slice(
-      &image_config.pixcfg,
-      wuffs_base__make_slice_u8((uint8_t*)ptr, (size_t)len));
-  if (!status.is_ok()) {
-    free(ptr);
-    return AllocPixbufResult(status.message());
-  }
-  return AllocPixbufResult(MemOwner(ptr, &free), pixbuf);
-}
-
-DecodeImageCallbacks::AllocWorkbufResult  //
-DecodeImageCallbacks::AllocWorkbuf(wuffs_base__range_ii_u64 len_range,
-                                   bool allow_uninitialized_memory) {
-  uint64_t len = len_range.max_incl;
-  if (len == 0) {
-    return AllocWorkbufResult("");
-  } else if (SIZE_MAX < len) {
-    return AllocWorkbufResult(DecodeImage_OutOfMemory);
-  }
-  void* ptr =
-      allow_uninitialized_memory ? malloc((size_t)len) : calloc((size_t)len, 1);
-  if (!ptr) {
-    return AllocWorkbufResult(DecodeImage_OutOfMemory);
-  }
-  return AllocWorkbufResult(
-      MemOwner(ptr, &free),
-      wuffs_base__make_slice_u8((uint8_t*)ptr, (size_t)len));
-}
-
-void  //
-DecodeImageCallbacks::Done(
-    DecodeImageResult& result,
-    sync_io::Input& input,
-    IOBuffer& buffer,
-    wuffs_base__image_decoder::unique_ptr image_decoder) {}
-
-const char DecodeImage_BufferIsTooShort[] =  //
-    "wuffs_aux::DecodeImage: buffer is too short";
-const char DecodeImage_MaxInclDimensionExceeded[] =  //
-    "wuffs_aux::DecodeImage: max_incl_dimension exceeded";
-const char DecodeImage_MaxInclMetadataLengthExceeded[] =  //
-    "wuffs_aux::DecodeImage: max_incl_metadata_length exceeded";
-const char DecodeImage_OutOfMemory[] =  //
-    "wuffs_aux::DecodeImage: out of memory";
-const char DecodeImage_UnexpectedEndOfFile[] =  //
-    "wuffs_aux::DecodeImage: unexpected end of file";
-const char DecodeImage_UnsupportedImageFormat[] =  //
-    "wuffs_aux::DecodeImage: unsupported image format";
-const char DecodeImage_UnsupportedMetadata[] =  //
-    "wuffs_aux::DecodeImage: unsupported metadata";
-const char DecodeImage_UnsupportedPixelBlend[] =  //
-    "wuffs_aux::DecodeImage: unsupported pixel blend";
-const char DecodeImage_UnsupportedPixelConfiguration[] =  //
-    "wuffs_aux::DecodeImage: unsupported pixel configuration";
-const char DecodeImage_UnsupportedPixelFormat[] =  //
-    "wuffs_aux::DecodeImage: unsupported pixel format";
-
-DecodeImageArgQuirks::DecodeImageArgQuirks(wuffs_base__slice_u32 repr0)
-    : repr(repr0) {}
-
-DecodeImageArgQuirks::DecodeImageArgQuirks(uint32_t* ptr0, size_t len0)
-    : repr(wuffs_base__make_slice_u32(ptr0, len0)) {}
-
-DecodeImageArgQuirks  //
-DecodeImageArgQuirks::DefaultValue() {
-  return DecodeImageArgQuirks(wuffs_base__empty_slice_u32());
-}
-
-DecodeImageArgFlags::DecodeImageArgFlags(uint64_t repr0) : repr(repr0) {}
-
-DecodeImageArgFlags  //
-DecodeImageArgFlags::DefaultValue() {
-  return DecodeImageArgFlags(0);
-}
-
-DecodeImageArgPixelBlend::DecodeImageArgPixelBlend(
-    wuffs_base__pixel_blend repr0)
-    : repr(repr0) {}
-
-DecodeImageArgPixelBlend  //
-DecodeImageArgPixelBlend::DefaultValue() {
-  return DecodeImageArgPixelBlend(WUFFS_BASE__PIXEL_BLEND__SRC);
-}
-
-DecodeImageArgBackgroundColor::DecodeImageArgBackgroundColor(
-    wuffs_base__color_u32_argb_premul repr0)
-    : repr(repr0) {}
-
-DecodeImageArgBackgroundColor  //
-DecodeImageArgBackgroundColor::DefaultValue() {
-  return DecodeImageArgBackgroundColor(1);
-}
-
-DecodeImageArgMaxInclDimension::DecodeImageArgMaxInclDimension(uint32_t repr0)
-    : repr(repr0) {}
-
-DecodeImageArgMaxInclDimension  //
-DecodeImageArgMaxInclDimension::DefaultValue() {
-  return DecodeImageArgMaxInclDimension(1048575);
-}
-
-DecodeImageArgMaxInclMetadataLength::DecodeImageArgMaxInclMetadataLength(
-    uint64_t repr0)
-    : repr(repr0) {}
-
-DecodeImageArgMaxInclMetadataLength  //
-DecodeImageArgMaxInclMetadataLength::DefaultValue() {
-  return DecodeImageArgMaxInclMetadataLength(16777215);
-}
-
-// --------
-
-namespace {
-
-const private_impl::ErrorMessages DecodeImageErrorMessages = {
-    DecodeImage_MaxInclMetadataLengthExceeded,  //
-    DecodeImage_OutOfMemory,                    //
-    DecodeImage_UnexpectedEndOfFile,            //
-    DecodeImage_UnsupportedMetadata,            //
-    DecodeImage_UnsupportedImageFormat,         //
-};
-
-std::string  //
-DecodeImageAdvanceIOBufferTo(sync_io::Input& input,
-                             wuffs_base__io_buffer& io_buf,
-                             uint64_t absolute_position) {
-  return private_impl::AdvanceIOBufferTo(DecodeImageErrorMessages, input,
-                                         io_buf, absolute_position);
-}
-
-wuffs_base__status  //
-DIHM0(void* self,
-      wuffs_base__io_buffer* a_dst,
-      wuffs_base__more_information* a_minfo,
-      wuffs_base__io_buffer* a_src) {
-  return wuffs_base__image_decoder__tell_me_more(
-      static_cast<wuffs_base__image_decoder*>(self), a_dst, a_minfo, a_src);
-}
-
-std::string  //
-DIHM1(void* self,
-      const wuffs_base__more_information* minfo,
-      wuffs_base__slice_u8 raw) {
-  return static_cast<DecodeImageCallbacks*>(self)->HandleMetadata(*minfo, raw);
-}
-
-std::string  //
-DecodeImageHandleMetadata(wuffs_base__image_decoder::unique_ptr& image_decoder,
-                          DecodeImageCallbacks& callbacks,
-                          sync_io::Input& input,
-                          wuffs_base__io_buffer& io_buf,
-                          sync_io::DynIOBuffer& raw_metadata_buf) {
-  return private_impl::HandleMetadata(DecodeImageErrorMessages, input, io_buf,
-                                      raw_metadata_buf, DIHM0,
-                                      static_cast<void*>(image_decoder.get()),
-                                      DIHM1, static_cast<void*>(&callbacks));
-}
-
-DecodeImageResult  //
-DecodeImage0(wuffs_base__image_decoder::unique_ptr& image_decoder,
-             DecodeImageCallbacks& callbacks,
-             sync_io::Input& input,
-             wuffs_base__io_buffer& io_buf,
-             wuffs_base__slice_u32 quirks,
-             uint64_t flags,
-             wuffs_base__pixel_blend pixel_blend,
-             wuffs_base__color_u32_argb_premul background_color,
-             uint32_t max_incl_dimension,
-             uint64_t max_incl_metadata_length) {
-  // Check args.
-  switch (pixel_blend) {
-    case WUFFS_BASE__PIXEL_BLEND__SRC:
-    case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-      break;
-    default:
-      return DecodeImageResult(DecodeImage_UnsupportedPixelBlend);
-  }
-
-  wuffs_base__image_config image_config = wuffs_base__null_image_config();
-  sync_io::DynIOBuffer raw_metadata_buf(max_incl_metadata_length);
-  uint64_t start_pos = io_buf.reader_position();
-  bool interested_in_metadata_after_the_frame = false;
-  bool redirected = false;
-  int32_t fourcc = 0;
-redirect:
-  do {
-    // Determine the image format.
-    if (!redirected) {
-      while (true) {
-        fourcc = wuffs_base__magic_number_guess_fourcc(io_buf.reader_slice(),
-                                                       io_buf.meta.closed);
-        if (fourcc > 0) {
-          break;
-        } else if ((fourcc == 0) && (io_buf.reader_length() >= 64)) {
-          // Having (fourcc == 0) means that Wuffs' built in MIME sniffer
-          // didn't recognize the image format. Nonetheless, custom callbacks
-          // may still be able to do their own MIME sniffing, for exotic image
-          // types. We try to give them at least 64 bytes of prefix data when
-          // one-shot-calling callbacks.SelectDecoder. There is no mechanism
-          // for the callbacks to request a longer prefix.
-          break;
-        } else if (io_buf.meta.closed || (io_buf.writer_length() == 0)) {
-          fourcc = 0;
-          break;
-        }
-        std::string error_message = input.CopyIn(&io_buf);
-        if (!error_message.empty()) {
-          return DecodeImageResult(std::move(error_message));
-        }
-      }
-    } else {
-      wuffs_base__io_buffer empty = wuffs_base__empty_io_buffer();
-      wuffs_base__more_information minfo = wuffs_base__empty_more_information();
-      wuffs_base__status tmm_status =
-          image_decoder->tell_me_more(&empty, &minfo, &io_buf);
-      if (tmm_status.repr != nullptr) {
-        return DecodeImageResult(tmm_status.message());
-      }
-      if (minfo.flavor != WUFFS_BASE__MORE_INFORMATION__FLAVOR__IO_REDIRECT) {
-        return DecodeImageResult(DecodeImage_UnsupportedImageFormat);
-      }
-      uint64_t pos = minfo.io_redirect__range().min_incl;
-      if (pos <= start_pos) {
-        // Redirects must go forward.
-        return DecodeImageResult(DecodeImage_UnsupportedImageFormat);
-      }
-      std::string error_message =
-          DecodeImageAdvanceIOBufferTo(input, io_buf, pos);
-      if (!error_message.empty()) {
-        return DecodeImageResult(std::move(error_message));
-      }
-      fourcc = (int32_t)(minfo.io_redirect__fourcc());
-      if (fourcc == 0) {
-        return DecodeImageResult(DecodeImage_UnsupportedImageFormat);
-      }
-      image_decoder.reset();
-    }
-
-    // Select the image decoder.
-    image_decoder = callbacks.SelectDecoder(
-        (uint32_t)fourcc, io_buf.reader_slice(), io_buf.meta.closed);
-    if (!image_decoder) {
-      return DecodeImageResult(DecodeImage_UnsupportedImageFormat);
-    }
-
-    // Apply quirks.
-    for (size_t i = 0; i < quirks.len; i++) {
-      image_decoder->set_quirk(quirks.ptr[i], 1);
-    }
-
-    // Apply flags.
-    if (flags != 0) {
-      if (flags & DecodeImageArgFlags::REPORT_METADATA_CHRM) {
-        image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__CHRM, true);
-      }
-      if (flags & DecodeImageArgFlags::REPORT_METADATA_EXIF) {
-        interested_in_metadata_after_the_frame = true;
-        image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__EXIF, true);
-      }
-      if (flags & DecodeImageArgFlags::REPORT_METADATA_GAMA) {
-        image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__GAMA, true);
-      }
-      if (flags & DecodeImageArgFlags::REPORT_METADATA_ICCP) {
-        image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__ICCP, true);
-      }
-      if (flags & DecodeImageArgFlags::REPORT_METADATA_KVP) {
-        interested_in_metadata_after_the_frame = true;
-        image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__KVP, true);
-      }
-      if (flags & DecodeImageArgFlags::REPORT_METADATA_SRGB) {
-        image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__SRGB, true);
-      }
-      if (flags & DecodeImageArgFlags::REPORT_METADATA_XMP) {
-        interested_in_metadata_after_the_frame = true;
-        image_decoder->set_report_metadata(WUFFS_BASE__FOURCC__XMP, true);
-      }
-    }
-
-    // Decode the image config.
-    while (true) {
-      wuffs_base__status id_dic_status =
-          image_decoder->decode_image_config(&image_config, &io_buf);
-      if (id_dic_status.repr == nullptr) {
-        break;
-      } else if (id_dic_status.repr == wuffs_base__note__i_o_redirect) {
-        if (redirected) {
-          return DecodeImageResult(DecodeImage_UnsupportedImageFormat);
-        }
-        redirected = true;
-        goto redirect;
-      } else if (id_dic_status.repr == wuffs_base__note__metadata_reported) {
-        std::string error_message = DecodeImageHandleMetadata(
-            image_decoder, callbacks, input, io_buf, raw_metadata_buf);
-        if (!error_message.empty()) {
-          return DecodeImageResult(std::move(error_message));
-        }
-      } else if (id_dic_status.repr != wuffs_base__suspension__short_read) {
-        return DecodeImageResult(id_dic_status.message());
-      } else if (io_buf.meta.closed) {
-        return DecodeImageResult(DecodeImage_UnexpectedEndOfFile);
-      } else {
-        std::string error_message = input.CopyIn(&io_buf);
-        if (!error_message.empty()) {
-          return DecodeImageResult(std::move(error_message));
-        }
-      }
-    }
-  } while (false);
-  if (!interested_in_metadata_after_the_frame) {
-    raw_metadata_buf.drop();
-  }
-
-  // Select the pixel format.
-  uint32_t w = image_config.pixcfg.width();
-  uint32_t h = image_config.pixcfg.height();
-  if ((w > max_incl_dimension) || (h > max_incl_dimension)) {
-    return DecodeImageResult(DecodeImage_MaxInclDimensionExceeded);
-  }
-  wuffs_base__pixel_format pixel_format = callbacks.SelectPixfmt(image_config);
-  if (pixel_format.repr != image_config.pixcfg.pixel_format().repr) {
-    switch (pixel_format.repr) {
-      case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-        break;
-      default:
-        return DecodeImageResult(DecodeImage_UnsupportedPixelFormat);
-    }
-    image_config.pixcfg.set(pixel_format.repr,
-                            WUFFS_BASE__PIXEL_SUBSAMPLING__NONE, w, h);
-  }
-
-  // Allocate the pixel buffer.
-  bool valid_background_color =
-      wuffs_base__color_u32_argb_premul__is_valid(background_color);
-  DecodeImageCallbacks::AllocPixbufResult alloc_pixbuf_result =
-      callbacks.AllocPixbuf(image_config, valid_background_color);
-  if (!alloc_pixbuf_result.error_message.empty()) {
-    return DecodeImageResult(std::move(alloc_pixbuf_result.error_message));
-  }
-  wuffs_base__pixel_buffer pixel_buffer = alloc_pixbuf_result.pixbuf;
-  if (valid_background_color) {
-    wuffs_base__status pb_scufr_status = pixel_buffer.set_color_u32_fill_rect(
-        pixel_buffer.pixcfg.bounds(), background_color);
-    if (pb_scufr_status.repr != nullptr) {
-      return DecodeImageResult(pb_scufr_status.message());
-    }
-  }
-
-  // Allocate the work buffer. Wuffs' decoders conventionally assume that this
-  // can be uninitialized memory.
-  wuffs_base__range_ii_u64 workbuf_len = image_decoder->workbuf_len();
-  DecodeImageCallbacks::AllocWorkbufResult alloc_workbuf_result =
-      callbacks.AllocWorkbuf(workbuf_len, true);
-  if (!alloc_workbuf_result.error_message.empty()) {
-    return DecodeImageResult(std::move(alloc_workbuf_result.error_message));
-  } else if (alloc_workbuf_result.workbuf.len < workbuf_len.min_incl) {
-    return DecodeImageResult(DecodeImage_BufferIsTooShort);
-  }
-
-  // Decode the frame config.
-  wuffs_base__frame_config frame_config = wuffs_base__null_frame_config();
-  while (true) {
-    wuffs_base__status id_dfc_status =
-        image_decoder->decode_frame_config(&frame_config, &io_buf);
-    if (id_dfc_status.repr == nullptr) {
-      break;
-    } else if (id_dfc_status.repr == wuffs_base__note__metadata_reported) {
-      std::string error_message = DecodeImageHandleMetadata(
-          image_decoder, callbacks, input, io_buf, raw_metadata_buf);
-      if (!error_message.empty()) {
-        return DecodeImageResult(std::move(error_message));
-      }
-    } else if (id_dfc_status.repr != wuffs_base__suspension__short_read) {
-      return DecodeImageResult(id_dfc_status.message());
-    } else if (io_buf.meta.closed) {
-      return DecodeImageResult(DecodeImage_UnexpectedEndOfFile);
-    } else {
-      std::string error_message = input.CopyIn(&io_buf);
-      if (!error_message.empty()) {
-        return DecodeImageResult(std::move(error_message));
-      }
-    }
-  }
-
-  // Decode the frame (the pixels).
-  //
-  // From here on, always returns the pixel_buffer. If we get this far, we can
-  // still display a partial image, even if we encounter an error.
-  std::string message("");
-  if ((pixel_blend == WUFFS_BASE__PIXEL_BLEND__SRC_OVER) &&
-      frame_config.overwrite_instead_of_blend()) {
-    pixel_blend = WUFFS_BASE__PIXEL_BLEND__SRC;
-  }
-  while (true) {
-    wuffs_base__status id_df_status =
-        image_decoder->decode_frame(&pixel_buffer, &io_buf, pixel_blend,
-                                    alloc_workbuf_result.workbuf, nullptr);
-    if (id_df_status.repr == nullptr) {
-      break;
-    } else if (id_df_status.repr != wuffs_base__suspension__short_read) {
-      message = id_df_status.message();
-      break;
-    } else if (io_buf.meta.closed) {
-      message = DecodeImage_UnexpectedEndOfFile;
-      break;
-    } else {
-      std::string error_message = input.CopyIn(&io_buf);
-      if (!error_message.empty()) {
-        message = std::move(error_message);
-        break;
-      }
-    }
-  }
-
-  // Decode any metadata after the frame.
-  if (interested_in_metadata_after_the_frame) {
-    while (true) {
-      wuffs_base__status id_dfc_status =
-          image_decoder->decode_frame_config(NULL, &io_buf);
-      if (id_dfc_status.repr == wuffs_base__note__end_of_data) {
-        break;
-      } else if (id_dfc_status.repr == nullptr) {
-        continue;
-      } else if (id_dfc_status.repr == wuffs_base__note__metadata_reported) {
-        std::string error_message = DecodeImageHandleMetadata(
-            image_decoder, callbacks, input, io_buf, raw_metadata_buf);
-        if (!error_message.empty()) {
-          return DecodeImageResult(std::move(error_message));
-        }
-      } else if (id_dfc_status.repr != wuffs_base__suspension__short_read) {
-        return DecodeImageResult(id_dfc_status.message());
-      } else if (io_buf.meta.closed) {
-        return DecodeImageResult(DecodeImage_UnexpectedEndOfFile);
-      } else {
-        std::string error_message = input.CopyIn(&io_buf);
-        if (!error_message.empty()) {
-          return DecodeImageResult(std::move(error_message));
-        }
-      }
-    }
-  }
-
-  return DecodeImageResult(std::move(alloc_pixbuf_result.mem_owner),
-                           pixel_buffer, std::move(message));
-}
-
-}  // namespace
-
-DecodeImageResult  //
-DecodeImage(DecodeImageCallbacks& callbacks,
-            sync_io::Input& input,
-            DecodeImageArgQuirks quirks,
-            DecodeImageArgFlags flags,
-            DecodeImageArgPixelBlend pixel_blend,
-            DecodeImageArgBackgroundColor background_color,
-            DecodeImageArgMaxInclDimension max_incl_dimension,
-            DecodeImageArgMaxInclMetadataLength max_incl_metadata_length) {
-  wuffs_base__io_buffer* io_buf = input.BringsItsOwnIOBuffer();
-  wuffs_base__io_buffer fallback_io_buf = wuffs_base__empty_io_buffer();
-  std::unique_ptr<uint8_t[]> fallback_io_array(nullptr);
-  if (!io_buf) {
-    fallback_io_array = std::unique_ptr<uint8_t[]>(new uint8_t[32768]);
-    fallback_io_buf =
-        wuffs_base__ptr_u8__writer(fallback_io_array.get(), 32768);
-    io_buf = &fallback_io_buf;
-  }
-
-  wuffs_base__image_decoder::unique_ptr image_decoder(nullptr, &free);
-  DecodeImageResult result =
-      DecodeImage0(image_decoder, callbacks, input, *io_buf, quirks.repr,
-                   flags.repr, pixel_blend.repr, background_color.repr,
-                   max_incl_dimension.repr, max_incl_metadata_length.repr);
-  callbacks.Done(result, input, *io_buf, std::move(image_decoder));
-  return result;
-}
-
-}  // namespace wuffs_aux
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__AUX__IMAGE)
-
-// ---------------- Auxiliary - JSON
-
-#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__AUX__JSON)
-
-#include <utility>
-
-namespace wuffs_aux {
-
-DecodeJsonResult::DecodeJsonResult(std::string&& error_message0,
-                                   uint64_t cursor_position0)
-    : error_message(std::move(error_message0)),
-      cursor_position(cursor_position0) {}
-
-DecodeJsonCallbacks::~DecodeJsonCallbacks() {}
-
-void  //
-DecodeJsonCallbacks::Done(DecodeJsonResult& result,
-                          sync_io::Input& input,
-                          IOBuffer& buffer) {}
-
-const char DecodeJson_BadJsonPointer[] =  //
-    "wuffs_aux::DecodeJson: bad JSON Pointer";
-const char DecodeJson_NoMatch[] =  //
-    "wuffs_aux::DecodeJson: no match";
-
-DecodeJsonArgQuirks::DecodeJsonArgQuirks(wuffs_base__slice_u32 repr0)
-    : repr(repr0) {}
-
-DecodeJsonArgQuirks::DecodeJsonArgQuirks(uint32_t* ptr0, size_t len0)
-    : repr(wuffs_base__make_slice_u32(ptr0, len0)) {}
-
-DecodeJsonArgQuirks  //
-DecodeJsonArgQuirks::DefaultValue() {
-  return DecodeJsonArgQuirks(wuffs_base__empty_slice_u32());
-}
-
-DecodeJsonArgJsonPointer::DecodeJsonArgJsonPointer(std::string repr0)
-    : repr(repr0) {}
-
-DecodeJsonArgJsonPointer  //
-DecodeJsonArgJsonPointer::DefaultValue() {
-  return DecodeJsonArgJsonPointer(std::string());
-}
-
-// --------
-
-#define WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN                          \
-  while (tok_buf.meta.ri >= tok_buf.meta.wi) {                              \
-    if (tok_status.repr == nullptr) {                                       \
-      goto done;                                                            \
-    } else if (tok_status.repr == wuffs_base__suspension__short_write) {    \
-      tok_buf.compact();                                                    \
-    } else if (tok_status.repr == wuffs_base__suspension__short_read) {     \
-      if (!io_error_message.empty()) {                                      \
-        ret_error_message = std::move(io_error_message);                    \
-        goto done;                                                          \
-      } else if (cursor_index != io_buf->meta.ri) {                         \
-        ret_error_message =                                                 \
-            "wuffs_aux::DecodeJson: internal error: bad cursor_index";      \
-        goto done;                                                          \
-      } else if (io_buf->meta.closed) {                                     \
-        ret_error_message =                                                 \
-            "wuffs_aux::DecodeJson: internal error: io_buf is closed";      \
-        goto done;                                                          \
-      }                                                                     \
-      io_buf->compact();                                                    \
-      if (io_buf->meta.wi >= io_buf->data.len) {                            \
-        ret_error_message =                                                 \
-            "wuffs_aux::DecodeJson: internal error: io_buf is full";        \
-        goto done;                                                          \
-      }                                                                     \
-      cursor_index = io_buf->meta.ri;                                       \
-      io_error_message = input.CopyIn(io_buf);                              \
-    } else {                                                                \
-      ret_error_message = tok_status.message();                             \
-      goto done;                                                            \
-    }                                                                       \
-    tok_status =                                                            \
-        dec->decode_tokens(&tok_buf, io_buf, wuffs_base__empty_slice_u8()); \
-    if ((tok_buf.meta.ri > tok_buf.meta.wi) ||                              \
-        (tok_buf.meta.wi > tok_buf.data.len) ||                             \
-        (io_buf->meta.ri > io_buf->meta.wi) ||                              \
-        (io_buf->meta.wi > io_buf->data.len)) {                             \
-      ret_error_message =                                                   \
-          "wuffs_aux::DecodeJson: internal error: bad buffer indexes";      \
-      goto done;                                                            \
-    }                                                                       \
-  }                                                                         \
-  wuffs_base__token token = tok_buf.data.ptr[tok_buf.meta.ri++];            \
-  uint64_t token_len = token.length();                                      \
-  if ((io_buf->meta.ri < cursor_index) ||                                   \
-      ((io_buf->meta.ri - cursor_index) < token_len)) {                     \
-    ret_error_message =                                                     \
-        "wuffs_aux::DecodeJson: internal error: bad token indexes";         \
-    goto done;                                                              \
-  }                                                                         \
-  uint8_t* token_ptr = io_buf->data.ptr + cursor_index;                     \
-  (void)(token_ptr);                                                        \
-  cursor_index += static_cast<size_t>(token_len)
-
-// --------
-
-namespace {
-
-// DecodeJson_SplitJsonPointer returns ("bar", 8) for ("/foo/bar/b~1z/qux", 5,
-// etc). It returns a 0 size_t when s has invalid JSON Pointer syntax or i is
-// out of bounds.
-//
-// The string returned is unescaped. If calling it again, this time with i=8,
-// the "b~1z" substring would be returned as "b/z".
-std::pair<std::string, size_t>  //
-DecodeJson_SplitJsonPointer(std::string& s,
-                            size_t i,
-                            bool allow_tilde_n_tilde_r_tilde_t) {
-  std::string fragment;
-  if (i > s.size()) {
-    return std::make_pair(std::string(), 0);
-  }
-  while (i < s.size()) {
-    char c = s[i];
-    if (c == '/') {
-      break;
-    } else if (c != '~') {
-      fragment.push_back(c);
-      i++;
-      continue;
-    }
-    i++;
-    if (i >= s.size()) {
-      return std::make_pair(std::string(), 0);
-    }
-    c = s[i];
-    if (c == '0') {
-      fragment.push_back('~');
-      i++;
-      continue;
-    } else if (c == '1') {
-      fragment.push_back('/');
-      i++;
-      continue;
-    } else if (allow_tilde_n_tilde_r_tilde_t) {
-      if (c == 'n') {
-        fragment.push_back('\n');
-        i++;
-        continue;
-      } else if (c == 'r') {
-        fragment.push_back('\r');
-        i++;
-        continue;
-      } else if (c == 't') {
-        fragment.push_back('\t');
-        i++;
-        continue;
-      }
-    }
-    return std::make_pair(std::string(), 0);
-  }
-  return std::make_pair(std::move(fragment), i);
-}
-
-// --------
-
-std::string  //
-DecodeJson_WalkJsonPointerFragment(wuffs_base__token_buffer& tok_buf,
-                                   wuffs_base__status& tok_status,
-                                   wuffs_json__decoder::unique_ptr& dec,
-                                   wuffs_base__io_buffer* io_buf,
-                                   std::string& io_error_message,
-                                   size_t& cursor_index,
-                                   sync_io::Input& input,
-                                   std::string& json_pointer_fragment) {
-  std::string ret_error_message;
-  while (true) {
-    WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN;
-
-    int64_t vbc = token.value_base_category();
-    uint64_t vbd = token.value_base_detail();
-    if (vbc == WUFFS_BASE__TOKEN__VBC__FILLER) {
-      continue;
-    } else if ((vbc != WUFFS_BASE__TOKEN__VBC__STRUCTURE) ||
-               !(vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH)) {
-      return DecodeJson_NoMatch;
-    } else if (vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__TO_LIST) {
-      goto do_list;
-    }
-    goto do_dict;
-  }
-
-do_dict:
-  // Alternate between these two things:
-  //  1. Decode the next dict key (a string). If it matches the fragment, we're
-  //    done (success). If we've reached the dict's end (VBD__STRUCTURE__POP)
-  //    so that there was no next dict key, we're done (failure).
-  //  2. Otherwise, skip the next dict value.
-  while (true) {
-    for (std::string str; true;) {
-      WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN;
-
-      int64_t vbc = token.value_base_category();
-      uint64_t vbd = token.value_base_detail();
-      switch (vbc) {
-        case WUFFS_BASE__TOKEN__VBC__FILLER:
-          continue;
-
-        case WUFFS_BASE__TOKEN__VBC__STRUCTURE:
-          if (vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH) {
-            goto fail;
-          }
-          return DecodeJson_NoMatch;
-
-        case WUFFS_BASE__TOKEN__VBC__STRING: {
-          if (vbd & WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP) {
-            // No-op.
-          } else if (vbd &
-                     WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_1_SRC_COPY) {
-            const char* ptr =  // Convert from (uint8_t*).
-                static_cast<const char*>(static_cast<void*>(token_ptr));
-            str.append(ptr, static_cast<size_t>(token_len));
-          } else {
-            goto fail;
-          }
-          break;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT: {
-          uint8_t u[WUFFS_BASE__UTF_8__BYTE_LENGTH__MAX_INCL];
-          size_t n = wuffs_base__utf_8__encode(
-              wuffs_base__make_slice_u8(
-                  &u[0], WUFFS_BASE__UTF_8__BYTE_LENGTH__MAX_INCL),
-              static_cast<uint32_t>(vbd));
-          const char* ptr =  // Convert from (uint8_t*).
-              static_cast<const char*>(static_cast<void*>(&u[0]));
-          str.append(ptr, n);
-          break;
-        }
-
-        default:
-          goto fail;
-      }
-
-      if (token.continued()) {
-        continue;
-      }
-      if (str == json_pointer_fragment) {
-        return "";
-      }
-      goto skip_the_next_dict_value;
-    }
-
-  skip_the_next_dict_value:
-    for (uint32_t skip_depth = 0; true;) {
-      WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN;
-
-      int64_t vbc = token.value_base_category();
-      uint64_t vbd = token.value_base_detail();
-      if (token.continued() || (vbc == WUFFS_BASE__TOKEN__VBC__FILLER)) {
-        continue;
-      } else if (vbc == WUFFS_BASE__TOKEN__VBC__STRUCTURE) {
-        if (vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH) {
-          skip_depth++;
-          continue;
-        }
-        skip_depth--;
-      }
-
-      if (skip_depth == 0) {
-        break;
-      }
-    }  // skip_the_next_dict_value
-  }    // do_dict
-
-do_list:
-  do {
-    wuffs_base__result_u64 result_u64 = wuffs_base__parse_number_u64(
-        wuffs_base__make_slice_u8(
-            static_cast<uint8_t*>(static_cast<void*>(
-                const_cast<char*>(json_pointer_fragment.data()))),
-            json_pointer_fragment.size()),
-        WUFFS_BASE__PARSE_NUMBER_XXX__DEFAULT_OPTIONS);
-    if (!result_u64.status.is_ok()) {
-      return DecodeJson_NoMatch;
-    }
-    uint64_t remaining = result_u64.value;
-    if (remaining == 0) {
-      goto check_that_a_value_follows;
-    }
-    for (uint32_t skip_depth = 0; true;) {
-      WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN;
-
-      int64_t vbc = token.value_base_category();
-      uint64_t vbd = token.value_base_detail();
-      if (token.continued() || (vbc == WUFFS_BASE__TOKEN__VBC__FILLER)) {
-        continue;
-      } else if (vbc == WUFFS_BASE__TOKEN__VBC__STRUCTURE) {
-        if (vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH) {
-          skip_depth++;
-          continue;
-        }
-        if (skip_depth == 0) {
-          return DecodeJson_NoMatch;
-        }
-        skip_depth--;
-      }
-
-      if (skip_depth > 0) {
-        continue;
-      }
-      remaining--;
-      if (remaining == 0) {
-        goto check_that_a_value_follows;
-      }
-    }
-  } while (false);  // do_list
-
-check_that_a_value_follows:
-  while (true) {
-    WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN;
-
-    int64_t vbc = token.value_base_category();
-    uint64_t vbd = token.value_base_detail();
-    if (vbc == WUFFS_BASE__TOKEN__VBC__FILLER) {
-      continue;
-    }
-
-    // Undo the last part of WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN, so
-    // that we're only peeking at the next token.
-    tok_buf.meta.ri--;
-    cursor_index -= static_cast<size_t>(token_len);
-
-    if ((vbc == WUFFS_BASE__TOKEN__VBC__STRUCTURE) &&
-        (vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__POP)) {
-      return DecodeJson_NoMatch;
-    }
-    return "";
-  }  // check_that_a_value_follows
-
-fail:
-  return "wuffs_aux::DecodeJson: internal error: unexpected token";
-done:
-  return ret_error_message;
-}
-
-}  // namespace
-
-// --------
-
-DecodeJsonResult  //
-DecodeJson(DecodeJsonCallbacks& callbacks,
-           sync_io::Input& input,
-           DecodeJsonArgQuirks quirks,
-           DecodeJsonArgJsonPointer json_pointer) {
-  // Prepare the wuffs_base__io_buffer and the resultant error_message.
-  wuffs_base__io_buffer* io_buf = input.BringsItsOwnIOBuffer();
-  wuffs_base__io_buffer fallback_io_buf = wuffs_base__empty_io_buffer();
-  std::unique_ptr<uint8_t[]> fallback_io_array(nullptr);
-  if (!io_buf) {
-    fallback_io_array = std::unique_ptr<uint8_t[]>(new uint8_t[4096]);
-    fallback_io_buf = wuffs_base__ptr_u8__writer(fallback_io_array.get(), 4096);
-    io_buf = &fallback_io_buf;
-  }
-  // cursor_index is discussed at
-  // https://nigeltao.github.io/blog/2020/jsonptr.html#the-cursor-index
-  size_t cursor_index = 0;
-  std::string ret_error_message;
-  std::string io_error_message;
-
-  do {
-    // Prepare the low-level JSON decoder.
-    wuffs_json__decoder::unique_ptr dec = wuffs_json__decoder::alloc();
-    if (!dec) {
-      ret_error_message = "wuffs_aux::DecodeJson: out of memory";
-      goto done;
-    } else if (WUFFS_JSON__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE != 0) {
-      ret_error_message =
-          "wuffs_aux::DecodeJson: internal error: bad WORKBUF_LEN";
-      goto done;
-    }
-    bool allow_tilde_n_tilde_r_tilde_t = false;
-    for (size_t i = 0; i < quirks.repr.len; i++) {
-      dec->set_quirk(quirks.repr.ptr[i], 1);
-      if (quirks.repr.ptr[i] ==
-          WUFFS_JSON__QUIRK_JSON_POINTER_ALLOW_TILDE_N_TILDE_R_TILDE_T) {
-        allow_tilde_n_tilde_r_tilde_t = true;
-      }
-    }
-
-    // Prepare the wuffs_base__tok_buffer. 256 tokens is 2KiB.
-    wuffs_base__token tok_array[256];
-    wuffs_base__token_buffer tok_buf =
-        wuffs_base__slice_token__writer(wuffs_base__make_slice_token(
-            &tok_array[0], (sizeof(tok_array) / sizeof(tok_array[0]))));
-    wuffs_base__status tok_status =
-        dec->decode_tokens(&tok_buf, io_buf, wuffs_base__empty_slice_u8());
-
-    // Prepare other state.
-    int32_t depth = 0;
-    std::string str;
-
-    // Walk the (optional) JSON Pointer.
-    for (size_t i = 0; i < json_pointer.repr.size();) {
-      if (json_pointer.repr[i] != '/') {
-        ret_error_message = DecodeJson_BadJsonPointer;
-        goto done;
-      }
-      std::pair<std::string, size_t> split = DecodeJson_SplitJsonPointer(
-          json_pointer.repr, i + 1, allow_tilde_n_tilde_r_tilde_t);
-      i = split.second;
-      if (i == 0) {
-        ret_error_message = DecodeJson_BadJsonPointer;
-        goto done;
-      }
-      ret_error_message = DecodeJson_WalkJsonPointerFragment(
-          tok_buf, tok_status, dec, io_buf, io_error_message, cursor_index,
-          input, split.first);
-      if (!ret_error_message.empty()) {
-        goto done;
-      }
-    }
-
-    // Loop, doing these two things:
-    //  1. Get the next token.
-    //  2. Process that token.
-    while (true) {
-      WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN;
-
-      int64_t vbc = token.value_base_category();
-      uint64_t vbd = token.value_base_detail();
-      switch (vbc) {
-        case WUFFS_BASE__TOKEN__VBC__FILLER:
-          continue;
-
-        case WUFFS_BASE__TOKEN__VBC__STRUCTURE: {
-          if (vbd & WUFFS_BASE__TOKEN__VBD__STRUCTURE__PUSH) {
-            ret_error_message = callbacks.Push(static_cast<uint32_t>(vbd));
-            if (!ret_error_message.empty()) {
-              goto done;
-            }
-            depth++;
-            if (depth > WUFFS_JSON__DECODER_DEPTH_MAX_INCL) {
-              ret_error_message =
-                  "wuffs_aux::DecodeJson: internal error: bad depth";
-              goto done;
-            }
-            continue;
-          }
-          ret_error_message = callbacks.Pop(static_cast<uint32_t>(vbd));
-          depth--;
-          if (depth < 0) {
-            ret_error_message =
-                "wuffs_aux::DecodeJson: internal error: bad depth";
-            goto done;
-          }
-          goto parsed_a_value;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__STRING: {
-          if (vbd & WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_0_DST_1_SRC_DROP) {
-            // No-op.
-          } else if (vbd &
-                     WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_1_SRC_COPY) {
-            const char* ptr =  // Convert from (uint8_t*).
-                static_cast<const char*>(static_cast<void*>(token_ptr));
-            str.append(ptr, static_cast<size_t>(token_len));
-          } else {
-            goto fail;
-          }
-          if (token.continued()) {
-            continue;
-          }
-          ret_error_message = callbacks.AppendTextString(std::move(str));
-          str.clear();
-          goto parsed_a_value;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__UNICODE_CODE_POINT: {
-          uint8_t u[WUFFS_BASE__UTF_8__BYTE_LENGTH__MAX_INCL];
-          size_t n = wuffs_base__utf_8__encode(
-              wuffs_base__make_slice_u8(
-                  &u[0], WUFFS_BASE__UTF_8__BYTE_LENGTH__MAX_INCL),
-              static_cast<uint32_t>(vbd));
-          const char* ptr =  // Convert from (uint8_t*).
-              static_cast<const char*>(static_cast<void*>(&u[0]));
-          str.append(ptr, n);
-          if (token.continued()) {
-            continue;
-          }
-          goto fail;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__LITERAL: {
-          ret_error_message =
-              (vbd & WUFFS_BASE__TOKEN__VBD__LITERAL__NULL)
-                  ? callbacks.AppendNull()
-                  : callbacks.AppendBool(vbd &
-                                         WUFFS_BASE__TOKEN__VBD__LITERAL__TRUE);
-          goto parsed_a_value;
-        }
-
-        case WUFFS_BASE__TOKEN__VBC__NUMBER: {
-          if (vbd & WUFFS_BASE__TOKEN__VBD__NUMBER__FORMAT_TEXT) {
-            if (vbd & WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_INTEGER_SIGNED) {
-              wuffs_base__result_i64 r = wuffs_base__parse_number_i64(
-                  wuffs_base__make_slice_u8(token_ptr,
-                                            static_cast<size_t>(token_len)),
-                  WUFFS_BASE__PARSE_NUMBER_XXX__DEFAULT_OPTIONS);
-              if (r.status.is_ok()) {
-                ret_error_message = callbacks.AppendI64(r.value);
-                goto parsed_a_value;
-              }
-            }
-            if (vbd & WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_FLOATING_POINT) {
-              wuffs_base__result_f64 r = wuffs_base__parse_number_f64(
-                  wuffs_base__make_slice_u8(token_ptr,
-                                            static_cast<size_t>(token_len)),
-                  WUFFS_BASE__PARSE_NUMBER_XXX__DEFAULT_OPTIONS);
-              if (r.status.is_ok()) {
-                ret_error_message = callbacks.AppendF64(r.value);
-                goto parsed_a_value;
-              }
-            }
-          } else if (vbd & WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_NEG_INF) {
-            ret_error_message = callbacks.AppendF64(
-                wuffs_base__ieee_754_bit_representation__from_u64_to_f64(
-                    0xFFF0000000000000ul));
-            goto parsed_a_value;
-          } else if (vbd & WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_POS_INF) {
-            ret_error_message = callbacks.AppendF64(
-                wuffs_base__ieee_754_bit_representation__from_u64_to_f64(
-                    0x7FF0000000000000ul));
-            goto parsed_a_value;
-          } else if (vbd & WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_NEG_NAN) {
-            ret_error_message = callbacks.AppendF64(
-                wuffs_base__ieee_754_bit_representation__from_u64_to_f64(
-                    0xFFFFFFFFFFFFFFFFul));
-            goto parsed_a_value;
-          } else if (vbd & WUFFS_BASE__TOKEN__VBD__NUMBER__CONTENT_POS_NAN) {
-            ret_error_message = callbacks.AppendF64(
-                wuffs_base__ieee_754_bit_representation__from_u64_to_f64(
-                    0x7FFFFFFFFFFFFFFFul));
-            goto parsed_a_value;
-          }
-          goto fail;
-        }
-      }
-
-    fail:
-      ret_error_message =
-          "wuffs_aux::DecodeJson: internal error: unexpected token";
-      goto done;
-
-    parsed_a_value:
-      // If an error was encountered, we are done. Otherwise, (depth == 0)
-      // after parsing a value is equivalent to having decoded the entire JSON
-      // value (for an empty json_pointer query) or having decoded the
-      // pointed-to JSON value (for a non-empty json_pointer query). In the
-      // latter case, we are also done.
-      //
-      // However, if quirks like WUFFS_JSON__QUIRK_ALLOW_TRAILING_FILLER or
-      // WUFFS_JSON__QUIRK_EXPECT_TRAILING_NEW_LINE_OR_EOF are passed, decoding
-      // the entire JSON value should also consume any trailing filler, in case
-      // the DecodeJson caller wants to subsequently check that the input is
-      // completely exhausted (and otherwise raise "valid JSON followed by
-      // further (unexpected) data"). We aren't done yet. Instead, keep the
-      // loop running until WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN's
-      // decode_tokens returns an ok status.
-      if (!ret_error_message.empty() ||
-          ((depth == 0) && !json_pointer.repr.empty())) {
-        goto done;
-      }
-    }
-  } while (false);
-
-done:
-  DecodeJsonResult result(
-      std::move(ret_error_message),
-      wuffs_base__u64__sat_add(io_buf->meta.pos, cursor_index));
-  callbacks.Done(result, input, *io_buf);
-  return result;
-}
-
-#undef WUFFS_AUX__DECODE_JSON__GET_THE_NEXT_TOKEN
-
-}  // namespace wuffs_aux
-
-#endif  // !defined(WUFFS_CONFIG__MODULES) ||
-        // defined(WUFFS_CONFIG__MODULE__AUX__JSON)
-
-#endif  // defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
-
-#endif  // WUFFS_IMPLEMENTATION
-
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-#endif  // WUFFS_INCLUDE_GUARD
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/json-to-usd.cc b/contrib/tinyusdz/tinyusdz_repo/src/json-to-usd.cc
deleted file mode 100644
index 2d3f3bbb8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/json-to-usd.cc
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "json-to-usd.hh"
-
-namespace tinyusdz {
-
-
-} // namespace tinyusdz
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/json-to-usd.hh b/contrib/tinyusdz/tinyusdz_repo/src/json-to-usd.hh
deleted file mode 100644
index 8051da5d0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/json-to-usd.hh
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: Apache 2.0
-// Experimental JSON to USD converter
-
-#include <string>
-
-#include "tinyusdz.hh"
-
-namespace tinyusdz {
-
-///
-/// Convert JSON string to USD Stage
-///
-///
-bool JSONToUSD(const std::string &json_string, tinyusdz::Stage *stage, std::string *warn, std::string *err);
-
-} // namespace tinyusd
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/nanobind-bindinds.cc b/contrib/tinyusdz/tinyusdz_repo/src/nanobind-bindinds.cc
deleted file mode 100644
index e510b4e51..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/nanobind-bindinds.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-#include <nanobind/nanobind.h>
-
-#include "prim-types.hh"
-#include "usda-reader.hh"
-//#include "ascii-writer.hh"
-
-#include "nonstd/optional.hpp"
-
-namespace nb = nanobind;
-
-using namespace nb::literals;  // to bring in the `_a` literal
-
-static double test_api() {
-  // TODO: Implement
-  return 4.14;
-}
-
-// stub classes
-struct Stage
-{
-  std::string filepath;
-
-  static Stage Open(const std::string &_filepath) {
-    // TODO
-    Stage stage;
-    stage.filepath = _filepath;
-
-    return stage;
-  }
-
-  bool Export(const std::string &_filepath) {
-    // TODO
-    return false;
-  }
-
-  nonstd::optional<tinyusdz::GPrim> GetPrimAtPath(const std::string &_path) const {
-    // TODO
-    tinyusdz::GPrim prim;
-
-    if (_path == "/bora") {
-      return nonstd::nullopt;
-    }
-
-    return prim;
-
-  }
-
-  static tinyusdz::GPrim DefinePrim(const std::string &_path, const std::string &type) {
-    tinyusdz::GPrim prim;
-
-    if (type == "Xform") {
-      // TODO:...
-      prim.prim_type = "Xform";
-      return prim;
-    }
-
-    return prim;
-  }
-
-};
-
-NB_MODULE(pytinyusd, m) {
-
-  m.def("test_api", &test_api, "Test API");
-
-  auto UsdModule = m.def_submodule("Usd");
-
-  nb::class_<Stage>(UsdModule, "Stage")
-    .def(nb::init<>())
-    .def_static("Open", &Stage::Open)
-    .def("Export", &Stage::Export)
-    .def("GetPrimAtPath", [](const Stage &s, const std::string &path) -> nb::object {
-      if (auto p = s.GetPrimAtPath(path)) {
-        return nb::cast(*p);
-      }
-      return nb::none();
-    });
-  ;
-
-  nb::class_<tinyusdz::GPrim>(UsdModule, "GPrim");
-
-
-  nb::class_<tinyusdz::GeomSphere>(m, "Sphere")
-    .def(nb::init<>())
-  ;
-
-  //py::class_<tinyusdz::GeomSphere>(m, "Sphere")
-  //  .def(py::init<>())
-  //  .def
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/CMakeLists.txt
deleted file mode 100644
index 8616b2f28..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/CMakeLists.txt
+++ /dev/null
@@ -1,911 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-cmake_minimum_required(VERSION 3.12)
-
-project(OpenSubdiv)
-
-# Turn on folder support
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-#-------------------------------------------------------------------------------
-# Obtain OpenSubdiv API version from version.h file
-if(EXISTS "${OpenSubdiv_SOURCE_DIR}/opensubdiv/version.h")
-    file(STRINGS "${OpenSubdiv_SOURCE_DIR}/opensubdiv/version.h"
-        OpenSubdiv_VERSION REGEX "^#define OPENSUBDIV_VERSION .*$")
-    string(REPLACE "#define OPENSUBDIV_VERSION " "" OpenSubdiv_VERSION ${OpenSubdiv_VERSION})
-else()
-    message(FATAL_ERROR, "Cannot locate opensubdiv/version.h in ${OpenSubdiv_SOURCE_DIR}")
-endif()
-
-# Evaluate 'soname' from OSD version
-
-    # replace '_' with '.'
-    string(REGEX REPLACE "(_)" "." OSD_SONAME ${OpenSubdiv_VERSION})
-
-    # remove starting 'v' character
-    string(REGEX REPLACE "^v" "" OSD_SONAME ${OSD_SONAME})
-
-    add_definitions(
-        -DOPENSUBDIV_VERSION_STRING="${OSD_SONAME}"
-    )
-
-#-------------------------------------------------------------------------------
-
-message(STATUS "Compiling ${PROJECT_NAME} version ${OpenSubdiv_VERSION}")
-message(STATUS "Using cmake version ${CMAKE_VERSION}")
-
-#-------------------------------------------------------------------------------
-# Determine if the project is built as a subproject (using add_subdirectory)
-# or if it is the main project.
-set(MAIN_PROJECT OFF)
-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-    set(MAIN_PROJECT ON)
-endif()
-
-# Specify the default install path
-if (NOT DEFINED CMAKE_INSTALL_PREFIX)
-    SET( CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/" )
-endif()
-
-if (NOT DEFINED CMAKE_INCDIR_BASE)
-    set( CMAKE_INCDIR_BASE include/opensubdiv )
-endif()
-
-if (NOT DEFINED CMAKE_BINDIR_BASE)
-    set( CMAKE_BINDIR_BASE bin )
-endif()
-
-if (NOT DEFINED CMAKE_LIBDIR_BASE)
-    set( CMAKE_LIBDIR_BASE lib )
-endif()
-
-if (NOT DEFINED CMAKE_FRAMEWORKDIR_BASE)
-    set( CMAKE_FRAMEWORKDIR_BASE Frameworks )
-endif()
-
-if (NOT DEFINED CMAKE_PLUGINDIR_BASE)
-    set( CMAKE_PLUGINDIR_BASE plugin )
-endif()
-
-if (NOT DEFINED CMAKE_DOCDIR_BASE)
-    set( CMAKE_DOCDIR_BASE share/doc/opensubdiv )
-else()
-    if (IS_ABSOLUTE ${CMAKE_DOCDIR_BASE})
-        set( CMAKE_DOCDIR_BASE "${CMAKE_DOCDIR_BASE}" )
-    else()
-        set( CMAKE_DOCDIR_BASE "${CMAKE_INSTALL_PREFIX}/${CMAKE_DOCDIR_BASE}" )
-    endif()
-endif()
-
-# Allow install path to be overridden for cross-compile builds
-if(LIBRARY_OUTPUT_PATH_ROOT)
-    SET( CMAKE_INSTALL_PREFIX "${LIBRARY_OUTPUT_PATH_ROOT}/" )
-endif()
-
-if (MAIN_PROJECT)
-    # Set the directory where the executables will be stored.
-    set(EXECUTABLE_OUTPUT_PATH
-        "${PROJECT_BINARY_DIR}/bin"
-        CACHE PATH
-        "Directory where executables will be stored"
-    )
-
-    # Set the directory where the libraries will be stored.
-    set(LIBRARY_OUTPUT_PATH
-        "${PROJECT_BINARY_DIR}/lib"
-        CACHE PATH
-        "Directory where all libraries will be stored"
-    )
-endif()
-
-# Specify the list of directories to search for cmake modules.
-set(CMAKE_MODULE_PATH
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
-)
-
-#-------------------------------------------------------------------------------
-# OpenSubdiv trips bugs in some older gcc versions
-if (CMAKE_COMPILER_IS_GNUCC)
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-        message(WARNING "g++ 4.8 or newer recommended")
-    endif()
-endif()
-
-# Detect Clang (until a cmake version provides built-in variables)
-if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-    set(CMAKE_COMPILER_IS_CLANGCC 1)
-elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Intel")
-    set(CMAKE_COMPILER_IS_ICC 1)
-endif()
-
-
-if (NOT CMAKE_COMPILER_IS_ICC)
-    # Currently icc has a bug that asserts when linking rpaths containing long
-    # sequences of ':' that this command causes. The consequence is that examples
-    # built and installed using icc will not have an rpath pointing to the built
-    # OSD library which they depend on and will have to set LD_LIBRARY_PATH instead.
-    list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-endif()
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-# ensure that ARC is shown as enabled in the Xcode UI
-if(CMAKE_GENERATOR STREQUAL "Xcode")
-    set (CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "YES")
-endif()
-
-
-set(OSD_COMPILER_FLAGS)
-
-# Disable spurious warnings in gcc builds and clang
-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANGCC OR CMAKE_COMPILER_IS_ICC )
-
-    # Turn on all warnings
-    if(CMAKE_COMPILER_IS_ICC)
-        list(APPEND OSD_COMPILER_FLAGS -w2 -wd1572 -wd1418 -wd981 -wd383 -wd193 -wd444)
-    else()
-        list(APPEND OSD_COMPILER_FLAGS -Wall -Wextra)
-    endif()
-
-    # HBR uses the offsetof macro on a templated struct, which appears
-    # to spuriously set off this warning in both gcc and Clang
-    list(APPEND OSD_COMPILER_FLAGS -Wno-invalid-offsetof)
-
-    # HBR uses unions as an optimization for its memory allocation.
-    # Type casting between union members breaks strict aliasing rules from
-    # gcc 4.4.1 versions onwards. We disable the warning but keep aliasing
-    # optimization.
-    list(APPEND OSD_COMPILER_FLAGS -Wno-strict-aliasing)
-
-    # FAR and OSD have templated virtual function implementations that trigger
-    # a lot of hidden virtual function overloads (some of them spurious).
-    # Disable those for now in Clang.
-    if(CMAKE_COMPILER_IS_CLANGCC)
-        list(APPEND OSD_COMPILER_FLAGS -Wno-overloaded-virtual)
-    endif()
-
-    # Intel's icc compiler requires some libraries linked
-    if(CMAKE_COMPILER_IS_ICC)
-
-        foreach (ICC_LIB iomp5 irng intlc)
-
-            if(CMAKE_SIZEOF_VOID_P MATCHES "8")
-                list(APPEND ICC_LIB_ARCH "intel64")
-            elseif(CMAKE_SIZEOF_VOID_P MATCHES "4")
-                list(APPEND ICC_LIB_ARCH "ia32")
-            endif()
-
-            find_library( ICC_${ICC_LIB}
-                NAMES
-                    ${ICC_LIB}
-                HINTS
-                    ${ICC_LOCATION}
-                PATHS
-                    /opt/intel/lib/
-                PATH_SUFFIXES
-                    ${ICC_LIB_ARCH}
-                    lib/${ICC_LIB_ARCH}
-            )
-
-            if (ICC_${ICC_LIB})
-                list(APPEND ICC_LIBRARIES ${ICC_${ICC_LIB}})
-            else()
-                message( FATAL_ERROR "${ICC_${ICC_LIB}} library not found - required by icc" )
-            endif()
-
-        endforeach()
-    endif()
-
-elseif(MSVC)
-
-    # Turn on all warnings
-    list(APPEND OSD_COMPILER_FLAGS /Wall)
-
-    list(APPEND OSD_COMPILER_FLAGS
-                    /W3     # Use warning level recommended for production purposes.
-                    /WX     # Treat all compiler warnings as errors.
-
-                    # warning C4005: macro redefinition
-                    /wd4005
-
-                    # these warnings are being triggered from inside VC's header files
-                    # warning C4350: behavior change: 'member1' called instead of 'member2'
-                    /wd4350
-                    # warning C4548: expression before comma has no effect; expected expression with side-effect
-                    /wd4548
-
-                    # Make sure WinDef.h does not define min and max macros which
-                    # will conflict with std::min() and std::max().
-                    /DNOMINMAX
-
-                    # Make sure the constants in <math.h> get defined.
-                    /D_USE_MATH_DEFINES
-
-                    # Do not enforce MSVC's safe CRT replacements.
-                    /D_CRT_SECURE_NO_WARNINGS
-
-                    # Disable checked iterators and iterator debugging.  Visual Studio
-                    # 2008 does not implement std::vector::data(), so we need to take the
-                    # address of std::vector::operator[](0) to get the memory location of
-                    # a vector's underlying data storage.  This does not work for an empty
-                    # vector if checked iterators or iterator debugging is enabled.
-
-                    # XXXX manuelk : we can't force SECURE_SCL to 0 or client code has
-                    # problems linking against OSD if their build is not also
-                    # overriding SSCL to the same value.
-                    # See : http://msdn.microsoft.com/en-us/library/vstudio/hh697468.aspx
-                    #/D_SECURE_SCL=0
-                    #/D_HAS_ITERATOR_DEBUGGING=0
-    )
-
-    option(MSVC_STATIC_CRT "Statically link MSVC CRT" OFF)
-
-    if(MSVC_STATIC_CRT)
-        message(STATUS "Using static MSVC CRT")
-        # http://stackoverflow.com/a/32128977/486990
-        add_compile_options(
-            "$<$<CONFIG:Debug>:/MTd>"
-            "$<$<CONFIG:RelWithDebInfo>:/MT>"
-            "$<$<CONFIG:Release>:/MT>"
-            "$<$<CONFIG:MinSizeRel>:/MT>"
-        )
-    else()
-        # Turn off a duplicate LIBCMT linker warning
-        set(CMAKE_EXE_LINKER_FLAGS
-            "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmt.lib")
-        set(CMAKE_SHARED_LINKER_FLAGS
-            "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:libcmt.lib")
-    endif()
-
-endif()
-
-if(${SIMD} MATCHES "AVX")
-    list(APPEND OSD_COMPILER_FLAGS -xAVX)
-endif()
-
-add_definitions(${OSD_COMPILER_FLAGS})
-
-#-------------------------------------------------------------------------------
-
-# Ignore rules that will re-run cmake (this will avoid constant
-# reloading of the generated Visual Studio project).
-set(CMAKE_SUPPRESS_REGENERATION TRUE)
-
-option(PTEX_LOCATION "Path to Ptex" "")
-option(GLEW_LOCATION "Path to GLEW" "")
-option(GLFW_LOCATION "Path to GLFW" "")
-
-option(NO_LIB "Disable the opensubdiv libs build (caveat emptor)" OFF)
-option(NO_EXAMPLES "Disable examples build" OFF)
-option(NO_TUTORIALS "Disable tutorials build" OFF)
-option(NO_REGRESSION "Disable regression tests build" OFF)
-option(NO_PTEX "Disable PTex support" OFF)
-option(NO_DOC "Disable documentation build" OFF)
-option(NO_OMP "Disable OpenMP backend" OFF)
-option(NO_TBB "Disable TBB backend" OFF)
-option(NO_CUDA "Disable CUDA backend" OFF)
-option(NO_OPENCL "Disable OpenCL backend" OFF)
-option(NO_CLEW "Disable CLEW wrapper library" OFF)
-option(NO_OPENGL "Disable OpenGL support")
-option(NO_METAL "Disable Metal support" OFF)
-option(NO_DX "Disable DirectX support")
-option(NO_TESTS "Disable all tests")
-option(NO_GLTESTS "Disable GL tests")
-option(NO_GLEW "Disable use of GLEW" ON)
-option(NO_GLFW "Disable components depending on GLFW" OFF)
-option(NO_GLFW_X11 "Disable GLFW components depending on X11" OFF)
-option(NO_MACOS_FRAMEWORK "Disable generation of framework on macOS" OFF)
-
-option(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES "Enable true derivative evaluation for Gregory basis patches" OFF)
-
-option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-
-# Save the current value of BUILD_SHARED_LIBS and restore it after
-# processing Find* modules, since some of the Find* modules invoked
-# below may wind up stomping over this value.
-set(build_shared_libs "${BUILD_SHARED_LIBS}")
-
-set(OSD_GPU FALSE)
-
-# Check for dependencies
-if(NOT NO_OMP)
-    find_package(OpenMP)
-endif()
-if(NOT NO_TBB)
-    find_package(TBB 4.0)
-endif()
-if (NOT NO_OPENGL)
-    find_package(OpenGL)
-endif()
-find_package(OpenGLES)
-if(NOT NO_OPENCL)
-    if(NOT NO_CLEW)
-        find_package(CLEW)
-    endif()
-    if (NOT CLEW_FOUND)
-        find_package(OpenCL 1.1)
-    else()
-        set(OPENCL_FOUND TRUE)
-    endif()
-endif()
-if(NOT NO_CUDA)
-    find_package(CUDA 4.0)
-endif()
-if(NOT NO_GLFW AND NOT NO_OPENGL AND NOT ANDROID AND NOT IOS)
-    find_package(GLFW 3.0.0)
-endif()
-if(NOT NO_PTEX)
-   find_package(PTex 2.0)
-   find_package(ZLIB 1.2)
-endif()
-if(APPLE AND NOT NO_METAL)
-    find_package(Metal)
-endif()
-if (OPENGL_FOUND AND NOT IOS)
-    add_definitions(
-        -DOPENSUBDIV_HAS_OPENGL
-    )
-    if (NOT NO_GLEW)
-        if (APPLE)
-            find_package(GLEW)
-        else()
-            find_package(GLEW REQUIRED)
-        endif()
-    endif()
-    if(GLEW_FOUND)
-        add_definitions( -DOSD_USES_GLEW )
-    else()
-        add_definitions( -DOSD_USES_INTERNAL_GLAPILOADER )
-    endif()
-endif()
-
-if (WIN32 AND NOT NO_DX)
-   find_package(DXSDK)
-endif()
-
-if (NOT NO_DOC)
-    find_package(Doxygen 1.8.4)
-    find_package(Docutils 0.9)
-else()
-    set(DOXYGEN_EXECUTABLE )
-endif()
-
-# Python is used optionally to process source and documentation source files.
-find_package(Python COMPONENTS Interpreter)
-
-set(BUILD_SHARED_LIBS "${build_shared_libs}")
-
-# Warn about missing dependencies that will cause parts of OpenSubdiv to be
-# disabled.  Also, add preprocessor defines that can be used in the source
-# code to determine if a specific dependency is present or not.
-
-if(OPENMP_FOUND)
-    add_definitions(
-        -DOPENSUBDIV_HAS_OPENMP
-        ${OpenMP_CXX_FLAGS}
-    )
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_CXX_FLAGS}")
-else()
-    if (NOT NO_OMP)
-        message(WARNING
-            "OpenMP was not found : support for OMP parallel compute kernels "
-            "will be disabled in Osd.  If your compiler supports OpenMP "
-            "directives, please refer to the FindOpenMP.cmake shared module "
-            "in your cmake installation.")
-    endif()
-endif()
-
-if(TBB_FOUND)
-    add_definitions(
-        -DOPENSUBDIV_HAS_TBB
-        ${TBB_CXX_FLAGS}
-    )
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TBB_CXX_FLAGS}")
-else()
-    if (NOT NO_TBB)
-        message(WARNING
-            "TBB was not found : support for TBB parallel compute kernels "
-            "will be disabled in Osd.  If your compiler supports TBB "
-            "directives, please refer to the FindTBB.cmake shared module "
-            "in your cmake installation.")
-    endif()
-endif()
-
-if( METAL_FOUND AND NOT NO_METAL)
-    set(OSD_GPU TRUE)
-    if (CMAKE_COMPILER_IS_CLANGCC)
-        # When building with Metal support enabled, we need to explicitly
-        # request that the C++ code be compiled with C++11 since some example
-        # code for Metal relies on functionality only available in C++11.
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif()
-endif()
-
-if( OPENGL_FOUND AND NOT NO_OPENGL)
-    set(OSD_GPU TRUE)
-endif()
-
-if(GLFW_FOUND AND (GLFW_VERSION VERSION_EQUAL 3.0 OR GLFW_VERSION VERSION_GREATER 3.0))
-    add_definitions( -DGLFW_VERSION_3 )
-endif()
-
-macro(osd_detect_gl_version header)
-
-   if (EXISTS "${header}")
-       file(STRINGS "${header}" VERSION_4_2 REGEX "^#define GL_VERSION_4_2.*$")
-       if (VERSION_4_2)
-           set(OPENGL_4_2_FOUND TRUE)
-       else ()
-           message(WARNING "OpenGL 4.2 dependent features not enabled")
-       endif ()
-
-       file(STRINGS "${header}" VERSION_4_3 REGEX "^#define GL_VERSION_4_3.*$")
-       if (VERSION_4_3)
-           SET(OPENGL_4_3_FOUND TRUE)
-       else ()
-           message(WARNING "OpenGL 4.3 dependent features not enabled")
-       endif ()
-   endif ()
-
-endmacro()
-
-if(GLEW_FOUND AND GLEW_INCLUDE_DIR)
-
-    osd_detect_gl_version(${GLEW_INCLUDE_DIR}/GL/glew.h)
-    set(OPENGL_LOADER_INCLUDE_DIRS
-        ${GLEW_INCLUDE_DIR}
-        ${PROJECT_SOURCE_DIR}/glLoader)
-    set(OPENGL_LOADER_LIBRARIES
-        ${GLEW_LIBRARY}
-        ${OPENGL_gl_LIBRARY}
-        ${CMAKE_DL_LIBS})
-
-elseif(OPENGL_FOUND)
-
-    osd_detect_gl_version(${PROJECT_SOURCE_DIR}/glLoader/glApi.h)
-    set(OPENGL_LOADER_INCLUDE_DIRS
-        ${OPENGL_INCLUDE_DIR}
-        ${PROJECT_SOURCE_DIR}/glLoader)
-    set(OPENGL_LOADER_LIBRARIES
-        ${OPENGL_gl_LIBRARY}
-        ${CMAKE_DL_LIBS})
-
-endif()
-
-# note : (GLSL transform feedback kernels require GL 4.2)
-if(OPENGL_4_2_FOUND)
-    add_definitions(
-        -DOPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK
-    )
-else()
-    if (NOT NO_OPENGL)
-        message(WARNING
-            "OpenGL 4.2 was not found : support for GLSL transform feedback kernels "
-            "will be disabled in Osd.  If you have an OpenGL SDK installed "
-            "(version 4.2 or above), please refer to the FindOpenGL.cmake "
-            "shared module in your cmake installation.")
-    endif()
-endif()
-
-# note : (GLSL compute shader kernels require GL 4.3)
-if(OPENGL_4_3_FOUND)
-    add_definitions(
-        -DOPENSUBDIV_HAS_GLSL_COMPUTE
-    )
-else()
-    if (NOT NO_OPENGL)
-        message(WARNING
-            "OpenGL 4.3 was not found : support for GLSL compute shader kernels "
-            "will be disabled in Osd.  If you have an OpenGL SDK installed "
-            "(version 4.3 or above), please refer to the FindOpenGL.cmake "
-            "shared module in your cmake installation.")
-    endif()
-endif()
-
-if(OPENGLES_FOUND)
-    add_definitions(
-        -DOPENSUBDIV_HAS_OPENGLES
-    )
-    set(OSD_GPU TRUE)
-endif()
-
-if(OPENCL_FOUND)
-    add_definitions(
-        -DOPENSUBDIV_HAS_OPENCL
-    )
-    if(CLEW_FOUND)
-        add_definitions(
-            -DOPENSUBDIV_HAS_CLEW
-        )
-        set(OPENCL_INCLUDE_DIRS ${CLEW_INCLUDE_DIR})
-        set(OPENCL_LIBRARIES ${CLEW_LIBRARY} ${CMAKE_DL_LIBS})
-    else()
-        if (NOT NO_CLEW)
-            message(WARNING
-                "OpenCL was found, but CLEW was not. "
-                "Building with OpenCL support enabled, but the built binary "
-                "will not be portable to systems without OpenCL installed.")
-        endif()
-    endif()
-
-    if (DXSDK_FOUND AND NOT NO_DX)
-        if (OPENCL_CL_D3D11_H_FOUND)
-            set(OPENCL_D3D11_INTEROP_FOUND "YES")
-            add_definitions(
-                -DOPENSUBDIV_HAS_OPENCL_DX_INTEROP
-                -DOPENSUBDIV_HAS_CL_D3D11_H
-            )
-        endif()
-        if (OPENCL_CL_D3D11_EXT_H_FOUND)
-            set(OPENCL_D3D11_INTEROP_FOUND "YES")
-            add_definitions(
-                -DOPENSUBDIV_HAS_OPENCL_DX_INTEROP
-                -DOPENSUBDIV_HAS_CL_D3D11_EXT_H
-            )
-        endif()
-    endif()
-    set(OSD_GPU TRUE)
-else()
-    if (NOT NO_OPENCL)
-        message(WARNING
-            "OpenCL was not found : support for OpenCL parallel compute kernels "
-            "will be disabled in Osd.  If you have the OpenCL SDK installed, "
-            "please refer to the FindOpenCL.cmake in ${PROJECT_SOURCE_DIR}/cmake.")
-    endif()
-endif()
-
-if(CUDA_FOUND)
-    add_definitions(
-        -DOPENSUBDIV_HAS_CUDA
-        -DCUDA_ENABLE_DEPRECATED=0
-    )
-    set(OSD_GPU TRUE)
-
-    if (UNIX)
-        list( APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC )
-        if (NOT DEFINED OSD_CUDA_NVCC_FLAGS)
-            if (CUDA_VERSION_MAJOR LESS 6)
-                set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 )
-            else()
-                set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
-            endif()
-        endif()
-    endif()
-
-    if (DEFINED OSD_CUDA_NVCC_FLAGS)
-        list( APPEND CUDA_NVCC_FLAGS ${OSD_CUDA_NVCC_FLAGS})
-    endif()
-
-else()
-    if (NOT NO_CUDA)
-        message(WARNING
-            "CUDA was not found : support for CUDA parallel compute kernels "
-            "will be disabled in Osd.  If you have the CUDA SDK installed, please "
-            "refer to the FindCUDA.cmake shared module in your cmake installation.")
-    endif()
-endif()
-
-if(PTEX_FOUND)
-    add_definitions(
-        -DOPENSUBDIV_HAS_PTEX
-        -DPTEX_STATIC
-    )
-else()
-    if(NOT NO_PTEX)
-        message(WARNING
-            "Ptex was not found : the OpenSubdiv Ptex example will not be "
-            "available.  If you do have Ptex installed and see this message, "
-            "please add your Ptex path to FindPTex.cmake in "
-            "${PROJECT_SOURCE_DIR}/cmake or set it through the PTEX_LOCATION "
-            "cmake command line argument or environment variable.")
-    endif()
-endif()
-
-if( OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES )
-    add_definitions(-DOPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES)
-endif()
-
-# Link examples & regressions against Osd
-if( BUILD_SHARED_LIBS )
-    if( OSD_GPU )
-        set( OSD_LINK_TARGET osd_dynamic_gpu osd_dynamic_cpu )
-    else()
-        set( OSD_LINK_TARGET osd_dynamic_cpu )
-    endif()
-else()
-    if( OSD_GPU )
-        set( OSD_LINK_TARGET osd_static_gpu osd_static_cpu )
-    else()
-        set( OSD_LINK_TARGET osd_static_cpu )
-    endif()
-endif()
-
-if (WIN32)
-    if ("${GLEW_LIBRARY}" MATCHES "glew32s(d|)")
-        # Link against the static version of GLEW
-        add_definitions(
-            -DGLEW_STATIC
-        )
-    endif()
-
-    if (DXSDK_FOUND AND NOT NO_DX)
-        add_definitions(
-            -DOPENSUBDIV_HAS_DX11SDK
-        )
-        set(OSD_GPU TRUE)
-    elseif(NOT NO_DX)
-        message(WARNING
-            "DirectX11 SDK was not found. "
-            "If you do have DXSDK installed and see this message, "
-            "please add your sdk path to FindDirectX.cmake in "
-            "${PROJECT_SOURCE_DIR}/cmake or set it through the "
-            "DXSDK_LOCATION cmake command line argument or "
-            "environment variable."
-        )
-    endif()
-
-    # Link examples & regressions statically against Osd for
-    # Windows until all the kinks can be worked out.
-    if( OSD_GPU )
-        set( OSD_LINK_TARGET osd_static_cpu osd_static_gpu )
-    else()
-        set( OSD_LINK_TARGET osd_static_cpu )
-    endif()
-
-endif()
-
-
-#-------------------------------------------------------------------------------
-# General-use macros
-
-# Macro for processing public headers into the build area for doxygen processing
-
-add_custom_target( public_headers )
-
-macro(osd_add_doxy_headers headers)
-    if (NOT NO_DOC AND DOXYGEN_FOUND)
-        file(RELATIVE_PATH path "${OpenSubdiv_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" )
-
-        string(REPLACE  "/" "_" targetpath ${path})
-
-        foreach (header ${headers})
-
-            set(infile "${CMAKE_CURRENT_SOURCE_DIR}/${header}")
-            set(outfile "${OpenSubdiv_BINARY_DIR}/public_headers/${path}/${header}")
-            set(targetname "${targetpath}_${header}")
-
-            add_custom_command(
-                OUTPUT
-                    "${outfile}"
-                COMMAND
-                    ${CMAKE_COMMAND}
-                ARGS
-                    -E copy ${infile} ${outfile}
-                DEPENDS
-                    ${infile}
-            )
-
-            add_custom_target(${targetname} DEPENDS "${outfile}")
-
-
-            list(APPEND headerfiles ${targetname} )
-        endforeach()
-
-        add_dependencies( public_headers ${headerfiles} )
-    endif()
-endmacro()
-
-# Kernel Stringification
-# We want to use preprocessor include directives to include GLSL, OpenCL, etc.
-# kernel source files in cpp files, but since the sources contain newline
-# characters we would need raw string literals from C++11 to do this directly.
-# To avoid depending on C++11 we instead use a small tool called "stringify"
-# to generate source files that are suitable for direct inclusion.
-
-# We provide a Python implementation for configurability, e.g. to
-# use when cross compiling or building multi-architecture binaries.
-# We also provide a C++ binary implementation so that Python is not
-# required (for backward compatibility).
-if (OPENGL_FOUND OR OPENCL_FOUND OR DXSDK_FOUND OR METAL_FOUND)
-    if(Python_Interpreter_FOUND)
-        set(OSD_STRINGIFY_TOOL ${CMAKE_CURRENT_SOURCE_DIR}/tools/stringify/stringify.py)
-        set(OSD_STRINGIFY ${Python_EXECUTABLE} ${OSD_STRINGIFY_TOOL})
-    else()
-        set(OSD_STRINGIFY_TOOL stringify)
-        set(OSD_STRINGIFY ${OSD_STRINGIFY_TOOL})
-        set(OSD_USES_STRINGIFY_TOOL_BINARY TRUE)
-    endif()
-endif()
-
-function(osd_stringify src_files varname)
-
-    set(inc_files "")
-
-    foreach(src_file ${src_files})
-
-        string(REGEX REPLACE ".*[.](.*)" "\\1" extension "${src_file}")
-
-        string(REGEX REPLACE "(.*)[.].*" "\\1.gen.h" inc_file "${src_file}")
-        list(APPEND inc_files "${CMAKE_CURRENT_BINARY_DIR}/${inc_file}")
-
-        add_custom_command(
-            OUTPUT
-                "${CMAKE_CURRENT_BINARY_DIR}/${inc_file}"
-            COMMAND
-                ${OSD_STRINGIFY} "${CMAKE_CURRENT_SOURCE_DIR}/${src_file}" "${CMAKE_CURRENT_BINARY_DIR}/${inc_file}"
-            DEPENDS
-                ${OSD_STRINGIFY_TOOL} "${CMAKE_CURRENT_SOURCE_DIR}/${src_file}"
-        )
-
-    endforeach()
-    set(${varname} ${inc_files} PARENT_SCOPE)
-endfunction()
-
-# Macro wrapper for adding a non-cuda dependent executable
-macro(osd_add_executable target folder)
-
-    add_executable(${target} ${ARGN})
-
-    set_target_properties(${target} PROPERTIES FOLDER ${folder})
-
-    if(CMAKE_COMPILER_IS_ICC)
-        target_link_libraries(${target} ${ICC_LIBRARIES})
-    endif()
-
-    if(APPLE)
-        set_property (TARGET ${target} APPEND_STRING PROPERTY
-              COMPILE_FLAGS " -fobjc-arc ")
-    endif()
-endmacro()
-
-
-# Macro for adding a cuda executable if cuda is found and a regular
-# executable otherwise.
-macro(osd_add_possibly_cuda_executable target folder)
-    if(CUDA_FOUND)
-        cuda_add_executable(${target} ${ARGN})
-    else()
-        add_executable(${target} ${ARGN})
-    endif()
-
-    set_target_properties(${target} PROPERTIES FOLDER ${folder})
-
-    if(CMAKE_COMPILER_IS_ICC)
-        target_link_libraries(${target} ${ICC_LIBRARIES})
-    endif()
-
-    if(APPLE)
-        set_property (TARGET ${target} APPEND_STRING PROPERTY
-              COMPILE_FLAGS " -fobjc-arc ")
-    endif()
-endmacro()
-
-
-# Macro for adding a cuda library if cuda is found and a regular
-# library otherwise.
-macro(osd_add_possibly_cuda_library target folder)
-    if(CUDA_FOUND)
-        cuda_add_library(${target} ${ARGN})
-    else()
-        add_library(${target} ${ARGN})
-    endif()
-    set_target_properties(${target} PROPERTIES FOLDER ${folder})
-
-    if(APPLE)
-        set_property (TARGET ${target} APPEND_STRING PROPERTY
-              COMPILE_FLAGS " -fobjc-arc ")
-    endif()
-endmacro()
-
-
-# Macro for adding a (potentially cuda) GLFW executable.
-macro(osd_add_glfw_executable target folder)
-
-    osd_add_possibly_cuda_executable(${target} ${folder} ${ARGN})
-
-    if(APPLE)
-        set_property (TARGET ${target} APPEND_STRING PROPERTY
-              COMPILE_FLAGS " -fobjc-arc ")
-    endif()
-
-endmacro()
-
-#-------------------------------------------------------------------------------
-# Build targets
-
-
-# if you want to build examples against installed OpenSubdiv header files,
-# use OPENSUBDIV_INCLUDE_DIR.
-
-# example: if you have already installed opensubdiv libs in this cmake setup,
-# set (OPENSUBDIV_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INCDIR_BASE})
-
-if (NOT OPENSUBDIV_INCLUDE_DIR)
-    set(OPENSUBDIV_INCLUDE_DIR "${PROJECT_SOURCE_DIR}")
-endif()
-
-if (NOT NO_TESTS)
-    enable_testing()
-endif()
-
-if (NOT NO_OPENGL)
-    add_subdirectory(glLoader)
-endif()
-
-if (OSD_USES_STRINGIFY_TOOL_BINARY)
-    add_subdirectory(tools/stringify)
-endif()
-
-add_subdirectory(opensubdiv)
-
-if (NOT ANDROID) # XXXdyu
-    add_subdirectory(regression)
-endif()
-
-if (NOT NO_EXAMPLES)
-    add_subdirectory(examples)
-endif()
-
-if (NOT NO_TUTORIALS)
-    add_subdirectory(tutorials)
-endif()
-
-if (NOT NO_DOC)
-    add_subdirectory(documentation)
-endif()
-
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.2)
-    #
-    # CMake Config.
-    #
-    include(GNUInstallDirs)
-    include(CMakePackageConfigHelpers)
-
-    set(OPENSUBDIV_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-
-    configure_package_config_file(
-        opensubdiv-config.cmake.in
-        ${CMAKE_CURRENT_BINARY_DIR}/OpenSubdivConfig.cmake
-        INSTALL_DESTINATION ${OPENSUBDIV_CONFIG_PATH}
-    )
-    write_basic_package_version_file(
-        ${CMAKE_CURRENT_BINARY_DIR}/OpenSubdivConfigVersion.cmake
-        VERSION ${OSD_SONAME}
-        COMPATIBILITY SameMajorVersion
-    )
-
-    install(EXPORT opensubdiv-targets
-        NAMESPACE OpenSubdiv::
-        FILE OpenSubdivTargets.cmake
-        DESTINATION ${OPENSUBDIV_CONFIG_PATH})
-
-    install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/OpenSubdivConfig.cmake
-        ${CMAKE_CURRENT_BINARY_DIR}/OpenSubdivConfigVersion.cmake
-        DESTINATION ${OPENSUBDIV_CONFIG_PATH}
-    )
-endif()
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/LICENSE.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/LICENSE.txt
deleted file mode 100644
index c7533090b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/LICENSE.txt
+++ /dev/null
@@ -1,174 +0,0 @@
-
-                               Modified Apache 2.0 License
-
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor
-      and its affiliates, except as required to comply with Section 4(c) of
-      the License and to reproduce the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/README.md b/contrib/tinyusdz/tinyusdz_repo/src/osd/README.md
deleted file mode 100644
index 6be837e06..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Code grabbed from OpenSubdiv-aarch64(v3.4.3(2020 April))
-
-https://github.com/syoyo/OpenSubdiv-aarch64
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/CMakeLists.txt
deleted file mode 100644
index f01a8a055..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/CMakeLists.txt
+++ /dev/null
@@ -1,440 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-if (NOT NO_LIB)
-
-    #---------------------------------------------------------------------------
-    include_directories(
-        "${PROJECT_SOURCE_DIR}/opensubdiv"
-    )
-
-    #---------------------------------------------------------------------------
-    # platform dependent tweaks
-    if(APPLE OR UNIX)
-        set(PLATFORM_COMPILE_FLAGS -fPIC)
-    elseif(WIN32)
-
-    endif()
-
-    add_definitions(
-        ${PLATFORM_COMPILE_FLAGS}
-    )
-
-    #---------------------------------------------------------------------------
-    if( OPENMP_FOUND )
-        if (CMAKE_COMPILER_IS_GNUCXX)
-            list(APPEND PLATFORM_CPU_LIBRARIES gomp)
-        endif()
-    endif()
-
-    if( TBB_FOUND )
-        include_directories("${TBB_INCLUDE_DIR}")
-        list(APPEND PLATFORM_CPU_LIBRARIES
-            ${TBB_LIBRARIES}
-        )
-    endif()
-
-    if( OPENGL_FOUND )
-        include_directories(${OPENGL_LOADER_INCLUDE_DIRS})
-        list(APPEND PLATFORM_GPU_LIBRARIES
-            ${OPENGL_LOADER_LIBRARIES}
-        )
-        set(OPENGL_LOADER_OBJS $<TARGET_OBJECTS:glLoader_obj>)
-    elseif( OPENGLES_FOUND )
-        include_directories("${OPENGLES_INCLUDE_DIR}")
-        list(APPEND PLATFORM_GPU_LIBRARIES
-            ${OPENGLES_LIBRARIES}
-        )
-    endif()
-
-    if( DXSDK_FOUND )
-        include_directories( "${DXSDK_INCLUDE_DIR}" )
-        list(APPEND PLATFORM_GPU_LIBRARIES
-            ${DXSDK_LIBRARIES}
-        )
-    endif()
-
-    if( METAL_FOUND )
-        include_directories( "${METAL_INCLUDE_DIR}" )
-        list(APPEND PLATFORM_GPU_LIBRARIES
-            ${METAL_LIBRARIES}
-        )
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-    endif()
-
-    if ( OPENCL_FOUND )
-        include_directories( "${OPENCL_INCLUDE_DIRS}" )
-        list(APPEND PLATFORM_GPU_LIBRARIES
-            ${OPENCL_LIBRARIES}
-        )
-    endif()
-
-    if( CUDA_FOUND )
-        include_directories( "${CUDA_INCLUDE_DIRS}" )
-    endif()
-
-
-
-    #---------------------------------------------------------------------------
-
-    add_subdirectory(hbr)
-
-    add_subdirectory(sdc)
-
-    add_subdirectory(vtr)
-
-    add_subdirectory(far)
-
-    add_subdirectory(bfr)
-
-    add_subdirectory(osd)
-
-    #---------------------------------------------------------------------------
-
-    install( FILES version.h
-        DESTINATION
-            "${CMAKE_INCDIR_BASE}"
-        PERMISSIONS
-            OWNER_READ
-            GROUP_READ
-            WORLD_READ )
-
-    #---------------------------------------------------------------------------
-
-    # Build static libs ------------------------------------
-    add_library(osd_static_cpu
-        STATIC
-        version.cpp
-        $<TARGET_OBJECTS:sdc_obj>
-        $<TARGET_OBJECTS:vtr_obj>
-        $<TARGET_OBJECTS:far_obj>
-        $<TARGET_OBJECTS:bfr_obj>
-        $<TARGET_OBJECTS:osd_cpu_obj>
-    )
-
-    set_target_properties(osd_static_cpu
-        PROPERTIES
-            OUTPUT_NAME osdCPU
-            EXPORT_NAME osdCPU_static
-            CLEAN_DIRECT_OUTPUT 1
-            FOLDER "opensubdiv"
-    )
-
-    target_link_libraries(osd_static_cpu
-        ${PLATFORM_CPU_LIBRARIES}
-    )
-
-    install( TARGETS osd_static_cpu EXPORT opensubdiv-targets DESTINATION "${CMAKE_LIBDIR_BASE}" )
-
-    if( OSD_GPU )
-        # this macro uses FindCUDA.cmake to compile .cu kernel files
-        # the target then adds the other obj dependencies and include files
-        osd_add_possibly_cuda_library(osd_static_gpu "opensubdiv"
-                STATIC
-                version.cpp
-                $<TARGET_OBJECTS:osd_gpu_obj>
-                ${OPENGL_LOADER_OBJS}
-                ${CUDA_KERNEL_FILES}
-        )
-        set_target_properties(osd_static_gpu
-            PROPERTIES
-                OUTPUT_NAME osdGPU
-                EXPORT_NAME osdGPU_static
-                CLEAN_DIRECT_OUTPUT 1)
-
-        target_link_libraries(osd_static_gpu
-            ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES}
-        )
-
-        install( TARGETS osd_static_gpu EXPORT opensubdiv-targets DESTINATION "${CMAKE_LIBDIR_BASE}" )
-    endif()
-
-
-    # Build dynamic libs  ----------------------------------
-    if (BUILD_SHARED_LIBS AND NOT WIN32 AND NOT IOS)
-
-        # generate dynamic-link targets
-
-        #---------------------------------------------------
-        add_library(osd_dynamic_cpu
-            SHARED
-            version.cpp
-            $<TARGET_OBJECTS:sdc_obj>
-            $<TARGET_OBJECTS:vtr_obj>
-            $<TARGET_OBJECTS:far_obj>
-            $<TARGET_OBJECTS:bfr_obj>
-            $<TARGET_OBJECTS:osd_cpu_obj>
-        )
-
-        if (NOT ANDROID)
-            set_target_properties(osd_dynamic_cpu
-                PROPERTIES
-                    OUTPUT_NAME osdCPU
-                    EXPORT_NAME osdCPU
-                    CLEAN_DIRECT_OUTPUT 1
-                    SOVERSION ${OSD_SONAME}
-                )
-        else()
-            set_target_properties(osd_dynamic_cpu
-                PROPERTIES
-                    OUTPUT_NAME osdCPU
-                    EXPORT_NAME osdCPU
-                    CLEAN_DIRECT_OUTPUT 1
-                )
-        endif()
-
-        target_link_libraries(osd_dynamic_cpu
-            ${PLATFORM_CPU_LIBRARIES}
-        )
-
-        install( TARGETS osd_dynamic_cpu EXPORT opensubdiv-targets LIBRARY DESTINATION "${CMAKE_LIBDIR_BASE}" )
-
-        #---------------------------------------------------
-        if( OSD_GPU )
-            osd_add_possibly_cuda_library(osd_dynamic_gpu "opensubdiv"
-                SHARED
-                version.cpp
-                $<TARGET_OBJECTS:osd_gpu_obj>
-                ${OPENGL_LOADER_OBJS}
-                ${CUDA_KERNEL_FILES}
-            )
-
-            if (NOT ANDROID)
-                set_target_properties(osd_dynamic_gpu
-                    PROPERTIES
-                        OUTPUT_NAME osdGPU
-                        EXPORT_NAME osdGPU
-                        CLEAN_DIRECT_OUTPUT 1
-                        SOVERSION ${OSD_SONAME}
-                    )
-            else()
-                set_target_properties(osd_dynamic_gpu
-                    PROPERTIES
-                        OUTPUT_NAME osdGPU
-                        EXPORT_NAME osdGPU
-                        CLEAN_DIRECT_OUTPUT 1
-                    )
-            endif()
-
-            target_link_libraries(osd_dynamic_gpu
-                osd_dynamic_cpu
-                ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES}
-            )
-
-            install( TARGETS osd_dynamic_gpu EXPORT opensubdiv-targets LIBRARY DESTINATION "${CMAKE_LIBDIR_BASE}" )
-        endif()
-
-    endif()
-
-    # Build frameworks  ----------------------------------
-    if(APPLE AND NOT NO_MACOS_FRAMEWORK)
-        get_directory_property(OSD_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/osd DEFINITION PUBLIC_HEADER_FILES)
-        get_directory_property(FAR_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/far DEFINITION PUBLIC_HEADER_FILES)
-        get_directory_property(SDC_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/sdc DEFINITION PUBLIC_HEADER_FILES)
-        get_directory_property(HBR_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/hbr DEFINITION PUBLIC_HEADER_FILES)
-        get_directory_property(VTR_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/vtr DEFINITION PUBLIC_HEADER_FILES)
-        get_directory_property(BFR_HEADER_FILES DIRECTORY ${PROJECT_SOURCE_DIR}/opensubdiv/bfr DEFINITION PUBLIC_HEADER_FILES)
-
-
-        foreach(file ${OSD_HEADER_FILES})
-            list(APPEND PUBLIC_HEADER_FILES "osd/${file}")
-        endforeach(file)
-
-        foreach(file ${FAR_HEADER_FILES})
-            list(APPEND PUBLIC_HEADER_FILES "far/${file}")
-        endforeach(file)
-
-        foreach(file ${SDC_HEADER_FILES})
-            list(APPEND PUBLIC_HEADER_FILES "sdc/${file}")
-        endforeach(file)
-
-        foreach(file ${HBR_HEADER_FILES})
-            list(APPEND PUBLIC_HEADER_FILES "hbr/${file}")
-        endforeach(file)
-
-        foreach(file ${VTR_HEADER_FILES})
-            list(APPEND PUBLIC_HEADER_FILES "vtr/${file}")
-        endforeach(file)
-
-        foreach(file ${BFR_HEADER_FILES})
-            list(APPEND PUBLIC_HEADER_FILES "bfr/${file}")
-        endforeach(file)
-
-        list(APPEND PUBLIC_HEADER_FILES "version.h")
-
-        #static framework
-        add_library(osd_static_framework
-            STATIC
-            version.cpp
-            $<TARGET_OBJECTS:sdc_obj>
-            $<TARGET_OBJECTS:vtr_obj>
-            $<TARGET_OBJECTS:far_obj>
-            $<TARGET_OBJECTS:bfr_obj>
-            $<TARGET_OBJECTS:osd_cpu_obj>
-            $<TARGET_OBJECTS:osd_gpu_obj>
-            ${OPENGL_LOADER_OBJS}
-        )
-
-        set_target_properties(
-            osd_static_framework
-            PROPERTIES
-            FRAMEWORK true
-            INSTALL_NAME_DIR "@rpath/OpenSubdiv.framework/OpenSubdiv"
-            INSTALL_RPATH "@executable_path/Frameworks;@loader_path/Frameworks"
-            OUTPUT_NAME OpenSubdiv_static
-            EXPORT_NAME OpenSubdiv_static
-            CLEAN_DIRECT_OUTPUT true
-        )
-
-        target_link_libraries(osd_static_framework
-            ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES}
-        )
-
-        install( TARGETS osd_static_framework EXPORT opensubdiv-targets
-             LIBRARY DESTINATION "${CMAKE_LIBDIR_BASE}"
-             FRAMEWORK DESTINATION "${CMAKE_LIBDIR_BASE}"
-             PUBLIC_HEADER  DESTINATION "${CMAKE_INCDIR_BASE}"
-             ARCHIVE DESTINATION "${CMAKE_LIBDIR_BASE}")
-
-        foreach(file ${PUBLIC_HEADER_FILES})
-            add_custom_command(TARGET osd_static_framework POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy
-                "${CMAKE_SOURCE_DIR}/opensubdiv/${file}"
-                "$<TARGET_FILE_DIR:osd_static_framework>/Headers/${file}"
-            )
-        endforeach(file)
-
-        add_custom_command(TARGET osd_static_framework POST_BUILD
-            COMMAND ln -sf
-            "Versions/Current/Headers"
-            "$<TARGET_FILE_DIR:osd_static_framework>/../../Headers"
-        )
-
-        #shared framework
-        if (BUILD_SHARED_LIBS)
-            add_library(osd_dynamic_framework
-                SHARED
-                version.cpp
-                $<TARGET_OBJECTS:sdc_obj>
-                $<TARGET_OBJECTS:vtr_obj>
-                $<TARGET_OBJECTS:far_obj>
-                $<TARGET_OBJECTS:bfr_obj>
-                $<TARGET_OBJECTS:osd_cpu_obj>
-                $<TARGET_OBJECTS:osd_gpu_obj>
-                ${OPENGL_LOADER_OBJS}
-            )
-
-            set_target_properties(
-                osd_dynamic_framework
-                PROPERTIES
-                RPATH true
-                FRAMEWORK true
-                INSTALL_NAME_DIR "@rpath/OpenSubdiv.framework/OpenSubdiv"
-                INSTALL_RPATH "@executable_path/Frameworks;@loader_path/Frameworks"
-                OUTPUT_NAME OpenSubdiv
-                EXPORT_NAME OpenSubdiv
-                CLEAN_DIRECT_OUTPUT true
-            )
-
-            target_link_libraries(osd_dynamic_framework
-                ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES}
-            )
-
-            install( TARGETS osd_dynamic_framework EXPORT opensubdiv-targets
-                 FRAMEWORK DESTINATION "${CMAKE_LIBDIR_BASE}"
-                 LIBRARY DESTINATION "${CMAKE_LIBDIR_BASE}"
-                 PUBLIC_HEADER  DESTINATION "${CMAKE_INCDIR_BASE}"
-                 PRIVATE_HEADER  DESTINATION "${CMAKE_INCDIR_BASE}"
-                 )
-
-            foreach(file ${PUBLIC_HEADER_FILES})
-                add_custom_command(TARGET osd_dynamic_framework POST_BUILD
-                    COMMAND ${CMAKE_COMMAND} -E copy
-                    "${CMAKE_SOURCE_DIR}/opensubdiv/${file}"
-                    "$<TARGET_FILE_DIR:osd_dynamic_framework>/Headers/${file}"
-                )
-            endforeach(file)
-
-            add_custom_command(TARGET osd_dynamic_framework POST_BUILD
-                COMMAND ln -sf
-                "Versions/Current/Headers"
-                "$<TARGET_FILE_DIR:osd_dynamic_framework>/../../Headers"
-            )
-        endif()
-
-    endif()
-
-    # Expose preprocessor macro to the interface so that client know which feature are enabled
-    if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)
-        foreach(osd_target osd_static_cpu osd_static_gpu osd_dynamic_cpu osd_dynamic_gpu osd_static_framework osd_dynamic_framework)
-            if(TARGET ${osd_target})
-                if(CLEW_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_CLEW)
-                endif()
-                if(CUDA_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_CUDA)
-                endif()
-                if(DXSDK_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_DX11SDK)
-                endif()
-                if(METAL_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_METAL)
-                endif()
-                if(OPENCL_CL_D3D11_EXT_H_FOUND OR OPENCL_CL_D3D11_H_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_OPENCL_DX_INTEROP)
-                endif()
-                if(OPENCL_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_OPENCL)
-                endif()
-                if(OPENGL_4_2_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK)
-                endif()
-                if(OPENGL_4_3_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_GLSL_COMPUTE)
-                endif()
-                if(NOT NO_OPENGL AND OPENGL_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_OPENGL)
-                endif()
-                if(NOT NO_OPENGL AND OPENGLES_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_OPENGLES)
-                endif()
-                if(OPENMP_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_OPENMP)
-                endif()
-                if(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES)
-                endif()
-                if(PTEX_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_PTEX)
-                endif()
-                if(TBB_FOUND)
-                    target_compile_definitions(${osd_target} INTERFACE OPENSUBDIV_HAS_TBB)
-                endif()
-            endif()
-        endforeach()
-    endif()
-
-endif()
-
-#-------------------------------------------------------------------------------
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/CMakeLists.txt
deleted file mode 100644
index 81784a38f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/CMakeLists.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-#   Copyright 2021 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# source & headers
-set(SOURCE_FILES
-     faceSurface.cpp
-     faceTopology.cpp
-     faceVertex.cpp
-     hash.cpp
-     irregularPatchBuilder.cpp
-     parameterization.cpp
-     patchTree.cpp
-     patchTreeBuilder.cpp
-     refinerSurfaceFactory.cpp
-     regularPatchBuilder.cpp
-     surface.cpp
-     surfaceData.cpp
-     surfaceFactory.cpp
-     surfaceFactoryCache.cpp
-     tessellation.cpp
-     vertexDescriptor.cpp
-)
-
-set(PRIVATE_HEADER_FILES
-     faceSurface.h
-     faceTopology.h
-     faceVertex.h
-     faceVertexSubset.h
-     hash.h
-     irregularPatchBuilder.h
-     patchTree.h
-     patchTreeBuilder.h
-     pointOperations.h
-     regularPatchBuilder.h
-     vertexTag.h
-)
-
-set(PUBLIC_HEADER_FILES
-     irregularPatchType.h
-     limits.h
-     parameterization.h
-     refinerSurfaceFactory.h
-     surface.h
-     surfaceData.h
-     surfaceFactory.h
-     surfaceFactoryMeshAdapter.h
-     surfaceFactoryCache.h
-     tessellation.h
-     vertexDescriptor.h
-)
-
-set(DOXY_HEADER_FILES ${PUBLIC_HEADER_FILES})
-
-include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-
-if (NOT NO_LIB)
-
-    # Compile objs first for both the CPU and GPU libs -----
-    add_library(bfr_obj
-        OBJECT
-            ${SOURCE_FILES}
-            ${PRIVATE_HEADER_FILES}
-            ${PUBLIC_HEADER_FILES}
-    )
-
-    set_target_properties(bfr_obj
-        PROPERTIES
-            FOLDER "opensubdiv"
-    )
-
-endif()
-
-#-------------------------------------------------------------------------------
-osd_add_doxy_headers( "${DOXY_HEADER_FILES}" )
-
-install(
-    FILES
-        ${PUBLIC_HEADER_FILES}
-    DESTINATION
-        "${CMAKE_INCDIR_BASE}/bfr"
-    PERMISSIONS
-        OWNER_READ
-        GROUP_READ
-        WORLD_READ )
-
-#-------------------------------------------------------------------------------
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceSurface.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceSurface.cpp
deleted file mode 100644
index c23f3be68..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceSurface.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/faceSurface.h"
-
-#include <algorithm>
-#include <cstring>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Initialization utilities for both vertex and face-varying surfaces:
-//
-void
-FaceSurface::preInitialize(FaceTopology const & faceTopology,
-                           Index        const   faceIndices[]) {
-
-    //
-    //  Initialize members, allocate subsets for the corners and clear
-    //  tags combining features of all corners:
-    //
-    _topology = &faceTopology;
-    _indices  = faceIndices;
-
-    _isFaceVarying = false;
-    _matchesVertex = false;
-
-    _corners.SetSize(GetFaceSize());
-
-    _combinedTag.Clear();
-}
-
-void
-FaceSurface::postInitialize() {
-
-    //
-    //  Determine if the surface is regular and if not, filter options
-    //  that are not being used (to avoid them falsely indicating that
-    //  two similar surfaces are different):
-    //
-    _isRegular = isRegular();
-
-    _optionsInEffect = GetSdcOptionsAsAssigned();
-    if (!_isRegular) {
-        reviseSdcOptionsInEffect();
-    }
-}
-
-//
-//  Initializers for vertex and face-varying surfaces:
-//
-void
-FaceSurface::Initialize(FaceTopology const & vtxTopology,
-                        Index const          vtxIndices[]) {
-
-    preInitialize(vtxTopology, vtxIndices);
-
-    _isFaceVarying = false;
-
-    //  WIP - we could reduce the subset by seeking delimiting inf-sharp
-    //        edges, but not in the presence of a dart
-    bool useInfSharpSubsets = _topology->GetTag().HasInfSharpEdges() &&
-                             !_topology->GetTag().HasInfSharpDarts();
-
-    //
-    //  For each corner, identify the manifold subset containing the face
-    //  and sharpen according to the vertex boundary interpolation option
-    //  if warranted.  Meanwhile, accumulate the combined set of tags for
-    //  all corners:
-    //
-    for (int corner = 0; corner < GetFaceSize(); ++corner) {
-        FaceVertex       const & vtxTop = GetCornerTopology(corner);
-        FaceVertexSubset       & vtxSub = _corners[corner];
-
-        vtxTop.GetVertexSubset(&vtxSub);
-
-        if (vtxSub.IsBoundary() && !vtxSub.IsSharp()) {
-            sharpenBySdcVtxBoundaryInterpolation(&vtxSub, vtxTop);
-        }
-        if (useInfSharpSubsets && vtxTop.GetTag().HasInfSharpEdges()) {
-            //  WIP - potentially reduce to a smaller subset here
-        }
-        _combinedTag.Combine(vtxSub.GetTag());
-    }
-    postInitialize();
-}
-
-void
-FaceSurface::Initialize(FaceSurface const  & vtxSurface,
-                        Index const          fvarIndices[]) {
-
-    preInitialize(*vtxSurface._topology, fvarIndices);
-
-    _isFaceVarying = true;
-
-    //
-    //  For each corner, find the face-varying subset of the vertex subset
-    //  and sharpen according to the face-varying interpolation option if
-    //  warranted.  Meanwhile, accumulate the combined set of tags for all
-    //  corners, and whether the face-varying topology matches the vertex
-    //  for all corners:
-    //
-    for (int corner = 0; corner < GetFaceSize(); ++corner) {
-        FaceVertex       const & vtxTop  = GetCornerTopology(corner);
-        FaceVertexSubset const & vtxSub  = vtxSurface.GetCornerSubset(corner);
-        FaceVertexSubset       & fvarSub = _corners[corner];
-
-        vtxTop.FindFaceVaryingSubset(&fvarSub, fvarIndices, vtxSub);
-
-        if (fvarSub.IsBoundary() && !fvarSub.IsSharp()) {
-            sharpenBySdcFVarLinearInterpolation(&fvarSub, fvarIndices,
-                    vtxSub, vtxTop);
-        }
-        _combinedTag.Combine(fvarSub.GetTag());
-
-        _matchesVertex = _matchesVertex && fvarSub.ShapeMatchesSuperset(vtxSub);
-
-        fvarIndices += vtxTop.GetNumFaceVertices();
-    }
-    postInitialize();
-}
-
-//
-//  Minor methods supporting initialization:
-//
-bool
-FaceSurface::isRegular() const {
-
-    //
-    //  Immediate reject features from the combined tags (semi-sharp
-    //  vertices, any sharp edges, any irregular face sizes) before
-    //  testing valence and topology at each corner:
-    //
-    if (_combinedTag.HasSharpEdges() ||
-        _combinedTag.HasSemiSharpVertices() ||
-        _combinedTag.HasIrregularFaceSizes()) {
-        return false;
-    }
-
-    //
-    //  If no boundaries, the interior case can be quickly determined:
-    //
-    if (!_combinedTag.HasBoundaryVertices()) {
-        if (_combinedTag.HasInfSharpVertices()) return false;
-
-        if (GetRegFaceSize() == 4) {
-            //  Can use bitwise-OR here for reg valence of 4:
-            return (_corners[0].GetNumFaces() |
-                    _corners[1].GetNumFaces() |
-                    _corners[2].GetNumFaces() |
-                    _corners[3].GetNumFaces()) == 4;
-        } else {
-            return (_corners[0].GetNumFaces() == 6) &&
-                   (_corners[1].GetNumFaces() == 6) &&
-                   (_corners[2].GetNumFaces() == 6);
-        }
-    }
-
-    //
-    //  Test all corners for appropriate interior or boundary valence:
-    //
-    int regInteriorValence = (GetRegFaceSize() == 4) ? 4 : 6;
-    int regBoundaryValence = (regInteriorValence / 2);
-
-    for (int i = 0; i < GetFaceSize(); ++i) {
-        FaceVertexSubset const & corner = _corners[i];
-
-        if (corner.IsSharp()) {
-            if (corner.GetNumFaces() != 1) return false;
-        } else if (corner.IsBoundary()) {
-            if (corner.GetNumFaces() != regBoundaryValence) return false;
-        } else {
-            if (corner.GetNumFaces() != regInteriorValence) return false;
-        }
-    }
-    return true;
-}
-
-void
-FaceSurface::reviseSdcOptionsInEffect() {
-
-    //
-    //  "Override" (ignore, set to default) any options not affecting
-    //  the shape of the limit surface.  The boundary and face-varying
-    //  interpolation options are fixed/ignored for all cases.  Whether
-    //  other options have an effect depends on the topology present.
-    //
-    //  This is done, in part, to make accurate comparisons between
-    //  the topologies of two surfaces.  For example, the presence of
-    //  differing creasing methods should not lead to two topologically
-    //  identical surfaces with no creasing being considered different.
-    //
-    //  This is to be used on construction on irregular surfaces AFTER
-    //  the combined tags have been determined.
-    //
-    assert(!_isRegular);
-
-    MultiVertexTag const & tags = _combinedTag;
-
-    Sdc::Options & options = _optionsInEffect;
-
-    //  Boundary and face-varying interpolation fixed/ignored for all:
-    options.SetVtxBoundaryInterpolation(Sdc::Options::VTX_BOUNDARY_EDGE_ONLY);
-    options.SetFVarLinearInterpolation( Sdc::Options::FVAR_LINEAR_ALL);
-
-    //  Crease-method ignored when no semi-sharp creasing:
-    if (options.GetCreasingMethod() != Sdc::Options::CREASE_UNIFORM) {
-        if (!tags.HasSemiSharpEdges() && !tags.HasSemiSharpVertices()) {
-            options.SetCreasingMethod(Sdc::Options::CREASE_UNIFORM);
-        }
-    }
-
-    //  Catmark triangle smoothing ignored if not Catmark with triangles:
-    if (options.GetTriangleSubdivision() != Sdc::Options::TRI_SUB_CATMARK) {
-        //  This is slightly stronger than necessary -- will keep the
-        //  tri-smooth setting if Catmark and any non-quads:
-        if ((GetSdcScheme() != Sdc::SCHEME_CATMARK) ||
-                !tags.HasIrregularFaceSizes()) {
-            options.SetTriangleSubdivision(Sdc::Options::TRI_SUB_CATMARK);
-        }
-    }
-
-    //  Non-default values of any future options will warrant attention
-}
-
-
-//
-//  Internal methods to apply the Sdc boundary interpolation options for
-//  vertex and face-varying topology:
-//
-void
-FaceSurface::sharpenBySdcVtxBoundaryInterpolation(FaceVertexSubset * vtxSub,
-        FaceVertex const & vtxTop) const {
-
-    assert(vtxSub->IsBoundary() && !vtxSub->IsSharp());
-
-    //
-    //  Sharpen according to Sdc::Options::VtxBoundaryInterpolation:
-    //
-    //  Remember vertex boundary interpolation is applied based on the
-    //  full topology of the vertex not a particular subset (e.g. we can
-    //  have a smooth corner in a subset delimited by inf-sharp edges).
-    //  And edges are all implicitly sharpened -- leaving only corners to
-    //  be sharpened -- making the EDGE_ONLY and EDGE_AND_CORNER names
-    //  somewhat misleading.
-    //
-    bool isSharp = false;
-
-    switch (_topology->_schemeOptions.GetVtxBoundaryInterpolation()) {
-    case Sdc::Options::VTX_BOUNDARY_NONE:
-        //  Nothing to do, as the name suggests
-        break;
-
-    case Sdc::Options::VTX_BOUNDARY_EDGE_ONLY:
-        //  Edges are implicitly sharpened -- nothing more to do
-        break;
-
-    case Sdc::Options::VTX_BOUNDARY_EDGE_AND_CORNER:
-        //  Edges are implicitly sharpened -- sharpen any corners
-        isSharp = (vtxTop.GetNumFaces() == 1);
-        break;
-
-    default:
-        assert("Unknown value for Sdc::Options::VtxBoundaryInterpolation" == 0);
-        break;
-    }
-
-    if (isSharp) {
-        vtxTop.SharpenSubset(vtxSub);
-    }
-}
-
-namespace fvar_plus {
-    //
-    //  This local namespace includes a few utilities for dealing solely
-    //  with the CORNERS_PLUS1 and PLUS2 face-varying interpolation options.
-    //
-    //  These "plus" options differ from the others in that the behavior
-    //  within a face-varying subset is influenced by factors outside the
-    //  subset, i.e. the presence of external face-varying indices or sharp
-    //  edges.
-    //
-    typedef FaceSurface::Index Index;
-
-    //
-    //  If more than two distinct face-varying subsets are present, the
-    //  corner is sharpened regardless of any other conditions -- leaving
-    //  cases of only one or two subsets to be dealt with.
-    //
-    bool
-    hasMoreThanTwoFVarSubsets(FaceVertex const & top,
-                              Index      const   fvarIndices[]) {
-
-        Index indexCorner = top.GetFaceIndexAtCorner(fvarIndices);
-        Index indexOther = -1;
-
-        int numOtherEdgesDiscts = 1;
-
-        //
-        //  Iterate through the faces and return if more than two unique
-        //  fvar indices encountered, or more than two discts edges are
-        //  found in the only other subset:
-        //
-        int  numFaces = top.GetNumFaces();
-
-        for (int face = 0; face < numFaces; ++face) {
-            Index index = top.GetFaceIndexAtCorner(face, fvarIndices);
-
-            //  Matches the corner's subset -- skip:
-            if (index == indexCorner) continue;
-
-            //  Does not match corner's subset or the other subset -- done:
-            if ((indexOther >= 0) && (index != indexOther)) return true;
-
-            //  Matches the "other" subset -- check for discontinuity
-            //  between this face and the next:
-            indexOther = index;
-
-            int faceNext = top.GetFaceNext(face);
-
-            numOtherEdgesDiscts += (faceNext < 0) ||
-                !top.FaceIndicesMatchAcrossEdge(face, faceNext, fvarIndices);
-
-            if (numOtherEdgesDiscts > 2) return true;
-        }
-        return false;
-    }
-
-    //
-    //  Two face-varying subsets are said to have "dependent sharpness"
-    //  when the sharpness of one influences the other. This is applied
-    //  when one subset has no sharp interior edges while the other does.
-    //
-    //  NOTE that while these match the behavior of Far, it is unclear if
-    //  Far's conditions are what was intended (need to compare to Hbr).
-    //  If both subsets have a semi-sharp interior edge, the largest of
-    //  the two should probably influence the other -- as is the case as
-    //  one of those semi-sharp edges becomes inf-sharp.
-    //
-    bool
-    hasDependentSharpness(FaceVertex       const & topology,
-                          FaceVertexSubset const & subset) {
-
-        return ((topology.GetNumFaces() - subset.GetNumFaces()) > 1) &&
-                topology.GetTag().HasSharpEdges() &&
-               !subset.GetTag().HasSharpEdges();
-    }
-
-    //
-    //  After the conditions for dependent sharpness have been confirmed,
-    //  retrieve the desired value.  The result is the maximum sharpness
-    //  of interior edges that are outside the subset -- and do not lie
-    //  on the seams between the two subsets.
-    //
-    float
-    getDependentSharpness(FaceVertex       const & top,
-                          FaceVertexSubset const & subset) {
-
-        //  Identify the first and last faces of the subset -- to be
-        //  skipped when searching for the largest interior sharp edge:
-        int firstFace = top.GetFaceFirst(subset);
-        int lastFace  = top.GetFaceLast(subset);
-
-        //  Skip the face or its neighbor with the shared leading edge:
-        int firstFacePrev = top.GetFacePrevious(firstFace);
-        int lastFaceNext  = top.GetFaceNext(lastFace);
-
-        firstFace = (firstFacePrev < 0) ? -1 : firstFace;
-        lastFace  = (lastFaceNext  < 0) ? -1 : lastFaceNext;
-
-        //  Search for largest interior sharp edge using leading edges:
-        float sharp = 0.0f;
-        for (int i = 0; i < top.GetNumFaces(); ++i) {
-            if (top.GetFacePrevious(i) >= 0) {
-                if ((i != firstFace) && (i != lastFace)) {
-                    sharp = std::max(sharp, top.GetFaceEdgeSharpness(2*i));
-                }
-            }
-        }
-        //  Must exceed vert sharpness to have any effect, otherwise ignore:
-        return (sharp > top.GetVertexSharpness()) ? sharp : 0.0f;
-    }
-}
-
-
-//
-//  The main method for affecting face-varying subsets according to the
-//  face-varying interpolation options.  Most of these are trivial, with
-//  only the LINEAR_CORNERS_PLUS* cases requiring much effort.
-//
-void
-FaceSurface::sharpenBySdcFVarLinearInterpolation(FaceVertexSubset * fvarSub,
-        Index            const   fvarIndices[],
-        FaceVertexSubset const & vtxSub,
-        FaceVertex       const & vtxTop) const {
-
-    assert(fvarSub->IsBoundary() && !fvarSub->IsSharp());
-
-    //  Each option applies rules to make the corner "linear", i.e. sharp:
-    bool isSharp = false;
-
-    switch (_topology->_schemeOptions.GetFVarLinearInterpolation()) {
-    case Sdc::Options::FVAR_LINEAR_NONE:
-        //  Nothing to do, as the name suggests
-        break;
-
-    case Sdc::Options::FVAR_LINEAR_CORNERS_ONLY:
-        //  Sharpen corners only:
-        isSharp = (fvarSub->GetNumFaces() == 1);
-        break;
-
-    case Sdc::Options::FVAR_LINEAR_CORNERS_PLUS1:
-        //
-        //  Sharpen corners with more than two disjoint face-varying subsets
-        //  and apply "dependent sharpness" (see above) when necessary:
-        //
-        isSharp = (fvarSub->GetNumFaces() == 1) ||
-                  fvar_plus::hasMoreThanTwoFVarSubsets(vtxTop, fvarIndices);
-        if (!isSharp && fvar_plus::hasDependentSharpness(vtxTop, *fvarSub)) {
-            //  Sharpen if sharp edges of other subset affects this one
-            vtxTop.SharpenSubset(fvarSub,
-                    fvar_plus::getDependentSharpness(vtxTop, *fvarSub));
-        }
-        break;
-
-    case Sdc::Options::FVAR_LINEAR_CORNERS_PLUS2:
-        //
-        //  Sharpen as with "plus1" above, in addition to sharpening both
-        //  concave corners and darts.
-        //
-        //  In other words, the only situations unsharpened are when either
-        //  the face-varying and vertex subsets exactly match, or there
-        //  are two fvar subsets that both have two or more faces (and no
-        //  dependent sharpness between them).
-        //
-        isSharp = (fvarSub->GetNumFaces() == 1) ||
-                  fvar_plus::hasMoreThanTwoFVarSubsets(vtxTop, fvarIndices);
-        if (!isSharp) {
-            //  Distinguish by the number of faces outside the subset:
-            int numOtherFaces = vtxSub.GetNumFaces() - fvarSub->GetNumFaces();
-            if (numOtherFaces == 0) {
-                //  Sharpen if a dart was created from a periodic vertex
-                isSharp = !vtxSub.IsBoundary();
-            } else if (numOtherFaces == 1) {
-                //  Sharpen this concave corner since other subset is a corner
-                isSharp = true;
-            } else {
-                //  Sharpen if sharp edges of other subset affects this one
-                if (fvar_plus::hasDependentSharpness(vtxTop, *fvarSub)) {
-                    vtxTop.SharpenSubset(fvarSub,
-                            fvar_plus::getDependentSharpness(vtxTop, *fvarSub));
-                }
-            }
-        }
-        break;
-
-    case Sdc::Options::FVAR_LINEAR_BOUNDARIES:
-        //  Sharpen all boundaries:
-        isSharp = true;
-        break;
-
-    case Sdc::Options::FVAR_LINEAR_ALL:
-        assert("Unexpected FVarLinearInterpolation == FVAR_LINEAR_ALL" == 0);
-        break;
-
-    default:
-        assert("Unknown value for Sdc::Options::FVarLinearInterpolation" == 0);
-        break;
-    }
-
-    if (isSharp) {
-        vtxTop.SharpenSubset(fvarSub);
-    }
-}
-
-//
-//  Miscellaneous methods for debugging:
-//
-void
-FaceSurface::print(bool printVerts) const {
-
-    MultiVertexTag const & tag = _combinedTag;
-
-    printf("    FaceTopology:\n");
-    printf("       face size       = %d\n", _topology->GetFaceSize());
-    printf("       num-face-verts  = %d\n", _topology->GetNumFaceVertices());
-    printf("    Properties:\n");
-    printf("       is regular      = %d\n", IsRegular());
-    printf("    Combined tags:\n");
-    printf("       inf-sharp verts  = %d\n", tag.HasInfSharpVertices());
-    printf("       semi-sharp verts = %d\n", tag.HasSemiSharpVertices());
-    printf("       inf-sharp edges  = %d\n", tag.HasInfSharpEdges());
-    printf("       semi-sharp edges = %d\n", tag.HasSemiSharpEdges());
-    printf("       inf-sharp darts  = %d\n", tag.HasInfSharpDarts());
-    printf("       unsharp boundary = %d\n", tag.HasNonSharpBoundary());
-    printf("       irregular faces  = %d\n", tag.HasIrregularFaceSizes());
-    printf("       unordered verts  = %d\n", tag.HasUnOrderedVertices());
-
-    if (printVerts) {
-        Index const * indices = _indices;
-
-        for (int i = 0; i < GetFaceSize(); ++i) {
-            FaceVertex       const & top = GetCornerTopology(i);
-            FaceVertexSubset const & sub = GetCornerSubset(i);
-
-            printf("        corner %d:\n", i);
-            printf("            topology:  num faces  = %d, boundary = %d\n",
-                    top.GetNumFaces(), top.GetTag().IsBoundary());
-            printf("            subset:    num faces  = %d, boundary = %d\n",
-                    sub.GetNumFaces(), sub.IsBoundary());
-            printf("                       num before = %d, num after = %d\n",
-                    sub._numFacesBefore, sub._numFacesAfter);
-
-            printf("            face-vert indices:\n");
-
-            for (int j = 0, n = 0; j < top.GetNumFaces(); ++j) {
-                printf("            face %d:  ", j);
-                int S = top.GetFaceSize(j);
-                for (int k = 0; k < S; ++k, ++n) {
-                    printf("%3d", indices[n]);
-                }
-                printf("\n");
-            }
-            indices += top.GetNumFaceVertices();
-        }
-    }
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceSurface.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceSurface.h
deleted file mode 100644
index ee8ec2c30..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceSurface.h
+++ /dev/null
@@ -1,215 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_FACE_SURFACE_H
-#define OPENSUBDIV3_BFR_FACE_SURFACE_H
-
-#include "../version.h"
-
-#include "../bfr/faceTopology.h"
-#include "../bfr/faceVertex.h"
-#include "../vtr/stackBuffer.h"
-#include "../vtr/types.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  The FaceSurface class combines references to several other classes and
-//  data to provide a complete description of the limit surface of a face.
-//
-//  It is a simple aggregate of four sets of data:
-//
-//      - an instance of FaceTopology with all topological information
-//      - a set of FaceVertexSubsets for topological extent of each corner
-//      - a set of indices associated with all vertices of FaceTopology
-//      - a subset of the Sdc::Options that actually affects the surface
-//
-//  with a few additional members summarizing features of these.  The full
-//  set of topology and corresponding indices are provided on construction
-//  and the rest are initialized as member variables.
-//
-//  FaceSurfaces are constructed/initialized in two ways:
-//
-//      - for the vertex topology of a face, initialization requires:
-//          - an instance of FaceTopology
-//          - vertex indices associated with the FaceTopology (though in
-//            some cases the vertex indices are not necessary)
-//
-//      - for the face-varying topology of a face:
-//          - an instance of FaceSurface capturing the vertex topology
-//          - face-varying indices associated with the vertex topology
-//
-//  Once initialized, other than a few simple queries, it serves solely
-//  as a container to be passed to other classes to assemble into regular
-//  or irregular surfaces.
-//
-class FaceSurface {
-public:
-    typedef FaceTopology::Index Index;
-
-public:
-    //  Constructors for vertex and face-varying surfaces:
-    FaceSurface();
-    FaceSurface(FaceTopology const & vtxTopology, Index const vtxIndices[]);
-    FaceSurface(FaceSurface const  & vtxSurface,  Index const fvarIndices[]);
-    ~FaceSurface() { }
-
-    bool IsInitialized() const;
-    void Initialize(FaceTopology const & vtxTopology, Index const vtxInds[]);
-    void Initialize(FaceSurface const  & vtxSurface,  Index const fvarInds[]);
-
-    //   Main public methods to distinguish surface and topology:
-    bool IsRegular() const { return _isRegular; }
-
-    bool FVarTopologyMatchesVertex() const { return _matchesVertex; }
-
-    //  Debugging:
-    void print(bool printVerts = false) const;
-
-public:
-    //  Public access to the main members:
-    FaceTopology     const & GetTopology() const { return *_topology; }
-    FaceVertexSubset const * GetSubsets()  const { return _corners; }
-    Index            const * GetIndices()  const { return _indices; }
-    MultiVertexTag           GetTag()      const { return _combinedTag; }
-
-public:
-    //  Additional public access to data used by builder classes:
-    int GetFaceSize() const;
-    int GetRegFaceSize() const;
-
-    Sdc::SchemeType GetSdcScheme() const;
-    Sdc::Options    GetSdcOptionsInEffect() const;
-    Sdc::Options    GetSdcOptionsAsAssigned() const;
-
-    FaceVertex       const & GetCornerTopology(int corner) const;
-    FaceVertexSubset const & GetCornerSubset(int corner) const;
-
-    int GetNumIndices() const;
-
-private:
-    //  Internal methods:
-    void preInitialize(FaceTopology const & topology, Index const indices[]);
-    void postInitialize();
-
-    bool isRegular() const;
-    void reviseSdcOptionsInEffect();
-
-    //  Methods to apply specified interpolation options to the corners:
-    void sharpenBySdcVtxBoundaryInterpolation(
-                   FaceVertexSubset       * vtxSubsetPtr,
-                   FaceVertex       const & cornerTopology) const;
-
-    void sharpenBySdcFVarLinearInterpolation(
-                   FaceVertexSubset       * fvarSubsetPtr,
-                   Index const              fvarIndices[],
-                   FaceVertexSubset const & vtxSubset,
-                   FaceVertex       const & cornerTopology) const;
-
-private:
-    typedef Vtr::internal::StackBuffer<FaceVertexSubset,8,true> CornerArray;
-
-    FaceTopology const * _topology;
-    Index        const * _indices;
-    CornerArray          _corners;
-
-    //  Members reflecting the effective subset of topology and options:
-    MultiVertexTag _combinedTag;
-    Sdc::Options   _optionsInEffect;
-
-    unsigned int _isFaceVarying : 1;
-    unsigned int _matchesVertex : 1;
-    unsigned int _isRegular     : 1;
-};
-
-//
-//  Inline constructors:
-//
-inline
-FaceSurface::FaceSurface() : _topology(0), _indices(0) {
-}
-inline
-FaceSurface::FaceSurface(FaceTopology const & vtxTop, Index const vIndices[]) {
-    Initialize(vtxTop, vIndices);
-}
-inline
-FaceSurface::FaceSurface(FaceSurface const & vtxSurf, Index const fvIndices[]) {
-    Initialize(vtxSurf, fvIndices);
-}
-
-//
-//  Inline accessors:
-//
-inline bool
-FaceSurface::IsInitialized() const {
-    return _topology != 0;
-}
-
-inline int
-FaceSurface::GetFaceSize() const {
-    return _topology->GetFaceSize();
-}
-inline int
-FaceSurface::GetRegFaceSize() const {
-    return _topology->GetRegFaceSize();
-}
-
-inline Sdc::SchemeType
-FaceSurface::GetSdcScheme() const {
-    return _topology->_schemeType;
-}
-inline Sdc::Options
-FaceSurface::GetSdcOptionsInEffect() const {
-    return _optionsInEffect;
-}
-inline Sdc::Options
-FaceSurface::GetSdcOptionsAsAssigned() const {
-    return _topology->_schemeOptions;
-}
-
-inline FaceVertex const &
-FaceSurface::GetCornerTopology(int corner) const {
-    return _topology->GetTopology(corner);
-}
-
-inline FaceVertexSubset const & 
-FaceSurface::GetCornerSubset(int corner) const {
-    return _corners[corner];
-}
-
-inline int
-FaceSurface::GetNumIndices() const {
-    return _topology->GetNumFaceVertices();
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_FACE_SURFACE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceTopology.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceTopology.cpp
deleted file mode 100644
index fb9ce3df9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceTopology.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/faceTopology.h"
-#include "../sdc/crease.h"
-
-#include <cstring>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-
-//
-//  Constructor needs the same Sdc scheme/options as the SurfaceFactory
-//  to support internal work -- may need to figure another way to assign
-//  these if we later need a default constructor for some purpose...
-//
-FaceTopology::FaceTopology(Sdc::SchemeType schemeType,
-                           Sdc::Options schemeOptions) :
-    _schemeType(schemeType),
-    _schemeOptions(schemeOptions),
-    _regFaceSize(Sdc::SchemeTypeTraits::GetRegularFaceSize(schemeType)),
-    _isInitialized(false) {
-
-}
-
-//
-//  Main initialize/finalize used by base factory to delimit assignment:
-//
-void
-FaceTopology::Initialize(int faceSize) {
-
-    _faceSize = faceSize;
-    _numFaceVertsTotal = 0;
-
-    _combinedTag.Clear();
-
-    _isInitialized = true;
-    _isFinalized   = false;
-
-    _corner.SetSize(faceSize);
-}
-
-void
-FaceTopology::Finalize() {
-
-    //
-    //  Inspect all corner vertex topologies -- accumulating the presence
-    //  of irregular features for the face and assigning other internal
-    //  members used to assemble the limit surface:
-    //
-    //  WIP - potentially want to identify presence of degenerate faces
-    //  below too, i.e. face size < 3.  A subclass may specify these in
-    //  an ordered set and that would mess up some of the topological
-    //  traversals.  In such case, we can initialize the vertex subset
-    //  to excludes such faces -- treating their edges as non-manifold.
-    //
-    //  Probably need to add yet another bit per vertex here to know when
-    //  to process an otherwise simple manifold ring, i.e. hasDegenFaces
-    //
-    assert(_isInitialized);
-
-    for (int i = 0; i < _faceSize; ++i) {
-        FaceVertex & cTop  = GetTopology(i);
-
-        _combinedTag.Combine(cTop.GetTag());
-
-        _numFaceVertsTotal += cTop.GetNumFaceVertices();
-    }
-
-    _isFinalized = true;
-}
-
-void
-FaceTopology::ResolveUnOrderedCorners(Index const fvIndices[]) {
-
-    //
-    //  Inspect and deal with any corner that did not have its incident
-    //  faces specified in counter-clockwise order (and so which may be
-    //  non-manifold).  The face-vertex indices are required for the
-    //  corner to identify the connectivity between them for later use:
-    //
-    //  Be sure to reset the combined tags as resolution of ordering
-    //  will also detect non-manifold (or manifold) features, e.g.
-    //  sharpening or the presence of boundaries edges.
-    //
-    _combinedTag.Clear();
- 
-    for (int i = 0; i < _faceSize; ++i) {
-        FaceVertex & cTop = GetTopology(i);
-
-        if (cTop.GetTag().IsUnOrdered()) {
-            cTop.ConnectUnOrderedFaces(fvIndices);
-        }
-
-        _combinedTag.Combine(cTop.GetTag());
-
-        fvIndices += cTop.GetNumFaceVertices();
-    }
-}
-
-void
-FaceTopology::print(Index const faceVertIndices[]) const {
-
-    MultiVertexTag const & tag = _combinedTag;
-
-    printf("FaceTopology:\n");
-    printf("    face size      = %d\n", _faceSize);
-    printf("    num-face-verts = %d\n", _numFaceVertsTotal);
-    printf("  Tags:\n");
-    printf("    inf-sharp verts  = %d\n", tag.HasInfSharpVertices());
-    printf("    semi-sharp verts = %d\n", tag.HasSemiSharpVertices());
-    printf("    inf-sharp edges  = %d\n", tag.HasInfSharpEdges());
-    printf("    semi-sharp edges = %d\n", tag.HasSemiSharpEdges());
-    printf("    inf-sharp darts  = %d\n", tag.HasInfSharpDarts());
-    printf("    unsharp boundary = %d\n", tag.HasNonSharpBoundary());
-    printf("    irregular faces  = %d\n", tag.HasIrregularFaceSizes());
-    printf("    unordered verts  = %d\n", tag.HasUnOrderedVertices());
-
-    if (faceVertIndices) {
-        Index const * cornerFaceVertIndices = faceVertIndices;
-
-        for (int i = 0; i < _faceSize; ++i) {
-            printf("    corner %d:\n", i);
-
-            FaceVertex const & cTop = GetTopology(i);
-            printf("        topology:  num faces  = %d, boundary = %d\n",
-                    cTop.GetNumFaces(), cTop.GetTag().IsBoundary());
-
-            printf("        face-vert indices:\n");
-
-            for (int j = 0, n = 0; j < cTop.GetNumFaces(); ++j) {
-                printf("        face %d:  ", j);
-                int S = cTop.GetFaceSize(j);
-                for (int k = 0; k < S; ++k, ++n) {
-                    printf("%3d", cornerFaceVertIndices[n]);
-                }
-                printf("\n");
-            }
-            cornerFaceVertIndices += cTop.GetNumFaceVertices();
-        }
-    }
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceTopology.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceTopology.h
deleted file mode 100644
index ca589f073..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceTopology.h
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_FACE_TOPOLOGY_H
-#define OPENSUBDIV3_BFR_FACE_TOPOLOGY_H
-
-#include "../version.h"
-
-#include "../bfr/faceVertex.h"
-#include "../vtr/stackBuffer.h"
-#include "../sdc/types.h"
-#include "../sdc/options.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  The FaceTopology class describes the full topological neighborhood
-//  around a base face of a mesh, which includes everything topologically
-//  necessary to define the limit surface for that face.
-//
-//  It is used solely by the base SurfaceFactory class -- first partially
-//  populated by subclasses before being inspected and augmented to help
-//  assemble the limit surface for the face. Its members include some of
-//  the members of the SurfaceFactory class (e.g. the subdivision scheme
-//  and options) to make them more available for its purposes.
-//
-//  The primary component of FaceTopology is an array of instances of
-//  the FaceVertex class (one for each vertex of the face), which is a
-//  lightweight wrapper around the public VertexDescriptor class that is
-//  populated by subclasses of SurfaceFactory.
-//
-//  FaceTopology is one of three key components in defining the limit
-//  surface around a face.  The others are a set of FaceVertexSubsets (one
-//  for each FaceVertex) that specify the subset of the neighborhood of
-//  the corners of the face that actually do contribute to its surface,
-//  and the indices associated with vertices that FaceTopology describes
-//  (which become the control points of the limit surface).
-//
-class FaceTopology {
-public:
-    typedef FaceVertex::Index Index;
-
-public:
-    FaceTopology(Sdc::SchemeType schemeType,
-                 Sdc::Options    schemeOptions);
-    ~FaceTopology() { }
-
-    void Initialize(int faceSize);
-    void Finalize();
-
-public:
-    Sdc::SchemeType GetSchemeType()    const { return _schemeType; }
-    Sdc::Options    GetSchemeOptions() const { return _schemeOptions; }
-
-    int GetFaceSize()    const { return _faceSize; }
-    int GetRegFaceSize() const { return _regFaceSize; }
-
-    FaceVertex       & GetTopology(int i)       { return _corner[i]; }
-    FaceVertex const & GetTopology(int i) const { return _corner[i]; }
-
-    MultiVertexTag const GetTag() const { return _combinedTag; }
-
-    int GetNumFaceVertices() const { return _numFaceVertsTotal; }
-    int GetNumFaceVertices(int i) const{return _corner[i].GetNumFaceVertices();}
-
-    //  Methods to test for and resolve unordered corners of the face:
-    bool HasUnOrderedCorners() const { return GetTag().HasUnOrderedVertices(); }
-    void ResolveUnOrderedCorners(Index const faceVertexIndices[]);
-
-    //  Debugging...
-    void print(Index const faceVertIndices[]) const;
-
-public:
-    Sdc::SchemeType _schemeType;
-    Sdc::Options    _schemeOptions;
-
-    int _faceSize;
-    int _regFaceSize;
-    int _numFaceVertsTotal;
-
-    MultiVertexTag _combinedTag;
-
-    unsigned short _isInitialized : 1;
-    unsigned short _isFinalized   : 1;
-
-    Vtr::internal::StackBuffer<FaceVertex,4> _corner;
-};
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_FACE_TOPOLOGY_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceVertex.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceVertex.cpp
deleted file mode 100644
index 9492e4f57..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceVertex.cpp
+++ /dev/null
@@ -1,903 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/faceVertex.h"
-#include "../sdc/crease.h"
-
-#include <algorithm>
-#include <cstring>
-#include <cstdio>
-#include <map>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Main initialize and finalize methods used to bracket the assignment
-//  by clients to the VertexDescriptor member:
-//
-void
-FaceVertex::Initialize(int faceSize, int regFaceSize) {
-
-    _commonFaceSize = (short) faceSize;
-    _regFaceSize    = (unsigned char) regFaceSize;
-    _numFaceVerts   = 0;
-
-    _isExpInfSharp  = false;
-    _isExpSemiSharp = false;
-    _isImpInfSharp  = false;
-    _isImpSemiSharp = false;
-
-    _vDesc._isValid       = false;
-    _vDesc._isInitialized = false;
-}
-
-void
-FaceVertex::Finalize(int faceInVertex) {
-
-    assert(_vDesc._isFinalized);
-
-    _faceInRing = (short) faceInVertex;
-
-    //
-    //  Initialize members from the VertexDescriptor:
-    //
-    if (!_vDesc.HasIncidentFaceSizes()) {
-        //  Common face size was previously initialized to the face size
-        _numFaceVerts = _vDesc._numFaces * _commonFaceSize;
-    } else {
-        _commonFaceSize = 0;
-        //  Recall face sizes are available as differences between offsets:
-        _numFaceVerts = _vDesc._faceSizeOffsets[_vDesc._numFaces];
-    }
-
-    //  Vertex sharpness:
-    _isExpInfSharp  = Sdc::Crease::IsInfinite(_vDesc._vertSharpness);
-    _isExpSemiSharp = Sdc::Crease::IsSemiSharp(_vDesc._vertSharpness);
-
-    //
-    //  Initialize tags from VertexDescriptor and other members
-    //
-    //  Note that not all tags can be assigned at this point if the vertex
-    //  is defined by a set of unordered faces. In such cases, the tags
-    //  will be assigned later when the connectivity between incident faces
-    //  is determined. Those that can be assigned regardless of ordering
-    //  are set here -- splitting the assignment of those remaining between
-    //  ordered and unordered cases.
-    //
-    _tag.Clear();
-
-    _tag._unCommonFaceSizes  = _vDesc.HasIncidentFaceSizes();
-    _tag._irregularFaceSizes = (_commonFaceSize != _regFaceSize);
-
-    _tag._infSharpVerts  = _isExpInfSharp;
-    _tag._semiSharpVerts = _isExpSemiSharp;
-
-    _tag._unOrderedFaces = !_vDesc.IsManifold();
-
-    if (_vDesc.IsManifold()) {
-        finalizeOrderedTags();
-    }
-}
-
-void
-FaceVertex::finalizeOrderedTags() {
-
-    //
-    //  A vertex with a set of ordered faces is required to be manifold:
-    //
-    _tag._unOrderedFaces   = false;
-    _tag._nonManifoldVerts = false;
-
-    _tag._boundaryVerts    = _vDesc.IsBoundary();
-    _tag._boundaryNonSharp = _vDesc.IsBoundary();
-
-    //
-    //  Assign tags (and other members) affected by edge sharpness:
-    //
-    if (_vDesc.HasEdgeSharpness()) {
-        float const * sharpness = &_vDesc._faceEdgeSharpness[0];
-
-        //  Detect unsharpened boundary edges:
-        bool isBoundary = _tag._boundaryVerts;
-        if (isBoundary) {
-            int last = 2 * _vDesc._numFaces - 1;
-            _tag._boundaryNonSharp =
-                    !Sdc::Crease::IsInfinite(sharpness[0]) ||
-                    !Sdc::Crease::IsInfinite(sharpness[last]);
-        }
-
-        //  Detect interior inf-sharp and semi-sharp edges:
-        int numInfSharpEdges  = 0;
-        int numSemiSharpEdges = 0;
-
-        for (int i = isBoundary; i < _vDesc._numFaces; ++i ) {
-            if (Sdc::Crease::IsInfinite(sharpness[2*i])) {
-                ++ numInfSharpEdges;
-            } else if (Sdc::Crease::IsSharp(sharpness[2*i])) {
-                ++ numSemiSharpEdges;
-            }
-        }
-
-        //  Mark the presence of interior sharp edges:
-        _tag._infSharpEdges  = (numInfSharpEdges > 0);
-        _tag._semiSharpEdges = (numSemiSharpEdges > 0);
-        _tag._infSharpDarts  = (numInfSharpEdges == 1) && !isBoundary;
-
-        //  Detect edges effectively making the vertex sharp -- note that
-        //  a vertex can be both explicitly and implicitly sharp (e.g. low
-        //  semi-sharp vertex value with a higher semi-sharp edge):
-        int numInfSharpTotal = numInfSharpEdges + isBoundary * 2;
-        if (numInfSharpTotal > 2) {
-            _isImpInfSharp = true;
-        } else if ((numInfSharpTotal + numSemiSharpEdges) > 2) {
-            _isImpSemiSharp = true;
-        }
-
-        //  Mark the vertex inf-sharp if implicitly inf-sharp:
-        if (!_isExpInfSharp && _isImpInfSharp) {
-            _tag._infSharpVerts  = true;
-            _tag._semiSharpVerts = false;
-        }
-    }
-}
-
-bool
-FaceVertex::HasImplicitVertexSharpness() const {
-
-    return _isImpInfSharp || _isImpSemiSharp;
-}
-
-float
-FaceVertex::GetImplicitVertexSharpness() const {
-
-    if (_isImpInfSharp) {
-        return Sdc::Crease::SHARPNESS_INFINITE;
-    }
-    assert(_isImpSemiSharp);
-
-    //
-    //  Since this will be applied at an inf-sharp crease, there will be
-    //  two inf-sharp edges in addition to the semi-sharp, so we only
-    //  need find the max of the semi-sharp edges and whatever explicit
-    //  vertex sharpness may have been assigned.  Iterate through all
-    //  faces and inspect the sharpness of each leading interior edge:
-    //
-    float sharpness = GetVertexSharpness();
-
-    for (int i = 0; i < GetNumFaces(); ++i) {
-        if (GetFacePrevious(i) >= 0) {
-            sharpness = std::max(sharpness, GetFaceEdgeSharpness(2*i));
-        }
-    }
-    return sharpness;
-}
-
-//
-//  Methods to initialize and/or find subsets of the corner's topology:
-//
-int
-FaceVertex::initCompleteSubset(Subset * subsetPtr) const {
-
-    Subset & subset = *subsetPtr;
-
-    //
-    //  Initialize with tags and assign the extent:
-    //
-    int numFaces = GetNumFaces();
-
-    subset.Initialize(GetTag());
-
-    subset._numFacesTotal = (short) numFaces;
-    if (isInterior()) {
-        subset._numFacesBefore = 0;
-        subset._numFacesAfter  = (short)(numFaces - 1);
-    } else if (isOrdered()) {
-        subset._numFacesBefore = _faceInRing;
-        subset._numFacesAfter  = (short)(numFaces - 1 - subset._numFacesBefore);
-    } else {
-        //  Unordered faces -- boundary needs to identify its orientation:
-        subset._numFacesAfter = 0;
-        for (int f = GetFaceNext(_faceInRing); f >= 0; f = GetFaceNext(f)) {
-            ++ subset._numFacesAfter;
-        }
-        subset._numFacesBefore = (short)(numFaces - 1 - subset._numFacesAfter);
-    }
-    return subset._numFacesTotal;
-}
-
-int
-FaceVertex::findConnectedSubsetExtent(Subset * subsetPtr) const {
-
-    Subset & subset = *subsetPtr;
-
-    //
-    //  Initialize with tags and mark manifold:
-    //
-    subset.Initialize(GetTag());
-
-    subset._tag._nonManifoldVerts = false;
-
-    //  Add faces to the dflt single face extent by seeking forward/backward:
-    int fStart = _faceInRing;
-
-    for (int f = GetFaceNext(fStart); f >= 0; f = GetFaceNext(f)) {
-        if (f == fStart) {
-            //  Periodic -- tag as such and return:
-            subset.SetBoundary(false);
-            return subset._numFacesTotal;
-        }
-        subset._numFacesAfter ++;
-        subset._numFacesTotal ++;
-    }
-    for (int f = GetFacePrevious(fStart); f >= 0; f = GetFacePrevious(f)) {
-        subset._numFacesBefore ++;
-        subset._numFacesTotal ++;
-    }
-    subset.SetBoundary(true);
-    return subset._numFacesTotal;
-}
-
-int
-FaceVertex::GetVertexSubset(Subset * subsetPtr) const {
-
-    //
-    //  The subset from a manifold vertex is trivially complete (ordered
-    //  or not), but for non-manifold cases we need to search and update
-    //  the tags according to the content of the subset:
-    //
-    if (isManifold()) {
-        initCompleteSubset(subsetPtr);
-    } else {
-        findConnectedSubsetExtent(subsetPtr);
-
-        adjustSubsetTags(subsetPtr);
-
-        //  And if on a non-manifold crease, test for implicit sharpness:
-        if (!subsetPtr->IsSharp() && HasImplicitVertexSharpness()) {
-            SharpenSubset(subsetPtr, GetImplicitVertexSharpness());
-        }
-    }
-    return subsetPtr->_numFacesTotal;
-}
-
-int
-FaceVertex::findFVarSubsetExtent(Subset const & vtxSub,
-                                 Subset       * fvarSubsetPtr,
-                                 Index  const   fvarIndices[]) const {
-
-    Subset & fvarSub = *fvarSubsetPtr;
-
-    //
-    //  Initialize with tags and declare as a boundary to start:
-    //
-    fvarSub.Initialize(vtxSub._tag);
-
-    fvarSub.SetBoundary(true);
-
-    if (vtxSub._numFacesTotal == 1) return 1;
-
-    //
-    //  Inspect/gather faces "after" (counter-clockwise order from) the
-    //  corner face.  If we arrive back at the corner face, a periodic
-    //  set is complete, but check the continuity of the seam and apply
-    //  before returning:
-    //
-    int cornerFace = _faceInRing;
-
-    int numFacesAfterToVisit = vtxSub._numFacesAfter;
-    if (numFacesAfterToVisit) {
-        int thisFace = cornerFace;
-        int nextFace = GetFaceNext(thisFace);
-        for (int i = 0; i < numFacesAfterToVisit; ++i) {
-            if (!FaceIndicesMatchAcrossEdge(thisFace, nextFace, fvarIndices)) {
-                break;
-            }
-            ++ fvarSub._numFacesAfter;
-            ++ fvarSub._numFacesTotal;
-
-            thisFace = nextFace;
-            nextFace = GetFaceNext(thisFace);
-        }
-
-        if (nextFace == cornerFace) {
-            assert(vtxSub._numFacesBefore == 0);
-            if (FaceIndicesMatchAtEdgeEnd(thisFace, cornerFace, fvarIndices)) {
-                fvarSub.SetBoundary(false);
-            }
-            return fvarSub._numFacesTotal;
-        }
-    }
-
-    //
-    //  Inspect/gather faces "before" (clockwise order from) the corner
-    //  face.  Include any faces "after" in the case of a periodic vertex
-    //  that was interrupted by a discontinuity above:
-    //
-    int numFacesBeforeToVisit = vtxSub._numFacesBefore;
-    if (!vtxSub.IsBoundary()) {
-        numFacesBeforeToVisit += vtxSub._numFacesAfter - fvarSub._numFacesAfter;
-    }
-    if (numFacesBeforeToVisit) {
-        int thisFace = cornerFace;
-        int prevFace = GetFacePrevious(thisFace);
-        for (int i = 0; i < numFacesBeforeToVisit; ++i) {
-            if (!FaceIndicesMatchAcrossEdge(prevFace, thisFace, fvarIndices)) {
-                break;
-            }
-            ++ fvarSub._numFacesBefore;
-            ++ fvarSub._numFacesTotal;
-
-            thisFace = prevFace;
-            prevFace = GetFacePrevious(thisFace);
-        }
-    }
-    return fvarSub._numFacesTotal;
-}
-
-int
-FaceVertex::FindFaceVaryingSubset(Subset       * fvarSubsetPtr,
-                                  Index  const   fvarIndices[],
-                                  Subset const & vtxSub) const {
-
-    Subset & fvarSub = *fvarSubsetPtr;
-
-    //
-    //  Find the face-varying extent and update the tags if its topology
-    //  is a true subset of the vertex.  Also reset the sharpness in this
-    //  case as the rules for the FVar interpolation options (applied
-    //  later) take precedence over those of the vertex:
-    //
-    findFVarSubsetExtent(vtxSub, &fvarSub, fvarIndices);
-
-    bool fvarTopologyMatchesVertex = fvarSub.ExtentMatchesSuperset(vtxSub);
-    if (!fvarTopologyMatchesVertex) {
-        if (fvarSub.IsSharp()) {
-            UnSharpenSubset(&fvarSub);
-        }
-        adjustSubsetTags(&fvarSub, &vtxSub);
-    }
-
-    //  Sharpen if the vertex is non-manifold:
-    if (!fvarSub.IsSharp() && !isManifold()) {
-        SharpenSubset(&fvarSub);
-    }
-
-    //  Sharpen if the face-varying value is non-manifold, i.e. if there
-    //  are any occurrences of the corner FVar index outside the subset:
-    if (!fvarSub.IsSharp() && (fvarSub.GetNumFaces() < vtxSub.GetNumFaces())) {
-        Index fvarMatch = GetFaceIndexAtCorner(fvarIndices);
-
-        int numMatches = 0;
-        for (int i = 0; i < GetNumFaces(); ++i) {
-            numMatches += (GetFaceIndexAtCorner(i, fvarIndices) == fvarMatch);
-            if (numMatches > fvarSub.GetNumFaces()) {
-                SharpenSubset(&fvarSub);
-                break;
-            }
-        }
-    }
-    return fvarSub.GetNumFaces();
-}
-
-//
-//  Method to revise the tags for a subset of the corner, which may no
-//  longer include properties that trigger exceptional behavior:
-//
-void
-FaceVertex::SharpenSubset(Subset * subset) const {
-
-    //  Mark the subset sharp and ensure any related tags are also
-    //  updated accordingly:
-    subset->_tag._infSharpVerts  = true;
-    subset->_tag._semiSharpVerts = false;
-}
-void
-FaceVertex::UnSharpenSubset(Subset * subset) const {
-
-    //  Restore subset sharpness based on actual sharpness assignment:
-    subset->_tag._infSharpVerts  = _isExpInfSharp;
-    subset->_tag._semiSharpVerts = _isExpSemiSharp;
-}
-void
-FaceVertex::SharpenSubset(Subset * subset, float sharpness) const {
-
-    //  Mark the subset according to sharpness value
-    if (sharpness > subset->_localSharpness) {
-        subset->_localSharpness = sharpness;
-
-        subset->_tag._infSharpVerts  = Sdc::Crease::IsInfinite(sharpness);
-        subset->_tag._semiSharpVerts = Sdc::Crease::IsSemiSharp(sharpness);
-    }
-}
-
-bool
-FaceVertex::subsetHasIrregularFaces(Subset const & subset) const {
-
-    assert(_tag.HasIrregularFaceSizes());
-
-    if (!_tag._unCommonFaceSizes) return true;
-
-    int f = GetFaceFirst(subset);
-    for (int i = 0; i < subset.GetNumFaces(); ++i, f = GetFaceNext(f)) {
-        if (GetFaceSize(f) != _regFaceSize) return true;
-    }
-    return false;
-}
-
-bool
-FaceVertex::subsetHasInfSharpEdges(Subset const & subset) const {
-
-    assert(_tag.HasInfSharpEdges());
-
-    int n = subset.GetNumFaces();
-    if (n > 1) {
-        int f = GetFaceFirst(subset);
-        //  Reduce number of faces to visit when inspecting trailing edges:
-        for (int i = subset.IsBoundary(); i < n; ++i, f = GetFaceNext(f)) {
-            if (IsFaceEdgeInfSharp(f, 1)) return true;
-        }
-    }
-    return false;
-}
-
-bool
-FaceVertex::subsetHasSemiSharpEdges(Subset const & subset) const {
-
-    assert(_tag.HasSemiSharpEdges());
-
-    int n = subset.GetNumFaces();
-    if (n > 1) {
-        int f = GetFaceFirst(subset);
-        //  Reduce number of faces to visit when inspecting trailing edges:
-        for (int i = subset.IsBoundary(); i < n; ++i, f = GetFaceNext(f)) {
-            if (IsFaceEdgeSemiSharp(f, 1)) return true;
-        }
-    }
-    return false;
-}
-
-void
-FaceVertex::adjustSubsetTags(Subset       * subset,
-                             Subset const * superset) const {
-
-    VertexTag & subsetTag = subset->_tag;
-
-    //  Adjust any tags related to boundary or sharpness status:
-    if (subsetTag.IsBoundary()) {
-        subsetTag._infSharpDarts = false;
-    }
-    if (subsetTag.IsInfSharp()) {
-        subsetTag._semiSharpVerts = false;
-    }
-
-    //  Adjust for the presence of irregular faces or sharp edges if the
-    //  subset is actually a proper subset of this entire corner or the
-    //  optionally provided superset:
-    int  numSuperFaces = superset ? superset->GetNumFaces() : GetNumFaces();
-    bool superBoundary = superset ? superset->IsBoundary()  : isBoundary();
-
-    if ((subset->GetNumFaces() < numSuperFaces) ||
-        (subset->IsBoundary() != superBoundary)) {
-
-        if (subsetTag._irregularFaceSizes) {
-            subsetTag._irregularFaceSizes = subsetHasIrregularFaces(*subset);
-        }
-        if (subsetTag._infSharpEdges) {
-            subsetTag._infSharpEdges = subsetHasInfSharpEdges(*subset);
-            if (subsetTag._infSharpEdges && subset->IsBoundary()) {
-                SharpenSubset(subset);
-            }
-        }
-        if (subsetTag._semiSharpEdges) {
-            subsetTag._semiSharpEdges = subsetHasSemiSharpEdges(*subset);
-        }
-    }
-}
-
-
-//
-//  Main and supporting internal datatypes and methods to connect unordered
-//  faces and allow for topological traversals of the incident faces:
-//
-//  The fundamental element of this process is the following definition of
-//  an Edge. It is lightweight and only stores a state (boundary, interior,
-//  or non-manifold) along with the one or two faces for a manifold edge.
-//  It is initialized as a boundary when first created and is then modified
-//  by adding additional incident faces.
-//
-struct FaceVertex::Edge {
-    //  Empty constructor intentional since we over-allocate what we need:
-    Edge() { }
-
-    void clear() { std::memset(this, 0, sizeof(*this)); }
-    void Initialize(Index vtx) { clear(), endVertex = vtx; }
-
-    //  Transition of state as incident faces are added:
-    void SetBoundary()    { boundary = 1; }
-    void SetInterior()    { boundary = 0, interior = 1; }
-    void SetNonManifold() { boundary = 0, interior = 0, nonManifold = 1; }
-
-    //  Special cases forcing non-manifold
-    void SetDegenerate()  { SetNonManifold(), degenerate = 1; }
-    void SetDuplicate()   { SetNonManifold(), duplicate = 1; }
-
-    void SetSharpness(float sharpness) {
-        if (sharpness > 0.0f) {
-            if (Sdc::Crease::IsInfinite(sharpness)) {
-                infSharp = true;
-            } else {
-                semiSharp = true;
-            }
-        }
-    }
-
-    void SetFace(int newFace, bool newTrailing) {
-        trailing = newTrailing;
-        *(trailing ? &prevFace : &nextFace) = (short) newFace;
-    }
-
-    void AddFace(int newFace, bool newTrailing) {
-
-        //  Update the state of the Edge based on the added incident face:
-        if (boundary) {
-            if (newTrailing == trailing) {
-                //  Edge is reversed
-                SetNonManifold();
-            } else if (newFace == (trailing ? prevFace : nextFace)) {
-                //  Edge is repeated in the face
-                SetNonManifold();
-            } else {
-                //  Edge is manifold thus far -- promote to interior
-                SetInterior();
-                SetFace(newFace, newTrailing);
-            }
-        } else if (interior) {
-            //  More than two incident faces -- make non-manifold
-            SetNonManifold();
-        }
-    }
-
-    Index endVertex;
-
-    unsigned short boundary    : 1;
-    unsigned short interior    : 1;
-    unsigned short nonManifold : 1;
-    unsigned short trailing    : 1;
-    unsigned short degenerate  : 1;
-    unsigned short duplicate   : 1;
-    unsigned short infSharp    : 1;
-    unsigned short semiSharp   : 1;
-
-    short prevFace, nextFace;
-};
-
-void
-FaceVertex::ConnectUnOrderedFaces(Index const fvIndices[]) {
-
-    //
-    //  There are two transient sets of data needed here:  a set of Edges
-    //  that connect adjoining faces, and a set of indices (one for each
-    //  of the 2*N face-edges) to identify the Edge for each face-edge.
-    //
-    //  IMPORTANT -- since these later edge indices are of the same type
-    //  and size as the internal face-edge neighbors, we'll use that array
-    //  to avoid a separate declaration (and possible allocation) and will
-    //  update it in place later.
-    //
-    int numFaceEdges = GetNumFaces() * 2;
-
-    _faceEdgeNeighbors.SetSize(numFaceEdges);
-
-    //  Allocate and populate the edges and indices referring to them.
-    //  Initialization fails to detect some "duplicate" edges in a face,
-    //  so post-process to catch these before continuing:
-    Vtr::internal::StackBuffer<Edge,32,true> edges(numFaceEdges);
-
-    short * feEdges = &_faceEdgeNeighbors[0];
-
-    int numEdges = createUnOrderedEdges(edges, feEdges, fvIndices);
-
-    markDuplicateEdges(edges, feEdges, fvIndices);
-
-    //  Use the connecting edges to assign neighboring faces (overwriting
-    //  our edge indices) and finish initializing the tags retaining the
-    //  properties of the corner:
-    assignUnOrderedFaceNeighbors(edges, feEdges);
-
-    finalizeUnOrderedTags(edges, numEdges);
-}
-
-//
-//  Identify a set of shared edges between unordered faces so that we can
-//  establish connections between them.
-//
-//  The "face-edge edges" are really just half-edges that refer (by index)
-//  to potentially shared Edges.  As Edges are created, these half-edges
-//  are made to refer to them, after which the state of the edge may change
-//  due to the presence or orientation of additional incident faces.
-//
-int
-FaceVertex::createUnOrderedEdges(Edge        edges[],
-                                 short       feEdges[],
-                                 Index const fvIndices[]) const {
-
-    //  Optional map to help construction for high valence:
-    typedef std::map<Index,int> EdgeMap;
-
-    EdgeMap edgeMap;
-
-    bool useMap = (GetNumFaces() > 16);
-
-    //
-    //  Iterate through the face-edge pairs to find connecting edges:
-    //
-    Index vCorner = GetFaceIndexAtCorner(0, fvIndices);
-
-    int numFaceEdges = 2 * GetNumFaces();
-    int numEdges = 0;
-
-    //  Don't rely on the tag yet to determine presence of sharpness:
-    bool hasSharpness = _vDesc.HasEdgeSharpness();
-
-    for (int feIndex = 0; feIndex < numFaceEdges; ++feIndex) {
-        Index vIndex = (feIndex & 1) ?
-                       GetFaceIndexTrailing((feIndex >> 1), fvIndices) :
-                       GetFaceIndexLeading( (feIndex >> 1), fvIndices);
-
-        int eIndex = -1;
-        if (vIndex != vCorner) {
-            if (useMap) {
-                EdgeMap::iterator eFound = edgeMap.find(vIndex);
-                if (eFound != edgeMap.end()) {
-                    eIndex = eFound->second;
-                } else {
-                    //  Make sure to create the new edge below at this index
-                    edgeMap[vIndex] = numEdges;
-                }
-            } else {
-                for (int j = 0; j < numEdges; ++j) {
-                    if (edges[j].endVertex == vIndex) {
-                        eIndex = j;
-                        break;
-                    }
-                }
-            }
-
-            //  Update an existing edge or create a new one
-            if (eIndex >= 0) {
-                edges[eIndex].AddFace(feIndex >> 1, feIndex & 1);
-            } else {
-                //  Index of the new (pre-allocated) edge:
-                eIndex = numEdges ++;
-
-                //  Initialize a new edge as boundary (manifold)
-                Edge & E = edges[eIndex];
-                E.Initialize(vIndex);
-                E.SetBoundary();
-                E.SetFace(feIndex >> 1, feIndex & 1);
-                if (hasSharpness) {
-                    E.SetSharpness(GetFaceEdgeSharpness(feIndex));
-                }
-            }
-        } else {
-            //  If degenerate, create unique edge (non-manifold)
-            eIndex = numEdges++;
-
-            edges[eIndex].Initialize(vIndex);
-            edges[eIndex].SetDegenerate();
-        }
-        assert(eIndex >= 0);
-        feEdges[feIndex] = (short) eIndex;
-    }
-    return numEdges;
-}
-
-void
-FaceVertex::markDuplicateEdges(Edge        edges[],
-                               short const feEdges[],
-                               Index const fvIndices[]) const {
-
-    //
-    //  The edge assignment thus far does not correctly detect the presence
-    //  of all edges repeated or duplicated in the same face, e.g. for quad
-    //  with vertices {A, B, A, C} the edge AB occurs both as AB and BA.
-    //  When the face is oriented relative to corner B, we have {B, A, C, A}
-    //  and edge BA will be detected as non-manifold -- but not from corner
-    //  A or C.
-    //
-    //  So look for repeated instances of the corner vertex in the face and
-    //  inspect its neighbors to see if they match the leading or trailing
-    //  edges.
-    //
-    //  This is a trivial test for a quad:  if the opposite vertex matches
-    //  the corner vertex, both the leading and trailing edges will be
-    //  duplicated and so can immediately be marked non-manifold.  So deal
-    //  with the common case of all neighboring quads separately.
-    //
-    if (_commonFaceSize == 3) return;
-
-    Index vCorner = fvIndices[0];
-    int numFaces = GetNumFaces();
-
-    if (_commonFaceSize == 4) {
-        Index const * fvOpposite = fvIndices + 2;
-        for (int face = 0; face < numFaces; ++face, fvOpposite += 4) {
-            if (*fvOpposite == vCorner) {
-                edges[feEdges[2*face  ]].SetDuplicate();
-                edges[feEdges[2*face+1]].SetDuplicate();
-            }
-        }
-    } else {
-        Index const * fv = fvIndices;
-
-        for (int face = 0; face < numFaces; ++face) {
-            int faceSize = GetFaceSize(face);
-
-            if (faceSize == 4) {
-                if (fv[2] == vCorner) {
-                    edges[feEdges[2*face  ]].SetDuplicate();
-                    edges[feEdges[2*face+1]].SetDuplicate();
-                }
-            } else {
-                for (int j = 2; j < (faceSize - 2); ++j) {
-                    if (fv[j] == vCorner) {
-                        if (fv[j-1] == fv[1])
-                            edges[feEdges[2*face  ]].SetDuplicate();
-                        if (fv[j+1] == fv[faceSize-1])
-                            edges[feEdges[2*face+1]].SetDuplicate();
-                    }
-                }
-            }
-            fv += faceSize;
-        }
-    }
-}
-
-void
-FaceVertex::assignUnOrderedFaceNeighbors(Edge const  edges[],
-                                         short const feEdges[]) {
-
-    int numFaceEdges = 2 * GetNumFaces();
-
-    for (int i = 0; i < numFaceEdges; ++i) {
-        assert(feEdges[i] >= 0);
-
-        Edge const & E = edges[feEdges[i]];
-        bool edgeIsSingular = E.nonManifold || E.boundary;
-        if (edgeIsSingular) {
-            _faceEdgeNeighbors[i] = -1;
-        } else {
-            _faceEdgeNeighbors[i] = (i & 1) ? E.nextFace : E.prevFace;
-        }
-    }
-}
-
-void
-FaceVertex::finalizeUnOrderedTags(Edge const edges[], int numEdges) {
-
-    //
-    //  Summarize properties of the corner given the number and nature of
-    //  the edges around its vertex and initialize remaining members or
-    //  tags that depend on them.
-    //
-    //  First, take inventory of relevant properties from the edges:
-    //
-    int numNonManifoldEdges = 0;
-    int numInfSharpEdges    = 0;
-    int numSemiSharpEdges   = 0;
-    int numSingularEdges    = 0;
-
-    bool hasBoundaryEdges         = false;
-    bool hasBoundaryEdgesNotSharp = false;
-    bool hasDegenerateEdges       = false;
-    bool hasDuplicateEdges        = false;
-
-    for (int i = 0; i < numEdges; ++i) {
-        Edge const & E = edges[i];
-
-        if (E.interior) {
-            numInfSharpEdges  += E.infSharp;
-            numSemiSharpEdges += E.semiSharp;
-        } else if (E.boundary) {
-            hasBoundaryEdges = true;
-            hasBoundaryEdgesNotSharp |= !E.infSharp;
-        } else {
-            ++ numNonManifoldEdges;
-            hasDegenerateEdges |= E.degenerate;
-            hasDuplicateEdges  |= E.duplicate;
-        }
-
-        //  Singular edges include all that are effectively inf-sharp:
-        numSingularEdges += E.nonManifold || E.boundary || E.infSharp;
-    }
-
-    //
-    //  Next determine whether manifold or not.  Some obvious tests quickly
-    //  indicate if the corner is non-manifold, but ultimately it will be
-    //  necessary to traverse the faces to confirm that they form a single
-    //  connected set (e.g. two cones sharing their apex vertex may appear
-    //  manifold to this point but as two connected sets are non-manifold).
-    //
-    bool isNonManifold       = false;
-    bool isNonManifoldCrease = false;
-
-    if (numNonManifoldEdges) {
-        isNonManifold = true;
-
-        if (!hasDegenerateEdges && !hasDuplicateEdges && !hasBoundaryEdges) {
-            //  Special crease case that avoids sharpening: two interior
-            //  non-manifold edges radiating more than two sets of faces:
-            isNonManifoldCrease = (numNonManifoldEdges == 2) &&
-                                  (GetNumFaces() > numEdges);
-        }
-    } else {
-        //  Mismatch between number of incident faces and edges:
-        isNonManifold = ((numEdges - GetNumFaces()) != (int)hasBoundaryEdges);
-
-        if (!isNonManifold) {
-            //  If all faces are not connected, the set is non-manifold:
-            Subset subset;
-            int numFacesInSubset = findConnectedSubsetExtent(&subset);
-            if (numFacesInSubset < GetNumFaces()) {
-                isNonManifold = true;
-            }
-        }
-    }
-
-    //
-    //  Assign tags and other members related to the inventory of edges
-    //  (boundary status is relevant if non-manifold as it can affect
-    //  the presence of the limit surface):
-    //
-    _tag._nonManifoldVerts = isNonManifold;
-
-    _tag._boundaryVerts    = hasBoundaryEdges;
-    _tag._boundaryNonSharp = hasBoundaryEdgesNotSharp;
-
-    _tag._infSharpEdges  = (numInfSharpEdges > 0);
-    _tag._semiSharpEdges = (numSemiSharpEdges > 0);
-    _tag._infSharpDarts  = (numInfSharpEdges == 1) && !hasBoundaryEdges;
-
-    //  Conditions effectively making the vertex sharp, include the usual
-    //  excess of inf-sharp edges plus some non-manifold cases:
-    if ((numSingularEdges > 2) || (isNonManifold && !isNonManifoldCrease)) {
-        _isImpInfSharp = true;
-    } else if ((numSingularEdges + numSemiSharpEdges) > 2) {
-        _isImpSemiSharp = true;
-    }
-
-    //  Mark the vertex inf-sharp if implicitly inf-sharp:
-    if (!_isExpInfSharp && _isImpInfSharp) {
-        _tag._infSharpVerts = true;
-        _tag._semiSharpVerts = false;
-    }
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceVertex.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceVertex.h
deleted file mode 100644
index 407ff32b1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceVertex.h
+++ /dev/null
@@ -1,395 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_FACE_VERTEX_H
-#define OPENSUBDIV3_BFR_FACE_VERTEX_H
-
-#include "../version.h"
-
-#include "../bfr/vertexTag.h"
-#include "../bfr/vertexDescriptor.h"
-#include "../bfr/faceVertexSubset.h"
-#include "../bfr/surfaceData.h"
-#include "../sdc/crease.h"
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  The FaceVertex class is the primary internal class for gathering all
-//  topological information around the corner of a face.  As such, it
-//  wraps an instance of the public VertexDescriptor class populated by the
-//  Factory subclasses.  It extends an instance of VertexDescriptor with
-//  additional topological information and methods to make it more widely
-//  available and useful to internal classes.
-//
-//  One fundamental extension of FaceVertex is that it includes the
-//  location of the face in the ring of incident faces around the vertex.
-//  VertexDescriptor alone simply specifies the neighborhood of the
-//  vertex, but the FaceVertex provides context relative to the face for
-//  which all of this information is being gathered.
-//
-//  Several instances of FaceVertex (one for each corner of a face)
-//  are necessary to fully define the limit surface for a face, but in
-//  many cases, only a subset of the FaceVertex's incident faces will
-//  actually contribute to the surface. A companion class for defining
-//  that subset is defined elsewhere.
-//  
-class FaceVertex {
-public:
-    typedef internal::SurfaceData::Index Index;
-
-public:
-    FaceVertex() { }
-    ~FaceVertex() { }
-
-    //  Methods supporting construction/initialization (subclass required
-    //  to populate VertexDescriptor between Initialize and Finalize):
-    void Initialize(int faceSize, int regFaceSize);
-    void Finalize(int faceInVertex);
-
-    VertexDescriptor & GetVertexDescriptor() { return _vDesc; }
-
-    void ConnectUnOrderedFaces(Index const faceVertexIndices[]);
-
-public:
-    //  Methods to initialize and find subsets:
-    typedef FaceVertexSubset Subset;
-
-    int GetVertexSubset(Subset * subset) const;
-
-    int FindFaceVaryingSubset(Subset       * fvarSubset,
-                              Index  const   fvarIndices[],
-                              Subset const & vtxSubset) const;
-
-    //  Methods to control sharpness of the corner in a subset:
-    void SharpenSubset(Subset * subset) const;
-    void SharpenSubset(Subset * subset, float sharpness) const;
-    void UnSharpenSubset(Subset * subset) const;
-
-public:
-    //
-    //  Public methods to query simple properties:
-    //
-    VertexTag GetTag() const { return _tag; }
-
-    int GetFace() const { return _faceInRing; }
-
-    int GetNumFaces()        const { return _vDesc._numFaces; }
-    int GetNumFaceVertices() const { return _numFaceVerts; }
-
-    bool HasCommonFaceSize() const { return (_commonFaceSize > 0); }
-    int  GetCommonFaceSize() const { return _commonFaceSize; }
-
-public:
-    //
-    //  Public methods to inspect incident faces and connected neighbors:
-    //
-    int GetFaceSize(int face) const;
-
-    //  Get neighbors of a specific face (return -1 if unconnected):
-    int GetFaceNext(    int face) const;
-    int GetFacePrevious(int face) const;
-
-    //  Find faces relative to this face (require a known safe step size):
-    int GetFaceAfter (int stepForwardFromCornerFace) const;
-    int GetFaceBefore(int stepBackwardFromCornerFace) const;
-
-    //  Get first and last faces of a subset:
-    int GetFaceFirst(Subset const & subset) const;
-    int GetFaceLast( Subset const & subset) const;
-
-public:
-    //
-    //  Public methods to access indices assigned to incident faces:
-    //
-    int GetFaceIndexOffset(int face) const;
-
-    Index GetFaceIndexAtCorner(Index const indices[]) const;
-
-    Index GetFaceIndexAtCorner(int face, Index const indices[]) const;
-    Index GetFaceIndexTrailing(int face, Index const indices[]) const;
-    Index GetFaceIndexLeading( int face, Index const indices[]) const;
-
-    bool FaceIndicesMatchAtCorner(  int f1, int f2, Index const indices[])const;
-    bool FaceIndicesMatchAtEdgeEnd( int f1, int f2, Index const indices[])const;
-    bool FaceIndicesMatchAcrossEdge(int f1, int f2, Index const indices[])const;
-
-public:
-    //
-    //  Public methods for sharpness of the vertex or its incident edges:
-    //
-    float GetVertexSharpness() const;
-
-    float GetFaceEdgeSharpness(int faceEdge) const;
-    float GetFaceEdgeSharpness(int face, bool trailingEdge) const;
-
-    bool IsFaceEdgeSharp(    int face, bool trailingEdge) const;
-    bool IsFaceEdgeInfSharp( int face, bool trailingEdge) const;
-    bool IsFaceEdgeSemiSharp(int face, bool trailingEdge) const;
-
-    bool  HasImplicitVertexSharpness() const;
-    float GetImplicitVertexSharpness() const;
-
-private:
-    //  Internal convenience methods:
-    bool isOrdered()   const { return _tag.IsOrdered(); }
-    bool isUnOrdered() const { return _tag.IsUnOrdered(); }
-    bool isBoundary()  const { return _tag.IsBoundary(); }
-    bool isInterior()  const { return _tag.IsInterior(); }
-    bool isManifold()  const { return _tag.IsManifold(); }
-
-    int getConnectedFaceNext(int face) const;
-    int getConnectedFacePrev(int face) const;
-
-private:
-    //  Internal methods for assembling and managing subsets:
-    int initCompleteSubset(Subset * subset) const;
-
-    int findConnectedSubsetExtent(Subset * subset) const;
-
-    int findFVarSubsetExtent(Subset const & vtxSubset,
-                             Subset       * fvarSubset,
-                             Index  const   fvarIndices[]) const;
-
-    void adjustSubsetTags(Subset       * subset,
-                          Subset const * superset = 0) const;
-
-    bool subsetHasInfSharpEdges( Subset const & subset) const;
-    bool subsetHasSemiSharpEdges(Subset const & subset) const;
-    bool subsetHasIrregularFaces(Subset const & subset) const;
-
-private:
-    //  Internal methods to connect a set of unordered faces (given their
-    //  associated face-vertex indices) and assess the resulting topology:
-    struct Edge;
-
-    int  createUnOrderedEdges(Edge        edges[],
-                              short       faceEdgeIndices[],
-                              Index const faceVertIndices[]) const;
-
-    void markDuplicateEdges(Edge        edges[],
-                            short const faceEdgeIndices[],
-                            Index const faceVertIndices[]) const;
-
-    void assignUnOrderedFaceNeighbors(Edge const  edges[],
-                                      short const faceEdgeIndices[]);
-
-    void finalizeUnOrderedTags(Edge const edges[], int numEdges);
-
-    //  Ordered counterpart to the above method for finalizing tags
-    void finalizeOrderedTags();
-
-private:
-    typedef Vtr::internal::StackBuffer<short,16,true> ShortBuffer;
-
-    //  Private members:
-    VertexDescriptor _vDesc;
-    VertexTag        _tag;
-
-    short _faceInRing;
-    short _commonFaceSize;
-
-    unsigned char _regFaceSize;
-    unsigned char _isExpInfSharp  :  1;
-    unsigned char _isExpSemiSharp :  1;
-    unsigned char _isImpInfSharp  :  1;
-    unsigned char _isImpSemiSharp :  1;
-
-    int _numFaceVerts;
-
-    ShortBuffer _faceEdgeNeighbors;
-};
-
-
-//
-//  Inline methods for inspecting/traversing incident faces of the vertex:
-//
-inline int
-FaceVertex::GetFaceSize(int face) const {
-    return _commonFaceSize ? _commonFaceSize :
-            (_vDesc._faceSizeOffsets[face+1] - _vDesc._faceSizeOffsets[face]);
-}
-
-inline int
-FaceVertex::getConnectedFaceNext(int face) const {
-    return _faceEdgeNeighbors[2*face + 1];
-}
-inline int
-FaceVertex::getConnectedFacePrev(int face) const {
-    return _faceEdgeNeighbors[2*face];
-}
-
-inline int
-FaceVertex::GetFaceNext(int face) const {
-    if (isUnOrdered()) {
-        return getConnectedFaceNext(face);
-    } else if (face < (_vDesc._numFaces - 1)) {
-        return face + 1;
-    } else {
-        return isBoundary() ? -1 : 0;
-    }
-}
-inline int
-FaceVertex::GetFacePrevious(int face) const {
-    if (isUnOrdered()) {
-        return getConnectedFacePrev(face);
-    } else if (face) {
-        return face - 1;
-    } else {
-        return isBoundary() ? -1 : (_vDesc._numFaces - 1);
-    }
-}
-
-inline int
-FaceVertex::GetFaceAfter(int step) const {
-    assert(step >= 0);
-    if (isOrdered()) {
-        return (_faceInRing + step) % _vDesc._numFaces;
-    } else if (step == 1) {
-        return getConnectedFaceNext(_faceInRing);
-    } else if (step == 2) {
-        return getConnectedFaceNext(getConnectedFaceNext(_faceInRing));
-    } else {
-        int face = _faceInRing;
-        for ( ; step > 0; --step) {
-            face = getConnectedFaceNext(face);
-        }
-        return face;
-    }
-}
-inline int
-FaceVertex::GetFaceBefore(int step) const {
-    assert(step >= 0);
-    if (isOrdered()) {
-        return (_faceInRing - step + _vDesc._numFaces) % _vDesc._numFaces;
-    } else if (step == 1) {
-        return getConnectedFacePrev(_faceInRing);
-    } else if (step == 2) {
-        return getConnectedFacePrev(getConnectedFacePrev(_faceInRing));
-    } else {
-        int face = _faceInRing;
-        for ( ; step > 0; --step) {
-            face = getConnectedFacePrev(face);
-        }
-        return face;
-    }
-}
-
-inline int
-FaceVertex::GetFaceFirst(Subset const & subset) const {
-    return GetFaceBefore(subset._numFacesBefore);
-}
-inline int
-FaceVertex::GetFaceLast(Subset const & subset) const {
-    return GetFaceAfter(subset._numFacesAfter);
-}
-
-//
-//  Inline methods for accessing indices associated with incident faces:
-//
-inline int
-FaceVertex::GetFaceIndexOffset(int face) const {
-    return _commonFaceSize ? (face * _commonFaceSize) :
-                             _vDesc._faceSizeOffsets[face];
-}
-
-inline FaceVertex::Index
-FaceVertex::GetFaceIndexAtCorner(Index const indices[]) const {
-    return indices[GetFaceIndexOffset(_faceInRing)];
-}
-inline FaceVertex::Index
-FaceVertex::GetFaceIndexAtCorner(int face, Index const indices[]) const {
-    return indices[GetFaceIndexOffset(face)];
-}
-inline FaceVertex::Index
-FaceVertex::GetFaceIndexLeading(int face, Index const indices[]) const {
-    return indices[GetFaceIndexOffset(face) + 1];
-}
-inline FaceVertex::Index
-FaceVertex::GetFaceIndexTrailing(int face, Index const indices[]) const {
-    // It is safe to use "face+1" here for the last face:
-    return indices[GetFaceIndexOffset(face+1) - 1];
-}
-
-inline bool
-FaceVertex::FaceIndicesMatchAtCorner(int facePrev, int faceNext,
-                                         Index const indices[]) const {
-    return GetFaceIndexAtCorner(facePrev, indices) ==
-           GetFaceIndexAtCorner(faceNext, indices);
-}
-inline bool
-FaceVertex::FaceIndicesMatchAtEdgeEnd(int facePrev, int faceNext,
-                                         Index const indices[]) const {
-    return GetFaceIndexTrailing(facePrev, indices) ==
-           GetFaceIndexLeading(faceNext, indices);
-}
-inline bool
-FaceVertex::FaceIndicesMatchAcrossEdge(int facePrev, int faceNext,
-                                         Index const indices[]) const {
-    return FaceIndicesMatchAtCorner (facePrev, faceNext, indices) &&
-           FaceIndicesMatchAtEdgeEnd(facePrev, faceNext, indices);
-}
-
-//
-//  Inline methods for accessing vertex and edge sharpness:
-//
-inline float
-FaceVertex::GetVertexSharpness() const {
-    return _vDesc._vertSharpness;
-}
-
-inline float
-FaceVertex::GetFaceEdgeSharpness(int faceEdge) const {
-    return _vDesc._faceEdgeSharpness[faceEdge];
-}
-inline float
-FaceVertex::GetFaceEdgeSharpness(int face, bool trailing) const {
-    return _vDesc._faceEdgeSharpness[face*2 + trailing];
-}
-
-inline bool
-FaceVertex::IsFaceEdgeSharp(int face, bool trailing) const {
-    return Sdc::Crease::IsSharp(_vDesc._faceEdgeSharpness[face*2+trailing]);
-}
-inline bool
-FaceVertex::IsFaceEdgeInfSharp(int face, bool trailing) const {
-    return Sdc::Crease::IsInfinite(_vDesc._faceEdgeSharpness[face*2+trailing]);
-}
-inline bool
-FaceVertex::IsFaceEdgeSemiSharp(int face, bool trailing) const {
-    return Sdc::Crease::IsSemiSharp(_vDesc._faceEdgeSharpness[face*2+trailing]);
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_FACE_VERTEX_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceVertexSubset.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceVertexSubset.h
deleted file mode 100644
index ca73834bf..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/faceVertexSubset.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_FACE_VERTEX_SUBSET_H
-#define OPENSUBDIV3_BFR_FACE_VERTEX_SUBSET_H
-
-#include "../version.h"
-
-#include "../bfr/vertexTag.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  FaceVertexSubset is a simple struct and companion of FaceVertex that
-//  identifies a subset of the topology around a corner.  Such subsets are
-//  what ultimately define the limit surface around a face and so are used
-//  by higher level classes in conjunction with FaceVertex.
-//
-//  WIP - this is simple enough to warrant a nested class in FaceVertex
-//      - it serves no purpose without a FaceVertex and the FaceVertex
-//        class has several methods to initialize/modify FaceVertexSubsets
-//
-struct FaceVertexSubset {
-    FaceVertexSubset() { }
-
-    void Initialize(VertexTag tag) {
-        _tag = tag;
-        _numFacesBefore = 0;
-        _numFacesAfter  = 0;
-        _numFacesTotal  = 1;
-        _localSharpness = 0.0f;
-    }
-
-    //  Queries consistent with other classes:
-    VertexTag GetTag() const { return _tag; }
-
-    int GetNumFaces() const { return _numFacesTotal; }
-
-    //  Simple get/set methods to avoid the tedious syntax of the tag:
-    bool IsBoundary() const { return _tag._boundaryVerts; }
-    bool IsSharp()    const { return _tag._infSharpVerts; }
-
-    void SetBoundary(bool on) { _tag._boundaryVerts = on; }
-    void SetSharp(bool on)    { _tag._infSharpVerts = on; }
-
-    //  Methods comparing to a superset (not any arbitrary subset):
-    bool ExtentMatchesSuperset(FaceVertexSubset const & sup) const {
-        return (GetNumFaces() == sup.GetNumFaces()) &&
-               (IsBoundary()  == sup.IsBoundary());
-    }
-    bool ShapeMatchesSuperset(FaceVertexSubset const & sup) const {
-        return ExtentMatchesSuperset(sup) &&
-               (IsSharp() == sup.IsSharp());
-    }
-
-    //  Member tags containing boundary and sharp bits:
-    VertexTag _tag;
-
-    //  Members defining the extent of the subset:
-    short _numFacesBefore;
-    short _numFacesAfter;
-    short _numFacesTotal;
-
-    //  Member to override vertex sharpness (rarely used):
-    float _localSharpness;
-};
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_FACE_VERTEX_SUBSET_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/hash.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/hash.cpp
deleted file mode 100644
index 6dd874058..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/hash.cpp
+++ /dev/null
@@ -1,706 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//
-// Functions for hashing to 32- and 64-bit integers. These are the same
-// functions used in USD (pxr/base/arch/hash.*) under similar conditions.
-//
-
-#include "hash.h"
-
-//
-// SpookyHash: a 128-bit noncryptographic hash function
-// By Bob Jenkins, public domain
-//   Oct 31 2010: alpha, framework + SpookyHash::Mix appears right
-//   Oct 31 2011: alpha again, Mix only good to 2^^69 but rest appears right
-//   Dec 31 2011: beta, improved Mix, tested it for 2-bit deltas
-//   Feb  2 2012: production, same bits as beta
-//   Feb  5 2012: adjusted definitions of uint* to be more portable
-//   Mar 30 2012: 3 bytes/cycle, not 4.  Alpha was 4 but wasn't thorough enough.
-//   August 5 2012: SpookyV2 (different results)
-// 
-// Up to 3 bytes/cycle for long messages.  Reasonably fast for short messages.
-// All 1 or 2 bit deltas achieve avalanche within 1% bias per output bit.
-//
-// This was developed for and tested on 64-bit x86-compatible processors.
-// It assumes the processor is little-endian.  There is a macro
-// controlling whether unaligned reads are allowed (by default they are).
-// This should be an equally good hash on big-endian machines, but it will
-// compute different results on them than on little-endian machines.
-//
-// Google's CityHash has similar specs to SpookyHash, and CityHash is faster
-// on new Intel boxes.  MD4 and MD5 also have similar specs, but they are orders
-// of magnitude slower.  CRCs are two or more times slower, but unlike 
-// SpookyHash, they have nice math for combining the CRCs of pieces to form 
-// the CRCs of wholes.  There are also cryptographic hashes, but those are even 
-// slower than MD5.
-//
-
-#include <cstring>
-#include <cstddef>
-
-//  Local typedefs to match the original code:
-typedef  uint64_t  uint64;
-typedef  uint32_t  uint32;
-typedef  uint16_t  uint16;
-typedef  uint8_t   uint8;
-
-namespace {
-
-class SpookyHash
-{
-public:
-    //
-    // SpookyHash: hash a single message in one call, produce 128-bit output
-    //
-    static void Hash128(
-        const void *message,  // message to hash
-        size_t length,        // length of message in bytes
-        uint64 *hash1,        // in/out: in seed 1, out hash value 1
-        uint64 *hash2);       // in/out: in seed 2, out hash value 2
-
-    //
-    // Hash64: hash a single message in one call, return 64-bit output
-    //
-    static uint64 Hash64(
-        const void *message,  // message to hash
-        size_t length,        // length of message in bytes
-        uint64 seed)          // seed
-    {
-        uint64 hash1 = seed;
-        Hash128(message, length, &hash1, &seed);
-        return hash1;
-    }
-
-    //
-    // Hash32: hash a single message in one call, produce 32-bit output
-    //
-    static uint32 Hash32(
-        const void *message,  // message to hash
-        size_t length,        // length of message in bytes
-        uint32 seed)          // seed
-    {
-        uint64 hash1 = seed, hash2 = seed;
-        Hash128(message, length, &hash1, &hash2);
-        return (uint32)hash1;
-    }
-
-#ifdef OPENSUBDIV3_BFR_HASH_INCLUDE_UNUSED_FUNCTIONS
-    //
-    // Init: initialize the context of a SpookyHash
-    //
-    void Init(
-        uint64 seed1,       // any 64-bit value will do, including 0
-        uint64 seed2);      // different seeds produce independent hashes
-    
-    //
-    // Update: add a piece of a message to a SpookyHash state
-    //
-    void Update(
-        const void *message,  // message fragment
-        size_t length);       // length of message fragment in bytes
-
-
-    //
-    // Final: compute the hash for the current SpookyHash state
-    //
-    // This does not modify the state; you can keep updating it afterward
-    //
-    // The result is the same as if SpookyHash() had been called with
-    // all the pieces concatenated into one message.
-    //
-    void Final(
-        uint64 *hash1,    // out only: first 64 bits of hash value.
-        uint64 *hash2);   // out only: second 64 bits of hash value.
-#endif
-
-    //
-    // left rotate a 64-bit value by k bytes
-    //
-    static inline uint64 Rot64(uint64 x, int k)
-    {
-        return (x << k) | (x >> (64 - k));
-    }
-
-    //
-    // This is used if the input is 96 bytes long or longer.
-    //
-    // The internal state is fully overwritten every 96 bytes.
-    // Every input bit appears to cause at least 128 bits of entropy
-    // before 96 other bytes are combined, when run forward or backward
-    //   For every input bit,
-    //   Two inputs differing in just that input bit
-    //   Where "differ" means xor or subtraction
-    //   And the base value is random
-    //   When run forward or backwards one Mix
-    // I tried 3 pairs of each; they all differed by at least 212 bits.
-    //
-    static inline void Mix(
-        const uint64 *data, 
-        uint64 &s0, uint64 &s1, uint64 &s2, uint64 &s3,
-        uint64 &s4, uint64 &s5, uint64 &s6, uint64 &s7,
-        uint64 &s8, uint64 &s9, uint64 &s10,uint64 &s11)
-    {
-      s0 += data[0];   s2 ^= s10; s11 ^= s0;  s0 = Rot64(s0,11);   s11 += s1;
-      s1 += data[1];   s3 ^= s11; s0 ^= s1;   s1 = Rot64(s1,32);   s0 += s2;
-      s2 += data[2];   s4 ^= s0;  s1 ^= s2;   s2 = Rot64(s2,43);   s1 += s3;
-      s3 += data[3];   s5 ^= s1;  s2 ^= s3;   s3 = Rot64(s3,31);   s2 += s4;
-      s4 += data[4];   s6 ^= s2;  s3 ^= s4;   s4 = Rot64(s4,17);   s3 += s5;
-      s5 += data[5];   s7 ^= s3;  s4 ^= s5;   s5 = Rot64(s5,28);   s4 += s6;
-      s6 += data[6];   s8 ^= s4;  s5 ^= s6;   s6 = Rot64(s6,39);   s5 += s7;
-      s7 += data[7];   s9 ^= s5;  s6 ^= s7;   s7 = Rot64(s7,57);   s6 += s8;
-      s8 += data[8];   s10 ^= s6; s7 ^= s8;   s8 = Rot64(s8,55);   s7 += s9;
-      s9 += data[9];   s11 ^= s7; s8 ^= s9;   s9 = Rot64(s9,54);   s8 += s10;
-      s10 += data[10]; s0 ^= s8;  s9 ^= s10;  s10 = Rot64(s10,22); s9 += s11;
-      s11 += data[11]; s1 ^= s9;  s10 ^= s11; s11 = Rot64(s11,46); s10 += s0;
-    }
-
-    //
-    // Mix all 12 inputs together so that h0, h1 are a hash of them all.
-    //
-    // For two inputs differing in just the input bits
-    // Where "differ" means xor or subtraction
-    // And the base value is random, or a counting value starting at that bit
-    // The final result will have each bit of h0, h1 flip
-    // For every input bit,
-    // with probability 50 +- .3%
-    // For every pair of input bits,
-    // with probability 50 +- 3%
-    //
-    // This does not rely on the last Mix() call having already mixed some.
-    // Two iterations was almost good enough for a 64-bit result, but a
-    // 128-bit result is reported, so End() does three iterations.
-    //
-    static inline void EndPartial(
-        uint64 &h0, uint64 &h1, uint64 &h2, uint64 &h3,
-        uint64 &h4, uint64 &h5, uint64 &h6, uint64 &h7, 
-        uint64 &h8, uint64 &h9, uint64 &h10,uint64 &h11)
-    {
-        h11+= h1;    h2 ^= h11;   h1 = Rot64(h1,44);
-        h0 += h2;    h3 ^= h0;    h2 = Rot64(h2,15);
-        h1 += h3;    h4 ^= h1;    h3 = Rot64(h3,34);
-        h2 += h4;    h5 ^= h2;    h4 = Rot64(h4,21);
-        h3 += h5;    h6 ^= h3;    h5 = Rot64(h5,38);
-        h4 += h6;    h7 ^= h4;    h6 = Rot64(h6,33);
-        h5 += h7;    h8 ^= h5;    h7 = Rot64(h7,10);
-        h6 += h8;    h9 ^= h6;    h8 = Rot64(h8,13);
-        h7 += h9;    h10^= h7;    h9 = Rot64(h9,38);
-        h8 += h10;   h11^= h8;    h10= Rot64(h10,53);
-        h9 += h11;   h0 ^= h9;    h11= Rot64(h11,42);
-        h10+= h0;    h1 ^= h10;   h0 = Rot64(h0,54);
-    }
-
-    static inline void End(
-        const uint64 *data, 
-        uint64 &h0, uint64 &h1, uint64 &h2, uint64 &h3,
-        uint64 &h4, uint64 &h5, uint64 &h6, uint64 &h7, 
-        uint64 &h8, uint64 &h9, uint64 &h10,uint64 &h11)
-    {
-        h0 += data[0];   h1 += data[1];   h2 += data[2];   h3 += data[3];
-        h4 += data[4];   h5 += data[5];   h6 += data[6];   h7 += data[7];
-        h8 += data[8];   h9 += data[9];   h10 += data[10]; h11 += data[11];
-        EndPartial(h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-        EndPartial(h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-        EndPartial(h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-    }
-
-    //
-    // The goal is for each bit of the input to expand into 128 bits of 
-    //   apparent entropy before it is fully overwritten.
-    // n trials both set and cleared at least m bits of h0 h1 h2 h3
-    //   n: 2   m: 29
-    //   n: 3   m: 46
-    //   n: 4   m: 57
-    //   n: 5   m: 107
-    //   n: 6   m: 146
-    //   n: 7   m: 152
-    // when run forwards or backwards
-    // for all 1-bit and 2-bit diffs
-    // with diffs defined by either xor or subtraction
-    // with a base of all zeros plus a counter, or plus another bit, or random
-    //
-    static inline void ShortMix(uint64 &h0, uint64 &h1, uint64 &h2, uint64 &h3)
-    {
-        h2 = Rot64(h2,50);  h2 += h3;  h0 ^= h2;
-        h3 = Rot64(h3,52);  h3 += h0;  h1 ^= h3;
-        h0 = Rot64(h0,30);  h0 += h1;  h2 ^= h0;
-        h1 = Rot64(h1,41);  h1 += h2;  h3 ^= h1;
-        h2 = Rot64(h2,54);  h2 += h3;  h0 ^= h2;
-        h3 = Rot64(h3,48);  h3 += h0;  h1 ^= h3;
-        h0 = Rot64(h0,38);  h0 += h1;  h2 ^= h0;
-        h1 = Rot64(h1,37);  h1 += h2;  h3 ^= h1;
-        h2 = Rot64(h2,62);  h2 += h3;  h0 ^= h2;
-        h3 = Rot64(h3,34);  h3 += h0;  h1 ^= h3;
-        h0 = Rot64(h0,5);   h0 += h1;  h2 ^= h0;
-        h1 = Rot64(h1,36);  h1 += h2;  h3 ^= h1;
-    }
-
-    //
-    // Mix all 4 inputs together so that h0, h1 are a hash of them all.
-    //
-    // For two inputs differing in just the input bits
-    // Where "differ" means xor or subtraction
-    // And the base value is random, or a counting value starting at that bit
-    // The final result will have each bit of h0, h1 flip
-    // For every input bit,
-    // with probability 50 +- .3% (it is probably better than that)
-    // For every pair of input bits,
-    // with probability 50 +- .75% (the worst case is approximately that)
-    //
-    static inline void ShortEnd(uint64 &h0, uint64 &h1, uint64 &h2, uint64 &h3)
-    {
-        h3 ^= h2;  h2 = Rot64(h2,15);  h3 += h2;
-        h0 ^= h3;  h3 = Rot64(h3,52);  h0 += h3;
-        h1 ^= h0;  h0 = Rot64(h0,26);  h1 += h0;
-        h2 ^= h1;  h1 = Rot64(h1,51);  h2 += h1;
-        h3 ^= h2;  h2 = Rot64(h2,28);  h3 += h2;
-        h0 ^= h3;  h3 = Rot64(h3,9);   h0 += h3;
-        h1 ^= h0;  h0 = Rot64(h0,47);  h1 += h0;
-        h2 ^= h1;  h1 = Rot64(h1,54);  h2 += h1;
-        h3 ^= h2;  h2 = Rot64(h2,32);  h3 += h2;
-        h0 ^= h3;  h3 = Rot64(h3,25);  h0 += h3;
-        h1 ^= h0;  h0 = Rot64(h0,63);  h1 += h0;
-    }
-    
-private:
-
-    //
-    // Short is used for messages under 192 bytes in length
-    // Short has a low startup cost, the normal mode is good for long
-    // keys, the cost crossover is at about 192 bytes.  The two modes were
-    // held to the same quality bar.
-    // 
-    static void Short(
-        const void *message, // message (array of bytes, not necessarily
-                             // aligned)
-        size_t length,       // length of message (in bytes)
-        uint64 *hash1,       // in/out: in the seed, out the hash value
-        uint64 *hash2);      // in/out: in the seed, out the hash value
-
-    // number of uint64's in internal state
-    static const size_t sc_numVars = 12;
-
-    // size of the internal state
-    static const size_t sc_blockSize = sc_numVars*8;
-
-    // size of buffer of unhashed data, in bytes
-    static const size_t sc_bufSize = 2*sc_blockSize;
-
-    //
-    // sc_const: a constant which:
-    //  * is not zero
-    //  * is odd
-    //  * is a not-very-regular mix of 1's and 0's
-    //  * does not need any other special mathematical properties
-    //
-    static const uint64 sc_const = 0xdeadbeefdeadbeefLL;
-
-    uint64 m_data[2*sc_numVars];   // unhashed data, for partial messages
-    uint64 m_state[sc_numVars];  // internal state of the hash
-    size_t m_length;             // total length of the input so far
-    uint8  m_remainder;          // length of unhashed data stashed in m_data
-};
-
-#define ALLOW_UNALIGNED_READS 1
-
-//
-// short hash ... it could be used on any message, 
-// but it's used by Spooky just for short messages.
-//
-void SpookyHash::Short(
-    const void *message,
-    size_t length,
-    uint64 *hash1,
-    uint64 *hash2)
-{
-    uint64 buf[2*sc_numVars];
-    union 
-    { 
-        const uint8 *p8; 
-        uint32 *p32;
-        uint64 *p64; 
-        size_t i; 
-    } u;
-
-    u.p8 = (const uint8 *)message;
-    
-    if (!ALLOW_UNALIGNED_READS && (u.i & 0x7))
-    {
-        memcpy(buf, message, length);
-        u.p64 = buf;
-    }
-
-    size_t remainder = length%32;
-    uint64 a=*hash1;
-    uint64 b=*hash2;
-    uint64 c=sc_const;
-    uint64 d=sc_const;
-
-    if (length > 15)
-    {
-        const uint64 *end = u.p64 + (length/32)*4;
-        
-        // handle all complete sets of 32 bytes
-        for (; u.p64 < end; u.p64 += 4)
-        {
-            c += u.p64[0];
-            d += u.p64[1];
-            ShortMix(a,b,c,d);
-            a += u.p64[2];
-            b += u.p64[3];
-        }
-        
-        //Handle the case of 16+ remaining bytes.
-        if (remainder >= 16)
-        {
-            c += u.p64[0];
-            d += u.p64[1];
-            ShortMix(a,b,c,d);
-            u.p64 += 2;
-            remainder -= 16;
-        }
-    }
-    
-    // Handle the last 0..15 bytes, and its length
-    d += ((uint64)length) << 56;
-    switch (remainder)
-    {
-    case 15:
-    d += ((uint64)u.p8[14]) << 48;
-        // FALLTHRU
-    case 14:
-        d += ((uint64)u.p8[13]) << 40;
-        // FALLTHRU
-    case 13:
-        d += ((uint64)u.p8[12]) << 32;
-        // FALLTHRU
-    case 12:
-        d += u.p32[2];
-        c += u.p64[0];
-        break;
-    case 11:
-        d += ((uint64)u.p8[10]) << 16;
-        // FALLTHRU
-    case 10:
-        d += ((uint64)u.p8[9]) << 8;
-        // FALLTHRU
-    case 9:
-        d += (uint64)u.p8[8];
-        // FALLTHRU
-    case 8:
-        c += u.p64[0];
-        break;
-    case 7:
-        c += ((uint64)u.p8[6]) << 48;
-        // FALLTHRU
-    case 6:
-        c += ((uint64)u.p8[5]) << 40;
-        // FALLTHRU
-    case 5:
-        c += ((uint64)u.p8[4]) << 32;
-        // FALLTHRU
-    case 4:
-        c += u.p32[0];
-        break;
-    case 3:
-        c += ((uint64)u.p8[2]) << 16;
-        // FALLTHRU
-    case 2:
-        c += ((uint64)u.p8[1]) << 8;
-        // FALLTHRU
-    case 1:
-        c += (uint64)u.p8[0];
-        break;
-    case 0:
-        c += sc_const;
-        d += sc_const;
-    }
-    ShortEnd(a,b,c,d);
-    *hash1 = a;
-    *hash2 = b;
-}
-
-// do the whole hash in one call
-void SpookyHash::Hash128(
-    const void *message, 
-    size_t length, 
-    uint64 *hash1, 
-    uint64 *hash2)
-{
-    if (length < sc_bufSize)
-    {
-        Short(message, length, hash1, hash2);
-        return;
-    }
-
-    uint64 h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11;
-    uint64 buf[sc_numVars];
-    uint64 *end;
-    union 
-    { 
-        const uint8 *p8; 
-        uint64 *p64; 
-        size_t i; 
-    } u;
-    size_t remainder;
-    
-    h0=h3=h6=h9  = *hash1;
-    h1=h4=h7=h10 = *hash2;
-    h2=h5=h8=h11 = sc_const;
-    
-    u.p8 = (const uint8 *)message;
-    end = u.p64 + (length/sc_blockSize)*sc_numVars;
-
-    // handle all whole sc_blockSize blocks of bytes
-    if (ALLOW_UNALIGNED_READS || ((u.i & 0x7) == 0))
-    {
-        while (u.p64 < end)
-        { 
-            Mix(u.p64, h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-            u.p64 += sc_numVars;
-        }
-    }
-    else
-    {
-        while (u.p64 < end)
-        {
-            memcpy(buf, u.p64, sc_blockSize);
-            Mix(buf, h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-            u.p64 += sc_numVars;
-        }
-    }
-
-    // handle the last partial block of sc_blockSize bytes
-    remainder = (length - ((const uint8 *)end-(const uint8 *)message));
-    memcpy(buf, end, remainder);
-    memset(((uint8 *)buf)+remainder, 0, sc_blockSize-remainder);
-    ((uint8 *)buf)[sc_blockSize-1] = static_cast<uint8>(remainder);
-    
-    // do some final mixing 
-    End(buf, h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-    *hash1 = h0;
-    *hash2 = h1;
-}
-
-#ifdef OPENSUBDIV3_BFR_HASH_INCLUDE_UNUSED_FUNCTIONS
-// init spooky state
-void SpookyHash::Init(uint64 seed1, uint64 seed2)
-{
-    m_length = 0;
-    m_remainder = 0;
-    m_state[0] = seed1;
-    m_state[1] = seed2;
-}
-
-// add a message fragment to the state
-void SpookyHash::Update(const void *message, size_t length)
-{
-    uint64 h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11;
-    size_t newLength = length + m_remainder;
-    uint8  remainder;
-    union 
-    { 
-        const uint8 *p8; 
-        uint64 *p64; 
-        size_t i; 
-    } u;
-    const uint64 *end;
-    
-    // Is this message fragment too short?  If it is, stuff it away.
-    if (newLength < sc_bufSize)
-    {
-        memcpy(&((uint8 *)m_data)[m_remainder], message, length);
-        m_length = length + m_length;
-        m_remainder = (uint8)newLength;
-        return;
-    }
-    
-    // init the variables
-    if (m_length < sc_bufSize)
-    {
-        h0=h3=h6=h9  = m_state[0];
-        h1=h4=h7=h10 = m_state[1];
-        h2=h5=h8=h11 = sc_const;
-    }
-    else
-    {
-        h0 = m_state[0];
-        h1 = m_state[1];
-        h2 = m_state[2];
-        h3 = m_state[3];
-        h4 = m_state[4];
-        h5 = m_state[5];
-        h6 = m_state[6];
-        h7 = m_state[7];
-        h8 = m_state[8];
-        h9 = m_state[9];
-        h10 = m_state[10];
-        h11 = m_state[11];
-    }
-    m_length = length + m_length;
-    
-    // if we've got anything stuffed away, use it now
-    if (m_remainder)
-    {
-        uint8 prefix = sc_bufSize-m_remainder;
-        memcpy(&(((uint8 *)m_data)[m_remainder]), message, prefix);
-        u.p64 = m_data;
-        Mix(u.p64, h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-        Mix(&u.p64[sc_numVars], h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-        u.p8 = ((const uint8 *)message) + prefix;
-        length -= prefix;
-    }
-    else
-    {
-        u.p8 = (const uint8 *)message;
-    }
-    
-    // handle all whole blocks of sc_blockSize bytes
-    end = u.p64 + (length/sc_blockSize)*sc_numVars;
-    remainder = (uint8)(length-((const uint8 *)end-u.p8));
-    if (ALLOW_UNALIGNED_READS || (u.i & 0x7) == 0)
-    {
-        while (u.p64 < end)
-        { 
-            Mix(u.p64, h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-            u.p64 += sc_numVars;
-        }
-    }
-    else
-    {
-        while (u.p64 < end)
-        { 
-            memcpy(m_data, u.p8, sc_blockSize);
-            Mix(m_data, h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-            u.p64 += sc_numVars;
-        }
-    }
-
-    // stuff away the last few bytes
-    m_remainder = remainder;
-    memcpy(m_data, end, remainder);
-    
-    // stuff away the variables
-    m_state[0] = h0;
-    m_state[1] = h1;
-    m_state[2] = h2;
-    m_state[3] = h3;
-    m_state[4] = h4;
-    m_state[5] = h5;
-    m_state[6] = h6;
-    m_state[7] = h7;
-    m_state[8] = h8;
-    m_state[9] = h9;
-    m_state[10] = h10;
-    m_state[11] = h11;
-}
-
-// report the hash for the concatenation of all message fragments so far
-void SpookyHash::Final(uint64 *hash1, uint64 *hash2)
-{
-    // init the variables
-    if (m_length < sc_bufSize)
-    {
-        *hash1 = m_state[0];
-        *hash2 = m_state[1];
-        Short( m_data, m_length, hash1, hash2);
-        return;
-    }
-    
-    const uint64 *data = (const uint64 *)m_data;
-    uint8 remainder = m_remainder;
-    
-    uint64 h0 = m_state[0];
-    uint64 h1 = m_state[1];
-    uint64 h2 = m_state[2];
-    uint64 h3 = m_state[3];
-    uint64 h4 = m_state[4];
-    uint64 h5 = m_state[5];
-    uint64 h6 = m_state[6];
-    uint64 h7 = m_state[7];
-    uint64 h8 = m_state[8];
-    uint64 h9 = m_state[9];
-    uint64 h10 = m_state[10];
-    uint64 h11 = m_state[11];
-
-    if (remainder >= sc_blockSize)
-    {
-        // m_data can contain two blocks; handle any whole first block
-        Mix(data, h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-        data += sc_numVars;
-        remainder -= sc_blockSize;
-    }
-
-    // mix in the last partial block, and the length mod sc_blockSize
-    memset(&((uint8 *)data)[remainder], 0, (sc_blockSize-remainder));
-
-    ((uint8 *)data)[sc_blockSize-1] = remainder;
-    
-    // do some final mixing
-    End(data, h0,h1,h2,h3,h4,h5,h6,h7,h8,h9,h10,h11);
-
-    *hash1 = h0;
-    *hash2 = h1;
-}
-#endif
-
-} // anon
-
-
-//
-//  Public functions exposed for OpenSubdiv:
-//
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-namespace Bfr {
-namespace internal {
-
-uint32_t
-Hash32(const void *data, size_t len)
-{
-    return SpookyHash::Hash32(data, len, /*seed=*/0);
-}
-
-uint32_t
-Hash32(const void *data, size_t len, uint32_t seed)
-{
-    return SpookyHash::Hash32(data, len, seed);
-}
-
-uint64_t
-Hash64(const void *data, size_t len)
-{
-    return SpookyHash::Hash64(data, len, /*seed=*/0);
-}
-
-uint64_t
-Hash64(const void *data, size_t len, uint64_t seed)
-{
-    return SpookyHash::Hash64(data, len, seed);
-}
-
-} // end namespace internal
-} // end namespace Bfr
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/hash.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/hash.h
deleted file mode 100644
index a7a0b7b17..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/hash.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_HASH_H
-#define OPENSUBDIV3_BFR_HASH_H
-
-#include "../version.h"
-
-#include <cstdint>
-#include <cstddef>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-namespace internal {
-
-//
-//  Internal functions to hash data to unsigned ints for caching. Both
-//  32- and 64-bit versions are provided here, but only 64-bit versions
-//  are currently intended for internal use (so consider removing 32).
-//
-//  To compute a hash value for data that is not contiguous in memory,
-//  iterate over all the contiguous blocks of memory and accumulate the
-//  hash value by passing it on as a seed.  Note that this is *not*
-//  equivalent to hashing the contiguous pieces as a whole.  Support
-//  for that may be added in future.
-// 
-uint32_t Hash32(const void *data, size_t len);
-uint32_t Hash32(const void *data, size_t len, uint32_t seed);
-
-uint64_t Hash64(const void *data, size_t len);
-uint64_t Hash64(const void *data, size_t len, uint64_t seed);
-
-} // end namespace internal
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_HASH_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/irregularPatchBuilder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/irregularPatchBuilder.cpp
deleted file mode 100644
index bfbd640ba..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/irregularPatchBuilder.cpp
+++ /dev/null
@@ -1,916 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/irregularPatchBuilder.h"
-#include "../bfr/patchTreeBuilder.h"
-#include "../bfr/patchTree.h"
-#include "../far/topologyDescriptor.h"
-#include "../far/topologyRefiner.h"
-
-#include <cstring>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Trivial constructor -- initializes members related to the control hull:
-//
-IrregularPatchBuilder::IrregularPatchBuilder(
-        FaceSurface const & surfaceDescription, Options const & options) :
-            _surface(surfaceDescription),
-            _options(options) {
-
-    initializeControlHullInventory();
-}
-
-//
-//  Inline private methods for accessing indices associated with the
-//  face-vertex topology and indices stored in map or vector members:
-//
-inline IrregularPatchBuilder::Index const *
-IrregularPatchBuilder::getSurfaceIndices() const {
-
-    return _surface.GetIndices();
-}
-
-inline IrregularPatchBuilder::Index const *
-IrregularPatchBuilder::getCornerIndices(int corner) const { 
-
-    return getSurfaceIndices() +
-           _cornerHullInfo[corner].surfaceIndicesOffset;
-}
-
-inline IrregularPatchBuilder::Index const *
-IrregularPatchBuilder::getBaseFaceIndices() const {
-
-    FaceVertex const & corner0 = _surface.GetCornerTopology(0);
-    return getSurfaceIndices() +
-           corner0.GetFaceIndexOffset(corner0.GetFace());
-}
-
-inline IrregularPatchBuilder::Index const *
-IrregularPatchBuilder::getCornerFaceIndices(int corner, int face) const {
-
-    return getCornerIndices(corner) +
-           _surface.GetCornerTopology(corner).GetFaceIndexOffset(face);
-}
-
-inline int
-IrregularPatchBuilder::getLocalControlVertex(Index meshVertIndex) const {
-
-    return _controlVertMap.find(meshVertIndex)->second;
-}
-
-inline IrregularPatchBuilder::Index
-IrregularPatchBuilder::getMeshControlVertex(int localVertIndex) const {
-
-    return _controlVerts[localVertIndex];
-}
-
-//
-//  The IrregularPatchBuilder assembles a control hull for the base face
-//  from the topology information given for each corner of the face.  It
-//  first initializes the number of control vertices and faces required,
-//  along with the contributions of each from the corners of the face.
-//
-//  Once initialized, iteration over the corners of the base face is
-//  expected to follow a similar pattern when inspecting the incident
-//  faces of a corner:
-//
-//      - deal with faces after the base face (skipping the first)
-//      - deal with boundary vertex between faces after and before
-//      - deal with faces before the base face (all)
-//
-//  Tags and other inventory assigned here help to expedite and simplify
-//  those iterations.
-//
-void
-IrregularPatchBuilder::initializeControlHullInventory() {
-
-    //
-    //  Iterate through the corners to identify the vertices, faces and
-    //  face-vertices that contribute to the collective control hull --
-    //  keeping track of a few situations that cause complications:
-    //
-    int numVal2IntCorners = 0;
-    int numVal3IntAdjTris = 0;
-    int numSrcFaceIndices = 0;
-
-    int faceSize = _surface.GetFaceSize();
-
-    _cornerHullInfo.SetSize(faceSize);
-
-    _numControlFaces     = 1;
-    _numControlVerts     = faceSize;
-    _numControlFaceVerts = faceSize;
-
-    for (int corner = 0; corner < faceSize; ++corner) {
-        FaceVertex       const & cTop = _surface.GetCornerTopology(corner);
-        FaceVertexSubset const & cSub = _surface.GetCornerSubset(corner);
-
-        //
-        //  Inspect faces after the corner face first -- dealing with a few
-        //  special cases for interior vertices of low valence -- followed
-        //  by those faces before the corner face:
-        //
-        CornerHull & cHull = _cornerHullInfo[corner];
-        cHull.Clear();
-
-        int numCornerFaceVerts = 0;
-
-        if (cSub._numFacesAfter) {
-            int nextFace = cTop.GetFaceNext(cTop.GetFace());
-
-            if (cSub.IsBoundary()) {
-                //  Boundary -- no special cases:
-                for (int i = 1; i < cSub._numFacesAfter; ++i) {
-                    nextFace = cTop.GetFaceNext(nextFace);
-                    int S = cTop.GetFaceSize(nextFace);
-
-                    cHull.numControlVerts += S - 2;
-                    numCornerFaceVerts += S;
-                }
-                cHull.numControlFaces = cSub._numFacesAfter - 1;
-                //  Include unshared vertex of trailing edge
-                cHull.numControlVerts ++;
-            } else if ((cSub._numFacesTotal == 3) &&
-                    (cTop.GetFaceSize(cTop.GetFaceAfter(2)) == 3)) {
-                //  Interior, valence-3, adjacent triangle -- special case:
-                if (++numVal3IntAdjTris == faceSize) {
-                    cHull.singleSharedVert = true;
-                    cHull.numControlVerts = 1;
-                }
-                cHull.numControlFaces = 1;
-                numCornerFaceVerts = 3;
-            } else if (cSub._numFacesTotal > 2) {
-                //  Interior -- general case:
-                for (int i = 2; i < cSub._numFacesTotal; ++i) {
-                    nextFace = cTop.GetFaceNext(nextFace);
-                    int S = cTop.GetFaceSize(nextFace);
-
-                    cHull.numControlVerts += S - 2;
-                    numCornerFaceVerts += S;
-                }
-                cHull.numControlFaces = cSub._numFacesTotal - 2;
-                //  Exclude vertex shared with/contributed by next corner
-                cHull.numControlVerts --;
-            } else {
-                //  Interior, valence-2 -- special case:
-                if (++numVal2IntCorners == faceSize) {
-                    cHull.singleSharedFace = true;
-                    cHull.numControlFaces = 1;
-                    numCornerFaceVerts = faceSize;
-                }
-            }
-        }
-        if (cSub._numFacesBefore) {
-            assert(cSub.IsBoundary());
-            int nextFace = cTop.GetFaceFirst(cSub);
-
-            for (int i = 0; i < cSub._numFacesBefore; ++i) {
-                int S = cTop.GetFaceSize(nextFace);
-                nextFace = cTop.GetFaceNext(nextFace);
-
-                cHull.numControlVerts += S - 2;
-                numCornerFaceVerts += S;
-            }
-            cHull.numControlFaces += cSub._numFacesBefore;
-            //  Exclude vertex shared with/contributed by next corner
-            cHull.numControlVerts --;
-        }
-
-        //  Assign the contributions for this corner:
-        cHull.nextControlVert      = _numControlVerts;
-        cHull.surfaceIndicesOffset = numSrcFaceIndices;
-
-        _numControlFaces     += cHull.numControlFaces;
-        _numControlVerts     += cHull.numControlVerts;
-        _numControlFaceVerts += numCornerFaceVerts;
-
-        numSrcFaceIndices += cTop.GetNumFaceVertices();
-    }
-
-    //
-    //  Use/build a map for the control vertex indices when incident
-    //  faces overlap to an extent that makes traversal ill-defined:
-    //
-    _controlFacesOverlap = (numVal2IntCorners > 0);
-
-    _useControlVertMap = _controlFacesOverlap;
-    if (_useControlVertMap) {
-        initializeControlVertexMap();
-    }
-}
-
-void
-IrregularPatchBuilder::addMeshControlVertex(Index meshVertIndex) {
-
-    if (_controlVertMap.find(meshVertIndex) == _controlVertMap.end()) {
-        int newLocalVertIndex = (int) _controlVerts.size();
-        _controlVertMap[meshVertIndex] = newLocalVertIndex;
-        _controlVerts.push_back(meshVertIndex);
-    }
-}
-
-void
-IrregularPatchBuilder::addMeshControlVertices(Index const fVerts[], int fSize) {
-
-    //  Ignore the first index of the face, which corresponds to a corner
-    for (int i = 1; i < fSize; ++i) {
-        addMeshControlVertex(fVerts[i]);
-    }
-}
-
-void
-IrregularPatchBuilder::initializeControlVertexMap() {
-
-    //
-    //  Add CV indices from the base face first -- be careful to ensure
-    //  that a vector entry is made for each base face vertex in cases
-    //  when repeated indices may occur:
-    Index const * baseVerts = getBaseFaceIndices();
-
-    int faceSize = _surface.GetFaceSize();
-    for (int i = 0; i < faceSize; ++i) {
-        addMeshControlVertex(baseVerts[i]);
-        if ((int)_controlVerts.size() == i) {
-            _controlVerts.push_back(baseVerts[i]);
-        }
-    }
-
-    //
-    //  For each corner, add face-vertices to the map only for those
-    //  incident faces that contribute to the control hull:
-    //
-    for (int corner = 0; corner < faceSize; ++corner) {
-        CornerHull & cHull = _cornerHullInfo[corner];
-        if (cHull.numControlFaces == 0) continue;
-
-        FaceVertex       const & cTop = _surface.GetCornerTopology(corner);
-        FaceVertexSubset const & cSub = _surface.GetCornerSubset(corner);
-
-        //  Special case of a single shared back-to-back face first:
-        if (cHull.singleSharedFace) {
-            int nextFace = cTop.GetFaceAfter(1);
-            addMeshControlVertices(getCornerFaceIndices(corner, nextFace),
-                                   cTop.GetFaceSize(nextFace));
-            continue;
-        }
-
-        //  Follow the common pattern:  faces after, boundary, faces before
-        //  (no need to deal with isolated boundary vertex in this case)
-        if (cSub._numFacesAfter > 1) {
-            int nextFace = cTop.GetFaceAfter(1);
-            for (int j = 1; j < cSub._numFacesAfter; ++j) {
-                nextFace = cTop.GetFaceNext(nextFace);
-
-                addMeshControlVertices(getCornerFaceIndices(corner, nextFace),
-                                       cTop.GetFaceSize(nextFace));
-            }
-        }
-        if (cSub._numFacesBefore) {
-            int nextFace = cTop.GetFaceFirst(cSub);
-            for (int i = 0; i < cSub._numFacesBefore; ++i) {
-                addMeshControlVertices(getCornerFaceIndices(corner, nextFace),
-                                       cTop.GetFaceSize(nextFace));
-
-                nextFace = cTop.GetFaceNext(nextFace);
-            }
-        }
-    }
-    _numControlVerts = (int) _controlVerts.size();
-}
-
-//
-//  Methods for gathering control vertices, faces, sharpness, etc. -- the
-//  method to gather control vertex indices is for external use, while the
-//  rest are internal:
-//
-int
-IrregularPatchBuilder::GatherControlVertexIndices(Index cvIndices[]) const {
-
-    //
-    //  If a map was built, simply copy the associated vector of indices:
-    //
-    if (_useControlVertMap) {
-        std::memcpy(cvIndices, &_controlVerts[0], _numControlVerts*sizeof(int));
-        return _numControlVerts;
-    }
-
-    //
-    //  Assign CV indices from the base face first:
-    //
-    int faceSize   = _surface.GetFaceSize();
-    int numIndices = faceSize;
-
-    std::memcpy(cvIndices, getBaseFaceIndices(), faceSize * sizeof(Index));
-
-    //
-    //  Assign vertex indices identified as contributed by each corner:
-    //
-    for (int corner = 0; corner < faceSize; ++corner) {
-        CornerHull const & cHull = _cornerHullInfo[corner];
-        if (cHull.numControlVerts == 0) continue;
-
-        FaceVertex       const & cTop   = _surface.GetCornerTopology(corner);
-        FaceVertexSubset const & cSub   = _surface.GetCornerSubset(corner);
-
-        //  Special case with all val-3 interior triangles:
-        if (cHull.singleSharedVert) {
-            assert(!cSub.IsBoundary() && (cSub._numFacesTotal == 3) &&
-                   (cTop.GetFaceSize(cTop.GetFaceAfter(2)) == 3));
-
-            cvIndices[numIndices++] =
-                    getCornerFaceIndices(corner, cTop.GetFaceAfter(2))[1];
-            continue;
-        }
-
-        //
-        //  Follow the common pattern:  faces after, boundary, faces before
-        //
-        if (cSub._numFacesAfter > 1) {
-            int nextFace = cTop.GetFaceAfter(1);
-            int N = cSub._numFacesAfter - 1;
-            for (int j = 0; j < N; ++j) {
-                nextFace = cTop.GetFaceNext(nextFace);
-
-                Index const * faceVerts = getCornerFaceIndices(corner,nextFace);
-
-                int S = cTop.GetFaceSize(nextFace);
-                int L = ((j < (N-1)) || cSub.IsBoundary()) ?  0 : 1;
-                int M = (S - 2) - L;
-                for (int k = 1; k <= M; ++k) {
-                    cvIndices[numIndices++] = faceVerts[k];
-                }
-            }
-        }
-        if (cSub._numFacesAfter && cSub.IsBoundary()) {
-            //  Include trailing edge for boundary before crossing the gap:
-            int nextFace = cTop.GetFaceAfter(cSub._numFacesAfter);
-            cvIndices[numIndices++] = cTop.GetFaceIndexTrailing(nextFace,
-                                                    getCornerIndices(corner));
-        }
-        if (cSub._numFacesBefore) {
-            int nextFace = cTop.GetFaceFirst(cSub);
-            int N = cSub._numFacesBefore;
-            for (int j = 0; j < N; ++j) {
-                Index const * faceVerts = getCornerFaceIndices(corner,nextFace);
-
-                int S = cTop.GetFaceSize(nextFace);
-                int L = (j < (N-1)) ? 0 : 1;
-                int M = (S - 2) - L;
-                for (int k = 1; k <= M; ++k) {
-                    cvIndices[numIndices++] = faceVerts[k];
-                }
-                nextFace = cTop.GetFaceNext(nextFace);
-            }
-        }
-    }
-    assert(numIndices == _numControlVerts);
-    return numIndices;
-}
-
-int
-IrregularPatchBuilder::gatherControlFaces(int faceSizes[],
-                                          int faceVertices[]) const {
-
-    //
-    //  Assign face-vertices for the first/base face:
-    //
-    int * faceVerts = faceVertices;
-
-    int faceSize = _surface.GetFaceSize();
-    for (int i = 0; i < faceSize; ++i) {
-        *faceVerts++ = i;
-    }
-    *faceSizes++ = faceSize;
-
-    //
-    //  Assign face-vertex indices for faces "local to" each corner:
-    //
-    for (int corner = 0; corner < faceSize; ++corner) {
-        CornerHull const & cHull = _cornerHullInfo[corner];
-        if (cHull.numControlFaces == 0) continue;
-
-        FaceVertex       const & cTop = _surface.GetCornerTopology(corner);
-        FaceVertexSubset const & cSub = _surface.GetCornerSubset(corner);
-
-        //  Special case of a single shared opposing face first:
-        if (cHull.singleSharedFace) {
-            assert(_useControlVertMap);
-            getControlFaceVertices(faceVerts, faceSize, corner,
-                        getCornerFaceIndices(corner, cTop.GetFaceAfter(1)));
-            *faceSizes++ = faceSize;
-            faceVerts   += faceSize;
-            continue;
-        }
-
-        //
-        //  Follow the common pattern:  faces after, boundary, faces before
-        //
-        int nextVert = cHull.nextControlVert;
-
-        if (cSub._numFacesAfter > 1) {
-            int nextFace = cTop.GetFaceAfter(2);
-            int N = cSub._numFacesAfter - 1;
-            for (int j = 0; j < N; ++j) {
-                int S = cTop.GetFaceSize(nextFace);
-
-                if (_useControlVertMap) {
-                    getControlFaceVertices(faceVerts, S, corner,
-                            getCornerFaceIndices(corner, nextFace));
-                } else if (cSub.IsBoundary()) {
-                    getControlFaceVertices(faceVerts, S, corner, nextVert);
-                } else {
-                    getControlFaceVertices(faceVerts, S, corner, nextVert,
-                            (j == (N - 1)));
-                }
-                *faceSizes++ = S;
-                faceVerts   += S;
-
-                nextVert += S - 2;
-                nextFace  = cTop.GetFaceNext(nextFace);
-            }
-        }
-        if (cSub._numFacesAfter && cSub.IsBoundary()) {
-            nextVert ++;
-        }
-        if (cSub._numFacesBefore) {
-            int nextFace = cTop.GetFaceFirst(cSub);
-            int N = cSub._numFacesBefore;
-            for (int j = 0; j < N; ++j) {
-                int S = cTop.GetFaceSize(nextFace);
-
-                if (_useControlVertMap) {
-                    getControlFaceVertices(faceVerts, S, corner,
-                            getCornerFaceIndices(corner, nextFace));
-                } else {
-                    getControlFaceVertices(faceVerts, S, corner, nextVert,
-                            (j == (N - 1)));
-                }
-                *faceSizes++ = S;
-                faceVerts   += S;
-
-                nextVert += S - 2;
-                nextFace  = cTop.GetFaceNext(nextFace);
-            }
-        }
-    }
-    assert((faceVerts - faceVertices) == _numControlFaceVerts);
-    return _numControlFaceVerts;
-}
-
-int
-IrregularPatchBuilder::gatherControlVertexSharpness(
-        int vertIndices[], float vertSharpness[]) const {
-
-    int nSharpVerts = 0;
-    for (int i = 0; i < _surface.GetFaceSize(); ++i) {
-        FaceVertexSubset const & cSub = _surface.GetCornerSubset(i);
-
-        if (cSub._tag.IsInfSharp()) {
-            vertSharpness[nSharpVerts] = Sdc::Crease::SHARPNESS_INFINITE;
-            vertIndices[nSharpVerts++] = i;
-        } else if (cSub._tag.IsSemiSharp()) {
-            vertSharpness[nSharpVerts] = (cSub._localSharpness > 0.0f) ? 
-                        cSub._localSharpness :
-                        _surface.GetCornerTopology(i).GetVertexSharpness();
-            vertIndices[nSharpVerts++] = i;
-        }
-    }
-    return nSharpVerts;
-}
-
-int
-IrregularPatchBuilder::gatherControlEdgeSharpness(
-        int edgeVertPairs[], float edgeSharpness[]) const {
-
-    //
-    //  First test the forward edge of each corner of the face (avoid
-    //  including redundant inf-sharp boundary edges):
-    //
-    int nSharpEdges = 0;
-
-    int faceSize = _surface.GetFaceSize();
-
-    for (int corner = 0; corner < faceSize; ++corner) {
-        FaceVertexSubset const & cSub = _surface.GetCornerSubset(corner);
-        if (!cSub._tag.HasSharpEdges()) continue;
-
-        if (!cSub.IsBoundary() || cSub._numFacesBefore) {
-            FaceVertex const & cTop = _surface.GetCornerTopology(corner);
-
-            int   cornerFace = cTop.GetFace();
-            float sharpness  = cTop.GetFaceEdgeSharpness(cornerFace, 0);
-            if (Sdc::Crease::IsSharp(sharpness)) {
-                *edgeSharpness++ = sharpness;
-                *edgeVertPairs++ =  corner;
-                *edgeVertPairs++ = (corner + 1) % faceSize;
-                nSharpEdges++;
-            }
-        }
-    }
-
-    //
-    //  For each corner, test any interior edges connected to vertices
-    //  on the perimeter:
-    //
-    for (int corner = 0; corner < faceSize; ++corner) {
-        FaceVertexSubset const & cSub = _surface.GetCornerSubset(corner);
-        if (!cSub._tag.HasSharpEdges()) continue;
-
-        CornerHull const & cHull = _cornerHullInfo[corner];
-        if (cHull.numControlFaces == 0) continue;
-
-        FaceVertex const & cTop = _surface.GetCornerTopology(corner);
-
-        //
-        //  Inspect interior edges around the subset -- testing sharpness
-        //  of the trailing edge of the faces after/before the corner face.
-        //
-        //  Follow the common pattern:  faces after, boundary, faces before
-        //
-        //  Track perimeter index to identify verts at end of sharp edges:
-        int maxVert  = _numControlVerts;
-        int nextVert = cHull.nextControlVert;
-
-        Index const * cVerts = getCornerIndices(corner);
-
-        if (cSub._numFacesAfter > 1) {
-            int nextFace = cTop.GetFaceAfter(1);
-            for (int i = 1; i < cSub._numFacesAfter; ++i) {
-                float sharpness = cTop.GetFaceEdgeSharpness(nextFace, 1);
-                if (Sdc::Crease::IsSharp(sharpness)) {
-                    int edgeVert = (nextVert < maxVert) ? nextVert : faceSize;
-                    if (_useControlVertMap) {
-                        edgeVert = getLocalControlVertex(
-                            cTop.GetFaceIndexTrailing(nextFace, cVerts));
-                    }
-
-                    *edgeSharpness++ = sharpness;
-                    *edgeVertPairs++ = corner;
-                    *edgeVertPairs++ = edgeVert;
-                    nSharpEdges++;
-                }
-                nextFace  = cTop.GetFaceNext(nextFace);
-                nextVert += cTop.GetFaceSize(nextFace) - 2;
-            }
-        }
-        if (cSub._numFacesAfter && cSub.IsBoundary()) {
-            nextVert += cSub.IsBoundary();
-        }
-        if (cSub._numFacesBefore) {
-            int nextFace = cTop.GetFaceFirst(cSub);
-            for (int i = 1; i < cSub._numFacesBefore; ++i) {
-                nextVert += cTop.GetFaceSize(nextFace) - 2;
-                float sharpness = cTop.GetFaceEdgeSharpness(nextFace, 1);
-                if (Sdc::Crease::IsSharp(sharpness)) {
-                    int edgeVert = (nextVert < maxVert) ? nextVert : faceSize;
-                    if (_useControlVertMap) {
-                        edgeVert = getLocalControlVertex(
-                            cTop.GetFaceIndexTrailing(nextFace, cVerts));
-                    }
-
-                    *edgeSharpness++ = sharpness;
-                    *edgeVertPairs++ = corner;
-                    *edgeVertPairs++ = edgeVert;
-                    nSharpEdges++;
-                }
-                nextFace  = cTop.GetFaceNext(nextFace);
-            }
-        }
-    }
-    return nSharpEdges;
-}
-
-
-//
-//  Methods to gather the local face-vertices for a particular incident
-//  face of a corner.  The first is the trivial case -- where all vertices
-//  other than the initial corner vertex lie on the perimeter and do not
-//  wrap around.  The second deals handles more of the complications and
-//  is used in all cases where the trivial method cannot be applied.
-//
-void
-IrregularPatchBuilder::getControlFaceVertices(int fVerts[], int numFVerts,
-        int corner, Index const srcVerts[]) const {
-    assert(_useControlVertMap);
-
-    *fVerts++ = corner;
-    for (int i = 1; i < numFVerts; ++i) {
-        *fVerts++ = getLocalControlVertex(srcVerts[i]);
-    }
-}
-
-void
-IrregularPatchBuilder::getControlFaceVertices(int fVerts[], int numFVerts,
-        int corner, int nextPerimeterVert) const {
-
-    *fVerts++ = corner;
-    for (int i = 1; i < numFVerts; ++i) {
-        *fVerts++ = nextPerimeterVert + i - 1;
-    }
-}
-
-void
-IrregularPatchBuilder::getControlFaceVertices(int fVerts[], int numFVerts,
-        int corner, int nextPerimeterVert, bool lastFace) const {
-
-    int S = numFVerts;
-    int N = _surface.GetFaceSize();
-
-    //
-    //  The typical case:  the corner vertex first, followed by vertices
-    //  on the perimeter -- potentially wrapping around the perimeter to
-    //  the first corner or the base face:
-    //
-    //      - for the last corner only, the face-vert preceding the last
-    //        will wrap around the perimeter
-    //      - for all corners, the last face-vert of the last face wraps
-    //        around the face to the next corner
-    //
-    *fVerts++ = corner;
-
-    for (int i = 1; i < S - 2; ++i) {
-        *fVerts++ = nextPerimeterVert + i - 1;
-    }
-
-    int nextToLastPerimOfFace = nextPerimeterVert + S - 3;
-    if (nextToLastPerimOfFace == _numControlVerts) {
-        nextToLastPerimOfFace = N;
-    }
-    *fVerts++ = nextToLastPerimOfFace;
-
-    int lastPerimOfFace = nextPerimeterVert + S - 2;
-    if (lastPerimOfFace == _numControlVerts) {
-        lastPerimOfFace = N;
-    }
-    *fVerts++ = lastFace ? ((corner + 1) % N) : lastPerimOfFace;
-}
-
-//
-//  Detection and removal of duplicate control faces -- which can only
-//  occur when incident faces overlap with the base face:
-//
-namespace {
-    //
-    //  Internal helper functions to detect duplicate faces:
-    //
-    bool
-    doFacesMatch(int size, int const a[], int const b[], int bStart) {
-        for (int i = 0, j = bStart; i < size; ++i, ++j) {
-            j = (j == size) ? 0 : j;
-            if (a[i] != b[j]) return false;
-        }
-        return true;
-    }
-
-    bool
-    doFacesMatch(int size, int const a[], int const b[]) {
-        //  Find a matching vertex to correlate possible rotation:
-        for (int i = 0; i < size; ++i) {
-            if (b[i] == a[0]) {
-                return doFacesMatch(size, a, b, i);
-            }
-        }
-        return false;
-    }
-}
-
-void
-IrregularPatchBuilder::removeDuplicateControlFaces(
-        int   faceSizes[], int   faceVerts[],
-        int * numFaces,    int * numFaceVerts) const {
-
-    //
-    //  Work backwards from the last face -- detecting if it matches a
-    //  face earlier in the arrays and removing it if so:
-    //
-    int numSizesAfter = 0;
-    int numVertsAfter = 0;
-
-    int * sizesAfter = faceSizes + *numFaces;
-    int * vertsAfter = faceVerts + *numFaceVerts;
-
-    for (int i = *numFaces - 1; i > 1; --i) {
-        int   iSize  = faceSizes[i];
-        int * iVerts = vertsAfter - iSize;
-
-        //  Inspect the faces preceding this face for a duplicate:
-        bool isDuplicate = false;
-
-        int * jVerts = iVerts;
-        for (int j = i - 1; !isDuplicate && (j > 0); --j) {
-            jVerts = jVerts - faceSizes[j];
-            if (iSize == faceSizes[j]) {
-                isDuplicate = doFacesMatch(iSize, iVerts, jVerts);
-            }
-        }
-
-        //  If this face was duplicated by one preceding it, remove it:
-        if (isDuplicate) {
-            if (numSizesAfter) {
-                std::memmove(sizesAfter - 1, sizesAfter,
-                             numSizesAfter * sizeof(int));
-                std::memmove(vertsAfter - iSize, vertsAfter,
-                             numVertsAfter * sizeof(int));
-            }
-            (*numFaces) --;
-            (*numFaceVerts) -= iSize;
-        } else {
-            numSizesAfter ++;
-            numVertsAfter += iSize;
-        }
-        sizesAfter --;
-        vertsAfter -= iSize;
-    }
-}
-
-void
-IrregularPatchBuilder::sharpenBoundaryControlEdges(
-        int edgeVertPairs[], float edgeSharpness[], int * numSharpEdges) const {
-
-    //
-    //  When extracting a manifold subset from a greater non-manifold
-    //  region, the boundary edges for the subset sometimes occur on
-    //  non-manifold edges.  When extracting the subset topology in
-    //  cases where faces overlap, those boundary edges can sometimes
-    //  be misinterpreted as manifold interior edges -- as the extra
-    //  faces connected to them that made the edge non-manifold are
-    //  not included in the subset.
-    //
-    //  So boundary edges are sharpened here -- which generally has no
-    //  effect (as boundary edges are implicitly sharpened) but ensures
-    //  that if the edge is misinterpreted as interior, it will remain
-    //  sharp. And only boundary edges of the base face are sharpened
-    //  here -- it is not necessary to deal with others.
-    //
-    int faceSize = _surface.GetFaceSize();
-
-    for (int corner = 0; corner < faceSize; ++corner) {
-        FaceVertexSubset const & cSub = _surface.GetCornerSubset(corner);
-
-        if (cSub.IsBoundary() && (cSub._numFacesBefore == 0)) {
-            *edgeSharpness++ = Sdc::Crease::SHARPNESS_INFINITE;
-            *edgeVertPairs++ =  corner;
-            *edgeVertPairs++ = (corner + 1) % faceSize;
-            (*numSharpEdges) ++;
-        }
-    }
-}
-
-//
-//  The main build/assembly method to create a PatchTree:
-//
-//  Note that the IrregularPatchBuilder was conceived to potentially build
-//  different representations of irregular patches (all sharing a virtual
-//  interface to hide that from it clients).  It was here that topology
-//  would be inspected and builders for the different representations would
-//  be dispatched.
-//
-//  At this point, the PatchTree is used for all topological cases, so
-//  those future intentions are not reflected here.
-//
-internal::IrregularPatchSharedPtr
-IrregularPatchBuilder::Build() {
-
-    //
-    //  Build a PatchTree -- the sole representation used for all irregular
-    //  patch topologies.
-    //
-    //  Given the PatchTree's origin in Far, it's builder class requires a
-    //  Far::TopologyRefiner.  Now that PatchTreeBuilder is part of Bfr, it
-    //  could be adapted to accept the Bfr::FaceSurface directly and deal
-    //  with any any intermediate TopologyRefiner internally.
-    //
-    //  For now, the quickest way of constructing a TopologyRefiner is via
-    //  a Far::TopologyDescriptor -- which simply refers to pre-allocated
-    //  topology arrays. Those arrays will be allocated on the stack here
-    //  to accommodate typical cases not involving excessively high valence.
-    //
-    //  Use of TopologyDescriptor could be eliminated by defining a factory
-    //  to create a TopologyRefiner directly from the FaceSurface, but the
-    //  benefits relative to the cost of creating the PatchTree are not
-    //  significant. The fact that the current assembly requires removing
-    //  duplicate faces in some cases further complicates that process.
-    //
-    int numVerts     = _numControlVerts;
-    int numFaces     = _numControlFaces;
-    int numFaceVerts = _numControlFaceVerts;
-    int numCorners   = _surface.GetFaceSize();
-    int numCreases   = _numControlVerts;
-
-    //  Allocate and partition stack buffers for the topology arrays:
-    int numInts   = numFaces + numFaceVerts + numCorners + numCreases*2;
-    int numFloats = numCorners + numCreases;
-
-    Vtr::internal::StackBuffer<int, 256,true> intBuffer(numInts);
-    Vtr::internal::StackBuffer<float,64,true> floatBuffer(numFloats);
-
-    int * faceSizes     = intBuffer;
-    int * faceVerts     = faceSizes     + numFaces;
-    int * cornerIndices = faceVerts     + numFaceVerts;
-    int * creaseIndices = cornerIndices + numCorners;
-
-    float * cornerWeights = floatBuffer;
-    float * creaseWeights = cornerWeights + numCorners;
-
-    //  Gather face topology (sizes and vertices) and explicit sharpness:
-    gatherControlFaces(faceSizes, faceVerts);
-
-    numCorners = _surface.GetTag().HasSharpVertices() ?
-                 gatherControlVertexSharpness(cornerIndices, cornerWeights) : 0;
-
-    numCreases = _surface.GetTag().HasSharpEdges() ?
-                 gatherControlEdgeSharpness(creaseIndices, creaseWeights) : 0;
-
-    //  Make some adjustments when control faces may overlap:
-    if (controlFacesMayOverlap()) {
-        if (numFaces > 2) {
-            removeDuplicateControlFaces(faceSizes, faceVerts,
-                                        &numFaces, &numFaceVerts);
-        }
-        if (_surface.GetTag().HasBoundaryVertices()) {
-            sharpenBoundaryControlEdges(creaseIndices, creaseWeights,
-                                        &numCreases);
-        }
-    }
-
-    //  Declare a TopologyDescriptor to reference the data gathered above:
-    Far::TopologyDescriptor topDescriptor;
-
-    topDescriptor.numVertices = numVerts;
-    topDescriptor.numFaces    = numFaces;
-
-    topDescriptor.numVertsPerFace    = faceSizes;
-    topDescriptor.vertIndicesPerFace = faceVerts;
-
-    if (numCorners) {
-        topDescriptor.numCorners          = numCorners;
-        topDescriptor.cornerVertexIndices = cornerIndices;
-        topDescriptor.cornerWeights       = cornerWeights;
-    }
-
-    if (numCreases) {
-        topDescriptor.numCreases             = numCreases;
-        topDescriptor.creaseVertexIndexPairs = creaseIndices;
-        topDescriptor.creaseWeights          = creaseWeights;
-    }
-
-    //  Construct a TopologyRefiner in order to create a PatchTree:
-    typedef Far::TopologyDescriptor Descriptor;
-    typedef Far::TopologyRefinerFactory<Descriptor> RefinerFactory;
-
-    RefinerFactory::Options refinerOptions;
-    refinerOptions.schemeType    = _surface.GetSdcScheme();
-    refinerOptions.schemeOptions = _surface.GetSdcOptionsInEffect();
-    // WIP - enable for debugging
-    //refinerOptions.validateFullTopology = true;
-
-    Far::TopologyRefiner * refiner =
-            RefinerFactory::Create(topDescriptor, refinerOptions);
-
-    //  Create the PatchTree from the TopologyRefiner:
-    PatchTreeBuilder::Options patchTreeOptions;
-    patchTreeOptions.includeInteriorPatches = false;
-    patchTreeOptions.maxPatchDepthSharp  = (unsigned char)_options.sharpLevel;
-    patchTreeOptions.maxPatchDepthSmooth = (unsigned char)_options.smoothLevel;
-    patchTreeOptions.useDoublePrecision  = _options.doublePrecision;
-
-    PatchTreeBuilder patchTreeBuilder(*refiner, patchTreeOptions);
-
-    PatchTree const * patchTree = patchTreeBuilder.Build();
-
-    assert(patchTree->GetNumControlPoints() == _numControlVerts);
-
-    delete refiner;
-    return internal::IrregularPatchSharedPtr(patchTree);
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/irregularPatchBuilder.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/irregularPatchBuilder.h
deleted file mode 100644
index 9b1e5908f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/irregularPatchBuilder.h
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_IRREGULAR_PATCH_BUILDER_H
-#define OPENSUBDIV3_IRREGULAR_PATCH_BUILDER_H
-
-#include "../version.h"
-
-#include "../bfr/faceSurface.h"
-#include "../bfr/irregularPatchType.h"
-#include "../vtr/stackBuffer.h"
-
-#include <map>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  IrregularPatchBuilder takes a FaceSurface (that has been flagged as not
-//  regular) and builds a representation for the limit surface it defines.
-//
-//  It is intended to hide the construction details and final representation
-//  of the limit surface from its clients, i.e. the SurfaceFactory.  If the
-//  preferred representation changes, or more than one is made available, it
-//  should have minimal impact on its clients (ideally none).
-//
-//  WIP - the nature of the approximating options needs more work...
-//      - we need some way of specifying the options of PatchTree in a
-//        way that's more in line with the Factory's public interface
-//
-class IrregularPatchBuilder {
-public:
-    typedef FaceSurface::Index Index;
-
-public:
-    //  WIP - see note above
-    struct Options {
-        Options() : sharpLevel(6), smoothLevel(2), doublePrecision(false) { }
-
-        int  sharpLevel;
-        int  smoothLevel;
-        bool doublePrecision;
-    };
-
-public:
-    IrregularPatchBuilder(FaceSurface const & surfaceDescription,
-                          Options     const & options = Options());
-    ~IrregularPatchBuilder() { }
-
-    //  Debugging:
-    void print() const;
-
-public:
-    //  Methods to query the number and indices of control vertices:
-    int GetNumControlVertices() const { return _numControlVerts; }
-
-    int GatherControlVertexIndices(Index cvIndices[]) const;
-
-public:
-    //  Methods to build irregular patches:
-
-    internal::IrregularPatchSharedPtr Build();
-
-private:
-    //  Private methods to assemble the control hull:
-
-    //  A simple struct keeps track of the contribution of each corner to
-    //  the collective control hull. These are first initialized and then
-    //  used by methods to gather the various topological data that define
-    //  the hull.
-    //
-    //  Note that vertices of the base face and the base face itself are
-    //  not included as part of this inventory for each corner, e.g. the
-    //  number of control vertices or control faces may be zero if the
-    //  corner has no incident faces.
-    //  
-    struct CornerHull {
-        void Clear() { std::memset(this, 0, sizeof(*this)); }
-
-        int          numControlFaces;
-        int          numControlVerts;
-        int          nextControlVert;
-        int          surfaceIndicesOffset;
-        unsigned int singleSharedVert : 1;
-        unsigned int singleSharedFace : 1;
-    };
-
-    void initializeControlHullInventory();
-
-    //  Methods to access the control vertex indices:
-    Index const * getSurfaceIndices() const;
-    Index const * getBaseFaceIndices() const;
-    Index const * getCornerIndices(int corner) const;
-    Index const * getCornerFaceIndices(int corner, int face) const;
-
-    //  Methods to gather topology defining the control hull:
-    int gatherControlFaces(int faceSizes[], int faceVertices[]) const;
-
-    int gatherControlVertexSharpness(int indices[], float sharpness[]) const;
-    int gatherControlEdgeSharpness(  int indices[], float sharpness[]) const;
-
-    //  Methods to identify face-verts for an individual control face:
-    void getControlFaceVertices(int  faceVerts[], int numFaceVerts,
-                                int  corner,      int nextPerimeterVert) const;
-    void getControlFaceVertices(int  faceVerts[], int numFaceVerts,
-                                int  corner,      int nextPerimeterVert,
-                                bool lastFace) const;
-    void getControlFaceVertices(int  faceVerts[], int numFaceVerts,
-                                int  corner,      Index const srcVerts[]) const;
-
-    //  Methods for dealing with the control vertex map:
-    void initializeControlVertexMap();
-
-    void addMeshControlVertex(Index faceVertIndex);
-    void addMeshControlVertices(Index const faceVertIndices[], int faceSize);
-
-    int   getLocalControlVertex(Index meshVertexIndex) const;
-    Index getMeshControlVertex( int   localVertexIndex) const;
-
-    //  Methods for dealing with potentially overlapping faces:
-    bool controlFacesMayOverlap() const { return _controlFacesOverlap; }
-
-    void removeDuplicateControlFaces(int faceSizes[], int faceVerts[],
-                                     int * numFaces, int * numFaceVerts) const;
-    void sharpenBoundaryControlEdges(int edgeIndices[], float edgeSharpness[],
-                                     int * numSharpEdges) const;
-
-private:
-    //  Private members:
-    FaceSurface const & _surface;
-    Options             _options;
-
-    //  Members defining the control hull of the surface -- some storing
-    //  contributions to the control hull for each corner:
-    typedef Vtr::internal::StackBuffer<CornerHull,8,true> CornerHullArray;
-
-    int  _numControlVerts;
-    int  _numControlFaces;
-    int  _numControlFaceVerts;
-    bool _controlFacesOverlap;
-    bool _useControlVertMap;
-
-    CornerHullArray _cornerHullInfo;
-
-    std::map<Index,int> _controlVertMap;
-    std::vector<Index>  _controlVerts;
-};
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_IRREGULAR_PATCH_BUILDER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/irregularPatchType.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/irregularPatchType.h
deleted file mode 100644
index 1f8f0585c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/irregularPatchType.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_IRREGULAR_PATCH_TYPE_H
-#define OPENSUBDIV3_BFR_IRREGULAR_PATCH_TYPE_H
-
-#include "../version.h"
-
-#include <memory>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  This header was intended to contain an abstract class providing the
-//  common interface to potentially more than one representations of the
-//  irregular patches.  But given only one implementation exists -- the
-//  PatchTree -- that level of abstraction has been deferred.
-//
-//  So this header serves to encapsulate the forward declaration of that
-//  single representation, along with related typedefs for internal use.
-//
-class PatchTree;
-
-namespace internal {
-
-    typedef PatchTree IrregularPatchType;
-
-    typedef std::shared_ptr<const IrregularPatchType> IrregularPatchSharedPtr;
-
-} // end namespace internal
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_IRREGULAR_PATCH_TYPE */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/limits.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/limits.h
deleted file mode 100644
index 0ece6c4c2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/limits.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_LIMITS_H
-#define OPENSUBDIV3_BFR_LIMITS_H
-
-#include "../version.h"
-
-#include "../far/types.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-///
-/// @brief Simple struct with limits related to topology
-///
-struct Limits {
-    /// @brief Returns the maximum allowable valence for a vertex
-    static int MaxValence()  { return Far::VALENCE_LIMIT; }
-
-    /// @brief Returns the maximum allowable size for a face (number of
-    ///        vertices)
-    static int MaxFaceSize() { return Far::VALENCE_LIMIT; }
-};
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_LIMITS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/parameterization.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/parameterization.cpp
deleted file mode 100644
index f5a2a1b3d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/parameterization.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/parameterization.h"
-#include "../bfr/limits.h"
-#include "../sdc/types.h"
-
-#include <cmath>
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Construction:
-//
-Parameterization::Parameterization(Sdc::SchemeType scheme, int faceSize) {
-
-    int regFaceSize = Sdc::SchemeTypeTraits::GetRegularFaceSize(scheme);
-
-    _type     = (unsigned char) ((regFaceSize == 4) ? QUAD : TRI);
-    _faceSize = (unsigned short) faceSize;
-    _uDim     = 0;
-
-    if (faceSize != regFaceSize) {
-        if ((faceSize < 3) || (faceSize > Limits::MaxFaceSize())) {
-            //  Reset size to 0 (invalid) for degenerate or excessive size
-            _faceSize = 0;
-        } else if (regFaceSize == 3) {
-            //  Reset size to 0 (invalid) for non-triangles of tri schemes:
-            _faceSize = 0;
-        } else {
-            //  Quad sub-faces -- use int sqrt for udim to preserve accuracy:
-            _type = QUAD_SUBFACES;
-            _uDim = (faceSize < 10) ?
-                    (unsigned char)(2 + (faceSize > 4)) :
-                    (unsigned char)(1 + (int) std::sqrt((float)(faceSize - 1)));
-        }
-    }
-}
-
-//
-//  Simple coordinate queries:
-//
-template <typename REAL>
-void
-Parameterization::GetVertexCoord(int vertex, REAL uv[2]) const {
-
-    switch (GetType()) {
-    case QUAD:
-        uv[0] = (REAL) (vertex && (vertex < 3));
-        uv[1] = (REAL) (vertex > 1);
-        break;
-    case TRI:
-        uv[0] = (REAL) (vertex == 1);
-        uv[1] = (REAL) (vertex == 2);
-        break;
-    case QUAD_SUBFACES:
-        uv[0] = (REAL) (vertex % _uDim);
-        uv[1] = (REAL) (vertex / _uDim);
-        break;
-    default:
-        uv[0] = -1.0f;
-        uv[1] = -1.0f;
-        break;
-    }
-}
-
-template <typename REAL>
-void
-Parameterization::GetEdgeCoord(int edge, REAL t, REAL uv[2]) const {
-
-    switch (GetType()) {
-    case QUAD:
-        switch (edge) {
-        case 0: uv[0] = t;        uv[1] = 0.0f;     break;
-        case 1: uv[0] = 1.0f;     uv[1] = t;        break;
-        case 2: uv[0] = 1.0f - t; uv[1] = 1.0f;     break;
-        case 3: uv[0] = 0.0f;     uv[1] = 1.0f - t; break;
-        }
-        break;
-
-    case TRI:
-        switch (edge) {
-        case 0: uv[0] = t;        uv[1] = 0.0f;     break;
-        case 1: uv[0] = 1.0f - t; uv[1] = t;        break;
-        case 2: uv[0] = 0.0f;     uv[1] = 1.0f - t; break;
-        }
-        break;
-
-    case QUAD_SUBFACES:
-        if (t < 0.5f) {
-            GetVertexCoord(edge, uv);
-            uv[0] += t;
-        } else {
-            GetVertexCoord((edge + 1) % _faceSize, uv);
-            uv[1] += 1.0f - t;
-        }
-        break;
-    default:
-        uv[0] = -1.0f;
-        uv[1] = -1.0f;
-        break;
-    }
-}
-
-template <typename REAL>
-void
-Parameterization::GetCenterCoord(REAL uv[2]) const {
-
-    if (GetType() == TRI) {
-        uv[0] = 1.0f / 3.0f;
-        uv[1] = 1.0f / 3.0f;
-    } else {
-        uv[0] = 0.5f;
-        uv[1] = 0.5f;
-    }
-}
-
-//
-//  Private sub-face coordinate conversion methods used externally:
-//
-template <typename REAL>
-int
-Parameterization::convertCoordToSubFace(bool normalized,
-        REAL const uvCoord[2], REAL subCoord[2]) const {
-
-    assert(HasSubFaces());
-
-    int uTile = (int) uvCoord[0];
-    int vTile = (int) uvCoord[1];
-
-    REAL uFrac = uvCoord[0] - (REAL) uTile;
-    REAL vFrac = uvCoord[1] - (REAL) vTile;
-
-    //  Allow for coords slightly outside the domain of each tile:
-    if (uFrac > 0.75f) {
-        uTile ++;
-        uFrac = uFrac - 1.0f;
-    }
-    if (vFrac > 0.75f) {
-        vTile ++;
-        vFrac = vFrac - 1.0f;
-    }
-
-    //  Be sure this assignment always supports in-place conversion:
-    if (normalized) {
-        subCoord[0] = uFrac * 2.0f;
-        subCoord[1] = vFrac * 2.0f;
-    } else {
-        subCoord[0] = uFrac;
-        subCoord[1] = vFrac;
-    }
-    return _uDim * vTile + uTile;
-}
-
-template <typename REAL>
-void
-Parameterization::convertSubFaceToCoord(bool normalized, int subFace,
-        REAL const subCoord[2], REAL uvCoord[2]) const {
-
-    assert(HasSubFaces());
-
-    int uTile = subFace % _uDim;
-    int vTile = subFace / _uDim;
-
-    //  Be sure this assignment always supports in-place conversion:
-    if (normalized) {
-        uvCoord[0] = (REAL) uTile + subCoord[0] * 0.5f;
-        uvCoord[1] = (REAL) vTile + subCoord[1] * 0.5f;
-    } else {
-        uvCoord[0] = (REAL) uTile + subCoord[0];
-        uvCoord[1] = (REAL) vTile + subCoord[1];
-    }
-}
-
-//
-//  Explicit instantiation of template methods for <REAL>:
-//
-//  Coordinate queries:
-template void
-Parameterization::GetVertexCoord<float>(int, float uv[2]) const;
-template void
-Parameterization::GetEdgeCoord<float>(int, float, float uv[2]) const;
-template void
-Parameterization::GetCenterCoord<float>(float uv[2]) const;
-
-template void
-Parameterization::GetVertexCoord<double>(int, double uv[2]) const;
-template void
-Parameterization::GetEdgeCoord<double>(int, double, double uv[2]) const;
-template void
-Parameterization::GetCenterCoord<double>(double uv[2]) const;
-
-//  Sub-face conversions:
-template int
-Parameterization::convertCoordToSubFace<float>(bool,
-                        float const uvIn[2], float uvOut[2]) const;
-template void
-Parameterization::convertSubFaceToCoord<float>(bool, int,
-                        float const uvIn[2], float uvOut[2]) const;
-
-template int
-Parameterization::convertCoordToSubFace<double>(bool,
-                        double const uvIn[2], double uvOut[2]) const;
-template void
-Parameterization::convertSubFaceToCoord<double>(bool, int,
-                        double const uvIn[2], double uvOut[2]) const;
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/parameterization.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/parameterization.h
deleted file mode 100644
index d2279cbf5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/parameterization.h
+++ /dev/null
@@ -1,247 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_PARAMETERIZATION_H
-#define OPENSUBDIV3_BFR_PARAMETERIZATION_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-///
-/// @brief Simple class defining the 2D parameterization of a face
-///
-/// Parameterization is a simple class that provides information about the
-/// parameterization of a face in a local (u,v) coordinate system. It is
-/// defined by the size of a face (i.e. its number of vertices) and the
-/// subdivision scheme that determines its limit surface.
-///
-/// As an example of how the subdivision scheme is essential in determining
-/// the Parameterization, consider the case of a triangle.  A triangle is
-/// regular for the Loop scheme and so has a very simple parameterization
-/// as a triangular patch. But for the Catmull-Clark scheme, a triangle is
-/// an irregular face that must first be subdivided -- making its limit
-/// surface a piecewise collection of quadrilateral patches.
-///
-class Parameterization {
-public:
-    ///
-    /// @brief Enumerated type for the different kinds of Parameterizations.
-    ///
-    /// The three kinds of parameterizations defined are:  quadrilateral,
-    /// triangle and quadrangulated sub-faces.  This is not intended for
-    /// common use, but is publicly available for situations when it is
-    /// necessary to distinguish:
-    ///
-    enum Type { QUAD,          ///<  Quadrilateral
-                TRI,           ///<  Triangle
-                QUAD_SUBFACES  ///<  Partitioned into quadrilateral sub-faces
-    };
-
-public:
-    //@{
-    /// @name Construction and initialization
-    ///
-    /// Valid construction of a Parameterization is only achieved with
-    /// the non-default constructor. A Parameterization will be invalid
-    /// (and so unusable) if default constructed, or constructed using
-    /// arguments that describe a face that cannot be parameterized.
-    ///
-
-    /// @brief Primary constructor with subdivision scheme and face size
-    Parameterization(Sdc::SchemeType scheme, int faceSize);
-
-    /// @brief Returns true if correctly initialized
-    bool IsValid() const { return (_faceSize > 0); }
-
-    /// @brief Default construction produces an invalid instance
-    Parameterization() : _type(0), _uDim(0), _faceSize(0) { }
-
-    Parameterization(Parameterization const &) = default;
-    Parameterization & operator=(Parameterization const &) = default;
-    ~Parameterization() = default;
-    //@}
-
-    //@{
-    /// @name Simple queries
-    ///
-    /// Simple queries of a valid Parameterization.
-    ///
-
-    /// @brief Returns the type of parameterization assigned
-    Type GetType() const { return (Type) _type; }
-
-    /// @brief Returns the size (number of vertices) of the corresponding face
-    int  GetFaceSize() const { return _faceSize; }
-    //@}
-
-public:
-    //@{
-    /// @name Methods to inspect parametric features
-    ///
-    /// Methods are available to inspect common topological features of a
-    /// Parameterization, i.e. the parametric coordinates corresponding
-    /// to the vertices, edges or center of the face it represents.
-    ///
-    /// Methods for vertices and edges require an index of the desired
-    /// vertex or edge. The edge parameter "t" locally parameterizes the
-    /// edge over [0,1] in a counter-clockwise orientation.
-    ///
-
-    /// @brief Returns the (u,v) coordinate of a given vertex
-    template <typename REAL>
-    void GetVertexCoord(int vertexIndex, REAL uvCoord[2]) const;
-
-    /// @brief Returns the (u,v) coordinate at any point on a given edge
-    template <typename REAL>
-    void GetEdgeCoord(int edgeIndex, REAL t, REAL uvCoord[2]) const;
-
-    /// @brief Returns the (u,v) coordinate for the center of the face
-    template <typename REAL>
-    void GetCenterCoord(REAL uvCoord[2]) const;
-    //@}
-
-public:
-    //@{
-    /// @name Methods to deal with discontinuous parameterizations
-    ///
-    /// Parameterizations that have been partitioned into sub-faces are
-    /// discontinuous and warrant care in order to process them effectively --
-    /// often requiring explicit conversions.
-    ///
-    /// These conversion methods to and from the local coordinates of a
-    /// sub-face are only for use with instances of Parameterization that
-    /// have such sub-faces. Results for input coordinates that are
-    /// significantly outside the domain of the input parameterization are
-    /// undefined.
-    ///
-    /// Note that sub-face coordinates that are normalized correspond to
-    /// coordinates for Ptex faces.
-    ///
-
-    /// @brief Returns if Parameterization has been partitioned into sub-faces
-    bool HasSubFaces() const;
-
-    /// @brief Returns the integer sub-face containing the given (u,v)
-    template <typename REAL>
-    int GetSubFace(REAL const uvCoord[2]) const;
-
-    /// @brief Convert (u,v) to a sub-face (return value) and its local (u,v)
-    ///        coordinate
-    template <typename REAL>
-    int ConvertCoordToSubFace(
-                REAL const uvCoord[2], REAL subFaceCoord[2]) const;
-
-    /// @brief Convert a sub-face and its local (u,v) coordinate to (u,v)
-    template <typename REAL>
-    void ConvertSubFaceToCoord(int subFace,
-                REAL const subFaceCoord[2], REAL uvCoord[2]) const;
-
-    /// @brief Convert (u,v) to a sub-face (return value) and its normalized
-    ///        (u,v) coordinate
-    template <typename REAL>
-    int ConvertCoordToNormalizedSubFace(
-                REAL const uvCoord[2], REAL subFaceCoord[2]) const;
-
-    /// @brief Convert a sub-face and its normalized (u,v) coordinate to (u,v)
-    template <typename REAL>
-    void ConvertNormalizedSubFaceToCoord(int subFace,
-                REAL const subFaceCoord[2], REAL uvCoord[2]) const;
-    //@}
-
-private:
-    template <typename REAL>
-    int convertCoordToSubFace(bool normalized,
-                REAL const uvCoord[2], REAL subFaceCoord[2]) const;
-    template <typename REAL>
-    void convertSubFaceToCoord(bool normalized, int subFace,
-                REAL const subFaceCoord[2], REAL uvCoord[2]) const;
-
-private:
-    unsigned char  _type;
-    unsigned char  _uDim;
-    unsigned short _faceSize;
-};
-
-//
-//  Inline sub-face coordinate conversion methods:
-//
-inline bool
-Parameterization::HasSubFaces() const {
-    return (_type == QUAD_SUBFACES);
-}
-
-template <typename REAL>
-inline int
-Parameterization::GetSubFace(REAL const uvCoord[2]) const {
-
-    if (!HasSubFaces()) return 0;
-
-    int uTile = (int) uvCoord[0];
-    int vTile = (int) uvCoord[1];
-    return (vTile + ((uvCoord[1] - (REAL) vTile) > 0.75f)) * _uDim +
-           (uTile + ((uvCoord[0] - (REAL) uTile) > 0.75f));
-}
-
-//  Conversions to unnormalized sub-face coordinates:
-template <typename REAL>
-inline int
-Parameterization::ConvertCoordToSubFace(
-        REAL const uvCoord[2], REAL subCoord[2]) const {
-    return convertCoordToSubFace<REAL>(false, uvCoord, subCoord);
-}
-template <typename REAL>
-inline void
-Parameterization::ConvertSubFaceToCoord(
-        int subFace, REAL const subCoord[2], REAL uvCoord[2]) const {
-    convertSubFaceToCoord<REAL>(false, subFace, subCoord, uvCoord);
-}
-
-//  Conversions to normalized sub-face coordinates:
-template <typename REAL>
-inline int
-Parameterization::ConvertCoordToNormalizedSubFace(
-        REAL const uvCoord[2], REAL subCoord[2]) const {
-    return convertCoordToSubFace<REAL>(true, uvCoord, subCoord);
-}
-template <typename REAL>
-inline void
-Parameterization::ConvertNormalizedSubFaceToCoord(
-        int subFace, REAL const subCoord[2], REAL uvCoord[2]) const {
-    convertSubFaceToCoord<REAL>(true, subFace, subCoord, uvCoord);
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_PARAMETERIZATION */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTree.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTree.cpp
deleted file mode 100644
index a91e65688..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTree.cpp
+++ /dev/null
@@ -1,503 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/patchTree.h"
-#include "../far/patchBasis.h"
-
-#include <algorithm>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-namespace Bfr {
-
-using Far::PatchDescriptor;
-using Far::PatchParam;
-
-
-//
-//  Avoid warnings comparing floating point values to zero:
-//
-namespace {
-#ifdef __INTEL_COMPILER
-#pragma warning (push)
-#pragma warning disable 1572
-#endif
-
-    template <typename REAL>
-    inline bool isWeightZero(REAL w) { return (w == (REAL)0.0); }
-
-#ifdef __INTEL_COMPILER
-#pragma warning (pop)
-#endif
-}
-
-
-//
-//  Simple inline methods for the PatchTree::TreeNode:
-//
-// sets all the children to point to the patch of given index
-inline void
-PatchTree::TreeNode::SetChildren(int index) {
-
-    for (int i=0; i<4; ++i) {
-        children[i].isSet  = true;
-        children[i].isLeaf = true;
-        children[i].SetIndex(index);
-    }
-}
-
-// sets the child in "quadrant" to point to node or patch of the given index
-inline void
-PatchTree::TreeNode::SetChild(int quadrant, int index, bool isLeaf) {
-
-    assert(!children[quadrant].isSet);
-    children[quadrant].isSet  = true;
-    children[quadrant].isLeaf = isLeaf;
-    children[quadrant].SetIndex(index);
-}
-
-
-//
-//  PatchTree constructor and destructor:
-//
-PatchTree::PatchTree() :
-    _useDoublePrecision(false),
-    _patchesIncludeNonLeaf(false),
-    _patchesAreTriangular(false),
-    _regPatchType(PatchDescriptor::NON_PATCH),
-    _irregPatchType(PatchDescriptor::NON_PATCH),
-    _regPatchSize(0),
-    _irregPatchSize(0),
-    _patchPointStride(0),
-    _numSubFaces(0),
-    _numControlPoints(0),
-    _numRefinedPoints(0),
-    _numSubPatchPoints(0),
-    _numIrregPatches(0),
-    _treeDepth(-1) {
-}
-
-PatchTree::~PatchTree() {
-}
-
-
-//
-//  Class methods supporting access to patches:
-//
-PatchTree::PatchPointArray
-PatchTree::GetSubPatchPoints(int patchIndex) const {
-
-    return PatchPointArray(
-            &_patchPoints[patchIndex * _patchPointStride],
-            _patchParams[patchIndex].IsRegular() ? _regPatchSize
-                                                 : _irregPatchSize);
-}
-
-template <typename REAL>
-int
-PatchTree::EvalSubPatchBasis(int patchIndex, REAL u, REAL v,
-                             REAL wP[], REAL wDu[], REAL wDv[],
-                             REAL wDuu[], REAL wDuv[], REAL wDvv[]) const {
-
-    PatchParam const & param = _patchParams[patchIndex];
-
-    return Far::internal::EvaluatePatchBasis(
-            param.IsRegular() ? _regPatchType : _irregPatchType,
-            param, u, v, wP, wDu, wDv, wDuu, wDuv, wDvv);
-}
-
-template <typename REAL>
-int
-PatchTree::EvalSubPatchStencils(int patchIndex, REAL u, REAL v,
-                                REAL sP[], REAL sDu[], REAL sDv[],
-                                REAL sDuu[], REAL sDuv[], REAL sDvv[]) const{
-
-    //
-    //  If evaluating a regular interior patch at the base level, evaluate
-    //  basis directly into the output stencils:
-    //
-    PatchParam const & param = _patchParams[patchIndex];
-
-    if ((param.GetDepth() == 0) && param.IsRegular() && !param.GetBoundary()) {
-        assert(_regPatchSize == _numControlPoints);
-        return Far::internal::EvaluatePatchBasis(
-                _regPatchType, param, u, v, sP, sDu, sDv, sDuu, sDuv, sDuv);
-    }
-
-    //  Invoke according to precision of the internal stencil matrix:
-    if (_useDoublePrecision) {
-        return evalSubPatchStencils<double>(patchIndex, u, v,
-                                            sP, sDu, sDv, sDuu, sDuv, sDvv);
-    } else {
-        return evalSubPatchStencils<float>(patchIndex, u, v,
-                                           sP, sDu, sDv, sDuu, sDuv, sDvv);
-    }
-}
-
-namespace {
-    template <typename REAL_SRC, typename REAL_DST>
-    void addToArray(REAL_DST * dst, int n, REAL_DST w, REAL_SRC const * src) {
-
-        if (isWeightZero(w)) return;
-
-        //  WIP - we can guarantee these vectors are aligned (in future),
-        //        so anything here to make use of SSE/AVX will be worth it
-        //      - prefer something portable to ensure auto-vectorization
-        //      - we can also pad the matrix so "n" is a multiple of 4...
-        //      - note will need to specialize when cast required
-
-        for (int i = 0; i < n; ++i) {
-            dst[i] += (REAL_DST) (w * src[i]);
-        }
-    }
-}
-
-template <typename REAL_MATRIX, typename REAL>
-int
-PatchTree::evalSubPatchStencils(int patchIndex, REAL u, REAL v,
-                                REAL sP[], REAL sDu[], REAL sDv[],
-                                REAL sDuu[], REAL sDuv[], REAL sDvv[]) const{
-
-    PatchParam const & param = _patchParams[patchIndex];
-
-    //
-    //  Basis weights must be evaluated into local arrays and transformed
-    //  into stencil weights (in terms of the base level control points
-    //  rather than the patch's control points):
-    //
-    REAL wDuBuffer[20],  wDvBuffer[20];
-    REAL wDuuBuffer[20], wDuvBuffer[20], wDvvBuffer[20];
-
-    REAL   wP[20];
-    REAL * wDu  = 0;
-    REAL * wDv  = 0;
-    REAL * wDuu = 0;
-    REAL * wDuv = 0;
-    REAL * wDvv = 0;
-
-    bool d1 = sDu  && sDv;
-    if (d1) {
-        wDu = wDuBuffer;
-        wDv = wDvBuffer;
-    }
-
-    bool d2 = d1 && sDuu && sDuv && sDvv;
-    if (d2) {
-        wDuu = wDuuBuffer;
-        wDuv = wDuvBuffer;
-        wDvv = wDvvBuffer;
-    }
-
-    Far::internal::EvaluatePatchBasis(
-            param.IsRegular() ? _regPatchType : _irregPatchType,
-            param, u, v, wP, wDu, wDv, wDuu, wDuv, wDvv);
-
-    PatchPointArray patchPoints = GetSubPatchPoints(patchIndex);
-
-    //
-    //  Clear and accumulate the stencil weights for the contribution of
-    //  each point of the patch:
-    //
-    std::memset(sP, 0, sizeof(REAL) * _numControlPoints);
-    if (d1) {
-        std::memset(sDu, 0, sizeof(REAL) * _numControlPoints);
-        std::memset(sDv, 0, sizeof(REAL) * _numControlPoints);
-    }
-    if (d2) {
-        std::memset(sDuu, 0, sizeof(REAL) * _numControlPoints);
-        std::memset(sDuv, 0, sizeof(REAL) * _numControlPoints);
-        std::memset(sDvv, 0, sizeof(REAL) * _numControlPoints);
-    }
-
-    for (int i = 0; i < patchPoints.size(); ++i) {
-        int pIndex = patchPoints[i];
-        if (pIndex < _numControlPoints) {
-            sP[pIndex] += wP [i];
-            if (d1) {
-                sDu[pIndex] += wDu[i];
-                sDv[pIndex] += wDv[i];
-            }
-            if (d2) {
-                sDuu[pIndex] += wDuu[i];
-                sDuv[pIndex] += wDuv[i];
-                sDvv[pIndex] += wDvv[i];
-            }
-        } else {
-            std::vector<REAL_MATRIX> const & pStencilMtx =
-                getStencilMatrix<REAL_MATRIX>();
-            assert(!pStencilMtx.empty());
-
-            REAL_MATRIX const * pStencilRow =
-                &pStencilMtx[(pIndex - _numControlPoints) * _numControlPoints];
-
-            addToArray(sP, _numControlPoints, wP[i], pStencilRow);
-            if (d1) {
-                addToArray(sDu, _numControlPoints, wDu[i], pStencilRow);
-                addToArray(sDv, _numControlPoints, wDv[i], pStencilRow);
-            }
-            if (d2) {
-                addToArray(sDuu, _numControlPoints, wDuu[i], pStencilRow);
-                addToArray(sDuv, _numControlPoints, wDuv[i], pStencilRow);
-                addToArray(sDvv, _numControlPoints, wDvv[i], pStencilRow);
-            }
-        }
-    }
-    return _numControlPoints;
-}
-
-//
-//  Local functions and class methods supporting tree searches and construction:
-//
-namespace {
-    template <typename T>
-    inline int
-    transformUVToQuadQuadrant(T const & median, T & u, T & v) {
-
-        int uHalf = (u >= median);
-        if (uHalf) u -= median;
-
-        int vHalf = (v >= median);
-        if (vHalf) v -= median;
-
-        return (vHalf << 1) | uHalf;
-    }
-
-    template <typename T>
-    int inline
-    transformUVToTriQuadrant(T const & median, T & u, T & v, bool & rotated) {
-
-        if (!rotated) {
-            if (u >= median) {
-                u -= median;
-                return 1;
-            }
-            if (v >= median) {
-                v -= median;
-                return 2;
-            }
-            if ((u + v) >= median) {
-                rotated = true;
-                return 3;
-            }
-            return 0;
-        } else {
-            if (u < median) {
-                v -= median;
-                return 1;
-            }
-            if (v < median) {
-                u -= median;
-                return 2;
-            }
-            u -= median;
-            v -= median;
-            if ((u + v) < median) {
-                rotated = true;
-                return 3;
-            }
-            return 0;
-        }
-    }
-} // end namespace
-
-inline PatchTree::TreeNode *
-PatchTree::assignLeafOrChildNode(TreeNode * node,
-        bool isLeaf, int quadrant, int patchIndex) {
-
-    //  This is getting far enough away from PatchMap's original
-    //  structure and implementation that it warrants a face lift...
-
-    if (!node->children[quadrant].isSet) {
-        if (isLeaf) {
-            node->SetChild(quadrant, patchIndex, true);
-            return node;
-        } else {
-            int newNodeIndex = (int)_treeNodes.size();
-            _treeNodes.push_back(TreeNode());
-            node->SetChild(quadrant, newNodeIndex, false);
-            return &_treeNodes[newNodeIndex];
-        }
-    }
-
-    if (isLeaf || node->children[quadrant].isLeaf) {
-        //  Need to replace the leaf index with new node and index:
-        int newNodeIndex = (int)_treeNodes.size();
-        _treeNodes.push_back(TreeNode());
-        TreeNode * newNode = &_treeNodes[newNodeIndex];
-
-        //  Move existing patch index from child to new child node:
-        newNode->patchIndex = node->children[quadrant].index;
-
-        node->children[quadrant].SetIndex(newNodeIndex);
-        node->children[quadrant].isLeaf = false;
-        if (isLeaf) {
-            newNode->SetChild(quadrant, patchIndex, true);
-        }
-        return newNode;
-    } else {
-        //  Simply return the existing interior node:
-        return &_treeNodes[node->children[quadrant].index];
-    }
-}
-
-void
-PatchTree::buildQuadtree() {
-
-    int numPatches = (int) _patchParams.size();
-
-    _treeNodes.reserve(numPatches);
-    _treeNodes.resize(_numSubFaces ? _numSubFaces : 1);
-    _treeDepth = 0;
-
-    for (int patchIndex = 0; patchIndex < numPatches; ++patchIndex) {
-
-        PatchParam const & param = _patchParams[patchIndex];
-
-        int depth     = param.GetDepth();
-        int rootDepth = param.NonQuadRoot();
-        int subFace   = param.GetFaceId();
-        assert((subFace == 0) || (subFace < _numSubFaces));
-
-        TreeNode * node = &_treeNodes[subFace];
-
-        _treeDepth = std::max(depth, _treeDepth);
-
-        if (depth == rootDepth) {
-            node->patchIndex = patchIndex;
-            continue;
-        }
-            
-        if (!_patchesAreTriangular) {
-            //  Use the UV bits of the PatchParam directly for quad patches:
-            int u = param.GetU();
-            int v = param.GetV();
-
-            for (int j = rootDepth + 1; j <= depth; ++j) {
-                int uBit = (u >> (depth - j)) & 1;
-                int vBit = (v >> (depth - j)) & 1;
-
-                int quadrant = (vBit << 1) | uBit;
-
-                node = assignLeafOrChildNode(node, (j == depth), quadrant,
-                                             patchIndex);
-            }
-        } else {
-            //  Use an interior UV point of triangles to identify quadrants:
-            double u = 0.25f;
-            double v = 0.25f;
-            param.UnnormalizeTriangle(u, v);
-
-            double median = 0.5f;
-            bool triRotated = false;
-
-            for (int j = rootDepth + 1; j <= depth; ++j, median *= 0.5f) {
-                int quadrant = transformUVToTriQuadrant(median, u, v,
-                                                        triRotated);
-
-                node = assignLeafOrChildNode(node, (j == depth), quadrant,
-                                             patchIndex);
-            }
-        }
-    }
-}
-
-int
-PatchTree::searchQuadtree(double u, double v,
-        int subFace, int searchDepth) const {
-
-    //
-    //  These details warrant closer inspection and possible tweaking
-    //  since non-leaf patches were optionally added to the tree...
-    //
-
-    //
-    //  Identify the root patch and make a quick exit when seeking it.  If
-    //  there is no patch at level 0 but subpatches present (possible e.g.
-    //  if adjacent to an irregular face) force the search to level 1:
-    //
-    TreeNode const * node = &_treeNodes[subFace];
-
-    if (_treeDepth == 0) {
-        assert(node->patchIndex >= 0);
-        return node->patchIndex;
-    }
-
-    int maxDepth = ((searchDepth >= 0) && _patchesIncludeNonLeaf) ? searchDepth
-                                                                  : _treeDepth;
-    if (maxDepth == (_numSubFaces > 0)) {
-        if (node->patchIndex >= 0) {
-            return node->patchIndex;
-        }
-        maxDepth = 1;
-    }
-
-    //
-    //  Search the tree for the sub-patch containing the given (u,v)
-    //
-    double median = 0.5f;
-    bool triRotated = false;
-
-    for (int depth = 1; depth <= maxDepth; ++depth, median *= 0.5f) {
-
-        int quadrant = _patchesAreTriangular
-                     ? transformUVToTriQuadrant(median, u, v, triRotated)
-                     : transformUVToQuadQuadrant(median, u, v);
-
-        //  Identify child patch if leaf, otherwise child node:
-        if (node->children[quadrant].isLeaf) {
-            return node->children[quadrant].index;
-        } else if (node->children[quadrant].isSet) {
-            node = &_treeNodes[node->children[quadrant].index];
-        }
-    }
-    assert(node->patchIndex >= 0);
-    return node->patchIndex;
-}
-
-//
-//  Explicit instantiation for methods supporting float and double:
-//
-template int PatchTree::EvalSubPatchBasis<float>(int patchIndex,
-                float u, float v,
-                float wP[], float wDu[], float wDv[],
-                float wDuu[], float wDuv[], float wDvv[]) const;
-template int PatchTree::EvalSubPatchStencils<float>(int patchIndex,
-                float u, float v,
-                float sP[], float sDu[], float sDv[],
-                float sDuu[], float sDuv[], float sDvv[]) const;
-
-template int PatchTree::EvalSubPatchBasis<double>(int patchIndex,
-                double u, double v,
-                double wP[], double wDu[], double wDv[],
-                double wDuu[], double wDuv[], double wDvv[]) const;
-template int PatchTree::EvalSubPatchStencils<double>(int patchIndex,
-                double u, double v,
-                double sP[], double sDu[], double sDv[],
-                double sDuu[], double sDuv[], double sDvv[]) const;
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTree.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTree.h
deleted file mode 100644
index 91bbcfbd9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTree.h
+++ /dev/null
@@ -1,251 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_PATCH_TREE_H
-#define OPENSUBDIV3_BFR_PATCH_TREE_H
-
-#include "../version.h"
-
-#include "../far/patchDescriptor.h"
-#include "../far/patchParam.h"
-#include "../vtr/array.h"
-
-#include <vector>
-#include <cstring>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  A PatchTree is a hierarchical collection of parametric patches that
-//  form a piecewise representation of the limit surface for a single face
-//  of a mesh.  Using the patch representations from Far, it combines
-//  stripped down versions of the PatchTable and PatchMap from Far and a
-//  raw representation of stencils into a more compact representation
-//  suited to evaluating a single face. These are constructed based on
-//  adaptive refinement of a single face of a Far::TopologyRefiner.
-//
-//  As the internal representation for the limit surface of a face with
-//  irregular topology, the PatchTree is not publicly exposed. As is the
-//  case with other internal Bfr classes whose headers are not exported,
-//  it is not further protected by the "internal" namespace.
-//
-//  PatchTree was initially developed as an internal class for Far, so
-//  some comments may still reflect that origin.
-//
-//  PatchTree also includes functionality beyond what is needed for Bfr
-//  for potential future use. Most notable is the ability for the tree
-//  to store a patch at interior nodes -- in addition to the leaf nodes.
-//  This allows the depth of evaluation to be varied, which takes place
-//  when searching a patch from the tree (specifying a maximum depth for
-//  the search). Construction options allow this functionality to be
-//  selectively enabled/disabled, and Bfr currently disables it.
-//
-class PatchTree {
-public:
-    //  Constructors are protected
-    ~PatchTree();
-
-    //  Simple public accessors:
-    int GetNumControlPoints() const  { return _numControlPoints; }
-    int GetNumSubPatchPoints() const { return _numSubPatchPoints; }
-    int GetNumPointsTotal() const    { return _numControlPoints +
-                                              _numSubPatchPoints; }
-
-    //  These queries may not be necessary...
-    int GetDepth() const      { return _treeDepth; }
-    int GetNumPatches() const { return (int)_patchParams.size(); }
-
-    //  Methods to access stencils to compute patch points:
-    template <typename REAL>
-    REAL const * GetStencilMatrix() const;
-
-    bool UsesDoublePrecision() const { return _useDoublePrecision; }
-
-    //  Methods supporting evaluation:
-    int HasSubFaces() const    { return _numSubFaces > 0; }
-    int GetNumSubFaces() const { return _numSubFaces; }
-
-    int FindSubPatch(double u, double v, int subFace=0, int maxDep=-1) const;
-
-    typedef Vtr::ConstArray<int> PatchPointArray;
-    PatchPointArray GetSubPatchPoints(int subPatch) const;
-    Far::PatchParam GetSubPatchParam( int subPatch) const;
-
-    //  Main evaluation methods - basis weights or limit stencils:
-    template <typename REAL>
-    int EvalSubPatchBasis(int subPatch, REAL u, REAL v, REAL w[],
-                          REAL wDu[],  REAL wDv[],
-                          REAL wDuu[], REAL wDuv[], REAL wDvv[]) const;
-
-    template <typename REAL>
-    int EvalSubPatchStencils(int subPatch, REAL u, REAL v, REAL s[],
-                             REAL sDu[],  REAL sDv[],
-                             REAL sDuu[], REAL sDuv[], REAL sDvv[]) const;
-
-protected:
-    PatchTree();
-    friend class PatchTreeBuilder;
-
-    //
-    //  Internal utilities to support the stencil matrix of variable precision
-    //
-    template <typename REAL> std::vector<REAL> const & getStencilMatrix() const;
-    template <typename REAL> std::vector<REAL>       & getStencilMatrix();
-
-    template <typename REAL_MATRIX, typename REAL>
-    int evalSubPatchStencils(int subPatch, REAL u, REAL v, REAL s[],
-                             REAL sDu[],  REAL sDv[],
-                             REAL sDuu[], REAL sDuv[], REAL sDvv[]) const;
-
-protected:
-    //  Internal quad-tree node type and assembly and search methods:
-    struct TreeNode {
-        struct Child {
-            unsigned int isSet  :  1;
-            unsigned int isLeaf :  1;
-            unsigned int index  : 28;
-
-            void SetIndex(int indexArg) { index = indexArg & 0xfffffff; }
-        };
-
-        TreeNode() : patchIndex(-1) {
-            std::memset(children, 0, sizeof(children));
-        }
-
-        void SetChildren(int index);
-        void SetChild(int quadrant, int index, bool isLeaf);
-
-        int   patchIndex;
-        Child children[4];
-    };
-
-    int searchQuadtree(double u, double v, int subFace=0, int depth=-1) const;
-    void buildQuadtree();
-
-    TreeNode * assignLeafOrChildNode(TreeNode * node,
-                                     bool isLeaf, int quadrant, int index);
-
-private:
-    //  Private members:
-    typedef Far::PatchDescriptor::Type PatchType;
-
-    //  Simple configuration members:
-    unsigned int _useDoublePrecision    : 1;
-    unsigned int _patchesIncludeNonLeaf : 1;
-    unsigned int _patchesAreTriangular  : 1;
-
-    PatchType _regPatchType;
-    PatchType _irregPatchType;
-    int       _regPatchSize;
-    int       _irregPatchSize;
-    int       _patchPointStride;
-
-    //  Simple topology inventory members:
-    int _numSubFaces;
-    int _numControlPoints;
-    int _numRefinedPoints;
-    int _numSubPatchPoints;
-    int _numIrregPatches;
-
-    //  Vectors for points and PatchParams of all patches:
-    //
-    //  Note we store both regular and irregular patch point indices in the
-    //  same vector (using a common stride for each patch) and the patch type
-    //  determined by the PatchParam -- in the same way that face-varying
-    //  patches are stored in the PatchTable.  Could also be stored in
-    //  separate "patch arrays" or separated in other ways and managed with
-    //  a bit more book-keeping.
-    //
-    std::vector<int>             _patchPoints;
-    std::vector<Far::PatchParam> _patchParams;
-
-    //  The quadtree organizing the patches:
-    std::vector<TreeNode>  _treeNodes;
-    int                    _treeDepth;
-
-    //  Array of stencils for computing patch points from control points
-    //  (single or double to be used as specified on construction):
-    std::vector<float>  _stencilMatrixFloat;
-    std::vector<double> _stencilMatrixDouble;
-};
-
-//
-//  Internal specializations to support the stencil matrix of variable
-//  precision -- const access presumes it is non-empty (and so assert)
-//  while non-const access may be used to populate it.
-//
-template <>
-inline std::vector<float> const &
-PatchTree::getStencilMatrix<float>() const {
-    assert(!_stencilMatrixFloat.empty());
-    return _stencilMatrixFloat;
-}
-template <>
-inline std::vector<double> const &
-PatchTree::getStencilMatrix<double>() const {
-    assert(!_stencilMatrixDouble.empty());
-    return _stencilMatrixDouble;
-}
-
-template <>
-inline std::vector<float> &
-PatchTree::getStencilMatrix<float>() {
-    return _stencilMatrixFloat;
-}
-template <>
-inline std::vector<double> &
-PatchTree::getStencilMatrix<double>() {
-    return _stencilMatrixDouble;
-}
-
-//
-//  Inline methods:
-//
-inline Far::PatchParam
-PatchTree::GetSubPatchParam(int subPatch) const {
-    return _patchParams[subPatch];
-}
-
-inline int
-PatchTree::FindSubPatch(double u, double v, int subFace, int maxDep) const {
-    return searchQuadtree(u, v, subFace, maxDep);
-}
-
-template <typename REAL>
-inline REAL const *
-PatchTree::GetStencilMatrix() const {
-    return &getStencilMatrix<REAL>()[0];
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_PATCH_TREE */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTreeBuilder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTreeBuilder.cpp
deleted file mode 100644
index e49500fce..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTreeBuilder.cpp
+++ /dev/null
@@ -1,599 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/patchTreeBuilder.h"
-#include "../far/primvarRefiner.h"
-#include "../far/topologyRefiner.h"
-#include "../far/topologyDescriptor.h"
-#include "../far/patchBuilder.h"
-#include "../far/sparseMatrix.h"
-#include "../far/ptexIndices.h"
-#include "../vtr/stackBuffer.h"
-
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-namespace Bfr {
-
-using Vtr::internal::Level;
-using Vtr::internal::StackBuffer;
-
-using Far::TopologyRefiner;
-using Far::Index;
-using Far::ConstIndexArray;
-using Far::SparseMatrix;
-using Far::PatchBuilder;
-using Far::PatchDescriptor;
-using Far::PatchParam;
-
-//
-//  Construction initializes some of the main components of the
-//  build process (e.g. the Far::PatchBuilder) but defers most of
-//  the work to other methods:
-//
-PatchTreeBuilder::PatchTreeBuilder(TopologyRefiner & faceRefiner,
-                                   Options const & options) :
-    _patchTree(new PatchTree),
-    _faceRefiner(faceRefiner),
-    _faceAtRoot(0),
-    _patchBuilder(0) {
-
-    //
-    //  Adaptive refinement in Far requires smooth level <= sharp level,
-    //  with the sharp level taking precedence.  And if attempting to
-    //  generate patches at the base level, force at least one level of
-    //  refinement when necessary:
-    //
-    int adaptiveLevelPrimary = options.maxPatchDepthSharp;
-
-    int adaptiveLevelSecondary = options.maxPatchDepthSmooth;
-    if (adaptiveLevelSecondary > adaptiveLevelPrimary) {
-        adaptiveLevelSecondary = adaptiveLevelPrimary;
-    }
-
-    //  If primary is 0, so is secondary -- see if level 1 required:
-    if (adaptiveLevelSecondary == 0) {
-        if (rootFaceNeedsRefinement()) {
-            adaptiveLevelPrimary   = std::max(1, adaptiveLevelPrimary);
-            adaptiveLevelSecondary = 1;
-        }
-    }
-
-    //
-    //  Apply adaptive refinement to a local refiner for this face:
-    //
-    TopologyRefiner::AdaptiveOptions adaptiveOptions(adaptiveLevelPrimary);
-
-    adaptiveOptions.SetSecondaryLevel(adaptiveLevelSecondary);
-
-    adaptiveOptions.useInfSharpPatch     = true;
-    adaptiveOptions.useSingleCreasePatch = false;
-    adaptiveOptions.considerFVarChannels = false;
-
-    ConstIndexArray baseFaceArray(&_faceAtRoot, 1);
-
-    _faceRefiner.RefineAdaptive(adaptiveOptions, baseFaceArray);
-
-    //
-    //  Determine offsets per level (we could eventually include local
-    //  points in the levels in which the patch occurs)
-    //
-    int numLevels = _faceRefiner.GetNumLevels();
-    _levelOffsets.resize(1 + numLevels);
-    _levelOffsets[0] = 0;
-    for (int i = 0; i < numLevels; ++i) {
-        _levelOffsets[1 + i] = _levelOffsets[i]
-                             + _faceRefiner.GetLevel(i).GetNumVertices();
-    }
-
-    //
-    //  Create a PatchBuilder for this refiner:
-    //
-    PatchBuilder::BasisType patchBuilderIrregularBasis;
-    if (options.irregularBasis == Options::REGULAR) {
-        patchBuilderIrregularBasis = PatchBuilder::BASIS_REGULAR;
-    } else if (options.irregularBasis == Options::LINEAR) {
-        patchBuilderIrregularBasis = PatchBuilder::BASIS_LINEAR;
-    } else {
-        patchBuilderIrregularBasis = PatchBuilder::BASIS_GREGORY;
-    }
-
-    PatchBuilder::Options patchOptions;
-    patchOptions.regBasisType                = PatchBuilder::BASIS_REGULAR;
-    patchOptions.irregBasisType              = patchBuilderIrregularBasis;
-    patchOptions.approxInfSharpWithSmooth    = false;
-    patchOptions.approxSmoothCornerWithSharp = false;
-    patchOptions.fillMissingBoundaryPoints   = true;
-
-    _patchBuilder = PatchBuilder::Create(faceRefiner, patchOptions);
-
-    //
-    //  Initialize general PatchTree members relating to patch topology:
-    //
-    Vtr::internal::Level const & baseLevel = _faceRefiner.getLevel(0);
-
-    int thisFaceSize = baseLevel.getFaceVertices(_faceAtRoot).size();
-    int regFaceSize  = _patchBuilder->GetRegularFaceSize();
-
-    //  Configuration:
-    _patchTree->_useDoublePrecision = options.useDoublePrecision;
-
-    _patchTree->_patchesIncludeNonLeaf = options.includeInteriorPatches;
-    _patchTree->_patchesAreTriangular  = (regFaceSize == 3);
-
-    _patchTree->_regPatchType   = _patchBuilder->GetRegularPatchType();
-    _patchTree->_irregPatchType = _patchBuilder->GetIrregularPatchType();
-
-    _patchTree->_regPatchSize =
-        PatchDescriptor(_patchTree->_regPatchType).GetNumControlVertices();
-    _patchTree->_irregPatchSize =
-        PatchDescriptor(_patchTree->_irregPatchType).GetNumControlVertices();
-    _patchTree->_patchPointStride =
-        std::max(_patchTree->_regPatchSize, _patchTree->_irregPatchSize);
-
-    //  Topology:
-    _patchTree->_numSubFaces = (thisFaceSize == regFaceSize) ? 0 : thisFaceSize;
-
-    _patchTree->_numControlPoints  = _faceRefiner.GetLevel(0).GetNumVertices();
-    _patchTree->_numRefinedPoints  = _faceRefiner.GetNumVerticesTotal()
-                                   - _patchTree->_numControlPoints;
-    _patchTree->_numSubPatchPoints = _patchTree->_numRefinedPoints;
-}
-
-PatchTreeBuilder::~PatchTreeBuilder() {
-    delete _patchBuilder;
-}
-
-const PatchTree *
-PatchTreeBuilder::Build() {
-
-    identifyPatches();
-    initializePatches();
-    if (_patchTree->_useDoublePrecision) {
-        initializeStencilMatrix<double>();
-    } else {
-        initializeStencilMatrix<float>();
-    }
-    initializeQuadTree();
-
-    return _patchTree;
-}
-
-bool
-PatchTreeBuilder::rootFaceNeedsRefinement() const {
-
-    //
-    //  The Far::PatchBuilder cannot construct a single patch from a face
-    //  in the base level under the following circumstances:
-    //
-    //      - the face is or is adjacent to an irregular face (non-quad)
-    //      - the face contains an inf-sharp dart vertex
-    //      - the face contains an interior val-2 vertex
-    //      - the face contains an interior val-3 vertex adj to a tri
-    //
-    //  All but the first are subject to additional conditions (e.g.
-    //  whether the irregular feature is isolated or not) but until those
-    //  conditions are clear, such features will trigger refinement.
-    //
-    int           baseFace  = _faceAtRoot;
-    Level const & baseLevel = _faceRefiner.getLevel(0);
-
-    Level::VTag const & fTags  = baseLevel.getFaceCompositeVTag(baseFace);
-    ConstIndexArray     fVerts = baseLevel.getFaceVertices(baseFace);
-
-    //
-    //  Vertices incident non-quads in any way are easily detected:
-    //
-    if (fTags._incidIrregFace) return true;
-
-    //
-    //  A dart and inf-sharp irregularity may indicate an inf-sharp dart,
-    //  so inspect the face-vertices:
-    //
-    if ((fTags._rule & Sdc::Crease::RULE_DART) && fTags._infIrregular) {
-        for (int i = 0; i < fVerts.size(); ++i) {
-            Level::VTag const & vTag = baseLevel.getVertexTag(fVerts[i]);
-            if ((vTag._rule & Sdc::Crease::RULE_DART) && vTag._infSharpEdges) {
-                //  WIP - inf-sharp dart is fine in some cases (TBD):
-                //          - possibly when the edge-end isolated
-                //      - refine for any occurrence until fully determined
-                return true;
-            }
-        }
-    }
-
-    //
-    //  Interior extra-ordinary vertices of low valence require inspection
-    //  of the face-vertices to test valence and other conditions:
-    //
-    if (fTags._xordinary) {
-        for (int i = 0, fSize = fVerts.size(); i < fSize; ++i) {
-            Level::VTag const & vTag = baseLevel.getVertexTag(fVerts[i]);
-            if (vTag._xordinary && !vTag._boundary && !vTag._infSharpEdges) {
-                int vValence = baseLevel.getVertexFaces(fVerts[i]).size();
-                if ((vValence == 2) || ((vValence == 3) && (fSize == 3))) {
-                    //  WIP - low valence verts are fine in some cases (TBD)
-                    //          - val-2 a problem only when two adjacent
-                    //      - refine for any occurrence until fully determined
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-
-bool
-PatchTreeBuilder::testFaceAncestors() const {
-
-    //  Conditions of overlapping faces that require testing base face:
-    return (_patchBuilder->GetRegularFaceSize() == 3) &&
-           (_faceRefiner.getLevel(0).getNumEdges() == 3) &&
-           (_faceRefiner.getLevel(0).getNumFaces() > 1);
-}
-
-bool
-PatchTreeBuilder::faceAncestorIsRoot(int level, int face) const {
-
-    // Move up the hierarchy to the base level:
-    for (int i = level; i > 0; --i) {
-        face = _faceRefiner.getRefinement(i-1).getChildFaceParentFace(face);
-    }
-    return (face == _faceAtRoot);
-}
-
-void
-PatchTreeBuilder::identifyPatches() {
-
-    //
-    //  Take inventory of the patches.  Only one face exists at the base
-    //  level -- the root face.  Check all other levels breadth first:
-    //
-    bool incNonLeaf = _patchTree->_patchesIncludeNonLeaf;
-
-    _patchFaces.clear();
-
-    int numIrregPatches = 0;
-
-    if (_patchBuilder->IsFaceAPatch(0, _faceAtRoot)) {
-        if (incNonLeaf || _patchBuilder->IsFaceALeaf(0, _faceAtRoot)) {
-            bool isRegular = _patchBuilder->IsPatchRegular(0, _faceAtRoot);
-            _patchFaces.push_back(PatchFace(0, _faceAtRoot, isRegular));
-            numIrregPatches += !isRegular;
-        }
-    }
-
-    //  Under rare circumstances, the normally quick test for a patch is
-    //  flawed and includes faces descended from neighboring faces:
-    bool testBaseFace = testFaceAncestors();
-
-    int numLevels = _faceRefiner.GetNumLevels();
-    for (int level = 1; level < numLevels; ++level) {
-        int numFaces = _faceRefiner.getLevel(level).getNumFaces();
-
-        for (int face = 0; face < numFaces; ++face) {
-            if (testBaseFace && !faceAncestorIsRoot(level, face)) continue;
-
-            if (_patchBuilder->IsFaceAPatch(level, face)) {
-                if (incNonLeaf || _patchBuilder->IsFaceALeaf(level, face)) {
-                    bool isRegular = _patchBuilder->IsPatchRegular(level, face);
-                    _patchFaces.push_back(PatchFace(level, face, isRegular));
-                    numIrregPatches += !isRegular;
-                }
-            }
-        }
-    }
-
-    //
-    //  Allocate and populate the arrays of patch data for the identified
-    //  patches:
-    //
-    int numPatches = (int) _patchFaces.size();
-    assert(numPatches);
-
-    _patchTree->_patchPoints.resize(numPatches * _patchTree->_patchPointStride);
-    _patchTree->_patchParams.resize(numPatches);
-
-    _patchTree->_numIrregPatches = numIrregPatches;
-
-    _patchTree->_numSubPatchPoints += numIrregPatches *
-                                      _patchTree->_irregPatchSize;
-}
-
-void
-PatchTreeBuilder::initializePatches() {
-
-    //  Keep track of the growing index of local points in irregular patches:
-    int irregPointIndexBase = _patchTree->_numControlPoints +
-                              _patchTree->_numRefinedPoints;
-
-    Far::PtexIndices ptexIndices(_faceRefiner);
-
-    for (size_t i = 0; i < _patchFaces.size(); ++i) {
-        PatchFace const & pf = _patchFaces[i];
-
-        PatchParam & patchParam = _patchTree->_patchParams[i];
-
-        Index * patchPoints =
-                &_patchTree->_patchPoints[i * _patchTree->_patchPointStride];
-
-        if (pf.isRegular) {
-            //  Determine boundary mask before computing/assigning PatchParam:
-            int boundaryMask =
-                _patchBuilder->GetRegularPatchBoundaryMask(pf.level, pf.face);
-
-            patchParam = _patchBuilder->ComputePatchParam(pf.level, pf.face,
-                    ptexIndices, true, boundaryMask, true);
-
-            //  Gather the points of the patch -- since they are assigned
-            //  directly into the PatchTree's buffer by the PatchBuilder
-            //  here, they must be offset as a post-process:
-            _patchBuilder->GetRegularPatchPoints(pf.level, pf.face,
-                boundaryMask, patchPoints);
-
-            for (int j = 0; j < _patchTree->_regPatchSize; ++j) {
-                patchPoints[j] += _levelOffsets[pf.level];
-            }
-        } else {
-            //  Compute/assign the PatchParam for an irregular patch:
-            patchParam = _patchBuilder->ComputePatchParam(pf.level, pf.face,
-                    ptexIndices, false /*irreg*/, 0 /*mask*/, false);
-
-            //  Assign indices of new/local points for this irregular patch:
-            for (int j = 0; j < _patchTree->_irregPatchSize; ++j) {
-                patchPoints[j] = irregPointIndexBase ++;
-            }
-        }
-    }
-}
-
-//
-//  Some local interpolatable types for combining stencil vectors -- the
-//  rows of the stencil matrix:
-//
-namespace {
-    //
-    //  When accessing a "row" for a control point, the only non-zero
-    //  entry is that at the index, with a value of 1, so just store
-    //  that index so the StencilRows can combine it:
-    //
-    struct ControlRow {
-        ControlRow(int index) : _index(index) { }
-        ControlRow() { }
-
-        ControlRow operator[] (int index) const {
-            return ControlRow(index);
-        }
-
-        //  Members:
-        int _index;
-    };
-
-    //
-    //  A "row" for each stencil is just our typical vector of variable
-    //  size that needs to support [].
-    //
-    //  For the first level, there are no source rows for the control
-    //  points so combine with the proxy ControlRow defined above.  All
-    //  other levels will accumulate StencilRows as weighted combinations
-    //  of other StencilRows.
-    //
-    //  WIP - consider combining StencilRows to exploit SSE/AVX vectorization
-    //      - we can (in future) easily guarantee both are 4-word aligned
-    //      - we can also pad the rows to a multiple of 4
-    //      - prefer writing the combination in a portable way that makes
-    //        use of auto-vectorization
-    //
-    template <typename REAL>
-    struct StencilRow {
-        StencilRow() : _data(0), _size(0) { }
-        StencilRow(REAL * data, int size) :
-                    _data(data), _size(size) { }
-        StencilRow(REAL const * data, int size) :
-                    _data(const_cast<REAL*>(data)), _size(size) { }
-
-        void Clear() {
-            for (int i = 0; i < _size; ++i) {
-                _data[i] = 0.0f;
-            }
-        }
-
-        void AddWithWeight(ControlRow const & src, REAL weight) {
-            assert(src._index >= 0);
-            _data[src._index] += weight;
-        }
-
-        void AddWithWeight(StencilRow const & src, REAL weight) {
-            assert(src._size == _size);
-            //  Weights passed here by PrimvarRefiner should be non-zero
-            //  WIP - see note on potential/future auto-vectorization above
-            for (int i = 0; i < _size; ++i) {
-                _data[i] += weight * src._data[i];
-            }
-        }
-
-        StencilRow operator[](int index) const {
-            return StencilRow(_data + index * _size, _size);
-        }
-
-        //  Members:
-        REAL * _data;
-        int    _size;
-    };
-}
-
-template <typename REAL>
-void
-PatchTreeBuilder::initializeStencilMatrix() {
-
-    if (_patchTree->_numSubPatchPoints == 0) return;
-
-    //
-    //  Allocate and initialize a full matrix of true stencils (i.e.
-    //  factored in terms of the control points):
-    //
-    int numPointStencils = _patchTree->_numRefinedPoints + 
-                          (_patchTree->_numIrregPatches *
-                           _patchTree->_irregPatchSize);
-    int numControlPoints = _patchTree->_numControlPoints;
-
-    std::vector<REAL> & stencilMatrix = _patchTree->getStencilMatrix<REAL>();
-
-    stencilMatrix.resize(numPointStencils*numControlPoints);
-
-    //
-    //  For refined points, initialize successive rows of the stencil matrix
-    //  a level at a time using the PrimvarRefiner to accumulate contributing
-    //  rows:
-    //
-    int numLevels = _faceRefiner.GetNumLevels();
-    if (numLevels > 1) {
-        Far::PrimvarRefinerReal<REAL> primvarRefiner(_faceRefiner);
-
-        StencilRow<REAL> dstRow(&stencilMatrix[0], numControlPoints);
-        primvarRefiner.Interpolate(1, ControlRow(-1), dstRow);
-
-        for (int level = 2; level < numLevels; ++level) {
-            StencilRow<REAL> srcRow = dstRow;
-            dstRow = srcRow[_faceRefiner.getLevel(level-1).getNumVertices()];
-            primvarRefiner.Interpolate(level, srcRow, dstRow);
-        }
-    }
-
-    //
-    //  For irregular patch points, append rows for each irregular patch:
-    //
-    if (_patchTree->_numIrregPatches) {
-        SparseMatrix<REAL> irregConvMatrix;
-        std::vector<Index> irregSourcePoints;
-
-        int stencilIndexBase = _patchTree->_numRefinedPoints;
-
-        for (size_t i = 0; i < _patchFaces.size(); ++i) {
-            if (!_patchFaces[i].isRegular) {
-                getIrregularPatchConversion(_patchFaces[i],
-                        irregConvMatrix, irregSourcePoints);
-
-                appendConversionStencilsToMatrix(stencilIndexBase,
-                        irregConvMatrix,irregSourcePoints);
-
-                stencilIndexBase += _patchTree->_irregPatchSize;
-            }
-        }
-    }
-}
-
-template <typename REAL>
-void
-PatchTreeBuilder::appendConversionStencilsToMatrix(
-        int                        stencilBaseIndex,
-        SparseMatrix<REAL> const & conversionMatrix,
-        std::vector<Index> const & sourcePoints) {
-
-    //
-    //  Each row of the sparse conversion matrix corresponds to a row
-    //  of the stencil matrix -- which will be computed from the weights
-    //  and indices of stencils indicated by the SparseMatrix row:
-    //
-    int numControlPoints = _patchTree->_numControlPoints;
-    int numPatchPoints   = conversionMatrix.GetNumRows();
-
-    std::vector<REAL> & stencilMatrix = _patchTree->getStencilMatrix<REAL>();
-
-    StencilRow<REAL> srcStencils(&stencilMatrix[0], numControlPoints);
-    StencilRow<REAL> dstStencils = srcStencils[stencilBaseIndex];
-
-    for (int i = 0; i < numPatchPoints; ++i) {
-        StencilRow<REAL> dstStencil = dstStencils[i];
-        dstStencil.Clear();
-
-        int  const * rowIndices = &conversionMatrix.GetRowColumns(i)[0];
-        REAL const * rowWeights = &conversionMatrix.GetRowElements(i)[0];
-        int          rowSize    =  conversionMatrix.GetRowSize(i);
-
-        for (int j = 0; j < rowSize; ++j) {
-            REAL srcWeight = rowWeights[j];
-            int  srcIndex  = sourcePoints[rowIndices[j]];
-
-            //  Simply increment single weight if this is a control point
-            if (srcIndex < numControlPoints) {
-                dstStencil._data[srcIndex] += srcWeight;
-            } else {
-                int srcStencilIndex = srcIndex - numControlPoints;
-
-                StencilRow<REAL> srcStencil = srcStencils[srcStencilIndex];
-
-                dstStencil.AddWithWeight(srcStencil, srcWeight);
-            }
-        }
-    }
-}
-
-void
-PatchTreeBuilder::initializeQuadTree() {
-
-    _patchTree->buildQuadtree();
-}
-
-template <typename REAL>
-void
-PatchTreeBuilder::getIrregularPatchConversion(PatchFace const & pf,
-    SparseMatrix<REAL> & conversionMatrix,
-    std::vector<Index> & sourcePoints) {
-
-    //
-    //  The topology of an irregular patch is determined by its four corners:
-    //
-    Level::VSpan cornerSpans[4];
-    _patchBuilder->GetIrregularPatchCornerSpans(pf.level, pf.face, cornerSpans);
-
-    //
-    //  Compute the conversion matrix from refined/source points to the
-    //  set of points local to this patch:
-    //
-    _patchBuilder->GetIrregularPatchConversionMatrix(pf.level, pf.face,
-            cornerSpans, conversionMatrix);
-
-    //
-    //  Identify the refined/source points for the patch and append stencils
-    //  for the local patch points in terms of the source points:
-    //
-    int numSourcePoints = conversionMatrix.GetNumColumns();
-
-    sourcePoints.resize(numSourcePoints);
-
-    _patchBuilder->GetIrregularPatchSourcePoints(pf.level, pf.face,
-                                                 cornerSpans, &sourcePoints[0]);
-
-    int sourceIndexOffset = _levelOffsets[pf.level];
-    for (int i = 0; i < numSourcePoints; ++i) {
-        sourcePoints[i] += sourceIndexOffset;
-    }
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTreeBuilder.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTreeBuilder.h
deleted file mode 100644
index 986dd7b23..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/patchTreeBuilder.h
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_PATCH_TREE_BUILDER_H
-#define OPENSUBDIV3_BFR_PATCH_TREE_BUILDER_H
-
-#include "../version.h"
-
-#include "../bfr/patchTree.h"
-#include "../far/topologyRefiner.h"
-#include "../far/patchBuilder.h"
-#include "../far/sparseMatrix.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-namespace Bfr {
-
-//
-//  The PatchTreeBuilder class assemble a PatchTree from one or more
-//  topological descriptions -- keeping the PatchTree class free from
-//  the dependencies of whatever its topological source may be.
-//
-//  Having been originally conceived as part of Far, the PatchTree is
-//  assembled from a given Far::TopologyRefiner, which is constructed
-//  for a local neighborhood by another class.  Some of the internal
-//  details of PatchTree assembly also include complexity from that
-//  history when a PatchTree could be constructed from any face of any
-//  given TopologyRefiner -- which is no longer the case. The public
-//  now prevents such unsupported flexibility, but internal support
-//  remains.
-//
-class PatchTreeBuilder {
-public:
-    //
-    //  Minimize the number of shape approximating Options here (compared
-    //  to the Far classes):
-    //
-    //  Note that the "interior patches" capability of PatchTree is not
-    //  used in Bfr and so is never enabled. It is left available as a
-    //  reminder of that ability for future use.
-    //
-    struct Options {
-        enum BasisType { REGULAR, GREGORY, LINEAR };
-
-        Options(int depth = 4) : irregularBasis((unsigned char) GREGORY),
-                                 maxPatchDepthSharp((unsigned char) depth),
-                                 maxPatchDepthSmooth(15),
-                                 includeInteriorPatches(false),
-                                 useDoublePrecision(false) { }
-
-        unsigned char irregularBasis;
-        unsigned char maxPatchDepthSharp;
-        unsigned char maxPatchDepthSmooth;
-        unsigned char includeInteriorPatches : 1;
-        unsigned char useDoublePrecision     : 1;
-    };
-
-public:
-    //
-    //  Public interface intended for use by other builders requiring
-    //  PatchTrees -- now reduced essentially to a single method:
-    //
-    PatchTreeBuilder(Far::TopologyRefiner & refiner, Options const & options);
-    ~PatchTreeBuilder();
-
-    const PatchTree * Build();
-
-    PatchTree * GetPatchTree() const { return _patchTree; }
-
-private:
-    //  Internal struct for a patch in the refinement hierarchy:
-    struct PatchFace {
-        PatchFace(int levelArg, int faceArg, bool isReg = true) :
-                face(faceArg), level((short)levelArg), isRegular(isReg) { }
-
-        int   face;
-        short level;
-        short isRegular;
-    };
-
-    //  Internal methods to identify and assemble patches and the tree:
-    bool rootFaceNeedsRefinement() const;
-    bool testFaceAncestors() const;
-    bool faceAncestorIsRoot(int level, int face) const;
-
-    void identifyPatches();
-    void initializePatches();
-    void initializeQuadTree();
-
-    //  Internal methods to assemble the matrix of stencils converting
-    //  points of irregular patches from points in the refined levels:
-    template <typename REAL>
-    void initializeStencilMatrix();
-
-    template <typename REAL>
-    void getIrregularPatchConversion(PatchFace const & patchFace,
-                                     Far::SparseMatrix<REAL> & convMatrix,
-                                     std::vector<Far::Index> & srcPoints);
-
-    template <typename REAL>
-    void appendConversionStencilsToMatrix(int stencilIndexBase,
-                                     Far::SparseMatrix<REAL> const & convMatrix,
-                                     std::vector<Far::Index> const & srcPoints);
-
-private:
-    //  The PatchTree instance being assembled:
-    PatchTree * _patchTree;
-
-    //  Member variables supporting its assembly:
-    Far::TopologyRefiner &    _faceRefiner;
-    Far::Index                _faceAtRoot;
-    std::vector<int>          _levelOffsets;
-    std::vector<PatchFace>    _patchFaces;
-    Far::PatchBuilder *       _patchBuilder;
-};
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_PATCH_TREE_BUILDER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/pointOperations.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/pointOperations.h
deleted file mode 100644
index aec034010..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/pointOperations.h
+++ /dev/null
@@ -1,543 +0,0 @@
-//
-//   Copyright 2022 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_POINT_OPERATIONS_H
-#define OPENSUBDIV3_BFR_POINT_OPERATIONS_H
-
-#include "../version.h"
-
-#include <cstring>
-#include <cassert>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Internal utilities for efficiently dealing with single and multiple
-//  floating point tuples, i.e. "points":
-//
-namespace points {
-
-//
-//  Simple classes for primitive point operations -- to be specialized for
-//  small, fixed sizes via template <int SIZE>.
-//
-//  These class templates with static methods are partially specialized for
-//  SIZE. The copy operation is made a separate class due to its additional
-//  template parameters (different precision for source and destination).
-//  Combining the two can lead to undesired ambiguities with the desired
-//  partial specializations.
-//
-template <typename REAL, int SIZE>
-struct PointBuilder {
-    static void Set(REAL pDst[], REAL w, REAL const pSrc[], int size) {
-        for (int i = 0; i < size; ++i) {
-            pDst[i] = w * pSrc[i];
-        }
-    }
-    static void Add(REAL pDst[], REAL w, REAL const pSrc[], int size) {
-        for (int i = 0; i < size; ++i) {
-            pDst[i] += w * pSrc[i];
-        }
-    }
-};
-template <typename REAL_DST, typename REAL_SRC, int SIZE = 0>
-struct PointCopier {
-    static void Copy(REAL_DST * pDst, REAL_SRC const * pSrc, int size) {
-        for (int i = 0; i < size; ++i) {
-            pDst[i] = (REAL_DST) pSrc[i];
-        }
-    }
-};
-
-//  Specialization for SIZE = 1:
-template <typename REAL>
-struct PointBuilder<REAL, 1> {
-    static void Set(REAL * pDst, REAL w, REAL const * pSrc, int) {
-        pDst[0] = w * pSrc[0];
-    }
-    static void Add(REAL * pDst, REAL w, REAL const * pSrc, int) {
-        pDst[0] += w * pSrc[0];
-    }
-};
-template <typename REAL>
-struct PointCopier<REAL, REAL, 1> {
-    static void Copy(REAL * pDst, REAL const * pSrc, int) {
-        pDst[0] = pSrc[0];
-    }
-};
-
-//  Specialization for SIZE = 2:
-template <typename REAL>
-struct PointBuilder<REAL, 2> {
-    static void Set(REAL * pDst, REAL w, REAL const * pSrc, int) {
-        pDst[0] = w * pSrc[0];
-        pDst[1] = w * pSrc[1];
-    }
-    static void Add(REAL * pDst, REAL w, REAL const * pSrc, int) {
-        pDst[0] += w * pSrc[0];
-        pDst[1] += w * pSrc[1];
-    }
-};
-template <typename REAL>
-struct PointCopier<REAL, REAL, 2> {
-    static void Copy(REAL * pDst, REAL const * pSrc, int) {
-        pDst[0] = pSrc[0];
-        pDst[1] = pSrc[1];
-    }
-};
-
-//  Specialization for SIZE = 3:
-template <typename REAL>
-struct PointBuilder<REAL, 3> {
-    static void Set(REAL * pDst, REAL w, REAL const * pSrc, int) {
-        pDst[0] = w * pSrc[0];
-        pDst[1] = w * pSrc[1];
-        pDst[2] = w * pSrc[2];
-    }
-    static void Add(REAL * pDst, REAL w, REAL const * pSrc, int) {
-        pDst[0] += w * pSrc[0];
-        pDst[1] += w * pSrc[1];
-        pDst[2] += w * pSrc[2];
-    }
-};
-template <typename REAL>
-struct PointCopier<REAL, REAL, 3> {
-    static void Copy(REAL * pDst, REAL const * pSrc, int) {
-        pDst[0] = pSrc[0];
-        pDst[1] = pSrc[1];
-        pDst[2] = pSrc[2];
-    }
-};
-
-//  Specialization for SIZE = 4:
-template <typename REAL>
-struct PointBuilder<REAL, 4> {
-    static void Set(REAL * pDst, REAL w, REAL const * pSrc, int) {
-        pDst[0] = w * pSrc[0];
-        pDst[1] = w * pSrc[1];
-        pDst[2] = w * pSrc[2];
-        pDst[3] = w * pSrc[3];
-    }
-    static void Add(REAL * pDst, REAL w, REAL const * pSrc, int) {
-        pDst[0] += w * pSrc[0];
-        pDst[1] += w * pSrc[1];
-        pDst[2] += w * pSrc[2];
-        pDst[3] += w * pSrc[3];
-    }
-};
-template <typename REAL>
-struct PointCopier<REAL, REAL, 4> {
-    static void Copy(REAL * pDst, REAL const * pSrc, int) {
-        pDst[0] = pSrc[0];
-        pDst[1] = pSrc[1];
-        pDst[2] = pSrc[2];
-        pDst[3] = pSrc[3];
-    }
-};
-
-//  Additional specialization for copy when precision matches:
-template <typename REAL, int SIZE>
-struct PointCopier<REAL, REAL, SIZE> {
-    static void Copy(REAL * pDst, REAL const * pSrc, int size) {
-        std::memcpy(pDst, pSrc, size * sizeof(REAL));
-    }
-};
-
-
-//
-//  Each major operation is encapsulated in a separate class consisting of
-//  the following:
-//
-//      - a struct containing all parameters of the operation
-//      - a single private method with a generic implementing for all SIZEs
-//      - a public method invoking specializations for small SIZEs
-//
-//  Further specializations of the private implementation of each operation
-//  are possible.
-//
-
-//
-//  The Parameters for the operations vary slightly (based on the operation
-//  and potentially varying data destinations) but generally consist of the
-//  following:
-//
-//      - a description of a full set of input points involved, including:
-//          - the data, size and stride of the array of points
-//
-//      - a description of the subset of the input points used, including
-//          - the number and optional indices for each "source" point
-//
-//      - a description of the resulting points, including:
-//          - the number of resulting points
-//          - an array of locations or single location for resulting points
-//          - an array of or consecutive weights for all resulting points
-//
-//  Several operations combining control points for patch evaluation make
-//  use of the same parameters, so these are encapsulated in a common set.
-//  All classes are expected to declare Parameters for their operation --
-//  even if it is simply a typedef for the set of common parameters.
-//
-//  Common set of parameters for operations combining points:
-template <typename REAL>
-struct CommonCombinationParameters {
-    REAL const * pointData;
-    int          pointSize;
-    int          pointStride;
-
-    int const * srcIndices;
-    int         srcCount;
-
-    int                  resultCount;
-    REAL              ** resultArray;
-    REAL const * const * weightArray;
-};
-
-//
-//  Combination of source points into a single result (for use computing
-//  position only, applying single stencils, and other purposes):
-//
-template <typename REAL>
-class Combine1 {
-public:
-    typedef CommonCombinationParameters<REAL> Parameters;
-
-private:
-    template <int SIZE = 0>
-    static void apply(Parameters const & args) {
-        typedef struct PointBuilder<REAL,SIZE> Point;
-
-        int pSize   = args.pointSize;
-        int pStride = args.pointStride;
-
-        REAL const * w = args.weightArray[0];
-        REAL       * p = args.resultArray[0];
-
-        if (args.srcIndices == 0) {
-            REAL const * pSrc = args.pointData;
-            Point::Set(p, w[0], pSrc, pSize);
-
-            for (int i = 1; i < args.srcCount; ++i) {
-                pSrc += pStride;
-                Point::Add(p, w[i], pSrc, pSize);
-            }
-        } else {
-            REAL const * pSrc = args.pointData + pStride * args.srcIndices[0];
-            Point::Set(p, w[0], pSrc, pSize);
-
-            for (int i = 1; i < args.srcCount; ++i) {
-                pSrc = args.pointData + pStride * args.srcIndices[i];
-                Point::Add(p, w[i], pSrc, pSize);
-            }
-        }
-    }
-
-public:
-    static void Apply(Parameters const & parameters) {
-        switch (parameters.pointSize) {
-        case 1:  apply<1>(parameters); break;
-        case 2:  apply<2>(parameters); break;
-        case 3:  apply<3>(parameters); break;
-        case 4:  apply<4>(parameters); break;
-        default: apply<>(parameters); break;
-        }
-    }
-};
-
-//
-//  Combination of source points into three results (for use computing
-//  position and 1st derivatives):
-//
-template <typename REAL>
-class Combine3 {
-public:
-    typedef CommonCombinationParameters<REAL> Parameters;
-
- private:
-    template <int SIZE = 0>
-    static void apply(Parameters const & args) {
-        typedef struct PointBuilder<REAL,SIZE> Point;
-
-        int pSize   = args.pointSize;
-        int pStride = args.pointStride;
-
-        REAL const * const * wArray = args.weightArray;
-        REAL              ** pArray = args.resultArray;
-
-        //
-        //  Apply each successive control point to all derivatives at once,
-        //  rather than computing each derivate independently:
-        //
-        REAL const * pSrc = (args.srcIndices == 0) ? args.pointData :
-                            (args.pointData + pStride * args.srcIndices[0]);
-        Point::Set(pArray[0], wArray[0][0], pSrc, pSize);
-        Point::Set(pArray[1], wArray[1][0], pSrc, pSize);
-        Point::Set(pArray[2], wArray[2][0], pSrc, pSize);
-
-        for (int i = 1; i < args.srcCount; ++i) {
-            pSrc = (args.srcIndices == 0) ? (pSrc + pStride) :
-                   (args.pointData + pStride * args.srcIndices[i]);
-            Point::Add(pArray[0], wArray[0][i], pSrc, pSize);
-            Point::Add(pArray[1], wArray[1][i], pSrc, pSize);
-            Point::Add(pArray[2], wArray[2][i], pSrc, pSize);
-        }
-    }
-
-public:
-    static void Apply(Parameters const & parameters) {
-        switch (parameters.pointSize) {
-        case 1:  apply<1>(parameters); break;
-        case 2:  apply<2>(parameters); break;
-        case 3:  apply<3>(parameters); break;
-        case 4:  apply<4>(parameters); break;
-        default: apply<>(parameters); break;
-        }
-    }
-};
-
-//
-//  Combination of source points into an arbitrary array of results (for
-//  use computing position with all derivatives, i.e. 6 results):
-//
-template <typename REAL>
-class CombineMultiple {
-public:
-    typedef CommonCombinationParameters<REAL> Parameters;
-
-private:
-    template <int SIZE = 0>
-    static void
-    apply(Parameters const & args) {
-        typedef struct PointBuilder<REAL,SIZE> Point;
-
-        int pSize   = args.pointSize;
-        int pStride = args.pointStride;
-
-        REAL const * const * wArray = args.weightArray;
-        REAL              ** pArray = args.resultArray;
-
-        //
-        //  Apply each successive control point to all derivatives at once,
-        //  rather than computing each derivate independently:
-        //
-        REAL const * pSrc = (args.srcIndices == 0) ? args.pointData :
-                            (args.pointData + pStride * args.srcIndices[0]);
-
-        for (int j = 0; j < args.resultCount; ++j) {
-            Point::Set(pArray[j], wArray[j][0], pSrc, pSize);
-        }
-
-        for (int i = 1; i < args.srcCount; ++i) {
-            pSrc = (args.srcIndices == 0) ? (pSrc + pStride) :
-                   (args.pointData + pStride * args.srcIndices[i]);
-
-            for (int j = 0; j < args.resultCount; ++j) {
-                Point::Add(pArray[j], wArray[j][i], pSrc, pSize);
-            }
-        }
-    }
-
-public:
-    static void
-    Apply(Parameters const & parameters) {
-        switch (parameters.pointSize) {
-        case 1:  apply<1>(parameters); break;
-        case 2:  apply<2>(parameters); break;
-        case 3:  apply<3>(parameters); break;
-        case 4:  apply<4>(parameters); break;
-        default: apply<>(parameters); break;
-        }
-    }
-};
-
-//
-//  Combination of a subset of N input points into M resulting points
-//  in consecutive memory locations. The weights for the resulting M
-//  points (N for the input points contributing to each result) are
-//  also stored consecutively:
-//
-template <typename REAL>
-class CombineConsecutive {
-public:
-    struct Parameters {
-        REAL const * pointData;
-        int          pointSize;
-        int          pointStride;
-
-        int srcCount;
-
-        int          resultCount;
-        REAL       * resultData;
-        REAL const * weightData;
-    };
-
-private:
-    template <int SIZE = 0>
-    static void
-    apply(Parameters const & args) {
-        typedef struct PointBuilder<REAL,SIZE> Point;
-
-        REAL const * w = args.weightData;
-        REAL       * p = args.resultData;
-
-        for (int i = 0; i < args.resultCount; ++i) {
-            REAL const * pSrc = args.pointData;
-            Point::Set(p, w[0], pSrc, args.pointSize);
-
-            for (int j = 1; j < args.srcCount; ++j) {
-                pSrc += args.pointStride;
-                Point::Add(p, w[j], pSrc, args.pointSize);
-            }
-
-            p += args.pointStride;
-            w += args.srcCount;
-        }
-    }
-
-public:
-    static void
-    Apply(Parameters const & parameters) {
-        switch (parameters.pointSize) {
-        case 1:  apply<1>(parameters); break;
-        case 2:  apply<2>(parameters); break;
-        case 3:  apply<3>(parameters); break;
-        case 4:  apply<4>(parameters); break;
-        default: apply<>(parameters); break;
-        }
-    }
-};
-
-//
-//  Split the N-sided face formed by the N input control points, i.e.
-//  compute the midpoint of the face and the midpoint of each edge --
-//  to be stored consecutively in the given location for results:
-//
-template <typename REAL>
-class SplitFace {
-public:
-    struct Parameters {
-        REAL const * pointData;
-        int          pointSize;
-        int          pointStride;
-
-        int srcCount;
-
-        REAL * resultData;
-    };
-
-private:
-    template <int SIZE = 0>
-    static void apply(Parameters const & args) {
-        typedef struct PointBuilder<REAL,SIZE> Point;
-
-        int N = args.srcCount;
-        REAL invN = 1.0f / (REAL) N;
-
-        REAL * facePoint = args.resultData;
-        std::memset(facePoint, 0, args.pointSize * sizeof(REAL));
-
-        for (int i = 0; i < N; ++i) {
-            int j = (i < (N - 1)) ? (i + 1) : 0;
-
-            REAL const * pi = args.pointData + args.pointStride * i;
-            REAL const * pj = args.pointData + args.pointStride * j;
-
-            Point::Add(facePoint, invN, pi, args.pointSize);
-
-            REAL * edgePoint = args.resultData + args.pointStride * (1 + i);
-            Point::Set(edgePoint, 0.5f, pi, args.pointSize);
-            Point::Add(edgePoint, 0.5f, pj, args.pointSize);
-        }
-    }
-
-public:
-    static void Apply(Parameters const & parameters) {
-
-        switch (parameters.pointSize) {
-        case 1:  apply<1>(parameters); break;
-        case 2:  apply<2>(parameters); break;
-        case 3:  apply<3>(parameters); break;
-        case 4:  apply<4>(parameters); break;
-        default: apply<>(parameters); break;
-        }
-    }
-};
-
-//
-//  Copy a subset of N input points -- identified by the indices given for
-//  each -- to the resulting location specified:
-//
-template <typename REAL_DST, typename REAL_SRC>
-class CopyConsecutive {
-public:
-    struct Parameters {
-        REAL_SRC const * pointData;
-        int              pointSize;
-        int              pointStride;
-
-        int const * srcIndices;
-        int         srcCount;
-
-        REAL_DST * resultData;
-        int        resultStride;
-    };
-
-private:
-    template <int SIZE = 0>
-    static void apply(Parameters const & args) {
-        typedef struct PointCopier<REAL_DST,REAL_SRC,SIZE> Point;
-
-        for (int i = 0; i < args.srcCount; ++i) {
-            REAL_DST       * pDst = args.resultData + args.resultStride * i;
-            REAL_SRC const * pSrc = args.pointData +
-                                    args.pointStride * args.srcIndices[i];
-
-            Point::Copy(pDst, pSrc, args.pointSize);
-        }
-    }
-
-public:
-    static void Apply(Parameters const & parameters) {
-
-        switch (parameters.pointSize) {
-        case 1:  apply<1>(parameters); break;
-        case 2:  apply<2>(parameters); break;
-        case 3:  apply<3>(parameters); break;
-        case 4:  apply<4>(parameters); break;
-        default: apply<>(parameters); break;
-        }
-    }
-};
-
-} // end namespace points
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_POINT_OPERATIONS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/refinerSurfaceFactory.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/refinerSurfaceFactory.cpp
deleted file mode 100644
index 828c6d59a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/refinerSurfaceFactory.cpp
+++ /dev/null
@@ -1,554 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/refinerSurfaceFactory.h"
-#include "../bfr/vertexDescriptor.h"
-#include "../far/topologyRefiner.h"
-
-#include <map>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-using Far::ConstIndexArray;
-using Far::ConstLocalIndexArray;
-
-
-//
-//  Main constructor and destructor:
-//
-RefinerSurfaceFactoryBase::RefinerSurfaceFactoryBase(
-    Far::TopologyRefiner const & mesh, Options const & factoryOptions) :
-        SurfaceFactory(mesh.GetSchemeType(),
-                       mesh.GetSchemeOptions(),
-                       factoryOptions),
-        _mesh(mesh),
-        _numFaces(mesh.GetLevel(0).GetNumFaces()),
-        _numFVarChannels(mesh.GetNumFVarChannels()) {
-
-    //  Management of internal cache deferred to subclasses
-}
-
-
-//
-//  Inline support method to provide a valid face-varying channel from
-//  a given face-varying ID/handle used in the factory interface:
-//
-inline int
-RefinerSurfaceFactoryBase::getFaceVaryingChannel(FVarID fvarID) const {
-
-    return ((0 <= fvarID) && (fvarID < _numFVarChannels)) ? (int)fvarID : -1;
-}
-
-
-//
-//  Virtual methods from the SurfaceFactoryMeshAdapter interface supporting
-//  Surface construction and initialization:
-//
-//  Simple/trivial face queries:
-//
-bool
-RefinerSurfaceFactoryBase::isFaceHole(Index face) const {
-
-    return _mesh.HasHoles() && _mesh.getLevel(0).isFaceHole(face);
-}
-
-int
-RefinerSurfaceFactoryBase::getFaceSize(Index baseFace) const {
-
-    return _mesh.GetLevel(0).GetFaceVertices(baseFace).size();
-}
-
-//
-//  Specifying vertex or face-varying indices for a face:
-//
-int
-RefinerSurfaceFactoryBase::getFaceVertexIndices(Index baseFace,
-        Index indices[]) const {
-
-    ConstIndexArray fVerts = _mesh.GetLevel(0).GetFaceVertices(baseFace);
-
-    std::memcpy(indices, &fVerts[0], fVerts.size() * sizeof(Index));
-    return fVerts.size();
-}
-
-int
-RefinerSurfaceFactoryBase::getFaceFVarValueIndices(Index baseFace,
-        FVarID fvarID, Index indices[]) const {
-
-    int fvarChannel = getFaceVaryingChannel(fvarID);
-    if (fvarChannel < 0) return 0;
-
-    ConstIndexArray fvarValues =
-            _mesh.GetLevel(0).GetFaceFVarValues(baseFace, fvarChannel);
-
-    std::memcpy(indices, &fvarValues[0], fvarValues.size() * sizeof(Index));
-    return fvarValues.size();
-}
-
-//
-//  Specifying the topology around a face-vertex:
-//
-int
-RefinerSurfaceFactoryBase::populateFaceVertexDescriptor(
-        Index baseFace, int cornerVertex,
-        VertexDescriptor * vertexDescriptor) const {
-
-    VertexDescriptor & vd = *vertexDescriptor;
-
-    //
-    //  Identify the vertex index for the specified corner of the face
-    //  and topology information related to it:
-    //
-    Vtr::internal::Level const & baseLevel = _mesh.getLevel(0);
-
-    Far::Index vIndex = baseLevel.getFaceVertices(baseFace)[cornerVertex];
-
-    ConstIndexArray vFaces = baseLevel.getVertexFaces(vIndex);
-    int             nFaces = vFaces.size();
-
-    Vtr::internal::Level::VTag vTag = baseLevel.getVertexTag(vIndex);
-    bool isManifold = !vTag._nonManifold;
-
-    //
-    //  Initialize, assign and finalize the vertex topology:
-    //
-    //  Note there is no need to check valence or face sizes with any
-    //  max here as TopologyRefiner construction excludes extreme cases.
-    //
-    vd.Initialize(nFaces);
-    {
-        //  Assign ordering and boundary status:
-        vd.SetManifold(isManifold);
-        vd.SetBoundary(vTag._boundary);
-
-        //  Assign face sizes if not all regular:
-        if (vTag._incidIrregFace) {
-            for (int i = 0; i < nFaces; ++i) {
-                vd.SetIncidentFaceSize(i,
-                            baseLevel.getFaceVertices(vFaces[i]).size());
-            }
-        }
-
-        //  Assign vertex sharpness when present:
-        if (vTag._semiSharp || vTag._infSharp) {
-            vd.SetVertexSharpness(
-                    baseLevel.getVertexSharpness(vIndex));
-        }
-
-        //  Assign edge sharpness when present:
-        if (vTag._semiSharpEdges || vTag._infSharpEdges) {
-            if (isManifold) {
-                //  Can use manifold/ordered edge indices here:
-                ConstIndexArray vEdges = baseLevel.getVertexEdges(vIndex);
-
-                for (int i = 0; i < vEdges.size(); ++i) {
-                    vd.SetManifoldEdgeSharpness(i,
-                            baseLevel.getEdgeSharpness(vEdges[i]));
-                }
-            } else {
-                //  Must use face-edges and identify next/prev edges in face:
-                ConstLocalIndexArray vInFace =
-                    baseLevel.getVertexFaceLocalIndices(vIndex);
-
-                for (int i = 0; i < nFaces; ++i) {
-                    ConstIndexArray fEdges = baseLevel.getFaceEdges(vFaces[i]);
-
-                    int eLeading  = vInFace[i];
-                    int eTrailing = (eLeading ? eLeading : fEdges.size()) - 1;
-
-                    vd.SetIncidentFaceEdgeSharpness(i,
-                            baseLevel.getEdgeSharpness(fEdges[eLeading]),
-                            baseLevel.getEdgeSharpness(fEdges[eTrailing]));
-                }
-            }
-        }
-    }
-    vd.Finalize();
-
-    //
-    //  Return the index of the base face around the vertex:
-    //
-    //  Remember that for some non-manifold cases the face may occur
-    //  multiple times around this vertex, so make sure to identify the
-    //  instance that matches the specified corner of the face.
-    //
-    if (isManifold) {
-        return vFaces.FindIndex(baseFace);
-    } else {
-        ConstLocalIndexArray vInFace =
-                baseLevel.getVertexFaceLocalIndices(vIndex);
-        for (int i = 0; i < vFaces.size(); ++i) {
-            if ((vFaces[i] == baseFace) && (vInFace[i] == cornerVertex)) {
-                return i;
-            }
-        }
-        assert("Cannot identify face-vertex around non-manifold vertex." == 0);
-        return -1;
-    }
-}
-
-
-//
-//  Specifying vertex and face-varying indices around a face-vertex --
-//  both virtual methods trivially use a common internal method to get
-//  the indices for a particular vertex Index:
-//
-int
-RefinerSurfaceFactoryBase::getFaceVertexPointIndices(
-        Index baseFace, int cornerVertex,
-        Index indices[], int vtxOrFVarChannel) const {
-
-    Vtr::internal::Level const & baseLevel = _mesh.getLevel(0);
-
-    Far::Index vIndex = baseLevel.getFaceVertices(baseFace)[cornerVertex];
-
-    ConstIndexArray      vFaces  = baseLevel.getVertexFaces(vIndex);
-    ConstLocalIndexArray vInFace = baseLevel.getVertexFaceLocalIndices(vIndex);
-
-    int nIndices = 0;
-    for (int i = 0; i < vFaces.size(); ++i) {
-        ConstIndexArray srcIndices = (vtxOrFVarChannel < 0) ?
-                baseLevel.getFaceVertices(vFaces[i]) :
-                baseLevel.getFaceFVarValues(vFaces[i], vtxOrFVarChannel);
-
-        int srcStart = vInFace[i];
-        int srcCount = srcIndices.size();
-        for (int j = srcStart; j < srcCount; ++j) {
-            indices[nIndices++] = srcIndices[j];
-        }
-        for (int j = 0; j < srcStart; ++j) {
-            indices[nIndices++] = srcIndices[j];
-        }
-    }
-    return nIndices;
-}
-
-int
-RefinerSurfaceFactoryBase::getFaceVertexIncidentFaceVertexIndices(
-        Index baseFace, int cornerVertex,
-        Index indices[]) const {
-
-    return getFaceVertexPointIndices(baseFace, cornerVertex, indices, -1);
-}
-
-int
-RefinerSurfaceFactoryBase::getFaceVertexIncidentFaceFVarValueIndices(
-        Index baseFace, int corner,
-        FVarID fvarID, Index indices[]) const {
-
-    int fvarChannel = getFaceVaryingChannel(fvarID);
-    if (fvarChannel < 0) return 0;
-
-    return getFaceVertexPointIndices(baseFace, corner, indices, fvarChannel);
-}
-
-//
-//  Optional SurfaceFactoryMeshAdapter methods for determining if a face has
-//  purely regular topology, and retrieving its control point indices if so:
-//
-bool
-RefinerSurfaceFactoryBase::getFaceNeighborhoodVertexIndicesIfRegular(
-        Index baseFace, Index vtxIndices[]) const {
-
-    //
-    //  Get the composite tag for the corners of the face and reject some
-    //  of the obvious irregular features first:
-    //
-    Vtr::internal::Level const & baseLevel = _mesh.getLevel(0);
-
-    Vtr::internal::Level::VTag fTag = baseLevel.getFaceCompositeVTag(baseFace);
-
-    if (fTag._xordinary || fTag._nonManifold
-                        || fTag._incidIrregFace
-                        || fTag._semiSharp || fTag._semiSharpEdges
-                        || fTag._infIrregular) {
-        return false;
-    }
-
-    //
-    //  At this point, we have not rejected inf-sharp features, as they
-    //  are intertwined with boundaries -- which may be regular.  Recall
-    //  that both edges and vertices may have been explicitly sharpened
-    //  by application of the boundary interpolation options, so we must
-    //  exclude faces with any inf-sharp features added elsewhere.
-    //
-    //  Recall also that in the case of "boundary none", a face that does
-    //  not have a limit surface will have been tagged as a hole.  So all
-    //  faces here -- and all regular faces in general -- have a limit.
-    //
-    //  To determine regular patches with inf-sharp features, we can first
-    //  trivially reject an interior face if it has any inf-sharp features.
-    //  Otherwise, we have to inspect the vertices of boundary patches:
-    //
-    assert(!baseLevel.isFaceHole(baseFace));
-
-    if (!fTag._boundary) {
-        if (fTag._infSharp || fTag._infSharpEdges) {
-            return false;
-        }
-    } else {
-        ConstIndexArray fVerts = baseLevel.getFaceVertices(baseFace);
-        for (int i = 0; i < fVerts.size(); ++i) {
-            Far::Index vIndex = fVerts[i];
-            Vtr::internal::Level::VTag vTag = baseLevel.getVertexTag(vIndex);
-
-            if (!vTag._boundary) {
-                if (vTag._rule != Sdc::Crease::RULE_SMOOTH) return false;
-            } else if (baseLevel.getVertexFaces(vIndex).size() == 1) {
-                if (vTag._rule != Sdc::Crease::RULE_CORNER) return false;
-            } else {
-                if (vTag._rule != Sdc::Crease::RULE_CREASE) return false;
-            }
-        }
-    }
-
-    //  Only regular cases make it this far -- assign indices if requested:
-    if (vtxIndices) {
-        getFacePatchPointIndices(baseFace, vtxIndices, -1);
-    }
-    return true;
-}
-
-bool
-RefinerSurfaceFactoryBase::getFaceNeighborhoodFVarValueIndicesIfRegular(
-        Index baseFace, FVarID fvarID, Index fvarIndices[]) const {
-
-    int fvarChannel = getFaceVaryingChannel(fvarID);
-    if (fvarChannel < 0) return false;
-
-    //
-    //  This method will only be invoked when the vertex topology is
-    //  regular, so no need to confirm that here.
-    //
-    //  It is also recommended that this method only be used when the
-    //  face-varying topology exactly matches the vertex topology, i.e.
-    //  don't try to return a regular boundary patch that is a subset
-    //  of a regular interior patch, as face-varying interpolation
-    //  rules may affect that boundary patch (making it irregular).
-    //
-    Vtr::internal::Level const & baseLevel = _mesh.getLevel(0);
-
-    bool isRegular = baseLevel.doesFaceFVarTopologyMatch(baseFace, fvarChannel);
-
-    if (isRegular && fvarIndices) {
-        getFacePatchPointIndices(baseFace, fvarIndices, fvarChannel);
-    }
-    return isRegular;
-}
-
-
-//
-//  Supporting functions to extract regular patch points.
-//
-//  The two main functions here load the patch points from faces into
-//  arrays for patches -- knowing that the mesh topology is regular.
-//  Various methods to do all or part if this in different forms exist
-//  in other places in the Far code, but they typically cater to more
-//  general purposes (e.g. including rotations). These are written to
-//  be as fast as possible for the purpose here.
-//
-namespace {
-    //  Local less-verbose typedefs for Far indices and arrays:
-    typedef Vtr::internal::Level Level;
-    typedef Far::Index           Index;
-    typedef ConstIndexArray      IArray;
-    typedef ConstLocalIndexArray LIArray;
-
-    //  Avoid repeated integer modulo N operations:
-    inline int _mod3(int x) { return (x < 3) ? x : (x - 3); }
-    inline int _mod4(int x) { return (x & 3); }
-    inline int _mod6(int x) { return (x < 6) ? x : (x - 6); }
-
-    //
-    //  Retrieval of the 16-point patch for quad schemes:
-    //
-    template <typename POINT>
-    int
-    gatherPatchPoints4(Level const & level, Index face, IArray const & fVerts,
-                       POINT P[], int fvar) {
-
-        static int const pointsPerCorner[4][4] = { {  5,  4,  0,  1 },
-                                                   {  6,  2,  3,  7 },
-                                                   { 10, 11, 15, 14 },
-                                                   {  9, 13, 12,  8 } };
-
-        for (int i = 0; i < 4; ++i) {
-            int const * corner = pointsPerCorner[i];
-
-            int     vIndex  = fVerts[i];
-            IArray  vFaces  = level.getVertexFaces(vIndex);
-            LIArray vInFace = level.getVertexFaceLocalIndices(vIndex);
-
-            if (vFaces.size() == 4) {
-                int iOpposite = _mod4(vFaces.FindIndexIn4Tuple(face) + 2);
-
-                Index  fj = vFaces[iOpposite];
-                int    j  = vInFace[iOpposite];
-                IArray FV = (fvar < 0) ? level.getFaceVertices(fj) :
-                                         level.getFaceFVarValues(fj, fvar);
-
-                P[corner[0]] = FV[j];
-                P[corner[1]] = FV[_mod4(j + 1)];
-                P[corner[2]] = FV[_mod4(j + 2)];
-                P[corner[3]] = FV[_mod4(j + 3)];
-            } else if (vFaces.size() == 1) {
-                Index FVcorner = (fvar < 0) ? vIndex :
-                    level.getFaceFVarValues(vFaces[0], fvar)[vInFace[0]];
-
-                P[corner[0]] = FVcorner;
-                P[corner[1]] = -1;
-                P[corner[2]] = -1;
-                P[corner[3]] = -1;
-            } else if (vFaces[0] == face) {
-                Index  f1 = vFaces[1];
-                int    j1 = vInFace[1];
-                IArray FV = (fvar < 0) ? level.getFaceVertices(f1) :
-                                         level.getFaceFVarValues(f1, fvar);
-
-                P[corner[0]] = FV[j1];
-                P[corner[1]] = FV[_mod4(j1 + 3)];
-                P[corner[2]] = -1;
-                P[corner[3]] = -1;
-            } else {
-                Index  f0 = vFaces[0];
-                int    j0 = vInFace[0];
-                IArray FV = (fvar < 0) ? level.getFaceVertices(f0) :
-                                         level.getFaceFVarValues(f0, fvar);
-
-                P[corner[0]] = FV[j0];
-                P[corner[1]] = -1;
-                P[corner[2]] = -1;
-                P[corner[3]] = FV[_mod4(j0 + 1)];
-            }
-        }
-        return 16;
-    }
-
-    //
-    //  Retrieval of the 12-point patch for triangular schemes:
-    //
-    template <typename POINT>
-    int
-    gatherPatchPoints3(Level const & level, Index face, IArray const & fVerts,
-                       POINT P[], int fvar) {
-
-        static int const pointsPerCorner[3][4] = { {  4,  3,  0,  1 },
-                                                   {  5,  2,  6,  9 },
-                                                   {  8, 11, 10,  7 } };
-
-        for (int i = 0; i < 3; ++i) {
-            int const * corner = pointsPerCorner[i];
-
-            int     vIndex  = fVerts[i];
-            IArray  vFaces  = level.getVertexFaces(vIndex);
-            LIArray vInFace = level.getVertexFaceLocalIndices(vIndex);
-
-            if (vFaces.size() == 6) {
-                int iOpposite = _mod6(vFaces.FindIndex(face) + 3);
-
-                Index  f0  = vFaces[iOpposite];
-                int    j0  = vInFace[iOpposite];
-                IArray FV0 = (fvar < 0) ? level.getFaceVertices(f0) :
-                                          level.getFaceFVarValues(f0, fvar);
-                Index  f1  = vFaces[_mod6(iOpposite + 1)];
-                int    j1  = vInFace[_mod6(iOpposite + 1)];
-                IArray FV1 = (fvar < 0) ? level.getFaceVertices(f1) :
-                                          level.getFaceFVarValues(f1, fvar);
-
-                P[corner[0]] = FV0[j0];
-                P[corner[1]] = FV0[_mod3(j0 + 1)];
-                P[corner[2]] = FV0[_mod3(j0 + 2)];
-                P[corner[3]] = FV1[_mod3(j1 + 2)];
-            } else if (vFaces.size() == 1) {
-                Index FVcorner = (fvar < 0) ? vIndex :
-                    level.getFaceFVarValues(vFaces[0], fvar)[vInFace[0]];
-
-                P[corner[0]] = FVcorner;
-                P[corner[1]] = -1;
-                P[corner[2]] = -1;
-                P[corner[3]] = -1;
-            } else if (vFaces[0] == face) {
-                Index  f2 = vFaces[2];
-                int    j2 = vInFace[2];
-                IArray FV = (fvar < 0) ? level.getFaceVertices(f2) :
-                                         level.getFaceFVarValues(f2, fvar);
-
-                P[corner[0]] = FV[j2];
-                P[corner[1]] = FV[_mod3(j2 + 2)];
-                P[corner[2]] = -1;
-                P[corner[3]] = -1;
-            } else if (vFaces[1] == face) {
-                Index  f0 = vFaces[0];
-                int    j0 = vInFace[0];
-                IArray FV = (fvar < 0) ? level.getFaceVertices(f0) :
-                                         level.getFaceFVarValues(f0, fvar);
-
-                P[corner[0]] = FV[j0];
-                P[corner[1]] = -1;
-                P[corner[2]] = -1;
-                P[corner[3]] = FV[_mod3(j0 + 1)];
-            } else {  //  (vFaces[2] == face)
-                Index  f0 = vFaces[0];
-                int    j0 = vInFace[0];
-                IArray FV = (fvar < 0) ? level.getFaceVertices(f0) :
-                                         level.getFaceFVarValues(f0, fvar);
-
-                P[corner[0]] = FV[j0];
-                P[corner[1]] = -1;
-                P[corner[2]] = FV[_mod3(j0 + 1)];
-                P[corner[3]] = FV[_mod3(j0 + 2)];
-            }
-        }
-        return 12;
-    }
-}
-
-//
-//  Private method to dispatch the above patch point retrieval functions:
-//
-int
-RefinerSurfaceFactoryBase::getFacePatchPointIndices(Index baseFace,
-        Index indices[], int vtxOrFVarChannel) const {
-
-    Vtr::internal::Level const & baseLevel = _mesh.getLevel(0);
-
-    ConstIndexArray baseFaceVerts = baseLevel.getFaceVertices(baseFace);
-
-    if (baseFaceVerts.size() == 4) {
-        return gatherPatchPoints4(baseLevel, baseFace, baseFaceVerts,
-                                  indices, vtxOrFVarChannel);
-    } else {
-        return gatherPatchPoints3(baseLevel, baseFace, baseFaceVerts,
-                                  indices, vtxOrFVarChannel);
-    }
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/refinerSurfaceFactory.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/refinerSurfaceFactory.h
deleted file mode 100644
index 16132661e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/refinerSurfaceFactory.h
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_REFINER_SURFACE_FACTORY_H
-#define OPENSUBDIV3_BFR_REFINER_SURFACE_FACTORY_H
-
-#include "../version.h"
-
-#include "../bfr/surfaceFactory.h"
-#include "../bfr/surfaceFactoryCache.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-    class TopologyRefiner;
-}
-
-namespace Bfr {
-
-///
-/// @brief Intermediate subclass of SurfaceFactory with Far::TopologyRefiner
-///        as the mesh
-///
-/// RefinerSurfaceFactoryBase is an intermediate subclass of SurfaceFactory
-/// using Far::TopologyRefiner as the connected mesh representation.
-///
-/// The SurfaceFactoryMeshAdapter interface for TopologyRefiner is provided
-/// in full, along with some public extensions specific to TopologyRefiner.
-///
-/// Additional caching expectations of SurfaceFactory are NOT specified
-/// here. These are deferred to subclasses to implement different behaviors
-/// of the factory's internal caching. A template for such subclasses is 
-/// additionally provided -- allowing clients desiring a thread-safe cache
-/// to simply declare a subclass for a preferred thread-safe type.
-///
-class RefinerSurfaceFactoryBase : public SurfaceFactory {
-public:
-    //@{
-    /// @name Construction and initialization
-    ///
-    /// Construction and initialization
-    ///
-
-    RefinerSurfaceFactoryBase(Far::TopologyRefiner const & mesh,
-                              Options const & options);
-
-    ~RefinerSurfaceFactoryBase() override = default;
-    //@}
-
-    //@{
-    /// @name Simple queries related to Far::TopologyRefiner
-    ///
-    /// Simple queries related to Far::TopologyRefiner
-    ///
-
-    /// @brief Return the instance of the mesh
-    Far::TopologyRefiner const & GetMesh() const { return _mesh; }
-
-    /// @brief Return the number of faces
-    int GetNumFaces() const { return _numFaces; }
-
-    /// @brief Return the number of face-varying channels
-    int GetNumFVarChannels() const { return _numFVarChannels; }
-    //@}
-
-protected:
-    /// @cond PROTECTED
-    //
-    //  Virtual overrides to satisfy the SurfaceFactoryMeshAdapter interface:
-    //
-    bool isFaceHole( Index faceIndex) const override;
-    int  getFaceSize(Index faceIndex) const override;
-
-    int getFaceVertexIndices(Index faceIndex,
-                        Index vertexIndices[]) const override;
-    int getFaceFVarValueIndices(Index faceIndex,
-                        FVarID fvarID, Index fvarValueIndices[]) const override;
-
-    int populateFaceVertexDescriptor(Index faceIndex, int faceVertex,
-                        VertexDescriptor * vertexDescriptor) const override;
-
-    int getFaceVertexIncidentFaceVertexIndices(
-                        Index faceIndex, int faceVertex,
-                        Index vertexIndices[]) const override;
-    int getFaceVertexIncidentFaceFVarValueIndices(
-                        Index faceIndex, int faceVertex,
-                        FVarID fvarID, Index fvarValueIndices[]) const override;
-
-    //  Optional SurfaceFactoryMeshAdapter overrides for regular patches:
-    bool getFaceNeighborhoodVertexIndicesIfRegular(
-                        Index faceIndex,
-                        Index vertexIndices[]) const override;
-
-    bool getFaceNeighborhoodFVarValueIndicesIfRegular(
-                        Index faceIndex,
-                        FVarID fvarID, Index fvarValueIndices[]) const override;
-    /// @endcond
-
-private:
-    //
-    //  Internal supporting methods:
-    //
-    int getFaceVaryingChannel(FVarID fvarID) const;
-
-    int getFaceVertexPointIndices(Index faceIndex, int faceVertex,
-                                  Index indices[], int vtxOrFVarChannel) const;
-
-    int getFacePatchPointIndices(Index faceIndex,
-                                 Index indices[], int vtxOrFVarChannel) const;
-
-private:
-    //  Additional members for the subclass:
-    Far::TopologyRefiner const & _mesh;
-
-    int _numFaces;
-    int _numFVarChannels;
-};
-
-
-//
-/// @brief Template for concrete subclasses of RefinerSurfaceFactoryBase
-///
-/// This class template is used to declare concrete subclasses of
-/// RefinerSurfaceFactoryBase with the additional support of an internal
-/// cache used by the base class. With an instance of a thread-safe
-/// subclass of SurfaceFactoryCache declared as a member, the resulting
-/// factory will be thread-safe.
-///
-/// @tparam CACHE_TYPE  A subclass of SurfaceFactoryCache
-///
-/// Note a default template parameter uses the base SurfaceFactoryCache
-/// for convenience, but which is not thread-safe.
-///
-template <class CACHE_TYPE = SurfaceFactoryCache>
-class RefinerSurfaceFactory : public RefinerSurfaceFactoryBase {
-public:
-    RefinerSurfaceFactory(Far::TopologyRefiner const & mesh,
-                          Options const & options = Options()) :
-            RefinerSurfaceFactoryBase(mesh, options),
-            _localCache() {
-
-        SurfaceFactory::setInternalCache(&_localCache);
-    }
-    ~RefinerSurfaceFactory() override = default;
-
-private:
-    CACHE_TYPE _localCache;
-};
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_REFINER_SURFACE_FACTORY_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/regularPatchBuilder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/regularPatchBuilder.cpp
deleted file mode 100644
index 7e77367b2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/regularPatchBuilder.cpp
+++ /dev/null
@@ -1,441 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/regularPatchBuilder.h"
-
-#include <cstring>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Internal helper functions:
-//
-namespace {
-    inline int
-    encodeTriBoundaryMask(int eBits, int vBits) {
-
-        int upperBits = 0;
-        int lowerBits = eBits;
-
-        if (vBits) {
-            if (eBits == 0) {
-                upperBits = 1;
-                lowerBits = vBits;
-            } else if ((vBits == 7) &&
-                       ((eBits == 1) || (eBits == 2) || (eBits == 4))) {
-                upperBits = 2;
-                lowerBits = eBits;
-            }
-        }
-        return (upperBits << 3) | lowerBits;
-    }
-}
-
-//
-//  Static methods:
-//
-int
-RegularPatchBuilder::GetBoundaryMask(int faceSize, Index const cvs[]) {
-
-    bool isQuad = (faceSize == 4);
-    if (isQuad) {
-        int eMask = ((cvs[ 1] < 0) << 0) |
-                    ((cvs[ 7] < 0) << 1) |
-                    ((cvs[14] < 0) << 2) |
-                    ((cvs[ 8] < 0) << 3);
-        return eMask;
-    } else {
-        int eMask = ((cvs[ 1] < 0) << 0) |
-                    ((cvs[ 9] < 0) << 1) |
-                    ((cvs[ 7] < 0) << 2) ;
-        int vMask = (((cvs[ 0] < 0) | (cvs[ 3] < 0)) << 0) |
-                    (((cvs[ 2] < 0) | (cvs[ 6] < 0)) << 1) |
-                    (((cvs[10] < 0) | (cvs[11] < 0)) << 2) ;
-        return encodeTriBoundaryMask(eMask, vMask);
-    }
-}
-
-//
-//  Constructor (empty destructor is inline):
-//
-RegularPatchBuilder::RegularPatchBuilder(FaceSurface const & surface) :
-        _surface(surface) {
-
-    _isQuad = (_surface.GetTopology()._faceSize == 4);
-    if (_isQuad) {
-        assert(_surface.GetTopology()._regFaceSize == 4);
-
-        _patchType = Far::PatchDescriptor::REGULAR;
-        _patchSize = 16;
-    } else {
-        assert(_surface.GetTopology()._faceSize == 3);
-        assert(_surface.GetTopology()._regFaceSize == 3);
-
-        _patchType = Far::PatchDescriptor::LOOP;
-        _patchSize = 12;
-    }
-
-    _isBoundary = _surface.GetTag().HasBoundaryVertices();
-    if (!_isBoundary) {
-        _boundaryMask = 0;
-    } else if (_isQuad) {
-        //  Boundary mask for quad trivial -- bit for each boundary edge:
-        FaceVertexSubset const * C = _surface.GetSubsets();
-        int eMask = ((C[0].IsBoundary() & (C[0]._numFacesBefore == 0)) << 0) |
-                    ((C[1].IsBoundary() & (C[1]._numFacesBefore == 0)) << 1) |
-                    ((C[2].IsBoundary() & (C[2]._numFacesBefore == 0)) << 2) |
-                    ((C[3].IsBoundary() & (C[3]._numFacesBefore == 0)) << 3);
-        _boundaryMask = eMask;
-    } else {
-        //  Boundary mask for tris not so trivial -- boundary verts can exist
-        //  on tris without boundary edges, so bits for both are combined:
-        FaceVertexSubset const * C = _surface.GetSubsets();
-        int eMask = ((C[0].IsBoundary() & (C[0]._numFacesBefore == 0)) << 0) |
-                    ((C[1].IsBoundary() & (C[1]._numFacesBefore == 0)) << 1) |
-                    ((C[2].IsBoundary() & (C[2]._numFacesBefore == 0)) << 2);
-        int vMask =  (C[0].IsBoundary() << 0) |
-                     (C[1].IsBoundary() << 1) |
-                     (C[2].IsBoundary() << 2);
-        _boundaryMask = encodeTriBoundaryMask(eMask, vMask);
-    }
-}
-
-//
-//  Methods for gathering control vertices:
-//
-void
-RegularPatchBuilder::gatherInteriorPatchPoints4(Index P[]) const {
-
-    Index const * fvIndices  = &_surface.GetIndices()[0];
-    Index const * fvOpposite = 0;
-
-    //
-    //  For each of the 4 corners, identify the opposite face in the ring
-    //  and assign its 4 indices to the corresponding quadrant of the patch:
-    //
-    FaceVertex const & cTop0 = _surface.GetCornerTopology(0);
-    fvOpposite = fvIndices + cTop0.GetFaceIndexOffset(cTop0.GetFaceAfter(2));
-    P[ 5] = fvOpposite[0];
-    P[ 4] = fvOpposite[1];
-    P[ 0] = fvOpposite[2];
-    P[ 1] = fvOpposite[3];
-    fvIndices += cTop0.GetNumFaceVertices();
-
-    FaceVertex const & cTop1 = _surface.GetCornerTopology(1);
-    fvOpposite = fvIndices + cTop1.GetFaceIndexOffset(cTop1.GetFaceAfter(2));
-    P[ 6] = fvOpposite[0];
-    P[ 2] = fvOpposite[1];
-    P[ 3] = fvOpposite[2];
-    P[ 7] = fvOpposite[3];
-    fvIndices += cTop1.GetNumFaceVertices();
-
-    FaceVertex const & cTop2 = _surface.GetCornerTopology(2);
-    fvOpposite = fvIndices + cTop2.GetFaceIndexOffset(cTop2.GetFaceAfter(2));
-    P[10] = fvOpposite[0];
-    P[11] = fvOpposite[1];
-    P[15] = fvOpposite[2];
-    P[14] = fvOpposite[3];
-    fvIndices += cTop2.GetNumFaceVertices();
-
-    FaceVertex const & cTop3 = _surface.GetCornerTopology(3);
-    fvOpposite = fvIndices + cTop3.GetFaceIndexOffset(cTop3.GetFaceAfter(2));
-    P[ 9] = fvOpposite[0];
-    P[13] = fvOpposite[1];
-    P[12] = fvOpposite[2];
-    P[ 8] = fvOpposite[3];
-}
-
-void
-RegularPatchBuilder::gatherBoundaryPatchPoints4(Index P[]) const {
-
-    Index const * fvIndices = &_surface.GetIndices()[0];
-
-    //
-    //  For each of the 4 corners -- whether boundary or interior -- one
-    //  incident face contains all indices that will contribute to the points
-    //  of the corresponding patch.  Identify it first and then retrieve and
-    //  assign the indices accordingly:
-    //
-    for (int i = 0; i < 4; ++i) {
-        FaceVertex       const & cTop = _surface.GetCornerTopology(i);
-        FaceVertexSubset const & cSub = _surface.GetCornerSubset(i);
-
-        int faceCorner = cTop.GetFace();
-
-        int faceOther = faceCorner;
-        if (!cSub.IsBoundary()) {
-            faceOther = cTop.GetFaceAfter(2);
-        } else if (cSub._numFacesAfter) {
-            faceOther = cTop.GetFaceNext(faceCorner);
-        } else if (cSub._numFacesBefore) {
-            faceOther = cTop.GetFacePrevious(faceCorner);
-        }
-
-        Index const * fvOther = fvIndices + cTop.GetFaceIndexOffset(faceOther);
-
-        Index fvPhantom = fvOther[0];
-
-        switch (i) {
-        case 0:
-            P[5] = fvOther[0];
-            if (!cSub.IsBoundary()) {
-                P[4] = fvOther[1];
-                P[0] = fvOther[2];
-                P[1] = fvOther[3];
-            } else {
-                P[4] = cSub._numFacesAfter  ? fvOther[3] : fvPhantom;
-                P[0] = fvPhantom;
-                P[1] = cSub._numFacesBefore ? fvOther[1] : fvPhantom;
-            }
-            break;
-        case 1:
-            P[6] = fvOther[0];
-            if (!cSub.IsBoundary()) {
-                P[2] = fvOther[1];
-                P[3] = fvOther[2];
-                P[7] = fvOther[3];
-            } else {
-                P[2] = cSub._numFacesAfter  ? fvOther[3] : fvPhantom;
-                P[3] = fvPhantom;
-                P[7] = cSub._numFacesBefore ? fvOther[1] : fvPhantom;
-            }
-            break;
-        case 2:
-            P[10] = fvOther[0];
-            if (!cSub.IsBoundary()) {
-                P[11] = fvOther[1];
-                P[15] = fvOther[2];
-                P[14] = fvOther[3];
-            } else {
-                P[11] = cSub._numFacesAfter  ? fvOther[3] : fvPhantom;
-                P[15] = fvPhantom;
-                P[14] = cSub._numFacesBefore ? fvOther[1] : fvPhantom;
-            }
-            break;
-        case 3:
-            P[ 9] = fvOther[0];
-            if (!cSub.IsBoundary()) {
-                P[13] = fvOther[1];
-                P[12] = fvOther[2];
-                P[ 8] = fvOther[3];
-            } else {
-                P[13] = cSub._numFacesAfter  ? fvOther[3] : fvPhantom;
-                P[12] = fvPhantom;
-                P[ 8] = cSub._numFacesBefore ? fvOther[1] : fvPhantom;
-            }
-            break;
-        }
-        fvIndices += cTop.GetNumFaceVertices();
-    }
-}
-
-void
-RegularPatchBuilder::gatherInteriorPatchPoints3(Index P[]) const {
-
-    Index const * fvIndices = &_surface.GetIndices()[0];
-
-    //
-    //  For each of the 3 corners, the indices for the four contributing
-    //  points come from the 2nd and 3rd faces following the corner face:
-    //
-    Index const * fvNext2 = 0;
-    Index const * fvNext3 = 0;
-
-    FaceVertex const & cTop0 = _surface.GetCornerTopology(0);
-    fvNext2 = fvIndices + cTop0.GetFaceIndexOffset(cTop0.GetFaceAfter(2));
-    fvNext3 = fvIndices + cTop0.GetFaceIndexOffset(cTop0.GetFaceAfter(3));
-    P[ 4] = fvNext2[0];
-    P[ 7] = fvNext2[1];
-    P[ 3] = fvNext2[2];
-    P[ 0] = fvNext3[2];
-    fvIndices += cTop0.GetNumFaceVertices();
-
-    FaceVertex const & cTop1 = _surface.GetCornerTopology(1);
-    fvNext2 = fvIndices + cTop1.GetFaceIndexOffset(cTop1.GetFaceAfter(2));
-    fvNext3 = fvIndices + cTop1.GetFaceIndexOffset(cTop1.GetFaceAfter(3));
-    P[ 5] = fvNext2[0];
-    P[ 1] = fvNext2[1];
-    P[ 2] = fvNext2[2];
-    P[ 6] = fvNext3[2];
-    fvIndices += cTop1.GetNumFaceVertices();
-
-    FaceVertex const & cTop2 = _surface.GetCornerTopology(2);
-    fvNext2 = fvIndices + cTop2.GetFaceIndexOffset(cTop2.GetFaceAfter(2));
-    fvNext3 = fvIndices + cTop2.GetFaceIndexOffset(cTop2.GetFaceAfter(3));
-    P[ 8] = fvNext2[0];
-    P[ 9] = fvNext2[1];
-    P[11] = fvNext2[2];
-    P[10] = fvNext3[2];
-}
-
-void
-RegularPatchBuilder::gatherBoundaryPatchPoints3(Index P[]) const {
-
-    Index const * fvIndices = &_surface.GetIndices()[0];
-
-    //
-    //  For each of the 3 corners, one incident face contains all indices
-    //  that will contribute to the points of the corresponding patch, but
-    //  interior vertices require two:
-    //
-    for (int i = 0; i < 3; ++i) {
-        FaceVertex       const & cTop = _surface.GetCornerTopology(i);
-        FaceVertexSubset const & cSub = _surface.GetCornerSubset(i);
-
-        int faceCorner = cTop.GetFace();
-
-        int faceOther = -1;
-        if (!cSub.IsBoundary()) {
-            faceOther = cTop.GetFaceAfter(2);
-        } else if (cSub._numFacesTotal == 1) {
-            faceOther = faceCorner;
-        } else if (cSub._numFacesBefore == 0) {
-            faceOther = cTop.GetFaceAfter(2);
-        } else if (cSub._numFacesAfter == 0) {
-            faceOther = cTop.GetFaceBefore(2);
-        } else {
-            faceOther = cTop.GetFaceNext(faceCorner);
-        }
-        assert(faceOther >= 0);
-
-        Index const * fvOther = fvIndices + cTop.GetFaceIndexOffset(faceOther);
-
-        Index fvPhantom = fvOther[0];
-
-        switch (i) {
-        case 0:
-            P[4] = fvOther[0];
-            if (!cSub.IsBoundary()) {
-                P[7] = fvOther[1];
-                P[3] = fvOther[2];
-                fvOther = fvIndices +
-                          cTop.GetFaceIndexOffset(cTop.GetFaceNext(faceOther));
-                P[0] = fvOther[2];
-            } else {
-                P[7] = (cSub._numFacesAfter) ? fvOther[3 - cSub._numFacesAfter]
-                                             : fvPhantom;
-                P[3] = (cSub._numFacesAfter  == 2) ? fvOther[2] : fvPhantom;
-                P[0] = (cSub._numFacesBefore == 2) ? fvOther[1] : fvPhantom;
-            }
-            break;
-        case 1:
-            P[5] = fvOther[0];
-            if (!cSub.IsBoundary()) {
-                P[1] = fvOther[1];
-                P[2] = fvOther[2];
-                fvOther = fvIndices +
-                          cTop.GetFaceIndexOffset(cTop.GetFaceNext(faceOther));
-                P[6] = fvOther[2];
-            } else {
-                P[1] = (cSub._numFacesAfter) ? fvOther[3 - cSub._numFacesAfter]
-                                             : fvPhantom;
-                P[2] = (cSub._numFacesAfter  == 2) ? fvOther[2] : fvPhantom;
-                P[6] = (cSub._numFacesBefore == 2) ? fvOther[1] : fvPhantom;
-            }
-            break;
-        case 2:
-            P[8] = fvOther[0];
-            if (!cSub.IsBoundary()) {
-                P[ 9] = fvOther[1];
-                P[11] = fvOther[2];
-                fvOther = fvIndices +
-                          cTop.GetFaceIndexOffset(cTop.GetFaceNext(faceOther));
-                P[10] = fvOther[2];
-            } else {
-                P[ 9] = (cSub._numFacesAfter) ? fvOther[3 - cSub._numFacesAfter]
-                                              : fvPhantom;
-                P[11] = (cSub._numFacesAfter  == 2) ? fvOther[2] : fvPhantom;
-                P[10] = (cSub._numFacesBefore == 2) ? fvOther[1] : fvPhantom;
-            }
-            break;
-        }
-        fvIndices += cTop.GetNumFaceVertices();
-    }
-}
-
-int
-RegularPatchBuilder::GatherControlVertexIndices(Index cvIndices[]) const {
-
-    if (_isQuad) {
-        if (_isBoundary) {
-            gatherBoundaryPatchPoints4(cvIndices);
-        } else {
-            gatherInteriorPatchPoints4(cvIndices);
-        }
-    } else {
-        if (_isBoundary) {
-            gatherBoundaryPatchPoints3(cvIndices);
-        } else {
-            gatherInteriorPatchPoints3(cvIndices);
-        }
-    }
-    return _patchSize;
-}
-
-
-//
-//  Methods for debugging...
-//
-void
-RegularPatchBuilder::print(Index const P[]) const {
-
-    printf("RegularPatchBuilder:\n");
-
-    if (_patchType == Far::PatchDescriptor::REGULAR) {
-        printf("    patch type  = REGULAR (B-Spline, quad)\n");
-    } else if (_patchType == Far::PatchDescriptor::LOOP) {
-        printf("    patch type  = LOOP (Box-Spline, tri)\n");
-    } else {
-        assert("Unknown _patchType for RegularPatchBuilder" == 0);
-    }
-
-    printf("    patch size  = %d\n", _patchSize);
-    printf("    is quad     = %d\n", _isQuad);
-    printf("    is boundary = %d\n", _isBoundary);
-
-    if (P) {
-        const char * label  = "    patch points:";
-        const char * indent = "                 ";
-        if (_isQuad) {
-            printf("%s %4d %4d %4d %4d\n", label,  P[12], P[13], P[14], P[15]);
-            printf("%s %4d %4d %4d %4d\n", indent, P[ 8], P[ 9], P[10], P[11]);
-            printf("%s %4d %4d %4d %4d\n", indent, P[ 4], P[ 5], P[ 6], P[ 7]);
-            printf("%s %4d %4d %4d %4d\n", indent, P[ 0], P[ 1], P[ 2], P[ 3]);
-        } else {
-            printf("%s       %4d  %4d\n",     label,  P[10], P[11]);
-            printf("%s    %4d  %4d  %4d\n",   indent, P[7], P[8], P[9]);
-            printf("%s %4d  %4d  %4d  %4d\n", indent, P[3], P[4], P[5], P[6]);
-            printf("%s    %4d  %4d  %4d\n",   indent, P[0], P[1], P[2]);
-        }
-    }
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/regularPatchBuilder.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/regularPatchBuilder.h
deleted file mode 100644
index 3fdfb3c89..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/regularPatchBuilder.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_REGULAR_PATCH_BUILDER_H
-#define OPENSUBDIV3_REGULAR_PATCH_BUILDER_H
-
-#include "../version.h"
-
-#include "../bfr/faceSurface.h"
-#include "../far/patchDescriptor.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  RegularPatchBuilder ...
-//
-class RegularPatchBuilder {
-public:
-    typedef FaceSurface::Index Index;
-
-public:
-    RegularPatchBuilder(FaceSurface const & surfaceDescription);
-    ~RegularPatchBuilder() { }
-
-    //  Debugging...
-    void print(Index const cvIndices[] = 0) const;
-
-public:
-    //  Methods to query the number and indices of control vertices:
-    int GetNumControlVertices() const { return _patchSize; }
-
-    int GatherControlVertexIndices(Index cvIndices[]) const;
-
-public:
-    //  Methods to query patch properties:
-    bool IsQuadPatch() const { return _isQuad; }
-    bool IsBoundaryPatch() const { return _isBoundary; }
-
-    Far::PatchDescriptor::Type GetPatchType() const { return _patchType; }
-
-    //  Note the bit-mask here is specific for use with Far::PatchParam
-    int GetPatchParamBoundaryMask() const { return _boundaryMask; }
-
-public:
-    //  Static methods for use without a FaceSurface:
-    static int GetPatchSize(int regFaceSize) {
-        return (regFaceSize == 4) ? 16 : 12;
-    }
-    static Far::PatchDescriptor::Type GetPatchType(int regFaceSize) {
-        return (regFaceSize == 4) ? Far::PatchDescriptor::REGULAR :
-                                    Far::PatchDescriptor::LOOP;
-    }
-    static int GetBoundaryMask(int regFaceSize, Index const patchPoints[]);
-
-private:
-    //  Internal methods for assembling quad and tri patches:
-    void gatherInteriorPatchPoints4(Index cvIndices[]) const;
-    void gatherBoundaryPatchPoints4(Index cvIndices[]) const;
-
-    void gatherInteriorPatchPoints3(Index cvIndices[]) const;
-    void gatherBoundaryPatchPoints3(Index cvIndices[]) const;
-
-private:
-    //  Private members:
-    FaceSurface const & _surface;
-
-    unsigned int _isQuad     : 1;
-    unsigned int _isBoundary : 1;
-    int          _boundaryMask;
-    int          _patchSize;
-
-    Far::PatchDescriptor::Type _patchType;
-};
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_REGULAR_PATCH_BUILDER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surface.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surface.cpp
deleted file mode 100644
index dab77e6ee..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surface.cpp
+++ /dev/null
@@ -1,697 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/surface.h"
-#include "../bfr/surfaceData.h"
-#include "../bfr/pointOperations.h"
-#include "../bfr/patchTree.h"
-#include "../far/patchParam.h"
-#include "../far/patchDescriptor.h"
-#include "../far/patchBasis.h"
-
-#include <algorithm>
-#include <cassert>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Constructor for the Surface -- defers to the constructor for its full
-//  set of member variables, but marks the precision as double when needed
-//  (as a specialization here):
-//
-template <typename REAL>
-Surface<REAL>::Surface() : _data() {
-
-    //  Surface<> should not be adding members outside its SurfaceData:
-    assert(sizeof(*this) == sizeof(internal::SurfaceData));
-}
-
-template <>
-Surface<double>::Surface() : _data() {
-
-    _data.setDouble(true);
-}
-
-
-//
-//  Simple internal utilities:
-//
-template <typename REAL>
-inline internal::IrregularPatchType const &
-Surface<REAL>::getIrregPatch() const {
-
-    return _data.getIrregPatch();
-}
-
-template <typename REAL>
-int
-Surface<REAL>::GetNumPatchPoints() const {
-
-    if (IsRegular()) {
-        return GetNumControlPoints();
-    } else if (IsLinear()) {
-        return 2 * GetNumControlPoints() + 1;
-    } else {
-        return getIrregPatch().GetNumPointsTotal();
-    }
-}
-
-template <typename REAL>
-int
-Surface<REAL>::GetControlPointIndices(Index cvs[]) const {
-
-    std::memcpy(cvs, _data.getCVIndices(), _data.getNumCVs() * sizeof(Index));
-    return _data.getNumCVs();
-}
-
-
-//
-//  Methods for gathering and computing control and patch points:
-//
-template <typename REAL>
-template <typename REAL_MESH>
-void
-Surface<REAL>::GatherControlPoints(
-        REAL_MESH const meshPoints[], PointDescriptor const & meshDesc,
-        REAL controlPoints[], PointDescriptor const & controlDesc) const {
-
-    //
-    //  Assemble parameters of the point copy operation and apply:
-    //
-    typedef points::CopyConsecutive<REAL,REAL_MESH> PointCopier;
-
-    typename PointCopier::Parameters copyParams;
-    copyParams.pointData    = meshPoints;
-    copyParams.pointSize    = meshDesc.size;
-    copyParams.pointStride  = meshDesc.stride;
-
-    copyParams.srcCount   = GetNumControlPoints();
-    copyParams.srcIndices = _data.getCVIndices();
-
-    copyParams.resultData   = controlPoints;
-    copyParams.resultStride = controlDesc.stride;
-
-    PointCopier::Apply(copyParams);
-}
-
-template <typename REAL>
-void
-Surface<REAL>::computeLinearPatchPoints(REAL pointData[],
-        PointDescriptor const & pointDesc) const {
-
-    //
-    //  The initial control points of the N-sided face will be followed
-    //  by the midpoint of the face and the midpoint of the N edges.
-    //
-    //  Assemble parameters of the face splitting operation and apply:
-    //
-    int N = GetNumControlPoints();
-
-    typedef points::SplitFace<REAL> PointSplitter;
-
-    typename PointSplitter::Parameters splitParams;
-    splitParams.pointData   = pointData;
-    splitParams.pointSize   = pointDesc.size;
-    splitParams.pointStride = pointDesc.stride;
-
-    splitParams.srcCount = N;
-
-    splitParams.resultData = pointData + pointDesc.stride * N;
-
-    PointSplitter::Apply(splitParams);
-}
-
-template <typename REAL>
-void
-Surface<REAL>::computeIrregularPatchPoints(REAL pointData[],
-        PointDescriptor const & pointDesc) const {
-
-    //
-    //  An "irregular patch" may be represented by a regular patch in
-    //  rare cases, so be sure there are patch points to compute:
-    //
-    internal::IrregularPatchType const & irregPatch = getIrregPatch();
-
-    int numControlPoints = GetNumControlPoints();
-    int numPatchPoints   = irregPatch.GetNumPointsTotal();
-
-    if (numPatchPoints == numControlPoints) return;
-
-    //
-    //  Assemble parameters of the point combination operation and apply:
-    //
-    typedef points::CombineConsecutive<REAL> PointCombiner;
-
-    typename PointCombiner::Parameters combParams;
-    combParams.pointData   = pointData;
-    combParams.pointSize   = pointDesc.size;
-    combParams.pointStride = pointDesc.stride;
-
-    combParams.srcCount = numControlPoints;
-
-    combParams.resultCount = numPatchPoints - numControlPoints;
-    combParams.resultData  = pointData + pointDesc.stride * numControlPoints;
-    combParams.weightData  = irregPatch.GetStencilMatrix<REAL>();
-
-    PointCombiner::Apply(combParams);
-}
-
-//
-//  Methods for computing the extent of the control points:
-//
-template <typename REAL>
-void
-Surface<REAL>::BoundControlPoints(
-        REAL const controlPoints[], PointDescriptor const & pointDesc,
-        REAL boundMin[], REAL boundMax[]) const {
-
-    int numPoints = GetNumControlPoints();
-    int pointSize = pointDesc.size;
-
-    REAL const * p = controlPoints;
-    std::memcpy(boundMin, p, pointSize * sizeof(REAL));
-    std::memcpy(boundMax, p, pointSize * sizeof(REAL));
-
-    for (int i = 1; i < numPoints; ++i) {
-        p += pointDesc.stride;
-        for (int j = 0; j < pointSize; ++j) {
-            boundMin[j] = std::min(boundMin[j], p[j]);
-            boundMax[j] = std::max(boundMax[j], p[j]);
-        }
-    }
-}
-
-template <typename REAL>
-void
-Surface<REAL>::BoundControlPointsFromMesh(
-        REAL const meshPoints[], PointDescriptor const & pointDesc,
-        REAL boundMin[], REAL boundMax[]) const {
-
-    int numPoints = GetNumControlPoints();
-    int pointSize = pointDesc.size;
-
-    int const * meshIndices = _data.getCVIndices();
-
-    REAL const * p = meshPoints + pointDesc.stride * meshIndices[0];
-    std::memcpy(boundMin, p, pointSize * sizeof(REAL));
-    std::memcpy(boundMax, p, pointSize * sizeof(REAL));
-
-    for (int i = 1; i < numPoints; ++i) {
-        p = meshPoints + pointDesc.stride * meshIndices[i];
-        for (int j = 0; j < pointSize; ++j) {
-            boundMin[j] = std::min(boundMin[j], p[j]);
-            boundMax[j] = std::max(boundMax[j], p[j]);
-        }
-    }
-}
-
-
-//
-//  Internal helper for evaluation:
-//
-namespace {
-    template <typename REAL>
-    inline int
-    assignWeightsPerDeriv(REAL * const deriv[6], int wSize, REAL wBuffer[],
-                          REAL * wDeriv[6]) {
-
-        std::memset(wDeriv, 0, 6 * sizeof(REAL*));
-
-        wDeriv[0] = wBuffer;
-        if (deriv[1] && deriv[2]) {
-            wDeriv[1] = wDeriv[0] + wSize;
-            wDeriv[2] = wDeriv[1] + wSize;
-            if (deriv[3] && deriv[4] && deriv[5]) {
-                wDeriv[3] = wDeriv[2] + wSize;
-                wDeriv[4] = wDeriv[3] + wSize;
-                wDeriv[5] = wDeriv[4] + wSize;
-                return 6;
-            }
-            return 3;
-        }
-        return 1;
-    }
-}
-
-
-//
-//  Evaluation methods accessing the local data for a simple regular patch:
-//
-template <typename REAL>
-void
-Surface<REAL>::evalRegularBasis(REAL const uv[2], REAL * wDeriv[]) const {
-
-    Far::PatchParam patchParam;
-    patchParam.Set(0, 0, 0, 0, 0, getRegPatchMask(), 0, true);
-
-    Far::internal::EvaluatePatchBasisNormalized(
-        getRegPatchType(), patchParam, uv[0], uv[1],
-        wDeriv[0], wDeriv[1], wDeriv[2], wDeriv[3], wDeriv[4], wDeriv[5]);
-}
-
-template <typename REAL>
-int
-Surface<REAL>::evalRegularStencils(REAL const uv[2], REAL * sDeriv[]) const {
-
-    //
-    //  The control points of a regular patch are always the full set
-    //  of points required by a patch, i.e. phantom points will have an
-    //  entry of some kind (a duplicate).  For example, for an isolated
-    //  quad, its regular patch still has 16 control points.  So we can
-    //  return the basis weights as stencil weights for all cases.
-    //
-    Far::PatchParam patchParam;
-    patchParam.Set(0, 0, 0, 0, 0, getRegPatchMask(), 0, true);
-
-    Far::internal::EvaluatePatchBasisNormalized(
-        getRegPatchType(), patchParam, uv[0], uv[1],
-        sDeriv[0], sDeriv[1], sDeriv[2], sDeriv[3], sDeriv[4], sDeriv[5]);
-
-    return GetNumControlPoints();
-}
-
-template <typename REAL>
-void
-Surface<REAL>::evalRegularDerivs(REAL const uv[2],
-        REAL const patchPoints[], PointDescriptor const & pointDesc,
-        REAL * deriv[]) const {
-
-    //
-    //  Regular basis evaluation simply returns weights for use with
-    //  the entire set of patch control points.
-    //
-    //  Assign weights for requested derivatives and evaluate:
-    //
-    REAL   wBuffer[6 * 20];
-    REAL * wDeriv[6];
-
-    int numDerivs = assignWeightsPerDeriv(deriv, 20, wBuffer, wDeriv);
-
-    evalRegularBasis(uv, wDeriv);
-
-    //
-    //  Assemble parameters of the point combination operation and apply:
-    //
-    points::CommonCombinationParameters<REAL> combineParams;
-    combineParams.pointData   = patchPoints;
-    combineParams.pointSize   = pointDesc.size;
-    combineParams.pointStride = pointDesc.stride;
-
-    combineParams.srcCount   = GetNumControlPoints();
-    combineParams.srcIndices = 0;
-
-    combineParams.resultCount = numDerivs;
-    combineParams.resultArray = deriv;
-    combineParams.weightArray = wDeriv;
-
-    if (numDerivs == 1) {
-        points::Combine1<REAL>::Apply(combineParams);
-    } else if (numDerivs == 3) {
-        points::Combine3<REAL>::Apply(combineParams);
-    } else {
-        points::CombineMultiple<REAL>::Apply(combineParams);
-    }
-}
-
-//
-//  Evaluation methods accessing the PatchTree for irregular patches:
-//
-template <typename REAL>
-typename Surface<REAL>::IndexArray
-Surface<REAL>::evalIrregularBasis(REAL const UV[2], REAL * wDeriv[]) const {
-
-    Parameterization param = GetParameterization();
-    REAL uv[2] = { UV[0], UV[1] };
-    int subFace = param.HasSubFaces() ?
-                  param.ConvertCoordToNormalizedSubFace(uv, uv) : 0;
-
-    internal::IrregularPatchType const & irregPatch = getIrregPatch();
-    int subPatchIndex = irregPatch.FindSubPatch(uv[0], uv[1], subFace);
-    assert(subPatchIndex >= 0);
-
-    irregPatch.EvalSubPatchBasis(subPatchIndex, uv[0], uv[1],
-            wDeriv[0], wDeriv[1], wDeriv[2], wDeriv[3], wDeriv[4], wDeriv[5]);
-
-    return irregPatch.GetSubPatchPoints(subPatchIndex);
-}
-
-template <typename REAL>
-int
-Surface<REAL>::evalIrregularStencils(REAL const UV[2], REAL * sDeriv[]) const {
-
-    Parameterization param = GetParameterization();
-    REAL uv[2] = { UV[0], UV[1] };
-    int subFace = param.HasSubFaces() ?
-                  param.ConvertCoordToNormalizedSubFace(uv, uv) : 0;
-
-    internal::IrregularPatchType const & irregPatch = getIrregPatch();
-    int subPatchIndex = irregPatch.FindSubPatch(uv[0], uv[1], subFace);
-    assert(subPatchIndex >= 0);
-
-    return irregPatch.EvalSubPatchStencils(
-            subPatchIndex, uv[0], uv[1],
-            sDeriv[0], sDeriv[1], sDeriv[2], sDeriv[3], sDeriv[4], sDeriv[5]);
-}
-
-template <typename REAL>
-void
-Surface<REAL>::evalIrregularDerivs(REAL const uv[2],
-        REAL const patchPoints[], PointDescriptor const & pointDesc,
-        REAL * deriv[]) const {
-
-    //
-    //  Non-linear irregular basis evaluation returns both the weights
-    //  and the corresponding points of a sub-patch defined by a subset
-    //  of the given patch points.
-    //
-    //  Assign weights for requested derivatives and evaluate:
-    //
-    REAL   wBuffer[6 * 20];
-    REAL * wDeriv[6];
-
-    int numDerivs = assignWeightsPerDeriv(deriv, 20, wBuffer, wDeriv);
-
-    IndexArray indices = evalIrregularBasis(uv, wDeriv);
-
-    //
-    //  Assemble parameters of the point combination operation and apply:
-    //
-    points::CommonCombinationParameters<REAL> combineParams;
-    combineParams.pointData   = patchPoints;
-    combineParams.pointSize   = pointDesc.size;
-    combineParams.pointStride = pointDesc.stride;
-
-    combineParams.srcCount   = indices.size();
-    combineParams.srcIndices = &indices[0];
-
-    combineParams.resultCount = numDerivs;
-    combineParams.resultArray = deriv;
-    combineParams.weightArray = wDeriv;
-
-    if (numDerivs == 1) {
-        points::Combine1<REAL>::Apply(combineParams);
-    } else if (numDerivs == 3) {
-        points::Combine3<REAL>::Apply(combineParams);
-    } else {
-        points::CombineMultiple<REAL>::Apply(combineParams);
-    }
-}
-
-//
-//  Supporting methods for the N-sided quadrangulated linear patch:
-//
-namespace {
-    //
-    //  For stencils, there are four unique weights derived from the
-    //  four bilinear weights of the sub-face.  Given these weights as
-    //  input for a sub-face with origin at base point P, the resulting
-    //  weights are associated with the N base points as follows:
-    //
-    //      w[0] = the point at the origin (P)
-    //      w[1] = the point following P
-    //      w[2] = the N-3 points not adjacent to P (contributing to center)
-    //      w[3] = the point preceding P
-    //
-    template <typename REAL>
-    inline void
-    transformLinearQuadWeightsToStencil(REAL w[4], int N) {
-
-        REAL wOrigin = w[0];
-        REAL wNext   = w[1] * 0.5f;
-        REAL wCenter = w[2] / (REAL)N;
-        REAL wPrev   = w[3] * 0.5f;
-
-        w[0] = wCenter + wNext + wPrev + wOrigin;
-        w[1] = wCenter + wNext;
-        w[2] = wCenter;
-        w[3] = wCenter + wPrev;
-    }
-
-    template <typename REAL>
-    inline void
-    scaleWeights4(REAL w[4], REAL derivScale) {
-        if (w) {
-            w[0] *= derivScale;
-            w[1] *= derivScale;
-            w[2] *= derivScale;
-            w[3] *= derivScale;
-        }
-    }
-}
-
-template <typename REAL>
-int
-Surface<REAL>::evalMultiLinearBasis(REAL const UV[2], REAL *wDeriv[]) const {
-
-    Parameterization param = GetParameterization();
-    assert(param.GetType() == Parameterization::QUAD_SUBFACES);
-
-    REAL uv[2];
-    int subFace = param.ConvertCoordToNormalizedSubFace(UV, uv);
-
-    //  WIP - Prefer to eval Linear basis directly, i.e.:
-    //
-    //      Far::internal::EvalBasisLinear(u, v, wP, wDu, wDv);
-    //
-    //  but this internal Far function is sometimes optimized out, causing
-    //  link errors.  Need to fix in Far with explicit instantiation...
-    Far::internal::EvaluatePatchBasisNormalized(Far::PatchDescriptor::QUADS,
-            Far::PatchParam(), uv[0], uv[1],
-            wDeriv[0], wDeriv[1], wDeriv[2], wDeriv[3], wDeriv[4], wDeriv[5]);
-
-    //  Scale weights for derivatives (only mixed partial of 2nd is non-zero):
-    scaleWeights4<REAL>(wDeriv[1], 2.0f);
-    scaleWeights4<REAL>(wDeriv[2], 2.0f);
-
-    scaleWeights4<REAL>(wDeriv[4], 4.0f);
-
-    return subFace;
-}
-
-template <typename REAL>
-int
-Surface<REAL>::evalMultiLinearStencils(REAL const uv[2], REAL *sDeriv[]) const {
-
-    //
-    //  Linear evaluation of irregular N-sided faces evaluates one of N
-    //  locally subdivided quad faces and identifies that sub-face -- also
-    //  the origin vertex of the quad. The basis weights are subsequently
-    //  transformed into the four unique values that are then assigned to
-    //  the N vertices of the face.
-    //
-    //  Assign weights for requested stencils and evaluate:
-    //
-    REAL   wBuffer[6 * 4];
-    REAL * wDeriv[6];
-
-    int numDerivs = assignWeightsPerDeriv(sDeriv, 4, wBuffer, wDeriv);
-
-    int iOrigin = evalMultiLinearBasis(uv, wDeriv);
-
-    //
-    //  Transform the four linear weights to four unique stencil weights:
-    //
-    int numControlPoints = GetNumControlPoints();
-
-    transformLinearQuadWeightsToStencil(wDeriv[0], numControlPoints);
-    if (numDerivs > 1) {
-        transformLinearQuadWeightsToStencil(wDeriv[1], numControlPoints);
-        transformLinearQuadWeightsToStencil(wDeriv[2], numControlPoints);
-        if (numDerivs > 3) {
-            transformLinearQuadWeightsToStencil(wDeriv[4], numControlPoints);
-        }
-    }
-
-    //
-    //  Assign the N stencil weights from the four unique values:
-    //
-    int iNext = (iOrigin + 1) % numControlPoints;
-    int iPrev = (iOrigin + numControlPoints - 1) % numControlPoints;
-
-    for (int i = 0; i < numControlPoints; ++i) {
-        int wIndex = 2;
-        if (i == iOrigin) {
-            wIndex = 0;
-        } else if (i == iNext) {
-            wIndex = 1;
-        } else if (i == iPrev) {
-            wIndex = 3;
-        }
-
-        sDeriv[0][i] = wDeriv[0][wIndex];
-        if (numDerivs > 1) {
-            sDeriv[1][i] = wDeriv[1][wIndex];
-            sDeriv[2][i] = wDeriv[2][wIndex];
-            if (numDerivs > 3) {
-                sDeriv[3][i] = 0.0f;
-                sDeriv[4][i] = wDeriv[4][wIndex];
-                sDeriv[5][i] = 0.0f;
-            }
-        }
-    }
-    return numControlPoints;
-}
-
-template <typename REAL>
-void
-Surface<REAL>::evalMultiLinearDerivs(REAL const uv[],
-        REAL const patchPoints[], PointDescriptor const & pointDesc,
-        REAL * deriv[]) const {
-
-    //
-    //  Linear evaluation of irregular N-sided faces evaluates one of N
-    //  locally subdivided quad faces and identifies that sub-face.
-    //
-    //  Assign weights for requested derivatives and evaluate:
-    //
-    REAL   wBuffer[6 * 4];
-    REAL * wDeriv[6];
-
-    int numDerivs = assignWeightsPerDeriv(deriv, 4, wBuffer, wDeriv);
-
-    int subQuad = evalMultiLinearBasis(uv, wDeriv);
-
-    //
-    //  Identify the patch points for the sub-face and interpolate:
-    //
-    int N = GetNumControlPoints();
-
-    int quadIndices[4];
-    quadIndices[0] = subQuad;
-    quadIndices[1] = N + 1 + subQuad;
-    quadIndices[2] = N;
-    quadIndices[3] = N + 1 + (subQuad + N - 1) % N;
-
-    //
-    //  Assemble parameters of the point combination operation and apply:
-    //
-    points::CommonCombinationParameters<REAL> combineParams;
-    combineParams.pointData   = patchPoints;
-    combineParams.pointSize   = pointDesc.size;
-    combineParams.pointStride = pointDesc.stride;
-
-    combineParams.srcCount   = 4;
-    combineParams.srcIndices = quadIndices;
-
-    combineParams.resultCount = numDerivs;
-    combineParams.resultArray = deriv;
-    combineParams.weightArray = wDeriv;
-
-    if (numDerivs == 1) {
-        points::Combine1<REAL>::Apply(combineParams);
-    } else if (numDerivs == 3) {
-        points::Combine3<REAL>::Apply(combineParams);
-    } else {
-        points::CombineMultiple<REAL>::Apply(combineParams);
-    }
-}
-
-
-//
-//  Public methods to apply stencils:
-//
-template <typename REAL>
-void
-Surface<REAL>::ApplyStencilFromMesh(REAL const stencil[],
-        REAL const meshPoints[], PointDescriptor const & pointDesc,
-        REAL result[]) const {
-
-    //
-    //  Assemble parameters of the point combination operation and apply:
-    //
-    typedef points::Combine1<REAL> PointCombiner;
-
-    typename PointCombiner::Parameters combParams;
-    combParams.pointData   = meshPoints;
-    combParams.pointSize   = pointDesc.size;
-    combParams.pointStride = pointDesc.stride;
-
-    combParams.srcCount   = GetNumControlPoints();
-    combParams.srcIndices = _data.getCVIndices();
-
-    combParams.resultCount = 1;
-    combParams.resultArray = &result;
-    combParams.weightArray = &stencil;
-
-    PointCombiner::Apply(combParams);
-}
-
-template <typename REAL>
-void
-Surface<REAL>::ApplyStencil(REAL const stencil[],
-        REAL const controlPoints[], PointDescriptor const & pointDesc,
-        REAL result[]) const {
-
-    //
-    //  Assemble parameters of the point combination operation and apply:
-    //
-    typedef points::Combine1<REAL> PointCombiner;
-
-    typename PointCombiner::Parameters combParams;
-    combParams.pointData   = controlPoints;
-    combParams.pointSize   = pointDesc.size;
-    combParams.pointStride = pointDesc.stride;
-
-    combParams.srcCount   = GetNumControlPoints();
-    combParams.srcIndices = 0;
-
-    combParams.resultCount = 1;
-    combParams.resultArray = &result;
-    combParams.weightArray = &stencil;
-
-    PointCombiner::Apply(combParams);
-}
-
-
-//
-//  Explicitly instantiate Surface<> implementations for float and double:
-//
-template class Surface<float>;
-template class Surface<double>;
-
-//
-//  Explicitly instantiate template methods for converting precision:
-//
-template void Surface<float>::GatherControlPoints(
-                      float const [], PointDescriptor const &,
-                      float       [], PointDescriptor const &) const;
-template void Surface<float>::GatherControlPoints(
-                      double const [], PointDescriptor const &,
-                      float        [], PointDescriptor const &) const;
-
-template void Surface<double>::GatherControlPoints(
-                      double const [], PointDescriptor const &,
-                      double       [], PointDescriptor const &) const;
-template void Surface<double>::GatherControlPoints(
-                      float const [], PointDescriptor const &,
-                      double      [], PointDescriptor const &) const;
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surface.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surface.h
deleted file mode 100644
index 65516fb38..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surface.h
+++ /dev/null
@@ -1,446 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_SURFACE_H
-#define OPENSUBDIV3_BFR_SURFACE_H
-
-#include "../version.h"
-
-#include "../bfr/surfaceData.h"
-#include "../bfr/parameterization.h"
-#include "../vtr/array.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-///
-/// @brief Encapsulates the limit surface for a face of a mesh
-///
-/// The Surface class encapsulates the limit surface for a face of a mesh
-/// for any data interpolation type (vertex, varying and face-varying) and
-/// provides the public interface for its evaluation. Surface is a class
-/// template parameterized to support evaluation in single or double
-/// precision.
-///
-/// @tparam REAL  Floating point precision (float or double only)
-///
-/// Instances of Surface are created or initialized by a subclass of the
-/// SurfaceFactory. Since existing instances can be re-initialized, they
-/// should be tested for validity after such re-initialization.
-///
-/// All Surfaces are assigned a Parameterization based on the subdivision
-/// scheme and the size of the face, which can then be used for evaluation
-/// and tessellation of the surface.
-///
-template <typename REAL>
-class Surface {
-public:
-    /// @brief Simple struct defining the size and stride of points in
-    ///        arrays.
-    struct PointDescriptor {
-        PointDescriptor() : size(0), stride(0) { }
-        PointDescriptor(int n) : size(n), stride(n) { }
-        PointDescriptor(int n, int m) : size(n), stride(m) { }
-
-        int size, stride;
-    };
-
-    /// @brief Integer type representing a mesh index
-    typedef int Index;
-
-public:
-    //@{
-    /// @name Construction and initialization
-    ///
-    /// Instances of Surface may be explicitly constructed, but are
-    /// initialized by SurfaceFactory and so only default construction
-    /// is provided. An instance will be invalid (and so unusable) if
-    /// default constructed, or if the factory that initialized it
-    /// determined that the face associated with it has no limit surface.
-    ///
-
-    /// @brief Return true if successfully initialized
-    bool IsValid() const { return _data.isValid(); }
-
-    /// @brief Clear a previously initialized Surface
-    void Clear() { _data.reinitialize(); }
-
-    /// @brief Default construction produces an invalid instance
-    Surface();
-
-    Surface(Surface const & src) = default;
-    Surface& operator=(Surface const & src) = default;
-    ~Surface() = default;
-    //@}
-
-    //@{
-    /// @name Simple queries
-    ///
-    /// Simple queries of valid Surface.
-    ///
-
-    /// @brief Return the Parameterization
-    Parameterization GetParameterization() const { return _data.getParam(); }
-
-    /// @brief Return the size of the face
-    int GetFaceSize() const { return GetParameterization().GetFaceSize(); }
-
-    /// @brief Return if the Surface is a single regular patch
-    bool IsRegular() const { return _data.isRegular(); }
-
-    /// @brief Return if the Surface is linear
-    bool IsLinear() const { return _data.isLinear(); }
-    //@}
-
-    //@{
-    /// @name Methods to manage control points
-    ///
-    /// Control points are the subset of points in the mesh that influence
-    /// a Surface. They can be identified as part of the mesh data by their
-    /// indices, or gathered into an array for other purposes.
-    ///
-    /// It is not necessary to deal directly with control points for
-    /// evaluation, but they are useful with limit stencils and other
-    /// purposes, e.g. computing a bounding box of the control hull of
-    /// the Surface.
-    ///
-    /// Note that methods that access control points from the array of
-    /// mesh data require that the array be contiguous. If a large data
-    /// set is fragmented into blocks or pages, these methods cannot be
-    /// used and control points will need to be gathered explicitly.
-    ///       
-
-    /// @brief Return the number of control points affecting the Surface
-    int GetNumControlPoints() const { return _data.getNumCVs(); }
-
-    /// @brief Identify indices of control points in the mesh
-    int GetControlPointIndices(Index meshPointIndices[]) const;
-
-    /// @brief Gather control points in a local array
-    ///
-    /// @tparam REAL_MESH        Floating point precision of mesh points
-    ///
-    /// @param  meshPoints       Input array of mesh point data
-    /// @param  meshPointDesc    The size and stride of mesh point data
-    /// @param  controlPoints    Output array of control point data
-    /// @param  controlPointDesc The size and stride of control point data
-    ///
-    template <typename REAL_MESH>
-    void GatherControlPoints(REAL_MESH       const   meshPoints[],
-                             PointDescriptor const & meshPointDesc,
-                             REAL                    controlPoints[],
-                             PointDescriptor const & controlPointDesc) const;
-
-    /// @brief Compute bounds of control points from a local array
-    void BoundControlPoints(REAL            const   controlPoints[],
-                            PointDescriptor const & controlPointDesc,
-                            REAL                    minExtent[],
-                            REAL                    maxExtent[]) const;
-
-    /// @brief Compute bounds of control points from the mesh data
-    void BoundControlPointsFromMesh(REAL            const   meshPoints[],
-                                    PointDescriptor const & meshPointDesc,
-                                    REAL                    minExtent[],
-                                    REAL                    maxExtent[]) const;
-    //@}
-
-    //@{
-    /// @name Methods to manage patch points
-    ///
-    /// Patch points are derived from the control points and are used to
-    /// evaluate the Surface. The patch points always include the control
-    /// points as a subset.
-    ///       
-
-    /// @brief Return the number of patch points representing the Surface
-    int GetNumPatchPoints() const;
-
-    ///
-    /// @brief Prepare patch points in a local array for evaluation
-    ///
-    /// The patch points consist of the control points plus any additional
-    /// points derived from them that may be required to represent the
-    /// limit surface as one or more parametric patches.
-    ///
-    /// @param  meshPoints     Input array of mesh point data
-    /// @param  meshPointDesc  The size and stride of mesh point data
-    /// @param  patchPoints    Output array of patch point data
-    /// @param  patchPointDesc The size and stride of patch point data
-    ///
-    /// Note that this method requires the mesh data be in a contiguous
-    /// array. If a large data set is fragmented into blocks or pages, this
-    /// method cannot be used. The control points will need to be gathered
-    /// explicitly as the subset of patch points, after which the method to
-    /// compute the remaining patch points can be used.
-    ///
-    void PreparePatchPoints(REAL            const   meshPoints[],
-                            PointDescriptor const & meshPointDesc,
-                            REAL                    patchPoints[],
-                            PointDescriptor const & patchPointDesc) const;
-
-    /// @brief Compute all patch points following the control points
-    ///
-    /// For cases where the control points have already been gathered into
-    /// an array allocated for the patch points, the remaining patch points
-    /// will be computed.
-    ///
-    /// @param  patchPoints    Array of patch point data to be modified
-    /// @param  patchPointDesc The size and stride of patch point data
-    ///
-    void ComputePatchPoints(REAL                    patchPoints[],
-                            PointDescriptor const & patchPointDesc) const;
-    //@}
-
-    //@{
-    /// @name Evaluation of positions and derivatives
-    ///
-    /// Evaluation methods use the patch points to compute position, 1st and
-    /// 2nd derivatives of the Surface at a given (u,v) coordinate within
-    /// the domain of the Surface's Parameterization. All parameters of the
-    /// different overloads are required.
-    ///       
-
-    /// @brief Evaluation of position
-    void Evaluate(REAL const uv[2],
-                  REAL const patchPoints[], PointDescriptor const & pointDesc,
-                  REAL P[]) const;
-
-    /// @brief Overload of evaluation for 1st derivatives
-    void Evaluate(REAL const uv[2],
-                  REAL const patchPoints[], PointDescriptor const & pointDesc,
-                  REAL P[], REAL Du[], REAL Dv[]) const;
-
-    /// @brief Overload of evaluation for 2nd derivatives
-    void Evaluate(REAL const uv[2],
-                  REAL const patchPoints[], PointDescriptor const & pointDesc,
-                  REAL P[], REAL Du[],  REAL Dv[],
-                  REAL Duu[], REAL Duv[], REAL Dvv[]) const;
-    //@}
-
-    //@{
-    /// @name Evaluation and application of limit stencils
-    ///
-    /// Limit stencils are sets of coefficients that express an evaluation
-    /// as a linear combination of the control points. As with the direct
-    /// evaluation methods, they are overloaded to optionally provide
-    /// evaluation for 1st and 2nd derivatives.
-    ///
-    /// In addition to methods to provide limit stencils, methods are also
-    /// provided to apply them to the control points. Since application of
-    /// stencils is identical for each (i.e. the same for position and any
-    /// derivative) no overloads are provided for derivatives.
-    ///       
-
-    /// @brief Evaluation of the limit stencil for position
-    int EvaluateStencil(REAL const uv[2], REAL sP[]) const;
-
-    /// @brief Overload of limit stencil evaluation for 1st derivatives
-    int EvaluateStencil(REAL const uv[2], REAL sP[],
-                        REAL sDu[], REAL sDv[]) const;
-
-    /// @brief Overload of limit stencil evaluation for 2nd derivatives
-    int EvaluateStencil(REAL const uv[2], REAL sP[],
-                        REAL sDu[],  REAL sDv[],
-                        REAL sDuu[], REAL sDuv[], REAL sDvv[]) const;
-
-    /// @brief Apply a single stencil to control points from a local array
-    void ApplyStencil(REAL const stencil[],
-                      REAL const controlPoints[], PointDescriptor const &,
-                      REAL result[]) const;
-
-    /// @brief Apply a single stencil to control points from the mesh data
-    void ApplyStencilFromMesh(REAL const stencil[],
-                              REAL const meshPoints[], PointDescriptor const &,
-                              REAL result[]) const;
-    //@}
-
-private:
-    //  Internal methods for evaluating derivatives, basis weights and
-    //  stencils for regular, irregular and irregular linear patches:
-    typedef Vtr::ConstArray<int> IndexArray;
-
-    void evaluateDerivs(REAL const uv[2], REAL const patchPoints[],
-                        PointDescriptor const &, REAL * derivs[]) const;
-    void evalRegularDerivs(REAL const uv[2], REAL const patchPoints[],
-                           PointDescriptor const &, REAL * derivs[]) const;
-    void evalIrregularDerivs(REAL const uv[2], REAL const patchPoints[],
-                             PointDescriptor const &, REAL * derivs[]) const;
-    void evalMultiLinearDerivs(REAL const uv[2], REAL const patchPoints[],
-                               PointDescriptor const &, REAL * derivs[]) const;
-
-    void       evalRegularBasis(REAL const uv[2], REAL * wDeriv[]) const;
-    IndexArray evalIrregularBasis(REAL const uv[2], REAL * wDeriv[]) const;
-    int        evalMultiLinearBasis(REAL const uv[2], REAL * wDeriv[]) const;
-
-    int evaluateStencils(REAL const uv[2], REAL * sDeriv[]) const;
-    int evalRegularStencils(REAL const uv[2], REAL * sDeriv[]) const;
-    int evalIrregularStencils(REAL const uv[2], REAL * sDeriv[]) const;
-    int evalMultiLinearStencils(REAL const uv[2], REAL * sDeriv[]) const;
-
-    //  Internal methods to compute patch points:
-    void computeLinearPatchPoints(REAL p[], PointDescriptor const &) const;
-    void computeIrregularPatchPoints(REAL p[], PointDescriptor const &) const;
-
-    //  Internal methods specific to regular or irregular patches:
-    unsigned char getRegPatchType() const { return _data.getRegPatchType(); }
-    unsigned char getRegPatchMask() const { return _data.getRegPatchMask(); }
-
-    internal::IrregularPatchType const & getIrregPatch() const;
-
-private:
-    //  Access to the set of member variables - provided to the Factory:
-    friend class SurfaceFactory;
-
-    internal::SurfaceData       & getSurfaceData()       { return _data; }
-    internal::SurfaceData const & getSurfaceData() const { return _data; }
-
-private:
-    //  All member variables encapsulated in a single class:
-    internal::SurfaceData _data;
-};
-
-
-//
-//  Simple inline methods composed of other methods:
-//
-template <typename REAL>
-inline void
-Surface<REAL>::ComputePatchPoints(REAL points[],
-                                  PointDescriptor const & pointDesc) const {
-
-    if (!IsRegular()) {
-        if (IsLinear()) {
-            computeLinearPatchPoints(points, pointDesc);
-        } else {
-            computeIrregularPatchPoints(points, pointDesc);
-        }
-    }
-}
-
-template <typename REAL>
-inline void
-Surface<REAL>::PreparePatchPoints(
-        REAL const meshPoints[], PointDescriptor const & meshPointDesc,
-        REAL patchPoints[],  PointDescriptor const & patchPointDesc) const {
-
-    GatherControlPoints(meshPoints, meshPointDesc, patchPoints, patchPointDesc);
-    ComputePatchPoints(patchPoints, patchPointDesc);
-}
-
-//
-//  Inline invocations of more general methods for derivative overloads:
-//
-template <typename REAL>
-inline void
-Surface<REAL>::evaluateDerivs(REAL const uv[2],
-                              REAL const patchPoints[],
-                              PointDescriptor const & pointDesc,
-                              REAL * derivatives[]) const {
-    if (IsRegular()) {
-        evalRegularDerivs(uv, patchPoints, pointDesc, derivatives);
-    } else if (IsLinear()) {
-        evalMultiLinearDerivs(uv, patchPoints, pointDesc, derivatives);
-    } else {
-        evalIrregularDerivs(uv, patchPoints, pointDesc, derivatives);
-    }
-}
-template <typename REAL>
-inline void
-Surface<REAL>::Evaluate(REAL const uv[2],
-                        REAL const patchPoints[],
-                        PointDescriptor const & pointDesc,
-                        REAL P[]) const {
-
-    REAL * derivatives[6] = { P, 0, 0, 0, 0, 0 };
-    evaluateDerivs(uv, patchPoints, pointDesc, derivatives);
-}
-template <typename REAL>
-inline void
-Surface<REAL>::Evaluate(REAL const uv[2],
-                        REAL const patchPoints[],
-                        PointDescriptor const & pointDesc,
-                        REAL P[], REAL Du[], REAL Dv[]) const {
-
-    REAL * derivatives[6] = { P, Du, Dv, 0, 0, 0 };
-    evaluateDerivs(uv, patchPoints, pointDesc, derivatives);
-}
-template <typename REAL>
-inline void
-Surface<REAL>::Evaluate(REAL const uv[2],
-                        REAL const patchPoints[],
-                        PointDescriptor const & pointDesc,
-                        REAL P[],   REAL Du[],  REAL Dv[],
-                        REAL Duu[], REAL Duv[], REAL Dvv[]) const {
-
-    REAL * derivatives[6] = { P, Du, Dv, Duu, Duv, Dvv };
-    evaluateDerivs(uv, patchPoints, pointDesc, derivatives);
-}
-
-template <typename REAL>
-inline int
-Surface<REAL>::evaluateStencils(REAL const uv[2], REAL * sDeriv[]) const {
-
-    if (IsRegular()) {
-        return evalRegularStencils(uv, sDeriv);
-    } else if (IsLinear()) {
-        return evalMultiLinearStencils(uv, sDeriv);
-    } else {
-        return evalIrregularStencils(uv, sDeriv);
-    }
-}
-template <typename REAL>
-inline int
-Surface<REAL>::EvaluateStencil(REAL const uv[2], REAL sP[]) const {
-
-    REAL * derivativeStencils[6] = { sP, 0, 0, 0, 0, 0 };
-    return evaluateStencils(uv, derivativeStencils);
-}
-template <typename REAL>
-inline int
-Surface<REAL>::EvaluateStencil(REAL const uv[2],
-                          REAL sP[], REAL sDu[], REAL sDv[]) const {
-
-    REAL * derivativeStencils[6] = { sP, sDu, sDv, 0, 0, 0 };
-    return evaluateStencils(uv, derivativeStencils);
-}
-template <typename REAL>
-inline int
-Surface<REAL>::EvaluateStencil(REAL const uv[2],
-                          REAL sP[],   REAL sDu[],  REAL sDv[],
-                          REAL sDuu[], REAL sDuv[], REAL sDvv[]) const {
-
-    REAL * derivativeStencils[6] = { sP, sDu, sDv, sDuu, sDuv, sDvv };
-    return evaluateStencils(uv, derivativeStencils);
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_SURFACE */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceData.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceData.cpp
deleted file mode 100644
index 089925e23..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceData.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/surfaceData.h"
-#include "../bfr/patchTree.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-namespace internal {
-
-//
-//  Constructors and other methods to manage data members for copy and
-//  destruction:
-//
-SurfaceData::SurfaceData() : _cvIndices(), _param(),
-    _isValid(false),
-    _isDouble(false),
-    _isRegular(true),
-    _isLinear(false),
-    _regPatchType(0),
-    _regPatchMask(0),
-    _irregPatch() {
-}
-
-SurfaceData & 
-SurfaceData::operator=(SurfaceData const & src) {
-
-    //  No need to explicitly manage pre-existing resources in destination
-    //  as they will be either re-used or released when re-assigned
-
-    //  No copy/operator= supported by StackBuffer so resize and copy:
-    _cvIndices.SetSize(src._cvIndices.GetSize());
-    std::memcpy(&_cvIndices[0],
-        &src._cvIndices[0], src._cvIndices.GetSize() * sizeof(Index));
-
-    _param = src._param;
-
-    _isValid      = src._isValid;
-    _isDouble     = src._isDouble;
-    _isRegular    = src._isRegular;
-    _isLinear     = src._isLinear;
-    _regPatchType = src._regPatchType;
-    _regPatchMask = src._regPatchMask;
-    _irregPatch   = src._irregPatch;
-
-    return *this;
-}
-
-void
-SurfaceData::invalidate() {
-
-    //  Release any attached memory before marking as invalid:
-    _irregPatch = 0;
-
-    _isValid = false;
-}
-
-} // end namespace internal
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceData.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceData.h
deleted file mode 100644
index 29c6a3b5e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceData.h
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_SURFACE_DATA_H
-#define OPENSUBDIV3_BFR_SURFACE_DATA_H
-
-#include "../version.h"
-
-#include "../bfr/parameterization.h"
-#include "../bfr/irregularPatchType.h"
-
-#include "../vtr/stackBuffer.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-namespace internal {
-
-//
-//  SurfaceData is a simple internal class that encapsulates all member
-//  variables of a Surface -- allowing the SurfaceFactory to initialize
-//  a Surface independent of its final type.
-//
-//  Since internal, and access to instances of SurfaceData is restricted
-//  by other means, all accessors and modifiers are made public (though
-//  only the SurfaceFactory modifies an instance).
-//
-class SurfaceData {
-public:
-    SurfaceData();
-    SurfaceData(SurfaceData const & src) { *this = src; }
-    SurfaceData & operator=(SurfaceData const & src);
-    ~SurfaceData() { invalidate(); }
-
-public:
-    //  Simple accessors used by both Surface and SurfaceFactory:
-    typedef int Index;
-
-    int           getNumCVs()    const { return (int)_cvIndices.GetSize(); }
-    Index const * getCVIndices() const { return &_cvIndices[0]; }
-
-    Parameterization  getParam()        const { return _param; }
-    bool              isValid()         const { return _isValid; }
-    bool              isDouble()        const { return _isDouble; }
-    bool              isRegular()       const { return _isRegular; }
-    bool              isLinear()        const { return _isLinear; }
-    unsigned char     getRegPatchType() const { return _regPatchType; }
-    unsigned char     getRegPatchMask() const { return _regPatchMask; }
-
-    //  Local types and accessors for references to irregular patches:
-    typedef internal::IrregularPatchType      IrregPatchType;
-    typedef internal::IrregularPatchSharedPtr IrregPatchPtr;
-
-    bool                   hasIrregPatch()    const { return _irregPatch != 0; }
-    IrregPatchType const & getIrregPatch()    const { return *_irregPatch; }
-    IrregPatchPtr          getIrregPatchPtr() const { return _irregPatch; }
-
-public:
-    //  Modifiers used by SurfaceFactory to assemble a Surface:
-    void invalidate();
-    void reinitialize() { if (isValid()) invalidate(); }
-
-    Index * getCVIndices() { return &_cvIndices[0]; }
-    Index * resizeCVs(int size) {
-        _cvIndices.SetSize(size);
-        return &_cvIndices[0];
-    }
-
-    void setParam(Parameterization p)   { _param = p; }
-    void setValid(bool on)              { _isValid = on; }
-    void setDouble(bool on)             { _isDouble = on; }
-    void setRegular(bool on)            { _isRegular = on; }
-    void setLinear(bool on)             { _isLinear = on; }
-    void setRegPatchType(int t)         { _regPatchType = (unsigned char) t; }
-    void setRegPatchMask(int m)         { _regPatchMask = (unsigned char) m; }
-
-    void setIrregPatchPtr(IrregPatchPtr const & ptr) { _irregPatch = ptr; }
-
-private:
-    //  Member variables -- try to avoid redundancy and/or wasted space
-    //  here as some may choose to cache all Surfaces of a mesh:
-    typedef Vtr::internal::StackBuffer<Index,20,true> CVIndexArray;
-
-    CVIndexArray _cvIndices;
-
-    Parameterization _param;
-
-    unsigned char _isValid   : 1;
-    unsigned char _isDouble  : 1;
-    unsigned char _isRegular : 1;
-    unsigned char _isLinear  : 1;
-
-    unsigned char _regPatchType;
-    unsigned char _regPatchMask;
-
-    IrregPatchPtr _irregPatch;
-};
-
-} // end namespace internal
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_SURFACE_DATA */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactory.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactory.cpp
deleted file mode 100644
index a2bdacd6e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactory.cpp
+++ /dev/null
@@ -1,1293 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/hash.h"
-#include "../bfr/limits.h"
-#include "../bfr/surface.h"
-#include "../bfr/surfaceFactory.h"
-#include "../bfr/surfaceFactoryCache.h"
-#include "../bfr/faceTopology.h"
-#include "../bfr/faceSurface.h"
-#include "../bfr/regularPatchBuilder.h"
-#include "../bfr/irregularPatchBuilder.h"
-#include "../bfr/patchTree.h"
-
-#include <map>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-//
-//  DEBUG - static variables to keep track of constructed Surfaces
-//        - note that these global variables have extremely limited use:
-//            - they are initialized once per process
-//            - reported and reset on destruction of a SurfaceFactory
-//
-//#define _BFR_DEBUG_TOP_TYPE_STATS
-#ifdef _BFR_DEBUG_TOP_TYPE_STATS
-static int __numLinearPatches     = 0;
-static int __numExpRegularPatches = 0;
-static int __numRegularPatches    = 0;
-static int __numIrregularPatches  = 0;
-static int __numIrregularUncached = 0;
-static int __numIrregularInCache  = 0;
-#endif
-
-//
-//  Definition of the private/nested SurfaceSet class:
-//
-//  This class (essentially a struct) encapsulates a clients specification
-//  of a set of multiple surfaces and their intended interpolation types
-//  (vertex, varying, and face-varying).  The multiple public creation
-//  methods to request common subsets of surfaces all populate an instance
-//  of SurfaceSet for internal use.
-//
-class SurfaceFactory::SurfaceSet {
-public:
-    SurfaceSet() : numSurfs(0), numFVarSurfs(0),
-                   vtxSurf(0), varSurf(0),
-                   fvarSurfs(0), fvarSurfPtrs(0), fvarIDs(0) { }
-
-public:
-    //  Assignment to member variable is intended to be explicit:
-    int numSurfs;
-    int numFVarSurfs;
-
-    typedef internal::SurfaceData SurfaceType;
-
-    SurfaceType  * vtxSurf;
-    SurfaceType  * varSurf;
-    SurfaceType  * fvarSurfs;
-    SurfaceType ** fvarSurfPtrs;
-
-    FVarID const * fvarIDs;
-
-    void InitializeSurfaces() const {
-        if (vtxSurf) vtxSurf->reinitialize();
-        if (varSurf) varSurf->reinitialize();
-        for (int i = 0; i < numFVarSurfs; ++i) {
-            GetFVarSurface(i)->reinitialize();
-        }
-    }
-
-public:
-    //  Access to member variables is preferred through these methods,
-    //  which may require a little more logic than expected:
-    int GetNumSurfaces() const { return numSurfs; }
-
-    bool          HasVertexSurface() const { return (vtxSurf != 0); }
-    SurfaceType * GetVertexSurface() const { return vtxSurf; }
-
-    bool          HasVaryingSurface() const { return (varSurf != 0); }
-    SurfaceType * GetVaryingSurface() const { return varSurf; }
-
-    //  More than one FVar surface may be present, and each may have
-    //  a unique ID:
-    bool HasFVarSurfaces()    const { return numFVarSurfs > 0; }
-    int  GetNumFVarSurfaces() const { return numFVarSurfs; }
-
-    FVarID GetFVarSurfaceID(int i) const {
-        return fvarIDs ? fvarIDs[i] : FVarID(i);
-    }
-
-    SurfaceType * GetFVarSurface(int i)   const {
-        //  Note that FVar Surfaces may be specified either as an
-        //  array of Surfaces or an array of Surface pointers:
-        return fvarSurfs ? (fvarSurfs + i) : fvarSurfPtrs[i];
-    }
-};
-
-
-//
-//  Main constructor and supporting initialization methods:
-//
-SurfaceFactory::SurfaceFactory(Sdc::SchemeType      subdivScheme,
-                               Sdc::Options const & subdivOptions,
-                               Options      const & factoryOptions) :
-        _topologyCache(0) {
-
-    //  Order of operations not important here:
-    setSubdivisionOptions(subdivScheme, subdivOptions);
-    setFactoryOptions(factoryOptions);
-}
-
-void
-SurfaceFactory::setSubdivisionOptions(Sdc::SchemeType      subdivScheme,
-                                      Sdc::Options const & subdivOptions) {
-
-    //  Assign the main member variables before others derived from them:
-    _subdivScheme  = subdivScheme;
-    _subdivOptions = subdivOptions;
-
-    //  Initialize members dependent on subdivision topology:
-    _regFaceSize = Sdc::SchemeTypeTraits::GetRegularFaceSize(_subdivScheme);
-
-    _linearScheme =
-        (Sdc::SchemeTypeTraits::GetLocalNeighborhoodSize(_subdivScheme) == 0);
-
-    _linearFVarInterp = _linearScheme ||
-                       (_subdivOptions.GetFVarLinearInterpolation() ==
-                                 Sdc::Options::FVAR_LINEAR_ALL);
-
-    //  Initialize members related to the "face has limit" test:
-    _rejectSmoothBoundariesForLimit = !_linearScheme &&
-                       (_subdivOptions.GetVtxBoundaryInterpolation() ==
-                                 Sdc::Options::VTX_BOUNDARY_NONE);
-
-    _rejectIrregularFacesForLimit = !_linearScheme && (_regFaceSize == 3);
-
-    _testNeighborhoodForLimit = _rejectSmoothBoundariesForLimit ||
-                                _rejectIrregularFacesForLimit;
-}
-
-void
-SurfaceFactory::setFactoryOptions(Options const & factoryOptions) {
-
-    //  Assign the main member variable before others derived from them:
-    _factoryOptions = factoryOptions;
-
-    if (_factoryOptions.IsCachingEnabled()) {
-        if (_factoryOptions.GetExternalCache()) {
-            _topologyCache = _factoryOptions.GetExternalCache();
-        }
-    }
-}
-
-void
-SurfaceFactory::setInternalCache(SurfaceFactoryCache * cache) {
-
-    //  Remember caching must be on and an external cache takes precedence
-    if (_factoryOptions.IsCachingEnabled()) {
-        if (_factoryOptions.GetExternalCache() == 0) {
-            _topologyCache = cache;
-        }
-    }
-}
-
-SurfaceFactory::~SurfaceFactory() {
-
-#ifdef _BFR_DEBUG_TOP_TYPE_STATS
-//  DEBUG - report and reset inventory:
-printf("SurfaceFactory destructor:\n");
-printf("    __numLinearPatches     = %6d\n", __numLinearPatches);
-printf("    __numExpRegularPatches = %6d\n", __numExpRegularPatches);
-printf("    __numRegularPatches    = %6d\n", __numRegularPatches);
-printf("    __numIrregularPatches  = %6d\n", __numIrregularPatches);
-if (!_factoryOptions.DisableTopologyCache()) {
-printf("\n");
-printf("    __numIrregularUncached = %6d\n", __numIrregularUncached);
-printf("    __numIrregularInCache  = %6d\n", __numIrregularInCache);
-}
-__numLinearPatches     = 0;
-__numExpRegularPatches = 0;
-__numRegularPatches    = 0;
-__numIrregularPatches  = 0;
-__numIrregularUncached = 0;
-__numIrregularInCache  = 0;
-#endif
-}
-
-//
-//  Notes on presence/absence of a limit surface...
-//
-//  Unfortunately it is not trivial to detect when a face does not have
-//  an associated limit surface.  There are a few cases when a face will
-//  not have a limit surface -- divided into simple and complex cases:
-//
-//      - simple:
-//          - the face is a hole
-//          - the face is degenerate (< 3 edges)
-//      - complex:
-//          - boundary interpolation option "none" is assigned:
-//              - in which case some, not all, boundary faces have no limit
-//          - Loop subdivision is applied to non-triangles
-//
-//  The simple cases are, as the name suggests, simple.  But the complex
-//  cases require a greater inspection of the topological neighborhood of
-//  the face.
-//
-//  With boundary faces when "boundary none" is set (not very often) it is
-//  not enough to test if a face is a boundary -- if a boundary face has all
-//  of its incident boundary edges (i.e. all boundary edges incident to all
-//  of its face-vertices) then the boundary face has a limit surface.  This
-//  requires a complete topological description of each corner of the face.
-//
-//  Similarly, the case of Loop subdivision in the presence of non-triangles
-//  required determining if any corner of the face has an incident face
-//  that is not a triangle.
-//
-//  The method here inspects a corner at a time and tries to reject a face
-//  without a limit surface as soon as possible. But most cases are going to
-//  require inspection of all corners -- and that same inspection is likely
-//  to be applied later when constructing the limit.
-//
-inline bool
-SurfaceFactory::faceHasLimitSimple(Index faceIndex, int faceSize) const {
-
-    return (faceSize >= 3) && (faceSize <= Limits::MaxFaceSize()) &&
-           !isFaceHole(faceIndex);
-}
-
-bool
-SurfaceFactory::faceHasLimitNeighborhood(FaceTopology const & topology) const {
-
-    assert(_testNeighborhoodForLimit);
-
-    MultiVertexTag tag = topology.GetTag();
-
-    if ((_rejectSmoothBoundariesForLimit && tag.HasNonSharpBoundary()) ||
-        (_rejectIrregularFacesForLimit   && tag.HasIrregularFaceSizes())) {
-        return false;
-    }
-    return true;
-}
-
-bool
-SurfaceFactory::faceHasLimitNeighborhood(Index faceIndex) const {
-
-    assert(_testNeighborhoodForLimit);
-
-    //
-    //  The FaceTopology was not available, and rather than construct it
-    //  in its entirety, determine a corner at a time and return if any
-    //  corner warrants it:
-    //
-    typedef Vtr::internal::StackBuffer<Index,32,true> CornerIndexBuffer;
-
-    CornerIndexBuffer cFaceVertIndices;
-
-    FaceVertex         faceVtx;
-    VertexDescriptor & vtxDesc = faceVtx.GetVertexDescriptor();
-
-    int faceSize = getFaceSize(faceIndex);
-    for (int i = 0; i < faceSize; ++i) {
-        //  Have the subclass load VertexDescriptor and finalize:
-        faceVtx.Initialize(faceSize, _regFaceSize);
-
-        int faceInRing = populateFaceVertexDescriptor(faceIndex, i, &vtxDesc);
-        if (faceInRing < 0) return false;
-
-        faceVtx.Finalize(faceInRing);
-
-        //  Inspect the tag to reject cases with no limit surface:
-        VertexTag faceVtxTag = faceVtx.GetTag();
-
-        if (_rejectSmoothBoundariesForLimit) {
-            if (faceVtxTag.IsUnOrdered()) {
-                //  Need to load face-vertices, connect faces and inspect...
-                cFaceVertIndices.SetSize(faceVtx.GetNumFaceVertices());
-
-                if (getFaceVertexIncidentFaceVertexIndices(
-                        faceIndex, i, cFaceVertIndices) < 0) return false;
-
-                faceVtx.ConnectUnOrderedFaces(cFaceVertIndices);
-            }
-            if (faceVtxTag.HasNonSharpBoundary()) return false;
-        }
-        if (_rejectIrregularFacesForLimit) {
-            if (faceVtxTag.HasIrregularFaceSizes()) return false;
-        }
-    }
-    return true;
-}
-
-bool
-SurfaceFactory::FaceHasLimitSurface(Index faceIndex) const {
-
-    if (!faceHasLimitSimple(faceIndex, getFaceSize(faceIndex))) {
-        return false;
-    }
-    if (_testNeighborhoodForLimit) {
-        if (!isFaceNeighborhoodRegular(faceIndex, 0, 0)) {
-            return faceHasLimitNeighborhood(faceIndex);
-        }
-    }
-    return true;
-}
-
-Parameterization
-SurfaceFactory::GetFaceParameterization(Index faceIndex) const {
-
-    return Parameterization(_subdivScheme, getFaceSize(faceIndex));
-}
-
-
-//
-//  Namespace with internal utilities to compute keys for unique surface
-//  topologies to help cache their limit surface representations:
-//
-namespace {
-    //  Need to redefine since SurfaceFactoryCache::Key is protected:
-    typedef std::uint64_t KeyIntType;
-
-    //
-    //  Note that the data used in determining a topology key is not
-    //  purely topological.  While most data determines a unique limit
-    //  surface, a few parameters determine the approximation to it
-    //  (e.g. the various adaptive refinement levels) or dictate other
-    //  properties of its representation (e.g. double precision).
-    //
-    //  It may be worth separating these -- writing a method to deal
-    //  with the pure topology first, then combining it with details
-    //  of the representation.
-    //
-
-#ifdef _OPENSUBDIV_BFR_INCLUDE_PACKED_TOPOLOGY_KEY_
-    //
-    //  This alternate function for computing the cache key was applied
-    //  to common topologies with low-valence and simply packs integer
-    //  bitfields with the topology of the face and all of its corners.
-    //
-    //  It is typically 3x faster than the hashing method, but is suited
-    //  for general use. Given the relatively low cost of computing the
-    //  cache key (compared to building an irregular patch) use of this
-    //  faster function is not generally significant, but could become
-    //  so in future when/if other costs are reduced.
-    //
-    //  When the cost of building new patches is very low due to a high
-    //  percentage of cache hits, the cost of computing the cache keys
-    //  (relative to constructing the entire Surface) can rise to over
-    //  10% in extreme cases.
-    //
-    KeyIntType
-    packTopologyKey(FaceSurface const & surface,
-                    IrregularPatchBuilder::Options options) {
-
-        //
-        //  Keep the bitfield struct local in scope unless needed elsewhere:
-        //
-        struct KeyBits {
-            //  Be sure to clear to avoid uninitialized bits:
-            KeyBits() { std::memset(this, 0, sizeof(*this)); }
-
-            //  Bits for general options:
-            KeyIntType subdScheme       :  2;
-            KeyIntType sharpLevel       :  4;
-            KeyIntType smoothLevel      :  4;
-            KeyIntType usesDouble       :  1;
-            KeyIntType unused           :  1;  // future use
-            //  Bits for the corners:
-            KeyIntType v0Valence        :  6;
-            KeyIntType v1Valence        :  6;
-            KeyIntType v2Valence        :  6;
-            KeyIntType v3Valence        :  6;
-            KeyIntType v0IsSharp        :  1;
-            KeyIntType v1IsSharp        :  1;
-            KeyIntType v2IsSharp        :  1;
-            KeyIntType v3IsSharp        :  1;
-            KeyIntType v0IsBoundary     :  1;
-            KeyIntType v1IsBoundary     :  1;
-            KeyIntType v2IsBoundary     :  1;
-            KeyIntType v3IsBoundary     :  1;
-            KeyIntType v0FaceInBoundary :  5;
-            KeyIntType v1FaceInBoundary :  5;
-            KeyIntType v2FaceInBoundary :  5;
-            KeyIntType v3FaceInBoundary :  5;
-
-            //
-            //  Static methods to determine if bitfields can be used:
-            //
-            static bool InteriorValenceFits(int n) { return n < (1 << 6); }
-            static bool BoundaryValenceFits(int n) { return n < (1 << 5); }
-
-            //  A place holder if future Sdc::Options inhibit use of bitfields:
-            static bool OptionsInhibitUsage(Sdc::Options) { return false; }
-        };
-        assert(sizeof(KeyBits) == sizeof(KeyIntType));
-
-        //
-        //  Quickly test if the topology can be packed into bitfields, or
-        //  if hashing must be used.  Bitfields cannot be used when the
-        //  following features are present:
-        //
-        //      - any sharp edges of any kind (semi-sharp or inf-sharp)
-        //      - any semi-sharp vertices (inf-sharp is 1-bit per corner)
-        //      - any incident irregular faces
-        //
-        //  These can quickly be determined by inspecting the topology tags.
-        //  Two other situations are:
-        //
-        //      - any vertex with valence too high (more than ~6 bits)
-        //      - any Sdc::Option that cannot be encoded (in theory only)
-        //
-        //  The former must inspect the valence of each face-vertex, while
-        //  the latter requires inspecting the Sdc::Options -- and this is
-        //  called out more as a future possibility...
-        //
-        //  In theory, if certain Sdc::Options impact the limit surface,
-        //  they might need to be encoded, or might not be able to be fully
-        //  encoded in future.  This is not currently the case in practice:
-        //  boundary interpolation options are essentially unused as the
-        //  boundary conditions are explicitly applied; the creasing method
-        //  can be ignored here because creases cannot be packed; and the
-        //  Catmark triangle subdivision option can be ignored because the
-        //  presence of any irregular faces cannot be packed.
-        //
-
-        //  Immediate rejection of bitfields:
-        MultiVertexTag combinedTag = surface.GetTag();
-        if (combinedTag.HasSharpEdges() ||
-            combinedTag.HasSemiSharpVertices() ||
-            combinedTag.HasIrregularFaceSizes()) {
-            return false;
-        }
-
-        //  Conditional rejection of bitfields for high valence:
-        FaceVertexSubset const * subsets = surface.GetSubsets();
-
-        for (int i = 0; i < surface.GetFaceSize(); ++i) {
-            int valence = subsets[i]._numFacesTotal;
-            if (subsets[i].IsBoundary()) {
-                if (!KeyBits::BoundaryValenceFits(valence)) return false;
-            } else {
-                if (!KeyBits::InteriorValenceFits(valence)) return false;
-            }
-        }
-
-        //  Conditional rejection of bitfields for specific Sdc::Options:
-        if (KeyBits::OptionsInhibitUsage(surface.GetSdcOptionsInEffect())) {
-            return false;
-        }
-
-        //
-        //  Pack the topology of each FaceVertexSubset into bitfields:
-        //
-        KeyBits keyBits;
-
-        keyBits.subdScheme  = surface.GetSdcScheme();
-        keyBits.sharpLevel  = options.sharpLevel;
-        keyBits.smoothLevel = options.smoothLevel;
-        keyBits.usesDouble  = options.doublePrecision;
-
-        keyBits.v0Valence        = subsets[0]._numFacesTotal;
-        keyBits.v0IsSharp        = subsets[0].IsSharp();
-        keyBits.v0IsBoundary     = subsets[0].IsBoundary();
-        keyBits.v0FaceInBoundary = subsets[0]._numFacesBefore;
-
-        keyBits.v1Valence        = subsets[1]._numFacesTotal;
-        keyBits.v1IsSharp        = subsets[1].IsSharp();
-        keyBits.v1IsBoundary     = subsets[1].IsBoundary();
-        keyBits.v1FaceInBoundary = subsets[1]._numFacesBefore;
-
-        keyBits.v2Valence        = subsets[2]._numFacesTotal;
-        keyBits.v2IsSharp        = subsets[2].IsSharp();
-        keyBits.v2IsBoundary     = subsets[2].IsBoundary();
-        keyBits.v2FaceInBoundary = subsets[2]._numFacesBefore;
-
-        if (surface.GetFaceSize() == 4) {
-            keyBits.v3Valence        = subsets[3]._numFacesTotal;
-            keyBits.v3IsSharp        = subsets[3].IsSharp();
-            keyBits.v3IsBoundary     = subsets[3].IsBoundary();
-            keyBits.v3FaceInBoundary = subsets[3]._numFacesBefore;
-        }
-
-        KeyIntType keyValue = 0;
-        std::memcpy(&keyValue, &keyBits, sizeof(KeyIntType));
-        return keyValue;
-    }
-#endif
-
-    //
-    //  Function to assign the topology of any FaceSurface to the desired
-    //  integer using a hashing function that considers all topological
-    //  features (incident face sizes, crease and corner sharpness, etc.):
-    //
-    KeyIntType
-    hashTopologyKey(FaceSurface const & surface,
-                    IrregularPatchBuilder::Options options) {
-
-        //
-        //  Structs for "headers" for the entire surface and each corner,
-        //  to be assigned and copied into a larger buffer to be hashed:
-        //
-        typedef unsigned char uchar;
-
-        struct SurfaceHeader {
-            //  Be sure to clear to avoid uninitialized bits:
-            SurfaceHeader() { std::memset(this, 0, sizeof(*this)); }
-
-            short faceSize;
-            uchar subdScheme;
-            uchar subdCreasing;
-            uchar subdTriSmooth;
-            uchar sharpLevel;
-            uchar smoothLevel;
-            uchar usesDouble;
-        };
-        struct CornerHeader {
-            //  Be sure to clear to avoid uninitialized bits:
-            CornerHeader() { std::memset(this, 0, sizeof(*this)); }
-
-            short numFaces;
-            short faceInBoundary;
-
-            uchar isBoundary    : 1;
-            uchar isInfSharp    : 1;
-            uchar isSemiSharp   : 1;
-            uchar hasFaceSizes  : 1;
-            uchar hasSharpEdges : 1;
-        };
-
-        //
-        //  Consider using a "delimiter" between corners in the buffer of
-        //  data to be hashed, i.e. a value with a distinct bit pattern
-        //  such as -1, to help prevent aliasing (may not be needed):
-        //
-        int  delimiter = -1;
-        bool useCornerDelimiter = false;
-
-        //
-        //  Local buffers for accumulating and hashing:
-        //
-        Vtr::internal::StackBuffer<float,16,true> floatBuffer;
-        Vtr::internal::StackBuffer<short,16,true> shortBuffer;
-
-        Vtr::internal::StackBuffer<char,256,true> hashBuffer;
-
-        //
-        //  Determine size of the main buffer to hash ahead of time:
-        //
-        //  Note there is some redundancy in the use of the uncommon
-        //  faces sizes and sharp edges around each corner due to the
-        //  way the corners' incident faces overlap. For typical cases
-        //  the extra data used is not large. Only in extreme cases is
-        //  it likely to be an issue -- but then the added processing
-        //  and construction costs associated with such cases (e.g.
-        //  high valence vertices, heavy use of creasing) will make
-        //  make the overhead here insignificant.
-        //
-        size_t hashBufferSize = sizeof(SurfaceHeader);
-
-        int faceSize = surface.GetFaceSize();
-        for (int i = 0; i < faceSize; ++i) {
-            FaceVertexSubset const & cSub = surface.GetCornerSubset(i);
-
-            int N = cSub.GetNumFaces();
-
-            hashBufferSize += sizeof(CornerHeader);
-
-            hashBufferSize += cSub._tag.IsSemiSharp() ?
-                              sizeof(float) : 0;
-            hashBufferSize += cSub._tag.HasUnCommonFaceSizes() ?
-                             (sizeof(short) * N) : 0;
-            hashBufferSize += cSub._tag.HasSharpEdges() ?
-                             (sizeof(float) * (N - cSub.IsBoundary())) : 0;
-
-            hashBufferSize += useCornerDelimiter ? sizeof(delimiter) : 0;
-        }
-        hashBuffer.SetSize((int)hashBufferSize);
-
-        //
-        //  Start populating the buffer with the surface header:
-        //
-        Sdc::Options subdOptions = surface.GetSdcOptionsInEffect();
-
-        SurfaceHeader sHeader;
-        sHeader.faceSize      = (short) faceSize;
-        sHeader.subdScheme    = (uchar) surface.GetSdcScheme();
-        sHeader.subdCreasing  = (uchar) subdOptions.GetCreasingMethod();
-        sHeader.subdTriSmooth = (uchar) subdOptions.GetTriangleSubdivision();
-        sHeader.sharpLevel    = (uchar) options.sharpLevel;
-        sHeader.smoothLevel   = (uchar) options.smoothLevel;
-        sHeader.usesDouble    = (uchar) options.doublePrecision;
-
-        std::memcpy(hashBuffer, &sHeader, sizeof(sHeader));
-
-        //
-        //  Populate the buffer for each corner of the surface:
-        //
-        char * bufferPtr = hashBuffer + sizeof(sHeader);
-
-        for (int corner = 0; corner < faceSize; ++corner) {
-            FaceVertex       const & cTop = surface.GetCornerTopology(corner);
-            FaceVertexSubset const & cSub = surface.GetCornerSubset(corner);
-
-            //  Assign the corner header:
-            CornerHeader cHeader;
-            cHeader.numFaces       = (short) cSub.GetNumFaces();
-            cHeader.faceInBoundary = cSub._numFacesBefore;
-            cHeader.isBoundary     = cSub.IsBoundary();
-            cHeader.isInfSharp     = cSub.IsSharp();
-            cHeader.isSemiSharp    = cSub._tag.IsSemiSharp();
-            cHeader.hasFaceSizes   = cSub._tag.HasUnCommonFaceSizes();
-            cHeader.hasSharpEdges  = cSub._tag.HasSharpEdges();
-
-            std::memcpy(bufferPtr, &cHeader, sizeof(cHeader));
-            bufferPtr += sizeof(cHeader);
-
-            if (cHeader.isSemiSharp) {
-                float sharpness = (cSub._localSharpness > 0.0f)
-                                ?  cSub._localSharpness
-                                :  cTop.GetVertexSharpness();
-                std::memcpy(bufferPtr, &sharpness, sizeof(sharpness));
-                bufferPtr += sizeof(sharpness);
-            }
-            if (cHeader.hasFaceSizes) {
-                int n = cSub.GetNumFaces();
-                shortBuffer.SetSize(n);
-                for (int i = 0, f = cTop.GetFaceFirst(cSub); i < n;
-                                f = cTop.GetFaceNext(f), ++i) {
-                    shortBuffer[i] = (short) cTop.GetFaceSize(f);
-                }
-                std::memcpy(bufferPtr, shortBuffer, n * sizeof(short));
-                bufferPtr += n * sizeof(short);
-            }
-            if (cHeader.hasSharpEdges) {
-                int n = cSub.GetNumFaces() - cSub.IsBoundary();
-                floatBuffer.SetSize(n);
-                for (int i = 0, f = cTop.GetFaceFirst(cSub); i < n;
-                                f = cTop.GetFaceNext(f), ++i) {
-                    floatBuffer[i] = cTop.GetFaceEdgeSharpness(f, 1);
-                }
-                std::memcpy(bufferPtr, floatBuffer, n * sizeof(float));
-                bufferPtr += n * sizeof(float);
-            }
-
-            if (useCornerDelimiter) {
-                std::memcpy(bufferPtr, &delimiter, sizeof(delimiter));
-                bufferPtr += sizeof(delimiter);
-            }
-        }
-        assert((bufferPtr - hashBuffer) == (int)hashBufferSize);
-
-        return internal::Hash64(hashBuffer, hashBufferSize);
-    }
-}
-
-//
-//  Methods supporting construction of linear, regular and irregular patches:
-//
-void
-SurfaceFactory::assignLinearSurface(SurfaceType * surfacePtr,
-        Index faceIndex, FVarID const * fvarPtrOrVtx) const {
-
-    SurfaceType & surface = *surfacePtr;
-
-    //  Initialize instance members from the associated irregular patch:
-    int faceSize  = getFaceSize(faceIndex);
-
-    surface.setParam(Parameterization(_subdivScheme, faceSize));
-
-    surface.setRegular(faceSize == _regFaceSize);
-    surface.setLinear(true);
-
-    surface.setRegPatchMask(0);
-    if (_regFaceSize == 4) {
-        surface.setRegPatchType(Far::PatchDescriptor::QUADS);
-    } else {
-        surface.setRegPatchType(Far::PatchDescriptor::TRIANGLES);
-    }
-
-    //
-    //  Finally, gather patch control points from the appropriate indices:
-    //
-    Index * surfaceCVs = surface.resizeCVs(faceSize);
-
-    int count = 0;
-    if (fvarPtrOrVtx == 0) {
-        count = getFaceVertexIndices(faceIndex, surfaceCVs);
-    } else {
-        count = getFaceFVarValueIndices(faceIndex, *fvarPtrOrVtx, surfaceCVs);
-    }
-    //  If subclass fails to get indices, Surface will remain invalid
-    if (count < faceSize) return;
-
-    surface.setValid(true);
-#ifdef _BFR_DEBUG_TOP_TYPE_STATS
-__numLinearPatches ++;
-#endif
-}
-
-void
-SurfaceFactory::assignRegularSurface(SurfaceType * surfacePtr,
-        Index const patchPoints[]) const {
-
-    SurfaceType & surface = *surfacePtr;
-
-    //
-    //  Assign the parameterization and discriminants first:
-    //
-    surface.setParam(Parameterization(_subdivScheme, _regFaceSize));
-
-    surface.setRegular(true);
-    surface.setLinear(false);
-
-    //
-    //  Assemble the regular patch:
-    //
-    surface.setRegPatchType(RegularPatchBuilder::GetPatchType(_regFaceSize));
-    surface.setRegPatchMask(RegularPatchBuilder::GetBoundaryMask(_regFaceSize,
-                                                                  patchPoints));
-
-    //
-    //  Copy the patch control points from the given indices:
-    //
-    int patchSize = RegularPatchBuilder::GetPatchSize(_regFaceSize);
-
-    Index const * pSrc = patchPoints;
-    Index       * pDst = surface.resizeCVs(patchSize);
-
-    //  Remember to replace negative indices in boundary patches:
-    if (surface.getRegPatchMask() == 0) {
-        std::memcpy(pDst, pSrc, patchSize * sizeof(Index));
-    } else {
-        //  Consider delegating this task to the RegularPatchBuilder:
-        Index pPhantom = pSrc[5];
-        assert(pPhantom >= 0);
-        for (int i = 0; i < patchSize; ++i) {
-            pDst[i] = (pSrc[i] < 0) ? pPhantom : pSrc[i];
-        }
-    }
-
-    surface.setValid(true);
-#ifdef _BFR_DEBUG_TOP_TYPE_STATS
-__numExpRegularPatches ++;
-#endif
-}
-
-void
-SurfaceFactory::assignRegularSurface(SurfaceType * surfacePtr,
-        FaceSurface const & descriptor) const {
-
-    SurfaceType & surface = *surfacePtr;
-
-    //
-    //  Assign the parameterization and discriminants first:
-    //
-    surface.setParam(Parameterization(_subdivScheme, _regFaceSize));
-
-    surface.setRegular(true);
-    surface.setLinear(false);
-
-    //
-    //  Assemble the regular patch:
-    //
-    RegularPatchBuilder builder(descriptor);
-
-    surface.setRegPatchType(builder.GetPatchType());
-    surface.setRegPatchMask(builder.GetPatchParamBoundaryMask());
-
-    //
-    //  Gather the patch control points from the given indices:
-    //
-    builder.GatherControlVertexIndices(
-            surface.resizeCVs(builder.GetNumControlVertices()));
-
-    surface.setValid(true);
-#ifdef _BFR_DEBUG_TOP_TYPE_STATS
-__numRegularPatches ++;
-#endif
-}
-
-void
-SurfaceFactory::assignIrregularSurface(SurfaceType * surfacePtr,
-        FaceSurface const & descriptor) const {
-
-    //
-    //  A builder for the irregular patch is required regardless of
-    //  whether a new instance is constructed:
-    //
-    IrregularPatchBuilder::Options buildOptions;
-
-    buildOptions.sharpLevel      = _factoryOptions.GetApproxLevelSharp();
-    buildOptions.smoothLevel     = _factoryOptions.GetApproxLevelSmooth();
-    buildOptions.doublePrecision = surfacePtr->isDouble();
-
-    IrregularPatchBuilder builder(descriptor, buildOptions);
-
-    //
-    //  Construct a new irregular patch or identify one from the cache:
-    //
-    internal::IrregularPatchSharedPtr patch(0);
-
-    if (_topologyCache == 0) {
-        patch = builder.Build();
-    } else {
-        //
-        //  Compute the cache key for the topology of this face, search the
-        //  cache for an existing patch and build/add one if not found:
-        //
-        //  Be sure to use the return result of Add() when adding as it may
-        //  be the case that another thread added a patch with the same key
-        //  while this one was being built. Using the instance assigned to
-        //  the cache intentionally releases the one built here.
-        //
-        SurfaceFactoryCache::KeyType key =
-                hashTopologyKey(descriptor, buildOptions);
-
-        patch = _topologyCache->Find(key);
-        if (patch == 0) {
-            patch = _topologyCache->Add(key, builder.Build());
-#ifdef _BFR_DEBUG_TOP_TYPE_STATS
-__numIrregularInCache ++;
-#endif
-        }
-    }
-
-    //
-    //  Assign the Surface parameterization, discriminants and patch:
-    //
-    SurfaceType & surface = *surfacePtr;
-
-    surface.setParam(Parameterization(_subdivScheme, descriptor.GetFaceSize()));
-
-    surface.setRegular(false);
-    surface.setLinear(false);
-
-    surface.setIrregPatchPtr(patch);
-
-    //  Gather the patch control points from the given indices:
-    builder.GatherControlVertexIndices(
-            surface.resizeCVs(patch->GetNumControlPoints()));
-
-    surface.setValid(true);
-#ifdef _BFR_DEBUG_TOP_TYPE_STATS
-__numIrregularPatches  ++;
-__numIrregularUncached += surface.ownsIrregPatch();
-#endif
-}
-
-void
-SurfaceFactory::copyNonLinearSurface(
-        SurfaceType       * surfaceDstPtr,
-        SurfaceType const & surfaceSrc,
-        FaceSurface const & descriptor) const {
-
-    SurfaceType & surfaceDst = *surfaceDstPtr;
-
-    //  Should be creating a linear patch directly rather than copying:
-    assert(!surfaceSrc.isLinear());
-
-    //
-    //  Assign the topological fields of the patch first:
-    //
-    surfaceDst.setParam(surfaceSrc.getParam());
-
-    surfaceDst.setLinear(surfaceSrc.isLinear());
-    surfaceDst.setRegular(surfaceSrc.isRegular());
-
-    surfaceDst.resizeCVs(surfaceSrc.getNumCVs());
-
-    //
-    //  Assign regular/irregular fields and gather control points:
-    //
-    if (surfaceDst.isRegular()) {
-        surfaceDst.setRegPatchType(surfaceSrc.getRegPatchType());
-        surfaceDst.setRegPatchMask(surfaceSrc.getRegPatchMask());
-
-        RegularPatchBuilder builder(descriptor);
-        assert(builder.GetNumControlVertices() == surfaceDst.getNumCVs());
-
-        builder.GatherControlVertexIndices(surfaceDst.getCVIndices());
-#ifdef _BFR_DEBUG_TOP_TYPE_STATS
-__numRegularPatches ++;
-#endif
-    } else {
-        surfaceDst.setIrregPatchPtr(surfaceSrc.getIrregPatchPtr());
-
-        IrregularPatchBuilder builder(descriptor);
-        assert(builder.GetNumControlVertices() == surfaceDst.getNumCVs());
-
-        builder.GatherControlVertexIndices(surfaceDst.getCVIndices());
-#ifdef _BFR_DEBUG_TOP_TYPE_STATS
-__numIrregularPatches  ++;
-#endif
-    }
-
-    surfaceDst.setValid(true);
-}
-
-
-//
-//  Methods to deal with topology assembly and inspection:
-//
-//  Note the difference between the "init" and "gather" methods:  "init"
-//  fully resolves and initializes the topology by gathering face indices
-//  locally and dealing with unordered faces if present, while the "gather"
-//  method simply gathers the corner information -- allowing indices to be
-//  provided for further use if needed.
-//
-bool
-SurfaceFactory::initFaceNeighborhoodTopology(Index faceIndex,
-        FaceTopology * faceTopologyPtr) const {
-
-    FaceTopology & topology = *faceTopologyPtr;
-
-    if (!gatherFaceNeighborhoodTopology(faceIndex, &topology)) {
-        return false;
-    }
-    if (!topology.HasUnOrderedCorners()) {
-        return true;
-    }
-
-    //  Gather the indices to determine topology between unordered faces:
-    typedef Vtr::internal::StackBuffer<Index,72,true> IndexBuffer;
-
-    IndexBuffer indices(topology._numFaceVertsTotal);
-    if (gatherFaceNeighborhoodIndices(faceIndex, topology, 0, indices) < 0) {
-        return false;
-    }
-    topology.ResolveUnOrderedCorners(indices);
-    return true;
-}
-
-bool
-SurfaceFactory::gatherFaceNeighborhoodTopology(Index faceIndex,
-        FaceTopology * faceTopologyPtr) const {
-
-    FaceTopology & faceTopology = *faceTopologyPtr;
-
-    int N = getFaceSize(faceIndex);
-
-    faceTopology.Initialize(N);
-
-    for (int i = 0; i < N; ++i) {
-        FaceVertex       & faceVtx = faceTopology.GetTopology(i);
-        VertexDescriptor & vtxDesc = faceVtx.GetVertexDescriptor();
-
-        faceVtx.Initialize(N, _regFaceSize);
-
-        //  Subclass returning negative here indicates unsupported features
-        //  or some other kind of failure:
-        int faceInRing = populateFaceVertexDescriptor(faceIndex, i, &vtxDesc);
-        if (faceInRing < 0) return false;
-
-        faceVtx.Finalize(faceInRing);
-    }
-
-    faceTopology.Finalize();
-
-    return true;
-}
-
-int
-SurfaceFactory::gatherFaceNeighborhoodIndices(Index faceIndex,
-        FaceTopology const & faceTopology,
-        FVarID       const * fvarPtrOrVtx,
-        Index                controlIndices[]) const {
-
-    int faceSize = faceTopology.GetFaceSize();
-
-    Index * indices  = controlIndices;
-    int     nIndices = 0;
-
-    for (int i = 0; i < faceSize; ++i) {
-        int numFaceVerts = (fvarPtrOrVtx == 0) ?
-                getFaceVertexIncidentFaceVertexIndices(faceIndex, i,
-                        indices) :
-                getFaceVertexIncidentFaceFVarValueIndices(faceIndex, i,
-                        *fvarPtrOrVtx, indices);
-
-        if (numFaceVerts != faceTopology.GetNumFaceVertices(i)) {
-            return -1;
-        }
-
-        indices  += numFaceVerts;
-        nIndices += numFaceVerts;
-    }
-    return nIndices;
-}
-
-bool
-SurfaceFactory::isFaceNeighborhoodRegular(Index          faceIndex,
-                                          FVarID const * fvarPtrOrVtx,
-                                          Index          indices[]) const {
-    return (fvarPtrOrVtx == 0) ?
-        getFaceNeighborhoodVertexIndicesIfRegular(faceIndex, indices) :
-        getFaceNeighborhoodFVarValueIndicesIfRegular(faceIndex, *fvarPtrOrVtx,
-                                                     indices);
-}
-
-//
-//  Main internal methods to populate set of limit Surfaces:
-//
-bool
-SurfaceFactory::populateAllSurfaces(Index faceIndex,
-        SurfaceSet * surfaceSetPtr) const {
-
-    SurfaceSet & surfaces = *surfaceSetPtr;
-
-    //  Abort if no Surfaces are specified to populate:
-    if (surfaces.GetNumSurfaces() == 0) {
-        return false;
-    }
-
-    //
-    //  Be sure to re-initialize all Surfaces up-front, rather than
-    //  deferring it to the assignment of each.  A failure of any one
-    //  surface may leave others unvisited -- leaving it unchanged
-    //  from previous use.
-    //
-    surfaces.InitializeSurfaces();
-
-    //  Quickly reject faces with no limit (typically holes) -- some cases
-    //  require full topological inspection and will be rejected later:
-    if (!faceHasLimitSimple(faceIndex, getFaceSize(faceIndex))) {
-        return false;
-    }
-
-    //  Determine if we have any non-linear cases to deal with -- which
-    //  require gathering and inspection of the full neighborhood around
-    //  the given face:
-    int numFVarSurfaces = surfaces.GetNumFVarSurfaces();
-
-    bool hasNonLinearSurfaces =
-                (surfaces.HasVertexSurface() && !_linearScheme) ||
-                (numFVarSurfaces && !_linearFVarInterp);
-
-    bool hasLinearSurfaces =
-                 surfaces.HasVaryingSurface() ||
-                (surfaces.HasVertexSurface() && _linearScheme) ||
-                (numFVarSurfaces && _linearFVarInterp);
-
-    if (hasNonLinearSurfaces || _testNeighborhoodForLimit) {
-        if (!populateNonLinearSurfaces(faceIndex, &surfaces)) {
-            return false;
-        }
-    }
-    if (hasLinearSurfaces) {
-        if (!populateLinearSurfaces(faceIndex, &surfaces)) {
-            return false;
-        }
-    }
-    return true;
-}
-
-bool
-SurfaceFactory::populateLinearSurfaces(Index faceIndex,
-        SurfaceSet * surfaceSetPtr) const {
-
-    SurfaceSet & surfaces = *surfaceSetPtr;
-
-    if (surfaces.HasVaryingSurface()) {
-        assignLinearSurface(surfaces.GetVaryingSurface(), faceIndex, 0);
-    }
-
-    if (_linearScheme && surfaces.HasVertexSurface()) {
-        assignLinearSurface(surfaces.GetVertexSurface(), faceIndex, 0);
-    }
-
-    if (_linearFVarInterp) {
-        int numFVarSurfaces = surfaces.GetNumFVarSurfaces();
-        for (int i = 0; i < numFVarSurfaces; ++i) {
-            FVarID fvarID = surfaces.GetFVarSurfaceID(i);
-            assignLinearSurface(surfaces.GetFVarSurface(i), faceIndex, &fvarID);
-        }
-    }
-    return true;
-}
-
-bool
-SurfaceFactory::populateNonLinearSurfaces(Index faceIndex,
-        SurfaceSet * surfaceSetPtr) const {
-
-    SurfaceSet & surfaces = *surfaceSetPtr;
-
-    typedef Vtr::internal::StackBuffer<Index,72,true> IndexBuffer;
-
-    bool vtxIsNonLinear  = surfaces.HasVertexSurface() && !_linearScheme;
-    bool fvarIsNonLinear = surfaces.HasFVarSurfaces()  && !_linearFVarInterp;
-    bool anyNonLinear    = vtxIsNonLinear || fvarIsNonLinear;
-
-    //
-    //  First need to determine the vertex topology of the face and take
-    //  appropriate action based on inputs.  It may be the case that the
-    //  topology is only used to determine if the non-linear face has a
-    //  limit surface and no non-linear surfaces are generated here (and
-    //  linear varying or face-varying surfaces are determined elsewhere).
-    //
-    //  So determine the topology and deal with any required tests for
-    //  the presence of limit surface.
-    //
-    //  If the face is "explicitly regular", i.e. the subclass can provide
-    //  an immediate regular patch representation, the more tedious work
-    //  to assemble the more general topological representation is avoided.
-    //
-    //  Note that while the vertex surface may be explicitly regular, if
-    //  the face-varying topology does not match, i.e. there is a UV seam
-    //  present around the face, the more general topological representation
-    //  will be necessary to deal with a potentially irregular face-varying
-    //  surface.
-    //
-    FaceTopology faceTopology(_subdivScheme, _subdivOptions);
-    IndexBuffer  vtxIndices(16);
-    FaceSurface  vtxSurfDesc;
-
-    bool vtxIsExplicitlyRegular =
-                isFaceNeighborhoodRegular(faceIndex, 0, vtxIndices);
-    if (vtxIsExplicitlyRegular) {
-        if (_testNeighborhoodForLimit && !anyNonLinear) {
-            return true;
-        }
-    } else {
-        //
-        //  Three steps are required to get full topological description:
-        //      - gathering the full description of the neighborhood
-        //      - gathering vertex indices for the neighborhood
-        //      - using the indices to resolve any unordered topology
-        //  Gathering indices for the vertex surface and/or to resolve
-        //  unordered topology is conditional.
-        //
-        if (!gatherFaceNeighborhoodTopology(faceIndex, &faceTopology)) {
-            return false;
-        }
-        if (vtxIsNonLinear || faceTopology.HasUnOrderedCorners()) {
-            vtxIndices.SetSize(faceTopology._numFaceVertsTotal);
-            if (gatherFaceNeighborhoodIndices(faceIndex, faceTopology, 0,
-                        vtxIndices) < 0) {
-                return false;
-            }
-            if (faceTopology.HasUnOrderedCorners()) {
-                faceTopology.ResolveUnOrderedCorners(vtxIndices);
-            }
-        }
-        if (_testNeighborhoodForLimit) {
-            if (!faceHasLimitNeighborhood(faceTopology)) {
-                return false;
-            } else if (!anyNonLinear) {
-                return true;
-            }
-        }
-
-        //  Initialize the vertex surface descriptor for use creating both
-        //  the vertex Surface and any non-linear FVar Surfaces:
-        vtxSurfDesc.Initialize(faceTopology, vtxIndices);
-    }
-
-    //
-    //  Construct the Surface for vertex topology first, as face-varying
-    //  surfaces that match topology may make use of it:
-    //
-    bool vtxSurfIsValid = false;
-    if (vtxIsNonLinear) {
-        SurfaceType & vtxSurf = *surfaces.GetVertexSurface();
-
-        if (vtxIsExplicitlyRegular) {
-            assignRegularSurface(&vtxSurf, vtxIndices);
-        } else if (vtxSurfDesc.IsRegular()) {
-            assignRegularSurface(&vtxSurf, vtxSurfDesc);
-        } else {
-            assignIrregularSurface(&vtxSurf, vtxSurfDesc);
-        }
-        vtxSurfIsValid = vtxSurf.isValid();
-    }
-
-    //
-    //  Construct the Surface for the given face-varying topologies --
-    //  all of which are potentially distinct.
-    //
-    //  If the vertex topology is explicitly regular, the face-varying
-    //  surface can only make use of it if it shares the same topology
-    //  and the subclass provides corresponding control points.
-    //
-    //  In all other cases the full topological description and the full
-    //  description of the vertex surface must be provided.  The set of
-    //  face-varying indices must then be gathered and used to create a
-    //  face-varying surface descriptor, which uses the indices to find
-    //  the relevant face-varying subsets for each corner.
-    //
-    if (fvarIsNonLinear) {
-        //  We can re-use the vertex index buffer for face-varying indices:
-        IndexBuffer & fvIndices = vtxIndices;
-
-        int numFVarSurfaces = surfaces.GetNumFVarSurfaces();
-        for (int i = 0; i < numFVarSurfaces; ++i) {
-            SurfaceType & fvarSurf = *surfaces.GetFVarSurface(i);
-            FVarID        fvarID   =  surfaces.GetFVarSurfaceID(i);
-
-            //  First check if trivially regular, quickly assign and continue:
-            bool fvarIsExplicitlyRegular = vtxIsExplicitlyRegular &&
-                    isFaceNeighborhoodRegular(faceIndex, &fvarID, fvIndices);
-
-            if (fvarIsExplicitlyRegular) {
-                assignRegularSurface(&fvarSurf, fvIndices);
-                continue;
-            }
-
-            //  Make sure topology, indices and vertex surface are initialized
-            //  (will not be if vertex surface was explicitly regular):
-            if (!vtxSurfDesc.IsInitialized()) {
-                if (!initFaceNeighborhoodTopology(faceIndex, &faceTopology)) {
-                    return false;
-                }
-                vtxSurfDesc.Initialize(faceTopology, 0);
-            }
-            fvIndices.SetSize(faceTopology._numFaceVertsTotal);
-
-            //  Gather FVar indices and initialize FVar surface descriptor:
-            if (gatherFaceNeighborhoodIndices(faceIndex, faceTopology,
-                    &fvarID, fvIndices) < 0) {
-                return false;
-            }
-
-            FaceSurface fvarSurfDesc(vtxSurfDesc, fvIndices);
-
-            //  Detect matching or other topology and dispatch accordingly:
-            if (fvarSurfDesc.FVarTopologyMatchesVertex() && vtxSurfIsValid) {
-                copyNonLinearSurface(&fvarSurf, *surfaces.GetVertexSurface(),
-                                     fvarSurfDesc);
-            } else if (fvarSurfDesc.IsRegular()) {
-                assignRegularSurface(&fvarSurf, fvarSurfDesc);
-            } else {
-                assignIrregularSurface(&fvarSurf, fvarSurfDesc);
-            }
-        }
-    }
-    return true;
-}
-
-//
-//  Main internal method to initialize instances of Surface:
-//
-bool
-SurfaceFactory::initSurfaces(Index faceIndex,
-        internal::SurfaceData * vtxSurface,
-        internal::SurfaceData * varSurface,
-        internal::SurfaceData * fvarSurfaces,
-        int                     fvarCount,
-        FVarID const            fvarIDs[]) const {
-
-    //  Note the SurfaceData for the first FVar Surface is assumed below
-    //  to be the head of an array of SurfaceData, which will not be true
-    //  if additional members are added to Surface<REAL> in future:
-    assert(sizeof(internal::SurfaceData) == sizeof(Surface<float>));
-
-    SurfaceSet surfaces;
-
-    surfaces.vtxSurf      = vtxSurface;
-    surfaces.varSurf      = varSurface;
-    surfaces.fvarSurfs    = fvarSurfaces;
-    surfaces.fvarIDs      = fvarIDs;
-    surfaces.numFVarSurfs = fvarCount;
-    surfaces.numSurfs     = fvarCount + (vtxSurface != 0) + (varSurface != 0);
-
-    return populateAllSurfaces(faceIndex, &surfaces);
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactory.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactory.h
deleted file mode 100644
index c0040d6dd..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactory.h
+++ /dev/null
@@ -1,563 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_SURFACE_FACTORY_H
-#define OPENSUBDIV3_BFR_SURFACE_FACTORY_H
-
-#include "../version.h"
-
-#include "../bfr/surface.h"
-#include "../bfr/surfaceFactoryMeshAdapter.h"
-#include "../sdc/options.h"
-#include "../sdc/types.h"
-
-#include <cstdint>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Forward declarations of public and internal classes used by factories:
-//
-class SurfaceFactoryCache;
-class FaceTopology;
-class FaceSurface;
-
-///
-/// @brief Base class providing initialization of a Surface for each face
-///        of a mesh
-///
-/// SurfaceFactory is an abstract class that provides the majority of
-/// the implementation and the interface for a factory that initializes
-/// instances of Surface for the faces of a mesh.
-///
-/// A subclass of SurfaceFactory is written to support a specific type
-/// of connected mesh. The public interface of SurfaceFactory is both
-/// inherited by and extended by the subclasses. Expected extensions to
-/// the interface include one or more constructors (i.e. given a specific
-/// instance of the subclass' mesh type) as well as other methods that
-/// may involve the mesh's data types (primvars) in their native form.
-///
-/// By inheriting the SurfaceFactoryMeshAdapter interface, SurfaceFactory
-/// requires its subclasses to implement the small suite of pure
-/// virtual methods to complete the factory's implementation for the
-/// subclass' mesh type. These methods provide the base factory with
-/// topological information about faces of that mesh -- from which it
-/// creates instances of Surface defining their limit surface.
-///
-/// The SurfaceFactory inherits rather than contains SurfaceFactoryMeshAdapter
-/// as instances of SurfaceFactoryMeshAdapter serve no purpose on their own,
-/// and the interface between the two is designed with the specific needs
-/// of the SurfaceFactory. When customizing a subclass of SurfaceFactory
-/// for a particular mesh type, this inheritance also avoids the need to
-/// coordinate the subclass of SurfaceFactory with the separate subclass
-/// of SurfaceFactoryMeshAdapter.
-///
-/// It must be emphasized that a subclass of SurfaceFactory is written to
-/// support a specific type of "connected" mesh -- not simply a container
-/// of data defining a mesh. The SurfaceFactoryMeshAdapter interface describes
-/// the complete topological neighborhood around a specific face, and
-/// without any connectivity between mesh components (e.g. given a vertex,
-/// what are its incident faces?), satisfying these methods will be
-/// impossible, or, at best, extremely inefficient.
-///
-/// Ultimately a subclass of SurfaceFactory is expected to be a lightweight
-/// interface to a connected mesh -- lightweight in terms of both time and
-/// memory usage. It's construction is expected to be trivial, after which
-/// it can quickly and efficiently provide a Surface for one or more faces
-/// of a mesh for immediate evaluation. So construction of an instance of
-/// a subclass should involve no heavy pre-processing -- the greater the
-/// overhead of a subclass constructor, the more it violates the intention
-/// of the base class as a lightweight interface.
-///
-/// Instances of SurfaceFactory are initialized with a set of Options that
-/// form part of the state of the factory and remain fixed for its lifetime.
-/// Such options are intended to ensure that the instances of Surface that
-/// it creates are consistent, as well as to enable/disable or otherwise
-/// manage caching for construction efficiency -- either internally or
-/// between itself and other factories (advanced).
-///
-class SurfaceFactory : public SurfaceFactoryMeshAdapter {
-public:
-    ///
-    /// @brief Simple set of options assigned to instances of SurfaceFactory
-    ///
-    /// The Options class is a simple container specifying options for the
-    /// construction of the SurfaceFactory to be applied during its lifetime.
-    ///
-    /// These options currently include choices to identify a default
-    /// face-varying ID, to control caching behavior (on or off, use of
-    /// external vs internal cache), and to control the accuracy of the
-    /// resulting limit surface representations.
-    ///
-    class Options {
-    public:
-        Options() : _dfltFVarID(-1), _externCache(0), _enableCache(true),
-                    _approxLevelSmooth(2), _approxLevelSharp(6) { }
-
-        /// @brief Assign the default face-varying ID (none assigned by
-        ///        default)
-        Options & SetDefaultFVarID(FVarID id);
-        /// @brief Return the default face-varying ID
-        FVarID GetDefaultFVarID() const { return _dfltFVarID; }
-
-        /// @brief Enable or disable caching (default is true):
-        Options & EnableCaching(bool on);
-        /// @brief Return if caching is enable
-        bool IsCachingEnabled() const { return _enableCache; }
-
-        /// @brief Assign an external cache to override the internal
-        Options & SetExternalCache(SurfaceFactoryCache * c);
-        /// @brief Return any assigned external cache
-        SurfaceFactoryCache * GetExternalCache() const { return _externCache; }
-
-        //  Set refinement levels used to approximate the limit surface
-        //  for smooth and sharp features (reasonable defaults assigned):
-        /// @brief Assign maximum refinement level for smooth features
-        Options & SetApproxLevelSmooth(int level);
-        /// @brief Return maximum refinement level for smooth features
-        int GetApproxLevelSmooth() const { return _approxLevelSmooth; }
-
-        /// @brief Assign maximum refinement level for sharp features
-        Options & SetApproxLevelSharp(int level);
-        /// @brief Return maximum refinement level for sharp features
-        int GetApproxLevelSharp() const { return _approxLevelSharp; }
-
-    private:
-        //  Member variables:
-        FVarID _dfltFVarID;
-
-        SurfaceFactoryCache * _externCache;
-
-        unsigned char _enableCache : 1;
-        unsigned char _approxLevelSmooth;
-        unsigned char _approxLevelSharp;
-    };
-
-public:
-    ~SurfaceFactory() override;
-
-    //@{
-    /// @name Simple queries of subdivision properties
-    ///
-    /// Simple queries to inspect subdivision properties.
-    ///
-
-    /// @brief Return the subdivision scheme
-    Sdc::SchemeType GetSchemeType() const { return _subdivScheme; }
-
-    /// @brief Return the set of subdivision options
-    Sdc::Options GetSchemeOptions() const { return _subdivOptions; }
-    //@}
-
-public:
-    //@{
-    /// @name Simple queries influencing Surface construction
-    ///
-    /// Methods to quickly inspect faces that influence Surface construction.
-    ///
-    /// A small set of methods is useful to inspect faces in order to
-    /// determine if their corresponding Surfaces should be initialized.
-    /// The Surface initialization methods will fail when a limit surface
-    /// does exist, so the methods here are intended for purposes when
-    /// that simple failure on initialization is not suitable, e.g. to
-    /// address some kind of pre-processing need prior to the initialization
-    /// of any Surfaces.
-    ///
-
-    /// @brief Return if a specified face has a limit surface
-    ///
-    /// This method determines if a face has an associated limit surface,
-    /// and so supports initialization of Surface for evaluation. This
-    /// is usually the case, except when the face is tagged as a hole, or
-    /// due to the use of uncommon boundary interpolation options (i.e.
-    /// Sdc::Options::VTX_BOUNDARY_NONE). The test of a hole is trivial,
-    /// but the boundary test is not when such uncommon options are used.
-    ///
-    bool FaceHasLimitSurface(Index faceIndex) const;
-
-    /// @brief Return the Parameterization of a face with a limit surface
-    ///
-    /// This method simply returns the Parameterization of the specified
-    /// face. It is presumed the face has an existing limit surface and
-    /// so is a quick and simple accessor.
-    ///
-    Parameterization GetFaceParameterization(Index faceIndex) const;
-    //@}
-
-public:
-    //@{
-    /// @name Methods to initialize Surfaces
-    ///
-    /// Methods to initialize instances of Surface for a specific face.
-    ///
-    /// Given the different interpolation types for data associated with
-    /// mesh vertices (i.e. vertex, varying and face-varying data), the
-    /// topology of the limit surface potentially (likely) differs between
-    /// them. So it is necessary to specify the type of data to be associated
-    /// with the Surface. Methods exist to initialize a single surface for
-    /// each of the three data types, and to initialize multiple surfaces
-    /// for different data types at once (which will avoid repeated effort
-    /// in a single-threaded context).
-    /// 
-    /// Failure of these initialization methods is expected (and so to be
-    /// tested) when a face has no limit surface -- either due to it being
-    /// a hole or through the use of less common boundary interpolation
-    /// options. Failure is also possible if the subclass fails to provide
-    /// a valid topological description of the face. (WIP - consider more
-    /// extreme failure for these cases, e.g. possible assertions.)
-    ///
-
-    /// @brief Initialize a Surface for vertex data
-    ///
-    /// @param  faceIndex Index of face with limit surface of interest
-    /// @param  surface   Surface to initialize for vertex data
-    /// @return           True if the face has a limit surface and it was
-    ///                   successfully constructed
-    ///
-    template <typename REAL>
-    bool InitVertexSurface(Index faceIndex, Surface<REAL> * surface) const;
-
-    /// @brief Initialize a Surface for varying data
-    ///
-    /// @param  faceIndex Index of face with limit surface of interest
-    /// @param  surface   Surface to initialize for varying data
-    /// @return           True if the face has a limit surface and it was
-    ///                   successfully constructed
-    ///
-    template <typename REAL>
-    bool InitVaryingSurface(Index faceIndex, Surface<REAL> * surface) const;
-
-    /// @brief Initialize a Surface for the default face-varying data
-    ///
-    /// For this variant, no explicit face-varying ID is specified. The
-    /// default is determined from the Options with which the SurfaceFactory
-    /// was created (assignment of that default is required).
-    ///
-    /// @param  faceIndex Index of face with limit surface of interest
-    /// @param  surface   Surface to initialize for face-varying data
-    /// @return           True if the face has a limit surface, the default
-    ///                   face-varying ID was valid, and its Surface was
-    ///                   successfully constructed
-    ///
-    template <typename REAL>
-    bool InitFaceVaryingSurface(Index faceIndex, Surface<REAL> * surface) const;
-
-    /// @brief Initialize a Surface for specified face-varying data
-    ///
-    /// @param  faceIndex Index of face with limit surface of interest
-    /// @param  surface   Surface to initialize for face-varying data
-    /// @param  fvarID    Identifier of a specific set of face-varying data
-    /// @return           True if the face has a limit surface, the given
-    ///                   face-varying ID was valid, and its Surface was
-    ///                   successfully constructed
-    ///
-    template <typename REAL>
-    bool InitFaceVaryingSurface(Index faceIndex, Surface<REAL> * surface,
-                                                 FVarID          fvarID) const;
-
-    ///
-    /// @brief Initialize multiple Surfaces at once
-    ///
-    /// This method initializes multiple Surfaces at once -- for any
-    /// combination of the three different data interpolation types.
-    /// Its use is recommended when two are more surfaces are known to
-    /// be non-linear, which will avoid the repeated effort if each 
-    /// Surface is individually initialized.
-    ///
-    /// Arguments are ordered here to satisfy common cases easily with
-    /// the use of optional arguments for less common cases.
-    ///
-    /// @param  faceIndex    Index of face with limit surfaces of interest
-    /// @param  vtxSurface   Surface to initialize for vertex data
-    /// @param  fvarSurfaces Surface array to initialize for face-varying data
-    /// @param  fvarIDs      Array of face-varying IDs corresponding to the
-    ///                      face-varying Surfaces to be initialized
-    ///                      (optional -- defaults to an integer sequence
-    ///                      [0 .. fvarCount-1] if absent)
-    /// @param  fvarCount    Size of array of face-varying Surfaces (optional)
-    /// @param  varSurface   Surface to initialize for varying data (optional)
-    /// @return              True if the face has a limit surface, any given
-    ///                      face-varying IDs were valid, and all Surfaces
-    ///                      were successfully constructed.
-    ///
-    template <typename REAL>
-    bool InitSurfaces(Index faceIndex, Surface<REAL> * vtxSurface,
-                                       Surface<REAL> * fvarSurfaces,
-                                       FVarID const    fvarIDs[] = 0,
-                                       int             fvarCount = 0,
-                                       Surface<REAL> * varSurface = 0) const;
-    //@}
-
-    //@{
-    /// @name Methods to construct Surfaces
-    ///
-    /// Methods to both allocate and initialize a single Surface.
-    //
-    //      WIP - considering removing these since non-essential
-    //
-
-    /// @brief Construct a Surface for vertex data
-    template <typename REAL=float>
-    Surface<REAL> * CreateVertexSurface(Index faceIndex) const;
-
-    /// @brief Construct a Surface for varying data
-    template <typename REAL=float>
-    Surface<REAL> * CreateVaryingSurface(Index faceIndex) const;
-
-    /// @brief Construct a Surface for the default face-varying data
-    template <typename REAL=float>
-    Surface<REAL> * CreateFaceVaryingSurface(Index faceIndex) const;
-
-    /// @brief Construct a Surface for specified face-varying data
-    template <typename REAL=float>
-    Surface<REAL> * CreateFaceVaryingSurface(Index faceIndex, FVarID id) const;
-    //@}
-
-protected:
-    //@{
-    /// @name Protected methods supporting subclass construction
-    ///
-    /// Protected methods supporting subclass construction.
-    ///
-
-    ///
-    /// @brief Constructor to be used by subclasses
-    ///
-    /// Construction requires specification of the subdivision scheme and
-    /// options associated with the mesh (as is the case with other classes
-    /// in Far). These will typically reflect the settings in the mesh but
-    /// can also be used to override them -- as determined by the subclass.
-    /// Common uses of overrides are to assign a subdivision scheme to a
-    /// simple polygonal mesh, or to change the face-varying interpolation
-    /// for the faster linear interpolation of UVs.
-    ///
-    SurfaceFactory(Sdc::SchemeType      schemeType,
-                   Sdc::Options const & schemeOptions,
-                   Options      const & limitOptions);
-
-    /// @brief Subclass to identify an internal cache for use by base class
-    void setInternalCache(SurfaceFactoryCache * cache);
-
-    SurfaceFactory(SurfaceFactory const &) = delete;
-    SurfaceFactory & operator=(SurfaceFactory const &) = delete;
-    //@}
-
-private:
-    //  Supporting internal methods:
-    void setSubdivisionOptions(Sdc::SchemeType, Sdc::Options const & options);
-    void setFactoryOptions(Options const & factoryOptions);
-
-    bool faceHasLimitSimple(Index faceIndex, int faceSize) const;
-
-    bool faceHasLimitNeighborhood(Index faceIndex) const;
-    bool faceHasLimitNeighborhood(FaceTopology const & faceTopology) const;
-
-    class SurfaceSet;
-
-    bool populateAllSurfaces(      Index faceIndex, SurfaceSet * sSetPtr) const;
-    bool populateLinearSurfaces(   Index faceIndex, SurfaceSet * sSetPtr) const;
-    bool populateNonLinearSurfaces(Index faceIndex, SurfaceSet * sSetPtr) const;
-
-    bool initSurfaces(Index faceIndex, internal::SurfaceData * vtxSurface,
-                                       internal::SurfaceData * varSurface,
-                                       internal::SurfaceData * fvarSurfaces,
-                                       int           fvarCount,
-                                       FVarID const  fvarIDs[]) const;
-
-    //  Methods to assemble topology and corresponding indices for entire face:
-    bool isFaceNeighborhoodRegular(Index          faceIndex,
-                                   FVarID const * fvarPtrOrVtx,
-                                   Index          indices[]) const;
-
-    bool initFaceNeighborhoodTopology(Index          faceIndex,
-                                      FaceTopology * topology) const;
-
-    bool gatherFaceNeighborhoodTopology(Index          faceIndex,
-                                        FaceTopology * topology) const;
-
-    int gatherFaceNeighborhoodIndices(Index                faceIndex,
-                                      FaceTopology const & topology,
-                                      FVarID       const * fvarPtrOrVtx,
-                                      Index                indices[]) const;
-
-    //  Methods to assemble Surfaces for the different categories of patch:
-    typedef internal::SurfaceData SurfaceType;
-
-    void assignLinearSurface(SurfaceType  * surfacePtr,
-                             Index          faceIndex,
-                             FVarID const * fvarPtrOrVtx) const;
-
-    void assignRegularSurface(SurfaceType * surfacePtr,
-                              Index const   surfacePatchPoints[]) const;
-
-    void assignRegularSurface(SurfaceType       * surfacePtr,
-                              FaceSurface const & surfaceDescription) const;
-
-    void assignIrregularSurface(SurfaceType       * surfacePtr,
-                                FaceSurface const & surfaceDescription) const;
-
-    void copyNonLinearSurface(SurfaceType       * surfacePtr,
-                              SurfaceType const & surfaceSource,
-                              FaceSurface const & surfaceDescription) const;
-
-private:
-    //  Members describing options and subdivision properties (very little
-    //  memory and low initialization cost)
-    Sdc::SchemeType _subdivScheme;
-    Sdc::Options    _subdivOptions;
-    Options         _factoryOptions;
-
-    //  Members related to subdivision topology, options and limit tests:
-    unsigned int _linearScheme      : 1;
-    unsigned int _linearFVarInterp  : 1;
-
-    unsigned int _testNeighborhoodForLimit       : 1;
-    unsigned int _rejectSmoothBoundariesForLimit : 1;
-    unsigned int _rejectIrregularFacesForLimit   : 1;
-
-    int  _regFaceSize;
-
-    //  Members related to caching:
-    SurfaceFactoryCache mutable * _topologyCache;
-};
-
-//
-//  Inline methods for Options:
-//
-inline SurfaceFactory::Options &
-SurfaceFactory::Options::SetDefaultFVarID(FVarID id) {
-    _dfltFVarID = id;
-    return *this;
-}
-inline SurfaceFactory::Options &
-SurfaceFactory::Options::EnableCaching(bool on) {
-    _enableCache = on;
-    return *this;
-}
-inline SurfaceFactory::Options & 
-SurfaceFactory::Options::SetExternalCache(SurfaceFactoryCache * c) {
-    _externCache = c;
-    return *this;
-}
-inline SurfaceFactory::Options &
-SurfaceFactory::Options::SetApproxLevelSmooth(int level) {
-    _approxLevelSmooth = (unsigned char) level;
-    return *this;
-}
-inline SurfaceFactory::Options &
-SurfaceFactory::Options::SetApproxLevelSharp(int level) {
-    _approxLevelSharp = (unsigned char) level;
-    return *this;
-}
-
-//
-//  Inline methods to initializes Surfaces:
-//
-template <typename REAL>
-inline bool
-SurfaceFactory::InitVertexSurface(Index face, Surface<REAL> * s) const {
-
-    return initSurfaces(face, &s->getSurfaceData(), 0, 0, 0, 0);
-}
-template <typename REAL>
-inline bool
-SurfaceFactory::InitVaryingSurface(Index face, Surface<REAL> * s) const {
-
-    return initSurfaces(face, 0, &s->getSurfaceData(), 0, 0, 0);
-}
-template <typename REAL>
-inline bool
-SurfaceFactory::InitFaceVaryingSurface(Index face, Surface<REAL> * s,
-                                                   FVarID fvarID) const {
-    return initSurfaces(face, 0, 0, &s->getSurfaceData(), 1, &fvarID);
-}
-template <typename REAL>
-inline bool
-SurfaceFactory::InitFaceVaryingSurface(Index face, Surface<REAL> * s) const {
-    FVarID dfltID = _factoryOptions.GetDefaultFVarID();
-    return initSurfaces(face, 0, 0, &s->getSurfaceData(), 1, &dfltID);
-}
-
-template <typename REAL>
-inline bool
-SurfaceFactory::InitSurfaces(Index faceIndex, Surface<REAL> * vtxSurface,
-        Surface<REAL> * fvarSurfaces, FVarID const fvarIDs[], int fvarCount,
-        Surface<REAL> * varSurface) const {
-
-    bool useDfltFVarID = fvarSurfaces && (fvarIDs == 0) && (fvarCount == 0);
-    FVarID dfltFVarID = useDfltFVarID ? _factoryOptions.GetDefaultFVarID() : 0;
-
-    return initSurfaces(faceIndex,
-                        vtxSurface    ? &vtxSurface->getSurfaceData()   : 0,
-                        varSurface    ? &varSurface->getSurfaceData()   : 0,
-                        fvarSurfaces  ? &fvarSurfaces->getSurfaceData() : 0,
-                        fvarCount     ? fvarCount : (fvarSurfaces != 0),
-                        useDfltFVarID ? &dfltFVarID : fvarIDs);
-}
-
-//
-//  Inline methods to allocate and initialize Surfaces:
-//
-template <typename REAL>
-inline Surface<REAL> *
-SurfaceFactory::CreateVertexSurface(Index faceIndex) const {
-    Surface<REAL> * s = new Surface<REAL>();
-    if (InitVertexSurface<REAL>(faceIndex, s)) return s;
-    delete s;
-    return 0;
-}
-template <typename REAL>
-inline Surface<REAL> *
-SurfaceFactory::CreateVaryingSurface(Index faceIndex) const {
-    Surface<REAL> * s = new Surface<REAL>();
-    if (InitVaryingSurface<REAL>(faceIndex, s)) return s;
-    delete s;
-    return 0;
-}
-template <typename REAL>
-inline Surface<REAL> *
-SurfaceFactory::CreateFaceVaryingSurface(Index faceIndex, FVarID fvarID) const {
-    Surface<REAL> * s = new Surface<REAL>();
-    if (InitFaceVaryingSurface<REAL>(faceIndex, s, fvarID)) return s;
-    delete s;
-    return 0;
-}
-template <typename REAL>
-inline Surface<REAL> *
-SurfaceFactory::CreateFaceVaryingSurface(Index face) const {
-    FVarID dfltID = _factoryOptions.GetDefaultFVarID();
-    return CreateFaceVaryingSurface<REAL>(face, dfltID);
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_SURFACE_FACTORY_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactoryCache.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactoryCache.cpp
deleted file mode 100644
index ba75a8a13..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactoryCache.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/surfaceFactoryCache.h"
-#include "../bfr/patchTree.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Trivial constructor and destructor:
-//
-SurfaceFactoryCache::SurfaceFactoryCache() : _map() {
-}
-
-SurfaceFactoryCache::~SurfaceFactoryCache() {
-    //  Potentially monitor usage on destruction
-}
-
-
-//
-//  Internal methods to find and add map entries:
-//
-SurfaceFactoryCache::DataType
-SurfaceFactoryCache::find(KeyType const & key) const {
-
-    MapType::const_iterator itFound = _map.find(key);
-    return (itFound != _map.end()) ? itFound->second : DataType(0);
-}
-
-SurfaceFactoryCache::DataType
-SurfaceFactoryCache::add(KeyType const & key, DataType const & data) {
-
-    MapType::const_iterator itFound = _map.find(key);
-    return (itFound != _map.end()) ? itFound->second : (_map[key] = data);
-}
-
-//
-//  Virtual method defaults -- intended to be overridden for thread-safety:
-//
-SurfaceFactoryCache::DataType
-SurfaceFactoryCache::Find(KeyType const & key) const {
-
-    return find(key);
-}
-
-SurfaceFactoryCache::DataType
-SurfaceFactoryCache::Add(KeyType const & key, DataType const & data) {
-
-    return add(key, data);
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactoryCache.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactoryCache.h
deleted file mode 100644
index a62c4614a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactoryCache.h
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_SURFACE_FACTORY_CACHE_H
-#define OPENSUBDIV3_BFR_SURFACE_FACTORY_CACHE_H
-
-#include "../version.h"
-
-#include "../bfr/irregularPatchType.h"
-
-#include <map>
-#include <cstdint>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-///
-/// @brief Container used internally by SurfaceFactory to store reusable
-///        information
-///
-/// SurfaceFactoryCache is a container for storing/caching instances of
-/// the internal representation of complex patches used by SurfaceFactory
-/// so that they can be quickly identified and retrieved for reuse.
-///
-/// It is intended for internal use by SurfaceFactory.  Public access is
-/// available but limited to construction only -- allowing an instance to
-/// be reused by assigning it to more than one SurfaceFactory.
-///
-//
-//  Initial/expected use requires simple searches of and additions to the
-//  cache by the SurfaceFactory or its Builders.  Longer term, with the
-//  possibility of instances of caches being shared between meshes and
-//  factories, additional options and/or public methods may be warranted
-//  to limit what is cached or to prune the cache if it gets too large.
-//
-class SurfaceFactoryCache {
-public:
-    SurfaceFactoryCache();
-    virtual ~SurfaceFactoryCache();
-
-    SurfaceFactoryCache(SurfaceFactoryCache const &) = delete;
-    SurfaceFactoryCache & operator=(SurfaceFactoryCache const &) = delete;
-
-protected:
-    /// @cond PROTECTED
-    //  Access restricted to the Factory, its Builders, etc.
-    friend class SurfaceFactory;
-
-    typedef std::uint64_t                     KeyType;
-    typedef internal::IrregularPatchSharedPtr DataType;
-    /// @endcond PROTECTED
-
-protected:
-    /// @cond PROTECTED
-    size_t Size() const { return _map.size(); }
-
-    //
-    //  Potential overrides by subclasses for thread-safety:
-    //
-    virtual DataType Find(KeyType const & key) const;
-    virtual DataType Add(KeyType const & key, DataType const & data);
-
-    //
-    //  Common implementation used by all subclasses:
-    //
-    DataType find(KeyType const & key) const;
-    DataType add(KeyType const & key, DataType const & data);
-    /// @endcond PROTECTED
-
-private:
-    typedef std::map<KeyType, DataType> MapType;
-
-    MapType _map;
-};
-
-///
-/// @brief Template for declaring thread-safe subclasses of SurfaceFactoryCache
-///
-/// SurfaceFactoryCacheThreaded extends SurfaceFactoryCache by protecting
-/// access to the cache to ensure thread-safe operation. A mutex type and
-/// associated locks are specified to declare a subclass with appropriately
-/// protected read and write access.
-///
-/// @tparam MUTEX_TYPE            A mutex type with supported lock guards
-/// @tparam READ_LOCK_GUARD_TYPE  A scoped lock guard allowing potentially
-///                               shared access for read operations.
-/// @tparam WRITE_LOCK_GUARD_TYPE A scoped lock guard allowing exclusive
-///                               access for write operations.
-///
-//  Separate read and write locks are provided to support mutex types
-//  allowing shared (read) or exclusive (write) access.
-// 
-template <class MUTEX_TYPE, class READ_LOCK_GUARD_TYPE,
-                            class WRITE_LOCK_GUARD_TYPE>
-class SurfaceFactoryCacheThreaded : public SurfaceFactoryCache {
-public:
-    SurfaceFactoryCacheThreaded() : SurfaceFactoryCache() { }
-    ~SurfaceFactoryCacheThreaded() override = default;
-
-protected:
-    /// @cond PROTECTED
-    //
-    //  Virtual overrides from base:
-    //
-    DataType Find(KeyType const & key) const override {
-        READ_LOCK_GUARD_TYPE lockGuard(_mutex);
-        return find(key);
-    }
-
-    DataType Add(KeyType const & key, DataType const & data) override {
-        WRITE_LOCK_GUARD_TYPE lockGuard(_mutex);
-        return add(key, data);
-    }
-    /// @endcond PROTECTED
-
-private:
-    MUTEX_TYPE mutable _mutex;
-};
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_SURFACE_FACTORY_CACHE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactoryMeshAdapter.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactoryMeshAdapter.h
deleted file mode 100644
index e9a221657..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/surfaceFactoryMeshAdapter.h
+++ /dev/null
@@ -1,236 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_SURFACE_FACTORY_ADAPTER_H
-#define OPENSUBDIV3_BFR_SURFACE_FACTORY_ADAPTER_H
-
-#include "../version.h"
-
-#include <cstdint>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-class VertexDescriptor;
-
-///
-/// @brief Abstract interface adapting SurfaceFactory to a connected mesh
-///        representation
-///
-//  SurfaceFactoryMeshAdapter is an abstract class that defines the interface
-//  through which subclasses of SurfaceFactory adapt to a connected mesh
-//  representation. The interface defines methods that describe the mesh
-//  topology and control indices in the neighborhood of a mesh -- from
-//  which the SurfaceFactory to identifies an appropriate limit surface.
-//
-//  SurfaceFactoryMeshAdapter methods require a subclass to provide a complete
-//  description of the topology around a base face, as well as indices
-//  associated with it (both vertex and face-varying).  The intent here is
-//  to keep the number of methods required to a minimum, and also to minimize
-//  the number of invocations required by the factory.
-//
-//  With the need to support both linear and non-linear cases (for which
-//  linear is trivial by comparison) and the limit surface for both vertex
-//  and face-varying topologies, the result is a small set of methods
-//  covering this matrix of functionality.
-//
-//  Since face-varying data may differ in topology from the vertex data --
-//  with each set of face-varying data potentially having its own unique
-//  topology -- sets of face-varying data are uniquely distinguished by an
-//  associated integer (a face-varying ID).
-//
-class SurfaceFactoryMeshAdapter {
-public:
-    /// @brief Integer type representing a mesh index
-    typedef int Index;
-
-    /// @brief Type used to identify and specify face-varying primvars
-    ///
-    /// A face-varying ID is used to specify face-varying primvars for
-    /// evaluation so that they can be identified by the subclass for
-    /// the mesh.  It can be assigned as either a positive integer ID
-    /// or pointer, with the subclass determining its interpretation.
-    ///
-    /// Often only one face-varying primvar is of interest, so a default
-    /// can be assigned to the factory to avoid repeated specification.
-    ///
-    typedef std::intptr_t FVarID;
-
-protected:
-    /// @cond PROTECTED
-    SurfaceFactoryMeshAdapter() { }
-    virtual ~SurfaceFactoryMeshAdapter() { }
-    /// @endcond
-
-protected:
-    //@{
-    /// @name Methods to query simple face properties
-    ///
-    /// Methods to return simple properties associated with a face.
-    ///
-
-    /// @brief Returns if a face is a hole
-    virtual bool isFaceHole(Index faceIndex) const = 0;
-
-    /// @brief Returns the size of a face (number of vertices)
-    virtual int getFaceSize(Index faceIndex) const = 0;
-    //@}
-
-    //@{
-    /// @name Methods to gather indices for the face's vertices
-    ///
-    /// These methods gather indices associated with the vertices of a
-    /// face, e.g. the indices of the vertices themselves, or the indices
-    /// of face-varying values associated with the vertices. These are
-    /// used to quickly deal with linear limit surfaces without any
-    /// inspection of the neighboring topology.
-    ///
-
-    /// @brief Gather the indices of the face's vertices
-    virtual int getFaceVertexIndices(Index faceIndex,
-                    Index vertexIndices[]) const = 0;
-
-    /// @brief Gather the face-varying indices of the face's vertices
-    virtual int getFaceFVarValueIndices(Index faceIndex,
-                    FVarID fvarID, Index fvarValueIndices[]) const = 0;
-    //@}
-
-protected:
-    //@{
-    /// @name Methods to identify the neighborhood of a face-vertex
-    ///
-    /// These methods identify the topology and associated indices for
-    /// the complete set of incident faces surrounding a corner (or
-    /// face-vertex) of a face.
-    ///
-    /// Methods here use "FaceVertex" in the name to emphasize that they
-    /// require information for a particular corner vertex of the face.
-    ///
-    /// The topology around the face-vertex is described by populating a
-    /// given instance of a simple VertexDescriptor class -- which fully
-    /// describes the face-vertex, it incident faces and any sharpness
-    /// assigned at or around the face-vertex.  (See the comments with
-    /// the VertexDescriptor definition for more details.)
-    ///
-    /// Additional methods are then required to identify indices for the
-    /// incident faces around a face-vertex. One method gathers the
-    /// indices for control vertices of the mesh assigned to the incident
-    /// faces (their VertexIndices), while the other gathers indices for
-    /// a particular set of face-varying values assigned to them (their
-    /// FVarValueIndices).
-    ///
-    /// Both methods expect the incident faces to be ordered consistent
-    /// with the specification in VertexDescriptor, and all indices for
-    /// all incident faces are required.
-    ///
-    /// The order of indices assigned to each face for these methods must
-    /// also be specified relative to the face-vertex, rather than the
-    /// way the face is defined.  For example, if a quad Q is defined by
-    /// the four vertices {A, B, C, D}, when gathering the indices for Q
-    /// as part of face-vertex C, the indices should be specified starting
-    /// with C, i.e. as {C, D, A, B}.  Ordering indices this way makes it
-    /// much easier for the factory to identify when face-varying topology
-    /// differs from the vertex topology, and both the face-varying and
-    /// vertex indices are ordered this way for consistency.
-    ///
- 
-    /// @brief Describe the topology of incident faces around a face-vertex
-    virtual int populateFaceVertexDescriptor(
-                    Index faceIndex, int faceVertex,
-                    VertexDescriptor * vertexDescriptor) const = 0;
- 
-    /// @brief Gather vertex indices of incident faces around a face-vertex
-    virtual int getFaceVertexIncidentFaceVertexIndices(
-                    Index faceIndex, int faceVertex,
-                    Index vertexIndices[]) const = 0;
-
-    /// @brief Gather face-varying indices of incident faces around a
-    ///        face-vertex
-    virtual int getFaceVertexIncidentFaceFVarValueIndices(
-                    Index faceIndex, int faceVertex,
-                    FVarID fvarID, Index fvarValueIndices[]) const = 0;
-    //@}
-
-protected:
-    //@{
-    /// @name Optional methods for purely regular topology
-    ///
-    /// Optional methods for advanced use to accelerate the case of
-    /// purely regular topology around a face.
-    ///
-    /// For cases when a mesh can quickly determine if the neighborhood
-    /// around a faces is purely regular, these methods can be used to
-    /// quickly identify the control point indices for the corresponding
-    /// regular patch defining its limit surface. In doing so, the more
-    /// tedious topological assembly requiring information about each
-    /// face-vertex can be avoided.
-    ///
-    /// The indices returned must be ordered according to the regular
-    /// patch type corresponding to the subdivision scheme of the mesh.
-    /// Boundary vertices are allowed and indicated by an Index of -1.
-    ///
-    /// The face-varying version will only be invoked if the vertex
-    /// version is purely regular, in which case, the face-varying
-    /// topology is expected to be similar.
-    ///
-    /// Note that these methods allow the caller (the SurfaceFactory) to
-    /// pass nullptr (0) for the index arrays -- in which case only the
-    /// return value should be provided.
-    ///
-    virtual bool getFaceNeighborhoodVertexIndicesIfRegular(
-            Index faceIndex, Index vertexIndices[]) const;
-
-    virtual bool getFaceNeighborhoodFVarValueIndicesIfRegular(
-            Index faceIndex, FVarID fvarID, Index fvarValueIndices[]) const;
-    //@}
-
-private:
-    //  No private members
-};
-
-//
-//  Inline defaults for optional methods:
-//
-inline bool
-SurfaceFactoryMeshAdapter::getFaceNeighborhoodVertexIndicesIfRegular(
-        Index, Index[]) const {
-    return false;
-}
-
-inline bool
-SurfaceFactoryMeshAdapter::getFaceNeighborhoodFVarValueIndicesIfRegular(
-        Index, FVarID, Index[]) const {
-    return false;
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_SURFACE_FACTORY_ADAPTER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/tessellation.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/tessellation.cpp
deleted file mode 100644
index 266a9523f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/tessellation.cpp
+++ /dev/null
@@ -1,2504 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/tessellation.h"
-
-#include <cstring>
-#include <cstdio>
-#include <cassert>
-#include <limits>
-#include <algorithm>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Tessellation patterns are composed of concentric rings of points (or
-//  "coords" for coordinates) and facets -- beginning with the boundary
-//  and moving inward.  Each ring of can be further divided into subsets
-//  corresponding elements associated with each edge.
-//
-//  While the nature of these rings is similar for the different types of
-//  parameterizations, each is different enough to have warranted its own
-//  implementation at a high level.  Lower level utilities for assembling
-//  the rings from strips of coords and facets are common to all.
-//
-//  WIP - consider moving some of these implementation details to separate
-//        internal header and source files
-//
-namespace {
-    //
-    //  Simple classes to provide array-like interfaces to the primitive
-    //  data buffers passed by clients.  Both parametric coordinate pairs
-    //  and the integer tuples (size 3 or 4) representing a single facet
-    //  of a tessellation are represented here.
-    //
-    //  These array interfaces are "minimal" in the sense that they provide
-    //  only what is needed here -- rather than trying to support a wider
-    //  range of use where full generality is needed (e.g. the arithmetic
-    //  operators are limited to those used here for advancing through and
-    //  assigning elements of the array, so the full range required for
-    //  arbitrary address arithmetic are not included).
-    //
-    //  Both arrays support a user-specified stride within which the tuple
-    //  for the coord or facet is assigned.
-    //
-
-    //  Floating point pair and its array for points of a tessellation:
-    template <typename REAL>
-    class Coord2 {
-    public:
-        Coord2(REAL * data) : _uv(data) { }
-        Coord2() : _uv(0) { }
-        ~Coord2() { }
-
-        void Set(REAL u, REAL v) { _uv[0] = u, _uv[1] = v; }
-
-        REAL const & operator[](int index) const { return _uv[index]; }
-        REAL       & operator[](int index)       { return _uv[index]; }
-
-    private:
-        REAL * _uv;
-    };
-
-    template <typename REAL>
-    class Coord2Array {
-    public:
-        Coord2Array(REAL * data, int stride) : _data(data), _stride(stride) { }
-        Coord2Array() : _data(0), _stride(2) { }
-        ~Coord2Array() { }
-
-        Coord2Array operator+(int offset) {
-            return Coord2Array(_data + offset*_stride, _stride);
-        }
-
-        Coord2<REAL> operator[](int index) {
-            return Coord2<REAL>(_data + index*_stride);
-        }
-
-    private:
-        REAL * _data;
-        int    _stride;
-    };
-
-    //  Integer 3- or 4-tuple and its array for facets of a tessellation:
-    class Facet {
-    public:
-        Facet(int * indices, int n) : _T(indices), _size(n) { }
-        Facet() : _T(0), _size(4) { }
-        ~Facet() { }
-
-        void Set(int a, int b, int c) {
-            //  Assign size-1 to ensure last index of 4-tuple is set
-            _T[_size - 1] = -1;
-            _T[0] = a, _T[1] = b, _T[2] = c;
-        }
-        void Set(int a, int b, int c, int d) {
-            _T[0] = a, _T[1] = b, _T[2] = c, _T[3] = d;
-        }
-
-        int const & operator[](int index) const { return _T[index]; }
-        int       & operator[](int index)       { return _T[index]; }
-
-    private:
-        int * _T;
-        int   _size;
-    };
-
-    class FacetArray {
-    public:
-        FacetArray(int * data, int size, int stride) :
-                _data(data), _size(size), _stride(stride) { }
-        ~FacetArray() { }
-
-        FacetArray operator+(int offset) {
-            return FacetArray(_data + offset*_stride, _size, _stride);
-        }
-
-        Facet operator[](int index) {
-            return Facet(_data + index*_stride, _size);
-        }
-
-    private:
-        FacetArray() : _data(0), _size(4), _stride(4) { }
-
-        int * _data;
-        int   _size;
-        int   _stride;
-    };
-
-    //
-    //  Functions for assembling simple, common sets of coordinate pairs:
-    //
-    template <typename REAL>
-    inline int
-    appendUIsoLine(Coord2Array<REAL> P, int n, REAL u, REAL v, REAL dv) {
-
-        for (int i = 0; i < n; ++i, v += dv) {
-            P[i].Set(u,v);
-        }
-        return n;
-    }
-
-    template <typename REAL>
-    inline int
-    appendVIsoLine(Coord2Array<REAL> P, int n, REAL u, REAL v, REAL du) {
-
-        for (int i = 0; i < n; ++i, u += du) {
-            P[i].Set(u,v);
-        }
-        return n;
-    }
-
-    template <typename REAL>
-    inline int
-    appendUVLine(Coord2Array<REAL> P, int n, REAL u, REAL v, REAL du, REAL dv) {
-
-        for (int i = 0; i < n; ++i, u += du, v += dv) {
-            P[i].Set(u,v);
-        }
-        return n;
-    }
-
-    //
-    //  Functions for assembling simple, common sets of facets:
-    //
-    inline int
-    appendTri(FacetArray facets, int t0, int t1, int t2) {
-
-        facets[0].Set(t0, t1, t2);
-        return 1;
-    }
-
-    inline int
-    appendQuad(FacetArray facets, int q0, int q1, int q2, int q3,
-                  int triangulationSign) {
-
-        if (triangulationSign == 0) {
-            // no triangulation
-            facets[0].Set(q0, q1, q2, q3);
-            return 1;
-        } else if (triangulationSign > 0) {
-            // triangulate along diagonal in direction of leading edge
-            facets[0].Set(q0, q1, q2);
-            facets[1].Set(q2, q3, q0);
-            return 2;
-        } else {
-            // triangulate along diagonal opposing the leading edge
-            facets[0].Set(q2, q3, q1);
-            facets[1].Set(q0, q1, q3);
-            return 2;
-        }
-    }
-
-    inline int
-    appendTriFan(FacetArray facets, int size, int startIndex) {
-
-        for (int i = 1; i <= size; ++i) {
-            facets[i-1].Set(startIndex + (i - 1),
-                            startIndex + ((i < size) ? i : 0),
-                            startIndex + size);
-        }
-        return size;
-    }
-
-    //
-    //  Useful struct for storing bounding indices and other topology of
-    //  a strip of facets so points can be connected in various ways:
-    //
-    //  A strip of facets is defined between an outer and inner ring of
-    //  points -- denoted as follows, where the "i" and "o" prefixes are
-    //  used to designate points on the inner and outer rings:
-    //
-    //    oPrev  ---  iFirst  ... iFirst+/-i ...  iLast    --- oLast+1
-    //      |                                                    |
-    //    oFirst --- oFirst+1 ...  oFirst+j ... oFirst+N-1 --- oLast
-    //
-    //  Since these points form part of a ring, they will wrap around to
-    //  the beginning of the ring for the last edge and so the sequence
-    //  is not always sequential.  Transitions to the "first" and "last"
-    //  of both the outer and inner rings are potentially discontinuous,
-    //  which is why they are provided as separate members.
-    //
-    //  This topological structure is similar but slightly different for
-    //  quad-based versus triangular parameterizations.  For quad-based
-    //  parameterizations the parametric range of the inner and outer
-    //  sequences are the same, but for triangular, the extent of the
-    //  inner ring is one edge less (and the triangular domain may be
-    //  offset a half edge length so that uniformly spaced points on
-    //  both will alternate).
-    //
-    struct FacetStrip {
-    public:
-        FacetStrip() { std::memset((void*) this, 0, sizeof(*this)); }
-
-        int connectUniformQuads(    FacetArray facets) const;
-        int connectUniformTris(     FacetArray facets) const;
-        int connectNonUniformFacets(FacetArray facets) const;
-
-    public:
-        //  Members defining how the strip should be used:
-        unsigned int quadTopology    : 1;
-        unsigned int quadTriangulate : 1;
-        unsigned int innerReversed   : 1;
-
-        unsigned int excludeFirstFace : 1;
-        unsigned int splitFirstFace   : 1;
-        unsigned int splitLastFace    : 1;
-        unsigned int includeLastFace  : 1;
-
-        //  Members defining the dimensions of the strip -- the number
-        //  of "inner edges" potentially excludes the two edges that
-        //  connect the inner ring to the outer:
-        int outerEdges;
-        int innerEdges;
-
-        //  Members containing indices for points noted above.  Since
-        //  a strip may wrap around the concentric rings of points,
-        //  pairs of points that may appear to have successive indices
-        //  will not -- which is why these are assigned externally:
-        int outerFirst, outerLast, outerPrev;
-        int innerFirst, innerLast;
-    };
-
-    int
-    FacetStrip::connectUniformQuads(FacetArray facets) const {
-
-        assert(quadTopology);
-        assert(innerEdges == (outerEdges - 2));
-        //
-        //  For connecting quads, the pattern is simplified as follows:
-        //
-        //      oPrev ---- iFirst  ...   iLast ---- oLast+1
-        //        | 3      2 | 3         2 | 3       2 |
-        //        | 0      1 | 0         1 | 0       1 |
-        //      oFirst -- oFirst+1 ... oFirst+N-1 -- oLast
-        //
-        //  with the first and last quads not sharing any inner edges
-        //  (between inner-first and inner-last) and potentially being
-        //  split to include the triangle on the outer edge.
-        //
-        //  It is typical for the first quad to always be included and
-        //  for the last to be excluded -- the last quad usually being
-        //  included by the next strip in the ring (unless split).
-        //
-        int nFacets = 0;
-
-        //  Split or assign the first quad (precedes inner edges):
-        int out0 = outerFirst;
-        int in0  = innerFirst;
-
-        if (splitFirstFace) {
-            nFacets += appendTri(facets + nFacets, out0, out0 + 1, in0);
-        } else if (!excludeFirstFace) {
-            nFacets += appendQuad(facets + nFacets,
-                             out0, out0 + 1, in0, outerPrev, quadTriangulate);
-        }
-
-        //  Assign quads sharing the inner edges (last is a special case):
-        int outI = outerFirst + 1;
-        int inI  = innerFirst;
-
-        if (innerEdges) {
-            int triSign = quadTriangulate;
-            int inDelta = innerReversed ? -1 : 1;
-
-            for (int i = 1; i <= innerEdges; ++i, ++outI, inI += inDelta) {
-                if (i > (innerEdges / 2)) triSign = - (int)quadTriangulate;
-
-                int outJ = outI + 1;
-                int inJ  = (i < innerEdges) ? (inI + inDelta) : innerLast;
-
-                nFacets += appendQuad(facets + nFacets,
-                                 outI, outJ, inJ, inI, triSign);
-            }
-        }
-
-        //  Split or assign the last quad (follows inner edges):
-        int outN = outerLast;
-        int inN  = innerLast;
-
-        if (splitLastFace) {
-            nFacets += appendTri(facets + nFacets, outI, outN, inN);
-        } else if (includeLastFace) {
-            nFacets += appendQuad(facets + nFacets,
-                             outI, outN, outN+1, inN, - (int)quadTriangulate);
-        }
-        return nFacets;
-    }
-
-    int
-    FacetStrip::connectUniformTris(FacetArray facets) const {
-
-        assert(!quadTopology);
-        assert(!excludeFirstFace);
-        assert(!includeLastFace);
-        assert(!innerReversed);
-        //
-        //  Assign the set of tris for the "sawtooth" strip with N outer
-        //  edges and N-3 inner edges of the inner ring:
-        //
-        //               1       3              2M-1
-        //       oPrev --- iFirst -- i1  ...  ii --- iLast -- oLast+1
-        //          / 2\1  0/  \    /  \       \1  0/ 2\    /  \.
-        //         /0  1\2 /    \  /    \       \2 /0  1\  /    \.
-        //    oFirst --- o1 ---- o2  ..  oi  ... oM --- oN-1 --- oLast
-        //           0       2       4              2M
-        //
-        //  The first and last pair of tris may optionally be split by
-        //  connecting the "first" or "last" points between the two rows
-        //  (i.e. [oFirst, oFirst+1, iFirst]) which bisects the two
-        //  triangles normally included.
-        //
-        //  Following the first pair (or single tri if split), a single
-        //  leading triangle ([o1, o2, iFirst] above) is then assigned,
-        //  followed by pairs of adjacent tris below each inner edge:
-        //  the first of the pair based on the inner edge, the second on
-        //  the outer edge.
-        //
-        int nFacets = 0;
-
-        //  Split or assign the first pair of tris (precedes inner edges):
-        int out0 = outerFirst;
-        int in0  = innerFirst;
-
-        if (splitFirstFace) {
-            nFacets += appendTri(facets + nFacets, out0, out0+1, in0);
-        } else {
-            nFacets += appendTri(facets + nFacets, out0, out0+1,outerPrev);
-            nFacets += appendTri(facets + nFacets, in0, outerPrev, out0+1);
-        }
-
-        //  Assign the next tri -- preceding the pairs for the inner edges:
-        nFacets += appendTri(facets + nFacets, out0 + 1, out0 + 2, in0);
-
-        //  Assign pair of tris below each inner edge (last is special):
-        int outI = outerFirst + 2;
-        int inI  = innerFirst;
-
-        if (innerEdges) {
-            for (int i = 1; i <= innerEdges; ++i, ++inI, ++outI) {
-                int outJ = outI + 1;
-                int inJ  = (i < innerEdges) ? (inI  + 1) : innerLast;
-
-                nFacets += appendTri(facets + nFacets, inJ, inI, outI);
-                nFacets += appendTri(facets + nFacets, outI, outJ, inJ);
-            }
-        }
-
-        //  Split the last pair of tris (follows  inner edges):
-        int outN = outerLast;
-        int inN  = innerLast;
-
-        if (splitLastFace) {
-            nFacets += appendTri(facets + nFacets, outI, outN, inN);
-        }
-        return nFacets;
-    }
-
-    int
-    FacetStrip::connectNonUniformFacets(FacetArray facets) const {
-
-        //
-        //  General case:
-        //
-        //   oPrev -- iFirst  .  ...  i0+/-i  ...   .   iLast --*
-        //        |   /       .                     .        \  |
-        //        | /         |                     |         \ |
-        //   oFirst -------- o0  ...   o0+i   ...  oN-1 ------ oLast
-        //
-        //  The sequence of edges -- both inner and outer -- is parameterized
-        //  over the integer range [0 .. M*N] where M and N are the resolution
-        //  (number of edges) of the inner and outer rings respectively.
-        //
-        //  Note that the current implementation expects the faces at the
-        //  ends to be "split", i.e. a diagonal edge created between the
-        //  first/last points of the inner and outer rings at both ends.
-        //  It is possible that this will later be relaxed (allowing an
-        //  unsplit quad at the corner to be generated), as is currently
-        //  the case with uniform strips.  In the meantime, the caller is
-        //  expected to explicitly request split corners to make it clear
-        //  where they need to adapt later.
-        //
-        assert(splitFirstFace && splitLastFace);
-
-        int M = innerEdges + (quadTopology ? 2 : 3);
-        int N = outerEdges;
-
-        int dtOuter = M;
-        int dtInner = N;
-
-        int dtMin = std::min(dtInner, dtOuter);
-        int dtMax = std::max(dtInner, dtOuter);
-
-        //  Use larger slope when M ~= N to accomodate tri insertion:
-        int dtSlopeMax = ((dtMax / 2) < dtMin) ? (dtMin - 1) : (dtMax / 2);
-
-        int tOuterLast   = dtOuter *  N;
-        int tOuterMiddle = tOuterLast / 2;
-
-        int tInnerOffset = 0;
-        int tInnerLast   = dtInner * (M - 1);
-
-        //  If tris, adjust parametric range for the inner edges:
-        if (!quadTopology) {
-            tInnerOffset = dtInner / 2;
-            tInnerLast  += tInnerOffset - dtInner;
-        }
-
-        int dInner = innerReversed ? -1 : 1;
-
-        //
-        //  Two points are successively identified on each of the inner and
-        //  outer sequence of edges, from which facets will be generated:
-        //
-        //           inner0  inner1
-        //              * ----- * . . .
-        //             /
-        //            /
-        //           * ----------- * . . .
-        //        outer0        outer1
-        //
-        //  Identify the parameterization and coordinate indices for the
-        //  points starting the sequence:
-        //
-        int tOuter0 = 0;
-        int cOuter0 = outerFirst;
-
-        int tOuter1 = dtOuter;
-        int cOuter1 = (N == 1) ? outerLast : (outerFirst + 1);
-
-        int tInner0 = tInnerOffset + dtInner;
-        int cInner0 = innerFirst;
-
-        int tInner1 = tInner0 + (innerEdges ? dtInner : 0);
-        int cInner1 = (innerEdges == 1) ? innerLast : (innerFirst + dInner);
-
-        //
-        //  Walk forward through the strip, identifying each successive quad
-        //  and choosing the most "vertical" edge to use to triangulate it:
-        //
-        bool keepQuads = quadTopology && !quadTriangulate;
-
-        int nFacetsExpected = 0;
-        if (keepQuads) {
-            nFacetsExpected = std::max(innerEdges, outerEdges);
-            //  Include a symmetric center triangle if any side is odd:
-            if ((nFacetsExpected & 1) == 0) {
-                nFacetsExpected += (innerEdges & 1) || (outerEdges & 1);
-            }
-        } else {
-            nFacetsExpected = innerEdges + outerEdges;
-        }
-
-        //  These help maintain symmetry where possible:
-        int  nFacetsLeading = nFacetsExpected / 2;
-        int  nFacetsMiddle  = nFacetsExpected & 1;
-
-        int  middleFacet = nFacetsMiddle ? nFacetsLeading : -1;
-        bool middleQuad  = keepQuads && (outerEdges & 1) && (innerEdges & 1);
-
-        //
-        //  Assign all expected facets sequentially -- advancing references
-        //  to the inner and outer edges according to what is used for each:
-        //
-        for (int facetIndex = 0; facetIndex < nFacetsExpected; ++facetIndex) {
-            bool generateTriOuter = false;
-            bool generateTriInner = false;
-            bool generateQuad     = false;
-
-            //
-            //  Detect simple cases first:  the symmetric center face or 
-            //  triangles in the absence of an inner or outer edge:
-            //
-            if (facetIndex == middleFacet) {
-                if (middleQuad) {
-                    generateQuad = true;
-                } else if (outerEdges & 1) {
-                    generateTriOuter = true;
-                } else {
-                    generateTriInner = true;
-                }
-            } else if (tInner1 == tInner0) {
-                generateTriOuter = true;
-            } else if (tOuter1 == tOuter0) {
-                generateTriInner = true;
-            } else {
-                //
-                //  For the general case, assign a quad if specified and
-                //  possible.  Otherwise continue with a triangle.  Both
-                //  situations avoid poor aspect and preserve symmetry:
-                //
-                if (keepQuads) {
-                    //  If face is after the midpoint, use the same kind of
-                    //  face as its mirrored counterpart. Otherwise, reject a
-                    //  quad trying to cross the midpoint.  Finally, test the
-                    //  slope of the "vertical" edge of the potential quad:
-                    if (facetIndex >= nFacetsLeading) {
-                        int mirroredFacetIndex = nFacetsLeading - 1 -
-                                (facetIndex - nFacetsLeading - nFacetsMiddle);
-
-                        generateQuad = (facets[mirroredFacetIndex][3] >= 0);
-                    } else if ((tInner1 > tOuterMiddle) ||
-                               (tOuter1 > tOuterMiddle)) {
-                        generateQuad = false;
-                    } else {
-                        int dtSlope1 = std::abs(tOuter1 - tInner1);
-
-                        generateQuad = (dtSlope1 <= dtSlopeMax);
-                    }
-                }
-
-                if (!generateQuad) {
-                    //  Can't detect symmetric triangles as inner or outer as
-                    //  easily as quads, but the test is relatively simple --
-                    //  choose the diagonal spanning the shortest interval
-                    //  (when equal, choose relative to midpoint for symmetry):
-                    int dtDiagToOuter1 = tOuter1 - tInner0;
-                    int dtDiagToInner1 = tInner1 - tOuter0;
-
-                    bool useOuterEdge = (dtDiagToOuter1 == dtDiagToInner1)
-                                      ? (tOuter1 > tOuterMiddle)
-                                      : (dtDiagToOuter1 < dtDiagToInner1);
-                    if (useOuterEdge) {
-                        generateTriOuter = true;
-                    } else {
-                        generateTriInner = true;
-                    }
-                }
-            }
-
-            //  Assign the face as determined above:
-            if (generateTriOuter) {
-                facets[facetIndex].Set(cOuter0, cOuter1, cInner0);
-            } else if (generateTriInner) {
-                facets[facetIndex].Set(cInner1, cInner0, cOuter0);
-            } else {
-                facets[facetIndex].Set(cOuter0, cOuter1, cInner1, cInner0);
-            }
-
-            //  Advance to the next point of the next outer edge:
-            bool advanceOuter = generateTriOuter || generateQuad;
-            if (advanceOuter) {
-                tOuter0 = tOuter1;
-                cOuter0 = cOuter1;
-
-                tOuter1 += dtOuter;
-                cOuter1  = cOuter1 + 1;
-                if (tOuter1 >= tOuterLast) {
-                    tOuter1 = tOuterLast;
-                    cOuter1 = outerLast;
-                }
-            }
-
-            //  Advance to the next point of the next inner edge:
-            bool advanceInner = generateTriInner || generateQuad;
-            if (advanceInner) {
-                tInner0 = tInner1;
-                cInner0 = cInner1;
-
-                tInner1 += dtInner;
-                cInner1  = cInner1 + dInner;
-                if (tInner1 >= tInnerLast) {
-                    tInner1  = tInnerLast;
-                    cInner1  = innerLast;
-                }
-            }
-        }
-        return nFacetsExpected;
-    }
-}
-
-
-//
-//  Utility functions to help assembly of tessellation patterns -- grouped
-//  into local structs/namespaces for each of the supported parameterization
-//  types:  quad, triangle (tri) or quadrangulated sub-faces (qsub):
-//
-//  Given the similar structure to these -- the construction of patterns
-//  using concentric rings of Coords, rings of Facets between successive
-//  concentric rings, etc. -- there are some opportunities for refactoring
-//  some of these.  (But there are typically subtle differences between
-//  each that complicate doing so.)
-//
-class quad {
-public:
-    //  Public methods for counting coords and facets:
-    static int CountUniformFacets(int edgeRes, bool triangulate);
-    static int CountSegmentedFacets(int const uvRes[], bool triangulate);
-    static int CountNonUniformFacets(int const outerRes[], int const uvRes[],
-                                     bool triangulate);
-
-    static int CountInteriorCoords(int edgeRes);
-    static int CountInteriorCoords(int const uvRes[]);
-
-    //  Public methods for identifying and assigning coordinate pairs:
-    template <typename REAL>
-    static int GetEdgeCoords(int edge, int edgeRes,
-                             Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int GetBoundaryCoords(int const edgeRates[],
-                                 Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int GetInteriorCoords(int const uvRes[2],
-                                 Coord2Array<REAL> coords);
-
-    //  Public methods for identifying and assigning facets:
-    static int GetUniformFacets(int edgeRes, bool triangulate,
-                                FacetArray facets);
-    static int GetSegmentedFacets(int const uvRes[], bool triangulate,
-                                  FacetArray facets);
-    static int GetNonUniformFacets(int const outerRes[], int const innerRes[],
-                                   int nBoundaryEdges, bool triangulate,
-                                   FacetArray facets);
-private:
-    //  Private methods used by those above:
-    static int countUniformCoords(int edgeRes);
-    static int countNonUniformEdgeFacets(int outerRes, int innerRes);
-
-    template <typename REAL>
-    static int getCenterCoord(Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int getInteriorRingCoords(int  uRes,   int  vRes,
-                                     REAL uStart, REAL vStart,
-                                     REAL uDelta, REAL vDelta,
-                                     Coord2Array<REAL> coords);
-
-    static int getInteriorRingFacets(int uRes, int vRes,
-                                     int indexOfFirstCoord, bool triangulate,
-                                     FacetArray facets);
-    static int getBoundaryRingFacets(int const outerRes[], int uRes, int vRes,
-                                     int nBoundaryEdges, bool triangulate,
-                                     FacetArray facets);
-    static int getSingleStripFacets(int uRes, int vRes,
-                                    int indexOfFirstCoord, bool triangulate,
-                                    FacetArray facets);
-};
-
-class tri {
-public:
-    //  Public methods for counting coords and facets:
-    static int CountUniformFacets(int edgeRes);
-    static int CountNonUniformFacets(int const outerRes[], int innerRes);
-
-    static int CountInteriorCoords(int edgeRes);
-
-    //  Public methods for identifying and assigning coordinate pairs:
-    template <typename REAL>
-    static int GetEdgeCoords(int edge, int edgeRes,
-                             Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int GetBoundaryCoords(int const edgeRates[],
-                                 Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int GetInteriorCoords(int edgeRes,
-                                 Coord2Array<REAL> coords);
-
-    //  Public methods for identifying and assigning facets:
-    static int GetUniformFacets(int edgeRes,
-                                FacetArray facets);
-    static int GetNonUniformFacets(int const outerRes[], int innerRes,
-                                   int nBoundaryEdges,
-                                   FacetArray facets);
-private:
-    //  Private methods used by those above:
-    static int countUniformCoords(int edgeRes);
-
-    template <typename REAL>
-    static int getCenterCoord(Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int getInteriorRingCoords(int  edgeRes,
-                                     REAL uStart, REAL vStart, REAL tDelta,
-                                     Coord2Array<REAL> coords);
-
-    static int getInteriorRingFacets(int edgeRes, int indexOfFirstCoord,
-                                     FacetArray facets);
-    static int getBoundaryRingFacets(int const outerRes[], int innerRes,
-                                     int nBoundaryEdges,
-                                     FacetArray facets);
-};
-
-class qsub {
-public:
-    //  Public methods for counting coords and facets:
-    static int CountUniformFacets(int N, int edgeRes, bool triangulate);
-    static int CountNonUniformFacets(int N, int const outerRes[], int innerRes,
-                                     bool triangulate);
-
-    static int CountInteriorCoords(int N, int edgeRes);
-
-    //  Public methods for identifying and assigning coordinate pairs (note
-    //  these require a Parameterization while others only need face size N)
-    template <typename REAL>
-    static int GetEdgeCoords(Parameterization P, int edge, int edgeRes,
-                             Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int GetBoundaryCoords(Parameterization P, int const edgeRates[],
-                                 Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int GetInteriorCoords(Parameterization P, int edgeRes,
-                                 Coord2Array<REAL> coords);
-
-    //  Public methods for identifying and assigning facets:
-    static int GetUniformFacets(int N, int edgeRes, bool triangulate,
-                                FacetArray facets);
-    static int GetNonUniformFacets(int N, int const outerRes[], int innerRes,
-                                   int nBoundaryEdges, bool triangulate,
-                                   FacetArray facets);
-private:
-    //  Private methods used by those above:
-    static int countUniformCoords(int N, int edgeRes);
-
-    template <typename REAL>
-    static int getCenterCoord(Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int getCenterRingCoords(Parameterization P, REAL tStart,
-                                   Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int getRingEdgeCoords(Parameterization P, int edge, int edgeRes,
-                                 bool incFirst, bool incLast,
-                                 REAL tStart, REAL tDelta,
-                                 Coord2Array<REAL> coords);
-    template <typename REAL>
-    static int getInteriorRingCoords(Parameterization P, int edgeRes,
-                                     REAL tStart, REAL tDelta,
-                                     Coord2Array<REAL> coords);
-
-    static int getCenterFacets(int N, int indexOfFirstCoord,
-                               FacetArray facets);
-    static int getInteriorRingFacets(int N, int edgeRes,
-                                     int indexOfFirstCoord, bool triangulate,
-                                     FacetArray facets);
-    static int getBoundaryRingFacets(int N, int const outerRes[], int innerRes,
-                                     int nBoundaryEdges, bool triangulate,
-                                     FacetArray facets);
-};
-
-//
-//  Implementations for quad functions:
-//
-inline int
-quad::CountUniformFacets(int edgeRes, bool triangulate) {
-    return (edgeRes * edgeRes) << (int) triangulate;
-}
-
-inline int
-quad::CountSegmentedFacets(int const uvRes[], bool triangulate) {
-
-    //  WIP - may extend later to handle different opposing outer rates
-    assert((uvRes[0] == 1) || (uvRes[1] == 1));
-    return (uvRes[0] * uvRes[1]) << (int) triangulate;
-}
-
-int
-quad::countNonUniformEdgeFacets(int outerRes, int innerRes) {
-
-    int nFacets = std::max(outerRes, (innerRes - 2));
-
-    //  If the lesser is odd, a triangle will be added in the middle:
-    if ((nFacets & 1) == 0) {
-        nFacets += (outerRes & 1) || (innerRes & 1);
-    }
-    return nFacets;
-}
-
-int
-quad::CountNonUniformFacets(int const outerRes[], int const innerRes[],
-                            bool triangulate) {
-
-    int uRes = innerRes[0];
-    int vRes = innerRes[1];
-    assert((uRes > 1) && (vRes > 1));
-
-    //  Count interior facets based on edges of inner ring:
-    int innerUEdges = uRes - 2;
-    int innerVEdges = vRes - 2;
-
-    int nInterior = innerUEdges * innerVEdges;
-
-    //  If triangulating, things are much simpler:
-    if (triangulate) {
-        int nFacets = nInterior * 2;
-
-        nFacets += innerUEdges + outerRes[0];
-        nFacets += innerVEdges + outerRes[1];
-        nFacets += innerUEdges + outerRes[2];
-        nFacets += innerVEdges + outerRes[3];
-        return nFacets;
-    }
-
-    //
-    //  Accumulate boundary facets for each edge based on uniformity...
-    //
-    //  A uniform edge contributes a quad for each inner edge, plus one
-    //  facet for the leading corner (quad if uniform, tri if not) and a
-    //  tri for the trailing corner if it is not uniform.  A non-uniform
-    //  edge contributes quads and tris based on the larger of the inner
-    //  and outer resolutions.
-    //
-    bool uniformEdges[4];
-    uniformEdges[0] = (outerRes[0] == uRes);
-    uniformEdges[1] = (outerRes[1] == vRes);
-    uniformEdges[2] = (outerRes[2] == uRes);
-    uniformEdges[3] = (outerRes[3] == vRes);
-
-    bool uniformCorners[4];
-    uniformCorners[0] = (uniformEdges[0] && uniformEdges[3]);
-    uniformCorners[1] = (uniformEdges[1] && uniformEdges[0]);
-    uniformCorners[2] = (uniformEdges[2] && uniformEdges[1]);
-    uniformCorners[3] = (uniformEdges[3] && uniformEdges[2]);
-
-    int nBoundary = 0;
-    nBoundary += uniformEdges[0] ? (innerUEdges + 1 + !uniformCorners[1]) :
-                 countNonUniformEdgeFacets(outerRes[0], uRes);
-    nBoundary += uniformEdges[1] ? (innerVEdges + 1 + !uniformCorners[2]) :
-                 countNonUniformEdgeFacets(outerRes[1], vRes);
-    nBoundary += uniformEdges[2] ? (innerUEdges + 1 + !uniformCorners[3]) :
-                 countNonUniformEdgeFacets(outerRes[2], uRes);
-    nBoundary += uniformEdges[3] ? (innerVEdges + 1 + !uniformCorners[0]) :
-                 countNonUniformEdgeFacets(outerRes[3], vRes);
-    return nInterior + nBoundary;
-}
-
-inline int
-quad::countUniformCoords(int edgeRes) {
-    return (edgeRes + 1) * (edgeRes + 1);
-}
-
-inline int
-quad::CountInteriorCoords(int edgeRes) {
-    return (edgeRes - 1) * (edgeRes - 1);
-}
-
-inline int
-quad::CountInteriorCoords(int const uvRes[]) {
-    return (uvRes[0] - 1) * (uvRes[1] - 1);
-}
-
-template <typename REAL>
-inline int
-quad::getCenterCoord(Coord2Array<REAL> coords) {
-
-    coords[0].Set(0.5f, 0.5f);
-    return 1;
-}
-
-template <typename REAL>
-int
-quad::GetEdgeCoords(int edge, int edgeRes, Coord2Array<REAL> coords) {
-
-    REAL dt = 1.0f / (REAL)edgeRes;
-
-    REAL t0 = dt;
-    REAL t1 = 1.0f - dt;
-
-    int n = edgeRes - 1;
-
-    switch (edge) {
-    case 0:  return appendVIsoLine<REAL>(coords, n, t0,   0.0f,  dt);
-    case 1:  return appendUIsoLine<REAL>(coords, n, 1.0f, t0,    dt);
-    case 2:  return appendVIsoLine<REAL>(coords, n, t1,   1.0f, -dt);
-    case 3:  return appendUIsoLine<REAL>(coords, n, 0.0f, t1,   -dt);
-    }
-    return 0;
-}
-
-template <typename REAL>
-int
-quad::GetBoundaryCoords(int const edgeRates[], Coord2Array<REAL> coords) {
-
-    int nCoords = 0;
-    nCoords += appendVIsoLine<REAL>(coords + nCoords, edgeRates[0], 0.0f, 0.0f,
-                                        1.0f / (REAL) edgeRates[0]);
-    nCoords += appendUIsoLine<REAL>(coords + nCoords, edgeRates[1], 1.0f, 0.0f,
-                                        1.0f / (REAL) edgeRates[1]);
-    nCoords += appendVIsoLine<REAL>(coords + nCoords, edgeRates[2], 1.0f, 1.0f,
-                                       -1.0f / (REAL) edgeRates[2]);
-    nCoords += appendUIsoLine<REAL>(coords + nCoords, edgeRates[3], 0.0f, 1.0f,
-                                       -1.0f / (REAL) edgeRates[3]);
-    return nCoords;
-}
-
-template <typename REAL>
-int
-quad::getInteriorRingCoords(int uRes, int vRes,
-                            REAL u0, REAL v0, REAL du, REAL dv,
-                            Coord2Array<REAL> coords) {
-
-    int nCoords = 0;
-    if ((uRes > 0) && (vRes > 0)) {
-        REAL u1 = 1.0f - u0;
-        REAL v1 = 1.0f - v0;
-
-        nCoords += appendVIsoLine(coords + nCoords, uRes, u0, v0, du);
-        nCoords += appendUIsoLine(coords + nCoords, vRes, u1, v0, dv);
-        nCoords += appendVIsoLine(coords + nCoords, uRes, u1, v1,-du);
-        nCoords += appendUIsoLine(coords + nCoords, vRes, u0, v1,-dv);
-    } else if (uRes > 0) {
-        nCoords += appendVIsoLine(coords, uRes+1, u0, v0, du);
-    } else if (vRes > 0) {
-        nCoords += appendUIsoLine(coords, vRes+1, u0, v0, dv);
-    } else {
-        return getCenterCoord(coords);
-    }
-    return nCoords;
-}
-
-template <typename REAL>
-int
-quad::GetInteriorCoords(int const uvRes[2], Coord2Array<REAL> coords) {
-
-    int nIntRings = std::min((uvRes[0] / 2), (uvRes[1] / 2));
-    if (nIntRings == 0) return 0;
-
-    REAL du = 1.0f / (REAL) uvRes[0];
-    REAL dv = 1.0f / (REAL) uvRes[1];
-    REAL u  = du;
-    REAL v  = dv;
-
-    int uRes = uvRes[0] - 2;
-    int vRes = uvRes[1] - 2;
-
-    //
-    //  Note that with separate U and V res, one can go negative so beware
-    //  of making any assumptions -- defer to the function for the ring:
-    //
-    int nCoords = 0;
-    for (int i=0; i < nIntRings; ++i, uRes -= 2, vRes -= 2, u += du, v += dv) {
-        nCoords += getInteriorRingCoords(uRes, vRes, u, v, du, dv,
-                                         coords + nCoords);
-    }
-    return nCoords;
-}
-
-int
-quad::getSingleStripFacets(int uRes, int vRes, int coord0, bool triangulate,
-                           FacetArray facets) {
-
-    assert((uRes == 1) || (vRes == 1));
-
-    FacetStrip qStrip;
-    qStrip.quadTopology    = true;
-    qStrip.quadTriangulate = triangulate;
-    qStrip.splitFirstFace  = false;
-    qStrip.splitLastFace   = false;
-    qStrip.innerReversed   = true;
-    qStrip.includeLastFace = true;
-
-    if (uRes > 1) {
-        qStrip.outerEdges = uRes;
-        qStrip.innerEdges = uRes - 2;
-
-        //  Assign these successively around the strip:
-        qStrip.outerFirst = coord0;
-        qStrip.outerLast  = qStrip.outerFirst + uRes;
-        qStrip.innerLast  = qStrip.outerLast  + 2;
-        qStrip.innerFirst = qStrip.outerLast  + uRes;
-        qStrip.outerPrev  = qStrip.innerFirst + 1;
-
-        return qStrip.connectUniformQuads(facets);
-    } else {
-        qStrip.outerEdges = vRes;
-        qStrip.innerEdges = vRes - 2;
-
-        qStrip.outerPrev  = coord0;
-        qStrip.outerFirst = coord0 + 1;
-        qStrip.outerLast  = qStrip.outerFirst + vRes;
-        qStrip.innerLast  = qStrip.outerLast  + 2;
-        qStrip.innerFirst = qStrip.outerLast  + vRes;
-
-        return qStrip.connectUniformQuads(facets);
-    }
-}
-
-int
-quad::getInteriorRingFacets(int uRes, int vRes, int coord0, bool triangulate,
-                            FacetArray facets) {
-
-    assert((uRes >= 0) && (vRes >= 0));
-
-    //
-    //  Deal with some simple and special cases first:
-    //
-    int totalInnerFacets = uRes * vRes;
-    if (totalInnerFacets == 0) return 0;
-
-    if (totalInnerFacets == 1) {
-        return appendQuad(facets, coord0, coord0+1, coord0+2, coord0+3,
-                                triangulate);
-    }
-
-    //  The single interior strip is enclosed by a single ring:
-    if ((uRes == 1) || (vRes == 1)) {
-        return getSingleStripFacets(uRes, vRes, coord0, triangulate, facets);
-    }
-
-    //
-    //  The general case -- one or more quads for each edge that are
-    //  connected to the next interior ring of vertices:
-    //
-    int nFacets = 0;
-
-    int uResInner = uRes - 2;
-    int vResInner = vRes - 2;
-
-    int outerRingStart = coord0;
-    int innerRingStart = coord0 + 2 * (uRes + vRes);
-
-    FacetStrip qStrip;
-    qStrip.quadTopology    = true;
-    qStrip.quadTriangulate = triangulate;
-    qStrip.splitFirstFace  = false;
-    qStrip.splitLastFace   = false;
-
-    qStrip.outerEdges    = uRes;
-    qStrip.outerFirst    = outerRingStart;
-    qStrip.outerPrev     = innerRingStart - 1;
-    qStrip.outerLast     = outerRingStart + uRes;
-    qStrip.innerEdges    = uResInner;
-    qStrip.innerReversed = false;
-    qStrip.innerFirst    = innerRingStart;
-    qStrip.innerLast     = innerRingStart + uResInner;
-    nFacets += qStrip.connectUniformQuads(facets + nFacets);
-
-    qStrip.outerEdges    = vRes;
-    qStrip.outerFirst   += uRes;
-    qStrip.outerPrev     = qStrip.outerFirst - 1;
-    qStrip.outerLast     = qStrip.outerFirst + vRes;
-    qStrip.innerEdges    = vResInner;
-    qStrip.innerReversed = false;
-    qStrip.innerFirst    = qStrip.innerLast;
-    qStrip.innerLast    += vResInner;
-    nFacets += qStrip.connectUniformQuads(facets + nFacets);
-
-    qStrip.outerEdges    = uRes;
-    qStrip.outerFirst   += vRes;
-    qStrip.outerPrev     = qStrip.outerFirst - 1;
-    qStrip.outerLast     = qStrip.outerFirst + uRes;
-    qStrip.innerEdges    = uResInner;
-    qStrip.innerReversed = (vResInner == 0);
-    qStrip.innerFirst    = qStrip.innerLast;
-    qStrip.innerLast    += uResInner * (qStrip.innerReversed ? -1 : 1);
-    nFacets += qStrip.connectUniformQuads(facets + nFacets);
-
-    qStrip.outerEdges    = vRes;
-    qStrip.outerFirst   += uRes;
-    qStrip.outerPrev     = qStrip.outerFirst - 1;
-    qStrip.outerLast     = outerRingStart;
-    qStrip.innerEdges    = vResInner;
-    qStrip.innerReversed = (uResInner == 0);
-    qStrip.innerFirst    = qStrip.innerLast;
-    qStrip.innerLast     = innerRingStart;
-    nFacets += qStrip.connectUniformQuads(facets + nFacets);
-
-    return nFacets;
-}
-
-int
-quad::getBoundaryRingFacets(int const outerRes[], int uRes, int vRes,
-                            int nBoundaryEdges, bool triangulate,
-                            FacetArray facets) {
-
-    //  Identify edges and corners that should preserve uniform behavior:
-    bool uniformEdges[4];
-    uniformEdges[0] = (outerRes[0] == uRes);
-    uniformEdges[1] = (outerRes[1] == vRes);
-    uniformEdges[2] = (outerRes[2] == uRes);
-    uniformEdges[3] = (outerRes[3] == vRes);
-
-    bool uniformCorners[4];
-    uniformCorners[0] = (uniformEdges[0] && uniformEdges[3]);
-    uniformCorners[1] = (uniformEdges[1] && uniformEdges[0]);
-    uniformCorners[2] = (uniformEdges[2] && uniformEdges[1]);
-    uniformCorners[3] = (uniformEdges[3] && uniformEdges[2]);
-
-    //  Initialize inner edge counts and the FacetStrip for local use:
-    assert((uRes > 1) && (vRes > 1));
-    int innerResU = uRes - 2;
-    int innerResV = vRes - 2;
-
-    int nFacets = 0;
-
-    int outerRingStart = 0;
-    int innerRingStart = nBoundaryEdges;
-
-    FacetStrip qStrip;
-    qStrip.quadTopology    = true;
-    qStrip.quadTriangulate = triangulate;
-
-    //  Assign strip indices for the inner and outer rings:
-    qStrip.outerEdges    = outerRes[0];
-    qStrip.outerFirst    = outerRingStart;
-    qStrip.outerPrev     = innerRingStart - 1;
-    qStrip.outerLast     = outerRingStart + outerRes[0];
-    qStrip.innerEdges    = innerResU;
-    qStrip.innerReversed = false;
-    qStrip.innerFirst    = innerRingStart;
-    qStrip.innerLast     = innerRingStart + innerResU;
-    if (uniformEdges[0]) {
-        qStrip.splitFirstFace = !uniformCorners[0];
-        qStrip.splitLastFace  = !uniformCorners[1];
-        nFacets += qStrip.connectUniformQuads(facets + nFacets);
-    } else {
-        qStrip.splitFirstFace = true;
-        qStrip.splitLastFace  = true;
-        nFacets += qStrip.connectNonUniformFacets(facets + nFacets);
-    }
-
-    qStrip.outerEdges    = outerRes[1];
-    qStrip.outerFirst    = qStrip.outerLast;
-    qStrip.outerPrev     = qStrip.outerFirst - 1;
-    qStrip.outerLast    += outerRes[1];
-    qStrip.innerEdges    = innerResV;
-    qStrip.innerReversed = false;
-    qStrip.innerFirst    = qStrip.innerLast;
-    qStrip.innerLast    += innerResV;
-    if (uniformEdges[1]) {
-        qStrip.splitFirstFace = !uniformCorners[1];
-        qStrip.splitLastFace  = !uniformCorners[2];
-        nFacets += qStrip.connectUniformQuads(facets + nFacets);
-    } else {
-        qStrip.splitFirstFace = true;
-        qStrip.splitLastFace  = true;
-        nFacets += qStrip.connectNonUniformFacets(facets + nFacets);
-    }
-
-    qStrip.outerEdges    = outerRes[2];
-    qStrip.outerFirst    = qStrip.outerLast;
-    qStrip.outerPrev     = qStrip.outerFirst - 1;
-    qStrip.outerLast    += outerRes[2];
-    qStrip.innerEdges    = innerResU;
-    qStrip.innerReversed = (innerResV == 0);
-    qStrip.innerFirst    = qStrip.innerLast;
-    qStrip.innerLast    += innerResU * (qStrip.innerReversed ? -1 : 1);
-    if (uniformEdges[2]) {
-        qStrip.splitFirstFace = !uniformCorners[2];
-        qStrip.splitLastFace  = !uniformCorners[3];
-        nFacets += qStrip.connectUniformQuads(facets + nFacets);
-    } else {
-        qStrip.splitFirstFace = true;
-        qStrip.splitLastFace  = true;
-        nFacets += qStrip.connectNonUniformFacets(facets + nFacets);
-    }
-
-    qStrip.outerEdges    = outerRes[3];
-    qStrip.outerFirst    = qStrip.outerLast;
-    qStrip.outerPrev     = qStrip.outerFirst - 1;
-    qStrip.outerLast     = 0;
-    qStrip.innerEdges    = innerResV;
-    qStrip.innerReversed = (innerResU == 0);
-    qStrip.innerFirst    = qStrip.innerLast;
-    qStrip.innerLast     = innerRingStart;
-    if (uniformEdges[3]) {
-        qStrip.splitFirstFace = !uniformCorners[3];
-        qStrip.splitLastFace  = !uniformCorners[0];
-        nFacets += qStrip.connectUniformQuads(facets + nFacets);
-    } else {
-        qStrip.splitFirstFace = true;
-        qStrip.splitLastFace  = true;
-        nFacets += qStrip.connectNonUniformFacets(facets + nFacets);
-    }
-    return nFacets;
-}
-
-int
-quad::GetSegmentedFacets(int const innerRes[], bool triangulate,
-                         FacetArray facets) {
-
-    //  WIP - may extend later to handle different opposing outer rates
-    //        resulting in a non-uniform strip between the opposing edges
-    int uRes = innerRes[0];
-    int vRes = innerRes[1];
-    assert((uRes == 1) || (vRes == 1));
-
-    return getSingleStripFacets(uRes, vRes, 0, triangulate, facets);
-}
-
-int
-quad::GetNonUniformFacets(int const outerRes[], int const innerRes[],
-                          int nBoundaryEdges, bool triangulate,
-                          FacetArray facets) {
-
-    int uRes = innerRes[0];
-    int vRes = innerRes[1];
-    assert((uRes > 1) && (vRes > 1));
-
-    //  First, generate the ring of boundary facets separately:
-    int nFacets = getBoundaryRingFacets(outerRes, uRes, vRes, nBoundaryEdges,
-                                        triangulate, facets);
-
-    //  Second, generate the remaining rings of interior facets:
-    int nRings = (std::min(uRes,vRes) + 1) / 2;
-    int coord0 = nBoundaryEdges;
-
-    for (int ring = 1; ring < nRings; ++ring) {
-        uRes = std::max(uRes - 2, 0);
-        vRes = std::max(vRes - 2, 0);
-
-        nFacets += getInteriorRingFacets(uRes, vRes, coord0, triangulate,
-                                         facets + nFacets);
-        coord0  += 2 * (uRes + vRes);
-    }
-    return nFacets;
-}
-
-int
-quad::GetUniformFacets(int res, bool triangulate, FacetArray facets) {
-
-    //  The trivial case should have been handled by the caller:
-    assert(res > 1);
-
-    int nRings = (res + 1) / 2;
-
-    int nFacets = 0;
-    int coord0 = 0;
-    for (int ring = 0; ring < nRings; ++ring, res -= 2) {
-        nFacets += getInteriorRingFacets(res, res, coord0, triangulate,
-                                         facets + nFacets);
-        coord0  += 4 * res;
-    }
-    return nFacets;
-}
-
-
-//
-//  REMINDER TO SELF -- according to the OpenGL docs, the "inner" tess
-//  rates are expected to reflect a tessellation of the entire face, i.e.
-//  they are not the outer rates with 2 subtracted, but are the same as
-//  the outer rates.  Their minimum is therefore 1 -- no inner vertices,
-//  BUT any non-unit outer rate will trigger an interior point.
-//
-//  Note that triangles will need considerably different treatment in
-//  some cases given the way we diverge from the OpenGL patterns, e.g.
-//  the corner faces are not bisected in the uniform case but may need
-//  to be when non-uniform.
-//
-
-//
-//  Implementations for tri functions:
-//
-inline int
-tri::CountUniformFacets(int edgeRes) {
-    return edgeRes * edgeRes;
-}
-
-int
-tri::CountNonUniformFacets(int const outerRes[], int innerRes) {
-
-    assert(innerRes > 2);
-
-    //  Count interior facets based on edges of inner ring:
-    int nInnerEdges = innerRes - 3;
-
-    int nInterior = nInnerEdges ? CountUniformFacets(nInnerEdges) : 0;
-
-    //
-    //  Note the number of boundary facets is not affected by the uniform
-    //  behavior at corners when rates match -- in contrast to quads.  In
-    //  both cases, two tris are generated from four points at the corner,
-    //  just with a different edge bisecting that "quad".
-    //
-    int nBoundary = (nInnerEdges + outerRes[0]) +
-                    (nInnerEdges + outerRes[1]) +
-                    (nInnerEdges + outerRes[2]);
-
-    return nInterior + nBoundary;
-}
-
-inline int
-tri::countUniformCoords(int edgeRes) {
-    return edgeRes * (edgeRes + 1) / 2;
-}
-
-inline int
-tri::CountInteriorCoords(int edgeRes) {
-    return countUniformCoords(edgeRes - 2);
-}
-
-template <typename REAL>
-inline int
-tri::getCenterCoord(Coord2Array<REAL> coords) {
-
-    coords[0].Set(1.0f/3.0f, 1.0f/3.0f);
-    return 1;
-}
-
-template <typename REAL>
-int
-tri::GetEdgeCoords(int edge, int edgeRes, Coord2Array<REAL> coords) {
-
-    REAL dt = 1.0f / (REAL)edgeRes;
-
-    REAL t0 = dt;
-    REAL t1 = 1.0f - dt;
-
-    int n = edgeRes - 1;
-
-    switch (edge) {
-    case 0:  return appendVIsoLine<REAL>(coords, n,  t0, 0.0f, dt);
-    case 1:  return appendUVLine<REAL>(  coords, n,  t1,  t0, -dt, dt);
-    case 2:  return appendUIsoLine<REAL>(coords, n, 0.0f, t1, -dt);
-    }
-    return 0;
-}
-
-template <typename REAL>
-int
-tri::GetBoundaryCoords(int const edgeRates[], Coord2Array<REAL> coords) {
-
-    int nCoords = 0;
-    nCoords += appendVIsoLine<REAL>(coords + nCoords, edgeRates[0], 0.0f, 0.0f,
-                                        1.0f / (REAL) edgeRates[0]);
-    nCoords += appendUVLine<REAL>(  coords + nCoords, edgeRates[1], 1.0f, 0.0f,
-                                       -1.0f / (REAL) edgeRates[1],
-                                        1.0f / (REAL) edgeRates[1]);
-    nCoords += appendUIsoLine<REAL>(coords + nCoords, edgeRates[2], 0.0f, 1.0f,
-                                       -1.0f / (REAL) edgeRates[2]);
-    return nCoords;
-}
-
-template <typename REAL>
-int
-tri::getInteriorRingCoords(int edgeRes, REAL u0, REAL v0, REAL dt,
-                           Coord2Array<REAL> coords) {
-    assert(edgeRes);
-
-    REAL u1 = 1.0f - u0*2.0f;
-    REAL v1 = 1.0f - v0*2.0f;
-
-    int nCoords = 0;
-    nCoords += appendVIsoLine(coords + nCoords, edgeRes, u0, v0, dt);
-    nCoords += appendUVLine(  coords + nCoords, edgeRes, u1, v0,-dt, dt);
-    nCoords += appendUIsoLine(coords + nCoords, edgeRes, u0, v1,-dt);
-    return nCoords;
-}
-
-template <typename REAL>
-int
-tri::GetInteriorCoords(int edgeRes, Coord2Array<REAL> coords) {
-
-    int nIntRings = edgeRes / 3;
-    if (nIntRings == 0) return 0;
-
-    REAL dt = 1.0f / (REAL) edgeRes;
-    REAL u  = dt;
-    REAL v  = dt;
-
-    int ringRes = edgeRes - 3;
-
-    int nCoords = 0;
-    for (int i = 0; i < nIntRings; ++i, ringRes -= 3, u += dt, v += dt) {
-        if (ringRes == 0) {
-            nCoords += getCenterCoord(coords + nCoords);
-        } else {
-            nCoords += getInteriorRingCoords(ringRes, u, v, dt,
-                                             coords + nCoords);
-        }
-    }
-    return nCoords;
-}
-
-int
-tri::getInteriorRingFacets(int edgeRes, int coord0, FacetArray facets) {
-
-    //
-    //  Deal with trivial cases with no inner vertices:
-    //
-    if (edgeRes < 1) {
-        return 0;
-    } else if (edgeRes == 1) {
-        return appendTri(facets, coord0, coord0+1, coord0+2);
-    } else if (edgeRes == 2) {
-        appendTri(facets + 0, coord0+0, coord0+1, coord0+5);
-        appendTri(facets + 1, coord0+2, coord0+3, coord0+1);
-        appendTri(facets + 2, coord0+4, coord0+5, coord0+3);
-        appendTri(facets + 3, coord0+1, coord0+3, coord0+5);
-        return 4;
-    }
-
-    //
-    //  Generate facets for the 3 tri-strips for each edge:
-    //
-    int nFacets = 0;
-
-    int outerEdges = edgeRes;
-    int innerEdges = edgeRes - 3;
-
-    int outerRingStart = coord0;
-    int innerRingStart = coord0 + 3 * outerEdges;
-
-    FacetStrip tStrip;
-    tStrip.quadTopology  = false;
-    tStrip.innerReversed = false;
-    tStrip.innerEdges    = innerEdges;
-    tStrip.outerEdges    = outerEdges;
-
-    tStrip.outerFirst = outerRingStart;
-    tStrip.outerLast  = outerRingStart + outerEdges;
-    tStrip.outerPrev  = innerRingStart - 1;
-    tStrip.innerFirst = innerRingStart;
-    tStrip.innerLast  = innerRingStart + innerEdges;
-    nFacets += tStrip.connectUniformTris(facets + nFacets);
-
-    tStrip.outerFirst += outerEdges;
-    tStrip.outerLast  += outerEdges;
-    tStrip.outerPrev   = tStrip.outerFirst - 1;
-    tStrip.innerFirst += innerEdges;
-    tStrip.innerLast  += innerEdges;
-    nFacets += tStrip.connectUniformTris(facets + nFacets);
-
-    tStrip.outerFirst += outerEdges;
-    tStrip.outerLast   = outerRingStart;
-    tStrip.outerPrev   = tStrip.outerFirst - 1;
-    tStrip.innerFirst += innerEdges;
-    tStrip.innerLast   = innerRingStart;
-    nFacets += tStrip.connectUniformTris(facets + nFacets);
-
-    return nFacets;
-}
-
-int
-tri::getBoundaryRingFacets(int const outerRes[], int innerRes,
-                           int nBoundaryEdges, FacetArray facets) {
-
-    //  Identify edges and corners that should preserve uniform behavior:
-    bool uniformEdges[3];
-    uniformEdges[0] = (outerRes[0] == innerRes);
-    uniformEdges[1] = (outerRes[1] == innerRes);
-    uniformEdges[2] = (outerRes[2] == innerRes);
-
-    bool uniformCorners[3];
-    uniformCorners[0] = (uniformEdges[0] && uniformEdges[2]);
-    uniformCorners[1] = (uniformEdges[1] && uniformEdges[0]);
-    uniformCorners[2] = (uniformEdges[2] && uniformEdges[1]);
-
-    //  Initialize inner edge count and the FacetStrip for local use:
-    assert(innerRes > 2);
-    int innerEdges = innerRes - 3;
-
-    int nFacets = 0;
-
-    int outerRingStart = 0;
-    int innerRingStart = nBoundaryEdges;
-
-    FacetStrip tStrip;
-    tStrip.quadTopology  = false;
-    tStrip.innerReversed = false;
-    tStrip.innerEdges    = innerEdges;
-
-    //  Assign the three strips of Facets:
-    tStrip.outerEdges   = outerRes[0];
-    tStrip.outerFirst   = outerRingStart;
-    tStrip.outerLast    = outerRingStart + outerRes[0];
-    tStrip.outerPrev    = innerRingStart - 1;
-    tStrip.innerFirst   = innerRingStart;
-    tStrip.innerLast    = innerRingStart + innerEdges;
-    if (uniformEdges[0]) {
-        tStrip.splitFirstFace = !uniformCorners[0];
-        tStrip.splitLastFace  = !uniformCorners[1];
-        nFacets += tStrip.connectUniformTris(facets + nFacets);
-    } else {
-        tStrip.splitFirstFace = true;
-        tStrip.splitLastFace  = true;
-        nFacets += tStrip.connectNonUniformFacets(facets + nFacets);
-    }
-
-    tStrip.outerEdges   = outerRes[1];
-    tStrip.outerFirst   = tStrip.outerLast;
-    tStrip.outerLast   += outerRes[1];
-    tStrip.outerPrev    = tStrip.outerFirst - 1;
-    tStrip.innerFirst   = tStrip.innerLast;
-    tStrip.innerLast   += innerEdges;
-    if (uniformEdges[1]) {
-        tStrip.splitFirstFace = !uniformCorners[1];
-        tStrip.splitLastFace  = !uniformCorners[2];
-        nFacets += tStrip.connectUniformTris(facets + nFacets);
-    } else {
-        tStrip.splitFirstFace = true;
-        tStrip.splitLastFace  = true;
-        nFacets += tStrip.connectNonUniformFacets(facets + nFacets);
-    }
-
-    tStrip.outerEdges   = outerRes[2];
-    tStrip.outerFirst   = tStrip.outerLast;
-    tStrip.outerLast    = 0;
-    tStrip.outerPrev    = tStrip.outerFirst - 1;
-    tStrip.innerFirst   = tStrip.innerLast;
-    tStrip.innerLast    = innerRingStart;
-    if (uniformEdges[2]) {
-        tStrip.splitFirstFace = !uniformCorners[2];
-        tStrip.splitLastFace  = !uniformCorners[0];
-        nFacets += tStrip.connectUniformTris(facets + nFacets);
-    } else {
-        tStrip.splitFirstFace = true;
-        tStrip.splitLastFace  = true;
-        nFacets += tStrip.connectNonUniformFacets(facets + nFacets);
-    }
-    return nFacets;
-}
-
-int
-tri::GetUniformFacets(int edgeRes, FacetArray facets) {
-
-    //  The trivial case should have been handled by the caller:
-    assert(edgeRes > 1);
-
-    int nRings = 1 + (edgeRes / 3);
-
-    int nFacets = 0;
-    int coord0  = 0;
-    for (int ring = 0; ring < nRings; ++ring, edgeRes -= 3) {
-        nFacets += getInteriorRingFacets(edgeRes, coord0, facets + nFacets);
-        coord0  += 3 * edgeRes;
-    }
-    return nFacets;
-}
-
-int
-tri::GetNonUniformFacets(int const outerRes[], int innerRes,
-                         int nBoundaryEdges, FacetArray facets) {
-
-    assert(innerRes > 2);
-
-    //  First, generate the ring of boundary facets separately:
-    int nFacets = getBoundaryRingFacets(outerRes, innerRes,
-                                        nBoundaryEdges, facets);
-
-    //  Second, generate the remaining rings of interior facets:
-    int nRings = 1 + (innerRes / 3);
-    int coord0  = nBoundaryEdges;
-
-    for (int ring = 1; ring < nRings; ++ring) {
-        innerRes -= 3;
-
-        nFacets += getInteriorRingFacets(innerRes,
-                                         coord0, facets + nFacets);
-        coord0  += 3 * innerRes;
-    }
-    return nFacets;
-}
-
-
-//
-//  These utilities support quadrangulated polygons used for quad-based
-//  subdivision schemes.
-//
-
-//
-//  The formulae to enumerate points and facets for a uniform tessellation
-//  reflect the differing topologies for the odd and even case:
-//
-inline int
-qsub::CountUniformFacets(int N, int edgeRes, bool triangulate) {
-
-    bool resIsOdd = (edgeRes & 1);
-
-    int H = edgeRes / 2;
-
-    int nQuads  = (H + resIsOdd) * H * N;
-    int nCenter = resIsOdd ? ((N == 3) ? 1 : N) : 0;
-
-    return (nQuads << (int)triangulate) + nCenter;
-}
-
-int
-qsub::CountNonUniformFacets(int N, int const outerRes[], int innerRes,
-                            bool triangulate) {
-
-    assert(innerRes > 1);
-
-    //  Count interior facets based on edges of inner ring:
-    int nInnerEdges = innerRes - 2;
-
-    int nInterior = 0;
-    if (nInnerEdges) {
-        nInterior = CountUniformFacets(N, nInnerEdges, triangulate);
-    }
-
-    //
-    //  Accumulate boundary facets for uniform vs non-uniform edge.  Uniform
-    //  has a quad for each inner edge, plus one facet for leading corner
-    //  and a tri for the trailing corner if not uniform.  Non-uniform has
-    //  a tri for each inner edge and each outer edge:
-    //
-    int nBoundary = 0;
-    for (int i = 0; i < N; ++i) {
-        if (triangulate) {
-            nBoundary += nInnerEdges + outerRes[i];
-        } else if (outerRes[i] == innerRes) {
-            nBoundary += nInnerEdges + 1 + (innerRes != outerRes[(i+1) % N]);
-        } else {
-            int nEdge = std::max(nInnerEdges, outerRes[i]);
-            if ((nEdge & 1) == 0) {
-                nEdge += (nInnerEdges & 1) || (outerRes[i] & 1);
-            }
-            nBoundary += nEdge;
-        }
-    }
-    return nInterior + nBoundary;
-}
-
-inline int
-qsub::countUniformCoords(int N, int edgeRes) {
-
-    int H = edgeRes / 2;
-    return (edgeRes & 1) ? (H+1)* (H+1) * N + ((N == 3) ? 0 : 1)
-                         :   H  * (H+1) * N + 1;
-}
-
-inline int
-qsub::CountInteriorCoords(int N, int edgeRes) {
-
-    assert(edgeRes > 1);
-    return countUniformCoords(N, edgeRes - 2);
-}
-
-template <typename REAL>
-inline int
-qsub::getCenterCoord(Coord2Array<REAL> coords) {
-
-    coords[0].Set(0.5f, 0.5f);
-    return 1;
-}
-
-template <typename REAL>
-int
-qsub::getRingEdgeCoords(Parameterization P, int edge, int edgeRes,
-                        bool incFirst, bool incLast,
-                        REAL tOrigin, REAL dt,
-                        Coord2Array<REAL> coords) {
-
-    //
-    //  Determine number of coords in each half, excluding the ends.  The
-    //  second half will get the extra when odd so that the sequence starts
-    //  exactly on the boundary of the second sub-face (avoiding floating
-    //  point error when accumulating to the boundary of the first):
-    //
-    int n0 = (edgeRes - 1) / 2;
-    int n1 = (edgeRes - 1) - n0;
-
-    int nCoords = 0;
-    if (incFirst || n0) {
-        REAL uv0[2];
-        P.GetVertexCoord(edge, uv0);
-
-        //  u ranges from [tOrigin < 0.5] while v is constant
-        if (incFirst) {
-            coords[nCoords++].Set(uv0[0] + tOrigin, uv0[1] + tOrigin);
-        }
-        if (n0) {
-            REAL u = uv0[0] + tOrigin + dt;
-            REAL v = uv0[1] + tOrigin;
-            nCoords += appendVIsoLine(coords + nCoords, n0, u, v, dt);
-        }
-    }
-    if (n1 || incLast) {
-        REAL uv1[2];
-        P.GetVertexCoord((edge + 1) % P.GetFaceSize(), uv1);
-
-        //  u is constant while v ranges from [0.5 > tOrigin] (even)
-        if (n1) {
-            REAL u = uv1[0] + tOrigin;
-            REAL v = uv1[1] + ((edgeRes & 1) ? (0.5f - 0.5f * dt) : 0.5f);
-            nCoords += appendUIsoLine(coords + nCoords, n1, u, v, -dt);
-        }
-        if (incLast) {
-            coords[nCoords++].Set(uv1[0] + tOrigin, uv1[1] + tOrigin);
-        }
-    }
-    return nCoords;
-}
-
-template <typename REAL>
-int
-qsub::GetEdgeCoords(Parameterization P, int edge, int edgeRes,
-                    Coord2Array<REAL> coords) {
-
-    return getRingEdgeCoords<REAL>(P, edge, edgeRes, false, false,
-                                   0.0f, 1.0f / (REAL)edgeRes,
-                                   coords);
-}
-
-template <typename REAL>
-int
-qsub::GetBoundaryCoords(Parameterization P, int const edgeRates[],
-                        Coord2Array<REAL> coords) {
-
-
-    int N = P.GetFaceSize();
-
-    int nCoords = 0;
-    for (int i = 0; i < N; ++i) {
-        nCoords += getRingEdgeCoords<REAL>(P, i, edgeRates[i], true, false,
-                                           0.0f, 1.0f / (REAL)edgeRates[i],
-                                           coords + nCoords);
-    }
-    return nCoords;
-}
-
-template <typename REAL>
-int
-qsub::getInteriorRingCoords(Parameterization P, int edgeRes,
-                            REAL tOrigin, REAL dt,
-                            Coord2Array<REAL> coords) {
-    assert(edgeRes > 1);
-
-    int N = P.GetFaceSize();
-
-    int nCoords = 0;
-    for (int i = 0; i < N; ++i) {
-        nCoords += getRingEdgeCoords(P, i, edgeRes, true, false,
-                                     tOrigin, dt,
-                                     coords + nCoords);
-    }
-    return nCoords;
-}
-
-template <typename REAL>
-int
-qsub::getCenterRingCoords(Parameterization P, REAL tOrigin,
-                          Coord2Array<REAL> coords) {
-
-    int N = P.GetFaceSize();
-
-    //  Just need the single corner point for each edge here:
-    for (int i = 0; i < N; ++i) {
-        REAL uv[2];
-        P.GetVertexCoord(i, uv);
-        coords[i].Set(uv[0] + tOrigin, uv[1] + tOrigin);
-    }
-    return (N == 3) ? N : (N + getCenterCoord(coords + N));
-}
-
-template <typename REAL>
-int
-qsub::GetInteriorCoords(Parameterization P, int edgeRes,
-                        Coord2Array<REAL> coords) {
-
-    int nIntRings = edgeRes / 2;
-    if (nIntRings == 0) return 0;
-
-    REAL dt = 1.0f / (REAL) edgeRes;
-    REAL t  = dt;
-
-    int ringRes = edgeRes - 2;
-
-    int nCoords = 0;
-    for (int i = 0; i < nIntRings; ++i, ringRes -= 2, t += dt) {
-        if (ringRes == 0) {
-            nCoords += getCenterCoord(coords + nCoords);
-        } else if (ringRes == 1) {
-            nCoords += getCenterRingCoords(P, t, coords + nCoords);
-        } else {
-            nCoords += getInteriorRingCoords(P, ringRes, t, dt,
-                                             coords + nCoords);
-        }
-    }
-    return nCoords;
-}
-
-int
-qsub::getCenterFacets(int N, int coord0, FacetArray facets) {
-
-    return (N == 3) ? appendTri(facets, coord0, coord0+1, coord0+2)
-                    : appendTriFan(facets, N, coord0);
-}
-
-int
-qsub::getInteriorRingFacets(int N, int edgeRes, int coord0, bool triangulate,
-                            FacetArray facets) {
-
-    //
-    //  Deal with trivial cases with no inner vertices:
-    //
-    if (edgeRes < 1) return 0;
-
-    if (edgeRes == 1) {
-        return getCenterFacets(N, coord0, facets);
-    }
-
-    //
-    //  Generate facets for the N quad-strips for each edge:
-    //
-    int outerRes  = edgeRes;
-    int outerRing = coord0;
-
-    int innerRes  = outerRes - 2;
-    int innerRing = outerRing + N * outerRes;
-
-    int nFacets = 0;
-
-    FacetStrip qStrip;
-    qStrip.quadTopology    = true;
-    qStrip.quadTriangulate = triangulate;
-    qStrip.outerEdges      = outerRes;
-    qStrip.innerEdges      = innerRes;
-    qStrip.innerReversed   = false;
-    qStrip.splitFirstFace  = false;
-    qStrip.splitLastFace   = false;
-
-    for (int edge = 0; edge < N; ++edge) {
-        qStrip.outerFirst = outerRing + edge * outerRes;
-        qStrip.innerFirst = innerRing + edge * innerRes;
-
-        qStrip.outerPrev = (edge ? qStrip.outerFirst : innerRing) - 1;
-
-        if (edge < N-1) {
-            qStrip.outerLast = qStrip.outerFirst + outerRes;
-            qStrip.innerLast = qStrip.innerFirst + innerRes;
-        } else {
-            qStrip.outerLast = outerRing;
-            qStrip.innerLast = innerRing;
-        }
-
-        nFacets += qStrip.connectUniformQuads(facets + nFacets);
-    }
-    return nFacets;
-}
-
-int
-qsub::getBoundaryRingFacets(int N, int const outerRes[], int innerRes,
-                            int nBoundaryEdges, bool triangulate,
-                            FacetArray facets) {
-
-    int innerEdges = std::max(innerRes - 2, 0);
-
-    int nFacets = 0;
-
-    int outerRingStart = 0;
-    int innerRingStart = nBoundaryEdges;
-
-    //  Initialize properties of the strip that are fixed:
-    FacetStrip qStrip;
-    qStrip.quadTopology    = true;
-    qStrip.quadTriangulate = triangulate;
-    qStrip.innerReversed   = false;
-    qStrip.innerEdges      = innerEdges;
-
-    for (int edge = 0; edge < N; ++edge) {
-        qStrip.outerEdges = outerRes[edge];
-
-        //  Initialize the indices starting this strip:
-        if (edge) {
-            qStrip.outerFirst = qStrip.outerLast;
-            qStrip.outerPrev  = qStrip.outerFirst - 1;
-            qStrip.innerFirst = qStrip.innerLast;
-        } else {
-            qStrip.outerFirst = outerRingStart;
-            qStrip.outerPrev  = innerRingStart - 1;
-            qStrip.innerFirst = innerRingStart;
-        }
-
-        //  Initialize the indices ending this strip:
-        if (edge < N-1) {
-            qStrip.outerLast = qStrip.outerFirst + qStrip.outerEdges;
-            qStrip.innerLast = qStrip.innerFirst + qStrip.innerEdges;
-        } else {
-            qStrip.outerLast = outerRingStart;
-            qStrip.innerLast = innerRingStart;
-        }
-
-        //  Test rates at, before and after this edge for uniform behavior:
-        if ((outerRes[edge] == innerRes) && (innerRes > 1)) {
-            qStrip.splitFirstFace = (outerRes[(edge-1+N) % N] != innerRes);
-            qStrip.splitLastFace  = (outerRes[(edge + 1) % N] != innerRes);
-
-            nFacets += qStrip.connectUniformQuads(facets+nFacets);
-        } else {
-            qStrip.splitFirstFace = true;
-            qStrip.splitLastFace  = true;
-
-            nFacets += qStrip.connectNonUniformFacets(facets + nFacets);
-        }
-    }
-    return nFacets;
-}
-    
-int
-qsub::GetUniformFacets(int N, int edgeRes, bool triangulate,
-                       FacetArray facets) {
-
-    //  The trivial (single facet) case should be handled externally:
-    if (edgeRes == 1) {
-        return getCenterFacets(N, 0, facets);
-    }
-
-    int nRings = (edgeRes + 1) / 2;
-
-    int nFacets = 0;
-    int coord0  = 0;
-    for (int ring = 0; ring < nRings; ++ring, edgeRes -= 2) {
-        nFacets += getInteriorRingFacets(N, edgeRes, coord0, triangulate,
-                                         facets + nFacets);
-        coord0  += N * edgeRes;
-    }
-    return nFacets;
-}
-
-int
-qsub::GetNonUniformFacets(int N, int const outerRes[], int innerRes,
-                          int nBoundaryEdges, bool triangulate,
-                          FacetArray facets) {
-
-    //  First, generate the ring of boundary facets separately:
-    int nFacets = getBoundaryRingFacets(N, outerRes, innerRes, nBoundaryEdges,
-                                        triangulate, facets);
-
-    //  Second, generate the remaining rings of interior facets:
-    int nRings = (innerRes + 1) / 2;
-    int coord0  = nBoundaryEdges;
-
-    for (int ring = 1; ring < nRings; ++ring) {
-        innerRes = std::max(innerRes - 2, 0);
-
-        nFacets += getInteriorRingFacets(N, innerRes, coord0, triangulate,
-                                         facets + nFacets);
-        coord0  += N * innerRes;
-    }
-    return nFacets;
-}
-
-
-//
-//  Internal initialization methods:
-//
-void
-Tessellation::initializeDefaults() {
-
-    std::memset((void*) this, 0, sizeof(*this));
-
-    //  Assign any non-zero defaults:
-    _triangulate = true;
-
-    _isValid = false;
-}
-
-bool
-Tessellation::validateArguments(Parameterization const & p,
-        int numRates, int const rates[], Options const & options) {
-
-    //  Check the Parameterization:
-    if (!p.IsValid()) return false;
-
-    //  Check given tessellation rates:
-    if (numRates < 1) return false;
-    for (int i = 0; i < numRates; ++i) {
-        if (rates[i] < 1) return false;
-    }
-
-    //  Check given buffer strides in Options:
-    int coordStride = options.GetCoordStride();
-    if (coordStride && (coordStride < 2)) return false;
-
-    int facetStride = options.GetFacetStride();
-    if (facetStride && (facetStride < options.GetFacetSize())) return false;
-
-    return true;
-}
-
-void
-Tessellation::initialize(Parameterization const & p,
-        int numRates, int const rates[], Options const & options) {
-
-    //  Validate arguments and initialize simple members:
-    initializeDefaults();
-
-    if (!validateArguments(p, numRates, rates, options)) return;
-
-    _param = p;
-
-    _facetSize   = (short) options.GetFacetSize();
-    _facetStride = options.GetFacetStride() ?
-                   options.GetFacetStride() : options.GetFacetSize();
-
-    _coordStride = options.GetCoordStride() ? options.GetCoordStride() : 2;
-
-    //  Initialize the full array of rates, returning sum of outer edge rates
-    int sumOfOuterRates = initializeRates(numRates, rates);
-
-    //  Initialize the inventory based on the Parameterization type:
-    _triangulate = (_facetSize == 3) || !options.PreserveQuads();
-
-    switch (_param.GetType()) {
-    case Parameterization::QUAD:
-        initializeInventoryForParamQuad(sumOfOuterRates);
-        break;
-    case Parameterization::TRI:
-        initializeInventoryForParamTri(sumOfOuterRates);
-        break;
-    case Parameterization::QUAD_SUBFACES:
-        initializeInventoryForParamQPoly(sumOfOuterRates);
-        break;
-    }
-    _isValid = true;
-
-    //  Debugging output:
-    bool printNonUniform = false; // !_isUniform;
-    if (printNonUniform) {
-        int N = _param.GetFaceSize();
-        printf("Tessellation::initialize(%d, numRates = %d):\n", N, numRates);
-        printf("    is uniform          = %d\n", _isUniform);
-        printf("        outer rates     =");
-        for (int i = 0; i < N; ++i) printf(" %d", _outerRates[i]);
-        printf("\n");
-        printf("        inner rate(s)   = %d", _innerRates[0]);
-        if (N == 4) printf(" %d\n", _innerRates[1]);
-        printf("\n");
-        printf("    num boundary points = %d\n", _numBoundaryPoints);
-        printf("    num interior points = %d\n", _numInteriorPoints);
-        printf("    num facets          = %d\n", _numFacets);
-    }
-}
-
-int
-Tessellation::initializeRates(int numGivenRates, int const givenRates[]) {
-
-    _numGivenRates = numGivenRates;
-
-    //  Allocate space for rates of N-sided faces if necessary:
-    int N = _param.GetFaceSize();
-    if (N > (int)(sizeof(_outerRatesLocal) / sizeof(int))) {
-        _outerRates = new int[N];
-    } else {
-        _outerRates = &_outerRatesLocal[0];
-    }
-    bool isQuad = (N == 4);
-
-    //  Keep track of the total tessellation rate for all edges to return:
-    int const MaxRate = std::numeric_limits<short>::max();
-
-    int totalEdgeRate = 0;
-    if (numGivenRates < N) {
-        //  Given one or two inner rates, infer outer (others < N ignored):
-        if ((numGivenRates == 2) && isQuad) {
-            //  Infer outer rates from two given inner rates of quad:
-            _innerRates[0] = std::min(givenRates[0], MaxRate);
-            _innerRates[1] = std::min(givenRates[1], MaxRate);
-
-            _outerRates[0] = _outerRates[2] = _innerRates[0];
-            _outerRates[1] = _outerRates[3] = _innerRates[1];
-
-            _isUniform = (_innerRates[0] == _innerRates[1]);
-            totalEdgeRate = 2 * (_innerRates[0] + _innerRates[1]);
-        } else {
-            //  Infer outer rates from single inner rate (uniform):
-            _innerRates[0] = std::min(givenRates[0], MaxRate);
-            _innerRates[1] = _innerRates[0];
-
-            std::fill(_outerRates, _outerRates + N, _innerRates[0]);
-
-            _isUniform = true;
-            totalEdgeRate = _innerRates[0] * N;
-        }
-    } else {
-        //  Assign the N outer rates:
-        _isUniform = true;
-        for (int i = 0; i < N; ++i) {
-            _outerRates[i] = std::min(givenRates[i], MaxRate);
-            _isUniform = _isUniform && (_outerRates[i] == _outerRates[0]);
-            totalEdgeRate += _outerRates[i];
-        }
-
-        //  Assign any given inner rates or infer:
-        if (numGivenRates > N) {
-            //  Assign single inner rate, assign/infer second for quad:
-            _innerRates[0] = std::min(givenRates[N], MaxRate);
-            _innerRates[1] = ((numGivenRates == 6) && isQuad)
-                           ? std::min(givenRates[5], MaxRate) : _innerRates[0];
-
-            _isUniform = _isUniform && (_innerRates[0] == _outerRates[0]);
-            _isUniform = _isUniform && (_innerRates[1] == _outerRates[0]);
-        } else if (isQuad) {
-            //  Infer two inner rates for quads (avg of opposite edges):
-            _innerRates[0] = (_outerRates[0] + _outerRates[2]) / 2;
-            _innerRates[1] = (_outerRates[1] + _outerRates[3]) / 2;
-        } else {
-            //  Infer single inner rate for non-quads (avg of edge rates)
-            _innerRates[0] = totalEdgeRate / N;
-            _innerRates[1] = _innerRates[0];
-        }
-    }
-    return totalEdgeRate;
-}
-
-int
-Tessellation::GetRates(int rates[]) const {
-
-    int N = _param.GetFaceSize();
-
-    int numOuterRates = std::min<int>(N, _numGivenRates);
-    int numInnerRates = std::max<int>(0, _numGivenRates - N);
-
-    for (int i = 0; i < numOuterRates; ++i) {
-        rates[i] = _outerRates[i];
-    }
-    for (int i = 0; i < numInnerRates; ++i) {
-        rates[N + i] = _innerRates[i > 0];
-    }
-    return _numGivenRates;
-}
-
-void
-Tessellation::initializeInventoryForParamQuad(int sumOfEdgeRates) {
-
-    int const * inner = &_innerRates[0];
-    int const * outer = &_outerRates[0];
-
-    if (_isUniform) {
-        if (inner[0] > 1) {
-            _numInteriorPoints = quad::CountInteriorCoords(inner[0]);
-            _numFacets = quad::CountUniformFacets(inner[0], _triangulate);
-        } else if (_triangulate) {
-            _numInteriorPoints = 0;
-            _numFacets = 2;
-            _splitQuad = true;
-        } else {
-            _numInteriorPoints = 0;
-            _numFacets = 1;
-            _singleFace = true;
-        }
-    } else {
-        //
-        //  For quads another low-res case is recognized when there are
-        //  no interior points, but the face has extra boundary points.
-        //  Instead of introducing a center point, the face is considered
-        //  to be "segmented" into other faces that cover it without the
-        //  addition of any interior vertices.
-        //
-        //  This currently occurs for a pure 1 x M tessellation -- from
-        //  which a quad strip is generated -- but could be extended to
-        //  handle the 1 x M inner case with additional points on the
-        //  opposing edges.
-        //
-        if ((inner[0] > 1) && (inner[1] > 1)) {
-            _numInteriorPoints = quad::CountInteriorCoords(_innerRates);
-            _numFacets = quad::CountNonUniformFacets(_outerRates, _innerRates,
-                                                     _triangulate);
-        } else if ((outer[0] == inner[0]) && (inner[0] == outer[2]) &&
-                   (outer[1] == inner[1]) && (inner[1] == outer[3])) {
-            _numInteriorPoints = 0;
-            _numFacets = quad::CountSegmentedFacets(_innerRates, _triangulate);
-            _segmentedFace = true;
-        } else {
-            _numInteriorPoints = 1;
-            _numFacets = sumOfEdgeRates;
-            _triangleFan = true;
-        }
-    }
-    _numBoundaryPoints = sumOfEdgeRates;
-}
-
-void
-Tessellation::initializeInventoryForParamTri(int sumOfEdgeRates) {
-
-    int res = _innerRates[0];
-
-    if (_isUniform) {
-        if (res > 1) {
-            _numInteriorPoints = tri::CountInteriorCoords(res);
-            _numFacets = tri::CountUniformFacets(res);
-        } else {
-            _numInteriorPoints = 0;
-            _numFacets = 1;
-            _singleFace = true;
-        }
-    } else {
-        if (res > 2) {
-            _numInteriorPoints = tri::CountInteriorCoords(res);
-            _numFacets = tri::CountNonUniformFacets(_outerRates, res);
-        } else {
-            _numInteriorPoints = 1;
-            _numFacets = sumOfEdgeRates;
-            _triangleFan = true;
-        }
-    }
-    _numBoundaryPoints = sumOfEdgeRates;
-}
-
-void
-Tessellation::initializeInventoryForParamQPoly(int sumOfEdgeRates) {
-
-    int N   = _param.GetFaceSize();
-    int res = _innerRates[0];
-
-    if (_isUniform) {
-        if (res > 1) {
-            _numInteriorPoints = qsub::CountInteriorCoords(N, res);
-            _numFacets = qsub::CountUniformFacets(N, res, _triangulate);
-        } else if (N == 3) {
-            _numInteriorPoints = 0;
-            _numFacets = 1;
-            _singleFace  = true;
-        } else {
-            _numInteriorPoints = 1;
-            _numFacets = N;
-            _triangleFan = true;
-        }
-    } else {
-        if (res > 1) {
-            _numInteriorPoints = qsub::CountInteriorCoords(N, res);
-            _numFacets = qsub::CountNonUniformFacets(N, _outerRates, res,
-                                                     _triangulate);
-        } else {
-            _numInteriorPoints = 1;
-            _numFacets = sumOfEdgeRates;
-            _triangleFan = true;
-        }
-    }
-    _numBoundaryPoints = sumOfEdgeRates;
-}
-
-//
-//  Tessellation constructors and destructor:
-//
-Tessellation::Tessellation(
-        Parameterization const & p, int uniformRate,
-        Options const & options) {
-
-    initialize(p, 1, &uniformRate, options);
-}
-
-Tessellation::Tessellation(
-        Parameterization const & p, int numRates, int const rates[],
-        Options const & options) {
-
-    initialize(p, numRates, rates, options);
-}
-
-Tessellation::~Tessellation() {
-
-    if (_outerRates != &_outerRatesLocal[0]) {
-        delete[] _outerRates;
-    }
-}
-
-
-//
-//  Main methods to retrieve samples and facets:
-//
-template <typename REAL>
-int
-Tessellation::GetEdgeCoords(int edge, REAL coordBuffer[]) const {
-
-    //  Remember this method excludes coords at the end vertices
-    int edgeRes = _outerRates[edge];
-
-    Coord2Array<REAL> coords(coordBuffer, _coordStride);
-
-    switch (_param.GetType()) {
-    case Parameterization::QUAD:
-        return quad::GetEdgeCoords(edge, edgeRes, coords);
-    case Parameterization::TRI:
-        return tri::GetEdgeCoords(edge, edgeRes, coords);
-    case Parameterization::QUAD_SUBFACES:
-        return qsub::GetEdgeCoords(_param, edge, edgeRes, coords);
-    default:
-        assert(0);
-    }
-    return -1;
-}
-
-template <typename REAL>
-int
-Tessellation::GetBoundaryCoords(REAL coordBuffer[]) const {
-
-    Coord2Array<REAL> coords(coordBuffer, _coordStride);
-
-    switch (_param.GetType()) {
-    case Parameterization::QUAD:
-        return quad::GetBoundaryCoords(_outerRates, coords);
-    case Parameterization::TRI:
-        return tri::GetBoundaryCoords(_outerRates, coords);
-    case Parameterization::QUAD_SUBFACES:
-        return qsub::GetBoundaryCoords(_param, _outerRates, coords);
-    default:
-        assert(0);
-    }
-    return -1;
-}
-
-template <typename REAL>
-int
-Tessellation::GetInteriorCoords(REAL coordBuffer[]) const {
-
-    if (_numInteriorPoints == 0) return 0;
-
-    if (_numInteriorPoints == 1) {
-        _param.GetCenterCoord(coordBuffer);
-        return 1;
-    }
-
-    Coord2Array<REAL> coords(coordBuffer, _coordStride);
-
-    switch (_param.GetType()) {
-    case Parameterization::QUAD:
-        return quad::GetInteriorCoords(_innerRates, coords);
-    case Parameterization::TRI:
-        return tri::GetInteriorCoords(_innerRates[0], coords);
-    case Parameterization::QUAD_SUBFACES:
-        return qsub::GetInteriorCoords(_param, _innerRates[0], coords);
-    default:
-        assert(0);
-    }
-    return 0;
-}
-
-int
-Tessellation::GetFacets(int facetIndices[]) const {
-
-    FacetArray facets(facetIndices, _facetSize, _facetStride);
-
-    int N = GetFaceSize();
-
-    if (_singleFace) {
-        if (N == 3) {
-            return appendTri(facets, 0, 1, 2);
-        } else {
-            return appendQuad(facets, 0, 1, 2, 3, 0);
-        }
-    }
-    if (_triangleFan) {
-        return appendTriFan(facets, _numFacets, 0);
-    }
-    if (_splitQuad) {
-        return appendQuad(facets, 0, 1, 2, 3, _triangulate);
-    }
-
-    int nFacets = 0;
-    switch (_param.GetType()) {
-    case Parameterization::QUAD:
-        if (_isUniform) {
-            nFacets = quad::GetUniformFacets(_innerRates[0], _triangulate,
-                                facets);
-        } else if (_segmentedFace) {
-            nFacets = quad::GetSegmentedFacets(_innerRates, _triangulate,
-                                facets);
-        } else {
-            nFacets = quad::GetNonUniformFacets(_outerRates, _innerRates,
-                                _numBoundaryPoints, _triangulate, facets);
-        }
-        break;
-    case Parameterization::TRI:
-        if (_isUniform) {
-            nFacets = tri::GetUniformFacets(_innerRates[0], facets);
-        } else {
-            nFacets = tri::GetNonUniformFacets(_outerRates, _innerRates[0],
-                                _numBoundaryPoints, facets);
-        }
-        break;
-    case Parameterization::QUAD_SUBFACES:
-        if (_isUniform) {
-            nFacets = qsub::GetUniformFacets(N, _innerRates[0], _triangulate,
-                                facets);
-        } else {
-            nFacets = qsub::GetNonUniformFacets(N, _outerRates, _innerRates[0],
-                                _numBoundaryPoints, _triangulate, facets);
-        }
-        break;
-    default:
-        assert(0);
-    }
-    assert(nFacets == _numFacets);
-    return nFacets;
-}
-
-void
-Tessellation::TransformFacetCoordIndices(int facetIndices[], int commonOffset) {
-
-    if (_facetSize == 4) {
-        for (int i = 0; i < _numFacets; ++i, facetIndices += _facetStride) {
-            facetIndices[0] += commonOffset;
-            facetIndices[1] += commonOffset;
-            facetIndices[2] += commonOffset;
-            if (facetIndices[3] >= 0) {
-                facetIndices[3] += commonOffset;
-            }
-        }
-    } else {
-        for (int i = 0; i < _numFacets; ++i, facetIndices += _facetStride) {
-            facetIndices[0] += commonOffset;
-            facetIndices[1] += commonOffset;
-            facetIndices[2] += commonOffset;
-        }
-    }
-}
-
-void
-Tessellation::TransformFacetCoordIndices(int facetIndices[],
-                                         int const boundaryIndices[],
-                                         int interiorOffset) {
-
-    for (int i = 0; i < _numFacets; ++i, facetIndices += _facetStride) {
-        for (int j = 0; j < (int)_facetSize; ++j) {
-            int & index = facetIndices[j];
-            if (index >= 0) {
-                index = (index < _numBoundaryPoints)
-                      ? boundaryIndices[index]
-                      : (index + interiorOffset);
-            }
-        }
-    }
-}
-
-void
-Tessellation::TransformFacetCoordIndices(int facetIndices[],
-                                         int const boundaryIndices[],
-                                         int const interiorIndices[]) {
-
-    for (int i = 0; i < _numFacets; ++i, facetIndices += _facetStride) {
-        for (int j = 0; j < (int)_facetSize; ++j) {
-            int & index = facetIndices[j];
-            if (index >= 0) {
-                index = (index < _numBoundaryPoints)
-                      ? boundaryIndices[index]
-                      : interiorIndices[index - _numBoundaryPoints];
-            }
-        }
-    }
-}
-
-//
-//  Explicit instantiation for multiple precision coordinate pairs:
-//
-template int
-Tessellation::GetBoundaryCoords<float>(float coordBuffer[]) const;
-template int
-Tessellation::GetBoundaryCoords<double>(double coordBuffer[]) const;
-
-template int
-Tessellation::GetInteriorCoords<float>(float coordBuffer[]) const;
-template int
-Tessellation::GetInteriorCoords<double>(double coordBuffer[]) const;
-
-template int
-Tessellation::GetEdgeCoords<float>(int edge, float coordBuffer[]) const;
-template int
-Tessellation::GetEdgeCoords<double>(int edge, double coordBuffer[]) const;
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/tessellation.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/tessellation.h
deleted file mode 100644
index 5325524b8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/tessellation.h
+++ /dev/null
@@ -1,385 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_TESSELLATION_H
-#define OPENSUBDIV3_BFR_TESSELLATION_H
-
-#include "../version.h"
-
-#include "../bfr/parameterization.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-///
-/// @brief Encapsulates a specific tessellation pattern of a Parameterization
-///
-/// Tessellation is a simple class that encapsulates a specified tessellation
-/// pattern for a given Parameterization. Tessellation parameters are given
-/// on construction and are fixed for its lifetime.
-///
-/// Methods allow inspection of the pattern in terms of the 2D coordinates of
-/// the points comprising the pattern and the faces that connect them. The
-/// 2D coordinates are referred to both in the documentation and the interface
-/// as "coords" while the faces connecting them are referred to as "facets"
-/// (to distinguish from the faces of the mesh, to which a Tessellation is
-/// applied).
-///
-class Tessellation {
-public:
-    ///
-    /// @brief Options configure a Tessellation to specify the nature of
-    ///        both its results and the structure of the coordinate and
-    ///        facet index arrays that its methods will populate.
-    ///
-    /// The sizes and strides of the target arrays should be specified
-    /// explicitly as they are not inferred by the presence of other
-    /// options.
-    ///
-    /// Modifiers of Options return a reference to itself to facilitate
-    /// inline usage.
-    ///
-    class Options {
-    public:
-        Options() : _preserveQuads(false), _facetSize4(false),
-                    _coordStride(0), _facetStride(0) { }
-
-        /// @brief Select preservation of quads for quad-based subdivision
-        ///        (requires 4-sided facets, default is off)
-        Options & PreserveQuads(bool on);
-        /// @brief Return if preservation of quads is set
-        bool      PreserveQuads() const { return _preserveQuads; }
-
-        /// @brief Assign the number of indices per facet (must be 3 or 4,
-        ///        default is 3)
-        Options & SetFacetSize(int numIndices);
-        //  @brief Return the number of indices per facet
-        int       GetFacetSize() const { return 3 + (int)_facetSize4; }
-
-        /// @brief Assign the stride between facets (default is facet size)
-        Options & SetFacetStride(int stride);
-        /// @brief Return the stride between facets
-        int       GetFacetStride() const { return _facetStride; }
-
-        /// @brief Assign the stride between (u,v) pairs (default is 2)
-        Options & SetCoordStride(int stride);
-        /// @brief Return the stride between (u,v) pairs
-        int       GetCoordStride() const { return _coordStride; }
-
-    private:
-        unsigned int _preserveQuads : 1;
-        unsigned int _facetSize4    : 1;
-
-        short _coordStride;
-        short _facetStride;
-    };
-
-public:
-    //@{
-    /// @name Construction and initialization
-    ///
-    /// Constructors require a Parameterization of a face, a set of one or
-    /// more tessellation rates, and a standard set of options.
-    ///
-    /// As with other classes, constructors can produce invalid instances if
-    /// given obviously invalid arguments, e.g. an invalid Parameterization,
-    /// non-positive tessellation rate, etc.
-    ///
-
-    /// @brief Simple constructor providing a single uniform tessellation rate.
-    ///
-    /// @param  p           Parameterization of a face to be tessellated
-    /// @param  uniformRate Integer tessellation rate (non-zero)
-    /// @param  options     Options describing tessellation results
-    ///
-    Tessellation(Parameterization const & p, int uniformRate,
-                 Options const & options = Options());
-
-    ///
-    /// @brief General constructor providing multiple tessellation rates for
-    ///        a non-uniform tessellation.
-    ///
-    /// @param  p           Parameterization of a face to be tessellated
-    /// @param  numRates    The number of tessellation rates provided, which
-    ///                     usually includes one per edge of the face (more
-    ///                     details below)
-    /// @param  rates       The array of non-zero integer tessellation rates
-    /// @param  options     Options describing tessellation results
-    ///
-    /// For a Parameterization of a face with N edges, the acceptable number
-    /// of tessellation rates can vary. Aside from N "outer" tessellation
-    /// rates (one for each edge), all faces can have at least one "inner"
-    /// rate additionally specified while quads can have two inner rates.
-    ///
-    /// If inner rates are not specified in addition to the N outer rates,
-    /// they will be inferred (so it is not necessary to initialize quads
-    /// distinctly from other faces). Similarly -- though less useful -- the
-    /// smaller set of inner rates can be specified, leaving all outer rates
-    /// to be inferred.
-    ///
-    /// For a face with N edges, the full set of acceptable rates and their
-    /// interpretations is as follows:
-    ///
-    ///      1  - single explicit inner rate (uniform)
-    ///      2  - (quads only) two explicit inner rates, outer rates inferred
-    ///      N  - explicit edge rates, inner rates inferred
-    ///     N+1 - explicit edge rates, explicit inner rate
-    ///     N+2 - (quads only) explicit edge rates, two explicit inner rates
-    ///
-    /// When associating rates with edges, note that rates[0] corresponds
-    /// to the edge between vertices 0 and 1. This is consistent with use
-    /// elsewhere in OpenSubdiv -- where edge i lies between vertices i and
-    /// i+1 -- but differs from the conventions used with many hardware
-    ///  tessellation interfaces.
-    ///
-    Tessellation(Parameterization const & p, int numRates, int const rates[],
-                 Options const & options = Options());
-
-    /// @brief Return true if correctly initialized
-    bool IsValid() const { return _isValid; }
-
-    /// @brief Default construction is unavailable
-    Tessellation() = delete;
-
-    Tessellation(Tessellation const &) = delete;
-    Tessellation & operator=(Tessellation const &) = delete;
-    ~Tessellation();
-    //@}
-
-    //@{
-    /// @name Simple queries
-    ///
-    /// Simple queries of a valid Tessellation.
-    ///
-
-    /// @brief Return the Parameterization
-    Parameterization GetParameterization() const { return _param; }
-
-    /// @brief Return the size of the face
-    int GetFaceSize() const { return _param.GetFaceSize(); }
-
-    /// @brief Retrieve the rates assigned
-    int GetRates(int rates[]) const;
-
-    /// @brief Return if the pattern is uniform
-    bool IsUniform() const { return _isUniform; }
-    //@}
-
-    //@{
-    /// @name Methods to inspect and gather coordinates
-    ///
-    /// Methods to determine the number of sample points involved in the
-    /// tessellation pattern and their content are available for the entire
-    /// pattern, or for parts of the boundary or interior of the pattern.
-    ///
-    /// The methods that assign the coordinate arrays also return the number
-    /// of coordinates assigned, so the methods that just return those sizes
-    /// are not necessary if arrays for the resulting coords have already
-    /// been sufficiently allocated.
-    ///
-
-    /// @brief Return the number of coordinates in the entire pattern
-    int GetNumCoords() const { return _numInteriorPoints + _numBoundaryPoints; }
-
-    /// @brief Return the number of elements between each coordinate
-    int GetCoordStride() const { return _coordStride; }
-
-    /// @brief Return the number of boundary coordinates
-    int GetNumBoundaryCoords() const { return _numBoundaryPoints; }
-
-    /// @brief Return the number of interior coordinates
-    int GetNumInteriorCoords() const { return _numInteriorPoints; }
-
-    /// @brief Return the number of coordinates within a given edge
-    ///        (excluding those at its end vertices)
-    int GetNumEdgeCoords(int edge) const { return _outerRates[edge] - 1; }
-
-    /// @brief Retrieve the coordinates for the entire pattern
-    template <typename REAL>
-    int GetCoords(REAL coordTuples[]) const;
-
-    /// @brief Retrieve the coordinates for the boundary
-    template <typename REAL>
-    int GetBoundaryCoords(REAL coordTuples[]) const;
-
-    /// @brief Retrieve the coordinates for the boundary
-    template <typename REAL>
-    int GetInteriorCoords(REAL coordTuples[]) const;
-
-    /// @brief Retrieve the coordinate for a given vertex of the face
-    template <typename REAL>
-    int GetVertexCoord(int vertex, REAL coordTuples[]) const;
-
-    /// @brief Retrieve the coordinates for a given edge of the face
-    ///        (excluding those at its end vertices)
-    template <typename REAL>
-    int GetEdgeCoords(int edge,  REAL coordTuples[]) const;
-    //@}
-
-    //@{
-    /// @name Methods to inspect and gather facets
-    ///
-    /// Methods to inspect the number and values of facets. Facets are
-    /// simply integer tuples of size 3 or 4 which contain the indices
-    /// of the coordinates generated by the Tessellation.
-    ///
-    /// Unlike the coordinates -- which can be separated into those on
-    /// the boundary or interior of the pattern -- the facets are not
-    /// distinguished in any way. 
-    ///
-
-    /// @brief Return the number of facets in the entire pattern
-    int GetNumFacets() const { return _numFacets; }
-
-    /// @brief Return the number of indices assigned to each facet
-    int GetFacetSize() const { return _facetSize; }
-
-    /// @brief Return the number of elements between each facet
-    int GetFacetStride() const { return _facetStride; }
-
-    /// @brief Retrieve the facet indices for the entire pattern
-    int GetFacets(int facetTuples[]) const;
-    //@}
-
-    //@{
-    /// @name Methods to modify the coordinate indices of facets
-    ///
-    /// Methods to modify the coordinate indices of facets rely on the
-    /// coordinate indices being identifiable as those of boundary or
-    /// interior coordinates. The first N coordinates generated by
-    /// Tessellation will be on the boundary, while the remaining M
-    /// will be for the interior.
-    ///
-    /// The boundary and interior coordinate indices can be transformed
-    /// collectively or separately by offsets or by explicit reassignment.
-    /// Both the boundary and interior indices must be modified at the
-    /// same time while the Tessellation can distinguish them, i.e. a
-    /// boundary coord is identified by index < N and an interior coord
-    /// by index >= N.
-    ///
-
-    /// @brief Apply a common offset to all facet coordinate indices
-    void TransformFacetCoordIndices(int facetTuples[], int commonOffset);
-
-    /// @brief Reassign indices of boundary coordinates while offseting
-    ///        those of interior coordinates
-    void TransformFacetCoordIndices(int facetTuples[],
-                                    int const boundaryIndices[],
-                                    int       interiorOffset);
-
-    /// @brief Reassign all facet coordinate indices
-    void TransformFacetCoordIndices(int facetTuples[],
-                                    int const boundaryIndices[],
-                                    int const interiorIndices[]);
-    //@}
-
-private:
-    //  Private initialization methods:
-    bool validateArguments(Parameterization const & p,
-                    int nRates, int const rates[], Options const & options);
-
-    void initialize(Parameterization const & p,
-                    int nRates, int const rates[], Options const & options);
-
-    void initializeDefaults();
-    int  initializeRates(int nRates, int const rates[]);
-    void initializeInventoryForParamTri(int sumOfOuterRates);
-    void initializeInventoryForParamQuad(int sumOfOuterRates);
-    void initializeInventoryForParamQPoly(int sumOfOuterRates);
-
-private:
-    //  Private members:
-    Parameterization _param;
-
-    unsigned short _isValid       :  1;
-    unsigned short _isUniform     :  1;
-    unsigned short _triangulate   :  1;
-    unsigned short _singleFace    :  1;
-    unsigned short _segmentedFace :  1;
-    unsigned short _triangleFan   :  1;
-    unsigned short _splitQuad     :  1;
-
-    short _facetSize;
-    int   _facetStride;
-    int   _coordStride;
-
-    int _numGivenRates;
-    int _numBoundaryPoints;
-    int _numInteriorPoints;
-    int _numFacets;
-
-    int  _innerRates[2];
-    int* _outerRates;
-    int  _outerRatesLocal[4];
-};
-
-//
-//  Inline implementations:
-//
-inline Tessellation::Options &
-Tessellation::Options::PreserveQuads(bool on) {
-    _preserveQuads = on;
-    return *this;
-}
-inline Tessellation::Options &
-Tessellation::Options::SetFacetSize(int numIndices) {
-    _facetSize4 = (numIndices == 4);
-    return *this;
-}
-inline Tessellation::Options &
-Tessellation::Options::SetFacetStride(int stride)  {
-    _facetStride = (short) stride;
-    return *this;
-}
-inline Tessellation::Options &
-Tessellation::Options::SetCoordStride(int stride) {
-    _coordStride = (short) stride;
-    return *this;
-}
-
-template <typename REAL>
-inline int
-Tessellation::GetVertexCoord(int vertex, REAL coord[]) const {
-    _param.GetVertexCoord(vertex, coord);
-    return 1;
-}
-
-template <typename REAL>
-inline int
-Tessellation::GetCoords(REAL coordTuples[]) const {
-    int nCoords = GetBoundaryCoords(coordTuples);
-    nCoords += GetInteriorCoords(coordTuples + nCoords * _coordStride);
-    return nCoords;
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_TESSELLATION */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/vertexDescriptor.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/vertexDescriptor.cpp
deleted file mode 100644
index 379ca499a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/vertexDescriptor.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../bfr/vertexDescriptor.h"
-#include "../bfr/limits.h"
-#include "../sdc/crease.h"
-
-#include <cstring>
-#include <cstdio>
-#include <algorithm>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  Main initialize/finalize methods used by clients to delimit the
-//  assignment (most work is now handled by the containing class):
-//
-bool
-VertexDescriptor::Initialize(int numFaces) {
-
-    //  Mark invalid if too many or too few incident faces specified:
-    _isValid  = (numFaces > 0) && (numFaces <= Limits::MaxValence());
-    _numFaces = _isValid ? (short) numFaces : 0;
-
-    //  Initialize all other members regardless of the above:
-    _vertSharpness = 0.0f;
-
-    _isManifold = false;
-    _isBoundary = false;
-
-    _hasFaceSizes     = false;
-    _hasEdgeSharpness = false;
-
-    _isInitialized = _isValid;
-    _isFinalized   = false;
-
-    return _isInitialized;
-}
-
-bool
-VertexDescriptor::Finalize() {
-
-    //  Fail if already invalid:
-    if (!_isValid) return false;
-
-    //  Test for valid face size assignments while converting the sizes
-    //  to offsets. Also detect if the faces are all the same size -- in
-    //  which case, ignore the explicit assignments:
-    if (_hasFaceSizes) {
-        int  size0 = _faceSizeOffsets[0];
-        bool sameSizes = true;
-
-        int sum = 0;
-        for (int i = 0; i < _numFaces; ++i) {
-            int faceSize = _faceSizeOffsets[i];
-            if ((faceSize < 3) || (faceSize > Limits::MaxFaceSize())) {
-                _isValid = false;
-                return false;
-            }
-            sameSizes &= (faceSize == size0);
-
-            _faceSizeOffsets[i] = sum;
-            sum += faceSize;
-        }
-        _faceSizeOffsets[_numFaces] = sum;
-
-        //  No need to make use of explicit face sizes and offsets:
-        if (sameSizes) {
-            _hasFaceSizes = false;
-        }
-    }
-    _isFinalized = true;
-    return true;
-}
-
-//
-//  Internal methods for resizing local buffers:
-//
-void
-VertexDescriptor::initFaceSizes() {
-
-    _faceSizeOffsets.SetSize(_numFaces + 1);
-    std::fill(&_faceSizeOffsets[0], &_faceSizeOffsets[_numFaces + 1], 0);
-    _hasFaceSizes = true;
-}
-
-void
-VertexDescriptor::initEdgeSharpness() {
-
-    _faceEdgeSharpness.SetSize(_numFaces * 2);
-    std::fill(&_faceEdgeSharpness[0], &_faceEdgeSharpness[_numFaces * 2], 0.0f);
-    _hasEdgeSharpness = true;
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/vertexDescriptor.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/vertexDescriptor.h
deleted file mode 100644
index 06ed429e5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/vertexDescriptor.h
+++ /dev/null
@@ -1,449 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_VERTEX_DESCRIPTOR_H
-#define OPENSUBDIV3_BFR_VERTEX_DESCRIPTOR_H
-
-#include "../version.h"
-
-#include "../vtr/stackBuffer.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-///
-/// @brief Simple class used by subclasses of SurfaceFactory to describe a
-///        vertex
-///
-/// VertexDescriptor is a simple class used by SurfaceFactory and its
-/// subclasses to provide a complete topological description around the
-/// vertex of a face, i.e. its valence, the sizes of its incident faces,
-/// sharpness values, etc.
-///
-/// Instances are created and partially initialized by SurfaceFactory
-/// before being passed to its subclasses to be fully populated. So
-/// public construction is not available (or useful).
-///
-//
-//  WIP - need to migrate some of these comments into Doxygen
-//      - others will be moved to the external documentation
-//
-//  It is used by subclasses of SurfaceFactory to provide a complete
-//  topological description for each vertex of a face, i.e. invoked via
-//  the virtual method:
-//
-//      int populateFaceVertexDescriptor(Index baseFace,
-//                                       int cornerVertex,
-//                                       VertexDescriptor & v) const;
-//
-//  Assignment of the full topology can be involved in the presence of
-//  irregular faces, non-manifold topology or creasing around a vertex, but
-//  many cases will be simple.  For example, to specify a regular boundary
-//  vertex of a Catmark mesh without any optional sharpness:
-//
-//      int  numIncidentFaces = 2;
-//      bool vertexOnBoundary = true;
-//
-//      vd.Initialize(numIncidentFaces);
-//          vd.SetManifold(true);
-//          vd.SetBoundary(vertexOnBoundary);
-//          vd.ClearIncidentFaceSizes();
-//      vd.Finalize();
-//
-//  For a more general example, to assign a vertex of some valence whose
-//  incident faces are of different sizes (e.g. required when triangles
-//  appear around a vertex in an otherwise quad-dominant Catmark mesh):
-//
-//      int  numIncidentFaces = meshVertex.GetNumIncidentFaces();
-//      bool vertexOnBoundary = meshVertex.IsBoundar();
-//
-//      vd.Initialize(numIncidentFaces);
-//          vd.SetManifold(true);
-//          vd.SetBoundary(vertexOnBoundary);
-//
-//          for (int i = 0; i < numIncidentFaces; ++i) {
-//              vd.SetIncidentFaceSize(i, meshVertex.GetIncidentFaceSize(i));
-//          }
-//      vd.Finalize();
-//
-//  These examples specify the incident faces as forming a manifold ring
-//  (or half-ring) around the vertex, i.e. they can be specified as a
-//  continuous, connected sequence in counter-clockwise order (and also
-//  without degeneracies).  In the case of a boundary vertex, the first
-//  face must be on the leading edge of the boundary while the last is on
-//  the trailing edge.  For an interior vertex, which face is specified
-//  first does not matter (since the set is periodic).
-//
-//  In both cases, the location of the base face in this sequence -- the
-//  face whose corner vertex is being described here -- must be specified
-//  in the return value to populateFaceVertexDescriptor() (e.g. when a
-//  boundary vertex has 3 incident faces, a return value of 0, 1 or 2
-//  will indicate which is the base face).
-//
-//  The corresponding methods to specify mesh control vertex indices (or
-//  face-varying indices) complete the specification of the neighborhood:
-//
-//      int getFaceCornerVertexIndices(Index baseFace, int cornerVertex,
-//                                     Index vertexIndices[]) const;
-//
-//      int getFaceCornerFVarValueIndices(Index baseFace, int cornerVertex,
-//                                        Index fvarValueIndices[],
-//                                        int   fvarChannel) const;
-//
-//  and are invoked by the Factory when needed.
-//
-//  For each incident face, the indices for all vertices of that face are
-//  to be specified (not the one-ring or some other subset).  These indices
-//  must also be specified in an orientation relative to the vertex, i.e.
-//  for a vertex A and an incident face with face-vertices that may be
-//  stored internally as {D, C, A, B}, they must be specified with A first
-//  as {A, B, C, D}.  This may seem a bit cumbersome, but it has clear
-//  advantages when dealing with face-varying indices and unordered faces.
-//
-//  More compact ways of specifying vertex indices for ordered, manifold
-//  cases may be worth exploring in future, but face-varying indices and
-//  non-manifold (unordered) vertices will always require such a full set,
-//  so both methods will need to co-exist.
-//  
-class VertexDescriptor {
-public:
-    //  The full declaration must be enclosed by calls to these methods:
-    //
-    //  Note that vertex valences or face sizes in excess of those defined
-    //  in Bfr::Limits (typically 16-bits) are not valid.  When specifying
-    //  values in excess of these limits, initialization will fail and/or
-    //  the descriptor will be marked invalid and finalization will fail.
-    //
-
-    //@{
-    /// @name Methods to begin and end specification
-    ///
-    /// Partially constructed instances are populated using a set of
-    /// methods between calls to Initialize() and Finalize(). Both return
-    /// false to indicate failure due to invalid input, or the instance
-    /// can be inspected after each to determine if valid.
-    /// 
-
-    /// @brief Initialize specification with the number of incident faces
-    bool Initialize(int numIncidentFaces);
-
-    /// @brief Terminate the sequence of specifications
-    bool Finalize();
-
-    /// @brief Return if instance is valid
-    bool IsValid() const;
-    //@}
-
-    //
-    //  WIP - need to migrate these comments into Doxygen
-    //
-    //  Three groups of methods describe the topology around a vertex:
-    //      - simple properties (vertex is a boundary, manifold, etc.)
-    //      - sizes of incident faces (constant or size for each face)
-    //      - sharpness of the vertex and its incident edges (optional)
-    //
-
-    //  Manifold and boundary conditions:
-    //
-    //  The manifold property is a strict condition but preferred for
-    //  efficiency and is usually available from common connected mesh
-    //  representations.  When declaring the topology as "manifold",
-    //  the Factory assumes the following:
-    //
-    //      - all incident faces are "ordered" (counter-clockwise)
-    //      - all incident faces are consistently oriented
-    //      - all incident edges are non-degenerate
-    //
-    //  If not certain that all of these conditions are met, it is best
-    //  to not declare manifold -- leaving the Factory to make sense of
-    //  the set of incident faces from the face-vertex indices that are
-    //  provided elsewhere.
-    //  
-
-    //@{
-    /// @name Methods to specify topology
-    ///
-    /// Methods to specify the overall topology, the sizes of incident
-    /// faces and any assigned sharpness values.
-
-    /// @brief Declare the vertex neighborhood as manifold (ordered)
-    void SetManifold(bool isManifold);
-
-    /// @brief Declare the vertex neighborhood as being on a boundary
-    void SetBoundary(bool isOnBoundary);
-
-    /// @brief Assign the size of an incident face
-    void SetIncidentFaceSize(int faceIndex, int faceSize);
-
-    /// @brief Remove any assigned sizes of incident faces
-    void ClearIncidentFaceSizes();
-
-    /// @brief Assign sharpness to the vertex
-    void SetVertexSharpness(float sharpness);
-
-    /// @brief Remove any sharpness assigned to the vertex
-    void ClearVertexSharpness();
-
-    /// @brief Assign sharpness to the edge of a manifold neighborhood
-    ///
-    /// For use with a vertex declared manifold only, assigns a given
-    /// sharpness to the indicated edge in the ordered sequence of edges
-    /// around the vertex. In the case of a boundary vertex, the number
-    /// of incident edges in this ordered sequence will exceed the number
-    /// of incident faces by one.
-    ///
-    /// @param  edgeIndex     Index of the edge in the ordered sequence
-    /// @param  edgeSharpness Sharpness to be assigned to the edge
-    ///
-    void SetManifoldEdgeSharpness(int edgeIndex, float edgeSharpness);
-
-    /// @brief Assign sharpness to the edges of an incident face
-    ///
-    /// In all cases, sharpness can be assigned to edges by associating
-    /// those edges with their incident faces. This method assigns sharpness
-    /// to the two edges incident edges of an incident face. An alternative
-    /// is available for the case of a manifold vertex.
-    ///
-    /// @param  faceIndex         Index of the incident face
-    /// @param  leadingEdgeSharp  Sharpness to assign to the leading edge
-    ///                           of the incident face, i.e. the edge of the
-    ///                           face following the vertex.
-    /// @param  trailingEdgeSharp Sharpness to assign to the trailing edge
-    ///                           of the incident face, i.e. the edge of the
-    ///                           face preceding the vertex.
-    ///
-    void SetIncidentFaceEdgeSharpness(int faceIndex, float leadingEdgeSharp,
-                                                     float trailingEdgeSharp);
-
-    /// @brief Remove any sharpness assigned to the incident edges
-    void ClearEdgeSharpness();
-    //@}
-
-    //@{
-    /// @name Methods to inspect topology to confirm assignment
-    ///
-    /// While the public interface is primarily intended for assignment,
-    /// methods are available to inspect intermediate results.
-    ///
-
-    /// @brief Return if vertex neighborhood is manifold
-    bool IsManifold() const;
-
-    /// @brief Return if vertex neighborhood is on a boundary
-    bool IsBoundary() const;
-
-    /// @brief Return if the sizes of incident faces are assigned
-    bool HasIncidentFaceSizes() const;
-
-    /// @brief Return the size of an incident face
-    int GetIncidentFaceSize(int faceIndex) const;
-
-    /// @brief Return if sharpness was assigned to the vertex
-    bool HasVertexSharpness() const;
-
-    /// @brief Return the sharpness of the vertex
-    float GetVertexSharpness() const;
-
-    /// @brief Return if sharpness was assigned to the incident edges
-    bool HasEdgeSharpness() const;
-
-    /// @brief Return the sharpness assigned to a manifold edge
-    float GetManifoldEdgeSharpness(int edgeIndex) const;
-
-    /// @brief Return the sharpness assigned to edges of an incident face
-    void GetIncidentFaceEdgeSharpness(int faceIndex,
-            float * leadingEdgeSharp, float * trailingEdgeSharp) const;
-    //@}
-
-protected:
-    /// @cond PROTECTED
-    friend class FaceVertex;
-
-    VertexDescriptor() { }
-    ~VertexDescriptor() { }
-
-    typedef Vtr::internal::StackBuffer<int,8,true>    IntBuffer;
-    typedef Vtr::internal::StackBuffer<float,16,true> FloatBuffer;
-
-    void initFaceSizes();
-    void initEdgeSharpness();
-    /// @endcond
-
-protected:
-    /// @cond PROTECTED
-    //  Member variables assigned through the above interface:
-    unsigned short _isValid       : 1;
-    unsigned short _isInitialized : 1;
-    unsigned short _isFinalized   : 1;
-
-    unsigned short _isManifold : 1;
-    unsigned short _isBoundary : 1;
-
-    unsigned short _hasFaceSizes     : 1;
-    unsigned short _hasEdgeSharpness : 1;
-
-    short _numFaces;
-    float _vertSharpness;
-
-    FloatBuffer _faceEdgeSharpness;
-    IntBuffer   _faceSizeOffsets;
-    /// @endcond
-};
-
-//
-//  Public inline methods for simple assignment:
-//  
-inline bool
-VertexDescriptor::IsValid() const {
-    return _isValid;
-}
-
-inline void
-VertexDescriptor::SetManifold(bool isManifold) {
-    _isManifold = isManifold;
-}
-inline bool
-VertexDescriptor::IsManifold() const {
-    return _isManifold;
-}
-
-inline void
-VertexDescriptor::SetBoundary(bool isBoundary) {
-    _isBoundary = isBoundary;
-}
-inline bool
-VertexDescriptor::IsBoundary() const {
-    return _isBoundary;
-}
-
-//
-//  Public inline methods involving sizes of incident faces:
-//  
-inline bool
-VertexDescriptor::HasIncidentFaceSizes() const {
-    return _hasFaceSizes;
-}
-inline void
-VertexDescriptor::ClearIncidentFaceSizes() {
-    _hasFaceSizes = false;
-}
-
-inline void
-VertexDescriptor::SetIncidentFaceSize(int incFaceIndex, int faceSize) {
-
-    if (!_hasFaceSizes) initFaceSizes();
-
-    _faceSizeOffsets[incFaceIndex] = faceSize;
-}
-inline int
-VertexDescriptor::GetIncidentFaceSize(int incFaceIndex) const {
-
-    return _isFinalized ?
-          (_faceSizeOffsets[incFaceIndex+1] - _faceSizeOffsets[incFaceIndex]) :
-           _faceSizeOffsets[incFaceIndex];
-}
-
-//
-//  Public inline methods involving vertex sharpness:
-//  
-inline bool
-VertexDescriptor::HasVertexSharpness() const {
-    return _vertSharpness > 0.0f;
-}
-inline void
-VertexDescriptor::ClearVertexSharpness() {
-    _vertSharpness = 0.0f;
-}
-
-inline void
-VertexDescriptor::SetVertexSharpness(float vertSharpness) {
-    _vertSharpness = vertSharpness;
-}
-inline float
-VertexDescriptor::GetVertexSharpness() const {
-    return _vertSharpness;
-}
-
-//
-//  Public inline methods involving vertex sharpness:
-//  
-inline bool
-VertexDescriptor::HasEdgeSharpness() const {
-    return _hasEdgeSharpness;
-}
-inline void
-VertexDescriptor::ClearEdgeSharpness() {
-    _hasEdgeSharpness = false;
-}
-
-inline void
-VertexDescriptor::SetManifoldEdgeSharpness(int edgeIndex, float sharpness) {
-
-    if (!_hasEdgeSharpness) initEdgeSharpness();
-
-    //  Assign the leading edge of the face after the edge (even index):
-    if (edgeIndex < _numFaces) {
-        _faceEdgeSharpness[2*edgeIndex] = sharpness;
-    }
-
-    //  Assign the trailing edge of the face before the edge (odd index):
-    if (edgeIndex > 0) {
-        _faceEdgeSharpness[2*edgeIndex-1] = sharpness;
-    } else if (!IsBoundary()) {
-        _faceEdgeSharpness[2*_numFaces-1] = sharpness;
-    }
-}
-inline float
-VertexDescriptor::GetManifoldEdgeSharpness(int edgeIndex) const {
-
-    //  All edges are first of the pair (even index) except last of boundary
-    return _faceEdgeSharpness[2*edgeIndex - (edgeIndex == _numFaces)];
-}
-
-inline void
-VertexDescriptor::SetIncidentFaceEdgeSharpness(int faceIndex,
-        float leadingEdgeSharpness, float trailingEdgeSharpness) {
-
-    if (!_hasEdgeSharpness) initEdgeSharpness();
-
-    _faceEdgeSharpness[2*faceIndex  ] = leadingEdgeSharpness;
-    _faceEdgeSharpness[2*faceIndex+1] = trailingEdgeSharpness;
-}
-inline void
-VertexDescriptor::GetIncidentFaceEdgeSharpness(int faceIndex,
-        float * leadingEdgeSharpness, float * trailingEdgeSharpness) const {
-
-    *leadingEdgeSharpness  = _faceEdgeSharpness[2*faceIndex];
-    *trailingEdgeSharpness = _faceEdgeSharpness[2*faceIndex+1];
-}
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_VERTEX_DESCRIPTOR_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/vertexTag.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/vertexTag.h
deleted file mode 100644
index d6d9d7ea7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/bfr/vertexTag.h
+++ /dev/null
@@ -1,163 +0,0 @@
-//
-//   Copyright 2021 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_BFR_VERTEX_TAG_H
-#define OPENSUBDIV3_BFR_VERTEX_TAG_H
-
-#include "../version.h"
-
-#include <cstring>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Bfr {
-
-//
-//  VertexTag is a simple set of bits that identify exceptional properties
-//  at the corner vertices of a face that warrant closer inspection (and
-//  potential additional processing).  As with some bitfields in Far, this
-//  supports bitwise-OR so that tags for the corners of a face can quickly
-//  be combined to determine properties of the associated limit surface.
-//
-//  In order to accommodate the two separate uses more clearly -- that of
-//  a set of bits applying to a single corner/vertex versus a set of bits
-//  resulting from the combination (bitwise-OR) of several -- the bitfield
-//  is defined as a base class and two separate classes are derived from
-//  it to suit those purposes.
-//
-class FeatureBits {
-public:
-    FeatureBits() { }
-    ~FeatureBits() { }
-
-public:
-    //  Integer/bit conversions and operations:
-    typedef unsigned short IntType;
-
-    IntType GetBits() const {
-        IntType bits;
-        std::memcpy(&bits, this, sizeof(*this));
-        return bits;
-    }
-    void SetBits(IntType bits) {
-        std::memcpy(this, &bits, sizeof(*this));
-    }
-    void Clear() {
-        SetBits(0);
-    }
-
-protected:
-    friend class FaceVertex;
-    friend struct FaceVertexSubset;
-
-    IntType _boundaryVerts      : 1;
-    IntType _infSharpVerts      : 1;
-    IntType _infSharpEdges      : 1;
-    IntType _infSharpDarts      : 1;
-    IntType _semiSharpVerts     : 1;
-    IntType _semiSharpEdges     : 1;
-    IntType _unCommonFaceSizes  : 1;
-    IntType _irregularFaceSizes : 1;
-    IntType _unOrderedFaces     : 1;
-    IntType _nonManifoldVerts   : 1;
-    IntType _boundaryNonSharp   : 1;
-};
-
-//
-//  VertexTag wraps the FeatureBits for use with a single corner/vertex:
-//
-//  Note that a bit is not defined to detect extra-ordinary or regular
-//  valence.  Since subsets of the topology are ultimately used in the
-//  limit surface definition, and face-varying surfaces are potentially
-//  subsets of subsets, we intentionally avoid having to re-compute
-//  that bit for each subset.  Such a bit has little value for a single
-//  corner in Bfr, so the collective presence is determined when the
-//  surface definition is finalized in the regular/irregular test.
-//
-class VertexTag : public FeatureBits {
-public:
-    VertexTag() { }
-    ~VertexTag() { }
-
-    //  Queries for single corner/vertex (some reversing sense of the bit):
-    bool IsBoundary()            const { return  _boundaryVerts; }
-    bool IsInterior()            const { return !_boundaryVerts; }
-    bool IsInfSharp()            const { return  _infSharpVerts; }
-    bool HasInfSharpEdges()      const { return  _infSharpEdges; }
-    bool IsInfSharpDart()        const { return  _infSharpDarts; }
-    bool IsSemiSharp()           const { return  _semiSharpVerts; }
-    bool HasSemiSharpEdges()     const { return  _semiSharpEdges; }
-    bool HasUnCommonFaceSizes()  const { return  _unCommonFaceSizes; }
-    bool HasIrregularFaceSizes() const { return  _irregularFaceSizes; }
-    bool IsOrdered()             const { return !_unOrderedFaces; }
-    bool IsUnOrdered()           const { return  _unOrderedFaces; }
-    bool IsManifold()            const { return !_nonManifoldVerts; }
-    bool IsNonManifold()         const { return  _nonManifoldVerts; }
-    bool HasNonSharpBoundary()   const { return  _boundaryNonSharp; }
-    bool HasSharpEdges()         const { return   HasInfSharpEdges() ||
-                                                  HasSemiSharpEdges(); }
-};
-
-//
-//  MultiVertexTag wraps the FeatureBits for use with bits combined from 
-//  several corners/vertices. It includes the Combine() method to apply
-//  the bitwise-OR with a given VertexTag, in addition to using different
-//  names for the access methods to reflect their collective nature (e.g.
-//  the use of "has" versus "is").
-//
-class MultiVertexTag : public FeatureBits {
-public:
-    MultiVertexTag() { }
-    ~MultiVertexTag() { }
-
-    //  Queries for multiple VertexTags combined into one:
-    bool HasBoundaryVertices()     const { return _boundaryVerts; }
-    bool HasInfSharpVertices()     const { return _infSharpVerts; }
-    bool HasInfSharpEdges()        const { return _infSharpEdges; }
-    bool HasInfSharpDarts()        const { return _infSharpDarts; }
-    bool HasSemiSharpVertices()    const { return _semiSharpVerts; }
-    bool HasSemiSharpEdges()       const { return _semiSharpEdges; }
-    bool HasUnCommonFaceSizes()    const { return _unCommonFaceSizes; }
-    bool HasIrregularFaceSizes()   const { return _irregularFaceSizes; }
-    bool HasUnOrderedVertices()    const { return _unOrderedFaces; }
-    bool HasNonManifoldVertices()  const { return _nonManifoldVerts; }
-    bool HasNonSharpBoundary()     const { return _boundaryNonSharp; }
-    bool HasSharpVertices()        const { return  HasInfSharpVertices() ||
-                                                   HasSemiSharpVertices(); }
-    bool HasSharpEdges()           const { return  HasInfSharpEdges() ||
-                                                   HasSemiSharpEdges(); }
-
-    void Combine(VertexTag const & tag) {
-        SetBits(GetBits() | tag.GetBits());
-    }
-};
-
-} // end namespace Bfr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_BFR_VERTEX_TAG_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/CMakeLists.txt
deleted file mode 100644
index e2f59dbc3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/CMakeLists.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-#-------------------------------------------------------------------------------
-# source & headers
-set(SOURCE_FILES
-    bilinearPatchBuilder.cpp
-    catmarkPatchBuilder.cpp
-    error.cpp
-    loopPatchBuilder.cpp
-    patchBasis.cpp
-    patchBuilder.cpp
-    patchDescriptor.cpp
-    patchMap.cpp
-    patchTable.cpp
-    patchTableFactory.cpp
-    ptexIndices.cpp
-    stencilTable.cpp
-    stencilTableFactory.cpp
-    stencilBuilder.cpp
-    topologyDescriptor.cpp
-    topologyRefiner.cpp
-    topologyRefinerFactory.cpp
-)
-
-set(PRIVATE_HEADER_FILES
-    bilinearPatchBuilder.h
-    catmarkPatchBuilder.h
-    loopPatchBuilder.h
-    patchBasis.h
-    patchBuilder.h
-    sparseMatrix.h
-    stencilBuilder.h
-)
-
-set(PUBLIC_HEADER_FILES
-    error.h
-    patchDescriptor.h
-    patchParam.h
-    patchMap.h
-    patchTable.h
-    patchTableFactory.h
-    primvarRefiner.h
-    ptexIndices.h
-    stencilTable.h
-    stencilTableFactory.h
-    topologyDescriptor.h
-    topologyLevel.h
-    topologyRefiner.h
-    topologyRefinerFactory.h
-    types.h
-)
-
-set(DOXY_HEADER_FILES ${PUBLIC_HEADER_FILES})
-
-#-------------------------------------------------------------------------------
-if (NOT NO_LIB)
-
-    # Compile objs first for both the CPU and GPU libs -----
-    add_library(far_obj
-        OBJECT
-            ${SOURCE_FILES}
-            ${PRIVATE_HEADER_FILES}
-            ${PUBLIC_HEADER_FILES}
-    )
-
-    set_target_properties(far_obj
-        PROPERTIES
-            FOLDER "opensubdiv"
-    )
-
-endif()
-
-#-------------------------------------------------------------------------------
-osd_add_doxy_headers( "${DOXY_HEADER_FILES}" )
-
-install(
-    FILES
-        ${PUBLIC_HEADER_FILES}
-    DESTINATION
-        "${CMAKE_INCDIR_BASE}/far"
-    PERMISSIONS
-        OWNER_READ
-        GROUP_READ
-        WORLD_READ )
-
-#-------------------------------------------------------------------------------
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/bilinearPatchBuilder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/bilinearPatchBuilder.cpp
deleted file mode 100644
index aab2f75a2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/bilinearPatchBuilder.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-//   Copyright 2018 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../far/bilinearPatchBuilder.h"
-
-#include <cassert>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-using Vtr::internal::Level;
-using Vtr::internal::FVarLevel;
-using Vtr::internal::Refinement;
-
-namespace Far {
-
-namespace {
-
-    //
-    //  The patch type associated with each basis for Bilinear -- quickly indexed
-    //  from an array.  The patch type here is essentially the quad form of each
-    //  basis.
-    //
-    PatchDescriptor::Type patchTypeFromBasisArray[] = {
-            PatchDescriptor::NON_PATCH,      // undefined
-            PatchDescriptor::QUADS,          // regular
-            PatchDescriptor::GREGORY_BASIS,  // Gregory
-            PatchDescriptor::QUADS,          // linear
-            PatchDescriptor::NON_PATCH };    // Bezier -- for future use
-};
-
-BilinearPatchBuilder::BilinearPatchBuilder(
-    TopologyRefiner const& refiner, Options const& options) :
-        PatchBuilder(refiner, options) {
-
-    _regPatchType   = patchTypeFromBasisArray[_options.regBasisType];
-    _irregPatchType = (_options.irregBasisType == BASIS_UNSPECIFIED)
-                    ? _regPatchType
-                    : patchTypeFromBasisArray[_options.irregBasisType];
-
-    _nativePatchType = PatchDescriptor::QUADS;
-    _linearPatchType = PatchDescriptor::QUADS;
-}
-
-BilinearPatchBuilder::~BilinearPatchBuilder() {
-}
-
-PatchDescriptor::Type
-BilinearPatchBuilder::patchTypeFromBasis(BasisType basis) const {
-
-    return patchTypeFromBasisArray[(int)basis];
-}
-
-template <typename REAL>
-int
-BilinearPatchBuilder::convertSourcePatch(SourcePatch const &   sourcePatch,
-                                         PatchDescriptor::Type patchType,
-                                         SparseMatrix<REAL> &  matrix) const {
-
-    assert("Conversion from Bilinear patches to other bases not yet supported" == 0);
-
-    //  For suppressing warnings until implemented...
-    if (sourcePatch.GetNumSourcePoints() == 0) return -1;
-    if (patchType == PatchDescriptor::NON_PATCH) return -1;
-    if (matrix.GetNumRows() <= 0) return -1;
-    return -1;
-}
-
-int
-BilinearPatchBuilder::convertToPatchType(SourcePatch const &   sourcePatch,
-                                         PatchDescriptor::Type patchType,
-                                         SparseMatrix<float> & matrix) const {
-    return convertSourcePatch(sourcePatch, patchType, matrix);
-}
-int
-BilinearPatchBuilder::convertToPatchType(SourcePatch const &    sourcePatch,
-                                         PatchDescriptor::Type  patchType,
-                                         SparseMatrix<double> & matrix) const {
-    return convertSourcePatch(sourcePatch, patchType, matrix);
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/bilinearPatchBuilder.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/bilinearPatchBuilder.h
deleted file mode 100644
index 70add3b0a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/bilinearPatchBuilder.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-//   Copyright 2017 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_BILINEAR_PATCH_BUILDER_H
-#define OPENSUBDIV3_FAR_BILINEAR_PATCH_BUILDER_H
-
-#include "../version.h"
-
-#include "../far/patchBuilder.h"
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  BilinearPatchBuilder
-//
-//  Declaration of PatchBuilder subclass supporting Sdc::SCHEME_BILINEAR.
-//  Required virtual methods are included, along with any customizations
-//  local to their implementation.
-//
-class BilinearPatchBuilder : public PatchBuilder {
-public:
-    BilinearPatchBuilder(TopologyRefiner const& refiner, Options const& options);
-    virtual ~BilinearPatchBuilder();
-
-protected:
-    virtual PatchDescriptor::Type patchTypeFromBasis(BasisType basis) const;
-
-    virtual int convertToPatchType(SourcePatch const &   sourcePatch,
-                                   PatchDescriptor::Type patchType,
-                                   SparseMatrix<float> & matrix) const;
-    virtual int convertToPatchType(SourcePatch const &    sourcePatch,
-                                   PatchDescriptor::Type  patchType,
-                                   SparseMatrix<double> & matrix) const;
-private:
-    template <typename REAL>
-    int convertSourcePatch(SourcePatch const &   sourcePatch,
-                           PatchDescriptor::Type patchType,
-                           SparseMatrix<REAL> &  matrix) const;
-};
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_BILINEAR_PATCH_BUILDER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/catmarkPatchBuilder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/catmarkPatchBuilder.cpp
deleted file mode 100644
index cafd6768f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/catmarkPatchBuilder.cpp
+++ /dev/null
@@ -1,2009 +0,0 @@
-//
-//   Copyright 2018 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../far/catmarkPatchBuilder.h"
-#include "../vtr/stackBuffer.h"
-
-#include <cassert>
-#include <cmath>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-using Vtr::Array;
-using Vtr::ConstArray;
-using Vtr::internal::StackBuffer;
-
-namespace Far {
-
-constexpr auto kPI = 3.14159265358979323846;
-constexpr auto kPI_2 = kPI/2.0;
-
-//
-//  Core functions for computing Catmark limit properties that are used
-//  in the conversion to multiple patch types.
-//
-//  This struct/class is just a means of grouping common functions.
-//
-//  There is a long and unclear history to the details of the computations
-//  involved in the patch conversion here...
-//
-//  The formulae for computing the Gregory patch points do not follow the
-//  more widely accepted work of Loop, Shaefer et al or Myles et al.  The
-//  formulae for the limit points and tangents also ultimately need to be
-//  retrieved from Sdc::Scheme to ensure they conform, so future factoring
-//  of the formulae is still necessary.
-//
-//  Regarding support for multiple precision, like Sdc, some intermediate
-//  calculations are performed in double and cast to float.  Historically
-//  this conversion code has been purely float and later extended to
-//  support template <typename REAL>.  For math functions such as cos(),
-//  sin(), etc., we rely on overloading via <cmath> through the use of
-//  std::cos(), std::sin(), etc.
-//
-template <typename REAL>
-struct CatmarkLimits {
-public:
-    typedef REAL Weight;
-
-    static void ComputeInteriorPointWeights(int valence, int faceInRing,
-                Weight* pWeights, Weight* epWeights, Weight* emWeights);
-
-    static void ComputeBoundaryPointWeights(int valence, int faceInRing,
-                Weight* pWeights, Weight* epWeights, Weight* emWeights);
-
-private:
-    static double computeCoefficient(int valence);
-};
-
-//
-//  Lookup table and formula for the scale factor applied to limit
-//  tangents that arises from eigen values of the subdivision matrix.
-//  Historically 30 values have been stored -- up to valence 29.
-//
-template <typename REAL>
-inline double
-CatmarkLimits<REAL>::computeCoefficient(int valence) {
-
-    static double const efTable[] = {
-        0.0,                    0.0,                    0.0,
-        8.1281572906372312e-01, 0.5,                    3.6364406329142801e-01,
-        2.8751379706077085e-01, 2.3868786685851678e-01, 2.0454364190756097e-01,
-        1.7922903958061159e-01, 1.5965737079986253e-01, 1.4404233443011302e-01,
-        1.3127568415883017e-01, 1.2063172212675841e-01, 1.1161437506676930e-01,
-        1.0387245516114274e-01, 9.7150019090724835e-02, 9.1255917505950648e-02,
-        8.6044378511602668e-02, 8.1402211336798411e-02, 7.7240129516184072e-02,
-        7.3486719751997026e-02, 7.0084157479797987e-02, 6.6985104030725440e-02,
-        6.4150420569810074e-02, 6.1547457638637268e-02, 5.9148757447233989e-02,
-        5.6931056818776957e-02, 5.4874512279256417e-02, 5.2962091433796134e-02
-    };
-    assert(valence > 0);
-    if (valence < 30) return efTable[valence];
-
-    double invValence = 1.0 / valence;
-    double cosT = std::cos(2.0 * kPI * invValence);
-    double divisor = (cosT + 5.0) + std::sqrt((cosT + 9.0) * (cosT + 1.0));
-
-    return (16.0 * invValence / divisor);
-}
-
-template <typename REAL>
-void
-CatmarkLimits<REAL>::ComputeInteriorPointWeights(int valence, int faceInRing,
-                Weight* pWeights, Weight* epWeights, Weight* emWeights) {
-
-    //
-    //  For the limit tangents of an interior vertex, the second tangent is a
-    //  rotation of the first, i.e. the coefficients for the ring around the
-    //  vertex can be simply shifted by two.  So there is really no need to
-    //  compute it explicitly here.  The single tangent can similarly be
-    //  oriented along the corresponding edges for Ep and Em and scaled and
-    //  offset by P accordingly.
-    //
-    //  The formula used for tangents here differs from Sdc::Scheme for
-    //  Catmark -- the direction is the same but the length varies due to the
-    //  different terms used to scale the results (both based on eigenvalues).
-    //  The main difference in the computation here though is that each edge-
-    //  point is a function of three cos() terms:
-    //      cos(i*theta), cos((i-1)*theta), cos((i+1)theta)
-    //  while the Sdc::Scheme weight depends only on cos(i*theta), and so they
-    //  are accumulated here rather than assigned directly.
-    //
-    //  Ultimately the Sdc::Scheme formulae are a little more efficient but we
-    //  don't want to impact positions of Ep and Em slightly by switching to
-    //  them until such a change can be given more justification and visibility
-    //  (e.g. major version).
-    //
-    bool computeEdgePoints = epWeights && emWeights;
-
-    double fValence        = (double) valence;
-    double oneOverValence  = 1.0f / fValence;
-    double oneOverValPlus5 = 1.0f / (fValence + 5.0f);
-
-    double pCoeff   = oneOverValence * oneOverValPlus5;
-    double tanCoeff = computeCoefficient(valence) * 0.5f * oneOverValPlus5;
-
-    double faceAngle = 2.0 * kPI * oneOverValence;
-
-    //
-    //  Assign position weights directly while accumulating an intermediate set
-    //  of weights for the limit tangent.  And skip over the first weight for
-    //  the corner vertex once assigned (zero for tangents) so that we don't
-    //  have to deal with the off-by-one offset within the loop:
-    //
-    int weightWidth = 1 + 2 * valence;
-    StackBuffer<Weight, 64, true> tanWeights(weightWidth);
-    std::memset(&tanWeights[0], 0, weightWidth * sizeof(Weight));
-
-    pWeights[0] = (Weight) (fValence * oneOverValPlus5);
-
-    Weight *pW = &pWeights[1];
-    Weight *tW = &tanWeights[1];
-    for (int i = 0; i < valence; ++i) {
-        pW[2*i]     = (Weight) (pCoeff * 4.0f);
-        pW[2*i + 1] = (Weight)  pCoeff;
-
-        if (computeEdgePoints) {
-            int iPrev = (i + valence - 1) % valence;
-            int iNext = (i + 1) % valence;
-
-            double cosICoeff = tanCoeff * std::cos(faceAngle * i);
-
-            tW[2*iPrev]     += (Weight) (cosICoeff * 2.0f);
-            tW[2*iPrev + 1] += (Weight)  cosICoeff;
-            tW[2*i]         += (Weight) (cosICoeff * 4.0f);
-            tW[2*i + 1]     += (Weight)  cosICoeff;
-            tW[2*iNext]     += (Weight) (cosICoeff * 2.0f);
-        }
-    }
-
-    //
-    //  Rotate/permute the scaled tangent weights along edges and add to P:
-    //
-    if (computeEdgePoints) {
-        int epOffset = 2 * ((valence - faceInRing) % valence);
-        int emOffset = 2 * ((valence - faceInRing - 1 + valence) % valence);
-
-        epWeights[0] = pWeights[0];
-        emWeights[0] = pWeights[0];
-        for (int i = 1; i < weightWidth; ++i) {
-            int ip = i + epOffset;
-            if (ip >= weightWidth) ip -= weightWidth - 1;
-
-            int im = i + emOffset;
-            if (im >= weightWidth) im -= weightWidth - 1;
-
-            epWeights[i] = pWeights[i] + tanWeights[ip];
-            emWeights[i] = pWeights[i] + tanWeights[im];
-        }
-    }
-}
-
-template <typename REAL>
-void
-CatmarkLimits<REAL>::ComputeBoundaryPointWeights(int valence, int faceInRing,
-                Weight* pWeights, Weight* epWeights, Weight* emWeights) {
-
-    int    numFaces  = valence - 1;
-    double faceAngle = kPI / numFaces;
-
-    int weightWidth = 2 * valence;
-
-    int N = weightWidth - 1;
-
-    //
-    //  Position weights are trivial:
-    //
-    std::memset(&pWeights[0],  0, weightWidth * sizeof(Weight));
-
-    pWeights[0] = (Weight) (4.0 / 6.0);
-    pWeights[1] = (Weight) (1.0 / 6.0);
-    pWeights[N] = (Weight) (1.0 / 6.0);
-
-    if ((epWeights == 0) && (emWeights == 0)) return;
-
-    //
-    //  Ep and Em weights are computed by combining weights for the boundary
-    //  and interior tangents.  The boundary tangent is trivially represented
-    //  by two non-zero weights, so allocate and compute weights for the
-    //  interior tangent:
-    //
-    double tBoundaryCoeff_1 = ( 1.0 / 6.0);
-    double tBoundaryCoeff_N = (-1.0 / 6.0);
-
-    StackBuffer<Weight, 64, true> tanWeights(weightWidth);
-    {
-        double k = (double) numFaces;
-        double theta = faceAngle;
-        double c = std::cos(theta);
-        double s = std::sin(theta);
-        double div3 = 1.0 / 3.0;
-        double div3kc = 1.0f / (3.0f * k + c);
-        double gamma = -4.0f * s * div3kc;
-        double alpha_0k = -((1.0f + 2.0f * c) * std::sqrt(1.0f + c)) * div3kc
-                        / std::sqrt(1.0f - c);
-        double beta_0 = s * div3kc;
-
-        tanWeights[0] = (Weight) (gamma * div3);
-        tanWeights[1] = (Weight) (alpha_0k * div3);
-        tanWeights[2] = (Weight) (beta_0 * div3);
-        tanWeights[N] = (Weight) (alpha_0k * div3);
-
-        for (int i = 1; i < valence - 1; ++i) {
-            double sinThetaI      = std::sin(theta * i);
-            double sinThetaIplus1 = std::sin(theta * (i+1));
-
-            double alpha = 4.0f * sinThetaI * div3kc;
-            double beta = (sinThetaI + sinThetaIplus1) * div3kc;
-
-            tanWeights[1 + 2*i]     = (Weight) (alpha * div3);
-            tanWeights[1 + 2*i + 1] = (Weight) (beta * div3);
-        }
-    }
-
-    //
-    //  Compute Ep weights -- trivial case if on the leading face and edge:
-    //
-    if (faceInRing == 0) {
-        //  Ep is on boundary edge and has only two weights:  w[1] and w[N]
-        std::memset(&epWeights[0], 0, weightWidth * sizeof(Weight));
-
-        epWeights[0] = (Weight) (2.0 / 3.0);
-        epWeights[1] = (Weight) (1.0 / 3.0);
-    } else {
-        //  Ep is on interior edge and has all weights
-        int iEdgeNext = faceInRing;
-        double faceAngleNext = faceAngle * iEdgeNext;
-        double cosAngleNext  = std::cos(faceAngleNext);
-        double sinAngleNext  = std::sin(faceAngleNext);
-
-        for (int i = 0; i < weightWidth; ++i) {
-            epWeights[i] = (Weight)(tanWeights[i] * sinAngleNext);
-        }
-        epWeights[0] += pWeights[0];
-        epWeights[1] += pWeights[1] + (Weight)(tBoundaryCoeff_1 * cosAngleNext);
-        epWeights[N] += pWeights[N] + (Weight)(tBoundaryCoeff_N * cosAngleNext);
-    }
-
-    //
-    //  Compute Em weights -- trivial case if on the trailing face and edge:
-    //
-    if (faceInRing == (numFaces - 1)) {
-        //  Em is on boundary edge and has only two weights:  w[1] and w[N]
-        std::memset(&emWeights[0], 0, weightWidth * sizeof(Weight));
-
-        emWeights[0] = (Weight) (2.0 / 3.0);
-        emWeights[N] = (Weight) (1.0 / 3.0);
-    } else {
-        //  Em is on interior edge and has all weights
-        int iEdgePrev = (faceInRing + 1) % valence;
-        double faceAnglePrev = faceAngle * iEdgePrev;
-        double cosAnglePrev  = std::cos(faceAnglePrev);
-        double sinAnglePrev  = std::sin(faceAnglePrev);
-
-        for (int i = 0; i < weightWidth; ++i) {
-            emWeights[i] = (Weight)(tanWeights[i] * sinAnglePrev);
-        }
-        emWeights[0] += pWeights[0];
-        emWeights[1] += pWeights[1] + (Weight)(tBoundaryCoeff_1 * cosAnglePrev);
-        emWeights[N] += pWeights[N] + (Weight)(tBoundaryCoeff_N * cosAnglePrev);
-    }
-}
-
-//
-//  SparseMatrixRow
-//
-//  This is a utility class representing a row of a SparseMatrix -- which
-//  in turn corresponds to a point of a resulting patch.  Instances of this
-//  class are intended to encapsulate the contributions of a point and be
-//  passed to functions as such.
-//
-//  (Consider moving this to PatchBuilder as a protected class or maybe a
-//  public class within SparseMatrix itself, e.g. SparseMatrix<REAL>::Row.)
-//
-namespace {
-    template <typename REAL>
-    class SparseMatrixRow {
-    public:
-        SparseMatrixRow(SparseMatrix<REAL> & matrix, int row) :
-            _size(matrix.GetRowSize(row)),
-            _indices(matrix.SetRowColumns(row).begin()),
-            _weights(matrix.SetRowElements(row).begin()) { }
-
-        int GetSize() const { return _size; }
-
-        void Assign(int rowEntry, Index index, REAL weight) {
-            _indices[rowEntry] = index;
-            _weights[rowEntry] = weight;
-        }
-
-        void Copy(SparseMatrixRow<REAL> const & other) {
-            assert(GetSize() == other.GetSize());
-            std::memcpy(_indices, other._indices, _size * sizeof(Index));
-            std::memcpy(_weights, other._weights, _size * sizeof(REAL));
-        }
-
-    public:
-        int     _size;
-        Index * _indices;
-        REAL *  _weights;
-    };
-} // end namespace
-
-
-//
-//  Simple utility functions for dealing with SparseMatrix:
-//
-namespace {
-    template <typename REAL>
-    void
-    _printMatrix(SparseMatrix<REAL> const & matrix, bool printIndices = true,
-                                                    bool printWeights = true) {
-
-        printf("Matrix %d x %d, %d elements:\n",
-            matrix.GetNumRows(), matrix.GetNumColumns(), matrix.GetNumElements());
-
-        for (int i = 0; i < matrix.GetNumRows(); ++i) {
-            int rowSize = matrix.GetRowSize(i);
-            printf("  Row %d (size = %d):\n", i, rowSize);
-
-            if (printIndices) {
-                ConstArray<int> indices = matrix.GetRowColumns(i);
-                printf("    Indices:  ");
-                for (int j = 0; j < rowSize; ++j) {
-                    printf("%6d ", indices[j]);
-                }
-                printf("\n");
-            }
-            if (printWeights) {
-                ConstArray<REAL> weights = matrix.GetRowElements(i);
-                printf("    Weights:  ");
-                for (int j = 0; j < rowSize; ++j) {
-                    printf("%6.3f ", (REAL)weights[j]);
-                }
-                printf("\n");
-            }
-        }
-    }
-
-    template <typename REAL>
-    void
-    _initializeFullMatrix(SparseMatrix<REAL> & M, int nRows, int nColumns) {
-
-        M.Resize(nRows, nColumns, nRows * nColumns);
-
-        //  Fill row 0 with index for every column:
-        M.SetRowSize(0, nColumns);
-        Array<int> row0Columns = M.SetRowColumns(0);
-        for (int i = 0; i < nColumns; ++i) {
-            row0Columns[i] = i;
-        }
-
-        //  Copy row 0's indices into all other rows:
-        for (int row = 1; row < nRows; ++row) {
-            M.SetRowSize(row, nColumns);
-            Array<int> dstRowColumns = M.SetRowColumns(row);
-            std::memcpy(&dstRowColumns[0], &row0Columns[0], nColumns * sizeof(int));
-        }
-    }
-
-    template <typename REAL>
-    void
-    _resizeMatrix(SparseMatrix<REAL> & matrix,
-                  int numRows, int numColumns, int numElements,
-                  int const rowSizes[]) {
-
-        matrix.Resize(numRows, numColumns, numElements);
-        for (int i = 0; i < numRows; ++i) {
-            matrix.SetRowSize(i, rowSizes[i]);
-        }
-        assert(matrix.GetNumElements() == numElements);
-    }
-
-    template <typename REAL>
-    void
-    _addSparsePointToFullRow(REAL * fullRow,
-                             SparseMatrixRow<REAL> const & p,
-                             REAL s, int * indexMask) {
-
-        for (int i = 0; i < p.GetSize(); ++i) {
-            int index = p._indices[i];
-
-            fullRow[index] += s * p._weights[i];
-
-            indexMask[index] = 1 + index;
-        }
-    }
-
-    template <typename REAL>
-    void
-    _addSparseRowToFull(REAL * fullRow,
-                        SparseMatrix<REAL> const & M, int sparseRow, REAL s) {
-
-        ConstArray<int>  indices = M.GetRowColumns(sparseRow);
-        ConstArray<REAL> weights = M.GetRowElements(sparseRow);
-
-        for (int i = 0; i < indices.size(); ++i) {
-            fullRow[indices[i]] += s * weights[i];
-        }
-    }
-
-    template <typename REAL>
-    void
-    _combineSparseMatrixRowsInFull(SparseMatrix<REAL> & dstMatrix, int dstRowIndex,
-           SparseMatrix<REAL> const & srcMatrix, int numSrcRows,
-           int const srcRowIndices[], REAL const * srcRowWeights) {
-
-        REAL * dstRow = &dstMatrix.SetRowElements(dstRowIndex)[0];
-
-        std::memset(dstRow, 0, dstMatrix.GetNumColumns() * sizeof(REAL));
-
-        for (int i = 0; i < numSrcRows; ++i) {
-            _addSparseRowToFull(dstRow, srcMatrix, srcRowIndices[i], srcRowWeights[i]);
-        }
-    }
-
-    template <typename REAL>
-    void
-    _matrixPrintDensity(const char* prefix, SparseMatrix<REAL> const & M) {
-
-        int fullSize = M.GetNumRows() * M.GetNumColumns();
-        int sparseSize = M.GetNumElements();
-
-        int nonZeroSize = 0;
-        for (int i = 0; i < M.GetNumRows(); ++i) {
-            ConstArray<REAL> elements = M.GetRowElements(i);
-            for (int j = 0; j < elements.size(); ++j) {
-                nonZeroSize += (elements[j] != 0);
-            }
-        }
-        printf("%s(%dx%d = %d):  elements = %d, non-zero = %d, density = %.1f\n",
-            prefix, M.GetNumRows(), M.GetNumColumns(), fullSize,
-            sparseSize, nonZeroSize, (REAL)nonZeroSize * 100.0f / (REAL)fullSize);
-    }
-
-
-    //
-    //  The valence-2 interior case poses problems for the way patch points
-    //  are computed as combinations of source points and stored as a row in
-    //  a SparseMatrix.  An interior vertex of valence-2 causes duplicate
-    //  vertices to appear in the 1-rings of its neighboring vertices and we
-    //  want the entries of a SparseMatrix row to be unique.
-    //
-    //  For the most part, this does not pose a problem while the matrix (set
-    //  of patch points) is being constructed, so we leave those duplicate
-    //  entries in place and deal with them as a post-process here.
-    //
-    //  The SourcePatch is also sensitive to the presence of such valence-2
-    //  vertices for its own reasons (it needs to identifiy a unique set of
-    //  source points from a set of corner rings), so a simple query of its
-    //  corners indicates when this post-process is necessary.  (And since
-    //  this case is a rare occurrence, efficiency is not a major concern.)
-    //
-    template <typename REAL>
-    void _removeValence2Duplicates(SparseMatrix<REAL> & M) {
-
-        //  This will later be determined by the PatchBuilder member:
-        int regFaceSize = 4;
-
-        SparseMatrix<REAL> T;
-        T.Resize(M.GetNumRows(), M.GetNumColumns(), M.GetNumElements());
-
-        int nRows = M.GetNumRows();
-        for (int row = 0; row < nRows; ++row) {
-            int srcRowSize = M.GetRowSize(row);
-
-            int const *  srcIndices = M.GetRowColumns(row).begin();
-            REAL const * srcWeights = M.GetRowElements(row).begin();
-
-            //  Scan the entries to see if there are duplicates -- copy
-            //  the row if not, otherwise, need to compress it:
-            bool cornerUsed[4] = { false, false, false, false };
-
-            int srcDupCount = 0;
-            for (int i = 0; i < srcRowSize; ++i) {
-                int srcIndex = srcIndices[i];
-                if (srcIndex < regFaceSize) {
-                    srcDupCount += (int) cornerUsed[srcIndex];
-                    cornerUsed[srcIndex] = true;
-                }
-            }
-
-            //  Size this row for the destination and copy or compress:
-            T.SetRowSize(row, srcRowSize - srcDupCount);
-
-            int*  dstIndices = T.SetRowColumns(row).begin();
-            REAL* dstWeights = T.SetRowElements(row).begin();
-
-            if (srcDupCount) {
-                REAL * cornerDstPtr[4] = { 0, 0, 0, 0 };
-
-                for (int i = 0; i < srcRowSize; ++i) {
-                    int  srcIndex  = *srcIndices++;
-                    REAL srcWeight = *srcWeights++;
-
-                    if (srcIndex < regFaceSize) {
-                        if (cornerDstPtr[srcIndex]) {
-                            *cornerDstPtr[srcIndex] += srcWeight;
-                            continue;
-                        } else {
-                            cornerDstPtr[srcIndex] = dstWeights;
-                        }
-                    }
-                    *dstIndices++ = srcIndex;
-                    *dstWeights++ = srcWeight;
-                }
-            } else {
-                std::memcpy(&dstIndices[0], &srcIndices[0], srcRowSize * sizeof(Index));
-                std::memcpy(&dstWeights[0], &srcWeights[0], srcRowSize * sizeof(REAL));
-            }
-        }
-        M.Swap(T);
-    }
-} // end namespace for SparseMatrix utilities
-
-
-//
-//  GregoryConverter
-//
-//  The GregoryConverter class essentially provides a change-of-basis matrix
-//  from source vertices in a Catmull-Clark mesh to the 20 control points of a
-//  Gregory patch.
-//
-//  Historically the source topology was specified as a Vtr::Level and face index,
-//  from which contributions of all 1-ring vertices that support the 20 points of
-//  the patch are determined.  The source topology is now specified via a simple
-//  SourcePatch, so a matrix can be determined for a particular configuration and
-//  re-used for any similar instance.
-//
-//  Control points are labeled using the convention from:  "Approximating
-//  Subdivision Surfaces with Gregory Patches for Hardware Tessellation" Loop,
-//  Schaefer, Ni, Castano (ACM ToG Siggraph Asia 2009)
-//
-//     P3         e3-      e2+         P2
-//        x--------x--------x--------x
-//        |        |        |        |
-//        |        |        |        |
-//        |        | f3-    | f2+    |
-//        |        x        x        |
-//    e3+ x------x            x------x e2-
-//        |     f3+          f2-     |
-//        |                          |
-//        |                          |
-//        |     f0-          f1+     |
-//    e0- x------x            x------x e1+
-//        |        x        x        |
-//        |        | f0+    | f1-    |
-//        |        |        |        |
-//        |        |        |        |
-//        x--------x--------x--------x
-//     P0         e0+      e1-         P1
-//
-template <typename REAL>
-class GregoryConverter {
-public:
-    typedef REAL                      Weight;
-    typedef SparseMatrix<Weight>      Matrix;
-    typedef SparseMatrixRow<Weight>   Point;
-public:
-    GregoryConverter() : _numSourcePoints(0) { }
-    GregoryConverter(SourcePatch const & sourcePatch);
-    GregoryConverter(SourcePatch const & sourcePatch, Matrix & sparseMatrix);
-
-    void Initialize(SourcePatch const & sourcePatch);
-
-    bool IsIsolatedInteriorPatch() const { return _isIsolatedInteriorPatch; }
-    bool HasVal2InteriorCorner() const { return _hasVal2InteriorCorner; }
-    int  GetIsolatedInteriorCorner() const { return _isolatedCorner; }
-    int  GetIsolatedInteriorValence() const { return _isolatedValence; }
-
-    void Convert(Matrix & sparseMatrix) const;
-
-private:
-    //
-    //  Local nested class for GregoryConverter to cache information for the
-    //  corners of the source patch.  It copies some information from the
-    //  SourcePatch so that we don't have to keep it around, but it contains
-    //  additional information relevant to the determination of the Gregory
-    //  points -- most notably classifications of the face-points and the
-    //  sines/cosines of angles for the face corners that are used repeatedly.
-    //
-    struct CornerTopology {
-        //  Basic flags copied from the SourcePatch
-        unsigned int isBoundary  : 1;
-        unsigned int isSharp     : 1;
-        unsigned int isDart      : 1;
-        unsigned int isRegular   : 1;
-        unsigned int isVal2Int   : 1;
-
-        //  Flags for edge- and face-points relating to adjacent corners:
-        unsigned int epOnBoundary : 1;
-        unsigned int emOnBoundary : 1;
-
-        unsigned int fpIsRegular : 1;
-        unsigned int fmIsRegular : 1;
-        unsigned int fpIsCopied  : 1;
-        unsigned int fmIsCopied  : 1;
-
-        //  Other values stored for repeated use:
-        int  valence;
-        int  numFaces;
-        int  faceInRing;
-
-        REAL faceAngle;
-        REAL cosFaceAngle;
-        REAL sinFaceAngle;
-
-        //  Its useful to have the ring for each corner immediately available:
-        StackBuffer<int, 40, true> ringPoints;
-    };
-
-    //
-    //  Methods to resize the matrix before populating it:
-    //
-    void resizeMatrixUnisolated(Matrix & matrix) const;
-
-    void resizeMatrixIsolatedIrregular(Matrix & matrix, int irregCornerIndex,
-                                                        int irregValence) const;
-
-    //
-    //  Methods to compute the various rows of points in the matrix:
-    //
-    void assignRegularEdgePoints(int cornerIndex, Matrix & matrix) const;
-    void computeIrregularEdgePoints(int cornerIndex, Matrix & matrix,
-                                    Weight *weightBuffer) const;
-
-    void assignRegularFacePoints(int cornerIndex, Matrix & matrix) const;
-    void computeIrregularFacePoints(int cornerIndex, Matrix & matrix,
-                                    Weight *weightBuffer, int *indexBuffer) const;
-
-    void computeIrregularInteriorEdgePoints(int cornerIndex,
-                                            Point & P, Point & Ep, Point & Em,
-                                            Weight *weightBuffer) const;
-    void computeIrregularBoundaryEdgePoints(int cornerIndex,
-                                            Point & P, Point & Ep, Point & Em,
-                                            Weight *weightBuffer) const;
-
-    int  getIrregularFacePointSize(int cornerNear, int cornerFar) const;
-    void computeIrregularFacePoint(
-                int cornerNear, int edgeInNearRing, int cornerFar,
-                Point const & p, Point const & eNear, Point const & eFar,
-                Point & fNear, REAL signForSideOfEdge /* -1.0 or 1.0 */,
-                Weight *rowWeights, int *columnMask) const;
-
-private:
-    int _numSourcePoints;
-    int _maxValence;
-
-    bool _isIsolatedInteriorPatch;
-    bool _hasVal2InteriorCorner;
-    int  _isolatedCorner;
-    int  _isolatedValence;
-
-    CornerTopology _corners[4];
-};
-
-
-//
-//  GregoryConverter
-//
-//  Construction and initialization/computation of the change-of-basis
-//  matrix to a Gregory patch.
-//
-template <typename REAL>
-GregoryConverter<REAL>::GregoryConverter(
-        SourcePatch const & sourcePatch) {
-
-    Initialize(sourcePatch);
-}
-
-template <typename REAL>
-GregoryConverter<REAL>::GregoryConverter(
-        SourcePatch const & sourcePatch, Matrix & sparseMatrix) {
-
-    Initialize(sourcePatch);
-    Convert(sparseMatrix);
-}
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::Initialize(SourcePatch const & sourcePatch) {
-
-    //
-    //  Allocate and gather the 1-rings for the corner vertices and other
-    //  topological information for more immediate access:
-    //
-    int width = sourcePatch.GetNumSourcePoints();
-    _numSourcePoints = width;
-    _maxValence      = sourcePatch.GetMaxValence();
-
-    int boundaryCount = 0;
-    int irregularCount = 0;
-    int irregularCorner = -1;
-    int irregularValence = -1;
-    int sharpCount = 0;
-    int val2IntCount = 0;
-
-    for (int cIndex = 0; cIndex < 4; ++cIndex) {
-        SourcePatch::Corner srcCorner = sourcePatch._corners[cIndex];
-
-        CornerTopology& corner = _corners[cIndex];
-
-        corner.isBoundary = srcCorner._boundary;
-        corner.isSharp    = srcCorner._sharp;
-        corner.isDart     = srcCorner._dart;
-        corner.numFaces   = srcCorner._numFaces;
-        corner.faceInRing = srcCorner._patchFace;
-        corner.isVal2Int  = srcCorner._val2Interior;
-        corner.valence    = corner.numFaces + corner.isBoundary;
-
-        corner.isRegular = ((corner.numFaces << corner.isBoundary) == 4)
-                         && !corner.isSharp;
-        if (corner.isRegular) {
-            corner.faceAngle    = REAL(kPI_2);
-            corner.cosFaceAngle = 0.0f;
-            corner.sinFaceAngle = 1.0f;
-        } else {
-            corner.faceAngle =
-                (corner.isBoundary ? REAL(kPI) : (2.0f * REAL(kPI)))
-                    / REAL(corner.numFaces);
-            corner.cosFaceAngle = std::cos(corner.faceAngle);
-            corner.sinFaceAngle = std::sin(corner.faceAngle);
-        }
-
-        corner.ringPoints.SetSize(sourcePatch.GetCornerRingSize(cIndex));
-        sourcePatch.GetCornerRingPoints(cIndex, corner.ringPoints);
-
-        //  Accumulate topology information to categorize the patch as a whole:
-        boundaryCount += corner.isBoundary;
-        if (!corner.isRegular) {
-            irregularCount ++;
-            irregularCorner = cIndex;
-            irregularValence = corner.valence;
-        }
-        sharpCount += corner.isSharp;
-        val2IntCount += corner.isVal2Int;
-    }
-
-    //  Make a second pass to assign tags dependent on adjacent corners
-    for (int cIndex = 0; cIndex < 4; ++cIndex) {
-        CornerTopology& corner = _corners[cIndex];
-
-        int cNext = (cIndex + 1) & 0x3;
-        int cPrev = (cIndex + 3) & 0x3;
-
-        corner.epOnBoundary = false;
-        corner.emOnBoundary = false;
-
-        //
-        //  Identify if the face points are regular or shared/copied from
-        //  one of the pair:
-        //
-        corner.fpIsRegular = corner.isRegular && _corners[cNext].isRegular;
-        corner.fmIsRegular = corner.isRegular && _corners[cPrev].isRegular;
-
-        corner.fpIsCopied = false;
-        corner.fmIsCopied = false;
-
-        if (corner.isBoundary) {
-            corner.epOnBoundary = (corner.faceInRing == 0);
-            corner.emOnBoundary = (corner.faceInRing == (corner.numFaces - 1));
-
-            //  Both face points are same when one of the two corners' edges
-            //  is discontinuous -- one is then copied from the other (unless
-            //  regular)
-            if (corner.numFaces > 1) {
-                if (corner.epOnBoundary) {
-                    corner.fpIsRegular = corner.fmIsRegular;
-                    corner.fpIsCopied  = !corner.fpIsRegular;
-                }
-                if (corner.emOnBoundary) {
-                    corner.fmIsRegular = corner.fpIsRegular;
-                    corner.fmIsCopied  = !corner.fmIsRegular;
-                }
-            } else {
-                //  The case of a corner patch is always regular
-                corner.fpIsRegular = true;
-                corner.fmIsRegular = true;
-            }
-        }
-    }
-    _isIsolatedInteriorPatch = (irregularCount == 1) && (boundaryCount == 0) &&
-                               (irregularValence > 2) && (sharpCount == 0);
-    if (_isIsolatedInteriorPatch) {
-        _isolatedCorner  = irregularCorner;
-        _isolatedValence = irregularValence;
-    }
-    _hasVal2InteriorCorner = (val2IntCount > 0);
-}
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::Convert(Matrix & matrix) const {
-
-    //
-    //  Initialize the sparse matrix to accomodate the coefficients for each
-    //  row/point -- identify common topological cases to treat more easily
-    //  (and note that specializing the popoluation of the matrix may also be
-    //  worthwhile in such cases)
-    //
-    if (_isIsolatedInteriorPatch) {
-        resizeMatrixIsolatedIrregular(matrix, _isolatedCorner, _isolatedValence);
-    } else {
-        resizeMatrixUnisolated(matrix);
-    }
-
-    //
-    //  Compute the corner and edge points P, Ep and Em first.  Since face
-    //  points Fp and Fm involve edge points for two adjacent corners, their
-    //  computation must follow:
-    //
-    int maxRingSize      = 1 + 2 * _maxValence;
-    int weightBufferSize = std::max(3 * maxRingSize, 2 * _numSourcePoints);
-
-    StackBuffer<Weight, 128, true> weightBuffer(weightBufferSize);
-    StackBuffer<int, 128, true>    indexBuffer(weightBufferSize);
-
-    for (int cIndex = 0; cIndex < 4; ++cIndex) {
-        if (_corners[cIndex].isRegular) {
-            assignRegularEdgePoints(cIndex, matrix);
-        } else {
-            computeIrregularEdgePoints(cIndex, matrix, weightBuffer);
-        }
-    }
-
-    for (int cIndex = 0; cIndex < 4; ++cIndex) {
-        if (_corners[cIndex].fpIsRegular || _corners[cIndex].fmIsRegular) {
-            assignRegularFacePoints(cIndex, matrix);
-        }
-        if (!_corners[cIndex].fpIsRegular || !_corners[cIndex].fmIsRegular) {
-            computeIrregularFacePoints(cIndex, matrix, weightBuffer, indexBuffer);
-        }
-    }
-    if (_hasVal2InteriorCorner) {
-        _removeValence2Duplicates(matrix);
-    }
-}
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::resizeMatrixIsolatedIrregular(
-        Matrix & matrix, int cornerIndex, int cornerValence) const {
-
-    int irregRingSize = 1 + 2 * cornerValence;
-
-    int irregCorner   =  cornerIndex;
-    int irregPlus     = (cornerIndex + 1) & 0x3;
-    int irregOpposite = (cornerIndex + 2) & 0x3;
-    int irregMinus    = (cornerIndex + 3) & 0x3;
-
-    int   rowSizes[20];
-    int * rowSizePtr = 0;
-
-    rowSizePtr = rowSizes + irregCorner * 5;
-    *rowSizePtr++ = irregRingSize;
-    *rowSizePtr++ = irregRingSize;
-    *rowSizePtr++ = irregRingSize;
-    *rowSizePtr++ = irregRingSize;
-    *rowSizePtr++ = irregRingSize;
-
-    rowSizePtr = rowSizes + irregPlus * 5;
-    *rowSizePtr++ = 9;
-    *rowSizePtr++ = 6;
-    *rowSizePtr++ = 6;
-    *rowSizePtr++ = 4;
-    *rowSizePtr++ = 3 + irregRingSize;
-
-    rowSizePtr = rowSizes + irregOpposite * 5;
-    *rowSizePtr++ = 9;
-    *rowSizePtr++ = 6;
-    *rowSizePtr++ = 6;
-    *rowSizePtr++ = 4;
-    *rowSizePtr++ = 4;
-
-    rowSizePtr = rowSizes + irregMinus * 5;
-    *rowSizePtr++ = 9;
-    *rowSizePtr++ = 6;
-    *rowSizePtr++ = 6;
-    *rowSizePtr++ = 3 + irregRingSize;
-    *rowSizePtr++ = 4;
-
-    int numElements = 7*irregRingSize + 85;
-
-    _resizeMatrix(matrix, 20, _numSourcePoints, numElements, rowSizes);
-}
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::resizeMatrixUnisolated(Matrix & matrix) const {
-
-    int rowSizes[20];
-
-    int numElements = 0;
-
-    for (int cIndex = 0; cIndex < 4; ++cIndex) {
-        int * rowSize = rowSizes + cIndex*5;
-
-        CornerTopology const & corner = _corners[cIndex];
-
-        //  First, the corner and pair of edge points:
-        if (corner.isRegular) {
-            if (! corner.isBoundary) {
-                rowSize[0] = 9;
-                rowSize[1] = 6;
-                rowSize[2] = 6;
-            } else {
-                rowSize[0] = 3;
-                rowSize[1] = corner.epOnBoundary ? 2 : 6;
-                rowSize[2] = corner.emOnBoundary ? 2 : 6;
-            }
-        } else {
-            if (corner.isSharp) {
-                rowSize[0] = 1;
-                rowSize[1] = 2;
-                rowSize[2] = 2;
-            } else if (! corner.isBoundary) {
-                int ringSize = 1 + 2 * corner.valence;
-                rowSize[0] = ringSize;
-                rowSize[1] = ringSize;
-                rowSize[2] = ringSize;
-            } else if (corner.numFaces > 1) {
-                int ringSize = 1 + corner.valence + corner.numFaces;
-                rowSize[0] = 3;
-                rowSize[1] = corner.epOnBoundary ? 2 : ringSize;
-                rowSize[2] = corner.emOnBoundary ? 2 : ringSize;
-            } else {
-                rowSize[0] = 3;
-                rowSize[1] = 2;
-                rowSize[2] = 2;
-            }
-        }
-        numElements += rowSize[0] + rowSize[1] + rowSize[2];
-
-        //  Second, the pair of face points:
-        rowSize[3] = 4;
-        rowSize[4] = 4;
-        if (!corner.fpIsRegular || !corner.fmIsRegular) {
-            int cNext = (cIndex + 1) & 0x3;
-            int cPrev = (cIndex + 3) & 0x3;
-            if (!corner.fpIsRegular) {
-                rowSize[3] = getIrregularFacePointSize(cIndex,
-                                corner.fpIsCopied ? cPrev : cNext);
-            }
-            if (!corner.fmIsRegular) {
-                rowSize[4] = getIrregularFacePointSize(cIndex,
-                                corner.fmIsCopied ? cNext : cPrev);
-            }
-        }
-        numElements += rowSize[3] + rowSize[4];
-    }
-
-    _resizeMatrix(matrix, 20, _numSourcePoints, numElements, rowSizes);
-}
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::assignRegularEdgePoints(int cIndex, Matrix & matrix) const {
-
-    Point p (matrix, 5*cIndex + 0);
-    Point ep(matrix, 5*cIndex + 1);
-    Point em(matrix, 5*cIndex + 2);
-
-    CornerTopology const & corner = _corners[cIndex];
-
-    int const * cRing = corner.ringPoints;
-
-    if (! corner.isBoundary) {
-        p.Assign(0, cIndex,   (REAL) (4.0 / 9.0));
-        p.Assign(1, cRing[0], (REAL) (1.0 / 9.0));
-        p.Assign(2, cRing[2], (REAL) (1.0 / 9.0));
-        p.Assign(3, cRing[4], (REAL) (1.0 / 9.0));
-        p.Assign(4, cRing[6], (REAL) (1.0 / 9.0));
-        p.Assign(5, cRing[1], (REAL) (1.0 / 36.0));
-        p.Assign(6, cRing[3], (REAL) (1.0 / 36.0));
-        p.Assign(7, cRing[5], (REAL) (1.0 / 36.0));
-        p.Assign(8, cRing[7], (REAL) (1.0 / 36.0));
-        assert(p.GetSize() == 9);
-
-        //  Identify the edges along Ep and Em and those opposite them:
-        int iEdgeEp = 2 *   corner.faceInRing;
-        int iEdgeEm = 2 * ((corner.faceInRing + 1) & 0x3);
-        int iEdgeOp = 2 * ((corner.faceInRing + 2) & 0x3);
-        int iEdgeOm = 2 * ((corner.faceInRing + 3) & 0x3);
-
-        ep.Assign(0, cIndex,             (REAL) (4.0 / 9.0));
-        ep.Assign(1, cRing[iEdgeEp],     (REAL) (2.0 / 9.0));
-        ep.Assign(2, cRing[iEdgeEm],     (REAL) (1.0 / 9.0));
-        ep.Assign(3, cRing[iEdgeOm],     (REAL) (1.0 / 9.0));
-        ep.Assign(4, cRing[iEdgeEp + 1], (REAL) (1.0 / 18.0));
-        ep.Assign(5, cRing[iEdgeOm + 1], (REAL) (1.0 / 18.0));
-        assert(ep.GetSize() == 6);
-
-        em.Assign(0, cIndex,             (REAL) (4.0 / 9.0));
-        em.Assign(1, cRing[iEdgeEm],     (REAL) (2.0 / 9.0));
-        em.Assign(2, cRing[iEdgeEp],     (REAL) (1.0 / 9.0));
-        em.Assign(3, cRing[iEdgeOp],     (REAL) (1.0 / 9.0));
-        em.Assign(4, cRing[iEdgeEp + 1], (REAL) (1.0 / 18.0));
-        em.Assign(5, cRing[iEdgeEm + 1], (REAL) (1.0 / 18.0));
-        assert(em.GetSize() == 6);
-    } else {
-        //  Decide which point corresponds to interior vs exterior tangent:
-        Point & eBoundary = corner.epOnBoundary ? ep : em;
-        Point & eInterior = corner.epOnBoundary ? em : ep;
-        int     iBoundary = corner.epOnBoundary ? 0 : 4;
-
-        p.Assign(0, cIndex,   (REAL) (2.0 / 3.0));
-        p.Assign(1, cRing[0], (REAL) (1.0 / 6.0));
-        p.Assign(2, cRing[4], (REAL) (1.0 / 6.0));
-        assert(p.GetSize() == 3);
-
-        eBoundary.Assign(0, cIndex,           (REAL) (2.0 / 3.0));
-        eBoundary.Assign(1, cRing[iBoundary], (REAL) (1.0 / 3.0));
-        assert(eBoundary.GetSize() == 2);
-
-        eInterior.Assign(0, cIndex,   (REAL) (4.0 / 9.0));
-        eInterior.Assign(1, cRing[2], (REAL) (2.0 / 9.0));
-        eInterior.Assign(2, cRing[0], (REAL) (1.0 / 9.0));
-        eInterior.Assign(3, cRing[4], (REAL) (1.0 / 9.0));
-        eInterior.Assign(4, cRing[1], (REAL) (1.0 / 18.0));
-        eInterior.Assign(5, cRing[3], (REAL) (1.0 / 18.0));
-        assert(eInterior.GetSize() == 6);
-    }
-}
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::computeIrregularEdgePoints(int cIndex,
-        Matrix & matrix, Weight *weightBuffer) const {
-
-    Point p (matrix, 5*cIndex + 0);
-    Point ep(matrix, 5*cIndex + 1);
-    Point em(matrix, 5*cIndex + 2);
-
-    //
-    //  The corner and edge points P, Ep and Em  are completely determined
-    //  by the 1-ring of vertices around (and including) the corner vertex.
-    //  We combine full sets of coefficients for the vertex and its 1-ring.
-    //
-    CornerTopology const & corner = _corners[cIndex];
-
-    if (corner.isSharp) {
-        //
-        //  The sharp case -- both interior and boundary...
-        //
-        p.Assign(0, cIndex, 1.0f);
-        assert(p.GetSize() == 1);
-
-        // Approximating these for now, pending future investigation...
-        ep.Assign(0, cIndex,           (REAL)(2.0 / 3.0));
-        ep.Assign(1, (cIndex+1) & 0x3, (REAL)(1.0 / 3.0));
-        assert(ep.GetSize() == 2);
-
-        em.Assign(0, cIndex,           (REAL)(2.0 / 3.0));
-        em.Assign(1, (cIndex+3) & 0x3, (REAL)(1.0 / 3.0));
-        assert(em.GetSize() == 2);
-    } else if (! corner.isBoundary) {
-        //
-        //  The irregular interior case:
-        //
-        computeIrregularInteriorEdgePoints(cIndex, p, ep, em, weightBuffer);
-    } else if (corner.numFaces > 1) {
-        //
-        //  The irregular boundary case:
-        //
-        computeIrregularBoundaryEdgePoints(cIndex, p, ep, em, weightBuffer);
-    } else {
-        //
-        //  The irregular/smooth corner case:
-        //
-        p.Assign(0, cIndex,           (REAL)(4.0 / 6.0));
-        p.Assign(1, (cIndex+1) & 0x3, (REAL)(1.0 / 6.0));
-        p.Assign(2, (cIndex+3) & 0x3, (REAL)(1.0 / 6.0));
-        assert(p.GetSize() == 3);
-
-        ep.Assign(0, cIndex,           (REAL)(2.0 / 3.0));
-        ep.Assign(1, (cIndex+1) & 0x3, (REAL)(1.0 / 3.0));
-        assert(ep.GetSize() == 2);
-
-        em.Assign(0, cIndex,           (REAL)(2.0 / 3.0));
-        em.Assign(1, (cIndex+3) & 0x3, (REAL)(1.0 / 3.0));
-        assert(em.GetSize() == 2);
-    }
-}
-
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::computeIrregularInteriorEdgePoints(
-        int cIndex,
-        Point& p, Point& ep, Point& em,
-        Weight *ringWeights) const {
-
-    CornerTopology const & corner = _corners[cIndex];
-
-    int valence = corner.valence;
-    int weightWidth = 1 + 2 * valence;
-
-    Weight* pWeights  = &ringWeights[0];
-    Weight* epWeights = pWeights + weightWidth;
-    Weight* emWeights = pWeights + weightWidth * 2;
-
-    //
-    //  The interior (smooth) case -- invoke the public static method that
-    //  computes pre-allocated ring weights for P, Ep and Em:
-    //
-    CatmarkLimits<REAL>::ComputeInteriorPointWeights(valence, corner.faceInRing,
-            pWeights, epWeights, emWeights);
-
-    //
-    //  Transer the weights for the ring into the stencil form of the required
-    //  Point type.  The limit mask for position involves all ring weights, and
-    //  since Ep and Em depend on it, there should be no need to filter weights
-    //  with value 0:
-    //
-    p.Assign( 0, cIndex, pWeights[0]);
-    ep.Assign(0, cIndex, epWeights[0]);
-    em.Assign(0, cIndex, emWeights[0]);
-
-    for (int i = 1; i < weightWidth; ++i) {
-        int pRingPoint = corner.ringPoints[i-1];
-
-        p.Assign( i, pRingPoint, pWeights[i]);
-        ep.Assign(i, pRingPoint, epWeights[i]);
-        em.Assign(i, pRingPoint, emWeights[i]);
-    }
-    assert(p.GetSize() == weightWidth);
-    assert(ep.GetSize() == weightWidth);
-    assert(em.GetSize() == weightWidth);
-}
-
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::computeIrregularBoundaryEdgePoints(
-        int cIndex,
-        Point& p, Point& ep, Point& em,
-        Weight *ringWeights) const {
-
-    CornerTopology const & corner = _corners[cIndex];
-
-    int valence = corner.valence;
-    int weightWidth = 1 + corner.valence + corner.numFaces;
-
-    Weight* pWeights  = &ringWeights[0];
-    Weight* epWeights = pWeights + weightWidth;
-    Weight* emWeights = pWeights + weightWidth * 2;
-
-    //
-    //  The boundary (smooth) case -- invoke the public static method that
-    //  computes pre-allocated ring weights for P, Ep and Em:
-    //
-    CatmarkLimits<REAL>::ComputeBoundaryPointWeights(valence, corner.faceInRing,
-                pWeights, epWeights, emWeights);
-
-    //
-    //  Transfer ring weights into points -- exploiting cases where they
-    //  are known to be non-zero only along the two boundary edges:
-    //
-    int N = weightWidth - 1;
-
-    int p0 = cIndex;
-    int p1 = corner.ringPoints[0];
-    int pN = corner.ringPoints[2*(valence-1)];
-
-    p.Assign(0, p0, pWeights[0]);
-    p.Assign(1, p1, pWeights[1]);
-    p.Assign(2, pN, pWeights[N]);
-    assert(p.GetSize() == 3);
-
-    //  If Ep is on the boundary edge, it has only two non-zero weights along
-    //  that edge:
-    ep.Assign(0, p0, epWeights[0]);
-    if (corner.epOnBoundary) {
-        ep.Assign(1, p1, epWeights[1]);
-        assert(ep.GetSize() == 2);
-    } else {
-        for (int i = 1; i < weightWidth; ++i) {
-            ep.Assign(i, corner.ringPoints[i-1], epWeights[i]);
-        }
-        assert(ep.GetSize() == weightWidth);
-    }
-
-    //  If Em is on the boundary edge, it has only two non-zero weights along
-    //  that edge:
-    em.Assign(0, p0, emWeights[0]);
-    if (corner.emOnBoundary) {
-        em.Assign(1, pN, emWeights[N]);
-        assert(em.GetSize() == 2);
-    } else {
-        for (int i = 1; i <= weightWidth; ++i) {
-            em.Assign(i, corner.ringPoints[i-1], emWeights[i]);
-        }
-        assert(em.GetSize() == weightWidth);
-    }
-}
-
-
-template <typename REAL>
-int
-GregoryConverter<REAL>::getIrregularFacePointSize(
-        int cIndexNear, int cIndexFar) const {
-
-    CornerTopology const & corner    = _corners[cIndexNear];
-    CornerTopology const & adjCorner = _corners[cIndexFar];
-
-    if (corner.isSharp && adjCorner.isSharp) return 2;
-
-    int thisSize = corner.isSharp
-                 ? 6
-                 : (1 + corner.ringPoints.GetSize());
-
-    int adjSize = (adjCorner.isRegular || adjCorner.isSharp)
-                ? 0
-                : (1 + adjCorner.ringPoints.GetSize() - 6);
-
-    return thisSize + adjSize;
-}
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::computeIrregularFacePoint(
-        int cIndexNear, int edgeInNearCornerRing, int cIndexFar,
-        Point const & p, Point const & eNear, Point const & eFar, Point & fNear,
-        REAL signForSideOfEdge, Weight *rowWeights, int *columnMask) const {
-
-    CornerTopology const & cornerNear = _corners[cIndexNear];
-    CornerTopology const & cornerFar  = _corners[cIndexFar];
-
-    int valence = cornerNear.valence;
-
-    Weight cosNear = cornerNear.cosFaceAngle;
-    Weight cosFar  = cornerFar.cosFaceAngle;
-
-    Weight pCoeff     =                          cosFar  / 3.0f;
-    Weight eNearCoeff = (3.0f - 2.0f * cosNear - cosFar) / 3.0f;
-    Weight eFarCoeff  =         2.0f * cosNear           / 3.0f;
-
-    int fullRowSize = _numSourcePoints;
-    std::memset(&columnMask[0], 0, fullRowSize * sizeof(int));
-    std::memset(&rowWeights[0], 0, fullRowSize * sizeof(Weight));
-
-    _addSparsePointToFullRow(rowWeights, p,     pCoeff,     columnMask);
-    _addSparsePointToFullRow(rowWeights, eNear, eNearCoeff, columnMask);
-    _addSparsePointToFullRow(rowWeights, eFar,  eFarCoeff,  columnMask);
-
-    //  Remember that R is to be computed about an interior edge and is
-    //  comprised of the two pairs of points opposite the interior edge
-    //
-    int iEdgeInterior = edgeInNearCornerRing;
-    int iEdgePrev     = (iEdgeInterior + valence - 1) % valence;
-    int iEdgeNext     = (iEdgeInterior + 1) % valence;
-
-    rowWeights[cornerNear.ringPoints[2*iEdgePrev]]         += -signForSideOfEdge /  9.0f;
-    rowWeights[cornerNear.ringPoints[2*iEdgePrev     + 1]] += -signForSideOfEdge / 18.0f;
-    rowWeights[cornerNear.ringPoints[2*iEdgeInterior + 1]] +=  signForSideOfEdge / 18.0f;
-    rowWeights[cornerNear.ringPoints[2*iEdgeNext]]         +=  signForSideOfEdge /  9.0f;
-
-    int nWeights = 0;
-    for (int i = 0; i < fullRowSize; ++i) {
-        if (columnMask[i]) {
-            fNear.Assign(nWeights++, columnMask[i] - 1, rowWeights[i]);
-        }
-    }
-
-    //  Complete the expected row size when val-2 interior corners induce duplicates:
-    if (_hasVal2InteriorCorner && (nWeights < fNear.GetSize())) {
-        while (nWeights < fNear.GetSize()) {
-            fNear.Assign(nWeights++, cIndexNear, 0.0f);
-        }
-    }
-    assert(fNear.GetSize() == nWeights);
-}
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::assignRegularFacePoints(int cIndex, Matrix & matrix) const {
-
-    Point fp(matrix, 5*cIndex + 3);
-    Point fm(matrix, 5*cIndex + 4);
-
-    CornerTopology const & corner = _corners[cIndex];
-
-    int cNext = (cIndex+1) & 0x3;
-    int cOpp  = (cIndex+2) & 0x3;
-    int cPrev = (cIndex+3) & 0x3;
-
-    //  Assign regular Fp and/or Fm:
-    if (corner.fpIsRegular) {
-        fp.Assign(0, cIndex, (REAL)(4.0 / 9.0));
-        fp.Assign(1, cPrev,  (REAL)(2.0 / 9.0));
-        fp.Assign(2, cNext,  (REAL)(2.0 / 9.0));
-        fp.Assign(3, cOpp,   (REAL)(1.0 / 9.0));
-        assert(fp.GetSize() == 4);
-    }
-    if (corner.fmIsRegular) {
-        fm.Assign(0, cIndex, (REAL)(4.0 / 9.0));
-        fm.Assign(1, cPrev,  (REAL)(2.0 / 9.0));
-        fm.Assign(2, cNext,  (REAL)(2.0 / 9.0));
-        fm.Assign(3, cOpp,   (REAL)(1.0 / 9.0));
-        assert(fm.GetSize() == 4);
-    }
-}
-
-template <typename REAL>
-void
-GregoryConverter<REAL>::computeIrregularFacePoints(int cIndex,
-        Matrix & matrix, Weight *rowWeights, int *columnMask) const {
-
-    //  Identify neighboring corners:
-    CornerTopology const & corner = _corners[cIndex];
-
-    int cNext = (cIndex+1) & 0x3;
-    int cPrev = (cIndex+3) & 0x3;
-
-    Point epPrev(matrix, 5*cPrev  + 1);
-    Point em    (matrix, 5*cIndex + 2);
-    Point p     (matrix, 5*cIndex + 0);
-    Point ep    (matrix, 5*cIndex + 1);
-    Point emNext(matrix, 5*cNext  + 2);
-
-    Point fp(matrix, 5*cIndex + 3);
-    Point fm(matrix, 5*cIndex + 4);
-
-    //
-    //  Compute the face points Fp and Fm in terms of the corner (P) and edge
-    //  points (Ep and Em) previously computed.  The caller provides a buffer
-    //  of the appropriate size (twice the width of the matrix) to use for
-    //  combining weights, along with an integer buffer used to identify
-    //  non-zero weights and preserve the sparsity of the combinations (note
-    //  they use index + 1 to detect index 0 when cleared with 0 entries).
-    //
-    if (!corner.fpIsRegular && !corner.fpIsCopied) {
-        int iEdgeP = corner.faceInRing;
-        computeIrregularFacePoint(cIndex, iEdgeP, cNext,
-                p, ep, emNext, fp, 1.0, rowWeights, columnMask);
-    }
-    if (!corner.fmIsRegular && !corner.fmIsCopied) {
-        int iEdgeM = (corner.faceInRing + 1) % corner.valence;
-        computeIrregularFacePoint(cIndex, iEdgeM, cPrev,
-                p, em, epPrev, fm, -1.0, rowWeights, columnMask);
-    }
-
-    //  Copy Fp or Fm now that any shared values were computed above:
-    if (corner.fpIsCopied) {
-        fp.Copy(fm);
-    }
-    if (corner.fmIsCopied) {
-        fm.Copy(fp);
-    }
-
-    if (!corner.fpIsRegular) assert(matrix.GetRowSize(5*cIndex + 3) == fp.GetSize());
-    if (!corner.fmIsRegular) assert(matrix.GetRowSize(5*cIndex + 4) == fm.GetSize());
-}
-
-//
-//  BSplineConverter
-//
-//  The BSplineConverter is far less complicated than GregoryConverter -- and
-//  actually makes use of GregroyConverter in some cases.  It provides a direct
-//  mapping from the original Catmull-Clark points to a set of BSpline points
-//  fit to the limit position and tangent plane of a single/isolated irregular
-//  interior corner. In the case of all other irregularities, the set of Gregory
-//  points are first determined (using the GregoryConverter) and then converted
-//  to BSpline.
-//
-//  In this latter case, none of the BSpline points derived correspond to the
-//  original source points.
-//
-template <typename REAL>
-class BSplineConverter {
-public:
-    typedef REAL                   Weight;
-    typedef SparseMatrix<Weight>   Matrix;
-public:
-    BSplineConverter() : _sourcePatch(0) { }
-    BSplineConverter(SourcePatch const & sourcePatch);
-    BSplineConverter(SourcePatch const & sourcePatch, Matrix & sparseMatrix);
-
-    void Initialize(SourcePatch const & sourcePatch);
-    void Convert(Matrix & matrix) const;
-
-private:
-    void convertIrregularCorner(int irregularCornerIndex, Matrix & matrix) const;
-    void buildIrregularCornerMatrix(int irregularCornerValence,
-                                    int numSourcePoints,
-                                    int const rowsForXPoints[7],
-                                    Matrix & matrix) const;
-
-    void convertFromGregory(Matrix const & gregoryMatrix, Matrix & matrix) const;
-
-private:
-    SourcePatch const * _sourcePatch;
-    GregoryConverter<REAL> _gregoryConverter;
-};
-
-template <typename REAL>
-BSplineConverter<REAL>::BSplineConverter(SourcePatch const & sourcePatch) {
-
-    Initialize(sourcePatch);
-}
-template <typename REAL>
-BSplineConverter<REAL>::BSplineConverter(SourcePatch const & sourcePatch,
-                                         Matrix & matrix) {
-
-    Initialize(sourcePatch);
-    Convert(matrix);
-}
-
-template <typename REAL>
-void
-BSplineConverter<REAL>::Initialize(SourcePatch const & sourcePatch) {
-
-    _sourcePatch = &sourcePatch;
-    _gregoryConverter.Initialize(sourcePatch);
-}
-
-template <typename REAL>
-void
-BSplineConverter<REAL>::Convert(Matrix & matrix) const {
-
-    if (_gregoryConverter.IsIsolatedInteriorPatch()) {
-        convertIrregularCorner(_gregoryConverter.GetIsolatedInteriorCorner(),
-                               matrix);
-    } else {
-        Matrix gregoryMatrix;
-        _gregoryConverter.Convert(gregoryMatrix);
-
-        convertFromGregory(gregoryMatrix, matrix);
-    }
-}
-
-template <typename REAL>
-void
-BSplineConverter<REAL>::convertFromGregory(Matrix const & G, Matrix & B) const {
-
-    //
-    //  The change of basis matrix from Gregory/Bezier to BSpline contains three
-    //  unique sets of weights corresponding to corner, boundary and interior
-    //  points:
-    //
-    static REAL const wCorner[9]   = { 49.f,-42.f,-42.f, 36.f,-14.f,-14.f, 12.f, 12.f, 4.f };
-    static REAL const wBoundary[6] = {-14.f, 12.f,  7.f, -6.f,  4.f, -2.f };
-    static REAL const wInterior[4] = {  4.f, -2.f, -2.f,  1.f };
-
-    //
-    //  The points of the BSpline and Gregory matrices are oriented and correlated
-    //  as follows:
-    //
-    //      B = { 12, 13, 14, 15 }     G = { 15, 17, 11, 10 }
-    //          {  8,  9, 10, 11 }         { 16, 18, 13, 12 }
-    //          {  4,  5,  6,  7 }         {  2,  3,  8,  6 }
-    //          {  0,  1,  2,  3 }         {  0,  1,  7,  5 }
-    //
-    //  With four symmetric quadrants the dependencies of the BSpline points on the
-    //  Gregory/Bezier points are as follows -- using the "p", "ep", "em" and "f"
-    //  naming from the Gregory points:
-    //
-    static int const pIndices[4][9]  = { {  3,  1,  2,  0,  8, 18,  7, 16, 13 },
-                                         {  8,  6,  7,  5,  3, 13, 12,  1, 18 },
-                                         { 13, 11, 12, 10, 18,  8, 17,  6,  3 },
-                                         { 18, 16, 17, 15, 13,  3,  2, 11,  8 } };
-
-    static int const epIndices[4][6] = { {  3,  1,  8,  7, 18, 13 },
-                                         {  8,  6, 13, 12,  3, 18 },
-                                         { 13, 11, 18, 17,  8,  3 },
-                                         { 18, 16,  3,  2, 13,  8 } };
-    static int const emIndices[4][6] = { {  3,  2, 18, 16,  8, 13 },
-                                         {  8,  7,  3,  1, 13, 18 },
-                                         { 13, 12,  8,  6, 18,  3 },
-                                         { 18, 17, 13, 11,  3,  8 } };
-
-    static int const fIndices[4][4]  = { {  3,  8, 18, 13 },
-                                         {  8, 13,  3, 18 },
-                                         { 13, 18,  8,  3 },
-                                         { 18,  3, 13,  8 } };
-
-    //
-    //  The matrix is not very sparse -- build it full for now for simplicity and
-    //  consider pruning later.
-    //
-    //  Remember that to use variable/sparse row sizes requires processing rows in
-    //  order unless we can pre-assign the row sizes (difficult here).
-    //
-    _initializeFullMatrix(B, 16, G.GetNumColumns());
-
-    _combineSparseMatrixRowsInFull(B,  0, G, 9, pIndices[0],  wCorner);
-    _combineSparseMatrixRowsInFull(B,  1, G, 6, epIndices[0], wBoundary);
-    _combineSparseMatrixRowsInFull(B,  2, G, 6, emIndices[1], wBoundary);
-    _combineSparseMatrixRowsInFull(B,  3, G, 9, pIndices[1],  wCorner);
-
-    _combineSparseMatrixRowsInFull(B,  4, G, 6, emIndices[0], wBoundary);
-    _combineSparseMatrixRowsInFull(B,  5, G, 4, fIndices[0],  wInterior);
-    _combineSparseMatrixRowsInFull(B,  6, G, 4, fIndices[1],  wInterior);
-    _combineSparseMatrixRowsInFull(B,  7, G, 6, epIndices[1], wBoundary);
-
-    _combineSparseMatrixRowsInFull(B,  8, G, 6, epIndices[3], wBoundary);
-    _combineSparseMatrixRowsInFull(B,  9, G, 4, fIndices[3],  wInterior);
-    _combineSparseMatrixRowsInFull(B, 10, G, 4, fIndices[2],  wInterior);
-    _combineSparseMatrixRowsInFull(B, 11, G, 6, emIndices[2], wBoundary);
-
-    _combineSparseMatrixRowsInFull(B, 12, G, 9, pIndices[3],  wCorner);
-    _combineSparseMatrixRowsInFull(B, 13, G, 6, emIndices[3], wBoundary);
-    _combineSparseMatrixRowsInFull(B, 14, G, 6, epIndices[2], wBoundary);
-    _combineSparseMatrixRowsInFull(B, 15, G, 9, pIndices[2],  wCorner);
-}
-
-template <typename REAL>
-void
-BSplineConverter<REAL>::buildIrregularCornerMatrix(
-        int irregularCornerValence,
-        int numSourcePoints, int const rowsForXPoints[7],
-        Matrix & matrix) const {
-
-    int ringSizePlusCorner = 1 + 2 * irregularCornerValence;
-
-    int numElements = 7 * ringSizePlusCorner + 11;
-
-    int rowSizes[16];
-    for (int i = 0; i < 16; ++i) {
-        rowSizes[i] = 1;
-    }
-    rowSizes[rowsForXPoints[0]] = ringSizePlusCorner;
-    rowSizes[rowsForXPoints[1]] = ringSizePlusCorner;
-    rowSizes[rowsForXPoints[2]] = ringSizePlusCorner;
-    rowSizes[rowsForXPoints[3]] = ringSizePlusCorner;
-    rowSizes[rowsForXPoints[4]] = ringSizePlusCorner;
-    rowSizes[rowsForXPoints[5]] = ringSizePlusCorner + 1;
-    rowSizes[rowsForXPoints[6]] = ringSizePlusCorner + 1;
-
-    matrix.Resize(16, numSourcePoints, numElements);
-    for (int i = 0; i < 16; ++i) {
-        matrix.SetRowSize(i, rowSizes[i]);
-
-        REAL * firstElement = &matrix.SetRowElements(i)[0];
-        if (rowSizes[i] == 1) {
-            *firstElement = REAL(1.0);
-        } else {
-            std::memset(firstElement, 0, rowSizes[i] * sizeof(REAL));
-        }
-    }
-}
-
-template <typename REAL>
-void
-BSplineConverter<REAL>::convertIrregularCorner(int irregularCorner,
-                                               Matrix & matrix) const {
-    //
-    //  Labeling/ordering of source points P[] and derived points X[] for the
-    //  final patch, where P0* denotes the extra-ordinary vertex and P5 "does
-    //  not exist", i.e. it serves as a place-holder for the remainder of the
-    //  exterior ring of arbitrary size around P0:
-    //
-    //        ...
-    //    (P5)   P4----P15---P14          X0----X2----X4----X6
-    //   .        |     |     |            |     |     |     |
-    //   .        |     |     |            |     |     |     |
-    //     P6----P0*---P3----P13          X1----P0*---P3----P13
-    //      |     |P' Em|     |    --->    |     |     |     |
-    //      |     |Ep   |     |            |     |     |     |
-    //     P7----P1----P2----P12          X3----P1----P2----P12
-    //      |     |     |     |            |     |     |     |
-    //      |     |     |     |            |     |     |     |
-    //     P8----P9----P10---P11          X5----P9----P10---P11
-    //
-    //  The formulae deriving X[] on the right are in terms of the P[] on the
-    //  left along with the limit position and edge points (P', Ep and Em) and
-    //  other X[].  Given dependencies between the Xi formulae, the order of
-    //  evaluation is important.
-    //
-    //  Listed in terms of symmetric pairs, we compute X0 last:
-    //
-    //      X1 = 1/3 * ( 36Ep - 16P0 - 8P1 - 2P2 - 4P3 - P6 - 2P7)
-    //      X2 = 1/3 * ( 36Em - 16P0 - 4P1 - 2P2 - 8P3 - P4 - 2P15)
-    //
-    //      X3 = 1/3 * (-18Ep + 8P0 + 4P1 + P2 + 2P3 + 4P7  + 2P6)
-    //      X4 = 1/3 * (-18Em + 8P0 + 2P1 + P2 + 4P3 + 4P15 + 2P4)
-    //
-    //      X5 = X1 + (P8  - P6)
-    //      X6 = X2 + (P14 - P4)
-    //
-    //      X0 = 36P' - 16P0 - 4(P1 + P3 + X2 + X1) - (P2 + X3 + X4)
-    //
-    //  Since the limit points (P', Ep and Em) are all defined in terms of the
-    //  1-ring around P0, and with terms generally involving source points P[]
-    //  also part of that ring, almost all Xi are fully determined by points in
-    //  the ring.  Only X5 and X6 involve additional points, and then only one
-    //  additional point each, so its simple to amend these cases separately.
-    //
-    //  So we compute the Xi by combining sets of coefficients for the 1-ring
-    //  around P0 (with that ring including PO as the first entry).
-    //
-
-    //
-    //  Compute limit points P, Ep and Em in terms of weights of the 1-ring for the
-    //  corner and identify the indices of relevant points within the ring:
-    //
-    int valence    = _sourcePatch->_corners[irregularCorner]._numFaces;
-    int faceInRing = _sourcePatch->_corners[irregularCorner]._patchFace;
-
-    int ringSizePlusCorner = 1 + 2 * valence;
-
-    StackBuffer<REAL, 120, true> limitPointWeights(3 * ringSizePlusCorner);
-
-    Weight * wP  = &limitPointWeights[0];
-    Weight * wEp = wP + ringSizePlusCorner;
-    Weight * wEm = wEp + ringSizePlusCorner;
-
-    assert(valence > 2);
-    CatmarkLimits<REAL>::ComputeInteriorPointWeights(valence, faceInRing, wP, wEp, wEm);
-
-    //
-    //  Resize the sparse matrix (and all of its rows) to hold coefficients for
-    //  X and identify arrays for each X where we will compute the weights:
-    //
-    static int const xRowsAll[4][7] = { {  0,  1,  4,  2,  8,  3, 12 },
-                                        {  3,  7,  2, 11,  1, 15,  0 },
-                                        { 15, 14, 11, 13,  7, 12,  3 },
-                                        { 12,  8, 13,  4, 14,  0, 15 } };
-
-    int const * xRows = xRowsAll[irregularCorner];
-
-    int numSourcePoints = _sourcePatch->GetNumSourcePoints();
-
-    buildIrregularCornerMatrix(valence, numSourcePoints, xRows, matrix);
-
-    Weight * wX0 = &matrix.SetRowElements(xRows[0])[0];
-    Weight * wX1 = &matrix.SetRowElements(xRows[1])[0];
-    Weight * wX2 = &matrix.SetRowElements(xRows[2])[0];
-    Weight * wX3 = &matrix.SetRowElements(xRows[3])[0];
-    Weight * wX4 = &matrix.SetRowElements(xRows[4])[0];
-    Weight * wX5 = &matrix.SetRowElements(xRows[5])[0];
-    Weight * wX6 = &matrix.SetRowElements(xRows[6])[0];
-
-    //
-    //  We use the ordering of points in the retrieved 1-ring for which weights
-    //  of the Catmark limit points are computed.  So rather than re-order the
-    //  ring to accomodate contributing source points, identify the locations
-    //  of the source points in the 1-ring so we can set coefficients
-    //  appropriately:
-    //
-    int faceInRingPlus1  = (faceInRing + 1) % valence;
-    int faceInRingPlus2  = (faceInRing + 2) % valence;
-    int faceInRingMinus1 = (faceInRing + valence - 1) % valence;
-
-    int p0inRing  = 0;
-    int p1inRing  = 1 + 2*faceInRing;
-    int p2inRing  = 1 + 2*faceInRing + 1;
-    int p3inRing  = 1 + 2*faceInRingPlus1;
-    int p15inRing = 1 + 2*faceInRingPlus1 + 1;
-    int p4inRing  = 1 + 2*faceInRingPlus2;
-    int p6inRing  = 1 + 2*faceInRingMinus1;
-    int p7inRing  = 1 + 2*faceInRingMinus1 + 1;
-    int p8inRing  = ringSizePlusCorner;
-    int p14inRing = ringSizePlusCorner;
-
-    //
-    //  Assign the weights for the X[] in symmetric pairs -- first initializing
-    //  entries for contributions of source points P[], then combining the
-    //  contributions of P[] with those for the limit points and dependent X[]:
-    //
-    //  X1 = 1/3 * (36Ep - (16P0 + 8P1 + 2P2 + 4P3 + P6 + 2P7))
-    //  X2 = 1/3 * (36pm - (16P0 + 8P3 + 2P2 + 4P1 + P4 + 2P15))
-    wX1[p0inRing] = wX2[p0inRing]  = 16.0f;
-    wX1[p1inRing] = wX2[p3inRing]  =  8.0f;
-    wX1[p2inRing] = wX2[p2inRing]  =  2.0f;
-    wX1[p3inRing] = wX2[p1inRing]  =  4.0f;
-    wX1[p6inRing] = wX2[p4inRing]  =  1.0f;
-    wX1[p7inRing] = wX2[p15inRing] =  2.0f;
-
-    //  X3 = 1/3 * (-18Ep + (8P0 + 4P1 + P2 + 2P3 + 2P6 + 4P7))
-    //  X4 = 1/3 * (-18Em + (8P0 + 4P3 + P2 + 2P1 + 2P4 + 4P15))
-    wX3[p0inRing] = wX4[p0inRing]  =  8.0f;
-    wX3[p1inRing] = wX4[p3inRing]  =  4.0f;
-    wX3[p2inRing] = wX4[p2inRing]  =  1.0f;
-    wX3[p3inRing] = wX4[p1inRing]  =  2.0f;
-    wX3[p6inRing] = wX4[p4inRing]  =  2.0f;
-    wX3[p7inRing] = wX4[p15inRing] =  4.0f;
-
-    //  X5 = X1 + (P8  - P6)
-    //  X6 = X2 + (P14 - P4)
-    wX5[p6inRing] = wX6[p4inRing]  = -1.0f;
-    wX5[p8inRing] = wX6[p14inRing] =  1.0f;
-
-    //  X0 = 36P' - 16P0 - 4(P1 + P3 + X2 + X1) - (P2 + X3 + X4)
-    //     = 36P' - (16P0 + 4P1 + P2 + 4P3) - 4(X2 + X1) - (X3 + X4)
-    wX0[p0inRing] = 16.0f;
-    wX0[p1inRing] =  4.0f;
-    wX0[p2inRing] =  1.0f;
-    wX0[p3inRing] =  4.0f;
-
-    //  Combine weights for all X[] in one iteration through the ring:
-    const REAL oneThird = (REAL) (1.0 / 3.0);
-    for (int i = 0; i < ringSizePlusCorner; ++i) {
-        wX1[i] = (36.0f * wEp[i] - wX1[i]) * oneThird;
-        wX2[i] = (36.0f * wEm[i] - wX2[i]) * oneThird;
-
-        wX3[i] = - wEp[i] * 6.0f + wX3[i] * oneThird;
-        wX4[i] = - wEm[i] * 6.0f + wX4[i] * oneThird;
-
-        wX5[i] += wX1[i];
-        wX6[i] += wX2[i];
-
-        wX0[i] =  wP[i] * 36.0f - wX0[i] - (wX2[i] + wX1[i]) * 4.0f - (wX3[i] + wX4[i]);
-    }
-
-    //
-    //  The weights for the rows for X[] are now computed, and with identity
-    //  rows of the remaining source points already assigned a weight of 1.0,
-    //  all weights in the conversion matrix are now assigned.
-    //
-    //  We now need to assign the indices.  Indices for the 1-ring around the
-    //  corner are trivially retrieved and complete rows for all X[] except
-    //  the last entries for X5 and X6.  So identify the source points needed
-    //  for these two trailing entries and those for other source points that
-    //  are referenced by the matrix.
-    //
-    //  We've already identified those involved in the equations above -- the
-    //  rest can be determined from the orientation of points in SourcePatch:
-    //  all exterior points follow in a counter-clockwise order after the four
-    //  interior points, and we only care about the exterior points P8 through
-    //  P14.
-    //
-    StackBuffer<int, 40, true> ringPoints(ringSizePlusCorner);
-
-    ringPoints[0] = irregularCorner;
-    _sourcePatch->GetCornerRingPoints(irregularCorner, &ringPoints[1]);
-
-    //  Identify P8 through P14 (no need to identify all 16):
-    int pPoints[16];
-    int pNext = ringPoints[p7inRing] + 1;
-    for (int i = 8; i < 16; ++i, ++pNext) {
-        pPoints[i] = (pNext < numSourcePoints) ? pNext
-                   : (pNext - numSourcePoints + 4);
-    }
-
-    //  Assign the ring of indices for the rows of X[] -- amending X5 and X6:
-    int * xIndices[7];
-    for (int i = 0; i < 7; ++i) {
-        xIndices[i] = &matrix.SetRowColumns(xRows[i])[0];
-        std::memcpy(xIndices[i], ringPoints, ringSizePlusCorner * sizeof(int));
-    }
-    xIndices[5][ringSizePlusCorner] = pPoints[8];
-    xIndices[6][ringSizePlusCorner] = pPoints[14];
-
-    //  Assign the index for the rows of the four interior points -- these are
-    //  fixed given the interior points precede the exterior:
-    matrix.SetRowColumns( 5)[0] = 0;
-    matrix.SetRowColumns( 6)[0] = 1;
-    matrix.SetRowColumns( 9)[0] = 3;
-    matrix.SetRowColumns(10)[0] = 2;
-
-    //  Assign the index for the rows of remaining exterior source points
-    //  (P9 through P13) -- identify the rows from a lookup table based on
-    //  the irregular corner:
-    static int const extPointRowsAll[4][5] = { {  7, 11, 15, 14, 13 },
-                                               { 14, 13, 12,  8,  4 },
-                                               {  8,  4,  0,  1,  2 },
-                                               {  1,  2,  3,  7, 11 } };
-    int const * extPointRows = extPointRowsAll[irregularCorner];
-
-    matrix.SetRowColumns(extPointRows[0])[0] = pPoints[ 9];
-    matrix.SetRowColumns(extPointRows[1])[0] = pPoints[10];
-    matrix.SetRowColumns(extPointRows[2])[0] = pPoints[11];
-    matrix.SetRowColumns(extPointRows[3])[0] = pPoints[12];
-    matrix.SetRowColumns(extPointRows[4])[0] = pPoints[13];
-}
-
-//
-//  LinearConverter
-//
-//  The LinearConverter is far less complicated than any of the others.  There's
-//  not much more to it than a single conversion method -- it follows the pattern
-//  for consistency.
-//
-template <typename REAL>
-class LinearConverter {
-public:
-    typedef REAL                      Weight;
-    typedef SparseMatrix<Weight>      Matrix;
-public:
-    LinearConverter() : _sourcePatch(0) { }
-    LinearConverter(SourcePatch const & sourcePatch);
-    LinearConverter(SourcePatch const & sourcePatch, Matrix & sparseMatrix);
-
-    void Initialize(SourcePatch const & sourcePatch);
-    void Convert(Matrix & matrix) const;
-
-private:
-    SourcePatch const * _sourcePatch;
-};
-
-template <typename REAL>
-LinearConverter<REAL>::LinearConverter(SourcePatch const & sourcePatch) {
-
-    Initialize(sourcePatch);
-}
-template <typename REAL>
-LinearConverter<REAL>::LinearConverter(SourcePatch const & sourcePatch, Matrix & matrix) {
-
-    Initialize(sourcePatch);
-    Convert(matrix);
-}
-
-template <typename REAL>
-void
-LinearConverter<REAL>::Initialize(SourcePatch const & sourcePatch) {
-
-    _sourcePatch = &sourcePatch;
-}
-
-template <typename REAL>
-void
-LinearConverter<REAL>::Convert(Matrix & matrix) const {
-
-    StackBuffer<Index,64,true>  indexBuffer(1 + _sourcePatch->GetMaxRingSize());
-    StackBuffer<Weight,64,true> weightBuffer(1 + _sourcePatch->GetMaxRingSize());
-
-    int numElements = 4 * (1 + _sourcePatch->GetMaxRingSize());
-
-    matrix.Resize(4, _sourcePatch->GetNumSourcePoints(), numElements);
-
-    bool hasVal2InteriorCorner = false;
-
-    for (int cIndex = 0; cIndex < 4; ++cIndex) {
-        //  Deal with the trivial sharp case first:
-        if (_sourcePatch->_corners[cIndex]._sharp) {
-            matrix.SetRowSize(cIndex, 1);
-            matrix.SetRowColumns(cIndex)[0] = cIndex;
-            matrix.SetRowElements(cIndex)[0] = 1.0f;
-            continue;
-        }
-
-        SourcePatch::Corner const & sourceCorner = _sourcePatch->_corners[cIndex];
-
-        int ringSize = _sourcePatch->GetCornerRingSize(cIndex);
-        if (sourceCorner._boundary) {
-            matrix.SetRowSize(cIndex, 3);
-        } else {
-            matrix.SetRowSize(cIndex, 1 + ringSize);
-        }
-
-        Array<Index>  rowIndices = matrix.SetRowColumns(cIndex);
-        Array<Weight> rowWeights = matrix.SetRowElements(cIndex);
-
-        indexBuffer[0] = cIndex;
-        _sourcePatch->GetCornerRingPoints(cIndex, &indexBuffer[1]);
-
-        if (sourceCorner._boundary) {
-            CatmarkLimits<REAL>::ComputeBoundaryPointWeights(
-                1 + sourceCorner._numFaces, sourceCorner._patchFace,
-                &weightBuffer[0], 0, 0);
-
-            rowIndices[0] = indexBuffer[0];
-            rowIndices[1] = indexBuffer[1];
-            rowIndices[2] = indexBuffer[ringSize];
-
-            rowWeights[0] = weightBuffer[0];
-            rowWeights[1] = weightBuffer[1];
-            rowWeights[2] = weightBuffer[ringSize];
-        } else {
-            CatmarkLimits<REAL>::ComputeInteriorPointWeights(
-                sourceCorner._numFaces, sourceCorner._patchFace,
-                &weightBuffer[0], 0, 0);
-
-            std::memcpy(&rowIndices[0], indexBuffer, (1 + ringSize) * sizeof(Index));
-            std::memcpy(&rowWeights[0], weightBuffer, (1 + ringSize) * sizeof(Weight));
-        }
-        hasVal2InteriorCorner |= sourceCorner._val2Interior;
-    }
-    if (hasVal2InteriorCorner) {
-        _removeValence2Duplicates(matrix);
-    }
-}
-
-
-//
-//  Internal utilities more relevant to the CatmarkPatchBuilder:
-//
-namespace {
-    //
-    //  The patch type associated with each basis for Catmark -- quickly
-    //  indexed from an array.  The patch type here is essentially the
-    //  quad form of each basis.
-    //
-    PatchDescriptor::Type const patchTypeFromBasisArray[] = {
-            PatchDescriptor::NON_PATCH,      // undefined
-            PatchDescriptor::REGULAR,        // regular
-            PatchDescriptor::GREGORY_BASIS,  // Gregory
-            PatchDescriptor::QUADS,          // linear
-            PatchDescriptor::NON_PATCH       // Bezier -- for future use
-    };
-}
-
-template <typename REAL>
-int
-CatmarkPatchBuilder::convertSourcePatch(SourcePatch const &   sourcePatch,
-                                        PatchDescriptor::Type patchType,
-                                        SparseMatrix<REAL> &  matrix) const {
-
-    assert(_schemeType == Sdc::SCHEME_CATMARK);
-
-    //
-    //  XXXX (barfowl) - consider a CatmarkPatch class to wrap SourcePatch
-    //  with the additional corner information that it initializes.  That
-    //  can then be used for conversion to all destination patch types...
-    //
-
-    if (patchType == PatchDescriptor::GREGORY_BASIS) {
-        GregoryConverter<REAL>(sourcePatch, matrix);
-    } else if (patchType == PatchDescriptor::REGULAR) {
-        BSplineConverter<REAL>(sourcePatch, matrix);
-    } else if (patchType == PatchDescriptor::QUADS) {
-        LinearConverter<REAL>(sourcePatch, matrix);
-    } else {
-        assert("Unknown or unsupported patch type" == 0);
-    }
-    return matrix.GetNumRows();
-}
-
-int
-CatmarkPatchBuilder::convertToPatchType(SourcePatch const &   sourcePatch,
-                                        PatchDescriptor::Type patchType,
-                                        SparseMatrix<float> & matrix) const {
-    return convertSourcePatch(sourcePatch, patchType, matrix);
-}
-int
-CatmarkPatchBuilder::convertToPatchType(SourcePatch const &    sourcePatch,
-                                        PatchDescriptor::Type  patchType,
-                                        SparseMatrix<double> & matrix) const {
-    return convertSourcePatch(sourcePatch, patchType, matrix);
-}
-
-CatmarkPatchBuilder::CatmarkPatchBuilder(
-    TopologyRefiner const& refiner, Options const& options) :
-        PatchBuilder(refiner, options) {
-
-    _regPatchType   = patchTypeFromBasisArray[_options.regBasisType];
-    _irregPatchType = (_options.irregBasisType == BASIS_UNSPECIFIED)
-                    ? _regPatchType
-                    : patchTypeFromBasisArray[_options.irregBasisType];
-
-    _nativePatchType = patchTypeFromBasisArray[BASIS_REGULAR];
-    _linearPatchType = patchTypeFromBasisArray[BASIS_LINEAR];
-}
-
-CatmarkPatchBuilder::~CatmarkPatchBuilder() {
-}
-
-PatchDescriptor::Type
-CatmarkPatchBuilder::patchTypeFromBasis(BasisType basis) const {
-
-    return patchTypeFromBasisArray[(int)basis];
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/catmarkPatchBuilder.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/catmarkPatchBuilder.h
deleted file mode 100644
index b2ccb795b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/catmarkPatchBuilder.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-//   Copyright 2017 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_CATMARK_PATCH_BUILDER_H
-#define OPENSUBDIV3_FAR_CATMARK_PATCH_BUILDER_H
-
-#include "../version.h"
-
-#include "../far/patchBuilder.h"
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  CatmarkPatchBuilder
-//
-//  Declaration of PatchBuilder subclass supporting Sdc::SCHEME_CATMARK.
-//  Required virtual methods are included, along with any customizations
-//  local to their implementation.
-//
-class CatmarkPatchBuilder : public PatchBuilder {
-public:
-    CatmarkPatchBuilder(TopologyRefiner const& refiner, Options const& options);
-    virtual ~CatmarkPatchBuilder();
-
-protected:
-    virtual PatchDescriptor::Type patchTypeFromBasis(BasisType basis) const;
-
-    virtual int convertToPatchType(SourcePatch const &   sourcePatch,
-                                   PatchDescriptor::Type patchType,
-                                   SparseMatrix<float> & matrix) const;
-    virtual int convertToPatchType(SourcePatch const &    sourcePatch,
-                                   PatchDescriptor::Type  patchType,
-                                   SparseMatrix<double> & matrix) const;
-
-private:
-    typedef SparseMatrix<float>   ConversionMatrix;
-
-    template <typename REAL>
-    int convertSourcePatch(SourcePatch const &   sourcePatch,
-                           PatchDescriptor::Type patchType,
-                           SparseMatrix<REAL> &  matrix) const;
-};
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_CATMARK_PATCH_BUILDER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/error.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/error.cpp
deleted file mode 100644
index de81c0934..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/error.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../far/error.h"
-
-#include <cassert>
-#include <cstdarg>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  Statics for the publicly assignable callbacks and the methods to
-//  assign them (disable static assignment warnings when doing so):
-//
-static ErrorCallbackFunc errorFunc = 0;
-static WarningCallbackFunc warningFunc = 0;
-
-#ifdef __INTEL_COMPILER
-#pragma warning disable 1711
-#endif
-
-void SetErrorCallback(ErrorCallbackFunc func) {
-    errorFunc = func;
-}
-
-void SetWarningCallback(WarningCallbackFunc func) {
-    warningFunc = func;
-}
-
-#ifdef __INTEL_COMPILER
-#pragma warning enable 1711
-#endif
-
-
-//
-//  The default error and warning callbacks eventually belong in the
-//  internal namespace:
-//
-void Error(ErrorType err, const char *format, ...) {
-
-    static char const * errorTypeLabel[] = {
-        "No Error",
-        "Fatal Error",
-        "Coding Error (internal)",
-        "Coding Error",
-        "Error"
-    };
-
-    assert(err!=FAR_NO_ERROR);
-
-    char message[10240];
-    va_list argptr;
-    va_start(argptr, format);
-    vsnprintf(message, 10240, format, argptr);
-    va_end(argptr);
-
-    if (errorFunc) {
-        errorFunc(err, message);
-    } else {
-        printf("%s: %s\n", errorTypeLabel[err], message);
-    }
-}
-
-void Warning(const char *format, ...) {
-
-    char message[10240];
-    va_list argptr;
-    va_start(argptr, format);
-    vsnprintf(message, 10240, format, argptr);
-    va_end(argptr);
-
-    if (warningFunc) {
-        warningFunc(message);
-    } else {
-        fprintf(stdout, "Warning: %s\n", message);
-    }
-}
-
-} // end namespace
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/error.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/error.h
deleted file mode 100644
index c2d31fb41..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/error.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_ERROR_H
-#define OPENSUBDIV3_FAR_ERROR_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-typedef enum {
-    FAR_NO_ERROR,               ///< No error. Move along.
-    FAR_FATAL_ERROR,            ///< Issue a fatal error and end the program.
-    FAR_INTERNAL_CODING_ERROR,  ///< Issue an internal programming error, but continue execution.
-    FAR_CODING_ERROR,           ///< Issue a generic programming error, but continue execution.
-    FAR_RUNTIME_ERROR           ///< Issue a generic runtime error, but continue execution.
-} ErrorType;
-
-
-/// \brief The error callback function type (default is "printf")
-typedef void (*ErrorCallbackFunc)(ErrorType err, const char *message);
-
-/// \brief Sets the error callback function (default is "printf")
-///
-/// \note This function is not thread-safe !
-///
-/// @param func function pointer to the callback function
-///
-void SetErrorCallback(ErrorCallbackFunc func);
-
-
-/// \brief The warning callback function type (default is "printf")
-typedef void (*WarningCallbackFunc)(const char *message);
-
-/// \brief Sets the warning callback function (default is "printf")
-///
-/// \note This function is not thread-safe !
-///
-/// @param func function pointer to the callback function
-///
-void SetWarningCallback(WarningCallbackFunc func);
-
-
-//
-//  The following are intended for internal use only (and will eventually
-//  be moved within namespace internal)
-//
-
-/// \brief Sends an OSD error with a message (internal use only)
-///
-/// @param err     the error type
-///
-/// @param format  the format of the message (followed by arguments)
-///
-void Error(ErrorType err, const char *format, ...);
-
-/// \brief Sends an OSD warning message (internal use only)
-///
-/// @param format  the format of the message (followed by arguments)
-///
-void Warning(const char *format, ...);
-
-
-} // end namespace
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif // OPENSUBDIV3_FAR_ERROR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/loopPatchBuilder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/loopPatchBuilder.cpp
deleted file mode 100644
index 7e8c9a8f3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/loopPatchBuilder.cpp
+++ /dev/null
@@ -1,1898 +0,0 @@
-//
-//   Copyright 2018 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifdef _MSC_VER
-#ifndef _USE_MATH_DEFINES
-#define _USE_MATH_DEFINES
-#endif
-#endif
-
-#include "../far/loopPatchBuilder.h"
-#include "../vtr/stackBuffer.h"
-#include "../sdc/loopScheme.h"
-
-#include <cassert>
-#include <cmath>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-using Vtr::Array;
-using Vtr::ConstArray;
-using Vtr::internal::StackBuffer;
-
-namespace Far {
-
-constexpr auto kPI = 3.14159265358979323846;
-
-//
-//  A simple struct with methods to compute Loop limit points (following
-//  the pattern established for Catmull-Clark limit points)
-//
-//  Unlike the corresponding Catmull-Clark struct, Loop limit points are
-//  computed using the limit masks provided by the Sdc Scheme for Loop.
-//
-template <typename REAL>
-struct LoopLimits {
-public:
-    //
-    //  Local classes to fulfill the interface requirements of template
-    //  arguments to the Sdc::Scheme methods
-    //
-    //  Class fulfilling <typename VERTEX>:
-    //
-    class LimitVertex {
-    public:
-        LimitVertex() : _nFaces(0), _nEdges(0) { }
-        LimitVertex(int faces, int edges) : _nFaces(faces), _nEdges(edges) { }
-
-        void Assign(int faces, int edges) { _nFaces = faces; _nEdges = edges; }
-
-        int GetNumEdges() const { return _nEdges; }
-        int GetNumFaces() const { return _nFaces; }
-
-        void GetSharpnessPerEdge(float sharpness[]) const {
-            sharpness[0] = Sdc::Crease::SHARPNESS_INFINITE;
-            for (int i = 1; i < _nEdges - 1; ++i) {
-                sharpness[i] = Sdc::Crease::SHARPNESS_SMOOTH;
-            }
-            sharpness[_nEdges - 1] = Sdc::Crease::SHARPNESS_INFINITE;
-        }
-
-    private:
-        int _nFaces;
-        int _nEdges;
-    };
-
-    //
-    //  Class fulfilling <typename MASK>:
-    //
-    class LimitMask {
-    public:
-        typedef REAL Weight;  //  Also part of the expected interface
-
-    public:
-        LimitMask(Weight* w) : _weights(w), _valence(0) { }
-        ~LimitMask() { }
-
-    public:  //  Generic interface expected of <typename MASK>:
-        int GetNumVertexWeights() const { return 1; }
-        int GetNumEdgeWeights()   const { return _valence; }
-        int GetNumFaceWeights()   const { return 0; }
-
-        void SetNumVertexWeights(int)     { }
-        void SetNumEdgeWeights(int count) { _valence = count; }
-        void SetNumFaceWeights(int)       { }
-
-        Weight const& VertexWeight(int)     const { return _weights[0]; }
-        Weight const& EdgeWeight(int index) const { return _weights[1 + index]; }
-        Weight const& FaceWeight(int)       const { return _weights[0]; }
-
-        Weight& VertexWeight(int)       { return _weights[0]; }
-        Weight& EdgeWeight(  int index) { return _weights[1 + index]; }
-        Weight& FaceWeight(  int)       { return _weights[0]; }
-
-        bool AreFaceWeightsForFaceCenters() const  { return false; }
-        void SetFaceWeightsForFaceCenters(bool)    { }
-
-    private:
-        Weight* _weights;
-        int     _valence;
-    };
-public:
-    typedef Sdc::Scheme<Sdc::SCHEME_LOOP>   SchemeLoop;
-
-    static void ComputeInteriorPointWeights(int valence, int faceInRing,
-                REAL* pWeights, REAL* epWeights, REAL* emWeights);
-
-    static void ComputeBoundaryPointWeights(int valence, int faceInRing,
-                REAL* pWeights, REAL* epWeights, REAL* emWeights);
-};
-
-template <typename REAL>
-void
-LoopLimits<REAL>::ComputeInteriorPointWeights(int valence, int faceInRing,
-                REAL* pWeights, REAL* epWeights, REAL* emWeights) {
-
-    int ringSize = valence + 1;
-
-    LimitVertex vertex(valence, valence);
-
-    bool computeTangentPoints = epWeights && emWeights;
-    if (!computeTangentPoints) {
-        //
-        //  The interior position mask is symmetric -- no need to rotate
-        //  or otherwise account for orientation:
-        //
-        LimitMask pMask(pWeights);
-
-        SchemeLoop().ComputeVertexLimitMask(vertex, pMask,
-                Sdc::Crease::RULE_SMOOTH);
-    } else {
-        //
-        //  The interior tangent masks will be directed along the first
-        //  two edges (the second a rotation of the first).  Adjust the
-        //  tangent weights for a point along the tangent, then rotate
-        //  according to the face within the ring:
-        //
-        int weightWidth = valence + 1;
-        StackBuffer<REAL, 32, true> tWeights(2 * weightWidth);
-        REAL * t1Weights = &tWeights[0];
-        REAL * t2Weights = t1Weights + ringSize;
-
-        LimitMask pMask(pWeights);
-        LimitMask t1Mask(t1Weights);
-        LimitMask t2Mask(t2Weights);
-
-        SchemeLoop().ComputeVertexLimitMask(vertex, pMask, t1Mask, t2Mask,
-                Sdc::Crease::RULE_SMOOTH);
-
-        //
-        //  Use the subdominant eigenvalue to scale the limit tangent t1:
-        //
-        //      e = (3 + cos(2*PI/valence)) / 8
-        //
-        //  Combine it with a normalizing factor of (2 / valence) to account
-        //  for the scale inherent in the tangent weights, and (2 / 3) to
-        //  match desired placement of the cubic point in the regular case.
-        //
-        //  The weights for t1 can simply be rotated around the ring to yield
-        //  t2.  Combine the weights for the point in a single set for t2 and
-        //  then copy it into the appropriate orientation for ep and em:
-        //
-        double theta = 2.0 * kPI / (double) valence;
-
-        REAL tanScale = (REAL) ((3.0 + 2.0 * std::cos(theta)) / (6.0 * valence));
-
-        for (int i = 0; i < ringSize; ++i) {
-            t2Weights[i] = pWeights[i] + t1Weights[i] * tanScale;
-        }
-
-        int n1 = faceInRing;
-        int n2 = valence - n1;
-
-        epWeights[0] = t2Weights[0];
-        std::memcpy(epWeights + 1,      t2Weights + 1 + n2, n1 * sizeof(REAL));
-        std::memcpy(epWeights + 1 + n1, t2Weights + 1,      n2 * sizeof(REAL));
-
-        n1 = (faceInRing + 1) % valence;
-        n2 = valence - n1;
-
-        emWeights[0] = t2Weights[0];
-        std::memcpy(emWeights + 1,      t2Weights + 1 + n2, n1 * sizeof(REAL));
-        std::memcpy(emWeights + 1 + n1, t2Weights + 1,      n2 * sizeof(REAL));
-    }
-}
-
-template <typename REAL>
-void
-LoopLimits<REAL>::ComputeBoundaryPointWeights(int valence, int faceInRing,
-                REAL* pWeights, REAL* epWeights, REAL* emWeights) {
-
-    LimitVertex vertex(valence - 1, valence);
-
-    bool computeTangentPoints = epWeights && emWeights;
-    if (!computeTangentPoints) {
-        //
-        //  The boundary position mask will be assigned non-zero weights
-        //  for the vertex and its first and last edges:
-        //
-        LimitMask pMask(pWeights);
-
-        SchemeLoop().ComputeVertexLimitMask(vertex, pMask,
-                Sdc::Crease::RULE_CREASE);
-    } else {
-        //
-        //  The boundary tangent masks need more explicit handling than
-        //  the interior.  One of the tangents will be along the boundary
-        //  and the other towards the interior, but one or both edge
-        //  points may be along interior edges.  A boundary edge point is
-        //  easy to deal with once identified, but interior edge points
-        //  need a numerical rotation of the interior tangent to orient it
-        //  along the desired edge.
-        //
-        int weightWidth = valence + 1;
-        StackBuffer<REAL, 32, true> tWeights(2 * weightWidth);
-        REAL * t1Weights = &tWeights[0];
-        REAL * t2Weights = t1Weights + weightWidth;
-
-        REAL t1Leading  =  (REAL) (1.0 / 6.0);
-        REAL t1Trailing = -(REAL) (1.0 / 6.0);
-
-        REAL t2Scale = (REAL) (1.0 / 24.0);
-
-        LimitMask pMask(pWeights);
-        LimitMask t1Mask(t1Weights);
-        LimitMask t2Mask(t2Weights);
-
-        SchemeLoop().ComputeVertexLimitMask(vertex, pMask, t1Mask, t2Mask,
-                Sdc::Crease::RULE_CREASE);
-
-        bool epOnLeadingEdge  = (faceInRing == 0);
-        bool emOnTrailingEdge = (faceInRing == (valence - 1));
-
-        if (epOnLeadingEdge) {
-            std::memset(&epWeights[0], 0, weightWidth * sizeof(REAL));
-
-            epWeights[0] = (REAL) (2.0 / 3.0);
-            epWeights[1] = (REAL) (1.0 / 3.0);
-        } else {
-            int  iEdgeNext     = faceInRing;
-            REAL faceAngle     = (REAL) (kPI / (double)(valence - 1));
-            REAL faceAngleNext = faceAngle * (REAL)iEdgeNext;
-            REAL cosAngleNext  = std::cos(faceAngleNext);
-            REAL sinAngleNext  = std::sin(faceAngleNext);
-
-            for (int i = 0; i < weightWidth; ++i) {
-                epWeights[i] = t2Scale * t2Weights[i] * sinAngleNext;
-            }
-            epWeights[0]       += pWeights[0];
-            epWeights[1]       += pWeights[1]       + t1Leading  * cosAngleNext;
-            epWeights[valence] += pWeights[valence] + t1Trailing * cosAngleNext;
-        }
-
-        if (emOnTrailingEdge) {
-            std::memset(&emWeights[0], 0, weightWidth * sizeof(REAL));
-
-            emWeights[0]       = (REAL) (2.0 / 3.0);
-            emWeights[valence] = (REAL) (1.0 / 3.0);
-        } else {
-            int  iEdgePrev     = (faceInRing + 1) % valence;
-            REAL faceAngle     = (REAL) (kPI / (double)(valence - 1));
-            REAL faceAnglePrev = faceAngle * (REAL)iEdgePrev;
-            REAL cosAnglePrev  = std::cos(faceAnglePrev);
-            REAL sinAnglePrev  = std::sin(faceAnglePrev);
-
-            for (int i = 0; i < weightWidth; ++i) {
-                emWeights[i] = t2Scale * t2Weights[i] * sinAnglePrev;
-            }
-            emWeights[0]       += pWeights[0];
-            emWeights[1]       += pWeights[1]       + t1Leading  * cosAnglePrev;
-            emWeights[valence] += pWeights[valence] + t1Trailing * cosAnglePrev;
-        }
-    }
-}
-
-
-//
-//  SparseMatrixRow
-//
-//  This was copied from the CatmarkPatchBuilder as a starting point, so
-//  comments below relate to the state of CatmarkPatchBuilder...
-//
-// This is a utility class representing a row of a SparseMatrix -- which
-// in turn corresponds to a point of a resulting patch.  Instances of this
-// class are intended to encapsulate the contributions of a point and be
-// passed to functions as such.
-//
-// (Consider moving this to PatchBuilder as a protected class or maybe a
-// public class within SparseMatrix itself, e.g. SparseMatrix<REAL>::Row.)
-//
-namespace {
-    template <typename REAL>
-    class SparseMatrixRow {
-    public:
-        SparseMatrixRow(SparseMatrix<REAL> & matrix, int row) :
-            _size(matrix.GetRowSize(row)),
-            _indices(matrix.SetRowColumns(row).begin()),
-            _weights(matrix.SetRowElements(row).begin()) { }
-
-        int GetSize() const { return _size; }
-
-        void SetWeight(int i, REAL weight) { _weights[i] = weight; }
-
-        void Assign(int rowEntry, Index index, REAL weight) {
-            _indices[rowEntry] = index;
-            _weights[rowEntry] = weight;
-        }
-
-        void Copy(SparseMatrixRow<REAL> const & other) {
-            assert(GetSize() == other.GetSize());
-            std::memcpy(_indices, other._indices, _size * sizeof(Index));
-            std::memcpy(_weights, other._weights, _size * sizeof(REAL));
-        }
-
-    public:
-        int     _size;
-        Index * _indices;
-        REAL *  _weights;
-    };
-} // end namespace
-
-//
-//  Simple utility functions for dealing with SparseMatrix:
-//
-namespace {
-#ifdef __INTEL_COMPILER
-#pragma warning (push)
-#pragma warning disable 1572
-#endif
-    template <typename REAL>
-    inline bool _isZero(REAL w) { return (w == (REAL)0.0); }
-#ifdef __INTEL_COMPILER
-#pragma warning (pop)
-#endif
-
-    template <typename REAL>
-    void
-    _initializeFullMatrix(SparseMatrix<REAL> & M, int nRows, int nColumns) {
-
-        M.Resize(nRows, nColumns, nRows * nColumns);
-
-        //  Fill row 0 with index for every column:
-        M.SetRowSize(0, nColumns);
-        Array<int> row0Columns = M.SetRowColumns(0);
-        for (int i = 0; i < nColumns; ++i) {
-            row0Columns[i] = i;
-        }
-
-        //  Copy row 0's indices into all other rows:
-        for (int row = 1; row < nRows; ++row) {
-            M.SetRowSize(row, nColumns);
-            Array<int> dstRowColumns = M.SetRowColumns(row);
-            std::memcpy(&dstRowColumns[0], &row0Columns[0], nColumns * sizeof(int));
-        }
-    }
-
-    template <typename REAL>
-    void
-    _resizeMatrix(SparseMatrix<REAL> & matrix,
-                  int numRows, int numColumns, int numElements,
-                  int const rowSizes[]) {
-
-        matrix.Resize(numRows, numColumns, numElements);
-        for (int i = 0; i < numRows; ++i) {
-            matrix.SetRowSize(i, rowSizes[i]);
-        }
-        assert(matrix.GetNumElements() == numElements);
-    }
-
-    template <typename REAL>
-    void
-    _addSparsePointToFullRow(REAL * fullRow,
-                             SparseMatrixRow<REAL> const & p,
-                             REAL s, int * indexMask) {
-
-        for (int i = 0; i < p.GetSize(); ++i) {
-            int index = p._indices[i];
-
-            fullRow[index] += s * p._weights[i];
-
-            indexMask[index] = 1 + index;
-        }
-    }
-
-    template <typename REAL>
-    void
-    _combineSparsePointsInFullRow(SparseMatrixRow<REAL> & p,
-                                  REAL aCoeff, SparseMatrixRow<REAL> const & a,
-                                  REAL bCoeff, SparseMatrixRow<REAL> const & b,
-                                  int rowSize, REAL * rowBuffer, int * maskBuffer) {
-
-        std::memset(maskBuffer, 0, rowSize * sizeof(int));
-        std::memset(rowBuffer,  0, rowSize * sizeof(REAL));
-
-        _addSparsePointToFullRow(rowBuffer, a, aCoeff, maskBuffer);
-        _addSparsePointToFullRow(rowBuffer, b, bCoeff, maskBuffer);
-
-        int nWeights = 0;
-        for (int i = 0; i < rowSize; ++i) {
-            if (maskBuffer[i]) {
-                p.Assign(nWeights++, maskBuffer[i] - 1, rowBuffer[i]);
-            }
-        }
-        assert(nWeights <= p.GetSize());
-        for (int i = nWeights; i < p.GetSize(); ++i, ++nWeights) {
-            p.Assign(i, 0, 0.0f);
-        }
-    }
-
-    template <typename REAL>
-    void
-    _addSparseRowToFull(REAL * fullRow,
-                        SparseMatrix<REAL> const & M, int sparseRow, REAL s) {
-
-        ConstArray<int>  indices = M.GetRowColumns(sparseRow);
-        ConstArray<REAL> weights = M.GetRowElements(sparseRow);
-
-        for (int i = 0; i < indices.size(); ++i) {
-            fullRow[indices[i]] += s * weights[i];
-        }
-    }
-
-    template <typename REAL>
-    void
-    _combineSparseMatrixRowsInFull(SparseMatrix<REAL> & dstMatrix, int dstRowIndex,
-           SparseMatrix<REAL> const & srcMatrix, int numSrcRows,
-           int const srcRowIndices[], REAL const * srcRowWeights) {
-
-        REAL * dstRow = &dstMatrix.SetRowElements(dstRowIndex)[0];
-
-        std::memset(dstRow, 0, dstMatrix.GetNumColumns() * sizeof(REAL));
-
-        for (int i = 0; i < numSrcRows; ++i) {
-            if (!_isZero(srcRowWeights[i])) {
-                _addSparseRowToFull(dstRow, srcMatrix, srcRowIndices[i], srcRowWeights[i]);
-            }
-        }
-    }
-
-    template <typename REAL>
-    void
-    _matrixPrintDensity(const char* prefix, SparseMatrix<REAL> const & M) {
-    
-        int fullSize = M.GetNumRows() * M.GetNumColumns();
-        int sparseSize = M.GetNumElements();
-
-        int nonZeroSize = 0;
-        for (int i = 0; i < M.GetNumRows(); ++i) {
-            ConstArray<REAL> elements = M.GetRowElements(i);
-            for (int j = 0; j < elements.size(); ++j) {
-                nonZeroSize += (elements[j] != 0);
-            }
-        }
-        printf("%s(%dx%d = %d):  elements = %d, non-zero = %d, density = %.1f\n",
-            prefix, M.GetNumRows(), M.GetNumColumns(), fullSize,
-            sparseSize, nonZeroSize, (REAL)nonZeroSize * 100.0f / (REAL)fullSize);
-    }
-
-    //
-    //  The valence-2 interior case poses problems for the way patch points
-    //  are computed as combinations of source points and stored as a row in
-    //  a SparseMatrix.  An interior vertex of valence-2 causes duplicate
-    //  vertices to appear in the 1-rings of its neighboring vertices and we
-    //  want the entries of a SparseMatrix row to be unique.
-    //
-    //  For the most part, this does not pose a problem while the matrix (set
-    //  of patch points) is being constructed, so we leave those duplicate
-    //  entries in place and deal with them as a post-process here.
-    //
-    //  The SourcePatch is also sensitive to the presence of such valence-2
-    //  vertices for its own reasons (it needs to identifiy a unique set of
-    //  source points from a set of corner rings), so a simple query of its
-    //  corners indicates when this post-process is necessary.  (And since
-    //  this case is a rare occurrence, efficiency is not a major concern.)
-    //
-    template <typename REAL>
-    void _removeValence2Duplicates(SparseMatrix<REAL> & M) {
-
-        //  This will later be determined by the PatchBuilder member:
-        int regFaceSize = 4;
-
-        SparseMatrix<REAL> T;
-        T.Resize(M.GetNumRows(), M.GetNumColumns(), M.GetNumElements());
-
-        int nRows = M.GetNumRows();
-        for (int row = 0; row < nRows; ++row) {
-            int srcRowSize = M.GetRowSize(row);
-
-            int const *  srcIndices = M.GetRowColumns(row).begin();
-            REAL const * srcWeights = M.GetRowElements(row).begin();
-
-            //  Scan the entries to see if there are duplicates -- copy
-            //  the row if not, otherwise, need to compress it:
-            bool cornerUsed[4] = { false, false, false, false };
-
-            int srcDupCount = 0;
-            for (int i = 0; i < srcRowSize; ++i) {
-                int srcIndex = srcIndices[i];
-                if (srcIndex < regFaceSize) {
-                    srcDupCount += (int) cornerUsed[srcIndex];
-                    cornerUsed[srcIndex] = true;
-                }
-            }
-
-            //  Size this row for the destination and copy or compress:
-            T.SetRowSize(row, srcRowSize - srcDupCount);
-
-            int*  dstIndices = T.SetRowColumns(row).begin();
-            REAL* dstWeights = T.SetRowElements(row).begin();
-
-            if (srcDupCount) {
-                REAL * cornerDstPtr[4] = { 0, 0, 0, 0 };
-
-                for (int i = 0; i < srcRowSize; ++i) {
-                    int  srcIndex  = *srcIndices++;
-                    REAL srcWeight = *srcWeights++;
-
-                    if (srcIndex < regFaceSize) {
-                        if (cornerDstPtr[srcIndex]) {
-                            *cornerDstPtr[srcIndex] += srcWeight;
-                            continue;
-                        } else {
-                            cornerDstPtr[srcIndex] = dstWeights;
-                        }
-                    }
-                    *dstIndices++ = srcIndex;
-                    *dstWeights++ = srcWeight;
-                }
-            } else {
-                std::memcpy(&dstIndices[0], &srcIndices[0], srcRowSize * sizeof(Index));
-                std::memcpy(&dstWeights[0], &srcWeights[0], srcRowSize * sizeof(REAL));
-            }
-        }
-        M.Swap(T);
-    }
-} // end namespace for SparseMatrix utilities
-
-
-//
-//  GregoryTriConverter
-//
-//  The GregoryTriConverter class provides a change-of-basis matrix from source
-//  vertices in a Loop mesh to the 18 control points of a quartic Gregory triangle.
-//
-//  The quartic triangle is first constructed as a cubic/quartic hybrid -- with
-//  cubic boundary curves and cross-boundary continuity formulated in terms of
-//  cubics.  The result is then raised to a full quartic once continuity across
-//  all boundaries is achieved.  In most cases 2 of the 3 boundaries will be
-//  cubic (though now represented as quartic) and only one boundary need be a
-//  true quartic to meet a regular Box-spline patch.
-//
-//  Control points are labeled using the convention adopted for quads, with
-//  Ep and Em referring to the "plus" and "minus" edge points and similarly
-//  for the face points Fp and Fm.  The additional quartic "mid-edge" points
-//  associated with each boundary are referred to as M.
-//
-template <typename REAL>
-class GregoryTriConverter {
-public:
-    typedef REAL                    Weight;
-    typedef SparseMatrix<Weight>    Matrix;
-    typedef SparseMatrixRow<Weight> Point;
-public:
-    GregoryTriConverter() : _numSourcePoints(0) { }
-    GregoryTriConverter(SourcePatch const & sourcePatch);
-    GregoryTriConverter(SourcePatch const & sourcePatch, Matrix & sparseMatrix);
-
-    void Initialize(SourcePatch const & sourcePatch);
-
-    bool IsIsolatedInteriorPatch() const { return _isIsolatedInteriorPatch; }
-    bool HasVal2InteriorCorner() const { return _hasVal2InteriorCorner; }
-    int  GetIsolatedInteriorCorner() const { return _isolatedCorner; }
-    int  GetIsolatedInteriorValence() const { return _isolatedValence; }
-
-    void Convert(Matrix & sparseMatrix) const;
-
-private:
-    //
-    //  Local nested class for GregoryTriConverter to cache information for
-    //  the corners of the source patch.  It copies some information from the
-    //  SourcePatch so that we don't have to keep it around, but it contains
-    //  additional information relevant to the determination of the Gregory
-    //  points -- most notably classifications of the face-points and the
-    //  cosines of angles for the face corners that are used repeatedly.
-    //
-    struct CornerTopology {
-        //  Basic flags copied from the SourcePatch
-        unsigned int isBoundary  : 1;
-        unsigned int isSharp     : 1;
-        unsigned int isDart      : 1;
-        unsigned int isRegular   : 1;
-        unsigned int isVal2Int   : 1;
-        unsigned int isCorner    : 1;
-
-        //  Flags for edge- and face-points relating to adjacent corners:
-        unsigned int epOnBoundary : 1;
-        unsigned int emOnBoundary : 1;
-
-        unsigned int fpIsRegular : 1;
-        unsigned int fmIsRegular : 1;
-        unsigned int fpIsCopied  : 1;
-        unsigned int fmIsCopied  : 1;
-
-        //  Other values stored for repeated use:
-        int  valence;
-        int  numFaces;
-        int  faceInRing;
-
-        REAL faceAngle;
-        REAL cosFaceAngle;
-
-        //  Its useful to have the ring for each corner immediately available:
-        StackBuffer<int, 30, true> ringPoints;
-    };
-
-    //
-    //  Methods to resize the matrix before populating it:
-    //
-    void resizeMatrixUnisolated(Matrix & matrix) const;
-
-    void resizeMatrixIsolatedIrregular(Matrix & matrix, int irregCornerIndex,
-                                                        int irregValence) const;
-
-    //
-    //  Methods to compute the various rows of points in the matrix:
-    //
-    void assignRegularEdgePoints(int cornerIndex, Matrix & matrix) const;
-    void computeIrregularEdgePoints(int cornerIndex, Matrix & matrix,
-                                    Weight *weightBuffer) const;
-
-    void assignRegularFacePoints(int cornerIndex, Matrix & matrix) const;
-    void computeIrregularFacePoints(int cornerIndex, Matrix & matrix,
-                                    Weight *weightBuffer, int *indexBuffer) const;
-
-    void computeIrregularInteriorEdgePoints(int cornerIndex,
-                                            Point & P, Point & Ep, Point & Em,
-                                            Weight *weightBuffer) const;
-    void computeIrregularBoundaryEdgePoints(int cornerIndex,
-                                            Point & P, Point & Ep, Point & Em,
-                                            Weight *weightBuffer) const;
-
-    int  getIrregularFacePointSize(int cornerNear, int cornerFar) const;
-    void computeIrregularFacePoint(
-                int cornerNear, int edgeInNearRing, int cornerFar,
-                Point const & p, Point const & eNear, Point const & eFar,
-                Point & fNear, REAL signForSideOfEdge /* -1.0 or 1.0 */,
-                Weight *rowWeights, int *columnMask) const;
-
-    void assignRegularMidEdgePoint(int edgeIndex, Matrix & matrix) const;
-    void computeIrregularMidEdgePoint(int edgeIndex, Matrix & matrix,
-                                      Weight *rowWeights, int *columnMask) const;
-
-    void promoteCubicEdgePointsToQuartic(Matrix & matrix,
-                                         Weight *rowWeights, int *columnMask) const;
-
-private:
-    int _numSourcePoints;
-    int _maxValence;
-
-    bool _isIsolatedInteriorPatch;
-    bool _hasVal2InteriorCorner;
-    int  _isolatedCorner;
-    int  _isolatedValence;
-
-    CornerTopology _corners[3];
-};
-
-
-//
-//  GregoryTriConverter
-//
-//  Construction and initialization/computation of the change-of-basis
-//  matrix to a Gregory patch.
-//
-template <typename REAL>
-GregoryTriConverter<REAL>::GregoryTriConverter(
-        SourcePatch const & sourcePatch) {
-
-    Initialize(sourcePatch);
-}
-
-template <typename REAL>
-GregoryTriConverter<REAL>::GregoryTriConverter(
-        SourcePatch const & sourcePatch, Matrix & sparseMatrix) {
-
-    Initialize(sourcePatch);
-    Convert(sparseMatrix);
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::Initialize(SourcePatch const & sourcePatch) {
-
-    //
-    //  Allocate and gather the 1-rings for the corner vertices and other
-    //  topological information for more immediate access:
-    //
-    int width = sourcePatch.GetNumSourcePoints();
-    _numSourcePoints = width;
-    _maxValence      = sourcePatch.GetMaxValence();
-
-    int boundaryCount = 0;
-    int irregularCount = 0;
-    int irregularCorner = -1;
-    int irregularValence = -1;
-    int sharpCount = 0;
-    int val2IntCount = 0;
-
-    for (int cIndex = 0; cIndex < 3; ++cIndex) {
-        SourcePatch::Corner srcCorner = sourcePatch._corners[cIndex];
-
-        CornerTopology& corner = _corners[cIndex];
-
-        corner.isBoundary = srcCorner._boundary;
-        corner.isSharp    = srcCorner._sharp;
-        corner.isDart     = srcCorner._dart;
-        corner.isCorner   = (srcCorner._numFaces == 1);
-        corner.numFaces   = srcCorner._numFaces;
-        corner.faceInRing = srcCorner._patchFace;
-        corner.isVal2Int  = srcCorner._val2Interior;
-        corner.valence    = corner.numFaces + corner.isBoundary;
-
-        corner.isRegular = ((corner.numFaces << corner.isBoundary) == 6)
-                         && !corner.isSharp;
-        if (corner.isRegular) {
-            corner.faceAngle = (REAL)(kPI / 3.0);
-            corner.cosFaceAngle = 0.5f;
-        } else {
-            corner.faceAngle =
-                (corner.isBoundary ? REAL(kPI) : REAL(2.0 * kPI))
-                    / REAL(corner.numFaces);
-            corner.cosFaceAngle = std::cos(corner.faceAngle);
-        }
-
-        corner.ringPoints.SetSize(sourcePatch.GetCornerRingSize(cIndex));
-        sourcePatch.GetCornerRingPoints(cIndex, corner.ringPoints);
-
-        //  Accumulate topology information to categorize the patch as a whole:
-        boundaryCount += corner.isBoundary;
-        if (!corner.isRegular) {
-            irregularCount ++;
-            irregularCorner = cIndex;
-            irregularValence = corner.valence;
-        }
-        sharpCount += corner.isSharp;
-        val2IntCount += corner.isVal2Int;
-    }
-
-    //  Make a second pass to assign tags dependent on adjacent corners
-    for (int cIndex = 0; cIndex < 3; ++cIndex) {
-        CornerTopology& corner = _corners[cIndex];
-
-        int cNext = (cIndex + 1) % 3;
-        int cPrev = (cIndex + 2) % 3;
-
-        corner.epOnBoundary = false;
-        corner.emOnBoundary = false;
-
-        //
-        //  Identify if the face points are regular or shared/copied from
-        //  one of the pair:
-        //
-        corner.fpIsRegular = corner.isRegular && _corners[cNext].isRegular;
-        corner.fmIsRegular = corner.isRegular && _corners[cPrev].isRegular;
-
-        corner.fpIsCopied = false;
-        corner.fmIsCopied = false;
-
-        if (corner.isBoundary) {
-            corner.epOnBoundary = (corner.faceInRing == 0);
-            corner.emOnBoundary = (corner.faceInRing == (corner.numFaces - 1));
-
-            //  Both face points are same when one of the two corners' edges
-            //  is discontinuous -- one is then copied from the other (unless
-            //  regular)
-            if (corner.numFaces > 1) {
-                if (corner.epOnBoundary) {
-                    corner.fpIsRegular = corner.fmIsRegular;
-                    corner.fpIsCopied  = !corner.fpIsRegular;
-                }
-                if (corner.emOnBoundary) {
-                    corner.fmIsRegular = corner.fpIsRegular;
-                    corner.fmIsCopied  = !corner.fmIsRegular;
-                }
-            } else {
-                //  The case of a corner patch is always regular
-                corner.fpIsRegular = true;
-                corner.fmIsRegular = true;
-            }
-        }
-    }
-    _isIsolatedInteriorPatch = (irregularCount == 1) && (boundaryCount == 0) &&
-                               (irregularValence > 2) && (sharpCount == 0);
-    if (_isIsolatedInteriorPatch) {
-        _isolatedCorner  = irregularCorner;
-        _isolatedValence = irregularValence;
-    }
-    _hasVal2InteriorCorner = (val2IntCount > 0);
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::Convert(Matrix & matrix) const {
-
-    //
-    //  Initialize the sparse matrix to accomodate the coefficients for each
-    //  row/point -- identify common topological cases to treat more easily
-    //  (and note that specializing the population of the matrix may also be
-    //  worthwhile in such cases)
-    //
-    if (_isIsolatedInteriorPatch) {
-        resizeMatrixIsolatedIrregular(matrix, _isolatedCorner, _isolatedValence);
-    } else {
-        resizeMatrixUnisolated(matrix);
-    }
-
-    //
-    //  Compute the corner and edge points P, Ep and Em first.  Since face
-    //  points Fp and Fm involve edge points for two adjacent corners, their
-    //  computation must follow:
-    //
-    int maxRingSize      = 1 + _maxValence;
-    int weightBufferSize = std::max(3 * maxRingSize, 2 * _numSourcePoints);
-
-    StackBuffer<Weight, 128, true> weightBuffer(weightBufferSize);
-    StackBuffer<int, 128, true>    indexBuffer(weightBufferSize);
-
-    for (int cIndex = 0; cIndex < 3; ++cIndex) {
-        if (_corners[cIndex].isRegular) {
-            assignRegularEdgePoints(cIndex, matrix);
-        } else {
-            computeIrregularEdgePoints(cIndex, matrix, weightBuffer);
-        }
-    }
-
-    for (int cIndex = 0; cIndex < 3; ++cIndex) {
-        if (_corners[cIndex].fpIsRegular || _corners[cIndex].fmIsRegular) {
-            assignRegularFacePoints(cIndex, matrix);
-        }
-        if (!_corners[cIndex].fpIsRegular || !_corners[cIndex].fmIsRegular) {
-            computeIrregularFacePoints(cIndex, matrix, weightBuffer, indexBuffer);
-        }
-    }
-
-    for (int eIndex = 0; eIndex < 3; ++eIndex) {
-        CornerTopology const & c0 = _corners[eIndex];
-        CornerTopology const & c1 = _corners[(eIndex + 1) % 3];
-
-        bool isBoundaryEdge = c0.epOnBoundary && c1.emOnBoundary;
-        bool isDartEdge     = c0.epOnBoundary != c1.emOnBoundary;
-        if (isBoundaryEdge || (c0.isRegular && c1.isRegular && !isDartEdge)) {
-            assignRegularMidEdgePoint(eIndex, matrix);
-        } else {
-            computeIrregularMidEdgePoint(eIndex, matrix, weightBuffer, indexBuffer);
-        }
-    }
-    promoteCubicEdgePointsToQuartic(matrix, weightBuffer, indexBuffer);
-
-    if (_hasVal2InteriorCorner) {
-        _removeValence2Duplicates(matrix);
-    }
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::resizeMatrixIsolatedIrregular(
-        Matrix & matrix, int cornerIndex, int cornerValence) const {
-
-    int irregRingSize = 1 + cornerValence;
-
-    int irregCorner   =  cornerIndex;
-    int irregPlus     = (cornerIndex + 1) % 3;
-    int irregMinus    = (cornerIndex + 2) % 3;
-
-    int   rowSizes[18];
-    int * rowSizePtr = 0;
-
-    rowSizePtr = rowSizes + irregCorner * 5;
-    *rowSizePtr++ = irregRingSize;
-    *rowSizePtr++ = irregRingSize;
-    *rowSizePtr++ = irregRingSize;
-    *rowSizePtr++ = 3 + irregRingSize;
-    *rowSizePtr++ = 3 + irregRingSize;
-
-    rowSizePtr = rowSizes + irregPlus * 5;
-    *rowSizePtr++ = 7;
-    *rowSizePtr++ = 7;
-    *rowSizePtr++ = 7;
-    *rowSizePtr++ = 5;
-    *rowSizePtr++ = 3 + irregRingSize;
-
-    rowSizePtr = rowSizes + irregMinus * 5;
-    *rowSizePtr++ = 7;
-    *rowSizePtr++ = 7;
-    *rowSizePtr++ = 7;
-    *rowSizePtr++ = 3 + irregRingSize;
-    *rowSizePtr++ = 5;
-
-    //  The 3 quartic mid-edge points are not grouped with corners:
-    rowSizes[15 + irregCorner] = 3 + irregRingSize;
-    rowSizes[15 + irregPlus]   = 4;
-    rowSizes[15 + irregMinus]  = 3 + irregRingSize;
-
-    int numElements = 9*irregRingSize + 74;
-
-    _resizeMatrix(matrix, 18, _numSourcePoints, numElements, rowSizes);
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::resizeMatrixUnisolated(Matrix & matrix) const {
-
-    int rowSizes[18];
-
-    int numElements = 0;
-
-    for (int cIndex = 0; cIndex < 3; ++cIndex) {
-        int * rowSize = rowSizes + cIndex*5;
-
-        CornerTopology const & corner = _corners[cIndex];
-
-        //  First, the corner and pair of edge points:
-        if (corner.isRegular) {
-            if (! corner.isBoundary) {
-                rowSize[0] = 7;
-                rowSize[1] = 7;
-                rowSize[2] = 7;
-            } else {
-                rowSize[0] = 3;
-                rowSize[1] = corner.epOnBoundary ? 3 : 5;
-                rowSize[2] = corner.emOnBoundary ? 3 : 5;
-            }
-        } else {
-            if (corner.isSharp) {
-                rowSize[0] = 1;
-                rowSize[1] = 2;
-                rowSize[2] = 2;
-            } else if (! corner.isBoundary) {
-                int ringSize = 1 + corner.valence;
-                rowSize[0] = ringSize;
-                rowSize[1] = ringSize;
-                rowSize[2] = ringSize;
-            } else if (corner.numFaces > 1) {
-                int ringSize = 1 + corner.valence;
-                rowSize[0] = 3;
-                rowSize[1] = corner.epOnBoundary ? 3 : ringSize;
-                rowSize[2] = corner.emOnBoundary ? 3 : ringSize;
-            } else {
-                rowSize[0] = 3;
-                rowSize[1] = 3;
-                rowSize[2] = 3;
-            }
-        }
-        numElements += rowSize[0] + rowSize[1] + rowSize[2];
-
-        //  Second, the pair of face points:
-        rowSize[3] = 5 - corner.epOnBoundary - corner.emOnBoundary;
-        rowSize[4] = 5 - corner.epOnBoundary - corner.emOnBoundary;
-        if (!corner.fpIsRegular || !corner.fmIsRegular) {
-            int cNext = (cIndex + 1) % 3;
-            int cPrev = (cIndex + 2) % 3;
-            if (!corner.fpIsRegular) {
-                rowSize[3] = getIrregularFacePointSize(cIndex,
-                                corner.fpIsCopied ? cPrev : cNext);
-            }
-            if (!corner.fmIsRegular) {
-                rowSize[4] = getIrregularFacePointSize(cIndex,
-                                corner.fmIsCopied ? cNext : cPrev);
-            }
-        }
-        numElements += rowSize[3] + rowSize[4];
-
-        //  Third, the quartic mid-edge boundary point (edge following corner):
-        int cNext = (cIndex + 1) % 3;
-        CornerTopology const & cornerNext = _corners[cNext];
-
-        int & midEdgeSize = rowSizes[15 + cIndex];
-
-        if (corner.epOnBoundary && cornerNext.emOnBoundary) {
-            midEdgeSize = 2;
-        } else if (corner.isRegular && cornerNext.isRegular &&
-                  (corner.epOnBoundary == cornerNext.emOnBoundary)) {
-            midEdgeSize = 4;
-        } else {
-            midEdgeSize = getIrregularFacePointSize(cIndex, cNext);
-        }
-        numElements += midEdgeSize;
-    }
-    _resizeMatrix(matrix, 18, _numSourcePoints, numElements, rowSizes);
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::assignRegularEdgePoints(int cIndex, Matrix & matrix) const {
-
-    Point p (matrix, 5*cIndex + 0);
-    Point ep(matrix, 5*cIndex + 1);
-    Point em(matrix, 5*cIndex + 2);
-
-    CornerTopology const & corner = _corners[cIndex];
-
-    int const * cRing = corner.ringPoints;
-
-    if (! corner.isBoundary) {
-        REAL const pScale = (REAL) (1.0 / 12.0);
-
-        p.Assign(0, cIndex, 0.5f);
-        p.Assign(1, cRing[0], pScale);
-        p.Assign(2, cRing[1], pScale);
-        p.Assign(3, cRing[2], pScale);
-        p.Assign(4, cRing[3], pScale);
-        p.Assign(5, cRing[4], pScale);
-        p.Assign(6, cRing[5], pScale);
-        assert(p.GetSize() == 7);
-
-        //  Identify the edges along Ep and Em and those opposite them:
-        REAL const eWeights[6] = { 7.0f, 5.0f, 1.0f, -1.0f, 1.0f, 5.0f };
-        REAL const eScale = (REAL) (1.0 / 36.0);
-
-        int iEdgeEp =  corner.faceInRing;
-        int iEdgeEm = (corner.faceInRing + 1) % 6;
-
-        ep.Assign(0, cIndex, 0.5f);
-        ep.Assign(1, cRing[iEdgeEp],           eScale * eWeights[0]);
-        ep.Assign(2, cRing[(iEdgeEp + 1) % 6], eScale * eWeights[1]);
-        ep.Assign(3, cRing[(iEdgeEp + 2) % 6], eScale * eWeights[2]);
-        ep.Assign(4, cRing[(iEdgeEp + 3) % 6], eScale * eWeights[3]);
-        ep.Assign(5, cRing[(iEdgeEp + 4) % 6], eScale * eWeights[4]);
-        ep.Assign(6, cRing[(iEdgeEp + 5) % 6], eScale * eWeights[5]);
-        assert(ep.GetSize() == 7);
-
-        em.Assign(0, cIndex, 0.5f);
-        em.Assign(1, cRing[iEdgeEm],           eScale * eWeights[0]);
-        em.Assign(2, cRing[(iEdgeEm + 1) % 6], eScale * eWeights[1]);
-        em.Assign(3, cRing[(iEdgeEm + 2) % 6], eScale * eWeights[2]);
-        em.Assign(4, cRing[(iEdgeEm + 3) % 6], eScale * eWeights[3]);
-        em.Assign(5, cRing[(iEdgeEm + 4) % 6], eScale * eWeights[4]);
-        em.Assign(6, cRing[(iEdgeEm + 5) % 6], eScale * eWeights[5]);
-        assert(em.GetSize() == 7);
-    } else {
-        REAL oneThird  = (REAL) (1.0 / 3.0);
-        REAL twoThirds = (REAL) (2.0 / 3.0);
-        REAL oneSixth  = (REAL) (1.0 / 6.0);
-
-        p.Assign(0, cIndex,   twoThirds);
-        p.Assign(1, cRing[0], oneSixth);
-        p.Assign(2, cRing[3], oneSixth);
-        assert(p.GetSize() == 3);
-
-        //
-        //  We have three triangles here, and the two edge points may be along two
-        //  of four edges -- two of which are interior and require weights adjusted
-        //  from above to account for phantom points (yielding {1/2, 1/6, 1/6, 1/6})
-        //
-        if (corner.epOnBoundary) {
-            ep.Assign(0, cIndex,   twoThirds);
-            ep.Assign(1, cRing[0], oneThird);
-            ep.Assign(2, cRing[3], 0.0f);
-            assert(ep.GetSize() == 3);
-        } else {
-            ep.Assign(0, cIndex, 0.5f);
-            ep.Assign(1, cRing[1], oneSixth);
-            ep.Assign(2, cRing[2], oneSixth);
-            ep.Assign(3, cRing[corner.emOnBoundary ? 3 : 0], oneSixth);
-            ep.Assign(4, cRing[corner.emOnBoundary ? 0 : 3], 0.0f);
-            assert(ep.GetSize() == 5);
-        }
-
-        if (corner.emOnBoundary) {
-            em.Assign(0, cIndex,   twoThirds);
-            em.Assign(1, cRing[3], oneThird);
-            em.Assign(2, cRing[0], 0.0f);
-            assert(em.GetSize() == 3);
-        } else {
-            em.Assign(0, cIndex, 0.5f);
-            em.Assign(1, cRing[1], oneSixth);
-            em.Assign(2, cRing[2], oneSixth);
-            em.Assign(3, cRing[corner.epOnBoundary ? 0 : 3], oneSixth);
-            em.Assign(4, cRing[corner.epOnBoundary ? 3 : 0], 0.0f);
-            assert(em.GetSize() == 5);
-        }
-    }
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::computeIrregularEdgePoints(int cIndex,
-        Matrix & matrix, Weight *weightBuffer) const {
-
-    Point p (matrix, 5*cIndex + 0);
-    Point ep(matrix, 5*cIndex + 1);
-    Point em(matrix, 5*cIndex + 2);
-
-    //
-    //  The corner and edge points P, Ep and Em  are completely determined
-    //  by the 1-ring of vertices around (and including) the corner vertex.
-    //  We combine full sets of coefficients for the vertex and its 1-ring.
-    //
-    CornerTopology const & corner = _corners[cIndex];
-
-    if (corner.isSharp) {
-        //
-        //  The sharp case -- both interior and boundary...
-        //
-        p.Assign(0, cIndex, 1.0f);
-        assert(p.GetSize() == 1);
-
-        // Approximating these for now, pending future investigation...
-        ep.Assign(0, cIndex,         (REAL) (2.0 / 3.0));
-        ep.Assign(1, (cIndex+1) % 3, (REAL) (1.0 / 3.0));
-        assert(ep.GetSize() == 2);
-
-        em.Assign(0, cIndex,         (REAL) (2.0 / 3.0));
-        em.Assign(1, (cIndex+2) % 3, (REAL) (1.0 / 3.0));
-        assert(em.GetSize() == 2);
-    } else if (! corner.isBoundary) {
-        //
-        //  The irregular interior case:
-        //
-        computeIrregularInteriorEdgePoints(cIndex, p, ep, em, weightBuffer);
-    } else if (corner.numFaces > 1) {
-        //
-        //  The irregular boundary case:
-        //
-        computeIrregularBoundaryEdgePoints(cIndex, p, ep, em, weightBuffer);
-    } else {
-        //
-        //  The irregular/smooth corner case:
-        //
-        p.Assign(0, cIndex,         (REAL) (4.0 / 6.0));
-        p.Assign(1, (cIndex+1) % 3, (REAL) (1.0 / 6.0));
-        p.Assign(2, (cIndex+2) % 3, (REAL) (1.0 / 6.0));
-        assert(p.GetSize() == 3);
-
-        ep.Assign(0, cIndex,         (REAL) (2.0 / 3.0));
-        ep.Assign(1, (cIndex+1) % 3, (REAL) (1.0 / 3.0));
-        ep.Assign(2, (cIndex+2) % 3, 0.0f);
-        assert(ep.GetSize() == 3);
-
-        em.Assign(0, cIndex,         (REAL) (2.0 / 3.0));
-        em.Assign(1, (cIndex+2) % 3, (REAL) (1.0 / 3.0));
-        em.Assign(2, (cIndex+1) % 3, 0.0f);
-        assert(em.GetSize() == 3);
-    }
-}
-
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::computeIrregularInteriorEdgePoints(
-        int cIndex,
-        Point& p, Point& ep, Point& em,
-        Weight *ringWeights) const {
-
-    CornerTopology const & corner = _corners[cIndex];
-
-    int valence = corner.valence;
-    int weightWidth = 1 + valence;
-
-    Weight* pWeights  = &ringWeights[0];
-    Weight* epWeights = pWeights + weightWidth;
-    Weight* emWeights = pWeights + weightWidth * 2;
-
-    //
-    //  The interior (smooth) case -- invoke the public static method that
-    //  computes pre-allocated ring weights for P, Ep and Em:
-    //
-    LoopLimits<REAL>::ComputeInteriorPointWeights(valence, corner.faceInRing,
-            pWeights, epWeights, emWeights);
-
-    //
-    //  Transer the weights for the ring into the stencil form of the required
-    //  Point type.  The limit mask for position involves all ring weights, and
-    //  since Ep and Em depend on it, there should be no need to filter weights
-    //  with value 0:
-    //
-    p.Assign( 0, cIndex, pWeights[0]);
-    ep.Assign(0, cIndex, epWeights[0]);
-    em.Assign(0, cIndex, emWeights[0]);
-
-    for (int i = 1; i < weightWidth; ++i) {
-        int pRingPoint = corner.ringPoints[i-1];
-
-        p.Assign( i, pRingPoint, pWeights[i]);
-        ep.Assign(i, pRingPoint, epWeights[i]);
-        em.Assign(i, pRingPoint, emWeights[i]);
-    }
-    assert(p.GetSize() == weightWidth);
-    assert(ep.GetSize() == weightWidth);
-    assert(em.GetSize() == weightWidth);
-}
-
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::computeIrregularBoundaryEdgePoints(
-        int cIndex,
-        Point& p, Point& ep, Point& em,
-        Weight *ringWeights) const {
-
-    CornerTopology const & corner = _corners[cIndex];
-
-    int valence = corner.valence;
-    int weightWidth = 1 + corner.valence;
-
-    Weight* pWeights  = &ringWeights[0];
-    Weight* epWeights = pWeights + weightWidth;
-    Weight* emWeights = pWeights + weightWidth * 2;
-
-    //
-    //  The boundary (smooth) case -- invoke the public static method that
-    //  computes pre-allocated ring weights for P, Ep and Em:
-    //
-    LoopLimits<REAL>::ComputeBoundaryPointWeights(valence, corner.faceInRing,
-                pWeights, epWeights, emWeights);
-
-    //
-    //  Transfer ring weights into points -- exploiting cases where they
-    //  are known to be non-zero only along the two boundary edges:
-    //
-    int N = weightWidth - 1;
-
-    int p0 = cIndex;
-    int p1 = corner.ringPoints[0];
-    int pN = corner.ringPoints[valence-1];
-
-    p.Assign(0, p0, pWeights[0]);
-    p.Assign(1, p1, pWeights[1]);
-    p.Assign(2, pN, pWeights[N]);
-    assert(p.GetSize() == 3);
-
-    //  If Ep is on the boundary edge, it has only two non-zero weights along
-    //  that edge:
-    ep.Assign(0, p0, epWeights[0]);
-    if (corner.epOnBoundary) {
-        ep.Assign(1, p1, epWeights[1]);
-        ep.Assign(2, pN, 0.0f);
-        assert(ep.GetSize() == 3);
-    } else {
-        for (int i = 1; i < weightWidth; ++i) {
-            ep.Assign(i, corner.ringPoints[i-1], epWeights[i]);
-        }
-        assert(ep.GetSize() == weightWidth);
-    }
-
-    //  If Em is on the boundary edge, it has only two non-zero weights along
-    //  that edge:
-    em.Assign(0, p0, emWeights[0]);
-    if (corner.emOnBoundary) {
-        em.Assign(1, pN, emWeights[N]);
-        em.Assign(2, p1, 0.0f);
-        assert(em.GetSize() == 3);
-    } else {
-        for (int i = 1; i < weightWidth; ++i) {
-            em.Assign(i, corner.ringPoints[i-1], emWeights[i]);
-        }
-        assert(em.GetSize() == weightWidth);
-    }
-}
-
-
-template <typename REAL>
-int
-GregoryTriConverter<REAL>::getIrregularFacePointSize(
-        int cIndexNear, int cIndexFar) const {
-
-    CornerTopology const & nearCorner = _corners[cIndexNear];
-    CornerTopology const & farCorner  = _corners[cIndexFar];
-
-    if (nearCorner.isSharp && farCorner.isSharp) return 2;
-
-    int nearSize = nearCorner.ringPoints.GetSize() - 3;
-    int farSize  = farCorner.ringPoints.GetSize() - 3;
-
-    return 4 + (((nearSize > 0) && !nearCorner.isSharp) ? nearSize : 0)
-             + (((farSize > 0)  && !farCorner.isSharp)  ? farSize  : 0);
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::computeIrregularFacePoint(
-        int cIndexNear, int edgeInNearCornerRing, int cIndexFar,
-        Point const & p, Point const & eNear, Point const & eFar, Point & fNear,
-        REAL signForSideOfEdge, Weight *rowWeights, int *columnMask) const {
-
-    CornerTopology const & cornerNear = _corners[cIndexNear];
-    CornerTopology const & cornerFar  = _corners[cIndexFar];
-
-    int valence = cornerNear.valence;
-
-    Weight cosNear = cornerNear.cosFaceAngle;
-    Weight cosFar  = cornerFar.cosFaceAngle;
-
-    //
-    //  From Loop, Schaefer et al, a face point F is computed as:
-    //
-    //    F = (1/d) * (c0 * P0 + (d - 2*c0 - c1) * E0 + 2*c1 * E1 + R)
-    //
-    //  where d = 3 for quads and d = 4 for triangles, and R is:
-    //
-    //    R = 1/3 (Mm + Mp) + 2/3 (Cm + Cp)
-    //
-    //  where Mm and Mp are the midpoints of the two adjacent edges
-    //  and Cm and Cp are the midpoints of the two adjacent faces.
-    //
-    Weight pCoeff     =                          cosFar  / 4.0f;
-    Weight eNearCoeff = (4.0f - 2.0f * cosNear - cosFar) / 4.0f;
-    Weight eFarCoeff  =         2.0f * cosNear           / 4.0f;
-
-    int fullRowSize = _numSourcePoints;
-    std::memset(&columnMask[0], 0, fullRowSize * sizeof(int));
-    std::memset(&rowWeights[0], 0, fullRowSize * sizeof(Weight));
-
-    _addSparsePointToFullRow(rowWeights, p,     pCoeff,     columnMask);
-    _addSparsePointToFullRow(rowWeights, eNear, eNearCoeff, columnMask);
-    _addSparsePointToFullRow(rowWeights, eFar,  eFarCoeff,  columnMask);
-
-    //  Remember that R is to be computed about an interior edge and is
-    //  comprised of the two pairs of points opposite the interior edge
-    //
-    int iEdgeInterior = edgeInNearCornerRing;
-    int iEdgePrev     = (iEdgeInterior + valence - 1) % valence;
-    int iEdgeNext     = (iEdgeInterior + 1) % valence;
-
-    Weight rScale = (REAL) (0.25 * (7.0 / 18.0));
-
-    rowWeights[cornerNear.ringPoints[iEdgePrev]] += -signForSideOfEdge * rScale;
-    rowWeights[cornerNear.ringPoints[iEdgeNext]] +=  signForSideOfEdge * rScale;
-
-    int nWeights = 0;
-    for (int i = 0; i < fullRowSize; ++i) {
-        if (columnMask[i]) {
-            fNear.Assign(nWeights++, columnMask[i] - 1, rowWeights[i]);
-        }
-    }
-
-    //  Complete the expected row size when val-2 corners induce duplicates:
-    if (_hasVal2InteriorCorner && (nWeights < fNear.GetSize())) {
-        while (nWeights < fNear.GetSize()) {
-            fNear.Assign(nWeights++, cIndexNear, 0.0f);
-        }
-    }
-    assert(fNear.GetSize() == nWeights);
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::assignRegularFacePoints(int cIndex, Matrix & matrix) const {
-
-    CornerTopology const & corner = _corners[cIndex];
-
-    int cNext = (cIndex+1) % 3;
-    int cPrev = (cIndex+2) % 3;
-
-    int const * cRing = corner.ringPoints;
-
-    //
-    //  Regular face-points are computed the same for both face-points of a
-    //  a corner (fp and fm), so iterate through both and make appropriate
-    //  assignments when tagged as regular:
-    //
-    for (int fIsFm = 0; fIsFm < 2; ++fIsFm) {
-        bool fIsRegular = fIsFm ? corner.fmIsRegular : corner.fpIsRegular;
-        if (!fIsRegular) continue;
-
-        Point f(matrix, 5*cIndex + 3 + fIsFm);
-
-        if (corner.isCorner) {
-            f.Assign(0, cIndex, 0.5f);
-            f.Assign(1, cNext,  0.25f);
-            f.Assign(2, cPrev,  0.25f);
-            assert(f.GetSize() == 3);
-        } else if (corner.epOnBoundary) {
-            //  Face is the first/leading face of the boundary ring:
-            f.Assign(0, cIndex,   (REAL) (11.0 / 24.0));
-            f.Assign(1, cRing[0], (REAL) ( 7.0 / 24.0));
-            f.Assign(2, cRing[1], (REAL) ( 5.0 / 24.0));
-            f.Assign(3, cRing[2], (REAL) ( 1.0 / 24.0));
-            assert(f.GetSize() == 4);
-        } else if (corner.emOnBoundary) {
-            //  Face is the last/trailing face of the boundary ring:
-            f.Assign(0, cIndex,   (REAL) (11.0 / 24.0));
-            f.Assign(1, cRing[3], (REAL) ( 7.0 / 24.0));
-            f.Assign(2, cRing[2], (REAL) ( 5.0 / 24.0));
-            f.Assign(3, cRing[1], (REAL) ( 1.0 / 24.0));
-            assert(f.GetSize() == 4);
-        } else {
-            //  Face is interior or the middle face of the boundary:
-            int eNext = corner.isBoundary ? 0 : ((corner.faceInRing + 5) % 6);
-            int ePrev = corner.isBoundary ? 3 : ((corner.faceInRing + 2) % 6);
-
-            f.Assign(0, cIndex,       (REAL) (10.0 / 24.0));
-            f.Assign(1, cPrev,                 0.25f);
-            f.Assign(2, cNext,                 0.25f);
-            f.Assign(3, cRing[ePrev], (REAL) ( 1.0 / 24.0));
-            f.Assign(4, cRing[eNext], (REAL) ( 1.0 / 24.0));
-            assert(f.GetSize() == 5);
-        }
-    }
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::computeIrregularFacePoints(int cIndex,
-        Matrix & matrix, Weight *rowWeights, int *columnMask) const {
-
-    //  Identify neighboring corners:
-    CornerTopology const & corner = _corners[cIndex];
-
-    int cNext = (cIndex+1) % 3;
-    int cPrev = (cIndex+2) % 3;
-
-    Point epPrev(matrix, 5*cPrev  + 1);
-    Point em    (matrix, 5*cIndex + 2);
-    Point p     (matrix, 5*cIndex + 0);
-    Point ep    (matrix, 5*cIndex + 1);
-    Point emNext(matrix, 5*cNext  + 2);
-
-    Point fp(matrix, 5*cIndex + 3);
-    Point fm(matrix, 5*cIndex + 4);
-
-    //
-    //  Compute the face points Fp and Fm in terms of the corner (P) and edge
-    //  points (Ep and Em) previously computed.  The caller provides a buffer
-    //  of the appropriate size (twice the width of the matrix) to use for
-    //  combining weights, along with an integer buffer used to identify
-    //  non-zero weights and preserve the sparsity of the combinations (note
-    //  they use index + 1 to detect index 0 when cleared with 0 entries).
-    //
-    if (!corner.fpIsRegular && !corner.fpIsCopied) {
-        int iEdgeP = corner.faceInRing;
-        computeIrregularFacePoint(cIndex, iEdgeP, cNext,
-                p, ep, emNext, fp, 1.0, rowWeights, columnMask);
-    }
-    if (!corner.fmIsRegular && !corner.fmIsCopied) {
-        int iEdgeM = (corner.faceInRing + 1) % corner.valence;
-        computeIrregularFacePoint(cIndex, iEdgeM, cPrev,
-                p, em, epPrev, fm, -1.0, rowWeights, columnMask);
-    }
-
-    //  Copy Fp or Fm now that any shared values were computed above:
-    if (corner.fpIsCopied) {
-        fp.Copy(fm);
-    }
-    if (corner.fmIsCopied) {
-        fm.Copy(fp);
-    }
-
-    if (!corner.fpIsRegular) assert(matrix.GetRowSize(5*cIndex + 3) == fp.GetSize());
-    if (!corner.fmIsRegular) assert(matrix.GetRowSize(5*cIndex + 4) == fm.GetSize());
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::assignRegularMidEdgePoint(int edgeIndex,
-                            Matrix & matrix) const {
-
-    Point M(matrix, 15 + edgeIndex);
-
-    CornerTopology const & corner = _corners[edgeIndex];
-    if (corner.epOnBoundary) {
-        //  Trivial boundary edge case -- midway between two corners
-
-        M.Assign(0,  edgeIndex, 0.5f);
-        M.Assign(1, (edgeIndex + 1) % 3, 0.5f);
-        assert(M.GetSize() == 2);
-    } else {
-        //  Regular case -- two corners and two vertices opposite the edge
-
-        int oppositeInRing = corner.isBoundary ?
-            (corner.faceInRing - 1) : ((corner.faceInRing + 5) % 6);
-        int oppositeVertex = corner.ringPoints[oppositeInRing];
-
-        M.Assign(0,  edgeIndex,          (REAL) (1.0 / 3.0));
-        M.Assign(1, (edgeIndex + 1) % 3, (REAL) (1.0 / 3.0));
-        M.Assign(2, (edgeIndex + 2) % 3, (REAL) (1.0 / 6.0));
-        M.Assign(3,  oppositeVertex,     (REAL) (1.0 / 6.0));
-        assert(M.GetSize() == 4);
-    }
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::computeIrregularMidEdgePoint(int edgeIndex, Matrix & matrix,
-                                Weight * rowWeights, int * columnMask) const {
-    //
-    //  General case -- interpolate midway between cubic edge points E0 and E1:
-    //
-    int cIndex0 =  edgeIndex;
-    int cIndex1 = (edgeIndex + 1) % 3;
-
-    Point E0p(matrix, 5 * (cIndex0) + 1);
-    Point E1m(matrix, 5 * (cIndex1) + 2);
-
-    Point M(matrix, 15 + edgeIndex);
-
-    _combineSparsePointsInFullRow(M, (REAL)0.5f, E0p, (REAL)0.5f, E1m,
-                                  _numSourcePoints, rowWeights, columnMask);
-}
-
-template <typename REAL>
-void
-GregoryTriConverter<REAL>::promoteCubicEdgePointsToQuartic(Matrix & matrix,
-                                Weight * rowWeights, int * columnMask) const {
-    //
-    //  Re-assign all regular edge-point weights with quartic coefficients,
-    //  so only perform general combinations for the irregular case.
-    //
-    REAL const onBoundaryWeights[3]  = { 16, 7, 1 };
-    REAL const regBoundaryWeights[5] = { 13, 3, 3, 4, 1 };
-    REAL const regInteriorWeights[7] = { 12, 4, 3, 1,  0, 1, 3 };
-
-    REAL const oneOver24 = (REAL) (1.0 / 24.0);
-
-    for (int cIndex = 0; cIndex < 3; ++cIndex) {
-        CornerTopology const & corner = _corners[cIndex];
-
-        //
-        //  Ordering of weight values for symmetric ep and em is the same, so
-        //  we can re-assign in a loop of 2 for {ep, em}
-        //
-        Point P(matrix, 5 * cIndex);
-
-        for (int ePair = 0; ePair < 2; ++ePair) {
-            Point E(matrix, 5 * cIndex + 1 + ePair);
-
-            REAL const * weightsToReassign = 0;
-
-            bool eOnBoundary = ePair ? corner.emOnBoundary : corner.epOnBoundary;
-            if (eOnBoundary && !corner.isSharp) {
-                assert(E.GetSize() == 3);
-                weightsToReassign = onBoundaryWeights;
-            } else if (corner.isRegular) {
-                if (corner.isBoundary) {
-                    assert(E.GetSize() == 5);
-                    weightsToReassign = regBoundaryWeights;
-                } else {
-                    assert(E.GetSize() == 7);
-                    weightsToReassign = regInteriorWeights;
-                }
-            }
-            if (weightsToReassign) {
-                for (int i = 0; i < E.GetSize(); ++i) {
-                    E.SetWeight(i, weightsToReassign[i] * oneOver24);
-                }
-            } else {
-                _combineSparsePointsInFullRow(E, (REAL)0.25f, P, (REAL)0.75f, E,
-                                              _numSourcePoints, rowWeights, columnMask);
-            }
-        }
-    }
-}
-
-namespace {
-    template <typename REAL>
-    void
-    _printPoint(SparseMatrixRow<REAL> const & p, bool printIndices = true,
-                                                 bool printWeights = true) {
-        printf("  Point size = %d:\n", p._size);
-        if (printIndices) {
-            printf("    Indices:  ");
-            for (int j = 0; j < p._size; ++j) {
-                printf("%6d ", p._indices[j]);
-            }
-            printf("\n");
-        }
-        if (printWeights) {
-            printf("    Weights:  ");
-            for (int j = 0; j < p._size; ++j) {
-                printf("%6.3f ", (REAL)p._weights[j]);
-            }
-            printf("\n");
-        }
-    }
-
-    template <typename REAL>
-    void
-    _printMatrix(SparseMatrix<REAL> const & matrix, bool printIndices = true,
-                                                    bool printWeights = true) {
-
-        printf("Matrix %d x %d, %d elements:\n",
-            matrix.GetNumRows(), matrix.GetNumColumns(), matrix.GetNumElements());
-
-        for (int i = 0; i < matrix.GetNumRows(); ++i) {
-            int rowSize = matrix.GetRowSize(i);
-            printf("  Row %d (size = %d):\n", i, rowSize);
-
-            if (printIndices) {
-                ConstArray<int> indices = matrix.GetRowColumns(i);
-                printf("    Indices:  ");
-                for (int j = 0; j < rowSize; ++j) {
-                    printf("%6d ", indices[j]);
-                }
-                printf("\n");
-            }
-            if (printWeights) {
-                ConstArray<REAL> weights = matrix.GetRowElements(i);
-                printf("    Weights:  ");
-                for (int j = 0; j < rowSize; ++j) {
-                    printf("%6.3f ", (REAL)weights[j]);
-                }
-                printf("\n");
-            }
-        }
-    }
-
-#ifdef FAR_DEBUG_LOOP_PATCH_BUILDER
-    void
-    _printSourcePatch(SourcePatch const & patch, bool printCornerInfo = true,
-                                                 bool printRingPoints = true) {
-
-        printf("SoucePatch - %d corners, %d points:\n",
-            patch._numCorners, patch._numSourcePoints);
-
-        if (printCornerInfo) {
-            printf("  Corner info:\n");
-            for (int i = 0; i < patch._numCorners; ++i) {
-                printf("%6d:  boundary = %d, sharp = %d, numFaces = %d, in-ring = %d, ringSize = %d\n", i,
-                    patch._corners[i]._boundary, patch._corners[i]._sharp, patch._corners[i]._numFaces,
-                    patch._corners[i]._patchFace, patch._ringSizes[i]);
-            }
-        }
-        if (printRingPoints) {
-            StackBuffer<Index,64,true> ringPoints;
-            printf("  Ring points:\n");
-            for (int i = 0; i < patch._numCorners; ++i) {
-                int ringSize = patch._ringSizes[i];
-
-                ringPoints.SetSize(ringSize);
-                patch.GetCornerRingPoints(i, ringPoints);
-
-                printf("%6d:  ", i);
-                for (int j = 0; j < ringSize; ++j) {
-                    printf("%d ", ringPoints[j]);
-                }
-                printf("\n");
-            }
-        }
-    }
-#endif
-}
-
-
-//
-//  Not using the same "Converter" pattern used above and in the Catmark scheme,
-//  since the two remaining conversions are fairly trivial.
-//
-template <typename REAL>
-void
-convertToLinear(SourcePatch const & sourcePatch, SparseMatrix<REAL> & matrix) {
-
-    typedef REAL Weight;
-
-    StackBuffer<Index,64,true>  indexBuffer(1 + sourcePatch.GetMaxRingSize());
-    StackBuffer<Weight,64,true> weightBuffer(1 + sourcePatch.GetMaxRingSize());
-
-    int numElements = sourcePatch.GetCornerRingSize(0) +
-                      sourcePatch.GetCornerRingSize(1) +
-                      sourcePatch.GetCornerRingSize(2);
-
-    matrix.Resize(3, sourcePatch.GetNumSourcePoints(), numElements);
-
-    bool hasVal2InteriorCorner = false;
-
-    for (int cIndex = 0; cIndex < 3; ++cIndex) {
-        SourcePatch::Corner const & sourceCorner = sourcePatch._corners[cIndex];
-
-        int ringSize = sourcePatch.GetCornerRingSize(cIndex);
-        if (sourceCorner._sharp) {
-            matrix.SetRowSize(cIndex, 1);
-        } else if (sourceCorner._boundary) {
-            matrix.SetRowSize(cIndex, 3);
-        } else {
-            matrix.SetRowSize(cIndex, 1 + ringSize);
-        }
-
-        Array<Index>  rowIndices = matrix.SetRowColumns(cIndex);
-        Array<Weight> rowWeights = matrix.SetRowElements(cIndex);
-
-        indexBuffer[0] = cIndex;
-        sourcePatch.GetCornerRingPoints(cIndex, &indexBuffer[1]);
-
-        if (sourceCorner._sharp) {
-            rowIndices[0] = cIndex;
-            rowWeights[0] = 1.0f;
-        } else if (sourceCorner._boundary) {
-            LoopLimits<REAL>::ComputeBoundaryPointWeights(
-                    1 + sourceCorner._numFaces, sourceCorner._patchFace,
-                    &weightBuffer[0], 0, 0);
-
-            rowIndices[0] = indexBuffer[0];
-            rowIndices[1] = indexBuffer[1];
-            rowIndices[2] = indexBuffer[ringSize];
-
-            rowWeights[0] = weightBuffer[0];
-            rowWeights[1] = weightBuffer[1];
-            rowWeights[2] = weightBuffer[ringSize];
-        } else {
-            LoopLimits<REAL>::ComputeInteriorPointWeights(
-                    sourceCorner._numFaces, sourceCorner._patchFace,
-                    &weightBuffer[0], 0, 0);
-
-            std::memcpy(&rowIndices[0], indexBuffer, rowIndices.size() * sizeof(Index));
-            std::memcpy(&rowWeights[0], weightBuffer, rowWeights.size() * sizeof(Weight));
-        }
-        hasVal2InteriorCorner |= sourceCorner._val2Interior;
-    }
-    if (hasVal2InteriorCorner) {
-        _removeValence2Duplicates(matrix);
-    }
-}
-
-template <typename REAL>
-void
-convertToGregory(SourcePatch const & sourcePatch, SparseMatrix<REAL> & matrix) {
-
-    GregoryTriConverter<REAL> gregoryConverter(sourcePatch);
-    gregoryConverter.Convert(matrix);
-}
-
-template <typename REAL>
-void
-convertToLoop(SourcePatch const & sourcePatch, SparseMatrix<REAL> & matrix) {
-
-    //
-    //  Unlike quads, there are not enough degrees of freedom in the regular patch
-    //  to enforce interpolation of the limit point and tangent at the corner while
-    //  preserving the two adjoining boundary curves.  Since we end up destroying
-    //  neighboring conintuity in doing so, we use a fully constructed Gregory
-    //  patch here for the isolated corner case as well as the general case.
-    //
-    //  Unfortunately, the regular patch here -- a quartic Box-spline triangle --
-    //  is not as flexible as the BSpline patches for Catmark.  Unlike BSplines
-    //  and Bezier patches, the Box-splines do not span the full space of possible
-    //  shapes (only 12 control points in a space spanned by 15 polynomials for
-    //  the quartic case).  So it is possible to construct shapes with a Gregory
-    //  or Bezier triangle that cannot be represented by the Box-spline.
-    //
-    //  The solution fits a Box-spline patch to the constructed Gregory patch with
-    //  a set of constraints.  With quartic boundary curves, 12 constraints on the
-    //  boundary curve make this tightly constrained.  Such a set of constraints
-    //  is rank deficient (11 instead of 12) so an additional constraint on the
-    //  midpoint of the patch is included and a conversion matrix is constructed
-    //  from the pseudo-inverse of the 13 constraints.
-    //
-    //  For the full 12x15 conversion matrix from 15-point quartic Bezier patch
-    //  back to a Box spline patch, the matrix rows and columns are ordered
-    //  according to control point orientations used elsewhere.  Correllation of
-    //  points between the Bezier and Gregory points is as follows:
-    //
-    //      Q0  Q1  Q2  Q3  Q4  Q5  Q6   Q7  Q8  Q9  Q10   Q11  Q12  Q13  Q14
-    //      G0  G1 G15  G7  G5  G2 G3,4 G8,9 G6 G17 G13,14 G16  G11  G12  G10
-    //
-    //  As with conversion from Gregory to BSpline for Catmark, one of the face
-    //  points is chosen as a Bezier point in the conversion rather than combining
-    //  the pair (which would avoid slight asymmetric artefacts of the choice).
-    //  And given the solution now depends primarily on the boundary, its not
-    //  necessary to construct a full Gregory patch with enforced continuity.
-    //
-    REAL const gregoryToLoopMatrix[12][15] = {
-        {  8.214411f,  7.571190f, -7.690082f,  2.237840f, -1.118922f,-16.428828f,  0.666666f,  0.666666f,
-                       2.237835f,  6.309870f,  0.666666f, -1.690100f, -0.428812f, -0.428805f,  0.214407f },
-        { -0.304687f,  0.609374f,  6.752593f,  0.609374f, -0.304687f,  0.609378f, -3.333333f, -3.333333f,
-                       0.609378f, -1.247389f, -3.333333f, -1.247389f,  3.276037f,  3.276037f, -1.638020f },
-        { -1.118922f,  2.237840f, -7.690082f,  7.571190f,  8.214411f,  2.237835f,  0.666666f,  0.666666f,
-                     -16.428828f, -1.690100f,  0.666666f,  6.309870f, -0.428805f, -0.428812f,  0.214407f },
-        {  8.214411f,-16.428828f,  6.309870f, -0.428812f,  0.214407f,  7.571190f,  0.666666f,  0.666666f,
-                      -0.428805f, -7.690082f,  0.666666f, -1.690100f,  2.237840f,  2.237835f, -1.118922f },
-        { -0.813368f,  1.626735f, -0.773435f, -1.039929f,  0.519965f,  1.626735f,  0.666666f,  0.666666f,
-                      -1.039930f, -0.773435f,  0.666666f,  1.226558f, -1.039929f, -1.039930f,  0.519965f },
-        {  0.519965f, -1.039929f, -0.773435f,  1.626735f, -0.813368f, -1.039930f,  0.666666f,  0.666666f,
-                       1.626735f,  1.226558f,  0.666666f, -0.773435f, -1.039930f, -1.039929f,  0.519965f },
-        {  0.214407f, -0.428812f,  6.309870f,-16.428828f,  8.214411f, -0.428805f,  0.666666f,  0.666666f,
-                       7.571190f, -1.690100f,  0.666666f, -7.690082f,  2.237835f,  2.237840f, -1.118922f },
-        { -0.304687f,  0.609378f, -1.247389f,  3.276037f, -1.638020f,  0.609374f, -3.333333f, -3.333333f,
-                       3.276037f,  6.752593f, -3.333333f, -1.247389f,  0.609374f,  0.609378f, -0.304687f },
-        {  0.519965f, -1.039930f,  1.226558f, -1.039930f,  0.519965f, -1.039929f,  0.666666f,  0.666666f,
-                      -1.039929f, -0.773435f,  0.666666f, -0.773435f,  1.626735f,  1.626735f, -0.813368f },
-        { -1.638020f,  3.276037f, -1.247389f,  0.609378f, -0.304687f,  3.276037f, -3.333333f, -3.333333f,
-                       0.609374f, -1.247389f, -3.333333f,  6.752593f,  0.609378f,  0.609374f, -0.304687f },
-        { -1.118922f,  2.237835f, -1.690100f, -0.428805f,  0.214407f,  2.237840f,  0.666666f,  0.666666f,
-                      -0.428812f, -7.690082f,  0.666666f,  6.309870f,  7.571190f,-16.428828f,  8.214411f },
-        {  0.214407f, -0.428805f, -1.690100f,  2.237835f, -1.118922f, -0.428812f,  0.666666f,  0.666666f,
-                       2.237840f,  6.309870f,  0.666666f, -7.690082f,-16.428828f,  7.571190f,  8.214411f }
-    };
-    int const gRowIndices[15] = { 0,1,15,7,5, 2,4,8,6, 17,14,16, 11,12, 10 };
-
-    SparseMatrix<REAL> G;
-    convertToGregory<REAL>(sourcePatch, G);
-
-    _initializeFullMatrix(matrix, 12, G.GetNumColumns());
-
-    for (int i = 0; i < 12; ++i) {
-        REAL const * gRowWeights = gregoryToLoopMatrix[i];
-        _combineSparseMatrixRowsInFull(matrix, i, G, 15, gRowIndices, gRowWeights);
-    }
-}
-
-
-//
-//  Internal utilities more relevant to the LoopPatchBuilder:
-//
-namespace {
-    //
-    //  The patch type associated with each basis for Loop -- quickly
-    //  indexed from an array.  The patch type here is essentially the
-    //  triangle form of each basis.
-    //
-    PatchDescriptor::Type patchTypeFromBasisArray[] = {
-            PatchDescriptor::NON_PATCH,        // undefined
-            PatchDescriptor::LOOP,             // regular
-            PatchDescriptor::GREGORY_TRIANGLE, // Gregory
-            PatchDescriptor::TRIANGLES,        // linear
-            PatchDescriptor::NON_PATCH };      // Bezier -- for future use
-};
-
-LoopPatchBuilder::LoopPatchBuilder(
-    TopologyRefiner const& refiner, Options const& options) :
-        PatchBuilder(refiner, options) {
-
-    _regPatchType   = patchTypeFromBasisArray[_options.regBasisType];
-    _irregPatchType = (_options.irregBasisType == BASIS_UNSPECIFIED)
-                    ? _regPatchType
-                    : patchTypeFromBasisArray[_options.irregBasisType];
-
-    _nativePatchType = PatchDescriptor::LOOP;
-    _linearPatchType = PatchDescriptor::TRIANGLES;
-}
-
-LoopPatchBuilder::~LoopPatchBuilder() {
-}
-
-PatchDescriptor::Type
-LoopPatchBuilder::patchTypeFromBasis(BasisType basis) const {
-
-    return patchTypeFromBasisArray[(int)basis];
-}
-
-template <typename REAL>
-int
-LoopPatchBuilder::convertSourcePatch(SourcePatch const &   sourcePatch,
-                                     PatchDescriptor::Type patchType,
-                                     SparseMatrix<REAL> &  matrix) const {
-
-    assert(_schemeType == Sdc::SCHEME_LOOP);
-
-    if (patchType == PatchDescriptor::LOOP) {
-        convertToLoop<REAL>(sourcePatch, matrix);
-    } else if (patchType == PatchDescriptor::TRIANGLES) {
-        convertToLinear<REAL>(sourcePatch, matrix);
-    } else if (patchType == PatchDescriptor::GREGORY_TRIANGLE) {
-        convertToGregory<REAL>(sourcePatch, matrix);
-    } else {
-        assert("Unknown or unsupported patch type" == 0);
-    }
-    return matrix.GetNumRows();
-}
-
-int
-LoopPatchBuilder::convertToPatchType(SourcePatch const &       sourcePatch,
-                                         PatchDescriptor::Type patchType,
-                                         SparseMatrix<float> & matrix) const {
-    return convertSourcePatch(sourcePatch, patchType, matrix);
-}
-int
-LoopPatchBuilder::convertToPatchType(SourcePatch const &        sourcePatch,
-                                         PatchDescriptor::Type  patchType,
-                                         SparseMatrix<double> & matrix) const {
-    return convertSourcePatch(sourcePatch, patchType, matrix);
-}
-
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/loopPatchBuilder.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/loopPatchBuilder.h
deleted file mode 100644
index 99790250f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/loopPatchBuilder.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-//   Copyright 2017 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_LOOP_PATCH_BUILDER_H
-#define OPENSUBDIV3_FAR_LOOP_PATCH_BUILDER_H
-
-#include "../version.h"
-
-#include "../far/patchBuilder.h"
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  LoopPatchBuilder
-//
-//  Declaration of PatchBuilder subclass supporting Sdc::SCHEME_LOOP.
-//  Required virtual methods are included, along with any customizations
-//  local to their implementation.
-//
-class LoopPatchBuilder : public PatchBuilder {
-public:
-    LoopPatchBuilder(TopologyRefiner const& refiner, Options const& options);
-    virtual ~LoopPatchBuilder();
-
-protected:
-    virtual PatchDescriptor::Type patchTypeFromBasis(BasisType basis) const;
-
-    virtual int convertToPatchType(SourcePatch const &   sourcePatch,
-                                   PatchDescriptor::Type patchType,
-                                   SparseMatrix<float> & matrix) const;
-    virtual int convertToPatchType(SourcePatch const &    sourcePatch,
-                                   PatchDescriptor::Type  patchType,
-                                   SparseMatrix<double> & matrix) const;
-private:
-    template <typename REAL>
-    int convertSourcePatch(SourcePatch const &   sourcePatch,
-                           PatchDescriptor::Type patchType,
-                           SparseMatrix<REAL> &  matrix) const;
-};
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_LOOP_PATCH_BUILDER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBasis.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBasis.cpp
deleted file mode 100644
index 483738882..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBasis.cpp
+++ /dev/null
@@ -1,1405 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../far/patchBasis.h"
-#include "../far/patchDescriptor.h"
-
-#include <cassert>
-#include <cstring>
-#include <cmath>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-namespace internal {
-
-
-//
-//  Basis support for quadrilateral patches:
-//
-//  Quadrilateral patches are parameterized in terms of (s,t) as follows:
-//
-//      (1,0) *---------* (1,1)
-//            | 3     2 |
-//          t |         |
-//            |         |
-//            | 0     1 |
-//      (0,0) *---------* (1,0)
-//                 s
-//
-
-
-//
-//  Simple bilinear quad:
-//
-template <typename REAL>
-int
-EvalBasisLinear(REAL s, REAL t,
-    REAL wP[4], REAL wDs[4], REAL wDt[4],
-    REAL wDss[4], REAL wDst[4], REAL wDtt[4]) {
-
-    REAL sC = 1.0f - s;
-    REAL tC = 1.0f - t;
-
-    if (wP) {
-        wP[0] = sC * tC;
-        wP[1] =  s * tC;
-        wP[2] =  s * t;
-        wP[3] = sC * t;
-    }
-    if (wDs && wDt) {
-        wDs[0] = -tC;
-        wDs[1] =  tC;
-        wDs[2] =   t;
-        wDs[3] =  -t;
-
-        wDt[0] = -sC;
-        wDt[1] =  -s;
-        wDt[2] =   s;
-        wDt[3] =  sC;
-
-        if (wDss && wDst && wDtt) {
-            for(int i = 0; i < 4; ++i) {
-                wDss[i] = 0.0f;
-                wDtt[i] = 0.0f;
-            }
-
-            wDst[0] =  1.0f;
-            wDst[1] = -1.0f;
-            wDst[2] =  1.0f;
-            wDst[3] = -1.0f;
-        }
-    }
-    return 4;
-}
-
-//
-//  Bicubic BSpline patch:
-//
-//     12-----13------14-----15
-//      |      |      |      |
-//      |      |      |      |
-//      8------9------10-----11
-//      |      | t    |      |
-//      |      |   s  |      |
-//      4------5------6------7
-//      |      |      |      |
-//      |      |      |      |
-//      O------1------2------3
-//
-//  The basis if a bicubic BSpline patch is a tensor product, which we make
-//  use of here by evaluating, differentiating and combining basis functions
-//  in each of the two parametric directions.
-//
-//  Not all 16 points will be present.  The boundary mask indicates boundary
-//  edges beyond which phantom points are implicitly extrapolated.  Weights
-//  for missing points are set to zero while those contributing to their
-//  implicit extrapolation will be adjusted.
-//
-namespace {
-    //
-    //  Cubic BSpline curve basis evaluation:
-    //
-    template <typename REAL>
-    void
-    evalBSplineCurve(REAL t, REAL wP[4], REAL wDP[4], REAL wDP2[4]) {
-
-        REAL const one6th = (REAL)(1.0 / 6.0);
-
-        REAL t2 = t * t;
-        REAL t3 = t * t2;
-
-        wP[0] = one6th * (1.0f - 3.0f*(t -      t2) -      t3);
-        wP[1] = one6th * (4.0f           - 6.0f*t2  + 3.0f*t3);
-        wP[2] = one6th * (1.0f + 3.0f*(t +      t2  -      t3));
-        wP[3] = one6th * (                                 t3);
-
-        if (wDP) {
-            wDP[0] = -0.5f*t2 +      t - 0.5f;
-            wDP[1] =  1.5f*t2 - 2.0f*t;
-            wDP[2] = -1.5f*t2 +      t + 0.5f;
-            wDP[3] =  0.5f*t2;
-        }
-        if (wDP2) {
-            wDP2[0] = -       t + 1.0f;
-            wDP2[1] =  3.0f * t - 2.0f;
-            wDP2[2] = -3.0f * t + 1.0f;
-            wDP2[3] =         t;
-        }
-    }
-
-    //
-    //  Weight adjustments to account for phantom end points:
-    //
-    template <typename REAL>
-    void
-    adjustBSplineBoundaryWeights(int boundary, REAL w[16]) {
-
-        if ((boundary & 1) != 0) {
-            for (int i = 0; i < 4; ++i) {
-                w[i + 8] -= w[i + 0];
-                w[i + 4] += w[i + 0] * 2.0f;
-                w[i + 0]  = 0.0f;
-            }
-        }
-        if ((boundary & 2) != 0) {
-            for (int i = 0; i < 16; i += 4) {
-                w[i + 1] -= w[i + 3];
-                w[i + 2] += w[i + 3] * 2.0f;
-                w[i + 3]  = 0.0f;
-            }
-        }
-        if ((boundary & 4) != 0) {
-            for (int i = 0; i < 4; ++i) {
-                w[i +  4] -= w[i + 12];
-                w[i +  8] += w[i + 12] * 2.0f;
-                w[i + 12]  = 0.0f;
-            }
-        }
-        if ((boundary & 8) != 0) {
-            for (int i = 0; i < 16; i += 4) {
-                w[i + 2] -= w[i + 0];
-                w[i + 1] += w[i + 0] * 2.0f;
-                w[i + 0]  = 0.0f;
-            }
-        }
-    }
-
-    template <typename REAL>
-    void
-    boundBasisBSpline(int boundary,
-        REAL wP[16], REAL wDs[16], REAL wDt[16],
-        REAL wDss[16], REAL wDst[16], REAL wDtt[16]) {
-
-        if (wP) {
-            adjustBSplineBoundaryWeights(boundary, wP);
-        }
-        if (wDs && wDt) {
-            adjustBSplineBoundaryWeights(boundary, wDs);
-            adjustBSplineBoundaryWeights(boundary, wDt);
-
-            if (wDss && wDst && wDtt) {
-                adjustBSplineBoundaryWeights(boundary, wDss);
-                adjustBSplineBoundaryWeights(boundary, wDst);
-                adjustBSplineBoundaryWeights(boundary, wDtt);
-            }
-        }
-    }
-
-} // end namespace
-
-template <typename REAL>
-int
-EvalBasisBSpline(REAL s, REAL t,
-    REAL wP[16], REAL wDs[16], REAL wDt[16],
-    REAL wDss[16], REAL wDst[16], REAL wDtt[16]) {
-
-    REAL sWeights[4], tWeights[4], dsWeights[4], dtWeights[4], dssWeights[4], dttWeights[4];
-
-    evalBSplineCurve(s, wP ? sWeights : 0, wDs ? dsWeights : 0, wDss ? dssWeights : 0);
-    evalBSplineCurve(t, wP ? tWeights : 0, wDt ? dtWeights : 0, wDtt ? dttWeights : 0);
-
-    if (wP) {
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wP[4*i+j] = sWeights[j] * tWeights[i];
-            }
-        }
-    }
-    if (wDs && wDt) {
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wDs[4*i+j] = dsWeights[j] * tWeights[i];
-                wDt[4*i+j] = sWeights[j] * dtWeights[i];
-            }
-        }
-
-        if (wDss && wDst && wDtt) {
-            for (int i = 0; i < 4; ++i) {
-                for (int j = 0; j < 4; ++j) {
-                    wDss[4*i+j] = dssWeights[j] * tWeights[i];
-                    wDst[4*i+j] = dsWeights[j] * dtWeights[i];
-                    wDtt[4*i+j] = sWeights[j] * dttWeights[i];
-                }
-            }
-        }
-    }
-    return 16;
-}
-
-//
-//  Bicubic Bezier patch:
-//
-//     12-----13------14-----15
-//      |      |      |      |
-//      |      |      |      |
-//      8------9------10-----11
-//      |      |      |      |
-//      |      |      |      |
-//      4------5------6------7
-//      | t    |      |      |
-//      |   s  |      |      |
-//      O------1------2------3
-//
-//  As was the case with the BSpline patch, a bicubic Bezier patch can also
-//  make use of its tensor product property by evaluating, differentiating
-//  and combining basis functions in each of the two parametric directions.
-//
-namespace {
-    //
-    //  Cubic Bezier curve basis evaluation:
-    //
-    template <typename REAL>
-    void
-    evalBezierCurve(REAL t, REAL wP[4], REAL wDP[4], REAL wDP2[4]) {
-
-        // The four uniform cubic Bezier basis functions (in terms of t and its
-        // complement tC) evaluated at t:
-        REAL t2 = t*t;
-        REAL tC = 1.0f - t;
-        REAL tC2 = tC * tC;
-
-        wP[0] = tC2 * tC;
-        wP[1] = tC2 * t * 3.0f;
-        wP[2] = t2 * tC * 3.0f;
-        wP[3] = t2 * t;
-
-        // Derivatives of the above four basis functions at t:
-        if (wDP) {
-           wDP[0] = -3.0f * tC2;
-           wDP[1] =  9.0f * t2 - 12.0f * t + 3.0f;
-           wDP[2] = -9.0f * t2 +  6.0f * t;
-           wDP[3] =  3.0f * t2;
-        }
-
-        // Second derivatives of the basis functions at t:
-        if (wDP2) {
-            wDP2[0] =   6.0f * tC;
-            wDP2[1] =  18.0f * t - 12.0f;
-            wDP2[2] = -18.0f * t +  6.0f;
-            wDP2[3] =   6.0f * t;
-        }
-    }
-} // end namespace
-
-template <typename REAL>
-int
-EvalBasisBezier(REAL s, REAL t,
-    REAL wP[16], REAL wDs[16], REAL wDt[16],
-    REAL wDss[16], REAL wDst[16], REAL wDtt[16]) {
-
-    REAL sWeights[4], tWeights[4], dsWeights[4], dtWeights[4], dssWeights[4], dttWeights[4];
-
-    evalBezierCurve(s, wP ? sWeights : 0, wDs ? dsWeights : 0, wDss ? dssWeights : 0);
-    evalBezierCurve(t, wP ? tWeights : 0, wDt ? dtWeights : 0, wDtt ? dttWeights : 0);
-
-    if (wP) {
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wP[4*i+j] = sWeights[j] * tWeights[i];
-            }
-        }
-    }
-    if (wDs && wDt) {
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wDs[4*i+j] = dsWeights[j] * tWeights[i];
-                wDt[4*i+j] = sWeights[j] * dtWeights[i];
-            }
-        }
-
-        if (wDss && wDst && wDtt) {
-            for (int i = 0; i < 4; ++i) {
-                for (int j = 0; j < 4; ++j) {
-                    wDss[4*i+j] = dssWeights[j] * tWeights[i];
-                    wDst[4*i+j] = dsWeights[j] * dtWeights[i];
-                    wDtt[4*i+j] = sWeights[j] * dttWeights[i];
-                }
-            }
-        }
-    }
-    return 16;
-}
-
-//
-//  Cubic Gregory patch:
-//
-//      P3         e3-      e2+         P2
-//         15------17-------11--------10
-//         |        |        |        |
-//         |        |        |        |
-//         |        | f3-    | f2+    |
-//         |       19       13        |
-//     e3+ 16-----18           14-----12 e2-
-//         |     f3+          f2-     |
-//         |                          |
-//         |                          |
-//         |      f0-         f1+     |
-//     e0- 2------4            8------6 e1+
-//         |        3        9        |
-//         |        | f0+    | f1-    |
-//         | t      |        |        |
-//         |   s    |        |        |
-//         O--------1--------7--------5
-//      P0         e0+      e1-         P1
-//
-//  The 20-point cubic Gregory patch is an extension of the 16-point bicubic
-//  Bezier patch with the 4 interior points of the Bezier patch replaced with
-//  pairs of points (face points -- fi+ and fi-) that are rationally combined.
-//
-//  The point ordering of the Gregory patch deviates considerably from the
-//  BSpline and Bezier patches by grouping the 5 points at each corner and
-//  ordering the groups by corner index.
-//
-template <typename REAL>
-int
-EvalBasisGregory(REAL s, REAL t,
-    REAL point[20], REAL wDs[20], REAL wDt[20],
-    REAL wDss[20], REAL wDst[20], REAL wDtt[20]) {
-
-    //  Indices of boundary and interior points and their corresponding Bezier points
-    //  (this can be reduced with more direct indexing and unrolling of loops):
-    //
-    static int const boundaryGregory[12] = { 0, 1, 7, 5, 2, 6, 16, 12, 15, 17, 11, 10 };
-    static int const boundaryBezSCol[12] = { 0, 1, 2, 3, 0, 3,  0,  3,  0,  1,  2,  3 };
-    static int const boundaryBezTRow[12] = { 0, 0, 0, 0, 1, 1,  2,  2,  3,  3,  3,  3 };
-
-    static int const interiorGregory[8] = { 3, 4,  8, 9,  13, 14,  18, 19 };
-    static int const interiorBezSCol[8] = { 1, 1,  2, 2,   2,  2,   1,  1 };
-    static int const interiorBezTRow[8] = { 1, 1,  1, 1,   2,  2,   2,  2 };
-
-    //
-    //  Bezier basis functions are denoted with B while the rational multipliers for the
-    //  interior points will be denoted G -- so we have B(s), B(t) and G(s,t):
-    //
-    //  Directional Bezier basis functions B at s and t:
-    REAL Bs[4], Bds[4], Bdss[4];
-    REAL Bt[4], Bdt[4], Bdtt[4];
-
-    evalBezierCurve(s, Bs, wDs ? Bds : 0, wDss ? Bdss : 0);
-    evalBezierCurve(t, Bt, wDt ? Bdt : 0, wDtt ? Bdtt : 0);
-
-    //  Rational multipliers G at s and t:
-    REAL sC = 1.0f - s;
-    REAL tC = 1.0f - t;
-
-    //  Use <= here to avoid compiler warnings -- the sums should always be non-negative:
-    REAL df0 = s  + t;   df0 = (df0 <= 0.0f) ? (REAL)1.0f : (1.0f / df0);
-    REAL df1 = sC + t;   df1 = (df1 <= 0.0f) ? (REAL)1.0f : (1.0f / df1);
-    REAL df2 = sC + tC;  df2 = (df2 <= 0.0f) ? (REAL)1.0f : (1.0f / df2);
-    REAL df3 = s  + tC;  df3 = (df3 <= 0.0f) ? (REAL)1.0f : (1.0f / df3);
-
-    //  Make sure the G[i] for pairs of interior points sum to 1 in all cases:
-    REAL G[8] = { s*df0, (1.0f -  s*df0),
-                  t*df1, (1.0f -  t*df1),
-                 sC*df2, (1.0f - sC*df2),
-                 tC*df3, (1.0f - tC*df3) };
-
-    //  Combined weights for boundary and interior points:
-    for (int i = 0; i < 12; ++i) {
-        point[boundaryGregory[i]] = Bs[boundaryBezSCol[i]] * Bt[boundaryBezTRow[i]];
-    }
-    for (int i = 0; i < 8; ++i) {
-        point[interiorGregory[i]] = Bs[interiorBezSCol[i]] * Bt[interiorBezTRow[i]] * G[i];
-    }
-
-    //
-    //  For derivatives, the basis functions for the interior points are rational and ideally
-    //  require appropriate differentiation, i.e. product rule for the combination of B and G
-    //  and the quotient rule for the rational G itself.  As initially proposed by Loop et al
-    //  though, the approximation using the 16 Bezier points arising from the G(s,t) has
-    //  proved adequate (and is what the GPU shaders use) so we continue to use that here.
-    //
-    //  An implementation of the true derivatives is provided and conditionally compiled for
-    //  those that require it, e.g.:
-    //
-    //    dclyde's note: skipping half of the product rule like this does seem to change the
-    //    result a lot in my tests.  This is not a runtime bottleneck for cloth sims anyway
-    //    so I'm just using the accurate version.
-    //
-    if (wDs && wDt) {
-        bool find_second_partials = wDs && wDst && wDtt;
-
-        //  Combined weights for boundary points -- simple tensor products:
-        for (int i = 0; i < 12; ++i) {
-            int iDst = boundaryGregory[i];
-            int tRow = boundaryBezTRow[i];
-            int sCol = boundaryBezSCol[i];
-
-            wDs[iDst] = Bds[sCol] * Bt[tRow];
-            wDt[iDst] = Bdt[tRow] * Bs[sCol];
-
-            if (find_second_partials) {
-                wDss[iDst] = Bdss[sCol] * Bt[tRow];
-                wDst[iDst] = Bds[sCol] * Bdt[tRow];
-                wDtt[iDst] = Bs[sCol] * Bdtt[tRow];
-            }
-        }
-
-#ifndef OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES
-        //  Approximation to the true Gregory derivatives by differentiating the Bezier patch
-        //  unique to the given (s,t), i.e. having F = (g^+ * f^+) + (g^- * f^-) as its four
-        //  interior points:
-        //
-        //  Combined weights for interior points -- tensor products with G+ or G-:
-        for (int i = 0; i < 8; ++i) {
-            int iDst = interiorGregory[i];
-            int tRow = interiorBezTRow[i];
-            int sCol = interiorBezSCol[i];
-
-            wDs[iDst] = Bds[sCol] * Bt[tRow] * G[i];
-            wDt[iDst] = Bdt[tRow] * Bs[sCol] * G[i];
-
-            if (find_second_partials) {
-                wDss[iDst] = Bdss[sCol] * Bt[tRow] * G[i];
-                wDst[iDst] = Bds[sCol] * Bdt[tRow] * G[i];
-                wDtt[iDst] = Bs[sCol] * Bdtt[tRow] * G[i];
-            }
-        }
-#else
-        //  True Gregory derivatives using appropriate differentiation of composite functions:
-        //
-        //  Note that for G(s,t) = N(s,t) / D(s,t), all N' and D' are trivial constants (which
-        //  simplifies things for higher order derivatives).  And while each pair of functions
-        //  G (i.e. the G+ and G- corresponding to points f+ and f-) must sum to 1 to ensure
-        //  Bezier equivalence (when f+ = f-), the pairs of G' must similarly sum to 0.  So we
-        //  can potentially compute only one of the pair and negate the result for the other
-        //  (and with 4 or 8 computations involving these constants, this is all very SIMD
-        //  friendly...) but for now we treat all 8 independently for simplicity.
-        //
-        //REAL N[8] = {   s,     t,      t,     sC,      sC,     tC,      tC,     s };
-        REAL D[8] = {   df0,   df0,    df1,    df1,     df2,    df2,     df3,   df3 };
-
-        static REAL const Nds[8] = {  1.0f,  0.0f,  0.0f, -1.0f, -1.0f,  0.0f,  0.0f,  1.0f };
-        static REAL const Ndt[8] = {  0.0f,  1.0f,  1.0f,  0.0f,  0.0f, -1.0f, -1.0f,  0.0f };
-
-        static REAL const Dds[8] = {  1.0f,  1.0f, -1.0f, -1.0f, -1.0f, -1.0f,  1.0f,  1.0f };
-        static REAL const Ddt[8] = {  1.0f,  1.0f,  1.0f,  1.0f, -1.0f, -1.0f, -1.0f, -1.0f };
-
-        //  Combined weights for interior points -- combinations of B, B', G and G':
-        for (int i = 0; i < 8; ++i) {
-            int iDst = interiorGregory[i];
-            int tRow = interiorBezTRow[i];
-            int sCol = interiorBezSCol[i];
-
-            //  Quotient rule for G' (re-expressed in terms of G to simplify (and D = 1/D)):
-            REAL Gds = (Nds[i] - Dds[i] * G[i]) * D[i];
-            REAL Gdt = (Ndt[i] - Ddt[i] * G[i]) * D[i];
-
-            //  Product rule combining B and B' with G and G':
-            wDs[iDst] = (Bds[sCol] * G[i] + Bs[sCol] * Gds) * Bt[tRow];
-            wDt[iDst] = (Bdt[tRow] * G[i] + Bt[tRow] * Gdt) * Bs[sCol];
-
-            if (find_second_partials) {
-                REAL Dsqr_inv = D[i]*D[i];
-
-                REAL Gdss = 2.0f * Dds[i] * Dsqr_inv * (G[i] * Dds[i] - Nds[i]);
-                REAL Gdst = Dsqr_inv * (2.0f * G[i] * Dds[i] * Ddt[i] - Nds[i] * Ddt[i] - Ndt[i] * Dds[i]);
-                REAL Gdtt = 2.0f * Ddt[i] * Dsqr_inv * (G[i] * Ddt[i] - Ndt[i]);
-
-                wDss[iDst] = (Bdss[sCol] * G[i] + 2.0f * Bds[sCol] * Gds + Bs[sCol] * Gdss) * Bt[tRow];
-                wDst[iDst] =  Bt[tRow] * (Bs[sCol] * Gdst + Bds[sCol] * Gdt) +
-                             Bdt[tRow] * (Bds[sCol] * G[i] + Bs[sCol] * Gds);
-                wDtt[iDst] = (Bdtt[tRow] * G[i] + 2.0f * Bdt[tRow] * Gdt + Bt[tRow] * Gdtt) * Bs[sCol];
-            }
-        }
-#endif
-    }
-    return 20;
-}
-
-
-//
-//  Basis support for triangular patches:
-//
-//  Triangular patches may be evaluated in barycentric (trivariate) or
-//  bivariate form, depending on the complexity of their basis functions.
-//  The parametric orientation for a triangle is as follows:
-//
-//            (1,0)
-//              *
-//             . .
-//          t . 2 .
-//           .     .
-//          . 0   1 .
-//   (0,0) *---------* (1,0)
-//              s
-//
-//  With the origin (0,0) -- barycentric (0,0,w = 1) -- oriented at the
-//  corner V0, the corners V0, V1, and V2 correspond to barycentric
-//  coordinates W, U and V.  This is consistent with GPU tessellation
-//  shaders, but not with many publications where the corners correspond
-//  more intuitively to U, V and W.
-//
-
-
-//
-//  Simple linear triangle:
-//
-template <typename REAL>
-int
-EvalBasisLinearTri(REAL s, REAL t,
-    REAL wP[3], REAL wDs[3], REAL wDt[3],
-    REAL wDss[3], REAL wDst[3], REAL wDtt[3]) {
-
-    if (wP) {
-        wP[0] = 1.0f - s - t;
-        wP[1] = s;
-        wP[2] = t;
-    }
-    if (wDs && wDt) {
-        wDs[0] = -1.0f;
-        wDs[1] =  1.0f;
-        wDs[2] =  0.0f;
-
-        wDt[0] = -1.0f;
-        wDt[1] =  0.0f;
-        wDt[2] =  1.0f;
-
-        if (wDss && wDst && wDtt) {
-            wDss[0] = wDss[1] = wDss[2] = 0.0f;
-            wDst[0] = wDst[1] = wDst[2] = 0.0f;
-            wDtt[0] = wDtt[1] = wDtt[2] = 0.0f;
-        }
-    }
-    return 3;
-}
-
-
-//
-//  Quartic Box spline triangle:
-//
-//  Points for the quartic triangular Box spline (representing regular
-//  patches for Loop subdivision) are as follows:
-//
-//         10-----11
-//         . .   . .
-//        .   . .   .
-//       7-----8-----9
-//      . .   . .   . .
-//     .   . .   . .   .
-//    3-----4-----5-----6
-//     .   . .   . .   .
-//      . .   . .   . /
-//       0-----1-----2
-//
-//  Stam provided the basis functions for these patches in terms of barycentric
-//  coordinates (u,v,w) (see Stam's "Evaluation of Loop Subdivision Surfaces").
-//  Unfortunately, unlike the basis functions for a quartic Bezier triangle,
-//  they are not very compact -- 3 functions involving 9 quartic terms and 3
-//  others involving 15 quartic terms.  (In contrast, the maximum number of
-//  terms in bivariate form is 15.)
-//
-//  Since we also need to differentiate with respect to u and v, we eliminate w
-//  and use the coefficient matrix C multiplied by the set of monomials M
-//  evaluated at (u,v), i.e. the full set of basis functions is:
-//
-//      B(u,v) = C * M(u,v)
-//
-//  where
-//
-//      M(u,v) = { 1, u,v, uu,uv,vv, uuu,uuv,uvv,vvv, uuuu,uuuv,uuvv,uvvv,vvvv }
-//
-//  and the 12 x 15 matrix C is as follows, scaled by a common factor of 1/12:
-//
-//      { 1, -2,-4,    0,  6,  6,   2,  0, -6, -4,  -1, -2, 0,  2,  1 },
-//      { 1,  2,-2,    0, -6,  0,  -4,  0,  6,  2,   2,  4, 0, -2, -1 },
-//      { 0,  0, 0,    0,  0,  0,   2,  0,  0,  0,  -1, -2, 0,  0,  0 },
-//      { 1, -4,-2,    6,  6,  0,  -4, -6,  0,  2,   1,  2, 0, -2, -1 },
-//      { 6,  0, 0,  -12,-12,-12,   8, 12, 12,  8,  -1, -2, 0, -2, -1 },
-//      { 1,  4, 2,    6,  6,  0,  -4, -6,-12, -4,  -1, -2, 0,  4,  2 },
-//      { 0,  0, 0,    0,  0,  0,   0,  0,  0,  0,   1,  2, 0,  0,  0 },
-//      { 1, -2, 2,    0, -6,  0,   2,  6,  0, -4,  -1, -2, 0,  4,  2 },
-//      { 1,  2, 4,    0,  6,  6,  -4,-12, -6, -4,   2,  4, 0, -2, -1 },
-//      { 0,  0, 0,    0,  0,  0,   2,  6,  6,  2,  -1, -2, 0, -2, -1 },
-//      { 0,  0, 0,    0,  0,  0,   0,  0,  0,  2,   0,  0, 0, -2, -1 },
-//      { 0,  0, 0,    0,  0,  0,   0,  0,  0,  0,   0,  0, 0,  2,  1 } 
-//
-//  Differentiating the monomials and refactoring yields a unique set of
-//  coefficients for each of the derivatives, which we multiply by M(u,v).
-//
-namespace {
-    template <typename REAL>
-    inline void
-    evalBivariateMonomialsQuartic(REAL s, REAL t, REAL M[]) {
-
-        M[0] = 1.0;
-
-        M[1] = s;
-        M[2] = t;
-
-        M[3] = s * s;
-        M[4] = s * t;
-        M[5] = t * t;
-
-        M[6] = M[3] * s;
-        M[7] = M[4] * s;
-        M[8] = M[4] * t;
-        M[9] = M[5] * t;
-
-        M[10] = M[6] * s;
-        M[11] = M[7] * s;
-        M[12] = M[3] * M[5];
-        M[13] = M[8] * t;
-        M[14] = M[9] * t;
-    }
-
-    template <typename REAL>
-    void
-    evalBoxSplineTriDerivWeights(REAL const stMonomials[], int ds, int dt, REAL w[]) {
-
-        REAL const * M = stMonomials;
-
-        REAL S = 1.0;
-
-        int totalOrder = ds + dt;
-        if (totalOrder == 0) {
-            S *= (REAL) (1.0 / 12.0);
-
-            w[0]  = S * (1 - 2*M[1] - 4*M[2]          + 6*M[4] + 6*M[5] + 2*M[6]          - 6*M[8] - 4*M[9] -   M[10] - 2*M[11] + 2*M[13] +   M[14]);
-            w[1]  = S * (1 + 2*M[1] - 2*M[2]          - 6*M[4]          - 4*M[6]          + 6*M[8] + 2*M[9] + 2*M[10] + 4*M[11] - 2*M[13] -   M[14]);
-            w[2]  = S * (                                                 2*M[6]                            -   M[10] - 2*M[11]                    );
-            w[3]  = S * (1 - 4*M[1] - 2*M[2] + 6*M[3] + 6*M[4]          - 4*M[6] - 6*M[7]          + 2*M[9] +   M[10] + 2*M[11] - 2*M[13] -   M[14]);
-            w[4]  = S * (6                   -12*M[3] -12*M[4] -12*M[5] + 8*M[6] +12*M[7] +12*M[8] + 8*M[9] -   M[10] - 2*M[11] - 2*M[13] -   M[14]);
-            w[5]  = S * (1 + 4*M[1] + 2*M[2] + 6*M[3] + 6*M[4]          - 4*M[6] - 6*M[7] -12*M[8] - 4*M[9] -   M[10] - 2*M[11] + 4*M[13] + 2*M[14]);
-            w[6]  = S * (                                                                                       M[10] + 2*M[11]                    );
-            w[7]  = S * (1 - 2*M[1] + 2*M[2]          - 6*M[4]          + 2*M[6] + 6*M[7]          - 4*M[9] -   M[10] - 2*M[11] + 4*M[13] + 2*M[14]);
-            w[8]  = S * (1 + 2*M[1] + 4*M[2]          + 6*M[4] + 6*M[5] - 4*M[6] -12*M[7] - 6*M[8] - 4*M[9] + 2*M[10] + 4*M[11] - 2*M[13] -   M[14]);
-            w[9]  = S * (                                                 2*M[6] + 6*M[7] + 6*M[8] + 2*M[9] -   M[10] - 2*M[11] - 2*M[13] -   M[14]);
-            w[10] = S * (                                                                            2*M[9]                     - 2*M[13] -   M[14]);
-            w[11] = S * (                                                                                                         2*M[13] +   M[14]);
-        } else if (totalOrder == 1) {
-            S *= (REAL) (1.0 / 6.0);
-
-            if (ds) {
-                w[0]  = S * (-1          + 3*M[2] + 3*M[3]          - 3*M[5] - 2*M[6] - 3*M[7] +   M[9]);
-                w[1]  = S * ( 1          - 3*M[2] - 6*M[3]          + 3*M[5] + 4*M[6] + 6*M[7] -   M[9]);
-                w[2]  = S * (                       3*M[3]                   - 2*M[6] - 3*M[7]         );
-                w[3]  = S * (-2 + 6*M[1] + 3*M[2] - 6*M[3] - 6*M[4]          + 2*M[6] + 3*M[7] -   M[9]);
-                w[4]  = S * (   -12*M[1] - 6*M[2] +12*M[3] +12*M[4] + 6*M[5] - 2*M[6] - 3*M[7] -   M[9]);
-                w[5]  = S * ( 2 + 6*M[1] + 3*M[2] - 6*M[3] - 6*M[4] - 6*M[5] - 2*M[6] - 3*M[7] + 2*M[9]);
-                w[6]  = S * (                                                  2*M[6] + 3*M[7]         );
-                w[7]  = S * (-1          - 3*M[2] + 3*M[3] + 6*M[4]          - 2*M[6] - 3*M[7] + 2*M[9]);
-                w[8]  = S * ( 1          + 3*M[2] - 6*M[3] -12*M[4] - 3*M[5] + 4*M[6] + 6*M[7] -   M[9]);
-                w[9]  = S * (                       3*M[3] + 6*M[4] + 3*M[5] - 2*M[6] - 3*M[7] -   M[9]);
-                w[10] = S * (                                                                  -   M[9]);
-                w[11] = S * (                                                                      M[9]);
-            } else {
-                w[0]  = S * (-2 + 3*M[1] + 6*M[2]          - 6*M[4] - 6*M[5]  -   M[6] + 3*M[8] + 2*M[9]);
-                w[1]  = S * (-1 - 3*M[1]                   + 6*M[4] + 3*M[5]  + 2*M[6] - 3*M[8] - 2*M[9]);
-                w[2]  = S * (                                                 -   M[6]                  );
-                w[3]  = S * (-1 + 3*M[1]          - 3*M[3]          + 3*M[5]  +   M[6] - 3*M[8] - 2*M[9]);
-                w[4]  = S * (   - 6*M[1] -12*M[2] + 6*M[3] +12*M[4] +12*M[5]  -   M[6] - 3*M[8] - 2*M[9]);
-                w[5]  = S * ( 1 + 3*M[1]          - 3*M[3] -12*M[4] - 6*M[5]  -   M[6] + 6*M[8] + 4*M[9]);
-                w[6]  = S * (                                                 +   M[6]                  );
-                w[7]  = S * ( 1 - 3*M[1]          + 3*M[3]          - 6*M[5]  -   M[6] + 6*M[8] + 4*M[9]);
-                w[8]  = S * ( 2 + 3*M[1] + 6*M[2] - 6*M[3] - 6*M[4] - 6*M[5]  + 2*M[6] - 3*M[8] - 2*M[9]);
-                w[9]  = S * (                     + 3*M[3] + 6*M[4] + 3*M[5]  -   M[6] - 3*M[8] - 2*M[9]);
-                w[10] = S * (                                         3*M[5]           - 3*M[8] - 2*M[9]);
-                w[11] = S * (                                                            3*M[8] + 2*M[9]);
-            }
-        } else if (totalOrder == 2) {
-            if (ds == 2) {
-                w[0]  = S * (   +   M[1]          -   M[3] -   M[4]);
-                w[1]  = S * (   - 2*M[1]          + 2*M[3] + 2*M[4]);
-                w[2]  = S * (       M[1]          -   M[3] -   M[4]);
-                w[3]  = S * ( 1 - 2*M[1] -   M[2] +   M[3] +   M[4]);
-                w[4]  = S * (-2 + 4*M[1] + 2*M[2] -   M[3] -   M[4]);
-                w[5]  = S * ( 1 - 2*M[1] -   M[2] -   M[3] -   M[4]);
-                w[6]  = S * (                         M[3] +   M[4]);
-                w[7]  = S * (   +   M[1] +   M[2] -   M[3] -   M[4]);
-                w[8]  = S * (   - 2*M[1] - 2*M[2] + 2*M[3] + 2*M[4]);
-                w[9]  = S * (       M[1] +   M[2] -   M[3] -   M[4]);
-                w[10] =     0;
-                w[11] =     0;
-            } else if (dt == 2) {
-                w[0]  = S * ( 1 -   M[1] - 2*M[2] +   M[4] +   M[5]);
-                w[1]  = S * (   +   M[1] +   M[2] -   M[4] -   M[5]);
-                w[2]  =     0;
-                w[3]  = S * (            +   M[2] -   M[4] -   M[5]);
-                w[4]  = S * (-2 + 2*M[1] + 4*M[2] -   M[4] -   M[5]);
-                w[5]  = S * (   - 2*M[1] - 2*M[2] + 2*M[4] + 2*M[5]);
-                w[6]  =     0;
-                w[7]  = S * (            - 2*M[2] + 2*M[4] + 2*M[5]);
-                w[8]  = S * ( 1 -   M[1] - 2*M[2] -   M[4] -   M[5]);
-                w[9]  = S * (   +   M[1] +   M[2] -   M[4] -   M[5]);
-                w[10] = S * (                M[2] -   M[4] -   M[5]);
-                w[11] = S * (                         M[4] +   M[5]);
-            } else {
-                S *= (REAL) (1.0 / 2.0);
-
-                w[0]  = S * ( 1          - 2*M[2] -   M[3] +   M[5]);
-                w[1]  = S * (-1          + 2*M[2] + 2*M[3] -   M[5]);
-                w[2]  = S * (                     -   M[3]         );
-                w[3]  = S * ( 1 - 2*M[1]          +   M[3] -   M[5]);
-                w[4]  = S * (-2 + 4*M[1] + 4*M[2] -   M[3] -   M[5]);
-                w[5]  = S * ( 1 - 2*M[1] - 4*M[2] -   M[3] + 2*M[5]);
-                w[6]  = S * (                     +   M[3]         );
-                w[7]  = S * (-1 + 2*M[1]          -   M[3] + 2*M[5]);
-                w[8]  = S * ( 1 - 4*M[1] - 2*M[2] + 2*M[3] -   M[5]);
-                w[9]  = S * (   + 2*M[1] + 2*M[2] -   M[3] -   M[5]);
-                w[10] = S * (                              -   M[5]);
-                w[11] = S * (                                  M[5]);
-            }
-        } else {
-            assert(totalOrder <= 2);
-        }
-    }
-
-    template <typename REAL>
-    void
-    adjustBoxSplineTriBoundaryWeights(int boundaryMask, REAL weights[]) {
-
-        if (boundaryMask == 0) return;
-
-        //
-        //  Determine boundary edges and vertices from the lower 3 and upper
-        //  2 bits of the 5-bit mask:
-        //
-        int upperBits = (boundaryMask >> 3) & 0x3;
-        int lowerBits = boundaryMask & 7;
-
-        int eBits = lowerBits;
-        int vBits = 0;
-
-        if (upperBits == 1) {
-            //  Boundary vertices only:
-            vBits = eBits;
-            eBits = 0;
-        } else if (upperBits == 2) {
-            //  Opposite vertex bit is edge bit rotated one to the right:
-            vBits = ((eBits & 1) << 2) | (eBits >> 1);
-        }
-
-        bool edge0IsBoundary = (eBits & 1) != 0;
-        bool edge1IsBoundary = (eBits & 2) != 0;
-        bool edge2IsBoundary = (eBits & 4) != 0;
-
-        //
-        //  Adjust weights for the 4 boundary points and 3 interior points
-        //  to account for the 3 phantom points adjacent to each
-        //  boundary edge:
-        //
-        if (edge0IsBoundary) {
-            REAL w0 = weights[0];
-            if (edge2IsBoundary) {
-                //  P0 = B1 + (B1 - I1)
-                weights[4] += w0;
-                weights[4] += w0;
-                weights[8] -= w0;
-            } else {
-                //  P0 = B1 + (B0 - I0)
-                weights[4] += w0;
-                weights[3] += w0;
-                weights[7] -= w0;
-            }
-
-            //  P1 = B1 + (B2 - I1)
-            REAL w1 = weights[1];
-            weights[4] += w1;
-            weights[5] += w1;
-            weights[8] -= w1;
-
-            REAL w2 = weights[2];
-            if (edge1IsBoundary) {
-                //  P2 = B2 + (B2 - I1)
-                weights[5] += w2;
-                weights[5] += w2;
-                weights[8] -= w2;
-            } else {
-                //  P2 = B2 + (B3 - I2)
-                weights[5] += w2;
-                weights[6] += w2;
-                weights[9] -= w2;
-            }
-            //  Clear weights for the phantom points:
-            weights[0] = weights[1] = weights[2] = 0.0f;
-        }
-        if (edge1IsBoundary) {
-            REAL w0 = weights[6];
-            if (edge0IsBoundary) {
-                //  P0 = B1 + (B1 - I1)
-                weights[5] += w0;
-                weights[5] += w0;
-                weights[4] -= w0;
-            } else {
-                //  P0 = B1 + (B0 - I0)
-                weights[5] += w0;
-                weights[2] += w0;
-                weights[1] -= w0;
-            }
-
-            //  P1 = B1 + (B2 - I1)
-            REAL w1 = weights[9];
-            weights[5] += w1;
-            weights[8] += w1;
-            weights[4] -= w1;
-
-            REAL w2 = weights[11];
-            if (edge2IsBoundary) {
-                //  P2 = B2 + (B2 - I1)
-                weights[8] += w2;
-                weights[8] += w2;
-                weights[4] -= w2;
-            } else {
-                //  P2 = B2 + (B3 - I2)
-                weights[8]  += w2;
-                weights[10] += w2;
-                weights[7]  -= w2;
-            }
-            //  Clear weights for the phantom points:
-            weights[6] = weights[9] = weights[11] = 0.0f;
-        }
-        if (edge2IsBoundary) {
-            REAL w0 = weights[10];
-            if (edge1IsBoundary) {
-                //  P0 = B1 + (B1 - I1)
-                weights[8] += w0;
-                weights[8] += w0;
-                weights[5] -= w0;
-            } else {
-                //  P0 = B1 + (B0 - I0)
-                weights[8]  += w0;
-                weights[11] += w0;
-                weights[9]  -= w0;
-            }
-
-            //  P1 = B1 + (B2 - I1)
-            REAL w1 = weights[7];
-            weights[8] += w1;
-            weights[4] += w1;
-            weights[5] -= w1;
-
-            REAL w2 = weights[3];
-            if (edge0IsBoundary) {
-                //  P2 = B2 + (B2 - I1)
-                weights[4] += w2;
-                weights[4] += w2;
-                weights[5] -= w2;
-            } else {
-                //  P2 = B2 + (B3 - I2)
-                weights[4] += w2;
-                weights[0] += w2;
-                weights[1] -= w2;
-            }
-            //  Clear weights for the phantom points:
-            weights[10] = weights[7] = weights[3] = 0.0f;
-        }
-
-        //
-        //  Adjust weights for the 3 boundary points and the 2 interior
-        //  points to account for the 2 phantom points adjacent to
-        //  each boundary vertex:
-        //
-        if ((vBits & 1) != 0) {
-            //  P0 = B1 + (B0 - I0)
-            REAL w0 = weights[3];
-            weights[4] += w0;
-            weights[7] += w0;
-            weights[8] -= w0;
-
-            //  P1 = B1 + (B2 - I1)
-            REAL w1 = weights[0];
-            weights[4] += w1;
-            weights[1] += w1;
-            weights[5] -= w1;
-
-            //  Clear weights for the phantom points:
-            weights[3] = weights[0] = 0.0f;
-        }
-        if ((vBits & 2) != 0) {
-            //  P0 = B1 + (B0 - I0)
-            REAL w0 = weights[2];
-            weights[5] += w0;
-            weights[1] += w0;
-            weights[4] -= w0;
-
-            //  P1 = B1 + (B2 - I1)
-            REAL w1 = weights[6];
-            weights[5] += w1;
-            weights[9] += w1;
-            weights[8] -= w1;
-
-            //  Clear weights for the phantom points:
-            weights[2] = weights[6] = 0.0f;
-        }
-        if ((vBits & 4) != 0) {
-            //  P0 = B1 + (B0 - I0)
-            REAL w0 = weights[11];
-            weights[8] += w0;
-            weights[9] += w0;
-            weights[5] -= w0;
-
-            //  P1 = B1 + (B2 - I1)
-            REAL w1 = weights[10];
-            weights[8] += w1;
-            weights[7] += w1;
-            weights[4] -= w1;
-
-            //  Clear weights for the phantom points:
-            weights[11] = weights[10] = 0.0f;
-        }
-    }
-
-    template <typename REAL>
-    void
-    boundBasisBoxSplineTri(int boundary,
-        REAL wP[12], REAL wDs[12], REAL wDt[12],
-        REAL wDss[12], REAL wDst[12], REAL wDtt[12]) {
-
-        if (wP) {
-            adjustBoxSplineTriBoundaryWeights(boundary, wP);
-        }
-        if (wDs && wDt) {
-            adjustBoxSplineTriBoundaryWeights(boundary, wDs);
-            adjustBoxSplineTriBoundaryWeights(boundary, wDt);
-
-            if (wDss && wDst && wDtt) {
-                adjustBoxSplineTriBoundaryWeights(boundary, wDss);
-                adjustBoxSplineTriBoundaryWeights(boundary, wDst);
-                adjustBoxSplineTriBoundaryWeights(boundary, wDtt);
-            }
-        }
-    }
-}  // namespace
-
-template <typename REAL>
-int EvalBasisBoxSplineTri(REAL s, REAL t,
-    REAL wP[12], REAL wDs[12], REAL wDt[12],
-    REAL wDss[12], REAL wDst[12], REAL wDtt[12]) {
-
-    REAL stMonomials[15];
-    evalBivariateMonomialsQuartic(s, t, stMonomials);
-
-    if (wP) {
-        evalBoxSplineTriDerivWeights<REAL>(stMonomials, 0, 0, wP);
-    }
-    if (wDs && wDt) {
-        evalBoxSplineTriDerivWeights(stMonomials, 1, 0, wDs);
-        evalBoxSplineTriDerivWeights(stMonomials, 0, 1, wDt);
-
-        if (wDss && wDst && wDtt) {
-            evalBoxSplineTriDerivWeights(stMonomials, 2, 0, wDss);
-            evalBoxSplineTriDerivWeights(stMonomials, 1, 1, wDst);
-            evalBoxSplineTriDerivWeights(stMonomials, 0, 2, wDtt);
-        }
-    }
-    return 12;
-}
-
-
-//
-//  Quartic Bezier triangle:
-//
-//  The regular patch for Loop subdivision is a quartic triangular Box spline
-//  with cubic boundaries.  So we need a quartic Bezier patch to represent it
-//  faithfully.
-//
-//  The formulae for the 15 quartic basis functions are:
-//
-//                       4!        i   j   k
-//      B   (u,v,w) =  ------- * (u * v * w )
-//       ijk           i!j!k!
-//
-//  for each i + j + k = 4.   The control points (P) and correspondingly
-//  labeled p<i,j,k> are oriented as follows:
-//
-//                    P14                                   p040
-//                P12     P13                           p031    p130
-//            P9      P10     P11                   p022    p121    p220
-//        P5      P6      P7      P8            p013    p112    p211    p310
-//    P0      P1      P2      P3      P4    p004    p103    p202    p301    p400
-//
-namespace {
-    template <typename REAL>
-    void
-    evalBezierTriDerivWeights(REAL s, REAL t, int ds, int dt, REAL wB[]) {
-
-        REAL u  = s;
-        REAL v  = t;
-        REAL w  = 1 - u - v;
-
-        REAL uu = u * u;
-        REAL vv = v * v;
-        REAL ww = w * w;
-
-        REAL uv = u * v;
-        REAL vw = v * w;
-        REAL uw = u * w;
-
-        int totalOrder = ds + dt;
-        if (totalOrder == 0) {
-            wB[0]  =      ww * ww;
-            wB[1]  =  4 * uw * ww;
-            wB[2]  =  6 * uw * uw;
-            wB[3]  =  4 * uw * uu;
-            wB[4]  =      uu * uu;
-            wB[5]  =  4 * vw * ww;
-            wB[6]  = 12 * ww * uv;
-            wB[7]  = 12 * uu * vw;
-            wB[8]  =  4 * uv * uu;
-            wB[9]  =  6 * vw * vw;
-            wB[10] = 12 * vv * uw;
-            wB[11] =  6 * uv * uv;
-            wB[12] =  4 * vw * vv;
-            wB[13] =  4 * uv * vv;
-            wB[14] =      vv * vv;
-        } else if (totalOrder == 1) {
-            if (ds == 1) {
-                wB[0]  =  -4 * ww * w;
-                wB[1]  =   4 * ww * (w - 3 * u);
-                wB[2]  =  12 * uw * (w - u);
-                wB[3]  =   4 * uu * (3 * w - u);
-                wB[4]  =   4 * uu * u;
-                wB[5]  = -12 * vw * w;
-                wB[6]  =  12 * vw * (w - 2 * u);
-                wB[7]  =  12 * uv * (2 * w - u);
-                wB[8]  =  12 * uv * u;
-                wB[9]  = -12 * vv * w;
-                wB[10] =  12 * vv * (w - u);
-                wB[11] =  12 * vv * u;
-                wB[12] =  -4 * vv * v;
-                wB[13] =   4 * vv * v;
-                wB[14] =   0;
-            } else {
-                wB[0]  =  -4 * ww * w;
-                wB[1]  = -12 * ww * u;
-                wB[2]  = -12 * uu * w;
-                wB[3]  =  -4 * uu * u;
-                wB[4]  =   0;
-                wB[5]  =   4 * ww * (w - 3 * v);
-                wB[6]  =  12 * uw * (w - 2 * v);
-                wB[7]  =  12 * uu * (w - v);
-                wB[8]  =   4 * uu * u;
-                wB[9]  =  12 * vw * (w - v);
-                wB[10] =  12 * uv * (2 * w - v);
-                wB[11] =  12 * uv * u;;
-                wB[12] =   4 * vv * (3 * w - v);
-                wB[13] =  12 * vv * u;
-                wB[14] =   4 * vv * v;
-            }
-        } else if (totalOrder == 2) {
-            if (ds == 2) {
-                wB[0]  =  12 * ww;
-                wB[1]  =  24 * (uw - ww);
-                wB[2]  =  12 * (uu - 4 * uw + ww);
-                wB[3]  =  24 * (uw - uu);
-                wB[4]  =  12 * uu;
-                wB[5]  =  24 * vw;
-                wB[6]  =  24 * (uv - 2 * vw);
-                wB[7]  =  24 * (vw - 2 * uv);
-                wB[8]  =  24 * uv;
-                wB[9]  =  12 * vv;
-                wB[10] = -24 * vv;
-                wB[11] =  12 * vv;
-                wB[12] =   0;
-                wB[13] =   0;
-                wB[14] =   0;
-            } else if (dt == 2) {
-                wB[0]  =  12 * ww;
-                wB[1]  =  24 * uw;
-                wB[2]  =  12 * uu;
-                wB[3]  =   0;
-                wB[4]  =   0;
-                wB[5]  =  24 * (vw - ww);
-                wB[6]  =  24 * (uv - 2 * uw);
-                wB[7]  = -24 * uu;
-                wB[8]  =   0;
-                wB[9]  =  12 * (vv - 4 * vw + ww);
-                wB[10] =  24 * (uw - 2 * uv);
-                wB[11] =  12 * uu;
-                wB[12] =  24 * (vw - vv);
-                wB[13] =  24 * uv;
-                wB[14] =  12 * vv;
-            } else {
-                wB[0]  =  12 * ww;
-                wB[3]  = -12 * uu;
-                wB[13] =  12 * vv;
-                wB[11] =  24 * uv;
-                wB[1]  =  24 * uw - wB[0];
-                wB[2]  = -24 * uw - wB[3];
-                wB[5]  =  24 * vw - wB[0];
-                wB[6]  = -24 * vw + wB[11] - wB[1];
-                wB[8]  = - wB[3];
-                wB[7]  = -(wB[11] + wB[2]);
-                wB[9]  =   wB[13] - wB[5] - wB[0];
-                wB[10] = -(wB[9] + wB[11]);
-                wB[12] = - wB[13];
-                wB[4]  =   0;
-                wB[14] =   0;
-            }
-        } else {
-            assert(totalOrder <= 2);
-        }
-    }
-} // end namespace
-
-template <typename REAL>
-int
-EvalBasisBezierTri(REAL s, REAL t,
-    REAL wP[15], REAL wDs[15], REAL wDt[15],
-    REAL wDss[15], REAL wDst[15], REAL wDtt[15]) {
-
-    if (wP) {
-        evalBezierTriDerivWeights<REAL>(s, t, 0, 0, wP);
-    }
-    if (wDs && wDt) {
-        evalBezierTriDerivWeights(s, t, 1, 0, wDs);
-        evalBezierTriDerivWeights(s, t, 0, 1, wDt);
-
-        if (wDss && wDst && wDtt) {
-            evalBezierTriDerivWeights(s, t, 2, 0, wDss);
-            evalBezierTriDerivWeights(s, t, 1, 1, wDst);
-            evalBezierTriDerivWeights(s, t, 0, 2, wDtt);
-        }
-    }
-    return 15;
-}
-
-
-//
-//  Quartic Gregory triangle:
-//
-//  The 18-point quaritic Gregory patch is an extension of the 15-point
-//  quartic Bezier triangle with the 3 interior points of the Bezier patch
-//  replaced with pairs of points (face points -- fi+ and fi-) that are
-//  rationally combined.
-//
-//  The point ordering of Gregory patches deviates considerably from the
-//  BSpline and Bezier patches by grouping the 5 points at each corner and
-//  ordering the groups by corner index.  This is consistent with the cubic
-//  Gregory quad patch.
-//
-//  The 3 additional quartic boundary points are currently appended to these
-//  3 groups of 5 control points.  In contrast to the 5 points associated
-//  with each corner, these 3 points are more associated with the edge
-//  between the corner vertices and are equally weighted between the two.
-//
-namespace {
-    //
-    //  Expanding a set of 15 Bezier basis functions for the 6 (3 pairs) of 
-    //  rational weights for the 18 Gregory basis functions:
-    //
-    template <typename REAL>
-    void
-    convertBezierWeightsToGregory(REAL const wB[15], REAL const rG[6], REAL wG[18]) {
-
-        wG[0]  = wB[0];
-        wG[1]  = wB[1];
-        wG[2]  = wB[5];
-        wG[3]  = wB[6] * rG[0];
-        wG[4]  = wB[6] * rG[1];
-
-        wG[5]  = wB[4];
-        wG[6]  = wB[8];
-        wG[7]  = wB[3];
-        wG[8]  = wB[7] * rG[2];
-        wG[9]  = wB[7] * rG[3];
-
-        wG[10] = wB[14];
-        wG[11] = wB[12];
-        wG[12] = wB[13];
-        wG[13] = wB[10] * rG[4];
-        wG[14] = wB[10] * rG[5];
-
-        wG[15] = wB[2];
-        wG[16] = wB[11];
-        wG[17] = wB[9];
-    }
-} // end namespace
-
-template <typename REAL>
-int
-EvalBasisGregoryTri(REAL s, REAL t,
-    REAL wP[18], REAL wDs[18], REAL wDt[18],
-    REAL wDss[18], REAL wDst[18], REAL wDtt[18]) {
-
-    //
-    //  Bezier basis functions are denoted with B while the rational multipliers for the
-    //  interior points will be denoted G -- so we have B(s,t) and G(s,t) (though we
-    //  switch to barycentric (u,v,w) briefly to compute G)
-    //
-    REAL BP[15], BDs[15], BDt[15], BDss[15], BDst[15], BDtt[15];
-
-    REAL G[6] = { 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f };
-    REAL u = s;
-    REAL v = t;
-    REAL w = 1 - u - v;
-
-    if ((u + v) > 0) {
-        G[0]  = u / (u + v);
-        G[1]  = v / (u + v);
-    }
-    if ((v + w) > 0) {
-        G[2] = v / (v + w);
-        G[3] = w / (v + w);
-    }
-    if ((w + u) > 0) {
-        G[4] = w / (w + u);
-        G[5] = u / (w + u);
-    }
-
-    //
-    //  Compute Bezier basis functions and convert, adjusting interior points:
-    //
-    if (wP) {
-        evalBezierTriDerivWeights<REAL>(s, t, 0, 0, BP);
-        convertBezierWeightsToGregory(BP, G, wP);
-    }
-    if (wDs && wDt) {
-        //  TBD -- ifdef OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES
-
-        evalBezierTriDerivWeights(s, t, 1, 0, BDs);
-        evalBezierTriDerivWeights(s, t, 0, 1, BDt);
-
-        convertBezierWeightsToGregory(BDs, G, wDs);
-        convertBezierWeightsToGregory(BDt, G, wDt);
-
-        if (wDss && wDst && wDtt) {
-            evalBezierTriDerivWeights(s, t, 2, 0, BDss);
-            evalBezierTriDerivWeights(s, t, 1, 1, BDst);
-            evalBezierTriDerivWeights(s, t, 0, 2, BDtt);
-
-            convertBezierWeightsToGregory(BDss, G, wDss);
-            convertBezierWeightsToGregory(BDst, G, wDst);
-            convertBezierWeightsToGregory(BDtt, G, wDtt);
-        }
-    }
-    return 18;
-}
-
-//
-//  Higher level basis evaluation functions that deal with parameterization and
-//  boundary issues (reflected in PatchParam) for all patch types:
-//
-template <typename REAL>
-int
-EvaluatePatchBasisNormalized(int patchType, PatchParam const & param, REAL s, REAL t,
-    REAL wP[], REAL wDs[], REAL wDt[],
-    REAL wDss[], REAL wDst[], REAL wDtt[]) {
-
-    int boundaryMask = param.GetBoundary();
-
-    int nPoints = 0;
-    if (patchType == PatchDescriptor::REGULAR) {
-        nPoints = EvalBasisBSpline(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-        if (boundaryMask) {
-            boundBasisBSpline(boundaryMask, wP, wDs, wDt, wDss, wDst, wDtt);
-        }
-    } else if (patchType == PatchDescriptor::LOOP) {
-        nPoints = EvalBasisBoxSplineTri(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-        if (boundaryMask) {
-            boundBasisBoxSplineTri(boundaryMask, wP, wDs, wDt, wDss, wDst, wDtt);
-        }
-    } else if (patchType == PatchDescriptor::GREGORY_BASIS) {
-        nPoints = EvalBasisGregory(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-    } else if (patchType == PatchDescriptor::GREGORY_TRIANGLE) {
-        nPoints = EvalBasisGregoryTri(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-    } else if (patchType == PatchDescriptor::QUADS) {
-        nPoints = EvalBasisLinear(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-    } else if (patchType == PatchDescriptor::TRIANGLES) {
-        nPoints = EvalBasisLinearTri(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-    } else {
-        assert(0);
-    }
-    return nPoints;
-}
-
-template <typename REAL>
-int
-EvaluatePatchBasis(int patchType, PatchParam const & param, REAL s, REAL t,
-    REAL wP[], REAL wDs[], REAL wDt[],
-    REAL wDss[], REAL wDst[], REAL wDtt[]) {
-
-    REAL derivSign = 1.0f;
-
-    if ((patchType == PatchDescriptor::LOOP) ||
-        (patchType == PatchDescriptor::GREGORY_TRIANGLE) ||
-        (patchType == PatchDescriptor::TRIANGLES)) {
-        param.NormalizeTriangle(s, t);
-        if (param.IsTriangleRotated()) {
-            derivSign = -1.0f;
-        }
-    } else {
-        param.Normalize(s, t);
-    }
-
-    int nPoints = EvaluatePatchBasisNormalized(
-        patchType, param, s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-
-    if (wDs && wDt) {
-        REAL d1Scale = derivSign * (REAL)(1 << param.GetDepth());
-
-        for (int i = 0; i < nPoints; ++i) {
-            wDs[i] *= d1Scale;
-            wDt[i] *= d1Scale;
-        }
-
-        if (wDss && wDst && wDtt) {
-            REAL d2Scale = derivSign * d1Scale * d1Scale;
-
-            for (int i = 0; i < nPoints; ++i) {
-                wDss[i] *= d2Scale;
-                wDst[i] *= d2Scale;
-                wDtt[i] *= d2Scale;
-            }
-        }
-    }
-    return nPoints;
-}
-
-//
-//  Explicit float and double instantiations:
-//
-template int EvaluatePatchBasisNormalized<float>(int patchType, PatchParam const & param,
-    float s, float t, float wP[], float wDs[], float wDt[], float wDss[], float wDst[], float wDtt[]);
-template int EvaluatePatchBasis<float>(int patchType, PatchParam const & param,
-    float s, float t, float wP[], float wDs[], float wDt[], float wDss[], float wDst[], float wDtt[]);
-
-template int EvaluatePatchBasisNormalized<double>(int patchType, PatchParam const & param,
-    double s, double t, double wP[], double wDs[], double wDt[], double wDss[], double wDst[], double wDtt[]);
-template int EvaluatePatchBasis<double>(int patchType, PatchParam const & param,
-    double s, double t, double wP[], double wDs[], double wDt[], double wDss[], double wDst[], double wDtt[]);
-
-//
-//   Most basis evaluation functions are implicitly instantiated above -- Bezier
-//   require explicit instantiation as they are not invoked via a patch type:
-//
-template int EvalBasisBezier<float>(float s, float t,
-    float wP[16], float wDs[16], float wDt[16], float wDss[16], float wDst[16], float wDtt[16]);
-template int EvalBasisBezierTri<float>(float s, float t,
-    float wP[12], float wDs[12], float wDt[12], float wDss[12], float wDst[12], float wDtt[12]);
-
-template int EvalBasisBezier<double>(double s, double t,
-    double wP[16], double wDs[16], double wDt[16], double wDss[16], double wDst[16], double wDtt[16]);
-template int EvalBasisBezierTri<double>(double s, double t,
-    double wP[12], double wDs[12], double wDt[12], double wDss[12], double wDst[12], double wDtt[12]);
-
-} // end namespace internal
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBasis.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBasis.h
deleted file mode 100644
index c5b0b3ab1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBasis.h
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_PATCH_BASIS_H
-#define OPENSUBDIV3_FAR_PATCH_BASIS_H
-
-#include "../version.h"
-
-#include "../far/patchParam.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-namespace internal {
-
-//
-// XXXX barfowl:  These functions are being kept internal while more complete
-// underlying support for all patch types is being worked out.  The set of
-// bases supported here is actually larger than PatchDescriptor::Type -- with
-// Bezier available for internal use.  A new and more complete set of types
-// is warranted (without the non-patch types associated with PatchDescriptor)
-// along with an interface to query properties associated with them.
-//
-// Note that with the high-level functions here that operate on all patch
-// types, it is not strictly necessary to expose the low-level methods in
-// currant usage.
-//
-
-//
-// Low-level basis evaluation (normalized, unscaled) for quad patch types:
-//
-template <typename REAL>
-int EvalBasisLinear(REAL s, REAL t,
-    REAL wP[4], REAL wDs[4] = 0, REAL wDt[4] = 0, REAL wDss[4] = 0, REAL wDst[4] = 0, REAL wDtt[4] = 0);
-
-template <typename REAL>
-int EvalBasisBezier(REAL s, REAL t,
-    REAL wP[16], REAL wDs[16] = 0, REAL wDt[16] = 0, REAL wDss[16] = 0, REAL wDst[16] = 0, REAL wDtt[16] = 0);
-
-template <typename REAL>
-int EvalBasisBSpline(REAL s, REAL t,
-    REAL wP[16], REAL wDs[16] = 0, REAL wDt[16] = 0, REAL wDss[16] = 0, REAL wDst[16] = 0, REAL wDtt[16] = 0);
-
-template <typename REAL>
-int EvalBasisGregory(REAL s, REAL t,
-    REAL wP[20], REAL wDs[20] = 0, REAL wDt[20] = 0, REAL wDss[20] = 0, REAL wDst[20] = 0, REAL wDtt[20] = 0);
-
-//
-// Low-level basis evaluation (normalized, unscaled) for triangular patch types:
-//
-template <typename REAL>
-int EvalBasisLinearTri(REAL s, REAL t,
-    REAL wP[3], REAL wDs[3] = 0, REAL wDt[3] = 0, REAL wDss[3] = 0, REAL wDst[3] = 0, REAL wDtt[3] = 0);
-
-template <typename REAL>
-int EvalBasisBezierTri(REAL s, REAL t,
-    REAL wP[15], REAL wDs[15] = 0, REAL wDt[15] = 0, REAL wDss[15] = 0, REAL wDst[15] = 0, REAL wDtt[15] = 0);
-
-template <typename REAL>
-int EvalBasisBoxSplineTri(REAL s, REAL t,
-    REAL wP[12], REAL wDs[12] = 0, REAL wDt[12] = 0, REAL wDss[12] = 0, REAL wDst[12] = 0, REAL wDtt[12] = 0);
-
-template <typename REAL>
-int EvalBasisGregoryTri(REAL s, REAL t,
-    REAL wP[18], REAL wDs[18] = 0, REAL wDt[18] = 0, REAL wDss[18] = 0, REAL wDst[18] = 0, REAL wDtt[18] = 0);
-
-
-//
-// High-level basis evaluation for all types using PatchParam:
-//
-template <typename REAL>
-int EvaluatePatchBasisNormalized(int patchType, PatchParam const & param, REAL s, REAL t,
-    REAL wP[], REAL wDs[] = 0, REAL wDt[] = 0, REAL wDss[] = 0, REAL wDst[] = 0, REAL wDtt[] = 0);
-
-template <typename REAL>
-int EvaluatePatchBasis(int patchType, PatchParam const & param, REAL s, REAL t,
-    REAL wP[], REAL wDs[] = 0, REAL wDt[] = 0, REAL wDss[] = 0, REAL wDst[] = 0, REAL wDtt[] = 0);
-
-
-} // end namespace internal
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_PATCH_BASIS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBuilder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBuilder.cpp
deleted file mode 100644
index 344106799..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBuilder.cpp
+++ /dev/null
@@ -1,1624 +0,0 @@
-//
-//   Copyright 2018 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../far/patchBuilder.h"
-#include "../far/catmarkPatchBuilder.h"
-#include "../far/loopPatchBuilder.h"
-#include "../far/bilinearPatchBuilder.h"
-#include "../vtr/level.h"
-#include "../vtr/fvarLevel.h"
-#include "../vtr/refinement.h"
-#include "../vtr/stackBuffer.h"
-
-#include <cassert>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-using Vtr::Array;
-using Vtr::ConstArray;
-using Vtr::internal::Level;
-using Vtr::internal::FVarLevel;
-using Vtr::internal::Refinement;
-using Vtr::internal::StackBuffer;
-
-namespace Far {
-
-//
-//  Local helper functions for topology queries:
-//
-namespace {
-
-    //
-    //  Inline methods to encapsulate fast and specific modulus operations.
-    //  The mod-4 case is trivial.  For mod-N, since we are always doing
-    //  the test (i + 1) % N, or (i - 1 + N) % N, the subtraction suffices.
-    //
-    inline int fastMod4(int x) {
-        return x & 0x3;
-    }
-    inline int fastMod3(int x) {
-        static int const mod3Array[] = { 0, 1, 2, 0, 1, 2 };
-        return mod3Array[x];
-    }
-    inline int fastModN(int x, int N) {
-        return (x < N) ? x : (x - N);
-    }
-
-    //
-    //  Local helper functions for identifying the subset of a ring around a
-    //  corner that contributes to a patch -- parameterized by a mask that
-    //  indicates what kind of edge is to delimit the span.
-    //
-    //  Note that the two main methods need both face-verts and face-edges
-    //  for each corner, and that we don't really need the face-index once
-    //  we have them -- consider passing the fVerts and fEdges as arguments
-    //  as they will otherwise be retrieved repeatedly for each corner.
-    //
-    //  (As these mature it is likely they will be moved to Vtr, as a method
-    //  to identify a VSpan would complement the existing method to gather
-    //  the vertex/values associated with it.  The manifold vs non-manifold
-    //  choice would then also be encapsulated -- provided both remain free
-    //  of PatchTable-specific logic.)
-    //
-    inline Level::ETag
-    getSingularEdgeMask(bool includeAllInfSharpEdges = false) {
-
-        Level::ETag eTagMask;
-        eTagMask.clear();
-        eTagMask._boundary = true;
-        eTagMask._nonManifold = true;
-        eTagMask._infSharp = includeAllInfSharpEdges;
-        return eTagMask;
-    }
-
-    inline bool
-    isEdgeSingular(Level const & level, FVarLevel const * fvarLevel,
-                   Index eIndex, Level::ETag eTagMask)
-    {
-        Level::ETag eTag = level.getEdgeTag(eIndex);
-        if (fvarLevel) {
-            eTag = fvarLevel->getEdgeTag(eIndex).combineWithLevelETag(eTag);
-        }
-        return (eTag.getBits() & eTagMask.getBits()) > 0;
-    }
-
-    void
-    identifyManifoldCornerSpan(Level const & level, Index fIndex,
-                               int fCorner, Level::ETag eTagMask,
-                               Level::VSpan & vSpan, int fvc = -1)
-    {
-        FVarLevel const * fvarLevel = (fvc < 0) ? 0 : &level.getFVarLevel(fvc);
-
-        ConstIndexArray fVerts = level.getFaceVertices(fIndex);
-        ConstIndexArray fEdges = level.getFaceEdges(fIndex);
-
-        ConstIndexArray vEdges = level.getVertexEdges(fVerts[fCorner]);
-        int             nEdges = vEdges.size();
-
-        int iLeadingStart  = vEdges.FindIndex(fEdges[fCorner]);
-        int iTrailingStart = fastModN(iLeadingStart + 1, nEdges);
-
-        vSpan.clear();
-        vSpan._numFaces = 1;
-        vSpan._cornerInSpan = 0;
-
-        int iLeading  = iLeadingStart;
-        while (! isEdgeSingular(level, fvarLevel, vEdges[iLeading], eTagMask)) {
-            ++vSpan._numFaces;
-            ++vSpan._cornerInSpan;
-            iLeading = fastModN(iLeading + nEdges - 1, nEdges);
-            if (iLeading == iTrailingStart) break;
-        }
-
-        int iTrailing = iTrailingStart;
-        if (iTrailing != iLeading) {
-            while (!isEdgeSingular(level, fvarLevel, vEdges[iTrailing], eTagMask)) {
-                ++vSpan._numFaces;
-                iTrailing = fastModN(iTrailing + 1, nEdges);
-                if (iTrailing == iLeadingStart) break;
-            }
-        }
-        vSpan._startFace = (LocalIndex) iLeading;
-    }
-
-    void
-    identifyNonManifoldCornerSpan(Level const & level, Index fIndex,
-                                  int fCorner, Level::ETag eTagMask,
-                                  Level::VSpan & vSpan, int fvc = -1)
-    {
-        FVarLevel const * fvarLevel = (fvc < 0) ? 0 : &level.getFVarLevel(fvc);
-
-        ConstIndexArray fEdges = level.getFaceEdges(fIndex);
-
-        Index eLeadingStart  = fEdges[fCorner];
-        Index eTrailingStart = fEdges[(fCorner + fEdges.size() - 1) % fEdges.size()];
-
-        vSpan.clear();
-        vSpan._numFaces = 1;
-        vSpan._cornerInSpan = 0;
-
-        Index startFace   = fIndex;
-        int   startCorner = fCorner;
-
-        //  Traverse clockwise to find the leading edge of the span -- keeping
-        //  track of the starting face and corner to use later:
-        Index fLeading = fIndex;
-        Index eLeading = eLeadingStart;
-        while (!isEdgeSingular(level, fvarLevel, eLeading, eTagMask)) {
-            ++vSpan._numFaces;
-            ++vSpan._cornerInSpan;
-
-            //  Identify the face opposite the current leading edge, identify
-            //  the edges of the next face, and then the next leading edge:
-            //
-            ConstIndexArray eFaces = level.getEdgeFaces(eLeading);
-            assert(eFaces.size() == 2);
-            fLeading = (eFaces[0] == fLeading) ? eFaces[1] : eFaces[0];
-            fEdges = level.getFaceEdges(fLeading);
-
-            startFace   = fLeading;
-            startCorner = (fEdges.FindIndex(eLeading) + 1) % fEdges.size();
-
-            eLeading = fEdges[startCorner];
-            if (eLeading == eTrailingStart) {
-                vSpan._periodic = !isEdgeSingular(level, fvarLevel, eLeading, eTagMask);
-                break;
-            }
-        }
-
-        //  Traverse counter-clockwise to find the trailing edge of the span (unless
-        //  the above traversal reached where it started):
-        Index fTrailing = fIndex;
-        Index eTrailing = eTrailingStart;
-        if (eTrailing != eLeading) {
-            while (!isEdgeSingular(level, fvarLevel, eTrailing, eTagMask)) {
-                ++vSpan._numFaces;
-
-                //  Identify the face opposite the current trailing edge, identify
-                //  the edges of the next face, and then the next trailing edge:
-                //
-                ConstIndexArray eFaces = level.getEdgeFaces(eTrailing);
-                assert(eFaces.size() == 2);
-                fTrailing = (eFaces[0] == fTrailing) ? eFaces[1] : eFaces[0];
-                fEdges = level.getFaceEdges(fTrailing);
-
-                eTrailing = fEdges[(fEdges.FindIndex(eTrailing) + fEdges.size() - 1) % fEdges.size()];
-                if (eTrailing == eLeadingStart) {
-                    vSpan._periodic = !isEdgeSingular(level, fvarLevel, eTrailing, eTagMask);
-                    break;
-                }
-            }
-        }
-
-        //  Identify the span's starting point relative to the incident components
-        //  of the vertex, using the start face and corner of the leading edge:
-        //
-        Index vIndex = level.getFaceVertices(fIndex)[fCorner];
-
-        ConstIndexArray      vFaces   = level.getVertexFaces(vIndex);
-        ConstLocalIndexArray vInFaces = level.getVertexFaceLocalIndices(vIndex);
-
-        vSpan._startFace = (LocalIndex) vFaces.size();
-        for (int i = 0; i < vFaces.size(); ++i) {
-            if ((vFaces[i] == startFace) && (vInFaces[i] == startCorner)) {
-                vSpan._startFace = (LocalIndex) i;
-                break;
-            }
-        }
-        assert(vSpan._startFace < vFaces.size());
-    }
-
-    //  Simple conveniences for the span search functions:
-    inline int
-    countManifoldCornerSpan(Level const & level, Index fIndex, int fCorner,
-                            Level::ETag eTagMask, int fvc = -1)
-    {
-        Level::VSpan vSpan;
-        identifyManifoldCornerSpan(level, fIndex, fCorner, eTagMask, vSpan, fvc);
-        return vSpan._numFaces;
-    }
-    inline int
-    countNonManifoldCornerSpan(Level const & level, Index fIndex, int fCorner,
-                               Level::ETag eTagMask, int fvc = -1)
-    {
-        Level::VSpan vSpan;
-        identifyNonManifoldCornerSpan(level, fIndex, fCorner, eTagMask, vSpan, fvc);
-        return vSpan._numFaces;
-    }
-
-
-    //
-    //  Gathering the one-ring of vertices from triangles surrounding a vertex:
-    //      - the neighborhood of the vertex is assumed to be tri-regular (manifold)
-    //
-    //  Ordering of resulting vertices:
-    //      The surrounding one-ring follows the ordering of the incident faces.  For each
-    //  incident tri, the vertex opposite its leading edge is added.  If the vertex is on a
-    //  boundary, a second vertex on the boundary edge will be contributed from the last face.
-    //
-    int
-    gatherTriRegularRingAroundVertex(Level const& level,
-        Index vIndex, int ringPoints[], int fvarChannel) {
-
-        ConstIndexArray vEdges = level.getVertexEdges(vIndex);
-
-        ConstIndexArray vFaces = level.getVertexFaces(vIndex);
-        ConstLocalIndexArray vInFaces = level.getVertexFaceLocalIndices(vIndex);
-
-        bool isBoundary = (vEdges.size() > vFaces.size());
-
-        int ringIndex = 0;
-        for (int i = 0; i < vFaces.size(); ++i) {
-            //
-            //  For each tri, we want the the vertex at the end of the leading edge:
-            //
-            ConstIndexArray fPoints = (fvarChannel < 0)
-                                    ? level.getFaceVertices(vFaces[i])
-                                    : level.getFaceFVarValues(vFaces[i], fvarChannel);
-
-            int vInThisFace = vInFaces[i];
-
-            ringPoints[ringIndex++] = fPoints[fastMod3(vInThisFace + 1)];
-
-            if (isBoundary && (i == (vFaces.size() - 1))) {
-                ringPoints[ringIndex++] = fPoints[fastMod3(vInThisFace + 2)];
-            }
-        }
-        return ringIndex;
-    }
-
-    int
-    gatherRegularPartialRingAroundVertex(Level const& level,
-        Index vIndex, Level::VSpan const & span, int ringPoints[], int fvarChannel) {
-
-        bool isManifold = !level.isVertexNonManifold(vIndex);
-
-        ConstIndexArray      vFaces   = level.getVertexFaces(vIndex);
-        ConstLocalIndexArray vInFaces = level.getVertexFaceLocalIndices(vIndex);
-
-        int nFaces    = span._numFaces;
-        int startFace = span._startFace;
-
-        Index nextFace    = vFaces[startFace];
-        int   vInNextFace = vInFaces[startFace];
-
-        int ringIndex = 0;
-        for (int i = 0; i < nFaces; ++i) {
-            Index thisFace    = nextFace;
-            int   vInThisFace = vInNextFace;
-
-            ConstIndexArray fPoints = (fvarChannel < 0)
-                                    ? level.getFaceVertices(thisFace)
-                                    : level.getFaceFVarValues(thisFace, fvarChannel);
-
-            bool isQuad = (fPoints.size() == 4);
-            if (isQuad) {
-                ringPoints[ringIndex++] = fPoints[fastMod4(vInThisFace + 1)];
-                ringPoints[ringIndex++] = fPoints[fastMod4(vInThisFace + 2)];
-            } else {
-                ringPoints[ringIndex++] = fPoints[fastMod3(vInThisFace + 1)];
-            }
-
-            if (i == (nFaces - 1)) {
-                if (!span._periodic) {
-                    if (isQuad) {
-                        ringPoints[ringIndex++] = fPoints[fastMod4(vInThisFace + 3)];
-                    } else {
-                        ringPoints[ringIndex++] = fPoints[fastMod3(vInThisFace + 2)];
-                    }
-                }
-            } else if (isManifold) {
-                int iNext = fastModN(startFace + i + 1, vFaces.size());
-
-                nextFace    = vFaces[iNext];
-                vInNextFace = vInFaces[iNext];
-            } else {
-                int nextInThisFace = fastModN(vInThisFace + fPoints.size() - 1, fPoints.size());
-
-                Index nextEdge = level.getFaceEdges(thisFace)[nextInThisFace];
-                ConstIndexArray eFaces = level.getEdgeFaces(nextEdge);
-
-                nextFace    = (eFaces[0] == thisFace) ? eFaces[1] : eFaces[0];
-                vInNextFace = level.getFaceEdges(nextFace).FindIndex(nextEdge);
-            }
-        }
-        return ringIndex;
-    }
-
-    //
-    //  Functions to encode/decode the 5-bit boundary mask for a triangular patch
-    //  from the two 3-bit boundary vertex and bounday edge masks.  When referring
-    //  to a "boundary vertex" in the encoded bits, we are referring to a vertex on
-    //  a boundary while its incident edges of the triangle are not boundaries --
-    //  topologically distinct from a vertex at the end of a boundary edge.
-    //
-    //  The 5-bit encoding is as follows:
-    //
-    //      - the upper 2 bits indicate how to interpret the lower 3 bits:
-    //          0 - as boundary edges only (all boundary vertices are implicit)
-    //          1 - as "boundary vertices" only (no boundary edges)
-    //          2 - a single boundary edge with opposite "boundary vertex"
-    //
-    //      - the lower 3 bits are set according to boundary features present
-    //
-    //  There are a total of 18 possible boundary configurations:
-    //
-    //      - no boundaries at all (1 case)
-    //      - one boundary edge (3 cases)
-    //      - two boundary edges (3 cases)
-    //      - three boundary edges (1 case)
-    //      - one boundary vertex (3 cases)
-    //      - two boundary vertices (3 cases)
-    //      - three boundarey vertices (1 case)
-    //      - one boundary edge with opposite boundary vertex (3 cases)
-    //
-    inline int unpackTriBoundaryMaskLower(int mask) { return mask & 0x7; }
-    inline int unpackTriBoundaryMaskUpper(int mask) { return (mask >> 3) & 0x3; }
-
-    inline int packTriBoundaryMask(int upper, int lower) { return (upper << 3) | lower; }
-
-    int
-    encodeTriBoundaryMask(int eBits, int vBits)
-    {
-        int upperBits = 0;
-        int lowerBits = eBits;
-
-        if (vBits) {
-            if (eBits == 0) {
-                upperBits = 1;
-                lowerBits = vBits;
-            } else if ((vBits == 7) && ((eBits == 1) || (eBits == 2) || (eBits == 4))) {
-                upperBits = 2;
-                lowerBits = eBits;
-            }
-        }
-        return packTriBoundaryMask(upperBits, lowerBits);
-    }
-    void
-    decodeTriBoundaryMask(int mask, int & eBits, int & vBits)
-    {
-        static int const eBitsToVBits[] = { 0, 3, 6, 7, 5, 7, 7, 7 };
-
-        int lowerBits = unpackTriBoundaryMaskLower(mask);
-        int upperBits = unpackTriBoundaryMaskUpper(mask);
-
-        switch (upperBits) {
-        case 0:
-            eBits = lowerBits;
-            vBits = eBitsToVBits[eBits];
-            break;
-        case 1:
-            eBits = 0;
-            vBits = lowerBits;
-            break;
-        case 2:
-            eBits = lowerBits;
-            vBits = 0x7;
-            break;
-        }
-    }
-
-    inline Index
-    getNextFaceInVertFaces(Level const & level, int thisFaceInVFaces,
-                           ConstIndexArray const & vFaces,
-                           ConstLocalIndexArray const & vInFaces,
-                           bool manifold, int & vInNextFace) {
-
-        Index nextFace;
-        if (manifold) {
-            int nextFaceInVFaces = fastModN(thisFaceInVFaces + 1, vFaces.size());
-
-            nextFace    = vFaces[nextFaceInVFaces];
-            vInNextFace = vInFaces[nextFaceInVFaces];
-        } else {
-            Index thisFace    = vFaces[thisFaceInVFaces];
-            int   vInThisFace = vInFaces[thisFaceInVFaces];
-
-            ConstIndexArray fEdges = level.getFaceEdges(thisFace);
-
-            Index nextEdge = fEdges[fastModN((vInThisFace + fEdges.size() - 1), fEdges.size())];
-
-            ConstIndexArray eFaces = level.getEdgeFaces(nextEdge);
-            assert(eFaces.size() == 2);
-
-            nextFace = (eFaces[0] == thisFace) ? eFaces[1] : eFaces[0];
-
-            int edgeInNextFace = level.getFaceEdges(nextFace).FindIndex(nextEdge);
-
-            vInNextFace = edgeInNextFace;
-        }
-        return nextFace;
-    }
-    inline Index
-    getPrevFaceInVertFaces(Level const & level, int thisFaceInVFaces,
-                           ConstIndexArray const & vFaces,
-                           ConstLocalIndexArray const & vInFaces,
-                           bool manifold, int & vInPrevFace) {
-
-        Index prevFace;
-        if (manifold) {
-            int prevFaceInVFaces = (thisFaceInVFaces ? thisFaceInVFaces : vFaces.size()) - 1;
-
-            prevFace    = vFaces[prevFaceInVFaces];
-            vInPrevFace = vInFaces[prevFaceInVFaces];
-        } else {
-            Index thisFace    = vFaces[thisFaceInVFaces];
-            int   vInThisFace = vInFaces[thisFaceInVFaces];
-
-            ConstIndexArray fEdges = level.getFaceEdges(thisFace);
-
-            Index prevEdge = fEdges[vInThisFace];
-
-            ConstIndexArray eFaces = level.getEdgeFaces(prevEdge);
-            assert(eFaces.size() == 2);
-
-            prevFace = (eFaces[0] == thisFace) ? eFaces[1] : eFaces[0];
-
-            int edgeInPrevFace = level.getFaceEdges(prevFace).FindIndex(prevEdge);
-
-            vInPrevFace = fastModN(edgeInPrevFace + 1, fEdges.size());
-        }
-        return prevFace;
-    }
-
-    inline ConstIndexArray
-    getFacePoints(Level const& level, Index faceIndex, int fvarChannel)
-    {
-        return (fvarChannel < 0) ? level.getFaceVertices(faceIndex)
-                                 : level.getFaceFVarValues(faceIndex, fvarChannel);
-    }
-
-} // namespace anon
-
-
-//
-//  Factory method and constructor:
-//
-PatchBuilder*
-PatchBuilder::Create(TopologyRefiner const& refiner, Options const& options) {
-
-    switch (refiner.GetSchemeType()) {
-    case Sdc::SCHEME_BILINEAR:
-        return new BilinearPatchBuilder(refiner, options);
-    case Sdc::SCHEME_CATMARK:
-        return new CatmarkPatchBuilder(refiner, options);
-    case Sdc::SCHEME_LOOP:
-        return new LoopPatchBuilder(refiner, options);
-    }
-    assert("Unrecognized Sdc::SchemeType for PatchBuilder construction" == 0);
-    return 0;
-}
-
-PatchBuilder::PatchBuilder(
-    TopologyRefiner const& refiner, Options const& options) :
-        _refiner(refiner), _options(options) {
-
-    //
-    //  Initialize members with properties of the subdivision scheme and patch
-    //  choices for quick retrieval:
-    //
-    _schemeType        = refiner.GetSchemeType();
-    _schemeRegFaceSize = Sdc::SchemeTypeTraits::GetRegularFaceSize(_schemeType);
-    _schemeIsLinear    = Sdc::SchemeTypeTraits::GetLocalNeighborhoodSize(_schemeType) == 0;
-
-    //  Initialization of members involving patch types is deferred to the
-    //  subclass for the scheme
-}
-
-PatchBuilder::~PatchBuilder() {
-}
-
-
-//
-//  Topology inspections methods for a particular face in the hierarchy:
-//
-bool
-PatchBuilder::IsFaceAPatch(int levelIndex, Index faceIndex) const {
-
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    //  Faces tagged as holes are not patches (no limit surface)
-    if (_refiner.HasHoles() && level.isFaceHole(faceIndex)) return false;
-
-    //  Base faces are patches unless an irregular face or incident one:
-    if (levelIndex == 0) {
-        if (_schemeIsLinear) {
-            return level.getFaceVertices(faceIndex).size() == _schemeRegFaceSize;
-        } else {
-            return !level.getFaceCompositeVTag(faceIndex)._incidIrregFace;
-        }
-    }
-    
-    //  Refined faces are patches unless "incomplete", i.e. they exist solely to
-    //  support an adjacent patch (can only use the more commonly used combined
-    //  VTag for all corners for quads -- need a Refinement tag for tris):
-    if (_schemeRegFaceSize == 4) {
-        return !level.getFaceCompositeVTag(faceIndex)._incomplete;
-    } else {
-        Refinement const & refinement = _refiner.getRefinement(levelIndex - 1);
-        return !refinement.getChildFaceTag(faceIndex)._incomplete;
-    }
-}
-
-bool
-PatchBuilder::IsFaceALeaf(int levelIndex, Index faceIndex) const {
-
-    //  All faces in the last level are leaves
-    if (levelIndex < _refiner.GetMaxLevel()) {
-        //  Faces selected for further refinement are not leaves
-        if (_refiner.getRefinement(levelIndex).
-                        getParentFaceSparseTag(faceIndex)._selected) {
-            return false;
-        }
-    }
-    return true;
-}
-
-bool
-PatchBuilder::IsPatchRegular(int levelIndex, Index faceIndex, int fvc) const {
-
-    if (_schemeIsLinear) {
-        //  The previous face-is-a-patch test precludes an irregular patch
-        return true;
-    }
-
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    //
-    //  Retrieve individual VTags for the four corners and combine, as we may
-    //  need the individual VTags for closer inspection.
-    //
-    //  Immediately return regular status based on xordinary bit if completely
-    //  smooth at all corners, i.e. no inf-sharp corners or boundaries present
-    //  (which also rules out the presence of non-manifold vertices)
-    //
-    Level::VTag vTags[4];
-    level.getFaceVTags(faceIndex, vTags, fvc);
-
-    Level::VTag fCompVTag = Level::VTag::BitwiseOr(vTags, _schemeRegFaceSize);
-
-    if (!fCompVTag._infSharp && !fCompVTag._infSharpEdges) {
-        return !fCompVTag._xordinary;
-    }
-
-    //
-    //  Irregular features will exist at corners that are either non-manifold,
-    //  extra-ordinary, or that are tagged with inf-sharp irregularities (may
-    //  be regular even if extra-ordinary or vice versa -- depending on the
-    //  specific inf-sharp edges present around the vertex).
-    //
-    //  Build a bit-mask for the irregular features -- if the composite tag
-    //  has no irregular features, we can immediately return.
-    //
-    bool testInfSharpFeatures = !_options.approxInfSharpWithSmooth;
-
-    Level::VTag irregFeatureTag(0);
-    irregFeatureTag._nonManifold  = true;
-    irregFeatureTag._xordinary    = true;
-    irregFeatureTag._infIrregular = testInfSharpFeatures;
-
-    int irregFeatureMask = irregFeatureTag.getBits(); 
-
-    if ((fCompVTag.getBits() & irregFeatureMask) == 0) {
-        return true;
-    }
-
-    //
-    //  If the irregular feature is isolated, we can use the combined corner
-    //  tags to determine regularity -- unless specified options require a
-    //  closer inspection of the single irregular feature:
-    //
-    bool mayHaveIrregFaces  = _refiner._hasIrregFaces;
-    int  needsExtraIsoLevel = fCompVTag._xordinary && mayHaveIrregFaces;
-
-    bool featureIsIsolated = levelIndex > needsExtraIsoLevel;
-    if (featureIsIsolated) {
-        bool featureRequiresFurtherInspection = fCompVTag._nonManifold ||
-                (_options.approxSmoothCornerWithSharp &&
-                        fCompVTag._xordinary && fCompVTag._boundary) ||
-                (testInfSharpFeatures &&
-                        fCompVTag._infIrregular && fCompVTag._infSharpEdges);
-
-        if (!featureRequiresFurtherInspection) {
-            if (testInfSharpFeatures) {
-                return !fCompVTag._infIrregular;
-            } else {
-                return !fCompVTag._xordinary;
-            }
-        }
-    }
-    
-    //
-    //  Inspect all or the single isolated corner.  Use the irregular feature
-    //  mask to quickly skip regular corners and return on the first irregular
-    //  feature encountered:
-    //
-    int nRegBoundaryFaces = (_schemeRegFaceSize == 4) ? 2 : 3;
-
-    for (int i = 0; i < _schemeRegFaceSize; ++i) {
-        Level::VTag vTag = vTags[i];
-
-        if ((vTag.getBits() & irregFeatureMask) == 0) continue;
-
-        if (vTag._nonManifold) {
-            //  Identify the span containing the face and assess:
-            int nSpanFaces = countNonManifoldCornerSpan(level, faceIndex, i,
-                getSingularEdgeMask(testInfSharpFeatures), fvc);
-            if (vTag._infSharp) {
-                if (nSpanFaces != 1) return false;
-            } else {
-                if (nSpanFaces != (nRegBoundaryFaces)) return false;
-            }
-            continue;
-        }
-
-        if (vTag._xordinary) {
-            //  A smooth xordinary vertex is always irregular
-            if (!vTag._infSharpEdges) return false;
-
-            //  A smooth corner vertex may be interpreted as regular:
-            if (_options.approxSmoothCornerWithSharp &&
-                    vTag._boundary && !vTag._infSharp) {
-                Level::ETag eTags[4];
-                level.getFaceETags(faceIndex, eTags, fvc);
-                int iPrev = i ? (i - 1) : (_schemeRegFaceSize - 1);
-                if (eTags[i]._boundary && eTags[iPrev]._boundary) {
-                    continue;
-                }
-            }
-
-            //  All others irregular, unless further inspecting inf-sharp
-            if (!testInfSharpFeatures) return false;
-        }
-
-        if (vTag._infIrregular) {
-            //  Inf-sharp vertex with no inf-sharp edges:
-            if (!vTag._infSharpEdges) return false;
-
-            //  Irregular boundary crease:
-            if (vTag._infSharpCrease && vTag._boundary) return false;
-
-            //  Identify the span containing the face and assess:
-            int nSpanFaces = countManifoldCornerSpan(level, faceIndex, i,
-                getSingularEdgeMask(true), fvc);
-            if (vTag._infSharpCrease) {
-                if (nSpanFaces != (nRegBoundaryFaces)) return false;
-            } else {
-                if (nSpanFaces != 1) return false;
-            }
-        }
-    }
-    return true;
-}
-
-int
-PatchBuilder::GetRegularPatchBoundaryMask(int levelIndex, Index faceIndex,
-    int fvarChannel) const {
-
-    if (_schemeIsLinear) {
-        //  Boundaries for patches not dependent on the 1-ring are ignored
-        return 0;
-    }
-
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    //  Gather tags for the four corners and edges.  Regardless of the
-    //  options for treating non-manifold or inf-sharp patches, for a
-    //  regular patch we can infer all that we need from these tags:
-    //
-    Level::VTag vTags[4];
-    Level::ETag eTags[4];
-
-    level.getFaceVTags(faceIndex, vTags, fvarChannel);
-
-    Level::VTag fTag = Level::VTag::BitwiseOr(vTags, _schemeRegFaceSize);
-    if (!fTag._infSharpEdges) {
-        return 0;
-    }
-
-    level.getFaceETags(faceIndex, eTags, fvarChannel);
-
-    //
-    //  Test the edge tags for boundary features.  For quads this is
-    //  sufficient, so return the edge bits.
-    //
-    bool testInfSharpFeatures = !_options.approxInfSharpWithSmooth;
-
-    Level::ETag eFeatureTag(0);
-    eFeatureTag._boundary    = true;
-    eFeatureTag._infSharp    = testInfSharpFeatures;
-    eFeatureTag._nonManifold = true;
-
-    int eFeatureMask = eFeatureTag.getBits();
-
-    int eBits = (((eTags[0].getBits() & eFeatureMask) != 0) << 0) |
-                (((eTags[1].getBits() & eFeatureMask) != 0) << 1) |
-                (((eTags[2].getBits() & eFeatureMask) != 0) << 2);
-    if (_schemeRegFaceSize == 4) {
-        eBits |= (((eTags[3].getBits() & eFeatureMask) != 0) << 3);
-        return eBits;
-    }
-
-    //
-    //  For triangles, test the vertex tags for boundary features (we
-    //  can have boundary vertices with no boundary edges) and return
-    //  the encoded result of the two sets of 3 bits:
-    //
-    Level::VTag vFeatureTag(0);
-    vFeatureTag._boundary      = true;
-    vFeatureTag._infSharpEdges = testInfSharpFeatures;
-    vFeatureTag._nonManifold   = true;
-
-    int vFeatureMask = vFeatureTag.getBits();
-
-    int vBits = (((vTags[0].getBits() & vFeatureMask) != 0) << 0) |
-                (((vTags[1].getBits() & vFeatureMask) != 0) << 1) |
-                (((vTags[2].getBits() & vFeatureMask) != 0) << 2);
-
-    return (eBits || vBits) ? encodeTriBoundaryMask(eBits, vBits) : 0;
-}
-
-void
-PatchBuilder::GetIrregularPatchCornerSpans(int levelIndex, Index faceIndex,
-        Level::VSpan cornerSpans[4], int fvarChannel) const {
-
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    //  Retrieve tags and identify other information for the corner vertices:
-    Level::VTag vTags[4];
-    level.getFaceVTags(faceIndex, vTags, fvarChannel);
-
-    FVarLevel::ValueTag fvarTags[4];
-    if (fvarChannel >= 0) {
-        level.getFVarLevel(fvarChannel).getFaceValueTags(faceIndex, fvarTags);
-    }
-
-    //
-    //  For each corner, identify the span of interest around the vertex,
-    //  using the complete neighborhood when possible (which does not require
-    //  a search):
-    //
-    bool testInfSharpFeatures = !_options.approxInfSharpWithSmooth;
-
-    Level::ETag singularEdgeMask = getSingularEdgeMask(testInfSharpFeatures);
-
-    for (int i = 0; i < _schemeRegFaceSize; ++i) {
-        Level::VTag vTag = vTags[i];
-
-        bool isNonManifold = vTag._nonManifold;
-
-        bool isFVarMisMatch = (fvarChannel >= 0) && fvarTags[i]._mismatch;
-
-        bool testInfSharpEdges = testInfSharpFeatures &&
-                vTag._infSharpEdges && (vTag._rule != Sdc::Crease::RULE_DART);
-
-        //
-        //  Identify a discontinuity in the one-ring, otherwise use an
-        //  unassigned (cleared) span to indicate use of the full ring:
-        //
-        if (testInfSharpEdges || isFVarMisMatch || isNonManifold) {
-            if (isNonManifold) {
-                identifyNonManifoldCornerSpan(level, faceIndex,
-                        i, singularEdgeMask, cornerSpans[i], fvarChannel);
-            } else {
-                identifyManifoldCornerSpan(level, faceIndex,
-                        i, singularEdgeMask, cornerSpans[i], fvarChannel);
-            }
-        } else {
-            cornerSpans[i].clear();
-        }
-
-        //  Sharpen the span if a corner or subject to inf-sharp features:
-        if (vTag._corner) {
-            //  Corners tagged in FVar space need additional qualification:
-            if (isFVarMisMatch) {
-                cornerSpans[i]._sharp = (cornerSpans[i]._numFaces == 1) || isNonManifold;
-            } else {
-                cornerSpans[i]._sharp = true;
-            }
-        } else if (isNonManifold) {
-            cornerSpans[i]._sharp = vTag._infSharp;
-        } else if (testInfSharpFeatures) {
-            cornerSpans[i]._sharp = testInfSharpEdges
-                    ? !vTag._infSharpCrease : vTag._infSharp;
-        }
-
-        //  Legacy option -- reinterpret a smooth corner as sharp:
-        bool smoothCorner = !cornerSpans[i]._sharp;
-        if (smoothCorner && _options.approxSmoothCornerWithSharp && vTag._xordinary &&
-                vTag._boundary && !vTag._infSharp && !vTag._nonManifold) {
-            int nFaces = cornerSpans[i].isAssigned()
-                ? cornerSpans[i]._numFaces
-                : level.getVertexFaces(level.getFaceVertices(faceIndex)[i]).size();
-            cornerSpans[i]._sharp = (nFaces == 1);
-        }
-    }
-}
-
-int
-PatchBuilder::getRegularFacePoints(int levelIndex, Index faceIndex,
-        Index patchPoints[], int fvarChannel) const {
-
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    ConstIndexArray facePoints = (fvarChannel < 0)
-                               ? level.getFaceVertices(faceIndex)
-                               : level.getFaceFVarValues(faceIndex, fvarChannel);
-
-    for (int i = 0; i < facePoints.size(); ++i) {
-        patchPoints[i] = facePoints[i];
-    }
-    return facePoints.size();
-}
-
-int
-PatchBuilder::getQuadRegularPatchPoints(int levelIndex, Index faceIndex,
-        int regBoundaryMask, Index patchPoints[],
-        int fvarChannel) const {
-
-    if (regBoundaryMask < 0) {
-        regBoundaryMask = GetRegularPatchBoundaryMask(levelIndex, faceIndex);
-    }
-    bool interiorPatch = (regBoundaryMask == 0);
-
-    static int const patchPointsPerCorner[4][4] = { {  5,  4,  0,  1 },
-                                                    {  6,  2,  3,  7 },
-                                                    { 10, 11, 15, 14 },
-                                                    {  9, 13, 12,  8 } };
-
-    int eMask = regBoundaryMask;
-
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    ConstIndexArray fVerts  = level.getFaceVertices(faceIndex);
-    ConstIndexArray fPoints = getFacePoints(level, faceIndex, fvarChannel);
-
-    Index boundaryPoint = INDEX_INVALID;
-    if (!interiorPatch && _options.fillMissingBoundaryPoints) {
-        boundaryPoint = fPoints[0];
-    }
-
-    for (int i = 0; i < 4; ++i) {
-        Index v = fVerts[i];
-
-        const int* cornerPointIndices = patchPointsPerCorner[i];
-
-        ConstIndexArray      vFaces   = level.getVertexFaces(v);
-        ConstLocalIndexArray vInFaces = level.getVertexFaceLocalIndices(v);
-
-        //  Identify the patch face in the ring of incident faces.  (There's
-        //  no need to deal with multiple occurrences of the face in the ring
-        //  here -- as can happen with non-manifold vertices -- as such corners
-        //  will be sharp, regular boundaries and not need the incident faces.)
-        //
-        Index f = faceIndex;
-        int fInVFaces = vFaces.FindIndex(f);
-
-        //  Identify the exterior points for this corner from the appropriate 
-        //  incident face:
-        //
-        bool interiorCorner = interiorPatch || (((eMask & (1 << i)) |
-                                                 (eMask & (1 << fastMod4(i+3)))) == 0);
-        if (interiorCorner) {
-            int fOppInVFaces = fastMod4(fInVFaces + 2);
-
-            Index fOpp = vFaces[fOppInVFaces];
-            int vInFOpp = vInFaces[fOppInVFaces];
-            ConstIndexArray fOppPoints = getFacePoints(level, fOpp, fvarChannel);
-
-            patchPoints[cornerPointIndices[1]] = fOppPoints[fastMod4(vInFOpp + 1)];
-            patchPoints[cornerPointIndices[2]] = fOppPoints[fastMod4(vInFOpp + 2)];
-            patchPoints[cornerPointIndices[3]] = fOppPoints[fastMod4(vInFOpp + 3)];
-        } else if ((eMask & (1 << i)) && (eMask & (1 << fastMod4(i+3)))) {
-            //  Two indicent boundary edges -- no incident faces
-            patchPoints[cornerPointIndices[1]] = boundaryPoint;
-            patchPoints[cornerPointIndices[2]] = boundaryPoint;
-            patchPoints[cornerPointIndices[3]] = boundaryPoint;
-        } else if (eMask & (1 << i)) {
-            //  Leading/outgoing boundary edge -- need next face:
-            int vInFNext;
-            Index fNext = getNextFaceInVertFaces(level, fInVFaces, vFaces, vInFaces,
-                                   !level.getVertexTag(v)._nonManifold, vInFNext);
-
-            ConstIndexArray fNextPoints = getFacePoints(level, fNext, fvarChannel);
-
-            patchPoints[cornerPointIndices[1]] = fNextPoints[fastMod4(vInFNext + 3)];
-            patchPoints[cornerPointIndices[2]] = boundaryPoint;
-            patchPoints[cornerPointIndices[3]] = boundaryPoint;
-        } else {
-            //  Trailing/incoming boundary edge -- need previous face:
-            int vInFPrev;
-            Index fPrev = getPrevFaceInVertFaces(level, fInVFaces, vFaces, vInFaces,
-                                   !level.getVertexTag(v)._nonManifold, vInFPrev);
-
-            ConstIndexArray fPrevPoints = getFacePoints(level, fPrev, fvarChannel);
-
-            patchPoints[cornerPointIndices[1]] = boundaryPoint;
-            patchPoints[cornerPointIndices[2]] = boundaryPoint;
-            patchPoints[cornerPointIndices[3]] = fPrevPoints[fastMod4(vInFPrev + 1)];
-        }
-        patchPoints[cornerPointIndices[0]] = fPoints[i];
-    }
-    return 16;
-}
-
-int
-PatchBuilder::getTriRegularPatchPoints(int levelIndex, Index faceIndex,
-        int regBoundaryMask, Index patchPoints[],
-        int fvarChannel) const {
-
-    if (regBoundaryMask < 0) {
-        regBoundaryMask = GetRegularPatchBoundaryMask(levelIndex, faceIndex);
-    }
-    bool interiorPatch = (regBoundaryMask == 0);
-
-    static int const patchPointsPerCorner[3][4] = { { 4, 7, 3, 0 },
-                                                    { 5, 1, 2, 6 },
-                                                    { 8, 9, 11, 10 } };
-
-    int vMask = 0;
-    int eMask = 0;
-    if (!interiorPatch) {
-        decodeTriBoundaryMask(regBoundaryMask, eMask, vMask);
-    }
-
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    ConstIndexArray fVerts  = level.getFaceVertices(faceIndex);
-    ConstIndexArray fPoints = getFacePoints(level, faceIndex, fvarChannel);
-
-    Index boundaryPoint = INDEX_INVALID;
-    if (!interiorPatch && _options.fillMissingBoundaryPoints) {
-        boundaryPoint = fPoints[0];
-    }
-
-    for (int i = 0; i < 3; ++i) {
-        Index v = fVerts[i];
-
-        const int* cornerPointIndices = patchPointsPerCorner[i];
-
-        ConstIndexArray      vFaces   = level.getVertexFaces(v);
-        ConstLocalIndexArray vInFaces = level.getVertexFaceLocalIndices(v);
-
-        //  Identify the patch face in the ring of incident faces.  (There's
-        //  no need to deal with multiple occurrences of the face in the ring
-        //  here -- as can happen with non-manifold vertices -- as such corners
-        //  will be sharp, regular boundaries and not need the incident faces.)
-        //
-        Index f = faceIndex;
-        int fInVFaces = vFaces.FindIndex(f);
-
-        //  Identify the exterior points for this corner from the appropriate 
-        //  incident faces:
-        //
-        bool interiorCorner = interiorPatch || ((vMask & (1 << i)) == 0);
-        if (interiorCorner) {
-            int f2InVFaces = fastModN(fInVFaces + 2, 6);
-            int f3InVFaces = fastModN(fInVFaces + 3, 6);
-
-            Index f2 = vFaces[f2InVFaces];
-            Index f3 = vFaces[f3InVFaces];
-
-            int vInf2 = vInFaces[f2InVFaces];
-            int vInf3 = vInFaces[f3InVFaces];
-
-            ConstIndexArray f2Points = getFacePoints(level, f2, fvarChannel);
-            ConstIndexArray f3Points = getFacePoints(level, f3, fvarChannel);
-
-            patchPoints[cornerPointIndices[1]] = f2Points[fastMod3(vInf2 + 1)];
-            patchPoints[cornerPointIndices[2]] = f3Points[fastMod3(vInf3 + 1)];
-            patchPoints[cornerPointIndices[3]] = f3Points[fastMod3(vInf3 + 2)];
-        } else if ((eMask & (1 << i)) && (eMask & (1 << fastMod3(i+2)))) {
-            //  Two indicent boundary edges -- no incident faces
-
-            patchPoints[cornerPointIndices[1]] = boundaryPoint;
-            patchPoints[cornerPointIndices[2]] = boundaryPoint;
-            patchPoints[cornerPointIndices[3]] = boundaryPoint;
-        } else if (eMask & (1 << i)) {
-            //  Leading/outgoing boundary edge, i.e. f0 of {f0,f1,f2}, need f2:
-            int f2InVFaces = fastModN(fInVFaces + 2, vFaces.size());
-
-            Index f2 = vFaces[f2InVFaces];
-            int vInf2 = vInFaces[f2InVFaces];
-
-            if (level.getVertexTag(v)._nonManifold) {
-                Index f1 = getNextFaceInVertFaces(level, fInVFaces,
-                                            vFaces, vInFaces, false, vInf2);
-                f2 = getNextFaceInVertFaces(level, vFaces.FindIndex(f1),
-                                            vFaces, vInFaces, false, vInf2);
-            }
-            ConstIndexArray f2Points = getFacePoints(level, f2, fvarChannel);
-
-            patchPoints[cornerPointIndices[1]] = f2Points[fastMod3(vInf2 + 1)];
-            patchPoints[cornerPointIndices[2]] = f2Points[fastMod3(vInf2 + 2)];
-            patchPoints[cornerPointIndices[3]] = boundaryPoint;
-        } else if (eMask & (1 << fastMod3(i+2))) {
-            //  Trailing/incoming boundary edge, i.e. f2 of {f0,f1,f2}, need f0:
-            int f0InVFaces = fastModN(fInVFaces + vFaces.size() - 2, vFaces.size());
-
-            Index f0 = vFaces[f0InVFaces];
-            int vInf0 = vInFaces[f0InVFaces];
-
-            if (level.getVertexTag(v)._nonManifold) {
-                Index f1 = getPrevFaceInVertFaces(level, fInVFaces,
-                                            vFaces, vInFaces, false, vInf0);
-                f0 = getPrevFaceInVertFaces(level, vFaces.FindIndex(f1),
-                                            vFaces, vInFaces, false, vInf0);
-            }
-            ConstIndexArray f0Points = getFacePoints(level, f0, fvarChannel);
-
-            patchPoints[cornerPointIndices[1]] = boundaryPoint;
-            patchPoints[cornerPointIndices[2]] = boundaryPoint;
-            patchPoints[cornerPointIndices[3]] = f0Points[fastMod3(vInf0 + 1)];
-        } else {
-            //  Boundary vertex on edge, i.e. f1 of {f0,f1,f2}, need next face f2:
-            int vInf2;
-            Index f2 = getNextFaceInVertFaces(level, fInVFaces, vFaces, vInFaces,
-                                       !level.getVertexTag(v)._nonManifold, vInf2);
-
-            ConstIndexArray f2Points = getFacePoints(level, f2, fvarChannel);
-
-            patchPoints[cornerPointIndices[1]] = f2Points[fastMod3(vInf2 + 2)];
-            patchPoints[cornerPointIndices[2]] = boundaryPoint;
-            patchPoints[cornerPointIndices[3]] = boundaryPoint;
-        }
-        patchPoints[cornerPointIndices[0]] = fPoints[i];
-    }
-    return 12;
-}
-
-int
-PatchBuilder::GetRegularPatchPoints(int levelIndex, Index faceIndex,
-        int regBoundaryMask, Index patchPoints[],
-        int fvarChannel) const {
-
-    if (_schemeIsLinear) {
-        return getRegularFacePoints(
-            levelIndex, faceIndex, patchPoints, fvarChannel);
-    } else if (_schemeRegFaceSize == 4) {
-        return getQuadRegularPatchPoints(
-            levelIndex, faceIndex, regBoundaryMask, patchPoints, fvarChannel);
-    } else {
-        return getTriRegularPatchPoints(
-            levelIndex, faceIndex, regBoundaryMask, patchPoints, fvarChannel);
-    }
-    return 0;
-}
-
-int
-PatchBuilder::assembleIrregularSourcePatch(
-        int levelIndex, Index faceIndex, Level::VSpan const cornerSpans[],
-        SourcePatch & sourcePatch) const {
-
-    //
-    //  Initialize the four Patch corners and finalize the patch:
-    //
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    ConstIndexArray fVerts = level.getFaceVertices(faceIndex);
-
-    for (int corner = 0; corner < fVerts.size(); ++corner) {
-        //
-        //  Retrieve corner properties from the VSpan when explicitly assigned.
-        //  Otherwise, identify properties from the incident faces and tags and
-        //  find the face for the patch within the set of incident faces:
-        //
-        Level::VTag vTag = level.getVertexTag(fVerts[corner]);
-
-        SourcePatch::Corner & patchCorner = sourcePatch._corners[corner];
-
-        if (cornerSpans[corner].isAssigned()) {
-            patchCorner._numFaces  = cornerSpans[corner]._numFaces;
-            patchCorner._patchFace = cornerSpans[corner]._cornerInSpan;
-            patchCorner._boundary  = !cornerSpans[corner]._periodic;
-        } else {
-            ConstIndexArray vFaces = level.getVertexFaces(fVerts[corner]);
-
-            patchCorner._numFaces  = (LocalIndex) vFaces.size();
-            patchCorner._patchFace = (LocalIndex) vFaces.FindIndex(faceIndex);
-            patchCorner._boundary  = vTag._boundary;
-        }
-        patchCorner._sharp = cornerSpans[corner]._sharp;
-        patchCorner._dart  = (vTag._rule == Sdc::Crease::RULE_DART) && vTag._infSharpEdges;
-    }
-    sourcePatch.Finalize(fVerts.size());
-
-    return sourcePatch.GetNumSourcePoints();
-}
-
-
-//
-//  Gather patch points from around the face of a level given a previously
-//  initialized SourcePatch.  This is historically specific to an irregular
-//  patch and still relies on the cornerSpans (which may or may not have been
-//  initialized when the SourcePatch was created) rather than inspecting the
-//  corners of the SourcePatch.
-//
-//  We need temporary/local space for rings around each corner -- both for
-//  the Vtr::Level and the corresponding rings of the patch.
-//
-//  Get the corresponding rings from the Vtr::Level and the patch descriptor:
-//  the values of the latter will be indices for points[] whose values will
-//  come from values of former, i.e. points[localRing[i]] = sourceRing[i].
-//  Points that overlap will be assigned multiple times, but messy logic to
-//  deal with overlap while determining the correspondence is avoided.
-//
-int
-PatchBuilder::gatherIrregularSourcePoints(
-        int levelIndex, Index faceIndex,
-        Level::VSpan const cornerSpans[4], SourcePatch & sourcePatch,
-        Index patchVerts[], int fvarChannel) const {
-
-    //
-    //  Allocate temporary space for rings around the corners in both the Level
-    //  and the Patch, then retrieve corresponding rings and assign the source
-    //  vertices to the given array of patch points
-    //
-    int numSourceVerts = sourcePatch.GetNumSourcePoints();
-
-    StackBuffer<Index,64,true> sourceRingVertices(sourcePatch.GetMaxRingSize());
-    StackBuffer<Index,64,true> patchRingPoints(sourcePatch.GetMaxRingSize());
-
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    ConstIndexArray faceVerts = level.getFaceVertices(faceIndex);
-    for (int corner = 0; corner < sourcePatch._numCorners; ++corner) {
-        Index cornerVertex = faceVerts[corner];
-        
-        //  Gather the ring of source points from the Vtr level:
-        int sourceRingSize = 0;
-        if (cornerSpans[corner].isAssigned()) {
-            sourceRingSize = gatherRegularPartialRingAroundVertex(level,
-                cornerVertex, cornerSpans[corner], sourceRingVertices,
-                fvarChannel);
-        } else if (sourcePatch._numCorners == 4) {
-            sourceRingSize = level.gatherQuadRegularRingAroundVertex(
-                cornerVertex, sourceRingVertices,
-                fvarChannel);
-        } else {
-            sourceRingSize = gatherTriRegularRingAroundVertex(level,
-                cornerVertex, sourceRingVertices,
-                fvarChannel);
-        }
-
-        //  Gather the ring of local points from the patch:
-        int patchRingSize = sourcePatch.GetCornerRingPoints(
-                corner, patchRingPoints);
-        assert(patchRingSize == sourceRingSize);
-
-        //  Identify source points for corresponding local patch points of ring:
-        for (int i = 0; i < patchRingSize; ++i) {
-            assert(patchRingPoints[i] < numSourceVerts);
-            patchVerts[patchRingPoints[i]] = sourceRingVertices[i];
-        }
-    }
-    return numSourceVerts;
-}
-
-int
-PatchBuilder::GetIrregularPatchSourcePoints(
-        int levelIndex, Index faceIndex, Level::VSpan const cornerSpans[],
-        Index sourcePoints[], int fvarChannel) const {
-
-    SourcePatch sourcePatch;
-    assembleIrregularSourcePatch(
-            levelIndex, faceIndex, cornerSpans, sourcePatch);
-
-    return gatherIrregularSourcePoints(levelIndex, faceIndex,
-        cornerSpans, sourcePatch, sourcePoints, fvarChannel);
-}
-
-//
-//  Template conversion methods for the matrix type -- explicit instantiation
-//  for float and double is required and follows the definition:
-//
-template <typename REAL>
-int
-PatchBuilder::GetIrregularPatchConversionMatrix(
-        int levelIndex, Index faceIndex,
-        Level::VSpan const cornerSpans[],
-        SparseMatrix<REAL> & conversionMatrix) const {
-
-    SourcePatch sourcePatch;
-    assembleIrregularSourcePatch(
-            levelIndex, faceIndex, cornerSpans, sourcePatch);
-
-    return convertToPatchType(
-        sourcePatch, GetIrregularPatchType(), conversionMatrix);
-}
-template int PatchBuilder::GetIrregularPatchConversionMatrix<float>(
-        int levelIndex, Index faceIndex, Level::VSpan const cornerSpans[],
-        SparseMatrix<float> & conversionMatrix) const;
-template int PatchBuilder::GetIrregularPatchConversionMatrix<double>(
-        int levelIndex, Index faceIndex, Level::VSpan const cornerSpans[],
-        SparseMatrix<double> & conversionMatrix) const;
-
-
-bool
-PatchBuilder::IsRegularSingleCreasePatch(int levelIndex, Index faceIndex,
-        SingleCreaseInfo & creaseInfo) const {
-
-    if (_schemeRegFaceSize != 4) return false;
-
-    Level const & level = _refiner.getLevel(levelIndex);
-
-    return level.isSingleCreasePatch(faceIndex,
-                &creaseInfo.creaseSharpness, &creaseInfo.creaseEdgeInFace);
-}   
-
-PatchParam
-PatchBuilder::ComputePatchParam(int levelIndex, Index faceIndex,
-        PtexIndices const& ptexIndices, bool isRegular,
-        int boundaryMask, bool computeTransitionMask) const {
-
-    // Move up the hierarchy accumulating u,v indices to the coarse level:
-    int depth = levelIndex;
-    int childIndexInParent = 0,
-        u = 0,
-        v = 0,
-        ofs = 1;
-
-    int regFaceSize = _schemeRegFaceSize;
-
-    bool irregBase =
-        _refiner.GetLevel(depth).GetFaceVertices(faceIndex).size() !=
-        regFaceSize;
-
-    // For triangle refinement, the parameterization is rotated at
-    // the fourth triangle subface at each level. The u and v values
-    // computed for rotated triangles will be negative while we are
-    // walking through the refinement levels.
-    bool rotatedTriangle = false;
-
-    int childFaceIndex = faceIndex;
-    for (int i = depth; i > 0; --i) {
-        Refinement const& refinement  = _refiner.getRefinement(i-1);
-        Level const&      parentLevel = _refiner.getLevel(i-1);
-
-        Index parentFaceIndex =
-            refinement.getChildFaceParentFace(childFaceIndex);
-
-        irregBase =
-            parentLevel.getFaceVertices(parentFaceIndex).size() !=
-            regFaceSize;
-
-        if (_schemeRegFaceSize == 3) {
-            // For now, we don't consider irregular faces for
-            // triangle refinement.
-
-            childIndexInParent =
-                refinement.getChildFaceInParentFace(childFaceIndex);
-
-            if (rotatedTriangle) {
-                switch ( childIndexInParent ) {
-                    case 0 :                     break;
-                    case 1 : { u-=ofs;         } break;
-                    case 2 : {         v-=ofs; } break;
-                    case 3 : { u+=ofs; v+=ofs; rotatedTriangle = false; } break;
-                }
-            } else {
-                switch ( childIndexInParent ) {
-                    case 0 :                     break;
-                    case 1 : { u+=ofs;         } break;
-                    case 2 : {         v+=ofs; } break;
-                    case 3 : { u-=ofs; v-=ofs; rotatedTriangle = true; } break;
-                }
-            }
-            ofs = (unsigned short)(ofs << 1);
-        } else if (!irregBase) {
-            childIndexInParent =
-                refinement.getChildFaceInParentFace(childFaceIndex);
-
-            switch ( childIndexInParent ) {
-                case 0 :                     break;
-                case 1 : { u+=ofs;         } break;
-                case 2 : { u+=ofs; v+=ofs; } break;
-                case 3 : {         v+=ofs; } break;
-            }
-            ofs = (unsigned short)(ofs << 1);
-        } else {
-            // If the root face is not a quad, we need to offset the ptex index
-            // CCW to match the correct child face
-            ConstIndexArray children =
-                refinement.getFaceChildFaces(parentFaceIndex);
-
-            for (int j=0; j<children.size(); ++j) {
-                if (children[j] == childFaceIndex) {
-                    childIndexInParent = j;
-                    break;
-                }
-            }
-        }
-        childFaceIndex = parentFaceIndex;
-    }
-    if (rotatedTriangle) {
-        // If the triangle is tagged as rotated at this point then the
-        // computed u and v parameters will both be negative and we map
-        // them onto positive values in the opposite diagonal of the
-        // parameter space.
-        u += ofs;
-        v += ofs;
-    }
-    int baseFaceIndex = childFaceIndex;
-
-    //  Need to store ptex index from base face and child of an irregular face:
-    Index ptexIndex = ptexIndices.GetFaceId(baseFaceIndex);
-    assert(ptexIndex != -1);
-    if (irregBase) {
-        ptexIndex += childIndexInParent;
-    }
-
-    //  Compute/identify the transition mask if requested, otherwise leave it 0:
-    int transitionMask = 0;
-    if (computeTransitionMask && (levelIndex < _refiner.GetMaxLevel())) {
-        transitionMask = _refiner.getRefinement(levelIndex).
-                            getParentFaceSparseTag(faceIndex)._transitional;
-    }
-
-    PatchParam param;
-    param.Set(ptexIndex, (short)u, (short)v, (unsigned short) depth, irregBase,
-              (unsigned short) boundaryMask, (unsigned short) transitionMask,
-              (unsigned short) isRegular);
-    return param;
-}
-
-
-//
-//  SourcePatch
-//
-//  This class allows the full topological specification of the neighborhood
-//  of vertices and edges around a face that collectively define a rectangular
-//  piece of surface corresponding to that face.  All components are declared
-//  in terms of local indices and explicitly avoid any references/indices to
-//  an external representation.  It is assembled by specifying the topology
-//  of each corner (number of faces/edges, boundary, etc.) and finalization
-//  determines a set of source vertices in a canonical orientation relative
-//  to the face and any patch which may be derived from it.
-//
-//  Any/all corners can be arbitrarily irregular.  Information for each corner
-//  is similar to what is provided in a Vtr::Level::VSpan but does not require
-//  any Vtr dependent orientation (e.g. the leading edge) and also requires
-//  identification of the incident face that corresponds to the patch (i.e.
-//  the "patch face").
-//
-//  The set of local source vertices begins with the corner vertices of the
-//  face corresponding to the patch.  Since the 1-rings of the corner vertices
-//  overlap, a subset of the 1-rings is identified as the "local ring points"
-//  for a corner, which are the points most associated with the corner.  While
-//  one of these local ring points may overlap with an adjacent corner, the
-//  local ring points for each corner are indexed successively for each corner.
-//
-//  The cumulative set of source points forming the 1-ring around the patch
-//  face is indexed successively in a counter-clockwise orientation beginning
-//  with the first edge-vertex of the first corner, e.g. for a patch with
-//  three regular corners and an irregular boundary:
-//
-//     13          12       11         10
-//        x--------x--------x--------x
-//        |        |        |        |
-//        |        |        |        |
-//        |        |        |        |
-//        |        |        |        |
-//     14 x--------x--------x--------x 9
-//        |        |3      2|        |
-//        |        |        |        |
-//        |        |        |        |
-//        |        |0      1|        |
-//      4 x--------x--------x--------x 8
-//        |        |        |
-//        |        |        |
-//        |        |        |
-//        |        |        |
-//        x--------x--------x
-//      5          6         7
-//
-//  The set of source points consists of the corner points {0,1,2,3} followed
-//  by the four sets of points {4,5,6}, {7,8}, {9,10,11} and {12,13,14} --
-//  each being the exterior subset of the points of the one-ring for the
-//  corresponding corner point.
-//
-//  The 1-ring for each corner is made available for both assembling the points
-//  of the resulting Gregory patch and for defining correspondence between the
-//  original source of the vertices.  All 1-rings are oriented counter-clockwise
-//  and begin with a vertex at the end of an edge.  The 1-rings for boundaries
-//  begin/end with vertices at the ends of the leading/trailing edges.  Interior
-//  1-rings are ordered such that the patch-face vertices occur as specified.
-//
-
-//
-//  SourcePatch method to initialize other internal members once required
-//  members of all corners have been explicitly initialized.  This deals with
-//  all of the awkward ways in which rings of vertices around each corner
-//  overlap in order to define the canonical ordering of vertices (and avoiding
-//  have the same vertex twice).
-//
-//  Note:  Considering passing Corner[4] to a constructor so that this is all
-//  dealt with in the constructor.
-//
-void
-SourcePatch::Finalize(int size) {
-
-    //
-    //  Determine the sizes of the rings and the total number of points
-    //  involved.  In the process, identify which corners share ring points
-    //  with their neighbors and accumulate maximal ring sizes and valence:
-    //
-    bool isQuad = (size == 4);
-
-    _numCorners = size;
-
-    _maxValence = 0;
-    _maxRingSize = 0;
-    _numSourcePoints = _numCorners;
-
-    for (int cIndex = 0; cIndex < _numCorners; ++cIndex) {
-        //
-        //  Need valence-2 information for neighbors as it affects sizing:
-        //
-        int cPrev = fastModN(cIndex + 2 + isQuad, _numCorners);
-        int cNext = fastModN(cIndex + 1,          _numCorners);
-
-        bool prevIsVal2Interior = ((_corners[cPrev]._numFaces == 2) &&
-                                   !_corners[cPrev]._boundary);
-        bool thisIsVal2Interior = ((_corners[cIndex]._numFaces == 2) &&
-                                   !_corners[cIndex]._boundary);
-        bool nextIsVal2Interior = ((_corners[cNext]._numFaces == 2) &&
-                                   !_corners[cNext]._boundary);
-
-        Corner & corner = _corners[cIndex];
-
-        corner._val2Interior = thisIsVal2Interior;
-        corner._val2Adjacent = prevIsVal2Interior || nextIsVal2Interior;
-
-        //
-        //  General cases are >= 3-face interior and >= 2-face boundary:
-        //
-        if ((corner._numFaces + corner._boundary) > 2) {
-            //
-            //  Quads generally share with both prev and next, but triangles
-            //  never share with prev because of the necessary asymmetry of
-            //  the local ring points.
-            //
-            if (corner._boundary) {
-                corner._sharesWithPrev = isQuad && (corner._patchFace != (corner._numFaces - 1));
-                corner._sharesWithNext = (corner._patchFace != 0);
-            } else if (corner._dart) {
-                Corner & cP = _corners[cPrev];
-                Corner & cN = _corners[cNext];
-
-                bool cPrevOnDartEdge = cP._boundary && (cP._patchFace == 0);
-                bool cNextOnDartEdge = cN._boundary && (cN._patchFace == cN._numFaces - 1);
-
-                corner._sharesWithPrev = isQuad && !cPrevOnDartEdge;
-                corner._sharesWithNext = !cNextOnDartEdge;
-            } else {
-                corner._sharesWithPrev = isQuad;
-                corner._sharesWithNext = true;
-            }
-
-            _ringSizes[cIndex]      = corner._numFaces * (1 + isQuad) + corner._boundary;
-            _localRingSizes[cIndex] = _ringSizes[cIndex] - (_numCorners - 1)
-                                    - corner._sharesWithPrev - corner._sharesWithNext;
-
-            if (corner._val2Adjacent) {
-                _localRingSizes[cIndex] -= prevIsVal2Interior;
-                _localRingSizes[cIndex] -= (nextIsVal2Interior && isQuad);
-            }
-        } else {
-            corner._sharesWithPrev = false;
-            corner._sharesWithNext = false;
-
-            //  Single-face boundary/corner and valence-2 interior:
-            if (corner._numFaces == 1) {
-                _ringSizes[cIndex]      = _numCorners - 1;
-                _localRingSizes[cIndex] = 0;
-            } else {
-                _ringSizes[cIndex]      = 2 * (1 + isQuad);
-                _localRingSizes[cIndex] = isQuad;
-            }
-        }
-        _localRingOffsets[cIndex] = _numSourcePoints;
-
-        _maxValence  = std::max(_maxValence, corner._numFaces + corner._boundary);
-        _maxRingSize = std::max(_maxRingSize, _ringSizes[cIndex]);
-
-        _numSourcePoints += _localRingSizes[cIndex];
-    }
-}
-
-
-int
-SourcePatch::GetCornerRingPoints(int corner, int ringPoints[]) const {
-
-    bool isQuad = (_numCorners == 4);
-
-    int cNext = fastModN(corner + 1,          _numCorners);
-    int cOpp  = fastModN(corner + 1 + isQuad, _numCorners);
-    int cPrev = fastModN(corner + 2 + isQuad, _numCorners);
-
-    //
-    //  Assemble the ring in a canonical ordering beginning with the points of
-    //  the 2 or 3 other corners of the face followed by the local ring -- with
-    //  any shared or compensating points (for valence-2 interior) preceding
-    //  and following the points local to the ring.
-    //
-    int ringSize = 0;
-
-    //  The adjacent corner points:
-    ringPoints[ringSize++] = cNext;
-    if (isQuad) {
-        ringPoints[ringSize++] = cOpp;
-    }
-    ringPoints[ringSize++] = cPrev;
-
-    //  Shared points preceding the local ring points:
-    if (_corners[cPrev]._val2Interior) {
-        ringPoints[ringSize++] = isQuad ? cOpp : cNext;
-    }
-    if (_corners[corner]._sharesWithPrev) {
-        ringPoints[ringSize++] = _localRingOffsets[cPrev] + _localRingSizes[cPrev] - 1;
-    }
-
-    //  The local ring points:
-    for (int i = 0; i < _localRingSizes[corner]; ++i) {
-        ringPoints[ringSize++] = _localRingOffsets[corner] + i;
-    }
-
-    //  Shared points following the local ring points:
-    if (isQuad) {
-        if (_corners[corner]._sharesWithNext) {
-            ringPoints[ringSize++] = _localRingOffsets[cNext];
-        }
-        if (_corners[cNext]._val2Interior) {
-            ringPoints[ringSize++] = cOpp;
-        }
-    } else {
-        if (_corners[corner]._sharesWithNext) {
-            if (_corners[cNext]._val2Interior) {
-                ringPoints[ringSize++] = cPrev;
-            } else if (_localRingSizes[cNext] == 0) {
-                ringPoints[ringSize++] = _localRingOffsets[cPrev];
-            } else {
-                ringPoints[ringSize++] = _localRingOffsets[cNext];
-            }
-        }
-    }
-    assert(ringSize == _ringSizes[corner]);
-
-    //  The assembled ordering matches the desired ordering if the patch-face
-    //  is first, so rotate the assembled ring if that's not the case:
-    //
-    if (_corners[corner]._patchFace) {
-        int rotationOffset = ringSize - (1 + isQuad) * _corners[corner]._patchFace;
-        std::rotate(ringPoints, ringPoints + rotationOffset, ringPoints + ringSize);
-    }
-    return ringSize;
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBuilder.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBuilder.h
deleted file mode 100644
index 01b4ecb9b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchBuilder.h
+++ /dev/null
@@ -1,332 +0,0 @@
-//
-//   Copyright 2017 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_PATCH_BUILDER_H
-#define OPENSUBDIV3_FAR_PATCH_BUILDER_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-#include "../far/types.h"
-#include "../far/topologyRefiner.h"
-#include "../far/patchDescriptor.h"
-#include "../far/patchParam.h"
-#include "../far/ptexIndices.h"
-#include "../far/sparseMatrix.h"
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  SourcePatch
-//
-//  This is a local utility class that captures the full local topology of an
-//  arbitrarily irregular patch, i.e. a patch which may have one or all corners
-//  irregular.  Given the topology at each corner the entire collection of
-//  points involved is identified and oriented consistently.
-//
-//  Note (barfowl):
-//      This was originally a class internal to PatchBuilder, but there is some
-//  redundancy between it and the Level::VSpan used more publicly to identify
-//  irregular corner topology.   Replacing VSpan with SourcePatch is now under
-//  consideration, and doing so will impact its public/private interface (which
-//  was left public to give PatchBuilder access).
-//      A simpler constructor to initialize an instance given a set of Corners
-//  would also be preferable if made more public (i.e. public for use within
-//  the library, not exported to clients) -- eliminating the need for the
-//  explicit initialization and required call to the Finalize() method that
-//  the PatchBuilder currently performs internally.
-//
-class SourcePatch {
-public:
-    struct Corner {
-        Corner() { std::memset((void*) this, 0, sizeof(Corner)); }
-
-        LocalIndex _numFaces;   // valence of corner vertex
-        LocalIndex _patchFace;  // location of patch within incident faces
-
-        unsigned short _boundary : 1;
-        unsigned short _sharp    : 1;
-        unsigned short _dart     : 1;
-
-        //  For internal bookkeeping -- consider hiding or moving elsewhere
-        unsigned short _sharesWithPrev : 1;
-        unsigned short _sharesWithNext : 1;
-        unsigned short _val2Interior   : 1;
-        unsigned short _val2Adjacent   : 1;
-    };
-
-public:
-    SourcePatch() { std::memset((void*) this, 0, sizeof(SourcePatch)); }
-    ~SourcePatch() { }
-
-    //  To be called after all Corners have been initialized (hope to
-    //  replace this with alternative constructor at some point)
-    void Finalize(int size3or4);
-
-    int GetNumSourcePoints() const { return _numSourcePoints; }
-    int GetMaxValence() const { return _maxValence; }
-    int GetMaxRingSize() const { return _maxRingSize; }
-
-    int GetCornerRingSize(int corner) const { return _ringSizes[corner]; }
-    int GetCornerRingPoints(int corner, int points[]) const;
-
-//  public/private access needs to be reviewed when/if used more publicly
-//private:
-public:
-    //  The SourcePatch is fully defined by its Corner members
-    Corner _corners[4];
-    int    _numCorners;
-
-    //  Additional members (derived from Corners) to help assemble corner rings:
-    int _numSourcePoints;
-    int _maxValence;
-    int _maxRingSize;
-
-    int _ringSizes[4];
-    int _localRingSizes[4];
-    int _localRingOffsets[4];
-};
-
-
-//
-//  PatchBuilder
-//
-//  This is the main class to assist the identification of limit surface
-//  patches from faces in a TopologyRefiner for assembly into other, larger
-//  datatypes.
-//
-//  The PatchBuilder takes a const reference to a refiner and supports
-//  arbitrarily refined hierarchies, i.e. it is not restricted to uniform or
-//  adaptive refinement strategies and does not include any logic relating
-//  to the origin of the hierarchy.  It can associate a patch with any face
-//  in the hierarchy (subject to a few minimum requirements) -- leaving the
-//  decision as to which faces/patches are appropriate to its client.
-//
-//  PatchBuilder is an abstract base class with a subclass derived to support
-//  each subdivision scheme -- as such, construction relies on a factory
-//  method to create an instance of the appropriate subclass.  Only two pure
-//  virtual methods are required (other than the required destructor):
-//
-//      - determine the patch type for a subdivision scheme given a more
-//        general basis specification (e.g. Bezier, Gregory, Linear, etc)
-//
-//      - convert the vertices in the subdivision hierarchy into points of a
-//        specified patch type, using computations specific to that scheme
-//
-//  The base class handles the more general topological analysis that
-//  determines the nature of a patch associated with each face -- providing
-//  both queries to the client, along with more involved methods to extract
-//  or convert data associated with the patches.  There is no concrete "Patch"
-//  class to which all clients would be required to conform.  The queries and
-//  data returned are provided for clients to assemble into patches or other
-//  aggregates as they see fit.
-//
-//  This is intended as an internal/private class for use within the library
-//  for now -- possibly to be exported for use by clients when/if its
-//  interface is appropriate and stable.
-//
-class PatchBuilder {
-public:
-    //
-    //  A PatchBuilder is constructed given a patch "basis" rather than a
-    //  "type" to use with the subdivision scheme involved.  The relevant
-    //  explicit patch types will be determined from the basis and scheme:
-    //
-    enum BasisType {
-        BASIS_UNSPECIFIED,
-        BASIS_REGULAR,
-        BASIS_GREGORY,
-        BASIS_LINEAR,
-        BASIS_BEZIER   // to be supported in future
-    };
-
-    //
-    //  Required Options specify a patch basis to use for both regular and
-    //  irregular patches -- sparing the client the need to repeatedly
-    //  specify these for each face considered.  Other options are included
-    //  to support legacy approximations:
-    //
-    struct Options {
-        Options() : regBasisType(BASIS_UNSPECIFIED),
-                    irregBasisType(BASIS_UNSPECIFIED),
-                    fillMissingBoundaryPoints(false),
-                    approxInfSharpWithSmooth(false),
-                    approxSmoothCornerWithSharp(false) { }
-
-        BasisType regBasisType;
-        BasisType irregBasisType;
-        bool      fillMissingBoundaryPoints;
-        bool      approxInfSharpWithSmooth;
-        bool      approxSmoothCornerWithSharp;
-    };
-
-public:
-    //
-    //  Public construction (via factory method) and destruction:
-    //
-    static PatchBuilder* Create(TopologyRefiner const& refiner,
-                                Options const& options);
-    virtual ~PatchBuilder();
-
-    //
-    //  High-level queries related to the subdivision scheme of the refiner, the
-    //  patch types associated with it and those chosen to represent its faces:
-    //
-    int GetRegularFaceSize() const { return _schemeRegFaceSize; }
-
-    BasisType GetRegularBasisType() const { return _options.regBasisType; }
-    BasisType GetIrregularBasisType() const { return _options.irregBasisType; }
-
-    PatchDescriptor::Type GetRegularPatchType() const { return _regPatchType; }
-    PatchDescriptor::Type GetIrregularPatchType() const { return _irregPatchType; }
-
-    PatchDescriptor::Type GetNativePatchType() const { return _nativePatchType; }
-    PatchDescriptor::Type GetLinearPatchType() const { return _linearPatchType; }
-
-    //
-    //  Face-level queries to determine presence of patches:
-    //
-    bool IsFaceAPatch(int level, Index face) const;
-    bool IsFaceALeaf(int level, Index face) const;
-
-    //
-    //  Patch-level topological queries:
-    //
-    bool IsPatchRegular(int level, Index face, int fvc = -1) const;
-
-    int GetRegularPatchBoundaryMask(int level, Index face, int fvc = -1) const;
-
-    void GetIrregularPatchCornerSpans(int level, Index face,
-            Vtr::internal::Level::VSpan cornerSpans[4], int fvc = -1) const;
-
-    bool DoesFaceVaryingPatchMatch(int level, Index face, int fvc) const {
-        return _refiner.getLevel(level).doesFaceFVarTopologyMatch(face, fvc);
-    }
-
-    //
-    //  Patch-level control point retrieval and methods for converting source
-    //  points to a set of local points in a different basis
-    //
-    int GetRegularPatchPoints(int level, Index face,
-            int regBoundaryMask, // compute internally when < 0
-            Index patchPoints[],
-            int fvc = -1) const;
-
-    template <typename REAL>
-    int GetIrregularPatchConversionMatrix(int level, Index face,
-            Vtr::internal::Level::VSpan const cornerSpans[],
-            SparseMatrix<REAL> &              matrix) const;
-
-    int GetIrregularPatchSourcePoints(int level, Index face,
-            Vtr::internal::Level::VSpan const cornerSpans[],
-            Index                             sourcePoints[],
-            int                               fvc = -1) const;
-    //
-    //  Queries related to "single-crease" patches -- currently a subset of
-    //  regular interior patches:
-    //
-    struct SingleCreaseInfo {
-        int   creaseEdgeInFace;
-        float creaseSharpness;
-    };
-    bool IsRegularSingleCreasePatch(int level, Index face,
-            SingleCreaseInfo & info) const;
-
-    //
-    //  Computing the PatchParam -- note the regrettable dependency on
-    //  PtexIndices but PatchParam is essentially tied to it indefinitely.
-    //  Better to pass it in than have the PatchBuilder build its own
-    //  PtexIndices.
-    //
-    //  Consider creating a PatchParamFactory which can manage the PtexIndices
-    //  along with this method.  It will then be able to generate additional
-    //  data to accelerate these computations.
-    //
-    PatchParam ComputePatchParam(int level, Index face,
-            PtexIndices const& ptexIndices, bool isRegular = true,
-            int boundaryMask = 0, bool computeTransitionMask = false) const;
-
-protected:
-    PatchBuilder(TopologyRefiner const& refiner, Options const& options);
-
-    //  Internal methods supporting topology queries:
-    int getRegularFacePoints(int level, Index face,
-            Index patchPoints[], int fvc) const;
-
-    int getQuadRegularPatchPoints(int level, Index face,
-            int regBoundaryMask, Index patchPoints[], int fvc) const;
-
-    int getTriRegularPatchPoints(int level, Index face,
-            int regBoundaryMask, Index patchPoints[], int fvc) const;
-
-    //  Internal methods using the SourcePatch:
-    int assembleIrregularSourcePatch(int level, Index face,
-            Vtr::internal::Level::VSpan const cornerSpans[],
-            SourcePatch & sourcePatch) const;
-
-    int gatherIrregularSourcePoints(int level, Index face,
-            Vtr::internal::Level::VSpan const cornerSpans[],
-            SourcePatch &  sourcePatch,
-            Index patchPoints[], int fvc) const;
-
-protected:
-    //
-    //  Virtual methods to be provided by subclass for each scheme:
-    //
-    virtual PatchDescriptor::Type patchTypeFromBasis(BasisType basis) const = 0;
-
-    //  Note overloading of the conversion for SparseMatrix<REAL>:
-    virtual int convertToPatchType(SourcePatch const &   sourcePatch,
-                                   PatchDescriptor::Type patchType,
-                                   SparseMatrix<float> & matrix) const = 0;
-    virtual int convertToPatchType(SourcePatch const &    sourcePatch,
-                                   PatchDescriptor::Type  patchType,
-                                   SparseMatrix<double> & matrix) const = 0;
-
-protected:
-    TopologyRefiner const& _refiner;
-    Options const          _options;
-
-    Sdc::SchemeType _schemeType;
-    int             _schemeRegFaceSize;
-    bool            _schemeIsLinear;
-
-    PatchDescriptor::Type _regPatchType;
-    PatchDescriptor::Type _irregPatchType;
-    PatchDescriptor::Type _nativePatchType;
-    PatchDescriptor::Type _linearPatchType;
-};
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_PATCH_BUILDER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchDescriptor.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchDescriptor.cpp
deleted file mode 100644
index 2b58b9bb4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchDescriptor.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../far/patchDescriptor.h"
-
-#include <cassert>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-
-
-//
-// Lists of valid patch Descriptors for each subdivision scheme
-//
-// Historically this has only included the non-linear patch types, though
-// it is possible for linear patches to represent irregularities for both
-// Catmark and Loop, and the Bilinear scheme is adaptively refined into
-// linear quads (e.g. a pentagon becoming five quads).
-//
-
-ConstPatchDescriptorArray
-PatchDescriptor::GetAdaptivePatchDescriptors(Sdc::SchemeType type) {
-
-    static PatchDescriptor _loopDescriptors[] = {
-        PatchDescriptor(LOOP),
-        PatchDescriptor(GREGORY_TRIANGLE),
-    };
-
-    static PatchDescriptor _catmarkDescriptors[] = {
-        PatchDescriptor(REGULAR),
-        PatchDescriptor(GREGORY),
-        PatchDescriptor(GREGORY_BOUNDARY),
-        PatchDescriptor(GREGORY_BASIS),
-    };
-
-    switch (type) {
-        case Sdc::SCHEME_BILINEAR :
-            return ConstPatchDescriptorArray(0, 0);
-        case Sdc::SCHEME_CATMARK :
-            return ConstPatchDescriptorArray(_catmarkDescriptors,
-                (int)(sizeof(_catmarkDescriptors)/sizeof(PatchDescriptor)));
-        case Sdc::SCHEME_LOOP :
-            return ConstPatchDescriptorArray(_loopDescriptors,
-                (int)(sizeof(_loopDescriptors)/sizeof(PatchDescriptor)));
-        default:
-          assert(0);
-    }
-    return ConstPatchDescriptorArray(0, 0);;
-}
-
-void
-PatchDescriptor::print() const {
-    static char const * types[13] = {
-        "NON_PATCH", "POINTS", "LINES", "QUADS", "TRIANGLES", "LOOP",
-            "REGULAR", "GREGORY", "GREGORY_BOUNDARY", "GREGORY_BASIS",
-            "GREGORY_TRIANGLE"};
-
-    printf("    type %s\n",
-        types[_type]);
-}
-
-
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchDescriptor.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchDescriptor.h
deleted file mode 100644
index 266af3203..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchDescriptor.h
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_PATCH_DESCRIPTOR_H
-#define OPENSUBDIV3_FAR_PATCH_DESCRIPTOR_H
-
-#include "../version.h"
-
-#include "../far/types.h"
-#include "../sdc/types.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-/// \brief Describes the type of a patch
-///
-/// Uniquely identifies all the different types of patches
-///
-class PatchDescriptor {
-
-public:
-
-    enum Type {
-        NON_PATCH = 0,     ///< undefined
-
-        POINTS,            ///< points (useful for cage drawing)
-        LINES,             ///< lines  (useful for cage drawing)
-
-        QUADS,             ///< 4-sided quadrilateral (bilinear)
-        TRIANGLES,         ///< 3-sided triangle
-
-        LOOP,              ///< regular triangular patch for the Loop scheme
-
-        REGULAR,           ///< regular B-Spline patch for the Catmark scheme
-        GREGORY,
-        GREGORY_BOUNDARY,
-        GREGORY_BASIS,
-        GREGORY_TRIANGLE
-    };
-
-public:
-
-    /// \brief Default constructor.
-    PatchDescriptor() :
-        _type(NON_PATCH) { }
-
-    /// \brief Constructor
-    PatchDescriptor(int type) :
-        _type(type) { }
-
-    /// \brief Copy Constructor
-    PatchDescriptor( PatchDescriptor const & d ) :
-        _type(d.GetType()) { }
-
-    /// \brief Assignment operator
-    PatchDescriptor & operator=( PatchDescriptor const & d ) {
-        _type = d.GetType();
-        return *this;
-    }
-
-    /// \brief Returns the type of the patch
-    Type GetType() const {
-        return (Type)_type;
-    }
-
-    /// \brief Returns true if the type is an adaptive (non-linear) patch
-    static inline bool IsAdaptive(Type type) {
-        return type > TRIANGLES;
-    }
-
-    /// \brief Returns true if the type is an adaptive patch
-    bool IsAdaptive() const {
-        return IsAdaptive( this->GetType() );
-    }
-
-    /// \brief Returns the number of control vertices expected for a patch of the
-    /// type described
-    static inline short GetNumControlVertices( Type t );
-
-    /// \brief Deprecated @see PatchDescriptor#GetNumControlVertices
-    static inline short GetNumFVarControlVertices( Type t );
-
-    /// \brief Returns the number of control vertices expected for a patch of the
-    /// type described
-    short GetNumControlVertices() const {
-        return GetNumControlVertices( this->GetType() );
-    }
-
-    /// \brief Deprecated @see PatchDescriptor#GetNumControlVertices
-    short GetNumFVarControlVertices() const {
-        return GetNumFVarControlVertices( this->GetType() );
-    }
-
-    /// \brief Number of control vertices of Regular Patches in table.
-    static short GetRegularPatchSize() { return 16; }
-
-    /// \brief Number of control vertices of Gregory (and Gregory Boundary) Patches in table.
-    static short GetGregoryPatchSize() { return 4; }
-
-    /// \brief Number of control vertices of Gregory patch basis (20)
-    static short GetGregoryBasisPatchSize() { return 20; }
-
-
-    /// \brief Returns a vector of all the legal patch descriptors for the
-    ///        given adaptive subdivision scheme
-    static Vtr::ConstArray<PatchDescriptor> GetAdaptivePatchDescriptors(Sdc::SchemeType type);
-
-    /// \brief Allows ordering of patches by type
-    inline bool operator < ( PatchDescriptor const other ) const;
-
-    /// \brief True if the descriptors are identical
-    inline bool operator == ( PatchDescriptor const other ) const;
-
-    // debug helper
-    void print() const;
-
-private:
-    unsigned int _type;
-};
-
-typedef Vtr::ConstArray<PatchDescriptor> ConstPatchDescriptorArray;
-
-// Returns the number of control vertices expected for a patch of this type
-inline short
-PatchDescriptor::GetNumControlVertices( Type type ) {
-    switch (type) {
-        case REGULAR           : return GetRegularPatchSize();
-        case LOOP              : return 12;
-        case QUADS             : return 4;
-        case GREGORY           :
-        case GREGORY_BOUNDARY  : return GetGregoryPatchSize();
-        case GREGORY_BASIS     : return GetGregoryBasisPatchSize();
-        case GREGORY_TRIANGLE  : return 18;
-        case TRIANGLES         : return 3;
-        case LINES             : return 2;
-        case POINTS            : return 1;
-        default : return -1;
-    }
-}
-
-// Returns the number of face-varying control vertices expected for a patch of this type
-inline short
-PatchDescriptor::GetNumFVarControlVertices( Type type ) {
-    return PatchDescriptor::GetNumControlVertices(type);
-}
-
-// Allows ordering of patches by type
-inline bool
-PatchDescriptor::operator < ( PatchDescriptor const other ) const {
-    return (_type < other._type);
-}
-
-// True if the descriptors are identical
-inline bool
-PatchDescriptor::operator == ( PatchDescriptor const other ) const {
-    return _type == other._type;
-}
-
-
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_PATCH_DESCRIPTOR_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchMap.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchMap.cpp
deleted file mode 100644
index 3156b7a6f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchMap.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../far/patchMap.h"
-
-#include <algorithm>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  Inline quadtree assembly methods used by the constructor:
-//
-
-// sets all the children to point to the patch of given index
-inline void
-PatchMap::QuadNode::SetChildren(int index) {
-
-    for (int i=0; i<4; ++i) {
-        children[i].isSet  = true;
-        children[i].isLeaf = true;
-        children[i].index  = index;
-    }
-}
-
-// sets the child in "quadrant" to point to the node or patch of the given index
-inline void
-PatchMap::QuadNode::SetChild(int quadrant, int index, bool isLeaf) {
-
-    assert(!children[quadrant].isSet);
-    children[quadrant].isSet  = true;
-    children[quadrant].isLeaf = isLeaf;
-    children[quadrant].index  = index;
-}
-
-inline void
-PatchMap::assignRootNode(QuadNode * node, int index) {
-
-    //  Assign the given index to all children of the node (all leaves)
-    node->SetChildren(index);
-}
-
-inline PatchMap::QuadNode *
-PatchMap::assignLeafOrChildNode(QuadNode * node, bool isLeaf, int quadrant, int index) {
-
-    //  Assign the node given if it is a leaf node, otherwise traverse
-    //  the node -- creating/assigning a new child node if needed
-
-    if (isLeaf) {
-        node->SetChild(quadrant, index, true);
-        return node;
-    }
-    if (node->children[quadrant].isSet) {
-        return &_quadtree[node->children[quadrant].index];
-    } else {
-        int newChildNodeIndex = (int)_quadtree.size();
-        _quadtree.push_back(QuadNode());
-        node->SetChild(quadrant, newChildNodeIndex, false);
-        return &_quadtree[newChildNodeIndex];
-    }
-}
-
-//
-//  Constructor and initialization methods for the handles and quadtree:
-//
-PatchMap::PatchMap(PatchTable const & patchTable) :
-    _minPatchFace(-1), _maxPatchFace(-1), _maxDepth(0) {
-
-    _patchesAreTriangular =
-        patchTable.GetVaryingPatchDescriptor().GetNumControlVertices() == 3;
-
-    if (patchTable.GetNumPatchesTotal() > 0) {
-        initializeHandles(patchTable);
-        initializeQuadtree(patchTable);
-    }
-}
-
-void
-PatchMap::initializeHandles(PatchTable const & patchTable) {
-
-    //
-    //  Populate the vector of patch Handles.  Keep track of the min and max
-    //  face indices to allocate resources accordingly and limit queries:
-    //
-    _minPatchFace = (int) patchTable.GetPatchParamTable()[0].GetFaceId();
-    _maxPatchFace = _minPatchFace;
-
-    int numArrays  = (int) patchTable.GetNumPatchArrays();
-    int numPatches = (int) patchTable.GetNumPatchesTotal();
-
-    _handles.resize(numPatches);
-
-    for (int pArray = 0, handleIndex = 0; pArray < numArrays; ++pArray) {
-
-        ConstPatchParamArray params = patchTable.GetPatchParams(pArray);
-
-        int patchSize = patchTable.GetPatchArrayDescriptor(pArray).GetNumControlVertices();
-
-        for (Index j=0; j < patchTable.GetNumPatches(pArray); ++j, ++handleIndex) {
-
-            Handle & h = _handles[handleIndex];
-
-            h.arrayIndex = pArray;
-            h.patchIndex = handleIndex;
-            h.vertIndex  = j * patchSize;
-
-            int patchFaceId = params[j].GetFaceId();
-            _minPatchFace = std::min(_minPatchFace, patchFaceId);
-            _maxPatchFace = std::max(_maxPatchFace, patchFaceId);
-        }
-    }
-}
-
-void
-PatchMap::initializeQuadtree(PatchTable const & patchTable) {
-
-    //
-    //  Reserve quadtree nodes for the worst case and prune later.  Set the
-    //  initial size to accomodate the root node of each patch face:
-    //
-    int nPatchFaces = (_maxPatchFace - _minPatchFace) + 1;
-
-    int nHandles = (int)_handles.size();
-
-    _quadtree.reserve(nPatchFaces + nHandles);
-    _quadtree.resize(nPatchFaces);
-
-    PatchParamTable const & params = patchTable.GetPatchParamTable();
-
-    for (int handle = 0; handle < nHandles; ++handle) {
-
-        PatchParam const & param = params[handle];
-
-        int depth     = param.GetDepth();
-        int rootDepth = param.NonQuadRoot();
-
-        _maxDepth = std::max(_maxDepth, depth);
-
-        QuadNode * node = &_quadtree[param.GetFaceId() - _minPatchFace];
-
-        if (depth == rootDepth) {
-            assignRootNode(node, handle);
-            continue;
-        }
-            
-        if (!_patchesAreTriangular) {
-            //  Use the UV bits of the PatchParam directly for quad patches:
-            int u = param.GetU();
-            int v = param.GetV();
-
-            for (int j = rootDepth + 1; j <= depth; ++j) {
-                int uBit = (u >> (depth - j)) & 1;
-                int vBit = (v >> (depth - j)) & 1;
-
-                int quadrant = (vBit << 1) | uBit;
-
-                node = assignLeafOrChildNode(node, (j == depth), quadrant, handle);
-            }
-        } else {
-            //  Use an interior UV point of triangles to identify quadrants:
-            double u = 0.25;
-            double v = 0.25;
-            param.UnnormalizeTriangle(u, v);
-
-            double median = 0.5;
-            bool triRotated = false;
-
-            for (int j = rootDepth + 1; j <= depth; ++j, median *= 0.5) {
-                int quadrant = transformUVToTriQuadrant(median, u, v, triRotated);
-
-                node = assignLeafOrChildNode(node, (j == depth), quadrant, handle);
-            }
-        }
-    }
-
-    //  Swap the Node vector with a copy to reduce worst case memory allocation:
-    QuadTree tmpTree = _quadtree;
-    _quadtree.swap(tmpTree);
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchMap.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchMap.h
deleted file mode 100644
index b7be906e9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchMap.h
+++ /dev/null
@@ -1,240 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_PATCH_MAP_H
-#define OPENSUBDIV3_FAR_PATCH_MAP_H
-
-#include "../version.h"
-
-#include "../far/patchTable.h"
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-/// \brief An quadtree-based map connecting coarse faces to their sub-patches
-///
-/// PatchTable::PatchArrays contain lists of patches that represent the limit
-/// surface of a mesh, sorted by their topological type. These arrays break the
-/// connection between coarse faces and their sub-patches.
-///
-/// The PatchMap provides a quad-tree based lookup structure that, given a singular
-/// parametric location, can efficiently return a handle to the sub-patch that
-/// contains this location.
-///
-class PatchMap {
-public:
-
-    typedef PatchTable::PatchHandle Handle;
-
-    /// \brief Constructor
-    ///
-    /// @param patchTable  A valid PatchTable
-    ///
-    PatchMap( PatchTable const & patchTable );
-
-    /// \brief Returns a handle to the sub-patch of the face at the given (u,v).
-    /// Note that the patch face ID corresponds to potentially quadrangulated
-    /// face indices and not the base face indices (see Far::PtexIndices for more
-    /// details).
-    ///
-    /// @param patchFaceId  The index of the patch (Ptex) face
-    ///
-    /// @param u       Local u parameter
-    ///
-    /// @param v       Local v parameter
-    ///
-    /// @return        A patch handle or 0 if the face is not supported (index
-    ///                out of bounds) or is tagged as a hole
-    ///
-    Handle const * FindPatch( int patchFaceId, double u, double v ) const;
-
-private:
-    void initializeHandles(PatchTable const & patchTable);
-    void initializeQuadtree(PatchTable const & patchTable);
-
-private:
-    // Quadtree node with 4 children, tree is just a vector of nodes
-    struct QuadNode {
-        QuadNode() { std::memset(this, 0, sizeof(QuadNode)); }
-
-        struct Child {
-            unsigned int isSet  :  1;  // true if the child has been set
-            unsigned int isLeaf :  1;  // true if the child is a QuadNode
-            unsigned int index  : 30;  // child index (either QuadNode or Handle)
-        };
-
-        // sets all the children to point to the patch of given index
-        void SetChildren(int index);
-
-        // sets the child in "quadrant" to point to the node or patch of the given index
-        void SetChild(int quadrant, int index, bool isLeaf);
-
-        Child children[4];
-    };
-    typedef std::vector<QuadNode> QuadTree;
-
-    // Internal methods supporting quadtree construction and queries
-    void       assignRootNode(QuadNode * node, int index);
-    QuadNode * assignLeafOrChildNode(QuadNode * node, bool isLeaf, int quad, int index);
-
-    template <class T>
-    static int transformUVToQuadQuadrant(T const & median, T & u, T & v);
-    template <class T>
-    static int transformUVToTriQuadrant(T const & median, T & u, T & v, bool & rotated);
-
-private:
-    bool _patchesAreTriangular;  // tri and quad assembly and search requirements differ
-
-    int  _minPatchFace;  // minimum patch face index supported by the map
-    int  _maxPatchFace;  // maximum patch face index supported by the map
-    int  _maxDepth;      // maximum depth of a patch in the tree
-
-    std::vector<Handle>   _handles;  // all the patches in the PatchTable
-    std::vector<QuadNode> _quadtree; // quadtree nodes
-};
-
-//
-//  Given a median value for both U and V, these methods transform a (u,v) pair
-//  into the quadrant that contains them and returns the quadrant index.
-//
-//  Quadrant indexing for tri and quad patches -- consistent with PatchParam's
-//  usage of UV bits:
-//
-//      (0,1) o-----o-----o (1,1)     (0,1) o     (1,0) o-----o-----o (0,0)  
-//            |     |     |                 |\           \  1 |\  0 |        
-//            |  2  |  3  |                 |  \           \  |  \  |        
-//            |     |     |                 | 2  \           \| 3  \|        
-//            o-----o-----o                 o-----o           o-----o        
-//            |     |     |                 |\  3 |\           \  2 |        
-//            |  0  |  1  |                 |  \  |  \           \  |        
-//            |     |     |                 | 0  \| 1  \           \|        
-//      (0,0) o-----o-----o (1,0)     (0,0) o-----o-----o (1,0)     o (0,1)  
-//
-//  The triangular case also takes and returns/affects the rotation of the
-//  quadrant being searched and identified (quadrant 3 imparts a rotation).
-//
-template <class T>
-inline int
-PatchMap::transformUVToQuadQuadrant(T const & median, T & u, T & v) {
-
-    int uHalf = (u >= median);
-    if (uHalf) u -= median;
-
-    int vHalf = (v >= median);
-    if (vHalf) v -= median;
-
-    return (vHalf << 1) | uHalf;
-}
-    
-template <class T>
-int inline
-PatchMap::transformUVToTriQuadrant(T const & median, T & u, T & v, bool & rotated) {
-    
-    if (!rotated) {
-        if (u >= median) {
-            u -= median;
-            return 1;
-        }
-        if (v >= median) {
-            v -= median;
-            return 2;
-        }
-        if ((u + v) >= median) {
-            rotated = true;
-            return 3;
-        }
-        return 0;
-    } else {
-        if (u < median) {
-            v -= median;
-            return 1;
-        }
-        if (v < median) {
-            u -= median;
-            return 2;
-        }
-        u -= median;
-        v -= median;
-        if ((u + v) < median) {
-            rotated = false;
-            return 3;
-        }
-        return 0;
-    }
-}
-
-/// Returns a handle to the sub-patch of the face at the given (u,v).
-inline PatchMap::Handle const *
-PatchMap::FindPatch( int faceid, double u, double v ) const {
-
-    //
-    //  Reject patch faces not supported by this map, or those corresponding
-    //  to holes or otherwise unassigned (the root node for a patch will
-    //  have all or no quadrants set):
-    //
-    if ((faceid < _minPatchFace) || (faceid > _maxPatchFace)) return 0;
-
-    QuadNode const * node = &_quadtree[faceid - _minPatchFace];
-
-    if (!node->children[0].isSet) return 0;
-
-    //
-    //  Search the tree for the sub-patch containing the given (u,v)
-    //
-    assert( (u>=0.0) && (u<=1.0) && (v>=0.0) && (v<=1.0) );
-
-    double median = 0.5;
-    bool triRotated = false;
-
-    for (int depth = 0; depth <= _maxDepth; ++depth, median *= 0.5) {
-
-        int quadrant = _patchesAreTriangular
-                     ? transformUVToTriQuadrant(median, u, v, triRotated)
-                     : transformUVToQuadQuadrant(median, u, v);
-
-        //  holes should have been rejected at the root node of the face
-        assert(node->children[quadrant].isSet);
-
-        if (node->children[quadrant].isLeaf) {
-            return &_handles[node->children[quadrant].index];
-        } else {
-            node = &_quadtree[node->children[quadrant].index];
-        }
-    }
-    assert(0);
-    return 0;
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_PATCH_PARAM */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchParam.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchParam.h
deleted file mode 100644
index 5499b3999..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchParam.h
+++ /dev/null
@@ -1,332 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_PATCH_PARAM_H
-#define OPENSUBDIV3_FAR_PATCH_PARAM_H
-
-#include "../version.h"
-
-#include "../far/types.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-/// \brief Patch parameterization
-///
-/// Topological refinement splits coarse mesh faces into refined faces.
-///
-/// This patch parameterzation describes the relationship between one
-/// of these refined faces and its corresponding coarse face. It is used
-/// both for refined faces that are represented as full limit surface
-/// parametric patches as well as for refined faces represented as simple
-/// triangles or quads. This parameterization is needed to interpolate
-/// primvar data across a refined face.
-///
-/// The U,V and refinement level parameters describe the scale and offset
-/// needed to map a location on the patch between levels of refinement.
-/// The encoding of these values exploits the quad-tree organization of
-/// the faces produced by subdivision. We encode the U,V origin of the
-/// patch using two 10-bit integer values and the refinement level as
-/// a 4-bit integer. This is sufficient to represent up through 10 levels
-/// of refinement.
-///
-/// Special consideration must be given to the refined faces resulting from
-/// irregular coarse faces. We adopt a convention similar to Ptex texture
-/// mapping and define the parameterization for these faces in terms of the
-/// regular faces resulting from the first topological splitting of the
-/// irregular coarse face.
-///
-/// When computing the basis functions needed to evaluate the limit surface
-/// parametric patch representing a refined face, we also need to know which
-/// edges of the patch are interpolated boundaries. These edges are encoded
-/// as a boundary bitmask identifying the boundary edges of the patch in
-/// sequential order starting from the first vertex of the refined face.
-///
-/// A sparse topological refinement (like feature adaptive refinement) can
-/// produce refined faces that are adjacent to faces at the next level of
-/// subdivision. We identify these transitional edges with a transition
-/// bitmask using the same encoding as the boundary bitmask.
-///
-/// For triangular subdivision schemes we specify the parameterization using
-/// a similar method. Alternate triangles at a given level of refinement
-/// are parameterized from their opposite corners and encoded as occupying
-/// the opposite diagonal of the quad-tree hierarchy. The third barycentric
-/// coordinate is dependent on and can be derived from the other two
-/// coordinates. This encoding also takes inspiration from the Ptex
-/// texture mapping specification.
-///
-/// Bitfield layout :
-///
-///  Field0     | Bits | Content
-///  -----------|:----:|------------------------------------------------------
-///  faceId     | 28   | the faceId of the patch
-///  transition | 4    | transition edge mask encoding
-///
-///  Field1     | Bits | Content
-///  -----------|:----:|------------------------------------------------------
-///  level      | 4    | the subdivision level of the patch
-///  nonquad    | 1    | whether patch is refined from a non-quad face
-///  regular    | 1    | whether patch is regular
-///  unused     | 1    | unused
-///  boundary   | 5    | boundary edge mask encoding
-///  v          | 10   | log2 value of u parameter at first patch corner
-///  u          | 10   | log2 value of v parameter at first patch corner
-///
-/// Note : the bitfield is not expanded in the struct due to differences in how
-///        GPU & CPU compilers pack bit-fields and endian-ness.
-///
-/*!
- \verbatim
- Quad Patch Parameterization
-
- (0,1)                           (1,1)
-   +-------+-------+---------------+
-   |       |       |               |
-   |   L2  |   L2  |               |
-   |0,3    |1,3    |               |
-   +-------+-------+       L1      |
-   |       |       |               |
-   |   L2  |   L2  |               |
-   |0,2    |1,2    |1,1            |
-   +-------+-------+---------------+
-   |               |               |
-   |               |               |
-   |               |               |
-   |       L1      |       L1      |
-   |               |               |
-   |               |               |
-   |0,0            |1,0            |
-   +---------------+---------------+
- (0,0)                           (1,0)
- \endverbatim
-*/
-/*!
- \verbatim
- Triangle Patch Parameterization
-
- (0,1)                           (1,1)  (0,1,0)
-   +-------+-------+---------------+       +
-   | \     | \     | \             |       | \
-   |L2 \   |L2 \   |   \           |       |   \
-   |0,3  \ |1,3  \ |     \         |       | L2  \
-   +-------+-------+       \       |       +-------+
-   | \     | \     |   L1    \     |       | \  L2 | \
-   |L2 \   |L2 \   |           \   |       |   \   |   \
-   |0,2  \ |1,2  \ |1,1          \ |       | L2  \ | L2  \
-   +-------+-------+---------------+       +-------+-------+
-   | \             | \             |       | \             | \
-   |   \           |   \           |       |   \           |   \
-   |     \         |     \         |       |     \    L1   |     \
-   |       \       |       \       |       |       \       |       \
-   |   L1    \     |   L1    \     |       |   L1    \     |   L1    \
-   |           \   |           \   |       |           \   |           \
-   |0,0          \ |1,0          \ |       |             \ |             \
-   +---------------+---------------+       +---------------+---------------+
- (0,0)                           (1,0)  (0,0,1)                         (1,0,0)
- \endverbatim
-*/
-
-struct PatchParam {
-    /// \brief Sets the values of the bit fields
-    ///
-    /// @param faceid face index
-    ///
-    /// @param u value of the u parameter for the first corner of the face
-    /// @param v value of the v parameter for the first corner of the face
-    ///
-    /// @param depth subdivision level of the patch
-    /// @param nonquad true if the root face is not a quad
-    ///
-    /// @param boundary 5-bits identifying boundary edges (and verts for tris)
-    /// @param transition 4-bits identifying transition edges
-    ///
-    /// @param regular whether the patch is regular
-    ///
-    void Set(Index faceid, short u, short v,
-             unsigned short depth, bool nonquad,
-             unsigned short boundary, unsigned short transition,
-             bool regular = false);
-
-    /// \brief Resets everything to 0
-    void Clear() { field0 = field1 = 0; }
-
-    /// \brief Returns the faceid
-    Index GetFaceId() const { return Index(unpack(field0,28,0)); }
-
-    /// \brief Returns the log2 value of the u parameter at
-    /// the first corner of the patch
-    unsigned short GetU() const { return (unsigned short)unpack(field1,10,22); }
-
-    /// \brief Returns the log2 value of the v parameter at
-    /// the first corner of the patch
-    unsigned short GetV() const { return (unsigned short)unpack(field1,10,12); }
-
-    /// \brief Returns the transition edge encoding for the patch.
-    unsigned short GetTransition() const { return (unsigned short)unpack(field0,4,28); }
-
-    /// \brief Returns the boundary edge encoding for the patch.
-    unsigned short GetBoundary() const { return (unsigned short)unpack(field1,5,7); }
-
-    /// \brief True if the parent base face is a non-quad
-    bool NonQuadRoot() const { return (unpack(field1,1,4) != 0); }
-
-    /// \brief Returns the level of subdivision of the patch
-    unsigned short GetDepth() const { return (unsigned short)unpack(field1,4,0); }
-
-    /// \brief Returns the fraction of unit parametric space covered by this face.
-    float GetParamFraction() const;
-
-    /// \brief A (u,v) pair in the fraction of parametric space covered by this
-    /// face is mapped into a normalized parametric space.
-    ///
-    /// @param u  u parameter
-    /// @param v  v parameter
-    ///
-    template <typename REAL>
-    void Normalize( REAL & u, REAL & v ) const;
-    template <typename REAL>
-    void NormalizeTriangle( REAL & u, REAL & v ) const;
-
-    /// \brief A (u,v) pair in a normalized parametric space is mapped back into the
-    /// fraction of parametric space covered by this face.
-    ///
-    /// @param u  u parameter
-    /// @param v  v parameter
-    ///
-    template <typename REAL>
-    void Unnormalize( REAL & u, REAL & v ) const;
-    template <typename REAL>
-    void UnnormalizeTriangle( REAL & u, REAL & v ) const;
-
-    /// \brief Returns if a triangular patch is parametrically rotated 180 degrees
-    bool IsTriangleRotated() const;
-
-    /// \brief Returns whether the patch is regular
-    bool IsRegular() const { return (unpack(field1,1,5) != 0); }
-
-    unsigned int field0:32;
-    unsigned int field1:32;
-
-private:
-    unsigned int pack(unsigned int value, int width, int offset) const {
-        return (unsigned int)((value & ((1<<width)-1)) << offset);
-    }
-
-    unsigned int unpack(unsigned int value, int width, int offset) const {
-        return (unsigned int)((value >> offset) & ((1<<width)-1));
-    }
-};
-
-typedef std::vector<PatchParam> PatchParamTable;
-
-typedef Vtr::Array<PatchParam> PatchParamArray;
-typedef Vtr::ConstArray<PatchParam> ConstPatchParamArray;
-
-inline void
-PatchParam::Set(Index faceid, short u, short v,
-                unsigned short depth, bool nonquad,
-                unsigned short boundary, unsigned short transition,
-                bool regular) {
-    field0 = pack(faceid,    28,  0) |
-             pack(transition, 4, 28);
-
-    field1 = pack(u,         10, 22) |
-             pack(v,         10, 12) |
-             pack(boundary,   5,  7) |
-             pack(regular,    1,  5) |
-             pack(nonquad,    1,  4) |
-             pack(depth,      4,  0);
-}
-
-inline float
-PatchParam::GetParamFraction( ) const {
-    return 1.0f / (float)(1 << (GetDepth() - NonQuadRoot()));
-}
-
-template <typename REAL>
-inline void
-PatchParam::Normalize( REAL & u, REAL & v ) const {
-
-    REAL fracInv = (REAL)(1.0f / GetParamFraction());
-
-    u = u * fracInv - (REAL)GetU();
-    v = v * fracInv - (REAL)GetV();
-}
-
-template <typename REAL>
-inline void
-PatchParam::Unnormalize( REAL & u, REAL & v ) const {
-
-    REAL frac = (REAL)GetParamFraction();
-
-    u = (u + (REAL)GetU()) * frac;
-    v = (v + (REAL)GetV()) * frac;
-}
-
-inline bool
-PatchParam::IsTriangleRotated() const {
-
-    return (GetU() + GetV()) >= (1 << GetDepth());
-}
-
-template <typename REAL>
-inline void
-PatchParam::NormalizeTriangle( REAL & u, REAL & v ) const {
-
-    if (IsTriangleRotated()) {
-        REAL fracInv = (REAL)(1.0f / GetParamFraction());
-
-        int depthFactor = 1 << GetDepth();
-        u = (REAL)(depthFactor - GetU()) - (u * fracInv);
-        v = (REAL)(depthFactor - GetV()) - (v * fracInv);
-    } else {
-        Normalize(u, v);
-    }
-}
-
-template <typename REAL>
-inline void
-PatchParam::UnnormalizeTriangle( REAL & u, REAL & v ) const {
-
-    if (IsTriangleRotated()) {
-        REAL frac = GetParamFraction();
-
-        int depthFactor = 1 << GetDepth();
-        u = ((REAL)(depthFactor - GetU()) - u) * frac;
-        v = ((REAL)(depthFactor - GetV()) - v) * frac;
-    } else {
-        Unnormalize(u, v);
-    }
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_PATCH_PARAM */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTable.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTable.cpp
deleted file mode 100644
index 2c7613be4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTable.cpp
+++ /dev/null
@@ -1,708 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../far/patchTable.h"
-#include "../far/patchBasis.h"
-
-#include <algorithm>
-#include <cstring>
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-PatchTable::PatchTable(int maxvalence) :
-    _maxValence(maxvalence),
-    _localPointStencils(),
-    _localPointVaryingStencils(),
-    _varyingDesc(Far::PatchDescriptor::QUADS),
-    _isUniformLinear(false),
-    _vertexPrecisionIsDouble(false),
-    _varyingPrecisionIsDouble(false),
-    _faceVaryingPrecisionIsDouble(false) {
-}
-
-// Copy constructor
-// XXXX manuelk we need to eliminate this constructor (C++11 smart pointers)
-PatchTable::PatchTable(PatchTable const & src) :
-    _maxValence(src._maxValence),
-    _numPtexFaces(src._numPtexFaces),
-    _patchArrays(src._patchArrays),
-    _patchVerts(src._patchVerts),
-    _paramTable(src._paramTable),
-    _quadOffsetsTable(src._quadOffsetsTable),
-    _vertexValenceTable(src._vertexValenceTable),
-    _localPointStencils(src._localPointStencils),
-    _localPointVaryingStencils(src._localPointVaryingStencils),
-    _varyingDesc(src._varyingDesc),
-    _fvarChannels(src._fvarChannels),
-    _sharpnessIndices(src._sharpnessIndices),
-    _sharpnessValues(src._sharpnessValues),
-    _isUniformLinear(src._isUniformLinear),
-    _vertexPrecisionIsDouble(src._vertexPrecisionIsDouble),
-    _varyingPrecisionIsDouble(src._varyingPrecisionIsDouble),
-    _faceVaryingPrecisionIsDouble(src._faceVaryingPrecisionIsDouble) {
-
-    if (src._localPointStencils) {
-        if (src._vertexPrecisionIsDouble) {
-            _localPointStencils.Set(
-                new StencilTableReal<double>(*src._localPointStencils.Get<double>()));
-        } else {
-            _localPointStencils.Set(
-                new StencilTableReal<float>(*src._localPointStencils.Get<float>()));
-        }
-    }
-    if (src._localPointVaryingStencils) {
-        if (src._varyingPrecisionIsDouble) {
-            _localPointVaryingStencils.Set(
-                new StencilTableReal<double>(*src._localPointVaryingStencils.Get<double>()));
-        } else {
-            _localPointVaryingStencils.Set(
-                new StencilTableReal<float>(*src._localPointVaryingStencils.Get<float>()));
-        }
-    }
-    if (! src._localPointFaceVaryingStencils.empty()) {
-        _localPointFaceVaryingStencils.resize(src._localPointFaceVaryingStencils.size());
-        for (int fvc=0; fvc<(int)_localPointFaceVaryingStencils.size(); ++fvc) {
-            if (src._localPointFaceVaryingStencils[fvc]) {
-                if (src._faceVaryingPrecisionIsDouble) {
-                    _localPointFaceVaryingStencils[fvc].Set(new StencilTableReal<double>(
-                            *src._localPointFaceVaryingStencils[fvc].Get<double>()));
-                } else {
-                    _localPointFaceVaryingStencils[fvc].Set(new StencilTableReal<float>(
-                            *src._localPointFaceVaryingStencils[fvc].Get<float>()));
-                }
-            }
-        }
-    }
-}
-
-PatchTable::~PatchTable() {
-    if (_vertexPrecisionIsDouble) {
-        delete _localPointStencils.Get<double>();
-    } else {
-        delete _localPointStencils.Get<float>();
-    }
-
-    if (_varyingPrecisionIsDouble) {
-        delete _localPointVaryingStencils.Get<double>();
-    } else {
-        delete _localPointVaryingStencils.Get<float>();
-    }
-
-    for (int fvc=0; fvc<(int)_localPointFaceVaryingStencils.size(); ++fvc) {
-        if (_faceVaryingPrecisionIsDouble) {
-            delete _localPointFaceVaryingStencils[fvc].Get<double>();
-        } else {
-            delete _localPointFaceVaryingStencils[fvc].Get<float>();
-        }
-    }
-}
-
-//
-// PatchArrays
-//
-struct PatchTable::PatchArray {
-
-    PatchArray(PatchDescriptor d, int np, Index v, Index p, Index qo) :
-            desc(d), numPatches(np), vertIndex(v),
-                patchIndex(p), quadOffsetIndex (qo) { }
-
-    void print() const;
-
-    PatchDescriptor desc;  // type of patches in the array
-
-    int numPatches;        // number of patches in the array
-
-    Index vertIndex,       // index to the first control vertex
-          patchIndex,      // absolute index of the first patch in the array
-          quadOffsetIndex; // index of the first quad offset entry
-
-};
-
-// debug helper
-void
-PatchTable::PatchArray::print() const {
-    desc.print();
-    printf("    numPatches=%d vertIndex=%d patchIndex=%d "
-        "quadOffsetIndex=%d\n", numPatches, vertIndex, patchIndex,
-            quadOffsetIndex);
-}
-inline PatchTable::PatchArray &
-PatchTable::getPatchArray(Index arrayIndex) {
-    assert(arrayIndex<(Index)GetNumPatchArrays());
-    return _patchArrays[arrayIndex];
-}
-inline PatchTable::PatchArray const &
-PatchTable::getPatchArray(Index arrayIndex) const {
-    assert(arrayIndex<(Index)GetNumPatchArrays());
-    return _patchArrays[arrayIndex];
-}
-void
-PatchTable::reservePatchArrays(int numPatchArrays) {
-    _patchArrays.reserve(numPatchArrays);
-}
-
-//
-// FVarPatchChannel
-//
-// Stores a record for each patch in the primitive :
-//
-//  - Each patch in the PatchTable has a corresponding patch in each
-//    face-varying patch channel. Patch vertex indices are sorted in the same
-//    patch-type order as PatchTable::PTables. Face-varying data for a patch
-//    can therefore be quickly accessed by using the patch primitive ID as
-//    index into patchValueOffsets to locate the face-varying control vertex
-//    indices.
-//
-//  - Face-varying channels can have a different interpolation modes
-//
-//  - Unlike "vertex" patches, there are no transition masks required
-//    for face-varying patches.
-//
-//  - Face-varying patches still require boundary edge masks.
-//
-//  - currently most patches with sharp boundaries but smooth interiors have
-//    to be isolated to level 10 : we need a special type of bicubic patch
-//    similar to single-crease to resolve this condition without requiring
-//    isolation if possible
-//
-struct PatchTable::FVarPatchChannel {
-
-    Sdc::Options::FVarLinearInterpolation interpolation;
-
-    PatchDescriptor regDesc;
-    PatchDescriptor irregDesc;
-
-    int stride;
-
-    std::vector<Index> patchValues;
-    std::vector<PatchParam> patchParam;
-};
-
-void
-PatchTable::allocateVaryingVertices(
-        PatchDescriptor desc, int numPatches) {
-    _varyingDesc = desc;
-    _varyingVerts.resize(numPatches*desc.GetNumControlVertices());
-}
-
-inline PatchTable::FVarPatchChannel &
-PatchTable::getFVarPatchChannel(int channel) {
-    assert(channel>=0 && channel<(int)_fvarChannels.size());
-    return _fvarChannels[channel];
-}
-inline PatchTable::FVarPatchChannel const &
-PatchTable::getFVarPatchChannel(int channel) const {
-    assert(channel>=0 && channel<(int)_fvarChannels.size());
-    return _fvarChannels[channel];
-}
-void
-PatchTable::allocateFVarPatchChannels(int numChannels) {
-    _fvarChannels.resize(numChannels);
-}
-void
-PatchTable::allocateFVarPatchChannelValues(
-        PatchDescriptor regDesc, PatchDescriptor irregDesc,
-        int numPatches, int channel) {
-    FVarPatchChannel & c = getFVarPatchChannel(channel);
-    c.regDesc   = regDesc;
-    c.irregDesc = irregDesc;
-
-    c.stride = std::max(regDesc.GetNumControlVertices(),
-                        irregDesc.GetNumControlVertices());
-
-    c.patchValues.resize(numPatches * c.stride);
-    c.patchParam.resize(numPatches);
-}
-void
-PatchTable::setFVarPatchChannelLinearInterpolation(
-        Sdc::Options::FVarLinearInterpolation interpolation, int channel) {
-    FVarPatchChannel & c = getFVarPatchChannel(channel);
-    c.interpolation = interpolation;
-}
-
-//
-// PatchTable
-//
-
-inline int
-getPatchSize(PatchDescriptor desc) {
-    return desc.GetNumControlVertices();
-}
-
-void
-PatchTable::pushPatchArray(PatchDescriptor desc, int npatches,
-    Index * vidx, Index * pidx, Index * qoidx) {
-
-    if (npatches>0) {
-        _patchArrays.push_back(PatchArray(
-            desc, npatches, *vidx, *pidx, qoidx ? *qoidx : 0));
-        int nverts = getPatchSize(desc);
-        *vidx += npatches * nverts;
-        *pidx += npatches;
-        if (qoidx) {
-            *qoidx += (desc.GetType() == PatchDescriptor::GREGORY) ?
-                npatches*nverts  : 0;
-        }
-    }
-}
-
-int
-PatchTable::getPatchIndex(int arrayIndex, int patchIndex) const {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    assert(patchIndex<pa.numPatches);
-    return pa.patchIndex + patchIndex;
-}
-Index *
-PatchTable::getSharpnessIndices(int arrayIndex) {
-    return &_sharpnessIndices[getPatchArray(arrayIndex).patchIndex];
-}
-
-float *
-PatchTable::getSharpnessValues(int arrayIndex) {
-    return &_sharpnessValues[getPatchArray(arrayIndex).patchIndex];
-}
-
-PatchDescriptor
-PatchTable::GetPatchDescriptor(PatchHandle const & handle) const {
-    return getPatchArray(handle.arrayIndex).desc;
-}
-
-PatchDescriptor
-PatchTable::GetPatchArrayDescriptor(int arrayIndex) const {
-    return getPatchArray(arrayIndex).desc;
-}
-
-int
-PatchTable::GetNumPatchArrays() const {
-    return (int)_patchArrays.size();
-}
-int
-PatchTable::GetNumPatches(int arrayIndex) const {
-    return getPatchArray(arrayIndex).numPatches;
-}
-int
-PatchTable::GetNumPatchesTotal() const {
-    // there is one PatchParam record for each patch in the mesh
-    return (int)_paramTable.size();
-}
-int
-PatchTable::GetNumControlVertices(int arrayIndex) const {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    return pa.numPatches * getPatchSize(pa.desc);
-}
-
-Index
-PatchTable::findPatchArray(PatchDescriptor desc) {
-    for (int i=0; i<(int)_patchArrays.size(); ++i) {
-        if (_patchArrays[i].desc==desc)
-            return i;
-    }
-    return Vtr::INDEX_INVALID;
-}
-IndexArray
-PatchTable::getPatchArrayVertices(int arrayIndex) {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    int size = getPatchSize(pa.desc);
-    assert(pa.vertIndex<(Index)_patchVerts.size());
-    return IndexArray(&_patchVerts[pa.vertIndex], pa.numPatches * size);
-}
-ConstIndexArray
-PatchTable::GetPatchArrayVertices(int arrayIndex) const {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    int size = getPatchSize(pa.desc);
-    assert(pa.vertIndex<(Index)_patchVerts.size());
-    return ConstIndexArray(&_patchVerts[pa.vertIndex], pa.numPatches * size);
-}
-
-ConstIndexArray
-PatchTable::GetPatchVertices(PatchHandle const & handle) const {
-    PatchArray const & pa = getPatchArray(handle.arrayIndex);
-    Index vert = pa.vertIndex + handle.vertIndex;
-    return ConstIndexArray(&_patchVerts[vert], getPatchSize(pa.desc));
-}
-ConstIndexArray
-PatchTable::GetPatchVertices(int arrayIndex, int patchIndex) const {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    int size = getPatchSize(pa.desc);
-    assert((pa.vertIndex + patchIndex*size)<(Index)_patchVerts.size());
-    return ConstIndexArray(&_patchVerts[pa.vertIndex + patchIndex*size], size);
-}
-
-PatchParam
-PatchTable::GetPatchParam(PatchHandle const & handle) const {
-    assert(handle.patchIndex < (Index)_paramTable.size());
-    return _paramTable[handle.patchIndex];
-}
-PatchParam
-PatchTable::GetPatchParam(int arrayIndex, int patchIndex) const {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    assert((pa.patchIndex + patchIndex) < (int)_paramTable.size());
-    return _paramTable[pa.patchIndex + patchIndex];
-}
-PatchParamArray
-PatchTable::getPatchParams(int arrayIndex) {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    return PatchParamArray(&_paramTable[pa.patchIndex], pa.numPatches);
-}
-ConstPatchParamArray const
-PatchTable::GetPatchParams(int arrayIndex) const {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    return ConstPatchParamArray(&_paramTable[pa.patchIndex], pa.numPatches);
-}
-
-float
-PatchTable::GetSingleCreasePatchSharpnessValue(PatchHandle const & handle) const {
-    assert((handle.patchIndex) < (int)_sharpnessIndices.size());
-    Index index = _sharpnessIndices[handle.patchIndex];
-    if (index == Vtr::INDEX_INVALID) {
-        return 0.0f;
-    }
-    assert(index < (Index)_sharpnessValues.size());
-    return _sharpnessValues[index];
-}
-float
-PatchTable::GetSingleCreasePatchSharpnessValue(int arrayIndex, int patchIndex) const {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    assert((pa.patchIndex + patchIndex) < (int)_sharpnessIndices.size());
-    Index index = _sharpnessIndices[pa.patchIndex + patchIndex];
-    if (index == Vtr::INDEX_INVALID) {
-        return 0.0f;
-    }
-    assert(index < (Index)_sharpnessValues.size());
-    return _sharpnessValues[index];
-}
-
-int
-PatchTable::GetNumLocalPoints() const {
-    if (!_localPointStencils) return 0;
-    return _vertexPrecisionIsDouble
-                ? _localPointStencils.Get<double>()->GetNumStencils()
-                : _localPointStencils.Get<float>()->GetNumStencils();
-}
-int
-PatchTable::GetNumLocalPointsVarying() const {
-    if (!_localPointVaryingStencils) return 0;
-    return _varyingPrecisionIsDouble
-                ? _localPointVaryingStencils.Get<double>()->GetNumStencils()
-                : _localPointVaryingStencils.Get<float>()->GetNumStencils();
-}
-int
-PatchTable::GetNumLocalPointsFaceVarying(int channel) const {
-    if (channel>=0 && channel<(int)_localPointFaceVaryingStencils.size()) {
-        if (!_localPointFaceVaryingStencils[channel]) return 0;
-        return _faceVaryingPrecisionIsDouble
-                    ? _localPointFaceVaryingStencils[channel].Get<double>()->GetNumStencils()
-                    : _localPointFaceVaryingStencils[channel].Get<float>()->GetNumStencils();
-    }
-    return 0;
-}
-
-PatchTable::ConstQuadOffsetsArray
-PatchTable::GetPatchQuadOffsets(PatchHandle const & handle) const {
-    PatchArray const & pa = getPatchArray(handle.arrayIndex);
-    return Vtr::ConstArray<unsigned int>(&_quadOffsetsTable[pa.quadOffsetIndex + handle.vertIndex], 4);
-}
-bool
-PatchTable::IsFeatureAdaptive() const {
-
-    return !_isUniformLinear;
-}
-
-PatchDescriptor
-PatchTable::GetVaryingPatchDescriptor() const {
-    return _varyingDesc;
-}
-ConstIndexArray
-PatchTable::GetPatchVaryingVertices(PatchHandle const & handle) const {
-    if (_varyingVerts.empty()) {
-        return ConstIndexArray();
-    }
-    int numVaryingCVs = _varyingDesc.GetNumControlVertices();
-    Index start = handle.patchIndex * numVaryingCVs;
-    return ConstIndexArray(&_varyingVerts[start], numVaryingCVs);
-}
-ConstIndexArray
-PatchTable::GetPatchVaryingVertices(int array, int patch) const {
-    if (_varyingVerts.empty()) {
-        return ConstIndexArray();
-    }
-    PatchArray const & pa = getPatchArray(array);
-    int numVaryingCVs = _varyingDesc.GetNumControlVertices();
-    Index start = (pa.patchIndex + patch) * numVaryingCVs;
-    return ConstIndexArray(&_varyingVerts[start], numVaryingCVs);
-}
-ConstIndexArray
-PatchTable::GetPatchArrayVaryingVertices(int array) const {
-    if (_varyingVerts.empty()) {
-        return ConstIndexArray();
-    }
-    PatchArray const & pa = getPatchArray(array);
-    int numVaryingCVs = _varyingDesc.GetNumControlVertices();
-    Index start = pa.patchIndex * numVaryingCVs;
-    Index count = pa.numPatches * numVaryingCVs;
-    return ConstIndexArray(&_varyingVerts[start], count);
-}
-ConstIndexArray
-PatchTable::GetVaryingVertices() const {
-    if (_varyingVerts.empty()) {
-        return ConstIndexArray();
-    }
-    return ConstIndexArray(&_varyingVerts[0], (int)_varyingVerts.size());
-}
-IndexArray
-PatchTable::getPatchArrayVaryingVertices(int arrayIndex) {
-    PatchArray const & pa = getPatchArray(arrayIndex);
-    int numVaryingCVs = _varyingDesc.GetNumControlVertices();
-    Index start = pa.patchIndex * numVaryingCVs;
-    return IndexArray(&_varyingVerts[start], pa.numPatches * numVaryingCVs);
-}
-void
-PatchTable::populateVaryingVertices() {
-    // In order to support evaluation of varying data we need to access
-    // the varying values indexed by the zero ring vertices of the vertex
-    // patch. This indexing is redundant for triangles and quads and
-    // could be made redunant for other patch types if we reorganized
-    // the vertex patch indices so that the zero ring indices always occured
-    // first. This will also need to be updated when we add support for
-    // triangle patches.
-    int numVaryingCVs = _varyingDesc.GetNumControlVertices();
-    for (int arrayIndex=0; arrayIndex<(int)_patchArrays.size(); ++arrayIndex) {
-        PatchArray const & pa = getPatchArray(arrayIndex);
-        PatchDescriptor::Type patchType = pa.desc.GetType();
-        for (int patch=0; patch<pa.numPatches; ++patch) {
-            ConstIndexArray vertexCVs = GetPatchVertices(arrayIndex, patch);
-            int start = (pa.patchIndex + patch) * numVaryingCVs;
-            if (patchType == PatchDescriptor::REGULAR) {
-                _varyingVerts[start+0] = vertexCVs[5];
-                _varyingVerts[start+1] = vertexCVs[6];
-                _varyingVerts[start+2] = vertexCVs[10];
-                _varyingVerts[start+3] = vertexCVs[9];
-            } else if (patchType == PatchDescriptor::GREGORY_BASIS) {
-                _varyingVerts[start+0] = vertexCVs[0];
-                _varyingVerts[start+1] = vertexCVs[5];
-                _varyingVerts[start+2] = vertexCVs[10];
-                _varyingVerts[start+3] = vertexCVs[15];
-            } else if (patchType == PatchDescriptor::QUADS) {
-                _varyingVerts[start+0] = vertexCVs[0];
-                _varyingVerts[start+1] = vertexCVs[1];
-                _varyingVerts[start+2] = vertexCVs[2];
-                _varyingVerts[start+3] = vertexCVs[3];
-            } else if (patchType == PatchDescriptor::TRIANGLES) {
-                _varyingVerts[start+0] = vertexCVs[0];
-                _varyingVerts[start+1] = vertexCVs[1];
-                _varyingVerts[start+2] = vertexCVs[2];
-            }
-        }
-    }
-}
-
-int
-PatchTable::GetNumFVarChannels() const {
-    return (int)_fvarChannels.size();
-}
-Sdc::Options::FVarLinearInterpolation
-PatchTable::GetFVarChannelLinearInterpolation(int channel) const {
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    return c.interpolation;
-}
-PatchDescriptor
-PatchTable::GetFVarPatchDescriptorRegular(int channel) const {
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    return c.regDesc;
-}
-PatchDescriptor
-PatchTable::GetFVarPatchDescriptorIrregular(int channel) const {
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    return c.irregDesc;
-}
-PatchDescriptor
-PatchTable::GetFVarPatchDescriptor(int channel) const {
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    return c.irregDesc;
-}
-ConstIndexArray
-PatchTable::GetFVarValues(int channel) const {
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    return ConstIndexArray(&c.patchValues[0], (int)c.patchValues.size());
-}
-int
-PatchTable::GetFVarValueStride(int channel) const {
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    return c.stride;
-}
-IndexArray
-PatchTable::getFVarValues(int channel) {
-    FVarPatchChannel & c = getFVarPatchChannel(channel);
-    return IndexArray(&c.patchValues[0], (int)c.patchValues.size());
-}
-ConstIndexArray
-PatchTable::getPatchFVarValues(int patch, int channel) const {
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    int ncvsThisPatch = c.patchParam[patch].IsRegular()
-                      ? c.regDesc.GetNumControlVertices()
-                      : c.irregDesc.GetNumControlVertices();
-    return ConstIndexArray(&c.patchValues[patch * c.stride], ncvsThisPatch);
-}
-ConstIndexArray
-PatchTable::GetPatchFVarValues(PatchHandle const & handle, int channel) const {
-    return getPatchFVarValues(handle.patchIndex, channel);
-}
-ConstIndexArray
-PatchTable::GetPatchFVarValues(int arrayIndex, int patchIndex, int channel) const {
-    return getPatchFVarValues(getPatchIndex(arrayIndex, patchIndex), channel);
-}
-ConstIndexArray
-PatchTable::GetPatchArrayFVarValues(int array, int channel) const {
-    PatchArray const & pa = getPatchArray(array);
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    int ncvs = c.stride;
-    int start = pa.patchIndex * ncvs;
-    int count = pa.numPatches * ncvs;
-    return ConstIndexArray(&c.patchValues[start], count);
-}
-PatchParam
-PatchTable::getPatchFVarPatchParam(int patch, int channel) const {
-
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    return c.patchParam[patch];
-}
-PatchParam
-PatchTable::GetPatchFVarPatchParam(PatchHandle const & handle, int channel) const {
-    return getPatchFVarPatchParam(handle.patchIndex, channel);
-}
-PatchParam
-PatchTable::GetPatchFVarPatchParam(int arrayIndex, int patchIndex, int channel) const {
-    return getPatchFVarPatchParam(getPatchIndex(arrayIndex, patchIndex), channel);
-}
-ConstPatchParamArray
-PatchTable::GetPatchArrayFVarPatchParams(int array, int channel) const {
-    PatchArray const & pa = getPatchArray(array);
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    return ConstPatchParamArray(&c.patchParam[pa.patchIndex], pa.numPatches);
-}
-ConstPatchParamArray
-PatchTable::GetFVarPatchParams(int channel) const {
-    FVarPatchChannel const & c = getFVarPatchChannel(channel);
-    return ConstPatchParamArray(&c.patchParam[0], (int)c.patchParam.size());
-}
-PatchParamArray
-PatchTable::getFVarPatchParams(int channel) {
-    FVarPatchChannel & c = getFVarPatchChannel(channel);
-    return PatchParamArray(&c.patchParam[0], (int)c.patchParam.size());
-}
-
-void
-PatchTable::print() const {
-    printf("patchTable (0x%p)\n", this);
-    printf("  numPatches = %d\n", GetNumPatchesTotal());
-    for (int i=0; i<GetNumPatchArrays(); ++i) {
-        printf("  patchArray %d:\n", i);
-        PatchArray const & pa = getPatchArray(i);
-        pa.print();
-    }
-}
-
-//
-//  Evaluate basis functions for vertex and derivatives at (s,t):
-//
-template <typename REAL>
-void
-PatchTable::EvaluateBasis(
-    PatchHandle const & handle, REAL s, REAL t,
-    REAL wP[], REAL wDs[], REAL wDt[],
-    REAL wDss[], REAL wDst[], REAL wDtt[]) const {
-
-    PatchParam const & param = _paramTable[handle.patchIndex];
-    PatchDescriptor::Type patchType = GetPatchArrayDescriptor(handle.arrayIndex).GetType();
-
-    internal::EvaluatePatchBasis(patchType, param, s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-}
-
-//
-//  Evaluate basis functions for varying and derivatives at (s,t):
-//
-template <typename REAL>
-void
-PatchTable::EvaluateBasisVarying(
-    PatchHandle const & handle, REAL s, REAL t,
-    REAL wP[], REAL wDs[], REAL wDt[],
-    REAL wDss[], REAL wDst[], REAL wDtt[]) const {
-
-    PatchParam const & param = _paramTable[handle.patchIndex];
-    PatchDescriptor::Type patchType = GetVaryingPatchDescriptor().GetType();
-
-    internal::EvaluatePatchBasis(patchType, param, s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-}
-
-//
-//  Evaluate basis functions for face-varying and derivatives at (s,t):
-//
-template <typename REAL>
-void
-PatchTable::EvaluateBasisFaceVarying(
-    PatchHandle const & handle, REAL s, REAL t,
-    REAL wP[], REAL wDs[], REAL wDt[],
-    REAL wDss[], REAL wDst[], REAL wDtt[],
-    int channel) const {
-
-    PatchParam param = getPatchFVarPatchParam(handle.patchIndex, channel);
-    PatchDescriptor::Type patchType = param.IsRegular()
-            ? GetFVarPatchDescriptorRegular(channel).GetType()
-            : GetFVarPatchDescriptorIrregular(channel).GetType();
-
-    internal::EvaluatePatchBasis(patchType, param, s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-}
-
-
-//
-//  Explicit instantiation of EvaluateBasis...() methods for float and double:
-//
-template void PatchTable::EvaluateBasis<float>(PatchHandle const & handle,
-        float s, float t, float wP[], float wDs[], float wDt[],
-        float wDss[], float wDst[], float wDtt[]) const;
-template void PatchTable::EvaluateBasisVarying<float>(PatchHandle const & handle,
-        float s, float t, float wP[], float wDs[], float wDt[],
-        float wDss[], float wDst[], float wDtt[]) const;
-template void PatchTable::EvaluateBasisFaceVarying<float>(PatchHandle const & handle,
-        float s, float t, float wP[], float wDs[], float wDt[],
-        float wDss[], float wDst[], float wDtt[], int channel) const;
-
-template void PatchTable::EvaluateBasis<double>(PatchHandle const & handle,
-        double s, double t, double wP[], double wDs[], double wDt[],
-        double wDss[], double wDst[], double wDtt[]) const;
-template void PatchTable::EvaluateBasisVarying<double>(PatchHandle const & handle,
-        double s, double t, double wP[], double wDs[], double wDt[],
-        double wDss[], double wDst[], double wDtt[]) const;
-template void PatchTable::EvaluateBasisFaceVarying<double>(PatchHandle const & handle,
-        double s, double t, double wP[], double wDs[], double wDt[],
-        double wDss[], double wDst[], double wDtt[], int channel) const;
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTable.h
deleted file mode 100644
index 8be51ccb5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTable.h
+++ /dev/null
@@ -1,861 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_PATCH_TABLE_H
-#define OPENSUBDIV3_FAR_PATCH_TABLE_H
-
-#include "../version.h"
-
-#include "../far/patchDescriptor.h"
-#include "../far/patchParam.h"
-#include "../far/stencilTable.h"
-
-#include "../sdc/options.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-/// \brief Container for arrays of parametric patches
-///
-/// PatchTable contains topology and parametric information about the patches
-/// generated by the Refinement process. Patches in the table are sorted into
-/// arrays based on their PatchDescriptor Type.
-///
-/// Note : PatchTable can be accessed either using a PatchHandle or a
-///        combination of array and patch indices.
-///
-/// XXXX manuelk we should add a PatchIterator that can dereference into
-///              a PatchHandle for fast linear traversal of the table
-///
-class PatchTable {
-
-public:
-
-    /// \brief Handle that can be used as unique patch identifier within PatchTable
-    class PatchHandle {
-    // XXXX manuelk members will eventually be made private
-    public:
-
-        friend class PatchTable;
-        friend class PatchMap;
-
-        Index arrayIndex, // Array index of the patch
-              patchIndex, // Absolute Index of the patch
-              vertIndex;  // Relative offset to the first CV of the patch in array
-    };
-
-public:
-
-    /// \brief Copy constructor
-    PatchTable(PatchTable const & src);
-
-    /// \brief Destructor
-    ~PatchTable();
-
-    /// \brief True if the patches are of feature adaptive types
-    bool IsFeatureAdaptive() const;
-
-    /// \brief Returns the total number of control vertex indices in the table
-    int GetNumControlVerticesTotal() const {
-        return (int)_patchVerts.size();
-    }
-
-    /// \brief Returns the total number of patches stored in the table
-    int GetNumPatchesTotal() const;
-
-    /// \brief Returns max vertex valence
-    int GetMaxValence() const { return _maxValence; }
-
-    /// \brief Returns the total number of ptex faces in the mesh
-    int GetNumPtexFaces() const { return _numPtexFaces; }
-
-
-    //@{
-    ///  @name Individual patches
-    ///
-    /// \anchor individual_patches
-    ///
-    /// \brief Accessors for individual patches
-    ///
-
-    /// \brief Returns the PatchDescriptor for the patch identified by \p handle
-    PatchDescriptor GetPatchDescriptor(PatchHandle const & handle) const;
-
-    /// \brief Returns the control vertex indices for the patch identified by \p handle
-    ConstIndexArray GetPatchVertices(PatchHandle const & handle) const;
-
-    /// \brief Returns a PatchParam for the patch identified by \p handle
-    PatchParam GetPatchParam(PatchHandle const & handle) const;
-
-    /// \brief Returns the control vertex indices for \p patch in \p array
-    ConstIndexArray GetPatchVertices(int array, int patch) const;
-
-    /// \brief Returns the PatchParam for \p patch in \p array
-    PatchParam GetPatchParam(int array, int patch) const;
-    //@}
-
-
-    //@{
-    ///  @name Arrays of patches
-    ///
-    /// \anchor arrays_of_patches
-    ///
-    /// \brief Accessors for arrays of patches of the same type
-    ///
-
-    /// \brief Returns the number of patch arrays in the table
-    int GetNumPatchArrays() const;
-
-    /// \brief Returns the number of patches in \p array
-    int GetNumPatches(int array) const;
-
-    /// \brief Returns the number of control vertices in \p array
-    int GetNumControlVertices(int array) const;
-
-    /// \brief Returns the PatchDescriptor for the patches in \p array
-    PatchDescriptor GetPatchArrayDescriptor(int array) const;
-
-    /// \brief Returns the control vertex indices for the patches in \p array
-    ConstIndexArray GetPatchArrayVertices(int array) const;
-
-    /// \brief Returns the PatchParams for the patches in \p array
-    ConstPatchParamArray const GetPatchParams(int array) const;
-    //@}
-
-
-    //@{
-    ///  @name Change of basis patches
-    ///
-    /// \anchor change_of_basis_patches
-    ///
-    /// \brief Accessors for change of basis patches
-    ///
-    ///
-
-    /// \brief Returns the number of local vertex points.
-    int GetNumLocalPoints() const;
-
-    /// \brief Returns the stencil table to compute local point vertex values
-    StencilTable const *GetLocalPointStencilTable() const;
-
-    /// \brief Returns the stencil table to compute local point vertex values
-    template <typename REAL>
-    StencilTableReal<REAL> const *GetLocalPointStencilTable() const;
-
-    /// \brief Tests if the precision of the stencil table to compute local point
-    /// vertex values matches the given floating point type \<REAL\>.
-    template <typename REAL> bool LocalPointStencilPrecisionMatchesType() const;
-
-    /// \brief Updates local point vertex values.
-    ///
-    /// @param src       Buffer with primvar data for the base and refined
-    ///                  vertex values
-    ///
-    /// @param dst       Destination buffer for the computed local point
-    ///                  vertex values
-    ///
-    /// For more flexibility computing local vertex points, retrieval of
-    /// the local point stencil table and use of its public methods is
-    /// recommended or often required.
-    ///
-    template <class T> void
-    ComputeLocalPointValues(T const *src, T *dst) const;
-
-
-    /// \brief Returns the number of local varying points.
-    int GetNumLocalPointsVarying() const;
-
-    /// \brief Returns the stencil table to compute local point varying values
-    StencilTable const *GetLocalPointVaryingStencilTable() const;
-
-    /// \brief Returns the stencil table to compute local point varying values
-    template <typename REAL>
-    StencilTableReal<REAL> const *GetLocalPointVaryingStencilTable() const;
-
-    /// \brief Tests if the precision of the stencil table to compute local point
-    /// varying values matches the given floating point type \<REAL\>.
-    template <typename REAL> bool LocalPointVaryingStencilPrecisionMatchesType() const;
-
-    /// \brief Updates local point varying values.
-    ///
-    /// @param src       Buffer with primvar data for the base and refined
-    ///                  varying values
-    ///
-    /// @param dst       Destination buffer for the computed local point
-    ///                  varying values
-    ///
-    /// For more flexibility computing local varying points, retrieval of
-    /// the local point varying stencil table and use of its public methods
-    /// is recommended or often required.
-    ///
-    template <class T> void
-    ComputeLocalPointValuesVarying(T const *src, T *dst) const;
-
-
-    /// \brief Returns the number of local face-varying points for \p channel
-    int GetNumLocalPointsFaceVarying(int channel = 0) const;
-
-    /// \brief Returns the stencil table to compute local point face-varying values
-    StencilTable const *GetLocalPointFaceVaryingStencilTable(int channel = 0) const;
-
-    /// \brief Returns the stencil table to compute local point face-varying values
-    template <typename REAL>
-    StencilTableReal<REAL> const * GetLocalPointFaceVaryingStencilTable(int channel = 0) const;
-
-    /// \brief Tests if the precision of the stencil table to compute local point
-    /// face-varying values matches the given floating point type \<REAL\>.
-    template <typename REAL> bool LocalPointFaceVaryingStencilPrecisionMatchesType() const;
-
-    /// \brief Updates local point face-varying values.
-    ///
-    /// @param src       Buffer with primvar data for the base and refined
-    ///                  face-varying values
-    ///
-    /// @param dst       Destination buffer for the computed local point
-    ///                  face-varying values
-    ///
-    /// @param channel   face-varying channel
-    ///
-    /// For more flexibility computing local face-varying points, retrieval
-    /// of the local point face-varying stencil table and use of its public
-    /// methods is recommended or often required.
-    ///
-    template <class T> void
-    ComputeLocalPointValuesFaceVarying(T const *src, T *dst, int channel = 0) const;
-    //@}
-
-
-    //@{
-    ///  @name Legacy gregory patch evaluation buffers
-
-    /// \brief Accessors for the gregory patch evaluation buffers.
-    ///        These methods will be deprecated.
-    ///
-    typedef Vtr::ConstArray<unsigned int> ConstQuadOffsetsArray;
-
-    /// \brief Returns the 'QuadOffsets' for the Gregory patch identified by \p handle
-    ConstQuadOffsetsArray GetPatchQuadOffsets(PatchHandle const & handle) const;
-
-    typedef std::vector<Index> VertexValenceTable;
-
-    /// \brief Returns the 'VertexValences' table (vertex neighborhoods table)
-    VertexValenceTable const & GetVertexValenceTable() const {
-        return _vertexValenceTable;
-    }
-    //@}
-
-
-    //@{
-    ///  @name Single-crease patches
-    ///
-    /// \anchor single_crease_patches
-    ///
-    /// \brief Accessors for single-crease patch edge sharpness
-    ///
-
-    /// \brief Returns the crease sharpness for the patch identified by \p handle
-    ///        if it is a single-crease patch, or 0.0f
-    float GetSingleCreasePatchSharpnessValue(PatchHandle const & handle) const;
-
-    /// \brief Returns the crease sharpness for the \p patch in \p array
-    ///        if it is a single-crease patch, or 0.0f
-    float GetSingleCreasePatchSharpnessValue(int array, int patch) const;
-    //@}
-
-
-    //@{
-    ///  @name Varying data
-    ///
-    /// \anchor varying_data
-    ///
-    /// \brief Accessors for varying data
-    ///
-
-    /// \brief Returns the varying patch descriptor
-    PatchDescriptor GetVaryingPatchDescriptor() const;
-
-    /// \brief Returns the varying vertex indices for a given patch
-    ConstIndexArray GetPatchVaryingVertices(PatchHandle const & handle) const;
-
-    /// \brief Returns the varying vertex indices for a given patch
-    ConstIndexArray GetPatchVaryingVertices(int array, int patch) const;
-
-    /// \brief Returns the varying vertex indices for the patches in \p array
-    ConstIndexArray GetPatchArrayVaryingVertices(int array) const;
-
-    /// \brief Returns an array of varying vertex indices for the patches.
-    ConstIndexArray GetVaryingVertices() const;
-    //@}
-
-
-    //@{
-    ///  @name Face-varying channels
-    ///
-    /// \anchor face_varying_channels
-    ///
-    /// \brief Accessors for face-varying channels
-    ///
-
-    /// \brief Returns the number of face-varying channels
-    int GetNumFVarChannels() const;
-
-    /// \brief Returns the regular patch descriptor for \p channel
-    PatchDescriptor GetFVarPatchDescriptorRegular(int channel = 0) const;
-
-    /// \brief Returns the irregular patch descriptor for \p channel
-    PatchDescriptor GetFVarPatchDescriptorIrregular(int channel = 0) const;
-
-    /// \brief Returns the default/irregular patch descriptor for \p channel
-    PatchDescriptor GetFVarPatchDescriptor(int channel = 0) const;
-
-    /// \brief Returns the value indices for a given patch in \p channel
-    ConstIndexArray GetPatchFVarValues(PatchHandle const & handle, int channel = 0) const;
-
-    /// \brief Returns the value indices for a given patch in \p channel
-    ConstIndexArray GetPatchFVarValues(int array, int patch, int channel = 0) const;
-
-    /// \brief Returns the value indices for the patches in \p array in \p channel
-    ConstIndexArray GetPatchArrayFVarValues(int array, int channel = 0) const;
-
-    /// \brief Returns an array of value indices for the patches in \p channel
-    ConstIndexArray GetFVarValues(int channel = 0) const;
-
-    /// \brief Returns the stride between patches in the value index array of \p channel
-    int GetFVarValueStride(int channel = 0) const;
-
-    /// \brief Returns the value indices for a given patch in \p channel
-    PatchParam GetPatchFVarPatchParam(PatchHandle const & handle, int channel = 0) const;
-
-    /// \brief Returns the face-varying params for a given patch \p channel
-    PatchParam GetPatchFVarPatchParam(int array, int patch, int channel = 0) const;
-
-    /// \brief Returns the face-varying for a given patch in \p array in \p channel
-    ConstPatchParamArray GetPatchArrayFVarPatchParams(int array, int channel = 0) const;
-
-    /// \brief Returns an array of face-varying patch param for \p channel
-    ConstPatchParamArray GetFVarPatchParams(int channel = 0) const;
-
-    /// \brief Deprecated @see PatchTable#GetFVarPatchDescriptor
-    Sdc::Options::FVarLinearInterpolation GetFVarChannelLinearInterpolation(int channel = 0) const;
-    //@}
-
-
-    //@{
-    ///  @name Direct accessors
-    ///
-    /// \warning These direct accessors are left for convenience, but they are
-    ///          likely going to be deprecated in future releases
-    ///
-
-    typedef std::vector<Index> PatchVertsTable;
-
-    /// \brief Get the table of patch control vertices
-    PatchVertsTable const & GetPatchControlVerticesTable() const { return _patchVerts; }
-
-    /// \brief Returns the PatchParamTable (PatchParams order matches patch array sorting)
-    PatchParamTable const & GetPatchParamTable() const { return _paramTable; }
-
-    /// \brief Returns a sharpness index table for each patch (if exists)
-    std::vector<Index> const &GetSharpnessIndexTable() const { return _sharpnessIndices; }
-
-    /// \brief Returns sharpness values table
-    std::vector<float> const &GetSharpnessValues() const { return _sharpnessValues; }
-
-    typedef std::vector<unsigned int> QuadOffsetsTable;
-
-    /// \brief Returns the quad-offsets table
-    QuadOffsetsTable const & GetQuadOffsetsTable() const {
-        return _quadOffsetsTable;
-    }
-    //@}
-
-    /// debug helper
-    void print() const;
-
-public:
-
-    //@{
-    ///  @name Evaluation methods
-    ///
-
-    /// \brief Evaluate basis functions for position and derivatives at a
-    /// given (u,v) parametric location of a patch.
-    ///
-    /// @param handle  A patch handle identifying the sub-patch containing the
-    ///                (u,v) location
-    ///
-    /// @param u       Patch coordinate (in base face normalized space)
-    ///
-    /// @param v       Patch coordinate (in base face normalized space)
-    ///
-    /// @param wP      Weights (evaluated basis functions) for the position
-    ///
-    /// @param wDu     Weights (evaluated basis functions) for derivative wrt u
-    ///
-    /// @param wDv     Weights (evaluated basis functions) for derivative wrt v
-    ///
-    /// @param wDuu    Weights (evaluated basis functions) for 2nd derivative wrt u
-    ///
-    /// @param wDuv    Weights (evaluated basis functions) for 2nd derivative wrt u and v
-    ///
-    /// @param wDvv    Weights (evaluated basis functions) for 2nd derivative wrt v
-    ///
-    template <typename REAL>
-    void EvaluateBasis(PatchHandle const & handle, REAL u, REAL v,
-        REAL wP[], REAL wDu[] = 0, REAL wDv[] = 0,
-        REAL wDuu[] = 0, REAL wDuv[] = 0, REAL wDvv[] = 0) const;
-
-    /// \brief  An overloaded version to assist template parameter resolution
-    /// when explicitly declaring unused array arguments as 0.
-    void EvaluateBasis(PatchHandle const & handle, float u, float v,
-        float wP[], float wDu[] = 0, float wDv[] = 0,
-        float wDuu[] = 0, float wDuv[] = 0, float wDvv[] = 0) const;
-
-    /// \brief  An overloaded version to assist template parameter resolution
-    /// when explicitly declaring unused array arguments as 0.
-    void EvaluateBasis(PatchHandle const & handle, double u, double v,
-        double wP[], double wDu[] = 0, double wDv[] = 0,
-        double wDuu[] = 0, double wDuv[] = 0, double wDvv[] = 0) const;
-
-    /// \brief Evaluate basis functions for a varying value and
-    /// derivatives at a given (u,v) parametric location of a patch.
-    ///
-    /// @param handle  A patch handle identifying the sub-patch containing the
-    ///                (u,v) location
-    ///
-    /// @param u       Patch coordinate (in base face normalized space)
-    ///
-    /// @param v       Patch coordinate (in base face normalized space)
-    ///
-    /// @param wP      Weights (evaluated basis functions) for the position
-    ///
-    /// @param wDu     Weights (evaluated basis functions) for derivative wrt u
-    ///
-    /// @param wDv     Weights (evaluated basis functions) for derivative wrt v
-    ///
-    /// @param wDuu    Weights (evaluated basis functions) for 2nd derivative wrt u
-    ///
-    /// @param wDuv    Weights (evaluated basis functions) for 2nd derivative wrt u and v
-    ///
-    /// @param wDvv    Weights (evaluated basis functions) for 2nd derivative wrt v
-    ///
-    template <typename REAL>
-    void EvaluateBasisVarying(PatchHandle const & handle, REAL u, REAL v,
-        REAL wP[], REAL wDu[] = 0, REAL wDv[] = 0,
-        REAL wDuu[] = 0, REAL wDuv[] = 0, REAL wDvv[] = 0) const;
-
-    /// \brief  An overloaded version to assist template parameter resolution
-    /// when explicitly declaring unused array arguments as 0.
-    void EvaluateBasisVarying(PatchHandle const & handle, float u, float v,
-        float wP[], float wDu[] = 0, float wDv[] = 0,
-        float wDuu[] = 0, float wDuv[] = 0, float wDvv[] = 0) const;
-
-    /// \brief  An overloaded version to assist template parameter resolution
-    /// when explicitly declaring unused array arguments as 0.
-    void EvaluateBasisVarying(PatchHandle const & handle, double u, double v,
-        double wP[], double wDu[] = 0, double wDv[] = 0,
-        double wDuu[] = 0, double wDuv[] = 0, double wDvv[] = 0) const;
-
-    /// \brief Evaluate basis functions for a face-varying value and
-    /// derivatives at a given (u,v) parametric location of a patch.
-    ///
-    /// @param handle  A patch handle identifying the sub-patch containing the
-    ///                (u,v) location
-    ///
-    /// @param u       Patch coordinate (in base face normalized space)
-    ///
-    /// @param v       Patch coordinate (in base face normalized space)
-    ///
-    /// @param wP      Weights (evaluated basis functions) for the position
-    ///
-    /// @param wDu     Weights (evaluated basis functions) for derivative wrt u
-    ///
-    /// @param wDv     Weights (evaluated basis functions) for derivative wrt v
-    ///
-    /// @param wDuu    Weights (evaluated basis functions) for 2nd derivative wrt u
-    ///
-    /// @param wDuv    Weights (evaluated basis functions) for 2nd derivative wrt u and v
-    ///
-    /// @param wDvv    Weights (evaluated basis functions) for 2nd derivative wrt v
-    ///
-    /// @param channel face-varying channel
-    ///
-    template <typename REAL>
-    void EvaluateBasisFaceVarying(PatchHandle const & handle, REAL u, REAL v,
-        REAL wP[], REAL wDu[] = 0, REAL wDv[] = 0,
-        REAL wDuu[] = 0, REAL wDuv[] = 0, REAL wDvv[] = 0,
-        int channel = 0) const;
-
-    /// \brief  An overloaded version to assist template parameter resolution
-    /// when explicitly declaring unused array arguments as 0.
-    void EvaluateBasisFaceVarying(PatchHandle const & handle, float u, float v,
-        float wP[], float wDu[] = 0, float wDv[] = 0,
-        float wDuu[] = 0, float wDuv[] = 0, float wDvv[] = 0,
-        int channel = 0) const;
-
-    /// \brief  An overloaded version to assist template parameter resolution
-    /// when explicitly declaring unused array arguments as 0.
-    void EvaluateBasisFaceVarying(PatchHandle const & handle, double u, double v,
-        double wP[], double wDu[] = 0, double wDv[] = 0,
-        double wDuu[] = 0, double wDuv[] = 0, double wDvv[] = 0,
-        int channel = 0) const;
-    //@}
-
-protected:
-
-    friend class PatchTableBuilder;
-
-    // Factory constructor
-    PatchTable(int maxvalence);
-
-    Index getPatchIndex(int array, int patch) const;
-
-    PatchParamArray getPatchParams(int arrayIndex);
-
-    Index * getSharpnessIndices(Index arrayIndex);
-    float * getSharpnessValues(Index arrayIndex);
-
-private:
-
-    //
-    // Patch arrays
-    //
-
-    struct PatchArray;
-    typedef std::vector<PatchArray> PatchArrayVector;
-
-    PatchArray & getPatchArray(Index arrayIndex);
-    PatchArray const & getPatchArray(Index arrayIndex) const;
-
-    void reservePatchArrays(int numPatchArrays);
-    void pushPatchArray(PatchDescriptor desc, int npatches,
-        Index * vidx, Index * pidx, Index * qoidx=0);
-
-    IndexArray getPatchArrayVertices(int arrayIndex);
-
-    Index findPatchArray(PatchDescriptor desc);
-
-
-    //
-    // Varying patch arrays
-    //
-    IndexArray getPatchArrayVaryingVertices(int arrayIndex);
-
-    void allocateVaryingVertices(
-        PatchDescriptor desc, int numPatches);
-    void populateVaryingVertices();
-
-    //
-    // Face-varying patch channels
-    //
-
-    struct FVarPatchChannel;
-    typedef std::vector<FVarPatchChannel> FVarPatchChannelVector;
-
-    FVarPatchChannel & getFVarPatchChannel(int channel);
-    FVarPatchChannel const & getFVarPatchChannel(int channel) const;
-
-    void allocateFVarPatchChannels(int numChannels);
-    void allocateFVarPatchChannelValues(
-        PatchDescriptor regDesc, PatchDescriptor irregDesc,
-        int numPatches, int channel);
-
-    // deprecated
-    void setFVarPatchChannelLinearInterpolation(
-        Sdc::Options::FVarLinearInterpolation interpolation, int channel);
-
-    IndexArray getFVarValues(int channel);
-    ConstIndexArray getPatchFVarValues(int patch, int channel) const;
-
-    PatchParamArray getFVarPatchParams(int channel);
-    PatchParam getPatchFVarPatchParam(int patch, int channel) const;
-
-private:
-    //
-    //  Simple private class to hold stencil table pointers of varying precision,
-    //  where the discriminant of the precision is external.
-    //
-    //  NOTE that this is a simple pointer container and NOT a smart pointer that
-    //  manages the ownership of the object referred to by it.
-    //
-    class StencilTablePtr {
-    private:
-        typedef StencilTableReal<float>  float_type;
-        typedef StencilTableReal<double> double_type;
-
-        union {
-            float_type  * _fPtr;
-            double_type * _dPtr;
-        };
-
-    public:
-        StencilTablePtr()                  { _fPtr = 0; }
-        StencilTablePtr(float_type  * ptr) { _fPtr = ptr; }
-        StencilTablePtr(double_type * ptr) { _dPtr = ptr; }
-
-        operator bool() const { return _fPtr != 0; }
-
-        void Set()                  { _fPtr = 0; }
-        void Set(float_type  * ptr) { _fPtr = ptr; }
-        void Set(double_type * ptr) { _dPtr = ptr; }
-
-        template <typename REAL> StencilTableReal<REAL> * Get() const;
-    };
-
-private:
-
-    //
-    // Topology
-    //
-
-    int _maxValence,   // highest vertex valence found in the mesh
-        _numPtexFaces; // total number of ptex faces
-
-    PatchArrayVector     _patchArrays;  // Vector of descriptors for arrays of patches
-
-    std::vector<Index>   _patchVerts;   // Indices of the control vertices of the patches
-
-    PatchParamTable      _paramTable;   // PatchParam bitfields (one per patch)
-
-    //
-    // Extraordinary vertex closed-form evaluation / endcap basis conversion
-    //
-    // XXXtakahito: these data will probably be replaced with mask coefficient or something
-    //              SchemeWorker populates.
-    //
-    QuadOffsetsTable     _quadOffsetsTable;   // Quad offsets (for Gregory patches)
-    VertexValenceTable   _vertexValenceTable; // Vertex valence table (for Gregory patches)
-
-    StencilTablePtr _localPointStencils;        // local point conversion stencils
-    StencilTablePtr _localPointVaryingStencils; // local point varying stencils
-
-    //
-    // Varying data
-    //
-    PatchDescriptor _varyingDesc;
-
-    std::vector<Index>   _varyingVerts;
-
-    //
-    // Face-varying data
-    //
-    FVarPatchChannelVector _fvarChannels;
-
-    std::vector<StencilTablePtr> _localPointFaceVaryingStencils;
-
-    //
-    // 'single-crease' patch sharpness tables
-    //
-    std::vector<Index>   _sharpnessIndices; // Indices of single-crease sharpness (one per patch)
-    std::vector<float>   _sharpnessValues;  // Sharpness values.
-
-    //
-    //  Construction history -- relevant to at least one public query:
-    //
-    unsigned int _isUniformLinear : 1;
-
-    //
-    //  Precision -- only applies to local-point stencil tables
-    //
-    unsigned int _vertexPrecisionIsDouble      : 1;
-    unsigned int _varyingPrecisionIsDouble     : 1;
-    unsigned int _faceVaryingPrecisionIsDouble : 1;
-};
-
-
-//
-//  Template specializations for float/double -- to be defined before used:
-//
-template <> inline StencilTableReal<float> *
-PatchTable::StencilTablePtr::Get<float>() const { return _fPtr; }
-
-template <> inline StencilTableReal<double> *
-PatchTable::StencilTablePtr::Get<double>() const { return _dPtr; }
-
-template <> inline bool
-PatchTable::LocalPointStencilPrecisionMatchesType<float>() const {
-    return !_vertexPrecisionIsDouble;
-}
-template <> inline bool
-PatchTable::LocalPointVaryingStencilPrecisionMatchesType<float>() const {
-    return !_varyingPrecisionIsDouble;
-}
-template <> inline bool
-PatchTable::LocalPointFaceVaryingStencilPrecisionMatchesType<float>() const {
-    return !_faceVaryingPrecisionIsDouble;
-}
-
-template <> inline bool
-PatchTable::LocalPointStencilPrecisionMatchesType<double>() const {
-    return _vertexPrecisionIsDouble;
-}
-template <> inline bool
-PatchTable::LocalPointVaryingStencilPrecisionMatchesType<double>() const {
-    return _varyingPrecisionIsDouble;
-}
-template <> inline bool
-PatchTable::LocalPointFaceVaryingStencilPrecisionMatchesType<double>() const {
-    return _faceVaryingPrecisionIsDouble;
-}
-
-//
-//  StencilTable access -- backward compatible and generic:
-//
-inline StencilTable const *
-PatchTable::GetLocalPointStencilTable() const {
-    assert(LocalPointStencilPrecisionMatchesType<float>());
-    return static_cast<StencilTable const *>(_localPointStencils.Get<float>());
-}
-inline StencilTable const *
-PatchTable::GetLocalPointVaryingStencilTable() const {
-    assert(LocalPointVaryingStencilPrecisionMatchesType<float>());
-    return static_cast<StencilTable const *>(
-            _localPointVaryingStencils.Get<float>());
-}
-inline StencilTable const *
-PatchTable::GetLocalPointFaceVaryingStencilTable(int channel) const {
-    assert(LocalPointFaceVaryingStencilPrecisionMatchesType<float>());
-    if (channel >= 0 && channel < (int)_localPointFaceVaryingStencils.size()) {
-        return static_cast<StencilTable const *>(
-                _localPointFaceVaryingStencils[channel].Get<float>());
-    }
-    return NULL;
-}
-
-template <typename REAL>
-inline StencilTableReal<REAL> const *
-PatchTable::GetLocalPointStencilTable() const {
-    assert(LocalPointStencilPrecisionMatchesType<REAL>());
-    return _localPointStencils.Get<REAL>();
-}
-template <typename REAL>
-inline StencilTableReal<REAL> const *
-PatchTable::GetLocalPointVaryingStencilTable() const {
-    assert(LocalPointVaryingStencilPrecisionMatchesType<REAL>());
-    return _localPointVaryingStencils.Get<REAL>();
-}
-template <typename REAL>
-inline StencilTableReal<REAL> const *
-PatchTable::GetLocalPointFaceVaryingStencilTable(int channel) const {
-    assert(LocalPointFaceVaryingStencilPrecisionMatchesType<REAL>());
-    if (channel >= 0 && channel < (int)_localPointFaceVaryingStencils.size()) {
-        return _localPointFaceVaryingStencils[channel].Get<REAL>();
-    }
-    return NULL;
-}
-
-
-//
-//  Computation of local point values:
-//
-template <class T>
-inline void
-PatchTable::ComputeLocalPointValues(T const *src, T *dst) const {
-    assert(LocalPointStencilPrecisionMatchesType<float>());
-    if (_localPointStencils) {
-        _localPointStencils.Get<float>()->UpdateValues(src, dst);
-    }
-}
-
-template <class T>
-inline void
-PatchTable::ComputeLocalPointValuesVarying(T const *src, T *dst) const {
-    assert(LocalPointVaryingStencilPrecisionMatchesType<float>());
-    if (_localPointVaryingStencils) {
-        _localPointVaryingStencils.Get<float>()->UpdateValues(src, dst);
-    }
-}
-
-template <class T>
-inline void
-PatchTable::ComputeLocalPointValuesFaceVarying(T const *src, T *dst, int channel) const {
-    assert(LocalPointFaceVaryingStencilPrecisionMatchesType<float>());
-    if (channel >= 0 && channel < (int)_localPointFaceVaryingStencils.size()) {
-        if (_localPointFaceVaryingStencils[channel]) {
-            _localPointFaceVaryingStencils[channel].Get<float>()->UpdateValues(src, dst);
-        }
-    }
-}
-
-
-//
-//  Basis evaluation overloads
-//
-inline void
-PatchTable::EvaluateBasis(PatchHandle const & handle, float u, float v,
-    float wP[], float wDu[], float wDv[],
-    float wDuu[], float wDuv[], float wDvv[]) const {
-
-    EvaluateBasis<float>(handle, u, v, wP, wDu, wDv, wDuu, wDuv, wDvv);
-}
-inline void
-PatchTable::EvaluateBasis(PatchHandle const & handle, double u, double v,
-    double wP[], double wDu[], double wDv[],
-    double wDuu[], double wDuv[], double wDvv[]) const {
-
-    EvaluateBasis<double>(handle, u, v, wP, wDu, wDv, wDuu, wDuv, wDvv);
-}
-
-inline void
-PatchTable::EvaluateBasisVarying(PatchHandle const & handle, float u, float v,
-    float wP[], float wDu[], float wDv[],
-    float wDuu[], float wDuv[], float wDvv[]) const {
-
-    EvaluateBasisVarying<float>(handle, u, v, wP, wDu, wDv, wDuu, wDuv, wDvv);
-}
-inline void
-PatchTable::EvaluateBasisVarying(PatchHandle const & handle, double u, double v,
-    double wP[], double wDu[], double wDv[],
-    double wDuu[], double wDuv[], double wDvv[]) const {
-
-    EvaluateBasisVarying<double>(handle, u, v, wP, wDu, wDv, wDuu, wDuv, wDvv);
-}
-
-inline void
-PatchTable::EvaluateBasisFaceVarying(PatchHandle const & handle, float u, float v,
-    float wP[], float wDu[], float wDv[],
-    float wDuu[], float wDuv[], float wDvv[], int channel) const {
-
-    EvaluateBasisFaceVarying<float>(handle, u, v, wP, wDu, wDv, wDuu, wDuv, wDvv, channel);
-}
-inline void
-PatchTable::EvaluateBasisFaceVarying(PatchHandle const & handle, double u, double v,
-    double wP[], double wDu[], double wDv[],
-    double wDuu[], double wDuv[], double wDvv[], int channel) const {
-
-    EvaluateBasisFaceVarying<double>(handle, u, v, wP, wDu, wDv, wDuu, wDuv, wDvv, channel);
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_PATCH_TABLE */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTableFactory.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTableFactory.cpp
deleted file mode 100644
index 47d99ee9d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTableFactory.cpp
+++ /dev/null
@@ -1,2050 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../far/patchTableFactory.h"
-#include "../far/patchBuilder.h"
-#include "../far/error.h"
-#include "../far/ptexIndices.h"
-#include "../far/topologyRefiner.h"
-#include "../vtr/level.h"
-#include "../vtr/fvarLevel.h"
-#include "../vtr/refinement.h"
-#include "../vtr/stackBuffer.h"
-
-#include <algorithm>
-#include <cassert>
-#include <cstring>
-
-#include <cstdio>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-namespace Far {
-
-using Vtr::Array;
-using Vtr::ConstArray;
-using Vtr::IndexVector;
-using Vtr::internal::Level;
-using Vtr::internal::StackBuffer;
-
-namespace {
-    //
-    //  Helpers for compiler warnings and floating point equality tests
-    //
-#ifdef __INTEL_COMPILER
-#pragma warning (push)
-#pragma warning disable 1572
-#endif
-    inline bool isSharpnessEqual(float s1, float s2) { return (s1 == s2); }
-#ifdef __INTEL_COMPILER
-#pragma warning (pop)
-#endif
-
-    inline int
-    assignSharpnessIndex(float sharpness, std::vector<float> & sharpnessValues) {
-
-        // linear search
-        for (int i=0; i<(int)sharpnessValues.size(); ++i) {
-            if (isSharpnessEqual(sharpnessValues[i], sharpness)) {
-                return i;
-            }
-        }
-        sharpnessValues.push_back(sharpness);
-        return (int)sharpnessValues.size()-1;
-    }
-
-    inline bool
-    isBoundaryFace(Level const & level, Index face) {
-
-        return (level.getFaceCompositeVTag(face)._boundary != 0);
-    }
-
-    inline void
-    offsetIndices(Index indices[], int size, int offset) {
-
-        for (int i = 0; i < size; ++i) {
-            indices[i] += offset;
-        }
-    }
-} // namespace anon
-
-
-//
-//  The main PatchTableBuilder class with context
-//
-//  Helper class aggregating transient contextual data structures during the
-//  creation of a patch table.  This helps keeping the factory class stateless.
-//
-class PatchTableBuilder {
-public:
-    //
-    //  Public interface intended for use by the PatchTableFactory -- all
-    //  else is solely for internal use:
-    //
-    typedef PatchTableFactory::Options Options;
-
-    PatchTableBuilder(TopologyRefiner const & refiner, Options options,
-                      ConstIndexArray selectedFaces);
-    ~PatchTableBuilder();
-
-    bool UniformPolygonsSpecified() const { return _buildUniformLinear; }
-
-    void BuildUniformPolygons();
-    void BuildPatches();
-
-    PatchTable * GetPatchTable() const { return _table; };
-
-private:
-    typedef PatchTable::StencilTablePtr StencilTablePtr;
-
-    //  Simple struct to store <face,level> pair for a patch:
-    struct PatchTuple {
-        PatchTuple(Index face, int level) : faceIndex(face), levelIndex(level) { }
-
-        Index faceIndex;
-        int   levelIndex;
-    };
-    typedef std::vector<PatchTuple> PatchTupleVector;
-
-    //  Struct comprising a collection of topological properties for a patch that
-    //  may be shared (between vertex and face-varying patches):
-    struct PatchInfo {
-        PatchInfo() : isRegular(false), isRegSingleCrease(false),
-                      regBoundaryMask(0), regSharpness(0.0f),
-                      paramBoundaryMask(0) { }
-
-        bool         isRegular;
-        bool         isRegSingleCrease;
-        int          regBoundaryMask;
-        float        regSharpness;
-        Level::VSpan irregCornerSpans[4];
-        int          paramBoundaryMask;
-
-        SparseMatrix<float>  fMatrix;
-        SparseMatrix<double> dMatrix;
-    };
-
-private:
-    //
-    //  Internal LocalPointHelper class
-    //
-    //  A LocalPointHelper manages the number, sharing of and StencilTable for
-    //  the local points of a patch or one of its face-varying channels.  An
-    //  instance of the helper does not know anything about the properties of
-    //  the Builder classes that use it.  It can combine local points for any
-    //  patch types all in one, so the regular and irregular patch types can
-    //  both be local and differ, e.g. Bezier for regular and Gregory for
-    //  irregular, and points can be effectively shared, appropriate stencils
-    //  created, etc.
-    //
-    //  While not dependent on a particular patch type, some methods do require
-    //  a patch type argument in order to know what can be done with its local
-    //  points, e.g. which points can be shared with adjacent patches.
-    //
-    class LocalPointHelper {
-    public:
-        struct Options {
-            Options() : shareLocalPoints(false),
-                        reuseSourcePoints(false),
-                        createStencilTable(true),
-                        createVaryingTable(false),
-                        doubleStencilTable(false) { }
-
-            unsigned int shareLocalPoints   : 1;
-            unsigned int reuseSourcePoints  : 1;
-            unsigned int createStencilTable : 1;
-            unsigned int createVaryingTable : 1;
-            unsigned int doubleStencilTable : 1;
-        };
-
-    public:
-        LocalPointHelper(TopologyRefiner const & refiner,
-                         Options const & options,
-                         int fvarChannel,
-                         int numLocalPointsExpected);
-        ~LocalPointHelper();
-
-    public:
-        int GetNumLocalPoints() const { return _numLocalPoints; }
-
-        template <typename REAL>
-        int AppendLocalPatchPoints(int levelIndex, Index faceIndex,
-                                   SparseMatrix<REAL> const &  conversionMatrix,
-                                   PatchDescriptor::Type       patchType,
-                                   Index const                 sourcePoints[],
-                                   int                         sourcePointOffset,
-                                   Index                       patchPoints[]);
-
-        StencilTablePtr AcquireStencilTable() {
-            return _options.doubleStencilTable
-                ? acquireStencilTable<double>(_stencilTable)
-                : acquireStencilTable<float>(_stencilTable);
-        }
-
-    private:
-        //  Internal methods:
-        template <typename REAL>
-        void initializeStencilTable(int numLocalPointsExpected);
-
-        template <typename REAL>
-        void appendLocalPointStencil(SparseMatrix<REAL> const &  conversionMatrix,
-                                     int                         stencilRow,
-                                     Index const                 sourcePoints[],
-                                     int                         sourcePointOffset);
-
-        template <typename REAL>
-        void appendLocalPointStencils(SparseMatrix<REAL> const &  conversionMatrix,
-                                      Index const                 sourcePoints[],
-                                      int                         sourcePointOffset);
-
-        //  Methods for local point Varying stencils
-        //      XXXX -- hope to get rid of these...
-        template <typename REAL>
-        void appendLocalPointVaryingStencil(int const *  varyingIndices,
-                                            int          patchPointIndex,
-                                            Index const  sourcePoints[],
-                                            int          sourcePointOffset);
-
-        template <typename REAL>
-        StencilTablePtr acquireStencilTable(StencilTablePtr& stencilTableMember);
-
-        Index findSharedCornerPoint(int levelIndex, Index valueIndex,
-                                    Index newIndex);
-        Index findSharedEdgePoint(int levelIndex, Index edgeIndex, int edgeEnd,
-                                  Index newIndex);
-
-    private:
-        //  Member variables:
-        TopologyRefiner const& _refiner;
-        Options                _options;
-
-        int _fvarChannel;
-        int _numLocalPoints;
-        int _localPointOffset;
-
-        std::vector<IndexVector> _sharedCornerPoints;
-        std::vector<IndexVector> _sharedEdgePoints;
-
-        StencilTablePtr _stencilTable;
-
-    //  This was hopefully transitional but will persist -- the should be
-    //  no need for Varying local points or stencils associated with them.
-    public:
-        StencilTablePtr AcquireStencilTableVarying() {
-            return _options.doubleStencilTable
-                ? acquireStencilTable<double>(_stencilTableVarying)
-                : acquireStencilTable<float>(_stencilTableVarying);
-        }
-
-        StencilTablePtr _stencilTableVarying;
-    };
-
-private:
-    //
-    //  Internal LegacyGregoryHelper class
-    //
-    //  This local class helps to populate the arrays in the PatchTable
-    //  associated with legacy-Gregory patches, i.e. the quad-offset and
-    //  vertex-valence tables.  These patches are always associated with
-    //  faces at the last level of refinement, so only the face index in
-    //  that level is required to identify them.
-    //
-    class LegacyGregoryHelper {
-    public:
-        LegacyGregoryHelper(TopologyRefiner const & ref) : _refiner(ref) { }
-        ~LegacyGregoryHelper() { }
-
-    public:
-        int GetNumBoundaryPatches() const { return (int)_boundaryFaceIndices.size(); }
-        int GetNumInteriorPatches() const { return (int)_interiorFaceIndices.size(); }
-
-        void AddPatchFace(int level, Index face);
-        void FinalizeQuadOffsets(  PatchTable::QuadOffsetsTable & qTable);
-        void FinalizeVertexValence(PatchTable::VertexValenceTable & vTable,
-                                   int lastLevelVertOffset);
-    private:
-        TopologyRefiner const& _refiner;
-        std::vector<Index> _interiorFaceIndices;
-        std::vector<Index> _boundaryFaceIndices;
-    };
-
-private:
-    //  Builder methods for internal use:
-
-    //  Simple queries:
-    int getRefinerFVarChannel(int fvcInTable) const {
-        return (fvcInTable >= 0) ? _fvarChannelIndices[fvcInTable] : -1;
-    }
-
-    bool isFVarChannelLinear(int fvcInTable) const {
-        if (_options.generateFVarLegacyLinearPatches) return true;
-        return (_refiner.GetFVarLinearInterpolation(
-            getRefinerFVarChannel(fvcInTable)) == Sdc::Options::FVAR_LINEAR_ALL);
-    }
-
-    bool doesFVarTopologyMatch(PatchTuple const & patch, int fvcInTable) {
-        return _patchBuilder->DoesFaceVaryingPatchMatch(
-            patch.levelIndex, patch.faceIndex,
-            getRefinerFVarChannel(fvcInTable));
-    }
-
-    //  Methods for identifying and assigning patch-related data:
-    void identifyPatchTopology(PatchTuple const & patch, PatchInfo & patchInfo,
-                               int fvcInTable = -1);
-
-    int assignPatchPointsAndStencils(PatchTuple const & patch,
-                                     PatchInfo const & patchInfo,
-                                     Index * patchPoints,
-                                     LocalPointHelper & localHelper,
-                                     int fvcInTable = -1);
-
-    int assignFacePoints(PatchTuple const & patch,
-                         Index * patchPoints,
-                         int fvcInTable = -1) const;
-
-    //  High level methods for assembling the table:
-    void identifyPatches();
-    void appendPatch(int levelIndex, Index faceIndex);
-    void findDescendantPatches(int levelIndex, Index faceIndex, int targetLevel);
-    void populatePatches();
-
-    void allocateVertexTables();
-    void allocateFVarChannels();
-
-    int estimateLocalPointCount(LocalPointHelper::Options const & options,
-                                int fvcInTable = -1) const;
-
-private:
-    //  Refiner and Options passed on construction:
-    TopologyRefiner const & _refiner;
-    Options const           _options;
-    ConstIndexArray         _selectedFaces;
-
-    // Flags indicating the need for processing based on provided options
-    unsigned int _requiresLocalPoints          : 1;
-    unsigned int _requiresRegularLocalPoints   : 1;
-    unsigned int _requiresIrregularLocalPoints : 1;
-    unsigned int _requiresSharpnessArray       : 1;
-    unsigned int _requiresFVarPatches          : 1;
-    unsigned int _requiresVaryingPatches       : 1;
-    unsigned int _requiresVaryingLocalPoints   : 1;
-
-    unsigned int _buildUniformLinear : 1;
-
-    // The PatchTable being constructed and classes to help its construction:
-    PatchTable * _table;
-
-    PatchBuilder *    _patchBuilder;
-    PtexIndices const _ptexIndices;
-
-    // Vector of tuples for each patch identified during topology traversal
-    // and the numbers of irregular and irregular patches identifed:
-    PatchTupleVector _patches;
-
-    int _numRegularPatches;
-    int _numIrregularPatches;
-
-    // Vectors for remapping indices of vertices and fvar values as well
-    // as the fvar channels (when a subset is chosen)
-    std::vector<int>                _levelVertOffsets;
-    std::vector< std::vector<int> > _levelFVarValueOffsets;
-    std::vector<int>                _fvarChannelIndices;
-
-    // State and helpers for legacy features
-    bool                  _requiresLegacyGregoryTables;
-    LegacyGregoryHelper * _legacyGregoryHelper;
-};
-
-// Constructor
-PatchTableBuilder::PatchTableBuilder(
-    TopologyRefiner const & refiner, Options opts, ConstIndexArray faces) :
-    _refiner(refiner), _options(opts), _selectedFaces(faces),
-    _table(0), _patchBuilder(0), _ptexIndices(refiner),
-    _numRegularPatches(0), _numIrregularPatches(0),
-    _legacyGregoryHelper(0) {
-
-    if (_options.generateFVarTables) {
-        // If client-code does not select specific channels, default to all
-        // the channels in the refiner.
-        if (_options.numFVarChannels==-1) {
-            _fvarChannelIndices.resize(_refiner.GetNumFVarChannels());
-            for (int fvc=0;fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-                _fvarChannelIndices[fvc] = fvc; // std::iota
-            }
-        } else {
-            _fvarChannelIndices.assign(
-                _options.fvarChannelIndices,
-                _options.fvarChannelIndices + _options.numFVarChannels);
-        }
-    }
-
-    //
-    //  Will need to translate PatchTableFactory options to the newer set of
-    //  PatchBuilder options in the near future.  And the state variables are
-    //  a potentially complex combination of options and so are handled after
-    //  the PatchBuilder construction (to potentially help) rather than in
-    //  the initializer list.
-    //
-    PatchBuilder::Options patchOptions;
-
-    patchOptions.regBasisType = PatchBuilder::BASIS_REGULAR;
-    switch (_options.GetEndCapType()) {
-        case Options::ENDCAP_BILINEAR_BASIS:
-            patchOptions.irregBasisType = PatchBuilder::BASIS_LINEAR;
-            break;
-        case Options::ENDCAP_BSPLINE_BASIS:
-            patchOptions.irregBasisType = PatchBuilder::BASIS_REGULAR;
-            break;
-        case Options::ENDCAP_GREGORY_BASIS:
-            patchOptions.irregBasisType = PatchBuilder::BASIS_GREGORY;
-            break;
-        default:
-            //  The PatchBuilder will infer if left un-specified
-            patchOptions.irregBasisType = PatchBuilder::BASIS_UNSPECIFIED;
-            break;
-    }
-    patchOptions.fillMissingBoundaryPoints   = true;
-    patchOptions.approxInfSharpWithSmooth    = !_options.useInfSharpPatch;
-    patchOptions.approxSmoothCornerWithSharp =
-        _options.generateLegacySharpCornerPatches;
-
-    _patchBuilder = PatchBuilder::Create(_refiner, patchOptions);
-
-    //
-    //  Initialize member variables that capture specified options:
-    //
-    _requiresRegularLocalPoints =
-        (patchOptions.regBasisType != PatchBuilder::BASIS_REGULAR);
-    _requiresIrregularLocalPoints =
-        (_options.GetEndCapType() != Options::ENDCAP_LEGACY_GREGORY);
-    _requiresLocalPoints =
-        _requiresIrregularLocalPoints || _requiresRegularLocalPoints;
-
-    _requiresSharpnessArray = _options.useSingleCreasePatch;
-    _requiresFVarPatches = ! _fvarChannelIndices.empty();
-
-    _requiresVaryingPatches = _options.generateVaryingTables;
-    _requiresVaryingLocalPoints = _options.generateVaryingTables &&
-                                  _options.generateVaryingLocalPoints;
-
-    //  Option to be made public in future:
-    bool options_generateNonLinearUniformPatches = false;
-
-    _buildUniformLinear = _refiner.IsUniform() && !options_generateNonLinearUniformPatches;
-
-    //
-    //  Create and initialize the new PatchTable instance to be assembled:
-    //
-    _table = new PatchTable(_refiner.GetMaxValence());
-
-    _table->_numPtexFaces = _ptexIndices.GetNumFaces();
-
-    _table->_vertexPrecisionIsDouble = _options.patchPrecisionDouble;
-    _table->_varyingPrecisionIsDouble = _options.patchPrecisionDouble;
-    _table->_faceVaryingPrecisionIsDouble = _options.fvarPatchPrecisionDouble;
-
-    _table->_varyingDesc = PatchDescriptor(_patchBuilder->GetLinearPatchType());
-
-    //  State and helper to support LegacyGregory arrays in the PatchTable:
-    _requiresLegacyGregoryTables = !_refiner.IsUniform() &&
-        (_options.GetEndCapType() == Options::ENDCAP_LEGACY_GREGORY);
-
-    if (_requiresLegacyGregoryTables) {
-        _legacyGregoryHelper = new LegacyGregoryHelper(_refiner);
-    }
-
-}
-
-PatchTableBuilder::~PatchTableBuilder() {
-
-    delete _patchBuilder;
-    delete _legacyGregoryHelper;
-}
-
-
-void
-PatchTableBuilder::identifyPatchTopology(PatchTuple const & patch,
-        PatchInfo & patchInfo, int fvarInTable) {
-
-    int   patchLevel = patch.levelIndex;
-    Index patchFace  = patch.faceIndex;
-
-    int fvarInRefiner = getRefinerFVarChannel(fvarInTable);
-
-    patchInfo.isRegular = _patchBuilder->IsPatchRegular(
-        patchLevel, patchFace, fvarInTable);
-
-    bool useDoubleMatrix = (fvarInRefiner < 0)
-                         ? _options.patchPrecisionDouble
-                         : _options.fvarPatchPrecisionDouble;
-
-    if (patchInfo.isRegular) {
-        patchInfo.regBoundaryMask = _patchBuilder->GetRegularPatchBoundaryMask(
-            patchLevel, patchFace, fvarInRefiner);
-
-        patchInfo.isRegSingleCrease = false;
-        patchInfo.regSharpness      = 0.0f;
-        patchInfo.paramBoundaryMask = patchInfo.regBoundaryMask;
-
-        //  If converting to another basis, get the change-of-basis matrix:
-        if (_requiresRegularLocalPoints) {
-            // _patchBuilder->GetRegularConversionMatrix(...);
-        }
-
-        //
-        //  Test regular interior patches for a single-crease patch when it
-        //  was specified.
-        //
-        //  Note that the PatchTable clamps the sharpness of single-crease
-        //  patches to that of the maximimu refinement level, so any single-
-        //  crease patches at the last level will be reduced to regular
-        //  patches (maintaining continuity with other semi-sharp patches
-        //  also reduced to regular).
-        //
-        if (_requiresSharpnessArray &&
-                (patchInfo.regBoundaryMask == 0) && (fvarInRefiner < 0)) {
-            if (patchLevel < (int) _options.maxIsolationLevel) {
-                PatchBuilder::SingleCreaseInfo creaseInfo;
-
-                if (_patchBuilder->IsRegularSingleCreasePatch(
-                        patchLevel, patchFace, creaseInfo)) {
-                    creaseInfo.creaseSharpness =
-                        std::min(creaseInfo.creaseSharpness,
-                             (float)(_options.maxIsolationLevel - patchLevel));
-
-                    patchInfo.isRegSingleCrease = true;
-                    patchInfo.regSharpness      = creaseInfo.creaseSharpness;
-                    patchInfo.paramBoundaryMask = (1 << creaseInfo.creaseEdgeInFace);
-                }
-            }
-        }
-    } else if (_requiresIrregularLocalPoints) {
-        _patchBuilder->GetIrregularPatchCornerSpans(
-            patchLevel, patchFace, patchInfo.irregCornerSpans, fvarInRefiner);
-
-        if (useDoubleMatrix) {
-            _patchBuilder->GetIrregularPatchConversionMatrix(
-                patchLevel, patchFace, patchInfo.irregCornerSpans, patchInfo.dMatrix);
-        } else {
-            _patchBuilder->GetIrregularPatchConversionMatrix(
-                patchLevel, patchFace, patchInfo.irregCornerSpans, patchInfo.fMatrix);
-        }
-
-        patchInfo.paramBoundaryMask = 0;
-    }
-}
-
-int
-PatchTableBuilder::assignPatchPointsAndStencils(PatchTuple const & patch,
-        PatchInfo const & patchInfo, Index * patchPoints,
-        LocalPointHelper & localHelper, int fvarInTable) {
-
-    //
-    //  This is where the interesting/complicated new work will take place
-    //  when a change-of-basis is determined necessary and previously assigned
-    //  to the PatchInfo
-    //
-    //  No change-of-basis means no local points or stencils associated with
-    //  them, which should be trivial but should also only be true in the
-    //  regular case.  (It is also the case that no local points will be
-    //  generated for irregular patches when the LegacyGregory option is
-    //  used -- so that possibility is still accounted for here.)
-    //
-    //  Regarding the return result, it should just be the size of the patch
-    //  associated with the regular/irregular patch type chosen.  This could
-    //  be retrieved from the PatchBuilder or PatchDescriptors -- alternatively
-    //  a return value could be removed and the client left to increment by
-    //  such a fixed step (which is already the case for FVar channels)
-    //
-    //  The more interesting size here is the number of local points/stencils
-    //  added.
-    //
-    int fvarInRefiner = getRefinerFVarChannel(fvarInTable);
-
-    int sourcePointOffset = (fvarInTable < 0)
-                          ? _levelVertOffsets[patch.levelIndex]
-                          : _levelFVarValueOffsets[fvarInTable][patch.levelIndex];
-
-    bool useDoubleMatrix = (fvarInTable < 0)
-                         ? _options.patchPrecisionDouble
-                         : _options.fvarPatchPrecisionDouble;
-
-    int numPatchPoints = 0;
-    if (patchInfo.isRegular) {
-        if (!_requiresRegularLocalPoints) {
-            numPatchPoints = _patchBuilder->GetRegularPatchPoints(
-                    patch.levelIndex, patch.faceIndex,
-                    patchInfo.regBoundaryMask, patchPoints, fvarInRefiner);
-
-            //  PatchBuilder set to fill missing boundary points so offset all
-            offsetIndices(patchPoints, numPatchPoints, sourcePointOffset);
-        } else {
-            //
-            //  Future support for regular patches converted to another basis.
-            //  Note the "source points" are not returned in the same
-            //  orientation and there may be fewer than expected number in the
-            //  case of boundaries:
-            /*
-            StackBuffer<Index,64,true> sourcePoints(
-                patchInfo.matrix.GetNumColumns());
-
-            _patchBuilder->GetRegularPatchSourcePoints(
-                    patch.levelIndex, patch.faceIndex,
-                    patchInfo.regBoundaryMask, sourcePoints, fvarInRefiner);
-
-            localHelper.AppendLocalPatchPoints(
-                    patch.levelIndex, patch.faceIndex,
-                    patchInfo.matrix, _patchBuilder->GetRegularPatchType(),
-                    sourcePoints, sourcePointOffset, patchPoints);
-
-            numPatchPoints = patchInfo.matrix.GetNumRows();
-            */
-        }
-    } else if (_requiresIrregularLocalPoints) {
-        int numSourcePoints = 0;
-        if (useDoubleMatrix) {
-            numSourcePoints = patchInfo.dMatrix.GetNumColumns();
-            numPatchPoints  = patchInfo.dMatrix.GetNumRows();
-        } else {
-            numSourcePoints = patchInfo.fMatrix.GetNumColumns();
-            numPatchPoints  = patchInfo.fMatrix.GetNumRows();
-        }
-
-        StackBuffer<Index,64,true> sourcePoints(numSourcePoints);
-
-        _patchBuilder->GetIrregularPatchSourcePoints(
-                patch.levelIndex, patch.faceIndex,
-                patchInfo.irregCornerSpans, sourcePoints, fvarInRefiner);
-
-        if (useDoubleMatrix) {
-            localHelper.AppendLocalPatchPoints(
-                    patch.levelIndex, patch.faceIndex,
-                    patchInfo.dMatrix, _patchBuilder->GetIrregularPatchType(),
-                    sourcePoints, sourcePointOffset, patchPoints);
-        } else {
-            localHelper.AppendLocalPatchPoints(
-                    patch.levelIndex, patch.faceIndex,
-                    patchInfo.fMatrix, _patchBuilder->GetIrregularPatchType(),
-                    sourcePoints, sourcePointOffset, patchPoints);
-        }
-    }
-    return numPatchPoints;
-}
-
-int
-PatchTableBuilder::assignFacePoints(PatchTuple const & patch,
-                                    Index * patchPoints,
-                                    int fvarInTable) const {
-
-    Level const & level = _refiner.getLevel(patch.levelIndex);
-
-    int facePointOffset = (fvarInTable < 0)
-                        ? _levelVertOffsets[patch.levelIndex]
-                        : _levelFVarValueOffsets[fvarInTable][patch.levelIndex];
-
-    int fvarInRefiner = getRefinerFVarChannel(fvarInTable);
-
-    ConstIndexArray facePoints = (fvarInRefiner < 0)
-                    ? level.getFaceVertices(patch.faceIndex)
-                    : level.getFaceFVarValues(patch.faceIndex, fvarInRefiner);
-
-    for (int i = 0; i < facePoints.size(); ++i) {
-        patchPoints[i] = facePoints[i] + facePointOffset;
-    }
-    return facePoints.size();
-}
-
-//
-//  Reserves tables based on contents of the PatchArrayVector in the PatchTable:
-//
-void
-PatchTableBuilder::allocateVertexTables() {
-
-    int ncvs = 0, npatches = 0;
-    for (int i=0; i<_table->GetNumPatchArrays(); ++i) {
-        npatches += _table->GetNumPatches(i);
-        ncvs += _table->GetNumControlVertices(i);
-    }
-
-    if (ncvs==0 || npatches==0)
-        return;
-
-    _table->_patchVerts.resize( ncvs );
-
-    _table->_paramTable.resize( npatches );
-
-    if (_requiresVaryingPatches && !_buildUniformLinear) {
-        _table->allocateVaryingVertices(
-            PatchDescriptor(_patchBuilder->GetLinearPatchType()), npatches);
-    }
-
-    if (_requiresSharpnessArray) {
-        _table->_sharpnessIndices.resize( npatches, Vtr::INDEX_INVALID );
-    }
-}
-
-//
-//  Allocate face-varying tables
-//
-void
-PatchTableBuilder::allocateFVarChannels() {
-
-    int npatches = _table->GetNumPatchesTotal();
-
-    _table->allocateFVarPatchChannels((int)_fvarChannelIndices.size());
-
-    // Initialize each channel
-    for (int fvc=0; fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-        int refinerChannel = _fvarChannelIndices[fvc];
-
-        Sdc::Options::FVarLinearInterpolation interpolation =
-            _refiner.GetFVarLinearInterpolation(refinerChannel);
-
-        _table->setFVarPatchChannelLinearInterpolation(interpolation, fvc);
-
-        PatchDescriptor::Type regPatchType   = _patchBuilder->GetLinearPatchType();
-        PatchDescriptor::Type irregPatchType = regPatchType;
-        if (_buildUniformLinear) {
-            if (_options.triangulateQuads) {
-                regPatchType   = PatchDescriptor::TRIANGLES;
-                irregPatchType = regPatchType;
-            }
-        } else {
-            if (!isFVarChannelLinear(fvc)) {
-                regPatchType   = _patchBuilder->GetRegularPatchType();
-                irregPatchType = _patchBuilder->GetIrregularPatchType();
-            }
-        }
-        _table->allocateFVarPatchChannelValues(
-                PatchDescriptor(regPatchType), PatchDescriptor(irregPatchType),
-                npatches, fvc);
-    }
-}
-
-void
-PatchTableBuilder::BuildUniformPolygons() {
-
-    // Default behavior is to include base level vertices in the patch vertices
-    // for vertex and varying patches, but not face-varying.  Consider exposing
-    // these as public options in future so that clients can create consistent
-    // behavior:
-
-    bool includeBaseLevelIndices     = _options.includeBaseLevelIndices;
-    bool includeBaseLevelFVarIndices = _options.includeFVarBaseLevelIndices;
-
-    // ensure that triangulateQuads is only set for quadrilateral schemes
-    bool triangulateQuads =
-        _options.triangulateQuads && (_patchBuilder->GetRegularFaceSize() == 4);
-
-    // level=0 may contain n-gons, which are not supported in PatchTable.
-    // even if generateAllLevels = true, we start from level 1.
-
-    int maxlevel = _refiner.GetMaxLevel(),
-        firstlevel = _options.generateAllLevels ? 1 : maxlevel,
-        nlevels = maxlevel-firstlevel+1;
-
-    PatchDescriptor::Type ptype = triangulateQuads
-                                ? PatchDescriptor::TRIANGLES
-                                : _patchBuilder->GetLinearPatchType();
-
-    //
-    //  Allocate and initialize the table's members.
-    //
-    _table->_isUniformLinear = true;
-
-    _table->reservePatchArrays(nlevels);
-
-    PatchDescriptor desc(ptype);
-
-    // generate patch arrays
-    for (int level=firstlevel, poffset=0, voffset=0; level<=maxlevel; ++level) {
-
-        TopologyLevel const & refLevel = _refiner.GetLevel(level);
-
-        int npatches = refLevel.GetNumFaces();
-        if (_refiner.HasHoles()) {
-            for (int i = npatches - 1; i >= 0; --i) {
-                npatches -= refLevel.IsFaceHole(i);
-            }
-        }
-        assert(npatches>=0);
-
-        if (triangulateQuads)
-            npatches *= 2;
-
-        _table->pushPatchArray(desc, npatches, &voffset, &poffset, 0);
-    }
-
-    // Allocate various tables
-    allocateVertexTables();
-
-    if (_requiresFVarPatches) {
-        allocateFVarChannels();
-    }
-
-    //
-    //  Now populate the patches:
-    //
-
-    Index          * iptr = &_table->_patchVerts[0];
-    PatchParam     * pptr = &_table->_paramTable[0];
-    Index         ** fptr  = 0;
-    PatchParam    ** fpptr = 0;
-
-    Index levelVertOffset = includeBaseLevelIndices
-                          ? _refiner.GetLevel(0).GetNumVertices() : 0;
-
-    Index * levelFVarVertOffsets = 0;
-    if (_requiresFVarPatches) {
-
-        levelFVarVertOffsets =
-            (Index *)alloca(_fvarChannelIndices.size()*sizeof(Index));
-        memset(levelFVarVertOffsets, 0, _fvarChannelIndices.size()*sizeof(Index));
-
-        fptr = (Index **)alloca(_fvarChannelIndices.size()*sizeof(Index *));
-        fpptr = (PatchParam **)alloca(_fvarChannelIndices.size()*sizeof(PatchParam *));
-        for (int fvc=0; fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-            fptr[fvc] = _table->getFVarValues(fvc).begin();
-            fpptr[fvc] = _table->getFVarPatchParams(fvc).begin();
-
-            if (includeBaseLevelFVarIndices) {
-                int refinerChannel = _fvarChannelIndices[fvc];
-                levelFVarVertOffsets[fvc] =
-                    _refiner.GetLevel(0).GetNumFVarValues(refinerChannel);
-            }
-        }
-    }
-
-    for (int level=1; level<=maxlevel; ++level) {
-
-        TopologyLevel const & refLevel = _refiner.GetLevel(level);
-
-        int nfaces = refLevel.GetNumFaces();
-        if (level>=firstlevel) {
-            for (int face=0; face<nfaces; ++face) {
-
-                if (_refiner.HasHoles() && refLevel.IsFaceHole(face)) {
-                    continue;
-                }
-
-                ConstIndexArray fverts = refLevel.GetFaceVertices(face);
-                for (int vert=0; vert<fverts.size(); ++vert) {
-                    *iptr++ = levelVertOffset + fverts[vert];
-                }
-
-                PatchParam pparam = _patchBuilder->ComputePatchParam(
-                    level, face, _ptexIndices);
-                *pptr++ = pparam;
-
-                if (_requiresFVarPatches) {
-                    for (int fvc=0; fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-                        int refinerChannel = _fvarChannelIndices[fvc];
-
-                        ConstIndexArray fvalues =
-                            refLevel.GetFaceFVarValues(face, refinerChannel);
-                        for (int vert=0; vert<fvalues.size(); ++vert) {
-                            assert((levelFVarVertOffsets[fvc] + fvalues[vert])
-                                < (int)_table->getFVarValues(fvc).size());
-                            fptr[fvc][vert] =
-                                levelFVarVertOffsets[fvc] + fvalues[vert];
-                        }
-                        fptr[fvc]+=fvalues.size();
-                        *fpptr[fvc]++ = pparam;
-                    }
-                }
-
-                if (triangulateQuads) {
-                    // Triangulate the quadrilateral:
-                    //     {v0,v1,v2,v3} -> {v0,v1,v2},{v3,v0,v2}.
-                    *iptr = *(iptr - 4); // copy v0 index
-                    ++iptr;
-                    *iptr = *(iptr - 3); // copy v2 index
-                    ++iptr;
-
-                    *pptr++ = pparam;
-
-                    if (_requiresFVarPatches) {
-                        for (int fvc=0; fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-                            *fptr[fvc] = *(fptr[fvc]-4); // copy fv0 index
-                            ++fptr[fvc];
-                            *fptr[fvc] = *(fptr[fvc]-3); // copy fv2 index
-                            ++fptr[fvc];
-
-                            *fpptr[fvc]++ = pparam;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (_options.generateAllLevels) {
-            levelVertOffset += _refiner.GetLevel(level).GetNumVertices();
-
-            if (_requiresFVarPatches) {
-                for (int fvc=0; fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-                    int refinerChannel = _fvarChannelIndices[fvc];
-                    levelFVarVertOffsets[fvc] +=
-                        _refiner.GetLevel(level).GetNumFVarValues(refinerChannel);
-                }
-            }
-        }
-    }
-}
-
-void
-PatchTableBuilder::BuildPatches() {
-
-    identifyPatches();
-    populatePatches();
-}
-
-//
-//  Identify all patches required for faces at all levels -- appending the
-//  <level,face> pairs to identify each patch for later construction, while
-//  accumulating the number of regular vs irregular patches to size tables.
-//
-inline void
-PatchTableBuilder::appendPatch(int levelIndex, Index faceIndex) {
-
-    _patches.push_back(PatchTuple(faceIndex, levelIndex));
-
-    // Count the patches here to simplify subsequent allocation.
-    if (_patchBuilder->IsPatchRegular(levelIndex, faceIndex)) {
-        ++_numRegularPatches;
-    } else {
-        ++_numIrregularPatches;
-
-        //  LegacyGregory needs to distinguish boundary vs interior
-        if (_requiresLegacyGregoryTables) {
-            _legacyGregoryHelper->AddPatchFace(levelIndex, faceIndex);
-        }
-    }
-}
-
-inline void
-PatchTableBuilder::findDescendantPatches(int levelIndex, Index faceIndex, int targetLevel) {
-
-    //
-    //  If we have reached the target level or a leaf, append the patch (if
-    //  the face qualifies), otherwise recursively search the children:
-    //
-    if ((levelIndex == targetLevel) || _patchBuilder->IsFaceALeaf(levelIndex, faceIndex)) {
-        if (_patchBuilder->IsFaceAPatch(levelIndex, faceIndex)) {
-            appendPatch(levelIndex, faceIndex);
-        }
-    } else {
-        TopologyLevel const & level = _refiner.GetLevel(levelIndex);
-        ConstIndexArray childFaces = level.GetFaceChildFaces(faceIndex);
-        for (int i = 0; i < childFaces.size(); ++i) {
-            if (Vtr::IndexIsValid(childFaces[i])) {
-                findDescendantPatches(levelIndex + 1, childFaces[i], targetLevel);
-            }
-        }
-    }
-}
-
-void
-PatchTableBuilder::identifyPatches() {
-
-    //
-    //  First initialize the offsets for all levels
-    //
-    _levelVertOffsets.push_back(0);
-    _levelFVarValueOffsets.resize(_fvarChannelIndices.size());
-    for (int fvc=0; fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-        _levelFVarValueOffsets[fvc].push_back(0);
-    }
-
-    for (int levelIndex=0; levelIndex<_refiner.GetNumLevels(); ++levelIndex) {
-        Level const & level = _refiner.getLevel(levelIndex);
-
-        _levelVertOffsets.push_back(
-            _levelVertOffsets.back() + level.getNumVertices());
-
-        for (int fvc=0; fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-            int refinerChannel = _fvarChannelIndices[fvc];
-            _levelFVarValueOffsets[fvc].push_back(
-                _levelFVarValueOffsets[fvc].back()
-                + level.getNumFVarValues(refinerChannel));
-        }
-    }
-
-    //
-    //  If a set of selected base faces is present, identify the patches
-    //  depth first.  Otherwise search breadth first through the levels:
-    //
-    int uniformLevel = _refiner.IsUniform() ? _options.maxIsolationLevel : -1;
-
-    _patches.reserve(_refiner.GetNumFacesTotal());
-
-    if (_selectedFaces.size()) {
-        for (int i = 0; i < (int)_selectedFaces.size(); ++i) {
-            findDescendantPatches(0, _selectedFaces[i], uniformLevel);
-        }
-    } else if (uniformLevel >= 0) {
-        int numFaces = _refiner.getLevel(uniformLevel).getNumFaces();
-
-        for (int faceIndex = 0; faceIndex < numFaces; ++faceIndex) {
-
-            if (_patchBuilder->IsFaceAPatch(uniformLevel, faceIndex)) {
-                appendPatch(uniformLevel, faceIndex);
-            }
-        }
-    } else {
-        for (int levelIndex=0; levelIndex<_refiner.GetNumLevels(); ++levelIndex) {
-            int numFaces = _refiner.getLevel(levelIndex).getNumFaces();
-
-            for (int faceIndex = 0; faceIndex < numFaces; ++faceIndex) {
-
-                if (_patchBuilder->IsFaceAPatch(levelIndex, faceIndex) &&
-                    _patchBuilder->IsFaceALeaf(levelIndex, faceIndex)) {
-                    appendPatch(levelIndex, faceIndex);
-                }
-            }
-        }
-    }
-}
-
-//
-//  Populate patches that were previously identified.
-//
-void
-PatchTableBuilder::populatePatches() {
-
-    // State needed to populate an array in the patch table.
-    // Pointers in this structure are initialized after the patch array
-    // data buffers have been allocated and are then incremented as we
-    // populate data into the patch table. Currently, we'll have at
-    // most 3 patch arrays: Regular, Irregular, and IrregularBoundary.
-    struct PatchArrayBuilder {
-        PatchArrayBuilder()
-            : patchType(PatchDescriptor::NON_PATCH), numPatches(0)
-            , iptr(NULL), pptr(NULL), sptr(NULL), vptr(NULL) { }
-
-        PatchDescriptor::Type patchType;
-        int numPatches;
-
-        Index      *iptr;
-        PatchParam *pptr;
-        Index      *sptr;
-        Index      *vptr;
-
-        StackBuffer<Index*,1>      fptr;   // fvar indices
-        StackBuffer<PatchParam*,1> fpptr;  // fvar patch-params
-
-    private:
-        // Non-copyable
-        PatchArrayBuilder(PatchArrayBuilder const &) {}
-        PatchArrayBuilder & operator=(PatchArrayBuilder const &) {return *this;}
-
-    } arrayBuilders[3];
-
-    // Regular patches patches will be packed into the first patch array
-    // Irregular patches will be packed into arrays according to optional
-    // specification -- sharing the array with regular patches or packed
-    // into an array of their own.
-    int ARRAY_REGULAR   = 0;
-    int ARRAY_IRREGULAR = 1;
-    int ARRAY_BOUNDARY  = 2; // only used by LegacyGregory
-
-    arrayBuilders[ARRAY_REGULAR].patchType = _patchBuilder->GetRegularPatchType();
-    arrayBuilders[ARRAY_REGULAR].numPatches = _numRegularPatches;
-
-    int numPatchArrays = (_numRegularPatches > 0);
-    if (_numIrregularPatches > 0) {
-        if (!_requiresLegacyGregoryTables) {
-            //
-            //  Pack irregular patches into same array as regular or separately:
-            //
-            if (_patchBuilder->GetRegularPatchType() ==
-                    _patchBuilder->GetIrregularPatchType()) {
-                ARRAY_IRREGULAR = ARRAY_REGULAR;
-                numPatchArrays = 1;  // needed in case no regular patches
-            } else {
-                ARRAY_IRREGULAR = numPatchArrays;
-                numPatchArrays ++;
-            }
-            arrayBuilders[ARRAY_IRREGULAR].patchType =
-                _patchBuilder->GetIrregularPatchType();
-            arrayBuilders[ARRAY_IRREGULAR].numPatches += _numIrregularPatches;
-        } else {
-            //
-            // Arrays for Legacy-Gregory tables -- irregular patches are split
-            // into two arrays for interior and boundary patches
-            //
-            ARRAY_IRREGULAR = numPatchArrays;
-            arrayBuilders[ARRAY_IRREGULAR].patchType =
-                PatchDescriptor::GREGORY;
-            arrayBuilders[ARRAY_IRREGULAR].numPatches =
-                _legacyGregoryHelper->GetNumInteriorPatches();
-            numPatchArrays += (arrayBuilders[ARRAY_IRREGULAR].numPatches > 0);
-
-            ARRAY_BOUNDARY = numPatchArrays;
-            arrayBuilders[ARRAY_BOUNDARY].patchType =
-                PatchDescriptor::GREGORY_BOUNDARY;
-            arrayBuilders[ARRAY_BOUNDARY].numPatches =
-                _legacyGregoryHelper->GetNumBoundaryPatches();
-            numPatchArrays += (arrayBuilders[ARRAY_BOUNDARY].numPatches > 0);
-        }
-    }
-
-    // Create patch arrays
-    _table->reservePatchArrays(numPatchArrays);
-
-    int voffset=0, poffset=0, qoffset=0;
-    for (int arrayIndex=0; arrayIndex<numPatchArrays; ++arrayIndex) {
-        PatchArrayBuilder & arrayBuilder = arrayBuilders[arrayIndex];
-        _table->pushPatchArray(PatchDescriptor(arrayBuilder.patchType),
-            arrayBuilder.numPatches, &voffset, &poffset, &qoffset );
-    }
-
-    // Allocate patch array data buffers
-    allocateVertexTables();
-
-    if (_requiresFVarPatches) {
-        allocateFVarChannels();
-    }
-
-    // Initialize pointers used while populating patch array data buffers
-    for (int arrayIndex=0; arrayIndex<numPatchArrays; ++arrayIndex) {
-        PatchArrayBuilder & arrayBuilder = arrayBuilders[arrayIndex];
-
-        arrayBuilder.iptr = _table->getPatchArrayVertices(arrayIndex).begin();
-        arrayBuilder.pptr = _table->getPatchParams(arrayIndex).begin();
-        if (_requiresSharpnessArray) {
-            arrayBuilder.sptr = _table->getSharpnessIndices(arrayIndex);
-        }
-        if (_requiresVaryingPatches) {
-            arrayBuilder.vptr = _table->getPatchArrayVaryingVertices(arrayIndex).begin();
-        }
-
-        if (_requiresFVarPatches) {
-            arrayBuilder.fptr.SetSize((int)_fvarChannelIndices.size());
-            arrayBuilder.fpptr.SetSize((int)_fvarChannelIndices.size());
-
-            for (int fvc=0; fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-
-                Index pidx = _table->getPatchIndex(arrayIndex, 0);
-                int   ofs  = pidx * _table->GetFVarValueStride(fvc);
-
-                arrayBuilder.fptr[fvc] = &_table->getFVarValues(fvc)[ofs];
-                arrayBuilder.fpptr[fvc] = &_table->getFVarPatchParams(fvc)[pidx];
-            }
-        }
-    }
-
-    //
-    //  Initializing StencilTable and other helpers.  Note Varying local points
-    //  are managed by the LocalPointHelper for Vertex patches (as Varying local
-    //  points are tightly coupled to their local points)
-    //
-    LocalPointHelper * vertexLocalPointHelper = 0;
-
-    StackBuffer<LocalPointHelper*,4> fvarLocalPointHelpers;
-
-    if (_requiresLocalPoints) {
-        LocalPointHelper::Options opts;
-        opts.createStencilTable = true;
-        opts.createVaryingTable = _requiresVaryingLocalPoints;
-        opts.doubleStencilTable = _options.patchPrecisionDouble;
-        opts.shareLocalPoints   = _options.shareEndCapPatchPoints;
-        opts.reuseSourcePoints  = (_patchBuilder->GetIrregularPatchType() ==
-                                   _patchBuilder->GetNativePatchType() );
-
-        vertexLocalPointHelper = new LocalPointHelper(
-                _refiner, opts, -1, estimateLocalPointCount(opts, -1));
-
-        if (_requiresFVarPatches) {
-            opts.createStencilTable = true;
-            opts.createVaryingTable = false;
-            opts.doubleStencilTable = _options.fvarPatchPrecisionDouble;
-
-            fvarLocalPointHelpers.SetSize((int)_fvarChannelIndices.size());
-
-            for (int fvc = 0; fvc < (int)_fvarChannelIndices.size(); ++fvc) {
-                fvarLocalPointHelpers[fvc] = new LocalPointHelper(
-                        _refiner, opts, getRefinerFVarChannel(fvc),
-                        estimateLocalPointCount(opts, fvc));
-            }
-        }
-    }
-
-    //  Populate patch data buffers
-    //
-    //  Intentionally declare local vairables to contain patch topology info
-    //  outside the loop to avoid repeated memory de-allocation/re-allocation
-    //  associated with a change-of-basis.
-    PatchInfo patchInfo;
-    PatchInfo fvarPatchInfo;
-
-    bool fvarPrecisionMatches = (_options.patchPrecisionDouble ==
-                                 _options.fvarPatchPrecisionDouble);
-
-    for (int patchIndex = 0; patchIndex < (int)_patches.size(); ++patchIndex) {
-
-        PatchTuple const & patch = _patches[patchIndex];
-
-        //
-        //  Identify and assign points, stencils, sharpness, etc. for this patch:
-        //
-        identifyPatchTopology(patch, patchInfo);
-
-        PatchArrayBuilder * arrayBuilder = &arrayBuilders[ARRAY_REGULAR];
-        if (!patchInfo.isRegular) {
-            arrayBuilder = &arrayBuilders[ARRAY_IRREGULAR];
-        }
-
-        if (_requiresLegacyGregoryTables && !patchInfo.isRegular) {
-            if (isBoundaryFace(
-                    _refiner.getLevel(patch.levelIndex), patch.faceIndex)) {
-                arrayBuilder = &arrayBuilders[ARRAY_BOUNDARY];
-            }
-            arrayBuilder->iptr += assignFacePoints(patch, arrayBuilder->iptr);
-        } else {
-            arrayBuilder->iptr += assignPatchPointsAndStencils(patch,
-                        patchInfo, arrayBuilder->iptr, *vertexLocalPointHelper);
-        }
-        if (_requiresSharpnessArray) {
-            *arrayBuilder->sptr++ = assignSharpnessIndex(patchInfo.regSharpness,
-                        _table->_sharpnessValues);
-        }
-
-        //
-        //  Identify the PatchParam -- which may vary slightly for face-varying
-        //  channels but will still be used to initialize them when so to avoid
-        //  recomputing from scratch
-        //
-        PatchParam patchParam =
-            _patchBuilder->ComputePatchParam(patch.levelIndex, patch.faceIndex,
-                  _ptexIndices, patchInfo.isRegular, patchInfo.paramBoundaryMask,
-                  true/* condition to compute transition mask */);
-        *arrayBuilder->pptr++ = patchParam;
-
-        //
-        //  Assignment of face-varying patches is split between the comon/trivial
-        //  case of linear patches and the more complex non-linear cases:
-        //
-        assert((_fvarChannelIndices.size() > 0) == _requiresFVarPatches);
-        for (int fvc = 0; fvc < (int)_fvarChannelIndices.size(); ++fvc) {
-
-            if (isFVarChannelLinear(fvc)) {
-                assignFacePoints(patch, arrayBuilder->fptr[fvc], fvc);
-
-                *arrayBuilder->fpptr[fvc] = patchParam;
-            } else {
-                //
-                //  For non-linear patches, reuse patch information when the
-                //  topology of the face in face-varying space matches the
-                //  original patch:
-                //
-                bool fvcTopologyMatches = fvarPrecisionMatches &&
-                                          doesFVarTopologyMatch(patch, fvc);
-
-                PatchInfo & fvcPatchInfo = fvcTopologyMatches
-                                         ? patchInfo : fvarPatchInfo;
-
-                if (!fvcTopologyMatches) {
-                    identifyPatchTopology(patch, fvcPatchInfo, fvc);
-                }
-                assignPatchPointsAndStencils(patch, fvcPatchInfo,
-                        arrayBuilder->fptr[fvc], *fvarLocalPointHelpers[fvc], fvc);
-
-                //  Initialize and assign the face-varying PatchParam:
-                PatchParam & fvcPatchParam = *arrayBuilder->fpptr[fvc];
-                fvcPatchParam.Set(
-                   patchParam.GetFaceId(),
-                   patchParam.GetU(), patchParam.GetV(),
-                   patchParam.GetDepth(),
-                   patchParam.NonQuadRoot(),
-                   (unsigned short) fvcPatchInfo.paramBoundaryMask,
-                   patchParam.GetTransition(),
-                   fvcPatchInfo.isRegular);
-            }
-            arrayBuilder->fpptr[fvc] ++;
-            arrayBuilder->fptr[fvc] += _table->GetFVarValueStride(fvc);
-        }
-
-        if (_requiresVaryingPatches) {
-            arrayBuilder->vptr += assignFacePoints(patch, arrayBuilder->vptr);
-        }
-    }
-
-    //
-    //  Finalizing and destroying StencilTable and other helpers:
-    //
-    if (_requiresLocalPoints) {
-        _table->_localPointStencils =
-            vertexLocalPointHelper->AcquireStencilTable();
-        if (_requiresVaryingLocalPoints) {
-            _table->_localPointVaryingStencils =
-                vertexLocalPointHelper->AcquireStencilTableVarying();
-        }
-        delete vertexLocalPointHelper;
-
-        if (_requiresFVarPatches) {
-            _table->_localPointFaceVaryingStencils.resize(_fvarChannelIndices.size());
-
-            for (int fvc=0; fvc<(int)_fvarChannelIndices.size(); ++fvc) {
-                _table->_localPointFaceVaryingStencils[fvc] =
-                        fvarLocalPointHelpers[fvc]->AcquireStencilTable();
-                delete fvarLocalPointHelpers[fvc];
-            }
-        }
-    }
-    if (_requiresLegacyGregoryTables) {
-        _legacyGregoryHelper->FinalizeQuadOffsets(_table->_quadOffsetsTable);
-        _legacyGregoryHelper->FinalizeVertexValence(_table->_vertexValenceTable,
-                                       _levelVertOffsets[_refiner.GetMaxLevel()]);
-    }
-}
-
-int
-PatchTableBuilder::estimateLocalPointCount(
-        LocalPointHelper::Options const & options,
-        int fvarChannel) const {
-
-    if ((fvarChannel >= 0) && isFVarChannelLinear(fvarChannel)) return 0;
-
-    //
-    //  Estimate the local points required for the Vertex topology in all cases
-    //  as it may be used in the estimates for face-varying channels:
-    //
-    int estLocalPoints = 0;
-
-    if (_requiresRegularLocalPoints) {
-        //
-        //  Either all regular patches are being converted to a non-native
-        //  basis, or boundary points are being extrapolated in the regular
-        //  basis.  The latter case typically involves a small fraction of
-        //  patches and points, so we don't estimate any local points and
-        //  leave it up to incremental allocation later to account for them.
-        //
-        int numPointsPerPatch = PatchDescriptor(
-                _patchBuilder->GetRegularPatchType()).GetNumControlVertices();
-
-        if (_patchBuilder->GetRegularPatchType() !=
-                _patchBuilder->GetNativePatchType()) {
-            estLocalPoints += _numRegularPatches * numPointsPerPatch;
-        }
-    } 
-    if (_requiresIrregularLocalPoints) {
-        bool oldEstimate = false;
-        int numIrregularPatches = oldEstimate ?
-            _refiner.GetLevel(_refiner.GetMaxLevel()).GetNumFaces() :
-            _numIrregularPatches;
-
-        //
-        //  If converting to a basis other than regular, its difficult to
-        //  predict the degree of point-sharing that may occur, and in general,
-        //  the maximal benefit is small so we don't attempt to compensate for
-        //  it here.  If converting to the same basis as regular, roughly half
-        //  of the points of the patch are involved in approximating the
-        //  irregularity (and cannot be shared) so don't include the source
-        //  points that will be used in such patches.
-        //
-        int numPointsPerPatch = PatchDescriptor(
-            _patchBuilder->GetIrregularPatchType()).GetNumControlVertices();
-
-        if (options.reuseSourcePoints && (_patchBuilder->GetIrregularPatchType() ==
-                                          _patchBuilder->GetNativePatchType())) {
-            numPointsPerPatch /= 2;
-        }
-        estLocalPoints += numIrregularPatches * numPointsPerPatch;
-    } 
-
-    //
-    //  Its difficult to estimate the differences in number of irregularities
-    //  between the vertex topology and a face-varying channel without more
-    //  detailed inspection.
-    //
-    //  A much higher number of fvar-values than vertices is an indication that
-    //  the number of differences increases, and that generally lowers the
-    //  number of irregular patches due to more regular patches on face-varying
-    //  boundaries, but not always.  The use of some interpolation types, e.g.
-    //  LINEAR_BOUNDARIES, combined with inf-sharp patches can increase the
-    //  number of irregularities significantly.
-    //
-    if ((fvarChannel >= 0) && (_refiner.GetNumLevels() > 1)) {
-        //
-        //  We're seeing face-varying stencil table sizes about 1/4 the size of
-        //  the vertex stencil table for what seem like typical cases...
-        //
-        //  Identify the ratio of fvar-values to vertices that typically leads
-        //  to these reductions and reduce the number of expected local points
-        //  proportionally.  Use the number of fvar-values at level 1:  level 0
-        //  can be misleading as there can be many FEWER than the number of
-        //  vertices, but subsequent levels will have at least one unique
-        //  fvar-value per vertex, and later levels will have a much higher
-        //  percentage shared as a result of refinement.
-        //
-        int fvc = getRefinerFVarChannel(fvarChannel);
-        if (_refiner.GetLevel(1).GetNumFVarValues(fvc) >
-                _refiner.GetLevel(1).GetNumVertices()) {
-            //  Scale this based on ratio of fvar-values to vertices...
-            float fvarReduction = 0.5;
-
-            estLocalPoints = (int) ((float)estLocalPoints * fvarReduction);
-        }
-    }
-    return estLocalPoints;
-}
-
-
-//
-//  Member function definitions for the LocalPointHelper class:
-//
-PatchTableBuilder::LocalPointHelper::LocalPointHelper(
-        TopologyRefiner const & refiner, Options const & options,
-        int fvarChannel, int numLocalPointsExpected) :
-            _refiner(refiner), _options(options), _fvarChannel(fvarChannel),
-            _numLocalPoints(0), _stencilTable(), _stencilTableVarying() {
-
-    _localPointOffset = (_fvarChannel < 0)
-                      ? _refiner.GetNumVerticesTotal()
-                      : _refiner.GetNumFVarValuesTotal(_fvarChannel);
-
-    if (_options.createStencilTable) {
-        if (_options.doubleStencilTable) {
-            initializeStencilTable<double>(numLocalPointsExpected);
-        } else {
-            initializeStencilTable<float>(numLocalPointsExpected);
-        }
-    }
-}
-
-template <typename REAL>
-void
-PatchTableBuilder::LocalPointHelper::initializeStencilTable(int numLocalPointsExpected) {
-
-    //
-    //  Reserving space for the local-point stencils has been a source of
-    //  problems in the past so we rely on the PatchTableBuilder to provide
-    //  a reasonable estimate to the LocalPointHelper on construction.  For
-    //  large meshes a limit on the size initially reserve is capped.
-    //
-    //  The average number of entries per stencil has been historically set
-    //  at 16, which seemed high and was reduced on further investigation.
-    //
-    StencilTableReal<REAL> * stencilTable = new StencilTableReal<REAL>(0);
-    StencilTableReal<REAL> * varyingTable = _options.createVaryingTable
-                                          ? new StencilTableReal<REAL>(0) : 0;
-
-    //  Historic note:  limits to 100M (=800M bytes) entries for reserved size
-    size_t const MaxEntriesToReserve  = 100 * 1024 * 1024;
-    size_t const AvgEntriesPerStencil = 9;  // originally 16
-
-    size_t numStencilsExpected       = numLocalPointsExpected;
-    size_t numStencilEntriesExpected = numStencilsExpected * AvgEntriesPerStencil;
-
-    size_t numEntriesToReserve = std::min(numStencilEntriesExpected,
-                                          MaxEntriesToReserve);
-    if (numEntriesToReserve) {
-        stencilTable->reserve(
-                (int)numStencilsExpected, (int)numEntriesToReserve);
-
-        if (varyingTable) {
-            //  Varying stencils have only one entry per point
-            varyingTable->reserve(
-                    (int)numStencilsExpected, (int)numStencilsExpected);
-        }
-    }
-
-    _stencilTable.Set(stencilTable);
-    _stencilTableVarying.Set(varyingTable);
-}
-
-template <typename REAL>
-PatchTableBuilder::StencilTablePtr
-PatchTableBuilder::LocalPointHelper::acquireStencilTable(
-        StencilTablePtr& stencilTableMember) {
-
-    StencilTableReal<REAL> * stencilTable = stencilTableMember.Get<REAL>();
-
-    if (stencilTable) {
-        if (stencilTable->GetNumStencils() > 0) {
-            stencilTable->finalize();
-        } else {
-            delete stencilTable;
-            stencilTable = 0;
-        }
-    }
-
-    stencilTableMember.Set();
-    return StencilTablePtr(stencilTable);
-}
-
-PatchTableBuilder::LocalPointHelper::~LocalPointHelper() {
-
-    if (_options.doubleStencilTable) {
-        delete _stencilTable.Get<double>();
-        delete _stencilTableVarying.Get<double>();
-    } else {
-        delete _stencilTable.Get<float>();
-        delete _stencilTableVarying.Get<float>();
-    }
-}
-
-Index
-PatchTableBuilder::LocalPointHelper::findSharedCornerPoint(int levelIndex,
-        Index vertIndex, Index localPointIndex) {
-
-    if (_sharedCornerPoints.empty()) {
-        _sharedCornerPoints.resize(_refiner.GetNumLevels());
-    }
-
-    IndexVector & vertexPoints = _sharedCornerPoints[levelIndex];
-    if (vertexPoints.empty()) {
-        Level const & level = _refiner.getLevel(levelIndex);
-
-        if (_fvarChannel < 0) {
-            vertexPoints.resize(level.getNumVertices(), INDEX_INVALID);
-        } else {
-            vertexPoints.resize(level.getNumFVarValues(_fvarChannel), INDEX_INVALID);
-        }
-    }
-
-    Index & assignedIndex = vertexPoints[vertIndex];
-    if (!IndexIsValid(assignedIndex)) {
-        assignedIndex = localPointIndex;
-    }
-    return assignedIndex;
-}
-
-Index
-PatchTableBuilder::LocalPointHelper::findSharedEdgePoint(int levelIndex,
-         Index edgeIndex, int edgeEnd, Index localPointIndex) {
-
-    if (_sharedEdgePoints.empty()) {
-        _sharedEdgePoints.resize(_refiner.GetNumLevels());
-    }
-
-    IndexVector & edgePoints = _sharedEdgePoints[levelIndex];
-    if (edgePoints.empty()) {
-        edgePoints.resize(
-                2 * _refiner.GetLevel(levelIndex).GetNumEdges(), INDEX_INVALID);
-    }
-
-    Index & assignedIndex = edgePoints[2 * edgeIndex + edgeEnd];
-    if (!IndexIsValid(assignedIndex)) {
-        assignedIndex = localPointIndex;
-    } else {
-    }
-    return assignedIndex;
-}
-
-template <typename REAL>
-void
-PatchTableBuilder::LocalPointHelper::appendLocalPointStencil(
-    SparseMatrix<REAL> const &  conversionMatrix,
-    int                         stencilRow,
-    Index const                 sourcePoints[],
-    int                         sourcePointOffset) {
-
-    int               stencilSize   = conversionMatrix.GetRowSize(stencilRow);
-    ConstArray<int>   matrixColumns = conversionMatrix.GetRowColumns(stencilRow);
-    ConstArray<REAL>  matrixWeights = conversionMatrix.GetRowElements(stencilRow);
-
-    StencilTableReal<REAL>* stencilTable = _stencilTable.Get<REAL>();
-
-    stencilTable->_sizes.push_back(stencilSize);
-    for (int i = 0; i < stencilSize; ++i) {
-        stencilTable->_weights.push_back(matrixWeights[i]);
-        stencilTable->_indices.push_back(
-                sourcePoints[matrixColumns[i]] + sourcePointOffset);
-    }
-}
-
-template <typename REAL>
-void
-PatchTableBuilder::LocalPointHelper::appendLocalPointStencils(
-    SparseMatrix<REAL> const &  conversionMatrix,
-    Index const                 sourcePoints[],
-    int                         sourcePointOffset) {
-
-    //
-    //  Resize the StencilTable members to accomodate all rows and elements from
-    //  the given set of points represented by the matrix
-    //
-    StencilTableReal<REAL>* stencilTable = _stencilTable.Get<REAL>();
-
-    int numNewStencils = conversionMatrix.GetNumRows();
-    int numNewElements = conversionMatrix.GetNumElements();
-
-    size_t numOldStencils = stencilTable->_sizes.size();
-    size_t numOldElements = stencilTable->_indices.size();
-
-    //  Assign the sizes for the new stencils:
-    stencilTable->_sizes.resize(numOldStencils + numNewStencils);
-
-    int * newSizes = &stencilTable->_sizes[numOldStencils];
-    for (int i = 0; i < numNewStencils; ++i) {
-        newSizes[i] = conversionMatrix.GetRowSize(i);
-    }
-
-    //  Assign remapped indices for the stencils:
-    stencilTable->_indices.resize(numOldElements + numNewElements);
-
-    int const * mtxIndices = &conversionMatrix.GetColumns()[0];
-    int *       newIndices = &stencilTable->_indices[numOldElements];
-
-    for (int i = 0; i < numNewElements; ++i) {
-        newIndices[i] = sourcePoints[mtxIndices[i]] + sourcePointOffset;
-    }
-
-    //  Copy the stencil weights direct from the matrix elements:
-    stencilTable->_weights.resize(numOldElements + numNewElements);
-
-    REAL const * mtxWeights = &conversionMatrix.GetElements()[0];
-    REAL *       newWeights = &stencilTable->_weights[numOldElements];
-
-    std::memcpy(newWeights, mtxWeights, numNewElements * sizeof(REAL));
-}
-
-
-//
-//  Its unfortunate that varying stencils for local points were ever created
-//  and external dependency on them forces a certain coordination here.  Each
-//  patch type is expected to have a varying value computed for each patch
-//  point and shaders retrieve the varying value associated with particular
-//  points.  So we need to store that mapping from control point to varying
-//  point (or corner of the patch) somewhere.  We are trying to avoid adding
-//  more to the PatchDescriptor interface, so we'll keep it here for now in
-//  the hope we may be able to eliminate the need for it.
-//
-namespace {
-    inline int const *
-    GetVaryingIndicesPerType(PatchDescriptor::Type type) {
-
-        //  Note that we can use the linear and gregory vectors here for
-        //  both quads and tris
-        static int const linearIndices[4] = { 0, 1, 2, 3 };
-        static int const bsplineIndices[] =
-                { 0, 0, 1, 1, 0, 0, 1, 1, 3, 3, 2, 2, 3, 3, 2, 2 };
-        static int const boxsplineIndices[] =
-                { 0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 2, 2 };
-        static int const gregoryIndices[] =
-                { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3 };
-        static int const gregoryTriIndices[] =
-                { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 0, 1, 2 };
-
-        if (type == PatchDescriptor::GREGORY_BASIS) {
-            return gregoryIndices;
-        } else if (type == PatchDescriptor::GREGORY_TRIANGLE) {
-            return gregoryTriIndices;
-        } else if (type == PatchDescriptor::REGULAR) {
-            return bsplineIndices;
-        } else if (type == PatchDescriptor::LOOP) {
-            return boxsplineIndices;
-        } else if (type == PatchDescriptor::QUADS) {
-            return linearIndices;
-        } else if (type == PatchDescriptor::TRIANGLES) {
-            return linearIndices;
-        }
-        return 0;
-    }
-}
-
-template <typename REAL>
-void
-PatchTableBuilder::LocalPointHelper::appendLocalPointVaryingStencil(
-    int const * varyingIndices, int patchPointIndex,
-    Index const sourcePoints[], int sourcePointOffset) {
-
-    Index varyingPoint =
-        sourcePoints[varyingIndices[patchPointIndex]] + sourcePointOffset;
-
-    StencilTableReal<REAL>* t = _stencilTableVarying.Get<REAL>();
-
-    t->_sizes.push_back(1);
-    t->_indices.push_back(varyingPoint);
-    t->_weights.push_back((REAL) 1.0);
-}
-
-namespace {
-    typedef short ShareBits;
-
-    static ShareBits const SHARE_CORNER     = 0x10;
-    static ShareBits const SHARE_EDGE_BEGIN = 0x20;
-    static ShareBits const SHARE_EDGE_END   = 0x40;
-    static ShareBits const SHARE_EDGE       = SHARE_EDGE_BEGIN | SHARE_EDGE_END;
-    static ShareBits const SHARE_INDEX_MASK = 0x0f;
-
-    inline ShareBits const *
-    GetShareBitsPerType(PatchDescriptor::Type type) {
-
-        static ShareBits const linearQuadBits[5] = { 0x10, 0x11, 0x12, 0x13,
-                                                     SHARE_CORNER };
-        static ShareBits const gregoryQuadBits[21] = { 0x10, 0x20, 0x43, 0, 0,
-                                                       0x11, 0x21, 0x40, 0, 0,
-                                                       0x12, 0x22, 0x41, 0, 0,
-                                                       0x13, 0x23, 0x42, 0, 0, 
-                                                       SHARE_CORNER | SHARE_EDGE };
-
-        if (type == PatchDescriptor::QUADS) {
-            return linearQuadBits;
-        } else if (type == PatchDescriptor::GREGORY_BASIS) {
-            return gregoryQuadBits;
-        }
-        return 0;
-    }
-}
-
-template <typename REAL>
-int
-PatchTableBuilder::LocalPointHelper::AppendLocalPatchPoints(
-    int levelIndex, Index faceIndex,
-    SparseMatrix<REAL> const &  matrix,
-    PatchDescriptor::Type       patchType,
-    Index const                 sourcePoints[],
-    int                         sourcePointOffset,
-    Index                       patchPoints[]) {
-
-    //
-    //  If sharing local points, verify the type of this patch supports
-    //  sharing and disable it if not:
-    //
-    int numPatchPoints  = matrix.GetNumRows();
-
-    int firstNewLocalPoint = _localPointOffset + _numLocalPoints;
-    int nextNewLocalPoint  = firstNewLocalPoint;
-
-    ShareBits const* shareBitsPerPoint = _options.shareLocalPoints ?
-                        GetShareBitsPerType(patchType) : 0;
-
-    bool shareLocalPointsForThisPatch = (shareBitsPerPoint != 0);
-
-    int const * varyingIndices = 0;
-    if (_stencilTableVarying) {
-        varyingIndices = GetVaryingIndicesPerType(patchType);
-    }
-
-    bool applyVertexStencils  = (_stencilTable.Get<REAL>() != 0);
-    bool applyVaryingStencils = (varyingIndices != 0);
-
-    //
-    //  When point-sharing is not enabled, all patch points are generally
-    //  new local points -- the exception to this occurs when "re-using"
-    //  source points, i.e. the resulting patch can be a mixture of source
-    //  and local points (typically when the irregular patch type is the
-    //  same as the regular patch type native to the scheme).
-    //
-    if (!shareLocalPointsForThisPatch) {
-        if (!_options.reuseSourcePoints) {
-            if (applyVertexStencils) {
-                appendLocalPointStencils(
-                    matrix, sourcePoints, sourcePointOffset);
-                if (applyVaryingStencils) {
-                    for (int i = 0; i < numPatchPoints; ++i) {
-                        appendLocalPointVaryingStencil<REAL>(
-                            varyingIndices, i, sourcePoints, sourcePointOffset);
-                    }
-                }
-            }
-            for (int i = 0; i < numPatchPoints; ++i) {
-                patchPoints[i] = nextNewLocalPoint ++;
-            }
-        } else {
-            for (int i = 0; i < numPatchPoints; ++i) {
-                if (_options.reuseSourcePoints && (matrix.GetRowSize(i) == 1)) {
-                    patchPoints[i] = sourcePoints[matrix.GetRowColumns(i)[0]]
-                                   + sourcePointOffset;
-                    continue;
-                }
-                if (applyVertexStencils) {
-                    appendLocalPointStencil(
-                        matrix, i, sourcePoints, sourcePointOffset);
-                    if (applyVaryingStencils) {
-                        appendLocalPointVaryingStencil<REAL>(
-                            varyingIndices, i, sourcePoints, sourcePointOffset);
-                    }
-                }
-                patchPoints[i] = nextNewLocalPoint ++;
-            }
-        }
-    } else {
-        //  Gather topology info according to the sharing for this patch type
-        //
-        Level const & level = _refiner.getLevel(levelIndex);
-
-        ConstIndexArray fCorners;
-        ConstIndexArray fVerts;
-        ConstIndexArray fEdges;
-        bool            fEdgeReversed[4];
-        bool            fEdgeBoundary[4];
-
-        ShareBits const shareBitsForType = shareBitsPerPoint[numPatchPoints];
-        if (shareBitsForType) {
-            if (shareBitsForType & SHARE_CORNER) {
-                fCorners = (_fvarChannel < 0) 
-                         ? level.getFaceVertices(faceIndex)
-                         : level.getFaceFVarValues(faceIndex, _fvarChannel);
-            }
-            if (shareBitsForType & SHARE_EDGE) {
-                fEdges = level.getFaceEdges(faceIndex);
-                fVerts = (_fvarChannel < 0) ? fCorners
-                                            : level.getFaceVertices(faceIndex);
-
-                Level::ETag fEdgeTags[4];
-                level.getFaceETags(faceIndex, fEdgeTags, _fvarChannel);
-
-                for (int i = 0; i < fEdges.size(); ++i) {
-                    fEdgeReversed[i] = level.getEdgeVertices(fEdges[i])[0] != fVerts[i];
-                    fEdgeBoundary[i] = fEdgeTags[i]._boundary;
-                }
-            }
-        }
-
-        //  Inspect the sharing bits for each point -- if set, see if a local
-        //  point for the corresponding vertex/fvar-value or edge was
-        //  previously used:
-        //
-        for (int i = 0; i < numPatchPoints; ++i) {
-            if (_options.reuseSourcePoints && (matrix.GetRowSize(i) == 1)) {
-                patchPoints[i] = sourcePoints[matrix.GetRowColumns(i)[0]]
-                               + sourcePointOffset;
-                continue;
-            }
-
-            int patchPoint = nextNewLocalPoint;
-
-            if (shareBitsPerPoint[i]) {
-                int index = shareBitsPerPoint[i] & SHARE_INDEX_MASK;
-
-                if (shareBitsPerPoint[i] & SHARE_CORNER) {
-                    patchPoint = findSharedCornerPoint(
-                        levelIndex, fCorners[index], nextNewLocalPoint);
-                } else if (!fEdgeBoundary[index]) {
-                    int edgeEnd = (((shareBitsPerPoint[i] & SHARE_EDGE_END) > 0) !=
-                                   fEdgeReversed[index]);
-                    patchPoint = findSharedEdgePoint(
-                        levelIndex, fEdges[index], edgeEnd, nextNewLocalPoint);
-                }
-            }
-            if (patchPoint == nextNewLocalPoint) {
-                if (applyVertexStencils) {
-                    appendLocalPointStencil(
-                        matrix, i, sourcePoints, sourcePointOffset);
-                    if (applyVaryingStencils) {
-                        appendLocalPointVaryingStencil<REAL>(
-                            varyingIndices, i, sourcePoints, sourcePointOffset);
-                    }
-                }
-                nextNewLocalPoint ++;
-            }
-            patchPoints[i] = patchPoint;
-        }
-    }
-
-    int numNewLocalPoints = nextNewLocalPoint - firstNewLocalPoint;
-    _numLocalPoints += numNewLocalPoints;
-    return numNewLocalPoints;
-}
-
-
-//
-//  Member function definitions for the LegacyGregoryHelper class:
-//
-void
-PatchTableBuilder::LegacyGregoryHelper::AddPatchFace(int level, Index face) {
-
-    if (_refiner.getLevel(level).getFaceCompositeVTag(face)._boundary) {
-        _boundaryFaceIndices.push_back(face);
-    } else {
-        _interiorFaceIndices.push_back(face);
-    }
-}
-
-void
-PatchTableBuilder::LegacyGregoryHelper::FinalizeQuadOffsets(
-        PatchTable::QuadOffsetsTable & qTable) {
-
-    size_t numInteriorPatches = _interiorFaceIndices.size();
-    size_t numBoundaryPatches = _boundaryFaceIndices.size();
-    size_t numTotalPatches    = numInteriorPatches + numBoundaryPatches;
-
-    struct QuadOffset {
-        static int Assign(Level const& level, Index faceIndex,
-                          unsigned int offsets[]) {
-            ConstIndexArray fVerts = level.getFaceVertices(faceIndex);
-
-            for (int i = 0; i < 4; ++i) {
-                ConstIndexArray vFaces = level.getVertexFaces(fVerts[i]);
-                int faceInVFaces = vFaces.FindIndex(faceIndex);
-
-                // we have to use number of incident edges to modulo the local
-                // index as there could be 2 consecutive edges in the face
-                // belonging to the patch
-                int vOffset0 = faceInVFaces;
-                int vOffset1 = (faceInVFaces + 1) %
-                                    level.getVertexEdges(fVerts[i]).size();
-                offsets[i] = vOffset0 | (vOffset1 << 8);
-            }
-            return 4;
-        }
-    };
-
-    if (numTotalPatches > 0) {
-        qTable.resize(numTotalPatches*4);
-
-        // all patches assumed to be at the last level
-        Level const &maxLevel = _refiner.getLevel(_refiner.GetMaxLevel());
-
-        PatchTable::QuadOffsetsTable::value_type *p = &(qTable[0]);
-        for (size_t i = 0; i < numInteriorPatches; ++i) {
-            p += QuadOffset::Assign(maxLevel, _interiorFaceIndices[i], p);
-        }
-        for (size_t i = 0; i < numBoundaryPatches; ++i) {
-            p += QuadOffset::Assign(maxLevel, _boundaryFaceIndices[i], p);
-        }
-    }
-}
-
-void
-PatchTableBuilder::LegacyGregoryHelper::FinalizeVertexValence(
-        PatchTable::VertexValenceTable & vTable, int lastLevelOffset) {
-
-    //  Populate the "vertex valence" table for Gregory patches -- this table
-    //  contains the one-ring of vertices around each vertex.  Currently it is
-    //  extremely wasteful for the following reasons:
-    //      - it allocates 2*maxvalence+1 for ALL vertices
-    //      - it initializes the one-ring for ALL vertices
-    //  We use the full size expected (not sure what else relies on that) but
-    //  we avoid initializing the vast majority of vertices that are not
-    //  associated with gregory patches -- only populating those in the last
-    //  level (an older version attempted to avoid vertices not involved with
-    //  Gregory patches)
-    //
-    int vWidth = 2*_refiner.GetMaxValence() + 1;
-
-    vTable.resize((long)_refiner.GetNumVerticesTotal() * vWidth);
-
-    Level const & lastLevel = _refiner.getLevel(_refiner.GetMaxLevel());
-
-    int * vTableEntry = &vTable[lastLevelOffset * vWidth];
-
-    for (int vIndex = 0; vIndex < lastLevel.getNumVertices(); ++vIndex) {
-        //  Gather the one-ring around the vertex and set its resulting size
-        //  (note negative size used to distinguish between boundary/interior):
-        //
-        int *ringDest = vTableEntry + 1;
-        int  ringSize =
-                lastLevel.gatherQuadRegularRingAroundVertex(vIndex, ringDest);
-
-        for (int j = 0; j < ringSize; ++j) {
-            ringDest[j] += lastLevelOffset;
-        }
-        if (ringSize & 1) {
-            // boundary: duplicate end vertex index and store negative valence
-            ringSize++;
-            vTableEntry[ringSize]=vTableEntry[ringSize-1];
-            vTableEntry[0] = -ringSize/2;
-        } else {
-            vTableEntry[0] = ringSize/2;
-        }
-        vTableEntry += vWidth;
-    }
-}
-
-
-//
-//  The sole public PatchTableFactory method to create a PatchTable -- deferring
-//  to the PatchTableBuilder implementation
-//
-PatchTable *
-PatchTableFactory::Create(TopologyRefiner const & refiner,
-                          Options options,
-                          ConstIndexArray selectedFaces) {
-
-    PatchTableBuilder builder(refiner, options, selectedFaces);
-
-    if (builder.UniformPolygonsSpecified()) {
-        builder.BuildUniformPolygons();
-    } else {
-        builder.BuildPatches();
-    }
-    return builder.GetPatchTable();
-}
-
-
-//
-//  Implementation of PatchTableFactory::PatchFaceTag -- unintentionally
-//  exposed to the public interface, no longer internally used and so
-//  planned for deprecation
-//
-void
-PatchTableFactory::PatchFaceTag::clear() {
-    std::memset(this, 0, sizeof(*this));
-}
-
-void
-PatchTableFactory::PatchFaceTag::assignTransitionPropertiesFromEdgeMask(
-        int tMask) {
-
-    _transitionMask = tMask;
-}
-
-void
-PatchTableFactory::PatchFaceTag::assignBoundaryPropertiesFromEdgeMask(
-        int eMask) {
-
-    static int const edgeMaskToCount[16] =
-        { 0, 1, 1, 2, 1, -1, 2, -1, 1, 2, -1, -1, 2, -1, -1, -1 };
-    static int const edgeMaskToIndex[16] =
-        { -1, 0, 1, 1, 2, -1, 2, -1, 3, 0, -1, -1, 3, -1, -1,-1 };
-
-    assert(edgeMaskToCount[eMask] != -1);
-    assert(edgeMaskToIndex[eMask] != -1);
-
-    _boundaryMask    = eMask;
-    _hasBoundaryEdge = (eMask > 0);
-
-    _boundaryCount = edgeMaskToCount[eMask];
-    _boundaryIndex = edgeMaskToIndex[eMask];
-}
-
-void
-PatchTableFactory::PatchFaceTag::assignBoundaryPropertiesFromVertexMask(
-        int vMask) {
-
-    // This is only intended to support the case of a single boundary vertex
-    // with no boundary edges, which can only occur with an irregular vertex
-
-    static int const singleBitVertexMaskToCount[16] =
-        { 0, 1, 1, -1, 1, -1 , -1, -1, 1, -1 , -1, -1, -1, -1 , -1, -1 };
-    static int const singleBitVertexMaskToIndex[16] =
-        { 0, 0, 1, -1, 2, -1 , -1, -1, 3, -1 , -1, -1, -1, -1 , -1, -1 };
-
-    assert(_hasBoundaryEdge == false);
-    assert(singleBitVertexMaskToCount[vMask] != -1);
-    assert(singleBitVertexMaskToIndex[vMask] != -1);
-
-    _boundaryMask = vMask;
-
-    _boundaryCount = singleBitVertexMaskToCount[vMask];
-    _boundaryIndex = singleBitVertexMaskToIndex[vMask];
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTableFactory.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTableFactory.h
deleted file mode 100644
index 955e75e2e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/patchTableFactory.h
+++ /dev/null
@@ -1,235 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_PATCH_TABLE_FACTORY_H
-#define OPENSUBDIV3_FAR_PATCH_TABLE_FACTORY_H
-
-#include "../version.h"
-
-#include "../far/topologyRefiner.h"
-#include "../far/patchTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-/// \brief Factory for constructing a PatchTable from a TopologyRefiner
-///
-class PatchTableFactory {
-public:
-
-    /// \brief Public options for the PatchTable factory
-    ///
-    struct Options {
-
-        /// \brief Choice for approximating irregular patches (end-caps)
-        ///
-        /// This enum specifies how irregular patches (end-caps) are approximated.
-        /// A basis is chosen, rather than a specific patch type, and has a
-        /// corresponding patch type for each subdivision scheme, i.e. a quad and
-        /// triangular patch type exists for each basis.  These choices provide a
-        /// trade-off between surface quality and performance.
-        ///
-        enum EndCapType {
-            ENDCAP_NONE = 0,        ///< unspecified
-            ENDCAP_BILINEAR_BASIS,  ///< use linear patches (simple quads or tris)
-            ENDCAP_BSPLINE_BASIS,   ///< use BSpline-like patches (same patch type as regular)
-            ENDCAP_GREGORY_BASIS,   ///< use Gregory patches (highest quality, recommended default)
-            ENDCAP_LEGACY_GREGORY   ///< legacy option for 2.x style Gregory patches (Catmark only)
-        };
-
-        Options(unsigned int maxIsolation=10) :
-             generateAllLevels(false),
-             includeBaseLevelIndices(true),
-             includeFVarBaseLevelIndices(false),
-             triangulateQuads(false),
-             useSingleCreasePatch(false),
-             useInfSharpPatch(false),
-             maxIsolationLevel(maxIsolation & 0xf),
-             endCapType(ENDCAP_GREGORY_BASIS),
-             shareEndCapPatchPoints(true),
-             generateVaryingTables(true),
-             generateVaryingLocalPoints(true),
-             generateFVarTables(false),
-             patchPrecisionDouble(false),
-             fvarPatchPrecisionDouble(false),
-             generateFVarLegacyLinearPatches(true),
-             generateLegacySharpCornerPatches(true),
-             numFVarChannels(-1),
-             fvarChannelIndices(0)
-        { }
-
-        /// \brief Get endcap basis type
-        EndCapType GetEndCapType() const { return (EndCapType)endCapType; }
-
-        /// \brief Set endcap basis type
-        void SetEndCapType(EndCapType e) { endCapType = e & 0x7; }
-
-        /// \brief Set maximum isolation level
-        void SetMaxIsolationLevel(unsigned int level) { maxIsolationLevel = level & 0xf; }
-
-        /// \brief Set precision of vertex patches
-        template <typename REAL> void SetPatchPrecision();
-
-        /// \brief Set precision of face-varying patches
-        template <typename REAL> void SetFVarPatchPrecision();
-
-        /// \brief Determine adaptive refinement options to match assigned patch options
-        TopologyRefiner::AdaptiveOptions GetRefineAdaptiveOptions() const {
-            TopologyRefiner::AdaptiveOptions adaptiveOptions(maxIsolationLevel);
-
-            adaptiveOptions.useInfSharpPatch     = useInfSharpPatch;
-            adaptiveOptions.useSingleCreasePatch = useSingleCreasePatch;
-            adaptiveOptions.considerFVarChannels = generateFVarTables &&
-                                                  !generateFVarLegacyLinearPatches;
-            return adaptiveOptions;
-        }
-
-        unsigned int generateAllLevels           : 1, ///< Generate levels from 'firstLevel' to 'maxLevel' (Uniform mode only)
-                     includeBaseLevelIndices     : 1, ///< Include base level in patch point indices (Uniform mode only)
-                     includeFVarBaseLevelIndices : 1, ///< Include base level in face-varying patch point indices (Uniform mode only)
-                     triangulateQuads            : 1, ///< Triangulate 'QUADS' primitives (Uniform mode only)
-
-                     useSingleCreasePatch : 1, ///< Use single crease patch
-                     useInfSharpPatch     : 1, ///< Use infinitely-sharp patch
-                     maxIsolationLevel    : 4, ///< Cap adaptive feature isolation to the given level (max. 10)
-
-                     // end-capping
-                     endCapType              : 3, ///< EndCapType
-                     shareEndCapPatchPoints  : 1, ///< Share endcap patch points among adjacent endcap patches.
-                                                  ///< currently only work with GregoryBasis.
-
-                     // varying
-                     generateVaryingTables      : 1, ///< Generate varying patch tables
-                     generateVaryingLocalPoints : 1, ///< Generate local points with varying patches
-
-                     // face-varying
-                     generateFVarTables  : 1, ///< Generate face-varying patch tables
-
-                     // precision
-                     patchPrecisionDouble     : 1, ///< Generate double-precision stencils for vertex patches
-                     fvarPatchPrecisionDouble : 1, ///< Generate double-precision stencils for face-varying patches
-
-                     // legacy behaviors (default to true)
-                     generateFVarLegacyLinearPatches  : 1, ///< Generate all linear face-varying patches (legacy)
-                     generateLegacySharpCornerPatches : 1; ///< Generate sharp regular patches at smooth corners (legacy)
-
-        int          numFVarChannels;          ///< Number of channel indices and interpolation modes passed
-        int const *  fvarChannelIndices;       ///< List containing the indices of the channels selected for the factory
-    };
-
-    /// \brief Instantiates a PatchTable from a client-provided TopologyRefiner.
-    ///
-    ///  A PatchTable can be constructed from a TopologyRefiner that has been
-    ///  either adaptively or uniformly refined.  In both cases, the resulting
-    ///  patches reference vertices in the various refined levels by index,
-    ///  and those indices accumulate with the levels in different ways.
-    ///
-    ///  For adaptively refined patches, patches are defined at different levels,
-    ///  including the base level, so the indices of patch vertices include
-    ///  vertices from all levels.  A sparse set of patches can be created by
-    ///  restricting the patches generated to those descending from a given set
-    ///  of faces at the base level.  This sparse set of base faces is expected
-    ///  to be a subset of the faces that were adaptively refined in the given
-    ///  TopologyRefiner, otherwise results are undefined.
-    ///
-    ///  For uniformly refined patches, all patches are completely defined within
-    ///  the last level.  There is often no use for intermediate levels and they
-    ///  can usually be ignored.  Indices of patch vertices might therefore be
-    ///  expected to be defined solely within the last level.  While this is true
-    ///  for face-varying patches, for historical reasons it is not the case for
-    ///  vertex and varying patches.  Indices for vertex and varying patches include
-    ///  the base level in addition to the last level while indices for face-varying
-    ///  patches include only the last level.
-    ///
-    /// @param refiner        TopologyRefiner from which to generate patches
-    ///
-    /// @param options        Options controlling the creation of the table
-    ///
-    /// @param selectedFaces  Only create patches for the given set of base faces.
-    ///
-    /// @return               A new instance of PatchTable
-    ///
-    static PatchTable * Create(TopologyRefiner const & refiner,
-                               Options options = Options(),
-                               ConstIndexArray selectedFaces = ConstIndexArray());
-
-public:
-    //  PatchFaceTag
-    //
-    //  This simple struct was previously used within the factory to take inventory of
-    //  various kinds of patches to fully allocate buffers prior to populating them.  It
-    //  was not intended to be exposed as part of the public interface.
-    //
-    //  It is no longer used internally and is being kept here to respect preservation
-    //  of the public interface, but it will be deprecated at the earliest opportunity.
-    //
-    /// \brief Obsolete internal struct not intended for public use -- due to
-    /// be deprecated.
-    //
-    struct PatchFaceTag {
-    public:
-        unsigned int   _hasPatch        : 1;
-        unsigned int   _isRegular       : 1;
-        unsigned int   _transitionMask  : 4;
-        unsigned int   _boundaryMask    : 4;
-        unsigned int   _boundaryIndex   : 2;
-        unsigned int   _boundaryCount   : 3;
-        unsigned int   _hasBoundaryEdge : 3;
-        unsigned int   _isSingleCrease  : 1;
-
-        void clear();
-        void assignBoundaryPropertiesFromEdgeMask(int boundaryEdgeMask);
-        void assignBoundaryPropertiesFromVertexMask(int boundaryVertexMask);
-        void assignTransitionPropertiesFromEdgeMask(int boundaryVertexMask);
-    };
-    typedef std::vector<PatchFaceTag> PatchTagVector;
-};
-
-
-template <> inline void PatchTableFactory::Options::SetPatchPrecision<float>() {
-    patchPrecisionDouble = false;
-}
-template <> inline void PatchTableFactory::Options::SetFVarPatchPrecision<float>() {
-    fvarPatchPrecisionDouble = false;
-}
-
-template <> inline void PatchTableFactory::Options::SetPatchPrecision<double>() {
-    patchPrecisionDouble = true;
-}
-template <> inline void PatchTableFactory::Options::SetFVarPatchPrecision<double>() {
-    fvarPatchPrecisionDouble = true;
-}
-
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-
-#endif /* OPENSUBDIV3_FAR_PATCH_TABLE_FACTORY_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/primvarRefiner.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/primvarRefiner.h
deleted file mode 100644
index 42abc5284..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/primvarRefiner.h
+++ /dev/null
@@ -1,1277 +0,0 @@
-//
-//   Copyright 2015 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_FAR_PRIMVAR_REFINER_H
-#define OPENSUBDIV3_FAR_PRIMVAR_REFINER_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-#include "../sdc/options.h"
-#include "../sdc/bilinearScheme.h"
-#include "../sdc/catmarkScheme.h"
-#include "../sdc/loopScheme.h"
-#include "../vtr/level.h"
-#include "../vtr/fvarLevel.h"
-#include "../vtr/refinement.h"
-#include "../vtr/fvarRefinement.h"
-#include "../vtr/stackBuffer.h"
-#include "../vtr/componentInterfaces.h"
-#include "../far/types.h"
-#include "../far/error.h"
-#include "../far/topologyLevel.h"
-#include "../far/topologyRefiner.h"
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-///
-///  \brief Applies refinement operations to generic primvar data.
-///
-template <typename REAL>
-class PrimvarRefinerReal {
-
-public:
-    PrimvarRefinerReal(TopologyRefiner const & refiner) : _refiner(refiner) { }
-    ~PrimvarRefinerReal() { }
-
-    TopologyRefiner const & GetTopologyRefiner() const { return _refiner; }
-
-    //@{
-    ///  @name Primvar data interpolation
-    ///
-    /// \anchor templating
-    ///
-    /// \note Interpolation methods template both the source and destination
-    ///       data buffer classes. Client-code is expected to provide interfaces
-    ///       that implement the functions specific to its primitive variable
-    ///       data layout. Template APIs must implement the following:
-    ///       <br><br> \code{.cpp}
-    ///
-    ///       class MySource {
-    ///           MySource & operator[](int index);
-    ///       };
-    ///
-    ///       class MyDestination {
-    ///           void Clear();
-    ///           void AddWithWeight(MySource const & value, float weight);
-    ///           void AddWithWeight(MyDestination const & value, float weight);
-    ///       };
-    ///
-    ///       \endcode
-    ///       <br>
-    ///       It is possible to implement a single interface only and use it as
-    ///       both source and destination.
-    ///       <br><br>
-    ///       Primitive variable buffers are expected to be arrays of instances,
-    ///       passed either as direct pointers or with a container
-    ///       (ex. std::vector<MyVertex>).
-    ///       Some interpolation methods however allow passing the buffers by
-    ///       reference: this allows to work transparently with arrays and
-    ///       containers (or other schemes that overload the '[]' operator)
-    ///       <br><br>
-    ///       See the <a href=http://graphics.pixar.com/opensubdiv/docs/tutorials.html>
-    ///       Far tutorials</a> for code examples.
-    ///
-
-    /// \brief Apply vertex interpolation weights to a primvar buffer for a single
-    ///        level of refinement.
-    ///
-    /// The destination buffer must allocate an array of data for all the
-    /// refined vertices, i.e. at least refiner.GetLevel(level).GetNumVertices()
-    ///
-    /// @param level  The refinement level
-    ///
-    /// @param src    Source primvar buffer (\ref templating control vertex data)
-    ///
-    /// @param dst    Destination primvar buffer (\ref templating refined vertex data)
-    ///
-    template <class T, class U> void Interpolate(int level, T const & src, U & dst) const;
-
-    /// \brief Apply only varying interpolation weights to a primvar buffer
-    ///        for a single level of refinement.
-    ///
-    /// This method can useful if the varying primvar data does not need to be
-    /// re-computed over time.
-    ///
-    /// The destination buffer must allocate an array of data for all the
-    /// refined vertices, i.e. at least refiner.GetLevel(level).GetNumVertices()
-    ///
-    /// @param level  The refinement level
-    ///
-    /// @param src    Source primvar buffer (\ref templating control vertex data)
-    ///
-    /// @param dst    Destination primvar buffer (\ref templating refined vertex data)
-    ///
-    template <class T, class U> void InterpolateVarying(int level, T const & src, U & dst) const;
-
-    /// \brief Refine uniform (per-face) primvar data between levels.
-    ///
-    /// Data is simply copied from a parent face to its child faces and does not involve
-    /// any weighting.  Setting the source primvar data for the base level to be the index
-    /// of each face allows the propagation of the base face to primvar data for child
-    /// faces in all levels.
-    ///
-    /// The destination buffer must allocate an array of data for all the refined faces,
-    /// i.e. at least refiner.GetLevel(level).GetNumFaces()
-    ///
-    /// @param level  The refinement level
-    ///
-    /// @param src    Source primvar buffer
-    ///
-    /// @param dst    Destination primvar buffer
-    ///
-    template <class T, class U> void InterpolateFaceUniform(int level, T const & src, U & dst) const;
-
-    /// \brief Apply face-varying interpolation weights to a primvar buffer
-    ///        associated with a particular face-varying channel.
-    ///
-    /// Unlike vertex and varying primvar buffers, there is not a 1-to-1 correspondence
-    /// between vertices and face-varying values -- typically there are more face-varying
-    /// values than vertices.  Each face-varying channel is also independent in how its
-    /// values relate to the vertices.
-    ///
-    /// The destination buffer must allocate an array of data for all the refined values,
-    /// i.e. at least refiner.GetLevel(level).GetNumFVarValues(channel).
-    ///
-    template <class T, class U> void InterpolateFaceVarying(int level, T const & src, U & dst, int channel = 0) const;
-
-
-    /// \brief Apply limit weights to a primvar buffer
-    ///
-    /// The source buffer must refer to an array of previously interpolated
-    /// vertex data for the last refinement level.  The destination buffer
-    /// must allocate an array for all vertices at the last refinement level,
-    /// i.e. at least refiner.GetLevel(refiner.GetMaxLevel()).GetNumVertices()
-    ///
-    /// @param src     Source primvar buffer (refined data) for last level
-    ///
-    /// @param dstPos  Destination primvar buffer (data at the limit)
-    ///
-    template <class T, class U> void Limit(T const & src, U & dstPos) const;
-
-    template <class T, class U, class U1, class U2>
-    void Limit(T const & src, U & dstPos, U1 & dstTan1, U2 & dstTan2) const;
-
-    template <class T, class U> void LimitFaceVarying(T const & src, U & dst, int channel = 0) const;
-
-    //@}
-
-private:
-    typedef REAL Weight;
-
-    //  Non-copyable:
-    PrimvarRefinerReal(PrimvarRefinerReal const & src) : _refiner(src._refiner) { }
-    PrimvarRefinerReal & operator=(PrimvarRefinerReal const &) { return *this; }
-
-    template <Sdc::SchemeType SCHEME, class T, class U> void interpFromFaces(int, T const &, U &) const;
-    template <Sdc::SchemeType SCHEME, class T, class U> void interpFromEdges(int, T const &, U &) const;
-    template <Sdc::SchemeType SCHEME, class T, class U> void interpFromVerts(int, T const &, U &) const;
-
-    template <Sdc::SchemeType SCHEME, class T, class U> void interpFVarFromFaces(int, T const &, U &, int) const;
-    template <Sdc::SchemeType SCHEME, class T, class U> void interpFVarFromEdges(int, T const &, U &, int) const;
-    template <Sdc::SchemeType SCHEME, class T, class U> void interpFVarFromVerts(int, T const &, U &, int) const;
-
-    template <Sdc::SchemeType SCHEME, class T, class U, class U1, class U2>
-    void limit(T const & src, U & pos, U1 * tan1, U2 * tan2) const;
-
-    template <Sdc::SchemeType SCHEME, class T, class U>
-    void limitFVar(T const & src, U & dst, int channel) const;
-
-private:
-    TopologyRefiner const &  _refiner;
-
-private:
-    //
-    //  Local class to fulfill interface for <typename MASK> in the Scheme mask queries:
-    //
-    class Mask {
-    public:
-        typedef REAL Weight;  //  Also part of the expected interface
-
-    public:
-        Mask(Weight* v, Weight* e, Weight* f) : 
-            _vertWeights(v), _edgeWeights(e), _faceWeights(f),
-            _vertCount(0), _edgeCount(0), _faceCount(0), 
-            _faceWeightsForFaceCenters(false)
-        { }
-
-        ~Mask() { }
-
-    public:  //  Generic interface expected of <typename MASK>:
-        int GetNumVertexWeights() const { return _vertCount; }
-        int GetNumEdgeWeights()   const { return _edgeCount; }
-        int GetNumFaceWeights()   const { return _faceCount; }
-
-        void SetNumVertexWeights(int count) { _vertCount = count; }
-        void SetNumEdgeWeights(  int count) { _edgeCount = count; }
-        void SetNumFaceWeights(  int count) { _faceCount = count; }
-
-        Weight const& VertexWeight(int index) const { return _vertWeights[index]; }
-        Weight const& EdgeWeight(  int index) const { return _edgeWeights[index]; }
-        Weight const& FaceWeight(  int index) const { return _faceWeights[index]; }
-
-        Weight& VertexWeight(int index) { return _vertWeights[index]; }
-        Weight& EdgeWeight(  int index) { return _edgeWeights[index]; }
-        Weight& FaceWeight(  int index) { return _faceWeights[index]; }
-
-        bool AreFaceWeightsForFaceCenters() const  { return _faceWeightsForFaceCenters; }
-        void SetFaceWeightsForFaceCenters(bool on) { _faceWeightsForFaceCenters = on; }
-
-    private:
-        Weight* _vertWeights;
-        Weight* _edgeWeights;
-        Weight* _faceWeights;
-
-        int _vertCount;
-        int _edgeCount;
-        int _faceCount;
-
-        bool _faceWeightsForFaceCenters;
-    };
-};
-
-
-//
-//  Public entry points to the methods.  Queries of the scheme type and its
-//  use as a template parameter in subsequent implementation will be factored
-//  out of a later release:
-//
-template <typename REAL>
-template <class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::Interpolate(int level, T const & src, U & dst) const {
-
-    assert(level>0 && level<=(int)_refiner._refinements.size());
-
-    switch (_refiner._subdivType) {
-    case Sdc::SCHEME_CATMARK:
-        interpFromFaces<Sdc::SCHEME_CATMARK>(level, src, dst);
-        interpFromEdges<Sdc::SCHEME_CATMARK>(level, src, dst);
-        interpFromVerts<Sdc::SCHEME_CATMARK>(level, src, dst);
-        break;
-    case Sdc::SCHEME_LOOP:
-        interpFromFaces<Sdc::SCHEME_LOOP>(level, src, dst);
-        interpFromEdges<Sdc::SCHEME_LOOP>(level, src, dst);
-        interpFromVerts<Sdc::SCHEME_LOOP>(level, src, dst);
-        break;
-    case Sdc::SCHEME_BILINEAR:
-        interpFromFaces<Sdc::SCHEME_BILINEAR>(level, src, dst);
-        interpFromEdges<Sdc::SCHEME_BILINEAR>(level, src, dst);
-        interpFromVerts<Sdc::SCHEME_BILINEAR>(level, src, dst);
-        break;
-    }
-}
-
-template <typename REAL>
-template <class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::InterpolateFaceVarying(int level, T const & src, U & dst, int channel) const {
-
-    assert(level>0 && level<=(int)_refiner._refinements.size());
-
-    switch (_refiner._subdivType) {
-    case Sdc::SCHEME_CATMARK:
-        interpFVarFromFaces<Sdc::SCHEME_CATMARK>(level, src, dst, channel);
-        interpFVarFromEdges<Sdc::SCHEME_CATMARK>(level, src, dst, channel);
-        interpFVarFromVerts<Sdc::SCHEME_CATMARK>(level, src, dst, channel);
-        break;
-    case Sdc::SCHEME_LOOP:
-        interpFVarFromFaces<Sdc::SCHEME_LOOP>(level, src, dst, channel);
-        interpFVarFromEdges<Sdc::SCHEME_LOOP>(level, src, dst, channel);
-        interpFVarFromVerts<Sdc::SCHEME_LOOP>(level, src, dst, channel);
-        break;
-    case Sdc::SCHEME_BILINEAR:
-        interpFVarFromFaces<Sdc::SCHEME_BILINEAR>(level, src, dst, channel);
-        interpFVarFromEdges<Sdc::SCHEME_BILINEAR>(level, src, dst, channel);
-        interpFVarFromVerts<Sdc::SCHEME_BILINEAR>(level, src, dst, channel);
-        break;
-    }
-}
-
-template <typename REAL>
-template <class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::Limit(T const & src, U & dst) const {
-
-    if (_refiner.getLevel(_refiner.GetMaxLevel()).getNumVertexEdgesTotal() == 0) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in PrimvarRefiner::Limit() -- "
-            "last level of refinement does not include full topology.");
-        return;
-    }
-
-    switch (_refiner._subdivType) {
-    case Sdc::SCHEME_CATMARK:
-        limit<Sdc::SCHEME_CATMARK>(src, dst, (U*)0, (U*)0);
-        break;
-    case Sdc::SCHEME_LOOP:
-        limit<Sdc::SCHEME_LOOP>(src, dst, (U*)0, (U*)0);
-        break;
-    case Sdc::SCHEME_BILINEAR:
-        limit<Sdc::SCHEME_BILINEAR>(src, dst, (U*)0, (U*)0);
-        break;
-    }
-}
-
-template <typename REAL>
-template <class T, class U, class U1, class U2>
-inline void
-PrimvarRefinerReal<REAL>::Limit(T const & src, U & dstPos, U1 & dstTan1, U2 & dstTan2) const {
-
-    if (_refiner.getLevel(_refiner.GetMaxLevel()).getNumVertexEdgesTotal() == 0) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in PrimvarRefiner::Limit() -- "
-            "last level of refinement does not include full topology.");
-        return;
-    }
-
-    switch (_refiner._subdivType) {
-    case Sdc::SCHEME_CATMARK:
-        limit<Sdc::SCHEME_CATMARK>(src, dstPos, &dstTan1, &dstTan2);
-        break;
-    case Sdc::SCHEME_LOOP:
-        limit<Sdc::SCHEME_LOOP>(src, dstPos, &dstTan1, &dstTan2);
-        break;
-    case Sdc::SCHEME_BILINEAR:
-        limit<Sdc::SCHEME_BILINEAR>(src, dstPos, &dstTan1, &dstTan2);
-        break;
-    }
-}
-
-template <typename REAL>
-template <class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::LimitFaceVarying(T const & src, U & dst, int channel) const {
-
-    if (_refiner.getLevel(_refiner.GetMaxLevel()).getNumVertexEdgesTotal() == 0) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in PrimvarRefiner::LimitFaceVarying() -- "
-            "last level of refinement does not include full topology.");
-        return;
-    }
-
-    switch (_refiner._subdivType) {
-    case Sdc::SCHEME_CATMARK:
-        limitFVar<Sdc::SCHEME_CATMARK>(src, dst, channel);
-        break;
-    case Sdc::SCHEME_LOOP:
-        limitFVar<Sdc::SCHEME_LOOP>(src, dst, channel);
-        break;
-    case Sdc::SCHEME_BILINEAR:
-        limitFVar<Sdc::SCHEME_BILINEAR>(src, dst, channel);
-        break;
-    }
-}
-
-template <typename REAL>
-template <class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::InterpolateFaceUniform(int level, T const & src, U & dst) const {
-
-    assert(level>0 && level<=(int)_refiner._refinements.size());
-
-    Vtr::internal::Refinement const & refinement = _refiner.getRefinement(level-1);
-    Vtr::internal::Level const & child = refinement.child();
-
-    for (int cFace = 0; cFace < child.getNumFaces(); ++cFace) {
-
-        Vtr::Index pFace = refinement.getChildFaceParentFace(cFace);
-
-        dst[cFace] = src[pFace];
-    }
-}
-
-template <typename REAL>
-template <class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::InterpolateVarying(int level, T const & src, U & dst) const {
-
-    assert(level>0 && level<=(int)_refiner._refinements.size());
-
-    Vtr::internal::Refinement const & refinement = _refiner.getRefinement(level-1);
-    Vtr::internal::Level const &      parent     = refinement.parent();
-
-    //
-    //  Group values to interpolate based on origin -- note that there may
-    //  be none originating from faces:
-    //
-    if (refinement.getNumChildVerticesFromFaces() > 0) {
-
-        for (int face = 0; face < parent.getNumFaces(); ++face) {
-
-            Vtr::Index cVert = refinement.getFaceChildVertex(face);
-            if (Vtr::IndexIsValid(cVert)) {
-
-                //  Apply the weights to the parent face's vertices:
-                ConstIndexArray fVerts = parent.getFaceVertices(face);
-
-                Weight fVaryingWeight = 1.0f / (Weight) fVerts.size();
-
-                dst[cVert].Clear();
-                for (int i = 0; i < fVerts.size(); ++i) {
-                    dst[cVert].AddWithWeight(src[fVerts[i]], fVaryingWeight);
-                }
-            }
-        }
-    }
-    for (int edge = 0; edge < parent.getNumEdges(); ++edge) {
-
-        Vtr::Index cVert = refinement.getEdgeChildVertex(edge);
-        if (Vtr::IndexIsValid(cVert)) {
-
-            //  Apply the weights to the parent edges's vertices
-            ConstIndexArray eVerts = parent.getEdgeVertices(edge);
-
-            dst[cVert].Clear();
-            dst[cVert].AddWithWeight(src[eVerts[0]], 0.5f);
-            dst[cVert].AddWithWeight(src[eVerts[1]], 0.5f);
-        }
-    }
-    for (int vert = 0; vert < parent.getNumVertices(); ++vert) {
-
-        Vtr::Index cVert = refinement.getVertexChildVertex(vert);
-        if (Vtr::IndexIsValid(cVert)) {
-
-            //  Essentially copy the parent vertex:
-            dst[cVert].Clear();
-            dst[cVert].AddWithWeight(src[vert], 1.0f);
-        }
-    }
-}
-
-
-//
-//  Internal implementation methods -- grouping vertices to be interpolated
-//  based on the type of parent component from which they originated:
-//
-template <typename REAL>
-template <Sdc::SchemeType SCHEME, class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::interpFromFaces(int level, T const & src, U & dst) const {
-
-    Vtr::internal::Refinement const & refinement = _refiner.getRefinement(level-1);
-    Vtr::internal::Level const &      parent     = refinement.parent();
-
-    if (refinement.getNumChildVerticesFromFaces() == 0) return;
-
-    Sdc::Scheme<SCHEME> scheme(_refiner._subdivOptions);
-
-    Vtr::internal::StackBuffer<Weight,16> fVertWeights(parent.getMaxValence());
-
-    for (int face = 0; face < parent.getNumFaces(); ++face) {
-
-        Vtr::Index cVert = refinement.getFaceChildVertex(face);
-        if (!Vtr::IndexIsValid(cVert))
-            continue;
-
-        //  Declare and compute mask weights for this vertex relative to its parent face:
-        ConstIndexArray fVerts = parent.getFaceVertices(face);
-
-        Mask fMask(fVertWeights, 0, 0);
-        Vtr::internal::FaceInterface fHood(fVerts.size());
-
-        scheme.ComputeFaceVertexMask(fHood, fMask);
-
-        //  Apply the weights to the parent face's vertices:
-        dst[cVert].Clear();
-
-        for (int i = 0; i < fVerts.size(); ++i) {
-
-            dst[cVert].AddWithWeight(src[fVerts[i]], fVertWeights[i]);
-        }
-    }
-}
-
-template <typename REAL>
-template <Sdc::SchemeType SCHEME, class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::interpFromEdges(int level, T const & src, U & dst) const {
-
-    Vtr::internal::Refinement const & refinement = _refiner.getRefinement(level-1);
-    Vtr::internal::Level const &      parent     = refinement.parent();
-    Vtr::internal::Level const &      child      = refinement.child();
-
-    Sdc::Scheme<SCHEME> scheme(_refiner._subdivOptions);
-
-    Vtr::internal::EdgeInterface eHood(parent);
-
-    Weight                               eVertWeights[2];
-    Vtr::internal::StackBuffer<Weight,8> eFaceWeights(parent.getMaxEdgeFaces());
-
-    for (int edge = 0; edge < parent.getNumEdges(); ++edge) {
-
-        Vtr::Index cVert = refinement.getEdgeChildVertex(edge);
-        if (!Vtr::IndexIsValid(cVert))
-            continue;
-
-        //  Declare and compute mask weights for this vertex relative to its parent edge:
-        ConstIndexArray eVerts = parent.getEdgeVertices(edge),
-                        eFaces = parent.getEdgeFaces(edge);
-
-        Mask eMask(eVertWeights, 0, eFaceWeights);
-
-        eHood.SetIndex(edge);
-
-        Sdc::Crease::Rule pRule = (parent.getEdgeSharpness(edge) > 0.0f) ? Sdc::Crease::RULE_CREASE : Sdc::Crease::RULE_SMOOTH;
-        Sdc::Crease::Rule cRule = child.getVertexRule(cVert);
-
-        scheme.ComputeEdgeVertexMask(eHood, eMask, pRule, cRule);
-
-        //  Apply the weights to the parent edges's vertices and (if applicable) to
-        //  the child vertices of its incident faces:
-        dst[cVert].Clear();
-        dst[cVert].AddWithWeight(src[eVerts[0]], eVertWeights[0]);
-        dst[cVert].AddWithWeight(src[eVerts[1]], eVertWeights[1]);
-
-        if (eMask.GetNumFaceWeights() > 0) {
-
-            for (int i = 0; i < eFaces.size(); ++i) {
-
-                if (eMask.AreFaceWeightsForFaceCenters()) {
-                    assert(refinement.getNumChildVerticesFromFaces() > 0);
-                    Vtr::Index cVertOfFace = refinement.getFaceChildVertex(eFaces[i]);
-
-                    assert(Vtr::IndexIsValid(cVertOfFace));
-                    dst[cVert].AddWithWeight(dst[cVertOfFace], eFaceWeights[i]);
-                } else {
-                    Vtr::Index            pFace      = eFaces[i];
-                    ConstIndexArray pFaceEdges = parent.getFaceEdges(pFace),
-                                    pFaceVerts = parent.getFaceVertices(pFace);
-
-                    int eInFace = 0;
-                    for ( ; pFaceEdges[eInFace] != edge; ++eInFace ) ;
-
-                    int vInFace = eInFace + 2;
-                    if (vInFace >= pFaceVerts.size()) vInFace -= pFaceVerts.size();
-
-                    Vtr::Index pVertNext = pFaceVerts[vInFace];
-                    dst[cVert].AddWithWeight(src[pVertNext], eFaceWeights[i]);
-                }
-            }
-        }
-    }
-}
-
-template <typename REAL>
-template <Sdc::SchemeType SCHEME, class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::interpFromVerts(int level, T const & src, U & dst) const {
-
-    Vtr::internal::Refinement const & refinement = _refiner.getRefinement(level-1);
-    Vtr::internal::Level const &      parent     = refinement.parent();
-    Vtr::internal::Level const &      child      = refinement.child();
-
-    Sdc::Scheme<SCHEME> scheme(_refiner._subdivOptions);
-
-    Vtr::internal::VertexInterface vHood(parent, child);
-
-    Vtr::internal::StackBuffer<Weight,32> weightBuffer(2*parent.getMaxValence());
-
-    for (int vert = 0; vert < parent.getNumVertices(); ++vert) {
-
-        Vtr::Index cVert = refinement.getVertexChildVertex(vert);
-        if (!Vtr::IndexIsValid(cVert))
-            continue;
-
-        //  Declare and compute mask weights for this vertex relative to its parent edge:
-        ConstIndexArray vEdges = parent.getVertexEdges(vert),
-                        vFaces = parent.getVertexFaces(vert);
-
-        Weight   vVertWeight,
-               * vEdgeWeights = weightBuffer,
-               * vFaceWeights = vEdgeWeights + vEdges.size();
-
-        Mask vMask(&vVertWeight, vEdgeWeights, vFaceWeights);
-
-        vHood.SetIndex(vert, cVert);
-
-        Sdc::Crease::Rule pRule = parent.getVertexRule(vert);
-        Sdc::Crease::Rule cRule = child.getVertexRule(cVert);
-
-        scheme.ComputeVertexVertexMask(vHood, vMask, pRule, cRule);
-
-        //  Apply the weights to the parent vertex, the vertices opposite its incident
-        //  edges, and the child vertices of its incident faces:
-        //
-        //  In order to improve numerical precision, it's better to apply smaller weights
-        //  first, so begin with the face-weights followed by the edge-weights and the
-        //  vertex weight last.
-        dst[cVert].Clear();
-
-        if (vMask.GetNumFaceWeights() > 0) {
-            assert(vMask.AreFaceWeightsForFaceCenters());
-
-            for (int i = 0; i < vFaces.size(); ++i) {
-
-                Vtr::Index cVertOfFace = refinement.getFaceChildVertex(vFaces[i]);
-                assert(Vtr::IndexIsValid(cVertOfFace));
-                dst[cVert].AddWithWeight(dst[cVertOfFace], vFaceWeights[i]);
-            }
-        }
-        if (vMask.GetNumEdgeWeights() > 0) {
-
-            for (int i = 0; i < vEdges.size(); ++i) {
-
-                ConstIndexArray eVerts = parent.getEdgeVertices(vEdges[i]);
-                Vtr::Index pVertOppositeEdge = (eVerts[0] == vert) ? eVerts[1] : eVerts[0];
-
-                dst[cVert].AddWithWeight(src[pVertOppositeEdge], vEdgeWeights[i]);
-            }
-        }
-        dst[cVert].AddWithWeight(src[vert], vVertWeight);
-    }
-}
-
-
-//
-// Internal face-varying implementation details:
-//
-template <typename REAL>
-template <Sdc::SchemeType SCHEME, class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::interpFVarFromFaces(int level, T const & src, U & dst, int channel) const {
-
-    Vtr::internal::Refinement const & refinement = _refiner.getRefinement(level-1);
-
-    if (refinement.getNumChildVerticesFromFaces() == 0) return;
-
-    Sdc::Scheme<SCHEME> scheme(_refiner._subdivOptions);
-
-    Vtr::internal::Level const & parentLevel = refinement.parent();
-    Vtr::internal::Level const & childLevel  = refinement.child();
-
-    Vtr::internal::FVarLevel const & parentFVar = parentLevel.getFVarLevel(channel);
-    Vtr::internal::FVarLevel const & childFVar  = childLevel.getFVarLevel(channel);
-
-    Vtr::internal::StackBuffer<Weight,16> fValueWeights(parentLevel.getMaxValence());
-
-    for (int face = 0; face < parentLevel.getNumFaces(); ++face) {
-
-        Vtr::Index cVert = refinement.getFaceChildVertex(face);
-        if (!Vtr::IndexIsValid(cVert))
-            continue;
-
-        Vtr::Index cVertValue = childFVar.getVertexValueOffset(cVert);
-
-        //  The only difference for face-varying here is that we get the values associated
-        //  with each face-vertex directly from the FVarLevel, rather than using the parent
-        //  face-vertices directly.  If any face-vertex has any sibling values, then we may
-        //  get the wrong one using the face-vertex index directly.
-
-        //  Declare and compute mask weights for this vertex relative to its parent face:
-        ConstIndexArray fValues = parentFVar.getFaceValues(face);
-
-        Mask fMask(fValueWeights, 0, 0);
-        Vtr::internal::FaceInterface fHood(fValues.size());
-
-        scheme.ComputeFaceVertexMask(fHood, fMask);
-
-        //  Apply the weights to the parent face's vertices:
-        dst[cVertValue].Clear();
-
-        for (int i = 0; i < fValues.size(); ++i) {
-            dst[cVertValue].AddWithWeight(src[fValues[i]], fValueWeights[i]);
-        }
-    }
-}
-
-template <typename REAL>
-template <Sdc::SchemeType SCHEME, class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::interpFVarFromEdges(int level, T const & src, U & dst, int channel) const {
-
-    Vtr::internal::Refinement const & refinement = _refiner.getRefinement(level-1);
-
-    Sdc::Scheme<SCHEME> scheme(_refiner._subdivOptions);
-
-    Vtr::internal::Level const & parentLevel = refinement.parent();
-    Vtr::internal::Level const & childLevel  = refinement.child();
-
-    Vtr::internal::FVarRefinement const & refineFVar = refinement.getFVarRefinement(channel);
-    Vtr::internal::FVarLevel const &      parentFVar = parentLevel.getFVarLevel(channel);
-    Vtr::internal::FVarLevel const &      childFVar  = childLevel.getFVarLevel(channel);
-
-    //
-    //  Allocate and initialize (if linearly interpolated) interpolation weights for
-    //  the edge mask:
-    //
-    Weight                               eVertWeights[2];
-    Vtr::internal::StackBuffer<Weight,8> eFaceWeights(parentLevel.getMaxEdgeFaces());
-
-    Mask eMask(eVertWeights, 0, eFaceWeights);
-
-    bool isLinearFVar = parentFVar.isLinear() || (_refiner._subdivType == Sdc::SCHEME_BILINEAR);
-    if (isLinearFVar) {
-        eMask.SetNumVertexWeights(2);
-        eMask.SetNumEdgeWeights(0);
-        eMask.SetNumFaceWeights(0);
-
-        eVertWeights[0] = 0.5f;
-        eVertWeights[1] = 0.5f;
-    }
-
-    Vtr::internal::EdgeInterface eHood(parentLevel);
-
-    for (int edge = 0; edge < parentLevel.getNumEdges(); ++edge) {
-
-        Vtr::Index cVert = refinement.getEdgeChildVertex(edge);
-        if (!Vtr::IndexIsValid(cVert))
-            continue;
-
-        ConstIndexArray cVertValues = childFVar.getVertexValues(cVert);
-
-        bool fvarEdgeVertMatchesVertex = childFVar.valueTopologyMatches(cVertValues[0]);
-        if (fvarEdgeVertMatchesVertex) {
-            //
-            //  If smoothly interpolated, compute new weights for the edge mask:
-            //
-            if (!isLinearFVar) {
-                eHood.SetIndex(edge);
-
-                Sdc::Crease::Rule pRule = (parentLevel.getEdgeSharpness(edge) > 0.0f)
-                                        ? Sdc::Crease::RULE_CREASE : Sdc::Crease::RULE_SMOOTH;
-                Sdc::Crease::Rule cRule = childLevel.getVertexRule(cVert);
-
-                scheme.ComputeEdgeVertexMask(eHood, eMask, pRule, cRule);
-            }
-
-            //  Apply the weights to the parent edge's vertices and (if applicable) to
-            //  the child vertices of its incident faces:
-            //
-            //  Even though the face-varying topology matches the vertex topology, we need
-            //  to be careful here when getting values corresponding to the two end-vertices.
-            //  While the edge may be continuous, the vertices at their ends may have
-            //  discontinuities elsewhere in their neighborhood (i.e. on the "other side"
-            //  of the end-vertex) and so have sibling values associated with them.  In most
-            //  cases the topology for an end-vertex will match and we can use it directly,
-            //  but we must still check and retrieve as needed.
-            //
-            //  Indices for values corresponding to face-vertices are guaranteed to match,
-            //  so we can use the child-vertex indices directly.
-            //
-            //  And by "directly", we always use getVertexValue(vertexIndex) to reference
-            //  values in the "src" to account for the possible indirection that may exist at
-            //  level 0 -- where there may be fewer values than vertices and an additional
-            //  indirection is necessary.  We can use a vertex index directly for "dst" when
-            //  it matches.
-            //
-            Vtr::Index eVertValues[2];
-
-            parentFVar.getEdgeFaceValues(edge, 0, eVertValues);
-
-            Index cVertValue = cVertValues[0];
-
-            dst[cVertValue].Clear();
-            dst[cVertValue].AddWithWeight(src[eVertValues[0]], eVertWeights[0]);
-            dst[cVertValue].AddWithWeight(src[eVertValues[1]], eVertWeights[1]);
-
-            if (eMask.GetNumFaceWeights() > 0) {
-
-                ConstIndexArray  eFaces = parentLevel.getEdgeFaces(edge);
-
-                for (int i = 0; i < eFaces.size(); ++i) {
-                    if (eMask.AreFaceWeightsForFaceCenters()) {
-
-                        Vtr::Index cVertOfFace = refinement.getFaceChildVertex(eFaces[i]);
-                        assert(Vtr::IndexIsValid(cVertOfFace));
-
-                        Vtr::Index cValueOfFace = childFVar.getVertexValueOffset(cVertOfFace);
-                        dst[cVertValue].AddWithWeight(dst[cValueOfFace], eFaceWeights[i]);
-                    } else {
-                        Vtr::Index            pFace      = eFaces[i];
-                        ConstIndexArray pFaceEdges = parentLevel.getFaceEdges(pFace),
-                                        pFaceVerts = parentLevel.getFaceVertices(pFace);
-
-                        int eInFace = 0;
-                        for ( ; pFaceEdges[eInFace] != edge; ++eInFace ) ;
-
-                        //  Edge "i" spans vertices [i,i+1] so we want i+2...
-                        int vInFace = eInFace + 2;
-                        if (vInFace >= pFaceVerts.size()) vInFace -= pFaceVerts.size();
-
-                        Vtr::Index pValueNext = parentFVar.getFaceValues(pFace)[vInFace];
-                        dst[cVertValue].AddWithWeight(src[pValueNext], eFaceWeights[i]);
-                    }
-                }
-            }
-        } else {
-            //
-            //  Mismatched edge-verts should just be linearly interpolated between the pairs of
-            //  values for each sibling of the child edge-vertex -- the question is:  which face
-            //  holds that pair of values for a given sibling?
-            //
-            //  In the manifold case, the sibling and edge-face indices will correspond.  We
-            //  will eventually need to update this to account for > 3 incident faces.
-            //
-            for (int i = 0; i < cVertValues.size(); ++i) {
-                Vtr::Index eVertValues[2];
-                int      eFaceIndex = refineFVar.getChildValueParentSource(cVert, i);
-                assert(eFaceIndex == i);
-
-                parentFVar.getEdgeFaceValues(edge, eFaceIndex, eVertValues);
-
-                Index cVertValue = cVertValues[i];
-
-                dst[cVertValue].Clear();
-                dst[cVertValue].AddWithWeight(src[eVertValues[0]], 0.5);
-                dst[cVertValue].AddWithWeight(src[eVertValues[1]], 0.5);
-            }
-        }
-    }
-}
-
-template <typename REAL>
-template <Sdc::SchemeType SCHEME, class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::interpFVarFromVerts(int level, T const & src, U & dst, int channel) const {
-
-    Vtr::internal::Refinement const & refinement = _refiner.getRefinement(level-1);
-
-    Sdc::Scheme<SCHEME> scheme(_refiner._subdivOptions);
-
-    Vtr::internal::Level const & parentLevel = refinement.parent();
-    Vtr::internal::Level const & childLevel  = refinement.child();
-
-    Vtr::internal::FVarRefinement const & refineFVar = refinement.getFVarRefinement(channel);
-    Vtr::internal::FVarLevel const &      parentFVar = parentLevel.getFVarLevel(channel);
-    Vtr::internal::FVarLevel const &      childFVar  = childLevel.getFVarLevel(channel);
-
-    bool isLinearFVar = parentFVar.isLinear() || (_refiner._subdivType == Sdc::SCHEME_BILINEAR);
-
-    Vtr::internal::StackBuffer<Weight,32> weightBuffer(2*parentLevel.getMaxValence());
-
-    Vtr::internal::StackBuffer<Vtr::Index,16> vEdgeValues(parentLevel.getMaxValence());
-
-    Vtr::internal::VertexInterface vHood(parentLevel, childLevel);
-
-    for (int vert = 0; vert < parentLevel.getNumVertices(); ++vert) {
-
-        Vtr::Index cVert = refinement.getVertexChildVertex(vert);
-        if (!Vtr::IndexIsValid(cVert))
-            continue;
-
-        ConstIndexArray pVertValues = parentFVar.getVertexValues(vert),
-                        cVertValues = childFVar.getVertexValues(cVert);
-
-        bool fvarVertVertMatchesVertex = childFVar.valueTopologyMatches(cVertValues[0]);
-        if (isLinearFVar && fvarVertVertMatchesVertex) {
-            dst[cVertValues[0]].Clear();
-            dst[cVertValues[0]].AddWithWeight(src[pVertValues[0]], 1.0f);
-            continue;
-        }
-
-        if (fvarVertVertMatchesVertex) {
-            //
-            //  Declare and compute mask weights for this vertex relative to its parent edge:
-            //
-            //  (We really need to encapsulate this somewhere else for use here and in the
-            //  general case)
-            //
-            ConstIndexArray vEdges = parentLevel.getVertexEdges(vert);
-
-            Weight   vVertWeight;
-            Weight * vEdgeWeights = weightBuffer;
-            Weight * vFaceWeights = vEdgeWeights + vEdges.size();
-
-            Mask vMask(&vVertWeight, vEdgeWeights, vFaceWeights);
-
-            vHood.SetIndex(vert, cVert);
-
-            Sdc::Crease::Rule pRule = parentLevel.getVertexRule(vert);
-            Sdc::Crease::Rule cRule = childLevel.getVertexRule(cVert);
-
-            scheme.ComputeVertexVertexMask(vHood, vMask, pRule, cRule);
-
-            //  Apply the weights to the parent vertex, the vertices opposite its incident
-            //  edges, and the child vertices of its incident faces:
-            //
-            //  Even though the face-varying topology matches the vertex topology, we need
-            //  to be careful here when getting values corresponding to vertices at the
-            //  ends of edges.  While the edge may be continuous, the end vertex may have
-            //  discontinuities elsewhere in their neighborhood (i.e. on the "other side"
-            //  of the end-vertex) and so have sibling values associated with them.  In most
-            //  cases the topology for an end-vertex will match and we can use it directly,
-            //  but we must still check and retrieve as needed.
-            //
-            //  Indices for values corresponding to face-vertices are guaranteed to match,
-            //  so we can use the child-vertex indices directly.
-            //
-            //  And by "directly", we always use getVertexValue(vertexIndex) to reference
-            //  values in the "src" to account for the possible indirection that may exist at
-            //  level 0 -- where there may be fewer values than vertices and an additional
-            //  indirection is necessary.  We can use a vertex index directly for "dst" when
-            //  it matches.
-            //
-            //  As with applying the mask to vertex data, in order to improve numerical
-            //  precision, it's better to apply smaller weights first, so begin with the
-            //  face-weights followed by the edge-weights and the vertex weight last.
-            //
-            Vtr::Index pVertValue = pVertValues[0];
-            Vtr::Index cVertValue = cVertValues[0];
-
-            dst[cVertValue].Clear();
-            if (vMask.GetNumFaceWeights() > 0) {
-                assert(vMask.AreFaceWeightsForFaceCenters());
-
-                ConstIndexArray vFaces = parentLevel.getVertexFaces(vert);
-
-                for (int i = 0; i < vFaces.size(); ++i) {
-
-                    Vtr::Index cVertOfFace  = refinement.getFaceChildVertex(vFaces[i]);
-                    assert(Vtr::IndexIsValid(cVertOfFace));
-
-                    Vtr::Index cValueOfFace = childFVar.getVertexValueOffset(cVertOfFace);
-                    dst[cVertValue].AddWithWeight(dst[cValueOfFace], vFaceWeights[i]);
-                }
-            }
-            if (vMask.GetNumEdgeWeights() > 0) {
-
-                parentFVar.getVertexEdgeValues(vert, vEdgeValues);
-
-                for (int i = 0; i < vEdges.size(); ++i) {
-                    dst[cVertValue].AddWithWeight(src[vEdgeValues[i]], vEdgeWeights[i]);
-                }
-            }
-            dst[cVertValue].AddWithWeight(src[pVertValue], vVertWeight);
-        } else {
-            //
-            //  Each FVar value associated with a vertex will be either a corner or a crease,
-            //  or potentially in transition from corner to crease:
-            //      - if the CHILD is a corner, there can be no transition so we have a corner
-            //      - otherwise if the PARENT is a crease, both will be creases (no transition)
-            //      - otherwise the parent must be a corner and the child a crease (transition)
-            //
-            Vtr::internal::FVarLevel::ConstValueTagArray pValueTags = parentFVar.getVertexValueTags(vert);
-            Vtr::internal::FVarLevel::ConstValueTagArray cValueTags = childFVar.getVertexValueTags(cVert);
-
-            for (int cSiblingIndex = 0; cSiblingIndex < cVertValues.size(); ++cSiblingIndex) {
-                int pSiblingIndex = refineFVar.getChildValueParentSource(cVert, cSiblingIndex);
-                assert(pSiblingIndex == cSiblingIndex);
-
-                typedef Vtr::internal::FVarLevel::Sibling SiblingIntType;
-
-                SiblingIntType cSibling = (SiblingIntType) cSiblingIndex;
-                SiblingIntType pSibling = (SiblingIntType) pSiblingIndex;
-
-                Vtr::Index pVertValue = pVertValues[pSibling];
-                Vtr::Index cVertValue = cVertValues[cSibling];
-
-                dst[cVertValue].Clear();
-                if (isLinearFVar || cValueTags[cSibling].isCorner()) {
-                    dst[cVertValue].AddWithWeight(src[pVertValue], 1.0f);
-                } else {
-                    //
-                    //  We have either a crease or a transition from corner to crease -- in
-                    //  either case, we need the end values for the full/fractional crease:
-                    //
-                    Index pEndValues[2];
-                    parentFVar.getVertexCreaseEndValues(vert, pSibling, pEndValues);
-
-                    Weight vWeight = 0.75f;
-                    Weight eWeight = 0.125f;
-
-                    //
-                    //  If semi-sharp we need to apply fractional weighting -- if made sharp because
-                    //  of the other sibling (dependent-sharp) use the fractional weight from that
-                    //  other sibling (should only occur when there are 2):
-                    //
-                    if (pValueTags[pSibling].isSemiSharp()) {
-                        Weight wCorner = pValueTags[pSibling].isDepSharp()
-                                      ? refineFVar.getFractionalWeight(vert, !pSibling, cVert, !cSibling)
-                                      : refineFVar.getFractionalWeight(vert, pSibling, cVert, cSibling);
-                        Weight wCrease = 1.0f - wCorner;
-
-                        vWeight = wCrease * 0.75f + wCorner;
-                        eWeight = wCrease * 0.125f;
-                    }
-                    dst[cVertValue].AddWithWeight(src[pEndValues[0]], eWeight);
-                    dst[cVertValue].AddWithWeight(src[pEndValues[1]], eWeight);
-                    dst[cVertValue].AddWithWeight(src[pVertValue], vWeight);
-                }
-            }
-        }
-    }
-}
-
-template <typename REAL>
-template <Sdc::SchemeType SCHEME, class T, class U, class U1, class U2>
-inline void
-PrimvarRefinerReal<REAL>::limit(T const & src, U & dstPos, U1 * dstTan1Ptr, U2 * dstTan2Ptr) const {
-
-    Sdc::Scheme<SCHEME> scheme(_refiner._subdivOptions);
-
-    Vtr::internal::Level const & level = _refiner.getLevel(_refiner.GetMaxLevel());
-
-    int  maxWeightsPerMask = 1 + 2 * level.getMaxValence();
-    bool hasTangents = (dstTan1Ptr && dstTan2Ptr);
-    int  numMasks = 1 + (hasTangents ? 2 : 0);
-
-    Vtr::internal::StackBuffer<Index,33> indexBuffer(maxWeightsPerMask);
-    Vtr::internal::StackBuffer<Weight,99> weightBuffer(numMasks * maxWeightsPerMask);
-
-    Weight * vPosWeights = weightBuffer,
-           * ePosWeights = vPosWeights + 1,
-           * fPosWeights = ePosWeights + level.getMaxValence();
-    Weight * vTan1Weights = vPosWeights + maxWeightsPerMask,
-           * eTan1Weights = ePosWeights + maxWeightsPerMask,
-           * fTan1Weights = fPosWeights + maxWeightsPerMask;
-    Weight * vTan2Weights = vTan1Weights + maxWeightsPerMask,
-           * eTan2Weights = eTan1Weights + maxWeightsPerMask,
-           * fTan2Weights = fTan1Weights + maxWeightsPerMask;
-
-    Mask posMask( vPosWeights,  ePosWeights,  fPosWeights);
-    Mask tan1Mask(vTan1Weights, eTan1Weights, fTan1Weights);
-    Mask tan2Mask(vTan2Weights, eTan2Weights, fTan2Weights);
-
-    //  This is a bit obscure -- assigning both parent and child as last level -- but
-    //  this mask type was intended for another purpose.  Consider one for the limit:
-    Vtr::internal::VertexInterface vHood(level, level);
-
-    for (int vert = 0; vert < level.getNumVertices(); ++vert) {
-        ConstIndexArray vEdges = level.getVertexEdges(vert);
-
-        //  Incomplete vertices (present in sparse refinement) do not have their full
-        //  topological neighborhood to determine a proper limit -- just leave the
-        //  vertex at the refined location and continue to the next:
-        if (level.getVertexTag(vert)._incomplete || (vEdges.size() == 0)) {
-            dstPos[vert].Clear();
-            dstPos[vert].AddWithWeight(src[vert], 1.0);
-            if (hasTangents) {
-                (*dstTan1Ptr)[vert].Clear();
-                (*dstTan2Ptr)[vert].Clear();
-            }
-            continue;
-        }
-
-        //
-        //  Limit masks require the subdivision Rule for the vertex in order to deal
-        //  with infinitely sharp features correctly -- including boundaries and corners.
-        //  The vertex neighborhood is minimally defined with vertex and edge counts.
-        //
-        Sdc::Crease::Rule vRule = level.getVertexRule(vert);
-
-        //  This is a bit obscure -- child vertex index will be ignored here
-        vHood.SetIndex(vert, vert);
-
-        if (hasTangents) {
-            scheme.ComputeVertexLimitMask(vHood, posMask, tan1Mask, tan2Mask, vRule);
-        } else {
-            scheme.ComputeVertexLimitMask(vHood, posMask, vRule);
-        }
-
-        //
-        //  Gather the neighboring vertices of this vertex -- the vertices opposite its
-        //  incident edges, and the opposite vertices of its incident faces:
-        //
-        Index * eIndices = indexBuffer;
-        Index * fIndices = indexBuffer + vEdges.size();
-
-        for (int i = 0; i < vEdges.size(); ++i) {
-            ConstIndexArray eVerts = level.getEdgeVertices(vEdges[i]);
-
-            eIndices[i] = (eVerts[0] == vert) ? eVerts[1] : eVerts[0];
-        }
-        if (posMask.GetNumFaceWeights() || (hasTangents && tan1Mask.GetNumFaceWeights())) {
-            ConstIndexArray      vFaces = level.getVertexFaces(vert);
-            ConstLocalIndexArray vInFace = level.getVertexFaceLocalIndices(vert);
-
-            for (int i = 0; i < vFaces.size(); ++i) {
-                ConstIndexArray fVerts = level.getFaceVertices(vFaces[i]);
-
-                LocalIndex vOppInFace = (vInFace[i] + 2);
-                if (vOppInFace >= fVerts.size()) vOppInFace -= (LocalIndex)fVerts.size();
-
-                fIndices[i] = level.getFaceVertices(vFaces[i])[vOppInFace];
-            }
-        }
-
-        //
-        //  Combine the weights and indices for position and tangents.  As with applying
-        //  refinement masks to vertex data, in order to improve numerical precision, it's
-        //  better to apply smaller weights first, so begin with the face-weights followed
-        //  by the edge-weights and the vertex weight last.
-        //
-        dstPos[vert].Clear();
-        for (int i = 0; i < posMask.GetNumFaceWeights(); ++i) {
-            dstPos[vert].AddWithWeight(src[fIndices[i]], fPosWeights[i]);
-        }
-        for (int i = 0; i < posMask.GetNumEdgeWeights(); ++i) {
-            dstPos[vert].AddWithWeight(src[eIndices[i]], ePosWeights[i]);
-        }
-        dstPos[vert].AddWithWeight(src[vert], vPosWeights[0]);
-
-        //
-        //  Apply the tangent masks -- both will have the same number of weights and 
-        //  indices (one tangent may be "padded" to accommodate the other), but these
-        //  may differ from those of the position:
-        //
-        if (hasTangents) {
-            assert(tan1Mask.GetNumFaceWeights() == tan2Mask.GetNumFaceWeights());
-            assert(tan1Mask.GetNumEdgeWeights() == tan2Mask.GetNumEdgeWeights());
-
-            U1 & dstTan1 = *dstTan1Ptr;
-            U2 & dstTan2 = *dstTan2Ptr;
-
-            dstTan1[vert].Clear();
-            dstTan2[vert].Clear();
-            for (int i = 0; i < tan1Mask.GetNumFaceWeights(); ++i) {
-                dstTan1[vert].AddWithWeight(src[fIndices[i]], fTan1Weights[i]);
-                dstTan2[vert].AddWithWeight(src[fIndices[i]], fTan2Weights[i]);
-            }
-            for (int i = 0; i < tan1Mask.GetNumEdgeWeights(); ++i) {
-                dstTan1[vert].AddWithWeight(src[eIndices[i]], eTan1Weights[i]);
-                dstTan2[vert].AddWithWeight(src[eIndices[i]], eTan2Weights[i]);
-            }
-            dstTan1[vert].AddWithWeight(src[vert], vTan1Weights[0]);
-            dstTan2[vert].AddWithWeight(src[vert], vTan2Weights[0]);
-        }
-    }
-}
-
-template <typename REAL>
-template <Sdc::SchemeType SCHEME, class T, class U>
-inline void
-PrimvarRefinerReal<REAL>::limitFVar(T const & src, U & dst, int channel) const {
-
-    Sdc::Scheme<SCHEME> scheme(_refiner._subdivOptions);
-
-    Vtr::internal::Level const &      level       = _refiner.getLevel(_refiner.GetMaxLevel());
-    Vtr::internal::FVarLevel const &  fvarChannel = level.getFVarLevel(channel);
-
-    int maxWeightsPerMask = 1 + 2 * level.getMaxValence();
-
-    Vtr::internal::StackBuffer<Weight,33> weightBuffer(maxWeightsPerMask);
-    Vtr::internal::StackBuffer<Index,16> vEdgeBuffer(level.getMaxValence());
-
-    //  This is a bit obscure -- assign both parent and child as last level
-    Vtr::internal::VertexInterface vHood(level, level);
-
-    for (int vert = 0; vert < level.getNumVertices(); ++vert) {
-
-        ConstIndexArray vEdges  = level.getVertexEdges(vert);
-        ConstIndexArray vValues = fvarChannel.getVertexValues(vert);
-
-        //  Incomplete vertices (present in sparse refinement) do not have their full
-        //  topological neighborhood to determine a proper limit -- just leave the
-        //  values (perhaps more than one per vertex) at the refined location.
-        //
-        //  The same can be done if the face-varying channel is purely linear.
-        //
-        bool isIncomplete = (level.getVertexTag(vert)._incomplete || (vEdges.size() == 0));
-        if (isIncomplete || fvarChannel.isLinear()) {
-            for (int i = 0; i < vValues.size(); ++i) {
-                Vtr::Index vValue = vValues[i];
-
-                dst[vValue].Clear();
-                dst[vValue].AddWithWeight(src[vValue], 1.0f);
-            }
-            continue;
-        }
-
-        bool fvarVertMatchesVertex = fvarChannel.valueTopologyMatches(vValues[0]);
-        if (fvarVertMatchesVertex) {
-
-            //  Assign the mask weights to the common buffer and compute the mask:
-            //
-            Weight * vWeights = weightBuffer,
-                   * eWeights = vWeights + 1,
-                   * fWeights = eWeights + vEdges.size();
-
-            Mask vMask(vWeights, eWeights, fWeights);
-
-            vHood.SetIndex(vert, vert);
-
-            scheme.ComputeVertexLimitMask(vHood, vMask, level.getVertexRule(vert));
-
-            //
-            //  Apply mask to corresponding FVar values for neighboring vertices:
-            //
-            Vtr::Index vValue = vValues[0];
-
-            dst[vValue].Clear();
-            if (vMask.GetNumFaceWeights() > 0) {
-                assert(!vMask.AreFaceWeightsForFaceCenters());
-
-                ConstIndexArray      vFaces = level.getVertexFaces(vert);
-                ConstLocalIndexArray vInFace = level.getVertexFaceLocalIndices(vert);
-
-                for (int i = 0; i < vFaces.size(); ++i) {
-                    ConstIndexArray faceValues = fvarChannel.getFaceValues(vFaces[i]);
-                    LocalIndex vOppInFace = vInFace[i] + 2;
-                    if (vOppInFace >= faceValues.size()) vOppInFace -= faceValues.size();
-
-                    Index vValueOppositeFace = faceValues[vOppInFace];
-
-                    dst[vValue].AddWithWeight(src[vValueOppositeFace], fWeights[i]);
-                }
-            }
-            if (vMask.GetNumEdgeWeights() > 0) {
-                Index * vEdgeValues = vEdgeBuffer;
-                fvarChannel.getVertexEdgeValues(vert, vEdgeValues);
-
-                for (int i = 0; i < vEdges.size(); ++i) {
-                    dst[vValue].AddWithWeight(src[vEdgeValues[i]], eWeights[i]);
-                }
-            }
-            dst[vValue].AddWithWeight(src[vValue], vWeights[0]);
-        } else {
-            //
-            //  Sibling FVar values associated with a vertex will be either a corner or a crease:
-            //
-            for (int i = 0; i < vValues.size(); ++i) {
-                Vtr::Index vValue = vValues[i];
-
-                dst[vValue].Clear();
-                if (fvarChannel.getValueTag(vValue).isCorner()) {
-                    dst[vValue].AddWithWeight(src[vValue], 1.0f);
-                } else {
-                    Index vEndValues[2];
-                    fvarChannel.getVertexCreaseEndValues(vert, i, vEndValues);
-
-                    dst[vValue].AddWithWeight(src[vEndValues[0]], 1.0f/6.0f);
-                    dst[vValue].AddWithWeight(src[vEndValues[1]], 1.0f/6.0f);
-                    dst[vValue].AddWithWeight(src[vValue], 2.0f/3.0f);
-                }
-            }
-        }
-    }
-}
-
-class PrimvarRefiner : public PrimvarRefinerReal<float> {
-public:
-    PrimvarRefiner(TopologyRefiner const & refiner)
-        : PrimvarRefinerReal<float>(refiner) { }
-};
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_PRIMVAR_REFINER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/ptexIndices.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/ptexIndices.cpp
deleted file mode 100644
index 95622f04f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/ptexIndices.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../far/ptexIndices.h"
-
-#include "../far/error.h"
-#include "../vtr/level.h"
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-
-PtexIndices::PtexIndices(TopologyRefiner const &refiner) {
-    initializePtexIndices(refiner);
-}
-
-PtexIndices::~PtexIndices() {
-
-}
-
-
-void
-PtexIndices::initializePtexIndices(TopologyRefiner const &refiner) {
-
-    int regFaceSize = Sdc::SchemeTypeTraits::GetRegularFaceSize(
-            refiner.GetSchemeType());
-
-    Vtr::internal::Level const & coarseLevel = refiner.getLevel(0);
-
-    int nfaces = coarseLevel.getNumFaces();
-    _ptexIndices.resize(nfaces+1);
-    int ptexID=0;
-    for (int i = 0; i < nfaces; ++i) {
-        _ptexIndices[i] = ptexID;
-        Vtr::ConstIndexArray fverts = coarseLevel.getFaceVertices(i);
-        ptexID += fverts.size()==regFaceSize ? 1 : fverts.size();
-    }
-    // last entry contains the number of ptex texture faces
-    _ptexIndices[nfaces]=ptexID;
-}
-
-int
-PtexIndices::GetNumFaces() const {
-    return _ptexIndices.back();
-}
-
-int
-PtexIndices::GetFaceId(Index f) const {
-    assert(f<(int)_ptexIndices.size());
-    return _ptexIndices[f];
-}
-
-namespace {
-    // Returns the face adjacent to 'face' along edge 'edge'
-    inline Index
-    getAdjacentFace(Vtr::internal::Level const & level, Index edge, Index face) {
-        Far::ConstIndexArray adjFaces = level.getEdgeFaces(edge);
-        if (adjFaces.size()!=2) {
-            return -1;
-        }
-        return (adjFaces[0]==face) ? adjFaces[1] : adjFaces[0];
-    }
-}
-
-void
-PtexIndices::GetAdjacency(
-    TopologyRefiner const &refiner,
-    int face, int quadrant,
-    int adjFaces[4], int adjEdges[4]) const {
-
-    int regFaceSize =
-        Sdc::SchemeTypeTraits::GetRegularFaceSize(refiner.GetSchemeType());
-
-    Vtr::internal::Level const & level = refiner.getLevel(0);
-
-    ConstIndexArray fedges = level.getFaceEdges(face);
-
-    if (fedges.size() == regFaceSize) {
-
-        // Regular ptex quad face
-        for (int i=0; i<regFaceSize; ++i) {
-            int edge = fedges[i];
-            Index adjface = getAdjacentFace(level, edge, face);
-            if (adjface==-1) {
-                adjFaces[i] = -1;  // boundary or non-manifold
-                adjEdges[i] = 0;
-            } else {
-
-                ConstIndexArray aedges = level.getFaceEdges(adjface);
-                if (aedges.size()==regFaceSize) {
-                    adjFaces[i] = _ptexIndices[adjface];
-                    adjEdges[i] = aedges.FindIndex(edge);
-                    assert(adjEdges[i]!=-1);
-                } else {
-                    // neighbor is a sub-face
-                    adjFaces[i] = _ptexIndices[adjface] +
-                                  (aedges.FindIndex(edge)+1)%aedges.size();
-                    adjEdges[i] = 3;
-                }
-                assert(adjFaces[i]!=-1);
-            }
-        }
-        if (regFaceSize == 3) {
-            adjFaces[3] = -1;
-            adjEdges[3] = 0;
-        }
-    } else if (regFaceSize == 4) {
-
-        //  Ptex sub-face 'quadrant' (non-quad)
-        //
-        // Ptex adjacency pattern for non-quads:
-        //
-        //             v2
-        /*             o
-        //            / \
-        //           /   \
-        //          /0   3\
-        //         /       \
-        //        o_ 1   2 _o
-        //       /  -_   _-  \
-        //      /  2  -o-  1  \
-        //     /3      |      0\
-        //    /       1|2       \
-        //   /    0    |    3    \
-        //  o----------o----------o
-        // v0                     v1
-        */
-        assert(quadrant>=0 && quadrant<fedges.size());
-
-        int nextQuadrant = (quadrant+1) % fedges.size(),
-            prevQuadrant = (quadrant+fedges.size()-1) % fedges.size();
-
-        {   // resolve neighbors within the sub-face (edges 1 & 2)
-            adjFaces[1] = _ptexIndices[face] + nextQuadrant;
-            adjEdges[1] = 2;
-
-            adjFaces[2] = _ptexIndices[face] + prevQuadrant;
-            adjEdges[2] = 1;
-        }
-
-        {   // resolve neighbor outside the sub-face (edge 0)
-            int edge0 = fedges[quadrant];
-            Index adjface0 = getAdjacentFace(level, edge0, face);
-            if (adjface0==-1) {
-                adjFaces[0] = -1;  // boundary or non-manifold
-                adjEdges[0] = 0;
-            } else {
-                ConstIndexArray afedges = level.getFaceEdges(adjface0);
-                if (afedges.size()==4) {
-                   adjFaces[0] = _ptexIndices[adjface0];
-                   adjEdges[0] = afedges.FindIndexIn4Tuple(edge0);
-                } else {
-                   int subedge = (afedges.FindIndex(edge0)+1)%afedges.size();
-                   adjFaces[0] = _ptexIndices[adjface0] + subedge;
-                   adjEdges[0] = 3;
-                }
-                assert(adjFaces[0]!=-1);
-            }
-
-            // resolve neighbor outside the sub-face (edge 3)
-            int edge3 = fedges[prevQuadrant];
-            Index adjface3 = getAdjacentFace(level, edge3, face);
-            if (adjface3==-1) {
-                adjFaces[3]=-1;  // boundary or non-manifold
-                adjEdges[3]=0;
-            } else {
-                ConstIndexArray afedges = level.getFaceEdges(adjface3);
-                if (afedges.size()==4) {
-                   adjFaces[3] = _ptexIndices[adjface3];
-                   adjEdges[3] = afedges.FindIndexIn4Tuple(edge3);
-                } else {
-                   int subedge = afedges.FindIndex(edge3);
-                   adjFaces[3] = _ptexIndices[adjface3] + subedge;
-                   adjEdges[3] = 0;
-                }
-                assert(adjFaces[3]!=-1);
-            }
-        }
-    } else {
-        Far::Error(FAR_RUNTIME_ERROR,
-                "Failure in PtexIndices::GetAdjacency() -- "
-                "irregular faces only supported for quad schemes.");
-    }
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/ptexIndices.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/ptexIndices.h
deleted file mode 100644
index 04bfbe18e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/ptexIndices.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_FAR_PTEX_INDICES_H
-#define OPENSUBDIV3_FAR_PTEX_INDICES_H
-
-#include "../version.h"
-
-#include "../far/topologyRefiner.h"
-#include "../far/types.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-///
-/// \brief Object used to compute and query ptex face indices.
-///
-/// Given a refiner, constructing a PtexIndices object builds the mapping
-/// from coarse faces to ptex ids.  Once built, the object can be used to
-/// query the mapping.
-///
-class PtexIndices {
-
-public:
-
-    /// \brief Constructor
-    PtexIndices(TopologyRefiner const &refiner);
-
-    /// \brief Destructor
-    ~PtexIndices();
-
-    //@{
-    ///
-    /// Ptex
-    ///
-
-    /// \brief Returns the number of ptex faces in the mesh
-    ///
-    int GetNumFaces() const;
-
-    /// \brief Returns the ptex face index given a coarse face 'f' or -1
-    ///
-    int GetFaceId(Index f) const;
-
-    /// \brief Returns ptex face adjacency information for a given coarse face
-    ///
-    /// @param refiner   refiner used to build this PtexIndices object.
-    ///
-    /// @param face      coarse face index
-    ///
-    /// @param quadrant  quadrant index if 'face' is not a quad (the local ptex
-    ///                  sub-face index). Must be less than the number of face
-    ///                  vertices.
-    ///
-    /// @param adjFaces  ptex face indices of adjacent faces
-    ///
-    /// @param adjEdges  ptex edge indices of adjacent faces
-    ///
-    void GetAdjacency(
-        TopologyRefiner const &refiner,
-        int face, int quadrant,
-        int adjFaces[4], int adjEdges[4]) const;
-
-    //@}
-
-private:
-
-    void initializePtexIndices(TopologyRefiner const &refiner);
-
-private:
-
-    std::vector<Index> _ptexIndices;
-};
-
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_PTEX_INDICES_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/sparseMatrix.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/sparseMatrix.h
deleted file mode 100644
index 047ba0af1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/sparseMatrix.h
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-//   Copyright 2017 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_SPARSE_MATRIX_H
-#define OPENSUBDIV3_FAR_SPARSE_MATRIX_H
-
-#include "../version.h"
-
-#include "../vtr/array.h"
-
-#include <algorithm>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  SparseMatrix
-//
-//  The SparseMatrix class is used by the PatchBuilder to store coefficients
-//  for a set of patch points derived from some other set of points -- usually
-//  the refined points in a subdivision level.  The compressed sparse row
-//  format (CSR) is used as it provides us with stencils for points that
-//  correspond to rows and so can be more directly and efficiently copied.
-//
-//  It has potential for other uses and so may eventually warrant a seperate
-//  header file of its own.  For now, in keeping with the trend of exposing
-//  classes only where used, it is defined with the PatchBuilder.
-//
-//  We may also want to explore the possibility of being able to assign
-//  static buffers as members here -- allowing common matrices to be set
-//  directly rather than repeatedly replicated.
-//
-template <typename REAL>
-class SparseMatrix {
-public:
-    typedef int  column_type;
-    typedef REAL element_type;
-
-public:
-    //  Declaration and access methods:
-    SparseMatrix() : _numRows(0), _numColumns(0), _numElements(0) { }
-
-    int GetNumRows() const { return _numRows; }
-    int GetNumColumns() const { return _numColumns; }
-    int GetNumElements() const { return _numElements; }
-    int GetCapacity() const;
-
-    int GetRowSize(int rowIndex) const {
-        return _rowOffsets[rowIndex + 1] - _rowOffsets[rowIndex];
-    }
-
-    Vtr::ConstArray<column_type>  GetRowColumns( int rowIndex) const {
-        return Vtr::ConstArray<column_type>(&_columns[_rowOffsets[rowIndex]],
-                                            GetRowSize(rowIndex));
-    }
-    Vtr::ConstArray<element_type> GetRowElements(int rowIndex) const {
-        return Vtr::ConstArray<element_type>(&_elements[_rowOffsets[rowIndex]],
-                                             GetRowSize(rowIndex));
-    }
-
-    Vtr::ConstArray<column_type>  GetColumns() const {
-        return Vtr::ConstArray<column_type>(&_columns[0], GetNumElements());
-    }
-    Vtr::ConstArray<element_type> GetElements() const {
-        return Vtr::ConstArray<element_type>(&_elements[0], GetNumElements());
-    }
-
-public:
-    //  Modification methods
-    void Resize(int numRows, int numColumns, int numNonZeroEntriesToReserve);
-    void Copy(SparseMatrix const & srcMatrix);
-    void Swap(SparseMatrix & otherMatrix);
-
-    void SetRowSize(int rowIndex, int size);
-
-    Vtr::Array<column_type>  SetRowColumns( int rowIndex) {
-        return Vtr::Array<column_type>(&_columns[_rowOffsets[rowIndex]],
-                                       GetRowSize(rowIndex));
-    }
-    Vtr::Array<element_type> SetRowElements(int rowIndex) {
-        return Vtr::Array<element_type>(&_elements[_rowOffsets[rowIndex]],
-                                        GetRowSize(rowIndex));
-    }
-
-private:
-    //  Simple dimensions:
-    int _numRows;
-    int _numColumns;
-    int _numElements;
-
-    std::vector<int> _rowOffsets;  // remember one more entry here than rows
-
-    //  XXXX (barfowl) - Note that the use of std::vector for the columns and
-    //  element arrays was causing performance issues in the incremental
-    //  resizing of consecutive rows, so we've been exploring alternatives...
-    std::vector<column_type>  _columns;
-    std::vector<element_type> _elements;
-};
-
-template <typename REAL>
-inline int
-SparseMatrix<REAL>::GetCapacity() const {
-
-    return (int) _elements.size();
-}
-
-template <typename REAL>
-inline void
-SparseMatrix<REAL>::Resize(int numRows, int numCols, int numElementsToReserve) {
-
-    _numRows     = numRows;
-    _numColumns  = numCols;
-    _numElements = 0;
-
-    _rowOffsets.resize(0);
-    _rowOffsets.resize(_numRows + 1, -1);
-    _rowOffsets[0] = 0;
-
-    if (numElementsToReserve > GetCapacity()) {
-        _columns.resize(numElementsToReserve);
-        _elements.resize(numElementsToReserve);
-    }
-}
-template <typename REAL>
-inline void
-SparseMatrix<REAL>::SetRowSize(int rowIndex, int rowSize) {
-
-    assert(_rowOffsets[rowIndex] == _numElements);
-
-    int & newVectorSize = _rowOffsets[rowIndex + 1];
-    newVectorSize = _rowOffsets[rowIndex] + rowSize;
-
-    _numElements = newVectorSize;
-    if (newVectorSize > GetCapacity()) {
-        _columns.resize(newVectorSize);
-        _elements.resize(newVectorSize);
-    }
-}
-
-template <typename REAL>
-inline void
-SparseMatrix<REAL>::Copy(SparseMatrix const & src) {
-
-    _numRows    = src._numRows;
-    _numColumns = src._numColumns;
-
-    _rowOffsets = src._rowOffsets;
-
-    _numElements = src._numElements;
-
-    _columns  = src._columns;
-    _elements = src._elements;
-}
-
-template <typename REAL>
-inline void
-SparseMatrix<REAL>::Swap(SparseMatrix & other) {
-
-    std::swap(_numRows, other._numRows);
-    std::swap(_numColumns, other._numColumns);
-    std::swap(_numElements, other._numElements);
-
-    _rowOffsets.swap(other._rowOffsets);
-    _columns.swap(other._columns);
-    _elements.swap(other._elements);
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_SPARSE_MATRIX_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilBuilder.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilBuilder.cpp
deleted file mode 100644
index 4d3f1e1f8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilBuilder.cpp
+++ /dev/null
@@ -1,606 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../far/stencilBuilder.h"
-#include "../far/topologyRefiner.h"
- 
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-namespace internal {
-
-namespace {
-#ifdef __INTEL_COMPILER
-#pragma warning (push)
-#pragma warning disable 1572
-#endif
-
-    template <typename REAL>
-    inline bool isWeightZero(REAL w) { return (w == (REAL)0.0); }
-
-#ifdef __INTEL_COMPILER
-#pragma warning (pop)
-#endif
-}
-
-template <typename REAL>
-struct Point1stDerivWeight {
-    REAL p;
-    REAL du;
-    REAL dv;
-
-    Point1stDerivWeight()
-        : p(0.0f), du(0.0f), dv(0.0f)
-    { }
-    Point1stDerivWeight(REAL w)
-        : p(w), du(w), dv(w)
-    { }
-    Point1stDerivWeight(REAL w, REAL wDu, REAL wDv)
-        : p(w), du(wDu), dv(wDv)
-    { }
-
-    friend Point1stDerivWeight operator*(Point1stDerivWeight lhs,
-                                         Point1stDerivWeight const& rhs) {
-        lhs.p *= rhs.p;
-        lhs.du *= rhs.du;
-        lhs.dv *= rhs.dv;
-        return lhs;
-    }
-    Point1stDerivWeight& operator+=(Point1stDerivWeight const& rhs) {
-        p += rhs.p;
-        du += rhs.du;
-        dv += rhs.dv;
-        return *this;
-    }
-};
-
-template <typename REAL>
-struct Point2ndDerivWeight {
-    REAL p;
-    REAL du;
-    REAL dv;
-    REAL duu;
-    REAL duv;
-    REAL dvv;
-
-    Point2ndDerivWeight()
-        : p(0.0f), du(0.0f), dv(0.0f), duu(0.0f), duv(0.0f), dvv(0.0f)
-    { }
-    Point2ndDerivWeight(REAL w)
-        : p(w), du(w), dv(w), duu(w), duv(w), dvv(w)
-    { }
-    Point2ndDerivWeight(REAL w, REAL wDu, REAL wDv,
-                        REAL wDuu, REAL wDuv, REAL wDvv)
-        : p(w), du(wDu), dv(wDv), duu(wDuu), duv(wDuv), dvv(wDvv)
-    { }
-
-    friend Point2ndDerivWeight operator*(Point2ndDerivWeight lhs,
-                                         Point2ndDerivWeight const& rhs) {
-        lhs.p *= rhs.p;
-        lhs.du *= rhs.du;
-        lhs.dv *= rhs.dv;
-        lhs.duu *= rhs.duu;
-        lhs.duv *= rhs.duv;
-        lhs.dvv *= rhs.dvv;
-        return lhs;
-    }
-    Point2ndDerivWeight& operator+=(Point2ndDerivWeight const& rhs) {
-        p += rhs.p;
-        du += rhs.du;
-        dv += rhs.dv;
-        duu += rhs.duu;
-        duv += rhs.duv;
-        dvv += rhs.dvv;
-        return *this;
-    }
-};
-
-/// Stencil table constructor set.
-///
-template <typename REAL>
-class WeightTable {
-public:
-    WeightTable(int coarseVerts,
-                bool genCtrlVertStencils,
-                bool compactWeights)
-        : _size(0)
-        , _lastOffset(0)
-        , _coarseVertCount(coarseVerts)
-        , _compactWeights(compactWeights)
-    {
-        // These numbers were chosen by profiling production assets at uniform
-        // level 3.
-        size_t n = std::max(coarseVerts,
-                      std::min(int(5*1024*1024),
-                          coarseVerts*2));
-        _dests.reserve(n);
-        _sources.reserve(n);
-        _weights.reserve(n);
-        
-        if (!genCtrlVertStencils)
-            return;
-
-        // Generate trivial control vert stencils
-        _sources.resize(coarseVerts);
-        _weights.resize(coarseVerts);
-        _dests.resize(coarseVerts);
-        _indices.resize(coarseVerts);
-        _sizes.resize(coarseVerts);
-
-        for (int i = 0; i < coarseVerts; i++) {
-            _indices[i] = i;
-            _sizes[i] = 1;
-            _dests[i] = i;
-            _sources[i] = i;
-            _weights[i] = 1.0;
-        }
-
-        _size = static_cast<int>(_sources.size());
-        _lastOffset = _size - 1;
-    }
-
-    template <class W, class WACCUM>
-    void AddWithWeight(int src, int dest, W weight, WACCUM weights)
-    {
-        // Factorized stencils are expressed purely in terms of the control
-        // mesh verts. Without this flattening, level_i's weights would point
-        // to level_i-1, which would point to level_i-2, until the final level
-        // points to the control verts.
-        //
-        // So here, we check if the incoming vert (src) is in the control mesh,
-        // if it is, we can simply merge it without attempting to resolve it
-        // first.
-        if (src < _coarseVertCount) {
-            merge(src, dest, weight, W(1.0), _lastOffset, _size, weights);
-            return;
-        }
-
-        // src is not in the control mesh, so resolve all contributing coarse
-        // verts (src itself is made up of many control vert weights). 
-        //
-        // Find the src stencil and number of contributing CVs.
-        int len = _sizes[src];
-        int start = _indices[src];
-
-        for (int i = start; i < start+len; i++) {
-            // Invariant: by processing each level in order and each vertex in
-            // dependent order, any src stencil vertex reference is guaranteed
-            // to consist only of coarse verts: therefore resolving src verts
-            // must yield verts in the coarse mesh.
-            assert(_sources[i] < _coarseVertCount);
-
-            // Merge each of src's contributing verts into this stencil.
-            merge(_sources[i], dest, weights.Get(i), weight,
-                                _lastOffset, _size, weights);
-        }
-    }
-
-    class Point1stDerivAccumulator {
-        WeightTable* _tbl;
-    public:
-        Point1stDerivAccumulator(WeightTable* tbl) : _tbl(tbl)
-        { }
-        void PushBack(Point1stDerivWeight<REAL> weight) {
-            _tbl->_weights.push_back(weight.p);
-            _tbl->_duWeights.push_back(weight.du);
-            _tbl->_dvWeights.push_back(weight.dv);
-        }
-        void Add(size_t i, Point1stDerivWeight<REAL> weight) {
-            _tbl->_weights[i] += weight.p;
-            _tbl->_duWeights[i] += weight.du;
-            _tbl->_dvWeights[i] += weight.dv;
-        }
-        Point1stDerivWeight<REAL> Get(size_t index) {
-            return Point1stDerivWeight<REAL>(_tbl->_weights[index],
-                                             _tbl->_duWeights[index],
-                                             _tbl->_dvWeights[index]);
-        }
-    };
-    Point1stDerivAccumulator GetPoint1stDerivAccumulator() {
-        return Point1stDerivAccumulator(this);
-    };
-
-    class Point2ndDerivAccumulator {
-        WeightTable* _tbl;
-    public:
-        Point2ndDerivAccumulator(WeightTable* tbl) : _tbl(tbl)
-        { }
-        void PushBack(Point2ndDerivWeight<REAL> weight) {
-            _tbl->_weights.push_back(weight.p);
-            _tbl->_duWeights.push_back(weight.du);
-            _tbl->_dvWeights.push_back(weight.dv);
-            _tbl->_duuWeights.push_back(weight.duu);
-            _tbl->_duvWeights.push_back(weight.duv);
-            _tbl->_dvvWeights.push_back(weight.dvv);
-        }
-        void Add(size_t i, Point2ndDerivWeight<REAL> weight) {
-            _tbl->_weights[i] += weight.p;
-            _tbl->_duWeights[i] += weight.du;
-            _tbl->_dvWeights[i] += weight.dv;
-            _tbl->_duuWeights[i] += weight.duu;
-            _tbl->_duvWeights[i] += weight.duv;
-            _tbl->_dvvWeights[i] += weight.dvv;
-        }
-        Point2ndDerivWeight<REAL> Get(size_t index) {
-            return Point2ndDerivWeight<REAL>(_tbl->_weights[index],
-                                             _tbl->_duWeights[index],
-                                             _tbl->_dvWeights[index],
-                                             _tbl->_duuWeights[index],
-                                             _tbl->_duvWeights[index],
-                                             _tbl->_dvvWeights[index]);
-        }
-    };
-    Point2ndDerivAccumulator GetPoint2ndDerivAccumulator() {
-        return Point2ndDerivAccumulator(this);
-    };
-
-    class ScalarAccumulator {
-        WeightTable* _tbl;
-    public:
-        ScalarAccumulator(WeightTable* tbl) : _tbl(tbl)
-        { }
-        void PushBack(REAL weight) {
-            _tbl->_weights.push_back(weight);
-        }
-        void Add(size_t i, REAL w) {
-            _tbl->_weights[i] += w;
-        }
-        REAL Get(size_t index) {
-            return _tbl->_weights[index];
-        }
-    };
-    ScalarAccumulator GetScalarAccumulator() {
-        return ScalarAccumulator(this);
-    };
-
-    std::vector<int> const&
-    GetOffsets() const { return _indices; }
-
-    std::vector<int> const& 
-    GetSizes() const { return _sizes; }
-
-    std::vector<int> const&
-    GetSources() const { return _sources; }
-
-    std::vector<REAL> const&
-    GetWeights() const { return _weights; }
-
-    std::vector<REAL> const&
-    GetDuWeights() const { return _duWeights; }
-
-    std::vector<REAL> const&
-    GetDvWeights() const { return _dvWeights; }
-
-    std::vector<REAL> const&
-    GetDuuWeights() const { return _duuWeights; }
-
-    std::vector<REAL> const&
-    GetDuvWeights() const { return _duvWeights; }
-
-    std::vector<REAL> const&
-    GetDvvWeights() const { return _dvvWeights; }
-
-    void SetCoarseVertCount(int numVerts) {
-        _coarseVertCount = numVerts;
-    }
-private:
-
-    // Merge a vertex weight into the stencil table, if there is an existing
-    // weight for a given source vertex it will be combined.
-    //
-    // PERFORMANCE: caution, this function is super hot.
-    template <class W, class WACCUM>
-    void merge(int src, int dst, W weight,
-               // Delaying weight*factor multiplication hides memory latency of
-               // accessing weight[i], yielding more stable performance.
-               W weightFactor, 
-               // Similarly, passing offset & tableSize as params yields higher
-               // performance than accessing the class members directly.
-               int lastOffset, int tableSize, WACCUM weights)
-    {
-        // The lastOffset is the vertex we're currently processing, by
-        // leveraging this we need not lookup the dest stencil size or offset.
-        //
-        // Additionally, if the client does not want the resulting verts
-        // compacted, do not attempt to combine weights.
-        if (_compactWeights && !_dests.empty() && _dests[lastOffset] == dst) {
-
-            // tableSize is exactly _sources.size(), but using tableSize is
-            // significantly faster.
-            for (int i = lastOffset; i < tableSize; i++) {
-
-                // If we find an existing vertex that matches src, we need to
-                // combine the weights to avoid duplicate entries for src.
-                if (_sources[i] == src) {
-                    weights.Add(i, weight*weightFactor);
-                    return;
-                }
-            }
-        }
-
-        // We haven't seen src yet, insert it as a new vertex weight.
-        add(src, dst, weight*weightFactor, weights);
-    }
-
-    // Add a new vertex weight to the stencil table.
-    template <class W, class WACCUM>
-    void add(int src, int dst, W weight, WACCUM weights)
-    {
-        // The _dests array has num(weights) elements mapping each individual
-        // element back to a specific stencil. The array is constructed in such
-        // a way that the current stencil being built is always at the end of
-        // the array, so if the dests array is empty or back() doesn't match
-        // dst, then we just started building a new stencil.
-        if (_dests.empty() || dst != _dests.back()) {
-            // _indices and _sizes always have num(stencils) elements so that
-            // stencils can be directly looked up by their index in these
-            // arrays. So here, ensure that they are large enough to hold the
-            // new stencil about to be built.
-            if (dst+1 > (int)_indices.size()) {
-                _indices.resize(dst+1);
-                _sizes.resize(dst+1);
-            }
-            // Initialize the new stencil's meta-data (offset, size).
-            _indices[dst] = static_cast<int>(_sources.size());
-            _sizes[dst] = 0;
-            // Keep track of where the current stencil begins, which lets us
-            // avoid having to look it up later.
-            _lastOffset = static_cast<int>(_sources.size());
-        }
-        // Cache the number of elements as an optimization, it's faster than
-        // calling size() on any of the vectors.
-        _size++;
-
-        // Increment the current stencil element size.
-        _sizes[dst]++;
-        // Track this element as belonging to the stencil "dst".
-        _dests.push_back(dst);
-
-        // Store the actual stencil data.
-        _sources.push_back(src);
-        weights.PushBack(weight);
-    }
-
-    // The following vectors are explicitly stored as non-interleaved elements
-    // to reduce cache misses.
-
-    // Stencil to destination vertex map.
-    std::vector<int> _dests;
-
-    // The actual stencil data.
-    std::vector<int> _sources;
-    std::vector<REAL> _weights;
-    std::vector<REAL> _duWeights;
-    std::vector<REAL> _dvWeights;
-    std::vector<REAL> _duuWeights;
-    std::vector<REAL> _duvWeights;
-    std::vector<REAL> _dvvWeights;
-
-    // Index data used to recover stencil-to-vertex mapping.
-    std::vector<int> _indices;
-    std::vector<int> _sizes;
-
-    // Acceleration members to avoid pointer chasing and reverse loops.
-    int _size;
-    int _lastOffset;
-    int _coarseVertCount;
-    bool _compactWeights;
-};
-
-template <typename REAL>
-StencilBuilder<REAL>::StencilBuilder(int coarseVertCount,
-                               bool genCtrlVertStencils,
-                               bool compactWeights)
-        : _weightTable(new WeightTable<REAL>(coarseVertCount,
-                                   genCtrlVertStencils,
-                                   compactWeights))
-{
-}
-
-template <typename REAL>
-StencilBuilder<REAL>::~StencilBuilder()
-{
-    delete _weightTable;
-}
-
-template <typename REAL>
-size_t
-StencilBuilder<REAL>::GetNumVerticesTotal() const
-{
-    return _weightTable->GetWeights().size();
-}
-
-
-template <typename REAL>
-int 
-StencilBuilder<REAL>::GetNumVertsInStencil(size_t stencilIndex) const
-{
-    if (stencilIndex > _weightTable->GetSizes().size() - 1)
-        return 0;
-
-    return (int)_weightTable->GetSizes()[stencilIndex];
-}
-
-template <typename REAL>
-void
-StencilBuilder<REAL>::SetCoarseVertCount(int numVerts)
-{
-    _weightTable->SetCoarseVertCount(numVerts);
-}
-
-template <typename REAL>
-std::vector<int> const&
-StencilBuilder<REAL>::GetStencilOffsets() const {
-    return _weightTable->GetOffsets();
-}
-
-template <typename REAL>
-std::vector<int> const& 
-StencilBuilder<REAL>::GetStencilSizes() const {
-    return _weightTable->GetSizes();
-}
-
-template <typename REAL>
-std::vector<int> const&
-StencilBuilder<REAL>::GetStencilSources() const {
-    return _weightTable->GetSources();
-}
-
-template <typename REAL>
-std::vector<REAL> const&
-StencilBuilder<REAL>::GetStencilWeights() const {
-    return _weightTable->GetWeights();
-}
-
-template <typename REAL>
-std::vector<REAL> const&
-StencilBuilder<REAL>::GetStencilDuWeights() const {
-    return _weightTable->GetDuWeights();
-}
-
-template <typename REAL>
-std::vector<REAL> const&
-StencilBuilder<REAL>::GetStencilDvWeights() const {
-    return _weightTable->GetDvWeights();
-}
-
-template <typename REAL>
-std::vector<REAL> const&
-StencilBuilder<REAL>::GetStencilDuuWeights() const {
-    return _weightTable->GetDuuWeights();
-}
-
-template <typename REAL>
-std::vector<REAL> const&
-StencilBuilder<REAL>::GetStencilDuvWeights() const {
-    return _weightTable->GetDuvWeights();
-}
-
-template <typename REAL>
-std::vector<REAL> const&
-StencilBuilder<REAL>::GetStencilDvvWeights() const {
-    return _weightTable->GetDvvWeights();
-}
-
-template <typename REAL>
-void
-StencilBuilder<REAL>::Index::AddWithWeight(Index const & src, REAL weight)
-{
-    // Ignore no-op weights.
-    if (isWeightZero(weight)) {
-        return;
-    }
-    _owner->_weightTable->AddWithWeight(src._index, _index, weight,
-                                _owner->_weightTable->GetScalarAccumulator());
-}
-
-template <typename REAL>
-void
-StencilBuilder<REAL>::Index::AddWithWeight(StencilReal<REAL> const& src, REAL weight)
-{
-    if (isWeightZero(weight)) {
-        return;
-    }
-
-    int srcSize = *src.GetSizePtr();
-    Vtr::Index const * srcIndices = src.GetVertexIndices();
-    REAL const * srcWeights = src.GetWeights();
-
-    for (int i = 0; i < srcSize; ++i) {
-        REAL w = srcWeights[i];
-        if (isWeightZero(w)) {
-            continue;
-        }
-
-        Vtr::Index srcIndex = srcIndices[i];
-
-        REAL wgt = weight * w;
-        _owner->_weightTable->AddWithWeight(srcIndex, _index, wgt,
-                            _owner->_weightTable->GetScalarAccumulator());
-    }  
-}
-
-template <typename REAL>
-void
-StencilBuilder<REAL>::Index::AddWithWeight(StencilReal<REAL> const& src,
-    REAL weight, REAL du, REAL dv)
-{
-    if (isWeightZero(weight) && isWeightZero(du) && isWeightZero(dv)) {
-        return;
-    }
-
-    int srcSize = *src.GetSizePtr();
-    Vtr::Index const * srcIndices = src.GetVertexIndices();
-    REAL const * srcWeights = src.GetWeights();
-
-    for (int i = 0; i < srcSize; ++i) {
-        REAL w = srcWeights[i];
-        if (isWeightZero(w)) {
-            continue;
-        }
-
-        Vtr::Index srcIndex = srcIndices[i];
-
-        Point1stDerivWeight<REAL> wgt = Point1stDerivWeight<REAL>(weight, du, dv) * w;
-        _owner->_weightTable->AddWithWeight(srcIndex, _index, wgt,
-                           _owner->_weightTable->GetPoint1stDerivAccumulator());
-    }
-}
-
-template <typename REAL>
-void
-StencilBuilder<REAL>::Index::AddWithWeight(StencilReal<REAL> const& src,
-    REAL weight, REAL du, REAL dv, REAL duu, REAL duv, REAL dvv)
-{
-    if (isWeightZero(weight) && isWeightZero(du) && isWeightZero(dv) &&
-        isWeightZero(duu) && isWeightZero(duv) && isWeightZero(dvv)) {
-        return;
-    }
-
-    int srcSize = *src.GetSizePtr();
-    Vtr::Index const * srcIndices = src.GetVertexIndices();
-    REAL const * srcWeights = src.GetWeights();
-
-    for (int i = 0; i < srcSize; ++i) {
-        REAL w = srcWeights[i];
-        if (isWeightZero(w)) {
-            continue;
-        }
-
-        Vtr::Index srcIndex = srcIndices[i];
-
-        Point2ndDerivWeight<REAL> wgt = Point2ndDerivWeight<REAL>(weight, du, dv, duu, duv, dvv) * w;
-        _owner->_weightTable->AddWithWeight(srcIndex, _index, wgt,
-                           _owner->_weightTable->GetPoint2ndDerivAccumulator());
-    }
-}
-
-template class StencilBuilder<float>;
-template class StencilBuilder<double>;
-
-} // end namespace internal
-} // end namespace Far
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilBuilder.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilBuilder.h
deleted file mode 100644
index 11b310ed0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilBuilder.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_STENCILBUILDER_H
-#define OPENSUBDIV3_FAR_STENCILBUILDER_H
-
-#include <vector>
-
-#include "../version.h"
-#include "../far/stencilTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-namespace internal {
-
-template <typename REAL> class WeightTable;
-
-template <typename REAL>
-class StencilBuilder {
-public:
-    StencilBuilder(int coarseVertCount, 
-                   bool genCtrlVertStencils=true,
-                   bool compactWeights=true);
-    ~StencilBuilder();
-
-    // TODO: noncopyable.
-
-    size_t GetNumVerticesTotal() const;
-
-    int GetNumVertsInStencil(size_t stencilIndex) const;
-
-    void SetCoarseVertCount(int numVerts);
-
-    // Mapping from stencil[i] to its starting offset in the sources[] and weights[] arrays;
-    std::vector<int> const& GetStencilOffsets() const;
-
-    // The number of contributing sources and weights in stencil[i]
-    std::vector<int> const& GetStencilSizes() const;
-
-    // The absolute source vertex offsets.
-    std::vector<int> const& GetStencilSources() const;
-
-    // The individual vertex weights, each weight is paired with one source.
-    std::vector<REAL> const& GetStencilWeights() const;
-    std::vector<REAL> const& GetStencilDuWeights() const;
-    std::vector<REAL> const& GetStencilDvWeights() const;
-    std::vector<REAL> const& GetStencilDuuWeights() const;
-    std::vector<REAL> const& GetStencilDuvWeights() const;
-    std::vector<REAL> const& GetStencilDvvWeights() const;
-
-    // Vertex Facade.
-    class Index {
-    public:
-        Index(StencilBuilder* owner, int index) 
-            : _owner(owner)
-            , _index(index)
-        {}
-
-        // Add with point/vertex weight only.
-        void AddWithWeight(Index const & src, REAL weight);
-        void AddWithWeight(StencilReal<REAL> const& src, REAL weight);
-
-        // Add with first derivative.
-        void AddWithWeight(StencilReal<REAL> const& src,
-            REAL weight, REAL du, REAL dv);
-
-        // Add with first and second derivatives.
-        void AddWithWeight(StencilReal<REAL> const& src,
-            REAL weight, REAL du, REAL dv, REAL duu, REAL duv, REAL dvv);
-
-        Index operator[](int index) const {
-            return Index(_owner, index+_index);
-        }
-
-        int GetOffset() const { return _index; }
-
-        void Clear() {/*nothing to do here*/}
-    private:
-        StencilBuilder* _owner;
-        int _index;
-    };
-
-private:
-    WeightTable<REAL>* _weightTable;
-};
-
-} // end namespace internal
-} // end namespace Far
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
-
-#endif // FAR_STENCILBUILDER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTable.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTable.cpp
deleted file mode 100644
index 9a911d757..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTable.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../version.h"
-#include "../far/stencilTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-
-namespace {
-    template <typename REAL>
-    void
-    copyStencilData(int numControlVerts,
-                    bool includeCoarseVerts,
-                    size_t firstOffset,
-                    std::vector<int> const*   offsets,
-                    std::vector<int> *       _offsets,
-                    std::vector<int> const*   sizes,
-                    std::vector<int> *       _sizes,
-                    std::vector<int> const*   sources,
-                    std::vector<int> *       _sources,
-                    std::vector<REAL> const*  weights,
-                    std::vector<REAL> *      _weights,
-                    std::vector<REAL> const*  duWeights=NULL,
-                    std::vector<REAL> *      _duWeights=NULL,
-                    std::vector<REAL> const*  dvWeights=NULL,
-                    std::vector<REAL> *      _dvWeights=NULL,
-                    std::vector<REAL> const*  duuWeights=NULL,
-                    std::vector<REAL> *      _duuWeights=NULL,
-                    std::vector<REAL> const*  duvWeights=NULL,
-                    std::vector<REAL> *      _duvWeights=NULL,
-                    std::vector<REAL> const*  dvvWeights=NULL,
-                    std::vector<REAL> *      _dvvWeights=NULL) {
-        size_t start = includeCoarseVerts ? 0 : firstOffset;
-
-        _offsets->resize(offsets->size());
-        _sizes->resize(sizes->size());
-        _sources->resize(sources->size());
-        _weights->resize(weights->size());
-        if (_duWeights)
-            _duWeights->resize(duWeights->size());
-        if (_dvWeights)
-            _dvWeights->resize(dvWeights->size());
-        if (_duuWeights)
-            _duuWeights->resize(duuWeights->size());
-        if (_duvWeights)
-            _duvWeights->resize(duvWeights->size());
-        if (_dvvWeights)
-            _dvvWeights->resize(dvvWeights->size());
-
-        // The stencils are probably not in order, so we must copy/sort them.
-        // Note here that loop index 'i' represents stencil_i for vertex_i.
-        int curOffset = 0;
-
-        size_t stencilCount = 0,
-               weightCount = 0;
-
-        for ( size_t i=start; i<offsets->size(); i++ ) {
-            // Once we've copied out all the control verts, jump to the offset
-            // where the actual stencils begin.
-            if (includeCoarseVerts && (int)i == numControlVerts)
-                i = firstOffset;
-
-            // Copy the stencil.
-            int sz = (*sizes)[i];
-            int off = (*offsets)[i];
-
-            (*_offsets)[stencilCount] = curOffset;
-            (*_sizes)[stencilCount] = sz;
-
-            std::memcpy(&(*_sources)[curOffset],
-                        &(*sources)[off], sz*sizeof(int));
-            std::memcpy(&(*_weights)[curOffset],
-                        &(*weights)[off], sz*sizeof(REAL));
-
-            if (_duWeights && !_duWeights->empty()) {
-                std::memcpy(&(*_duWeights)[curOffset],
-                            &(*duWeights)[off], sz*sizeof(REAL));
-            }
-            if (_dvWeights && !_dvWeights->empty()) {
-                std::memcpy(&(*_dvWeights)[curOffset],
-                        &(*dvWeights)[off], sz*sizeof(REAL));
-            }
-
-            if (_duuWeights && !_duuWeights->empty()) {
-                std::memcpy(&(*_duuWeights)[curOffset],
-                        &(*duuWeights)[off], sz*sizeof(REAL));
-            }
-            if (_duvWeights && !_duvWeights->empty()) {
-                std::memcpy(&(*_duvWeights)[curOffset],
-                        &(*duvWeights)[off], sz*sizeof(REAL));
-            }
-            if (_dvvWeights && !_dvvWeights->empty()) {
-                std::memcpy(&(*_dvvWeights)[curOffset],
-                        &(*dvvWeights)[off], sz*sizeof(REAL));
-            }
-
-            curOffset += sz;
-            stencilCount++;
-            weightCount += sz;
-        }
-
-        _offsets->resize(stencilCount);
-        _sizes->resize(stencilCount);
-        _sources->resize(weightCount);
-
-        if (_duWeights && !_duWeights->empty())
-            _duWeights->resize(weightCount);
-        if (_dvWeights && !_dvWeights->empty())
-            _dvWeights->resize(weightCount);
-
-        if (_duuWeights && !_duuWeights->empty())
-            _duuWeights->resize(weightCount);
-        if (_duvWeights && !_duvWeights->empty())
-            _duvWeights->resize(weightCount);
-        if (_dvvWeights && !_dvvWeights->empty())
-            _dvvWeights->resize(weightCount);
-    }
-};
-
-template <typename REAL>
-StencilTableReal<REAL>::StencilTableReal(int numControlVerts,
-                           std::vector<int> const& offsets,
-                           std::vector<int> const& sizes,
-                           std::vector<int> const& sources,
-                           std::vector<REAL> const& weights,
-                           bool includeCoarseVerts,
-                           size_t firstOffset)
-    : _numControlVertices(numControlVerts) {
-    copyStencilData(numControlVerts,
-                    includeCoarseVerts,
-                    firstOffset,
-                    &offsets, &_offsets,
-                    &sizes, &_sizes,
-                    &sources, &_indices,
-                    &weights, &_weights);
-}
-
-template <typename REAL>
-void
-StencilTableReal<REAL>::Clear() {
-    _numControlVertices=0;
-    _sizes.clear();
-    _offsets.clear();
-    _indices.clear();
-    _weights.clear();
-}
-
-template <typename REAL>
-LimitStencilTableReal<REAL>::LimitStencilTableReal(
-                                     int numControlVerts,
-                                     std::vector<int> const& offsets,
-                                     std::vector<int> const& sizes,
-                                     std::vector<int> const& sources,
-                                     std::vector<REAL> const& weights,
-                                     std::vector<REAL> const& duWeights,
-                                     std::vector<REAL> const& dvWeights,
-                                     std::vector<REAL> const& duuWeights,
-                                     std::vector<REAL> const& duvWeights,
-                                     std::vector<REAL> const& dvvWeights,
-                                     bool includeCoarseVerts,
-                                     size_t firstOffset)
-    : StencilTableReal<REAL>(numControlVerts) {
-    copyStencilData(numControlVerts,
-                    includeCoarseVerts,
-                    firstOffset,
-                    &offsets, &this->_offsets,
-                    &sizes, &this->_sizes,
-                    &sources, &this->_indices,
-                    &weights, &this->_weights,
-                    &duWeights, &_duWeights,
-                    &dvWeights, &_dvWeights,
-                    &duuWeights, &_duuWeights,
-                    &duvWeights, &_duvWeights,
-                    &dvvWeights, &_dvvWeights);
-}
-
-template <typename REAL>
-void
-LimitStencilTableReal<REAL>::Clear() {
-    StencilTableReal<REAL>::Clear();
-    _duWeights.clear();
-    _dvWeights.clear();
-    _duuWeights.clear();
-    _duvWeights.clear();
-    _dvvWeights.clear();
-}
-
-
-//
-//  Explicit instantiation for float and double:
-//
-template class StencilReal<float>;
-template class StencilReal<double>;
-
-template class LimitStencilReal<float>;
-template class LimitStencilReal<double>;
-
-template class StencilTableReal<float>;
-template class StencilTableReal<double>;
-
-template class LimitStencilTableReal<float>;
-template class LimitStencilTableReal<double>;
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTable.h
deleted file mode 100644
index f9a89bcb1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTable.h
+++ /dev/null
@@ -1,793 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_STENCILTABLE_H
-#define OPENSUBDIV3_FAR_STENCILTABLE_H
-
-#include "../version.h"
-
-#include "../far/types.h"
-
-#include <cassert>
-#include <cstring>
-#include <vector>
-#include <iostream>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//  Forward declarations for friends:
-class PatchTableBuilder;
-
-template <typename REAL> class StencilTableFactoryReal;
-template <typename REAL> class LimitStencilTableFactoryReal;
-
-/// \brief Vertex stencil descriptor
-///
-/// Allows access and manipulation of a single stencil in a StencilTable.
-///
-template <typename REAL>
-class StencilReal {
-public:
-
-    /// \brief Default constructor
-    StencilReal() {}
-
-    /// \brief Constructor
-    ///
-    /// @param size     Table pointer to the size of the stencil
-    ///
-    /// @param indices  Table pointer to the vertex indices of the stencil
-    ///
-    /// @param weights  Table pointer to the vertex weights of the stencil
-    ///
-    StencilReal(int * size, Index * indices, REAL * weights)
-        : _size(size), _indices(indices), _weights(weights) { }
-
-    /// \brief Copy constructor
-    StencilReal(StencilReal const & other) {
-        _size = other._size;
-        _indices = other._indices;
-        _weights = other._weights;
-    }
-
-    /// \brief Returns the size of the stencil
-    int GetSize() const {
-        return *_size;
-    }
-
-    /// \brief Returns the size of the stencil as a pointer
-    int * GetSizePtr() const {
-        return _size;
-    }
-
-    /// \brief Returns the control vertices' indices
-    Index const * GetVertexIndices() const {
-        return _indices;
-    }
-
-    /// \brief Returns the interpolation weights
-    REAL const * GetWeights() const {
-        return _weights;
-    }
-
-    /// \brief Advance to the next stencil in the table
-    void Next() {
-        int stride = *_size;
-        ++_size;
-        _indices += stride;
-        _weights += stride;
-    }
-
-protected:
-    friend class StencilTableFactoryReal<REAL>;
-    friend class LimitStencilTableFactoryReal<REAL>;
-
-    int * _size;
-    Index * _indices;
-    REAL  * _weights;
-};
-
-/// \brief Vertex stencil class wrapping the template for compatibility.
-///
-class Stencil : public StencilReal<float> {
-protected:
-    typedef StencilReal<float>   BaseStencil;
-
-public:
-    Stencil() : BaseStencil() { }
-    Stencil(BaseStencil const & other) : BaseStencil(other) { }
-    Stencil(int * size, Index * indices, float * weights)
-        : BaseStencil(size, indices, weights) { }
-};
-
-
-/// \brief Table of subdivision stencils.
-///
-/// Stencils are the most direct method of evaluation of locations on the limit
-/// of a surface. Every point of a limit surface can be computed by linearly
-/// blending a collection of coarse control vertices.
-///
-/// A stencil assigns a series of control vertex indices with a blending weight
-/// that corresponds to a unique parametric location of the limit surface. When
-/// the control vertices move in space, the limit location can be very efficiently
-/// recomputed simply by applying the blending weights to the series of coarse
-/// control vertices.
-///
-template <typename REAL>
-class StencilTableReal {
-protected:
-    StencilTableReal(int numControlVerts,
-                    std::vector<int> const& offsets,
-                    std::vector<int> const& sizes,
-                    std::vector<int> const& sources,
-                    std::vector<REAL> const& weights,
-                    bool includeCoarseVerts,
-                    size_t firstOffset);
-
-public:
-
-    virtual ~StencilTableReal() {};
-    
-    /// \brief Returns the number of stencils in the table
-    int GetNumStencils() const {
-        return (int)_sizes.size();
-    }
-
-    /// \brief Returns the number of control vertices indexed in the table
-    int GetNumControlVertices() const {
-        return _numControlVertices;
-    }
-
-    /// \brief Returns a Stencil at index i in the table
-    StencilReal<REAL> GetStencil(Index i) const;
-
-    /// \brief Returns the number of control vertices of each stencil in the table
-    std::vector<int> const & GetSizes() const {
-        return _sizes;
-    }
-
-    /// \brief Returns the offset to a given stencil (factory may leave empty)
-    std::vector<Index> const & GetOffsets() const {
-        return _offsets;
-    }
-
-    /// \brief Returns the indices of the control vertices
-    std::vector<Index> const & GetControlIndices() const {
-        return _indices;
-    }
-
-    /// \brief Returns the stencil interpolation weights
-    std::vector<REAL> const & GetWeights() const {
-        return _weights;
-    }
-
-    /// \brief Returns the stencil at index i in the table
-    StencilReal<REAL> operator[] (Index index) const;
-
-    /// \brief Updates point values based on the control values
-    ///
-    /// \note The destination buffers are assumed to have allocated at least
-    ///       \c GetNumStencils() elements.
-    ///
-    /// @param srcValues  Buffer with primvar data for the control vertices
-    ///
-    /// @param dstValues  Destination buffer for the interpolated primvar data
-    ///
-    /// @param start      Index of first destination value to update
-    ///
-    /// @param end        Index of last destination value to update
-    ///
-    template <class T, class U>
-    void UpdateValues(T const &srcValues, U &dstValues, Index start=-1, Index end=-1) const {
-        this->update(srcValues, dstValues, _weights, start, end);
-    }
-
-    template <class T1, class T2, class U>
-    void UpdateValues(T1 const &srcBase, int numBase, T2 const &srcRef,
-        U &dstValues, Index start=-1, Index end=-1) const {
-        this->update(srcBase, numBase, srcRef, dstValues, _weights, start, end);
-    }
-
-    //  Pointer interface for backward compatibility
-    template <class T, class U>
-    void UpdateValues(T const *src, U *dst, Index start=-1, Index end=-1) const {
-        this->update(src, dst, _weights, start, end);
-    }
-    template <class T1, class T2, class U>
-    void UpdateValues(T1 const *srcBase, int numBase, T2 const *srcRef,
-        U *dst, Index start=-1, Index end=-1) const {
-        this->update(srcBase, numBase, srcRef, dst, _weights, start, end);
-    }
-
-    /// \brief Clears the stencils from the table
-    void Clear();
-
-protected:
-
-    // Update values by applying cached stencil weights to new control values
-    template <class T, class U>
-    void update( T const &srcValues, U &dstValues,
-        std::vector<REAL> const & valueWeights, Index start, Index end) const;
-    template <class T1, class T2, class U>
-    void update( T1 const &srcBase, int numBase, T2 const &srcRef, U &dstValues,
-        std::vector<REAL> const & valueWeights, Index start, Index end) const;
-
-    // Populate the offsets table from the stencil sizes in _sizes (factory helper)
-    void generateOffsets();
-
-    // Resize the table arrays (factory helper)
-    void resize(int nstencils, int nelems);
-
-    // Reserves the table arrays (factory helper)
-    void reserve(int nstencils, int nelems);
-
-    // Reallocates the table arrays to remove excess capacity (factory helper)
-    void shrinkToFit();
-
-    // Performs any final operations on internal tables (factory helper)
-    void finalize();
-
-protected:
-    StencilTableReal() : _numControlVertices(0) {}
-    StencilTableReal(int numControlVerts)
-        : _numControlVertices(numControlVerts) 
-    { }
-
-    friend class StencilTableFactoryReal<REAL>;
-    friend class Far::PatchTableBuilder;
-
-    int _numControlVertices;              // number of control vertices
-
-    std::vector<int>           _sizes;    // number of coefficients for each stencil
-    std::vector<Index>         _offsets,  // offset to the start of each stencil
-                               _indices;  // indices of contributing coarse vertices
-    std::vector<REAL>         _weights;  // stencil weight coefficients
-};
-
-/// \brief Stencil table class wrapping the template for compatibility.
-///
-class StencilTable : public StencilTableReal<float> {
-protected:
-    typedef StencilTableReal<float>   BaseTable;
-
-public:
-    Stencil GetStencil(Index index) const {
-        return Stencil(BaseTable::GetStencil(index));
-    }
-    Stencil operator[] (Index index) const {
-        return Stencil(BaseTable::GetStencil(index));
-    }
-
-protected:
-    StencilTable() : BaseTable() { }
-    StencilTable(int numControlVerts) : BaseTable(numControlVerts) { }
-    StencilTable(int numControlVerts,
-                 std::vector<int> const& offsets,
-                 std::vector<int> const& sizes,
-                 std::vector<int> const& sources,
-                 std::vector<float> const& weights,
-                 bool includeCoarseVerts,
-                 size_t firstOffset)
-        : BaseTable(numControlVerts, offsets,
-                sizes, sources, weights, includeCoarseVerts, firstOffset) { }
-};
-
-
-/// \brief Limit point stencil descriptor
-///
-template <typename REAL>
-class LimitStencilReal : public StencilReal<REAL> {
-public:
-
-    /// \brief Constructor
-    ///
-    /// @param size       Table pointer to the size of the stencil
-    ///
-    /// @param indices    Table pointer to the vertex indices of the stencil
-    ///
-    /// @param weights    Table pointer to the vertex weights of the stencil
-    ///
-    /// @param duWeights  Table pointer to the 'u' derivative weights
-    ///
-    /// @param dvWeights  Table pointer to the 'v' derivative weights
-    ///
-    /// @param duuWeights Table pointer to the 'uu' derivative weights
-    ///
-    /// @param duvWeights Table pointer to the 'uv' derivative weights
-    ///
-    /// @param dvvWeights Table pointer to the 'vv' derivative weights
-    ///
-    LimitStencilReal( int* size,
-                      Index * indices,
-                      REAL * weights,
-                      REAL * duWeights=0,
-                      REAL * dvWeights=0,
-                      REAL * duuWeights=0,
-                      REAL * duvWeights=0,
-                      REAL * dvvWeights=0)
-        : StencilReal<REAL>(size, indices, weights),
-          _duWeights(duWeights),
-          _dvWeights(dvWeights),
-          _duuWeights(duuWeights),
-          _duvWeights(duvWeights),
-          _dvvWeights(dvvWeights) {
-    }
-
-    /// \brief Returns the u derivative weights
-    REAL const * GetDuWeights() const {
-        return _duWeights;
-    }
-
-    /// \brief Returns the v derivative weights
-    REAL const * GetDvWeights() const {
-        return _dvWeights;
-    }
-
-    /// \brief Returns the uu derivative weights
-    REAL const * GetDuuWeights() const {
-        return _duuWeights;
-    }
-
-    /// \brief Returns the uv derivative weights
-    REAL const * GetDuvWeights() const {
-        return _duvWeights;
-    }
-
-    /// \brief Returns the vv derivative weights
-    REAL const * GetDvvWeights() const {
-        return _dvvWeights;
-    }
-
-    /// \brief Advance to the next stencil in the table
-    void Next() {
-       int stride = *this->_size;
-       ++this->_size;
-       this->_indices += stride;
-       this->_weights += stride;
-       if (_duWeights) _duWeights += stride;
-       if (_dvWeights) _dvWeights += stride;
-       if (_duuWeights) _duuWeights += stride;
-       if (_duvWeights) _duvWeights += stride;
-       if (_dvvWeights) _dvvWeights += stride;
-    }
-
-private:
-
-    friend class StencilTableFactoryReal<REAL>;
-    friend class LimitStencilTableFactoryReal<REAL>;
-
-    REAL  * _duWeights,  // pointer to stencil u derivative limit weights
-          * _dvWeights,  // pointer to stencil v derivative limit weights
-          * _duuWeights, // pointer to stencil uu derivative limit weights
-          * _duvWeights, // pointer to stencil uv derivative limit weights
-          * _dvvWeights; // pointer to stencil vv derivative limit weights
-};
-
-/// \brief Limit point stencil class wrapping the template for compatibility.
-///
-class LimitStencil : public LimitStencilReal<float> {
-protected:
-    typedef LimitStencilReal<float>   BaseStencil;
-
-public:
-    LimitStencil(BaseStencil const & other) : BaseStencil(other) { }
-    LimitStencil(int* size, Index * indices, float * weights,
-                 float * duWeights=0, float * dvWeights=0,
-                 float * duuWeights=0, float * duvWeights=0, float * dvvWeights=0)
-        : BaseStencil(size, indices, weights,
-                 duWeights, dvWeights, duuWeights, duvWeights, dvvWeights) { }
-};
-
-
-/// \brief Table of limit subdivision stencils.
-///
-template <typename REAL>
-class LimitStencilTableReal : public StencilTableReal<REAL> {
-protected:
-    LimitStencilTableReal(
-                    int numControlVerts,
-                    std::vector<int> const& offsets,
-                    std::vector<int> const& sizes,
-                    std::vector<int> const& sources,
-                    std::vector<REAL> const& weights,
-                    std::vector<REAL> const& duWeights,
-                    std::vector<REAL> const& dvWeights,
-                    std::vector<REAL> const& duuWeights,
-                    std::vector<REAL> const& duvWeights,
-                    std::vector<REAL> const& dvvWeights,
-                    bool includeCoarseVerts,
-                    size_t firstOffset);
-
-public:
-
-    /// \brief Returns a LimitStencil at index i in the table
-    LimitStencilReal<REAL> GetLimitStencil(Index i) const;
-
-    /// \brief Returns the limit stencil at index i in the table
-    LimitStencilReal<REAL> operator[] (Index index) const;
-
-    /// \brief Returns the 'u' derivative stencil interpolation weights
-    std::vector<REAL> const & GetDuWeights() const {
-        return _duWeights;
-    }
-
-    /// \brief Returns the 'v' derivative stencil interpolation weights
-    std::vector<REAL> const & GetDvWeights() const {
-        return _dvWeights;
-    }
-
-    /// \brief Returns the 'uu' derivative stencil interpolation weights
-    std::vector<REAL> const & GetDuuWeights() const {
-        return _duuWeights;
-    }
-
-    /// \brief Returns the 'uv' derivative stencil interpolation weights
-    std::vector<REAL> const & GetDuvWeights() const {
-        return _duvWeights;
-    }
-
-    /// \brief Returns the 'vv' derivative stencil interpolation weights
-    std::vector<REAL> const & GetDvvWeights() const {
-        return _dvvWeights;
-    }
-
-    /// \brief Updates derivative values based on the control values
-    ///
-    /// \note The destination buffers ('uderivs' & 'vderivs') are assumed to
-    ///       have allocated at least \c GetNumStencils() elements.
-    ///
-    /// @param srcValues  Buffer with primvar data for the control vertices
-    ///
-    /// @param uderivs    Destination buffer for the interpolated 'u'
-    ///                   derivative primvar data
-    ///
-    /// @param vderivs    Destination buffer for the interpolated 'v'
-    ///                   derivative primvar data
-    ///
-    /// @param start      Index of first destination derivative to update
-    ///
-    /// @param end        Index of last destination derivative to update
-    ///
-    template <class T, class U>
-    void UpdateDerivs(T const & srcValues, U & uderivs, U & vderivs,
-        int start=-1, int end=-1) const {
-
-        this->update(srcValues, uderivs, _duWeights, start, end);
-        this->update(srcValues, vderivs, _dvWeights, start, end);
-    }
-
-    template <class T1, class T2, class U>
-    void UpdateDerivs(T1 const & srcBase, int numBase, T2 const & srcRef,
-        U & uderivs, U & vderivs, int start=-1, int end=-1) const {
-
-        this->update(srcBase, numBase, srcRef, uderivs, _duWeights, start, end);
-        this->update(srcBase, numBase, srcRef, vderivs, _dvWeights, start, end);
-    }
-
-    //  Pointer interface for backward compatibility
-    template <class T, class U>
-    void UpdateDerivs(T const *src, U *uderivs, U *vderivs,
-        int start=-1, int end=-1) const {
-
-        this->update(src, uderivs, _duWeights, start, end);
-        this->update(src, vderivs, _dvWeights, start, end);
-    }
-    template <class T1, class T2, class U>
-    void UpdateDerivs(T1 const *srcBase, int numBase, T2 const *srcRef,
-        U *uderivs, U *vderivs, int start=-1, int end=-1) const {
-
-        this->update(srcBase, numBase, srcRef, uderivs, _duWeights, start, end);
-        this->update(srcBase, numBase, srcRef, vderivs, _dvWeights, start, end);
-    }
-
-    /// \brief Updates 2nd derivative values based on the control values
-    ///
-    /// \note The destination buffers ('uuderivs', 'uvderivs', & 'vderivs') are
-    ///       assumed to have allocated at least \c GetNumStencils() elements.
-    ///
-    /// @param srcValues  Buffer with primvar data for the control vertices
-    ///
-    /// @param uuderivs   Destination buffer for the interpolated 'uu'
-    ///                   derivative primvar data
-    ///
-    /// @param uvderivs   Destination buffer for the interpolated 'uv'
-    ///                   derivative primvar data
-    ///
-    /// @param vvderivs   Destination buffer for the interpolated 'vv'
-    ///                   derivative primvar data
-    ///
-    /// @param start      Index of first destination derivative to update
-    ///
-    /// @param end        Index of last destination derivative to update
-    ///
-    template <class T, class U>
-    void Update2ndDerivs(T const & srcValues,
-        U & uuderivs, U & uvderivs, U & vvderivs,
-        int start=-1, int end=-1) const {
-
-        this->update(srcValues, uuderivs, _duuWeights, start, end);
-        this->update(srcValues, uvderivs, _duvWeights, start, end);
-        this->update(srcValues, vvderivs, _dvvWeights, start, end);
-    }
-
-    template <class T1, class T2, class U>
-    void Update2ndDerivs(T1 const & srcBase, int numBase, T2 const & srcRef,
-        U & uuderivs, U & uvderivs, U & vvderivs, int start=-1, int end=-1) const {
-
-        this->update(srcBase, numBase, srcRef, uuderivs, _duuWeights, start, end);
-        this->update(srcBase, numBase, srcRef, uvderivs, _duvWeights, start, end);
-        this->update(srcBase, numBase, srcRef, vvderivs, _dvvWeights, start, end);
-    }
-
-    //  Pointer interface for backward compatibility
-    template <class T, class U>
-    void Update2ndDerivs(T const *src, T *uuderivs, U *uvderivs, U *vvderivs,
-        int start=-1, int end=-1) const {
-
-        this->update(src, uuderivs, _duuWeights, start, end);
-        this->update(src, uvderivs, _duvWeights, start, end);
-        this->update(src, vvderivs, _dvvWeights, start, end);
-    }
-    template <class T1, class T2, class U>
-    void Update2ndDerivs(T1 const *srcBase, int numBase, T2 const *srcRef,
-        U *uuderivs, U *uvderivs, U *vvderivs, int start=-1, int end=-1) const {
-
-        this->update(srcBase, numBase, srcRef, uuderivs, _duuWeights, start, end);
-        this->update(srcBase, numBase, srcRef, uvderivs, _duvWeights, start, end);
-        this->update(srcBase, numBase, srcRef, vvderivs, _dvvWeights, start, end);
-    }
-
-    /// \brief Clears the stencils from the table
-    void Clear();
-
-private:
-    friend class LimitStencilTableFactoryReal<REAL>;
-
-    // Resize the table arrays (factory helper)
-    void resize(int nstencils, int nelems);
-
-private:
-    std::vector<REAL>   _duWeights,   // u  derivative limit stencil weights
-                        _dvWeights,   // v  derivative limit stencil weights
-                        _duuWeights,  // uu derivative limit stencil weights
-                        _duvWeights,  // uv derivative limit stencil weights
-                        _dvvWeights;  // vv derivative limit stencil weights
-};
-
-/// \brief Limit stencil table class wrapping the template for compatibility.
-///
-class LimitStencilTable : public LimitStencilTableReal<float> {
-protected:
-    typedef LimitStencilTableReal<float>   BaseTable;
-
-public:
-    LimitStencil GetLimitStencil(Index index) const {
-        return LimitStencil(BaseTable::GetLimitStencil(index));
-    }
-    LimitStencil operator[] (Index index) const {
-        return LimitStencil(BaseTable::GetLimitStencil(index));
-    }
-
-protected:
-    LimitStencilTable(int numControlVerts,
-                    std::vector<int> const& offsets,
-                    std::vector<int> const& sizes,
-                    std::vector<int> const& sources,
-                    std::vector<float> const& weights,
-                    std::vector<float> const& duWeights,
-                    std::vector<float> const& dvWeights,
-                    std::vector<float> const& duuWeights,
-                    std::vector<float> const& duvWeights,
-                    std::vector<float> const& dvvWeights,
-                    bool includeCoarseVerts,
-                    size_t firstOffset)
-        : BaseTable(numControlVerts,
-                    offsets, sizes, sources, weights,
-                    duWeights, dvWeights, duuWeights, duvWeights, dvvWeights,
-                    includeCoarseVerts, firstOffset) { }
-};
-
-
-// Update values by applying cached stencil weights to new control values
-template <typename REAL>
-template <class T1, class T2, class U> void
-StencilTableReal<REAL>::update(T1 const &srcBase, int numBase,
-    T2 const &srcRef, U &dstValues,
-    std::vector<REAL> const &valueWeights, Index start, Index end) const {
-
-    int const * sizes = &_sizes.at(0);
-    Index const * indices = &_indices.at(0);
-    REAL const * weights = &valueWeights.at(0);
-
-    if (start > 0) {
-        assert(start < (Index)_offsets.size());
-        sizes += start;
-        indices += _offsets[start];
-        weights += _offsets[start];
-    } else {
-        start = 0;
-    }
-
-    int nstencils = ((end < start) ? GetNumStencils() : end) - start;
-
-    for (int i = 0; i < nstencils; ++i, ++sizes) {
-        dstValues[start + i].Clear();
-        for (int j = 0; j < *sizes; ++j, ++indices, ++weights) {
-            if (*indices < numBase) {
-                dstValues[start + i].AddWithWeight(srcBase[*indices], *weights);
-            } else {
-                dstValues[start + i].AddWithWeight(srcRef[*indices - numBase], *weights);
-            }
-        }
-    }
-}
-template <typename REAL>
-template <class T, class U> void
-StencilTableReal<REAL>::update(T const &srcValues, U &dstValues,
-    std::vector<REAL> const &valueWeights, Index start, Index end) const {
-
-    int const * sizes = &_sizes.at(0);
-    Index const * indices = &_indices.at(0);
-    REAL const * weights = &valueWeights.at(0);
-
-    if (start > 0) {
-        assert(start < (Index)_offsets.size());
-        sizes += start;
-        indices += _offsets[start];
-        weights += _offsets[start];
-    } else {
-        start = 0;
-    }
-
-    int nstencils = ((end < start) ? GetNumStencils() : end) - start;
-
-    for (int i = 0; i < nstencils; ++i, ++sizes) {
-        dstValues[start + i].Clear();
-        for (int j = 0; j < *sizes; ++j, ++indices, ++weights) {
-            dstValues[start + i].AddWithWeight(srcValues[*indices], *weights);
-        }
-    }
-}
-
-template <typename REAL>
-inline void
-StencilTableReal<REAL>::generateOffsets() {
-    Index offset=0;
-    int noffsets = (int)_sizes.size();
-    _offsets.resize(noffsets);
-    for (int i=0; i<(int)_sizes.size(); ++i ) {
-        _offsets[i]=offset;
-        offset+=_sizes[i];
-    }
-}
-
-template <typename REAL>
-inline void
-StencilTableReal<REAL>::resize(int nstencils, int nelems) {
-    _sizes.resize(nstencils);
-    _indices.resize(nelems);
-    _weights.resize(nelems);
-}
-
-template <typename REAL>
-inline void
-StencilTableReal<REAL>::reserve(int nstencils, int nelems) {
-    _sizes.reserve(nstencils);
-    _indices.reserve(nelems);
-    _weights.reserve(nelems);
-}
-
-template <typename REAL>
-inline void
-StencilTableReal<REAL>::shrinkToFit() {
-    std::vector<int>(_sizes).swap(_sizes);
-    std::vector<Index>(_indices).swap(_indices);
-    std::vector<REAL>(_weights).swap(_weights);
-}
-
-template <typename REAL>
-inline void
-StencilTableReal<REAL>::finalize() {
-    shrinkToFit();
-    generateOffsets();
-}
-
-// Returns a Stencil at index i in the table
-template <typename REAL>
-inline StencilReal<REAL>
-StencilTableReal<REAL>::GetStencil(Index i) const {
-    assert((! _offsets.empty()) && i<(int)_offsets.size());
-
-    Index ofs = _offsets[i];
-
-    return StencilReal<REAL>(const_cast<int*>(&_sizes[i]),
-                             const_cast<Index*>(&_indices[ofs]),
-                             const_cast<REAL*>(&_weights[ofs]));
-}
-
-template <typename REAL>
-inline StencilReal<REAL>
-StencilTableReal<REAL>::operator[] (Index index) const {
-    return GetStencil(index);
-}
-
-template <typename REAL>
-inline void
-LimitStencilTableReal<REAL>::resize(int nstencils, int nelems) {
-    StencilTableReal<REAL>::resize(nstencils, nelems);
-    _duWeights.resize(nelems);
-    _dvWeights.resize(nelems);
-}
-
-// Returns a LimitStencil at index i in the table
-template <typename REAL>
-inline LimitStencilReal<REAL>
-LimitStencilTableReal<REAL>::GetLimitStencil(Index i) const {
-    assert((! this->GetOffsets().empty()) && i<(int)this->GetOffsets().size());
-
-    Index ofs = this->GetOffsets()[i];
-
-    if (!_duWeights.empty() && !_dvWeights.empty() &&
-        !_duuWeights.empty() && !_duvWeights.empty() && !_dvvWeights.empty()) {
-        return LimitStencilReal<REAL>(
-                             const_cast<int *>(&this->GetSizes()[i]),
-                             const_cast<Index *>(&this->GetControlIndices()[ofs]),
-                             const_cast<REAL *>(&this->GetWeights()[ofs]),
-                             const_cast<REAL *>(&GetDuWeights()[ofs]),
-                             const_cast<REAL *>(&GetDvWeights()[ofs]),
-                             const_cast<REAL *>(&GetDuuWeights()[ofs]),
-                             const_cast<REAL *>(&GetDuvWeights()[ofs]),
-                             const_cast<REAL *>(&GetDvvWeights()[ofs]) );
-    } else if (!_duWeights.empty() && !_dvWeights.empty()) {
-        return LimitStencilReal<REAL>(
-                             const_cast<int *>(&this->GetSizes()[i]),
-                             const_cast<Index *>(&this->GetControlIndices()[ofs]),
-                             const_cast<REAL *>(&this->GetWeights()[ofs]),
-                             const_cast<REAL *>(&GetDuWeights()[ofs]),
-                             const_cast<REAL *>(&GetDvWeights()[ofs]) );
-    } else {
-        return LimitStencilReal<REAL>(
-                             const_cast<int *>(&this->GetSizes()[i]),
-                             const_cast<Index *>(&this->GetControlIndices()[ofs]),
-                             const_cast<REAL *>(&this->GetWeights()[ofs]) );
-    }
-}
-
-template <typename REAL>
-inline LimitStencilReal<REAL>
-LimitStencilTableReal<REAL>::operator[] (Index index) const {
-    return GetLimitStencil(index);
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif // OPENSUBDIV3_FAR_STENCILTABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTableFactory.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTableFactory.cpp
deleted file mode 100644
index ce152ad67..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTableFactory.cpp
+++ /dev/null
@@ -1,683 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifdef _MSC_VER
-#ifndef _USE_MATH_DEFINES
-#define _USE_MATH_DEFINES
-#endif
-#endif
-
-#include "../far/stencilTableFactory.h"
-#include "../far/stencilBuilder.h"
-#include "../far/patchTable.h"
-#include "../far/patchTableFactory.h"
-#include "../far/patchMap.h"
-#include "../far/topologyRefiner.h"
-#include "../far/primvarRefiner.h"
-
-#include <cassert>
-#include <algorithm>
-#include <iostream>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-using internal::StencilBuilder;
-
-namespace {
-#ifdef __INTEL_COMPILER
-#pragma warning (push)
-#pragma warning disable 1572
-#endif
-
-    template <typename REAL>
-    inline bool isWeightZero(REAL w) { return (w == (REAL) 0.0); }
-
-#ifdef __INTEL_COMPILER
-#pragma warning (pop)
-#endif
-}
-
-//------------------------------------------------------------------------------
-
-template <typename REAL>
-void
-StencilTableFactoryReal<REAL>::generateControlVertStencils(
-    int numControlVerts,
-    StencilReal<REAL> & dst) {
-
-    // Control vertices contribute a single index with a weight of 1.0
-    for (int i=0; i<numControlVerts; ++i) {
-        *dst._size = 1;
-        *dst._indices = i;
-        *dst._weights = (REAL) 1.0;
-        dst.Next();
-    }
-}
-
-//
-// StencilTable factory
-//
-template <typename REAL>
-StencilTableReal<REAL> const *
-StencilTableFactoryReal<REAL>::Create(TopologyRefiner const & refiner,
-    Options options) {
-
-    bool interpolateVertex = options.interpolationMode==INTERPOLATE_VERTEX;
-    bool interpolateVarying = options.interpolationMode==INTERPOLATE_VARYING;
-    bool interpolateFaceVarying = options.interpolationMode==INTERPOLATE_FACE_VARYING;
-
-    int numControlVertices = !interpolateFaceVarying
-        ? refiner.GetLevel(0).GetNumVertices()
-        : refiner.GetLevel(0).GetNumFVarValues(options.fvarChannel);
-
-    int maxlevel = std::min(int(options.maxLevel), refiner.GetMaxLevel());
-    if (maxlevel==0 && (! options.generateControlVerts)) {
-        StencilTableReal<REAL> * result = new StencilTableReal<REAL>;
-        result->_numControlVertices = numControlVertices;
-        return result;
-    }
-
-    StencilBuilder<REAL> builder(numControlVertices,
-                                /*genControlVerts*/ true,
-                                /*compactWeights*/  true);
-
-    //
-    // Interpolate stencils for each refinement level
-    //
-    PrimvarRefinerReal<REAL> primvarRefiner(refiner);
-
-    typename StencilBuilder<REAL>::Index srcIndex(&builder, 0);
-    typename StencilBuilder<REAL>::Index dstIndex(&builder, numControlVertices);
-
-    for (int level=1; level<=maxlevel; ++level) {
-        if (interpolateVertex) {
-            primvarRefiner.Interpolate(level, srcIndex, dstIndex);
-        } else if (interpolateVarying) {
-            primvarRefiner.InterpolateVarying(level, srcIndex, dstIndex);
-        } else {
-            primvarRefiner.InterpolateFaceVarying(level, srcIndex, dstIndex, options.fvarChannel);
-        }
-
-        if (options.factorizeIntermediateLevels) {
-            srcIndex = dstIndex;
-        }
-
-        int dstVertex = !interpolateFaceVarying
-            ? refiner.GetLevel(level).GetNumVertices()
-            : refiner.GetLevel(level).GetNumFVarValues(options.fvarChannel);
-        dstIndex = dstIndex[dstVertex];
-
-        if (! options.factorizeIntermediateLevels) {
-            // All previous verts are considered as coarse verts, as a
-            // result, we don't update the srcIndex and update the coarse
-            // vertex count.
-            builder.SetCoarseVertCount(dstIndex.GetOffset());
-        }
-    }
-
-    size_t firstOffset = numControlVertices;
-    if (! options.generateIntermediateLevels)
-        firstOffset = srcIndex.GetOffset();
- 
-    // Copy stencils from the StencilBuilder into the StencilTable.
-    // Always initialize numControlVertices (useful for torus case)
-    StencilTableReal<REAL> * result = 
-                        new StencilTableReal<REAL>(numControlVertices,
-                                          builder.GetStencilOffsets(),
-                                          builder.GetStencilSizes(),
-                                          builder.GetStencilSources(),
-                                          builder.GetStencilWeights(),
-                                          options.generateControlVerts,
-                                          firstOffset);
-    return result;
-}
-
-//------------------------------------------------------------------------------
-
-template <typename REAL>
-StencilTableReal<REAL> const *
-StencilTableFactoryReal<REAL>::Create(int numTables,
-    StencilTableReal<REAL> const ** tables) {
-
-    // XXXtakahito:
-    // This function returns NULL for empty inputs or erroneous condition.
-    // It's convenient for skipping varying stencils etc, however,
-    // other Create() API returns an empty stencil instead of NULL.
-    // They need to be consistent.
-
-    if ( (numTables<=0) || (! tables)) {
-        return NULL;
-    }
-
-    int ncvs = -1,
-        nstencils = 0,
-        nelems = 0;
-
-    for (int i=0; i<numTables; ++i) {
-
-        StencilTableReal<REAL> const * st = tables[i];
-        // allow the tables could have a null entry.
-        if (!st) continue;
-
-        if (ncvs >= 0 && st->GetNumControlVertices() != ncvs) {
-            return NULL;
-        }
-        ncvs = st->GetNumControlVertices();
-        nstencils += st->GetNumStencils();
-        nelems += (int)st->GetControlIndices().size();
-    }
-
-    if (ncvs == -1) {
-        return NULL;
-    }
-
-    StencilTableReal<REAL> * result = new StencilTableReal<REAL>;
-    result->resize(nstencils, nelems);
-
-    int * sizes = &result->_sizes[0];
-    Index * indices = &result->_indices[0];
-    REAL * weights = &result->_weights[0];
-    for (int i=0; i<numTables; ++i) {
-        StencilTableReal<REAL> const * st = tables[i];
-        if (!st) continue;
-
-        int st_nstencils = st->GetNumStencils(),
-            st_nelems = (int)st->_indices.size();
-        memcpy(sizes, &st->_sizes[0], st_nstencils*sizeof(int));
-        memcpy(indices, &st->_indices[0], st_nelems*sizeof(Index));
-        memcpy(weights, &st->_weights[0], st_nelems*sizeof(REAL));
-
-        sizes += st_nstencils;
-        indices += st_nelems;
-        weights += st_nelems;
-    }
-
-    result->_numControlVertices = ncvs;
-
-    // have to re-generate offsets from scratch
-    result->generateOffsets();
-
-    return result;
-}
-
-//------------------------------------------------------------------------------
-
-template <typename REAL>
-StencilTableReal<REAL> const *
-StencilTableFactoryReal<REAL>::AppendLocalPointStencilTable(
-    TopologyRefiner const &refiner,
-    StencilTableReal<REAL> const * baseStencilTable,
-    StencilTableReal<REAL> const * localPointStencilTable,
-    bool factorize) {
-
-    return appendLocalPointStencilTable(
-        refiner,
-        baseStencilTable,
-        localPointStencilTable,
-        /*channel*/-1,
-        factorize);
-}
-
-template <typename REAL>
-StencilTableReal<REAL> const *
-StencilTableFactoryReal<REAL>::AppendLocalPointStencilTableFaceVarying(
-    TopologyRefiner const &refiner,
-    StencilTableReal<REAL> const * baseStencilTable,
-    StencilTableReal<REAL> const * localPointStencilTable,
-    int channel,
-    bool factorize) {
-
-    return appendLocalPointStencilTable(
-        refiner,
-        baseStencilTable,
-        localPointStencilTable,
-        channel,
-        factorize);
-}
-
-template <typename REAL>
-StencilTableReal<REAL> const *
-StencilTableFactoryReal<REAL>::appendLocalPointStencilTable(
-    TopologyRefiner const &refiner,
-    StencilTableReal<REAL> const * baseStencilTable,
-    StencilTableReal<REAL> const * localPointStencilTable,
-    int channel,
-    bool factorize) {
-
-    // require the local point stencils exist and be non-empty
-    if ((localPointStencilTable == NULL) ||
-        (localPointStencilTable->GetNumStencils() == 0)) {
-        return NULL;
-    }
-
-    int nControlVerts = channel < 0
-        ? refiner.GetLevel(0).GetNumVertices()
-        : refiner.GetLevel(0).GetNumFVarValues(channel);
-
-    //  if no base stencils or empty, return copy of local point stencils
-    if ((baseStencilTable == NULL) ||
-        (baseStencilTable->GetNumStencils() == 0)) {
-        StencilTableReal<REAL> * result =
-                new StencilTableReal<REAL>(*localPointStencilTable);
-        result->_numControlVertices = nControlVerts;
-        return result;
-    }
-
-    // baseStencilTable can be built with or without singular stencils
-    // (single weight of 1.0f) as place-holders for coarse mesh vertices.
-
-    int controlVertsIndexOffset = 0;
-    int nBaseStencils = baseStencilTable->GetNumStencils();
-    int nBaseStencilsElements = (int)baseStencilTable->_indices.size();
-    {
-        int nverts = channel < 0
-            ? refiner.GetNumVerticesTotal()
-            : refiner.GetNumFVarValuesTotal(channel);
-        if (nBaseStencils == nverts) {
-
-            // the table contains stencils for the control vertices
-            //
-            //  <-----------------  nverts ------------------>
-            //
-            //  +---------------+----------------------------+-----------------+
-            //  | control verts | refined verts   : (max lv) |   local points  |
-            //  +---------------+----------------------------+-----------------+
-            //  |          base stencil table                |    LP stencils  |
-            //  +--------------------------------------------+-----------------+
-            //                         ^                           /
-            //                          \_________________________/
-            //
-            //
-            controlVertsIndexOffset = 0;
-
-        } else if (nBaseStencils == (nverts - nControlVerts)) {
-
-            // the table does not contain stencils for the control vertices
-            //
-            //  <-----------------  nverts ------------------>
-            //                  <------ nBaseStencils ------->
-            //  +---------------+----------------------------+-----------------+
-            //  | control verts | refined verts   : (max lv) |   local points  |
-            //  +---------------+----------------------------+-----------------+
-            //                  |     base stencil table     |    LP stencils  |
-            //                  +----------------------------+-----------------+
-            //                                 ^                   /
-            //                                  \_________________/
-            //  <-------------->
-            //                 controlVertsIndexOffset
-            //
-            controlVertsIndexOffset = nControlVerts;
-
-        } else {
-            // these are not the stencils you are looking for.
-            assert(0);
-            return NULL;
-        }
-    }
-
-    // copy all local point stencils to proto stencils, and factorize if needed.
-    int nLocalPointStencils = localPointStencilTable->GetNumStencils();
-    int nLocalPointStencilsElements = 0;
-
-    StencilBuilder<REAL> builder(nControlVerts,
-                                /*genControlVerts*/ false,
-                                /*compactWeights*/  factorize);
-    typename StencilBuilder<REAL>::Index origin(&builder, 0);
-    typename StencilBuilder<REAL>::Index dst = origin;
-    typename StencilBuilder<REAL>::Index srcIdx = origin;
-
-    for (int i = 0 ; i < nLocalPointStencils; ++i) {
-        StencilReal<REAL> src = localPointStencilTable->GetStencil(i);
-        dst = origin[i];
-        for (int j = 0; j < src.GetSize(); ++j) {
-            Index index = src.GetVertexIndices()[j];
-            REAL weight = src.GetWeights()[j];
-            if (isWeightZero<REAL>(weight)) continue;
-
-            if (factorize) {
-                dst.AddWithWeight(
-                    // subtracting controlVertsIndex if the baseStencil doesn't
-                    // include control vertices (see above diagram)
-                    // since currently local point stencils are created with
-                    // absolute indices including control (level=0) vertices.
-                    baseStencilTable->GetStencil(index - controlVertsIndexOffset),
-                    weight);
-            } else {
-                srcIdx = origin[index + controlVertsIndexOffset];
-                dst.AddWithWeight(srcIdx, weight);
-            }
-        }
-        nLocalPointStencilsElements += builder.GetNumVertsInStencil(i);
-    }
-
-    // create new stencil table
-    StencilTableReal<REAL> * result = new StencilTableReal<REAL>;
-    result->_numControlVertices = nControlVerts;
-    result->resize(nBaseStencils + nLocalPointStencils,
-                   nBaseStencilsElements + nLocalPointStencilsElements);
-
-    int* sizes = &result->_sizes[0];
-    Index * indices = &result->_indices[0];
-    REAL * weights = &result->_weights[0];
-
-    // put base stencils first
-    memcpy(sizes, &baseStencilTable->_sizes[0],
-           nBaseStencils*sizeof(int));
-    memcpy(indices, &baseStencilTable->_indices[0],
-           nBaseStencilsElements*sizeof(Index));
-    memcpy(weights, &baseStencilTable->_weights[0],
-           nBaseStencilsElements*sizeof(REAL));
-
-    sizes += nBaseStencils;
-    indices += nBaseStencilsElements;
-    weights += nBaseStencilsElements;
-
-    // endcap stencils second
-    for (int i = 0 ; i < nLocalPointStencils; ++i) {
-        int size = builder.GetNumVertsInStencil(i);
-        int idx = builder.GetStencilOffsets()[i];
-        for (int j = 0; j < size; ++j) {
-            *indices++ = builder.GetStencilSources()[idx+j];
-            *weights++ = builder.GetStencilWeights()[idx+j];
-        }
-        *sizes++ = size;
-    }
-
-    // have to re-generate offsets from scratch
-    result->generateOffsets();
-
-    return result;
-}
-
-//------------------------------------------------------------------------------
-template <typename REAL>
-LimitStencilTableReal<REAL> const *
-LimitStencilTableFactoryReal<REAL>::Create(TopologyRefiner const & refiner,
-    LocationArrayVec const & locationArrays,
-    StencilTableReal<REAL> const * cvStencilsIn,
-    PatchTable const * patchTableIn,
-    Options options) {
-
-    // Compute the total number of stencils to generate
-    int numStencils=0, numLimitStencils=0;
-    for (int i=0; i<(int)locationArrays.size(); ++i) {
-        assert(locationArrays[i].numLocations>=0);
-        numStencils += locationArrays[i].numLocations;
-    }
-    if (numStencils<=0) {
-        return 0;
-    }
-
-    bool uniform  = refiner.IsUniform();
-    int  maxlevel = refiner.GetMaxLevel();
-
-    bool interpolateVertex      = (options.interpolationMode == INTERPOLATE_VERTEX);
-    bool interpolateVarying     = (options.interpolationMode == INTERPOLATE_VARYING);
-    bool interpolateFaceVarying = (options.interpolationMode == INTERPOLATE_FACE_VARYING);
-    int  fvarChannel            = options.fvarChannel;
-
-    //
-    //  Quick sanity checks for given PatchTable and/or StencilTables:
-    //
-    int nRefinedStencils = 0;
-    if (uniform) {
-        //  Uniform stencils must include at least the last level points:
-        nRefinedStencils = interpolateFaceVarying
-                         ? refiner.GetLevel(maxlevel).GetNumFVarValues(fvarChannel)
-                         : refiner.GetLevel(maxlevel).GetNumVertices();
-    } else {
-        //  Adaptive stencils must include at least all refined points:
-        nRefinedStencils = interpolateFaceVarying
-                         ? refiner.GetNumFVarValuesTotal(fvarChannel)
-                         : refiner.GetNumVerticesTotal();
-    }
-    if (cvStencilsIn && (cvStencilsIn->GetNumStencils() < nRefinedStencils)) {
-        //  Too few stencils in given StencilTable
-        return 0;
-    }
-    if (patchTableIn && (patchTableIn->IsFeatureAdaptive() == uniform)) {
-        //  Adaptive/uniform mismatch with given PatchTable and refiner
-        return 0;
-    }
-
-    // If an appropriate StencilTable was given, use it, otherwise, create a new one
-    StencilTableReal<REAL> const * cvstencils = cvStencilsIn;
-    if (! cvstencils) {
-        //
-        // Generate stencils for the control vertices - this is necessary to
-        // properly factorize patches with control vertices at level 0 (natural
-        // regular patches, such as in a torus)
-        // note: the control vertices of the mesh are added as single-index
-        //       stencils of weight 1.0f
-        //
-        typename StencilTableFactoryReal<REAL>::Options stencilTableOptions;
-        stencilTableOptions.generateIntermediateLevels = uniform ? false :true;
-        stencilTableOptions.generateControlVerts = true;
-        stencilTableOptions.generateOffsets = true;
-        stencilTableOptions.interpolationMode = options.interpolationMode;
-        stencilTableOptions.fvarChannel = options.fvarChannel;
-
-        cvstencils = StencilTableFactoryReal<REAL>::Create(refiner, stencilTableOptions);
-    }
-
-    // If an appropriate PatchTable was given, use it, otherwise, create a new one
-    PatchTable const * patchtable = patchTableIn;
-    if (! patchtable) {
-        //
-        // Ideally we could create a sparse PatchTable here for the given
-        // Locations, but that requires inverting the ptex/base-face relation.
-        // so the caller must deal with that and provide such a PatchTable
-        //
-        PatchTableFactory::Options patchTableOptions;
-        patchTableOptions.SetPatchPrecision<REAL>();
-        patchTableOptions.includeBaseLevelIndices = true;
-        patchTableOptions.generateVaryingTables = interpolateVarying;
-        patchTableOptions.generateFVarTables = interpolateFaceVarying;
-        if (interpolateFaceVarying) {
-            patchTableOptions.includeFVarBaseLevelIndices = true;
-            patchTableOptions.numFVarChannels = 1;
-            patchTableOptions.fvarChannelIndices = &fvarChannel;
-            patchTableOptions.generateFVarLegacyLinearPatches = uniform ||
-                !refiner.GetAdaptiveOptions().considerFVarChannels;
-        }
-        patchTableOptions.SetEndCapType(
-            Far::PatchTableFactory::Options::ENDCAP_GREGORY_BASIS);
-        patchTableOptions.useInfSharpPatch = !uniform &&
-            refiner.GetAdaptiveOptions().useInfSharpPatch;
-
-        patchtable = PatchTableFactory::Create(refiner, patchTableOptions);
-    }
-
-    // Append local point stencils and further verfiy size of given StencilTable:
-    StencilTableReal<REAL> const * localstencils = 0;
-    if (interpolateVertex) {
-        localstencils = patchtable->GetLocalPointStencilTable<REAL>();
-    } else if (interpolateFaceVarying) {
-        localstencils = patchtable->GetLocalPointFaceVaryingStencilTable<REAL>(fvarChannel);
-    } else {
-        localstencils = patchtable->GetLocalPointVaryingStencilTable<REAL>();
-    }
-
-    if (localstencils && (cvstencils->GetNumStencils() == nRefinedStencils)) {
-        StencilTableReal<REAL> const *refinedstencils = cvstencils;
-        if (interpolateFaceVarying) {
-            cvstencils = StencilTableFactoryReal<REAL>::AppendLocalPointStencilTableFaceVarying(
-                    refiner, refinedstencils, localstencils, fvarChannel);
-        } else {
-            cvstencils = StencilTableFactoryReal<REAL>::AppendLocalPointStencilTable(
-                    refiner, refinedstencils, localstencils);
-        }
-        if (!cvStencilsIn) delete refinedstencils;
-    }
-
-    assert(patchtable && cvstencils);
-
-    // Create a patch-map to locate sub-patches faster
-    PatchMap patchmap( *patchtable );
-
-    //
-    // Generate limit stencils for locations
-    //
-    int nControlVertices = interpolateFaceVarying
-                         ? refiner.GetLevel(0).GetNumFVarValues(fvarChannel)
-                         : refiner.GetLevel(0).GetNumVertices();
-
-    StencilBuilder<REAL> builder(nControlVertices,
-                                /*genControlVerts*/ false,
-                                /*compactWeights*/  true);
-    typename StencilBuilder<REAL>::Index origin(&builder, 0);
-    typename StencilBuilder<REAL>::Index dst = origin;
-
-    //
-    //  Generally use the patches corresponding to the interpolation mode, but Uniform
-    //  PatchTables do not have varying patches -- use the equivalent linear vertex
-    //  patches in this case:
-    //
-    bool useVertexPatches = interpolateVertex || (interpolateVarying && uniform);
-    bool useFVarPatches   = interpolateFaceVarying;
-
-    REAL  wP[20], wDs[20], wDt[20], wDss[20], wDst[20], wDtt[20];
-
-    for (size_t i=0; i<locationArrays.size(); ++i) {
-        LocationArray const & array = locationArrays[i];
-        assert(array.ptexIdx>=0);
-
-        for (int j=0; j<array.numLocations; ++j) { // for each face we're working on
-            REAL  s = array.s[j],
-                  t = array.t[j]; // for each target (s,t) point on that face
-
-            PatchMap::Handle const * handle = 
-                                        patchmap.FindPatch(array.ptexIdx, s, t);
-            if (handle) {
-                ConstIndexArray cvs;
-                if (useVertexPatches) {
-                    cvs = patchtable->GetPatchVertices(*handle);
-                } else if (useFVarPatches) {
-                    cvs = patchtable->GetPatchFVarValues(*handle, fvarChannel);
-                } else {
-                    cvs = patchtable->GetPatchVaryingVertices(*handle);
-                }
-
-                StencilTableReal<REAL> const & src = *cvstencils;
-                dst = origin[numLimitStencils];
-
-                if (options.generate2ndDerivatives) {
-                    if (useVertexPatches) {
-                        patchtable->EvaluateBasis<REAL>(
-                                *handle, s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-                    } else if (useFVarPatches) {
-                        patchtable->EvaluateBasisFaceVarying<REAL>(
-                                *handle, s, t, wP, wDs, wDt, wDss, wDst, wDtt, fvarChannel);
-                    } else {
-                        patchtable->EvaluateBasisVarying<REAL>(
-                                *handle, s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-                    }
-
-                    dst.Clear();
-                    for (int k = 0; k < cvs.size(); ++k) {
-                        dst.AddWithWeight(src[cvs[k]], wP[k], wDs[k], wDt[k], wDss[k], wDst[k], wDtt[k]);
-                    }
-                } else if (options.generate1stDerivatives) {
-                    if (useVertexPatches) {
-                        patchtable->EvaluateBasis<REAL>(
-                                *handle, s, t, wP, wDs, wDt);
-                    } else if (useFVarPatches) {
-                        patchtable->EvaluateBasisFaceVarying<REAL>(
-                                *handle, s, t, wP, wDs, wDt, 0, 0, 0, fvarChannel);
-                    } else {
-                        patchtable->EvaluateBasisVarying<REAL>(
-                                *handle, s, t, wP, wDs, wDt);
-                    }
-
-                    dst.Clear();
-                    for (int k = 0; k < cvs.size(); ++k) {
-                        dst.AddWithWeight(src[cvs[k]], wP[k], wDs[k], wDt[k]);
-                    }
-                } else {
-                    if (useVertexPatches) {
-                        patchtable->EvaluateBasis<REAL>(
-                                *handle, s, t, wP);
-                    } else if (useFVarPatches) {
-                        patchtable->EvaluateBasisFaceVarying<REAL>(
-                                *handle, s, t, wP, 0, 0, 0, 0, 0, fvarChannel);
-                    } else {
-                        patchtable->EvaluateBasisVarying<REAL>(
-                                *handle, s, t, wP);
-                    }
-
-                    dst.Clear();
-                    for (int k = 0; k < cvs.size(); ++k) {
-                        dst.AddWithWeight(src[cvs[k]], wP[k]);
-                    }
-                }
-
-                ++numLimitStencils;
-            }
-        }
-    }
-
-    if (! cvStencilsIn) {
-        delete cvstencils;
-    }
-
-    if (! patchTableIn) {
-        delete patchtable;
-    }
-
-    //
-    // Copy the proto-stencils into the limit stencil table
-    //
-    LimitStencilTableReal<REAL> * result = new LimitStencilTableReal<REAL>(
-                                          nControlVertices,
-                                          builder.GetStencilOffsets(),
-                                          builder.GetStencilSizes(),
-                                          builder.GetStencilSources(),
-                                          builder.GetStencilWeights(),
-                                          builder.GetStencilDuWeights(),
-                                          builder.GetStencilDvWeights(),
-                                          builder.GetStencilDuuWeights(),
-                                          builder.GetStencilDuvWeights(),
-                                          builder.GetStencilDvvWeights(),
-                                          /*ctrlVerts*/false,
-                                          /*fristOffset*/0);
-    return result;
-}
-
-//
-//  Explicit instantiation for float and double:
-//
-template class StencilTableFactoryReal<float>;
-template class StencilTableFactoryReal<double>;
-
-template class LimitStencilTableFactoryReal<float>;
-template class LimitStencilTableFactoryReal<double>;
-
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTableFactory.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTableFactory.h
deleted file mode 100644
index c2e95e1c3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/stencilTableFactory.h
+++ /dev/null
@@ -1,384 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_STENCILTABLE_FACTORY_H
-#define OPENSUBDIV3_FAR_STENCILTABLE_FACTORY_H
-
-#include "../version.h"
-
-#include "../far/patchTable.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-class TopologyRefiner;
-
-template <typename REAL> class StencilReal;
-template <typename REAL> class StencilTableReal;
-
-template <typename REAL> class LimitStencilReal;
-template <typename REAL> class LimitStencilTableReal;
-
-
-/// \brief A specialized factory for StencilTable
-///
-template <typename REAL>
-class StencilTableFactoryReal {
-
-public:
-
-    enum Mode {
-        INTERPOLATE_VERTEX=0,           ///< vertex primvar stencils
-        INTERPOLATE_VARYING,            ///< varying primvar stencils
-        INTERPOLATE_FACE_VARYING        ///< face-varying primvar stencils
-    };
-
-    struct Options {
-
-        Options() : interpolationMode(INTERPOLATE_VERTEX),
-                    generateOffsets(false),
-                    generateControlVerts(false),
-                    generateIntermediateLevels(true),
-                    factorizeIntermediateLevels(true),
-                    maxLevel(10),
-                    fvarChannel(0) { }
-
-        unsigned int interpolationMode           : 2, ///< interpolation mode
-                     generateOffsets             : 1, ///< populate optional "_offsets" field
-                     generateControlVerts        : 1, ///< generate stencils for control-vertices
-                     generateIntermediateLevels  : 1, ///< vertices at all levels or highest only
-                     factorizeIntermediateLevels : 1, ///< accumulate stencil weights from control
-                                                      ///  vertices or from the stencils of the
-                                                      ///  previous level
-                     maxLevel                    : 4; ///< generate stencils up to 'maxLevel'
-        unsigned int fvarChannel;                     ///< face-varying channel to use
-                                                      ///  when generating face-varying stencils
-    };
-
-    /// \brief Instantiates StencilTable from TopologyRefiner that have been
-    ///        refined uniformly or adaptively.
-    ///
-    /// \note The factory only creates stencils for vertices that have already
-    ///       been refined in the TopologyRefiner. Use RefineUniform() or
-    ///       RefineAdaptive() before constructing the stencils.
-    ///
-    /// @param refiner  The TopologyRefiner containing the topology
-    ///
-    /// @param options  Options controlling the creation of the table
-    ///
-    static StencilTableReal<REAL> const * Create(
-                TopologyRefiner const & refiner, Options options = Options());
-
-
-    /// \brief Instantiates StencilTable by concatenating an array of existing
-    ///        stencil tables.
-    ///
-    /// \note This factory checks that the stencil tables point to the same set
-    ///       of supporting control vertices - no re-indexing is done.
-    ///       GetNumControlVertices() *must* return the same value for all input
-    ///       tables.
-    ///
-    /// @param numTables Number of input StencilTables
-    ///
-    /// @param tables    Array of input StencilTables
-    ///
-    static StencilTableReal<REAL> const * Create(
-                int numTables, StencilTableReal<REAL> const ** tables);
-
-
-    /// \brief Utility function for stencil splicing for local point stencils.
-    ///
-    /// @param refiner              The TopologyRefiner containing the topology
-    ///
-    /// @param baseStencilTable     Input StencilTable for refined vertices
-    ///
-    /// @param localPointStencilTable
-    ///                             StencilTable for the change of basis patch points.
-    ///
-    /// @param factorize            If factorize is set to true, endcap stencils will be
-    ///                             factorized with supporting vertices from baseStencil
-    ///                             table so that the endcap points can be computed
-    ///                             directly from control vertices.
-    ///
-    static StencilTableReal<REAL> const * AppendLocalPointStencilTable(
-                TopologyRefiner const &refiner,
-                StencilTableReal<REAL> const *baseStencilTable,
-                StencilTableReal<REAL> const *localPointStencilTable,
-                bool factorize = true);
-
-    /// \brief Utility function for stencil splicing for local point varying stencils.
-    ///
-    /// @param refiner              The TopologyRefiner containing the topology
-    ///
-    /// @param baseStencilTable     Input StencilTable for refined vertices
-    ///
-    /// @param localPointStencilTable
-    ///                             StencilTable for the change of basis patch points.
-    ///
-    /// @param factorize            If factorize is set to true, endcap stencils will be
-    ///                             factorized with supporting vertices from baseStencil
-    ///                             table so that the endcap points can be computed
-    ///                             directly from control vertices.
-    ///
-    static StencilTableReal<REAL> const * AppendLocalPointStencilTableVarying(
-                TopologyRefiner const &refiner,
-                StencilTableReal<REAL> const *baseStencilTable,
-                StencilTableReal<REAL> const *localPointStencilTable,
-                bool factorize = true) {
-        return AppendLocalPointStencilTable(
-                refiner, baseStencilTable, localPointStencilTable, factorize);
-    }
-
-    /// \brief Utility function for stencil splicing for local point
-    /// face-varying stencils.
-    ///
-    /// @param refiner              The TopologyRefiner containing the topology
-    ///
-    /// @param baseStencilTable     Input StencilTable for refined vertices
-    ///
-    /// @param localPointStencilTable
-    ///                             StencilTable for the change of basis patch points.
-    ///
-    /// @param channel              face-varying channel
-    ///
-    /// @param factorize            If factorize is set to true, endcap stencils will be
-    ///                             factorized with supporting vertices from baseStencil
-    ///                             table so that the endcap points can be computed
-    ///                             directly from control vertices.
-    ///
-    static StencilTableReal<REAL> const * AppendLocalPointStencilTableFaceVarying(
-                TopologyRefiner const &refiner,
-                StencilTableReal<REAL> const *baseStencilTable,
-                StencilTableReal<REAL> const *localPointStencilTable,
-                int channel = 0,
-                bool factorize = true);
-
-private:
-
-    // Generate stencils for the coarse control-vertices (single weight = 1.0f)
-    static void generateControlVertStencils(
-                int numControlVerts,
-                StencilReal<REAL> & dst);
-
-    // Internal method to splice local point stencils
-    static StencilTableReal<REAL> const * appendLocalPointStencilTable(
-                TopologyRefiner const &refiner,
-                StencilTableReal<REAL> const * baseStencilTable,
-                StencilTableReal<REAL> const * localPointStencilTable,
-                int channel,
-                bool factorize);
-};
-
-/// \brief A specialized factory for LimitStencilTable
-///
-/// The LimitStencilTableFactory creates a table of limit stencils. Limit
-/// stencils can interpolate any arbitrary location on the limit surface.
-/// The stencils will be bilinear if the surface is refined uniformly, and
-/// bicubic if feature adaptive isolation is used instead.
-///
-/// Surface locations are expressed as a combination of ptex face index and
-/// normalized (s,t) patch coordinates. The factory exposes the LocationArray
-/// struct as a container for these location descriptors.
-///
-template <typename REAL>
-class LimitStencilTableFactoryReal {
-
-public:
-
-    enum Mode {
-        INTERPOLATE_VERTEX=0,           ///< vertex primvar stencils
-        INTERPOLATE_VARYING,            ///< varying primvar stencils
-        INTERPOLATE_FACE_VARYING        ///< face-varying primvar stencils
-    };
-
-    struct Options {
-
-        Options() : interpolationMode(INTERPOLATE_VERTEX),
-                    generate1stDerivatives(true),
-                    generate2ndDerivatives(false),
-                    fvarChannel(0) { }
-
-        unsigned int interpolationMode           : 2, ///< interpolation mode
-                     generate1stDerivatives      : 1, ///< Generate weights for 1st derivatives
-                     generate2ndDerivatives      : 1; ///< Generate weights for 2nd derivatives
-        unsigned int fvarChannel;                     ///< face-varying channel to use
-    };
-
-    /// \brief Descriptor for limit surface locations
-    struct LocationArray {
-
-        LocationArray() : ptexIdx(-1), numLocations(0), s(0), t(0) { }
-
-        int ptexIdx,        ///< ptex face index
-            numLocations;   ///< number of (u,v) coordinates in the array
-
-        REAL  const * s,    ///< array of u coordinates
-                    * t;    ///< array of v coordinates
-    };
-
-    typedef std::vector<LocationArray> LocationArrayVec;
-
-    /// \brief Instantiates LimitStencilTable from a TopologyRefiner that has
-    ///        been refined either uniformly or adaptively.
-    ///
-    /// @param refiner          The TopologyRefiner containing the topology
-    ///
-    /// @param locationArrays   An array of surface location descriptors
-    ///                         (see LocationArray)
-    ///
-    /// @param cvStencils       A StencilTable generated from the TopologyRefiner
-    ///                         (Optional: prevents redundant instantiation of the
-    ///                         table if available. The given table must at least
-    ///                         contain stencils for all control points and all
-    ///                         refined points -- any stencils for local points of
-    ///                         a PatchTable must match the PatchTable provided or
-    ///                         internally generated)
-    ///
-    /// @param patchTable       A PatchTable generated from the TopologyRefiner
-    ///                         (Optional: prevents redundant instantiation of the
-    ///                         table if available. The given table must match
-    ///                         the optional StencilTable if also provided)
-    ///
-    /// @param options          Options controlling the creation of the table
-    ///
-    static LimitStencilTableReal<REAL> const * Create(
-                TopologyRefiner const & refiner,
-                LocationArrayVec const & locationArrays,
-                StencilTableReal<REAL> const * cvStencils = 0,
-                PatchTable const * patchTable = 0,
-                Options options = Options());
-
-};
-
-
-//
-//  Public wrapper classes for the templates
-//
-class Stencil;
-class StencilTable;
-
-/// \brief Stencil table factory class wrapping the template for compatibility.
-///
-class StencilTableFactory : public StencilTableFactoryReal<float> {
-private:
-    typedef StencilTableFactoryReal<float> BaseFactory;
-    typedef StencilTableReal<float>        BaseTable;
-
-public:
-    static StencilTable const * Create(
-                TopologyRefiner const & refiner, Options options = Options()) {
-
-        return static_cast<StencilTable const *>(
-                BaseFactory::Create(refiner, options));
-    }
-
-    static StencilTable const * Create(
-                int numTables, StencilTable const ** tables) {
-
-        return static_cast<StencilTable const *>(
-                BaseFactory::Create(numTables,
-                        reinterpret_cast<BaseTable const **>(tables)));
-    }
-
-    static StencilTable const * AppendLocalPointStencilTable(
-                TopologyRefiner const &refiner,
-                StencilTable const *baseStencilTable,
-                StencilTable const *localPointStencilTable,
-                bool factorize = true) {
-
-        return static_cast<StencilTable const *>(
-                BaseFactory::AppendLocalPointStencilTable(refiner,
-                        static_cast<BaseTable const *>(baseStencilTable),
-                        static_cast<BaseTable const *>(localPointStencilTable),
-                        factorize));
-    }
-
-    static StencilTable const * AppendLocalPointStencilTableVarying(
-                TopologyRefiner const &refiner,
-                StencilTable const *baseStencilTable,
-                StencilTable const *localPointStencilTable,
-                bool factorize = true) {
-
-        return static_cast<StencilTable const *>(
-                BaseFactory::AppendLocalPointStencilTableVarying(refiner,
-                        static_cast<BaseTable const *>(baseStencilTable),
-                        static_cast<BaseTable const *>(localPointStencilTable),
-                        factorize));
-    }
-
-    static StencilTable const * AppendLocalPointStencilTableFaceVarying(
-                TopologyRefiner const &refiner,
-                StencilTable const *baseStencilTable,
-                StencilTable const *localPointStencilTable,
-                int channel = 0,
-                bool factorize = true) {
-
-        return static_cast<StencilTable const *>(
-                BaseFactory::AppendLocalPointStencilTableFaceVarying(refiner,
-                        static_cast<BaseTable const *>(baseStencilTable),
-                        static_cast<BaseTable const *>(localPointStencilTable),
-                        channel, factorize));
-    }
-};
-
-class LimitStencil;
-class LimitStencilTable;
-
-/// \brief Stencil table factory class wrapping the template for compatibility.
-///
-class LimitStencilTableFactory : public LimitStencilTableFactoryReal<float> {
-private:
-    typedef LimitStencilTableFactoryReal<float> BaseFactory;
-    typedef StencilTableReal<float>             BaseTable;
-
-public:
-    static LimitStencilTable const * Create(
-                TopologyRefiner const & refiner,
-                LocationArrayVec const & locationArrays,
-                StencilTable const * cvStencils = 0,
-                PatchTable const * patchTable = 0,
-                Options options = Options()) {
-
-        return static_cast<LimitStencilTable const *>(
-                BaseFactory::Create(
-                        refiner,
-                        locationArrays,
-                        static_cast<BaseTable const *>(cvStencils),
-                        patchTable,
-                        options));
-    }
-};
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif // OPENSUBDIV3_FAR_STENCILTABLE_FACTORY_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyDescriptor.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyDescriptor.cpp
deleted file mode 100644
index 0f0d8328a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyDescriptor.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../far/topologyDescriptor.h"
-#include "../far/topologyRefinerFactory.h"
-#include "../far/topologyRefiner.h"
-
-//  Unfortunately necessary for error codes that should be more accessible...
-#include "../vtr/level.h"
-
-#include <cstdio>
-#ifdef _MSC_VER
-    #define snprintf _snprintf
-#endif
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  Definitions for TopologyDescriptor:
-//
-TopologyDescriptor::TopologyDescriptor() {
-    memset(this, 0, sizeof(TopologyDescriptor));
-}
-
-
-//
-//  Definitions/specializations for its RefinerFactory<TopologyDescriptor>:
-//
-template <>
-bool
-TopologyRefinerFactory<TopologyDescriptor>::resizeComponentTopology(
-    TopologyRefiner & refiner, TopologyDescriptor const & desc) {
-
-    setNumBaseVertices(refiner, desc.numVertices);
-    setNumBaseFaces(refiner, desc.numFaces);
-
-    for (int face=0; face<desc.numFaces; ++face) {
-
-        setNumBaseFaceVertices(refiner, face, desc.numVertsPerFace[face]);
-    }
-    return true;
-}
-
-template <>
-bool
-TopologyRefinerFactory<TopologyDescriptor>::assignComponentTopology(
-    TopologyRefiner & refiner, TopologyDescriptor const & desc) {
-
-    for (int face=0, idx=0; face<desc.numFaces; ++face) {
-
-        IndexArray dstFaceVerts = getBaseFaceVertices(refiner, face);
-
-        if (desc.isLeftHanded) {
-            dstFaceVerts[0] = desc.vertIndicesPerFace[idx++];
-            for (int vert=dstFaceVerts.size()-1; vert > 0; --vert) {
-
-                dstFaceVerts[vert] = desc.vertIndicesPerFace[idx++];
-            }
-        } else {
-            for (int vert=0; vert<dstFaceVerts.size(); ++vert) {
-
-                dstFaceVerts[vert] = desc.vertIndicesPerFace[idx++];
-            }
-        }
-    }
-    return true;
-}
-
-template <>
-bool
-TopologyRefinerFactory<TopologyDescriptor>::assignComponentTags(
-    TopologyRefiner & refiner, TopologyDescriptor const & desc) {
-
-    if ((desc.numCreases>0) && desc.creaseVertexIndexPairs && desc.creaseWeights) {
-
-        int const * vertIndexPairs = desc.creaseVertexIndexPairs;
-        for (int edge=0; edge<desc.numCreases; ++edge, vertIndexPairs+=2) {
-
-            Index idx = findBaseEdge(refiner, vertIndexPairs[0], vertIndexPairs[1]);
-
-            if (idx!=INDEX_INVALID) {
-                setBaseEdgeSharpness(refiner, idx, desc.creaseWeights[edge]);
-            } else {
-                char msg[1024];
-                snprintf(msg, 1024, "Edge %d specified to be sharp does not exist (%d, %d)",
-                    edge, vertIndexPairs[0], vertIndexPairs[1]);
-                reportInvalidTopology(Vtr::internal::Level::TOPOLOGY_INVALID_CREASE_EDGE, msg, desc);
-            }
-        }
-    }
-
-    if ((desc.numCorners>0) && desc.cornerVertexIndices && desc.cornerWeights) {
-
-        for (int vert=0; vert<desc.numCorners; ++vert) {
-
-            int idx = desc.cornerVertexIndices[vert];
-
-            if (idx >= 0 && idx < getNumBaseVertices(refiner)) {
-                setBaseVertexSharpness(refiner, idx, desc.cornerWeights[vert]);
-            } else {
-                char msg[1024];
-                snprintf(msg, 1024, "Vertex %d specified to be sharp does not exist", idx);
-                reportInvalidTopology(Vtr::internal::Level::TOPOLOGY_INVALID_CREASE_VERT, msg, desc);
-            }
-        }
-    }
-    if (desc.numHoles>0) {
-        for (int i=0; i<desc.numHoles; ++i) {
-            setBaseFaceHole(refiner, desc.holeIndices[i], true);
-        }
-    }
-    return true;
-}
-
-template <>
-bool
-TopologyRefinerFactory<TopologyDescriptor>::assignFaceVaryingTopology(
-    TopologyRefiner & refiner, TopologyDescriptor const & desc) {
-
-    if (desc.numFVarChannels>0) {
-
-        for (int channel=0; channel<desc.numFVarChannels; ++channel) {
-
-            int        numFVarValues = desc.fvarChannels[channel].numValues;
-            int const* srcFVarValues = desc.fvarChannels[channel].valueIndices;
-
-            createBaseFVarChannel(refiner, numFVarValues);
-
-            for (int face = 0, srcNext = 0; face < desc.numFaces; ++face) {
-
-                IndexArray dstFaceFVarValues = getBaseFaceFVarValues(refiner, face, channel);
-
-                if (desc.isLeftHanded) {
-                    dstFaceFVarValues[0] = srcFVarValues[srcNext++];
-                    for (int vert = dstFaceFVarValues.size() - 1; vert > 0; --vert) {
-                        
-                        dstFaceFVarValues[vert] = srcFVarValues[srcNext++];
-                    }
-                } else {
-                    for (int vert = 0; vert < dstFaceFVarValues.size(); ++vert) {
-                        
-                        dstFaceFVarValues[vert] = srcFVarValues[srcNext++];
-                    }
-                }
-            }
-        }
-    }
-    return true;
-}
-
-template <>
-void
-TopologyRefinerFactory<TopologyDescriptor>::reportInvalidTopology(
-    TopologyError /* errCode */, char const * msg, TopologyDescriptor const& /* mesh */) {
-    Warning(msg);
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyDescriptor.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyDescriptor.h
deleted file mode 100644
index aceb1049d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyDescriptor.h
+++ /dev/null
@@ -1,127 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_FAR_TOPOLOGY_DESCRIPTOR_H
-#define OPENSUBDIV3_FAR_TOPOLOGY_DESCRIPTOR_H
-
-#include "../version.h"
-
-#include "../far/topologyRefiner.h"
-#include "../far/topologyRefinerFactory.h"
-#include "../far/error.h"
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-///
-/// \brief  A simple reference to raw topology data for use with TopologyRefinerFactory
-/// 
-/// TopologyDescriptor is a simple struct containing references to raw topology data used
-/// to construct a TopologyRefiner.  It is not a requirement but a convenience for use
-/// with TopologyRefinerFactory when mesh topology is not available in an existing mesh
-/// data structure.  It should be functionally complete and simple to use, but for more
-/// demanding situations, writing a custom Factory is usually warranted.
-///
-struct TopologyDescriptor {
-
-    int           numVertices,
-                  numFaces;
-
-    int const   * numVertsPerFace;
-    Index const * vertIndicesPerFace;
-
-    int           numCreases;
-    Index const * creaseVertexIndexPairs;
-    float const * creaseWeights;
-
-    int           numCorners;
-    Index const * cornerVertexIndices;
-    float const * cornerWeights;
-        
-    int           numHoles;
-    Index const * holeIndices;
-
-    bool          isLeftHanded;
-
-    //  Face-varying data channel -- value indices correspond to vertex indices,
-    //  i.e. one for every vertex of every face:
-    //
-    struct FVarChannel {
-
-        int           numValues;
-        Index const * valueIndices;
-
-        FVarChannel() : numValues(0), valueIndices(0) { }
-    };
-        
-    int                 numFVarChannels;
-    FVarChannel const * fvarChannels;
-
-    TopologyDescriptor();
-};
-
-
-//
-//  Forward declarations of required TopologyRefinerFactory<TopologyDescriptor>
-//  specializations (defined internally):
-//
-// @cond EXCLUDE_DOXYGEN
-
-template <>
-bool
-TopologyRefinerFactory<TopologyDescriptor>::resizeComponentTopology(
-    TopologyRefiner & refiner, TopologyDescriptor const & desc);
-
-template <>
-bool
-TopologyRefinerFactory<TopologyDescriptor>::assignComponentTopology(
-    TopologyRefiner & refiner, TopologyDescriptor const & desc);
-
-template <>
-bool
-TopologyRefinerFactory<TopologyDescriptor>::assignComponentTags(
-    TopologyRefiner & refiner, TopologyDescriptor const & desc);
-
-template <>
-bool
-TopologyRefinerFactory<TopologyDescriptor>::assignFaceVaryingTopology(
-    TopologyRefiner & refiner, TopologyDescriptor const & desc);
-
-template <>
-void
-TopologyRefinerFactory<TopologyDescriptor>::reportInvalidTopology(
-    TopologyError errCode, char const * msg, TopologyDescriptor const & desc);
-
-// @endcond
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_TOPOLOGY_DESCRIPTOR_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyLevel.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyLevel.h
deleted file mode 100644
index 54212b514..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyLevel.h
+++ /dev/null
@@ -1,310 +0,0 @@
-//
-//   Copyright 2015 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_FAR_TOPOLOGY_LEVEL_H
-#define OPENSUBDIV3_FAR_TOPOLOGY_LEVEL_H
-
-#include "../version.h"
-
-#include "../vtr/level.h"
-#include "../vtr/refinement.h"
-#include "../far/types.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-///
-/// \brief An interface for accessing data in a specific level of a refined topology hierarchy.
-///
-/// TopologyLevel provides an interface to data in a specific level of a topology hierarchy.
-/// Instances of TopologyLevel are created and owned by a TopologyRefiner,
-/// which will return const-references to them.  Such references are only valid during the
-/// lifetime of the TopologyRefiner that created and returned them, and only for a given refinement,
-/// i.e. if the TopologyRefiner is re-refined, any references to TopoologyLevels are invalidated.
-///
-class TopologyLevel {
-
-public:
-    //@{
-    /// @name Methods to inspect the overall inventory of components:
-    ///
-    /// All three main component types are indexed locally within each level.  For
-    /// some topological relationships -- notably face-vertices, which is often
-    /// the only relationship of interest -- the total number of entries is also
-    /// made available.
-    ///
-
-    /// \brief Return the number of vertices in this level
-    int GetNumVertices() const     { return _level->getNumVertices(); }
-
-    /// \brief Return the number of faces in this level
-    int GetNumFaces() const        { return _level->getNumFaces(); }
-
-    /// \brief Return the number of edges in this level
-    int GetNumEdges() const        { return _level->getNumEdges(); }
-
-    /// \brief Return the total number of face-vertices, i.e. the sum of all vertices for all faces
-    int GetNumFaceVertices() const { return _level->getNumFaceVerticesTotal(); }
-    //@}
-
-    //@{
-    /// @name Methods to inspect topological relationships for individual components:
-    ///
-    /// With three main component types (vertices, faces and edges), for each of the
-    /// three components the TopologyLevel stores the incident/adjacent components of
-    /// the other two types.  So there are six relationships available for immediate
-    /// inspection.  All are accessed by methods that return an array of fixed size
-    /// containing the indices of the incident components.
-    ///
-    /// For some of the relations, i.e. those for which the incident components are
-    /// of higher order or 'contain' the component itself (e.g. a vertex has incident
-    /// faces that contain it), an additional 'local index' is available that identifies
-    /// the component within each of its neighbors.  For example, if vertex V is the k'th
-    /// vertex in some face F, then when F occurs in the set of incident vertices of V,
-    /// the local index corresponding to F will be k.  The ordering of local indices
-    /// matches the ordering of the incident component to which it corresponds.
-    //
-
-    /// \brief Access the vertices incident a given face
-    ConstIndexArray GetFaceVertices(Index f) const { return _level->getFaceVertices(f); }
-
-    /// \brief Access the edges incident a given face
-    ConstIndexArray GetFaceEdges(Index f) const    { return _level->getFaceEdges(f); }
-
-    /// \brief Access the vertices incident a given edge
-    ConstIndexArray GetEdgeVertices(Index e) const { return _level->getEdgeVertices(e); }
-
-    /// \brief Access the faces incident a given edge
-    ConstIndexArray GetEdgeFaces(Index e) const    { return _level->getEdgeFaces(e); }
-
-    /// \brief Access the faces incident a given vertex
-    ConstIndexArray GetVertexFaces(Index v) const  { return _level->getVertexFaces(v); }
-
-    /// \brief Access the edges incident a given vertex
-    ConstIndexArray GetVertexEdges(Index v) const  { return _level->getVertexEdges(v); }
-
-    /// \brief Access the local indices of a vertex with respect to its incident faces
-    ConstLocalIndexArray GetVertexFaceLocalIndices(Index v) const { return _level->getVertexFaceLocalIndices(v); }
-
-    /// \brief Access the local indices of a vertex with respect to its incident edges
-    ConstLocalIndexArray GetVertexEdgeLocalIndices(Index v) const { return _level->getVertexEdgeLocalIndices(v); }
-
-    /// \brief Access the local indices of an edge with respect to its incident faces
-    ConstLocalIndexArray GetEdgeFaceLocalIndices(Index e) const   { return _level->getEdgeFaceLocalIndices(e); }
-
-    /// \brief Identify the edge matching the given vertex pair
-    Index FindEdge(Index v0, Index v1) const { return _level->findEdge(v0, v1); }
-    //@}
-
-    //@{
-    /// @name Methods to inspect other topological properties of individual components:
-    ///
-
-    /// \brief Return if the edge is non-manifold
-    bool IsEdgeNonManifold(Index e) const   { return _level->isEdgeNonManifold(e); }
-
-    /// \brief Return if the vertex is non-manifold
-    bool IsVertexNonManifold(Index v) const { return _level->isVertexNonManifold(v); }
-
-    /// \brief Return if the edge is a boundary (only one incident face)
-    bool IsEdgeBoundary(Index e) const   { return _level->getEdgeTag(e)._boundary; }
-
-    /// \brief Return if the vertex is on a boundary (at least one incident boundary edge)
-    bool IsVertexBoundary(Index v) const { return _level->getVertexTag(v)._boundary; }
-
-    /// \brief Return if the vertex is a corner (only one incident face)
-    bool IsVertexCorner(Index v) const { return (_level->getNumVertexFaces(v) == 1); }
-
-    /// \brief Return if the valence of the vertex is regular (must be manifold)
-    ///
-    /// Note that this test only determines if the valence of the vertex is regular
-    /// with respect to the assigned subdivision scheme -- not if the neighborhood
-    /// around the vertex is regular. The latter depends on a number of factors
-    /// including the incident faces of the vertex (they must all be regular) and
-    /// the presence of sharpness at the vertex itself or its incident edges.
-    ///
-    /// The regularity of the valence is a necessary but not a sufficient condition
-    /// in determining the regularity of the neighborhood. For example, while the
-    /// valence of an interior vertex may be regular, its neighborhood is not if the
-    /// vertex was made infinitely sharp.  Conversely, a corner vertex is considered
-    /// regular by its valence but its neighborhood is not if the vertex was not made
-    /// infinitely sharp.
-    ///
-    /// Whether the valence of the vertex is regular is also a property that remains
-    /// the same for the vertex in all subdivision levels. In contrast, the regularity
-    /// of the region around the vertex may change as the presence of irregular faces
-    /// or semi-sharp features is reduced by subdivision.
-    ///
-    bool IsVertexValenceRegular(Index v) const { return !_level->getVertexTag(v)._xordinary || IsVertexCorner(v); }
-    //@}
-
-    //@{
-    /// @name Methods to inspect feature tags for individual components:
-    ///
-    /// While only a subset of components may have been tagged with features such
-    /// as sharpness, all such features have a default value and so all components
-    /// can be inspected.
-
-    /// \brief Return the sharpness assigned a given edge
-    float GetEdgeSharpness(Index e) const   { return _level->getEdgeSharpness(e); }
-
-    /// \brief Return the sharpness assigned a given vertex
-    float GetVertexSharpness(Index v) const { return _level->getVertexSharpness(v); }
-
-    /// \brief Return if the edge is infinitely-sharp
-    bool IsEdgeInfSharp(Index e) const { return _level->getEdgeTag(e)._infSharp; }
-
-    /// \brief Return if the vertex is infinitely-sharp
-    bool IsVertexInfSharp(Index v) const { return _level->getVertexTag(v)._infSharp; }
-
-    /// \brief Return if the edge is semi-sharp
-    bool IsEdgeSemiSharp(Index e) const { return _level->getEdgeTag(e)._semiSharp; }
-
-    /// \brief Return if the vertex is semi-sharp
-    bool IsVertexSemiSharp(Index v) const { return _level->getVertexTag(v)._semiSharp; }
-
-    /// \brief Return if a given face has been tagged as a hole
-    bool  IsFaceHole(Index f) const         { return _level->isFaceHole(f); }
-
-    /// \brief Return the subdivision rule assigned a given vertex specific to this level
-    Sdc::Crease::Rule GetVertexRule(Index v) const { return _level->getVertexRule(v); }
-    //@}
-
-    //@{
-    /// @name Methods to inspect face-varying data:
-    ///
-    /// Face-varying data is organized into topologically independent channels,
-    /// each with an integer identifier.  Access to face-varying data generally
-    /// requires the specification of a channel, though with a single channel
-    /// being a common situation the first/only channel will be assumed if
-    /// unspecified.
-    ///
-    /// A face-varying channel is composed of a set of values that may be shared
-    /// by faces meeting at a common vertex.  Just as there are sets of vertices
-    /// that are associated with faces by index (ranging from 0 to
-    /// num-vertices - 1), face-varying values are also referenced by index
-    /// (ranging from 0 to num-values -1).
-    ///
-    /// The face-varying values associated with a face are accessed similarly to
-    /// the way in which vertices associated with the face are accessed -- an
-    /// array of fixed size containing the indices for each corner is provided
-    /// for inspection, iteration, etc.
-    ///
-    /// When the face-varying topology around a vertex "matches", it has the
-    /// same limit properties and so results in the same limit surface when
-    /// collections of adjacent vertices match.  Like other references to
-    /// "topology", this includes consideration of sharpness.  So it may be
-    /// that face-varying values are assigned around a vertex on a boundary in
-    /// a way that appears to match, but the face-varying interpolation option
-    /// requires sharpening of that vertex in face-varying space -- the
-    /// difference in the topology of the resulting limit surfaces leading to
-    /// the query returning false for the match.  The edge case is simpler in
-    /// that it only considers continuity across the edge, not the entire
-    /// neighborhood around each end vertex.
-
-    /// \brief Return the number of face-varying channels (should be same for all levels)
-    int GetNumFVarChannels() const { return _level->getNumFVarChannels(); }
-
-    /// \brief Return the total number of face-varying values in a particular channel
-    /// (the upper bound of a face-varying value index)
-    int GetNumFVarValues(int channel = 0) const { return _level->getNumFVarValues(channel); }
-
-    /// \brief Access the face-varying values associated with a particular face
-    ConstIndexArray GetFaceFVarValues(Index f, int channel = 0) const {
-        return _level->getFaceFVarValues(f, channel);
-    }
-
-    /// \brief Return if face-varying topology around a vertex matches
-    bool DoesVertexFVarTopologyMatch(Index v, int channel = 0) const {
-        return _level->doesVertexFVarTopologyMatch(v, channel);
-    }
-
-    /// \brief Return if face-varying topology across the edge only matches
-    bool DoesEdgeFVarTopologyMatch(Index e, int channel = 0) const {
-        return _level->doesEdgeFVarTopologyMatch(e, channel);
-    }
-
-    /// \brief Return if face-varying topology around a face matches
-    bool DoesFaceFVarTopologyMatch(Index f, int channel = 0) const {
-        return _level->doesFaceFVarTopologyMatch(f, channel);
-    }
-
-    //@}
-
-    //@{
-    /// @name Methods to identify parent or child components in adjoining levels of refinement:
-
-    /// \brief Access the child faces (in the next level) of a given face
-    ConstIndexArray GetFaceChildFaces(Index f) const { return _refToChild->getFaceChildFaces(f); }
-
-    /// \brief Access the child edges (in the next level) of a given face
-    ConstIndexArray GetFaceChildEdges(Index f) const { return _refToChild->getFaceChildEdges(f); }
-
-    /// \brief Access the child edges (in the next level) of a given edge
-    ConstIndexArray GetEdgeChildEdges(Index e) const { return _refToChild->getEdgeChildEdges(e); }
-
-    /// \brief Return the child vertex (in the next level) of a given face
-    Index GetFaceChildVertex(  Index f) const { return _refToChild->getFaceChildVertex(f); }
-
-    /// \brief Return the child vertex (in the next level) of a given edge
-    Index GetEdgeChildVertex(  Index e) const { return _refToChild->getEdgeChildVertex(e); }
-
-    /// \brief Return the child vertex (in the next level) of a given vertex
-    Index GetVertexChildVertex(Index v) const { return _refToChild->getVertexChildVertex(v); }
-
-    /// \brief Return the parent face (in the previous level) of a given face
-    Index GetFaceParentFace(Index f) const { return _refToParent->getChildFaceParentFace(f); }
-    //@}
-
-    //@{
-    /// @name Debugging aides:
-
-    bool ValidateTopology() const { return _level->validateTopology(); }
-    void PrintTopology(bool children = true) const { _level->print((children && _refToChild) ? _refToChild : 0); }
-    //@}
-
-
-private:
-    friend class TopologyRefiner;
-
-    Vtr::internal::Level const *      _level;
-    Vtr::internal::Refinement const * _refToParent;
-    Vtr::internal::Refinement const * _refToChild;
-
-public:
-    //  Not intended for public use, but required by std::vector, etc...
-    TopologyLevel() { }
-    ~TopologyLevel() { }
-};
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_TOPOLOGY_LEVEL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefiner.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefiner.cpp
deleted file mode 100644
index b8ef0aeb1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefiner.cpp
+++ /dev/null
@@ -1,832 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../far/topologyRefiner.h"
-#include "../far/error.h"
-#include "../vtr/fvarLevel.h"
-#include "../vtr/sparseSelector.h"
-#include "../vtr/quadRefinement.h"
-#include "../vtr/triRefinement.h"
-
-#include <cassert>
-#include <cstdio>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  Relatively trivial construction/destruction -- the base level (level[0]) needs
-//  to be explicitly initialized after construction and refinement then applied
-//
-TopologyRefiner::TopologyRefiner(Sdc::SchemeType schemeType, Sdc::Options schemeOptions) :
-    _subdivType(schemeType),
-    _subdivOptions(schemeOptions),
-    _isUniform(true),
-    _hasHoles(false),
-    _hasIrregFaces(false),
-    _regFaceSize(Sdc::SchemeTypeTraits::GetRegularFaceSize(schemeType)),
-    _maxLevel(0),
-    _uniformOptions(0),
-    _adaptiveOptions(0),
-    _totalVertices(0),
-    _totalEdges(0),
-    _totalFaces(0),
-    _totalFaceVertices(0),
-    _maxValence(0),
-    _baseLevelOwned(true) {
-
-    //  Need to revisit allocation scheme here -- want to use smart-ptrs for these
-    //  but will probably have to settle for explicit new/delete...
-    _levels.reserve(10);
-    _levels.push_back(new Vtr::internal::Level);
-    _farLevels.reserve(10);
-    assembleFarLevels();
-}
-
-//
-//  The copy constructor is protected and used by the factory to create a new instance
-//  from only the base level of the given instance -- it does not create a full copy.
-//  So members reflecting any refinement are default-initialized while those dependent
-//  on the base level are copied or explicitly initialized after its assignment.
-//
-TopologyRefiner::TopologyRefiner(TopologyRefiner const & source) :
-    _subdivType(source._subdivType),
-    _subdivOptions(source._subdivOptions),
-    _isUniform(true),
-    _hasHoles(source._hasHoles),
-    _hasIrregFaces(source._hasIrregFaces),
-    _regFaceSize(source._regFaceSize),
-    _maxLevel(0),
-    _uniformOptions(0),
-    _adaptiveOptions(0),
-    _baseLevelOwned(false) {
-
-    _levels.reserve(10);
-    _levels.push_back(source._levels[0]);
-    initializeInventory();
-
-    _farLevels.reserve(10);
-    assembleFarLevels();
-}
-
-
-TopologyRefiner::~TopologyRefiner() {
-
-    for (int i=0; i<(int)_levels.size(); ++i) {
-        if ((i > 0) || _baseLevelOwned) delete _levels[i];
-    }
-
-    for (int i=0; i<(int)_refinements.size(); ++i) {
-        delete _refinements[i];
-    }
-}
-
-void
-TopologyRefiner::Unrefine() {
-
-    if (_levels.size()) {
-        for (int i=1; i<(int)_levels.size(); ++i) {
-            delete _levels[i];
-        }
-        _levels.resize(1);
-        initializeInventory();
-    }
-    for (int i=0; i<(int)_refinements.size(); ++i) {
-        delete _refinements[i];
-    }
-    _refinements.clear();
-    _maxLevel = 0;
-
-    assembleFarLevels();
-}
-
-
-//
-//  Initializing and updating the component inventory:
-//
-void
-TopologyRefiner::initializeInventory() {
-
-    if (_levels.size()) {
-        assert(_levels.size() == 1);
-
-        Vtr::internal::Level const & baseLevel = *_levels[0];
-
-        _totalVertices     = baseLevel.getNumVertices();
-        _totalEdges        = baseLevel.getNumEdges();
-        _totalFaces        = baseLevel.getNumFaces();
-        _totalFaceVertices = baseLevel.getNumFaceVerticesTotal();
-
-        _maxValence = baseLevel.getMaxValence();
-    } else {
-        _totalVertices     = 0;
-        _totalEdges        = 0;
-        _totalFaces        = 0;
-        _totalFaceVertices = 0;
-
-        _maxValence = 0;
-    }
-}
-
-void
-TopologyRefiner::updateInventory(Vtr::internal::Level const & newLevel) {
-
-    _totalVertices     += newLevel.getNumVertices();
-    _totalEdges        += newLevel.getNumEdges();
-    _totalFaces        += newLevel.getNumFaces();
-    _totalFaceVertices += newLevel.getNumFaceVerticesTotal();
-
-    _maxValence = std::max(_maxValence, newLevel.getMaxValence());
-}
-
-void
-TopologyRefiner::appendLevel(Vtr::internal::Level & newLevel) {
-
-    _levels.push_back(&newLevel);
-
-    updateInventory(newLevel); 
-}
-
-void
-TopologyRefiner::appendRefinement(Vtr::internal::Refinement & newRefinement) {
-
-    _refinements.push_back(&newRefinement);
-}
-
-void
-TopologyRefiner::assembleFarLevels() {
-
-    _farLevels.resize(_levels.size());
-
-    _farLevels[0]._refToParent = 0;
-    _farLevels[0]._level       = _levels[0];
-    _farLevels[0]._refToChild  = 0;
-
-    int nRefinements = (int)_refinements.size();
-    if (nRefinements) {
-        _farLevels[0]._refToChild = _refinements[0];
-
-        for (int i = 1; i < nRefinements; ++i) {
-            _farLevels[i]._refToParent = _refinements[i - 1];
-            _farLevels[i]._level       = _levels[i];
-            _farLevels[i]._refToChild  = _refinements[i];;
-        }
-
-        _farLevels[nRefinements]._refToParent = _refinements[nRefinements - 1];
-        _farLevels[nRefinements]._level       = _levels[nRefinements];
-        _farLevels[nRefinements]._refToChild  = 0;
-    }
-}
-
-
-//
-//  Accessors to the topology information:
-//
-int
-TopologyRefiner::GetNumFVarValuesTotal(int channel) const {
-    int sum = 0;
-    for (int i = 0; i < (int)_levels.size(); ++i) {
-        sum += _levels[i]->getNumFVarValues(channel);
-    }
-    return sum;
-}
-
-
-//
-//  Main refinement method -- allocating and initializing levels and refinements:
-//
-void
-TopologyRefiner::RefineUniform(UniformOptions options) {
-
-    if (_levels[0]->getNumVertices() == 0) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in TopologyRefiner::RefineUniform() -- base level is uninitialized.");
-        return;
-    }
-    if (_refinements.size()) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in TopologyRefiner::RefineUniform() -- previous refinements already applied.");
-        return;
-    }
-
-    //
-    //  Allocate the stack of levels and the refinements between them:
-    //
-    _uniformOptions = options;
-
-    _isUniform = true;
-    _maxLevel = options.refinementLevel;
-
-    Sdc::Split splitType = Sdc::SchemeTypeTraits::GetTopologicalSplitType(_subdivType);
-
-    //
-    //  Initialize refinement options for Vtr -- adjusting full-topology for the last level:
-    //
-    Vtr::internal::Refinement::Options refineOptions;
-    refineOptions._sparse         = false;
-    refineOptions._faceVertsFirst = options.orderVerticesFromFacesFirst;
-
-    for (int i = 1; i <= (int)options.refinementLevel; ++i) {
-        refineOptions._minimalTopology =
-            options.fullTopologyInLastLevel ? false : (i == (int)options.refinementLevel);
-
-        Vtr::internal::Level& parentLevel = getLevel(i-1);
-        Vtr::internal::Level& childLevel  = *(new Vtr::internal::Level);
-
-        Vtr::internal::Refinement* refinement = 0;
-        if (splitType == Sdc::SPLIT_TO_QUADS) {
-            refinement = new Vtr::internal::QuadRefinement(parentLevel, childLevel, _subdivOptions);
-        } else {
-            refinement = new Vtr::internal::TriRefinement(parentLevel, childLevel, _subdivOptions);
-        }
-        refinement->refine(refineOptions);
-
-        appendLevel(childLevel);
-        appendRefinement(*refinement);
-    }
-    assembleFarLevels();
-}
-
-//
-//  Internal utility class and function supporting feature adaptive selection of faces...
-//
-namespace internal {
-    //
-    //  FeatureMask is a simple set of bits identifying features to be selected during a level of
-    //  adaptive refinement.  Adaptive refinement options passed the Refiner are interpreted as a
-    //  specific set of features defined here.  Given options to reduce faces generated at deeper
-    //  levels, a method to "reduce" the set of features is also provided here.
-    //
-    //  This class was specifically not nested in TopologyRefiner to allow simple non-class methods
-    //  to make use of it in the core selection methods.  Those selection methods were similarly
-    //  made non-class methods to ensure they conform to the feature set defined by the FeatureMask
-    //  and not some internal class state.
-    //
-    class FeatureMask {
-    public:
-        typedef TopologyRefiner::AdaptiveOptions Options;
-        typedef unsigned int                     int_type;
-
-        void Clear()         { *((int_type*)this) = 0; }
-        bool IsEmpty() const { return *((int_type*)this) == 0; }
-
-        FeatureMask() { Clear(); }
-        FeatureMask(Options const & options, int regFaceSize) {
-            Clear();
-            InitializeFeatures(options, regFaceSize);
-        }
-
-        //  These are the two primary methods intended for use -- intialization via a set of Options
-        //  and reduction of the subsequent feature set (which presumes prior initialization with the
-        //  same set as give)
-        //
-        void InitializeFeatures(Options const & options, int regFaceSize);
-        void ReduceFeatures(    Options const & options);
-
-    public:
-        int_type selectXOrdinaryInterior : 1;
-        int_type selectXOrdinaryBoundary : 1;
-
-        int_type selectSemiSharpSingle    : 1;
-        int_type selectSemiSharpNonSingle : 1;
-
-        int_type selectInfSharpRegularCrease   : 1;
-        int_type selectInfSharpRegularCorner   : 1;
-        int_type selectInfSharpIrregularDart   : 1;
-        int_type selectInfSharpIrregularCrease : 1;
-        int_type selectInfSharpIrregularCorner : 1;
-
-        int_type selectUnisolatedInteriorEdge : 1;
-
-        int_type selectNonManifold  : 1;
-        int_type selectFVarFeatures : 1;
-    };
-
-    void
-    FeatureMask::InitializeFeatures(Options const & options, int regFaceSize) {
-
-        //
-        //  Support for the "single-crease patch" case is limited to the subdivision scheme
-        //  (currently only Catmull-Clark).  It has historically been applied to both semi-
-        //  sharp and inf-sharp creases -- the semi-sharp application is still relevant,
-        //  but the inf-sharp has been superceded.
-        //
-        //  The inf-sharp single-crease case now corresponds to an inf-sharp regular crease
-        //  in the interior -- and since such regular creases on the boundary are never
-        //  considered for selection (just as interior smoot regular faces are not), this
-        //  feature is only relevant for the interior case.  So aside from it being used
-        //  when regular inf-sharp features are all selected, it can also be used for the
-        //  single-crease case.
-        //
-        bool useSingleCreasePatch = options.useSingleCreasePatch && (regFaceSize == 4);
-
-        //  Extra-ordinary features (independent of the inf-sharp options):
-        selectXOrdinaryInterior = true;
-        selectXOrdinaryBoundary = true;
-
-        //  Semi-sharp features -- the regular single crease case and all others:
-        selectSemiSharpSingle    = !useSingleCreasePatch;
-        selectSemiSharpNonSingle = true;
-
-        //  Inf-sharp features -- boundary extra-ordinary vertices are irreg creases:
-        selectInfSharpRegularCrease   = !(options.useInfSharpPatch || useSingleCreasePatch);
-        selectInfSharpRegularCorner   = !options.useInfSharpPatch;
-        selectInfSharpIrregularDart   = true;
-        selectInfSharpIrregularCrease = true;
-        selectInfSharpIrregularCorner = true;
-
-        selectUnisolatedInteriorEdge = useSingleCreasePatch && !options.useInfSharpPatch;
-
-        selectNonManifold  = true;
-        selectFVarFeatures = options.considerFVarChannels;
-    }
-
-    void
-    FeatureMask::ReduceFeatures(Options const & options) {
-
-        //  Disable typical xordinary vertices:
-        selectXOrdinaryInterior = false;
-        selectXOrdinaryBoundary = false;
-
-        //  If minimizing inf-sharp patches, disable all but sharp/corner irregularities
-        if (options.useInfSharpPatch) {
-            selectInfSharpRegularCrease    = false;
-            selectInfSharpRegularCorner    = false;
-            selectInfSharpIrregularDart    = false;
-            selectInfSharpIrregularCrease  = false;
-        }
-    }
-} // end namespace internal
-
-void
-TopologyRefiner::RefineAdaptive(AdaptiveOptions options,
-                                ConstIndexArray baseFacesToRefine) {
-
-    if (_levels[0]->getNumVertices() == 0) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in TopologyRefiner::RefineAdaptive() -- base level is uninitialized.");
-        return;
-    }
-    if (_refinements.size()) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in TopologyRefiner::RefineAdaptive() -- previous refinements already applied.");
-        return;
-    }
-
-    //
-    //  Initialize member and local variables from the adaptive options:
-    //
-    _isUniform = false;
-    _adaptiveOptions = options;
-
-    //
-    //  Initialize the feature-selection options based on given options -- with two sets
-    //  of levels isolating different sets of features, initialize the two feature sets
-    //  up front and use the appropriate one for each level:
-    //
-    int nonLinearScheme = Sdc::SchemeTypeTraits::GetLocalNeighborhoodSize(_subdivType);
-
-    int shallowLevel = std::min<int>(options.secondaryLevel, options.isolationLevel);
-    int deeperLevel  = options.isolationLevel;
-
-    int potentialMaxLevel = nonLinearScheme ? deeperLevel : _hasIrregFaces;
-
-    internal::FeatureMask moreFeaturesMask(options, _regFaceSize);
-    internal::FeatureMask lessFeaturesMask = moreFeaturesMask;
-
-    if (shallowLevel < potentialMaxLevel) {
-        lessFeaturesMask.ReduceFeatures(options);
-    }
-
-    //
-    //  If face-varying channels are considered, make sure non-linear channels are present
-    //  and turn off consideration if none present:
-    //
-    if (moreFeaturesMask.selectFVarFeatures && nonLinearScheme) {
-        bool nonLinearChannelsPresent = false;
-        for (int channel = 0; channel < _levels[0]->getNumFVarChannels(); ++channel) {
-            nonLinearChannelsPresent |= !_levels[0]->getFVarLevel(channel).isLinear();
-        }
-        if (!nonLinearChannelsPresent) {
-            moreFeaturesMask.selectFVarFeatures = false;
-            lessFeaturesMask.selectFVarFeatures = false;
-        }
-    }
-
-    //
-    //  Initialize refinement options for Vtr -- full topology is always generated in
-    //  the last level as expected usage is for patch retrieval:
-    //
-    Vtr::internal::Refinement::Options refineOptions;
-
-    refineOptions._sparse          = true;
-    refineOptions._minimalTopology = false;
-    refineOptions._faceVertsFirst  = options.orderVerticesFromFacesFirst;
-
-    Sdc::Split splitType = Sdc::SchemeTypeTraits::GetTopologicalSplitType(_subdivType);
-
-    for (int i = 1; i <= potentialMaxLevel; ++i) {
-
-        Vtr::internal::Level& parentLevel     = getLevel(i-1);
-        Vtr::internal::Level& childLevel      = *(new Vtr::internal::Level);
-
-        Vtr::internal::Refinement* refinement = 0;
-        if (splitType == Sdc::SPLIT_TO_QUADS) {
-            refinement = new Vtr::internal::QuadRefinement(parentLevel, childLevel, _subdivOptions);
-        } else {
-            refinement = new Vtr::internal::TriRefinement(parentLevel, childLevel, _subdivOptions);
-        }
-
-        //
-        //  Initialize a Selector to mark a sparse set of components for refinement -- choose
-        //  the feature selection mask appropriate to the level:
-        //
-        Vtr::internal::SparseSelector selector(*refinement);
-
-        internal::FeatureMask const & levelFeatures = (i <= shallowLevel) ? moreFeaturesMask
-                                                                          : lessFeaturesMask;
-
-        if (i > 1) {
-            selectFeatureAdaptiveComponents(selector, levelFeatures, ConstIndexArray());
-        } else if (nonLinearScheme) {
-            selectFeatureAdaptiveComponents(selector, levelFeatures, baseFacesToRefine);
-        } else {
-            selectLinearIrregularFaces(selector, baseFacesToRefine);
-        }
-
-        if (selector.isSelectionEmpty()) {
-            delete refinement;
-            delete &childLevel;
-            break;
-        } else {
-            refinement->refine(refineOptions);
-
-            appendLevel(childLevel);
-            appendRefinement(*refinement);
-        }
-    }
-    _maxLevel = (unsigned int) _refinements.size();
-
-    assembleFarLevels();
-}
-
-//
-//  Local utility functions for selecting features in faces for adaptive refinement:
-//
-namespace {
-    //
-    //  First are a couple of low-level utility methods to perform the same analysis
-    //  at a corner or the entire face for specific detection of inf-sharp or boundary
-    //  features.  These are shared between the analysis of the main face and those in
-    //  face-varying channels (which only differ from the main face in the presence of
-    //  face-varying boundaries).
-    //
-    //  The first can be applied equally to an individual corner or to the entire face
-    //  (using its composite tag).  The second applies to the entire face, making use
-    //  of the first, and is the main entry point for dealng with inf-sharp features.
-    //
-    //  Note we can use the composite tag here even though it arises from all corners
-    //  of the face and so does not represent a specific corner.  When at least one
-    //  smooth interior vertex exists, it limits the combinations that can exist on the
-    //  remaining corners (though quads and tris cannot be treated equally here).
-    //
-    //  If any inf-sharp features are to be selected, identify them first as irregular
-    //  or not, then qualify them more specifically.  (Remember that a regular vertex
-    //  may have its neighboring faces partitioned into irregular regions in the
-    //  presence of inf-sharp edges.  Similarly an irregular vertex may have its
-    //  neighborhood partitioned into regular regions.)
-    //
-    inline bool
-    doesInfSharpVTagHaveFeatures(Vtr::internal::Level::VTag compVTag,
-                                 internal::FeatureMask const & featureMask) {
-
-        //  Note that even though the given VTag may represent an individual corner, we
-        //  use more general bitwise tests here (particularly the Rule) so that we can
-        //  pass in a composite tag for the entire face and have the same tests applied:
-        //
-        if (compVTag._infIrregular) {
-            if (compVTag._rule & Sdc::Crease::RULE_CORNER) {
-                return featureMask.selectInfSharpIrregularCorner;
-            } else if (compVTag._rule & Sdc::Crease::RULE_CREASE) {
-                return compVTag._boundary ? featureMask.selectXOrdinaryBoundary :
-                                            featureMask.selectInfSharpIrregularCrease;
-            } else if (compVTag._rule & Sdc::Crease::RULE_DART) {
-                return featureMask.selectInfSharpIrregularDart;
-            }
-        } else if (compVTag._boundary) {
-            //  Remember that regular boundary features should never be selected, except
-            //  for a boundary crease sharpened (and so a Corner) by an interior edge:
-
-            if (compVTag._rule & Sdc::Crease::RULE_CORNER) {
-                return compVTag._corner ? false : featureMask.selectInfSharpRegularCorner;
-            } else {
-                return false;
-            }
-        } else {
-            if (compVTag._rule & Sdc::Crease::RULE_CORNER) {
-                return featureMask.selectInfSharpRegularCorner;
-            } else {
-                return featureMask.selectInfSharpRegularCrease;
-            }
-        }
-        return false;
-    }
-
-    inline bool
-    doesInfSharpFaceHaveFeatures(Vtr::internal::Level::VTag compVTag,
-                                 Vtr::internal::Level::VTag vTags[], int numVerts,
-                                 internal::FeatureMask const & featureMask) {
-        //
-        //  For quads, if at least one smooth corner of a regular face, features
-        //  are isolated enough to make use of the composite tag alone (unless
-        //  boundary isolation is enabled, in which case trivially return).
-        //
-        //  For tris, the presence of boundaries creates more ambiguity, so we
-        //  need to exclude that case and inspect corner features individually.
-        //
-        bool isolateQuadBoundaries = false;
-
-        bool atLeastOneSmoothCorner = (compVTag._rule & Sdc::Crease::RULE_SMOOTH);
-        if (numVerts == 4) {
-            if (atLeastOneSmoothCorner) {
-                return doesInfSharpVTagHaveFeatures(compVTag, featureMask);
-            } else if (isolateQuadBoundaries) {
-                return true;
-            } else if (featureMask.selectUnisolatedInteriorEdge) {
-                //  Needed for single-crease approximation to inf-sharp interior edge:
-                for (int i = 0; i < 4; ++i) {
-                    if (vTags[i]._infSharpEdges && !vTags[i]._boundary) {
-                        return true;
-                    }
-                }
-            }
-        } else {
-            if (atLeastOneSmoothCorner && !compVTag._boundary) {
-                return doesInfSharpVTagHaveFeatures(compVTag, featureMask);
-            }
-        }
-
-        for (int i = 0; i < numVerts; ++i) {
-            if (!(vTags[i]._rule & Sdc::Crease::RULE_SMOOTH)) {
-                if (doesInfSharpVTagHaveFeatures(vTags[i], featureMask)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    //
-    //  This is the core method/function for analyzing a face and deciding whether or not
-    //  to included it during feature-adaptive refinement.
-    //
-    //  Topological analysis of the face exploits tags that are applied to corner vertices
-    //  and carried through the refinement hierarchy.  The tags were designed with this
-    //  in mind and also to be combined via bitwise-OR to make collective decisions about
-    //  the neighborhood of the entire face.
-    //
-    //  After a few trivial acceptances/rejections, feature detection is divided up into
-    //  semi-sharp and inf-sharp cases -- note that both may be present, but semi-sharp
-    //  features have an implicit precedence until they decay and so are handled first.
-    //  They are also fairly trivial to deal with (most often requiring selection) while
-    //  the presence of boundaries and additional options complicates the inf-sharp case.
-    //  Since the inf-sharp logic needs to be applied in face-varying cases, it exists in
-    //  a separate method.
-    //
-    //  This was originally written specific to the quad-centric Catmark scheme and was
-    //  since generalized to support Loop given the enhanced tagging of components based
-    //  on the scheme.  Any enhancements here should be aware of the intended generality.
-    //  Ultimately it may not be worth trying to keep this general and we will be better
-    //  off specializing it for each scheme.  The fact that this method is intimately tied
-    //  to patch generation also begs for it to become part of a class that encompasses
-    //  both the feature adaptive tagging and the identification of the intended patches
-    //  that result from it.
-    //
-    bool
-    doesFaceHaveFeatures(Vtr::internal::Level const& level, Index face,
-                         internal::FeatureMask const & featureMask, int regFaceSize) {
-
-        using Vtr::internal::Level;
-
-        ConstIndexArray fVerts = level.getFaceVertices(face);
-
-        //  Irregular faces (base level) are unconditionally included:
-        if (fVerts.size() != regFaceSize) {
-            return true;
-        }
-
-        //  Gather and combine the VTags:
-        Level::VTag vTags[4];
-        level.getFaceVTags(face, vTags);
-
-        Level::VTag compFaceVTag = Level::VTag::BitwiseOr(vTags, fVerts.size());
-
-        //  Faces incident irregular faces (base level) are unconditionally included:
-        if (compFaceVTag._incidIrregFace) {
-            return true;
-        }
-        //  Incomplete faces (incomplete neighborhood) are unconditionally excluded:
-        if (compFaceVTag._incomplete) {
-            return false;
-        }
-
-        //  Select non-manifold features if specified, otherwise treat as inf-sharp:
-        if (compFaceVTag._nonManifold && featureMask.selectNonManifold) {
-            return true;
-        }
-
-        //  Select (smooth) xord vertices if specified, boundaries handled with inf-sharp:
-        if (compFaceVTag._xordinary && featureMask.selectXOrdinaryInterior) {
-            if (compFaceVTag._rule == Sdc::Crease::RULE_SMOOTH) {
-                return true;
-            } else if (level.getDepth() < 2) {
-                for (int i = 0; i < fVerts.size(); ++i) {
-                    if (vTags[i]._xordinary && (vTags[i]._rule == Sdc::Crease::RULE_SMOOTH)) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        //  If all smooth corners, no remaining features to select (x-ordinary dealt with):
-        if (compFaceVTag._rule == Sdc::Crease::RULE_SMOOTH) {
-            return false;
-        }
-
-        //  Semi-sharp features -- select all immediately or test the single-crease case:
-        if (compFaceVTag._semiSharp || compFaceVTag._semiSharpEdges) {
-            if (featureMask.selectSemiSharpSingle && featureMask.selectSemiSharpNonSingle) {
-                return true;
-            } else if (level.isSingleCreasePatch(face)) {
-                return featureMask.selectSemiSharpSingle;
-            } else {
-                return featureMask.selectSemiSharpNonSingle;
-            }
-        }
-
-        //  Inf-sharp features (including boundaries) -- delegate to shared method:
-        if (compFaceVTag._infSharp || compFaceVTag._infSharpEdges) {
-            return doesInfSharpFaceHaveFeatures(compFaceVTag, vTags, fVerts.size(), featureMask);
-        }
-        return false;
-    }
-
-    //
-    //  Analyzing the face-varying topology for selection is considerably simpler that
-    //  for the face and its vertices -- in part due to the fact that these faces lie on
-    //  face-varying boundaries, and also due to assumptions about prior inspection:
-    //
-    //      - it is assumed the face topologgy does not match, so the face must lie on
-    //        a FVar boundary, i.e. inf-sharp
-    //
-    //      - it is assumed the face vertices were already inspected, so cases such as
-    //        semi-sharp or smooth interior x-ordinary features have already triggered
-    //        selection
-    //
-    //  That leaves the inspection of inf-sharp features, for the tags from the face
-    //  varying channel -- code that is shared with the main face.
-    //
-    bool
-    doesFaceHaveDistinctFaceVaryingFeatures(Vtr::internal::Level const& level, Index face,
-                                internal::FeatureMask const & featureMask, int fvarChannel) {
-
-        using Vtr::internal::Level;
-
-        ConstIndexArray fVerts = level.getFaceVertices(face);
-
-        assert(!level.doesFaceFVarTopologyMatch(face, fvarChannel));
-
-        //  We can't use the composite VTag for the face here as it only includes the FVar
-        //  values specific to this face.  We need to account for all FVar values around
-        //  each corner of the face -- including those in potentially completely disjoint
-        //  sets -- to ensure that adjacent faces remain compatibly refined (i.e. differ
-        //  by only one level), so we use the composite tags for the corner vertices:
-        //
-        Level::VTag vTags[4];
-
-        for (int i = 0; i < fVerts.size(); ++i) {
-            vTags[i] = level.getVertexCompositeFVarVTag(fVerts[i], fvarChannel);
-        }
-        Level::VTag compVTag = Level::VTag::BitwiseOr(vTags, fVerts.size());
-
-        //  Incomplete faces (incomplete neighborhood) are unconditionally excluded:
-        if (compVTag._incomplete) {
-            return false;
-        }
-
-        //  Select non-manifold features if specified, otherwise treat as inf-sharp:
-        if (compVTag._nonManifold && featureMask.selectNonManifold) {
-            return true;
-        }
-
-        //  Any remaining locally extra-ordinary face-varying boundaries warrant selection:
-        if (compVTag._xordinary && featureMask.selectXOrdinaryInterior) {
-            return true;
-        }
-
-        //  Given faces with differing FVar topology are on boundaries, defer to inf-sharp:
-        return doesInfSharpFaceHaveFeatures(compVTag, vTags, fVerts.size(), featureMask);
-    }
-
-} // end namespace
-
-//
-//   Method for selecting components for sparse refinement based on the feature-adaptive needs
-//   of patch generation.
-//
-//   It assumes we have a freshly initialized SparseSelector (i.e. nothing already selected)
-//   and will select all relevant topological features for inclusion in the subsequent sparse
-//   refinement.
-//
-void
-TopologyRefiner::selectFeatureAdaptiveComponents(Vtr::internal::SparseSelector& selector,
-                                                 internal::FeatureMask const & featureMask,
-                                                 ConstIndexArray facesToRefine) {
-
-    //
-    //  Inspect each face and the properties tagged at all of its corners:
-    //
-    Vtr::internal::Level const& level = selector.getRefinement().parent();
-
-    int numFacesToRefine = facesToRefine.size() ? facesToRefine.size() : level.getNumFaces();
-
-    int numFVarChannels = featureMask.selectFVarFeatures ? level.getNumFVarChannels() : 0;
-
-    for (int fIndex = 0; fIndex < numFacesToRefine; ++fIndex) {
-
-        Vtr::Index face = facesToRefine.size() ? facesToRefine[fIndex] : (Index) fIndex;
-
-        if (HasHoles() && level.isFaceHole(face)) continue;
-
-        //
-        //  Test if the face has any of the specified features present.  If not, and FVar
-        //  channels are to be considered, look for features in the FVar channels:
-        //
-        bool selectFace = doesFaceHaveFeatures(level, face, featureMask, _regFaceSize);
-
-        if (!selectFace && featureMask.selectFVarFeatures) {
-            for (int channel = 0; !selectFace && (channel < numFVarChannels); ++channel) {
-
-                //  Only test the face for this channel if the topology does not match:
-                if (!level.doesFaceFVarTopologyMatch(face, channel)) {
-                    selectFace = doesFaceHaveDistinctFaceVaryingFeatures(
-                                        level, face, featureMask, channel);
-                }
-            }
-        }
-        if (selectFace) {
-            selector.selectFace(face);
-        }
-    }
-}
-
-void
-TopologyRefiner::selectLinearIrregularFaces(Vtr::internal::SparseSelector& selector,
-                                            ConstIndexArray facesToRefine) {
-
-    //
-    //  Inspect each face and select only irregular faces:
-    //
-    Vtr::internal::Level const& level = selector.getRefinement().parent();
-
-    int numFacesToRefine = facesToRefine.size() ? facesToRefine.size() : level.getNumFaces();
-
-    for (int fIndex = 0; fIndex < numFacesToRefine; ++fIndex) {
-
-        Vtr::Index face = facesToRefine.size() ? facesToRefine[fIndex] : (Index) fIndex;
-
-        if (HasHoles() && level.isFaceHole(face)) continue;
-
-        if (level.getFaceVertices(face).size() != _regFaceSize) {
-            selector.selectFace(face);
-        }
-    }
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefiner.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefiner.h
deleted file mode 100644
index 5c8c6fbef..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefiner.h
+++ /dev/null
@@ -1,309 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_FAR_TOPOLOGY_REFINER_H
-#define OPENSUBDIV3_FAR_TOPOLOGY_REFINER_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-#include "../sdc/options.h"
-#include "../far/types.h"
-#include "../far/topologyLevel.h"
-
-#include <vector>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr { namespace internal { class SparseSelector; } }
-namespace Far { namespace internal { class FeatureMask; } }
-
-namespace Far {
-
-template <typename REAL> class PrimvarRefinerReal;
-template <class MESH> class TopologyRefinerFactory;
-
-///
-///  \brief Stores topology data for a specified set of refinement options.
-///
-class TopologyRefiner {
-
-public:
-
-    /// \brief Constructor
-    TopologyRefiner(Sdc::SchemeType type, Sdc::Options options = Sdc::Options());
-
-    /// \brief Destructor
-    ~TopologyRefiner();
-
-    /// \brief Returns the subdivision scheme
-    Sdc::SchemeType GetSchemeType() const    { return _subdivType; }
-
-    /// \brief Returns the subdivision options
-    Sdc::Options GetSchemeOptions() const { return _subdivOptions; }
-
-    /// \brief Returns true if uniform refinement has been applied
-    bool IsUniform() const   { return _isUniform; }
-
-    /// \brief Returns the number of refinement levels
-    int  GetNumLevels() const { return (int)_farLevels.size(); }
-
-    /// \brief Returns the highest level of refinement
-    int  GetMaxLevel() const { return _maxLevel; }
-
-    /// \brief Returns the maximum vertex valence in all levels
-    int  GetMaxValence() const { return _maxValence; }
-
-    /// \brief Returns true if faces have been tagged as holes
-    bool HasHoles() const { return _hasHoles; }
-
-    /// \brief Returns the total number of vertices in all levels
-    int GetNumVerticesTotal() const { return _totalVertices; }
-
-    /// \brief Returns the total number of edges in all levels
-    int GetNumEdgesTotal() const { return _totalEdges; }
-
-    /// \brief Returns the total number of edges in all levels
-    int GetNumFacesTotal() const { return _totalFaces; }
-
-    /// \brief Returns the total number of face vertices in all levels
-    int GetNumFaceVerticesTotal() const { return _totalFaceVertices; }
-
-    /// \brief Returns a handle to access data specific to a particular level
-    TopologyLevel const & GetLevel(int level) const { return _farLevels[level]; }
-
-    //@{
-    ///  @name High-level refinement and related methods
-    ///
-
-    //
-    // Uniform refinement
-    //
-
-    /// \brief Uniform refinement options
-    ///
-    /// Options for uniform refinement, including the number of levels, vertex
-    /// ordering and generation of topology information.
-    ///
-    /// Note the impact of the option to generate fullTopologyInLastLevel.  Given
-    /// subsequent levels of uniform refinement typically reguire 4x the data
-    /// of the previous level, only the minimum amount of data is generated in the
-    /// last level by default, i.e. a vertex and face-vertex list.  If requiring
-    /// topology traversal of the last level, e.g. inspecting edges or incident
-    /// faces of vertices, the option to generate full topology in the last
-    /// level should be enabled.
-    ///
-    struct UniformOptions {
-
-        UniformOptions(int level) :
-            refinementLevel(level & 0xf),
-            orderVerticesFromFacesFirst(false),
-            fullTopologyInLastLevel(false) { }
-
-        /// \brief Set uniform refinement level
-        void SetRefinementLevel(int level) { refinementLevel = level & 0xf; }
-
-        unsigned int refinementLevel:4,             ///< Number of refinement iterations
-                     orderVerticesFromFacesFirst:1, ///< Order child vertices from faces first
-                                                    ///< instead of child vertices of vertices
-                     fullTopologyInLastLevel:1;     ///< Skip topological relationships in the last
-                                                    ///< level of refinement that are not needed for
-                                                    ///< interpolation (keep false if using limit).
-    };
-
-    /// \brief Refine the topology uniformly
-    ///
-    /// This method applies uniform refinement to the level specified in the
-    /// given UniformOptions.
-    ///
-    /// Note the impact of the UniformOption to generate fullTopologyInLastLevel
-    /// and be sure it is assigned to satisfy the needs of the resulting refinement.
-    ///
-    /// @param options   Options controlling uniform refinement
-    ///
-    void RefineUniform(UniformOptions options);
-
-    /// \brief Returns the options specified on refinement
-    UniformOptions GetUniformOptions() const { return _uniformOptions; }
-
-    //
-    // Adaptive refinement
-    //
-
-    /// \brief Adaptive refinement options
-    struct AdaptiveOptions {
-
-        AdaptiveOptions(int level) :
-            isolationLevel(level & 0xf),
-            secondaryLevel(0xf),
-            useSingleCreasePatch(false),
-            useInfSharpPatch(false),
-            considerFVarChannels(false),
-            orderVerticesFromFacesFirst(false) { }
-
-        /// \brief Set isolation level
-        void SetIsolationLevel(int level) { isolationLevel = level & 0xf; }
-
-        /// \brief Set secondary isolation level
-        void SetSecondaryLevel(int level) { secondaryLevel = level & 0xf; }
-
-        unsigned int isolationLevel:4;              ///< Number of iterations applied to isolate
-                                                    ///< extraordinary vertices and creases
-        unsigned int secondaryLevel:4;              ///< Shallower level to stop isolation of
-                                                    ///< smooth irregular features
-        unsigned int useSingleCreasePatch:1;        ///< Use 'single-crease' patch and stop
-                                                    ///< isolation where applicable
-        unsigned int useInfSharpPatch:1;            ///< Use infinitely sharp patches and stop
-                                                    ///< isolation where applicable
-        unsigned int considerFVarChannels:1;        ///< Inspect face-varying channels and
-                                                    ///< isolate when irregular features present
-        unsigned int orderVerticesFromFacesFirst:1; ///< Order child vertices from faces first
-                                                    ///< instead of child vertices of vertices
-    };
-
-    /// \brief Feature Adaptive topology refinement
-    ///
-    /// @param options         Options controlling adaptive refinement
-    ///
-    /// @param selectedFaces   Limit adaptive refinement to the specified faces
-    ///
-    void RefineAdaptive(AdaptiveOptions options,
-                        ConstIndexArray selectedFaces = ConstIndexArray());
-
-    /// \brief Returns the options specified on refinement
-    AdaptiveOptions GetAdaptiveOptions() const { return _adaptiveOptions; }
-
-    /// \brief Unrefine the topology, keeping only the base level.
-    void Unrefine();
-
-
-    //@{
-    /// @name Number and properties of face-varying channels:
-    ///
-
-    /// \brief Returns the number of face-varying channels in the tables
-    int GetNumFVarChannels() const;
-
-    /// \brief Returns the face-varying interpolation rule set for a given channel
-    Sdc::Options::FVarLinearInterpolation GetFVarLinearInterpolation(int channel = 0) const;
-
-    /// \brief Returns the total number of face-varying values in all levels
-    int GetNumFVarValuesTotal(int channel = 0) const;
-
-    //@}
-
-protected:
-
-    //
-    //  Lower level protected methods intended strictly for internal use:
-    //
-    template <class MESH>
-    friend class TopologyRefinerFactory;
-    friend class TopologyRefinerFactoryBase;
-    friend class PatchTableBuilder;
-    friend class PatchBuilder;
-    friend class PtexIndices;
-    template <typename REAL>
-    friend class PrimvarRefinerReal;
-
-    //  Copy constructor exposed via the factory class:
-    TopologyRefiner(TopologyRefiner const & source);
-
-public:
-    //  Levels and Refinements available internally (avoids need for more friends)
-    Vtr::internal::Level & getLevel(int l) { return *_levels[l]; }
-    Vtr::internal::Level const & getLevel(int l) const { return *_levels[l]; }
-
-    Vtr::internal::Refinement & getRefinement(int l) { return *_refinements[l]; }
-    Vtr::internal::Refinement const & getRefinement(int l) const { return *_refinements[l]; }
-
-private:
-    //  Not default constructible or copyable:
-    TopologyRefiner() : _uniformOptions(0), _adaptiveOptions(0) { }
-    TopologyRefiner & operator=(TopologyRefiner const &) { return *this; }
-
-    void selectFeatureAdaptiveComponents(Vtr::internal::SparseSelector& selector,
-                                         internal::FeatureMask const & mask,
-                                         ConstIndexArray selectedFaces);
-    void selectLinearIrregularFaces(Vtr::internal::SparseSelector& selector,
-                                    ConstIndexArray selectedFaces);
-
-    void initializeInventory();
-    void updateInventory(Vtr::internal::Level const & newLevel);
-
-    void appendLevel(Vtr::internal::Level & newLevel);
-    void appendRefinement(Vtr::internal::Refinement & newRefinement);
-    void assembleFarLevels();
-
-private:
-
-    Sdc::SchemeType _subdivType;
-    Sdc::Options    _subdivOptions;
-
-    unsigned int _isUniform     : 1;
-    unsigned int _hasHoles      : 1;
-    unsigned int _hasIrregFaces : 1;
-    unsigned int _regFaceSize   : 3;
-    unsigned int _maxLevel      : 4;
-
-    //  Options assigned on refinement:
-    UniformOptions  _uniformOptions;
-    AdaptiveOptions _adaptiveOptions;
-
-    //  Cumulative properties of all levels:
-    int _totalVertices;
-    int _totalEdges;
-    int _totalFaces;
-    int _totalFaceVertices;
-    int _maxValence;
-
-    //  Note the base level may be shared with another instance
-    bool _baseLevelOwned;
-
-    std::vector<Vtr::internal::Level *>      _levels;
-    std::vector<Vtr::internal::Refinement *> _refinements;
-
-    std::vector<TopologyLevel> _farLevels;
-};
-
-
-inline int
-TopologyRefiner::GetNumFVarChannels() const {
-
-    return _levels[0]->getNumFVarChannels();
-}
-inline Sdc::Options::FVarLinearInterpolation
-TopologyRefiner::GetFVarLinearInterpolation(int channel) const {
-
-    return _levels[0]->getFVarOptions(channel).GetFVarLinearInterpolation();
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_TOPOLOGY_REFINER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefinerFactory.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefinerFactory.cpp
deleted file mode 100644
index 1e469497b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefinerFactory.cpp
+++ /dev/null
@@ -1,444 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../far/topologyRefinerFactory.h"
-#include "../far/topologyRefiner.h"
-#include "../sdc/types.h"
-#include "../vtr/level.h"
-
-#include <cstdio>
-#ifdef _MSC_VER
-    #define snprintf _snprintf
-#endif
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  Methods for the Factory base class -- general enough to warrant including
-//  in the base class rather than the subclass template (and so replicated for
-//  each usage)
-//
-//
-bool
-TopologyRefinerFactoryBase::prepareComponentTopologySizing(
-    TopologyRefiner& refiner) {
-
-    Vtr::internal::Level& baseLevel = refiner.getLevel(0);
-
-    //
-    //  At minimum we require face-vertices (the total count of which can be
-    //  determined from the offsets accumulated during sizing pass) and we
-    //  need to resize members related to them to be populated during
-    //  assignment:
-    //
-    int vCount = baseLevel.getNumVertices();
-    int fCount = baseLevel.getNumFaces();
-
-    if (vCount == 0) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in TopologyRefinerFactory<>::Create() -- "
-            "mesh contains no vertices.");
-        return false;
-    }
-    if (fCount == 0) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in TopologyRefinerFactory<>::Create() -- "
-            "meshes without faces not yet supported.");
-        return false;
-    }
-
-    //  Make sure no face was defined that would lead to a valence overflow --
-    //  the max valence has been initialized with the maximum number of
-    //  face-vertices:
-    if (baseLevel.getMaxValence() > Vtr::VALENCE_LIMIT) {
-        char msg[1024];
-        snprintf(msg, 1024,
-            "Failure in TopologyRefinerFactory<>::Create() -- "
-            "face with %d vertices > %d max.",
-            baseLevel.getMaxValence(), Vtr::VALENCE_LIMIT);
-        Error(FAR_RUNTIME_ERROR, msg);
-        return false;
-    }
-
-    int fVertCount = baseLevel.getNumFaceVertices(fCount - 1) +
-                     baseLevel.getOffsetOfFaceVertices(fCount - 1);
-
-    if (fVertCount == 0) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in TopologyRefinerFactory<>::Create() -- "
-            "mesh contains no face-vertices.");
-        return false;
-    }
-    if ((refiner.GetSchemeType() == Sdc::SCHEME_LOOP) &&
-        (fVertCount != (3 * fCount))) {
-        Error(FAR_RUNTIME_ERROR,
-            "Failure in TopologyRefinerFactory<>::Create() -- "
-            "non-triangular faces not supported by Loop scheme.");
-        return false;
-    }
-    baseLevel.resizeFaceVertices(fVertCount);
-
-    //
-    //  If edges were sized, all other topological relations must be sized
-    //  with it, in which case we allocate those members to be populated.
-    //  Otherwise, sizing of the other topology members is deferred until
-    //  the face-vertices are assigned and the resulting relationships
-    //  determined:
-    //
-    int eCount = baseLevel.getNumEdges();
-
-    if (eCount > 0) {
-        baseLevel.resizeFaceEdges(baseLevel.getNumFaceVerticesTotal());
-        baseLevel.resizeEdgeVertices();
-        baseLevel.resizeEdgeFaces(  baseLevel.getNumEdgeFaces(eCount-1)   +
-                                    baseLevel.getOffsetOfEdgeFaces(eCount-1));
-        baseLevel.resizeVertexFaces(baseLevel.getNumVertexFaces(vCount-1) +
-                                    baseLevel.getOffsetOfVertexFaces(vCount-1));
-        baseLevel.resizeVertexEdges(baseLevel.getNumVertexEdges(vCount-1) +
-                                    baseLevel.getOffsetOfVertexEdges(vCount-1));
-
-        assert(baseLevel.getNumFaceEdgesTotal() > 0);
-        assert(baseLevel.getNumEdgeVerticesTotal() > 0);
-        assert(baseLevel.getNumEdgeFacesTotal() > 0);
-        assert(baseLevel.getNumVertexFacesTotal() > 0);
-        assert(baseLevel.getNumVertexEdgesTotal() > 0);
-    }
-    return true;
-}
-
-bool
-TopologyRefinerFactoryBase::prepareComponentTopologyAssignment(
-    TopologyRefiner& refiner, bool fullValidation,
-    TopologyCallback callback, void const * callbackData) {
-
-    Vtr::internal::Level& baseLevel = refiner.getLevel(0);
-
-    bool completeMissingTopology = (baseLevel.getNumEdges() == 0);
-    if (completeMissingTopology) {
-        if (! baseLevel.completeTopologyFromFaceVertices()) {
-            char msg[1024];
-            snprintf(msg, 1024,
-                "Failure in TopologyRefinerFactory<>::Create() -- "
-                "vertex with valence %d > %d max.",
-                baseLevel.getMaxValence(), Vtr::VALENCE_LIMIT);
-            Error(FAR_RUNTIME_ERROR, msg);
-            return false;
-        }
-    } else {
-        if (baseLevel.getMaxValence() == 0) {
-            Error(FAR_RUNTIME_ERROR,
-                "Failure in TopologyRefinerFactory<>::Create() -- "
-                "maximum valence not assigned.");
-            return false;
-        }
-    }
-
-    if (fullValidation) {
-        if (! baseLevel.validateTopology(callback, callbackData)) {
-            if (completeMissingTopology) {
-                Error(FAR_RUNTIME_ERROR,
-                    "Failure in TopologyRefinerFactory<>::Create() -- "
-                    "invalid topology detected from partial specification.");
-            } else {
-                Error(FAR_RUNTIME_ERROR,
-                    "Failure in TopologyRefinerFactory<>::Create() -- "
-                    "invalid topology detected as fully specified.");
-            }
-            return false;
-        }
-    }
-
-    //  Now that we have a valid base level, initialize the Refiner's
-    //  component inventory:
-    refiner.initializeInventory();
-    return true;
-}
-
-bool
-TopologyRefinerFactoryBase::prepareComponentTagsAndSharpness(
-    TopologyRefiner& refiner) {
-
-    //
-    //  This method combines the initialization of internal component tags
-    //  with the sharpening of edges and vertices according to the given
-    //  boundary interpolation rule in the Options.
-    //  Since both involve traversing the edge and vertex lists and noting
-    //  the presence of boundaries -- best to do both at once...
-    //
-    Vtr::internal::Level&  baseLevel = refiner.getLevel(0);
-
-    Sdc::Options options = refiner.GetSchemeOptions();
-    Sdc::Crease  creasing(options);
-
-    bool makeBoundaryFacesHoles =
-        (options.GetVtxBoundaryInterpolation() ==
-            Sdc::Options::VTX_BOUNDARY_NONE) &&
-        (Sdc::SchemeTypeTraits::GetLocalNeighborhoodSize(
-            refiner.GetSchemeType()) > 0);
-
-    bool sharpenCornerVerts =
-        (options.GetVtxBoundaryInterpolation() ==
-            Sdc::Options::VTX_BOUNDARY_EDGE_AND_CORNER);
-
-    bool sharpenNonManFeatures = true;
-
-    //
-    //  Before initializing edge and vertex tags, tag any qualifying boundary
-    //  faces as holes before the sharpness of incident vertices and edges is
-    //  affected by boundary interpolation rules.
-    //
-    //  Faces will be excluded (tagged as holes) if they contain a vertex on a
-    //  boundary that did not have all of its incident boundary edges sharpened
-    //  (not just the boundary edges within the face), so inspect the vertices
-    //  and tag their incident faces when necessary:
-    //
-    if (makeBoundaryFacesHoles) {
-        for (Vtr::Index vIndex = 0; vIndex < baseLevel.getNumVertices();
-                ++vIndex) {
-            Vtr::ConstIndexArray vEdges = baseLevel.getVertexEdges(vIndex);
-            Vtr::ConstIndexArray vFaces = baseLevel.getVertexFaces(vIndex);
-
-            //  Ignore manifold interior vertices:
-            if ((vEdges.size() == vFaces.size()) &&
-                !baseLevel.getVertexTag(vIndex)._nonManifold) {
-                continue;
-            }
-
-            bool excludeFaces = false;
-            for (int i = 0; !excludeFaces && (i < vEdges.size()); ++i) {
-                excludeFaces = (baseLevel.getNumEdgeFaces(vEdges[i]) == 1) &&
-                    !Sdc::Crease::IsInfinite(
-                        baseLevel.getEdgeSharpness(vEdges[i]));
-            }
-            if (excludeFaces) {
-                for (int i = 0; i < vFaces.size(); ++i) {
-                    baseLevel.getFaceTag(vFaces[i])._hole = true;
-                }
-                //  Need to tag Refiner (the Level does not keep track of this)
-                refiner._hasHoles = true;
-            }
-        }
-    }
-
-    //
-    //  Process the Edge tags first, as Vertex tags (notably the Rule) are
-    //  dependent on properties of their incident edges.
-    //
-    for (Vtr::Index eIndex = 0; eIndex < baseLevel.getNumEdges(); ++eIndex) {
-        Vtr::internal::Level::ETag& eTag = baseLevel.getEdgeTag(eIndex);
-
-        float& eSharpness = baseLevel.getEdgeSharpness(eIndex);
-
-        eTag._boundary = (baseLevel.getNumEdgeFaces(eIndex) < 2);
-        if (eTag._boundary || (eTag._nonManifold && sharpenNonManFeatures)) {
-            eSharpness = Sdc::Crease::SHARPNESS_INFINITE;
-        }
-        eTag._infSharp  = Sdc::Crease::IsInfinite(eSharpness);
-        eTag._semiSharp = Sdc::Crease::IsSharp(eSharpness) && !eTag._infSharp;
-    }
-
-    //
-    //  Process the Vertex tags now -- for some tags (semi-sharp and its rule)
-    //  we need to inspect all incident edges:
-    //
-    int schemeRegularInteriorValence =
-        Sdc::SchemeTypeTraits::GetRegularVertexValence(refiner.GetSchemeType());
-    int schemeRegularBoundaryValence = schemeRegularInteriorValence / 2;
-
-    for (Vtr::Index vIndex = 0; vIndex < baseLevel.getNumVertices(); ++vIndex) {
-        Vtr::internal::Level::VTag& vTag = baseLevel.getVertexTag(vIndex);
-
-        float& vSharpness = baseLevel.getVertexSharpness(vIndex);
-
-        Vtr::ConstIndexArray vEdges = baseLevel.getVertexEdges(vIndex);
-        Vtr::ConstIndexArray vFaces = baseLevel.getVertexFaces(vIndex);
-
-        //
-        //  Take inventory of properties of incident edges that affect this
-        //  vertex:
-        //
-        int boundaryEdgeCount    = 0;
-        int infSharpEdgeCount    = 0;
-        int semiSharpEdgeCount   = 0;
-        int nonManifoldEdgeCount = 0;
-        for (int i = 0; i < vEdges.size(); ++i) {
-            Vtr::internal::Level::ETag const& eTag =
-                baseLevel.getEdgeTag(vEdges[i]);
-
-            boundaryEdgeCount    += eTag._boundary;
-            infSharpEdgeCount    += eTag._infSharp;
-            semiSharpEdgeCount   += eTag._semiSharp;
-            nonManifoldEdgeCount += eTag._nonManifold;
-        }
-        int sharpEdgeCount = infSharpEdgeCount + semiSharpEdgeCount;
-
-        //
-        //  Sharpen the vertex before using it in conjunction with incident edge
-        //  properties to determine the semi-sharp tag and rule:
-        //
-        bool isTopologicalCorner = (vFaces.size() == 1) && (vEdges.size() == 2);
-        bool isSharpenedCorner =  isTopologicalCorner && sharpenCornerVerts;
-        if (isSharpenedCorner) {
-            vSharpness = Sdc::Crease::SHARPNESS_INFINITE;
-        } else if (vTag._nonManifold && sharpenNonManFeatures) {
-            //
-            //  We avoid sharpening non-manifold vertices when they occur on
-            //  interior non-manifold creases, i.e. a pair of opposing non-
-            //  manifold edges with more than two incident faces.  In these
-            //  cases there are more incident faces than edges (1 more for
-            //  each additional "fin") and no boundaries.
-            //
-            if (! ((nonManifoldEdgeCount == 2) && (boundaryEdgeCount == 0) &&
-                   (vFaces.size() > vEdges.size()))) {
-                vSharpness = Sdc::Crease::SHARPNESS_INFINITE;
-            }
-        }
-
-        vTag._infSharp       = Sdc::Crease::IsInfinite(vSharpness);
-        vTag._semiSharp      = Sdc::Crease::IsSemiSharp(vSharpness);
-        vTag._semiSharpEdges = (semiSharpEdgeCount > 0);
-
-        vTag._rule = (Vtr::internal::Level::VTag::VTagSize)
-            creasing.DetermineVertexVertexRule(vSharpness, sharpEdgeCount);
-
-        //
-        //  Assign topological tags -- note that the "xordinary" tag is not
-        //  assigned if non-manifold:
-        //
-        vTag._boundary = (boundaryEdgeCount > 0);
-        vTag._corner = isTopologicalCorner && vTag._infSharp;
-        if (vTag._nonManifold) {
-            vTag._xordinary = false;
-        } else if (vTag._corner) {
-            vTag._xordinary = false;
-        } else if (vTag._boundary) {
-            vTag._xordinary = (vFaces.size() != schemeRegularBoundaryValence);
-        } else {
-            vTag._xordinary = (vFaces.size() != schemeRegularInteriorValence);
-        }
-        vTag._incomplete = 0;
-
-        //
-        //  Assign tags specific to inf-sharp features to identify regular
-        //  topologies partitioned by inf-sharp creases -- must be no semi-
-        //  harp features here (and manifold for now):
-        //
-        vTag._infSharpEdges   = (infSharpEdgeCount > 0);
-        vTag._infSharpCrease  = false;
-        vTag._infIrregular    = vTag._infSharp || vTag._infSharpEdges;
-
-        if (vTag._infSharpEdges) {
-            //  Ignore semi-sharp vertex sharpness when computing the
-            //  inf-sharp Rule:
-            Sdc::Crease::Rule infRule = creasing.DetermineVertexVertexRule(
-                (vTag._infSharp ? vSharpness : 0.0f), infSharpEdgeCount);
-
-            if (infRule == Sdc::Crease::RULE_CREASE) {
-                vTag._infSharpCrease = true;
-
-                //  A "regular" inf-crease can only occur along a manifold
-                //  regular boundary or by bisecting a manifold interior
-                //  region (it is also possible along non-manifold vertices
-                //  in some cases, but that requires much more effort to
-                //  detect -- perhaps later...)
-                //
-                if (!vTag._xordinary && !vTag._nonManifold) {
-                    if (vTag._boundary) {
-                        vTag._infIrregular = false;
-                    } else {
-                        assert((schemeRegularInteriorValence == 4) ||
-                            (schemeRegularInteriorValence == 6));
-
-                        if (schemeRegularInteriorValence == 4) {
-                            vTag._infIrregular =
-                                (baseLevel.getEdgeTag(vEdges[0])._infSharp !=
-                                 baseLevel.getEdgeTag(vEdges[2])._infSharp);
-                        } else if (schemeRegularInteriorValence == 6) {
-                            vTag._infIrregular =
-                                (baseLevel.getEdgeTag(vEdges[0])._infSharp !=
-                                 baseLevel.getEdgeTag(vEdges[3])._infSharp) ||
-                                (baseLevel.getEdgeTag(vEdges[1])._infSharp !=
-                                 baseLevel.getEdgeTag(vEdges[4])._infSharp);
-                        }
-                    }
-                }
-            } else if (infRule == Sdc::Crease::RULE_CORNER) {
-                //  A regular set of inf-corners occurs when all edges are
-                //  sharp and not a smooth corner:
-                //
-                if ((infSharpEdgeCount == vEdges.size() &&
-                    ((vEdges.size() > 2) || vTag._infSharp))) {
-                    vTag._infIrregular = false;
-                }
-            }
-        }
-
-        //
-        //  If any irregular faces are present, mark whether or not a vertex
-        //  is incident any irregular face:
-        //
-        if (refiner._hasIrregFaces) {
-            int regSize = refiner._regFaceSize;
-            for (int i = 0; i < vFaces.size(); ++i) {
-                if (baseLevel.getFaceVertices(vFaces[i]).size() != regSize) {
-                    vTag._incidIrregFace = true;
-                    break;
-                }
-            }
-        }
-    }
-    return true;
-}
-
-bool
-TopologyRefinerFactoryBase::prepareFaceVaryingChannels(
-    TopologyRefiner& refiner) {
-
-    Vtr::internal::Level& baseLevel = refiner.getLevel(0);
-
-    int regVertexValence   =
-        Sdc::SchemeTypeTraits::GetRegularVertexValence(refiner.GetSchemeType());
-    int regBoundaryValence = regVertexValence / 2;
-
-    for (int channel=0; channel<refiner.GetNumFVarChannels(); ++channel) {
-        if (baseLevel.getNumFVarValues(channel) == 0) {
-            char msg[1024];
-            snprintf(msg, 1024,
-                "Failure in TopologyRefinerFactory<>::Create() -- "
-                "face-varying channel %d has no values.", channel);
-            Error(FAR_RUNTIME_ERROR, msg);
-            return false;
-        }
-        baseLevel.completeFVarChannelTopology(channel, regBoundaryValence);
-    }
-    return true;
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefinerFactory.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefinerFactory.h
deleted file mode 100644
index 8f3358e37..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/topologyRefinerFactory.h
+++ /dev/null
@@ -1,723 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_FAR_TOPOLOGY_REFINER_FACTORY_H
-#define OPENSUBDIV3_FAR_TOPOLOGY_REFINER_FACTORY_H
-
-#include "../version.h"
-
-#include "../far/topologyRefiner.h"
-#include "../far/error.h"
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-///\brief Private base class of Factories for constructing TopologyRefiners
-///
-/// TopologyRefinerFactoryBase is the base class for subclasses that are intended to
-/// construct TopologyRefiners directly from meshes in their native representations.
-/// The subclasses are parameterized by the mesh type \<class MESH\> and are expected
-/// to inherit the details related to assembly and validation provided here that are
-/// independent of the subclass' mesh type.
-//
-class TopologyRefinerFactoryBase {
-protected:
-
-    //
-    //  Protected methods invoked by the subclass template to verify and process each
-    //  stage of construction implemented by the subclass:
-    //
-    typedef Vtr::internal::Level::ValidationCallback TopologyCallback;
-
-    static bool prepareComponentTopologySizing(TopologyRefiner& refiner);
-    static bool prepareComponentTopologyAssignment(TopologyRefiner& refiner, bool fullValidation,
-                                                   TopologyCallback callback, void const * callbackData);
-    static bool prepareComponentTagsAndSharpness(TopologyRefiner& refiner);
-    static bool prepareFaceVaryingChannels(TopologyRefiner& refiner);
-};
-
-
-///\brief Factory for constructing TopologyRefiners from specific mesh classes.
-///
-/// TopologyRefinerFactory<MESH> is the factory class template to convert an instance of
-/// TopologyRefiner from an arbitrary mesh class.  While a class template, the implementation
-/// is not (cannot) be complete, so specialization of a few methods is required (it is a
-/// stateless factory, so no instance and only static methods).
-///
-/// This template provides both the interface and high level assembly for the construction
-/// of the TopologyRefiner instance.  The high level construction executes a specific set
-/// of operations to convert the client's MESH into TopologyRefiner.  This set of operations
-/// combines methods independent of MESH from the base class with those specialized here for
-/// class MESH.
-///
-template <class MESH>
-class TopologyRefinerFactory : public TopologyRefinerFactoryBase {
-
-public:
-
-    /// \brief Options related to the construction of each TopologyRefiner.
-    ///
-    struct Options {
-
-        Options(Sdc::SchemeType sdcType = Sdc::SCHEME_CATMARK, Sdc::Options sdcOptions = Sdc::Options()) :
-            schemeType(sdcType),
-            schemeOptions(sdcOptions),
-            validateFullTopology(false) { }
-
-        Sdc::SchemeType schemeType;             ///< The subdivision scheme type identifier
-        Sdc::Options    schemeOptions;          ///< The full set of options for the scheme,
-                                                ///< e.g. boundary interpolation rules...
-        unsigned int validateFullTopology : 1;  ///< Apply more extensive validation of
-                                                ///< the constructed topology -- intended
-                                                ///< for debugging.
-    };
-
-    /// \brief Instantiates a TopologyRefiner from client-provided topological
-    ///        representation.
-    ///
-    ///  If only the face-vertices topological relationships are specified
-    ///  with this factory, edge relationships have to be inferred, which
-    ///  requires additional processing. If the client topological rep can
-    ///  provide this information, it is highly recommended to do so.
-    ///
-    /// @param mesh       Client's topological representation (or a converter)
-    //
-    /// @param options    Options controlling the creation of the TopologyRefiner
-    ///
-    /// @return           A new instance of TopologyRefiner or 0 for failure
-    ///
-    static TopologyRefiner* Create(MESH const& mesh, Options options = Options());
-
-    /// \brief Instantiates a TopologyRefiner from the base level of an
-    ///        existing instance.
-    ///
-    ///  This allows lightweight copies of the same topology to be refined
-    ///  differently for each new instance.  As with other classes that refer
-    ///  to an existing TopologyRefiner, it must generally exist for the entire
-    ///  lifetime of the new instance.  In this case, the base level of the
-    ///  original instance must be preserved.
-    ///
-    /// @param baseLevel  An existing TopologyRefiner to share base level.
-    ///
-    /// @return           A new instance of TopologyRefiner or 0 for failure
-    ///
-    static TopologyRefiner* Create(TopologyRefiner const & baseLevel);
-
-protected:
-    typedef Vtr::internal::Level::TopologyError TopologyError;
-
-    //@{
-    ///  @name  Methods to be provided to complete assembly of the TopologyRefiner
-    ///
-    ///
-    ///  These methods are to be specialized to implement all details specific to
-    ///  class MESH required to convert MESH data to TopologyRefiner.  Note that
-    ///  some of these *must* be specialized in order to complete construction while
-    ///  some are optional.
-    ///
-    ///  There are two minimal construction requirements (to specify the size and
-    ///  content of all topology relations) and three optional (to specify feature
-    ///  tags, face-varying data, and runtime validation and error reporting).
-    ///
-    ///  See comments in the generic stubs, the factory for Far::TopologyDescriptor
-    ///  or the tutorials for more details on writing these.
-    ///
-
-    /// \brief  Specify the number of vertices, faces, face-vertices, etc.
-    static bool resizeComponentTopology(TopologyRefiner& newRefiner, MESH const& mesh);
-
-    /// \brief  Specify the relationships between vertices, faces, etc. ie the
-    /// face-vertices, vertex-faces, edge-vertices, etc.
-    static bool assignComponentTopology(TopologyRefiner& newRefiner, MESH const& mesh);
-
-    /// \brief  (Optional) Specify edge or vertex sharpness or face holes
-    static bool assignComponentTags(TopologyRefiner& newRefiner, MESH const& mesh);
-
-    /// \brief  (Optional) Specify face-varying data per face
-    static bool assignFaceVaryingTopology(TopologyRefiner& newRefiner, MESH const& mesh);
-
-    /// \brief  (Optional) Control run-time topology validation and error reporting
-    static void reportInvalidTopology(TopologyError errCode, char const * msg, MESH const& mesh);
-
-    //@}
-
-protected:
-    //@{
-    ///  @name  Base level assembly methods to be used within resizeComponentTopology()
-    ///
-    /// \brief These methods specify sizes of various quantities, e.g. the number of
-    ///  vertices, faces, face-vertices, etc.  The number of the primary components
-    ///  (vertices, faces and edges) should be specified prior to anything else that
-    ///  references them (e.g. we need to know the number of faces before specifying
-    ///  the vertices for that face.
-    ///
-    ///  If a full boundary representation with all neighborhood information is not
-    ///  available, e.g. faces and vertices are available but not edges, only the
-    ///  face-vertices should be specified.  The remaining topological relationships
-    ///  will be constructed later in the assembly (though at greater cost than if
-    ///  specified directly).
-    ///
-    ///  The sizes for topological relationships between individual components should be
-    ///  specified in order, i.e. the number of face-vertices for each successive face.
-    ///
-
-    /// \brief Specify the number of vertices to be accommodated
-    static void setNumBaseVertices(TopologyRefiner & newRefiner, int count);
-
-    /// \brief Specify the number of faces to be accommodated
-    static void setNumBaseFaces(TopologyRefiner & newRefiner, int count);
-
-    /// \brief Specify the number of edges to be accommodated
-    static void setNumBaseEdges(TopologyRefiner & newRefiner, int count);
-
-    /// \brief Specify the number of vertices incident each face
-    static void setNumBaseFaceVertices(TopologyRefiner & newRefiner, Index f, int count);
-
-    /// \brief Specify the number of faces incident each edge
-    static void setNumBaseEdgeFaces(TopologyRefiner & newRefiner, Index e, int count);
-
-    /// \brief Specify the number of faces incident each vertex
-    static void setNumBaseVertexFaces(TopologyRefiner & newRefiner, Index v, int count);
-
-    /// \brief Specify the number of edges incident each vertex
-    static void setNumBaseVertexEdges(TopologyRefiner & newRefiner, Index v, int count);
-
-    static int getNumBaseVertices(TopologyRefiner const & newRefiner);
-    static int getNumBaseFaces(TopologyRefiner const & newRefiner);
-    static int getNumBaseEdges(TopologyRefiner const & newRefiner);
-    //@}
-
-    //@{
-    ///  @name  Base level assembly methods to be used within assignComponentTopology()
-    ///
-    /// \brief These methods populate relationships between components -- in much the
-    /// same manner as they are inspected once the TopologyRefiner is completed.
-    ///
-    /// An array of fixed size is returned from these methods and its entries are to be
-    /// populated with the appropriate indices for its neighbors.  At minimum, the
-    /// vertices for each face must be specified.  As noted previously, the remaining
-    /// relationships will be constructed as needed.
-    ///
-    /// The ordering of entries in these arrays is important -- they are expected to
-    /// be ordered counter-clockwise for a right-hand orientation.
-    ///
-    /// Non-manifold components must be explicitly tagged as such and they do not
-    /// require the ordering expected of manifold components.  Special consideration
-    /// must also be given to certain non-manifold situations, e.g. the same edge
-    /// cannot appear twice in a face, and a degenerate edge (same vertex at both
-    /// ends) can only have one incident face.  Such considerations are typically
-    /// achievable by creating multiple instances of an edge.  So while there will
-    /// always be a one-to-one correspondence between vertices and faces, the same
-    /// is not guaranteed of edges in certain non-manifold circumstances.
-    ///
-
-    /// \brief Assign the vertices incident each face
-    static IndexArray getBaseFaceVertices(TopologyRefiner & newRefiner, Index f);
-
-    /// \brief Assign the edges incident each face
-    static IndexArray getBaseFaceEdges(TopologyRefiner & newRefiner,    Index f);
-
-    /// \brief Assign the vertices incident each edge
-    static IndexArray getBaseEdgeVertices(TopologyRefiner & newRefiner, Index e);
-
-    /// \brief Assign the faces incident each edge
-    static IndexArray getBaseEdgeFaces(TopologyRefiner & newRefiner,    Index e);
-
-    /// \brief Assign the faces incident each vertex
-    static IndexArray getBaseVertexFaces(TopologyRefiner & newRefiner,  Index v);
-
-    /// \brief Assign the edges incident each vertex
-    static IndexArray getBaseVertexEdges(TopologyRefiner & newRefiner,  Index v);
-
-    /// \brief Assign the local indices of a vertex within each of its incident faces
-    static LocalIndexArray getBaseVertexFaceLocalIndices(TopologyRefiner & newRefiner, Index v);
-    /// \brief Assign the local indices of a vertex within each of its incident edges
-    static LocalIndexArray getBaseVertexEdgeLocalIndices(TopologyRefiner & newRefiner, Index v);
-    /// \brief Assign the local indices of an edge within each of its incident faces
-    static LocalIndexArray getBaseEdgeFaceLocalIndices(TopologyRefiner & newRefiner, Index e);
-
-    /// \brief Determine all local indices by inspection (only for pure manifold meshes)
-    static void populateBaseLocalIndices(TopologyRefiner & newRefiner);
-
-    /// \brief Tag an edge as non-manifold
-    static void setBaseEdgeNonManifold(TopologyRefiner & newRefiner, Index e, bool b);
-
-    /// \brief Tag a vertex as non-manifold
-    static void setBaseVertexNonManifold(TopologyRefiner & newRefiner, Index v, bool b);
-    //@}
-
-    //@{
-    ///  @name  Base level assembly methods to be used within assignComponentTags()
-    ///
-    /// These methods are used to assign edge or vertex sharpness, for tagging faces
-    /// as holes, etc.  Unlike topological assignment, only those components that
-    /// possess a feature of interest need be explicitly assigned.
-    ///
-    /// Since topological construction is largely complete by this point, a method is
-    /// available to identify an edge for sharpness assignment given a pair of vertices.
-    ///
-
-    /// \brief Identify an edge to be assigned a sharpness value given a vertex pair
-    static Index findBaseEdge(TopologyRefiner const & newRefiner, Index v0, Index v1);
-
-    /// \brief Assign a sharpness value to a given edge
-    static void setBaseEdgeSharpness(TopologyRefiner & newRefiner, Index e, float sharpness);
-
-    /// \brief Assign a sharpness value to a given vertex
-    static void setBaseVertexSharpness(TopologyRefiner & newRefiner, Index v, float sharpness);
-
-    /// \brief Tag a face as a hole
-    static void setBaseFaceHole(TopologyRefiner & newRefiner, Index f, bool isHole);
-    //@}
-
-    //@{
-    ///  @name  Base level assembly methods to be used within assignFaceVaryingTopology()
-    ///
-    /// Face-varying data is assigned to faces in much the same way as face-vertex
-    /// topology is assigned -- indices for face-varying values are assigned to the
-    /// corners of each face just as indices for vertices were assigned.
-    ///
-    /// Independent sets of face-varying data are stored in channels.  The identifier
-    /// of each channel (an integer) is expected whenever referring to face-varying
-    /// data in any form.
-    ///
-
-    /// \brief  Create a new face-varying channel with the given number of values
-    static int createBaseFVarChannel(TopologyRefiner & newRefiner, int numValues);
-
-    /// \brief  Create a new face-varying channel with the given number of values and independent interpolation options
-    static int createBaseFVarChannel(TopologyRefiner & newRefiner, int numValues, Sdc::Options const& fvarOptions);
-
-    /// \brief Assign the face-varying values for the corners of each face
-    static IndexArray getBaseFaceFVarValues(TopologyRefiner & newRefiner, Index face, int channel = 0);
-
-    //@}
-
-protected:
-    //
-    //  Not to be specialized:
-    //
-    static bool populateBaseLevel(TopologyRefiner& refiner, MESH const& mesh, Options options);
-
-private:
-    //
-    //  An oversight in the interfaces of the error reporting function between the factory
-    //  class and the Vtr::Level requires this adapter function to avoid warnings.
-    //
-    //  The static class method requires a reference as the MESH argument, but the interface
-    //  for Vtr::Level requires a pointer (void*). So this adapter with a MESH* argument is
-    //  used to effectively cast the function pointer required by Vtr::Level error reporting:
-    //
-    static void reportInvalidTopologyAdapter(TopologyError errCode, char const * msg, MESH const * mesh) {
-        reportInvalidTopology(errCode, msg, *mesh);
-    }
-};
-
-
-//
-//  Generic implementations:
-//
-template <class MESH>
-TopologyRefiner*
-TopologyRefinerFactory<MESH>::Create(MESH const& mesh, Options options) {
-
-    TopologyRefiner * refiner = new TopologyRefiner(options.schemeType, options.schemeOptions);
-
-    if (! populateBaseLevel(*refiner, mesh, options)) {
-        delete refiner;
-        return 0;
-    }
-
-    //  Eventually want to move the Refiner's inventory initialization here.  Currently it
-    //  is handled after topology assignment, but if the inventory is to include additional
-    //  features (e.g. holes, etc.) it is better off deferred to here.
-
-    return refiner;
-}
-
-template <class MESH>
-TopologyRefiner*
-TopologyRefinerFactory<MESH>::Create(TopologyRefiner const & source) {
-
-    return new TopologyRefiner(source);
-}
-
-template <class MESH>
-bool
-TopologyRefinerFactory<MESH>::populateBaseLevel(TopologyRefiner& refiner, MESH const& mesh, Options options) {
-
-    //
-    //  Construction of a specialized topology refiner involves four steps, each of which
-    //  involves a method specialized for MESH followed by one that takes an action in
-    //  response to it or in preparation for the next step.
-    //
-    //  Both the specialized methods and those that follow them may find fault in the
-    //  construction and trigger failure at any time:
-    //
-
-    //
-    //  Sizing of the topology -- this is a required specialization for MESH.  This defines
-    //  an inventory of all components and their relations that is used to allocate buffers
-    //  to be efficiently populated in the subsequent topology assignment step.
-    //
-    if (! resizeComponentTopology(refiner, mesh)) return false;
-    if (! prepareComponentTopologySizing(refiner)) return false;
-
-    //
-    //  Assignment of the topology -- this is a required specialization for MESH.  If edges
-    //  are specified, all other topological relations are expected to be defined for them.
-    //  Otherwise edges and remaining topology will be completed from the face-vertices:
-    //
-    bool             validate = options.validateFullTopology;
-    TopologyCallback callback = reinterpret_cast<TopologyCallback>(reportInvalidTopologyAdapter);
-    void const *     userData = &mesh;
-        
-    if (! assignComponentTopology(refiner, mesh)) return false;
-    if (! prepareComponentTopologyAssignment(refiner, validate, callback, userData)) return false;
-
-    //
-    //  User assigned and internal tagging of components -- an optional specialization for
-    //  MESH.  Allows the specification of sharpness values, holes, etc.
-    //
-    if (! assignComponentTags(refiner, mesh)) return false;
-    if (! prepareComponentTagsAndSharpness(refiner)) return false;
-
-    //
-    //  Defining channels of face-varying primvar data -- an optional specialization for MESH.
-    //
-    if (! assignFaceVaryingTopology(refiner, mesh)) return false;
-    if (! prepareFaceVaryingChannels(refiner)) return false;
-
-    return true;
-}
-
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setNumBaseFaces(TopologyRefiner & newRefiner, int count) {
-    newRefiner._levels[0]->resizeFaces(count);
-}
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setNumBaseEdges(TopologyRefiner & newRefiner, int count) {
-    newRefiner._levels[0]->resizeEdges(count);
-}
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setNumBaseVertices(TopologyRefiner & newRefiner, int count) {
-    newRefiner._levels[0]->resizeVertices(count);
-}
-
-template <class MESH>
-inline int
-TopologyRefinerFactory<MESH>::getNumBaseFaces(TopologyRefiner const & newRefiner) {
-    return newRefiner._levels[0]->getNumFaces();
-}
-template <class MESH>
-inline int
-TopologyRefinerFactory<MESH>::getNumBaseEdges(TopologyRefiner const & newRefiner) {
-    return newRefiner._levels[0]->getNumEdges();
-}
-template <class MESH>
-inline int
-TopologyRefinerFactory<MESH>::getNumBaseVertices(TopologyRefiner const & newRefiner) {
-    return newRefiner._levels[0]->getNumVertices();
-}
-
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setNumBaseFaceVertices(TopologyRefiner & newRefiner, Index f, int count) {
-    newRefiner._levels[0]->resizeFaceVertices(f, count);
-    newRefiner._hasIrregFaces = newRefiner._hasIrregFaces || (count != newRefiner._regFaceSize);
-}
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setNumBaseEdgeFaces(TopologyRefiner & newRefiner, Index e, int count) {
-    newRefiner._levels[0]->resizeEdgeFaces(e, count);
-}
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setNumBaseVertexFaces(TopologyRefiner & newRefiner, Index v, int count) {
-    newRefiner._levels[0]->resizeVertexFaces(v, count);
-}
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setNumBaseVertexEdges(TopologyRefiner & newRefiner, Index v, int count) {
-    newRefiner._levels[0]->resizeVertexEdges(v, count);
-}
-
-template <class MESH>
-inline IndexArray
-TopologyRefinerFactory<MESH>::getBaseFaceVertices(TopologyRefiner & newRefiner, Index f) {
-    return newRefiner._levels[0]->getFaceVertices(f);
-}
-template <class MESH>
-inline IndexArray
-TopologyRefinerFactory<MESH>::getBaseFaceEdges(TopologyRefiner & newRefiner,    Index f) {
-    return newRefiner._levels[0]->getFaceEdges(f);
-}
-template <class MESH>
-inline IndexArray
-TopologyRefinerFactory<MESH>::getBaseEdgeVertices(TopologyRefiner & newRefiner, Index e) {
-    return newRefiner._levels[0]->getEdgeVertices(e);
-}
-template <class MESH>
-inline IndexArray
-TopologyRefinerFactory<MESH>::getBaseEdgeFaces(TopologyRefiner & newRefiner,    Index e) {
-    return newRefiner._levels[0]->getEdgeFaces(e);
-}
-template <class MESH>
-inline IndexArray
-TopologyRefinerFactory<MESH>::getBaseVertexFaces(TopologyRefiner & newRefiner,  Index v) {
-    return newRefiner._levels[0]->getVertexFaces(v);
-}
-template <class MESH>
-inline IndexArray
-TopologyRefinerFactory<MESH>::getBaseVertexEdges(TopologyRefiner & newRefiner,  Index v) {
-    return newRefiner._levels[0]->getVertexEdges(v);
-}
-
-template <class MESH>
-inline LocalIndexArray
-TopologyRefinerFactory<MESH>::getBaseEdgeFaceLocalIndices(TopologyRefiner & newRefiner, Index e)   {
-    return newRefiner._levels[0]->getEdgeFaceLocalIndices(e);
-}
-template <class MESH>
-inline LocalIndexArray
-TopologyRefinerFactory<MESH>::getBaseVertexFaceLocalIndices(TopologyRefiner & newRefiner, Index v) {
-    return newRefiner._levels[0]->getVertexFaceLocalIndices(v);
-}
-template <class MESH>
-inline LocalIndexArray
-TopologyRefinerFactory<MESH>::getBaseVertexEdgeLocalIndices(TopologyRefiner & newRefiner, Index v) {
-    return newRefiner._levels[0]->getVertexEdgeLocalIndices(v);
-}
-
-template <class MESH>
-inline Index
-TopologyRefinerFactory<MESH>::findBaseEdge(TopologyRefiner const & newRefiner, Index v0, Index v1) {
-    return newRefiner._levels[0]->findEdge(v0, v1);
-}
-
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::populateBaseLocalIndices(TopologyRefiner & newRefiner) {
-    newRefiner._levels[0]->populateLocalIndices();
-}
-
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setBaseEdgeNonManifold(TopologyRefiner & newRefiner, Index e, bool b) {
-    newRefiner._levels[0]->setEdgeNonManifold(e, b);
-}
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setBaseVertexNonManifold(TopologyRefiner & newRefiner, Index v, bool b) {
-    newRefiner._levels[0]->setVertexNonManifold(v, b);
-}
-
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setBaseEdgeSharpness(TopologyRefiner & newRefiner, Index e, float s)   {
-    newRefiner._levels[0]->getEdgeSharpness(e) = s;
-}
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setBaseVertexSharpness(TopologyRefiner & newRefiner, Index v, float s) {
-    newRefiner._levels[0]->getVertexSharpness(v) = s;
-}
-template <class MESH>
-inline void
-TopologyRefinerFactory<MESH>::setBaseFaceHole(TopologyRefiner & newRefiner, Index f, bool b) {
-    newRefiner._levels[0]->setFaceHole(f, b);
-    newRefiner._hasHoles = newRefiner._hasHoles || b;
-}
-
-template <class MESH>
-inline int
-TopologyRefinerFactory<MESH>::createBaseFVarChannel(TopologyRefiner & newRefiner, int numValues) {
-    return newRefiner._levels[0]->createFVarChannel(numValues, newRefiner._subdivOptions);
-}
-template <class MESH>
-inline int
-TopologyRefinerFactory<MESH>::createBaseFVarChannel(TopologyRefiner & newRefiner, int numValues, Sdc::Options const& fvarOptions) {
-    Sdc::Options newOptions = newRefiner._subdivOptions;
-    newOptions.SetFVarLinearInterpolation(fvarOptions.GetFVarLinearInterpolation());
-    return newRefiner._levels[0]->createFVarChannel(numValues, newOptions);
-}
-template <class MESH>
-inline IndexArray
-TopologyRefinerFactory<MESH>::getBaseFaceFVarValues(TopologyRefiner & newRefiner, Index face, int channel) {
-    return newRefiner._levels[0]->getFaceFVarValues(face, channel);
-}
-
-
-template <class MESH>
-bool
-TopologyRefinerFactory<MESH>::resizeComponentTopology(TopologyRefiner& /* refiner */, MESH const& /* mesh */) {
-
-    Error(FAR_RUNTIME_ERROR,
-        "Failure in TopologyRefinerFactory<>::resizeComponentTopology() -- no specialization provided.");
-
-    //
-    //  Sizing the topology tables:
-    //      This method is for determining the sizes of the various topology tables (and other
-    //  data) associated with the mesh.  Once completed, appropriate memory will be allocated
-    //  and an additional method invoked to populate it accordingly.
-    //
-    //  The following methods should be called -- first those to specify the number of faces,
-    //  edges and vertices in the mesh:
-    //
-    //      void setBaseFaceCount(  TopologyRefiner& newRefiner, int count)
-    //      void setBaseEdgeCount(  TopologyRefiner& newRefiner, int count)
-    //      void setBaseVertexCount(TopologyRefiner& newRefiner, int count)
-    //
-    //  and then for each face, edge and vertex, the number of its incident components:
-    //
-    //      void setBaseFaceVertexCount(TopologyRefiner& newRefiner, Index face, int count)
-    //      void setBaseEdgeFaceCount(  TopologyRefiner& newRefiner, Index edge, int count)
-    //      void setBaseVertexFaceCount(TopologyRefiner& newRefiner, Index vertex, int count)
-    //      void setBaseVertexEdgeCount(TopologyRefiner& newRefiner, Index vertex, int count)
-    //
-    //  The count/size for a component type must be set before indices associated with that
-    //  component type can be used.
-    //
-    //  Note that it is only necessary to size 4 of the 6 supported topological relations --
-    //  the number of edge-vertices is fixed at two per edge, and the number of face-edges is
-    //  the same as the number of face-vertices.
-    //
-    //  So a single pass through your mesh to gather up all of this sizing information will
-    //  allow the Tables to be allocated appropriately once and avoid any dynamic resizing as
-    //  it grows.
-    //
-    return false;
-}
-
-template <class MESH>
-bool
-TopologyRefinerFactory<MESH>::assignComponentTopology(TopologyRefiner& /* refiner */, MESH const& /* mesh */) {
-
-    Error(FAR_RUNTIME_ERROR,
-        "Failure in TopologyRefinerFactory<>::assignComponentTopology() -- no specialization provided.");
-
-    //
-    //  Assigning the topology tables:
-    //      Once the topology tables have been allocated, the six required topological
-    //  relations can be directly populated using the following methods:
-    //
-    //      IndexArray setBaseFaceVertices(TopologyRefiner& newRefiner, Index face)
-    //      IndexArray setBaseFaceEdges(TopologyRefiner& newRefiner, Index face)
-    //
-    //      IndexArray setBaseEdgeVertices(TopologyRefiner& newRefiner, Index edge)
-    //      IndexArray setBaseEdgeFaces(TopologyRefiner& newRefiner, Index edge)
-    //
-    //      IndexArray setBaseVertexEdges(TopologyRefiner& newRefiner, Index vertex)
-    //      IndexArray setBaseVertexFaces(TopologyRefiner& newRefiner, Index vertex)
-    //
-    //  For the last two relations -- the faces and edges incident a vertex -- there are
-    //  also "local indices" that must be specified (considering doing this internally),
-    //  where the "local index" of each incident face or edge is the index of the vertex
-    //  within that face or edge, and so ranging from 0-3 for incident quads and 0-1 for
-    //  incident edges.  These are assigned through similarly retrieved arrays:
-    //
-    //      LocalIndexArray setBaseVertexFaceLocalIndices(TopologyRefiner& newRefiner, Index vertex)
-    //      LocalIndexArray setBaseVertexEdgeLocalIndices(TopologyRefiner& newRefiner, Index vertex)
-    //      LocalIndexArray setBaseEdgeFaceLocalIndices(  TopologyRefiner& newRefiner, Index edge)
-    //
-    //  or, if the mesh is manifold, explicit assignment of these can be deferred and
-    //  all can be determined by calling:
-    //
-    //      void populateBaseLocalIndices(TopologyRefiner& newRefiner)
-    //
-    //  All components are assumed to be locally manifold and ordering of components in
-    //  the above relations is expected to be counter-clockwise.
-    //
-    //  For non-manifold components, no ordering/orientation of incident components is
-    //  assumed or required, but be sure to explicitly tag such components (vertices and
-    //  edges) as non-manifold:
-    //
-    //      void setBaseEdgeNonManifold(TopologyRefiner& newRefiner, Index edge, bool b);
-    //
-    //      void setBaseVertexNonManifold(TopologyRefiner& newRefiner, Index vertex, bool b);
-    //
-    //  Also consider using TopologyLevel::ValidateTopology() when debugging to ensure
-    //  that topology has been completely and correctly specified.
-    //
-    return false;
-}
-
-template <class MESH>
-bool
-TopologyRefinerFactory<MESH>::assignFaceVaryingTopology(TopologyRefiner& /* refiner */, MESH const& /* mesh */) {
-
-    //
-    //  Optional assigning face-varying topology tables:
-    //
-    //  Create independent face-varying primitive variable channels:
-    //      int createBaseFVarChannel(TopologyRefiner& newRefiner, int numValues)
-    //
-    //  For each channel, populate the face-vertex values:
-    //      IndexArray setBaseFaceFVarValues(TopologyRefiner& newRefiner, Index face, int channel = 0)
-    //
-    return true;
-}
-
-template <class MESH>
-bool
-TopologyRefinerFactory<MESH>::assignComponentTags(TopologyRefiner& /* refiner */, MESH const& /* mesh */) {
-
-    //
-    //  Optional tagging:
-    //      This is where any additional feature tags -- sharpness, holes, etc. -- can be
-    //  specified using:
-    //
-    //      void setBaseEdgeSharpness(TopologyRefiner& newRefiner, Index edge, float sharpness)
-    //      void setBaseVertexSharpness(TopologyRefiner& newRefiner, Index vertex, float sharpness)
-    //
-    //      void setBaseFaceHole(TopologyRefiner& newRefiner, Index face, bool hole)
-    //
-    return true;
-}
-
-template <class MESH>
-void
-TopologyRefinerFactory<MESH>::reportInvalidTopology(
-    TopologyError /* errCode */, char const * /* msg */, MESH const& /* mesh */) {
-
-    //
-    //  Optional topology validation error reporting:
-    //      This method is called whenever the factory encounters topology validation
-    //  errors. By default, nothing is reported
-    //
-}
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_TOPOLOGY_REFINER_FACTORY_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/types.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/types.h
deleted file mode 100644
index 8a476d887..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/far/types.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_FAR_TYPES_H
-#define OPENSUBDIV3_FAR_TYPES_H
-
-#include "../version.h"
-
-#include "../vtr/types.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-
-//
-//  Typedefs for indices that are inherited from the Vtr level -- eventually
-//  these primitive Vtr types may be declared at a lower, more public level.
-//
-typedef Vtr::Index       Index;
-typedef Vtr::LocalIndex  LocalIndex;
-
-typedef Vtr::IndexArray       IndexArray;
-typedef Vtr::LocalIndexArray  LocalIndexArray;
-
-typedef Vtr::ConstIndexArray       ConstIndexArray;
-typedef Vtr::ConstLocalIndexArray  ConstLocalIndexArray;
-
-inline bool IndexIsValid(Index index) { return Vtr::IndexIsValid(index); }
-
-static const Index INDEX_INVALID = Vtr::INDEX_INVALID;
-static const int   VALENCE_LIMIT = Vtr::VALENCE_LIMIT;
-
-} // end namespace Far
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_FAR_TYPES_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/CMakeLists.txt
deleted file mode 100644
index 8c3e4b0fe..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-#-------------------------------------------------------------------------------
-set(PUBLIC_HEADER_FILES
-    allocator.h
-    bilinear.h
-    catmark.h
-    cornerEdit.h
-    creaseEdit.h
-    faceEdit.h
-    face.h
-    fvarData.h
-    fvarEdit.h
-    halfedge.h
-    hierarchicalEdit.h
-    holeEdit.h
-    loop.h
-    mesh.h
-    subdivision.h
-    vertexEdit.h
-    vertex.h
-)
-
-#-------------------------------------------------------------------------------
-
-install( 
-    FILES
-        ${PUBLIC_HEADER_FILES}
-    DESTINATION 
-        "${CMAKE_INCDIR_BASE}/hbr"
-    PERMISSIONS
-        OWNER_READ
-        GROUP_READ
-        WORLD_READ )
-
-#-------------------------------------------------------------------------------
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/allocator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/allocator.h
deleted file mode 100644
index b561b830a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/allocator.h
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRALLOCATOR_H
-#define OPENSUBDIV3_HBRALLOCATOR_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-typedef void (*HbrMemStatFunction)(size_t bytes);
-
-/**
- * HbrAllocator - derived from UtBlockAllocator.h, but embedded in
- * libhbrep.
- */
-template <typename T> class HbrAllocator {
-
-public:
-
-    /// Constructor
-    HbrAllocator(size_t *memorystat, int blocksize, void (*increment)(size_t bytes), void (*decrement)(size_t bytes), size_t elemsize = sizeof(T));
-
-    /// Destructor
-    ~HbrAllocator();
-
-    /// Create an allocated object
-    T * Allocate();
-
-    /// Return an allocated object to the block allocator
-    void Deallocate(T *);
-
-    /// Clear the allocator, deleting all allocated objects.
-    void Clear();
-
-    void SetMemStatsIncrement(void (*increment)(size_t bytes)) { m_increment = increment; }
-
-    void SetMemStatsDecrement(void (*decrement)(size_t bytes)) { m_decrement = decrement; }
-
-private:
-    size_t *m_memorystat;
-    const int m_blocksize;
-    int m_elemsize;
-    T** m_blocks;
-
-    // Number of actually allocated blocks
-    int m_nblocks;
-
-    // Size of the m_blocks array (which is NOT the number of actually
-    // allocated blocks)
-    int m_blockCapacity;
-
-    int m_freecount;
-    T * m_freelist;
-
-    // Memory statistics tracking routines
-    HbrMemStatFunction m_increment;
-    HbrMemStatFunction m_decrement;
-};
-
-template <typename T>
-HbrAllocator<T>::HbrAllocator(size_t *memorystat, int blocksize, void (*increment)(size_t bytes), void (*decrement)(size_t bytes), size_t elemsize)
-    : m_memorystat(memorystat), m_blocksize(blocksize), m_elemsize((int)elemsize), m_blocks(0), m_nblocks(0), m_blockCapacity(0), m_freecount(0), m_increment(increment), m_decrement(decrement) {
-}
-
-template <typename T>
-HbrAllocator<T>::~HbrAllocator() {
-    Clear();
-}
-
-template <typename T>
-void HbrAllocator<T>::Clear() {
-    for (int i = 0; i < m_nblocks; ++i) {
-        // Run the destructors (placement)
-        T* blockptr = m_blocks[i];
-        T* startblock = blockptr;
-        for (int j = 0; j < m_blocksize; ++j) {
-            blockptr->~T();
-            blockptr = (T*) ((char*) blockptr + m_elemsize);
-        }
-        free(startblock);
-        if (m_decrement) m_decrement(m_blocksize * m_elemsize);
-        *m_memorystat -= m_blocksize * m_elemsize;
-    }
-    free(m_blocks);
-    m_blocks = 0;
-    m_nblocks = 0;
-    m_blockCapacity = 0;
-    m_freecount = 0;
-    m_freelist = NULL;
-}
-
-template <typename T>
-T*
-HbrAllocator<T>::Allocate() {
-    if (!m_freecount) {
-
-        // Allocate a new block
-        T* block = (T*) malloc(m_blocksize * m_elemsize);
-        T* blockptr = block;
-        // Run the constructors on each element using placement new
-        for (int i = 0; i < m_blocksize; ++i) {
-            new (blockptr) T();
-            blockptr = (T*) ((char*) blockptr + m_elemsize);
-        }
-        if (m_increment) m_increment(m_blocksize * m_elemsize);
-        *m_memorystat += m_blocksize * m_elemsize;
-
-        // Put the block's entries on the free list
-        blockptr = block;
-        for (int i = 0; i < m_blocksize - 1; ++i) {
-            T* next = (T*) ((char*) blockptr + m_elemsize);
-            blockptr->GetNext() = next;
-            blockptr = next;
-        }
-        blockptr->GetNext() = 0;
-        m_freelist = block;
-
-        // Keep track of the newly allocated block
-        if (m_nblocks + 1 >= m_blockCapacity) {
-            m_blockCapacity = m_blockCapacity * 2;
-            if (m_blockCapacity < 1) m_blockCapacity = 1;
-            m_blocks = (T**) realloc(m_blocks, m_blockCapacity * sizeof(T*));
-        }
-        m_blocks[m_nblocks] = block;
-        m_nblocks++;
-        m_freecount += m_blocksize;
-    }
-    T* obj = m_freelist;
-    m_freelist = obj->GetNext();
-    obj->GetNext() = 0;
-    m_freecount--;
-    return obj;
-}
-
-template <typename T>
-void
-HbrAllocator<T>::Deallocate(T * obj) {
-    assert(!obj->GetNext());
-    obj->GetNext() = m_freelist;
-    m_freelist = obj;
-    m_freecount++;
-}
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRALLOCATOR_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/bilinear.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/bilinear.h
deleted file mode 100644
index 0f46f558a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/bilinear.h
+++ /dev/null
@@ -1,909 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRBILINEAR_H
-#define OPENSUBDIV3_HBRBILINEAR_H
-
-/*#define HBR_DEBUG */
-#include "../hbr/subdivision.h"
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T>
-class HbrBilinearSubdivision : public HbrSubdivision<T> {
-public:
-    HbrBilinearSubdivision<T>()
-        : HbrSubdivision<T>() {}
-
-    virtual HbrSubdivision<T>* Clone() const {
-        return new HbrBilinearSubdivision<T>();
-    }
-
-    virtual void Refine(HbrMesh<T>* mesh, HbrFace<T>* face);
-    virtual HbrFace<T>* RefineFaceAtVertex(HbrMesh<T>* mesh, HbrFace<T>* face, HbrVertex<T>* vertex);
-    virtual void GuaranteeNeighbor(HbrMesh<T>* mesh, HbrHalfedge<T>* edge);
-    virtual void GuaranteeNeighbors(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    virtual bool HasLimit(HbrMesh<T>* mesh, HbrFace<T>* face);
-    virtual bool HasLimit(HbrMesh<T>* mesh, HbrHalfedge<T>* edge);
-    virtual bool HasLimit(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrFace<T>* face);
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrHalfedge<T>* edge);
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    virtual bool VertexIsExtraordinary(HbrMesh<T> const * /* mesh */, HbrVertex<T>* vertex) { return vertex->GetValence() != 4; }
-    virtual bool FaceIsExtraordinary(HbrMesh<T> const * /* mesh */, HbrFace<T>* face) { return face->GetNumVertices() != 4; }
-
-    virtual int GetFaceChildrenCount(int nvertices) const { return nvertices; }
-
-private:
-
-    // Transfers facevarying data from a parent face to a child face
-    void transferFVarToChild(HbrMesh<T>* mesh, HbrFace<T>* face, HbrFace<T>* child, int index);
-
-    // Transfers vertex and edge edits from a parent face to a child face
-    void transferEditsToChild(HbrFace<T>* face, HbrFace<T>* child, int index);
-};
-
-template <class T>
-void
-HbrBilinearSubdivision<T>::transferFVarToChild(HbrMesh<T>* mesh, HbrFace<T>* face, HbrFace<T>* child, int index) {
-
-    typename HbrMesh<T>::InterpolateBoundaryMethod fvarinterp = mesh->GetFVarInterpolateBoundaryMethod();
-    const int fvarcount = mesh->GetFVarCount();
-    int fvarindex = 0;
-    const int nv = face->GetNumVertices();
-    bool extraordinary = (nv != 4);
-    HbrVertex<T> *v = face->GetVertex(index), *childVertex;
-    HbrHalfedge<T>* edge;
-
-    // We do the face subdivision rule first, because we may reuse the
-    // result (stored in fv2) for the other subdivisions.
-    float weight =  1.0f / nv;
-
-    // For the face center vertex, the facevarying data can be cleared
-    // and averaged en masse, since the subdivision rules don't change
-    // for any of the data - we use the smooth rule for all of it.
-    // And since we know that the fvardata for this particular vertex
-    // is smooth and therefore shareable amongst all incident faces,
-    // we don't have to allocate extra storage for it. We also don't
-    // have to compute it if some other face got to it first (as
-    // indicated by the IsInitialized() flag).
-    HbrFVarData<T>& fv2 = child->GetFVarData(extraordinary ? 2 : (index+2)%4);
-    if (!fv2.IsInitialized()) {
-        const int totalfvarwidth = mesh->GetTotalFVarWidth();
-        fv2.ClearAll(totalfvarwidth);
-        for (int j = 0; j < nv; ++j) {
-            fv2.AddWithWeightAll(face->GetFVarData(j), totalfvarwidth, weight);
-        }
-    }
-    assert(fv2.IsInitialized());
-
-    v->GuaranteeNeighbors();
-
-    // Make sure that that each of the vertices of the child face have
-    // the appropriate facevarying storage as needed. If there are
-    // discontinuities in any facevarying datum, the vertex must
-    // allocate a new block of facevarying storage specific to the
-    // child face.
-    bool fv0IsSmooth, fv1IsSmooth, fv3IsSmooth;
-
-    childVertex = child->GetVertex(extraordinary ? 0 : (index+0)%4);
-    fv0IsSmooth = v->IsFVarAllSmooth();
-    if (!fv0IsSmooth) {
-        childVertex->NewFVarData(child);
-    }
-    HbrFVarData<T>& fv0 = childVertex->GetFVarData(child);
-
-    edge = face->GetEdge(index);
-    GuaranteeNeighbor(mesh, edge);
-    assert(edge->GetOrgVertex() == v);
-    childVertex = child->GetVertex(extraordinary ? 1 : (index+1)%4);
-    fv1IsSmooth = !edge->IsFVarInfiniteSharpAnywhere();
-    if (!fv1IsSmooth) {
-        childVertex->NewFVarData(child);
-    }
-    HbrFVarData<T>& fv1 = childVertex->GetFVarData(child);
-
-    edge = edge->GetPrev();
-    GuaranteeNeighbor(mesh, edge);
-    assert(edge == face->GetEdge((index + nv - 1) % nv));
-    assert(edge->GetDestVertex() == v);
-    childVertex = child->GetVertex(extraordinary ? 3 : (index+3)%4);
-    fv3IsSmooth = !edge->IsFVarInfiniteSharpAnywhere();
-    if (!fv3IsSmooth) {
-        childVertex->NewFVarData(child);
-    }
-    HbrFVarData<T>& fv3 = childVertex->GetFVarData(child);
-    fvarindex = 0;
-    for (int fvaritem = 0; fvaritem < fvarcount; ++fvaritem) {
-        // Vertex subdivision rule. Analyze whether the vertex is on the
-        // boundary and whether it's an infinitely sharp corner. We
-        // determine the last by checking the propagate corners flag on
-        // the mesh; if it's off, we check the two edges of this face
-        // incident to that vertex and determining whether they are
-        // facevarying boundary edges - this is analogous to what goes on
-        // for the interpolateboundary tag (which when set to
-        // EDGEANDCORNER marks vertices with a valence of two as being
-        // sharp corners). If propagate corners is on, we check *all*
-        // faces to see if two edges side by side are facevarying boundary
-        // edges. The facevarying boundary check ignores geometric
-        // sharpness, otherwise we may swim at geometric creases which
-        // aren't actually discontinuous.
-        bool infcorner = false;
-        const int fvarwidth = mesh->GetFVarWidths()[fvaritem];
-        const unsigned char fvarmask = v->GetFVarMask(fvaritem);
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryEdgeAndCorner) {
-            if (fvarmask >= HbrVertex<T>::k_Corner) {
-                infcorner = true;
-            } else if (mesh->GetFVarPropagateCorners()) {
-                if (v->IsFVarCorner(fvaritem)) {
-                    infcorner = true;
-                }
-            } else {
-                if (face->GetEdge(index)->GetFVarSharpness(fvaritem, true) && face->GetEdge(index)->GetPrev()->GetFVarSharpness(fvaritem, true)) {
-                    infcorner = true;
-                }
-            }
-        }
-
-        // Infinitely sharp vertex rule. Applied if the vertex is:
-        // - undergoing no facevarying boundary interpolation;
-        // - at a geometric crease, in either boundary interpolation case; or
-        // - is an infinitely sharp facevarying vertex, in the EDGEANDCORNER case; or
-        // - has a mask equal or greater than one, in the "always
-        //   sharp" interpolate boundary case
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-            (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryAlwaysSharp &&
-             fvarmask >= 1) ||
-            v->GetSharpness() > HbrVertex<T>::k_Smooth ||
-            infcorner) {
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 1.0f);
-        }
-        // Dart rule: unlike geometric creases, because there's two
-        // discontinuous values for the one incident edge, we use the
-        // boundary rule and not the smooth rule
-        else if (fvarmask == 1) {
-            assert(!v->OnBoundary());
-
-            // Use 0.75 of the current vert
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.75f);
-
-            // 0.125 of "two adjacent edge vertices", which in actuality
-            // are the facevarying values of the same vertex but on each
-            // side of the single incident facevarying sharp edge
-            HbrHalfedge<T>* start = v->GetIncidentEdge(), *nextedge;
-            edge = start;
-            while (edge) {
-                if (edge->GetFVarSharpness(fvaritem)) {
-                    break;
-                }
-                nextedge = v->GetNextEdge(edge);
-                if (nextedge == start) {
-                    assert(0); // we should have found it by now
-                    break;
-                } else if (!nextedge) {
-                    // should never get into this case - if the vertex is
-                    // on a boundary, it can never be a facevarying dart
-                    // vertex
-                    assert(0);
-                    edge = edge->GetPrev();
-                    break;
-                } else {
-                    edge = nextedge;
-                }
-            }
-            HbrVertex<T>* w = edge->GetDestVertex();
-            HbrFace<T>* bestface = edge->GetLeftFace();
-            int j;
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-            bestface = edge->GetRightFace();
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-        }
-        // Boundary vertex rule
-        else if (fvarmask != 0) {
-
-            // Use 0.75 of the current vert
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.75f);
-
-            // Compute 0.125 of two adjacent edge vertices. However the
-            // two adjacent edge vertices we use must be part of the
-            // facevarying "boundary". To find the first edge we cycle
-            // counterclockwise around the current vertex v and look for
-            // the first boundary edge
-
-            HbrFace<T>* bestface = face;
-            HbrHalfedge<T>* bestedge = face->GetEdge(index)->GetPrev();
-            HbrHalfedge<T>* starte = bestedge->GetOpposite();
-            HbrVertex<T>* w = 0;
-            if (!starte) {
-                w = face->GetEdge(index)->GetPrev()->GetOrgVertex();
-            } else {
-                HbrHalfedge<T>* e = starte, *next;
-                assert(starte->GetOrgVertex() == v);
-                do {
-                    if (e->GetFVarSharpness(fvaritem) || !e->GetLeftFace()) {
-                        bestface = e->GetRightFace();
-                        bestedge = e;
-                        break;
-                    }
-                    next = v->GetNextEdge(e);
-                    if (!next) {
-                        bestface = e->GetLeftFace();
-                        w = e->GetPrev()->GetOrgVertex();
-                        break;
-                    }
-                    e = next;
-                } while (e && e != starte);
-            }
-            if (!w) w = bestedge->GetDestVertex();
-            int j;
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-
-            // Look for the other edge by cycling clockwise around v
-            bestface = face;
-            bestedge = face->GetEdge(index);
-            starte = bestedge;
-            w = 0;
-            if (HbrHalfedge<T>* e = starte) {
-                assert(starte->GetOrgVertex() == v);
-                do {
-                    if (e->GetFVarSharpness(fvaritem) || !e->GetRightFace()) {
-                        bestface = e->GetLeftFace();
-                        bestedge = e;
-                        break;
-                    }
-                    assert(e->GetOpposite());
-                    e = v->GetPreviousEdge(e);
-                } while (e && e != starte);
-            }
-            if (!w) w = bestedge->GetDestVertex();
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-
-        }
-        // Smooth rule. Here, we can take a shortcut if we know that
-        // the vertex is smooth and some other vertex has completely
-        // computed the facevarying values
-        else if (!fv0IsSmooth || !fv0.IsInitialized()) {
-            int valence = v->GetValence();
-            float invvalencesquared = 1.0f / (valence * valence);
-
-            // Use n-2/n of the current vertex value
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, invvalencesquared * valence * (valence - 2));
-
-            // Add 1/n^2 of surrounding edge vertices and surrounding face
-            // averages. We loop over all surrounding faces..
-            HbrHalfedge<T>* start = v->GetIncidentEdge(), *edge;
-            edge = start;
-            while (edge) {
-                HbrFace<T>* g = edge->GetLeftFace();
-                weight = invvalencesquared / g->GetNumVertices();
-                // .. and compute the average of each face. At the same
-                // time, we look for the edge on that face whose origin is
-                // the same as v, and add a contribution from its
-                // destination vertex value; this takes care of the
-                // surrounding edge vertex addition.
-                for (int j = 0; j < g->GetNumVertices(); ++j) {
-                    fv0.AddWithWeight(g->GetFVarData(j), fvarindex, fvarwidth, weight);
-                    if (g->GetEdge(j)->GetOrgVertex() == v) {
-                        fv0.AddWithWeight(g->GetFVarData((j + 1) % g->GetNumVertices()), fvarindex, fvarwidth, invvalencesquared);
-                    }
-                }
-                edge = v->GetNextEdge(edge);
-                if (edge == start) break;
-            }
-        }
-
-        // Edge subdivision rule
-        edge = face->GetEdge(index);
-
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-            edge->GetFVarSharpness(fvaritem) || edge->IsBoundary()) {
-
-            // Sharp edge rule
-            fv1.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.5f);
-            fv1.AddWithWeight(face->GetFVarData((index + 1) % nv), fvarindex, fvarwidth, 0.5f);
-        } else if (!fv1IsSmooth || !fv1.IsInitialized()) {
-            // Smooth edge subdivision. Add 0.25 of adjacent vertices
-            fv1.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.25f);
-            fv1.AddWithWeight(face->GetFVarData((index + 1) % nv), fvarindex, fvarwidth, 0.25f);
-            // Local subdivided face vertex
-            fv1.AddWithWeight(fv2, fvarindex, fvarwidth, 0.25f);
-            // Add 0.25 * average of neighboring face vertices
-            HbrFace<T>* oppFace = edge->GetRightFace();
-            weight = 0.25f / oppFace->GetNumVertices();
-            for (int j = 0; j < oppFace->GetNumVertices(); ++j) {
-                fv1.AddWithWeight(oppFace->GetFVarData(j), fvarindex, fvarwidth, weight);
-            }
-        }
-
-
-        // Edge subdivision rule
-        edge = edge->GetPrev();
-
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-            edge->GetFVarSharpness(fvaritem) || edge->IsBoundary()) {
-
-            // Sharp edge rule
-            fv3.SetWithWeight(face->GetFVarData((index + nv - 1) % nv), fvarindex, fvarwidth, 0.5f);
-            fv3.AddWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.5f);
-        } else if (!fv3IsSmooth || !fv3.IsInitialized()) {
-            // Smooth edge subdivision. Add 0.25 of adjacent vertices
-            fv3.SetWithWeight(face->GetFVarData((index + nv - 1) % nv), fvarindex, fvarwidth, 0.25f);
-            fv3.AddWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.25f);
-            // Local subdivided face vertex
-            fv3.AddWithWeight(fv2, fvarindex, fvarwidth, 0.25f);
-            // Add 0.25 * average of neighboring face vertices
-            HbrFace<T>* oppFace = edge->GetRightFace();
-            weight = 0.25f / oppFace->GetNumVertices();
-            for (int j = 0; j < oppFace->GetNumVertices(); ++j) {
-                fv3.AddWithWeight(oppFace->GetFVarData(j), fvarindex, fvarwidth, weight);
-            }
-        }
-
-        fvarindex += fvarwidth;
-    }
-    fv0.SetInitialized();
-    fv1.SetInitialized();
-    fv3.SetInitialized();
-}
-
-template <class T>
-void
-HbrBilinearSubdivision<T>::transferEditsToChild(HbrFace<T>* face, HbrFace<T>* child, int index) {
-
-    // Hand down hole tag
-    child->SetHole(face->IsHole());
-
-    // Hand down pointers to hierarchical edits
-    if (HbrHierarchicalEdit<T>** edits = face->GetHierarchicalEdits()) {
-        while (HbrHierarchicalEdit<T>* edit = *edits) {
-            if (!edit->IsRelevantToFace(face)) break;
-            if (edit->GetNSubfaces() > face->GetDepth() &&
-                (edit->GetSubface(face->GetDepth()) == index)) {
-                child->SetHierarchicalEdits(edits);
-                break;
-            }
-            edits++;
-        }
-    }
-}
-
-
-template <class T>
-void
-HbrBilinearSubdivision<T>::Refine(HbrMesh<T>* mesh, HbrFace<T>* face) {
-
-    // Create new quadrilateral children faces from this face
-    HbrFace<T>* child;
-    HbrVertex<T>* vertices[4];
-    HbrHalfedge<T>* edge = face->GetFirstEdge();
-    HbrHalfedge<T>* prevedge = edge->GetPrev();
-    HbrHalfedge<T>* childedge;
-    int nv = face->GetNumVertices();
-    float sharpness;
-    bool extraordinary = (nv != 4);
-    // The funny indexing on vertices is done only for
-    // non-extraordinary faces in order to correctly preserve
-    // parametric space through the refinement. If we split an
-    // extraordinary face then it doesn't matter.
-    for (int i = 0; i < nv; ++i) {
-        if (!face->GetChild(i)) {
-#ifdef HBR_DEBUG
-            std::cerr << "Kid " << i << "\n";
-#endif
-            HbrVertex<T>* vertex = edge->GetOrgVertex();
-            if (extraordinary) {
-                vertices[0] = vertex->Subdivide();
-                vertices[1] = edge->Subdivide();
-                vertices[2] = face->Subdivide();
-                vertices[3] = prevedge->Subdivide();
-            } else {
-                vertices[i] = vertex->Subdivide();
-                vertices[(i+1)%4] = edge->Subdivide();
-                vertices[(i+2)%4] = face->Subdivide();
-                vertices[(i+3)%4] = prevedge->Subdivide();
-            }
-            child = mesh->NewFace(4, vertices, face, i);
-#ifdef HBR_DEBUG
-            std::cerr << "Creating face " << *child << " during refine\n";
-#endif
-
-            // Hand down edge sharpnesses
-            childedge = vertex->Subdivide()->GetEdge(edge->Subdivide());
-            assert(childedge);
-            if ((sharpness = edge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                HbrSubdivision<T>::SubdivideCreaseWeight(edge, edge->GetOrgVertex(), childedge);
-            }
-            childedge->CopyFVarInfiniteSharpness(edge);
-
-            childedge = prevedge->Subdivide()->GetEdge(vertex->Subdivide());
-            assert(childedge);
-            if ((sharpness = prevedge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                HbrSubdivision<T>::SubdivideCreaseWeight(prevedge, prevedge->GetDestVertex(), childedge);
-            }
-            childedge->CopyFVarInfiniteSharpness(prevedge);
-
-            if (mesh->GetTotalFVarWidth()) {
-                transferFVarToChild(mesh, face, child, i);
-            }
-
-            // Special handling of ptex index for extraordinary faces: make
-            // sure the children get their indices reassigned to be
-            // consecutive within the block reserved for the parent.
-            if (face->GetNumVertices() != 4 && face->GetPtexIndex() != -1) {
-                child->SetPtexIndex(face->GetPtexIndex() + i);
-            }
-
-            transferEditsToChild(face, child, i);
-        }
-        prevedge = edge;
-        edge = edge->GetNext();
-    }
-}
-
-template <class T>
-HbrFace<T>*
-HbrBilinearSubdivision<T>::RefineFaceAtVertex(HbrMesh<T>* mesh, HbrFace<T>* face, HbrVertex<T>* vertex) {
-
-#ifdef HBR_DEBUG
-    std::cerr << "    forcing refine on " << *face << " at " << *vertex << '\n';
-#endif
-
-    // Create new quadrilateral children faces from this face
-    HbrHalfedge<T>* edge = face->GetFirstEdge();
-    HbrHalfedge<T>* prevedge = edge->GetPrev();
-    HbrHalfedge<T>* childedge;
-    int nv = face->GetNumVertices();
-    float sharpness;
-    bool extraordinary = (nv != 4);
-    // The funny indexing on vertices is done only for
-    // non-extraordinary faces in order to correctly preserve
-    // parametric space through the refinement. If we split an
-    // extraordinary face then it doesn't matter.
-    for (int i = 0; i < nv; ++i) {
-        if (edge->GetOrgVertex() == vertex) {
-            if (!face->GetChild(i)) {
-                HbrFace<T>* child;
-                HbrVertex<T>* vertices[4];
-                if (extraordinary) {
-                    vertices[0] = vertex->Subdivide();
-                    vertices[1] = edge->Subdivide();
-                    vertices[2] = face->Subdivide();
-                    vertices[3] = prevedge->Subdivide();
-                } else {
-                    vertices[i] = vertex->Subdivide();
-                    vertices[(i+1)%4] = edge->Subdivide();
-                    vertices[(i+2)%4] = face->Subdivide();
-                    vertices[(i+3)%4] = prevedge->Subdivide();
-                }
-#ifdef HBR_DEBUG
-                std::cerr << "Kid " << i << "\n";
-                std::cerr << "  subdivision created " << *vertices[0] << '\n';
-                std::cerr << "  subdivision created " << *vertices[1] << '\n';
-                std::cerr << "  subdivision created " << *vertices[2] << '\n';
-                std::cerr << "  subdivision created " << *vertices[3] << '\n';
-#endif
-                child = mesh->NewFace(4, vertices, face, i);
-#ifdef HBR_DEBUG
-                std::cerr << "Creating face " << *child << " during refine\n";
-#endif
-                // Hand down edge sharpness
-                childedge = vertex->Subdivide()->GetEdge(edge->Subdivide());
-                assert(childedge);
-                if ((sharpness = edge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                    HbrSubdivision<T>::SubdivideCreaseWeight(edge, edge->GetOrgVertex(), childedge);
-                }
-                childedge->CopyFVarInfiniteSharpness(edge);
-
-                childedge = prevedge->Subdivide()->GetEdge(vertex->Subdivide());
-                assert(childedge);
-                if ((sharpness = prevedge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                    HbrSubdivision<T>::SubdivideCreaseWeight(prevedge, prevedge->GetDestVertex(), childedge);
-                }
-                childedge->CopyFVarInfiniteSharpness(prevedge);
-
-                if (mesh->GetTotalFVarWidth()) {
-                    transferFVarToChild(mesh, face, child, i);
-                }
-
-                // Special handling of ptex index for extraordinary faces: make
-                // sure the children get their indices reassigned to be
-                // consecutive within the block reserved for the parent.
-                if (face->GetNumVertices() != 4 && face->GetPtexIndex() != -1) {
-                    child->SetPtexIndex(face->GetPtexIndex() + i);
-                }
-
-                transferEditsToChild(face, child, i);
-                return child;
-            } else {
-                return face->GetChild(i);
-            }
-        }
-        prevedge = edge;
-        edge = edge->GetNext();
-    }
-    return 0;
-}
-
-template <class T>
-void
-HbrBilinearSubdivision<T>::GuaranteeNeighbor(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) {
-    if (edge->GetOpposite()) {
-        return;
-    }
-
-    // For the given edge: if the parent of either of its incident
-    // vertices is itself a _face_, then ensuring that this parent
-    // face has refined at a particular vertex is sufficient to
-    // ensure that both of the faces on each side of the edge have
-    // been created.
-    bool destParentWasEdge = true;
-    HbrFace<T>* parentFace = edge->GetOrgVertex()->GetParentFace();
-    HbrHalfedge<T>* parentEdge = edge->GetDestVertex()->GetParentEdge();
-    if (!parentFace) {
-        destParentWasEdge = false;
-        parentFace = edge->GetDestVertex()->GetParentFace();
-        parentEdge = edge->GetOrgVertex()->GetParentEdge();
-    }
-
-    if (parentFace) {
-
-        // Make sure we deal with a parent halfedge which is
-        // associated with the parent face
-        if (parentEdge->GetFace() != parentFace) {
-            parentEdge = parentEdge->GetOpposite();
-        }
-        // If one of the vertices had a parent face, the other one MUST
-        // have been a child of an edge
-        assert(parentEdge && parentEdge->GetFace() == parentFace);
-#ifdef HBR_DEBUG
-        std::cerr << "\nparent edge is " << *parentEdge << "\n";
-#endif
-
-        // The vertex to refine at depends on whether the
-        // destination or origin vertex of this edge had a parent
-        // edge
-        if (destParentWasEdge) {
-            RefineFaceAtVertex(mesh, parentFace, parentEdge->GetOrgVertex());
-        } else {
-            RefineFaceAtVertex(mesh, parentFace, parentEdge->GetDestVertex());
-        }
-
-        // It should always be the case that the opposite now exists -
-        // we can't have a boundary case here
-        assert(edge->GetOpposite());
-    } else {
-        HbrVertex<T>* parentVertex = edge->GetOrgVertex()->GetParentVertex();
-        parentEdge = edge->GetDestVertex()->GetParentEdge();
-        if (!parentVertex) {
-            parentVertex = edge->GetDestVertex()->GetParentVertex();
-            parentEdge = edge->GetOrgVertex()->GetParentEdge();
-        }
-
-        if (parentVertex) {
-
-            assert(parentEdge);
-
-#ifdef HBR_DEBUG
-            std::cerr << "\nparent edge is " << *parentEdge << "\n";
-#endif
-
-            // 1. Go up to the parent of my face
-
-            parentFace = edge->GetFace()->GetParent();
-#ifdef HBR_DEBUG
-            std::cerr << "\nparent face is " << *parentFace << "\n";
-#endif
-
-            // 2. Ask the opposite face (if it exists) to refine
-            if (parentFace) {
-
-                // A vertex can be associated with either of two
-                // parent halfedges. If the parent edge that we're
-                // interested in doesn't match then we should look at
-                // its opposite
-                if (parentEdge->GetFace() != parentFace)
-                    parentEdge = parentEdge->GetOpposite();
-                assert(parentEdge->GetFace() == parentFace);
-
-                // Make sure the parent edge has its neighbor as well
-                GuaranteeNeighbor(mesh, parentEdge);
-
-                // Now access that neighbor and refine it
-                if (parentEdge->GetRightFace()) {
-                    RefineFaceAtVertex(mesh, parentEdge->GetRightFace(), parentVertex);
-
-                    // FIXME: assertion?
-                    assert(edge->GetOpposite());
-                }
-            }
-        }
-    }
-}
-
-template <class T>
-void
-HbrBilinearSubdivision<T>::GuaranteeNeighbors(HbrMesh<T>* mesh, HbrVertex<T>* vertex) {
-
-#ifdef HBR_DEBUG
-    std::cerr << "\n\nneighbor guarantee at " << *vertex << " invoked\n";
-#endif
-
-    // If the vertex is a child of a face, guaranteeing the neighbors
-    // of the vertex is simply a matter of ensuring the parent face
-    // has refined.
-    HbrFace<T>* parentFace = vertex->GetParentFace();
-    if (parentFace) {
-
-#ifdef HBR_DEBUG
-        std::cerr << "  forcing full refine on parent face\n";
-#endif
-        Refine(mesh, parentFace);
-        return;
-    }
-
-    // Otherwise if the vertex is a child of an edge, we need to
-    // ensure that the parent faces on either side of the parent edge
-    // 1) exist, and 2) have refined at both vertices of the parent
-    // edge
-    HbrHalfedge<T>* parentEdge = vertex->GetParentEdge();
-    if (parentEdge) {
-
-#ifdef HBR_DEBUG
-        std::cerr << "  forcing full refine on adjacent faces of parent edge\n";
-#endif
-        HbrVertex<T>* dest = parentEdge->GetDestVertex();
-        HbrVertex<T>* org = parentEdge->GetOrgVertex();
-        GuaranteeNeighbor(mesh, parentEdge);
-        parentFace = parentEdge->GetLeftFace();
-        RefineFaceAtVertex(mesh, parentFace, dest);
-        RefineFaceAtVertex(mesh, parentFace, org);
-
-#ifdef HBR_DEBUG
-        std::cerr << "    on the right face?\n";
-#endif
-        parentFace = parentEdge->GetRightFace();
-        // The right face may not necessarily exist even after
-        // GuaranteeNeighbor
-        if (parentFace) {
-            RefineFaceAtVertex(mesh, parentFace, dest);
-            RefineFaceAtVertex(mesh, parentFace, org);
-        }
-#ifdef HBR_DEBUG
-        std::cerr << "  end force\n";
-#endif
-        return;
-    }
-
-    // The last case: the vertex is a child of a vertex. In this case
-    // we have to first recursively guarantee that the parent's
-    // adjacent faces also exist.
-    HbrVertex<T>* parentVertex = vertex->GetParentVertex();
-    if (parentVertex) {
-
-#ifdef HBR_DEBUG
-        std::cerr << "  recursive parent vertex guarantee call\n";
-#endif
-        parentVertex->GuaranteeNeighbors();
-
-        // And then we refine all the face neighbors of the
-        // parentVertex
-        HbrHalfedge<T>* start = parentVertex->GetIncidentEdge(), *edge;
-        edge = start;
-        while (edge) {
-            HbrFace<T>* f = edge->GetLeftFace();
-            RefineFaceAtVertex(mesh, f, parentVertex);
-            edge = parentVertex->GetNextEdge(edge);
-            if (edge == start) break;
-        }
-    }
-}
-
-template <class T>
-bool
-HbrBilinearSubdivision<T>::HasLimit(HbrMesh<T>* mesh, HbrFace<T>* face) {
-
-    if (face->IsHole()) return false;
-    // A limit face exists if all the bounding edges have limit curves
-    for (int i = 0; i < face->GetNumVertices(); ++i) {
-        if (!HasLimit(mesh, face->GetEdge(i))) {
-            return false;
-        }
-    }
-    return true;
-}
-
-template <class T>
-bool
-HbrBilinearSubdivision<T>::HasLimit(HbrMesh<T>* /* mesh */, HbrHalfedge<T>* /* edge */) {
-    return true;
-}
-
-template <class T>
-bool
-HbrBilinearSubdivision<T>::HasLimit(HbrMesh<T>* /* mesh */, HbrVertex<T>* vertex) {
-    vertex->GuaranteeNeighbors();
-    switch (vertex->GetMask(false)) {
-        case HbrVertex<T>::k_Smooth:
-        case HbrVertex<T>::k_Dart:
-            return !vertex->OnBoundary();
-            break;
-        case HbrVertex<T>::k_Crease:
-        case HbrVertex<T>::k_Corner:
-        default:
-            return true;
-    }
-}
-
-template <class T>
-HbrVertex<T>*
-HbrBilinearSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrFace<T>* face) {
-
-    // Face rule: simply average all vertices on the face
-    HbrVertex<T>* v = mesh->NewVertex();
-    T& data = v->GetData();
-    int nv = face->GetNumVertices();
-    float weight = 1.0f / nv;
-
-    HbrHalfedge<T>* edge = face->GetFirstEdge();
-    for (int i = 0; i < face->GetNumVertices(); ++i) {
-        HbrVertex<T>* w = edge->GetOrgVertex();
-        // If there are vertex edits we have to make sure the edit
-        // has been applied
-        if (mesh->HasVertexEdits()) {
-            w->GuaranteeNeighbors();
-        }
-        data.AddWithWeight(w->GetData(), weight);
-        data.AddVaryingWithWeight(w->GetData(), weight);
-        edge = edge->GetNext();
-    }
-#ifdef HBR_DEBUG
-    std::cerr << "Subdividing at " << *face << "\n";
-#endif
-
-    // Set the extraordinary flag if the face had anything other than
-    // 4 vertices
-    if (nv != 4) v->SetExtraordinary();
-
-#ifdef HBR_DEBUG
-    std::cerr << "  created " << *v << "\n";
-#endif
-    return v;
-}
-
-template <class T>
-HbrVertex<T>*
-HbrBilinearSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) {
-
-#ifdef HBR_DEBUG
-    float esharp = edge->GetSharpness();
-    std::cerr << "Subdividing at " << *edge << " (sharpness = " << esharp << ")";
-#endif
-
-    HbrVertex<T>* v = mesh->NewVertex();
-    T& data = v->GetData();
-
-
-    // If there's the possibility of a crease edits, make sure the
-    // edit has been applied
-    if (mesh->HasCreaseEdits()) {
-        edge->GuaranteeNeighbor();
-    }
-
-    // If there's the possibility of vertex edits on either vertex, we
-    // have to make sure the edit has been applied
-    if (mesh->HasVertexEdits()) {
-        edge->GetOrgVertex()->GuaranteeNeighbors();
-        edge->GetDestVertex()->GuaranteeNeighbors();
-    }
-
-    // Average the two end points
-    data.AddWithWeight(edge->GetOrgVertex()->GetData(), 0.5f);
-    data.AddWithWeight(edge->GetDestVertex()->GetData(), 0.5f);
-
-    // Varying data is always the average of two end points
-    data.AddVaryingWithWeight(edge->GetOrgVertex()->GetData(), 0.5f);
-    data.AddVaryingWithWeight(edge->GetDestVertex()->GetData(), 0.5f);
-
-#ifdef HBR_DEBUG
-    std::cerr << "  created " << *v << "\n";
-#endif
-    return v;
-}
-
-template <class T>
-HbrVertex<T>*
-HbrBilinearSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrVertex<T>* vertex) {
-
-    HbrVertex<T>* v;
-
-    // If there are vertex edits we have to make sure the edit has
-    // been applied by guaranteeing the neighbors of the
-    // vertex. Unfortunately in this case, we can't share the data
-    // with the parent
-    if (mesh->HasVertexEdits()) {
-        vertex->GuaranteeNeighbors();
-
-        v = mesh->NewVertex();
-        T& data = v->GetData();
-
-        // Just copy the old value
-        data.AddWithWeight(vertex->GetData(), 1.0f);
-
-        // Varying data is always just propagated down
-        data.AddVaryingWithWeight(vertex->GetData(), 1.0f);
-
-    } else {
-        // Create a new vertex that just shares the same data
-        v = mesh->NewVertex(vertex->GetData());
-    }
-
-#ifdef HBR_DEBUG
-    std::cerr << "Subdividing at " << *vertex << "\n";
-    std::cerr << "  created " << *v << "\n";
-#endif
-    // Inherit extraordinary flag and sharpness
-    if (vertex->IsExtraordinary()) v->SetExtraordinary();
-    float sharp = vertex->GetSharpness();
-    if (sharp >= HbrVertex<T>::k_InfinitelySharp) {
-        v->SetSharpness(HbrVertex<T>::k_InfinitelySharp);
-    } else if (sharp > HbrVertex<T>::k_Smooth) {
-        sharp -= 1.0f;
-        if (sharp < (float) HbrVertex<T>::k_Smooth) {
-            sharp = (float) HbrVertex<T>::k_Smooth;
-        }
-        v->SetSharpness(sharp);
-    } else {
-        v->SetSharpness(HbrVertex<T>::k_Smooth);
-    }
-    return v;
-}
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRBILINEAR_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/catmark.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/catmark.h
deleted file mode 100644
index 041febc21..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/catmark.h
+++ /dev/null
@@ -1,1131 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRCATMARK_H
-#define OPENSUBDIV3_HBRCATMARK_H
-
-/*#define HBR_DEBUG */
-#include "../hbr/subdivision.h"
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T>
-class HbrCatmarkSubdivision : public HbrSubdivision<T> {
-public:
-    HbrCatmarkSubdivision<T>()
-        : HbrSubdivision<T>(), triangleSubdivision(k_Normal) {}
-
-    HbrCatmarkSubdivision<T>(const HbrCatmarkSubdivision<T> &old)
-        : HbrSubdivision<T>(), triangleSubdivision(old.triangleSubdivision) {}
-
-    virtual HbrSubdivision<T>* Clone() const {
-        return new HbrCatmarkSubdivision<T>(*this);
-    }
-
-    virtual void Refine(HbrMesh<T>* mesh, HbrFace<T>* face);
-    virtual HbrFace<T>* RefineFaceAtVertex(HbrMesh<T>* mesh, HbrFace<T>* face, HbrVertex<T>* vertex);
-    virtual void GuaranteeNeighbor(HbrMesh<T>* mesh, HbrHalfedge<T>* edge);
-    virtual void GuaranteeNeighbors(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    virtual bool HasLimit(HbrMesh<T>* mesh, HbrFace<T>* face);
-    virtual bool HasLimit(HbrMesh<T>* mesh, HbrHalfedge<T>* edge);
-    virtual bool HasLimit(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrFace<T>* face);
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrHalfedge<T>* edge);
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    virtual bool VertexIsExtraordinary(HbrMesh<T> const * /* mesh */, HbrVertex<T>* vertex) { return vertex->GetValence() != 4; }
-    virtual bool FaceIsExtraordinary(HbrMesh<T> const* /* mesh */, HbrFace<T>* face) { return face->GetNumVertices() != 4; }
-
-    // Triangle subdivision rules, which modifies the rules for
-    // triangular faces in order to make them smoother. The "normal"
-    // rule is the standard Catmull-Clark rule. The "old" rule
-    // modifies only the subdivision rules for a face to vertex
-    // refinement. The "new" rule modifies only the subdivision rules
-    // for an edge to vertex refinement. These rules are only applied
-    // to the top level face, since only top level faces can be
-    // triangular; after one level of refinement everything becomes
-    // quads.
-    enum TriangleSubdivision {
-        k_Normal,
-        k_Old,
-        k_New
-    };
-    TriangleSubdivision GetTriangleSubdivisionMethod() const { return triangleSubdivision; }
-    void SetTriangleSubdivisionMethod(TriangleSubdivision method) { triangleSubdivision = method; }
-
-    virtual int GetFaceChildrenCount(int nvertices) const { return nvertices; }
-
-private:
-
-    // Transfers facevarying data from a parent face to a child face
-    void transferFVarToChild(HbrMesh<T>* mesh, HbrFace<T>* face, HbrFace<T>* child, int index);
-
-    // Transfers vertex and edge edits from a parent face to a child face
-    void transferEditsToChild(HbrFace<T>* face, HbrFace<T>* child, int index);
-
-    TriangleSubdivision triangleSubdivision;
-};
-
-template <class T>
-void
-HbrCatmarkSubdivision<T>::transferFVarToChild(HbrMesh<T>* mesh, HbrFace<T>* face, HbrFace<T>* child, int index) {
-
-    typename HbrMesh<T>::InterpolateBoundaryMethod fvarinterp = mesh->GetFVarInterpolateBoundaryMethod();
-    const int fvarcount = mesh->GetFVarCount();
-    int fvarindex = 0;
-    const int nv = face->GetNumVertices();
-    bool extraordinary = (nv != 4);
-    HbrVertex<T> *v = face->GetVertex(index), *childVertex;
-    HbrHalfedge<T>* edge;
-
-    // We do the face subdivision rule first, because we may reuse the
-    // result (stored in fv2) for the other subdivisions.
-    float weight =  1.0f / nv;
-    // For the face center vertex, the facevarying data can be cleared
-    // and averaged en masse, since the subdivision rules don't change
-    // for any of the data - we use the smooth rule for all of it.
-    // And since we know that the fvardata for this particular vertex
-    // is smooth and therefore shareable amongst all incident faces,
-    // we don't have to allocate extra storage for it. We also don't
-    // have to compute it if some other face got to it first (as
-    // indicated by the IsInitialized() flag).
-    HbrFVarData<T>& fv2 = child->GetFVarData(extraordinary ? 2 : (index+2)%4);
-    if (!fv2.IsInitialized()) {
-        const int totalfvarwidth = mesh->GetTotalFVarWidth();
-        fv2.ClearAll(totalfvarwidth);
-        for (int j = 0; j < nv; ++j) {
-            fv2.AddWithWeightAll(face->GetFVarData(j), totalfvarwidth, weight);
-        }
-    }
-    assert(fv2.IsInitialized());
-
-    v->GuaranteeNeighbors();
-
-    // Make sure that that each of the vertices of the child face have
-    // the appropriate facevarying storage as needed. If there are
-    // discontinuities in any facevarying datum, the vertex must
-    // allocate a new block of facevarying storage specific to the
-    // child face.
-    bool fv0IsSmooth, fv1IsSmooth, fv3IsSmooth;
-
-    childVertex = child->GetVertex(extraordinary ? 0 : (index+0)%4);
-    fv0IsSmooth = v->IsFVarAllSmooth();
-    if (!fv0IsSmooth) {
-        childVertex->NewFVarData(child);
-    }
-    HbrFVarData<T>& fv0 = childVertex->GetFVarData(child);
-
-    edge = face->GetEdge(index);
-    GuaranteeNeighbor(mesh, edge);
-    assert(edge->GetOrgVertex() == v);
-    childVertex = child->GetVertex(extraordinary ? 1 : (index+1)%4);
-    fv1IsSmooth = !edge->IsFVarInfiniteSharpAnywhere();
-    if (!fv1IsSmooth) {
-        childVertex->NewFVarData(child);
-    }
-    HbrFVarData<T>& fv1 = childVertex->GetFVarData(child);
-
-    edge = edge->GetPrev();
-    GuaranteeNeighbor(mesh, edge);
-    assert(edge == face->GetEdge((index + nv - 1) % nv));
-    assert(edge->GetDestVertex() == v);
-    childVertex = child->GetVertex(extraordinary ? 3 : (index+3)%4);
-    fv3IsSmooth = !edge->IsFVarInfiniteSharpAnywhere();
-    if (!fv3IsSmooth) {
-        childVertex->NewFVarData(child);
-    }
-    HbrFVarData<T>& fv3 = childVertex->GetFVarData(child);
-    fvarindex = 0;
-    for (int fvaritem = 0; fvaritem < fvarcount; ++fvaritem) {
-        // Vertex subdivision rule. Analyze whether the vertex is on the
-        // boundary and whether it's an infinitely sharp corner. We
-        // determine the last by checking the propagate corners flag on
-        // the mesh; if it's off, we check the two edges of this face
-        // incident to that vertex and determining whether they are
-        // facevarying boundary edges - this is analogous to what goes on
-        // for the interpolateboundary tag (which when set to
-        // EDGEANDCORNER marks vertices with a valence of two as being
-        // sharp corners). If propagate corners is on, we check *all*
-        // faces to see if two edges side by side are facevarying boundary
-        // edges. The facevarying boundary check ignores geometric
-        // sharpness, otherwise we may swim at geometric creases which
-        // aren't actually discontinuous.
-        bool infcorner = false;
-        const int fvarwidth = mesh->GetFVarWidths()[fvaritem];
-        const unsigned char fvarmask = v->GetFVarMask(fvaritem);
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryEdgeAndCorner) {
-            if (fvarmask >= HbrVertex<T>::k_Corner) {
-                infcorner = true;
-            } else if (mesh->GetFVarPropagateCorners()) {
-                if (v->IsFVarCorner(fvaritem)) {
-                    infcorner = true;
-                }
-            } else {
-                if (face->GetEdge(index)->GetFVarSharpness(fvaritem, true) && face->GetEdge(index)->GetPrev()->GetFVarSharpness(fvaritem, true)) {
-                    infcorner = true;
-                }
-            }
-        }
-
-        // Infinitely sharp vertex rule. Applied if the vertex is:
-        // - undergoing no facevarying boundary interpolation;
-        // - at a geometric crease, in either boundary interpolation case; or
-        // - is an infinitely sharp facevarying vertex, in the EDGEANDCORNER case; or
-        // - has a mask equal or greater than one, in the "always
-        //   sharp" interpolate boundary case
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-            (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryAlwaysSharp &&
-             fvarmask >= 1) ||
-            v->GetSharpness() > HbrVertex<T>::k_Smooth ||
-            infcorner) {
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 1.0f);
-        }
-        // Dart rule: unlike geometric creases, because there's two
-        // discontinuous values for the one incident edge, we use the
-        // boundary rule and not the smooth rule
-        else if (fvarmask == 1) {
-            assert(!v->OnBoundary());
-
-            // Use 0.75 of the current vert
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.75f);
-
-            // 0.125 of "two adjacent edge vertices", which in actuality
-            // are the facevarying values of the same vertex but on each
-            // side of the single incident facevarying sharp edge
-            HbrHalfedge<T>* start = v->GetIncidentEdge(), *nextedge;
-            edge = start;
-            while (edge) {
-                if (edge->GetFVarSharpness(fvaritem)) {
-                    break;
-                }
-                nextedge = v->GetNextEdge(edge);
-                if (nextedge == start) {
-                    assert(0); // we should have found it by now
-                    break;
-                } else if (!nextedge) {
-                    // should never get into this case - if the vertex is
-                    // on a boundary, it can never be a facevarying dart
-                    // vertex
-                    assert(0);
-                    edge = edge->GetPrev();
-                    break;
-                } else {
-                    edge = nextedge;
-                }
-            }
-            HbrVertex<T>* w = edge->GetDestVertex();
-            HbrFace<T>* bestface = edge->GetLeftFace();
-            int j;
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-            bestface = edge->GetRightFace();
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-        }
-        // Boundary vertex rule
-        else if (fvarmask != 0) {
-
-            // Use 0.75 of the current vert
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.75f);
-
-            // Compute 0.125 of two adjacent edge vertices. However the
-            // two adjacent edge vertices we use must be part of the
-            // facevarying "boundary". To find the first edge we cycle
-            // counterclockwise around the current vertex v and look for
-            // the first boundary edge
-
-            HbrFace<T>* bestface = face;
-            HbrHalfedge<T>* bestedge = face->GetEdge(index)->GetPrev();
-            HbrHalfedge<T>* starte = bestedge->GetOpposite();
-            HbrVertex<T>* w = 0;
-            if (!starte) {
-                w = face->GetEdge(index)->GetPrev()->GetOrgVertex();
-            } else {
-                HbrHalfedge<T>* e = starte, *next;
-                assert(starte->GetOrgVertex() == v);
-                do {
-                    if (e->GetFVarSharpness(fvaritem) || !e->GetLeftFace()) {
-                        bestface = e->GetRightFace();
-                        bestedge = e;
-                        break;
-                    }
-                    next = v->GetNextEdge(e);
-                    if (!next) {
-                        bestface = e->GetLeftFace();
-                        w = e->GetPrev()->GetOrgVertex();
-                        break;
-                    }
-                    e = next;
-                } while (e && e != starte);
-            }
-            if (!w) w = bestedge->GetDestVertex();
-            int j;
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-
-            // Look for the other edge by cycling clockwise around v
-            bestface = face;
-            bestedge = face->GetEdge(index);
-            starte = bestedge;
-            w = 0;
-            if (HbrHalfedge<T>* e = starte) {
-                assert(starte->GetOrgVertex() == v);
-                do {
-                    if (e->GetFVarSharpness(fvaritem) || !e->GetRightFace()) {
-                        bestface = e->GetLeftFace();
-                        bestedge = e;
-                        break;
-                    }
-                    assert(e->GetOpposite());
-                    e = v->GetPreviousEdge(e);
-                } while (e && e != starte);
-            }
-            if (!w) w = bestedge->GetDestVertex();
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-
-        }
-        // Smooth rule. Here, we can take a shortcut if we know that
-        // the vertex is smooth and some other vertex has completely
-        // computed the facevarying values
-        else if (!fv0IsSmooth || !fv0.IsInitialized()) {
-            int valence = v->GetValence();
-            float invvalencesquared = 1.0f / (valence * valence);
-
-            // Use n-2/n of the current vertex value
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, invvalencesquared * valence * (valence - 2));
-
-            // Add 1/n^2 of surrounding edge vertices and surrounding face
-            // averages. We loop over all surrounding faces..
-            HbrHalfedge<T>* start = v->GetIncidentEdge(), *edge;
-            edge = start;
-            while (edge) {
-                HbrFace<T>* g = edge->GetLeftFace();
-                weight = invvalencesquared / g->GetNumVertices();
-                // .. and compute the average of each face. At the same
-                // time, we look for the edge on that face whose origin is
-                // the same as v, and add a contribution from its
-                // destination vertex value; this takes care of the
-                // surrounding edge vertex addition.
-                for (int j = 0; j < g->GetNumVertices(); ++j) {
-                    fv0.AddWithWeight(g->GetFVarData(j), fvarindex, fvarwidth, weight);
-                    if (g->GetEdge(j)->GetOrgVertex() == v) {
-                        fv0.AddWithWeight(g->GetFVarData((j + 1) % g->GetNumVertices()), fvarindex, fvarwidth, invvalencesquared);
-                    }
-                }
-                edge = v->GetNextEdge(edge);
-                if (edge == start) break;
-            }
-        }
-
-        // Edge subdivision rule
-        edge = face->GetEdge(index);
-
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-            edge->GetFVarSharpness(fvaritem) || edge->IsBoundary()) {
-
-            // Sharp edge rule
-            fv1.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.5f);
-            fv1.AddWithWeight(face->GetFVarData((index + 1) % nv), fvarindex, fvarwidth, 0.5f);
-        } else if (!fv1IsSmooth || !fv1.IsInitialized()) {
-            // Smooth edge subdivision. Add 0.25 of adjacent vertices
-            fv1.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.25f);
-            fv1.AddWithWeight(face->GetFVarData((index + 1) % nv), fvarindex, fvarwidth, 0.25f);
-            // Local subdivided face vertex
-            fv1.AddWithWeight(fv2, fvarindex, fvarwidth, 0.25f);
-            // Add 0.25 * average of neighboring face vertices
-            HbrFace<T>* oppFace = edge->GetRightFace();
-            weight = 0.25f / oppFace->GetNumVertices();
-            for (int j = 0; j < oppFace->GetNumVertices(); ++j) {
-                fv1.AddWithWeight(oppFace->GetFVarData(j), fvarindex, fvarwidth, weight);
-            }
-        }
-
-
-        // Edge subdivision rule
-        edge = edge->GetPrev();
-
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-            edge->GetFVarSharpness(fvaritem) || edge->IsBoundary()) {
-
-            // Sharp edge rule
-            fv3.SetWithWeight(face->GetFVarData((index + nv - 1) % nv), fvarindex, fvarwidth, 0.5f);
-            fv3.AddWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.5f);
-        } else if (!fv3IsSmooth || !fv3.IsInitialized()) {
-            // Smooth edge subdivision. Add 0.25 of adjacent vertices
-            fv3.SetWithWeight(face->GetFVarData((index + nv - 1) % nv), fvarindex, fvarwidth, 0.25f);
-            fv3.AddWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.25f);
-            // Local subdivided face vertex
-            fv3.AddWithWeight(fv2, fvarindex, fvarwidth, 0.25f);
-            // Add 0.25 * average of neighboring face vertices
-            HbrFace<T>* oppFace = edge->GetRightFace();
-            weight = 0.25f / oppFace->GetNumVertices();
-            for (int j = 0; j < oppFace->GetNumVertices(); ++j) {
-                fv3.AddWithWeight(oppFace->GetFVarData(j), fvarindex, fvarwidth, weight);
-            }
-        }
-
-        fvarindex += fvarwidth;
-    }
-    fv0.SetInitialized();
-    fv1.SetInitialized();
-    fv3.SetInitialized();
-
-}
-
-template <class T>
-void
-HbrCatmarkSubdivision<T>::transferEditsToChild(HbrFace<T>* face, HbrFace<T>* child, int index) {
-
-    // Hand down hole tag
-    child->SetHole(face->IsHole());
-
-    // Hand down pointers to hierarchical edits
-    if (HbrHierarchicalEdit<T>** edits = face->GetHierarchicalEdits()) {
-        while (HbrHierarchicalEdit<T>* edit = *edits) {
-            if (!edit->IsRelevantToFace(face)) break;
-            if (edit->GetNSubfaces() > face->GetDepth() &&
-                (edit->GetSubface(face->GetDepth()) == index)) {
-                child->SetHierarchicalEdits(edits);
-                break;
-            }
-            edits++;
-        }
-    }
-}
-
-
-template <class T>
-void
-HbrCatmarkSubdivision<T>::Refine(HbrMesh<T>* mesh, HbrFace<T>* face) {
-
-    // Create new quadrilateral children faces from this face
-    HbrFace<T>* child;
-    HbrVertex<T>* vertices[4];
-    HbrHalfedge<T>* edge = face->GetFirstEdge();
-    HbrHalfedge<T>* prevedge = edge->GetPrev();
-    HbrHalfedge<T>* childedge;
-    int nv = face->GetNumVertices();
-    float sharpness;
-    bool extraordinary = (nv != 4);
-    // The funny indexing on vertices is done only for
-    // non-extraordinary faces in order to correctly preserve
-    // parametric space through the refinement. If we split an
-    // extraordinary face then it doesn't matter.
-    for (int i = 0; i < nv; ++i) {
-        if (!face->GetChild(i)) {
-#ifdef HBR_DEBUG
-            std::cerr << "Kid " << i << "\n";
-#endif
-            HbrVertex<T>* vertex = edge->GetOrgVertex();
-            if (extraordinary) {
-                vertices[0] = vertex->Subdivide();
-                vertices[1] = edge->Subdivide();
-                vertices[2] = face->Subdivide();
-                vertices[3] = prevedge->Subdivide();
-            } else {
-                vertices[i] = vertex->Subdivide();
-                vertices[(i+1)%4] = edge->Subdivide();
-                vertices[(i+2)%4] = face->Subdivide();
-                vertices[(i+3)%4] = prevedge->Subdivide();
-            }
-            child = mesh->NewFace(4, vertices, face, i);
-#ifdef HBR_DEBUG
-            std::cerr << "Creating face " << *child << " during refine\n";
-#endif
-
-            // Hand down edge sharpnesses
-            childedge = vertex->Subdivide()->GetEdge(edge->Subdivide());
-            assert(childedge);
-            if ((sharpness = edge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                HbrSubdivision<T>::SubdivideCreaseWeight(
-                    edge, edge->GetOrgVertex(), childedge);
-            }
-            childedge->CopyFVarInfiniteSharpness(edge);
-
-            childedge = prevedge->Subdivide()->GetEdge(vertex->Subdivide());
-            assert(childedge);
-            if ((sharpness = prevedge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                HbrSubdivision<T>::SubdivideCreaseWeight(
-                    prevedge, prevedge->GetDestVertex(), childedge);
-            }
-            childedge->CopyFVarInfiniteSharpness(prevedge);
-
-            if (mesh->GetTotalFVarWidth()) {
-                transferFVarToChild(mesh, face, child, i);
-            }
-
-            // Special handling of ptex index for extraordinary faces: make
-            // sure the children get their indices reassigned to be
-            // consecutive within the block reserved for the parent.
-            if (face->GetNumVertices() != 4 && face->GetPtexIndex() != -1) {
-                child->SetPtexIndex(face->GetPtexIndex() + i);
-            }
-
-            transferEditsToChild(face, child, i);
-        }
-        prevedge = edge;
-        edge = edge->GetNext();
-    }
-}
-
-template <class T>
-HbrFace<T>*
-HbrCatmarkSubdivision<T>::RefineFaceAtVertex(HbrMesh<T>* mesh, HbrFace<T>* face, HbrVertex<T>* vertex) {
-
-#ifdef HBR_DEBUG
-    std::cerr << "    forcing refine on " << *face << " at " << *vertex << '\n';
-#endif
-
-    // Create new quadrilateral children faces from this face
-    HbrHalfedge<T>* edge = face->GetFirstEdge();
-    HbrHalfedge<T>* prevedge = edge->GetPrev();
-    HbrHalfedge<T>* childedge;
-    int nv = face->GetNumVertices();
-    float sharpness;
-    bool extraordinary = (nv != 4);
-    // The funny indexing on vertices is done only for
-    // non-extraordinary faces in order to correctly preserve
-    // parametric space through the refinement. If we split an
-    // extraordinary face then it doesn't matter.
-    for (int i = 0; i < nv; ++i) {
-        if (edge->GetOrgVertex() == vertex) {
-            if (!face->GetChild(i)) {
-                HbrFace<T>* child;
-                HbrVertex<T>* vertices[4];
-                if (extraordinary) {
-                    vertices[0] = vertex->Subdivide();
-                    vertices[1] = edge->Subdivide();
-                    vertices[2] = face->Subdivide();
-                    vertices[3] = prevedge->Subdivide();
-                } else {
-                    vertices[i] = vertex->Subdivide();
-                    vertices[(i+1)%4] = edge->Subdivide();
-                    vertices[(i+2)%4] = face->Subdivide();
-                    vertices[(i+3)%4] = prevedge->Subdivide();
-                }
-#ifdef HBR_DEBUG
-                std::cerr << "Kid " << i << "\n";
-                std::cerr << "  subdivision created " << *vertices[0] << '\n';
-                std::cerr << "  subdivision created " << *vertices[1] << '\n';
-                std::cerr << "  subdivision created " << *vertices[2] << '\n';
-                std::cerr << "  subdivision created " << *vertices[3] << '\n';
-#endif
-                child = mesh->NewFace(4, vertices, face, i);
-#ifdef HBR_DEBUG
-                std::cerr << "Creating face " << *child << " during refine\n";
-#endif
-                // Hand down edge sharpness
-                childedge = vertex->Subdivide()->GetEdge(edge->Subdivide());
-                assert(childedge);
-                if ((sharpness = edge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                    HbrSubdivision<T>::SubdivideCreaseWeight(
-                        edge, edge->GetOrgVertex(), childedge);
-                }
-                childedge->CopyFVarInfiniteSharpness(edge);
-
-                childedge = prevedge->Subdivide()->GetEdge(vertex->Subdivide());
-                assert(childedge);
-                if ((sharpness = prevedge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                    HbrSubdivision<T>::SubdivideCreaseWeight(
-                        prevedge, prevedge->GetDestVertex(), childedge);
-                }
-                childedge->CopyFVarInfiniteSharpness(prevedge);
-
-                if (mesh->GetTotalFVarWidth()) {
-                    transferFVarToChild(mesh, face, child, i);
-                }
-
-                // Special handling of ptex index for extraordinary faces: make
-                // sure the children get their indices reassigned to be
-                // consecutive within the block reserved for the parent.
-                if (face->GetNumVertices() != 4 && face->GetPtexIndex() != -1) {
-                    child->SetPtexIndex(face->GetPtexIndex() + i);
-                }
-
-                transferEditsToChild(face, child, i);
-                return child;
-            } else {
-                return face->GetChild(i);
-            }
-        }
-        prevedge = edge;
-        edge = edge->GetNext();
-    }
-    return 0;
-}
-
-template <class T>
-void
-HbrCatmarkSubdivision<T>::GuaranteeNeighbor(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) {
-    if (edge->GetOpposite()) {
-        return;
-    }
-
-    // For the given edge: if the parent of either of its incident
-    // vertices is itself a _face_, then ensuring that this parent
-    // face has refined at a particular vertex is sufficient to
-    // ensure that both of the faces on each side of the edge have
-    // been created.
-    bool destParentWasEdge = true;
-    HbrFace<T>* parentFace = edge->GetOrgVertex()->GetParentFace();
-    HbrHalfedge<T>* parentEdge = edge->GetDestVertex()->GetParentEdge();
-    if (!parentFace) {
-        destParentWasEdge = false;
-        parentFace = edge->GetDestVertex()->GetParentFace();
-        parentEdge = edge->GetOrgVertex()->GetParentEdge();
-    }
-
-    if (parentFace) {
-
-        // Make sure we deal with a parent halfedge which is
-        // associated with the parent face
-        if (parentEdge->GetFace() != parentFace) {
-            parentEdge = parentEdge->GetOpposite();
-        }
-        // If one of the vertices had a parent face, the other one MUST
-        // have been a child of an edge
-        assert(parentEdge && parentEdge->GetFace() == parentFace);
-#ifdef HBR_DEBUG
-        std::cerr << "\nparent edge is " << *parentEdge << "\n";
-#endif
-
-        // The vertex to refine at depends on whether the
-        // destination or origin vertex of this edge had a parent
-        // edge
-        if (destParentWasEdge) {
-            RefineFaceAtVertex(mesh, parentFace, parentEdge->GetOrgVertex());
-        } else {
-            RefineFaceAtVertex(mesh, parentFace, parentEdge->GetDestVertex());
-        }
-
-        // It should always be the case that the opposite now exists -
-        // we can't have a boundary case here
-        assert(edge->GetOpposite());
-    } else {
-        HbrVertex<T>* parentVertex = edge->GetOrgVertex()->GetParentVertex();
-        parentEdge = edge->GetDestVertex()->GetParentEdge();
-        if (!parentVertex) {
-            parentVertex = edge->GetDestVertex()->GetParentVertex();
-            parentEdge = edge->GetOrgVertex()->GetParentEdge();
-        }
-
-        if (parentVertex) {
-
-            assert(parentEdge);
-
-#ifdef HBR_DEBUG
-            std::cerr << "\nparent edge is " << *parentEdge << "\n";
-#endif
-
-            // 1. Go up to the parent of my face
-
-            parentFace = edge->GetFace()->GetParent();
-#ifdef HBR_DEBUG
-            std::cerr << "\nparent face is " << *parentFace << "\n";
-#endif
-
-            // 2. Ask the opposite face (if it exists) to refine
-            if (parentFace) {
-
-                // A vertex can be associated with either of two
-                // parent halfedges. If the parent edge that we're
-                // interested in doesn't match then we should look at
-                // its opposite
-                if (parentEdge->GetFace() != parentFace)
-                    parentEdge = parentEdge->GetOpposite();
-                assert(parentEdge->GetFace() == parentFace);
-
-                // Make sure the parent edge has its neighbor as well
-                GuaranteeNeighbor(mesh, parentEdge);
-
-                // Now access that neighbor and refine it
-                if (parentEdge->GetRightFace()) {
-                    RefineFaceAtVertex(mesh, parentEdge->GetRightFace(), parentVertex);
-
-                    // FIXME: assertion?
-                    assert(edge->GetOpposite());
-                }
-            }
-        }
-    }
-}
-
-template <class T>
-void
-HbrCatmarkSubdivision<T>::GuaranteeNeighbors(HbrMesh<T>* mesh, HbrVertex<T>* vertex) {
-
-#ifdef HBR_DEBUG
-    std::cerr << "\n\nneighbor guarantee at " << *vertex << " invoked\n";
-#endif
-
-    // If the vertex is a child of a face, guaranteeing the neighbors
-    // of the vertex is simply a matter of ensuring the parent face
-    // has refined.
-    HbrFace<T>* parentFace = vertex->GetParentFace();
-    if (parentFace) {
-
-#ifdef HBR_DEBUG
-        std::cerr << "  forcing full refine on parent face\n";
-#endif
-        Refine(mesh, parentFace);
-        return;
-    }
-
-    // Otherwise if the vertex is a child of an edge, we need to
-    // ensure that the parent faces on either side of the parent edge
-    // 1) exist, and 2) have refined at both vertices of the parent
-    // edge
-    HbrHalfedge<T>* parentEdge = vertex->GetParentEdge();
-    if (parentEdge) {
-
-#ifdef HBR_DEBUG
-        std::cerr << "  forcing full refine on adjacent faces of parent edge\n";
-#endif
-        HbrVertex<T>* dest = parentEdge->GetDestVertex();
-        HbrVertex<T>* org = parentEdge->GetOrgVertex();
-        GuaranteeNeighbor(mesh, parentEdge);
-        parentFace = parentEdge->GetLeftFace();
-        RefineFaceAtVertex(mesh, parentFace, dest);
-        RefineFaceAtVertex(mesh, parentFace, org);
-
-#ifdef HBR_DEBUG
-        std::cerr << "    on the right face?\n";
-#endif
-        parentFace = parentEdge->GetRightFace();
-        // The right face may not necessarily exist even after
-        // GuaranteeNeighbor
-        if (parentFace) {
-            RefineFaceAtVertex(mesh, parentFace, dest);
-            RefineFaceAtVertex(mesh, parentFace, org);
-        }
-#ifdef HBR_DEBUG
-        std::cerr << "  end force\n";
-#endif
-        return;
-    }
-
-    // The last case: the vertex is a child of a vertex. In this case
-    // we have to first recursively guarantee that the parent's
-    // adjacent faces also exist.
-    HbrVertex<T>* parentVertex = vertex->GetParentVertex();
-    if (parentVertex) {
-
-#ifdef HBR_DEBUG
-        std::cerr << "  recursive parent vertex guarantee call\n";
-#endif
-        parentVertex->GuaranteeNeighbors();
-
-        // And then we refine all the face neighbors of the
-        // parentVertex
-        HbrHalfedge<T>* start = parentVertex->GetIncidentEdge(), *edge;
-        edge = start;
-        while (edge) {
-            HbrFace<T>* f = edge->GetLeftFace();
-            RefineFaceAtVertex(mesh, f, parentVertex);
-            edge = parentVertex->GetNextEdge(edge);
-            if (edge == start) break;
-        }
-    }
-}
-
-template <class T>
-bool
-HbrCatmarkSubdivision<T>::HasLimit(HbrMesh<T>* mesh, HbrFace<T>* face) {
-
-    if (face->IsHole()) return false;
-    // A limit face exists if all the bounding edges have limit curves
-    for (int i = 0; i < face->GetNumVertices(); ++i) {
-        if (!HasLimit(mesh, face->GetEdge(i))) {
-            return false;
-        }
-    }
-    return true;
-}
-
-template <class T>
-bool
-HbrCatmarkSubdivision<T>::HasLimit(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) {
-    //  A sharp edge has a limit curve if both endpoints have limits.
-    //  A smooth edge has a limit if both endpoints have limits and
-    //  the edge isn't on the boundary.
-
-    if (edge->GetSharpness() >= HbrHalfedge<T>::k_InfinitelySharp) return true;
-
-    if (!HasLimit(mesh, edge->GetOrgVertex()) || !HasLimit(mesh, edge->GetDestVertex())) return false;
-
-    return !edge->IsBoundary();
-}
-
-template <class T>
-bool
-HbrCatmarkSubdivision<T>::HasLimit(HbrMesh<T>* /* mesh */, HbrVertex<T>* vertex) {
-    vertex->GuaranteeNeighbors();
-    switch (vertex->GetMask(false)) {
-        case HbrVertex<T>::k_Smooth:
-        case HbrVertex<T>::k_Dart:
-            return !vertex->OnBoundary();
-            break;
-        case HbrVertex<T>::k_Crease:
-        case HbrVertex<T>::k_Corner:
-        default:
-            if (vertex->IsVolatile()) {
-                // Search for any incident semisharp boundary edge
-                HbrHalfedge<T>* start = vertex->GetIncidentEdge(), *edge, *next;
-                edge = start;
-                while (edge) {
-                    if (edge->IsBoundary() && edge->GetSharpness() < HbrHalfedge<T>::k_InfinitelySharp) {
-                        return false;
-                    }
-                    next = vertex->GetNextEdge(edge);
-                    if (next == start) {
-                        break;
-                    } else if (!next) {
-                        edge = edge->GetPrev();
-                        if (edge->IsBoundary() && edge->GetSharpness() < HbrHalfedge<T>::k_InfinitelySharp) {
-                            return false;
-                        }
-                        break;
-                    } else {
-                        edge = next;
-                    }
-                }
-            }
-            return true;
-    }
-}
-
-template <class T>
-HbrVertex<T>*
-HbrCatmarkSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrFace<T>* face) {
-
-    // Face rule: simply average all vertices on the face
-    HbrVertex<T>* v = mesh->NewVertex();
-    T& data = v->GetData();
-    int nv = face->GetNumVertices();
-    float weight = 1.0f / nv;
-
-    HbrHalfedge<T>* edge = face->GetFirstEdge();
-    for (int i = 0; i < face->GetNumVertices(); ++i) {
-        HbrVertex<T>* w = edge->GetOrgVertex();
-        // If there are vertex edits we have to make sure the edit
-        // has been applied
-        if (mesh->HasVertexEdits()) {
-            w->GuaranteeNeighbors();
-        }
-        data.AddWithWeight(w->GetData(), weight);
-        data.AddVaryingWithWeight(w->GetData(), weight);
-        edge = edge->GetNext();
-    }
-#ifdef HBR_DEBUG
-    std::cerr << "Subdividing at " << *face << "\n";
-#endif
-
-    // Set the extraordinary flag if the face had anything other than
-    // 4 vertices
-    if (nv != 4) v->SetExtraordinary();
-
-#ifdef HBR_DEBUG
-    std::cerr << "  created " << *v << "\n";
-#endif
-    return v;
-}
-
-#if 0
-// The "old" triangle subdivision method modifies the face subdivision
-// rule. Unfortunately we can't put simply put this code into the
-// standard face Subdivide method, because that would disrupt the
-// averages computed for adjacent edges and vertices (which rely on
-// face averages computed using the standard Catmull-Clark method).
-// Instead we must call this after a face has been Subdivided using
-// the normal rule; this code will modify that face's subdivided
-// vertex value only.
-template <class T>
-HbrVertex<T>*
-HbrCatmarkSubdivision<T>::OldTriangleSubdivide(HbrMesh<T>* mesh, HbrFace<T>* face) {
-    assert(face->GetNumVertices() == 3 && triangleSubdivision == k_Old);
-    HbrVertex<T>* w = face->Subdivide();
-    NgpVVectorItem& data = w->GetData();
-    data.Clear();
-
-    float weight = 1.0f / 6.0f;
-
-    for (int i = 0; i < 3; ++i) {
-        HbrVertex<T>* w = face->GetVertex(i);
-        HbrHalfedge<T>* e = face->GetEdge(i);
-        data.AddWithWeight(w->Subdivide()->GetData(), weight);
-        data.AddWithWeight(e->Subdivide()->GetData(), weight);
-    }
-}
-#endif
-
-/* This comment describe the "new" triangle subdivision method, which
-   modifies only the edge subdivision rule:
-
-   The "smoothtriangles" tag makes triangular faces smoother.  This is done
-   by modifying the first level of subdivision in order to generate a limit
-   surface that is closer to what Loop subdivision would yield.  Note that
-   there is no extra expense in forcing one level of subdivision, since
-   extraordinary faces need to be subdivided at least once anyway.
-
-   We have two degrees of freedom to play with, namely the weight assigned
-   to each neighbouring vertex when subdividing a vertex, and the weight
-   assigned to each neighbouring face vertex when subdividing an edge.  Our
-   initial strategy for choosing these parameters was to derive the limit
-   masks (position and tangent) for the Catmull-Clark and Loop schemes at
-   three representative points: each original vertex, the center of each
-   original edge, and the center of each original face.  The parameter
-   values were then optimized to get the best least-squares match to the
-   limit positions and tangents of the Loop surface at these chosen points.
-   (In the case of tangents an extra scale factor was used so that only the
-   tangent direction is optimized rather than its magnitude.)  All this was
-   done using Mathematica.
-
-   Although the resulting surfaces were much smoother, there was still some
-   degree of "ringing" (probably due to the fact that the surface was
-   optimized at a discrete set of points, rather than by integrating over
-   the surface).  We then tried a second strategy, namely choosing the
-   vertex weights to minimize surface curvature.  This was done by setting
-   up test cases for extraordinary vertices of each degree, rendering an
-   animation using a range of parameter values, and integrating the
-   curvature over each surface (with a shader and some scripts).  We chose
-   to minimize the squared mean curvature, which seemed to have the best
-   correspondence to surfaces that look "smooth".
-
-   Surprisingly, the vertex weights obtained in this way were not
-   significantly different than the standard Catmull-Clark weights.
-   Thus the final "smooth triangles" technique only modifies the edge
-   subdivision rule: the adjacent face vertices are weighted by
-   HBR_SMOOTH_TRI_EDGE_WEIGHT rather than the standard CC value of 0.25.
-   If there is a mixture of triangular and non-triangular faces, the
-   weights are interpolated. */
-
-#define HBR_SMOOTH_TRI_EDGE_WEIGHT      0.470f  /* from Mathematica */
-
-template <class T>
-HbrVertex<T>*
-HbrCatmarkSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) {
-
-    // Ensure the opposite face exists.
-    GuaranteeNeighbor(mesh, edge);
-
-    float esharp = edge->GetSharpness();
-
-#ifdef HBR_DEBUG
-    std::cerr << "Subdividing at " << *edge << " (sharpness = " << esharp << ")";
-#endif
-
-    HbrVertex<T>* v = mesh->NewVertex();
-    T& data = v->GetData();
-
-    // If there's the possibility of vertex edits on either vertex, we
-    // have to make sure the edit has been applied
-    if (mesh->HasVertexEdits()) {
-        edge->GetOrgVertex()->GuaranteeNeighbors();
-        edge->GetDestVertex()->GuaranteeNeighbors();
-    }
-
-    if (!edge->IsBoundary() && esharp <= 1.0f) {
-
-        // Of the two half-edges, pick one of them consistently such
-        // that the left and right faces are also consistent through
-        // multi-threading. It doesn't matter as far as the
-        // theoretical calculation is concerned, but it is desirable
-        // to be consistent about it in the face of the limitations of
-        // floating point commutativity. So we always pick the
-        // half-edge such that its incident face is the smallest of
-        // the two faces, as far as the face paths are concerned.
-        if (edge->GetOpposite() && edge->GetOpposite()->GetFace()->GetPath() < edge->GetFace()->GetPath()) {
-            edge = edge->GetOpposite();
-        }
-
-        // Handle both the smooth and fractional sharpness cases.  We
-        // lerp between the sharp case (average of the two end points)
-        // and the unsharp case (average of two end points plus two
-        // face averages).
-
-        float leftWeight, rightWeight, faceWeight, vertWeight;
-        HbrFace<T>* rf = edge->GetRightFace();
-        HbrFace<T>* lf = edge->GetLeftFace();
-
-        // The standard catmull-clark rule for face weights is 0.25.
-        // The modified, new triangle subdivision rule uses a value of
-        // SMOOTH_TRI_EDGE_WEIGHT as defined above. We lerp between
-        // the right and left weights as needed.
-        leftWeight = (triangleSubdivision == k_New && lf->GetNumVertices() == 3) ? HBR_SMOOTH_TRI_EDGE_WEIGHT : 0.25f;
-        rightWeight = (triangleSubdivision == k_New && rf->GetNumVertices() == 3) ? HBR_SMOOTH_TRI_EDGE_WEIGHT : 0.25f;
-        faceWeight = 0.5f * (leftWeight + rightWeight);
-        vertWeight = 0.5f * (1.0f - 2.0f * faceWeight);
-
-        // Lerp the face weight between non sharp contribution and
-        // sharp contribution (which is zero)
-        faceWeight *= (1.0f - esharp);
-
-        // Lerp the vert weight between non sharp contribution and
-        // sharp contribution of 0.5f
-        vertWeight = 0.5f * esharp + (1.0f - esharp) * vertWeight;
-
-        data.AddWithWeight(edge->GetOrgVertex()->GetData(), vertWeight);
-        data.AddWithWeight(edge->GetDestVertex()->GetData(), vertWeight);
-
-        data.AddWithWeight(lf->Subdivide()->GetData(), faceWeight);
-        data.AddWithWeight(rf->Subdivide()->GetData(), faceWeight);
-    } else {
-        // Fully sharp edge, just average the two end points
-        data.AddWithWeight(edge->GetOrgVertex()->GetData(), 0.5f);
-        data.AddWithWeight(edge->GetDestVertex()->GetData(), 0.5f);
-    }
-
-    // Varying data is always the average of two end points
-    data.AddVaryingWithWeight(edge->GetOrgVertex()->GetData(), 0.5f);
-    data.AddVaryingWithWeight(edge->GetDestVertex()->GetData(), 0.5f);
-
-#ifdef HBR_DEBUG
-    std::cerr << "  created " << *v << "\n";
-#endif
-    return v;
-}
-
-template <class T>
-HbrVertex<T>*
-HbrCatmarkSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrVertex<T>* vertex) {
-
-    // Ensure the ring of faces around this vertex exists before
-    // we compute the valence
-    vertex->GuaranteeNeighbors();
-
-    float valence = static_cast<float>(vertex->GetValence());
-    float invvalencesquared = 1.0f / (valence * valence);
-
-
-    HbrVertex<T>* v = mesh->NewVertex();
-    T& data = v->GetData();
-
-    // Due to fractional weights we may need to do two subdivision
-    // passes
-    int masks[2];
-    float weights[2];
-    int passes;
-    masks[0] = vertex->GetMask(false);
-    masks[1] = vertex->GetMask(true);
-    // If the masks are different, we subdivide twice: once using the
-    // current mask, once using the mask at the next level of
-    // subdivision, then use fractional mask weights to weigh
-    // each weighing
-    if (masks[0] != masks[1]) {
-        weights[1] = vertex->GetFractionalMask();
-        weights[0] = 1.0f - weights[1];
-        passes = 2;
-    } else {
-        weights[0] = 1.0f;
-        weights[1] = 0.0f;
-        passes = 1;
-    }
-    for (int i = 0; i < passes; ++i) {
-        switch (masks[i]) {
-            case HbrVertex<T>::k_Smooth:
-            case HbrVertex<T>::k_Dart: {
-                // Compute n-2/n of the old vertex value
-                data.AddWithWeight(vertex->GetData(), weights[i] * invvalencesquared * valence * (valence - 2));
-                // Add 1 / n^2 * surrounding edge vertices and surrounding face
-                // subdivided vertices
-                HbrSubdivision<T>::AddSurroundingVerticesWithWeight(
-                    mesh, vertex, weights[i] * invvalencesquared, &data);
-
-                HbrHalfedge<T>* start = vertex->GetIncidentEdge(), *edge;
-                edge = start;
-                while (edge) {
-                    HbrFace<T>* f = edge->GetLeftFace();
-                    data.AddWithWeight(f->Subdivide()->GetData(), weights[i] * invvalencesquared);
-                    edge = vertex->GetNextEdge(edge);
-                    if (edge == start) break;
-                }
-                break;
-            }
-            case HbrVertex<T>::k_Crease: {
-                // Compute 3/4 of old vertex value
-                data.AddWithWeight(vertex->GetData(), weights[i] * 0.75f);
-
-                // Add 0.125f of the (hopefully only two!) neighbouring
-                // sharp edges
-                HbrSubdivision<T>::AddCreaseEdgesWithWeight(
-                    mesh, vertex, i == 1, weights[i] * 0.125f, &data);
-                break;
-            }
-            case HbrVertex<T>::k_Corner:
-            default: {
-                // Just copy the old value
-                data.AddWithWeight(vertex->GetData(), weights[i]);
-                break;
-            }
-        }
-    }
-
-    // Varying data is always just propagated down
-    data.AddVaryingWithWeight(vertex->GetData(), 1.0f);
-
-#ifdef HBR_DEBUG
-    std::cerr << "Subdividing at " << *vertex << "\n";
-    std::cerr << "  created " << *v << "\n";
-#endif
-    // Inherit extraordinary flag and sharpness
-    if (vertex->IsExtraordinary()) v->SetExtraordinary();
-    float sharp = vertex->GetSharpness();
-    if (sharp >= HbrVertex<T>::k_InfinitelySharp) {
-        v->SetSharpness(HbrVertex<T>::k_InfinitelySharp);
-    } else if (sharp > HbrVertex<T>::k_Smooth) {
-        sharp -= 1.0f;
-        if (sharp < (float) HbrVertex<T>::k_Smooth) {
-            sharp = (float) HbrVertex<T>::k_Smooth;
-        }
-        v->SetSharpness(sharp);
-    } else {
-        v->SetSharpness(HbrVertex<T>::k_Smooth);
-    }
-    return v;
-}
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRCATMARK_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/cornerEdit.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/cornerEdit.h
deleted file mode 100644
index e8b9b2f05..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/cornerEdit.h
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRCORNEREDIT_H
-#define OPENSUBDIV3_HBRCORNEREDIT_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrCornerEdit;
-
-template <class T>
-std::ostream& operator<<(std::ostream& out, const HbrCornerEdit<T>& path) {
-    out << "vertex path = (" << path.faceid << ' ';
-    for (int i = 0; i < path.nsubfaces; ++i) {
-        out << static_cast<int>(path.subfaces[i]) << ' ';
-    }
-    return out << static_cast<int>(path.vertexid) << "), sharpness = " << path.sharpness;
-}
-
-template <class T>
-class HbrCornerEdit : public HbrHierarchicalEdit<T> {
-
-public:
-
-    HbrCornerEdit(int _faceid, int _nsubfaces, unsigned char *_subfaces, unsigned char _vertexid, typename HbrHierarchicalEdit<T>::Operation _op, float _sharpness)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), vertexid(_vertexid), op(_op), sharpness(_sharpness) {
-    }
-
-    HbrCornerEdit(int _faceid, int _nsubfaces, int *_subfaces, int _vertexid, typename HbrHierarchicalEdit<T>::Operation _op, float _sharpness)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), vertexid(static_cast<unsigned char>(_vertexid)), op(_op), sharpness(_sharpness) {
-    }
-
-    virtual ~HbrCornerEdit() {}
-
-    friend std::ostream& operator<< <T> (std::ostream& out, const HbrCornerEdit<T>& path);
-
-    virtual void ApplyEditToFace(HbrFace<T>* face) {
-        if (HbrHierarchicalEdit<T>::GetNSubfaces() == face->GetDepth()) {
-            // Modify vertex sharpness. Note that we could actually do
-            // this in ApplyEditToVertex as well!
-            float sharp = 0.0f;
-            if (op == HbrHierarchicalEdit<T>::Set) {
-                sharp = sharpness;
-            } else if (op == HbrHierarchicalEdit<T>::Add) {
-                sharp = face->GetVertex(vertexid)->GetSharpness() + sharpness;
-            } else if (op == HbrHierarchicalEdit<T>::Subtract) {
-                sharp = face->GetVertex(vertexid)->GetSharpness() - sharpness;
-            }
-            if (sharp < HbrVertex<T>::k_Smooth) {
-                sharp = HbrVertex<T>::k_Smooth;
-            }
-            if (sharp > HbrVertex<T>::k_InfinitelySharp) {
-                sharp = HbrVertex<T>::k_InfinitelySharp;
-            }
-            face->GetVertex(vertexid)->SetSharpness(sharp);
-        }
-    }
-
-private:
-    // ID of the edge (you can think of this also as the id of the
-    // origin vertex of the two-vertex length edge)
-    const unsigned char vertexid;
-    typename HbrHierarchicalEdit<T>::Operation op;
-    // sharpness of the vertex edit
-    const float sharpness;
-};
-
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRCORNEREDIT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/creaseEdit.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/creaseEdit.h
deleted file mode 100644
index 3f979dc27..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/creaseEdit.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRCREASEEDIT_H
-#define OPENSUBDIV3_HBRCREASEEDIT_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrCreaseEdit;
-
-template <class T>
-std::ostream& operator<<(std::ostream& out, const HbrCreaseEdit<T>& path) {
-    out << "edge path = (" << path.faceid << ' ';
-    for (int i = 0; i < path.nsubfaces; ++i) {
-        out << static_cast<int>(path.subfaces[i]) << ' ';
-    }
-    return out << static_cast<int>(path.edgeid) << "), sharpness = " << path.sharpness;
-}
-
-template <class T>
-class HbrCreaseEdit : public HbrHierarchicalEdit<T> {
-
-public:
-
-    HbrCreaseEdit(int _faceid, int _nsubfaces, unsigned char *_subfaces, unsigned char _edgeid, typename HbrHierarchicalEdit<T>::Operation _op, float _sharpness)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), edgeid(_edgeid), op(_op), sharpness(_sharpness) {
-    }
-
-    HbrCreaseEdit(int _faceid, int _nsubfaces, int *_subfaces, int _edgeid, typename HbrHierarchicalEdit<T>::Operation _op, float _sharpness)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), edgeid(static_cast<unsigned char>(_edgeid)), op(_op), sharpness(_sharpness) {
-    }
-
-    virtual ~HbrCreaseEdit() {}
-
-    friend std::ostream& operator<< <T> (std::ostream& out, const HbrCreaseEdit<T>& path);
-
-    virtual void ApplyEditToFace(HbrFace<T>* face) {
-        if (HbrHierarchicalEdit<T>::GetNSubfaces() == face->GetDepth()) {
-            // Modify edge sharpness
-            float sharp=0.0f;
-            if (op == HbrHierarchicalEdit<T>::Set) {
-                sharp = sharpness;
-            } else if (op == HbrHierarchicalEdit<T>::Add) {
-                sharp = face->GetEdge(edgeid)->GetSharpness() + sharpness;
-            } else if (op == HbrHierarchicalEdit<T>::Subtract) {
-                sharp = face->GetEdge(edgeid)->GetSharpness() - sharpness;
-            }
-            if (sharp < HbrHalfedge<T>::k_Smooth)
-                sharp = HbrHalfedge<T>::k_Smooth;
-            if (sharp > HbrHalfedge<T>::k_InfinitelySharp)
-                sharp = HbrHalfedge<T>::k_InfinitelySharp;
-            // We have to make sure the neighbor of the edge exists at
-            // this point. Otherwise, if it comes into being late, it
-            // will clobber the overriden sharpness and we will lose
-            // the edit.
-            face->GetEdge(edgeid)->GuaranteeNeighbor();
-            face->GetEdge(edgeid)->SetSharpness(sharp);
-        }
-    }
-
-private:
-    // ID of the edge (you can think of this also as the id of the
-    // origin vertex of the two-vertex length edge)
-    const unsigned char edgeid;
-    typename HbrHierarchicalEdit<T>::Operation op;
-    // sharpness of the edge edit
-    const float sharpness;
-};
-
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRCREASEEDIT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/face.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/face.h
deleted file mode 100644
index 6c2fde62c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/face.h
+++ /dev/null
@@ -1,1029 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRFACE_H
-#define OPENSUBDIV3_HBRFACE_H
-
-#include <assert.h>
-#include <cstdio>
-#include <functional>
-#include <iostream>
-#include <algorithm>
-#include <vector>
-
-#include "../hbr/fvarData.h"
-#include "../hbr/allocator.h"
-#ifdef HBRSTITCH
-#include "libgprims/stitch.h"
-#include "libgprims/stitchInternal.h"
-#endif
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrVertex;
-template <class T> class HbrHalfedge;
-template <class T> class HbrFace;
-template <class T> class HbrMesh;
-template <class T> class HbrHierarchicalEdit;
-
-template <class T> std::ostream& operator<<(std::ostream& out, const HbrFace<T>& face);
-
-// A descriptor for a path to a face
-struct HbrFacePath {
-    void Print() const {
-        printf("%d", topface);
-        for (std::vector<int>::const_reverse_iterator i = remainder.rbegin(); i != remainder.rend(); ++i) {
-            printf(" %d", *i);
-        }
-        printf("\n");
-    }
-
-    int topface;
-    // Note that the elements in remainder are stored in reverse order.
-    std::vector<int> remainder;
-    friend bool operator< (const HbrFacePath& x, const HbrFacePath& y);
-};
-
-inline bool operator< (const HbrFacePath& x, const HbrFacePath& y) {
-    if (x.topface != y.topface) {
-        return x.topface < y.topface;
-    } else if (x.remainder.size() != y.remainder.size()) {
-        return x.remainder.size() < y.remainder.size();
-    } else {
-        std::vector<int>::const_reverse_iterator i = x.remainder.rbegin();
-        std::vector<int>::const_reverse_iterator j = y.remainder.rbegin();
-        for ( ; i != x.remainder.rend(); ++i, ++j) {
-            if (*i != *j) return (*i < *j);
-        }
-        return true;
-    }
-}
-
-// A simple wrapper around an array of four children. Used to block
-// allocate pointers to children of HbrFace in the common case
-template <class T>
-class HbrFaceChildren {
-public:
-    HbrFace<T> *& operator[](const int index) {
-        return children[index];
-    }
-
-    const HbrFace<T> *& operator[](const int index) const {
-        return children[index];
-    }
-    
-
-private:
-    friend class HbrAllocator<HbrFaceChildren<T> >;
-
-    // Used by block allocator
-    HbrFaceChildren<T>*& GetNext() { return (HbrFaceChildren<T>*&) children; }
-    
-    HbrFaceChildren() {}
-
-    ~HbrFaceChildren() {}
-
-    HbrFace<T> *children[4];
-};
-
-template <class T> class HbrFace {
-
-private:
-    friend class HbrAllocator<HbrFace<T> >;
-    friend class HbrHalfedge<T>;
-    HbrFace();
-    ~HbrFace();
-
-public:
-
-    void Initialize(HbrMesh<T>* mesh, HbrFace<T>* parent, int childindex, int id, int uindex, int nvertices, HbrVertex<T>** vertices, int fvarwidth = 0, int depth = 0);
-    void Destroy();
-
-    // Returns the mesh to which this face belongs
-    HbrMesh<T>* GetMesh() const { return mesh; }
-
-    // Return number of vertices
-    int GetNumVertices() const { return nvertices; }
-
-    // Return face ID
-    int GetID() const { return id; }
-
-    // Return the first halfedge of the face
-    HbrHalfedge<T>* GetFirstEdge() const {
-        if (nvertices > 4) {
-            return (HbrHalfedge<T>*)(extraedges);
-        } else {
-            return const_cast<HbrHalfedge<T>*>(&edges[0]);
-        }
-    }
-
-    // Return the halfedge which originates at the vertex with the
-    // indicated origin index
-    HbrHalfedge<T>* GetEdge(int index) const;
-
-    // Return the vertex with the indicated index
-    HbrVertex<T>* GetVertex(int index) const;
-
-    // Return the ID of the vertex with the indicated index
-    int GetVertexID(int index) const;
-
-    // Return the parent of this face
-    HbrFace<T>* GetParent() const {
-        if (parent == -1) return NULL;
-        return mesh->GetFace(parent);
-    }
-
-    // Set the child
-    void SetChild(int index, HbrFace<T>* face);
-
-    // Return the child with the indicated index
-    HbrFace<T>* GetChild(int index) const {
-        int nchildren = mesh->GetSubdivision()->GetFaceChildrenCount(nvertices);
-        if (!children.children || index < 0 || index >= nchildren) return 0;
-        if (nchildren > 4) {
-            return children.extrachildren[index];
-        } else {
-            return (*children.children)[index];
-        }
-    }
-
-    // Subdivide the face into a vertex if needed and return
-    HbrVertex<T>* Subdivide();
-
-    bool HasChildVertex() const { return vchild!=-1; }
-
-    // Remove the reference to subdivided vertex
-    void RemoveChild() { vchild = -1; }
-
-    // "Hole" flags used by subdivision to drop faces
-    bool IsHole() const { return hole; }
-    void SetHole(bool h=1) { hole = h; }
-
-    // Coarse faces are the top level faces of a mesh. This will be
-    // set by mesh->Finish()
-    bool IsCoarse() const { return coarse; }
-    void SetCoarse() { coarse = 1; }
-
-    // Protected faces cannot be garbage collected; this may be set on
-    // coarse level faces if the mesh is shared
-    bool IsProtected() const { return protect; }
-    void SetProtected() { protect = 1; }
-    void ClearProtected() { protect = 0; }
-
-    // Simple bookkeeping needed for garbage collection by HbrMesh
-    bool IsCollected() const { return collected; }
-    void SetCollected() { collected = 1; }
-    void ClearCollected() { collected = 0; }
-
-    // Refine the face
-    void Refine();
-
-    // Unrefine the face
-    void Unrefine();
-
-    // Returns true if the face has a limit surface
-    bool HasLimit();
-
-    // Returns memory statistics
-    unsigned long GetMemStats() const;
-
-    // Return facevarying data from the appropriate vertex index
-    // registered to this face. Note that this may either be "generic"
-    // facevarying item (data.GetFace() == 0) or one specifically
-    // registered to the face (data.GetFace() == this) - this is
-    // important when trying to figure out whether the vertex has
-    // created some storage for the item designed to store
-    // discontinuous values for this face.
-    HbrFVarData<T>& GetFVarData(int index) {
-        return GetVertex(index)->GetFVarData(this);
-    }
-
-    // Mark this face as being used, which in turn increments the
-    // usage counter of all vertices in the support for the face. A
-    // used face can not be garbage collected
-    void MarkUsage();
-
-    // Clears the usage of this face, which in turn decrements the
-    // usage counter of all vertices in the support for the face and
-    // marks the face as a candidate for garbage collection
-    void ClearUsage();
-
-    // A face can be cleaned if all of its vertices are not being
-    // used; has no children; and (for top level faces) deletion of
-    // its edges will not leave singular vertices
-    bool GarbageCollectable() const;
-
-    // Connect this face to a list of hierarchical edits
-    void SetHierarchicalEdits(HbrHierarchicalEdit<T>** edits);
-
-    // Return the list of hierarchical edits associated with this face
-    HbrHierarchicalEdit<T>** GetHierarchicalEdits() const {
-        if (editOffset == -1) {
-            return NULL;
-        }
-        return mesh->GetHierarchicalEditsAtOffset(editOffset);
-    }
-
-    // Whether the face has certain types of edits (not necessarily
-    // local - could apply to a subface)
-    bool HasVertexEdits() const { return hasVertexEdits; }
-    void MarkVertexEdits() { hasVertexEdits = 1; }
-
-    // Return the depth of the face
-    int GetDepth() const { return static_cast<int>(depth); }
-
-    // Return the uniform index of the face. This is different
-    // from the ID because it may be shared with other faces
-    int GetUniformIndex() const { return uindex; }
-
-    // Set the uniform index of the face
-    void SetUniformIndex(int i) { uindex = i; }
-
-    // Return the ptex index
-    int GetPtexIndex() const { return ptexindex; }
-
-    // Set the ptex index of the face
-    void SetPtexIndex(int i) { ptexindex = i; }
-
-    // Used by block allocator
-    HbrFace<T>*& GetNext() { return (HbrFace<T>*&) mesh; }
-
-    HbrFacePath GetPath() const {
-        HbrFacePath path;
-        path.remainder.reserve(GetDepth());
-        const HbrFace<T>* f = this, *p = GetParent();
-        while (p) {
-            int nchildren = mesh->GetSubdivision()->GetFaceChildrenCount(p->nvertices);
-            if (nchildren > 4) {
-                for (int i = 0; i < nchildren; ++i) {
-                    if (p->children.extrachildren[i] == f) {
-                        path.remainder.push_back(i);
-                        break;
-                    }
-                }
-            } else {
-                for (int i = 0; i < nchildren; ++i) {
-                    if ((*p->children.children)[i] == f) {
-                        path.remainder.push_back(i);
-                        break;
-                    }
-                }
-            }
-            f = p;
-            p = f->GetParent();
-        }
-        path.topface = f->GetID();
-        assert(GetDepth() == 0 || static_cast<int>(path.remainder.size()) == GetDepth());
-        return path;
-    }
-
-    void PrintPath() const {
-        GetPath().Print();
-    }
-
-    // Returns the blind pointer to client data
-    void *GetClientData() const {
-        return mesh->GetFaceClientData(id);
-    }
-
-    // Sets the blind pointer to client data
-    void SetClientData(void *data) {
-        mesh->SetFaceClientData(id, data);
-    }
-
-    // Gets the list of vertices which are in the support for the face.
-    void GetSupportingVertices(std::vector<int> &support);
-
-private:
-
-    // Mesh to which this face belongs
-    HbrMesh<T>* mesh;
-
-    // Unique id for this face
-    int id;
-
-    // Uniform index
-    int uindex;
-
-    // Ptex index
-    int ptexindex;
-
-    // Number of vertices (and number of edges)
-    int nvertices;
-
-    // Halfedge array for this face
-    HbrHalfedge<T> edges[4];
-
-    // Edge storage if this face is not a triangle or quad
-    char* extraedges;
-
-    // Pointer to children array. If there are four children or less,
-    // we use the HbrFaceChildren pointer, otherwise we use
-    // extrachildren
-    union {
-        HbrFaceChildren<T>* children;
-        HbrFace<T>** extrachildren;
-    } children;
-
-    // Bits used by halfedges to track facevarying sharpnesses
-    unsigned int *fvarbits;
-
-#ifdef HBRSTITCH
-    // Pointers to stitch edges used by the half edges.
-    StitchEdge **stitchEdges;
-#endif
-
-    // Index of parent face
-    int parent;
-
-    // Index of subdivided vertex child
-    int vchild;
-
-    // Offset to the mesh' list of hierarchical edits applicable to this face
-    int editOffset;
-
-    // Depth of the face in the mesh hierarchy - coarse faces are
-    // level 0. (Hmmm.. is it safe to assume that we'll never
-    // subdivide to greater than 255?)
-    unsigned char depth;
-
-    unsigned short hole:1;
-    unsigned short coarse:1;
-    unsigned short protect:1;
-    unsigned short collected:1;
-    unsigned short hasVertexEdits:1;
-    unsigned short initialized:1;
-    unsigned short destroyed:1;
-
-#ifdef HBR_ADAPTIVE
-public:
-    enum PatchType {  kUnknown=0,
-                         kFull=1,
-                          kEnd=2,
-                      kGregory=3 };
-                     
-    enum TransitionType { kTransition0=0,
-                          kTransition1=1,
-                          kTransition2=2,
-                          kTransition3=3,
-                          kTransition4=4,
-                                 kNone=5 };
- 
-    struct AdaptiveFlags {
-        unsigned patchType:2;
-        unsigned transitionType:3;
-        unsigned rots:2; 
-        unsigned brots:2; 
-        unsigned bverts:2; 
-        unsigned isCritical:1;
-        unsigned isExtraordinary:1;
-        unsigned isTagged:1;
-        
-        AdaptiveFlags() : patchType(0), transitionType(5), rots(0), brots(0), bverts(0), isCritical(0), isExtraordinary(0), isTagged(0) { }
-    };
-    
-    AdaptiveFlags _adaptiveFlags;
-
-    bool isTransitionPatch() const {
-        return (_adaptiveFlags.transitionType!=kNone);
-    }
-        
-    bool hasTaggedVertices() {
-        int nv = GetNumVertices();
-        for (int i=0; i<nv; ++i) {
-            if (GetVertex(i)->_adaptiveFlags.wasTagged)
-                return true;
-        }
-        return false;
-    }    
-#endif
-};
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#include "../hbr/mesh.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T>
-HbrFace<T>::HbrFace()
-    : mesh(0), id(-1), uindex(-1), ptexindex(-1), nvertices(0), extraedges(0), fvarbits(0), parent(-1), vchild(-1), 
-#ifdef HBRSTITCH
-      stitchEdges(0),
-#endif
-      editOffset(-1), depth(0), hole(0), coarse(0), protect(0), collected(0), hasVertexEdits(0), initialized(0), destroyed(0) {
-    children.children = 0;
-}
-
-template <class T>
-void
-HbrFace<T>::Initialize(HbrMesh<T>* m, HbrFace<T>* _parent, int childindex, int fid, int _uindex, int nv, HbrVertex<T>** vertices, int /* fvarwidth */, int _depth) {
-    mesh = m;
-    id = fid;
-    uindex = _uindex;
-    ptexindex = -1;
-    nvertices = nv;
-    extraedges = 0;
-    children.children = 0;
-    vchild = -1;
-    fvarbits = 0;
-#ifdef HBRSTITCH
-    stitchEdges = 0;
-#endif
-    editOffset = -1;
-    depth = static_cast<unsigned char>(_depth);
-    hole = 0;
-    coarse = 0;
-    protect = 0;
-    collected = 0;
-    hasVertexEdits = 0;
-    initialized = 1;
-    destroyed = 0;
-
-    int i;
-    const int fvarcount = mesh->GetFVarCount();
-    int fvarbitsSizePerEdge = ((fvarcount + 15) / 16);
-
-    if (nv > 4) {
-
-        // If we have more than four vertices, we ignore the
-        // overallocation and allocate our own buffers for stitch
-        // edges and facevarying data.
-#ifdef HBRSTITCH
-        if (mesh->GetStitchCount()) {
-            const size_t buffersize = nv * (mesh->GetStitchCount() * sizeof(StitchEdge*));
-            char *buffer = (char *) malloc(buffersize);
-            memset(buffer, 0, buffersize);
-            stitchEdges = (StitchEdge**) buffer;
-        }
-#endif
-        if (fvarcount) {
-            // We allocate fvarbits in one chunk.
-            // fvarbits needs capacity for two bits per fvardatum per edge,
-            // minimum size one integer per edge
-            const size_t fvarbitsSize = nv * (fvarbitsSizePerEdge * sizeof(unsigned int));
-            char *buffer = (char*) malloc(fvarbitsSize);
-            fvarbits = (unsigned int*) buffer;
-        }
-
-        // We also ignore the edge array and allocate extra storage -
-        // this simplifies GetNext and GetPrev math in HbrHalfedge
-        const size_t edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-        extraedges = (char *) malloc(nv * edgesize);
-        for (i = 0; i < nv; ++i) {
-            HbrHalfedge<T>* edge = (HbrHalfedge<T>*)(extraedges + i * edgesize);
-            new (edge) HbrHalfedge<T>();
-        }
-
-    } else {
-        // Under four vertices: upstream allocation for the class has
-        // been over allocated to include storage for stitchEdges
-        // and fvarbits. Just point our pointers at it.
-        char *buffer = ((char *) this + sizeof(*this));
-#ifdef HBRSTITCH
-        if (mesh->GetStitchCount()) {
-            const size_t buffersize = 4 * (mesh->GetStitchCount() * sizeof(StitchEdge*));
-            memset(buffer, 0, buffersize);
-            stitchEdges = (StitchEdge**) buffer;
-            buffer += buffersize;
-        }
-#endif
-        if (fvarcount) {
-            fvarbits = (unsigned int*) buffer;
-        }
-    }
-
-    // Must do this before we create edges
-    if (_parent) {
-        _parent->SetChild(childindex, this);
-    }
-
-    // Edges must be constructed in this two part approach: we must
-    // ensure that opposite/next/previous ptrs are all set up
-    // correctly, before we can begin adding incident edges to
-    // vertices.
-    int next;
-    unsigned int *curfvarbits = fvarbits;
-    HbrHalfedge<T>* edge;
-    size_t edgesize;
-    if (nv > 4) {
-        edge = (HbrHalfedge<T>*)(extraedges);
-        edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-    } else {
-        edge = edges;
-        edgesize = sizeof(HbrHalfedge<T>);
-    }
-    for (i = 0, next = 1; i < nv; ++i, ++next) {
-        if (next == nv) next = 0;
-        HbrHalfedge<T>* opposite = vertices[next]->GetEdge(vertices[i]->GetID());
-        edge->Initialize(opposite, i, vertices[i], curfvarbits, this);
-        if (opposite) opposite->SetOpposite(edge);
-        if (fvarbits) {
-            curfvarbits = curfvarbits + fvarbitsSizePerEdge;
-        }
-        edge = (HbrHalfedge<T>*)((char *) edge + edgesize);
-    }
-    if (nv > 4) {
-        edge = (HbrHalfedge<T>*)(extraedges);
-    } else {
-        edge = edges;
-    }
-    for (i = 0; i < nv; ++i) {
-        vertices[i]->AddIncidentEdge(edge);
-        edge = (HbrHalfedge<T>*)((char *) edge + edgesize);        
-    }
-}
-
-template <class T>
-HbrFace<T>::~HbrFace() {
-    Destroy();
-}
-
-template <class T>
-void
-HbrFace<T>::Destroy() {
-    if (initialized && !destroyed) {
-        int i;
-#ifdef HBRSTITCH
-        const int stitchCount = mesh->GetStitchCount();
-#endif
-
-        // Remove children's references to self
-        if (children.children) {
-            int nchildren = mesh->GetSubdivision()->GetFaceChildrenCount(nvertices);
-            if (nchildren > 4) {
-                for (i = 0; i < nchildren; ++i) {
-                    if (children.extrachildren[i]) {
-                        children.extrachildren[i]->parent = -1;
-                        children.extrachildren[i] = 0;
-                    }
-                }
-                delete[] children.extrachildren;
-                children.extrachildren = 0;
-            } else {
-                for (i = 0; i < nchildren; ++i) {
-                    if ((*children.children)[i]) {
-                        (*children.children)[i]->parent = -1;
-                        (*children.children)[i] = 0;
-                    }
-                }
-                mesh->DeleteFaceChildren(children.children);
-                children.children = 0;
-            }
-        }
-
-        // Deleting the incident edges from the vertices in this way is
-        // the safest way of doing things. Doing it in the halfedge
-        // destructor will not work well because it disrupts cycle
-        // finding/incident edge replacement in the vertex code.
-        // We also take this time to clean up any orphaned stitches
-        // still belonging to the edges.
-        HbrHalfedge<T>* edge;
-        size_t edgesize;
-        if (nvertices > 4) {
-            edge = (HbrHalfedge<T>*)(extraedges);
-            edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-        } else {
-            edge = edges;
-            edgesize = sizeof(HbrHalfedge<T>);
-        }
-        for (i = 0; i < nvertices; ++i) {
-#ifdef HBRSTITCH
-            edge->DestroyStitchEdges(stitchCount);
-#endif
-            HbrVertex<T>* vertex = mesh->GetVertex(edge->GetOrgVertexID());
-            if (fvarbits) {
-                HbrFVarData<T>& fvt = vertex->GetFVarData(this);
-                if (fvt.GetFaceID() == GetID()) {
-                    fvt.SetFaceID(-1);
-                }
-            }
-            vertex->RemoveIncidentEdge(edge);
-            vertex->UnGuaranteeNeighbors();
-            edge = (HbrHalfedge<T>*)((char *) edge + edgesize);
-        }
-        if (extraedges) {
-            edge = (HbrHalfedge<T>*)(extraedges);            
-            for (i = 0; i < nvertices; ++i) {
-                edge->~HbrHalfedge<T>();
-                edge = (HbrHalfedge<T>*)((char *) edge + edgesize);
-            }
-            free(extraedges);
-            extraedges = 0;
-        }
-
-        // Remove parent's reference to self
-        HbrFace<T> *parentFace = GetParent();
-        if (parentFace) {
-            bool parentHasOtherKids = false;
-            int nchildren = mesh->GetSubdivision()->GetFaceChildrenCount(parentFace->nvertices);
-            if (nchildren > 4) {
-                for (i = 0; i < nchildren; ++i) {
-                    if (parentFace->children.extrachildren[i] == this) {
-                        parentFace->children.extrachildren[i] = 0;
-                    } else if (parentFace->children.extrachildren[i]) parentHasOtherKids = true;
-                }
-                // After cleaning the parent's reference to self, the parent
-                // may be able to clean itself up
-                if (!parentHasOtherKids) {
-                    delete[] parentFace->children.extrachildren;
-                    parentFace->children.extrachildren = 0;
-                    if (parentFace->GarbageCollectable()) {
-                        mesh->DeleteFace(parentFace);
-                    }
-                }
-            } else {
-                for (i = 0; i < nchildren; ++i) {
-                    if ((*parentFace->children.children)[i] == this) {
-                        (*parentFace->children.children)[i] = 0;
-                    } else if ((*parentFace->children.children)[i]) parentHasOtherKids = true;
-                }
-                // After cleaning the parent's reference to self, the parent
-                // may be able to clean itself up
-                if (!parentHasOtherKids) {
-                    mesh->DeleteFaceChildren(parentFace->children.children);
-                    parentFace->children.children = 0;
-                    if (parentFace->GarbageCollectable()) {
-                        mesh->DeleteFace(parentFace);
-                    }
-                }
-            }
-            parent = -1;
-        }
-
-        // Orphan the child vertex
-        if (vchild != -1) {
-            HbrVertex<T> *vchildVert = mesh->GetVertex(vchild);
-            vchildVert->SetParent(static_cast<HbrFace*>(0));
-            vchild = -1;
-        }
-
-        if (nvertices > 4 && fvarbits) {
-            free(fvarbits);
-#ifdef HBRSTITCH
-            if (stitchEdges) {
-                free(stitchEdges);
-            }
-#endif
-        }
-        fvarbits = 0;
-#ifdef HBRSTITCH
-        stitchEdges = 0;
-#endif
-
-        // Make sure the four edges intrinsic to face are properly cleared
-        // if they were used
-        if (nvertices <= 4) {
-            for (i = 0; i < nvertices; ++i) {
-                edges[i].Clear();
-            }
-        }
-        nvertices = 0;
-        initialized = 0;
-        mesh = 0;
-        destroyed = 1;
-    }
-}
-
-template <class T>
-HbrHalfedge<T>*
-HbrFace<T>::GetEdge(int index) const {
-    assert(index >= 0 && index < nvertices);
-    if (nvertices > 4) {
-        const size_t edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-        return (HbrHalfedge<T>*)(extraedges + index * edgesize);
-    } else {
-        return const_cast<HbrHalfedge<T>*>(edges + index);
-    }
-}
-
-template <class T>
-HbrVertex<T>*
-HbrFace<T>::GetVertex(int index) const {
-    assert(index >= 0 && index < nvertices);
-    if (nvertices > 4) {
-        const size_t edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);        
-        HbrHalfedge<T>* edge = (HbrHalfedge<T>*)(extraedges +
-            index * edgesize);
-        return mesh->GetVertex(edge->GetOrgVertexID());
-    } else {
-        return mesh->GetVertex(edges[index].GetOrgVertexID());
-    }
-}
-
-template <class T>
-int
-HbrFace<T>::GetVertexID(int index) const {
-    assert(index >= 0 && index < nvertices);    
-    if (nvertices > 4) {
-        const size_t edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);        
-        HbrHalfedge<T>* edge = (HbrHalfedge<T>*)(extraedges +
-            index * edgesize);
-        return edge->GetOrgVertexID();
-    } else {
-        return edges[index].GetOrgVertexID();
-    }
-}
-
-template <class T>
-void
-HbrFace<T>::SetChild(int index, HbrFace<T>* face) {
-    assert(id != -1);
-    int nchildren = mesh->GetSubdivision()->GetFaceChildrenCount(nvertices);
-    // Construct the children array if it doesn't already exist
-    if (!children.children) {
-        int i;
-        if (nchildren > 4) {
-            children.extrachildren = new HbrFace<T>*[nchildren];
-            for (i = 0; i < nchildren; ++i) {
-                children.extrachildren[i] = 0;
-            }
-        } else {
-            children.children = mesh->NewFaceChildren();
-            for (i = 0; i < nchildren; ++i) {
-                (*children.children)[i] = 0;
-            }
-        }
-    }
-    if (nchildren > 4) {
-        children.extrachildren[index] = face;
-    } else {
-        (*children.children)[index] = face;
-    }
-    face->parent = this->id;
-}
-
-template <class T>
-HbrVertex<T>*
-HbrFace<T>::Subdivide() {
-    if (vchild != -1) return mesh->GetVertex(vchild);
-    HbrVertex<T>* vchildVert = mesh->GetSubdivision()->Subdivide(mesh, this);
-    vchild = vchildVert->GetID();
-    vchildVert->SetParent(this);
-    return vchildVert;
-}
-
-template <class T>
-void
-HbrFace<T>::Refine() {
-    mesh->GetSubdivision()->Refine(mesh, this);
-}
-
-template <class T>
-void
-HbrFace<T>::Unrefine() {
-    // Delete the children, via the mesh (so that the mesh loses
-    // references to the children)
-    if (children.children) {
-        int nchildren = mesh->GetSubdivision()->GetFaceChildrenCount(nvertices);
-        if (nchildren > 4) {
-            for (int i = 0; i < nchildren; ++i) {
-                if (children.extrachildren[i]) mesh->DeleteFace(children.extrachildren[i]);
-            }
-            delete[] children.extrachildren;
-            children.extrachildren = 0;
-        } else {
-            for (int i = 0; i < nchildren; ++i) {
-                if ((*children.children)[i]) mesh->DeleteFace((*children.children)[i]);
-            }
-            mesh->DeleteFaceChildren(children.children);
-            children.children = 0;
-        }
-    }
-}
-
-template <class T>
-bool
-HbrFace<T>::HasLimit() {
-    return mesh->GetSubdivision()->HasLimit(mesh, this);
-}
-
-template <class T>
-unsigned long
-HbrFace<T>::GetMemStats() const {
-    return sizeof(HbrFace<T>);
-}
-
-template <class T>
-void
-HbrFace<T>::MarkUsage() {
-    // Must increment the usage on all vertices which are in the
-    // support for this face. Note well: this will increment vertices
-    // more than once. This doesn't really matter as long as
-    // ClearUsage also does the same number of decrements. If we
-    // really were concerned about ensuring single increments, we can
-    // use GetSupportingVertices, but that's slower.
-    HbrVertex<T>* v;
-    HbrHalfedge<T>* e, *ee, *eee, *start;
-    size_t edgesize, eedgesize;
-    if (nvertices > 4) {
-        e = (HbrHalfedge<T>*)(extraedges);
-        edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-    } else {
-        e = edges;
-        edgesize = sizeof(HbrHalfedge<T>);
-    }
-    for (int i = 0; i < nvertices; ++i) {
-        v = mesh->GetVertex(e->GetOrgVertexID());
-        v->GuaranteeNeighbors();
-        start = v->GetIncidentEdge();
-        ee = start;
-        do {
-            HbrFace<T>* f = ee->GetLeftFace();
-            int nv = f->GetNumVertices();
-            if (nv > 4) {
-                eee = (HbrHalfedge<T>*)(f->extraedges);
-                eedgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-            } else {
-                eee = f->edges;
-                eedgesize = sizeof(HbrHalfedge<T>);
-            }
-            for (int j = 0; j < nv; ++j) {
-                mesh->GetVertex(eee->GetOrgVertexID())->IncrementUsage();
-                eee = (HbrHalfedge<T>*)((char *) eee + eedgesize);
-            }
-            ee = v->GetNextEdge(ee);
-            if (ee == start) break;
-        } while (ee);
-        e = (HbrHalfedge<T>*)((char *) e + edgesize);
-    }
-}
-
-template <class T>
-void
-HbrFace<T>::ClearUsage() {
-    bool gc = false;
-    // Must mark all vertices which may affect this face
-    HbrVertex<T>* v, *vv;
-    HbrHalfedge<T>* e, *ee, *eee, *start;
-    size_t edgesize, eedgesize;
-    if (nvertices > 4) {
-        e = (HbrHalfedge<T>*)(extraedges);
-        edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-    } else {
-        e = edges;
-        edgesize = sizeof(HbrHalfedge<T>);
-    }
-    for (int i = 0; i < nvertices; ++i) {
-        v = mesh->GetVertex(e->GetOrgVertexID());
-        start = v->GetIncidentEdge();
-        ee = start;
-        do {
-            HbrFace<T>* f = ee->GetLeftFace();
-            int nv = f->GetNumVertices();
-            if (nv > 4) {
-                eee = (HbrHalfedge<T>*)(f->extraedges);
-                eedgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-            } else {
-                eee = f->edges;
-                eedgesize = sizeof(HbrHalfedge<T>);
-            }
-            for (int j = 0; j < nv; ++j) {
-                HbrVertex<T>* vert = mesh->GetVertex(eee->GetOrgVertexID());
-                vert->DecrementUsage();
-                if (!vert->IsUsed()) {
-                    mesh->AddGarbageCollectableVertex(vert);
-                    gc = true;
-                }
-                eee = (HbrHalfedge<T>*)((char *) eee + eedgesize);
-            }
-            ee = v->GetNextEdge(ee);
-            if (ee == start) break;
-        } while (ee);
-        e = (HbrHalfedge<T>*)((char *) e + edgesize);
-    }
-    if (gc) mesh->GarbageCollect();
-}
-
-template <class T>
-bool
-HbrFace<T>::GarbageCollectable() const {
-    if (children.children || protect) return false;
-    for (int i = 0; i < nvertices; ++i) {
-        HbrHalfedge<T>* edge = GetEdge(i);
-        HbrVertex<T>* vertex = edge->GetOrgVertex(mesh);
-        if (vertex->IsUsed()) return false;
-        if (!GetParent() && vertex->EdgeRemovalWillMakeSingular(edge)) {
-            return false;
-        }
-    }
-    return true;
-}
-
-template <class T>
-void
-HbrFace<T>::SetHierarchicalEdits(HbrHierarchicalEdit<T>** edits) {
-    HbrHierarchicalEdit<T>** faceedits = edits;
-    HbrHierarchicalEdit<T>** baseedit = mesh->GetHierarchicalEditsAtOffset(0);
-    editOffset = int(faceedits - baseedit);
-
-    // Walk the list of edits and look for any which apply locally.
-    while (HbrHierarchicalEdit<T>* edit = *faceedits) {
-        if (!edit->IsRelevantToFace(this)) break;
-        edit->ApplyEditToFace(this);
-        faceedits++;
-    }
-}
-
-template <class T>
-void
-HbrFace<T>::GetSupportingVertices(std::vector<int> &support) {
-    support.reserve(16);
-    HbrVertex<T>* v;    
-    HbrHalfedge<T>* e, *ee, *eee, *start;
-    size_t edgesize, eedgesize;
-    if (nvertices > 4) {
-        e = (HbrHalfedge<T>*)(extraedges);
-        edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-    } else {
-        e = edges;
-        edgesize = sizeof(HbrHalfedge<T>);
-    }
-    for (int i = 0; i < nvertices; ++i) {
-        v = mesh->GetVertex(e->GetOrgVertexID());
-        v->GuaranteeNeighbors();
-        start = v->GetIncidentEdge();
-        ee = start;
-        do {
-            HbrFace<T>* f = ee->GetLeftFace();
-            int nv = f->GetNumVertices();
-            if (nv > 4) {
-                eee = (HbrHalfedge<T>*)(f->extraedges);
-                eedgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-            } else {
-                eee = f->edges;
-                eedgesize = sizeof(HbrHalfedge<T>);
-            }
-            for (int j = 0; j < nv; ++j) {
-                int id = eee->GetOrgVertexID();
-                std::vector<int>::iterator vi =
-                    std::lower_bound(support.begin(), support.end(), id);
-                if (vi == support.end() || *vi != id) {
-                    support.insert(vi, id);
-                }
-                eee = (HbrHalfedge<T>*)((char *) eee + eedgesize);
-            }
-            ee = v->GetNextEdge(ee);
-            if (ee == start) break;
-        } while (ee);
-        e = (HbrHalfedge<T>*)((char *) e + edgesize);
-    }
-}
-
-template <class T>
-std::ostream& operator<<(std::ostream& out, const HbrFace<T>& face) {
-    out << "face " << face.GetID() << ", " << face.GetNumVertices() << " vertices (";
-    for (int i = 0; i < face.GetNumVertices(); ++i) {
-        HbrHalfedge<T>* e = face.GetEdge(i);
-        out << *(e->GetOrgVertex());
-        if (e->IsBoundary()) {
-            out << " -/-> ";
-        } else {
-            out << " ---> ";
-        }
-    }
-    out << ")";
-    return out;
-}
-
-template <class T>
-class HbrFaceOperator {
-public:
-    virtual void operator() (HbrFace<T> &face) = 0;
-    virtual ~HbrFaceOperator() {}
-};
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRFACE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/faceEdit.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/faceEdit.h
deleted file mode 100644
index c0427f2ca..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/faceEdit.h
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRFACEEDIT_H
-#define OPENSUBDIV3_HBRFACEEDIT_H
-
-#include "../hbr/hierarchicalEdit.h"
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrFaceEdit;
-
-template <class T>
-std::ostream& operator<<(std::ostream& out, const HbrFaceEdit<T>& path) {
-    out << "face path = (" << path.faceid << ' ';
-    for (int i = 0; i < path.nsubfaces; ++i) {
-        out << static_cast<int>(path.subfaces[i]) << ' ';
-    }
-    return out << ")";
-}
-
-template <class T>
-class HbrFaceEdit : public HbrHierarchicalEdit<T> {
-
-public:
-
-    HbrFaceEdit(int _faceid, int _nsubfaces, unsigned char *_subfaces, int _index, int _width, typename HbrHierarchicalEdit<T>::Operation _op, float *_edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), index(_index), width(_width), op(_op) {
-        edit = new float[width];
-        memcpy(edit, _edit, width * sizeof(float));
-    }
-
-    HbrFaceEdit(int _faceid, int _nsubfaces, int *_subfaces, int _index, int _width, typename HbrHierarchicalEdit<T>::Operation _op, float *_edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), index(_index), width(_width), op(_op) {
-        edit = new float[width];
-        memcpy(edit, _edit, width * sizeof(float));
-    }
-
-#ifdef PRMAN
-    HbrFaceEdit(int _faceid, int _nsubfaces, unsigned char *_subfaces, int _index, int _width, typename HbrHierarchicalEdit<T>::Operation _op, RtToken _edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), index(_index), width(_width), op(_op) {
-        edit = new float[width];
-        RtString* sedit = (RtString*) edit;
-        *sedit = _edit;
-    }
-
-    HbrFaceEdit(int _faceid, int _nsubfaces, int *_subfaces, int _index, int _width, typename HbrHierarchicalEdit<T>::Operation _op, RtToken _edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), index(_index), width(_width), op(_op) {
-        edit = new float[width];
-        RtString* sedit = (RtString*) edit;
-        *sedit = _edit;
-    }
-#endif
-
-    virtual ~HbrFaceEdit() {
-        delete[] edit;
-    }
-
-    friend std::ostream& operator<< <T> (std::ostream& out, const HbrFaceEdit<T>& path);
-
-    // Return index of variable this edit applies to
-    int GetIndex() const { return index; }
-
-    // Return width of the variable
-    int GetWidth() const { return width; }
-
-    // Get the numerical value of the edit
-    const float* GetEdit() const { return edit; }
-
-    // Get the type of operation
-    typename HbrHierarchicalEdit<T>::Operation GetOperation() const { return op; }
-
-    virtual void ApplyEditToFace(HbrFace<T>* face) {
-        if (HbrHierarchicalEdit<T>::GetNSubfaces() == face->GetDepth()) {
-
-            int oldUniformIndex = face->GetUniformIndex();
-
-            // Any face below level 0 needs a new uniform index
-            if (face->GetDepth() > 0) {
-            face->SetUniformIndex(face->GetMesh()->NewUniformIndex());
-            }
-
-            // Apply edit
-            face->GetVertex(0)->GetData().ApplyFaceEdit(oldUniformIndex, face->GetUniformIndex(), *const_cast<const HbrFaceEdit<T>*>(this));
-        }
-    }
-
-private:
-    int index;
-    int width;
-    typename HbrHierarchicalEdit<T>::Operation op;
-    float* edit;
-};
-
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRFACEEDIT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/fvarData.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/fvarData.h
deleted file mode 100644
index 7b815fda2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/fvarData.h
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRFVARDATA_H
-#define OPENSUBDIV3_HBRFVARDATA_H
-
-#include <cstring>
-#include <cmath>
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrFVarEdit;
-template <class T> class HbrFace;
-template <class T> class HbrVertex;
-
-// This class implements a "face varying vector item". Really it's
-// just a smart wrapper around face varying data (itself just a bunch
-// of floats) stored on each vertex.
-template <class T> class HbrFVarData {
-
-private:
-    HbrFVarData()
-        : faceid(0), initialized(0) {
-    }
-
-    ~HbrFVarData() {
-        Uninitialize();
-    }
-
-    HbrFVarData(const HbrFVarData &/* data */) {}
-
-public:
-    
-    // Sets the face id
-    void SetFaceID(int id) {
-        faceid = id;
-    }
-
-    // Returns the id of the face to which this data is bound
-    int GetFaceID() const {
-        return faceid;
-    }
-
-    // Clears the initialized flag
-    void Uninitialize() {
-        initialized = 0;
-        faceid = 0;
-    }
-
-    // Returns initialized flag
-    bool IsInitialized() const {
-        return initialized;
-    }
-
-    // Sets initialized flag
-    void SetInitialized() {
-        initialized = 1;
-    }
-
-    // Return the data from the NgpFVVector
-    float* GetData(int item) { return data + item; }    
-
-    // Clears the indicates value of this item
-    void Clear(int startindex, int width) {
-        memset(data + startindex, 0, width * sizeof(float));
-    }
-
-    // Clears all values of this item
-    void ClearAll(int width) {
-        initialized = 1;
-        memset(data, 0, width * sizeof(float));
-    }
-
-    // Set values of the indicated item (with the indicated weighing)
-    // on this item
-    void SetWithWeight(const HbrFVarData& fvvi, int startindex, int width, float weight) {
-        float *dst = data + startindex;
-        const float *src = fvvi.data + startindex;
-        for (int i = 0; i < width; ++i) {
-            *dst++ = weight * *src++;
-        }
-    }
-
-    // Add values of the indicated item (with the indicated weighing)
-    // to this item
-    void AddWithWeight(const HbrFVarData& fvvi, int startindex, int width, float weight) {
-        float *dst = data + startindex;
-        const float *src = fvvi.data + startindex;
-        for (int i = 0; i < width; ++i) {
-            *dst++ += weight * *src++;
-        }
-    }
-
-    // Add all values of the indicated item (with the indicated
-    // weighing) to this item
-    void AddWithWeightAll(const HbrFVarData& fvvi, int width, float weight) {
-        float *dst = data;
-        const float *src = fvvi.data;
-        for (int i = 0; i < width; ++i) {
-            *dst++ += weight * *src++;
-        }
-    }
-
-    // Compare all values item against a float buffer. Returns true
-    // if all values match
-    bool CompareAll(int width, const float *values, float tolerance=0.0f) const {
-        if (!initialized) return false;
-        for (int i = 0; i < width; ++i) {
-            if (fabsf(values[i] - data[i]) > tolerance) return false;
-        }
-        return true;
-    }
-
-    // Initializes data
-    void SetAllData(int width, const float *values) {
-        initialized = 1;
-        memcpy(data, values, width * sizeof(float));
-    }
-
-    // Compare this item against another item with tolerance.  Returns
-    // true if it compares identical
-    bool Compare(const HbrFVarData& fvvi, int startindex, int width, float tolerance=0.0f) const {
-        for (int i = 0; i < width; ++i) {
-            if (fabsf(data[startindex + i] - fvvi.data[startindex + i]) > tolerance) return false;
-        }
-        return true;
-    }
-
-    // Modify the data of the item with an edit
-    void ApplyFVarEdit(const HbrFVarEdit<T>& edit);
-
-    friend class HbrVertex<T>;
-    
-private:
-    unsigned int faceid:31;
-    unsigned int initialized:1;
-    float data[1];
-};
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#include "../hbr/fvarEdit.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T>
-void
-HbrFVarData<T>::ApplyFVarEdit(const HbrFVarEdit<T>& edit) {
-        float *dst = data + edit.GetIndex() + edit.GetOffset();
-        const float *src = edit.GetEdit();
-        for (int i = 0; i < edit.GetWidth(); ++i) {
-            switch(edit.GetOperation()) {
-                case HbrVertexEdit<T>::Set:
-                    *dst++ = *src++;
-                    break;
-                case HbrVertexEdit<T>::Add:
-                    *dst++ += *src++;
-                    break;
-                case HbrVertexEdit<T>::Subtract:
-                    *dst++ -= *src++;
-            }
-        }
-        initialized = 1;
-    }
-
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRFVARDATA_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/fvarEdit.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/fvarEdit.h
deleted file mode 100644
index 8d69c069d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/fvarEdit.h
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRFVAREDIT_H
-#define OPENSUBDIV3_HBRFVAREDIT_H
-
-#include "../hbr/hierarchicalEdit.h"
-#include "../hbr/vertexEdit.h"
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrFVarEdit;
-
-template <class T>
-std::ostream& operator<<(std::ostream& out, const HbrFVarEdit<T>& path) {
-    out << "vertex path = (" << path.faceid << ' ';
-    for (int i = 0; i < path.nsubfaces; ++i) {
-        out << static_cast<int>(path.subfaces[i]) << ' ';
-    }
-    return out << static_cast<int>(path.vertexid) << "), edit = (" << path.edit[0] << ',' << path.edit[1] << ',' << path.edit[2] << ')';
-}
-
-template <class T>
-class HbrFVarEdit : public HbrHierarchicalEdit<T> {
-
-public:
-
-    HbrFVarEdit(int _faceid, int _nsubfaces, unsigned char *_subfaces, unsigned char _vertexid, int _index, int _width, int _offset, typename HbrHierarchicalEdit<T>::Operation _op, float *_edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), vertexid(_vertexid), index(_index), width(_width), offset(_offset), op(_op) {
-        edit = new float[width];
-        memcpy(edit, _edit, width * sizeof(float));
-    }
-
-    HbrFVarEdit(int _faceid, int _nsubfaces, int *_subfaces, int _vertexid, int _index, int _width, int _offset, typename HbrHierarchicalEdit<T>::Operation _op, float *_edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), vertexid(_vertexid), index(_index), width(_width), offset(_offset), op(_op) {
-        edit = new float[width];
-        memcpy(edit, _edit, width * sizeof(float));
-    }
-
-    virtual ~HbrFVarEdit() {
-        delete[] edit;
-    }
-
-    // Return the vertex id (the last element in the path)
-    unsigned char GetVertexID() const { return vertexid; }
-
-    friend std::ostream& operator<< <T> (std::ostream& out, const HbrFVarEdit<T>& path);
-
-    // Return index into the facevarying data
-    int GetIndex() const { return index; }
-
-    // Return width of the data
-    int GetWidth() const { return width; }
-
-    // Return offset of the data
-    int GetOffset() const { return offset; }
-
-    // Get the numerical value of the edit
-    const float* GetEdit() const { return edit; }
-
-    // Get the type of operation
-    typename HbrHierarchicalEdit<T>::Operation GetOperation() const { return op; }
-
-    virtual void ApplyEditToFace(HbrFace<T>* face) {
-        if (HbrHierarchicalEdit<T>::GetNSubfaces() == face->GetDepth()) {
-            // The edit will modify the data and almost certainly
-            // create a discontinuity, so allocate storage for a new
-            // copy of the existing data specific to the face (or use
-            // one that already exists) and modify that
-            HbrFVarData<T> &fvt = face->GetVertex(vertexid)->GetFVarData(face);
-            if (fvt.GetFaceID() != face->GetID()) {
-                // This is the generic fvt, allocate a new copy and edit it
-                HbrFVarData<T> &newfvt = face->GetVertex(vertexid)->NewFVarData(face);
-                newfvt.SetAllData(face->GetMesh()->GetTotalFVarWidth(), fvt.GetData(0));
-                newfvt.ApplyFVarEdit(*const_cast<const HbrFVarEdit<T>*>(this));
-            } else {
-                fvt.ApplyFVarEdit(*const_cast<const HbrFVarEdit<T>*>(this));
-            }
-        }
-    }
-
-private:
-    const unsigned char vertexid;
-    const int index;
-    const int width;
-    const int offset;
-    float* edit;
-    typename HbrHierarchicalEdit<T>::Operation op;
-};
-
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRFVAREDIT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/halfedge.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/halfedge.h
deleted file mode 100644
index e7350694a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/halfedge.h
+++ /dev/null
@@ -1,740 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRHALFEDGE_H
-#define OPENSUBDIV3_HBRHALFEDGE_H
-
-#include <assert.h>
-#include <stddef.h>
-#include <cstring>
-#include <iostream>
-
-
-#ifdef HBRSTITCH
-#include "libgprims/stitch.h"
-#include "libgprims/stitchInternal.h"
-#endif
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrFace;
-template <class T> class HbrHalfedge;
-template <class T> class HbrVertex;
-template <class T> class HbrMesh;
-
-template <class T> std::ostream& operator<<(std::ostream& out, const HbrHalfedge<T>& edge);
-
-template <class T> class HbrHalfedge {
-
-private:
-    HbrHalfedge(): opposite(0), incidentVertex(-1), vchild(-1), sharpness(0.0f)
-#ifdef HBRSTITCH
-    , stitchccw(1), raystitchccw(1)
-#endif
-    , coarse(1)
-    {
-    }
-
-    HbrHalfedge(const HbrHalfedge &/* edge */) {}
-    
-    ~HbrHalfedge();
-
-    void Clear();
-
-    // Finish the initialization of the halfedge. Should only be
-    // called by HbrFace
-    void Initialize(HbrHalfedge<T>* opposite, int index, HbrVertex<T>* origin, unsigned int *fvarbits, HbrFace<T>* face);
-public:
-
-    // Returns the opposite half edge
-    HbrHalfedge<T>* GetOpposite() const { return opposite; }
-
-    // Sets the opposite half edge
-    void SetOpposite(HbrHalfedge<T>* opposite) { this->opposite = opposite; sharpness = opposite->sharpness; }
-
-    // Returns the next clockwise halfedge around the incident face
-    HbrHalfedge<T>* GetNext() const {
-        if (m_index == 4) {
-            const size_t edgesize = sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*);
-            if (lastedge) {
-                return (HbrHalfedge<T>*) ((char*) this - (GetFace()->GetNumVertices() - 1) * edgesize);
-            } else {
-                return (HbrHalfedge<T>*) ((char*) this + edgesize);
-            }
-        } else {
-            if (lastedge) {
-                return (HbrHalfedge<T>*) ((char*) this - (m_index) * sizeof(HbrHalfedge<T>));
-            } else {
-                return (HbrHalfedge<T>*) ((char*) this + sizeof(HbrHalfedge<T>));
-            }
-        }
-    }
-
-    // Returns the previous counterclockwise halfedge around the incident face
-    HbrHalfedge<T>* GetPrev() const {
-        const size_t edgesize = (m_index == 4) ? 
-            (sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*)) :
-            sizeof(HbrHalfedge<T>);
-        if (firstedge) {
-            return (HbrHalfedge<T>*) ((char*) this + (GetFace()->GetNumVertices() - 1) * edgesize);
-        } else {
-            return (HbrHalfedge<T>*) ((char*) this - edgesize);
-        }
-    }
-
-    // Returns the incident vertex
-    HbrVertex<T>* GetVertex() const {
-        return GetMesh()->GetVertex(incidentVertex);
-        }
-
-    // Returns the incident vertex
-    HbrVertex<T>* GetVertex(HbrMesh<T> *mesh) const {
-        return mesh->GetVertex(incidentVertex);
-    }
-
-    // Returns the incident vertex
-    int GetVertexID() const {
-        return incidentVertex;
-    }
-
-    // Returns the source vertex
-    HbrVertex<T>* GetOrgVertex() const {
-        return GetVertex();
-    }
-
-    // Returns the source vertex
-    HbrVertex<T>* GetOrgVertex(HbrMesh<T> *mesh) const {
-        return GetVertex(mesh);
-    }
-
-    // Returns the source vertex id
-    int GetOrgVertexID() const {
-        return incidentVertex;
-    }
-
-    // Changes the origin vertex. Generally not a good idea to do
-    void SetOrgVertex(HbrVertex<T>* v) { incidentVertex = v->GetID(); }
-
-    // Returns the destination vertex
-    HbrVertex<T>* GetDestVertex() const { return GetNext()->GetOrgVertex(); }
-
-    // Returns the destination vertex
-    HbrVertex<T>* GetDestVertex(HbrMesh<T> *mesh) const { return GetNext()->GetOrgVertex(mesh); }
-
-    // Returns the destination vertex ID
-    int GetDestVertexID() const { return GetNext()->GetOrgVertexID(); }
-    
-    // Returns the incident facet
-    HbrFace<T>* GetFace() const {
-        if (m_index == 4) {
-            // Pointer to face is stored after the data for the edge
-            return *(HbrFace<T>**)((char *) this + sizeof(HbrHalfedge<T>));
-        } else {
-            return (HbrFace<T>*) ((char*) this - (m_index) * sizeof(HbrHalfedge<T>) -
-                offsetof(HbrFace<T>, edges));
-        }
-    }
-
-    // Returns the mesh to which this edge belongs
-    HbrMesh<T>* GetMesh() const { return GetFace()->GetMesh(); }
-
-    // Returns the face on the right
-    HbrFace<T>* GetRightFace() const { return opposite ? opposite->GetLeftFace() : NULL; }
-
-    // Return the face on the left of the halfedge
-    HbrFace<T>* GetLeftFace() const { return GetFace(); }
-
-    // Returns whether this is a boundary edge
-    bool IsBoundary() const { return opposite == 0; }
-
-    // Tag the edge as being an infinitely sharp facevarying edge
-    void SetFVarInfiniteSharp(int datum, bool infsharp) {
-        int intindex = datum >> 4;
-        unsigned int bits = infsharp << ((datum & 15) * 2);
-        getFVarInfSharp()[intindex] |= bits;
-        if (opposite) {
-            opposite->getFVarInfSharp()[intindex] |= bits;
-        }
-    }
-
-    // Copy fvar infinite sharpness flags from another edge
-    void CopyFVarInfiniteSharpness(HbrHalfedge<T>* edge) {
-        unsigned int *fvarinfsharp = getFVarInfSharp();
-        if (fvarinfsharp) {
-            const int fvarcount = GetMesh()->GetFVarCount();
-            int fvarbitsSizePerEdge = ((fvarcount + 15) / 16);
-            
-            if (edge->IsSharp(true)) {
-                memset(fvarinfsharp, 0x55555555, fvarbitsSizePerEdge * sizeof(unsigned int));
-            } else {
-                memcpy(fvarinfsharp, edge->getFVarInfSharp(), fvarbitsSizePerEdge * sizeof(unsigned int));
-            }
-        }
-    }
-
-    // Returns whether the edge is infinitely sharp in facevarying for
-    // a particular facevarying datum
-    bool GetFVarInfiniteSharp(int datum);
-
-    // Returns whether the edge is infinitely sharp in any facevarying
-    // datum
-    bool IsFVarInfiniteSharpAnywhere();
-
-    // Get the sharpness relative to facevarying data
-    float GetFVarSharpness(int datum, bool ignoreGeometry=false);
-
-    // Returns the (raw) sharpness of the edge
-    float GetSharpness() const { return sharpness; }
-
-    // Sets the sharpness of the edge
-    void SetSharpness(float sharp) { sharpness = sharp; if (opposite) opposite->sharpness = sharp; ClearMask(); }
-
-    // Returns whether the edge is sharp at the current level of
-    // subdivision (next = false) or at the next level of subdivision
-    // (next = true).
-    bool IsSharp(bool next) const { return (next ? (sharpness > 0.0f) : (sharpness >= 1.0f)); }
-
-    // Clears the masks of the adjacent edge vertices. Usually called
-    // when a change in edge sharpness occurs.
-    void ClearMask() { GetOrgVertex()->ClearMask(); GetDestVertex()->ClearMask(); }
-
-    // Subdivide the edge into a vertex if needed and return
-    HbrVertex<T>* Subdivide();
-
-    // Make sure the edge has its opposite face
-    void GuaranteeNeighbor();
-    
-    // True if the edge has a subdivided child vertex
-    bool HasChild() const { return vchild!=-1; }
-
-    // Remove the reference to subdivided vertex
-    void RemoveChild() { vchild = -1; }
-
-    // Sharpness constants
-    enum Mask {
-        k_Smooth = 0,
-        k_Sharp = 1,
-        k_InfinitelySharp = 10
-    };
-
-#ifdef HBRSTITCH
-    StitchEdge* GetStitchEdge(int i) {
-        StitchEdge **stitchEdge = getStitchEdges();
-        // If the stitch edge exists, the ownership is transferred to
-        // the caller. Make sure the opposite edge loses ownership as
-        // well.
-        if (stitchEdge[i]) {
-            if (opposite) {
-                opposite->getStitchEdges()[i] = 0;
-            }
-            return StitchGetEdge(&stitchEdge[i]);
-        }
-        // If the stitch edge does not exist then we create one now.
-        // Make sure the opposite edge gets a copy of it too
-        else {
-            StitchGetEdge(&stitchEdge[i]);
-            if (opposite) {
-                opposite->getStitchEdges()[i] = stitchEdge[i];
-            }
-            return stitchEdge[i];
-        }
-    }
-
-    // If stitch edge exists, and this edge has no opposite, destroy
-    // it
-    void DestroyStitchEdges(int stitchcount) {
-        if (!opposite) {
-            StitchEdge **stitchEdge = getStitchEdges();
-            for (int i = 0; i < stitchcount; ++i) {
-                if (stitchEdge[i]) {
-                    StitchFreeEdge(stitchEdge[i]);
-                    stitchEdge[i] = 0;
-                }
-            }
-        }
-    }
-
-    StitchEdge* GetRayStitchEdge(int i) {
-        return GetStitchEdge(i + 2);
-    }
-
-    // Splits our split edge between our children. We'd better have
-    // subdivided this edge by this point
-    void SplitStitchEdge(int i) {
-        StitchEdge* se = GetStitchEdge(i);
-        HbrHalfedge<T>* ea = GetOrgVertex()->Subdivide()->GetEdge(Subdivide());
-        HbrHalfedge<T>* eb = Subdivide()->GetEdge(GetDestVertex()->Subdivide());
-        StitchEdge **ease = ea->getStitchEdges();
-        StitchEdge **ebse = eb->getStitchEdges();
-        if (i >= 2) { // ray tracing stitches
-            if (!raystitchccw) {
-                StitchSplitEdge(se, &ease[i], &ebse[i], false, 0, 0, 0);
-            } else {
-                StitchSplitEdge(se, &ebse[i], &ease[i], true, 0, 0, 0);
-            }
-            ea->raystitchccw = eb->raystitchccw = raystitchccw;
-            if (eb->opposite) {
-                eb->opposite->getStitchEdges()[i] = ebse[i];
-                eb->opposite->raystitchccw = raystitchccw;
-            }
-            if (ea->opposite) {
-                ea->opposite->getStitchEdges()[i] = ease[i];
-                ea->opposite->raystitchccw = raystitchccw;
-            }
-        } else {
-            if (!stitchccw) {
-                StitchSplitEdge(se, &ease[i], &ebse[i], false, 0, 0, 0);
-            } else {
-                StitchSplitEdge(se, &ebse[i], &ease[i], true, 0, 0, 0);
-            }
-            ea->stitchccw = eb->stitchccw = stitchccw;
-            if (eb->opposite) {
-                eb->opposite->getStitchEdges()[i] = ebse[i];
-                eb->opposite->stitchccw = stitchccw;
-            }
-            if (ea->opposite) {
-                ea->opposite->getStitchEdges()[i] = ease[i];
-                ea->opposite->stitchccw = stitchccw;
-            }
-        }
-    }
-
-    void SplitRayStitchEdge(int i) {
-        SplitStitchEdge(i + 2);
-    }
-
-    void SetStitchEdge(int i, StitchEdge* edge) {
-        StitchEdge **stitchEdges = getStitchEdges();
-        stitchEdges[i] = edge;
-        if (opposite) {
-            opposite->getStitchEdges()[i] = edge;
-        }
-    }
-
-    void SetRayStitchEdge(int i, StitchEdge* edge) {
-        StitchEdge **stitchEdges = getStitchEdges();
-        stitchEdges[i+2] = edge;
-        if (opposite) {
-            opposite->getStitchEdges()[i+2] = edge;
-        }
-    }
-
-    void* GetStitchData() const {
-        if (stitchdatavalid) return GetMesh()->GetStitchData(this);
-        else return 0;
-    }
-
-    void SetStitchData(void* data) {
-        GetMesh()->SetStitchData(this, data);
-        stitchdatavalid = data ? 1 : 0;
-        if (opposite) {
-            opposite->GetMesh()->SetStitchData(opposite, data);
-            opposite->stitchdatavalid = stitchdatavalid;
-        }
-    }
-
-    bool GetStitchCCW(bool raytraced) const { return raytraced ? raystitchccw : stitchccw; }
-
-    void ClearStitchCCW(bool raytraced) {
-        if (raytraced) {
-            raystitchccw = 0;
-            if (opposite) opposite->raystitchccw = 0;
-        } else {
-            stitchccw = 0;
-            if (opposite) opposite->stitchccw = 0;
-        }
-    }
-
-    void ToggleStitchCCW(bool raytraced) {
-        if (raytraced) {
-            raystitchccw = 1 - raystitchccw;
-            if (opposite) opposite->raystitchccw = raystitchccw;
-        } else {
-            stitchccw = 1 - stitchccw;
-            if (opposite) opposite->stitchccw = stitchccw;
-        }
-    }
-
-#endif
-
-    // Marks the edge as being "coarse" (belonging to the control
-    // mesh). Generally this distinction only needs to be made if
-    // we're worried about interpolateboundary behaviour
-    void SetCoarse(bool c) { coarse = c; }
-    bool IsCoarse() const { return coarse; }
-
-    friend class HbrFace<T>;
-
-private:
-    HbrHalfedge<T>* opposite;
-    // Index of incident vertex
-    int incidentVertex;
-
-    // Index of subdivided vertex child
-    int vchild;
-    float sharpness;
-
-#ifdef HBRSTITCH
-    unsigned short stitchccw:1;
-    unsigned short raystitchccw:1;
-    unsigned short stitchdatavalid:1;
-#endif
-    unsigned short coarse:1;
-    unsigned short lastedge:1;
-    unsigned short firstedge:1;
-
-    // If m_index = 0, 1, 2 or 3: we are the m_index edge of an
-    // incident face with 3 or 4 vertices.
-    // If m_index = 4: our incident face has more than 4 vertices, and
-    // we must do some extra math to determine what our actual index
-    // is. See getIndex()
-    unsigned short m_index:3;
-
-    // Returns the index of the edge relative to its incident face.
-    // This relies on knowledge of the face's edge allocation pattern
-    int getIndex() const {
-        if (m_index < 4) {
-            return m_index;
-        } else {
-            // We allocate room for up to 4 values (to handle tri or
-            // quad) in the edges array.  If there are more than that,
-            // they _all_ go in the faces' extraedges array.
-            HbrFace<T>* incidentFace = *(HbrFace<T>**)((char *) this + sizeof(HbrHalfedge<T>));
-            return int(((char *) this - incidentFace->extraedges) /
-                (sizeof(HbrHalfedge<T>) + sizeof(HbrFace<T>*)));
-        }
-    }
-
-    // Returns bitmask indicating whether a given facevarying datum
-    // for the edge is infinitely sharp. Each datum has two bits, and
-    // if those two bits are set to 3, it means the status has not
-    // been computed yet.
-    unsigned int *getFVarInfSharp() {
-        unsigned int *fvarbits = GetFace()->fvarbits;
-        if (fvarbits) {
-            int fvarbitsSizePerEdge = ((GetMesh()->GetFVarCount() + 15) / 16);
-            return fvarbits + getIndex() * fvarbitsSizePerEdge;
-        } else {
-            return 0;
-        }
-    }
-
-#ifdef HBRSTITCH
-    StitchEdge **getStitchEdges() {
-        return GetFace()->stitchEdges + GetMesh()->GetStitchCount() * getIndex();
-    }
-#endif
-
-#ifdef HBR_ADAPTIVE
-public:
-    struct adaptiveFlags {
-        unsigned isTransition:1;
-        unsigned isTriangleHead:1;
-        unsigned isWatertightCritical:1;
-        
-        adaptiveFlags() : isTransition(0),isTriangleHead(0),isWatertightCritical(0) { }
-    };
-    
-    adaptiveFlags _adaptiveFlags;
-    
-    bool IsInsideHole() const {
-
-        HbrFace<T> * left = GetLeftFace();       
-        if (left and (not left->IsHole()))
-            return false;
-        
-        HbrFace<T> * right = GetRightFace();
-        if (right and (not right->IsHole()))
-            return false;
-                        
-        return true;
-    }
-    
-    bool IsTransition() const { return _adaptiveFlags.isTransition; }
-
-    bool IsTriangleHead() const { return _adaptiveFlags.isTriangleHead; }
-
-    bool IsWatertightCritical() const { return _adaptiveFlags.isWatertightCritical; }
-#endif
-};
-
-template <class T>
-void
-HbrHalfedge<T>::Initialize(HbrHalfedge<T>* opposite, int index, HbrVertex<T>* origin,
-    unsigned int *fvarbits, HbrFace<T>* face) {
-    HbrMesh<T> *mesh = face->GetMesh();
-    if (face->GetNumVertices() <= 4) {
-        m_index = index;
-    } else {
-        m_index = 4;
-        // Assumes upstream allocation ensured we have extra storage
-        // for pointer to face after the halfedge data structure
-        // itself
-        *(HbrFace<T>**)((char *) this + sizeof(HbrHalfedge<T>)) = face;
-    }
-    
-    this->opposite = opposite;
-    incidentVertex = origin->GetID();
-    lastedge = (index == face->GetNumVertices() - 1);
-    firstedge = (index == 0);
-    if (opposite) {
-        sharpness = opposite->sharpness;
-#ifdef HBRSTITCH
-        StitchEdge **stitchEdges = face->stitchEdges +
-            mesh->GetStitchCount() * index;
-        for (int i = 0; i < mesh->GetStitchCount(); ++i) {
-            stitchEdges[i] = opposite->getStitchEdges()[i];
-        }
-        stitchccw = opposite->stitchccw;
-        raystitchccw = opposite->raystitchccw;
-        stitchdatavalid = 0;
-        if (stitchEdges && opposite->GetStitchData()) {
-            mesh->SetStitchData(this, opposite->GetStitchData());
-            stitchdatavalid = 1;
-        }
-#endif
-        if (fvarbits) {
-            const int fvarcount = mesh->GetFVarCount();
-            int fvarbitsSizePerEdge = ((fvarcount + 15) / 16);
-            memcpy(fvarbits, opposite->getFVarInfSharp(), fvarbitsSizePerEdge * sizeof(unsigned int));
-        }
-    } else {
-        sharpness = 0.0f;
-#ifdef HBRSTITCH
-        StitchEdge **stitchEdges = getStitchEdges();
-        for (int i = 0; i < mesh->GetStitchCount(); ++i) {
-            stitchEdges[i] = 0;
-        }
-        stitchccw = 1;
-        raystitchccw = 1;
-        stitchdatavalid = 0;
-#endif
-        if (fvarbits) {
-            const int fvarcount = mesh->GetFVarCount();
-            int fvarbitsSizePerEdge = ((fvarcount + 15) / 16);
-            memset(fvarbits, 0xff, fvarbitsSizePerEdge * sizeof(unsigned int));
-        }
-    }
-}
-
-template <class T>
-HbrHalfedge<T>::~HbrHalfedge() {
-    Clear();
-}
-
-template <class T>
-void
-HbrHalfedge<T>::Clear() {
-    if (opposite) {
-        opposite->opposite = 0;
-        if (vchild != -1) {
-            // Transfer ownership of the vchild to the opposite ptr
-            opposite->vchild = vchild;
-
-            HbrVertex<T> *vchildVert = GetMesh()->GetVertex(vchild);
-            // Done this way just for assertion sanity
-            vchildVert->SetParent(static_cast<HbrHalfedge*>(0));
-            vchildVert->SetParent(opposite);
-            vchild = -1;
-        }
-        opposite = 0;
-    }
-    // Orphan the child vertex
-    else if (vchild != -1) {
-        HbrVertex<T> *vchildVert = GetMesh()->GetVertex(vchild);        
-        vchildVert->SetParent(static_cast<HbrHalfedge*>(0));
-        vchild = -1;
-    }
-}
-
-template <class T>
-HbrVertex<T>*
-HbrHalfedge<T>::Subdivide() {
-    HbrMesh<T>* mesh = GetMesh();
-    if (vchild != -1) return mesh->GetVertex(vchild);
-    // Make sure that our opposite doesn't "own" a subdivided vertex
-    // already. If it does, use that
-    if (opposite && opposite->vchild != -1) return mesh->GetVertex(opposite->vchild);
-    HbrVertex<T>* vchildVert = mesh->GetSubdivision()->Subdivide(mesh, this);
-    vchild = vchildVert->GetID();
-    vchildVert->SetParent(this);
-    return vchildVert;
-}
-
-template <class T>
-void
-HbrHalfedge<T>::GuaranteeNeighbor() {
-    HbrMesh<T>* mesh = GetMesh();
-    mesh->GetSubdivision()->GuaranteeNeighbor(mesh, this);
-}
-
-// Determines whether an edge is infinitely sharp as far as its
-// facevarying data is concerned. Happens if the faces on both sides
-// disagree on the facevarying data at either of the shared vertices
-// on the edge.
-template <class T>
-bool
-HbrHalfedge<T>::GetFVarInfiniteSharp(int datum) {
-
-    // Check to see if already initialized
-    int intindex = datum >> 4;
-    int shift = (datum & 15) << 1;
-    unsigned int *fvarinfsharp = getFVarInfSharp();
-    unsigned int bits = (fvarinfsharp[intindex] >> shift) & 0x3;
-    if (bits != 3) {
-        assert (bits != 2);
-        return bits ? true : false;
-    }
-
-    // If there is no face varying data it can't be infinitely sharp!
-    const int fvarwidth = GetMesh()->GetTotalFVarWidth();
-    if (!fvarwidth) {
-        bits = ~(0x3 << shift);
-        fvarinfsharp[intindex] &= bits;
-        if (opposite) opposite->getFVarInfSharp()[intindex] &= bits;
-        return false;
-    }
-
-    // If either incident face is missing, it's a geometric boundary
-    // edge, and also a facevarying boundary edge
-    HbrFace<T>* left = GetLeftFace(), *right = GetRightFace();
-    if (!left || !right) {
-        bits = ~(0x2 << shift);
-        fvarinfsharp[intindex] &= bits;
-        if (opposite) opposite->getFVarInfSharp()[intindex] &= bits;
-        return true;
-    }
-
-    // Look for the indices on each face which correspond to the
-    // origin and destination vertices of the edge
-    int lorg = -1, ldst = -1, rorg = -1, rdst = -1, i, nv;
-    HbrHalfedge<T>* e;
-    e = left->GetFirstEdge();
-    nv = left->GetNumVertices();
-    for (i = 0; i < nv; ++i) {
-        if (e->GetOrgVertex() == GetOrgVertex()) lorg = i;
-        if (e->GetOrgVertex() == GetDestVertex()) ldst = i;
-        e = e->GetNext();
-    }
-    e = right->GetFirstEdge();
-    nv = right->GetNumVertices();
-    for (i = 0; i < nv; ++i) {
-        if (e->GetOrgVertex() == GetOrgVertex()) rorg = i;
-        if (e->GetOrgVertex() == GetDestVertex()) rdst = i;
-        e = e->GetNext();
-    }
-    assert(lorg >= 0 && ldst >= 0 && rorg >= 0 && rdst >= 0);
-    // Compare the facevarying data to some tolerance
-    const int startindex = GetMesh()->GetFVarIndices()[datum];
-    const int width = GetMesh()->GetFVarWidths()[datum];
-    if (!right->GetFVarData(rorg).Compare(left->GetFVarData(lorg), startindex, width, 0.001f) ||
-        !right->GetFVarData(rdst).Compare(left->GetFVarData(ldst), startindex, width, 0.001f)) {
-        bits = ~(0x2 << shift);
-        fvarinfsharp[intindex] &= bits;
-        if (opposite) opposite->getFVarInfSharp()[intindex] &= bits;
-        return true;
-    }
-
-    bits = ~(0x3 << shift);
-    fvarinfsharp[intindex] &= bits;
-    if (opposite) opposite->getFVarInfSharp()[intindex] &= bits;
-    return false;
-}
-
-template <class T>
-bool
-HbrHalfedge<T>::IsFVarInfiniteSharpAnywhere() {
-
-    if (sharpness > k_Smooth) {
-        return true;
-    }
-
-    for (int i = 0; i < GetMesh()->GetFVarCount(); ++i) {
-        if (GetFVarInfiniteSharp(i)) return true;
-    }
-    return false;
-}
-
-template <class T>
-float
-HbrHalfedge<T>::GetFVarSharpness(int datum, bool ignoreGeometry) {
-
-    if (GetFVarInfiniteSharp(datum)) return k_InfinitelySharp;
-
-    if (!ignoreGeometry) {
-        // If it's a geometrically sharp edge it's going to be a
-        // facevarying sharp edge too
-        if (sharpness > k_Smooth) {
-            SetFVarInfiniteSharp(datum, true);
-            return k_InfinitelySharp;
-        }
-    }
-    return k_Smooth;
-}
-
-
-template <class T>
-std::ostream&
-operator<<(std::ostream& out, const HbrHalfedge<T>& edge) {
-    if (edge.IsBoundary()) out << "boundary ";
-    out << "edge connecting ";
-    if (edge.GetOrgVertex())
-        out << *edge.GetOrgVertex();
-    else
-        out << "(none)";
-    out << " to ";
-    if (edge.GetDestVertex()) {
-        out << *edge.GetDestVertex();
-    } else {
-        out << "(none)";
-    }
-    return out;
-}
-
-// Sorts half edges by the relative ordering of the incident faces'
-// paths.
-template <class T>
-class HbrHalfedgeCompare {
-public:
-    bool operator() (const HbrHalfedge<T>* a, HbrHalfedge<T>* b) const {
-        return (a->GetFace()->GetPath() < b->GetFace()->GetPath());
-    }
-};
-
-template <class T>
-class HbrHalfedgeOperator {
-public:
-    virtual void operator() (HbrHalfedge<T> &edge) = 0;
-    virtual ~HbrHalfedgeOperator() {}
-};
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRHALFEDGE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/hierarchicalEdit.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/hierarchicalEdit.h
deleted file mode 100644
index 35407023c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/hierarchicalEdit.h
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRHIERARCHICALEDIT_H
-#define OPENSUBDIV3_HBRHIERARCHICALEDIT_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrHierarchicalEdit;
-template <class T> class HbrFace;
-template <class T> class HbrVertex;
-
-template <class T>
-class HbrHierarchicalEdit {
-
-public:
-    typedef enum Operation {
-        Set,
-        Add,
-        Subtract
-    } Operation;
-
-protected:
-
-    HbrHierarchicalEdit(int _faceid, int _nsubfaces, unsigned char *_subfaces)
-        : faceid(_faceid), nsubfaces(_nsubfaces) {
-        subfaces = new unsigned char[_nsubfaces];
-        for (int i = 0; i < nsubfaces; ++i) {
-            subfaces[i] = _subfaces[i];
-        }
-    }
-
-    HbrHierarchicalEdit(int _faceid, int _nsubfaces, int *_subfaces)
-        : faceid(_faceid), nsubfaces(_nsubfaces) {
-        subfaces = new unsigned char[_nsubfaces];
-        for (int i = 0; i < nsubfaces; ++i) {
-            subfaces[i] = static_cast<unsigned char>(_subfaces[i]);
-        }
-    }
-
-public:
-    virtual ~HbrHierarchicalEdit() {
-        delete[] subfaces;
-    }
-
-    bool operator<(const HbrHierarchicalEdit& p) const {
-        if (faceid < p.faceid) return true;
-        if (faceid > p.faceid) return false;
-        int minlength = nsubfaces;
-        if (minlength > p.nsubfaces) minlength = p.nsubfaces;
-        for (int i = 0; i < minlength; ++i) {
-            if (subfaces[i] < p.subfaces[i]) return true;
-            if (subfaces[i] > p.subfaces[i]) return false;
-        }
-        return (nsubfaces < p.nsubfaces);
-    }
-
-    // Return the face id (the first element in the path)
-    int GetFaceID() const { return faceid; }
-
-    // Return the number of subfaces in the path
-    int GetNSubfaces() const { return nsubfaces; }
-
-    // Return a subface element in the path
-    unsigned char GetSubface(int index) const { return subfaces[index]; }
-
-    // Determines whether this hierarchical edit is relevant to the
-    // face in question
-    bool IsRelevantToFace(HbrFace<T>* face) const;
-
-    // Applys edit to face. All subclasses may override this method
-    virtual void ApplyEditToFace(HbrFace<T>* /* face */) {}
-
-    // Applys edit to vertex. Subclasses may override this method.
-    virtual void ApplyEditToVertex(HbrFace<T>* /* face */, HbrVertex<T>* /* vertex */) {}
-
-#ifdef PRMAN
-    // Gets the effect of this hierarchical edit on the bounding box.
-    // Subclasses may override this method
-    virtual void ApplyToBound(struct bbox& /* box */, RtMatrix * /* mx */) const {}
-#endif
-
-protected:
-    // ID of the top most face in the mesh which begins the path
-    const int faceid;
-
-    // Number of subfaces
-    const int nsubfaces;
-
-    // IDs of the subfaces
-    unsigned char *subfaces;
-};
-
-template <class T>
-class HbrHierarchicalEditComparator {
-public:
-    bool operator() (const HbrHierarchicalEdit<T>* path1, const HbrHierarchicalEdit<T>* path2) const {
-        return (*path1 < *path2);
-    }
-};
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#include "../hbr/face.h"
-#include <cstring>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T>
-bool
-HbrHierarchicalEdit<T>::IsRelevantToFace(HbrFace<T>* face) const {
-
-    // Key assumption: the face's first vertex edit is relevant to
-    // that face. We will then compare ourselves to that edit and if
-    // the first part of our subpath is identical to the entirety of
-    // that subpath, this edit is relevant.
-
-    // Calling code is responsible for making sure we don't
-    // dereference a null pointer here
-    HbrHierarchicalEdit<T>* p = *face->GetHierarchicalEdits();
-    if (!p) return false;
-
-    if (this == p) return true;
-
-    if (faceid != p->faceid) return false;
-
-    // If our path length is less than the face depth, it should mean
-    // that we're dealing with another face somewhere up the path, so
-    // we're not relevant
-    if (nsubfaces < face->GetDepth()) return false;
-
-    if (memcmp(subfaces, p->subfaces, face->GetDepth() * sizeof(unsigned char)) != 0) {
-        return false;
-    }
-    return true;
-}
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRHIERARCHICALEDIT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/holeEdit.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/holeEdit.h
deleted file mode 100644
index ea07b1f67..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/holeEdit.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRHOLEEDIT_H
-#define OPENSUBDIV3_HBRHOLEEDIT_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrHoleEdit;
-
-template <class T>
-std::ostream& operator<<(std::ostream& out, const HbrHoleEdit<T>& path) {
-    out << "edge path = (" << path.faceid << ' ';
-    for (int i = 0; i < path.nsubfaces; ++i) {
-        out << static_cast<int>(path.subfaces[i]) << ' ';
-    }
-    return out << ")";
-}
-
-template <class T>
-class HbrHoleEdit : public HbrHierarchicalEdit<T> {
-
-public:
-
-    HbrHoleEdit(int _faceid, int _nsubfaces, unsigned char *_subfaces)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces) {
-    }
-
-    HbrHoleEdit(int _faceid, int _nsubfaces, int *_subfaces)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces) {
-    }
-
-    virtual ~HbrHoleEdit() {}
-
-    friend std::ostream& operator<< <T> (std::ostream& out, const HbrHoleEdit<T>& path);
-
-    virtual void ApplyEditToFace(HbrFace<T>* face) {
-        if (HbrHierarchicalEdit<T>::GetNSubfaces() == face->GetDepth()) {
-            face->SetHole();
-        }
-    }
-};
-
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRHOLEEDIT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/loop.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/loop.h
deleted file mode 100644
index f21014f1a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/loop.h
+++ /dev/null
@@ -1,979 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRLOOP_H
-#define OPENSUBDIV3_HBRLOOP_H
-
-#include <cmath>
-#include <assert.h>
-#include <algorithm>
-
-#include "../hbr/subdivision.h"
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-/* #define HBR_DEBUG */
-
-template <class T>
-class HbrLoopSubdivision : public HbrSubdivision<T>{
-public:
-    HbrLoopSubdivision<T>()
-        : HbrSubdivision<T>() {}
-
-    virtual HbrSubdivision<T>* Clone() const {
-        return new HbrLoopSubdivision<T>();
-    }
-
-    virtual void Refine(HbrMesh<T>* mesh, HbrFace<T>* face);
-    virtual HbrFace<T>* RefineFaceAtVertex(HbrMesh<T>* mesh, HbrFace<T>* face, HbrVertex<T>* vertex);
-    virtual void GuaranteeNeighbor(HbrMesh<T>* mesh, HbrHalfedge<T>* edge);
-    virtual void GuaranteeNeighbors(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    virtual bool HasLimit(HbrMesh<T>* mesh, HbrFace<T>* face);
-    virtual bool HasLimit(HbrMesh<T>* mesh, HbrHalfedge<T>* edge);
-    virtual bool HasLimit(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrFace<T>* face);
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrHalfedge<T>* edge);
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    virtual bool VertexIsExtraordinary(HbrMesh<T> const * /* mesh */, HbrVertex<T>* vertex) { return vertex->GetValence() != 6; }
-    virtual bool FaceIsExtraordinary(HbrMesh<T> const * /* mesh */, HbrFace<T>* face) { return face->GetNumVertices() != 3; }
-
-    virtual int GetFaceChildrenCount(int /* nvertices */) const { return 4; }
-
-private:
-
-    // Transfers facevarying data from a parent face to a child face
-    void transferFVarToChild(HbrMesh<T>* mesh, HbrFace<T>* face, HbrFace<T>* child, int index);
-
-    // Transfers vertex and edge edits from a parent face to a child face
-    void transferEditsToChild(HbrFace<T>* face, HbrFace<T>* child, int index);
-
-    // Generates the fourth child of a triangle: the triangle in the
-    // middle whose vertices have parents which are all edges
-    void refineFaceAtMiddle(HbrMesh<T>* mesh, HbrFace<T>* face);
-
-};
-
-template <class T>
-void
-HbrLoopSubdivision<T>::transferFVarToChild(HbrMesh<T>* mesh, HbrFace<T>* face, HbrFace<T>* child, int index) {
-    typename HbrMesh<T>::InterpolateBoundaryMethod fvarinterp = mesh->GetFVarInterpolateBoundaryMethod();
-    HbrVertex<T>* childVertex;
-
-    // In the case of index == 3, this is the middle face, and so
-    // we need to do three edge subdivision rules
-    if (index == 3) {
-        const int fvarcount = mesh->GetFVarCount();
-        for (int i = 0; i < 3; ++i) {
-            HbrHalfedge<T> *edge = face->GetEdge(i);
-            GuaranteeNeighbor(mesh, edge);
-            childVertex = child->GetVertex((i + 2) % 3);
-            bool fvIsSmooth = !edge->IsFVarInfiniteSharpAnywhere();
-            if (!fvIsSmooth) {
-                childVertex->NewFVarData(child);
-            }
-            HbrFVarData<T>& fv = childVertex->GetFVarData(child);
-            int fvarindex = 0;
-            for (int fvaritem = 0; fvaritem < fvarcount; ++fvaritem) {
-                const int fvarwidth = mesh->GetFVarWidths()[fvaritem];
-
-                if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-                    face->GetEdge(i)->GetFVarSharpness(fvaritem) || face->GetEdge(i)->IsBoundary()) {
-
-                    // Sharp edge rule
-                    fv.SetWithWeight(face->GetFVarData(i), fvarindex, fvarwidth, 0.5f);
-                    fv.AddWithWeight(face->GetFVarData((i + 1) % 3), fvarindex, fvarwidth, 0.5f);
-                } else if (!fvIsSmooth || !fv.IsInitialized()) {
-                    // Smooth edge subdivision. Add 0.375 of adjacent vertices
-                    fv.SetWithWeight(face->GetFVarData(i), fvarindex, fvarwidth, 0.375f);
-                    fv.AddWithWeight(face->GetFVarData((i + 1) % 3), fvarindex, fvarwidth, 0.375f);
-                    // Add 0.125 of opposite vertices
-                    fv.AddWithWeight(face->GetFVarData((i + 2) % 3), fvarindex, fvarwidth, 0.125f);
-                    HbrFace<T>* oppFace = face->GetEdge(i)->GetRightFace();
-                    for (int j = 0; j < oppFace->GetNumVertices(); ++j) {
-                        if (oppFace->GetVertex(j) == face->GetVertex(i)) {
-                            fv.AddWithWeight(oppFace->GetFVarData((j+1)%oppFace->GetNumVertices()), fvarindex, fvarwidth, 0.125f);
-                            break;
-                        }
-                    }
-                }
-                fvarindex += fvarwidth;
-            }
-            fv.SetInitialized();
-        }
-        return;
-    }
-
-    HbrHalfedge<T>* edge;
-    HbrVertex<T>* v = face->GetVertex(index);
-
-    // Otherwise we proceed with one vertex and two edge subdivision
-    // applications. First the vertex subdivision rule. Analyze
-    // whether the vertex is on the boundary and whether it's an
-    // infinitely sharp corner.  We determine the last by checking the
-    // propagate corners flag on the mesh; if it's off, we check the
-    // two edges of this face incident to that vertex and determining
-    // whether they are facevarying boundary edges - this is analogous
-    // to what goes on for the interpolateboundary tag (which when set
-    // to EDGEANDCORNER marks vertices with a valence of two as being
-    // sharp corners). If propagate corners is on, we check *all*
-    // faces to see if two edges side by side are facevarying boundary
-    // edges. The facevarying boundary check ignores geometric
-    // sharpness, otherwise we may swim at geometric creases which
-    // aren't actually discontinuous.
-    //
-    // We need to make sure that that each of the vertices of the
-    // child face have the appropriate facevarying storage as
-    // needed. If there are discontinuities in any facevarying datum,
-    // the vertex must allocate a new block of facevarying storage
-    // specific to the child face.
-
-    v->GuaranteeNeighbors();
-
-
-    bool fv0IsSmooth, fv1IsSmooth, fv2IsSmooth;
-
-    childVertex = child->GetVertex(index);
-    fv0IsSmooth = v->IsFVarAllSmooth();
-    if (!fv0IsSmooth) {
-        childVertex->NewFVarData(child);
-    }
-    HbrFVarData<T>& fv0 = childVertex->GetFVarData(child);
-
-    edge = face->GetEdge(index);
-    GuaranteeNeighbor(mesh, edge);
-    assert(edge->GetOrgVertex() == v);
-    childVertex = child->GetVertex((index + 1) % 3);
-    fv1IsSmooth = !edge->IsFVarInfiniteSharpAnywhere();
-    if (!fv1IsSmooth) {
-        childVertex->NewFVarData(child);
-    }
-    HbrFVarData<T>& fv1 = childVertex->GetFVarData(child);
-
-    edge = edge->GetPrev();
-    GuaranteeNeighbor(mesh, edge);
-    assert(edge == face->GetEdge((index + 2) % 3));
-    assert(edge->GetDestVertex() == v);
-    childVertex = child->GetVertex((index + 2) % 3);
-    fv2IsSmooth = !edge->IsFVarInfiniteSharpAnywhere();
-    if (!fv2IsSmooth) {
-        childVertex->NewFVarData(child);
-    }
-    HbrFVarData<T>& fv2 = childVertex->GetFVarData(child);
-
-    const int fvarcount = mesh->GetFVarCount();
-    int fvarindex = 0;
-    for (int fvaritem = 0; fvaritem < fvarcount; ++fvaritem) {
-        bool infcorner = false;
-        const int fvarwidth = mesh->GetFVarWidths()[fvaritem];
-        const char fvarmask = v->GetFVarMask(fvaritem);
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryEdgeAndCorner) {
-            if (fvarmask >= HbrVertex<T>::k_Corner) {
-                infcorner = true;
-            } else if (mesh->GetFVarPropagateCorners()) {
-                if (v->IsFVarCorner(fvaritem)) {
-                    infcorner = true;
-                }
-            } else {
-                if (face->GetEdge(index)->GetFVarSharpness(fvaritem, true) && face->GetEdge(index)->GetPrev()->GetFVarSharpness(fvaritem, true)) {
-                    infcorner = true;
-                }
-            }
-        }
-
-        // Infinitely sharp vertex rule. Applied if the vertex is:
-        // - undergoing no facevarying boundary interpolation;
-        // - at a geometric crease, in either boundary interpolation case; or
-        // - is an infinitely sharp facevarying vertex, in the EDGEANDCORNER case; or
-        // - has a mask equal or greater than one, in the "always
-        //   sharp" interpolate boundary case
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-            (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryAlwaysSharp &&
-             fvarmask >= 1) ||
-            v->GetSharpness() > HbrVertex<T>::k_Smooth ||
-            infcorner) {
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 1.0f);
-        }
-        // Dart rule: unlike geometric creases, because there's two
-        // discontinuous values for the one incident edge, we use the
-        // boundary rule and not the smooth rule
-        else if (fvarmask == 1) {
-            // Use 0.75 of the current vert
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.75f);
-
-            // 0.125 of "two adjacent edge vertices", which in actuality
-            // are the facevarying values of the same vertex but on each
-            // side of the single incident facevarying sharp edge
-            HbrHalfedge<T>* start = v->GetIncidentEdge(), *edge, *nextedge;
-            edge = start;
-            while (edge) {
-                if (edge->GetFVarSharpness(fvaritem)) {
-                    break;
-                }
-                nextedge = v->GetNextEdge(edge);
-                if (nextedge == start) {
-                    assert(0); // we should have found it by now
-                    break;
-                } else if (!nextedge) {
-                    // should never get into this case - if the vertex is
-                    // on a boundary, it can never be a facevarying dart
-                    // vertex
-                    assert(0);
-                    edge = edge->GetPrev();
-                    break;
-                } else {
-                    edge = nextedge;
-                }
-            }
-            HbrVertex<T>* w = edge->GetDestVertex();
-            HbrFace<T>* bestface = edge->GetLeftFace();
-            int j;
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-            bestface = edge->GetRightFace();
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-        }
-        // Boundary vertex rule (can use FVarSmooth, which is equivalent
-        // to checking that it's sharper than a dart)
-        else if (fvarmask != 0) {
-
-            // Use 0.75 of the current vert
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.75f);
-
-            // Compute 0.125 of two adjacent edge vertices. However the
-            // two adjacent edge vertices we use must be part of the
-            // facevarying "boundary". To find the first edge we cycle
-            // counterclockwise around the current vertex v and look for
-            // the first boundary edge
-
-            HbrFace<T>* bestface = face;
-            HbrHalfedge<T>* bestedge = face->GetEdge(index)->GetPrev();
-            HbrHalfedge<T>* starte = bestedge->GetOpposite();
-            HbrVertex<T>* w = 0;
-            if (!starte) {
-                w = face->GetEdge(index)->GetPrev()->GetOrgVertex();
-            } else {
-                HbrHalfedge<T>* e = starte, *next;
-                assert(starte->GetOrgVertex() == v);
-                do {
-                    if (e->GetFVarSharpness(fvaritem) || !e->GetLeftFace()) {
-                        bestface = e->GetRightFace();
-                        bestedge = e;
-                        break;
-                    }
-                    next = v->GetNextEdge(e);
-                    if (!next) {
-                        bestface = e->GetLeftFace();
-                        w = e->GetPrev()->GetOrgVertex();
-                        break;
-                    }
-                    e = next;
-                } while (e && e != starte);
-            }
-            if (!w) w = bestedge->GetDestVertex();
-            int j;
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-
-            // Look for the other edge by cycling clockwise around v
-            bestface = face;
-            bestedge = face->GetEdge(index);
-            starte = bestedge;
-            w = 0;
-            if (HbrHalfedge<T>* e = starte) {
-                assert(starte->GetOrgVertex() == v);
-                do {
-                    if (e->GetFVarSharpness(fvaritem) || !e->GetRightFace()) {
-                        bestface = e->GetLeftFace();
-                        bestedge = e;
-                        break;
-                    }
-                    assert(e->GetOpposite());
-                    e = v->GetPreviousEdge(e);
-                } while (e && e != starte);
-            }
-            if (!w) w = bestedge->GetDestVertex();
-            for (j = 0; j < bestface->GetNumVertices(); ++j) {
-                if (bestface->GetVertex(j) == w) break;
-            }
-            assert(j != bestface->GetNumVertices());
-            fv0.AddWithWeight(bestface->GetFVarData(j), fvarindex, fvarwidth, 0.125f);
-
-        }
-        // Smooth rule
-        else if (!fv0IsSmooth || !fv0.IsInitialized()) {
-            int valence = v->GetValence();
-            float invvalence = 1.0f / valence;
-            float beta = 0.25f * cosf((float)M_PI * 2.0f * invvalence) + 0.375f;
-            beta = beta * beta;
-            beta = (0.625f - beta) * invvalence;
-
-            // Use 1 - beta * valence of the current vertex value
-            fv0.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 1 - (beta * valence));
-
-            // Add beta of surrounding vertices averages. We loop over all
-            // surrounding faces..
-            HbrHalfedge<T>* start = v->GetIncidentEdge(), *edge;
-            edge = start;
-            while (edge) {
-                HbrFace<T>* g = edge->GetLeftFace();
-
-                // .. and look for the edge on that face whose origin is
-                // the same as v, and add a contribution from its
-                // destination vertex value; this takes care of the
-                // surrounding edge vertex addition.
-                for (int j = 0; j < g->GetNumVertices(); ++j) {
-                    if (g->GetEdge(j)->GetOrgVertex() == v) {
-                        fv0.AddWithWeight(g->GetFVarData((j + 1) % g->GetNumVertices()), fvarindex, fvarwidth, beta);
-                        break;
-                    }
-                }
-                edge = v->GetNextEdge(edge);
-                if (edge == start) break;
-            }
-        }
-
-        // Edge subdivision rule
-        HbrHalfedge<T>* edge = face->GetEdge(index);
-
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-            edge->GetFVarSharpness(fvaritem) || edge->IsBoundary()) {
-
-            // Sharp edge rule
-            fv1.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.5f);
-            fv1.AddWithWeight(face->GetFVarData((index + 1) % 3), fvarindex, fvarwidth, 0.5f);
-        } else if (!fv1IsSmooth || !fv1.IsInitialized()) {
-            // Smooth edge subdivision. Add 0.375 of adjacent vertices
-            fv1.SetWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.375f);
-            fv1.AddWithWeight(face->GetFVarData((index + 1) % 3), fvarindex, fvarwidth, 0.375f);
-            // Add 0.125 of opposite vertices
-            fv1.AddWithWeight(face->GetFVarData((index + 2) % 3), fvarindex, fvarwidth, 0.125f);
-            HbrFace<T>* oppFace = edge->GetRightFace();
-            for (int j = 0; j < oppFace->GetNumVertices(); ++j) {
-                if (oppFace->GetVertex(j) == v) {
-                    fv1.AddWithWeight(oppFace->GetFVarData((j+1)%oppFace->GetNumVertices()), fvarindex, fvarwidth, 0.125f);
-                    break;
-                }
-            }
-        }
-
-
-        // Edge subdivision rule
-        edge = edge->GetPrev();
-
-        if (fvarinterp == HbrMesh<T>::k_InterpolateBoundaryNone ||
-            edge->GetFVarSharpness(fvaritem) || edge->IsBoundary()) {
-
-            // Sharp edge rule
-            fv2.SetWithWeight(face->GetFVarData((index + 2) % 3), fvarindex, fvarwidth, 0.5f);
-            fv2.AddWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.5f);
-        } else if (!fv2IsSmooth || !fv2.IsInitialized()) {
-            // Smooth edge subdivision. Add 0.375 of adjacent vertices
-            fv2.SetWithWeight(face->GetFVarData((index + 2) % 3), fvarindex, fvarwidth, 0.375f);
-            fv2.AddWithWeight(face->GetFVarData(index), fvarindex, fvarwidth, 0.375f);
-            // Add 0.125 of opposite vertices
-            fv2.AddWithWeight(face->GetFVarData((index + 1) % 3), fvarindex, fvarwidth, 0.125f);
-
-            HbrFace<T>* oppFace = edge->GetRightFace();
-            for (int j = 0; j < oppFace->GetNumVertices(); ++j) {
-                if (oppFace->GetVertex(j) == v) {
-                    fv2.AddWithWeight(oppFace->GetFVarData((j+2)%oppFace->GetNumVertices()), fvarindex, fvarwidth, 0.125f);
-                    break;
-                }
-            }
-        }
-
-        fvarindex += fvarwidth;
-    }
-    fv0.SetInitialized();
-    fv1.SetInitialized();
-    fv2.SetInitialized();
-}
-
-template <class T>
-void
-HbrLoopSubdivision<T>::transferEditsToChild(HbrFace<T>* face, HbrFace<T>* child, int index) {
-
-    // Hand down hole tag
-    child->SetHole(face->IsHole());
- 
-    // Hand down pointers to hierarchical edits
-    if (HbrHierarchicalEdit<T>** edits = face->GetHierarchicalEdits()) {
-        while (HbrHierarchicalEdit<T>* edit = *edits) {
-            if (!edit->IsRelevantToFace(face)) break;
-            if (edit->GetNSubfaces() > face->GetDepth() &&
-                (edit->GetSubface(face->GetDepth()) == index)) {
-                child->SetHierarchicalEdits(edits);
-                break;
-            }
-            edits++;
-        }
-    }
-}
-
-template <class T>
-void
-HbrLoopSubdivision<T>::Refine(HbrMesh<T>* mesh, HbrFace<T>* face) {
-
-#ifdef HBR_DEBUG
-    std::cerr << "\n\nRefining face " << *face << "\n";
-#endif
-
-    assert(face->GetNumVertices() == 3); // or triangulate it?
-
-    HbrHalfedge<T>* edge = face->GetFirstEdge();
-    HbrHalfedge<T>* prevedge = edge->GetPrev();
-    for (int i = 0; i < 3; ++i) {
-        HbrVertex<T>* vertex = edge->GetOrgVertex();
-        if (!face->GetChild(i)) {
-#ifdef HBR_DEBUG
-            std::cerr << "Kid " << i << "\n";
-#endif
-            HbrFace<T>* child;
-            HbrVertex<T>* vertices[3];
-
-            vertices[i] = vertex->Subdivide();
-            vertices[(i + 1) % 3] = edge->Subdivide();
-            vertices[(i + 2) % 3] = prevedge->Subdivide();
-            child = mesh->NewFace(3, vertices, face, i);
-#ifdef HBR_DEBUG
-            std::cerr << "Creating face " << *child << " during refine\n";
-#endif
-
-            // Hand down edge sharpness
-            float sharpness;
-            HbrHalfedge<T>* childedge;
-
-            childedge = child->GetEdge(i);
-            if ((sharpness = edge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                HbrSubdivision<T>::SubdivideCreaseWeight(
-                    edge, edge->GetOrgVertex(), childedge);
-            }
-            childedge->CopyFVarInfiniteSharpness(edge);
-
-            childedge = child->GetEdge((i+2)%3);
-            if ((sharpness = prevedge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                HbrSubdivision<T>::SubdivideCreaseWeight(
-                    prevedge, prevedge->GetDestVertex(), childedge);
-            }
-            childedge->CopyFVarInfiniteSharpness(prevedge);
-
-            if (mesh->GetTotalFVarWidth()) {
-                transferFVarToChild(mesh, face, child, i);
-            }
-
-            transferEditsToChild(face, child, i);
-
-        }
-        prevedge = edge;
-        edge = edge->GetNext();
-    }
-
-    refineFaceAtMiddle(mesh, face);
-}
-
-template <class T>
-HbrFace<T>*
-HbrLoopSubdivision<T>::RefineFaceAtVertex(HbrMesh<T>* mesh, HbrFace<T>* face, HbrVertex<T>* vertex) {
-
-#ifdef HBR_DEBUG
-    std::cerr << "    forcing refine on " << *face << " at " << *vertex << '\n';
-#endif
-    HbrHalfedge<T>* edge = face->GetFirstEdge();
-    HbrHalfedge<T>* prevedge = edge->GetPrev();
-
-    for (int i = 0; i < 3; ++i) {
-        if (edge->GetOrgVertex() == vertex) {
-            if (!face->GetChild(i)) {
-#ifdef HBR_DEBUG
-                std::cerr << "Kid " << i << "\n";
-#endif
-                HbrFace<T>* child;
-                HbrVertex<T>* vertices[3];
-
-                vertices[i] = vertex->Subdivide();
-                vertices[(i + 1) % 3] = edge->Subdivide();
-                vertices[(i + 2) % 3] = prevedge->Subdivide();
-                child = mesh->NewFace(3, vertices, face, i);
-#ifdef HBR_DEBUG
-                std::cerr << "Creating face " << *child << " during refine\n";
-#endif
-
-                // Hand down edge sharpness
-                float sharpness;
-                HbrHalfedge<T>* childedge;
-
-                childedge = child->GetEdge(i);
-                if ((sharpness = edge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                    HbrSubdivision<T>::SubdivideCreaseWeight(
-                        edge, edge->GetOrgVertex(), childedge);
-                }
-                childedge->CopyFVarInfiniteSharpness(edge);
-
-                childedge = child->GetEdge((i+2)%3);
-                if ((sharpness = prevedge->GetSharpness()) > HbrHalfedge<T>::k_Smooth) {
-                    HbrSubdivision<T>::SubdivideCreaseWeight(
-                        prevedge, prevedge->GetDestVertex(), childedge);
-                }
-                childedge->CopyFVarInfiniteSharpness(prevedge);
-
-                if (mesh->GetTotalFVarWidth()) {
-                    transferFVarToChild(mesh, face, child, i);
-                }
-
-                transferEditsToChild(face, child, i);
-
-                return child;
-            } else {
-                return face->GetChild(i);
-            }
-        }
-        prevedge = edge;
-        edge = edge->GetNext();
-    }
-    return 0;
-}
-
-template <class T>
-void
-HbrLoopSubdivision<T>::GuaranteeNeighbor(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) {
-    if (edge->GetOpposite()) {
-        return;
-    }
-
-#ifdef HBR_DEBUG
-    std::cerr << "\n\nneighbor guarantee at " << *edge << " invoked\n";
-#endif
-
-    /*
-      Imagine the following:
-
-                      X
-                     / \
-                    /   \
-                   /     \
-                  X       \
-                 /\        \
-               2/  \3       \
-               /    \        \
-              X------X--------X
-                 1
-
-     If the parent of _both_ incident vertices are themselves edges,
-     (like the edge marked 3 above), then this edge is in the center
-     of the parent face. Refining the parent face in the middle or
-     refining the parent face at one vertex (where the two parent
-     edges meet) should suffice
-    */
-    HbrHalfedge<T>* parentEdge1 = edge->GetOrgVertex()->GetParentEdge();
-    HbrHalfedge<T>* parentEdge2 = edge->GetDestVertex()->GetParentEdge();
-    if (parentEdge1 && parentEdge2) {
-#ifdef HBR_DEBUG
-        std::cerr << "two parent edge situation\n";
-#endif
-        HbrFace<T>* parentFace = parentEdge1->GetFace();
-        assert(parentFace == parentEdge2->GetFace());
-        if(parentEdge1->GetOrgVertex() == parentEdge2->GetDestVertex()) {
-            refineFaceAtMiddle(mesh, parentFace);
-        } else {
-            RefineFaceAtVertex(mesh, parentFace, parentEdge1->GetOrgVertex());
-        }
-        assert(edge->GetOpposite());
-        return;
-    }
-
-    // Otherwise we're in the situation of edge 1 or edge 2 in the
-    // diagram above.
-    if (parentEdge1) {
-#ifdef HBR_DEBUG
-        std::cerr << "parent edge 1 " << *parentEdge1 << "\n";
-#endif
-        HbrVertex<T>* parentVertex2 = edge->GetDestVertex()->GetParentVertex();
-        assert(parentVertex2);
-        RefineFaceAtVertex(mesh, parentEdge1->GetLeftFace(), parentVertex2);
-        if (parentEdge1->GetRightFace()) {
-            RefineFaceAtVertex(mesh, parentEdge1->GetRightFace(), parentVertex2);
-        }
-    } else if (parentEdge2) {
-#ifdef HBR_DEBUG
-        std::cerr << "parent edge 2 " << *parentEdge2 << "\n";
-#endif
-        HbrVertex<T>* parentVertex1 = edge->GetOrgVertex()->GetParentVertex();
-        assert(parentVertex1);
-        RefineFaceAtVertex(mesh, parentEdge2->GetLeftFace(), parentVertex1);
-        if (parentEdge2->GetRightFace()) {
-            RefineFaceAtVertex(mesh, parentEdge2->GetRightFace(), parentVertex1);
-        }
-    }
-}
-
-template <class T>
-void
-HbrLoopSubdivision<T>::GuaranteeNeighbors(HbrMesh<T>* mesh, HbrVertex<T>* vertex) {
-
-#ifdef HBR_DEBUG
-    std::cerr << "\n\nneighbor guarantee at " << *vertex << " invoked\n";
-#endif
-
-    assert(vertex->GetParentFace() == 0);
-
-    // The first case: the vertex is a child of an edge. Make sure
-    // that the parent faces on either side of the parent edge exist,
-    // and have 1) refined at both vertices of the parent edge, and 2)
-    // have refined their "middle" face (which doesn't live at either
-    // vertex).
-
-    HbrHalfedge<T>* parentEdge = vertex->GetParentEdge();
-    if (parentEdge) {
-#ifdef HBR_DEBUG
-        std::cerr << "parent edge situation " << *parentEdge << "\n";
-#endif
-        HbrVertex<T>* dest = parentEdge->GetDestVertex();
-        HbrVertex<T>* org = parentEdge->GetOrgVertex();
-        GuaranteeNeighbor(mesh, parentEdge);
-        HbrFace<T>* parentFace = parentEdge->GetLeftFace();
-        RefineFaceAtVertex(mesh, parentFace, dest);
-        RefineFaceAtVertex(mesh, parentFace, org);
-        refineFaceAtMiddle(mesh, parentFace);
-        parentFace = parentEdge->GetRightFace();
-        // The right face may not necessarily exist even after
-        // GuaranteeNeighbor
-        if (parentFace) {
-            RefineFaceAtVertex(mesh, parentFace, dest);
-            RefineFaceAtVertex(mesh, parentFace, org);
-            refineFaceAtMiddle(mesh, parentFace);
-        }
-        return;
-    }
-
-    // The second case: the vertex is a child of a vertex. In this case
-    // we have to recursively guarantee that the parent's adjacent
-    // faces also exist.
-    HbrVertex<T>* parentVertex = vertex->GetParentVertex();
-    if (parentVertex) {
-#ifdef HBR_DEBUG
-        std::cerr << "parent vertex situation " << *parentVertex << "\n";
-#endif
-        parentVertex->GuaranteeNeighbors();
-
-        // And then we refine all the face neighbors of the parent
-        // vertex
-        HbrHalfedge<T>* start = parentVertex->GetIncidentEdge(), *edge;
-        edge = start;
-        while (edge) {
-            HbrFace<T>* f = edge->GetLeftFace();
-            RefineFaceAtVertex(mesh, f, parentVertex);
-            edge = parentVertex->GetNextEdge(edge);
-            if (edge == start) break;
-        }
-    }
-}
-
-template <class T>
-bool
-HbrLoopSubdivision<T>::HasLimit(HbrMesh<T>* mesh, HbrFace<T>* face) {
-
-    if (face->IsHole()) return false;
-    // A limit face exists if all the bounding edges have limit curves
-    for (int i = 0; i < face->GetNumVertices(); ++i) {
-        if (!HasLimit(mesh, face->GetEdge(i))) {
-            return false;
-        }
-    }
-    return true;
-}
-
-template <class T>
-bool
-HbrLoopSubdivision<T>::HasLimit(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) {
-    //  A sharp edge has a limit curve if both endpoints have limits.
-    //  A smooth edge has a limit if both endpoints have limits and
-    //  the edge isn't on the boundary.
-
-    if (edge->GetSharpness() >= HbrHalfedge<T>::k_InfinitelySharp) return true;
-
-    if (!HasLimit(mesh, edge->GetOrgVertex()) || !HasLimit(mesh, edge->GetDestVertex())) return false;
-
-    return !edge->IsBoundary();
-}
-
-template <class T>
-bool
-HbrLoopSubdivision<T>::HasLimit(HbrMesh<T>* /* mesh */, HbrVertex<T>* vertex) {
-    vertex->GuaranteeNeighbors();
-    switch (vertex->GetMask(false)) {
-        case HbrVertex<T>::k_Smooth:
-        case HbrVertex<T>::k_Dart:
-            return !vertex->OnBoundary();
-            break;
-        case HbrVertex<T>::k_Crease:
-        case HbrVertex<T>::k_Corner:
-        default:
-            if (vertex->IsVolatile()) {
-                // Search for any incident semisharp boundary edge
-                HbrHalfedge<T>* start = vertex->GetIncidentEdge(), *edge, *next;
-                edge = start;
-                while (edge) {
-                    if (edge->IsBoundary() && edge->GetSharpness() < HbrHalfedge<T>::k_InfinitelySharp) {
-                        return false;
-                    }
-                    next = vertex->GetNextEdge(edge);
-                    if (next == start) {
-                        break;
-                    } else if (!next) {
-                        edge = edge->GetPrev();
-                        if (edge->IsBoundary() && edge->GetSharpness() < HbrHalfedge<T>::k_InfinitelySharp) {
-                            return false;
-                        }
-                        break;
-                    } else {
-                        edge = next;
-                    }
-                }
-            }
-            return true;
-    }
-}
-
-template <class T>
-HbrVertex<T>*
-HbrLoopSubdivision<T>::Subdivide(HbrMesh<T>* /* mesh */, HbrFace<T>* /* face */) {
-    // In loop subdivision, faces never subdivide
-    assert(0);
-    return 0;
-}
-
-template <class T>
-HbrVertex<T>*
-HbrLoopSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) {
-
-#ifdef HBR_DEBUG
-    std::cerr << "Subdividing at " << *edge << "\n";
-#endif
-    // Ensure the opposite face exists.
-    GuaranteeNeighbor(mesh, edge);
-
-    float esharp = edge->GetSharpness();
-    HbrVertex<T>* v = mesh->NewVertex();
-    T& data = v->GetData();
-
-    // If there's the possibility of vertex edits on either vertex, we
-    // have to make sure the edit has been applied
-    if (mesh->HasVertexEdits()) {
-        edge->GetOrgVertex()->GuaranteeNeighbors();
-        edge->GetDestVertex()->GuaranteeNeighbors();
-    }
-
-    if (!edge->IsBoundary() && esharp <= 1.0f) {
-
-        // Of the two half-edges, pick one of them consistently such
-        // that the org and dest vertices are also consistent through
-        // multi-threading. It doesn't matter as far as the
-        // theoretical calculation is concerned, but it is desirable
-        // to be consistent about it in the face of the limitations of
-        // floating point commutativity. So we always pick the
-        // half-edge such that its incident face is the smallest of
-        // the two faces, as far as the face paths are concerned.
-        if (edge->GetOpposite() && edge->GetOpposite()->GetFace()->GetPath() < edge->GetFace()->GetPath()) {
-            edge = edge->GetOpposite();
-        }
-
-        // Handle both the smooth and fractional sharpness cases.  We
-        // lerp between the sharp case (average of the two end points)
-        // and the unsharp case (3/8 of each of the two end points
-        // plus 1/8 of the two opposite face averages).
-
-        // Lerp end point weight between non sharp contribution of
-        // 3/8 and the sharp contribution of 0.5.
-        float endPtWeight = 0.375f + esharp * (0.5f - 0.375f);
-        data.AddWithWeight(edge->GetOrgVertex()->GetData(), endPtWeight);
-        data.AddWithWeight(edge->GetDestVertex()->GetData(), endPtWeight);
-
-        // Lerp the opposite pt weights between non sharp contribution
-        // of 1/8 and the sharp contribution of 0.
-        float oppPtWeight = 0.125f * (1 - esharp);
-        HbrHalfedge<T>* ee = edge->GetNext();
-        data.AddWithWeight(ee->GetDestVertex()->GetData(), oppPtWeight);
-        ee = edge->GetOpposite()->GetNext();
-        data.AddWithWeight(ee->GetDestVertex()->GetData(), oppPtWeight);
-    } else {
-        // Fully sharp edge, just average the two end points
-        data.AddWithWeight(edge->GetOrgVertex()->GetData(), 0.5f);
-        data.AddWithWeight(edge->GetDestVertex()->GetData(), 0.5f);
-    }
-
-    // Varying data is always the average of two end points
-    data.AddVaryingWithWeight(edge->GetOrgVertex()->GetData(), 0.5f);
-    data.AddVaryingWithWeight(edge->GetDestVertex()->GetData(), 0.5f);
-
-#ifdef HBR_DEBUG
-    std::cerr << "  created " << *v << "\n";
-#endif
-
-    // Only boundary edges will create extraordinary vertices
-    if (edge->IsBoundary()) {
-        v->SetExtraordinary();
-    }
-    return v;
-}
-
-template <class T>
-HbrVertex<T>*
-HbrLoopSubdivision<T>::Subdivide(HbrMesh<T>* mesh, HbrVertex<T>* vertex) {
-
-    // Ensure the ring of faces around this vertex exists before
-    // we compute the valence
-    vertex->GuaranteeNeighbors();
-
-    float valence = static_cast<float>(vertex->GetValence());
-    float invvalence = 1.0f / valence;
-
-    HbrVertex<T>* v = mesh->NewVertex();
-    T& data = v->GetData();
-
-    // Due to fractional weights we may need to do two subdivision
-    // passes
-    int masks[2];
-    float weights[2];
-    int passes;
-    masks[0] = vertex->GetMask(false);
-    masks[1] = vertex->GetMask(true);
-    // If the masks are different, we subdivide twice: once using the
-    // current mask, once using the mask at the next level of
-    // subdivision, then use fractional mask weights to weigh
-    // each weighing
-    if (masks[0] != masks[1]) {
-        weights[1] = vertex->GetFractionalMask();
-        weights[0] = 1.0f - weights[1];
-        passes = 2;
-    } else {
-        weights[0] = 1.0f;
-        weights[1] = 0.0f;
-        passes = 1;
-    }
-    for (int i = 0; i < passes; ++i) {
-        switch (masks[i]) {
-            case HbrVertex<T>::k_Smooth:
-            case HbrVertex<T>::k_Dart: {
-                float beta = 0.25f * cosf((float)M_PI * 2.0f * invvalence) + 0.375f;
-                beta = beta * beta;
-                beta = (0.625f - beta) * invvalence;
-
-                data.AddWithWeight(vertex->GetData(), weights[i] * (1 - (beta * valence)));
-
-                HbrSubdivision<T>::AddSurroundingVerticesWithWeight(
-                    mesh, vertex, weights[i] * beta, &data);
-                break;
-            }
-            case HbrVertex<T>::k_Crease: {
-                // Compute 3/4 of old vertex value
-                data.AddWithWeight(vertex->GetData(), weights[i] * 0.75f);
-
-                // Add 0.125f of the (hopefully only two!) neighbouring
-                // sharp edges
-                HbrSubdivision<T>::AddCreaseEdgesWithWeight(
-                    mesh, vertex, i == 1, weights[i] * 0.125f, &data);
-                break;
-            }
-            case HbrVertex<T>::k_Corner:
-            default: {
-                // Just copy the old value
-                data.AddWithWeight(vertex->GetData(), weights[i]);
-                break;
-            }
-        }
-    }
-
-    // Varying data is always just propagated down
-    data.AddVaryingWithWeight(vertex->GetData(), 1.0f);
-
-#ifdef HBR_DEBUG
-    std::cerr << "Subdividing at " << *vertex << "\n";
-    std::cerr << "  created " << *v << "\n";
-#endif
-    // Inherit extraordinary flag and sharpness
-    if (vertex->IsExtraordinary()) v->SetExtraordinary();
-    float sharp = vertex->GetSharpness();
-    if (sharp >= HbrVertex<T>::k_InfinitelySharp) {
-        v->SetSharpness(HbrVertex<T>::k_InfinitelySharp);
-    } else if (sharp > HbrVertex<T>::k_Smooth) {
-        v->SetSharpness(std::max((float) HbrVertex<T>::k_Smooth, sharp - 1.0f));
-    } else {
-        v->SetSharpness(HbrVertex<T>::k_Smooth);
-    }
-    return v;
-}
-
-template <class T>
-void
-HbrLoopSubdivision<T>::refineFaceAtMiddle(HbrMesh<T>* mesh, HbrFace<T>* face) {
-
-#ifdef HBR_DEBUG
-    std::cerr << "Refining middle face of " << *face << "\n";
-#endif
-
-    if (!face->GetChild(3)) {
-        HbrFace<T>* child;
-        HbrVertex<T>* vertices[3];
-
-        // The fourth face is not an obvious child of any vertex. We
-        // assign it index 3 despite there being no fourth vertex in
-        // the triangle. The ordering of vertices here is done to
-        // preserve parametric space as best we can
-        vertices[0] = face->GetEdge(1)->Subdivide();
-        vertices[1] = face->GetEdge(2)->Subdivide();
-        vertices[2] = face->GetEdge(0)->Subdivide();
-        child = mesh->NewFace(3, vertices, face, 3);
-#ifdef HBR_DEBUG
-        std::cerr << "Creating face " << *child << "\n";
-#endif
-        if (mesh->GetTotalFVarWidth()) {
-            transferFVarToChild(mesh, face, child, 3);
-        }
-
-        transferEditsToChild(face, child, 3);
-    }
-}
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRLOOP_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/mesh.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/mesh.h
deleted file mode 100644
index 87e29c888..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/mesh.h
+++ /dev/null
@@ -1,1012 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRMESH_H
-#define OPENSUBDIV3_HBRMESH_H
-
-#ifdef PRMAN
-#include "libtarget/TgMalloc.h" // only for alloca
-#include "libtarget/TgThread.h"
-#ifdef HBRSTITCH
-#include "libtarget/TgHashMap.h"
-#endif
-#endif
-
-#include <algorithm>
-#include <cstring>
-#include <iterator>
-#include <vector>
-#include <set>
-#include <iostream>
-
-#include "../hbr/vertex.h"
-#include "../hbr/face.h"
-#include "../hbr/hierarchicalEdit.h"
-#include "../hbr/vertexEdit.h"
-#include "../hbr/creaseEdit.h"
-#include "../hbr/allocator.h"
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrSubdivision;
-template <class T> class HbrHalfedge;
-
-template <class T> class HbrMesh {
-public:
-    HbrMesh(HbrSubdivision<T>* subdivision = 0, int fvarcount = 0, const int *fvarindices = 0, const int *fvarwidths = 0, int totalfvarwidth = 0
-#ifdef HBRSTITCH
-    , int stitchCount = 0
-#endif
-    );
-    ~HbrMesh();
-
-    // Create vertex with the indicated ID and data
-    HbrVertex<T>* NewVertex(int id, const T &data);
-
-    // Create vertex with the indicated data. The ID will be assigned
-    // by the mesh.
-    HbrVertex<T>* NewVertex(const T &data);
-
-    // Create vertex without an ID - one will be assigned by the mesh,
-    // and the data implicitly created will share the same id
-    HbrVertex<T>* NewVertex();
-
-    // Ask for vertex with the indicated ID
-    HbrVertex<T>* GetVertex(int id) const {
-        if (id >= nvertices) {
-            return 0;
-        } else {
-            return vertices[id];
-        }
-    }        
-
-    // Ask for client data associated with the vertex with the indicated ID
-    void* GetVertexClientData(int id) const {
-        if (id >= vertexClientData.size()) {        
-            return 0;
-        } else {
-            return vertexClientData[id];
-        }
-    }
-
-    // Set client data associated with the vertex with the indicated ID
-    void SetVertexClientData(int id, void *data) {
-        if (id >= vertexClientData.size()) {
-            size_t oldsize = vertexClientData.size();
-            vertexClientData.resize(nvertices);
-            if (s_memStatsIncrement) {
-                s_memStatsIncrement((vertexClientData.size() - oldsize) * sizeof(void*));
-            }
-        }
-        vertexClientData[id] = data;
-    }
-
-    // Create face from a list of vertex IDs
-    HbrFace<T>* NewFace(int nvertices, const int *vtx, int uindex);
-
-    // Create face from a list of vertices
-    HbrFace<T>* NewFace(int nvertices, HbrVertex<T>** vtx, HbrFace<T>* parent, int childindex);
-
-    // "Create" a new uniform index
-    int NewUniformIndex() { return ++maxUniformIndex; }
-
-    // Finishes initialization of the mesh
-    void Finish();
-
-    // Remove the indicated face from the mesh
-    void DeleteFace(HbrFace<T>* face);
-
-    // Remove the indicated vertex from the mesh
-    void DeleteVertex(HbrVertex<T>* vertex);
-
-    // Returns number of vertices in the mesh
-    int GetNumVertices() const;
-
-    // Returns number of disconnected vertices in the mesh
-    int GetNumDisconnectedVertices() const;
-
-    // Returns number of faces in the mesh
-    int GetNumFaces() const;
-
-    // Returns number of coarse faces in the mesh
-    int GetNumCoarseFaces() const;
-
-    // Ask for face with the indicated ID
-    HbrFace<T>* GetFace(int id) const;
-
-    // Ask for client data associated with the face with the indicated ID
-    void* GetFaceClientData(int id) const {
-        if (id >= faceClientData.size()) {        
-            return 0;
-        } else {
-            return faceClientData[id];
-        }
-    }
-
-    // Set client data associated with the face with the indicated ID
-    void SetFaceClientData(int id, void *data) {
-        if (id >= faceClientData.size()) {
-            size_t oldsize = faceClientData.size();
-            faceClientData.resize(nfaces);
-            if (s_memStatsIncrement) {
-                s_memStatsIncrement((faceClientData.size() - oldsize) * sizeof(void*));
-            }
-        }
-        faceClientData[id] = data;
-    }
-    
-    // Returns a collection of all vertices in the mesh. This function
-    // requires an output iterator; to get the vertices into a
-    // std::vector, use GetVertices(std::back_inserter(myvector))
-    template <typename OutputIterator>
-    void GetVertices(OutputIterator vertices) const;
-
-    // Applies operator to all vertices
-    void ApplyOperatorAllVertices(HbrVertexOperator<T> &op) const;
-
-    // Returns a collection of all faces in the mesh.  This function
-    // requires an output iterator; to get the faces into a
-    // std::vector, use GetFaces(std::back_inserter(myvector))
-    template <typename OutputIterator>
-    void GetFaces(OutputIterator faces) const;
-
-    // Returns the subdivision method
-    HbrSubdivision<T>* GetSubdivision() const { return subdivision; }
-
-    // Return the number of facevarying variables
-    int GetFVarCount() const { return fvarcount; }
-
-    // Return a table of the start index of each facevarying variable
-    const int *GetFVarIndices() const { return fvarindices; }
-
-    // Return a table of the size of each facevarying variable
-    const int *GetFVarWidths() const { return fvarwidths; }
-
-    // Return the sum size of facevarying variables per vertex
-    int GetTotalFVarWidth() const { return totalfvarwidth; }
-
-#ifdef HBRSTITCH
-    int GetStitchCount() const { return stitchCount; }
-#endif
-
-    void PrintStats(std::ostream& out);
-
-    // Returns memory statistics
-    size_t GetMemStats() const { return m_memory; }
-
-    // Interpolate boundary management
-    enum InterpolateBoundaryMethod {
-        k_InterpolateBoundaryNone,
-        k_InterpolateBoundaryEdgeOnly,
-        k_InterpolateBoundaryEdgeAndCorner,
-        k_InterpolateBoundaryAlwaysSharp
-    };
-
-    InterpolateBoundaryMethod GetInterpolateBoundaryMethod() const { return interpboundarymethod; }
-    void SetInterpolateBoundaryMethod(InterpolateBoundaryMethod method) { interpboundarymethod = method; }
-    InterpolateBoundaryMethod GetFVarInterpolateBoundaryMethod() const { return fvarinterpboundarymethod; }
-    void SetFVarInterpolateBoundaryMethod(InterpolateBoundaryMethod method) { fvarinterpboundarymethod = method; }
-
-    bool GetFVarPropagateCorners() const { return fvarpropagatecorners; }
-    void SetFVarPropagateCorners(bool p) { fvarpropagatecorners = p; }
-
-    // Register routines for keeping track of memory usage
-    void RegisterMemoryRoutines(void (*increment)(unsigned long bytes), void (*decrement)(unsigned long bytes)) {
-        m_faceAllocator.SetMemStatsIncrement(increment);
-        m_faceAllocator.SetMemStatsDecrement(decrement);
-        m_vertexAllocator.SetMemStatsIncrement(increment);
-        m_vertexAllocator.SetMemStatsDecrement(decrement);
-        s_memStatsIncrement = increment;
-        s_memStatsDecrement = decrement;
-    }
-
-    // Add a vertex to consider for garbage collection. All
-    // neighboring faces of that vertex will be examined to see if
-    // they can be deleted
-    void AddGarbageCollectableVertex(HbrVertex<T>* vertex) {
-        if (!m_transientMode) {
-            assert(vertex);
-            if (!vertex->IsCollected()) {
-                gcVertices.push_back(vertex); vertex->SetCollected();
-            }
-        }
-    }
-
-    // Apply garbage collection to the mesh
-    void GarbageCollect();
-
-    // Add a new hierarchical edit to the mesh
-    void AddHierarchicalEdit(HbrHierarchicalEdit<T>* edit);
-
-    // Return the hierarchical edits associated with the mesh
-    const std::vector<HbrHierarchicalEdit<T>*> &GetHierarchicalEdits() const {
-        return hierarchicalEdits;
-    }
-
-    // Return the hierarchical edits associated with the mesh at an
-    // offset
-    HbrHierarchicalEdit<T>** GetHierarchicalEditsAtOffset(int offset) {
-        return &hierarchicalEdits[offset];
-    }
-
-    // Whether the mesh has certain types of edits
-    bool HasVertexEdits() const { return hasVertexEdits; }
-    bool HasCreaseEdits() const { return hasCreaseEdits; }
-
-    void Unrefine(int numCoarseVerts, int numCoarseFaces) {
-
-        for (int i = numCoarseFaces; i < maxFaceID; ++i) {
-            HbrFace<T>* f = GetFace(i);
-                if(f and not f->IsCoarse())
-                    DeleteFace(f);
-        }
-        
-        maxFaceID = numCoarseFaces;
-
-        for(int i=numCoarseVerts; i<(int)vertices.size(); ++i ) {
-            HbrVertex<T>* v = GetVertex(i);
-            if(v and not v->IsReferenced())
-                DeleteVertex(v);
-        }
-    }
-
-    // When mode is true, the mesh is put in a "transient" mode,
-    // i.e. all subsequent intermediate vertices/faces that are
-    // created by subdivision are deemed temporary. This transient
-    // data can be entirely freed by a subsequent call to
-    // FreeTransientData(). Essentially, the mesh is checkpointed and
-    // restored. This is useful when space is at a premium and
-    // subdivided results are cached elsewhere. On the other hand,
-    // repeatedly putting the mesh in and out of transient mode and
-    // performing the same evaluations comes at a significant compute
-    // cost.
-    void SetTransientMode(bool mode) {
-        m_transientMode = mode;
-    }
-
-    // Frees transient subdivision data; returns the mesh to a
-    // checkpointed state prior to a call to SetTransientMode.
-    void FreeTransientData();
-
-    // Create new face children block for use by HbrFace
-    HbrFaceChildren<T>* NewFaceChildren() {
-        return m_faceChildrenAllocator.Allocate();
-    }
-
-    // Recycle face children block used by HbrFace
-    void DeleteFaceChildren(HbrFaceChildren<T>* facechildren) {
-        m_faceChildrenAllocator.Deallocate(facechildren);
-    }
-
-#ifdef HBRSTITCH
-    void * GetStitchData(const HbrHalfedge<T>* edge) const {
-        typename TgHashMap<const HbrHalfedge<T>*, void *>::const_iterator i =
-            stitchData.find(edge);
-        if (i != stitchData.end()) {
-            return i->second;
-        } else {
-            return NULL;
-        }
-    }
-
-    void SetStitchData(const HbrHalfedge<T>* edge, void *data) {
-        stitchData[edge] = data;
-    }
-#endif
-
-private:
-
-    // Subdivision method used in this mesh
-    HbrSubdivision<T>* subdivision;
-
-    // Number of facevarying datums
-    int fvarcount;
-
-    // Start indices of the facevarying data we want to store
-    const int *fvarindices;
-
-    // Individual widths of the facevarying data we want to store
-    const int *fvarwidths;
-
-    // Total widths of the facevarying data
-    const int totalfvarwidth;
-
-#ifdef HBRSTITCH
-    // Number of stitch edges per halfedge 
-    const int stitchCount;
-
-    // Client (sparse) data used on some halfedges
-    TgHashMap<const HbrHalfedge<T>*, void *> stitchData;
-#endif
-
-    // Vertices which comprise this mesh
-    std::vector<HbrVertex<T> *> vertices;
-    int nvertices;
-
-    // Client data associated with each face
-    std::vector<void *> vertexClientData;
-
-    // Faces which comprise this mesh
-    std::vector<HbrFace<T> *> faces;
-    int nfaces;
-
-    // Client data associated with each face
-    std::vector<void *> faceClientData;
-
-    // Maximum vertex ID - may be needed when generating a unique
-    // vertex ID
-    int maxVertexID;
-
-    // Maximum face ID - needed when generating a unique face ID
-    int maxFaceID;
-
-    // Maximum uniform index - needed to generate a new uniform index
-    int maxUniformIndex;
-
-    // Boundary interpolation method
-    InterpolateBoundaryMethod interpboundarymethod;
-
-    // Facevarying boundary interpolation method
-    InterpolateBoundaryMethod fvarinterpboundarymethod;
-
-    // Whether facevarying corners propagate their sharpness
-    bool fvarpropagatecorners;
-
-    // Memory statistics tracking routines
-    HbrMemStatFunction s_memStatsIncrement;
-    HbrMemStatFunction s_memStatsDecrement;
-
-    // Vertices which may be garbage collected
-    std::vector<HbrVertex<T>*> gcVertices;
-
-    // List of vertex IDs which may be recycled
-    std::set<int> recycleIDs;
-
-    // Hierarchical edits. This vector is left unsorted until Finish()
-    // is called, at which point it is sorted. After that point,
-    // HbrFaces have pointers directly into this array so manipulation
-    // of it should be avoided.
-    std::vector<HbrHierarchicalEdit<T>*> hierarchicalEdits;
-
-    // Size of faces (including 4 facevarying bits and stitch edges)
-    const size_t m_faceSize;
-    HbrAllocator<HbrFace<T> > m_faceAllocator;
-
-    // Size of vertices (includes storage for one piece of facevarying data)
-    const size_t m_vertexSize;
-    HbrAllocator<HbrVertex<T> > m_vertexAllocator;
-
-    // Allocator for face children blocks used by HbrFace
-    HbrAllocator<HbrFaceChildren<T> > m_faceChildrenAllocator;
-    
-    // Memory used by this mesh alone, plus all its faces and vertices
-    size_t m_memory;
-
-    // Number of coarse faces. Initialized at Finish()
-    int m_numCoarseFaces;
-
-    // Flags which indicate whether the mesh has certain types of
-    // edits
-    unsigned hasVertexEdits:1;
-    unsigned hasCreaseEdits:1;
-
-    // True if the mesh is in "transient" mode, meaning all
-    // vertices/faces that are created via NewVertex/NewFace should be
-    // deemed temporary
-    bool m_transientMode;
-
-    // Vertices which are transient
-    std::vector<HbrVertex<T>*> m_transientVertices;
-
-    // Faces which are transient
-    std::vector<HbrFace<T>*> m_transientFaces;
-
-#ifdef HBR_ADAPTIVE
-public:
-    std::vector<std::pair<int, int> > const & GetSplitVertices() const {
-        return m_splitVertices;
-    }
-
-protected:
-    friend class HbrVertex<T>;
-    
-    void addSplitVertex(int splitIdx, int orgIdx) {
-        m_splitVertices.push_back(std::pair<int,int>(splitIdx, orgIdx));
-    }
-    
-private:
-    std::vector<std::pair<int, int> >  m_splitVertices;
-#endif
-};
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#include <algorithm>
-#include "../hbr/mesh.h"
-#include "../hbr/halfedge.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T>
-HbrMesh<T>::HbrMesh(HbrSubdivision<T>* s, int _fvarcount, const int *_fvarindices, const int *_fvarwidths, int _totalfvarwidth
-#ifdef HBRSTITCH
-    , int _stitchCount
-#endif
-    )
-    : subdivision(s), fvarcount(_fvarcount), fvarindices(_fvarindices),
-      fvarwidths(_fvarwidths), totalfvarwidth(_totalfvarwidth),
-#ifdef HBRSTITCH
-      stitchCount(_stitchCount),
-#endif
-      nvertices(0), nfaces(0), maxVertexID(0), maxFaceID(0), maxUniformIndex(0),
-      interpboundarymethod(k_InterpolateBoundaryNone),
-      fvarinterpboundarymethod(k_InterpolateBoundaryNone),
-      fvarpropagatecorners(false),
-      s_memStatsIncrement(0), s_memStatsDecrement(0),
-      m_faceSize(sizeof(HbrFace<T>) + 4 *
-                 ((fvarcount + 15) / 16 * sizeof(unsigned int)
-#ifdef HBRSTITCH
-                 + stitchCount * sizeof(StitchEdge*)
-#endif
-                  )),
-      m_faceAllocator(&m_memory, 512, 0, 0, m_faceSize),
-      m_vertexSize(sizeof(HbrVertex<T>) +
-          (totalfvarwidth ? (sizeof(HbrFVarData<T>) + (totalfvarwidth - 1) * sizeof(float)) : 0)),
-      m_vertexAllocator(&m_memory, 512, 0, 0, m_vertexSize),
-      m_faceChildrenAllocator(&m_memory, 512, 0, 0),
-      m_memory(0),
-      m_numCoarseFaces(-1),
-      hasVertexEdits(0),
-      hasCreaseEdits(0),
-      m_transientMode(false) {
-}
-
-template <class T>
-HbrMesh<T>::~HbrMesh() {
-    GarbageCollect();
-
-    int i;
-    if (!faces.empty()) {
-        for (i = 0; i < nfaces; ++i) {
-            if (faces[i]) {
-                faces[i]->Destroy();
-                m_faceAllocator.Deallocate(faces[i]);
-            }
-        }
-        if (s_memStatsDecrement) {
-            s_memStatsDecrement(faces.size() * sizeof(HbrFace<T>*));
-        }
-    }
-    if (!vertices.empty()) {
-        for (i = 0; i < nvertices; ++i) {
-            if (vertices[i]) {
-                vertices[i]->Destroy(this);
-                m_vertexAllocator.Deallocate(vertices[i]);
-            }
-        }
-        if (s_memStatsDecrement) {
-            s_memStatsDecrement(vertices.size() * sizeof(HbrVertex<T>*));
-        }
-    }
-    if (!vertexClientData.empty() && s_memStatsDecrement) {
-        s_memStatsDecrement(vertexClientData.size() * sizeof(void*));
-    }
-    if (!faceClientData.empty() && s_memStatsDecrement) {
-        s_memStatsDecrement(faceClientData.size() * sizeof(void*));
-    }
-    for (typename std::vector<HbrHierarchicalEdit<T>* >::iterator hi =
-             hierarchicalEdits.begin(); hi != hierarchicalEdits.end(); ++hi) {
-        delete *hi;
-    }
-}
-
-template <class T>
-HbrVertex<T>*
-HbrMesh<T>::NewVertex(int id, const T &data) {
-    HbrVertex<T>* v = 0;
-    if (nvertices <= id) {
-        while (nvertices <= maxVertexID) {
-            nvertices *= 2;
-            if (nvertices < 1) nvertices = 1;
-        }
-        size_t oldsize = vertices.size();
-        vertices.resize(nvertices);
-        if (s_memStatsIncrement) {
-            s_memStatsIncrement((vertices.size() - oldsize) * sizeof(HbrVertex<T>*));
-        }
-    }
-    v = vertices[id];
-    if (v) {
-        v->Destroy(this);
-    } else {
-        v = m_vertexAllocator.Allocate();
-    }
-    v->Initialize(id, data, GetTotalFVarWidth());
-    vertices[id] = v;
-
-    if (id >= maxVertexID) {
-        maxVertexID = id + 1;
-    }
-
-    // Newly created vertices are always candidates for garbage
-    // collection, until they get "owned" by someone who
-    // IncrementsUsage on the vertex.
-    AddGarbageCollectableVertex(v);
-
-    // If mesh is in transient mode, add vertex to transient list
-    if (m_transientMode) {
-        m_transientVertices.push_back(v);
-    }
-    return v;
-}
-
-template <class T>
-HbrVertex<T>*
-HbrMesh<T>::NewVertex(const T &data) {
-    // Pick an ID - either the maximum vertex ID or a recycled ID if
-    // we can
-    int id = maxVertexID;
-    if (!recycleIDs.empty()) {
-        id = *recycleIDs.begin();
-        recycleIDs.erase(recycleIDs.begin());
-    }
-    if (id >= maxVertexID) {
-        maxVertexID = id + 1;
-    }
-    return NewVertex(id, data);
-}
-
-template <class T>
-HbrVertex<T>*
-HbrMesh<T>::NewVertex() {
-    // Pick an ID - either the maximum vertex ID or a recycled ID if
-    // we can
-    int id = maxVertexID;
-    if (!recycleIDs.empty()) {
-        id = *recycleIDs.begin();
-        recycleIDs.erase(recycleIDs.begin());
-    }
-    if (id >= maxVertexID) {
-        maxVertexID = id + 1;
-    }
-    T data(id);
-    data.Clear();
-    return NewVertex(id, data);
-}
-
-template <class T>
-HbrFace<T>*
-HbrMesh<T>::NewFace(int nv, const int *vtx, int uindex) {
-    HbrVertex<T>** facevertices = reinterpret_cast<HbrVertex<T>**>(alloca(sizeof(HbrVertex<T>*) * nv));
-    int i;
-    for (i = 0; i < nv; ++i) {
-        facevertices[i] = GetVertex(vtx[i]);
-        if (!facevertices[i]) {
-            return 0;
-        }
-    }
-    HbrFace<T> *f = 0;
-    // Resize if needed
-    if (nfaces <= maxFaceID) {
-        while (nfaces <= maxFaceID) {
-            nfaces *= 2;
-            if (nfaces < 1) nfaces = 1;
-        }
-        size_t oldsize = faces.size();
-        faces.resize(nfaces);
-        if (s_memStatsIncrement) {
-            s_memStatsIncrement((faces.size() - oldsize) * sizeof(HbrVertex<T>*));
-        }
-    }
-    f = faces[maxFaceID];
-    if (f) {
-        f->Destroy();
-    } else {
-        f = m_faceAllocator.Allocate();
-    }
-    f->Initialize(this, NULL, -1, maxFaceID, uindex, nv, facevertices, totalfvarwidth, 0);
-    faces[maxFaceID] = f;
-    maxFaceID++;
-    // Update the maximum encountered uniform index
-    if (uindex > maxUniformIndex) maxUniformIndex = uindex;
-
-    // If mesh is in transient mode, add face to transient list
-    if (m_transientMode) {
-        m_transientFaces.push_back(f);
-    }
-    return f;
-}
-
-template <class T>
-HbrFace<T>*
-HbrMesh<T>::NewFace(int nv, HbrVertex<T> **vtx, HbrFace<T>* parent, int childindex) {
-    HbrFace<T> *f = 0;
-    // Resize if needed
-    if (nfaces <= maxFaceID) {
-        while (nfaces <= maxFaceID) {
-            nfaces *= 2;
-            if (nfaces < 1) nfaces = 1;
-        }
-        size_t oldsize = faces.size();        
-        faces.resize(nfaces);
-        if (s_memStatsIncrement) {
-            s_memStatsIncrement((faces.size() - oldsize) * sizeof(HbrVertex<T>*));
-        }
-    }
-    f = faces[maxFaceID];
-    if (f) {
-        f->Destroy();
-    } else {
-        f = m_faceAllocator.Allocate();
-    }
-    f->Initialize(this, parent, childindex, maxFaceID, parent ? parent->GetUniformIndex() : 0, nv, vtx, totalfvarwidth, parent ? parent->GetDepth() + 1 : 0);
-    if (parent) {
-        f->SetPtexIndex(parent->GetPtexIndex());
-    }
-    faces[maxFaceID] = f;
-    maxFaceID++;
-
-    // If mesh is in transient mode, add face to transient list
-    if (m_transientMode) {
-        m_transientFaces.push_back(f);
-    }
-    return f;
-}
-
-template <class T>
-void
-HbrMesh<T>::Finish() {
-    int i, j;
-    m_numCoarseFaces = 0;
-    for (i = 0; i < nfaces; ++i) {
-        if (faces[i]) {
-            faces[i]->SetCoarse();
-            m_numCoarseFaces++;
-        }
-    }
-
-    std::vector<HbrVertex<T>*> vertexlist;
-    GetVertices(std::back_inserter(vertexlist));
-    for (typename std::vector<HbrVertex<T>*>::iterator vi = vertexlist.begin();
-         vi != vertexlist.end(); ++vi) {
-        HbrVertex<T>* vertex = *vi;
-        if (vertex->IsConnected()) vertex->Finish();
-    }
-    // Finish may have added new vertices
-    vertexlist.clear();
-    GetVertices(std::back_inserter(vertexlist));
-
-    // If interpolateboundary is on, process boundary edges
-    if (interpboundarymethod == k_InterpolateBoundaryEdgeOnly || interpboundarymethod == k_InterpolateBoundaryEdgeAndCorner) {
-        for (i = 0; i < nfaces; ++i) {
-            if (HbrFace<T>* face = faces[i]) {
-                int nv = face->GetNumVertices();
-                for (int k = 0; k < nv; ++k) {
-                    HbrHalfedge<T>* edge = face->GetEdge(k);
-                    if (edge->IsBoundary()) {
-                        edge->SetSharpness(HbrHalfedge<T>::k_InfinitelySharp);
-                    }
-                }
-            }
-        }
-    }
-    // Process corners
-    if (interpboundarymethod == k_InterpolateBoundaryEdgeAndCorner) {
-        for (typename std::vector<HbrVertex<T>*>::iterator vi = vertexlist.begin();
-             vi != vertexlist.end(); ++vi) {
-            HbrVertex<T>* vertex = *vi;
-            if (vertex && vertex->IsConnected() && vertex->OnBoundary() && vertex->GetCoarseValence() == 2) {
-                vertex->SetSharpness(HbrVertex<T>::k_InfinitelySharp);
-            }
-        }
-    }
-
-    // Sort the hierarchical edits
-    if (!hierarchicalEdits.empty()) {
-        HbrHierarchicalEditComparator<T> cmp;
-        int nHierarchicalEdits = (int)hierarchicalEdits.size();
-        std::sort(hierarchicalEdits.begin(), hierarchicalEdits.end(), cmp);
-        // Push a sentinel null value - we rely upon this sentinel to
-        // ensure face->GetHierarchicalEdits knows when to terminate
-        hierarchicalEdits.push_back(0);
-        j = 0;
-        // Link faces to hierarchical edits
-        for (i = 0; i < nfaces; ++i) {
-            if (faces[i]) {
-                while (j < nHierarchicalEdits && hierarchicalEdits[j]->GetFaceID() < i) {
-                    ++j;
-                }
-                if (j < nHierarchicalEdits && hierarchicalEdits[j]->GetFaceID() == i) {
-                    faces[i]->SetHierarchicalEdits(&hierarchicalEdits[j]);
-                }
-            }
-        }
-    }
-}
-
-template <class T>
-void
-HbrMesh<T>::DeleteFace(HbrFace<T>* face) {
-    if (face->GetID() < nfaces) {
-        HbrFace<T>* f = faces[face->GetID()];
-        if (f == face) {
-            faces[face->GetID()] = 0;
-            face->Destroy();
-            m_faceAllocator.Deallocate(face);
-        }
-    }
-}
-
-template <class T>
-void
-HbrMesh<T>::DeleteVertex(HbrVertex<T>* vertex) {
-    HbrVertex<T> *v = GetVertex(vertex->GetID());
-    if (v == vertex) {
-        recycleIDs.insert(vertex->GetID());
-        int id = vertex->GetID();
-        vertices[id] = 0;
-        vertex->Destroy(this);
-        m_vertexAllocator.Deallocate(vertex);
-    }
-}
-
-template <class T>
-int
-HbrMesh<T>::GetNumVertices() const {
-    int count = 0;
-    for (int i = 0; i < nvertices; ++i) {
-        if (vertices[i]) count++;
-    }
-    return count;
-}
-
-template <class T>
-int
-HbrMesh<T>::GetNumDisconnectedVertices() const {
-    int disconnected = 0;
-    for (int i = 0; i < nvertices; ++i) {
-        if (HbrVertex<T>* v = vertices[i]) {
-                if (!v->IsConnected()) {
-                    disconnected++;
-                }
-            }
-        }
-    return disconnected;
-}
-
-template <class T>
-int
-HbrMesh<T>::GetNumFaces() const {
-    int count = 0;
-    for (int i = 0; i < nfaces; ++i) {
-        if (faces[i]) count++;
-    }
-    return count;
-}
-
-template <class T>
-int
-HbrMesh<T>::GetNumCoarseFaces() const {
-    // Use the value computed by Finish() if it exists
-    if (m_numCoarseFaces >= 0) return m_numCoarseFaces;
-    // Otherwise we have to just count it up now
-    int count = 0;
-    for (int i = 0; i < nfaces; ++i) {
-        if (faces[i] && faces[i]->IsCoarse()) count++;
-    }
-    return count;
-}
-
-template <class T>
-HbrFace<T>*
-HbrMesh<T>::GetFace(int id) const {
-    if (id < nfaces) {
-        return faces[id];
-    }
-    return 0;
-}
-
-template <class T>
-template <typename OutputIterator>
-void
-HbrMesh<T>::GetVertices(OutputIterator lvertices) const {
-    for (int i = 0; i < nvertices; ++i) {
-        if (vertices[i]) *lvertices++ = vertices[i];
-    }
-}
-
-template <class T>
-void
-HbrMesh<T>::ApplyOperatorAllVertices(HbrVertexOperator<T> &op) const {
-    for (int i = 0; i < nvertices; ++i) {    
-        if (vertices[i]) op(*vertices[i]);
-    }
-}
-
-template <class T>
-template <typename OutputIterator>
-void
-HbrMesh<T>::GetFaces(OutputIterator lfaces) const {
-    for (int i = 0; i < nfaces; ++i) {
-        if (faces[i]) *lfaces++ = faces[i];
-    }
-}
-
-template <class T>
-void
-HbrMesh<T>::PrintStats(std::ostream &out) {
-    int singular = 0;
-    int sumvalence = 0;
-    int i, nv = 0;
-    int disconnected = 0;
-    int extraordinary = 0;
-    for (i = 0; i < nvertices; ++i) {
-        if (HbrVertex<T>* v = vertices[i]) {
-            nv++;
-            if (v->IsSingular()) {
-                out << "  singular: " << *v << "\n";
-                singular++;
-            } else if (!v->IsConnected()) {
-                out << "  disconnected: " << *v << "\n";
-                disconnected++;
-            } else {
-                if (v->IsExtraordinary()) {
-                    extraordinary++;
-                }
-                sumvalence += v->GetValence();
-            }
-        }
-    }
-    out << "Mesh has " << nv << " vertices\n";
-    out << "Total singular vertices " << singular << "\n";
-    out << "Total disconnected vertices " << disconnected << "\n";
-    out << "Total extraordinary vertices " << extraordinary << "\n";
-    out << "Average valence " << (float) sumvalence / nv << "\n";
-
-    int sumsides = 0;
-    int numfaces = 0;
-    for (i = 0; i < nfaces; ++i) {
-        if (HbrFace<T>* f = faces[i]) {
-            numfaces++;
-            sumsides += f->GetNumVertices();
-        }
-    }
-    out << "Mesh has " << nfaces << " faces\n";
-    out << "Average sidedness " << (float) sumsides / nfaces << "\n";
-}
-
-template <class T>
-void
-HbrMesh<T>::GarbageCollect() {
-    if (gcVertices.empty()) return;
-
-    static const size_t gcthreshold = 4096;
-
-    if (gcVertices.size() <= gcthreshold) return;
-    // Go through the list of garbage collectable vertices and gather
-    // up the neighboring faces of those vertices which can be garbage
-    // collected.
-    std::vector<HbrFace<T>*> killlist;
-    std::vector<HbrVertex<T>*> vlist;
-
-    // Process the vertices in the same order as they were collected
-    // (gcVertices used to be declared as a std::deque, but that was
-    // causing unnecessary heap traffic).
-    int numprocessed = (int)gcVertices.size() - gcthreshold / 2;
-    for (int i = 0; i < numprocessed; ++i) {
-        HbrVertex<T>* v = gcVertices[i];
-        v->ClearCollected();
-        if (v->IsUsed()) continue;
-        vlist.push_back(v);
-        HbrHalfedge<T>* start = v->GetIncidentEdge(), *edge;
-        edge = start;
-        while (edge) {
-            HbrFace<T>* f = edge->GetLeftFace();
-            if (!f->IsCollected()) {
-                f->SetCollected();
-                killlist.push_back(f);
-            }
-            edge = v->GetNextEdge(edge);
-            if (edge == start) break;
-        }
-    }
-
-    gcVertices.erase(gcVertices.begin(), gcVertices.begin() + numprocessed);
-
-    // Delete those faces
-    for (typename std::vector<HbrFace<T>*>::iterator fi = killlist.begin(); fi != killlist.end(); ++fi) {
-        if ((*fi)->GarbageCollectable()) {
-            DeleteFace(*fi);
-        } else {
-            (*fi)->ClearCollected();
-        }
-    }
-
-    // Delete as many vertices as we can
-    for (typename std::vector<HbrVertex<T>*>::iterator vi = vlist.begin(); vi != vlist.end(); ++vi) {
-        HbrVertex<T>* v = *vi;
-        if (!v->IsReferenced()) {
-            DeleteVertex(v);
-        }
-    }
-}
-
-template <class T>
-void
-HbrMesh<T>::AddHierarchicalEdit(HbrHierarchicalEdit<T>* edit) {
-    hierarchicalEdits.push_back(edit);
-    if (dynamic_cast<HbrVertexEdit<T>*>(edit) ||
-        dynamic_cast<HbrMovingVertexEdit<T>*>(edit)) {
-        hasVertexEdits = 1;
-    } else if (dynamic_cast<HbrCreaseEdit<T>*>(edit)) {
-        hasCreaseEdits = 1;
-    }
-}
-
-template <class T>
-void
-HbrMesh<T>::FreeTransientData() {
-    // When purging transient data, we must clear the faces first
-    for (typename std::vector<HbrFace<T>*>::iterator fi = m_transientFaces.begin();
-         fi != m_transientFaces.end(); ++fi) {
-        DeleteFace(*fi);
-    }
-    // The vertices should now be trivial to purge after the transient
-    // faces have been cleared
-    for (typename std::vector<HbrVertex<T>*>::iterator vi = m_transientVertices.begin();
-         vi != m_transientVertices.end(); ++vi) {
-        DeleteVertex(*vi);
-    }
-    m_transientVertices.clear();
-    m_transientFaces.clear();
-    // Reset max face ID
-    int i;
-    for (i = nfaces - 1; i >= 0; --i) {
-        if (faces[i]) {
-            maxFaceID = i + 1;
-            break;
-        }
-    }
-    // Reset max vertex ID
-    for (i = nvertices - 1; i >= 0; --i) {
-        if (vertices[i]) {
-            maxVertexID = i + 1;
-            break;
-        }
-    }
-}
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRMESH_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/subdivision.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/subdivision.h
deleted file mode 100644
index 455b71838..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/subdivision.h
+++ /dev/null
@@ -1,293 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRSUBDIVISION_H
-#define OPENSUBDIV3_HBRSUBDIVISION_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrFace;
-template <class T> class HbrVertex;
-template <class T> class HbrHalfedge;
-template <class T> class HbrMesh;
-template <class T> class HbrSubdivision {
-public:
-    HbrSubdivision<T>()
-        : creaseSubdivision(k_CreaseNormal) {}
-
-    virtual ~HbrSubdivision<T>() {}
-
-    virtual HbrSubdivision<T>* Clone() const = 0;
-
-    // How to subdivide a face
-    virtual void Refine(HbrMesh<T>* mesh, HbrFace<T>* face) = 0;
-
-    // Subdivide a face only at a particular vertex (creating one child)
-    virtual HbrFace<T>* RefineFaceAtVertex(HbrMesh<T>* mesh, HbrFace<T>* face, HbrVertex<T>* vertex) = 0;
-
-    // Refine all faces around a particular vertex
-    virtual void RefineAtVertex(HbrMesh<T>* mesh, HbrVertex<T>* vertex);
-
-    // Given an edge, try to ensure the edge's opposite exists by
-    // forcing refinement up the hierarchy
-    virtual void GuaranteeNeighbor(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) = 0;
-
-    // Given an vertex, ensure all faces in the ring around it exist
-    // by forcing refinement up the hierarchy
-    virtual void GuaranteeNeighbors(HbrMesh<T>* mesh, HbrVertex<T>* vertex) = 0;
-
-    // Returns true if the vertex, edge, or face has a limit point,
-    // curve, or surface associated with it
-    virtual bool HasLimit(HbrMesh<T>* /* mesh */, HbrFace<T>* /* face */) { return true; }
-    virtual bool HasLimit(HbrMesh<T>* /* mesh */, HbrHalfedge<T>* /* edge */) { return true; }
-    virtual bool HasLimit(HbrMesh<T>* /* mesh */, HbrVertex<T>* /* vertex */) { return true; }
-
-    // How to turn faces, edges, and vertices into vertices
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrFace<T>* face) = 0;
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrHalfedge<T>* edge) = 0;
-    virtual HbrVertex<T>* Subdivide(HbrMesh<T>* mesh, HbrVertex<T>* vertex) = 0;
-
-    // Returns true if the vertex is extraordinary in the subdivision scheme
-    virtual bool VertexIsExtraordinary(HbrMesh<T> const * /* mesh */, HbrVertex<T>* /* vertex */) { return false; }
-
-    // Returns true if the face is extraordinary in the subdivision scheme
-    virtual bool FaceIsExtraordinary(HbrMesh<T> const * /* mesh */, HbrFace<T>* /* face */) { return false; }
-
-    // Crease subdivision rules. When subdividing a edge with a crease
-    // strength, we get two child subedges, and we need to determine
-    // what weights to assign these subedges. The "normal" rule
-    // is to simply assign the current edge's crease strength - 1
-    // to both of the child subedges. The "Chaikin" rule looks at the
-    // current edge and incident edges to the current edge's end
-    // vertices, and weighs them; for more information consult
-    // the Geri's Game paper.
-    enum CreaseSubdivision {
-        k_CreaseNormal,
-        k_CreaseChaikin
-    };
-    CreaseSubdivision GetCreaseSubdivisionMethod() const { return creaseSubdivision; }
-    void SetCreaseSubdivisionMethod(CreaseSubdivision method) { creaseSubdivision = method; }
-
-    // Figures out how to assign a crease weight on an edge to its
-    // subedge. The subedge must be a child of the parent edge
-    // (either subedge->GetOrgVertex() or subedge->GetDestVertex()
-    // == edge->Subdivide()). The vertex supplied must NOT be
-    // a parent of the subedge; it is either the origin or
-    // destination vertex of edge.
-    void SubdivideCreaseWeight(HbrHalfedge<T>* edge, HbrVertex<T>* vertex, HbrHalfedge<T>* subedge);
-
-    // Returns the expected number of children faces after subdivision
-    // for a face with the given number of vertices.
-    virtual int GetFaceChildrenCount(int nvertices) const = 0;
-
-protected:
-    CreaseSubdivision creaseSubdivision;
-
-    // Helper routine for subclasses: for a given vertex, sums
-    // contributions from surrounding vertices
-    void AddSurroundingVerticesWithWeight(HbrMesh<T>* mesh, HbrVertex<T>* vertex, float weight, T* data);
-
-    // Helper routine for subclasses: for a given vertex with a crease
-    // mask, adds contributions from the two crease edges
-    void AddCreaseEdgesWithWeight(HbrMesh<T>* mesh, HbrVertex<T>* vertex, bool next, float weight, T* data);
-
-private:
-    // Helper class used by AddSurroundingVerticesWithWeight
-    class SmoothSubdivisionVertexOperator : public HbrVertexOperator<T> {
-    public:
-        SmoothSubdivisionVertexOperator(T* data, bool meshHasEdits, float weight)
-            : m_data(data),
-              m_meshHasEdits(meshHasEdits),
-              m_weight(weight)
-        {
-        }
-        virtual void operator() (HbrVertex<T> &vertex) {
-            // Must ensure vertex edits have been applied
-            if (m_meshHasEdits) {
-                vertex.GuaranteeNeighbors();
-            }
-            m_data->AddWithWeight(vertex.GetData(), m_weight);
-        }
-    private:
-        T* m_data;
-        const bool m_meshHasEdits;
-        const float m_weight;
-    };
-
-    // Helper class used by AddCreaseEdgesWithWeight
-    class CreaseSubdivisionHalfedgeOperator : public HbrHalfedgeOperator<T> {
-    public:
-        CreaseSubdivisionHalfedgeOperator(HbrVertex<T> *vertex, T* data, bool meshHasEdits, bool next, float weight)
-            : m_vertex(vertex),
-              m_data(data),
-              m_meshHasEdits(meshHasEdits),
-              m_next(next),
-              m_weight(weight),
-              m_count(0)
-        {
-        }
-        virtual void operator() (HbrHalfedge<T> &edge) {
-            if (m_count < 2 && edge.IsSharp(m_next)) {
-                HbrVertex<T>* a = edge.GetDestVertex();
-                if (a == m_vertex) a = edge.GetOrgVertex();
-                // Must ensure vertex edits have been applied
-                if (m_meshHasEdits) {
-                    a->GuaranteeNeighbors();
-                }
-                m_data->AddWithWeight(a->GetData(), m_weight);
-                m_count++;
-            }
-        }
-    private:
-        HbrVertex<T>* m_vertex;
-        T* m_data;
-        const bool m_meshHasEdits;
-        const bool m_next;
-        const float m_weight;
-        int m_count;
-    };
-
-private:
-    // Helper class used by RefineAtVertex.
-    class RefineFaceAtVertexOperator : public HbrFaceOperator<T> {
-    public:
-        RefineFaceAtVertexOperator(HbrSubdivision<T>* subdivision, HbrMesh<T>* mesh, HbrVertex<T> *vertex)
-            : m_subdivision(subdivision),
-              m_mesh(mesh),
-              m_vertex(vertex)
-        {
-        }
-        virtual void operator() (HbrFace<T> &face) {
-            m_subdivision->RefineFaceAtVertex(m_mesh, &face, m_vertex);
-        }
-    private:
-        HbrSubdivision<T>* const m_subdivision;
-        HbrMesh<T>* const m_mesh;
-        HbrVertex<T>* const m_vertex;
-    };
-
-};
-
-template <class T>
-void
-HbrSubdivision<T>::RefineAtVertex(HbrMesh<T>* mesh, HbrVertex<T>* vertex) {
-    GuaranteeNeighbors(mesh, vertex);
-    RefineFaceAtVertexOperator op(this, mesh, vertex);
-    vertex->ApplyOperatorSurroundingFaces(op);
-}
-
-template <class T>
-void
-HbrSubdivision<T>::SubdivideCreaseWeight(HbrHalfedge<T>* edge, HbrVertex<T>* vertex, HbrHalfedge<T>* subedge) {
-
-    float sharpness = edge->GetSharpness();
-
-    // In all methods, if the parent edge is infinitely sharp, the
-    // child edge is also infinitely sharp
-    if (sharpness >= HbrHalfedge<T>::k_InfinitelySharp) {
-        subedge->SetSharpness(HbrHalfedge<T>::k_InfinitelySharp);
-    }
-
-    // Chaikin's curve subdivision: use 3/4 of the parent sharpness,
-    // plus 1/4 of crease sharpnesses incident to vertex
-    else if (creaseSubdivision == HbrSubdivision<T>::k_CreaseChaikin) {
-
-        float childsharp = 0.0f;
-        
-        int n = 0;
-
-        // Add 1/4 of the sharpness of all crease edges incident to
-        // the vertex (other than this crease edge)
-        class ChaikinEdgeCreaseOperator : public HbrHalfedgeOperator<T> {
-        public:
-
-            ChaikinEdgeCreaseOperator(
-                HbrHalfedge<T> const * edge, float & childsharp, int & count) : 
-                    m_edge(edge), m_childsharp(childsharp), m_count(count) { }
-
-            virtual void operator() (HbrHalfedge<T> &edge) {
-
-                // Skip original edge or it's opposite
-                if ((&edge==m_edge) || (&edge==m_edge->GetOpposite()))
-                    return;
-                if (edge.GetSharpness() > HbrHalfedge<T>::k_Smooth) {
-                    m_childsharp += edge.GetSharpness();
-                    ++m_count;
-                }
-            }
-
-        private:
-            HbrHalfedge<T> const * m_edge;
-            float & m_childsharp;
-            int & m_count;
-        };
-
-        ChaikinEdgeCreaseOperator op(edge, childsharp, n);
-        vertex->GuaranteeNeighbors();
-        vertex->ApplyOperatorSurroundingEdges(op);
-
-        if (n) {
-            childsharp = childsharp * 0.25f / float(n);
-        }
-
-        // Add 3/4 of the sharpness of this crease edge
-        childsharp += sharpness * 0.75f;
-        childsharp -= 1.0f;
-        if (childsharp < (float) HbrHalfedge<T>::k_Smooth) {
-            childsharp = (float) HbrHalfedge<T>::k_Smooth;
-        }
-        subedge->SetSharpness(childsharp);
-
-    } else {
-        sharpness -= 1.0f;
-        if (sharpness < (float) HbrHalfedge<T>::k_Smooth) {
-            sharpness = (float) HbrHalfedge<T>::k_Smooth;
-        }
-        subedge->SetSharpness(sharpness);
-    }
-}
-
-template <class T>
-void
-HbrSubdivision<T>::AddSurroundingVerticesWithWeight(HbrMesh<T>* mesh, HbrVertex<T>* vertex, float weight, T* data) {
-    SmoothSubdivisionVertexOperator op(data, mesh->HasVertexEdits(), weight);
-    vertex->ApplyOperatorSurroundingVertices(op);
-}
-
-template <class T>
-void
-HbrSubdivision<T>::AddCreaseEdgesWithWeight(HbrMesh<T>* mesh, HbrVertex<T>* vertex, bool next, float weight, T* data) {
-    CreaseSubdivisionHalfedgeOperator op(vertex, data, mesh->HasVertexEdits(), next, weight);
-    vertex->ApplyOperatorSurroundingEdges(op);
-}
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRSUBDIVISION_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/vertex.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/vertex.h
deleted file mode 100644
index 995463f50..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/vertex.h
+++ /dev/null
@@ -1,1558 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRVERTEX_H
-#define OPENSUBDIV3_HBRVERTEX_H
-
-#include <assert.h>
-#include <iostream>
-#include <iterator>
-#include <vector>
-#include "../hbr/fvarData.h"
-#include "../hbr/face.h"
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrHalfedge;
-template <class T> class HbrHalfedgeCompare;
-template <class T> class HbrVertex;
-template <class T> class HbrVertexOperator;
-template <class T> class HbrFaceOperator;
-template <class T> class HbrHalfedgeOperator;
-
-template <class T> class HbrVertex {
-
-public:
-    HbrVertex();
-    HbrVertex(int vid, const T &data, int fvarwidth) {
-        Initialize(vid, data, fvarwidth);
-    }
-    void Initialize(int vid, const T &data, int fvarwidth);
-    ~HbrVertex();
-    void Destroy(HbrMesh<T> *mesh = 0);
-
-    // Registers an incident edge with the vertex
-    void AddIncidentEdge(HbrHalfedge<T>* edge);
-
-    // Unregister an incident edge with the vertex
-    void RemoveIncidentEdge(HbrHalfedge<T>* edge);
-
-    // Checks if removal of the indicated incident edge will result
-    // in a singular vertex
-    bool EdgeRemovalWillMakeSingular(HbrHalfedge<T>* edge) const;
-
-    // Sets up vertex flags after the vertex has been bound to a mesh
-    void Finish();
-
-    // Compute the valence of this vertex
-    int GetValence() const;
-
-    // Compute the valence of this vertex including only edges which
-    // are "coarse" (highest level edges)
-    int GetCoarseValence() const;
-
-    // Return vertex ID
-    int GetID() const { return id; }
-
-    // Return vertex data
-    T& GetData() { return data; }
-
-    // Return vertex data
-    const T& GetData() const { return data; }
-
-    // Returns the facevarying data which is matched to the face.
-    // This may either be the "generic" facevarying item (fvardata, so
-    // data.GetFace() == face) or one specifically registered to the
-    // face (in the middle of morefvardata, so data.GetFace() ==
-    // face). If we require storage for a facevarying data designed to
-    // store discontinuous values for this face, we must have called
-    // NewFVarData before GetFVarData will give it to us.
-    HbrFVarData<T>& GetFVarData(const HbrFace<T>* face);
-
-    // Returns new facevarying data matched to the face
-    HbrFVarData<T>& NewFVarData(const HbrFace<T>* face);
-
-    // Return any incident face attached to the vertex
-    HbrFace<T>* GetFace() const;
-
-    // Return the mesh to which this vertex belongs
-    HbrMesh<T>* GetMesh() const;
-
-    // Return an edge connected to dest
-    HbrHalfedge<T>* GetEdge(const HbrVertex<T>* dest) const;
-
-    // Return an edge connected to vertex with id dest
-    HbrHalfedge<T>* GetEdge(int dest) const;
-    
-    // Given an edge, returns the next edge in counterclockwise order
-    // around this vertex. Note well: this is only the next halfedge,
-    // which means that all edges returned by this function are
-    // guaranteed to have the same origin vertex (ie this vertex).  In
-    // boundary cases if you are interested in all edges you will not
-    // get the last edge with this function. For that reason,
-    // GetSurroundingEdges is preferred.
-    HbrHalfedge<T>* GetNextEdge(const HbrHalfedge<T>* edge) const;
-
-    // Given an edge, returns the previous edge (ie going clockwise)
-    // around this vertex
-    HbrHalfedge<T>* GetPreviousEdge(const HbrHalfedge<T>* edge) const;
-
-    // Quadedge-like algebra subset. Since we are dealing with
-    // halfedges and not symmetric edges, these functions accept a
-    // destination vertex which indicates the (possibly imaginary)
-    // halfedge we are considering, and return the destination vertex
-    // of the desired (also possibly imaginary) halfedge. Also,
-    // currently they are potentially very inefficient and should be
-    // avoided.
-    HbrVertex<T>* GetQEONext(const HbrVertex<T>* dest) const;
-    HbrVertex<T>* GetQEONext(const HbrHalfedge<T>* edge) const;
-    HbrVertex<T>* GetQEOPrev(const HbrHalfedge<T>* edge) const;
-    HbrVertex<T>* GetQEOPrev(const HbrVertex<T>* dest) const;
-    HbrVertex<T>* GetQELNext(const HbrVertex<T>* dest) const;
-
-    // Returns true if the vertex is on a boundary edge
-    bool OnBoundary() const;
-
-    // Returns true if the vertex has a facevarying mask which is
-    // smooth (0).
-    bool IsFVarSmooth(int datum);
-
-    // Returns true if all facevarying data has facevarying mask which
-    // is smooth
-    bool IsFVarAllSmooth();
-
-    // Returns true if the vertex has a facevarying mask which is dart
-    // (1).
-    bool IsFVarDart(int datum);
-
-    // Returns true if the vertex is a facevarying corner for any
-    // incident face, where "cornerness" is defined as having two
-    // incident edges that make up a face both being facevarying
-    // edges.
-    bool IsFVarCorner(int datum);
-
-    // Returns the sharpness of the vertex
-    float GetSharpness() const { return sharpness; }
-
-    // Sets the sharpness of the vertex
-    void SetSharpness(float sharp) { sharpness = sharp; ClearMask(); }
-
-    // Returns whether the corner is sharp at the current level of
-    // subdivision (next = false) or at the next level of subdivision
-    // (next = true).
-    bool IsSharp(bool next) const { return (next ? (sharpness > 0.0f) : (sharpness >= 1.0f)); }
-
-    // Sets the vertex mask if the vertex is sharp to reflect that
-    // it's a corner
-    void ClearMask() {
-        mask0 = mask1 = 0; validmask = 0; volatil = 0;
-    }
-
-    // Returns the integer mask of the vertex at the current level of
-    // subdivision (next = false) or at the next level of subdivision
-    // (next = true)
-    unsigned char GetMask(bool next);
-
-    // Returns the facevarying integer mask of the vertex
-    unsigned char GetFVarMask(int datum);
-
-    // Computes the "fractional mask" of the vertex at the current
-    // subdivision level, based on the fractional sharpnesses of any
-    // adjacent sharp edges. The fractional mask is a value between 0
-    // and 1
-    float GetFractionalMask() const;
-
-    // Returns whether the vertex is singular (has two separate
-    // incident halfedge cycles)
-    bool IsSingular() const { return nIncidentEdges > 1; }
-
-    // Collect the ring of edges around this vertex. Note well: not
-    // all edges in this list will have an orientation where the
-    // origin of the edge is this vertex!  This function requires an
-    // output iterator; to get the edges into a std::vector, use
-    // GetSurroundingEdges(std::back_inserter(myvector))
-    template <typename OutputIterator>
-    void GetSurroundingEdges(OutputIterator edges) const;
-
-    // Apply an edge operator to each edge in the ring of edges
-    // around this vertex
-    void ApplyOperatorSurroundingEdges(HbrHalfedgeOperator<T> &op) const;
-
-    // Collect the ring of vertices around this vertex (the ones that
-    // share an edge with this vertex). This function requires an
-    // output iterator; to get the vertices into a std::vector, use
-    // GetSurroundingVertices(std::back_inserter(myvector))
-    template <typename OutputIterator>
-    void GetSurroundingVertices(OutputIterator vertices) const;
-
-    // Apply a vertex operator to each vertex in the ring of vertices
-    // around this vertex
-    void ApplyOperatorSurroundingVertices(HbrVertexOperator<T> &op) const;
-
-    // Applys an operator to the ring of faces around this vertex
-    void ApplyOperatorSurroundingFaces(HbrFaceOperator<T> &op) const;
-
-    // Returns the parent, which can be a edge, face, or vertex
-    HbrHalfedge<T>* GetParentEdge() const { return (parentType == k_ParentEdge ? parent.edge : 0); }
-    HbrFace<T>* GetParentFace() const { return (parentType == k_ParentFace ? parent.face : 0); }
-    HbrVertex<T>* GetParentVertex() const { return (parentType == k_ParentVertex ? parent.vertex : 0); }
-
-    // Set the parent pointer
-    void SetParent(HbrHalfedge<T>* edge) { assert(!edge || !parent.vertex); parentType = k_ParentEdge; parent.edge = edge; }
-    void SetParent(HbrFace<T>* face) { assert(!face || !parent.vertex); parentType = k_ParentFace; parent.face = face; }
-    void SetParent(HbrVertex<T>* vertex) { assert(!vertex || !parent.vertex); parentType = k_ParentVertex; parent.vertex = vertex; }
-
-    // Subdivides the vertex and returns the child vertex
-    HbrVertex<T>* Subdivide();
-
-    // Refines the ring of faces around this vertex
-    void Refine();
-
-    // Make sure the vertex has all faces in the ring around it
-    void GuaranteeNeighbors();
-
-    // Indicates that the vertex may have a missing face neighbor and
-    // may need to guarantee its neighbors in the future
-    void UnGuaranteeNeighbors() {
-        neighborsguaranteed = 0;
-        // Its mask is also invalidated
-        validmask = 0;
-    }
-
-    // True if the edge has a subdivided child vertex
-    bool HasChild() const { return vchild!=-1; }
-
-    // Remove the reference to subdivided vertex
-    void RemoveChild() { vchild = -1; }
-
-    // Returns true if the vertex still has an incident edge (in other
-    // words, it belongs to a face)
-    bool IsReferenced() const { return references != 0; }
-
-    // Returns true if the vertex is extraordinary
-    bool IsExtraordinary() const { return extraordinary; }
-
-    // Tag the vertex as being extraordinary
-    void SetExtraordinary() { extraordinary = 1; }
-
-    // Returns whether the vertex is volatile (incident to a semisharp
-    // edge or semisharp corner)
-    bool IsVolatile() { if (!validmask) GetMask(false); return volatil; }
-
-    // Simple bookkeeping needed for garbage collection by HbrMesh
-    bool IsCollected() const { return collected; }
-    void SetCollected() { collected = 1; }
-    void ClearCollected() { collected = 0; }
-
-    // Bookkeeping to see if a vertex edit exists for this vertex
-    bool HasVertexEdit() const { return hasvertexedit; }
-    void SetVertexEdit() { hasvertexedit = 1; }
-    void ClearVertexEdit() { hasvertexedit = 0; }
-
-    // Returns memory statistics
-    unsigned long GetMemStats() const;
-
-    // Returns true if the vertex is connected. This means that it has
-    // an incident edge
-    bool IsConnected() const { return nIncidentEdges > 0; }
-
-    // Return an incident edge to this vertex, which happens to be the
-    // first halfedge of the cycles.
-    HbrHalfedge<T>* GetIncidentEdge() const {
-        if (nIncidentEdges > 1) {
-            return incident.edges[0];
-        } else if (nIncidentEdges == 1) {
-            return incident.edge;
-        } else {
-            return 0;
-        }
-    }
-
-    // Sharpness and mask constants
-    enum Mask {
-        k_Smooth = 0,
-        k_Dart = 1,
-        k_Crease = 2,
-        k_Corner = 3,
-        k_InfinitelySharp = 10
-    };
-
-    // Increment the usage counter on the vertex
-    void IncrementUsage() { used++; }
-
-    // Decrement the usage counter on the vertex
-    void DecrementUsage() { used--; }
-
-    // Check the usage counter on the vertex
-    bool IsUsed() const { return used || (vchild != -1); }
-
-    // Used by block allocator
-    HbrVertex<T>*& GetNext() { return parent.vertex; }
-
-    // Returns the blind pointer to client data
-    void *GetClientData(HbrMesh<T>* mesh) const {
-        return mesh->GetVertexClientData(id);
-    }
-
-    // Sets the blind pointer to client data
-    void SetClientData(HbrMesh<T> *mesh, void *data) {
-        mesh->SetVertexClientData(id, data);
-    }
-
-    enum ParentType {
-        k_ParentNone, k_ParentFace, k_ParentEdge, k_ParentVertex
-    };
-
-private:
-    // Splits a singular vertex into multiple nonsingular vertices
-    void splitSingular();
-
-    // Data
-    T data;
-
-    // Pointer to extra facevarying data. Space for this is allocated
-    // by NewFVarData. This struct is actually overpadded.
-    struct morefvardata {
-        int count;
-    } *morefvar;
-
-    // Unique ID of this vertex
-    int id;
-
-    // The number of halfedges which have this vertex as the incident
-    // edge. When references == 0, the vertex is safe to delete
-    int references;
-
-    // The number of faces marked "used" which share this vertex.  May
-    // not be the same as references!
-    int used;
-
-    // Sharpness
-    float sharpness;
-
-    // Index of child vertex
-    int vchild;
-
-    // Size of incident array
-    unsigned short nIncidentEdges;
-    
-    // Vertex masks, at this level of subdivision and at the next
-    // level of subdivision. Valid only when validmask = 1.
-    unsigned short mask0:3;
-    unsigned short mask1:3;
-
-    // Extraordinary bit
-    unsigned short extraordinary:1;
-    // Whether the current mask value is correct or should be recalculated
-    unsigned short validmask:1;
-    // Whether the vertex is "volatile" (is incident to a semisharp edge,
-    // or is a semisharp corner)
-    unsigned short volatil:1;
-    // Whether we can guarantee the existence of neighboring faces on
-    // this vertex
-    unsigned short neighborsguaranteed:1;
-    // Bookkeeping for HbrMesh
-    unsigned short collected:1;
-
-    // Whether the vertex has an edit. The edit is owned by a face
-    // so this is just a tag that indicates we need to search the
-    // vertex's neighboring faces for an edit
-    unsigned short hasvertexedit:1;
-    // Whether the vertex edit (if any) has been applied
-    unsigned short editsapplied:1;
-    // Whether Destroy() has been called
-    unsigned short destroyed:1;
-
-    // Parent type - can be face, edge, or vertex
-    unsigned short parentType:2;
-
-    // List of edge cycles. For "singular" vertices, the corresponding
-    // set of adjacent halfedges may consist of several cycles, and we
-    // need to account for all of them here. In cases where
-    // nIncidentEdges is 1, the edge field of the union points
-    // directly at the edge which starts the only incident cycle. If
-    // nIncidnetEdges is 2 or more, the edges field of the union is a
-    // separate allocated array and edge member of the array points at
-    // separate cycles.
-    union {
-        HbrHalfedge<T>* edge;
-        HbrHalfedge<T>** edges;
-    } incident;
-
-    union {
-        HbrFace<T>* face;
-        HbrHalfedge<T>* edge;
-        HbrVertex<T>* vertex;
-    } parent;
-
-#ifdef HBR_ADAPTIVE
-public:
-    struct adaptiveFlags {
-        unsigned isTagged:1;
-        unsigned wasTagged:1;
-        
-        adaptiveFlags() : isTagged(0), wasTagged(0) { }
-    };
-    
-    adaptiveFlags _adaptiveFlags;
-#endif
-};
-
-template <class T>
-HbrVertex<T>::HbrVertex() :
-    morefvar(0), id(-1), references(0), used(0),
-    sharpness(0.0f), vchild(-1), nIncidentEdges(0), extraordinary(0), validmask(0),
-    volatil(0), neighborsguaranteed(0), collected(0), hasvertexedit(0),
-    editsapplied(0), destroyed(0), parentType(k_ParentNone) {
-    ClearMask();
-    parent.vertex = 0;
-    incident.edge = 0;
-}
-
-template <class T>
-void
-HbrVertex<T>::Initialize(int vid, const T &vdata, int fvarwidth) {
-    data = vdata;
-    morefvar = 0 ;
-    id = vid;
-    references = 0;
-    used = 0;
-    extraordinary = 0;
-    ClearMask();
-    neighborsguaranteed = 0;
-    collected = 0;
-    hasvertexedit = 0;
-    editsapplied = 0;
-    destroyed = 0;
-    sharpness = 0.0f;
-    nIncidentEdges = 0;
-    vchild = -1;
-    assert(!parent.vertex);
-    parentType = k_ParentVertex;
-    parent.vertex = 0;
-
-    if (fvarwidth) {
-        // Upstream allocator ensured the class was padded by the
-        // appropriate size. GetFVarData will return a pointer to this
-        // memory, but it needs to be properly initialized.
-        // Run placement new to initialize datum
-        char *buffer = ((char*) this + sizeof(*this));
-        new (buffer) HbrFVarData<T>();
-    }
-}
-
-template <class T>
-HbrVertex<T>::~HbrVertex() {
-    Destroy();
-}
-
-template <class T>
-void
-HbrVertex<T>::Destroy(HbrMesh<T> *mesh) {
-    if (!destroyed) {
-        // Vertices are only safe for deletion if the number of incident
-        // edges is exactly zero.
-        assert(references == 0);
-
-        // Delete parent reference to self
-        if (parentType == k_ParentEdge && parent.edge) {
-            parent.edge->RemoveChild();
-            parent.edge = 0;
-        } else if (parentType == k_ParentFace && parent.face) {
-            parent.face->RemoveChild();
-            parent.face = 0;
-        } else if (parentType == k_ParentVertex && parent.vertex) {
-            parent.vertex->RemoveChild();
-            parent.vertex = 0;
-        }
-
-        // Orphan the child vertex
-        if (vchild != -1) {
-            if (mesh) {
-                HbrVertex<T> *vchildVert = mesh->GetVertex(vchild);
-                vchildVert->SetParent(static_cast<HbrVertex*>(0));
-            }
-            vchild = -1;
-        }
-        // We're skipping the placement destructors here, in the
-        // assumption that HbrFVarData's destructor doesn't actually do
-        // anything much
-        if (morefvar) {
-            free(morefvar);
-        }
-        destroyed = 1;
-    }
-}
-
-template <class T>
-void
-HbrVertex<T>::AddIncidentEdge(HbrHalfedge<T>* edge) {
-    assert(edge->GetOrgVertex() == this);
-
-    // First, maintain the property that all of the incident edges
-    // will always be a boundary edge if possible. If any of the
-    // incident edges are no longer boundaries at this point then they
-    // can be immediately removed.
-    int i;
-    unsigned short newEdgeCount = 0;
-    bool edgeFound = false;
-    HbrHalfedge<T>** incidentEdges =
-        (nIncidentEdges > 1) ? incident.edges : &incident.edge;
-    
-    for (i = 0; i < nIncidentEdges; ++i) {
-        if (incidentEdges[i] == edge) {
-            edgeFound = true;
-        }
-        if (incidentEdges[i]->IsBoundary()) {
-            incidentEdges[newEdgeCount++] = incidentEdges[i];
-        } else {
-            // Did this edge suddenly stop being a boundary because
-            // the newly introduced edge (or something close to it)
-            // closed a cycle? If so, we don't want to lose a pointer
-            // to this edge cycle!  So check to see if this cycle is
-            // complete, and if so, keep it.
-            HbrHalfedge<T>* start = incidentEdges[i];
-            HbrHalfedge<T>* edge = start;
-            bool prevmatch = false;
-            do {
-                edge = GetNextEdge(edge);
-                // Check all previous incident edges, if already
-                // encountered then we have an edge to this cycle and
-                // don't need to proceed further with this check
-                for (int j = 0; j < i; ++j) {
-                    if (incidentEdges[j] == edge) {
-                        prevmatch = true;
-                        break;
-                    }
-                }
-            } while (!prevmatch && edge && edge != start);
-            if (!prevmatch && edge && edge == start) {
-
-                incidentEdges[newEdgeCount++] = incidentEdges[i];
-            }
-        }
-    }
-
-    // If we are now left with no incident edges, then this edge
-    // becomes the sole incident edge (since we always need somewhere
-    // to start, even if it's a uninterrupted cycle [ie it doesn't
-    // matter whether the edge is a boundary]). Restore incidentEdges
-    // array to point to the end of the object.
-    if (newEdgeCount == 0) {
-        if (!(edgeFound && nIncidentEdges == 1)) {
-            if (nIncidentEdges > 1) {
-                delete [] incidentEdges;
-            }
-            incidentEdges = &incident.edge;
-            incidentEdges[0] = edge;
-            nIncidentEdges = 1;
-        }
-    }
-
-    // Otherwise, we already have a set of incident edges - we only
-    // add this edge if it's a boundary edge, which would begin a new
-    // cycle.
-    else if (edge->IsBoundary()) {
-        if (!edgeFound) {
-            // Must add the new edge. May need to reallocate here.
-            if (newEdgeCount + 1 != nIncidentEdges) {
-                HbrHalfedge<T>** newIncidentEdges = 0;
-                if (newEdgeCount + 1 > 1) {
-                    newIncidentEdges = new HbrHalfedge<T>*[newEdgeCount + 1];
-                } else {
-                    newIncidentEdges = &incident.edge;
-                }
-                for (i = 0; i < newEdgeCount; ++i) {
-                    newIncidentEdges[i] = incidentEdges[i];
-                }
-                if (nIncidentEdges > 1) {
-                    delete[] incidentEdges;
-                }
-                nIncidentEdges = newEdgeCount + 1;
-                incidentEdges = newIncidentEdges;
-                if (nIncidentEdges > 1) {
-                    incident.edges = newIncidentEdges;
-                }
-            }
-            incidentEdges[newEdgeCount] = edge;
-        } else {
-            // Edge is already in our list, so we don't need to add it
-            // again. However, we may need to reallocate due to above
-            // cleaning of nonboundary edges
-            if (newEdgeCount != nIncidentEdges) {
-                HbrHalfedge<T>** newIncidentEdges = 0;
-                if (newEdgeCount > 1) {
-                    newIncidentEdges = new HbrHalfedge<T>*[newEdgeCount];
-                } else {
-                    newIncidentEdges = &incident.edge;
-                }
-                for (i = 0; i < newEdgeCount; ++i) {
-                    newIncidentEdges[i] = incidentEdges[i];
-                }
-                if (nIncidentEdges > 1) {
-                    delete[] incidentEdges;
-                }
-                nIncidentEdges = newEdgeCount;
-                incidentEdges = newIncidentEdges;
-                if (nIncidentEdges > 1) {
-                    incident.edges = newIncidentEdges;
-                }
-            }
-        }
-    }
-    else {
-        // Again, we may need to reallocate due to above cleaning of
-        // nonboundary edges
-        if (newEdgeCount != nIncidentEdges) {
-            HbrHalfedge<T>** newIncidentEdges = 0;
-            if (newEdgeCount > 1) {
-                newIncidentEdges = new HbrHalfedge<T>*[newEdgeCount];
-            } else {
-                newIncidentEdges = &incident.edge;
-            }
-            for (i = 0; i < newEdgeCount; ++i) {
-                newIncidentEdges[i] = incidentEdges[i];
-            }
-            if (nIncidentEdges > 1) {
-                delete[] incidentEdges;
-            }
-            nIncidentEdges = newEdgeCount;
-            incidentEdges = newIncidentEdges;
-            if (nIncidentEdges > 1) {
-                incident.edges = newIncidentEdges;
-            }
-        }
-    }
-
-    // For non-boundary edges, ensure that the incident edge starting
-    // the cycle is the lowest possible edge. By doing this,
-    // operations like GetSurroundingEdges will be guaranteed to
-    // return the same order of edges/faces through multi-threading.
-    if (!incidentEdges[0]->IsBoundary()) {
-        HbrHalfedge<T>* start = GetIncidentEdge();
-        incidentEdges[0] = start;
-        HbrFacePath incidentEdgePath = incidentEdges[0]->GetFace()->GetPath();
-        HbrHalfedge<T>* e = GetNextEdge(start);
-        while (e) {
-            if (e == start) break;
-            HbrFacePath ePath = e->GetFace()->GetPath();
-            if (ePath < incidentEdgePath) {
-                incidentEdges[0] = e;
-                incidentEdgePath = ePath;
-            }
-            HbrHalfedge<T>* next = GetNextEdge(e);
-            if (!next) {
-                e = e->GetPrev();
-                if (e->GetFace()->GetPath() < incidentEdges[0]->GetFace()->GetPath()) {
-                    incidentEdges[0] = e;
-                }
-                break;
-            } else {
-                e = next;
-            }
-        }
-    }
-
-    references++;
-}
-
-template <class T>
-void
-HbrVertex<T>::RemoveIncidentEdge(HbrHalfedge<T>* edge) {
-
-    int i, j;
-    HbrHalfedge<T>** incidentEdges =
-        (nIncidentEdges > 1) ? incident.edges : &incident.edge;
-
-    references--;
-    if (references) {
-
-        HbrHalfedge<T>* next;
-
-        // We may need to shuffle our halfedge cycles. First we check
-        // whether the edge being erased begins any edge cycles
-        bool edgeFound = false;
-        next = GetNextEdge(edge);
-
-        for (i = 0; i < nIncidentEdges; ++i) {
-            if (incidentEdges[i] == edge) {
-
-                // Edge cycle found. Replace the edge with the next edge
-                // in the cycle if possible.
-                if (next) {
-                    incidentEdges[i] = next;
-                    // We are done.
-                    return;
-                }
-
-                // If no next edge is found it means the entire cycle
-                // has gone away.
-                edgeFound = true;
-                break;
-            }
-        }
-
-        // The edge cycle needs to disappear
-        if (edgeFound) {
-            assert(nIncidentEdges > 1);
-
-            HbrHalfedge<T>** newIncidentEdges = 0;
-            if (nIncidentEdges - 1 > 1) {
-                newIncidentEdges = new HbrHalfedge<T>*[nIncidentEdges - 1];
-            } else {
-                newIncidentEdges = &incident.edge;
-            }
-            j = 0;
-            for (i = 0; i < nIncidentEdges; ++i) {
-                if (incidentEdges[i] != edge) {
-                    newIncidentEdges[j++] = incidentEdges[i];
-                }
-            }
-            assert(j == nIncidentEdges - 1);
-            if (nIncidentEdges > 1) {
-                delete[] incidentEdges;
-            }
-            nIncidentEdges--;
-            if (nIncidentEdges > 1) {
-                incident.edges = newIncidentEdges;
-            }
-            return;
-        }
-        // Now deal with the case where we remove an edge
-        // which did not begin a boundary edge cycle. If this
-        // happens then the resulting unbroken cycle does
-        // get broken; in that case we replace the incident
-        // edge with the next one after this.
-        else if (nIncidentEdges == 1 && !incidentEdges[0]->IsBoundary()) {
-            if (next) {
-                incidentEdges[0] = next;
-            } else {
-                // hm, what does this mean for us? Not sure at the
-                // moment.
-                std::cout << "Could not split cycle!\n";
-                assert(0);
-            }
-        }
-
-        // (Is this another case or a specialization of the above?)
-        // When an edge in the middle of a boundary cycle goes away we
-        // need to mark a new cycle.
-        //
-        // If there is no next edge, it means that we didn't
-        // actually split the cycle, we just deleted the last edge
-        // in the cycle. As such nothing needs to occur because
-        // the "split" is already present.
-
-        else if (!edge->IsBoundary() && next) {
-            HbrHalfedge<T>** newIncidentEdges = 0;
-            if (nIncidentEdges + 1 > 1) {
-                newIncidentEdges = new HbrHalfedge<T>*[nIncidentEdges + 1];
-            } else {
-                newIncidentEdges = &incident.edge;
-            }
-            for (i = 0; i < nIncidentEdges; ++i) {
-                newIncidentEdges[i] = incidentEdges[i];
-            }
-            newIncidentEdges[nIncidentEdges] = next;
-            if (nIncidentEdges > 1) {
-                delete[] incidentEdges;
-            }
-            nIncidentEdges++;
-            if (nIncidentEdges > 1) {
-                incident.edges = newIncidentEdges;
-            }
-        }
-    } else {
-        // No references left, we can just clear all the cycles
-        if (nIncidentEdges > 1) {
-            delete[] incidentEdges;
-        }
-        nIncidentEdges = 0;
-    }
-}
-
-template <class T>
-bool
-HbrVertex<T>::EdgeRemovalWillMakeSingular(HbrHalfedge<T>* edge) const {
-    // Only edge left, or no incident edges at all (how?)
-    if (references <= 1 || nIncidentEdges <= 0) {
-        return false;
-    }
-    // There are at least two existing cycles. We could maybe consider
-    // the case where removal of this edge will actually make one of
-    // the edge cycles go away, possibly leaving behind just one, but
-    // we'll ignore that possibility for now
-    else if (nIncidentEdges > 1) {
-        return true;
-    }
-     // This is the incident edge starting a single cycle. Removal of
-     // the edge will replace the start of the cycle with the next
-     // edge, and we keep a single cycle.
-    else if (nIncidentEdges == 1 && incident.edge == edge) {
-        return false;
-    }
-    // Check the single cycle: was it interrupted? (i.e. a
-    // boundary). If not interrupted, then deletion of any edge still
-    // leaves a single cycle. Otherwise: if the edge is the *last*
-    // edge in the cycle, we still don't need to split the any further
-    // cycle. Otherwise we must split the cycle, which would result in
-    // a singular vertex
-    else if (!GetIncidentEdge()->IsBoundary()) {
-        return false;
-    } else if (GetNextEdge(edge)) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-template <class T>
-void
-HbrVertex<T>::Finish() {
-    extraordinary = false;
-    if (HbrMesh<T>* mesh = GetMesh()) {
-        if (IsSingular()) splitSingular();
-        assert(!IsSingular());
-        if (mesh->GetSubdivision()) {
-            extraordinary = mesh->GetSubdivision()->VertexIsExtraordinary(mesh, this);
-        }
-    }
-}
-
-template <class T>
-int
-HbrVertex<T>::GetValence() const {
-    int valence = 0;
-    assert(!IsSingular());
-    HbrHalfedge<T>* start =
-        (nIncidentEdges > 1) ? incident.edges[0] : incident.edge;
-    HbrHalfedge<T>* edge = start;
-    if (edge) do {
-        valence++;
-        edge = GetNextEdge(edge);
-    } while (edge && edge != start);
-    // In boundary cases, we increment the valence count by
-    // one more
-    if (!edge) valence++;
-    return valence;
-}
-
-template <class T>
-int
-HbrVertex<T>::GetCoarseValence() const {
-    int valence = 0;
-    assert(!IsSingular());
-    HbrHalfedge<T>* start =
-        (nIncidentEdges > 1) ? incident.edges[0] : incident.edge;
-    HbrHalfedge<T>* edge = start;
-    if (edge) do {
-        if (edge->IsCoarse()) {
-            valence++;
-        }
-        edge = GetNextEdge(edge);
-    } while (edge && edge != start);
-    // In boundary cases, we increment the valence count by one more
-    // (this assumes the last edge is coarse, which it had better be
-    // in the boundary case!)
-    if (!edge) valence++;
-    return valence;
-}
-
-template <class T>
-HbrFVarData<T>&
-HbrVertex<T>::GetFVarData(const HbrFace<T>* face) {
-    // See if there are any extra facevarying datum associated with
-    // this vertex, and whether any of them match the face.
-    if (morefvar) {
-        size_t fvtsize = sizeof(HbrFVarData<T>) + sizeof(float) * (GetMesh()->GetTotalFVarWidth() - 1);
-        HbrFVarData<T> *fvt = (HbrFVarData<T> *)((char *) morefvar + sizeof(int));
-        for (int i = 0; i < morefvar->count; ++i) {
-            if (fvt->GetFaceID() == face->GetID()) {
-                return *fvt;
-            }
-            fvt = (HbrFVarData<T>*)((char*) fvt + fvtsize);
-        }
-    }
-    // Otherwise, return the default facevarying datum, which lives
-    // in the overallocated space after the end of this object
-    return *((HbrFVarData<T>*) ((char*) this + sizeof(*this)));
-}
-
-template <class T>
-HbrFVarData<T>&
-HbrVertex<T>::NewFVarData(const HbrFace<T>* face) {
-    const int fvarwidth = GetMesh()->GetTotalFVarWidth();
-    size_t fvtsize = sizeof(HbrFVarData<T>) + (fvarwidth - 1) * sizeof(float);
-    if (morefvar) {
-        struct morefvardata *newmorefvar =
-            (struct morefvardata *) malloc(sizeof(int) + (morefvar->count + 1) * fvtsize);
-        HbrFVarData<T> *newfvt = (HbrFVarData<T> *)((char *) newmorefvar + sizeof(int));
-        HbrFVarData<T> *oldfvt = (HbrFVarData<T> *)((char *) morefvar + sizeof(int));
-        for (int i = 0; i < morefvar->count; ++i) {
-            new (newfvt) HbrFVarData<T>();
-            newfvt->SetAllData(fvarwidth, oldfvt->GetData(0));
-            newfvt->SetFaceID(oldfvt->GetFaceID());
-            oldfvt = (HbrFVarData<T>*)((char*) oldfvt + fvtsize);
-            newfvt = (HbrFVarData<T>*)((char*) newfvt + fvtsize);
-        }
-        new (newfvt) HbrFVarData<T>();
-        newfvt->SetFaceID(face->GetID());
-        newmorefvar->count = morefvar->count + 1;
-        free(morefvar);
-        morefvar = newmorefvar;
-        return *newfvt;
-    } else {
-        morefvar = (struct morefvardata *) malloc(sizeof(int) + fvtsize);
-        HbrFVarData<T> *newfvt = (HbrFVarData<T> *)((char *) morefvar + sizeof(int));
-        new (newfvt) HbrFVarData<T>();
-        newfvt->SetFaceID(face->GetID());
-        morefvar->count = 1;
-        return *newfvt;
-    }
-}
-
-
-
-template <class T>
-HbrFace<T>*
-HbrVertex<T>::GetFace() const {
-    return GetIncidentEdge()->GetFace();
-}
-
-template <class T>
-HbrMesh<T>*
-HbrVertex<T>::GetMesh() const {
-    return GetFace()->GetMesh();
-}
-
-template <class T>
-HbrHalfedge<T>*
-HbrVertex<T>::GetEdge(const HbrVertex<T>* dest) const {
-    // Here, we generally want to go through all halfedge cycles
-    for (int i = 0; i < nIncidentEdges; ++i) {
-        HbrHalfedge<T>* cycle =
-            (nIncidentEdges > 1) ? incident.edges[i] : incident.edge;
-        HbrHalfedge<T>* edge = cycle;
-        if (edge) do {
-            if (edge->GetDestVertex() == dest) {
-                return edge;
-            }
-            edge = GetNextEdge(edge);
-        } while (edge && edge != cycle);
-    }
-    return 0;
-}
-
-template <class T>
-HbrHalfedge<T>*
-HbrVertex<T>::GetEdge(int dest) const {
-    // Here, we generally want to go through all halfedge cycles
-    for (int i = 0; i < nIncidentEdges; ++i) {
-        HbrHalfedge<T>* cycle =
-            (nIncidentEdges > 1) ? incident.edges[i] : incident.edge;
-        HbrHalfedge<T>* edge = cycle;
-        if (edge) do {
-            if (edge->GetDestVertexID() == dest) {
-                return edge;
-            }
-            edge = GetNextEdge(edge);
-        } while (edge && edge != cycle);
-    }
-    return 0;
-}
-
-template <class T>
-HbrHalfedge<T>*
-HbrVertex<T>::GetNextEdge(const HbrHalfedge<T>* edge) const {
-    // Paranoia:
-    //    if (edge->GetOrgVertex() != this) return 0;
-    return edge->GetPrev()->GetOpposite();
-}
-
-template <class T>
-HbrHalfedge<T>*
-HbrVertex<T>::GetPreviousEdge(const HbrHalfedge<T>* edge) const {
-    // Paranoia:
-    //    if (edge->GetOrgVertex() != this) return 0;
-    return edge->GetOpposite()->GetNext();
-}
-
-template <class T>
-HbrVertex<T>*
-HbrVertex<T>::GetQEONext(const HbrVertex<T>* dest) const {
-    HbrHalfedge<T>* edge = GetEdge(dest);
-    if (edge) {
-        return edge->GetPrev()->GetOrgVertex();
-    }
-    HbrHalfedge<T>* start = GetIncidentEdge(), *next;
-    edge = start;
-    while (edge) {
-        next = GetNextEdge(edge);
-        if (edge->GetDestVertex() == dest) {
-            if (!next) {
-                return edge->GetPrev()->GetOrgVertex();
-            } else {
-                return next->GetDestVertex();
-            }
-        }
-        if (next == start) {
-            return 0;
-        } else if (!next) {
-            if (edge->GetPrev()->GetOrgVertex() == dest) {
-                return start->GetDestVertex();
-            } else {
-                return 0;
-            }
-        } else {
-            edge = next;
-        }
-    }
-    // Shouldn't get here
-    return 0;
-}
-
-template <class T>
-HbrVertex<T>*
-HbrVertex<T>::GetQEONext(const HbrHalfedge<T>* edge) const {
-    assert(edge->GetOrgVertex() == this);
-    return edge->GetPrev()->GetOrgVertex();
-}
-
-template <class T>
-HbrVertex<T>*
-HbrVertex<T>::GetQEOPrev(const HbrVertex<T>* dest) const {
-    HbrHalfedge<T>* edge = GetEdge(dest);
-    if (edge) {
-        if (edge->GetOpposite()) {
-            return edge->GetOpposite()->GetNext()->GetDestVertex();
-        } else {
-            HbrHalfedge<T>* start = GetIncidentEdge(), *next;
-            edge = start;
-            while (edge) {
-                next = GetNextEdge(edge);
-                if (next == start) {
-                    if (next->GetDestVertex() == dest) {
-                        return edge->GetDestVertex();
-                    } else {
-                        return 0;
-                    }
-                } else if (!next) {
-                    if (edge->GetPrev()->GetOrgVertex() == dest) {
-                        return edge->GetDestVertex();
-                    } else if (start->GetDestVertex() == dest) {
-                        return edge->GetPrev()->GetOrgVertex();
-                    } else {
-                        return 0;
-                    }
-                } else if (next->GetDestVertex() == dest) {
-                    return edge->GetDestVertex();
-                } else {
-                    edge = next;
-                }
-            }
-            return 0;
-        }
-    }
-    edge = dest->GetEdge(this);
-    if (edge) {
-        return edge->GetNext()->GetDestVertex();
-    }
-    return 0;
-}
-
-template <class T>
-HbrVertex<T>*
-HbrVertex<T>::GetQEOPrev(const HbrHalfedge<T>* edge) const {
-    assert(edge->GetOrgVertex() == this);
-    if (edge->GetOpposite()) {
-        return edge->GetOpposite()->GetNext()->GetDestVertex();
-    } else {
-        return GetQEOPrev(edge->GetDestVertex());
-    }
-}
-
-template <class T>
-HbrVertex<T>*
-HbrVertex<T>::GetQELNext(const HbrVertex<T>* dest) const {
-    HbrHalfedge<T>* edge = GetEdge(dest);
-    if (edge) {
-        return edge->GetNext()->GetDestVertex();
-    }
-    edge = dest->GetEdge(this);
-    if (edge) {
-        return edge->GetPrev()->GetOrgVertex();
-    }
-    return 0;
-}
-
-template <class T>
-bool
-HbrVertex<T>::OnBoundary() const {
-    // We really only need to check the first incident edge, since
-    // singular vertices by definition are on the boundary
-    return GetIncidentEdge()->IsBoundary();
-}
-
-template <class T>
-bool
-HbrVertex<T>::IsFVarSmooth(int datum) {
-    return (GetFVarMask(datum) == k_Smooth);
-}
-
-template <class T>
-bool
-HbrVertex<T>::IsFVarAllSmooth() {
-    for (int i = 0; i < GetMesh()->GetFVarCount(); ++i) {
-        if (!IsFVarSmooth(i)) return false;
-    }
-    return true;
-}
-
-template <class T>
-bool
-HbrVertex<T>::IsFVarDart(int datum) {
-    return (GetFVarMask(datum) == k_Dart);
-}
-
-template <class T>
-bool
-HbrVertex<T>::IsFVarCorner(int datum) {
-
-    // If it's a dart, it's a corner
-    if (IsFVarDart(datum)) return true;
-
-    // Run through surrounding edges, looking for two adjacent
-    // facevarying boundary edges
-    HbrHalfedge<T>* start = GetIncidentEdge(), *edge, *nextedge;
-    edge = start;
-    bool lastedgewassharp = false;
-    while (edge) {
-        if (edge->GetFVarSharpness(datum)) {
-            if (lastedgewassharp) {
-                return true;
-            } else {
-                lastedgewassharp = true;
-            }
-        } else {
-            lastedgewassharp = false;
-        }
-        nextedge = GetNextEdge(edge);
-        if (nextedge == start) {
-            return start->GetFVarSharpness(datum) && lastedgewassharp;
-        } else if (!nextedge) {
-            // Special case for the last edge in a cycle.
-            edge = edge->GetPrev();
-            return edge->GetFVarSharpness(datum) && lastedgewassharp;
-        } else {
-            edge = nextedge;
-        }
-    }
-    return false;
-}
-
-template <class T>
-unsigned char
-HbrVertex<T>::GetMask(bool next) {
-
-    if (validmask) {
-        return (unsigned char)(next ? mask1 : mask0);
-    }
-
-    mask0 = mask1 = 0;
-
-    // Mark volatility
-    if (sharpness > k_Smooth && sharpness < k_InfinitelySharp)
-        volatil = 1;
-
-    // If the vertex is tagged as sharp immediately promote its mask
-    // to corner
-    if (IsSharp(false)) {
-        mask0 += k_Corner;
-    }
-    if (IsSharp(true)) {
-        mask1 += k_Corner;
-    }
-
-    // Count the number of surrounding sharp edges
-    HbrHalfedge<T>* start = GetIncidentEdge(), *edge, *nextedge;
-    edge = start;
-    while (edge) {
-        float esharp = edge->GetSharpness();
-
-        if (edge->IsSharp(false)) {
-            if (mask0 < k_Corner) {
-                mask0++;
-            }
-        }
-        if (edge->IsSharp(true)) {
-            if (mask1 < k_Corner) {
-                mask1++;
-            }
-        }
-        // If any incident edge is semisharp, mark the vertex as volatile
-        if (esharp > HbrHalfedge<T>::k_Smooth && esharp < HbrHalfedge<T>::k_InfinitelySharp) {
-            volatil = 1;
-        }
-        nextedge = GetNextEdge(edge);
-        if (nextedge == start) {
-            break;
-        } else if (!nextedge) {
-            // Special case for the last edge in a cycle.
-            edge = edge->GetPrev();
-            esharp = edge->GetSharpness();
-            if (edge->IsSharp(false)) {
-                if (mask0 < k_Corner) {
-                    mask0++;
-                }
-            }
-            if (edge->IsSharp(true)) {
-                if (mask1 < k_Corner) {
-                    mask1++;
-                }
-            }
-            if (esharp > HbrHalfedge<T>::k_Smooth && esharp < HbrHalfedge<T>::k_InfinitelySharp) {
-                volatil = 1;
-            }
-            break;
-        } else {
-            edge = nextedge;
-        }
-    }
-    validmask = 1;
-    return (unsigned char)(next ? mask1 : mask0);
-}
-
-template <class T>
-unsigned char
-HbrVertex<T>::GetFVarMask(int datum) {
-
-    unsigned char mask = 0;
-
-    // If the vertex is tagged as sharp immediately promote its mask
-    // to corner
-    if (IsSharp(false)) {
-        mask += k_Corner;
-    }
-
-    // Count the number of surrounding facevarying boundary edges
-    HbrHalfedge<T>* start = GetIncidentEdge(), *edge, *nextedge;
-    edge = start;
-    while (edge) {
-        if (edge->GetFVarSharpness(datum)) {
-            if (mask < k_Corner) {
-                mask++;
-            } else {
-                // Can't get any sharper, so give up early
-                break;
-            }
-        }
-        nextedge = GetNextEdge(edge);
-        if (nextedge == start) {
-            break;
-        } else if (!nextedge) {
-            // Special case for the last edge in a cycle.
-            edge = edge->GetPrev();
-            if (edge->GetFVarSharpness(datum)) {
-                if (mask < k_Corner) {
-                    mask++;
-                }
-            }
-            break;
-        } else {
-            edge = nextedge;
-        }
-    }
-    return mask;
-}
-
-template <class T>
-float
-HbrVertex<T>::GetFractionalMask() const {
-    float mask = 0;
-    float n = 0;
-
-    if (sharpness > k_Smooth && sharpness < k_Dart) {
-        mask += sharpness; ++n;
-    }
-
-    // Add up the strengths of surrounding fractional sharp edges
-    HbrHalfedge<T>* start = GetIncidentEdge(), *edge, *next;
-    edge = start;
-    while (edge) {
-        float esharp = edge->GetSharpness();
-        if (esharp > HbrHalfedge<T>::k_Smooth && esharp < HbrHalfedge<T>::k_Sharp) {
-            mask += esharp; ++n;
-        }
-        next = GetNextEdge(edge);
-        if (next == start) {
-            break;
-        } else if (!next) {
-            // Special case for the last edge in a cycle.
-            esharp = edge->GetPrev()->GetSharpness();
-            if (esharp > HbrHalfedge<T>::k_Smooth && esharp < HbrHalfedge<T>::k_Sharp) {
-                mask += esharp; ++n;
-            }
-            break;
-        } else {
-            edge = next;
-        }
-    }
-    assert (n > 0.0f && mask < n);
-    return (mask / n);
-}
-
-template <class T>
-template <typename OutputIterator>
-void
-HbrVertex<T>::GetSurroundingEdges(OutputIterator edges) const {
-    HbrHalfedge<T>* start = GetIncidentEdge(), *edge, *next;
-    edge = start;
-    while (edge) {
-        *edges++ = edge;
-        next = GetNextEdge(edge);
-        if (next == start) {
-            break;
-        } else if (!next) {
-            // Special case for the last edge in a cycle.
-            *edges++ = edge->GetPrev();
-            break;
-        } else {
-            edge = next;
-        }
-    }
-}
-
-template <class T>
-void
-HbrVertex<T>::ApplyOperatorSurroundingEdges(HbrHalfedgeOperator<T> &op) const {
-    HbrHalfedge<T>* start = GetIncidentEdge(), *edge, *next;
-    edge = start;
-    while (edge) {
-        op(*edge);
-        next = GetNextEdge(edge);
-        if (next == start) {
-            break;
-        } else if (!next) {
-            op(*edge->GetPrev());
-            break;
-        } else {
-            edge = next;
-        }
-    }
-}
-
-template <class T>
-template <typename OutputIterator>
-void
-HbrVertex<T>::GetSurroundingVertices(OutputIterator vertices) const {
-    HbrMesh<T>* mesh = GetMesh();
-    HbrHalfedge<T>* start = GetIncidentEdge(), *edge, *next;
-    edge = start;
-    while (edge) {
-        *vertices++ = edge->GetDestVertex(mesh);
-        next = GetNextEdge(edge);
-        if (next == start) {
-            break;
-        } else if (!next) {
-            // Special case for the last edge in a cycle: the last
-            // vertex on that cycle is not the destination of an
-            // outgoing halfedge
-            *vertices++ = edge->GetPrev()->GetOrgVertex(mesh);
-            break;
-        } else {
-            edge = next;
-        }
-    }
-}
-
-template <class T>
-void
-HbrVertex<T>::ApplyOperatorSurroundingVertices(HbrVertexOperator<T> &op) const {
-    HbrMesh<T>* mesh = GetMesh();
-    HbrHalfedge<T>* start = GetIncidentEdge(), *edge, *next;
-    edge = start;
-    while (edge) {
-        op(*edge->GetDestVertex(mesh));
-        next = GetNextEdge(edge);
-        if (next == start) return;
-        else if (!next) {
-            op(*edge->GetPrev()->GetOrgVertex(mesh));
-            return;
-        } else {
-            edge = next;
-        }
-    }
-}
-
-template <class T>
-void
-HbrVertex<T>::ApplyOperatorSurroundingFaces(HbrFaceOperator<T> &op) const {
-    HbrHalfedge<T>* start = GetIncidentEdge(), *edge;
-    edge = start;
-    while (edge) {
-        op(*edge->GetLeftFace());
-        edge = GetNextEdge(edge);
-        if (edge == start) break;
-    }
-}
-
-template <class T>
-HbrVertex<T>*
-HbrVertex<T>::Subdivide() {
-    HbrMesh<T>* mesh = GetMesh();
-    if (vchild != -1) return mesh->GetVertex(vchild);
-    HbrVertex<T>* vchildVert = mesh->GetSubdivision()->Subdivide(mesh, this);
-    vchild = vchildVert->GetID();
-    vchildVert->SetParent(this);
-    return vchildVert;
-}
-
-template <class T>
-void
-HbrVertex<T>::Refine() {
-    HbrMesh<T>* mesh = GetMesh();
-    mesh->GetSubdivision()->RefineAtVertex(mesh, this);
-}
-
-template <class T>
-void
-HbrVertex<T>::GuaranteeNeighbors() {
-    if (!neighborsguaranteed) {
-        HbrMesh<T>* mesh = GetMesh();
-        mesh->GetSubdivision()->GuaranteeNeighbors(mesh, this);
-        neighborsguaranteed = 1;
-
-        // At this point we can apply vertex edits because we have all
-        // surrounding faces, and know whether any of them has
-        // necessary edit information (they would have set our
-        // hasvertexedit bit)
-        if (hasvertexedit && !editsapplied) {
-            HbrHalfedge<T>* start = GetIncidentEdge(), *edge;
-            edge = start;
-            while (edge) {
-                HbrFace<T>* face = edge->GetLeftFace();
-                if (HbrHierarchicalEdit<T>** edits = face->GetHierarchicalEdits()) {
-                    while (HbrHierarchicalEdit<T>* edit = *edits) {
-                        if (!edit->IsRelevantToFace(face)) break;
-                        edit->ApplyEditToVertex(face, this);
-                        edits++;
-                    }
-                }
-                edge = GetNextEdge(edge);
-                if (edge == start) break;
-            }
-            editsapplied = 1;
-        }
-    }
-}
-
-template <class T>
-unsigned long
-HbrVertex<T>::GetMemStats() const {
-    return sizeof(HbrVertex<T>);
-}
-
-
-template <class T>
-void
-HbrVertex<T>::splitSingular() {
-    HbrMesh<T>* mesh = GetMesh();
-    HbrHalfedge<T>* e;
-    HbrHalfedge<T>** incidentEdges =
-        (nIncidentEdges > 1) ? incident.edges : &incident.edge;
-
-    // Go through each edge cycle after the first
-    std::vector<HbrHalfedge<T>*> edges;
-    for (int i = 1; i < nIncidentEdges; ++i) {
-
-        // Create duplicate vertex
-        HbrVertex<T>* w = mesh->NewVertex();
-        w->GetData().AddWithWeight(GetData(), 1.0);
-        w->SetSharpness(GetSharpness());
-
-        // Walk all edges in this cycle and reattach them to duplicate
-        // vertex
-        HbrHalfedge<T>* start = incidentEdges[i];
-        e = start;
-        edges.clear();
-        do {
-            edges.push_back(e);
-            e = GetNextEdge(e);
-        } while (e && e != start);
-
-        for (typename std::vector<HbrHalfedge<T>*>::iterator ei = edges.begin(); ei != edges.end(); ++ei) {
-            e = *ei;
-            if (e->GetOpposite()) {
-                HbrHalfedge<T>* next = e->GetOpposite()->GetNext();
-                if (next->GetOrgVertex() == this) {
-                    references--;
-                    next->SetOrgVertex(w);
-                    w->AddIncidentEdge(next);
-                }
-            }
-            // Check again, because sometimes it's been relinked by
-            // previous clause already
-            if (e->GetOrgVertex() == this) {
-                references--;
-                e->SetOrgVertex(w);
-                w->AddIncidentEdge(e);
-            }
-        }
-        w->Finish();
-#ifdef HBR_ADAPTIVE
-        mesh->addSplitVertex(w->GetID(), this->GetID());
-#endif
-    }
-
-    e = incidentEdges[0];
-    if (nIncidentEdges > 1) {
-        delete[] incidentEdges;
-    }
-    nIncidentEdges = 1;
-    incident.edge = e;
-}
-
-template <class T>
-std::ostream&
-operator<<(std::ostream& out, const HbrVertex<T>& vertex) {
-    return out << "vertex " << vertex.GetID();
-}
-
-template <class T>
-class HbrVertexOperator {
-public:
-    virtual void operator() (HbrVertex<T> &vertex) = 0;
-    virtual ~HbrVertexOperator() {}
-};
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRVERTEX_H */
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/vertexEdit.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/vertexEdit.h
deleted file mode 100644
index 162df5fe7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/hbr/vertexEdit.h
+++ /dev/null
@@ -1,241 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_HBRVERTEXEDIT_H
-#define OPENSUBDIV3_HBRVERTEXEDIT_H
-
-#include <algorithm>
-#include "../hbr/hierarchicalEdit.h"
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-template <class T> class HbrVertexEdit;
-
-template <class T>
-std::ostream& operator<<(std::ostream& out, const HbrVertexEdit<T>& path) {
-    out << "vertex path = (" << path.faceid << ' ';
-    for (int i = 0; i < path.nsubfaces; ++i) {
-        out << static_cast<int>(path.subfaces[i]) << ' ';
-    }
-    return out << static_cast<int>(path.vertexid) << "), edit = (" << path.edit[0] << ',' << path.edit[1] << ',' << path.edit[2] << ')';
-}
-
-template <class T>
-class HbrVertexEdit : public HbrHierarchicalEdit<T> {
-
-public:
-
-    HbrVertexEdit(int _faceid, int _nsubfaces, unsigned char *_subfaces, unsigned char _vertexid, int _index, int _width, bool _isP, typename HbrHierarchicalEdit<T>::Operation _op, float *_edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), vertexid(_vertexid), index(_index), width(_width), isP(_isP), op(_op) {
-        edit = new float[width];
-        memcpy(edit, _edit, width * sizeof(float));
-    }
-
-    HbrVertexEdit(int _faceid, int _nsubfaces, int *_subfaces, int _vertexid, int _index, int _width, bool _isP, typename HbrHierarchicalEdit<T>::Operation _op, float *_edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), vertexid(static_cast<unsigned char>(_vertexid)), index(_index), width(_width), isP(_isP), op(_op) {
-        edit = new float[width];
-        memcpy(edit, _edit, width * sizeof(float));
-    }
-
-    virtual ~HbrVertexEdit() {
-        delete[] edit;
-    }
-
-    // Return the vertex id (the last element in the path)
-    unsigned char GetVertexID() const { return vertexid; }
-
-    friend std::ostream& operator<< <T> (std::ostream& out, const HbrVertexEdit<T>& path);
-
-    // Return index of variable this edit applies to
-    int GetIndex() const { return index; }
-
-    // Return width of the variable
-    int GetWidth() const { return width; }
-
-    // Get the numerical value of the edit
-    const float* GetEdit() const { return edit; }
-
-    // Get the type of operation
-    typename HbrHierarchicalEdit<T>::Operation GetOperation() const { return op; }
-
-    virtual void ApplyEditToFace(HbrFace<T>* face) {
-        if (HbrHierarchicalEdit<T>::GetNSubfaces() == face->GetDepth()) {
-            // Tags the vertex as being edited; it'll figure out what to
-            // when GuaranteeNeighbor is called
-            face->GetVertex(vertexid)->SetVertexEdit();
-        }
-        // In any event, mark the face as having a vertex edit (which
-        // may only be applied on subfaces)
-        face->MarkVertexEdits();
-    }
-
-    virtual void ApplyEditToVertex(HbrFace<T>* face, HbrVertex<T>* vertex) {
-        if (HbrHierarchicalEdit<T>::GetNSubfaces() == face->GetDepth() &&
-                face->GetVertex(vertexid) == vertex) {
-            vertex->GetData().ApplyVertexEdit(*const_cast<const HbrVertexEdit<T>*>(this));
-        }
-    }
-
-#ifdef PRMAN
-    virtual void ApplyToBound(struct bbox& bbox, RtMatrix *mx) const {
-        if (isP) {
-            struct xyz p = *(struct xyz*)edit;
-            if (mx)
-                MxTransformByMatrix(&p, &p, *mx, 1);
-            if (op == HbrHierarchicalEdit<T>::Set) {
-                bbox.min.x = std::min(bbox.min.x, p.x);
-                bbox.min.y = std::min(bbox.min.y, p.y);
-                bbox.min.z = std::min(bbox.min.z, p.z);
-                bbox.max.x = std::max(bbox.max.x, p.x);
-                bbox.max.y = std::max(bbox.max.y, p.y);
-                bbox.max.z = std::max(bbox.max.z, p.z);
-            } else if (op == HbrHierarchicalEdit<T>::Add ||
-                       op == HbrHierarchicalEdit<T>::Subtract) {
-                bbox.min.x -= fabsf(p.x);
-                bbox.min.y -= fabsf(p.y);
-                bbox.min.z -= fabsf(p.z);
-                bbox.max.x += fabsf(p.x);
-                bbox.max.y += fabsf(p.y);
-                bbox.max.z += fabsf(p.z);
-            }
-        }
-    }
-#endif
-
-private:
-    const unsigned char vertexid;
-    int index;
-    int width;
-    unsigned isP:1;
-    typename HbrHierarchicalEdit<T>::Operation op;
-    float* edit;
-};
-
-template <class T>
-class HbrMovingVertexEdit : public HbrHierarchicalEdit<T> {
-
-public:
-
-    HbrMovingVertexEdit(int _faceid, int _nsubfaces, unsigned char *_subfaces, unsigned char _vertexid, int _index, int _width, bool _isP, typename HbrHierarchicalEdit<T>::Operation _op, float *_edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), vertexid(_vertexid), index(_index), width(_width), isP(_isP), op(_op) {
-        edit = new float[width * 2];
-        memcpy(edit, _edit, 2 * width * sizeof(float));
-    }
-
-    HbrMovingVertexEdit(int _faceid, int _nsubfaces, int *_subfaces, int _vertexid, int _index, int _width, bool _isP, typename HbrHierarchicalEdit<T>::Operation _op, float *_edit)
-        : HbrHierarchicalEdit<T>(_faceid, _nsubfaces, _subfaces), vertexid(_vertexid), index(_index), width(_width), isP(_isP), op(_op) {
-        edit = new float[width * 2];
-        memcpy(edit, _edit, 2 * width * sizeof(float));
-    }
-
-    virtual ~HbrMovingVertexEdit() {
-        delete[] edit;
-    }
-
-    // Return the vertex id (the last element in the path)
-    unsigned char GetVertexID() const { return vertexid; }
-
-    friend std::ostream& operator<< <T> (std::ostream& out, const HbrVertexEdit<T>& path);
-
-    // Return index of variable this edit applies to
-    int GetIndex() const { return index; }
-
-    // Return width of the variable
-    int GetWidth() const { return width; }
-
-    // Get the numerical value of the edit
-    const float* GetEdit() const { return edit; }
-
-    // Get the type of operation
-    typename HbrHierarchicalEdit<T>::Operation GetOperation() const { return op; }
-
-    virtual void ApplyEditToFace(HbrFace<T>* face) {
-        if (HbrHierarchicalEdit<T>::GetNSubfaces() == face->GetDepth()) {
-            // Tags the vertex as being edited; it'll figure out what to
-            // when GuaranteeNeighbor is called
-            face->GetVertex(vertexid)->SetVertexEdit();
-        }
-        // In any event, mark the face as having a vertex edit (which
-        // may only be applied on subfaces)
-        face->MarkVertexEdits();
-    }
-
-    virtual void ApplyEditToVertex(HbrFace<T>* face, HbrVertex<T>* vertex) {
-        if (HbrHierarchicalEdit<T>::GetNSubfaces() == face->GetDepth() &&
-                face->GetVertex(vertexid) == vertex) {
-            vertex->GetData().ApplyMovingVertexEdit(*const_cast<const HbrMovingVertexEdit<T>*>(this));
-        }
-    }
-
-#ifdef PRMAN
-    virtual void ApplyToBound(struct bbox& bbox, RtMatrix *mx) const {
-        if (isP) {
-            struct xyz p1 = *(struct xyz*)edit;
-            struct xyz p2 = *(struct xyz*)&edit[3];
-            if (mx) {
-                MxTransformByMatrix(&p1, &p1, *mx, 1);
-                MxTransformByMatrix(&p2, &p2, *mx, 1);
-            }
-            if (op == HbrVertexEdit<T>::Set) {
-                bbox.min.x = std::min(std::min(bbox.min.x, p1.x), p2.x);
-                bbox.min.y = std::min(std::min(bbox.min.y, p1.y), p2.y);
-                bbox.min.z = std::min(std::min(bbox.min.z, p1.z), p2.z);
-                bbox.max.x = std::max(std::max(bbox.max.x, p1.x), p2.x);
-                bbox.max.y = std::max(std::max(bbox.max.y, p1.y), p2.y);
-                bbox.max.z = std::max(std::max(bbox.max.z, p1.z), p2.z);
-            } else if (op == HbrVertexEdit<T>::Add ||
-                       op == HbrVertexEdit<T>::Subtract) {
-                float maxx = std::max(fabsf(p1.x), fabsf(p2.x));
-                float maxy = std::max(fabsf(p1.y), fabsf(p2.y));
-                float maxz = std::max(fabsf(p1.z), fabsf(p2.z));
-                bbox.min.x -= maxx;
-                bbox.min.y -= maxy;
-                bbox.min.z -= maxz;
-                bbox.max.x += maxx;
-                bbox.max.y += maxy;
-                bbox.max.z += maxz;
-            }
-        }
-    }
-#endif
-
-private:
-    const unsigned char vertexid;
-    int index;
-    int width;
-    unsigned isP:1;
-    typename HbrHierarchicalEdit<T>::Operation op;
-    float* edit;
-};
-
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_HBRVERTEXEDIT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/Android.mk b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/Android.mk
deleted file mode 100644
index b333616e4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/Android.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-# This file is used by the Android NDK to allow OpenSubdiv libraries
-# to be imported by client modules.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE = OpenSubdivOsdCPU
-LOCAL_SRC_FILES = libs/armeabi-v7a/libosdCPU.so
-LOCAL_EXPORT_C_INCLUDES = $(LOCAL_PATH)/include
-
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE = OpenSubdivOsdGPU
-LOCAL_SRC_FILES = libs/armeabi-v7a/libosdGPU.so
-LOCAL_EXPORT_C_INCLUDES = $(LOCAL_PATH)/include
-
-include $(PREBUILT_SHARED_LIBRARY)
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/CMakeLists.txt
deleted file mode 100644
index 75f64b661..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/CMakeLists.txt
+++ /dev/null
@@ -1,425 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# source & headers
-set(CPU_SOURCE_FILES
-    cpuEvaluator.cpp
-    cpuKernel.cpp
-    cpuPatchTable.cpp
-    cpuVertexBuffer.cpp
-)
-
-set(GPU_SOURCE_FILES )
-
-set(INC_FILES )
-
-set(PRIVATE_HEADER_FILES
-    cpuKernel.h
-)
-
-set(PUBLIC_HEADER_FILES
-    bufferDescriptor.h
-    cpuEvaluator.h
-    cpuPatchTable.h
-    cpuVertexBuffer.h
-    mesh.h
-    nonCopyable.h
-    opengl.h
-    types.h
-)
-
-list(APPEND KERNEL_FILES
-    patchBasisCommonTypes.h
-    patchBasisCommon.h
-    patchBasisCommonEval.h
-)
-
-set(DOXY_HEADER_FILES ${PUBLIC_HEADER_FILES})
-
-#-------------------------------------------------------------------------------
-set(OPENMP_PUBLIC_HEADERS
-    ompEvaluator.h
-    ompKernel.h
-)
-
-if(OPENMP_FOUND )
-    list(APPEND CPU_SOURCE_FILES
-        ompEvaluator.cpp
-        ompKernel.cpp
-    )
-
-    list(APPEND PUBLIC_HEADER_FILES ${OPENMP_PUBLIC_HEADERS})
-
-    if (CMAKE_COMPILER_IS_GNUCXX)
-        list(APPEND PLATFORM_CPU_LIBRARIES gomp)
-    endif()
-endif()
-
-list(APPEND DOXY_HEADER_FILES ${OPENMP_PUBLIC_HEADERS})
-
-#-------------------------------------------------------------------------------
-set(TBB_PUBLIC_HEADERS
-    tbbEvaluator.h
-    tbbKernel.h
-)
-
-if( TBB_FOUND )
-    include_directories("${TBB_INCLUDE_DIR}")
-
-    list(APPEND CPU_SOURCE_FILES
-        tbbEvaluator.cpp
-        tbbKernel.cpp
-    )
-
-    list(APPEND PUBLIC_HEADER_FILES ${TBB_PUBLIC_HEADERS})
-
-    if (CMAKE_COMPILER_IS_GNUCXX)
-        list(APPEND PLATFORM_CPU_LIBRARIES gomp)
-    endif()
-
-    list(APPEND PLATFORM_CPU_LIBRARIES
-        ${TBB_LIBRARIES}
-    )
-endif()
-
-list(APPEND DOXY_HEADER_FILES ${TBB_PUBLIC_HEADERS})
-
-#-------------------------------------------------------------------------------
-# GL code & dependencies
-set(GL_PUBLIC_HEADERS
-    cpuGLVertexBuffer.h
-    glLegacyGregoryPatchTable.h
-    glPatchTable.h
-    glVertexBuffer.h
-    glMesh.h
-    glslPatchShaderSource.h
-)
-
-if( (NOT NO_OPENGL) AND (OPENGL_FOUND OR OPENGLES_FOUND) )
-    list(APPEND GPU_SOURCE_FILES
-        cpuGLVertexBuffer.cpp
-        glLegacyGregoryPatchTable.cpp
-        glPatchTable.cpp
-        glVertexBuffer.cpp
-        glslPatchShaderSource.cpp
-    )
-    list(APPEND PUBLIC_HEADER_FILES ${GL_PUBLIC_HEADERS})
-    if ( OPENGL_FOUND )
-        list(APPEND KERNEL_FILES
-            glslPatchCommon.glsl
-            glslPatchCommonTess.glsl
-            glslPatchBoxSplineTriangle.glsl
-            glslPatchBSpline.glsl
-            glslPatchGregory.glsl
-            glslPatchGregoryBasis.glsl
-            glslPatchGregoryTriangle.glsl
-            glslPatchLegacy.glsl
-        )
-    endif()
-endif()
-
-list(APPEND DOXY_HEADER_FILES ${GL_PUBLIC_HEADERS})
-
-#-------------------------------------------------------------------------------
-# OpenGL 4.2 dependencies
-# note : (GLSL transform feedback kernels require GL 4.2)
-set(GL_4_2_PUBLIC_HEADERS
-    glXFBEvaluator.h
-)
-
-if( OPENGL_4_2_FOUND )
-    list(APPEND GPU_SOURCE_FILES
-        glXFBEvaluator.cpp
-    )
-    list(APPEND PUBLIC_HEADER_FILES ${GL_4_2_PUBLIC_HEADERS})
-    list(APPEND KERNEL_FILES
-        glslXFBKernel.glsl
-    )
-    list(APPEND PLATFORM_GPU_LIBRARIES
-        ${OPENGL_LOADER_LIBRARIES}
-    )
-endif()
-
-list(APPEND DOXY_HEADER_FILES ${GL_4_2_PUBLIC_HEADERS})
-
-
-#-------------------------------------------------------------------------------
-# OpenGL 4.3 dependencies
-# note : (GLSL compute shader kernels require GL 4.3)
-set(GL_4_3_PUBLIC_HEADERS
-    glComputeEvaluator.h
-)
-
-if( OPENGL_4_3_FOUND )
-    list(APPEND GPU_SOURCE_FILES
-        glComputeEvaluator.cpp
-    )
-    list(APPEND PUBLIC_HEADER_FILES ${GL_4_3_PUBLIC_HEADERS})
-    list(APPEND KERNEL_FILES
-        glslComputeKernel.glsl
-    )
-    list(APPEND PLATFORM_GPU_LIBRARIES
-        ${OPENGL_LOADER_LIBRARIES}
-    )
-endif()
-
-list(APPEND DOXY_HEADER_FILES ${GL_4_3_PUBLIC_HEADERS})
-
-#-------------------------------------------------------------------------------
-# DX11 code & dependencies
-set(DXSDK_PUBLIC_HEADERS
-    cpuD3D11VertexBuffer.h
-    d3d11ComputeEvaluator.h
-    d3d11LegacyGregoryPatchTable.h
-    d3d11PatchTable.h
-    d3d11VertexBuffer.h
-    d3d11Mesh.h
-    hlslPatchShaderSource.h
-)
-if( DXSDK_FOUND )
-    list(APPEND GPU_SOURCE_FILES
-        cpuD3D11VertexBuffer.cpp
-        d3d11ComputeEvaluator.cpp
-        d3d11LegacyGregoryPatchTable.cpp
-        d3d11PatchTable.cpp
-        d3d11VertexBuffer.cpp
-        hlslPatchShaderSource.cpp
-    )
-    list(APPEND PUBLIC_HEADER_FILES ${DXSDK_PUBLIC_HEADERS})
-    list(APPEND KERNEL_FILES
-        hlslComputeKernel.hlsl
-        hlslPatchCommon.hlsl
-        hlslPatchCommonTess.hlsl
-        hlslPatchBoxSplineTriangle.hlsl
-        hlslPatchBSpline.hlsl
-        hlslPatchGregory.hlsl
-        hlslPatchGregoryBasis.hlsl
-        hlslPatchGregoryTriangle.hlsl
-        hlslPatchLegacy.hlsl
-    )
-    list(APPEND PLATFORM_GPU_LIBRARIES
-        ${DXSDK_LIBRARIES}
-    )
-endif()
-
-list(APPEND DOXY_HEADER_FILES ${DXSDK_PUBLIC_HEADERS})
-
-#-------------------------------------------------------------------------------
-# Metal code & dependencies
-set(METAL_PUBLIC_HEADERS
-    mtlVertexBuffer.h
-    mtlComputeEvaluator.h
-    mtlLegacyGregoryPatchTable.h
-    mtlPatchTable.h
-    mtlMesh.h
-    mtlPatchShaderSource.h
-    mtlCommon.h
-)
-
-
-if( METAL_FOUND )
-    set(METAL_SOURCE_FILES
-        mtlVertexBuffer.mm
-        mtlComputeEvaluator.mm
-        mtlLegacyGregoryPatchTable.mm
-        mtlPatchTable.mm
-        mtlVertexBuffer.mm
-        mtlPatchShaderSource.mm
-    )
-
-    set_source_files_properties(
-        ${METAL_SOURCE_FILES}
-        PROPERTIES
-        COMPILE_FLAGS
-        "-fobjc-arc")
-
-    list(APPEND GPU_SOURCE_FILES ${METAL_SOURCE_FILES})
-
-    
-
-    list(APPEND PUBLIC_HEADER_FILES ${METAL_PUBLIC_HEADERS})
-    list(APPEND KERNEL_FILES
-       mtlComputeKernel.metal
-       mtlPatchCommon.metal
-       mtlPatchCommonTess.metal
-       mtlPatchBoxSplineTriangle.metal
-       mtlPatchBSpline.metal
-       mtlPatchGregory.metal
-       mtlPatchGregoryBasis.metal
-       mtlPatchGregoryTriangle.metal
-       mtlPatchLegacy.metal
-    )
-    list(APPEND PLATFORM_GPU_LIBRARIES
-        ${METAL_LIBRARIES}
-    )
-endif()
-
-list(APPEND DOXY_HEADER_FILES ${METAL_PUBLIC_HEADERS})
-
-#-------------------------------------------------------------------------------
-# OpenCL code & dependencies
-set(OPENCL_PUBLIC_HEADERS
-    clEvaluator.h
-    clPatchTable.h
-    clVertexBuffer.h
-    opencl.h
-)
-
-if ( OPENCL_FOUND )
-    list(APPEND GPU_SOURCE_FILES
-        clEvaluator.cpp
-        clPatchTable.cpp
-        clVertexBuffer.cpp
-    )
-    list(APPEND PUBLIC_HEADER_FILES ${OPENCL_PUBLIC_HEADERS})
-    list(APPEND KERNEL_FILES
-        clKernel.cl
-    )
-    list(APPEND PLATFORM_GPU_LIBRARIES
-        ${OPENCL_LIBRARIES}
-    )
-    include_directories( "${OPENCL_INCLUDE_DIRS}" )
-    if ( OPENGL_FOUND )
-        list(APPEND GPU_SOURCE_FILES clGLVertexBuffer.cpp)
-        list(APPEND PUBLIC_HEADER_FILES clGLVertexBuffer.h)
-    endif()
-
-    if ( OPENCL_D3D11_INTEROP_FOUND )
-        list(APPEND GPU_SOURCE_FILES
-             clD3D11VertexBuffer.cpp
-        )
-        list(APPEND PUBLIC_HEADER_FILES
-             clD3D11VertexBuffer.h
-        )
-    endif()
-endif()
-
-list(APPEND DOXY_HEADER_FILES ${OPENCL_PUBLIC_HEADERS})
-
-#-------------------------------------------------------------------------------
-# CUDA code & dependencies
-set(CUDA_PUBLIC_HEADERS
-    cudaEvaluator.h
-    cudaPatchTable.h
-    cudaVertexBuffer.h
-)
-
-if( CUDA_FOUND )
-    list(APPEND GPU_SOURCE_FILES
-        cudaEvaluator.cpp
-        cudaPatchTable.cpp
-        cudaVertexBuffer.cpp
-    )
-    list(APPEND PUBLIC_HEADER_FILES ${CUDA_PUBLIC_HEADERS})
-    list(APPEND CUDA_KERNEL_FILES
-        osd/cudaKernel.cu
-    )
-    set (CUDA_KERNEL_FILES ${CUDA_KERNEL_FILES} PARENT_SCOPE)
-    if ( OPENGL_FOUND )
-        list(APPEND GPU_SOURCE_FILES
-            cudaGLVertexBuffer.cpp
-        )
-        list(APPEND PUBLIC_HEADER_FILES
-            cudaGLVertexBuffer.h
-        )
-    endif()
-
-    if( DXSDK_FOUND )
-        list(APPEND GPU_SOURCE_FILES
-            cudaD3D11VertexBuffer.cpp
-        )
-        list(APPEND PUBLIC_HEADER_FILES
-            cudaD3D11VertexBuffer.h
-        )
-    endif()
-endif()
-
-list(APPEND DOXY_HEADER_FILES ${CUDA_PUBLIC_HEADERS})
-
-#-------------------------------------------------------------------------------
-
-osd_stringify("${KERNEL_FILES}" INC_FILES)
-
-include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-
-#-------------------------------------------------------------------------------
-source_group("Kernels" FILES ${KERNEL_FILES})
-
-source_group("Inc" FILES ${INC_FILES})
-
-# Compile objs first for both the CPU and GPU libs -----
-add_library(osd_cpu_obj
-    OBJECT
-        ${CPU_SOURCE_FILES}
-        ${PRIVATE_HEADER_FILES}
-        ${PUBLIC_HEADER_FILES}
-)
-
-set_target_properties(osd_cpu_obj
-    PROPERTIES
-        FOLDER "opensubdiv"
-)
-
-if( GPU_SOURCE_FILES ) 
-    add_library(osd_gpu_obj
-        OBJECT
-            ${GPU_SOURCE_FILES}
-            ${PRIVATE_HEADER_FILES}
-            ${PUBLIC_HEADER_FILES}
-            ${INC_FILES}
-    )
-    set_target_properties(osd_gpu_obj
-        PROPERTIES
-            FOLDER "opensubdiv"
-    )
-endif()
-
-osd_add_doxy_headers( "${DOXY_HEADER_FILES}" )
-
-install(
-    FILES
-        ${PUBLIC_HEADER_FILES}
-    DESTINATION
-        "${CMAKE_INCDIR_BASE}/osd"
-    PERMISSIONS
-        OWNER_READ
-        GROUP_READ
-        WORLD_READ )
-
-if (ANDROID)
-    install(
-        FILES
-            Android.mk
-        DESTINATION
-            "${LIBRARY_OUTPUT_PATH_ROOT}"
-        PERMISSIONS
-            OWNER_READ
-            GROUP_READ
-            WORLD_READ )
-endif()
-
-#-------------------------------------------------------------------------------
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/bufferDescriptor.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/bufferDescriptor.h
deleted file mode 100644
index 67cb93b1d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/bufferDescriptor.h
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_BUFFER_DESCRIPTOR_H
-#define OPENSUBDIV3_OSD_BUFFER_DESCRIPTOR_H
-
-#include "../version.h"
-#include <string.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-/// \brief BufferDescriptor is a struct which describes buffer elements in
-///        interleaved data buffers. Almost all Osd Evaluator APIs take
-///        BufferDescriptors along with device-specific buffer objects.
-///
-///        The offset of BufferDescriptor can also be used to express a
-///        batching offset if the data buffer is combined across multiple
-///        objects together.
-///
-///        * Note that each element has the same data type (float)
-///
-
-//  example:
-//       n
-//  -----+----------------------------------------+-------------------------
-//       |               vertex  0                |
-//  -----+----------------------------------------+-------------------------
-//       |  X  Y  Z  R  G  B  A Xu Yu Zu Xv Yv Zv |
-//  -----+----------------------------------------+-------------------------
-//       <------------- stride = 13 -------------->
-//
-//     - XYZ      (offset = n+0,  length = 3, stride = 13)
-//     - RGBA     (offset = n+3,  length = 4, stride = 13)
-//     - uTangent (offset = n+7,  length = 3, stride = 13)
-//     - vTangent (offset = n+10, length = 3, stride = 13)
-//
-struct BufferDescriptor {
-
-    /// Default Constructor
-    BufferDescriptor() : offset(0), length(0), stride(0) { }
-
-    /// Constructor
-    BufferDescriptor(int o, int l, int s) : offset(o), length(l), stride(s) { }
-
-    /// Returns the relative offset within a stride
-    int GetLocalOffset() const {
-        return stride > 0 ? offset % stride : 0;
-    }
-
-    /// True if the descriptor values are internally consistent
-    bool IsValid() const {
-        return ((length > 0) &&
-                (length <= stride - GetLocalOffset()));
-    }
-
-    /// Resets the descriptor to default
-    void Reset() {
-        offset = length = stride = 0;
-    }
-
-    /// True if the descriptors are identical
-    bool operator == (BufferDescriptor const &other) const {
-        return (offset == other.offset &&
-                length == other.length &&
-                stride == other.stride);
-    }
-
-    /// True if the descriptors are not identical
-    bool operator != (BufferDescriptor const &other) const {
-        return !(this->operator==(other));
-    }
-
-    /// offset to desired element data
-    int offset;
-    /// number or length of the data
-    int length;
-    /// stride to the next element
-    int stride;
-};
-
-} // end namespace Osd
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_BUFFER_DESCRIPTOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clD3D11VertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clD3D11VertexBuffer.cpp
deleted file mode 100644
index 5a0c2f636..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clD3D11VertexBuffer.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/clD3D11VertexBuffer.h"
-
-#include <cassert>
-#include <D3D11.h>
-#if defined(OPENSUBDIV_HAS_CL_D3D11_H)
-#include <CL/cl_d3d11.h>
-#elif defined(OPENSUBDIV_HAS_CL_D3D11_EXT_H)
-#include <CL/cl_d3d11_ext.h>
-#else
-#error "d3d11.h or d3d11_ext.h must be found in cmake"
-#endif
-
-#include "../far/error.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-#if defined(OPENSUBDIV_HAS_CL_D3D11_H)
-typedef clCreateFromD3D11BufferKHR_fn clCreateFromD3D11Buffer_fn;
-typedef clEnqueueAcquireD3D11ObjectsKHR_fn clEnqueueAcquireD3D11Objects_fn;
-typedef clEnqueueReleaseD3D11ObjectsKHR_fn clEnqueueReleaseD3D11Objects_fn;
-#else
-typedef clCreateFromD3D11BufferNV_fn clCreateFromD3D11Buffer_fn;
-typedef clEnqueueAcquireD3D11ObjectsNV_fn clEnqueueAcquireD3D11Objects_fn;
-typedef clEnqueueReleaseD3D11ObjectsNV_fn clEnqueueReleaseD3D11Objects_fn;
-#endif
-
-static clCreateFromD3D11Buffer_fn clCreateFromD3D11Buffer = NULL;
-static clEnqueueAcquireD3D11Objects_fn clEnqueueAcquireD3D11Objects = NULL;
-static clEnqueueReleaseD3D11Objects_fn clEnqueueReleaseD3D11Objects = NULL;
-
-// XXX: clGetExtensionFunctionAddress is marked as deprecated and
-//      clGetExtensionFunctionAddressForPlatform should be used,
-//      however it requires OpenCL 1.2.
-//      until we bump the requirement to 1.2, mute the deprecated warning.
-#if defined(_MSC_VER)
-#pragma warning(disable: 4996)
-#endif
-
-
-static void resolveInteropFunctions() {
-
-    if (! clCreateFromD3D11Buffer) {
-        clCreateFromD3D11Buffer =
-            (clCreateFromD3D11Buffer_fn)
-            clGetExtensionFunctionAddress("clCreateFromD3D11BufferKHR");
-    }
-    if (! clCreateFromD3D11Buffer) {
-        clCreateFromD3D11Buffer =
-            (clCreateFromD3D11Buffer_fn)
-            clGetExtensionFunctionAddress("clCreateFromD3D11BufferNV");
-    }
-
-    if (! clEnqueueAcquireD3D11Objects) {
-        clEnqueueAcquireD3D11Objects = (clEnqueueAcquireD3D11Objects_fn)
-            clGetExtensionFunctionAddress("clEnqueueAcquireD3D11ObjectsKHR");
-    }
-    if (! clEnqueueAcquireD3D11Objects) {
-        clEnqueueAcquireD3D11Objects = (clEnqueueAcquireD3D11Objects_fn)
-            clGetExtensionFunctionAddress("clEnqueueAcquireD3D11ObjectsNV");
-    }
-
-    if (! clEnqueueReleaseD3D11Objects) {
-        clEnqueueReleaseD3D11Objects = (clEnqueueReleaseD3D11Objects_fn)
-            clGetExtensionFunctionAddress("clEnqueueReleaseD3D11ObjectsKHR");
-    }
-    if (! clEnqueueReleaseD3D11Objects) {
-        clEnqueueReleaseD3D11Objects = (clEnqueueReleaseD3D11Objects_fn)
-            clGetExtensionFunctionAddress("clEnqueueReleaseD3D11ObjectsNV");
-    }
-}
-
-CLD3D11VertexBuffer::CLD3D11VertexBuffer(int numElements, int numVertices)
-    : _numElements(numElements), _numVertices(numVertices),
-      _d3d11Buffer(NULL), _clMemory(NULL), _clQueue(NULL), _clMapped(false) {
-}
-
-CLD3D11VertexBuffer::~CLD3D11VertexBuffer() {
-
-    unmap();
-    clReleaseMemObject(_clMemory);
-    _d3d11Buffer->Release();
-}
-
-CLD3D11VertexBuffer *
-CLD3D11VertexBuffer::Create(int numElements, int numVertices,
-                            cl_context clContext,
-                            ID3D11DeviceContext *deviceContext) {
-    CLD3D11VertexBuffer *instance =
-        new CLD3D11VertexBuffer(numElements, numVertices);
-
-    ID3D11Device *device;
-    deviceContext->GetDevice(&device);
-
-    if (instance->allocate(clContext, device)) return instance;
-    delete instance;
-    return NULL;
-}
-
-void
-CLD3D11VertexBuffer::UpdateData(const float *src, int startVertex,
-                                int numVertices, cl_command_queue queue) {
-
-    size_t size = numVertices * _numElements * sizeof(float);
-    size_t offset = startVertex * _numElements * sizeof(float);
-
-    map(queue);
-    clEnqueueWriteBuffer(queue, _clMemory, true, offset, size, src, 0, NULL, NULL);
-}
-
-int
-CLD3D11VertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-CLD3D11VertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-cl_mem
-CLD3D11VertexBuffer::BindCLBuffer(cl_command_queue queue) {
-
-    map(queue);
-    return _clMemory;
-}
-
-ID3D11Buffer *
-CLD3D11VertexBuffer::BindD3D11Buffer(ID3D11DeviceContext *deviceContext) {
-
-    unmap();
-    return _d3d11Buffer;
-}
-
-bool
-CLD3D11VertexBuffer::allocate(cl_context clContext, ID3D11Device *device) {
-
-    D3D11_BUFFER_DESC hBufferDesc;
-    hBufferDesc.ByteWidth           = _numElements * _numVertices * sizeof(float);
-    hBufferDesc.Usage               = D3D11_USAGE_DYNAMIC;
-    hBufferDesc.BindFlags           = D3D11_BIND_VERTEX_BUFFER | D3D11_BIND_SHADER_RESOURCE;
-    hBufferDesc.CPUAccessFlags      = D3D11_CPU_ACCESS_WRITE;
-    hBufferDesc.MiscFlags           = 0;
-    hBufferDesc.StructureByteStride = sizeof(float);
-
-    HRESULT hr;
-    hr = device->CreateBuffer(&hBufferDesc, NULL, &_d3d11Buffer);
-    if (FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "Fail in CreateBuffer\n");
-        return false;
-    }
-
-    if (! clCreateFromD3D11Buffer) {
-        resolveInteropFunctions();
-        if (! clCreateFromD3D11Buffer) {
-            return false;
-        }
-    }
-
-    // register d3d11buffer as cl memory
-    cl_int err;
-
-    _clMemory = clCreateFromD3D11Buffer(clContext, CL_MEM_READ_WRITE, _d3d11Buffer, &err);
-
-    if (err != CL_SUCCESS) return false;
-    return true;
-}
-
-void
-CLD3D11VertexBuffer::map(cl_command_queue queue) {
-
-    if (_clMapped) return;
-    _clQueue = queue;
-
-    if (! clEnqueueAcquireD3D11Objects) {
-        resolveInteropFunctions();
-        if (! clEnqueueAcquireD3D11Objects) {
-            return;
-        }
-    }
-
-    clEnqueueAcquireD3D11Objects(queue, 1, &_clMemory, 0, 0, 0);
-    _clMapped = true;
-}
-
-void
-CLD3D11VertexBuffer::unmap() {
-
-    if (! _clMapped) return;
-    if (! clEnqueueReleaseD3D11Objects) {
-        resolveInteropFunctions();
-        if (! clEnqueueReleaseD3D11Objects) {
-            return;
-        }
-    }
-    clEnqueueReleaseD3D11Objects(_clQueue, 1, &_clMemory, 0, 0, 0);
-    _clMapped = false;
-}
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clD3D11VertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clD3D11VertexBuffer.h
deleted file mode 100644
index 3ee2c459f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clD3D11VertexBuffer.h
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CL_D3D11_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_CL_D3D11_VERTEX_BUFFER_H
-
-#include "../version.h"
-#include "../osd/opencl.h"
-
-struct ID3D11VertexShader;
-struct ID3D11HullShader;
-struct ID3D11DomainShader;
-struct ID3D11GeometryShader;
-struct ID3D11PixelShader;
-
-struct ID3D11Buffer;
-struct ID3D11ShaderResourceView;
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-///
-/// \brief Concrete vertex buffer class for OpenCL subdivision and DirectX
-/// drawing.
-///
-/// D3D11VertexBuffer implements CLVertexBufferInterface and
-/// D3D11VertexBufferInterface.
-///
-/// An instance of this buffer class can be passed to D3D11ComputeEvaluator.
-///
-class CLD3D11VertexBuffer {
-public:
-    /// Creator. Returns NULL if error.
-    static CLD3D11VertexBuffer * Create(int numElements, int numVertices,
-                                        cl_context clContext,
-                                        ID3D11DeviceContext *deviceContext);
-
-    /// template version for custom context (OpenCL) used by OsdMesh
-    template<typename DEVICE_CONTEXT>
-    static CLD3D11VertexBuffer * Create(int numElements, int numVertices,
-                                        DEVICE_CONTEXT context) {
-        return Create(numElements, numVertices,
-                      context->GetContext(),
-                      context->GetDeviceContext());
-    }
-
-
-    /// Destructor.
-    virtual ~CLD3D11VertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide coarse
-    /// vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    cl_command_queue clQueue);
-
-    /// template version for custom context (OpenCL) used by OsdMesh
-    template<typename DEVICE_CONTEXT>
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    DEVICE_CONTEXT context) {
-        UpdateData(src, startVertex, numVertices, context->GetCommandQueue());
-    }
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns the CL memory object.
-    cl_mem BindCLBuffer(cl_command_queue queue);
-
-    /// Returns the D3D11 buffer object.
-    ID3D11Buffer *BindD3D11Buffer(ID3D11DeviceContext *deviceContext);
-
-    /// Returns the D3D11 buffer object (for Osd::Mesh interface)
-    ID3D11Buffer *BindVBO(ID3D11DeviceContext *deviceContext) {
-        return BindD3D11Buffer(deviceContext);
-    }
-
-    /// template version for custom context (OpenCL) used by OsdMesh
-    template<typename DEVICE_CONTEXT>
-    ID3D11Buffer *BindVBO(DEVICE_CONTEXT context) {
-        return BindD3D11Buffer(context->GetDeviceContext());
-    }
-
-protected:
-    /// Constructor.
-    CLD3D11VertexBuffer(int numElements, int numVertices);
-
-    /// Allocates this buffer and registers as a cl resource.
-    /// Returns true if success.
-    bool allocate(cl_context clContext, ID3D11Device *device);
-
-    /// Acquire a resource from DirectX.
-    void map(cl_command_queue queue);
-
-    /// Releases a resource to DirectX.
-    void unmap();
-
-private:
-    int _numElements;
-    int _numVertices;
-    ID3D11Buffer *_d3d11Buffer;
-    cl_command_queue _clQueue;
-    cl_mem _clMemory;
-
-    bool _clMapped;
-
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CL_D3D11_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clEvaluator.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clEvaluator.cpp
deleted file mode 100644
index c2f8d7109..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clEvaluator.cpp
+++ /dev/null
@@ -1,541 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/clEvaluator.h"
-
-#include <sstream>
-#include <string>
-#include <vector>
-#include <cstdio>
-
-#include "../osd/opencl.h"
-#include "../far/error.h"
-#include "../far/stencilTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-static const char *clSource =
-#include "clKernel.gen.h"
-;
-static const char *patchBasisTypesSource =
-#include "patchBasisCommonTypes.gen.h"
-;
-static const char *patchBasisSource =
-#include "patchBasisCommon.gen.h"
-;
-static const char *patchBasisEvalSource =
-#include "patchBasisCommonEval.gen.h"
-;
-
-// ----------------------------------------------------------------------------
-
-template <class T> cl_mem
-createCLBuffer(std::vector<T> const & src, cl_context clContext) {
-    if (src.empty()) {
-        return NULL;
-    }
-
-    cl_int errNum = 0;
-    cl_mem devicePtr = clCreateBuffer(clContext,
-                                      CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
-                                      src.size()*sizeof(T),
-                                      (void*)(&src.at(0)),
-                                      &errNum);
-
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "clCreateBuffer: %d", errNum);
-    }
-
-    return devicePtr;
-}
-
-// ----------------------------------------------------------------------------
-
-CLStencilTable::CLStencilTable(Far::StencilTable const *stencilTable,
-                               cl_context clContext) {
-    _numStencils = stencilTable->GetNumStencils();
-
-    if (_numStencils > 0) {
-        _sizes   = createCLBuffer(stencilTable->GetSizes(), clContext);
-        _offsets = createCLBuffer(stencilTable->GetOffsets(), clContext);
-        _indices = createCLBuffer(stencilTable->GetControlIndices(),
-                                  clContext);
-        _weights = createCLBuffer(stencilTable->GetWeights(), clContext);
-        _duWeights = _dvWeights = NULL;
-        _duuWeights = _duvWeights = _dvvWeights = NULL;
-    } else {
-        _sizes = _offsets = _indices = _weights = NULL;
-        _duWeights = _dvWeights = NULL;
-        _duuWeights = _duvWeights = _dvvWeights = NULL;
-    }
-}
-
-CLStencilTable::CLStencilTable(Far::LimitStencilTable const *limitStencilTable,
-                               cl_context clContext) {
-    _numStencils = limitStencilTable->GetNumStencils();
-
-    if (_numStencils > 0) {
-        _sizes   = createCLBuffer(limitStencilTable->GetSizes(), clContext);
-        _offsets = createCLBuffer(limitStencilTable->GetOffsets(), clContext);
-        _indices = createCLBuffer(limitStencilTable->GetControlIndices(),
-                                  clContext);
-        _weights = createCLBuffer(limitStencilTable->GetWeights(), clContext);
-        _duWeights = createCLBuffer(
-            limitStencilTable->GetDuWeights(), clContext);
-        _dvWeights = createCLBuffer(
-            limitStencilTable->GetDvWeights(), clContext);
-        _duuWeights = createCLBuffer(
-            limitStencilTable->GetDuuWeights(), clContext);
-        _duvWeights = createCLBuffer(
-            limitStencilTable->GetDuvWeights(), clContext);
-        _dvvWeights = createCLBuffer(
-            limitStencilTable->GetDvvWeights(), clContext);
-    } else {
-        _sizes = _offsets = _indices = _weights = NULL;
-        _duWeights = _dvWeights = NULL;
-        _duuWeights = _duvWeights = _dvvWeights = NULL;
-    }
-}
-
-CLStencilTable::~CLStencilTable() {
-    if (_sizes)   clReleaseMemObject(_sizes);
-    if (_offsets) clReleaseMemObject(_offsets);
-    if (_indices) clReleaseMemObject(_indices);
-    if (_weights) clReleaseMemObject(_weights);
-    if (_duWeights) clReleaseMemObject(_duWeights);
-    if (_dvWeights) clReleaseMemObject(_dvWeights);
-    if (_duuWeights) clReleaseMemObject(_duuWeights);
-    if (_duvWeights) clReleaseMemObject(_duvWeights);
-    if (_dvvWeights) clReleaseMemObject(_dvvWeights);
-}
-
-// ---------------------------------------------------------------------------
-
-CLEvaluator::CLEvaluator(cl_context context, cl_command_queue queue)
-    : _clContext(context), _clCommandQueue(queue),
-      _program(NULL), _stencilKernel(NULL), _stencilDerivKernel(NULL),
-      _patchKernel(NULL) {
-}
-
-CLEvaluator::~CLEvaluator() {
-    if (_stencilKernel) clReleaseKernel(_stencilKernel);
-    if (_stencilDerivKernel) clReleaseKernel(_stencilDerivKernel);
-    if (_patchKernel) clReleaseKernel(_patchKernel);
-    if (_program) clReleaseProgram(_program);
-}
-
-bool
-CLEvaluator::Compile(BufferDescriptor const &srcDesc,
-                     BufferDescriptor const &dstDesc,
-                     BufferDescriptor const & /*duDesc*/,
-                     BufferDescriptor const & /*dvDesc*/,
-                     BufferDescriptor const & /*duuDesc*/,
-                     BufferDescriptor const & /*duvDesc*/,
-                     BufferDescriptor const & /*dvvDesc*/) {
-    if (srcDesc.length > dstDesc.length) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "srcDesc length must be less than or equal to "
-                   "dstDesc length.\n");
-        return false;
-    }
-
-    cl_int errNum;
-
-    std::ostringstream defines;
-    defines << "#define LENGTH "     << srcDesc.length << "\n"
-            << "#define SRC_STRIDE " << srcDesc.stride << "\n"
-            << "#define DST_STRIDE " << dstDesc.stride << "\n"
-            << "#define OSD_PATCH_BASIS_OPENCL\n";
-    std::string defineStr = defines.str();
-
-    const char *sources[] = { defineStr.c_str(),
-                              patchBasisTypesSource,
-                              patchBasisSource,
-                              patchBasisEvalSource,
-                              clSource };
-    _program = clCreateProgramWithSource(_clContext, 5, sources, 0, &errNum);
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "clCreateProgramWithSource (%d)", errNum);
-    }
-
-    errNum = clBuildProgram(_program, 0, NULL, NULL, NULL, NULL);
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "clBuildProgram (%d) \n", errNum);
-
-        cl_int numDevices = 0;
-        clGetContextInfo(
-            _clContext, CL_CONTEXT_NUM_DEVICES,
-            sizeof(cl_uint), &numDevices, NULL);
-
-        cl_device_id *devices = new cl_device_id[numDevices];
-        clGetContextInfo(_clContext, CL_CONTEXT_DEVICES,
-                         sizeof(cl_device_id)*numDevices, devices, NULL);
-
-        for (int i = 0; i < numDevices; ++i) {
-            char cBuildLog[10240];
-            clGetProgramBuildInfo(
-                _program, devices[i],
-                CL_PROGRAM_BUILD_LOG, sizeof(cBuildLog), cBuildLog, NULL);
-            Far::Error(Far::FAR_RUNTIME_ERROR, cBuildLog);
-        }
-        delete[] devices;
-
-        return false;
-    }
-
-    _stencilKernel = clCreateKernel(_program, "computeStencils", &errNum);
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "buildKernel (%d)\n", errNum);
-        return false;
-    }
-
-    _stencilDerivKernel = clCreateKernel(_program,
-                                         "computeStencilsDerivatives", &errNum);
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "buildKernel (%d)\n", errNum);
-        return false;
-    }
-
-    _patchKernel = clCreateKernel(_program, "computePatches", &errNum);
-
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "buildKernel (%d)\n", errNum);
-        return false;
-    }
-    return true;
-}
-
-bool
-CLEvaluator::EvalStencils(cl_mem src, BufferDescriptor const &srcDesc,
-                          cl_mem dst, BufferDescriptor const &dstDesc,
-                          cl_mem sizes,
-                          cl_mem offsets,
-                          cl_mem indices,
-                          cl_mem weights,
-                          int start, int end,
-                          unsigned int numStartEvents,
-                          const cl_event* startEvents,
-                          cl_event* endEvent) const {
-    if (end <= start) return true;
-
-    size_t globalWorkSize = (size_t)(end - start);
-
-    clSetKernelArg(_stencilKernel, 0, sizeof(cl_mem), &src);
-    clSetKernelArg(_stencilKernel, 1, sizeof(int), &srcDesc.offset);
-    clSetKernelArg(_stencilKernel, 2, sizeof(cl_mem), &dst);
-    clSetKernelArg(_stencilKernel, 3, sizeof(int), &dstDesc.offset);
-    clSetKernelArg(_stencilKernel, 4, sizeof(cl_mem), &sizes);
-    clSetKernelArg(_stencilKernel, 5, sizeof(cl_mem), &offsets);
-    clSetKernelArg(_stencilKernel, 6, sizeof(cl_mem), &indices);
-    clSetKernelArg(_stencilKernel, 7, sizeof(cl_mem), &weights);
-    clSetKernelArg(_stencilKernel, 8, sizeof(int), &start);
-    clSetKernelArg(_stencilKernel, 9, sizeof(int), &end);
-
-    cl_int errNum = clEnqueueNDRangeKernel(
-        _clCommandQueue, _stencilKernel, 1, NULL,
-        &globalWorkSize, NULL, numStartEvents, startEvents, endEvent);
-
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "ApplyStencilKernel (%d) ", errNum);
-        return false;
-    }
-
-    if (endEvent == NULL)
-    {
-    clFinish(_clCommandQueue);
-    }
-    return true;
-}
-
-bool
-CLEvaluator::EvalStencils(cl_mem src, BufferDescriptor const &srcDesc,
-                          cl_mem dst, BufferDescriptor const &dstDesc,
-                          cl_mem du, BufferDescriptor const &duDesc,
-                          cl_mem dv, BufferDescriptor const &dvDesc,
-                          cl_mem sizes,
-                          cl_mem offsets,
-                          cl_mem indices,
-                          cl_mem weights,
-                          cl_mem duWeights,
-                          cl_mem dvWeights,
-                          int start, int end,
-                          unsigned int numStartEvents,
-                          const cl_event* startEvents,
-                          cl_event* endEvent) const {
-    if (end <= start) return true;
-
-    size_t globalWorkSize = (size_t)(end - start);
-
-    BufferDescriptor empty;
-    clSetKernelArg(_stencilDerivKernel,  0, sizeof(cl_mem), &src);
-    clSetKernelArg(_stencilDerivKernel,  1, sizeof(int), &srcDesc.offset);
-    clSetKernelArg(_stencilDerivKernel,  2, sizeof(cl_mem), &dst);
-    clSetKernelArg(_stencilDerivKernel,  3, sizeof(int), &dstDesc.offset);
-    clSetKernelArg(_stencilDerivKernel,  4, sizeof(cl_mem), &du);
-    clSetKernelArg(_stencilDerivKernel,  5, sizeof(int), &duDesc.offset);
-    clSetKernelArg(_stencilDerivKernel,  6, sizeof(int), &duDesc.stride);
-    clSetKernelArg(_stencilDerivKernel,  7, sizeof(cl_mem), &dv);
-    clSetKernelArg(_stencilDerivKernel,  8, sizeof(int), &dvDesc.offset);
-    clSetKernelArg(_stencilDerivKernel,  9, sizeof(int), &dvDesc.stride);
-    clSetKernelArg(_stencilDerivKernel, 10, sizeof(cl_mem), NULL);
-    clSetKernelArg(_stencilDerivKernel, 11, sizeof(int), &empty.offset);
-    clSetKernelArg(_stencilDerivKernel, 12, sizeof(int), &empty.stride);
-    clSetKernelArg(_stencilDerivKernel, 13, sizeof(cl_mem), NULL);
-    clSetKernelArg(_stencilDerivKernel, 14, sizeof(int), &empty.offset);
-    clSetKernelArg(_stencilDerivKernel, 15, sizeof(int), &empty.stride);
-    clSetKernelArg(_stencilDerivKernel, 16, sizeof(cl_mem), NULL);
-    clSetKernelArg(_stencilDerivKernel, 17, sizeof(int), &empty.offset);
-    clSetKernelArg(_stencilDerivKernel, 18, sizeof(int), &empty.stride);
-    clSetKernelArg(_stencilDerivKernel, 19, sizeof(cl_mem), &sizes);
-    clSetKernelArg(_stencilDerivKernel, 20, sizeof(cl_mem), &offsets);
-    clSetKernelArg(_stencilDerivKernel, 21, sizeof(cl_mem), &indices);
-    clSetKernelArg(_stencilDerivKernel, 22, sizeof(cl_mem), &weights);
-    clSetKernelArg(_stencilDerivKernel, 23, sizeof(cl_mem), &duWeights);
-    clSetKernelArg(_stencilDerivKernel, 24, sizeof(cl_mem), &dvWeights);
-    clSetKernelArg(_stencilDerivKernel, 25, sizeof(cl_mem), NULL);
-    clSetKernelArg(_stencilDerivKernel, 26, sizeof(cl_mem), NULL);
-    clSetKernelArg(_stencilDerivKernel, 27, sizeof(cl_mem), NULL);
-    clSetKernelArg(_stencilDerivKernel, 28, sizeof(int), &start);
-    clSetKernelArg(_stencilDerivKernel, 29, sizeof(int), &end);
-
-    cl_int errNum = clEnqueueNDRangeKernel(
-        _clCommandQueue, _stencilDerivKernel, 1, NULL,
-        &globalWorkSize, NULL, numStartEvents, startEvents, endEvent);
-
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "ApplyStencilKernel (%d) ", errNum);
-        return false;
-    }
-
-    if (endEvent == NULL) {
-        clFinish(_clCommandQueue);
-    }
-    return true;
-}
-
-bool
-CLEvaluator::EvalStencils(cl_mem src, BufferDescriptor const &srcDesc,
-                          cl_mem dst, BufferDescriptor const &dstDesc,
-                          cl_mem du,  BufferDescriptor const &duDesc,
-                          cl_mem dv,  BufferDescriptor const &dvDesc,
-                          cl_mem duu, BufferDescriptor const &duuDesc,
-                          cl_mem duv, BufferDescriptor const &duvDesc,
-                          cl_mem dvv, BufferDescriptor const &dvvDesc,
-                          cl_mem sizes,
-                          cl_mem offsets,
-                          cl_mem indices,
-                          cl_mem weights,
-                          cl_mem duWeights,
-                          cl_mem dvWeights,
-                          cl_mem duuWeights,
-                          cl_mem duvWeights,
-                          cl_mem dvvWeights,
-                          int start, int end,
-                          unsigned int numStartEvents,
-                          const cl_event* startEvents,
-                          cl_event* endEvent) const {
-    if (end <= start) return true;
-
-    size_t globalWorkSize = (size_t)(end - start);
-
-    clSetKernelArg(_stencilDerivKernel,  0, sizeof(cl_mem), &src);
-    clSetKernelArg(_stencilDerivKernel,  1, sizeof(int), &srcDesc.offset);
-    clSetKernelArg(_stencilDerivKernel,  2, sizeof(cl_mem), &dst);
-    clSetKernelArg(_stencilDerivKernel,  3, sizeof(int), &dstDesc.offset);
-    clSetKernelArg(_stencilDerivKernel,  4, sizeof(cl_mem), &du);
-    clSetKernelArg(_stencilDerivKernel,  5, sizeof(int), &duDesc.offset);
-    clSetKernelArg(_stencilDerivKernel,  6, sizeof(int), &duDesc.stride);
-    clSetKernelArg(_stencilDerivKernel,  7, sizeof(cl_mem), &dv);
-    clSetKernelArg(_stencilDerivKernel,  8, sizeof(int), &dvDesc.offset);
-    clSetKernelArg(_stencilDerivKernel,  9, sizeof(int), &dvDesc.stride);
-    clSetKernelArg(_stencilDerivKernel, 10, sizeof(cl_mem), &duu);
-    clSetKernelArg(_stencilDerivKernel, 11, sizeof(int), &duuDesc.offset);
-    clSetKernelArg(_stencilDerivKernel, 12, sizeof(int), &duuDesc.stride);
-    clSetKernelArg(_stencilDerivKernel, 13, sizeof(cl_mem), &duv);
-    clSetKernelArg(_stencilDerivKernel, 14, sizeof(int), &duvDesc.offset);
-    clSetKernelArg(_stencilDerivKernel, 15, sizeof(int), &duvDesc.stride);
-    clSetKernelArg(_stencilDerivKernel, 16, sizeof(cl_mem), &dvv);
-    clSetKernelArg(_stencilDerivKernel, 17, sizeof(int), &dvvDesc.offset);
-    clSetKernelArg(_stencilDerivKernel, 18, sizeof(int), &dvvDesc.stride);
-    clSetKernelArg(_stencilDerivKernel, 19, sizeof(cl_mem), &sizes);
-    clSetKernelArg(_stencilDerivKernel, 20, sizeof(cl_mem), &offsets);
-    clSetKernelArg(_stencilDerivKernel, 21, sizeof(cl_mem), &indices);
-    clSetKernelArg(_stencilDerivKernel, 22, sizeof(cl_mem), &weights);
-    clSetKernelArg(_stencilDerivKernel, 23, sizeof(cl_mem), &duWeights);
-    clSetKernelArg(_stencilDerivKernel, 24, sizeof(cl_mem), &dvWeights);
-    clSetKernelArg(_stencilDerivKernel, 25, sizeof(cl_mem), &duuWeights);
-    clSetKernelArg(_stencilDerivKernel, 26, sizeof(cl_mem), &duvWeights);
-    clSetKernelArg(_stencilDerivKernel, 27, sizeof(cl_mem), &dvvWeights);
-    clSetKernelArg(_stencilDerivKernel, 28, sizeof(int), &start);
-    clSetKernelArg(_stencilDerivKernel, 29, sizeof(int), &end);
-
-    cl_int errNum = clEnqueueNDRangeKernel(
-        _clCommandQueue, _stencilDerivKernel, 1, NULL,
-        &globalWorkSize, NULL, numStartEvents, startEvents, endEvent);
-
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "ApplyStencilKernel (%d) ", errNum);
-        return false;
-    }
-
-    if (endEvent == NULL) {
-        clFinish(_clCommandQueue);
-    }
-    return true;
-}
-
-bool
-CLEvaluator::EvalPatches(cl_mem src, BufferDescriptor const &srcDesc,
-                         cl_mem dst, BufferDescriptor const &dstDesc,
-                         cl_mem du,  BufferDescriptor const &duDesc,
-                         cl_mem dv,  BufferDescriptor const &dvDesc,
-                         int numPatchCoords,
-                         cl_mem patchCoordsBuffer,
-                         cl_mem patchArrayBuffer,
-                         cl_mem patchIndexBuffer,
-                         cl_mem patchParamBuffer,
-                         unsigned int numStartEvents,
-                         const cl_event* startEvents,
-                         cl_event* endEvent) const {
-
-    size_t globalWorkSize = (size_t)(numPatchCoords);
-
-    BufferDescriptor empty;
-    clSetKernelArg(_patchKernel,  0, sizeof(cl_mem), &src);
-    clSetKernelArg(_patchKernel,  1, sizeof(int),    &srcDesc.offset);
-    clSetKernelArg(_patchKernel,  2, sizeof(cl_mem), &dst);
-    clSetKernelArg(_patchKernel,  3, sizeof(int),    &dstDesc.offset);
-    clSetKernelArg(_patchKernel,  4, sizeof(cl_mem), &du);
-    clSetKernelArg(_patchKernel,  5, sizeof(int),    &duDesc.offset);
-    clSetKernelArg(_patchKernel,  6, sizeof(int),    &duDesc.stride);
-    clSetKernelArg(_patchKernel,  7, sizeof(cl_mem), &dv);
-    clSetKernelArg(_patchKernel,  8, sizeof(int),    &dvDesc.offset);
-    clSetKernelArg(_patchKernel,  9, sizeof(int),    &dvDesc.stride);
-    clSetKernelArg(_patchKernel, 10, sizeof(cl_mem), NULL);
-    clSetKernelArg(_patchKernel, 11, sizeof(int),    &empty.offset);
-    clSetKernelArg(_patchKernel, 12, sizeof(int),    &empty.stride);
-    clSetKernelArg(_patchKernel, 13, sizeof(cl_mem), NULL);
-    clSetKernelArg(_patchKernel, 14, sizeof(int),    &empty.offset);
-    clSetKernelArg(_patchKernel, 15, sizeof(int),    &empty.stride);
-    clSetKernelArg(_patchKernel, 16, sizeof(cl_mem), NULL);
-    clSetKernelArg(_patchKernel, 17, sizeof(int),    &empty.offset);
-    clSetKernelArg(_patchKernel, 18, sizeof(int),    &empty.stride);
-    clSetKernelArg(_patchKernel, 19, sizeof(cl_mem), &patchCoordsBuffer);
-    clSetKernelArg(_patchKernel, 20, sizeof(cl_mem), &patchArrayBuffer);
-    clSetKernelArg(_patchKernel, 21, sizeof(cl_mem), &patchIndexBuffer);
-    clSetKernelArg(_patchKernel, 22, sizeof(cl_mem), &patchParamBuffer);
-
-    cl_int errNum = clEnqueueNDRangeKernel(
-        _clCommandQueue, _patchKernel, 1, NULL,
-        &globalWorkSize, NULL, numStartEvents, startEvents, endEvent);
-
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "ApplyPatchKernel (%d) ", errNum);
-        return false;
-    }
-
-    if (endEvent == NULL) {
-        clFinish(_clCommandQueue);
-    }
-    return true;
-}
-
-bool
-CLEvaluator::EvalPatches(cl_mem src, BufferDescriptor const &srcDesc,
-                         cl_mem dst, BufferDescriptor const &dstDesc,
-                         cl_mem du,  BufferDescriptor const &duDesc,
-                         cl_mem dv,  BufferDescriptor const &dvDesc,
-                         cl_mem duu, BufferDescriptor const &duuDesc,
-                         cl_mem duv, BufferDescriptor const &duvDesc,
-                         cl_mem dvv, BufferDescriptor const &dvvDesc,
-                         int numPatchCoords,
-                         cl_mem patchCoordsBuffer,
-                         cl_mem patchArrayBuffer,
-                         cl_mem patchIndexBuffer,
-                         cl_mem patchParamBuffer,
-                         unsigned int numStartEvents,
-                         const cl_event* startEvents,
-                         cl_event* endEvent) const {
-
-    size_t globalWorkSize = (size_t)(numPatchCoords);
-
-    clSetKernelArg(_patchKernel,  0, sizeof(cl_mem), &src);
-    clSetKernelArg(_patchKernel,  1, sizeof(int),    &srcDesc.offset);
-    clSetKernelArg(_patchKernel,  2, sizeof(cl_mem), &dst);
-    clSetKernelArg(_patchKernel,  3, sizeof(int),    &dstDesc.offset);
-    clSetKernelArg(_patchKernel,  4, sizeof(cl_mem), &du);
-    clSetKernelArg(_patchKernel,  5, sizeof(int),    &duDesc.offset);
-    clSetKernelArg(_patchKernel,  6, sizeof(int),    &duDesc.stride);
-    clSetKernelArg(_patchKernel,  7, sizeof(cl_mem), &dv);
-    clSetKernelArg(_patchKernel,  8, sizeof(int),    &dvDesc.offset);
-    clSetKernelArg(_patchKernel,  9, sizeof(int),    &dvDesc.stride);
-    clSetKernelArg(_patchKernel, 10, sizeof(cl_mem), &duu);
-    clSetKernelArg(_patchKernel, 11, sizeof(int),    &duuDesc.offset);
-    clSetKernelArg(_patchKernel, 12, sizeof(int),    &duuDesc.stride);
-    clSetKernelArg(_patchKernel, 13, sizeof(cl_mem), &duv);
-    clSetKernelArg(_patchKernel, 14, sizeof(int),    &duvDesc.offset);
-    clSetKernelArg(_patchKernel, 15, sizeof(int),    &duvDesc.stride);
-    clSetKernelArg(_patchKernel, 16, sizeof(cl_mem), &dvv);
-    clSetKernelArg(_patchKernel, 17, sizeof(int),    &dvvDesc.offset);
-    clSetKernelArg(_patchKernel, 18, sizeof(int),    &dvvDesc.stride);
-    clSetKernelArg(_patchKernel, 19, sizeof(cl_mem), &patchCoordsBuffer);
-    clSetKernelArg(_patchKernel, 20, sizeof(cl_mem), &patchArrayBuffer);
-    clSetKernelArg(_patchKernel, 21, sizeof(cl_mem), &patchIndexBuffer);
-    clSetKernelArg(_patchKernel, 22, sizeof(cl_mem), &patchParamBuffer);
-
-    cl_int errNum = clEnqueueNDRangeKernel(
-        _clCommandQueue, _patchKernel, 1, NULL,
-        &globalWorkSize, NULL, numStartEvents, startEvents, endEvent);
-
-    if (errNum != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "ApplyPatchKernel (%d) ", errNum);
-        return false;
-    }
-
-    if (endEvent == NULL) {
-        clFinish(_clCommandQueue);
-    }
-    return true;
-}
-
-
-/* static */
-void
-CLEvaluator::Synchronize(cl_command_queue clCommandQueue) {
-    clFinish(clCommandQueue);
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clEvaluator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clEvaluator.h
deleted file mode 100644
index 5c5653004..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clEvaluator.h
+++ /dev/null
@@ -1,2636 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CL_EVALUATOR_H
-#define OPENSUBDIV3_OSD_CL_EVALUATOR_H
-
-#include "../version.h"
-
-#include "../osd/opencl.h"
-#include "../osd/types.h"
-#include "../osd/bufferDescriptor.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-    class PatchTable;
-    class StencilTable;
-    class LimitStencilTable;
-}
-
-namespace Osd {
-
-/// \brief OpenCL stencil table
-///
-/// This class is an OpenCL buffer representation of Far::StencilTable.
-///
-/// CLCompute consumes this table to apply stencils
-///
-///
-class CLStencilTable {
-public:
-    template <typename DEVICE_CONTEXT>
-    static CLStencilTable *Create(Far::StencilTable const *stencilTable,
-                                  DEVICE_CONTEXT context) {
-        return new CLStencilTable(stencilTable, context->GetContext());
-    }
-
-    template <typename DEVICE_CONTEXT>
-    static CLStencilTable *Create(
-        Far::LimitStencilTable const *limitStencilTable,
-        DEVICE_CONTEXT context) {
-        return new CLStencilTable(limitStencilTable, context->GetContext());
-    }
-
-    CLStencilTable(Far::StencilTable const *stencilTable,
-                   cl_context clContext);
-    CLStencilTable(Far::LimitStencilTable const *limitStencilTable,
-                   cl_context clContext);
-    ~CLStencilTable();
-
-    // interfaces needed for CLComputeKernel
-    cl_mem GetSizesBuffer()      const { return _sizes; }
-    cl_mem GetOffsetsBuffer()    const { return _offsets; }
-    cl_mem GetIndicesBuffer()    const { return _indices; }
-    cl_mem GetWeightsBuffer()    const { return _weights; }
-    cl_mem GetDuWeightsBuffer()  const { return _duWeights; }
-    cl_mem GetDvWeightsBuffer()  const { return _dvWeights; }
-    cl_mem GetDuuWeightsBuffer() const { return _duuWeights; }
-    cl_mem GetDuvWeightsBuffer() const { return _duvWeights; }
-    cl_mem GetDvvWeightsBuffer() const { return _dvvWeights; }
-    int GetNumStencils()         const { return _numStencils; }
-
-private:
-    cl_mem _sizes;
-    cl_mem _offsets;
-    cl_mem _indices;
-    cl_mem _weights;
-    cl_mem _duWeights;
-    cl_mem _dvWeights;
-    cl_mem _duuWeights;
-    cl_mem _duvWeights;
-    cl_mem _dvvWeights;
-    int _numStencils;
-};
-
-// ---------------------------------------------------------------------------
-
-class CLEvaluator {
-public:
-    typedef bool Instantiatable;
-
-    /// Generic creator template.
-    template <typename DEVICE_CONTEXT>
-    static CLEvaluator *Create(BufferDescriptor const &srcDesc,
-                               BufferDescriptor const &dstDesc,
-                               BufferDescriptor const &duDesc,
-                               BufferDescriptor const &dvDesc,
-                               DEVICE_CONTEXT deviceContext) {
-        return Create(srcDesc, dstDesc, duDesc, dvDesc,
-                      deviceContext->GetContext(),
-                      deviceContext->GetCommandQueue());
-    }
-
-    static CLEvaluator * Create(BufferDescriptor const &srcDesc,
-                                BufferDescriptor const &dstDesc,
-                                BufferDescriptor const &duDesc,
-                                BufferDescriptor const &dvDesc,
-                                cl_context clContext,
-                                cl_command_queue clCommandQueue) {
-        CLEvaluator *instance = new CLEvaluator(clContext, clCommandQueue);
-        if (instance->Compile(srcDesc, dstDesc, duDesc, dvDesc))
-            return instance;
-        delete instance;
-        return NULL;
-    }
-
-    /// Generic creator template.
-    template <typename DEVICE_CONTEXT>
-    static CLEvaluator *Create(BufferDescriptor const &srcDesc,
-                               BufferDescriptor const &dstDesc,
-                               BufferDescriptor const &duDesc,
-                               BufferDescriptor const &dvDesc,
-                               BufferDescriptor const &duuDesc,
-                               BufferDescriptor const &duvDesc,
-                               BufferDescriptor const &dvvDesc,
-                               DEVICE_CONTEXT deviceContext) {
-        return Create(srcDesc, dstDesc, duDesc, dvDesc,
-                      duuDesc, duvDesc, dvvDesc,
-                      deviceContext->GetContext(),
-                      deviceContext->GetCommandQueue());
-    }
-
-    static CLEvaluator * Create(BufferDescriptor const &srcDesc,
-                                BufferDescriptor const &dstDesc,
-                                BufferDescriptor const &duDesc,
-                                BufferDescriptor const &dvDesc,
-                                BufferDescriptor const &duuDesc,
-                                BufferDescriptor const &duvDesc,
-                                BufferDescriptor const &dvvDesc,
-                                cl_context clContext,
-                                cl_command_queue clCommandQueue) {
-        CLEvaluator *instance = new CLEvaluator(clContext, clCommandQueue);
-        if (instance->Compile(srcDesc, dstDesc, duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc))
-            return instance;
-        delete instance;
-        return NULL;
-    }
-
-    /// Constructor.
-    CLEvaluator(cl_context context, cl_command_queue queue);
-
-    /// Destructor.
-    ~CLEvaluator();
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Stencil evaluations with StencilTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for results to be written
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename STENCIL_TABLE, typename DEVICE_CONTEXT>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          stencilTable,
-                                          numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor(),
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                stencilTable,
-                                                numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for results to be written
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for du results to be written
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for dv results to be written
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename STENCIL_TABLE, typename DEVICE_CONTEXT>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          duBuffer,  duDesc,
-                                          dvBuffer,  dvDesc,
-                                          stencilTable,
-                                          numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc, duDesc, dvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                duBuffer,  duDesc,
-                                                dvBuffer,  dvDesc,
-                                                stencilTable,
-                                                numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for results to be written
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for du results to be written
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for dv results to be written
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for du results to be written
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for du results to be written
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for dv results to be written
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename STENCIL_TABLE, typename DEVICE_CONTEXT>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          duBuffer,  duDesc,
-                                          dvBuffer,  dvDesc,
-                                          duuBuffer, duuDesc,
-                                          duvBuffer, duvDesc,
-                                          dvvBuffer, dvvDesc,
-                                          stencilTable,
-                                          numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                duBuffer,  duDesc,
-                                                dvBuffer,  dvDesc,
-                                                duuBuffer, duuDesc,
-                                                duvBuffer, duvDesc,
-                                                dvvBuffer, dvvDesc,
-                                                stencilTable,
-                                                numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for results to be written
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-        return EvalStencils(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                            dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                            stencilTable->GetSizesBuffer(),
-                            stencilTable->GetOffsetsBuffer(),
-                            stencilTable->GetIndicesBuffer(),
-                            stencilTable->GetWeightsBuffer(),
-                            0,
-                            stencilTable->GetNumStencils(),
-                            numStartEvents, startEvents, endEvent);
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for results to be written
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for du results to be written
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for dv results to be written
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-        return EvalStencils(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                            dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                            duBuffer->BindCLBuffer(_clCommandQueue), duDesc,
-                            dvBuffer->BindCLBuffer(_clCommandQueue), dvDesc,
-                            stencilTable->GetSizesBuffer(),
-                            stencilTable->GetOffsetsBuffer(),
-                            stencilTable->GetIndicesBuffer(),
-                            stencilTable->GetWeightsBuffer(),
-                            stencilTable->GetDuWeightsBuffer(),
-                            stencilTable->GetDvWeightsBuffer(),
-                            0,
-                            stencilTable->GetNumStencils(),
-                            numStartEvents, startEvents, endEvent);
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for results to be written
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for du results to be written
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for dv results to be written
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for du results to be written
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for du results to be written
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCLBuffer() method returning the
-    ///                       cl_mem object for dv results to be written
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-        return EvalStencils(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                            dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                            duBuffer->BindCLBuffer(_clCommandQueue), duDesc,
-                            dvBuffer->BindCLBuffer(_clCommandQueue), dvDesc,
-                            duuBuffer->BindCLBuffer(_clCommandQueue), duuDesc,
-                            duvBuffer->BindCLBuffer(_clCommandQueue), duvDesc,
-                            dvvBuffer->BindCLBuffer(_clCommandQueue), dvvDesc,
-                            stencilTable->GetSizesBuffer(),
-                            stencilTable->GetOffsetsBuffer(),
-                            stencilTable->GetIndicesBuffer(),
-                            stencilTable->GetWeightsBuffer(),
-                            stencilTable->GetDuWeightsBuffer(),
-                            stencilTable->GetDvWeightsBuffer(),
-                            stencilTable->GetDuuWeightsBuffer(),
-                            stencilTable->GetDuvWeightsBuffer(),
-                            stencilTable->GetDvvWeightsBuffer(),
-                            0,
-                            stencilTable->GetNumStencils(),
-                            numStartEvents, startEvents, endEvent);
-    }
-
-    /// Dispatch the CL compute kernel asynchronously.
-    /// returns false if the kernel hasn't been compiled yet.
-    bool EvalStencils(cl_mem src, BufferDescriptor const &srcDesc,
-                      cl_mem dst, BufferDescriptor const &dstDesc,
-                      cl_mem sizes,
-                      cl_mem offsets,
-                      cl_mem indices,
-                      cl_mem weights,
-                      int start,
-                      int end,
-                      unsigned int numStartEvents=0,
-                      const cl_event* startEvents=NULL,
-                      cl_event* endEvent=NULL) const;
-
-    /// \brief Dispatch the CL compute kernel asynchronously.
-    /// returns false if the kernel hasn't been compiled yet.
-    ///
-    /// @param src              CL buffer of input primvar source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the srcBuffer
-    ///
-    /// @param dst              CL buffer of output primvar destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param du               CL buffer of output derivative wrt u
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               CL buffer of output derivative wrt v
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param sizes            CL buffer of the sizes in the stencil table
-    ///
-    /// @param offsets          CL buffer of the offsets in the stencil table
-    ///
-    /// @param indices          CL buffer of the indices in the stencil table
-    ///
-    /// @param weights          CL buffer of the weights in the stencil table
-    ///
-    /// @param duWeights        CL buffer of the du weights in the stencil table
-    ///
-    /// @param dvWeights        CL buffer of the dv weights in the stencil table
-    ///
-    /// @param start            start index of stencil table
-    ///
-    /// @param end              end index of stencil table
-    ///
-    /// @param numStartEvents   the number of events in the array pointed to by
-    ///                         startEvents.
-    ///
-    /// @param startEvents      points to an array of cl_event which will determine
-    ///                         when it is safe for the OpenCL device to begin work
-    ///                         or NULL if it can begin immediately.
-    ///
-    /// @param endEvent         pointer to a cl_event which will receive a copy of
-    ///                         the cl_event which indicates when all work for this
-    ///                         call has completed.  This cl_event has an incremented
-    ///                         reference count and should be released via
-    ///                         clReleaseEvent().  NULL if not required.
-    ///
-    bool EvalStencils(cl_mem src, BufferDescriptor const &srcDesc,
-                      cl_mem dst, BufferDescriptor const &dstDesc,
-                      cl_mem du,  BufferDescriptor const &duDesc,
-                      cl_mem dv,  BufferDescriptor const &dvDesc,
-                      cl_mem sizes,
-                      cl_mem offsets,
-                      cl_mem indices,
-                      cl_mem weights,
-                      cl_mem duWeights,
-                      cl_mem dvWeights,
-                      int start,
-                      int end,
-                      unsigned int numStartEvents=0,
-                      const cl_event* startEvents=NULL,
-                      cl_event* endEvent=NULL) const;
-
-    /// \brief Dispatch the CL compute kernel asynchronously.
-    /// returns false if the kernel hasn't been compiled yet.
-    ///
-    /// @param src              CL buffer of input primvar source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the srcBuffer
-    ///
-    /// @param dst              CL buffer of output primvar destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param du               CL buffer of output derivative wrt u
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               CL buffer of output derivative wrt v
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duu              CL buffer of output 2nd derivative wrt u
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duv              CL buffer of output 2nd derivative wrt u and v
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvv              CL buffer of output 2nd derivative wrt v
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param sizes            CL buffer of the sizes in the stencil table
-    ///
-    /// @param offsets          CL buffer of the offsets in the stencil table
-    ///
-    /// @param indices          CL buffer of the indices in the stencil table
-    ///
-    /// @param weights          CL buffer of the weights in the stencil table
-    ///
-    /// @param duWeights        CL buffer of the du weights in the stencil table
-    ///
-    /// @param dvWeights        CL buffer of the dv weights in the stencil table
-    ///
-    /// @param duuWeights       CL buffer of the duu weights in the stencil table
-    ///
-    /// @param duvWeights       CL buffer of the duv weights in the stencil table
-    ///
-    /// @param dvvWeights       CL buffer of the dvv weights in the stencil table
-    ///
-    /// @param start            start index of stencil table
-    ///
-    /// @param end              end index of stencil table
-    ///
-    /// @param numStartEvents   the number of events in the array pointed to by
-    ///                         startEvents.
-    ///
-    /// @param startEvents      points to an array of cl_event which will determine
-    ///                         when it is safe for the OpenCL device to begin work
-    ///                         or NULL if it can begin immediately.
-    ///
-    /// @param endEvent         pointer to a cl_event which will receive a copy of
-    ///                         the cl_event which indicates when all work for this
-    ///                         call has completed.  This cl_event has an incremented
-    ///                         reference count and should be released via
-    ///                         clReleaseEvent().  NULL if not required.
-    ///
-    bool EvalStencils(cl_mem src, BufferDescriptor const &srcDesc,
-                      cl_mem dst, BufferDescriptor const &dstDesc,
-                      cl_mem du,  BufferDescriptor const &duDesc,
-                      cl_mem dv,  BufferDescriptor const &dvDesc,
-                      cl_mem duu, BufferDescriptor const &duuDesc,
-                      cl_mem duv, BufferDescriptor const &duvDesc,
-                      cl_mem dvv, BufferDescriptor const &dvvDesc,
-                      cl_mem sizes,
-                      cl_mem offsets,
-                      cl_mem indices,
-                      cl_mem weights,
-                      cl_mem duWeights,
-                      cl_mem dvWeights,
-                      cl_mem duuWeights,
-                      cl_mem duvWeights,
-                      cl_mem dvvWeights,
-                      int start,
-                      int end,
-                      unsigned int numStartEvents=0,
-                      const cl_event* startEvents=NULL,
-                      cl_event* endEvent=NULL) const;
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Limit evaluations with PatchTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE,
-              typename DEVICE_CONTEXT>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor(),
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE,
-              typename DEVICE_CONTEXT>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc, duDesc, dvDesc, deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE,
-              typename DEVICE_CONTEXT>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-
-        return EvalPatches(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                           dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindCLBuffer(_clCommandQueue),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           numStartEvents, startEvents, endEvent);
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of destination data
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of destination data
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CLPatchTable or equivalent
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-
-        return EvalPatches(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                           dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                           duBuffer->BindCLBuffer(_clCommandQueue),  duDesc,
-                           dvBuffer->BindCLBuffer(_clCommandQueue),  dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindCLBuffer(_clCommandQueue),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           numStartEvents, startEvents, endEvent);
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of destination data
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of destination data
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of destination data
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of destination data
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCLBuffer() method returning a CL
-    ///                         buffer object of destination data
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CLPatchTable or equivalent
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-
-        return EvalPatches(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                           dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                           duBuffer->BindCLBuffer(_clCommandQueue),  duDesc,
-                           dvBuffer->BindCLBuffer(_clCommandQueue),  dvDesc,
-                           duuBuffer->BindCLBuffer(_clCommandQueue), duuDesc,
-                           duvBuffer->BindCLBuffer(_clCommandQueue), duvDesc,
-                           dvvBuffer->BindCLBuffer(_clCommandQueue), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindCLBuffer(_clCommandQueue),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           numStartEvents, startEvents, endEvent);
-    }
-
-    bool EvalPatches(cl_mem src, BufferDescriptor const &srcDesc,
-                     cl_mem dst, BufferDescriptor const &dstDesc,
-                     cl_mem du,  BufferDescriptor const &duDesc,
-                     cl_mem dv,  BufferDescriptor const &dvDesc,
-                     int numPatchCoords,
-                     cl_mem patchCoordsBuffer,
-                     cl_mem patchArrayBuffer,
-                     cl_mem patchIndexBuffer,
-                     cl_mem patchParamsBuffer,
-                     unsigned int numStartEvents=0,
-                     const cl_event* startEvents=NULL,
-                     cl_event* endEvent=NULL) const;
-
-    bool EvalPatches(cl_mem src, BufferDescriptor const &srcDesc,
-                     cl_mem dst, BufferDescriptor const &dstDesc,
-                     cl_mem du,  BufferDescriptor const &duDesc,
-                     cl_mem dv,  BufferDescriptor const &dvDesc,
-                     cl_mem duu, BufferDescriptor const &duuDesc,
-                     cl_mem duv, BufferDescriptor const &duvDesc,
-                     cl_mem dvv, BufferDescriptor const &dvvDesc,
-                     int numPatchCoords,
-                     cl_mem patchCoordsBuffer,
-                     cl_mem patchArrayBuffer,
-                     cl_mem patchIndexBuffer,
-                     cl_mem patchParamsBuffer,
-                     unsigned int numStartEvents=0,
-                     const cl_event* startEvents=NULL,
-                     cl_event* endEvent=NULL) const;
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE,
-              typename DEVICE_CONTEXT>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor(),
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-
-        return EvalPatches(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                           dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindCLBuffer(_clCommandQueue),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           numStartEvents, startEvents, endEvent);
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE,
-              typename DEVICE_CONTEXT>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-
-        return EvalPatches(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                           dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                           duBuffer->BindCLBuffer(_clCommandQueue), duDesc,
-                           dvBuffer->BindCLBuffer(_clCommandQueue), dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindCLBuffer(_clCommandQueue),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           numStartEvents, startEvents, endEvent);
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE,
-              typename DEVICE_CONTEXT>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-
-        return EvalPatches(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                           dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                           duBuffer->BindCLBuffer(_clCommandQueue), duDesc,
-                           dvBuffer->BindCLBuffer(_clCommandQueue), dvDesc,
-                           duuBuffer->BindCLBuffer(_clCommandQueue), duuDesc,
-                           duvBuffer->BindCLBuffer(_clCommandQueue), duvDesc,
-                           dvvBuffer->BindCLBuffer(_clCommandQueue), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindCLBuffer(_clCommandQueue),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           numStartEvents, startEvents, endEvent);
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE,
-              typename DEVICE_CONTEXT>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable, fvarChannel,
-                                         numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor(),
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable, fvarChannel,
-                                               numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel = 0,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-
-        return EvalPatches(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                           dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindCLBuffer(_clCommandQueue),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel),
-                           numStartEvents, startEvents, endEvent);
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE,
-              typename DEVICE_CONTEXT>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable, fvarChannel,
-                                         numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc, deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable, fvarChannel,
-                                               numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel = 0,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-
-        return EvalPatches(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                           dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                           duBuffer->BindCLBuffer(_clCommandQueue), duDesc,
-                           dvBuffer->BindCLBuffer(_clCommandQueue), dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindCLBuffer(_clCommandQueue),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel),
-                           numStartEvents, startEvents, endEvent);
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  client providing context class which supports
-    ///                         cL_context GetContext()
-    ///                         cl_command_queue GetCommandQueue()
-    ///                       methods.
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE,
-              typename DEVICE_CONTEXT>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        CLEvaluator const *instance,
-        DEVICE_CONTEXT deviceContext,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable, fvarChannel,
-                                         numStartEvents, startEvents, endEvent);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable, fvarChannel,
-                                               numStartEvents, startEvents, endEvent);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCLBuffer() method returning a CL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindCLBuffer() method returning an
-    ///                       array of PatchCoord struct.
-    ///
-    /// @param patchTable     CLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param numStartEvents the number of events in the array pointed to by
-    ///                       startEvents.
-    ///
-    /// @param startEvents    points to an array of cl_event which will determine
-    ///                       when it is safe for the OpenCL device to begin work
-    ///                       or NULL if it can begin immediately.
-    ///
-    /// @param endEvent       pointer to a cl_event which will receive a copy of
-    ///                       the cl_event which indicates when all work for this
-    ///                       call has completed.  This cl_event has an incremented
-    ///                       reference count and should be released via
-    ///                       clReleaseEvent().  NULL if not required.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel = 0,
-        unsigned int numStartEvents=0,
-        const cl_event* startEvents=NULL,
-        cl_event* endEvent=NULL) const {
-
-        return EvalPatches(srcBuffer->BindCLBuffer(_clCommandQueue), srcDesc,
-                           dstBuffer->BindCLBuffer(_clCommandQueue), dstDesc,
-                           duBuffer->BindCLBuffer(_clCommandQueue), duDesc,
-                           dvBuffer->BindCLBuffer(_clCommandQueue), dvDesc,
-                           duuBuffer->BindCLBuffer(_clCommandQueue), duuDesc,
-                           duvBuffer->BindCLBuffer(_clCommandQueue), duvDesc,
-                           dvvBuffer->BindCLBuffer(_clCommandQueue), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindCLBuffer(_clCommandQueue),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel),
-                           numStartEvents, startEvents, endEvent);
-    }
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Other methods
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// Configure OpenCL kernel.
-    /// Returns false if it fails to compile the kernel.
-    bool Compile(BufferDescriptor const &srcDesc,
-                 BufferDescriptor const &dstDesc,
-                 BufferDescriptor const &duDesc = BufferDescriptor(),
-                 BufferDescriptor const &dvDesc = BufferDescriptor(),
-                 BufferDescriptor const &duuDesc = BufferDescriptor(),
-                 BufferDescriptor const &duvDesc = BufferDescriptor(),
-                 BufferDescriptor const &dvvDesc = BufferDescriptor());
-
-    /// Wait the OpenCL kernels finish.
-    template <typename DEVICE_CONTEXT>
-    static void Synchronize(DEVICE_CONTEXT deviceContext) {
-        Synchronize(deviceContext->GetCommandQueue());
-    }
-
-    static void Synchronize(cl_command_queue queue);
-
-private:
-    cl_context _clContext;
-    cl_command_queue _clCommandQueue;
-    cl_program _program;
-    cl_kernel _stencilKernel;
-    cl_kernel _stencilDerivKernel;
-    cl_kernel _patchKernel;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-
-#endif  // OPENSUBDIV3_OSD_CL_EVALUATOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clGLVertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clGLVertexBuffer.cpp
deleted file mode 100644
index b8aeec959..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clGLVertexBuffer.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "glLoader.h"
-
-#include "../osd/clGLVertexBuffer.h"
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CLGLVertexBuffer::CLGLVertexBuffer(int numElements,
-                                         int numVertices,
-                                         cl_context /* clContext */)
-    : _numElements(numElements), _numVertices(numVertices),
-      _vbo(0), _clQueue(0), _clMemory(0), _clMapped(false) {
-
-    // Initialize internal OpenGL loader library if necessary
-    OpenSubdiv::internal::GLLoader::libraryInitializeGL();
-}
-
-CLGLVertexBuffer::~CLGLVertexBuffer() {
-
-    unmap();
-    clReleaseMemObject(_clMemory);
-    glDeleteBuffers(1, &_vbo);
-}
-
-CLGLVertexBuffer *
-CLGLVertexBuffer::Create(int numElements, int numVertices, cl_context clContext)
-{
-    CLGLVertexBuffer *instance =
-        new CLGLVertexBuffer(numElements, numVertices, clContext);
-    if (instance->allocate(clContext)) return instance;
-    delete instance;
-    return NULL;
-}
-
-void
-CLGLVertexBuffer::UpdateData(const float *src, int startVertex, int numVertices,
-                             cl_command_queue queue) {
-
-    size_t size = numVertices * _numElements * sizeof(float);
-    size_t offset = startVertex * _numElements * sizeof(float);
-
-    map(queue);
-    clEnqueueWriteBuffer(queue, _clMemory, true, offset, size, src, 0, NULL, NULL);
-}
-
-int
-CLGLVertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-CLGLVertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-cl_mem
-CLGLVertexBuffer::BindCLBuffer(cl_command_queue queue) {
-
-    map(queue);
-    return _clMemory;
-}
-
-GLuint
-CLGLVertexBuffer::BindVBO(void * /*deviceContext*/) {
-
-    unmap();
-    return _vbo;
-}
-
-bool
-CLGLVertexBuffer::allocate(cl_context clContext) {
-
-    assert(clContext);
-
-    // create GL buffer first
-    int size = _numElements * _numVertices * sizeof(float);
-
-#if defined(GL_ARB_direct_state_access)
-    if (OSD_OPENGL_HAS(ARB_direct_state_access)) {
-        glCreateBuffers(1, &_vbo);
-        glNamedBufferData(_vbo, size, 0, GL_DYNAMIC_DRAW);
-    } else
-#endif
-    {
-        GLint prev = 0;
-        glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &prev);
-        glGenBuffers(1, &_vbo);
-        glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-        glBufferData(GL_ARRAY_BUFFER, size, 0, GL_DYNAMIC_DRAW);
-        glBindBuffer(GL_ARRAY_BUFFER, prev);
-    }
-
-    // register vbo as cl memory
-    cl_int err;
-    _clMemory = clCreateFromGLBuffer(clContext,
-                                     CL_MEM_READ_WRITE, _vbo, &err);
-
-    if (err != CL_SUCCESS) return false;
-    return true;
-}
-
-void
-CLGLVertexBuffer::map(cl_command_queue queue) {
-
-    if (_clMapped) return;    // XXX: what if another queue is given?
-    _clQueue = queue;
-    clEnqueueAcquireGLObjects(queue, 1, &_clMemory, 0, 0, 0);
-    _clMapped = true;
-}
-
-void
-CLGLVertexBuffer::unmap() {
-
-    if (! _clMapped) return;
-    clEnqueueReleaseGLObjects(_clQueue, 1, &_clMemory, 0, 0, 0);
-    _clMapped = false;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clGLVertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clGLVertexBuffer.h
deleted file mode 100644
index 98f7784f0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clGLVertexBuffer.h
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CL_GL_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_CL_GL_VERTEX_BUFFER_H
-
-#include "../version.h"
-
-#include "../osd/opengl.h"
-#include "../osd/opencl.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-///
-/// \brief Concrete vertex buffer class for OpenCL subdivision and OpenGL drawing.
-///
-/// CLGLVertexBuffer implements CLVertexBufferInterface and
-/// GLVertexBufferInterface.
-///
-/// The buffer interop between OpenCL and GL is handled automatically when a
-/// client calls BindCLBuffer and BindVBO methods.
-///
-class CLGLVertexBuffer {
-public:
-    /// Creator. Returns NULL if error.
-    static CLGLVertexBuffer * Create(int numElements,
-                                     int numVertices,
-                                     cl_context clContext);
-
-    template <typename DEVICE_CONTEXT>
-    static CLGLVertexBuffer * Create(int numElements, int numVertices,
-                                     DEVICE_CONTEXT context) {
-        return Create(numElements, numVertices, context->GetContext());
-    }
-
-    /// Destructor.
-    ~CLGLVertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide
-    /// coarse vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    cl_command_queue clQueue);
-
-    template<typename DEVICE_CONTEXT>
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    DEVICE_CONTEXT context) {
-        UpdateData(src, startVertex, numVertices, context->GetCommandQueue());
-    }
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns the CL memory object. GL buffer will be mapped to CL memory
-    /// space if necessary.
-    cl_mem BindCLBuffer(cl_command_queue queue);
-
-    /// Returns the GL buffer object. If the buffer is mapped to CL memory
-    /// space, it will be unmapped back to GL.
-    GLuint BindVBO(void *deviceContext = NULL);
-
-protected:
-    /// Constructor.
-    CLGLVertexBuffer(int numElements, int numVertices, cl_context clContext);
-
-    /// Allocates VBO for this buffer and register as a CL resource.
-    /// Returns true if success.
-    bool allocate(cl_context clContext);
-
-    /// Acquires a resource from GL.
-    void map(cl_command_queue queue);
-
-    /// Releases a resource to GL.
-    void unmap();
-
-private:
-    int _numElements;
-    int _numVertices;
-    GLuint _vbo;
-    cl_command_queue _clQueue;
-    cl_mem _clMemory;
-
-    bool _clMapped;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CL_GL_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clKernel.cl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clKernel.cl
deleted file mode 100644
index 5628a0575..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clKernel.cl
+++ /dev/null
@@ -1,249 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-struct Vertex {
-    float v[LENGTH];
-};
-
-static void clear(struct Vertex *vertex) {
-    for (int i = 0; i < LENGTH; i++) {
-        vertex->v[i] = 0.0f;
-    }
-}
-
-static void addWithWeight(struct Vertex *dst,
-                          __global float *srcOrigin,
-                          int index, float weight) {
-
-    __global float *src = srcOrigin + index * SRC_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        dst->v[i] += src[i] * weight;
-    }
-}
-
-static void writeVertex(__global float *dstOrigin,
-                        int index,
-                        struct Vertex *src) {
-
-    __global float *dst = dstOrigin + index * DST_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        dst[i] = src->v[i];
-    }
-}
-static void writeVertexStride(__global float *dstOrigin,
-                              int index,
-                              struct Vertex *src,
-                              int stride) {
-
-    __global float *dst = dstOrigin + index * stride;
-    for (int i = 0; i < LENGTH; ++i) {
-        dst[i] = src->v[i];
-    }
-}
-
-
-__kernel void computeStencils(
-    __global float * src, int srcOffset,
-    __global float * dst, int dstOffset,
-    __global int * sizes,
-    __global int * offsets,
-    __global int * indices,
-    __global float * weights,
-    int batchStart, int batchEnd) {
-
-    int current = get_global_id(0) + batchStart;
-
-    if (current>=batchEnd) {
-        return;
-    }
-
-    struct Vertex v;
-    clear(&v);
-
-    int size = sizes[current],
-        offset = offsets[current];
-
-    src += srcOffset;
-    dst += dstOffset;
-
-    for (int i=0; i<size; ++i) {
-        addWithWeight(&v, src, indices[offset+i], weights[offset+i]);
-    }
-
-    writeVertex(dst, current, &v);
-}
-
-__kernel void computeStencilsDerivatives(
-    __global float * src, int srcOffset,
-    __global float * dst, int dstOffset,
-    __global float * du,  int duOffset, int duStride,
-    __global float * dv,  int dvOffset, int dvStride,
-    __global float * duu, int duuOffset, int duuStride,
-    __global float * duv, int duvOffset, int duvStride,
-    __global float * dvv, int dvvOffset, int dvvStride,
-    __global int * sizes,
-    __global int * offsets,
-    __global int * indices,
-    __global float * weights,
-    __global float * duWeights,
-    __global float * dvWeights,
-    __global float * duuWeights,
-    __global float * duvWeights,
-    __global float * dvvWeights,
-    int batchStart, int batchEnd) {
-
-    int current = get_global_id(0) + batchStart;
-
-    if (current>=batchEnd) {
-        return;
-    }
-
-    struct Vertex v, vdu, vdv, vduu, vduv, vdvv;
-    clear(&v);
-    clear(&vdu);
-    clear(&vdv);
-    clear(&vduu);
-    clear(&vduv);
-    clear(&vdvv);
-
-    int size = sizes[current],
-        offset = offsets[current];
-
-    if (src) src += srcOffset;
-    if (dst) dst += dstOffset;
-    if (du)  du  += duOffset;
-    if (dv)  dv  += dvOffset;
-    if (duu) duu += duuOffset;
-    if (duv) duv += duvOffset;
-    if (dvv) dvv += dvvOffset;
-
-    for (int i=0; i<size; ++i) {
-        int ofs = offset + i;
-        int vid = indices[ofs];
-        if (weights)   addWithWeight(  &v, src, vid,   weights[ofs]);
-        if (duWeights) addWithWeight(&vdu, src, vid, duWeights[ofs]);
-        if (dvWeights) addWithWeight(&vdv, src, vid, dvWeights[ofs]);
-        if (duuWeights) addWithWeight(&vduu, src, vid, duuWeights[ofs]);
-        if (duvWeights) addWithWeight(&vduv, src, vid, duvWeights[ofs]);
-        if (dvvWeights) addWithWeight(&vdvv, src, vid, dvvWeights[ofs]);
-    }
-
-    if (dst) writeVertex      (dst, current, &v);
-    if (du)  writeVertexStride(du,  current, &vdu, duStride);
-    if (dv)  writeVertexStride(dv,  current, &vdv, dvStride);
-    if (duu) writeVertexStride(duu, current, &vduu, duuStride);
-    if (duv) writeVertexStride(duv, current, &vduv, duvStride);
-    if (dvv) writeVertexStride(dvv, current, &vdvv, dvvStride);
-}
-
-// ---------------------------------------------------------------------------
-
-__kernel void computePatches(__global float *src, int srcOffset,
-                             __global float *dst, int dstOffset,
-                             __global float *du,  int duOffset, int duStride,
-                             __global float *dv,  int dvOffset, int dvStride,
-                             __global float *duu, int duuOffset, int duuStride,
-                             __global float *duv, int duvOffset, int duvStride,
-                             __global float *dvv, int dvvOffset, int dvvStride,
-                             __global struct OsdPatchCoord *patchCoords,
-                             __global struct OsdPatchArray *patchArrayBuffer,
-                             __global int *patchIndexBuffer,
-                             __global struct OsdPatchParam *patchParamBuffer) {
-    int current = get_global_id(0);
-
-    if (src) src += srcOffset;
-    if (dst) dst += dstOffset;
-    if (du)  du  += duOffset;
-    if (dv)  dv  += dvOffset;
-    if (duu) duu += duuOffset;
-    if (duv) duv += duvOffset;
-    if (dvv) dvv += dvvOffset;
-
-    struct OsdPatchCoord coord = patchCoords[current];
-    struct OsdPatchArray array = patchArrayBuffer[coord.arrayIndex];
-    struct OsdPatchParam param = patchParamBuffer[coord.patchIndex];
-
-    int patchType = OsdPatchParamIsRegular(param) ? array.regDesc : array.desc;
-
-    float wP[20], wDu[20], wDv[20], wDuu[20], wDuv[20], wDvv[20];
-    int nPoints = OsdEvaluatePatchBasis(patchType, param,
-        coord.s, coord.t, wP, wDu, wDv, wDuu, wDuv, wDvv);
-
-    int indexBase = array.indexBase + array.stride *
-            (coord.patchIndex - array.primitiveIdBase);
-
-    struct Vertex v;
-    clear(&v);
-    for (int i = 0; i < nPoints; ++i) {
-        int index = patchIndexBuffer[indexBase + i];
-        addWithWeight(&v, src, index, wP[i]);
-    }
-    writeVertex(dst, current, &v);
-
-    if (du) {
-        struct Vertex vdu;
-        clear(&vdu);
-        for (int i = 0; i < nPoints; ++i) {
-            int index = patchIndexBuffer[indexBase + i];
-            addWithWeight(&vdu, src, index, wDu[i]);
-        }
-        writeVertexStride(du, current, &vdu, duStride);
-    }
-    if (dv) {
-        struct Vertex vdv;
-        clear(&vdv);
-        for (int i = 0; i < nPoints; ++i) {
-            int index = patchIndexBuffer[indexBase + i];
-            addWithWeight(&vdv, src, index, wDv[i]);
-        }
-        writeVertexStride(dv, current, &vdv, dvStride);
-    }
-    if (duu) {
-        struct Vertex vduu;
-        clear(&vduu);
-        for (int i = 0; i < nPoints; ++i) {
-            int index = patchIndexBuffer[indexBase + i];
-            addWithWeight(&vduu, src, index, wDuu[i]);
-        }
-        writeVertexStride(duu, current, &vduu, duuStride);
-    }
-    if (duv) {
-        struct Vertex vduv;
-        clear(&vduv);
-        for (int i = 0; i < nPoints; ++i) {
-            int index = patchIndexBuffer[indexBase + i];
-            addWithWeight(&vduv, src, index, wDuv[i]);
-        }
-        writeVertexStride(duv, current, &vduv, duvStride);
-    }
-    if (dvv) {
-        struct Vertex vdvv;
-        clear(&vdvv);
-        for (int i = 0; i < nPoints; ++i) {
-            int index = patchIndexBuffer[indexBase + i];
-            addWithWeight(&vdvv, src, index, wDvv[i]);
-        }
-        writeVertexStride(dvv, current, &vdvv, dvvStride);
-    }
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clPatchTable.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clPatchTable.cpp
deleted file mode 100644
index 6fec5b98f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clPatchTable.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/clPatchTable.h"
-
-#include "../far/error.h"
-#include "../far/patchTable.h"
-#include "../osd/opencl.h"
-#include "../osd/cpuPatchTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CLPatchTable::CLPatchTable() :
-    _patchArrays(NULL), _indexBuffer(NULL), _patchParamBuffer(NULL) {
-}
-
-CLPatchTable::~CLPatchTable() {
-    if (_patchArrays) clReleaseMemObject(_patchArrays);
-    if (_indexBuffer) clReleaseMemObject(_indexBuffer);
-    if (_patchParamBuffer) clReleaseMemObject(_patchParamBuffer);
-    if (_varyingPatchArrays) clReleaseMemObject(_varyingPatchArrays);
-    if (_varyingIndexBuffer) clReleaseMemObject(_varyingIndexBuffer);
-    for (int fvc=0; fvc<(int)_fvarPatchArrays.size(); ++fvc) {
-        if (_fvarPatchArrays[fvc]) clReleaseMemObject(_fvarPatchArrays[fvc]);
-    }
-    for (int fvc=0; fvc<(int)_fvarIndexBuffers.size(); ++fvc) {
-        if (_fvarIndexBuffers[fvc]) clReleaseMemObject(_fvarIndexBuffers[fvc]);
-    }
-    for (int fvc=0; fvc<(int)_fvarParamBuffers.size(); ++fvc) {
-        if (_fvarParamBuffers[fvc]) clReleaseMemObject(_fvarParamBuffers[fvc]);
-    }
-}
-
-CLPatchTable *
-CLPatchTable::Create(Far::PatchTable const *farPatchTable,
-                     cl_context clContext) {
-    CLPatchTable *instance = new CLPatchTable();
-    if (instance->allocate(farPatchTable, clContext)) return instance;
-    delete instance;
-    return 0;
-}
-
-bool
-CLPatchTable::allocate(Far::PatchTable const *farPatchTable, cl_context clContext) {
-    CpuPatchTable patchTable(farPatchTable);
-
-    size_t numPatchArrays = patchTable.GetNumPatchArrays();
-    size_t indexSize = patchTable.GetPatchIndexSize();
-    size_t patchParamSize = patchTable.GetPatchParamSize();
-
-    cl_int err = 0;
-    _patchArrays = clCreateBuffer(clContext,
-                                  CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
-                                  numPatchArrays * sizeof(Osd::PatchArray),
-                                  (void*)patchTable.GetPatchArrayBuffer(),
-                                  &err);
-    if (err != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "clCreateBuffer: %d", err);
-        return false;
-    }
-
-    _indexBuffer = clCreateBuffer(clContext,
-                                  CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
-                                  indexSize * sizeof(int),
-                                  (void*)patchTable.GetPatchIndexBuffer(),
-                                  &err);
-    if (err != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "clCreateBuffer: %d", err);
-        return false;
-    }
-
-    _patchParamBuffer = clCreateBuffer(clContext,
-                                       CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
-                                       patchParamSize * sizeof(Osd::PatchParam),
-                                       (void*)patchTable.GetPatchParamBuffer(),
-                                       &err);
-    if (err != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "clCreateBuffer: %d", err);
-        return false;
-    }
-
-    _varyingPatchArrays = clCreateBuffer(clContext,
-                                  CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
-                                  numPatchArrays * sizeof(Osd::PatchArray),
-                                  (void*)patchTable.GetVaryingPatchArrayBuffer(),
-                                  &err);
-    if (err != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "clCreateBuffer: %d", err);
-        return false;
-    }
-
-    _varyingIndexBuffer = clCreateBuffer(clContext,
-                                  CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
-                                  patchTable.GetVaryingPatchIndexSize() * sizeof(int),
-                                  (void*)patchTable.GetVaryingPatchIndexBuffer(),
-                                  &err);
-    if (err != CL_SUCCESS) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "clCreateBuffer: %d", err);
-        return false;
-    }
-
-    size_t numFVarChannels = patchTable.GetNumFVarChannels();
-    _fvarPatchArrays.resize(numFVarChannels, 0);
-    _fvarIndexBuffers.resize(numFVarChannels, 0);
-    _fvarParamBuffers.resize(numFVarChannels, 0);
-    for (int fvc=0; fvc<(int)numFVarChannels; ++fvc) {
-        _fvarPatchArrays[fvc] = clCreateBuffer(clContext,
-                                  CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
-                                  numPatchArrays * sizeof(Osd::PatchArray),
-                                  (void*)patchTable.GetFVarPatchArrayBuffer(fvc),
-                                  &err);
-        if (err != CL_SUCCESS) {
-            Far::Error(Far::FAR_RUNTIME_ERROR, "clCreateBuffer: %d", err);
-            return false;
-        }
-
-        _fvarIndexBuffers[fvc] = clCreateBuffer(clContext,
-                                  CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
-                                  patchTable.GetFVarPatchIndexSize(fvc) * sizeof(int),
-                                  (void*)patchTable.GetFVarPatchIndexBuffer(fvc),
-                                  &err);
-        if (err != CL_SUCCESS) {
-            Far::Error(Far::FAR_RUNTIME_ERROR, "clCreateBuffer: %d", err);
-            return false;
-        }
-
-        _fvarParamBuffers[fvc] = clCreateBuffer(clContext,
-                                   CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
-                                   patchTable.GetFVarPatchParamSize(fvc) * sizeof(Osd::PatchParam),
-                                   (void*)patchTable.GetFVarPatchParamBuffer(fvc),
-                                   &err);
-        if (err != CL_SUCCESS) {
-            Far::Error(Far::FAR_RUNTIME_ERROR, "clCreateBuffer: %d", err);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clPatchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clPatchTable.h
deleted file mode 100644
index 1a93ed1e4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clPatchTable.h
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CL_PATCH_TABLE_H
-#define OPENSUBDIV3_OSD_CL_PATCH_TABLE_H
-
-#include "../version.h"
-
-#include "../osd/opencl.h"
-#include "../osd/nonCopyable.h"
-#include "../osd/types.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far{
-    class PatchTable;
-};
-
-namespace Osd {
-
-/// \brief CL patch table
-///
-/// This class is a CL buffer representation of Far::PatchTable.
-///
-/// CLEvaluator consumes this table to evaluate on the patches.
-///
-///
-class CLPatchTable : private NonCopyable<CLPatchTable> {
-public:
-    /// Creator. Returns NULL if error
-    static CLPatchTable *Create(Far::PatchTable const *patchTable,
-                                cl_context clContext);
-
-    template <typename DEVICE_CONTEXT>
-    static CLPatchTable * Create(Far::PatchTable const *patchTable,
-                                 DEVICE_CONTEXT context) {
-        return Create(patchTable, context->GetContext());
-    }
-
-    /// Destructor
-    ~CLPatchTable();
-
-    /// Returns the CL memory of the array of Osd::PatchArray buffer
-    cl_mem GetPatchArrayBuffer() const { return _patchArrays; }
-
-    /// Returns the CL memory of the patch control vertices
-    cl_mem GetPatchIndexBuffer() const { return _indexBuffer; }
-
-    /// Returns the CL memory of the array of Osd::PatchParam buffer
-    cl_mem GetPatchParamBuffer() const { return _patchParamBuffer; }
-
-    /// Returns the CL memory of the array of Osd::PatchArray buffer
-    cl_mem GetVaryingPatchArrayBuffer() const { return _varyingPatchArrays; }
-
-    /// Returns the CL memory of the varying control vertices
-    cl_mem GetVaryingPatchIndexBuffer() const { return _varyingIndexBuffer; }
-
-    /// Returns the number of face-varying channel buffers
-    int GetNumFVarChannels() const { return (int)_fvarPatchArrays.size(); }
-
-    /// Returns the CL memory of the array of Osd::PatchArray buffer
-    cl_mem GetFVarPatchArrayBuffer(int fvarChannel = 0) const { return _fvarPatchArrays[fvarChannel]; }
-
-    /// Returns the CL memory of the face-varying control vertices
-    cl_mem GetFVarPatchIndexBuffer(int fvarChannel = 0) const { return _fvarIndexBuffers[fvarChannel]; }
-
-    /// Returns the CL memory of the array of Osd::PatchParam buffer
-    cl_mem GetFVarPatchParamBuffer(int fvarChannel = 0) const { return _fvarParamBuffers[fvarChannel]; }
-
-protected:
-    CLPatchTable();
-
-    bool allocate(Far::PatchTable const *patchTable, cl_context clContext);
-
-    cl_mem _patchArrays;
-    cl_mem _indexBuffer;
-    cl_mem _patchParamBuffer;
-
-    cl_mem _varyingPatchArrays;
-    cl_mem _varyingIndexBuffer;
-
-    std::vector<cl_mem> _fvarPatchArrays;
-    std::vector<cl_mem> _fvarIndexBuffers;
-    std::vector<cl_mem> _fvarParamBuffers;
-
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CL_PATCH_TABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clVertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clVertexBuffer.cpp
deleted file mode 100644
index 10a25c359..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clVertexBuffer.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/clVertexBuffer.h"
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CLVertexBuffer::CLVertexBuffer(int numElements, int numVertices,
-                                     cl_context /* clContext */)
-    : _numElements(numElements), _numVertices(numVertices), _clMemory(NULL) {
-
-}
-
-CLVertexBuffer::~CLVertexBuffer() {
-
-    clReleaseMemObject(_clMemory);
-}
-
-CLVertexBuffer *
-CLVertexBuffer::Create(int numElements, int numVertices,
-                          cl_context clContext) {
-    CLVertexBuffer *instance =
-        new CLVertexBuffer(numElements, numVertices, clContext);
-    if (instance->allocate(clContext)) return instance;
-    delete instance;
-    return NULL;
-}
-
-void
-CLVertexBuffer::UpdateData(const float *src, int startVertex, int numVertices, cl_command_queue queue,
-    cl_event* startEvents, unsigned int numStartEvents, cl_event* endEvent) {
-
-    size_t size = _numElements * numVertices * sizeof(float);
-    size_t offset = startVertex * _numElements * sizeof(float);
-
-    cl_bool blocking = (endEvent == NULL) ? CL_TRUE : CL_FALSE;
-    cl_int err = clEnqueueWriteBuffer(queue, _clMemory, blocking, offset, size, src, numStartEvents, startEvents, endEvent);
-    assert(err == CL_SUCCESS);
-}
-
-int
-CLVertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-CLVertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-cl_mem
-CLVertexBuffer::BindCLBuffer(cl_command_queue /* queue */) {
-
-    return _clMemory;
-}
-
-bool
-CLVertexBuffer::allocate(cl_context clContext) {
-    assert(clContext);
-    int size = _numVertices * _numElements * sizeof(float);
-    cl_int err;
-
-    _clMemory = clCreateBuffer(clContext, CL_MEM_READ_WRITE, size, NULL, &err);
-
-    if (err != CL_SUCCESS) return false;
-    return true;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clVertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clVertexBuffer.h
deleted file mode 100644
index e07cc04aa..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/clVertexBuffer.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CL_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_CL_VERTEX_BUFFER_H
-
-#include "../version.h"
-#include "../osd/opencl.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-///
-/// \brief Concrete vertex buffer class for OpenCL subdivision.
-///
-/// CLVertexBuffer implements CLVertexBufferInterface. An instance of this
-/// buffer class can be passed to CLEvaluator
-///
-class CLVertexBuffer {
-
-public:
-    /// Creator. Returns NULL if error.
-    static CLVertexBuffer * Create(int numElements, int numVertices, cl_context clContext);
-
-    template <typename DEVICE_CONTEXT>
-    static CLVertexBuffer * Create(int numElements, int numVertices,
-                                   DEVICE_CONTEXT context) {
-        return Create(numElements, numVertices, context->GetContext());
-    }
-
-    /// Destructor.
-    ~CLVertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide coarse
-    /// vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices, cl_command_queue clQueue, 
-        cl_event* startEvents = NULL, unsigned int numStartEvents = 0, cl_event* endEvent = NULL);
-
-    template<typename DEVICE_CONTEXT>
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    DEVICE_CONTEXT context, 
-                    cl_event* startEvents = NULL, unsigned int numStartEvents = 0, cl_event* endEvent = NULL) {
-        UpdateData(src, startVertex, numVertices, context->GetCommandQueue(), startEvents, numStartEvents, endEvent);
-    }
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns the CL memory object.
-    cl_mem BindCLBuffer(cl_command_queue queue);
-
-protected:
-    /// Constructor.
-    CLVertexBuffer(int numElements, int numVertices, cl_context clContext);
-
-    /// Allocates CL memory for this buffer.
-    /// Returns true if success.
-    bool allocate(cl_context clContext);
-
-private:
-    int _numElements;
-    int _numVertices;
-    cl_mem _clMemory;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CL_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuD3D11VertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuD3D11VertexBuffer.cpp
deleted file mode 100644
index 9fab02b72..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuD3D11VertexBuffer.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cpuD3D11VertexBuffer.h"
-#include "../far/error.h"
-
-#include <D3D11.h>
-#include <cassert>
-#include <string.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CpuD3D11VertexBuffer::CpuD3D11VertexBuffer(int numElements, int numVertices)
-    : _numElements(numElements), _numVertices(numVertices),
-      _d3d11Buffer(NULL), _cpuBuffer(NULL) {
-}
-
-CpuD3D11VertexBuffer::~CpuD3D11VertexBuffer() {
-
-    delete[] _cpuBuffer;
-
-    if (_d3d11Buffer) _d3d11Buffer->Release();
-}
-
-CpuD3D11VertexBuffer *
-CpuD3D11VertexBuffer::Create(int numElements, int numVertices,
-                             ID3D11DeviceContext *deviceContext) {
-
-    CpuD3D11VertexBuffer *instance =
-        new CpuD3D11VertexBuffer(numElements, numVertices);
-    ID3D11Device *device;
-    deviceContext->GetDevice(&device);
-    if (instance->allocate(device)) return instance;
-    delete instance;
-    return NULL;
-}
-
-void
-CpuD3D11VertexBuffer::UpdateData(const float *src, int startVertex,
-                                 int numVertices,
-                                 void * /*deviceContext*/) {
-
-    memcpy(_cpuBuffer + startVertex * _numElements, src,
-           _numElements * numVertices * sizeof(float));
-}
-
-int
-CpuD3D11VertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-CpuD3D11VertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-float*
-CpuD3D11VertexBuffer::BindCpuBuffer() {
-
-    return _cpuBuffer;
-}
-
-ID3D11Buffer *
-CpuD3D11VertexBuffer::BindD3D11Buffer(ID3D11DeviceContext *deviceContext) {
-
-    assert(deviceContext);
-
-    D3D11_MAPPED_SUBRESOURCE resource;
-    HRESULT hr = deviceContext->Map(_d3d11Buffer, 0,
-                                    D3D11_MAP_WRITE_DISCARD, 0, &resource);
-
-    if (FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "Fail to map buffer\n");
-        return NULL;
-    }
-
-    int size = _numElements * _numVertices * sizeof(float);
-
-    memcpy(resource.pData, _cpuBuffer, size);
-
-    deviceContext->Unmap(_d3d11Buffer, 0);
-
-    return _d3d11Buffer;
-}
-
-bool
-CpuD3D11VertexBuffer::allocate(ID3D11Device *device) {
-
-    _cpuBuffer = new float[_numElements * _numVertices];
-
-    // XXX: should move this constructor to factory for error handling
-    D3D11_BUFFER_DESC hBufferDesc;
-    hBufferDesc.ByteWidth = _numElements * _numVertices * sizeof(float);
-    hBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    hBufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER | D3D11_BIND_SHADER_RESOURCE;
-    hBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-    hBufferDesc.MiscFlags = 0;
-    hBufferDesc.StructureByteStride = sizeof(float);  // XXX ?
-
-    HRESULT hr;
-    hr = device->CreateBuffer(&hBufferDesc, NULL, &_d3d11Buffer);
-    if (FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                 "Fail in CreateBuffer\n");
-        return false;
-    }
-    return true;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuD3D11VertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuD3D11VertexBuffer.h
deleted file mode 100644
index d8a47c297..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuD3D11VertexBuffer.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CPU_D3D11_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_CPU_D3D11_VERTEX_BUFFER_H
-
-#include "../version.h"
-#include <cstddef>
-
-struct ID3D11Buffer;
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-///
-/// \brief Concrete vertex buffer class for Cpu subdivision and DirectX drawing.
-///
-/// CpuD3D11VertexBuffer implements CpuVertexBufferInterface and
-/// D3D11VertexBufferInterface.
-///
-/// An instance of this buffer class can be passed to CpuEvaluator.
-///
-class CpuD3D11VertexBuffer {
-public:
-    /// Creator. Returns NULL if error.
-    static CpuD3D11VertexBuffer * Create(int numElements, int numVertices,
-                                         ID3D11DeviceContext *deviceContext);
-
-    /// Destructor.
-    virtual ~CpuD3D11VertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide coarse
-    /// vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    void *deviceContext = NULL);
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns the address of CPU buffer.
-    float * BindCpuBuffer();
-
-    /// Returns the D3D11 buffer object.
-    ID3D11Buffer *BindD3D11Buffer(ID3D11DeviceContext *deviceContext);
-
-    /// Returns the D3D11 buffer object (for Osd::Mesh interface)
-    ID3D11Buffer *BindVBO(ID3D11DeviceContext *deviceContext) {
-        return BindD3D11Buffer(deviceContext);
-    }
-
-protected:
-    /// Constructor.
-    CpuD3D11VertexBuffer(int numElements, int numVertices);
-
-    bool allocate(ID3D11Device *device);
-
-private:
-    int _numElements;
-    int _numVertices;
-    ID3D11Buffer *_d3d11Buffer;
-    float *_cpuBuffer;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CPU_D3D11_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuEvaluator.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuEvaluator.cpp
deleted file mode 100644
index a5ce6978a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuEvaluator.cpp
+++ /dev/null
@@ -1,389 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cpuEvaluator.h"
-#include "../osd/cpuKernel.h"
-#include "../osd/patchBasisCommonTypes.h"
-#include "../osd/patchBasisCommon.h"
-#include "../osd/patchBasisCommonEval.h"
-
-#include <cstdlib>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-/* static */
-bool
-CpuEvaluator::EvalStencils(const float *src, BufferDescriptor const &srcDesc,
-                           float *dst,       BufferDescriptor const &dstDesc,
-                           const int * sizes,
-                           const int * offsets,
-                           const int * indices,
-                           const float * weights,
-                           int start, int end) {
-
-    if (end <= start) return true;
-    if (srcDesc.length != dstDesc.length) return false;
-
-    // XXX: we can probably expand cpuKernel.cpp to here.
-    CpuEvalStencils(src, srcDesc, dst, dstDesc,
-                    sizes, offsets, indices, weights, start, end);
-
-    return true;
-}
-
-/* static */
-bool
-CpuEvaluator::EvalStencils(const float *src, BufferDescriptor const &srcDesc,
-                           float *dst,       BufferDescriptor const &dstDesc,
-                           float *du,        BufferDescriptor const &duDesc,
-                           float *dv,        BufferDescriptor const &dvDesc,
-                           const int * sizes,
-                           const int * offsets,
-                           const int * indices,
-                           const float * weights,
-                           const float * duWeights,
-                           const float * dvWeights,
-                           int start, int end) {
-    if (end <= start) return true;
-    if (srcDesc.length != dstDesc.length) return false;
-    if (srcDesc.length != duDesc.length) return false;
-    if (srcDesc.length != dvDesc.length) return false;
-
-    CpuEvalStencils(src, srcDesc,
-                    dst, dstDesc,
-                    du,  duDesc,
-                    dv,  dvDesc,
-                    sizes, offsets, indices,
-                    weights, duWeights, dvWeights,
-                    start, end);
-
-    return true;
-}
-
-/* static */
-bool
-CpuEvaluator::EvalStencils(const float *src, BufferDescriptor const &srcDesc,
-                           float *dst,       BufferDescriptor const &dstDesc,
-                           float *du,        BufferDescriptor const &duDesc,
-                           float *dv,        BufferDescriptor const &dvDesc,
-                           float *duu,       BufferDescriptor const &duuDesc,
-                           float *duv,       BufferDescriptor const &duvDesc,
-                           float *dvv,       BufferDescriptor const &dvvDesc,
-                           const int * sizes,
-                           const int * offsets,
-                           const int * indices,
-                           const float * weights,
-                           const float * duWeights,
-                           const float * dvWeights,
-                           const float * duuWeights,
-                           const float * duvWeights,
-                           const float * dvvWeights,
-                           int start, int end) {
-    if (end <= start) return true;
-    if (srcDesc.length != dstDesc.length) return false;
-    if (srcDesc.length != duDesc.length) return false;
-    if (srcDesc.length != dvDesc.length) return false;
-    if (srcDesc.length != duuDesc.length) return false;
-    if (srcDesc.length != duvDesc.length) return false;
-    if (srcDesc.length != dvvDesc.length) return false;
-
-    CpuEvalStencils(src, srcDesc,
-                    dst, dstDesc,
-                    du,  duDesc,
-                    dv,  dvDesc,
-                    duu, duuDesc,
-                    duv, duvDesc,
-                    dvv, dvvDesc,
-                    sizes, offsets, indices,
-                    weights, duWeights, dvWeights,
-                    duuWeights, duvWeights, dvvWeights,
-                    start, end);
-
-    return true;
-}
-
-template <typename T>
-struct BufferAdapter {
-    BufferAdapter(T *p, int length, int stride) :
-        _p(p), _length(length), _stride(stride) { }
-    void Clear() {
-        for (int i = 0; i < _length; ++i) _p[i] = 0;
-    }
-    void AddWithWeight(T const *src, float w) {
-        if (_p) {
-            for (int i = 0; i < _length; ++i) {
-                _p[i] += src[i] * w;
-            }
-        }
-    }
-    const T *operator[] (int index) const {
-        return _p + _stride * index;
-    }
-    BufferAdapter<T> & operator ++() {
-        if (_p) {
-            _p += _stride;
-        }
-        return *this;
-    }
-
-    T *_p;
-    int _length;
-    int _stride;
-};
-
-/* static */
-bool
-CpuEvaluator::EvalPatches(const float *src, BufferDescriptor const &srcDesc,
-                          float *dst,       BufferDescriptor const &dstDesc,
-                          int numPatchCoords,
-                          const PatchCoord *patchCoords,
-                          const PatchArray *patchArrays,
-                          const int *patchIndexBuffer,
-                          const PatchParam *patchParamBuffer) {
-    if (src) {
-        src += srcDesc.offset;
-    } else {
-        return false;
-    }
-    if (dst) {
-        dst += dstDesc.offset;
-        if (srcDesc.length != dstDesc.length) return false;
-    } else {
-        return false;
-    }
-
-    BufferAdapter<const float> srcT(src, srcDesc.length, srcDesc.stride);
-    BufferAdapter<float>       dstT(dst, dstDesc.length, dstDesc.stride);
-
-    float wP[20];
-
-    for (int i = 0; i < numPatchCoords; ++i) {
-        PatchCoord const &coord = patchCoords[i];
-        PatchArray const &array = patchArrays[coord.handle.arrayIndex];
-
-        Osd::PatchParam const & paramStruct =
-            patchParamBuffer[coord.handle.patchIndex];
-        OsdPatchParam param = OsdPatchParamInit(
-            paramStruct.field0, paramStruct.field1, paramStruct.sharpness);
-
-        int patchType = OsdPatchParamIsRegular(param)
-            ? array.GetPatchTypeRegular()
-            : array.GetPatchTypeIrregular();
-
-        int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                coord.s, coord.t, wP, 0, 0, 0, 0, 0);
-
-        int indexBase = array.GetIndexBase() + array.GetStride() *
-                (coord.handle.patchIndex - array.GetPrimitiveIdBase());
-
-        const int *cvs = &patchIndexBuffer[indexBase];
-
-        dstT.Clear();
-        for (int j = 0; j < nPoints; ++j) {
-            dstT.AddWithWeight(srcT[cvs[j]], wP[j]);
-        }
-        ++dstT;
-    }
-    return true;
-}
-
-/* static */
-bool
-CpuEvaluator::EvalPatches(const float *src, BufferDescriptor const &srcDesc,
-                          float *dst,       BufferDescriptor const &dstDesc,
-                          float *du,        BufferDescriptor const &duDesc,
-                          float *dv,        BufferDescriptor const &dvDesc,
-                          int numPatchCoords,
-                          const PatchCoord *patchCoords,
-                          const PatchArray *patchArrays,
-                          const int *patchIndexBuffer,
-                          const PatchParam *patchParamBuffer) {
-    if (src) {
-        src += srcDesc.offset;
-    } else {
-        return false;
-    }
-    if (dst) {
-        if (srcDesc.length != dstDesc.length) return false;
-        dst += dstDesc.offset;
-    }
-    if (du) {
-        du  += duDesc.offset;
-        if (srcDesc.length != duDesc.length) return false;
-    }
-    if (dv) {
-        dv  += dvDesc.offset;
-        if (srcDesc.length != dvDesc.length) return false;
-    }
-
-    BufferAdapter<const float> srcT(src, srcDesc.length, srcDesc.stride);
-    BufferAdapter<float>       dstT(dst, dstDesc.length, dstDesc.stride);
-    BufferAdapter<float>        duT(du,  duDesc.length,  duDesc.stride);
-    BufferAdapter<float>        dvT(dv,  dvDesc.length,  dvDesc.stride);
-
-    float wP[20], wDs[20], wDt[20];
-
-    for (int i = 0; i < numPatchCoords; ++i) {
-        PatchCoord const &coord = patchCoords[i];
-        PatchArray const &array = patchArrays[coord.handle.arrayIndex];
-
-        Osd::PatchParam const & paramStruct =
-            patchParamBuffer[coord.handle.patchIndex];
-        OsdPatchParam param = OsdPatchParamInit(
-            paramStruct.field0, paramStruct.field1, paramStruct.sharpness);
-
-        int patchType = OsdPatchParamIsRegular(param)
-            ? array.GetPatchTypeRegular()
-            : array.GetPatchTypeIrregular();
-
-        int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                coord.s, coord.t, wP, wDs, wDt, 0, 0, 0);
-
-        int indexBase = array.GetIndexBase() + array.GetStride() *
-                (coord.handle.patchIndex - array.GetPrimitiveIdBase());
-
-        const int *cvs = &patchIndexBuffer[indexBase];
-
-        dstT.Clear();
-        duT.Clear();
-        dvT.Clear();
-        for (int j = 0; j < nPoints; ++j) {
-            dstT.AddWithWeight(srcT[cvs[j]], wP[j]);
-            duT.AddWithWeight (srcT[cvs[j]], wDs[j]);
-            dvT.AddWithWeight (srcT[cvs[j]], wDt[j]);
-        }
-        ++dstT;
-        ++duT;
-        ++dvT;
-    }
-    return true;
-}
-
-/* static */
-bool
-CpuEvaluator::EvalPatches(const float *src, BufferDescriptor const &srcDesc,
-                          float *dst,       BufferDescriptor const &dstDesc,
-                          float *du,        BufferDescriptor const &duDesc,
-                          float *dv,        BufferDescriptor const &dvDesc,
-                          float *duu,       BufferDescriptor const &duuDesc,
-                          float *duv,       BufferDescriptor const &duvDesc,
-                          float *dvv,       BufferDescriptor const &dvvDesc,
-                          int numPatchCoords,
-                          const PatchCoord *patchCoords,
-                          const PatchArray *patchArrays,
-                          const int *patchIndexBuffer,
-                          const PatchParam *patchParamBuffer) {
-    if (src) {
-        src += srcDesc.offset;
-    } else {
-        return false;
-    }
-    if (dst) {
-        if (srcDesc.length != dstDesc.length) return false;
-        dst += dstDesc.offset;
-    }
-    if (du) {
-        du  += duDesc.offset;
-        if (srcDesc.length != duDesc.length) return false;
-    }
-    if (dv) {
-        dv  += dvDesc.offset;
-        if (srcDesc.length != dvDesc.length) return false;
-    }
-    if (duu) {
-        duu += duuDesc.offset;
-        if (srcDesc.length != duuDesc.length) return false;
-    }
-    if (duv) {
-        duv += duvDesc.offset;
-        if (srcDesc.length != duvDesc.length) return false;
-    }
-    if (dvv) {
-        dvv += dvvDesc.offset;
-        if (srcDesc.length != dvvDesc.length) return false;
-    }
-
-    BufferAdapter<const float> srcT(src, srcDesc.length, srcDesc.stride);
-    BufferAdapter<float>       dstT(dst, dstDesc.length, dstDesc.stride);
-    BufferAdapter<float>       duT(du,   duDesc.length,  duDesc.stride);
-    BufferAdapter<float>       dvT(dv,   dvDesc.length,  dvDesc.stride);
-    BufferAdapter<float>       duuT(duu, duuDesc.length, duuDesc.stride);
-    BufferAdapter<float>       duvT(duv, duvDesc.length, duvDesc.stride);
-    BufferAdapter<float>       dvvT(dvv, dvvDesc.length, dvvDesc.stride);
-
-    float wP[20], wDu[20], wDv[20], wDuu[20], wDuv[20], wDvv[20];
-
-    for (int i = 0; i < numPatchCoords; ++i) {
-        PatchCoord const &coord = patchCoords[i];
-        PatchArray const &array = patchArrays[coord.handle.arrayIndex];
-
-        Osd::PatchParam const & paramStruct =
-            patchParamBuffer[coord.handle.patchIndex];
-        OsdPatchParam param = OsdPatchParamInit(
-            paramStruct.field0, paramStruct.field1, paramStruct.sharpness);
-
-        int patchType = OsdPatchParamIsRegular(param)
-            ? array.GetPatchTypeRegular()
-            : array.GetPatchTypeIrregular();
-
-        int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                coord.s, coord.t, wP, wDu, wDv, wDuu, wDuv, wDvv);
-
-        int indexBase = array.GetIndexBase() + array.GetStride() *
-                (coord.handle.patchIndex - array.GetPrimitiveIdBase());
-
-        const int *cvs = &patchIndexBuffer[indexBase];
-
-        dstT.Clear();
-        duT.Clear();
-        dvT.Clear();
-        duuT.Clear();
-        duvT.Clear();
-        dvvT.Clear();
-        for (int j = 0; j < nPoints; ++j) {
-            dstT.AddWithWeight(srcT[cvs[j]], wP[j]);
-            duT.AddWithWeight (srcT[cvs[j]], wDu[j]);
-            dvT.AddWithWeight (srcT[cvs[j]], wDv[j]);
-            duuT.AddWithWeight (srcT[cvs[j]], wDuu[j]);
-            duvT.AddWithWeight (srcT[cvs[j]], wDuv[j]);
-            dvvT.AddWithWeight (srcT[cvs[j]], wDvv[j]);
-        }
-        ++dstT;
-        ++duT;
-        ++dvT;
-        ++duuT;
-        ++duvT;
-        ++dvvT;
-    }
-    return true;
-}
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuEvaluator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuEvaluator.h
deleted file mode 100644
index 0c29de5be..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuEvaluator.h
+++ /dev/null
@@ -1,1241 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CPU_EVALUATOR_H
-#define OPENSUBDIV3_OSD_CPU_EVALUATOR_H
-
-#include "../version.h"
-#include "../osd/bufferDescriptor.h"
-#include "../osd/types.h"
-
-#include <cstddef>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class CpuEvaluator {
-public:
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Stencil evaluations with StencilTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic static eval stencils function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   Far::StencilTable or equivalent
-    ///
-    /// @param instance       not used in the cpu kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the cpu kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        const CpuEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        if (stencilTable->GetNumStencils() == 0)
-            return false;
-
-        return EvalStencils(srcBuffer->BindCpuBuffer(), srcDesc,
-                            dstBuffer->BindCpuBuffer(), dstDesc,
-                            &stencilTable->GetSizes()[0],
-                            &stencilTable->GetOffsets()[0],
-                            &stencilTable->GetControlIndices()[0],
-                            &stencilTable->GetWeights()[0],
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function which takes raw CPU pointers for
-    ///        input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        int start, int end);
-
-    /// \brief Generic static eval stencils function with derivatives.
-    ///        This function has a same signature as other device kernels
-    ///        have so that it can be called in the same way from OsdMesh
-    ///        template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   Far::StencilTable or equivalent
-    ///
-    /// @param instance       not used in the cpu kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the cpu kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        const CpuEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalStencils(srcBuffer->BindCpuBuffer(), srcDesc,
-                            dstBuffer->BindCpuBuffer(), dstDesc,
-                            duBuffer->BindCpuBuffer(),  duDesc,
-                            dvBuffer->BindCpuBuffer(),  dvDesc,
-                            &stencilTable->GetSizes()[0],
-                            &stencilTable->GetOffsets()[0],
-                            &stencilTable->GetControlIndices()[0],
-                            &stencilTable->GetWeights()[0],
-                            &stencilTable->GetDuWeights()[0],
-                            &stencilTable->GetDvWeights()[0],
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function with derivatives, which takes
-    ///        raw CPU pointers for input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param du             Output pointer derivative wrt u. An offset of
-    ///                       duDesc will be applied internally.
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv             Output pointer derivative wrt v. An offset of
-    ///                       dvDesc will be applied internally.
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param duWeights      pointer to the du-weights buffer of the stencil table
-    ///
-    /// @param dvWeights      pointer to the dv-weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        const float * duWeights,
-        const float * dvWeights,
-        int start, int end);
-
-    /// \brief Generic static eval stencils function with derivatives.
-    ///        This function has a same signature as other device kernels
-    ///        have so that it can be called in the same way from OsdMesh
-    ///        template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   Far::StencilTable or equivalent
-    ///
-    /// @param instance       not used in the cpu kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the cpu kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        const CpuEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalStencils(srcBuffer->BindCpuBuffer(), srcDesc,
-                            dstBuffer->BindCpuBuffer(), dstDesc,
-                            duBuffer->BindCpuBuffer(),  duDesc,
-                            dvBuffer->BindCpuBuffer(),  dvDesc,
-                            duuBuffer->BindCpuBuffer(), duuDesc,
-                            duvBuffer->BindCpuBuffer(), duvDesc,
-                            dvvBuffer->BindCpuBuffer(), dvvDesc,
-                            &stencilTable->GetSizes()[0],
-                            &stencilTable->GetOffsets()[0],
-                            &stencilTable->GetControlIndices()[0],
-                            &stencilTable->GetWeights()[0],
-                            &stencilTable->GetDuWeights()[0],
-                            &stencilTable->GetDvWeights()[0],
-                            &stencilTable->GetDuuWeights()[0],
-                            &stencilTable->GetDuvWeights()[0],
-                            &stencilTable->GetDvvWeights()[0],
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function with derivatives, which takes
-    ///        raw CPU pointers for input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param du             Output pointer derivative wrt u. An offset of
-    ///                       duDesc will be applied internally.
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv             Output pointer derivative wrt v. An offset of
-    ///                       dvDesc will be applied internally.
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duu            Output pointer 2nd derivative wrt u. An offset of
-    ///                       duuDesc will be applied internally.
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duv            Output pointer 2nd derivative wrt u and v. An offset of
-    ///                       duvDesc will be applied internally.
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvv            Output pointer 2nd derivative wrt v. An offset of
-    ///                       dvvDesc will be applied internally.
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param duWeights      pointer to the du-weights buffer of the stencil table
-    ///
-    /// @param dvWeights      pointer to the dv-weights buffer of the stencil table
-    ///
-    /// @param duuWeights     pointer to the duu-weights buffer of the stencil table
-    ///
-    /// @param duvWeights     pointer to the duv-weights buffer of the stencil table
-    ///
-    /// @param dvvWeights     pointer to the dvv-weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        float *duu,       BufferDescriptor const &duuDesc,
-        float *duv,       BufferDescriptor const &duvDesc,
-        float *dvv,       BufferDescriptor const &dvvDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        const float * duWeights,
-        const float * dvWeights,
-        const float * duuWeights,
-        const float * duvWeights,
-        const float * dvvWeights,
-        int start, int end);
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Limit evaluations with PatchTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CpuEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CpuEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        // XXX: PatchCoords is somewhat abusing vertex primvar buffer interop.
-        //      ideally all buffer classes should have templated by datatype
-        //      so that downcast isn't needed there.
-        //      (e.g. Osd::CpuBuffer<PatchCoord> )
-        //
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CpuEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        // XXX: PatchCoords is somewhat abusing vertex primvar buffer interop.
-        //      ideally all buffer classes should have templated by datatype
-        //      so that downcast isn't needed there.
-        //      (e.g. Osd::CpuBuffer<PatchCoord> )
-        //
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           duuBuffer->BindCpuBuffer(), duuDesc,
-                           duvBuffer->BindCpuBuffer(), duvDesc,
-                           dvvBuffer->BindCpuBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndexBuffer an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParamBuffer an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        const PatchCoord *patchCoords,
-        const PatchArray *patchArrays,
-        const int *patchIndexBuffer,
-        const PatchParam *patchParamBuffer);
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param du               Output pointer derivative wrt u. An offset of
-    ///                         duDesc will be applied internally.
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               Output pointer derivative wrt v. An offset of
-    ///                         dvDesc will be applied internally.
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndexBuffer an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParamBuffer an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PatchCoord const *patchCoords,
-        PatchArray const *patchArrays,
-        const int *patchIndexBuffer,
-        PatchParam const *patchParamBuffer);
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param du               Output pointer derivative wrt u. An offset of
-    ///                         duDesc will be applied internally.
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               Output pointer derivative wrt v. An offset of
-    ///                         dvDesc will be applied internally.
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duu              Output pointer 2nd derivative wrt u. An offset of
-    ///                         duuDesc will be applied internally.
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duv              Output pointer 2nd derivative wrt u and v. An offset of
-    ///                         duvDesc will be applied internally.
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvv              Output pointer 2nd derivative wrt v. An offset of
-    ///                         dvvDesc will be applied internally.
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndexBuffer an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParamBuffer an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        float *duu,       BufferDescriptor const &duuDesc,
-        float *duv,       BufferDescriptor const &duvDesc,
-        float *dvv,       BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PatchCoord const *patchCoords,
-        PatchArray const *patchArrays,
-        const int *patchIndexBuffer,
-        PatchParam const *patchParamBuffer);
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CpuEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CpuEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CpuEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           duuBuffer->BindCpuBuffer(), duuDesc,
-                           duvBuffer->BindCpuBuffer(), duvDesc,
-                           dvvBuffer->BindCpuBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        CpuEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        CpuEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        CpuEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           duuBuffer->BindCpuBuffer(), duuDesc,
-                           duvBuffer->BindCpuBuffer(), duvDesc,
-                           dvvBuffer->BindCpuBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Other methods
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief synchronize all asynchronous computation invoked on this device.
-    static void Synchronize(void * /*deviceContext = NULL*/) {
-        // nothing.
-    }
-};
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-
-#endif  // OPENSUBDIV3_OSD_CPU_EVALUATOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuGLVertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuGLVertexBuffer.cpp
deleted file mode 100644
index c504072a0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuGLVertexBuffer.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "glLoader.h"
-
-#include "../osd/cpuGLVertexBuffer.h"
-
-#include <string.h>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CpuGLVertexBuffer::CpuGLVertexBuffer(int numElements, int numVertices)
-    : _numElements(numElements), _numVertices(numVertices),
-      _vbo(0), _cpuBuffer(0), _dataDirty(true) {
-
-    // Initialize internal OpenGL loader library if necessary
-    OpenSubdiv::internal::GLLoader::libraryInitializeGL();
-}
-
-CpuGLVertexBuffer::~CpuGLVertexBuffer() {
-
-    delete[] _cpuBuffer;
-
-    if (_vbo) {
-        glDeleteBuffers(1, &_vbo);
-    }
-}
-
-CpuGLVertexBuffer *
-CpuGLVertexBuffer::Create(int numElements, int numVertices, void *) {
-    CpuGLVertexBuffer *instance =
-        new CpuGLVertexBuffer(numElements, numVertices);
-    if (instance->allocate()) return instance;
-    delete instance;
-    return NULL;
-}
-
-void
-CpuGLVertexBuffer::UpdateData(const float *src,
-                              int startVertex, int numVertices,
-                              void * /*deviceContext*/) {
-
-    memcpy(_cpuBuffer + startVertex * GetNumElements(), src,
-           GetNumElements() * numVertices * sizeof(float));
-    _dataDirty = true;
-}
-
-int
-CpuGLVertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-CpuGLVertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-float*
-CpuGLVertexBuffer::BindCpuBuffer() {
-
-    _dataDirty = true; // caller might modify data
-    return _cpuBuffer;
-}
-
-GLuint
-CpuGLVertexBuffer::BindVBO(void * /*deviceContext*/) {
-
-    if (! _dataDirty)
-        return _vbo;
-
-    int size = GetNumElements() * GetNumVertices() * (int) sizeof(float);
-
-    if (! _vbo) {
-        glGenBuffers(1, &_vbo);
-    }
-
-    glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-    glBufferData(GL_ARRAY_BUFFER, size, _cpuBuffer, GL_STATIC_DRAW);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-    _dataDirty = false;
-    return _vbo;
-}
-
-bool
-CpuGLVertexBuffer::allocate() {
-
-    _cpuBuffer = new float[GetNumElements() * GetNumVertices()];
-    _dataDirty = true;
-    return true;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuGLVertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuGLVertexBuffer.h
deleted file mode 100644
index 33bff287e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuGLVertexBuffer.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CPU_GL_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_CPU_GL_VERTEX_BUFFER_H
-
-#include "../version.h"
-
-#include <cstddef>
-#include "../osd/opengl.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-///
-/// \brief Concrete vertex buffer class for cpu subdivision and OpenGL drawing.
-///
-/// CpuGLVertexBuffer implements CpuVertexBufferInterface and
-/// GLVertexBufferInterface.
-///
-/// The buffer interop between Cpu and GL is handled automatically when a
-/// client calls BindCpuBuffer and BindVBO methods.
-///
-class CpuGLVertexBuffer {
-public:
-    /// Creator. Returns NULL if error.
-    static CpuGLVertexBuffer * Create(int numElements, int numVertices,
-                                      void *deviceContext = NULL);
-
-    /// Destructor.
-    ~CpuGLVertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide
-    /// coarse vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    void *deviceContext = NULL);
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns cpu memory. GL buffer will be mapped to cpu address
-    /// if necessary.
-    float * BindCpuBuffer();
-
-    /// Returns the name of GL buffer object. If the buffer is mapped
-    /// to cpu address, it will be unmapped back to GL.
-    GLuint BindVBO(void *deviceContext = NULL);
-
-protected:
-    /// Constructor.
-    CpuGLVertexBuffer(int numElements, int numVertices);
-
-    /// Allocates VBO for this buffer. Returns true if success.
-    bool allocate();
-
-private:
-    int _numElements;
-    int _numVertices;
-    GLuint _vbo;
-    float *_cpuBuffer;
-    bool _dataDirty;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CPU_GL_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuKernel.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuKernel.cpp
deleted file mode 100644
index 6703d38e9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuKernel.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cpuKernel.h"
-#include "../osd/bufferDescriptor.h"
-
-#include <cassert>
-#include <cmath>
-#include <cstdlib>
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-template <class T> T *
-elementAtIndex(T * src, int index, BufferDescriptor const &desc) {
-
-    return src + index * desc.stride;
-}
-
-static inline void
-clear(float *dst, BufferDescriptor const &desc) {
-
-    assert(dst);
-    memset(dst, 0, desc.length*sizeof(float));
-}
-
-static inline void
-addWithWeight(float *dst, const float *src, int srcIndex, float weight,
-              BufferDescriptor const &desc) {
-
-    assert(src && dst);
-    src = elementAtIndex(src, srcIndex, desc);
-    for (int k = 0; k < desc.length; ++k) {
-        dst[k] += src[k] * weight;
-    }
-}
-
-static inline void
-copy(float *dst, int dstIndex, const float *src, BufferDescriptor const &desc) {
-
-    assert(src && dst);
-
-    dst = elementAtIndex(dst, dstIndex, desc);
-    memcpy(dst, src, desc.length*sizeof(float));
-}
-
-void
-CpuEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                int start, int end) {
-
-    assert(start>=0 && start<end);
-
-    if (start>0) {
-        sizes += start;
-        indices += offsets[start];
-        weights += offsets[start];
-    }
-
-    src += srcDesc.offset;
-    dst += dstDesc.offset;
-
-    if (srcDesc.length == 4 && dstDesc.length == 4 &&
-        srcDesc.stride == 4 && dstDesc.stride == 4) {
-
-        // SIMD fast path for aligned primvar data (4 floats)
-        ComputeStencilKernel<4>(src, dst,
-            sizes, indices, weights, start,  end);
-
-    } else if (srcDesc.length == 8 && dstDesc.length == 8 &&
-               srcDesc.stride == 8 && dstDesc.stride == 8) {
-
-        // SIMD fast path for aligned primvar data (8 floats)
-        ComputeStencilKernel<8>(src, dst,
-            sizes, indices, weights, start,  end);
-    } else {
-
-        // Slow path for non-aligned data
-
-        float * result = (float*)alloca(srcDesc.length * sizeof(float));
-
-        int nstencils = end-start;
-        for (int i=0; i<nstencils; ++i, ++sizes) {
-
-            clear(result, srcDesc);
-
-            for (int j=0; j<*sizes; ++j) {
-                addWithWeight(result, src, *indices++, *weights++, srcDesc);
-            }
-
-            copy(dst, i, result, dstDesc);
-        }
-    }
-}
-
-void
-CpuEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                int start, int end) {
-    if (start > 0) {
-        sizes += start;
-        indices += offsets[start];
-        weights += offsets[start];
-        duWeights += offsets[start];
-        dvWeights += offsets[start];
-    }
-
-    src += srcDesc.offset;
-    dst += dstDesc.offset;
-    dstDu += dstDuDesc.offset;
-    dstDv += dstDvDesc.offset;
-
-    int nOutLength = dstDesc.length + dstDuDesc.length + dstDvDesc.length;
-    float * result   = (float*)alloca(nOutLength * sizeof(float));
-    float * resultDu = result + dstDesc.length;
-    float * resultDv = resultDu + dstDuDesc.length;
-
-    int nStencils = end - start;
-    for (int i = 0; i < nStencils; ++i, ++sizes) {
-
-        // clear
-        memset(result, 0, nOutLength * sizeof(float));
-
-        for (int j=0; j<*sizes; ++j) {
-            addWithWeight(result,   src, *indices, *weights++,   srcDesc);
-            addWithWeight(resultDu, src, *indices, *duWeights++, srcDesc);
-            addWithWeight(resultDv, src, *indices, *dvWeights++, srcDesc);
-            ++indices;
-        }
-        copy(dst,   i, result, dstDesc);
-        copy(dstDu, i, resultDu, dstDuDesc);
-        copy(dstDv, i, resultDv, dstDvDesc);
-    }
-}
-
-void
-CpuEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                float * dstDuu,    BufferDescriptor const &dstDuuDesc,
-                float * dstDuv,    BufferDescriptor const &dstDuvDesc,
-                float * dstDvv,    BufferDescriptor const &dstDvvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                float const * duuWeights,
-                float const * duvWeights,
-                float const * dvvWeights,
-                int start, int end) {
-    if (start > 0) {
-        sizes += start;
-        indices += offsets[start];
-        weights += offsets[start];
-        duWeights += offsets[start];
-        dvWeights += offsets[start];
-        duuWeights += offsets[start];
-        duvWeights += offsets[start];
-        dvvWeights += offsets[start];
-    }
-
-    src += srcDesc.offset;
-    dst += dstDesc.offset;
-    dstDu += dstDuDesc.offset;
-    dstDv += dstDvDesc.offset;
-    dstDuu += dstDuuDesc.offset;
-    dstDuv += dstDuvDesc.offset;
-    dstDvv += dstDvvDesc.offset;
-
-    int nOutLength = dstDesc.length + dstDuDesc.length + dstDvDesc.length
-                   + dstDuuDesc.length + dstDuvDesc.length + dstDvvDesc.length;
-    float * result   = (float*)alloca(nOutLength * sizeof(float));
-    float * resultDu = result + dstDesc.length;
-    float * resultDv = resultDu + dstDuDesc.length;
-    float * resultDuu = resultDv + dstDvDesc.length;
-    float * resultDuv = resultDuu + dstDuuDesc.length;
-    float * resultDvv = resultDuv + dstDuvDesc.length;
-
-    int nStencils = end - start;
-    for (int i = 0; i < nStencils; ++i, ++sizes) {
-
-        // clear
-        memset(result, 0, nOutLength * sizeof(float));
-
-        for (int j=0; j<*sizes; ++j) {
-            addWithWeight(result,   src, *indices, *weights++,   srcDesc);
-            addWithWeight(resultDu, src, *indices, *duWeights++, srcDesc);
-            addWithWeight(resultDv, src, *indices, *dvWeights++, srcDesc);
-            addWithWeight(resultDuu, src, *indices, *duuWeights++, srcDesc);
-            addWithWeight(resultDuv, src, *indices, *duvWeights++, srcDesc);
-            addWithWeight(resultDvv, src, *indices, *dvvWeights++, srcDesc);
-            ++indices;
-        }
-        copy(dst,   i, result, dstDesc);
-        copy(dstDu, i, resultDu, dstDuDesc);
-        copy(dstDv, i, resultDv, dstDvDesc);
-        copy(dstDuu, i, resultDuu, dstDuuDesc);
-        copy(dstDuv, i, resultDuv, dstDuvDesc);
-        copy(dstDvv, i, resultDvv, dstDvvDesc);
-    }
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuKernel.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuKernel.h
deleted file mode 100644
index 239f04c62..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuKernel.h
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CPU_KERNEL_H
-#define OPENSUBDIV3_OSD_CPU_KERNEL_H
-
-#include "../version.h"
-#include <cstring>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-struct BufferDescriptor;
-
-void
-CpuEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                int start, int end);
-
-void
-CpuEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                int start, int end);
-
-void
-CpuEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                float * dstDuu,    BufferDescriptor const &dstDuuDesc,
-                float * dstDuv,    BufferDescriptor const &dstDuvDesc,
-                float * dstDvv,    BufferDescriptor const &dstDvvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                float const * duuWeights,
-                float const * duvWeights,
-                float const * dvvWeights,
-                int start, int end);
-
-//
-// SIMD ICC optimization of the stencil kernel
-//
-
-#if defined ( __INTEL_COMPILER ) || defined ( __ICC )
-    #define __ALIGN_DATA __declspec(align(32))
-#else
-    #define __ALIGN_DATA
-#endif
-
-// Note : this function is re-used in the TBB Compute kernel
-template <int numElems> void
-ComputeStencilKernel(float const * vertexSrc,
-                     float * vertexDst,
-                     int const * sizes,
-                     int const * indices,
-                     float const * weights,
-                     int start,
-                     int end) {
-
-    __ALIGN_DATA float result[numElems],
-                       result1[numElems];
-
-    float const * src;
-    float * dst, weight;
-
-    for (int i=start; i<end; ++i) {
-
-        // Clear
-#if defined ( __INTEL_COMPILER ) || defined ( __ICC )
-    #pragma simd
-    #pragma vector aligned
-#endif
-        for (int k = 0; k<numElems; ++k)
-            result[k] = 0.0f;
-
-        for (int j=0; j<sizes[i]; ++j, ++indices, ++weights) {
-
-            src = vertexSrc + (*indices)*numElems;
-            weight = *weights;
-
-            // AddWithWeight
-#if defined ( __INTEL_COMPILER ) || defined ( __ICC )
-    #pragma simd
-    #pragma vector aligned
-#endif
-            for (int k=0; k<numElems; ++k) {
-                result[k] += src[k] * weight;
-            }
-        }
-
-#if defined ( __INTEL_COMPILER ) || defined ( __ICC )
-    #pragma simd
-    #pragma vector aligned
-#endif
-        for (int k=0; k<numElems; ++k) {
-            result1[k] = result[k];
-        }
-
-        dst = vertexDst + i*numElems;
-        memcpy(dst, result1, numElems*sizeof(float));
-    }
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CPU_KERNEL_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuPatchTable.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuPatchTable.cpp
deleted file mode 100644
index 96ea4e408..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuPatchTable.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cpuPatchTable.h"
-#include "../far/patchDescriptor.h"
-
-#include <iostream>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CpuPatchTable::CpuPatchTable(const Far::PatchTable *farPatchTable) {
-    int nPatchArrays = farPatchTable->GetNumPatchArrays();
-
-    // count
-    int numPatches = 0;
-    int numIndices = 0;
-    for (int j = 0; j < nPatchArrays; ++j) {
-        int nPatch = farPatchTable->GetNumPatches(j);
-        int nCV = farPatchTable->GetPatchArrayDescriptor(j).GetNumControlVertices();
-        numPatches += nPatch;
-        numIndices += nPatch * nCV;
-    }
-    _patchArrays.reserve(nPatchArrays);
-    _indexBuffer.reserve(numIndices);
-
-    _varyingPatchArrays.reserve(nPatchArrays);
-    _varyingIndexBuffer.reserve(
-        numPatches*farPatchTable->GetVaryingPatchDescriptor().GetNumControlVertices());
-
-    _fvarPatchArrays.resize(farPatchTable->GetNumFVarChannels());
-    _fvarIndexBuffers.resize(farPatchTable->GetNumFVarChannels());
-    _fvarParamBuffers.resize(farPatchTable->GetNumFVarChannels());
-    for (int fvc=0; fvc<farPatchTable->GetNumFVarChannels(); ++fvc) {
-        _fvarPatchArrays[fvc].reserve(nPatchArrays);
-        _fvarIndexBuffers[fvc].reserve(
-            numPatches * farPatchTable->GetFVarValueStride(fvc));
-        _fvarParamBuffers[fvc].reserve(numPatches);
-    }
-    _patchParamBuffer.reserve(numPatches);
-
-    // for each patchArray
-    for (int j = 0; j < nPatchArrays; ++j) {
-        int numPatchesThisArray = farPatchTable->GetNumPatches(j);
-
-        // create vertex array and append indices to buffer:
-        PatchArray patchArray(
-            farPatchTable->GetPatchArrayDescriptor(j),
-            numPatchesThisArray,
-            (int)_indexBuffer.size(), (int)_patchParamBuffer.size());
-        _patchArrays.push_back(patchArray);
-
-        Far::ConstIndexArray indices = farPatchTable->GetPatchArrayVertices(j);
-        _indexBuffer.insert(_indexBuffer.end(), indices.begin(), indices.end());
-
-        // create varying array and append indices to buffer:
-        PatchArray varyingPatchArray(
-            farPatchTable->GetVaryingPatchDescriptor(),
-            numPatchesThisArray, 
-            (int)_varyingIndexBuffer.size(), (int)_patchParamBuffer.size());
-        _varyingPatchArrays.push_back(varyingPatchArray);
-
-        Far::ConstIndexArray
-            varyingIndices = farPatchTable->GetPatchArrayVaryingVertices(j);
-        _varyingIndexBuffer.insert(_varyingIndexBuffer.end(),
-                varyingIndices.begin(), varyingIndices.end());
-
-        // create face-varying arrays for each channel:
-        for (int fvc=0; fvc<farPatchTable->GetNumFVarChannels(); ++fvc) {
-            // create face-varying array and append indices to buffer:
-            PatchArray fvarPatchArray(
-                farPatchTable->GetFVarPatchDescriptorRegular(fvc),
-                farPatchTable->GetFVarPatchDescriptorIrregular(fvc),
-                numPatchesThisArray, 
-                (int)_fvarIndexBuffers[fvc].size(), (int)_fvarParamBuffers[fvc].size());
-            _fvarPatchArrays[fvc].push_back(fvarPatchArray);
-
-            Far::ConstIndexArray
-                fvarIndices = farPatchTable->GetPatchArrayFVarValues(j, fvc);
-            _fvarIndexBuffers[fvc].insert(_fvarIndexBuffers[fvc].end(),
-                    fvarIndices.begin(), fvarIndices.end());
-
-            // append face-varying patch params (converting Far PatchParams to Osd)
-            Far::ConstPatchParamArray
-                fvarParam = farPatchTable->GetPatchArrayFVarPatchParams(j, fvc);
-
-            for (int k = 0; k < numPatchesThisArray; ++k) {
-                PatchParam param;
-                //param.patchParam = patchParamTable[patchIndex];
-                param.field0 = fvarParam[k].field0;
-                param.field1 = fvarParam[k].field1;
-                param.sharpness = 0.0f;
-                _fvarParamBuffers[fvc].push_back(param);
-            }
-        }
-
-        // patchParams bundling
-        // XXX: this process won't be needed if Far::PatchParam includes
-        // sharpness.
-#if 0
-        // XXX: we need sharpness interface for patcharray or put sharpness
-        //      into patchParam.
-        Far::ConstPatchParamArray patchParams =
-            farPatchTable->GetPatchParams(j);
-        for (int k = 0; k < patchParams.size(); ++k) {
-            float sharpness = 0.0;
-            _patchParamBuffer.push_back(patchParams[k].field0);
-            _patchParamBuffer.push_back(patchParams[k].field1);
-            _patchParamBuffer.push_back(*((unsigned int *)&sharpness));
-        }
-#else
-        // XXX: workaround. GetPatchParamTable() will be deprecated though.
-        Far::PatchParamTable const & patchParamTable =
-            farPatchTable->GetPatchParamTable();
-        std::vector<Far::Index> const &sharpnessIndexTable =
-            farPatchTable->GetSharpnessIndexTable();
-        int numPatchesJ = farPatchTable->GetNumPatches(j);
-        for (int k = 0; k < numPatchesJ; ++k) {
-            float sharpness = 0.0;
-            int patchIndex = (int)_patchParamBuffer.size();
-            if (patchIndex < (int)sharpnessIndexTable.size()) {
-                int sharpnessIndex = sharpnessIndexTable[patchIndex];
-                if (sharpnessIndex >= 0)
-                    sharpness = farPatchTable->GetSharpnessValues()[sharpnessIndex];
-            }
-            PatchParam param;
-            //param.patchParam = patchParamTable[patchIndex];
-            param.field0 = patchParamTable[patchIndex].field0;
-            param.field1 = patchParamTable[patchIndex].field1;
-            param.sharpness = sharpness;
-            _patchParamBuffer.push_back(param);
-        }
-#endif
-    }
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuPatchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuPatchTable.h
deleted file mode 100644
index 6a964f575..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuPatchTable.h
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CPU_PATCH_TABLE_H
-#define OPENSUBDIV3_OSD_CPU_PATCH_TABLE_H
-
-#include "../version.h"
-
-#include <vector>
-#include "../far/patchDescriptor.h"
-#include "../osd/nonCopyable.h"
-#include "../osd/types.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far{
-    class PatchTable;
-};
-
-namespace Osd {
-
-/// \brief Cpu patch table
-///
-/// XXX: We can use just Far::PatchTable for typical CpuEval use cases.
-///
-///  Currently this class exists because of the template resolution
-///  for the CpuEvaluator's generic interface functions
-///    (glEvalLimit example uses), and
-///  device-specific patch tables such as GLPatchTables internally use
-///  as a staging buffer to splice patcharray and interleave sharpnesses.
-///
-///  Ideally Far::PatchTables should have the same data representation
-///  and accessors so that we don't have to copy data unnecessarily.
-///
-class CpuPatchTable {
-public:
-    static CpuPatchTable *Create(const Far::PatchTable *patchTable,
-                                 void *deviceContext = NULL) {
-        (void)deviceContext;  // unused
-        return new CpuPatchTable(patchTable);
-    }
-
-    explicit CpuPatchTable(const Far::PatchTable *patchTable);
-    ~CpuPatchTable() {}
-
-    const PatchArray *GetPatchArrayBuffer() const {
-        return &_patchArrays[0];
-    }
-    const int *GetPatchIndexBuffer() const {
-        return &_indexBuffer[0];
-    }
-    const PatchParam *GetPatchParamBuffer() const {
-        return &_patchParamBuffer[0];
-    }
-
-    size_t GetNumPatchArrays() const {
-        return _patchArrays.size();
-    }
-    size_t GetPatchIndexSize() const {
-        return _indexBuffer.size();
-    }
-    size_t GetPatchParamSize() const {
-        return _patchParamBuffer.size();
-    }
-
-    const PatchArray *GetVaryingPatchArrayBuffer() const {
-        if (_varyingPatchArrays.empty()) {
-            return NULL;
-        }
-        return &_varyingPatchArrays[0];
-    }
-    const int *GetVaryingPatchIndexBuffer() const {
-        if (_varyingIndexBuffer.empty()) {
-            return NULL;
-        }
-        return &_varyingIndexBuffer[0];
-    }
-    size_t GetVaryingPatchIndexSize() const {
-        return _varyingIndexBuffer.size();
-    }
-
-    int GetNumFVarChannels() const {
-        return (int)_fvarPatchArrays.size();
-    }
-    const PatchArray *GetFVarPatchArrayBuffer(int fvarChannel = 0) const {
-        return &_fvarPatchArrays[fvarChannel][0];
-    }
-    const int *GetFVarPatchIndexBuffer(int fvarChannel = 0) const {
-        return &_fvarIndexBuffers[fvarChannel][0];
-    }
-    size_t GetFVarPatchIndexSize(int fvarChannel = 0) const {
-        return _fvarIndexBuffers[fvarChannel].size();
-    }
-    const PatchParam *GetFVarPatchParamBuffer(int fvarChannel= 0) const {
-        return &_fvarParamBuffers[fvarChannel][0];
-    }
-    size_t GetFVarPatchParamSize(int fvarChannel = 0) const {
-        return _fvarParamBuffers[fvarChannel].size();
-    }
-
-protected:
-    PatchArrayVector _patchArrays;
-    std::vector<int> _indexBuffer;
-    PatchParamVector _patchParamBuffer;
-
-    PatchArrayVector _varyingPatchArrays;
-    std::vector<int> _varyingIndexBuffer;
-
-    std::vector< PatchArrayVector > _fvarPatchArrays;
-    std::vector< std::vector<int> > _fvarIndexBuffers;
-    std::vector< PatchParamVector > _fvarParamBuffers;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CPU_PATCH_TABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuVertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuVertexBuffer.cpp
deleted file mode 100644
index 9f354da54..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuVertexBuffer.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cpuVertexBuffer.h"
-
-#include <string.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CpuVertexBuffer::CpuVertexBuffer(int numElements, int numVertices)
-    : _numElements(numElements),
-      _numVertices(numVertices),
-      _cpuBuffer(NULL) {
-
-    _cpuBuffer = new float[numElements * numVertices];
-}
-
-CpuVertexBuffer::~CpuVertexBuffer() {
-
-    delete[] _cpuBuffer;
-}
-
-CpuVertexBuffer *
-CpuVertexBuffer::Create(int numElements, int numVertices,
-                        void * /*deviceContext*/) {
-
-    return new CpuVertexBuffer(numElements, numVertices);
-}
-
-void
-CpuVertexBuffer::UpdateData(const float *src, int startVertex, int numVertices,
-                            void * /*deviceContext*/) {
-
-    memcpy(_cpuBuffer + startVertex * _numElements,
-           src, GetNumElements() * numVertices * sizeof(float));
-}
-
-int
-CpuVertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-CpuVertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-float*
-CpuVertexBuffer::BindCpuBuffer() {
-
-    return _cpuBuffer;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuVertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuVertexBuffer.h
deleted file mode 100644
index 654961754..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cpuVertexBuffer.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CPU_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_CPU_VERTEX_BUFFER_H
-
-#include "../version.h"
-
-#include <cstddef>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-/// \brief Concrete vertex buffer class for CPU subdivision.
-///
-/// CpuVertexBuffer implements the VertexBufferInterface. An instance
-/// of this buffer class can be passed to CpuEvaluator
-///
-class CpuVertexBuffer {
-public:
-    /// Creator. Returns NULL if error.
-    static CpuVertexBuffer * Create(int numElements, int numVertices,
-                                    void *deviceContext = NULL);
-
-    /// Destructor.
-    ~CpuVertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide
-    /// coarse vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    void *deviceContext = NULL);
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns the address of CPU buffer
-    float * BindCpuBuffer();
-
-protected:
-    /// Constructor.
-    CpuVertexBuffer(int numElements, int numVertices);
-
-private:
-    int _numElements;
-    int _numVertices;
-    float *_cpuBuffer;
-};
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CPU_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaD3D11VertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaD3D11VertexBuffer.cpp
deleted file mode 100644
index 52972fee0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaD3D11VertexBuffer.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cudaD3D11VertexBuffer.h"
-#include "../far/error.h"
-
-#include <D3D11.h>
-#include <cuda_runtime.h>
-#include <cuda_d3d11_interop.h>
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CudaD3D11VertexBuffer::CudaD3D11VertexBuffer(int numElements, int numVertices)
-    : _numElements(numElements), _numVertices(numVertices),
-      _d3d11Buffer(NULL), _cudaBuffer(NULL), _cudaResource(NULL) {
-}
-
-CudaD3D11VertexBuffer::~CudaD3D11VertexBuffer() {
-
-    unmap();
-    cudaGraphicsUnregisterResource(_cudaResource);
-    _d3d11Buffer->Release();
-}
-
-CudaD3D11VertexBuffer *
-CudaD3D11VertexBuffer::Create(int numElements, int numVertices,
-                              ID3D11DeviceContext *deviceContext) {
-    CudaD3D11VertexBuffer *instance =
-        new CudaD3D11VertexBuffer(numElements, numVertices);
-
-    ID3D11Device *device;
-    deviceContext->GetDevice(&device);
-    if (instance->allocate(device)) return instance;
-    delete instance;
-    return NULL;
-}
-
-void
-CudaD3D11VertexBuffer::UpdateData(const float *src,
-                                  int startVertex, int numVertices,
-                                  void * /*deviceContext*/) {
-
-    map();
-    cudaMemcpy((float*)_cudaBuffer + _numElements * startVertex,
-               src, _numElements * numVertices * sizeof(float),
-               cudaMemcpyHostToDevice);
-}
-
-int
-CudaD3D11VertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-CudaD3D11VertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-float *
-CudaD3D11VertexBuffer::BindCudaBuffer() {
-
-    map();
-    return (float*)_cudaBuffer;
-}
-
-ID3D11Buffer *
-CudaD3D11VertexBuffer::BindD3D11Buffer(ID3D11DeviceContext *deviceContext) {
-
-    unmap();
-    return _d3d11Buffer;
-}
-
-bool
-CudaD3D11VertexBuffer::allocate(ID3D11Device *device) {
-
-    D3D11_BUFFER_DESC hBufferDesc;
-    hBufferDesc.ByteWidth           = _numElements * _numVertices * sizeof(float);
-    hBufferDesc.Usage               = D3D11_USAGE_DYNAMIC;
-    hBufferDesc.BindFlags           = D3D11_BIND_VERTEX_BUFFER | D3D11_BIND_SHADER_RESOURCE;
-    hBufferDesc.CPUAccessFlags      = D3D11_CPU_ACCESS_WRITE;
-    hBufferDesc.MiscFlags           = 0;
-    hBufferDesc.StructureByteStride = sizeof(float);
-
-    HRESULT hr;
-    hr = device->CreateBuffer(&hBufferDesc, NULL, &_d3d11Buffer);
-    if(FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                 "Fail in CreateBuffer\n");
-        return false;
-    }
-    
-    // register d3d11buffer as cuda resource
-    cudaError_t err = cudaGraphicsD3D11RegisterResource(
-        &_cudaResource, _d3d11Buffer, cudaGraphicsRegisterFlagsNone);
-
-    if (err != cudaSuccess) return false;
-    return true;
-}
-
-void
-CudaD3D11VertexBuffer::map() {
-
-    if (_cudaBuffer) return;
-    size_t num_bytes;
-    void *ptr;
-    
-    cudaGraphicsMapResources(1, &_cudaResource, 0);
-    cudaGraphicsResourceGetMappedPointer(&ptr, &num_bytes, _cudaResource);
-    _cudaBuffer = ptr;
-}
-
-void
-CudaD3D11VertexBuffer::unmap() {
-    
-    if (_cudaBuffer == NULL) return;
-    cudaGraphicsUnmapResources(1, &_cudaResource, 0);
-    _cudaBuffer = NULL;
-}
-
-}  // end namespace Osd
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaD3D11VertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaD3D11VertexBuffer.h
deleted file mode 100644
index e72e63914..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaD3D11VertexBuffer.h
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CUDA_D3D11_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_CUDA_D3D11_VERTEX_BUFFER_H
-
-#include "../version.h"
-
-struct cudaGraphicsResource;
-
-struct ID3D11Buffer;
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-/// \brief Concrete vertex buffer class for cuda subdivision and D3D11 drawing.
-///
-/// CudaD3D11VertexBuffer implements CudaVertexBufferInterface and
-/// D3D11VertexBufferInterface.
-///
-/// The buffer interop between Cuda and D3D is handled automatically when a 
-/// client calls BindCudaBuffer and BindVBO methods.
-///
-class CudaD3D11VertexBuffer {
-public:
-    /// Creator. Returns NULL if error.
-    static CudaD3D11VertexBuffer * Create(int numElements,
-                                          int numVertices,
-                                          ID3D11DeviceContext *deviceContext);
-
-    /// Destructor.
-    virtual ~CudaD3D11VertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide coarse
-    /// vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    void * /*deviceContext*/);
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns cuda memory. DX buffer will be mapped to cuda resource
-    /// if necessary.
-    float * BindCudaBuffer();
-
-    /// Returns the D3D11 buffer object.
-    ID3D11Buffer *BindD3D11Buffer(ID3D11DeviceContext *deviceContext);
-
-    /// Returns the D3D11 buffer object (for Osd::Mesh interface)
-    ID3D11Buffer *BindVBO(ID3D11DeviceContext *deviceContext) {
-        return BindD3D11Buffer(deviceContext);
-    }
-
-protected:
-    /// Constructor.
-    CudaD3D11VertexBuffer(int numElements, int numVertices);
-
-    bool allocate(ID3D11Device *device);
-
-    // Acquires a cuda resource from DX11
-    void map();
-
-    // Releases a cuda resource to DX11
-    void unmap();
-
-private:
-    int _numElements;
-    int _numVertices;
-    ID3D11Buffer *_d3d11Buffer;
-    void *_cudaBuffer;
-    cudaGraphicsResource *_cudaResource;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CUDA_D3D11_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaEvaluator.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaEvaluator.cpp
deleted file mode 100644
index 57b3f9151..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaEvaluator.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cudaEvaluator.h"
-
-#include <cuda_runtime.h>
-#include <vector>
-
-#include "../far/stencilTable.h"
-#include "../osd/types.h"
-
-extern "C" {
-    void CudaEvalStencils(const float *src,
-                          float *dst,
-                          int length,
-                          int srcStride,
-                          int dstStride,
-                          const int * sizes,
-                          const int * offsets,
-                          const int * indices,
-                          const float * weights,
-                          int start,
-                          int end);
-
-    void CudaEvalPatches(
-        const float *src, float *dst,
-        int length, int srcStride, int dstStride,
-        int numPatchCoords,
-        const void *patchCoords,
-        const void *patchArrays,
-        const int *patchIndices,
-        const void *patchParams);
-
-    void CudaEvalPatchesWithDerivatives(
-        const float *src, float *dst,
-        float *du, float *dv,
-        float *duu, float *duv, float *dvv,
-        int length, int srcStride, int dstStride,
-        int duStride, int dvStride,
-        int duuStride, int duvStride, int dvvStride,
-        int numPatchCoords,
-        const void *patchCoords,
-        const void *patchArrays,
-        const int *patchIndices,
-        const void *patchParams);
-
-}
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-template <class T> void *
-createCudaBuffer(std::vector<T> const & src) {
-    if (src.empty()) {
-        return NULL;
-    }
-
-    void * devicePtr = 0;
-
-    size_t size = src.size()*sizeof(T);
-
-    cudaError_t err = cudaMalloc(&devicePtr, size);
-    if (err != cudaSuccess) {
-        return devicePtr;
-    }
-
-    err = cudaMemcpy(devicePtr, &src.at(0), size, cudaMemcpyHostToDevice);
-    if (err != cudaSuccess) {
-        cudaFree(devicePtr);
-        return 0;
-    }
-    return devicePtr;
-}
-
-// ----------------------------------------------------------------------------
-
-CudaStencilTable::CudaStencilTable(Far::StencilTable const *stencilTable) {
-    _numStencils = stencilTable->GetNumStencils();
-    if (_numStencils > 0) {
-        _sizes   = createCudaBuffer(stencilTable->GetSizes());
-        _offsets = createCudaBuffer(stencilTable->GetOffsets());
-        _indices = createCudaBuffer(stencilTable->GetControlIndices());
-        _weights = createCudaBuffer(stencilTable->GetWeights());
-        _duWeights = _dvWeights = NULL;
-        _duuWeights = _duvWeights = _dvvWeights = NULL;
-    } else {
-        _sizes = _offsets = _indices = _weights = NULL;
-        _duWeights = _dvWeights = NULL;
-        _duuWeights = _duvWeights = _dvvWeights = NULL;
-    }
-}
-
-CudaStencilTable::CudaStencilTable(Far::LimitStencilTable const *limitStencilTable) {
-    _numStencils = limitStencilTable->GetNumStencils();
-    if (_numStencils > 0) {
-        _sizes   = createCudaBuffer(limitStencilTable->GetSizes());
-        _offsets = createCudaBuffer(limitStencilTable->GetOffsets());
-        _indices = createCudaBuffer(limitStencilTable->GetControlIndices());
-        _weights = createCudaBuffer(limitStencilTable->GetWeights());
-        _duWeights = createCudaBuffer(limitStencilTable->GetDuWeights());
-        _dvWeights = createCudaBuffer(limitStencilTable->GetDvWeights());
-        _duuWeights = createCudaBuffer(limitStencilTable->GetDuuWeights());
-        _duvWeights = createCudaBuffer(limitStencilTable->GetDuvWeights());
-        _dvvWeights = createCudaBuffer(limitStencilTable->GetDvvWeights());
-    } else {
-        _sizes = _offsets = _indices = _weights = NULL;
-        _duWeights = _dvWeights = NULL;
-        _duuWeights = _duvWeights = _dvvWeights = NULL;
-    }
-}
-
-CudaStencilTable::~CudaStencilTable() {
-    if (_sizes)   cudaFree(_sizes);
-    if (_offsets) cudaFree(_offsets);
-    if (_indices) cudaFree(_indices);
-    if (_weights) cudaFree(_weights);
-    if (_duWeights) cudaFree(_duWeights);
-    if (_dvWeights) cudaFree(_dvWeights);
-    if (_duuWeights) cudaFree(_duuWeights);
-    if (_duvWeights) cudaFree(_duvWeights);
-    if (_dvvWeights) cudaFree(_dvvWeights);
-}
-
-// ---------------------------------------------------------------------------
-
-/* static */
-bool
-CudaEvaluator::EvalStencils(const float *src, BufferDescriptor const &srcDesc,
-                            float *dst,       BufferDescriptor const &dstDesc,
-                            const int * sizes,
-                            const int * offsets,
-                            const int * indices,
-                            const float * weights,
-                            int start,
-                            int end) {
-    if (dst == NULL) return false;
-
-    CudaEvalStencils(src + srcDesc.offset,
-                     dst + dstDesc.offset,
-                     srcDesc.length,
-                     srcDesc.stride,
-                     dstDesc.stride,
-                     sizes, offsets, indices, weights,
-                     start, end);
-    return true;
-}
-
-/* static */
-bool
-CudaEvaluator::EvalStencils(const float *src, BufferDescriptor const &srcDesc,
-                            float *dst,       BufferDescriptor const &dstDesc,
-                            float *du,        BufferDescriptor const &duDesc,
-                            float *dv,        BufferDescriptor const &dvDesc,
-                            const int * sizes,
-                            const int * offsets,
-                            const int * indices,
-                            const float * weights,
-                            const float * duWeights,
-                            const float * dvWeights,
-                            int start,
-                            int end) {
-    // PERFORMANCE: need to combine 3 launches together
-    if (dst) {
-        CudaEvalStencils(src + srcDesc.offset,
-                         dst + dstDesc.offset,
-                         srcDesc.length,
-                         srcDesc.stride,
-                         dstDesc.stride,
-                         sizes, offsets, indices, weights,
-                         start, end);
-    }
-    if (du) {
-        CudaEvalStencils(src + srcDesc.offset,
-                         du +  duDesc.offset,
-                         srcDesc.length,
-                         srcDesc.stride,
-                         duDesc.stride,
-                         sizes, offsets, indices, duWeights,
-                         start, end);
-    }
-    if (dv) {
-        CudaEvalStencils(src + srcDesc.offset,
-                         dv  + dvDesc.offset,
-                         srcDesc.length,
-                         srcDesc.stride,
-                         dvDesc.stride,
-                         sizes, offsets, indices, dvWeights,
-                         start, end);
-    }
-    return true;
-}
-
-/* static */
-bool
-CudaEvaluator::EvalStencils(const float *src, BufferDescriptor const &srcDesc,
-                            float *dst,       BufferDescriptor const &dstDesc,
-                            float *du,        BufferDescriptor const &duDesc,
-                            float *dv,        BufferDescriptor const &dvDesc,
-                            float *duu,       BufferDescriptor const &duuDesc,
-                            float *duv,       BufferDescriptor const &duvDesc,
-                            float *dvv,       BufferDescriptor const &dvvDesc,
-                            const int * sizes,
-                            const int * offsets,
-                            const int * indices,
-                            const float * weights,
-                            const float * duWeights,
-                            const float * dvWeights,
-                            const float * duuWeights,
-                            const float * duvWeights,
-                            const float * dvvWeights,
-                            int start,
-                            int end) {
-    // PERFORMANCE: need to combine 3 launches together
-    if (dst) {
-        CudaEvalStencils(src + srcDesc.offset,
-                         dst + dstDesc.offset,
-                         srcDesc.length,
-                         srcDesc.stride,
-                         dstDesc.stride,
-                         sizes, offsets, indices, weights,
-                         start, end);
-    }
-    if (du) {
-        CudaEvalStencils(src + srcDesc.offset,
-                         du  +  duDesc.offset,
-                         srcDesc.length,
-                         srcDesc.stride,
-                         duDesc.stride,
-                         sizes, offsets, indices, duWeights,
-                         start, end);
-    }
-    if (dv) {
-        CudaEvalStencils(src + srcDesc.offset,
-                         dv  + dvDesc.offset,
-                         srcDesc.length,
-                         srcDesc.stride,
-                         dvDesc.stride,
-                         sizes, offsets, indices, dvWeights,
-                         start, end);
-    }
-    if (duu) {
-        CudaEvalStencils(src + srcDesc.offset,
-                         duu +  duuDesc.offset,
-                         srcDesc.length,
-                         srcDesc.stride,
-                         duuDesc.stride,
-                         sizes, offsets, indices, duuWeights,
-                         start, end);
-    }
-    if (duv) {
-        CudaEvalStencils(src + srcDesc.offset,
-                         duv +  duvDesc.offset,
-                         srcDesc.length,
-                         srcDesc.stride,
-                         duvDesc.stride,
-                         sizes, offsets, indices, duvWeights,
-                         start, end);
-    }
-    if (dvv) {
-        CudaEvalStencils(src + srcDesc.offset,
-                         dvv + dvvDesc.offset,
-                         srcDesc.length,
-                         srcDesc.stride,
-                         dvvDesc.stride,
-                         sizes, offsets, indices, dvvWeights,
-                         start, end);
-    }
-    return true;
-}
-
-/* static */
-bool
-CudaEvaluator::EvalPatches(const float *src,
-                           BufferDescriptor const &srcDesc,
-                           float *dst,
-                           BufferDescriptor const &dstDesc,
-                           int numPatchCoords,
-                           const PatchCoord *patchCoords,
-                           const PatchArray *patchArrays,
-                           const int *patchIndices,
-                           const PatchParam *patchParams) {
-    if (src) src += srcDesc.offset;
-    if (dst) dst += dstDesc.offset;
-
-    CudaEvalPatches(src, dst,
-                    srcDesc.length, srcDesc.stride, dstDesc.stride,
-                    numPatchCoords, patchCoords, patchArrays, patchIndices, patchParams);
-
-    return true;
-}
-
-/* static */
-bool
-CudaEvaluator::EvalPatches(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    int numPatchCoords,
-    const PatchCoord *patchCoords,
-    const PatchArray *patchArrays,
-    const int *patchIndices,
-    const PatchParam *patchParams) {
-
-    if (src) src += srcDesc.offset;
-    if (dst) dst += dstDesc.offset;
-    if (du)  du  += duDesc.offset;
-    if (dv)  dv  += dvDesc.offset;
-
-    CudaEvalPatchesWithDerivatives(
-        src, dst, du, dv, NULL, NULL, NULL,
-        srcDesc.length, srcDesc.stride, dstDesc.stride,
-        duDesc.stride, dvDesc.stride, 0, 0, 0,
-        numPatchCoords, patchCoords, patchArrays, patchIndices, patchParams);
-    return true;
-}
-
-/* static */
-bool
-CudaEvaluator::EvalPatches(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    float *duu,       BufferDescriptor const &duuDesc,
-    float *duv,       BufferDescriptor const &duvDesc,
-    float *dvv,       BufferDescriptor const &dvvDesc,
-    int numPatchCoords,
-    const PatchCoord *patchCoords,
-    const PatchArray *patchArrays,
-    const int *patchIndices,
-    const PatchParam *patchParams) {
-
-    if (src) src += srcDesc.offset;
-    if (dst) dst += dstDesc.offset;
-    if (du)  du  += duDesc.offset;
-    if (dv)  dv  += dvDesc.offset;
-    if (duu) duu += duuDesc.offset;
-    if (duv) duv += duvDesc.offset;
-    if (dvv) dvv += dvvDesc.offset;
-
-    CudaEvalPatchesWithDerivatives(
-        src, dst, du, dv, duu, duv, dvv,
-        srcDesc.length, srcDesc.stride, dstDesc.stride,
-        duDesc.stride, dvDesc.stride,
-        duuDesc.stride, duvDesc.stride, dvvDesc.stride,
-        numPatchCoords, patchCoords, patchArrays, patchIndices, patchParams);
-    return true;
-}
-
-
-
-/* static */
-void
-CudaEvaluator::Synchronize(void * /*deviceContext*/) {
-    cudaThreadSynchronize();
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaEvaluator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaEvaluator.h
deleted file mode 100644
index bc09119f0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaEvaluator.h
+++ /dev/null
@@ -1,1273 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CUDA_EVALUATOR_H
-#define OPENSUBDIV3_OSD_CUDA_EVALUATOR_H
-
-#include "../version.h"
-
-#include <vector>
-#include "../osd/bufferDescriptor.h"
-#include "../osd/types.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-    class PatchTable;
-    class StencilTable;
-    class LimitStencilTable;
-}
-
-namespace Osd {
-
-/// \brief CUDA stencil table
-///
-/// This class is a cuda buffer representation of Far::StencilTable.
-///
-/// CudaEvaluator consumes this table to apply stencils
-///
-///
-class CudaStencilTable {
-public:
-    static CudaStencilTable *Create(Far::StencilTable const *stencilTable,
-                                    void *deviceContext = NULL) {
-        (void)deviceContext;  // unused
-        return new CudaStencilTable(stencilTable);
-    }
-    static CudaStencilTable *Create(Far::LimitStencilTable const *limitStencilTable,
-                                    void *deviceContext = NULL) {
-        (void)deviceContext;  // unused
-        return new CudaStencilTable(limitStencilTable);
-    }
-
-    explicit CudaStencilTable(Far::StencilTable const *stencilTable);
-    explicit CudaStencilTable(Far::LimitStencilTable const *limitStencilTable);
-    ~CudaStencilTable();
-
-    // interfaces needed for CudaCompute
-    void *GetSizesBuffer() const { return _sizes; }
-    void *GetOffsetsBuffer() const { return _offsets; }
-    void *GetIndicesBuffer() const { return _indices; }
-    void *GetWeightsBuffer() const { return _weights; }
-    void *GetDuWeightsBuffer() const { return _duWeights; }
-    void *GetDvWeightsBuffer() const { return _dvWeights; }
-    void *GetDuuWeightsBuffer() const { return _duuWeights; }
-    void *GetDuvWeightsBuffer() const { return _duvWeights; }
-    void *GetDvvWeightsBuffer() const { return _dvvWeights; }
-    int GetNumStencils() const { return _numStencils; }
-
-private:
-    void * _sizes,
-         * _offsets,
-         * _indices,
-         * _weights,
-         * _duWeights,
-         * _dvWeights,
-         * _duuWeights,
-         * _duvWeights,
-         * _dvvWeights;
-    int _numStencils;
-};
-
-class CudaEvaluator {
-public:
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Stencil evaluations with StencilTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic static compute function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       Cuda memory interfaces.
-    ///
-    /// @param instance       not used in the CudaEvaluator
-    ///
-    /// @param deviceContext  not used in the CudaEvaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        const void *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;  // unused
-        (void)deviceContext;  // unused
-        return EvalStencils(srcBuffer->BindCudaBuffer(), srcDesc,
-                            dstBuffer->BindCudaBuffer(), dstDesc,
-                            (int const *)stencilTable->GetSizesBuffer(),
-                            (int const *)stencilTable->GetOffsetsBuffer(),
-                            (int const *)stencilTable->GetIndicesBuffer(),
-                            (float const *)stencilTable->GetWeightsBuffer(),
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function which takes raw cuda buffers for
-    ///        input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        int start, int end);
-
-    /// \brief Generic static eval stencils function with derivatives.
-    ///        This function has a same signature as other device kernels
-    ///        have so that it can be called in the same way from OsdMesh
-    ///        template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied.
-    ///
-    /// @param instance       not used in the cuda kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the cuda kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        const CudaEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalStencils(srcBuffer->BindCudaBuffer(), srcDesc,
-                            dstBuffer->BindCudaBuffer(), dstDesc,
-                            duBuffer->BindCudaBuffer(),  duDesc,
-                            dvBuffer->BindCudaBuffer(),  dvDesc,
-                            (int const *)stencilTable->GetSizesBuffer(),
-                            (int const *)stencilTable->GetOffsetsBuffer(),
-                            (int const *)stencilTable->GetIndicesBuffer(),
-                            (float const *)stencilTable->GetWeightsBuffer(),
-                            (float const *)stencilTable->GetDuWeightsBuffer(),
-                            (float const *)stencilTable->GetDvWeightsBuffer(),
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function with derivatives, which takes
-    ///        raw cuda pointers for input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param du             Output pointer derivative wrt u. An offset of
-    ///                       duDesc will be applied internally.
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv             Output pointer derivative wrt v. An offset of
-    ///                       dvDesc will be applied internally.
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param duWeights      pointer to the du-weights buffer of the stencil table
-    ///
-    /// @param dvWeights      pointer to the dv-weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        const float * duWeights,
-        const float * dvWeights,
-        int start, int end);
-
-    /// \brief Generic static eval stencils function with derivatives.
-    ///        This function has a same signature as other device kernels
-    ///        have so that it can be called in the same way from OsdMesh
-    ///        template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCudaBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied.
-    ///
-    /// @param instance       not used in the cuda kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the cuda kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        const CudaEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalStencils(srcBuffer->BindCudaBuffer(), srcDesc,
-                            dstBuffer->BindCudaBuffer(), dstDesc,
-                            duBuffer->BindCudaBuffer(),  duDesc,
-                            dvBuffer->BindCudaBuffer(),  dvDesc,
-                            duuBuffer->BindCudaBuffer(), duuDesc,
-                            duvBuffer->BindCudaBuffer(), duvDesc,
-                            dvvBuffer->BindCudaBuffer(), dvvDesc,
-                            (int const *)stencilTable->GetSizesBuffer(),
-                            (int const *)stencilTable->GetOffsetsBuffer(),
-                            (int const *)stencilTable->GetIndicesBuffer(),
-                            (float const *)stencilTable->GetWeightsBuffer(),
-                            (float const *)stencilTable->GetDuWeightsBuffer(),
-                            (float const *)stencilTable->GetDvWeightsBuffer(),
-                            (float const *)stencilTable->GetDuuWeightsBuffer(),
-                            (float const *)stencilTable->GetDuvWeightsBuffer(),
-                            (float const *)stencilTable->GetDvvWeightsBuffer(),
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function with derivatives, which takes
-    ///        raw cuda pointers for input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param du             Output pointer derivative wrt u. An offset of
-    ///                       duDesc will be applied internally.
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv             Output pointer derivative wrt v. An offset of
-    ///                       dvDesc will be applied internally.
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duu            Output pointer 2nd derivative wrt u. An offset of
-    ///                       duuDesc will be applied internally.
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duv            Output pointer 2nd derivative wrt u and v. An offset of
-    ///                       duvDesc will be applied internally.
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvv            Output pointer 2nd derivative wrt v. An offset of
-    ///                       dvvDesc will be applied internally.
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param duWeights      pointer to the du-weights buffer of the stencil table
-    ///
-    /// @param dvWeights      pointer to the dv-weights buffer of the stencil table
-    ///
-    /// @param duuWeights     pointer to the duu-weights buffer of the stencil table
-    ///
-    /// @param duvWeights     pointer to the duv-weights buffer of the stencil table
-    ///
-    /// @param dvvWeights     pointer to the dvv-weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        float *duu,       BufferDescriptor const &duuDesc,
-        float *duv,       BufferDescriptor const &duvDesc,
-        float *dvv,       BufferDescriptor const &dvvDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        const float * duWeights,
-        const float * dvWeights,
-        const float * duuWeights,
-        const float * duvWeights,
-        const float * dvvWeights,
-        int start, int end);
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Limit evaluations with PatchTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///                         must have BindCudaBuffer() method returning an
-    ///                         array of PatchCoord struct in cuda memory.
-    ///
-    /// @param patchTable       CudaPatchTable or equivalent
-    ///
-    /// @param instance         not used in the cuda evaluator
-    ///
-    /// @param deviceContext    not used in the cuda evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CudaEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCudaBuffer(), srcDesc,
-                           dstBuffer->BindCudaBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord *)patchCoords->BindCudaBuffer(),
-                           (const PatchArray *)patchTable->GetPatchArrayBuffer(),
-                           (const int *)patchTable->GetPatchIndexBuffer(),
-                           (const PatchParam *)patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CudaPatchTable or equivalent
-    ///
-    /// @param instance         not used in the cuda evaluator
-    ///
-    /// @param deviceContext    not used in the cuda evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CudaEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCudaBuffer(), srcDesc,
-                           dstBuffer->BindCudaBuffer(), dstDesc,
-                           duBuffer->BindCudaBuffer(),  duDesc,
-                           dvBuffer->BindCudaBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord *)patchCoords->BindCudaBuffer(),
-                           (const PatchArray *)patchTable->GetPatchArrayBuffer(),
-                           (const int *)patchTable->GetPatchIndexBuffer(),
-                           (const PatchParam *)patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CudaPatchTable or equivalent
-    ///
-    /// @param instance         not used in the cuda evaluator
-    ///
-    /// @param deviceContext    not used in the cuda evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CudaEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCudaBuffer(), srcDesc,
-                           dstBuffer->BindCudaBuffer(), dstDesc,
-                           duBuffer->BindCudaBuffer(),  duDesc,
-                           dvBuffer->BindCudaBuffer(),  dvDesc,
-                           duuBuffer->BindCudaBuffer(), duuDesc,
-                           duvBuffer->BindCudaBuffer(), duvDesc,
-                           dvvBuffer->BindCudaBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord *)patchCoords->BindCudaBuffer(),
-                           (const PatchArray *)patchTable->GetPatchArrayBuffer(),
-                           (const int *)patchTable->GetPatchIndexBuffer(),
-                           (const PatchParam *)patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndices     an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParams      an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        const PatchCoord *patchCoords,
-        const PatchArray *patchArrays,
-        const int *patchIndices,
-        const PatchParam *patchParams);
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param du               Output pointer derivative wrt u. An offset of
-    ///                         duDesc will be applied internally.
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               Output pointer derivative wrt v. An offset of
-    ///                         dvDesc will be applied internally.
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndices     an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParams      an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PatchCoord const *patchCoords,
-        PatchArray const *patchArrays,
-        const int *patchIndices,
-        PatchParam const *patchParams);
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param du               Output pointer derivative wrt u. An offset of
-    ///                         duDesc will be applied internally.
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               Output pointer derivative wrt v. An offset of
-    ///                         dvDesc will be applied internally.
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duu              Output pointer 2nd derivative wrt u. An offset of
-    ///                         duuDesc will be applied internally.
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duv              Output pointer 2nd derivative wrt u and v. An offset of
-    ///                         duvDesc will be applied internally.
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvv              Output pointer 2nd derivative wrt v. An offset of
-    ///                         dvvDesc will be applied internally.
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndices     an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParams      an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        float *duu,       BufferDescriptor const &duuDesc,
-        float *duv,       BufferDescriptor const &duvDesc,
-        float *dvv,       BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PatchCoord const *patchCoords,
-        PatchArray const *patchArrays,
-        const int *patchIndices,
-        PatchParam const *patchParams);
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///                         must have BindCudaBuffer() method returning an
-    ///                         array of PatchCoord struct in cuda memory.
-    ///
-    /// @param patchTable       CudaPatchTable or equivalent
-    ///
-    /// @param instance         not used in the cuda evaluator
-    ///
-    /// @param deviceContext    not used in the cuda evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CudaEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCudaBuffer(), srcDesc,
-                           dstBuffer->BindCudaBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord *)patchCoords->BindCudaBuffer(),
-                           (const PatchArray *)patchTable->GetVaryingPatchArrayBuffer(),
-                           (const int *)patchTable->GetVaryingPatchIndexBuffer(),
-                           (const PatchParam *)patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///                         must have BindCudaBuffer() method returning an
-    ///                         array of PatchCoord struct in cuda memory.
-    ///
-    /// @param patchTable       CudaPatchTable or equivalent
-    ///
-    /// @param instance         not used in the cuda evaluator
-    ///
-    /// @param deviceContext    not used in the cuda evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CudaEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCudaBuffer(), srcDesc,
-                           dstBuffer->BindCudaBuffer(), dstDesc,
-                           duBuffer->BindCudaBuffer(), duDesc,
-                           dvBuffer->BindCudaBuffer(), dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord *)patchCoords->BindCudaBuffer(),
-                           (const PatchArray *)patchTable->GetVaryingPatchArrayBuffer(),
-                           (const int *)patchTable->GetVaryingPatchIndexBuffer(),
-                           (const PatchParam *)patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///                         must have BindCudaBuffer() method returning an
-    ///                         array of PatchCoord struct in cuda memory.
-    ///
-    /// @param patchTable       CudaPatchTable or equivalent
-    ///
-    /// @param instance         not used in the cuda evaluator
-    ///
-    /// @param deviceContext    not used in the cuda evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        CudaEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCudaBuffer(), srcDesc,
-                           dstBuffer->BindCudaBuffer(), dstDesc,
-                           duBuffer->BindCudaBuffer(), duDesc,
-                           dvBuffer->BindCudaBuffer(), dvDesc,
-                           duuBuffer->BindCudaBuffer(), duuDesc,
-                           duvBuffer->BindCudaBuffer(), duvDesc,
-                           dvvBuffer->BindCudaBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord *)patchCoords->BindCudaBuffer(),
-                           (const PatchArray *)patchTable->GetVaryingPatchArrayBuffer(),
-                           (const int *)patchTable->GetVaryingPatchIndexBuffer(),
-                           (const PatchParam *)patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///                         must have BindCudaBuffer() method returning an
-    ///                         array of PatchCoord struct in cuda memory.
-    ///
-    /// @param patchTable       CudaPatchTable or equivalent
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the cuda evaluator
-    ///
-    /// @param deviceContext    not used in the cuda evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        CudaEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        (void)instance;   // unused
-        (void)deviceContext;   // unused
-
-        return EvalPatches(srcBuffer->BindCudaBuffer(), srcDesc,
-                           dstBuffer->BindCudaBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord *)patchCoords->BindCudaBuffer(),
-                           (const PatchArray *)patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           (const int *)patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           (const PatchParam *)patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///                         must have BindCudaBuffer() method returning an
-    ///                         array of PatchCoord struct in cuda memory.
-    ///
-    /// @param patchTable       CudaPatchTable or equivalent
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the cuda evaluator
-    ///
-    /// @param deviceContext    not used in the cuda evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer, BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer, BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        CudaEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        (void)instance;   // unused
-        (void)deviceContext;   // unused
-
-        return EvalPatches(srcBuffer->BindCudaBuffer(), srcDesc,
-                           dstBuffer->BindCudaBuffer(), dstDesc,
-                           duBuffer->BindCudaBuffer(), duDesc,
-                           dvBuffer->BindCudaBuffer(), dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord *)patchCoords->BindCudaBuffer(),
-                           (const PatchArray *)patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           (const int *)patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           (const PatchParam *)patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCudaBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///                         must have BindCudaBuffer() method returning an
-    ///                         array of PatchCoord struct in cuda memory.
-    ///
-    /// @param patchTable       CudaPatchTable or equivalent
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the cuda evaluator
-    ///
-    /// @param deviceContext    not used in the cuda evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        CudaEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCudaBuffer(), srcDesc,
-                           dstBuffer->BindCudaBuffer(), dstDesc,
-                           duBuffer->BindCudaBuffer(), duDesc,
-                           dvBuffer->BindCudaBuffer(), dvDesc,
-                           duuBuffer->BindCudaBuffer(), duuDesc,
-                           duvBuffer->BindCudaBuffer(), duvDesc,
-                           dvvBuffer->BindCudaBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord *)patchCoords->BindCudaBuffer(),
-                           (const PatchArray *)patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           (const int *)patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           (const PatchParam *)patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Other methods
-    ///
-    /// ----------------------------------------------------------------------
-    static void Synchronize(void *deviceContext = NULL);
-};
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-
-#endif  // OPENSUBDIV3_OSD_CUDA_EVALUATOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaGLVertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaGLVertexBuffer.cpp
deleted file mode 100644
index 2406b7865..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaGLVertexBuffer.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "glLoader.h"
-
-#include "../osd/cudaGLVertexBuffer.h"
-#include "../far/error.h"
-
-#include <cuda_runtime.h>
-#include <cuda_gl_interop.h>
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CudaGLVertexBuffer::CudaGLVertexBuffer(int numElements, int numVertices)
-    : _numElements(numElements), _numVertices(numVertices),
-      _vbo(0), _devicePtr(0), _cudaResource(0) {
-
-    // Initialize internal OpenGL loader library if necessary
-    OpenSubdiv::internal::GLLoader::libraryInitializeGL();
-}
-
-CudaGLVertexBuffer::~CudaGLVertexBuffer() {
-
-    unmap();
-    cudaGraphicsUnregisterResource(_cudaResource);
-    glDeleteBuffers(1, &_vbo);
-}
-
-CudaGLVertexBuffer *
-CudaGLVertexBuffer::Create(int numElements, int numVertices, void *) {
-    CudaGLVertexBuffer *instance =
-        new CudaGLVertexBuffer(numElements, numVertices);
-    if (instance->allocate()) return instance;
-    Far::Error(Far::FAR_RUNTIME_ERROR, "CudaGLVertexBuffer::Create failed.\n");
-    delete instance;
-    return NULL;
-}
-
-void
-CudaGLVertexBuffer::UpdateData(const float *src,
-                               int startVertex, int numVertices,
-                               void * /*deviceContext*/) {
-
-    map();
-    cudaError_t err = cudaMemcpy((float*)_devicePtr + _numElements * startVertex,
-                                 src,
-                                 _numElements * numVertices * sizeof(float),
-                                 cudaMemcpyHostToDevice);
-    if (err != cudaSuccess)
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "CudaGLVertexBuffer::UpdateData failed. : %s\n",
-                   cudaGetErrorString(err));
-}
-
-int
-CudaGLVertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-CudaGLVertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-float *
-CudaGLVertexBuffer::BindCudaBuffer() {
-
-    map();
-    return static_cast<float*>(_devicePtr);
-}
-
-GLuint
-CudaGLVertexBuffer::BindVBO(void * /*deviceContext*/) {
-
-    unmap();
-    return _vbo;
-}
-
-bool
-CudaGLVertexBuffer::allocate() {
-
-    int size = _numElements * _numVertices * sizeof(float);
-
-
-#if defined(GL_ARB_direct_state_access)
-    if (OSD_OPENGL_HAS(ARB_direct_state_access)) {
-        glCreateBuffers(1, &_vbo);
-        glNamedBufferData(_vbo, size, 0, GL_DYNAMIC_DRAW);
-    } else
-#endif
-    {
-        GLint prev = 0;
-        glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &prev);
-        glGenBuffers(1, &_vbo);
-        glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-        glBufferData(GL_ARRAY_BUFFER, size, 0, GL_DYNAMIC_DRAW);
-        glBindBuffer(GL_ARRAY_BUFFER, prev);
-    }
-
-    // register vbo as cuda resource
-    cudaError_t err = cudaGraphicsGLRegisterBuffer(
-        &_cudaResource, _vbo, cudaGraphicsMapFlagsWriteDiscard);
-
-    if (err != cudaSuccess) return false;
-    return true;
-}
-
-void
-CudaGLVertexBuffer::map() {
-
-    if (_devicePtr) return;
-    size_t num_bytes;
-    void *ptr;
-
-    cudaError_t err = cudaGraphicsMapResources(1, &_cudaResource, 0);
-    if (err != cudaSuccess)
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "CudaGLVertexBuffer::map failed.\n%s\n",
-                   cudaGetErrorString(err));
-    err = cudaGraphicsResourceGetMappedPointer(&ptr, &num_bytes, _cudaResource);
-    if (err != cudaSuccess)
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "CudaGLVertexBuffer::map failed.\n%s\n",
-                   cudaGetErrorString(err));
-    _devicePtr = ptr;
-}
-
-void
-CudaGLVertexBuffer::unmap() {
-
-    if (_devicePtr == NULL) return;
-    cudaError_t err = cudaGraphicsUnmapResources(1, &_cudaResource, 0);
-    if (err != cudaSuccess)
-       Far::Error(Far::FAR_RUNTIME_ERROR,
-                  "CudaGLVertexBuffer::unmap failed.\n%s\n",
-                  cudaGetErrorString(err));
-    _devicePtr = NULL;
-}
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaGLVertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaGLVertexBuffer.h
deleted file mode 100644
index a71b62697..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaGLVertexBuffer.h
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CUDA_GL_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_CUDA_GL_VERTEX_BUFFER_H
-
-#include "../version.h"
-
-#include <cstddef>
-#include <cuda_runtime.h>
-
-#include "../osd/opengl.h"    // needed before cuda_gl_interop.h
-
-#include <cuda_gl_interop.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-/// \brief Concrete vertex buffer class for cuda subdivision and OpenGL drawing.
-///
-/// CudaGLVertexBuffer implements CudaVertexBufferInterface and
-/// GLVertexBufferInterface.
-///
-/// The buffer interop between Cuda and GL is handled automatically when a
-/// client calls BindCudaBuffer and BindVBO methods.
-///
-class CudaGLVertexBuffer {
-public:
-    /// Creator. Returns NULL if error.
-    static CudaGLVertexBuffer * Create(int numElements, int numVertices,
-                                       void *deviceContext = NULL);
-
-    /// Destructor.
-    ~CudaGLVertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide
-    /// coarse vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    void *deviceContext = NULL);
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns cuda memory. GL buffer will be mapped to cuda resource
-    /// if necessary.
-    float * BindCudaBuffer();
-
-    /// Returns the GL buffer object. If the buffer is mapped as a cuda
-    /// resource, it will be unmapped back to GL.
-    GLuint BindVBO(void *deviceContext = NULL);
-
-protected:
-    /// Constructor.
-    CudaGLVertexBuffer(int numElements, int numVertices);
-
-    /// Allocates VBO for this buffer and register as a cuda resource.
-    /// Returns true if success.
-    bool allocate();
-
-    /// Acquire a cuda resource from GL.
-    void map();
-
-    /// Release a cuda resource to GL.
-    void unmap();
-
-private:
-    int _numElements;
-    int _numVertices;
-    GLuint _vbo;
-    void *_devicePtr;
-    struct cudaGraphicsResource *_cudaResource;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CUDA_GL_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaKernel.cu b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaKernel.cu
deleted file mode 100644
index 910565539..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaKernel.cu
+++ /dev/null
@@ -1,427 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include <assert.h>
-#define OSD_PATCH_BASIS_CUDA
-#include "../osd/patchBasisCommonTypes.h"
-#include "../osd/patchBasisCommon.h"
-#include "../osd/patchBasisCommonEval.h"
-
-// -----------------------------------------------------------------------------
-template<int N> struct DeviceVertex {
-
-    float v[N];
-
-    __device__ void addWithWeight(DeviceVertex<N> const & src, float weight) {
-#pragma unroll
-        for(int i = 0; i < N; ++i){
-            v[i] += src.v[i] * weight;
-        }
-    }
-
-    __device__ void clear() {
-#pragma unroll
-        for(int i = 0; i < N; ++i){
-            v[i] = 0.0f;
-        }
-    }
-};
-
-// Specialize DeviceVertex for N=0 to avoid compile error:
-// "flexible array member in otherwise empty struct"
-template<> struct DeviceVertex<0> {
-    __device__ void addWithWeight(DeviceVertex<0> &src, float weight) {}
-    __device__ void clear() {}
-};
-
-// -----------------------------------------------------------------------------
-
-__device__ void clear(float *dst, int count)
-{
-    for(int i = 0; i < count; ++i) dst[i] = 0;
-}
-
-__device__ void addWithWeight(float *dst, float const *src, float weight, int count)
-{
-    for(int i = 0; i < count; ++i) dst[i] += src[i] * weight;
-}
-
-// --------------------------------------------------------------------------------------------
-
-template <int NUM_ELEMENTS> __global__ void
-computeStencils(float const * cvs, float * vbuffer,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                int start, int end) {
-
-    DeviceVertex<NUM_ELEMENTS> const * src =
-        (DeviceVertex<NUM_ELEMENTS> const *)cvs;
-
-    DeviceVertex<NUM_ELEMENTS> * verts =
-        (DeviceVertex<NUM_ELEMENTS> *)vbuffer;
-
-    int first = start + threadIdx.x + blockIdx.x*blockDim.x;
-
-    for (int i=first; i<end; i += blockDim.x * gridDim.x) {
-
-        int const * lindices = indices + offsets[i];
-        float const * lweights = weights + offsets[i];
-
-        DeviceVertex<NUM_ELEMENTS> dst;
-        dst.clear();
-
-        for (int j=0; j<sizes[i]; ++j) {
-            dst.addWithWeight(src[lindices[j]], lweights[j]);
-        }
-        verts[i] = dst;
-    }
-}
-
-__global__ void
-computeStencils(float const * cvs, float * dst,
-                int length,
-                int srcStride,
-                int dstStride,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                int start, int end) {
-
-    int first = start + threadIdx.x + blockIdx.x*blockDim.x;
-
-    for (int i=first; i<end; i += blockDim.x * gridDim.x) {
-
-        int const * lindices = indices + offsets[i];
-        float const * lweights = weights + offsets[i];
-
-        float * dstVert = dst + i*dstStride;
-        clear(dstVert, length);
-
-        for (int j=0; j<sizes[i]; ++j) {
-
-            float const * srcVert = cvs + lindices[j]*srcStride;
-
-            addWithWeight(dstVert, srcVert, lweights[j], length);
-        }
-    }
-}
-
-// -----------------------------------------------------------------------------
-
-#define USE_NVIDIA_OPTIMIZATION
-#ifdef USE_NVIDIA_OPTIMIZATION
-
-template< int NUM_ELEMENTS, int NUM_THREADS_PER_BLOCK >
-__global__ void computeStencilsNv(float const *__restrict cvs,
-                                  float * vbuffer,
-                                  int const *__restrict sizes,
-                                  int const *__restrict offsets,
-                                  int const *__restrict indices,
-                                  float const *__restrict weights,
-                                  int start,
-                                  int end)
-{
-  // Shared memory to stage indices/weights.
-  __shared__ int   smem_indices_buffer[NUM_THREADS_PER_BLOCK];
-  __shared__ float smem_weights_buffer[NUM_THREADS_PER_BLOCK];
-
-  // The size of a single warp.
-  const int WARP_SIZE = 32;
-  // The number of warps per block.
-  const int NUM_WARPS_PER_BLOCK = NUM_THREADS_PER_BLOCK / WARP_SIZE;
-  // The number of outputs computed by a single warp.
-  const int NUM_OUTPUTS_PER_WARP = WARP_SIZE / NUM_ELEMENTS;
-  // The number of outputs computed by a block of threads.
-  const int NUM_OUTPUTS_PER_BLOCK = NUM_OUTPUTS_PER_WARP*NUM_WARPS_PER_BLOCK;
-  // The number of active threads in a warp.
-  const int NUM_ACTIVE_THREADS_PER_WARP = NUM_OUTPUTS_PER_WARP * NUM_ELEMENTS;
-
-  // The number of the warp inside the block.
-  const int warpId = threadIdx.x / WARP_SIZE;
-  const int laneId = threadIdx.x % WARP_SIZE;
-
-  // We use NUM_ELEMENTS threads per output. Find which output/element a thread works on.
-  int outputIdx = warpId*NUM_OUTPUTS_PER_WARP + laneId/NUM_ELEMENTS, elementIdx = laneId%NUM_ELEMENTS;
-
-  // Each output corresponds to a section of shared memory.
-  volatile int   *smem_indices = &smem_indices_buffer[warpId*WARP_SIZE + (laneId/NUM_ELEMENTS)*NUM_ELEMENTS];
-  volatile float *smem_weights = &smem_weights_buffer[warpId*WARP_SIZE + (laneId/NUM_ELEMENTS)*NUM_ELEMENTS];
-
-  // Disable threads that have nothing to do inside the warp.
-  int i = end;
-  if( laneId < NUM_ACTIVE_THREADS_PER_WARP )
-    i = start + blockIdx.x*NUM_OUTPUTS_PER_BLOCK + outputIdx;
-
-  // Iterate over the vertices.
-  for( ; i < end ; i += gridDim.x*NUM_OUTPUTS_PER_BLOCK )
-  {
-    // Each thread computes an element of the final vertex.
-    float x = 0.f;
-
-    // Load the offset and the size for each vertex. We have NUM_THREADS_PER_VERTEX threads loading the same value.
-    const int offset_i = offsets[i], size_i = sizes[i];
-
-    // Iterate over the stencil.
-    for( int j = offset_i, j_end = offset_i+size_i ; j < j_end ; )
-    {
-      int j_it = j + elementIdx;
-
-      // Load some indices and some weights. The transaction is coalesced.
-      smem_indices[elementIdx] = j_it < j_end ? indices[j_it] : 0;
-      smem_weights[elementIdx] = j_it < j_end ? weights[j_it] : 0.f;
-
-      // Thread now collaborates to load the vertices.
-      #pragma unroll
-      for( int k = 0 ; k < NUM_ELEMENTS ; ++k, ++j )
-        if( j < j_end )
-          x += smem_weights[k] * cvs[smem_indices[k]*NUM_ELEMENTS + elementIdx];
-    }
-
-    // Store the vertex.
-    vbuffer[NUM_ELEMENTS*i + elementIdx] = x;
-  }
-}
-
-template< int NUM_THREADS_PER_BLOCK >
-__global__ void computeStencilsNv_v4(float const *__restrict cvs,
-                                     float * vbuffer,
-                                     int const *__restrict sizes,
-                                     int const *__restrict offsets,
-                                     int const *__restrict indices,
-                                     float const *__restrict weights,
-                                     int start,
-                                     int end)
-{
-  // Iterate over the vertices.
-  for( int i = start + blockIdx.x*NUM_THREADS_PER_BLOCK + threadIdx.x ; i < end ; i += gridDim.x*NUM_THREADS_PER_BLOCK )
-  {
-    // Each thread computes an element of the final vertex.
-    float4 x = make_float4(0.f, 0.f, 0.f, 0.f);
-
-    // Iterate over the stencil.
-    for( int j = offsets[i], j_end = offsets[i]+sizes[i] ; j < j_end ; ++j )
-    {
-      float w = weights[j];
-      float4 tmp = reinterpret_cast<const float4 *>(cvs)[indices[j]];
-      x.x += w*tmp.x;
-      x.y += w*tmp.y;
-      x.z += w*tmp.z;
-      x.w += w*tmp.w;
-    }
-
-    // Store the vertex.
-    reinterpret_cast<float4*>(vbuffer)[i] = x;
-  }
-}
-
-#endif // USE_NVIDIA_OPTIMIZATION
-
-// -----------------------------------------------------------------------------
-
-__global__ void
-computePatches(const float *src, float *dst,
-               float *dstDu, float *dstDv,
-               float *dstDuu, float *dstDuv, float *dstDvv,
-               int length, int srcStride, int dstStride,
-               int dstDuStride, int dstDvStride,
-               int dstDuuStride, int dstDuvStride, int dstDvvStride,
-               int numPatchCoords, const OsdPatchCoord *patchCoords,
-               const OsdPatchArray *patchArrayBuffer,
-               const int *patchIndexBuffer,
-               const OsdPatchParam *patchParamBuffer) {
-
-    int first = threadIdx.x + blockIdx.x * blockDim.x;
-
-    // PERFORMANCE: not yet optimized
-
-    for (int i = first; i < numPatchCoords; i += blockDim.x * gridDim.x) {
-
-        OsdPatchCoord const &coord = patchCoords[i];
-        int arrayIndex = coord.arrayIndex;
-        int patchIndex = coord.patchIndex;
-
-        OsdPatchArray const &array = patchArrayBuffer[arrayIndex];
-        OsdPatchParam const &param = patchParamBuffer[patchIndex];
-
-        int patchType = OsdPatchParamIsRegular(param)
-                ? array.regDesc : array.desc;
-
-        float wP[20], wDu[20], wDv[20], wDuu[20], wDuv[20], wDvv[20];
-        int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                coord.s, coord.t, wP, wDu, wDv, wDuu, wDuv, wDvv);
-
-        int indexBase = array.indexBase + array.stride *
-                (patchIndex - array.primitiveIdBase);
-
-        const int *cvs = patchIndexBuffer + indexBase;
-
-        float * dstVert = dst + i * dstStride;
-        clear(dstVert, length);
-        for (int j = 0; j < nPoints; ++j) {
-            const float * srcVert = src + cvs[j] * srcStride;
-            addWithWeight(dstVert, srcVert, wP[j], length);
-        }
-        if (dstDu) {
-            float *d = dstDu + i * dstDuStride;
-            clear(d, length);
-            for (int j = 0; j < nPoints; ++j) {
-                const float * srcVert = src + cvs[j] * srcStride;
-                addWithWeight(d, srcVert, wDu[j], length);
-            }
-        }
-        if (dstDv) {
-            float *d = dstDv + i * dstDvStride;
-            clear(d, length);
-            for (int j = 0; j < nPoints; ++j) {
-                const float * srcVert = src + cvs[j] * srcStride;
-                addWithWeight(d, srcVert, wDv[j], length);
-            }
-        }
-        if (dstDuu) {
-            float *d = dstDuu + i * dstDuuStride;
-            clear(d, length);
-            for (int j = 0; j < nPoints; ++j) {
-                const float * srcVert = src + cvs[j] * srcStride;
-                addWithWeight(d, srcVert, wDuu[j], length);
-            }
-        }
-        if (dstDuv) {
-            float *d = dstDuv + i * dstDuvStride;
-            clear(d, length);
-            for (int j = 0; j < nPoints; ++j) {
-                const float * srcVert = src + cvs[j] * srcStride;
-                addWithWeight(d, srcVert, wDuv[j], length);
-            }
-        }
-        if (dstDvv) {
-            float *d = dstDvv + i * dstDvvStride;
-            clear(d, length);
-            for (int j = 0; j < nPoints; ++j) {
-                const float * srcVert = src + cvs[j] * srcStride;
-                addWithWeight(d, srcVert, wDvv[j], length);
-            }
-        }
-    }
-}
-
-// -----------------------------------------------------------------------------
-
-#include "../version.h"
-
-#define OPT_KERNEL(NUM_ELEMENTS, KERNEL, X, Y, ARG) \
-    if (length==NUM_ELEMENTS && srcStride==length && dstStride==length) {   \
-        KERNEL<NUM_ELEMENTS><<<X,Y>>>ARG;             \
-        return;                                     \
-    }
-
-#ifdef USE_NVIDIA_OPTIMIZATION
-#define OPT_KERNEL_NVIDIA(NUM_ELEMENTS, KERNEL, X, Y, ARG) \
-    if (length==NUM_ELEMENTS && srcStride==length && dstStride==length) {   \
-        int gridDim = min(X, (end-start+Y-1)/Y); \
-        KERNEL<NUM_ELEMENTS, Y><<<gridDim, Y>>>ARG; \
-        return;                                     \
-    }
-#endif
-
-extern "C" {
-
-void CudaEvalStencils(
-    const float *src, float *dst,
-    int length, int srcStride, int dstStride,
-    const int * sizes, const int * offsets, const int * indices,
-    const float * weights,
-    int start, int end) {
-    if (length == 0 || srcStride == 0 || dstStride == 0 || (end <= start)) {
-        return;
-    }
-
-#ifdef USE_NVIDIA_OPTIMIZATION
-    OPT_KERNEL_NVIDIA(3, computeStencilsNv, 2048, 256,
-                      (src, dst, sizes, offsets, indices, weights, start, end));
-    //OPT_KERNEL_NVIDIA(4, computeStencilsNv, 2048, 256,
-    //                  (cvs, dst, sizes, offsets, indices, weights, start, end));
-    if (length == 4 && srcStride == length && dstStride == length) {
-      int gridDim = min(2048, (end-start+256-1)/256);
-      computeStencilsNv_v4<256><<<gridDim, 256>>>(
-          src, dst, sizes, offsets, indices, weights, start, end);
-      return;
-    }
-#else
-    OPT_KERNEL(3, computeStencils, 512, 32,
-               (src, dst, sizes, offsets, indices, weights, start, end));
-    OPT_KERNEL(4, computeStencils, 512, 32,
-               (src, dst, sizes, offsets, indices, weights, start, end));
-#endif
-
-    // generic case (slow)
-    computeStencils <<<512, 32>>>(
-        src, dst, length, srcStride, dstStride,
-        sizes, offsets, indices, weights, start, end);
-}
-
-// -----------------------------------------------------------------------------
-
-void CudaEvalPatches(
-    const float *src, float *dst,
-    int length, int srcStride, int dstStride,
-    int numPatchCoords, const OsdPatchCoord *patchCoords,
-    const OsdPatchArray *patchArrayBuffer,
-    const int *patchIndexBuffer,
-    const OsdPatchParam *patchParamBuffer) {
-
-    // PERFORMANCE: not optimized at all
-
-    computePatches <<<512, 32>>>(
-        src, dst, NULL, NULL, NULL, NULL, NULL,
-        length, srcStride, dstStride, 0, 0, 0, 0, 0,
-        numPatchCoords, patchCoords,
-        patchArrayBuffer, patchIndexBuffer, patchParamBuffer);
-}
-
-void CudaEvalPatchesWithDerivatives(
-    const float *src, float *dst,
-    float *dstDu, float *dstDv,
-    float *dstDuu, float *dstDuv, float *dstDvv,
-    int length, int srcStride, int dstStride,
-    int dstDuStride, int dstDvStride,
-    int dstDuuStride, int dstDuvStride, int dstDvvStride,
-    int numPatchCoords, const OsdPatchCoord *patchCoords,
-    const OsdPatchArray *patchArrayBuffer,
-    const int *patchIndexBuffer,
-    const OsdPatchParam *patchParamBuffer) {
-
-    // PERFORMANCE: not optimized at all
-
-    computePatches <<<512, 32>>>(
-        src, dst, dstDu, dstDv, dstDuu, dstDuv, dstDvv,
-        length, srcStride, dstStride,
-        dstDuStride, dstDvStride, dstDuuStride, dstDuvStride, dstDvvStride,
-        numPatchCoords, patchCoords,
-        patchArrayBuffer, patchIndexBuffer, patchParamBuffer);
-}
-
-}  /* extern "C" */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaPatchTable.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaPatchTable.cpp
deleted file mode 100644
index c1b07ccb3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaPatchTable.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cudaPatchTable.h"
-
-#include <cuda_runtime.h>
-
-#include "../far/patchTable.h"
-#include "../osd/cpuPatchTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CudaPatchTable::CudaPatchTable() :
-    _patchArrays(NULL), _indexBuffer(NULL), _patchParamBuffer(NULL),
-    _varyingPatchArrays(NULL), _varyingIndexBuffer(NULL) {
-}
-
-CudaPatchTable::~CudaPatchTable() {
-    if (_patchArrays) cudaFree(_patchArrays);
-    if (_indexBuffer) cudaFree(_indexBuffer);
-    if (_patchParamBuffer) cudaFree(_patchParamBuffer);
-    if (_varyingPatchArrays) cudaFree(_varyingPatchArrays);
-    if (_varyingIndexBuffer) cudaFree(_varyingIndexBuffer);
-    for (int fvc=0; fvc<(int)_fvarPatchArrays.size(); ++fvc) {
-        if (_fvarPatchArrays[fvc]) cudaFree(_fvarPatchArrays[fvc]);
-    }
-    for (int fvc=0; fvc<(int)_fvarIndexBuffers.size(); ++fvc) {
-        if (_fvarIndexBuffers[fvc]) cudaFree(_fvarIndexBuffers[fvc]);
-    }
-    for (int fvc=0; fvc<(int)_fvarParamBuffers.size(); ++fvc) {
-        if (_fvarParamBuffers[fvc]) cudaFree(_fvarParamBuffers[fvc]);
-    }
-}
-
-CudaPatchTable *
-CudaPatchTable::Create(Far::PatchTable const *farPatchTable,
-                       void * /*deviceContext*/) {
-    CudaPatchTable *instance = new CudaPatchTable();
-    if (instance->allocate(farPatchTable)) return instance;
-    delete instance;
-    return 0;
-}
-
-bool
-CudaPatchTable::allocate(Far::PatchTable const *farPatchTable) {
-    CpuPatchTable patchTable(farPatchTable);
-
-    size_t numPatchArrays = patchTable.GetNumPatchArrays();
-    size_t indexSize = patchTable.GetPatchIndexSize();
-    size_t patchParamSize = patchTable.GetPatchParamSize();
-
-    cudaError_t err;
-    err = cudaMalloc(&_patchArrays, numPatchArrays * sizeof(Osd::PatchArray));
-    if (err != cudaSuccess) return false;
-
-    err = cudaMalloc(&_indexBuffer, indexSize * sizeof(int));
-    if (err != cudaSuccess) return false;
-
-    err = cudaMalloc(&_patchParamBuffer, patchParamSize * sizeof(Osd::PatchParam));
-    if (err != cudaSuccess) return false;
-
-    err = cudaMalloc(&_varyingPatchArrays, numPatchArrays * sizeof(Osd::PatchArray));
-    if (err != cudaSuccess) return false;
-
-    size_t varyingIndexSize = patchTable.GetVaryingPatchIndexSize();
-    err = cudaMalloc(&_varyingIndexBuffer, varyingIndexSize * sizeof(int));
-    if (err != cudaSuccess) return false;
-
-    size_t numFVarChannels = patchTable.GetNumFVarChannels();
-    _fvarPatchArrays.resize(numFVarChannels, 0);
-    _fvarIndexBuffers.resize(numFVarChannels, 0);
-    _fvarParamBuffers.resize(numFVarChannels, 0);
-    for (int fvc=0; fvc<(int)numFVarChannels; ++fvc) {
-        err = cudaMalloc(&_fvarPatchArrays[fvc], numPatchArrays * sizeof(Osd::PatchArray));
-        if (err != cudaSuccess) return false;
-
-        err = cudaMemcpy(_fvarPatchArrays[fvc],
-                         patchTable.GetFVarPatchArrayBuffer(fvc),
-                         numPatchArrays * sizeof(Osd::PatchArray),
-                         cudaMemcpyHostToDevice);
-        if (err != cudaSuccess) return false;
-
-        size_t fvarIndexSize = patchTable.GetFVarPatchIndexSize(fvc);
-        err = cudaMalloc(&_fvarIndexBuffers[fvc], fvarIndexSize * sizeof(int));
-        if (err != cudaSuccess) return false;
-
-        err = cudaMemcpy(_fvarIndexBuffers[fvc],
-                         patchTable.GetFVarPatchIndexBuffer(fvc),
-                         fvarIndexSize * sizeof(int),
-                         cudaMemcpyHostToDevice);
-        if (err != cudaSuccess) return false;
-
-        size_t fvarParamSize = patchTable.GetFVarPatchParamSize(fvc);
-        err = cudaMalloc(&_fvarParamBuffers[fvc], fvarParamSize * sizeof(Osd::PatchParam));
-        if (err != cudaSuccess) return false;
-
-        err = cudaMemcpy(_fvarParamBuffers[fvc],
-                         patchTable.GetFVarPatchParamBuffer(fvc),
-                         patchParamSize * sizeof(PatchParam),
-                         cudaMemcpyHostToDevice);
-        if (err != cudaSuccess) return false;
-    }
-
-    // copy patch array
-    err = cudaMemcpy(_patchArrays,
-                     patchTable.GetPatchArrayBuffer(),
-                     numPatchArrays * sizeof(Osd::PatchArray),
-                     cudaMemcpyHostToDevice);
-    if (err != cudaSuccess) return false;
-
-    // copy index buffer
-    err = cudaMemcpy(_indexBuffer,
-                     patchTable.GetPatchIndexBuffer(),
-                     indexSize * sizeof(int),
-                     cudaMemcpyHostToDevice);
-    if (err != cudaSuccess) return false;
-
-    // patch param buffer
-    err = cudaMemcpy(_patchParamBuffer,
-                     patchTable.GetPatchParamBuffer(),
-                     patchParamSize * sizeof(Osd::PatchParam),
-                     cudaMemcpyHostToDevice);
-    if (err != cudaSuccess) return false;
-
-    // copy varying patch arrays and index buffer
-    err = cudaMemcpy(_varyingPatchArrays,
-                     patchTable.GetVaryingPatchArrayBuffer(),
-                     numPatchArrays * sizeof(Osd::PatchArray),
-                     cudaMemcpyHostToDevice);
-    if (err != cudaSuccess) return false;
-    err = cudaMemcpy(_varyingIndexBuffer,
-                     patchTable.GetVaryingPatchIndexBuffer(),
-                     varyingIndexSize * sizeof(int),
-                     cudaMemcpyHostToDevice);
-    if (err != cudaSuccess) return false;
-
-    return true;
-}
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaPatchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaPatchTable.h
deleted file mode 100644
index b7d069c85..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaPatchTable.h
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CUDA_PATCH_TABLE_H
-#define OPENSUBDIV3_OSD_CUDA_PATCH_TABLE_H
-
-#include "../version.h"
-
-#include "../osd/nonCopyable.h"
-#include "../osd/types.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far{
-    class PatchTable;
-};
-
-namespace Osd {
-
-/// \brief CUDA patch table
-///
-/// This class is a cuda buffer representation of Far::PatchTable.
-///
-/// CudaEvaluator consumes this table to evaluate on the patches.
-///
-///
-class CudaPatchTable : private NonCopyable<CudaPatchTable> {
-public:
-    /// Creator. Returns NULL if error
-    static CudaPatchTable *Create(Far::PatchTable const *patchTable,
-                                  void *deviceContext = NULL);
-    /// Destructor
-    ~CudaPatchTable();
-
-    /// Returns the cuda memory of the array of Osd::PatchArray buffer
-    void *GetPatchArrayBuffer() const { return _patchArrays; }
-
-    /// Returns the cuda memory of the patch control vertices
-    void *GetPatchIndexBuffer() const { return _indexBuffer; }
-
-    /// Returns the cuda memory of the array of Osd::PatchParam buffer
-    void *GetPatchParamBuffer() const { return _patchParamBuffer; }
-
-    /// Returns the cuda memory of the array of Osd::PatchArray buffer
-    void *GetVaryingPatchArrayBuffer() const {
-        return _varyingPatchArrays;
-    }
-    /// Returns the cuda memory of the array of varying control vertices
-    void *GetVaryingPatchIndexBuffer() const {
-        return _varyingIndexBuffer;
-    }
-
-    /// Returns the number of face-varying channels buffers
-    int GetNumFVarChannels() const { return (int)_fvarPatchArrays.size(); }
-
-    /// Returns the cuda memory of the array of Osd::PatchArray buffer
-    void *GetFVarPatchArrayBuffer(int fvarChannel) const {
-        return _fvarPatchArrays[fvarChannel];
-    }
-
-    /// Returns the cuda memory of the array of face-varying control vertices
-    void *GetFVarPatchIndexBuffer(int fvarChannel = 0) const {
-        return _fvarIndexBuffers[fvarChannel];
-    }
-
-    /// Returns the cuda memory of the array of face-varying param
-    void *GetFVarPatchParamBuffer(int fvarChannel = 0) const {
-        return _fvarParamBuffers[fvarChannel];
-    }
-
-protected:
-    CudaPatchTable();
-
-    bool allocate(Far::PatchTable const *patchTable);
-
-    void *_patchArrays;
-    void *_indexBuffer;
-    void *_patchParamBuffer;
-
-    void *_varyingPatchArrays;
-    void *_varyingIndexBuffer;
-
-    std::vector<void *> _fvarPatchArrays;
-    std::vector<void *> _fvarIndexBuffers;
-    std::vector<void *> _fvarParamBuffers;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CUDA_PATCH_TABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaVertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaVertexBuffer.cpp
deleted file mode 100644
index 38ac62db0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaVertexBuffer.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cudaVertexBuffer.h"
-
-#include <cuda_runtime.h>
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CudaVertexBuffer::CudaVertexBuffer(int numElements, int numVertices)
-    : _numElements(numElements),
-      _numVertices(numVertices),
-      _cudaMem(0) {
-}
-
-CudaVertexBuffer::~CudaVertexBuffer() {
-    if (_cudaMem) cudaFree(_cudaMem);
-}
-
-CudaVertexBuffer *
-CudaVertexBuffer::Create(int numElements, int numVertices,
-                         void * /*deviceContext */) {
-    CudaVertexBuffer *instance =
-        new CudaVertexBuffer(numElements, numVertices);
-    if (instance->allocate()) return instance;
-    delete instance;
-    return NULL;
-}
-
-void
-CudaVertexBuffer::UpdateData(const float *src, int startVertex, int numVertices,
-                             void * /*deviceContext*/) {
-
-    size_t size = _numElements * numVertices * sizeof(float);
-
-    cudaMemcpy((float*)_cudaMem + _numElements * startVertex,
-               src, size, cudaMemcpyHostToDevice);
-}
-
-int
-CudaVertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-CudaVertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-float *
-CudaVertexBuffer::BindCudaBuffer() {
-
-    return static_cast<float*>(_cudaMem);
-}
-
-bool
-CudaVertexBuffer::allocate() {
-    int size = _numElements * _numVertices * sizeof(float);
-
-    cudaError_t err = cudaMalloc(&_cudaMem, size);
-
-    if (err != cudaSuccess) return false;
-    return true;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaVertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaVertexBuffer.h
deleted file mode 100644
index e826f061a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/cudaVertexBuffer.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_CUDA_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_CUDA_VERTEX_BUFFER_H
-
-#include "../version.h"
-
-#include <cstddef>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-/// \brief Concrete vertex buffer class for Cuda subdivision.
-///
-/// CudaVertexBuffer implements CudaVertexBufferInterface.
-/// An instance of this buffer class can be passed to CudaEvaluator
-///
-class CudaVertexBuffer {
-
-public:
-    /// Creator. Returns NULL if error.
-    static CudaVertexBuffer * Create(int numElements, int numVertices,
-                                     void *deviceContext = NULL);
-
-    /// Destructor.
-    ~CudaVertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide coarse
-    /// vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    void *deviceContext=NULL);
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns cuda memory.
-    float * BindCudaBuffer();
-
-protected:
-    /// Constructor.
-    CudaVertexBuffer(int numElements, int numVertices);
-
-    /// Allocates Cuda memory for this buffer.
-    /// Returns true if success.
-    bool allocate();
-
-private:
-    int _numElements;
-    int _numVertices;
-    void *_cudaMem;
-
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_CUDA_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11ComputeEvaluator.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11ComputeEvaluator.cpp
deleted file mode 100644
index e95ea72ea..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11ComputeEvaluator.cpp
+++ /dev/null
@@ -1,398 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/d3d11ComputeEvaluator.h"
-
-#include <cassert>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#define INITGUID        // for IID_ID3D11ShaderReflection
-#include <D3D11.h>
-#include <D3D11shader.h>
-#include <D3Dcompiler.h>
-
-#include "../far/error.h"
-#include "../far/stencilTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
-
-static const char *shaderSource =
-#include "../osd/hlslComputeKernel.gen.h"
-;
-
-// ----------------------------------------------------------------------------
-
-// must match constant buffer declaration in hlslComputeKernel.hlsl
-__declspec(align(16))
-
-struct KernelUniformArgs {
-
-    int start;     // batch
-    int end;
-
-    int srcOffset;
-    int dstOffset;
-};
-
-// ----------------------------------------------------------------------------
-
-template <typename T>
-static ID3D11Buffer *createBuffer(std::vector<T> const &src,
-                                  ID3D11Device *device) {
-
-    size_t size = src.size()*sizeof(T);
-
-    ID3D11Buffer *buffer = NULL;
-    D3D11_BUFFER_DESC bd;
-    bd.ByteWidth = (unsigned int)size;
-    bd.Usage = D3D11_USAGE_IMMUTABLE;
-    bd.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-    bd.CPUAccessFlags = 0;
-    bd.MiscFlags = 0;
-    bd.StructureByteStride = 0;
-
-    D3D11_SUBRESOURCE_DATA initData;
-    initData.pSysMem = &src.at(0);
-
-    HRESULT hr = device->CreateBuffer(&bd, &initData, &buffer);
-    if (FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "Error creating compute table buffer\n");
-        return NULL;
-    }
-    return buffer;
-}
-
-static ID3D11ShaderResourceView *createSRV(ID3D11Buffer *buffer,
-                                           DXGI_FORMAT format,
-                                           ID3D11Device *device,
-                                           size_t size) {
-    ID3D11ShaderResourceView *srv = NULL;
-    D3D11_SHADER_RESOURCE_VIEW_DESC srvd;
-    ZeroMemory(&srvd, sizeof(srvd));
-    srvd.Format = format;
-    srvd.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
-    srvd.Buffer.FirstElement = 0;
-    srvd.Buffer.NumElements = (unsigned int)size;
-
-    HRESULT hr = device->CreateShaderResourceView(buffer, &srvd, &srv);
-    if (FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "Error creating compute table shader resource view\n");
-        return NULL;
-    }
-    return srv;
-}
-
-D3D11StencilTable::D3D11StencilTable(Far::StencilTable const *stencilTable,
-                                     ID3D11DeviceContext *deviceContext)
- {
-    ID3D11Device *device = NULL;
-    deviceContext->GetDevice(&device);
-    assert(device);
-
-    _numStencils = stencilTable->GetNumStencils();
-    if (_numStencils > 0) {
-        std::vector<int> const &sizes = stencilTable->GetSizes();
-
-        _sizesBuffer   = createBuffer(sizes, device);
-        _offsetsBuffer = createBuffer(stencilTable->GetOffsets(), device);
-        _indicesBuffer = createBuffer(stencilTable->GetControlIndices(), device);
-        _weightsBuffer = createBuffer(stencilTable->GetWeights(), device);
-
-        _sizes   = createSRV(_sizesBuffer,   DXGI_FORMAT_R32_SINT, device,
-                             stencilTable->GetSizes().size());
-        _offsets = createSRV(_offsetsBuffer, DXGI_FORMAT_R32_SINT, device,
-                             stencilTable->GetOffsets().size());
-        _indices = createSRV(_indicesBuffer, DXGI_FORMAT_R32_SINT, device,
-                             stencilTable->GetControlIndices().size());
-        _weights= createSRV(_weightsBuffer, DXGI_FORMAT_R32_FLOAT, device,
-                            stencilTable->GetWeights().size());
-    } else {
-        _sizes = _offsets = _indices = _weights = NULL;
-        _sizesBuffer = _offsetsBuffer = _indicesBuffer = _weightsBuffer = NULL;
-    }
-}
-
-D3D11StencilTable::~D3D11StencilTable() {
-    SAFE_RELEASE(_sizes);
-    SAFE_RELEASE(_sizesBuffer);
-    SAFE_RELEASE(_offsets);
-    SAFE_RELEASE(_offsetsBuffer);
-    SAFE_RELEASE(_indices);
-    SAFE_RELEASE(_indicesBuffer);
-    SAFE_RELEASE(_weights);
-    SAFE_RELEASE(_weightsBuffer);
-}
-
-// ---------------------------------------------------------------------------
-
-
-D3D11ComputeEvaluator::D3D11ComputeEvaluator() :
-    _computeShader(NULL),
-    _classLinkage(NULL),
-    _singleBufferKernel(NULL),
-    _separateBufferKernel(NULL),
-    _uniformArgs(NULL),
-    _workGroupSize(64) {
-
-}
-
-D3D11ComputeEvaluator *
-D3D11ComputeEvaluator::Create(BufferDescriptor const &srcDesc,
-                              BufferDescriptor const &dstDesc,
-                              BufferDescriptor const &duDesc,
-                              BufferDescriptor const &dvDesc,
-                              ID3D11DeviceContext *deviceContext) {
-    return Create(srcDesc, dstDesc, duDesc, dvDesc,
-                  BufferDescriptor(),
-                  BufferDescriptor(),
-                  BufferDescriptor(),
-                  deviceContext);
-}
-
-D3D11ComputeEvaluator *
-D3D11ComputeEvaluator::Create(BufferDescriptor const &srcDesc,
-                              BufferDescriptor const &dstDesc,
-                              BufferDescriptor const &duDesc,
-                              BufferDescriptor const &dvDesc,
-                              BufferDescriptor const &duuDesc,
-                              BufferDescriptor const &duvDesc,
-                              BufferDescriptor const &dvvDesc,
-                              ID3D11DeviceContext *deviceContext) {
-    (void)deviceContext;  // not used
-
-    // TODO: implements derivatives
-    (void)duDesc;
-    (void)dvDesc;
-
-    D3D11ComputeEvaluator *instance = new D3D11ComputeEvaluator();
-    if (instance->Compile(srcDesc, dstDesc, deviceContext)) return instance;
-    delete instance;
-    return NULL;
-}
-
-D3D11ComputeEvaluator::~D3D11ComputeEvaluator() {
-    SAFE_RELEASE(_computeShader);
-    SAFE_RELEASE(_classLinkage);
-    SAFE_RELEASE(_singleBufferKernel);
-    SAFE_RELEASE(_separateBufferKernel);
-    SAFE_RELEASE(_uniformArgs);
-}
-
-bool
-D3D11ComputeEvaluator::Compile(BufferDescriptor const &srcDesc,
-                               BufferDescriptor const &dstDesc,
-                               ID3D11DeviceContext *deviceContext) {
-
-    if (srcDesc.length > dstDesc.length) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                   "srcDesc length must be less than or equal to "
-                   "dstDesc length.\n");
-        return false;
-    }
-
-    DWORD dwShaderFlags = D3DCOMPILE_ENABLE_STRICTNESS;
-#if defined(D3D10_SHADER_RESOURCES_MAY_ALIAS)
-     dwShaderFlags |= D3D10_SHADER_RESOURCES_MAY_ALIAS;
-#endif
-
-#ifdef _DEBUG
-    dwShaderFlags |= D3DCOMPILE_DEBUG;
-#endif
-
-    std::ostringstream ss;
-    ss << srcDesc.length;  std::string lengthValue(ss.str()); ss.str("");
-    ss << srcDesc.stride;  std::string srcStrideValue(ss.str()); ss.str("");
-    ss << dstDesc.stride;  std::string dstStrideValue(ss.str()); ss.str("");
-    ss << _workGroupSize;  std::string workgroupSizeValue(ss.str()); ss.str("");
-
-    D3D_SHADER_MACRO defines[] =
-        { { "LENGTH", lengthValue.c_str() },
-          { "SRC_STRIDE", srcStrideValue.c_str() },
-          { "DST_STRIDE", dstStrideValue.c_str() },
-          { "WORK_GROUP_SIZE", workgroupSizeValue.c_str() },
-          { 0, 0 } };
-
-    ID3DBlob * computeShaderBuffer = NULL;
-    ID3DBlob * errorBuffer = NULL;
-
-    HRESULT hr = D3DCompile(shaderSource, strlen(shaderSource),
-                            NULL, &defines[0], NULL,
-                            "cs_main", "cs_5_0",
-                            dwShaderFlags, 0,
-                            &computeShaderBuffer, &errorBuffer);
-    if (FAILED(hr)) {
-        if (errorBuffer != NULL) {
-            Far::Error(Far::FAR_RUNTIME_ERROR,
-                       "Error compiling HLSL shader: %s\n",
-                       (CHAR*)errorBuffer->GetBufferPointer());
-            errorBuffer->Release();
-            return false;
-        }
-    }
-
-    ID3D11Device *device = NULL;
-    deviceContext->GetDevice(&device);
-    assert(device);
-
-    device->CreateClassLinkage(&_classLinkage);
-    assert(_classLinkage);
-
-    device->CreateComputeShader(computeShaderBuffer->GetBufferPointer(),
-                                computeShaderBuffer->GetBufferSize(),
-                                _classLinkage,
-                                &_computeShader);
-    assert(_computeShader);
-
-    ID3D11ShaderReflection *reflector;
-    D3DReflect(computeShaderBuffer->GetBufferPointer(),
-               computeShaderBuffer->GetBufferSize(),
-               IID_ID3D11ShaderReflection, (void**) &reflector);
-    assert(reflector);
-
-    assert(reflector->GetNumInterfaceSlots() == 1);
-    reflector->Release();
-
-    computeShaderBuffer->Release();
-
-    _classLinkage->GetClassInstance("singleBufferCompute", 0, &_singleBufferKernel);
-    assert(_singleBufferKernel);
-    _classLinkage->GetClassInstance("separateBufferCompute", 0, &_separateBufferKernel);
-    assert(_separateBufferKernel);
-
-    D3D11_BUFFER_DESC cbDesc;
-    ZeroMemory(&cbDesc, sizeof(cbDesc));
-    cbDesc.Usage = D3D11_USAGE_DYNAMIC;
-    cbDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
-    cbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-    cbDesc.MiscFlags = 0;
-    cbDesc.ByteWidth = sizeof(KernelUniformArgs);
-    device->CreateBuffer(&cbDesc, NULL, &_uniformArgs);
-
-    return true;
-}
-
-/* static */
-void
-D3D11ComputeEvaluator::Synchronize(ID3D11DeviceContext *deviceContext) {
-    // XXX: this is currently just for the performance measuring purpose.
-
-    // XXXFIXME!
-    ID3D11Query *query = NULL;
-
-    ID3D11Device *device = NULL;
-    deviceContext->GetDevice(&device);
-    assert(device);
-
-    D3D11_QUERY_DESC desc;
-    desc.Query = D3D11_QUERY_EVENT;
-    desc.MiscFlags = 0;
-    device->CreateQuery(&desc, &query);
-
-    deviceContext->Flush();
-    deviceContext->End(query);
-    while (S_OK != deviceContext->GetData(query, NULL, 0, 0));
-
-    SAFE_RELEASE(query);
-}
-
-bool
-D3D11ComputeEvaluator::EvalStencils(ID3D11UnorderedAccessView *srcUAV,
-                                    BufferDescriptor const &srcDesc,
-                                    ID3D11UnorderedAccessView *dstUAV,
-                                    BufferDescriptor const &dstDesc,
-                                    ID3D11ShaderResourceView *sizesSRV,
-                                    ID3D11ShaderResourceView *offsetsSRV,
-                                    ID3D11ShaderResourceView *indicesSRV,
-                                    ID3D11ShaderResourceView *weightsSRV,
-                                    int start,
-                                    int end,
-                                    ID3D11DeviceContext *deviceContext) const {
-    assert(deviceContext);
-
-    int count = end - start;
-    if (count <= 0) return true;
-
-    KernelUniformArgs args;
-    args.start = start;
-    args.end = end;
-    args.srcOffset = srcDesc.offset;
-    args.dstOffset = dstDesc.offset;
-
-    D3D11_MAPPED_SUBRESOURCE mappedResource;
-    deviceContext->Map(_uniformArgs, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-    CopyMemory(mappedResource.pData, &args, sizeof(KernelUniformArgs));
-
-    deviceContext->Unmap(_uniformArgs, 0);
-    deviceContext->CSSetConstantBuffers(0, 1, &_uniformArgs); // b0
-
-    // Unbind the vertexBuffer from the input assembler
-    ID3D11Buffer *NULLBuffer = 0;
-    UINT voffset = 0, vstride = 0;
-    deviceContext->IASetVertexBuffers(0, 1, &NULLBuffer, &voffset, &vstride);
-    ID3D11ShaderResourceView *NULLSRV = 0;
-    deviceContext->VSSetShaderResources(0, 1, &NULLSRV);
-
-    // bind UAV
-    ID3D11UnorderedAccessView *UAViews[] = { srcUAV, dstUAV };
-    ID3D11ShaderResourceView *SRViews[] = {
-        sizesSRV, offsetsSRV, indicesSRV, weightsSRV };
-
-    // bind source vertex and stencil table
-    deviceContext->CSSetShaderResources(1, 4, SRViews); // t1-t4
-
-    if (srcUAV == dstUAV) {
-        deviceContext->CSSetUnorderedAccessViews(0, 1, UAViews, 0); // u0
-        // Dispatch src == dst buffer
-        deviceContext->CSSetShader(_computeShader, &_singleBufferKernel, 1);
-        deviceContext->Dispatch((count + _workGroupSize - 1) / _workGroupSize, 1, 1);
-    } else {
-        deviceContext->CSSetUnorderedAccessViews(0, 2, UAViews, 0); // u0, u1
-        // Dispatch src != dst buffer
-        deviceContext->CSSetShader(_computeShader, &_separateBufferKernel, 1);
-        deviceContext->Dispatch((count + _workGroupSize - 1) / _workGroupSize, 1, 1);
-    }
-
-    // unbind stencil table and vertexbuffers
-    SRViews[0] = SRViews[1] = SRViews[2] = SRViews[3] = NULL;
-    deviceContext->CSSetShaderResources(1, 4, SRViews);
-
-    UAViews[0] = UAViews[1] = NULL;
-    deviceContext->CSSetUnorderedAccessViews(0, 2, UAViews, 0);
-
-    return true;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11ComputeEvaluator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11ComputeEvaluator.h
deleted file mode 100644
index e9290fab0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11ComputeEvaluator.h
+++ /dev/null
@@ -1,237 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_D3D11_COMPUTE_EVALUATOR_H
-#define OPENSUBDIV3_OSD_D3D11_COMPUTE_EVALUATOR_H
-
-#include "../version.h"
-
-struct ID3D11DeviceContext;
-struct ID3D11Buffer;
-struct ID3D11ComputeShader;
-struct ID3D11ClassLinkage;
-struct ID3D11ClassInstance;
-struct ID3D11ShaderResourceView;
-struct ID3D11UnorderedAccessView;
-
-#include "../osd/bufferDescriptor.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-    class StencilTable;
-}
-
-namespace Osd {
-
-/// \brief D3D11 stencil table
-///
-/// This class is a D3D11 Shader Resource View representation of
-/// Far::StencilTable.
-///
-/// D3D11ComputeEvaluator consumes this table to apply stencils
-///
-class D3D11StencilTable {
-public:
-    template <typename DEVICE_CONTEXT>
-    static D3D11StencilTable *Create(Far::StencilTable const *stencilTable,
-                                      DEVICE_CONTEXT context) {
-        return new D3D11StencilTable(stencilTable, context->GetDeviceContext());
-    }
-
-    static D3D11StencilTable *Create(Far::StencilTable const *stencilTable,
-                                      ID3D11DeviceContext *deviceContext) {
-        return new D3D11StencilTable(stencilTable, deviceContext);
-    }
-
-    D3D11StencilTable(Far::StencilTable const *stencilTable,
-                       ID3D11DeviceContext *deviceContext);
-
-    ~D3D11StencilTable();
-
-    // interfaces needed for D3D11ComputeEvaluator
-    ID3D11ShaderResourceView *GetSizesSRV() const { return _sizes; }
-    ID3D11ShaderResourceView *GetOffsetsSRV() const { return _offsets; }
-    ID3D11ShaderResourceView *GetIndicesSRV() const { return _indices; }
-    ID3D11ShaderResourceView *GetWeightsSRV() const { return _weights; }
-    int GetNumStencils() const { return _numStencils; }
-
-private:
-    ID3D11ShaderResourceView *_sizes;
-    ID3D11ShaderResourceView *_offsets;
-    ID3D11ShaderResourceView *_indices;
-    ID3D11ShaderResourceView *_weights;
-    ID3D11Buffer *_sizesBuffer;
-    ID3D11Buffer *_offsetsBuffer;
-    ID3D11Buffer *_indicesBuffer;
-    ID3D11Buffer *_weightsBuffer;
-
-    int _numStencils;
-};
-
-// ---------------------------------------------------------------------------
-
-class D3D11ComputeEvaluator {
-public:
-    typedef bool Instantiatable;
-    static D3D11ComputeEvaluator * Create(BufferDescriptor const &srcDesc,
-                                          BufferDescriptor const &dstDesc,
-                                          BufferDescriptor const &duDesc,
-                                          BufferDescriptor const &dvDesc,
-                                          ID3D11DeviceContext *deviceContext);
-
-    static D3D11ComputeEvaluator * Create(BufferDescriptor const &srcDesc,
-                                          BufferDescriptor const &dstDesc,
-                                          BufferDescriptor const &duDesc,
-                                          BufferDescriptor const &dvDesc,
-                                          BufferDescriptor const &duuDesc,
-                                          BufferDescriptor const &duvDesc,
-                                          BufferDescriptor const &dvvDesc,
-                                          ID3D11DeviceContext *deviceContext);
-
-    /// Constructor.
-    D3D11ComputeEvaluator();
-
-    /// Destructor.
-    ~D3D11ComputeEvaluator();
-
-    /// \brief Generic static compute function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  ID3D11DeviceContext.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        D3D11ComputeEvaluator const *instance,
-        ID3D11DeviceContext * deviceContext) {
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          stencilTable,
-                                          deviceContext);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor(),
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                stencilTable,
-                                                deviceContext);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// Dispatch the DX compute kernel on GPU asynchronously.
-    /// returns false if the kernel hasn't been compiled yet.
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        ID3D11DeviceContext *deviceContext) const {
-        return EvalStencils(srcBuffer->BindD3D11UAV(deviceContext), srcDesc,
-                            dstBuffer->BindD3D11UAV(deviceContext), dstDesc,
-                            stencilTable->GetSizesSRV(),
-                            stencilTable->GetOffsetsSRV(),
-                            stencilTable->GetIndicesSRV(),
-                            stencilTable->GetWeightsSRV(),
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils(),
-                            deviceContext);
-    }
-
-    /// Dispatch the DX compute kernel on GPU asynchronously.
-    /// returns false if the kernel hasn't been compiled yet.
-    bool EvalStencils(ID3D11UnorderedAccessView *srcSRV,
-                      BufferDescriptor const &srcDesc,
-                      ID3D11UnorderedAccessView *dstUAV,
-                      BufferDescriptor const &dstDesc,
-                      ID3D11ShaderResourceView *sizesSRV,
-                      ID3D11ShaderResourceView *offsetsSRV,
-                      ID3D11ShaderResourceView *indicesSRV,
-                      ID3D11ShaderResourceView *weightsSRV,
-                      int start,
-                      int end,
-                      ID3D11DeviceContext *deviceContext) const;
-
-    /// Configure DX kernel. Returns false if it fails to compile the kernel.
-    bool Compile(BufferDescriptor const &srcDesc,
-                 BufferDescriptor const &dstDesc,
-                 ID3D11DeviceContext *deviceContext);
-
-    /// Wait the dispatched kernel finishes.
-    static void Synchronize(ID3D11DeviceContext *deviceContext);
-
-private:
-    ID3D11ComputeShader * _computeShader;
-    ID3D11ClassLinkage  * _classLinkage;
-    ID3D11ClassInstance * _singleBufferKernel;
-    ID3D11ClassInstance * _separateBufferKernel;
-    ID3D11Buffer        * _uniformArgs; // uniform parameters for kernels
-
-    int _workGroupSize;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-
-#endif  // OPENSUBDIV3_OSD_D3D11_COMPUTE_EVALUATOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11LegacyGregoryPatchTable.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11LegacyGregoryPatchTable.cpp
deleted file mode 100644
index 4f8a1a7d4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11LegacyGregoryPatchTable.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/d3d11LegacyGregoryPatchTable.h"
-
-#include <D3D11.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-D3D11LegacyGregoryPatchTable::D3D11LegacyGregoryPatchTable() :
-    _vertexValenceBuffer(0), _quadOffsetsBuffer(0),
-    _vertexSRV(0), _vertexValenceSRV(0), _quadOffsetsSRV(0) {
-    _quadOffsetsBase[0] = _quadOffsetsBase[1] = 0;
-}
-
-D3D11LegacyGregoryPatchTable::~D3D11LegacyGregoryPatchTable() {
-    if (_vertexValenceBuffer) _vertexValenceBuffer->Release();
-    if (_quadOffsetsBuffer)   _quadOffsetsBuffer->Release();
-    if (_vertexSRV)           _vertexSRV->Release();
-    if (_vertexValenceSRV)    _vertexValenceSRV->Release();
-    if (_quadOffsetsSRV)      _quadOffsetsSRV->Release();
-}
-
-D3D11LegacyGregoryPatchTable *
-D3D11LegacyGregoryPatchTable::Create(Far::PatchTable const *farPatchTable,
-                                     ID3D11DeviceContext *pd3d11DeviceContext) {
-    ID3D11Device *pd3d11Device = NULL;
-    pd3d11DeviceContext->GetDevice(&pd3d11Device);
-    assert(pd3d11Device);
-
-    D3D11LegacyGregoryPatchTable *result = new D3D11LegacyGregoryPatchTable();
-
-    Far::PatchTable::VertexValenceTable const &
-        valenceTable = farPatchTable->GetVertexValenceTable();
-    Far::PatchTable::QuadOffsetsTable const &
-        quadOffsetsTable = farPatchTable->GetQuadOffsetsTable();
-
-    if (! valenceTable.empty()) {
-        D3D11_BUFFER_DESC bd;
-        bd.ByteWidth = UINT(valenceTable.size() * sizeof(unsigned int));
-        bd.Usage = D3D11_USAGE_DEFAULT;
-        bd.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-        bd.CPUAccessFlags = 0;
-        bd.MiscFlags = 0;
-        bd.StructureByteStride = sizeof(unsigned int);
-        D3D11_SUBRESOURCE_DATA initData;
-        initData.pSysMem = &valenceTable[0];
-        HRESULT hr = pd3d11Device->CreateBuffer(&bd, &initData,
-                                                &result->_vertexValenceBuffer);
-        if (FAILED(hr)) {
-            delete result;
-            return NULL;
-        }
-
-        D3D11_SHADER_RESOURCE_VIEW_DESC srvd;
-        ZeroMemory(&srvd, sizeof(srvd));
-        srvd.Format = DXGI_FORMAT_R32_SINT;
-        srvd.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
-        srvd.Buffer.FirstElement = 0;
-        srvd.Buffer.NumElements = UINT(valenceTable.size());
-        hr = pd3d11Device->CreateShaderResourceView(
-            result->_vertexValenceBuffer, &srvd,
-            &result->_vertexValenceSRV);
-        if (FAILED(hr)) {
-            delete result;
-            return NULL;
-        }
-    }
-
-    if (! quadOffsetsTable.empty()) {
-        D3D11_BUFFER_DESC bd;
-        bd.ByteWidth = UINT(quadOffsetsTable.size() * sizeof(unsigned int));
-        bd.Usage = D3D11_USAGE_DEFAULT;
-        bd.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-        bd.CPUAccessFlags = 0;
-        bd.MiscFlags = 0;
-        bd.StructureByteStride = sizeof(unsigned int);
-        D3D11_SUBRESOURCE_DATA initData;
-        initData.pSysMem = &quadOffsetsTable[0];
-        HRESULT hr = pd3d11Device->CreateBuffer(&bd, &initData,
-                                                &result->_quadOffsetsBuffer);
-        if (FAILED(hr)) {
-            delete result;
-            return NULL;
-        }
-
-        D3D11_SHADER_RESOURCE_VIEW_DESC srvd;
-        ZeroMemory(&srvd, sizeof(srvd));
-        srvd.Format = DXGI_FORMAT_R32_SINT;
-        srvd.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
-        srvd.Buffer.FirstElement = 0;
-        srvd.Buffer.NumElements = UINT(quadOffsetsTable.size());
-        hr = pd3d11Device->CreateShaderResourceView(
-            result->_quadOffsetsBuffer, &srvd, &result->_quadOffsetsSRV);
-        if (FAILED(hr)) {
-            delete result;
-            return NULL;
-        }
-    }
-
-    result->_quadOffsetsBase[0] = 0;
-    result->_quadOffsetsBase[1] = 0;
-
-    // scan patchtable to find quadOffsetsBase.
-    for (int i = 0; i < farPatchTable->GetNumPatchArrays(); ++i) {
-        // GREGORY_BOUNDARY's quadoffsets come after GREGORY's.
-        if (farPatchTable->GetPatchArrayDescriptor(i) ==
-            Far::PatchDescriptor::GREGORY) {
-            result->_quadOffsetsBase[1] = farPatchTable->GetNumPatches(i) * 4;
-            break;
-        }
-    }
-
-    return result;
-}
-
-void
-D3D11LegacyGregoryPatchTable::UpdateVertexBuffer(
-    ID3D11Buffer *vbo, int numVertices, int numVertexElements,
-    ID3D11DeviceContext *pd3d11DeviceContext) {
-    ID3D11Device *pd3d11Device = NULL;
-    pd3d11DeviceContext->GetDevice(&pd3d11Device);
-    assert(pd3d11Device);
-
-    D3D11_SHADER_RESOURCE_VIEW_DESC srvd;
-    ZeroMemory(&srvd, sizeof(srvd));
-    srvd.Format = DXGI_FORMAT_R32_FLOAT;
-    srvd.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
-    srvd.Buffer.FirstElement = 0;
-    srvd.Buffer.NumElements = numVertices * numVertexElements;
-    HRESULT hr = pd3d11Device->CreateShaderResourceView(vbo, &srvd,
-                                                        &_vertexSRV);
-    if (FAILED(hr)) {
-        return;
-    }
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11LegacyGregoryPatchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11LegacyGregoryPatchTable.h
deleted file mode 100644
index bdf731ed1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11LegacyGregoryPatchTable.h
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_D3D11_LEGACY_GREGORY_PATCH_TABLE_H
-#define OPENSUBDIV3_OSD_D3D11_LEGACY_GREGORY_PATCH_TABLE_H
-
-#include "../version.h"
-
-#include "../far/patchTable.h"
-#include "../osd/nonCopyable.h"
-
-struct ID3D11Buffer;
-struct ID3D11ShaderResourceView;
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class D3D11LegacyGregoryPatchTable
-    : private NonCopyable<D3D11LegacyGregoryPatchTable> {
-public:
-    ~D3D11LegacyGregoryPatchTable();
-
-    template<typename DEVICE_CONTEXT>
-    static D3D11LegacyGregoryPatchTable *Create(
-        Far::PatchTable const *farPatchTable, DEVICE_CONTEXT context) {
-        return Create(farPatchTable, context->GetDeviceContext());
-    }
-
-    static D3D11LegacyGregoryPatchTable *Create(
-        Far::PatchTable const *farPatchTable,
-        ID3D11DeviceContext *deviceContext);
-
-    void UpdateVertexBuffer(ID3D11Buffer *vbo,
-                            int numVertices, int numVertexElements,
-                            ID3D11DeviceContext *pd3d11DeviceContext);
-
-    ID3D11ShaderResourceView* GetVertexSRV() const {
-        return _vertexSRV;
-    }
-
-    ID3D11ShaderResourceView* GetVertexValenceSRV() const {
-        return _vertexValenceSRV;
-    }
-
-    ID3D11ShaderResourceView* GetQuadOffsetsSRV() const {
-        return _quadOffsetsSRV;
-    }
-
-    int GetQuadOffsetsBase(Far::PatchDescriptor::Type type) {
-        if (type == Far::PatchDescriptor::GREGORY_BOUNDARY) {
-            return _quadOffsetsBase[1];
-        }
-        return _quadOffsetsBase[0];
-    }
-
-protected:
-    D3D11LegacyGregoryPatchTable();
-
-private:
-    ID3D11Buffer* _vertexValenceBuffer;
-    ID3D11Buffer* _quadOffsetsBuffer;
-    ID3D11ShaderResourceView* _vertexSRV;
-    ID3D11ShaderResourceView* _vertexValenceSRV;
-    ID3D11ShaderResourceView* _quadOffsetsSRV;
-    int _quadOffsetsBase[2];       // gregory, boundaryGregory
-};
-
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_D3D11_LEGACY_GREGORY_PATCH_TABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11Mesh.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11Mesh.h
deleted file mode 100644
index 5ce0a7f56..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11Mesh.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_D3D11MESH_H
-#define OPENSUBDIV3_OSD_D3D11MESH_H
-
-#include "../version.h"
-
-#include "../osd/mesh.h"
-#include "../osd/d3d11PatchTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-typedef MeshInterface<D3D11PatchTable> D3D11MeshInterface;
-
-
-} // end namespace Osd
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_D3D11MESH_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11PatchTable.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11PatchTable.cpp
deleted file mode 100644
index b92236615..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11PatchTable.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/d3d11PatchTable.h"
-
-#include <D3D11.h>
-#include "../far/patchTable.h"
-#include "../osd/cpuPatchTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-D3D11PatchTable::D3D11PatchTable() :
-    _indexBuffer(0), _patchParamBuffer(0), _patchParamBufferSRV(0) {
-}
-
-D3D11PatchTable::~D3D11PatchTable() {
-    if (_indexBuffer) _indexBuffer->Release();
-    if (_patchParamBuffer) _patchParamBuffer->Release();
-    if (_patchParamBufferSRV) _patchParamBufferSRV->Release();
-}
-
-D3D11PatchTable *
-D3D11PatchTable::Create(Far::PatchTable const *farPatchTable,
-                        ID3D11DeviceContext *pd3d11DeviceContext) {
-    D3D11PatchTable *instance = new D3D11PatchTable();
-    if (instance->allocate(farPatchTable, pd3d11DeviceContext))
-        return instance;
-    delete instance;
-    return 0;
-}
-
-bool
-D3D11PatchTable::allocate(Far::PatchTable const *farPatchTable,
-                          ID3D11DeviceContext *pd3d11DeviceContext) {
-    ID3D11Device *pd3d11Device = NULL;
-    pd3d11DeviceContext->GetDevice(&pd3d11Device);
-    assert(pd3d11Device);
-
-    CpuPatchTable patchTable(farPatchTable);
-
-    size_t numPatchArrays = patchTable.GetNumPatchArrays();
-    size_t indexSize = patchTable.GetPatchIndexSize();
-    size_t patchParamSize = patchTable.GetPatchParamSize();
-
-    // copy patch array
-    _patchArrays.assign(patchTable.GetPatchArrayBuffer(),
-                        patchTable.GetPatchArrayBuffer() + numPatchArrays);
-
-    // index buffer
-    D3D11_BUFFER_DESC bd;
-    ZeroMemory(&bd, sizeof(bd));
-    bd.ByteWidth = (int)indexSize * sizeof(int);
-    bd.Usage = D3D11_USAGE_DYNAMIC;
-    bd.BindFlags = D3D11_BIND_INDEX_BUFFER;
-    bd.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-    bd.MiscFlags = 0;
-    bd.StructureByteStride = sizeof(int);
-    HRESULT hr = pd3d11Device->CreateBuffer(&bd, NULL, &_indexBuffer);
-    if (FAILED(hr)) {
-        return false;
-    }
-
-    D3D11_MAPPED_SUBRESOURCE mappedResource;
-    hr = pd3d11DeviceContext->Map(_indexBuffer, 0,
-                                  D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-    if (FAILED(hr)) {
-        return false;
-    }
-    unsigned int * indexBuffer = (unsigned int *) mappedResource.pData;
-    memcpy(indexBuffer,
-           patchTable.GetPatchIndexBuffer(),
-           indexSize * sizeof(unsigned int));
-
-    pd3d11DeviceContext->Unmap(_indexBuffer, 0);
-
-    // patchparam buffer
-    ZeroMemory(&bd, sizeof(bd));
-    bd.ByteWidth = (int)patchParamSize * sizeof(PatchParam);
-    bd.Usage = D3D11_USAGE_DYNAMIC;
-    bd.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-    bd.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-    bd.MiscFlags = 0;
-    bd.StructureByteStride = sizeof(PatchParam);
-    hr = pd3d11Device->CreateBuffer(&bd, NULL, &_patchParamBuffer);
-    if (FAILED(hr)) {
-        return false;
-    }
-
-    D3D11_SHADER_RESOURCE_VIEW_DESC srvd;
-    ZeroMemory(&srvd, sizeof(srvd));
-    srvd.Format = DXGI_FORMAT_R32G32B32_UINT;
-    srvd.ViewDimension = D3D11_SRV_DIMENSION_BUFFER;
-    srvd.Buffer.FirstElement = 0;
-    srvd.Buffer.NumElements = (int)patchParamSize;
-    hr = pd3d11Device->CreateShaderResourceView(
-        _patchParamBuffer, &srvd, &_patchParamBufferSRV);
-    if (FAILED(hr)) {
-        return false;
-    }
-    hr = pd3d11DeviceContext->Map(_patchParamBuffer, 0,
-                                  D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
-    if (FAILED(hr)) {
-        return false;
-    }
-    unsigned int *dst = (unsigned int *) mappedResource.pData;
-    memcpy(dst,
-           patchTable.GetPatchParamBuffer(),
-           patchParamSize * sizeof(PatchParam));
-
-    pd3d11DeviceContext->Unmap(_patchParamBuffer, 0);
-
-    return true;
-}
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11PatchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11PatchTable.h
deleted file mode 100644
index 69b3aa47a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11PatchTable.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_GL_PATCH_TABLE_H
-#define OPENSUBDIV3_OSD_GL_PATCH_TABLE_H
-
-#include "../version.h"
-
-#include <vector>
-#include "../far/patchDescriptor.h"
-#include "../osd/nonCopyable.h"
-#include "../osd/types.h"
-
-struct ID3D11Buffer;
-struct ID3D11ShaderResourceView;
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far{
-    class PatchTable;
-};
-
-namespace Osd {
-
-class D3D11PatchTable : private NonCopyable<D3D11PatchTable> {
-public:
-    typedef ID3D11Buffer * VertexBufferBinding;
-
-    D3D11PatchTable();
-    ~D3D11PatchTable();
-
-    template<typename DEVICE_CONTEXT>
-    static D3D11PatchTable *Create(Far::PatchTable const *farPatchTable,
-                                   DEVICE_CONTEXT context) {
-        return Create(farPatchTable, context->GetDeviceContext());
-    }
-
-    static D3D11PatchTable *Create(Far::PatchTable const *farPatchTable,
-                                   ID3D11DeviceContext *deviceContext);
-
-    PatchArrayVector const &GetPatchArrays() const {
-        return _patchArrays;
-    }
-
-    /// Returns the index buffer containing the patch control vertices
-    ID3D11Buffer* GetPatchIndexBuffer() const {
-        return _indexBuffer;
-    }
-
-    /// Returns the SRV containing the patch parameter
-    ID3D11ShaderResourceView* GetPatchParamSRV() const {
-        return _patchParamBufferSRV;
-    }
-
-protected:
-    // allocate buffers from patchTable
-    bool allocate(Far::PatchTable const *farPatchTable,
-                  ID3D11DeviceContext *deviceContext);
-
-    PatchArrayVector _patchArrays;
-
-    ID3D11Buffer             *_indexBuffer;
-    ID3D11Buffer             *_patchParamBuffer;
-    ID3D11ShaderResourceView *_patchParamBufferSRV;
-};
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_GL_PATCH_TABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11VertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11VertexBuffer.cpp
deleted file mode 100644
index 8cb2125eb..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11VertexBuffer.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/d3d11VertexBuffer.h"
-#include "../far/error.h"
-
-#include <D3D11.h>
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
-
-D3D11VertexBuffer::D3D11VertexBuffer(int numElements, int numVertices)
-    : _numElements(numElements), _numVertices(numVertices), _buffer(0),
-      _uploadBuffer(0), _uav(0) {
-}
-
-D3D11VertexBuffer::~D3D11VertexBuffer() {
-
-    SAFE_RELEASE(_buffer);
-    SAFE_RELEASE(_uploadBuffer);
-    SAFE_RELEASE(_uav);
-}
-
-D3D11VertexBuffer*
-D3D11VertexBuffer::Create(int numElements, int numVertices,
-                          ID3D11DeviceContext *deviceContext) {
-    D3D11VertexBuffer *instance =
-        new D3D11VertexBuffer(numElements, numVertices);
-
-    ID3D11Device *device;
-    deviceContext->GetDevice(&device);
-    if (instance->allocate(device)) return instance;
-    delete instance;
-    return NULL;
-}
-
-void
-D3D11VertexBuffer::UpdateData(const float *src, int startVertex, int numVertices,
-                              ID3D11DeviceContext *deviceContext) {
-
-    assert(deviceContext);
-
-    D3D11_MAPPED_SUBRESOURCE resource;
-    HRESULT hr = deviceContext->Map(_uploadBuffer, 0,
-                                    D3D11_MAP_WRITE_DISCARD, 0, &resource);
-
-    if (FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "Failed to map buffer\n");
-        return;
-    }
-
-    unsigned int size = GetNumElements() * numVertices * sizeof(float);
-
-    memcpy((float*)resource.pData + startVertex * _numElements, src, size);
-
-    deviceContext->Unmap(_uploadBuffer, 0);
-
-    D3D11_BOX srcBox = { 0, 0, 0, size, 1, 1 };
-    deviceContext->CopySubresourceRegion(_buffer, 0, 0, 0, 0,
-                                         _uploadBuffer, 0, &srcBox);
-}
-
-int
-D3D11VertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-D3D11VertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-ID3D11Buffer *
-D3D11VertexBuffer::BindD3D11Buffer(ID3D11DeviceContext *deviceContext) {
-
-    return _buffer;
-}
-
-ID3D11UnorderedAccessView *
-D3D11VertexBuffer::BindD3D11UAV(ID3D11DeviceContext *deviceContext) {
-
-    return _uav;
-}
-
-bool
-D3D11VertexBuffer::allocate(ID3D11Device *device) {
-
-    D3D11_BUFFER_DESC hBufferDesc;
-    hBufferDesc.ByteWidth = _numElements * _numVertices * sizeof(float);
-    hBufferDesc.Usage = D3D11_USAGE_DEFAULT;
-    hBufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER | D3D11_BIND_UNORDERED_ACCESS | D3D11_BIND_SHADER_RESOURCE;
-    hBufferDesc.CPUAccessFlags = 0;
-    hBufferDesc.MiscFlags = 0;
-    hBufferDesc.StructureByteStride = sizeof(float);
-
-    HRESULT hr = device->CreateBuffer(&hBufferDesc, NULL, &_buffer);
-    if (FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                 "Failed to create vertex buffer\n");
-        return false;
-    }
-
-    hBufferDesc.ByteWidth = _numElements * _numVertices * sizeof(float);
-    hBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
-    hBufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER | D3D11_BIND_SHADER_RESOURCE;
-    hBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
-    hBufferDesc.MiscFlags = 0;
-    hBufferDesc.StructureByteStride = sizeof(float);
-
-    hr = device->CreateBuffer(&hBufferDesc, NULL, &_uploadBuffer);
-    if (FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                 "Failed to create upload vertex buffer\n");
-        return false;
-    }
-
-    D3D11_UNORDERED_ACCESS_VIEW_DESC uavd;
-    ZeroMemory(&uavd, sizeof(uavd));
-    uavd.Format = DXGI_FORMAT_R32_FLOAT;
-    uavd.ViewDimension = D3D11_UAV_DIMENSION_BUFFER;
-    uavd.Buffer.FirstElement = 0;
-    uavd.Buffer.NumElements = _numElements * _numVertices;
-    hr = device->CreateUnorderedAccessView(_buffer, &uavd, &_uav);
-    if (FAILED(hr)) {
-        Far::Error(Far::FAR_RUNTIME_ERROR,
-                 "Failed to create unordered access resource view\n");
-        return false;
-    }
-    return true;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11VertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11VertexBuffer.h
deleted file mode 100644
index fd8907395..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/d3d11VertexBuffer.h
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_D3D11_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_D3D11_VERTEX_BUFFER_H
-
-#include "../version.h"
-
-struct ID3D11Buffer;
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-struct ID3D11UnorderedAccessView;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-///
-/// \brief Concrete vertex buffer class for DirectX subdivision and DirectX drawing.
-///
-/// D3D11VertexBuffer implements D3D11VertexBufferInterface. An instance
-/// of this buffer class can be passed to D3D11ComputeEvaluator.
-///
-class D3D11VertexBuffer {
-public:
-    /// Creator. Returns NULL if error.
-    static D3D11VertexBuffer * Create(int numElements, int numVertices,
-                                      ID3D11DeviceContext *deviceContext);
-
-    /// Destructor.
-    virtual ~D3D11VertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide coarse
-    /// vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    ID3D11DeviceContext *deviceContext);
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns the D3D11 buffer object.
-    ID3D11Buffer *BindD3D11Buffer(ID3D11DeviceContext *deviceContext);
-
-    /// Returns the D3D11 buffer object (for Osd::Mesh interface)
-    ID3D11Buffer *BindVBO(ID3D11DeviceContext *deviceContext) {
-        return BindD3D11Buffer(deviceContext);
-    }
-
-    /// Returns the D3D11 UAV
-    ID3D11UnorderedAccessView *BindD3D11UAV(ID3D11DeviceContext *deviceContext);
-
-protected:
-    /// Constructor.
-    D3D11VertexBuffer(int numElements, int numVertices);
-
-    // Allocates D3D11 buffer
-    bool allocate(ID3D11Device *device);
-
-private:
-    int _numElements;
-    int _numVertices;
-    ID3D11Buffer *_buffer;
-    ID3D11Buffer *_uploadBuffer;
-    ID3D11UnorderedAccessView *_uav;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_D3D11_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glComputeEvaluator.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glComputeEvaluator.cpp
deleted file mode 100644
index 11e6b9389..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glComputeEvaluator.cpp
+++ /dev/null
@@ -1,573 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "glLoader.h"
-
-#include "../osd/glComputeEvaluator.h"
-#include "../osd/glslPatchShaderSource.h"
-
-#include "../far/error.h"
-#include "../far/stencilTable.h"
-
-#include <cassert>
-#include <sstream>
-#include <cstring>
-#include <vector>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-static const char *shaderSource =
-#include "../osd/glslComputeKernel.gen.h"
-;
-
-template <class T> GLuint
-createSSBO(std::vector<T> const & src) {
-    if (src.empty()) {
-        return 0;
-    }
-
-    GLuint devicePtr = 0;
-
-#if defined(GL_ARB_direct_state_access)
-    if (OSD_OPENGL_HAS(ARB_direct_state_access)) {
-        glCreateBuffers(1, &devicePtr);
-        glNamedBufferData(devicePtr, src.size()*sizeof(T),
-                          &src.at(0), GL_STATIC_DRAW);
-    } else
-#endif
-    {
-        GLint prev = 0;
-        glGetIntegerv(GL_SHADER_STORAGE_BUFFER_BINDING, &prev);
-        glGenBuffers(1, &devicePtr);
-        glBindBuffer(GL_SHADER_STORAGE_BUFFER, devicePtr);
-        glBufferData(GL_SHADER_STORAGE_BUFFER, src.size()*sizeof(T),
-                     &src.at(0), GL_STATIC_DRAW);
-        glBindBuffer(GL_SHADER_STORAGE_BUFFER, prev);
-    }
-
-    return devicePtr;
-}
-
-GLStencilTableSSBO::GLStencilTableSSBO(
-    Far::StencilTable const *stencilTable) {
-    _numStencils = stencilTable->GetNumStencils();
-    if (_numStencils > 0) {
-        _sizes   = createSSBO(stencilTable->GetSizes());
-        _offsets = createSSBO(stencilTable->GetOffsets());
-        _indices = createSSBO(stencilTable->GetControlIndices());
-        _weights = createSSBO(stencilTable->GetWeights());
-        _duWeights = _dvWeights = 0;
-        _duuWeights = _duvWeights = _dvvWeights = 0;
-    } else {
-        _sizes = _offsets = _indices = _weights = 0;
-        _duWeights = _dvWeights = 0;
-        _duuWeights = _duvWeights = _dvvWeights = 0;
-    }
-}
-
-GLStencilTableSSBO::GLStencilTableSSBO(
-    Far::LimitStencilTable const *limitStencilTable) {
-    _numStencils = limitStencilTable->GetNumStencils();
-    if (_numStencils > 0) {
-        _sizes   = createSSBO(limitStencilTable->GetSizes());
-        _offsets = createSSBO(limitStencilTable->GetOffsets());
-        _indices = createSSBO(limitStencilTable->GetControlIndices());
-        _weights = createSSBO(limitStencilTable->GetWeights());
-        _duWeights = createSSBO(limitStencilTable->GetDuWeights());
-        _dvWeights = createSSBO(limitStencilTable->GetDvWeights());
-        _duuWeights = createSSBO(limitStencilTable->GetDuuWeights());
-        _duvWeights = createSSBO(limitStencilTable->GetDuvWeights());
-        _dvvWeights = createSSBO(limitStencilTable->GetDvvWeights());
-    } else {
-        _sizes = _offsets = _indices = _weights = 0;
-        _duWeights = _dvWeights = 0;
-        _duuWeights = _duvWeights = _dvvWeights = 0;
-    }
-}
-
-GLStencilTableSSBO::~GLStencilTableSSBO() {
-    if (_sizes)   glDeleteBuffers(1, &_sizes);
-    if (_offsets) glDeleteBuffers(1, &_offsets);
-    if (_indices) glDeleteBuffers(1, &_indices);
-    if (_weights) glDeleteBuffers(1, &_weights);
-    if (_duWeights) glDeleteBuffers(1, &_duWeights);
-    if (_dvWeights) glDeleteBuffers(1, &_dvWeights);
-    if (_duuWeights) glDeleteBuffers(1, &_duuWeights);
-    if (_duvWeights) glDeleteBuffers(1, &_duvWeights);
-    if (_dvvWeights) glDeleteBuffers(1, &_dvvWeights);
-}
-
-// ---------------------------------------------------------------------------
-
-
-GLComputeEvaluator::GLComputeEvaluator()
-    : _workGroupSize(64),
-      _patchArraysSSBO(0) {
-    std::memset((void*) &_stencilKernel, 0, sizeof(_stencilKernel));
-    std::memset((void*) &_patchKernel, 0, sizeof(_patchKernel));
-
-    // Initialize internal OpenGL loader library if necessary
-    OpenSubdiv::internal::GLLoader::libraryInitializeGL();
-}
-
-GLComputeEvaluator::~GLComputeEvaluator() {
-    if (_patchArraysSSBO) {
-        glDeleteBuffers(1, &_patchArraysSSBO);
-    }
-}
-
-static GLuint
-compileKernel(BufferDescriptor const &srcDesc,
-              BufferDescriptor const &dstDesc,
-              BufferDescriptor const & duDesc,
-              BufferDescriptor const & dvDesc,
-              BufferDescriptor const & duuDesc,
-              BufferDescriptor const & duvDesc,
-              BufferDescriptor const & dvvDesc,
-              const char *kernelDefine,
-              int workGroupSize) {
-    GLuint program = glCreateProgram();
-
-    GLuint shader = glCreateShader(GL_COMPUTE_SHADER);
-
-    std::string patchBasisShaderSource =
-        GLSLPatchShaderSource::GetPatchBasisShaderSource();
-    const char *patchBasisShaderSourceDefine = "#define OSD_PATCH_BASIS_GLSL\n";
-
-    std::ostringstream defines;
-    defines << "#define LENGTH "     << srcDesc.length << "\n"
-            << "#define SRC_STRIDE " << srcDesc.stride << "\n"
-            << "#define DST_STRIDE " << dstDesc.stride << "\n"
-            << "#define WORK_GROUP_SIZE " << workGroupSize << "\n"
-            << kernelDefine << "\n"
-            << patchBasisShaderSourceDefine << "\n";
-
-    bool deriv1 = (duDesc.length > 0 || dvDesc.length > 0);
-    bool deriv2 = (duuDesc.length > 0 || duvDesc.length > 0 || dvvDesc.length > 0);
-    if (deriv1) {
-        defines << "#define OPENSUBDIV_GLSL_COMPUTE_USE_1ST_DERIVATIVES\n";
-    }
-    if (deriv2) {
-        defines << "#define OPENSUBDIV_GLSL_COMPUTE_USE_2ND_DERIVATIVES\n";
-    }
-
-    std::string defineStr = defines.str();
-
-    const char *shaderSources[4] = {"#version 430\n", 0, 0, 0};
-
-    shaderSources[1] = defineStr.c_str();
-    shaderSources[2] = patchBasisShaderSource.c_str();
-    shaderSources[3] = shaderSource;
-    glShaderSource(shader, 4, shaderSources, NULL);
-    glCompileShader(shader);
-    glAttachShader(program, shader);
-
-    GLint linked = 0;
-    glLinkProgram(program);
-    glGetProgramiv(program, GL_LINK_STATUS, &linked);
-
-    if (linked == GL_FALSE) {
-        char buffer[1024];
-        glGetShaderInfoLog(shader, 1024, NULL, buffer);
-        Far::Error(Far::FAR_RUNTIME_ERROR, buffer);
-
-        glGetProgramInfoLog(program, 1024, NULL, buffer);
-        Far::Error(Far::FAR_RUNTIME_ERROR, buffer);
-
-        glDeleteProgram(program);
-        return 0;
-    }
-
-    glDeleteShader(shader);
-
-    return program;
-}
-
-bool
-GLComputeEvaluator::Compile(BufferDescriptor const &srcDesc,
-                            BufferDescriptor const &dstDesc,
-                            BufferDescriptor const &duDesc,
-                            BufferDescriptor const &dvDesc,
-                            BufferDescriptor const &duuDesc,
-                            BufferDescriptor const &duvDesc,
-                            BufferDescriptor const &dvvDesc) {
-
-    // create a stencil kernel
-    if (!_stencilKernel.Compile(srcDesc, dstDesc,
-                                duDesc, dvDesc,
-                                duuDesc, duvDesc, dvvDesc,
-                                _workGroupSize)) {
-        return false;
-    }
-
-    // create a patch kernel
-    if (!_patchKernel.Compile(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc,
-                              _workGroupSize)) {
-        return false;
-    }
-
-    // create a patch arrays buffer
-    if (!_patchArraysSSBO) {
-        glGenBuffers(1, &_patchArraysSSBO);
-    }
-
-    return true;
-}
-
-/* static */
-void
-GLComputeEvaluator::Synchronize(void * /*kernel*/) {
-    // XXX: this is currently just for the performance measuring purpose.
-    // need to be reimplemented by fence and sync.
-    glFinish();
-}
-
-bool
-GLComputeEvaluator::EvalStencils(
-    GLuint srcBuffer, BufferDescriptor const &srcDesc,
-    GLuint dstBuffer, BufferDescriptor const &dstDesc,
-    GLuint duBuffer,  BufferDescriptor const &duDesc,
-    GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-    GLuint sizesBuffer,
-    GLuint offsetsBuffer,
-    GLuint indicesBuffer,
-    GLuint weightsBuffer,
-    GLuint duWeightsBuffer,
-    GLuint dvWeightsBuffer,
-    int start, int end) const {
-
-    return EvalStencils(srcBuffer, srcDesc,
-                        dstBuffer, dstDesc,
-                        duBuffer, duDesc,
-                        dvBuffer, dvDesc,
-                        0, BufferDescriptor(),
-                        0, BufferDescriptor(),
-                        0, BufferDescriptor(),
-                        sizesBuffer, offsetsBuffer, indicesBuffer,
-                        weightsBuffer,
-                        duWeightsBuffer, dvWeightsBuffer,
-                        0, 0, 0,
-                        start, end);
-}
-
-bool
-GLComputeEvaluator::EvalStencils(
-    GLuint srcBuffer, BufferDescriptor const &srcDesc,
-    GLuint dstBuffer, BufferDescriptor const &dstDesc,
-    GLuint duBuffer,  BufferDescriptor const &duDesc,
-    GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-    GLuint duuBuffer, BufferDescriptor const &duuDesc,
-    GLuint duvBuffer, BufferDescriptor const &duvDesc,
-    GLuint dvvBuffer, BufferDescriptor const &dvvDesc,
-    GLuint sizesBuffer,
-    GLuint offsetsBuffer,
-    GLuint indicesBuffer,
-    GLuint weightsBuffer,
-    GLuint duWeightsBuffer,
-    GLuint dvWeightsBuffer,
-    GLuint duuWeightsBuffer,
-    GLuint duvWeightsBuffer,
-    GLuint dvvWeightsBuffer,
-    int start, int end) const {
-
-    if (!_stencilKernel.program) return false;
-    int count = end - start;
-    if (count <= 0) {
-        return true;
-    }
-
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, srcBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, dstBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, duBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, dvBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 10, duuBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 11, duvBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 12, dvvBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, sizesBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 5, offsetsBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 6, indicesBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 7, weightsBuffer);
-    if (duWeightsBuffer)
-        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 8, duWeightsBuffer);
-    if (dvWeightsBuffer)
-        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 9, dvWeightsBuffer);
-    if (duuWeightsBuffer)
-        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 13, duuWeightsBuffer);
-    if (duvWeightsBuffer)
-        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 14, duvWeightsBuffer);
-    if (dvvWeightsBuffer)
-        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 15, dvvWeightsBuffer);
-
-    GLint activeProgram;
-    glGetIntegerv(GL_CURRENT_PROGRAM, &activeProgram);
-    glUseProgram(_stencilKernel.program);
-
-    glUniform1i(_stencilKernel.uniformStart,     start);
-    glUniform1i(_stencilKernel.uniformEnd,       end);
-    glUniform1i(_stencilKernel.uniformSrcOffset, srcDesc.offset);
-    glUniform1i(_stencilKernel.uniformDstOffset, dstDesc.offset);
-    if (_stencilKernel.uniformDuDesc > 0) {
-        glUniform3i(_stencilKernel.uniformDuDesc,
-                    duDesc.offset, duDesc.length, duDesc.stride);
-    }
-    if (_stencilKernel.uniformDvDesc > 0) {
-        glUniform3i(_stencilKernel.uniformDvDesc,
-                    dvDesc.offset, dvDesc.length, dvDesc.stride);
-    }
-    if (_stencilKernel.uniformDuuDesc > 0) {
-        glUniform3i(_stencilKernel.uniformDuuDesc,
-                    duuDesc.offset, duuDesc.length, duuDesc.stride);
-    }
-    if (_stencilKernel.uniformDuvDesc > 0) {
-        glUniform3i(_stencilKernel.uniformDuvDesc,
-                    duvDesc.offset, duvDesc.length, duvDesc.stride);
-    }
-    if (_stencilKernel.uniformDvvDesc > 0) {
-        glUniform3i(_stencilKernel.uniformDvvDesc,
-                    dvvDesc.offset, dvvDesc.length, dvvDesc.stride);
-    }
-
-    glDispatchCompute((count + _workGroupSize - 1) / _workGroupSize, 1, 1);
-
-    glUseProgram(activeProgram);
-
-    glMemoryBarrier(GL_TEXTURE_FETCH_BARRIER_BIT);
-    for (int i = 0; i < 16; ++i) {
-        glBindBufferBase(GL_SHADER_STORAGE_BUFFER, i, 0);
-    }
-
-    return true;
-}
-
-bool
-GLComputeEvaluator::EvalPatches(
-    GLuint srcBuffer, BufferDescriptor const &srcDesc,
-    GLuint dstBuffer, BufferDescriptor const &dstDesc,
-    GLuint duBuffer,  BufferDescriptor const &duDesc,
-    GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-    int numPatchCoords,
-    GLuint patchCoordsBuffer,
-    const PatchArrayVector &patchArrays,
-    GLuint patchIndexBuffer,
-    GLuint patchParamsBuffer) const {
-
-    return EvalPatches(srcBuffer, srcDesc,
-                       dstBuffer, dstDesc,
-                       duBuffer, duDesc,
-                       dvBuffer, dvDesc,
-                       0, BufferDescriptor(),
-                       0, BufferDescriptor(),
-                       0, BufferDescriptor(),
-                       numPatchCoords,
-                       patchCoordsBuffer,
-                       patchArrays,
-                       patchIndexBuffer,
-                       patchParamsBuffer);
-}
-
-bool
-GLComputeEvaluator::EvalPatches(
-    GLuint srcBuffer, BufferDescriptor const &srcDesc,
-    GLuint dstBuffer, BufferDescriptor const &dstDesc,
-    GLuint duBuffer,  BufferDescriptor const &duDesc,
-    GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-    GLuint duuBuffer, BufferDescriptor const &duuDesc,
-    GLuint duvBuffer, BufferDescriptor const &duvDesc,
-    GLuint dvvBuffer, BufferDescriptor const &dvvDesc,
-    int numPatchCoords,
-    GLuint patchCoordsBuffer,
-    const PatchArrayVector &patchArrays,
-    GLuint patchIndexBuffer,
-    GLuint patchParamsBuffer) const {
-
-    if (!_patchKernel.program) return false;
-
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, srcBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, dstBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, duBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, dvBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 10, duuBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 11, duvBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 12, dvvBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 5, patchCoordsBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 6, patchIndexBuffer);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 7, patchParamsBuffer);
-
-    GLint activeProgram;
-    glGetIntegerv(GL_CURRENT_PROGRAM, &activeProgram);
-    glUseProgram(_patchKernel.program);
-
-    glUniform1i(_patchKernel.uniformSrcOffset, srcDesc.offset);
-    glUniform1i(_patchKernel.uniformDstOffset, dstDesc.offset);
-
-    int patchArraySize = sizeof(PatchArray);
-    glBindBuffer(GL_SHADER_STORAGE_BUFFER, _patchArraysSSBO);
-    glBufferData(GL_SHADER_STORAGE_BUFFER,
-        patchArrays.size()*patchArraySize, NULL, GL_STATIC_DRAW);
-    for (int i=0; i<(int)patchArrays.size(); ++i) {
-        glBufferSubData(GL_SHADER_STORAGE_BUFFER,
-            i*patchArraySize, sizeof(PatchArray), &patchArrays[i]);
-    }
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, _patchArraysSSBO);
-
-    if (_patchKernel.uniformDuDesc > 0) {
-        glUniform3i(_patchKernel.uniformDuDesc,
-                    duDesc.offset, duDesc.length, duDesc.stride);
-    }
-    if (_patchKernel.uniformDvDesc > 0) {
-        glUniform3i(_patchKernel.uniformDvDesc,
-                    dvDesc.offset, dvDesc.length, dvDesc.stride);
-    }
-    if (_patchKernel.uniformDuuDesc > 0) {
-        glUniform3i(_patchKernel.uniformDuuDesc,
-                    duuDesc.offset, duuDesc.length, duuDesc.stride);
-    }
-    if (_patchKernel.uniformDuvDesc > 0) {
-        glUniform3i(_patchKernel.uniformDuvDesc,
-                    duvDesc.offset, duvDesc.length, duvDesc.stride);
-    }
-    if (_patchKernel.uniformDvvDesc > 0) {
-        glUniform3i(_patchKernel.uniformDvvDesc,
-                    dvvDesc.offset, dvvDesc.length, dvvDesc.stride);
-    }
-
-    glDispatchCompute((numPatchCoords + _workGroupSize - 1) / _workGroupSize, 1, 1);
-
-    glUseProgram(activeProgram);
-
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, 0);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, 0);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, 0);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 3, 0);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, 0);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 5, 0);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 6, 0);
-
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 10, 0);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 11, 0);
-    glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 12, 0);
-
-    return true;
-}
-// ---------------------------------------------------------------------------
-
-GLComputeEvaluator::_StencilKernel::_StencilKernel() : program(0) {
-}
-GLComputeEvaluator::_StencilKernel::~_StencilKernel() {
-    if (program) {
-        glDeleteProgram(program);
-    }
-}
-
-bool
-GLComputeEvaluator::_StencilKernel::Compile(BufferDescriptor const &srcDesc,
-                                            BufferDescriptor const &dstDesc,
-                                            BufferDescriptor const &duDesc,
-                                            BufferDescriptor const &dvDesc,
-                                            BufferDescriptor const &duuDesc,
-                                            BufferDescriptor const &duvDesc,
-                                            BufferDescriptor const &dvvDesc,
-                                            int workGroupSize) {
-    // create stencil kernel
-    if (program) {
-        glDeleteProgram(program);
-    }
-
-    const char * kernelDefine =
-        "#define OPENSUBDIV_GLSL_COMPUTE_KERNEL_EVAL_STENCILS\n";
-
-    program = compileKernel(srcDesc, dstDesc,
-                            duDesc, dvDesc, duuDesc, duvDesc, dvvDesc,
-                            kernelDefine, workGroupSize);
-    if (program == 0) return false;
-
-    // cache uniform locations (TODO: use uniform block)
-    uniformStart     = glGetUniformLocation(program, "batchStart");
-    uniformEnd       = glGetUniformLocation(program, "batchEnd");
-    uniformSrcOffset = glGetUniformLocation(program, "srcOffset");
-    uniformDstOffset = glGetUniformLocation(program, "dstOffset");
-    uniformDuDesc    = glGetUniformLocation(program, "duDesc");
-    uniformDvDesc    = glGetUniformLocation(program, "dvDesc");
-    uniformDuuDesc   = glGetUniformLocation(program, "duuDesc");
-    uniformDuvDesc   = glGetUniformLocation(program, "duvDesc");
-    uniformDvvDesc   = glGetUniformLocation(program, "dvvDesc");
-
-    return true;
-}
-
-// ---------------------------------------------------------------------------
-
-GLComputeEvaluator::_PatchKernel::_PatchKernel() : program(0) {
-}
-GLComputeEvaluator::_PatchKernel::~_PatchKernel() {
-    if (program) {
-        glDeleteProgram(program);
-    }
-}
-
-bool
-GLComputeEvaluator::_PatchKernel::Compile(BufferDescriptor const &srcDesc,
-                                          BufferDescriptor const &dstDesc,
-                                          BufferDescriptor const &duDesc,
-                                          BufferDescriptor const &dvDesc,
-                                          BufferDescriptor const &duuDesc,
-                                          BufferDescriptor const &duvDesc,
-                                          BufferDescriptor const &dvvDesc,
-                                          int workGroupSize) {
-    // create stencil kernel
-    if (program) {
-        glDeleteProgram(program);
-    }
-
-    const char * kernelDefine =
-        "#define OPENSUBDIV_GLSL_COMPUTE_KERNEL_EVAL_PATCHES\n";
-
-    program = compileKernel(srcDesc, dstDesc,
-                            duDesc, dvDesc, duuDesc, duvDesc, dvvDesc,
-                            kernelDefine, workGroupSize);
-    if (program == 0) return false;
-
-    // cache uniform locations
-    uniformSrcOffset  = glGetUniformLocation(program, "srcOffset");
-    uniformDstOffset  = glGetUniformLocation(program, "dstOffset");
-    uniformPatchArray = glGetUniformLocation(program, "patchArray");
-    uniformDuDesc     = glGetUniformLocation(program, "duDesc");
-    uniformDvDesc     = glGetUniformLocation(program, "dvDesc");
-    uniformDuuDesc    = glGetUniformLocation(program, "duuDesc");
-    uniformDuvDesc    = glGetUniformLocation(program, "duvDesc");
-    uniformDvvDesc    = glGetUniformLocation(program, "dvvDesc");
-
-    return true;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glComputeEvaluator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glComputeEvaluator.h
deleted file mode 100644
index 8656c560f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glComputeEvaluator.h
+++ /dev/null
@@ -1,2115 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_GL_COMPUTE_EVALUATOR_H
-#define OPENSUBDIV3_OSD_GL_COMPUTE_EVALUATOR_H
-
-#include "../version.h"
-
-#include "../osd/opengl.h"
-#include "../osd/types.h"
-#include "../osd/bufferDescriptor.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-    class PatchTable;
-    class StencilTable;
-    class LimitStencilTable;
-}
-
-namespace Osd {
-
-/// \brief GL stencil table (Shader Storage buffer)
-///
-/// This class is a GLSL SSBO representation of Far::StencilTable.
-///
-/// GLSLComputeKernel consumes this table to apply stencils
-///
-class GLStencilTableSSBO {
-public:
-    static GLStencilTableSSBO *Create(Far::StencilTable const *stencilTable,
-                                       void *deviceContext = NULL) {
-        (void)deviceContext;  // unused
-        return new GLStencilTableSSBO(stencilTable);
-    }
-    static GLStencilTableSSBO *Create(
-        Far::LimitStencilTable const *limitStencilTable,
-        void *deviceContext = NULL) {
-        (void)deviceContext;  // unused
-        return new GLStencilTableSSBO(limitStencilTable);
-    }
-
-    explicit GLStencilTableSSBO(Far::StencilTable const *stencilTable);
-    explicit GLStencilTableSSBO(Far::LimitStencilTable const *limitStencilTable);
-    ~GLStencilTableSSBO();
-
-    // interfaces needed for GLSLComputeKernel
-    GLuint GetSizesBuffer() const { return _sizes; }
-    GLuint GetOffsetsBuffer() const { return _offsets; }
-    GLuint GetIndicesBuffer() const { return _indices; }
-    GLuint GetWeightsBuffer() const { return _weights; }
-    GLuint GetDuWeightsBuffer() const { return _duWeights; }
-    GLuint GetDvWeightsBuffer() const { return _dvWeights; }
-    GLuint GetDuuWeightsBuffer() const { return _duuWeights; }
-    GLuint GetDuvWeightsBuffer() const { return _duvWeights; }
-    GLuint GetDvvWeightsBuffer() const { return _dvvWeights; }
-    int GetNumStencils() const { return _numStencils; }
-
-private:
-    GLuint _sizes;
-    GLuint _offsets;
-    GLuint _indices;
-    GLuint _weights;
-    GLuint _duWeights;
-    GLuint _dvWeights;
-    GLuint _duuWeights;
-    GLuint _duvWeights;
-    GLuint _dvvWeights;
-    int _numStencils;
-};
-
-// ---------------------------------------------------------------------------
-
-class GLComputeEvaluator {
-public:
-    typedef bool Instantiatable;
-    static GLComputeEvaluator * Create(BufferDescriptor const &srcDesc,
-                                       BufferDescriptor const &dstDesc,
-                                       BufferDescriptor const &duDesc,
-                                       BufferDescriptor const &dvDesc,
-                                       void * deviceContext = NULL) {
-        return Create(srcDesc, dstDesc, duDesc, dvDesc,
-                      BufferDescriptor(),
-                      BufferDescriptor(),
-                      BufferDescriptor(),
-                      deviceContext);
-    }
-
-    static GLComputeEvaluator * Create(BufferDescriptor const &srcDesc,
-                                       BufferDescriptor const &dstDesc,
-                                       BufferDescriptor const &duDesc,
-                                       BufferDescriptor const &dvDesc,
-                                       BufferDescriptor const &duuDesc,
-                                       BufferDescriptor const &duvDesc,
-                                       BufferDescriptor const &dvvDesc,
-                                       void * deviceContext = NULL) {
-        (void)deviceContext;  // not used
-        GLComputeEvaluator *instance = new GLComputeEvaluator();
-        if (instance->Compile(srcDesc, dstDesc, duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc))
-            return instance;
-        delete instance;
-        return NULL;
-    }
-
-    /// Constructor.
-    GLComputeEvaluator();
-
-    /// Destructor. note that the GL context must be made current.
-    ~GLComputeEvaluator();
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Stencil evaluations with StencilTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLSL kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          stencilTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor());
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                stencilTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLSL kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          duBuffer,  duDesc,
-                                          dvBuffer,  dvDesc,
-                                          stencilTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc, duDesc, dvDesc);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                duBuffer,  duDesc,
-                                                dvBuffer,  dvDesc,
-                                                stencilTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLSL kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          duBuffer,  duDesc,
-                                          dvBuffer,  dvDesc,
-                                          duuBuffer, duuDesc,
-                                          duvBuffer, duvDesc,
-                                          dvvBuffer, dvvDesc,
-                                          stencilTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc, duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                duBuffer,  duDesc,
-                                                dvBuffer,  dvDesc,
-                                                duuBuffer, duuDesc,
-                                                duvBuffer, duvDesc,
-                                                dvvBuffer, dvvDesc,
-                                                stencilTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable) const {
-        return EvalStencils(srcBuffer->BindVBO(), srcDesc,
-                            dstBuffer->BindVBO(), dstDesc,
-                            0, BufferDescriptor(),
-                            0, BufferDescriptor(),
-                            stencilTable->GetSizesBuffer(),
-                            stencilTable->GetOffsetsBuffer(),
-                            stencilTable->GetIndicesBuffer(),
-                            stencilTable->GetWeightsBuffer(),
-                            0,
-                            0,
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable) const {
-        return EvalStencils(srcBuffer->BindVBO(), srcDesc,
-                            dstBuffer->BindVBO(), dstDesc,
-                            duBuffer->BindVBO(),  duDesc,
-                            dvBuffer->BindVBO(),  dvDesc,
-                            stencilTable->GetSizesBuffer(),
-                            stencilTable->GetOffsetsBuffer(),
-                            stencilTable->GetIndicesBuffer(),
-                            stencilTable->GetWeightsBuffer(),
-                            stencilTable->GetDuWeightsBuffer(),
-                            stencilTable->GetDvWeightsBuffer(),
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       SSBO interfaces.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable) const {
-        return EvalStencils(srcBuffer->BindVBO(), srcDesc,
-                            dstBuffer->BindVBO(), dstDesc,
-                            duBuffer->BindVBO(),  duDesc,
-                            dvBuffer->BindVBO(),  dvDesc,
-                            duuBuffer->BindVBO(), duuDesc,
-                            duvBuffer->BindVBO(), duvDesc,
-                            dvvBuffer->BindVBO(), dvvDesc,
-                            stencilTable->GetSizesBuffer(),
-                            stencilTable->GetOffsetsBuffer(),
-                            stencilTable->GetIndicesBuffer(),
-                            stencilTable->GetWeightsBuffer(),
-                            stencilTable->GetDuWeightsBuffer(),
-                            stencilTable->GetDvWeightsBuffer(),
-                            stencilTable->GetDuuWeightsBuffer(),
-                            stencilTable->GetDuvWeightsBuffer(),
-                            stencilTable->GetDvvWeightsBuffer(),
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Dispatch the GLSL compute kernel on GPU asynchronously
-    /// returns false if the kernel hasn't been compiled yet.
-    ///
-    /// @param srcBuffer        GL buffer of input primvar source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the srcBuffer
-    ///
-    /// @param dstBuffer        GL buffer of output primvar destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer         GL buffer of output derivative wrt u
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         GL buffer of output derivative wrt v
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param sizesBuffer      GL buffer of the sizes in the stencil table
-    ///
-    /// @param offsetsBuffer    GL buffer of the offsets in the stencil table
-    ///
-    /// @param indicesBuffer    GL buffer of the indices in the stencil table
-    ///
-    /// @param weightsBuffer    GL buffer of the weights in the stencil table
-    ///
-    /// @param duWeightsBuffer  GL buffer of the du weights in the stencil table
-    ///
-    /// @param dvWeightsBuffer  GL buffer of the dv weights in the stencil table
-    ///
-    /// @param start            start index of stencil table
-    ///
-    /// @param end              end index of stencil table
-    ///
-    bool EvalStencils(GLuint srcBuffer, BufferDescriptor const &srcDesc,
-                      GLuint dstBuffer, BufferDescriptor const &dstDesc,
-                      GLuint duBuffer,  BufferDescriptor const &duDesc,
-                      GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-                      GLuint sizesBuffer,
-                      GLuint offsetsBuffer,
-                      GLuint indicesBuffer,
-                      GLuint weightsBuffer,
-                      GLuint duWeightsBuffer,
-                      GLuint dvWeightsBuffer,
-                      int start,
-                      int end) const;
-
-    /// \brief Dispatch the GLSL compute kernel on GPU asynchronously
-    /// returns false if the kernel hasn't been compiled yet.
-    ///
-    /// @param srcBuffer        GL buffer of input primvar source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the srcBuffer
-    ///
-    /// @param dstBuffer        GL buffer of output primvar destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer         GL buffer of output derivative wrt u
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         GL buffer of output derivative wrt v
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        GL buffer of output 2nd derivative wrt u
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        GL buffer of output 2nd derivative wrt u and v
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        GL buffer of output 2nd derivative wrt v
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param sizesBuffer      GL buffer of the sizes in the stencil table
-    ///
-    /// @param offsetsBuffer    GL buffer of the offsets in the stencil table
-    ///
-    /// @param indicesBuffer    GL buffer of the indices in the stencil table
-    ///
-    /// @param weightsBuffer    GL buffer of the weights in the stencil table
-    ///
-    /// @param duWeightsBuffer  GL buffer of the du weights in the stencil table
-    ///
-    /// @param dvWeightsBuffer  GL buffer of the dv weights in the stencil table
-    ///
-    /// @param duuWeightsBuffer GL buffer of the duu weights in the stencil table
-    ///
-    /// @param duvWeightsBuffer GL buffer of the duv weights in the stencil table
-    ///
-    /// @param dvvWeightsBuffer GL buffer of the dvv weights in the stencil table
-    ///
-    /// @param start            start index of stencil table
-    ///
-    /// @param end              end index of stencil table
-    ///
-    bool EvalStencils(GLuint srcBuffer, BufferDescriptor const &srcDesc,
-                      GLuint dstBuffer, BufferDescriptor const &dstDesc,
-                      GLuint duBuffer,  BufferDescriptor const &duDesc,
-                      GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-                      GLuint duuBuffer, BufferDescriptor const &duuDesc,
-                      GLuint duvBuffer, BufferDescriptor const &duvDesc,
-                      GLuint dvvBuffer, BufferDescriptor const &dvvDesc,
-                      GLuint sizesBuffer,
-                      GLuint offsetsBuffer,
-                      GLuint indicesBuffer,
-                      GLuint weightsBuffer,
-                      GLuint duWeightsBuffer,
-                      GLuint dvWeightsBuffer,
-                      GLuint duuWeightsBuffer,
-                      GLuint duvWeightsBuffer,
-                      GLuint dvvWeightsBuffer,
-                      int start,
-                      int end) const;
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Limit evaluations with PatchTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor());
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetPatchArrays(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(),  duDesc,
-                           dvBuffer->BindVBO(),  dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetPatchArrays(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(),  duDesc,
-                           dvBuffer->BindVBO(),  dvDesc,
-                           duuBuffer->BindVBO(), duuDesc,
-                           duvBuffer->BindVBO(), duvDesc,
-                           dvvBuffer->BindVBO(), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetPatchArrays(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    bool EvalPatches(GLuint srcBuffer, BufferDescriptor const &srcDesc,
-                     GLuint dstBuffer, BufferDescriptor const &dstDesc,
-                     GLuint duBuffer,  BufferDescriptor const &duDesc,
-                     GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-                     int numPatchCoords,
-                     GLuint patchCoordsBuffer,
-                     const PatchArrayVector &patchArrays,
-                     GLuint patchIndexBuffer,
-                     GLuint patchParamsBuffer) const;
-
-    bool EvalPatches(GLuint srcBuffer, BufferDescriptor const &srcDesc,
-                     GLuint dstBuffer, BufferDescriptor const &dstDesc,
-                     GLuint duBuffer,  BufferDescriptor const &duDesc,
-                     GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-                     GLuint duuBuffer, BufferDescriptor const &duuDesc,
-                     GLuint duvBuffer, BufferDescriptor const &duvDesc,
-                     GLuint dvvBuffer, BufferDescriptor const &dvvDesc,
-                     int numPatchCoords,
-                     GLuint patchCoordsBuffer,
-                     const PatchArrayVector &patchArrays,
-                     GLuint patchIndexBuffer,
-                     GLuint patchParamsBuffer) const;
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor());
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetVaryingPatchArrays(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(),  duDesc,
-                           dvBuffer->BindVBO(),  dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetVaryingPatchArrays(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(), duDesc,
-                           dvBuffer->BindVBO(), dvDesc,
-                           duuBuffer->BindVBO(), duuDesc,
-                           duvBuffer->BindVBO(), duvDesc,
-                           dvvBuffer->BindVBO(), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetVaryingPatchArrays(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable, fvarChannel);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor());
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable, fvarChannel);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel = 0) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetFVarPatchArrays(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable, fvarChannel);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable, fvarChannel);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel = 0) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(), duDesc,
-                           dvBuffer->BindVBO(), dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetFVarPatchArrays(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        GLComputeEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable, fvarChannel);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable, fvarChannel);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel = 0) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(), duDesc,
-                           dvBuffer->BindVBO(), dvDesc,
-                           duuBuffer->BindVBO(), duuDesc,
-                           duvBuffer->BindVBO(), duvDesc,
-                           dvvBuffer->BindVBO(), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetFVarPatchArrays(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Other methods
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// Configure GLSL kernel. A valid GL context must be made current before
-    /// calling this function. Returns false if it fails to compile the kernel.
-    bool Compile(BufferDescriptor const &srcDesc,
-                 BufferDescriptor const &dstDesc,
-                 BufferDescriptor const &duDesc = BufferDescriptor(),
-                 BufferDescriptor const &dvDesc = BufferDescriptor(),
-                 BufferDescriptor const &duuDesc = BufferDescriptor(),
-                 BufferDescriptor const &duvDesc = BufferDescriptor(),
-                 BufferDescriptor const &dvvDesc = BufferDescriptor());
-
-    /// Wait the dispatched kernel finishes.
-    static void Synchronize(void *deviceContext);
-
-private:
-    struct _StencilKernel {
-        _StencilKernel();
-        ~_StencilKernel();
-        bool Compile(BufferDescriptor const &srcDesc,
-                     BufferDescriptor const &dstDesc,
-                     BufferDescriptor const &duDesc,
-                     BufferDescriptor const &dvDesc,
-                     BufferDescriptor const &duuDesc,
-                     BufferDescriptor const &duvDesc,
-                     BufferDescriptor const &dvvDesc,
-                     int workGroupSize);
-        GLuint program;
-        GLuint uniformStart;
-        GLuint uniformEnd;
-        GLuint uniformSrcOffset;
-        GLuint uniformDstOffset;
-        GLuint uniformDuDesc;
-        GLuint uniformDvDesc;
-        GLuint uniformDuuDesc;
-        GLuint uniformDuvDesc;
-        GLuint uniformDvvDesc;
-    } _stencilKernel;
-
-    struct _PatchKernel {
-        _PatchKernel();
-        ~_PatchKernel();
-        bool Compile(BufferDescriptor const &srcDesc,
-                     BufferDescriptor const &dstDesc,
-                     BufferDescriptor const &duDesc,
-                     BufferDescriptor const &dvDesc,
-                     BufferDescriptor const &duuDesc,
-                     BufferDescriptor const &duvDesc,
-                     BufferDescriptor const &dvvDesc,
-                     int workGroupSize);
-        GLuint program;
-        GLuint uniformSrcOffset;
-        GLuint uniformDstOffset;
-        GLuint uniformPatchArray;
-        GLuint uniformDuDesc;
-        GLuint uniformDvDesc;
-        GLuint uniformDuuDesc;
-        GLuint uniformDuvDesc;
-        GLuint uniformDvvDesc;
-    } _patchKernel;
-
-    int _workGroupSize;
-    GLuint _patchArraysSSBO;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-
-#endif  // OPENSUBDIV3_OSD_GL_COMPUTE_EVALUATOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glLegacyGregoryPatchTable.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glLegacyGregoryPatchTable.cpp
deleted file mode 100644
index ad48b7fbb..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glLegacyGregoryPatchTable.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "glLoader.h"
-
-#include "../osd/glLegacyGregoryPatchTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-GLLegacyGregoryPatchTable::GLLegacyGregoryPatchTable() :
-    _vertexTextureBuffer(0), _vertexValenceTextureBuffer(0),
-    _quadOffsetsTextureBuffer(0) {
-    _quadOffsetsBase[0] = _quadOffsetsBase[1] = 0;
-
-    // Initialize internal OpenGL loader library if necessary
-    OpenSubdiv::internal::GLLoader::libraryInitializeGL();
-}
-
-GLLegacyGregoryPatchTable::~GLLegacyGregoryPatchTable() {
-    if (_vertexTextureBuffer)
-        glDeleteTextures(1, &_vertexTextureBuffer);
-    if (_vertexValenceTextureBuffer)
-        glDeleteTextures(1, &_vertexValenceTextureBuffer);
-    if (_quadOffsetsTextureBuffer)
-        glDeleteTextures(1, &_quadOffsetsTextureBuffer);
-}
-
-GLLegacyGregoryPatchTable *
-GLLegacyGregoryPatchTable::Create(Far::PatchTable const *farPatchTable) {
-
-    GLLegacyGregoryPatchTable *result = new GLLegacyGregoryPatchTable();
-    glGenTextures(1, &result->_vertexTextureBuffer);
-    glGenTextures(1, &result->_vertexValenceTextureBuffer);
-    glGenTextures(1, &result->_quadOffsetsTextureBuffer);
-
-    Far::PatchTable::VertexValenceTable const &
-        valenceTable = farPatchTable->GetVertexValenceTable();
-    Far::PatchTable::QuadOffsetsTable const &
-        quadOffsetsTable = farPatchTable->GetQuadOffsetsTable();
-
-    if (! valenceTable.empty()) {
-        GLuint buffer;
-        glGenBuffers(1, &buffer);
-        glBindBuffer(GL_ARRAY_BUFFER, buffer);
-        glBufferData(GL_ARRAY_BUFFER, valenceTable.size() * sizeof(int),
-                     &valenceTable[0], GL_STATIC_DRAW);
-
-        glBindTexture(GL_TEXTURE_BUFFER, result->_vertexValenceTextureBuffer);
-        glTexBuffer(GL_TEXTURE_BUFFER, GL_R32I, buffer);
-        glBindTexture(GL_TEXTURE_BUFFER, 0);
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-        glDeleteBuffers(1, &buffer);
-    }
-
-    if (! quadOffsetsTable.empty()) {
-        GLuint buffer;
-        glGenBuffers(1, &buffer);
-        glBindBuffer(GL_ARRAY_BUFFER, buffer);
-        glBufferData(GL_ARRAY_BUFFER, quadOffsetsTable.size() * sizeof(int),
-                     &quadOffsetsTable[0], GL_STATIC_DRAW);
-
-        glBindTexture(GL_TEXTURE_BUFFER, result->_quadOffsetsTextureBuffer);
-        glTexBuffer(GL_TEXTURE_BUFFER, GL_R32I, buffer);
-        glBindTexture(GL_TEXTURE_BUFFER, 0);
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-        glDeleteBuffers(1, &buffer);
-    }
-
-    result->_quadOffsetsBase[0] = 0;
-    result->_quadOffsetsBase[1] = 0;
-    // scan patchtable to find quadOffsetsBase.
-    for (int i = 0; i < farPatchTable->GetNumPatchArrays(); ++i) {
-        // GREGORY_BOUNDARY's quadoffsets come after GREGORY's.
-        if (farPatchTable->GetPatchArrayDescriptor(i) ==
-            Far::PatchDescriptor::GREGORY) {
-            result->_quadOffsetsBase[1] = farPatchTable->GetNumPatches(i) * 4;
-            break;
-        }
-    }
-    return result;
-}
-
-void
-GLLegacyGregoryPatchTable::UpdateVertexBuffer(GLuint vbo) {
-    glBindTexture(GL_TEXTURE_BUFFER, _vertexTextureBuffer);
-    glTexBuffer(GL_TEXTURE_BUFFER, GL_R32F, vbo);
-    glBindTexture(GL_TEXTURE_BUFFER, 0);
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glLegacyGregoryPatchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glLegacyGregoryPatchTable.h
deleted file mode 100644
index 680bfaf4f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glLegacyGregoryPatchTable.h
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_GL_LEGACY_GREGORY_PATCH_TABLE_H
-#define OPENSUBDIV3_OSD_GL_LEGACY_GREGORY_PATCH_TABLE_H
-
-#include "../version.h"
-
-#include "../far/patchTable.h"
-#include "../osd/nonCopyable.h"
-#include "../osd/opengl.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class GLLegacyGregoryPatchTable
-    : private NonCopyable<GLLegacyGregoryPatchTable> {
-public:
-    ~GLLegacyGregoryPatchTable();
-
-    static GLLegacyGregoryPatchTable *Create(Far::PatchTable const *patchTable);
-
-    void UpdateVertexBuffer(GLuint vbo);
-
-    GLuint GetVertexTextureBuffer() const {
-        return _vertexTextureBuffer;
-    }
-
-    GLuint GetVertexValenceTextureBuffer() const {
-        return _vertexValenceTextureBuffer;
-    }
-
-    GLuint GetQuadOffsetsTextureBuffer() const {
-        return _quadOffsetsTextureBuffer;
-    }
-
-    GLuint GetQuadOffsetsBase(Far::PatchDescriptor::Type type) {
-        if (type == Far::PatchDescriptor::GREGORY_BOUNDARY) {
-            return _quadOffsetsBase[1];
-        }
-        return _quadOffsetsBase[0];
-    }
-
-protected:
-    GLLegacyGregoryPatchTable();
-
-private:
-    GLuint _vertexTextureBuffer;
-    GLuint _vertexValenceTextureBuffer;
-    GLuint _quadOffsetsTextureBuffer;
-    GLuint _quadOffsetsBase[2];       // gregory, boundaryGregory
-};
-
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_GL_LEGACY_GREGORY_PATCH_TABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glMesh.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glMesh.h
deleted file mode 100644
index 3237e3532..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glMesh.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_GL_MESH_H
-#define OPENSUBDIV3_OSD_GL_MESH_H
-
-#include "../version.h"
-
-#include "../osd/mesh.h"
-#include "../osd/glPatchTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-typedef MeshInterface<GLPatchTable> GLMeshInterface;
-
-
-} // end namespace Osd
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_GL_MESH_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glPatchTable.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glPatchTable.cpp
deleted file mode 100644
index 856e726fc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glPatchTable.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "glLoader.h"
-
-#include "../osd/glPatchTable.h"
-
-#include "../far/patchTable.h"
-#include "../osd/cpuPatchTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-GLPatchTable::GLPatchTable() :
-    _patchIndexBuffer(0), _patchParamBuffer(0),
-    _patchIndexTexture(0), _patchParamTexture(0) {
-
-    // Initialize internal OpenGL loader library if necessary
-    OpenSubdiv::internal::GLLoader::libraryInitializeGL();
-}
-
-GLPatchTable::~GLPatchTable() {
-    if (_patchIndexBuffer) glDeleteBuffers(1, &_patchIndexBuffer);
-    if (_patchParamBuffer) glDeleteBuffers(1, &_patchParamBuffer);
-    if (_patchIndexTexture) glDeleteTextures(1, &_patchIndexTexture);
-    if (_patchParamTexture) glDeleteTextures(1, &_patchParamTexture);
-    if (_varyingIndexBuffer) glDeleteBuffers(1, &_varyingIndexBuffer);
-    if (_varyingIndexTexture) glDeleteTextures(1, &_varyingIndexTexture);
-    for (int fvc=0; fvc<(int)_fvarIndexBuffers.size(); ++fvc) {
-        if (_fvarIndexBuffers[fvc]) glDeleteBuffers(1, &_fvarIndexBuffers[fvc]);
-    }
-    for (int fvc=0; fvc<(int)_fvarIndexTextures.size(); ++fvc) {
-        if (_fvarIndexTextures[fvc]) glDeleteTextures(1, &_fvarIndexTextures[fvc]);
-    }
-}
-
-GLPatchTable *
-GLPatchTable::Create(Far::PatchTable const *farPatchTable,
-                     void * /*deviceContext*/) {
-    GLPatchTable *instance = new GLPatchTable();
-    if (instance->allocate(farPatchTable)) return instance;
-    delete instance;
-    return 0;
-}
-
-bool
-GLPatchTable::allocate(Far::PatchTable const *farPatchTable) {
-    glGenBuffers(1, &_patchIndexBuffer);
-    glGenBuffers(1, &_patchParamBuffer);
-
-    CpuPatchTable patchTable(farPatchTable);
-
-    size_t numPatchArrays = patchTable.GetNumPatchArrays();
-    GLsizei indexSize = (GLsizei)patchTable.GetPatchIndexSize();
-    GLsizei patchParamSize = (GLsizei)patchTable.GetPatchParamSize();
-
-    // copy patch array
-    _patchArrays.assign(patchTable.GetPatchArrayBuffer(),
-                        patchTable.GetPatchArrayBuffer() + numPatchArrays);
-
-    // copy index buffer
-    glBindBuffer(GL_ARRAY_BUFFER, _patchIndexBuffer);
-    glBufferData(GL_ARRAY_BUFFER,
-                 indexSize * sizeof(GLint),
-                 patchTable.GetPatchIndexBuffer(),
-                 GL_STATIC_DRAW);
-
-    // copy patchparam buffer
-    glBindBuffer(GL_ARRAY_BUFFER, _patchParamBuffer);
-    glBufferData(GL_ARRAY_BUFFER,
-                 patchParamSize * sizeof(PatchParam),
-                 patchTable.GetPatchParamBuffer(),
-                 GL_STATIC_DRAW);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-    // make both buffer as texture buffers too.
-    glGenTextures(1, &_patchIndexTexture);
-    glGenTextures(1, &_patchParamTexture);
-
-    glBindTexture(GL_TEXTURE_BUFFER, _patchIndexTexture);
-    glTexBuffer(GL_TEXTURE_BUFFER, GL_R32I, _patchIndexBuffer);
-
-    glBindTexture(GL_TEXTURE_BUFFER, _patchParamTexture);
-    glTexBuffer(GL_TEXTURE_BUFFER, GL_RGB32I, _patchParamBuffer);
-
-    // varying
-    _varyingPatchArrays.assign(
-        patchTable.GetVaryingPatchArrayBuffer(),
-        patchTable.GetVaryingPatchArrayBuffer() + numPatchArrays);
-
-    glGenBuffers(1, &_varyingIndexBuffer);
-    glBindBuffer(GL_ARRAY_BUFFER, _varyingIndexBuffer);
-    glBufferData(GL_ARRAY_BUFFER,
-                 patchTable.GetVaryingPatchIndexSize() * sizeof(GLint),
-                 patchTable.GetVaryingPatchIndexBuffer(),
-                 GL_STATIC_DRAW);
-
-    glGenTextures(1, &_varyingIndexTexture);
-    glBindTexture(GL_TEXTURE_BUFFER, _varyingIndexTexture);
-    glTexBuffer(GL_TEXTURE_BUFFER, GL_R32I, _varyingIndexBuffer);
-
-    // face-varying
-    int numFVarChannels = patchTable.GetNumFVarChannels();
-    _fvarPatchArrays.resize(numFVarChannels);
-    _fvarIndexBuffers.resize(numFVarChannels);
-    _fvarIndexTextures.resize(numFVarChannels);
-    _fvarParamBuffers.resize(numFVarChannels);
-    _fvarParamTextures.resize(numFVarChannels);
-    for (int fvc=0; fvc<numFVarChannels; ++fvc) {
-        _fvarPatchArrays[fvc].assign(
-            patchTable.GetFVarPatchArrayBuffer(fvc),
-            patchTable.GetFVarPatchArrayBuffer(fvc) + numPatchArrays);
-
-        glGenBuffers(1, &_fvarIndexBuffers[fvc]);
-        glBindBuffer(GL_ARRAY_BUFFER, _fvarIndexBuffers[fvc]);
-        glBufferData(GL_ARRAY_BUFFER,
-                     patchTable.GetFVarPatchIndexSize(fvc) * sizeof(GLint),
-                     patchTable.GetFVarPatchIndexBuffer(fvc),
-                 GL_STATIC_DRAW);
-
-        glGenTextures(1, &_fvarIndexTextures[fvc]);
-        glBindTexture(GL_TEXTURE_BUFFER, _fvarIndexTextures[fvc]);
-        glTexBuffer(GL_TEXTURE_BUFFER, GL_R32I, _fvarIndexBuffers[fvc]);
-
-        glGenBuffers(1, &_fvarParamBuffers[fvc]);
-        glBindBuffer(GL_ARRAY_BUFFER, _fvarParamBuffers[fvc]);
-        glBufferData(GL_ARRAY_BUFFER,
-                     patchTable.GetFVarPatchParamSize(fvc) * sizeof(PatchParam),
-                     patchTable.GetFVarPatchParamBuffer(fvc),
-                 GL_STATIC_DRAW);
-
-        glGenTextures(1, &_fvarParamTextures[fvc]);
-        glBindTexture(GL_TEXTURE_BUFFER, _fvarParamTextures[fvc]);
-        glTexBuffer(GL_TEXTURE_BUFFER, GL_RGB32I, _fvarParamBuffers[fvc]);
-        glBindTexture(GL_TEXTURE_BUFFER, 0);
-    }
-
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-    glBindTexture(GL_TEXTURE_BUFFER, 0);
-
-    return true;
-}
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glPatchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glPatchTable.h
deleted file mode 100644
index 2269f31e6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glPatchTable.h
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_GL_PATCH_TABLE_H
-#define OPENSUBDIV3_OSD_GL_PATCH_TABLE_H
-
-#include "../version.h"
-
-#include "../osd/nonCopyable.h"
-#include "../osd/opengl.h"
-#include "../osd/types.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far{
-    class PatchTable;
-};
-
-namespace Osd {
-
-class GLPatchTable : private NonCopyable<GLPatchTable> {
-public:
-    typedef GLuint VertexBufferBinding;
-
-    ~GLPatchTable();
-
-    static GLPatchTable *Create(Far::PatchTable const *farPatchTable,
-                                void *deviceContext = NULL);
-
-    /// Returns the patch arrays for vertex index buffer data
-    PatchArrayVector const &GetPatchArrays() const {
-        return _patchArrays;
-    }
-
-    /// Returns the GL index buffer containing the patch control vertices
-    GLuint GetPatchIndexBuffer() const {
-        return _patchIndexBuffer;
-    }
-
-    /// Returns the GL index buffer containing the patch parameter
-    GLuint GetPatchParamBuffer() const {
-        return _patchParamBuffer;
-    }
-
-    /// Returns the GL texture buffer containing the patch control vertices
-    GLuint GetPatchIndexTextureBuffer() const {
-        return _patchIndexTexture;
-    }
-
-    /// Returns the GL texture buffer containing the patch parameter
-    GLuint GetPatchParamTextureBuffer() const {
-        return _patchParamTexture;
-    }
-
-    /// Returns the patch arrays for varying index buffer data
-    PatchArrayVector const &GetVaryingPatchArrays() const {
-        return _varyingPatchArrays;
-    }
-
-    /// Returns the GL index buffer containing the varying control vertices
-    GLuint GetVaryingPatchIndexBuffer() const {
-        return _varyingIndexBuffer;
-    }
-
-    /// Returns the GL texture buffer containing the varying control vertices
-    GLuint GetVaryingPatchIndexTextureBuffer() const {
-        return _varyingIndexTexture;
-    }
-
-    /// Returns the number of face-varying channel buffers
-    int GetNumFVarChannels() const { return (int)_fvarPatchArrays.size(); }
-
-    /// Returns the patch arrays for face-varying index buffer data
-    PatchArrayVector const &GetFVarPatchArrays(int fvarChannel = 0) const {
-        return _fvarPatchArrays[fvarChannel];
-    }
-
-    /// Returns the GL index buffer containing face-varying control vertices
-    GLuint GetFVarPatchIndexBuffer(int fvarChannel = 0) const {
-        return _fvarIndexBuffers[fvarChannel];
-    }
-
-    /// Returns the GL texture buffer containing face-varying control vertices
-    GLuint GetFVarPatchIndexTextureBuffer(int fvarChannel = 0) const {
-        return _fvarIndexTextures[fvarChannel];
-    }
-
-    /// Returns the GL index buffer containing face-varying patch params
-    GLuint GetFVarPatchParamBuffer(int fvarChannel = 0) const {
-        return _fvarParamBuffers[fvarChannel];
-    }
-
-    /// Returns the GL texture buffer containing face-varying patch params
-    GLuint GetFVarPatchParamTextureBuffer(int fvarChannel = 0) const {
-        return _fvarParamTextures[fvarChannel];
-    }
-
-protected:
-    GLPatchTable();
-
-    // allocate buffers from patchTable
-    bool allocate(Far::PatchTable const *farPatchTable);
-
-    PatchArrayVector _patchArrays;
-
-    GLuint _patchIndexBuffer;
-    GLuint _patchParamBuffer;
-
-    GLuint _patchIndexTexture;
-    GLuint _patchParamTexture;
-
-    PatchArrayVector _varyingPatchArrays;
-    GLuint _varyingIndexBuffer;
-    GLuint _varyingIndexTexture;
-
-    std::vector<PatchArrayVector> _fvarPatchArrays;
-    std::vector<GLuint> _fvarIndexBuffers;
-    std::vector<GLuint> _fvarIndexTextures;
-
-    std::vector<GLuint> _fvarParamBuffers;
-    std::vector<GLuint> _fvarParamTextures;
-};
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_GL_PATCH_TABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glVertexBuffer.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glVertexBuffer.cpp
deleted file mode 100644
index 181b3a3c1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glVertexBuffer.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "glLoader.h"
-
-#include "../osd/glVertexBuffer.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-GLVertexBuffer::GLVertexBuffer(int numElements, int numVertices)
-    : _numElements(numElements),
-      _numVertices(numVertices),
-      _vbo(0) {
-
-    // Initialize internal OpenGL loader library if necessary
-    OpenSubdiv::internal::GLLoader::libraryInitializeGL();
-}
-
-GLVertexBuffer::~GLVertexBuffer() {
-
-    glDeleteBuffers(1, &_vbo);
-}
-
-GLVertexBuffer *
-GLVertexBuffer::Create(int numElements, int numVertices, void *) {
-
-    GLVertexBuffer *instance =
-        new GLVertexBuffer(numElements, numVertices);
-    if (instance->allocate()) return instance;
-    delete instance;
-    return 0;
-}
-
-void
-GLVertexBuffer::UpdateData(const float *src, int startVertex, int numVertices,
-                           void * /*deviceContext*/) {
-
-    int size = numVertices * _numElements * (int) sizeof(float);
-#if defined(GL_ARB_direct_state_access)
-    if (OSD_OPENGL_HAS(ARB_direct_state_access)) {
-        glNamedBufferSubData(_vbo,
-                             startVertex * _numElements * sizeof(float),
-size, src);
-    } else
-#endif
-    {
-        glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-        glBufferSubData(GL_ARRAY_BUFFER,
-                        startVertex * _numElements * sizeof(float), size, src);
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-    }
-}
-
-int
-GLVertexBuffer::GetNumElements() const {
-
-    return _numElements;
-}
-
-int
-GLVertexBuffer::GetNumVertices() const {
-
-    return _numVertices;
-}
-
-GLuint
-GLVertexBuffer::BindVBO(void * /*deviceContext*/) {
-
-    return _vbo;
-}
-
-bool
-GLVertexBuffer::allocate() {
-
-    int size = _numElements * _numVertices * (int) sizeof(float);
-
-
-#if defined(GL_ARB_direct_state_access)
-    if (OSD_OPENGL_HAS(ARB_direct_state_access)) {
-        glCreateBuffers(1, &_vbo);
-        glNamedBufferDataEXT(_vbo, size, 0, GL_DYNAMIC_DRAW);
-    } else
-#endif
-    {
-        GLint prev = 0;
-        glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &prev);
-        glGenBuffers(1, &_vbo);
-        glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-        glBufferData(GL_ARRAY_BUFFER, size, 0, GL_DYNAMIC_DRAW);
-        glBindBuffer(GL_ARRAY_BUFFER, prev);
-    }
-
-    return true;
-}
-
-}  // end namespace Osd
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glVertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glVertexBuffer.h
deleted file mode 100644
index e034223dd..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glVertexBuffer.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_GL_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_GL_VERTEX_BUFFER_H
-
-#include "../version.h"
-
-#include "../osd/opengl.h"
-#include <cstddef>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-///
-/// \brief Concrete vertex buffer class for GLSL subdivision and OpenGL drawing.
-///
-/// GLVertexBuffer implements GLVertexBufferInterface. An instance
-/// of this buffer class can be passed to OsdGLComputeEvaluator.
-///
-class GLVertexBuffer {
-public:
-    /// Creator. Returns NULL if error.
-    static GLVertexBuffer * Create(int numElements, int numVertices,
-                                   void *deviceContext = NULL);
-
-    /// Destructor.
-    ~GLVertexBuffer();
-
-    /// This method is meant to be used in client code in order to provide coarse
-    /// vertices data to Osd.
-    void UpdateData(const float *src, int startVertex, int numVertices,
-                    void *deviceContext = NULL);
-
-    /// Returns how many elements defined in this vertex buffer.
-    int GetNumElements() const;
-
-    /// Returns how many vertices allocated in this vertex buffer.
-    int GetNumVertices() const;
-
-    /// Returns the GL buffer object.
-    GLuint BindVBO(void *deviceContext = NULL);
-
-protected:
-    /// Constructor.
-    GLVertexBuffer(int numElements, int numVertices);
-
-    /// Allocates VBO for this buffer.
-    /// Returns true if success.
-    bool allocate();
-
-private:
-    int _numElements;
-    int _numVertices;
-    GLuint _vbo;
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_GL_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glXFBEvaluator.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glXFBEvaluator.cpp
deleted file mode 100644
index 2fb8f90d9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glXFBEvaluator.cpp
+++ /dev/null
@@ -1,964 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "glLoader.h"
-
-#include "../osd/glXFBEvaluator.h"
-#include "../osd/glslPatchShaderSource.h"
-
-#include <sstream>
-#include <string>
-#include <vector>
-#include <cstdio>
-
-#include "../far/error.h"
-#include "../far/stencilTable.h"
-
-#if _MSC_VER
-    #define snprintf _snprintf
-#endif
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-static const char *shaderSource =
-#include "../osd/glslXFBKernel.gen.h"
-;
-
-template <class T> GLuint
-createGLTextureBuffer(std::vector<T> const & src, GLenum type) {
-    if (src.empty()) {
-        return 0;
-    }
-
-    GLint size = static_cast<int>(src.size()*sizeof(T));
-    void const * ptr = &src.at(0);
-
-    GLuint buffer = 0;
-    GLuint devicePtr = 0;
-
-#if defined(GL_ARB_direct_state_access)
-    if (OSD_OPENGL_HAS(ARB_direct_state_access)) {
-        glCreateBuffers(1, &buffer);
-        glNamedBufferData(buffer, size, ptr, GL_STATIC_DRAW);
-        glCreateTextures(GL_TEXTURE_BUFFER, 1, &devicePtr);
-        glTextureBuffer(devicePtr, type, buffer);
-    } else
-#endif
-    {
-        GLint prev = 0;
-
-        glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &prev);
-        glGenBuffers(1, &buffer);
-        glBindBuffer(GL_ARRAY_BUFFER, buffer);
-        glBufferData(GL_ARRAY_BUFFER, size, ptr, GL_STATIC_DRAW);
-        glBindBuffer(GL_ARRAY_BUFFER, prev);
-
-        glGetIntegerv(GL_TEXTURE_BINDING_BUFFER, &prev);
-        glGenTextures(1, &devicePtr);
-        glBindTexture(GL_TEXTURE_BUFFER, devicePtr);
-        glTexBuffer(GL_TEXTURE_BUFFER, type, buffer);
-        glBindTexture(GL_TEXTURE_BUFFER, prev);
-    }
-
-    glDeleteBuffers(1, &buffer);
-
-    return devicePtr;
-}
-
-GLStencilTableTBO::GLStencilTableTBO(
-    Far::StencilTable const *stencilTable) {
-
-    _numStencils = stencilTable->GetNumStencils();
-    if (_numStencils > 0) {
-        _sizes   = createGLTextureBuffer(stencilTable->GetSizes(), GL_R32UI);
-        _offsets = createGLTextureBuffer(
-            stencilTable->GetOffsets(), GL_R32I);
-        _indices = createGLTextureBuffer(
-            stencilTable->GetControlIndices(), GL_R32I);
-        _weights = createGLTextureBuffer(stencilTable->GetWeights(), GL_R32F);
-        _duWeights = _dvWeights = 0;
-        _duuWeights = _duvWeights = _dvvWeights = 0;
-    } else {
-        _sizes = _offsets = _indices = _weights = 0;
-        _duWeights = _dvWeights = 0;
-        _duuWeights = _duvWeights = _dvvWeights = 0;
-    }
-}
-
-GLStencilTableTBO::GLStencilTableTBO(
-    Far::LimitStencilTable const *limitStencilTable) {
-
-    _numStencils = limitStencilTable->GetNumStencils();
-    if (_numStencils > 0) {
-        _sizes   = createGLTextureBuffer(
-            limitStencilTable->GetSizes(), GL_R32UI);
-        _offsets = createGLTextureBuffer(
-            limitStencilTable->GetOffsets(), GL_R32I);
-        _indices = createGLTextureBuffer(
-            limitStencilTable->GetControlIndices(), GL_R32I);
-        _weights = createGLTextureBuffer(
-            limitStencilTable->GetWeights(), GL_R32F);
-        _duWeights = createGLTextureBuffer(
-            limitStencilTable->GetDuWeights(), GL_R32F);
-        _dvWeights = createGLTextureBuffer(
-            limitStencilTable->GetDvWeights(), GL_R32F);
-        _duuWeights = createGLTextureBuffer(
-            limitStencilTable->GetDuuWeights(), GL_R32F);
-        _duvWeights = createGLTextureBuffer(
-            limitStencilTable->GetDuvWeights(), GL_R32F);
-        _dvvWeights = createGLTextureBuffer(
-            limitStencilTable->GetDvvWeights(), GL_R32F);
-    } else {
-        _sizes = _offsets = _indices = _weights = 0;
-        _duWeights = _dvWeights = 0;
-        _duuWeights = _duvWeights = _dvvWeights = 0;
-    }
-}
-
-GLStencilTableTBO::~GLStencilTableTBO() {
-    if (_sizes) glDeleteTextures(1, &_sizes);
-    if (_offsets) glDeleteTextures(1, &_offsets);
-    if (_indices) glDeleteTextures(1, &_indices);
-    if (_weights) glDeleteTextures(1, &_weights);
-    if (_duWeights) glDeleteTextures(1, &_duWeights);
-    if (_dvWeights) glDeleteTextures(1, &_dvWeights);
-    if (_duuWeights) glDeleteTextures(1, &_duuWeights);
-    if (_duvWeights) glDeleteTextures(1, &_duvWeights);
-    if (_dvvWeights) glDeleteTextures(1, &_dvvWeights);
-}
-
-// ---------------------------------------------------------------------------
-
-GLXFBEvaluator::GLXFBEvaluator(bool interleavedDerivativeBuffers)
-    : _srcBufferTexture(0),
-      _patchArraysUBO(0),
-      _interleavedDerivativeBuffers(interleavedDerivativeBuffers) {
-
-    // Initialize internal OpenGL loader library if necessary
-    OpenSubdiv::internal::GLLoader::libraryInitializeGL();
-}
-
-GLXFBEvaluator::~GLXFBEvaluator() {
-    if (_srcBufferTexture) {
-        glDeleteTextures(1, &_srcBufferTexture);
-    }
-    if (_patchArraysUBO) {
-        glDeleteBuffers(1, &_patchArraysUBO);
-    }
-}
-
-static GLuint
-compileKernel(BufferDescriptor const &srcDesc,
-              BufferDescriptor const &dstDesc,
-              BufferDescriptor const &duDesc,
-              BufferDescriptor const &dvDesc,
-              BufferDescriptor const &duuDesc,
-              BufferDescriptor const &duvDesc,
-              BufferDescriptor const &dvvDesc,
-              const char *kernelDefine,
-              bool interleavedDerivativeBuffers) {
-
-    GLuint program = glCreateProgram();
-
-    GLuint vertexShader = glCreateShader(GL_VERTEX_SHADER);
-
-    std::string patchBasisShaderSource =
-        GLSLPatchShaderSource::GetPatchBasisShaderSource();
-    const char *patchBasisShaderSourceDefine = "#define OSD_PATCH_BASIS_GLSL\n";
-
-    std::ostringstream defines;
-    defines << "#define LENGTH " << srcDesc.length << "\n"
-            << "#define SRC_STRIDE " << srcDesc.stride << "\n"
-            << "#define VERTEX_SHADER\n"
-            << kernelDefine << "\n"
-            << patchBasisShaderSourceDefine << "\n";
-
-    bool deriv1 = (duDesc.length > 0 || dvDesc.length > 0);
-    bool deriv2 = (duuDesc.length > 0 || duvDesc.length > 0 || dvvDesc.length > 0);
-    if (deriv1) {
-        defines << "#define OPENSUBDIV_GLSL_XFB_USE_1ST_DERIVATIVES\n";
-        if (interleavedDerivativeBuffers) {
-            defines <<
-                "#define OPENSUBDIV_GLSL_XFB_INTERLEAVED_1ST_DERIVATIVE_BUFFERS\n";
-        }
-    }
-    if (deriv2) {
-        defines << "#define OPENSUBDIV_GLSL_XFB_USE_2ND_DERIVATIVES\n";
-        if (interleavedDerivativeBuffers) {
-            defines <<
-                "#define OPENSUBDIV_GLSL_XFB_INTERLEAVED_2ND_DERIVATIVE_BUFFERS\n";
-        }
-    }
-
-    std::string defineStr = defines.str();
-
-    const char *shaderSources[4] = {"#version 410\n", NULL, NULL, NULL};
-
-    shaderSources[1] = defineStr.c_str();
-    shaderSources[2] = patchBasisShaderSource.c_str();
-    shaderSources[3] = shaderSource;
-    glShaderSource(vertexShader, 4, shaderSources, NULL);
-    glCompileShader(vertexShader);
-    glAttachShader(program, vertexShader);
-
-    std::vector<std::string> outputs;
-    char attrName[32];
-    {
-        // vertex data (may include custom vertex data) and varying data
-        // are stored into the same buffer, interleaved.
-        //
-        // (gl_SkipComponents1)
-        // outVertexData[0]
-        // outVertexData[1]
-        // outVertexData[2]
-        // (gl_SkipComponents1)
-        //
-        // note that "primvarOffset" in shader is still needed to read
-        // interleaved components even if gl_SkipComponents is used.
-        //
-        int primvarOffset = (dstDesc.offset % dstDesc.stride);
-        for (int i = 0; i < primvarOffset; ++i) {
-            outputs.push_back("gl_SkipComponents1");
-        }
-        for (int i = 0; i < dstDesc.length; ++i) {
-            snprintf(attrName, sizeof(attrName), "outVertexBuffer[%d]", i);
-            outputs.push_back(attrName);
-        }
-        for (int i = primvarOffset + dstDesc.length; i < dstDesc.stride; ++i) {
-            outputs.push_back("gl_SkipComponents1");
-        }
-    }
-    //
-    // For derivatives, we use another buffer bindings so gl_NextBuffer
-    // is inserted here to switch the destination of transform feedback.
-    //
-    // Note that the destination buffers may or may not be interleaved between
-    // vertex and each derivatives. gl_NextBuffer seems still works well
-    // in either case.
-    //
-    // If we know that the buffers for derivatives are interleaved, then we
-    // can use fewer buffer bindings. This can be important, since most GL
-    // implementations will support only up to 4 transform feedback bindings.
-    //
-    if (deriv1 && interleavedDerivativeBuffers) {
-        outputs.push_back("gl_NextBuffer");
-
-        int primvar1Offset = (duDesc.offset % duDesc.stride);
-        int primvar2Offset = (dvDesc.offset % dvDesc.stride);
-
-        for (int i = 0; i < primvar1Offset; ++i) {
-            outputs.push_back("gl_SkipComponents1");
-        }
-        for (int i = 0; i < duDesc.length; ++i) {
-            snprintf(attrName, sizeof(attrName), "outDeriv1Buffer[%d]", i);
-            outputs.push_back(attrName);
-        }
-        for (int i = primvar1Offset + duDesc.length; i < primvar2Offset; ++i) {
-            outputs.push_back("gl_SkipComponents1");
-        }
-        for (int i = 0; i < dvDesc.length; ++i) {
-            snprintf(attrName, sizeof(attrName), "outDeriv1Buffer[%d]", i+duDesc.length);
-            outputs.push_back(attrName);
-        }
-        for (int i = primvar2Offset + dvDesc.length; i < dvDesc.stride; ++i) {
-            outputs.push_back("gl_SkipComponents1");
-        }
-    } else {
-        if (duDesc.length) {
-            outputs.push_back("gl_NextBuffer");
-            int primvarOffset = (duDesc.offset % duDesc.stride);
-            for (int i = 0; i < primvarOffset; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-            for (int i = 0; i < duDesc.length; ++i) {
-                snprintf(attrName, sizeof(attrName), "outDuBuffer[%d]", i);
-                outputs.push_back(attrName);
-            }
-            for (int i = primvarOffset + duDesc.length; i < duDesc.stride; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-        }
-        if (dvDesc.length) {
-            outputs.push_back("gl_NextBuffer");
-            int primvarOffset = (dvDesc.offset % dvDesc.stride);
-            for (int i = 0; i < primvarOffset; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-            for (int i = 0; i < dvDesc.length; ++i) {
-                snprintf(attrName, sizeof(attrName), "outDvBuffer[%d]", i);
-                outputs.push_back(attrName);
-            }
-            for (int i = primvarOffset + dvDesc.length; i < dvDesc.stride; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-        }
-    }
-    if (deriv2 && interleavedDerivativeBuffers) {
-        outputs.push_back("gl_NextBuffer");
-
-        int primvar1Offset = (duuDesc.offset % duuDesc.stride);
-        int primvar2Offset = (duvDesc.offset % duvDesc.stride);
-        int primvar3Offset = (dvvDesc.offset % dvvDesc.stride);
-
-        for (int i = 0; i < primvar1Offset; ++i) {
-            outputs.push_back("gl_SkipComponents1");
-        }
-        for (int i = 0; i < duuDesc.length; ++i) {
-            snprintf(attrName, sizeof(attrName), "outDeriv2Buffer[%d]", i);
-            outputs.push_back(attrName);
-        }
-
-        for (int i = primvar1Offset + duuDesc.length; i < primvar2Offset; ++i) {
-            outputs.push_back("gl_SkipComponents1");
-        }
-        for (int i = 0; i < duvDesc.length; ++i) {
-            snprintf(attrName, sizeof(attrName), "outDeriv2Buffer[%d]", i+duuDesc.length);
-            outputs.push_back(attrName);
-        }
-
-        for (int i = primvar2Offset + duvDesc.length; i < primvar3Offset; ++i) {
-            outputs.push_back("gl_SkipComponents1");
-        }
-        for (int i = 0; i < dvvDesc.length; ++i) {
-            snprintf(attrName, sizeof(attrName), "outDeriv2Buffer[%d]", i+duuDesc.length+duvDesc.length);
-            outputs.push_back(attrName);
-        }
-
-        for (int i = primvar3Offset + dvvDesc.length; i < dvvDesc.stride; ++i) {
-            outputs.push_back("gl_SkipComponents1");
-        }
-    } else {
-        if (duuDesc.length) {
-            outputs.push_back("gl_NextBuffer");
-            int primvarOffset = (duuDesc.offset % duuDesc.stride);
-            for (int i = 0; i < primvarOffset; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-            for (int i = 0; i < duuDesc.length; ++i) {
-                snprintf(attrName, sizeof(attrName), "outDuuBuffer[%d]", i);
-                outputs.push_back(attrName);
-            }
-            for (int i = primvarOffset + duuDesc.length; i < duuDesc.stride; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-        }
-        if (duvDesc.length) {
-            outputs.push_back("gl_NextBuffer");
-            int primvarOffset = (duvDesc.offset % duvDesc.stride);
-            for (int i = 0; i < primvarOffset; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-            for (int i = 0; i < duvDesc.length; ++i) {
-                snprintf(attrName, sizeof(attrName), "outDuvBuffer[%d]", i);
-                outputs.push_back(attrName);
-            }
-            for (int i = primvarOffset + duvDesc.length; i < duvDesc.stride; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-        }
-        if (dvvDesc.length) {
-            outputs.push_back("gl_NextBuffer");
-            int primvarOffset = (dvvDesc.offset % dvvDesc.stride);
-            for (int i = 0; i < primvarOffset; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-            for (int i = 0; i < dvvDesc.length; ++i) {
-                snprintf(attrName, sizeof(attrName), "outDvvBuffer[%d]", i);
-                outputs.push_back(attrName);
-            }
-            for (int i = primvarOffset + dvvDesc.length; i < dvvDesc.stride; ++i) {
-                outputs.push_back("gl_SkipComponents1");
-            }
-        }
-    }
-    // convert to char* array
-    std::vector<const char *> pOutputs;
-    for (size_t i = 0; i < outputs.size(); ++i) {
-        pOutputs.push_back(&outputs[i][0]);
-    }
-
-    glTransformFeedbackVaryings(program, (GLsizei)outputs.size(),
-                                &pOutputs[0], GL_INTERLEAVED_ATTRIBS);
-
-    GLint linked = 0;
-    glLinkProgram(program);
-    glGetProgramiv(program, GL_LINK_STATUS, &linked);
-
-    if (linked == GL_FALSE) {
-        char buffer[1024];
-        glGetShaderInfoLog(vertexShader, 1024, NULL, buffer);
-        Far::Error(Far::FAR_RUNTIME_ERROR, buffer);
-
-        glGetProgramInfoLog(program, 1024, NULL, buffer);
-        Far::Error(Far::FAR_RUNTIME_ERROR, buffer);
-
-        glDeleteProgram(program);
-        program = 0;
-    }
-
-    glDeleteShader(vertexShader);
-
-    return program;
-}
-
-bool
-GLXFBEvaluator::Compile(BufferDescriptor const &srcDesc,
-                        BufferDescriptor const &dstDesc,
-                        BufferDescriptor const &duDesc,
-                        BufferDescriptor const &dvDesc,
-                        BufferDescriptor const &duuDesc,
-                        BufferDescriptor const &duvDesc,
-                        BufferDescriptor const &dvvDesc) {
-
-    // create a stencil kernel
-    _stencilKernel.Compile(srcDesc, dstDesc, duDesc, dvDesc,
-                           duuDesc, duvDesc, dvvDesc,
-                           _interleavedDerivativeBuffers);
-
-    // create a patch kernel
-    _patchKernel.Compile(srcDesc, dstDesc, duDesc, dvDesc,
-                         duuDesc, duvDesc, dvvDesc,
-                         _interleavedDerivativeBuffers);
-
-    // create a texture for input buffer
-    if (!_srcBufferTexture) {
-        glGenTextures(1, &_srcBufferTexture);
-    }
-    if (!_patchArraysUBO) {
-        glGenBuffers(1, &_patchArraysUBO);
-    }
-    return true;
-}
-
-/* static */
-void
-GLXFBEvaluator::Synchronize(void * /*kernel*/) {
-    // XXX: this is currently just for the test purpose.
-    // need to be reimplemented by fence and sync.
-    glFinish();
-}
-
-static void
-bindTexture(GLint sampler, GLuint texture, int unit) {
-    if (sampler == -1) {
-        return;
-    }
-    glUniform1i(sampler, unit);
-    glActiveTexture(GL_TEXTURE0 + unit);
-    glBindTexture(GL_TEXTURE_BUFFER, texture);
-    glActiveTexture(GL_TEXTURE0);
-}
-
-bool
-GLXFBEvaluator::EvalStencils(
-    GLuint srcBuffer, BufferDescriptor const &srcDesc,
-    GLuint dstBuffer, BufferDescriptor const &dstDesc,
-    GLuint duBuffer,  BufferDescriptor const &duDesc,
-    GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-    GLuint sizesBuffer,
-    GLuint offsetsBuffer,
-    GLuint indicesBuffer,
-    GLuint weightsBuffer,
-    GLuint duWeightsBuffer,
-    GLuint dvWeightsBuffer,
-    int start, int end) const {
-
-    return EvalStencils(srcBuffer, srcDesc,
-                        dstBuffer, dstDesc,
-                        duBuffer, duDesc,
-                        dvBuffer, dvDesc,
-                        0, BufferDescriptor(),
-                        0, BufferDescriptor(),
-                        0, BufferDescriptor(),
-                        sizesBuffer, offsetsBuffer, indicesBuffer,
-                        weightsBuffer,
-                        duWeightsBuffer, dvWeightsBuffer,
-                        0, 0, 0,
-                        start, end);
-}
-
-bool
-GLXFBEvaluator::EvalStencils(
-    GLuint srcBuffer, BufferDescriptor const &srcDesc,
-    GLuint dstBuffer, BufferDescriptor const &dstDesc,
-    GLuint duBuffer,  BufferDescriptor const &duDesc,
-    GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-    GLuint duuBuffer, BufferDescriptor const &duuDesc,
-    GLuint duvBuffer, BufferDescriptor const &duvDesc,
-    GLuint dvvBuffer, BufferDescriptor const &dvvDesc,
-    GLuint sizesTexture,
-    GLuint offsetsTexture,
-    GLuint indicesTexture,
-    GLuint weightsTexture,
-    GLuint duWeightsTexture,
-    GLuint dvWeightsTexture,
-    GLuint duuWeightsTexture,
-    GLuint duvWeightsTexture,
-    GLuint dvvWeightsTexture,
-    int start, int end) const {
-
-    if (!_stencilKernel.program) return false;
-    int count = end - start;
-    if (count <= 0) {
-        return true;
-    }
-
-    // bind vertex array
-    // always create new one, to be safe with multiple contexts (slow though)
-    GLuint vao = 0;
-    glGenVertexArrays(1, &vao);
-    glBindVertexArray(vao);
-
-    glEnable(GL_RASTERIZER_DISCARD);
-    glUseProgram(_stencilKernel.program);
-
-    // Set input VBO as a texture buffer.
-    glBindTexture(GL_TEXTURE_BUFFER, _srcBufferTexture);
-    glTexBuffer(GL_TEXTURE_BUFFER, GL_R32F, srcBuffer);
-    glBindTexture(GL_TEXTURE_BUFFER, 0);
-
-    bindTexture(_stencilKernel.uniformSrcBufferTexture, _srcBufferTexture, 0);
-
-    // bind stencil table textures.
-    bindTexture(_stencilKernel.uniformSizesTexture,   sizesTexture, 1);
-    bindTexture(_stencilKernel.uniformOffsetsTexture, offsetsTexture, 2);
-    bindTexture(_stencilKernel.uniformIndicesTexture, indicesTexture, 3);
-    bindTexture(_stencilKernel.uniformWeightsTexture, weightsTexture, 4);
-    if (_stencilKernel.uniformDuWeightsTexture >= 0 && duWeightsTexture)
-        bindTexture(_stencilKernel.uniformDuWeightsTexture, duWeightsTexture, 5);
-    if (_stencilKernel.uniformDvWeightsTexture >= 0 && dvWeightsTexture)
-        bindTexture(_stencilKernel.uniformDvWeightsTexture, dvWeightsTexture, 6);
-    if (_stencilKernel.uniformDuuWeightsTexture >= 0 && duuWeightsTexture)
-        bindTexture(_stencilKernel.uniformDuuWeightsTexture, duuWeightsTexture, 7);
-    if (_stencilKernel.uniformDuvWeightsTexture >= 0 && duvWeightsTexture)
-        bindTexture(_stencilKernel.uniformDuvWeightsTexture, duvWeightsTexture, 8);
-    if (_stencilKernel.uniformDvvWeightsTexture >= 0 && dvvWeightsTexture)
-        bindTexture(_stencilKernel.uniformDvvWeightsTexture, dvvWeightsTexture, 9);
-
-    // set batch range
-    glUniform1i(_stencilKernel.uniformStart,     start);
-    glUniform1i(_stencilKernel.uniformEnd,       end);
-    glUniform1i(_stencilKernel.uniformSrcOffset, srcDesc.offset);
-
-    // The destination buffer is bound at vertex boundary.
-    //
-    // Example: When we have a batched and interleaved vertex buffer
-    //
-    //  Obj  X    |    Obj Y                                  |
-    // -----------+-------------------------------------------+-------
-    //            |    vtx 0      |    vtx 1      |           |
-    // -----------+---------------+---------------+-----------+-------
-    //            | x y z r g b a | x y z r g b a | ....      |
-    // -----------+---------------+---------------+-----------+-------
-    //                    ^
-    //                    srcDesc.offset for Obj Y color
-    //
-    //            ^-------------------------------------------^
-    //                    XFB destination buffer range
-    //              S S S * * * *
-    //              k k k
-    //              i i i
-    //              p p p
-    //
-    //  We use gl_SkipComponents to skip the first 3 XYZ so the
-    //  buffer itself needs to be bound for entire section of ObjY.
-    //
-    //  Note that for the source buffer (texture) we bind the whole
-    //  buffer (all VBO range) and use srcOffset=srcDesc.offset for
-    //  indexing.
-    //
-    int dstBufferBindOffset = dstDesc.stride ?
-        (dstDesc.offset - (dstDesc.offset % dstDesc.stride)) : 0;
-    int duBufferBindOffset = duDesc.stride ?
-        (duDesc.offset - (duDesc.offset % duDesc.stride)) : 0;
-    int dvBufferBindOffset = dvDesc.stride ?
-        (dvDesc.offset - (dvDesc.offset % dvDesc.stride)) : 0;
-    int duuBufferBindOffset = duuDesc.stride ?
-        (duuDesc.offset - (duuDesc.offset % duuDesc.stride)) : 0;
-    int duvBufferBindOffset = duvDesc.stride ?
-        (duvDesc.offset - (duvDesc.offset % duvDesc.stride)) : 0;
-    int dvvBufferBindOffset = dvvDesc.stride ?
-        (dvvDesc.offset - (dvvDesc.offset % dvvDesc.stride)) : 0;
-
-    // bind destination buffer
-    glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                      0, dstBuffer,
-                      dstBufferBindOffset * sizeof(float),
-                      count * dstDesc.stride * sizeof(float));
-
-    if ((duDesc.length > 0) && _interleavedDerivativeBuffers) {
-        glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                          1, duBuffer,
-                          duBufferBindOffset * sizeof(float),
-                          count * duDesc.stride * sizeof(float));
-    } else {
-        if (duDesc.length > 0) {
-            glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                              1, duBuffer,
-                              duBufferBindOffset * sizeof(float),
-                              count * duDesc.stride * sizeof(float));
-        }
-
-        if (dvDesc.length > 0) {
-            glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                              2, dvBuffer,
-                              dvBufferBindOffset * sizeof(float),
-                              count * dvDesc.stride * sizeof(float));
-        }
-    }
-
-    if ((duuDesc.length > 0) && _interleavedDerivativeBuffers) {
-        glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                          2, duuBuffer,
-                          duuBufferBindOffset * sizeof(float),
-                          count * duuDesc.stride * sizeof(float));
-    } else {
-        if (duuDesc.length > 0) {
-            glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                              3, duuBuffer,
-                              duuBufferBindOffset * sizeof(float),
-                              count * duuDesc.stride * sizeof(float));
-        }
-
-        if (duvDesc.length > 0) {
-            glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                              4, duvBuffer,
-                              duvBufferBindOffset * sizeof(float),
-                              count * duvDesc.stride * sizeof(float));
-        }
-
-        if (dvvDesc.length > 0) {
-            glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                              5, dvvBuffer,
-                              dvvBufferBindOffset * sizeof(float),
-                              count * dvvDesc.stride * sizeof(float));
-        }
-    }
-
-    glBeginTransformFeedback(GL_POINTS);
-    glDrawArrays(GL_POINTS, 0, count);
-    glEndTransformFeedback();
-
-    glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, 0);
-
-    for (int i = 0; i < 6; ++i) {
-        glActiveTexture(GL_TEXTURE0 + i);
-        glBindTexture(GL_TEXTURE_BUFFER, 0);
-    }
-
-    glDisable(GL_RASTERIZER_DISCARD);
-    glUseProgram(0);
-    glActiveTexture(GL_TEXTURE0);
-
-    // revert vao
-    glBindVertexArray(0);
-    glDeleteVertexArrays(1, &vao);
-
-    return true;
-}
-
-
-bool
-GLXFBEvaluator::EvalPatches(
-    GLuint srcBuffer, BufferDescriptor const &srcDesc,
-    GLuint dstBuffer, BufferDescriptor const &dstDesc,
-    GLuint duBuffer,  BufferDescriptor const &duDesc,
-    GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-    int numPatchCoords,
-    GLuint patchCoordsBuffer,
-    const PatchArrayVector &patchArrays,
-    GLuint patchIndexTexture,
-    GLuint patchParamTexture) const {
-
-    return EvalPatches(srcBuffer, srcDesc,
-                       dstBuffer, dstDesc,
-                       duBuffer, duDesc,
-                       dvBuffer, dvDesc,
-                       0, BufferDescriptor(),
-                       0, BufferDescriptor(),
-                       0, BufferDescriptor(),
-                       numPatchCoords,
-                       patchCoordsBuffer, patchArrays,
-                       patchIndexTexture,
-                       patchParamTexture);
-}
-
-bool
-GLXFBEvaluator::EvalPatches(
-    GLuint srcBuffer, BufferDescriptor const &srcDesc,
-    GLuint dstBuffer, BufferDescriptor const &dstDesc,
-    GLuint duBuffer,  BufferDescriptor const &duDesc,
-    GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-    GLuint duuBuffer, BufferDescriptor const &duuDesc,
-    GLuint duvBuffer, BufferDescriptor const &duvDesc,
-    GLuint dvvBuffer, BufferDescriptor const &dvvDesc,
-    int numPatchCoords,
-    GLuint patchCoordsBuffer,
-    const PatchArrayVector &patchArrays,
-    GLuint patchIndexTexture,
-    GLuint patchParamTexture) const {
-
-    bool deriv1 = (duDesc.length > 0 || dvDesc.length > 0);
-    bool deriv2 = (duuDesc.length > 0 || duvDesc.length > 0 || dvvDesc.length > 0);
-
-    if (!_patchKernel.program) return false;
-
-    // bind vertex array
-    // always create new one, to be safe with multiple contexts (slow though)
-    GLuint vao = 0;
-    glGenVertexArrays(1, &vao);
-    glBindVertexArray(vao);
-
-    glEnable(GL_RASTERIZER_DISCARD);
-    glUseProgram(_patchKernel.program);
-
-    // Set input VBO as a texture buffer.
-    glBindTexture(GL_TEXTURE_BUFFER, _srcBufferTexture);
-    glTexBuffer(GL_TEXTURE_BUFFER, GL_R32F, srcBuffer);
-    glBindTexture(GL_TEXTURE_BUFFER, 0);
-
-    bindTexture(_patchKernel.uniformSrcBufferTexture, _srcBufferTexture, 0);
-
-    // bind patch index and patch param textures.
-    bindTexture(_patchKernel.uniformPatchParamTexture, patchParamTexture, 1);
-    bindTexture(_patchKernel.uniformPatchIndexTexture, patchIndexTexture, 2);
-
-    // bind patch arrays UBO (std140 struct size padded to vec4 alignment)
-    int patchArraySize =
-        sizeof(GLint) * ((sizeof(PatchArray)/sizeof(GLint) + 3) & ~3);
-    glBindBuffer(GL_UNIFORM_BUFFER, _patchArraysUBO);
-    glBufferData(GL_UNIFORM_BUFFER,
-        patchArrays.size()*patchArraySize, NULL, GL_STATIC_DRAW);
-    for (int i=0; i<(int)patchArrays.size(); ++i) {
-        glBufferSubData(GL_UNIFORM_BUFFER,
-            i*patchArraySize, sizeof(PatchArray), &patchArrays[i]);
-    }
-    glBindBufferBase(GL_UNIFORM_BUFFER,
-        _patchKernel.uniformPatchArraysUBOBinding, _patchArraysUBO);
-
-    // set other uniforms
-    glUniform1i(_patchKernel.uniformSrcOffset, srcDesc.offset);
-
-    // input patchcoords
-    glEnableVertexAttribArray(0);
-    glEnableVertexAttribArray(1);
-    int stride = sizeof(int) * 5; // patchcoord = int*5 struct
-    glBindBuffer(GL_ARRAY_BUFFER, patchCoordsBuffer);
-    glVertexAttribIPointer(0, 3, GL_UNSIGNED_INT, stride, (void*)0);
-    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, stride, (void*)(sizeof(int)*3));
-
-    int dstBufferBindOffset =
-        dstDesc.offset - (dstDesc.offset % dstDesc.stride);
-    int duBufferBindOffset = duDesc.stride
-        ? (duDesc.offset - (duDesc.offset % duDesc.stride))
-        : 0;
-    int dvBufferBindOffset = dvDesc.stride
-        ? (dvDesc.offset - (dvDesc.offset % dvDesc.stride))
-        : 0;
-    int duuBufferBindOffset = duuDesc.stride
-        ? (duuDesc.offset - (duuDesc.offset % duuDesc.stride))
-        : 0;
-    int duvBufferBindOffset = duvDesc.stride
-        ? (duvDesc.offset - (duvDesc.offset % duvDesc.stride))
-        : 0;
-    int dvvBufferBindOffset = dvvDesc.stride
-        ? (dvvDesc.offset - (dvvDesc.offset % dvvDesc.stride))
-        : 0;
-
-    // bind destination buffer
-    glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                      0, dstBuffer,
-                      dstBufferBindOffset * sizeof(float),
-                      numPatchCoords * dstDesc.stride * sizeof(float));
-
-    if (deriv1 && _interleavedDerivativeBuffers) {
-        glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                          1, duBuffer,
-                          duBufferBindOffset * sizeof(float),
-                          numPatchCoords * duDesc.stride * sizeof(float));
-    } else if (deriv1) {
-        glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                          1, duBuffer,
-                          duBufferBindOffset * sizeof(float),
-                          numPatchCoords * duDesc.stride * sizeof(float));
-
-        glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                          2, dvBuffer,
-                          dvBufferBindOffset * sizeof(float),
-                          numPatchCoords * dvDesc.stride * sizeof(float));
-    }
-    if (deriv2 && _interleavedDerivativeBuffers) {
-        glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                          2, duuBuffer,
-                          duuBufferBindOffset * sizeof(float),
-                          numPatchCoords * duuDesc.stride * sizeof(float));
-    } else if (deriv2) {
-        glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                          3, duuBuffer,
-                          duuBufferBindOffset * sizeof(float),
-                          numPatchCoords * duuDesc.stride * sizeof(float));
-
-        glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                          4, duvBuffer,
-                          duvBufferBindOffset * sizeof(float),
-                          numPatchCoords * duvDesc.stride * sizeof(float));
-
-        glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
-                          5, dvvBuffer,
-                          dvvBufferBindOffset * sizeof(float),
-                          numPatchCoords * dvvDesc.stride * sizeof(float));
-    }
-
-    glBeginTransformFeedback(GL_POINTS);
-    glDrawArrays(GL_POINTS, 0, numPatchCoords);
-    glEndTransformFeedback();
-
-    glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, 0);
-
-    // unbind textures
-    for (int i = 0; i < 6; ++i) {
-        glActiveTexture(GL_TEXTURE0 + i);
-        glBindTexture(GL_TEXTURE_BUFFER, 0);
-    }
-
-    // unbind UBO
-    glBindBufferBase(GL_UNIFORM_BUFFER,
-        _patchKernel.uniformPatchArraysUBOBinding, 0);
-
-    glDisable(GL_RASTERIZER_DISCARD);
-    glUseProgram(0);
-    glActiveTexture(GL_TEXTURE0);
-
-    glDisableVertexAttribArray(0);
-    glDisableVertexAttribArray(1);
-
-    // revert vao
-    glBindVertexArray(0);
-    glDeleteVertexArrays(1, &vao);
-
-    return true;
-}
-
-// ---------------------------------------------------------------------------
-
-GLXFBEvaluator::_StencilKernel::_StencilKernel() : program(0) {
-}
-GLXFBEvaluator::_StencilKernel::~_StencilKernel() {
-    if (program) {
-        glDeleteProgram(program);
-    }
-}
-
-bool
-GLXFBEvaluator::_StencilKernel::Compile(BufferDescriptor const &srcDesc,
-                                        BufferDescriptor const &dstDesc,
-                                        BufferDescriptor const &duDesc,
-                                        BufferDescriptor const &dvDesc,
-                                        BufferDescriptor const &duuDesc,
-                                        BufferDescriptor const &duvDesc,
-                                        BufferDescriptor const &dvvDesc,
-                                        bool interleavedDerivativeBuffers) {
-    // create stencil kernel
-    if (program) {
-        glDeleteProgram(program);
-    }
-
-    const char * kernelDefines =
-        "#define OPENSUBDIV_GLSL_XFB_KERNEL_EVAL_STENCILS\n";
-
-    program = compileKernel(srcDesc, dstDesc, duDesc, dvDesc,
-                            duuDesc, duvDesc, dvvDesc,
-                            kernelDefines, interleavedDerivativeBuffers);
-    if (program == 0) return false;
-
-    // cache uniform locations (TODO: use uniform block)
-    uniformSrcBufferTexture  = glGetUniformLocation(program, "vertexBuffer");
-    uniformSrcOffset         = glGetUniformLocation(program, "srcOffset");
-    uniformSizesTexture      = glGetUniformLocation(program, "sizes");
-    uniformOffsetsTexture    = glGetUniformLocation(program, "offsets");
-    uniformIndicesTexture    = glGetUniformLocation(program, "indices");
-    uniformWeightsTexture    = glGetUniformLocation(program, "weights");
-    uniformDuWeightsTexture  = glGetUniformLocation(program, "duWeights");
-    uniformDvWeightsTexture  = glGetUniformLocation(program, "dvWeights");
-    uniformDuuWeightsTexture = glGetUniformLocation(program, "duuWeights");
-    uniformDuvWeightsTexture = glGetUniformLocation(program, "duvWeights");
-    uniformDvvWeightsTexture = glGetUniformLocation(program, "dvvWeights");
-    uniformStart             = glGetUniformLocation(program, "batchStart");
-    uniformEnd               = glGetUniformLocation(program, "batchEnd");
-
-    return true;
-}
-
-// ---------------------------------------------------------------------------
-
-GLXFBEvaluator::_PatchKernel::_PatchKernel() : program(0) {
-}
-GLXFBEvaluator::_PatchKernel::~_PatchKernel() {
-    if (program) {
-        glDeleteProgram(program);
-    }
-}
-
-bool
-GLXFBEvaluator::_PatchKernel::Compile(BufferDescriptor const &srcDesc,
-                                      BufferDescriptor const &dstDesc,
-                                      BufferDescriptor const &duDesc,
-                                      BufferDescriptor const &dvDesc,
-                                      BufferDescriptor const &duuDesc,
-                                      BufferDescriptor const &duvDesc,
-                                      BufferDescriptor const &dvvDesc,
-                                      bool interleavedDerivativeBuffers) {
-    // create stencil kernel
-    if (program) {
-        glDeleteProgram(program);
-    }
-
-    const char * kernelDefines =
-        "#define OPENSUBDIV_GLSL_XFB_KERNEL_EVAL_PATCHES\n";
-
-    program = compileKernel(srcDesc, dstDesc, duDesc, dvDesc,
-                            duuDesc, duvDesc, dvvDesc,
-                            kernelDefines, interleavedDerivativeBuffers);
-    if (program == 0) return false;
-
-    // cache uniform locations
-    uniformSrcBufferTexture  = glGetUniformLocation(program, "vertexBuffer");
-    uniformSrcOffset         = glGetUniformLocation(program, "srcOffset");
-    uniformPatchParamTexture = glGetUniformLocation(program, "patchParamBuffer");
-    uniformPatchIndexTexture = glGetUniformLocation(program, "patchIndexBuffer");
-
-    uniformPatchArraysUBOBinding = 1;
-    int uboIndex  = glGetUniformBlockIndex(program, "PatchArrays");
-    glUniformBlockBinding(program, uboIndex , uniformPatchArraysUBOBinding);
-
-    return true;
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glXFBEvaluator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glXFBEvaluator.h
deleted file mode 100644
index 9225f1feb..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glXFBEvaluator.h
+++ /dev/null
@@ -1,2193 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_GL_XFB_EVALUATOR_H
-#define OPENSUBDIV3_OSD_GL_XFB_EVALUATOR_H
-
-#include "../version.h"
-
-#include "../osd/opengl.h"
-#include "../osd/types.h"
-#include "../osd/bufferDescriptor.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-    class PatchTable;
-    class StencilTable;
-    class LimitStencilTable;
-}
-
-namespace Osd {
-
-/// \brief GL TextureBuffer stencil table
-///
-/// This class is a GL Texture Buffer representation of Far::StencilTable.
-///
-/// GLSLTransformFeedback consumes this table to apply stencils
-///
-///
-class GLStencilTableTBO {
-public:
-    static GLStencilTableTBO *Create(
-        Far::StencilTable const *stencilTable, void *deviceContext = NULL) {
-        (void)deviceContext;  // unused
-        return new GLStencilTableTBO(stencilTable);
-    }
-
-    static GLStencilTableTBO *Create(
-        Far::LimitStencilTable const *limitStencilTable,
-        void *deviceContext = NULL) {
-        (void)deviceContext;  // unused
-        return new GLStencilTableTBO(limitStencilTable);
-    }
-
-    explicit GLStencilTableTBO(Far::StencilTable const *stencilTable);
-    explicit GLStencilTableTBO(Far::LimitStencilTable const *limitStencilTable);
-    ~GLStencilTableTBO();
-
-    // interfaces needed for GLSLTransformFeedbackKernel
-    GLuint GetSizesTexture() const { return _sizes; }
-    GLuint GetOffsetsTexture() const { return _offsets; }
-    GLuint GetIndicesTexture() const { return _indices; }
-    GLuint GetWeightsTexture() const { return _weights; }
-    GLuint GetDuWeightsTexture() const { return _duWeights; }
-    GLuint GetDvWeightsTexture() const { return _dvWeights; }
-    GLuint GetDuuWeightsTexture() const { return _duuWeights; }
-    GLuint GetDuvWeightsTexture() const { return _duvWeights; }
-    GLuint GetDvvWeightsTexture() const { return _dvvWeights; }
-    int GetNumStencils() const { return _numStencils; }
-
-private:
-    GLuint _sizes;
-    GLuint _offsets;
-    GLuint _indices;
-    GLuint _weights;
-    GLuint _duWeights;
-    GLuint _dvWeights;
-    GLuint _duuWeights;
-    GLuint _duvWeights;
-    GLuint _dvvWeights;
-    int _numStencils;
-};
-
-// ---------------------------------------------------------------------------
-
-class GLXFBEvaluator {
-public:
-    typedef bool Instantiatable;
-
-    /// Generic creator template.
-    template <typename DEVICE_CONTEXT>
-    static GLXFBEvaluator *Create(BufferDescriptor const &srcDesc,
-                                  BufferDescriptor const &dstDesc,
-                                  BufferDescriptor const &duDesc,
-                                  BufferDescriptor const &dvDesc,
-                                  DEVICE_CONTEXT deviceContext) {
-        bool interleavedDerivativeBuffers = deviceContext
-            ? deviceContext->AreInterleavedDerivativeBuffers()
-            : false;
-        return Create(srcDesc, dstDesc, duDesc, dvDesc,
-                      interleavedDerivativeBuffers);
-    }
-
-    /// Specialization to allow creation without a device context.
-    static GLXFBEvaluator *Create(BufferDescriptor const &srcDesc,
-                                  BufferDescriptor const &dstDesc,
-                                  BufferDescriptor const &duDesc,
-                                  BufferDescriptor const &dvDesc,
-                                  void * deviceContext) {
-        (void)deviceContext;  // not used
-        return Create(srcDesc, dstDesc, duDesc, dvDesc);
-    }
-
-    static GLXFBEvaluator * Create(BufferDescriptor const &srcDesc,
-                                   BufferDescriptor const &dstDesc,
-                                   BufferDescriptor const &duDesc,
-                                   BufferDescriptor const &dvDesc,
-                                   bool interleavedDerivativeBuffers = false) {
-        GLXFBEvaluator *instance = new GLXFBEvaluator(interleavedDerivativeBuffers);
-        if (instance->Compile(srcDesc, dstDesc, duDesc, dvDesc))
-            return instance;
-        delete instance;
-        return NULL;
-    }
-
-    /// Generic creator template.
-    template <typename DEVICE_CONTEXT>
-    static GLXFBEvaluator *Create(BufferDescriptor const &srcDesc,
-                                  BufferDescriptor const &dstDesc,
-                                  BufferDescriptor const &duDesc,
-                                  BufferDescriptor const &dvDesc,
-                                  BufferDescriptor const &duuDesc,
-                                  BufferDescriptor const &duvDesc,
-                                  BufferDescriptor const &dvvDesc,
-                                  DEVICE_CONTEXT deviceContext) {
-        bool interleavedDerivativeBuffers = deviceContext
-            ? deviceContext->AreInterleavedDerivativeBuffers()
-            : false;
-        return Create(srcDesc, dstDesc, duDesc, dvDesc,
-                      duuDesc, duvDesc, dvvDesc,
-                      interleavedDerivativeBuffers);
-    }
-
-    /// Specialization to allow creation without a device context.
-    static GLXFBEvaluator *Create(BufferDescriptor const &srcDesc,
-                                  BufferDescriptor const &dstDesc,
-                                  BufferDescriptor const &duDesc,
-                                  BufferDescriptor const &dvDesc,
-                                  BufferDescriptor const &duuDesc,
-                                  BufferDescriptor const &duvDesc,
-                                  BufferDescriptor const &dvvDesc,
-                                  void * deviceContext) {
-        (void)deviceContext;  // not used
-        return Create(srcDesc, dstDesc, duDesc, dvDesc,
-                      duuDesc, duvDesc, dvvDesc);
-    }
-
-    static GLXFBEvaluator * Create(BufferDescriptor const &srcDesc,
-                                   BufferDescriptor const &dstDesc,
-                                   BufferDescriptor const &duDesc,
-                                   BufferDescriptor const &dvDesc,
-                                   BufferDescriptor const &duuDesc,
-                                   BufferDescriptor const &duvDesc,
-                                   BufferDescriptor const &dvvDesc,
-                                   bool interleavedDerivativeBuffers = false) {
-        GLXFBEvaluator *instance = new GLXFBEvaluator(interleavedDerivativeBuffers);
-        if (instance->Compile(srcDesc, dstDesc, duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc))
-            return instance;
-        delete instance;
-        return NULL;
-    }
-
-    /// \brief Constructor.
-    ///
-    /// The transform feedback evaluator can make more sparing use of
-    /// transform feeback buffer bindings when it is known that evaluator
-    /// output buffers are shared and the corresponding buffer descriptors
-    /// are interleaved. When \a interleavedDerivativeBuffers is true
-    /// then evaluation requires that either 1st derivative outputs are
-    /// interleaved and 2nd derivative output are interleaved separately
-    /// or that both 1st derivative and 2nd derivative outputs are
-    /// interleaved together. This reduces the maximum number of required
-    /// transform feedback buffer bindings to 3 instead of 6 which is
-    /// significant, since most transform feedback implementations support
-    /// a maximum of 4 bindings.
-    GLXFBEvaluator(bool interleavedDerivativeBuffers = false);
-
-    /// Destructor. note that the GL context must be made current.
-    ~GLXFBEvaluator();
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Stencil evaluations with StencilTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       Texture Buffer Object interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLSLTransformFeedback kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          stencilTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor());
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                stencilTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       Texture Buffer Object interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLSLTransformFeedback kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          duBuffer,  duDesc,
-                                          dvBuffer,  dvDesc,
-                                          stencilTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc, duDesc, dvDesc);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                duBuffer,  duDesc,
-                                                dvBuffer,  dvDesc,
-                                                stencilTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       Texture Buffer Object interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLSLTransformFeedback kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          duBuffer,  duDesc,
-                                          dvBuffer,  dvDesc,
-                                          duuBuffer, duuDesc,
-                                          duvBuffer, duvDesc,
-                                          dvvBuffer, dvvDesc,
-                                          stencilTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                duBuffer,  duDesc,
-                                                dvBuffer,  dvDesc,
-                                                duuBuffer, duuDesc,
-                                                duvBuffer, duvDesc,
-                                                dvvBuffer, dvvDesc,
-                                                stencilTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       Texture Buffer Object interfaces.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable) const {
-
-        return EvalStencils(srcBuffer->BindVBO(), srcDesc,
-                            dstBuffer->BindVBO(), dstDesc,
-                            0, BufferDescriptor(),
-                            0, BufferDescriptor(),
-                            stencilTable->GetSizesTexture(),
-                            stencilTable->GetOffsetsTexture(),
-                            stencilTable->GetIndicesTexture(),
-                            stencilTable->GetWeightsTexture(),
-                            0,
-                            0,
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       Texture Buffer Object interfaces.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable) const {
-
-        return EvalStencils(srcBuffer->BindVBO(), srcDesc,
-                            dstBuffer->BindVBO(), dstDesc,
-                            duBuffer->BindVBO(),  duDesc,
-                            dvBuffer->BindVBO(),  dvDesc,
-                            stencilTable->GetSizesTexture(),
-                            stencilTable->GetOffsetsTexture(),
-                            stencilTable->GetIndicesTexture(),
-                            stencilTable->GetWeightsTexture(),
-                            stencilTable->GetDuWeightsTexture(),
-                            stencilTable->GetDvWeightsTexture(),
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       Texture Buffer Object interfaces.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable) const {
-
-        return EvalStencils(srcBuffer->BindVBO(), srcDesc,
-                            dstBuffer->BindVBO(), dstDesc,
-                            duBuffer->BindVBO(),  duDesc,
-                            dvBuffer->BindVBO(),  dvDesc,
-                            duuBuffer->BindVBO(), duuDesc,
-                            duvBuffer->BindVBO(), duvDesc,
-                            dvvBuffer->BindVBO(), dvvDesc,
-                            stencilTable->GetSizesTexture(),
-                            stencilTable->GetOffsetsTexture(),
-                            stencilTable->GetIndicesTexture(),
-                            stencilTable->GetWeightsTexture(),
-                            stencilTable->GetDuWeightsTexture(),
-                            stencilTable->GetDvWeightsTexture(),
-                            stencilTable->GetDuuWeightsTexture(),
-                            stencilTable->GetDuvWeightsTexture(),
-                            stencilTable->GetDvvWeightsTexture(),
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Dispatch the GLSL XFB kernel on on GPU asynchronously
-    /// returns false if the kernel hasn't been compiled yet.
-    ///
-    /// @param srcBuffer        GL buffer of input primvar source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the srcBuffer
-    ///
-    /// @param dstBuffer        GL buffer of output primvar destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer         GL buffer of output derivative wrt u
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         GL buffer of output derivative wrt v
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param sizesBuffer      GL buffer of the sizes in the stencil table
-    ///
-    /// @param offsetsBuffer    GL buffer of the offsets in the stencil table
-    ///
-    /// @param indicesBuffer    GL buffer of the indices in the stencil table
-    ///
-    /// @param weightsBuffer    GL buffer of the weights in the stencil table
-    ///
-    /// @param duWeightsBuffer  GL buffer of the du weights in the stencil table
-    ///
-    /// @param dvWeightsBuffer  GL buffer of the dv weights in the stencil table
-    ///
-    /// @param start            start index of stencil table
-    ///
-    /// @param end              end index of stencil table
-    ///
-    bool EvalStencils(GLuint srcBuffer, BufferDescriptor const &srcDesc,
-                      GLuint dstBuffer, BufferDescriptor const &dstDesc,
-                      GLuint duBuffer,  BufferDescriptor const &duDesc,
-                      GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-                      GLuint sizesBuffer,
-                      GLuint offsetsBuffer,
-                      GLuint indicesBuffer,
-                      GLuint weightsBuffer,
-                      GLuint duWeightsBuffer,
-                      GLuint dvWeightsBuffer,
-                      int start,
-                      int end) const;
-
-    /// \brief Dispatch the GLSL XFB kernel on on GPU asynchronously
-    /// returns false if the kernel hasn't been compiled yet.
-    ///
-    /// @param srcBuffer        GL buffer of input primvar source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the srcBuffer
-    ///
-    /// @param dstBuffer        GL buffer of output primvar destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer         GL buffer of output derivative wrt u
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         GL buffer of output derivative wrt v
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        GL buffer of output 2nd derivative wrt u
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        GL buffer of output 2nd derivative wrt u and v
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        GL buffer of output 2nd derivative wrt v
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param sizesBuffer      GL buffer of the sizes in the stencil table
-    ///
-    /// @param offsetsBuffer    GL buffer of the offsets in the stencil table
-    ///
-    /// @param indicesBuffer    GL buffer of the indices in the stencil table
-    ///
-    /// @param weightsBuffer    GL buffer of the weights in the stencil table
-    ///
-    /// @param duWeightsBuffer  GL buffer of the du weights in the stencil table
-    ///
-    /// @param dvWeightsBuffer  GL buffer of the dv weights in the stencil table
-    ///
-    /// @param duuWeightsBuffer GL buffer of the duu weights in the stencil table
-    ///
-    /// @param duvWeightsBuffer GL buffer of the duv weights in the stencil table
-    ///
-    /// @param dvvWeightsBuffer GL buffer of the dvv weights in the stencil table
-    ///
-    /// @param start            start index of stencil table
-    ///
-    /// @param end              end index of stencil table
-    ///
-    bool EvalStencils(GLuint srcBuffer, BufferDescriptor const &srcDesc,
-                      GLuint dstBuffer, BufferDescriptor const &dstDesc,
-                      GLuint duBuffer,  BufferDescriptor const &duDesc,
-                      GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-                      GLuint duuBuffer, BufferDescriptor const &duuDesc,
-                      GLuint duvBuffer, BufferDescriptor const &duvDesc,
-                      GLuint dvvBuffer, BufferDescriptor const &dvvDesc,
-                      GLuint sizesBuffer,
-                      GLuint offsetsBuffer,
-                      GLuint indicesBuffer,
-                      GLuint weightsBuffer,
-                      GLuint duWeightsBuffer,
-                      GLuint dvWeightsBuffer,
-                      GLuint duuWeightsBuffer,
-                      GLuint duvWeightsBuffer,
-                      GLuint dvvWeightsBuffer,
-                      int start,
-                      int end) const;
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Limit evaluations with PatchTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor());
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc, duDesc, dvDesc);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetPatchArrays(),
-                           patchTable->GetPatchIndexTextureBuffer(),
-                           patchTable->GetPatchParamTextureBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(),  duDesc,
-                           dvBuffer->BindVBO(),  dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetPatchArrays(),
-                           patchTable->GetPatchIndexTextureBuffer(),
-                           patchTable->GetPatchParamTextureBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindVBO() method returning a GL
-    ///                         buffer object of destination data
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(),  duDesc,
-                           dvBuffer->BindVBO(),  dvDesc,
-                           duuBuffer->BindVBO(), duuDesc,
-                           duvBuffer->BindVBO(), duvDesc,
-                           dvvBuffer->BindVBO(), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetPatchArrays(),
-                           patchTable->GetPatchIndexTextureBuffer(),
-                           patchTable->GetPatchParamTextureBuffer());
-    }
-
-    bool EvalPatches(GLuint srcBuffer, BufferDescriptor const &srcDesc,
-                     GLuint dstBuffer, BufferDescriptor const &dstDesc,
-                     GLuint duBuffer,  BufferDescriptor const &duDesc,
-                     GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-                     int numPatchCoords,
-                     GLuint patchCoordsBuffer,
-                     const PatchArrayVector &patchArrays,
-                     GLuint patchIndexBuffer,
-                     GLuint patchParamsBuffer) const;
-
-    bool EvalPatches(GLuint srcBuffer, BufferDescriptor const &srcDesc,
-                     GLuint dstBuffer, BufferDescriptor const &dstDesc,
-                     GLuint duBuffer,  BufferDescriptor const &duDesc,
-                     GLuint dvBuffer,  BufferDescriptor const &dvDesc,
-                     GLuint duuBuffer, BufferDescriptor const &duuDesc,
-                     GLuint duvBuffer, BufferDescriptor const &duvDesc,
-                     GLuint dvvBuffer, BufferDescriptor const &dvvDesc,
-                     int numPatchCoords,
-                     GLuint patchCoordsBuffer,
-                     const PatchArrayVector &patchArrays,
-                     GLuint patchIndexBuffer,
-                     GLuint patchParamsBuffer) const;
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor());
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetVaryingPatchArrays(),
-                           patchTable->GetVaryingPatchIndexTextureBuffer(),
-                           patchTable->GetPatchParamTextureBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(), duDesc,
-                           dvBuffer->BindVBO(), dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetVaryingPatchArrays(),
-                           patchTable->GetVaryingPatchIndexTextureBuffer(),
-                           patchTable->GetPatchParamTextureBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(), duDesc,
-                           dvBuffer->BindVBO(), dvDesc,
-                           duuBuffer->BindVBO(), duuDesc,
-                           duvBuffer->BindVBO(), duvDesc,
-                           dvvBuffer->BindVBO(), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetVaryingPatchArrays(),
-                           patchTable->GetVaryingPatchIndexTextureBuffer(),
-                           patchTable->GetPatchParamTextureBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable, fvarChannel);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor());
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable, fvarChannel);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel = 0) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetFVarPatchArrays(fvarChannel),
-                           patchTable->GetFVarPatchIndexTextureBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamTextureBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable, fvarChannel);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable, fvarChannel);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel = 0) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(), duDesc,
-                           dvBuffer->BindVBO(), dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetFVarPatchArrays(fvarChannel),
-                           patchTable->GetFVarPatchIndexTextureBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamTextureBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  not used in the GLXFB evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        GLXFBEvaluator const *instance,
-        void * deviceContext = NULL) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable, fvarChannel);
-        } else {
-            // Create an instance on demand (slow)
-            (void)deviceContext;  // unused
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable, fvarChannel);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a GL
-    ///                       buffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     GLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel = 0) const {
-
-        return EvalPatches(srcBuffer->BindVBO(), srcDesc,
-                           dstBuffer->BindVBO(), dstDesc,
-                           duBuffer->BindVBO(), duDesc,
-                           dvBuffer->BindVBO(), dvDesc,
-                           duuBuffer->BindVBO(), duuDesc,
-                           duvBuffer->BindVBO(), duvDesc,
-                           dvvBuffer->BindVBO(), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindVBO(),
-                           patchTable->GetFVarPatchArrays(fvarChannel),
-                           patchTable->GetFVarPatchIndexTextureBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamTextureBuffer(fvarChannel));
-    }
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Other methods
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// Configure GLSL kernel. A valid GL context must be made current before
-    /// calling this function. Returns false if it fails to compile the kernel.
-    bool Compile(BufferDescriptor const &srcDesc,
-                 BufferDescriptor const &dstDesc,
-                 BufferDescriptor const &duDesc = BufferDescriptor(),
-                 BufferDescriptor const &dvDesc = BufferDescriptor(),
-                 BufferDescriptor const &duuDesc = BufferDescriptor(),
-                 BufferDescriptor const &duvDesc = BufferDescriptor(),
-                 BufferDescriptor const &dvvDesc = BufferDescriptor());
-
-    /// Wait the dispatched kernel finishes.
-    static void Synchronize(void *kernel);
-
-private:
-    GLuint _srcBufferTexture;
-    GLuint _patchArraysUBO;
-    bool _interleavedDerivativeBuffers;
-
-    struct _StencilKernel {
-        _StencilKernel();
-        ~_StencilKernel();
-        bool Compile(BufferDescriptor const &srcDesc,
-                     BufferDescriptor const &dstDesc,
-                     BufferDescriptor const &duDesc,
-                     BufferDescriptor const &dvDesc,
-                     BufferDescriptor const &duuDesc,
-                     BufferDescriptor const &duvDesc,
-                     BufferDescriptor const &dvvDesc,
-                     bool interleavedDerivativeBuffers);
-        GLuint program;
-        GLint uniformSrcBufferTexture;
-        GLint uniformSrcOffset;    // src buffer offset (in elements)
-
-        GLint uniformSizesTexture;
-        GLint uniformOffsetsTexture;
-        GLint uniformIndicesTexture;
-        GLint uniformWeightsTexture;
-        GLint uniformDuWeightsTexture;
-        GLint uniformDvWeightsTexture;
-        GLint uniformDuuWeightsTexture;
-        GLint uniformDuvWeightsTexture;
-        GLint uniformDvvWeightsTexture;
-        GLint uniformStart;     // range
-        GLint uniformEnd;
-    } _stencilKernel;
-
-    struct _PatchKernel {
-        _PatchKernel();
-        ~_PatchKernel();
-        bool Compile(BufferDescriptor const &srcDesc,
-                     BufferDescriptor const &dstDesc,
-                     BufferDescriptor const &duDesc,
-                     BufferDescriptor const &dvDesc,
-                     BufferDescriptor const &duuDesc,
-                     BufferDescriptor const &duvDesc,
-                     BufferDescriptor const &dvvDesc,
-                     bool interleavedDerivativeBuffers);
-        GLuint program;
-        GLint uniformSrcBufferTexture;
-        GLint uniformSrcOffset;    // src buffer offset (in elements)
-
-        GLint uniformPatchArraysUBOBinding;
-        GLint uniformPatchParamTexture;
-        GLint uniformPatchIndexTexture;
-    } _patchKernel;
-
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-
-#endif  // OPENSUBDIV3_OSD_GL_XFB_EVALUATOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslComputeKernel.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslComputeKernel.glsl
deleted file mode 100644
index ed0dd220c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslComputeKernel.glsl
+++ /dev/null
@@ -1,311 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//------------------------------------------------------------------------------
-
-
-layout(local_size_x=WORK_GROUP_SIZE, local_size_y=1, local_size_z=1) in;
-layout(std430) buffer;
-
-// source and destination buffers
-
-uniform int srcOffset = 0;
-uniform int dstOffset = 0;
-layout(binding=0) buffer src_buffer      { float    srcVertexBuffer[]; };
-layout(binding=1) buffer dst_buffer      { float    dstVertexBuffer[]; };
-
-// derivative buffers (if needed)
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_1ST_DERIVATIVES)
-uniform ivec3 duDesc;
-uniform ivec3 dvDesc;
-layout(binding=2) buffer du_buffer   { float duBuffer[]; };
-layout(binding=3) buffer dv_buffer   { float dvBuffer[]; };
-#endif
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_2ND_DERIVATIVES)
-uniform ivec3 duuDesc;
-uniform ivec3 duvDesc;
-uniform ivec3 dvvDesc;
-layout(binding=10) buffer duu_buffer   { float duuBuffer[]; };
-layout(binding=11) buffer duv_buffer   { float duvBuffer[]; };
-layout(binding=12) buffer dvv_buffer   { float dvvBuffer[]; };
-#endif
-
-// stencil buffers
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_KERNEL_EVAL_STENCILS)
-
-uniform int batchStart = 0;
-uniform int batchEnd = 0;
-layout(binding=4) buffer stencilSizes    { int      _sizes[];   };
-layout(binding=5) buffer stencilOffsets  { int      _offsets[]; };
-layout(binding=6) buffer stencilIndices  { int      _indices[]; };
-layout(binding=7) buffer stencilWeights  { float    _weights[]; };
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_1ST_DERIVATIVES)
-layout(binding=8) buffer stencilDuWeights { float  _duWeights[]; };
-layout(binding=9) buffer stencilDvWeights { float  _dvWeights[]; };
-#endif
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_2ND_DERIVATIVES)
-layout(binding=13) buffer stencilDuuWeights { float  _duuWeights[]; };
-layout(binding=14) buffer stencilDuvWeights { float  _duvWeights[]; };
-layout(binding=15) buffer stencilDvvWeights { float  _dvvWeights[]; };
-#endif
-
-#endif
-
-// patch buffers
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_KERNEL_EVAL_PATCHES)
-
-layout(binding=4) buffer patchArray_buffer { OsdPatchArray patchArrayBuffer[]; };
-layout(binding=5) buffer patchCoord_buffer { OsdPatchCoord patchCoords[]; };
-layout(binding=6) buffer patchIndex_buffer { int patchIndexBuffer[]; };
-layout(binding=7) buffer patchParam_buffer { OsdPatchParam patchParamBuffer[]; };
-
-OsdPatchCoord GetPatchCoord(int coordIndex)
-{
-    return patchCoords[coordIndex];
-}
-
-OsdPatchArray GetPatchArray(int arrayIndex)
-{
-    return patchArrayBuffer[arrayIndex];
-}
-
-OsdPatchParam GetPatchParam(int patchIndex)
-{
-    return patchParamBuffer[patchIndex];
-}
-
-#endif
-
-//------------------------------------------------------------------------------
-
-struct Vertex {
-    float vertexData[LENGTH];
-};
-
-void clear(out Vertex v) {
-    for (int i = 0; i < LENGTH; ++i) {
-        v.vertexData[i] = 0;
-    }
-}
-
-Vertex readVertex(int index) {
-    Vertex v;
-    int vertexIndex = srcOffset + index * SRC_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        v.vertexData[i] = srcVertexBuffer[vertexIndex + i];
-    }
-    return v;
-}
-
-void writeVertex(int index, Vertex v) {
-    int vertexIndex = dstOffset + index * DST_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        dstVertexBuffer[vertexIndex + i] = v.vertexData[i];
-    }
-}
-
-void addWithWeight(inout Vertex v, const Vertex src, float weight) {
-    for (int i = 0; i < LENGTH; ++i) {
-        v.vertexData[i] += weight * src.vertexData[i];
-    }
-}
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_1ST_DERIVATIVES)
-void writeDu(int index, Vertex du) {
-    int duIndex = duDesc.x + index * duDesc.z;
-    for (int i = 0; i < LENGTH; ++i) {
-        duBuffer[duIndex + i] = du.vertexData[i];
-    }
-}
-
-void writeDv(int index, Vertex dv) {
-    int dvIndex = dvDesc.x + index * dvDesc.z;
-    for (int i = 0; i < LENGTH; ++i) {
-        dvBuffer[dvIndex + i] = dv.vertexData[i];
-    }
-}
-#endif
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_2ND_DERIVATIVES)
-void writeDuu(int index, Vertex duu) {
-    int duuIndex = duuDesc.x + index * duuDesc.z;
-    for (int i = 0; i < LENGTH; ++i) {
-        duuBuffer[duuIndex + i] = duu.vertexData[i];
-    }
-}
-
-void writeDuv(int index, Vertex duv) {
-    int duvIndex = duvDesc.x + index * duvDesc.z;
-    for (int i = 0; i < LENGTH; ++i) {
-        duvBuffer[duvIndex + i] = duv.vertexData[i];
-    }
-}
-
-void writeDvv(int index, Vertex dvv) {
-    int dvvIndex = dvvDesc.x + index * dvvDesc.z;
-    for (int i = 0; i < LENGTH; ++i) {
-        dvvBuffer[dvvIndex + i] = dvv.vertexData[i];
-    }
-}
-#endif
-
-//------------------------------------------------------------------------------
-#if defined(OPENSUBDIV_GLSL_COMPUTE_KERNEL_EVAL_STENCILS)
-
-void main() {
-
-    int current = int(gl_GlobalInvocationID.x) + batchStart;
-
-    if (current>=batchEnd) {
-        return;
-    }
-
-    Vertex dst;
-    clear(dst);
-
-    int offset = _offsets[current],
-        size   = _sizes[current];
-
-    for (int stencil = 0; stencil < size; ++stencil) {
-        int vindex = offset + stencil;
-        addWithWeight(
-            dst, readVertex(_indices[vindex]), _weights[vindex]);
-    }
-
-    writeVertex(current, dst);
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_1ST_DERIVATIVES)
-    Vertex du, dv;
-    clear(du);
-    clear(dv);
-    for (int i=0; i<size; ++i) {
-        // expects the compiler optimizes readVertex out here.
-        Vertex src = readVertex(_indices[offset+i]);
-        addWithWeight(du, src, _duWeights[offset+i]);
-        addWithWeight(dv, src, _dvWeights[offset+i]);
-    }
-
-    if (duDesc.y > 0) { // length
-        writeDu(current, du);
-    }
-    if (dvDesc.y > 0) {
-        writeDv(current, dv);
-    }
-#endif
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_2ND_DERIVATIVES)
-    Vertex duu, duv, dvv;
-    clear(duu);
-    clear(duv);
-    clear(dvv);
-    for (int i=0; i<size; ++i) {
-        // expects the compiler optimizes readVertex out here.
-        Vertex src = readVertex(_indices[offset+i]);
-        addWithWeight(duu, src, _duuWeights[offset+i]);
-        addWithWeight(duv, src, _duvWeights[offset+i]);
-        addWithWeight(dvv, src, _dvvWeights[offset+i]);
-    }
-
-    if (duuDesc.y > 0) { // length
-        writeDuu(current, duu);
-    }
-    if (duvDesc.y > 0) {
-        writeDuv(current, duv);
-    }
-    if (dvvDesc.y > 0) {
-        writeDvv(current, dvv);
-    }
-#endif
-}
-
-#endif
-
-//------------------------------------------------------------------------------
-#if defined(OPENSUBDIV_GLSL_COMPUTE_KERNEL_EVAL_PATCHES)
-
-// PERFORMANCE: stride could be constant, but not as significant as length
-
-void main() {
-
-    int current = int(gl_GlobalInvocationID.x);
-
-    OsdPatchCoord coord = GetPatchCoord(current);
-    OsdPatchArray array = GetPatchArray(coord.arrayIndex);
-    OsdPatchParam param = GetPatchParam(coord.patchIndex);
-
-    int patchType = OsdPatchParamIsRegular(param) ? array.regDesc : array.desc;
-
-    float wP[20], wDu[20], wDv[20], wDuu[20], wDuv[20], wDvv[20];
-    int nPoints = OsdEvaluatePatchBasis(patchType, param,
-        coord.s, coord.t, wP, wDu, wDv, wDuu, wDuv, wDvv);
-
-    Vertex dst, du, dv, duu, duv, dvv;
-    clear(dst);
-    clear(du);
-    clear(dv);
-    clear(duu);
-    clear(duv);
-    clear(dvv);
-
-    int indexBase = array.indexBase + array.stride *
-                (coord.patchIndex - array.primitiveIdBase);
-
-    for (int cv = 0; cv < nPoints; ++cv) {
-        int index = patchIndexBuffer[indexBase + cv];
-        addWithWeight(dst, readVertex(index), wP[cv]);
-        addWithWeight(du, readVertex(index), wDu[cv]);
-        addWithWeight(dv, readVertex(index), wDv[cv]);
-        addWithWeight(duu, readVertex(index), wDuu[cv]);
-        addWithWeight(duv, readVertex(index), wDuv[cv]);
-        addWithWeight(dvv, readVertex(index), wDvv[cv]);
-    }
-    writeVertex(current, dst);
-
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_1ST_DERIVATIVES)
-    if (duDesc.y > 0) { // length
-        writeDu(current, du);
-    }
-    if (dvDesc.y > 0) {
-        writeDv(current, dv);
-    }
-#endif
-#if defined(OPENSUBDIV_GLSL_COMPUTE_USE_2ND_DERIVATIVES)
-    if (duuDesc.y > 0) { // length
-        writeDuu(current, duu);
-    }
-    if (duvDesc.y > 0) { // length
-        writeDuv(current, duv);
-    }
-    if (dvvDesc.y > 0) {
-        writeDvv(current, dvv);
-    }
-#endif
-}
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchBSpline.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchBSpline.glsl
deleted file mode 100644
index 77f4bb5a3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchBSpline.glsl
+++ /dev/null
@@ -1,191 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexBSpline
-//----------------------------------------------------------
-#ifdef OSD_PATCH_VERTEX_BSPLINE_SHADER
-
-layout(location = 0) in vec4 position;
-OSD_USER_VARYING_ATTRIBUTE_DECLARE
-
-out block {
-    ControlVertex v;
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    outpt.v.position = position;
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(position);
-    OSD_USER_VARYING_PER_VERTEX();
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessControlBSpline
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_CONTROL_BSPLINE_SHADER
-
-patch out vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    ControlVertex v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OsdPerPatchVertexBezier v;
-    OSD_USER_VARYING_DECLARE
-} outpt[16];
-
-layout(vertices = 16) out;
-
-void main()
-{
-    vec3 cv[16];
-    for (int i=0; i<16; ++i) {
-        cv[i] = inpt[i].v.position.xyz;
-    }
-
-    ivec3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(gl_PrimitiveID));
-    OsdComputePerPatchVertexBSpline(patchParam, gl_InvocationID, cv, outpt[gl_InvocationID].v);
-
-    OSD_USER_VARYING_PER_CONTROL_POINT(gl_InvocationID, gl_InvocationID);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Wait for all basis conversion to be finished
-    barrier();
-#endif
-    if (gl_InvocationID == 0) {
-        vec4 tessLevelOuter = vec4(0);
-        vec2 tessLevelInner = vec2(0);
-
-        OSD_PATCH_CULL(16);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-        // Gather bezier control points to compute limit surface tess levels
-        OsdPerPatchVertexBezier cpBezier[16];
-        cpBezier[0] = outpt[0].v;
-        cpBezier[1] = outpt[1].v;
-        cpBezier[2] = outpt[2].v;
-        cpBezier[3] = outpt[3].v;
-        cpBezier[4] = outpt[4].v;
-        cpBezier[5] = outpt[5].v;
-        cpBezier[6] = outpt[6].v;
-        cpBezier[7] = outpt[7].v;
-        cpBezier[8] = outpt[8].v;
-        cpBezier[9] = outpt[9].v;
-        cpBezier[10] = outpt[10].v;
-        cpBezier[11] = outpt[11].v;
-        cpBezier[12] = outpt[12].v;
-        cpBezier[13] = outpt[13].v;
-        cpBezier[14] = outpt[14].v;
-        cpBezier[15] = outpt[15].v;
-
-        OsdEvalPatchBezierTessLevels(cpBezier, patchParam,
-                         tessLevelOuter, tessLevelInner,
-                         tessOuterLo, tessOuterHi);
-#else
-        OsdGetTessLevelsUniform(patchParam, tessLevelOuter, tessLevelInner,
-                         tessOuterLo, tessOuterHi);
-#endif
-
-        gl_TessLevelOuter[0] = tessLevelOuter[0];
-        gl_TessLevelOuter[1] = tessLevelOuter[1];
-        gl_TessLevelOuter[2] = tessLevelOuter[2];
-        gl_TessLevelOuter[3] = tessLevelOuter[3];
-
-        gl_TessLevelInner[0] = tessLevelInner[0];
-        gl_TessLevelInner[1] = tessLevelInner[1];
-    }
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessEvalBSpline
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_EVAL_BSPLINE_SHADER
-
-layout(quads) in;
-layout(OSD_SPACING) in;
-
-patch in vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    OsdPerPatchVertexBezier v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OutputVertex v;
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    vec2 vSegments;
-#endif
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    vec3 P = vec3(0), dPu = vec3(0), dPv = vec3(0);
-    vec3 N = vec3(0), dNu = vec3(0), dNv = vec3(0);
-
-    OsdPerPatchVertexBezier cv[16];
-    for (int i = 0; i < 16; ++i) {
-        cv[i] = inpt[i].v;
-    }
-
-    vec2 UV = OsdGetTessParameterization(gl_TessCoord.xy,
-                                         tessOuterLo,
-                                         tessOuterHi);
-
-    ivec3 patchParam = inpt[0].v.patchParam;
-    OsdEvalPatchBezier(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    outpt.v.position = OsdModelViewMatrix() * vec4(P, 1.0f);
-    outpt.v.normal = (OsdModelViewMatrix() * vec4(N, 0.0f)).xyz;
-    outpt.v.tangent = (OsdModelViewMatrix() * vec4(dPu, 0.0f)).xyz;
-    outpt.v.bitangent = (OsdModelViewMatrix() * vec4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    outpt.v.Nu = dNu;
-    outpt.v.Nv = dNv;
-#endif
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    outpt.vSegments = cv[0].vSegments;
-#endif
-
-    outpt.v.tessCoord = UV;
-    outpt.v.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-
-    OSD_USER_VARYING_PER_EVAL_POINT(UV, 5, 6, 9, 10);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    gl_Position = OsdProjectionMatrix() * outpt.v.position;
-}
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchBoxSplineTriangle.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchBoxSplineTriangle.glsl
deleted file mode 100644
index 8f6580df1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchBoxSplineTriangle.glsl
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-//   Copyright 2018 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexBoxSplineTriangle
-//----------------------------------------------------------
-#ifdef OSD_PATCH_VERTEX_BOX_SPLINE_TRIANGLE_SHADER
-
-layout(location = 0) in vec4 position;
-OSD_USER_VARYING_ATTRIBUTE_DECLARE
-
-out block {
-    ControlVertex v;
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    outpt.v.position = position;
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(position);
-    OSD_USER_VARYING_PER_VERTEX();
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessControlBoxSplineTriangle
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_CONTROL_BOX_SPLINE_TRIANGLE_SHADER
-
-patch out vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    ControlVertex v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OsdPerPatchVertexBezier v;
-    OSD_USER_VARYING_DECLARE
-} outpt[15];
-
-layout(vertices = 15) out;
-
-void main()
-{
-    vec3 cv[12];
-    for (int i=0; i<12; ++i) {
-        cv[i] = inpt[i].v.position.xyz;
-    }
-
-    ivec3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(gl_PrimitiveID));
-    OsdComputePerPatchVertexBoxSplineTriangle(
-        patchParam, gl_InvocationID, cv, outpt[gl_InvocationID].v);
-
-    OSD_USER_VARYING_PER_CONTROL_POINT(gl_InvocationID, gl_InvocationID);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Wait for all basis conversion to be finished
-    barrier();
-#endif
-    if (gl_InvocationID == 0) {
-        vec4 tessLevelOuter = vec4(0);
-        vec2 tessLevelInner = vec2(0);
-
-        OSD_PATCH_CULL(12);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-        // Gather bezier control points to compute limit surface tess levels
-        vec3 bezcv[15];
-        for (int i=0; i<15; ++i) {
-            bezcv[i] = outpt[i].v.P;
-        }
-        OsdEvalPatchBezierTriangleTessLevels(
-                         bezcv, patchParam,
-                         tessLevelOuter, tessLevelInner,
-                         tessOuterLo, tessOuterHi);
-#else
-        OsdGetTessLevelsUniformTriangle(patchParam,
-                        tessLevelOuter, tessLevelInner,
-                        tessOuterLo, tessOuterHi);
-
-#endif
-
-        gl_TessLevelOuter[0] = tessLevelOuter[0];
-        gl_TessLevelOuter[1] = tessLevelOuter[1];
-        gl_TessLevelOuter[2] = tessLevelOuter[2];
-
-        gl_TessLevelInner[0] = tessLevelInner[0];
-    }
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessEvalBoxSplineTriangle
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_EVAL_BOX_SPLINE_TRIANGLE_SHADER
-
-layout(triangles) in;
-layout(OSD_SPACING) in;
-
-patch in vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    OsdPerPatchVertexBezier v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OutputVertex v;
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    vec3 P = vec3(0), dPu = vec3(0), dPv = vec3(0);
-    vec3 N = vec3(0), dNu = vec3(0), dNv = vec3(0);
-
-    OsdPerPatchVertexBezier cv[15];
-    for (int i = 0; i < 15; ++i) {
-        cv[i] = inpt[i].v;
-    }
-
-    vec2 UV = OsdGetTessParameterizationTriangle(gl_TessCoord.xyz,
-                                                 tessOuterLo,
-                                                 tessOuterHi);
-
-    ivec3 patchParam = inpt[0].v.patchParam;
-    OsdEvalPatchBezierTriangle(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    outpt.v.position = OsdModelViewMatrix() * vec4(P, 1.0f);
-    outpt.v.normal = (OsdModelViewMatrix() * vec4(N, 0.0f)).xyz;
-    outpt.v.tangent = (OsdModelViewMatrix() * vec4(dPu, 0.0f)).xyz;
-    outpt.v.bitangent = (OsdModelViewMatrix() * vec4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    outpt.v.Nu = dNu;
-    outpt.v.Nv = dNv;
-#endif
-
-    outpt.v.tessCoord = UV;
-    outpt.v.patchCoord = OsdInterpolatePatchCoordTriangle(UV, patchParam);
-
-    OSD_USER_VARYING_PER_EVAL_POINT_TRIANGLE(UV, 4, 5, 8);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    gl_Position = OsdProjectionMatrix() * outpt.v.position;
-}
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchCommon.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchCommon.glsl
deleted file mode 100644
index 1bb113e71..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchCommon.glsl
+++ /dev/null
@@ -1,1262 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//
-// typical shader composition ordering (see glDrawRegistry:_CompileShader)
-//
-//
-// - glsl version string  (#version 430)
-//
-// - common defines       (#define OSD_ENABLE_PATCH_CULL, ...)
-// - source defines       (#define VERTEX_SHADER, ...)
-//
-// - osd headers          (glslPatchCommon: varying structs,
-//                         glslPtexCommon: ptex functions)
-// - client header        (Osd*Matrix(), displacement callback, ...)
-//
-// - osd shader source    (glslPatchBSpline, glslPatchGregory, ...)
-//     or
-//   client shader source (vertex/geometry/fragment shader)
-//
-
-//----------------------------------------------------------
-// Patches.Common
-//----------------------------------------------------------
-
-// XXXdyu all handling of varying data can be managed by client code
-#ifndef OSD_USER_VARYING_DECLARE
-#define OSD_USER_VARYING_DECLARE
-// type var;
-#endif
-
-#ifndef OSD_USER_VARYING_ATTRIBUTE_DECLARE
-#define OSD_USER_VARYING_ATTRIBUTE_DECLARE
-// layout(location = loc) in type var;
-#endif
-
-#ifndef OSD_USER_VARYING_PER_VERTEX
-#define OSD_USER_VARYING_PER_VERTEX()
-// output.var = var;
-#endif
-
-#ifndef OSD_USER_VARYING_PER_CONTROL_POINT
-#define OSD_USER_VARYING_PER_CONTROL_POINT(ID_OUT, ID_IN)
-// output[ID_OUT].var = input[ID_IN].var
-#endif
-
-#ifndef OSD_USER_VARYING_PER_EVAL_POINT
-#define OSD_USER_VARYING_PER_EVAL_POINT(UV, a, b, c, d)
-// output.var =
-//     mix(mix(input[a].var, input[b].var, UV.x),
-//         mix(input[c].var, input[d].var, UV.x), UV.y)
-#endif
-
-#ifndef OSD_USER_VARYING_PER_EVAL_POINT_TRIANGLE
-#define OSD_USER_VARYING_PER_EVAL_POINT_TRIANGLE(UV, a, b, c)
-// output.var =
-//     input[a].var * (1.0f-UV.x-UV.y) +
-//     input[b].var * UV.x +
-//     input[c].var * UV.y;
-#endif
-
-#if __VERSION__ < 420
-    #define centroid
-#endif
-
-struct ControlVertex {
-    vec4 position;
-#ifdef OSD_ENABLE_PATCH_CULL
-    ivec3 clipFlag;
-#endif
-};
-
-// XXXdyu all downstream data can be handled by client code
-struct OutputVertex {
-    vec4 position;
-    vec3 normal;
-    vec3 tangent;
-    vec3 bitangent;
-    vec4 patchCoord; // u, v, faceLevel, faceId
-    vec2 tessCoord; // tesscoord.st
-#if defined OSD_COMPUTE_NORMAL_DERIVATIVES
-    vec3 Nu;
-    vec3 Nv;
-#endif
-};
-
-// osd shaders need following functions defined
-mat4 OsdModelViewMatrix();
-mat4 OsdProjectionMatrix();
-mat4 OsdModelViewProjectionMatrix();
-float OsdTessLevel();
-int OsdGregoryQuadOffsetBase();
-int OsdPrimitiveIdBase();
-int OsdBaseVertex();
-
-#ifndef OSD_DISPLACEMENT_CALLBACK
-#define OSD_DISPLACEMENT_CALLBACK
-#endif
-
-// ----------------------------------------------------------------------------
-// Patch Parameters
-// ----------------------------------------------------------------------------
-
-//
-// Each patch has a corresponding patchParam. This is a set of three values
-// specifying additional information about the patch:
-//
-//    faceId    -- topological face identifier (e.g. Ptex FaceId)
-//    bitfield  -- refinement-level, non-quad, boundary, transition, uv-offset
-//    sharpness -- crease sharpness for single-crease patches
-//
-// These are stored in OsdPatchParamBuffer indexed by the value returned
-// from OsdGetPatchIndex() which is a function of the current PrimitiveID
-// along with an optional client provided offset.
-//
-
-uniform isamplerBuffer OsdPatchParamBuffer;
-
-int OsdGetPatchIndex(int primitiveId)
-{
-    return (primitiveId + OsdPrimitiveIdBase());
-}
-
-ivec3 OsdGetPatchParam(int patchIndex)
-{
-    return texelFetch(OsdPatchParamBuffer, patchIndex).xyz;
-}
-
-int OsdGetPatchFaceId(ivec3 patchParam)
-{
-    return (patchParam.x & 0xfffffff);
-}
-
-int OsdGetPatchFaceLevel(ivec3 patchParam)
-{
-    return (1 << ((patchParam.y & 0xf) - ((patchParam.y >> 4) & 1)));
-}
-
-int OsdGetPatchRefinementLevel(ivec3 patchParam)
-{
-    return (patchParam.y & 0xf);
-}
-
-int OsdGetPatchBoundaryMask(ivec3 patchParam)
-{
-    return ((patchParam.y >> 7) & 0x1f);
-}
-
-int OsdGetPatchTransitionMask(ivec3 patchParam)
-{
-    return ((patchParam.x >> 28) & 0xf);
-}
-
-ivec2 OsdGetPatchFaceUV(ivec3 patchParam)
-{
-    int u = (patchParam.y >> 22) & 0x3ff;
-    int v = (patchParam.y >> 12) & 0x3ff;
-    return ivec2(u,v);
-}
-
-bool OsdGetPatchIsRegular(ivec3 patchParam)
-{
-    return ((patchParam.y >> 5) & 0x1) != 0;
-}
-
-bool OsdGetPatchIsTriangleRotated(ivec3 patchParam)
-{
-    ivec2 uv = OsdGetPatchFaceUV(patchParam);
-    return (uv.x + uv.y) >= OsdGetPatchFaceLevel(patchParam);
-}
-
-float OsdGetPatchSharpness(ivec3 patchParam)
-{
-    return intBitsToFloat(patchParam.z);
-}
-
-float OsdGetPatchSingleCreaseSegmentParameter(ivec3 patchParam, vec2 uv)
-{
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-    float s = 0;
-    if ((boundaryMask & 1) != 0) {
-        s = 1 - uv.y;
-    } else if ((boundaryMask & 2) != 0) {
-        s = uv.x;
-    } else if ((boundaryMask & 4) != 0) {
-        s = uv.y;
-    } else if ((boundaryMask & 8) != 0) {
-        s = 1 - uv.x;
-    }
-    return s;
-}
-
-ivec4 OsdGetPatchCoord(ivec3 patchParam)
-{
-    int faceId = OsdGetPatchFaceId(patchParam);
-    int faceLevel = OsdGetPatchFaceLevel(patchParam);
-    ivec2 faceUV = OsdGetPatchFaceUV(patchParam);
-    return ivec4(faceUV.x, faceUV.y, faceLevel, faceId);
-}
-
-vec4 OsdInterpolatePatchCoord(vec2 localUV, ivec3 patchParam)
-{
-    ivec4 perPrimPatchCoord = OsdGetPatchCoord(patchParam);
-    int faceId = perPrimPatchCoord.w;
-    int faceLevel = perPrimPatchCoord.z;
-    vec2 faceUV = vec2(perPrimPatchCoord.x, perPrimPatchCoord.y);
-    vec2 uv = localUV/faceLevel + faceUV/faceLevel;
-    // add 0.5 to integer values for more robust interpolation
-    return vec4(uv.x, uv.y, faceLevel+0.5f, faceId+0.5f);
-}
-
-vec4 OsdInterpolatePatchCoordTriangle(vec2 localUV, ivec3 patchParam)
-{
-    vec4 result = OsdInterpolatePatchCoord(localUV, patchParam);
-    if (OsdGetPatchIsTriangleRotated(patchParam)) {
-        result.xy = vec2(1.0f) - result.xy;
-    }
-    return result;
-}
-
-// ----------------------------------------------------------------------------
-// patch culling
-// ----------------------------------------------------------------------------
-
-#ifdef OSD_ENABLE_PATCH_CULL
-
-#define OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(P)                     \
-    vec4 clipPos = OsdModelViewProjectionMatrix() * P;          \
-    bvec3 clip0 = lessThan(clipPos.xyz, vec3(clipPos.w));       \
-    bvec3 clip1 = greaterThan(clipPos.xyz, -vec3(clipPos.w));   \
-    outpt.v.clipFlag = ivec3(clip0) + 2*ivec3(clip1);           \
-
-#define OSD_PATCH_CULL(N)                            \
-    ivec3 clipFlag = ivec3(0);                       \
-    for(int i = 0; i < N; ++i) {                     \
-        clipFlag |= inpt[i].v.clipFlag;              \
-    }                                                \
-    if (clipFlag != ivec3(3) ) {                     \
-        gl_TessLevelInner[0] = 0;                    \
-        gl_TessLevelInner[1] = 0;                    \
-        gl_TessLevelOuter[0] = 0;                    \
-        gl_TessLevelOuter[1] = 0;                    \
-        gl_TessLevelOuter[2] = 0;                    \
-        gl_TessLevelOuter[3] = 0;                    \
-        return;                                      \
-    }
-
-#else
-#define OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(P)
-#define OSD_PATCH_CULL(N)
-#endif
-
-// ----------------------------------------------------------------------------
-
-void
-OsdUnivar4x4(in float u, out float B[4], out float D[4])
-{
-    float t = u;
-    float s = 1.0f - u;
-
-    float A0 = s * s;
-    float A1 = 2 * s * t;
-    float A2 = t * t;
-
-    B[0] = s * A0;
-    B[1] = t * A0 + s * A1;
-    B[2] = t * A1 + s * A2;
-    B[3] = t * A2;
-
-    D[0] =    - A0;
-    D[1] = A0 - A1;
-    D[2] = A1 - A2;
-    D[3] = A2;
-}
-
-void
-OsdUnivar4x4(in float u, out float B[4], out float D[4], out float C[4])
-{
-    float t = u;
-    float s = 1.0f - u;
-
-    float A0 = s * s;
-    float A1 = 2 * s * t;
-    float A2 = t * t;
-
-    B[0] = s * A0;
-    B[1] = t * A0 + s * A1;
-    B[2] = t * A1 + s * A2;
-    B[3] = t * A2;
-
-    D[0] =    - A0;
-    D[1] = A0 - A1;
-    D[2] = A1 - A2;
-    D[3] = A2;
-
-    A0 =   - s;
-    A1 = s - t;
-    A2 = t;
-
-    C[0] =    - A0;
-    C[1] = A0 - A1;
-    C[2] = A1 - A2;
-    C[3] = A2;
-}
-
-// ----------------------------------------------------------------------------
-
-struct OsdPerPatchVertexBezier {
-    ivec3 patchParam;
-    vec3 P;
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    vec3 P1;
-    vec3 P2;
-    vec2 vSegments;
-#endif
-};
-
-vec3
-OsdEvalBezier(vec3 cp[16], vec2 uv)
-{
-    vec3 BUCP[4] = vec3[4](vec3(0), vec3(0), vec3(0), vec3(0));
-
-    float B[4], D[4];
-
-    OsdUnivar4x4(uv.x, B, D);
-    for (int i=0; i<4; ++i) {
-        for (int j=0; j<4; ++j) {
-            vec3 A = cp[4*i + j];
-            BUCP[i] += A * B[j];
-        }
-    }
-
-    vec3 P = vec3(0);
-
-    OsdUnivar4x4(uv.y, B, D);
-    for (int k=0; k<4; ++k) {
-        P += B[k] * BUCP[k];
-    }
-
-    return P;
-}
-
-// When OSD_PATCH_ENABLE_SINGLE_CREASE is defined,
-// this function evaluates single-crease patch, which is segmented into
-// 3 parts in the v-direction.
-//
-//  v=0             vSegment.x        vSegment.y              v=1
-//   +------------------+-------------------+------------------+
-//   |       cp 0       |     cp 1          |      cp 2        |
-//   | (infinite sharp) | (floor sharpness) | (ceil sharpness) |
-//   +------------------+-------------------+------------------+
-//
-vec3
-OsdEvalBezier(OsdPerPatchVertexBezier cp[16], ivec3 patchParam, vec2 uv)
-{
-    vec3 BUCP[4] = vec3[4](vec3(0), vec3(0), vec3(0), vec3(0));
-
-    float B[4], D[4];
-    float s = OsdGetPatchSingleCreaseSegmentParameter(patchParam, uv);
-
-    OsdUnivar4x4(uv.x, B, D);
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    vec2 vSegments = cp[0].vSegments;
-    if (s <= vSegments.x) {
-        for (int i=0; i<4; ++i) {
-            for (int j=0; j<4; ++j) {
-                vec3 A = cp[4*i + j].P;
-                BUCP[i] += A * B[j];
-            }
-        }
-    } else if (s <= vSegments.y) {
-        for (int i=0; i<4; ++i) {
-            for (int j=0; j<4; ++j) {
-                vec3 A = cp[4*i + j].P1;
-                BUCP[i] += A * B[j];
-            }
-        }
-    } else {
-        for (int i=0; i<4; ++i) {
-            for (int j=0; j<4; ++j) {
-                vec3 A = cp[4*i + j].P2;
-                BUCP[i] += A * B[j];
-            }
-        }
-    }
-#else
-    for (int i=0; i<4; ++i) {
-        for (int j=0; j<4; ++j) {
-            vec3 A = cp[4*i + j].P;
-            BUCP[i] += A * B[j];
-        }
-    }
-#endif
-
-    vec3 P = vec3(0);
-
-    OsdUnivar4x4(uv.y, B, D);
-    for (int k=0; k<4; ++k) {
-        P += B[k] * BUCP[k];
-    }
-
-    return P;
-}
-
-// ----------------------------------------------------------------------------
-// Boundary Interpolation
-// ----------------------------------------------------------------------------
-
-void
-OsdComputeBSplineBoundaryPoints(inout vec3 cpt[16], ivec3 patchParam)
-{
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-
-    //  Don't extrapolate corner points until all boundary points in place
-    if ((boundaryMask & 1) != 0) {
-        cpt[1] = 2*cpt[5] - cpt[9];
-        cpt[2] = 2*cpt[6] - cpt[10];
-    }
-    if ((boundaryMask & 2) != 0) {
-        cpt[7] = 2*cpt[6] - cpt[5];
-        cpt[11] = 2*cpt[10] - cpt[9];
-    }
-    if ((boundaryMask & 4) != 0) {
-        cpt[13] = 2*cpt[9] - cpt[5];
-        cpt[14] = 2*cpt[10] - cpt[6];
-    }
-    if ((boundaryMask & 8) != 0) {
-        cpt[4] = 2*cpt[5] - cpt[6];
-        cpt[8] = 2*cpt[9] - cpt[10];
-    }
-
-    //  Now safe to extrapolate corner points:
-    if ((boundaryMask & 1) != 0) {
-        cpt[0] = 2*cpt[4] - cpt[8];
-        cpt[3] = 2*cpt[7] - cpt[11];
-    }
-    if ((boundaryMask & 2) != 0) {
-        cpt[3] = 2*cpt[2] - cpt[1];
-        cpt[15] = 2*cpt[14] - cpt[13];
-    }
-    if ((boundaryMask & 4) != 0) {
-        cpt[12] = 2*cpt[8] - cpt[4];
-        cpt[15] = 2*cpt[11] - cpt[7];
-    }
-    if ((boundaryMask & 8) != 0) {
-        cpt[0] = 2*cpt[1] - cpt[2];
-        cpt[12] = 2*cpt[13] - cpt[14];
-    }
-}
-
-void
-OsdComputeBoxSplineTriangleBoundaryPoints(inout vec3 cpt[12], ivec3 patchParam)
-{
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-    if (boundaryMask == 0) return;
-
-    int upperBits = (boundaryMask >> 3) & 0x3;
-    int lowerBits = boundaryMask & 7;
-
-    int eBits = lowerBits;
-    int vBits = 0;
-
-    if (upperBits == 1) {
-        vBits = eBits;
-        eBits = 0;
-    } else if (upperBits == 2) {
-        //  Opposite vertex bit is edge bit rotated one to the right:
-        vBits = ((eBits & 1) << 2) | (eBits >> 1);
-    }
-
-    bool edge0IsBoundary = (eBits & 1) != 0;
-    bool edge1IsBoundary = (eBits & 2) != 0;
-    bool edge2IsBoundary = (eBits & 4) != 0;
-
-    if (edge0IsBoundary) {
-        if (edge2IsBoundary) {
-            cpt[0] = cpt[4] + (cpt[4] - cpt[8]);
-        } else {
-            cpt[0] = cpt[4] + (cpt[3] - cpt[7]);
-        }
-        cpt[1] = cpt[4] + cpt[5] - cpt[8];
-        if (edge1IsBoundary) {
-            cpt[2] = cpt[5] + (cpt[5] - cpt[8]);
-        } else {
-            cpt[2] = cpt[5] + (cpt[6] - cpt[9]);
-        }
-    }
-    if (edge1IsBoundary) {
-        if (edge0IsBoundary) {
-            cpt[6] = cpt[5] + (cpt[5] - cpt[4]);
-        } else {
-            cpt[6] = cpt[5] + (cpt[2] - cpt[1]);
-        }
-        cpt[9] = cpt[5] + cpt[8] - cpt[4];
-        if (edge2IsBoundary) {
-            cpt[11] = cpt[8] + (cpt[8] - cpt[4]);
-        } else {
-            cpt[11] = cpt[8] + (cpt[10] - cpt[7]);
-        }
-    }
-    if (edge2IsBoundary) {
-        if (edge1IsBoundary) {
-            cpt[10] = cpt[8] + (cpt[8] - cpt[5]);
-        } else {
-            cpt[10] = cpt[8] + (cpt[11] - cpt[9]);
-        }
-        cpt[7] = cpt[8] + cpt[4] - cpt[5];
-        if (edge0IsBoundary) {
-            cpt[3] = cpt[4] + (cpt[4] - cpt[5]);
-        } else {
-            cpt[3] = cpt[4] + (cpt[0] - cpt[1]);
-        }
-    }
-
-    if ((vBits & 1) != 0) {
-        cpt[3] = cpt[4] + cpt[7] - cpt[8];
-        cpt[0] = cpt[4] + cpt[1] - cpt[5];
-    }
-    if ((vBits & 2) != 0) {
-        cpt[2] = cpt[5] + cpt[1] - cpt[4];
-        cpt[6] = cpt[5] + cpt[9] - cpt[8];
-    }
-    if ((vBits & 4) != 0) {
-        cpt[11] = cpt[8] + cpt[9] - cpt[5];
-        cpt[10] = cpt[8] + cpt[7] - cpt[4];
-    }
-}
-
-// ----------------------------------------------------------------------------
-// BSpline
-// ----------------------------------------------------------------------------
-
-// compute single-crease patch matrix
-mat4
-OsdComputeMs(float sharpness)
-{
-    float s = pow(2.0f, sharpness);
-    float s2 = s*s;
-    float s3 = s2*s;
-
-    mat4 m = mat4(
-        0, s + 1 + 3*s2 - s3, 7*s - 2 - 6*s2 + 2*s3, (1-s)*(s-1)*(s-1),
-        0,       (1+s)*(1+s),        6*s - 2 - 2*s2,       (s-1)*(s-1),
-        0,               1+s,               6*s - 2,               1-s,
-        0,                 1,               6*s - 2,                 1);
-
-    m /= (s*6.0);
-    m[0][0] = 1.0/6.0;
-
-    return m;
-}
-
-// flip matrix orientation
-mat4
-OsdFlipMatrix(mat4 m)
-{
-    return mat4(m[3][3], m[3][2], m[3][1], m[3][0],
-                m[2][3], m[2][2], m[2][1], m[2][0],
-                m[1][3], m[1][2], m[1][1], m[1][0],
-                m[0][3], m[0][2], m[0][1], m[0][0]);
-}
-
-// Regular BSpline to Bezier
-uniform mat4 Q = mat4(
-    1.f/6.f, 4.f/6.f, 1.f/6.f, 0.f,
-    0.f,     4.f/6.f, 2.f/6.f, 0.f,
-    0.f,     2.f/6.f, 4.f/6.f, 0.f,
-    0.f,     1.f/6.f, 4.f/6.f, 1.f/6.f
-);
-
-// Infinitely Sharp (boundary)
-uniform mat4 Mi = mat4(
-    1.f/6.f, 4.f/6.f, 1.f/6.f, 0.f,
-    0.f,     4.f/6.f, 2.f/6.f, 0.f,
-    0.f,     2.f/6.f, 4.f/6.f, 0.f,
-    0.f,     0.f,     1.f,     0.f
-);
-
-// convert BSpline cv to Bezier cv
-void
-OsdComputePerPatchVertexBSpline(ivec3 patchParam, int ID, vec3 cv[16],
-                                out OsdPerPatchVertexBezier result)
-{
-    result.patchParam = patchParam;
-
-    int i = ID%4;
-    int j = ID/4;
-
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-
-    vec3 P  = vec3(0); // 0 to 1-2^(-Sf)
-    vec3 P1 = vec3(0); // 1-2^(-Sf) to 1-2^(-Sc)
-    vec3 P2 = vec3(0); // 1-2^(-Sc) to 1
-
-    float sharpness = OsdGetPatchSharpness(patchParam);
-    if (sharpness > 0) {
-        float Sf = floor(sharpness);
-        float Sc = ceil(sharpness);
-        float Sr = fract(sharpness);
-        mat4 Mf = OsdComputeMs(Sf);
-        mat4 Mc = OsdComputeMs(Sc);
-        mat4 Mj = (1-Sr) * Mf + Sr * Mi;
-        mat4 Ms = (1-Sr) * Mf + Sr * Mc;
-        float s0 = 1 - pow(2, -floor(sharpness));
-        float s1 = 1 - pow(2, -ceil(sharpness));
-        result.vSegments = vec2(s0, s1);
-
-        mat4 MUi = Q, MUj = Q, MUs = Q;
-        mat4 MVi = Q, MVj = Q, MVs = Q;
-
-        int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-        if ((boundaryMask & 1) != 0) {
-            MVi = OsdFlipMatrix(Mi);
-            MVj = OsdFlipMatrix(Mj);
-            MVs = OsdFlipMatrix(Ms);
-        }
-        if ((boundaryMask & 2) != 0) {
-            MUi = Mi;
-            MUj = Mj;
-            MUs = Ms;
-        }
-        if ((boundaryMask & 4) != 0) {
-            MVi = Mi;
-            MVj = Mj;
-            MVs = Ms;
-        }
-        if ((boundaryMask & 8) != 0) {
-            MUi = OsdFlipMatrix(Mi);
-            MUj = OsdFlipMatrix(Mj);
-            MUs = OsdFlipMatrix(Ms);
-        }
-
-        vec3 Hi[4], Hj[4], Hs[4];
-        for (int l=0; l<4; ++l) {
-            Hi[l] = Hj[l] = Hs[l] = vec3(0);
-            for (int k=0; k<4; ++k) {
-                Hi[l] += MUi[i][k] * cv[l*4 + k];
-                Hj[l] += MUj[i][k] * cv[l*4 + k];
-                Hs[l] += MUs[i][k] * cv[l*4 + k];
-            }
-        }
-        for (int k=0; k<4; ++k) {
-            P  += MVi[j][k]*Hi[k];
-            P1 += MVj[j][k]*Hj[k];
-            P2 += MVs[j][k]*Hs[k];
-        }
-
-        result.P  = P;
-        result.P1 = P1;
-        result.P2 = P2;
-    } else {
-        result.vSegments = vec2(0);
-
-        OsdComputeBSplineBoundaryPoints(cv, patchParam);
-
-        vec3 Hi[4];
-        for (int l=0; l<4; ++l) {
-            Hi[l] = vec3(0);
-            for (int k=0; k<4; ++k) {
-                Hi[l] += Q[i][k] * cv[l*4 + k];
-            }
-        }
-        for (int k=0; k<4; ++k) {
-            P += Q[j][k]*Hi[k];
-        }
-
-        result.P  = P;
-        result.P1 = P;
-        result.P2 = P;
-    }
-#else
-    OsdComputeBSplineBoundaryPoints(cv, patchParam);
-
-    vec3 H[4];
-    for (int l=0; l<4; ++l) {
-        H[l] = vec3(0);
-        for (int k=0; k<4; ++k) {
-            H[l] += Q[i][k] * cv[l*4 + k];
-        }
-    }
-    {
-        result.P = vec3(0);
-        for (int k=0; k<4; ++k) {
-            result.P += Q[j][k]*H[k];
-        }
-    }
-#endif
-}
-
-void
-OsdEvalPatchBezier(ivec3 patchParam, vec2 UV,
-                   OsdPerPatchVertexBezier cv[16],
-                   out vec3 P, out vec3 dPu, out vec3 dPv,
-                   out vec3 N, out vec3 dNu, out vec3 dNv)
-{
-    //
-    //  Use the recursive nature of the basis functions to compute a 2x2 set
-    //  of intermediate points (via repeated linear interpolation).  These
-    //  points define a bilinear surface tangent to the desired surface at P
-    //  and so containing dPu and dPv.  The cost of computing P, dPu and dPv
-    //  this way is comparable to that of typical tensor product evaluation
-    //  (if not faster).
-    //
-    //  If N = dPu X dPv degenerates, it often results from an edge of the
-    //  2x2 bilinear hull collapsing or two adjacent edges colinear. In both
-    //  cases, the expected non-planar quad degenerates into a triangle, and
-    //  the tangent plane of that triangle provides the desired normal N.
-    //
-
-    //  Reduce 4x4 points to 2x4 -- two levels of linear interpolation in U
-    //  and so 3 original rows contributing to each of the 2 resulting rows:
-    float u    = UV.x;
-    float uinv = 1.0f - u;
-
-    float u0 = uinv * uinv;
-    float u1 = u * uinv * 2.0f;
-    float u2 = u * u;
-
-    vec3 LROW[4], RROW[4];
-#ifndef OSD_PATCH_ENABLE_SINGLE_CREASE
-    LROW[0] = u0 * cv[ 0].P + u1 * cv[ 1].P + u2 * cv[ 2].P;
-    LROW[1] = u0 * cv[ 4].P + u1 * cv[ 5].P + u2 * cv[ 6].P;
-    LROW[2] = u0 * cv[ 8].P + u1 * cv[ 9].P + u2 * cv[10].P;
-    LROW[3] = u0 * cv[12].P + u1 * cv[13].P + u2 * cv[14].P;
-
-    RROW[0] = u0 * cv[ 1].P + u1 * cv[ 2].P + u2 * cv[ 3].P;
-    RROW[1] = u0 * cv[ 5].P + u1 * cv[ 6].P + u2 * cv[ 7].P;
-    RROW[2] = u0 * cv[ 9].P + u1 * cv[10].P + u2 * cv[11].P;
-    RROW[3] = u0 * cv[13].P + u1 * cv[14].P + u2 * cv[15].P;
-#else
-    vec2 vSegments = cv[0].vSegments;
-    float s = OsdGetPatchSingleCreaseSegmentParameter(patchParam, UV);
-
-    for (int i = 0; i < 4; ++i) {
-        int j = i*4;
-        if (s <= vSegments.x) {
-            LROW[i] = u0 * cv[ j ].P + u1 * cv[j+1].P + u2 * cv[j+2].P;
-            RROW[i] = u0 * cv[j+1].P + u1 * cv[j+2].P + u2 * cv[j+3].P;
-        } else if (s <= vSegments.y) {
-            LROW[i] = u0 * cv[ j ].P1 + u1 * cv[j+1].P1 + u2 * cv[j+2].P1;
-            RROW[i] = u0 * cv[j+1].P1 + u1 * cv[j+2].P1 + u2 * cv[j+3].P1;
-        } else {
-            LROW[i] = u0 * cv[ j ].P2 + u1 * cv[j+1].P2 + u2 * cv[j+2].P2;
-            RROW[i] = u0 * cv[j+1].P2 + u1 * cv[j+2].P2 + u2 * cv[j+3].P2;
-        }
-    }
-#endif
-
-    //  Reduce 2x4 points to 2x2 -- two levels of linear interpolation in V
-    //  and so 3 original pairs contributing to each of the 2 resulting:
-    float v    = UV.y;
-    float vinv = 1.0f - v;
-
-    float v0 = vinv * vinv;
-    float v1 = v * vinv * 2.0f;
-    float v2 = v * v;
-
-    vec3 LPAIR[2], RPAIR[2];
-    LPAIR[0] = v0 * LROW[0] + v1 * LROW[1] + v2 * LROW[2];
-    RPAIR[0] = v0 * RROW[0] + v1 * RROW[1] + v2 * RROW[2];
-
-    LPAIR[1] = v0 * LROW[1] + v1 * LROW[2] + v2 * LROW[3];
-    RPAIR[1] = v0 * RROW[1] + v1 * RROW[2] + v2 * RROW[3];
-
-    //  Interpolate points on the edges of the 2x2 bilinear hull from which
-    //  both position and partials are trivially determined:
-    vec3 DU0 = vinv * LPAIR[0] + v * LPAIR[1];
-    vec3 DU1 = vinv * RPAIR[0] + v * RPAIR[1];
-    vec3 DV0 = uinv * LPAIR[0] + u * RPAIR[0];
-    vec3 DV1 = uinv * LPAIR[1] + u * RPAIR[1];
-
-    int level = OsdGetPatchFaceLevel(patchParam);
-    dPu = (DU1 - DU0) * 3 * level;
-    dPv = (DV1 - DV0) * 3 * level;
-
-    P = u * DU1 + uinv * DU0;
-
-    //  Compute the normal and test for degeneracy:
-    //
-    //  We need a geometric measure of the size of the patch for a suitable
-    //  tolerance.  Magnitudes of the partials are generally proportional to
-    //  that size -- the sum of the partials is readily available, cheap to
-    //  compute, and has proved effective in most cases (though not perfect).
-    //  The size of the bounding box of the patch, or some approximation to
-    //  it, would be better but more costly to compute.
-    //
-    float proportionalNormalTolerance = 0.00001f;
-
-    float nEpsilon = (length(dPu) + length(dPv)) * proportionalNormalTolerance;
-
-    N = cross(dPu, dPv);
-
-    float nLength = length(N);
-    if (nLength > nEpsilon) {
-        N = N / nLength;
-    } else {
-        vec3 diagCross = cross(RPAIR[1] - LPAIR[0], LPAIR[1] - RPAIR[0]);
-        float diagCrossLength = length(diagCross);
-        if (diagCrossLength > nEpsilon) {
-            N = diagCross / diagCrossLength;
-        }
-    }
-
-#ifndef OSD_COMPUTE_NORMAL_DERIVATIVES
-    dNu = vec3(0);
-    dNv = vec3(0);
-#else
-    //
-    //  Compute 2nd order partials of P(u,v) in order to compute 1st order partials
-    //  for the un-normalized n(u,v) = dPu X dPv, then project into the tangent
-    //  plane of normalized N.  With resulting dNu and dNv we can make another
-    //  attempt to resolve a still-degenerate normal.
-    //
-    //  We don't use the Weingarten equations here as they require N != 0 and also
-    //  are a little less numerically stable/accurate in single precision.
-    //
-    float B0u[4], B1u[4], B2u[4];
-    float B0v[4], B1v[4], B2v[4];
-
-    OsdUnivar4x4(UV.x, B0u, B1u, B2u);
-    OsdUnivar4x4(UV.y, B0v, B1v, B2v);
-
-    vec3 dUU = vec3(0);
-    vec3 dVV = vec3(0);
-    vec3 dUV = vec3(0);
-
-    for (int i=0; i<4; ++i) {
-        for (int j=0; j<4; ++j) {
-#ifdef OSD_PATCH_ENABLE_SINGLE_CREASE
-            int k = 4*i + j;
-            vec3 CV = (s <= vSegments.x) ? cv[k].P
-                 :   ((s <= vSegments.y) ? cv[k].P1
-                                         : cv[k].P2);
-#else
-            vec3 CV = cv[4*i + j].P;
-#endif
-            dUU += (B0v[i] * B2u[j]) * CV;
-            dVV += (B2v[i] * B0u[j]) * CV;
-            dUV += (B1v[i] * B1u[j]) * CV;
-        }
-    }
-
-    dUU *= 6 * level;
-    dVV *= 6 * level;
-    dUV *= 9 * level;
-
-    dNu = cross(dUU, dPv) + cross(dPu, dUV);
-    dNv = cross(dUV, dPv) + cross(dPu, dVV);
-
-    float nLengthInv = 1.0;
-    if (nLength > nEpsilon) {
-        nLengthInv = 1.0 / nLength;
-    } else {
-        //  N may have been resolved above if degenerate, but if N was resolved
-        //  we don't have an accurate length for its un-normalized value, and that
-        //  length is needed to project the un-normalized dNu and dNv into the
-        //  tangent plane of N.
-        //
-        //  So compute N more accurately with available second derivatives, i.e.
-        //  with a 1st order Taylor approximation to un-normalized N(u,v).
-
-        float DU = (UV.x == 1.0f) ? -1.0f : 1.0f;
-        float DV = (UV.y == 1.0f) ? -1.0f : 1.0f;
-
-        N = DU * dNu + DV * dNv;
-
-        nLength = length(N);
-        if (nLength > nEpsilon) {
-            nLengthInv = 1.0f / nLength;
-            N = N * nLengthInv;
-        }
-    }
-
-    //  Project derivatives of non-unit normals into tangent plane of N:
-    dNu = (dNu - dot(dNu,N) * N) * nLengthInv;
-    dNv = (dNv - dot(dNv,N) * N) * nLengthInv;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// Gregory Basis
-// ----------------------------------------------------------------------------
-
-struct OsdPerPatchVertexGregoryBasis {
-    ivec3 patchParam;
-    vec3 P;
-};
-
-void
-OsdComputePerPatchVertexGregoryBasis(ivec3 patchParam, int ID, vec3 cv,
-                                     out OsdPerPatchVertexGregoryBasis result)
-{
-    result.patchParam = patchParam;
-    result.P = cv;
-}
-
-void
-OsdEvalPatchGregory(ivec3 patchParam, vec2 UV, vec3 cv[20],
-                    out vec3 P, out vec3 dPu, out vec3 dPv,
-                    out vec3 N, out vec3 dNu, out vec3 dNv)
-{
-    float u = UV.x, v = UV.y;
-    float U = 1-u, V = 1-v;
-
-    //(0,1)                              (1,1)
-    //   P3         e3-      e2+         P2
-    //      15------17-------11-------10
-    //      |        |        |        |
-    //      |        |        |        |
-    //      |        | f3-    | f2+    |
-    //      |       19       13        |
-    //  e3+ 16-----18          14-----12 e2-
-    //      |     f3+          f2-     |
-    //      |                          |
-    //      |                          |
-    //      |     f0-         f1+      |
-    //  e0- 2------4            8------6 e1+
-    //      |        3 f0+    9        |
-    //      |        |        | f1-    |
-    //      |        |        |        |
-    //      |        |        |        |
-    //      0--------1--------7--------5
-    //    P0        e0+      e1-         P1
-    //(0,0)                               (1,0)
-
-    float d11 = u+v;
-    float d12 = U+v;
-    float d21 = u+V;
-    float d22 = U+V;
-
-    OsdPerPatchVertexBezier bezcv[16];
-
-    bezcv[ 5].P = (d11 == 0.0) ? cv[3]  : (u*cv[3] + v*cv[4])/d11;
-    bezcv[ 6].P = (d12 == 0.0) ? cv[8]  : (U*cv[9] + v*cv[8])/d12;
-    bezcv[ 9].P = (d21 == 0.0) ? cv[18] : (u*cv[19] + V*cv[18])/d21;
-    bezcv[10].P = (d22 == 0.0) ? cv[13] : (U*cv[13] + V*cv[14])/d22;
-
-    bezcv[ 0].P = cv[0];
-    bezcv[ 1].P = cv[1];
-    bezcv[ 2].P = cv[7];
-    bezcv[ 3].P = cv[5];
-    bezcv[ 4].P = cv[2];
-    bezcv[ 7].P = cv[6];
-    bezcv[ 8].P = cv[16];
-    bezcv[11].P = cv[12];
-    bezcv[12].P = cv[15];
-    bezcv[13].P = cv[17];
-    bezcv[14].P = cv[11];
-    bezcv[15].P = cv[10];
-
-    OsdEvalPatchBezier(patchParam, UV, bezcv, P, dPu, dPv, N, dNu, dNv);
-}
-
-//
-//  Convert the 12 points of a regular patch resulting from Loop subdivision
-//  into a more accessible Bezier patch for both tessellation assessment and
-//  evaluation.
-//
-//  Regular patch for Loop subdivision -- quartic triangular Box spline:
-//
-//                           10 --- 11
-//                           . .   . .
-//                          .   . .   .
-//                         7 --- 8 --- 9
-//                        . .   . .   . .
-//                       .   . .   . .   .
-//                      3 --- 4 --- 5 --- 6
-//                       .   . .   . .   .
-//                        . .   . .   . .
-//                         0 --- 1 --- 2
-//
-//  The equivalant quartic Bezier triangle (15 points):
-//
-//                              14
-//                              . .
-//                             .   .
-//                           12 --- 13
-//                           . .   . .
-//                          .   . .   .
-//                         9 -- 10 --- 11
-//                        . .   . .   . .
-//                       .   . .   . .   .
-//                      5 --- 6 --- 7 --- 8
-//                     . .   . .   . .   . .
-//                    .   . .   . .   . .   .
-//                   0 --- 1 --- 2 --- 3 --- 4
-//
-//  A hybrid cubic/quartic Bezier patch with cubic boundaries is a close
-//  approximation and would only use 12 control points, but we need a full
-//  quartic patch to maintain accuracy along boundary curves -- especially
-//  between subdivision levels.
-//
-void
-OsdComputePerPatchVertexBoxSplineTriangle(ivec3 patchParam, int ID, vec3 cv[12],
-                                          out OsdPerPatchVertexBezier result)
-{
-    //
-    //  Conversion matrix from 12-point Box spline to 15-point quartic Bezier
-    //  patch and its common scale factor:
-    //
-    const float boxToBezierMatrix[12*15] = float[12*15](
-    // L0   L1   L2     L3   L4   L5   L6     L7   L8   L9     L10  L11
-        2,   2,   0,     2,  12,   2,   0,     2,   2,   0,     0,   0,  // B0
-        1,   3,   0,     0,  12,   4,   0,     1,   3,   0,     0,   0,  // B1
-        0,   4,   0,     0,   8,   8,   0,     0,   4,   0,     0,   0,  // B2
-        0,   3,   1,     0,   4,  12,   0,     0,   3,   1,     0,   0,  // B3
-        0,   2,   2,     0,   2,  12,   2,     0,   2,   2,     0,   0,  // B4
-        0,   1,   0,     1,  12,   3,   0,     3,   4,   0,     0,   0,  // B5
-        0,   1,   0,     0,  10,   6,   0,     1,   6,   0,     0,   0,  // B6
-        0,   1,   0,     0,   6,  10,   0,     0,   6,   1,     0,   0,  // B7
-        0,   1,   0,     0,   3,  12,   1,     0,   4,   3,     0,   0,  // B8
-        0,   0,   0,     0,   8,   4,   0,     4,   8,   0,     0,   0,  // B9
-        0,   0,   0,     0,   6,   6,   0,     1,  10,   1,     0,   0,  // B10
-        0,   0,   0,     0,   4,   8,   0,     0,   8,   4,     0,   0,  // B11
-        0,   0,   0,     0,   4,   3,   0,     3,  12,   1,     1,   0,  // B12
-        0,   0,   0,     0,   3,   4,   0,     1,  12,   3,     0,   1,  // B13
-        0,   0,   0,     0,   2,   2,   0,     2,  12,   2,     2,   2   // B14
-    );
-    const float boxToBezierMatrixScale = 1.0 / 24.0;
-
-    OsdComputeBoxSplineTriangleBoundaryPoints(cv, patchParam);
-
-    result.patchParam = patchParam;
-    result.P = vec3(0);
-
-    int cvCoeffBase = 12 * ID;
-
-    for (int i = 0; i < 12; ++i) {
-        result.P += boxToBezierMatrix[cvCoeffBase + i] * cv[i];
-    }
-    result.P *= boxToBezierMatrixScale;
-}
-
-void
-OsdEvalPatchBezierTriangle(ivec3 patchParam, vec2 UV,
-                           OsdPerPatchVertexBezier cv[15],
-                           out vec3 P, out vec3 dPu, out vec3 dPv,
-                           out vec3 N, out vec3 dNu, out vec3 dNv)
-{
-    float u = UV.x;
-    float v = UV.y;
-    float w = 1.0 - u - v;
-
-    float uu = u * u;
-    float vv = v * v;
-    float ww = w * w;
-
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    //
-    //  When computing normal derivatives, we need 2nd derivatives, so compute
-    //  an intermediate quadratic Bezier triangle from which 2nd derivatives
-    //  can be easily computed, and which in turn yields the triangle that gives
-    //  the position and 1st derivatives.
-    //
-    //  Quadratic barycentric basis functions (in addition to those above):
-    float uv = u * v * 2.0;
-    float vw = v * w * 2.0;
-    float wu = w * u * 2.0;
-
-    vec3 Q0 = ww * cv[ 0].P + wu * cv[ 1].P + uu * cv[ 2].P +
-              uv * cv[ 6].P + vv * cv[ 9].P + vw * cv[ 5].P;
-    vec3 Q1 = ww * cv[ 1].P + wu * cv[ 2].P + uu * cv[ 3].P +
-              uv * cv[ 7].P + vv * cv[10].P + vw * cv[ 6].P;
-    vec3 Q2 = ww * cv[ 2].P + wu * cv[ 3].P + uu * cv[ 4].P +
-              uv * cv[ 8].P + vv * cv[11].P + vw * cv[ 7].P;
-    vec3 Q3 = ww * cv[ 5].P + wu * cv[ 6].P + uu * cv[ 7].P +
-              uv * cv[10].P + vv * cv[12].P + vw * cv[ 9].P;
-    vec3 Q4 = ww * cv[ 6].P + wu * cv[ 7].P + uu * cv[ 8].P +
-              uv * cv[11].P + vv * cv[13].P + vw * cv[10].P;
-    vec3 Q5 = ww * cv[ 9].P + wu * cv[10].P + uu * cv[11].P +
-              uv * cv[13].P + vv * cv[14].P + vw * cv[12].P;
-
-    vec3 V0 = w * Q0 + u * Q1 + v * Q3;
-    vec3 V1 = w * Q1 + u * Q2 + v * Q4;
-    vec3 V2 = w * Q3 + u * Q4 + v * Q5;
-#else
-    //
-    //  When 2nd derivatives are not required, factor the recursive evaluation
-    //  of a point to directly provide the three points of the triangle at the
-    //  last stage -- which then trivially provides both position and 1st
-    //  derivatives.  Each point of the triangle results from evaluating the
-    //  corresponding cubic Bezier sub-triangle for each corner of the quartic:
-    //
-    //  Cubic barycentric basis functions:
-    float uuu = uu * u;
-    float uuv = uu * v * 3.0;
-    float uvv = u * vv * 3.0;
-    float vvv = vv * v;
-    float vvw = vv * w * 3.0;
-    float vww = v * ww * 3.0;
-    float www = ww * w;
-    float wwu = ww * u * 3.0;
-    float wuu = w * uu * 3.0;
-    float uvw = u * v * w * 6.0;
-
-    vec3 V0 = www * cv[ 0].P + wwu * cv[ 1].P + wuu * cv[ 2].P
-            + uuu * cv[ 3].P + uuv * cv[ 7].P + uvv * cv[10].P
-            + vvv * cv[12].P + vvw * cv[ 9].P + vww * cv[ 5].P + uvw * cv[ 6].P;
-
-    vec3 V1 = www * cv[ 1].P + wwu * cv[ 2].P + wuu * cv[ 3].P
-            + uuu * cv[ 4].P + uuv * cv[ 8].P + uvv * cv[11].P
-            + vvv * cv[13].P + vvw * cv[10].P + vww * cv[ 6].P + uvw * cv[ 7].P;
-
-    vec3 V2 = www * cv[ 5].P + wwu * cv[ 6].P + wuu * cv[ 7].P
-            + uuu * cv[ 8].P + uuv * cv[11].P + uvv * cv[13].P
-            + vvv * cv[14].P + vvw * cv[12].P + vww * cv[ 9].P + uvw * cv[10].P;
-#endif
-
-    //
-    //  Compute P, du and dv all from the triangle formed from the three Vi:
-    //
-    P = w * V0 + u * V1 + v * V2;
-
-    int dSign = OsdGetPatchIsTriangleRotated(patchParam) ? -1 : 1;
-    int level = OsdGetPatchFaceLevel(patchParam);
-
-    float d1Scale = dSign * level * 4;
-
-    dPu = (V1 - V0) * d1Scale;
-    dPv = (V2 - V0) * d1Scale;
-
-    //  Compute N and test for degeneracy:
-    //
-    //  We need a geometric measure of the size of the patch for a suitable
-    //  tolerance.  Magnitudes of the partials are generally proportional to
-    //  that size -- the sum of the partials is readily available, cheap to
-    //  compute, and has proved effective in most cases (though not perfect).
-    //  The size of the bounding box of the patch, or some approximation to
-    //  it, would be better but more costly to compute.
-    //
-    float proportionalNormalTolerance = 0.00001f;
-
-    float nEpsilon = (length(dPu) + length(dPv)) * proportionalNormalTolerance;
-
-    N = cross(dPu, dPv);
-    float nLength = length(N);
-
-
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    //
-    //  Compute normal derivatives using 2nd order partials, then use the
-    //  normal derivatives to resolve a degenerate normal:
-    //
-    float d2Scale = dSign * level * level * 12;
-
-    vec3 dUU = (Q0 - 2 * Q1 + Q2)  * d2Scale;
-    vec3 dVV = (Q0 - 2 * Q3 + Q5)  * d2Scale;
-    vec3 dUV = (Q0 - Q1 + Q4 - Q3) * d2Scale;
-
-    dNu = cross(dUU, dPv) + cross(dPu, dUV);
-    dNv = cross(dUV, dPv) + cross(dPu, dVV);
-
-    if (nLength < nEpsilon) {
-        //  Use 1st order Taylor approximation of N(u,v) within patch interior:
-        if (w > 0.0) {
-            N =  dNu + dNv;
-        } else if (u >= 1.0) {
-            N = -dNu + dNv;
-        } else if (v >= 1.0) {
-            N =  dNu - dNv;
-        } else {
-            N = -dNu - dNv;
-        }
-
-        nLength = length(N);
-        if (nLength < nEpsilon) {
-            nLength = 1.0;
-        }
-    }
-    N = N / nLength;
-
-    //  Project derivs of non-unit normal function onto tangent plane of N:
-    dNu = (dNu - dot(dNu,N) * N) / nLength;
-    dNv = (dNv - dot(dNv,N) * N) / nLength;
-#else
-    dNu = vec3(0);
-    dNv = vec3(0);
-
-    //
-    //  Resolve a degenerate normal using the interior triangle of the
-    //  intermediate quadratic patch that results from recursive evaluation.
-    //  This addresses common cases of degenerate or colinear boundaries
-    //  without resorting to use of explicit 2nd derivatives:
-    //
-    if (nLength < nEpsilon) {
-        float uv  = u * v * 2.0;
-        float vw  = v * w * 2.0;
-        float wu  = w * u * 2.0;
-
-        vec3 Q1 = ww * cv[ 1].P + wu * cv[ 2].P + uu * cv[ 3].P +
-                  uv * cv[ 7].P + vv * cv[10].P + vw * cv[ 6].P;
-        vec3 Q3 = ww * cv[ 5].P + wu * cv[ 6].P + uu * cv[ 7].P +
-                  uv * cv[10].P + vv * cv[12].P + vw * cv[ 9].P;
-        vec3 Q4 = ww * cv[ 6].P + wu * cv[ 7].P + uu * cv[ 8].P +
-                  uv * cv[11].P + vv * cv[13].P + vw * cv[10].P;
-
-        N = cross((Q4 - Q1), (Q3 - Q1));
-        nLength = length(N);
-        if (nLength < nEpsilon) {
-            nLength = 1.0;
-        }
-    }
-    N = N / nLength;
-#endif
-}
-
-void
-OsdEvalPatchGregoryTriangle(ivec3 patchParam, vec2 UV, vec3 cv[18],
-                            out vec3 P, out vec3 dPu, out vec3 dPv,
-                            out vec3 N, out vec3 dNu, out vec3 dNv)
-{
-    float u = UV.x;
-    float v = UV.y;
-    float w = 1.0 - u - v;
-
-    float duv = u + v;
-    float dvw = v + w;
-    float dwu = w + u;
-
-    OsdPerPatchVertexBezier bezcv[15];
-
-    bezcv[ 6].P = (duv == 0.0) ? cv[3]  : ((u*cv[ 3] + v*cv[ 4]) / duv);
-    bezcv[ 7].P = (dvw == 0.0) ? cv[8]  : ((v*cv[ 8] + w*cv[ 9]) / dvw);
-    bezcv[10].P = (dwu == 0.0) ? cv[13] : ((w*cv[13] + u*cv[14]) / dwu);
-
-    bezcv[ 0].P = cv[ 0];
-    bezcv[ 1].P = cv[ 1];
-    bezcv[ 2].P = cv[15];
-    bezcv[ 3].P = cv[ 7];
-    bezcv[ 4].P = cv[ 5];
-    bezcv[ 5].P = cv[ 2];
-    bezcv[ 8].P = cv[ 6];
-    bezcv[ 9].P = cv[17];
-    bezcv[11].P = cv[16];
-    bezcv[12].P = cv[11];
-    bezcv[13].P = cv[12];
-    bezcv[14].P = cv[10];
-
-    OsdEvalPatchBezierTriangle(patchParam, UV, bezcv, P, dPu, dPv, N, dNu, dNv);
-}
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchCommonTess.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchCommonTess.glsl
deleted file mode 100644
index d85c66e40..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchCommonTess.glsl
+++ /dev/null
@@ -1,732 +0,0 @@
-//
-//   Copyright 2013-2018 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-// ----------------------------------------------------------------------------
-// Tessellation
-// ----------------------------------------------------------------------------
-
-// For now, fractional spacing is supported only with screen space tessellation
-#ifndef OSD_ENABLE_SCREENSPACE_TESSELLATION
-#undef OSD_FRACTIONAL_EVEN_SPACING
-#undef OSD_FRACTIONAL_ODD_SPACING
-#endif
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-  #define OSD_SPACING fractional_even_spacing
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-  #define OSD_SPACING fractional_odd_spacing
-#else
-  #define OSD_SPACING equal_spacing
-#endif
-
-//
-// Organization of B-spline and Bezier control points.
-//
-// Each patch is defined by 16 control points (labeled 0-15).
-//
-// The patch will be evaluated across the domain from (0,0) at
-// the lower-left to (1,1) at the upper-right. When computing
-// adaptive tessellation metrics, we consider refined vertex-vertex
-// and edge-vertex points along the transition edges of the patch
-// (labeled vv* and ev* respectively).
-//
-// The two segments of each transition edge are labeled Lo and Hi,
-// with the Lo segment occurring before the Hi segment along the
-// transition edge's domain parameterization. These Lo and Hi segment
-// tessellation levels determine how domain evaluation coordinates
-// are remapped along transition edges. The Hi segment value will
-// be zero for a non-transition edge.
-//
-// (0,1)                                         (1,1)
-//
-//   vv3                  ev23                   vv2
-//        |       Lo3       |       Hi3       |
-//      --O-----------O-----+-----O-----------O--
-//        | 12        | 13     14 |        15 |
-//        |           |           |           |
-//        |           |           |           |
-//    Hi0 |           |           |           | Hi2
-//        |           |           |           |
-//        O-----------O-----------O-----------O
-//        | 8         | 9      10 |        11 |
-//        |           |           |           |
-// ev03 --+           |           |           +-- ev12
-//        |           |           |           |
-//        | 4         | 5       6 |         7 |
-//        O-----------O-----------O-----------O
-//        |           |           |           |
-//    Lo0 |           |           |           | Lo2
-//        |           |           |           |
-//        |           |           |           |
-//        | 0         | 1       2 |         3 |
-//      --O-----------O-----+-----O-----------O--
-//        |       Lo1       |       Hi1       |
-//   vv0                  ev01                   vv1
-//
-// (0,0)                                         (1,0)
-//
-
-#define OSD_MAX_TESS_LEVEL gl_MaxTessGenLevel
-
-float OsdComputePostProjectionSphereExtent(vec3 center, float diameter)
-{
-    vec4 p = OsdProjectionMatrix() * vec4(center, 1.0);
-    return abs(diameter * OsdProjectionMatrix()[1][1] / p.w);
-}
-
-float OsdComputeTessLevel(vec3 p0, vec3 p1)
-{
-    // Adaptive factor can be any computation that depends only on arg values.
-    // Project the diameter of the edge's bounding sphere instead of using the
-    // length of the projected edge itself to avoid problems near silhouettes.
-    p0 = (OsdModelViewMatrix() * vec4(p0, 1.0)).xyz;
-    p1 = (OsdModelViewMatrix() * vec4(p1, 1.0)).xyz;
-    vec3 center = (p0 + p1) / 2.0;
-    float diameter = distance(p0, p1);
-    float projLength = OsdComputePostProjectionSphereExtent(center, diameter);
-    float tessLevel = max(1.0, OsdTessLevel() * projLength);
-
-    // We restrict adaptive tessellation levels to half of the device
-    // supported maximum because transition edges are split into two
-    // halves and the sum of the two corresponding levels must not exceed
-    // the device maximum. We impose this limit even for non-transition
-    // edges because a non-transition edge must be able to match up with
-    // one half of the transition edge of an adjacent transition patch.
-    return min(tessLevel, OSD_MAX_TESS_LEVEL / 2);
-}
-
-void
-OsdGetTessLevelsUniform(ivec3 patchParam,
-                        out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    // Uniform factors are simple powers of two for each level.
-    // The maximum here can be increased if we know the maximum
-    // refinement level of the mesh:
-    //     min(OSD_MAX_TESS_LEVEL, pow(2, MaximumRefinementLevel-1)
-    int refinementLevel = OsdGetPatchRefinementLevel(patchParam);
-    float tessLevel = min(OsdTessLevel(), OSD_MAX_TESS_LEVEL) /
-                        pow(2, refinementLevel-1);
-
-    // tessLevels of transition edge should be clamped to 2.
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-    vec4 tessLevelMin = vec4(1) + vec4(((transitionMask & 8) >> 3),
-                                       ((transitionMask & 1) >> 0),
-                                       ((transitionMask & 2) >> 1),
-                                       ((transitionMask & 4) >> 2));
-
-    tessOuterLo = max(vec4(tessLevel), tessLevelMin);
-    tessOuterHi = vec4(0);
-}
-
-void
-OsdGetTessLevelsUniformTriangle(ivec3 patchParam,
-                        out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    // Uniform factors are simple powers of two for each level.
-    // The maximum here can be increased if we know the maximum
-    // refinement level of the mesh:
-    //     min(OSD_MAX_TESS_LEVEL, pow(2, MaximumRefinementLevel-1)
-    int refinementLevel = OsdGetPatchRefinementLevel(patchParam);
-    float tessLevel = min(OsdTessLevel(), OSD_MAX_TESS_LEVEL) /
-                        pow(2, refinementLevel-1);
-
-    // tessLevels of transition edge should be clamped to 2.
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-    vec4 tessLevelMin = vec4(1) + vec4(((transitionMask & 4) >> 2),
-                                       ((transitionMask & 1) >> 0),
-                                       ((transitionMask & 2) >> 1),
-                                       0);
-
-    tessOuterLo = max(vec4(tessLevel), tessLevelMin);
-    tessOuterHi = vec4(0);
-}
-
-void
-OsdGetTessLevelsRefinedPoints(vec3 cp[16], ivec3 patchParam,
-                              out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. We compute the corresponding
-    // vertex-vertex and edge-vertex refined points along the edges of the
-    // patch using Catmull-Clark subdivision stencil weights.
-    // For simplicity, we let the optimizer discard unused computation.
-
-    vec3 vv0 = (cp[0] + cp[2] + cp[8] + cp[10]) * 0.015625 +
-               (cp[1] + cp[4] + cp[6] + cp[9]) * 0.09375 + cp[5] * 0.5625;
-    vec3 ev01 = (cp[1] + cp[2] + cp[9] + cp[10]) * 0.0625 +
-                (cp[5] + cp[6]) * 0.375;
-
-    vec3 vv1 = (cp[1] + cp[3] + cp[9] + cp[11]) * 0.015625 +
-               (cp[2] + cp[5] + cp[7] + cp[10]) * 0.09375 + cp[6] * 0.5625;
-    vec3 ev12 = (cp[5] + cp[7] + cp[9] + cp[11]) * 0.0625 +
-                (cp[6] + cp[10]) * 0.375;
-
-    vec3 vv2 = (cp[5] + cp[7] + cp[13] + cp[15]) * 0.015625 +
-               (cp[6] + cp[9] + cp[11] + cp[14]) * 0.09375 + cp[10] * 0.5625;
-    vec3 ev23 = (cp[5] + cp[6] + cp[13] + cp[14]) * 0.0625 +
-                (cp[9] + cp[10]) * 0.375;
-
-    vec3 vv3 = (cp[4] + cp[6] + cp[12] + cp[14]) * 0.015625 +
-               (cp[5] + cp[8] + cp[10] + cp[13]) * 0.09375 + cp[9] * 0.5625;
-    vec3 ev03 = (cp[4] + cp[6] + cp[8] + cp[10]) * 0.0625 +
-                (cp[5] + cp[9]) * 0.375;
-
-    tessOuterLo = vec4(0);
-    tessOuterHi = vec4(0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    if ((transitionMask & 8) != 0) {
-        tessOuterLo[0] = OsdComputeTessLevel(vv0, ev03);
-        tessOuterHi[0] = OsdComputeTessLevel(vv3, ev03);
-    } else {
-        tessOuterLo[0] = OsdComputeTessLevel(cp[5], cp[9]);
-    }
-    if ((transitionMask & 1) != 0) {
-        tessOuterLo[1] = OsdComputeTessLevel(vv0, ev01);
-        tessOuterHi[1] = OsdComputeTessLevel(vv1, ev01);
-    } else {
-        tessOuterLo[1] = OsdComputeTessLevel(cp[5], cp[6]);
-    }
-    if ((transitionMask & 2) != 0) {
-        tessOuterLo[2] = OsdComputeTessLevel(vv1, ev12);
-        tessOuterHi[2] = OsdComputeTessLevel(vv2, ev12);
-    } else {
-        tessOuterLo[2] = OsdComputeTessLevel(cp[6], cp[10]);
-    }
-    if ((transitionMask & 4) != 0) {
-        tessOuterLo[3] = OsdComputeTessLevel(vv3, ev23);
-        tessOuterHi[3] = OsdComputeTessLevel(vv2, ev23);
-    } else {
-        tessOuterLo[3] = OsdComputeTessLevel(cp[9], cp[10]);
-    }
-}
-
-//
-//  Patch boundary corners are ordered counter-clockwise from the first
-//  corner while patch boundary edges and their midpoints are similarly
-//  ordered counter-clockwise beginning at the edge preceding corner[0].
-//
-void
-Osd_GetTessLevelsFromPatchBoundaries4(vec3 corners[4], vec3 midpoints[4],
-                 ivec3 patchParam, out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    tessOuterLo = vec4(0);
-    tessOuterHi = vec4(0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    if ((transitionMask & 8) != 0) {
-        tessOuterLo[0] = OsdComputeTessLevel(corners[0], midpoints[0]);
-        tessOuterHi[0] = OsdComputeTessLevel(corners[3], midpoints[0]);
-    } else {
-        tessOuterLo[0] = OsdComputeTessLevel(corners[0], corners[3]);
-    }
-    if ((transitionMask & 1) != 0) {
-        tessOuterLo[1] = OsdComputeTessLevel(corners[0], midpoints[1]);
-        tessOuterHi[1] = OsdComputeTessLevel(corners[1], midpoints[1]);
-    } else {
-        tessOuterLo[1] = OsdComputeTessLevel(corners[0], corners[1]);
-    }
-    if ((transitionMask & 2) != 0) {
-        tessOuterLo[2] = OsdComputeTessLevel(corners[1], midpoints[2]);
-        tessOuterHi[2] = OsdComputeTessLevel(corners[2], midpoints[2]);
-    } else {
-        tessOuterLo[2] = OsdComputeTessLevel(corners[1], corners[2]);
-    }
-    if ((transitionMask & 4) != 0) {
-        tessOuterLo[3] = OsdComputeTessLevel(corners[3], midpoints[3]);
-        tessOuterHi[3] = OsdComputeTessLevel(corners[2], midpoints[3]);
-    } else {
-        tessOuterLo[3] = OsdComputeTessLevel(corners[3], corners[2]);
-    }
-}
-
-void
-Osd_GetTessLevelsFromPatchBoundaries3(vec3 corners[3], vec3 midpoints[3],
-                 ivec3 patchParam, out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    tessOuterLo = vec4(0);
-    tessOuterHi = vec4(0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    if ((transitionMask & 4) != 0) {
-        tessOuterLo[0] = OsdComputeTessLevel(corners[0], midpoints[0]);
-        tessOuterHi[0] = OsdComputeTessLevel(corners[2], midpoints[0]);
-    } else {
-        tessOuterLo[0] = OsdComputeTessLevel(corners[0], corners[2]);
-    }
-    if ((transitionMask & 1) != 0) {
-        tessOuterLo[1] = OsdComputeTessLevel(corners[0], midpoints[1]);
-        tessOuterHi[1] = OsdComputeTessLevel(corners[1], midpoints[1]);
-    } else {
-        tessOuterLo[1] = OsdComputeTessLevel(corners[0], corners[1]);
-    }
-    if ((transitionMask & 2) != 0) {
-        tessOuterLo[2] = OsdComputeTessLevel(corners[2], midpoints[2]);
-        tessOuterHi[2] = OsdComputeTessLevel(corners[1], midpoints[2]);
-    } else {
-        tessOuterLo[2] = OsdComputeTessLevel(corners[1], corners[2]);
-    }
-}
-
-vec3
-Osd_EvalBezierCurveMidPoint(vec3 p0, vec3 p1, vec3 p2, vec3 p3)
-{
-    //  Coefficients for the midpoint are { 1/8, 3/8, 3/8, 1/8 }:
-    return 0.125 * (p0 + p3) + 0.375 * (p1 + p2);
-}
-
-vec3
-Osd_EvalQuarticBezierCurveMidPoint(vec3 p0, vec3 p1, vec3 p2, vec3 p3, vec3 p4)
-{
-    //  Coefficients for the midpoint are { 1/16, 1/4, 3/8, 1/4, 1/16 }:
-    return 0.0625 * (p0 + p4) + 0.25 * (p1 + p3) + 0.375 * p2;
-}
-
-void
-OsdEvalPatchBezierTessLevels(OsdPerPatchVertexBezier cpBezier[16],
-                 ivec3 patchParam, out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. When the patch control
-    // points have been converted to the Bezier basis, the control points
-    // at the four corners are on the limit surface (since a Bezier patch
-    // interpolates its corner control points). We can compute an adaptive
-    // tessellation level for transition edges on the limit surface by
-    // evaluating a limit position at the mid point of each transition edge.
-
-    tessOuterLo = vec4(0);
-    tessOuterHi = vec4(0);
-
-    vec3 corners[4];
-    vec3 midpoints[4];
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    corners[0] = OsdEvalBezier(cpBezier, patchParam, vec2(0.0, 0.0));
-    corners[1] = OsdEvalBezier(cpBezier, patchParam, vec2(1.0, 0.0));
-    corners[2] = OsdEvalBezier(cpBezier, patchParam, vec2(1.0, 1.0));
-    corners[3] = OsdEvalBezier(cpBezier, patchParam, vec2(0.0, 1.0));
-
-    midpoints[0] = ((transitionMask & 8) == 0) ? vec3(0) :  
-        OsdEvalBezier(cpBezier, patchParam, vec2(0.0, 0.5));
-    midpoints[1] = ((transitionMask & 1) == 0) ? vec3(0) :  
-        OsdEvalBezier(cpBezier, patchParam, vec2(0.5, 0.0));
-    midpoints[2] = ((transitionMask & 2) == 0) ? vec3(0) :  
-        OsdEvalBezier(cpBezier, patchParam, vec2(1.0, 0.5));
-    midpoints[3] = ((transitionMask & 4) == 0) ? vec3(0) :
-        OsdEvalBezier(cpBezier, patchParam, vec2(0.5, 1.0));
-#else
-    corners[0] = cpBezier[ 0].P;
-    corners[1] = cpBezier[ 3].P;
-    corners[2] = cpBezier[15].P;
-    corners[3] = cpBezier[12].P;
-
-    midpoints[0] = ((transitionMask & 8) == 0) ? vec3(0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[0].P, cpBezier[4].P, cpBezier[8].P, cpBezier[12].P);
-    midpoints[1] = ((transitionMask & 1) == 0) ? vec3(0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[0].P, cpBezier[1].P, cpBezier[2].P, cpBezier[3].P);
-    midpoints[2] = ((transitionMask & 2) == 0) ? vec3(0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[3].P, cpBezier[7].P, cpBezier[11].P, cpBezier[15].P);
-    midpoints[3] = ((transitionMask & 4) == 0) ? vec3(0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[12].P, cpBezier[13].P, cpBezier[14].P, cpBezier[15].P);
-#endif
-
-    Osd_GetTessLevelsFromPatchBoundaries4(corners, midpoints,
-                                          patchParam, tessOuterLo, tessOuterHi);
-}
-
-void
-OsdEvalPatchBezierTriangleTessLevels(vec3 cv[15],
-                 ivec3 patchParam, out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. When the patch control
-    // points have been converted to the Bezier basis, the control points
-    // at the corners are on the limit surface (since a Bezier patch
-    // interpolates its corner control points). We can compute an adaptive
-    // tessellation level for transition edges on the limit surface by
-    // evaluating a limit position at the mid point of each transition edge.
-
-    tessOuterLo = vec4(0);
-    tessOuterHi = vec4(0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    vec3 corners[3];
-    corners[0] = cv[0];
-    corners[1] = cv[4];
-    corners[2] = cv[14];
-
-    vec3 midpoints[3];
-    midpoints[0] = ((transitionMask & 4) == 0) ? vec3(0) :
-        Osd_EvalQuarticBezierCurveMidPoint(cv[0], cv[5], cv[9], cv[12], cv[14]);
-    midpoints[1] = ((transitionMask & 1) == 0) ? vec3(0) :
-        Osd_EvalQuarticBezierCurveMidPoint(cv[0], cv[1], cv[2], cv[3], cv[4]);
-    midpoints[2] = ((transitionMask & 2) == 0) ? vec3(0) :
-        Osd_EvalQuarticBezierCurveMidPoint(cv[4], cv[8], cv[11], cv[13], cv[14]);
-
-    Osd_GetTessLevelsFromPatchBoundaries3(corners, midpoints,
-                                          patchParam, tessOuterLo, tessOuterHi);
-}
-
-// Round up to the nearest even integer
-float OsdRoundUpEven(float x) {
-    return 2*ceil(x/2);
-}
-
-// Round up to the nearest odd integer
-float OsdRoundUpOdd(float x) {
-    return 2*ceil((x+1)/2)-1;
-}
-
-// Compute outer and inner tessellation levels taking into account the
-// current tessellation spacing mode.
-void
-OsdComputeTessLevels(inout vec4 tessOuterLo, inout vec4 tessOuterHi,
-                     out vec4 tessLevelOuter, out vec2 tessLevelInner)
-{
-    // Outer levels are the sum of the Lo and Hi segments where the Hi
-    // segments will have lengths of zero for non-transition edges.
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-    // Combine fractional outer transition edge levels before rounding.
-    vec4 combinedOuter = tessOuterLo + tessOuterHi;
-
-    // Round the segments of transition edges separately. We will recover the
-    // fractional parameterization of transition edges after tessellation.
-
-    tessLevelOuter = combinedOuter;
-    if (tessOuterHi[0] > 0) {
-        tessLevelOuter[0] =
-            OsdRoundUpEven(tessOuterLo[0]) + OsdRoundUpEven(tessOuterHi[0]);
-    }
-    if (tessOuterHi[1] > 0) {
-        tessLevelOuter[1] =
-            OsdRoundUpEven(tessOuterLo[1]) + OsdRoundUpEven(tessOuterHi[1]);
-    }
-    if (tessOuterHi[2] > 0) {
-        tessLevelOuter[2] =
-            OsdRoundUpEven(tessOuterLo[2]) + OsdRoundUpEven(tessOuterHi[2]);
-    }
-    if (tessOuterHi[3] > 0) {
-        tessLevelOuter[3] =
-            OsdRoundUpEven(tessOuterLo[3]) + OsdRoundUpEven(tessOuterHi[3]);
-    }
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-    // Combine fractional outer transition edge levels before rounding.
-    vec4 combinedOuter = tessOuterLo + tessOuterHi;
-
-    // Round the segments of transition edges separately. We will recover the
-    // fractional parameterization of transition edges after tessellation.
-    //
-    // The sum of the two outer odd segment lengths will be an even number
-    // which the tessellator will increase by +1 so that there will be a
-    // total odd number of segments. We clamp the combinedOuter tess levels
-    // (used to compute the inner tess levels) so that the outer transition
-    // edges will be sampled without degenerate triangles.
-
-    tessLevelOuter = combinedOuter;
-    if (tessOuterHi[0] > 0) {
-        tessLevelOuter[0] =
-            OsdRoundUpOdd(tessOuterLo[0]) + OsdRoundUpOdd(tessOuterHi[0]);
-        combinedOuter = max(vec4(3), combinedOuter);
-    }
-    if (tessOuterHi[1] > 0) {
-        tessLevelOuter[1] =
-            OsdRoundUpOdd(tessOuterLo[1]) + OsdRoundUpOdd(tessOuterHi[1]);
-        combinedOuter = max(vec4(3), combinedOuter);
-    }
-    if (tessOuterHi[2] > 0) {
-        tessLevelOuter[2] =
-            OsdRoundUpOdd(tessOuterLo[2]) + OsdRoundUpOdd(tessOuterHi[2]);
-        combinedOuter = max(vec4(3), combinedOuter);
-    }
-    if (tessOuterHi[3] > 0) {
-        tessLevelOuter[3] =
-            OsdRoundUpOdd(tessOuterLo[3]) + OsdRoundUpOdd(tessOuterHi[3]);
-        combinedOuter = max(vec4(3), combinedOuter);
-    }
-#else
-    // Round equally spaced transition edge levels before combining.
-    tessOuterLo = round(tessOuterLo);
-    tessOuterHi = round(tessOuterHi);
-
-    vec4 combinedOuter = tessOuterLo + tessOuterHi;
-    tessLevelOuter = combinedOuter;
-#endif
-
-    // Inner levels are the averages the corresponding outer levels.
-    tessLevelInner[0] = (combinedOuter[1] + combinedOuter[3]) * 0.5;
-    tessLevelInner[1] = (combinedOuter[0] + combinedOuter[2]) * 0.5;
-}
-
-void
-OsdComputeTessLevelsTriangle(inout vec4 tessOuterLo, inout vec4 tessOuterHi,
-                             out vec4 tessLevelOuter, out vec2 tessLevelInner)
-{
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-
-    // Inner level is the max of the three outer levels.
-    tessLevelInner[0] = max(max(tessLevelOuter[0],
-                                tessLevelOuter[1]),
-                                tessLevelOuter[2]);
-}
-
-void
-OsdGetTessLevelsUniform(ivec3 patchParam,
-                 out vec4 tessLevelOuter, out vec2 tessLevelInner,
-                 out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    OsdGetTessLevelsUniform(patchParam, tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdGetTessLevelsUniformTriangle(ivec3 patchParam,
-                 out vec4 tessLevelOuter, out vec2 tessLevelInner,
-                 out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    OsdGetTessLevelsUniformTriangle(patchParam, tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevelsTriangle(tessOuterLo, tessOuterHi,
-                                 tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdEvalPatchBezierTessLevels(OsdPerPatchVertexBezier cpBezier[16],
-                 ivec3 patchParam,
-                 out vec4 tessLevelOuter, out vec2 tessLevelInner,
-                 out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    OsdEvalPatchBezierTessLevels(cpBezier, patchParam,
-                                 tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdEvalPatchBezierTriangleTessLevels(vec3 cv[15],
-                 ivec3 patchParam,
-                 out vec4 tessLevelOuter, out vec2 tessLevelInner,
-                 out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    OsdEvalPatchBezierTriangleTessLevels(cv, patchParam,
-                                         tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevelsTriangle(tessOuterLo, tessOuterHi,
-                                 tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdGetTessLevelsAdaptiveRefinedPoints(vec3 cpRefined[16], ivec3 patchParam,
-                        out vec4 tessLevelOuter, out vec2 tessLevelInner,
-                        out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    OsdGetTessLevelsRefinedPoints(cpRefined, patchParam,
-                                  tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-//  Deprecated -- prefer use of newer Bezier patch equivalent:
-void
-OsdGetTessLevelsLimitPoints(OsdPerPatchVertexBezier cpBezier[16],
-                 ivec3 patchParam, out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    OsdEvalPatchBezierTessLevels(cpBezier, patchParam, tessOuterLo, tessOuterHi);
-}
-
-//  Deprecated -- prefer use of newer Bezier patch equivalent:
-void
-OsdGetTessLevelsAdaptiveLimitPoints(OsdPerPatchVertexBezier cpBezier[16],
-                 ivec3 patchParam,
-                 out vec4 tessLevelOuter, out vec2 tessLevelInner,
-                 out vec4 tessOuterLo, out vec4 tessOuterHi)
-{
-    OsdGetTessLevelsLimitPoints(cpBezier, patchParam,
-                                tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-//  Deprecated -- prefer use of newer Bezier patch equivalent:
-void
-OsdGetTessLevels(vec3 cp0, vec3 cp1, vec3 cp2, vec3 cp3,
-                 ivec3 patchParam,
-                 out vec4 tessLevelOuter, out vec2 tessLevelInner)
-{
-    vec4 tessOuterLo = vec4(0);
-    vec4 tessOuterHi = vec4(0);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    tessOuterLo[0] = OsdComputeTessLevel(cp0, cp1);
-    tessOuterLo[1] = OsdComputeTessLevel(cp0, cp3);
-    tessOuterLo[2] = OsdComputeTessLevel(cp2, cp3);
-    tessOuterLo[3] = OsdComputeTessLevel(cp1, cp2);
-    tessOuterHi = vec4(0);
-#else
-    OsdGetTessLevelsUniform(patchParam, tessOuterLo, tessOuterHi);
-#endif
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING || defined OSD_FRACTIONAL_ODD_SPACING
-float
-OsdGetTessFractionalSplit(float t, float level, float levelUp)
-{
-    // Fractional tessellation of an edge will produce n segments where n
-    // is the tessellation level of the edge (level) rounded up to the
-    // nearest even or odd integer (levelUp). There will be n-2 segments of
-    // equal length (dx1) and two additional segments of equal length (dx0)
-    // that are typically shorter than the other segments. The two additional
-    // segments should be placed symmetrically on opposite sides of the
-    // edge (offset).
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-    if (level <= 2) return t;
-
-    float base = pow(2.0,floor(log2(levelUp)));
-    float offset = 1.0/(int(2*base-levelUp)/2 & int(base/2-1));
-
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-    if (level <= 1) return t;
-
-    float base = pow(2.0,floor(log2(levelUp)));
-    float offset = 1.0/(((int(2*base-levelUp)/2+1) & int(base/2-1))+1);
-#endif
-
-    float dx0 = (1.0 - (levelUp-level)/2) / levelUp;
-    float dx1 = (1.0 - 2.0*dx0) / (levelUp - 2.0*ceil(dx0));
-
-    if (t < 0.5) {
-        float x = levelUp/2 - round(t*levelUp);
-        return 0.5 - (x*dx1 + int(x*offset > 1) * (dx0 - dx1));
-    } else if (t > 0.5) {
-        float x = round(t*levelUp) - levelUp/2;
-        return 0.5 + (x*dx1 + int(x*offset > 1) * (dx0 - dx1));
-    } else {
-        return t;
-    }
-}
-#endif
-
-float
-OsdGetTessTransitionSplit(float t, float lo, float hi)
-{
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-    float loRoundUp = OsdRoundUpEven(lo);
-    float hiRoundUp = OsdRoundUpEven(hi);
-
-    // Convert the parametric t into a segment index along the combined edge.
-    float ti = round(t * (loRoundUp + hiRoundUp));
-
-    if (ti <= loRoundUp) {
-        float t0 = ti / loRoundUp;
-        return OsdGetTessFractionalSplit(t0, lo, loRoundUp) * 0.5;
-    } else {
-        float t1 = (ti - loRoundUp) / hiRoundUp;
-        return OsdGetTessFractionalSplit(t1, hi, hiRoundUp) * 0.5 + 0.5;
-    }
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-    float loRoundUp = OsdRoundUpOdd(lo);
-    float hiRoundUp = OsdRoundUpOdd(hi);
-
-    // Convert the parametric t into a segment index along the combined edge.
-    // The +1 below is to account for the extra segment produced by the
-    // tessellator since the sum of two odd tess levels will be rounded
-    // up by one to the next odd integer tess level.
-    float ti = round(t * (loRoundUp + hiRoundUp + 1));
-
-    if (ti <= loRoundUp) {
-        float t0 = ti / loRoundUp;
-        return OsdGetTessFractionalSplit(t0, lo, loRoundUp) * 0.5;
-    } else if (ti > (loRoundUp+1)) {
-        float t1 = (ti - (loRoundUp+1)) / hiRoundUp;
-        return OsdGetTessFractionalSplit(t1, hi, hiRoundUp) * 0.5 + 0.5;
-    } else {
-        return 0.5;
-    }
-#else
-    // Convert the parametric t into a segment index along the combined edge.
-    float ti = round(t * (lo + hi));
-
-    if (ti <= lo) {
-        return (ti / lo) * 0.5;
-    } else {
-        return ((ti - lo) / hi) * 0.5 + 0.5;
-    }
-#endif
-}
-
-vec2
-OsdGetTessParameterization(vec2 p, vec4 tessOuterLo, vec4 tessOuterHi)
-{
-    vec2 UV = p;
-    if (p.x == 0 && tessOuterHi[0] > 0) {
-        UV.y = OsdGetTessTransitionSplit(UV.y, tessOuterLo[0], tessOuterHi[0]);
-    } else
-    if (p.y == 0 && tessOuterHi[1] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[1], tessOuterHi[1]);
-    } else
-    if (p.x == 1 && tessOuterHi[2] > 0) {
-        UV.y = OsdGetTessTransitionSplit(UV.y, tessOuterLo[2], tessOuterHi[2]);
-    } else
-    if (p.y == 1 && tessOuterHi[3] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[3], tessOuterHi[3]);
-    }
-    return UV;
-}
-
-vec2
-OsdGetTessParameterizationTriangle(vec3 p, vec4 tessOuterLo, vec4 tessOuterHi)
-{
-    vec2 UV = p.xy;
-    if (p.x == 0 && tessOuterHi[0] > 0) {
-        UV.y = OsdGetTessTransitionSplit(UV.y, tessOuterLo[0], tessOuterHi[0]);
-    } else
-    if (p.y == 0 && tessOuterHi[1] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[1], tessOuterHi[1]);
-    } else
-    if (p.z == 0 && tessOuterHi[2] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[2], tessOuterHi[2]);
-        UV.y = 1.0 - UV.x;
-    }
-    return UV;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchGregory.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchGregory.glsl
deleted file mode 100644
index f591ff700..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchGregory.glsl
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexGregory
-//----------------------------------------------------------
-#ifdef OSD_PATCH_VERTEX_GREGORY_SHADER
-
-layout (location=0) in vec4 position;
-OSD_USER_VARYING_ATTRIBUTE_DECLARE
-
-out block {
-    OsdPerVertexGregory v;
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    OsdComputePerVertexGregory(gl_VertexID, position.xyz, outpt.v);
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(position);
-    OSD_USER_VARYING_PER_VERTEX();
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessControlGregory
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_CONTROL_GREGORY_SHADER
-
-patch out vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    OsdPerVertexGregory v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OsdPerPatchVertexGregory v;
-    OSD_USER_VARYING_DECLARE
-} outpt[4];
-
-layout(vertices = 4) out;
-
-void main()
-{
-    OsdPerVertexGregory cv[4];
-    for (int i=0; i<4; ++i) {
-        cv[i] = inpt[i].v;
-    }
-
-    ivec3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(gl_PrimitiveID));
-    OsdComputePerPatchVertexGregory(patchParam, gl_InvocationID, gl_PrimitiveID, cv, outpt[gl_InvocationID].v);
-
-    OSD_USER_VARYING_PER_CONTROL_POINT(gl_InvocationID, gl_InvocationID);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Wait for all basis conversion to be finished
-    barrier();
-#endif
-    if (gl_InvocationID == 0) {
-        vec4 tessLevelOuter = vec4(0);
-        vec2 tessLevelInner = vec2(0);
-
-        OSD_PATCH_CULL(4);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-        // Gather bezier control points to compute limit surface tess levels
-        OsdPerPatchVertexBezier bezcv[16];
-        bezcv[ 0].P = outpt[0].v.P;
-        bezcv[ 1].P = outpt[0].v.Ep;
-        bezcv[ 2].P = outpt[1].v.Em;
-        bezcv[ 3].P = outpt[1].v.P;
-        bezcv[ 4].P = outpt[0].v.Em;
-        bezcv[ 5].P = outpt[0].v.Fp;
-        bezcv[ 6].P = outpt[1].v.Fm;
-        bezcv[ 7].P = outpt[1].v.Ep;
-        bezcv[ 8].P = outpt[3].v.Ep;
-        bezcv[ 9].P = outpt[3].v.Fm;
-        bezcv[10].P = outpt[2].v.Fp;
-        bezcv[11].P = outpt[2].v.Em;
-        bezcv[12].P = outpt[3].v.P;
-        bezcv[13].P = outpt[3].v.Em;
-        bezcv[14].P = outpt[2].v.Ep;
-        bezcv[15].P = outpt[2].v.P;
-
-        OsdEvalPatchBezierTessLevels(bezcv, patchParam,
-                                     tessLevelOuter, tessLevelInner,
-                                     tessOuterLo, tessOuterHi);
-#else
-        OsdGetTessLevelsUniform(patchParam, tessLevelOuter, tessLevelInner,
-                         tessOuterLo, tessOuterHi);
-#endif
-
-        gl_TessLevelOuter[0] = tessLevelOuter[0];
-        gl_TessLevelOuter[1] = tessLevelOuter[1];
-        gl_TessLevelOuter[2] = tessLevelOuter[2];
-        gl_TessLevelOuter[3] = tessLevelOuter[3];
-
-        gl_TessLevelInner[0] = tessLevelInner[0];
-        gl_TessLevelInner[1] = tessLevelInner[1];
-    }
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessEvalGregory
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_EVAL_GREGORY_SHADER
-
-layout(quads) in;
-layout(OSD_SPACING) in;
-
-patch in vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    OsdPerPatchVertexGregory v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OutputVertex v;
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    vec3 P = vec3(0), dPu = vec3(0), dPv = vec3(0);
-    vec3 N = vec3(0), dNu = vec3(0), dNv = vec3(0);
-
-    vec3 cv[20];
-    cv[0] = inpt[0].v.P;
-    cv[1] = inpt[0].v.Ep;
-    cv[2] = inpt[0].v.Em;
-    cv[3] = inpt[0].v.Fp;
-    cv[4] = inpt[0].v.Fm;
-
-    cv[5] = inpt[1].v.P;
-    cv[6] = inpt[1].v.Ep;
-    cv[7] = inpt[1].v.Em;
-    cv[8] = inpt[1].v.Fp;
-    cv[9] = inpt[1].v.Fm;
-
-    cv[10] = inpt[2].v.P;
-    cv[11] = inpt[2].v.Ep;
-    cv[12] = inpt[2].v.Em;
-    cv[13] = inpt[2].v.Fp;
-    cv[14] = inpt[2].v.Fm;
-
-    cv[15] = inpt[3].v.P;
-    cv[16] = inpt[3].v.Ep;
-    cv[17] = inpt[3].v.Em;
-    cv[18] = inpt[3].v.Fp;
-    cv[19] = inpt[3].v.Fm;
-
-    vec2 UV = OsdGetTessParameterization(gl_TessCoord.xy,
-                                         tessOuterLo,
-                                         tessOuterHi);
-
-    ivec3 patchParam = inpt[0].v.patchParam;
-    OsdEvalPatchGregory(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    outpt.v.position = OsdModelViewMatrix() * vec4(P, 1.0f);
-    outpt.v.normal = (OsdModelViewMatrix() * vec4(N, 0.0f)).xyz;
-    outpt.v.tangent = (OsdModelViewMatrix() * vec4(dPu, 0.0f)).xyz;
-    outpt.v.bitangent = (OsdModelViewMatrix() * vec4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    outpt.v.Nu = dNu;
-    outpt.v.Nv = dNv;
-#endif
-
-    outpt.v.tessCoord = UV;
-    outpt.v.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-
-    OSD_USER_VARYING_PER_EVAL_POINT(UV, 0, 1, 3, 2);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    gl_Position = OsdProjectionMatrix() * outpt.v.position;
-}
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchGregoryBasis.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchGregoryBasis.glsl
deleted file mode 100644
index 77e48ce00..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchGregoryBasis.glsl
+++ /dev/null
@@ -1,182 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexGregoryBasis
-//----------------------------------------------------------
-#ifdef OSD_PATCH_VERTEX_GREGORY_BASIS_SHADER
-
-layout(location = 0) in vec4 position;
-OSD_USER_VARYING_ATTRIBUTE_DECLARE
-
-out block {
-    ControlVertex v;
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    outpt.v.position = position;
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(position);
-    OSD_USER_VARYING_PER_VERTEX();
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessControlGregoryBasis
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_CONTROL_GREGORY_BASIS_SHADER
-
-patch out vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    ControlVertex v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OsdPerPatchVertexGregoryBasis v;
-    OSD_USER_VARYING_DECLARE
-} outpt[20];
-
-layout(vertices = 20) out;
-
-void main()
-{
-    vec3 cv = inpt[gl_InvocationID].v.position.xyz;
-
-    ivec3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(gl_PrimitiveID));
-    OsdComputePerPatchVertexGregoryBasis(
-        patchParam, gl_InvocationID, cv, outpt[gl_InvocationID].v);
-
-    OSD_USER_VARYING_PER_CONTROL_POINT(gl_InvocationID, gl_InvocationID);
-
-    if (gl_InvocationID == 0) {
-        vec4 tessLevelOuter = vec4(0);
-        vec2 tessLevelInner = vec2(0);
-
-        OSD_PATCH_CULL(20);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-        // Gather bezier control points to compute limit surface tess levels
-        OsdPerPatchVertexBezier bezcv[16];
-        bezcv[ 0].P = inpt[ 0].v.position.xyz;
-        bezcv[ 1].P = inpt[ 1].v.position.xyz;
-        bezcv[ 2].P = inpt[ 7].v.position.xyz;
-        bezcv[ 3].P = inpt[ 5].v.position.xyz;
-        bezcv[ 4].P = inpt[ 2].v.position.xyz;
-        bezcv[ 5].P = inpt[ 3].v.position.xyz;
-        bezcv[ 6].P = inpt[ 8].v.position.xyz;
-        bezcv[ 7].P = inpt[ 6].v.position.xyz;
-        bezcv[ 8].P = inpt[16].v.position.xyz;
-        bezcv[ 9].P = inpt[18].v.position.xyz;
-        bezcv[10].P = inpt[13].v.position.xyz;
-        bezcv[11].P = inpt[12].v.position.xyz;
-        bezcv[12].P = inpt[15].v.position.xyz;
-        bezcv[13].P = inpt[17].v.position.xyz;
-        bezcv[14].P = inpt[11].v.position.xyz;
-        bezcv[15].P = inpt[10].v.position.xyz;
-
-        OsdEvalPatchBezierTessLevels(
-                bezcv, patchParam,
-                tessLevelOuter, tessLevelInner,
-                tessOuterLo, tessOuterHi);
-#else
-        OsdGetTessLevelsUniform(
-                patchParam,
-                tessLevelOuter, tessLevelInner,
-                tessOuterLo, tessOuterHi);
-#endif
-
-        gl_TessLevelOuter[0] = tessLevelOuter[0];
-        gl_TessLevelOuter[1] = tessLevelOuter[1];
-        gl_TessLevelOuter[2] = tessLevelOuter[2];
-        gl_TessLevelOuter[3] = tessLevelOuter[3];
-
-        gl_TessLevelInner[0] = tessLevelInner[0];
-        gl_TessLevelInner[1] = tessLevelInner[1];
-    }
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessEvalGregoryBasis
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_EVAL_GREGORY_BASIS_SHADER
-
-layout(quads) in;
-layout(OSD_SPACING) in;
-
-patch in vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    OsdPerPatchVertexGregoryBasis v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OutputVertex v;
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    vec3 P = vec3(0), dPu = vec3(0), dPv = vec3(0);
-    vec3 N = vec3(0), dNu = vec3(0), dNv = vec3(0);
-
-    vec3 cv[20];
-    for (int i = 0; i < 20; ++i) {
-        cv[i] = inpt[i].v.P;
-    }
-
-    vec2 UV = OsdGetTessParameterization(gl_TessCoord.xy,
-                                         tessOuterLo,
-                                         tessOuterHi);
-
-    ivec3 patchParam = inpt[0].v.patchParam;
-    OsdEvalPatchGregory(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    outpt.v.position = OsdModelViewMatrix() * vec4(P, 1.0f);
-    outpt.v.normal = (OsdModelViewMatrix() * vec4(N, 0.0f)).xyz;
-    outpt.v.tangent = (OsdModelViewMatrix() * vec4(dPu, 0.0f)).xyz;
-    outpt.v.bitangent = (OsdModelViewMatrix() * vec4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    outpt.v.Nu = dNu;
-    outpt.v.Nv = dNv;
-#endif
-
-    outpt.v.tessCoord = UV;
-    outpt.v.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-
-    OSD_USER_VARYING_PER_EVAL_POINT(UV, 0, 5, 15, 10);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    gl_Position = OsdProjectionMatrix() * outpt.v.position;
-}
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchGregoryTriangle.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchGregoryTriangle.glsl
deleted file mode 100644
index c4445ce63..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchGregoryTriangle.glsl
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-//   Copyright 2018 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexGregoryTriangle
-//----------------------------------------------------------
-#ifdef OSD_PATCH_VERTEX_GREGORY_TRIANGLE_SHADER
-
-layout(location = 0) in vec4 position;
-OSD_USER_VARYING_ATTRIBUTE_DECLARE
-
-out block {
-    ControlVertex v;
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    outpt.v.position = position;
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(position);
-    OSD_USER_VARYING_PER_VERTEX();
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessControlGregoryTriangle
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_CONTROL_GREGORY_TRIANGLE_SHADER
-
-patch out vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    ControlVertex v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OsdPerPatchVertexGregoryBasis v;
-    OSD_USER_VARYING_DECLARE
-} outpt[18];
-
-layout(vertices = 18) out;
-
-void main()
-{
-    vec3 cv = inpt[gl_InvocationID].v.position.xyz;
-
-    ivec3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(gl_PrimitiveID));
-    OsdComputePerPatchVertexGregoryBasis(
-        patchParam, gl_InvocationID, cv, outpt[gl_InvocationID].v);
-
-    OSD_USER_VARYING_PER_CONTROL_POINT(gl_InvocationID, gl_InvocationID);
-
-    if (gl_InvocationID == 0) {
-        vec4 tessLevelOuter = vec4(0);
-        vec2 tessLevelInner = vec2(0);
-
-        OSD_PATCH_CULL(18);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-        // Gather bezier control points to compute limit surface tess levels
-        vec3 cv[15];
-        cv[ 0] = inpt[ 0].v.position.xyz;
-        cv[ 1] = inpt[ 1].v.position.xyz;
-        cv[ 2] = inpt[15].v.position.xyz;
-        cv[ 3] = inpt[ 7].v.position.xyz;
-        cv[ 4] = inpt[ 5].v.position.xyz;
-        cv[ 5] = inpt[ 2].v.position.xyz;
-        cv[ 6] = inpt[ 3].v.position.xyz;
-        cv[ 7] = inpt[ 8].v.position.xyz;
-        cv[ 8] = inpt[ 6].v.position.xyz;
-        cv[ 9] = inpt[17].v.position.xyz;
-        cv[10] = inpt[13].v.position.xyz;
-        cv[11] = inpt[16].v.position.xyz;
-        cv[12] = inpt[11].v.position.xyz;
-        cv[13] = inpt[12].v.position.xyz;
-        cv[14] = inpt[10].v.position.xyz;
-
-        OsdEvalPatchBezierTriangleTessLevels(
-                cv, patchParam,
-                tessLevelOuter, tessLevelInner,
-                tessOuterLo, tessOuterHi);
-#else
-        OsdGetTessLevelsUniformTriangle(
-                patchParam,
-                tessLevelOuter, tessLevelInner,
-                tessOuterLo, tessOuterHi);
-#endif
-
-        gl_TessLevelOuter[0] = tessLevelOuter[0];
-        gl_TessLevelOuter[1] = tessLevelOuter[1];
-        gl_TessLevelOuter[2] = tessLevelOuter[2];
-
-        gl_TessLevelInner[0] = tessLevelInner[0];
-    }
-}
-
-#endif
-
-//----------------------------------------------------------
-// Patches.TessEvalGregoryTriangle
-//----------------------------------------------------------
-#ifdef OSD_PATCH_TESS_EVAL_GREGORY_TRIANGLE_SHADER
-
-layout(triangles) in;
-layout(OSD_SPACING) in;
-
-patch in vec4 tessOuterLo, tessOuterHi;
-
-in block {
-    OsdPerPatchVertexGregoryBasis v;
-    OSD_USER_VARYING_DECLARE
-} inpt[];
-
-out block {
-    OutputVertex v;
-    OSD_USER_VARYING_DECLARE
-} outpt;
-
-void main()
-{
-    vec3 P = vec3(0), dPu = vec3(0), dPv = vec3(0);
-    vec3 N = vec3(0), dNu = vec3(0), dNv = vec3(0);
-
-    vec3 cv[18];
-    for (int i = 0; i < 18; ++i) {
-        cv[i] = inpt[i].v.P;
-    }
-
-    vec2 UV = OsdGetTessParameterizationTriangle(gl_TessCoord.xyz,
-                                                 tessOuterLo,
-                                                 tessOuterHi);
-
-    ivec3 patchParam = inpt[0].v.patchParam;
-    OsdEvalPatchGregoryTriangle(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    outpt.v.position = OsdModelViewMatrix() * vec4(P, 1.0f);
-    outpt.v.normal = (OsdModelViewMatrix() * vec4(N, 0.0f)).xyz;
-    outpt.v.tangent = (OsdModelViewMatrix() * vec4(dPu, 0.0f)).xyz;
-    outpt.v.bitangent = (OsdModelViewMatrix() * vec4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    outpt.v.Nu = dNu;
-    outpt.v.Nv = dNv;
-#endif
-
-    outpt.v.tessCoord = UV;
-    outpt.v.patchCoord = OsdInterpolatePatchCoordTriangle(UV, patchParam);
-
-    OSD_USER_VARYING_PER_EVAL_POINT_TRIANGLE(UV, 0, 5, 10);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    gl_Position = OsdProjectionMatrix() * outpt.v.position;
-}
-
-#endif
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchLegacy.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchLegacy.glsl
deleted file mode 100644
index e1e7002d1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchLegacy.glsl
+++ /dev/null
@@ -1,511 +0,0 @@
-//
-//   Copyright 2013-2018 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-// ----------------------------------------------------------------------------
-// Legacy Gregory
-// ----------------------------------------------------------------------------
-#if defined(OSD_PATCH_GREGORY) || defined(OSD_PATCH_GREGORY_BOUNDARY)
-
-#define M_PI 3.14159265359f
-
-// precomputed catmark coefficient table up to valence 29
-uniform float OsdCatmarkCoefficient[30] = float[](
-    0, 0, 0, 0.812816, 0.500000, 0.363644, 0.287514,
-    0.238688, 0.204544, 0.179229, 0.159657,
-    0.144042, 0.131276, 0.120632, 0.111614,
-    0.103872, 0.09715, 0.0912559, 0.0860444,
-    0.0814022, 0.0772401, 0.0734867, 0.0700842,
-    0.0669851, 0.0641504, 0.0615475, 0.0591488,
-    0.0569311, 0.0548745, 0.0529621
-    );
-
-float
-OsdComputeCatmarkCoefficient(int valence)
-{
-#if OSD_MAX_VALENCE < 30
-    return OsdCatmarkCoefficient[valence];
-#else
-    if (valence < 30) {
-        return OsdCatmarkCoefficient[valence];
-    } else {
-        float t = 2.0f * float(M_PI) / float(valence);
-        return 1.0f / (valence * (cos(t) + 5.0f +
-                                  sqrt((cos(t) + 9) * (cos(t) + 1)))/16.0f);
-    }
-#endif
-}
-
-float cosfn(int n, int j) {
-    return cos((2.0f * M_PI * j)/float(n));
-}
-
-float sinfn(int n, int j) {
-    return sin((2.0f * M_PI * j)/float(n));
-}
-
-#if !defined OSD_MAX_VALENCE || OSD_MAX_VALENCE < 1
-#undef OSD_MAX_VALENCE
-#define OSD_MAX_VALENCE 4
-#endif
-
-struct OsdPerVertexGregory {
-    vec3 P;
-    ivec3 clipFlag;
-    int  valence;
-    vec3 e0;
-    vec3 e1;
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    int zerothNeighbor;
-    vec3 org;
-#endif
-    vec3 r[OSD_MAX_VALENCE];
-};
-
-struct OsdPerPatchVertexGregory {
-    ivec3 patchParam;
-    vec3 P;
-    vec3 Ep;
-    vec3 Em;
-    vec3 Fp;
-    vec3 Fm;
-};
-
-#ifndef OSD_NUM_ELEMENTS
-#define OSD_NUM_ELEMENTS 3
-#endif
-
-uniform samplerBuffer OsdVertexBuffer;
-uniform isamplerBuffer OsdValenceBuffer;
-
-vec3 OsdReadVertex(int vertexIndex)
-{
-    int index = int(OSD_NUM_ELEMENTS * (vertexIndex + OsdBaseVertex()));
-    return vec3(texelFetch(OsdVertexBuffer, index).x,
-                texelFetch(OsdVertexBuffer, index+1).x,
-                texelFetch(OsdVertexBuffer, index+2).x);
-}
-
-int OsdReadVertexValence(int vertexID)
-{
-    int index = int(vertexID * (2 * OSD_MAX_VALENCE + 1));
-    return texelFetch(OsdValenceBuffer, index).x;
-}
-
-int OsdReadVertexIndex(int vertexID, int valenceVertex)
-{
-    int index = int(vertexID * (2 * OSD_MAX_VALENCE + 1) + 1 + valenceVertex);
-    return texelFetch(OsdValenceBuffer, index).x;
-}
-
-uniform isamplerBuffer OsdQuadOffsetBuffer;
-
-int OsdReadQuadOffset(int primitiveID, int offsetVertex)
-{
-    int index = int(4*primitiveID+OsdGregoryQuadOffsetBase() + offsetVertex);
-    return texelFetch(OsdQuadOffsetBuffer, index).x;
-}
-
-void
-OsdComputePerVertexGregory(int vID, vec3 P, out OsdPerVertexGregory v)
-{
-    v.clipFlag = ivec3(0);
-
-    int ivalence = OsdReadVertexValence(vID);
-    v.valence = ivalence;
-    int valence = abs(ivalence);
-
-    vec3 f[OSD_MAX_VALENCE];
-    vec3 pos = P;
-    vec3 opos = vec3(0);
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    v.org = pos;
-    int boundaryEdgeNeighbors[2];
-    int currNeighbor = 0;
-    int ibefore = 0;
-    int zerothNeighbor = 0;
-#endif
-
-    for (int i=0; i<valence; ++i) {
-        int im = (i+valence-1)%valence;
-        int ip = (i+1)%valence;
-
-        int idx_neighbor = OsdReadVertexIndex(vID, 2*i);
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-        bool isBoundaryNeighbor = false;
-        int valenceNeighbor = OsdReadVertexValence(idx_neighbor);
-
-        if (valenceNeighbor < 0) {
-            isBoundaryNeighbor = true;
-            if (currNeighbor<2) {
-                boundaryEdgeNeighbors[currNeighbor] = idx_neighbor;
-            }
-            currNeighbor++;
-            if (currNeighbor == 1) {
-                ibefore = i;
-                zerothNeighbor = i;
-            } else {
-                if (i-ibefore == 1) {
-                    int tmp = boundaryEdgeNeighbors[0];
-                    boundaryEdgeNeighbors[0] = boundaryEdgeNeighbors[1];
-                    boundaryEdgeNeighbors[1] = tmp;
-                    zerothNeighbor = i;
-                }
-            }
-        }
-#endif
-
-        vec3 neighbor = OsdReadVertex(idx_neighbor);
-
-        int idx_diagonal = OsdReadVertexIndex(vID, 2*i + 1);
-        vec3 diagonal = OsdReadVertex(idx_diagonal);
-
-        int idx_neighbor_p = OsdReadVertexIndex(vID, 2*ip);
-        vec3 neighbor_p = OsdReadVertex(idx_neighbor_p);
-
-        int idx_neighbor_m = OsdReadVertexIndex(vID, 2*im);
-        vec3 neighbor_m = OsdReadVertex(idx_neighbor_m);
-
-        int idx_diagonal_m = OsdReadVertexIndex(vID, 2*im + 1);
-        vec3 diagonal_m = OsdReadVertex(idx_diagonal_m);
-
-        f[i] = (pos * float(valence) + (neighbor_p + neighbor)*2.0f + diagonal) / (float(valence)+5.0f);
-
-        opos += f[i];
-        v.r[i] = (neighbor_p-neighbor_m)/3.0f + (diagonal - diagonal_m)/6.0f;
-    }
-
-    opos /= valence;
-    v.P = vec4(opos, 1.0f).xyz;
-
-    vec3 e;
-    v.e0 = vec3(0);
-    v.e1 = vec3(0);
-
-    for(int i=0; i<valence; ++i) {
-        int im = (i + valence -1) % valence;
-        e = 0.5f * (f[i] + f[im]);
-        v.e0 += cosfn(valence, i)*e;
-        v.e1 += sinfn(valence, i)*e;
-    }
-    float ef = OsdComputeCatmarkCoefficient(valence);
-    v.e0 *= ef;
-    v.e1 *= ef;
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    v.zerothNeighbor = zerothNeighbor;
-    if (currNeighbor == 1) {
-        boundaryEdgeNeighbors[1] = boundaryEdgeNeighbors[0];
-    }
-
-    if (ivalence < 0) {
-        if (valence > 2) {
-            v.P = (OsdReadVertex(boundaryEdgeNeighbors[0]) +
-                   OsdReadVertex(boundaryEdgeNeighbors[1]) +
-                   4.0f * pos)/6.0f;
-        } else {
-            v.P = pos;
-        }
-
-        v.e0 = (OsdReadVertex(boundaryEdgeNeighbors[0]) -
-                OsdReadVertex(boundaryEdgeNeighbors[1]))/6.0;
-
-        float k = float(float(valence) - 1.0f);    //k is the number of faces
-        float c = cos(M_PI/k);
-        float s = sin(M_PI/k);
-        float gamma = -(4.0f*s)/(3.0f*k+c);
-        float alpha_0k = -((1.0f+2.0f*c)*sqrt(1.0f+c))/((3.0f*k+c)*sqrt(1.0f-c));
-        float beta_0 = s/(3.0f*k + c);
-
-        int idx_diagonal = OsdReadVertexIndex(vID, 2*zerothNeighbor + 1);
-        vec3 diagonal = OsdReadVertex(idx_diagonal);
-
-        v.e1 = gamma * pos +
-            alpha_0k * OsdReadVertex(boundaryEdgeNeighbors[0]) +
-            alpha_0k * OsdReadVertex(boundaryEdgeNeighbors[1]) +
-            beta_0 * diagonal;
-
-        for (int x=1; x<valence - 1; ++x) {
-            int curri = ((x + zerothNeighbor)%valence);
-            float alpha = (4.0f*sin((M_PI * float(x))/k))/(3.0f*k+c);
-            float beta = (sin((M_PI * float(x))/k) + sin((M_PI * float(x+1))/k))/(3.0f*k+c);
-
-            int idx_neighbor = OsdReadVertexIndex(vID, 2*curri);
-            vec3 neighbor = OsdReadVertex(idx_neighbor);
-
-            idx_diagonal = OsdReadVertexIndex(vID, 2*curri + 1);
-            diagonal = OsdReadVertex(idx_diagonal);
-
-            v.e1 += alpha * neighbor + beta * diagonal;
-        }
-
-        v.e1 /= 3.0f;
-    }
-#endif
-}
-
-void
-OsdComputePerPatchVertexGregory(ivec3 patchParam, int ID, int primitiveID,
-                                in OsdPerVertexGregory v[4],
-                                out OsdPerPatchVertexGregory result)
-{
-    result.patchParam = patchParam;
-    result.P = v[ID].P;
-
-    int i = ID;
-    int ip = (i+1)%4;
-    int im = (i+3)%4;
-    int valence = abs(v[i].valence);
-    int n = valence;
-
-    int start = OsdReadQuadOffset(primitiveID, i) & 0xff;
-    int prev = (OsdReadQuadOffset(primitiveID, i) >> 8) & 0xff;
-
-    int start_m = OsdReadQuadOffset(primitiveID, im) & 0xff;
-    int prev_p = (OsdReadQuadOffset(primitiveID, ip) >> 8) & 0xff;
-
-    int np = abs(v[ip].valence);
-    int nm = abs(v[im].valence);
-
-    // Control Vertices based on :
-    // "Approximating Subdivision Surfaces with Gregory Patches
-    //  for Hardware Tessellation"
-    // Loop, Schaefer, Ni, Castano (ACM ToG Siggraph Asia 2009)
-    //
-    //  P3         e3-      e2+         P2
-    //     O--------O--------O--------O
-    //     |        |        |        |
-    //     |        |        |        |
-    //     |        | f3-    | f2+    |
-    //     |        O        O        |
-    // e3+ O------O            O------O e2-
-    //     |     f3+          f2-     |
-    //     |                          |
-    //     |                          |
-    //     |      f0-         f1+     |
-    // e0- O------O            O------O e1+
-    //     |        O        O        |
-    //     |        | f0+    | f1-    |
-    //     |        |        |        |
-    //     |        |        |        |
-    //     O--------O--------O--------O
-    //  P0         e0+      e1-         P1
-    //
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    vec3 Em_ip;
-    if (v[ip].valence < -2) {
-        int j = (np + prev_p - v[ip].zerothNeighbor) % np;
-        Em_ip = v[ip].P + cos((M_PI*j)/float(np-1))*v[ip].e0 + sin((M_PI*j)/float(np-1))*v[ip].e1;
-    } else {
-        Em_ip = v[ip].P + v[ip].e0*cosfn(np, prev_p ) + v[ip].e1*sinfn(np, prev_p);
-    }
-
-    vec3 Ep_im;
-    if (v[im].valence < -2) {
-        int j = (nm + start_m - v[im].zerothNeighbor) % nm;
-        Ep_im = v[im].P + cos((M_PI*j)/float(nm-1))*v[im].e0 + sin((M_PI*j)/float(nm-1))*v[im].e1;
-    } else {
-        Ep_im = v[im].P + v[im].e0*cosfn(nm, start_m) + v[im].e1*sinfn(nm, start_m);
-    }
-
-    if (v[i].valence < 0) {
-        n = (n-1)*2;
-    }
-    if (v[im].valence < 0) {
-        nm = (nm-1)*2;
-    }
-    if (v[ip].valence < 0) {
-        np = (np-1)*2;
-    }
-
-    if (v[i].valence > 2) {
-        result.Ep = v[i].P + v[i].e0*cosfn(n, start) + v[i].e1*sinfn(n, start);
-        result.Em = v[i].P + v[i].e0*cosfn(n, prev ) + v[i].e1*sinfn(n, prev);
-
-        float s1=3-2*cosfn(n,1)-cosfn(np,1);
-        float s2=2*cosfn(n,1);
-
-        result.Fp = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-        s1 = 3.0f-2.0f*cos(2.0f*M_PI/float(n))-cos(2.0f*M_PI/float(nm));
-        result.Fm = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-
-    } else if (v[i].valence < -2) {
-        int j = (valence + start - v[i].zerothNeighbor) % valence;
-
-        result.Ep = v[i].P + cos((M_PI*j)/float(valence-1))*v[i].e0 + sin((M_PI*j)/float(valence-1))*v[i].e1;
-        j = (valence + prev - v[i].zerothNeighbor) % valence;
-        result.Em = v[i].P + cos((M_PI*j)/float(valence-1))*v[i].e0 + sin((M_PI*j)/float(valence-1))*v[i].e1;
-
-        vec3 Rp = ((-2.0f * v[i].org - 1.0f * v[im].org) + (2.0f * v[ip].org + 1.0f * v[(i+2)%4].org))/3.0f;
-        vec3 Rm = ((-2.0f * v[i].org - 1.0f * v[ip].org) + (2.0f * v[im].org + 1.0f * v[(i+2)%4].org))/3.0f;
-
-        float s1 = 3-2*cosfn(n,1)-cosfn(np,1);
-        float s2 = 2*cosfn(n,1);
-
-        result.Fp = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-        s1 = 3.0f-2.0f*cos(2.0f*M_PI/float(n))-cos(2.0f*M_PI/float(nm));
-        result.Fm = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-
-        if (v[im].valence < 0) {
-            s1 = 3-2*cosfn(n,1)-cosfn(np,1);
-            result.Fp = result.Fm = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-        } else if (v[ip].valence < 0) {
-            s1 = 3.0f-2.0f*cos(2.0f*M_PI/n)-cos(2.0f*M_PI/nm);
-            result.Fm = result.Fp = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-        }
-
-    } else if (v[i].valence == -2) {
-        result.Ep = (2.0f * v[i].org + v[ip].org)/3.0f;
-        result.Em = (2.0f * v[i].org + v[im].org)/3.0f;
-        result.Fp = result.Fm = (4.0f * v[i].org + v[(i+2)%n].org + 2.0f * v[ip].org + 2.0f * v[im].org)/9.0f;
-    }
-
-#else // not OSD_PATCH_GREGORY_BOUNDARY
-
-    result.Ep = v[i].P + v[i].e0 * cosfn(n, start) + v[i].e1*sinfn(n, start);
-    result.Em = v[i].P + v[i].e0 * cosfn(n, prev ) + v[i].e1*sinfn(n, prev);
-
-    vec3 Em_ip = v[ip].P + v[ip].e0 * cosfn(np, prev_p ) + v[ip].e1*sinfn(np, prev_p);
-    vec3 Ep_im = v[im].P + v[im].e0 * cosfn(nm, start_m) + v[im].e1*sinfn(nm, start_m);
-
-    float s1 = 3-2*cosfn(n,1)-cosfn(np,1);
-    float s2 = 2*cosfn(n,1);
-
-    result.Fp = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-    s1 = 3.0f-2.0f*cos(2.0f*M_PI/float(n))-cos(2.0f*M_PI/float(nm));
-    result.Fm = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-#endif
-}
-
-#endif  // OSD_PATCH_GREGORY || OSD_PATCH_GREGORY_BOUNDARY
-
-// ----------------------------------------------------------------------------
-// Legacy Face-varying
-// ----------------------------------------------------------------------------
-uniform samplerBuffer OsdFVarDataBuffer;
-
-#ifndef OSD_FVAR_WIDTH
-#define OSD_FVAR_WIDTH 0
-#endif
-
-// ------ extract from quads (catmark, bilinear) ---------
-// XXX: only linear interpolation is supported
-
-#define OSD_COMPUTE_FACE_VARYING_1(result, fvarOffset, tessCoord)       \
-    {                                                                   \
-        float v[4];                                                     \
-        int primOffset = OsdGetPatchIndex(gl_PrimitiveID) * 4;          \
-        for (int i = 0; i < 4; ++i) {                                   \
-            int index = (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset;     \
-            v[i] = texelFetch(OsdFVarDataBuffer, index).s               \
-        }                                                               \
-        result = mix(mix(v[0], v[1], tessCoord.s),                      \
-                     mix(v[3], v[2], tessCoord.s),                      \
-                     tessCoord.t);                                      \
-    }
-
-#define OSD_COMPUTE_FACE_VARYING_2(result, fvarOffset, tessCoord)       \
-    {                                                                   \
-        vec2 v[4];                                                      \
-        int primOffset = OsdGetPatchIndex(gl_PrimitiveID) * 4;          \
-        for (int i = 0; i < 4; ++i) {                                   \
-            int index = (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset;     \
-            v[i] = vec2(texelFetch(OsdFVarDataBuffer, index).s,         \
-                        texelFetch(OsdFVarDataBuffer, index + 1).s);    \
-        }                                                               \
-        result = mix(mix(v[0], v[1], tessCoord.s),                      \
-                     mix(v[3], v[2], tessCoord.s),                      \
-                     tessCoord.t);                                      \
-    }
-
-#define OSD_COMPUTE_FACE_VARYING_3(result, fvarOffset, tessCoord)       \
-    {                                                                   \
-        vec3 v[4];                                                      \
-        int primOffset = OsdGetPatchIndex(gl_PrimitiveID) * 4;          \
-        for (int i = 0; i < 4; ++i) {                                   \
-            int index = (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset;     \
-            v[i] = vec3(texelFetch(OsdFVarDataBuffer, index).s,         \
-                        texelFetch(OsdFVarDataBuffer, index + 1).s,     \
-                        texelFetch(OsdFVarDataBuffer, index + 2).s);    \
-        }                                                               \
-        result = mix(mix(v[0], v[1], tessCoord.s),                      \
-                     mix(v[3], v[2], tessCoord.s),                      \
-                     tessCoord.t);                                      \
-    }
-
-#define OSD_COMPUTE_FACE_VARYING_4(result, fvarOffset, tessCoord)       \
-    {                                                                   \
-        vec4 v[4];                                                      \
-        int primOffset = OsdGetPatchIndex(gl_PrimitiveID) * 4;          \
-        for (int i = 0; i < 4; ++i) {                                   \
-            int index = (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset;     \
-            v[i] = vec4(texelFetch(OsdFVarDataBuffer, index).s,         \
-                        texelFetch(OsdFVarDataBuffer, index + 1).s,     \
-                        texelFetch(OsdFVarDataBuffer, index + 2).s,     \
-                        texelFetch(OsdFVarDataBuffer, index + 3).s);    \
-        }                                                               \
-        result = mix(mix(v[0], v[1], tessCoord.s),                      \
-                     mix(v[3], v[2], tessCoord.s),                      \
-                     tessCoord.t);                                      \
-    }
-
-// ------ extract from triangles barycentric (loop) ---------
-// XXX: no interpolation supported
-
-#define OSD_COMPUTE_FACE_VARYING_TRI_1(result, fvarOffset, triVert)     \
-    {                                                                   \
-        int primOffset = OsdGetPatchIndex(gl_PrimitiveID) * 3;          \
-        int index = (primOffset+triVert)*OSD_FVAR_WIDTH + fvarOffset;   \
-        result = texelFetch(OsdFVarDataBuffer, index).s;                \
-    }
-
-#define OSD_COMPUTE_FACE_VARYING_TRI_2(result, fvarOffset, triVert)     \
-    {                                                                   \
-        int primOffset = OsdGetPatchIndex(gl_PrimitiveID) * 3;          \
-        int index = (primOffset+triVert)*OSD_FVAR_WIDTH + fvarOffset;   \
-        result = vec2(texelFetch(OsdFVarDataBuffer, index).s,           \
-                      texelFetch(OsdFVarDataBuffer, index + 1).s);      \
-    }
-
-#define OSD_COMPUTE_FACE_VARYING_TRI_3(result, fvarOffset, triVert)     \
-    {                                                                   \
-        int primOffset = OsdGetPatchIndex(gl_PrimitiveID) * 3;          \
-        int index = (primOffset+triVert)*OSD_FVAR_WIDTH + fvarOffset;   \
-        result = vec3(texelFetch(OsdFVarDataBuffer, index).s,           \
-                      texelFetch(OsdFVarDataBuffer, index + 1).s,       \
-                      texelFetch(OsdFVarDataBuffer, index + 2).s);      \
-    }
-
-#define OSD_COMPUTE_FACE_VARYING_TRI_4(result, fvarOffset, triVert)     \
-    {                                                                   \
-        int primOffset = OsdGetPatchIndex(gl_PrimitiveID) * 3;          \
-        int index = (primOffset+triVert)*OSD_FVAR_WIDTH + fvarOffset;   \
-        result = vec4(texelFetch(OsdFVarDataBuffer, index).s,           \
-                      texelFetch(OsdFVarDataBuffer, index + 1).s,       \
-                      texelFetch(OsdFVarDataBuffer, index + 2).s,       \
-                      texelFetch(OsdFVarDataBuffer, index + 3).s);      \
-    }
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchShaderSource.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchShaderSource.cpp
deleted file mode 100644
index 81a78041f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchShaderSource.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/glslPatchShaderSource.h"
-#include <sstream>
-#include <string>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-static const char *commonShaderSource =
-#include "glslPatchCommon.gen.h"
-;
-static const char *commonTessShaderSource =
-#include "glslPatchCommonTess.gen.h"
-;
-static const char *patchLegacyShaderSource =
-#include "glslPatchLegacy.gen.h"
-;
-static const char *patchBasisTypesShaderSource =
-#include "patchBasisCommonTypes.gen.h"
-;
-static const char *patchBasisShaderSource =
-#include "patchBasisCommon.gen.h"
-;
-static const char *patchBasisEvalShaderSource =
-#include "patchBasisCommonEval.gen.h"
-;
-static const char *boxSplineTriangleShaderSource =
-#include "glslPatchBoxSplineTriangle.gen.h"
-;
-static const char *bsplineShaderSource =
-#include "glslPatchBSpline.gen.h"
-;
-static const char *gregoryShaderSource =
-#include "glslPatchGregory.gen.h"
-;
-static const char *gregoryBasisShaderSource =
-#include "glslPatchGregoryBasis.gen.h"
-;
-static const char *gregoryTriangleShaderSource =
-#include "glslPatchGregoryTriangle.gen.h"
-;
-
-/*static*/
-std::string
-GLSLPatchShaderSource::GetCommonShaderSource() {
-    std::stringstream ss;
-    ss << std::string(commonShaderSource);
-    ss << std::string(commonTessShaderSource);
-    ss << std::string(patchLegacyShaderSource);
-    return ss.str();
-}
-
-/*static*/
-std::string
-GLSLPatchShaderSource::GetPatchBasisShaderSource() {
-    std::stringstream ss;
-#if defined(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES)
-    ss << "#define OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES\n";
-#endif
-    ss << std::string(patchBasisTypesShaderSource);
-    ss << std::string(patchBasisShaderSource);
-    ss << std::string(patchBasisEvalShaderSource);
-    return ss.str();
-}
-
-/*static*/
-std::string
-GLSLPatchShaderSource::GetVertexShaderSource(Far::PatchDescriptor::Type type) {
-    std::stringstream ss;
-    switch (type) {
-    case Far::PatchDescriptor::REGULAR:
-        ss << "#define OSD_PATCH_BSPLINE\n"
-           << "#define OSD_PATCH_VERTEX_BSPLINE_SHADER\n"
-           << bsplineShaderSource;
-        break;
-    case Far::PatchDescriptor::LOOP:
-        ss << "#define OSD_PATCH_BOX_SPLINE_TRIANGLE\n"
-           << "#define OSD_PATCH_VERTEX_BOX_SPLINE_TRIANGLE_SHADER\n"
-           << boxSplineTriangleShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY:
-        ss << "#define OSD_PATCH_GREGORY\n"
-           << "#define OSD_PATCH_VERTEX_GREGORY_SHADER\n"
-           << gregoryShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY_BOUNDARY:
-        ss << "#define OSD_PATCH_GREGORY_BOUNDARY\n"
-           << "#define OSD_PATCH_VERTEX_GREGORY_SHADER\n"
-           << gregoryShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY_BASIS:
-        ss << "#define OSD_PATCH_GREGORY_BASIS\n"
-           << "#define OSD_PATCH_VERTEX_GREGORY_BASIS_SHADER\n"
-           << gregoryBasisShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY_TRIANGLE:
-        ss << "#define OSD_PATCH_GREGORY_TRIANGLE\n"
-           << "#define OSD_PATCH_VERTEX_GREGORY_TRIANGLE_SHADER\n"
-           << gregoryTriangleShaderSource;
-        break;
-    default:
-        break;  // returns empty (points, lines, quads, ...)
-    }
-    return ss.str();
-}
-
-/*static*/
-std::string
-GLSLPatchShaderSource::GetTessControlShaderSource(
-    Far::PatchDescriptor::Type type) {
-    std::stringstream ss;
-    switch (type) {
-    case Far::PatchDescriptor::REGULAR:
-        ss << "#define OSD_PATCH_BSPLINE\n"
-           << "#define OSD_PATCH_TESS_CONTROL_BSPLINE_SHADER\n"
-           << bsplineShaderSource;
-        break;
-    case Far::PatchDescriptor::LOOP:
-        ss << "#define OSD_PATCH_BOX_SPLINE_TRIANGLE\n"
-           << "#define OSD_PATCH_TESS_CONTROL_BOX_SPLINE_TRIANGLE_SHADER\n"
-           << boxSplineTriangleShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY:
-        ss << "#define OSD_PATCH_GREGORY\n"
-           << "#define OSD_PATCH_TESS_CONTROL_GREGORY_SHADER\n"
-           << gregoryShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY_BOUNDARY:
-        ss << "#define OSD_PATCH_GREGORY_BOUNDARY\n"
-           << "#define OSD_PATCH_TESS_CONTROL_GREGORY_SHADER\n"
-           << gregoryShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY_BASIS:
-        ss << "#define OSD_PATCH_GREGORY_BASIS\n"
-           << "#define OSD_PATCH_TESS_CONTROL_GREGORY_BASIS_SHADER\n"
-           << gregoryBasisShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY_TRIANGLE:
-        ss << "#define OSD_PATCH_GREGORY_TRIANGLE\n"
-           << "#define OSD_PATCH_TESS_CONTROL_GREGORY_TRIANGLE_SHADER\n"
-           << gregoryTriangleShaderSource;
-        break;
-    default:
-        break;  // returns empty (points, lines, quads, ...)
-    }
-    return ss.str();
-}
-
-/*static*/
-std::string
-GLSLPatchShaderSource::GetTessEvalShaderSource(
-    Far::PatchDescriptor::Type type) {
-    std::stringstream ss;
-    switch (type) {
-    case Far::PatchDescriptor::REGULAR:
-        ss << "#define OSD_PATCH_BSPLINE\n"
-           << "#define OSD_PATCH_TESS_EVAL_BSPLINE_SHADER\n"
-           << bsplineShaderSource;
-        break;
-    case Far::PatchDescriptor::LOOP:
-        ss << "#define OSD_PATCH_BOX_SPLINE_TRIANGLE\n"
-           << "#define OSD_PATCH_TESS_EVAL_BOX_SPLINE_TRIANGLE_SHADER\n"
-           << boxSplineTriangleShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY:
-        ss << "#define OSD_PATCH_GREGORY\n"
-           << "#define OSD_PATCH_TESS_EVAL_GREGORY_SHADER\n"
-           << gregoryShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY_BOUNDARY:
-        ss << "#define OSD_PATCH_GREGORY_BOUNDARY\n"
-           << "#define OSD_PATCH_TESS_EVAL_GREGORY_SHADER\n"
-           << gregoryShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY_BASIS:
-        ss << "#define OSD_PATCH_GREGORY_BASIS\n"
-           << "#define OSD_PATCH_TESS_EVAL_GREGORY_BASIS_SHADER\n"
-           << gregoryBasisShaderSource;
-        break;
-    case Far::PatchDescriptor::GREGORY_TRIANGLE:
-        ss << "#define OSD_PATCH_GREGORY_TRIANGLE\n"
-           << "#define OSD_PATCH_TESS_EVAL_GREGORY_TRIANGLE_SHADER\n"
-           << gregoryTriangleShaderSource;
-        break;
-    default:
-        break;  // returns empty (points, lines, quads, ...)
-    }
-    return ss.str();
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchShaderSource.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchShaderSource.h
deleted file mode 100644
index 579a41ff3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslPatchShaderSource.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_GLSL_PATCH_SHADER_SOURCE_H
-#define OPENSUBDIV3_OSD_GLSL_PATCH_SHADER_SOURCE_H
-
-#include "../version.h"
-#include <string>
-#include "../far/patchDescriptor.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class GLSLPatchShaderSource {
-public:
-    static std::string GetCommonShaderSource();
-
-    static std::string GetPatchBasisShaderSource();
-
-    static std::string GetVertexShaderSource(
-        Far::PatchDescriptor::Type type);
-
-    static std::string GetTessControlShaderSource(
-        Far::PatchDescriptor::Type type);
-
-    static std::string GetTessEvalShaderSource(
-        Far::PatchDescriptor::Type type);
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_GLSL_PATCH_SHADER_SOURCE
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslXFBKernel.glsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslXFBKernel.glsl
deleted file mode 100644
index bf709b7c2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/glslXFBKernel.glsl
+++ /dev/null
@@ -1,294 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//------------------------------------------------------------------------------
-
-uniform samplerBuffer vertexBuffer;
-uniform int srcOffset = 0;
-out float outVertexBuffer[LENGTH];
-
-//------------------------------------------------------------------------------
-
-struct Vertex {
-    float vertexData[LENGTH];
-};
-
-void clear(out Vertex v) {
-    for (int i = 0; i < LENGTH; i++) {
-        v.vertexData[i] = 0;
-    }
-}
-
-void addWithWeight(inout Vertex v, Vertex src, float weight) {
-    for(int j = 0; j < LENGTH; j++) {
-        v.vertexData[j] += weight * src.vertexData[j];
-    }
-}
-
-Vertex readVertex(int index) {
-    Vertex v;
-    int vertexIndex = srcOffset + index * SRC_STRIDE;
-    for(int j = 0; j < LENGTH; j++) {
-        v.vertexData[j] = texelFetch(vertexBuffer, vertexIndex+j).x;
-    }
-    return v;
-}
-
-void writeVertex(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outVertexBuffer[i] = v.vertexData[i];
-    }
-}
-
-//------------------------------------------------------------------------------
-
-#if defined(OPENSUBDIV_GLSL_XFB_USE_1ST_DERIVATIVES) && \
-    defined(OPENSUBDIV_GLSL_XFB_INTERLEAVED_1ST_DERIVATIVE_BUFFERS)
-out float outDeriv1Buffer[2*LENGTH];
-
-void writeDu(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDeriv1Buffer[i] = v.vertexData[i];
-    }
-}
-
-void writeDv(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDeriv1Buffer[i+LENGTH] = v.vertexData[i];
-    }
-}
-#elif defined(OPENSUBDIV_GLSL_XFB_USE_1ST_DERIVATIVES)
-out float outDuBuffer[LENGTH];
-out float outDvBuffer[LENGTH];
-
-void writeDu(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDuBuffer[i] = v.vertexData[i];
-    }
-}
-
-void writeDv(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDvBuffer[i] = v.vertexData[i];
-    }
-}
-#endif
-
-#if defined(OPENSUBDIV_GLSL_XFB_USE_2ND_DERIVATIVES) && \
-    defined(OPENSUBDIV_GLSL_XFB_INTERLEAVED_2ND_DERIVATIVE_BUFFERS)
-out float outDeriv2Buffer[3*LENGTH];
-
-void writeDuu(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDeriv2Buffer[i] = v.vertexData[i];
-    }
-}
-
-void writeDuv(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDeriv2Buffer[i+LENGTH] = v.vertexData[i];
-    }
-}
-
-void writeDvv(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDeriv2Buffer[i+2*LENGTH] = v.vertexData[i];
-    }
-}
-#elif defined(OPENSUBDIV_GLSL_XFB_USE_2ND_DERIVATIVES)
-out float outDuuBuffer[LENGTH];
-out float outDuvBuffer[LENGTH];
-out float outDvvBuffer[LENGTH];
-
-void writeDuu(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDuuBuffer[i] = v.vertexData[i];
-    }
-}
-
-void writeDuv(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDuvBuffer[i] = v.vertexData[i];
-    }
-}
-
-void writeDvv(Vertex v) {
-    for(int i = 0; i < LENGTH; i++) {
-        outDvvBuffer[i] = v.vertexData[i];
-    }
-}
-#endif
-
-//------------------------------------------------------------------------------
-
-#if defined(OPENSUBDIV_GLSL_XFB_KERNEL_EVAL_STENCILS)
-
-uniform usamplerBuffer sizes;
-uniform isamplerBuffer offsets;
-uniform isamplerBuffer indices;
-uniform samplerBuffer  weights;
-
-#if defined(OPENSUBDIV_GLSL_XFB_USE_1ST_DERIVATIVES)
-uniform samplerBuffer  duWeights;
-uniform samplerBuffer  dvWeights;
-#endif
-
-#if defined(OPENSUBDIV_GLSL_XFB_USE_2ND_DERIVATIVES)
-uniform samplerBuffer  duuWeights;
-uniform samplerBuffer  duvWeights;
-uniform samplerBuffer  dvvWeights;
-#endif
-
-uniform int batchStart = 0;
-uniform int batchEnd = 0;
-
-void main() {
-    int current = gl_VertexID + batchStart;
-
-    if (current>=batchEnd) {
-        return;
-    }
-
-    Vertex dst, du, dv, duu, duv, dvv;
-    clear(dst);
-    clear(du);
-    clear(dv);
-    clear(duu);
-    clear(duv);
-    clear(dvv);
-
-    int offset = texelFetch(offsets, current).x;
-    uint size = texelFetch(sizes, current).x;
-
-    for (int stencil=0; stencil<size; ++stencil) {
-        int index = texelFetch(indices, offset+stencil).x;
-        float weight = texelFetch(weights, offset+stencil).x;
-        addWithWeight(dst, readVertex( index ), weight);
-
-#if defined(OPENSUBDIV_GLSL_XFB_USE_1ST_DERIVATIVES)
-        float duWeight = texelFetch(duWeights, offset+stencil).x;
-        float dvWeight = texelFetch(dvWeights, offset+stencil).x;
-        addWithWeight(du,  readVertex(index), duWeight);
-        addWithWeight(dv,  readVertex(index), dvWeight);
-#endif
-#if defined(OPENSUBDIV_GLSL_XFB_USE_2ND_DERIVATIVES)
-        float duuWeight = texelFetch(duuWeights, offset+stencil).x;
-        float duvWeight = texelFetch(duvWeights, offset+stencil).x;
-        float dvvWeight = texelFetch(dvvWeights, offset+stencil).x;
-        addWithWeight(duu,  readVertex(index), duuWeight);
-        addWithWeight(duv,  readVertex(index), duvWeight);
-        addWithWeight(dvv,  readVertex(index), dvvWeight);
-#endif
-    }
-    writeVertex(dst);
-
-#if defined(OPENSUBDIV_GLSL_XFB_USE_1ST_DERIVATIVES)
-    writeDu(du);
-    writeDv(dv);
-#endif
-#if defined(OPENSUBDIV_GLSL_XFB_USE_2ND_DERIVATIVES)
-    writeDuu(duu);
-    writeDuv(duv);
-    writeDvv(dvv);
-#endif
-}
-
-#endif
-
-//------------------------------------------------------------------------------
-
-#if defined(OPENSUBDIV_GLSL_XFB_KERNEL_EVAL_PATCHES)
-
-layout (location = 0) in ivec3 patchHandles;
-layout (location = 1) in vec2  patchCoords;
-
-layout (std140) uniform PatchArrays {
-    OsdPatchArray patchArrays[2];
-};
-uniform isamplerBuffer patchParamBuffer;
-uniform isamplerBuffer patchIndexBuffer;
-
-OsdPatchArray GetPatchArray(int arrayIndex) {
-    return patchArrays[arrayIndex];
-}
-
-OsdPatchParam GetPatchParam(int patchIndex) {
-    ivec3 patchParamBits = texelFetch(patchParamBuffer, patchIndex).xyz;
-    return OsdPatchParamInit(patchParamBits.x, patchParamBits.y, patchParamBits.z);
-}
-
-void main() {
-    int current = gl_VertexID;
-
-    ivec3 handle = patchHandles;
-    int arrayIndex = handle.x;
-    int patchIndex = handle.y;
-
-    vec2 coord = patchCoords;
-
-    OsdPatchArray array = GetPatchArray(arrayIndex);
-    OsdPatchParam param = GetPatchParam(patchIndex);
-
-    int patchType = OsdPatchParamIsRegular(param) ? array.regDesc : array.desc;
-
-    float wP[20], wDu[20], wDv[20], wDuu[20], wDuv[20], wDvv[20];
-    int nPoints = OsdEvaluatePatchBasis(patchType, param,
-        coord.x, coord.y, wP, wDu, wDv, wDuu, wDuv, wDvv);
-
-    Vertex dst, du, dv, duu, duv, dvv;
-    clear(dst);
-    clear(du);
-    clear(dv);
-    clear(duu);
-    clear(duv);
-    clear(dvv);
-
-    int indexBase = array.indexBase + array.stride *
-                (patchIndex - array.primitiveIdBase);
-
-    for (int cv = 0; cv < nPoints; ++cv) {
-        int index = texelFetch(patchIndexBuffer, indexBase + cv).x;
-        addWithWeight(dst, readVertex(index), wP[cv]);
-        addWithWeight(du,  readVertex(index), wDu[cv]);
-        addWithWeight(dv,  readVertex(index), wDv[cv]);
-        addWithWeight(duu, readVertex(index), wDuu[cv]);
-        addWithWeight(duv, readVertex(index), wDuv[cv]);
-        addWithWeight(dvv, readVertex(index), wDvv[cv]);
-    }
-
-    writeVertex(dst);
-
-#if defined(OPENSUBDIV_GLSL_XFB_USE_1ST_DERIVATIVES)
-    writeDu(du);
-    writeDv(dv);
-#endif
-#if defined(OPENSUBDIV_GLSL_XFB_USE_2ND_DERIVATIVES)
-    writeDuu(duu);
-    writeDuv(duv);
-    writeDvv(dvv);
-#endif
-}
-
-#endif
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslComputeKernel.hlsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslComputeKernel.hlsl
deleted file mode 100644
index 2e02bad03..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslComputeKernel.hlsl
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-cbuffer KernelUniformArgs : register( b0 ) {
-    int batchStart;
-    int batchEnd;
-    int srcOffset;
-    int dstOffset;
-};
-
-RWBuffer<float> vertexBuffer  : register( u0 );
-RWBuffer<float> dstVertexBuffer  : register( u1 );
-Buffer<int>    sizes   : register( t1 );
-Buffer<int>    offsets : register( t2 );
-Buffer<int>    indices : register( t3 );
-Buffer<float>  weights : register( t4 );
-
-//----------------------------------------------------------------------------
-
-struct Vertex {
-    float vertexData[LENGTH];
-};
-
-void clear(out Vertex v) {
-    for (int i = 0; i < LENGTH; ++i) {
-        v.vertexData[i] = 0;
-    }
-}
-
-Vertex readVertex(int index) {
-    Vertex v;
-    int vertexIndex = srcOffset + index * SRC_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        v.vertexData[i] = vertexBuffer[vertexIndex + i];
-    }
-    return v;
-}
-
-void writeVertex(int index, Vertex v) {
-    int vertexIndex = dstOffset + index * DST_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        vertexBuffer[vertexIndex + i] = v.vertexData[i];
-    }
-}
-
-void writeVertexSeparate(int index, Vertex v) {
-    int vertexIndex = dstOffset + index * DST_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        dstVertexBuffer[vertexIndex + i] = v.vertexData[i];
-    }
-}
-
-void addWithWeight(inout Vertex v, const Vertex src, float weight) {
-    for (int i = 0; i < LENGTH; ++i) {
-        v.vertexData[i] += weight * src.vertexData[i];
-    }
-}
-
-// ---------------------------------------------------------------------------
-
-interface IComputeKernel {
-    void runKernel( uint3 ID );
-};
-IComputeKernel kernel;
-
-class SingleBufferCompute : IComputeKernel {
-
-    int placeholder;
-    void runKernel(uint3 ID) {
-        int current = int(ID.x) + batchStart;
-
-        if (current>=batchEnd) {
-            return;
-        }
-
-        Vertex dst;
-        clear(dst);
-
-        int offset = offsets[current],
-            size = sizes[current];
-
-        for (int i=0; i<size; ++i) {
-            addWithWeight(dst, readVertex( indices[offset+i] ), weights[offset+i]);
-        }
-
-        writeVertex(current, dst);
-    }
-};
-class SeparateBufferCompute : IComputeKernel {
-
-    int placeholder;
-    void runKernel(uint3 ID) {
-        int current = int(ID.x) + batchStart;
-
-        if (current>=batchEnd) {
-            return;
-        }
-
-        Vertex dst;
-        clear(dst);
-
-        int offset = offsets[current],
-            size = sizes[current];
-
-        for (int i=0; i<size; ++i) {
-            addWithWeight(dst, readVertex( indices[offset+i] ), weights[offset+i]);
-        }
-
-        writeVertexSeparate(current, dst);
-    }
-};
-
-SingleBufferCompute singleBufferCompute;
-SeparateBufferCompute separateBufferCompute;
-
-// Add place-holder stencil kernel or D3D11ShaderReflection::GetInterfaceSlots()
-// returns 0
-class PlaceHolder : IComputeKernel {
-    int placeholder;
-    void runKernel( uint3 ID ) {
-    }
-};
-
-[numthreads(WORK_GROUP_SIZE, 1, 1)]
-void cs_main( uint3 ID : SV_DispatchThreadID )
-{
-    // call kernel
-    kernel.runKernel(ID);
-}
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchBSpline.hlsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchBSpline.hlsl
deleted file mode 100644
index 9aa1159c7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchBSpline.hlsl
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexBSpline
-//----------------------------------------------------------
-
-void vs_main_patches( in InputVertex input,
-                      out HullVertex output )
-{
-    output.position = input.position;
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(input.position);
-}
-
-//----------------------------------------------------------
-// Patches.HullBSpline
-//----------------------------------------------------------
-
-[domain("quad")]
-[partitioning(OSD_PARTITIONING)]
-[outputtopology("triangle_cw")]
-[outputcontrolpoints(16)]
-[patchconstantfunc("HSConstFunc")]
-OsdPerPatchVertexBezier hs_main_patches(
-    in InputPatch<HullVertex, 16> patch,
-    uint primitiveID : SV_PrimitiveID,
-    in uint ID : SV_OutputControlPointID )
-{
-    OsdPerPatchVertexBezier output;
-
-    float3 cv[16];
-    for (int i=0; i<16; ++i) {
-        cv[i] = patch[i].position.xyz;
-    }
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-    OsdComputePerPatchVertexBSpline(patchParam, ID, cv, output);
-
-    return output;
-}
-
-HS_CONSTANT_FUNC_OUT
-HSConstFunc(
-    InputPatch<HullVertex, 16> patch,
-    OutputPatch<OsdPerPatchVertexBezier, 16> bezierPatch,
-    uint primitiveID : SV_PrimitiveID)
-{
-    HS_CONSTANT_FUNC_OUT output;
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-
-    float4 tessLevelOuter = float4(0,0,0,0);
-    float2 tessLevelInner = float2(0,0);
-    float4 tessOuterLo = float4(0,0,0,0);
-    float4 tessOuterHi = float4(0,0,0,0);
-
-    OSD_PATCH_CULL(16);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Gather bezier control points to compute limit surface tess levels
-    OsdPerPatchVertexBezier cpBezier[16];
-    for (int i=0; i<16; ++i) {
-        cpBezier[i] = bezierPatch[i];
-        cpBezier[i].P += 0.0f;
-    }
-    OsdEvalPatchBezierTessLevels(cpBezier, patchParam,
-                     tessLevelOuter, tessLevelInner,
-                     tessOuterLo, tessOuterHi);
-#else
-    OsdGetTessLevelsUniform(patchParam, tessLevelOuter, tessLevelInner,
-                     tessOuterLo, tessOuterHi);
-#endif
-
-    output.tessLevelOuter[0] = tessLevelOuter[0];
-    output.tessLevelOuter[1] = tessLevelOuter[1];
-    output.tessLevelOuter[2] = tessLevelOuter[2];
-    output.tessLevelOuter[3] = tessLevelOuter[3];
-
-    output.tessLevelInner[0] = tessLevelInner[0];
-    output.tessLevelInner[1] = tessLevelInner[1];
-
-    output.tessOuterLo = tessOuterLo;
-    output.tessOuterHi = tessOuterHi;
-
-    return output;
-}
-
-//----------------------------------------------------------
-// Patches.DomainBSpline
-//----------------------------------------------------------
-
-[domain("quad")]
-void ds_main_patches(
-    in HS_CONSTANT_FUNC_OUT input,
-    in OutputPatch<OsdPerPatchVertexBezier, 16> patch,
-    in float2 domainCoord : SV_DomainLocation,
-    out OutputVertex output )
-{
-    float3 P = float3(0,0,0), dPu = float3(0,0,0), dPv = float3(0,0,0);
-    float3 N = float3(0,0,0), dNu = float3(0,0,0), dNv = float3(0,0,0);
-
-    OsdPerPatchVertexBezier cv[16];
-    for (int i=0; i<16; ++i) {
-        cv[i] = patch[i];
-    }
-
-    float2 UV = OsdGetTessParameterization(domainCoord,
-                                           input.tessOuterLo,
-                                           input.tessOuterHi);
-
-    int3 patchParam = patch[0].patchParam;
-    OsdEvalPatchBezier(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    output.position = mul(OsdModelViewMatrix(), float4(P, 1.0f));
-    output.normal = mul(OsdModelViewMatrix(), float4(N, 0.0f)).xyz;
-    output.tangent = mul(OsdModelViewMatrix(), float4(dPu, 0.0f)).xyz;
-    output.bitangent = mul(OsdModelViewMatrix(), float4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-#ifdef OSD_PATCH_ENABLE_SINGLE_CREASE
-    output.vSegments = cv[0].vSegments;
-#endif
-
-    output.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    output.positionOut = mul(OsdProjectionMatrix(), output.position);
-    output.edgeDistance = 0;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchBoxSplineTriangle.hlsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchBoxSplineTriangle.hlsl
deleted file mode 100644
index 76f407504..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchBoxSplineTriangle.hlsl
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-//   Copyright 2019 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexBoxSplineTriangle
-//----------------------------------------------------------
-
-void vs_main_patches( in InputVertex input,
-                      out HullVertex output )
-{
-    output.position = input.position;
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(input.position);
-}
-
-//----------------------------------------------------------
-// Patches.HullBoxSplineTriangle
-//----------------------------------------------------------
-
-[domain("tri")]
-[partitioning(OSD_PARTITIONING)]
-[outputtopology("triangle_cw")]
-[outputcontrolpoints(15)]
-[patchconstantfunc("HSConstFunc")]
-OsdPerPatchVertexBezier hs_main_patches(
-    in InputPatch<HullVertex, 12> patch,
-    uint primitiveID : SV_PrimitiveID,
-    in uint ID : SV_OutputControlPointID )
-{
-    OsdPerPatchVertexBezier output;
-
-    float3 cv[12];
-    for (int i=0; i<12; ++i) {
-        cv[i] = patch[i].position.xyz;
-    }
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-    OsdComputePerPatchVertexBoxSplineTriangle(patchParam, ID, cv, output);
-
-    return output;
-}
-
-HS_CONSTANT_FUNC_TRIANGLE_OUT
-HSConstFunc(
-    InputPatch<HullVertex, 12> patch,
-    OutputPatch<OsdPerPatchVertexBezier, 15> bezierTrianglePatch,
-    uint primitiveID : SV_PrimitiveID)
-{
-    HS_CONSTANT_FUNC_TRIANGLE_OUT output;
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-
-    float4 tessLevelOuter = float4(0,0,0,0);
-    float2 tessLevelInner = float2(0,0);
-    float4 tessOuterLo = float4(0,0,0,0);
-    float4 tessOuterHi = float4(0,0,0,0);
-
-    OSD_PATCH_CULL_TRIANGLE(12);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    float3 bezcv[15];
-    for (int i=0; i<15; ++i) {
-        bezcv[i] = bezierTrianglePatch[i].P;
-    }
-    OsdEvalPatchBezierTriangleTessLevels(bezcv, patchParam,
-                     tessLevelOuter, tessLevelInner,
-                     tessOuterLo, tessOuterHi);
-#else
-    OsdGetTessLevelsUniformTriangle(patchParam, tessLevelOuter, tessLevelInner,
-                     tessOuterLo, tessOuterHi);
-#endif
-
-    output.tessLevelOuter[0] = tessLevelOuter[0];
-    output.tessLevelOuter[1] = tessLevelOuter[1];
-    output.tessLevelOuter[2] = tessLevelOuter[2];
-
-    output.tessLevelInner[0] = tessLevelInner[0];
-
-    output.tessOuterLo = tessOuterLo;
-    output.tessOuterHi = tessOuterHi;
-
-    return output;
-}
-
-//----------------------------------------------------------
-// Patches.DomainBoxSplineTriangle
-//----------------------------------------------------------
-
-[domain("tri")]
-void ds_main_patches(
-    in HS_CONSTANT_FUNC_TRIANGLE_OUT input,
-    in OutputPatch<OsdPerPatchVertexBezier, 15> patch,
-    in float3 domainCoord : SV_DomainLocation,
-    out OutputVertex output )
-{
-    float3 P = float3(0,0,0), dPu = float3(0,0,0), dPv = float3(0,0,0);
-    float3 N = float3(0,0,0), dNu = float3(0,0,0), dNv = float3(0,0,0);
-
-    OsdPerPatchVertexBezier cv[15];
-    for (int i=0; i<15; ++i) {
-        cv[i] = patch[i];
-    }
-
-    float2 UV = OsdGetTessParameterizationTriangle(domainCoord,
-                                                   input.tessOuterLo,
-                                                   input.tessOuterHi);
-
-    int3 patchParam = patch[0].patchParam;
-    OsdEvalPatchBezierTriangle(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    output.position = mul(OsdModelViewMatrix(), float4(P, 1.0f));
-    output.normal = mul(OsdModelViewMatrix(), float4(N, 0.0f)).xyz;
-    output.tangent = mul(OsdModelViewMatrix(), float4(dPu, 0.0f)).xyz;
-    output.bitangent = mul(OsdModelViewMatrix(), float4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-
-    output.patchCoord = OsdInterpolatePatchCoordTriangle(UV, patchParam);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    output.positionOut = mul(OsdProjectionMatrix(), output.position);
-    output.edgeDistance = 0;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchCommon.hlsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchCommon.hlsl
deleted file mode 100644
index a824477bb..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchCommon.hlsl
+++ /dev/null
@@ -1,1244 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.Common
-//----------------------------------------------------------
-
-struct InputVertex {
-    float4 position : POSITION;
-    float3 normal : NORMAL;
-};
-
-struct HullVertex {
-    float4 position : POSITION;
-#ifdef OSD_ENABLE_PATCH_CULL
-    int3 clipFlag : CLIPFLAG;
-#endif
-};
-
-// XXXdyu all downstream data can be handled by client code
-struct OutputVertex {
-    float4 positionOut : SV_Position;
-    float4 position : POSITION1;
-    float3 normal : NORMAL;
-    float3 tangent : TANGENT;
-    float3 bitangent : TANGENT1;
-    float4 patchCoord : PATCHCOORD; // u, v, faceLevel, faceId
-    noperspective float4 edgeDistance : EDGEDISTANCE;
-#if defined(OSD_COMPUTE_NORMAL_DERIVATIVES)
-    float3 Nu : TANGENT2;
-    float3 Nv : TANGENT3;
-#endif
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    float2 vSegments : VSEGMENTS;
-#endif
-};
-
-// osd shaders need following functions defined
-float4x4 OsdModelViewMatrix();
-float4x4 OsdProjectionMatrix();
-float4x4 OsdModelViewProjectionMatrix();
-float OsdTessLevel();
-int OsdGregoryQuadOffsetBase();
-int OsdPrimitiveIdBase();
-int OsdBaseVertex();
-
-#ifndef OSD_DISPLACEMENT_CALLBACK
-#define OSD_DISPLACEMENT_CALLBACK
-#endif
-
-// ----------------------------------------------------------------------------
-// Patch Parameters
-// ----------------------------------------------------------------------------
-
-//
-// Each patch has a corresponding patchParam. This is a set of three values
-// specifying additional information about the patch:
-//
-//    faceId    -- topological face identifier (e.g. Ptex FaceId)
-//    bitfield  -- refinement-level, non-quad, boundary, transition, uv-offset
-//    sharpness -- crease sharpness for single-crease patches
-//
-// These are stored in OsdPatchParamBuffer indexed by the value returned
-// from OsdGetPatchIndex() which is a function of the current PrimitiveID
-// along with an optional client provided offset.
-//
-
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    Buffer<uint3> OsdPatchParamBuffer : register( t0 );
-#else
-    Buffer<uint2> OsdPatchParamBuffer : register( t0 );
-#endif
-
-int OsdGetPatchIndex(int primitiveId)
-{
-    return (primitiveId + OsdPrimitiveIdBase());
-}
-
-int3 OsdGetPatchParam(int patchIndex)
-{
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    return OsdPatchParamBuffer[patchIndex].xyz;
-#else
-    uint2 p = OsdPatchParamBuffer[patchIndex].xy;
-    return int3(p.x, p.y, 0);
-#endif
-}
-
-int OsdGetPatchFaceId(int3 patchParam)
-{
-    return (patchParam.x & 0xfffffff);
-}
-
-int OsdGetPatchFaceLevel(int3 patchParam)
-{
-    return (1 << ((patchParam.y & 0xf) - ((patchParam.y >> 4) & 1)));
-}
-
-int OsdGetPatchRefinementLevel(int3 patchParam)
-{
-    return (patchParam.y & 0xf);
-}
-
-int OsdGetPatchBoundaryMask(int3 patchParam)
-{
-    return ((patchParam.y >> 7) & 0x1f);
-}
-
-int OsdGetPatchTransitionMask(int3 patchParam)
-{
-    return ((patchParam.x >> 28) & 0xf);
-}
-
-int2 OsdGetPatchFaceUV(int3 patchParam)
-{
-    int u = (patchParam.y >> 22) & 0x3ff;
-    int v = (patchParam.y >> 12) & 0x3ff;
-    return int2(u,v);
-}
-
-bool OsdGetPatchIsRegular(int3 patchParam)
-{
-    return ((patchParam.y >> 5) & 0x1) != 0;
-}
-
-bool OsdGetPatchIsTriangleRotated(int3 patchParam)
-{
-    int2 uv = OsdGetPatchFaceUV(patchParam);
-    return (uv.x + uv.y) >= OsdGetPatchFaceLevel(patchParam);
-}
-
-float OsdGetPatchSharpness(int3 patchParam)
-{
-    return asfloat(patchParam.z);
-}
-
-float OsdGetPatchSingleCreaseSegmentParameter(int3 patchParam, float2 uv)
-{
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-    float s = 0;
-    if ((boundaryMask & 1) != 0) {
-        s = 1 - uv.y;
-    } else if ((boundaryMask & 2) != 0) {
-        s = uv.x;
-    } else if ((boundaryMask & 4) != 0) {
-        s = uv.y;
-    } else if ((boundaryMask & 8) != 0) {
-        s = 1 - uv.x;
-    }
-    return s;
-}
-
-int4 OsdGetPatchCoord(int3 patchParam)
-{
-    int faceId = OsdGetPatchFaceId(patchParam);
-    int faceLevel = OsdGetPatchFaceLevel(patchParam);
-    int2 faceUV = OsdGetPatchFaceUV(patchParam);
-    return int4(faceUV.x, faceUV.y, faceLevel, faceId);
-}
-
-float4 OsdInterpolatePatchCoord(float2 localUV, int3 patchParam)
-{
-    int4 perPrimPatchCoord = OsdGetPatchCoord(patchParam);
-    int faceId = perPrimPatchCoord.w;
-    int faceLevel = perPrimPatchCoord.z;
-    float2 faceUV = float2(perPrimPatchCoord.x, perPrimPatchCoord.y);
-    float2 uv = localUV/faceLevel + faceUV/faceLevel;
-    // add 0.5 to integer values for more robust interpolation
-    return float4(uv.x, uv.y, faceLevel+0.5, faceId+0.5);
-}
-
-float4 OsdInterpolatePatchCoordTriangle(float2 localUV, int3 patchParam)
-{
-    float4 result = OsdInterpolatePatchCoord(localUV, patchParam);
-    if (OsdGetPatchIsTriangleRotated(patchParam)) {
-        result.xy = float2(1.0f, 1.0f) - result.xy;
-    }
-    return result;
-}
-
-// ----------------------------------------------------------------------------
-// patch culling
-// ----------------------------------------------------------------------------
-
-#ifdef OSD_ENABLE_PATCH_CULL
-
-#define OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(P)                     \
-    float4 clipPos = mul(OsdModelViewProjectionMatrix(), P);    \
-    int3 clip0 = int3(clipPos.x < clipPos.w,                    \
-                      clipPos.y < clipPos.w,                    \
-                      clipPos.z < clipPos.w);                   \
-    int3 clip1 = int3(clipPos.x > -clipPos.w,                   \
-                      clipPos.y > -clipPos.w,                   \
-                      clipPos.z > -clipPos.w);                  \
-    output.clipFlag = int3(clip0) + 2*int3(clip1);              \
-
-#define OSD_PATCH_CULL(N)                          \
-    int3 clipFlag = int3(0,0,0);                   \
-    for(int i = 0; i < N; ++i) {                   \
-        clipFlag |= patch[i].clipFlag;             \
-    }                                              \
-    if (any(clipFlag != int3(3,3,3))) {            \
-        output.tessLevelInner[0] = 0;              \
-        output.tessLevelInner[1] = 0;              \
-        output.tessLevelOuter[0] = 0;              \
-        output.tessLevelOuter[1] = 0;              \
-        output.tessLevelOuter[2] = 0;              \
-        output.tessLevelOuter[3] = 0;              \
-        output.tessOuterLo = float4(0,0,0,0);      \
-        output.tessOuterHi = float4(0,0,0,0);      \
-        return output;                             \
-    }
-
-#define OSD_PATCH_CULL_TRIANGLE(N)                          \
-    int3 clipFlag = int3(0,0,0);                   \
-    for(int i = 0; i < N; ++i) {                   \
-        clipFlag |= patch[i].clipFlag;             \
-    }                                              \
-    if (any(clipFlag != int3(3,3,3))) {            \
-        output.tessLevelInner[0] = 0;              \
-        output.tessLevelOuter[0] = 0;              \
-        output.tessLevelOuter[1] = 0;              \
-        output.tessLevelOuter[2] = 0;              \
-        output.tessOuterLo = float4(0,0,0,0);      \
-        output.tessOuterHi = float4(0,0,0,0);      \
-        return output;                             \
-    }
-
-#else
-#define OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(P)
-#define OSD_PATCH_CULL(N)
-#define OSD_PATCH_CULL_TRIANGLE(N)
-#endif
-
-// ----------------------------------------------------------------------------
-
-void
-OsdUnivar4x4(in float u, out float B[4], out float D[4])
-{
-    float t = u;
-    float s = 1.0f - u;
-
-    float A0 = s * s;
-    float A1 = 2 * s * t;
-    float A2 = t * t;
-
-    B[0] = s * A0;
-    B[1] = t * A0 + s * A1;
-    B[2] = t * A1 + s * A2;
-    B[3] = t * A2;
-
-    D[0] =    - A0;
-    D[1] = A0 - A1;
-    D[2] = A1 - A2;
-    D[3] = A2;
-}
-
-void
-OsdUnivar4x4(in float u, out float B[4], out float D[4], out float C[4])
-{
-    float t = u;
-    float s = 1.0f - u;
-
-    float A0 = s * s;
-    float A1 = 2 * s * t;
-    float A2 = t * t;
-
-    B[0] = s * A0;
-    B[1] = t * A0 + s * A1;
-    B[2] = t * A1 + s * A2;
-    B[3] = t * A2;
-
-    D[0] =    - A0;
-    D[1] = A0 - A1;
-    D[2] = A1 - A2;
-    D[3] = A2;
-
-    A0 =   - s;
-    A1 = s - t;
-    A2 = t;
-
-    C[0] =    - A0;
-    C[1] = A0 - A1;
-    C[2] = A1 - A2;
-    C[3] = A2;
-}
-
-// ----------------------------------------------------------------------------
-
-struct OsdPerPatchVertexBezier {
-    int3 patchParam : PATCHPARAM;
-    float3 P : POSITION;
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    float3 P1 : POSITION1;
-    float3 P2 : POSITION2;
-    float2 vSegments : VSEGMENTS;
-#endif
-};
-
-float3
-OsdEvalBezier(float3 cp[16], float2 uv)
-{
-    float3 BUCP[4] = {float3(0,0,0),float3(0,0,0),float3(0,0,0),float3(0,0,0)};
-
-    float B[4], D[4];
-
-    OsdUnivar4x4(uv.x, B, D);
-    for (int i=0; i<4; ++i) {
-        for (int j=0; j<4; ++j) {
-            float3 A = cp[4*i + j];
-            BUCP[i] += A * B[j];
-        }
-    }
-
-    float3 P = float3(0,0,0);
-
-    OsdUnivar4x4(uv.y, B, D);
-    for (int k=0; k<4; ++k) {
-        P += B[k] * BUCP[k];
-    }
-
-    return P;
-}
-
-// When OSD_PATCH_ENABLE_SINGLE_CREASE is defined,
-// this function evaluates single-crease patch, which is segmented into
-// 3 parts in the v-direction.
-//
-//  v=0             vSegment.x        vSegment.y              v=1
-//   +------------------+-------------------+------------------+
-//   |       cp 0       |     cp 1          |      cp 2        |
-//   | (infinite sharp) | (floor sharpness) | (ceil sharpness) |
-//   +------------------+-------------------+------------------+
-//
-float3
-OsdEvalBezier(OsdPerPatchVertexBezier cp[16], int3 patchParam, float2 uv)
-{
-    float3 BUCP[4] = {float3(0,0,0),float3(0,0,0),float3(0,0,0),float3(0,0,0)};
-
-    float B[4], D[4];
-    float s = OsdGetPatchSingleCreaseSegmentParameter(patchParam, uv);
-
-    OsdUnivar4x4(uv.x, B, D);
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    float2 vSegments = cp[0].vSegments;
-    if (s <= vSegments.x) {
-        for (int i=0; i<4; ++i) {
-            for (int j=0; j<4; ++j) {
-                float3 A = cp[4*i + j].P;
-                BUCP[i] += A * B[j];
-            }
-        }
-    } else if (s <= vSegments.y) {
-        for (int i=0; i<4; ++i) {
-            for (int j=0; j<4; ++j) {
-                float3 A = cp[4*i + j].P1;
-                BUCP[i] += A * B[j];
-            }
-        }
-    } else {
-        for (int i=0; i<4; ++i) {
-            for (int j=0; j<4; ++j) {
-                float3 A = cp[4*i + j].P2;
-                BUCP[i] += A * B[j];
-            }
-        }
-    }
-#else
-    for (int i=0; i<4; ++i) {
-        for (int j=0; j<4; ++j) {
-            float3 A = cp[4*i + j].P;
-            BUCP[i] += A * B[j];
-        }
-    }
-#endif
-
-    float3 P = float3(0,0,0);
-
-    OsdUnivar4x4(uv.y, B, D);
-    for (int k=0; k<4; ++k) {
-        P += B[k] * BUCP[k];
-    }
-
-    return P;
-}
-
-// ----------------------------------------------------------------------------
-// Boundary Interpolation
-// ----------------------------------------------------------------------------
-
-void
-OsdComputeBSplineBoundaryPoints(inout float3 cpt[16], int3 patchParam)
-{
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-
-    //  Don't extrapolate corner points until all boundary points in place
-    if ((boundaryMask & 1) != 0) {
-        cpt[1] = 2*cpt[5] - cpt[9];
-        cpt[2] = 2*cpt[6] - cpt[10];
-    }
-    if ((boundaryMask & 2) != 0) {
-        cpt[7] = 2*cpt[6] - cpt[5];
-        cpt[11] = 2*cpt[10] - cpt[9];
-    }
-    if ((boundaryMask & 4) != 0) {
-        cpt[13] = 2*cpt[9] - cpt[5];
-        cpt[14] = 2*cpt[10] - cpt[6];
-    }
-    if ((boundaryMask & 8) != 0) {
-        cpt[4] = 2*cpt[5] - cpt[6];
-        cpt[8] = 2*cpt[9] - cpt[10];
-    }
-
-    //  Now safe to extrapolate corner points:
-    if ((boundaryMask & 1) != 0) {
-        cpt[0] = 2*cpt[4] - cpt[8];
-        cpt[3] = 2*cpt[7] - cpt[11];
-    }
-    if ((boundaryMask & 2) != 0) {
-        cpt[3] = 2*cpt[2] - cpt[1];
-        cpt[15] = 2*cpt[14] - cpt[13];
-    }
-    if ((boundaryMask & 4) != 0) {
-        cpt[12] = 2*cpt[8] - cpt[4];
-        cpt[15] = 2*cpt[11] - cpt[7];
-    }
-    if ((boundaryMask & 8) != 0) {
-        cpt[0] = 2*cpt[1] - cpt[2];
-        cpt[12] = 2*cpt[13] - cpt[14];
-    }
-}
-
-void
-OsdComputeBoxSplineTriangleBoundaryPoints(inout float3 cpt[12], int3 patchParam)
-{
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-    if (boundaryMask == 0) return;
-
-    int upperBits = (boundaryMask >> 3) & 0x3;
-    int lowerBits = boundaryMask & 7;
-
-    int eBits = lowerBits;
-    int vBits = 0;
-
-    if (upperBits == 1) {
-        vBits = eBits;
-        eBits = 0;
-    } else if (upperBits == 2) {
-        //  Opposite vertex bit is edge bit rotated one to the right:
-        vBits = ((eBits & 1) << 2) | (eBits >> 1);
-    }
-
-    bool edge0IsBoundary = (eBits & 1) != 0;
-    bool edge1IsBoundary = (eBits & 2) != 0;
-    bool edge2IsBoundary = (eBits & 4) != 0;
-
-    if (edge0IsBoundary) {
-        if (edge2IsBoundary) {
-            cpt[0] = cpt[4] + (cpt[4] - cpt[8]);
-        } else {
-            cpt[0] = cpt[4] + (cpt[3] - cpt[7]);
-        }
-        cpt[1] = cpt[4] + cpt[5] - cpt[8];
-        if (edge1IsBoundary) {
-            cpt[2] = cpt[5] + (cpt[5] - cpt[8]);
-        } else {
-            cpt[2] = cpt[5] + (cpt[6] - cpt[9]);
-        }
-    }
-    if (edge1IsBoundary) {
-        if (edge0IsBoundary) {
-            cpt[6] = cpt[5] + (cpt[5] - cpt[4]);
-        } else {
-            cpt[6] = cpt[5] + (cpt[2] - cpt[1]);
-        }
-        cpt[9] = cpt[5] + cpt[8] - cpt[4];
-        if (edge2IsBoundary) {
-            cpt[11] = cpt[8] + (cpt[8] - cpt[4]);
-        } else {
-            cpt[11] = cpt[8] + (cpt[10] - cpt[7]);
-        }
-    }
-    if (edge2IsBoundary) {
-        if (edge1IsBoundary) {
-            cpt[10] = cpt[8] + (cpt[8] - cpt[5]);
-        } else {
-            cpt[10] = cpt[8] + (cpt[11] - cpt[9]);
-        }
-        cpt[7] = cpt[8] + cpt[4] - cpt[5];
-        if (edge0IsBoundary) {
-            cpt[3] = cpt[4] + (cpt[4] - cpt[5]);
-        } else {
-            cpt[3] = cpt[4] + (cpt[0] - cpt[1]);
-        }
-    }
-
-    if ((vBits & 1) != 0) {
-        cpt[3] = cpt[4] + cpt[7] - cpt[8];
-        cpt[0] = cpt[4] + cpt[1] - cpt[5];
-    }
-    if ((vBits & 2) != 0) {
-        cpt[2] = cpt[5] + cpt[1] - cpt[4];
-        cpt[6] = cpt[5] + cpt[9] - cpt[8];
-    }
-    if ((vBits & 4) != 0) {
-        cpt[11] = cpt[8] + cpt[9] - cpt[5];
-        cpt[10] = cpt[8] + cpt[7] - cpt[4];
-    }
-}
-
-// ----------------------------------------------------------------------------
-// BSpline
-// ----------------------------------------------------------------------------
-
-// compute single-crease patch matrix
-float4x4
-OsdComputeMs(float sharpness)
-{
-    float s = pow(2.0f, sharpness);
-    float s2 = s*s;
-    float s3 = s2*s;
-
-    float4x4 m ={
-        0, s + 1 + 3*s2 - s3, 7*s - 2 - 6*s2 + 2*s3, (1-s)*(s-1)*(s-1),
-        0,       (1+s)*(1+s),        6*s - 2 - 2*s2,       (s-1)*(s-1),
-        0,               1+s,               6*s - 2,               1-s,
-        0,                 1,               6*s - 2,                 1 };
-
-    m /= (s*6.0);
-    m[0][0] = 1.0/6.0;
-
-    return m;
-}
-
-// flip matrix orientation
-float4x4
-OsdFlipMatrix(float4x4 m)
-{
-    return float4x4(m[3][3], m[3][2], m[3][1], m[3][0],
-                    m[2][3], m[2][2], m[2][1], m[2][0],
-                    m[1][3], m[1][2], m[1][1], m[1][0],
-                    m[0][3], m[0][2], m[0][1], m[0][0]);
-}
-
-// Regular BSpline to Bezier
-static float4x4 Q = {
-    1.f/6.f, 4.f/6.f, 1.f/6.f, 0.f,
-    0.f,     4.f/6.f, 2.f/6.f, 0.f,
-    0.f,     2.f/6.f, 4.f/6.f, 0.f,
-    0.f,     1.f/6.f, 4.f/6.f, 1.f/6.f
-};
-
-// Infinitely Sharp (boundary)
-static float4x4 Mi = {
-    1.f/6.f, 4.f/6.f, 1.f/6.f, 0.f,
-    0.f,     4.f/6.f, 2.f/6.f, 0.f,
-    0.f,     2.f/6.f, 4.f/6.f, 0.f,
-    0.f,     0.f,     1.f,     0.f
-};
-
-// convert BSpline cv to Bezier cv
-void
-OsdComputePerPatchVertexBSpline(int3 patchParam, int ID, float3 cv[16],
-                                out OsdPerPatchVertexBezier result)
-{
-    result.patchParam = patchParam;
-
-    int i = ID%4;
-    int j = ID/4;
-
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-
-    float3 P  = float3(0,0,0); // 0 to 1-2^(-Sf)
-    float3 P1 = float3(0,0,0); // 1-2^(-Sf) to 1-2^(-Sc)
-    float3 P2 = float3(0,0,0); // 1-2^(-Sc) to 1
-
-    float sharpness = OsdGetPatchSharpness(patchParam);
-    if (sharpness > 0) {
-        float Sf = floor(sharpness);
-        float Sc = ceil(sharpness);
-        float Sr = frac(sharpness);
-        float4x4 Mf = OsdComputeMs(Sf);
-        float4x4 Mc = OsdComputeMs(Sc);
-        float4x4 Mj = (1-Sr) * Mf + Sr * Mi;
-        float4x4 Ms = (1-Sr) * Mf + Sr * Mc;
-        float s0 = 1 - pow(2, -floor(sharpness));
-        float s1 = 1 - pow(2, -ceil(sharpness));
-        result.vSegments = float2(s0, s1);
-
-        float4x4 MUi = Q, MUj = Q, MUs = Q;
-        float4x4 MVi = Q, MVj = Q, MVs = Q;
-
-        int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-        if ((boundaryMask & 1) != 0) {
-            MVi = OsdFlipMatrix(Mi);
-            MVj = OsdFlipMatrix(Mj);
-            MVs = OsdFlipMatrix(Ms);
-        }
-        if ((boundaryMask & 2) != 0) {
-            MUi = Mi;
-            MUj = Mj;
-            MUs = Ms;
-        }
-        if ((boundaryMask & 4) != 0) {
-            MVi = Mi;
-            MVj = Mj;
-            MVs = Ms;
-        }
-        if ((boundaryMask & 8) != 0) {
-            MUi = OsdFlipMatrix(Mi);
-            MUj = OsdFlipMatrix(Mj);
-            MUs = OsdFlipMatrix(Ms);
-        }
-
-        float3 Hi[4], Hj[4], Hs[4];
-        for (int l=0; l<4; ++l) {
-            Hi[l] = Hj[l] = Hs[l] = float3(0,0,0);
-            for (int k=0; k<4; ++k) {
-                Hi[l] += MUi[i][k] * cv[l*4 + k];
-                Hj[l] += MUj[i][k] * cv[l*4 + k];
-                Hs[l] += MUs[i][k] * cv[l*4 + k];
-            }
-        }
-        for (int k=0; k<4; ++k) {
-            P  += MVi[j][k]*Hi[k];
-            P1 += MVj[j][k]*Hj[k];
-            P2 += MVs[j][k]*Hs[k];
-        }
-
-        result.P  = P;
-        result.P1 = P1;
-        result.P2 = P2;
-    } else {
-        result.vSegments = float2(0, 0);
-
-        OsdComputeBSplineBoundaryPoints(cv, patchParam);
-
-        float3 Hi[4];
-        for (int l=0; l<4; ++l) {
-            Hi[l] = float3(0,0,0);
-            for (int k=0; k<4; ++k) {
-                Hi[l] += Q[i][k] * cv[l*4 + k];
-            }
-        }
-        for (int k=0; k<4; ++k) {
-            P += Q[j][k]*Hi[k];
-        }
-
-        result.P  = P;
-        result.P1 = P;
-        result.P2 = P;
-    }
-#else
-    OsdComputeBSplineBoundaryPoints(cv, patchParam);
-
-    float3 H[4];
-    for (int l=0; l<4; ++l) {
-        H[l] = float3(0,0,0);
-        for(int k=0; k<4; ++k) {
-            H[l] += Q[i][k] * cv[l*4 + k];
-        }
-    }
-    {
-        result.P = float3(0,0,0);
-        for (int k=0; k<4; ++k){
-            result.P += Q[j][k]*H[k];
-        }
-    }
-#endif
-}
-
-void
-OsdEvalPatchBezier(int3 patchParam, float2 UV,
-                   OsdPerPatchVertexBezier cv[16],
-                   out float3 P, out float3 dPu, out float3 dPv,
-                   out float3 N, out float3 dNu, out float3 dNv)
-{
-    //
-    //  Use the recursive nature of the basis functions to compute a 2x2 set
-    //  of intermediate points (via repeated linear interpolation).  These
-    //  points define a bilinear surface tangent to the desired surface at P
-    //  and so containing dPu and dPv.  The cost of computing P, dPu and dPv
-    //  this way is comparable to that of typical tensor product evaluation
-    //  (if not faster).
-    //
-    //  If N = dPu X dPv degenerates, it often results from an edge of the
-    //  2x2 bilinear hull collapsing or two adjacent edges colinear. In both
-    //  cases, the expected non-planar quad degenerates into a triangle, and
-    //  the tangent plane of that triangle provides the desired normal N.
-    //
-
-    //  Reduce 4x4 points to 2x4 -- two levels of linear interpolation in U
-    //  and so 3 original rows contributing to each of the 2 resulting rows:
-    float u    = UV.x;
-    float uinv = 1.0f - u;
-
-    float u0 = uinv * uinv;
-    float u1 = u * uinv * 2.0f;
-    float u2 = u * u;
-
-    float3 LROW[4], RROW[4];
-#ifndef OSD_PATCH_ENABLE_SINGLE_CREASE
-    LROW[0] = u0 * cv[ 0].P + u1 * cv[ 1].P + u2 * cv[ 2].P;
-    LROW[1] = u0 * cv[ 4].P + u1 * cv[ 5].P + u2 * cv[ 6].P;
-    LROW[2] = u0 * cv[ 8].P + u1 * cv[ 9].P + u2 * cv[10].P;
-    LROW[3] = u0 * cv[12].P + u1 * cv[13].P + u2 * cv[14].P;
-
-    RROW[0] = u0 * cv[ 1].P + u1 * cv[ 2].P + u2 * cv[ 3].P;
-    RROW[1] = u0 * cv[ 5].P + u1 * cv[ 6].P + u2 * cv[ 7].P;
-    RROW[2] = u0 * cv[ 9].P + u1 * cv[10].P + u2 * cv[11].P;
-    RROW[3] = u0 * cv[13].P + u1 * cv[14].P + u2 * cv[15].P;
-#else
-    float2 vSegments = cv[0].vSegments;
-    float s = OsdGetPatchSingleCreaseSegmentParameter(patchParam, UV);
-
-    for (int i = 0; i < 4; ++i) {
-        int j = i*4;
-        if (s <= vSegments.x) {
-            LROW[i] = u0 * cv[ j ].P + u1 * cv[j+1].P + u2 * cv[j+2].P;
-            RROW[i] = u0 * cv[j+1].P + u1 * cv[j+2].P + u2 * cv[j+3].P;
-        } else if (s <= vSegments.y) {
-            LROW[i] = u0 * cv[ j ].P1 + u1 * cv[j+1].P1 + u2 * cv[j+2].P1;
-            RROW[i] = u0 * cv[j+1].P1 + u1 * cv[j+2].P1 + u2 * cv[j+3].P1;
-        } else {
-            LROW[i] = u0 * cv[ j ].P2 + u1 * cv[j+1].P2 + u2 * cv[j+2].P2;
-            RROW[i] = u0 * cv[j+1].P2 + u1 * cv[j+2].P2 + u2 * cv[j+3].P2;
-        }
-    }
-#endif
-
-    //  Reduce 2x4 points to 2x2 -- two levels of linear interpolation in V
-    //  and so 3 original pairs contributing to each of the 2 resulting:
-    float v    = UV.y;
-    float vinv = 1.0f - v;
-
-    float v0 = vinv * vinv;
-    float v1 = v * vinv * 2.0f;
-    float v2 = v * v;
-
-    float3 LPAIR[2], RPAIR[2];
-    LPAIR[0] = v0 * LROW[0] + v1 * LROW[1] + v2 * LROW[2];
-    RPAIR[0] = v0 * RROW[0] + v1 * RROW[1] + v2 * RROW[2];
-
-    LPAIR[1] = v0 * LROW[1] + v1 * LROW[2] + v2 * LROW[3];
-    RPAIR[1] = v0 * RROW[1] + v1 * RROW[2] + v2 * RROW[3];
-
-    //  Interpolate points on the edges of the 2x2 bilinear hull from which
-    //  both position and partials are trivially determined:
-    float3 DU0 = vinv * LPAIR[0] + v * LPAIR[1];
-    float3 DU1 = vinv * RPAIR[0] + v * RPAIR[1];
-    float3 DV0 = uinv * LPAIR[0] + u * RPAIR[0];
-    float3 DV1 = uinv * LPAIR[1] + u * RPAIR[1];
-
-    int level = OsdGetPatchFaceLevel(patchParam);
-    dPu = (DU1 - DU0) * 3 * level;
-    dPv = (DV1 - DV0) * 3 * level;
-
-    P = u * DU1 + uinv * DU0;
-
-    //  Compute the normal and test for degeneracy:
-    //
-    //  We need a geometric measure of the size of the patch for a suitable
-    //  tolerance.  Magnitudes of the partials are generally proportional to
-    //  that size -- the sum of the partials is readily available, cheap to
-    //  compute, and has proved effective in most cases (though not perfect).
-    //  The size of the bounding box of the patch, or some approximation to
-    //  it, would be better but more costly to compute.
-    //
-    float proportionalNormalTolerance = 0.00001f;
-
-    float nEpsilon = (length(dPu) + length(dPv)) * proportionalNormalTolerance;
-
-    N = cross(dPu, dPv);
-
-    float nLength = length(N);
-    if (nLength > nEpsilon) {
-        N = N / nLength;
-    } else {
-        float3 diagCross = cross(RPAIR[1] - LPAIR[0], LPAIR[1] - RPAIR[0]);
-        float diagCrossLength = length(diagCross);
-        if (diagCrossLength > nEpsilon) {
-            N = diagCross / diagCrossLength;
-        }
-    }
-
-#ifndef OSD_COMPUTE_NORMAL_DERIVATIVES
-    dNu = float3(0,0,0);
-    dNv = float3(0,0,0);
-#else
-    //
-    //  Compute 2nd order partials of P(u,v) in order to compute 1st order partials
-    //  for the un-normalized n(u,v) = dPu X dPv, then project into the tangent
-    //  plane of normalized N.  With resulting dNu and dNv we can make another
-    //  attempt to resolve a still-degenerate normal.
-    //
-    //  We don't use the Weingarten equations here as they require N != 0 and also
-    //  are a little less numerically stable/accurate in single precision.
-    //
-    float B0u[4], B1u[4], B2u[4];
-    float B0v[4], B1v[4], B2v[4];
-
-    OsdUnivar4x4(UV.x, B0u, B1u, B2u);
-    OsdUnivar4x4(UV.y, B0v, B1v, B2v);
-
-    float3 dUU = float3(0,0,0);
-    float3 dVV = float3(0,0,0);
-    float3 dUV = float3(0,0,0);
-
-    for (int i=0; i<4; ++i) {
-        for (int j=0; j<4; ++j) {
-#ifdef OSD_PATCH_ENABLE_SINGLE_CREASE
-            int k = 4*i + j;
-            float3 CV = (s <= vSegments.x) ? cv[k].P
-                   :   ((s <= vSegments.y) ? cv[k].P1
-                                           : cv[k].P2);
-#else
-            float3 CV = cv[4*i + j].P;
-#endif
-            dUU += (B0v[i] * B2u[j]) * CV;
-            dVV += (B2v[i] * B0u[j]) * CV;
-            dUV += (B1v[i] * B1u[j]) * CV;
-        }
-    }
-
-    dUU *= 6 * level;
-    dVV *= 6 * level;
-    dUV *= 9 * level;
-
-    dNu = cross(dUU, dPv) + cross(dPu, dUV);
-    dNv = cross(dUV, dPv) + cross(dPu, dVV);
-
-    float nLengthInv = 1.0;
-    if (nLength > nEpsilon) {
-        nLengthInv = 1.0 / nLength;
-    } else {
-        //  N may have been resolved above if degenerate, but if N was resolved
-        //  we don't have an accurate length for its un-normalized value, and that
-        //  length is needed to project the un-normalized dNu and dNv into the
-        //  tangent plane of N.
-        //
-        //  So compute N more accurately with available second derivatives, i.e.
-        //  with a 1st order Taylor approximation to un-normalized N(u,v).
-
-        float DU = (UV.x == 1.0f) ? -1.0f : 1.0f;
-        float DV = (UV.y == 1.0f) ? -1.0f : 1.0f;
-
-        N = DU * dNu + DV * dNv;
-
-        nLength = length(N);
-        if (nLength > nEpsilon) {
-            nLengthInv = 1.0f / nLength;
-            N = N * nLengthInv;
-        }
-    }
-
-    //  Project derivatives of non-unit normals into tangent plane of N:
-    dNu = (dNu - dot(dNu,N) * N) * nLengthInv;
-    dNv = (dNv - dot(dNv,N) * N) * nLengthInv;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// Gregory Basis
-// ----------------------------------------------------------------------------
-
-struct OsdPerPatchVertexGregoryBasis {
-    int3 patchParam : PATCHPARAM;
-    float3 P : POSITION0;
-};
-
-void
-OsdComputePerPatchVertexGregoryBasis(int3 patchParam, int ID, float3 cv,
-                                     out OsdPerPatchVertexGregoryBasis result)
-{
-    result.patchParam = patchParam;
-    result.P = cv;
-}
-
-void
-OsdEvalPatchGregory(int3 patchParam, float2 UV, float3 cv[20],
-                    out float3 P, out float3 dPu, out float3 dPv,
-                    out float3 N, out float3 dNu, out float3 dNv)
-{
-    float u = UV.x, v = UV.y;
-    float U = 1-u, V = 1-v;
-
-    //(0,1)                              (1,1)
-    //   P3         e3-      e2+         P2
-    //      15------17-------11-------10
-    //      |        |        |        |
-    //      |        |        |        |
-    //      |        | f3-    | f2+    |
-    //      |       19       13        |
-    //  e3+ 16-----18          14-----12 e2-
-    //      |     f3+          f2-     |
-    //      |                          |
-    //      |                          |
-    //      |     f0-         f1+      |
-    //  e0- 2------4            8------6 e1+
-    //      |        3 f0+    9        |
-    //      |        |        | f1-    |
-    //      |        |        |        |
-    //      |        |        |        |
-    //      0--------1--------7--------5
-    //    P0        e0+      e1-         P1
-    //(0,0)                               (1,0)
-
-    float d11 = u+v;
-    float d12 = U+v;
-    float d21 = u+V;
-    float d22 = U+V;
-
-    OsdPerPatchVertexBezier bezcv[16];
-
-    bezcv[ 5].P = (d11 == 0.0) ? cv[3]  : (u*cv[3] + v*cv[4])/d11;
-    bezcv[ 6].P = (d12 == 0.0) ? cv[8]  : (U*cv[9] + v*cv[8])/d12;
-    bezcv[ 9].P = (d21 == 0.0) ? cv[18] : (u*cv[19] + V*cv[18])/d21;
-    bezcv[10].P = (d22 == 0.0) ? cv[13] : (U*cv[13] + V*cv[14])/d22;
-
-    bezcv[ 0].P = cv[0];
-    bezcv[ 1].P = cv[1];
-    bezcv[ 2].P = cv[7];
-    bezcv[ 3].P = cv[5];
-    bezcv[ 4].P = cv[2];
-    bezcv[ 7].P = cv[6];
-    bezcv[ 8].P = cv[16];
-    bezcv[11].P = cv[12];
-    bezcv[12].P = cv[15];
-    bezcv[13].P = cv[17];
-    bezcv[14].P = cv[11];
-    bezcv[15].P = cv[10];
-
-    OsdEvalPatchBezier(patchParam, UV, bezcv, P, dPu, dPv, N, dNu, dNv);
-}
-
-//
-//  Convert the 12 points of a regular patch resulting from Loop subdivision
-//  into a more accessible Bezier patch for both tessellation assessment and
-//  evaluation.
-//
-//  Regular patch for Loop subdivision -- quartic triangular Box spline:
-//
-//                           10 --- 11
-//                           . .   . .
-//                          .   . .   .
-//                         7 --- 8 --- 9
-//                        . .   . .   . .
-//                       .   . .   . .   .
-//                      3 --- 4 --- 5 --- 6
-//                       .   . .   . .   .
-//                        . .   . .   . .
-//                         0 --- 1 --- 2
-//
-//  The equivalant quartic Bezier triangle (15 points):
-//
-//                              14
-//                              . .
-//                             .   .
-//                           12 --- 13
-//                           . .   . .
-//                          .   . .   .
-//                         9 -- 10 --- 11
-//                        . .   . .   . .
-//                       .   . .   . .   .
-//                      5 --- 6 --- 7 --- 8
-//                     . .   . .   . .   . .
-//                    .   . .   . .   . .   .
-//                   0 --- 1 --- 2 --- 3 --- 4
-//
-//  A hybrid cubic/quartic Bezier patch with cubic boundaries is a close
-//  approximation and would only use 12 control points, but we need a full
-//  quartic patch to maintain accuracy along boundary curves -- especially
-//  between subdivision levels.
-//
-void
-OsdComputePerPatchVertexBoxSplineTriangle(int3 patchParam, int ID, float3 cv[12],
-                                          out OsdPerPatchVertexBezier result)
-{
-    //
-    //  Conversion matrix from 12-point Box spline to 15-point quartic Bezier
-    //  patch and its common scale factor:
-    //
-    const float boxToBezierMatrix[12*15] = {
-    // L0   L1   L2     L3   L4   L5   L6     L7   L8   L9     L10  L11
-        2,   2,   0,     2,  12,   2,   0,     2,   2,   0,     0,   0,  // B0
-        1,   3,   0,     0,  12,   4,   0,     1,   3,   0,     0,   0,  // B1
-        0,   4,   0,     0,   8,   8,   0,     0,   4,   0,     0,   0,  // B2
-        0,   3,   1,     0,   4,  12,   0,     0,   3,   1,     0,   0,  // B3
-        0,   2,   2,     0,   2,  12,   2,     0,   2,   2,     0,   0,  // B4
-        0,   1,   0,     1,  12,   3,   0,     3,   4,   0,     0,   0,  // B5
-        0,   1,   0,     0,  10,   6,   0,     1,   6,   0,     0,   0,  // B6
-        0,   1,   0,     0,   6,  10,   0,     0,   6,   1,     0,   0,  // B7
-        0,   1,   0,     0,   3,  12,   1,     0,   4,   3,     0,   0,  // B8
-        0,   0,   0,     0,   8,   4,   0,     4,   8,   0,     0,   0,  // B9
-        0,   0,   0,     0,   6,   6,   0,     1,  10,   1,     0,   0,  // B10
-        0,   0,   0,     0,   4,   8,   0,     0,   8,   4,     0,   0,  // B11
-        0,   0,   0,     0,   4,   3,   0,     3,  12,   1,     1,   0,  // B12
-        0,   0,   0,     0,   3,   4,   0,     1,  12,   3,     0,   1,  // B13
-        0,   0,   0,     0,   2,   2,   0,     2,  12,   2,     2,   2   // B14
-    };
-    const float boxToBezierMatrixScale = 1.0 / 24.0;
-
-    OsdComputeBoxSplineTriangleBoundaryPoints(cv, patchParam);
-
-    result.patchParam = patchParam;
-    result.P = float3(0,0,0);
-
-    int cvCoeffBase = 12 * ID;
-
-    for (int i = 0; i < 12; ++i) {
-        result.P += boxToBezierMatrix[cvCoeffBase + i] * cv[i];
-    }
-    result.P *= boxToBezierMatrixScale;
-}
-
-void
-OsdEvalPatchBezierTriangle(int3 patchParam, float2 UV,
-                           OsdPerPatchVertexBezier cv[15],
-                           out float3 P, out float3 dPu, out float3 dPv,
-                           out float3 N, out float3 dNu, out float3 dNv)
-{
-    float u = UV.x;
-    float v = UV.y;
-    float w = 1.0 - u - v;
-
-    float uu = u * u;
-    float vv = v * v;
-    float ww = w * w;
-
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    //
-    //  When computing normal derivatives, we need 2nd derivatives, so compute
-    //  an intermediate quadratic Bezier triangle from which 2nd derivatives
-    //  can be easily computed, and which in turn yields the triangle that gives
-    //  the position and 1st derivatives.
-    //
-    //  Quadratic barycentric basis functions (in addition to those above):
-    float uv = u * v * 2.0;
-    float vw = v * w * 2.0;
-    float wu = w * u * 2.0;
-
-    float3 Q0 = ww * cv[ 0].P + wu * cv[ 1].P + uu * cv[ 2].P +
-                uv * cv[ 6].P + vv * cv[ 9].P + vw * cv[ 5].P;
-    float3 Q1 = ww * cv[ 1].P + wu * cv[ 2].P + uu * cv[ 3].P +
-                uv * cv[ 7].P + vv * cv[10].P + vw * cv[ 6].P;
-    float3 Q2 = ww * cv[ 2].P + wu * cv[ 3].P + uu * cv[ 4].P +
-                uv * cv[ 8].P + vv * cv[11].P + vw * cv[ 7].P;
-    float3 Q3 = ww * cv[ 5].P + wu * cv[ 6].P + uu * cv[ 7].P +
-                uv * cv[10].P + vv * cv[12].P + vw * cv[ 9].P;
-    float3 Q4 = ww * cv[ 6].P + wu * cv[ 7].P + uu * cv[ 8].P +
-                uv * cv[11].P + vv * cv[13].P + vw * cv[10].P;
-    float3 Q5 = ww * cv[ 9].P + wu * cv[10].P + uu * cv[11].P +
-                uv * cv[13].P + vv * cv[14].P + vw * cv[12].P;
-
-    float3 V0 = w * Q0 + u * Q1 + v * Q3;
-    float3 V1 = w * Q1 + u * Q2 + v * Q4;
-    float3 V2 = w * Q3 + u * Q4 + v * Q5;
-#else
-    //
-    //  When 2nd derivatives are not required, factor the recursive evaluation
-    //  of a point to directly provide the three points of the triangle at the
-    //  last stage -- which then trivially provides both position and 1st
-    //  derivatives.  Each point of the triangle results from evaluating the
-    //  corresponding cubic Bezier sub-triangle for each corner of the quartic:
-    //
-    //  Cubic barycentric basis functions:
-    float uuu = uu * u;
-    float uuv = uu * v * 3.0;
-    float uvv = u * vv * 3.0;
-    float vvv = vv * v;
-    float vvw = vv * w * 3.0;
-    float vww = v * ww * 3.0;
-    float www = ww * w;
-    float wwu = ww * u * 3.0;
-    float wuu = w * uu * 3.0;
-    float uvw = u * v * w * 6.0;
-
-    float3 V0 = www * cv[ 0].P + wwu * cv[ 1].P + wuu * cv[ 2].P
-              + uuu * cv[ 3].P + uuv * cv[ 7].P + uvv * cv[10].P
-              + vvv * cv[12].P + vvw * cv[ 9].P + vww * cv[ 5].P + uvw * cv[ 6].P;
-
-    float3 V1 = www * cv[ 1].P + wwu * cv[ 2].P + wuu * cv[ 3].P
-              + uuu * cv[ 4].P + uuv * cv[ 8].P + uvv * cv[11].P
-              + vvv * cv[13].P + vvw * cv[10].P + vww * cv[ 6].P + uvw * cv[ 7].P;
-
-    float3 V2 = www * cv[ 5].P + wwu * cv[ 6].P + wuu * cv[ 7].P
-              + uuu * cv[ 8].P + uuv * cv[11].P + uvv * cv[13].P
-              + vvv * cv[14].P + vvw * cv[12].P + vww * cv[ 9].P + uvw * cv[10].P;
-#endif
-
-    //
-    //  Compute P, du and dv all from the triangle formed from the three Vi:
-    //
-    P = w * V0 + u * V1 + v * V2;
-
-    int dSign = OsdGetPatchIsTriangleRotated(patchParam) ? -1 : 1;
-    int level = OsdGetPatchFaceLevel(patchParam);
-
-    float d1Scale = dSign * level * 4;
-
-    dPu = (V1 - V0) * d1Scale;
-    dPv = (V2 - V0) * d1Scale;
-
-    //  Compute N and test for degeneracy:
-    //
-    //  We need a geometric measure of the size of the patch for a suitable
-    //  tolerance.  Magnitudes of the partials are generally proportional to
-    //  that size -- the sum of the partials is readily available, cheap to
-    //  compute, and has proved effective in most cases (though not perfect).
-    //  The size of the bounding box of the patch, or some approximation to
-    //  it, would be better but more costly to compute.
-    //
-    float proportionalNormalTolerance = 0.00001f;
-
-    float nEpsilon = (length(dPu) + length(dPv)) * proportionalNormalTolerance;
-
-    N = cross(dPu, dPv);
-    float nLength = length(N);
-
-
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    //
-    //  Compute normal derivatives using 2nd order partials, then use the
-    //  normal derivatives to resolve a degenerate normal:
-    //
-    float d2Scale = dSign * level * level * 12;
-
-    float3 dUU = (Q0 - 2 * Q1 + Q2)  * d2Scale;
-    float3 dVV = (Q0 - 2 * Q3 + Q5)  * d2Scale;
-    float3 dUV = (Q0 - Q1 + Q4 - Q3) * d2Scale;
-
-    dNu = cross(dUU, dPv) + cross(dPu, dUV);
-    dNv = cross(dUV, dPv) + cross(dPu, dVV);
-
-    if (nLength < nEpsilon) {
-        //  Use 1st order Taylor approximation of N(u,v) within patch interior:
-        if (w > 0.0) {
-            N =  dNu + dNv;
-        } else if (u >= 1.0) {
-            N = -dNu + dNv;
-        } else if (v >= 1.0) {
-            N =  dNu - dNv;
-        } else {
-            N = -dNu - dNv;
-        }
-
-        nLength = length(N);
-        if (nLength < nEpsilon) {
-            nLength = 1.0;
-        }
-    }
-    N = N / nLength;
-
-    //  Project derivs of non-unit normal function onto tangent plane of N:
-    dNu = (dNu - dot(dNu,N) * N) / nLength;
-    dNv = (dNv - dot(dNv,N) * N) / nLength;
-#else
-    dNu = float3(0,0,0);
-    dNv = float3(0,0,0);
-
-    //
-    //  Resolve a degenerate normal using the interior triangle of the
-    //  intermediate quadratic patch that results from recursive evaluation.
-    //  This addresses common cases of degenerate or colinear boundaries
-    //  without resorting to use of explicit 2nd derivatives:
-    //
-    if (nLength < nEpsilon) {
-        float uv  = u * v * 2.0;
-        float vw  = v * w * 2.0;
-        float wu  = w * u * 2.0;
-
-        float3 Q1 = ww * cv[ 1].P + wu * cv[ 2].P + uu * cv[ 3].P +
-                    uv * cv[ 7].P + vv * cv[10].P + vw * cv[ 6].P;
-        float3 Q3 = ww * cv[ 5].P + wu * cv[ 6].P + uu * cv[ 7].P +
-                    uv * cv[10].P + vv * cv[12].P + vw * cv[ 9].P;
-        float3 Q4 = ww * cv[ 6].P + wu * cv[ 7].P + uu * cv[ 8].P +
-                    uv * cv[11].P + vv * cv[13].P + vw * cv[10].P;
-
-        N = cross((Q4 - Q1), (Q3 - Q1));
-        nLength = length(N);
-        if (nLength < nEpsilon) {
-            nLength = 1.0;
-        }
-    }
-    N = N / nLength;
-#endif
-}
-
-void
-OsdEvalPatchGregoryTriangle(int3 patchParam, float2 UV, float3 cv[18],
-                            out float3 P, out float3 dPu, out float3 dPv,
-                            out float3 N, out float3 dNu, out float3 dNv)
-{
-    float u = UV.x;
-    float v = UV.y;
-    float w = 1.0 - u - v;
-
-    float duv = u + v;
-    float dvw = v + w;
-    float dwu = w + u;
-
-    OsdPerPatchVertexBezier bezcv[15];
-
-    bezcv[ 6].P = (duv == 0.0) ? cv[3]  : ((u*cv[ 3] + v*cv[ 4]) / duv);
-    bezcv[ 7].P = (dvw == 0.0) ? cv[8]  : ((v*cv[ 8] + w*cv[ 9]) / dvw);
-    bezcv[10].P = (dwu == 0.0) ? cv[13] : ((w*cv[13] + u*cv[14]) / dwu);
-
-    bezcv[ 0].P = cv[ 0];
-    bezcv[ 1].P = cv[ 1];
-    bezcv[ 2].P = cv[15];
-    bezcv[ 3].P = cv[ 7];
-    bezcv[ 4].P = cv[ 5];
-    bezcv[ 5].P = cv[ 2];
-    bezcv[ 8].P = cv[ 6];
-    bezcv[ 9].P = cv[17];
-    bezcv[11].P = cv[16];
-    bezcv[12].P = cv[11];
-    bezcv[13].P = cv[12];
-    bezcv[14].P = cv[10];
-
-    OsdEvalPatchBezierTriangle(patchParam, UV, bezcv, P, dPu, dPv, N, dNu, dNv);
-}
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchCommonTess.hlsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchCommonTess.hlsl
deleted file mode 100644
index fb1d05a94..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchCommonTess.hlsl
+++ /dev/null
@@ -1,750 +0,0 @@
-//
-//   Copyright 2013-2019 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-// ----------------------------------------------------------------------------
-// Tessellation
-// ----------------------------------------------------------------------------
-
-// For now, fractional spacing is supported only with screen space tessellation
-#ifndef OSD_ENABLE_SCREENSPACE_TESSELLATION
-#undef OSD_FRACTIONAL_EVEN_SPACING
-#undef OSD_FRACTIONAL_ODD_SPACING
-#endif
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-  #define OSD_PARTITIONING "fractional_even"
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-  #define OSD_PARTITIONING "fractional_odd"
-#else
-  #define OSD_PARTITIONING "integer"
-#endif
-
-struct HS_CONSTANT_FUNC_OUT {
-    float tessLevelInner[2] : SV_InsideTessFactor;
-    float tessLevelOuter[4] : SV_TessFactor;
-    float4 tessOuterLo : TRANSITIONLO;
-    float4 tessOuterHi : TRANSITIONHI;
-};
-
-struct HS_CONSTANT_FUNC_TRIANGLE_OUT {
-    float tessLevelInner[1] : SV_InsideTessFactor;
-    float tessLevelOuter[3] : SV_TessFactor;
-    float4 tessOuterLo : TRANSITIONLO;
-    float4 tessOuterHi : TRANSITIONHI;
-};
-
-//
-// Organization of B-spline and Bezier control points.
-//
-// Each patch is defined by 16 control points (labeled 0-15).
-//
-// The patch will be evaluated across the domain from (0,0) at
-// the lower-left to (1,1) at the upper-right. When computing
-// adaptive tessellation metrics, we consider refined vertex-vertex
-// and edge-vertex points along the transition edges of the patch
-// (labeled vv* and ev* respectively).
-//
-// The two segments of each transition edge are labeled Lo and Hi,
-// with the Lo segment occurring before the Hi segment along the
-// transition edge's domain parameterization. These Lo and Hi segment
-// tessellation levels determine how domain evaluation coordinates
-// are remapped along transition edges. The Hi segment value will
-// be zero for a non-transition edge.
-//
-// (0,1)                                         (1,1)
-//
-//   vv3                  ev23                   vv2
-//        |       Lo3       |       Hi3       |
-//      --O-----------O-----+-----O-----------O--
-//        | 12        | 13     14 |        15 |
-//        |           |           |           |
-//        |           |           |           |
-//    Hi0 |           |           |           | Hi2
-//        |           |           |           |
-//        O-----------O-----------O-----------O
-//        | 8         | 9      10 |        11 |
-//        |           |           |           |
-// ev03 --+           |           |           +-- ev12
-//        |           |           |           |
-//        | 4         | 5       6 |         7 |
-//        O-----------O-----------O-----------O
-//        |           |           |           |
-//    Lo0 |           |           |           | Lo2
-//        |           |           |           |
-//        |           |           |           |
-//        | 0         | 1       2 |         3 |
-//      --O-----------O-----+-----O-----------O--
-//        |       Lo1       |       Hi1       |
-//   vv0                  ev01                   vv1
-//
-// (0,0)                                         (1,0)
-//
-
-#define OSD_MAX_TESS_LEVEL 64
-
-float OsdComputePostProjectionSphereExtent(float3 center, float diameter)
-{
-    float4 p = mul(OsdProjectionMatrix(), float4(center, 1.0));
-    return abs(diameter * OsdProjectionMatrix()[1][1] / p.w);
-}
-
-float OsdComputeTessLevel(float3 p0, float3 p1)
-{
-    // Adaptive factor can be any computation that depends only on arg values.
-    // Project the diameter of the edge's bounding sphere instead of using the
-    // length of the projected edge itself to avoid problems near silhouettes.
-    p0 = mul(OsdModelViewMatrix(), float4(p0, 1.0)).xyz;
-    p1 = mul(OsdModelViewMatrix(), float4(p1, 1.0)).xyz;
-    float3 center = (p0 + p1) / 2.0;
-    float diameter = distance(p0, p1);
-    float projLength = OsdComputePostProjectionSphereExtent(center, diameter);
-    float tessLevel = max(1.0, OsdTessLevel() * projLength);
-
-    // We restrict adaptive tessellation levels to half of the device
-    // supported maximum because transition edges are split into two
-    // halves and the sum of the two corresponding levels must not exceed
-    // the device maximum. We impose this limit even for non-transition
-    // edges because a non-transition edge must be able to match up with
-    // one half of the transition edge of an adjacent transition patch.
-    return min(tessLevel, OSD_MAX_TESS_LEVEL / 2);
-}
-
-void
-OsdGetTessLevelsUniform(int3 patchParam,
-                        out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    // Uniform factors are simple powers of two for each level.
-    // The maximum here can be increased if we know the maximum
-    // refinement level of the mesh:
-    //     min(OSD_MAX_TESS_LEVEL, pow(2, MaximumRefinementLevel-1)
-    int refinementLevel = OsdGetPatchRefinementLevel(patchParam);
-    float tessLevel = min(OsdTessLevel(), OSD_MAX_TESS_LEVEL) /
-                        pow(2, refinementLevel-1);
-
-    // tessLevels of transition edge should be clamped to 2.
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-    float4 tessLevelMin = float4(1,1,1,1)
-        + float4(((transitionMask & 8) >> 3),
-                 ((transitionMask & 1) >> 0),
-                 ((transitionMask & 2) >> 1),
-                 ((transitionMask & 4) >> 2));
-
-    tessOuterLo = max(float4(tessLevel,tessLevel,tessLevel,tessLevel),
-                      tessLevelMin);
-    tessOuterHi = float4(0,0,0,0);
-}
-
-void
-OsdGetTessLevelsUniformTriangle(int3 patchParam,
-                        out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    // Uniform factors are simple powers of two for each level.
-    // The maximum here can be increased if we know the maximum
-    // refinement level of the mesh:
-    //     min(OSD_MAX_TESS_LEVEL, pow(2, MaximumRefinementLevel-1)
-    int refinementLevel = OsdGetPatchRefinementLevel(patchParam);
-    float tessLevel = min(OsdTessLevel(), OSD_MAX_TESS_LEVEL) /
-                        pow(2, refinementLevel-1);
-
-    // tessLevels of transition edge should be clamped to 2.
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-    float4 tessLevelMin = float4(1,1,1,1)
-        + float4(((transitionMask & 4) >> 2),
-                 ((transitionMask & 1) >> 0),
-                 ((transitionMask & 2) >> 1),
-                 0);
-
-    tessOuterLo = max(float4(tessLevel,tessLevel,tessLevel,tessLevel),
-                      tessLevelMin);
-    tessOuterHi = float4(0,0,0,0);
-}
-
-void
-OsdGetTessLevelsRefinedPoints(float3 cp[16], int3 patchParam,
-                              out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. We compute the corresponding
-    // vertex-vertex and edge-vertex refined points along the edges of the
-    // patch using Catmull-Clark subdivision stencil weights.
-    // For simplicity, we let the optimizer discard unused computation.
-
-    float3 vv0 = (cp[0] + cp[2] + cp[8] + cp[10]) * 0.015625 +
-                 (cp[1] + cp[4] + cp[6] + cp[9]) * 0.09375 + cp[5] * 0.5625;
-    float3 ev01 = (cp[1] + cp[2] + cp[9] + cp[10]) * 0.0625 +
-                  (cp[5] + cp[6]) * 0.375;
-
-    float3 vv1 = (cp[1] + cp[3] + cp[9] + cp[11]) * 0.015625 +
-                 (cp[2] + cp[5] + cp[7] + cp[10]) * 0.09375 + cp[6] * 0.5625;
-    float3 ev12 = (cp[5] + cp[7] + cp[9] + cp[11]) * 0.0625 +
-                  (cp[6] + cp[10]) * 0.375;
-
-    float3 vv2 = (cp[5] + cp[7] + cp[13] + cp[15]) * 0.015625 +
-                 (cp[6] + cp[9] + cp[11] + cp[14]) * 0.09375 + cp[10] * 0.5625;
-    float3 ev23 = (cp[5] + cp[6] + cp[13] + cp[14]) * 0.0625 +
-                  (cp[9] + cp[10]) * 0.375;
-
-    float3 vv3 = (cp[4] + cp[6] + cp[12] + cp[14]) * 0.015625 +
-                 (cp[5] + cp[8] + cp[10] + cp[13]) * 0.09375 + cp[9] * 0.5625;
-    float3 ev03 = (cp[4] + cp[6] + cp[8] + cp[10]) * 0.0625 +
-                  (cp[5] + cp[9]) * 0.375;
-
-    tessOuterLo = float4(0,0,0,0);
-    tessOuterHi = float4(0,0,0,0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    if ((transitionMask & 8) != 0) {
-        tessOuterLo[0] = OsdComputeTessLevel(vv0, ev03);
-        tessOuterHi[0] = OsdComputeTessLevel(vv3, ev03);
-    } else {
-        tessOuterLo[0] = OsdComputeTessLevel(cp[5], cp[9]);
-    }
-    if ((transitionMask & 1) != 0) {
-        tessOuterLo[1] = OsdComputeTessLevel(vv0, ev01);
-        tessOuterHi[1] = OsdComputeTessLevel(vv1, ev01);
-    } else {
-        tessOuterLo[1] = OsdComputeTessLevel(cp[5], cp[6]);
-    }
-    if ((transitionMask & 2) != 0) {
-        tessOuterLo[2] = OsdComputeTessLevel(vv1, ev12);
-        tessOuterHi[2] = OsdComputeTessLevel(vv2, ev12);
-    } else {
-        tessOuterLo[2] = OsdComputeTessLevel(cp[6], cp[10]);
-    }
-    if ((transitionMask & 4) != 0) {
-        tessOuterLo[3] = OsdComputeTessLevel(vv3, ev23);
-        tessOuterHi[3] = OsdComputeTessLevel(vv2, ev23);
-    } else {
-        tessOuterLo[3] = OsdComputeTessLevel(cp[9], cp[10]);
-    }
-}
-
-//
-//  Patch boundary corners are ordered counter-clockwise from the first
-//  corner while patch boundary edges and their midpoints are similarly
-//  ordered counter-clockwise beginning at the edge preceding corner[0].
-//
-void
-Osd_GetTessLevelsFromPatchBoundaries4(float3 corners[4], float3 midpoints[4],
-                int3 patchParam, out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    tessOuterLo = float4(0,0,0,0);
-    tessOuterHi = float4(0,0,0,0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    if ((transitionMask & 8) != 0) {
-        tessOuterLo[0] = OsdComputeTessLevel(corners[0], midpoints[0]);
-        tessOuterHi[0] = OsdComputeTessLevel(corners[3], midpoints[0]);
-    } else {
-        tessOuterLo[0] = OsdComputeTessLevel(corners[0], corners[3]);
-    }
-    if ((transitionMask & 1) != 0) {
-        tessOuterLo[1] = OsdComputeTessLevel(corners[0], midpoints[1]);
-        tessOuterHi[1] = OsdComputeTessLevel(corners[1], midpoints[1]);
-    } else {
-        tessOuterLo[1] = OsdComputeTessLevel(corners[0], corners[1]);
-    }
-    if ((transitionMask & 2) != 0) {
-        tessOuterLo[2] = OsdComputeTessLevel(corners[1], midpoints[2]);
-        tessOuterHi[2] = OsdComputeTessLevel(corners[2], midpoints[2]);
-    } else {
-        tessOuterLo[2] = OsdComputeTessLevel(corners[1], corners[2]);
-    }
-    if ((transitionMask & 4) != 0) {
-        tessOuterLo[3] = OsdComputeTessLevel(corners[3], midpoints[3]);
-        tessOuterHi[3] = OsdComputeTessLevel(corners[2], midpoints[3]);
-    } else {
-        tessOuterLo[3] = OsdComputeTessLevel(corners[3], corners[2]);
-    }
-}
-
-void
-Osd_GetTessLevelsFromPatchBoundaries3(float3 corners[3], float3 midpoints[3],
-                int3 patchParam, out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    tessOuterLo = float4(0,0,0,0);
-    tessOuterHi = float4(0,0,0,0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    if ((transitionMask & 4) != 0) {
-        tessOuterLo[0] = OsdComputeTessLevel(corners[0], midpoints[0]);
-        tessOuterHi[0] = OsdComputeTessLevel(corners[2], midpoints[0]);
-    } else {
-        tessOuterLo[0] = OsdComputeTessLevel(corners[0], corners[2]);
-    }
-    if ((transitionMask & 1) != 0) {
-        tessOuterLo[1] = OsdComputeTessLevel(corners[0], midpoints[1]);
-        tessOuterHi[1] = OsdComputeTessLevel(corners[1], midpoints[1]);
-    } else {
-        tessOuterLo[1] = OsdComputeTessLevel(corners[0], corners[1]);
-    }
-    if ((transitionMask & 2) != 0) {
-        tessOuterLo[2] = OsdComputeTessLevel(corners[2], midpoints[2]);
-        tessOuterHi[2] = OsdComputeTessLevel(corners[1], midpoints[2]);
-    } else {
-        tessOuterLo[2] = OsdComputeTessLevel(corners[1], corners[2]);
-    }
-}
-
-float3
-Osd_EvalBezierCurveMidPoint(float3 p0, float3 p1, float3 p2, float3 p3)
-{
-    //  Coefficients for the midpoint are { 1/8, 3/8, 3/8, 1/8 }:
-    return 0.125 * (p0 + p3) + 0.375 * (p1 + p2);
-}
-
-float3
-Osd_EvalQuarticBezierCurveMidPoint(float3 p0, float3 p1, float3 p2, float3 p3, float3 p4)
-{
-    //  Coefficients for the midpoint are { 1/16, 1/4, 3/8, 1/4, 1/16 }:
-    return 0.0625 * (p0 + p4) + 0.25 * (p1 + p3) + 0.375 * p2;
-}
-
-void
-OsdEvalPatchBezierTessLevels(OsdPerPatchVertexBezier cpBezier[16],
-                int3 patchParam, out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. When the patch control
-    // points have been converted to the Bezier basis, the control points
-    // at the four corners are on the limit surface (since a Bezier patch
-    // interpolates its corner control points). We can compute an adaptive
-    // tessellation level for transition edges on the limit surface by
-    // evaluating a limit position at the mid point of each transition edge.
-
-    tessOuterLo = float4(0,0,0,0);
-    tessOuterHi = float4(0,0,0,0);
-
-    float3 corners[4];
-    float3 midpoints[4];
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    corners[0] = OsdEvalBezier(cpBezier, patchParam, float2(0.0, 0.0));
-    corners[1] = OsdEvalBezier(cpBezier, patchParam, float2(1.0, 0.0));
-    corners[2] = OsdEvalBezier(cpBezier, patchParam, float2(1.0, 1.0));
-    corners[3] = OsdEvalBezier(cpBezier, patchParam, float2(0.0, 1.0));
-
-    midpoints[0] = ((transitionMask & 8) == 0) ? float3(0,0,0) :
-        OsdEvalBezier(cpBezier, patchParam, float2(0.0, 0.5));
-    midpoints[1] = ((transitionMask & 1) == 0) ? float3(0,0,0) :
-        OsdEvalBezier(cpBezier, patchParam, float2(0.5, 0.0));
-    midpoints[2] = ((transitionMask & 2) == 0) ? float3(0,0,0) :
-        OsdEvalBezier(cpBezier, patchParam, float2(1.0, 0.5));
-    midpoints[3] = ((transitionMask & 4) == 0) ? float3(0,0,0) :
-        OsdEvalBezier(cpBezier, patchParam, float2(0.5, 1.0));
-#else
-    corners[0] = cpBezier[ 0].P;
-    corners[1] = cpBezier[ 3].P;
-    corners[2] = cpBezier[15].P;
-    corners[3] = cpBezier[12].P;
-
-    midpoints[0] = ((transitionMask & 8) == 0) ? float3(0,0,0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[0].P, cpBezier[4].P, cpBezier[8].P, cpBezier[12].P);
-    midpoints[1] = ((transitionMask & 1) == 0) ? float3(0,0,0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[0].P, cpBezier[1].P, cpBezier[2].P, cpBezier[3].P);
-    midpoints[2] = ((transitionMask & 2) == 0) ? float3(0,0,0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[3].P, cpBezier[7].P, cpBezier[11].P, cpBezier[15].P);
-    midpoints[3] = ((transitionMask & 4) == 0) ? float3(0,0,0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[12].P, cpBezier[13].P, cpBezier[14].P, cpBezier[15].P);
-#endif
-
-    Osd_GetTessLevelsFromPatchBoundaries4(corners, midpoints,
-                                          patchParam, tessOuterLo, tessOuterHi);
-}
-
-void
-OsdEvalPatchBezierTriangleTessLevels(float3 cv[15],
-                int3 patchParam, out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. When the patch control
-    // points have been converted to the Bezier basis, the control points
-    // at the corners are on the limit surface (since a Bezier patch
-    // interpolates its corner control points). We can compute an adaptive
-    // tessellation level for transition edges on the limit surface by
-    // evaluating a limit position at the mid point of each transition edge.
-
-    tessOuterLo = float4(0,0,0,0);
-    tessOuterHi = float4(0,0,0,0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    float3 corners[3];
-    corners[0] = cv[0];
-    corners[1] = cv[4];
-    corners[2] = cv[14];
-
-    float3 midpoints[3];
-    midpoints[0] = ((transitionMask & 4) == 0) ? float3(0,0,0) :
-        Osd_EvalQuarticBezierCurveMidPoint(cv[0], cv[5], cv[9], cv[12], cv[14]);
-    midpoints[1] = ((transitionMask & 1) == 0) ? float3(0,0,0) :
-        Osd_EvalQuarticBezierCurveMidPoint(cv[0], cv[1], cv[2], cv[3], cv[4]);
-    midpoints[2] = ((transitionMask & 2) == 0) ? float3(0,0,0) :
-        Osd_EvalQuarticBezierCurveMidPoint(cv[4], cv[8], cv[11], cv[13], cv[14]);
-
-    Osd_GetTessLevelsFromPatchBoundaries3(corners, midpoints,
-                                          patchParam, tessOuterLo, tessOuterHi);
-}
-
-// Round up to the nearest even integer
-float OsdRoundUpEven(float x) {
-    return 2*ceil(x/2);
-}
-
-// Round up to the nearest odd integer
-float OsdRoundUpOdd(float x) {
-    return 2*ceil((x+1)/2)-1;
-}
-
-// Compute outer and inner tessellation levels taking into account the
-// current tessellation spacing mode.
-void
-OsdComputeTessLevels(inout float4 tessOuterLo, inout float4 tessOuterHi,
-                     out float4 tessLevelOuter, out float2 tessLevelInner)
-{
-    // Outer levels are the sum of the Lo and Hi segments where the Hi
-    // segments will have lengths of zero for non-transition edges.
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-    // Combine fractional outer transition edge levels before rounding.
-    float4 combinedOuter = tessOuterLo + tessOuterHi;
-
-    // Round the segments of transition edges separately. We will recover the
-    // fractional parameterization of transition edges after tessellation.
-
-    tessLevelOuter = combinedOuter;
-    if (tessOuterHi[0] > 0) {
-        tessLevelOuter[0] =
-            OsdRoundUpEven(tessOuterLo[0]) + OsdRoundUpEven(tessOuterHi[0]);
-    }
-    if (tessOuterHi[1] > 0) {
-        tessLevelOuter[1] =
-            OsdRoundUpEven(tessOuterLo[1]) + OsdRoundUpEven(tessOuterHi[1]);
-    }
-    if (tessOuterHi[2] > 0) {
-        tessLevelOuter[2] =
-            OsdRoundUpEven(tessOuterLo[2]) + OsdRoundUpEven(tessOuterHi[2]);
-    }
-    if (tessOuterHi[3] > 0) {
-        tessLevelOuter[3] =
-            OsdRoundUpEven(tessOuterLo[3]) + OsdRoundUpEven(tessOuterHi[3]);
-    }
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-    // Combine fractional outer transition edge levels before rounding.
-    float4 combinedOuter = tessOuterLo + tessOuterHi;
-
-    // Round the segments of transition edges separately. We will recover the
-    // fractional parameterization of transition edges after tessellation.
-    //
-    // The sum of the two outer odd segment lengths will be an even number
-    // which the tessellator will increase by +1 so that there will be a
-    // total odd number of segments. We clamp the combinedOuter tess levels
-    // (used to compute the inner tess levels) so that the outer transition
-    // edges will be sampled without degenerate triangles.
-
-    tessLevelOuter = combinedOuter;
-    if (tessOuterHi[0] > 0) {
-        tessLevelOuter[0] =
-            OsdRoundUpOdd(tessOuterLo[0]) + OsdRoundUpOdd(tessOuterHi[0]);
-        combinedOuter = max(float4(3,3,3,3), combinedOuter);
-    }
-    if (tessOuterHi[1] > 0) {
-        tessLevelOuter[1] =
-            OsdRoundUpOdd(tessOuterLo[1]) + OsdRoundUpOdd(tessOuterHi[1]);
-        combinedOuter = max(float4(3,3,3,3), combinedOuter);
-    }
-    if (tessOuterHi[2] > 0) {
-        tessLevelOuter[2] =
-            OsdRoundUpOdd(tessOuterLo[2]) + OsdRoundUpOdd(tessOuterHi[2]);
-        combinedOuter = max(float4(3,3,3,3), combinedOuter);
-    }
-    if (tessOuterHi[3] > 0) {
-        tessLevelOuter[3] =
-            OsdRoundUpOdd(tessOuterLo[3]) + OsdRoundUpOdd(tessOuterHi[3]);
-        combinedOuter = max(float4(3,3,3,3), combinedOuter);
-    }
-#else
-    // Round equally spaced transition edge levels before combining.
-    tessOuterLo = round(tessOuterLo);
-    tessOuterHi = round(tessOuterHi);
-
-    float4 combinedOuter = tessOuterLo + tessOuterHi;
-    tessLevelOuter = combinedOuter;
-#endif
-
-    // Inner levels are the averages the corresponding outer levels.
-    tessLevelInner[0] = (combinedOuter[1] + combinedOuter[3]) * 0.5;
-    tessLevelInner[1] = (combinedOuter[0] + combinedOuter[2]) * 0.5;
-}
-
-void
-OsdComputeTessLevelsTriangle(inout float4 tessOuterLo, inout float4 tessOuterHi,
-                         out float4 tessLevelOuter, out float2 tessLevelInner)
-{
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-
-    // Inner level is the max of the three outer levels.
-    tessLevelInner[0] = max(max(tessLevelOuter[0],
-                                tessLevelOuter[1]),
-                                tessLevelOuter[2]);
-}
-
-void
-OsdGetTessLevelsUniform(int3 patchParam,
-                 out float4 tessLevelOuter, out float2 tessLevelInner,
-                 out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    OsdGetTessLevelsUniform(patchParam, tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdGetTessLevelsUniformTriangle(int3 patchParam,
-                 out float4 tessLevelOuter, out float2 tessLevelInner,
-                 out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    OsdGetTessLevelsUniformTriangle(patchParam, tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevelsTriangle(tessOuterLo, tessOuterHi,
-                                 tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdEvalPatchBezierTessLevels(OsdPerPatchVertexBezier cpBezier[16],
-                 int3 patchParam,
-                 out float4 tessLevelOuter, out float2 tessLevelInner,
-                 out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    OsdEvalPatchBezierTessLevels(cpBezier, patchParam,
-                                 tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdEvalPatchBezierTriangleTessLevels(float3 cv[15],
-                 int3 patchParam,
-                 out float4 tessLevelOuter, out float2 tessLevelInner,
-                 out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    OsdEvalPatchBezierTriangleTessLevels(cv, patchParam,
-                                         tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevelsTriangle(tessOuterLo, tessOuterHi,
-                                 tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdGetTessLevelsAdaptiveRefinedPoints(float3 cpRefined[16], int3 patchParam,
-                 out float4 tessLevelOuter, out float2 tessLevelInner,
-                 out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    OsdGetTessLevelsRefinedPoints(cpRefined, patchParam,
-                                  tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-//  Deprecated -- prefer use of newer Bezier patch equivalend:
-void
-OsdGetTessLevelsLimitPoints(OsdPerPatchVertexBezier cpBezier[16],
-                 int3 patchParam, out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    OsdEvalPatchBezierTessLevels(cpBezier, patchParam, tessOuterLo, tessOuterHi);
-}
-
-//  Deprecated -- prefer use of newer Bezier patch equivalent:
-void
-OsdGetTessLevelsAdaptiveLimitPoints(OsdPerPatchVertexBezier cpBezier[16],
-                 int3 patchParam,
-                 out float4 tessLevelOuter, out float2 tessLevelInner,
-                 out float4 tessOuterLo, out float4 tessOuterHi)
-{
-    OsdGetTessLevelsLimitPoints(cpBezier, patchParam,
-                                tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-//  Deprecated -- prefer use of newer Bezier patch equivalent:
-void
-OsdGetTessLevels(float3 cp0, float3 cp1, float3 cp2, float3 cp3,
-                 int3 patchParam,
-                 out float4 tessLevelOuter, out float2 tessLevelInner)
-{
-    float4 tessOuterLo = float4(0,0,0,0);
-    float4 tessOuterHi = float4(0,0,0,0);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    tessOuterLo[0] = OsdComputeTessLevel(cp0, cp1);
-    tessOuterLo[1] = OsdComputeTessLevel(cp0, cp3);
-    tessOuterLo[2] = OsdComputeTessLevel(cp2, cp3);
-    tessOuterLo[3] = OsdComputeTessLevel(cp1, cp2);
-    tessOuterHi = float4(0,0,0,0);
-#else
-    OsdGetTessLevelsUniform(patchParam, tessOuterLo, tessOuterHi);
-#endif
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING || defined OSD_FRACTIONAL_ODD_SPACING
-float
-OsdGetTessFractionalSplit(float t, float level, float levelUp)
-{
-    // Fractional tessellation of an edge will produce n segments where n
-    // is the tessellation level of the edge (level) rounded up to the
-    // nearest even or odd integer (levelUp). There will be n-2 segments of
-    // equal length (dx1) and two additional segments of equal length (dx0)
-    // that are typically shorter than the other segments. The two additional
-    // segments should be placed symmetrically on opposite sides of the
-    // edge (offset).
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-    if (level <= 2) return t;
-
-    float base = pow(2.0,floor(log2(levelUp)));
-    float offset = 1.0/(int(2*base-levelUp)/2 & int(base/2-1));
-
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-    if (level <= 1) return t;
-
-    float base = pow(2.0,floor(log2(levelUp)));
-    float offset = 1.0/(((int(2*base-levelUp)/2+1) & int(base/2-1))+1);
-#endif
-
-    float dx0 = (1.0 - (levelUp-level)/2) / levelUp;
-    float dx1 = (1.0 - 2.0*dx0) / (levelUp - 2.0*ceil(dx0));
-
-    if (t < 0.5) {
-        float x = levelUp/2 - round(t*levelUp);
-        return 0.5 - (x*dx1 + int(x*offset > 1) * (dx0 - dx1));
-    } else if (t > 0.5) {
-        float x = round(t*levelUp) - levelUp/2;
-        return 0.5 + (x*dx1 + int(x*offset > 1) * (dx0 - dx1));
-    } else {
-        return t;
-    }
-}
-#endif
-
-float
-OsdGetTessTransitionSplit(float t, float lo, float hi)
-{
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-    float loRoundUp = OsdRoundUpEven(lo);
-    float hiRoundUp = OsdRoundUpEven(hi);
-
-    // Convert the parametric t into a segment index along the combined edge.
-    float ti = round(t * (loRoundUp + hiRoundUp));
-
-    if (ti <= loRoundUp) {
-        float t0 = ti / loRoundUp;
-        return OsdGetTessFractionalSplit(t0, lo, loRoundUp) * 0.5;
-    } else {
-        float t1 = (ti - loRoundUp) / hiRoundUp;
-        return OsdGetTessFractionalSplit(t1, hi, hiRoundUp) * 0.5 + 0.5;
-    }
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-    float loRoundUp = OsdRoundUpOdd(lo);
-    float hiRoundUp = OsdRoundUpOdd(hi);
-
-    // Convert the parametric t into a segment index along the combined edge.
-    // The +1 below is to account for the extra segment produced by the
-    // tessellator since the sum of two odd tess levels will be rounded
-    // up by one to the next odd integer tess level.
-    float ti = round(t * (loRoundUp + hiRoundUp + 1));
-
-    if (ti <= loRoundUp) {
-        float t0 = ti / loRoundUp;
-        return OsdGetTessFractionalSplit(t0, lo, loRoundUp) * 0.5;
-    } else if (ti > (loRoundUp+1)) {
-        float t1 = (ti - (loRoundUp+1)) / hiRoundUp;
-        return OsdGetTessFractionalSplit(t1, hi, hiRoundUp) * 0.5 + 0.5;
-    } else {
-        return 0.5;
-    }
-#else
-    // Convert the parametric t into a segment index along the combined edge.
-    float ti = round(t * (lo + hi));
-
-    if (ti <= lo) {
-        return (ti / lo) * 0.5;
-    } else {
-        return ((ti - lo) / hi) * 0.5 + 0.5;
-    }
-#endif
-}
-
-float2
-OsdGetTessParameterization(float2 p, float4 tessOuterLo, float4 tessOuterHi)
-{
-    float2 UV = p;
-    if (p.x == 0 && tessOuterHi[0] > 0) {
-        UV.y = OsdGetTessTransitionSplit(UV.y, tessOuterLo[0], tessOuterHi[0]);
-    } else
-    if (p.y == 0 && tessOuterHi[1] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[1], tessOuterHi[1]);
-    } else
-    if (p.x == 1 && tessOuterHi[2] > 0) {
-        UV.y = OsdGetTessTransitionSplit(UV.y, tessOuterLo[2], tessOuterHi[2]);
-    } else
-    if (p.y == 1 && tessOuterHi[3] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[3], tessOuterHi[3]);
-    }
-    return UV;
-}
-
-float2
-OsdGetTessParameterizationTriangle(float3 p, float4 tessOuterLo, float4 tessOuterHi)
-{
-    float2 UV = p.xy;
-    if (p.x == 0 && tessOuterHi[0] > 0) {
-        UV.y = OsdGetTessTransitionSplit(UV.y, tessOuterLo[0], tessOuterHi[0]);
-    } else
-    if (p.y == 0 && tessOuterHi[1] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[1], tessOuterHi[1]);
-    } else
-    if (p.z == 0 && tessOuterHi[2] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[2], tessOuterHi[2]);
-        UV.y = 1.0 - UV.x;
-    }
-    return UV;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchGregory.hlsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchGregory.hlsl
deleted file mode 100644
index fb4535f20..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchGregory.hlsl
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexGregory
-//----------------------------------------------------------
-
-void vs_main_patches( in InputVertex input,
-                      uint vID : SV_VertexID,
-                      out OsdPerVertexGregory output )
-{
-    OsdComputePerVertexGregory(vID, input.position, output);
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(input.position);
-}
-
-//----------------------------------------------------------
-// Patches.HullGregory
-//----------------------------------------------------------
-
-[domain("quad")]
-[partitioning(OSD_PARTITIONING)]
-[outputtopology("triangle_cw")]
-[outputcontrolpoints(4)]
-[patchconstantfunc("HSConstFunc")]
-OsdPerPatchVertexGregory hs_main_patches(
-    in InputPatch<OsdPerVertexGregory, 4> patch,
-    uint primitiveID : SV_PrimitiveID,
-    in uint ID : SV_OutputControlPointID )
-{
-    OsdPerPatchVertexGregory output;
-
-    OsdPerVertexGregory cv[4];
-    for (int i=0; i<4; ++i) {
-        cv[i] = patch[i];
-    }
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-    OsdComputePerPatchVertexGregory(patchParam, ID, primitiveID, cv, output);
-
-    return output;
-}
-
-HS_CONSTANT_FUNC_OUT HSConstFunc(
-    InputPatch<OsdPerVertexGregory, 4> patch,
-    OutputPatch<OsdPerPatchVertexGregory, 4> gregoryPatch,
-    uint primitiveID : SV_PrimitiveID)
-{
-    HS_CONSTANT_FUNC_OUT output;
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-
-    float4 tessLevelOuter = float4(0,0,0,0);
-    float2 tessLevelInner = float2(0,0);
-    float4 tessOuterLo = float4(0,0,0,0);
-    float4 tessOuterHi = float4(0,0,0,0);
-
-    OSD_PATCH_CULL(4);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Gather bezier control points to compute limit surface tess levels
-    OsdPerPatchVertexBezier bezcv[16];
-    bezcv[ 0].P = gregoryPatch[0].P;
-    bezcv[ 1].P = gregoryPatch[0].Ep;
-    bezcv[ 2].P = gregoryPatch[1].Em;
-    bezcv[ 3].P = gregoryPatch[1].P;
-    bezcv[ 4].P = gregoryPatch[0].Em;
-    bezcv[ 5].P = gregoryPatch[0].Fp;
-    bezcv[ 6].P = gregoryPatch[1].Fm;
-    bezcv[ 7].P = gregoryPatch[1].Ep;
-    bezcv[ 8].P = gregoryPatch[3].Ep;
-    bezcv[ 9].P = gregoryPatch[3].Fm;
-    bezcv[10].P = gregoryPatch[2].Fp;
-    bezcv[11].P = gregoryPatch[2].Em;
-    bezcv[12].P = gregoryPatch[3].P;
-    bezcv[13].P = gregoryPatch[3].Em;
-    bezcv[14].P = gregoryPatch[2].Ep;
-    bezcv[15].P = gregoryPatch[2].P;
-
-    OsdEvalPatchBezierTessLevels(bezcv, patchParam,
-                                 tessLevelOuter, tessLevelInner,
-                                 tessOuterLo, tessOuterHi);
-#else
-    OsdGetTessLevelsUniform(patchParam, tessLevelOuter, tessLevelInner,
-                     tessOuterLo, tessOuterHi);
-
-#endif
-
-    output.tessLevelOuter[0] = tessLevelOuter[0];
-    output.tessLevelOuter[1] = tessLevelOuter[1];
-    output.tessLevelOuter[2] = tessLevelOuter[2];
-    output.tessLevelOuter[3] = tessLevelOuter[3];
-
-    output.tessLevelInner[0] = tessLevelInner[0];
-    output.tessLevelInner[1] = tessLevelInner[1];
-
-    output.tessOuterLo = tessOuterLo;
-    output.tessOuterHi = tessOuterHi;
-
-
-    return output;
-}
-
-//----------------------------------------------------------
-// Patches.DomainGregory
-//----------------------------------------------------------
-
-[domain("quad")]
-void ds_main_patches(
-    in HS_CONSTANT_FUNC_OUT input,
-    in OutputPatch<OsdPerPatchVertexGregory, 4> patch,
-    in float2 domainCoord : SV_DomainLocation,
-    out OutputVertex output )
-{
-    float3 P = float3(0,0,0), dPu = float3(0,0,0), dPv = float3(0,0,0);
-    float3 N = float3(0,0,0), dNu = float3(0,0,0), dNv = float3(0,0,0);
-
-    float3 cv[20];
-    cv[0] = patch[0].P;
-    cv[1] = patch[0].Ep;
-    cv[2] = patch[0].Em;
-    cv[3] = patch[0].Fp;
-    cv[4] = patch[0].Fm;
-
-    cv[5] = patch[1].P;
-    cv[6] = patch[1].Ep;
-    cv[7] = patch[1].Em;
-    cv[8] = patch[1].Fp;
-    cv[9] = patch[1].Fm;
-
-    cv[10] = patch[2].P;
-    cv[11] = patch[2].Ep;
-    cv[12] = patch[2].Em;
-    cv[13] = patch[2].Fp;
-    cv[14] = patch[2].Fm;
-
-    cv[15] = patch[3].P;
-    cv[16] = patch[3].Ep;
-    cv[17] = patch[3].Em;
-    cv[18] = patch[3].Fp;
-    cv[19] = patch[3].Fm;
-
-    float2 UV = OsdGetTessParameterization(domainCoord,
-                                           input.tessOuterLo,
-                                           input.tessOuterHi);
-
-    int3 patchParam = patch[0].patchParam;
-    OsdEvalPatchGregory(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    output.position = mul(OsdModelViewMatrix(), float4(P, 1.0f));
-    output.normal = mul(OsdModelViewMatrix(), float4(N, 0.0f)).xyz;
-    output.tangent = mul(OsdModelViewMatrix(), float4(dPu, 0.0f)).xyz;
-    output.bitangent = mul(OsdModelViewMatrix(), float4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-
-    output.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    output.positionOut = mul(OsdProjectionMatrix(), output.position);
-    output.edgeDistance = 0;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchGregoryBasis.hlsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchGregoryBasis.hlsl
deleted file mode 100644
index 1462b27b0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchGregoryBasis.hlsl
+++ /dev/null
@@ -1,166 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexGregoryBasis
-//----------------------------------------------------------
-
-void vs_main_patches( in InputVertex input,
-                      out HullVertex output )
-{
-    output.position = input.position;
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(input.position);
-}
-
-//----------------------------------------------------------
-// Patches.HullGregoryBasis
-//----------------------------------------------------------
-
-[domain("quad")]
-[partitioning(OSD_PARTITIONING)]
-[outputtopology("triangle_cw")]
-[outputcontrolpoints(20)]
-[patchconstantfunc("HSConstFunc")]
-OsdPerPatchVertexGregoryBasis hs_main_patches(
-    in InputPatch<HullVertex, 20> patch,
-    uint primitiveID : SV_PrimitiveID,
-    in uint ID : SV_OutputControlPointID )
-{
-    OsdPerPatchVertexGregoryBasis output;
-
-    float3 cv = patch[ID].position.xyz;
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-    OsdComputePerPatchVertexGregoryBasis(patchParam, ID, cv, output);
-
-    return output;
-}
-
-HS_CONSTANT_FUNC_OUT
-HSConstFunc(
-    InputPatch<HullVertex, 20> patch,
-    uint primitiveID : SV_PrimitiveID)
-{
-    HS_CONSTANT_FUNC_OUT output;
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-
-    float4 tessLevelOuter = float4(0,0,0,0);
-    float2 tessLevelInner = float2(0,0);
-    float4 tessOuterLo = float4(0,0,0,0);
-    float4 tessOuterHi = float4(0,0,0,0);
-
-    OSD_PATCH_CULL(20);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Gather bezier control points to compute limit surface tess levels
-    OsdPerPatchVertexBezier bezcv[16];
-    bezcv[ 0].P = patch[ 0].position.xyz;
-    bezcv[ 1].P = patch[ 1].position.xyz;
-    bezcv[ 2].P = patch[ 7].position.xyz;
-    bezcv[ 3].P = patch[ 5].position.xyz;
-    bezcv[ 4].P = patch[ 2].position.xyz;
-    bezcv[ 5].P = patch[ 3].position.xyz;
-    bezcv[ 6].P = patch[ 8].position.xyz;
-    bezcv[ 7].P = patch[ 6].position.xyz;
-    bezcv[ 8].P = patch[16].position.xyz;
-    bezcv[ 9].P = patch[18].position.xyz;
-    bezcv[10].P = patch[13].position.xyz;
-    bezcv[11].P = patch[12].position.xyz;
-    bezcv[12].P = patch[15].position.xyz;
-    bezcv[13].P = patch[17].position.xyz;
-    bezcv[14].P = patch[11].position.xyz;
-    bezcv[15].P = patch[10].position.xyz;
-
-    OsdEvalPatchBezierTessLevels(
-                bezcv, patchParam,
-                tessLevelOuter, tessLevelInner,
-                tessOuterLo, tessOuterHi);
-#else
-    OsdGetTessLevelsUniform(
-                patchParam,
-                tessLevelOuter, tessLevelInner,
-                tessOuterLo, tessOuterHi);
-#endif
-
-    output.tessLevelOuter[0] = tessLevelOuter[0];
-    output.tessLevelOuter[1] = tessLevelOuter[1];
-    output.tessLevelOuter[2] = tessLevelOuter[2];
-    output.tessLevelOuter[3] = tessLevelOuter[3];
-
-    output.tessLevelInner[0] = tessLevelInner[0];
-    output.tessLevelInner[1] = tessLevelInner[1];
-
-    output.tessOuterLo = tessOuterLo;
-    output.tessOuterHi = tessOuterHi;
-
-    return output;
-}
-
-//----------------------------------------------------------
-// Patches.DomainGregoryBasis
-//----------------------------------------------------------
-
-[domain("quad")]
-void ds_main_patches(
-    in HS_CONSTANT_FUNC_OUT input,
-    in OutputPatch<OsdPerPatchVertexGregoryBasis, 20> patch,
-    in float2 domainCoord : SV_DomainLocation,
-    out OutputVertex output )
-{
-    float3 P = float3(0,0,0), dPu = float3(0,0,0), dPv = float3(0,0,0);
-    float3 N = float3(0,0,0), dNu = float3(0,0,0), dNv = float3(0,0,0);
-
-    float3 cv[20];
-    for (int i = 0; i < 20; ++i) {
-        cv[i] = patch[i].P;
-    }
-
-    float2 UV = OsdGetTessParameterization(domainCoord,
-                                           input.tessOuterLo,
-                                           input.tessOuterHi);
-
-    int3 patchParam = patch[0].patchParam;
-    OsdEvalPatchGregory(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    output.position = mul(OsdModelViewMatrix(), float4(P, 1.0f));
-    output.normal = mul(OsdModelViewMatrix(), float4(N, 0.0f)).xyz;
-    output.tangent = mul(OsdModelViewMatrix(), float4(dPu, 0.0f)).xyz;
-    output.bitangent = mul(OsdModelViewMatrix(), float4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-#if defined OSD_PATCH_ENABLE_SINGLE_CREASE
-    output.vSegments = float2(0,0);
-#endif
-
-    output.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    output.positionOut = mul(OsdProjectionMatrix(), output.position);
-    output.edgeDistance = 0;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchGregoryTriangle.hlsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchGregoryTriangle.hlsl
deleted file mode 100644
index 41e9aeac5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchGregoryTriangle.hlsl
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-//   Copyright 2019 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.VertexGregoryTriangle
-//----------------------------------------------------------
-
-void vs_main_patches( in InputVertex input,
-                      out HullVertex output )
-{
-    output.position = input.position;
-    OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(input.position);
-}
-
-//----------------------------------------------------------
-// Patches.HullGregoryTriangle
-//----------------------------------------------------------
-
-[domain("tri")]
-[partitioning(OSD_PARTITIONING)]
-[outputtopology("triangle_cw")]
-[outputcontrolpoints(18)]
-[patchconstantfunc("HSConstFunc")]
-OsdPerPatchVertexGregoryBasis hs_main_patches(
-    in InputPatch<HullVertex, 18> patch,
-    uint primitiveID : SV_PrimitiveID,
-    in uint ID : SV_OutputControlPointID )
-{
-    OsdPerPatchVertexGregoryBasis output;
-
-    float3 cv = patch[ID].position.xyz;
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-    OsdComputePerPatchVertexGregoryBasis(patchParam, ID, cv, output);
-
-    return output;
-}
-
-HS_CONSTANT_FUNC_TRIANGLE_OUT
-HSConstFunc(
-    InputPatch<HullVertex, 18> patch,
-    uint primitiveID : SV_PrimitiveID)
-{
-    HS_CONSTANT_FUNC_TRIANGLE_OUT output;
-
-    int3 patchParam = OsdGetPatchParam(OsdGetPatchIndex(primitiveID));
-
-    float4 tessLevelOuter = float4(0,0,0,0);
-    float2 tessLevelInner = float2(0,0);
-    float4 tessOuterLo = float4(0,0,0,0);
-    float4 tessOuterHi = float4(0,0,0,0);
-
-    OSD_PATCH_CULL_TRIANGLE(18);
-
-#if defined OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Gather bezier control points to compute limit surface tess levels
-    float3 cv[15];
-    cv[ 0] = patch[ 0].position.xyz;
-    cv[ 1] = patch[ 1].position.xyz;
-    cv[ 2] = patch[15].position.xyz;
-    cv[ 3] = patch[ 7].position.xyz;
-    cv[ 4] = patch[ 5].position.xyz;
-    cv[ 5] = patch[ 2].position.xyz;
-    cv[ 6] = patch[ 3].position.xyz;
-    cv[ 7] = patch[ 8].position.xyz;
-    cv[ 8] = patch[ 6].position.xyz;
-    cv[ 9] = patch[17].position.xyz;
-    cv[10] = patch[13].position.xyz;
-    cv[11] = patch[16].position.xyz;
-    cv[12] = patch[11].position.xyz;
-    cv[13] = patch[12].position.xyz;
-    cv[14] = patch[10].position.xyz;
-
-    OsdEvalPatchBezierTriangleTessLevels(
-                cv, patchParam,
-                tessLevelOuter, tessLevelInner,
-                tessOuterLo, tessOuterHi);
-#else
-    OsdGetTessLevelsUniformTriangle(
-                patchParam,
-                tessLevelOuter, tessLevelInner,
-                tessOuterLo, tessOuterHi);
-#endif
-
-    output.tessLevelOuter[0] = tessLevelOuter[0];
-    output.tessLevelOuter[1] = tessLevelOuter[1];
-    output.tessLevelOuter[2] = tessLevelOuter[2];
-
-    output.tessLevelInner[0] = tessLevelInner[0];
-
-    output.tessOuterLo = tessOuterLo;
-    output.tessOuterHi = tessOuterHi;
-
-    return output;
-}
-
-//----------------------------------------------------------
-// Patches.DomainGregoryTriangle
-//----------------------------------------------------------
-
-[domain("tri")]
-void ds_main_patches(
-    in HS_CONSTANT_FUNC_TRIANGLE_OUT input,
-    in OutputPatch<OsdPerPatchVertexBezier, 18> patch,
-    in float3 domainCoord : SV_DomainLocation,
-    out OutputVertex output )
-{
-    float3 P = float3(0,0,0), dPu = float3(0,0,0), dPv = float3(0,0,0);
-    float3 N = float3(0,0,0), dNu = float3(0,0,0), dNv = float3(0,0,0);
-
-    float3 cv[18];
-    for (int i = 0; i < 18; ++i) {
-        cv[i] = patch[i].P;
-    }
-
-    float2 UV = OsdGetTessParameterizationTriangle(domainCoord,
-                                                   input.tessOuterLo,
-                                                   input.tessOuterHi);
-
-    int3 patchParam = patch[0].patchParam;
-    OsdEvalPatchGregoryTriangle(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    output.position = mul(OsdModelViewMatrix(), float4(P, 1.0f));
-    output.normal = mul(OsdModelViewMatrix(), float4(N, 0.0f)).xyz;
-    output.tangent = mul(OsdModelViewMatrix(), float4(dPu, 0.0f)).xyz;
-    output.bitangent = mul(OsdModelViewMatrix(), float4(dPv, 0.0f)).xyz;
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-
-    output.patchCoord = OsdInterpolatePatchCoordTriangle(UV, patchParam);
-
-    OSD_DISPLACEMENT_CALLBACK;
-
-    output.positionOut = mul(OsdProjectionMatrix(), output.position);
-    output.edgeDistance = 0;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchLegacy.hlsl b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchLegacy.hlsl
deleted file mode 100644
index 606291ea1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchLegacy.hlsl
+++ /dev/null
@@ -1,404 +0,0 @@
-//
-//   Copyright 2013-2019 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-// ----------------------------------------------------------------------------
-// Legacy Gregory
-// ----------------------------------------------------------------------------
-#if defined(OSD_PATCH_GREGORY) || defined(OSD_PATCH_GREGORY_BOUNDARY)
-
-#define M_PI 3.14159265359f
-
-// precomputed catmark coefficient table up to valence 29
-static float OsdCatmarkCoefficient[30] = {
-    0, 0, 0, 0.812816, 0.500000, 0.363644, 0.287514,
-    0.238688, 0.204544, 0.179229, 0.159657,
-    0.144042, 0.131276, 0.120632, 0.111614,
-    0.103872, 0.09715, 0.0912559, 0.0860444,
-    0.0814022, 0.0772401, 0.0734867, 0.0700842,
-    0.0669851, 0.0641504, 0.0615475, 0.0591488,
-    0.0569311, 0.0548745, 0.0529621
-};
-
-float
-OsdComputeCatmarkCoefficient(int valence)
-{
-#if OSD_MAX_VALENCE < 30
-    return OsdCatmarkCoefficient[valence];
-#else
-    if (valence < 30) {
-        return OsdCatmarkCoefficient[valence];
-    } else {
-        float t = 2.0f * float(M_PI) / float(valence);
-        return 1.0f / (valence * (cos(t) + 5.0f +
-                                  sqrt((cos(t) + 9) * (cos(t) + 1)))/16.0f);
-    }
-#endif
-}
-
-float cosfn(int n, int j) {
-    return cos((2.0f * M_PI * j)/float(n));
-}
-
-float sinfn(int n, int j) {
-    return sin((2.0f * M_PI * j)/float(n));
-}
-
-#if !defined OSD_MAX_VALENCE || OSD_MAX_VALENCE < 1
-#undef OSD_MAX_VALENCE
-#define OSD_MAX_VALENCE 4
-#endif
-
-struct OsdPerVertexGregory {
-    float3 P : POSITION0;
-    int3 clipFlag : CLIPFLAG;
-    int valence : BLENDINDICE0;
-    float3 e0 : POSITION1;
-    float3 e1 : POSITION2;
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    int zerothNeighbor : BLENDINDICE1;
-    float3 org : POSITION3;
-#endif
-    float3 r[OSD_MAX_VALENCE] : POSITION4;
-};
-
-struct OsdPerPatchVertexGregory {
-    int3   patchParam: PATCHPARAM;
-    float3 P : POSITION0;
-    float3 Ep : POSITION1;
-    float3 Em : POSITION2;
-    float3 Fp : POSITION3;
-    float3 Fm : POSITION4;
-};
-
-#ifndef OSD_NUM_ELEMENTS
-#define OSD_NUM_ELEMENTS 3
-#endif
-
-Buffer<float> OsdVertexBuffer : register( t2 );
-Buffer<int> OsdValenceBuffer : register( t3 );
-
-float3 OsdReadVertex(int vertexIndex)
-{
-    int index = int(OSD_NUM_ELEMENTS * (vertexIndex /*+ OsdBaseVertex()*/));
-    return float3(OsdVertexBuffer[index],
-                  OsdVertexBuffer[index+1],
-                  OsdVertexBuffer[index+2]);
-}
-
-int OsdReadVertexValence(int vertexID)
-{
-    int index = int(vertexID * (2 * OSD_MAX_VALENCE + 1));
-    return OsdValenceBuffer[index];
-}
-
-int OsdReadVertexIndex(int vertexID, int valenceVertex)
-{
-    int index = int(vertexID * (2 * OSD_MAX_VALENCE + 1) + 1 + valenceVertex);
-    return OsdValenceBuffer[index];
-}
-
-Buffer<int> OsdQuadOffsetBuffer : register( t4 );
-
-int OsdReadQuadOffset(int primitiveID, int offsetVertex)
-{
-    int index = int(4*primitiveID+OsdGregoryQuadOffsetBase() + offsetVertex);
-    return OsdQuadOffsetBuffer[index];
-}
-
-void
-OsdComputePerVertexGregory(int vID, float3 P, out OsdPerVertexGregory v)
-{
-    v.clipFlag = int3(0,0,0);
-
-    int ivalence = OsdReadVertexValence(vID);
-    v.valence = ivalence;
-    int valence = abs(ivalence);
-
-    float3 f[OSD_MAX_VALENCE];
-    float3 pos = P;
-    float3 opos = float3(0,0,0);
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    v.org = pos;
-    int boundaryEdgeNeighbors[2];
-    int currNeighbor = 0;
-    int ibefore = 0;
-    int zerothNeighbor = 0;
-#endif
-
-    for (int i=0; i<valence; ++i) {
-        int im = (i+valence-1)%valence;
-        int ip = (i+1)%valence;
-
-        int idx_neighbor = OsdReadVertexIndex(vID, 2*i);
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-        bool isBoundaryNeighbor = false;
-        int valenceNeighbor = OsdReadVertexValence(idx_neighbor);
-
-        if (valenceNeighbor < 0) {
-            isBoundaryNeighbor = true;
-            if (currNeighbor<2) {
-                boundaryEdgeNeighbors[currNeighbor] = idx_neighbor;
-            }
-            currNeighbor++;
-            if (currNeighbor == 1) {
-                ibefore = i;
-                zerothNeighbor = i;
-            } else {
-                if (i-ibefore == 1) {
-                    int tmp = boundaryEdgeNeighbors[0];
-                    boundaryEdgeNeighbors[0] = boundaryEdgeNeighbors[1];
-                    boundaryEdgeNeighbors[1] = tmp;
-                    zerothNeighbor = i;
-                }
-            }
-        }
-#endif
-
-        float3 neighbor = OsdReadVertex(idx_neighbor);
-
-        int idx_diagonal = OsdReadVertexIndex(vID, 2*i + 1);
-        float3 diagonal = OsdReadVertex(idx_diagonal);
-
-        int idx_neighbor_p = OsdReadVertexIndex(vID, 2*ip);
-        float3 neighbor_p = OsdReadVertex(idx_neighbor_p);
-
-        int idx_neighbor_m = OsdReadVertexIndex(vID, 2*im);
-        float3 neighbor_m = OsdReadVertex(idx_neighbor_m);
-
-        int idx_diagonal_m = OsdReadVertexIndex(vID, 2*im + 1);
-        float3 diagonal_m = OsdReadVertex(idx_diagonal_m);
-
-        f[i] = (pos * float(valence) + (neighbor_p + neighbor)*2.0f + diagonal) / (float(valence)+5.0f);
-
-        opos += f[i];
-        v.r[i] = (neighbor_p-neighbor_m)/3.0f + (diagonal - diagonal_m)/6.0f;
-    }
-
-    opos /= valence;
-    v.P = float4(opos, 1.0f).xyz;
-
-    float3 e;
-    v.e0 = float3(0,0,0);
-    v.e1 = float3(0,0,0);
-
-    for(int iv=0; iv<valence; ++iv) {
-        int im = (iv + valence -1) % valence;
-        e = 0.5f * (f[iv] + f[im]);
-        v.e0 += cosfn(valence, iv)*e;
-        v.e1 += sinfn(valence, iv)*e;
-    }
-    float ef = OsdComputeCatmarkCoefficient(valence);
-    v.e0 *= ef;
-    v.e1 *= ef;
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    v.zerothNeighbor = zerothNeighbor;
-    if (currNeighbor == 1) {
-        boundaryEdgeNeighbors[1] = boundaryEdgeNeighbors[0];
-    }
-
-    if (ivalence < 0) {
-        if (valence > 2) {
-            v.P = (OsdReadVertex(boundaryEdgeNeighbors[0]) +
-                   OsdReadVertex(boundaryEdgeNeighbors[1]) +
-                   4.0f * pos)/6.0f;
-        } else {
-            v.P = pos;
-        }
-
-        v.e0 = (OsdReadVertex(boundaryEdgeNeighbors[0]) -
-                OsdReadVertex(boundaryEdgeNeighbors[1]))/6.0;
-
-        float k = float(float(valence) - 1.0f);    //k is the number of faces
-        float c = cos(M_PI/k);
-        float s = sin(M_PI/k);
-        float gamma = -(4.0f*s)/(3.0f*k+c);
-        float alpha_0k = -((1.0f+2.0f*c)*sqrt(1.0f+c))/((3.0f*k+c)*sqrt(1.0f-c));
-        float beta_0 = s/(3.0f*k + c);
-
-        int idx_diagonal = OsdReadVertexIndex(vID, 2*zerothNeighbor + 1);
-        float3 diagonal = OsdReadVertex(idx_diagonal);
-
-        v.e1 = gamma * pos +
-            alpha_0k * OsdReadVertex(boundaryEdgeNeighbors[0]) +
-            alpha_0k * OsdReadVertex(boundaryEdgeNeighbors[1]) +
-            beta_0 * diagonal;
-
-        for (int x=1; x<valence - 1; ++x) {
-            int curri = ((x + zerothNeighbor)%valence);
-            float alpha = (4.0f*sin((M_PI * float(x))/k))/(3.0f*k+c);
-            float beta = (sin((M_PI * float(x))/k) + sin((M_PI * float(x+1))/k))/(3.0f*k+c);
-
-            int idx_neighbor = OsdReadVertexIndex(vID, 2*curri);
-            float3 neighbor = OsdReadVertex(idx_neighbor);
-
-            idx_diagonal = OsdReadVertexIndex(vID, 2*curri + 1);
-            diagonal = OsdReadVertex(idx_diagonal);
-
-            v.e1 += alpha * neighbor + beta * diagonal;
-        }
-
-        v.e1 /= 3.0f;
-    }
-#endif
-}
-
-void
-OsdComputePerPatchVertexGregory(int3 patchParam, int ID, int primitiveID,
-                                in OsdPerVertexGregory v[4],
-                                out OsdPerPatchVertexGregory result)
-{
-    result.patchParam = patchParam;
-    result.P = v[ID].P;
-
-    int i = ID;
-    int ip = (i+1)%4;
-    int im = (i+3)%4;
-    int valence = abs(v[i].valence);
-    int n = valence;
-
-    int start = OsdReadQuadOffset(primitiveID, i) & 0xff;
-    int prev = (OsdReadQuadOffset(primitiveID, i) >> 8) & 0xff;
-
-    int start_m = OsdReadQuadOffset(primitiveID, im) & 0xff;
-    int prev_p = (OsdReadQuadOffset(primitiveID, ip) >> 8) & 0xff;
-
-    int np = abs(v[ip].valence);
-    int nm = abs(v[im].valence);
-
-    // Control Vertices based on :
-    // "Approximating Subdivision Surfaces with Gregory Patches
-    //  for Hardware Tessellation"
-    // Loop, Schaefer, Ni, Castano (ACM ToG Siggraph Asia 2009)
-    //
-    //  P3         e3-      e2+         P2
-    //     O--------O--------O--------O
-    //     |        |        |        |
-    //     |        |        |        |
-    //     |        | f3-    | f2+    |
-    //     |        O        O        |
-    // e3+ O------O            O------O e2-
-    //     |     f3+          f2-     |
-    //     |                          |
-    //     |                          |
-    //     |      f0-         f1+     |
-    // e0- O------O            O------O e1+
-    //     |        O        O        |
-    //     |        | f0+    | f1-    |
-    //     |        |        |        |
-    //     |        |        |        |
-    //     O--------O--------O--------O
-    //  P0         e0+      e1-         P1
-    //
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    float3 Em_ip;
-    if (v[ip].valence < -2) {
-        int j = (np + prev_p - v[ip].zerothNeighbor) % np;
-        Em_ip = v[ip].P + cos((M_PI*j)/float(np-1))*v[ip].e0 + sin((M_PI*j)/float(np-1))*v[ip].e1;
-    } else {
-        Em_ip = v[ip].P + v[ip].e0*cosfn(np, prev_p) + v[ip].e1*sinfn(np, prev_p);
-    }
-
-    float3 Ep_im;
-    if (v[im].valence < -2) {
-        int j = (nm + start_m - v[im].zerothNeighbor) % nm;
-        Ep_im = v[im].P + cos((M_PI*j)/float(nm-1))*v[im].e0 + sin((M_PI*j)/float(nm-1))*v[im].e1;
-    } else {
-        Ep_im = v[im].P + v[im].e0*cosfn(nm, start_m) + v[im].e1*sinfn(nm, start_m);
-    }
-
-    if (v[i].valence < 0) {
-        n = (n-1)*2;
-    }
-    if (v[im].valence < 0) {
-        nm = (nm-1)*2;
-    }
-    if (v[ip].valence < 0) {
-        np = (np-1)*2;
-    }
-
-    if (v[i].valence > 2) {
-        result.Ep = v[i].P + (v[i].e0*cosfn(n, start) + v[i].e1*sinfn(n, start));
-        result.Em = v[i].P + (v[i].e0*cosfn(n, prev) +  v[i].e1*sinfn(n, prev));
-
-        float s1=3-2*cosfn(n,1)-cosfn(np,1);
-        float s2=2*cosfn(n,1);
-
-        result.Fp = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-        s1 = 3.0f-2.0f*cos(2.0f*M_PI/float(n))-cos(2.0f*M_PI/float(nm));
-        result.Fm = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-
-    } else if (v[i].valence < -2) {
-        int j = (valence + start - v[i].zerothNeighbor) % valence;
-
-        result.Ep = v[i].P + cos((M_PI*j)/float(valence-1))*v[i].e0 + sin((M_PI*j)/float(valence-1))*v[i].e1;
-        j = (valence + prev - v[i].zerothNeighbor) % valence;
-        result.Em = v[i].P + cos((M_PI*j)/float(valence-1))*v[i].e0 + sin((M_PI*j)/float(valence-1))*v[i].e1;
-
-        float3 Rp = ((-2.0f * v[i].org - 1.0f * v[im].org) + (2.0f * v[ip].org + 1.0f * v[(i+2)%4].org))/3.0f;
-        float3 Rm = ((-2.0f * v[i].org - 1.0f * v[ip].org) + (2.0f * v[im].org + 1.0f * v[(i+2)%4].org))/3.0f;
-
-        float s1 = 3-2*cosfn(n,1)-cosfn(np,1);
-        float s2 = 2*cosfn(n,1);
-
-        result.Fp = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-        s1 = 3.0f-2.0f*cos(2.0f*M_PI/float(n))-cos(2.0f*M_PI/float(nm));
-        result.Fm = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-
-        if (v[im].valence < 0) {
-            s1 = 3-2*cosfn(n,1)-cosfn(np,1);
-            result.Fp = result.Fm = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-        } else if (v[ip].valence < 0) {
-            s1 = 3.0f-2.0f*cos(2.0f*M_PI/n)-cos(2.0f*M_PI/nm);
-            result.Fm = result.Fp = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-        }
-
-    } else if (v[i].valence == -2) {
-        result.Ep = (2.0f * v[i].org + v[ip].org)/3.0f;
-        result.Em = (2.0f * v[i].org + v[im].org)/3.0f;
-        result.Fp = result.Fm = (4.0f * v[i].org + v[(i+2)%n].org + 2.0f * v[ip].org + 2.0f * v[im].org)/9.0f;
-    }
-
-#else // not OSD_PATCH_GREGORY_BOUNDARY
-
-    result.Ep = v[i].P + v[i].e0 * cosfn(n, start) + v[i].e1*sinfn(n, start);
-    result.Em = v[i].P + v[i].e0 * cosfn(n, prev ) + v[i].e1*sinfn(n, prev );
-
-    float3 Em_ip = v[ip].P + v[ip].e0*cosfn(np, prev_p) + v[ip].e1*sinfn(np, prev_p);
-    float3 Ep_im = v[im].P + v[im].e0*cosfn(nm, start_m) + v[im].e1*sinfn(nm, start_m);
-
-    float s1 = 3-2*cosfn(n,1)-cosfn(np,1);
-    float s2 = 2*cosfn(n,1);
-
-    result.Fp = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-    s1 = 3.0f-2.0f*cos(2.0f*M_PI/float(n))-cos(2.0f*M_PI/float(nm));
-    result.Fm = (cosfn(nm,1)*v[i].P + s1*result.Em +s2*Ep_im - v[i].r[prev])/3.0f;
-
-#endif
-}
-
-#endif  // OSD_PATCH_GREGORY || OSD_PATCH_GREGORY_BOUNDARY
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchShaderSource.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchShaderSource.cpp
deleted file mode 100644
index 6a3bba496..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchShaderSource.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/hlslPatchShaderSource.h"
-#include "../far/error.h"
-
-#include <sstream>
-#include <string>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-static const char *commonShaderSource =
-#include "hlslPatchCommon.gen.h"
-;
-static const char *commonTessShaderSource =
-#include "hlslPatchCommonTess.gen.h"
-;
-static const char *patchLegacyShaderSource =
-#include "hlslPatchLegacy.gen.h"
-;
-static const char *patchBasisTypesShaderSource =
-#include "patchBasisCommonTypes.gen.h"
-;
-static const char *patchBasisShaderSource =
-#include "patchBasisCommon.gen.h"
-;
-static const char *patchBasisEvalShaderSource =
-#include "patchBasisCommonEval.gen.h"
-;
-static const char *boxSplineTriangleShaderSource =
-#include "hlslPatchBoxSplineTriangle.gen.h"
-;
-static const char *bsplineShaderSource =
-#include "hlslPatchBSpline.gen.h"
-;
-static const char *gregoryShaderSource =
-#include "hlslPatchGregory.gen.h"
-;
-static const char *gregoryBasisShaderSource =
-#include "hlslPatchGregoryBasis.gen.h"
-;
-static const char *gregoryTriangleShaderSource =
-#include "hlslPatchGregoryTriangle.gen.h"
-;
-
-/*static*/
-std::string
-HLSLPatchShaderSource::GetCommonShaderSource() {
-    std::stringstream ss;
-    ss << std::string(commonShaderSource);
-    ss << std::string(commonTessShaderSource);
-    ss << std::string(patchLegacyShaderSource);
-    return ss.str();
-}
-
-/*static*/
-std::string
-HLSLPatchShaderSource::GetPatchBasisShaderSource() {
-    std::stringstream ss;
-#if defined(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES)
-    ss << "#define OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES\n";
-#endif
-    ss << std::string(patchBasisTypesShaderSource);
-    ss << std::string(patchBasisShaderSource);
-    ss << std::string(patchBasisEvalShaderSource);
-    return ss.str();
-}
-
-/*static*/
-std::string
-HLSLPatchShaderSource::GetVertexShaderSource(Far::PatchDescriptor::Type type) {
-    switch (type) {
-    case Far::PatchDescriptor::REGULAR:
-        return bsplineShaderSource;
-    case Far::PatchDescriptor::LOOP:
-        return boxSplineTriangleShaderSource;
-    case Far::PatchDescriptor::GREGORY:
-        return gregoryShaderSource;
-    case Far::PatchDescriptor::GREGORY_BOUNDARY:
-        return std::string("#define OSD_PATCH_GREGORY_BOUNDRY\n")
-             + std::string(gregoryShaderSource);
-    case Far::PatchDescriptor::GREGORY_BASIS:
-        return gregoryBasisShaderSource;
-    case Far::PatchDescriptor::GREGORY_TRIANGLE:
-        return gregoryTriangleShaderSource;
-    default:
-        break;  // returns empty (points, lines, quads, ...)
-    }
-    return std::string();
-}
-
-/*static*/
-std::string
-HLSLPatchShaderSource::GetHullShaderSource(Far::PatchDescriptor::Type type) {
-    switch (type) {
-    case Far::PatchDescriptor::REGULAR:
-        return bsplineShaderSource;
-    case Far::PatchDescriptor::LOOP:
-        return boxSplineTriangleShaderSource;
-    case Far::PatchDescriptor::GREGORY:
-        return gregoryShaderSource;
-    case Far::PatchDescriptor::GREGORY_BOUNDARY:
-        return std::string("#define OSD_PATCH_GREGORY_BOUNDRY\n")
-             + std::string(gregoryShaderSource);
-    case Far::PatchDescriptor::GREGORY_BASIS:
-        return gregoryBasisShaderSource;
-    case Far::PatchDescriptor::GREGORY_TRIANGLE:
-        return gregoryTriangleShaderSource;
-    default:
-        break;  // returns empty (points, lines, quads, ...)
-    }
-    return std::string();
-}
-
-/*static*/
-std::string
-HLSLPatchShaderSource::GetDomainShaderSource(Far::PatchDescriptor::Type type) {
-    switch (type) {
-    case Far::PatchDescriptor::REGULAR:
-        return bsplineShaderSource;
-    case Far::PatchDescriptor::LOOP:
-        return boxSplineTriangleShaderSource;
-    case Far::PatchDescriptor::GREGORY:
-        return gregoryShaderSource;
-    case Far::PatchDescriptor::GREGORY_BOUNDARY:
-        return std::string("#define OSD_PATCH_GREGORY_BOUNDRY\n")
-             + std::string(gregoryShaderSource);
-    case Far::PatchDescriptor::GREGORY_BASIS:
-        return gregoryBasisShaderSource;
-    case Far::PatchDescriptor::GREGORY_TRIANGLE:
-        return gregoryTriangleShaderSource;
-    default:
-        break;  // returns empty (points, lines, quads, ...)
-    }
-    return std::string();
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchShaderSource.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchShaderSource.h
deleted file mode 100644
index 028637a9e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/hlslPatchShaderSource.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_HLSL_PATCH_SHADER_SOURCE_H
-#define OPENSUBDIV3_OSD_HLSL_PATCH_SHADER_SOURCE_H
-
-#include "../version.h"
-#include <string>
-#include "../far/patchDescriptor.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class HLSLPatchShaderSource {
-public:
-    static std::string GetCommonShaderSource();
-
-    static std::string GetPatchBasisShaderSource();
-
-    static std::string GetVertexShaderSource(Far::PatchDescriptor::Type type);
-
-    static std::string GetHullShaderSource(Far::PatchDescriptor::Type type);
-
-    static std::string GetDomainShaderSource(Far::PatchDescriptor::Type type);
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_HLSL_PATCH_SHADER_SOURCE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mesh.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mesh.h
deleted file mode 100644
index fc3631167..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mesh.h
+++ /dev/null
@@ -1,723 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_MESH_H
-#define OPENSUBDIV3_OSD_MESH_H
-
-#include "../version.h"
-
-#include <bitset>
-#include <cassert>
-#include <cstring>
-#include <vector>
-
-#include "../far/topologyRefiner.h"
-#include "../far/patchTableFactory.h"
-#include "../far/stencilTable.h"
-#include "../far/stencilTableFactory.h"
-
-#include "../osd/bufferDescriptor.h"
-
-struct ID3D11DeviceContext;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-enum MeshBits {
-    MeshAdaptive             = 0,
-    MeshInterleaveVarying    = 1,
-    MeshFVarData             = 2,
-    MeshFVarAdaptive         = 3,
-    MeshUseSmoothCornerPatch = 4,
-    MeshUseSingleCreasePatch = 5,
-    MeshUseInfSharpPatch     = 6,
-    MeshEndCapBilinearBasis  = 7,  // exclusive
-    MeshEndCapBSplineBasis   = 8,  // exclusive
-    MeshEndCapGregoryBasis   = 9,  // exclusive
-    MeshEndCapLegacyGregory  = 10, // exclusive
-    NUM_MESH_BITS            = 11,
-};
-typedef std::bitset<NUM_MESH_BITS> MeshBitset;
-
-// ---------------------------------------------------------------------------
-
-template <class PATCH_TABLE>
-class MeshInterface {
-public:
-    typedef PATCH_TABLE PatchTable;
-    typedef typename PatchTable::VertexBufferBinding VertexBufferBinding;
-
-public:
-    MeshInterface() { }
-
-    virtual ~MeshInterface() { }
-
-    virtual int GetNumVertices() const = 0;
-
-    virtual int GetMaxValence() const = 0;
-
-    virtual void UpdateVertexBuffer(float const *vertexData,
-                                    int startVertex, int numVerts) = 0;
-
-    virtual void UpdateVaryingBuffer(float const *varyingData,
-                                     int startVertex, int numVerts) = 0;
-
-    virtual void Refine() = 0;
-
-    virtual void Synchronize() = 0;
-
-    virtual PatchTable * GetPatchTable() const = 0;
-
-    virtual Far::PatchTable const *GetFarPatchTable() const = 0;
-
-    virtual VertexBufferBinding BindVertexBuffer() = 0;
-
-    virtual VertexBufferBinding BindVaryingBuffer() = 0;
-
-protected:
-    static inline void refineMesh(Far::TopologyRefiner & refiner,
-                                  int level, bool adaptive,
-                                  bool singleCreasePatch) {
-        if (adaptive) {
-            Far::TopologyRefiner::AdaptiveOptions options(level);
-            options.useSingleCreasePatch = singleCreasePatch;
-            refiner.RefineAdaptive(options);
-        } else {
-            //  This dependency on FVar channels should not be necessary
-            bool fullTopologyInLastLevel = refiner.GetNumFVarChannels()>0;
-
-            Far::TopologyRefiner::UniformOptions options(level);
-            options.fullTopologyInLastLevel = fullTopologyInLastLevel;
-            refiner.RefineUniform(options);
-        }
-    }
-    static inline void refineMesh(Far::TopologyRefiner & refiner,
-                                  int level, MeshBitset bits) {
-        if (bits.test(MeshAdaptive)) {
-            Far::TopologyRefiner::AdaptiveOptions options(level);
-            options.useSingleCreasePatch = bits.test(MeshUseSingleCreasePatch);
-            options.useInfSharpPatch = bits.test(MeshUseInfSharpPatch);
-            options.considerFVarChannels = bits.test(MeshFVarAdaptive);
-            refiner.RefineAdaptive(options);
-        } else {
-            //  This dependency on FVar channels should not be necessary
-            bool fullTopologyInLastLevel = refiner.GetNumFVarChannels()>0;
-
-            Far::TopologyRefiner::UniformOptions options(level);
-            options.fullTopologyInLastLevel = fullTopologyInLastLevel;
-            refiner.RefineUniform(options);
-        }
-    }
-};
-
-// ---------------------------------------------------------------------------
-
-template <typename STENCIL_TABLE, typename SRC_STENCIL_TABLE,
-          typename DEVICE_CONTEXT>
-STENCIL_TABLE const *
-convertToCompatibleStencilTable(
-    SRC_STENCIL_TABLE const *table, DEVICE_CONTEXT *context) {
-    if (! table) return NULL;
-    return STENCIL_TABLE::Create(table, context);
-}
-
-template <>
-inline Far::StencilTable const *
-convertToCompatibleStencilTable<Far::StencilTable, Far::StencilTable, void>(
-    Far::StencilTable const *table, void *  /*context*/) {
-    // no need for conversion
-    // XXX: We don't want to even copy.
-    if (! table) return NULL;
-    return new Far::StencilTable(*table);
-}
-
-template <>
-inline Far::LimitStencilTable const *
-convertToCompatibleStencilTable<Far::LimitStencilTable, Far::LimitStencilTable, void>(
-    Far::LimitStencilTable const *table, void *  /*context*/) {
-    // no need for conversion
-    // XXX: We don't want to even copy.
-    if (! table) return NULL;
-    return new Far::LimitStencilTable(*table);
-}
-
-template <>
-inline Far::StencilTable const *
-convertToCompatibleStencilTable<Far::StencilTable, Far::StencilTable, ID3D11DeviceContext>(
-    Far::StencilTable const *table, ID3D11DeviceContext *  /*context*/) {
-    // no need for conversion
-    // XXX: We don't want to even copy.
-    if (! table) return NULL;
-    return new Far::StencilTable(*table);
-}
-
-// ---------------------------------------------------------------------------
-
-// Osd evaluator cache: for the GPU backends require compiled instance
-//   (GLXFB, GLCompute, CL)
-//
-// note: this is just an example usage and client applications are supposed
-//       to implement their own structure for Evaluator instance.
-//
-template <typename EVALUATOR>
-class EvaluatorCacheT {
-public:
-    ~EvaluatorCacheT() {
-        for(typename Evaluators::iterator it = _evaluators.begin();
-            it != _evaluators.end(); ++it) {
-            delete it->evaluator;
-        }
-    }
-
-    // XXX: FIXME, linear search
-    struct Entry {
-        Entry(BufferDescriptor const &srcDescArg,
-              BufferDescriptor const &dstDescArg,
-              BufferDescriptor const &duDescArg,
-              BufferDescriptor const &dvDescArg,
-              EVALUATOR *evalArg) : srcDesc(srcDescArg), dstDesc(dstDescArg),
-                              duDesc(duDescArg), dvDesc(dvDescArg),
-                              duuDesc(BufferDescriptor()),
-                              duvDesc(BufferDescriptor()),
-                              dvvDesc(BufferDescriptor()),
-                              evaluator(evalArg) {}
-        Entry(BufferDescriptor const &srcDescArg,
-              BufferDescriptor const &dstDescArg,
-              BufferDescriptor const &duDescArg,
-              BufferDescriptor const &dvDescArg,
-              BufferDescriptor const &duuDescArg,
-              BufferDescriptor const &duvDescArg,
-              BufferDescriptor const &dvvDescArg,
-              EVALUATOR *evalArg) : srcDesc(srcDescArg), dstDesc(dstDescArg),
-                              duDesc(duDescArg), dvDesc(dvDescArg),
-                              duuDesc(duuDescArg),
-                              duvDesc(duvDescArg),
-                              dvvDesc(dvvDescArg),
-                              evaluator(evalArg) {}
-        BufferDescriptor srcDesc, dstDesc;
-        BufferDescriptor duDesc, dvDesc;
-        BufferDescriptor duuDesc, duvDesc, dvvDesc;
-        EVALUATOR *evaluator;
-    };
-    typedef std::vector<Entry> Evaluators;
-
-    template <typename DEVICE_CONTEXT>
-    EVALUATOR *GetEvaluator(BufferDescriptor const &srcDesc,
-                            BufferDescriptor const &dstDesc,
-                            DEVICE_CONTEXT *deviceContext) {
-        return GetEvaluator(srcDesc, dstDesc,
-                            BufferDescriptor(),
-                            BufferDescriptor(),
-                            BufferDescriptor(),
-                            BufferDescriptor(),
-                            BufferDescriptor(),
-                            deviceContext);
-    }
-
-    template <typename DEVICE_CONTEXT>
-    EVALUATOR *GetEvaluator(BufferDescriptor const &srcDesc,
-                            BufferDescriptor const &dstDesc,
-                            BufferDescriptor const &duDesc,
-                            BufferDescriptor const &dvDesc,
-                            DEVICE_CONTEXT *deviceContext) {
-        return GetEvaluator(srcDesc, dstDesc,
-                            duDesc, dvDesc,
-                            BufferDescriptor(),
-                            BufferDescriptor(),
-                            BufferDescriptor(),
-                            deviceContext);
-    }
-
-    template <typename DEVICE_CONTEXT>
-    EVALUATOR *GetEvaluator(BufferDescriptor const &srcDesc,
-                            BufferDescriptor const &dstDesc,
-                            BufferDescriptor const &duDesc,
-                            BufferDescriptor const &dvDesc,
-                            BufferDescriptor const &duuDesc,
-                            BufferDescriptor const &duvDesc,
-                            BufferDescriptor const &dvvDesc,
-                            DEVICE_CONTEXT *deviceContext) {
-
-        for(typename Evaluators::iterator it = _evaluators.begin();
-            it != _evaluators.end(); ++it) {
-            if (isEqual(srcDesc, it->srcDesc) &&
-                isEqual(dstDesc, it->dstDesc) &&
-                isEqual(duDesc,  it->duDesc) &&
-                isEqual(dvDesc,  it->dvDesc) &&
-                isEqual(duuDesc, it->duuDesc) &&
-                isEqual(duvDesc, it->duvDesc) &&
-                isEqual(dvvDesc, it->dvvDesc)) {
-                return it->evaluator;
-            }
-        }
-        EVALUATOR *e = EVALUATOR::Create(srcDesc, dstDesc,
-                                         duDesc, dvDesc,
-                                         duuDesc, duvDesc, dvvDesc,
-                                         deviceContext);
-        _evaluators.push_back(Entry(srcDesc, dstDesc,
-                                    duDesc, dvDesc,
-                                    duuDesc, duvDesc, dvvDesc, e));
-        return e;
-    }
-
-private:
-    static bool isEqual(BufferDescriptor const &a,
-                        BufferDescriptor const &b) {
-        int offsetA = a.stride ? (a.offset % a.stride) : 0;
-        int offsetB = b.stride ? (b.offset % b.stride) : 0;
-
-        // Note: XFB kernel needs to be configured with the local offset
-        // of the dstDesc to skip preceding primvars.
-        return (offsetA == offsetB &&
-                a.length == b.length &&
-                a.stride == b.stride);
-    }
-
-    Evaluators _evaluators;
-};
-
-/// @cond INTERNAL
-
-// template helpers to see if the evaluator is instantiatable or not.
-template <typename EVALUATOR>
-struct instantiatable
-{
-    typedef char yes[1];
-    typedef char no[2];
-    template <typename C> static yes &chk(typename C::Instantiatable *t=0);
-    template <typename C> static no  &chk(...);
-    static bool const value = sizeof(chk<EVALUATOR>(0)) == sizeof(yes);
-};
-template <bool C, typename T=void>
-struct enable_if { typedef T type; };
-template <typename T>
-struct enable_if<false, T> { };
-
-/// @endcond
-
-// extract a kernel from cache if available
-template <typename EVALUATOR, typename DEVICE_CONTEXT>
-static EVALUATOR *GetEvaluator(
-    EvaluatorCacheT<EVALUATOR> *cache,
-    BufferDescriptor const &srcDesc,
-    BufferDescriptor const &dstDesc,
-    BufferDescriptor const &duDesc,
-    BufferDescriptor const &dvDesc,
-    BufferDescriptor const &duuDesc,
-    BufferDescriptor const &duvDesc,
-    BufferDescriptor const &dvvDesc,
-    DEVICE_CONTEXT deviceContext,
-    typename enable_if<instantiatable<EVALUATOR>::value, void>::type*t=0) {
-    (void)t;
-    if (cache == NULL) return NULL;
-    return cache->GetEvaluator(srcDesc, dstDesc,
-                               duDesc, dvDesc, duuDesc, duvDesc, dvvDesc,
-                               deviceContext);
-}
-
-template <typename EVALUATOR, typename DEVICE_CONTEXT>
-static EVALUATOR *GetEvaluator(
-    EvaluatorCacheT<EVALUATOR> *cache,
-    BufferDescriptor const &srcDesc,
-    BufferDescriptor const &dstDesc,
-    BufferDescriptor const &duDesc,
-    BufferDescriptor const &dvDesc,
-    DEVICE_CONTEXT deviceContext,
-    typename enable_if<instantiatable<EVALUATOR>::value, void>::type*t=0) {
-    (void)t;
-    if (cache == NULL) return NULL;
-    return cache->GetEvaluator(srcDesc, dstDesc, duDesc, dvDesc, deviceContext);
-}
-
-template <typename EVALUATOR, typename DEVICE_CONTEXT>
-static EVALUATOR *GetEvaluator(
-    EvaluatorCacheT<EVALUATOR> *cache,
-    BufferDescriptor const &srcDesc,
-    BufferDescriptor const &dstDesc,
-    DEVICE_CONTEXT deviceContext,
-    typename enable_if<instantiatable<EVALUATOR>::value, void>::type*t=0) {
-    (void)t;
-    if (cache == NULL) return NULL;
-    return cache->GetEvaluator(srcDesc, dstDesc,
-                               BufferDescriptor(),
-                               BufferDescriptor(),
-                               deviceContext);
-}
-
-// fallback
-template <typename EVALUATOR, typename DEVICE_CONTEXT>
-static EVALUATOR *GetEvaluator(
-    EvaluatorCacheT<EVALUATOR> *,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    DEVICE_CONTEXT,
-    typename enable_if<!instantiatable<EVALUATOR>::value, void>::type*t=0) {
-    (void)t;
-    return NULL;
-}
-
-template <typename EVALUATOR, typename DEVICE_CONTEXT>
-static EVALUATOR *GetEvaluator(
-    EvaluatorCacheT<EVALUATOR> *,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    DEVICE_CONTEXT,
-    typename enable_if<!instantiatable<EVALUATOR>::value, void>::type*t=0) {
-    (void)t;
-    return NULL;
-}
-
-template <typename EVALUATOR, typename DEVICE_CONTEXT>
-static EVALUATOR *GetEvaluator(
-    EvaluatorCacheT<EVALUATOR> *,
-    BufferDescriptor const &,
-    BufferDescriptor const &,
-    DEVICE_CONTEXT,
-    typename enable_if<!instantiatable<EVALUATOR>::value, void>::type*t=0) {
-    (void)t;
-    return NULL;
-}
-
-// ---------------------------------------------------------------------------
-
-template <typename VERTEX_BUFFER,
-          typename STENCIL_TABLE,
-          typename EVALUATOR,
-          typename PATCH_TABLE,
-          typename DEVICE_CONTEXT = void>
-class Mesh : public MeshInterface<PATCH_TABLE> {
-public:
-    typedef VERTEX_BUFFER VertexBuffer;
-    typedef EVALUATOR Evaluator;
-    typedef STENCIL_TABLE StencilTable;
-    typedef PATCH_TABLE PatchTable;
-    typedef DEVICE_CONTEXT DeviceContext;
-    typedef EvaluatorCacheT<Evaluator> EvaluatorCache;
-    typedef typename PatchTable::VertexBufferBinding VertexBufferBinding;
-
-    Mesh(Far::TopologyRefiner * refiner,
-         int numVertexElements,
-         int numVaryingElements,
-         int level,
-         MeshBitset bits = MeshBitset(),
-         EvaluatorCache * evaluatorCache = NULL,
-         DeviceContext * deviceContext = NULL) :
-
-            _refiner(refiner),
-            _farPatchTable(NULL),
-            _numVertices(0),
-            _maxValence(0),
-            _vertexBuffer(NULL),
-            _varyingBuffer(NULL),
-            _vertexStencilTable(NULL),
-            _varyingStencilTable(NULL),
-            _evaluatorCache(evaluatorCache),
-            _patchTable(NULL),
-            _deviceContext(deviceContext) {
-
-        assert(_refiner);
-
-        MeshInterface<PATCH_TABLE>::refineMesh(
-            *_refiner, level, bits);
-
-        int vertexBufferStride = numVertexElements +
-            (bits.test(MeshInterleaveVarying) ? numVaryingElements : 0);
-        int varyingBufferStride =
-            (bits.test(MeshInterleaveVarying) ? 0 : numVaryingElements);
-
-        initializeContext(numVertexElements,
-                          numVaryingElements,
-                          level, bits);
-
-        initializeVertexBuffers(_numVertices,
-                                vertexBufferStride,
-                                varyingBufferStride);
-
-        // configure vertex buffer descriptor
-        _vertexDesc =
-            BufferDescriptor(0, numVertexElements, vertexBufferStride);
-        if (bits.test(MeshInterleaveVarying)) {
-            _varyingDesc = BufferDescriptor(
-                numVertexElements, numVaryingElements, vertexBufferStride);
-        } else {
-            _varyingDesc = BufferDescriptor(
-                0, numVaryingElements, varyingBufferStride);
-        }
-    }
-
-    virtual ~Mesh() {
-        delete _refiner;
-        delete _farPatchTable;
-        delete _vertexBuffer;
-        delete _varyingBuffer;
-        delete _vertexStencilTable;
-        delete _varyingStencilTable;
-        delete _patchTable;
-        // deviceContext and evaluatorCache are not owned by this class.
-    }
-
-    virtual void UpdateVertexBuffer(float const *vertexData,
-                                    int startVertex, int numVerts) {
-        _vertexBuffer->UpdateData(vertexData, startVertex, numVerts,
-                                  _deviceContext);
-    }
-
-    virtual void UpdateVaryingBuffer(float const *varyingData,
-                                     int startVertex, int numVerts) {
-        _varyingBuffer->UpdateData(varyingData, startVertex, numVerts,
-                                   _deviceContext);
-    }
-
-    virtual void Refine() {
-
-        int numControlVertices = _refiner->GetLevel(0).GetNumVertices();
-
-        BufferDescriptor srcDesc = _vertexDesc;
-        BufferDescriptor dstDesc(srcDesc);
-        dstDesc.offset += numControlVertices * dstDesc.stride;
-
-        // note that the _evaluatorCache can be NULL and thus
-        // the evaluatorInstance can be NULL
-        //  (for uninstantiatable kernels CPU,TBB etc)
-        Evaluator const *instance = GetEvaluator<Evaluator>(
-            _evaluatorCache, srcDesc, dstDesc,
-            _deviceContext);
-
-        Evaluator::EvalStencils(_vertexBuffer, srcDesc,
-                                _vertexBuffer, dstDesc,
-                                _vertexStencilTable,
-                                instance, _deviceContext);
-
-        if (_varyingDesc.length > 0) {
-            BufferDescriptor vSrcDesc = _varyingDesc;
-            BufferDescriptor vDstDesc(vSrcDesc);
-            vDstDesc.offset += numControlVertices * vDstDesc.stride;
-
-            instance = GetEvaluator<Evaluator>(
-                _evaluatorCache, vSrcDesc, vDstDesc,
-                _deviceContext);
-
-            if (_varyingBuffer) {
-                // non-interleaved
-                Evaluator::EvalStencils(_varyingBuffer, vSrcDesc,
-                                        _varyingBuffer, vDstDesc,
-                                        _varyingStencilTable,
-                                        instance, _deviceContext);
-            } else {
-                // interleaved
-                Evaluator::EvalStencils(_vertexBuffer, vSrcDesc,
-                                        _vertexBuffer, vDstDesc,
-                                        _varyingStencilTable,
-                                        instance, _deviceContext);
-            }
-        }
-    }
-
-    virtual void Synchronize() {
-        Evaluator::Synchronize(_deviceContext);
-    }
-
-    virtual PatchTable * GetPatchTable() const {
-        return _patchTable;
-    }
-
-    virtual Far::PatchTable const *GetFarPatchTable() const {
-        return _farPatchTable;
-    }
-
-    virtual int GetNumVertices() const { return _numVertices; }
-
-    virtual int GetMaxValence() const { return _maxValence; }
-
-    virtual VertexBufferBinding BindVertexBuffer() {
-        return _vertexBuffer->BindVBO(_deviceContext);
-    }
-
-    virtual VertexBufferBinding BindVaryingBuffer() {
-        return _varyingBuffer->BindVBO(_deviceContext);
-    }
-
-    virtual VertexBuffer * GetVertexBuffer() {
-        return _vertexBuffer;
-    }
-
-    virtual VertexBuffer * GetVaryingBuffer() {
-        return _varyingBuffer;
-    }
-
-    virtual Far::TopologyRefiner const * GetTopologyRefiner() const {
-        return _refiner;
-    }
-
-private:
-    void initializeContext(int numVertexElements,
-                           int numVaryingElements,
-                           int level, MeshBitset bits) {
-        assert(_refiner);
-
-        Far::StencilTableFactory::Options options;
-        options.generateOffsets = true;
-        options.generateIntermediateLevels =
-            _refiner->IsUniform() ? false : true;
-
-        Far::StencilTable const * vertexStencils = NULL;
-        Far::StencilTable const * varyingStencils = NULL;
-
-        if (numVertexElements>0) {
-
-            vertexStencils = Far::StencilTableFactory::Create(*_refiner,
-                                                              options);
-        }
-
-        if (numVaryingElements>0) {
-
-            options.interpolationMode =
-                Far::StencilTableFactory::INTERPOLATE_VARYING;
-
-            varyingStencils = Far::StencilTableFactory::Create(*_refiner,
-                                                               options);
-        }
-
-        Far::PatchTableFactory::Options poptions(level);
-        poptions.generateFVarTables = bits.test(MeshFVarData);
-        poptions.generateFVarLegacyLinearPatches = !bits.test(MeshFVarAdaptive);
-        poptions.generateLegacySharpCornerPatches = !bits.test(MeshUseSmoothCornerPatch);
-        poptions.useSingleCreasePatch = bits.test(MeshUseSingleCreasePatch);
-        poptions.useInfSharpPatch = bits.test(MeshUseInfSharpPatch);
-
-        // points on bilinear and gregory basis endcap boundaries can be
-        // shared among adjacent patches to save some stencils.
-        if (bits.test(MeshEndCapBilinearBasis)) {
-            poptions.SetEndCapType(
-                Far::PatchTableFactory::Options::ENDCAP_BILINEAR_BASIS);
-            poptions.shareEndCapPatchPoints = true;
-        } else if (bits.test(MeshEndCapBSplineBasis)) {
-            poptions.SetEndCapType(
-                Far::PatchTableFactory::Options::ENDCAP_BSPLINE_BASIS);
-        } else if (bits.test(MeshEndCapGregoryBasis)) {
-            poptions.SetEndCapType(
-                Far::PatchTableFactory::Options::ENDCAP_GREGORY_BASIS);
-            poptions.shareEndCapPatchPoints = true;
-        } else if (bits.test(MeshEndCapLegacyGregory)) {
-            poptions.SetEndCapType(
-                Far::PatchTableFactory::Options::ENDCAP_LEGACY_GREGORY);
-        }
-
-        _farPatchTable = Far::PatchTableFactory::Create(*_refiner, poptions);
-
-        // if there's endcap stencils, merge it into regular stencils.
-        if (_farPatchTable->GetLocalPointStencilTable()) {
-            // append stencils
-            if (Far::StencilTable const *vertexStencilsWithLocalPoints =
-                Far::StencilTableFactory::AppendLocalPointStencilTable(
-                    *_refiner,
-                    vertexStencils,
-                    _farPatchTable->GetLocalPointStencilTable())) {
-                delete vertexStencils;
-                vertexStencils = vertexStencilsWithLocalPoints;
-            }
-            if (varyingStencils) {
-                if (Far::StencilTable const *varyingStencilsWithLocalPoints =
-                    Far::StencilTableFactory::AppendLocalPointStencilTable(
-                        *_refiner,
-                        varyingStencils,
-                        _farPatchTable->GetLocalPointVaryingStencilTable())) {
-                    delete varyingStencils;
-                    varyingStencils = varyingStencilsWithLocalPoints;
-                }
-            }
-        }
-
-        _maxValence = _farPatchTable->GetMaxValence();
-        _patchTable = PatchTable::Create(_farPatchTable, _deviceContext);
-
-        // numvertices = coarse verts + refined verts + gregory basis verts
-        _numVertices = vertexStencils->GetNumControlVertices()
-            + vertexStencils->GetNumStencils();
-
-        // convert to device stenciltable if necessary.
-        _vertexStencilTable =
-            convertToCompatibleStencilTable<StencilTable>(
-            vertexStencils, _deviceContext);
-        _varyingStencilTable =
-            convertToCompatibleStencilTable<StencilTable>(
-            varyingStencils, _deviceContext);
-
-        // FIXME: we do extra copyings for Far::Stencils.
-        delete vertexStencils;
-        delete varyingStencils;
-    }
-
-    void initializeVertexBuffers(int numVertices,
-                                 int numVertexElements,
-                                 int numVaryingElements) {
-
-        if (numVertexElements) {
-            _vertexBuffer = VertexBuffer::Create(numVertexElements,
-                                                 numVertices, _deviceContext);
-        }
-
-        if (numVaryingElements) {
-            _varyingBuffer = VertexBuffer::Create(numVaryingElements,
-                                                  numVertices, _deviceContext);
-        }
-    }
-
-    Far::TopologyRefiner * _refiner;
-    Far::PatchTable * _farPatchTable;
-
-    int _numVertices;
-    int _maxValence;
-
-    VertexBuffer * _vertexBuffer;
-    VertexBuffer * _varyingBuffer;
-
-    BufferDescriptor _vertexDesc;
-    BufferDescriptor _varyingDesc;
-
-    StencilTable const * _vertexStencilTable;
-    StencilTable const * _varyingStencilTable;
-    EvaluatorCache * _evaluatorCache;
-
-    PatchTable *_patchTable;
-    DeviceContext *_deviceContext;
-};
-
-} // end namespace Osd
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_MESH_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlCommon.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlCommon.h
deleted file mode 100644
index 84878c5be..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlCommon.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_MTL_COMMON_H
-#define OPENSUBDIV3_OSD_MTL_COMMON_H
-
-#include "../version.h"
-
-#include <cstddef>
-
-@protocol MTLDevice;
-@protocol MTLCommandQueue;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class MTLContext {
-public:
-        id<MTLDevice> device = nullptr;
-        id<MTLCommandQueue> commandQueue = nullptr;
-};
-
-} // end namespace Osd
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif //OPENSUBDIV3_OSD_MTL_COMMON_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlComputeEvaluator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlComputeEvaluator.h
deleted file mode 100644
index d2f7c00a7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlComputeEvaluator.h
+++ /dev/null
@@ -1,2167 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_MTL_COMPUTE_EVALUATOR_H
-#define OPENSUBDIV3_OSD_MTL_COMPUTE_EVALUATOR_H
-
-#include "../version.h"
-
-#include "../osd/types.h"
-#include "../osd/bufferDescriptor.h"
-#include "../osd/mtlCommon.h"
-
-@protocol MTLDevice;
-@protocol MTLBuffer;
-@protocol MTLLibrary;
-@protocol MTLComputePipelineState;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-    class PatchTable;
-    class StencilTable;
-    class LimitStencilTable;
-}
-
-namespace Osd {
-
-class MTLStencilTable
-{
-public:
-    template<typename STENCIL_TABLE, typename DEVICE_CONTEXT>
-    static MTLStencilTable* Create(STENCIL_TABLE* stencilTable,
-                                   DEVICE_CONTEXT context)
-    {
-        return new MTLStencilTable(stencilTable, context);
-    }
-
-
-    MTLStencilTable(Far::StencilTable const* stencilTable, MTLContext* context);
-    MTLStencilTable(Far::LimitStencilTable const* stencilTable, MTLContext* context);
-    ~MTLStencilTable();
-
-    id<MTLBuffer> GetSizesBuffer() const { return _sizesBuffer; }
-    id<MTLBuffer> GetOffsetsBuffer() const { return _offsetsBuffer; }
-    id<MTLBuffer> GetIndicesBuffer() const  { return _indicesBuffer; }
-    id<MTLBuffer> GetWeightsBuffer() const { return _weightsBuffer; }
-    id<MTLBuffer> GetDuWeightsBuffer() const { return _duWeightsBuffer; }
-    id<MTLBuffer> GetDvWeightsBuffer() const { return _dvWeightsBuffer; }
-    id<MTLBuffer> GetDuuWeightsBuffer() const { return _duuWeightsBuffer; }
-    id<MTLBuffer> GetDuvWeightsBuffer() const { return _duvWeightsBuffer; }
-    id<MTLBuffer> GetDvvWeightsBuffer() const { return _dvvWeightsBuffer; }
-
-    int GetNumStencils() const  { return _numStencils; }
-
-private:
-    id<MTLBuffer> _sizesBuffer;
-    id<MTLBuffer> _offsetsBuffer;
-    id<MTLBuffer> _indicesBuffer;
-    id<MTLBuffer> _weightsBuffer;
-    id<MTLBuffer> _duWeightsBuffer;
-    id<MTLBuffer> _dvWeightsBuffer;
-    id<MTLBuffer> _duuWeightsBuffer;
-    id<MTLBuffer> _duvWeightsBuffer;
-    id<MTLBuffer> _dvvWeightsBuffer;
-
-    int _numStencils;
-};
-
-class MTLComputeEvaluator
-{
-public:
-    typedef bool Instantiatable;
-
-    static MTLComputeEvaluator * Create(BufferDescriptor const &srcDesc,
-                                        BufferDescriptor const &dstDesc,
-                                        BufferDescriptor const &duDesc,
-                                        BufferDescriptor const &dvDesc,
-                                        MTLContext* context);
-
-    static MTLComputeEvaluator * Create(BufferDescriptor const &srcDesc,
-                                        BufferDescriptor const &dstDesc,
-                                        BufferDescriptor const &duDesc,
-                                        BufferDescriptor const &dvDesc,
-                                        BufferDescriptor const &duuDesc,
-                                        BufferDescriptor const &duvDesc,
-                                        BufferDescriptor const &dvvDesc,
-                                        MTLContext* context);
-
-    MTLComputeEvaluator();
-    ~MTLComputeEvaluator();
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Stencil evaluations with StencilTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       MTLBuffer interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        MTLComputeEvaluator const *instance,
-        MTLContext* context)
-    {
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          stencilTable,
-                                          context);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor(),
-                              context);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                stencilTable,
-                                                context);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       MTLBuffer interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        MTLComputeEvaluator const *instance,
-        MTLContext* context) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          duBuffer,  duDesc,
-                                          dvBuffer,  dvDesc,
-                                          stencilTable,
-                                          context);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc, duDesc, dvDesc, context);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                duBuffer,  duDesc,
-                                                dvBuffer,  dvDesc,
-                                                stencilTable,
-                                                context);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic static stencil function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        transparently from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       MTLBuffer interfaces.
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        MTLComputeEvaluator const *instance,
-        MTLContext* context) {
-
-        if (instance) {
-            return instance->EvalStencils(srcBuffer, srcDesc,
-                                          dstBuffer, dstDesc,
-                                          duBuffer,  duDesc,
-                                          dvBuffer,  dvDesc,
-                                          duuBuffer, duuDesc,
-                                          duvBuffer, duvDesc,
-                                          dvvBuffer, dvvDesc,
-                                          stencilTable,
-                                          context);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc, duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc, context);
-            if (instance) {
-                bool r = instance->EvalStencils(srcBuffer, srcDesc,
-                                                dstBuffer, dstDesc,
-                                                duBuffer,  duDesc,
-                                                dvBuffer,  dvDesc,
-                                                duuBuffer, duuDesc,
-                                                duvBuffer, duvDesc,
-                                                dvvBuffer, dvvDesc,
-                                                stencilTable,
-                                                context);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       MTLBuffer interfaces.
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-                      SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-                      DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-                      STENCIL_TABLE const *stencilTable,
-                      MTLContext* context) const
-    {
-        return EvalStencils(srcBuffer->BindMTLBuffer(context), srcDesc,
-                            dstBuffer->BindMTLBuffer(context), dstDesc,
-                            0, BufferDescriptor(),
-                            0, BufferDescriptor(),
-                            stencilTable->GetSizesBuffer(),
-                            stencilTable->GetOffsetsBuffer(),
-                            stencilTable->GetIndicesBuffer(),
-                            stencilTable->GetWeightsBuffer(),
-                            0,
-                            0,
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils(),
-                            context);
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       MTLBuffer interfaces.
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        MTLContext* context) const
-    {
-        return EvalStencils(srcBuffer->BindMTLBuffer(context), srcDesc,
-                            dstBuffer->BindMTLBuffer(context), dstDesc,
-                            duBuffer->BindMTLBuffer(context),  duDesc,
-                            dvBuffer->BindMTLBuffer(context),  dvDesc,
-                            stencilTable->GetSizesBuffer(),
-                            stencilTable->GetOffsetsBuffer(),
-                            stencilTable->GetIndicesBuffer(),
-                            stencilTable->GetWeightsBuffer(),
-                            stencilTable->GetDuWeightsBuffer(),
-                            stencilTable->GetDvWeightsBuffer(),
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils(),
-                            context);
-    }
-
-    /// \brief Generic stencil function.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duuDesc         vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   stencil table to be applied. The table must have
-    ///                       MTLBuffer interfaces.
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        MTLContext* context) const
-    {
-        return EvalStencils(srcBuffer->BindMTLBuffer(context), srcDesc,
-                            dstBuffer->BindMTLBuffer(context), dstDesc,
-                            duBuffer->BindMTLBuffer(context),  duDesc,
-                            dvBuffer->BindMTLBuffer(context),  dvDesc,
-                            duuBuffer->BindMTLBuffer(context), duuDesc,
-                            duvBuffer->BindMTLBuffer(context), duvDesc,
-                            dvvBuffer->BindMTLBuffer(context), dvvDesc,
-                            stencilTable->GetSizesBuffer(),
-                            stencilTable->GetOffsetsBuffer(),
-                            stencilTable->GetIndicesBuffer(),
-                            stencilTable->GetWeightsBuffer(),
-                            stencilTable->GetDuWeightsBuffer(),
-                            stencilTable->GetDvWeightsBuffer(),
-                            stencilTable->GetDuuWeightsBuffer(),
-                            stencilTable->GetDuvWeightsBuffer(),
-                            stencilTable->GetDvvWeightsBuffer(),
-                            /* start = */ 0,
-                            /* end   = */ stencilTable->GetNumStencils(),
-                            context);
-    }
-
-    /// \brief Dispatch the MTL compute kernel on GPU asynchronously
-    /// returns false if the kernel hasn't been compiled yet.
-    ///
-    /// @param srcBuffer        MTLBuffer of input primvar source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the srcBuffer
-    ///
-    /// @param dstBuffer        MTLBuffer of output primvar destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer         MTLBuffer of output derivative wrt u
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         MTLBuffer of output derivative wrt v
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param sizesBuffer      MTLBuffer of the sizes in the stencil table
-    ///
-    /// @param offsetsBuffer    MTLBuffer of the offsets in the stencil table
-    ///
-    /// @param indicesBuffer    MTLBuffer of the indices in the stencil table
-    ///
-    /// @param weightsBuffer    MTLBuffer of the weights in the stencil table
-    ///
-    /// @param duWeightsBuffer  MTLBuffer of the du weights in the stencil table
-    ///
-    /// @param dvWeightsBuffer  MTLBuffer of the dv weights in the stencil table
-    ///
-    /// @param start            start index of stencil table
-    ///
-    /// @param end              end index of stencil table
-    ///
-    /// @param context          used to obtain the MTLDevice object and command queue
-    ///                         to obtain command buffers from.
-    ///
-    bool EvalStencils(id<MTLBuffer> srcBuffer, BufferDescriptor const &srcDesc,
-                      id<MTLBuffer> dstBuffer, BufferDescriptor const &dstDesc,
-                      id<MTLBuffer> duBuffer,  BufferDescriptor const &duDesc,
-                      id<MTLBuffer> dvBuffer,  BufferDescriptor const &dvDesc,
-                      id<MTLBuffer> sizesBuffer,
-                      id<MTLBuffer> offsetsBuffer,
-                      id<MTLBuffer> indicesBuffer,
-                      id<MTLBuffer> weightsBuffer,
-                      id<MTLBuffer> duWeightsBuffer,
-                      id<MTLBuffer> dvWeightsBuffer,
-                      int start,
-                      int end,
-                      MTLContext* context) const;
-
-    /// \brief Dispatch the MTL compute kernel on GPU asynchronously
-    /// returns false if the kernel hasn't been compiled yet.
-    ///
-    /// @param srcBuffer        MTLBuffer of input primvar source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the srcBuffer
-    ///
-    /// @param dstBuffer        MTLBuffer of output primvar destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the dstBuffer
-    ///
-    /// @param duBuffer         MTLBuffer of output derivative wrt u
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         MTLBuffer of output derivative wrt v
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        MTLBuffer of output 2nd derivative wrt u
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        MTLBuffer of output 2nd derivative wrt u and v
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        MTLBuffer of output 2nd derivative wrt v
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param sizesBuffer      MTLBuffer of the sizes in the stencil table
-    ///
-    /// @param offsetsBuffer    MTLBuffer of the offsets in the stencil table
-    ///
-    /// @param indicesBuffer    MTLBuffer of the indices in the stencil table
-    ///
-    /// @param weightsBuffer    MTLBuffer of the weights in the stencil table
-    ///
-    /// @param duWeightsBuffer  MTLBuffer of the du weights in the stencil table
-    ///
-    /// @param dvWeightsBuffer  MTLBuffer of the dv weights in the stencil table
-    ///
-    /// @param duuWeightsBuffer MTLBuffer of the duu weights in the stencil table
-    ///
-    /// @param duvWeightsBuffer MTLBuffer of the duv weights in the stencil table
-    ///
-    /// @param dvvWeightsBuffer MTLBuffer of the dvv weights in the stencil table
-    ///
-    /// @param start            start index of stencil table
-    ///
-    /// @param end              end index of stencil table
-    ///
-    /// @param context          used to obtain the MTLDevice object and command queue
-    ///                         to obtain command buffers from.
-    ///
-    bool EvalStencils(id<MTLBuffer> srcBuffer, BufferDescriptor const &srcDesc,
-                      id<MTLBuffer> dstBuffer, BufferDescriptor const &dstDesc,
-                      id<MTLBuffer> duBuffer,  BufferDescriptor const &duDesc,
-                      id<MTLBuffer> dvBuffer,  BufferDescriptor const &dvDesc,
-                      id<MTLBuffer> duuBuffer, BufferDescriptor const &duuDesc,
-                      id<MTLBuffer> duvBuffer, BufferDescriptor const &duvDesc,
-                      id<MTLBuffer> dvvBuffer, BufferDescriptor const &dvvDesc,
-                      id<MTLBuffer> sizesBuffer,
-                      id<MTLBuffer> offsetsBuffer,
-                      id<MTLBuffer> indicesBuffer,
-                      id<MTLBuffer> weightsBuffer,
-                      id<MTLBuffer> duWeightsBuffer,
-                      id<MTLBuffer> dvWeightsBuffer,
-                      id<MTLBuffer> duuWeightsBuffer,
-                      id<MTLBuffer> duvWeightsBuffer,
-                      id<MTLBuffer> dvvWeightsBuffer,
-                      int start,
-                      int end,
-                      MTLContext* context) const;
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Limit evaluations with PatchTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLComputeEvaluator const *instance,
-        MTLContext* context) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         context);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor(),
-                              context);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               context);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLComputeEvaluator* instance,
-        MTLContext* context) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         context);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc, context);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               context);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLComputeEvaluator* instance,
-        MTLContext* context) {
-
-        if (instance) {
-            return instance->EvalPatches(srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         context);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc, context);
-            if (instance) {
-                bool r = instance->EvalPatches(srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               context);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBOBuffer() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param context        used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLContext* context) const {
-
-        return EvalPatches(srcBuffer->BindMTLBuffer(context), srcDesc,
-                           dstBuffer->BindMTLBuffer(context), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindMTLBuffer(context),
-                           patchTable->GetPatchArrays(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           context);
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindVBO() method returning an
-    ///                         MTLBuffer object of source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindVBO() method returning an
-    ///                         MTLBuffer object of destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindVBO() method returning an
-    ///                         MTLBuffer object of destination data
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindVBO() method returning an
-    ///                         MTLBuffer object of destination data
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       MTLPatchTable or equivalent
-    ///
-    /// @param context          used to obtain the MTLDevice object and command queue
-    ///                         to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLContext* context) const {
-
-        return EvalPatches(srcBuffer->BindMTLBuffer(context), srcDesc,
-                           dstBuffer->BindMTLBuffer(context), dstDesc,
-                           duBuffer->BindMTLBuffer(context),  duDesc,
-                           dvBuffer->BindMTLBuffer(context),  dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindMTLBuffer(context),
-                           patchTable->GetPatchArrays(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           context);
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindVBO() method returning a
-    ///                         MTLBuffer object of source data
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindVBO() method returning a
-    ///                         MTLBuffer object of destination data
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindVBO() method returning a
-    ///                         MTLBuffer object of destination data
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindVBO() method returning a
-    ///                         MTLBuffer object of destination data
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindVBO() method returning a
-    ///                         MTLBuffer object of destination data
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindVBO() method returning a
-    ///                         MTLBuffer object of destination data
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindVBO() method returning a
-    ///                         MTLBuffer object of destination data
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       MTLPatchTable or equivalent
-    ///
-    /// @param context          used to obtain the MTLDevice object and command queue
-    ///                         to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLContext* context) const {
-
-        return EvalPatches(srcBuffer->BindMTLBuffer(context), srcDesc,
-                           dstBuffer->BindMTLBuffer(context), dstDesc,
-                           duBuffer->BindMTLBuffer(context),  duDesc,
-                           dvBuffer->BindMTLBuffer(context),  dvDesc,
-                           duuBuffer->BindMTLBuffer(context), duuDesc,
-                           duvBuffer->BindMTLBuffer(context), duvDesc,
-                           dvvBuffer->BindMTLBuffer(context), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindMTLBuffer(context),
-                           patchTable->GetPatchArrays(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           context);
-    }
-
-    bool EvalPatches(id<MTLBuffer> srcBuffer, BufferDescriptor const &srcDesc,
-                     id<MTLBuffer> dstBuffer, BufferDescriptor const &dstDesc,
-                     id<MTLBuffer> duBuffer,  BufferDescriptor const &duDesc,
-                     id<MTLBuffer> dvBuffer,  BufferDescriptor const &dvDesc,
-                     int numPatchCoords,
-                     id<MTLBuffer> patchCoordsBuffer,
-                     const PatchArrayVector &patchArrays,
-                     id<MTLBuffer> patchIndexBuffer,
-                     id<MTLBuffer> patchParamsBuffer,
-                     MTLContext* context) const;
-
-    bool EvalPatches(id<MTLBuffer> srcBuffer, BufferDescriptor const &srcDesc,
-                     id<MTLBuffer> dstBuffer, BufferDescriptor const &dstDesc,
-                     id<MTLBuffer> duBuffer,  BufferDescriptor const &duDesc,
-                     id<MTLBuffer> dvBuffer,  BufferDescriptor const &dvDesc,
-                     id<MTLBuffer> duuBuffer, BufferDescriptor const &duuDesc,
-                     id<MTLBuffer> duvBuffer, BufferDescriptor const &duvDesc,
-                     id<MTLBuffer> dvvBuffer, BufferDescriptor const &dvvDesc,
-                     int numPatchCoords,
-                     id<MTLBuffer> patchCoordsBuffer,
-                     const PatchArrayVector &patchArrays,
-                     id<MTLBuffer> patchIndexBuffer,
-                     id<MTLBuffer> patchParamsBuffer,
-                     MTLContext* context) const;
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLComputeEvaluator const *instance,
-        MTLContext* deviceContext) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         deviceContext);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor(),
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               deviceContext);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLContext* deviceContext) const {
-
-        return EvalPatches(srcBuffer->BindMTLBuffer(deviceContext), srcDesc,
-                           dstBuffer->BindMTLBuffer(deviceContext), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindMTLBuffer(deviceContext),
-                           patchTable->GetVaryingPatchArrays(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           deviceContext
-                           );
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLComputeEvaluator const *instance,
-        MTLContext* deviceContext) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         deviceContext);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               deviceContext);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLContext* deviceContext) const {
-
-        return EvalPatches(srcBuffer->BindMTLBuffer(deviceContext), srcDesc,
-                           dstBuffer->BindMTLBuffer(deviceContext), dstDesc,
-                           duBuffer->BindMTLBuffer(deviceContext),  duDesc,
-                           dvBuffer->BindMTLBuffer(deviceContext),  dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindMTLBuffer(deviceContext),
-                           patchTable->GetVaryingPatchArrays(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           deviceContext
-                           );
-    }
-
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvvDesc       vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLComputeEvaluator const *instance,
-        MTLContext* deviceContext) {
-
-        if (instance) {
-            return instance->EvalPatchesVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         deviceContext);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               deviceContext);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        MTLContext* deviceContext) const {
-
-        return EvalPatches(srcBuffer->BindMTLBuffer(deviceContext), srcDesc,
-                           dstBuffer->BindMTLBuffer(deviceContext), dstDesc,
-                           duBuffer->BindMTLBuffer(deviceContext),  duDesc,
-                           dvBuffer->BindMTLBuffer(deviceContext),  dvDesc,
-                           duuBuffer->BindMTLBuffer(deviceContext), duuDesc,
-                           duvBuffer->BindMTLBuffer(deviceContext), duvDesc,
-                           dvvBuffer->BindMTLBuffer(deviceContext), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindMTLBuffer(deviceContext),
-                           patchTable->GetVaryingPatchArrays(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer(),
-                           deviceContext
-                           );
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        MTLComputeEvaluator const *instance,
-        MTLContext* deviceContext) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         fvarChannel,
-                                         deviceContext);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              BufferDescriptor(),
-                              BufferDescriptor(),
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               fvarChannel,
-                                               deviceContext);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        MTLContext* deviceContext) const {
-
-        return EvalPatches(srcBuffer->BindMTLBuffer(deviceContext), srcDesc,
-                           dstBuffer->BindMTLBuffer(deviceContext), dstDesc,
-                           0, BufferDescriptor(),
-                           0, BufferDescriptor(),
-                           numPatchCoords,
-                           patchCoords->BindMTLBuffer(deviceContext),
-                           patchTable->GetFVarPatchArrays(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel),
-                           deviceContext
-                           );
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        MTLComputeEvaluator const *instance,
-        MTLContext* deviceContext) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         fvarChannel,
-                                         deviceContext);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               fvarChannel,
-                                               deviceContext);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        MTLContext* deviceContext) const {
-
-        return EvalPatches(srcBuffer->BindMTLBuffer(deviceContext), srcDesc,
-                           dstBuffer->BindMTLBuffer(deviceContext), dstDesc,
-                           duBuffer->BindMTLBuffer(deviceContext),  duDesc,
-                           dvBuffer->BindMTLBuffer(deviceContext),  dvDesc,
-                           numPatchCoords,
-                           patchCoords->BindMTLBuffer(deviceContext),
-                           patchTable->GetFVarPatchArrays(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel),
-                           deviceContext
-                           );
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning an
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvvDesc       vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param instance       cached compiled instance. Clients are supposed to
-    ///                       pre-compile an instance of this class and provide
-    ///                       to this function. If it's null the kernel still
-    ///                       compute by instantiating on-demand kernel although
-    ///                       it may cause a performance problem.
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        MTLComputeEvaluator const *instance,
-        MTLContext* deviceContext) {
-
-        if (instance) {
-            return instance->EvalPatchesFaceVarying(
-                                         srcBuffer, srcDesc,
-                                         dstBuffer, dstDesc,
-                                         duBuffer, duDesc,
-                                         dvBuffer, dvDesc,
-                                         duuBuffer, duuDesc,
-                                         duvBuffer, duvDesc,
-                                         dvvBuffer, dvvDesc,
-                                         numPatchCoords, patchCoords,
-                                         patchTable,
-                                         fvarChannel,
-                                         deviceContext);
-        } else {
-            // Create an instance on demand (slow)
-            instance = Create(srcDesc, dstDesc,
-                              duDesc, dvDesc,
-                              duuDesc, duvDesc, dvvDesc,
-                              deviceContext);
-            if (instance) {
-                bool r = instance->EvalPatchesFaceVarying(
-                                               srcBuffer, srcDesc,
-                                               dstBuffer, dstDesc,
-                                               duBuffer, duDesc,
-                                               dvBuffer, dvDesc,
-                                               duuBuffer, duuDesc,
-                                               duvBuffer, duvDesc,
-                                               dvvBuffer, dvvDesc,
-                                               numPatchCoords, patchCoords,
-                                               patchTable,
-                                               fvarChannel,
-                                               deviceContext);
-                delete instance;
-                return r;
-            }
-            return false;
-        }
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of source data
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindVBO() method returning a
-    ///                       MTLBuffer object of destination data
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords number of patchCoords.
-    ///
-    /// @param patchCoords    array of locations to be evaluated.
-    ///                       must have BindVBO() method returning an
-    ///                       array of PatchCoord struct in VBO.
-    ///
-    /// @param patchTable     MTLPatchTable or equivalent
-    ///
-    /// @param fvarChannel    face-varying channel
-    ///
-    /// @param deviceContext  used to obtain the MTLDevice object and command queue
-    ///                       to obtain command buffers from.
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        MTLContext* deviceContext) const {
-
-        return EvalPatches(srcBuffer->BindMTLBuffer(deviceContext), srcDesc,
-                           dstBuffer->BindMTLBuffer(deviceContext), dstDesc,
-                           duBuffer->BindMTLBuffer(deviceContext),  duDesc,
-                           dvBuffer->BindMTLBuffer(deviceContext),  dvDesc,
-                           duuBuffer->BindMTLBuffer(deviceContext), duuDesc,
-                           duvBuffer->BindMTLBuffer(deviceContext), duvDesc,
-                           dvvBuffer->BindMTLBuffer(deviceContext), dvvDesc,
-                           numPatchCoords,
-                           patchCoords->BindMTLBuffer(deviceContext),
-                           patchTable->GetFVarPatchArrays(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel),
-                           fvarChannel,
-                           deviceContext
-                           );
-    }
-
-    /// Configure compute pipline state. Returns false if it fails to create the pipeline state.
-    bool Compile(BufferDescriptor const &srcDesc,
-                 BufferDescriptor const &dstDesc,
-                 BufferDescriptor const &duDesc,
-                 BufferDescriptor const &dvDesc,
-                 BufferDescriptor const &duuDesc,
-                 BufferDescriptor const &duvDesc,
-                 BufferDescriptor const &dvvDesc,
-                 MTLContext* context);
-
-    /// Wait for the dispatched kernel to finish.
-    static void Synchronize(MTLContext* context);
-
-    private:
-
-    id<MTLLibrary> _computeLibrary;
-    id<MTLComputePipelineState> _evalStencils;
-    id<MTLComputePipelineState> _evalPatches;
-    id<MTLBuffer> _parameterBuffer;
-
-    int _workGroupSize;
-};
-
-} //end namespace Osd
-
-} //end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} //end namespace OpenSubdiv
-
-#endif // OPENSUBDIV3_OSD_MTL_COMPUTE_EVALUATOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlComputeEvaluator.mm b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlComputeEvaluator.mm
deleted file mode 100644
index 45b5b1314..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlComputeEvaluator.mm
+++ /dev/null
@@ -1,612 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/mtlComputeEvaluator.h"
-#include "../osd/mtlPatchShaderSource.h"
-
-#include <vector>
-#include <Metal/Metal.h>
-#include <simd/simd.h>
-#include <sstream>
-#include <string>
-
-#include "../far/stencilTable.h"
-#include "../far/error.h"
-
-#define PARAMETER_BUFFER_INDEX 0
-#define SIZES_BUFFER_INDEX 1
-#define OFFSETS_BUFFER_INDEX 2
-#define INDICES_BUFFER_INDEX 3
-#define WEIGHTS_BUFFER_INDEX 4
-#define DST_VERTEX_BUFFER_INDEX 5
-#define SRC_VERTEX_BUFFER_INDEX 6
-#define DU_WEIGHTS_BUFFER_INDEX 7
-#define DV_WEIGHTS_BUFFER_INDEX 8
-#define DU_DERIVATIVE_BUFFER_INDEX 9
-#define DV_DERIVATIVE_BUFFER_INDEX 10
-#define DUU_WEIGHTS_BUFFER_INDEX 11
-#define DUV_WEIGHTS_BUFFER_INDEX 12
-#define DVV_WEIGHTS_BUFFER_INDEX 13
-#define DUU_DERIVATIVE_BUFFER_INDEX 14
-#define DUV_DERIVATIVE_BUFFER_INDEX 15
-#define DVV_DERIVATIVE_BUFFER_INDEX 16
-#define PATCH_ARRAYS_BUFFER_INDEX 17
-#define PATCH_COORDS_BUFFER_INDEX 18
-#define PATCH_INDICES_BUFFER_INDEX 19
-#define PATCH_PARAMS_BUFFER_INDEX 20
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-namespace Osd {
-
-namespace mtl
-{
-  struct PatchCoord
-  {
-      int arrayIndex;
-      int patchIndex;
-      int vertIndex;
-      float s;
-      float t;
-  };
-
-  struct PatchParam
-  {
-      uint field0;
-      uint field1;
-      float sharpness;
-  };
-
-  struct KernelUniformArgs
-  {
-      int batchStart;
-      int batchEnd;
-
-      int srcOffset;
-      int dstOffset;
-
-      simd::int3 duDesc;
-      simd::int3 dvDesc;
-
-      simd::int3 duuDesc;
-      simd::int3 duvDesc;
-      simd::int3 dvvDesc;
-  };
-} //end namespace mtl
-
-static const char *KernelSource =
-#include "mtlComputeKernel.gen.h"
-;
-
-template <typename T>
-static id<MTLBuffer> createBuffer(const std::vector<T> &vec,
-                                      MTLContext* context)
-{
-    if (vec.empty()) {
-        return nil;
-    }
-
-    const auto length = sizeof(T) * vec.size();
-#if TARGET_OS_IOS || TARGET_OS_TV
-    return [context->device newBufferWithBytes:vec.data() length:length options:MTLResourceOptionCPUCacheModeDefault];
-#elif TARGET_OS_OSX
-  @autoreleasepool {
-    auto cmdBuf = [context->commandQueue commandBuffer];
-    auto blitEncoder = [cmdBuf blitCommandEncoder];
-
-    auto stageBuffer = [context->device newBufferWithBytes:vec.data() length:length options:MTLResourceOptionCPUCacheModeDefault];
-
-    auto finalBuffer = [context->device newBufferWithLength:length options:MTLResourceStorageModePrivate];
-
-    [blitEncoder copyFromBuffer:stageBuffer sourceOffset:0 toBuffer:finalBuffer destinationOffset:0 size:length];
-    [blitEncoder endEncoding];
-    [cmdBuf commit];
-    [cmdBuf waitUntilCompleted];
-
-#if !__has_feature(objc_arc)
-      [stageBuffer release];
-#endif
-
-    return finalBuffer;
-  }
-#endif
-}
-
-using namespace OpenSubdiv::OPENSUBDIV_VERSION;
-using namespace Osd;
-
-MTLStencilTable::MTLStencilTable(Far::StencilTable const *stencilTable,
-                                 MTLContext* context)
-{
-    assert(context != nil);
-    assert(context->device != nil && context->commandQueue != nil);
-
-    _numStencils = stencilTable->GetNumStencils();
-    if (_numStencils > 0)
-    {
-      auto sizes = stencilTable->GetSizes();
-
-      _sizesBuffer = createBuffer(stencilTable->GetSizes(), context);
-      _offsetsBuffer = createBuffer(stencilTable->GetOffsets(), context);
-      _indicesBuffer = createBuffer(stencilTable->GetControlIndices(), context);
-      _weightsBuffer = createBuffer(stencilTable->GetWeights(), context);
-
-      _sizesBuffer.label = @"StencilTable Sizes";
-      _offsetsBuffer.label = @"StencilTable Offsets";
-      _indicesBuffer.label = @"StencilTable Indices";
-      _weightsBuffer.label = @"StencilTable Weights";
-    }
-
-    _duWeightsBuffer = nil;
-    _dvWeightsBuffer = nil;
-    _duuWeightsBuffer = nil;
-    _duvWeightsBuffer = nil;
-    _dvvWeightsBuffer = nil;
-}
-
-MTLStencilTable::MTLStencilTable(Far::LimitStencilTable const *stencilTable,
-                                 MTLContext* context)
-{
-    assert(context != nil);
-    assert(context->device != nil && context->commandQueue != nil);
-
-    _numStencils = stencilTable->GetNumStencils();
-    if (_numStencils > 0)
-    {
-      auto sizes = stencilTable->GetSizes();
-
-      _sizesBuffer = createBuffer(stencilTable->GetSizes(), context);
-      _offsetsBuffer = createBuffer(stencilTable->GetOffsets(), context);
-      _indicesBuffer = createBuffer(stencilTable->GetControlIndices(), context);
-      _weightsBuffer = createBuffer(stencilTable->GetWeights(), context);
-      _duWeightsBuffer = createBuffer(stencilTable->GetDuWeights(), context);
-      _dvWeightsBuffer = createBuffer(stencilTable->GetDvWeights(), context);
-      _duuWeightsBuffer = createBuffer(stencilTable->GetDuuWeights(), context);
-      _duvWeightsBuffer = createBuffer(stencilTable->GetDuvWeights(), context);
-      _dvvWeightsBuffer = createBuffer(stencilTable->GetDvvWeights(), context);
-
-      _sizesBuffer.label = @"StencilTable Sizes";
-      _offsetsBuffer.label = @"StencilTable Offsets";
-      _indicesBuffer.label = @"StencilTable Indices";
-      _weightsBuffer.label = @"StencilTable Weights";
-      if (_duWeightsBuffer) {
-          _duWeightsBuffer.label = @"StencilTable duWeights";
-      }
-      if (_dvWeightsBuffer) {
-          _dvWeightsBuffer.label = @"StencilTable dvWeights";
-      }
-      if (_duuWeightsBuffer) {
-          _duuWeightsBuffer.label = @"StencilTable duuWeights";
-      }
-      if (_duvWeightsBuffer) {
-          _duvWeightsBuffer.label = @"StencilTable duvWeights";
-      }
-      if (_dvvWeightsBuffer) {
-          _dvvWeightsBuffer.label = @"StencilTable dvvWeights";
-      }
-    }
-}
-
-MTLStencilTable::~MTLStencilTable() {}
-
-MTLComputeEvaluator *MTLComputeEvaluator::Create(
-    BufferDescriptor const &srcDesc, BufferDescriptor const &dstDesc,
-    BufferDescriptor const &duDesc, BufferDescriptor const &dvDesc,
-    MTLContext* context)
-{
-    assert(context != nil);
-    assert(context->device != nil && context->commandQueue != nil);
-
-    auto instance = new MTLComputeEvaluator();
-    if (instance->Compile(srcDesc, dstDesc, duDesc, dvDesc,
-                          BufferDescriptor(),
-                          BufferDescriptor(),
-                          BufferDescriptor(),
-                          context))
-      return instance;
-
-    delete instance;
-
-    return nullptr;
-}
-
-MTLComputeEvaluator *MTLComputeEvaluator::Create(
-    BufferDescriptor const &srcDesc, BufferDescriptor const &dstDesc,
-    BufferDescriptor const &duDesc, BufferDescriptor const &dvDesc,
-    BufferDescriptor const &duuDesc, BufferDescriptor const &duvDesc, BufferDescriptor const &dvvDesc,
-    MTLContext* context)
-{
-    assert(context != nil);
-    assert(context->device != nil && context->commandQueue != nil);
-
-    auto instance = new MTLComputeEvaluator();
-    if (instance->Compile(srcDesc, dstDesc, duDesc, dvDesc,
-                          duuDesc, duvDesc, dvvDesc, context)) {
-        return instance;
-    }
-
-    delete instance;
-
-    return nullptr;
-}
-
-bool MTLComputeEvaluator::Compile(BufferDescriptor const &srcDesc,
-                                  BufferDescriptor const &dstDesc,
-                                  BufferDescriptor const &duDesc,
-                                  BufferDescriptor const &dvDesc,
-                                  BufferDescriptor const &duuDesc,
-                                  BufferDescriptor const &duvDesc,
-                                  BufferDescriptor const &dvvDesc,
-                                  MTLContext* context)
-{
-    assert(context != nil);
-    assert(context->device != nil && context->commandQueue != nil);
-
-    using namespace Osd;
-    using namespace Far;
-
-    MTLCompileOptions *compileOptions = [[MTLCompileOptions alloc] init];
-    compileOptions.preprocessorMacros = nil;
-
-    bool deriv1 = duDesc.length > 0 || dvDesc.length > 0;
-    bool deriv2 = duuDesc.length > 0 || duvDesc.length > 0 || dvvDesc.length > 0;
-
-#define DEFINE(x,y) @(#x) : @(y)
-    auto preprocessor = @{
-    DEFINE(LENGTH, srcDesc.length),
-    DEFINE(SRC_STRIDE, srcDesc.stride),
-    DEFINE(DST_STRIDE, dstDesc.stride),
-    DEFINE(WORK_GROUP_SIZE, _workGroupSize),
-    DEFINE(OPENSUBDIV_MTL_COMPUTE_USE_1ST_DERIVATIVES, deriv1),
-    DEFINE(OPENSUBDIV_MTL_COMPUTE_USE_2ND_DERIVATIVES, deriv2),
-    DEFINE(PARAMETER_BUFFER_INDEX,PARAMETER_BUFFER_INDEX),
-    DEFINE(SIZES_BUFFER_INDEX,SIZES_BUFFER_INDEX),
-    DEFINE(OFFSETS_BUFFER_INDEX,OFFSETS_BUFFER_INDEX),
-    DEFINE(INDICES_BUFFER_INDEX,INDICES_BUFFER_INDEX),
-    DEFINE(WEIGHTS_BUFFER_INDEX,WEIGHTS_BUFFER_INDEX),
-    DEFINE(SRC_VERTEX_BUFFER_INDEX,SRC_VERTEX_BUFFER_INDEX),
-    DEFINE(DST_VERTEX_BUFFER_INDEX,DST_VERTEX_BUFFER_INDEX),
-    DEFINE(DU_WEIGHTS_BUFFER_INDEX,DU_WEIGHTS_BUFFER_INDEX),
-    DEFINE(DV_WEIGHTS_BUFFER_INDEX,DV_WEIGHTS_BUFFER_INDEX),
-    DEFINE(DU_DERIVATIVE_BUFFER_INDEX,DU_DERIVATIVE_BUFFER_INDEX),
-    DEFINE(DV_DERIVATIVE_BUFFER_INDEX,DV_DERIVATIVE_BUFFER_INDEX),
-    DEFINE(DUU_WEIGHTS_BUFFER_INDEX,DUU_WEIGHTS_BUFFER_INDEX),
-    DEFINE(DUV_WEIGHTS_BUFFER_INDEX,DUV_WEIGHTS_BUFFER_INDEX),
-    DEFINE(DVV_WEIGHTS_BUFFER_INDEX,DVV_WEIGHTS_BUFFER_INDEX),
-    DEFINE(DUU_DERIVATIVE_BUFFER_INDEX,DUU_DERIVATIVE_BUFFER_INDEX),
-    DEFINE(DUV_DERIVATIVE_BUFFER_INDEX,DUV_DERIVATIVE_BUFFER_INDEX),
-    DEFINE(DVV_DERIVATIVE_BUFFER_INDEX,DVV_DERIVATIVE_BUFFER_INDEX),
-    DEFINE(PATCH_ARRAYS_BUFFER_INDEX,PATCH_ARRAYS_BUFFER_INDEX),
-    DEFINE(PATCH_COORDS_BUFFER_INDEX,PATCH_COORDS_BUFFER_INDEX),
-    DEFINE(PATCH_INDICES_BUFFER_INDEX,PATCH_INDICES_BUFFER_INDEX),
-    DEFINE(PATCH_PARAMS_BUFFER_INDEX,PATCH_PARAMS_BUFFER_INDEX),
-    };
-#undef DEFINE
-
-    compileOptions.preprocessorMacros = preprocessor;
-
-    std::stringstream sourceString;
-    sourceString << MTLPatchShaderSource::GetPatchBasisShaderSource();
-    sourceString << KernelSource;
-
-    NSError *err = nil;
-
-    _computeLibrary =
-    [context->device newLibraryWithSource:@(sourceString.str().c_str())
-                                  options:compileOptions
-                                    error:&err];
-
-#if !__has_feature(objc_arc)
-    [compileOptions release];
-#endif
-
-    if (!_computeLibrary)
-    {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "Error compiling MTL Shader: %s\n",
-                   err ? err.localizedDescription.UTF8String : "");
-        return false;
-    }
-
-    auto evalStencilsFunction = [_computeLibrary newFunctionWithName:@"eval_stencils"];
-    _evalStencils =
-      [context->device newComputePipelineStateWithFunction:evalStencilsFunction
-                                                     error:&err];
-
-#if !__has_feature(objc_arc)
-    [evalStencilsFunction release];
-#endif
-
-    if (!_evalStencils)
-    {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "Error compiling MTL Pipeline eval_stencils: %s\n",
-                   err ? err.localizedDescription.UTF8String : "");
-        return false;
-    }
-
-    auto evalPatchesFunction = [_computeLibrary newFunctionWithName:@"eval_patches"];
-    _evalPatches =
-      [context->device newComputePipelineStateWithFunction:evalPatchesFunction
-                                                     error:&err];
-
-#if !__has_feature(objc_arc)
-    [evalPatchesFunction release];
-#endif
-
-    if (!_evalPatches)
-    {
-        Far::Error(Far::FAR_RUNTIME_ERROR, "Error compiling MTL Pipeline eval_patches:  %s\n",
-                   err ? err.localizedDescription.UTF8String : "");
-        return false;
-    }
-
-    _parameterBuffer =
-      [context->device newBufferWithLength:sizeof(mtl::KernelUniformArgs)
-                                   options:MTLResourceOptionCPUCacheModeDefault];
-
-    return true;
-}
-
-MTLComputeEvaluator::MTLComputeEvaluator() : _workGroupSize(32) {}
-
-MTLComputeEvaluator::~MTLComputeEvaluator()
-{
-#if !__has_feature(objc_arc)
-    [_computeLibrary release];
-    [_evalStencils release];
-    [_evalPatches release];
-    [_parameterBuffer release];
-#endif
-}
-
-void MTLComputeEvaluator::Synchronize(MTLContext*) { }
-
-bool MTLComputeEvaluator::EvalStencils(
-    id<MTLBuffer> srcBuffer, BufferDescriptor const &srcDesc,
-    id<MTLBuffer> dstBuffer, BufferDescriptor const &dstDesc,
-    id<MTLBuffer> duBuffer, BufferDescriptor const &duDesc,
-    id<MTLBuffer> dvBuffer, BufferDescriptor const &dvDesc,
-    id<MTLBuffer> sizesBuffer,
-    id<MTLBuffer> offsetsBuffer,
-    id<MTLBuffer> indicesBuffer,
-    id<MTLBuffer> weightsBuffer,
-    id<MTLBuffer> duWeightsBuffer,
-    id<MTLBuffer> dvWeightsBuffer,
-    int start, int end,
-    MTLContext* context) const
-{
-    return EvalStencils(
-        srcBuffer, srcDesc,
-        dstBuffer, dstDesc,
-        duBuffer, duDesc,
-        dvBuffer, dvDesc,
-        nil, BufferDescriptor(),
-        nil, BufferDescriptor(),
-        nil, BufferDescriptor(),
-        sizesBuffer,
-        offsetsBuffer,
-        indicesBuffer,
-        weightsBuffer,
-        duWeightsBuffer,
-        dvWeightsBuffer,
-        nil, nil, nil,
-        start, end,
-        context);
-}
-
-bool MTLComputeEvaluator::EvalStencils(
-    id<MTLBuffer> srcBuffer, BufferDescriptor const &srcDesc,
-    id<MTLBuffer> dstBuffer, BufferDescriptor const &dstDesc,
-    id<MTLBuffer> duBuffer,  BufferDescriptor const &duDesc,
-    id<MTLBuffer> dvBuffer,  BufferDescriptor const &dvDesc,
-    id<MTLBuffer> duuBuffer, BufferDescriptor const &duuDesc,
-    id<MTLBuffer> duvBuffer, BufferDescriptor const &duvDesc,
-    id<MTLBuffer> dvvBuffer, BufferDescriptor const &dvvDesc,
-    id<MTLBuffer> sizesBuffer,
-    id<MTLBuffer> offsetsBuffer,
-    id<MTLBuffer> indicesBuffer,
-    id<MTLBuffer> weightsBuffer,
-    id<MTLBuffer> duWeightsBuffer,
-    id<MTLBuffer> dvWeightsBuffer,
-    id<MTLBuffer> duuWeightsBuffer,
-    id<MTLBuffer> duvWeightsBuffer,
-    id<MTLBuffer> dvvWeightsBuffer,
-    int start, int end,
-    MTLContext* context) const
-{
-    if(_evalStencils == nil)
-      return false;
-
-    auto count = end - start;
-    if (count <= 0)
-        return true;
-
-    assert(context != nullptr);
-
-    auto device = context->device;
-    auto commandQueue = context->commandQueue;
-
-    assert(device != nil && commandQueue != nil);
-
-    mtl::KernelUniformArgs args;
-    args.batchStart = start;
-    args.batchEnd = end;
-    args.srcOffset = srcDesc.offset;
-    args.dstOffset = dstDesc.offset;
-    args.duDesc = (simd::int3){duDesc.offset, duDesc.length, duDesc.stride};
-    args.dvDesc = (simd::int3){dvDesc.offset, dvDesc.length, dvDesc.stride};
-    args.duuDesc = (simd::int3){duuDesc.offset, duuDesc.length, duuDesc.stride};
-    args.duvDesc = (simd::int3){duvDesc.offset, duvDesc.length, duvDesc.stride};
-    args.dvvDesc = (simd::int3){dvvDesc.offset, dvvDesc.length, dvvDesc.stride};
-
-    memcpy(_parameterBuffer.contents, &args, sizeof(args));
-
-    auto commandBuffer = [commandQueue commandBuffer];
-
-    auto computeEncoder = [commandBuffer computeCommandEncoder];
-
-    [computeEncoder setBuffer:_parameterBuffer offset:0 atIndex:PARAMETER_BUFFER_INDEX];
-    [computeEncoder setBuffer:sizesBuffer offset:0 atIndex:SIZES_BUFFER_INDEX];
-    [computeEncoder setBuffer:weightsBuffer offset:0 atIndex:WEIGHTS_BUFFER_INDEX];
-    [computeEncoder setBuffer:offsetsBuffer offset:0 atIndex:OFFSETS_BUFFER_INDEX];
-    [computeEncoder setBuffer:indicesBuffer offset:0 atIndex:INDICES_BUFFER_INDEX];
-    [computeEncoder setBuffer:srcBuffer offset:0 atIndex:SRC_VERTEX_BUFFER_INDEX];
-    [computeEncoder setBuffer:dstBuffer offset:0 atIndex:DST_VERTEX_BUFFER_INDEX];
-    if(duWeightsBuffer && dvWeightsBuffer)
-    {
-        [computeEncoder setBuffer:duWeightsBuffer offset:0 atIndex:DU_WEIGHTS_BUFFER_INDEX];
-        [computeEncoder setBuffer:dvWeightsBuffer offset:0 atIndex:DV_WEIGHTS_BUFFER_INDEX];
-    }
-    [computeEncoder setBuffer:duBuffer offset:0 atIndex:DU_DERIVATIVE_BUFFER_INDEX];
-    [computeEncoder setBuffer:dvBuffer offset:0 atIndex:DV_DERIVATIVE_BUFFER_INDEX];
-    if(duuWeightsBuffer && duvWeightsBuffer && dvvWeightsBuffer)
-    {
-        [computeEncoder setBuffer:duuWeightsBuffer offset:0 atIndex:DUU_WEIGHTS_BUFFER_INDEX];
-        [computeEncoder setBuffer:duvWeightsBuffer offset:0 atIndex:DUV_WEIGHTS_BUFFER_INDEX];
-        [computeEncoder setBuffer:dvvWeightsBuffer offset:0 atIndex:DVV_WEIGHTS_BUFFER_INDEX];
-    }
-    if(duuBuffer && duvBuffer && dvvBuffer)
-    {
-        [computeEncoder setBuffer:duuBuffer offset:0 atIndex:DUU_DERIVATIVE_BUFFER_INDEX];
-        [computeEncoder setBuffer:duvBuffer offset:0 atIndex:DUV_DERIVATIVE_BUFFER_INDEX];
-        [computeEncoder setBuffer:dvvBuffer offset:0 atIndex:DVV_DERIVATIVE_BUFFER_INDEX];
-    }
-    [computeEncoder setComputePipelineState:_evalStencils];
-
-    auto threadgroups = MTLSizeMake((count + _workGroupSize - 1) / _workGroupSize, 1, 1);
-    auto threadsPerGroup = MTLSizeMake(_workGroupSize, 1, 1);
-    [computeEncoder dispatchThreadgroups:threadgroups
-                   threadsPerThreadgroup:threadsPerGroup];
-
-    [computeEncoder endEncoding];
-    [commandBuffer commit];
-    [commandBuffer waitUntilCompleted];
-
-    return true;
-}
-
-bool
-MTLComputeEvaluator::EvalPatches(
-    id<MTLBuffer> srcBuffer, const BufferDescriptor &srcDesc,
-    id<MTLBuffer> dstBuffer, const BufferDescriptor &dstDesc,
-    id<MTLBuffer> duBuffer, const BufferDescriptor &duDesc,
-    id<MTLBuffer> dvBuffer, const BufferDescriptor &dvDesc,
-    int numPatchCoords,
-    id<MTLBuffer> patchCoordsBuffer,
-    const PatchArrayVector &patchArrays,
-    id<MTLBuffer> patchIndexBuffer,
-    id<MTLBuffer> patchParamsBuffer,
-    MTLContext* context) const
-{
-    return EvalPatches(
-        srcBuffer, srcDesc,
-        dstBuffer, dstDesc,
-        duBuffer, duDesc,
-        dvBuffer, dvDesc,
-        nil, BufferDescriptor(),
-        nil, BufferDescriptor(),
-        nil, BufferDescriptor(),
-        numPatchCoords,
-        patchCoordsBuffer,
-        patchArrays,
-        patchIndexBuffer,
-        patchParamsBuffer,
-        context);
-}
-
-bool
-MTLComputeEvaluator::EvalPatches(
-    id<MTLBuffer> srcBuffer, const BufferDescriptor &srcDesc,
-    id<MTLBuffer> dstBuffer, const BufferDescriptor &dstDesc,
-    id<MTLBuffer> duBuffer,  const BufferDescriptor &duDesc,
-    id<MTLBuffer> dvBuffer,  const BufferDescriptor &dvDesc,
-    id<MTLBuffer> duuBuffer, const BufferDescriptor &duuDesc,
-    id<MTLBuffer> duvBuffer, const BufferDescriptor &duvDesc,
-    id<MTLBuffer> dvvBuffer, const BufferDescriptor &dvvDesc,
-    int numPatchCoords,
-    id<MTLBuffer> patchCoordsBuffer,
-    const PatchArrayVector &patchArrays,
-    id<MTLBuffer> patchIndexBuffer,
-    id<MTLBuffer> patchParamsBuffer,
-    MTLContext* context) const
-{
-    if(_evalPatches == nil)
-        return false;
-
-    assert(context != nullptr);
-
-    auto device = context->device;
-    auto commandQueue = context->commandQueue;
-
-    assert(device != nil && commandQueue != nil);
-
-    auto commandBuffer = [commandQueue commandBuffer];
-    auto computeCommandEncoder = [commandBuffer computeCommandEncoder];
-
-    mtl::KernelUniformArgs args;
-    args.batchStart = 0;
-    args.batchEnd = numPatchCoords;
-    args.srcOffset = srcDesc.offset;
-    args.dstOffset = dstDesc.offset;
-    args.duDesc = (simd::int3){duDesc.offset, duDesc.length, duDesc.stride};
-    args.dvDesc = (simd::int3){dvDesc.offset, dvDesc.length, dvDesc.stride};
-    args.duuDesc = (simd::int3){duuDesc.offset, duuDesc.length, duuDesc.stride};
-    args.duvDesc = (simd::int3){duvDesc.offset, duvDesc.length, duvDesc.stride};
-    args.dvvDesc = (simd::int3){dvvDesc.offset, dvvDesc.length, dvvDesc.stride};
-
-    [computeCommandEncoder setBytes:&args length:sizeof(mtl::KernelUniformArgs) atIndex:PARAMETER_BUFFER_INDEX];
-    [computeCommandEncoder setBuffer:srcBuffer offset:0 atIndex:SRC_VERTEX_BUFFER_INDEX];
-    [computeCommandEncoder setBuffer:dstBuffer offset:0 atIndex:DST_VERTEX_BUFFER_INDEX];
-    if (duBuffer && dvBuffer) {
-        [computeCommandEncoder setBuffer:duBuffer offset:0 atIndex:DU_DERIVATIVE_BUFFER_INDEX];
-        [computeCommandEncoder setBuffer:dvBuffer offset:0 atIndex:DV_DERIVATIVE_BUFFER_INDEX];
-    }
-    if (duuBuffer && duvBuffer && dvvBuffer) {
-        [computeCommandEncoder setBuffer:duuBuffer offset:0 atIndex:DUU_DERIVATIVE_BUFFER_INDEX];
-        [computeCommandEncoder setBuffer:duvBuffer offset:0 atIndex:DUV_DERIVATIVE_BUFFER_INDEX];
-        [computeCommandEncoder setBuffer:dvvBuffer offset:0 atIndex:DVV_DERIVATIVE_BUFFER_INDEX];
-    }
-    [computeCommandEncoder setBuffer:patchCoordsBuffer offset:0 atIndex:PATCH_COORDS_BUFFER_INDEX];
-    [computeCommandEncoder setBuffer:patchIndexBuffer offset:0 atIndex:PATCH_INDICES_BUFFER_INDEX];
-    [computeCommandEncoder setBuffer:patchParamsBuffer offset:0 atIndex:PATCH_PARAMS_BUFFER_INDEX];
-    assert(!patchArrays.empty());
-    [computeCommandEncoder setBytes:&patchArrays[0] length:sizeof(patchArrays[0]) * patchArrays.size() atIndex:PATCH_ARRAYS_BUFFER_INDEX];
-    [computeCommandEncoder setComputePipelineState:_evalPatches];
-
-    auto threadgroups =
-    MTLSizeMake((numPatchCoords + _workGroupSize - 1) / _workGroupSize, 1, 1);
-    auto threadsPerGroup = MTLSizeMake(_workGroupSize, 1, 1);
-    [computeCommandEncoder dispatchThreadgroups:threadgroups
-                   threadsPerThreadgroup:threadsPerGroup];
-
-    [computeCommandEncoder endEncoding];
-    [commandBuffer commit];
-    [commandBuffer waitUntilCompleted];
-
-    return true;
-}
-
-} //end namespace Osd
-
-} //end namespace OPENSUBDIV_VERSION
-} //end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlComputeKernel.metal b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlComputeKernel.metal
deleted file mode 100644
index ca171283c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlComputeKernel.metal
+++ /dev/null
@@ -1,318 +0,0 @@
-#line 0 "osd/mtlComputeKernel.metal"
-
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include <metal_stdlib>
-
-#ifndef OPENSUBDIV_MTL_COMPUTE_USE_1ST_DERIVATIVES
-#define OPENSUBDIV_MTL_COMPUTE_USE_1ST_DERIVATIVES 0
-#endif
-
-#ifndef OPENSUBDIV_MTL_COMPUTE_USE_2ND_DERIVATIVES
-#define OPENSUBDIV_MTL_COMPUTE_USE_2ND_DERIVATIVES 0
-#endif
-
-using namespace metal;
-
-struct KernelUniformArgs
-{
-    int batchStart;
-    int batchEnd;
-
-    int srcOffset;
-    int dstOffset;
-
-    int3 duDesc;
-    int3 dvDesc;
-
-    int3 duuDesc;
-    int3 duvDesc;
-    int3 dvvDesc;
-};
-
-struct Vertex {
-    float vertexData[LENGTH];
-};
-
-void clear(thread Vertex& v) {
-    for (int i = 0; i < LENGTH; ++i) {
-        v.vertexData[i] = 0;
-    }
-}
-
-Vertex readVertex(int index, device const float* vertexBuffer, KernelUniformArgs args) {
-    Vertex v;
-    int vertexIndex = args.srcOffset + index * SRC_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        v.vertexData[i] = vertexBuffer[vertexIndex + i];
-    }
-    return v;
-}
-
-void writeVertex(int index, Vertex v, device float* vertexBuffer, KernelUniformArgs args) {
-    int vertexIndex = args.dstOffset + index * DST_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        vertexBuffer[vertexIndex + i] = v.vertexData[i];
-    }
-}
-
-void writeVertexSeparate(int index, Vertex v, device float* dstVertexBuffer, KernelUniformArgs args) {
-    int vertexIndex = args.dstOffset + index * DST_STRIDE;
-    for (int i = 0; i < LENGTH; ++i) {
-        dstVertexBuffer[vertexIndex + i] = v.vertexData[i];
-    }
-}
-
-void addWithWeight(thread Vertex& v, const Vertex src, float weight) {
-    for (int i = 0; i < LENGTH; ++i) {
-        v.vertexData[i] += weight * src.vertexData[i];
-    }
-}
-
-#if OPENSUBDIV_MTL_COMPUTE_USE_1ST_DERIVATIVES
-void writeDu(int index, Vertex du, device float* duDerivativeBuffer, KernelUniformArgs args)
-{
-    int duIndex = args.duDesc.x + index * args.duDesc.z;
-    for(int i = 0; i < LENGTH; i++) {
-        duDerivativeBuffer[duIndex + i] = du.vertexData[i];
-    }
-}
-
-void writeDv(int index, Vertex dv, device float* dvDerivativeBuffer, KernelUniformArgs args)
-{
-    int dvIndex = args.dvDesc.x + index * args.dvDesc.z;
-    for(int i = 0; i < LENGTH; i++) {
-        dvDerivativeBuffer[dvIndex + i] = dv.vertexData[i];
-    }
-}
-#endif
-
-#if OPENSUBDIV_MTL_COMPUTE_USE_2ND_DERIVATIVES
-void writeDuu(int index, Vertex duu, device float* duuDerivativeBuffer, KernelUniformArgs args)
-{
-    int duuIndex = args.duuDesc.x + index * args.duuDesc.z;
-    for(int i = 0; i < LENGTH; i++) {
-        duuDerivativeBuffer[duuIndex + i] = duu.vertexData[i];
-    }
-}
-
-void writeDuv(int index, Vertex duv, device float* duvDerivativeBuffer, KernelUniformArgs args)
-{
-    int duvIndex = args.duvDesc.x + index * args.duvDesc.z;
-    for(int i = 0; i < LENGTH; i++) {
-        duvDerivativeBuffer[duvIndex + i] = duv.vertexData[i];
-    }
-}
-
-void writeDvv(int index, Vertex dvv, device float* dvvDerivativeBuffer, KernelUniformArgs args)
-{
-    int dvvIndex = args.dvvDesc.x + index * args.dvvDesc.z;
-    for(int i = 0; i < LENGTH; i++) {
-        dvvDerivativeBuffer[dvvIndex + i] = dvv.vertexData[i];
-    }
-}
-#endif
-
-// ---------------------------------------------------------------------------
-
-kernel void eval_stencils(
-    uint thread_position_in_grid [[thread_position_in_grid]],
-    const device int* sizes [[buffer(SIZES_BUFFER_INDEX)]],
-    const device int* offsets [[buffer(OFFSETS_BUFFER_INDEX)]],
-    const device int* indices [[buffer(INDICES_BUFFER_INDEX)]],
-    const device float* weights [[buffer(WEIGHTS_BUFFER_INDEX)]],
-    const device float* srcVertices [[buffer(SRC_VERTEX_BUFFER_INDEX)]],
-    device float* dstVertexBuffer [[buffer(DST_VERTEX_BUFFER_INDEX)]],
-#if OPENSUBDIV_MTL_COMPUTE_USE_1ST_DERIVATIVES
-    const device float* duWeights [[buffer(DU_WEIGHTS_BUFFER_INDEX)]],
-    const device float* dvWeights [[buffer(DV_WEIGHTS_BUFFER_INDEX)]],
-    device float* duDerivativeBuffer [[buffer(DU_DERIVATIVE_BUFFER_INDEX)]],
-    device float* dvDerivativeBuffer [[buffer(DV_DERIVATIVE_BUFFER_INDEX)]],
-#endif
-#if OPENSUBDIV_MTL_COMPUTE_USE_2ND_DERIVATIVES
-    const device float* duuWeights [[buffer(DUU_WEIGHTS_BUFFER_INDEX)]],
-    const device float* duvWeights [[buffer(DUV_WEIGHTS_BUFFER_INDEX)]],
-    const device float* dvvWeights [[buffer(DVV_WEIGHTS_BUFFER_INDEX)]],
-    device float* duuDerivativeBuffer [[buffer(DUU_DERIVATIVE_BUFFER_INDEX)]],
-    device float* duvDerivativeBuffer [[buffer(DUV_DERIVATIVE_BUFFER_INDEX)]],
-    device float* dvvDerivativeBuffer [[buffer(DVV_DERIVATIVE_BUFFER_INDEX)]],
-#endif
-    const constant KernelUniformArgs& args [[buffer(PARAMETER_BUFFER_INDEX)]]
-)
-{
-    auto current  = thread_position_in_grid + args.batchStart;
-    if(current >= (unsigned int)args.batchEnd)
-        return;
-
-    Vertex dst;
-    clear(dst);
-
-
-    auto offset = offsets[current];
-    auto size = sizes[current];
-
-    for(auto stencil = 0; stencil < size; stencil++)
-    {
-        auto vindex = offset + stencil;
-        addWithWeight(dst, readVertex(indices[vindex], srcVertices, args), weights[vindex]);
-    }
-
-    writeVertex(current, dst, dstVertexBuffer, args);
-
-#if OPENSUBDIV_MTL_COMPUTE_USE_1ST_DERIVATIVES
-    Vertex du, dv;
-    clear(du);
-    clear(dv);
-
-
-    for(auto i = 0; i < size; i++)
-    {
-        auto src = readVertex(indices[offset + i], srcVertices, args);
-        addWithWeight(du, src, duWeights[offset + i]);
-        addWithWeight(dv, src, dvWeights[offset + i]);
-    }
-
-    writeDu(current, du, duDerivativeBuffer, args);
-    writeDv(current, dv, dvDerivativeBuffer, args);
-#endif
-
-#if OPENSUBDIV_MTL_COMPUTE_USE_2ND_DERIVATIVES
-    Vertex duu, duv, dvv;
-    clear(duu);
-    clear(duv);
-    clear(dvv);
-
-
-    for(auto i = 0; i < size; i++)
-    {
-        auto src = readVertex(indices[offset + i], srcVertices, args);
-        addWithWeight(duu, src, duuWeights[offset + i]);
-        addWithWeight(duv, src, duvWeights[offset + i]);
-        addWithWeight(dvv, src, dvvWeights[offset + i]);
-    }
-
-    writeDuu(current, duu, duuDerivativeBuffer, args);
-    writeDuv(current, duv, duvDerivativeBuffer, args);
-    writeDvv(current, dvv, dvvDerivativeBuffer, args);
-#endif
-}
-
-
-// ---------------------------------------------------------------------------
-
-// PERFORMANCE: stride could be constant, but not as significant as length
-
-// ---------------------------------------------------------------------------
-
-kernel void eval_patches(
-    uint thread_position_in_grid [[thread_position_in_grid]],
-    const constant int* patchArrays [[buffer(PATCH_ARRAYS_BUFFER_INDEX)]],
-    const device int* patchCoords [[buffer(PATCH_COORDS_BUFFER_INDEX)]],
-    const device int* patchIndices [[buffer(PATCH_INDICES_BUFFER_INDEX)]],
-    const device uint* patchParams [[buffer(PATCH_PARAMS_BUFFER_INDEX)]],
-    const device float* srcVertexBuffer [[buffer(SRC_VERTEX_BUFFER_INDEX)]],
-    device float* dstVertexBuffer [[buffer(DST_VERTEX_BUFFER_INDEX)]],
-#if OPENSUBDIV_MTL_COMPUTE_USE_1ST_DERIVATIVES
-    device float* duDerivativeBuffer [[buffer(DU_DERIVATIVE_BUFFER_INDEX)]],
-    device float* dvDerivativeBuffer [[buffer(DV_DERIVATIVE_BUFFER_INDEX)]],
-#endif
-#if OPENSUBDIV_MTL_COMPUTE_USE_2ND_DERIVATIVES
-    device float* duuDerivativeBuffer [[buffer(DUU_DERIVATIVE_BUFFER_INDEX)]],
-    device float* duvDerivativeBuffer [[buffer(DUV_DERIVATIVE_BUFFER_INDEX)]],
-    device float* dvvDerivativeBuffer [[buffer(DVV_DERIVATIVE_BUFFER_INDEX)]],
-#endif
-    const constant KernelUniformArgs& args [[buffer(PARAMETER_BUFFER_INDEX)]]
-)
-{
-    auto current = thread_position_in_grid;
-
-    // unpack struct (5 ints unaligned)
-    OsdPatchCoord patchCoord = OsdPatchCoordInit(patchCoords[current*5+0],
-                                                 patchCoords[current*5+1],
-                                                 patchCoords[current*5+2],
-                                  as_type<float>(patchCoords[current*5+3]),
-                                  as_type<float>(patchCoords[current*5+4]));
-
-    OsdPatchArray patchArray = OsdPatchArrayInit(patchArrays[patchCoord.arrayIndex*6+0],
-                                                 patchArrays[patchCoord.arrayIndex*6+1],
-                                                 patchArrays[patchCoord.arrayIndex*6+2],
-                                                 patchArrays[patchCoord.arrayIndex*6+3],
-                                                 patchArrays[patchCoord.arrayIndex*6+4],
-                                                 patchArrays[patchCoord.arrayIndex*6+5]);
-
-    OsdPatchParam patchParam = OsdPatchParamInit(patchParams[patchCoord.patchIndex*3+0],
-                                                 patchParams[patchCoord.patchIndex*3+1],
-                                  as_type<float>(patchParams[patchCoord.patchIndex*3+2]));
-
-    int patchType = OsdPatchParamIsRegular(patchParam)
-        ? patchArray.regDesc : patchArray.desc;
-
-    float wP[20], wDu[20], wDv[20], wDuu[20], wDuv[20], wDvv[20];
-    int nPoints = OsdEvaluatePatchBasis(patchType, patchParam,
-        patchCoord.s, patchCoord.t, wP, wDu, wDv, wDuu, wDuv, wDvv);
-
-    Vertex dst, du, dv, duu, duv, dvv;
-    clear(dst);
-    clear(du);
-    clear(dv);
-    clear(duu);
-    clear(duv);
-    clear(dvv);
-
-    auto indexBase = patchArray.indexBase + patchArray.stride *
-                (patchCoord.patchIndex - patchArray.primitiveIdBase);
-    for(auto cv = 0; cv < nPoints; cv++)
-    {
-        auto index = patchIndices[indexBase + cv];
-        auto src = readVertex(index, srcVertexBuffer, args);
-        addWithWeight(dst, src, wP[cv]);
-        addWithWeight(du,  src, wDu[cv]);
-        addWithWeight(dv,  src, wDv[cv]);
-        addWithWeight(duu, src, wDuu[cv]);
-        addWithWeight(duv, src, wDuv[cv]);
-        addWithWeight(dvv, src, wDvv[cv]);
-    }
-
-    writeVertex(current, dst, dstVertexBuffer, args);
-
-#if OPENSUBDIV_MTL_COMPUTE_USE_1ST_DERIVATIVES
-    if(args.duDesc.y > 0)
-        writeDu(current, du, duDerivativeBuffer, args);
-
-    if(args.dvDesc.y > 0)
-        writeDv(current, dv, dvDerivativeBuffer, args);
-#endif
-
-#if OPENSUBDIV_MTL_COMPUTE_USE_2ND_DERIVATIVES
-    if(args.duuDesc.y > 0)
-        writeDuu(current, duu, duuDerivativeBuffer, args);
-
-    if(args.duvDesc.y > 0)
-        writeDuv(current, duv, duvDerivativeBuffer, args);
-
-    if(args.dvvDesc.y > 0)
-        writeDvv(current, dvv, dvvDerivativeBuffer, args);
-#endif
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlLegacyGregoryPatchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlLegacyGregoryPatchTable.h
deleted file mode 100644
index 721c21c74..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlLegacyGregoryPatchTable.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_MTL_LEGACY_GREGORY_PATCH_TABLE_H
-#define OPENSUBDIV3_OSD_MTL_LEGACY_GREGORY_PATCH_TABLE_H
-
-#include "../version.h"
-#include "../far/patchTable.h"
-#include "../osd/nonCopyable.h"
-#include "../osd/mtlCommon.h"
-
-@protocol MTLDevice;
-@protocol MTLBuffer;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class MTLLegacyGregoryPatchTable
-: private NonCopyable<MTLLegacyGregoryPatchTable>
-{
-public:
-    ~MTLLegacyGregoryPatchTable();
-
-    template<typename DEVICE_CONTEXT>
-    static MTLLegacyGregoryPatchTable* Create(Far::PatchTable const* farPatchTable, DEVICE_CONTEXT context) {
-        return Create(farPatchTable, context);
-    }
-
-    static MTLLegacyGregoryPatchTable* Create(Far::PatchTable const* farPatchTable, MTLContext* context);
-
-    void UpdateVertexBuffer(id<MTLBuffer> vbo, int numVertices, int numVertexElements, MTLContext* context);
-
-    id<MTLBuffer> GetVertexBuffer() const
-    {
-        return _vertexBuffer;
-    }
-
-    id<MTLBuffer> GetVertexValenceBuffer() const
-    {
-        return _vertexValenceBuffer;
-    }
-
-    id<MTLBuffer> GetQuadOffsetsBuffer() const
-    {
-        return _quadOffsetsBuffer;
-    }
-
-    int GetQuadOffsetsBase(Far::PatchDescriptor::Type type)
-    {
-        if(type == Far::PatchDescriptor::GREGORY_BOUNDARY)
-            return _quadOffsetsBase[1];
-        return _quadOffsetsBase[0];
-    }
-
-private:
-    id<MTLBuffer> _vertexBuffer;
-    id<MTLBuffer> _vertexValenceBuffer;
-    id<MTLBuffer> _quadOffsetsBuffer;
-    int _quadOffsetsBase[2];
-};
-
-} //end namespace Osd
-
-} //end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} //end namespace OpenSuddiv
-
-#endif // OPENSUBDIV3_OSD_MTL_LEGACY_GREGORY_PATCH_TABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlLegacyGregoryPatchTable.mm b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlLegacyGregoryPatchTable.mm
deleted file mode 100644
index 3246cb2a9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlLegacyGregoryPatchTable.mm
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/mtlLegacyGregoryPatchTable.h"
-#include <Metal/Metal.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-namespace Osd {
-
-static id<MTLBuffer> createBuffer(const void* data, const size_t length,
-                                  MTLContext* context)
-{
-  @autoreleasepool {
-    auto cmdBuf = [context->commandQueue commandBuffer];
-    auto blitEncoder = [cmdBuf blitCommandEncoder];
-
-    auto stageBuffer = [context->device newBufferWithBytes:data length:length options:MTLResourceOptionCPUCacheModeDefault];
-
-    auto finalBuffer = [context->device newBufferWithLength:length options:MTLResourceStorageModePrivate];
-
-    [blitEncoder copyFromBuffer:stageBuffer sourceOffset:0 toBuffer:finalBuffer destinationOffset:0 size:length];
-    [blitEncoder endEncoding];
-    [cmdBuf commit];
-    [cmdBuf waitUntilCompleted];
-
-#if !__has_feature(objc_arc)
-      [stageBuffer release];
-#endif
-
-    return finalBuffer;
-  }
-}
-
-MTLLegacyGregoryPatchTable::~MTLLegacyGregoryPatchTable()
-{
-
-}
-
-MTLLegacyGregoryPatchTable* MTLLegacyGregoryPatchTable::Create(const Far::PatchTable *farPatchTable,
-                                                               MTLContext* context)
-{
-    auto pt = new MTLLegacyGregoryPatchTable();
-    auto& vertexValenceTable = farPatchTable->GetVertexValenceTable();
-    auto& quadOffsetsTable = farPatchTable->GetQuadOffsetsTable();
-
-    if(!vertexValenceTable.empty())
-    {
-        pt->_vertexValenceBuffer = createBuffer(vertexValenceTable.data(), vertexValenceTable.size() * sizeof(vertexValenceTable[0]), context);
-    }
-
-    if(!quadOffsetsTable.empty())
-    {
-        pt->_quadOffsetsBuffer = createBuffer(quadOffsetsTable.data(), quadOffsetsTable.size() * sizeof(quadOffsetsTable[0]), context);
-    }
-
-    pt->_quadOffsetsBase[0] = 0;
-    pt->_quadOffsetsBase[1] = 0;
-
-    for(auto i = 0; i < farPatchTable->GetNumPatchArrays(); i++)
-    {
-        if(farPatchTable->GetPatchArrayDescriptor(i).GetType() == Far::PatchDescriptor::GREGORY)
-        {
-            pt->_quadOffsetsBase[1] = farPatchTable->GetNumPatches(i) * 4;
-            break;
-        }
-    }
-
-    return pt;
-}
-
-void MTLLegacyGregoryPatchTable::UpdateVertexBuffer(id<MTLBuffer> vbo, int numVertices, int numVertexElements, MTLContext* context)
-{
-    _vertexBuffer = vbo;
-}
-
-} //end namespace Osd
-
-} //end namespace OPENSUBDIV_VERSION
-} //end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlMesh.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlMesh.h
deleted file mode 100644
index a2902ecdf..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlMesh.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_MTL_MESH_H
-#define OPENSUBDIV3_OSD_MTL_MESH_H
-
-#include "../version.h"
-#include "../osd/mesh.h"
-#include "../osd/mtlPatchTable.h"
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-typedef MeshInterface<MTLPatchTable> MTLMeshInterface;
-
-} // end namespace Osd
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif // OPENSUBDIV3_OSD_MTL_MESH_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlMesh.mm b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlMesh.mm
deleted file mode 100644
index ffb689d48..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlMesh.mm
+++ /dev/null
@@ -1 +0,0 @@
-#import "../osd/mtlMesh.h"
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchBSpline.metal b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchBSpline.metal
deleted file mode 100644
index d107baa6d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchBSpline.metal
+++ /dev/null
@@ -1,234 +0,0 @@
-#line 0 "osd/mtlPatchBSpline.metal"
-
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.BSpline.Hull
-//----------------------------------------------------------
-
-void OsdComputePerVertex(
-        float4 position,
-        threadgroup HullVertex& hullVertex,
-        int vertexId,
-        float4x4 modelViewProjectionMatrix,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    hullVertex.position = position;
-#if OSD_ENABLE_PATCH_CULL
-    float4 clipPos = mul(modelViewProjectionMatrix, position);
-    short3 clip0 = short3(clipPos.x < clipPos.w,
-                          clipPos.y < clipPos.w,
-                          clipPos.z < clipPos.w);
-    short3 clip1 = short3(clipPos.x > -clipPos.w,
-                          clipPos.y > -clipPos.w,
-                          clipPos.z > -clipPos.w);
-    hullVertex.clipFlag = short3(clip0) + 2*short3(clip1);
-#endif
-}
-
-//----------------------------------------------------------
-// Patches.BSpline.Factors
-//----------------------------------------------------------
-
-void OsdComputePerPatchBSplineFactors(
-        int3 patchParam,
-        float tessLevel,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        device OsdPerPatchVertexBezier* patch,
-#if !USE_PTVS_FACTORS
-        device OsdPerPatchTessFactors& patchFactors,
-#endif
-        device MTLQuadTessellationFactorsHalf& quadFactors
-        )
-{
-    float4 tessLevelOuter = float4(0);
-    float2 tessLevelInner = float2(0);
-    float4 tessOuterLo = float4(0);
-    float4 tessOuterHi = float4(0);
-
-#if OSD_ENABLE_SCREENSPACE_TESSELLATION
-    OsdEvalPatchBezierTessLevels(
-        tessLevel,
-        projectionMatrix,
-        modelViewMatrix,
-        patch,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#else
-    OsdGetTessLevelsUniform(
-        tessLevel,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#endif
-
-    quadFactors.edgeTessellationFactor[0] = tessLevelOuter[0];
-    quadFactors.edgeTessellationFactor[1] = tessLevelOuter[1];
-    quadFactors.edgeTessellationFactor[2] = tessLevelOuter[2];
-    quadFactors.edgeTessellationFactor[3] = tessLevelOuter[3];
-    quadFactors.insideTessellationFactor[0] = tessLevelInner[0];
-    quadFactors.insideTessellationFactor[1] = tessLevelInner[1];
-#if !USE_PTVS_FACTORS
-    patchFactors.tessOuterLo = tessOuterLo;
-    patchFactors.tessOuterHi = tessOuterHi;
-#endif
-}
-
-void OsdComputePerPatchFactors(
-        int3 patchParam,
-        float tessLevel,
-        unsigned patchID,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        OsdPatchParamBufferSet osdBuffer,
-        threadgroup PatchVertexType* patchVertices,
-        device MTLQuadTessellationFactorsHalf& quadFactors
-        )
-{
-    OsdComputePerPatchBSplineFactors(
-        patchParam,
-        tessLevel,
-        projectionMatrix,
-        modelViewMatrix,
-        osdBuffer.perPatchVertexBuffer + patchID * VERTEX_CONTROL_POINTS_PER_PATCH,
-#if !USE_PTVS_FACTORS
-        osdBuffer.patchTessBuffer[patchID],
-#endif
-        quadFactors
-        );
-}
-
-//----------------------------------------------------------
-// Patches.BSpline.Vertex
-//----------------------------------------------------------
-
-void OsdComputePerPatchVertex(
-        int3 patchParam,
-        unsigned ID,
-        unsigned PrimitiveID,
-        unsigned ControlID,
-        threadgroup PatchVertexType* patchVertices,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    OsdComputePerPatchVertexBSpline(patchParam, ID,
-        patchVertices, osdBuffers.perPatchVertexBuffer[ControlID]);
-}
-
-//----------------------------------------------------------
-// Patches.BSpline.Domain
-//----------------------------------------------------------
-
-template<typename PerPatchVertexBezier>
-OsdPatchVertex ds_regular_patches(
-        const float tessLevel,
-#if !USE_PTVS_FACTORS
-        float4 tessOuterLo,
-        float4 tessOuterHi,
-#endif
-        PerPatchVertexBezier cv,
-        int3 patchParam,
-        float2 domainCoord
-        )
-{
-#if USE_PTVS_FACTORS
-    float4 tessOuterLo(0), tessOuterHi(0);
-    OsdGetTessLevelsUniform(tessLevel, patchParam, tessOuterLo, tessOuterHi);
-#endif
-
-    float2 UV = OsdGetTessParameterization(domainCoord,
-                                           tessOuterLo,
-                                           tessOuterHi);
-
-    OsdPatchVertex output;
-
-    float3 P = float3(0), dPu = float3(0), dPv = float3(0);
-    float3 N = float3(0), dNu = float3(0), dNv = float3(0);
-    float2 vSegments = float2(0);
-
-    OsdEvalPatchBezier(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv, vSegments);
-
-    output.normal = N;
-    output.tangent = dPu;
-    output.bitangent = dPv;
-#if OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-#if OSD_PATCH_ENABLE_SINGLE_CREASE
-    output.vSegments = vSegments;
-#endif
-
-    output.tessCoord = UV;
-    output.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-    output.position = P;
-    return output;
-}
-
-#if USE_STAGE_IN
-template<typename PerPatchVertexBezier>
-#endif
-OsdPatchVertex OsdComputePatch(
-        float tessLevel,
-        float2 domainCoord,
-        unsigned patchID,
-#if USE_STAGE_IN
-        PerPatchVertexBezier osdPatch
-#else
-        OsdVertexBufferSet osdBuffers
-#endif
-        )
-{
-    return ds_regular_patches(
-            tessLevel,
-#if !USE_PTVS_FACTORS
-#if USE_STAGE_IN
-            osdPatch.tessOuterLo,
-            osdPatch.tessOuterHi,
-#else
-            osdBuffers.patchTessBuffer[patchID].tessOuterLo,
-            osdBuffers.patchTessBuffer[patchID].tessOuterHi,
-#endif
-#endif
-#if USE_STAGE_IN
-            osdPatch.cv,
-            osdPatch.patchParam,
-#else
-            osdBuffers.perPatchVertexBuffer + patchID * VERTEX_CONTROL_POINTS_PER_PATCH,
-            osdBuffers.patchParamBuffer[patchID],
-#endif
-            domainCoord
-            );
-}
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchBoxSplineTriangle.metal b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchBoxSplineTriangle.metal
deleted file mode 100644
index 96f88df16..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchBoxSplineTriangle.metal
+++ /dev/null
@@ -1,236 +0,0 @@
-#line 0 "osd/mtlPatchBoxSplineTriangle.metal"
-
-//
-//   Copyright 2019 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.BoxSplineTriangle.Hull
-//----------------------------------------------------------
-
-void OsdComputePerVertex(
-        float4 position,
-        threadgroup HullVertex& hullVertex,
-        int vertexId,
-        float4x4 modelViewProjectionMatrix,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    hullVertex.position = position;
-#if OSD_ENABLE_PATCH_CULL
-    float4 clipPos = mul(modelViewProjectionMatrix, position);
-    short3 clip0 = short3(clipPos.x < clipPos.w,
-                          clipPos.y < clipPos.w,
-                          clipPos.z < clipPos.w);
-    short3 clip1 = short3(clipPos.x > -clipPos.w,
-                          clipPos.y > -clipPos.w,
-                          clipPos.z > -clipPos.w);
-    hullVertex.clipFlag = short3(clip0) + 2*short3(clip1);
-#endif
-}
-
-//----------------------------------------------------------
-// Patches.BoxSplineTriangle.Factors
-//----------------------------------------------------------
-
-void OsdComputePerPatchBezierTriangleFactors(
-        int3 patchParam,
-        float tessLevel,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        device OsdPerPatchVertexBezier* patch,
-#if !USE_PTVS_FACTORS
-        device OsdPerPatchTessFactors& patchFactors,
-#endif
-        device MTLTriangleTessellationFactorsHalf& triFactors
-        )
-{
-    float4 tessLevelOuter = float4(0);
-    float2 tessLevelInner = float2(0);
-    float4 tessOuterLo = float4(0);
-    float4 tessOuterHi = float4(0);
-
-#if OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Gather bezier control points to compute limit surface tess levels
-    float3 bezcv[15];
-    for (int i=0; i<15; ++i) {
-        bezcv[i] = patch[i].P;
-    }
-
-    OsdEvalPatchBezierTriangleTessLevels(
-        tessLevel,
-        projectionMatrix,
-        modelViewMatrix,
-        bezcv,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#else
-    OsdGetTessLevelsUniformTriangle(
-        tessLevel,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#endif
-
-    triFactors.edgeTessellationFactor[0] = tessLevelOuter[0];
-    triFactors.edgeTessellationFactor[1] = tessLevelOuter[1];
-    triFactors.edgeTessellationFactor[2] = tessLevelOuter[2];
-    triFactors.insideTessellationFactor  = tessLevelInner[0];
-#if !USE_PTVS_FACTORS
-    patchFactors.tessOuterLo = tessOuterLo;
-    patchFactors.tessOuterHi = tessOuterHi;
-#endif
-}
-
-void OsdComputePerPatchFactors(
-        int3 patchParam,
-        float tessLevel,
-        unsigned patchID,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        OsdPatchParamBufferSet osdBuffer,
-        threadgroup PatchVertexType* patchVertices,
-        device MTLTriangleTessellationFactorsHalf& triFactors
-        )
-{
-    OsdComputePerPatchBezierTriangleFactors(
-            patchParam,
-            tessLevel,
-            projectionMatrix,
-            modelViewMatrix,
-            osdBuffer.perPatchVertexBuffer + patchID * VERTEX_CONTROL_POINTS_PER_PATCH,
-#if !USE_PTVS_FACTORS
-            osdBuffer.patchTessBuffer[patchID],
-#endif
-            triFactors
-            );
-}
-
-//----------------------------------------------------------
-// Patches.BoxSplineTriangle.Vertex
-//----------------------------------------------------------
-
-void OsdComputePerPatchVertex(
-        int3 patchParam,
-        unsigned ID,
-        unsigned PrimitiveID,
-        unsigned ControlID,
-        threadgroup PatchVertexType* patchVertices,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    OsdComputePerPatchVertexBoxSplineTriangle(
-        patchParam, ID, patchVertices,
-        osdBuffers.perPatchVertexBuffer[ControlID]);
-}
-
-//----------------------------------------------------------
-// Patches.BoxSplineTriangle.Domain
-//----------------------------------------------------------
-
-template<typename PerPatchVertexBezier>
-OsdPatchVertex ds_regular_patches(
-        float tessLevel,
-#if !USE_PTVS_FACTORS
-        float4 tessOuterLo,
-        float4 tessOuterHi,
-#endif
-        PerPatchVertexBezier cv,
-        int3 patchParam,
-        float3 domainCoord
-        )
-{
-#if USE_PTVS_FACTORS
-    float4 tessOuterLo(0), tessOuterHi(0);
-    OsdGetTessLevelsUniformTriangle(
-        tessLevel, patchParam, tessOuterLo, tessOuterHi);
-#endif
-
-    float2 UV = OsdGetTessParameterizationTriangle(domainCoord,
-                                                   tessOuterLo,
-                                                   tessOuterHi);
-
-    OsdPatchVertex output;
-
-    float3 P = float3(0), dPu = float3(0), dPv = float3(0);
-    float3 N = float3(0), dNu = float3(0), dNv = float3(0);
-
-    OsdEvalPatchBezierTriangle(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    output.normal = N;
-    output.tangent = dPu;
-    output.bitangent = dPv;
-#if OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-
-    output.tessCoord = UV;
-    output.patchCoord = OsdInterpolatePatchCoordTriangle(UV, patchParam);
-    output.position = P;
-    return output;
-}
-
-#if USE_STAGE_IN
-template<typename PerPatchVertexBezier>
-#endif
-OsdPatchVertex OsdComputePatch(
-        float tessLevel,
-        float3 domainCoord,
-        unsigned patchID,
-#if USE_STAGE_IN
-        PerPatchVertexBezier osdPatch
-#else
-        OsdVertexBufferSet osdBuffers
-#endif
-        )
-{
-    return ds_regular_patches(
-            tessLevel,
-#if !USE_PTVS_FACTORS
-#if USE_STAGE_IN
-            osdPatch.tessOuterLo,
-            osdPatch.tessOuterHi,
-#else
-            osdBuffers.patchTessBuffer[patchID].tessOuterLo,
-            osdBuffers.patchTessBuffer[patchID].tessOuterHi,
-#endif
-#endif
-#if USE_STAGE_IN
-            osdPatch.cv,
-            osdPatch.patchParam,
-#else
-            osdBuffers.perPatchVertexBuffer + patchID * VERTEX_CONTROL_POINTS_PER_PATCH,
-            osdBuffers.patchParamBuffer[patchID],
-#endif
-            domainCoord
-            );
-}
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchCommon.metal b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchCommon.metal
deleted file mode 100644
index 60c1a18d4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchCommon.metal
+++ /dev/null
@@ -1,1446 +0,0 @@
-#line 0 "osd/mtlPatchCommon.metal"
-
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.Common
-//----------------------------------------------------------
-
-#include <metal_stdlib>
-
-#define offsetof_(X, Y) &(((device X*)nullptr)->Y)
-
-#define OSD_IS_ADAPTIVE (OSD_PATCH_REGULAR || OSD_PATCH_BOX_SPLINE_TRIANGLE || OSD_PATCH_GREGORY_BASIS || OSD_PATCH_GREGORY_TRIANGLE || OSD_PATCH_GREGORY || OSD_PATCH_GREGORY_BOUNDARY)
-
-#ifndef OSD_MAX_TESS_LEVEL
-#define OSD_MAX_TESS_LEVEL 64
-#endif
-
-#ifndef OSD_NUM_ELEMENTS
-#define OSD_NUM_ELEMENTS 3
-#endif
-
-using namespace metal;
-
-using OsdPatchParamBufferType = packed_int3;
-
-struct OsdPerVertexGregory {
-    float3 P;
-    short3 clipFlag;
-    int valence;
-    float3 e0;
-    float3 e1;
-#if OSD_PATCH_GREGORY_BOUNDARY
-    int zerothNeighbor;
-    float3 org;
-#endif
-    float3 r[OSD_MAX_VALENCE];
-};
-
-struct OsdPerPatchVertexGregory {
-    packed_float3 P;
-    packed_float3 Ep;
-    packed_float3 Em;
-    packed_float3 Fp;
-    packed_float3 Fm;
-};
-
-//----------------------------------------------------------
-// HLSL->Metal Compatibility
-//----------------------------------------------------------
-
-float4 mul(float4x4 a, float4 b)
-{
-    return a * b;
-}
-
-float3 mul(float4x4 a, float3 b)
-{
-    float3x3 m(a[0].xyz, a[1].xyz, a[2].xyz);
-    return m * b;
-
-}
-
-//----------------------------------------------------------
-// Patches.Common
-//----------------------------------------------------------
-
-struct HullVertex {
-    float4 position;
-#if OSD_ENABLE_PATCH_CULL
-    short3 clipFlag;
-#endif
-
-    float3 GetPosition() threadgroup
-    {
-        return position.xyz;
-    }
-
-    void SetPosition(float3 v) threadgroup
-    {
-        position.xyz = v;
-    }
-};
-
-// XXXdyu all downstream data can be handled by client code
-struct OsdPatchVertex {
-    float3 position;
-    float3 normal;
-    float3 tangent;
-    float3 bitangent;
-    float4 patchCoord; //u, v, faceLevel, faceId
-    float2 tessCoord; // tesscoord.st
-#if OSD_COMPUTE_NORMAL_DERIVATIVES
-    float3 Nu;
-    float3 Nv;
-#endif
-#if OSD_PATCH_ENABLE_SINGLE_CREASE
-    float2 vSegments;
-#endif
-};
-
-struct OsdPerPatchTessFactors {
-    float4 tessOuterLo;
-    float4 tessOuterHi;
-};
-
-struct OsdPerPatchVertexBezier {
-    packed_float3 P;
-#if OSD_PATCH_ENABLE_SINGLE_CREASE
-    packed_float3 P1;
-    packed_float3 P2;
-#if !USE_PTVS_SHARPNESS
-    float2 vSegments;
-#endif
-#endif
-};
-
-struct OsdPerPatchVertexGregoryBasis {
-    packed_float3 P;
-};
-
-#if OSD_PATCH_REGULAR || OSD_PATCH_BOX_SPLINE_TRIANGLE
-using PatchVertexType = HullVertex;
-using PerPatchVertexType = OsdPerPatchVertexBezier;
-#elif OSD_PATCH_GREGORY || OSD_PATCH_GREGORY_BOUNDARY
-using PatchVertexType = OsdPerVertexGregory;
-using PerPatchVertexType = OsdPerPatchVertexGregory;
-#elif OSD_PATCH_GREGORY_BASIS || OSD_PATCH_GREGORY_TRIANGLE
-using PatchVertexType = HullVertex;
-using PerPatchVertexType = OsdPerPatchVertexGregoryBasis;
-#else
-using PatchVertexType = OsdInputVertexType;
-using PerPatchVertexType = OsdInputVertexType;
-#endif
-
-//Shared buffers used by OSD that are common to all kernels
-struct OsdPatchParamBufferSet
-{
-    const device OsdInputVertexType* vertexBuffer [[buffer(VERTEX_BUFFER_INDEX)]];
-    const device unsigned* indexBuffer [[buffer(CONTROL_INDICES_BUFFER_INDEX)]];
-
-    const device OsdPatchParamBufferType* patchParamBuffer [[buffer(OSD_PATCHPARAM_BUFFER_INDEX)]];
-
-    device PerPatchVertexType* perPatchVertexBuffer [[buffer(OSD_PERPATCHVERTEX_BUFFER_INDEX)]];
-
-#if !USE_PTVS_FACTORS
-    device OsdPerPatchTessFactors* patchTessBuffer [[buffer(OSD_PERPATCHTESSFACTORS_BUFFER_INDEX)]];
-#endif
-
-#if OSD_PATCH_GREGORY || OSD_PATCH_GREGORY_BOUNDARY
-    const device int* quadOffsetBuffer [[buffer(OSD_QUADOFFSET_BUFFER_INDEX)]];
-    const device int* valenceBuffer [[buffer(OSD_VALENCE_BUFFER_INDEX)]];
-#endif
-
-    const constant unsigned& kernelExecutionLimit [[buffer(OSD_KERNELLIMIT_BUFFER_INDEX)]];
-};
-
-//Shared buffers used by OSD that are common to all PTVS implementations
-struct OsdVertexBufferSet
-{
-    const device OsdInputVertexType* vertexBuffer [[buffer(VERTEX_BUFFER_INDEX)]];
-    const device unsigned* indexBuffer [[buffer(CONTROL_INDICES_BUFFER_INDEX)]];
-
-    const device OsdPatchParamBufferType* patchParamBuffer [[buffer(OSD_PATCHPARAM_BUFFER_INDEX)]];
-
-    device PerPatchVertexType* perPatchVertexBuffer [[buffer(OSD_PERPATCHVERTEX_BUFFER_INDEX)]];
-
-#if !USE_PTVS_FACTORS
-    device OsdPerPatchTessFactors* patchTessBuffer [[buffer(OSD_PERPATCHTESSFACTORS_BUFFER_INDEX)]];
-#endif
-};
-
-// ----------------------------------------------------------------------------
-// Patch Parameters
-// ----------------------------------------------------------------------------
-
-//
-// Each patch has a corresponding patchParam. This is a set of three values
-// specifying additional information about the patch:
-//
-//    faceId    -- topological face identifier (e.g. Ptex FaceId)
-//    bitfield  -- refinement-level, non-quad, boundary, transition, uv-offset
-//    sharpness -- crease sharpness for single-crease patches
-//
-// These are stored in OsdPatchParamBuffer indexed by the value returned
-// from OsdGetPatchIndex() which is a function of the current PrimitiveID
-// along with an optional client provided offset.
-//
-
-int3 OsdGetPatchParam(int patchIndex, const device OsdPatchParamBufferType* osdPatchParamBuffer)
-{
-#if OSD_PATCH_ENABLE_SINGLE_CREASE
-    return int3(osdPatchParamBuffer[patchIndex]);
-#else
-    auto p = osdPatchParamBuffer[patchIndex];
-    return int3(p[0], p[1], 0);
-#endif
-}
-
-int OsdGetPatchIndex(int primitiveId)
-{
-    return primitiveId;
-}
-
-int OsdGetPatchFaceId(int3 patchParam)
-{
-    return (patchParam.x & 0xfffffff);
-}
-
-int OsdGetPatchFaceLevel(int3 patchParam)
-{
-    return (1 << ((patchParam.y & 0xf) - ((patchParam.y >> 4) & 1)));
-}
-
-int OsdGetPatchRefinementLevel(int3 patchParam)
-{
-    return (patchParam.y & 0xf);
-}
-
-int OsdGetPatchBoundaryMask(int3 patchParam)
-{
-    return ((patchParam.y >> 7) & 0x1f);
-}
-
-int OsdGetPatchTransitionMask(int3 patchParam)
-{
-    return ((patchParam.x >> 28) & 0xf);
-}
-
-int2 OsdGetPatchFaceUV(int3 patchParam)
-{
-    int u = (patchParam.y >> 22) & 0x3ff;
-    int v = (patchParam.y >> 12) & 0x3ff;
-    return int2(u,v);
-}
-
-bool OsdGetPatchIsRegular(int3 patchParam)
-{
-    return ((patchParam.y >> 5) & 0x1) != 0;
-}
-
-bool OsdGetPatchIsTriangleRotated(int3 patchParam)
-{
-    int2 uv = OsdGetPatchFaceUV(patchParam);
-    return (uv.x + uv.y) >= OsdGetPatchFaceLevel(patchParam);
-}
-
-float OsdGetPatchSharpness(int3 patchParam)
-{
-    return as_type<float>(patchParam.z);
-}
-
-float OsdGetPatchSingleCreaseSegmentParameter(int3 patchParam, float2 uv)
-{
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-    float s = 0;
-    if ((boundaryMask & 1) != 0) {
-        s = 1 - uv.y;
-    } else if ((boundaryMask & 2) != 0) {
-        s = uv.x;
-    } else if ((boundaryMask & 4) != 0) {
-        s = uv.y;
-    } else if ((boundaryMask & 8) != 0) {
-        s = 1 - uv.x;
-    }
-    return s;
-}
-
-int4 OsdGetPatchCoord(int3 patchParam)
-{
-    int faceId = OsdGetPatchFaceId(patchParam);
-    int faceLevel = OsdGetPatchFaceLevel(patchParam);
-    int2 faceUV = OsdGetPatchFaceUV(patchParam);
-    return int4(faceUV.x, faceUV.y, faceLevel, faceId);
-}
-
-float4 OsdInterpolatePatchCoord(float2 localUV, int3 patchParam)
-{
-    int4 perPrimPatchCoord = OsdGetPatchCoord(patchParam);
-    int faceId = perPrimPatchCoord.w;
-    int faceLevel = perPrimPatchCoord.z;
-    float2 faceUV = float2(perPrimPatchCoord.x, perPrimPatchCoord.y);
-    float2 uv = localUV/faceLevel + faceUV/faceLevel;
-    // add 0.5 to integer values for more robust interpolation
-    return float4(uv.x, uv.y, faceLevel+0.5, faceId+0.5);
-}
-
-float4 OsdInterpolatePatchCoordTriangle(float2 localUV, int3 patchParam)
-{
-    float4 result = OsdInterpolatePatchCoord(localUV, patchParam);
-    if (OsdGetPatchIsTriangleRotated(patchParam)) {
-        result.xy = float2(1.0f, 1.0f) - result.xy;
-    }
-    return result;
-}
-
-// ----------------------------------------------------------------------------
-// patch culling
-// ----------------------------------------------------------------------------
-
-bool OsdCullPerPatchVertex(
-        threadgroup PatchVertexType* patch,
-        float4x4 ModelViewMatrix
-        )
-{
-#if OSD_ENABLE_BACKPATCH_CULL && OSD_PATCH_REGULAR
-    auto v0 = float3(ModelViewMatrix * patch[5].position);
-    auto v3 = float3(ModelViewMatrix * patch[6].position);
-    auto v12 = float3(ModelViewMatrix * patch[9].position);
-
-    auto n = normalize(cross(v3 - v0, v12 - v0));
-    v0 = normalize(v0 + v3 + v12);
-
-    if(dot(v0, n) > 0.6f)
-    {
-        return false;
-    }
-#endif
-#if OSD_ENABLE_PATCH_CULL
-    short3 clipFlag = short3(0,0,0);
-    for(int i = 0; i < CONTROL_POINTS_PER_PATCH; ++i) {
-        clipFlag |= patch[i].clipFlag;
-    }
-    if (any(clipFlag != short3(3,3,3))) {
-        return false;
-    }
-#endif
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-
-void
-OsdUnivar4x4(float u, thread float* B)
-{
-    float t = u;
-    float s = 1.0f - u;
-
-    float A0 = s * s;
-    float A1 = 2 * s * t;
-    float A2 = t * t;
-
-    B[0] = s * A0;
-    B[1] = t * A0 + s * A1;
-    B[2] = t * A1 + s * A2;
-    B[3] = t * A2;
-}
-
-void
-OsdUnivar4x4(float u, thread float* B, thread float* D)
-{
-    float t = u;
-    float s = 1.0f - u;
-
-    float A0 = s * s;
-    float A1 = 2 * s * t;
-    float A2 = t * t;
-
-    B[0] = s * A0;
-    B[1] = t * A0 + s * A1;
-    B[2] = t * A1 + s * A2;
-    B[3] = t * A2;
-
-    D[0] =    - A0;
-    D[1] = A0 - A1;
-    D[2] = A1 - A2;
-    D[3] = A2;
-}
-
-void
-OsdUnivar4x4(float u, thread float* B, thread float* D, thread float* C)
-{
-    float t = u;
-    float s = 1.0f - u;
-
-    float A0 = s * s;
-    float A1 = 2 * s * t;
-    float A2 = t * t;
-
-    B[0] = s * A0;
-    B[1] = t * A0 + s * A1;
-    B[2] = t * A1 + s * A2;
-    B[3] = t * A2;
-
-    D[0] =    - A0;
-    D[1] = A0 - A1;
-    D[2] = A1 - A2;
-    D[3] = A2;
-
-    A0 =   - s;
-    A1 = s - t;
-    A2 = t;
-
-    C[0] =    - A0;
-    C[1] = A0 - A1;
-    C[2] = A1 - A2;
-    C[3] = A2;
-}
-
-// ----------------------------------------------------------------------------
-
-float3
-OsdEvalBezier(float3 cp[16], float2 uv)
-{
-    float3 BUCP[4] = {float3(0,0,0),float3(0,0,0),float3(0,0,0),float3(0,0,0)};
-
-    float B[4], D[4];
-
-    OsdUnivar4x4(uv.x, B, D);
-    for (int i=0; i<4; ++i) {
-        for (int j=0; j<4; ++j) {
-            float3 A = cp[4*i + j];
-            BUCP[i] += A * B[j];
-        }
-    }
-
-    float3 P = float3(0,0,0);
-
-    OsdUnivar4x4(uv.y, B, D);
-    for (int k=0; k<4; ++k) {
-        P += B[k] * BUCP[k];
-    }
-
-    return P;
-}
-
-// When OSD_PATCH_ENABLE_SINGLE_CREASE is defined,
-// this function evaluates single-crease patch, which is segmented into
-// 3 parts in the v-direction.
-//
-//  v=0             vSegment.x        vSegment.y              v=1
-//   +------------------+-------------------+------------------+
-//   |       cp 0       |     cp 1          |      cp 2        |
-//   | (infinite sharp) | (floor sharpness) | (ceil sharpness) |
-//   +------------------+-------------------+------------------+
-//
-float3
-OsdEvalBezier(device OsdPerPatchVertexBezier* cp, int3 patchParam, float2 uv)
-{
-    float3 BUCP[4] = {float3(0,0,0),float3(0,0,0),float3(0,0,0),float3(0,0,0)};
-
-    float B[4], D[4];
-    float s = OsdGetPatchSingleCreaseSegmentParameter(patchParam, uv);
-
-    OsdUnivar4x4(uv.x, B, D);
-#if OSD_PATCH_ENABLE_SINGLE_CREASE
-#if USE_PTVS_SHARPNESS
-    float sharpness = OsdGetPatchSharpness(patchParam);
-    float Sf = floor(sharpness);
-    float Sc = ceil(sharpness);
-    float s0 = 1 - exp2(-Sf);
-    float s1 = 1 - exp2(-Sc);
-
-    float2 vSegments(s0, s1);
-#else
-    float2 vSegments = cp[0].vSegments;
-#endif // USE_PTVS_SHARPNESS
-
-    //By doing the offset calculation ahead of time it can be kept out of the actual indexing lookup.
-
-    if(s <= vSegments.x)
-        cp = (device OsdPerPatchVertexBezier*)(((device float*)cp) + 0);
-    else if( s <= vSegments.y)
-        cp = (device OsdPerPatchVertexBezier*)(((device float*)cp) + 3);
-    else
-        cp = (device OsdPerPatchVertexBezier*)(((device float*)cp) + 6);
-
-    BUCP[0] += cp[0].P * B[0];
-    BUCP[0] += cp[1].P * B[1];
-    BUCP[0] += cp[2].P * B[2];
-    BUCP[0] += cp[3].P * B[3];
-
-    BUCP[1] += cp[4].P * B[0];
-    BUCP[1] += cp[5].P * B[1];
-    BUCP[1] += cp[6].P * B[2];
-    BUCP[1] += cp[7].P * B[3];
-
-    BUCP[2] += cp[8].P * B[0];
-    BUCP[2] += cp[9].P * B[1];
-    BUCP[2] += cp[10].P * B[2];
-    BUCP[2] += cp[11].P * B[3];
-
-    BUCP[3] += cp[12].P * B[0];
-    BUCP[3] += cp[13].P * B[1];
-    BUCP[3] += cp[14].P * B[2];
-    BUCP[3] += cp[15].P * B[3];
-
-#else // single crease
-    for (int i=0; i<4; ++i) {
-        for (int j=0; j<4; ++j) {
-            float3 A = cp[4*i + j].P;
-            BUCP[i] += A * B[j];
-        }
-    }
-#endif  // single crease
-
-    OsdUnivar4x4(uv.y, B);
-    float3 P = B[0] * BUCP[0];
-    for (int k=1; k<4; ++k) {
-        P += B[k] * BUCP[k];
-    }
-
-    return P;
-}
-
-// ----------------------------------------------------------------------------
-// Boundary Interpolation
-// ----------------------------------------------------------------------------
-
-template<typename VertexType>
-void
-OsdComputeBSplineBoundaryPoints(threadgroup VertexType* cpt, int3 patchParam)
-{
-    //APPL TODO - multithread this
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-
-    //  Don't extrapolate corner points until all boundary points in place
-    if ((boundaryMask & 1) != 0) {
-        cpt[1].SetPosition(2*cpt[5].GetPosition() - cpt[9].GetPosition());
-        cpt[2].SetPosition(2*cpt[6].GetPosition() - cpt[10].GetPosition());
-    }
-    if ((boundaryMask & 2) != 0) {
-        cpt[7].SetPosition(2*cpt[6].GetPosition() - cpt[5].GetPosition());
-        cpt[11].SetPosition(2*cpt[10].GetPosition() - cpt[9].GetPosition());
-    }
-    if ((boundaryMask & 4) != 0) {
-        cpt[13].SetPosition(2*cpt[9].GetPosition() - cpt[5].GetPosition());
-        cpt[14].SetPosition(2*cpt[10].GetPosition() - cpt[6].GetPosition());
-    }
-    if ((boundaryMask & 8) != 0) {
-        cpt[4].SetPosition(2*cpt[5].GetPosition() - cpt[6].GetPosition());
-        cpt[8].SetPosition(2*cpt[9].GetPosition() - cpt[10].GetPosition());
-    }
-
-    //  Now safe to extrapolate corner points:
-    if ((boundaryMask & 1) != 0) {
-        cpt[0].SetPosition(2*cpt[4].GetPosition() - cpt[8].GetPosition());
-        cpt[3].SetPosition(2*cpt[7].GetPosition() - cpt[11].GetPosition());
-    }
-    if ((boundaryMask & 2) != 0) {
-        cpt[3].SetPosition(2*cpt[2].GetPosition() - cpt[1].GetPosition());
-        cpt[15].SetPosition(2*cpt[14].GetPosition() - cpt[13].GetPosition());
-    }
-    if ((boundaryMask & 4) != 0) {
-        cpt[12].SetPosition(2*cpt[8].GetPosition() - cpt[4].GetPosition());
-        cpt[15].SetPosition(2*cpt[11].GetPosition() - cpt[7].GetPosition());
-    }
-    if ((boundaryMask & 8) != 0) {
-        cpt[0].SetPosition(2*cpt[1].GetPosition() - cpt[2].GetPosition());
-        cpt[12].SetPosition(2*cpt[13].GetPosition() - cpt[14].GetPosition());
-    }
-}
-
-template<typename VertexType>
-void
-OsdComputeBoxSplineTriangleBoundaryPoints(thread VertexType* cpt, int3 patchParam)
-{
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-    if (boundaryMask == 0) return;
-
-    int upperBits = (boundaryMask >> 3) & 0x3;
-    int lowerBits = boundaryMask & 7;
-
-    int eBits = lowerBits;
-    int vBits = 0;
-
-    if (upperBits == 1) {
-        vBits = eBits;
-        eBits = 0;
-    } else if (upperBits == 2) {
-        //  Opposite vertex bit is edge bit rotated one to the right:
-        vBits = ((eBits & 1) << 2) | (eBits >> 1);
-    }
-
-    bool edge0IsBoundary = (eBits & 1) != 0;
-    bool edge1IsBoundary = (eBits & 2) != 0;
-    bool edge2IsBoundary = (eBits & 4) != 0;
-
-    if (edge0IsBoundary) {
-        if (edge2IsBoundary) {
-            cpt[0].SetPosition(cpt[4].GetPosition() + (cpt[4].GetPosition() - cpt[8].GetPosition()));
-        } else {
-            cpt[0].SetPosition(cpt[4].GetPosition() + (cpt[3].GetPosition() - cpt[7].GetPosition()));
-        }
-        cpt[1].SetPosition(cpt[4].GetPosition() + cpt[5].GetPosition() - cpt[8].GetPosition());
-        if (edge1IsBoundary) {
-            cpt[2].SetPosition(cpt[5].GetPosition() + (cpt[5].GetPosition() - cpt[8].GetPosition()));
-        } else {
-            cpt[2].SetPosition(cpt[5].GetPosition() + (cpt[6].GetPosition() - cpt[9].GetPosition()));
-        }
-    }
-    if (edge1IsBoundary) {
-        if (edge0IsBoundary) {
-            cpt[6].SetPosition(cpt[5].GetPosition() + (cpt[5].GetPosition() - cpt[4].GetPosition()));
-        } else {
-            cpt[6].SetPosition(cpt[5].GetPosition() + (cpt[2].GetPosition() - cpt[1].GetPosition()));
-        }
-        cpt[9].SetPosition(cpt[5].GetPosition() + cpt[8].GetPosition() - cpt[4].GetPosition());
-        if (edge2IsBoundary) {
-            cpt[11].SetPosition(cpt[8].GetPosition() + (cpt[8].GetPosition() - cpt[4].GetPosition()));
-        } else {
-            cpt[11].SetPosition(cpt[8].GetPosition() + (cpt[10].GetPosition() - cpt[7].GetPosition()));
-        }
-    }
-    if (edge2IsBoundary) {
-        if (edge1IsBoundary) {
-            cpt[10].SetPosition(cpt[8].GetPosition() + (cpt[8].GetPosition() - cpt[5].GetPosition()));
-        } else {
-            cpt[10].SetPosition(cpt[8].GetPosition() + (cpt[11].GetPosition() - cpt[9].GetPosition()));
-        }
-        cpt[7].SetPosition(cpt[8].GetPosition() + cpt[4].GetPosition() - cpt[5].GetPosition());
-        if (edge0IsBoundary) {
-            cpt[3].SetPosition(cpt[4].GetPosition() + (cpt[4].GetPosition() - cpt[5].GetPosition()));
-        } else {
-            cpt[3].SetPosition(cpt[4].GetPosition() + (cpt[0].GetPosition() - cpt[1].GetPosition()));
-        }
-    }
-
-    if ((vBits & 1) != 0) {
-        cpt[3].SetPosition(cpt[4].GetPosition() + cpt[7].GetPosition() - cpt[8].GetPosition());
-        cpt[0].SetPosition(cpt[4].GetPosition() + cpt[1].GetPosition() - cpt[5].GetPosition());
-    }
-    if ((vBits & 2) != 0) {
-        cpt[2].SetPosition(cpt[5].GetPosition() + cpt[1].GetPosition() - cpt[4].GetPosition());
-        cpt[6].SetPosition(cpt[5].GetPosition() + cpt[9].GetPosition() - cpt[8].GetPosition());
-    }
-    if ((vBits & 4) != 0) {
-        cpt[11].SetPosition(cpt[8].GetPosition() + cpt[9].GetPosition() - cpt[5].GetPosition());
-        cpt[10].SetPosition(cpt[8].GetPosition() + cpt[7].GetPosition() - cpt[4].GetPosition());
-    }
-}
-
-// ----------------------------------------------------------------------------
-// BSpline
-// ----------------------------------------------------------------------------
-
-// compute single-crease patch matrix
-float4x4
-OsdComputeMs(float sharpness)
-{
-    float s = exp2(sharpness);
-    float s2 = s*s;
-    float s3 = s2*s;
-
-    float4x4 m(
-        float4(0, s + 1 + 3*s2 - s3, 7*s - 2 - 6*s2 + 2*s3, (1-s)*(s-1)*(s-1)),
-        float4(0,       (1+s)*(1+s),        6*s - 2 - 2*s2,       (s-1)*(s-1)),
-        float4(0,               1+s,               6*s - 2,               1-s),
-        float4(0,                 1,               6*s - 2,                 1));
-
-    m[0] /= (s*6.0);
-    m[1] /= (s*6.0);
-    m[2] /= (s*6.0);
-    m[3] /= (s*6.0);
-
-    m[0][0] = 1.0/6.0;
-
-    return m;
-}
-
-float4x4
-OsdComputeMs2(float sharpness, float factor)
-{
-    float s = exp2(sharpness);
-    float s2 = s*s;
-    float s3 = s2*s;
-    float sx6 = s*6.0;
-    float sx6m2 = sx6 - 2;
-    float sfrac1 = 1-s;
-    float ssub1 = s-1;
-    float ssub1_2 = ssub1 * ssub1;
-    float div6 = 1.0/6.0;
-
-    float4x4 m(
-               float4(0, s + 1 + 3*s2 - s3, 7*s - 2 - 6*s2 + 2*s3,    sfrac1 * ssub1_2),
-               float4(0,      1 + 2*s + s2,         sx6m2 - 2*s2,             ssub1_2),
-               float4(0,               1+s,                sx6m2,              sfrac1),
-               float4(0,                 1,                sx6m2,                 1));
-
-    m *= factor * (1/sx6);
-
-    m[0][0] = div6 * factor;
-
-    return m;
-}
-
-// flip matrix orientation
-void OsdFlipMatrix(threadgroup float * src, threadgroup float * dst)
-{
-    for (int i = 0; i < 16; i++) dst[i] = src[15-i];
-}
-
-float4x4 OsdFlipMatrix(float4x4 m)
-{
-    return float4x4(float4(m[3][3], m[3][2], m[3][1], m[3][0]),
-                    float4(m[2][3], m[2][2], m[2][1], m[2][0]),
-                    float4(m[1][3], m[1][2], m[1][1], m[1][0]),
-                    float4(m[0][3], m[0][2], m[0][1], m[0][0]));
-}
-
-// Regular BSpline to Bezier
-constant float4x4 Q(
-                    float4(1.f/6.f, 4.f/6.f, 1.f/6.f, 0.f),
-                    float4(0.f,     4.f/6.f, 2.f/6.f, 0.f),
-                    float4(0.f,     2.f/6.f, 4.f/6.f, 0.f),
-                    float4(0.f,     1.f/6.f, 4.f/6.f, 1.f/6.f)
-                    );
-
-// Infinitely Sharp (boundary)
-constant float4x4 Mi(
-                     float4(1.f/6.f, 4.f/6.f, 1.f/6.f, 0.f),
-                     float4(0.f,     4.f/6.f, 2.f/6.f, 0.f),
-                     float4(0.f,     2.f/6.f, 4.f/6.f, 0.f),
-                     float4(0.f,     0.f,     1.f,     0.f)
-                     );
-
-// convert BSpline cv to Bezier cv
-template<typename VertexType> //VertexType should be some type that implements float3 VertexType::GetPosition()
-void
-OsdComputePerPatchVertexBSpline(
-        int3 patchParam, unsigned ID,
-        threadgroup VertexType* cv,
-        device OsdPerPatchVertexBezier& result)
-{
-    int i = ID%4;
-    int j = ID/4;
-
-#if OSD_PATCH_ENABLE_SINGLE_CREASE
-
-    float3 P  = float3(0,0,0); // 0 to 1-2^(-Sf)
-    float3 P1 = float3(0,0,0); // 1-2^(-Sf) to 1-2^(-Sc)
-    float3 P2 = float3(0,0,0); // 1-2^(-Sc) to 1
-    float sharpness = OsdGetPatchSharpness(patchParam);
-
-    int boundaryMask = OsdGetPatchBoundaryMask(patchParam);
-
-    if (sharpness > 0 && (boundaryMask & 15))
-    {
-        float Sf = floor(sharpness);
-        float Sc = ceil(sharpness);
-        float Sr = fract(sharpness);
-
-        float4x4 Mj = OsdComputeMs2(Sf, 1-Sr);
-        float4x4 Ms = Mj;
-        Mj += (Sr * Mi);
-        Ms += OsdComputeMs2(Sc, Sr);
-
-#if USE_PTVS_SHARPNESS
-#else
-        float s0 = 1 - exp2(-Sf);
-        float s1 = 1 - exp2(-Sc);
-        result.vSegments = float2(s0, s1);
-#endif
-
-        bool isBoundary[2];
-        isBoundary[0] = (((boundaryMask & 8) != 0) || ((boundaryMask & 2) != 0)) ? true : false;
-        isBoundary[1] = (((boundaryMask & 4) != 0) || ((boundaryMask & 1) != 0)) ? true : false;
-        bool needsFlip[2];
-        needsFlip[0] = (boundaryMask & 8) ? true : false;
-        needsFlip[1] = (boundaryMask & 1) ? true : false;
-        float3 Hi[4], Hj[4], Hs[4];
-
-        if (isBoundary[0])
-        {
-            int t[4] = {0,1,2,3};
-            int ti = i, step = 1, start = 0;
-            if (needsFlip[0]) {
-                t[0] = 3; t[1] = 2; t[2] = 1; t[3] = 0;
-                ti = 3-i;
-                start = 3; step = -1;
-            }
-            for (int l=0; l<4; ++l) {
-                Hi[l] = Hj[l] = Hs[l] = float3(0,0,0);
-                for (int k=0, tk = start; k<4; ++k, tk+=step) {
-                    float3 p = cv[l*4 + k].GetPosition();
-                    Hi[l] += Mi[ti][tk] * p;
-                    Hj[l] += Mj[ti][tk] * p;
-                    Hs[l] += Ms[ti][tk] * p;
-                }
-            }
-        }
-        else
-        {
-            for (int l=0; l<4; ++l) {
-                Hi[l] = Hj[l] = Hs[l] = float3(0,0,0);
-                for (int k=0; k<4; ++k) {
-                    float3 p = cv[l*4 + k].GetPosition();
-                    float3 val = Q[i][k] * p;
-                    Hi[l] += val;
-                    Hj[l] += val;
-                    Hs[l] += val;
-                }
-            }
-        }
-        {
-            int t[4] = {0,1,2,3};
-            int tj = j, step = 1, start = 0;
-            if (needsFlip[1]) {
-                t[0] = 3; t[1] = 2; t[2] = 1; t[3] = 0;
-                tj = 3-j;
-                start = 3; step = -1;
-            }
-            for (int k=0, tk = start; k<4; ++k, tk+=step) {
-                if (isBoundary[1])
-                {
-                    P  += Mi[tj][tk]*Hi[k];
-                    P1 += Mj[tj][tk]*Hj[k];
-                    P2 += Ms[tj][tk]*Hs[k];
-                }
-                else
-                {
-                    P  += Q[j][k]*Hi[k];
-                    P1 += Q[j][k]*Hj[k];
-                    P2 += Q[j][k]*Hs[k];
-                }
-            }
-        }
-
-    result.P  = P;
-    result.P1 = P1;
-    result.P2 = P2;
-    } else {
-#if USE_PTVS_SHARPNESS
-#else
-        result.vSegments = float2(0, 0);
-#endif
-
-        OsdComputeBSplineBoundaryPoints(cv, patchParam);
-
-    float3 Hi[4];
-    for (int l=0; l<4; ++l) {
-        Hi[l] = float3(0,0,0);
-        for (int k=0; k<4; ++k) {
-            Hi[l] += Q[i][k] * cv[l*4 + k].GetPosition();
-        }
-    }
-    for (int k=0; k<4; ++k) {
-        P += Q[j][k]*Hi[k];
-    }
-
-    result.P  = P;
-    result.P1 = P;
-    result.P2 = P;
-}
-#else
-    OsdComputeBSplineBoundaryPoints(cv, patchParam);
-
-    float3 H[4];
-    for (int l=0; l<4; ++l) {
-        H[l] = float3(0,0,0);
-        for(int k=0; k<4; ++k) {
-            H[l] += Q[i][k] * (cv + l*4 + k)->GetPosition();
-        }
-    }
-    {
-        result.P = float3(0,0,0);
-        for (int k=0; k<4; ++k){
-            result.P += Q[j][k]*H[k];
-        }
-    }
-#endif
-}
-
-template<typename PerPatchVertexBezier>
-void
-OsdEvalPatchBezier(int3 patchParam, float2 UV,
-                   PerPatchVertexBezier cv,
-                   thread float3& P, thread float3& dPu, thread float3& dPv,
-                   thread float3& N, thread float3& dNu, thread float3& dNv,
-                   thread float2& vSegments)
-{
-    //
-    //  Use the recursive nature of the basis functions to compute a 2x2 set
-    //  of intermediate points (via repeated linear interpolation).  These
-    //  points define a bilinear surface tangent to the desired surface at P
-    //  and so containing dPu and dPv.  The cost of computing P, dPu and dPv
-    //  this way is comparable to that of typical tensor product evaluation
-    //  (if not faster).
-    //
-    //  If N = dPu X dPv degenerates, it often results from an edge of the
-    //  2x2 bilinear hull collapsing or two adjacent edges colinear. In both
-    //  cases, the expected non-planar quad degenerates into a triangle, and
-    //  the tangent plane of that triangle provides the desired normal N.
-    //
-
-    //  Reduce 4x4 points to 2x4 -- two levels of linear interpolation in U
-    //  and so 3 original rows contributing to each of the 2 resulting rows:
-    float u    = UV.x;
-    float uinv = 1.0f - u;
-
-    float u0 = uinv * uinv;
-    float u1 = u * uinv * 2.0f;
-    float u2 = u * u;
-
-    float3 LROW[4], RROW[4];
-#if OSD_PATCH_ENABLE_SINGLE_CREASE
-#if USE_PTVS_SHARPNESS
-    float sharpness = OsdGetPatchSharpness(patchParam);
-    float Sf = floor(sharpness);
-    float Sc = ceil(sharpness);
-    float s0 = 1 - exp2(-Sf);
-    float s1 = 1 - exp2(-Sc);
-    vSegments = float2(s0, s1);
-#else // USE_PTVS_SHARPNESS
-    vSegments = cv[0].vSegments;
-#endif // USE_PTVS_SHARPNESS
-    float s = OsdGetPatchSingleCreaseSegmentParameter(patchParam, UV);
-
-    for (int i = 0; i < 4; ++i) {
-        int j = i*4;
-        if (s <= vSegments.x) {
-            LROW[i] = u0 * cv[ j ].P + u1 * cv[j+1].P + u2 * cv[j+2].P;
-            RROW[i] = u0 * cv[j+1].P + u1 * cv[j+2].P + u2 * cv[j+3].P;
-        } else if (s <= vSegments.y) {
-            LROW[i] = u0 * cv[ j ].P1 + u1 * cv[j+1].P1 + u2 * cv[j+2].P1;
-            RROW[i] = u0 * cv[j+1].P1 + u1 * cv[j+2].P1 + u2 * cv[j+3].P1;
-        } else {
-            LROW[i] = u0 * cv[ j ].P2 + u1 * cv[j+1].P2 + u2 * cv[j+2].P2;
-            RROW[i] = u0 * cv[j+1].P2 + u1 * cv[j+2].P2 + u2 * cv[j+3].P2;
-        }
-    }
-#else
-    LROW[0] = u0 * cv[ 0].P + u1 * cv[ 1].P + u2 * cv[ 2].P;
-    LROW[1] = u0 * cv[ 4].P + u1 * cv[ 5].P + u2 * cv[ 6].P;
-    LROW[2] = u0 * cv[ 8].P + u1 * cv[ 9].P + u2 * cv[10].P;
-    LROW[3] = u0 * cv[12].P + u1 * cv[13].P + u2 * cv[14].P;
-
-    RROW[0] = u0 * cv[ 1].P + u1 * cv[ 2].P + u2 * cv[ 3].P;
-    RROW[1] = u0 * cv[ 5].P + u1 * cv[ 6].P + u2 * cv[ 7].P;
-    RROW[2] = u0 * cv[ 9].P + u1 * cv[10].P + u2 * cv[11].P;
-    RROW[3] = u0 * cv[13].P + u1 * cv[14].P + u2 * cv[15].P;
-#endif
-
-    //  Reduce 2x4 points to 2x2 -- two levels of linear interpolation in V
-    //  and so 3 original pairs contributing to each of the 2 resulting:
-    float v    = UV.y;
-    float vinv = 1.0f - v;
-
-    float v0 = vinv * vinv;
-    float v1 = v * vinv * 2.0f;
-    float v2 = v * v;
-
-    float3 LPAIR[2], RPAIR[2];
-    LPAIR[0] = v0 * LROW[0] + v1 * LROW[1] + v2 * LROW[2];
-    RPAIR[0] = v0 * RROW[0] + v1 * RROW[1] + v2 * RROW[2];
-
-    LPAIR[1] = v0 * LROW[1] + v1 * LROW[2] + v2 * LROW[3];
-    RPAIR[1] = v0 * RROW[1] + v1 * RROW[2] + v2 * RROW[3];
-
-    //  Interpolate points on the edges of the 2x2 bilinear hull from which
-    //  both position and partials are trivially determined:
-    float3 DU0 = vinv * LPAIR[0] + v * LPAIR[1];
-    float3 DU1 = vinv * RPAIR[0] + v * RPAIR[1];
-    float3 DV0 = uinv * LPAIR[0] + u * RPAIR[0];
-    float3 DV1 = uinv * LPAIR[1] + u * RPAIR[1];
-
-    int level = OsdGetPatchFaceLevel(patchParam);
-    dPu = (DU1 - DU0) * 3 * level;
-    dPv = (DV1 - DV0) * 3 * level;
-
-    P = u * DU1 + uinv * DU0;
-
-    //  Compute the normal and test for degeneracy:
-    //
-    //  We need a geometric measure of the size of the patch for a suitable
-    //  tolerance.  Magnitudes of the partials are generally proportional to
-    //  that size -- the sum of the partials is readily available, cheap to
-    //  compute, and has proved effective in most cases (though not perfect).
-    //  The size of the bounding box of the patch, or some approximation to
-    //  it, would be better but more costly to compute.
-    //
-    float proportionalNormalTolerance = 0.00001f;
-
-    float nEpsilon = (length(dPu) + length(dPv)) * proportionalNormalTolerance;
-
-    N = cross(dPu, dPv);
-
-    float nLength = length(N);
-    if (nLength > nEpsilon) {
-        N = N / nLength;
-    } else {
-        float3 diagCross = cross(RPAIR[1] - LPAIR[0], LPAIR[1] - RPAIR[0]);
-        float diagCrossLength = length(diagCross);
-        if (diagCrossLength > nEpsilon) {
-            N = diagCross / diagCrossLength;
-        }
-    }
-
-#ifndef OSD_COMPUTE_NORMAL_DERIVATIVES
-    dNu = float3(0,0,0);
-    dNv = float3(0,0,0);
-#else
-    //
-    //  Compute 2nd order partials of P(u,v) in order to compute 1st order partials
-    //  for the un-normalized n(u,v) = dPu X dPv, then project into the tangent
-    //  plane of normalized N.  With resulting dNu and dNv we can make another
-    //  attempt to resolve a still-degenerate normal.
-    //
-    //  We don't use the Weingarten equations here as they require N != 0 and also
-    //  are a little less numerically stable/accurate in single precision.
-    //
-    float B0u[4], B1u[4], B2u[4];
-    float B0v[4], B1v[4], B2v[4];
-
-    OsdUnivar4x4(UV.x, B0u, B1u, B2u);
-    OsdUnivar4x4(UV.y, B0v, B1v, B2v);
-
-    float3 dUU = float3(0,0,0);
-    float3 dVV = float3(0,0,0);
-    float3 dUV = float3(0,0,0);
-
-    for (int i=0; i<4; ++i) {
-        for (int j=0; j<4; ++j) {
-#if OSD_PATCH_ENABLE_SINGLE_CREASE
-            int k = 4*i + j;
-            float3 CV = (s <= vSegments.x) ? cv[k].P
-                   :   ((s <= vSegments.y) ? cv[k].P1
-                                           : cv[k].P2);
-#else
-            float3 CV = cv[4*i + j].P;
-#endif
-            dUU += (B0v[i] * B2u[j]) * CV;
-            dVV += (B2v[i] * B0u[j]) * CV;
-            dUV += (B1v[i] * B1u[j]) * CV;
-        }
-    }
-
-    dUU *= 6 * level;
-    dVV *= 6 * level;
-    dUV *= 9 * level;
-
-    dNu = cross(dUU, dPv) + cross(dPu, dUV);
-    dNv = cross(dUV, dPv) + cross(dPu, dVV);
-
-    float nLengthInv = 1.0;
-    if (nLength > nEpsilon) {
-        nLengthInv = 1.0 / nLength;
-    } else {
-        //  N may have been resolved above if degenerate, but if N was resolved
-        //  we don't have an accurate length for its un-normalized value, and that
-        //  length is needed to project the un-normalized dNu and dNv into the
-        //  tangent plane of N.
-        //
-        //  So compute N more accurately with available second derivatives, i.e.
-        //  with a 1st order Taylor approximation to un-normalized N(u,v).
-
-        float DU = (UV.x == 1.0f) ? -1.0f : 1.0f;
-        float DV = (UV.y == 1.0f) ? -1.0f : 1.0f;
-
-        N = DU * dNu + DV * dNv;
-
-        nLength = length(N);
-        if (nLength > nEpsilon) {
-            nLengthInv = 1.0f / nLength;
-            N = N * nLengthInv;
-        }
-    }
-
-    //  Project derivatives of non-unit normals into tangent plane of N:
-    dNu = (dNu - dot(dNu,N) * N) * nLengthInv;
-    dNv = (dNv - dot(dNv,N) * N) * nLengthInv;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// Gregory Basis
-// ----------------------------------------------------------------------------
-
-void
-OsdComputePerPatchVertexGregoryBasis(int3 patchParam, int ID, float3 cv,
-                                     device OsdPerPatchVertexGregoryBasis& result)
-{
-    result.P = cv;
-}
-
-void
-OsdEvalPatchGregory(int3 patchParam, float2 UV, thread float3* cv,
-                    thread float3& P, thread float3& dPu, thread float3& dPv,
-                    thread float3& N, thread float3& dNu, thread float3& dNv)
-{
-    float u = UV.x, v = UV.y;
-    float U = 1-u, V = 1-v;
-
-    //(0,1)                              (1,1)
-    //   P3         e3-      e2+         P2
-    //      15------17-------11-------10
-    //      |        |        |        |
-    //      |        |        |        |
-    //      |        | f3-    | f2+    |
-    //      |       19       13        |
-    //  e3+ 16-----18          14-----12 e2-
-    //      |     f3+          f2-     |
-    //      |                          |
-    //      |                          |
-    //      |     f0-         f1+      |
-    //  e0- 2------4            8------6 e1+
-    //      |        3 f0+    9        |
-    //      |        |        | f1-    |
-    //      |        |        |        |
-    //      |        |        |        |
-    //      0--------1--------7--------5
-    //    P0        e0+      e1-         P1
-    //(0,0)                               (1,0)
-
-    float d11 = u+v;
-    float d12 = U+v;
-    float d21 = u+V;
-    float d22 = U+V;
-
-    OsdPerPatchVertexBezier bezcv[16];
-    float2 vSegments;
-
-    bezcv[ 5].P = (d11 == 0.0) ? cv[3]  : (u*cv[3] + v*cv[4])/d11;
-    bezcv[ 6].P = (d12 == 0.0) ? cv[8]  : (U*cv[9] + v*cv[8])/d12;
-    bezcv[ 9].P = (d21 == 0.0) ? cv[18] : (u*cv[19] + V*cv[18])/d21;
-    bezcv[10].P = (d22 == 0.0) ? cv[13] : (U*cv[13] + V*cv[14])/d22;
-
-    bezcv[ 0].P = cv[0];
-    bezcv[ 1].P = cv[1];
-    bezcv[ 2].P = cv[7];
-    bezcv[ 3].P = cv[5];
-    bezcv[ 4].P = cv[2];
-    bezcv[ 7].P = cv[6];
-    bezcv[ 8].P = cv[16];
-    bezcv[11].P = cv[12];
-    bezcv[12].P = cv[15];
-    bezcv[13].P = cv[17];
-    bezcv[14].P = cv[11];
-    bezcv[15].P = cv[10];
-
-    OsdEvalPatchBezier(patchParam, UV, bezcv, P, dPu, dPv, N, dNu, dNv, vSegments);
-}
-
-//
-//  Convert the 12 points of a regular patch resulting from Loop subdivision
-//  into a more accessible Bezier patch for both tessellation assessment and
-//  evaluation.
-//
-//  Regular patch for Loop subdivision -- quartic triangular Box spline:
-//
-//                           10 --- 11
-//                           . .   . .
-//                          .   . .   .
-//                         7 --- 8 --- 9
-//                        . .   . .   . .
-//                       .   . .   . .   .
-//                      3 --- 4 --- 5 --- 6
-//                       .   . .   . .   .
-//                        . .   . .   . .
-//                         0 --- 1 --- 2
-//
-//  The equivalant quartic Bezier triangle (15 points):
-//
-//                              14
-//                              . .
-//                             .   .
-//                           12 --- 13
-//                           . .   . .
-//                          .   . .   .
-//                         9 -- 10 --- 11
-//                        . .   . .   . .
-//                       .   . .   . .   .
-//                      5 --- 6 --- 7 --- 8
-//                     . .   . .   . .   . .
-//                    .   . .   . .   . .   .
-//                   0 --- 1 --- 2 --- 3 --- 4
-//
-//  A hybrid cubic/quartic Bezier patch with cubic boundaries is a close
-//  approximation and would only use 12 control points, but we need a full
-//  quartic patch to maintain accuracy along boundary curves -- especially
-//  between subdivision levels.
-//
-template<typename VertexType>
-void
-OsdComputePerPatchVertexBoxSplineTriangle(
-        int3 patchParam, int ID,
-        threadgroup VertexType* cv,
-        device OsdPerPatchVertexBezier& result)
-{
-    //
-    //  Conversion matrix from 12-point Box spline to 15-point quartic Bezier
-    //  patch and its common scale factor:
-    //
-    const float boxToBezierMatrix[12*15] = {
-    // L0   L1   L2     L3   L4   L5   L6     L7   L8   L9     L10  L11
-        2,   2,   0,     2,  12,   2,   0,     2,   2,   0,     0,   0,  // B0
-        1,   3,   0,     0,  12,   4,   0,     1,   3,   0,     0,   0,  // B1
-        0,   4,   0,     0,   8,   8,   0,     0,   4,   0,     0,   0,  // B2
-        0,   3,   1,     0,   4,  12,   0,     0,   3,   1,     0,   0,  // B3
-        0,   2,   2,     0,   2,  12,   2,     0,   2,   2,     0,   0,  // B4
-        0,   1,   0,     1,  12,   3,   0,     3,   4,   0,     0,   0,  // B5
-        0,   1,   0,     0,  10,   6,   0,     1,   6,   0,     0,   0,  // B6
-        0,   1,   0,     0,   6,  10,   0,     0,   6,   1,     0,   0,  // B7
-        0,   1,   0,     0,   3,  12,   1,     0,   4,   3,     0,   0,  // B8
-        0,   0,   0,     0,   8,   4,   0,     4,   8,   0,     0,   0,  // B9
-        0,   0,   0,     0,   6,   6,   0,     1,  10,   1,     0,   0,  // B10
-        0,   0,   0,     0,   4,   8,   0,     0,   8,   4,     0,   0,  // B11
-        0,   0,   0,     0,   4,   3,   0,     3,  12,   1,     1,   0,  // B12
-        0,   0,   0,     0,   3,   4,   0,     1,  12,   3,     0,   1,  // B13
-        0,   0,   0,     0,   2,   2,   0,     2,  12,   2,     2,   2   // B14
-    };
-    const float boxToBezierMatrixScale = 1.0 / 24.0;
-
-    OsdComputeBoxSplineTriangleBoundaryPoints(cv, patchParam);
-
-    //result.patchParam = patchParam;
-    result.P = float3(0);
-
-    int cvCoeffBase = 12 * ID;
-
-    for (int i = 0; i < 12; ++i) {
-        result.P += boxToBezierMatrix[cvCoeffBase + i] * cv[i].GetPosition();
-    }
-    result.P *= boxToBezierMatrixScale;
-}
-
-template<typename PerPatchVertexBezier>
-void
-OsdEvalPatchBezierTriangle(int3 patchParam, float2 UV,
-                       PerPatchVertexBezier cv,
-                       thread float3& P, thread float3& dPu, thread float3& dPv,
-                       thread float3& N, thread float3& dNu, thread float3& dNv)
-{
-    float u = UV.x;
-    float v = UV.y;
-    float w = 1.0 - u - v;
-
-    float uu = u * u;
-    float vv = v * v;
-    float ww = w * w;
-
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    //
-    //  When computing normal derivatives, we need 2nd derivatives, so compute
-    //  an intermediate quadratic Bezier triangle from which 2nd derivatives
-    //  can be easily computed, and which in turn yields the triangle that gives
-    //  the position and 1st derivatives.
-    //
-    //  Quadratic barycentric basis functions (in addition to those above):
-    float uv = u * v * 2.0;
-    float vw = v * w * 2.0;
-    float wu = w * u * 2.0;
-
-    float3 Q0 = ww * cv[ 0].P + wu * cv[ 1].P + uu * cv[ 2].P +
-              uv * cv[ 6].P + vv * cv[ 9].P + vw * cv[ 5].P;
-    float3 Q1 = ww * cv[ 1].P + wu * cv[ 2].P + uu * cv[ 3].P +
-              uv * cv[ 7].P + vv * cv[10].P + vw * cv[ 6].P;
-    float3 Q2 = ww * cv[ 2].P + wu * cv[ 3].P + uu * cv[ 4].P +
-              uv * cv[ 8].P + vv * cv[11].P + vw * cv[ 7].P;
-    float3 Q3 = ww * cv[ 5].P + wu * cv[ 6].P + uu * cv[ 7].P +
-              uv * cv[10].P + vv * cv[12].P + vw * cv[ 9].P;
-    float3 Q4 = ww * cv[ 6].P + wu * cv[ 7].P + uu * cv[ 8].P +
-              uv * cv[11].P + vv * cv[13].P + vw * cv[10].P;
-    float3 Q5 = ww * cv[ 9].P + wu * cv[10].P + uu * cv[11].P +
-              uv * cv[13].P + vv * cv[14].P + vw * cv[12].P;
-
-    float3 V0 = w * Q0 + u * Q1 + v * Q3;
-    float3 V1 = w * Q1 + u * Q2 + v * Q4;
-    float3 V2 = w * Q3 + u * Q4 + v * Q5;
-#else
-    //
-    //  When 2nd derivatives are not required, factor the recursive evaluation
-    //  of a point to directly provide the three points of the triangle at the
-    //  last stage -- which then trivially provides both position and 1st
-    //  derivatives.  Each point of the triangle results from evaluating the
-    //  corresponding cubic Bezier sub-triangle for each corner of the quartic:
-    //
-    //  Cubic barycentric basis functions:
-    float uuu = uu * u;
-    float uuv = uu * v * 3.0;
-    float uvv = u * vv * 3.0;
-    float vvv = vv * v;
-    float vvw = vv * w * 3.0;
-    float vww = v * ww * 3.0;
-    float www = ww * w;
-    float wwu = ww * u * 3.0;
-    float wuu = w * uu * 3.0;
-    float uvw = u * v * w * 6.0;
-
-    float3 V0 = www * cv[ 0].P + wwu * cv[ 1].P + wuu * cv[ 2].P
-            + uuu * cv[ 3].P + uuv * cv[ 7].P + uvv * cv[10].P
-            + vvv * cv[12].P + vvw * cv[ 9].P + vww * cv[ 5].P + uvw * cv[ 6].P;
-
-    float3 V1 = www * cv[ 1].P + wwu * cv[ 2].P + wuu * cv[ 3].P
-            + uuu * cv[ 4].P + uuv * cv[ 8].P + uvv * cv[11].P
-            + vvv * cv[13].P + vvw * cv[10].P + vww * cv[ 6].P + uvw * cv[ 7].P;
-
-    float3 V2 = www * cv[ 5].P + wwu * cv[ 6].P + wuu * cv[ 7].P
-            + uuu * cv[ 8].P + uuv * cv[11].P + uvv * cv[13].P
-            + vvv * cv[14].P + vvw * cv[12].P + vww * cv[ 9].P + uvw * cv[10].P;
-#endif
-
-    //
-    //  Compute P, du and dv all from the triangle formed from the three Vi:
-    //
-    P = w * V0 + u * V1 + v * V2;
-
-    int dSign = OsdGetPatchIsTriangleRotated(patchParam) ? -1 : 1;
-    int level = OsdGetPatchFaceLevel(patchParam);
-
-    float d1Scale = dSign * level * 4;
-
-    dPu = (V1 - V0) * d1Scale;
-    dPv = (V2 - V0) * d1Scale;
-
-    //  Compute N and test for degeneracy:
-    //
-    //  We need a geometric measure of the size of the patch for a suitable
-    //  tolerance.  Magnitudes of the partials are generally proportional to
-    //  that size -- the sum of the partials is readily available, cheap to
-    //  compute, and has proved effective in most cases (though not perfect).
-    //  The size of the bounding box of the patch, or some approximation to
-    //  it, would be better but more costly to compute.
-    //
-    float proportionalNormalTolerance = 0.00001f;
-
-    float nEpsilon = (length(dPu) + length(dPv)) * proportionalNormalTolerance;
-
-    N = cross(dPu, dPv);
-    float nLength = length(N);
-
-
-#ifdef OSD_COMPUTE_NORMAL_DERIVATIVES
-    //
-    //  Compute normal derivatives using 2nd order partials, then use the
-    //  normal derivatives to resolve a degenerate normal:
-    //
-    float d2Scale = dSign * level * level * 12;
-
-    float3 dUU = (Q0 - 2 * Q1 + Q2)  * d2Scale;
-    float3 dVV = (Q0 - 2 * Q3 + Q5)  * d2Scale;
-    float3 dUV = (Q0 - Q1 + Q4 - Q3) * d2Scale;
-
-    dNu = cross(dUU, dPv) + cross(dPu, dUV);
-    dNv = cross(dUV, dPv) + cross(dPu, dVV);
-
-    if (nLength < nEpsilon) {
-        //  Use 1st order Taylor approximation of N(u,v) within patch interior:
-        if (w > 0.0) {
-            N =  dNu + dNv;
-        } else if (u >= 1.0) {
-            N = -dNu + dNv;
-        } else if (v >= 1.0) {
-            N =  dNu - dNv;
-        } else {
-            N = -dNu - dNv;
-        }
-
-        nLength = length(N);
-        if (nLength < nEpsilon) {
-            nLength = 1.0;
-        }
-    }
-    N = N / nLength;
-
-    //  Project derivs of non-unit normal function onto tangent plane of N:
-    dNu = (dNu - dot(dNu,N) * N) / nLength;
-    dNv = (dNv - dot(dNv,N) * N) / nLength;
-#else
-    dNu = float3(0);
-    dNv = float3(0);
-
-    //
-    //  Resolve a degenerate normal using the interior triangle of the
-    //  intermediate quadratic patch that results from recursive evaluation.
-    //  This addresses common cases of degenerate or colinear boundaries
-    //  without resorting to use of explicit 2nd derivatives:
-    //
-    if (nLength < nEpsilon) {
-        float uv  = u * v * 2.0;
-        float vw  = v * w * 2.0;
-        float wu  = w * u * 2.0;
-
-        float3 Q1 = ww * cv[ 1].P + wu * cv[ 2].P + uu * cv[ 3].P +
-                  uv * cv[ 7].P + vv * cv[10].P + vw * cv[ 6].P;
-        float3 Q3 = ww * cv[ 5].P + wu * cv[ 6].P + uu * cv[ 7].P +
-                  uv * cv[10].P + vv * cv[12].P + vw * cv[ 9].P;
-        float3 Q4 = ww * cv[ 6].P + wu * cv[ 7].P + uu * cv[ 8].P +
-                  uv * cv[11].P + vv * cv[13].P + vw * cv[10].P;
-
-        N = cross((Q4 - Q1), (Q3 - Q1));
-        nLength = length(N);
-        if (nLength < nEpsilon) {
-            nLength = 1.0;
-        }
-    }
-    N = N / nLength;
-#endif
-}
-
-void
-OsdEvalPatchGregoryTriangle(int3 patchParam, float2 UV, float3 cv[18],
-                        thread float3& P, thread float3& dPu, thread float3& dPv,
-                        thread float3& N, thread float3& dNu, thread float3& dNv)
-{
-    float u = UV.x;
-    float v = UV.y;
-    float w = 1.0 - u - v;
-
-    float duv = u + v;
-    float dvw = v + w;
-    float dwu = w + u;
-
-    OsdPerPatchVertexBezier bezcv[15];
-
-    bezcv[ 6].P = (duv == 0.0) ? cv[3]  : ((u*cv[ 3] + v*cv[ 4]) / duv);
-    bezcv[ 7].P = (dvw == 0.0) ? cv[8]  : ((v*cv[ 8] + w*cv[ 9]) / dvw);
-    bezcv[10].P = (dwu == 0.0) ? cv[13] : ((w*cv[13] + u*cv[14]) / dwu);
-
-    bezcv[ 0].P = cv[ 0];
-    bezcv[ 1].P = cv[ 1];
-    bezcv[ 2].P = cv[15];
-    bezcv[ 3].P = cv[ 7];
-    bezcv[ 4].P = cv[ 5];
-    bezcv[ 5].P = cv[ 2];
-    bezcv[ 8].P = cv[ 6];
-    bezcv[ 9].P = cv[17];
-    bezcv[11].P = cv[16];
-    bezcv[12].P = cv[11];
-    bezcv[13].P = cv[12];
-    bezcv[14].P = cv[10];
-
-    OsdEvalPatchBezierTriangle(patchParam, UV, bezcv, P, dPu, dPv, N, dNu, dNv);
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchCommonTess.metal b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchCommonTess.metal
deleted file mode 100644
index f75f74262..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchCommonTess.metal
+++ /dev/null
@@ -1,909 +0,0 @@
-#line 0 "osd/mtlPatchCommonTess.metal"
-
-//
-//   Copyright 2015-2019 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-// ----------------------------------------------------------------------------
-// Tessellation
-// ----------------------------------------------------------------------------
-
-// For now, fractional spacing is supported only with screen space tessellation
-#ifndef OSD_ENABLE_SCREENSPACE_TESSELLATION
-#undef OSD_FRACTIONAL_EVEN_SPACING
-#undef OSD_FRACTIONAL_ODD_SPACING
-#endif
-
-//
-// Organization of B-spline and Bezier control points.
-//
-// Each patch is defined by 16 control points (labeled 0-15).
-//
-// The patch will be evaluated across the domain from (0,0) at
-// the lower-left to (1,1) at the upper-right. When computing
-// adaptive tessellation metrics, we consider refined vertex-vertex
-// and edge-vertex points along the transition edges of the patch
-// (labeled vv* and ev* respectively).
-//
-// The two segments of each transition edge are labeled Lo and Hi,
-// with the Lo segment occurring before the Hi segment along the
-// transition edge's domain parameterization. These Lo and Hi segment
-// tessellation levels determine how domain evaluation coordinates
-// are remapped along transition edges. The Hi segment value will
-// be zero for a non-transition edge.
-//
-// (0,1)                                         (1,1)
-//
-//   vv3                  ev23                   vv2
-//        |       Lo3       |       Hi3       |
-//      --O-----------O-----+-----O-----------O--
-//        | 12        | 13     14 |        15 |
-//        |           |           |           |
-//        |           |           |           |
-//    Hi0 |           |           |           | Hi2
-//        |           |           |           |
-//        O-----------O-----------O-----------O
-//        | 8         | 9      10 |        11 |
-//        |           |           |           |
-// ev03 --+           |           |           +-- ev12
-//        |           |           |           |
-//        | 4         | 5       6 |         7 |
-//        O-----------O-----------O-----------O
-//        |           |           |           |
-//    Lo0 |           |           |           | Lo2
-//        |           |           |           |
-//        |           |           |           |
-//        | 0         | 1       2 |         3 |
-//      --O-----------O-----+-----O-----------O--
-//        |       Lo1       |       Hi1       |
-//   vv0                  ev01                   vv1
-//
-// (0,0)                                         (1,0)
-//
-
-float OsdComputePostProjectionSphereExtent(
-        const float4x4 OsdProjectionMatrix, float3 center, float diameter)
-{
-    float4 p = OsdProjectionMatrix * float4(center, 1.0);
-    return abs(diameter * OsdProjectionMatrix[1][1] / p.w);
-}
-
-float OsdComputeTessLevel(
-        const float OsdTessLevel,
-        const float4x4 OsdProjectionMatrix, const float4x4 OsdModelViewMatrix,
-        float3 p0, float3 p1)
-{
-    // Adaptive factor can be any computation that depends only on arg values.
-    // Project the diameter of the edge's bounding sphere instead of using the
-    // length of the projected edge itself to avoid problems near silhouettes.
-    p0 = (OsdModelViewMatrix * float4(p0, 1.0)).xyz;
-    p1 = (OsdModelViewMatrix * float4(p1, 1.0)).xyz;
-    float3 center = (p0 + p1) / 2.0;
-    float diameter = distance(p0, p1);
-    float projLength = OsdComputePostProjectionSphereExtent(OsdProjectionMatrix, center, diameter);
-    float tessLevel = max(1.0, OsdTessLevel * projLength);
-
-    // We restrict adaptive tessellation levels to half of the device
-    // supported maximum because transition edges are split into two
-    // halves and the sum of the two corresponding levels must not exceed
-    // the device maximum. We impose this limit even for non-transition
-    // edges because a non-transition edge must be able to match up with
-    // one half of the transition edge of an adjacent transition patch.
-    return min(tessLevel, (float)(OSD_MAX_TESS_LEVEL / 2));
-}
-
-void
-OsdGetTessLevelsUniform(const float OsdTessLevel, int3 patchParam,
-                        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    // Uniform factors are simple powers of two for each level.
-    // The maximum here can be increased if we know the maximum
-    // refinement level of the mesh:
-    //     min(OSD_MAX_TESS_LEVEL, pow(2, MaximumRefinementLevel-1)
-    int refinementLevel = OsdGetPatchRefinementLevel(patchParam);
-    float tessLevel = min(OsdTessLevel, (float)OSD_MAX_TESS_LEVEL) /
-                        pow(2, refinementLevel - 1.0f);
-
-    // tessLevels of transition edge should be clamped to 2.
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-    float4 tessLevelMin = float4(1) + float4(((transitionMask & 8) >> 3),
-                                             ((transitionMask & 1) >> 0),
-                                             ((transitionMask & 2) >> 1),
-                                             ((transitionMask & 4) >> 2));
-
-    tessOuterLo = max(float4(tessLevel), tessLevelMin);
-    tessOuterHi = float4(0);
-}
-
-void
-OsdGetTessLevelsUniformTriangle(const float OsdTessLevel, int3 patchParam,
-                        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    // Uniform factors are simple powers of two for each level.
-    // The maximum here can be increased if we know the maximum
-    // refinement level of the mesh:
-    //     min(OSD_MAX_TESS_LEVEL, pow(2, MaximumRefinementLevel-1)
-    int refinementLevel = OsdGetPatchRefinementLevel(patchParam);
-    float tessLevel = min(OsdTessLevel, (float)OSD_MAX_TESS_LEVEL) /
-                        pow(2, refinementLevel - 1.0f);
-
-    // tessLevels of transition edge should be clamped to 2.
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-    float4 tessLevelMin = float4(1) + float4(((transitionMask & 4) >> 2),
-                                             ((transitionMask & 1) >> 0),
-                                             ((transitionMask & 2) >> 1),
-                                             0);
-
-    tessOuterLo = max(float4(tessLevel), tessLevelMin);
-    tessOuterHi = float4(0);
-}
-
-void
-OsdGetTessLevelsRefinedPoints(
-        const float OsdTessLevel,
-        const float4x4 OsdProjectionMatrix, const float4x4 OsdModelViewMatrix,
-        float3 cp[16], int3 patchParam,
-        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. We compute the corresponding
-    // vertex-vertex and edge-vertex refined points along the edges of the
-    // patch using Catmull-Clark subdivision stencil weights.
-    // For simplicity, we let the optimizer discard unused computation.
-
-    float3 vv0 = (cp[0] + cp[2] + cp[8] + cp[10]) * 0.015625 +
-                 (cp[1] + cp[4] + cp[6] + cp[9]) * 0.09375 + cp[5] * 0.5625;
-    float3 ev01 = (cp[1] + cp[2] + cp[9] + cp[10]) * 0.0625 +
-                  (cp[5] + cp[6]) * 0.375;
-
-    float3 vv1 = (cp[1] + cp[3] + cp[9] + cp[11]) * 0.015625 +
-                 (cp[2] + cp[5] + cp[7] + cp[10]) * 0.09375 + cp[6] * 0.5625;
-    float3 ev12 = (cp[5] + cp[7] + cp[9] + cp[11]) * 0.0625 +
-                  (cp[6] + cp[10]) * 0.375;
-
-    float3 vv2 = (cp[5] + cp[7] + cp[13] + cp[15]) * 0.015625 +
-                 (cp[6] + cp[9] + cp[11] + cp[14]) * 0.09375 + cp[10] * 0.5625;
-    float3 ev23 = (cp[5] + cp[6] + cp[13] + cp[14]) * 0.0625 +
-                  (cp[9] + cp[10]) * 0.375;
-
-    float3 vv3 = (cp[4] + cp[6] + cp[12] + cp[14]) * 0.015625 +
-                 (cp[5] + cp[8] + cp[10] + cp[13]) * 0.09375 + cp[9] * 0.5625;
-    float3 ev03 = (cp[4] + cp[6] + cp[8] + cp[10]) * 0.0625 +
-                  (cp[5] + cp[9]) * 0.375;
-
-    tessOuterLo = float4(0);
-    tessOuterHi = float4(0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    if ((transitionMask & 8) != 0) {
-        tessOuterLo[0] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, vv0, ev03);
-        tessOuterHi[0] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, vv3, ev03);
-    } else {
-        tessOuterLo[0] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, cp[5], cp[9]);
-    }
-    if ((transitionMask & 1) != 0) {
-        tessOuterLo[1] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, vv0, ev01);
-        tessOuterHi[1] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, vv1, ev01);
-    } else {
-        tessOuterLo[1] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, cp[5], cp[6]);
-    }
-    if ((transitionMask & 2) != 0) {
-        tessOuterLo[2] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, vv1, ev12);
-        tessOuterHi[2] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, vv2, ev12);
-    } else {
-        tessOuterLo[2] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, cp[6], cp[10]);
-    }
-    if ((transitionMask & 4) != 0) {
-        tessOuterLo[3] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, vv3, ev23);
-        tessOuterHi[3] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, vv2, ev23);
-    } else {
-        tessOuterLo[3] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, cp[9], cp[10]);
-    }
-}
-
-//
-//  Patch boundary corners are ordered counter-clockwise from the first
-//  corner while patch boundary edges and their midpoints are similarly
-//  ordered counter-clockwise beginning at the edge preceding corner[0].
-//
-void
-Osd_GetTessLevelsFromPatchBoundaries4(
-        const float OsdTessLevel,
-        const float4x4 OsdProjectionMatrix,
-        const float4x4 OsdModelViewMatrix,
-        float3 corners[3], float3 midpoints[3],
-        int3 patchParam,
-        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    tessOuterLo = float4(0);
-    tessOuterHi = float4(0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    if ((transitionMask & 8) != 0) {
-        tessOuterLo[0] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[0], midpoints[0]);
-        tessOuterHi[0] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[3], midpoints[0]);
-    } else {
-        tessOuterLo[0] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[0], corners[3]);
-    }
-    if ((transitionMask & 1) != 0) {
-        tessOuterLo[1] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[0], midpoints[1]);
-        tessOuterHi[1] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[1], midpoints[1]);
-    } else {
-        tessOuterLo[1] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[0], corners[1]);
-    }
-    if ((transitionMask & 2) != 0) {
-        tessOuterLo[2] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[1], midpoints[2]);
-        tessOuterHi[2] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[2], midpoints[2]);
-    } else {
-        tessOuterLo[2] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[1], corners[2]);
-    }
-    if ((transitionMask & 4) != 0) {
-        tessOuterLo[3] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[3], midpoints[3]);
-        tessOuterHi[3] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[2], midpoints[3]);
-    } else {
-        tessOuterLo[3] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[3], corners[2]);
-    }
-}
-
-void
-Osd_GetTessLevelsFromPatchBoundaries3(
-        const float OsdTessLevel,
-        const float4x4 OsdProjectionMatrix,
-        const float4x4 OsdModelViewMatrix,
-        float3 corners[3], float3 midpoints[3],
-        int3 patchParam,
-        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    tessOuterLo = float4(0);
-    tessOuterHi = float4(0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    if ((transitionMask & 4) != 0) {
-        tessOuterLo[0] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[0], midpoints[0]);
-        tessOuterHi[0] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[2], midpoints[0]);
-    } else {
-        tessOuterLo[0] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[0], corners[2]);
-    }
-    if ((transitionMask & 1) != 0) {
-        tessOuterLo[1] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[0], midpoints[1]);
-        tessOuterHi[1] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[1], midpoints[1]);
-    } else {
-        tessOuterLo[1] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[0], corners[1]);
-    }
-    if ((transitionMask & 2) != 0) {
-        tessOuterLo[2] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[2], midpoints[2]);
-        tessOuterHi[2] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[1], midpoints[2]);
-    } else {
-        tessOuterLo[2] = OsdComputeTessLevel(
-            OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-            corners[1], corners[2]);
-    }
-}
-
-float3
-Osd_EvalBezierCurveMidPoint(float3 p0, float3 p1, float3 p2, float3 p3)
-{
-    //  Coefficients for the midpoint are { 1/8, 3/8, 3/8, 1/8 }:
-    return 0.125 * (p0 + p3) + 0.375 * (p1 + p2);
-}
-
-float3
-Osd_EvalQuarticBezierCurveMidPoint(float3 p0, float3 p1, float3 p2, float3 p3, float3 p4)
-{
-    //  Coefficients for the midpoint are { 1/16, 1/4, 3/8, 1/4, 1/16 }:
-    return 0.0625 * (p0 + p4) + 0.25 * (p1 + p3) + 0.375 * p2;
-}
-
-void
-OsdEvalPatchBezierTessLevels(
-        const float OsdTessLevel,
-        const float4x4 OsdProjectionMatrix,
-        const float4x4 OsdModelViewMatrix,
-        device OsdPerPatchVertexBezier* cpBezier,
-        int3 patchParam,
-        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. When the patch control
-    // points have been converted to the Bezier basis, the control points
-    // at the four corners are on the limit surface (since a Bezier patch
-    // interpolates its corner control points). We can compute an adaptive
-    // tessellation level for transition edges on the limit surface by
-    // evaluating a limit position at the mid point of each transition edge.
-
-    tessOuterLo = float4(0);
-    tessOuterHi = float4(0);
-
-    float3 corners[4];
-    float3 midpoints[4];
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-#if OSD_PATCH_ENABLE_SINGLE_CREASE
-    corners[0] = OsdEvalBezier(cpBezier, patchParam, float2(0.0, 0.0));
-    corners[1] = OsdEvalBezier(cpBezier, patchParam, float2(1.0, 0.0));
-    corners[2] = OsdEvalBezier(cpBezier, patchParam, float2(1.0, 1.0));
-    corners[3] = OsdEvalBezier(cpBezier, patchParam, float2(0.0, 1.0));
-
-    midpoints[0] = ((transitionMask & 8) == 0) ? float3(0) :
-        OsdEvalBezier(cpBezier, patchParam, float2(0.0, 0.5));
-    midpoints[1] = ((transitionMask & 1) == 0) ? float3(0) :
-        OsdEvalBezier(cpBezier, patchParam, float2(0.5, 0.0));
-    midpoints[2] = ((transitionMask & 2) == 0) ? float3(0) :
-        OsdEvalBezier(cpBezier, patchParam, float2(1.0, 0.5));
-    midpoints[3] = ((transitionMask & 4) == 0) ? float3(0) :
-        OsdEvalBezier(cpBezier, patchParam, float2(0.5, 1.0));
-
-#else // OSD_PATCH_ENABLE_SINGLE_CREASE
-    corners[0] = cpBezier[ 0].P;
-    corners[1] = cpBezier[ 3].P;
-    corners[2] = cpBezier[15].P;
-    corners[3] = cpBezier[12].P;
-
-    midpoints[0] = ((transitionMask & 8) == 0) ? float3(0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[0].P, cpBezier[4].P, cpBezier[8].P, cpBezier[12].P);
-    midpoints[1] = ((transitionMask & 1) == 0) ? float3(0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[0].P, cpBezier[1].P, cpBezier[2].P, cpBezier[3].P);
-    midpoints[2] = ((transitionMask & 2) == 0) ? float3(0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[3].P, cpBezier[7].P, cpBezier[11].P, cpBezier[15].P);
-    midpoints[3] = ((transitionMask & 4) == 0) ? float3(0) :
-        Osd_EvalBezierCurveMidPoint(
-            cpBezier[12].P, cpBezier[13].P, cpBezier[14].P, cpBezier[15].P);
-#endif
-
-    Osd_GetTessLevelsFromPatchBoundaries4(
-        OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-        corners, midpoints, patchParam, tessOuterLo, tessOuterHi);
-}
-
-void
-OsdEvalPatchBezierTessLevels(
-        const float OsdTessLevel,
-        const float4x4 OsdProjectionMatrix,
-        const float4x4 OsdModelViewMatrix,
-        float3 cv[16],
-        int3 patchParam,
-        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. When the patch control
-    // points have been converted to the Bezier basis, the control points
-    // at the four corners are on the limit surface (since a Bezier patch
-    // interpolates its corner control points). We can compute an adaptive
-    // tessellation level for transition edges on the limit surface by
-    // evaluating a limit position at the mid point of each transition edge.
-
-    tessOuterLo = float4(0);
-    tessOuterHi = float4(0);
-
-    float3 corners[4];
-    float3 midpoints[4];
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    corners[0] = cv[ 0];
-    corners[1] = cv[ 3];
-    corners[2] = cv[15];
-    corners[3] = cv[12];
-
-    midpoints[0] = ((transitionMask & 8) == 0) ? float3(0) :
-        Osd_EvalBezierCurveMidPoint(cv[0], cv[4], cv[8], cv[12]);
-    midpoints[1] = ((transitionMask & 1) == 0) ? float3(0) :
-        Osd_EvalBezierCurveMidPoint(cv[0], cv[1], cv[2], cv[3]);
-    midpoints[2] = ((transitionMask & 2) == 0) ? float3(0) :
-        Osd_EvalBezierCurveMidPoint(cv[3], cv[7], cv[11], cv[15]);
-    midpoints[3] = ((transitionMask & 4) == 0) ? float3(0) :
-        Osd_EvalBezierCurveMidPoint(cv[12], cv[13], cv[14], cv[15]);
-
-    Osd_GetTessLevelsFromPatchBoundaries4(
-        OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-        corners, midpoints, patchParam, tessOuterLo, tessOuterHi);
-}
-
-void
-OsdEvalPatchBezierTriangleTessLevels(
-        const float OsdTessLevel,
-        const float4x4 OsdProjectionMatrix,
-        const float4x4 OsdModelViewMatrix,
-        float3 cv[15],
-        int3 patchParam,
-        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    // Each edge of a transition patch is adjacent to one or two patches
-    // at the next refined level of subdivision. When the patch control
-    // points have been converted to the Bezier basis, the control points
-    // at the corners are on the limit surface (since a Bezier patch
-    // interpolates its corner control points). We can compute an adaptive
-    // tessellation level for transition edges on the limit surface by
-    // evaluating a limit position at the mid point of each transition edge.
-
-    tessOuterLo = float4(0);
-    tessOuterHi = float4(0);
-
-    int transitionMask = OsdGetPatchTransitionMask(patchParam);
-
-    float3 corners[3];
-    corners[0] = cv[0];
-    corners[1] = cv[4];
-    corners[2] = cv[14];
-
-    float3 midpoints[3];
-    midpoints[0] = ((transitionMask & 4) == 0) ? float3(0) :
-        Osd_EvalQuarticBezierCurveMidPoint(cv[0], cv[5], cv[9], cv[12], cv[14]);
-    midpoints[1] = ((transitionMask & 1) == 0) ? float3(0) :
-        Osd_EvalQuarticBezierCurveMidPoint(cv[0], cv[1], cv[2], cv[3], cv[4]);
-    midpoints[2] = ((transitionMask & 2) == 0) ? float3(0) :
-        Osd_EvalQuarticBezierCurveMidPoint(cv[4], cv[8], cv[11], cv[13], cv[14]);
-
-    Osd_GetTessLevelsFromPatchBoundaries3(
-        OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-        corners, midpoints, patchParam, tessOuterLo, tessOuterHi);
-}
-
-// Round up to the nearest even integer
-float OsdRoundUpEven(float x) {
-    return 2*ceil(x/2);
-}
-
-// Round up to the nearest odd integer
-float OsdRoundUpOdd(float x) {
-    return 2*ceil((x+1)/2)-1;
-}
-
-// Compute outer and inner tessellation levels taking into account the
-// current tessellation spacing mode.
-void
-OsdComputeTessLevels(thread float4& tessOuterLo, thread float4& tessOuterHi,
-                     thread float4& tessLevelOuter, thread float2& tessLevelInner)
-{
-    // Outer levels are the sum of the Lo and Hi segments where the Hi
-    // segments will have lengths of zero for non-transition edges.
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-    // Combine fractional outer transition edge levels before rounding.
-    float4 combinedOuter = tessOuterLo + tessOuterHi;
-
-    // Round the segments of transition edges separately. We will recover the
-    // fractional parameterization of transition edges after tessellation.
-
-    tessLevelOuter = combinedOuter;
-    if (tessOuterHi[0] > 0) {
-        tessLevelOuter[0] =
-            OsdRoundUpEven(tessOuterLo[0]) + OsdRoundUpEven(tessOuterHi[0]);
-    }
-    if (tessOuterHi[1] > 0) {
-        tessLevelOuter[1] =
-            OsdRoundUpEven(tessOuterLo[1]) + OsdRoundUpEven(tessOuterHi[1]);
-    }
-    if (tessOuterHi[2] > 0) {
-        tessLevelOuter[2] =
-            OsdRoundUpEven(tessOuterLo[2]) + OsdRoundUpEven(tessOuterHi[2]);
-    }
-    if (tessOuterHi[3] > 0) {
-        tessLevelOuter[3] =
-            OsdRoundUpEven(tessOuterLo[3]) + OsdRoundUpEven(tessOuterHi[3]);
-    }
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-    // Combine fractional outer transition edge levels before rounding.
-    float4 combinedOuter = tessOuterLo + tessOuterHi;
-
-    // Round the segments of transition edges separately. We will recover the
-    // fractional parameterization of transition edges after tessellation.
-    //
-    // The sum of the two outer odd segment lengths will be an even number
-    // which the tessellator will increase by +1 so that there will be a
-    // total odd number of segments. We clamp the combinedOuter tess levels
-    // (used to compute the inner tess levels) so that the outer transition
-    // edges will be sampled without degenerate triangles.
-
-    tessLevelOuter = combinedOuter;
-    if (tessOuterHi[0] > 0) {
-        tessLevelOuter[0] =
-            OsdRoundUpOdd(tessOuterLo[0]) + OsdRoundUpOdd(tessOuterHi[0]);
-        combinedOuter = max(float4(3), combinedOuter);
-    }
-    if (tessOuterHi[1] > 0) {
-        tessLevelOuter[1] =
-            OsdRoundUpOdd(tessOuterLo[1]) + OsdRoundUpOdd(tessOuterHi[1]);
-        combinedOuter = max(float4(3), combinedOuter);
-    }
-    if (tessOuterHi[2] > 0) {
-        tessLevelOuter[2] =
-            OsdRoundUpOdd(tessOuterLo[2]) + OsdRoundUpOdd(tessOuterHi[2]);
-        combinedOuter = max(float4(3), combinedOuter);
-    }
-    if (tessOuterHi[3] > 0) {
-        tessLevelOuter[3] =
-            OsdRoundUpOdd(tessOuterLo[3]) + OsdRoundUpOdd(tessOuterHi[3]);
-        combinedOuter = max(float4(3), combinedOuter);
-    }
-#else
-    // Round equally spaced transition edge levels before combining.
-    tessOuterLo = round(tessOuterLo);
-    tessOuterHi = round(tessOuterHi);
-
-    float4 combinedOuter = tessOuterLo + tessOuterHi;
-    tessLevelOuter = combinedOuter;
-#endif
-
-    // Inner levels are the averages the corresponding outer levels.
-    tessLevelInner[0] = (combinedOuter[1] + combinedOuter[3]) * 0.5;
-    tessLevelInner[1] = (combinedOuter[0] + combinedOuter[2]) * 0.5;
-}
-
-void
-OsdComputeTessLevelsTriangle(
-        thread float4& tessOuterLo, thread float4& tessOuterHi,
-        thread float4& tessLevelOuter, thread float2& tessLevelInner)
-{
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-
-    // Inner level is the max of the three outer levels.
-    tessLevelInner[0] = max(max(tessLevelOuter[0],
-                                tessLevelOuter[1]),
-                                tessLevelOuter[2]);
-}
-
-void
-OsdGetTessLevelsUniform(
-        const float OsdTessLevel, int3 patchParam,
-        thread float4& tessLevelOuter, thread float2& tessLevelInner,
-        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    OsdGetTessLevelsUniform(OsdTessLevel, patchParam, tessOuterLo, tessOuterHi);
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi, tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdGetTessLevelsUniformTriangle(
-        const float OsdTessLevel, int3 patchParam,
-        thread float4& tessLevelOuter, thread float2& tessLevelInner,
-        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    OsdGetTessLevelsUniformTriangle(OsdTessLevel, patchParam, tessOuterLo, tessOuterHi);
-    OsdComputeTessLevelsTriangle(tessOuterLo, tessOuterHi, tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdEvalPatchBezierTessLevels(
-         const float OsdTessLevels,
-         const float4x4 OsdProjectionMatrix,
-         const float4x4 OsdModelViewMatrix,
-         device OsdPerPatchVertexBezier* cpBezier,
-         int3 patchParam,
-         thread float4& tessLevelOuter, thread float2& tessLevelInner,
-         thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    OsdEvalPatchBezierTessLevels(
-                OsdTessLevels,
-                OsdProjectionMatrix, OsdModelViewMatrix,
-                cpBezier, patchParam,
-                tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdEvalPatchBezierTessLevels(
-         const float OsdTessLevels,
-         const float4x4 OsdProjectionMatrix,
-         const float4x4 OsdModelViewMatrix,
-         float3 cv[16],
-         int3 patchParam,
-         thread float4& tessLevelOuter, thread float2& tessLevelInner,
-         thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    OsdEvalPatchBezierTessLevels(
-                OsdTessLevels,
-                OsdProjectionMatrix, OsdModelViewMatrix,
-                cv, patchParam,
-                tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdEvalPatchBezierTriangleTessLevels(
-         const float OsdTessLevels,
-         const float4x4 OsdProjectionMatrix,
-         const float4x4 OsdModelViewMatrix,
-         float3 cv[15],
-         int3 patchParam,
-         thread float4& tessLevelOuter, thread float2& tessLevelInner,
-         thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    OsdEvalPatchBezierTriangleTessLevels(
-                OsdTessLevels,
-                OsdProjectionMatrix, OsdModelViewMatrix,
-                cv, patchParam,
-                tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevelsTriangle(tessOuterLo, tessOuterHi,
-                                 tessLevelOuter, tessLevelInner);
-}
-
-void
-OsdGetTessLevelsAdaptiveRefinedPoints(
-    const float OsdTessLevel,
-    const float4x4 OsdProjectionMatrix,
-    const float4x4 OsdModelViewMatrix,
-    float3 cpRefined[16], int3 patchParam,
-    thread float4& tessLevelOuter, thread float2& tessLevelInner,
-    thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    OsdGetTessLevelsRefinedPoints(OsdTessLevel,
-                                  OsdProjectionMatrix, OsdModelViewMatrix,
-                                  cpRefined, patchParam,
-                                  tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-//  Deprecated -- prefer use of newer Bezier patch equivalent:
-void
-OsdGetTessLevelsLimitPoints(
-    const float OsdTessLevel,
-    const float4x4 OsdProjectionMatrix,
-    const float4x4 OsdModelViewMatrix,
-    device OsdPerPatchVertexBezier* cpBezier,
-    int3 patchParam,
-    thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    OsdEvalPatchBezierTessLevels(
-        OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix,
-        cpBezier, patchParam, tessOuterLo, tessOuterHi);
-}
-
-//  Deprecated -- prefer use of newer Bezier patch equivalent:
-void
-OsdGetTessLevelsAdaptiveLimitPoints(
-        const float OsdTessLevel,
-        const float4x4 OsdProjectionMatrix,
-        const float4x4 OsdModelViewMatrix,
-        device OsdPerPatchVertexBezier* cpBezier,
-        int3 patchParam,
-        thread float4& tessLevelOuter, thread float2& tessLevelInner,
-        thread float4& tessOuterLo, thread float4& tessOuterHi)
-{
-    OsdGetTessLevelsLimitPoints(OsdTessLevel,
-                                OsdProjectionMatrix, OsdModelViewMatrix,
-                                cpBezier, patchParam,
-                                tessOuterLo, tessOuterHi);
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-//  Deprecated -- prefer use of newer Bezier patch equivalent:
-void
-OsdGetTessLevels(
-        const float OsdTessLevel,
-        const float4x4 OsdProjectionMatrix, const float4x4 OsdModelViewMatrix,
-        float3 cp0, float3 cp1, float3 cp2, float3 cp3, int3 patchParam,
-        thread float4& tessLevelOuter, thread float2& tessLevelInner)
-{
-    float4 tessOuterLo = float4(0);
-    float4 tessOuterHi = float4(0);
-
-#if OSD_ENABLE_SCREENSPACE_TESSELLATION
-    tessOuterLo[0] = OsdComputeTessLevel(
-        OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, cp0, cp1);
-    tessOuterLo[1] = OsdComputeTessLevel(
-        OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, cp0, cp3);
-    tessOuterLo[2] = OsdComputeTessLevel(
-        OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, cp2, cp3);
-    tessOuterLo[3] = OsdComputeTessLevel(
-        OsdTessLevel, OsdProjectionMatrix, OsdModelViewMatrix, cp1, cp2);
-#else
-    OsdGetTessLevelsUniform(OsdTessLevel, patchParam, tessOuterLo, tessOuterHi);
-#endif
-
-    OsdComputeTessLevels(tessOuterLo, tessOuterHi,
-                         tessLevelOuter, tessLevelInner);
-}
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING || defined OSD_FRACTIONAL_ODD_SPACING
-float
-OsdGetTessFractionalSplit(float t, float level, float levelUp)
-{
-    // Fractional tessellation of an edge will produce n segments where n
-    // is the tessellation level of the edge (level) rounded up to the
-    // nearest even or odd integer (levelUp). There will be n-2 segments of
-    // equal length (dx1) and two additional segments of equal length (dx0)
-    // that are typically shorter than the other segments. The two additional
-    // segments should be placed symmetrically on opposite sides of the
-    // edge (offset).
-
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-    if (level <= 2) return t;
-
-    float base = pow(2.0,floor(log2(levelUp)));
-    float offset = 1.0/(int(2*base-levelUp)/2 & int(base/2-1));
-
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-    if (level <= 1) return t;
-
-    float base = pow(2.0,floor(log2(levelUp)));
-    float offset = 1.0/(((int(2*base-levelUp)/2+1) & int(base/2-1))+1);
-#endif
-
-    float dx0 = (1.0 - (levelUp-level)/2) / levelUp;
-    float dx1 = (1.0 - 2.0*dx0) / (levelUp - 2.0*ceil(dx0));
-
-    if (t < 0.5) {
-        float x = levelUp/2 - round(t*levelUp);
-        return 0.5 - (x*dx1 + int(x*offset > 1) * (dx0 - dx1));
-    } else if (t > 0.5) {
-        float x = round(t*levelUp) - levelUp/2;
-        return 0.5 + (x*dx1 + int(x*offset > 1) * (dx0 - dx1));
-    } else {
-        return t;
-    }
-}
-#endif
-
-float
-OsdGetTessTransitionSplit(float t, float lo, float hi)
-{
-#if defined OSD_FRACTIONAL_EVEN_SPACING
-    float loRoundUp = OsdRoundUpEven(lo);
-    float hiRoundUp = OsdRoundUpEven(hi);
-
-    // Convert the parametric t into a segment index along the combined edge.
-    float ti = round(t * (loRoundUp + hiRoundUp));
-
-    if (ti <= loRoundUp) {
-        float t0 = ti / loRoundUp;
-        return OsdGetTessFractionalSplit(t0, lo, loRoundUp) * 0.5;
-    } else {
-        float t1 = (ti - loRoundUp) / hiRoundUp;
-        return OsdGetTessFractionalSplit(t1, hi, hiRoundUp) * 0.5 + 0.5;
-    }
-#elif defined OSD_FRACTIONAL_ODD_SPACING
-    float loRoundUp = OsdRoundUpOdd(lo);
-    float hiRoundUp = OsdRoundUpOdd(hi);
-
-    // Convert the parametric t into a segment index along the combined edge.
-    // The +1 below is to account for the extra segment produced by the
-    // tessellator since the sum of two odd tess levels will be rounded
-    // up by one to the next odd integer tess level.
-    float ti = round(t * (loRoundUp + hiRoundUp + 1));
-
-    if (ti <= loRoundUp) {
-        float t0 = ti / loRoundUp;
-        return OsdGetTessFractionalSplit(t0, lo, loRoundUp) * 0.5;
-    } else if (ti > (loRoundUp+1)) {
-        float t1 = (ti - (loRoundUp+1)) / hiRoundUp;
-        return OsdGetTessFractionalSplit(t1, hi, hiRoundUp) * 0.5 + 0.5;
-    } else {
-        return 0.5;
-    }
-#else
-    // Convert the parametric t into a segment index along the combined edge.
-    float ti = round(t * (lo + hi));
-
-    if (ti <= lo) {
-        return (ti / lo) * 0.5;
-    } else {
-        return ((ti - lo) / hi) * 0.5 + 0.5;
-    }
-#endif
-}
-
-float2
-OsdGetTessParameterization(float2 p, float4 tessOuterLo, float4 tessOuterHi)
-{
-    float2 UV = p;
-    if (p.x == 0 && tessOuterHi[0] > 0) {
-        UV.y = OsdGetTessTransitionSplit(UV.y, tessOuterLo[0], tessOuterHi[0]);
-    } else
-    if (p.y == 0 && tessOuterHi[1] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[1], tessOuterHi[1]);
-    } else
-    if (p.x == 1 && tessOuterHi[2] > 0) {
-        UV.y = OsdGetTessTransitionSplit(UV.y, tessOuterLo[2], tessOuterHi[2]);
-    } else
-    if (p.y == 1 && tessOuterHi[3] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[3], tessOuterHi[3]);
-    }
-    return UV;
-}
-
-float2
-OsdGetTessParameterizationTriangle(float3 p, float4 tessOuterLo, float4 tessOuterHi)
-{
-    float2 UV = p.xy;
-    if (p.x == 0 && tessOuterHi[0] > 0) {
-        UV.y = OsdGetTessTransitionSplit(UV.y, tessOuterLo[0], tessOuterHi[0]);
-    } else
-    if (p.y == 0 && tessOuterHi[1] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[1], tessOuterHi[1]);
-    } else
-    if (p.z == 0 && tessOuterHi[2] > 0) {
-        UV.x = OsdGetTessTransitionSplit(UV.x, tessOuterLo[2], tessOuterHi[2]);
-        UV.y = 1.0 - UV.x;
-    }
-    return UV;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchGregory.metal b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchGregory.metal
deleted file mode 100644
index fe070f507..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchGregory.metal
+++ /dev/null
@@ -1,277 +0,0 @@
-#line 0 "osd/mtlPatchGregory.metal"
-
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.Gregory.Hull
-//----------------------------------------------------------
-
-void OsdComputePerVertex(
-        float4 position,
-        threadgroup OsdPerVertexGregory& hullVertex,
-        int vertexId,
-        float4x4 modelViewProjectionMatrix,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    OsdComputePerVertexGregory(vertexId, position.xyz, hullVertex, osdBuffers);
-
-#if OSD_ENABLE_PATCH_CULL
-    float4 clipPos = mul(modelViewProjectionMatrix, position);
-    short3 clip0 = short3(clipPos.x < clipPos.w,
-                          clipPos.y < clipPos.w,
-                          clipPos.z < clipPos.w);
-    short3 clip1 = short3(clipPos.x > -clipPos.w,
-                          clipPos.y > -clipPos.w,
-                          clipPos.z > -clipPos.w);
-    hullVertex.clipFlag = short3(clip0) + 2*short3(clip1);
-#endif
-}
-
-//----------------------------------------------------------
-// Patches.Gregory.Factors
-//----------------------------------------------------------
-
-void OsdComputePerPatchGregoryFactors(
-        int3 patchParam,
-        float tessLevel,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        device OsdPerPatchVertexGregory* patchVertices,
-#if !USE_PTVS_FACTORS
-        device OsdPerPatchTessFactors& patchFactors,
-#endif
-        device MTLQuadTessellationFactorsHalf& quadFactors
-        )
-{
-    float4 tessLevelOuter = float4(0);
-    float2 tessLevelInner = float2(0);
-    float4 tessOuterLo = float4(0);
-    float4 tessOuterHi = float4(0);
-
-#if OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Gather bezier control points to compute limit surface tess levels
-    float3 bezcv[16];
-    bezcv[ 0] = patchVertices[0].P;
-    bezcv[ 1] = patchVertices[0].Ep;
-    bezcv[ 2] = patchVertices[1].Em;
-    bezcv[ 3] = patchVertices[1].P;
-    bezcv[ 4] = patchVertices[0].Em;
-    bezcv[ 5] = patchVertices[0].Fp;
-    bezcv[ 6] = patchVertices[1].Fm;
-    bezcv[ 7] = patchVertices[1].Ep;
-    bezcv[ 8] = patchVertices[3].Ep;
-    bezcv[ 9] = patchVertices[3].Fm;
-    bezcv[10] = patchVertices[2].Fp;
-    bezcv[11] = patchVertices[2].Em;
-    bezcv[12] = patchVertices[3].P;
-    bezcv[13] = patchVertices[3].Em;
-    bezcv[14] = patchVertices[2].Ep;
-    bezcv[15] = patchVertices[2].P;
-
-    OsdEvalPatchBezierTessLevels(
-        tessLevel,
-        projectionMatrix,
-        modelViewMatrix,
-        bezcv,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#else
-    OsdGetTessLevelsUniform(
-        tessLevel,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#endif
-
-    quadFactors.edgeTessellationFactor[0] = tessLevelOuter[0];
-    quadFactors.edgeTessellationFactor[1] = tessLevelOuter[1];
-    quadFactors.edgeTessellationFactor[2] = tessLevelOuter[2];
-    quadFactors.edgeTessellationFactor[3] = tessLevelOuter[3];
-    quadFactors.insideTessellationFactor[0] = tessLevelInner[0];
-    quadFactors.insideTessellationFactor[1] = tessLevelInner[1];
-#if !USE_PTVS_FACTORS
-    patchFactors.tessOuterLo = tessOuterLo;
-    patchFactors.tessOuterHi = tessOuterHi;
-#endif
-}
-
-void OsdComputePerPatchFactors(
-        int3 patchParam,
-        float tessLevel,
-        unsigned patchID,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        OsdPatchParamBufferSet osdBuffer,
-        threadgroup PatchVertexType* patchVertices,
-        device MTLQuadTessellationFactorsHalf& quadFactors
-        )
-{
-    OsdComputePerPatchGregoryFactors(
-        patchParam,
-        tessLevel,
-        projectionMatrix,
-        modelViewMatrix,
-        osdBuffer.perPatchVertexBuffer + patchID * VERTEX_CONTROL_POINTS_PER_PATCH,
-#if !USE_PTVS_FACTORS
-        osdBuffer.patchTessBuffer[patchID],
-#endif
-        quadFactors
-        );
-}
-
-//----------------------------------------------------------
-// Patches.Gregory.Vertex
-//----------------------------------------------------------
-
-void OsdComputePerPatchVertex(
-        int3 patchParam,
-        unsigned ID,
-        unsigned PrimitiveID,
-        unsigned ControlID,
-        threadgroup PatchVertexType* patchVertices,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    OsdComputePerPatchVertexGregory(
-            patchParam,
-            ID,
-            PrimitiveID,
-            patchVertices,
-            osdBuffers.perPatchVertexBuffer[ControlID],
-            osdBuffers);
-}
-
-//----------------------------------------------------------
-// Patches.Gregory.Domain
-//----------------------------------------------------------
-
-template<typename PerPatchVertexGregory>
-OsdPatchVertex ds_gregory_patches(
-        const float tessLevel,
-#if !USE_PTVS_FACTORS
-        float4 tessOuterLo,
-        float4 tessOuterHi,
-#endif
-        PerPatchVertexGregory patch,
-        int3 patchParam,
-        float2 domainCoord
-        )
-{
-    float3 cv[20];
-    cv[0] = patch[0].P;
-    cv[1] = patch[0].Ep;
-    cv[2] = patch[0].Em;
-    cv[3] = patch[0].Fp;
-    cv[4] = patch[0].Fm;
-    cv[5] = patch[1].P;
-    cv[6] = patch[1].Ep;
-    cv[7] = patch[1].Em;
-    cv[8] = patch[1].Fp;
-    cv[9] = patch[1].Fm;
-    cv[10] = patch[2].P;
-    cv[11] = patch[2].Ep;
-    cv[12] = patch[2].Em;
-    cv[13] = patch[2].Fp;
-    cv[14] = patch[2].Fm;
-    cv[15] = patch[3].P;
-    cv[16] = patch[3].Ep;
-    cv[17] = patch[3].Em;
-    cv[18] = patch[3].Fp;
-    cv[19] = patch[3].Fm;
-
-#if USE_PTVS_FACTORS
-    float4 tessOuterLo(0), tessOuterHi(0);
-    OsdGetTessLevelsUniform(tessLevel, patchParam, tessOuterLo, tessOuterHi);
-#endif
-
-    float2 UV = OsdGetTessParameterization(domainCoord,
-                                           tessOuterLo,
-                                           tessOuterHi);
-
-    OsdPatchVertex output;
-
-    float3 P = float3(0), dPu = float3(0), dPv = float3(0);
-    float3 N = float3(0), dNu = float3(0), dNv = float3(0);
-
-    OsdEvalPatchGregory(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    // all code below here is client code
-    output.position = P;
-    output.normal = N;
-    output.tangent = dPu;
-    output.bitangent = dPv;
-#if OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-
-    output.tessCoord = UV;
-    output.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-
-    return output;
-}
-
-#if USE_STAGE_IN
-template<typename PerPatchVertexGregoryBasis>
-#endif
-OsdPatchVertex OsdComputePatch(
-        float tessLevel,
-        float2 domainCoord,
-        unsigned patchID,
-#if USE_STAGE_IN
-        PerPatchVertexGregoryBasis osdPatch
-#else
-        OsdVertexBufferSet osdBuffers
-#endif
-        )
-{
-    return ds_gregory_patches(
-            tessLevel,
-#if !USE_PTVS_FACTORS
-#if USE_STAGE_IN
-            osdPatch.tessOuterLo,
-            osdPatch.tessOuterHi,
-#else
-            osdBuffers.patchTessBuffer[patchID].tessOuterLo,
-            osdBuffers.patchTessBuffer[patchID].tessOuterHi,
-#endif
-#endif
-#if USE_STAGE_IN
-            osdPatch.cv,
-            osdPatch.patchParam,
-#else
-            osdBuffers.perPatchVertexBuffer + patchID * VERTEX_CONTROL_POINTS_PER_PATCH,
-            osdBuffers.patchParamBuffer[patchID],
-#endif
-            domainCoord);
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchGregoryBasis.metal b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchGregoryBasis.metal
deleted file mode 100644
index d22a36bd6..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchGregoryBasis.metal
+++ /dev/null
@@ -1,283 +0,0 @@
-#line 0 "osd/mtlPatchGregoryBasis.metal"
-
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.GregoryBasis.Hull
-//----------------------------------------------------------
-
-void OsdComputePerVertex(
-        float4 position,
-        threadgroup HullVertex& hullVertex,
-        int vertexId,
-        float4x4 modelViewProjectionMatrix,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    hullVertex.position = position;
-#if OSD_ENABLE_PATCH_CULL
-    float4 clipPos = mul(modelViewProjectionMatrix, position);
-    short3 clip0 = short3(clipPos.x < clipPos.w,
-                          clipPos.y < clipPos.w,
-                          clipPos.z < clipPos.w);
-    short3 clip1 = short3(clipPos.x > -clipPos.w,
-                          clipPos.y > -clipPos.w,
-                          clipPos.z > -clipPos.w);
-    hullVertex.clipFlag = short3(clip0) + 2*short3(clip1);
-#endif
-}
-
-//----------------------------------------------------------
-// Patches.GregoryBasis.Factors
-//----------------------------------------------------------
-
-void OsdComputePerPatchGregoryFactors(
-        int3 patchParam,
-        float tessLevel,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        threadgroup PatchVertexType* patchVertices,
-#if !USE_PTVS_FACTORS
-        device OsdPerPatchTessFactors& patchFactors,
-#endif
-        device MTLQuadTessellationFactorsHalf& quadFactors
-        )
-{
-    float4 tessLevelOuter = float4(0);
-    float2 tessLevelInner = float2(0);
-    float4 tessOuterLo = float4(0);
-    float4 tessOuterHi = float4(0);
-
-#if OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Gather bezier control points to compute limit surface tess levels
-    float3 bezcv[16];
-    bezcv[ 0] = patchVertices[ 0].position.xyz;
-    bezcv[ 1] = patchVertices[ 1].position.xyz;
-    bezcv[ 2] = patchVertices[ 7].position.xyz;
-    bezcv[ 3] = patchVertices[ 5].position.xyz;
-    bezcv[ 4] = patchVertices[ 2].position.xyz;
-    bezcv[ 5] = patchVertices[ 3].position.xyz;
-    bezcv[ 6] = patchVertices[ 8].position.xyz;
-    bezcv[ 7] = patchVertices[ 6].position.xyz;
-    bezcv[ 8] = patchVertices[16].position.xyz;
-    bezcv[ 9] = patchVertices[18].position.xyz;
-    bezcv[10] = patchVertices[13].position.xyz;
-    bezcv[11] = patchVertices[12].position.xyz;
-    bezcv[12] = patchVertices[15].position.xyz;
-    bezcv[13] = patchVertices[17].position.xyz;
-    bezcv[14] = patchVertices[11].position.xyz;
-    bezcv[15] = patchVertices[10].position.xyz;
-
-    OsdEvalPatchBezierTessLevels(
-        tessLevel,
-        projectionMatrix,
-        modelViewMatrix,
-        bezcv,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#else
-    OsdGetTessLevelsUniform(
-        tessLevel,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#endif
-
-    quadFactors.edgeTessellationFactor[0] = tessLevelOuter[0];
-    quadFactors.edgeTessellationFactor[1] = tessLevelOuter[1];
-    quadFactors.edgeTessellationFactor[2] = tessLevelOuter[2];
-    quadFactors.edgeTessellationFactor[3] = tessLevelOuter[3];
-    quadFactors.insideTessellationFactor[0] = tessLevelInner[0];
-    quadFactors.insideTessellationFactor[1] = tessLevelInner[1];
-#if !USE_PTVS_FACTORS
-    patchFactors.tessOuterLo = tessOuterLo;
-    patchFactors.tessOuterHi = tessOuterHi;
-#endif
-}
-
-void OsdComputePerPatchFactors(
-        int3 patchParam,
-        float tessLevel,
-        unsigned patchID,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        OsdPatchParamBufferSet osdBuffer,
-        threadgroup PatchVertexType* patchVertices,
-        device MTLQuadTessellationFactorsHalf& quadFactors
-        )
-{
-    OsdComputePerPatchGregoryFactors(
-        patchParam,
-        tessLevel,
-        projectionMatrix,
-        modelViewMatrix,
-        patchVertices,
-#if !USE_PTVS_FACTORS
-        osdBuffer.patchTessBuffer[patchID],
-#endif
-        quadFactors
-        );
-}
-
-//----------------------------------------------------------
-// Patches.GregoryBasis.Vertex
-//----------------------------------------------------------
-
-void OsdComputePerPatchVertex(
-        int3 patchParam,
-        unsigned ID,
-        unsigned PrimitiveID,
-        unsigned ControlID,
-        threadgroup PatchVertexType* patchVertices,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    //Does nothing, all transforms are in the PTVS
-}
-
-//----------------------------------------------------------
-// Patches.GregoryBasis.Domain
-//----------------------------------------------------------
-
-#define USE_128BIT_GREGORY_BASIS_INDICES_READ 1
-
-
-#if USE_STAGE_IN
-template<typename PerPatchVertexGregoryBasis>
-#endif
-OsdPatchVertex ds_gregory_basis_patches(
-        const float tessLevel,
-#if !USE_PTVS_FACTORS
-        float4 tessOuterLo,
-        float4 tessOuterHi,
-#endif
-#if USE_STAGE_IN
-        PerPatchVertexGregoryBasis patch,
-#else
-        const device OsdInputVertexType* patch,
-        const device unsigned* patchIndices,
-#endif
-        int3 patchParam,
-        float2 domainCoord
-        )
-{
-#if USE_STAGE_IN
-    float3 cv[20];
-    for(int i = 0; i < 20; i++)
-        cv[i] = patch[i].position;
-#else
-#if USE_128BIT_GREGORY_BASIS_INDICES_READ
-    float3 cv[20];
-    for(int i = 0; i < 5; i++) {
-        int4 indices = ((device int4*)patchIndices)[i];
-
-        int n = i * 4;
-        cv[n + 0] = (patch + indices[0])->position;
-        cv[n + 1] = (patch + indices[1])->position;
-        cv[n + 2] = (patch + indices[2])->position;
-        cv[n + 3] = (patch + indices[3])->position;
-    }
-#else
-    float3 cv[20];
-    for (int i = 0; i < 20; ++i) {
-        cv[i] = patch[patchIndices[i]].position;
-    }
-#endif
-#endif
-
-#if USE_PTVS_FACTORS
-    float4 tessOuterLo(0), tessOuterHi(0);
-    OsdGetTessLevelsUniform(tessLevel, patchParam, tessOuterLo, tessOuterHi);
-#endif
-
-    float2 UV = OsdGetTessParameterization(domainCoord,
-                                           tessOuterLo,
-                                           tessOuterHi);
-
-    OsdPatchVertex output;
-
-    float3 P = float3(0), dPu = float3(0), dPv = float3(0);
-    float3 N = float3(0), dNu = float3(0), dNv = float3(0);
-
-    OsdEvalPatchGregory(patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    output.position = P;
-    output.normal = N;
-    output.tangent = dPu;
-    output.bitangent = dPv;
-#if OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-
-    output.tessCoord = UV;
-    output.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-
-    return output;
-}
-
-#if USE_STAGE_IN
-template<typename PerPatchVertexGregoryBasis>
-#endif
-OsdPatchVertex OsdComputePatch(
-        float tessLevel,
-        float2 domainCoord,
-        unsigned patchID,
-#if USE_STAGE_IN
-        PerPatchVertexGregoryBasis osdPatch
-#else
-        OsdVertexBufferSet osdBuffers
-#endif
-        )
-{
-    return ds_gregory_basis_patches(
-            tessLevel,
-#if !USE_PTVS_FACTORS
-#if USE_STAGE_IN
-            osdPatch.tessOuterLo,
-            osdPatch.tessOuterHi,
-#else
-            osdBuffers.patchTessBuffer[patchID].tessOuterLo,
-            osdBuffers.patchTessBuffer[patchID].tessOuterHi,
-#endif
-#endif
-#if USE_STAGE_IN
-            osdPatch.cv,
-            osdPatch.patchParam,
-#else
-            osdBuffers.vertexBuffer,
-            osdBuffers.indexBuffer + patchID * VERTEX_CONTROL_POINTS_PER_PATCH,
-            osdBuffers.patchParamBuffer[patchID],
-#endif
-            domainCoord
-            );
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchGregoryTriangle.metal b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchGregoryTriangle.metal
deleted file mode 100644
index a00eaf73d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchGregoryTriangle.metal
+++ /dev/null
@@ -1,265 +0,0 @@
-#line 0 "osd/mtlPatchGregoryTriangle.metal"
-
-//
-//   Copyright 2019 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-//----------------------------------------------------------
-// Patches.GregoryTriangle.Hull
-//----------------------------------------------------------
-
-void OsdComputePerVertex(
-        float4 position,
-        threadgroup HullVertex& hullVertex,
-        int vertexId,
-        float4x4 modelViewProjectionMatrix,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    hullVertex.position = position;
-#if OSD_ENABLE_PATCH_CULL
-    float4 clipPos = mul(modelViewProjectionMatrix, position);
-    short3 clip0 = short3(clipPos.x < clipPos.w,
-                          clipPos.y < clipPos.w,
-                          clipPos.z < clipPos.w);
-    short3 clip1 = short3(clipPos.x > -clipPos.w,
-                          clipPos.y > -clipPos.w,
-                          clipPos.z > -clipPos.w);
-    hullVertex.clipFlag = short3(clip0) + 2*short3(clip1);
-#endif
-}
-
-//----------------------------------------------------------
-// Patches.GregoryTriangle.Factors
-//----------------------------------------------------------
-
-void OsdComputePerPatchGregoryTriangleFactors(
-        int3 patchParam,
-        float tessLevel,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        threadgroup PatchVertexType* patchVertices,
-#if !USE_PTVS_FACTORS
-        device OsdPerPatchTessFactors& patchFactors,
-#endif
-        device MTLTriangleTessellationFactorsHalf& triFactors
-        )
-{
-    float4 tessLevelOuter = float(0);
-    float2 tessLevelInner = float(0);
-    float4 tessOuterLo = float(0);
-    float4 tessOuterHi = float(0);
-
-#if OSD_ENABLE_SCREENSPACE_TESSELLATION
-    // Gather bezier control points to compute limit surface tess levels
-    float3 cv[15];
-    cv[ 0] = patchVertices[ 0].position.xyz;
-    cv[ 1] = patchVertices[ 1].position.xyz;
-    cv[ 2] = patchVertices[15].position.xyz;
-    cv[ 3] = patchVertices[ 7].position.xyz;
-    cv[ 4] = patchVertices[ 5].position.xyz;
-    cv[ 5] = patchVertices[ 2].position.xyz;
-    cv[ 6] = patchVertices[ 3].position.xyz;
-    cv[ 7] = patchVertices[ 8].position.xyz;
-    cv[ 8] = patchVertices[ 6].position.xyz;
-    cv[ 9] = patchVertices[17].position.xyz;
-    cv[10] = patchVertices[13].position.xyz;
-    cv[11] = patchVertices[16].position.xyz;
-    cv[12] = patchVertices[11].position.xyz;
-    cv[13] = patchVertices[12].position.xyz;
-    cv[14] = patchVertices[10].position.xyz;
-
-    OsdEvalPatchBezierTriangleTessLevels(
-        tessLevel,
-        projectionMatrix,
-        modelViewMatrix,
-        cv,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#else
-    OsdGetTessLevelsUniformTriangle(
-        tessLevel,
-        patchParam,
-        tessLevelOuter,
-        tessLevelInner,
-        tessOuterLo,
-        tessOuterHi
-        );
-#endif
-
-    triFactors.edgeTessellationFactor[0] = tessLevelOuter[0];
-    triFactors.edgeTessellationFactor[1] = tessLevelOuter[1];
-    triFactors.edgeTessellationFactor[2] = tessLevelOuter[2];
-    triFactors.insideTessellationFactor  = tessLevelInner[0];
-#if !USE_PTVS_FACTORS
-    patchFactors.tessOuterLo = tessOuterLo;
-    patchFactors.tessOuterHi = tessOuterHi;
-#endif
-}
-
-void OsdComputePerPatchFactors(
-        int3 patchParam,
-        float tessLevel,
-        unsigned patchID,
-        float4x4 projectionMatrix,
-        float4x4 modelViewMatrix,
-        OsdPatchParamBufferSet osdBuffer,
-        threadgroup PatchVertexType* patchVertices,
-        device MTLTriangleTessellationFactorsHalf& triFactors
-        )
-{
-    OsdComputePerPatchGregoryTriangleFactors(
-        patchParam,
-        tessLevel,
-        projectionMatrix,
-        modelViewMatrix,
-        patchVertices,
-#if !USE_PTVS_FACTORS
-        osdBuffer.patchTessBuffer[patchID],
-#endif
-        triFactors
-        );
-}
-
-//----------------------------------------------------------
-// Patches.GregoryTriangle.Vertex
-//----------------------------------------------------------
-
-void OsdComputePerPatchVertex(
-        int3 patchParam,
-        unsigned ID,
-        unsigned PrimitiveID,
-        unsigned ControlID,
-        threadgroup PatchVertexType* patchVertices,
-        OsdPatchParamBufferSet osdBuffers
-        )
-{
-    //Does nothing, all transforms are in the PTVS
-}
-
-//----------------------------------------------------------
-// Patches.GregoryTriangle.Domain
-//----------------------------------------------------------
-
-#if USE_STAGE_IN
-template<typename PerPatchVertexGregoryBasis>
-#endif
-OsdPatchVertex ds_gregory_triangle_patches(
-        const float tessLevel,
-#if !USE_PTVS_FACTORS
-        float4 tessOuterLo,
-        float4 tessOuterHi,
-#endif
-#if USE_STAGE_IN
-        PerPatchVertexGregoryBasis patch,
-#else
-        const device OsdInputVertexType* patch,
-        const device unsigned* patchIndices,
-#endif
-        int3 patchParam,
-        float3 domainCoord
-        )
-{
-#if USE_STAGE_IN
-    float3 cv[18];
-    for(int i = 0; i < 18; i++)
-        cv[i] = patch[i].position;
-#else
-    float3 cv[18];
-    for (int i = 0; i < 18; ++i) {
-        cv[i] = patch[patchIndices[i]].position;
-    }
-#endif
-
-#if USE_PTVS_FACTORS
-    float4 tessOuterLo(0), tessOuterHi(0);
-    OsdGetTessLevelsUniform(tessLevel, patchParam, tessOuterLo, tessOuterHi);
-#endif
-
-    float2 UV = OsdGetTessParameterizationTriangle(domainCoord,
-                                                   tessOuterLo,
-                                                   tessOuterHi);
-
-    OsdPatchVertex output;
-
-    float3 P = float3(0), dPu = float3(0), dPv = float3(0);
-    float3 N = float3(0), dNu = float3(0), dNv = float3(0);
-
-    OsdEvalPatchGregoryTriangle(
-        patchParam, UV, cv, P, dPu, dPv, N, dNu, dNv);
-
-    output.position = P;
-    output.normal = N;
-    output.tangent = dPu;
-    output.bitangent = dPv;
-#if OSD_COMPUTE_NORMAL_DERIVATIVES
-    output.Nu = dNu;
-    output.Nv = dNv;
-#endif
-
-    output.tessCoord = UV;
-    output.patchCoord = OsdInterpolatePatchCoord(UV, patchParam);
-
-    return output;
-}
-
-#if USE_STAGE_IN
-template<typename PerPatchVertexGregoryBasis>
-#endif
-OsdPatchVertex OsdComputePatch(
-        float tessLevel,
-        float3 domainCoord,
-        unsigned patchID,
-#if USE_STAGE_IN
-        PerPatchVertexGregoryBasis osdPatch
-#else
-        OsdVertexBufferSet osdBuffers
-#endif
-        )
-{
-    return ds_gregory_triangle_patches(
-            tessLevel,
-#if !USE_PTVS_FACTORS
-#if USE_STAGE_IN
-            osdPatch.tessOuterLo,
-            osdPatch.tessOuterHi,
-#else
-            osdBuffers.patchTessBuffer[patchID].tessOuterLo,
-            osdBuffers.patchTessBuffer[patchID].tessOuterHi,
-#endif
-#endif
-#if USE_STAGE_IN
-            osdPatch.cv,
-            osdPatch.patchParam,
-#else
-            osdBuffers.vertexBuffer,
-            osdBuffers.indexBuffer + patchID * VERTEX_CONTROL_POINTS_PER_PATCH,
-            osdBuffers.patchParamBuffer[patchID],
-#endif
-            domainCoord
-            );
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchLegacy.metal b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchLegacy.metal
deleted file mode 100644
index a171e3ce4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchLegacy.metal
+++ /dev/null
@@ -1,373 +0,0 @@
-#line 0 "osd/mtlPatchBoxSplineTriangle.metal"
-
-//
-//   Copyright 2015-2019 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-// ----------------------------------------------------------------------------
-// Legacy Gregory
-// ----------------------------------------------------------------------------
-#if defined(OSD_PATCH_GREGORY) || defined(OSD_PATCH_GREGORY_BOUNDARY)
-
-// precomputed catmark coefficient table up to valence 29
-constant float OsdCatmarkCoefficient[30] = {
-    0, 0, 0, 0.812816, 0.500000, 0.363644, 0.287514,
-    0.238688, 0.204544, 0.179229, 0.159657,
-    0.144042, 0.131276, 0.120632, 0.111614,
-    0.103872, 0.09715, 0.0912559, 0.0860444,
-    0.0814022, 0.0772401, 0.0734867, 0.0700842,
-    0.0669851, 0.0641504, 0.0615475, 0.0591488,
-    0.0569311, 0.0548745, 0.0529621
-};
-
-float
-OsdComputeCatmarkCoefficient(int valence)
-{
-#if OSD_MAX_VALENCE < 30
-    return OsdCatmarkCoefficient[valence];
-#else
-    if (valence < 30) {
-        return OsdCatmarkCoefficient[valence];
-    } else {
-        float t = 2.0f / float(valence);
-        return 1.0f / (valence * (cospi(t) + 5.0f +
-                                  sqrt((cospi(t) + 9) * (cospi(t) + 1)))/16.0f);
-    }
-#endif
-}
-
-float cosfn(int n, int j) {
-    return cospi((2.0f * j)/float(n));
-}
-
-float sinfn(int n, int j) {
-    return sinpi((2.0f * j)/float(n));
-}
-
-#ifndef OSD_MAX_VALENCE
-#define OSD_MAX_VALENCE 4
-#endif
-
-template<typename OsdVertexBuffer>
-float3 OsdReadVertex(int vertexIndex, OsdVertexBuffer osdVertexBuffer)
-{
-    int index = (vertexIndex /*+ OsdBaseVertex()*/);
-    return osdVertexBuffer[index].position;
-}
-
-template<typename OsdValenceBuffer>
-int OsdReadVertexValence(int vertexID, OsdValenceBuffer osdValenceBuffer)
-{
-    int index = int(vertexID * (2 * OSD_MAX_VALENCE + 1));
-    return osdValenceBuffer[index];
-}
-
-template<typename OsdValenceBuffer>
-int OsdReadVertexIndex(int vertexID, int valenceVertex, OsdValenceBuffer osdValenceBuffer)
-{
-    int index = int(vertexID * (2 * OSD_MAX_VALENCE + 1) + 1 + valenceVertex);
-    return osdValenceBuffer[index];
-}
-
-template<typename OsdQuadOffsetBuffer>
-int OsdReadQuadOffset(int primitiveID, int offsetVertex, OsdQuadOffsetBuffer osdQuadOffsetBuffer)
-{
-    int index = int(4*primitiveID + offsetVertex);
-    return osdQuadOffsetBuffer[index];
-}
-
-
-void OsdComputePerVertexGregory(unsigned vID, float3 P, threadgroup OsdPerVertexGregory& v, OsdPatchParamBufferSet osdBuffers)
-{
-    v.clipFlag = short3(0,0,0);
-
-    int ivalence = OsdReadVertexValence(vID, osdBuffers.valenceBuffer);
-    v.valence = ivalence;
-    int valence = abs(ivalence);
-
-    float3 f[OSD_MAX_VALENCE];
-    float3 pos = P;
-    float3 opos = float3(0,0,0);
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    v.org = pos;
-    int boundaryEdgeNeighbors[2];
-    int currNeighbor = 0;
-    int ibefore = 0;
-    int zerothNeighbor = 0;
-#endif
-
-    for (int i=0; i<valence; ++i) {
-        int im = (i+valence-1)%valence;
-        int ip = (i+1)%valence;
-
-        int idx_neighbor = OsdReadVertexIndex(vID, 2*i, osdBuffers.valenceBuffer);
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-        bool isBoundaryNeighbor = false;
-        int valenceNeighbor = OsdReadVertexValence(idx_neighbor, osdBuffers.valenceBuffer);
-
-        if (valenceNeighbor < 0) {
-            isBoundaryNeighbor = true;
-            if (currNeighbor<2) {
-                boundaryEdgeNeighbors[currNeighbor] = idx_neighbor;
-            }
-            currNeighbor++;
-            if (currNeighbor == 1) {
-                ibefore = i;
-                zerothNeighbor = i;
-            } else {
-                if (i-ibefore == 1) {
-                    int tmp = boundaryEdgeNeighbors[0];
-                    boundaryEdgeNeighbors[0] = boundaryEdgeNeighbors[1];
-                    boundaryEdgeNeighbors[1] = tmp;
-                    zerothNeighbor = i;
-                }
-            }
-        }
-#endif
-
-        float3 neighbor = OsdReadVertex(idx_neighbor, osdBuffers.vertexBuffer);
-
-        int idx_diagonal = OsdReadVertexIndex(vID, 2*i + 1, osdBuffers.valenceBuffer);
-        float3 diagonal = OsdReadVertex(idx_diagonal, osdBuffers.vertexBuffer);
-
-        int idx_neighbor_p = OsdReadVertexIndex(vID, 2*ip, osdBuffers.valenceBuffer);
-        float3 neighbor_p = OsdReadVertex(idx_neighbor_p, osdBuffers.vertexBuffer);
-
-        int idx_neighbor_m = OsdReadVertexIndex(vID, 2*im, osdBuffers.valenceBuffer);
-        float3 neighbor_m = OsdReadVertex(idx_neighbor_m, osdBuffers.vertexBuffer);
-
-        int idx_diagonal_m = OsdReadVertexIndex(vID, 2*im + 1, osdBuffers.valenceBuffer);
-        float3 diagonal_m = OsdReadVertex(idx_diagonal_m, osdBuffers.vertexBuffer);
-
-        f[i] = (pos * float(valence) + (neighbor_p + neighbor)*2.0f + diagonal) / (float(valence)+5.0f);
-
-        opos += f[i];
-        v.r[i] = (neighbor_p-neighbor_m)/3.0f + (diagonal - diagonal_m)/6.0f;
-    }
-
-    opos /= valence;
-    v.P = float4(opos, 1.0f).xyz;
-
-    float3 e;
-    v.e0 = float3(0,0,0);
-    v.e1 = float3(0,0,0);
-
-    for(int i=0; i<valence; ++i) {
-        int im = (i + valence -1) % valence;
-        e = 0.5f * (f[i] + f[im]);
-        v.e0 += cosfn(valence, i)*e;
-        v.e1 += sinfn(valence, i)*e;
-    }
-    float ef = OsdComputeCatmarkCoefficient(valence);
-    v.e0 *= ef;
-    v.e1 *= ef;
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    v.zerothNeighbor = zerothNeighbor;
-    if (currNeighbor == 1) {
-        boundaryEdgeNeighbors[1] = boundaryEdgeNeighbors[0];
-    }
-
-    if (ivalence < 0) {
-        if (valence > 2) {
-            v.P = (OsdReadVertex(boundaryEdgeNeighbors[0], osdBuffers.vertexBuffer) +
-                   OsdReadVertex(boundaryEdgeNeighbors[1], osdBuffers.vertexBuffer) +
-                   4.0f * pos)/6.0f;
-        } else {
-            v.P = pos;
-        }
-
-        v.e0 = (OsdReadVertex(boundaryEdgeNeighbors[0], osdBuffers.vertexBuffer) -
-                OsdReadVertex(boundaryEdgeNeighbors[1], osdBuffers.vertexBuffer))/6.0;
-
-        float k = float(float(valence) - 1.0f);    //k is the number of faces
-        float c = cospi(1.0/k);
-        float s = sinpi(1.0/k);
-        float gamma = -(4.0f*s)/(3.0f*k+c);
-        float alpha_0k = -((1.0f+2.0f*c)*sqrt(1.0f+c))/((3.0f*k+c)*sqrt(1.0f-c));
-        float beta_0 = s/(3.0f*k + c);
-
-        int idx_diagonal = OsdReadVertexIndex(vID, 2*zerothNeighbor + 1, osdBuffers.valenceBuffer);
-        float3 diagonal = OsdReadVertex(idx_diagonal, osdBuffers.vertexBuffer);
-
-        v.e1 = gamma * pos +
-            alpha_0k * OsdReadVertex(boundaryEdgeNeighbors[0], osdBuffers.vertexBuffer) +
-            alpha_0k * OsdReadVertex(boundaryEdgeNeighbors[1], osdBuffers.vertexBuffer) +
-            beta_0 * diagonal;
-
-        for (int x=1; x<valence - 1; ++x) {
-            int curri = ((x + zerothNeighbor)%valence);
-            float alpha = (4.0f*sinpi((float(x))/k))/(3.0f*k+c);
-            float beta = (sinpi((float(x))/k) + sinpi((float(x+1))/k))/(3.0f*k+c);
-
-            int idx_neighbor = OsdReadVertexIndex(vID, 2*curri, osdBuffers.valenceBuffer);
-            float3 neighbor = OsdReadVertex(idx_neighbor, osdBuffers.vertexBuffer);
-
-            idx_diagonal = OsdReadVertexIndex(vID, 2*curri + 1, osdBuffers.valenceBuffer);
-            diagonal = OsdReadVertex(idx_diagonal, osdBuffers.vertexBuffer);
-
-            v.e1 += alpha * neighbor + beta * diagonal;
-        }
-
-        v.e1 /= 3.0f;
-    }
-#endif
-}
-
-void
-OsdComputePerPatchVertexGregory(int3 patchParam, unsigned ID, unsigned primitiveID,
-                                threadgroup OsdPerVertexGregory* v,
-                                device OsdPerPatchVertexGregory& result,
-                                OsdPatchParamBufferSet osdBuffers)
-{
-    result.P = v[ID].P;
-
-    int i = ID;
-    int ip = (i+1)%4;
-    int im = (i+3)%4;
-    int valence = abs(v[i].valence);
-    int n = valence;
-
-    int start = OsdReadQuadOffset(primitiveID, i, osdBuffers.quadOffsetBuffer) & 0xff;
-    int prev = (OsdReadQuadOffset(primitiveID, i, osdBuffers.quadOffsetBuffer) >> 8) & 0xff;
-
-    int start_m = OsdReadQuadOffset(primitiveID, im, osdBuffers.quadOffsetBuffer) & 0xff;
-    int prev_p = (OsdReadQuadOffset(primitiveID, ip, osdBuffers.quadOffsetBuffer) >> 8) & 0xff;
-
-    int np = abs(v[ip].valence);
-    int nm = abs(v[im].valence);
-
-    // Control Vertices based on :
-    // "Approximating Subdivision Surfaces with Gregory Patches
-    //  for Hardware Tessellation"
-    // Loop, Schaefer, Ni, Castano (ACM ToG Siggraph Asia 2009)
-    //
-    //  P3         e3-      e2+         P2
-    //     O--------O--------O--------O
-    //     |        |        |        |
-    //     |        |        |        |
-    //     |        | f3-    | f2+    |
-    //     |        O        O        |
-    // e3+ O------O            O------O e2-
-    //     |     f3+          f2-     |
-    //     |                          |
-    //     |                          |
-    //     |      f0-         f1+     |
-    // e0- O------O            O------O e1+
-    //     |        O        O        |
-    //     |        | f0+    | f1-    |
-    //     |        |        |        |
-    //     |        |        |        |
-    //     O--------O--------O--------O
-    //  P0         e0+      e1-         P1
-    //
-
-#ifdef OSD_PATCH_GREGORY_BOUNDARY
-    float3 Em_ip;
-    if (v[ip].valence < -2) {
-        int j = (np + prev_p - v[ip].zerothNeighbor) % np;
-        Em_ip = v[ip].P + cospi(j/float(np-1))*v[ip].e0 + sinpi(j/float(np-1))*v[ip].e1;
-    } else {
-        Em_ip = v[ip].P + v[ip].e0*cosfn(np, prev_p) + v[ip].e1*sinfn(np, prev_p);
-    }
-
-    float3 Ep_im;
-    if (v[im].valence < -2) {
-        int j = (nm + start_m - v[im].zerothNeighbor) % nm;
-        Ep_im = v[im].P + cospi(j/float(nm-1))*v[im].e0 + sinpi(j/float(nm-1))*v[im].e1;
-    } else {
-        Ep_im = v[im].P + v[im].e0*cosfn(nm, start_m) + v[im].e1*sinfn(nm, start_m);
-    }
-
-    if (v[i].valence < 0) {
-        n = (n-1)*2;
-    }
-    if (v[im].valence < 0) {
-        nm = (nm-1)*2;
-    }
-    if (v[ip].valence < 0) {
-        np = (np-1)*2;
-    }
-
-    if (v[i].valence > 2) {
-        result.Ep = v[i].P + (v[i].e0*cosfn(n, start) + v[i].e1*sinfn(n, start));
-        result.Em = v[i].P + (v[i].e0*cosfn(n, prev) +  v[i].e1*sinfn(n, prev));
-
-        float s1=3-2*cosfn(n,1)-cosfn(np,1);
-        float s2=2*cosfn(n,1);
-
-        result.Fp = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-        s1 = 3.0f-2.0f*cospi(2.0f/float(n))-cospi(2.0f/float(nm));
-        result.Fm = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-
-    } else if (v[i].valence < -2) {
-        int j = (valence + start - v[i].zerothNeighbor) % valence;
-
-        result.Ep = v[i].P + cospi(j/float(valence-1))*v[i].e0 + sinpi(j/float(valence-1))*v[i].e1;
-        j = (valence + prev - v[i].zerothNeighbor) % valence;
-        result.Em = v[i].P + cospi(j/float(valence-1))*v[i].e0 + sinpi(j/float(valence-1))*v[i].e1;
-
-        float3 Rp = ((-2.0f * v[i].org - 1.0f * v[im].org) + (2.0f * v[ip].org + 1.0f * v[(i+2)%4].org))/3.0f;
-        float3 Rm = ((-2.0f * v[i].org - 1.0f * v[ip].org) + (2.0f * v[im].org + 1.0f * v[(i+2)%4].org))/3.0f;
-
-        float s1 = 3-2*cosfn(n,1)-cosfn(np,1);
-        float s2 = 2*cosfn(n,1);
-
-        result.Fp = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-        s1 = 3.0f-2.0f*cospi(2.0f/float(n))-cospi(2.0f/float(nm));
-        result.Fm = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-
-        if (v[im].valence < 0) {
-            s1 = 3-2*cosfn(n,1)-cosfn(np,1);
-            result.Fp = result.Fm = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-        } else if (v[ip].valence < 0) {
-            s1 = 3.0f-2.0f*cospi(2.0f/n)-cospi(2.0f/nm);
-            result.Fm = result.Fp = (cosfn(nm,1)*v[i].P + s1*result.Em + s2*Ep_im - v[i].r[prev])/3.0f;
-        }
-
-    } else if (v[i].valence == -2) {
-        result.Ep = (2.0f * v[i].org + v[ip].org)/3.0f;
-        result.Em = (2.0f * v[i].org + v[im].org)/3.0f;
-        result.Fp = result.Fm = (4.0f * v[i].org + v[(i+2)%n].org + 2.0f * v[ip].org + 2.0f * v[im].org)/9.0f;
-    }
-
-#else // not OSD_PATCH_GREGORY_BOUNDARY
-
-    result.Ep = v[i].P + v[i].e0 * cosfn(n, start) + v[i].e1*sinfn(n, start);
-    result.Em = v[i].P + v[i].e0 * cosfn(n, prev ) + v[i].e1*sinfn(n, prev );
-
-    float3 Em_ip = v[ip].P + v[ip].e0*cosfn(np, prev_p) + v[ip].e1*sinfn(np, prev_p);
-    float3 Ep_im = v[im].P + v[im].e0*cosfn(nm, start_m) + v[im].e1*sinfn(nm, start_m);
-
-    float s1 = 3-2*cosfn(n,1)-cosfn(np,1);
-    float s2 = 2*cosfn(n,1);
-
-    result.Fp = (cosfn(np,1)*v[i].P + s1*result.Ep + s2*Em_ip + v[i].r[start])/3.0f;
-    s1 = 3.0f-2.0f*cospi(2.0f/float(n))-cospi(2.0f/float(nm));
-    result.Fm = (cosfn(nm,1)*v[i].P + s1*result.Em +s2*Ep_im - v[i].r[prev])/3.0f;
-#endif
-}
-
-#endif  // OSD_PATCH_GREGORY || OSD_PATCH_GREGORY_BOUNDARY
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchShaderSource.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchShaderSource.h
deleted file mode 100644
index 54bbf6cda..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchShaderSource.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_MTL_PATCH_SHADER_SOURCE_H
-#define OPENSUBDIV3_OSD_MTL_PATCH_SHADER_SOURCE_H
-
-#import "../version.h"
-#import "../far/patchDescriptor.h"
-#import <string>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class MTLPatchShaderSource {
-    public:
-    static std::string GetCommonShaderSource();
-
-    static std::string GetPatchBasisShaderSource();
-
-    static std::string GetVertexShaderSource(Far::PatchDescriptor::Type type);
-
-    static std::string GetHullShaderSource(Far::PatchDescriptor::Type type);
-
-    static std::string GetDomainShaderSource(Far::PatchDescriptor::Type type);
-
-    /// These methods are deprecated. Clients should determine the
-    /// patch type of a face-varying patch by inspecting the
-    /// face-varying patch array descriptors.
-    /// \brief Deprecated
-    static std::string GetVertexShaderSource(
-        Far::PatchDescriptor::Type type,
-        Far::PatchDescriptor::Type fvarType);
-    static std::string GetHullShaderSource(
-        Far::PatchDescriptor::Type type,
-        Far::PatchDescriptor::Type fvarType);
-    static std::string GetDomainShaderSource(
-        Far::PatchDescriptor::Type type,
-        Far::PatchDescriptor::Type fvarType);
-};
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-    
-} // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_MTL_PATCH_SHADER_SOURCE
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchShaderSource.mm b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchShaderSource.mm
deleted file mode 100644
index 754909f01..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchShaderSource.mm
+++ /dev/null
@@ -1,244 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/mtlPatchShaderSource.h"
-#include "../far/error.h"
-
-#include <sstream>
-#include <string>
-#include <TargetConditionals.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-static std::string commonShaderSource(
-#include "mtlPatchCommon.gen.h"
-);
-static std::string commonTessShaderSource(
-#include "mtlPatchCommonTess.gen.h"
-);
-static std::string patchLegacyShaderSource(
-#include "mtlPatchLegacy.gen.h"
-);
-static std::string patchBasisTypesShaderSource(
-#include "patchBasisCommonTypes.gen.h"
-);
-static std::string patchBasisShaderSource(
-#include "patchBasisCommon.gen.h"
-);
-static std::string patchBasisEvalShaderSource(
-#include "patchBasisCommonEval.gen.h"
-);
-static std::string bsplineShaderSource(
-#include "mtlPatchBSpline.gen.h"
-);
-static std::string boxSplineTriangleShaderSource(
-#include "mtlPatchBoxSplineTriangle.gen.h"
-);
-static std::string gregoryShaderSource(
-#include "mtlPatchGregory.gen.h"
-);
-static std::string gregoryBasisShaderSource(
-#include "mtlPatchGregoryBasis.gen.h"
-);
-static std::string gregoryTriangleShaderSource(
-#include "mtlPatchGregoryTriangle.gen.h"
-);
-
-static std::string
-GetPatchTypeDefine(Far::PatchDescriptor::Type type,
-                   Far::PatchDescriptor::Type fvarType =
-                       Far::PatchDescriptor::NON_PATCH) {
-
-    std::stringstream ss;
-    switch(type) {
-        case Far::PatchDescriptor::LINES:
-            ss << "#define OSD_PATCH_LINES 1\n";
-            break;
-        case Far::PatchDescriptor::TRIANGLES:
-            ss << "#define OSD_PATCH_TRIANGLES 1\n";
-            break;
-        case Far::PatchDescriptor::QUADS:
-            ss << "#define OSD_PATCH_QUADS 1\n";
-            break;
-        case Far::PatchDescriptor::REGULAR:
-            ss << "#define OSD_PATCH_BSPLINE 1\n"
-                  "#define OSD_PATCH_REGULAR 1\n";
-            break;
-        case Far::PatchDescriptor::LOOP:
-            ss << "#define OSD_PATCH_BOX_SPLINE_TRIANGLE 1\n";
-            break;
-        case Far::PatchDescriptor::GREGORY:
-            ss << "#define OSD_PATCH_GREGORY 1\n";
-            break;
-        case Far::PatchDescriptor::GREGORY_BOUNDARY:
-            ss << "#define OSD_PATCH_GREGORY_BOUNDARY 1\n";
-            break;
-        case Far::PatchDescriptor::GREGORY_BASIS:
-            ss << "#define OSD_PATCH_GREGORY_BASIS 1\n";
-            break;
-        case Far::PatchDescriptor::GREGORY_TRIANGLE:
-            ss << "#define OSD_PATCH_GREGORY_TRIANGLE 1\n";
-            break;
-        default:
-            assert("Unknown Far::PatchDescriptor::Type" && 0);
-            return "";
-    }
-    switch(fvarType) {
-        case Far::PatchDescriptor::REGULAR:
-            ss << "#define OSD_FACEVARYING_PATCH_REGULAR 1\n";
-            break;
-        case Far::PatchDescriptor::GREGORY_BASIS:
-            ss << "#define OSD_FACEVARYING_PATCH_GREGORY_BASIS 1\n";
-            break;
-        default:
-            return ss.str();
-    }
-    return ss.str();
-}
-
-static std::string
-GetPatchTypeSource(Far::PatchDescriptor::Type type) {
-
-    switch(type) {
-        case Far::PatchDescriptor::QUADS:
-        case Far::PatchDescriptor::TRIANGLES:
-            return "";
-        case Far::PatchDescriptor::REGULAR:
-            return bsplineShaderSource;
-        case Far::PatchDescriptor::LOOP:
-            return boxSplineTriangleShaderSource;
-        case Far::PatchDescriptor::GREGORY:
-            return gregoryShaderSource;
-        case Far::PatchDescriptor::GREGORY_BOUNDARY:
-            return gregoryShaderSource;
-        case Far::PatchDescriptor::GREGORY_BASIS:
-            return gregoryBasisShaderSource;
-        case Far::PatchDescriptor::GREGORY_TRIANGLE:
-            return gregoryTriangleShaderSource;
-        default:
-            assert("Unknown Far::PatchDescriptor::Type" && 0);
-            return "";
-    }
-}
-
-/*static*/
-std::string
-MTLPatchShaderSource::GetCommonShaderSource() {
-#if TARGET_OS_IOS || TARGET_OS_TV
-    return std::string("#define OSD_METAL_IOS 1\n")
-               .append(commonShaderSource)
-               .append(commonTessShaderSource)
-               .append(patchLegacyShaderSource);
-#elif TARGET_OS_OSX
-    return std::string("#define OSD_METAL_OSX 1\n")
-               .append(commonShaderSource)
-               .append(commonTessShaderSource)
-               .append(patchLegacyShaderSource);
-#endif
-}
-
-/*static*/
-std::string
-MTLPatchShaderSource::GetPatchBasisShaderSource() {
-    std::stringstream ss;
-    ss << "#define OSD_PATCH_BASIS_METAL 1\n";
-#if defined(OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES)
-    ss << "#define OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES 1\n";
-#endif
-    ss << patchBasisTypesShaderSource;
-    ss << patchBasisShaderSource;
-    ss << patchBasisEvalShaderSource;
-    return ss.str();
-}
-
-/*static*/
-std::string
-MTLPatchShaderSource::GetVertexShaderSource(Far::PatchDescriptor::Type type) {
-    std::stringstream ss;
-    ss << GetPatchTypeDefine(type);
-    ss << GetCommonShaderSource();
-    ss << GetPatchTypeSource(type);
-    return ss.str();
-}
-
-/*static*/
-std::string
-MTLPatchShaderSource::GetVertexShaderSource(Far::PatchDescriptor::Type type,
-                                            Far::PatchDescriptor::Type fvarType) {
-    std::stringstream ss;
-    ss << GetPatchTypeDefine(type, fvarType);
-    ss << GetCommonShaderSource();
-    ss << GetPatchTypeSource(type);
-    return ss.str();
-}
-
-/*static*/
-std::string
-MTLPatchShaderSource::GetHullShaderSource(Far::PatchDescriptor::Type type) {
-    std::stringstream ss;
-    ss << GetPatchTypeDefine(type);
-    ss << GetCommonShaderSource();
-    ss << GetPatchTypeSource(type);
-    return ss.str();
-}
-
-/*static*/
-std::string
-MTLPatchShaderSource::GetHullShaderSource(Far::PatchDescriptor::Type type,
-                                          Far::PatchDescriptor::Type fvarType) {
-    std::stringstream ss;
-    ss << GetPatchTypeDefine(type, fvarType);
-    ss << GetCommonShaderSource();
-    ss << GetPatchTypeSource(type);
-    return ss.str();
-}
-
-/*static*/
-std::string
-MTLPatchShaderSource::GetDomainShaderSource(Far::PatchDescriptor::Type type) {
-    std::stringstream ss;
-    ss << GetPatchTypeDefine(type);
-    ss << GetCommonShaderSource();
-    ss << GetPatchTypeSource(type);
-    return ss.str();
-}
-
-/*static*/
-std::string
-MTLPatchShaderSource::GetDomainShaderSource(Far::PatchDescriptor::Type type,
-                                            Far::PatchDescriptor::Type fvarType) {
-    std::stringstream ss;
-    ss << GetPatchTypeDefine(type, fvarType);
-    ss << GetCommonShaderSource();
-    ss << GetPatchTypeSource(type);
-    return ss.str();
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchTable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchTable.h
deleted file mode 100644
index 9e68f7856..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchTable.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_MTL_PATCH_TABLE_H
-#define OPENSUBDIV3_OSD_MTL_PATCH_TABLE_H
-
-#include "../version.h"
-#include "../far/patchDescriptor.h"
-#include "../osd/nonCopyable.h"
-#include "../osd/types.h"
-#include "../osd/mtlCommon.h"
-
-@protocol MTLDevice;
-@protocol MTLBuffer;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Far {
-    class PatchTable;
-};
-
-namespace Osd {
-
-class MTLPatchTable : private NonCopyable<MTLPatchTable> {
-public:
-    typedef id<MTLBuffer> VertexBufferBinding;
-
-    MTLPatchTable();
-    ~MTLPatchTable();
-
-    template<typename DEVICE_CONTEXT>
-    static MTLPatchTable *Create(Far::PatchTable const *farPatchTable, DEVICE_CONTEXT context)
-    {
-        return Create(farPatchTable, context);
-    }
-
-    static MTLPatchTable *Create(Far::PatchTable const *farPatchTable, MTLContext* context);
-
-    PatchArrayVector const &GetPatchArrays() const { return _patchArrays; }
-    id<MTLBuffer> GetPatchIndexBuffer() const { return _indexBuffer; }
-    id<MTLBuffer> GetPatchParamBuffer() const { return _patchParamBuffer; }
-
-    PatchArrayVector const &GetVaryingPatchArrays() const { return _varyingPatchArrays; }
-    id<MTLBuffer> GetVaryingPatchIndexBuffer() const { return _varyingPatchIndexBuffer; }
-
-    int GetNumFVarChannels() const { return (int)_fvarPatchArrays.size(); }
-    PatchArrayVector const &GetFVarPatchArrays(int fvarChannel = 0) const { return _fvarPatchArrays[fvarChannel]; }
-    id<MTLBuffer> GetFVarPatchIndexBuffer(int fvarChannel = 0) const { return _fvarIndexBuffers[fvarChannel]; }
-    id<MTLBuffer> GetFVarPatchParamBuffer(int fvarChannel = 0) const { return _fvarParamBuffers[fvarChannel]; }
-
-protected:
-    bool allocate(Far::PatchTable const *farPatchTable, MTLContext* context);
-
-    PatchArrayVector _patchArrays;
-
-    id<MTLBuffer> _indexBuffer;
-    id<MTLBuffer> _patchParamBuffer;
-
-    PatchArrayVector _varyingPatchArrays;
-
-    id<MTLBuffer> _varyingPatchIndexBuffer;
-
-    std::vector<PatchArrayVector> _fvarPatchArrays;
-    std::vector<id<MTLBuffer>> _fvarIndexBuffers;
-    std::vector<id<MTLBuffer>> _fvarParamBuffers;
-};
-
-} // end namespace Osd
-
-} //end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} //end namespace OpenSubdiv
-
-#endif //end OPENSUBDIV3_OSD_MTL_PATCH_TABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchTable.mm b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchTable.mm
deleted file mode 100644
index 14b1961d9..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlPatchTable.mm
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#import "../osd/mtlPatchTable.h"
-#import <Metal/Metal.h>
-#import "../far/patchTable.h"
-#import "../osd/cpuPatchTable.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-MTLPatchTable::MTLPatchTable()
-:
-_indexBuffer(nil),
-_patchParamBuffer(nil),
-_varyingPatchIndexBuffer(nil)
-{
-
-}
-
-
-MTLPatchTable::~MTLPatchTable()
-{
-
-}
-
-static id<MTLBuffer> createBuffer(const void* data, const size_t length,
-                                  MTLContext* context)
-{
-    if(length == 0)
-        return nil;
-#if TARGET_OS_IOS || TARGET_OS_TV
-    return [context->device newBufferWithBytes:data length:length options:MTLResourceOptionCPUCacheModeDefault];
-#elif TARGET_OS_OSX
-  @autoreleasepool {
-    auto cmdBuf = [context->commandQueue commandBuffer];
-    auto blitEncoder = [cmdBuf blitCommandEncoder];
-
-    auto stageBuffer = [context->device newBufferWithBytes:data length:length options:MTLResourceOptionCPUCacheModeDefault];
-
-    auto finalBuffer = [context->device newBufferWithLength:length options:MTLResourceStorageModePrivate];
-
-    [blitEncoder copyFromBuffer:stageBuffer sourceOffset:0 toBuffer:finalBuffer destinationOffset:0 size:length];
-    [blitEncoder endEncoding];
-    [cmdBuf commit];
-    [cmdBuf waitUntilCompleted];
-
-#if !__has_feature(objc_arc)
-      [stageBuffer release];
-#endif
-
-    return finalBuffer;
-  }
-#endif
-}
-
-
-MTLPatchTable* MTLPatchTable::Create(const Far::PatchTable *farPatchTable, MTLContext* context)
-{
-    auto patchTable = new MTLPatchTable();
-    if(patchTable->allocate(farPatchTable, context))
-        return patchTable;
-
-    delete patchTable;
-    assert(0 && "MTLPatchTable Creation Failed");
-    return nullptr;
-}
-
-bool MTLPatchTable::allocate(Far::PatchTable const *farPatchTable, MTLContext* context)
-{
-    CpuPatchTable cpuTable(farPatchTable);
-
-    auto numPatchArrays = cpuTable.GetNumPatchArrays();
-    auto indexSize = cpuTable.GetPatchIndexSize();
-    auto patchParamSize = cpuTable.GetPatchParamSize();
-
-    _patchArrays.assign(cpuTable.GetPatchArrayBuffer(), cpuTable.GetPatchArrayBuffer() + numPatchArrays);
-
-    _indexBuffer = createBuffer(cpuTable.GetPatchIndexBuffer(), indexSize * sizeof(unsigned), context);
-    if(_indexBuffer == nil)
-        return false;
-
-    _indexBuffer.label = @"OSD PatchIndexBuffer";
-
-    _patchParamBuffer = createBuffer(cpuTable.GetPatchParamBuffer(), patchParamSize * sizeof(PatchParam), context);
-    if(_patchParamBuffer == nil)
-        return false;
-
-    _patchParamBuffer.label = @"OSD PatchParamBuffer";
-
-    _varyingPatchArrays.assign(cpuTable.GetVaryingPatchArrayBuffer(), cpuTable.GetVaryingPatchArrayBuffer() + numPatchArrays);
-
-    _varyingPatchIndexBuffer = createBuffer(cpuTable.GetVaryingPatchIndexBuffer(), sizeof(int) * cpuTable.GetVaryingPatchIndexSize(), context);
-    if(_varyingPatchIndexBuffer == nil && cpuTable.GetVaryingPatchIndexSize() > 0)
-        return false;
-
-    auto numFVarChannels = cpuTable.GetNumFVarChannels();
-    _fvarPatchArrays.resize(numFVarChannels);
-    _fvarIndexBuffers.resize(numFVarChannels);
-    _fvarParamBuffers.resize(numFVarChannels);
-    for(auto fvc = 0; fvc < numFVarChannels; fvc++)
-    {
-        _fvarPatchArrays[fvc].assign(cpuTable.GetFVarPatchArrayBuffer(fvc), cpuTable.GetFVarPatchArrayBuffer(fvc) + numPatchArrays);
-        _fvarIndexBuffers[fvc] = createBuffer(cpuTable.GetFVarPatchIndexBuffer(fvc), cpuTable.GetFVarPatchIndexSize(fvc) * sizeof(int), context);
-        if(_fvarIndexBuffers[fvc] == nil)
-            return false;
-
-        _fvarParamBuffers[fvc] = createBuffer(cpuTable.GetFVarPatchParamBuffer(fvc), cpuTable.GetFVarPatchParamSize(fvc) * sizeof(PatchParam), context);
-        if(_fvarParamBuffers[fvc] == nil)
-            return false;
-    }
-
-
-    return true;
-}
-
-} //end namespace Osd
-} //end namespace OPENSUBDIV_VERSION
-} //end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlVertexBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlVertexBuffer.h
deleted file mode 100644
index b64939ef2..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlVertexBuffer.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_MTL_VERTEX_BUFFER_H
-#define OPENSUBDIV3_OSD_MTL_VERTEX_BUFFER_H
-
-#include "../version.h"
-#include "../osd/mtlCommon.h"
-
-@protocol MTLDevice;
-@protocol MTLBuffer;
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class CPUMTLVertexBuffer {
-public:
-    static CPUMTLVertexBuffer* Create(int numElements, int numVertices, MTLContext* context);
-
-    void UpdateData(const float* src, int startVertex, int numVertices, MTLContext* context);
-
-    int GetNumElements() const
-    {
-        return _numElements;
-    }
-
-    int GetNumVertices() const
-    {
-        return _numVertices;
-    }
-
-    float* BindCpuBuffer();
-    id<MTLBuffer> BindMTLBuffer(MTLContext* context);
-
-    id<MTLBuffer> BindVBO(MTLContext* context)
-    {
-        return BindMTLBuffer(context);
-    }
-
-protected:
-
-    CPUMTLVertexBuffer(int numElements, int numVertices);
-
-    bool allocate(MTLContext* context);
-
-private:
-    int _numElements;
-    int _numVertices;
-    id<MTLBuffer> _buffer;
-    bool _dirty;
-};
-
-} //end namespace Osd
-
-} //end namespace OPENSUBDIV_VERSION
-    using namespace OPENSUBDIV_VERSION;
-
-} //end namespace OpenSubdiv
-
-#endif // OPENSUBDIV3_OSD_MTL_VERTEX_BUFFER_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlVertexBuffer.mm b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlVertexBuffer.mm
deleted file mode 100644
index f5120d39a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/mtlVertexBuffer.mm
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/mtlVertexBuffer.h"
-#include <Metal/Metal.h>
-#include <TargetConditionals.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-CPUMTLVertexBuffer::CPUMTLVertexBuffer(int numElements, int numVertices)
-:
-_numElements(numElements), _numVertices(numVertices),
-_buffer(nullptr), _dirty(true)
-{
-
-}
-
-bool CPUMTLVertexBuffer::allocate(MTLContext* context)
-{
-#if TARGET_OS_IOS || TARGET_OS_TV
-    _buffer = [context->device newBufferWithLength: _numElements * _numVertices * sizeof(float) options:MTLResourceOptionCPUCacheModeDefault];
-#elif TARGET_OS_OSX
-    _buffer = [context->device newBufferWithLength: _numElements * _numVertices * sizeof(float) options:MTLResourceStorageModeManaged];
-#endif
-    if(_buffer == nil)
-        return false;
-
-    _dirty = true;
-    _buffer.label = @"OSD VertexBuffer";
-
-    return true;
-}
-
-CPUMTLVertexBuffer* CPUMTLVertexBuffer::Create(int numElements, int numVertices, MTLContext* context)
-{
-    auto instance = new CPUMTLVertexBuffer(numElements, numVertices);
-    if(!instance->allocate(context))
-    {
-        delete instance;
-        return nullptr;
-    }
-
-    return instance;
-}
-
-void CPUMTLVertexBuffer::UpdateData(const float* src, int startVertex, int numVertices, MTLContext* context)
-{
-    _dirty = true;
-    memcpy(((float*)_buffer.contents) + startVertex * _numElements, src, _numElements * numVertices * sizeof(float));
-}
-
-float* CPUMTLVertexBuffer::BindCpuBuffer()
-{
-    _dirty = true;
-    return (float*)_buffer.contents;
-}
-
-id<MTLBuffer> CPUMTLVertexBuffer::BindMTLBuffer(MTLContext* context)
-{
-#if TARGET_OS_OSX
-    if(_dirty)
-        [_buffer didModifyRange:NSMakeRange(0, _buffer.length)];
-    _dirty = false;
-#endif
-    return _buffer;
-}
-
-
-
-} //end namepsace Osd
-
-} //end namespace OPENSUBDIV_VERSION
-} //end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/nonCopyable.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/nonCopyable.h
deleted file mode 100644
index 23f44c1b8..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/nonCopyable.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_NON_COPYABLE_H
-#define OPENSUBDIV3_OSD_NON_COPYABLE_H
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-template <class T>
-class NonCopyable {
-
-protected:
-    NonCopyable() {}
-    ~NonCopyable() {}
-
-private:
-    NonCopyable(const NonCopyable &);
-    T & operator = (const T &);
-};
-
-} // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_NON_COPYABLE_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompEvaluator.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompEvaluator.cpp
deleted file mode 100644
index 1fb3d21d7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompEvaluator.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/ompEvaluator.h"
-#include "../osd/ompKernel.h"
-#include "../osd/patchBasisCommonTypes.h"
-#include "../osd/patchBasisCommon.h"
-#include "../osd/patchBasisCommonEval.h"
-#include <omp.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-/* static */
-bool
-OmpEvaluator::EvalStencils(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    const int * sizes,
-    const int * offsets,
-    const int * indices,
-    const float * weights,
-    int start, int end) {
-
-    if (end <= start) return true;
-    if (srcDesc.length != dstDesc.length) return false;
-
-    // XXX: we can probably expand cpuKernel.cpp to here.
-    OmpEvalStencils(src, srcDesc, dst, dstDesc,
-                    sizes, offsets, indices, weights, start, end);
-
-    return true;
-}
-
-/* static */
-bool
-OmpEvaluator::EvalStencils(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    const int * sizes,
-    const int * offsets,
-    const int * indices,
-    const float * weights,
-    const float * duWeights,
-    const float * dvWeights,
-    int start, int end) {
-
-    if (end <= start) return true;
-    if (srcDesc.length != dstDesc.length) return false;
-    if (srcDesc.length != duDesc.length) return false;
-    if (srcDesc.length != dvDesc.length) return false;
-
-    OmpEvalStencils(src, srcDesc,
-                    dst, dstDesc,
-                    du,  duDesc,
-                    dv,  dvDesc,
-                    sizes, offsets, indices,
-                    weights, duWeights, dvWeights,
-                    start, end);
-
-    return true;
-}
-
-/* static */
-bool
-OmpEvaluator::EvalStencils(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    float *duu,       BufferDescriptor const &duuDesc,
-    float *duv,       BufferDescriptor const &duvDesc,
-    float *dvv,       BufferDescriptor const &dvvDesc,
-    const int * sizes,
-    const int * offsets,
-    const int * indices,
-    const float * weights,
-    const float * duWeights,
-    const float * dvWeights,
-    const float * duuWeights,
-    const float * duvWeights,
-    const float * dvvWeights,
-    int start, int end) {
-
-    if (end <= start) return true;
-    if (srcDesc.length != dstDesc.length) return false;
-    if (srcDesc.length != duDesc.length) return false;
-    if (srcDesc.length != dvDesc.length) return false;
-    if (srcDesc.length != duuDesc.length) return false;
-    if (srcDesc.length != duvDesc.length) return false;
-    if (srcDesc.length != dvvDesc.length) return false;
-
-    OmpEvalStencils(src, srcDesc,
-                    dst, dstDesc,
-                    du,  duDesc,
-                    dv,  dvDesc,
-                    duu, duuDesc,
-                    duv, duvDesc,
-                    dvv, dvvDesc,
-                    sizes, offsets, indices,
-                    weights, duWeights, dvWeights,
-                    duuWeights, duvWeights, dvvWeights,
-                    start, end);
-
-    return true;
-}
-
-template <typename T>
-struct BufferAdapter {
-    BufferAdapter(T *p, int length, int stride) :
-        _p(p), _length(length), _stride(stride) { }
-    void Clear() {
-        for (int i = 0; i < _length; ++i) _p[i] = 0;
-    }
-    void AddWithWeight(T const *src, float w) {
-        if (_p) {
-            // TODO: derivatives.
-            for (int i = 0; i < _length; ++i) {
-                _p[i] += src[i] * w;
-            }
-        }
-    }
-    const T *operator[] (int index) const {
-        return _p + _stride * index;
-    }
-    BufferAdapter<T> & operator ++() {
-        if (_p) {
-            _p += _stride;
-        }
-        return *this;
-    }
-
-    T *_p;
-    int _length;
-    int _stride;
-};
-
-/* static */
-bool
-OmpEvaluator::EvalPatches(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    int numPatchCoords,
-    const PatchCoord *patchCoords,
-    const PatchArray *patchArrays,
-    const int *patchIndexBuffer,
-    const PatchParam *patchParamBuffer){
-
-    src += srcDesc.offset;
-    if (dst) dst += dstDesc.offset;
-    else return false;
-    BufferAdapter<const float> srcT(src, srcDesc.length, srcDesc.stride);
-
-#pragma omp parallel for
-    for (int i = 0; i < numPatchCoords; ++i) {
-        BufferAdapter<float> dstT(dst + dstDesc.stride*i, dstDesc.length, dstDesc.stride);
-
-        float wP[20];
-        PatchCoord const &coord = patchCoords[i];
-        PatchArray const &array = patchArrays[coord.handle.arrayIndex];
-
-        Osd::PatchParam const & paramStruct =
-            patchParamBuffer[coord.handle.patchIndex];
-        OsdPatchParam param = OsdPatchParamInit(
-            paramStruct.field0, paramStruct.field1, paramStruct.sharpness);
-
-        int patchType = OsdPatchParamIsRegular(param)
-            ? array.GetPatchTypeRegular()
-            : array.GetPatchTypeIrregular();
-
-        int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                coord.s, coord.t, wP, 0, 0, 0, 0, 0);
-
-        int indexBase = array.GetIndexBase() + array.GetStride() *
-                (coord.handle.patchIndex - array.GetPrimitiveIdBase());
-
-        const int *cvs = &patchIndexBuffer[indexBase];
-
-        dstT.Clear();
-        for (int j = 0; j < nPoints; ++j) {
-            dstT.AddWithWeight(srcT[cvs[j]], wP[j]);
-        }
-    }
-    return true;
-}
-
-/* static */
-bool
-OmpEvaluator::EvalPatches(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    int numPatchCoords,
-    PatchCoord const *patchCoords,
-    PatchArray const *patchArrays,
-    const int *patchIndexBuffer,
-    PatchParam const *patchParamBuffer) {
-
-    src += srcDesc.offset;
-    if (dst) dst += dstDesc.offset;
-    if (du)  du += duDesc.offset;
-    if (dv)  dv += dvDesc.offset;
-
-    BufferAdapter<const float> srcT(src, srcDesc.length, srcDesc.stride);
-
-#pragma omp parallel for
-    for (int i = 0; i < numPatchCoords; ++i) {
-        float wP[20], wDu[20], wDv[20];
-        BufferAdapter<float> dstT(dst + dstDesc.stride*i, dstDesc.length, dstDesc.stride);
-        BufferAdapter<float> duT(du   + duDesc.stride*i, duDesc.length, duDesc.stride);
-        BufferAdapter<float> dvT(dv   + dvDesc.stride*i, dvDesc.length, dvDesc.stride);
-
-        PatchCoord const &coord = patchCoords[i];
-        PatchArray const &array = patchArrays[coord.handle.arrayIndex];
-
-        Osd::PatchParam const & paramStruct =
-            patchParamBuffer[coord.handle.patchIndex];
-        OsdPatchParam param = OsdPatchParamInit(
-            paramStruct.field0, paramStruct.field1, paramStruct.sharpness);
-
-        int patchType = OsdPatchParamIsRegular(param)
-            ? array.GetPatchTypeRegular()
-            : array.GetPatchTypeIrregular();
-
-        int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                coord.s, coord.t, wP, wDu, wDv, 0, 0, 0);
-
-        int indexBase = array.GetIndexBase() + array.GetStride() *
-                (coord.handle.patchIndex - array.GetPrimitiveIdBase());
-
-        const int *cvs = &patchIndexBuffer[indexBase];
-
-        dstT.Clear();
-        duT.Clear();
-        dvT.Clear();
-        for (int j = 0; j < nPoints; ++j) {
-            dstT.AddWithWeight(srcT[cvs[j]], wP[j]);
-            duT.AddWithWeight(srcT[cvs[j]], wDu[j]);
-            dvT.AddWithWeight(srcT[cvs[j]], wDv[j]);
-        }
-        ++dstT;
-        ++duT;
-        ++dvT;
-    }
-    return true;
-}
-
-/* static */
-bool
-OmpEvaluator::EvalPatches(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    float *duu,       BufferDescriptor const &duuDesc,
-    float *duv,       BufferDescriptor const &duvDesc,
-    float *dvv,       BufferDescriptor const &dvvDesc,
-    int numPatchCoords,
-    PatchCoord const *patchCoords,
-    PatchArray const *patchArrays,
-    const int *patchIndexBuffer,
-    PatchParam const *patchParamBuffer) {
-
-    src += srcDesc.offset;
-    if (dst) dst += dstDesc.offset;
-    if (du)  du += duDesc.offset;
-    if (dv)  dv += dvDesc.offset;
-    if (duu) duu += duuDesc.offset;
-    if (duv) duv += duvDesc.offset;
-    if (dvv) dvv += dvvDesc.offset;
-
-    BufferAdapter<const float> srcT(src, srcDesc.length, srcDesc.stride);
-
-#pragma omp parallel for
-    for (int i = 0; i < numPatchCoords; ++i) {
-        float wP[20], wDu[20], wDv[20], wDuu[20], wDuv[20], wDvv[20];
-        BufferAdapter<float> dstT(dst + dstDesc.stride*i, dstDesc.length, dstDesc.stride);
-        BufferAdapter<float> duT(du   + duDesc.stride*i, duDesc.length, duDesc.stride);
-        BufferAdapter<float> dvT(dv   + dvDesc.stride*i, dvDesc.length, dvDesc.stride);
-        BufferAdapter<float> duuT(duu + duuDesc.stride*i, duuDesc.length, duuDesc.stride);
-        BufferAdapter<float> duvT(duv + duvDesc.stride*i, duvDesc.length, duvDesc.stride);
-        BufferAdapter<float> dvvT(dvv + dvvDesc.stride*i, dvvDesc.length, dvvDesc.stride);
-
-        PatchCoord const &coord = patchCoords[i];
-        PatchArray const &array = patchArrays[coord.handle.arrayIndex];
-
-        Osd::PatchParam const & paramStruct =
-            patchParamBuffer[coord.handle.patchIndex];
-        OsdPatchParam param = OsdPatchParamInit(
-            paramStruct.field0, paramStruct.field1, paramStruct.sharpness);
-
-        int patchType = OsdPatchParamIsRegular(param)
-            ? array.GetPatchTypeRegular()
-            : array.GetPatchTypeIrregular();
-
-        int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                coord.s, coord.t, wP, wDu, wDv, wDuu, wDuv, wDvv);
-
-        int indexBase = array.GetIndexBase() + array.GetStride() *
-                (coord.handle.patchIndex - array.GetPrimitiveIdBase());
-
-        const int *cvs = &patchIndexBuffer[indexBase];
-
-        dstT.Clear();
-        duT.Clear();
-        dvT.Clear();
-        duuT.Clear();
-        duvT.Clear();
-        dvvT.Clear();
-        for (int j = 0; j < nPoints; ++j) {
-            dstT.AddWithWeight(srcT[cvs[j]], wP[j]);
-            duT.AddWithWeight(srcT[cvs[j]], wDu[j]);
-            dvT.AddWithWeight(srcT[cvs[j]], wDv[j]);
-            duuT.AddWithWeight(srcT[cvs[j]], wDuu[j]);
-            duvT.AddWithWeight(srcT[cvs[j]], wDuv[j]);
-            dvvT.AddWithWeight(srcT[cvs[j]], wDvv[j]);
-        }
-        ++dstT;
-        ++duT;
-        ++dvT;
-        ++duuT;
-        ++duvT;
-        ++dvvT;
-    }
-    return true;
-}
-
-
-/* static */
-void
-OmpEvaluator::Synchronize(void * /*deviceContext*/) {
-    // we use "omp parallel for" and it synchronizes by itself
-}
-
-/* static */
-void
-OmpEvaluator::SetNumThreads(int numThreads) {
-    omp_set_num_threads(numThreads);
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompEvaluator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompEvaluator.h
deleted file mode 100644
index b1d27d738..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompEvaluator.h
+++ /dev/null
@@ -1,1240 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_OMP_EVALUATOR_H
-#define OPENSUBDIV3_OSD_OMP_EVALUATOR_H
-
-#include "../version.h"
-#include "../osd/bufferDescriptor.h"
-#include "../osd/types.h"
-
-#include <cstddef>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class OmpEvaluator {
-public:
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Stencil evaluations with StencilTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic static eval stencils function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   Far::StencilTable or equivalent
-    ///
-    /// @param instance       not used in the omp kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the omp kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        const OmpEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        if (stencilTable->GetNumStencils() == 0)
-            return false;
-
-        return EvalStencils(srcBuffer->BindCpuBuffer(), srcDesc,
-                            dstBuffer->BindCpuBuffer(), dstDesc,
-                            &stencilTable->GetSizes()[0],
-                            &stencilTable->GetOffsets()[0],
-                            &stencilTable->GetControlIndices()[0],
-                            &stencilTable->GetWeights()[0],
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function which takes raw CPU pointers for
-    ///        input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        int start, int end);
-
-    /// \brief Generic static eval stencils function with derivatives.
-    ///        This function has a same signature as other device kernels
-    ///        have so that it can be called in the same way from OsdMesh
-    ///        template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   Far::StencilTable or equivalent
-    ///
-    /// @param instance       not used in the omp kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the omp kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        const OmpEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalStencils(srcBuffer->BindCpuBuffer(), srcDesc,
-                            dstBuffer->BindCpuBuffer(), dstDesc,
-                            duBuffer->BindCpuBuffer(),  duDesc,
-                            dvBuffer->BindCpuBuffer(),  dvDesc,
-                            &stencilTable->GetSizes()[0],
-                            &stencilTable->GetOffsets()[0],
-                            &stencilTable->GetControlIndices()[0],
-                            &stencilTable->GetWeights()[0],
-                            &stencilTable->GetDuWeights()[0],
-                            &stencilTable->GetDvWeights()[0],
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function with derivatives, which takes
-    ///        raw CPU pointers for input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param du             Output pointer derivative wrt u. An offset of
-    ///                       duDesc will be applied internally.
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv             Output pointer derivative wrt v. An offset of
-    ///                       dvDesc will be applied internally.
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param duWeights      pointer to the du-weights buffer of the stencil table
-    ///
-    /// @param dvWeights      pointer to the dv-weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        const float * duWeights,
-        const float * dvWeights,
-        int start, int end);
-
-    /// \brief Generic static eval stencils function with derivatives.
-    ///        This function has a same signature as other device kernels
-    ///        have so that it can be called in the same way from OsdMesh
-    ///        template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   Far::StencilTable or equivalent
-    ///
-    /// @param instance       not used in the omp kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the omp kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        const OmpEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalStencils(srcBuffer->BindCpuBuffer(), srcDesc,
-                            dstBuffer->BindCpuBuffer(), dstDesc,
-                            duBuffer->BindCpuBuffer(),  duDesc,
-                            dvBuffer->BindCpuBuffer(),  dvDesc,
-                            duuBuffer->BindCpuBuffer(), duuDesc,
-                            duvBuffer->BindCpuBuffer(), duvDesc,
-                            dvvBuffer->BindCpuBuffer(), dvvDesc,
-                            &stencilTable->GetSizes()[0],
-                            &stencilTable->GetOffsets()[0],
-                            &stencilTable->GetControlIndices()[0],
-                            &stencilTable->GetWeights()[0],
-                            &stencilTable->GetDuWeights()[0],
-                            &stencilTable->GetDvWeights()[0],
-                            &stencilTable->GetDuuWeights()[0],
-                            &stencilTable->GetDuvWeights()[0],
-                            &stencilTable->GetDvvWeights()[0],
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function with derivatives, which takes
-    ///        raw CPU pointers for input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param du             Output pointer derivative wrt u. An offset of
-    ///                       duDesc will be applied internally.
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv             Output pointer derivative wrt v. An offset of
-    ///                       dvDesc will be applied internally.
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duu            Output pointer 2nd derivative wrt u. An offset of
-    ///                       duuDesc will be applied internally.
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duv            Output pointer 2nd derivative wrt u and v. An offset of
-    ///                       duvDesc will be applied internally.
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvv            Output pointer 2nd derivative wrt v. An offset of
-    ///                       dvvDesc will be applied internally.
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param duWeights      pointer to the du-weights buffer of the stencil table
-    ///
-    /// @param dvWeights      pointer to the dv-weights buffer of the stencil table
-    ///
-    /// @param duuWeights     pointer to the duu-weights buffer of the stencil table
-    ///
-    /// @param duvWeights     pointer to the duv-weights buffer of the stencil table
-    ///
-    /// @param dvvWeights     pointer to the dvv-weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        float *duu,       BufferDescriptor const &duuDesc,
-        float *duv,       BufferDescriptor const &duvDesc,
-        float *dvv,       BufferDescriptor const &dvvDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        const float * duWeights,
-        const float * dvWeights,
-        const float * duuWeights,
-        const float * duvWeights,
-        const float * dvvWeights,
-        int start, int end);
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Limit evaluations with PatchTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the omp evaluator
-    ///
-    /// @param deviceContext    not used in the omp evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        OmpEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the omp evaluator
-    ///
-    /// @param deviceContext    not used in the omp evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        OmpEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        // XXX: PatchCoords is somewhat abusing vertex primvar buffer interop.
-        //      ideally all buffer classes should have templated by datatype
-        //      so that downcast isn't needed there.
-        //      (e.g. Osd::CpuBuffer<PatchCoord> )
-        //
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the omp evaluator
-    ///
-    /// @param deviceContext    not used in the omp evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        OmpEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        // XXX: PatchCoords is somewhat abusing vertex primvar buffer interop.
-        //      ideally all buffer classes should have templated by datatype
-        //      so that downcast isn't needed there.
-        //      (e.g. Osd::CpuBuffer<PatchCoord> )
-        //
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           duuBuffer->BindCpuBuffer(), duuDesc,
-                           duvBuffer->BindCpuBuffer(), duvDesc,
-                           dvvBuffer->BindCpuBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndexBuffer an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParamBuffer an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        const PatchCoord *patchCoords,
-        const PatchArray *patchArrays,
-        const int *patchIndexBuffer,
-        const PatchParam *patchParamBuffer);
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param du               Output pointer derivative wrt u. An offset of
-    ///                         duDesc will be applied internally.
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               Output pointer derivative wrt v. An offset of
-    ///                         dvDesc will be applied internally.
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndexBuffer an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParamBuffer an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PatchCoord const *patchCoords,
-        PatchArray const *patchArrays,
-        const int *patchIndexBuffer,
-        PatchParam const *patchParamBuffer);
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param du               Output pointer derivative wrt u. An offset of
-    ///                         duDesc will be applied internally.
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               Output pointer derivative wrt v. An offset of
-    ///                         dvDesc will be applied internally.
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duu              Output pointer 2nd derivative wrt u. An offset of
-    ///                         duuDesc will be applied internally.
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duv              Output pointer 2nd derivative wrt u and v. An offset of
-    ///                         duvDesc will be applied internally.
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvv              Output pointer 2nd derivative wrt v. An offset of
-    ///                         dvvDesc will be applied internally.
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndexBuffer an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParamBuffer an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        float *duu,       BufferDescriptor const &duuDesc,
-        float *duv,       BufferDescriptor const &duvDesc,
-        float *dvv,       BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PatchCoord const *patchCoords,
-        PatchArray const *patchArrays,
-        const int *patchIndexBuffer,
-        PatchParam const *patchParamBuffer);
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the omp evaluator
-    ///
-    /// @param deviceContext    not used in the omp evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        OmpEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the omp evaluator
-    ///
-    /// @param deviceContext    not used in the omp evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        OmpEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the omp evaluator
-    ///
-    /// @param deviceContext    not used in the omp evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        OmpEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           duuBuffer->BindCpuBuffer(), duuDesc,
-                           duvBuffer->BindCpuBuffer(), duvDesc,
-                           dvvBuffer->BindCpuBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the omp evaluator
-    ///
-    /// @param deviceContext    not used in the omp evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        OmpEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the omp evaluator
-    ///
-    /// @param deviceContext    not used in the omp evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        OmpEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the omp evaluator
-    ///
-    /// @param deviceContext    not used in the omp evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        OmpEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           duuBuffer->BindCpuBuffer(), duuDesc,
-                           duvBuffer->BindCpuBuffer(), duvDesc,
-                           dvvBuffer->BindCpuBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Other methods
-    ///
-    /// ----------------------------------------------------------------------
-
-    static void Synchronize(void *deviceContext = NULL);
-
-    static void SetNumThreads(int numThreads);
-};
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-
-#endif  // OPENSUBDIV3_OSD_OMP_EVALUATOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompKernel.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompKernel.cpp
deleted file mode 100644
index 3b4e9c0d1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompKernel.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/ompKernel.h"
-#include "../osd/bufferDescriptor.h"
-
-#include <cassert>
-#include <cstdlib>
-#include <omp.h>
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-template <class T> T *
-elementAtIndex(T * src, int index, BufferDescriptor const &desc) {
-
-    return src + index * desc.stride;
-}
-
-static inline void
-clear(float *dst, BufferDescriptor const &desc) {
-
-    assert(dst);
-    memset(dst, 0, desc.length*sizeof(float));
-}
-
-static inline void
-addWithWeight(float *dst, const float *src, int srcIndex, float weight,
-              BufferDescriptor const &desc) {
-
-    assert(src && dst);
-    src = elementAtIndex(src, srcIndex, desc);
-    for (int k = 0; k < desc.length; ++k) {
-        dst[k] += src[k] * weight;
-    }
-}
-
-static inline void
-copy(float *dst, int dstIndex, const float *src,
-     BufferDescriptor const &desc) {
-
-    assert(src && dst);
-
-    dst = elementAtIndex(dst, dstIndex, desc);
-    memcpy(dst, src, desc.length*sizeof(float));
-}
-
-
-// XXXX manuelk this should be optimized further by using SIMD - considering
-//              OMP is somewhat obsolete - this is probably not worth it.
-void
-OmpEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                int start, int end) {
-    start = (start > 0 ? start : 0);
-    
-    src += srcDesc.offset;
-    dst += dstDesc.offset;
-
-    int numThreads = omp_get_max_threads();
-    int n = end - start;
-
-    float * result = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-
-#pragma omp parallel for
-    for (int i = 0; i < n; ++i) {
-
-        int index = i + start; // Stencil index
-
-        // Get thread-local pointers
-        int const           * threadIndices = indices + offsets[index];
-        float const         * threadWeights = weights + offsets[index];
-
-        int threadId = omp_get_thread_num();
-
-        float * threadResult = result + threadId*srcDesc.length;
-
-        clear(threadResult, dstDesc);
-
-        for (int j=0; j<(int)sizes[index]; ++j) {
-            addWithWeight(threadResult, src,
-                threadIndices[j], threadWeights[j], srcDesc);
-        }
-
-        copy(dst, i, threadResult, dstDesc);
-    }
-}
-
-void
-OmpEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                int start, int end) {
-    start = (start > 0 ? start : 0);
-
-    src += srcDesc.offset;
-    dst += dstDesc.offset;
-    dstDu += dstDuDesc.offset;
-    dstDv += dstDvDesc.offset;
-
-    int numThreads = omp_get_max_threads();
-    int n = end - start;
-
-    float * result = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-    float * resultDu = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-    float * resultDv = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-
-#pragma omp parallel for
-    for (int i = 0; i < n; ++i) {
-
-        int index = i + start; // Stencil index
-
-        // Get thread-local pointers
-        int const           * threadIndices = indices + offsets[index];
-        float const         * threadWeights = weights + offsets[index];
-        float const         * threadWeightsDu = duWeights + offsets[index];
-        float const         * threadWeightsDv = dvWeights + offsets[index];
-
-        int threadId = omp_get_thread_num();
-
-        float * threadResult = result + threadId*srcDesc.length;
-        float * threadResultDu = resultDu + threadId*srcDesc.length;
-        float * threadResultDv = resultDv + threadId*srcDesc.length;
-
-        clear(threadResult, dstDesc);
-        clear(threadResultDu, dstDuDesc);
-        clear(threadResultDv, dstDvDesc);
-
-        for (int j=0; j<(int)sizes[index]; ++j) {
-            addWithWeight(threadResult, src,
-                threadIndices[j], threadWeights[j], srcDesc);
-            addWithWeight(threadResultDu, src,
-                threadIndices[j], threadWeightsDu[j], srcDesc);
-            addWithWeight(threadResultDv, src,
-                threadIndices[j], threadWeightsDv[j], srcDesc);
-        }
-
-        copy(dst, i, threadResult, dstDesc);
-        copy(dstDu, i, threadResultDu, dstDuDesc);
-        copy(dstDv, i, threadResultDv, dstDvDesc);
-    }
-
-}
-
-void
-OmpEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                float * dstDuu,    BufferDescriptor const &dstDuuDesc,
-                float * dstDuv,    BufferDescriptor const &dstDuvDesc,
-                float * dstDvv,    BufferDescriptor const &dstDvvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                float const * duuWeights,
-                float const * duvWeights,
-                float const * dvvWeights,
-                int start, int end) {
-    start = (start > 0 ? start : 0);
-
-    src += srcDesc.offset;
-    dst += dstDesc.offset;
-    dstDu += dstDuDesc.offset;
-    dstDv += dstDvDesc.offset;
-    dstDuu += dstDuuDesc.offset;
-    dstDuv += dstDuvDesc.offset;
-    dstDvv += dstDvvDesc.offset;
-
-    int numThreads = omp_get_max_threads();
-    int n = end - start;
-
-    float * result = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-    float * resultDu = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-    float * resultDv = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-    float * resultDuu = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-    float * resultDuv = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-    float * resultDvv = (float*)alloca(srcDesc.length * numThreads * sizeof(float));
-
-#pragma omp parallel for
-    for (int i = 0; i < n; ++i) {
-
-        int index = i + start; // Stencil index
-
-        // Get thread-local pointers
-        int const           * threadIndices = indices + offsets[index];
-        float const         * threadWeights = weights + offsets[index];
-        float const         * threadWeightsDu = duWeights + offsets[index];
-        float const         * threadWeightsDv = dvWeights + offsets[index];
-        float const         * threadWeightsDuu = duuWeights + offsets[index];
-        float const         * threadWeightsDuv = duvWeights + offsets[index];
-        float const         * threadWeightsDvv = dvvWeights + offsets[index];
-
-        int threadId = omp_get_thread_num();
-
-        float * threadResult = result + threadId*srcDesc.length;
-        float * threadResultDu = resultDu + threadId*srcDesc.length;
-        float * threadResultDv = resultDv + threadId*srcDesc.length;
-        float * threadResultDuu = resultDuu + threadId*srcDesc.length;
-        float * threadResultDuv = resultDuv + threadId*srcDesc.length;
-        float * threadResultDvv = resultDvv + threadId*srcDesc.length;
-
-        clear(threadResult, dstDesc);
-        clear(threadResultDu, dstDuDesc);
-        clear(threadResultDv, dstDvDesc);
-        clear(threadResultDuu, dstDuuDesc);
-        clear(threadResultDuv, dstDuvDesc);
-        clear(threadResultDvv, dstDvvDesc);
-
-        for (int j=0; j<(int)sizes[index]; ++j) {
-            addWithWeight(threadResult, src,
-                threadIndices[j], threadWeights[j], srcDesc);
-            addWithWeight(threadResultDu, src,
-                threadIndices[j], threadWeightsDu[j], srcDesc);
-            addWithWeight(threadResultDv, src,
-                threadIndices[j], threadWeightsDv[j], srcDesc);
-            addWithWeight(threadResultDuu, src,
-                threadIndices[j], threadWeightsDuu[j], srcDesc);
-            addWithWeight(threadResultDuv, src,
-                threadIndices[j], threadWeightsDuv[j], srcDesc);
-            addWithWeight(threadResultDvv, src,
-                threadIndices[j], threadWeightsDvv[j], srcDesc);
-        }
-
-        copy(dst, i, threadResult, dstDesc);
-        copy(dstDu, i, threadResultDu, dstDuDesc);
-        copy(dstDv, i, threadResultDv, dstDvDesc);
-        copy(dstDuu, i, threadResultDuu, dstDuuDesc);
-        copy(dstDuv, i, threadResultDuv, dstDuvDesc);
-        copy(dstDvv, i, threadResultDvv, dstDvvDesc);
-    }
-
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompKernel.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompKernel.h
deleted file mode 100644
index c31c7f5d1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/ompKernel.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_OMP_KERNEL_H
-#define OPENSUBDIV3_OSD_OMP_KERNEL_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-struct BufferDescriptor;
-
-void
-OmpEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                int start, int end);
-
-void
-OmpEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                int start, int end);
-
-void
-OmpEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                float * dstDuu,    BufferDescriptor const &dstDuuDesc,
-                float * dstDuv,    BufferDescriptor const &dstDuvDesc,
-                float * dstDvv,    BufferDescriptor const &dstDvvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                float const * duuWeights,
-                float const * duvWeights,
-                float const * dvvWeights,
-                int start, int end);
-
-} // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_OMP_KERNEL_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/opencl.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/opencl.h
deleted file mode 100644
index 61657e9b0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/opencl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-//   Copyright 2014 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_OPENCL_H
-#define OPENSUBDIV3_OSD_OPENCL_H
-
-#if defined(OPENSUBDIV_HAS_CLEW)
-#  include <clew.h>
-#else
-#  if defined(__APPLE__)
-#    include <OpenCL/opencl.h>
-#  else
-#    include <CL/opencl.h>
-#  endif
-#endif
-
-#endif  // OPENSUBDIV3_OSD_CL_UTIL_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/opengl.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/opengl.h
deleted file mode 100644
index 989177a69..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/opengl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_OPENGL_H
-#define OPENSUBDIV3_OSD_OPENGL_H
-
-#if defined(__APPLE__)
-    #include "TargetConditionals.h"
-    #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-        #include <OpenGLES/ES2/gl.h>
-    #else
-        #if defined(OSD_USES_GLEW)
-            #include <GL/glew.h>
-        #else
-            #include <OpenGL/gl3.h>
-        #endif
-    #endif
-#elif defined(ANDROID)
-    #include <GLES2/gl2.h>
-#else
-    #if defined(_WIN32)
-        #define WIN32_LEAN_AND_MEAN
-        #include <windows.h>
-    #endif
-    #if defined(OSD_USES_GLEW)
-        #include <GL/glew.h>
-    #else
-        #include <GL/gl.h>
-    #endif
-#endif
-
-#endif  // OPENSUBDIV3_OSD_OPENGL_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/patchBasisCommon.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/patchBasisCommon.h
deleted file mode 100644
index f123a9d86..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/patchBasisCommon.h
+++ /dev/null
@@ -1,1418 +0,0 @@
-//
-//   Copyright 2016-2018 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_PATCH_BASIS_COMMON_H
-#define OPENSUBDIV3_OSD_PATCH_BASIS_COMMON_H
-
-OSD_FUNCTION_STORAGE_CLASS
-// template <typename REAL>
-int
-Osd_EvalBasisLinear(OSD_REAL s, OSD_REAL t,
-        OSD_OUT_ARRAY(OSD_REAL, wP, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDs, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDt, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDss, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDst, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDtt, 4)) {
-
-    OSD_REAL sC = 1.0f - s;
-    OSD_REAL tC = 1.0f - t;
-
-    if (OSD_OPTIONAL(wP)) {
-        wP[0] = sC * tC;
-        wP[1] =  s * tC;
-        wP[2] =  s * t;
-        wP[3] = sC * t;
-    }
-
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        wDs[0] = -tC;
-        wDs[1] =  tC;
-        wDs[2] =   t;
-        wDs[3] =  -t;
-
-        wDt[0] = -sC;
-        wDt[1] =  -s;
-        wDt[2] =   s;
-        wDt[3] =  sC;
-
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            for(int i=0;i<4;i++) {
-                wDss[i] = 0.0f;
-                wDtt[i] = 0.0f;
-            }
-
-            wDst[0] =  1.0f;
-            wDst[1] = -1.0f;
-            wDst[2] =  1.0f;
-            wDst[3] = -1.0f;
-        }
-    }
-    return 4;
-}
-
-// namespace {
-    //
-    //  Cubic BSpline curve basis evaluation:
-    //
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_evalBSplineCurve(OSD_REAL t,
-        OSD_OUT_ARRAY(OSD_REAL, wP, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDP, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDP2, 4)) {
-
-        const OSD_REAL one6th = OSD_REAL_CAST(1.0f / 6.0f);
-
-        OSD_REAL t2 = t * t;
-        OSD_REAL t3 = t * t2;
-
-        wP[0] = one6th * (1.0f - 3.0f*(t -      t2) -      t3);
-        wP[1] = one6th * (4.0f           - 6.0f*t2  + 3.0f*t3);
-        wP[2] = one6th * (1.0f + 3.0f*(t +      t2  -      t3));
-        wP[3] = one6th * (                                 t3);
-
-        if (OSD_OPTIONAL(wDP)) {
-            wDP[0] = -0.5f*t2 +      t - 0.5f;
-            wDP[1] =  1.5f*t2 - 2.0f*t;
-            wDP[2] = -1.5f*t2 +      t + 0.5f;
-            wDP[3] =  0.5f*t2;
-        }
-        if (OSD_OPTIONAL(wDP2)) {
-            wDP2[0] = -       t + 1.0f;
-            wDP2[1] =  3.0f * t - 2.0f;
-            wDP2[2] = -3.0f * t + 1.0f;
-            wDP2[3] =         t;
-        }
-    }
-
-    //
-    //  Weight adjustments to account for phantom end points:
-    //
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_adjustBSplineBoundaryWeights(
-            int boundary,
-            OSD_INOUT_ARRAY(OSD_REAL, w, 16)) {
-
-        if ((boundary & 1) != 0) {
-            for (int i = 0; i < 4; ++i) {
-                w[i + 8] -= w[i + 0];
-                w[i + 4] += w[i + 0] * 2.0f;
-                w[i + 0]  = 0.0f;
-            }
-        }
-        if ((boundary & 2) != 0) {
-            for (int i = 0; i < 16; i += 4) {
-                w[i + 1] -= w[i + 3];
-                w[i + 2] += w[i + 3] * 2.0f;
-                w[i + 3]  = 0.0f;
-            }
-        }
-        if ((boundary & 4) != 0) {
-            for (int i = 0; i < 4; ++i) {
-                w[i +  4] -= w[i + 12];
-                w[i +  8] += w[i + 12] * 2.0f;
-                w[i + 12]  = 0.0f;
-            }
-        }
-        if ((boundary & 8) != 0) {
-            for (int i = 0; i < 16; i += 4) {
-                w[i + 2] -= w[i + 0];
-                w[i + 1] += w[i + 0] * 2.0f;
-                w[i + 0]  = 0.0f;
-            }
-        }
-    }
-
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_boundBasisBSpline(
-            int boundary,
-            OSD_INOUT_ARRAY(OSD_REAL, wP, 16),
-            OSD_INOUT_ARRAY(OSD_REAL, wDs, 16),
-            OSD_INOUT_ARRAY(OSD_REAL, wDt, 16),
-            OSD_INOUT_ARRAY(OSD_REAL, wDss, 16),
-            OSD_INOUT_ARRAY(OSD_REAL, wDst, 16),
-            OSD_INOUT_ARRAY(OSD_REAL, wDtt, 16)) {
-
-        if (OSD_OPTIONAL(wP)) {
-            Osd_adjustBSplineBoundaryWeights(boundary, wP);
-        }
-        if (OSD_OPTIONAL(wDs && wDt)) {
-            Osd_adjustBSplineBoundaryWeights(boundary, wDs);
-            Osd_adjustBSplineBoundaryWeights(boundary, wDt);
-
-            if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-                Osd_adjustBSplineBoundaryWeights(boundary, wDss);
-                Osd_adjustBSplineBoundaryWeights(boundary, wDst);
-                Osd_adjustBSplineBoundaryWeights(boundary, wDtt);
-            }
-        }
-    }
-
-// } // end namespace
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-Osd_EvalBasisBSpline(OSD_REAL s, OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 16)) {
-
-    OSD_REAL sWeights[4], tWeights[4], dsWeights[4], dtWeights[4], dssWeights[4], dttWeights[4];
-
-    Osd_evalBSplineCurve(s, sWeights, OSD_OPTIONAL_INIT(wDs, dsWeights), OSD_OPTIONAL_INIT(wDss, dssWeights));
-    Osd_evalBSplineCurve(t, tWeights, OSD_OPTIONAL_INIT(wDt, dtWeights), OSD_OPTIONAL_INIT(wDtt, dttWeights));
-
-    if (OSD_OPTIONAL(wP)) {
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wP[4*i+j] = sWeights[j] * tWeights[i];
-            }
-        }
-    }
-
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wDs[4*i+j] = dsWeights[j] * tWeights[i];
-                wDt[4*i+j] = sWeights[j] * dtWeights[i];
-            }
-        }
-
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            for (int i = 0; i < 4; ++i) {
-                for (int j = 0; j < 4; ++j) {
-                    wDss[4*i+j] = dssWeights[j] * tWeights[i];
-                    wDst[4*i+j] = dsWeights[j] * dtWeights[i];
-                    wDtt[4*i+j] = sWeights[j] * dttWeights[i];
-                }
-            }
-        }
-    }
-    return 16;
-}
-
-// namespace {
-    //
-    //  Cubic Bezier curve basis evaluation:
-    //
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_evalBezierCurve(
-        OSD_REAL t,
-        OSD_OUT_ARRAY(OSD_REAL, wP, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDP, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDP2, 4)) {
-
-        // The four uniform cubic Bezier basis functions (in terms of t and its
-        // complement tC) evaluated at t:
-        OSD_REAL t2 = t*t;
-        OSD_REAL tC = 1.0f - t;
-        OSD_REAL tC2 = tC * tC;
-
-        wP[0] = tC2 * tC;
-        wP[1] = tC2 * t * 3.0f;
-        wP[2] = t2 * tC * 3.0f;
-        wP[3] = t2 * t;
-
-        // Derivatives of the above four basis functions at t:
-        if (OSD_OPTIONAL(wDP)) {
-           wDP[0] = -3.0f * tC2;
-           wDP[1] =  9.0f * t2 - 12.0f * t + 3.0f;
-           wDP[2] = -9.0f * t2 +  6.0f * t;
-           wDP[3] =  3.0f * t2;
-        }
-
-        // Second derivatives of the basis functions at t:
-        if (OSD_OPTIONAL(wDP2)) {
-            wDP2[0] =   6.0f * tC;
-            wDP2[1] =  18.0f * t - 12.0f;
-            wDP2[2] = -18.0f * t +  6.0f;
-            wDP2[3] =   6.0f * t;
-        }
-    }
-// } // end namespace
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-Osd_EvalBasisBezier(OSD_REAL s, OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 16)) {
-
-    OSD_REAL sWeights[4], tWeights[4], dsWeights[4], dtWeights[4], dssWeights[4], dttWeights[4];
-
-    Osd_evalBezierCurve(s, OSD_OPTIONAL_INIT(wP, sWeights), OSD_OPTIONAL_INIT(wDs, dsWeights), OSD_OPTIONAL_INIT(wDss, dssWeights));
-    Osd_evalBezierCurve(t, OSD_OPTIONAL_INIT(wP, tWeights), OSD_OPTIONAL_INIT(wDt, dtWeights), OSD_OPTIONAL_INIT(wDtt, dttWeights));
-
-    if (OSD_OPTIONAL(wP)) {
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wP[4*i+j] = sWeights[j] * tWeights[i];
-            }
-        }
-    }
-
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wDs[4*i+j] = dsWeights[j] * tWeights[i];
-                wDt[4*i+j] = sWeights[j] * dtWeights[i];
-            }
-        }
-
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            for (int i = 0; i < 4; ++i) {
-                for (int j = 0; j < 4; ++j) {
-                    wDss[4*i+j] = dssWeights[j] * tWeights[i];
-                    wDst[4*i+j] = dsWeights[j] * dtWeights[i];
-                    wDtt[4*i+j] = sWeights[j] * dttWeights[i];
-                }
-            }
-        }
-    }
-    return 16;
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-Osd_EvalBasisGregory(OSD_REAL s, OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 20)) {
-
-    //  Indices of boundary and interior points and their corresponding Bezier points
-    //  (this can be reduced with more direct indexing and unrolling of loops):
-    //
-    OSD_DATA_STORAGE_CLASS const int boundaryGregory[12] = OSD_ARRAY_12(int, 0, 1, 7, 5, 2, 6, 16, 12, 15, 17, 11, 10 );
-    OSD_DATA_STORAGE_CLASS const int boundaryBezSCol[12] = OSD_ARRAY_12(int, 0, 1, 2, 3, 0, 3,  0,  3,  0,  1,  2,  3 );
-    OSD_DATA_STORAGE_CLASS const int boundaryBezTRow[12] = OSD_ARRAY_12(int, 0, 0, 0, 0, 1, 1,  2,  2,  3,  3,  3,  3 );
-
-    OSD_DATA_STORAGE_CLASS const int interiorGregory[8] = OSD_ARRAY_8(int, 3, 4,  8, 9,  13, 14,  18, 19 );
-    OSD_DATA_STORAGE_CLASS const int interiorBezSCol[8] = OSD_ARRAY_8(int, 1, 1,  2, 2,   2,  2,   1,  1 );
-    OSD_DATA_STORAGE_CLASS const int interiorBezTRow[8] = OSD_ARRAY_8(int, 1, 1,  1, 1,   2,  2,   2,  2 );
-
-    //
-    //  Bezier basis functions are denoted with B while the rational multipliers for the
-    //  interior points will be denoted G -- so we have B(s), B(t) and G(s,t):
-    //
-    //  Directional Bezier basis functions B at s and t:
-    OSD_REAL Bs[4], Bds[4], Bdss[4];
-    OSD_REAL Bt[4], Bdt[4], Bdtt[4];
-
-    Osd_evalBezierCurve(s, Bs, OSD_OPTIONAL_INIT(wDs, Bds), OSD_OPTIONAL_INIT(wDss, Bdss));
-    Osd_evalBezierCurve(t, Bt, OSD_OPTIONAL_INIT(wDt, Bdt), OSD_OPTIONAL_INIT(wDtt, Bdtt));
-
-    //  Rational multipliers G at s and t:
-    OSD_REAL sC = 1.0f - s;
-    OSD_REAL tC = 1.0f - t;
-
-    //  Use <= here to avoid compiler warnings -- the sums should always be non-negative:
-    OSD_REAL df0 = s  + t;   df0 = (df0 <= 0.0f) ? 1.0f : (1.0f / df0);
-    OSD_REAL df1 = sC + t;   df1 = (df1 <= 0.0f) ? 1.0f : (1.0f / df1);
-    OSD_REAL df2 = sC + tC;  df2 = (df2 <= 0.0f) ? 1.0f : (1.0f / df2);
-    OSD_REAL df3 = s  + tC;  df3 = (df3 <= 0.0f) ? 1.0f : (1.0f / df3);
-
-    //  Make sure the G[i] for pairs of interior points sum to 1 in all cases:
-    OSD_REAL G[8] = OSD_ARRAY_8(OSD_REAL,  s*df0, (1.0f -  s*df0),
-                                           t*df1, (1.0f -  t*df1),
-                                          sC*df2, (1.0f - sC*df2),
-                                          tC*df3, (1.0f - tC*df3) );
-
-    //  Combined weights for boundary and interior points:
-    for (int i = 0; i < 12; ++i) {
-        wP[boundaryGregory[i]] = Bs[boundaryBezSCol[i]] * Bt[boundaryBezTRow[i]];
-    }
-    for (int j = 0; j < 8; ++j) {
-        wP[interiorGregory[j]] = Bs[interiorBezSCol[j]] * Bt[interiorBezTRow[j]] * G[j];
-    }
-
-    //
-    //  For derivatives, the basis functions for the interior points are rational and ideally
-    //  require appropriate differentiation, i.e. product rule for the combination of B and G
-    //  and the quotient rule for the rational G itself.  As initially proposed by Loop et al
-    //  though, the approximation using the 16 Bezier points arising from the G(s,t) has
-    //  proved adequate (and is what the GPU shaders use) so we continue to use that here.
-    //
-    //  An implementation of the true derivatives is provided and conditionally compiled for
-    //  those that require it, e.g.:
-    //
-    //    dclyde's note: skipping half of the product rule like this does seem to change the
-    //    result a lot in my tests.  This is not a runtime bottleneck for cloth sims anyway
-    //    so I'm just using the accurate version.
-    //
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        bool find_second_partials = OSD_OPTIONAL(wDs && wDst && wDtt);
-
-        //  Combined weights for boundary points -- simple tensor products:
-        for (int i = 0; i < 12; ++i) {
-            int iDst = boundaryGregory[i];
-            int tRow = boundaryBezTRow[i];
-            int sCol = boundaryBezSCol[i];
-
-            wDs[iDst] = Bds[sCol] * Bt[tRow];
-            wDt[iDst] = Bdt[tRow] * Bs[sCol];
-
-            if (find_second_partials) {
-                wDss[iDst] = Bdss[sCol] * Bt[tRow];
-                wDst[iDst] = Bds[sCol] * Bdt[tRow];
-                wDtt[iDst] = Bs[sCol] * Bdtt[tRow];
-            }
-        }
-
-#ifndef OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES
-        //  Approximation to the true Gregory derivatives by differentiating the Bezier patch
-        //  unique to the given (s,t), i.e. having F = (g^+ * f^+) + (g^- * f^-) as its four
-        //  interior points:
-        //
-        //  Combined weights for interior points -- tensor products with G+ or G-:
-        for (int j = 0; j < 8; ++j) {
-            int iDst = interiorGregory[j];
-            int tRow = interiorBezTRow[j];
-            int sCol = interiorBezSCol[j];
-
-            wDs[iDst] = Bds[sCol] * Bt[tRow] * G[j];
-            wDt[iDst] = Bdt[tRow] * Bs[sCol] * G[j];
-
-            if (find_second_partials) {
-                wDss[iDst] = Bdss[sCol] * Bt[tRow] * G[j];
-                wDst[iDst] = Bds[sCol] * Bdt[tRow] * G[j];
-                wDtt[iDst] = Bs[sCol] * Bdtt[tRow] * G[j];
-            }
-        }
-#else
-        //  True Gregory derivatives using appropriate differentiation of composite functions:
-        //
-        //  Note that for G(s,t) = N(s,t) / D(s,t), all N' and D' are trivial constants (which
-        //  simplifies things for higher order derivatives).  And while each pair of functions
-        //  G (i.e. the G+ and G- corresponding to points f+ and f-) must sum to 1 to ensure
-        //  Bezier equivalence (when f+ = f-), the pairs of G' must similarly sum to 0.  So we
-        //  can potentially compute only one of the pair and negate the result for the other
-        //  (and with 4 or 8 computations involving these constants, this is all very SIMD
-        //  friendly...) but for now we treat all 8 independently for simplicity.
-        //
-        //float N[8] = OSD_ARRAY_8(float,    s,     t,      t,     sC,      sC,     tC,      tC,     s );
-        OSD_REAL D[8] = OSD_ARRAY_8(OSD_REAL,  df0,   df0,    df1,    df1,     df2,    df2,     df3,   df3 );
-
-        OSD_DATA_STORAGE_CLASS const OSD_REAL Nds[8] = OSD_ARRAY_8(OSD_REAL, 1.0f, 0.0f,  0.0f, -1.0f, -1.0f,  0.0f,  0.0f,  1.0f );
-        OSD_DATA_STORAGE_CLASS const OSD_REAL Ndt[8] = OSD_ARRAY_8(OSD_REAL, 0.0f, 1.0f,  1.0f,  0.0f,  0.0f, -1.0f, -1.0f,  0.0f );
-
-        OSD_DATA_STORAGE_CLASS const OSD_REAL Dds[8] = OSD_ARRAY_8(OSD_REAL, 1.0f, 1.0f, -1.0f, -1.0f, -1.0f, -1.0f,  1.0f,  1.0f );
-        OSD_DATA_STORAGE_CLASS const OSD_REAL Ddt[8] = OSD_ARRAY_8(OSD_REAL, 1.0f, 1.0f,  1.0f,  1.0f, -1.0f, -1.0f, -1.0f, -1.0f );
-        //  Combined weights for interior points -- (scaled) combinations of B, B', G and G':
-        for (int k = 0; k < 8; ++k) {
-            int iDst = interiorGregory[k];
-            int tRow = interiorBezTRow[k];
-            int sCol = interiorBezSCol[k];
-
-            //  Quotient rule for G' (re-expressed in terms of G to simplify (and D = 1/D)):
-            OSD_REAL Gds = (Nds[k] - Dds[k] * G[k]) * D[k];
-            OSD_REAL Gdt = (Ndt[k] - Ddt[k] * G[k]) * D[k];
-
-            //  Product rule combining B and B' with G and G':
-            wDs[iDst] = (Bds[sCol] * G[k] + Bs[sCol] * Gds) * Bt[tRow];
-            wDt[iDst] = (Bdt[tRow] * G[k] + Bt[tRow] * Gdt) * Bs[sCol];
-
-            if (find_second_partials) {
-                OSD_REAL Dsqr_inv = D[k]*D[k];
-
-                OSD_REAL Gdss = 2.0f * Dds[k] * Dsqr_inv * (G[k] * Dds[k] - Nds[k]);
-                OSD_REAL Gdst = Dsqr_inv * (2.0f * G[k] * Dds[k] * Ddt[k] - Nds[k] * Ddt[k] - Ndt[k] * Dds[k]);
-                OSD_REAL Gdtt = 2.0f * Ddt[k] * Dsqr_inv * (G[k] * Ddt[k] - Ndt[k]);
-
-                wDss[iDst] = (Bdss[sCol] * G[k] + 2.0f * Bds[sCol] * Gds + Bs[sCol] * Gdss) * Bt[tRow];
-                wDst[iDst] =  Bt[tRow] * (Bs[sCol] * Gdst + Bds[sCol] * Gdt) +
-                             Bdt[tRow] * (Bds[sCol] * G[k] + Bs[sCol] * Gds);
-                wDtt[iDst] = (Bdtt[tRow] * G[k] + 2.0f * Bdt[tRow] * Gdt + Bt[tRow] * Gdtt) * Bs[sCol];
-            }
-        }
-#endif
-    }
-    return 20;
-}
-
-
-OSD_FUNCTION_STORAGE_CLASS
-// template <typename REAL>
-int
-Osd_EvalBasisLinearTri(OSD_REAL s, OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 3),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 3),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 3),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 3),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 3),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 3)) {
-
-    if (OSD_OPTIONAL(wP)) {
-        wP[0] = 1.0f - s - t;
-        wP[1] = s;
-        wP[2] = t;
-    }
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        wDs[0] = -1.0f;
-        wDs[1] =  1.0f;
-        wDs[2] =  0.0f;
-
-        wDt[0] = -1.0f;
-        wDt[1] =  0.0f;
-        wDt[2] =  1.0f;
-
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            wDss[0] = wDss[1] = wDss[2] = 0.0f;
-            wDst[0] = wDst[1] = wDst[2] = 0.0f;
-            wDtt[0] = wDtt[1] = wDtt[2] = 0.0f;
-        }
-    }
-    return 3;
-}
-
-
-// namespace {
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_evalBivariateMonomialsQuartic(
-        OSD_REAL s, OSD_REAL t,
-        OSD_OUT_ARRAY(OSD_REAL, M, 15)) {
-
-        M[0] = 1.0;
-
-        M[1] = s;
-        M[2] = t;
-
-        M[3] = s * s;
-        M[4] = s * t;
-        M[5] = t * t;
-
-        M[6] = M[3] * s;
-        M[7] = M[4] * s;
-        M[8] = M[4] * t;
-        M[9] = M[5] * t;
-
-        M[10] = M[6] * s;
-        M[11] = M[7] * s;
-        M[12] = M[3] * M[5];
-        M[13] = M[8] * t;
-        M[14] = M[9] * t;
-    }
-
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_evalBoxSplineTriDerivWeights(
-        OSD_INOUT_ARRAY(OSD_REAL, /*stMonomials*/M, 15),
-        int ds, int dt,
-        OSD_OUT_ARRAY(OSD_REAL, w, 12)) {
-
-        // const OSD_REAL M[15] = stMonomials;
-
-        OSD_REAL S = 1.0f;
-
-        int totalOrder = ds + dt;
-        if (totalOrder == 0) {
-            S *= OSD_REAL_CAST(1.0 / 12.0);
-
-            w[0]  = S * (1 - 2*M[1] - 4*M[2]          + 6*M[4] + 6*M[5] + 2*M[6]          - 6*M[8] - 4*M[9] -   M[10] - 2*M[11] + 2*M[13] +   M[14]);
-            w[1]  = S * (1 + 2*M[1] - 2*M[2]          - 6*M[4]          - 4*M[6]          + 6*M[8] + 2*M[9] + 2*M[10] + 4*M[11] - 2*M[13] -   M[14]);
-            w[2]  = S * (                                                 2*M[6]                            -   M[10] - 2*M[11]                    );
-            w[3]  = S * (1 - 4*M[1] - 2*M[2] + 6*M[3] + 6*M[4]          - 4*M[6] - 6*M[7]          + 2*M[9] +   M[10] + 2*M[11] - 2*M[13] -   M[14]);
-            w[4]  = S * (6                   -12*M[3] -12*M[4] -12*M[5] + 8*M[6] +12*M[7] +12*M[8] + 8*M[9] -   M[10] - 2*M[11] - 2*M[13] -   M[14]);
-            w[5]  = S * (1 + 4*M[1] + 2*M[2] + 6*M[3] + 6*M[4]          - 4*M[6] - 6*M[7] -12*M[8] - 4*M[9] -   M[10] - 2*M[11] + 4*M[13] + 2*M[14]);
-            w[6]  = S * (                                                                                       M[10] + 2*M[11]                    );
-            w[7]  = S * (1 - 2*M[1] + 2*M[2]          - 6*M[4]          + 2*M[6] + 6*M[7]          - 4*M[9] -   M[10] - 2*M[11] + 4*M[13] + 2*M[14]);
-            w[8]  = S * (1 + 2*M[1] + 4*M[2]          + 6*M[4] + 6*M[5] - 4*M[6] -12*M[7] - 6*M[8] - 4*M[9] + 2*M[10] + 4*M[11] - 2*M[13] -   M[14]);
-            w[9]  = S * (                                                 2*M[6] + 6*M[7] + 6*M[8] + 2*M[9] -   M[10] - 2*M[11] - 2*M[13] -   M[14]);
-            w[10] = S * (                                                                            2*M[9]                     - 2*M[13] -   M[14]);
-            w[11] = S * (                                                                                                         2*M[13] +   M[14]);
-        } else if (totalOrder == 1) {
-            S *= OSD_REAL_CAST(1.0 / 6.0);
-
-            if (ds != 0) {
-                w[0]  = S * (-1          + 3*M[2] + 3*M[3]          - 3*M[5] - 2*M[6] - 3*M[7] +   M[9]);
-                w[1]  = S * ( 1          - 3*M[2] - 6*M[3]          + 3*M[5] + 4*M[6] + 6*M[7] -   M[9]);
-                w[2]  = S * (                       3*M[3]                   - 2*M[6] - 3*M[7]         );
-                w[3]  = S * (-2 + 6*M[1] + 3*M[2] - 6*M[3] - 6*M[4]          + 2*M[6] + 3*M[7] -   M[9]);
-                w[4]  = S * (   -12*M[1] - 6*M[2] +12*M[3] +12*M[4] + 6*M[5] - 2*M[6] - 3*M[7] -   M[9]);
-                w[5]  = S * ( 2 + 6*M[1] + 3*M[2] - 6*M[3] - 6*M[4] - 6*M[5] - 2*M[6] - 3*M[7] + 2*M[9]);
-                w[6]  = S * (                                                  2*M[6] + 3*M[7]         );
-                w[7]  = S * (-1          - 3*M[2] + 3*M[3] + 6*M[4]          - 2*M[6] - 3*M[7] + 2*M[9]);
-                w[8]  = S * ( 1          + 3*M[2] - 6*M[3] -12*M[4] - 3*M[5] + 4*M[6] + 6*M[7] -   M[9]);
-                w[9]  = S * (                       3*M[3] + 6*M[4] + 3*M[5] - 2*M[6] - 3*M[7] -   M[9]);
-                w[10] = S * (                                                                  -   M[9]);
-                w[11] = S * (                                                                      M[9]);
-            } else {
-                w[0]  = S * (-2 + 3*M[1] + 6*M[2]          - 6*M[4] - 6*M[5]  -   M[6] + 3*M[8] + 2*M[9]);
-                w[1]  = S * (-1 - 3*M[1]                   + 6*M[4] + 3*M[5]  + 2*M[6] - 3*M[8] - 2*M[9]);
-                w[2]  = S * (                                                 -   M[6]                  );
-                w[3]  = S * (-1 + 3*M[1]          - 3*M[3]          + 3*M[5]  +   M[6] - 3*M[8] - 2*M[9]);
-                w[4]  = S * (   - 6*M[1] -12*M[2] + 6*M[3] +12*M[4] +12*M[5]  -   M[6] - 3*M[8] - 2*M[9]);
-                w[5]  = S * ( 1 + 3*M[1]          - 3*M[3] -12*M[4] - 6*M[5]  -   M[6] + 6*M[8] + 4*M[9]);
-                w[6]  = S * (                                                 +   M[6]                  );
-                w[7]  = S * ( 1 - 3*M[1]          + 3*M[3]          - 6*M[5]  -   M[6] + 6*M[8] + 4*M[9]);
-                w[8]  = S * ( 2 + 3*M[1] + 6*M[2] - 6*M[3] - 6*M[4] - 6*M[5]  + 2*M[6] - 3*M[8] - 2*M[9]);
-                w[9]  = S * (                     + 3*M[3] + 6*M[4] + 3*M[5]  -   M[6] - 3*M[8] - 2*M[9]);
-                w[10] = S * (                                         3*M[5]           - 3*M[8] - 2*M[9]);
-                w[11] = S * (                                                            3*M[8] + 2*M[9]);
-            }
-        } else if (totalOrder == 2) {
-            if (ds == 2) {
-                w[0]  = S * (   +   M[1]          -   M[3] -   M[4]);
-                w[1]  = S * (   - 2*M[1]          + 2*M[3] + 2*M[4]);
-                w[2]  = S * (       M[1]          -   M[3] -   M[4]);
-                w[3]  = S * ( 1 - 2*M[1] -   M[2] +   M[3] +   M[4]);
-                w[4]  = S * (-2 + 4*M[1] + 2*M[2] -   M[3] -   M[4]);
-                w[5]  = S * ( 1 - 2*M[1] -   M[2] -   M[3] -   M[4]);
-                w[6]  = S * (                         M[3] +   M[4]);
-                w[7]  = S * (   +   M[1] +   M[2] -   M[3] -   M[4]);
-                w[8]  = S * (   - 2*M[1] - 2*M[2] + 2*M[3] + 2*M[4]);
-                w[9]  = S * (       M[1] +   M[2] -   M[3] -   M[4]);
-                w[10] =     0;
-                w[11] =     0;
-            } else if (dt == 2) {
-                w[0]  = S * ( 1 -   M[1] - 2*M[2] +   M[4] +   M[5]);
-                w[1]  = S * (   +   M[1] +   M[2] -   M[4] -   M[5]);
-                w[2]  =     0;
-                w[3]  = S * (            +   M[2] -   M[4] -   M[5]);
-                w[4]  = S * (-2 + 2*M[1] + 4*M[2] -   M[4] -   M[5]);
-                w[5]  = S * (   - 2*M[1] - 2*M[2] + 2*M[4] + 2*M[5]);
-                w[6]  =     0;
-                w[7]  = S * (            - 2*M[2] + 2*M[4] + 2*M[5]);
-                w[8]  = S * ( 1 -   M[1] - 2*M[2] -   M[4] -   M[5]);
-                w[9]  = S * (   +   M[1] +   M[2] -   M[4] -   M[5]);
-                w[10] = S * (                M[2] -   M[4] -   M[5]);
-                w[11] = S * (                         M[4] +   M[5]);
-            } else {
-                S *= OSD_REAL_CAST(1.0 / 2.0);
-
-                w[0]  = S * ( 1          - 2*M[2] -   M[3] +   M[5]);
-                w[1]  = S * (-1          + 2*M[2] + 2*M[3] -   M[5]);
-                w[2]  = S * (                     -   M[3]         );
-                w[3]  = S * ( 1 - 2*M[1]          +   M[3] -   M[5]);
-                w[4]  = S * (-2 + 4*M[1] + 4*M[2] -   M[3] -   M[5]);
-                w[5]  = S * ( 1 - 2*M[1] - 4*M[2] -   M[3] + 2*M[5]);
-                w[6]  = S * (                     +   M[3]         );
-                w[7]  = S * (-1 + 2*M[1]          -   M[3] + 2*M[5]);
-                w[8]  = S * ( 1 - 4*M[1] - 2*M[2] + 2*M[3] -   M[5]);
-                w[9]  = S * (   + 2*M[1] + 2*M[2] -   M[3] -   M[5]);
-                w[10] = S * (                              -   M[5]);
-                w[11] = S * (                                  M[5]);
-            }
-        } else {
-            // assert(totalOrder <= 2);
-        }
-    }
-
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_adjustBoxSplineTriBoundaryWeights(
-        int boundaryMask,
-        OSD_INOUT_ARRAY(OSD_REAL, weights, 12)) {
-
-        if (boundaryMask == 0) return;
-
-        //
-        //  Determine boundary edges and vertices from the lower 3 and upper
-        //  2 bits of the 5-bit mask:
-        //
-        int upperBits = (boundaryMask >> 3) & 0x3;
-        int lowerBits = boundaryMask & 7;
-
-        int eBits = lowerBits;
-        int vBits = 0;
-
-        if (upperBits == 1) {
-            //  Boundary vertices only:
-            vBits = eBits;
-            eBits = 0;
-        } else if (upperBits == 2) {
-            //  Opposite vertex bit is edge bit rotated one to the right:
-            vBits = ((eBits & 1) << 2) | (eBits >> 1);
-        }
-
-        bool edge0IsBoundary = (eBits & 1) != 0;
-        bool edge1IsBoundary = (eBits & 2) != 0;
-        bool edge2IsBoundary = (eBits & 4) != 0;
-
-        //
-        //  Adjust weights for the 4 boundary points and 3 interior points
-        //  to account for the 3 phantom points adjacent to each
-        //  boundary edge:
-        //
-        if (edge0IsBoundary) {
-            OSD_REAL w0 = weights[0];
-            if (edge2IsBoundary) {
-                //  P0 = B1 + (B1 - I1)
-                weights[4] += w0;
-                weights[4] += w0;
-                weights[8] -= w0;
-            } else {
-                //  P0 = B1 + (B0 - I0)
-                weights[4] += w0;
-                weights[3] += w0;
-                weights[7] -= w0;
-            }
-
-            //  P1 = B1 + (B2 - I1)
-            OSD_REAL w1 = weights[1];
-            weights[4] += w1;
-            weights[5] += w1;
-            weights[8] -= w1;
-
-            OSD_REAL w2 = weights[2];
-            if (edge1IsBoundary) {
-                //  P2 = B2 + (B2 - I1)
-                weights[5] += w2;
-                weights[5] += w2;
-                weights[8] -= w2;
-            } else {
-                //  P2 = B2 + (B3 - I2)
-                weights[5] += w2;
-                weights[6] += w2;
-                weights[9] -= w2;
-            }
-            //  Clear weights for the phantom points:
-            weights[0] = weights[1] = weights[2] = 0.0f;
-        }
-        if (edge1IsBoundary) {
-            OSD_REAL w0 = weights[6];
-            if (edge0IsBoundary) {
-                //  P0 = B1 + (B1 - I1)
-                weights[5] += w0;
-                weights[5] += w0;
-                weights[4] -= w0;
-            } else {
-                //  P0 = B1 + (B0 - I0)
-                weights[5] += w0;
-                weights[2] += w0;
-                weights[1] -= w0;
-            }
-
-            //  P1 = B1 + (B2 - I1)
-            OSD_REAL w1 = weights[9];
-            weights[5] += w1;
-            weights[8] += w1;
-            weights[4] -= w1;
-
-            OSD_REAL w2 = weights[11];
-            if (edge2IsBoundary) {
-                //  P2 = B2 + (B2 - I1)
-                weights[8] += w2;
-                weights[8] += w2;
-                weights[4] -= w2;
-            } else {
-                //  P2 = B2 + (B3 - I2)
-                weights[8]  += w2;
-                weights[10] += w2;
-                weights[7]  -= w2;
-            }
-            //  Clear weights for the phantom points:
-            weights[6] = weights[9] = weights[11] = 0.0f;
-        }
-        if (edge2IsBoundary) {
-            OSD_REAL w0 = weights[10];
-            if (edge1IsBoundary) {
-                //  P0 = B1 + (B1 - I1)
-                weights[8] += w0;
-                weights[8] += w0;
-                weights[5] -= w0;
-            } else {
-                //  P0 = B1 + (B0 - I0)
-                weights[8]  += w0;
-                weights[11] += w0;
-                weights[9]  -= w0;
-            }
-
-            //  P1 = B1 + (B2 - I1)
-            OSD_REAL w1 = weights[7];
-            weights[8] += w1;
-            weights[4] += w1;
-            weights[5] -= w1;
-
-            OSD_REAL w2 = weights[3];
-            if (edge0IsBoundary) {
-                //  P2 = B2 + (B2 - I1)
-                weights[4] += w2;
-                weights[4] += w2;
-                weights[5] -= w2;
-            } else {
-                //  P2 = B2 + (B3 - I2)
-                weights[4] += w2;
-                weights[0] += w2;
-                weights[1] -= w2;
-            }
-            //  Clear weights for the phantom points:
-            weights[10] = weights[7] = weights[3] = 0.0f;
-        }
-
-        //
-        //  Adjust weights for the 3 boundary points and the 2 interior
-        //  points to account for the 2 phantom points adjacent to
-        //  each boundary vertex:
-        //
-        if ((vBits & 1) != 0) {
-            //  P0 = B1 + (B0 - I0)
-            OSD_REAL w0 = weights[3];
-            weights[4] += w0;
-            weights[7] += w0;
-            weights[8] -= w0;
-
-            //  P1 = B1 + (B2 - I1)
-            OSD_REAL w1 = weights[0];
-            weights[4] += w1;
-            weights[1] += w1;
-            weights[5] -= w1;
-
-            //  Clear weights for the phantom points:
-            weights[3] = weights[0] = 0.0f;
-        }
-        if ((vBits & 2) != 0) {
-            //  P0 = B1 + (B0 - I0)
-            OSD_REAL w0 = weights[2];
-            weights[5] += w0;
-            weights[1] += w0;
-            weights[4] -= w0;
-
-            //  P1 = B1 + (B2 - I1)
-            OSD_REAL w1 = weights[6];
-            weights[5] += w1;
-            weights[9] += w1;
-            weights[8] -= w1;
-
-            //  Clear weights for the phantom points:
-            weights[2] = weights[6] = 0.0f;
-        }
-        if ((vBits & 4) != 0) {
-            //  P0 = B1 + (B0 - I0)
-            OSD_REAL w0 = weights[11];
-            weights[8] += w0;
-            weights[9] += w0;
-            weights[5] -= w0;
-
-            //  P1 = B1 + (B2 - I1)
-            OSD_REAL w1 = weights[10];
-            weights[8] += w1;
-            weights[7] += w1;
-            weights[4] -= w1;
-
-            //  Clear weights for the phantom points:
-            weights[11] = weights[10] = 0.0f;
-        }
-    }
-
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_boundBasisBoxSplineTri(
-            int boundary,
-            OSD_INOUT_ARRAY(OSD_REAL, wP, 12),
-            OSD_INOUT_ARRAY(OSD_REAL, wDs, 12),
-            OSD_INOUT_ARRAY(OSD_REAL, wDt, 12),
-            OSD_INOUT_ARRAY(OSD_REAL, wDss, 12),
-            OSD_INOUT_ARRAY(OSD_REAL, wDst, 12),
-            OSD_INOUT_ARRAY(OSD_REAL, wDtt, 12)) {
-
-        if (OSD_OPTIONAL(wP)) {
-            Osd_adjustBoxSplineTriBoundaryWeights(boundary, wP);
-        }
-        if (OSD_OPTIONAL(wDs && wDt)) {
-            Osd_adjustBoxSplineTriBoundaryWeights(boundary, wDs);
-            Osd_adjustBoxSplineTriBoundaryWeights(boundary, wDt);
-
-            if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-                Osd_adjustBoxSplineTriBoundaryWeights(boundary, wDss);
-                Osd_adjustBoxSplineTriBoundaryWeights(boundary, wDst);
-                Osd_adjustBoxSplineTriBoundaryWeights(boundary, wDtt);
-            }
-        }
-    }
-// }  // namespace
-
-OSD_FUNCTION_STORAGE_CLASS
-// template <typename REAL>
-int
-Osd_EvalBasisBoxSplineTri(OSD_REAL s, OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 12),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 12),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 12),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 12),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 12),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 12)) {
-
-    OSD_REAL stMonomials[15];
-    Osd_evalBivariateMonomialsQuartic(s, t, stMonomials);
-
-    if (OSD_OPTIONAL(wP)) {
-        Osd_evalBoxSplineTriDerivWeights(stMonomials, 0, 0, wP);
-    }
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        Osd_evalBoxSplineTriDerivWeights(stMonomials, 1, 0, wDs);
-        Osd_evalBoxSplineTriDerivWeights(stMonomials, 0, 1, wDt);
-
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            Osd_evalBoxSplineTriDerivWeights(stMonomials, 2, 0, wDss);
-            Osd_evalBoxSplineTriDerivWeights(stMonomials, 1, 1, wDst);
-            Osd_evalBoxSplineTriDerivWeights(stMonomials, 0, 2, wDtt);
-        }
-    }
-    return 12;
-}
-
-
-// namespace {
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_evalBezierTriDerivWeights(
-        OSD_REAL s, OSD_REAL t, int ds, int dt,
-        OSD_OUT_ARRAY(OSD_REAL, wB, 15)) {
-
-        OSD_REAL u  = s;
-        OSD_REAL v  = t;
-        OSD_REAL w  = 1 - u - v;
-
-        OSD_REAL uu = u * u;
-        OSD_REAL vv = v * v;
-        OSD_REAL ww = w * w;
-
-        OSD_REAL uv = u * v;
-        OSD_REAL vw = v * w;
-        OSD_REAL uw = u * w;
-
-        int totalOrder = ds + dt;
-        if (totalOrder == 0) {
-            wB[0]  =      ww * ww;
-            wB[1]  =  4 * uw * ww;
-            wB[2]  =  6 * uw * uw;
-            wB[3]  =  4 * uw * uu;
-            wB[4]  =      uu * uu;
-            wB[5]  =  4 * vw * ww;
-            wB[6]  = 12 * ww * uv;
-            wB[7]  = 12 * uu * vw;
-            wB[8]  =  4 * uv * uu;
-            wB[9]  =  6 * vw * vw;
-            wB[10] = 12 * vv * uw;
-            wB[11] =  6 * uv * uv;
-            wB[12] =  4 * vw * vv;
-            wB[13] =  4 * uv * vv;
-            wB[14] =      vv * vv;
-        } else if (totalOrder == 1) {
-            if (ds == 1) {
-                wB[0]  =  -4 * ww * w;
-                wB[1]  =   4 * ww * (w - 3 * u);
-                wB[2]  =  12 * uw * (w - u);
-                wB[3]  =   4 * uu * (3 * w - u);
-                wB[4]  =   4 * uu * u;
-                wB[5]  = -12 * vw * w;
-                wB[6]  =  12 * vw * (w - 2 * u);
-                wB[7]  =  12 * uv * (2 * w - u);
-                wB[8]  =  12 * uv * u;
-                wB[9]  = -12 * vv * w;
-                wB[10] =  12 * vv * (w - u);
-                wB[11] =  12 * vv * u;
-                wB[12] =  -4 * vv * v;
-                wB[13] =   4 * vv * v;
-                wB[14] =   0;
-            } else {
-                wB[0]  =  -4 * ww * w;
-                wB[1]  = -12 * ww * u;
-                wB[2]  = -12 * uu * w;
-                wB[3]  =  -4 * uu * u;
-                wB[4]  =   0;
-                wB[5]  =   4 * ww * (w - 3 * v);
-                wB[6]  =  12 * uw * (w - 2 * v);
-                wB[7]  =  12 * uu * (w - v);
-                wB[8]  =   4 * uu * u;
-                wB[9]  =  12 * vw * (w - v);
-                wB[10] =  12 * uv * (2 * w - v);
-                wB[11] =  12 * uv * u;;
-                wB[12] =   4 * vv * (3 * w - v);
-                wB[13] =  12 * vv * u;
-                wB[14] =   4 * vv * v;
-            }
-        } else if (totalOrder == 2) {
-            if (ds == 2) {
-                wB[0]  =  12 * ww;
-                wB[1]  =  24 * (uw - ww);
-                wB[2]  =  12 * (uu - 4 * uw + ww);
-                wB[3]  =  24 * (uw - uu);
-                wB[4]  =  12 * uu;
-                wB[5]  =  24 * vw;
-                wB[6]  =  24 * (uv - 2 * vw);
-                wB[7]  =  24 * (vw - 2 * uv);
-                wB[8]  =  24 * uv;
-                wB[9]  =  12 * vv;
-                wB[10] = -24 * vv;
-                wB[11] =  12 * vv;
-                wB[12] =   0;
-                wB[13] =   0;
-                wB[14] =   0;
-            } else if (dt == 2) {
-                wB[0]  =  12 * ww;
-                wB[1]  =  24 * uw;
-                wB[2]  =  12 * uu;
-                wB[3]  =   0;
-                wB[4]  =   0;
-                wB[5]  =  24 * (vw - ww);
-                wB[6]  =  24 * (uv - 2 * uw);
-                wB[7]  = -24 * uu;
-                wB[8]  =   0;
-                wB[9]  =  12 * (vv - 4 * vw + ww);
-                wB[10] =  24 * (uw - 2 * uv);
-                wB[11] =  12 * uu;
-                wB[12] =  24 * (vw - vv);
-                wB[13] =  24 * uv;
-                wB[14] =  12 * vv;
-            } else {
-                wB[0]  =  12 * ww;
-                wB[3]  = -12 * uu;
-                wB[13] =  12 * vv;
-                wB[11] =  24 * uv;
-                wB[1]  =  24 * uw - wB[0];
-                wB[2]  = -24 * uw - wB[3];
-                wB[5]  =  24 * vw - wB[0];
-                wB[6]  = -24 * vw + wB[11] - wB[1];
-                wB[8]  = - wB[3];
-                wB[7]  = -(wB[11] + wB[2]);
-                wB[9]  =   wB[13] - wB[5] - wB[0];
-                wB[10] = -(wB[9] + wB[11]);
-                wB[12] = - wB[13];
-                wB[4]  =   0;
-                wB[14] =   0;
-            }
-        } else {
-            // assert(totalOrder <= 2);
-        }
-    }
-// } // end namespace
-
-OSD_FUNCTION_STORAGE_CLASS
-// template <typename REAL>
-int
-Osd_EvalBasisBezierTri(OSD_REAL s, OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 15),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 15),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 15),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 15),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 15),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 15)) {
-
-    if (OSD_OPTIONAL(wP)) {
-        Osd_evalBezierTriDerivWeights(s, t, 0, 0, wP);
-    }
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        Osd_evalBezierTriDerivWeights(s, t, 1, 0, wDs);
-        Osd_evalBezierTriDerivWeights(s, t, 0, 1, wDt);
-
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            Osd_evalBezierTriDerivWeights(s, t, 2, 0, wDss);
-            Osd_evalBezierTriDerivWeights(s, t, 1, 1, wDst);
-            Osd_evalBezierTriDerivWeights(s, t, 0, 2, wDtt);
-        }
-    }
-    return 15;
-}
-
-
-// namespace {
-    //
-    //  Expanding a set of 15 Bezier basis functions for the 6 (3 pairs) of
-    //  rational weights for the 18 Gregory basis functions:
-    //
-    OSD_FUNCTION_STORAGE_CLASS
-    // template <typename REAL>
-    void
-    Osd_convertBezierWeightsToGregory(
-        OSD_INOUT_ARRAY(OSD_REAL, wB, 15),
-        OSD_INOUT_ARRAY(OSD_REAL, rG,  6),
-        OSD_OUT_ARRAY(OSD_REAL, wG, 18)) {
-
-        wG[0]  = wB[0];
-        wG[1]  = wB[1];
-        wG[2]  = wB[5];
-        wG[3]  = wB[6] * rG[0];
-        wG[4]  = wB[6] * rG[1];
-
-        wG[5]  = wB[4];
-        wG[6]  = wB[8];
-        wG[7]  = wB[3];
-        wG[8]  = wB[7] * rG[2];
-        wG[9]  = wB[7] * rG[3];
-
-        wG[10] = wB[14];
-        wG[11] = wB[12];
-        wG[12] = wB[13];
-        wG[13] = wB[10] * rG[4];
-        wG[14] = wB[10] * rG[5];
-
-        wG[15] = wB[2];
-        wG[16] = wB[11];
-        wG[17] = wB[9];
-    }
-// } // end namespace
-
-OSD_FUNCTION_STORAGE_CLASS
-// template <typename REAL>
-int
-Osd_EvalBasisGregoryTri(OSD_REAL s, OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 18),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 18),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 18),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 18),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 18),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 18)) {
-
-    //
-    //  Bezier basis functions are denoted with B while the rational multipliers for the
-    //  interior points will be denoted G -- so we have B(s,t) and G(s,t) (though we
-    //  switch to barycentric (u,v,w) briefly to compute G)
-    //
-    OSD_REAL BP[15], BDs[15], BDt[15], BDss[15], BDst[15], BDtt[15];
-
-    OSD_REAL G[6] = OSD_ARRAY_6(OSD_REAL, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f );
-    OSD_REAL u = s;
-    OSD_REAL v = t;
-    OSD_REAL w = 1 - u - v;
-
-    if ((u + v) > 0) {
-        G[0]  = u / (u + v);
-        G[1]  = v / (u + v);
-    }
-    if ((v + w) > 0) {
-        G[2] = v / (v + w);
-        G[3] = w / (v + w);
-    }
-    if ((w + u) > 0) {
-        G[4] = w / (w + u);
-        G[5] = u / (w + u);
-    }
-
-    //
-    //  Compute Bezier basis functions and convert, adjusting interior points:
-    //
-    if (OSD_OPTIONAL(wP)) {
-        Osd_evalBezierTriDerivWeights(s, t, 0, 0, BP);
-        Osd_convertBezierWeightsToGregory(BP, G, wP);
-    }
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        //  TBD -- ifdef OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES
-
-        Osd_evalBezierTriDerivWeights(s, t, 1, 0, BDs);
-        Osd_evalBezierTriDerivWeights(s, t, 0, 1, BDt);
-
-        Osd_convertBezierWeightsToGregory(BDs, G, wDs);
-        Osd_convertBezierWeightsToGregory(BDt, G, wDt);
-
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            Osd_evalBezierTriDerivWeights(s, t, 2, 0, BDss);
-            Osd_evalBezierTriDerivWeights(s, t, 1, 1, BDst);
-            Osd_evalBezierTriDerivWeights(s, t, 0, 2, BDtt);
-
-            Osd_convertBezierWeightsToGregory(BDss, G, wDss);
-            Osd_convertBezierWeightsToGregory(BDst, G, wDst);
-            Osd_convertBezierWeightsToGregory(BDtt, G, wDtt);
-        }
-    }
-    return 18;
-}
-
-// The following functions are low-level internal methods which
-// were exposed in earlier releases, but were never intended to
-// be part of the supported public API.
-
-//  Deprecated -- prefer use of OsdEvaluatePatchBasis() and
-//  OsdEvaluatePatchBasisNormalized() methods.
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdGetBezierWeights(
-    OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 4),
-    OSD_OUT_ARRAY(OSD_REAL, wDP, 4),
-    OSD_OUT_ARRAY(OSD_REAL, wDP2, 4)) {
-
-    Osd_evalBezierCurve(t, wP, wDP, wDP2);
-}
-
-//  Deprecated -- prefer use of OsdEvaluatePatchBasis() and
-//  OsdEvaluatePatchBasisNormalized() methods.
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdGetBSplineWeights(
-    OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 4),
-    OSD_OUT_ARRAY(OSD_REAL, wDP, 4),
-    OSD_OUT_ARRAY(OSD_REAL, wDP2, 4)) {
-
-    Osd_evalBSplineCurve(t, wP, wDP, wDP2);
-}
-
-//  Deprecated -- prefer use of OsdEvaluatePatchBasis() and
-//  OsdEvaluatePatchBasisNormalized() methods.
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdGetBoxSplineWeights(
-    float s, float t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 12)) {
-
-    OSD_REAL stMonomials[15];
-    Osd_evalBivariateMonomialsQuartic(s, t, stMonomials);
-
-    if (OSD_OPTIONAL(wP)) {
-        Osd_evalBoxSplineTriDerivWeights(stMonomials, 0, 0, wP);
-    }
-}
-
-//  Deprecated -- prefer use of OsdEvaluatePatchBasis() and
-//  OsdEvaluatePatchBasisNormalized() methods.
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdAdjustBoundaryWeights(
-        int boundary,
-        OSD_INOUT_ARRAY(OSD_REAL, sWeights, 4),
-        OSD_INOUT_ARRAY(OSD_REAL, tWeights, 4)) {
-
-    if ((boundary & 1) != 0) {
-        tWeights[2] -= tWeights[0];
-        tWeights[1] += tWeights[0] * 2.0f;
-        tWeights[0]  = 0.0f;
-    }
-    if ((boundary & 2) != 0) {
-        sWeights[1] -= sWeights[3];
-        sWeights[2] += sWeights[3] * 2.0f;
-        sWeights[3]  = 0.0f;
-    }
-    if ((boundary & 4) != 0) {
-        tWeights[1] -= tWeights[3];
-        tWeights[2] += tWeights[3] * 2.0f;
-        tWeights[3]  = 0.0f;
-    }
-    if ((boundary & 8) != 0) {
-        sWeights[2] -= sWeights[0];
-        sWeights[1] += sWeights[0] * 2.0f;
-        sWeights[0]  = 0.0f;
-    }
-}
-
-//  Deprecated -- prefer use of OsdEvaluatePatchBasis() and
-//  OsdEvaluatePatchBasisNormalized() methods.
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdComputeTensorProductPatchWeights(
-    float dScale, int boundary,
-    OSD_IN_ARRAY(float, sWeights, 4),
-    OSD_IN_ARRAY(float, tWeights, 4),
-    OSD_IN_ARRAY(float, dsWeights, 4),
-    OSD_IN_ARRAY(float, dtWeights, 4),
-    OSD_IN_ARRAY(float, dssWeights, 4),
-    OSD_IN_ARRAY(float, dttWeights, 4),
-    OSD_OUT_ARRAY(float, wP, 16),
-    OSD_OUT_ARRAY(float, wDs, 16),
-    OSD_OUT_ARRAY(float, wDt, 16),
-    OSD_OUT_ARRAY(float, wDss, 16),
-    OSD_OUT_ARRAY(float, wDst, 16),
-    OSD_OUT_ARRAY(float, wDtt, 16)) {
-
-    if (OSD_OPTIONAL(wP)) {
-        // Compute the tensor product weight of the (s,t) basis function
-        // corresponding to each control vertex:
-
-        OsdAdjustBoundaryWeights(boundary, sWeights, tWeights);
-
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wP[4*i+j] = sWeights[j] * tWeights[i];
-            }
-        }
-    }
-
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        // Compute the tensor product weight of the differentiated (s,t) basis
-        // function corresponding to each control vertex (scaled accordingly):
-
-        OsdAdjustBoundaryWeights(boundary, dsWeights, dtWeights);
-
-        for (int i = 0; i < 4; ++i) {
-            for (int j = 0; j < 4; ++j) {
-                wDs[4*i+j] = dsWeights[j] * tWeights[i] * dScale;
-                wDt[4*i+j] = sWeights[j] * dtWeights[i] * dScale;
-            }
-        }
-
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            // Compute the tensor product weight of appropriate differentiated
-            // (s,t) basis functions for each control vertex (scaled accordingly):
-            float d2Scale = dScale * dScale;
-
-            OsdAdjustBoundaryWeights(boundary, dssWeights, dttWeights);
-
-            for (int i = 0; i < 4; ++i) {
-                for (int j = 0; j < 4; ++j) {
-                    wDss[4*i+j] = dssWeights[j] * tWeights[i] * d2Scale;
-                    wDst[4*i+j] = dsWeights[j] * dtWeights[i] * d2Scale;
-                    wDtt[4*i+j] = sWeights[j] * dttWeights[i] * d2Scale;
-                }
-            }
-        }
-    }
-}
-
-//  Deprecated -- prefer use of OsdEvaluatePatchBasis() and
-//  OsdEvaluatePatchBasisNormalized() methods.
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdGetBilinearPatchWeights(
-        OSD_REAL s, OSD_REAL t, OSD_REAL d1Scale,
-        OSD_OUT_ARRAY(OSD_REAL, wP, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDs, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDt, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDss, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDst, 4),
-        OSD_OUT_ARRAY(OSD_REAL, wDtt, 4)) {
-
-    int nPoints = Osd_EvalBasisLinear(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        for (int i = 0; i < nPoints; ++i) {
-            wDs[i] *= d1Scale;
-            wDt[i] *= d1Scale;
-        }
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            OSD_REAL d2Scale = d1Scale * d1Scale;
-
-            for (int i = 0; i < nPoints; ++i) {
-                wDss[i] *= d2Scale;
-                wDst[i] *= d2Scale;
-                wDtt[i] *= d2Scale;
-            }
-        }
-    }
-}
-
-//  Deprecated -- prefer use of OsdEvaluatePatchBasis() and
-//  OsdEvaluatePatchBasisNormalized() methods.
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdGetBSplinePatchWeights(
-    OSD_REAL s, OSD_REAL t, OSD_REAL d1Scale, int boundary,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 16)) {
-
-    int nPoints = Osd_EvalBasisBSpline(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-    Osd_boundBasisBSpline(boundary, wP, wDs, wDt, wDss, wDst, wDtt);
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        for (int i = 0; i < nPoints; ++i) {
-            wDs[i] *= d1Scale;
-            wDt[i] *= d1Scale;
-        }
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            OSD_REAL d2Scale = d1Scale * d1Scale;
-
-            for (int i = 0; i < nPoints; ++i) {
-                wDss[i] *= d2Scale;
-                wDst[i] *= d2Scale;
-                wDtt[i] *= d2Scale;
-            }
-        }
-    }
-}
-
-//  Deprecated -- prefer use of OsdEvaluatePatchBasis() and
-//  OsdEvaluatePatchBasisNormalized() methods.
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdGetBezierPatchWeights(
-    OSD_REAL s, OSD_REAL t, OSD_REAL d1Scale,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 16),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 16)) {
-    int nPoints = Osd_EvalBasisBezier(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        for (int i = 0; i < nPoints; ++i) {
-            wDs[i] *= d1Scale;
-            wDt[i] *= d1Scale;
-        }
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            OSD_REAL d2Scale = d1Scale * d1Scale;
-
-            for (int i = 0; i < nPoints; ++i) {
-                wDss[i] *= d2Scale;
-                wDst[i] *= d2Scale;
-                wDtt[i] *= d2Scale;
-            }
-        }
-    }
-}
-
-//  Deprecated -- prefer use of OsdEvaluatePatchBasis() and
-//  OsdEvaluatePatchBasisNormalized() methods.
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdGetGregoryPatchWeights(
-    OSD_REAL s, OSD_REAL t, OSD_REAL d1Scale,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 20)) {
-    int nPoints = Osd_EvalBasisGregory(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        for (int i = 0; i < nPoints; ++i) {
-            wDs[i] *= d1Scale;
-            wDt[i] *= d1Scale;
-        }
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            OSD_REAL d2Scale = d1Scale * d1Scale;
-
-            for (int i = 0; i < nPoints; ++i) {
-                wDss[i] *= d2Scale;
-                wDst[i] *= d2Scale;
-                wDtt[i] *= d2Scale;
-            }
-        }
-    }
-}
-
-#endif /* OPENSUBDIV3_OSD_PATCH_BASIS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/patchBasisCommonEval.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/patchBasisCommonEval.h
deleted file mode 100644
index 5af5953a1..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/patchBasisCommonEval.h
+++ /dev/null
@@ -1,196 +0,0 @@
-//
-//   Copyright 2018 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_PATCH_BASIS_COMMON_EVAL_H
-#define OPENSUBDIV3_OSD_PATCH_BASIS_COMMON_EVAL_H
-
-OSD_FUNCTION_STORAGE_CLASS
-// template <typename REAL>
-int
-OsdEvaluatePatchBasisNormalized(
-    int patchType, OsdPatchParam param,
-    OSD_REAL s, OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 20)) {
-
-    int boundaryMask = OsdPatchParamGetBoundary(param);
-
-    int nPoints = 0;
-    if (patchType == OSD_PATCH_DESCRIPTOR_REGULAR) {
-#if OSD_ARRAY_ARG_BOUND_OPTIONAL
-        nPoints = Osd_EvalBasisBSpline(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-        if (boundaryMask != 0) {
-            Osd_boundBasisBSpline(
-                boundaryMask, wP, wDs, wDt, wDss, wDst, wDtt);
-        }
-#else
-        OSD_REAL wP16[16], wDs16[16], wDt16[16],
-                 wDss16[16], wDst16[16], wDtt16[16];
-        nPoints = Osd_EvalBasisBSpline(
-                s, t, wP16, wDs16, wDt16, wDss16, wDst16, wDtt16);
-        if (boundaryMask != 0) {
-            Osd_boundBasisBSpline(
-                boundaryMask, wP16, wDs16, wDt16, wDss16, wDst16, wDtt16);
-        }
-        for (int i=0; i<nPoints; ++i) {
-            wP[i] = wP16[i];
-            wDs[i] = wDs16[i]; wDt[i] = wDt16[i];
-            wDss[i] = wDss16[i]; wDst[i] = wDst16[i]; wDtt[i] = wDtt16[i];
-        }
-#endif
-    } else if (patchType == OSD_PATCH_DESCRIPTOR_LOOP) {
-#if OSD_ARRAY_ARG_BOUND_OPTIONAL
-        nPoints = Osd_EvalBasisBoxSplineTri(
-                s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-        if (boundaryMask != 0) {
-            Osd_boundBasisBoxSplineTri(
-                boundaryMask, wP, wDs, wDt, wDss, wDst, wDtt);
-        }
-#else
-        OSD_REAL wP12[12], wDs12[12], wDt12[12],
-                 wDss12[12], wDst12[12], wDtt12[12];
-        nPoints = Osd_EvalBasisBoxSplineTri(
-                s, t, wP12, wDs12, wDt12, wDss12, wDst12, wDtt12);
-        if (boundaryMask != 0) {
-            Osd_boundBasisBoxSplineTri(
-                boundaryMask, wP12, wDs12, wDt12, wDss12, wDst12, wDtt12);
-        }
-        for (int i=0; i<nPoints; ++i) {
-            wP[i] = wP12[i];
-            wDs[i] = wDs12[i]; wDt[i] = wDt12[i];
-            wDss[i] = wDss12[i]; wDst[i] = wDst12[i]; wDtt[i] = wDtt12[i];
-        }
-#endif
-    } else if (patchType == OSD_PATCH_DESCRIPTOR_GREGORY_BASIS) {
-        nPoints = Osd_EvalBasisGregory(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-    } else if (patchType == OSD_PATCH_DESCRIPTOR_GREGORY_TRIANGLE) {
-#if OSD_ARRAY_ARG_BOUND_OPTIONAL
-        nPoints = Osd_EvalBasisGregoryTri(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-#else
-        OSD_REAL wP18[18], wDs18[18], wDt18[18],
-                 wDss18[18], wDst18[18], wDtt18[18];
-        nPoints = Osd_EvalBasisGregoryTri(
-                s, t, wP18, wDs18, wDt18, wDss18, wDst18, wDtt18);
-        for (int i=0; i<nPoints; ++i) {
-            wP[i] = wP18[i];
-            wDs[i] = wDs18[i]; wDt[i] = wDt18[i];
-            wDss[i] = wDss18[i]; wDst[i] = wDst18[i]; wDtt[i] = wDtt18[i];
-        }
-#endif
-    } else if (patchType == OSD_PATCH_DESCRIPTOR_QUADS) {
-#if OSD_ARRAY_ARG_BOUND_OPTIONAL
-        nPoints = Osd_EvalBasisLinear(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-#else
-        OSD_REAL wP4[4], wDs4[4], wDt4[4],
-                 wDss4[4], wDst4[4], wDtt4[4];
-        nPoints = Osd_EvalBasisLinear(
-                s, t, wP4, wDs4, wDt4, wDss4, wDst4, wDtt4);
-        for (int i=0; i<nPoints; ++i) {
-            wP[i] = wP4[i];
-            wDs[i] = wDs4[i]; wDt[i] = wDt4[i];
-            wDss[i] = wDss4[i]; wDst[i] = wDst4[i]; wDtt[i] = wDtt4[i];
-        }
-#endif
-    } else if (patchType == OSD_PATCH_DESCRIPTOR_TRIANGLES) {
-#if OSD_ARRAY_ARG_BOUND_OPTIONAL
-        nPoints = Osd_EvalBasisLinearTri(s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-#else
-        OSD_REAL wP3[3], wDs3[3], wDt3[3],
-                 wDss3[3], wDst3[3], wDtt3[3];
-        nPoints = Osd_EvalBasisLinearTri(
-                s, t, wP3, wDs3, wDt3, wDss3, wDst3, wDtt3);
-        for (int i=0; i<nPoints; ++i) {
-            wP[i] = wP3[i];
-            wDs[i] = wDs3[i]; wDt[i] = wDt3[i];
-            wDss[i] = wDss3[i]; wDst[i] = wDst3[i]; wDtt[i] = wDtt3[i];
-        }
-#endif
-    } else {
-        // assert(0);
-    }
-    return nPoints;
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-// template <typename REAL>
-int
-OsdEvaluatePatchBasis(
-    int patchType, OsdPatchParam param,
-    OSD_REAL s, OSD_REAL t,
-    OSD_OUT_ARRAY(OSD_REAL, wP, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDs, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDt, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDss, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDst, 20),
-    OSD_OUT_ARRAY(OSD_REAL, wDtt, 20)) {
-
-    OSD_REAL derivSign = 1.0f;
-
-    if ((patchType == OSD_PATCH_DESCRIPTOR_LOOP) ||
-        (patchType == OSD_PATCH_DESCRIPTOR_GREGORY_TRIANGLE) ||
-        (patchType == OSD_PATCH_DESCRIPTOR_TRIANGLES)) {
-        OSD_REAL uv[2] = OSD_ARRAY_2(OSD_REAL, s, t);
-        OsdPatchParamNormalizeTriangle(param, uv);
-        s = uv[0];
-        t = uv[1];
-        if (OsdPatchParamIsTriangleRotated(param)) {
-            derivSign = -1.0f;
-        }
-    } else {
-        OSD_REAL uv[2] = OSD_ARRAY_2(OSD_REAL, s, t);
-        OsdPatchParamNormalize(param, uv);
-        s = uv[0];
-        t = uv[1];
-    }
-
-    int nPoints = OsdEvaluatePatchBasisNormalized(
-        patchType, param, s, t, wP, wDs, wDt, wDss, wDst, wDtt);
-
-    if (OSD_OPTIONAL(wDs && wDt)) {
-        OSD_REAL d1Scale =
-                derivSign * OSD_REAL_CAST(1 << OsdPatchParamGetDepth(param));
-
-        for (int i = 0; i < nPoints; ++i) {
-            wDs[i] *= d1Scale;
-            wDt[i] *= d1Scale;
-        }
-
-        if (OSD_OPTIONAL(wDss && wDst && wDtt)) {
-            OSD_REAL d2Scale = derivSign * d1Scale * d1Scale;
-
-            for (int i = 0; i < nPoints; ++i) {
-                wDss[i] *= d2Scale;
-                wDst[i] *= d2Scale;
-                wDtt[i] *= d2Scale;
-            }
-        }
-    }
-    return nPoints;
-}
-
-#endif /* OPENSUBDIV3_OSD_PATCH_BASIS_COMMON_EVAL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/patchBasisCommonTypes.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/patchBasisCommonTypes.h
deleted file mode 100644
index 594e6b111..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/patchBasisCommonTypes.h
+++ /dev/null
@@ -1,422 +0,0 @@
-//
-//   Copyright 2018 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_PATCH_BASIS_COMMON_TYPES_H
-#define OPENSUBDIV3_OSD_PATCH_BASIS_COMMON_TYPES_H
-
-#if defined(OSD_PATCH_BASIS_GLSL)
-
-    #define OSD_FUNCTION_STORAGE_CLASS
-    #define OSD_DATA_STORAGE_CLASS
-    #define OSD_REAL float
-    #define OSD_REAL_CAST float
-    #define OSD_OPTIONAL(a) true
-    #define OSD_OPTIONAL_INIT(a,b) b
-    #define OSD_ARRAY_ARG_BOUND_OPTIONAL 0
-    #define OSD_IN_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_OUT_ARRAY(elementType, identifier, arraySize) \
-            out elementType identifier[arraySize]
-    #define OSD_INOUT_ARRAY(elementType, identifier, arraySize) \
-            inout elementType identifier[arraySize]
-    #define OSD_ARRAY_2(elementType,a0,a1) \
-            elementType[](a0,a1)
-    #define OSD_ARRAY_3(elementType,a0,a1,a2) \
-            elementType[](a0,a1,a2)
-    #define OSD_ARRAY_4(elementType,a0,a1,a2,a3) \
-            elementType[](a0,a1,a2,a3)
-    #define OSD_ARRAY_6(elementType,a0,a1,a2,a3,a4,a5) \
-            elementType[](a0,a1,a2,a3,a4,a5)
-    #define OSD_ARRAY_8(elementType,a0,a1,a2,a3,a4,a5,a6,a7) \
-            elementType[](a0,a1,a2,a3,a4,a5,a6,a7)
-    #define OSD_ARRAY_9(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8) \
-            elementType[](a0,a1,a2,a3,a4,a5,a6,a7,a8)
-    #define OSD_ARRAY_12(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11) \
-            elementType[](a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11)
-
-#elif defined(OSD_PATCH_BASIS_HLSL)
-
-    #define OSD_FUNCTION_STORAGE_CLASS
-    #define OSD_DATA_STORAGE_CLASS
-    #define OSD_REAL float
-    #define OSD_REAL_CAST float
-    #define OSD_OPTIONAL(a) true
-    #define OSD_OPTIONAL_INIT(a,b) b
-    #define OSD_ARRAY_ARG_BOUND_OPTIONAL 0
-    #define OSD_IN_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_OUT_ARRAY(elementType, identifier, arraySize) \
-            out elementType identifier[arraySize]
-    #define OSD_INOUT_ARRAY(elementType, identifier, arraySize) \
-            inout elementType identifier[arraySize]
-    #define OSD_ARRAY_2(elementType,a0,a1) \
-            {a0,a1}
-    #define OSD_ARRAY_3(elementType,a0,a1,a2) \
-            {a0,a1,a2}
-    #define OSD_ARRAY_4(elementType,a0,a1,a2,a3) \
-            {a0,a1,a2,a3}
-    #define OSD_ARRAY_6(elementType,a0,a1,a2,a3,a4,a5) \
-            {a0,a1,a2,a3,a4,a5}
-    #define OSD_ARRAY_8(elementType,a0,a1,a2,a3,a4,a5,a6,a7) \
-            {a0,a1,a2,a3,a4,a5,a6,a7}
-    #define OSD_ARRAY_9(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8}
-    #define OSD_ARRAY_12(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11}
-
-#elif defined(OSD_PATCH_BASIS_CUDA)
-
-    #define OSD_FUNCTION_STORAGE_CLASS __device__
-    #define OSD_DATA_STORAGE_CLASS
-    #define OSD_REAL float
-    #define OSD_REAL_CAST float
-    #define OSD_OPTIONAL(a) true
-    #define OSD_OPTIONAL_INIT(a,b) b
-    #define OSD_ARRAY_ARG_BOUND_OPTIONAL 0
-    #define OSD_IN_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_OUT_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_INOUT_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_ARRAY_2(elementType,a0,a1) \
-            {a0,a1}
-    #define OSD_ARRAY_3(elementType,a0,a1,a2) \
-            {a0,a1,a2}
-    #define OSD_ARRAY_4(elementType,a0,a1,a2,a3) \
-            {a0,a1,a2,a3}
-    #define OSD_ARRAY_6(elementType,a0,a1,a2,a3,a4,a5) \
-            {a0,a1,a2,a3,a4,a5}
-    #define OSD_ARRAY_8(elementType,a0,a1,a2,a3,a4,a5,a6,a7) \
-            {a0,a1,a2,a3,a4,a5,a6,a7}
-    #define OSD_ARRAY_9(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8}
-    #define OSD_ARRAY_12(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11}
-
-#elif defined(OSD_PATCH_BASIS_OPENCL)
-
-    #define OSD_FUNCTION_STORAGE_CLASS static
-    #define OSD_DATA_STORAGE_CLASS
-    #define OSD_REAL float
-    #define OSD_REAL_CAST convert_float
-    #define OSD_OPTIONAL(a) true
-    #define OSD_OPTIONAL_INIT(a,b) b
-    #define OSD_ARRAY_ARG_BOUND_OPTIONAL 0
-    #define OSD_IN_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_OUT_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_INOUT_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_ARRAY_2(elementType,a0,a1) \
-            {a0,a1}
-    #define OSD_ARRAY_3(elementType,a0,a1,a2) \
-            {a0,a1,a2}
-    #define OSD_ARRAY_4(elementType,a0,a1,a2,a3) \
-            {a0,a1,a2,a3}
-    #define OSD_ARRAY_6(elementType,a0,a1,a2,a3,a4,a5) \
-            {a0,a1,a2,a3,a4,a5}
-    #define OSD_ARRAY_8(elementType,a0,a1,a2,a3,a4,a5,a6,a7) \
-            {a0,a1,a2,a3,a4,a5,a6,a7}
-    #define OSD_ARRAY_9(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8}
-    #define OSD_ARRAY_12(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11}
-
-#elif defined(OSD_PATCH_BASIS_METAL)
-
-    #define OSD_FUNCTION_STORAGE_CLASS
-    #define OSD_DATA_STORAGE_CLASS
-    #define OSD_REAL float
-    #define OSD_REAL_CAST float
-    #define OSD_OPTIONAL(a) true
-    #define OSD_OPTIONAL_INIT(a,b) b
-    #define OSD_ARRAY_ARG_BOUND_OPTIONAL 0
-    #define OSD_IN_ARRAY(elementType, identifier, arraySize) \
-            thread elementType* identifier
-    #define OSD_OUT_ARRAY(elementType, identifier, arraySize) \
-            thread elementType* identifier
-    #define OSD_INOUT_ARRAY(elementType, identifier, arraySize) \
-            thread elementType* identifier
-    #define OSD_ARRAY_2(elementType,a0,a1) \
-            {a0,a1}
-    #define OSD_ARRAY_3(elementType,a0,a1,a2) \
-            {a0,a1,a2}
-    #define OSD_ARRAY_4(elementType,a0,a1,a2,a3) \
-            {a0,a1,a2,a3}
-    #define OSD_ARRAY_6(elementType,a0,a1,a2,a3,a4,a5) \
-            {a0,a1,a2,a3,a4,a5}
-    #define OSD_ARRAY_8(elementType,a0,a1,a2,a3,a4,a5,a6,a7) \
-            {a0,a1,a2,a3,a4,a5,a6,a7}
-    #define OSD_ARRAY_9(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8}
-    #define OSD_ARRAY_12(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11}
-
-#else
-
-    #define OSD_FUNCTION_STORAGE_CLASS static inline
-    #define OSD_DATA_STORAGE_CLASS static
-    #define OSD_REAL float
-    #define OSD_REAL_CAST float
-    #define OSD_OPTIONAL(a) (a)
-    #define OSD_OPTIONAL_INIT(a,b) (a ? b : 0)
-    #define OSD_ARRAY_ARG_BOUND_OPTIONAL 1
-    #define OSD_IN_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_OUT_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_INOUT_ARRAY(elementType, identifier, arraySize) \
-            elementType identifier[arraySize]
-    #define OSD_ARRAY_2(elementType,a0,a1) \
-            {a0,a1}
-    #define OSD_ARRAY_3(elementType,a0,a1,a2) \
-            {a0,a1,a2}
-    #define OSD_ARRAY_4(elementType,a0,a1,a2,a3) \
-            {a0,a1,a2,a3}
-    #define OSD_ARRAY_6(elementType,a0,a1,a2,a3,a4,a5) \
-            {a0,a1,a2,a3,a4,a5}
-    #define OSD_ARRAY_8(elementType,a0,a1,a2,a3,a4,a5,a6,a7) \
-            {a0,a1,a2,a3,a4,a5,a6,a7}
-    #define OSD_ARRAY_9(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8}
-    #define OSD_ARRAY_12(elementType,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11) \
-            {a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11}
-
-#endif
-
-#if defined(OSD_PATCH_BASIS_OPENCL)
-// OpenCL binding uses typedef to provide the required "struct" type specifier.
-typedef struct OsdPatchParam OsdPatchParam;
-typedef struct OsdPatchArray OsdPatchArray;
-typedef struct OsdPatchCoord OsdPatchCoord;
-#endif
-
-// Osd reflection of Far::PatchDescriptor
-#define OSD_PATCH_DESCRIPTOR_QUADS            3
-#define OSD_PATCH_DESCRIPTOR_TRIANGLES        4
-#define OSD_PATCH_DESCRIPTOR_LOOP             5
-#define OSD_PATCH_DESCRIPTOR_REGULAR          6
-#define OSD_PATCH_DESCRIPTOR_GREGORY_BASIS    9
-#define OSD_PATCH_DESCRIPTOR_GREGORY_TRIANGLE 10
-
-// Osd reflection of Osd::PatchCoord
-struct OsdPatchCoord {
-   int arrayIndex;
-   int patchIndex;
-   int vertIndex;
-   float s;
-   float t;
-};
-
-OSD_FUNCTION_STORAGE_CLASS
-OsdPatchCoord
-OsdPatchCoordInit(
-    int arrayIndex, int patchIndex, int vertIndex, float s, float t)
-{
-    OsdPatchCoord coord;
-    coord.arrayIndex = arrayIndex;
-    coord.patchIndex = patchIndex;
-    coord.vertIndex = vertIndex;
-    coord.s = s;
-    coord.t = t;
-    return coord;
-}
-
-// Osd reflection of Osd::PatchArray
-struct OsdPatchArray {
-    int regDesc;
-    int desc;
-    int numPatches;
-    int indexBase;
-    int stride;
-    int primitiveIdBase;
-};
-
-OSD_FUNCTION_STORAGE_CLASS
-OsdPatchArray
-OsdPatchArrayInit(
-    int regDesc, int desc,
-    int numPatches, int indexBase, int stride, int primitiveIdBase)
-{
-    OsdPatchArray array;
-    array.regDesc = regDesc;
-    array.desc = desc;
-    array.numPatches = numPatches;
-    array.indexBase = indexBase;
-    array.stride = stride;
-    array.primitiveIdBase = primitiveIdBase;
-    return array;
-}
-
-// Osd reflection of Osd::PatchParam
-struct OsdPatchParam {
-    int field0;
-    int field1;
-    float sharpness;
-};
-
-OSD_FUNCTION_STORAGE_CLASS
-OsdPatchParam
-OsdPatchParamInit(int field0, int field1, float sharpness)
-{
-    OsdPatchParam param;
-    param.field0 = field0;
-    param.field1 = field1;
-    param.sharpness = sharpness;
-    return param;
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-OsdPatchParamGetFaceId(OsdPatchParam param)
-{
-    return (param.field0 & 0xfffffff);
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-OsdPatchParamGetU(OsdPatchParam param)
-{
-    return ((param.field1 >> 22) & 0x3ff);
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-OsdPatchParamGetV(OsdPatchParam param)
-{
-    return ((param.field1 >> 12) & 0x3ff);
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-OsdPatchParamGetTransition(OsdPatchParam param)
-{
-    return ((param.field0 >> 28) & 0xf);
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-OsdPatchParamGetBoundary(OsdPatchParam param)
-{
-    return ((param.field1 >> 7) & 0x1f);
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-OsdPatchParamGetNonQuadRoot(OsdPatchParam param)
-{
-    return ((param.field1 >> 4) & 0x1);
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-int
-OsdPatchParamGetDepth(OsdPatchParam param)
-{
-    return (param.field1 & 0xf);
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-OSD_REAL
-OsdPatchParamGetParamFraction(OsdPatchParam param)
-{
-    return 1.0f / OSD_REAL_CAST(1 <<
-        (OsdPatchParamGetDepth(param) - OsdPatchParamGetNonQuadRoot(param)));
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-bool
-OsdPatchParamIsRegular(OsdPatchParam param)
-{
-    return (((param.field1 >> 5) & 0x1) != 0);
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-bool
-OsdPatchParamIsTriangleRotated(OsdPatchParam param)
-{
-    return ((OsdPatchParamGetU(param) + OsdPatchParamGetV(param)) >=
-            (1 << OsdPatchParamGetDepth(param)));
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdPatchParamNormalize(
-        OsdPatchParam param,
-        OSD_INOUT_ARRAY(OSD_REAL, uv, 2))
-{
-    OSD_REAL fracInv = 1.0f / OsdPatchParamGetParamFraction(param);
-
-    uv[0] = uv[0] * fracInv - OSD_REAL_CAST(OsdPatchParamGetU(param));
-    uv[1] = uv[1] * fracInv - OSD_REAL_CAST(OsdPatchParamGetV(param));
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdPatchParamUnnormalize(
-        OsdPatchParam param,
-        OSD_INOUT_ARRAY(OSD_REAL, uv, 2))
-{
-    OSD_REAL frac = OsdPatchParamGetParamFraction(param);
-
-    uv[0] = (uv[0] + OSD_REAL_CAST(OsdPatchParamGetU(param))) * frac;
-    uv[1] = (uv[1] + OSD_REAL_CAST(OsdPatchParamGetV(param))) * frac;
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdPatchParamNormalizeTriangle(
-        OsdPatchParam param,
-        OSD_INOUT_ARRAY(OSD_REAL, uv, 2))
-{
-    if (OsdPatchParamIsTriangleRotated(param)) {
-        OSD_REAL fracInv = 1.0f / OsdPatchParamGetParamFraction(param);
-
-        int depthFactor = 1 << OsdPatchParamGetDepth(param);
-        uv[0] = OSD_REAL_CAST(depthFactor - OsdPatchParamGetU(param)) - (uv[0] * fracInv);
-        uv[1] = OSD_REAL_CAST(depthFactor - OsdPatchParamGetV(param)) - (uv[1] * fracInv);
-    } else {
-        OsdPatchParamNormalize(param, uv);
-    }
-}
-
-OSD_FUNCTION_STORAGE_CLASS
-void
-OsdPatchParamUnnormalizeTriangle(
-        OsdPatchParam param,
-        OSD_INOUT_ARRAY(OSD_REAL, uv, 2))
-{
-    if (OsdPatchParamIsTriangleRotated(param)) {
-        OSD_REAL frac = OsdPatchParamGetParamFraction(param);
-
-        int depthFactor = 1 << OsdPatchParamGetDepth(param);
-        uv[0] = (OSD_REAL_CAST(depthFactor - OsdPatchParamGetU(param)) - uv[0]) * frac;
-        uv[1] = (OSD_REAL_CAST(depthFactor - OsdPatchParamGetV(param)) - uv[1]) * frac;
-    } else {
-        OsdPatchParamUnnormalize(param, uv);
-    }
-}
-
-#endif /* OPENSUBDIV3_OSD_PATCH_BASIS_COMMON_TYPES_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbEvaluator.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbEvaluator.cpp
deleted file mode 100644
index c98db9f6d..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbEvaluator.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/tbbEvaluator.h"
-#include "../osd/tbbKernel.h"
-
-#include <tbb/task_scheduler_init.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-/* static */
-bool
-TbbEvaluator::EvalStencils(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    const int * sizes,
-    const int * offsets,
-    const int * indices,
-    const float * weights,
-    int start, int end) {
-
-    if (end <= start) return true;
-
-    TbbEvalStencils(src, srcDesc, dst, dstDesc,
-                    sizes, offsets, indices, weights, start, end);
-
-    return true;
-}
-
-/* static */
-bool
-TbbEvaluator::EvalStencils(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    const int * sizes,
-    const int * offsets,
-    const int * indices,
-    const float * weights,
-    const float * duWeights,
-    const float * dvWeights,
-    int start, int end) {
-
-    if (end <= start) return true;
-    if (srcDesc.length != dstDesc.length) return false;
-    if (srcDesc.length != duDesc.length) return false;
-    if (srcDesc.length != dvDesc.length) return false;
-
-    TbbEvalStencils(src, srcDesc,
-                    dst, dstDesc,
-                    du,  duDesc,
-                    dv,  dvDesc,
-                    NULL, BufferDescriptor(),
-                    NULL, BufferDescriptor(),
-                    NULL, BufferDescriptor(),
-                    sizes, offsets, indices,
-                    weights, duWeights, dvWeights, NULL, NULL, NULL,
-                    start, end);
-
-    return true;
-}
-
-/* static */
-bool
-TbbEvaluator::EvalStencils(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    float *duu,       BufferDescriptor const &duuDesc,
-    float *duv,       BufferDescriptor const &duvDesc,
-    float *dvv,       BufferDescriptor const &dvvDesc,
-    const int * sizes,
-    const int * offsets,
-    const int * indices,
-    const float * weights,
-    const float * duWeights,
-    const float * dvWeights,
-    const float * duuWeights,
-    const float * duvWeights,
-    const float * dvvWeights,
-    int start, int end) {
-
-    if (end <= start) return true;
-    if (srcDesc.length != dstDesc.length) return false;
-    if (srcDesc.length != duDesc.length) return false;
-    if (srcDesc.length != dvDesc.length) return false;
-    if (srcDesc.length != duuDesc.length) return false;
-    if (srcDesc.length != duvDesc.length) return false;
-    if (srcDesc.length != dvvDesc.length) return false;
-
-    TbbEvalStencils(src, srcDesc,
-                    dst, dstDesc,
-                    du,  duDesc,
-                    dv,  dvDesc,
-                    duu, duuDesc,
-                    duv, duvDesc,
-                    dvv, dvvDesc,
-                    sizes, offsets, indices,
-                    weights, duWeights, dvWeights,
-                    duuWeights, duvWeights, dvvWeights,
-                    start, end);
-
-    return true;
-}
-
-/* static */
-bool
-TbbEvaluator::EvalPatches(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    int numPatchCoords,
-    const PatchCoord *patchCoords,
-    const PatchArray *patchArrayBuffer,
-    const int *patchIndexBuffer,
-    const PatchParam *patchParamBuffer) {
-
-    if (srcDesc.length != dstDesc.length) return false;
-
-    TbbEvalPatches(src, srcDesc, dst, dstDesc,
-                   NULL, BufferDescriptor(),
-                   NULL, BufferDescriptor(),
-                   NULL, BufferDescriptor(),
-                   NULL, BufferDescriptor(),
-                   NULL, BufferDescriptor(),
-                   numPatchCoords, patchCoords,
-                   patchArrayBuffer, patchIndexBuffer, patchParamBuffer);
-
-    return true;
-}
-
-/* static */
-bool
-TbbEvaluator::EvalPatches(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    int numPatchCoords,
-    const PatchCoord *patchCoords,
-    const PatchArray *patchArrayBuffer,
-    const int *patchIndexBuffer,
-    const PatchParam *patchParamBuffer) {
-
-    if (srcDesc.length != dstDesc.length) return false;
-
-    TbbEvalPatches(src, srcDesc, dst, dstDesc,
-                   du,  duDesc,  dv,  dvDesc,
-                   NULL, BufferDescriptor(),
-                   NULL, BufferDescriptor(),
-                   NULL, BufferDescriptor(),
-                   numPatchCoords, patchCoords,
-                   patchArrayBuffer, patchIndexBuffer, patchParamBuffer);
-
-    return true;
-}
-
-/* static */
-bool
-TbbEvaluator::EvalPatches(
-    const float *src, BufferDescriptor const &srcDesc,
-    float *dst,       BufferDescriptor const &dstDesc,
-    float *du,        BufferDescriptor const &duDesc,
-    float *dv,        BufferDescriptor const &dvDesc,
-    float *duu,       BufferDescriptor const &duuDesc,
-    float *duv,       BufferDescriptor const &duvDesc,
-    float *dvv,       BufferDescriptor const &dvvDesc,
-    int numPatchCoords,
-    const PatchCoord *patchCoords,
-    const PatchArray *patchArrayBuffer,
-    const int *patchIndexBuffer,
-    const PatchParam *patchParamBuffer) {
-
-    if (srcDesc.length != dstDesc.length) return false;
-
-    TbbEvalPatches(src, srcDesc, dst, dstDesc,
-                   du,  duDesc,  dv,  dvDesc,
-                   duu, duuDesc, duv, duvDesc, dvv, dvvDesc,
-                   numPatchCoords, patchCoords,
-                   patchArrayBuffer, patchIndexBuffer, patchParamBuffer);
-
-    return true;
-}
-
-/* static */
-void
-TbbEvaluator::Synchronize(void *) {
-}
-
-/* static */
-void
-TbbEvaluator::SetNumThreads(int numThreads) {
-    if (numThreads == -1) {
-        tbb::task_scheduler_init init;
-    } else {
-        tbb::task_scheduler_init init(numThreads);
-    }
-}
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbEvaluator.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbEvaluator.h
deleted file mode 100644
index 6bd365bc5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbEvaluator.h
+++ /dev/null
@@ -1,1246 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_TBB_EVALUATOR_H
-#define OPENSUBDIV3_OSD_TBB_EVALUATOR_H
-
-#include "../version.h"
-#include "../osd/bufferDescriptor.h"
-#include "../osd/types.h"
-
-#include <cstddef>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-class TbbEvaluator {
-public:
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Stencil evaluations with StencilTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic static eval stencils function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way from OsdMesh template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param stencilTable   Far::StencilTable or equivalent
-    ///
-    /// @param instance       not used in the tbb kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the tbb kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        STENCIL_TABLE const *stencilTable,
-        TbbEvaluator const *instance = NULL,
-        void *deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        if (stencilTable->GetNumStencils() == 0)
-            return false;
-
-        return EvalStencils(srcBuffer->BindCpuBuffer(), srcDesc,
-                            dstBuffer->BindCpuBuffer(), dstDesc,
-                            &stencilTable->GetSizes()[0],
-                            &stencilTable->GetOffsets()[0],
-                            &stencilTable->GetControlIndices()[0],
-                            &stencilTable->GetWeights()[0],
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function which takes raw CPU pointers for
-    ///        input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        int start, int end);
-
-    /// \brief Generic static eval stencils function with derivatives.
-    ///        This function has a same signature as other device kernels
-    ///        have so that it can be called in the same way from OsdMesh
-    ///        template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param stencilTable   Far::StencilTable or equivalent
-    ///
-    /// @param instance       not used in the tbb kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the tbb kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        STENCIL_TABLE const *stencilTable,
-        const TbbEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalStencils(srcBuffer->BindCpuBuffer(), srcDesc,
-                            dstBuffer->BindCpuBuffer(), dstDesc,
-                            duBuffer->BindCpuBuffer(),  duDesc,
-                            dvBuffer->BindCpuBuffer(),  dvDesc,
-                            &stencilTable->GetSizes()[0],
-                            &stencilTable->GetOffsets()[0],
-                            &stencilTable->GetControlIndices()[0],
-                            &stencilTable->GetWeights()[0],
-                            &stencilTable->GetDuWeights()[0],
-                            &stencilTable->GetDvWeights()[0],
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function with derivatives, which takes
-    ///        raw CPU pointers for input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param du             Output pointer derivative wrt u. An offset of
-    ///                       duDesc will be applied internally.
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv             Output pointer derivative wrt v. An offset of
-    ///                       dvDesc will be applied internally.
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param duWeights      pointer to the du-weights buffer of the stencil table
-    ///
-    /// @param dvWeights      pointer to the dv-weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        const float * duWeights,
-        const float * dvWeights,
-        int start, int end);
-
-    /// \brief Generic static eval stencils function with derivatives.
-    ///        This function has a same signature as other device kernels
-    ///        have so that it can be called in the same way from OsdMesh
-    ///        template interface.
-    ///
-    /// @param srcBuffer      Input primvar buffer.
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       const float pointer for read
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer      Output primvar buffer
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer       Output buffer derivative wrt u
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer       Output buffer derivative wrt v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer      Output buffer 2nd derivative wrt u
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer      Output buffer 2nd derivative wrt u and v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer      Output buffer 2nd derivative wrt v
-    ///                       must have BindCpuBuffer() method returning a
-    ///                       float pointer for write
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param stencilTable   Far::StencilTable or equivalent
-    ///
-    /// @param instance       not used in the tbb kernel
-    ///                       (declared as a typed pointer to prevent
-    ///                        undesirable template resolution)
-    ///
-    /// @param deviceContext  not used in the tbb kernel
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER, typename STENCIL_TABLE>
-    static bool EvalStencils(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        STENCIL_TABLE const *stencilTable,
-        const TbbEvaluator *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalStencils(srcBuffer->BindCpuBuffer(), srcDesc,
-                            dstBuffer->BindCpuBuffer(), dstDesc,
-                            duBuffer->BindCpuBuffer(),  duDesc,
-                            dvBuffer->BindCpuBuffer(),  dvDesc,
-                            duuBuffer->BindCpuBuffer(), duuDesc,
-                            duvBuffer->BindCpuBuffer(), duvDesc,
-                            dvvBuffer->BindCpuBuffer(), dvvDesc,
-                            &stencilTable->GetSizes()[0],
-                            &stencilTable->GetOffsets()[0],
-                            &stencilTable->GetControlIndices()[0],
-                            &stencilTable->GetWeights()[0],
-                            &stencilTable->GetDuWeights()[0],
-                            &stencilTable->GetDvWeights()[0],
-                            &stencilTable->GetDuuWeights()[0],
-                            &stencilTable->GetDuvWeights()[0],
-                            &stencilTable->GetDvvWeights()[0],
-                            /*start = */ 0,
-                            /*end   = */ stencilTable->GetNumStencils());
-    }
-
-    /// \brief Static eval stencils function with derivatives, which takes
-    ///        raw CPU pointers for input and output.
-    ///
-    /// @param src            Input primvar pointer. An offset of srcDesc
-    ///                       will be applied internally (i.e. the pointer
-    ///                       should not include the offset)
-    ///
-    /// @param srcDesc        vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst            Output primvar pointer. An offset of dstDesc
-    ///                       will be applied internally.
-    ///
-    /// @param dstDesc        vertex buffer descriptor for the output buffer
-    ///
-    /// @param du             Output pointer derivative wrt u. An offset of
-    ///                       duDesc will be applied internally.
-    ///
-    /// @param duDesc         vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv             Output pointer derivative wrt v. An offset of
-    ///                       dvDesc will be applied internally.
-    ///
-    /// @param dvDesc         vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duu            Output pointer 2nd derivative wrt u. An offset of
-    ///                       duuDesc will be applied internally.
-    ///
-    /// @param duuDesc        vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duv            Output pointer 2nd derivative wrt u and v. An offset of
-    ///                       duvDesc will be applied internally.
-    ///
-    /// @param duvDesc        vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvv            Output pointer 2nd derivative wrt v. An offset of
-    ///                       dvvDesc will be applied internally.
-    ///
-    /// @param dvvDesc        vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param sizes          pointer to the sizes buffer of the stencil table
-    ///
-    /// @param offsets        pointer to the offsets buffer of the stencil table
-    ///
-    /// @param indices        pointer to the indices buffer of the stencil table
-    ///
-    /// @param weights        pointer to the weights buffer of the stencil table
-    ///
-    /// @param duWeights      pointer to the du-weights buffer of the stencil table
-    ///
-    /// @param dvWeights      pointer to the dv-weights buffer of the stencil table
-    ///
-    /// @param duuWeights     pointer to the duu-weights buffer of the stencil table
-    ///
-    /// @param duvWeights     pointer to the duv-weights buffer of the stencil table
-    ///
-    /// @param dvvWeights     pointer to the dvv-weights buffer of the stencil table
-    ///
-    /// @param start          start index of stencil table
-    ///
-    /// @param end            end index of stencil table
-    ///
-    static bool EvalStencils(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        float *duu,       BufferDescriptor const &duuDesc,
-        float *duv,       BufferDescriptor const &duvDesc,
-        float *dvv,       BufferDescriptor const &dvvDesc,
-        const int * sizes,
-        const int * offsets,
-        const int * indices,
-        const float * weights,
-        const float * duWeights,
-        const float * dvWeights,
-        const float * duuWeights,
-        const float * duvWeights,
-        const float * dvvWeights,
-        int start, int end);
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Limit evaluations with PatchTable
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        TbbEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        TbbEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        // XXX: PatchCoords is somewhat abusing vertex primvar buffer interop.
-        //      ideally all buffer classes should have templated by datatype
-        //      so that downcast isn't needed there.
-        //      (e.g. Osd::CpuBuffer<PatchCoord> )
-        //
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function with derivatives. This function has
-    ///        a same signature as other device kernels have so that it can be
-    ///        called in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatches(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        TbbEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        // XXX: PatchCoords is somewhat abusing vertex primvar buffer interop.
-        //      ideally all buffer classes should have templated by datatype
-        //      so that downcast isn't needed there.
-        //      (e.g. Osd::CpuBuffer<PatchCoord> )
-        //
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           duuBuffer->BindCpuBuffer(), duuDesc,
-                           duvBuffer->BindCpuBuffer(), duvDesc,
-                           dvvBuffer->BindCpuBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetPatchArrayBuffer(),
-                           patchTable->GetPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndexBuffer an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParamBuffer an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        const PatchCoord *patchCoords,
-        const PatchArray *patchArrays,
-        const int *patchIndexBuffer,
-        const PatchParam *patchParamBuffer);
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param du               Output pointer derivative wrt u. An offset of
-    ///                         duDesc will be applied internally.
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               Output pointer derivative wrt v. An offset of
-    ///                         dvDesc will be applied internally.
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndexBuffer an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParamBuffer an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PatchCoord const *patchCoords,
-        PatchArray const *patchArrays,
-        const int *patchIndexBuffer,
-        PatchParam const *patchParamBuffer);
-
-    /// \brief Static limit eval function. It takes an array of PatchCoord
-    ///        and evaluate limit values on given PatchTable.
-    ///
-    /// @param src              Input primvar pointer. An offset of srcDesc
-    ///                         will be applied internally (i.e. the pointer
-    ///                         should not include the offset)
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dst              Output primvar pointer. An offset of dstDesc
-    ///                         will be applied internally.
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param du               Output pointer derivative wrt u. An offset of
-    ///                         duDesc will be applied internally.
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dv               Output pointer derivative wrt v. An offset of
-    ///                         dvDesc will be applied internally.
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duu              Output pointer 2nd derivative wrt u. An offset of
-    ///                         duuDesc will be applied internally.
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duv              Output pointer 2nd derivative wrt u and v. An offset of
-    ///                         duvDesc will be applied internally.
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvv              Output pointer 2nd derivative wrt v. An offset of
-    ///                         dvvDesc will be applied internally.
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchArrays      an array of Osd::PatchArray struct
-    ///                         indexed by PatchCoord::arrayIndex
-    ///
-    /// @param patchIndexBuffer an array of patch indices
-    ///                         indexed by PatchCoord::vertIndex
-    ///
-    /// @param patchParamBuffer an array of Osd::PatchParam struct
-    ///                         indexed by PatchCoord::patchIndex
-    ///
-    static bool EvalPatches(
-        const float *src, BufferDescriptor const &srcDesc,
-        float *dst,       BufferDescriptor const &dstDesc,
-        float *du,        BufferDescriptor const &duDesc,
-        float *dv,        BufferDescriptor const &dvDesc,
-        float *duu,       BufferDescriptor const &duuDesc,
-        float *duv,       BufferDescriptor const &duvDesc,
-        float *dvv,       BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PatchCoord const *patchCoords,
-        PatchArray const *patchArrays,
-        const int *patchIndexBuffer,
-        PatchParam const *patchParamBuffer);
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        TbbEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        TbbEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        TbbEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           duuBuffer->BindCpuBuffer(), duuDesc,
-                           duvBuffer->BindCpuBuffer(), duvDesc,
-                           dvvBuffer->BindCpuBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetVaryingPatchArrayBuffer(),
-                           patchTable->GetVaryingPatchIndexBuffer(),
-                           patchTable->GetPatchParamBuffer());
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        TbbEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        TbbEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// \brief Generic limit eval function. This function has a same
-    ///        signature as other device kernels have so that it can be called
-    ///        in the same way.
-    ///
-    /// @param srcBuffer        Input primvar buffer.
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         const float pointer for read
-    ///
-    /// @param srcDesc          vertex buffer descriptor for the input buffer
-    ///
-    /// @param dstBuffer        Output primvar buffer
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dstDesc          vertex buffer descriptor for the output buffer
-    ///
-    /// @param duBuffer         Output buffer derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duDesc           vertex buffer descriptor for the duBuffer
-    ///
-    /// @param dvBuffer         Output buffer derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvDesc           vertex buffer descriptor for the dvBuffer
-    ///
-    /// @param duuBuffer        Output buffer 2nd derivative wrt u
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duuDesc          vertex buffer descriptor for the duuBuffer
-    ///
-    /// @param duvBuffer        Output buffer 2nd derivative wrt u and v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param duvDesc          vertex buffer descriptor for the duvBuffer
-    ///
-    /// @param dvvBuffer        Output buffer 2nd derivative wrt v
-    ///                         must have BindCpuBuffer() method returning a
-    ///                         float pointer for write
-    ///
-    /// @param dvvDesc          vertex buffer descriptor for the dvvBuffer
-    ///
-    /// @param numPatchCoords   number of patchCoords.
-    ///
-    /// @param patchCoords      array of locations to be evaluated.
-    ///
-    /// @param patchTable       CpuPatchTable or equivalent
-    ///                         XXX: currently Far::PatchTable can't be used
-    ///                              due to interface mismatch
-    ///
-    /// @param fvarChannel      face-varying channel
-    ///
-    /// @param instance         not used in the cpu evaluator
-    ///
-    /// @param deviceContext    not used in the cpu evaluator
-    ///
-    template <typename SRC_BUFFER, typename DST_BUFFER,
-              typename PATCHCOORD_BUFFER, typename PATCH_TABLE>
-    static bool EvalPatchesFaceVarying(
-        SRC_BUFFER *srcBuffer, BufferDescriptor const &srcDesc,
-        DST_BUFFER *dstBuffer, BufferDescriptor const &dstDesc,
-        DST_BUFFER *duBuffer,  BufferDescriptor const &duDesc,
-        DST_BUFFER *dvBuffer,  BufferDescriptor const &dvDesc,
-        DST_BUFFER *duuBuffer, BufferDescriptor const &duuDesc,
-        DST_BUFFER *duvBuffer, BufferDescriptor const &duvDesc,
-        DST_BUFFER *dvvBuffer, BufferDescriptor const &dvvDesc,
-        int numPatchCoords,
-        PATCHCOORD_BUFFER *patchCoords,
-        PATCH_TABLE *patchTable,
-        int fvarChannel,
-        TbbEvaluator const *instance = NULL,
-        void * deviceContext = NULL) {
-
-        (void)instance;       // unused
-        (void)deviceContext;  // unused
-
-        return EvalPatches(srcBuffer->BindCpuBuffer(), srcDesc,
-                           dstBuffer->BindCpuBuffer(), dstDesc,
-                           duBuffer->BindCpuBuffer(),  duDesc,
-                           dvBuffer->BindCpuBuffer(),  dvDesc,
-                           duuBuffer->BindCpuBuffer(), duuDesc,
-                           duvBuffer->BindCpuBuffer(), duvDesc,
-                           dvvBuffer->BindCpuBuffer(), dvvDesc,
-                           numPatchCoords,
-                           (const PatchCoord*)patchCoords->BindCpuBuffer(),
-                           patchTable->GetFVarPatchArrayBuffer(fvarChannel),
-                           patchTable->GetFVarPatchIndexBuffer(fvarChannel),
-                           patchTable->GetFVarPatchParamBuffer(fvarChannel));
-    }
-
-    /// ----------------------------------------------------------------------
-    ///
-    ///   Other methods
-    ///
-    /// ----------------------------------------------------------------------
-
-    /// \brief synchronize all asynchronous computation invoked on this device.
-    static void Synchronize(void *deviceContext = NULL);
-
-    /// \brief initialize tbb task schedular
-    ///        (optional: client may use tbb::task_scheduler_init)
-    ///
-    /// @param numThreads      how many threads
-    ///
-    static void SetNumThreads(int numThreads);
-};
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-
-#endif  // OPENSUBDIV3_OSD_TBB_EVALUATOR_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbKernel.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbKernel.cpp
deleted file mode 100644
index 968b94ffa..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbKernel.cpp
+++ /dev/null
@@ -1,615 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "../osd/cpuKernel.h"
-#include "../osd/tbbKernel.h"
-#include "../osd/types.h"
-#include "../osd/bufferDescriptor.h"
-#include "../osd/patchBasisCommonTypes.h"
-#include "../osd/patchBasisCommon.h"
-#include "../osd/patchBasisCommonEval.h"
-
-#include <cassert>
-#include <cstdlib>
-#include <tbb/parallel_for.h>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-#define grain_size  200
-
-template <class T> T *
-elementAtIndex(T * src, int index, BufferDescriptor const &desc) {
-
-    return src + index * desc.stride;
-}
-
-static inline void
-clear(float *dst, BufferDescriptor const &desc) {
-
-    assert(dst);
-    memset(dst, 0, desc.length*sizeof(float));
-}
-
-static inline void
-addWithWeight(float *dst, const float *src, int srcIndex, float weight,
-              BufferDescriptor const &desc) {
-
-    assert(src && dst);
-    src = elementAtIndex(src, srcIndex, desc);
-    for (int k = 0; k < desc.length; ++k) {
-        dst[k] += src[k] * weight;
-    }
-}
-
-static inline void
-copy(float *dst, int dstIndex, const float *src,
-     BufferDescriptor const &desc) {
-
-    assert(src && dst);
-
-    dst = elementAtIndex(dst, dstIndex, desc);
-    memcpy(dst, src, desc.length*sizeof(float));
-}
-
-
-class TBBStencilKernel {
-
-    BufferDescriptor _srcDesc;
-    BufferDescriptor _dstDesc;
-    float const * _vertexSrc;
-    float * _vertexDst;
-
-    int const * _sizes;
-    int const * _offsets,
-              * _indices;
-    float const * _weights;
-
-
-public:
-    TBBStencilKernel(float const *src, BufferDescriptor srcDesc,
-                     float *dst,       BufferDescriptor dstDesc,
-                     int const * sizes, int const * offsets,
-                     int const * indices, float const * weights) :
-         _srcDesc(srcDesc),
-         _dstDesc(dstDesc),
-         _vertexSrc(src),
-         _vertexDst(dst),
-         _sizes(sizes),
-         _offsets(offsets),
-         _indices(indices),
-         _weights(weights) { }
-
-    TBBStencilKernel(TBBStencilKernel const & other) {
-        _srcDesc    = other._srcDesc;
-        _dstDesc    = other._dstDesc;
-        _sizes      = other._sizes;
-        _offsets    = other._offsets;
-        _indices    = other._indices;
-        _weights    = other._weights;
-        _vertexSrc  = other._vertexSrc;
-        _vertexDst  = other._vertexDst;
-    }
-
-    void operator() (tbb::blocked_range<int> const &r) const {
-#define USE_SIMD
-#ifdef USE_SIMD
-        if (_srcDesc.length==4 && _srcDesc.stride==4 && _dstDesc.stride==4) {
-
-            // SIMD fast path for aligned primvar data (4 floats)
-            int offset = _offsets[r.begin()];
-            ComputeStencilKernel<4>(_vertexSrc, _vertexDst,
-                _sizes, _indices+offset, _weights+offset, r.begin(), r.end());
-
-        } else if (_srcDesc.length==8 && _srcDesc.stride==4 && _dstDesc.stride==4) {
-
-            // SIMD fast path for aligned primvar data (8 floats)
-            int offset = _offsets[r.begin()];
-            ComputeStencilKernel<8>(_vertexSrc, _vertexDst,
-                _sizes, _indices+offset, _weights+offset, r.begin(), r.end());
-
-        } else {
-#else
-        {
-#endif
-            int const * sizes = _sizes;
-            int const * indices = _indices;
-            float const * weights = _weights;
-
-            if (r.begin()>0) {
-                sizes += r.begin();
-                indices += _offsets[r.begin()];
-                weights += _offsets[r.begin()];
-            }
-
-            // Slow path for non-aligned data
-            float * result = (float*)alloca(_srcDesc.length * sizeof(float));
-
-            for (int i=r.begin(); i<r.end(); ++i, ++sizes) {
-
-                clear(result, _dstDesc);
-
-                for (int j=0; j<*sizes; ++j) {
-                    addWithWeight(result, _vertexSrc, *indices++, *weights++, _srcDesc);
-                }
-
-                copy(_vertexDst, i, result, _dstDesc);
-            }
-        }
-    }
-};
-
-void
-TbbEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                int start, int end) {
-
-    src += srcDesc.offset;
-    dst += dstDesc.offset;
-
-    TBBStencilKernel kernel(src, srcDesc, dst, dstDesc,
-                            sizes, offsets, indices, weights);
-
-    tbb::blocked_range<int> range(start, end, grain_size);
-
-    tbb::parallel_for(range, kernel);
-}
-
-void
-TbbEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * du,        BufferDescriptor const &duDesc,
-                float * dv,        BufferDescriptor const &dvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                int start, int end) {
-
-    if (src) src += srcDesc.offset;
-    if (dst) dst += dstDesc.offset;
-    if (du)  du  += duDesc.offset;
-    if (dv)  dv  += dvDesc.offset;
-
-    // PERFORMANCE: need to combine 3 launches together
-    if (dst) {
-        TBBStencilKernel kernel(src, srcDesc, dst, dstDesc,
-                                sizes, offsets, indices, weights);
-        tbb::blocked_range<int> range(start, end, grain_size);
-        tbb::parallel_for(range, kernel);
-    }
-
-    if (du) {
-        TBBStencilKernel kernel(src, srcDesc, du, duDesc,
-                                sizes, offsets, indices, duWeights);
-        tbb::blocked_range<int> range(start, end, grain_size);
-        tbb::parallel_for(range, kernel);
-    }
-
-    if (dv) {
-        TBBStencilKernel kernel(src, srcDesc, dv, dvDesc,
-                                sizes, offsets, indices, dvWeights);
-        tbb::blocked_range<int> range(start, end, grain_size);
-        tbb::parallel_for(range, kernel);
-    }
-
-}
-
-void
-TbbEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * du,        BufferDescriptor const &duDesc,
-                float * dv,        BufferDescriptor const &dvDesc,
-                float * duu,       BufferDescriptor const &duuDesc,
-                float * duv,       BufferDescriptor const &duvDesc,
-                float * dvv,       BufferDescriptor const &dvvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                float const * duuWeights,
-                float const * duvWeights,
-                float const * dvvWeights,
-                int start, int end) {
-
-    if (src) src += srcDesc.offset;
-    if (dst) dst += dstDesc.offset;
-    if (du)  du  += duDesc.offset;
-    if (dv)  dv  += dvDesc.offset;
-    if (duu) duu += duuDesc.offset;
-    if (duv) duv += duvDesc.offset;
-    if (dvv) dvv += dvvDesc.offset;
-
-    // PERFORMANCE: need to combine 3 launches together
-    if (dst) {
-        TBBStencilKernel kernel(src, srcDesc, dst, dstDesc,
-                                sizes, offsets, indices, weights);
-        tbb::blocked_range<int> range(start, end, grain_size);
-        tbb::parallel_for(range, kernel);
-    }
-
-    if (du) {
-        TBBStencilKernel kernel(src, srcDesc, du, duDesc,
-                                sizes, offsets, indices, duWeights);
-        tbb::blocked_range<int> range(start, end, grain_size);
-        tbb::parallel_for(range, kernel);
-    }
-
-    if (dv) {
-        TBBStencilKernel kernel(src, srcDesc, dv, dvDesc,
-                                sizes, offsets, indices, dvWeights);
-        tbb::blocked_range<int> range(start, end, grain_size);
-        tbb::parallel_for(range, kernel);
-    }
-
-    if (duu) {
-        TBBStencilKernel kernel(src, srcDesc, duu, duuDesc,
-                                sizes, offsets, indices, duuWeights);
-        tbb::blocked_range<int> range(start, end, grain_size);
-        tbb::parallel_for(range, kernel);
-    }
-
-    if (duv) {
-        TBBStencilKernel kernel(src, srcDesc, duv, duvDesc,
-                                sizes, offsets, indices, duvWeights);
-        tbb::blocked_range<int> range(start, end, grain_size);
-        tbb::parallel_for(range, kernel);
-    }
-
-    if (dvv) {
-        TBBStencilKernel kernel(src, srcDesc, dvv, dvvDesc,
-                                sizes, offsets, indices, dvvWeights);
-        tbb::blocked_range<int> range(start, end, grain_size);
-        tbb::parallel_for(range, kernel);
-    }
-}
-
-// ---------------------------------------------------------------------------
-
-template <typename T>
-struct BufferAdapter {
-    BufferAdapter(T *p, int length, int stride) :
-        _p(p), _length(length), _stride(stride) { }
-    void Clear() {
-        for (int i = 0; i < _length; ++i) _p[i] = 0;
-    }
-    void AddWithWeight(T const *src, float w) {
-        if (_p) {
-            for (int i = 0; i < _length; ++i) {
-                _p[i] += src[i] * w;
-            }
-        }
-    }
-    const T *operator[] (int index) const {
-        return _p + _stride * index;
-    }
-    BufferAdapter<T> & operator ++() {
-        if (_p) {
-            _p += _stride;
-        }
-        return *this;
-    }
-
-    T *_p;
-    int _length;
-    int _stride;
-};
-
-class TbbEvalPatchesKernel {
-    BufferDescriptor _srcDesc;
-    BufferDescriptor _dstDesc;
-    BufferDescriptor _dstDuDesc;
-    BufferDescriptor _dstDvDesc;
-    BufferDescriptor _dstDuuDesc;
-    BufferDescriptor _dstDuvDesc;
-    BufferDescriptor _dstDvvDesc;
-    float const * _src;
-    float * _dst;
-    float * _dstDu;
-    float * _dstDv;
-    float * _dstDuu;
-    float * _dstDuv;
-    float * _dstDvv;
-    int _numPatchCoords;
-    const PatchCoord *_patchCoords;
-    const PatchArray *_patchArrayBuffer;
-    const int        *_patchIndexBuffer;
-    const PatchParam *_patchParamBuffer;
-
-public:
-    TbbEvalPatchesKernel(float const *src, BufferDescriptor srcDesc,
-                         float *dst,       BufferDescriptor dstDesc,
-                         float *dstDu,     BufferDescriptor dstDuDesc,
-                         float *dstDv,     BufferDescriptor dstDvDesc,
-                         float *dstDuu,    BufferDescriptor dstDuuDesc,
-                         float *dstDuv,    BufferDescriptor dstDuvDesc,
-                         float *dstDvv,    BufferDescriptor dstDvvDesc,
-                         int numPatchCoords,
-                         const PatchCoord *patchCoords,
-                         const PatchArray *patchArrayBuffer,
-                         const int *patchIndexBuffer,
-                         const PatchParam *patchParamBuffer) :
-        _srcDesc(srcDesc), _dstDesc(dstDesc),
-        _dstDuDesc(dstDuDesc), _dstDvDesc(dstDvDesc),
-        _dstDuuDesc(dstDuuDesc), _dstDuvDesc(dstDuvDesc), _dstDvvDesc(dstDvvDesc),
-        _src(src), _dst(dst),
-        _dstDu(dstDu), _dstDv(dstDv),
-        _dstDuu(dstDuu), _dstDuv(dstDuv), _dstDvv(dstDvv),
-        _numPatchCoords(numPatchCoords),
-        _patchCoords(patchCoords),
-        _patchArrayBuffer(patchArrayBuffer),
-        _patchIndexBuffer(patchIndexBuffer),
-        _patchParamBuffer(patchParamBuffer) {
-    }
-
-    void operator() (tbb::blocked_range<int> const &r) const {
-        if (_dstDu == NULL && _dstDv == NULL) {
-            compute(r);
-        } else if (_dstDuu == NULL && _dstDuv == NULL && _dstDvv == NULL) {
-            computeWith1stDerivative(r);
-        } else {
-            computeWith2ndDerivative(r);
-        }
-    }
-
-    void compute(tbb::blocked_range<int> const &r) const {
-        float wP[20];
-        BufferAdapter<const float> srcT(_src + _srcDesc.offset,
-                                        _srcDesc.length,
-                                        _srcDesc.stride);
-        BufferAdapter<float> dstT(_dst + _dstDesc.offset
-                                       + r.begin() * _dstDesc.stride,
-                                  _dstDesc.length,
-                                  _dstDesc.stride);
-
-
-        for (int i = r.begin(); i < r.end(); ++i) {
-            PatchCoord const &coord = _patchCoords[i];
-            PatchArray const &array = _patchArrayBuffer[coord.handle.arrayIndex];
-
-            Osd::PatchParam const & paramStruct =
-                _patchParamBuffer[coord.handle.patchIndex];
-            OsdPatchParam param = OsdPatchParamInit(
-                paramStruct.field0, paramStruct.field1, paramStruct.sharpness);
-
-            int patchType = OsdPatchParamIsRegular(param)
-                ? array.GetPatchTypeRegular()
-                : array.GetPatchTypeIrregular();
-
-            int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                    coord.s, coord.t, wP, 0, 0, 0, 0, 0);
-
-            int indexBase = array.GetIndexBase() + array.GetStride() *
-                    (coord.handle.patchIndex - array.GetPrimitiveIdBase());
-
-            const int *cvs = &_patchIndexBuffer[indexBase];
-
-            dstT.Clear();
-            for (int j = 0; j < nPoints; ++j) {
-                dstT.AddWithWeight(srcT[cvs[j]], wP[j]);
-            }
-            ++dstT;
-        }
-    }
-
-    void computeWith1stDerivative(tbb::blocked_range<int> const &r) const {
-        float wP[20], wDu[20], wDv[20];
-        BufferAdapter<const float> srcT(_src + _srcDesc.offset,
-                                        _srcDesc.length,
-                                        _srcDesc.stride);
-        BufferAdapter<float> dstT(_dst + _dstDesc.offset
-                                       + r.begin() * _dstDesc.stride,
-                                  _dstDesc.length,
-                                  _dstDesc.stride);
-        BufferAdapter<float> dstDuT(_dstDu + _dstDuDesc.offset
-                                       + r.begin() * _dstDuDesc.stride,
-                                    _dstDuDesc.length,
-                                    _dstDuDesc.stride);
-        BufferAdapter<float> dstDvT(_dstDv + _dstDvDesc.offset
-                                       + r.begin() * _dstDvDesc.stride,
-                                    _dstDvDesc.length,
-                                    _dstDvDesc.stride);
-
-        for (int i = r.begin(); i < r.end(); ++i) {
-            PatchCoord const &coord = _patchCoords[i];
-            PatchArray const &array = _patchArrayBuffer[coord.handle.arrayIndex];
-
-            Osd::PatchParam const & paramStruct =
-                _patchParamBuffer[coord.handle.patchIndex];
-            OsdPatchParam param = OsdPatchParamInit(
-                paramStruct.field0, paramStruct.field1, paramStruct.sharpness);
-
-            int patchType = OsdPatchParamIsRegular(param)
-                ? array.GetPatchTypeRegular()
-                : array.GetPatchTypeIrregular();
-
-            int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                    coord.s, coord.t, wP, wDu, wDv, 0, 0, 0);
-
-            int indexBase = array.GetIndexBase() + array.GetStride() *
-                    (coord.handle.patchIndex - array.GetPrimitiveIdBase());
-
-            const int *cvs = &_patchIndexBuffer[indexBase];
-
-            dstT.Clear();
-            dstDuT.Clear();
-            dstDvT.Clear();
-            for (int j = 0; j < nPoints; ++j) {
-                dstT.AddWithWeight(srcT[cvs[j]], wP[j]);
-                dstDuT.AddWithWeight(srcT[cvs[j]], wDu[j]);
-                dstDvT.AddWithWeight(srcT[cvs[j]], wDv[j]);
-            }
-            ++dstT;
-            ++dstDuT;
-            ++dstDvT;
-        }
-    }
-
-    void computeWith2ndDerivative(tbb::blocked_range<int> const &r) const {
-        float wP[20], wDu[20], wDv[20], wDuu[20], wDuv[20], wDvv[20];
-        BufferAdapter<const float> srcT(_src + _srcDesc.offset,
-                                        _srcDesc.length,
-                                        _srcDesc.stride);
-        BufferAdapter<float> dstT(_dst + _dstDesc.offset
-                                       + r.begin() * _dstDesc.stride,
-                                  _dstDesc.length,
-                                  _dstDesc.stride);
-        BufferAdapter<float> dstDuT(_dstDu + _dstDuDesc.offset
-                                       + r.begin() * _dstDuDesc.stride,
-                                  _dstDuDesc.length,
-                                  _dstDuDesc.stride);
-        BufferAdapter<float> dstDvT(_dstDv + _dstDvDesc.offset
-                                       + r.begin() * _dstDvDesc.stride,
-                                  _dstDvDesc.length,
-                                  _dstDvDesc.stride);
-        BufferAdapter<float> dstDuuT(_dstDuu + _dstDuuDesc.offset
-                                       + r.begin() * _dstDuuDesc.stride,
-                                  _dstDuuDesc.length,
-                                  _dstDuuDesc.stride);
-        BufferAdapter<float> dstDuvT(_dstDuv + _dstDuvDesc.offset
-                                       + r.begin() * _dstDuvDesc.stride,
-                                  _dstDuvDesc.length,
-                                  _dstDuvDesc.stride);
-        BufferAdapter<float> dstDvvT(_dstDvv + _dstDvvDesc.offset
-                                       + r.begin() * _dstDvvDesc.stride,
-                                  _dstDvvDesc.length,
-                                  _dstDvvDesc.stride);
-
-        for (int i = r.begin(); i < r.end(); ++i) {
-            PatchCoord const &coord = _patchCoords[i];
-            PatchArray const &array = _patchArrayBuffer[coord.handle.arrayIndex];
-
-            Osd::PatchParam const & paramStruct =
-                _patchParamBuffer[coord.handle.patchIndex];
-            OsdPatchParam param = OsdPatchParamInit(
-                paramStruct.field0, paramStruct.field1, paramStruct.sharpness);
-
-            int patchType = OsdPatchParamIsRegular(param)
-                ? array.GetPatchTypeRegular()
-                : array.GetPatchTypeIrregular();
-
-            int nPoints = OsdEvaluatePatchBasis(patchType, param,
-                    coord.s, coord.t, wP, wDu, wDv, wDuu, wDuv, wDvv);
-
-            int indexBase = array.GetIndexBase() + array.GetStride() *
-                    (coord.handle.patchIndex - array.GetPrimitiveIdBase());
-
-            const int *cvs = &_patchIndexBuffer[indexBase];
-
-            dstT.Clear();
-            dstDuT.Clear();
-            dstDvT.Clear();
-            dstDuuT.Clear();
-            dstDuvT.Clear();
-            dstDvvT.Clear();
-            for (int j = 0; j < nPoints; ++j) {
-                dstT.AddWithWeight(srcT[cvs[j]], wP[j]);
-                dstDuT.AddWithWeight(srcT[cvs[j]], wDu[j]);
-                dstDvT.AddWithWeight(srcT[cvs[j]], wDv[j]);
-                dstDuuT.AddWithWeight(srcT[cvs[j]], wDuu[j]);
-                dstDuvT.AddWithWeight(srcT[cvs[j]], wDuv[j]);
-                dstDvvT.AddWithWeight(srcT[cvs[j]], wDvv[j]);
-            }
-            ++dstT;
-            ++dstDuT;
-            ++dstDvT;
-            ++dstDuuT;
-            ++dstDuvT;
-            ++dstDvvT;
-        }
-    }
-};
-
-
-void
-TbbEvalPatches(float const *src, BufferDescriptor const &srcDesc,
-               float *dst,       BufferDescriptor const &dstDesc,
-               float *dstDu,     BufferDescriptor const &dstDuDesc,
-               float *dstDv,     BufferDescriptor const &dstDvDesc,
-               int numPatchCoords,
-               const PatchCoord *patchCoords,
-               const PatchArray *patchArrayBuffer,
-               const int *patchIndexBuffer,
-               const PatchParam *patchParamBuffer) {
-
-    TbbEvalPatchesKernel kernel(src, srcDesc, dst, dstDesc,
-                                dstDu, dstDuDesc, dstDv, dstDvDesc,
-                                NULL, BufferDescriptor(),
-                                NULL, BufferDescriptor(),
-                                NULL, BufferDescriptor(),
-                                numPatchCoords, patchCoords,
-                                patchArrayBuffer,
-                                patchIndexBuffer,
-                                patchParamBuffer);
-
-    tbb::blocked_range<int> range(0, numPatchCoords, grain_size);
-    tbb::parallel_for(range, kernel);
-
-}
-
-
-void
-TbbEvalPatches(float const *src, BufferDescriptor const &srcDesc,
-               float *dst,       BufferDescriptor const &dstDesc,
-               float *dstDu,     BufferDescriptor const &dstDuDesc,
-               float *dstDv,     BufferDescriptor const &dstDvDesc,
-               float *dstDuu,    BufferDescriptor const &dstDuuDesc,
-               float *dstDuv,    BufferDescriptor const &dstDuvDesc,
-               float *dstDvv,    BufferDescriptor const &dstDvvDesc,
-               int numPatchCoords,
-               const PatchCoord *patchCoords,
-               const PatchArray *patchArrayBuffer,
-               const int *patchIndexBuffer,
-               const PatchParam *patchParamBuffer) {
-
-    TbbEvalPatchesKernel kernel(src, srcDesc, dst, dstDesc,
-                                dstDu, dstDuDesc, dstDv, dstDvDesc,
-                                dstDuu, dstDuuDesc,
-                                dstDuv, dstDuvDesc,
-                                dstDvv, dstDvvDesc,
-                                numPatchCoords, patchCoords,
-                                patchArrayBuffer,
-                                patchIndexBuffer,
-                                patchParamBuffer);
-
-    tbb::blocked_range<int> range(0, numPatchCoords, grain_size);
-    tbb::parallel_for(range, kernel);
-
-}
-
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-}  // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbKernel.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbKernel.h
deleted file mode 100644
index dc112b881..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/tbbKernel.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_TBB_KERNEL_H
-#define OPENSUBDIV3_OSD_TBB_KERNEL_H
-
-#include "../version.h"
-#include "../far/patchDescriptor.h"
-#include "../far/patchParam.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-struct PatchArray;
-struct PatchCoord;
-struct PatchParam;
-struct BufferDescriptor;
-
-void
-TbbEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                int start, int end);
-
-void
-TbbEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                int start, int end);
-
-void
-TbbEvalStencils(float const * src, BufferDescriptor const &srcDesc,
-                float * dst,       BufferDescriptor const &dstDesc,
-                float * dstDu,     BufferDescriptor const &dstDuDesc,
-                float * dstDv,     BufferDescriptor const &dstDvDesc,
-                float * dstDuu,    BufferDescriptor const &dstDuuDesc,
-                float * dstDuv,    BufferDescriptor const &dstDuvDesc,
-                float * dstDvv,    BufferDescriptor const &dstDvvDesc,
-                int const * sizes,
-                int const * offsets,
-                int const * indices,
-                float const * weights,
-                float const * duWeights,
-                float const * dvWeights,
-                float const * duuWeights,
-                float const * duvWeights,
-                float const * dvvWeights,
-                int start, int end);
-
-void
-TbbEvalPatches(float const *src, BufferDescriptor const &srcDesc,
-               float *dst,       BufferDescriptor const &dstDesc,
-               float *dstDu,     BufferDescriptor const &dstDuDesc,
-               float *dstDv,     BufferDescriptor const &dstDvDesc,
-               int numPatchCoords,
-               const PatchCoord *patchCoords,
-               const PatchArray *patchArrayBuffer,
-               const int *patchIndexBuffer,
-               const PatchParam *patchParamBuffer);
-
-void
-TbbEvalPatches(float const *src, BufferDescriptor const &srcDesc,
-               float *dst,       BufferDescriptor const &dstDesc,
-               float *dstDu,     BufferDescriptor const &dstDuDesc,
-               float *dstDv,     BufferDescriptor const &dstDvDesc,
-               float *dstDuu,    BufferDescriptor const &dstDuuDesc,
-               float *dstDuv,    BufferDescriptor const &dstDuvDesc,
-               float *dstDvv,    BufferDescriptor const &dstDvvDesc,
-               int numPatchCoords,
-               const PatchCoord *patchCoords,
-               const PatchArray *patchArrayBuffer,
-               const int *patchIndexBuffer,
-               const PatchParam *patchParamBuffer);
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-#endif  // OPENSUBDIV3_OSD_TBB_KERNEL_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/types.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/types.h
deleted file mode 100644
index ceedf6d6e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/osd/types.h
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-//   Copyright 2015 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_OSD_TYPES_H
-#define OPENSUBDIV3_OSD_TYPES_H
-
-#include "../version.h"
-#include "../far/patchTable.h"
-
-#include <algorithm>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Osd {
-
-/// \brief Coordinates set on a patch table
-///
-///  XXX: this class may be moved into Far
-///
-struct PatchCoord {
-    // 5-ints struct.
-
-    /// \brief Constructor
-    ///
-    /// @param handleArg    patch handle
-    ///
-    /// @param sArg         parametric location on the patch
-    ///
-    /// @param tArg         parametric location on the patch
-    ///
-    PatchCoord(Far::PatchTable::PatchHandle handleArg, float sArg, float tArg) :
-        handle(handleArg), s(sArg), t(tArg) { }
-
-    PatchCoord() : s(0), t(0) {
-        handle.arrayIndex = 0;
-        handle.patchIndex = 0;
-        handle.vertIndex = 0;
-    }
-
-    Far::PatchTable::PatchHandle handle; ///< patch handle
-    float s, t;              ///< parametric location on patch
-};
-
-struct PatchArray {
-    // 4-ints struct.
-    PatchArray(Far::PatchDescriptor desc_in,
-               int numPatches_in, int indexBase_in, int primitiveIdBase_in) :
-        regDesc(desc_in), desc(desc_in),
-        numPatches(numPatches_in), indexBase(indexBase_in),
-        stride(desc_in.GetNumControlVertices()),
-        primitiveIdBase(primitiveIdBase_in) {}
-
-    PatchArray(Far::PatchDescriptor regDesc_in, Far::PatchDescriptor irregDesc_in,
-               int numPatches_in, int indexBase_in, int primitiveIdBase_in) :
-        regDesc(regDesc_in), desc(irregDesc_in),
-        numPatches(numPatches_in), indexBase(indexBase_in),
-        stride(std::max(regDesc_in.GetNumControlVertices(),
-                        irregDesc_in.GetNumControlVertices())),
-        primitiveIdBase(primitiveIdBase_in) {}
-
-    Far::PatchDescriptor const &GetDescriptor() const {
-        return desc;
-    }
-    Far::PatchDescriptor const &GetDescriptorRegular() const {
-        return regDesc;
-    }
-    Far::PatchDescriptor const &GetDescriptorIrregular() const {
-        return desc;
-    }
-
-    int GetPatchType() const {
-        return desc.GetType();
-    }
-    int GetPatchTypeRegular() const {
-        return regDesc.GetType();
-    }
-    int GetPatchTypeIrregular() const {
-        return desc.GetType();
-    }
-
-    int GetNumPatches() const {
-        return numPatches;
-    }
-    int GetIndexBase() const {
-        return indexBase;
-    }
-    int GetStride() const {
-        return stride;
-    }
-    int GetPrimitiveIdBase() const {
-        return primitiveIdBase;
-    }
-
-    // Separate regular and irregular patch descriptors for cases where the
-    // array is mixed -- both will be equal if only a single type specified
-    Far::PatchDescriptor regDesc;
-    Far::PatchDescriptor desc;
-
-    int numPatches;
-    int indexBase;        // an offset within the index buffer
-    int stride;           // stride in buffer between patches
-    int primitiveIdBase;  // an offset within the patch param buffer
-};
-
-struct PatchParam : public Far::PatchParam {
-    // int3 struct.
-    float sharpness;
-};
-
-typedef std::vector<PatchArray> PatchArrayVector;
-typedef std::vector<PatchParam> PatchParamVector;
-
-}  // end namespace Osd
-
-}  // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-}  // end namespace OpenSubdiv
-
-
-#endif  // OPENSUBDIV3_OSD_TYPES_H
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/CMakeLists.txt
deleted file mode 100644
index a6e414e9b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/CMakeLists.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-#-------------------------------------------------------------------------------
-set(PUBLIC_HEADER_FILES
-    bilinearScheme.h
-    catmarkScheme.h
-    crease.h
-    loopScheme.h
-    options.h
-    scheme.h
-    types.h
-)
-
-set(PRIVATE_HEADER_FILES )
-
-#-------------------------------------------------------------------------------
-# source & headers
-set(SOURCE_FILES
-    crease.cpp
-    typeTraits.cpp
-)
-
-set(DOXY_HEADER_FILES ${PUBLIC_HEADER_FILES})
-
-include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-
-if (NOT NO_LIB)
-    add_library(sdc_obj
-        OBJECT
-            ${SOURCE_FILES}
-            ${PRIVATE_HEADER_FILES}
-            ${PUBLIC_HEADER_FILES}
-    )
-
-    set_target_properties(sdc_obj
-        PROPERTIES
-            FOLDER "opensubdiv"
-    )
-
-endif()
-
-#-------------------------------------------------------------------------------
-osd_add_doxy_headers( "${DOXY_HEADER_FILES}" )
-
-install(
-    FILES
-        ${PUBLIC_HEADER_FILES}
-    DESTINATION
-        "${CMAKE_INCDIR_BASE}/sdc"
-    PERMISSIONS
-        OWNER_READ
-        GROUP_READ
-        WORLD_READ )
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/bilinearScheme.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/bilinearScheme.h
deleted file mode 100644
index fa9f60e95..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/bilinearScheme.h
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_SDC_BILINEAR_SCHEME_H
-#define OPENSUBDIV3_SDC_BILINEAR_SCHEME_H
-
-#include "../version.h"
-
-#include "../sdc/scheme.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Sdc {
-
-//
-//  Specializations for Scheme<SCHEME_BILINEAR>:
-//
-
-//
-//  Bilinear traits:
-//
-template <>
-inline Split Scheme<SCHEME_BILINEAR>::GetTopologicalSplitType() { return SPLIT_TO_QUADS; }
-
-template <>
-inline int Scheme<SCHEME_BILINEAR>::GetRegularFaceSize() { return 4; }
-
-template <>
-inline int Scheme<SCHEME_BILINEAR>::GetRegularVertexValence() { return 4; }
-
-template <>
-inline int Scheme<SCHEME_BILINEAR>::GetLocalNeighborhoodSize() { return 0; }
-
-
-//
-//  Refinement masks:
-//
-template <>
-template <typename EDGE, typename MASK>
-void
-Scheme<SCHEME_BILINEAR>::ComputeEdgeVertexMask(EDGE const& edge, MASK& mask,
-                                                Crease::Rule, Crease::Rule) const {
-    //  This should be inline, otherwise trivially replicate it:
-    assignCreaseMaskForEdge(edge, mask);
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-void
-Scheme<SCHEME_BILINEAR>::ComputeVertexVertexMask(VERTEX const& vertex, MASK& mask,
-                                                  Crease::Rule, Crease::Rule) const {
-    //  This should be inline, otherwise trivially replicate it:
-    assignCornerMaskForVertex(vertex, mask);
-}
-
-
-//
-//  Limit masks for position -- the limit position of all vertices is the refined vertex.
-//
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_BILINEAR>::assignCornerLimitMask(VERTEX const& /* vertex */, MASK& posMask) const {
-
-    posMask.SetNumVertexWeights(1);
-    posMask.SetNumEdgeWeights(0);
-    posMask.SetNumFaceWeights(0);
-    posMask.SetFaceWeightsForFaceCenters(false);
-
-    posMask.VertexWeight(0) = 1.0f;
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_BILINEAR>::assignCreaseLimitMask(VERTEX const& vertex, MASK& posMask,
-                                               int const /* creaseEnds */[2]) const {
-
-    assignCornerLimitMask(vertex, posMask);
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_BILINEAR>::assignSmoothLimitMask(VERTEX const& vertex, MASK& posMask) const {
-
-    assignCornerLimitMask(vertex, posMask);
-}
-
-//
-//  Limit masks for tangents -- these are ambiguous around all vertices.  Provide
-//  the tangents based on the incident edges of the first face.
-//
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_BILINEAR>::assignCornerLimitTangentMasks(VERTEX const& /* vertex */,
-        MASK& tan1Mask, MASK& tan2Mask) const {
-
-    tan1Mask.SetNumVertexWeights(1);
-    tan1Mask.SetNumEdgeWeights(2);
-    tan1Mask.SetNumFaceWeights(0);
-    tan1Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan2Mask.SetNumVertexWeights(1);
-    tan2Mask.SetNumEdgeWeights(2);
-    tan2Mask.SetNumFaceWeights(0);
-    tan2Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan1Mask.VertexWeight(0) = -1.0f;
-    tan1Mask.EdgeWeight(0) = 1.0f;
-    tan1Mask.EdgeWeight(1) = 0.0f;
-
-    tan2Mask.VertexWeight(0) = -1.0f;
-    tan2Mask.EdgeWeight(0) = 0.0f;
-    tan2Mask.EdgeWeight(1) = 1.0f;
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_BILINEAR>::assignCreaseLimitTangentMasks(VERTEX const& vertex,
-        MASK& tan1Mask, MASK& tan2Mask, int const /* creaseEnds */[2]) const {
-
-    assignCornerLimitTangentMasks(vertex, tan1Mask, tan2Mask);
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_BILINEAR>::assignSmoothLimitTangentMasks(VERTEX const& vertex,
-        MASK& tan1Mask, MASK& tan2Mask) const {
-
-    assignCornerLimitTangentMasks(vertex, tan1Mask, tan2Mask);
-}
-
-} // end namespace sdc
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_SDC_BILINEAR_SCHEME_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/catmarkScheme.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/catmarkScheme.h
deleted file mode 100644
index 9d589ffa5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/catmarkScheme.h
+++ /dev/null
@@ -1,539 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_SDC_CATMARK_SCHEME_H
-#define OPENSUBDIV3_SDC_CATMARK_SCHEME_H
-
-#include "../version.h"
-
-#include "../sdc/scheme.h"
-
-#include <cassert>
-#include <cmath>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Sdc {
-
-//
-//  Specializations for Scheme<SCHEME_CATMARK>:
-//
-
-//
-//  Catmark traits:
-//
-template <>
-inline Split Scheme<SCHEME_CATMARK>::GetTopologicalSplitType() { return SPLIT_TO_QUADS; }
-
-template <>
-inline int Scheme<SCHEME_CATMARK>::GetRegularFaceSize() { return 4; }
-
-template <>
-inline int Scheme<SCHEME_CATMARK>::GetRegularVertexValence() { return 4; }
-
-template <>
-inline int Scheme<SCHEME_CATMARK>::GetLocalNeighborhoodSize() { return 1; }
-
-
-//
-//  Masks for edge-vertices:  the hard Crease mask does not need to be specialized
-//  (simply the midpoint), so all that is left is the Smooth case:
-//
-//  The Smooth mask is complicated by the need to support the "triangle subdivision"
-//  option, which applies different weighting in the presence of triangles.  It is
-//  up for debate as to whether this is useful or not -- we may be able to deprecate
-//  this option.
-//
-template <>
-template <typename EDGE, typename MASK>
-inline void
-Scheme<SCHEME_CATMARK>::assignSmoothMaskForEdge(EDGE const& edge, MASK& mask) const {
-
-    typedef typename MASK::Weight Weight;
-
-    int faceCount = edge.GetNumFaces();
-
-    mask.SetNumVertexWeights(2);
-    mask.SetNumEdgeWeights(0);
-    mask.SetNumFaceWeights(faceCount);
-    mask.SetFaceWeightsForFaceCenters(true);
-
-    //
-    //  Determine if we need to inspect incident faces and apply alternate weighting for
-    //  triangles -- and if so, determine which of the two are triangles.
-    //
-    bool face0IsTri = false;
-    bool face1IsTri = false;
-    bool useTriangleOption = (_options.GetTriangleSubdivision() == Options::TRI_SUB_SMOOTH);
-    if (useTriangleOption) {
-        if (faceCount == 2) {
-            //
-            //  Ideally we want to avoid this inspection when we have already subdivided at
-            //  least once -- need something in the Edge interface to help avoid this, e.g.
-            //  an IsRegular() query, the subdivision level...
-            //
-            int vertsPerFace[2];
-            edge.GetNumVerticesPerFace(vertsPerFace);
-
-            face0IsTri = (vertsPerFace[0] == 3);
-            face1IsTri = (vertsPerFace[1] == 3);
-            useTriangleOption = face0IsTri || face1IsTri;
-        } else {
-            useTriangleOption = false;
-        }
-    }
-
-    if (! useTriangleOption) {
-        mask.VertexWeight(0) = 0.25f;
-        mask.VertexWeight(1) = 0.25f;
-
-        if (faceCount == 2) {
-            mask.FaceWeight(0) = 0.25f;
-            mask.FaceWeight(1) = 0.25f;
-        } else {
-            Weight fWeight = 0.5f / (Weight)faceCount;
-            for (int i = 0; i < faceCount; ++i) {
-                mask.FaceWeight(i) = fWeight;
-            }
-        }
-    } else {
-        //
-        //  This mimics the implementation in Hbr in terms of order of operations.
-        //
-        const Weight CATMARK_SMOOTH_TRI_EDGE_WEIGHT = (Weight) 0.470;
-
-        Weight f0Weight = face0IsTri ? CATMARK_SMOOTH_TRI_EDGE_WEIGHT : 0.25f;
-        Weight f1Weight = face1IsTri ? CATMARK_SMOOTH_TRI_EDGE_WEIGHT : 0.25f;
-
-        Weight fWeight = 0.5f * (f0Weight + f1Weight);
-        Weight vWeight = 0.5f * (1.0f - 2.0f * fWeight);
-
-        mask.VertexWeight(0) = vWeight;
-        mask.VertexWeight(1) = vWeight;
-
-        mask.FaceWeight(0) = fWeight;
-        mask.FaceWeight(1) = fWeight;
-    }
-}
-
-
-//
-//  Masks for vertex-vertices:  the hard Corner mask does not need to be specialized
-//  (simply the vertex itself), leaving the Crease and Smooth cases (Dart is smooth):
-//
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_CATMARK>::assignCreaseMaskForVertex(VERTEX const& vertex, MASK& mask,
-                                                  int const creaseEnds[2]) const {
-    typedef typename MASK::Weight Weight;
-
-    int valence = vertex.GetNumEdges();
-
-    mask.SetNumVertexWeights(1);
-    mask.SetNumEdgeWeights(valence);
-    mask.SetNumFaceWeights(0);
-    mask.SetFaceWeightsForFaceCenters(false);
-
-    Weight vWeight = 0.75f;
-    Weight eWeight = 0.125f;
-
-    mask.VertexWeight(0) = vWeight;
-    for (int i = 0; i < valence; ++i) {
-        mask.EdgeWeight(i) = 0.0f;
-    }
-    mask.EdgeWeight(creaseEnds[0]) = eWeight;
-    mask.EdgeWeight(creaseEnds[1]) = eWeight;
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_CATMARK>::assignSmoothMaskForVertex(VERTEX const& vertex, MASK& mask) const {
-
-    typedef typename MASK::Weight Weight;
-
-    //
-    //  A Smooth vertex must be manifold and interior -- manifold boundary vertices will be
-    //  Creases and non-manifold vertices of any kind will be Corners or Creases.  If smooth
-    //  rules for non-manifold vertices are ever defined, this will need adjusting:
-    //
-    assert(vertex.GetNumFaces() == vertex.GetNumEdges());
-
-    int valence = vertex.GetNumFaces();
-
-    mask.SetNumVertexWeights(1);
-    mask.SetNumEdgeWeights(valence);
-    mask.SetNumFaceWeights(valence);
-    mask.SetFaceWeightsForFaceCenters(true);
-
-    Weight vWeight = (Weight)(valence - 2) / (Weight)valence;
-    Weight fWeight = 1.0f / (Weight)(valence * valence);
-    Weight eWeight = fWeight;
-
-    mask.VertexWeight(0) = vWeight;
-    for (int i = 0; i < valence; ++i) {
-        mask.EdgeWeight(i) = eWeight;
-        mask.FaceWeight(i) = fWeight;
-    }
-}
-
-//
-//  Limit masks for position:
-//
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_CATMARK>::assignCornerLimitMask(VERTEX const& /* vertex */, MASK& posMask) const {
-
-    posMask.SetNumVertexWeights(1);
-    posMask.SetNumEdgeWeights(0);
-    posMask.SetNumFaceWeights(0);
-    posMask.SetFaceWeightsForFaceCenters(false);
-
-    posMask.VertexWeight(0) = 1.0f;
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_CATMARK>::assignCreaseLimitMask(VERTEX const& vertex, MASK& posMask,
-                                              int const creaseEnds[2]) const {
-
-    typedef typename MASK::Weight Weight;
-
-    int valence = vertex.GetNumEdges();
-
-    posMask.SetNumVertexWeights(1);
-    posMask.SetNumEdgeWeights(valence);
-    posMask.SetNumFaceWeights(0);
-    posMask.SetFaceWeightsForFaceCenters(false);
-
-    Weight vWeight = (Weight)(2.0 / 3.0);
-    Weight eWeight = (Weight)(1.0 / 6.0);
-
-    posMask.VertexWeight(0) = vWeight;
-    for (int i = 0; i < valence; ++i) {
-        posMask.EdgeWeight(i) = 0.0f;
-    }
-    posMask.EdgeWeight(creaseEnds[0]) = eWeight;
-    posMask.EdgeWeight(creaseEnds[1]) = eWeight;
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_CATMARK>::assignSmoothLimitMask(VERTEX const& vertex, MASK& posMask) const {
-
-    typedef typename MASK::Weight Weight;
-
-    int valence = vertex.GetNumFaces();
-    if (valence == 2) {
-        assignCornerLimitMask(vertex, posMask);
-        return;
-    }
-
-    posMask.SetNumVertexWeights(1);
-    posMask.SetNumEdgeWeights(valence);
-    posMask.SetNumFaceWeights(valence);
-    posMask.SetFaceWeightsForFaceCenters(false);
-
-    //  Specialize for the regular case:
-    if (valence == 4) {
-        Weight fWeight = (Weight)(1.0 / 36.0);
-        Weight eWeight = (Weight)(1.0 /  9.0);
-        Weight vWeight = (Weight)(4.0 /  9.0);
-
-        posMask.VertexWeight(0) = vWeight;
-
-        posMask.EdgeWeight(0) = eWeight;
-        posMask.EdgeWeight(1) = eWeight;
-        posMask.EdgeWeight(2) = eWeight;
-        posMask.EdgeWeight(3) = eWeight;
-
-        posMask.FaceWeight(0) = fWeight;
-        posMask.FaceWeight(1) = fWeight;
-        posMask.FaceWeight(2) = fWeight;
-        posMask.FaceWeight(3) = fWeight;
-    } else {
-        Weight Valence = (Weight) valence;
-
-        Weight fWeight = 1.0f / (Valence * (Valence + 5.0f));
-        Weight eWeight = 4.0f * fWeight;
-        Weight vWeight = 1.0f - Valence * (eWeight + fWeight);
-
-        posMask.VertexWeight(0) = vWeight;
-        for (int i = 0; i < valence; ++i) {
-            posMask.EdgeWeight(i) = eWeight;
-            posMask.FaceWeight(i) = fWeight;
-        }
-    }
-}
-
-//
-//  Limit masks for tangents -- these are stubs for now, or have a temporary
-//  implementation
-//
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_CATMARK>::assignCornerLimitTangentMasks(VERTEX const& vertex,
-        MASK& tan1Mask, MASK& tan2Mask) const {
-
-    int valence = vertex.GetNumEdges();
-
-    tan1Mask.SetNumVertexWeights(1);
-    tan1Mask.SetNumEdgeWeights(valence);
-    tan1Mask.SetNumFaceWeights(0);
-    tan1Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan2Mask.SetNumVertexWeights(1);
-    tan2Mask.SetNumEdgeWeights(valence);
-    tan2Mask.SetNumFaceWeights(0);
-    tan2Mask.SetFaceWeightsForFaceCenters(false);
-
-    //  Should be at least 2 edges -- be sure to clear weights for any more:
-    tan1Mask.VertexWeight(0) = -1.0f;
-    tan1Mask.EdgeWeight(0)   =  1.0f;
-    tan1Mask.EdgeWeight(1)   =  0.0f;
-
-    tan2Mask.VertexWeight(0) = -1.0f;
-    tan2Mask.EdgeWeight(0)   =  0.0f;
-    tan2Mask.EdgeWeight(1)   =  1.0f;
-
-    for (int i = 2; i < valence; ++i) {
-        tan1Mask.EdgeWeight(i) = 0.0f;
-        tan2Mask.EdgeWeight(i) = 0.0f;
-    }
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_CATMARK>::assignCreaseLimitTangentMasks(VERTEX const& vertex,
-        MASK& tan1Mask, MASK& tan2Mask, int const creaseEnds[2]) const {
-
-    constexpr auto kPI = 3.14159265358979323846;
-
-    typedef typename MASK::Weight Weight;
-
-    //
-    //  First, the tangent along the crease:
-    //      The first crease edge is considered the "leading" edge of the span
-    //  of surface for which we are evaluating tangents and the second edge the
-    //  "trailing edge".  By convention, the tangent along the crease is oriented
-    //  in the direction of the leading edge.
-    //
-    int numEdges = vertex.GetNumEdges();
-    int numFaces = vertex.GetNumFaces();
-
-    tan1Mask.SetNumVertexWeights(1);
-    tan1Mask.SetNumEdgeWeights(numEdges);
-    tan1Mask.SetNumFaceWeights(numFaces);
-    tan1Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan1Mask.VertexWeight(0) = 0.0f;
-    for (int i = 0; i < numEdges; ++i) {
-        tan1Mask.EdgeWeight(i) = 0.0f;
-    }
-    for (int i = 0; i < numFaces; ++i) {
-        tan1Mask.FaceWeight(i) = 0.0f;
-    }
-
-    tan1Mask.EdgeWeight(creaseEnds[0]) =  0.5f;
-    tan1Mask.EdgeWeight(creaseEnds[1]) = -0.5f;
-
-    //
-    //  Second, the tangent across the interior faces:
-    //      Note this is ambiguous for an interior vertex.  We currently return
-    //  the tangent for the surface in the counter-clockwise span between the
-    //  leading and trailing edges that form the crease.  Given the expected
-    //  computation of a surface normal as Tan1 X Tan2, this tangent should be
-    //  oriented "inward" from the crease/boundary -- across the surface rather
-    //  than outward and away from it.
-    //
-    tan2Mask.SetNumVertexWeights(1);
-    tan2Mask.SetNumEdgeWeights(numEdges);
-    tan2Mask.SetNumFaceWeights(numFaces);
-    tan2Mask.SetFaceWeightsForFaceCenters(false);
-
-    //  Prepend weights of 0 preceding the crease:
-    for (int i = 0; i < creaseEnds[0]; ++i) {
-        tan2Mask.EdgeWeight(i) = 0.0f;
-        tan2Mask.FaceWeight(i) = 0.0f;
-    }
-
-    //  Assign weights to crease edge and interior points:
-    int interiorEdgeCount = creaseEnds[1] - creaseEnds[0] - 1;
-    if (interiorEdgeCount == 1) {
-        //  The regular case -- uniform B-spline cross-tangent:
-
-        tan2Mask.VertexWeight(0) = (Weight)(-4.0 / 6.0);
-
-        tan2Mask.EdgeWeight(creaseEnds[0])     = (Weight)(-1.0 / 6.0);
-        tan2Mask.EdgeWeight(creaseEnds[0] + 1) = (Weight)( 4.0 / 6.0);
-        tan2Mask.EdgeWeight(creaseEnds[1])     = (Weight)(-1.0 / 6.0);
-
-        tan2Mask.FaceWeight(creaseEnds[0])     = (Weight)(1.0 / 6.0);
-        tan2Mask.FaceWeight(creaseEnds[0] + 1) = (Weight)(1.0 / 6.0);
-    } else if (interiorEdgeCount > 1) {
-        //  The irregular case -- formulae from Biermann et al:
-
-        double k     = (double) (interiorEdgeCount + 1);
-        double theta = kPI / k;
-
-        double cosTheta = std::cos(theta);
-        double sinTheta = std::sin(theta);
-
-        //  Loop/Schaefer use a different divisor here (3*k + cos(theta)):
-        double commonDenom = 1.0f / (k * (3.0f + cosTheta));
-        double R = (cosTheta + 1.0f) / sinTheta;
-
-        double vertexWeight = 4.0f * R * (cosTheta - 1.0f);
-        double creaseWeight = -R * (1.0f + 2.0f * cosTheta);
-
-        tan2Mask.VertexWeight(0) = (Weight) (vertexWeight * commonDenom);
-
-        tan2Mask.EdgeWeight(creaseEnds[0]) = (Weight) (creaseWeight * commonDenom);
-        tan2Mask.EdgeWeight(creaseEnds[1]) = (Weight) (creaseWeight * commonDenom);
-
-        tan2Mask.FaceWeight(creaseEnds[0]) = (Weight) (sinTheta * commonDenom);
-
-        double sinThetaI      = 0.0f;
-        double sinThetaIplus1 = sinTheta;
-        for (int i = 1; i < k; ++i) {
-            sinThetaI      = sinThetaIplus1;
-            sinThetaIplus1 = std::sin((i+1)*theta);
-
-            tan2Mask.EdgeWeight(creaseEnds[0] + i) = (Weight) ((4.0f * sinThetaI) * commonDenom);
-            tan2Mask.FaceWeight(creaseEnds[0] + i) = (Weight) ((sinThetaI + sinThetaIplus1) * commonDenom);
-        }
-    } else {
-        //  Special case for a single face -- simple average of boundary edges:
-
-        tan2Mask.VertexWeight(0) = -6.0f;
-
-        tan2Mask.EdgeWeight(creaseEnds[0]) = 3.0f;
-        tan2Mask.EdgeWeight(creaseEnds[1]) = 3.0f;
-
-        tan2Mask.FaceWeight(creaseEnds[0]) = 0.0f;
-    }
-
-    //  Append weights of 0 following the crease:
-    for (int i = creaseEnds[1]; i < numFaces; ++i) {
-        tan2Mask.FaceWeight(i) = 0.0f;
-    }
-    for (int i = creaseEnds[1] + 1; i < numEdges; ++i) {
-        tan2Mask.EdgeWeight(i) = 0.0f;
-    }
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_CATMARK>::assignSmoothLimitTangentMasks(VERTEX const& vertex,
-        MASK& tan1Mask, MASK& tan2Mask) const {
-
-    constexpr auto kPI = 3.14159265358979323846;
-    typedef typename MASK::Weight Weight;
-
-    int valence = vertex.GetNumFaces();
-    if (valence == 2) {
-        assignCornerLimitTangentMasks(vertex, tan1Mask, tan2Mask);
-        return;
-    }
-
-    //  Compute tan1 initially -- tan2 is simply a rotation:
-    tan1Mask.SetNumVertexWeights(1);
-    tan1Mask.SetNumEdgeWeights(valence);
-    tan1Mask.SetNumFaceWeights(valence);
-    tan1Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan1Mask.VertexWeight(0) = 0.0f;
-
-    if (valence == 4) {
-        tan1Mask.EdgeWeight(0) =  4.0f;
-        tan1Mask.EdgeWeight(1) =  0.0f;
-        tan1Mask.EdgeWeight(2) = -4.0f;
-        tan1Mask.EdgeWeight(3) =  0.0f;
-
-        tan1Mask.FaceWeight(0) =  1.0f;
-        tan1Mask.FaceWeight(1) = -1.0f;
-        tan1Mask.FaceWeight(2) = -1.0f;
-        tan1Mask.FaceWeight(3) =  1.0f;
-    } else {
-        double theta = 2.0f * kPI / (double)valence;
-
-        double cosTheta     = std::cos(theta);
-        double cosHalfTheta = std::cos(theta * 0.5f);
-
-        double lambda = (5.0 / 16.0) + (1.0 / 16.0) *
-                (cosTheta + cosHalfTheta * std::sqrt(2.0f * (9.0f + cosTheta)));
-
-        double edgeWeightScale = 4.0f;
-        double faceWeightScale = 1.0f / (4.0f * lambda - 1.0f);
-
-        for (int i = 0; i < valence; ++i) {
-            double cosThetaI      = std::cos(  i  * theta);
-            double cosThetaIplus1 = std::cos((i+1)* theta);
-
-            tan1Mask.EdgeWeight(i) = (Weight) (edgeWeightScale * cosThetaI);
-            tan1Mask.FaceWeight(i) = (Weight) (faceWeightScale * (cosThetaI + cosThetaIplus1));
-        }
-    }
-
-    //  Now rotate/copy tan1 weights to tan2:
-    tan2Mask.SetNumVertexWeights(1);
-    tan2Mask.SetNumEdgeWeights(valence);
-    tan2Mask.SetNumFaceWeights(valence);
-    tan2Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan2Mask.VertexWeight(0) = 0.0f;
-    if (valence == 4) {
-        tan2Mask.EdgeWeight(0) =  0.0f;
-        tan2Mask.EdgeWeight(1) =  4.0f;
-        tan2Mask.EdgeWeight(2) =  0.0f;
-        tan2Mask.EdgeWeight(3) = -4.0f;
-
-        tan2Mask.FaceWeight(0) =  1.0f;
-        tan2Mask.FaceWeight(1) =  1.0f;
-        tan2Mask.FaceWeight(2) = -1.0f;
-        tan2Mask.FaceWeight(3) = -1.0f;
-    } else {
-        tan2Mask.EdgeWeight(0) = tan1Mask.EdgeWeight(valence-1);
-        tan2Mask.FaceWeight(0) = tan1Mask.FaceWeight(valence-1);
-        for (int i = 1; i < valence; ++i) {
-            tan2Mask.EdgeWeight(i) = tan1Mask.EdgeWeight(i-1);
-            tan2Mask.FaceWeight(i) = tan1Mask.FaceWeight(i-1);
-        }
-    }
-}
-
-} // end namespace sdc
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_SDC_CATMARK_SCHEME_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/crease.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/crease.cpp
deleted file mode 100644
index 8873f21da..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/crease.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../sdc/crease.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Sdc {
-
-//
-//  Declarations of creasing constants and non-inline methods:
-//
-float const Crease::SHARPNESS_SMOOTH   =  0.0f;
-float const Crease::SHARPNESS_INFINITE = 10.0f;
-
-
-//
-//  Creasing queries dependent on sharpness values:
-//
-Crease::Rule
-Crease::DetermineVertexVertexRule(float vertexSharpness, int sharpEdgeCount) const {
-
-    if (IsSharp(vertexSharpness)) return Crease::RULE_CORNER;
-
-    return (sharpEdgeCount > 2) ? Crease::RULE_CORNER : (Crease::Rule)(1 << sharpEdgeCount);
-}
-
-Crease::Rule
-Crease::DetermineVertexVertexRule(float        vertexSharpness,
-                                     int          incidentEdgeCount,
-                                     float const* incidentEdgeSharpness) const {
-
-    if (IsSharp(vertexSharpness)) return Crease::RULE_CORNER;
-
-    int sharpEdgeCount = 0;
-    for (int i = 0; i < incidentEdgeCount; ++i) {
-        sharpEdgeCount += IsSharp(incidentEdgeSharpness[i]);
-    }
-    return (sharpEdgeCount > 2) ? Crease::RULE_CORNER : (Crease::Rule)(1 << sharpEdgeCount);
-}
-
-float
-Crease::ComputeFractionalWeightAtVertex(float        parentVertexSharpness,
-                                           float        childVertexSharpness,
-                                           int          incidentEdgeCount,
-                                           float const* parentSharpness,
-                                           float const* childSharpness) const {
-
-    int   transitionCount = 0;
-    float transitionSum   = 0.0f;
-
-    if (IsSharp(parentVertexSharpness) && IsSmooth(childVertexSharpness)) {
-        transitionCount = 1;
-        transitionSum   = parentVertexSharpness;
-    }
-
-    //
-    //  We need the child-edge sharpness values for non-simple methods to ensure
-    //  that the sharpness went from a non-zero value (potentially greater than
-    //  1.0) to zero...
-    //
-    if (IsUniform() || (childSharpness == 0)) {
-        for (int i = 0; i < incidentEdgeCount; ++i) {
-            if (IsSharp(parentSharpness[i]) && (parentSharpness[i] <= 1.0f)) {
-                transitionSum   += parentSharpness[i];
-                transitionCount ++;
-            }
-        }
-    } else {
-        for (int i = 0; i < incidentEdgeCount; ++i) {
-            if (IsSharp(parentSharpness[i]) && IsSmooth(childSharpness[i])) {
-                transitionSum   += parentSharpness[i];
-                transitionCount ++;
-            }
-        }
-    }
-    if (transitionCount == 0) return 0.0f;
-    float fractionalWeight = transitionSum / (float)transitionCount;
-    return (fractionalWeight > 1.0f) ? 1.0f : fractionalWeight;
-}
-
-//
-//  Subdividing edge sharpness values (vertex sharpness is inline):
-//
-float
-Crease::SubdivideEdgeSharpnessAtVertex(float         edgeSharpness,
-                                       int           incEdgeCountAtVertex,
-                                       float const * incEdgeSharpness) const {
-
-    if (IsUniform() || (incEdgeCountAtVertex < 2)) {
-        return decrementSharpness(edgeSharpness);
-    }
-
-    if (IsSmooth(edgeSharpness)) return Crease::SHARPNESS_SMOOTH;
-    if (IsInfinite(edgeSharpness)) return Crease::SHARPNESS_INFINITE;
-
-    float sharpSum   = 0.0f;
-    int   sharpCount = 0;
-    for (int i = 0; i < incEdgeCountAtVertex; ++i) {
-        if (IsSemiSharp(incEdgeSharpness[i])) {
-            sharpCount ++;
-            sharpSum += incEdgeSharpness[i];
-        }
-    }
-    if (sharpCount > 1) {
-        //  Chaikin rule is 3/4 original sharpness + 1/4 average of the others
-
-        float avgSharpnessAtVertex = (sharpSum - edgeSharpness) / (float)(sharpCount - 1);
-
-        edgeSharpness = (0.75f * edgeSharpness) + (0.25f * avgSharpnessAtVertex);
-    }
-    edgeSharpness -= 1.0f;
-    return IsSharp(edgeSharpness) ? edgeSharpness : Crease::SHARPNESS_SMOOTH;
-}
-
-void
-Crease::SubdivideEdgeSharpnessesAroundVertex(int          edgeCount,
-                                                float const* parentSharpness,
-                                                float *      childSharpness) const {
-
-    if (IsUniform() || (edgeCount < 2)) {
-        for (int i = 0; i < edgeCount; ++i) {
-            childSharpness[i] = decrementSharpness(parentSharpness[i]);
-        }
-        return;
-    }
-
-    //
-    //  Chaikin creasing is most efficiently computed for all edges around a vertex at
-    //  once as the subdivided value for each creased edge depends on the average of
-    //  the other edges around the vertex.  So we can sum up the sharpness around the
-    //  vertex once and use that for each edge, rather than iterating around the vertex
-    //  for each incident edge.
-    //
-    if (_options.GetCreasingMethod() == Options::CREASE_CHAIKIN) {
-        float sharpSum   = 0.0f;
-        int   sharpCount = 0;
-        for (int i = 0; i < edgeCount; ++i) {
-            if (IsSemiSharp(parentSharpness[i])) {
-                sharpCount ++;
-                sharpSum += parentSharpness[i];
-            }
-        }
-
-        //
-        //  The smooth case is most common -- specialize for it first:
-        //
-        if (sharpCount == 0) {
-            for (int i = 0; i < edgeCount; ++i) {
-                childSharpness[i] = parentSharpness[i];
-            }
-        } else {
-            for (int i = 0; i < edgeCount; ++i) {
-                float const& pSharp = parentSharpness[i];
-                float&       cSharp = childSharpness[i];
-
-                if (IsSmooth(pSharp)) {
-                    cSharp = Crease::SHARPNESS_SMOOTH;
-                } else if (IsInfinite(pSharp)) {
-                    cSharp = Crease::SHARPNESS_INFINITE;
-                } else if (sharpCount == 1) {
-                    //  Need special case here anyway to avoid divide by zero below...
-                    cSharp = decrementSharpness(pSharp);
-                } else {
-                    float pOtherAverage = (sharpSum - pSharp) / (float)(sharpCount - 1);
-
-                    //  Chaikin rule is 3/4 original sharpness + 1/4 average of the others
-                    cSharp = ((0.75f * pSharp) + (0.25f * pOtherAverage)) - 1.0f;
-                    if (IsSmooth(cSharp)) cSharp = Crease::SHARPNESS_SMOOTH;
-                }
-            }
-        }
-    }
-}
-
-} // end namespace sdc
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/crease.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/crease.h
deleted file mode 100644
index 2d7fba368..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/crease.h
+++ /dev/null
@@ -1,247 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_SDC_CREASE_H
-#define OPENSUBDIV3_SDC_CREASE_H
-
-#include "../version.h"
-
-#include "../sdc/options.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Sdc {
-
-///
-///  \brief Types, constants and utilities related to semi-sharp creasing -- whose implementation
-///  is independent of the subdivision scheme.
-///
-///  Crease is intended to be a light-weight, trivially constructed class that computes
-///  crease-related properties -- typically sharpness values and associated interpolation
-///  weights.  An instance of Crease is defined with a set of options that include current
-///  and future variations that will impact computations involving sharpness values.
-///
-///  The Crease methods do not use topological neighborhoods as input.  The methods here
-///  rely more on the sharpness values and less on the topology, so we choose to work directly
-///  with the sharpness values.  We also follow the trend of using primitive arrays in the
-///  interface to encourage local gathering for re-use.
-///
-///  Note on the need for and use of sharpness values:
-///      In general, mask queries rely on the sharpness values.  The common case of a smooth
-///  vertex, when known, avoids the need to inspect them, but unless the rules are well understood,
-///  users will be expected to provided them -- particularly when they expect the mask queries
-///  to do all of the work (just determining if a vertex is smooth will require inspection of
-///  incident edge sharpness).
-///      Mask queries will occasionally require the subdivided sharpness values around the
-///  child vertex.  So users will be expected to either provide them up front when known, or to be
-///  gathered on demand.  Any implementation of subdivision with creasing cannot avoid subdividing
-///  the sharpness values first, so keeping them available for re-use is a worthwhile consideration.
-///
-
-class Crease {
-public:
-    //@{
-    ///  Constants and related queries of sharpness values:
-    ///
-    static float const SHARPNESS_SMOOTH;    // =  0.0f, do we really need this?
-    static float const SHARPNESS_INFINITE;  // = 10.0f;
-
-    static bool IsSmooth(float sharpness)    { return sharpness <= SHARPNESS_SMOOTH; }
-    static bool IsSharp(float sharpness)     { return sharpness > SHARPNESS_SMOOTH; }
-    static bool IsInfinite(float sharpness)  { return sharpness >= SHARPNESS_INFINITE; }
-    static bool IsSemiSharp(float sharpness) { return (SHARPNESS_SMOOTH < sharpness) && (sharpness < SHARPNESS_INFINITE); }
-    //@}
-
-    ///
-    ///  Enum for the types of subdivision rules applied based on sharpness values (note these
-    ///  correspond to Hbr's vertex "mask").  The values are assigned to bit positions as it is
-    ///  useful to use bitwise operations to inspect collections of vertices (i.e. all of the
-    ///  vertices incident a particular face).
-    ///
-    enum Rule {
-        RULE_UNKNOWN = 0,
-        RULE_SMOOTH  = (1 << 0),
-        RULE_DART    = (1 << 1),
-        RULE_CREASE  = (1 << 2),
-        RULE_CORNER  = (1 << 3)
-    };
-
-public:
-    Crease() : _options() { }
-    Crease(Options const& options) : _options(options) { }
-    ~Crease() { }
-
-    bool IsUniform() const { return _options.GetCreasingMethod() == Options::CREASE_UNIFORM; }
-
-    //@{
-    ///  Optional sharp features:
-    ///      Since options treat certain topological features as infinitely sharp -- boundaries
-    ///  or (in future) non-manifold features -- sharpness values should be adjusted before use.
-    ///  The following methods will adjust (by return) specific values according to the options
-    ///  applied.
-    ///
-    float SharpenBoundaryEdge(float edgeSharpness) const;
-    float SharpenBoundaryVertex(float edgeSharpness) const;
-
-    //  For future consideration
-    //float SharpenNonManifoldEdge(float edgeSharpness) const;
-    //float SharpenNonManifoldVertex(float edgeSharpness) const;
-    //@}
-
-    //@{
-    ///  Sharpness subdivision:
-    ///      The computation of a Uniform subdivided sharpness value is as follows:
-    ///        - Smooth edges or verts stay Smooth
-    ///        - Sharp edges or verts stay Sharp
-    ///        - semi-sharp edges or verts are decremented by 1.0
-    ///  but for Chaikin (and potentially future non-uniform schemes that improve upon it) the
-    ///  computation is more involved.  In the case of edges in particular, the sharpness of a
-    ///  child edge is determined by the sharpness in the neighborhood of the end vertex
-    ///  corresponding to the child.  For this reason, an alternative to subdividing sharpness
-    ///  that computes all child edges around a vertex is given.
-    ///
-    float SubdivideUniformSharpness(float vertexOrEdgeSharpness) const;
-
-    float SubdivideVertexSharpness(float vertexSharpness) const;
-
-    float SubdivideEdgeSharpnessAtVertex(float        edgeSharpness,
-                                         int          incidentEdgeCountAtEndVertex,
-                                         float const* edgeSharpnessAroundEndVertex) const;
-
-    void SubdivideEdgeSharpnessesAroundVertex(int          incidentEdgeCountAtVertex,
-                                              float const* incidentEdgeSharpnessAroundVertex,
-                                              float*       childEdgesSharpnessAroundVertex) const;
-    //@}
-
-    //@{
-    ///  Rule determination:
-    ///      Mask queries do not require the Rule to be known, it can be determined from
-    ///  the information provided, but it is generally more efficient when the Rule is known
-    ///  and provided.  In particular, the Smooth case dominates and is known to be applicable
-    ///  based on the origin of the vertex without inspection of sharpness.
-    ///
-    Rule DetermineVertexVertexRule(float        vertexSharpness,
-                                   int          incidentEdgeCount,
-                                   float const* incidentEdgeSharpness) const;
-    Rule DetermineVertexVertexRule(float        vertexSharpness,
-                                   int          sharpEdgeCount) const;
-    //@}
-
-    ///  \brief Transitional weighting:
-    ///      When the rules applicable to a parent vertex and its child differ, one or more
-    ///  sharpness values has "decayed" to zero.  Both rules are then applicable and blended
-    ///  by a weight between 0 and 1 that reflects the transition.  Most often this will be
-    ///  a single sharpness value that decays from within the interval [0,1] to zero -- and
-    ///  the weight to apply is exactly that sharpness value -- but more than one may decay,
-    ///  and values > 1 may also decay to 0 in a single step while others within [0,1] may
-    ///  remain > 0.
-    ///      So to properly determine a transitional weight, sharpness values for both the
-    ///  parent and child must be inspected, combined and clamped accordingly.
-    ///
-    float ComputeFractionalWeightAtVertex(float        vertexSharpness,
-                                          float        childVertexSharpness,
-                                          int          incidentEdgeCount,
-                                          float const* incidentEdgeSharpness,
-                                          float const* childEdgesSharpness) const;
-
-    void GetSharpEdgePairOfCrease(float const * incidentEdgeSharpness,
-                                  int           incidentEdgeCount,
-                                  int           sharpEdgePair[2]) const;
-
-    //  Would these really help?  Maybe only need Rules for the vertex-vertex case...
-    //
-    //  Rule DetermineEdgeVertexRule(float parentEdgeSharpness) const;
-    //  Rule DetermineEdgeVertexRule(float childEdge1Sharpness, float childEdge2Sharpness) const;
-
-protected:
-    float decrementSharpness(float sharpness) const;
-
-private:
-    Options _options;
-};
-
-
-//
-//  Inline declarations:
-//
-inline float
-Crease::SharpenBoundaryEdge(float /* edgeSharpness */) const {
-
-    //
-    //  Despite the presence of the BOUNDARY_NONE option, boundary edges are always sharpened.
-    //  Much of the code relies on sharpness to indicate boundaries to avoid the more complex
-    //  topological inspection
-    //
-    return SHARPNESS_INFINITE;
-}
-
-inline float
-Crease::SharpenBoundaryVertex(float vertexSharpness) const {
-
-    return (_options.GetVtxBoundaryInterpolation() == Options::VTX_BOUNDARY_EDGE_AND_CORNER) ?
-            SHARPNESS_INFINITE : vertexSharpness;
-}
-
-inline float
-Crease::decrementSharpness(float sharpness) const {
-
-    if (IsSmooth(sharpness)) return Crease::SHARPNESS_SMOOTH;  // redundant but most common
-    if (IsInfinite(sharpness)) return Crease::SHARPNESS_INFINITE;
-    if (sharpness > 1.0f) return (sharpness - 1.0f);
-    return Crease::SHARPNESS_SMOOTH;
-}
-
-inline float
-Crease::SubdivideUniformSharpness(float vertexOrEdgeSharpness) const {
-
-    return decrementSharpness(vertexOrEdgeSharpness);
-}
-
-inline float
-Crease::SubdivideVertexSharpness(float vertexSharpness) const {
-
-    return decrementSharpness(vertexSharpness);
-}
-
-inline void
-Crease::GetSharpEdgePairOfCrease(float const * incidentEdgeSharpness, int incidentEdgeCount,
-                                 int sharpEdgePair[2]) const {
-
-    //  Only to be called when a crease is present at a vertex -- exactly two sharp
-    //  edges are expected here:
-    //
-    sharpEdgePair[0] = 0;
-    while (IsSmooth(incidentEdgeSharpness[sharpEdgePair[0]])) ++ sharpEdgePair[0];
-
-    sharpEdgePair[1] = incidentEdgeCount - 1;
-    while (IsSmooth(incidentEdgeSharpness[sharpEdgePair[1]])) -- sharpEdgePair[1];
-}
-
-} // end namespace sdc
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_SDC_CREASE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/loopScheme.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/loopScheme.h
deleted file mode 100644
index 2bef6c416..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/loopScheme.h
+++ /dev/null
@@ -1,585 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_SDC_LOOP_SCHEME_H
-#define OPENSUBDIV3_SDC_LOOP_SCHEME_H
-
-#include "../version.h"
-
-#include "../sdc/scheme.h"
-
-#include <cassert>
-#include <cmath>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-namespace Sdc {
-
-constexpr auto kPI = 3.14159265358979323846;
-//constexpr auto kPI_2 = kPI/2.0;
-
-//
-//  Specializations for Sdc::Scheme<SCHEME_LOOP>:
-//
-//
-
-//
-//  Loop traits:
-//
-template <>
-inline Split Scheme<SCHEME_LOOP>::GetTopologicalSplitType() { return SPLIT_TO_TRIS; }
-
-template <>
-inline int Scheme<SCHEME_LOOP>::GetRegularFaceSize() { return 3; }
-
-template <>
-inline int Scheme<SCHEME_LOOP>::GetRegularVertexValence() { return 6; }
-
-template <>
-inline int Scheme<SCHEME_LOOP>::GetLocalNeighborhoodSize() { return 1; }
-
-
-//
-//  Protected methods to assign the two types of masks for an edge-vertex --
-//  Crease and Smooth.
-//
-//  The Crease case does not really need to be specialized, though it may be
-//  preferable to define all explicitly here.
-//
-template <>
-template <typename EDGE, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignCreaseMaskForEdge(EDGE const&, MASK& mask) const
-{
-    mask.SetNumVertexWeights(2);
-    mask.SetNumEdgeWeights(0);
-    mask.SetNumFaceWeights(0);
-    mask.SetFaceWeightsForFaceCenters(false);
-
-    mask.VertexWeight(0) = 0.5f;
-    mask.VertexWeight(1) = 0.5f;
-}
-
-template <>
-template <typename EDGE, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignSmoothMaskForEdge(EDGE const& edge, MASK& mask) const
-{
-    int faceCount = edge.GetNumFaces();
-
-    mask.SetNumVertexWeights(2);
-    mask.SetNumEdgeWeights(0);
-    mask.SetNumFaceWeights(faceCount);
-    mask.SetFaceWeightsForFaceCenters(false);
-
-    //
-    //  This is where we run into the issue of "face weights" -- we want to weight the
-    //  face-centers for Catmark, but face-centers are not generated for Loop.  So do
-    //  we make assumptions on how the mask is used, assign some property to the mask
-    //  to indicate how they were assigned, or take input from the mask itself?
-    //
-    //  Regardless, we have two choices:
-    //      - face-weights are for the vertices opposite the edge (as in Hbr):
-    //          vertex weights = 0.375f;
-    //          face weights   = 0.125f;
-    //
-    //      - face-weights are for the face centers:
-    //          vertex weights = 0.125f;
-    //          face weights   = 0.375f;
-    //
-    //  Coincidentally the coefficients are the same but reversed.
-    //
-    typedef typename MASK::Weight Weight;
-
-    Weight vWeight = mask.AreFaceWeightsForFaceCenters() ? 0.125f : 0.375f;
-    Weight fWeight = mask.AreFaceWeightsForFaceCenters() ? 0.375f : 0.125f;
-
-    mask.VertexWeight(0) = vWeight;
-    mask.VertexWeight(1) = vWeight;
-
-    if (faceCount == 2) {
-        mask.FaceWeight(0) = fWeight;
-        mask.FaceWeight(1) = fWeight;
-    } else {
-        //  The non-manifold case is not clearly defined -- we adjust the above
-        //  face-weight to preserve the ratio of edge-center and face-centers:
-        fWeight *= 2.0f / (Weight) faceCount;
-        for (int i = 0; i < faceCount; ++i) {
-            mask.FaceWeight(i) = fWeight;
-        }
-    }
-}
-
-
-//
-//  Protected methods to assign the three types of masks for a vertex-vertex --
-//  Corner, Crease and Smooth (Dart is the same as Smooth).
-//
-//  Corner and Crease do not really need to be specialized, though it may be
-//  preferable to define all explicitly here.
-//
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignCornerMaskForVertex(VERTEX const&, MASK& mask) const
-{
-    mask.SetNumVertexWeights(1);
-    mask.SetNumEdgeWeights(0);
-    mask.SetNumFaceWeights(0);
-    mask.SetFaceWeightsForFaceCenters(false);
-
-    mask.VertexWeight(0) = 1.0f;
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignCreaseMaskForVertex(VERTEX const& vertex, MASK& mask,
-                                               int const creaseEnds[2]) const {
-    typedef typename MASK::Weight Weight;
-
-    int valence = vertex.GetNumEdges();
-
-    mask.SetNumVertexWeights(1);
-    mask.SetNumEdgeWeights(valence);
-    mask.SetNumFaceWeights(0);
-    mask.SetFaceWeightsForFaceCenters(false);
-
-    Weight vWeight = 0.75f;
-    Weight eWeight = 0.125f;
-
-    mask.VertexWeight(0) = vWeight;
-    for (int i = 0; i < valence; ++i) {
-        mask.EdgeWeight(i) = 0.0f;
-    }
-    mask.EdgeWeight(creaseEnds[0]) = eWeight;
-    mask.EdgeWeight(creaseEnds[1]) = eWeight;
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignSmoothMaskForVertex(VERTEX const& vertex, MASK& mask) const
-{
-    typedef typename MASK::Weight Weight;
-
-    int valence = vertex.GetNumFaces();
-
-    mask.SetNumVertexWeights(1);
-    mask.SetNumEdgeWeights(valence);
-    mask.SetNumFaceWeights(0);
-    mask.SetFaceWeightsForFaceCenters(false);
-
-    //  Specialize for the regular case:  1/16 per edge-vert, 5/8 for the vert itself:
-    Weight eWeight = (Weight) 0.0625f;
-    Weight vWeight = (Weight) 0.625f;
-
-    if (valence != 6) {
-        //  From HbrLoopSubdivision<T>::Subdivide(mesh, vertex):
-        //     - could use some lookup tables here for common irregular valence (5, 7, 8)
-        //       or all of these cosine calls will be adding up...
-
-        double dValence   = (double) valence;
-        double invValence = 1.0f / dValence;
-        double cosTheta   = std::cos(kPI * 2.0f * invValence);
-
-        double beta = 0.25f * cosTheta + 0.375f;
-
-        eWeight = (Weight) ((0.625f - (beta * beta)) * invValence);
-        vWeight = (Weight) (1.0f - (eWeight * dValence));
-    }
-
-    mask.VertexWeight(0) = vWeight;
-    for (int i = 0; i < valence; ++i) {
-        mask.EdgeWeight(i) = eWeight;
-    }
-}
-
-
-//
-//  Limit masks for position:
-//
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignCornerLimitMask(VERTEX const& /* vertex */, MASK& posMask) const {
-
-    posMask.SetNumVertexWeights(1);
-    posMask.SetNumEdgeWeights(0);
-    posMask.SetNumFaceWeights(0);
-    posMask.SetFaceWeightsForFaceCenters(false);
-
-    posMask.VertexWeight(0) = 1.0f;
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignCreaseLimitMask(VERTEX const& vertex, MASK& posMask,
-                                           int const creaseEnds[2]) const {
-
-    typedef typename MASK::Weight Weight;
-
-    int valence = vertex.GetNumEdges();
-
-    posMask.SetNumVertexWeights(1);
-    posMask.SetNumEdgeWeights(valence);
-    posMask.SetNumFaceWeights(0);
-    posMask.SetFaceWeightsForFaceCenters(false);
-
-    //
-    //  The refinement mask for a crease vertex is (1/8, 3/4, 1/8) and for a crease
-    //  edge is (1/2, 1/2) -- producing a uniform B-spline curve along the crease
-    //  (boundary) whether the vertex or its crease is regular or not.  The limit
-    //  mask is therefore (1/6, 2/3, 1/6) for ALL cases.
-    //
-    //  An alternative limit mask (1/5, 3/5, 1/5) is often published for use either
-    //  for irregular crease vertices or for all crease/boundary vertices, but this
-    //  is based on an alternate refinement mask for the edge -- (3/8, 5/8) versus
-    //  the usual (1/2, 1/2) -- and will not produce the B-spline curve desired.
-    //
-    Weight vWeight = (Weight) (4.0 / 6.0);
-    Weight eWeight = (Weight) (1.0 / 6.0);
-
-    posMask.VertexWeight(0) = vWeight;
-    for (int i = 0; i < valence; ++i) {
-        posMask.EdgeWeight(i) = 0.0f;
-    }
-    posMask.EdgeWeight(creaseEnds[0]) = eWeight;
-    posMask.EdgeWeight(creaseEnds[1]) = eWeight;
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignSmoothLimitMask(VERTEX const& vertex, MASK& posMask) const {
-
-    typedef typename MASK::Weight Weight;
-
-    int valence = vertex.GetNumFaces();
-
-    posMask.SetNumVertexWeights(1);
-    posMask.SetNumEdgeWeights(valence);
-    posMask.SetNumFaceWeights(0);
-    posMask.SetFaceWeightsForFaceCenters(false);
-
-    //  Specialize for the regular case:  1/12 per edge-vert, 1/2 for the vert itself:
-    if (valence == 6) {
-        Weight eWeight = (Weight) (1.0 / 12.0);
-        Weight vWeight = 0.5f;
-
-        posMask.VertexWeight(0) = vWeight;
-
-        posMask.EdgeWeight(0) = eWeight;
-        posMask.EdgeWeight(1) = eWeight;
-        posMask.EdgeWeight(2) = eWeight;
-        posMask.EdgeWeight(3) = eWeight;
-        posMask.EdgeWeight(4) = eWeight;
-        posMask.EdgeWeight(5) = eWeight;
-
-    } else {
-        double dValence   = (double) valence;
-        double invValence = 1.0f / dValence;
-        double cosTheta   = std::cos(kPI * 2.0f * invValence);
-
-        double beta  = 0.25f * cosTheta + 0.375f;
-        double gamma = (0.625f - (beta * beta)) * invValence;
-
-        Weight eWeight = (Weight) (1.0f / (dValence + 3.0f / (8.0f * gamma)));
-        Weight vWeight = (Weight) (1.0f - (eWeight * dValence));
-
-        posMask.VertexWeight(0) = vWeight;
-        for (int i = 0; i < valence; ++i) {
-            posMask.EdgeWeight(i) = eWeight;
-        }
-    }
-}
-
-/*
-//  Limit masks for tangents:
-//
-//  A note on tangent magnitudes:
-//
-//  Several formulae exist for limit tangents at a vertex to accommodate the
-//  different topological configurations around the vertex.  While these produce
-//  the desired direction, there is inconsistency in the resulting magnitudes.
-//  Ideally a regular mesh of uniformly shaped triangles with similar edge lengths
-//  should produce tangents of similar magnitudes throughout -- including corners
-//  and boundaries.  So some of the common formulae for these are adjusted with
-//  scale factors.
-//
-//  For uses where magnitude does not matter, this scaling should be irrelevant.
-//  But just as with patches, where the magnitudes of partial derivatives are
-//  consistent between similar patches, the magnitudes of limit tangents should
-//  also be similar.
-//
-//  The reference tangents, in terms of magnitudes, are those produced by the
-//  limit tangent mask for smooth interior vertices, for which well established
-//  sin/cos formulae apply -- these remain unscaled.  Formulae for the other
-//  crease/boundary, corner tangents and irregular cases are scaled to be more
-//  consistent with these.
-//
-//  The crease/boundary tangents for the regular case can be viewed as derived
-//  from the smooth interior masks with two "phantom" points extrapolated across
-//  the regular boundary:
-//
-//            v3           v2          
-//             X - - - - - X
-//           /   \       /   \
-//         /       \   /       \
-//   v4  X - - - - - X - - - - - X  v1
-//         .       . 0 .       .
-//           .   .       .   .
-//             .   .   .   .
-//           (v5)         (v6)
-//
-//  where v5 = v0 + (v4 - v3) and v6 = v0 + v1 - v2.
-//
-//  When the standard limit tangent mask is applied, the cosines of increments
-//  of pi/3 give us coefficients that are multiples of 1/2, leading to the first
-//  tangent T1 = 3/2 * (v1 - v4), rather than the widely used T1 = v1 - v4.  So
-//  this scale factor of 3/2 is applied to ensure tangents along the boundaries
-//  are of similar magnitude as tangents in the immediate interior (which may be
-//  parallel).
-//
-//  Tangents at corners are essentially a form of boundary tangent, and so its
-//  simple difference formula is scaled to be consistent with adjoining boundary
-//  tangents -- not just with the 3/2 factor from above, but with an additional
-//  2.0 to compensate for the fact that the difference of only side of the vertex
-//  is considered here.  The resulting scale factor of 3.0 for the regular corner
-//  is what similarly arises by extrapolating an interior region around the
-//  vertex and using the interior mask for the first tangent.
-//
-//  The cross-tangent formula for the regular crease/boundary is similarly found
-//  from the above construction of the boundary, but the commonly used weights of
-//  +/- 1 and 2 result from omitting the common factor of sqrt(3)/2 (arising from
-//  the sines of increments of pi/3).  With that scale factor close to one, it has
-//  less impact than the irregular cases, which are analogous to corner tangents
-//  in that differences on only one side of the vertex are considered.  While a
-//  scaling of 3.0 is similarly understandable for the valence 2 and 3 cases, it is
-//  less obvious in the irregular formula for valence > 4, but similarly effective.
-//
-//  The end result of these adjustments should be a set of limit tangents that are
-//  of similar magnitude over a regular mesh including boundaries and corners.
-*/
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignCornerLimitTangentMasks(VERTEX const& vertex,
-        MASK& tan1Mask, MASK& tan2Mask) const {
-
-    int valence = vertex.GetNumEdges();
-
-    tan1Mask.SetNumVertexWeights(1);
-    tan1Mask.SetNumEdgeWeights(valence);
-    tan1Mask.SetNumFaceWeights(0);
-    tan1Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan2Mask.SetNumVertexWeights(1);
-    tan2Mask.SetNumEdgeWeights(valence);
-    tan2Mask.SetNumFaceWeights(0);
-    tan2Mask.SetFaceWeightsForFaceCenters(false);
-
-    //  See note above regarding scale factor of 3.0:
-    tan1Mask.VertexWeight(0) = -3.0f;
-    tan1Mask.EdgeWeight(0)   =  3.0f;
-    tan1Mask.EdgeWeight(1)   =  0.0f;
-
-    tan2Mask.VertexWeight(0) = -3.0f;
-    tan2Mask.EdgeWeight(0)   =  0.0f;
-    tan2Mask.EdgeWeight(1)   =  3.0f;
-
-    //  Should be at least 2 edges -- be sure to clear weights for any more:
-    for (int i = 2; i < valence; ++i) {
-        tan1Mask.EdgeWeight(i) = 0.0f;
-        tan2Mask.EdgeWeight(i) = 0.0f;
-    }
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignCreaseLimitTangentMasks(VERTEX const& vertex,
-        MASK& tan1Mask, MASK& tan2Mask, int const creaseEnds[2]) const {
-
-    typedef typename MASK::Weight Weight;
-
-    //
-    //  First, the tangent along the crease:
-    //      The first crease edge is considered the "leading" edge of the span
-    //  of surface for which we are evaluating tangents and the second edge the
-    //  "trailing edge".  By convention, the tangent along the crease is oriented
-    //  in the direction of the leading edge.
-    //
-    int valence = vertex.GetNumEdges();
-
-    tan1Mask.SetNumVertexWeights(1);
-    tan1Mask.SetNumEdgeWeights(valence);
-    tan1Mask.SetNumFaceWeights(0);
-    tan1Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan1Mask.VertexWeight(0) = 0.0f;
-    for (int i = 0; i < valence; ++i) {
-        tan1Mask.EdgeWeight(i) = 0.0f;
-    }
-
-    //  See the note above regarding scale factor of 1.5:
-    tan1Mask.EdgeWeight(creaseEnds[0]) =  1.5f;
-    tan1Mask.EdgeWeight(creaseEnds[1]) = -1.5f;
-
-    //
-    //  Second, the tangent across the interior faces:
-    //      Note this is ambiguous for an interior vertex.  We currently return
-    //  the tangent for the surface in the counter-clockwise span between the
-    //  leading and trailing edges that form the crease.  Given the expected
-    //  computation of a surface normal as Tan1 X Tan2, this tangent should be
-    //  oriented "inward" from the crease/boundary -- across the surface rather
-    //  than outward and away from it.
-    //
-    //  There is inconsistency in the orientation of this tangent in commonly
-    //  published results:  the general formula provided for arbitrary valence
-    //  has the tangent pointing across the crease and "outward" from the surface,
-    //  while the special cases for regular valence and lower have the tangent
-    //  pointing across the surface and "inward" from the crease.  So if we are
-    //  to consistently orient the first tangent along the crease, regardless of
-    //  the interior topology, we have to correct this.  With the first tangent
-    //  following the direction of the leading crease edge, we want the second
-    //  tangent pointing inward/across the surface -- so we flip the result of
-    //  the general formula.
-    //
-    tan2Mask.SetNumVertexWeights(1);
-    tan2Mask.SetNumEdgeWeights(valence);
-    tan2Mask.SetNumFaceWeights(0);
-    tan2Mask.SetFaceWeightsForFaceCenters(false);
-
-    for (int i = 0; i < creaseEnds[0]; ++i) {
-        tan2Mask.EdgeWeight(i) = 0.0f;
-    }
-    int interiorEdgeCount = creaseEnds[1] - creaseEnds[0] - 1;
-    if (interiorEdgeCount == 2) {
-        //  See note above regarding scale factor of (sin(60 degs) == sqrt(3)/2:
-
-        static Weight const Root3    = (Weight) 1.73205080756887729352;
-        static Weight const Root3by2 = (Weight) (Root3 * 0.5);
-
-        tan2Mask.VertexWeight(0) = -Root3;
-
-        tan2Mask.EdgeWeight(creaseEnds[0]) = -Root3by2;
-        tan2Mask.EdgeWeight(creaseEnds[1]) = -Root3by2;
-
-        tan2Mask.EdgeWeight(creaseEnds[0] + 1) = Root3;
-        tan2Mask.EdgeWeight(creaseEnds[0] + 2) = Root3;
-    } else if (interiorEdgeCount > 2) {
-        //  See notes above regarding scale factor of -3.0 (-1 for orientation,
-        //  2.0 for considering the region as a half-disk, and 1.5 in keeping
-        //  with the crease tangent):
-
-        double theta = kPI / (interiorEdgeCount + 1);
-
-        tan2Mask.VertexWeight(0) = 0.0f;
-
-        Weight cWeight = (Weight) (-3.0f * std::sin(theta));
-        tan2Mask.EdgeWeight(creaseEnds[0]) = cWeight;
-        tan2Mask.EdgeWeight(creaseEnds[1]) = cWeight;
-
-        double eCoeff  = -3.0f * 2.0f * (std::cos(theta) - 1.0f);
-        for (int i = 1; i <= interiorEdgeCount; ++i) {
-            tan2Mask.EdgeWeight(creaseEnds[0] + i) = (Weight) (eCoeff * std::sin(i * theta));
-        }
-    } else if (interiorEdgeCount == 1) {
-        //  See notes above regarding scale factor of 3.0:
-
-        tan2Mask.VertexWeight(0) = -3.0f;
-
-        tan2Mask.EdgeWeight(creaseEnds[0]) = 0.0f;
-        tan2Mask.EdgeWeight(creaseEnds[1]) = 0.0f;
-
-        tan2Mask.EdgeWeight(creaseEnds[0] + 1) = 3.0f;
-    } else {
-        //  See notes above regarding scale factor of 3.0:
-
-        tan2Mask.VertexWeight(0) = -6.0f;
-
-        tan2Mask.EdgeWeight(creaseEnds[0]) = 3.0f;
-        tan2Mask.EdgeWeight(creaseEnds[1]) = 3.0f;
-    }
-    for (int i = creaseEnds[1] + 1; i < valence; ++i) {
-        tan2Mask.EdgeWeight(i) = 0.0f;
-    }
-}
-
-template <>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME_LOOP>::assignSmoothLimitTangentMasks(VERTEX const& vertex,
-        MASK& tan1Mask, MASK& tan2Mask) const {
-
-    typedef typename MASK::Weight Weight;
-
-    int valence = vertex.GetNumFaces();
-
-    tan1Mask.SetNumVertexWeights(1);
-    tan1Mask.SetNumEdgeWeights(valence);
-    tan1Mask.SetNumFaceWeights(0);
-    tan1Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan2Mask.SetNumVertexWeights(1);
-    tan2Mask.SetNumEdgeWeights(valence);
-    tan2Mask.SetNumFaceWeights(0);
-    tan2Mask.SetFaceWeightsForFaceCenters(false);
-
-    tan1Mask.VertexWeight(0) = 0.0f;
-    tan2Mask.VertexWeight(0) = 0.0f;
-
-    if (valence == 6) {
-        static Weight const Root3by2 = (Weight)(0.5 * 1.73205080756887729352);
-
-        tan1Mask.EdgeWeight(0) =  1.0f;
-        tan1Mask.EdgeWeight(1) =  0.5f;
-        tan1Mask.EdgeWeight(2) = -0.5f;
-        tan1Mask.EdgeWeight(3) = -1.0f;
-        tan1Mask.EdgeWeight(4) = -0.5f;
-        tan1Mask.EdgeWeight(5) =  0.5f;
-
-        tan2Mask.EdgeWeight(0) =  0.0f;
-        tan2Mask.EdgeWeight(1) =  Root3by2;
-        tan2Mask.EdgeWeight(2) =  Root3by2;
-        tan2Mask.EdgeWeight(3) =  0.0f;
-        tan2Mask.EdgeWeight(4) = -Root3by2;
-        tan2Mask.EdgeWeight(5) = -Root3by2;
-    } else {
-        double alpha = 2.0f * kPI / valence;
-        for (int i = 0; i < valence; ++i) {
-            double alphaI = alpha * i;
-            tan1Mask.EdgeWeight(i) = (Weight) std::cos(alphaI);
-            tan2Mask.EdgeWeight(i) = (Weight) std::sin(alphaI);
-        }
-    }
-}
-
-} // end namespace Sdc
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_SDC_LOOP_SCHEME_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/options.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/options.h
deleted file mode 100644
index fd4a1dff0..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/options.h
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_SDC_OPTIONS_H
-#define OPENSUBDIV3_SDC_OPTIONS_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Sdc {
-
-///
-///  \brief All supported options applying to subdivision scheme.
-///
-///  The Options class contains all supported options that can be applied to a
-///  subdivision scheme to affect the shape of the limit surface.  These differ from
-///  approximations that may be applied at a higher level, i.e. options to limit the
-///  level of feature adaptive subdivision, options to ignore fractional creasing,
-///  or creasing entirely, etc. These options define the shape of a particular
-///  limit surface, including the "shape" of primitive variable data associated with
-///  it.
-///
-///  The intent is that these sets of options be defined at a high level and
-///  propagated into the lowest-level computation in support of each subdivision
-///  scheme.  Ideally it remains a set of bit-fields (essentially an int) and so
-///  remains light weight and easily passed around by value.
-///
-
-class Options {
-public:
-    enum VtxBoundaryInterpolation {
-        VTX_BOUNDARY_NONE = 0,        ///< no boundary interpolation, except where
-                                      ///< boundary edges were explicitly sharpened
-        VTX_BOUNDARY_EDGE_ONLY,       ///< all boundary edges sharpened and interpolated
-        VTX_BOUNDARY_EDGE_AND_CORNER  ///< all boundary edges and corner vertices
-                                      ///< sharpened and interpolated
-    };
-    enum FVarLinearInterpolation {
-        FVAR_LINEAR_NONE = 0,         ///< smooth everywhere ("edge only")
-        FVAR_LINEAR_CORNERS_ONLY,     ///< sharpen corners only
-        FVAR_LINEAR_CORNERS_PLUS1,    ///< ("edge corner")
-        FVAR_LINEAR_CORNERS_PLUS2,    ///< ("edge and corner + propagate corner")
-        FVAR_LINEAR_BOUNDARIES,       ///< sharpen all boundaries ("always sharp")
-        FVAR_LINEAR_ALL               ///< bilinear interpolation ("bilinear")
-    };
-    enum CreasingMethod {
-        CREASE_UNIFORM = 0,           ///< Catmark rule
-        CREASE_CHAIKIN                ///< Chaikin rule
-    };
-    enum TriangleSubdivision {
-        TRI_SUB_CATMARK = 0,          ///< Catmark weights (Catmark scheme only)
-        TRI_SUB_SMOOTH                ///< "smooth triangle" weights (Catmark scheme only)
-    };
-
-public:
-
-    Options() : _vtxBoundInterp(VTX_BOUNDARY_NONE),
-                _fvarLinInterp(FVAR_LINEAR_ALL),
-                _creasingMethod(CREASE_UNIFORM),
-                _triangleSub(TRI_SUB_CATMARK) { }
-
-    //
-    //  Trivial get/set methods:
-    //
-
-    /// \brief Get vertex boundary interpolation rule
-    VtxBoundaryInterpolation GetVtxBoundaryInterpolation() const { return (VtxBoundaryInterpolation) _vtxBoundInterp; }
-
-    /// \brief Set vertex boundary interpolation rule
-    void SetVtxBoundaryInterpolation(VtxBoundaryInterpolation b) { _vtxBoundInterp = (EnumIntType) b; }
-
-    /// \brief Get face-varying interpolation rule
-    FVarLinearInterpolation GetFVarLinearInterpolation() const { return (FVarLinearInterpolation) _fvarLinInterp; }
-
-    /// \brief Set face-varying interpolation rule
-    void SetFVarLinearInterpolation(FVarLinearInterpolation b) { _fvarLinInterp = (EnumIntType) b; }
-
-    /// \brief Get edge crease rule
-    CreasingMethod GetCreasingMethod() const { return (CreasingMethod) _creasingMethod; }
-
-    /// \brief Set edge crease rule
-    void SetCreasingMethod(CreasingMethod c) { _creasingMethod = (EnumIntType) c; }
-
-    /// \brief Get triangle subdivision weights rule (Catmark scheme only !)
-    TriangleSubdivision GetTriangleSubdivision() const { return (TriangleSubdivision) _triangleSub; }
-
-    /// \brief Set triangle subdivision weights rule (Catmark scheme only !)
-    void SetTriangleSubdivision(TriangleSubdivision t) { _triangleSub = (EnumIntType) t; }
-
-private:
-    //  Use a small integer type to pack these rather than bitfields:
-    typedef unsigned char EnumIntType;
-
-    EnumIntType _vtxBoundInterp;
-    EnumIntType _fvarLinInterp;
-    EnumIntType _creasingMethod;
-    EnumIntType _triangleSub;
-};
-
-} // end namespace sdc
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_SDC_OPTIONS_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/scheme.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/scheme.h
deleted file mode 100644
index 530cf6e37..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/scheme.h
+++ /dev/null
@@ -1,660 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_SDC_SCHEME_H
-#define OPENSUBDIV3_SDC_SCHEME_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-#include "../sdc/options.h"
-#include "../sdc/crease.h"
-
-#include <cassert>
-#include <cstdlib>
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Sdc {
-
-///
-///  \brief Scheme is a class template which provides all implementation for the
-///  subdivision schemes supported by OpenSubdiv through specializations of the
-///  methods of each.  An instance of Scheme<SCHEME_TYPE> includes a set of Options
-///  that will dictate the variable aspects of its behavior.  
-///  
-///  The primary purpose of Scheme is to provide the mask weights for vertices
-///  generated by subdivision.  Methods to determine the masks are given topological
-///  neighborhoods from which to compute the appropriate weights for neighboring
-///  components.  While these neighborhoods may require sharpness values for
-///  creasing, the computation of subdivided crease values is independent of the
-///  scheme type and is also made available through the Crease class. 
-///
-///  Mask queries are assisted by two utility classes -- a Neighborhood class
-///  defining the set of relevant data in the topological neighborhood of the vertex
-///  being subdivided, and a Mask class into which the associated mask weights will
-///  be stored.  Depending on where and how these queries are used, more or less
-///  information may be available.  See the details of the Neighborhood classes as
-///  appropriate initialization of them is critical.  It is generally best to
-///  initialize them with what data is known and accessible for immediate and
-///  efficient retrieval, but subclasses can be created to gather it lazily if
-///  desired.  
-///
-template <SchemeType SCHEME_TYPE>
-class Scheme {
-
-public:
-
-    Scheme() : _options() { }
-
-    Scheme(Options const& options) : _options(options) { }
-
-    Options GetOptions() const { return _options; }
-    void    SetOptions(const Options& newOptions) { _options = newOptions; }
-
-    ///
-    ///  \brief Face-vertex masks - trivial for all current schemes
-    ///
-    template <typename FACE, typename MASK>
-    void ComputeFaceVertexMask(FACE const& faceNeighborhood, MASK& faceVertexMask) const;
-
-    ///
-    ///  \brief Edge-vertex masks
-    ///      If known, the Rule for the edge and/or the derived vertex can be specified to
-    ///  accelerate the computation (though the Rule for the parent is trivially determined).
-    ///  In particular, knowing the child rule can avoid the need to subdivide the sharpness
-    ///  of the edge to see if it is a transitional crease that warrants fractional blending.
-    ///
-    ///  Whether to use the "Rules" in this interface is really debatable -- the parent Rule
-    ///  is really based on the edge and its sharpness, while the child Rule is technically
-    ///  based on the neighborhood of the child vertex, but it can be deduced from the two
-    ///  child edges' sharpness.  So the Crease methods used to compute these rules differ
-    ///  from those for the vertex-vertex mask.  Perhaps a simple pair of new methods for
-    ///  Crease should be added specific to the edge-vertex case, i.e. one that takes a
-    ///  single sharpness (for the parent rule) and one that takes a pair (for the child).
-    ///
-    template <typename EDGE, typename MASK>
-    void ComputeEdgeVertexMask(EDGE const& edgeNeighborhood, MASK& edgeVertexMask,
-                               Crease::Rule parentRule = Crease::RULE_UNKNOWN,
-                               Crease::Rule childRule = Crease::RULE_UNKNOWN) const;
-
-    ///
-    ///  \brief Vertex-vertex masks
-    ///      If known, a single Rule or pair of Rules can be specified (indicating a crease
-    ///  transition) to accelerate the computation.  Either no Rules, the first, or both should
-    ///  be specified.  Specification of only the first Rule implies it to be true for both
-    ///  (wish the compiler would allow such default value specification), i.e. no transition.
-    ///  The case of knowing the parent Rule but deferring determination of the child Rule to
-    ///  this method is not supported.
-    ///
-    template <typename VERTEX, typename MASK>
-    void ComputeVertexVertexMask(VERTEX const& vertexNeighborhood, MASK& vertexVertexMask,
-                                    Crease::Rule parentRule = Crease::RULE_UNKNOWN,
-                                    Crease::Rule childRule = Crease::RULE_UNKNOWN) const;
-
-    ///
-    ///  \brief Limit masks for vertices -- position and tangents
-    ///      These presume that a vertex is suitably isolated for its limit to be well-defined
-    ///  and, unlike the refinement masks, the subdivision Rule for the vertex (presumably at
-    ///  its last level of refinement) is required rather than being optional.  In the
-    ///  presence of semi-sharp creasing that has not decayed to zero, the limit is neither
-    ///  sharp nor smooth -- in such cases the Rule specified by the caller determines the
-    ///  result.
-    ///
-    ///  For tangent masks, the direction of the first tangent (T1) is oriented towards the
-    ///  leading edge of the vertex, i.e. the first incident edge of the vertex (beginning
-    ///  the set of incident edges in counter-clockwise order).  The second tangent (T2) lies
-    ///  within the tangent plane such that its normal can be computed as T1 x T2.  So for a
-    ///  boundary vertex, T1 will point along the boundary in the direction of the leading
-    ///  edge while T2 points inward across the limit surface.
-    ///
-    ///  As for magnitude, no assumptions should be made of the magnitudes of the resulting
-    ///  tangent vectors.  Common formulae often factor out scale factors that contribute to
-    ///  magnitude.  While some attempt has been made to make magnitudes more consistent
-    ///  between regular corners, boundaries and the interior, the same has not been done at
-    ///  irregular vertices -- at least not yet.  This may be addressed in future, as having
-    ///  consistent magnitudes returned here can aid in the construction of patches from
-    ///  limit positions and tangents.
-    ///
-    template <typename VERTEX, typename MASK>
-    void ComputeVertexLimitMask(VERTEX const& vertexNeighborhood, MASK& positionMask,
-                                Crease::Rule vertexRule) const;
-
-    template <typename VERTEX, typename MASK>
-    void ComputeVertexLimitMask(VERTEX const& vertexNeighborhood, MASK& positionMask,
-                                MASK& tangent1Mask, MASK& tangent2Mask,
-                                Crease::Rule vertexRule) const;
-
-    //
-    //  Static methods defining traits/properties of the scheme:
-    //
-    static Split GetTopologicalSplitType();
-    static int   GetRegularFaceSize();
-    static int   GetRegularVertexValence();
-    static int   GetLocalNeighborhoodSize();
-
-protected:
-
-    //
-    //  Supporting internal methods -- optionally implemented, depending on specialization:
-    //
-
-    //  Subdivision/refinement masks -- two for edge-vertices and three for vertex-vertices:
-    //
-    template <typename EDGE, typename MASK>
-    void assignCreaseMaskForEdge(EDGE const& edge, MASK& mask) const;
-    template <typename EDGE, typename MASK>
-    void assignSmoothMaskForEdge(EDGE const& edge, MASK& mask) const;
-
-    template <typename VERTEX, typename MASK>
-    void assignCornerMaskForVertex(VERTEX const& edge, MASK& mask) const;
-    template <typename VERTEX, typename MASK>
-    void assignCreaseMaskForVertex(VERTEX const& edge, MASK& mask, int const creaseEnds[2]) const;
-    template <typename VERTEX, typename MASK>
-    void assignSmoothMaskForVertex(VERTEX const& edge, MASK& mask) const;
-
-    //
-    //  Limit masks for position and tangents at vertices -- three cases for each:
-    //
-    template <typename VERTEX, typename MASK>
-    void assignCornerLimitMask(VERTEX const& vertex, MASK& pos) const;
-    template <typename VERTEX, typename MASK>
-    void assignCreaseLimitMask(VERTEX const& vertex, MASK& pos, int const creaseEnds[2]) const;
-    template <typename VERTEX, typename MASK>
-    void assignSmoothLimitMask(VERTEX const& vertex, MASK& pos) const;
-
-    template <typename VERTEX, typename MASK>
-    void assignCornerLimitTangentMasks(VERTEX const& vertex, MASK& tan1, MASK& tan2) const;
-    template <typename VERTEX, typename MASK>
-    void assignCreaseLimitTangentMasks(VERTEX const& vertex, MASK& tan1, MASK& tan2, int const creaseEnds[2]) const;
-    template <typename VERTEX, typename MASK>
-    void assignSmoothLimitTangentMasks(VERTEX const& vertex, MASK& tan1, MASK& tan2) const;
-
-private:
-    Options _options;
-
-protected:
-
-    //
-    //  Internal implementation support:
-    //
-    //  We need a local "mask" class to be declared locally within the vertex-vertex mask query
-    //  to hold one of the two possible masks required and to combine the local mask with the mask
-    //  the caller provides.  It has been parameterized by <WEIGHT> so that a version compatible
-    //  with the caller's mask class is created.
-    //
-    template <typename WEIGHT>
-    class LocalMask {
-
-    public:
-        typedef WEIGHT Weight;
-
-    public:
-        LocalMask(Weight* v, Weight* e, Weight* f) : _vWeights(v), _eWeights(e), _fWeights(f) { }
-        ~LocalMask() { }
-
-    public:
-
-        //
-        //  Methods required for general mask assignments and queries:
-        //
-        int GetNumVertexWeights() const { return _vCount; }
-        int GetNumEdgeWeights()   const { return _eCount; }
-        int GetNumFaceWeights()   const { return _fCount; }
-
-        void SetNumVertexWeights(int count) { _vCount = count; }
-        void SetNumEdgeWeights(  int count) { _eCount = count; }
-        void SetNumFaceWeights(  int count) { _fCount = count; }
-
-        Weight const& VertexWeight(int index) const { return _vWeights[index]; }
-        Weight const& EdgeWeight(  int index) const { return _eWeights[index]; }
-        Weight const& FaceWeight(  int index) const { return _fWeights[index]; }
-
-        Weight& VertexWeight(int index) { return _vWeights[index]; }
-        Weight& EdgeWeight(  int index) { return _eWeights[index]; }
-        Weight& FaceWeight(  int index) { return _fWeights[index]; }
-
-        bool AreFaceWeightsForFaceCenters() const  { return _fWeightsForCenters; }
-        void SetFaceWeightsForFaceCenters(bool on) { _fWeightsForCenters = on; }
-
-    public:
-
-        //
-        //  Additional methods -- mainly the blending method for vertex-vertex masks:
-        //
-        template <typename USER_MASK>
-        inline void
-        CombineVertexVertexMasks(Weight thisCoeff, Weight dstCoeff, USER_MASK& dst) const {
-
-            //
-            //  This implementation is convoluted by the potential sparsity of each mask.  Since
-            //  it is specific to a vertex-vertex mask, we are guaranteed to have exactly one
-            //  vertex-weight for both masks, but the edge- and face-weights are optional.  The
-            //  child mask (the "source") should have a superset of the weights of the parent
-            //  (the "destination") given its reduced sharpness, so we fortunately don't need to
-            //  test all permutations.
-            //
-            dst.VertexWeight(0) = dstCoeff * dst.VertexWeight(0) + thisCoeff * this->VertexWeight(0);
-
-            int edgeWeightCount = this->GetNumEdgeWeights();
-            if (edgeWeightCount) {
-                if (dst.GetNumEdgeWeights() == 0) {
-                    dst.SetNumEdgeWeights(edgeWeightCount);
-                    for (int i = 0; i < edgeWeightCount; ++i) {
-                        dst.EdgeWeight(i) = thisCoeff * this->EdgeWeight(i);
-                    }
-                } else {
-                    for (int i = 0; i < edgeWeightCount; ++i) {
-                        dst.EdgeWeight(i) = dstCoeff * dst.EdgeWeight(i) + thisCoeff * this->EdgeWeight(i);
-                    }
-                }
-            }
-
-            int faceWeightCount = this->GetNumFaceWeights();
-            if (faceWeightCount) {
-                //
-                //  If combining face weights, be sure their interpretation (i.e. face-centers
-                //  or opposite vertices) is properly set in the destination mask:
-                //
-                if (dst.GetNumFaceWeights() == 0) {
-                    dst.SetNumFaceWeights(faceWeightCount);
-                    dst.SetFaceWeightsForFaceCenters(this->AreFaceWeightsForFaceCenters());
-
-                    for (int i = 0; i < faceWeightCount; ++i) {
-                        dst.FaceWeight(i) = thisCoeff * this->FaceWeight(i);
-                    }
-                } else {
-                    assert(this->AreFaceWeightsForFaceCenters() == dst.AreFaceWeightsForFaceCenters());
-
-                    for (int i = 0; i < faceWeightCount; ++i) {
-                        dst.FaceWeight(i) = dstCoeff * dst.FaceWeight(i) + thisCoeff * this->FaceWeight(i);
-                    }
-                }
-            }
-        }
-
-    private:
-        Weight* _vWeights;
-        Weight* _eWeights;
-        Weight* _fWeights;
-        int _vCount;
-        int _eCount;
-        int _fCount;
-        bool _fWeightsForCenters;
-    };
-};
-
-
-//
-//  Crease and corner masks are common to most schemes -- the rest need to be provided
-//  for each Scheme specialization.
-//
-template <SchemeType SCHEME>
-template <typename EDGE, typename MASK>
-inline void
-Scheme<SCHEME>::assignCreaseMaskForEdge(EDGE const&, MASK& mask) const {
-
-    mask.SetNumVertexWeights(2);
-    mask.SetNumEdgeWeights(0);
-    mask.SetNumFaceWeights(0);
-    mask.SetFaceWeightsForFaceCenters(false);
-
-    mask.VertexWeight(0) = 0.5f;
-    mask.VertexWeight(1) = 0.5f;
-}
-
-template <SchemeType SCHEME>
-template <typename VERTEX, typename MASK>
-inline void
-Scheme<SCHEME>::assignCornerMaskForVertex(VERTEX const&, MASK& mask) const {
-
-    mask.SetNumVertexWeights(1);
-    mask.SetNumEdgeWeights(0);
-    mask.SetNumFaceWeights(0);
-    mask.SetFaceWeightsForFaceCenters(false);
-
-    mask.VertexWeight(0) = 1.0f;
-}
-
-
-//
-//  The computation of a face-vertex mask is trivial and consistent for all schemes:
-//
-template <SchemeType SCHEME>
-template <typename FACE, typename MASK>
-void
-Scheme<SCHEME>::ComputeFaceVertexMask(FACE const& face, MASK& mask) const {
-
-    int vertCount = face.GetNumVertices();
-
-    mask.SetNumVertexWeights(vertCount);
-    mask.SetNumEdgeWeights(0);
-    mask.SetNumFaceWeights(0);
-    mask.SetFaceWeightsForFaceCenters(false);
-
-    typename MASK::Weight vWeight = 1.0f / (typename MASK::Weight) vertCount;
-    for (int i = 0; i < vertCount; ++i) {
-        mask.VertexWeight(i) = vWeight;
-    }
-}
-
-
-//
-//  The computation of an edge-vertex mask requires inspection of sharpness values to
-//  determine if smooth or a crease, and also to detect and apply a transition from a
-//  crease to smooth.  Using the protected methods to assign the specific masks (only
-//  two -- smooth or crease) this implementation should serve all non-linear schemes
-//  (currently Catmark and Loop) and only needs to be specialized for Bilinear to
-//  trivialize it to the crease case.
-//
-//  The implementation here is slightly complicated by combining two scenarios into a
-//  single implementation -- either the caller knows the parent and child rules and
-//  provides them, or they don't and the Rules have to be determined from sharpness
-//  values.  Both cases include quick return once the parent is determined to be
-//  smooth or the child a crease, leaving the transitional case remaining.
-//
-//  The overall process is as follows:
-//
-//      - quickly detect the most common specified or detected Smooth case and return
-//      - quickly detect a full Crease by child Rule assignment and return
-//      - determine from sharpness if unspecified child is a crease -- return if so
-//      - compute smooth mask for child and combine with crease from parent
-//
-//  Usage of the parent Rule here allows some misuse in that only three of five possible
-//  assignments are legitimate for the parent and four for the child (Dart being only
-//  valid for the child and Corner for neither).  Results are undefined in these cases.
-//
-template <SchemeType SCHEME>
-template <typename EDGE, typename MASK>
-void
-Scheme<SCHEME>::ComputeEdgeVertexMask(EDGE const&     edge,
-                                         MASK&           mask,
-                                         Crease::Rule parentRule,
-                                         Crease::Rule childRule) const {
-
-    //
-    //  If the parent was specified or determined to be Smooth, we can quickly return
-    //  with a Smooth mask.  Otherwise the parent is a crease -- if the child was
-    //  also specified to be a crease, we can quickly return with a Crease mask.
-    //
-    if ((parentRule == Crease::RULE_SMOOTH) ||
-       ((parentRule == Crease::RULE_UNKNOWN) && (edge.GetSharpness() <= 0.0f))) {
-        assignSmoothMaskForEdge(edge, mask);
-        return;
-    }
-    if (childRule == Crease::RULE_CREASE) {
-        assignCreaseMaskForEdge(edge, mask);
-        return;
-    }
-
-    //
-    //  We have a Crease on the parent and the child was either specified as Smooth
-    //  or was not specified at all -- deal with the unspecified case first (again
-    //  returning a Crease mask if the child is also determined to be a Crease) and
-    //  continue if we have a transition to Smooth.
-    //
-    //  Note when qualifying the child that if the parent sharpness > 1.0, regardless
-    //  of the creasing method, whether the child sharpness values decay to zero is
-    //  irrelevant -- the fractional weight for such a case (the value of the parent
-    //  sharpness) is > 1.0, and when clamped to 1 effectively yields a full crease.
-    //
-    if (childRule == Crease::RULE_UNKNOWN) {
-        Crease crease(_options);
-
-        bool childIsCrease = false;
-        if (parentRule == Crease::RULE_CREASE) {
-            //  Child unknown as default value but parent Rule specified as Crease
-            childIsCrease = true;
-        } else if (edge.GetSharpness() >= 1.0f) {
-            //  Sharpness >= 1.0 always a crease -- see note above
-            childIsCrease = true;
-        } else if (crease.IsUniform()) {
-            //  Sharpness < 1.0 is guaranteed to decay to 0.0 for Uniform child edges
-            childIsCrease = false;
-        } else {
-            //  Sharpness <= 1.0 does not necessarily decay to 0.0 for both child edges...
-            float cEdgeSharpness[2];
-            edge.GetChildSharpnesses(crease, cEdgeSharpness);
-            childIsCrease = (cEdgeSharpness[0] > 0.0f) && (cEdgeSharpness[1] > 0.0f);
-        }
-        if (childIsCrease) {
-            assignCreaseMaskForEdge(edge, mask);
-            return;
-        }
-    }
-
-    //
-    //  We are now left with the Crease-to-Smooth case -- compute the Smooth mask
-    //  for the child and augment it with the transitional Crease of the parent.
-    //
-    //  A general combination of separately assigned masks here (as done in the vertex-
-    //  vertex case) is overkill -- trivially combine the 0.5f vertex coefficient for
-    //  the Crease of the parent with the vertex weights and attenuate the face weights
-    //  accordingly.
-    //
-    assignSmoothMaskForEdge(edge, mask);
-
-    typedef typename MASK::Weight Weight;
-
-    Weight pWeight = edge.GetSharpness();
-    Weight cWeight = 1.0f - pWeight;
-
-    mask.VertexWeight(0) = pWeight * 0.5f + cWeight * mask.VertexWeight(0);
-    mask.VertexWeight(1) = pWeight * 0.5f + cWeight * mask.VertexWeight(1);
-
-    int faceCount = mask.GetNumFaceWeights();
-    for (int i = 0; i < faceCount; ++i) {
-        mask.FaceWeight(i) *= cWeight;
-    }
-}
-
-//
-//  The computation of a vertex-vertex mask requires inspection of creasing sharpness values
-//  to determine what subdivision Rules apply to the parent and its child vertex, and also to
-//  detect and apply a transition between two differing Rules.  Using the protected methods to
-//  assign specific masks, this implementation should serve all non-linear schemes (currently
-//  Catmark and Loop) and only needs to be specialized for Bilinear to remove all unnecessary
-//  complexity relating to creasing, Rules, etc.
-//
-//  The implementation here is slightly complicated by combining two scenarios into one --
-//  either the caller knows the parent and child rules and provides them, or they don't and
-//  the Rules have to be determined from sharpness values.  Even when the Rules are known and
-//  provided though, there are cases where the parent and child sharpness values need to be
-//  identified, so accounting for the unknown Rules too is not much of an added complication.
-//
-//  The benefit of supporting specified Rules is that they can often be trivially
-//  determined from context (e.g. a vertex derived from a face at a previous level will always
-//  be smooth) rather than more generally, and at greater cost, inspecting neighboring and
-//  they are often the same for parent and child.
-//
-//  The overall process is as follows:
-//
-//      - quickly detect the most common Smooth case when specified and return
-//      - determine if sharpness for parent is required and gather if so
-//      - if unspecified, determine the parent rule
-//      - assign mask for the parent rule -- returning if Smooth/Dart
-//      - return if child rule matches parent
-//      - gather sharpness for child to determine or combine child rule
-//      - if unspecified, determine the child rule, returning if it matches parent
-//      - assign local mask for child rule
-//      - combine local child mask with the parent mask
-//
-//  Remember -- if the parent rule is specified but the child is not, this implies only one
-//  of the two optional rules was specified and is meant to indicate there is no transition,
-//  so the child rule should be assigned to be the same (wish the compiler would allow this
-//  in default value assignment).
-//
-template <SchemeType SCHEME>
-template <typename VERTEX, typename MASK>
-void
-Scheme<SCHEME>::ComputeVertexVertexMask(VERTEX const&   vertex,
-                                           MASK&           mask,
-                                           Crease::Rule pRule,
-                                           Crease::Rule cRule) const {
-
-    //  Quick assignment and return for the most common case:
-    if ((pRule == Crease::RULE_SMOOTH) || (pRule == Crease::RULE_DART)) {
-        assignSmoothMaskForVertex(vertex, mask);
-        return;
-    }
-    //  If unspecified, assign the child rule to match the parent rule if specified:
-    if ((cRule == Crease::RULE_UNKNOWN) && (pRule != Crease::RULE_UNKNOWN)) {
-        cRule = pRule;
-    }
-    int valence = vertex.GetNumEdges();
-
-    //
-    //  Determine if we need the parent edge sharpness values -- identify/gather if so
-    //  and use it to compute the parent rule if unspecified:
-    //
-    float * pEdgeSharpnessBuffer = (float *)alloca(valence*sizeof(float)),
-          * pEdgeSharpness   = 0,
-            pVertexSharpness = 0.0f;
-
-    bool requireParentSharpness = (pRule == Crease::RULE_UNKNOWN) ||
-                                  (pRule == Crease::RULE_CREASE) ||
-                                  (pRule != cRule);
-    if (requireParentSharpness) {
-        pVertexSharpness = vertex.GetSharpness();
-        pEdgeSharpness   = vertex.GetSharpnessPerEdge(pEdgeSharpnessBuffer);
-
-        if (pRule == Crease::RULE_UNKNOWN) {
-            pRule = Crease(_options).DetermineVertexVertexRule(pVertexSharpness, valence, pEdgeSharpness);
-        }
-    }
-    if ((pRule == Crease::RULE_SMOOTH) || (pRule == Crease::RULE_DART)) {
-        assignSmoothMaskForVertex(vertex, mask);
-        return;  //  As done on entry, we can return immediately if parent is Smooth/Dart
-    } else if (pRule == Crease::RULE_CREASE) {
-        int creaseEnds[2];
-        Crease(_options).GetSharpEdgePairOfCrease(pEdgeSharpness, valence, creaseEnds);
-
-        assignCreaseMaskForVertex(vertex, mask, creaseEnds);
-    } else {
-        assignCornerMaskForVertex(vertex, mask);
-    }
-    if (cRule == pRule) return;
-
-    //
-    //  Identify/gather child sharpness to combine masks for the two differing Rules:
-    //
-    Crease crease(_options);
-
-    float * cEdgeSharpnessBuffer = (float *)alloca(valence*sizeof(float)),
-          * cEdgeSharpness = vertex.GetChildSharpnessPerEdge(crease, cEdgeSharpnessBuffer),
-            cVertexSharpness = vertex.GetChildSharpness(crease);
-
-    if (cRule == Crease::RULE_UNKNOWN) {
-        cRule = crease.DetermineVertexVertexRule(cVertexSharpness, valence, cEdgeSharpness);
-        if (cRule == pRule) return;
-    }
-
-    //
-    //  Initialize a local child mask, compute the fractional weight from parent and child
-    //  sharpness values and combine the two masks:
-    //
-    typedef typename MASK::Weight Weight;
-
-    Weight * cMaskWeights = (Weight *)alloca((1 + 2 * valence)*sizeof(Weight));
-    LocalMask<Weight> cMask(cMaskWeights, cMaskWeights + 1, cMaskWeights + 1 + valence);
-
-    if ((cRule == Crease::RULE_SMOOTH) || (cRule == Crease::RULE_DART)) {
-        assignSmoothMaskForVertex(vertex, cMask);
-    } else if (cRule == Crease::RULE_CREASE) {
-        int creaseEnds[2];
-        Crease(_options).GetSharpEdgePairOfCrease(cEdgeSharpness, valence, creaseEnds);
-
-        assignCreaseMaskForVertex(vertex, cMask, creaseEnds);
-    } else {
-        assignCornerMaskForVertex(vertex, cMask);
-    }
-
-    Weight pWeight = crease.ComputeFractionalWeightAtVertex(pVertexSharpness, cVertexSharpness,
-                                                   valence, pEdgeSharpness, cEdgeSharpness);
-    Weight cWeight = 1.0f - pWeight;
-
-    cMask.CombineVertexVertexMasks(cWeight, pWeight, mask);
-}
-
-//
-//  The computation of limit masks for vertices:
-//
-template <SchemeType SCHEME>
-template <typename VERTEX, typename MASK>
-void
-Scheme<SCHEME>::ComputeVertexLimitMask(VERTEX const& vertex,
-                                       MASK&         mask,
-                                       Crease::Rule  rule) const {
-
-    if ((rule == Crease::RULE_SMOOTH) || (rule == Crease::RULE_DART)) {
-        assignSmoothLimitMask(vertex, mask);
-    } else if (rule == Crease::RULE_CREASE) {
-        float * edgeSharpness = (float *)alloca(vertex.GetNumEdges() * sizeof(float));
-        vertex.GetSharpnessPerEdge(edgeSharpness);
-
-        int creaseEnds[2];
-        Crease(_options).GetSharpEdgePairOfCrease(edgeSharpness, vertex.GetNumEdges(), creaseEnds);
-
-        assignCreaseLimitMask(vertex, mask, creaseEnds);
-    } else {
-        assignCornerLimitMask(vertex, mask);
-    }
-}
-
-template <SchemeType SCHEME>
-template <typename VERTEX, typename MASK>
-void
-Scheme<SCHEME>::ComputeVertexLimitMask(VERTEX const& vertex,
-                                       MASK&         posMask,
-                                       MASK&         tan1Mask,
-                                       MASK&         tan2Mask,
-                                       Crease::Rule  rule) const {
-
-    if ((rule == Crease::RULE_SMOOTH) || (rule == Crease::RULE_DART)) {
-        assignSmoothLimitMask(vertex, posMask);
-        assignSmoothLimitTangentMasks(vertex, tan1Mask, tan2Mask);
-    } else if (rule == Crease::RULE_CREASE) {
-        float * edgeSharpness = (float *)alloca(vertex.GetNumEdges() * sizeof(float));
-        vertex.GetSharpnessPerEdge(edgeSharpness);
-
-        int creaseEnds[2];
-        Crease(_options).GetSharpEdgePairOfCrease(edgeSharpness, vertex.GetNumEdges(), creaseEnds);
-
-        assignCreaseLimitMask(vertex, posMask, creaseEnds);
-        assignCreaseLimitTangentMasks(vertex, tan1Mask, tan2Mask, creaseEnds);
-    } else {
-        assignCornerLimitMask(vertex, posMask);
-        assignCornerLimitTangentMasks(vertex, tan1Mask, tan2Mask);
-    }
-}
-
-
-} // end namespace sdc
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_SDC_SCHEME_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/typeTraits.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/typeTraits.cpp
deleted file mode 100644
index 377a4b8eb..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/typeTraits.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../sdc/types.h"
-
-#include "../sdc/bilinearScheme.h"
-#include "../sdc/catmarkScheme.h"
-#include "../sdc/loopScheme.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Sdc {
-
-struct TraitsEntry {
-    char const * _name;
-
-    Split _splitType;
-    int   _regularFaceSize;
-    int   _regularVertexValence;
-    int   _localNeighborhood;
-};
-
-static const TraitsEntry staticTraitsTable[3] = {
-    { "bilinear", Scheme<SCHEME_BILINEAR>::GetTopologicalSplitType(),
-                  Scheme<SCHEME_BILINEAR>::GetRegularFaceSize(),
-                  Scheme<SCHEME_BILINEAR>::GetRegularVertexValence(),
-                  Scheme<SCHEME_BILINEAR>::GetLocalNeighborhoodSize() },
-    { "catmark",  Scheme<SCHEME_CATMARK>::GetTopologicalSplitType(),
-                  Scheme<SCHEME_CATMARK>::GetRegularFaceSize(),
-                  Scheme<SCHEME_CATMARK>::GetRegularVertexValence(),
-                  Scheme<SCHEME_CATMARK>::GetLocalNeighborhoodSize() },
-    { "loop",     Scheme<SCHEME_LOOP>::GetTopologicalSplitType(),
-                  Scheme<SCHEME_LOOP>::GetRegularFaceSize(),
-                  Scheme<SCHEME_LOOP>::GetRegularVertexValence(),
-                  Scheme<SCHEME_LOOP>::GetLocalNeighborhoodSize() }
-};
-
-//
-//  Static methods for SchemeTypeTraits:
-//
-char const*
-SchemeTypeTraits::GetName(SchemeType schemeType) {
-
-    return staticTraitsTable[schemeType]._name;
-}
-
-Split
-SchemeTypeTraits::GetTopologicalSplitType(SchemeType schemeType) {
-
-    return staticTraitsTable[schemeType]._splitType;
-}
-
-int
-SchemeTypeTraits::GetRegularFaceSize(SchemeType schemeType) {
-
-    return staticTraitsTable[schemeType]._regularFaceSize;
-}
-
-int
-SchemeTypeTraits::GetRegularVertexValence(SchemeType schemeType) {
-
-    return staticTraitsTable[schemeType]._regularVertexValence;
-}
-
-int
-SchemeTypeTraits::GetLocalNeighborhoodSize(SchemeType schemeType) {
-
-    return staticTraitsTable[schemeType]._localNeighborhood;
-}
-
-} // end namespace sdc
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/types.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/types.h
deleted file mode 100644
index a49913c7b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/sdc/types.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_SDC_TYPES_H
-#define OPENSUBDIV3_SDC_TYPES_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Sdc {
-
-///
-///  \brief Enumerated type for all subdivision schemes supported by OpenSubdiv
-///
-enum SchemeType {
-    SCHEME_BILINEAR,
-    SCHEME_CATMARK,
-    SCHEME_LOOP
-};
-
-
-///
-///  \brief Enumerated type for all face splitting schemes
-///
-enum Split {
-    SPLIT_TO_QUADS,  ///< Used by Catmark and Bilinear
-    SPLIT_TO_TRIS,   ///< Used by Loop
-    SPLIT_HYBRID     ///< Not currently used (potential future extension)
-};
-
-///
-///  \brief Traits associated with the types of all subdivision schemes -- parameterized by
-///  the scheme type.  All traits are also defined in the scheme itself.
-///
-struct SchemeTypeTraits {
-
-    static SchemeType GetType(SchemeType schemeType) { return schemeType; }
-
-    static Split GetTopologicalSplitType(SchemeType schemeType);
-    static int   GetRegularFaceSize(SchemeType schemeType);
-    static int   GetRegularVertexValence(SchemeType schemeType);
-    static int   GetLocalNeighborhoodSize(SchemeType schemeType);
-
-    static char const* GetName(SchemeType schemeType);
-};
-
-
-} // end namespace sdc
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_SDC_TYPES_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/tools/stringify/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/tools/stringify/CMakeLists.txt
deleted file mode 100644
index ae0aad940..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/tools/stringify/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-if(CMAKE_CROSSCOMPILING)
-	set(STRINGIFY_LOCATION "STRINGIFY-NOTFOUND" CACHE FILEPATH "Point it to the stringify binary from a native build") 
-	add_executable(stringify IMPORTED GLOBAL)
-	set_property(TARGET stringify PROPERTY IMPORTED_LOCATION ${STRINGIFY_LOCATION})
-endif()
-
-if(NOT CMAKE_CROSSCOMPILING)
-	osd_add_executable(stringify "opensubdiv/tools"
-	    main.cpp
-	)
-	install(TARGETS stringify DESTINATION ${CMAKE_BINDIR_BASE})
-endif() 
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/tools/stringify/main.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/tools/stringify/main.cpp
deleted file mode 100644
index a19d26944..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/tools/stringify/main.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-
-
-std::string stringify( std::string const & line ) {
-
-    bool inconstant=false;
-
-    std::stringstream s;
-    for (int i=0; i<(int)line.size(); ++i) {
-
-        // escape double quotes
-        if (line[i]=='"') {
-            s << '\\' ;
-            inconstant = inconstant ? false : true;
-        }
-
-        if (line[i]=='\\' && line[i+1]=='\0') {
-            s << "\"";
-            return s.str();
-        }
-
-        // escape backslash
-        if (inconstant && line[i]=='\\')
-           s << '\\' ;
-
-        s << line[i];
-    }
-
-    s << "\\n\"";
-
-    return s.str();
-}
-
-int main(int argc, char **argv) {
-
-    if (argc != 3) {
-        std::cerr << "Usage: stringify input-file output-file" << std::endl;
-        return 1;
-    }
-
-    std::ifstream input;
-    input.open(argv[1]);
-    if (! input.is_open()) {
-        std::cerr << "Can not read from: " << argv[1] << std::endl;
-        return 1;
-    }
-
-    std::ofstream output;
-    output.open(argv[2]);
-    if (! output.is_open()) {
-        std::cerr << "Can not write to: " << argv[2] << std::endl;
-        return 1;
-    }
-
-    std::string line;
-
-    while (! input.eof()) {
-        std::getline(input, line);
-        output << "\"" << stringify(line) << std::endl;
-    }
-
-    return 0;
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/version.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/version.cpp
deleted file mode 100644
index b4a08b6dc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/version.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#include "./version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/version.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/version.h
deleted file mode 100644
index f5a16d149..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/version.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//   Copyright 2013 Pixar
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-
-#ifndef OPENSUBDIV3_VERSION_H
-#define OPENSUBDIV3_VERSION_H
-
-#define OPENSUBDIV_VERSION v3_5_0
-
-#define OPENSUBDIV_VERSION_NUMBER 30500
-
-#define OPENSUBDIV_VERSION_MAJOR 3
-#define OPENSUBDIV_VERSION_MINOR 5
-#define OPENSUBDIV_VERSION_PATCH 0
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VERSION_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/CMakeLists.txt b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/CMakeLists.txt
deleted file mode 100644
index e4e1b8c5e..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/CMakeLists.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-#   Copyright 2013 Pixar
-#
-#   Licensed under the Apache License, Version 2.0 (the "Apache License")
-#   with the following modification; you may not use this file except in
-#   compliance with the Apache License and the following modification to it:
-#   Section 6. Trademarks. is deleted and replaced with:
-#
-#   6. Trademarks. This License does not grant permission to use the trade
-#      names, trademarks, service marks, or product names of the Licensor
-#      and its affiliates, except as required to comply with Section 4(c) of
-#      the License and to reproduce the content of the NOTICE file.
-#
-#   You may obtain a copy of the Apache License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the Apache License with the above modification is
-#   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied. See the Apache License for the specific
-#   language governing permissions and limitations under the Apache License.
-#
-
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# source & headers
-set(SOURCE_FILES
-     fvarLevel.cpp
-     fvarRefinement.cpp
-     level.cpp
-     quadRefinement.cpp
-     refinement.cpp
-     sparseSelector.cpp
-     triRefinement.cpp
-)
-
-set(PRIVATE_HEADER_FILES
-     quadRefinement.h
-     triRefinement.h
-)
-
-set(PUBLIC_HEADER_FILES
-     array.h
-     componentInterfaces.h
-     fvarLevel.h
-     fvarRefinement.h
-     level.h
-     refinement.h
-     sparseSelector.h
-     stackBuffer.h
-     types.h
-)
-
-set(DOXY_HEADER_FILES ${PUBLIC_HEADER_FILES})
-
-include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-
-if (NOT NO_LIB)
-
-    # Compile objs first for both the CPU and GPU libs -----
-    add_library(vtr_obj
-        OBJECT
-            ${SOURCE_FILES}
-            ${PRIVATE_HEADER_FILES}
-            ${PUBLIC_HEADER_FILES}
-    )
-
-    set_target_properties(vtr_obj
-        PROPERTIES
-            FOLDER "opensubdiv"
-    )
-
-endif()
-
-#-------------------------------------------------------------------------------
-osd_add_doxy_headers( "${DOXY_HEADER_FILES}" )
-
-install(
-    FILES
-        ${PUBLIC_HEADER_FILES}
-    DESTINATION
-        "${CMAKE_INCDIR_BASE}/vtr"
-    PERMISSIONS
-        OWNER_READ
-        GROUP_READ
-        WORLD_READ )
-
-#-------------------------------------------------------------------------------
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/array.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/array.h
deleted file mode 100644
index 19ecf5a3c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/array.h
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_ARRAY_INTERFACE_H
-#define OPENSUBDIV3_VTR_ARRAY_INTERFACE_H
-
-#include "../version.h"
-
-#include <cassert>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-
-//
-//  This class provides a simple array-like interface -- a subset std::vector's interface -- for
-//  a sequence of elements stored in contiguous memory.  It provides a unified representation for
-//  referencing data on the stack, all or a subset of std::vector<>, or anywhere else in memory.
-//
-//  Note that its members are head/size rather than begin/end as in std::vector -- we frequently
-//  need only the size for many queries, and that is most often what is stored elsewhere in other
-//  classes, so we hope to reduce unnecessary address arithmetic constructing the interface and
-//  accessing the size.  The size type is also specifically 32-bit (rather than size_t) to match
-//  internal usage and avoid unnecessary conversion to/from 64-bit.
-//
-//  Question:
-//      Naming is at issue here...  formerly called ArrayInterface until that was shot down it has
-//  been simplified to Array but needs to be distanced from std::array as it DOES NOT store its
-//  own memory and is simply an interface to memory stored elsewhere.
-//
-template <typename TYPE>
-class ConstArray {
-
-public:
-    typedef TYPE value_type;
-    typedef int  size_type;
-
-    typedef TYPE const& const_reference;
-    typedef TYPE const* const_iterator;
-
-    typedef TYPE& reference;
-    typedef TYPE* iterator;
-
-public:
-
-    ConstArray() : _begin(0), _size(0) { }
-
-    ConstArray(value_type const * ptr, size_type sizeArg) :
-        _begin(ptr), _size(sizeArg) { }
-
-    size_type size() const { return _size; }
-
-    bool empty() const { return _size==0; }
-
-    const_reference operator[](int index) const { return _begin[index]; }
-    const_iterator  begin() const               { return _begin; }
-    const_iterator  end() const                 { return _begin + _size; }
-
-    size_type FindIndexIn4Tuple(value_type value) const {
-        assert(_size>=4);
-        if (value == _begin[0]) return 0;
-        if (value == _begin[1]) return 1;
-        if (value == _begin[2]) return 2;
-        if (value == _begin[3]) return 3;
-        assert("FindIndexIn4Tuple() did not find expected value!" == 0);
-        return -1;
-    }
-
-    size_type FindIndex(value_type value) const {
-        for (size_type i=0; i<size(); ++i) {
-            if (value==_begin[i]) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-protected:
-    value_type const * _begin;
-    size_type _size;
-};
-
-template <typename TYPE>
-class Array : public ConstArray<TYPE> {
-
-public:
-    typedef TYPE value_type;
-    typedef int  size_type;
-
-    typedef TYPE const& const_reference;
-
-    typedef TYPE& reference;
-    typedef TYPE* iterator;
-
-public:
-
-    Array() : ConstArray<TYPE>() { }
-    
-    Array(value_type * ptr, size_type sizeArg) : ConstArray<TYPE>(ptr, sizeArg) { }
-
-public:
-
-    const_reference operator[](int index) const {
-        return ConstArray<TYPE>::_begin[index];
-    }
-
-    reference operator[](int index) {
-        return const_cast<reference>(ConstArray<TYPE>::_begin[index]);
-    }
-
-    iterator begin() {
-        return const_cast<iterator>(ConstArray<TYPE>::_begin);
-    }
-
-    iterator end() {
-        return const_cast<iterator>(ConstArray<TYPE>::_begin +
-            ConstArray<TYPE>::_size);
-    }
-};
-
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_ARRAY_INTERFACE_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/componentInterfaces.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/componentInterfaces.h
deleted file mode 100644
index 01fba9474..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/componentInterfaces.h
+++ /dev/null
@@ -1,158 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_COMPONENT_INTERFACES_H
-#define OPENSUBDIV3_VTR_COMPONENT_INTERFACES_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-#include "../sdc/crease.h"
-#include "../vtr/types.h"
-#include "../vtr/stackBuffer.h"
-
-#include <vector>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  Simple classes supporting the interfaces required of generic topological
-//  types in the Scheme mask queries, e.g. <typename FACE, VERTEX, etc.>
-//
-//  These are not used with Vtr but arguably belong with it as the details to
-//  write these efficiently depends very much on intimate details of Vtr's
-//  implementation, e.g. the use of tag bits, subdivision Rules, etc.
-//
-
-
-//
-//  For <typename FACE>, which provides information in the neighborhood of a face:
-//
-class FaceInterface {
-public:
-    FaceInterface() { }
-    FaceInterface(int vertCount) : _vertCount(vertCount) { }
-    ~FaceInterface() { }
-
-public:  //  Generic interface expected of <typename FACE>:
-    int GetNumVertices() const { return _vertCount; }
-
-private:
-    int _vertCount;
-};
-
-
-//
-//  For <typename EDGE>, which provides information in the neighborhood of an edge:
-//
-class EdgeInterface {
-public:
-    EdgeInterface() { }
-    EdgeInterface(Level const& level) : _level(&level) { }
-    ~EdgeInterface() { }
-
-    void SetIndex(int edgeIndex) { _eIndex = edgeIndex; }
-
-public:  //  Generic interface expected of <typename EDGE>:
-    int   GetNumFaces() const { return _level->getEdgeFaces(_eIndex).size(); }
-    float GetSharpness() const { return _level->getEdgeSharpness(_eIndex); }
-
-    void GetChildSharpnesses(Sdc::Crease const&, float s[2]) const {
-        //  Need to use the Refinement here to identify the two child edges:
-        s[0] = s[1] = GetSharpness() - 1.0f;
-    }
-
-    void GetNumVerticesPerFace(int vertsPerFace[]) const {
-        ConstIndexArray eFaces = _level->getEdgeFaces(_eIndex);
-        for (int i = 0; i < eFaces.size(); ++i) {
-            vertsPerFace[i] = _level->getFaceVertices(eFaces[i]).size();
-        }
-    }
-
-private:
-    const Level* _level;
-
-    int _eIndex;
-};
-
-
-//
-//  For <typename VERTEX>, which provides information in the neighborhood of a vertex:
-//
-class VertexInterface {
-public:
-    VertexInterface() { }
-    VertexInterface(Level const& parent, Level const& child) : _parent(&parent), _child(&child) { }
-    ~VertexInterface() { }
-
-    void SetIndex(int parentIndex, int childIndex) {
-        _pIndex = parentIndex;
-        _cIndex = childIndex;
-        _eCount = _parent->getVertexEdges(_pIndex).size();
-        _fCount = _parent->getVertexFaces(_pIndex).size();
-    }
-
-public:  //  Generic interface expected of <typename VERT>:
-    int GetNumEdges() const { return _eCount; }
-    int GetNumFaces() const { return _fCount; }
-
-    float  GetSharpness() const { return _parent->getVertexSharpness(_pIndex); }
-    float* GetSharpnessPerEdge(float pSharpness[]) const {
-        ConstIndexArray pEdges = _parent->getVertexEdges(_pIndex);
-        for (int i = 0; i < _eCount; ++i) {
-            pSharpness[i] = _parent->getEdgeSharpness(pEdges[i]);
-        }
-        return pSharpness;
-    }
-
-    float  GetChildSharpness(Sdc::Crease const&) const { return _child->getVertexSharpness(_cIndex); }
-    float* GetChildSharpnessPerEdge(Sdc::Crease const& crease, float cSharpness[]) const {
-        internal::StackBuffer<float,16> pSharpness(_eCount);
-        GetSharpnessPerEdge(pSharpness);
-        crease.SubdivideEdgeSharpnessesAroundVertex(_eCount, pSharpness, cSharpness);
-        return cSharpness;
-    }
-
-private:
-    const Level* _parent;
-    const Level* _child;
-
-    int _pIndex;
-    int _cIndex;
-    int _eCount;
-    int _fCount;
-};
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_COMPONENT_INTERFACES_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarLevel.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarLevel.cpp
deleted file mode 100644
index be70e1ff4..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarLevel.cpp
+++ /dev/null
@@ -1,1070 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../sdc/types.h"
-#include "../sdc/crease.h"
-#include "../vtr/array.h"
-#include "../vtr/stackBuffer.h"
-#include "../vtr/level.h"
-
-#include "../vtr/fvarLevel.h"
-
-#include <cassert>
-#include <cstdio>
-#include <cstring>
-#include <algorithm>
-
-
-//
-//  FVarLevel:
-//      Simple container of face-varying topology, associated with a particular
-//  level.  It is typically constructed and initialized similarly to levels -- the
-//  base level in a Factory and subsequent levels by refinement.
-//
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-
-//
-//  Information about the "span" for a face-varying value -- the set of faces
-//  that share face-varying continuous edges around their common vertex.
-//
-//  This is intended for transient internal use only when analyzing the base
-//  level topology.  Information gathered for a single span is translated into
-//  topology tags for the value (ValueTag) which classify the value and persist
-//  in the FVarLevel for later refinement and analysis.  The ValueSpan exists
-//  solely to derive the ValueTag and is not intended (or capable) of capturing
-//  the full topological extent of many spans.
-//
-struct FVarLevel::ValueSpan {
-    LocalIndex _size;
-    LocalIndex _start;
-    LocalIndex _disctsEdgeCount;
-    LocalIndex _semiSharpEdgeCount;
-    LocalIndex _infSharpEdgeCount;
-};
-
-
-//
-//  Simple (for now) constructor and destructor:
-//
-FVarLevel::FVarLevel(Level const& level) :
-    _level(level),
-    _isLinear(false),
-    _hasLinearBoundaries(false),
-    _hasDependentSharpness(false),
-    _valueCount(0) {
-}
-
-FVarLevel::~FVarLevel() {
-}
-
-//
-//  Initialization and sizing methods to allocate space:
-//
-void
-FVarLevel::setOptions(Sdc::Options const& options) {
-    _options = options;
-}
-
-void
-FVarLevel::resizeComponents() {
-
-    //  Per-face members:
-    _faceVertValues.resize(_level.getNumFaceVerticesTotal());
-
-    //  Per-edge members:
-    ETag edgeTagMatch;
-    edgeTagMatch.clear();
-    _edgeTags.resize(_level.getNumEdges(), edgeTagMatch);
-
-    //  Per-vertex members:
-    _vertSiblingCounts.resize(_level.getNumVertices());
-    _vertSiblingOffsets.resize(_level.getNumVertices());
-
-    _vertFaceSiblings.resize(_level.getNumVertexFacesTotal(), 0);
-}
-
-void
-FVarLevel::resizeVertexValues(int vertexValueCount) {
-
-    _vertValueIndices.resize(vertexValueCount);
-
-    ValueTag valueTagMatch;
-    valueTagMatch.clear();
-    _vertValueTags.resize(vertexValueCount, valueTagMatch);
-
-    if (hasCreaseEnds()) {
-        _vertValueCreaseEnds.resize(vertexValueCount);
-    }
-}
-
-void
-FVarLevel::resizeValues(int valueCount) {
-    _valueCount = valueCount;
-}
-
-
-//
-//  Initialize the component tags once all face-values have been assigned...
-//
-//  Constructing the mapping between vertices and their face-varying values involves:
-//
-//      - iteration through all vertices to mark edge discontinuities and classify
-//      - allocation of vectors mapping vertices to their multiple (sibling) values
-//      - iteration through all vertices and their distinct values to tag topologically
-//
-//  Once values have been identified for each vertex and tagged, refinement propagates
-//  the tags to child values using more simplified logic (child values inherit the
-//  topology of their parent) and no further analysis is required.
-//
-void
-FVarLevel::completeTopologyFromFaceValues(int regularBoundaryValence) {
-
-    //
-    //  Assign some members and local variables based on the interpolation options (the
-    //  members support queries that are expected later):
-    //
-    //  Given the growing number of options and behaviors to support, this is likely going
-    //  to get another pass.  It may be worth identifying the behavior for each "feature",
-    //  i.e. determine smooth or sharp for corners, creases and darts, but the fact that
-    //  the rule for one value may be dependent on that of another complicates this.
-    //
-    using Sdc::Options;
-
-    Options::VtxBoundaryInterpolation geomOptions = _options.GetVtxBoundaryInterpolation();
-    Options::FVarLinearInterpolation  fvarOptions = _options.GetFVarLinearInterpolation();
-
-    _isLinear = (fvarOptions == Options::FVAR_LINEAR_ALL);
-
-    _hasLinearBoundaries = (fvarOptions == Options::FVAR_LINEAR_ALL) ||
-                           (fvarOptions == Options::FVAR_LINEAR_BOUNDARIES);
-
-    _hasDependentSharpness = (fvarOptions == Options::FVAR_LINEAR_CORNERS_PLUS1) ||
-                             (fvarOptions == Options::FVAR_LINEAR_CORNERS_PLUS2);
-
-    bool geomCornersAreSmooth = (geomOptions != Options::VTX_BOUNDARY_EDGE_AND_CORNER);
-    bool fvarCornersAreSharp  = (fvarOptions != Options::FVAR_LINEAR_NONE);
-
-    bool makeSmoothCornersSharp = geomCornersAreSmooth && fvarCornersAreSharp;
-
-    bool sharpenBothIfOneCorner  = (fvarOptions == Options::FVAR_LINEAR_CORNERS_PLUS2);
-
-    bool sharpenDarts = sharpenBothIfOneCorner || _hasLinearBoundaries;
-
-
-    //
-    //  It's awkward and potentially inefficient to try and accomplish everything in one
-    //  pass over the vertices...
-    //
-    //  Make a first pass through the vertices to identify discts edges and to determine
-    //  the number of values-per-vertex for subsequent allocation.  The presence of a
-    //  discts edge warrants marking vertices at BOTH ends as having mismatched topology
-    //  wrt the vertices (part of why full topological analysis is deferred).
-    //
-    //  So this first pass will allocate/initialize the overall structure of the topology.
-    //  Given N vertices and M (as yet unknown) sibling values, the first pass achieves
-    //  the following:
-    //
-    //      - assigns a local vector indicating which of the N vertices "match"
-    //          - requires a single value but must also have no discts incident edges
-    //      - determines the number of values associated with each of the N vertices
-    //      - assigns an offset to the first value for each of the N vertices
-    //      - initializes the vert-face "siblings" for all N vertices
-    //  and
-    //      - tags any incident edges as discts
-    //
-    //  The second pass initializes remaining members based on the total number of siblings
-    //  M after allocating appropriate vectors dependent on M.
-    //
-    std::vector<LocalIndex> vertexMismatch(_level.getNumVertices(), 0);
-
-    _vertFaceSiblings.resize(_level.getNumVertexFacesTotal(), 0);
-
-    int const maxValence = _level.getMaxValence();
-
-    internal::StackBuffer<Index,16>     indexBuffer(maxValence);
-    internal::StackBuffer<int,16>       valueBuffer(maxValence);
-    internal::StackBuffer<Sibling,16>   siblingBuffer(maxValence);
-    internal::StackBuffer<ValueSpan,16> spanBuffer(maxValence);
-
-    int *     uniqueValues   = valueBuffer;
-    Sibling * vValueSiblings = siblingBuffer;
-
-    int totalValueCount = 0;
-    for (int vIndex = 0; vIndex < _level.getNumVertices(); ++vIndex) {
-        //
-        //  Retrieve the FVar values from each incident face and store locally for
-        //  use -- we will identify the index of its corresponding "sibling" as we
-        //  inspect them more closely later:
-        //
-        ConstIndexArray       vFaces  = _level.getVertexFaces(vIndex);
-        ConstLocalIndexArray  vInFace = _level.getVertexFaceLocalIndices(vIndex);
-
-        Index * vValues = indexBuffer;
-
-        for (int i = 0; i < vFaces.size(); ++i) {
-            vValues[i] = _faceVertValues[_level.getOffsetOfFaceVertices(vFaces[i]) + vInFace[i]];
-        }
-
-        //
-        //  Inspect the incident edges of the vertex and tag those whose FVar values are
-        //  discts between the two (or more) faces sharing that edge.  When manifold, we
-        //  know an edge is discts when two successive fvar-values differ -- so we will
-        //  make use of the local buffer of values.  Unfortunately we can't infer anything
-        //  about the edges for a non-manifold vertex, so that case will be more complex.
-        //
-        ConstIndexArray       vEdges  = _level.getVertexEdges(vIndex);
-        ConstLocalIndexArray  vInEdge = _level.getVertexEdgeLocalIndices(vIndex);
-
-        bool vIsManifold = !_level.getVertexTag(vIndex)._nonManifold;
-        bool vIsBoundary = _level.getVertexTag(vIndex)._boundary;
-
-        if (vIsManifold) {
-            //
-            //  We want to use face indices here as we are accessing the fvar-values per
-            //  face.  The indexing range here maps to the interior edges for boundary
-            //  and interior verts:
-            //
-            for (int i = vIsBoundary; i < vFaces.size(); ++i) {
-                int vFaceNext = i;
-                int vFacePrev = i ? (i - 1) : (vFaces.size() - 1);
-
-                if (vValues[vFaceNext] != vValues[vFacePrev]) {
-                    Index eIndex = vEdges[i];
-
-                    //  Tag both end vertices as not matching topology:
-                    ConstIndexArray eVerts = _level.getEdgeVertices(eIndex);
-                    vertexMismatch[eVerts[0]] = true;
-                    vertexMismatch[eVerts[1]] = true;
-
-                    //  Tag the corresponding edge as discts:
-                    ETag& eTag = _edgeTags[eIndex];
-
-                    eTag._disctsV0 = (eVerts[0] == vIndex);
-                    eTag._disctsV1 = (eVerts[1] == vIndex);
-                    eTag._mismatch = true;
-                    eTag._linear = (ETag::ETagSize) _hasLinearBoundaries;
-                }
-            }
-        } else if (vFaces.size() > 0) {
-            //
-            //  Unfortunately for non-manifold cases we can't make as much use of the
-            //  retrieved face-values as there is no correlation between the incident
-            //  edge and face lists.  So inspect each edge for continuity between its
-            //  faces in general -- which is awkward (and what we were hoping to avoid
-            //  by doing the overall vertex traversal to begin with):
-            //
-            for (int i = 0; i < vEdges.size(); ++i) {
-                Index eIndex = vEdges[i];
-
-                ConstIndexArray eFaces  = _level.getEdgeFaces(eIndex);
-                if (eFaces.size() < 2) continue;
-
-                ConstLocalIndexArray eInFace = _level.getEdgeFaceLocalIndices(eIndex);
-                ConstIndexArray      eVerts  = _level.getEdgeVertices(eIndex);
-
-                int   vertInEdge = vInEdge[i];
-                bool  markEdgeDiscts = false;
-                Index valueIndexInFace0 = 0;
-                for (int j = 0; !markEdgeDiscts && (j < eFaces.size()); ++j) {
-                    Index           fIndex  = eFaces[j];
-                    ConstIndexArray fVerts  = _level.getFaceVertices(fIndex);
-                    ConstIndexArray fValues = getFaceValues(fIndex);
-
-                    int edgeInFace   = eInFace[j];
-                    int edgeReversed = (eVerts[0] != fVerts[edgeInFace]);
-                    int vertInFace   = edgeInFace + (vertInEdge != edgeReversed);
-                    if (vertInFace == fVerts.size()) vertInFace = 0;
-
-                    if (j == 0) {
-                        valueIndexInFace0 = fValues[vertInFace];
-                    } else {
-                        markEdgeDiscts = (fValues[vertInFace] != valueIndexInFace0);
-                    }
-                }
-                if (markEdgeDiscts) {
-                    //  Tag both end vertices as not matching topology:
-                    vertexMismatch[eVerts[0]] = true;
-                    vertexMismatch[eVerts[1]] = true;
-
-                    //  Tag the corresponding edge as discts:
-                    ETag& eTag = _edgeTags[eIndex];
-
-                    eTag._disctsV0 = (eVerts[0] == vIndex);
-                    eTag._disctsV1 = (eVerts[1] == vIndex);
-                    eTag._mismatch = true;
-                    eTag._linear = (ETag::ETagSize) _hasLinearBoundaries;
-                }
-            }
-        }
-
-        //
-        //  While we've tagged the vertex as having mismatched FVar topology in the presence of
-        //  any discts edges, we also need to account for different treatment of vertices along
-        //  geometric boundaries if the FVar interpolation rules affect them.  So inspect all
-        //  boundary vertices that have not already been tagged.
-        //
-        if (vIsBoundary && !vertexMismatch[vIndex]) {
-            if (_hasLinearBoundaries && (vFaces.size() > 0)) {
-                vertexMismatch[vIndex] = true;
-
-                if (vIsManifold) {
-                    _edgeTags[vEdges[0]]._linear = true;
-                    _edgeTags[vEdges[vEdges.size()-1]]._linear = true;
-                } else {
-                    for (int i = 0; i < vEdges.size(); ++i) {
-                        if (_level.getEdgeTag(vEdges[i])._boundary) {
-                            _edgeTags[vEdges[i]]._linear = true;
-                        }
-                    }
-                }
-            } else if (vFaces.size() == 1) {
-                if (makeSmoothCornersSharp) {
-                    vertexMismatch[vIndex] = true;
-                }
-            }
-        }
-
-        //
-        //  Inspect the set of fvar-values around the vertex to identify the number of
-        //  unique values.  While doing so, associate a "sibling index" (over the range
-        //  of unique values) with each value around the vertex (this latter need makes
-        //  it harder to make simple use of std::sort() and uniq() on the set of values)
-        //
-        int uniqueValueCount = 1;
-
-        uniqueValues[0] = vValues[0];
-        vValueSiblings[0] = 0;
-
-        for (int i = 1; i < vFaces.size(); ++i) {
-            if (vValues[i] == vValues[i-1]) {
-                vValueSiblings[i] = vValueSiblings[i-1];
-            } else {
-                //  Add the "new" value if not already present -- unless found, the
-                //  sibling index will be for the next/new unique value:
-                vValueSiblings[i] = (Sibling) uniqueValueCount;
-
-                if (uniqueValueCount == 1) {
-                    uniqueValues[uniqueValueCount++] = vValues[i];
-                } else if ((uniqueValueCount == 2) && (uniqueValues[0] != vValues[i])) {
-                    uniqueValues[uniqueValueCount++] = vValues[i];
-                } else {
-                    int* uniqueBegin = uniqueValues;
-                    int* uniqueEnd   = uniqueValues + uniqueValueCount;
-                    int* uniqueFound = std::find(uniqueBegin, uniqueEnd, vValues[i]);
-                    if (uniqueFound == uniqueEnd) {
-                        uniqueValues[uniqueValueCount++] = vValues[i];
-                    } else {
-                        vValueSiblings[i] = (Sibling) (uniqueFound - uniqueBegin);
-                    }
-                }
-            }
-        }
-
-        //
-        //  Some non-manifold cases can have multiple fvar-values but without any discts
-        //  edges that would previously have identified mismatch (e.g. two faces meeting
-        //  at a common vertex), so deal with that case now that we've counted values:
-        //
-        if (!vIsManifold && !vertexMismatch[vIndex]) {
-            vertexMismatch[vIndex] = (uniqueValueCount > 1);
-        }
-
-        //
-        //  Update the value count and offset for this vertex and cumulative totals:
-        //
-        _vertSiblingCounts[vIndex]  = (LocalIndex) uniqueValueCount;
-        _vertSiblingOffsets[vIndex] = totalValueCount;
-
-        totalValueCount += uniqueValueCount;
-
-        //  Update the vert-face siblings from the local array above:
-        if (uniqueValueCount > 1) {
-            SiblingArray vFaceSiblings = getVertexFaceSiblings(vIndex);
-            for (int i = 0; i < vFaces.size(); ++i) {
-                vFaceSiblings[i] = vValueSiblings[i];
-            }
-        }
-    }
-
-    //
-    //  Now that we know the total number of additional sibling values (M values in addition
-    //  to the N vertex values) allocate space to accommodate all N + M vertex values.
-    //
-    //  Then make the second pass through the vertices to identify the values associated with
-    //  each and to inspect and tag local face-varying topology for those that don't match:
-    //
-    resizeVertexValues(totalValueCount);
-
-    for (int vIndex = 0; vIndex < _level.getNumVertices(); ++vIndex) {
-        ConstIndexArray       vFaces  = _level.getVertexFaces(vIndex);
-        ConstLocalIndexArray  vInFace = _level.getVertexFaceLocalIndices(vIndex);
-
-        //
-        //  First step is to assign the values associated with the faces by retrieving them
-        //  from the faces.  If the face-varying topology around this vertex matches the vertex
-        //  topology, there is little more to do as other members were bulk-initialized to
-        //  match, so we can continue immediately:
-        //
-        IndexArray vValues = getVertexValues(vIndex);
-
-        if (vFaces.size() > 0) {
-            vValues[0] = _faceVertValues[_level.getOffsetOfFaceVertices(vFaces[0]) + vInFace[0]];
-        } else {
-            vValues[0] = 0;
-        }
-        if (!vertexMismatch[vIndex]) {
-            continue;
-        }
-        if (vValues.size() > 1) {
-            ConstSiblingArray vFaceSiblings = getVertexFaceSiblings(vIndex);
-
-            for (int i = 1, nextSibling = 1; i < vFaces.size(); ++i) {
-                if (vFaceSiblings[i] == nextSibling) {
-                    vValues[nextSibling++] = _faceVertValues[_level.getOffsetOfFaceVertices(vFaces[i]) + vInFace[i]];
-                }
-            }
-        }
-
-        //  XXXX (barfowl) -- this pre-emptive sharpening of values will need to be
-        //  revisited soon.  This intentionally avoids the overhead of identifying the
-        //  local topology of the values along its boundaries -- necessary for smooth
-        //  boundary values but not for sharp as far as refining and limiting the
-        //  values is concerned.  But ultimately we need more information than just
-        //  the sharp tag when it comes to identifying and gathering FVar patches.
-        //
-        //  Currently values for non-manifold vertices are sharpened, and that may
-        //  also need to be revisited.
-        //
-        //  Until then...
-        //
-        //  If all values for this vertex are to be designated as sharp, the value tags
-        //  have already been initialized for this by default, so we can continue.  On
-        //  further inspection there may be other cases where all are determined to be
-        //  sharp, but use what information we can now to avoid that inspection:
-        //
-        //  Regarding sharpness of the vertex itself, its vertex tags reflect the inf-
-        //  or semi-sharp nature of the vertex and edges around it, so be careful not
-        //  to assume too much from say, the presence of an incident inf-sharp edge.
-        //  We can make clear decisions based on the sharpness of the vertex itself.
-        //
-        ValueTagArray vValueTags = getVertexValueTags(vIndex);
-
-        Level::VTag const vTag = _level.getVertexTag(vIndex);
-
-        bool allCornersAreSharp = _hasLinearBoundaries || vTag._infSharp || vTag._nonManifold ||
-                                  (_hasDependentSharpness && (vValues.size() > 2)) ||
-                                  (sharpenDarts && (vValues.size() == 1) && !vTag._boundary);
-
-        //
-        //  Values may be a mix of sharp corners and smooth boundaries -- start by
-        //  gathering information about the "span" of faces for each value.
-        //
-        //  Note that the term "span" presumes sequential and continuous, but the
-        //  result for a span may include multiple disconnected regions sharing the
-        //  common value -- think of a familiar non-manifold "bowtie" vertex in FVar
-        //  space.  Such spans are locally non-manifold but are marked as "disjoint"
-        //  to avoid overloading "non-manifold" here.
-        //
-        ValueSpan * vValueSpans = spanBuffer;
-        memset(vValueSpans, 0, vValues.size() * sizeof(ValueSpan));
-
-        gatherValueSpans(vIndex, vValueSpans);
-
-        //
-        //  Spans are identified as sharp or smooth based on their own local topology,
-        //  but the sharpness of one span may be dependent on the sharpness of another
-        //  if certain linear-interpolation options were specified.  Mark both as
-        //  infinitely sharp where possible (rather than semi-sharp) to avoid
-        //  re-assessing this dependency as sharpness is reduced during refinement.
-        //
-        bool hasDependentValuesToSharpen = false;
-        if (!allCornersAreSharp) {
-            if (_hasDependentSharpness && (vValues.size() == 2)) {
-                //  Detect interior inf-sharp or discts edges:
-                allCornersAreSharp = vValueSpans[0]._infSharpEdgeCount || vValueSpans[1]._infSharpEdgeCount ||
-                                     vValueSpans[0]._disctsEdgeCount   || vValueSpans[1]._disctsEdgeCount;
-
-                //  Detect a sharp corner, making both sharp:
-                if (sharpenBothIfOneCorner) {
-                    allCornersAreSharp |= (vValueSpans[0]._size == 1) || (vValueSpans[1]._size == 1);
-                }
-
-                //  If only one semi-sharp, need to mark the other as dependent on it:
-                hasDependentValuesToSharpen = (vValueSpans[0]._semiSharpEdgeCount > 0) !=
-                                              (vValueSpans[1]._semiSharpEdgeCount > 0);
-            }
-        }
-
-        //
-        //  Inspect each vertex value to determine if it is a smooth boundary (crease) and tag
-        //  it accordingly.  If not semi-sharp, be sure to consider those values sharpened by
-        //  the topology of other values.
-        //
-        for (int i = 0; i < vValues.size(); ++i) {
-            ValueTag & valueTag = vValueTags[i];
-
-            valueTag.clear();
-            valueTag._mismatch = true;
-
-            ValueSpan const & vSpan = vValueSpans[i];
-            if (vSpan._disctsEdgeCount) {
-                valueTag._nonManifold = true;
-                continue;
-            }
-            assert(vSpan._size != 0);
-
-            bool isInfSharp = allCornersAreSharp || vSpan._infSharpEdgeCount ||
-                              ((vSpan._size == 1) && fvarCornersAreSharp);
-
-            if (vSpan._size == 1) {
-                valueTag._xordinary = !isInfSharp;
-            } else {
-                valueTag._xordinary = (vSpan._size != regularBoundaryValence);
-            }
-
-            valueTag._infSharpEdges = (vSpan._infSharpEdgeCount > 0);
-            valueTag._infIrregular = vSpan._infSharpEdgeCount ? ((vSpan._size - vSpan._infSharpEdgeCount) > 1)
-                                   : (isInfSharp ? (vSpan._size > 1) : valueTag._xordinary);
-
-            if (!isInfSharp) {
-                //
-                //  Remember that a semi-sharp value (or one dependent on one) needs to be
-                //  treated as a corner (at least three sharp edges or one sharp vertex)
-                //  until the sharpness has decayed, so don't tag them as creases here.
-                //  But do initialize and maintain the ends of the crease until needed.
-                //
-                if (vSpan._semiSharpEdgeCount || vTag._semiSharp) {
-                    valueTag._semiSharp = true;
-                } else if (hasDependentValuesToSharpen) {
-                    valueTag._semiSharp = true;
-                    valueTag._depSharp = true;
-                } else {
-                    valueTag._crease = true;
-                }
-
-                if (hasCreaseEnds()) {
-                    CreaseEndPair & valueCrease = getVertexValueCreaseEnds(vIndex)[i];
-
-                    valueCrease._startFace = vSpan._start;
-                    if ((i == 0) && (vSpan._start != 0)) {
-                        valueCrease._endFace = (LocalIndex) (vSpan._start + vSpan._size - 1 - vFaces.size());
-                    } else {
-                        valueCrease._endFace = (LocalIndex) (vSpan._start + vSpan._size - 1);
-                    }
-                }
-            }
-        }
-    }
-    //printf("completed fvar topology...\n");
-    //print();
-    //printf("validating...\n");
-    //assert(validate());
-}
-
-//
-//  Values tagged as creases have their two "end values" identified relative to the incident
-//  faces of the vertex for compact storage and quick retrieval.  This method identifies the
-//  values for the two ends of such a crease value:
-//
-void
-FVarLevel::getVertexCreaseEndValues(Index vIndex, Sibling vSibling, Index endValues[2]) const {
-
-    ConstCreaseEndPairArray vValueCreaseEnds = getVertexValueCreaseEnds(vIndex);
-
-    ConstIndexArray      vFaces  = _level.getVertexFaces(vIndex);
-    ConstLocalIndexArray vInFace = _level.getVertexFaceLocalIndices(vIndex);
-
-    LocalIndex vertFace0 = vValueCreaseEnds[vSibling]._startFace;
-    LocalIndex vertFace1 = vValueCreaseEnds[vSibling]._endFace;
-
-    ConstIndexArray face0Values = getFaceValues(vFaces[vertFace0]);
-    ConstIndexArray face1Values = getFaceValues(vFaces[vertFace1]);
-
-    int endInFace0 = vInFace[vertFace0];
-    int endInFace1 = vInFace[vertFace1];
-
-    endInFace0 = (endInFace0 == (face0Values.size() - 1)) ? 0 : (endInFace0 + 1);
-    endInFace1 = (endInFace1 ? endInFace1 : face1Values.size()) - 1;
-
-    endValues[0] = face0Values[endInFace0];
-    endValues[1] = face1Values[endInFace1];
-}
-
-//
-//  Debugging aids...
-//
-bool
-FVarLevel::validate() const {
-
-    //
-    //  Verify that member sizes match sizes for the associated level:
-    //
-    if ((int)_vertSiblingCounts.size() != _level.getNumVertices()) {
-        printf("Error:  vertex count mismatch\n");
-        return false;
-    }
-    if ((int)_edgeTags.size() != _level.getNumEdges()) {
-        printf("Error:  edge count mismatch\n");
-        return false;
-    }
-    if ((int)_faceVertValues.size() != _level.getNumFaceVerticesTotal()) {
-        printf("Error:  face-value/face-vert count mismatch\n");
-        return false;
-    }
-    if (_level.getDepth() > 0) {
-        if (_valueCount != (int)_vertValueIndices.size()) {
-            printf("Error:  value/vertex-value count mismatch\n");
-            return false;
-        }
-    }
-
-    //
-    //  Verify that face-verts and (locally computed) face-vert siblings yield the
-    //  expected face-vert values:
-    //
-    std::vector<Sibling> fvSiblingVector;
-    buildFaceVertexSiblingsFromVertexFaceSiblings(fvSiblingVector);
-
-    for (int fIndex = 0; fIndex < _level.getNumFaces(); ++fIndex) {
-        ConstIndexArray     fVerts = _level.getFaceVertices(fIndex);
-        ConstIndexArray    fValues = getFaceValues(fIndex);
-        Sibling const  * fSiblings = &fvSiblingVector[_level.getOffsetOfFaceVertices(fIndex)];
-
-        for (int fvIndex = 0; fvIndex < fVerts.size(); ++fvIndex) {
-            Index vIndex = fVerts[fvIndex];
-
-            Index   fvValue   = fValues[fvIndex];
-            Sibling fvSibling = fSiblings[fvIndex];
-            if (fvSibling >= getNumVertexValues(vIndex)) {
-                printf("Error:  invalid sibling %d for face-vert %d.%d = %d\n", fvSibling, fIndex, fvIndex, vIndex);
-                return false;
-            }
-
-            Index testValue = getVertexValue(vIndex, fvSibling);
-            if (testValue != fvValue) {
-                printf("Error:  unexpected value %d for sibling %d of face-vert %d.%d = %d (expecting %d)\n",
-                        testValue, fvSibling, fIndex, fvIndex, vIndex, fvValue);
-                return false;
-            }
-        }
-    }
-
-    //
-    //  Verify that the vert-face siblings yield the expected value:
-    //
-    for (int vIndex = 0; vIndex < _level.getNumVertices(); ++vIndex) {
-        ConstIndexArray      vFaces    = _level.getVertexFaces(vIndex);
-        ConstLocalIndexArray vInFace   = _level.getVertexFaceLocalIndices(vIndex);
-        ConstSiblingArray    vSiblings = getVertexFaceSiblings(vIndex);
-
-        for (int j = 0; j < vFaces.size(); ++j) {
-            Sibling vSibling = vSiblings[j];
-            if (vSibling >= getNumVertexValues(vIndex)) {
-                printf("Error:  invalid sibling %d at vert-face %d.%d\n", vSibling, vIndex, j);
-                return false;
-            }
-
-            Index fIndex  = vFaces[j];
-            int   fvIndex = vInFace[j];
-            Index fvValue = getFaceValues(fIndex)[fvIndex];
-
-            Index vValue = getVertexValue(vIndex, vSibling);
-            if (vValue != fvValue) {
-                printf("Error:  value mismatch between face-vert %d.%d and vert-face %d.%d (%d != %d)\n",
-                        fIndex, fvIndex, vIndex, j, fvValue, vValue);
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-void
-FVarLevel::print() const {
-
-    std::vector<Sibling> fvSiblingVector;
-    buildFaceVertexSiblingsFromVertexFaceSiblings(fvSiblingVector);
-
-    printf("Face-varying data channel:\n");
-    printf("  Inventory:\n");
-    printf("    vertex count       = %d\n", _level.getNumVertices());
-    printf("    source value count = %d\n", _valueCount);
-    printf("    vertex value count = %d\n", (int)_vertValueIndices.size());
-
-    printf("  Face values:\n");
-    for (int i = 0; i < _level.getNumFaces(); ++i) {
-        ConstIndexArray  fVerts    = _level.getFaceVertices(i);
-        ConstIndexArray  fValues   = getFaceValues(i);
-        Sibling const  * fSiblings = &fvSiblingVector[_level.getOffsetOfFaceVertices(i)];
-
-        printf("    face%4d:  ", i);
-
-        printf("verts =");
-        for (int j = 0; j < fVerts.size(); ++j) {
-            printf("%4d", fVerts[j]);
-        }
-        printf(",  values =");
-        for (int j = 0; j < fValues.size(); ++j) {
-            printf("%4d", fValues[j]);
-        }
-        printf(",  siblings =");
-        for (int j = 0; j < fVerts.size(); ++j) {
-            printf("%4d", (int)fSiblings[j]);
-        }
-        printf("\n");
-    }
-
-    printf("  Vertex values:\n");
-    for (int i = 0; i < _level.getNumVertices(); ++i) {
-        int vCount  = getNumVertexValues(i);
-        int vOffset = getVertexValueOffset(i);
-
-        printf("    vert%4d:  vcount = %1d, voffset =%4d, ", i, vCount, vOffset);
-
-        ConstIndexArray vValues = getVertexValues(i);
-
-        printf("values =");
-        for (int j = 0; j < vValues.size(); ++j) {
-            printf("%4d", vValues[j]);
-        }
-        if (vCount > 1) {
-            ConstValueTagArray vValueTags = getVertexValueTags(i);
-
-            printf(", crease =");
-            for (int j = 0; j < vValueTags.size(); ++j) {
-                printf("%4d", vValueTags[j]._crease);
-            }
-            printf(", semi-sharp =");
-            for (int j = 0; j < vValueTags.size(); ++j) {
-                printf("%2d", vValueTags[j]._semiSharp);
-            }
-        }
-        printf("\n");
-    }
-
-    printf("  Edge discontinuities:\n");
-    for (int i = 0; i < _level.getNumEdges(); ++i) {
-        ETag const eTag = getEdgeTag(i);
-        if (eTag._mismatch) {
-            ConstIndexArray eVerts = _level.getEdgeVertices(i);
-            printf("    edge%4d:  verts = [%4d%4d], discts = [%d,%d]\n", i, eVerts[0], eVerts[1],
-                    eTag._disctsV0, eTag._disctsV1);
-        }
-    }
-}
-
-
-
-void
-FVarLevel::initializeFaceValuesFromFaceVertices() {
-
-    ConstIndexArray srcFaceVerts = _level.getFaceVertices();
-    Index *         dstFaceValues = &_faceVertValues[0];
-
-    std::memcpy(dstFaceValues, &srcFaceVerts[0], srcFaceVerts.size() * sizeof(Index));
-}
-
-
-void
-FVarLevel::initializeFaceValuesFromVertexFaceSiblings() {
-    //
-    //  Iterate through all face-values first and initialize them with the first value
-    //  associated with each face-vertex.  Then make a second sparse pass through the
-    //  vertex-faces to offset those with multiple values.  This turns out to be much
-    //  more efficient than a single iteration through the vertex-faces since the first
-    //  pass is much more memory coherent.
-    //
-    ConstIndexArray fvIndices = _level.getFaceVertices();
-    for (int i = 0; i < fvIndices.size(); ++i) {
-        _faceVertValues[i] = getVertexValueOffset(fvIndices[i]);
-    }
-
-    //
-    //  Now use the vert-face-siblings to populate the face-vert-values:
-    //
-    for (int vIndex = 0; vIndex < _level.getNumVertices(); ++vIndex) {
-        if (getNumVertexValues(vIndex) > 1) {
-            ConstIndexArray      vFaces    = _level.getVertexFaces(vIndex);
-            ConstLocalIndexArray vInFace   = _level.getVertexFaceLocalIndices(vIndex);
-            ConstSiblingArray    vSiblings = getVertexFaceSiblings(vIndex);
-
-            for (int j = 0; j < vFaces.size(); ++j) {
-                if (vSiblings[j]) {
-                    int fvOffset = _level.getOffsetOfFaceVertices(vFaces[j]);
-
-                    _faceVertValues[fvOffset + vInFace[j]] += vSiblings[j];
-                }
-            }
-        }
-    }
-}
-
-void
-FVarLevel::buildFaceVertexSiblingsFromVertexFaceSiblings(std::vector<Sibling>& fvSiblings) const {
-
-    fvSiblings.resize(_level.getNumFaceVerticesTotal());
-    std::memset(&fvSiblings[0], 0, _level.getNumFaceVerticesTotal() * sizeof(Sibling));
-
-    for (int vIndex = 0; vIndex < _level.getNumVertices(); ++vIndex) {
-        //  We can skip cases of one sibling as we initialized to 0...
-        if (getNumVertexValues(vIndex) > 1) {
-            ConstIndexArray      vFaces    = _level.getVertexFaces(vIndex);
-            ConstLocalIndexArray vInFace   = _level.getVertexFaceLocalIndices(vIndex);
-            ConstSiblingArray    vSiblings = getVertexFaceSiblings(vIndex);
-
-            for (int j = 0; j < vFaces.size(); ++j) {
-                if (vSiblings[j] > 0) {
-                    fvSiblings[_level.getOffsetOfFaceVertices(vFaces[j]) + vInFace[j]] = vSiblings[j];
-                }
-            }
-        }
-    }
-}
-
-
-//
-//  Higher-level topological queries, i.e. values in a neighborhood:
-//    - given an edge, return values corresponding to its vertices within a given face
-//    - given a vertex, return values corresponding to verts at the ends of its edges
-//
-void
-FVarLevel::getEdgeFaceValues(Index eIndex, int fIncToEdge, Index valuesPerVert[2]) const {
-
-    ConstIndexArray eVerts = _level.getEdgeVertices(eIndex);
-
-    if ((getNumVertexValues(eVerts[0]) + getNumVertexValues(eVerts[1])) > 2) {
-        Index eFace   = _level.getEdgeFaces(eIndex)[fIncToEdge];
-        int   eInFace = _level.getEdgeFaceLocalIndices(eIndex)[fIncToEdge];
-
-        ConstIndexArray fValues = getFaceValues(eFace);
-
-        valuesPerVert[0] = fValues[eInFace];
-        valuesPerVert[1] = fValues[((eInFace + 1) < fValues.size()) ? (eInFace + 1) : 0];
-
-        //  Given the way these two end-values are used (both weights the same) we really
-        //  don't need to ensure the value pair matches the vertex pair...
-        if (eVerts[0] != _level.getFaceVertices(eFace)[eInFace]) {
-            std::swap(valuesPerVert[0], valuesPerVert[1]);
-        }
-    } else {
-        //  Remember the extra level of indirection at level 0 -- avoid it here:
-        if (_level.getDepth() > 0) {
-            valuesPerVert[0] = getVertexValueOffset(eVerts[0]);
-            valuesPerVert[1] = getVertexValueOffset(eVerts[1]);
-        } else {
-            valuesPerVert[0] = getVertexValue(eVerts[0]);
-            valuesPerVert[1] = getVertexValue(eVerts[1]);
-        }
-    }
-}
-
-void
-FVarLevel::getVertexEdgeValues(Index vIndex, Index valuesPerEdge[]) const {
-
-    ConstIndexArray      vEdges  = _level.getVertexEdges(vIndex);
-    ConstLocalIndexArray vInEdge = _level.getVertexEdgeLocalIndices(vIndex);
-
-    ConstIndexArray      vFaces  = _level.getVertexFaces(vIndex);
-    ConstLocalIndexArray vInFace = _level.getVertexFaceLocalIndices(vIndex);
-
-    bool vIsBoundary = _level.getVertexTag(vIndex)._boundary;
-    bool vIsManifold = ! _level.getVertexTag(vIndex)._nonManifold;
-
-    bool isBaseLevel = (_level.getDepth() == 0);
-
-    for (int i = 0; i < vEdges.size(); ++i) {
-        Index           eIndex = vEdges[i];
-        ConstIndexArray eVerts = _level.getEdgeVertices(eIndex);
-
-        //  Remember this method is for presumed continuous edges around the vertex:
-        assert(edgeTopologyMatches(eIndex));
-
-        Index vOther = eVerts[!vInEdge[i]];
-        if (getNumVertexValues(vOther) == 1) {
-            valuesPerEdge[i] = isBaseLevel ? getVertexValue(vOther) : getVertexValueOffset(vOther);
-        } else if (vIsManifold) {
-            if (vIsBoundary && (i == (vEdges.size() - 1))) {
-                ConstIndexArray fValues = getFaceValues(vFaces[i-1]);
-
-                int prevInFace = vInFace[i-1] ? (vInFace[i-1] - 1) : (fValues.size() - 1);
-                valuesPerEdge[i] = fValues[prevInFace];
-            } else {
-                ConstIndexArray fValues = getFaceValues(vFaces[i]);
-
-                int nextInFace = (vInFace[i] == (fValues.size() - 1)) ? 0 : (vInFace[i] + 1);
-                valuesPerEdge[i] = fValues[nextInFace];
-            }
-        } else {
-            Index eFace0   = _level.getEdgeFaces(eIndex)[0];
-            int   eInFace0 = _level.getEdgeFaceLocalIndices(eIndex)[0];
-
-            ConstIndexArray fVerts  = _level.getFaceVertices(eFace0);
-            ConstIndexArray fValues = getFaceValues(eFace0);
-            if (vOther == fVerts[eInFace0]) {
-                valuesPerEdge[i] = fValues[eInFace0];
-            } else {
-                int valueInFace = (eInFace0 == (fValues.size() - 1)) ? 0 : (eInFace0 + 1);
-                valuesPerEdge[i] = fValues[valueInFace];
-            }
-        }
-    }
-}
-
-//
-//  Gather information about the "span" of faces for each value:
-//
-//  The "size" (number of faces in which each value occurs), is most immediately useful
-//  in determining whether a value is a corner or smooth boundary, while other properties
-//  such as the first face and whether or not the span is interrupted by discts, semi-
-//  sharp or infinite edges, are useful to fully qualify smooth boundaries by the caller.
-//
-void
-FVarLevel::gatherValueSpans(Index vIndex, ValueSpan * vValueSpans) const {
-
-    ConstIndexArray vEdges = _level.getVertexEdges(vIndex);
-    ConstIndexArray vFaces = _level.getVertexFaces(vIndex);
-
-    ConstSiblingArray vFaceSiblings = getVertexFaceSiblings(vIndex);
-
-    bool vHasSingleValue = (getNumVertexValues(vIndex) == 1);
-    bool vIsBoundary = vEdges.size() > vFaces.size();
-    bool vIsNonManifold = _level.getVertexTag(vIndex)._nonManifold;
-
-    if (vIsNonManifold) {
-        //  This needs more work as spans around a non-manifold vertex may themselves be
-        //  manifold.  Just mark all spans with a discts edge for now to trigger them 
-        //  non-manifold
-
-        ConstIndexArray vValues = getVertexValues(vIndex);
-        for (int i = 0; i < vValues.size(); ++i) {
-            vValueSpans[i]._size = 0;
-            vValueSpans[i]._disctsEdgeCount = 1;
-        }
-    } else if (vHasSingleValue && !vIsBoundary) {
-        //  Mark an interior dart disjoint if more than one discts edge:
-        vValueSpans[0]._size  = 0;
-        vValueSpans[0]._start = 0;
-        for (int i = 0; i < vEdges.size(); ++i) {
-            if (_edgeTags[vEdges[i]]._mismatch) {
-                if (vValueSpans[0]._size > 0) {
-                    vValueSpans[0]._disctsEdgeCount = 1;
-                    break;
-                } else {
-                    vValueSpans[0]._size  = (LocalIndex) vFaces.size();
-                    vValueSpans[0]._start = (LocalIndex) i;
-                }
-            } else if (_level.getEdgeTag(vEdges[i])._infSharp) {
-                ++ vValueSpans[0]._infSharpEdgeCount;
-            } else if (_level.getEdgeTag(vEdges[i])._semiSharp) {
-                ++ vValueSpans[0]._semiSharpEdgeCount;
-            }
-        }
-        vValueSpans[0]._size = (LocalIndex) vFaces.size();
-    } else {
-        //  Walk around the vertex and accumulate span info for each value -- be
-        //  careful about the span for the first value "wrapping" around:
-        vValueSpans[0]._size  = 1;
-        vValueSpans[0]._start = 0;
-        if (!vIsBoundary && (vFaceSiblings[vFaces.size() - 1] == 0)) {
-            if (_edgeTags[vEdges[0]]._mismatch) {
-                ++ vValueSpans[0]._disctsEdgeCount;
-            } else if (_level.getEdgeTag(vEdges[0])._infSharp) {
-                ++ vValueSpans[0]._infSharpEdgeCount;
-            } else if (_level.getEdgeTag(vEdges[0])._semiSharp) {
-                ++ vValueSpans[0]._semiSharpEdgeCount;
-            }
-        }
-        for (int i = 1; i < vFaces.size(); ++i) {
-            if (vFaceSiblings[i] == vFaceSiblings[i-1]) {
-                if (_edgeTags[vEdges[i]]._mismatch) {
-                    ++ vValueSpans[vFaceSiblings[i]]._disctsEdgeCount;
-                } else if (_level.getEdgeTag(vEdges[i])._infSharp) {
-                    ++ vValueSpans[vFaceSiblings[i]]._infSharpEdgeCount;
-                } else if (_level.getEdgeTag(vEdges[i])._semiSharp) {
-                    ++ vValueSpans[vFaceSiblings[i]]._semiSharpEdgeCount;
-                }
-            } else {
-                //  If we have already set the span for this value, mark disjoint
-                if (vValueSpans[vFaceSiblings[i]]._size > 0) {
-                    ++ vValueSpans[vFaceSiblings[i]]._disctsEdgeCount;
-                }
-                vValueSpans[vFaceSiblings[i]]._start = (LocalIndex) i;
-            }
-            ++ vValueSpans[vFaceSiblings[i]]._size;
-        }
-        //  If the span for value 0 has wrapped around, decrement the disjoint added
-        //  at the interior edge where it started the closing part of the span:
-        if ((vFaceSiblings[vFaces.size() - 1] == 0) && !vIsBoundary) {
-            -- vValueSpans[0]._disctsEdgeCount;
-        }
-    }
-}
-
-//
-//  Methods to retrieve and combine value and vertex tags:
-//
-void
-FVarLevel::getFaceValueTags(Index faceIndex, ValueTag valueTags[]) const {
-
-    ConstIndexArray faceValues = getFaceValues(faceIndex);
-    ConstIndexArray faceVerts  = _level.getFaceVertices(faceIndex);
-
-    for (int i = 0; i < faceValues.size(); ++i) {
-        Index srcValueIndex = findVertexValueIndex(faceVerts[i], faceValues[i]);
-        assert(_vertValueIndices[srcValueIndex] == faceValues[i]);
-
-        valueTags[i] = _vertValueTags[srcValueIndex];
-    }
-}
-
-FVarLevel::ValueTag
-FVarLevel::getFaceCompositeValueTag(Index faceIndex) const {
-
-    ConstIndexArray faceValues = getFaceValues(faceIndex);
-    ConstIndexArray faceVerts  = _level.getFaceVertices(faceIndex);
-
-    typedef ValueTag::ValueTagSize ValueTagSize;
-
-    ValueTagSize compInt = 0;
-    for (int i = 0; i < faceValues.size(); ++i) {
-        Index srcValueIndex = findVertexValueIndex(faceVerts[i], faceValues[i]);
-        assert(_vertValueIndices[srcValueIndex] == faceValues[i]);
-
-        ValueTag const &   srcTag = _vertValueTags[srcValueIndex];
-        ValueTagSize const srcInt = srcTag.getBits();
-
-        compInt |= srcInt;
-    }
-    return ValueTag(compInt);
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarLevel.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarLevel.h
deleted file mode 100644
index 48ddf0413..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarLevel.h
+++ /dev/null
@@ -1,439 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_FVAR_LEVEL_H
-#define OPENSUBDIV3_VTR_FVAR_LEVEL_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-#include "../sdc/crease.h"
-#include "../sdc/options.h"
-#include "../vtr/types.h"
-#include "../vtr/level.h"
-
-#include <vector>
-#include <cassert>
-#include <cstring>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  FVarLevel:
-//      A "face-varying channel" includes the topology for a set of face-varying
-//  data, relative to the topology of the Level with which it is associated.
-//
-//  Analogous to a set of vertices and face-vertices that define the topology for
-//  the geometry, a channel requires a set of "values" and "face-values".  The
-//  "values" are indices of entries in a set of face-varying data, just as vertices
-//  are indices into a set of vertex data.  The face-values identify a value for
-//  each vertex of the face, and so define topology for the values that may be
-//  unique to each channel.
-//
-//  In addition to the value size and the vector of face-values (which matches the
-//  size of the geometry's face-vertices), tags are associated with each component
-//  to identify deviations of the face-varying topology from the vertex topology.
-//  And since there may be a one-to-many mapping between vertices and face-varying
-//  values, that mapping is also allocated.
-//
-//  It turns out that the mapping used is able to completely encode the set of
-//  face-values and is more amenable to refinement.  Currently the face-values
-//  take up almost half the memory of this representation, so if memory does
-//  become a concern, we do not need to store them.  The only reason we do so now
-//  is that the face-value interface for specifying base topology and inspecting
-//  subsequent levels is very familiar to that of face-vertices for clients.  So
-//  having them available for such access is convenient.
-//
-//  Regarding scope and access...
-//      Unclear at this early state, but leaning towards nesting this class within
-//  Level, given the intimate dependency between the two.
-//      Everything is being declared public for now to facilitate access until it's
-//  clearer how this functionality will be provided.
-//
-class FVarLevel {
-public:
-    //
-    //  Component tags -- trying to minimize the types needed here:
-    //
-    //  Tag per Edge:
-    //      - facilitates topological analysis around each vertex
-    //      - required during refinement to spawn one or more edge-values
-    //
-    struct ETag {
-        ETag() { }
-
-        void clear() { std::memset(this, 0, sizeof(ETag)); }
-
-        typedef unsigned char ETagSize;
-
-        ETagSize _mismatch : 1;  // local FVar topology does not match
-        ETagSize _disctsV0 : 1;  // discontinuous at vertex 0
-        ETagSize _disctsV1 : 1;  // discontinuous at vertex 1
-        ETagSize _linear   : 1;  // linear boundary constraints
-
-        Level::ETag combineWithLevelETag(Level::ETag) const;
-    };
-
-    //
-    //  Tag per Value:
-    //      - informs both refinement and interpolation
-    //          - every value spawns a child value in refinement
-    //      - includes a subset of Level::VTag to be later combined with a VTag
-    //
-    struct ValueTag {
-        ValueTag() { }
-
-        void clear() { std::memset(this, 0, sizeof(ValueTag)); }
-
-        bool isMismatch() const    { return _mismatch; }
-        bool isCrease() const      { return _crease; }
-        bool isCorner() const      { return !_crease; }
-        bool isSemiSharp() const   { return _semiSharp; }
-        bool isInfSharp() const    { return !_semiSharp && !_crease; }
-        bool isDepSharp() const    { return _depSharp; }
-        bool hasCreaseEnds() const { return _crease || _semiSharp; }
-
-        bool hasInfSharpEdges() const   { return _infSharpEdges; }
-        bool hasInfIrregularity() const { return _infIrregular; }
-
-        typedef unsigned char ValueTagSize;
-
-        //  If there is no mismatch, no other members should be inspected
-        ValueTagSize _mismatch    : 1;  // local FVar topology does not match
-        ValueTagSize _xordinary   : 1;  // local FVar topology is extra-ordinary
-        ValueTagSize _nonManifold : 1;  // local FVar topology is non-manifold
-        ValueTagSize _crease      : 1;  // value is a crease, otherwise a corner
-        ValueTagSize _semiSharp   : 1;  // value is a corner decaying to crease
-        ValueTagSize _depSharp    : 1;  // value is a corner by dependency on another
-
-        ValueTagSize _infSharpEdges : 1;  // value is a corner by inf-sharp features
-        ValueTagSize _infIrregular  : 1;  // value span includes inf-sharp irregularity
-
-        Level::VTag combineWithLevelVTag(Level::VTag) const;
-
-        //  Alternate constructor and accessor for dealing with integer bits directly:
-        explicit ValueTag(ValueTagSize bits) {
-            std::memcpy(this, &bits, sizeof(bits));
-        }
-        ValueTagSize getBits() const {
-            ValueTagSize bits;
-            std::memcpy(&bits, this, sizeof(bits));
-            return bits;
-        }
-    };
-
-    typedef Vtr::ConstArray<ValueTag> ConstValueTagArray;
-    typedef Vtr::Array<ValueTag> ValueTagArray;
-
-    //
-    //  Simple struct containing the "end faces" of a crease, i.e. the faces which
-    //  contain the FVar values to be used when interpolating the crease.  (Prefer
-    //  the struct over std::pair for its member names)
-    //
-    struct CreaseEndPair {
-        LocalIndex _startFace;
-        LocalIndex _endFace;
-    };
-
-    typedef Vtr::ConstArray<CreaseEndPair> ConstCreaseEndPairArray;
-    typedef Vtr::Array<CreaseEndPair> CreaseEndPairArray;
-
-    typedef LocalIndex      Sibling;
-
-    typedef ConstLocalIndexArray ConstSiblingArray;
-    typedef LocalIndexArray SiblingArray;
-
-public:
-    FVarLevel(Level const& level);
-    ~FVarLevel();
-
-    //  Queries for the entire channel:
-    Level const& getLevel() const { return _level; }
-
-    int getNumValues() const          { return _valueCount; }
-    int getNumFaceValuesTotal() const { return (int) _faceVertValues.size(); }
-
-    bool isLinear() const            { return _isLinear; }
-    bool hasLinearBoundaries() const { return _hasLinearBoundaries; }
-    bool hasSmoothBoundaries() const { return ! _hasLinearBoundaries; }
-    bool hasCreaseEnds() const       { return hasSmoothBoundaries(); }
-
-    Sdc::Options getOptions() const { return _options; }
-
-    //  Queries per face:
-    ConstIndexArray  getFaceValues(Index fIndex) const;
-    IndexArray       getFaceValues(Index fIndex);
-
-    //  Queries per edge:
-    ETag getEdgeTag(Index eIndex) const          { return _edgeTags[eIndex]; }
-    bool edgeTopologyMatches(Index eIndex) const { return !getEdgeTag(eIndex)._mismatch; }
-
-    //  Queries per vertex (and its potential sibling values):
-    int   getNumVertexValues(Index v) const                  { return _vertSiblingCounts[v]; }
-    Index getVertexValueOffset(Index v, Sibling i = 0) const { return _vertSiblingOffsets[v] + i; }
-
-    Index getVertexValue(Index v, Sibling i = 0) const { return _vertValueIndices[getVertexValueOffset(v,i)]; }
-
-    Index findVertexValueIndex(Index vertexIndex, Index valueIndex) const;
-
-    //  Methods to access/modify array properties per vertex:
-    ConstIndexArray  getVertexValues(Index vIndex) const;
-    IndexArray       getVertexValues(Index vIndex);
-
-    ConstValueTagArray  getVertexValueTags(Index vIndex) const;
-    ValueTagArray       getVertexValueTags(Index vIndex);
-
-    ConstCreaseEndPairArray  getVertexValueCreaseEnds(Index vIndex) const;
-    CreaseEndPairArray       getVertexValueCreaseEnds(Index vIndex);
-
-    ConstSiblingArray  getVertexFaceSiblings(Index vIndex) const;
-    SiblingArray       getVertexFaceSiblings(Index vIndex);
-
-    //  Queries per value:
-    ValueTag getValueTag(Index valueIndex) const          { return _vertValueTags[valueIndex]; }
-    bool     valueTopologyMatches(Index valueIndex) const { return !getValueTag(valueIndex)._mismatch; }
-
-    CreaseEndPair getValueCreaseEndPair(Index valueIndex) const { return _vertValueCreaseEnds[valueIndex]; }
-
-    //  Tag queries related to faces (use Level methods for those returning Level::VTag/ETag)
-    void getFaceValueTags(Index faceIndex, ValueTag valueTags[]) const;
-
-    ValueTag getFaceCompositeValueTag(Index faceIndex) const;
-
-    //  Higher-level topological queries, i.e. values in a neighborhood:
-    void getEdgeFaceValues(Index eIndex, int fIncToEdge, Index valuesPerVert[2]) const;
-    void getVertexEdgeValues(Index vIndex, Index valuesPerEdge[]) const;
-    void getVertexCreaseEndValues(Index vIndex, Sibling sibling, Index endValues[2]) const;
-
-    //  Initialization and allocation helpers:
-    void setOptions(Sdc::Options const& options);
-    void resizeVertexValues(int numVertexValues);
-    void resizeValues(int numValues);
-    void resizeComponents();
-
-    //  Topological analysis methods -- tagging and face-value population:
-    void completeTopologyFromFaceValues(int regBoundaryValence);
-    void initializeFaceValuesFromFaceVertices();
-    void initializeFaceValuesFromVertexFaceSiblings();
-
-    struct ValueSpan;
-    void gatherValueSpans(Index vIndex, ValueSpan * vValueSpans) const;
-
-    //  Debugging methods:
-    bool validate() const;
-    void print() const;
-    void buildFaceVertexSiblingsFromVertexFaceSiblings(std::vector<Sibling>& fvSiblings) const;
-
-private:
-    //  Just as Refinements build Levels, FVarRefinements build FVarLevels...
-    friend class FVarRefinement;
-
-    Level const & _level;
-
-    //  Linear interpolation options vary between channels:
-    Sdc::Options _options;
-
-    bool _isLinear;
-    bool _hasLinearBoundaries;
-    bool _hasDependentSharpness;
-    int  _valueCount;
-
-    //
-    //  Vectors recording face-varying topology including tags that help propagate
-    //  data through the refinement hierarchy.  Vectors are not sparse but most use
-    //  8-bit values relative to the local topology.
-    //
-    //  The vector of face-values is actually redundant here, but is constructed as
-    //  it is most convenient for clients.  It represents almost half the memory of
-    //  the topology (4 32-bit integers per face) and not surprisingly, populating
-    //  it takes a considerable amount of the refinement time (1/3).  We can reduce
-    //  both if we are willing to compute these on demand for clients.
-    //
-    //  Per-face (matches face-verts of corresponding level):
-    std::vector<Index> _faceVertValues;
-
-    //  Per-edge:
-    std::vector<ETag> _edgeTags;
-
-    //  Per-vertex:
-    std::vector<Sibling>  _vertSiblingCounts;
-    std::vector<int>      _vertSiblingOffsets;
-    std::vector<Sibling>  _vertFaceSiblings;
-
-    //  Per-value:
-    std::vector<Index>         _vertValueIndices;
-    std::vector<ValueTag>      _vertValueTags;
-    std::vector<CreaseEndPair> _vertValueCreaseEnds;
-};
-
-//
-//  Access/modify the values associated with each face:
-//
-inline ConstIndexArray
-FVarLevel::getFaceValues(Index fIndex) const {
-
-    int vCount  = _level.getNumFaceVertices(fIndex);
-    int vOffset = _level.getOffsetOfFaceVertices(fIndex);
-    return ConstIndexArray(&_faceVertValues[vOffset], vCount);
-}
-inline IndexArray
-FVarLevel::getFaceValues(Index fIndex) {
-
-    int vCount  = _level.getNumFaceVertices(fIndex);
-    int vOffset = _level.getOffsetOfFaceVertices(fIndex);
-    return IndexArray(&_faceVertValues[vOffset], vCount);
-}
-
-inline FVarLevel::ConstSiblingArray
-FVarLevel::getVertexFaceSiblings(Index vIndex) const {
-
-    int vCount  = _level.getNumVertexFaces(vIndex);
-    int vOffset = _level.getOffsetOfVertexFaces(vIndex);
-    return ConstSiblingArray(&_vertFaceSiblings[vOffset], vCount);
-}
-inline FVarLevel::SiblingArray
-FVarLevel::getVertexFaceSiblings(Index vIndex) {
-
-    int vCount  = _level.getNumVertexFaces(vIndex);
-    int vOffset = _level.getOffsetOfVertexFaces(vIndex);
-    return SiblingArray(&_vertFaceSiblings[vOffset], vCount);
-}
-
-inline ConstIndexArray
-FVarLevel::getVertexValues(Index vIndex) const
-{
-    int vCount  = getNumVertexValues(vIndex);
-    int vOffset = getVertexValueOffset(vIndex);
-    return ConstIndexArray(&_vertValueIndices[vOffset], vCount);
-}
-inline IndexArray
-FVarLevel::getVertexValues(Index vIndex)
-{
-    int vCount  = getNumVertexValues(vIndex);
-    int vOffset = getVertexValueOffset(vIndex);
-    return IndexArray(&_vertValueIndices[vOffset], vCount);
-}
-
-inline FVarLevel::ConstValueTagArray
-FVarLevel::getVertexValueTags(Index vIndex) const
-{
-    int vCount  = getNumVertexValues(vIndex);
-    int vOffset = getVertexValueOffset(vIndex);
-    return ConstValueTagArray(&_vertValueTags[vOffset], vCount);
-}
-inline FVarLevel::ValueTagArray
-FVarLevel::getVertexValueTags(Index vIndex)
-{
-    int vCount  = getNumVertexValues(vIndex);
-    int vOffset = getVertexValueOffset(vIndex);
-    return ValueTagArray(&_vertValueTags[vOffset], vCount);
-}
-
-inline FVarLevel::ConstCreaseEndPairArray
-FVarLevel::getVertexValueCreaseEnds(Index vIndex) const
-{
-    int vCount  = getNumVertexValues(vIndex);
-    int vOffset = getVertexValueOffset(vIndex);
-    return ConstCreaseEndPairArray(&_vertValueCreaseEnds[vOffset], vCount);
-}
-inline FVarLevel::CreaseEndPairArray
-FVarLevel::getVertexValueCreaseEnds(Index vIndex)
-{
-    int vCount  = getNumVertexValues(vIndex);
-    int vOffset = getVertexValueOffset(vIndex);
-    return CreaseEndPairArray(&_vertValueCreaseEnds[vOffset], vCount);
-}
-
-inline Index
-FVarLevel::findVertexValueIndex(Index vertexIndex, Index valueIndex) const {
-
-    if (_level.getDepth() > 0) return valueIndex;
-
-    Index vvIndex = getVertexValueOffset(vertexIndex);
-    while (_vertValueIndices[vvIndex] != valueIndex) {
-        ++ vvIndex;
-    }
-    return vvIndex;
-}
-
-//
-//  Methods related to tagging:
-//
-inline Level::ETag
-FVarLevel::ETag::combineWithLevelETag(Level::ETag levelTag) const
-{
-    if (this->_mismatch) {
-        levelTag._boundary = true;
-        levelTag._infSharp = true;
-    }
-    return levelTag;
-}
-inline Level::VTag
-FVarLevel::ValueTag::combineWithLevelVTag(Level::VTag levelTag) const
-{
-    if (this->_mismatch) {
-        //
-        //  Semi-sharp FVar values are always tagged and treated as corners
-        //  (at least three sharp edges (two boundary edges and one interior
-        //  semi-sharp) and/or vertex is semi-sharp) until the sharpness has
-        //  decayed, but they ultimately lie on the inf-sharp crease of the
-        //  FVar boundary.  Consider this when tagging inf-sharp features.
-        //
-        if (this->isCorner()) {
-            levelTag._rule = (Level::VTag::VTagSize) Sdc::Crease::RULE_CORNER;
-        } else {
-            levelTag._rule = (Level::VTag::VTagSize) Sdc::Crease::RULE_CREASE;
-        }
-        if (this->isCrease() || this->isSemiSharp()) {
-            levelTag._infSharp = false;
-            levelTag._infSharpCrease = true;
-            levelTag._corner = false;
-        } else {
-            levelTag._infSharp = true;
-            levelTag._infSharpCrease = false;
-            levelTag._corner = !this->_infIrregular && !this->_infSharpEdges;
-        }
-        levelTag._infSharpEdges = true;
-        levelTag._infIrregular = this->_infIrregular;
-
-        levelTag._boundary = true;
-        levelTag._xordinary = this->_xordinary;
-
-        levelTag._nonManifold |= this->_nonManifold;
-    }
-    return levelTag;
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_FVAR_LEVEL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarRefinement.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarRefinement.cpp
deleted file mode 100644
index 3819a3f99..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarRefinement.cpp
+++ /dev/null
@@ -1,692 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../sdc/types.h"
-#include "../sdc/crease.h"
-#include "../vtr/array.h"
-#include "../vtr/stackBuffer.h"
-#include "../vtr/refinement.h"
-#include "../vtr/fvarLevel.h"
-
-#include "../vtr/fvarRefinement.h"
-
-#include <cassert>
-#include <cstdio>
-#include <cstring>
-#include <algorithm>
-
-
-//
-//  FVarRefinement:
-//      Analogous to Refinement -- retains data to facilitate refinement and
-//  population of refined face-varying data channels.
-//
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  Simple (for now) constructor and destructor:
-//
-FVarRefinement::FVarRefinement(Refinement const& refinement,
-                               FVarLevel&        parentFVarLevel,
-                               FVarLevel&        childFVarLevel) :
-    _refinement(refinement),
-    _parentLevel(refinement.parent()),
-    _parentFVar(parentFVarLevel),
-    _childLevel(refinement.child()),
-    _childFVar(childFVarLevel) {
-}
-
-FVarRefinement::~FVarRefinement() {
-}
-
-
-//
-// Methods supporting the refinement of face-varying data that has previously
-// been applied to the Refinement member. So these methods already have access
-// to fully refined child components.
-//
-
-void
-FVarRefinement::applyRefinement() {
-
-    //
-    //  Transfer basic properties from the parent to child level:
-    //
-    _childFVar._options = _parentFVar._options;
-
-    _childFVar._isLinear              = _parentFVar._isLinear;
-    _childFVar._hasLinearBoundaries   = _parentFVar._hasLinearBoundaries;
-    _childFVar._hasDependentSharpness = _parentFVar._hasDependentSharpness;
-
-    //
-    //  It's difficult to know immediately how many child values arise from the
-    //  refinement -- particularly when sparse, so we get a close upper bound,
-    //  resize for that number and trim when finished:
-    //
-    estimateAndAllocateChildValues();
-    populateChildValues();
-    trimAndFinalizeChildValues();
-
-    propagateEdgeTags();
-    propagateValueTags();
-    if (_childFVar.hasSmoothBoundaries()) {
-        propagateValueCreases();
-        reclassifySemisharpValues();
-    }
-
-    //
-    //  The refined face-values are technically redundant as they can be constructed
-    //  from the face-vertex siblings -- do so here as a post-process
-    //
-    if (_childFVar.getNumValues() > _childLevel.getNumVertices()) {
-        _childFVar.initializeFaceValuesFromVertexFaceSiblings();
-    } else {
-        _childFVar.initializeFaceValuesFromFaceVertices();
-    }
-
-    //printf("FVar refinement to level %d:\n", _childLevel.getDepth());
-    //_childFVar.print();
-
-    //printf("Validating refinement to level %d:\n", _childLevel.getDepth());
-    //_childFVar.validate();
-    //assert(_childFVar.validate());
-}
-
-//
-//  Quickly estimate the memory required for face-varying vertex-values in the child
-//  and allocate them.  For uniform refinement this estimate should exactly match the
-//  desired result.  For sparse refinement the excess should generally be low as the
-//  sparse boundary components generally occur where face-varying data is continuous.
-//
-void
-FVarRefinement::estimateAndAllocateChildValues() {
-
-    int maxVertexValueCount = _refinement.getNumChildVerticesFromFaces();
-
-    Index cVert    = _refinement.getFirstChildVertexFromEdges();
-    Index cVertEnd = cVert + _refinement.getNumChildVerticesFromEdges();
-    for ( ; cVert < cVertEnd; ++cVert) {
-        Index pEdge = _refinement.getChildVertexParentIndex(cVert);
-
-        maxVertexValueCount += _parentFVar.edgeTopologyMatches(pEdge)
-                             ? 1 : _parentLevel.getEdgeFaces(pEdge).size();
-    }
-
-    cVert    = _refinement.getFirstChildVertexFromVertices();
-    cVertEnd = cVert + _refinement.getNumChildVerticesFromVertices();
-    for ( ; cVert < cVertEnd; ++cVert) {
-        assert(_refinement.isChildVertexComplete(cVert));
-        Index pVert = _refinement.getChildVertexParentIndex(cVert);
-
-        maxVertexValueCount += _parentFVar.getNumVertexValues(pVert);
-    }
-
-    //
-    //  Now allocate/initialize for the maximum -- use resize() and trim the size later
-    //  to avoid the constant growing with reserve() and incremental sizing.  We know
-    //  the estimate should be close and memory wasted should be small, so initialize
-    //  all to zero as well to avoid writing in all but affected areas:
-    //
-    //  Resize vectors that mirror the component counts:
-    _childFVar.resizeComponents();
-
-    //  Resize the vertex-value tags in the child level:
-    _childFVar._vertValueTags.resize(maxVertexValueCount);
-
-    //  Resize the vertex-value "parent source" mapping in the refinement:
-    _childValueParentSource.resize(maxVertexValueCount, 0);
-}
-
-void
-FVarRefinement::trimAndFinalizeChildValues() {
-
-    _childFVar._vertValueTags.resize(_childFVar._valueCount);
-    if (_childFVar.hasSmoothBoundaries()) {
-        _childFVar._vertValueCreaseEnds.resize(_childFVar._valueCount);
-    }
-
-    _childValueParentSource.resize(_childFVar._valueCount);
-
-    //  Allocate and initialize the vector of indices (redundant after level 0):
-    _childFVar._vertValueIndices.resize(_childFVar._valueCount);
-    for (int i = 0; i < _childFVar._valueCount; ++i) {
-        _childFVar._vertValueIndices[i] = i;
-    }
-}
-
-inline int
-FVarRefinement::populateChildValuesForEdgeVertex(Index cVert, Index pEdge) {
-
-    //
-    //  Determine the number of sibling values for the child vertex of this discts
-    //  edge and populate their related topological data (e.g. source face).
-    //
-    //  This turns out to be very simple.  For FVar refinement to handle all cases
-    //  of non-manifold edges, when an edge is discts we generate a FVar value for
-    //  each face incident the edge.  So in the uniform refinement case we will
-    //  have as many child values as parent faces incident the edge.  But even when
-    //  refinement is sparse, if this edge-vertex is not complete, we will still be
-    //  guaranteed that a child face exists for each parent face since one of the
-    //  edge's end vertices must be complete and therefore include all child faces.
-    //
-    ConstIndexArray  pEdgeFaces = _parentLevel.getEdgeFaces(pEdge);
-    if (pEdgeFaces.size() == 1) {
-        //  No sibling so the first face (0) guaranteed to be a source and all
-        //  sibling indices per incident face will also be 0 -- all of which was
-        //  done on initialization, so nothing further to do.
-        return 1;
-    }
-
-    //
-    //  Update the parent-source of all child values:
-    //
-    int   cValueCount  = pEdgeFaces.size();
-    Index cValueOffset = _childFVar.getVertexValueOffset(cVert);
-
-    for (int i = 0; i < cValueCount; ++i) {
-        _childValueParentSource[cValueOffset + i] = (LocalIndex) i;
-    }
-
-    //
-    //  Update the vertex-face siblings for the faces incident the child vertex:
-    //
-    ConstIndexArray         cVertFaces        = _childLevel.getVertexFaces(cVert);
-    FVarLevel::SiblingArray cVertFaceSiblings = _childFVar.getVertexFaceSiblings(cVert);
-
-    assert(cVertFaces.size() == cVertFaceSiblings.size());
-    assert(cVertFaces.size() >= cValueCount);
-
-    for (int i = 0; i < cVertFaceSiblings.size(); ++i) {
-        Index pFaceI = _refinement.getChildFaceParentFace(cVertFaces[i]);
-        if (pEdgeFaces.size() == 2) {
-            //  Only two parent faces and all siblings previously initialized to 0:
-            if (pFaceI == pEdgeFaces[1]) {
-                cVertFaceSiblings[i] = (LocalIndex) 1;
-            }
-        } else {
-            //  Non-manifold case with > 2 parent faces -- match child faces to parent:
-            for (int j = 0; j < pEdgeFaces.size(); ++j) {
-                if (pFaceI == pEdgeFaces[j]) {
-                    cVertFaceSiblings[i] = (LocalIndex) j;
-                }
-            }
-        }
-    }
-    return cValueCount;
-}
-
-inline int
-FVarRefinement::populateChildValuesForVertexVertex(Index cVert, Index pVert) {
-
-    //
-    //  We should not be getting incomplete vertex-vertices from feature-adaptive
-    //  refinement (as neighboring vertices will be face-vertices or edge-vertices).
-    //  This will get messy when we do (i.e. sparse refinement of Bilinear or more
-    //  flexible and specific sparse refinement of Catmark) but for now assume 1-to-1.
-    //
-    assert(_refinement.isChildVertexComplete(cVert));
-
-    //  Number of child values is same as number of parent values since complete:
-    int cValueCount = _parentFVar.getNumVertexValues(pVert);
-
-    if (cValueCount > 1) {
-        Index cValueIndex = _childFVar.getVertexValueOffset(cVert);
-
-        // Update the parent source for all child values:
-        for (int j = 1; j < cValueCount; ++j) {
-            _childValueParentSource[cValueIndex + j] = (LocalIndex) j;
-        }
-
-        // Update the vertex-face siblings:
-        FVarLevel::ConstSiblingArray pVertFaceSiblings = _parentFVar.getVertexFaceSiblings(pVert);
-        FVarLevel::SiblingArray      cVertFaceSiblings = _childFVar.getVertexFaceSiblings(cVert);
-        for (int j = 0; j < cVertFaceSiblings.size(); ++j) {
-            cVertFaceSiblings[j] = pVertFaceSiblings[j];
-        }
-    }
-    return cValueCount;
-}
-
-void
-FVarRefinement::populateChildValues() {
-
-    //
-    //  Be sure to match the same vertex ordering as Refinement, i.e. face-vertices
-    //  first vs vertex-vertices first, etc.  A few optimizations within the use of
-    //  face-varying data take advantage of this assumption, and it just makes sense
-    //  to be consistent (e.g. if there is a 1-to-1 correspondence between vertices
-    //  and their FVar-values, their children will correspond).
-    //
-    _childFVar._valueCount = 0;
-
-    if (_refinement.hasFaceVerticesFirst()) {
-        populateChildValuesFromFaceVertices();
-        populateChildValuesFromEdgeVertices();
-        populateChildValuesFromVertexVertices();
-    } else {
-        populateChildValuesFromVertexVertices();
-        populateChildValuesFromFaceVertices();
-        populateChildValuesFromEdgeVertices();
-    }
-}
-
-void
-FVarRefinement::populateChildValuesFromFaceVertices() {
-
-    Index cVert    = _refinement.getFirstChildVertexFromFaces();
-    Index cVertEnd = cVert + _refinement.getNumChildVerticesFromFaces();
-    for ( ; cVert < cVertEnd; ++cVert) {
-        _childFVar._vertSiblingOffsets[cVert] = _childFVar._valueCount;
-        _childFVar._vertSiblingCounts[cVert]  = 1;
-        _childFVar._valueCount ++;
-    }
-}
-void
-FVarRefinement::populateChildValuesFromEdgeVertices() {
-
-    Index cVert    = _refinement.getFirstChildVertexFromEdges();
-    Index cVertEnd = cVert + _refinement.getNumChildVerticesFromEdges();
-    for ( ; cVert < cVertEnd; ++cVert) {
-        Index pEdge = _refinement.getChildVertexParentIndex(cVert);
-
-        _childFVar._vertSiblingOffsets[cVert] = _childFVar._valueCount;
-        if (_parentFVar.edgeTopologyMatches(pEdge)) {
-            _childFVar._vertSiblingCounts[cVert] = 1;
-            _childFVar._valueCount ++;
-        } else {
-            int cValueCount = populateChildValuesForEdgeVertex(cVert, pEdge);
-            _childFVar._vertSiblingCounts[cVert] = (LocalIndex)cValueCount;
-            _childFVar._valueCount += cValueCount;
-        }
-    }
-}
-void
-FVarRefinement::populateChildValuesFromVertexVertices() {
-
-    Index cVert    = _refinement.getFirstChildVertexFromVertices();
-    Index cVertEnd = cVert + _refinement.getNumChildVerticesFromVertices();
-    for ( ; cVert < cVertEnd; ++cVert) {
-        Index pVert = _refinement.getChildVertexParentIndex(cVert);
-
-        _childFVar._vertSiblingOffsets[cVert] = _childFVar._valueCount;
-        if (_parentFVar.valueTopologyMatches(_parentFVar.getVertexValueOffset(pVert))) {
-            _childFVar._vertSiblingCounts[cVert] = 1;
-            _childFVar._valueCount ++;
-        } else {
-            int cValueCount = populateChildValuesForVertexVertex(cVert, pVert);
-            _childFVar._vertSiblingCounts[cVert] = (LocalIndex)cValueCount;
-            _childFVar._valueCount += cValueCount;
-        }
-    }
-}
-
-void
-FVarRefinement::propagateEdgeTags() {
-
-    //
-    //  Edge tags correspond to child edges and originate from faces or edges:
-    //      Face-edges:
-    //          - tag can be initialized as cts (*)
-    //              * what was this comment:  "discts based on parent face-edges at ends"
-    //      Edge-edges:
-    //          - tag propagated from parent edge
-    //          - need to modify if parent edge was discts at one end
-    //              - child edge for the matching end inherits tag
-    //              - child edge at the other end is doubly discts
-    //
-    FVarLevel::ETag eTagMatch;
-    eTagMatch.clear();
-    eTagMatch._mismatch = false;
-
-    for (int eIndex = 0; eIndex < _refinement.getNumChildEdgesFromFaces(); ++eIndex) {
-        _childFVar._edgeTags[eIndex] = eTagMatch;
-    }
-    for (int eIndex = _refinement.getNumChildEdgesFromFaces(); eIndex < _childLevel.getNumEdges(); ++eIndex) {
-        Index pEdge = _refinement.getChildEdgeParentIndex(eIndex);
-
-        _childFVar._edgeTags[eIndex] = _parentFVar._edgeTags[pEdge];
-    }
-}
-
-void
-FVarRefinement::propagateValueTags() {
-
-    //
-    //  Value tags correspond to vertex-values and originate from all three sources:
-    //      Face-values:
-    //          - trivially initialized as matching
-    //      Edge-values:
-    //          - conditionally initialized based on parent edge continuity
-    //          - should be trivial though (unlike edge-tags for the child edges)
-    //      Vertex-values:
-    //          - if complete, trivially propagated/inherited
-    //          - if incomplete, need to map to child subset
-    //
-
-    //
-    //  Values from face-vertices -- all match and are sequential:
-    //
-    FVarLevel::ValueTag valTagMatch;
-    valTagMatch.clear();
-
-    Index cVert      = _refinement.getFirstChildVertexFromFaces();
-    Index cVertEnd   = cVert + _refinement.getNumChildVerticesFromFaces();
-    Index cVertValue = _childFVar.getVertexValueOffset(cVert);
-    for ( ; cVert < cVertEnd; ++cVert, ++cVertValue) {
-        _childFVar._vertValueTags[cVertValue] = valTagMatch;
-    }
-
-    //
-    //  Values from edge-vertices -- for edges that are split, tag as mismatched and tag
-    //  as corner or crease depending on the presence of creases in the parent:
-    //
-    FVarLevel::ValueTag valTagMismatch = valTagMatch;
-    valTagMismatch._mismatch = true;
-
-    FVarLevel::ValueTag valTagCrease = valTagMismatch;
-    valTagCrease._crease = true;
-
-    FVarLevel::ValueTag& valTagSplitEdge = _parentFVar.hasSmoothBoundaries() ? valTagCrease : valTagMismatch;
-
-    cVert    = _refinement.getFirstChildVertexFromEdges();
-    cVertEnd = cVert + _refinement.getNumChildVerticesFromEdges();
-    for ( ; cVert < cVertEnd; ++cVert) {
-        Index pEdge = _refinement.getChildVertexParentIndex(cVert);
-
-        FVarLevel::ValueTagArray cValueTags = _childFVar.getVertexValueTags(cVert);
-
-        FVarLevel::ETag pEdgeTag = _parentFVar._edgeTags[pEdge];
-        if (pEdgeTag._mismatch || pEdgeTag._linear) {
-            std::fill(cValueTags.begin(), cValueTags.end(), valTagSplitEdge);
-        } else {
-            std::fill(cValueTags.begin(), cValueTags.end(), valTagMatch);
-        }
-    }
-
-    //
-    //  Values from vertex-vertices -- inherit tags from parent values when complete
-    //  otherwise (not yet supported) need to identify the parent value for each child:
-    //
-    cVert    = _refinement.getFirstChildVertexFromVertices();
-    cVertEnd = cVert + _refinement.getNumChildVerticesFromVertices();
-
-    for ( ; cVert < cVertEnd; ++cVert) {
-        Index pVert = _refinement.getChildVertexParentIndex(cVert);
-        assert(_refinement.isChildVertexComplete(cVert));
-
-        FVarLevel::ConstValueTagArray pValueTags = _parentFVar.getVertexValueTags(pVert);
-        FVarLevel::ValueTagArray cValueTags = _childFVar.getVertexValueTags(cVert);
-
-        memcpy(cValueTags.begin(), pValueTags.begin(),
-            pValueTags.size()*sizeof(FVarLevel::ValueTag));
-    }
-}
-
-void
-FVarRefinement::propagateValueCreases() {
-
-    assert(_childFVar.hasSmoothBoundaries());
-
-    //  Skip child vertices from faces:
-
-    //
-    //  For each child vertex from an edge that has FVar values and is complete, initialize
-    //  the crease-ends for those values tagged as smooth boundaries
-    //
-    //  Note that this does depend on the nature of the topological split, i.e. how many
-    //  child faces are incident the new child vertex for each face that becomes a crease,
-    //  so identify constants to be used in each iteration first:
-    //
-    int incChildFacesPerEdge = (_refinement.getRegularFaceSize() == 4) ? 2 : 3;
-
-    Index cVert    = _refinement.getFirstChildVertexFromEdges();
-    Index cVertEnd = cVert + _refinement.getNumChildVerticesFromEdges();
-    for ( ; cVert < cVertEnd; ++cVert) {
-        FVarLevel::ValueTagArray cValueTags = _childFVar.getVertexValueTags(cVert);
-
-        if (!cValueTags[0].isMismatch()) continue;
-        if (!_refinement.isChildVertexComplete(cVert)) continue;
-
-        FVarLevel::CreaseEndPairArray cValueCreaseEnds = _childFVar.getVertexValueCreaseEnds(cVert);
-
-        int creaseStartFace = 0;
-        int creaseEndFace = creaseStartFace + incChildFacesPerEdge - 1;
-
-        for (int i = 0; i < cValueTags.size(); ++i) {
-            if (!cValueTags[i].isInfSharp()) {
-                cValueCreaseEnds[i]._startFace = (LocalIndex) creaseStartFace;
-                cValueCreaseEnds[i]._endFace   = (LocalIndex) creaseEndFace;
-            }
-            creaseStartFace += incChildFacesPerEdge;
-            creaseEndFace   += incChildFacesPerEdge;
-        }
-    }
-
-    //
-    //  For each child vertex from a vertex that has FVar values and is complete, initialize
-    //  the crease-ends for those values tagged as smooth or semi-sharp (to become smooth
-    //  eventually):
-    //
-    cVert    = _refinement.getFirstChildVertexFromVertices();
-    cVertEnd = cVert + _refinement.getNumChildVerticesFromVertices();
-    for ( ; cVert < cVertEnd; ++cVert) {
-        FVarLevel::ValueTagArray cValueTags = _childFVar.getVertexValueTags(cVert);
-
-        if (!cValueTags[0].isMismatch()) continue;
-        if (!_refinement.isChildVertexComplete(cVert)) continue;
-
-        Index pVert = _refinement.getChildVertexParentIndex(cVert);
-
-        FVarLevel::ConstCreaseEndPairArray pCreaseEnds = _parentFVar.getVertexValueCreaseEnds(pVert);
-        FVarLevel::CreaseEndPairArray cCreaseEnds = _childFVar.getVertexValueCreaseEnds(cVert);
-
-        for (int j = 0; j < cValueTags.size(); ++j) {
-            if (!cValueTags[j].isInfSharp()) {
-                cCreaseEnds[j] = pCreaseEnds[j];
-            }
-        }
-    }
-}
-
-void
-FVarRefinement::reclassifySemisharpValues() {
-
-    //
-    //  Reclassify the tags of semi-sharp vertex values to smooth creases according to
-    //  changes in sharpness:
-    //
-    //  Vertex values introduced on edge-verts can never be semi-sharp as they will be
-    //  introduced on discts edges, which are implicitly infinitely sharp, so we can
-    //  skip them entirely.
-    //
-    //  So we just need to deal with those values descended from parent vertices that
-    //  were semi-sharp.  The child values will have inherited the semi-sharp tag from
-    //  their parent values -- we will be able to clear it in many simple cases but
-    //  ultimately will need to inspect each value:
-    //
-    bool hasDependentSharpness = _parentFVar._hasDependentSharpness;
-
-    internal::StackBuffer<Index,16> cVertEdgeBuffer(_childLevel.getMaxValence());
-
-    Index cVert    = _refinement.getFirstChildVertexFromVertices();
-    Index cVertEnd = cVert + _refinement.getNumChildVerticesFromVertices();
-
-    for ( ; cVert < cVertEnd; ++cVert) {
-        FVarLevel::ValueTagArray cValueTags = _childFVar.getVertexValueTags(cVert);
-
-        if (!cValueTags[0].isMismatch()) continue;
-        if (!_refinement.isChildVertexComplete(cVert)) continue;
-
-        //  If the parent vertex wasn't semi-sharp, the child vertex and values can't be:
-        Index       pVert     = _refinement.getChildVertexParentIndex(cVert);
-        Level::VTag pVertTags = _parentLevel.getVertexTag(pVert);
-
-        if (!pVertTags._semiSharp && !pVertTags._semiSharpEdges) continue;
-
-        //  If the child vertex is still sharp, all values remain unaffected:
-        Level::VTag cVertTags = _childLevel.getVertexTag(cVert);
-
-        if (cVertTags._semiSharp || cVertTags._infSharp) continue;
-
-        //  If the child is no longer semi-sharp, we can just clear those values marked
-        //  (i.e. make them creases, others may remain corners) and continue:
-        //
-        if (!cVertTags._semiSharp && !cVertTags._semiSharpEdges) {
-            for (int j = 0; j < cValueTags.size(); ++j) {
-                if (cValueTags[j]._semiSharp) {
-                    cValueTags[j]._semiSharp = false;
-                    cValueTags[j]._depSharp = false;
-                    cValueTags[j]._crease = true;
-                }
-            }
-            continue;
-        }
-
-        //  There are some semi-sharp edges left -- for those values tagged as semi-sharp,
-        //  see if they are still semi-sharp and clear those that are not:
-        //
-        FVarLevel::CreaseEndPairArray const cValueCreaseEnds = _childFVar.getVertexValueCreaseEnds(cVert);
-
-        //  Beware accessing the child's vert-edges -- full topology may not be enabled:
-        ConstIndexArray cVertEdges;
-        if (_childLevel.getNumVertexEdgesTotal()) {
-            cVertEdges = _childLevel.getVertexEdges(cVert);
-        } else {
-            ConstIndexArray      pVertEdges  = _parentLevel.getVertexEdges(pVert);
-            ConstLocalIndexArray pVertInEdge = _parentLevel.getVertexEdgeLocalIndices(pVert);
-            for (int i = 0; i < pVertEdges.size(); ++i) {
-                cVertEdgeBuffer[i] = _refinement.getEdgeChildEdges(pVertEdges[i])[pVertInEdge[i]];
-            }
-            cVertEdges = IndexArray(cVertEdgeBuffer, pVertEdges.size());
-        }
-
-        for (int j = 0; j < cValueTags.size(); ++j) {
-            if (cValueTags[j]._semiSharp && !cValueTags[j]._depSharp) {
-                LocalIndex vStartFace = cValueCreaseEnds[j]._startFace;
-                LocalIndex vEndFace   = cValueCreaseEnds[j]._endFace;
-
-                bool isStillSemiSharp = false;
-                if (vEndFace > vStartFace) {
-                    for (int k = vStartFace + 1; !isStillSemiSharp && (k <= vEndFace); ++k) {
-                        isStillSemiSharp = _childLevel.getEdgeTag(cVertEdges[k])._semiSharp;
-                    }
-                } else if (vStartFace > vEndFace) {
-                    for (int k = vStartFace + 1; !isStillSemiSharp && (k < cVertEdges.size()); ++k) {
-                        isStillSemiSharp = _childLevel.getEdgeTag(cVertEdges[k])._semiSharp;
-                    }
-                    for (int k = 0; !isStillSemiSharp && (k <= vEndFace); ++k) {
-                        isStillSemiSharp = _childLevel.getEdgeTag(cVertEdges[k])._semiSharp;
-                    }
-                }
-                if (!isStillSemiSharp) {
-                    cValueTags[j]._semiSharp = false;
-                    cValueTags[j]._depSharp = false;
-                    cValueTags[j]._crease = true;
-                }
-            }
-        }
-
-        //
-        //  Now account for "dependent sharpness" (only matters when we have two values) --
-        //  if one value was dependent/sharpened based on the other, clear the dependency
-        //  tag if it is no longer sharp:
-        //
-        if ((cValueTags.size() == 2) && hasDependentSharpness) {
-            if (cValueTags[0]._depSharp && !cValueTags[1]._semiSharp) {
-                cValueTags[0]._depSharp = false;
-            } else if (cValueTags[1]._depSharp && !cValueTags[0]._semiSharp) {
-                cValueTags[1]._depSharp = false;
-            }
-        }
-    }
-}
-
-float
-FVarRefinement::getFractionalWeight(Index pVert, LocalIndex pSibling,
-                                    Index cVert, LocalIndex /* cSibling */) const {
-
-    //
-    //  Need to identify sharpness values for edges within the spans for both the
-    //  parent and child...
-    //
-    //  Consider gathering the complete parent and child sharpness vectors outside
-    //  this method and re-using them for each sibling, i.e. passing them to this
-    //  method somehow.  We may also need them there for mask-related purposes...
-    //
-    internal::StackBuffer<Index,16> cVertEdgeBuffer;
-
-    ConstIndexArray pVertEdges = _parentLevel.getVertexEdges(pVert);
-    ConstIndexArray cVertEdges;
-
-    //  Beware accessing the child's vert-edges -- full topology may not be enabled:
-    if (_childLevel.getNumVertexEdgesTotal()) {
-        cVertEdges = _childLevel.getVertexEdges(cVert);
-    } else {
-        cVertEdgeBuffer.SetSize(pVertEdges.size());
-
-        ConstLocalIndexArray pVertInEdge = _parentLevel.getVertexEdgeLocalIndices(pVert);
-        for (int i = 0; i < pVertEdges.size(); ++i) {
-            cVertEdgeBuffer[i] = _refinement.getEdgeChildEdges(pVertEdges[i])[pVertInEdge[i]];
-        }
-        cVertEdges = IndexArray(cVertEdgeBuffer, pVertEdges.size());
-    }
- 
-    internal::StackBuffer<float,32> sharpnessBuffer(2 * pVertEdges.size());
-    float * pEdgeSharpness = sharpnessBuffer;
-    float * cEdgeSharpness = sharpnessBuffer + pVertEdges.size();
-
-    FVarLevel::CreaseEndPair pValueCreaseEnds = _parentFVar.getVertexValueCreaseEnds(pVert)[pSibling];
-
-    LocalIndex pStartFace = pValueCreaseEnds._startFace;
-    LocalIndex pEndFace   = pValueCreaseEnds._endFace;
-
-    int interiorEdgeCount = 0;
-    if (pEndFace > pStartFace) {
-        for (int i = pStartFace + 1; i <= pEndFace; ++i, ++interiorEdgeCount) {
-            pEdgeSharpness[interiorEdgeCount] = _parentLevel.getEdgeSharpness(pVertEdges[i]);
-            cEdgeSharpness[interiorEdgeCount] = _childLevel.getEdgeSharpness(cVertEdges[i]);
-        }
-    } else if (pStartFace > pEndFace) {
-        for (int i = pStartFace + 1; i < pVertEdges.size(); ++i, ++interiorEdgeCount) {
-            pEdgeSharpness[interiorEdgeCount] = _parentLevel.getEdgeSharpness(pVertEdges[i]);
-            cEdgeSharpness[interiorEdgeCount] = _childLevel.getEdgeSharpness(cVertEdges[i]);
-        }
-        for (int i = 0; i <= pEndFace; ++i, ++interiorEdgeCount) {
-            pEdgeSharpness[interiorEdgeCount] = _parentLevel.getEdgeSharpness(pVertEdges[i]);
-            cEdgeSharpness[interiorEdgeCount] = _childLevel.getEdgeSharpness(cVertEdges[i]);
-        }
-    }
-    return Sdc::Crease(_refinement.getOptions()).ComputeFractionalWeightAtVertex(
-            _parentLevel.getVertexSharpness(pVert), _childLevel.getVertexSharpness(cVert),
-            interiorEdgeCount, pEdgeSharpness, cEdgeSharpness);
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarRefinement.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarRefinement.h
deleted file mode 100644
index 90c910e7b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/fvarRefinement.h
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_FVAR_REFINEMENT_H
-#define OPENSUBDIV3_VTR_FVAR_REFINEMENT_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-#include "../sdc/crease.h"
-#include "../vtr/types.h"
-#include "../vtr/refinement.h"
-#include "../vtr/fvarLevel.h"
-
-#include <vector>
-#include <cassert>
-#include <cstring>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  FVarRefinement:
-//      A face-varying refinement contains data to support the refinement of a
-//  particular face-varying "channel".  Just as Refinement maintains a mapping
-//  between the components of a parent Level and its child, the face-varying
-//  analog maintains a mapping between the face-varying values of a parent
-//  FVarLevel and its child.
-//
-//  It turns out there is little data necessary here, so the class consists
-//  mainly of methods that populate the child FVarLevel.  The mapping data in
-//  the refinement between Levels serves most purposes and all that is required
-//  in addition is a mapping from values in the child FVarLevel to the parent.
-//
-class FVarRefinement {
-public:
-    FVarRefinement(Refinement const& refinement, FVarLevel& parent, FVarLevel& child);
-    ~FVarRefinement();
-
-    int getChildValueParentSource(Index vIndex, int sibling) const {
-        return _childValueParentSource[_childFVar.getVertexValueOffset(vIndex, (LocalIndex)sibling)];
-    }
-
-    float getFractionalWeight(Index pVert, LocalIndex pSibling,
-                              Index cVert, LocalIndex cSibling) const;
-
-
-    //  Modifiers supporting application of the refinement:
-    void applyRefinement();
-
-    void estimateAndAllocateChildValues();
-    void populateChildValues();
-    void populateChildValuesFromFaceVertices();
-    void populateChildValuesFromEdgeVertices();
-    int  populateChildValuesForEdgeVertex(Index cVert, Index pEdge);
-    void populateChildValuesFromVertexVertices();
-    int  populateChildValuesForVertexVertex(Index cVert, Index pVert);
-    void trimAndFinalizeChildValues();
-
-    void propagateEdgeTags();
-    void propagateValueTags();
-    void propagateValueCreases();
-    void reclassifySemisharpValues();
-
-private:
-    //
-    //  Identify the Refinement, its Levels and assigned FVarLevels for more
-    //  immediate access -- child FVarLevel is non-const as it is to be assigned:
-    //
-    Refinement const & _refinement;
-
-    Level const &     _parentLevel;
-    FVarLevel const & _parentFVar;
-
-    Level const & _childLevel;
-    FVarLevel &   _childFVar;
-
-    //  When refinement is sparse, we need a mapping between siblings of a vertex
-    //  value in the parent and child -- and for some child values, there will not
-    //  be a parent value, in which case the source of the parent component will
-    //  be stored.  So we refer to the parent "source" rather than "sibling":
-    //
-    std::vector<LocalIndex> _childValueParentSource;
-};
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_FVAR_REFINEMENT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/level.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/level.cpp
deleted file mode 100644
index 192b80974..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/level.cpp
+++ /dev/null
@@ -1,2084 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../sdc/types.h"
-#include "../sdc/crease.h"
-#include "../vtr/array.h"
-#include "../vtr/level.h"
-#include "../vtr/refinement.h"
-#include "../vtr/fvarLevel.h"
-#include "../vtr/stackBuffer.h"
-
-#include <cassert>
-#include <cstdio>
-#include <cstring>
-#include <algorithm>
-#include <vector>
-#include <map>
-
-#ifdef _MSC_VER
-    #define snprintf _snprintf
-#endif
-
-//
-//  Level:
-//      This is intended to be a fairly simple container of topology, sharpness and
-//  other information that is useful to retain for subdivision.  It is intended to
-//  be constructed by other friend classes, i.e. factories and class specialized to
-//  construct topology based on various splitting schemes.  So its interface consists
-//  of simple methods for inspection, and low-level protected methods for populating
-//  it rather than high-level modifiers.
-//
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  Simple (for now) constructor and destructor:
-//
-Level::Level() :
-    _faceCount(0),
-    _edgeCount(0),
-    _vertCount(0),
-    _depth(0),
-    _maxEdgeFaces(0),
-    _maxValence(0) {
-}
-
-Level::~Level() {
-    for (int i = 0; i < (int)_fvarChannels.size(); ++i) {
-        delete _fvarChannels[i];
-    }
-}
-
-
-char const *
-Level::getTopologyErrorString(TopologyError errCode) {
-
-    switch (errCode) {
-        case TOPOLOGY_MISSING_EDGE_FACES :
-            return "MISSING_EDGE_FACES";
-        case TOPOLOGY_MISSING_EDGE_VERTS :
-            return "MISSING_EDGE_VERTS";
-        case TOPOLOGY_MISSING_FACE_EDGES :
-            return "MISSING_FACE_EDGES";
-        case TOPOLOGY_MISSING_FACE_VERTS :
-            return "MISSING_FACE_VERTS";
-        case TOPOLOGY_MISSING_VERT_FACES :
-            return "MISSING_VERT_FACES";
-        case TOPOLOGY_MISSING_VERT_EDGES :
-            return "MISSING_VERT_EDGES";
-
-        case TOPOLOGY_FAILED_CORRELATION_EDGE_FACE :
-            return "FAILED_CORRELATION_EDGE_FACE";
-        case TOPOLOGY_FAILED_CORRELATION_FACE_VERT :
-            return "FAILED_CORRELATION_FACE_VERT";
-        case TOPOLOGY_FAILED_CORRELATION_FACE_EDGE :
-            return "FAILED_CORRELATION_FACE_EDGE";
-
-        case TOPOLOGY_FAILED_ORIENTATION_INCIDENT_EDGE :
-            return "FAILED_ORIENTATION_INCIDENT_EDGE";
-        case TOPOLOGY_FAILED_ORIENTATION_INCIDENT_FACE :
-            return "FAILED_ORIENTATION_INCIDENT_FACE";
-        case TOPOLOGY_FAILED_ORIENTATION_INCIDENT_FACES_EDGES :
-            return "FAILED_ORIENTATION_INCIDENT_FACES_EDGES";
-
-        case TOPOLOGY_DEGENERATE_EDGE :
-            return "DEGENERATE_EDGE";
-        case TOPOLOGY_NON_MANIFOLD_EDGE :
-            return "NON_MANIFOLD_EDGE";
-
-        case TOPOLOGY_INVALID_CREASE_EDGE :
-            return "INVALID_CREASE_EDGE";
-        case TOPOLOGY_INVALID_CREASE_VERT :
-            return "INVALID_CREASE_VERT";
-
-        default:
-            assert(0);
-    }
-    return 0;
-}
-
-//
-//  Debugging method to validate topology, i.e. verify appropriate symmetry
-//  between the relations, etc.
-//
-//  Additions that need to be made in the near term:
-//      * verifying user-applied tags relating to topology:
-//          - non-manifold in particular (ordering above can be part of this)
-//          - face holes don't require anything
-//      - verifying orientation of components, particularly vert-edges and faces:
-//          - both need to be ordered correctly (when manifold)
-//          - both need to be in sync for an interior vertex
-//              ? is a rotation allowed for the interior case?
-//              - I don't see why not...
-//      ? verifying sharpness:
-//          - values < Smooth or > Infinite
-//          - sharpening of boundary edges (is this necessary, since we do it?)
-//              - it does ensure our work was not corrupted by client assignments
-//
-//  Possibilities:
-//      - single validate() method, which will call all of:
-//          - validateTopology()
-//          - validateSharpness()
-//          - validateTagging()
-//      - consider using a mask/struct to choose what to validate, i.e.:
-//          - bool validate(ValidateOptions const& options) const;
-//
-
-#define REPORT(code, format, ...) \
-    if (callback) { \
-        char const * errStr = getTopologyErrorString(code); \
-        char msg[1024]; \
-        snprintf(msg, 1024, "%s - " format, errStr, ##__VA_ARGS__); \
-        callback(code, msg, clientData); \
-    }
-
-bool
-Level::validateTopology(ValidationCallback callback, void const * clientData) const {
-
-    //
-    //  Verify internal topological consistency (eventually a Level method?):
-    //      - each face-vert has corresponding vert-face (and child)
-    //      - each face-edge has corresponding edge-face
-    //      - each edge-vert has corresponding vert-edge (and child)
-    //  The above three are enough for most cases, but it is still possible
-    //  the latter relation in each above has no correspondent in the former,
-    //  so apply the symmetric tests:
-    //      - each edge-face has corresponding face-edge
-    //      - each vert-face has corresponding face-vert
-    //      - each vert-edge has corresponding edge-vert
-    //  We are still left with the possibility of duplicate references in
-    //  places we don't want them.  Currently a component can exist multiple
-    //  times in a component of higher dimension.
-    //      - each vert-face <face,child> pair is unique
-    //      - each vert-edge <edge,child> pair is unique
-    //
-    bool returnOnFirstError = true;
-    bool isValid = true;
-
-    //  Verify each face-vert has corresponding vert-face and child:
-    if ((getNumFaceVerticesTotal() == 0) || (getNumVertexFacesTotal() == 0)) {
-        if (getNumFaceVerticesTotal() == 0) {
-            REPORT(TOPOLOGY_MISSING_FACE_VERTS, "missing face-verts");
-        }
-        if (getNumVertexFacesTotal() == 0) {
-            REPORT(TOPOLOGY_MISSING_VERT_FACES, "missing vert-faces");
-        }
-        return false;
-    }
-    for (int fIndex = 0; fIndex < getNumFaces(); ++fIndex) {
-        ConstIndexArray     fVerts      = getFaceVertices(fIndex);
-        int                 fVertCount  = fVerts.size();
-
-        for (int i = 0; i < fVertCount; ++i) {
-            Index vIndex = fVerts[i];
-
-            ConstIndexArray        vFaces = getVertexFaces(vIndex);
-            ConstLocalIndexArray  vInFace = getVertexFaceLocalIndices(vIndex);
-
-            bool vertFaceOfFaceExists = false;
-            for (int j = 0; j < vFaces.size(); ++j) {
-                if ((vFaces[j] == fIndex) && (vInFace[j] == i)) {
-                    vertFaceOfFaceExists = true;
-                    break;
-                }
-            }
-            if (!vertFaceOfFaceExists) {
-                REPORT(TOPOLOGY_FAILED_CORRELATION_FACE_VERT,
-                    "face %d correlation of vert %d failed", fIndex, i);
-                if (returnOnFirstError) return false;
-                isValid = false;
-            }
-        }
-    }
-
-    //  Verify each face-edge has corresponding edge-face:
-    if ((getNumEdgeFacesTotal() == 0) || (getNumFaceEdgesTotal() == 0)) {
-        if (getNumEdgeFacesTotal() == 0) {
-            REPORT(TOPOLOGY_MISSING_EDGE_FACES, "missing edge-faces");
-        }
-        if (getNumFaceEdgesTotal() == 0) {
-            REPORT(TOPOLOGY_MISSING_FACE_EDGES, "missing face-edges");
-        }
-        return false;
-    }
-    for (int fIndex = 0; fIndex < getNumFaces(); ++fIndex) {
-        ConstIndexArray  fEdges      = getFaceEdges(fIndex);
-        int              fEdgeCount  = fEdges.size();
-
-        for (int i = 0; i < fEdgeCount; ++i) {
-            int eIndex = fEdges[i];
-
-            ConstIndexArray       eFaces = getEdgeFaces(eIndex);
-            ConstLocalIndexArray eInFace = getEdgeFaceLocalIndices(eIndex);
-
-            bool edgeFaceOfFaceExists = false;
-            for (int j = 0; j < eFaces.size(); ++j) {
-                if ((eFaces[j] == fIndex) && (eInFace[j] == i)) {
-                    edgeFaceOfFaceExists = true;
-                    break;
-                }
-            }
-            if (!edgeFaceOfFaceExists) {
-                REPORT(TOPOLOGY_FAILED_CORRELATION_FACE_EDGE,
-                     "face %d correlation of edge %d failed", fIndex, i);
-                if (returnOnFirstError) return false;
-                isValid = false;
-            }
-        }
-    }
-
-    //  Verify each edge-vert has corresponding vert-edge and child:
-    if ((getNumEdgeVerticesTotal() == 0) || (getNumVertexEdgesTotal() == 0)) {
-        if (getNumEdgeVerticesTotal() == 0) {
-            REPORT(TOPOLOGY_MISSING_EDGE_VERTS, "missing edge-verts");
-        }
-        if (getNumVertexEdgesTotal() == 0) {
-            REPORT(TOPOLOGY_MISSING_VERT_EDGES, "missing vert-edges");
-        }
-        return false;
-    }
-    for (int eIndex = 0; eIndex < getNumEdges(); ++eIndex) {
-        ConstIndexArray  eVerts = getEdgeVertices(eIndex);
-
-        for (int i = 0; i < 2; ++i) {
-            Index vIndex = eVerts[i];
-
-            ConstIndexArray       vEdges = getVertexEdges(vIndex);
-            ConstLocalIndexArray  vInEdge = getVertexEdgeLocalIndices(vIndex);
-
-            bool vertEdgeOfEdgeExists = false;
-            for (int j = 0; j < vEdges.size(); ++j) {
-                if ((vEdges[j] == eIndex) && (vInEdge[j] == i)) {
-                    vertEdgeOfEdgeExists = true;
-                    break;
-                }
-            }
-            if (!vertEdgeOfEdgeExists) {
-                REPORT(TOPOLOGY_FAILED_CORRELATION_FACE_VERT,
-                    "edge %d correlation of vert %d failed", eIndex, i);
-                if (returnOnFirstError) return false;
-                isValid = false;
-            }
-        }
-    }
-
-    //  Verify that vert-faces and vert-edges are properly ordered and in sync:
-    //      - currently this requires the relations exactly match those that we construct from
-    //        the ordering method, i.e. we do not allow rotations for interior vertices.
-    internal::StackBuffer<Index,32> indexBuffer(2 * _maxValence);
-
-    for (int vIndex = 0; vIndex < getNumVertices(); ++vIndex) {
-        if (_vertTags[vIndex]._incomplete || _vertTags[vIndex]._nonManifold) continue;
-
-        ConstIndexArray  vFaces = getVertexFaces(vIndex);
-        ConstIndexArray  vEdges = getVertexEdges(vIndex);
-
-        Index * vFacesOrdered = indexBuffer;
-        Index * vEdgesOrdered = indexBuffer + vFaces.size();
-
-        if (!orderVertexFacesAndEdges(vIndex, vFacesOrdered, vEdgesOrdered)) {
-            REPORT(TOPOLOGY_FAILED_ORIENTATION_INCIDENT_FACES_EDGES,
-                "vertex %d cannot orient incident faces and edges", vIndex);
-            if (returnOnFirstError) return false;
-            isValid = false;
-        }
-        for (int i = 0; i < vFaces.size(); ++i) {
-            if (vFaces[i] != vFacesOrdered[i]) {
-                REPORT(TOPOLOGY_FAILED_ORIENTATION_INCIDENT_FACE,
-                    "vertex %d orientation failure at incident face %d", vIndex, i);
-                if (returnOnFirstError) return false;
-                isValid = false;
-                break;
-            }
-        }
-        for (int i = 0; i < vEdges.size(); ++i) {
-            if (vEdges[i] != vEdgesOrdered[i]) {
-                REPORT(TOPOLOGY_FAILED_ORIENTATION_INCIDENT_EDGE,
-                    "vertex %d orientation failure at incident edge %d", vIndex, i);
-                if (returnOnFirstError) return false;
-                isValid = false;
-                break;
-            }
-        }
-    }
-
-    //  Verify non-manifold tags are appropriately assigned to edges and vertices:
-    //      - note we have to validate orientation of vertex neighbors to do this rigorously
-    for (int eIndex = 0; eIndex < getNumEdges(); ++eIndex) {
-        Level::ETag const& eTag = _edgeTags[eIndex];
-        if (eTag._nonManifold) continue;
-
-        ConstIndexArray  eVerts = getEdgeVertices(eIndex);
-        if (eVerts[0] == eVerts[1]) {
-            REPORT(TOPOLOGY_DEGENERATE_EDGE,
-                "Error in eIndex = %d:  degenerate edge not tagged marked non-manifold", eIndex);
-            if (returnOnFirstError) return false;
-            isValid = false;
-        }
-
-        ConstIndexArray  eFaces = getEdgeFaces(eIndex);
-        if ((eFaces.size() < 1) || (eFaces.size() > 2)) {
-            REPORT(TOPOLOGY_NON_MANIFOLD_EDGE,
-                "edge %d with %d incident faces not tagged non-manifold", eIndex, eFaces.size());
-            if (returnOnFirstError) return false;
-            isValid = false;
-        }
-    }
-    return isValid;
-}
-
-//
-//  Anonymous helper functions for debugging output -- yes, using printf(), this is not
-//  intended to serve anyone other than myself for now and I favor its formatting control
-//
-namespace {
-    template <typename INT_TYPE>
-    void
-    printIndexArray(ConstArray<INT_TYPE> const& array) {
-
-        printf("%d [%d", array.size(), array[0]);
-        for (int i = 1; i < array.size(); ++i) {
-            printf(" %d", array[i]);
-        }
-        printf("]\n");
-    }
-
-    const char*
-    ruleString(Sdc::Crease::Rule rule) {
-        switch (rule) {
-            case Sdc::Crease::RULE_UNKNOWN: return "<uninitialized>";
-            case Sdc::Crease::RULE_SMOOTH:  return "Smooth";
-            case Sdc::Crease::RULE_DART:    return "Dart";
-            case Sdc::Crease::RULE_CREASE:  return "Crease";
-            case Sdc::Crease::RULE_CORNER:  return "Corner";
-            default:
-                assert(0);
-        }
-        return 0;
-    }
-
-#ifdef __INTEL_COMPILER
-#pragma warning (push)
-#pragma warning disable 1572
-#endif
-    inline bool isSharpnessEqual(float s1, float s2) { return (s1 == s2); }
-#ifdef __INTEL_COMPILER
-#pragma warning (pop)
-#endif
-}
-
-void
-Level::print(const Refinement* pRefinement) const {
-
-    bool printFaceVerts      = true;
-    bool printFaceEdges      = true;
-    bool printFaceChildVerts = false;
-    bool printFaceTags       = true;
-
-    bool printEdgeVerts      = true;
-    bool printEdgeFaces      = true;
-    bool printEdgeChildVerts = true;
-    bool printEdgeSharpness  = true;
-    bool printEdgeTags       = true;
-
-    bool printVertFaces      = true;
-    bool printVertEdges      = true;
-    bool printVertChildVerts = false;
-    bool printVertSharpness  = true;
-    bool printVertTags       = true;
-
-    printf("Level (0x%p):\n", this);
-    printf("  Depth = %d\n", _depth);
-
-    printf("  Primary component counts:\n");
-    printf("    faces = %d\n", _faceCount);
-    printf("    edges = %d\n", _edgeCount);
-    printf("    verts = %d\n", _vertCount);
-
-    printf("  Topology relation sizes:\n");
-
-    printf("    Face relations:\n");
-    printf("      face-vert counts/offset = %lu\n", (unsigned long)_faceVertCountsAndOffsets.size());
-    printf("      face-vert indices = %lu\n", (unsigned long)_faceVertIndices.size());
-    if (_faceVertIndices.size()) {
-        for (int i = 0; printFaceVerts && i < getNumFaces(); ++i) {
-            printf("        face %4d verts:  ", i);
-            printIndexArray(getFaceVertices(i));
-        }
-    }
-    printf("      face-edge indices = %lu\n", (unsigned long)_faceEdgeIndices.size());
-    if (_faceEdgeIndices.size()) {
-        for (int i = 0; printFaceEdges && i < getNumFaces(); ++i) {
-            printf("        face %4d edges:  ", i);
-            printIndexArray(getFaceEdges(i));
-        }
-    }
-    printf("      face tags = %lu\n", (unsigned long)_faceTags.size());
-    for (int i = 0; printFaceTags && i < (int)_faceTags.size(); ++i) {
-        FTag const& fTag = _faceTags[i];
-        printf("        face %4d:", i);
-        printf("  hole = %d",  (int)fTag._hole);
-        printf("\n");
-    }
-    if (pRefinement) {
-        printf("      face child-verts = %lu\n", (unsigned long)pRefinement->_faceChildVertIndex.size());
-        for (int i = 0; printFaceChildVerts && i < (int)pRefinement->_faceChildVertIndex.size(); ++i) {
-            printf("        face %4d child vert:  %d\n", i, pRefinement->_faceChildVertIndex[i]);
-        }
-    }
-
-    printf("    Edge relations:\n");
-    printf("      edge-vert indices = %lu\n", (unsigned long)_edgeVertIndices.size());
-    if (_edgeVertIndices.size()) {
-        for (int i = 0; printEdgeVerts && i < getNumEdges(); ++i) {
-            printf("        edge %4d verts:  ", i);
-            printIndexArray(getEdgeVertices(i));
-        }
-    }
-    printf("      edge-face counts/offset = %lu\n", (unsigned long)_edgeFaceCountsAndOffsets.size());
-    printf("      edge-face indices       = %lu\n", (unsigned long)_edgeFaceIndices.size());
-    printf("      edge-face local-indices = %lu\n", (unsigned long)_edgeFaceLocalIndices.size());
-    if (_edgeFaceIndices.size()) {
-        for (int i = 0; printEdgeFaces && i < getNumEdges(); ++i) {
-            printf("        edge %4d faces:  ", i);
-            printIndexArray(getEdgeFaces(i));
-
-            printf("             face-edges:  ");
-            printIndexArray(getEdgeFaceLocalIndices(i));
-        }
-    }
-    if (pRefinement) {
-        printf("      edge child-verts = %lu\n", (unsigned long)pRefinement->_edgeChildVertIndex.size());
-        for (int i = 0; printEdgeChildVerts && i < (int)pRefinement->_edgeChildVertIndex.size(); ++i) {
-            printf("        edge %4d child vert:  %d\n", i, pRefinement->_edgeChildVertIndex[i]);
-        }
-    }
-    printf("      edge sharpness = %lu\n", (unsigned long)_edgeSharpness.size());
-    for (int i = 0; printEdgeSharpness && i < (int)_edgeSharpness.size(); ++i) {
-        printf("        edge %4d sharpness:  %f\n", i, _edgeSharpness[i]);
-    }
-    printf("      edge tags = %lu\n", (unsigned long)_edgeTags.size());
-    for (int i = 0; printEdgeTags && i < (int)_edgeTags.size(); ++i) {
-        ETag const& eTag = _edgeTags[i];
-        printf("        edge %4d:", i);
-        printf("  boundary = %d",  (int)eTag._boundary);
-        printf(", nonManifold = %d", (int)eTag._nonManifold);
-        printf(", semiSharp = %d", (int)eTag._semiSharp);
-        printf(", infSharp = %d",  (int)eTag._infSharp);
-        printf("\n");
-    }
-
-    printf("    Vert relations:\n");
-    printf("      vert-face counts/offset = %lu\n", (unsigned long)_vertFaceCountsAndOffsets.size());
-    printf("      vert-face indices       = %lu\n", (unsigned long)_vertFaceIndices.size());
-    printf("      vert-face local-indices = %lu\n", (unsigned long)_vertFaceLocalIndices.size());
-    if (_vertFaceIndices.size()) {
-        for (int i = 0; printVertFaces && i < getNumVertices(); ++i) {
-            printf("        vert %4d faces:  ", i);
-            printIndexArray(getVertexFaces(i));
-
-            printf("             face-verts:  ");
-            printIndexArray(getVertexFaceLocalIndices(i));
-        }
-    }
-    printf("      vert-edge counts/offset = %lu\n", (unsigned long)_vertEdgeCountsAndOffsets.size());
-    printf("      vert-edge indices       = %lu\n", (unsigned long)_vertEdgeIndices.size());
-    printf("      vert-edge local-indices = %lu\n", (unsigned long)_vertEdgeLocalIndices.size());
-    if (_vertEdgeIndices.size()) {
-        for (int i = 0; printVertEdges && i < getNumVertices(); ++i) {
-            printf("        vert %4d edges:  ", i);
-            printIndexArray(getVertexEdges(i));
-
-            printf("             edge-verts:  ");
-            printIndexArray(getVertexEdgeLocalIndices(i));
-        }
-    }
-    if (pRefinement) {
-        printf("      vert child-verts = %lu\n", (unsigned long)pRefinement->_vertChildVertIndex.size());
-        for (int i = 0; printVertChildVerts && i < (int)pRefinement->_vertChildVertIndex.size(); ++i) {
-            printf("        vert %4d child vert:  %d\n", i, pRefinement->_vertChildVertIndex[i]);
-        }
-    }
-    printf("      vert sharpness = %lu\n", (unsigned long)_vertSharpness.size());
-    for (int i = 0; printVertSharpness && i < (int)_vertSharpness.size(); ++i) {
-        printf("        vert %4d sharpness:  %f\n", i, _vertSharpness[i]);
-    }
-    printf("      vert tags = %lu\n", (unsigned long)_vertTags.size());
-    for (int i = 0; printVertTags && i < (int)_vertTags.size(); ++i) {
-        VTag const& vTag = _vertTags[i];
-        printf("        vert %4d:", i);
-        printf("  rule = %s",           ruleString((Sdc::Crease::Rule)vTag._rule));
-        printf(", boundary = %d",       (int)vTag._boundary);
-        printf(", corner = %d",         (int)vTag._corner);
-        printf(", xordinary = %d",      (int)vTag._xordinary);
-        printf(", nonManifold = %d",    (int)vTag._nonManifold);
-        printf(", infSharp = %d",       (int)vTag._infSharp);
-        printf(", infSharpEdges = %d",  (int)vTag._infSharpEdges);
-        printf(", infSharpCrease = %d", (int)vTag._infSharpCrease);
-        printf(", infIrregular = %d",   (int)vTag._infIrregular);
-        printf(", semiSharp = %d",      (int)vTag._semiSharp);
-        printf(", semiSharpEdges = %d", (int)vTag._semiSharpEdges);
-        printf("\n");
-    }
-    fflush(stdout);
-}
-
-//
-//  Methods for retrieving and combining tags:
-//
-bool
-Level::doesVertexFVarTopologyMatch(Index vIndex, int fvarChannel) const {
-
-    return getFVarLevel(fvarChannel).valueTopologyMatches(
-             getFVarLevel(fvarChannel).getVertexValueOffset(vIndex));
-}
-bool
-Level::doesEdgeFVarTopologyMatch(Index eIndex, int fvarChannel) const {
-
-    return getFVarLevel(fvarChannel).edgeTopologyMatches(eIndex);
-}
-bool
-Level::doesFaceFVarTopologyMatch(Index fIndex, int fvarChannel) const {
-
-    return ! getFVarLevel(fvarChannel).getFaceCompositeValueTag(fIndex).isMismatch();
-}
-
-void
-Level::getFaceVTags(Index fIndex, VTag vTags[], int fvarChannel) const {
-
-    ConstIndexArray fVerts = getFaceVertices(fIndex);
-    if (fvarChannel < 0) {
-        for (int i = 0; i < fVerts.size(); ++i) {
-            vTags[i] = getVertexTag(fVerts[i]);
-        }
-    } else {
-        FVarLevel const & fvarLevel = getFVarLevel(fvarChannel);
-        ConstIndexArray fValues = fvarLevel.getFaceValues(fIndex);
-        for (int i = 0; i < fVerts.size(); ++i) {
-            Index valueIndex = fvarLevel.findVertexValueIndex(fVerts[i], fValues[i]);
-            FVarLevel::ValueTag valueTag = fvarLevel.getValueTag(valueIndex);
-
-            vTags[i] = valueTag.combineWithLevelVTag(getVertexTag(fVerts[i]));
-        }
-    }
-}
-void
-Level::getFaceETags(Index fIndex, ETag eTags[], int fvarChannel) const {
-
-    ConstIndexArray fEdges = getFaceEdges(fIndex);
-    if (fvarChannel < 0) {
-        for (int i = 0; i < fEdges.size(); ++i) {
-            eTags[i] = getEdgeTag(fEdges[i]);
-        }
-    } else {
-        FVarLevel const & fvarLevel = getFVarLevel(fvarChannel);
-        for (int i = 0; i < fEdges.size(); ++i) {
-            FVarLevel::ETag fvarETag = fvarLevel.getEdgeTag(fEdges[i]);
-
-            eTags[i] = fvarETag.combineWithLevelETag(getEdgeTag(fEdges[i]));
-        }
-    }
-}
-
-Level::VTag
-Level::VTag::BitwiseOr(VTag const vTags[], int size) {
-
-    VTag::VTagSize tagBits = vTags[0].getBits();
-    for (int i = 1; i < size; ++i) {
-        tagBits |= vTags[i].getBits();
-    }
-    return VTag(tagBits);
-}
-Level::ETag
-Level::ETag::BitwiseOr(ETag const eTags[], int size) {
-
-    ETag::ETagSize tagBits = eTags[0].getBits();
-    for (int i = 1; i < size; ++i) {
-        tagBits |= eTags[i].getBits();
-    }
-    return ETag(tagBits);
-}
-
-Level::VTag
-Level::getFaceCompositeVTag(ConstIndexArray & fVerts) const {
-
-    VTag::VTagSize tagBits = _vertTags[fVerts[0]].getBits();
-    for (int i = 1; i < fVerts.size(); ++i) {
-        tagBits |= _vertTags[fVerts[i]].getBits();
-    }
-    return VTag(tagBits);
-}
-Level::VTag
-Level::getFaceCompositeVTag(Index fIndex, int fvarChannel) const {
-
-    ConstIndexArray fVerts = getFaceVertices(fIndex);
-    if (fvarChannel < 0) {
-        return getFaceCompositeVTag(fVerts);
-    } else {
-        FVarLevel const & fvarLevel = getFVarLevel(fvarChannel);
-        internal::StackBuffer<FVarLevel::ValueTag,64> fvarTags(fVerts.size());
-        fvarLevel.getFaceValueTags(fIndex, fvarTags);
-
-        VTag::VTagSize tagBits = fvarTags[0].combineWithLevelVTag(_vertTags[fVerts[0]]).getBits();
-        for (int i = 1; i < fVerts.size(); ++i) {
-            tagBits |= fvarTags[i].combineWithLevelVTag(_vertTags[fVerts[i]]).getBits();
-        }
-        return VTag(tagBits);
-    }
-}
-
-Level::VTag
-Level::getVertexCompositeFVarVTag(Index vIndex, int fvarChannel) const {
-
-    FVarLevel const & fvarLevel = getFVarLevel(fvarChannel);
-
-    FVarLevel::ConstValueTagArray fvTags = fvarLevel.getVertexValueTags(vIndex);
-
-    VTag vTag = getVertexTag(vIndex);
-    if (fvTags[0].isMismatch()) {
-        VTag::VTagSize tagBits = fvTags[0].combineWithLevelVTag(vTag).getBits();
-        for (int i = 1; i < fvTags.size(); ++i) {
-            tagBits |= fvTags[i].combineWithLevelVTag(vTag).getBits();
-        }
-        return VTag(tagBits);
-    } else {
-        return vTag;
-    }
-}
-
-//
-//  High-level topology gathering functions -- used mainly in patch construction.  These
-//  may eventually be moved elsewhere, possibly to classes specialized for quad- and tri-
-//  patch identification and construction, but for now somewhere more accessible than the
-//  patch tables factory is preferable.
-//
-//  Note a couple of nuisances...
-//      - debatable whether we should include the face's face-verts in the face functions
-//          - we refer to the result as a "patch" when we do
-//          - otherwise a "ring" of vertices is more appropriate
-//
-namespace {
-    template <typename INT_TYPE>
-    inline INT_TYPE fastMod4(INT_TYPE value) {
-
-        return (value & 0x3);
-    }
-
-    template <class ARRAY_OF_TYPE, class TYPE>
-    inline TYPE otherOfTwo(ARRAY_OF_TYPE const& arrayOfTwo, TYPE const& value) {
-
-        return arrayOfTwo[value == arrayOfTwo[0]];
-    }
-}
-
-//
-//  Gathering the one-ring of vertices from quads surrounding a vertex:
-//      - the neighborhood of the vertex is assumed to be quad-regular (manifold)
-//
-//  Ordering of resulting vertices:
-//      The surrounding one-ring follows the ordering of the incident faces.  For each
-//  incident quad, the two vertices in CCW order within that quad are added.  If the
-//  vertex is on a boundary, a third vertex on the boundary edge will be contributed from
-//  the last face.
-//
-int
-Level::gatherQuadRegularRingAroundVertex(
-    Index vIndex, int ringPoints[], int fvarChannel) const {
-
-    Level const& level = *this;
-
-    ConstIndexArray vEdges = level.getVertexEdges(vIndex);
-
-    ConstIndexArray vFaces = level.getVertexFaces(vIndex);
-    ConstLocalIndexArray vInFaces = level.getVertexFaceLocalIndices(vIndex);
-
-    bool isBoundary = (vEdges.size() > vFaces.size());
-
-    int ringIndex = 0;
-    for (int i = 0; i < vFaces.size(); ++i) {
-        //
-        //  For every incident quad, we want the two vertices clockwise in each face, i.e.
-        //  the vertex at the end of the leading edge and the vertex opposite this one:
-        //
-        ConstIndexArray fPoints = (fvarChannel < 0)
-                                ? level.getFaceVertices(vFaces[i])
-                                : level.getFaceFVarValues(vFaces[i], fvarChannel);
-
-        int vInThisFace = vInFaces[i];
-
-        ringPoints[ringIndex++] = fPoints[fastMod4(vInThisFace + 1)];
-        ringPoints[ringIndex++] = fPoints[fastMod4(vInThisFace + 2)];
-
-        if (isBoundary && (i == (vFaces.size() - 1))) {
-            ringPoints[ringIndex++] = fPoints[fastMod4(vInThisFace + 3)];
-        }
-    }
-    return ringIndex;
-}
-
-int
-Level::gatherQuadRegularPartialRingAroundVertex(
-    Index vIndex, VSpan const & span, int ringPoints[], int fvarChannel) const {
-
-    Level const& level = *this;
-
-    assert(! level.isVertexNonManifold(vIndex));
-
-    ConstIndexArray      vFaces   = level.getVertexFaces(vIndex);
-    ConstLocalIndexArray vInFaces = level.getVertexFaceLocalIndices(vIndex);
-
-    int nFaces    = span._numFaces;
-    int startFace = span._startFace;
-
-    int ringIndex = 0;
-    for (int i = 0; i < nFaces; ++i) {
-        //
-        //  For every incident quad, we want the two vertices clockwise in each face, i.e.
-        //  the vertex at the end of the leading edge and the vertex opposite this one:
-        //
-        int fIncident = (startFace + i) % vFaces.size();
-
-        ConstIndexArray fPoints = (fvarChannel < 0)
-                                ? level.getFaceVertices(vFaces[fIncident])
-                                : level.getFaceFVarValues(vFaces[fIncident], fvarChannel);
-
-        int vInThisFace = vInFaces[fIncident];
-
-        ringPoints[ringIndex++] = fPoints[fastMod4(vInThisFace + 1)];
-        ringPoints[ringIndex++] = fPoints[fastMod4(vInThisFace + 2)];
-
-        if ((i == nFaces - 1) && !span._periodic) {
-            ringPoints[ringIndex++] = fPoints[fastMod4(vInThisFace + 3)];
-        }
-    }
-    return ringIndex;
-}
-
-//
-//  Gathering the 4 vertices of a quad:
-//      
-//        |     |  
-//      --0-----3--
-//        |x   x|  
-//        |x   x|  
-//      --1-----2--
-//        |     |  
-//      
-int
-Level::gatherQuadLinearPatchPoints(
-    Index thisFace, Index patchPoints[], int rotation, int fvarChannel) const {
-
-    Level const& level = *this;
-
-    assert((0 <= rotation) && (rotation < 4));
-    static int const   rotationSequence[7] = { 0, 1, 2, 3, 0, 1, 2 };
-    int const * rotatedVerts = &rotationSequence[rotation];
-
-    ConstIndexArray facePoints = (fvarChannel < 0) ?
-                                 level.getFaceVertices(thisFace) :
-                                 level.getFaceFVarValues(thisFace, fvarChannel);
-
-    patchPoints[0] = facePoints[rotatedVerts[0]];
-    patchPoints[1] = facePoints[rotatedVerts[1]];
-    patchPoints[2] = facePoints[rotatedVerts[2]];
-    patchPoints[3] = facePoints[rotatedVerts[3]];
-
-    return 4;
-}
-
-//
-//  Gathering the 16 vertices of a quad-regular interior patch:
-//      - the neighborhood of the face is assumed to be quad-regular
-//
-//  Ordering of resulting vertices:
-//      It was debatable whether to include the vertices of the original face for a complete
-//  "patch" or just the surrounding ring -- clearly we ended up with a function for the entire
-//  patch, but that may change.
-//      The latter ring of vertices around the face (potentially returned on its own) was
-//  oriented with respect to the face.  The ring of 12 vertices is gathered as 4 groups of 3
-//  vertices -- one for each corner vertex, and each group forming the quad opposite each
-//  corner vertex when combined with that corner vertex.  The four vertices of the face begin
-//  the patch.
-//
-//         |     |     |     |
-//      ---5-----4-----15----14---
-//         |     |     |     |
-//         |     |     |     |
-//      ---6-----0-----3-----13---
-//         |     |x   x|     |
-//         |     |x   x|     |
-//      ---7-----1-----2-----12---
-//         |     |     |     |
-//         |     |     |     |
-//      ---8-----9-----10----11---
-//         |     |     |     |
-//
-int
-Level::gatherQuadRegularInteriorPatchPoints(
-    Index thisFace, Index patchPoints[], int rotation, int fvarChannel) const {
-
-    Level const& level = *this;
-
-    assert((0 <= rotation) && (rotation < 4));
-    static int const   rotationSequence[7] = { 0, 1, 2, 3, 0, 1, 2 };
-    int const * rotatedVerts = &rotationSequence[rotation];
-
-    ConstIndexArray thisFaceVerts = level.getFaceVertices(thisFace);
-
-    ConstIndexArray facePoints = (fvarChannel < 0) ? thisFaceVerts :
-                                 level.getFaceFVarValues(thisFace, fvarChannel);
-
-    patchPoints[0] = facePoints[rotatedVerts[0]];
-    patchPoints[1] = facePoints[rotatedVerts[1]];
-    patchPoints[2] = facePoints[rotatedVerts[2]];
-    patchPoints[3] = facePoints[rotatedVerts[3]];
-
-    //
-    //  For each of the four corner vertices, there is a face diagonally opposite
-    //  the given/central face.  Each of these faces contains three points of the
-    //  entire ring of points around that given/central face.
-    //
-    int pointIndex = 4;
-    for (int i = 0; i < 4; ++i) {
-        Index v = thisFaceVerts[rotatedVerts[i]];
-
-        ConstIndexArray      vFaces   = level.getVertexFaces(v);
-        ConstLocalIndexArray vInFaces = level.getVertexFaceLocalIndices(v);
-
-        int thisFaceInVFaces = vFaces.FindIndexIn4Tuple(thisFace);
-        int intFaceInVFaces  = fastMod4(thisFaceInVFaces + 2);
-
-        Index intFace    = vFaces[intFaceInVFaces];
-        int   vInIntFace = vInFaces[intFaceInVFaces];
-
-        facePoints = (fvarChannel < 0) ? level.getFaceVertices(intFace) :
-                     level.getFaceFVarValues(intFace, fvarChannel);
-
-        patchPoints[pointIndex++] = facePoints[fastMod4(vInIntFace + 1)];
-        patchPoints[pointIndex++] = facePoints[fastMod4(vInIntFace + 2)];
-        patchPoints[pointIndex++] = facePoints[fastMod4(vInIntFace + 3)];
-    }
-    assert(pointIndex == 16);
-    return 16;
-}
-
-//
-//  Gathering the 12 vertices of a quad-regular boundary patch:
-//      - the neighborhood of the face is assumed to be quad-regular
-//      - the single edge of the face that lies on the boundary is specified
-//      - only one edge of the face is a boundary edge
-//
-//  Ordering of resulting vertices:
-//      It was debatable whether to include the vertices of the original face for a complete
-//  "patch" or just the surrounding ring -- clearly we ended up with a function for the entire
-//  patch, but that may change.
-//      The latter ring of vertices around the face (potentially returned on its own) was
-//  oriented beginning from the leading CCW boundary edge and ending at the trailing edge.
-//  The four vertices of the face begin the patch and are oriented similarly to this outer
-//  ring -- forming an inner ring that begins and ends in the same manner.
-//
-//      ---4-----0-----3-----11---
-//         |     |x   x|     |
-//         |     |x   x|     |
-//      ---5-----1-----2-----10---
-//         |     |v0 v1|     |
-//         |     |     |     |
-//      ---6-----7-----8-----9----
-//         |     |     |     |
-//
-int
-Level::gatherQuadRegularBoundaryPatchPoints(
-    Index face, Index patchPoints[], int boundaryEdgeInFace, int fvarChannel) const {
-
-    Level const& level = *this;
-
-    int interiorEdgeInFace = fastMod4(boundaryEdgeInFace + 2);
-
-    //
-    //  V0 and V1 are the two interior vertices (opposite the boundary edge) around
-    //  which we will gather most of the ring:
-    //
-    int intV0InFace = interiorEdgeInFace;
-    int intV1InFace = fastMod4(interiorEdgeInFace + 1);
-
-    ConstIndexArray faceVerts = level.getFaceVertices(face);
-
-    Index v0 = faceVerts[intV0InFace];
-    Index v1 = faceVerts[intV1InFace];
-
-    ConstIndexArray v0Faces = level.getVertexFaces(v0);
-    ConstIndexArray v1Faces = level.getVertexFaces(v1);
-
-    ConstLocalIndexArray v0InFaces = level.getVertexFaceLocalIndices(v0);
-    ConstLocalIndexArray v1InFaces = level.getVertexFaceLocalIndices(v1);
-
-    int boundaryFaceInV0Faces = -1;
-    int boundaryFaceInV1Faces = -1;
-    for (int i = 0; i < 4; ++i) {
-        if (face == v0Faces[i]) boundaryFaceInV0Faces = i;
-        if (face == v1Faces[i]) boundaryFaceInV1Faces = i;
-    }
-    assert((boundaryFaceInV0Faces >= 0) && (boundaryFaceInV1Faces >= 0));
-
-    //  Identify the four faces of interest -- previous to and opposite V0 and
-    //  opposite and next from V1 -- relative to V0 and V1:
-    int prevFaceInV0Faces = fastMod4(boundaryFaceInV0Faces + 1);
-    int intFaceInV0Faces  = fastMod4(boundaryFaceInV0Faces + 2);
-    int intFaceInV1Faces  = fastMod4(boundaryFaceInV1Faces + 2);
-    int nextFaceInV1Faces = fastMod4(boundaryFaceInV1Faces + 3);
-
-    //  Identify the indices of the four faces:
-    Index prevFace  = v0Faces[prevFaceInV0Faces];
-    Index intV0Face = v0Faces[intFaceInV0Faces];
-    Index intV1Face = v1Faces[intFaceInV1Faces];
-    Index nextFace  = v1Faces[nextFaceInV1Faces];
-
-    //  Identify V0 and V1 relative to these four faces:
-    LocalIndex v0InPrevFace = v0InFaces[prevFaceInV0Faces];
-    LocalIndex v0InIntFace  = v0InFaces[intFaceInV0Faces];
-    LocalIndex v1InIntFace  = v1InFaces[intFaceInV1Faces];
-    LocalIndex v1InNextFace = v1InFaces[nextFaceInV1Faces];
-
-    //
-    //  Now that all faces of interest have been found, identify the point
-    //  indices within each face (i.e. the vertex or fvar-value index arrays)
-    //  and copy them into the patch points:
-    //
-    ConstIndexArray thisFacePoints,
-                    prevFacePoints,
-                    intV0FacePoints,
-                    intV1FacePoints,
-                    nextFacePoints;
-
-    if (fvarChannel < 0) {
-        thisFacePoints  = faceVerts;
-        prevFacePoints  = level.getFaceVertices(prevFace);
-        intV0FacePoints = level.getFaceVertices(intV0Face);
-        intV1FacePoints = level.getFaceVertices(intV1Face);
-        nextFacePoints  = level.getFaceVertices(nextFace);
-    } else {
-        thisFacePoints  = level.getFaceFVarValues(face, fvarChannel);
-        prevFacePoints  = level.getFaceFVarValues(prevFace, fvarChannel);
-        intV0FacePoints = level.getFaceFVarValues(intV0Face, fvarChannel);
-        intV1FacePoints = level.getFaceFVarValues(intV1Face, fvarChannel);
-        nextFacePoints  = level.getFaceFVarValues(nextFace, fvarChannel);
-    }
-
-    patchPoints[0] = thisFacePoints[fastMod4(boundaryEdgeInFace + 1)];
-    patchPoints[1] = thisFacePoints[fastMod4(boundaryEdgeInFace + 2)];
-    patchPoints[2] = thisFacePoints[fastMod4(boundaryEdgeInFace + 3)];
-    patchPoints[3] = thisFacePoints[         boundaryEdgeInFace];
-
-    patchPoints[4] = prevFacePoints[fastMod4(v0InPrevFace + 2)];
-
-    patchPoints[5] = intV0FacePoints[fastMod4(v0InIntFace + 1)];
-    patchPoints[6] = intV0FacePoints[fastMod4(v0InIntFace + 2)];
-    patchPoints[7] = intV0FacePoints[fastMod4(v0InIntFace + 3)];
-
-    patchPoints[8]  = intV1FacePoints[fastMod4(v1InIntFace + 1)];
-    patchPoints[9]  = intV1FacePoints[fastMod4(v1InIntFace + 2)];
-    patchPoints[10] = intV1FacePoints[fastMod4(v1InIntFace + 3)];
-
-    patchPoints[11] = nextFacePoints[fastMod4(v1InNextFace + 2)];
-
-    return 12;
-}
-
-//
-//  Gathering the 9 vertices of a quad-regular corner patch:
-//      - the neighborhood of the face is assumed to be quad-regular
-//      - the single corner vertex is specified
-//      - only one vertex of the face is a corner
-//
-//  Ordering of resulting vertices:
-//      It was debatable whether to include the vertices of the original face for a complete
-//  "patch" or just the surrounding ring -- clearly we ended up with a function for the entire
-//  patch, but that may change.
-//      Like the boundary case, the latter ring of vertices around the face was oriented
-//  beginning from the leading CCW boundary edge and ending at the trailing edge.  The four
-//  face vertices begin the patch, and begin with the corner vertex.
-//
-//      0-----3-----8---
-//      |x   x|     |
-//      |x   x|     |
-//      1-----2-----7---
-//      |     |     |
-//      |     |     |
-//      4-----5-----6---
-//      |     |     |
-//
-int
-Level::gatherQuadRegularCornerPatchPoints(
-    Index face, Index patchPoints[], int cornerVertInFace, int fvarChannel) const {
-
-    Level const& level = *this;
-
-    int interiorFaceVert = fastMod4(cornerVertInFace + 2);
-
-    ConstIndexArray faceVerts = level.getFaceVertices(face);
-    Index intVert = faceVerts[interiorFaceVert];
-
-    ConstIndexArray      intVertFaces   = level.getVertexFaces(intVert);
-    ConstLocalIndexArray intVertInFaces = level.getVertexFaceLocalIndices(intVert);
-
-    int cornerFaceInIntVertFaces = -1;
-    for (int i = 0; i < intVertFaces.size(); ++i) {
-        if (face == intVertFaces[i]) {
-            cornerFaceInIntVertFaces = i;
-            break;
-        }
-    }
-    assert(cornerFaceInIntVertFaces >= 0);
-
-    //  Identify the three faces relative to the interior vertex:
-    int prevFaceInIntVertFaces = fastMod4(cornerFaceInIntVertFaces + 1);
-    int intFaceInIntVertFaces  = fastMod4(cornerFaceInIntVertFaces + 2);
-    int nextFaceInIntVertFaces = fastMod4(cornerFaceInIntVertFaces + 3);
-
-    //  Identify the indices of the three other faces:
-    Index prevFace = intVertFaces[prevFaceInIntVertFaces];
-    Index intFace  = intVertFaces[intFaceInIntVertFaces];
-    Index nextFace = intVertFaces[nextFaceInIntVertFaces];
-
-    //  Identify the interior vertex relative to these three faces:
-    LocalIndex intVertInPrevFace = intVertInFaces[prevFaceInIntVertFaces];
-    LocalIndex intVertInIntFace  = intVertInFaces[intFaceInIntVertFaces];
-    LocalIndex intVertInNextFace = intVertInFaces[nextFaceInIntVertFaces];
-
-    //
-    //  Now that all faces of interest have been found, identify the point
-    //  indices within each face (i.e. the vertex or fvar-value index arrays)
-    //  and copy them into the patch points:
-    //
-    ConstIndexArray thisFacePoints,
-                    prevFacePoints,
-                    intFacePoints,
-                    nextFacePoints;
-
-    if (fvarChannel < 0) {
-        thisFacePoints = faceVerts;
-        prevFacePoints = level.getFaceVertices(prevFace);
-        intFacePoints  = level.getFaceVertices(intFace);
-        nextFacePoints = level.getFaceVertices(nextFace);
-    } else {
-        thisFacePoints = level.getFaceFVarValues(face, fvarChannel);
-        prevFacePoints = level.getFaceFVarValues(prevFace, fvarChannel);
-        intFacePoints  = level.getFaceFVarValues(intFace, fvarChannel);
-        nextFacePoints = level.getFaceFVarValues(nextFace, fvarChannel);
-    }
-
-    patchPoints[0] = thisFacePoints[         cornerVertInFace];
-    patchPoints[1] = thisFacePoints[fastMod4(cornerVertInFace + 1)];
-    patchPoints[2] = thisFacePoints[fastMod4(cornerVertInFace + 2)];
-    patchPoints[3] = thisFacePoints[fastMod4(cornerVertInFace + 3)];
-
-    patchPoints[4] = prevFacePoints[fastMod4(intVertInPrevFace + 2)];
-
-    patchPoints[5] = intFacePoints[fastMod4(intVertInIntFace + 1)];
-    patchPoints[6] = intFacePoints[fastMod4(intVertInIntFace + 2)];
-    patchPoints[7] = intFacePoints[fastMod4(intVertInIntFace + 3)];
-
-    patchPoints[8] = nextFacePoints[fastMod4(intVertInNextFace + 2)];
-
-    return 9;
-}
-
-//
-//  Gathering the 12 vertices of a tri-regular interior patch:
-//      - the neighborhood of the face is assumed to be tri-regular
-//
-//  Ordering of resulting vertices:
-//      The three vertices of the triangle begin the sequence, followed by counter-clockwise
-//  traversal of the outer ring of vertices -- beginning with the vertex incident V0 such
-//  that the ring is symmetric about the triangle.
-/*
-//                   3           11
-//                   X - - - - - X
-//                 /   \       /   \
-//               /       \ 0 /       \
-//          4  X - - - - - X - - - - - X 10
-//           /   \       / * \       /   \
-//         /       \   / * * * \   /       \
-//    5  X - - - - - X - - - - - X - - - - - X  9
-//         \       / 1 \       / 2 \       /
-//           \   /       \   /       \   /
-//             X - - - - - X - - - - - X
-//             6           7           8
-*/
-int
-Level::gatherTriRegularInteriorPatchPoints(Index fIndex, Index points[12], int rotation) const
-{
-    ConstIndexArray  fVerts = getFaceVertices(fIndex);
-    ConstIndexArray  fEdges = getFaceEdges(fIndex);
-
-    int index0 = 0;
-    int index1 = 1;
-    int index2 = 2;
-    if (rotation) {
-        index0 = rotation % 3;
-        index1 = (rotation + 1) % 3;
-        index2 = (rotation + 2) % 3;
-    }
-
-    Index v0 = fVerts[index0];
-    Index v1 = fVerts[index1];
-    Index v2 = fVerts[index2];
-
-    ConstIndexArray  v0Edges = getVertexEdges(v0);
-    ConstIndexArray  v1Edges = getVertexEdges(v1);
-    ConstIndexArray  v2Edges = getVertexEdges(v2);
-
-    int e0InV0Edges = v0Edges.FindIndex(fEdges[index0]);
-    int e1InV1Edges = v1Edges.FindIndex(fEdges[index1]);
-    int e2InV2Edges = v2Edges.FindIndex(fEdges[index2]);
-
-    points[ 0] = v0;
-    points[ 1] = v1;
-    points[ 2] = v2;
-
-    points[11] = otherOfTwo(getEdgeVertices(v0Edges[(e0InV0Edges + 3) % 6]), v0);
-    points[ 3] = otherOfTwo(getEdgeVertices(v0Edges[(e0InV0Edges + 4) % 6]), v0);
-    points[ 4] = otherOfTwo(getEdgeVertices(v0Edges[(e0InV0Edges + 5) % 6]), v0);
-
-    points[ 5] = otherOfTwo(getEdgeVertices(v1Edges[(e1InV1Edges + 3) % 6]), v1);
-    points[ 6] = otherOfTwo(getEdgeVertices(v1Edges[(e1InV1Edges + 4) % 6]), v1);
-    points[ 7] = otherOfTwo(getEdgeVertices(v1Edges[(e1InV1Edges + 5) % 6]), v1);
-
-    points[ 8] = otherOfTwo(getEdgeVertices(v2Edges[(e2InV2Edges + 3) % 6]), v2);
-    points[ 9] = otherOfTwo(getEdgeVertices(v2Edges[(e2InV2Edges + 4) % 6]), v2);
-    points[10] = otherOfTwo(getEdgeVertices(v2Edges[(e2InV2Edges + 5) % 6]), v2);
-
-    return 12;
-}
-
-//
-//  Gathering the 9 vertices of a tri-regular "boundary edge" patch:
-//      - the neighborhood of the face is assumed to be tri-regular
-//      - referred to as "boundary edge" as the boundary occurs on the edge of the triangle
-//
-//  Boundary edge:
-//
-/*                   6           5
-//                   X - - - - - X
-//                 /   \       /   \
-//               /       \ 2 /       \
-//          7  X - - - - - X - - - - - X  4
-//           /   \       / * \       /   \
-//         /       \   / * * * \   /       \
-//    8  X - - - - - X - - - - - X - - - - - X  3
-//                   0           1
-*/
-int
-Level::gatherTriRegularBoundaryEdgePatchPoints(Index fIndex, Index points[], int boundaryFaceEdge) const
-{
-    ConstIndexArray  fVerts = getFaceVertices(fIndex);
-
-    Index v0 = fVerts[boundaryFaceEdge];
-    Index v1 = fVerts[(boundaryFaceEdge + 1) % 3];
-    Index v2 = fVerts[(boundaryFaceEdge + 2) % 3];
-
-    ConstIndexArray  v0Edges = getVertexEdges(v0);
-    ConstIndexArray  v1Edges = getVertexEdges(v1);
-    ConstIndexArray  v2Edges = getVertexEdges(v2);
-
-    int e1InV2Edges = v2Edges.FindIndex(v1Edges[2]);
-
-    points[0] = v0;
-    points[1] = v1;
-    points[2] = v2;
-
-    points[3] = otherOfTwo(getEdgeVertices(v1Edges[0]), v1);
-
-    points[4] = otherOfTwo(getEdgeVertices(v2Edges[(e1InV2Edges + 1) % 6]), v2);
-    points[5] = otherOfTwo(getEdgeVertices(v2Edges[(e1InV2Edges + 2) % 6]), v2);
-    points[6] = otherOfTwo(getEdgeVertices(v2Edges[(e1InV2Edges + 3) % 6]), v2);
-    points[7] = otherOfTwo(getEdgeVertices(v2Edges[(e1InV2Edges + 4) % 6]), v2);
-
-    points[8] = otherOfTwo(getEdgeVertices(v0Edges[3]), v0);
-
-    return 9;
-}
-
-//
-//  Gathering the 10 vertices of a tri-regular "boundary vertex" patch:
-//      - the neighborhood of the face is assumed to be tri-regular
-//      - referred to as "boundary vertex" as the boundary occurs on the vertex of the triangle
-//
-//  Boundary vertex:
-/*
-//                         0
-//          3  X - - - - - X - - - - - X  9
-//           /   \       / * \       /   \
-//         /       \   / * * * \   /       \
-//    4  X - - - - - X - - - - - X - - - - - X  8
-//         \       / 1 \       / 2 \       /
-//           \   /       \   /       \   /
-//             X - - - - - X - - - - - X
-//             5           6           7
-*/
-int
-Level::gatherTriRegularBoundaryVertexPatchPoints(Index fIndex, Index points[], int boundaryFaceVert) const
-{
-    ConstIndexArray  fVerts = getFaceVertices(fIndex);
-    ConstIndexArray  fEdges = getFaceEdges(fIndex);
-
-    Index v0 = fVerts[boundaryFaceVert];
-    Index v1 = fVerts[(boundaryFaceVert + 1) % 3];
-    Index v2 = fVerts[(boundaryFaceVert + 2) % 3];
-
-    Index e1 = fEdges[boundaryFaceVert];
-    Index e2 = fEdges[(boundaryFaceVert + 2) % 3];
-
-    ConstIndexArray  v1Edges = getVertexEdges(v1);
-    ConstIndexArray  v2Edges = getVertexEdges(v2);
-
-    int e1InV1Edges = v1Edges.FindIndex(e1);
-    int e2InV2Edges = v2Edges.FindIndex(e2);
-
-    points[0] = v0;
-    points[1] = v1;
-    points[2] = v2;
-
-    points[3] = otherOfTwo(getEdgeVertices(v1Edges[(e1InV1Edges + 1) % 6]), v1);
-    points[4] = otherOfTwo(getEdgeVertices(v1Edges[(e1InV1Edges + 2) % 6]), v1);
-    points[5] = otherOfTwo(getEdgeVertices(v1Edges[(e1InV1Edges + 3) % 6]), v1);
-    points[6] = otherOfTwo(getEdgeVertices(v1Edges[(e1InV1Edges + 4) % 6]), v1);
-
-    points[7] = otherOfTwo(getEdgeVertices(v2Edges[(e2InV2Edges + 3) % 6]), v2);
-    points[8] = otherOfTwo(getEdgeVertices(v2Edges[(e2InV2Edges + 4) % 6]), v2);
-    points[9] = otherOfTwo(getEdgeVertices(v2Edges[(e2InV2Edges + 5) % 6]), v2);
-
-    return 10;
-}
-
-//
-//  Gathering the 6 vertices of a tri-regular "corner vertex" patch:
-//      - the neighborhood of the face is assumed to be tri-regular
-//      - referred to as "corner vertex" to disambiguate it from another corner case
-//          - another boundary case shares the edge with the corner triangle
-//
-//  Corner vertex:
-/*
-//                         0
-//                         X
-//                       / * \
-//                     / * * * \
-//                   X - - - - - X
-//                 / 1 \       / 2 \
-//               /       \   /       \
-//             X - - - - - X - - - - - X
-//             3           4           5
-*/
-int
-Level::gatherTriRegularCornerVertexPatchPoints(Index fIndex, Index points[], int cornerFaceVert) const
-{
-    ConstIndexArray  fVerts = getFaceVertices(fIndex);
-
-    Index v0 = fVerts[cornerFaceVert];
-    Index v1 = fVerts[(cornerFaceVert + 1) % 3];
-    Index v2 = fVerts[(cornerFaceVert + 2) % 3];
-
-    ConstIndexArray  v1Edges = getVertexEdges(v1);
-    ConstIndexArray  v2Edges = getVertexEdges(v2);
-
-    points[0] = v0;
-    points[1] = v1;
-    points[2] = v2;
-
-    points[3] = otherOfTwo(getEdgeVertices(v1Edges[0]), v1);
-    points[4] = otherOfTwo(getEdgeVertices(v1Edges[1]), v1);
-    points[5] = otherOfTwo(getEdgeVertices(v2Edges[3]), v2);
-
-    return 6;
-}
-
-//
-//  Gathering the 8 vertices of a tri-regular "corner edge" patch:
-//      - the neighborhood of the face is assumed to be tri-regular
-//      - referred to as "corner edge" to disambiguate it from the vertex corner case
-//          - this faces shares the edge with a corner triangle
-//
-//  Corner edge:
-/*
-//                   6           5
-//                   X - - - - - X
-//                 /   \       /   \
-//               /       \ 2 /       \
-//          7  X - - - - - X - - - - - X  4
-//               \       / * \       /
-//                 \   / * * * \   /
-//                   X - - - - - X
-//                   0 \       / 1
-//                       \   /
-//                         X
-//                         3
-*/
-int
-Level::gatherTriRegularCornerEdgePatchPoints(Index fIndex, Index points[], int cornerFaceEdge) const
-{
-    ConstIndexArray  fVerts = getFaceVertices(fIndex);
-
-    Index v0 = fVerts[cornerFaceEdge];
-    Index v1 = fVerts[(cornerFaceEdge + 1) % 3];
-    Index v2 = fVerts[(cornerFaceEdge + 2) % 3];
-
-    ConstIndexArray  v0Edges = getVertexEdges(v0);
-    ConstIndexArray  v1Edges = getVertexEdges(v1);
-
-    points[0] = v0;
-    points[1] = v1;
-    points[2] = v2;
-
-    points[3] = otherOfTwo(getEdgeVertices(v1Edges[3]), v1);
-    points[4] = otherOfTwo(getEdgeVertices(v1Edges[0]), v1);
-    points[7] = otherOfTwo(getEdgeVertices(v0Edges[3]), v0);
-
-    ConstIndexArray  v4Edges = getVertexEdges(points[4]);
-    ConstIndexArray  v7Edges = getVertexEdges(points[7]);
-
-    points[5] = otherOfTwo(getEdgeVertices(v4Edges[v4Edges.size() - 3]), v1);
-    points[6] = otherOfTwo(getEdgeVertices(v7Edges[2]), v1);
-
-    return 8;
-}
-
-bool
-Level::isSingleCreasePatch(Index face, float *sharpnessOut, int *sharpEdgeInFaceOut) const {
-
-    //  Using the composite tag for all face vertices, first make sure that some
-    //  face-vertices are Crease vertices, and quickly reject this case based on the
-    //  presence of other features.  Ultimately we want a regular interior face with
-    //  two (adjacent) Crease vertics and two Smooth vertices.  This first test
-    //  quickly ensures a regular interior face with some number of Crease vertices
-    //  and any remaining as Smooth.
-    //
-    ConstIndexArray fVerts = getFaceVertices(face);
-
-    VTag allCornersTag = getFaceCompositeVTag(fVerts);
-    if (!(allCornersTag._rule & Sdc::Crease::RULE_CREASE) ||
-         (allCornersTag._rule & Sdc::Crease::RULE_CORNER) ||
-         (allCornersTag._rule & Sdc::Crease::RULE_DART) ||
-          allCornersTag._boundary ||
-          allCornersTag._xordinary ||
-          allCornersTag._nonManifold) {
-        return false;
-    }
-
-    //  Identify the crease vertices in a 4-bit mask and use it as an index to
-    //  verify that we have exactly two adjacent crease vertices while identifying
-    //  the edge between them -- reject any case not returning a valid edge.
-    //
-    int creaseCornerMask = ((getVertexTag(fVerts[0])._rule == Sdc::Crease::RULE_CREASE) << 0) |
-                           ((getVertexTag(fVerts[1])._rule == Sdc::Crease::RULE_CREASE) << 1) |
-                           ((getVertexTag(fVerts[2])._rule == Sdc::Crease::RULE_CREASE) << 2) |
-                           ((getVertexTag(fVerts[3])._rule == Sdc::Crease::RULE_CREASE) << 3);
-    static const int sharpEdgeFromCreaseMask[16] = { -1, -1, -1,  0, -1, -1,  1, -1,
-                                                     -1,  3, -1, -1,  2, -1, -1, -1 };
-
-    int sharpEdgeInFace = sharpEdgeFromCreaseMask[creaseCornerMask];
-    if (sharpEdgeInFace < 0) {
-        return false;
-    }
-
-    //  Reject if the crease at the two crease vertices A and B is not regular, i.e.
-    //  any pair of opposing edges does not have the same sharpness value (one pair
-    //  sharp, the other smooth).  The resulting two regular creases must be "colinear"
-    //  (sharing the edge between them, and so its common sharpness value) otherwise
-    //  we would have more than two crease vertices.
-    //
-    ConstIndexArray vAEdges = getVertexEdges(fVerts[         sharpEdgeInFace]);
-    ConstIndexArray vBEdges = getVertexEdges(fVerts[fastMod4(sharpEdgeInFace + 1)]);
-
-    if (!isSharpnessEqual(getEdgeSharpness(vAEdges[0]), getEdgeSharpness(vAEdges[2])) ||
-        !isSharpnessEqual(getEdgeSharpness(vAEdges[1]), getEdgeSharpness(vAEdges[3])) ||
-        !isSharpnessEqual(getEdgeSharpness(vBEdges[0]), getEdgeSharpness(vBEdges[2])) ||
-        !isSharpnessEqual(getEdgeSharpness(vBEdges[1]), getEdgeSharpness(vBEdges[3]))) {
-        return false;
-    }
-    if (sharpnessOut) {
-        *sharpnessOut = getEdgeSharpness(getFaceEdges(face)[sharpEdgeInFace]);
-    }
-    if (sharpEdgeInFaceOut) {
-        *sharpEdgeInFaceOut = sharpEdgeInFace;
-    }
-    return true;
-}
-
-//
-//  What follows is an internal/anonymous class and protected methods to complete all
-//  topological relations when only the face-vertex relations are defined.
-//
-//  In keeping with the original idea that Level is just data and relies on other
-//  classes to construct it, this functionality may be warranted elsewhere, but we are
-//  collectively unclear as to where that should be at present.  In the meantime, the
-//  implementation is provided here so that we can test and make use of it.
-//
-namespace {
-    //
-    //  This is an internal helper class to manage the assembly of the topological relations
-    //  that do not have a predictable size, i.e. faces-per-edge, faces-per-vertex and
-    //  edges-per-vertex.  Level manages these with two vectors:
-    //
-    //      - a vector of integer pairs for the "counts" and "offsets"
-    //      - a vector of incident members accessed by the "offset" of each
-    //
-    //  The "dynamic relation" allocates the latter vector of members based on a typical
-    //  number of members per component, e.g. we expect valence 4 vertices in a typical
-    //  quad-mesh, and so an "expected" number might be 6 to accommodate a few x-ordinary
-    //  vertices.  The member vector is allocated with this number per component and the
-    //  counts and offsets initialized to refer to them -- but with the counts set to 0.
-    //  The count will be incremented as members are identified and entered, and if any
-    //  component "overflows" the expected number of members, the members are moved to a
-    //  separate vector in an std::map for the component.
-    //
-    //  Once all incident members have been added, the main vector is compressed and may
-    //  need to merge entries from the map in the process.
-    //
-    typedef std::map<Index, IndexVector> IrregIndexMap;
-
-    class DynamicRelation {
-    public:
-        DynamicRelation(IndexVector& countAndOffsets, IndexVector& indices, int membersPerComp);
-        ~DynamicRelation() { }
-
-    public:
-        //  Methods dealing with the members for each component:
-        IndexArray getCompMembers(Index index);
-        void       appendCompMember(Index index, Index member);
-
-        //  Methods dealing with the components:
-        void appendComponent();
-        int  compressMemberIndices();
-
-    public:
-        int _compCount;
-        int _memberCountPerComp;
-
-        IndexVector & _countsAndOffsets;
-        IndexVector & _regIndices;
-
-        IrregIndexMap _irregIndices;
-    };
-
-    inline
-    DynamicRelation::DynamicRelation(IndexVector& countAndOffsets, IndexVector& indices, int membersPerComp) :
-            _compCount(0),
-            _memberCountPerComp(membersPerComp),
-            _countsAndOffsets(countAndOffsets),
-            _regIndices(indices) {
-
-        _compCount = (int) _countsAndOffsets.size() / 2;
-
-        for (int i = 0; i < _compCount; ++i) {
-            _countsAndOffsets[2*i]   = 0;
-            _countsAndOffsets[2*i+1] = i * _memberCountPerComp;
-        }
-        _regIndices.resize(_compCount * _memberCountPerComp);
-    }
-
-    inline IndexArray
-    DynamicRelation::getCompMembers(Index compIndex) {
-
-        int count = _countsAndOffsets[2*compIndex];
-        if (count > _memberCountPerComp) {
-            IndexVector & irregMembers = _irregIndices[compIndex];
-            return IndexArray(&irregMembers[0], (int)irregMembers.size());
-        } else {
-            int offset = _countsAndOffsets[2*compIndex+1];
-            return IndexArray(&_regIndices[offset], count);
-        }
-    }
-    inline void
-    DynamicRelation::appendCompMember(Index compIndex, Index memberValue) {
-
-        int count  = _countsAndOffsets[2*compIndex];
-        int offset = _countsAndOffsets[2*compIndex+1];
-
-        if (count < _memberCountPerComp) {
-            _regIndices[offset + count] = memberValue;
-        } else {
-            IndexVector& irregMembers = _irregIndices[compIndex];
-
-            if (count > _memberCountPerComp) {
-                irregMembers.push_back(memberValue);
-            } else {
-                irregMembers.resize(_memberCountPerComp + 1);
-                std::memcpy(&irregMembers[0], &_regIndices[offset], sizeof(Index) * _memberCountPerComp);
-                irregMembers[_memberCountPerComp] = memberValue;
-            }
-        }
-        _countsAndOffsets[2*compIndex] ++;
-    }
-    inline void
-    DynamicRelation::appendComponent() {
-
-        _countsAndOffsets.push_back(0);
-        _countsAndOffsets.push_back(_compCount * _memberCountPerComp);
-
-        ++ _compCount;
-        _regIndices.resize(_compCount * _memberCountPerComp);
-    }
-    int
-    DynamicRelation::compressMemberIndices() {
-
-        if (_irregIndices.size() == 0) {
-            int memberCount = _countsAndOffsets[0];
-            int memberMax   = _countsAndOffsets[0];
-            for (int i = 1; i < _compCount; ++i) {
-                int count  = _countsAndOffsets[2*i];
-                int offset = _countsAndOffsets[2*i + 1];
-
-                memmove(&_regIndices[memberCount], &_regIndices[offset], count * sizeof(Index));
-
-                _countsAndOffsets[2*i + 1] = memberCount;
-                memberCount += count;
-                memberMax    = std::max(memberMax, count);
-            }
-            _regIndices.resize(memberCount);
-            return memberMax;
-        } else {
-            //  Assign new offsets-per-component while determining if we can trivially compress in place:
-            bool cannotBeCompressedInPlace = false;
-
-            int memberCount = _countsAndOffsets[0];
-            for (int i = 1; i < _compCount; ++i) {
-                _countsAndOffsets[2*i + 1] = memberCount;
-
-                cannotBeCompressedInPlace |= (memberCount > (_memberCountPerComp * i));
-
-                memberCount += _countsAndOffsets[2*i];
-            }
-            cannotBeCompressedInPlace |= (memberCount > (_memberCountPerComp * _compCount));
-
-            //  Copy members into the original or temporary vector accordingly:
-            IndexVector  tmpIndices;
-            if (cannotBeCompressedInPlace) {
-                tmpIndices.resize(memberCount);
-            }
-            IndexVector& dstIndices = cannotBeCompressedInPlace ? tmpIndices : _regIndices;
-
-            int memberMax = _memberCountPerComp;
-            for (int i = 0; i < _compCount; ++i) {
-                int count = _countsAndOffsets[2*i];
-
-                Index *dstMembers = &dstIndices[0] + _countsAndOffsets[2*i + 1];
-                Index *srcMembers = 0;
-                
-                if (count <= _memberCountPerComp) {
-                     srcMembers = &_regIndices[i * _memberCountPerComp];
-                } else {
-                     srcMembers = &_irregIndices[i][0];
-                     memberMax = std::max(memberMax, count);
-                }
-                memmove(dstMembers, srcMembers, count * sizeof(Index));
-            }
-            if (cannotBeCompressedInPlace) {
-                _regIndices.swap(tmpIndices);
-            } else {
-                _regIndices.resize(memberCount);
-            }
-            return memberMax;
-        }
-    }
-}
-
-
-//
-//  Methods to populate the missing topology relations of the Level:
-//
-inline Index
-Level::findEdge(Index v0Index, Index v1Index, ConstIndexArray v0Edges) const {
-
-    if (v0Index != v1Index) {
-        for (int j = 0; j < v0Edges.size(); ++j) {
-            ConstIndexArray eVerts = this->getEdgeVertices(v0Edges[j]);
-            if ((eVerts[0] == v1Index) || (eVerts[1] == v1Index)) {
-                return v0Edges[j];
-            }
-        }
-    } else {
-        for (int j = 0; j < v0Edges.size(); ++j) {
-            ConstIndexArray eVerts = this->getEdgeVertices(v0Edges[j]);
-            if (eVerts[0] == eVerts[1]) {
-                return v0Edges[j];
-            }
-        }
-    }
-    return INDEX_INVALID;
-}
-
-Index
-Level::findEdge(Index v0Index, Index v1Index) const {
-    return this->findEdge(v0Index, v1Index, this->getVertexEdges(v0Index));
-}
-
-bool
-Level::completeTopologyFromFaceVertices() {
-
-    //
-    //  It's assumed (a pre-condition) that face-vertices have been fully specified and that we
-    //  are to construct the remaining relations:  including the edge list.  We may want to
-    //  support the existence of the edge list too in future:
-    //
-    int vCount = this->getNumVertices();
-    int fCount = this->getNumFaces();
-    int eCount = this->getNumEdges();
-    assert((vCount > 0) && (fCount > 0) && (eCount == 0));
-
-    //  May be unnecessary depending on how the vertices and faces were defined, but worth a
-    //  call to ensure all data related to verts and faces is available -- this will be a
-    //  harmless call if all has been taken care of.
-    //
-    //  Remember to resize edges similarly after the edge list has been assembled...
-    this->resizeVertices(vCount);
-    this->resizeFaces(fCount);
-    this->resizeEdges(0);
-
-    //
-    //  Resize face-edges to match face-verts and reserve for edges based on an estimate:
-    //
-    this->_faceEdgeIndices.resize(this->getNumFaceVerticesTotal());
-
-    int eCountEstimate = (vCount << 1);
-
-    this->_edgeVertIndices.reserve(eCountEstimate * 2);
-    this->_edgeFaceIndices.reserve(eCountEstimate * 2);
-
-    this->_edgeFaceCountsAndOffsets.reserve(eCountEstimate * 2);
-
-    //
-    //  Create the dynamic relations to be populated (edge-faces will remain empty as reserved
-    //  above since there are currently no edges) and iterate through the faces to do so:
-    //
-    const int avgSize = 6;
-
-    DynamicRelation dynEdgeFaces(this->_edgeFaceCountsAndOffsets, this->_edgeFaceIndices, 2);
-    DynamicRelation dynVertFaces(this->_vertFaceCountsAndOffsets, this->_vertFaceIndices, avgSize);
-    DynamicRelation dynVertEdges(this->_vertEdgeCountsAndOffsets, this->_vertEdgeIndices, avgSize);
-
-    //  Inspect each edge created and identify those that are non-manifold as we go:
-    IndexVector nonManifoldEdges;
-
-    for (Index fIndex = 0; fIndex < fCount; ++fIndex) {
-        IndexArray fVerts = this->getFaceVertices(fIndex);
-        IndexArray fEdges = this->getFaceEdges(fIndex);
-
-        for (int i = 0; i < fVerts.size(); ++i) {
-            Index v0Index = fVerts[i];
-            Index v1Index = fVerts[(i+1) % fVerts.size()];
-
-            //
-            //  If not degenerate, search for a previous occurrence of this edge [v0,v1]
-            //  in v0's incident edge members.  Otherwise, set the edge index as invalid
-            //  to trigger creation of a new/unique instance of the degenerate edge:
-            //
-            Index eIndex;
-            if (v0Index != v1Index) {
-                eIndex = this->findEdge(v0Index, v1Index, dynVertEdges.getCompMembers(v0Index));
-            } else {
-                eIndex = INDEX_INVALID;
-                nonManifoldEdges.push_back(this->_edgeCount);
-            }
-
-            //
-            //  If the edge already exists, see if it is non-manifold, i.e. it has already been
-            //  added to two faces, or this face has the edge in the same orientation as the
-            //  first face (indicating opposite winding orders between the two faces).
-            //
-            //  Otherwise, create a new edge, append the new vertex pair [v0,v1] and update
-            //  the incidence relations for the edge and its end vertices and this face.
-            //
-            //  Regardless of whether or not the edge was new, update the edge-faces, the
-            //  face-edges and the vertex-faces for this vertex.
-            //
-            if (IndexIsValid(eIndex)) {
-                IndexArray eFaces = dynEdgeFaces.getCompMembers(eIndex);
-                if (eFaces[eFaces.size() - 1] == fIndex) {
-                    //  If the edge already occurs in this face, create a new instance:
-                    nonManifoldEdges.push_back(eIndex);
-                    nonManifoldEdges.push_back(this->_edgeCount);
-                    eIndex = INDEX_INVALID;
-                } else if (eFaces.size() > 1) {
-                    nonManifoldEdges.push_back(eIndex);
-                } else if (v0Index == this->getEdgeVertices(eIndex)[0]) {
-                    nonManifoldEdges.push_back(eIndex);
-                }
-            }
-            if (!IndexIsValid(eIndex)) {
-                eIndex = (Index) this->_edgeCount;
-
-                this->_edgeCount ++;
-                this->_edgeVertIndices.push_back(v0Index);
-                this->_edgeVertIndices.push_back(v1Index);
-
-                dynEdgeFaces.appendComponent();
-
-                dynVertEdges.appendCompMember(v0Index, eIndex);
-                dynVertEdges.appendCompMember(v1Index, eIndex);
-            }
-
-            dynEdgeFaces.appendCompMember(eIndex,  fIndex);
-            dynVertFaces.appendCompMember(v0Index, fIndex);
-
-            fEdges[i] = eIndex;
-        }
-    }
-
-    //
-    //  Compress the incident member vectors while determining the maximum for each.
-    //  Use these to set maximum relation count members and to test for valence or
-    //  other incident member overflow:  max edge-faces is simple, but for max-valence,
-    //  remember it was first initialized with the maximum of face-verts, so use its
-    //  existing value -- and some non-manifold cases can have #faces > #edges, so be
-    //  sure to consider both.
-    //
-    int maxEdgeFaces = dynEdgeFaces.compressMemberIndices();
-    int maxVertFaces = dynVertFaces.compressMemberIndices();
-    int maxVertEdges = dynVertEdges.compressMemberIndices();
-
-    _maxEdgeFaces = maxEdgeFaces;
-
-    assert(_maxValence > 0);
-    _maxValence = std::max(maxVertFaces, _maxValence);
-    _maxValence = std::max(maxVertEdges, _maxValence);
-
-    //  If max-edge-faces too large, max-valence must also be, so just need the one:
-    if (_maxValence > VALENCE_LIMIT) {
-        return false;
-    }
-
-    //
-    //  At this point all incident members are associated with each component.  We still
-    //  need to populate the "local indices" for each and orient manifold components in
-    //  counter-clockwise order.  First tag non-manifold edges and their incident
-    //  vertices so that we can trivially skip orienting these -- though some vertices
-    //  will be determined non-manifold as a result of a failure to orient them (and
-    //  will be marked accordingly when so detected).
-    //
-    //  Finally, the local indices are assigned.  This is trivial for manifold components
-    //  as if component V is in component F, V will only occur once in F.  For non-manifold
-    //  cases V may occur multiple times in F -- we rely on such instances being successive
-    //  based on their original assignment above, which simplifies the task.
-    //
-    //  First resize edges to the new count to ensure anything related to edges is created:
-    eCount = this->getNumEdges();
-    this->resizeEdges(eCount);
-
-    for (int i = 0; i < (int)nonManifoldEdges.size(); ++i) {
-        Index eIndex = nonManifoldEdges[i];
-
-        _edgeTags[eIndex]._nonManifold = true;
-
-        IndexArray eVerts = getEdgeVertices(eIndex);
-        _vertTags[eVerts[0]]._nonManifold = true;
-        _vertTags[eVerts[1]]._nonManifold = true;
-    }
-
-    orientIncidentComponents();
-
-    populateLocalIndices();
-
-//printf("Vertex topology completed...\n");
-//this->print();
-//printf("  validating vertex topology...\n");
-//this->validateTopology();
-//assert(this->validateTopology());
-    return true;
-}
-
-void
-Level::populateLocalIndices() {
-
-    //
-    //  We have three sets of local indices -- edge-faces, vert-faces and vert-edges:
-    //
-    int eCount = this->getNumEdges();
-    int vCount = this->getNumVertices();
-
-    this->_vertFaceLocalIndices.resize(this->_vertFaceIndices.size());
-    this->_vertEdgeLocalIndices.resize(this->_vertEdgeIndices.size());
-    this->_edgeFaceLocalIndices.resize(this->_edgeFaceIndices.size());
-
-    for (Index vIndex = 0; vIndex < vCount; ++vIndex) {
-        IndexArray      vFaces   = this->getVertexFaces(vIndex);
-        LocalIndexArray vInFaces = this->getVertexFaceLocalIndices(vIndex);
-
-        //
-        //  We keep track of the last face during the iteration to detect when two
-        //  (or more) successive faces are the same -- indicating a degenerate edge
-        //  or other non-manifold situation.  If so, we continue to search from the
-        //  point of the last face's local index:
-        //
-        Index vFaceLast = INDEX_INVALID;
-        for (int i = 0; i < vFaces.size(); ++i) {
-            IndexArray fVerts = this->getFaceVertices(vFaces[i]);
-
-            int vStart = (vFaces[i] == vFaceLast) ? ((int)vInFaces[i-1] + 1) : 0;
-
-            int vInFaceIndex = (int)(std::find(fVerts.begin() + vStart, fVerts.end(), vIndex) - fVerts.begin());
-            vInFaces[i] = (LocalIndex) vInFaceIndex;
-
-            vFaceLast = vFaces[i];
-        }
-    }
-
-    for (Index vIndex = 0; vIndex < vCount; ++vIndex) {
-        IndexArray      vEdges   = this->getVertexEdges(vIndex);
-        LocalIndexArray vInEdges = this->getVertexEdgeLocalIndices(vIndex);
-
-        for (int i = 0; i < vEdges.size(); ++i) {
-            IndexArray eVerts = this->getEdgeVertices(vEdges[i]);
-
-            //
-            //  For degenerate edges, the first occurrence of the edge (which
-            //  are presumed successive) will get local index 0, the second 1.
-            //
-            if (eVerts[0] != eVerts[1]) {
-                vInEdges[i] = (vIndex == eVerts[1]);
-            } else {
-                vInEdges[i] = (i && (vEdges[i] == vEdges[i-1]));
-            }
-        }
-        _maxValence = std::max(_maxValence, vEdges.size());
-    }
-
-    for (Index eIndex = 0; eIndex < eCount; ++eIndex) {
-        IndexArray      eFaces   = this->getEdgeFaces(eIndex);
-        LocalIndexArray eInFaces = this->getEdgeFaceLocalIndices(eIndex);
-
-        //
-        //  We keep track of the last face during the iteration to detect when two
-        //  (or more) successive faces are the same -- indicating a degenerate edge
-        //  or other non-manifold situation.  If so, we continue to search from the
-        //  point of the last face's local index:
-        //
-        Index eFaceLast = INDEX_INVALID;
-        for (int i = 0; i < eFaces.size(); ++i) {
-            IndexArray fEdges = this->getFaceEdges(eFaces[i]);
-
-            int eStart = (eFaces[i] == eFaceLast) ? ((int)eInFaces[i-1] + 1) : 0;
-
-            int eInFaceIndex = (int)(std::find(fEdges.begin() + eStart, fEdges.end(), eIndex) - fEdges.begin());
-            eInFaces[i] = (LocalIndex) eInFaceIndex;
-
-            eFaceLast = eFaces[i];
-        }
-    }
-}
-
-void
-Level::orientIncidentComponents() {
-
-    int vCount = getNumVertices();
-
-    for (Index vIndex = 0; vIndex < vCount; ++vIndex) {
-        Level::VTag & vTag = _vertTags[vIndex];
-        if (!vTag._nonManifold) {
-            if (!orderVertexFacesAndEdges(vIndex)) {
-                vTag._nonManifold = true;
-            }
-        }
-    }
-}
-
-namespace {
-    inline int
-    findInArray(ConstIndexArray array, Index value) {
-        return (int)(std::find(array.begin(), array.end(), value) - array.begin());
-    }
-}
-
-bool
-Level::orderVertexFacesAndEdges(Index vIndex, Index * vFacesOrdered, Index * vEdgesOrdered) const {
-
-    ConstIndexArray  vEdges = this->getVertexEdges(vIndex);
-    ConstIndexArray  vFaces = this->getVertexFaces(vIndex);
-
-    int fCount = vFaces.size();
-    int eCount = vEdges.size();
-
-    if ((fCount == 0) || (eCount < 2) || ((eCount - fCount) > 1)) return false;
-
-    //
-    //  Note we have already eliminated the possibility of incident degenerate edges
-    //  and other bad edges earlier -- marking its vertices non-manifold as a result
-    //  and explicitly avoiding this method:
-    //
-    Index fStart  = INDEX_INVALID;
-    Index eStart  = INDEX_INVALID;
-    int      fvStart = 0;
-
-    if (eCount == fCount) {
-        //  Interior case -- start with the first face
-
-        fStart  = vFaces[0];
-        fvStart = findInArray(this->getFaceVertices(fStart), vIndex);
-        eStart  = this->getFaceEdges(fStart)[fvStart];
-    } else {
-        //  Boundary case -- start with (identify) the leading of two boundary edges:
-
-        for (int i = 0; i < eCount; ++i) {
-            ConstIndexArray  eFaces = this->getEdgeFaces(vEdges[i]);
-            if (eFaces.size() == 1) {
-                eStart = vEdges[i];
-                fStart = eFaces[0];
-                fvStart = findInArray(this->getFaceVertices(fStart), vIndex);
-
-                //  Singular edge -- look for forward edge to this vertex:
-                if (eStart == (this->getFaceEdges(fStart)[fvStart])) {
-                    break;
-                }
-            }
-        }
-    }
-
-    //
-    //  We have identified a starting face, face-vert and leading edge from
-    //  which to walk counter clockwise to identify manifold neighbors.  If
-    //  this vertex is really locally manifold, we will end up back at the
-    //  starting edge or at the other singular edge of a boundary:
-    //
-    int eCountOrdered = 1;
-    int fCountOrdered = 1;
-
-    vFacesOrdered[0] = fStart;
-    vEdgesOrdered[0] = eStart;
-
-    Index eFirst = eStart;
-
-    while (eCountOrdered < eCount) {
-        //
-        //  Find the next edge, i.e. the one counter-clockwise to the last:
-        //
-        ConstIndexArray  fVerts = this->getFaceVertices(fStart);
-        ConstIndexArray  fEdges = this->getFaceEdges(fStart);
-
-        int      feStart = fvStart;
-        int      feNext  = feStart ? (feStart - 1) : (fVerts.size() - 1);
-        Index eNext   = fEdges[feNext];
-
-        //  Two non-manifold situations detected:
-        //      - two subsequent edges the same, i.e. a "repeated edge" in a face
-        //      - back at the start before all edges processed
-        if ((eNext == eStart) || (eNext == eFirst)) return false;
-
-        //
-        //  Add the next edge and if more faces to visit (not at the end of
-        //  a boundary) look to its opposite face:
-        //
-        vEdgesOrdered[eCountOrdered++] = eNext;
-
-        if (fCountOrdered < fCount) {
-            ConstIndexArray  eFaces = this->getEdgeFaces(eNext);
-
-            if (eFaces.size() == 0) return false;
-            if ((eFaces.size() == 1) && (eFaces[0] == fStart)) return false;
-
-            fStart  = eFaces[eFaces[0] == fStart];
-            fvStart = findInArray(this->getFaceEdges(fStart), eNext);
-
-            vFacesOrdered[fCountOrdered++] = fStart;
-        }
-        eStart = eNext;
-    }
-    assert(eCountOrdered == eCount);
-    assert(fCountOrdered == fCount);
-    return true;
-}
-
-bool
-Level::orderVertexFacesAndEdges(Index vIndex) {
-
-    IndexArray vFaces = this->getVertexFaces(vIndex);
-    IndexArray vEdges = this->getVertexEdges(vIndex);
-
-    internal::StackBuffer<Index,32> indexBuffer(vFaces.size() + vEdges.size());
-
-    Index * vFacesOrdered = indexBuffer;
-    Index * vEdgesOrdered = indexBuffer + vFaces.size();
-
-    if (orderVertexFacesAndEdges(vIndex, vFacesOrdered, vEdgesOrdered)) {
-        std::memcpy(&vFaces[0], vFacesOrdered, vFaces.size() * sizeof(Index));
-        std::memcpy(&vEdges[0], vEdgesOrdered, vEdges.size() * sizeof(Index));
-        return true;
-    }
-    return false;
-}
-
-//
-//  In development -- methods for accessing face-varying data channels...
-//
-int
-Level::createFVarChannel(int fvarValueCount, Sdc::Options const& fvarOptions) {
-
-    FVarLevel* fvarLevel = new FVarLevel(*this);
-
-    fvarLevel->setOptions(fvarOptions);
-    fvarLevel->resizeValues(fvarValueCount);
-    fvarLevel->resizeComponents();
-
-    _fvarChannels.push_back(fvarLevel);
-    return (int)_fvarChannels.size() - 1;
-}
-
-void
-Level::destroyFVarChannel(int channel) {
-
-    delete _fvarChannels[channel];
-    _fvarChannels.erase(_fvarChannels.begin() + channel);
-}
-
-int
-Level::getNumFVarValues(int channel) const {
-    return _fvarChannels[channel]->getNumValues();
-}
-
-Sdc::Options
-Level::getFVarOptions(int channel) const {
-    return _fvarChannels[channel]->getOptions();
-}
-
-ConstIndexArray
-Level::getFaceFVarValues(Index faceIndex, int channel) const {
-    return _fvarChannels[channel]->getFaceValues(faceIndex);
-}
-
-IndexArray
-Level::getFaceFVarValues(Index faceIndex, int channel) {
-    return _fvarChannels[channel]->getFaceValues(faceIndex);
-}
-
-void
-Level::completeFVarChannelTopology(int channel, int regBoundaryValence) {
-    return _fvarChannels[channel]->completeTopologyFromFaceValues(regBoundaryValence);
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/level.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/level.h
deleted file mode 100644
index 507edb844..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/level.h
+++ /dev/null
@@ -1,879 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_LEVEL_H
-#define OPENSUBDIV3_VTR_LEVEL_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-#include "../sdc/crease.h"
-#include "../sdc/options.h"
-#include "../vtr/types.h"
-
-#include <algorithm>
-#include <vector>
-#include <cassert>
-#include <cstring>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-class Refinement;
-class TriRefinement;
-class QuadRefinement;
-class FVarRefinement;
-class FVarLevel;
-
-//
-//  Level:
-//      A refinement level includes a vectorized representation of the topology
-//  for a particular subdivision level.  The topology is "complete" in that any
-//  level can be used as the base level of another subdivision hierarchy and can
-//  be considered a complete mesh independent of its ancestors.  It currently
-//  does contain a "depth" member -- as some inferences can then be made about
-//  the topology (i.e. all quads or all tris if not level 0).
-//
-//  This class is intended for private use within the library.  There are still
-//  opportunities to specialize levels -- e.g. those supporting N-sided faces vs
-//  those that are purely quads or tris -- so we prefer to insulate it from public
-//  access.
-//
-//  The representation of topology here is to store six topological relationships
-//  in tables of integers.  Each is stored in its own array(s) so the result is
-//  a SOA representation of the topology.  The six relations are:
-//
-//      - face-verts:  vertices incident/comprising a face
-//      - face-edges:  edges incident a face
-//      - edge-verts:  vertices incident/comprising an edge
-//      - edge-faces:  faces incident an edge
-//      - vert-faces:  faces incident a vertex
-//      - vert-edges:  edges incident a vertex
-//
-//  There is some redundancy here but the intent is not that this be a minimal
-//  representation, the intent is that it be amenable to refinement.  Classes in
-//  the Far layer essentially store 5 of these 6 in a permuted form -- we add
-//  the face-edges here to simplify refinement.
-//
-
-class Level {
-
-public:
-    //
-    //  Simple nested types to hold the tags for each component type -- some of
-    //  which are user-specified features (e.g. whether a face is a hole or not)
-    //  while others indicate the topological nature of the component, how it
-    //  is affected by creasing in its neighborhood, etc.
-    //
-    //  Most of these properties are passed down to child components during
-    //  refinement, but some -- notably the designation of a component as semi-
-    //  sharp -- require re-determination as sharpness values are reduced at each
-    //  level.
-    //
-    struct VTag {
-        VTag() { }
-
-        //  When cleared, the VTag ALMOST represents a smooth, regular, interior
-        //  vertex -- the Type enum requires a bit be explicitly set for Smooth,
-        //  so that must be done explicitly if desired on initialization.
-        void clear() { std::memset((void*) this, 0, sizeof(VTag)); }
-
-        typedef unsigned short VTagSize;
-
-        VTagSize _nonManifold     : 1;  // fixed
-        VTagSize _xordinary       : 1;  // fixed
-        VTagSize _boundary        : 1;  // fixed
-        VTagSize _corner          : 1;  // fixed
-        VTagSize _infSharp        : 1;  // fixed
-        VTagSize _semiSharp       : 1;  // variable
-        VTagSize _semiSharpEdges  : 1;  // variable
-        VTagSize _rule            : 4;  // variable when _semiSharp
-
-        //  These next to tags are complementary -- the "incomplete" tag is only
-        //  relevant for refined levels while the "incident an irregular face" tag
-        //  is only relevant for the base level.  They could be combined as both
-        //  indicate "no full regular ring" around a vertex
-        VTagSize _incomplete      : 1;  // variable only set in refined levels
-        VTagSize _incidIrregFace  : 1;  // variable only set in base level
-
-        //  Tags indicating incident infinitely-sharp (permanent) features
-        VTagSize _infSharpEdges   : 1;  // fixed
-        VTagSize _infSharpCrease  : 1;  // fixed
-        VTagSize _infIrregular    : 1;  // fixed
-
-        //  Alternate constructor and accessor for dealing with integer bits directly:
-        explicit VTag(VTagSize bits) {
-            std::memcpy(this, &bits, sizeof(bits));
-        }
-        VTagSize getBits() const {
-            VTagSize bits;
-            std::memcpy(&bits, this, sizeof(bits));
-            return bits;
-        }
-
-        static VTag BitwiseOr(VTag const vTags[], int size = 4);
-    };
-    struct ETag {
-        ETag() { }
-
-        //  When cleared, the ETag represents a smooth, manifold, interior edge
-        void clear() { std::memset((void*) this, 0, sizeof(ETag)); }
-
-        typedef unsigned char ETagSize;
-
-        ETagSize _nonManifold  : 1;  // fixed
-        ETagSize _boundary     : 1;  // fixed
-        ETagSize _infSharp     : 1;  // fixed
-        ETagSize _semiSharp    : 1;  // variable
-
-        //  Alternate constructor and accessor for dealing with integer bits directly:
-        explicit ETag(ETagSize bits) {
-            std::memcpy(this, &bits, sizeof(bits));
-        }
-        ETagSize getBits() const {
-            ETagSize bits;
-            std::memcpy(&bits, this, sizeof(bits));
-            return bits;
-        }
-
-        static ETag BitwiseOr(ETag const eTags[], int size = 4);
-    };
-    struct FTag {
-        FTag() { }
-
-        void clear() { std::memset((void*) this, 0, sizeof(FTag)); }
-
-        typedef unsigned char FTagSize;
-
-        FTagSize _hole  : 1;  // fixed
-
-        //  On deck -- coming soon...
-        //FTagSize _hasEdits : 1;  // variable
-    };
-
-    //  Additional simple struct to identify a "span" around a vertex, i.e. a
-    //  subset of the faces around a vertex delimited by some property (e.g. a
-    //  face-varying discontinuity, an inf-sharp edge, etc.)
-    //
-    //  The span requires an "origin" and a "size" to fully define its extent.
-    //  Use of the size is required over a leading/trailing pair as the valence
-    //  around a non-manifold vertex cannot be trivially determined from two
-    //  extremeties.  Similarly a start face is chosen over an edge as starting
-    //  with a manifold edge is ambiguous.  Additional tags also support
-    //  non-manifold cases, e.g. periodic spans at the apex of a double cone.
-    //
-    //  Currently setting the size to 0 or leaving the span "unassigned" is an
-    //  indication to use the full neighborhood rather than a subset -- prefer
-    //  use of the const method here to direct inspection of the member.
-    //
-    struct VSpan {
-        VSpan() { std::memset((void*) this, 0, sizeof(VSpan)); }
-
-        void clear()            { std::memset((void*) this, 0, sizeof(VSpan)); }
-        bool isAssigned() const { return _numFaces > 0; }
-
-        LocalIndex _numFaces;
-        LocalIndex _startFace;
-        LocalIndex _cornerInSpan;
-
-        unsigned short _periodic : 1;
-        unsigned short _sharp    : 1;
-    };
-
-public:
-    Level();
-    ~Level();
-
-    //  Simple accessors:
-    int getDepth() const { return _depth; }
-
-    int getNumVertices() const { return _vertCount; }
-    int getNumFaces() const    { return _faceCount; }
-    int getNumEdges() const    { return _edgeCount; }
-
-    //  More global sizes may prove useful...
-    int getNumFaceVerticesTotal() const { return (int) _faceVertIndices.size(); }
-    int getNumFaceEdgesTotal() const    { return (int) _faceEdgeIndices.size(); }
-    int getNumEdgeVerticesTotal() const { return (int) _edgeVertIndices.size(); }
-    int getNumEdgeFacesTotal() const    { return (int) _edgeFaceIndices.size(); }
-    int getNumVertexFacesTotal() const  { return (int) _vertFaceIndices.size(); }
-    int getNumVertexEdgesTotal() const  { return (int) _vertEdgeIndices.size(); }
-
-    int getMaxValence() const { return _maxValence; }
-    int getMaxEdgeFaces() const { return _maxEdgeFaces; }
-
-    //  Methods to access the relation tables/indices -- note that for some relations
-    //  (i.e. those where a component is "contained by" a neighbor, or more generally
-    //  when the neighbor is a simplex of higher dimension) we store an additional
-    //  "local index", e.g. for the case of vert-faces if one of the faces F[i] is
-    //  incident a vertex V, then L[i] is the "local index" in F[i] of vertex V.
-    //  Once have only quads (or tris), this local index need only occupy two bits
-    //  and could conceivably be packed into the same integer as the face index, but
-    //  for now, given the need to support faces of potentially high valence we'll
-    //  use an 8- or 16-bit integer.
-    //
-    //  Methods to access the six topological relations:
-    ConstIndexArray getFaceVertices(Index faceIndex) const;
-    ConstIndexArray getFaceEdges(Index faceIndex) const;
-    ConstIndexArray getEdgeVertices(Index edgeIndex) const;
-    ConstIndexArray getEdgeFaces(Index edgeIndex) const;
-    ConstIndexArray getVertexFaces(Index vertIndex) const;
-    ConstIndexArray getVertexEdges(Index vertIndex) const;
-
-    ConstLocalIndexArray getEdgeFaceLocalIndices(Index edgeIndex) const;
-    ConstLocalIndexArray getVertexFaceLocalIndices(Index vertIndex) const;
-    ConstLocalIndexArray getVertexEdgeLocalIndices(Index vertIndex) const;
-
-    //  Replace these with access to sharpness buffers/arrays rather than elements:
-    float getEdgeSharpness(Index edgeIndex) const;
-    float getVertexSharpness(Index vertIndex) const;
-    Sdc::Crease::Rule getVertexRule(Index vertIndex) const;
-
-    Index findEdge(Index v0Index, Index v1Index) const;
-
-    // Holes
-    void setFaceHole(Index faceIndex, bool b);
-    bool isFaceHole(Index faceIndex) const;
-
-    // Face-varying
-    Sdc::Options getFVarOptions(int channel) const; 
-    int getNumFVarChannels() const { return (int) _fvarChannels.size(); }
-    int getNumFVarValues(int channel) const;
-    ConstIndexArray getFaceFVarValues(Index faceIndex, int channel) const;
-
-    FVarLevel & getFVarLevel(int channel) { return *_fvarChannels[channel]; }
-    FVarLevel const & getFVarLevel(int channel) const { return *_fvarChannels[channel]; }
-
-    //  Manifold/non-manifold tags:
-    void setEdgeNonManifold(Index edgeIndex, bool b);
-    bool isEdgeNonManifold(Index edgeIndex) const;
-
-    void setVertexNonManifold(Index vertIndex, bool b);
-    bool isVertexNonManifold(Index vertIndex) const;
-
-    //  General access to all component tags:
-    VTag const & getVertexTag(Index vertIndex) const { return _vertTags[vertIndex]; }
-    ETag const & getEdgeTag(Index edgeIndex) const { return _edgeTags[edgeIndex]; }
-    FTag const & getFaceTag(Index faceIndex) const { return _faceTags[faceIndex]; }
-
-    VTag & getVertexTag(Index vertIndex) { return _vertTags[vertIndex]; }
-    ETag & getEdgeTag(Index edgeIndex) { return _edgeTags[edgeIndex]; }
-    FTag & getFaceTag(Index faceIndex) { return _faceTags[faceIndex]; }
-
-public:
-
-    //  Debugging aides:
-    enum TopologyError {
-        TOPOLOGY_MISSING_EDGE_FACES=0,
-        TOPOLOGY_MISSING_EDGE_VERTS,
-        TOPOLOGY_MISSING_FACE_EDGES,
-        TOPOLOGY_MISSING_FACE_VERTS,
-        TOPOLOGY_MISSING_VERT_FACES,
-        TOPOLOGY_MISSING_VERT_EDGES,
-
-        TOPOLOGY_FAILED_CORRELATION_EDGE_FACE,
-        TOPOLOGY_FAILED_CORRELATION_FACE_VERT,
-        TOPOLOGY_FAILED_CORRELATION_FACE_EDGE,
-
-        TOPOLOGY_FAILED_ORIENTATION_INCIDENT_EDGE,
-        TOPOLOGY_FAILED_ORIENTATION_INCIDENT_FACE,
-        TOPOLOGY_FAILED_ORIENTATION_INCIDENT_FACES_EDGES,
-
-        TOPOLOGY_DEGENERATE_EDGE,
-        TOPOLOGY_NON_MANIFOLD_EDGE,
-
-        TOPOLOGY_INVALID_CREASE_EDGE,
-        TOPOLOGY_INVALID_CREASE_VERT
-    };
-
-    static char const * getTopologyErrorString(TopologyError errCode);
-
-    typedef void (* ValidationCallback)(TopologyError errCode, char const * msg, void const * clientData);
-
-    bool validateTopology(ValidationCallback callback=0, void const * clientData=0) const;
-
-    void print(const Refinement* parentRefinement = 0) const;
-
-public:
-    //  High-level topology queries -- these may be moved elsewhere:
-
-    bool isSingleCreasePatch(Index face, float* sharpnessOut=NULL, int* rotationOut=NULL) const;
-
-    //
-    //  When inspecting topology, the component tags -- particularly VTag and ETag -- are most
-    //  often inspected in groups for the face to which they belong.  They are designed to be
-    //  bitwise OR'd (the result then referred to as a "composite" tag) to make quick decisions
-    //  about the face as a whole to avoid tedious topological inspection.
-    //
-    //  The same logic can be applied to topology in a FVar channel when tags specific to that
-    //  channel are used.  Note that the VTags apply to the FVar values assigned to the corners
-    //  of the face and not the vertex as a whole.  The "composite" face-varying VTag for a
-    //  vertex is the union of VTags of all distinct FVar values for that vertex.
-    //
-    bool doesVertexFVarTopologyMatch(Index vIndex, int fvarChannel) const;
-    bool doesFaceFVarTopologyMatch(  Index fIndex, int fvarChannel) const;
-    bool doesEdgeFVarTopologyMatch(  Index eIndex, int fvarChannel) const;
-
-    void getFaceVTags(Index fIndex, VTag vTags[], int fvarChannel = -1) const;
-    void getFaceETags(Index fIndex, ETag eTags[], int fvarChannel = -1) const;
-
-    VTag getFaceCompositeVTag(Index fIndex, int fvarChannel = -1) const;
-    VTag getFaceCompositeVTag(ConstIndexArray & fVerts) const;
-
-    VTag getVertexCompositeFVarVTag(Index vIndex, int fvarChannel) const;
-
-    //
-    //  When gathering "patch points" we may want the indices of the vertices or the corresponding
-    //  FVar values for a particular channel.  Both are represented and equally accessible within
-    //  the faces, so we allow all to be returned through these methods.  Setting the optional FVar
-    //  channel to -1 will retrieve indices of vertices instead of FVar values:
-    //
-    int gatherQuadLinearPatchPoints(Index fIndex, Index patchPoints[], int rotation = 0,
-                                                                       int fvarChannel = -1) const;
-
-    int gatherQuadRegularInteriorPatchPoints(Index fIndex, Index patchPoints[], int rotation = 0,
-                                                                                int fvarChannel = -1) const;
-    int gatherQuadRegularBoundaryPatchPoints(Index fIndex, Index patchPoints[], int boundaryEdgeInFace,
-                                                                                int fvarChannel = -1) const;
-    int gatherQuadRegularCornerPatchPoints(  Index fIndex, Index patchPoints[], int cornerVertInFace,
-                                                                                int fvarChannel = -1) const;
-
-    int gatherQuadRegularRingAroundVertex(Index vIndex, Index ringPoints[],
-                                          int fvarChannel = -1) const;
-    int gatherQuadRegularPartialRingAroundVertex(Index vIndex, VSpan const & span, Index ringPoints[],
-                                                 int fvarChannel = -1) const;
-
-    //  WIP -- for future use, need to extend for face-varying...
-    int gatherTriRegularInteriorPatchPoints(      Index fIndex, Index patchVerts[], int rotation = 0) const;
-    int gatherTriRegularBoundaryVertexPatchPoints(Index fIndex, Index patchVerts[], int boundaryVertInFace) const;
-    int gatherTriRegularBoundaryEdgePatchPoints(  Index fIndex, Index patchVerts[], int boundaryEdgeInFace) const;
-    int gatherTriRegularCornerVertexPatchPoints(  Index fIndex, Index patchVerts[], int cornerVertInFace) const;
-    int gatherTriRegularCornerEdgePatchPoints(    Index fIndex, Index patchVerts[], int cornerEdgeInFace) const;
-
-public:
-    //  Sizing methods used to construct a level to populate:
-    void resizeFaces(       int numFaces);
-    void resizeFaceVertices(int numFaceVertsTotal);
-    void resizeFaceEdges(   int numFaceEdgesTotal);
-
-    void resizeEdges(    int numEdges);
-    void resizeEdgeVertices();  // always 2*edgeCount
-    void resizeEdgeFaces(int numEdgeFacesTotal);
-
-    void resizeVertices(   int numVertices);
-    void resizeVertexFaces(int numVertexFacesTotal);
-    void resizeVertexEdges(int numVertexEdgesTotal);
-
-    void setMaxValence(int maxValence);
-
-    //  Modifiers to populate the relations for each component:
-    IndexArray getFaceVertices(Index faceIndex);
-    IndexArray getFaceEdges(Index faceIndex);
-    IndexArray getEdgeVertices(Index edgeIndex);
-    IndexArray getEdgeFaces(Index edgeIndex);
-    IndexArray getVertexFaces(Index vertIndex);
-    IndexArray getVertexEdges(Index vertIndex);
-
-    LocalIndexArray getEdgeFaceLocalIndices(Index edgeIndex);
-    LocalIndexArray getVertexFaceLocalIndices(Index vertIndex);
-    LocalIndexArray getVertexEdgeLocalIndices(Index vertIndex);
-
-    //  Replace these with access to sharpness buffers/arrays rather than elements:
-    float& getEdgeSharpness(Index edgeIndex);
-    float& getVertexSharpness(Index vertIndex);
-
-    //  Create, destroy and populate face-varying channels:
-    int  createFVarChannel(int fvarValueCount, Sdc::Options const& options);
-    void destroyFVarChannel(int channel);
-
-    IndexArray getFaceFVarValues(Index faceIndex, int channel);
-
-    void completeFVarChannelTopology(int channel, int regBoundaryValence);
-
-    //  Counts and offsets for all relation types:
-    //      - these may be unwarranted if we let Refinement access members directly...
-    int getNumFaceVertices(     Index faceIndex) const { return _faceVertCountsAndOffsets[2*faceIndex]; }
-    int getOffsetOfFaceVertices(Index faceIndex) const { return _faceVertCountsAndOffsets[2*faceIndex + 1]; }
-
-    int getNumFaceEdges(     Index faceIndex) const { return getNumFaceVertices(faceIndex); }
-    int getOffsetOfFaceEdges(Index faceIndex) const { return getOffsetOfFaceVertices(faceIndex); }
-
-    int getNumEdgeVertices(     Index )          const { return 2; }
-    int getOffsetOfEdgeVertices(Index edgeIndex) const { return 2 * edgeIndex; }
-
-    int getNumEdgeFaces(     Index edgeIndex) const { return _edgeFaceCountsAndOffsets[2*edgeIndex]; }
-    int getOffsetOfEdgeFaces(Index edgeIndex) const { return _edgeFaceCountsAndOffsets[2*edgeIndex + 1]; }
-
-    int getNumVertexFaces(     Index vertIndex) const { return _vertFaceCountsAndOffsets[2*vertIndex]; }
-    int getOffsetOfVertexFaces(Index vertIndex) const { return _vertFaceCountsAndOffsets[2*vertIndex + 1]; }
-
-    int getNumVertexEdges(     Index vertIndex) const { return _vertEdgeCountsAndOffsets[2*vertIndex]; }
-    int getOffsetOfVertexEdges(Index vertIndex) const { return _vertEdgeCountsAndOffsets[2*vertIndex + 1]; }
-
-    ConstIndexArray getFaceVertices() const;
-
-    //
-    //  Note that for some relations, the size of the relations for a child component
-    //  can vary radically from its parent due to the sparsity of the refinement.  So
-    //  in these cases a few additional utilities are provided to help define the set
-    //  of incident components.  Assuming adequate memory has been allocated, the
-    //  "resize" methods here initialize the set of incident components by setting
-    //  both the size and the appropriate offset, while "trim" is use to quickly lower
-    //  the size from an upper bound and nothing else.
-    //
-    void resizeFaceVertices(Index FaceIndex, int count);
-
-    void resizeEdgeFaces(Index edgeIndex, int count);
-    void trimEdgeFaces(  Index edgeIndex, int count);
-
-    void resizeVertexFaces(Index vertIndex, int count);
-    void trimVertexFaces(  Index vertIndex, int count);
-
-    void resizeVertexEdges(Index vertIndex, int count);
-    void trimVertexEdges(  Index vertIndex, int count);
-
-public:
-    //
-    //  Initial plans were to have a few specific classes properly construct the
-    //  topology from scratch, e.g. the Refinement class and a Factory class for
-    //  the base level, by populating all topological relations.  The need to have
-    //  a class construct full topology given only a simple face-vertex list, made
-    //  it necessary to write code to define and orient all relations -- and most
-    //  of that seemed best placed here.
-    //
-    bool completeTopologyFromFaceVertices();
-    Index findEdge(Index v0, Index v1, ConstIndexArray v0Edges) const;
-
-    //  Methods supporting the above:
-    void orientIncidentComponents();
-    bool orderVertexFacesAndEdges(Index vIndex, Index* vFaces, Index* vEdges) const;
-    bool orderVertexFacesAndEdges(Index vIndex);
-    void populateLocalIndices();
-
-    IndexArray shareFaceVertCountsAndOffsets() const;
-
-private:
-    //  Refinement classes (including all subclasses) build a Level:
-    friend class Refinement;
-    friend class TriRefinement;
-    friend class QuadRefinement;
-
-    //
-    //  A Level is independent of subdivision scheme or options.  While it may have been
-    //  affected by them in its construction, they are not associated with it -- a Level
-    //  is pure topology and any subdivision parameters are external.
-    //
-
-    //  Simple members for inventory, etc.
-    int _faceCount;
-    int _edgeCount;
-    int _vertCount;
-
-    //  The "depth" member is clearly useful in both the topological splitting and the
-    //  stencil queries, but arguably it ties the Level to a hierarchy which counters
-    //  the idea of it being independent.
-    int _depth;
-
-    //  Maxima to help clients manage sizing of data buffers.  Given "max valence",
-    //  the "max edge faces" is strictly redundant as it will always be less, but 
-    //  since it will typically be so much less (i.e. 2) it is kept for now.
-    int _maxEdgeFaces;
-    int _maxValence;
-
-    //
-    //  Topology vectors:
-    //      Note that of all of these, only data for the face-edge relation is not
-    //      stored in the osd::FarTables in any form.  The FarTable vectors combine
-    //      the edge-vert and edge-face relations.  The eventual goal is that this
-    //      data be part of the osd::Far classes and be a superset of the FarTable
-    //      vectors, i.e. no data duplication or conversion.  The fact that FarTable
-    //      already stores 5 of the 6 possible relations should make the topology
-    //      storage as a whole a non-issue.
-    //
-    //      The vert-face-child and vert-edge-child indices are also arguably not
-    //      a topology relation but more one for parent/child relations.  But it is
-    //      a topological relationship, and if named differently would not likely
-    //      raise this.  It has been named with "child" in the name as it does play
-    //      a more significant role during subdivision in mapping between parent
-    //      and child components, and so has been named to reflect that more clearly.
-    //
-
-    //  Per-face:
-    std::vector<Index> _faceVertCountsAndOffsets;  // 2 per face, redundant after level 0
-    std::vector<Index> _faceVertIndices;           // 3 or 4 per face, variable at level 0
-    std::vector<Index> _faceEdgeIndices;           // matches face-vert indices
-    std::vector<FTag>  _faceTags;                  // 1 per face:  includes "hole" tag
-
-    //  Per-edge:
-    std::vector<Index>      _edgeVertIndices;           // 2 per edge
-    std::vector<Index>      _edgeFaceCountsAndOffsets;  // 2 per edge
-    std::vector<Index>      _edgeFaceIndices;           // varies with faces per edge
-    std::vector<LocalIndex> _edgeFaceLocalIndices;      // varies with faces per edge
-
-    std::vector<float>      _edgeSharpness;             // 1 per edge
-    std::vector<ETag>       _edgeTags;                  // 1 per edge:  manifold, boundary, etc.
-
-    //  Per-vertex:
-    std::vector<Index>      _vertFaceCountsAndOffsets;  // 2 per vertex
-    std::vector<Index>      _vertFaceIndices;           // varies with valence
-    std::vector<LocalIndex> _vertFaceLocalIndices;      // varies with valence, 8-bit for now
-
-    std::vector<Index>      _vertEdgeCountsAndOffsets;  // 2 per vertex
-    std::vector<Index>      _vertEdgeIndices;           // varies with valence
-    std::vector<LocalIndex> _vertEdgeLocalIndices;      // varies with valence, 8-bit for now
-
-    std::vector<float>      _vertSharpness;             // 1 per vertex
-    std::vector<VTag>       _vertTags;                  // 1 per vertex:  manifold, Sdc::Rule, etc.
-
-    //  Face-varying channels:
-    std::vector<FVarLevel*> _fvarChannels;
-};
-
-//
-//  Access/modify the vertices incident a given face:
-//
-inline ConstIndexArray
-Level::getFaceVertices(Index faceIndex) const {
-    return ConstIndexArray(&_faceVertIndices[_faceVertCountsAndOffsets[faceIndex*2+1]],
-                          _faceVertCountsAndOffsets[faceIndex*2]);
-}
-inline IndexArray
-Level::getFaceVertices(Index faceIndex) {
-    return IndexArray(&_faceVertIndices[_faceVertCountsAndOffsets[faceIndex*2+1]],
-                          _faceVertCountsAndOffsets[faceIndex*2]);
-}
-
-inline void
-Level::resizeFaceVertices(Index faceIndex, int count) {
-
-    int* countOffsetPair = &_faceVertCountsAndOffsets[faceIndex*2];
-
-    countOffsetPair[0] = count;
-    countOffsetPair[1] = (faceIndex == 0) ? 0 : (countOffsetPair[-2] + countOffsetPair[-1]);
-
-    _maxValence = std::max(_maxValence, count);
-}
-
-inline ConstIndexArray
-Level::getFaceVertices() const {
-    return ConstIndexArray(&_faceVertIndices[0], (int)_faceVertIndices.size());
-}
-
-//
-//  Access/modify the edges incident a given face:
-//
-inline ConstIndexArray
-Level::getFaceEdges(Index faceIndex) const {
-    return ConstIndexArray(&_faceEdgeIndices[_faceVertCountsAndOffsets[faceIndex*2+1]],
-                          _faceVertCountsAndOffsets[faceIndex*2]);
-}
-inline IndexArray
-Level::getFaceEdges(Index faceIndex) {
-    return IndexArray(&_faceEdgeIndices[_faceVertCountsAndOffsets[faceIndex*2+1]],
-                          _faceVertCountsAndOffsets[faceIndex*2]);
-}
-
-//
-//  Access/modify the faces incident a given vertex:
-//
-inline ConstIndexArray
-Level::getVertexFaces(Index vertIndex) const {
-    return ConstIndexArray( (&_vertFaceIndices[0]) + _vertFaceCountsAndOffsets[vertIndex*2+1],
-                          _vertFaceCountsAndOffsets[vertIndex*2]);
-}
-inline IndexArray
-Level::getVertexFaces(Index vertIndex) {
-    return IndexArray( (&_vertFaceIndices[0]) + _vertFaceCountsAndOffsets[vertIndex*2+1],
-                          _vertFaceCountsAndOffsets[vertIndex*2]);
-}
-
-inline ConstLocalIndexArray
-Level::getVertexFaceLocalIndices(Index vertIndex) const {
-    return ConstLocalIndexArray( (&_vertFaceLocalIndices[0]) + _vertFaceCountsAndOffsets[vertIndex*2+1],
-                               _vertFaceCountsAndOffsets[vertIndex*2]);
-}
-inline LocalIndexArray
-Level::getVertexFaceLocalIndices(Index vertIndex) {
-    return LocalIndexArray( (&_vertFaceLocalIndices[0]) + _vertFaceCountsAndOffsets[vertIndex*2+1],
-                               _vertFaceCountsAndOffsets[vertIndex*2]);
-}
-
-inline void
-Level::resizeVertexFaces(Index vertIndex, int count) {
-    int* countOffsetPair = &_vertFaceCountsAndOffsets[vertIndex*2];
-
-    countOffsetPair[0] = count;
-    countOffsetPair[1] = (vertIndex == 0) ? 0 : (countOffsetPair[-2] + countOffsetPair[-1]);
-}
-inline void
-Level::trimVertexFaces(Index vertIndex, int count) {
-    _vertFaceCountsAndOffsets[vertIndex*2] = count;
-}
-
-//
-//  Access/modify the edges incident a given vertex:
-//
-inline ConstIndexArray
-Level::getVertexEdges(Index vertIndex) const {
-    return ConstIndexArray( (&_vertEdgeIndices[0]) +_vertEdgeCountsAndOffsets[vertIndex*2+1],
-                          _vertEdgeCountsAndOffsets[vertIndex*2]);
-}
-inline IndexArray
-Level::getVertexEdges(Index vertIndex) {
-    return IndexArray( (&_vertEdgeIndices[0]) +_vertEdgeCountsAndOffsets[vertIndex*2+1],
-                          _vertEdgeCountsAndOffsets[vertIndex*2]);
-}
-
-inline ConstLocalIndexArray
-Level::getVertexEdgeLocalIndices(Index vertIndex) const {
-    return ConstLocalIndexArray( (&_vertEdgeLocalIndices[0]) + _vertEdgeCountsAndOffsets[vertIndex*2+1],
-                               _vertEdgeCountsAndOffsets[vertIndex*2]);
-}
-inline LocalIndexArray
-Level::getVertexEdgeLocalIndices(Index vertIndex) {
-    return LocalIndexArray( (&_vertEdgeLocalIndices[0]) + _vertEdgeCountsAndOffsets[vertIndex*2+1],
-                               _vertEdgeCountsAndOffsets[vertIndex*2]);
-}
-
-inline void
-Level::resizeVertexEdges(Index vertIndex, int count) {
-    int* countOffsetPair = &_vertEdgeCountsAndOffsets[vertIndex*2];
-
-    countOffsetPair[0] = count;
-    countOffsetPair[1] = (vertIndex == 0) ? 0 : (countOffsetPair[-2] + countOffsetPair[-1]);
-
-    _maxValence = std::max(_maxValence, count);
-}
-inline void
-Level::trimVertexEdges(Index vertIndex, int count) {
-    _vertEdgeCountsAndOffsets[vertIndex*2] = count;
-}
-
-inline void
-Level::setMaxValence(int valence) {
-    _maxValence = valence;
-}
-
-//
-//  Access/modify the vertices incident a given edge:
-//
-inline ConstIndexArray
-Level::getEdgeVertices(Index edgeIndex) const {
-    return ConstIndexArray(&_edgeVertIndices[edgeIndex*2], 2);
-}
-inline IndexArray
-Level::getEdgeVertices(Index edgeIndex) {
-    return IndexArray(&_edgeVertIndices[edgeIndex*2], 2);
-}
-
-//
-//  Access/modify the faces incident a given edge:
-//
-inline ConstIndexArray
-Level::getEdgeFaces(Index edgeIndex) const {
-    return ConstIndexArray(&_edgeFaceIndices[0] + 
-                           _edgeFaceCountsAndOffsets[edgeIndex*2+1],
-                           _edgeFaceCountsAndOffsets[edgeIndex*2]);
-}
-inline IndexArray
-Level::getEdgeFaces(Index edgeIndex) {
-    return IndexArray(&_edgeFaceIndices[0] +
-                      _edgeFaceCountsAndOffsets[edgeIndex*2+1],
-                      _edgeFaceCountsAndOffsets[edgeIndex*2]);
-}
-
-inline ConstLocalIndexArray
-Level::getEdgeFaceLocalIndices(Index edgeIndex) const {
-    return ConstLocalIndexArray(&_edgeFaceLocalIndices[0] +
-                                _edgeFaceCountsAndOffsets[edgeIndex*2+1],
-                                _edgeFaceCountsAndOffsets[edgeIndex*2]);
-}
-inline LocalIndexArray
-Level::getEdgeFaceLocalIndices(Index edgeIndex) {
-    return LocalIndexArray(&_edgeFaceLocalIndices[0] +
-                           _edgeFaceCountsAndOffsets[edgeIndex*2+1],
-                           _edgeFaceCountsAndOffsets[edgeIndex*2]);
-}
-
-inline void
-Level::resizeEdgeFaces(Index edgeIndex, int count) {
-    int* countOffsetPair = &_edgeFaceCountsAndOffsets[edgeIndex*2];
-
-    countOffsetPair[0] = count;
-    countOffsetPair[1] = (edgeIndex == 0) ? 0 : (countOffsetPair[-2] + countOffsetPair[-1]);
-
-    _maxEdgeFaces = std::max(_maxEdgeFaces, count);
-}
-inline void
-Level::trimEdgeFaces(Index edgeIndex, int count) {
-    _edgeFaceCountsAndOffsets[edgeIndex*2] = count;
-}
-
-//
-//  Access/modify sharpness values:
-//
-inline float
-Level::getEdgeSharpness(Index edgeIndex) const {
-    return _edgeSharpness[edgeIndex];
-}
-inline float&
-Level::getEdgeSharpness(Index edgeIndex) {
-    return _edgeSharpness[edgeIndex];
-}
-
-inline float
-Level::getVertexSharpness(Index vertIndex) const {
-    return _vertSharpness[vertIndex];
-}
-inline float&
-Level::getVertexSharpness(Index vertIndex) {
-    return _vertSharpness[vertIndex];
-}
-
-inline Sdc::Crease::Rule
-Level::getVertexRule(Index vertIndex) const {
-    return (Sdc::Crease::Rule) _vertTags[vertIndex]._rule;
-}
-
-//
-//  Access/modify hole tag:
-//
-inline void
-Level::setFaceHole(Index faceIndex, bool b) {
-    _faceTags[faceIndex]._hole = b;
-}
-inline bool
-Level::isFaceHole(Index faceIndex) const {
-    return _faceTags[faceIndex]._hole;
-}
-
-//
-//  Access/modify non-manifold tags:
-//
-inline void
-Level::setEdgeNonManifold(Index edgeIndex, bool b) {
-    _edgeTags[edgeIndex]._nonManifold = b;
-}
-inline bool
-Level::isEdgeNonManifold(Index edgeIndex) const {
-    return _edgeTags[edgeIndex]._nonManifold;
-}
-
-inline void
-Level::setVertexNonManifold(Index vertIndex, bool b) {
-    _vertTags[vertIndex]._nonManifold = b;
-}
-inline bool
-Level::isVertexNonManifold(Index vertIndex) const {
-    return _vertTags[vertIndex]._nonManifold;
-}
-
-//
-//  Sizing methods to allocate space:
-//
-inline void
-Level::resizeFaces(int faceCount) {
-    _faceCount = faceCount;
-    _faceVertCountsAndOffsets.resize(2 * faceCount);
-
-    _faceTags.resize(faceCount);
-    std::memset((void*) &_faceTags[0], 0, _faceCount * sizeof(FTag));
-}
-inline void
-Level::resizeFaceVertices(int totalFaceVertCount) {
-    _faceVertIndices.resize(totalFaceVertCount);
-}
-inline void
-Level::resizeFaceEdges(int totalFaceEdgeCount) {
-    _faceEdgeIndices.resize(totalFaceEdgeCount);
-}
-
-inline void
-Level::resizeEdges(int edgeCount) {
-
-    _edgeCount = edgeCount;
-    _edgeFaceCountsAndOffsets.resize(2 * edgeCount);
-
-    _edgeSharpness.resize(edgeCount);
-    _edgeTags.resize(edgeCount);
-
-    if (edgeCount>0) {
-        std::memset((void*) &_edgeTags[0], 0, _edgeCount * sizeof(ETag));
-    }
-}
-inline void
-Level::resizeEdgeVertices() {
-
-    _edgeVertIndices.resize(2 * _edgeCount);
-}
-inline void
-Level::resizeEdgeFaces(int totalEdgeFaceCount) {
-
-    _edgeFaceIndices.resize(totalEdgeFaceCount);
-    _edgeFaceLocalIndices.resize(totalEdgeFaceCount);
-}
-
-inline void
-Level::resizeVertices(int vertCount) {
-
-    _vertCount = vertCount;
-    _vertFaceCountsAndOffsets.resize(2 * vertCount);
-    _vertEdgeCountsAndOffsets.resize(2 * vertCount);
-
-    _vertSharpness.resize(vertCount);
-    _vertTags.resize(vertCount);
-    std::memset((void*) &_vertTags[0], 0, _vertCount * sizeof(VTag));
-}
-inline void
-Level::resizeVertexFaces(int totalVertFaceCount) {
-
-    _vertFaceIndices.resize(totalVertFaceCount);
-    _vertFaceLocalIndices.resize(totalVertFaceCount);
-}
-inline void
-Level::resizeVertexEdges(int totalVertEdgeCount) {
-
-    _vertEdgeIndices.resize(totalVertEdgeCount);
-    _vertEdgeLocalIndices.resize(totalVertEdgeCount);
-}
-
-inline IndexArray
-Level::shareFaceVertCountsAndOffsets() const {
-    // XXXX manuelk we have to force const casting here (classes don't 'share'
-    // members usually...)
-    return IndexArray(const_cast<Index *>(&_faceVertCountsAndOffsets[0]),
-        (int)_faceVertCountsAndOffsets.size());
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_LEVEL_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/quadRefinement.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/quadRefinement.cpp
deleted file mode 100644
index 09cfaa516..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/quadRefinement.cpp
+++ /dev/null
@@ -1,1010 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../sdc/crease.h"
-#include "../vtr/types.h"
-#include "../vtr/level.h"
-#include "../vtr/quadRefinement.h"
-
-#include <cassert>
-#include <cstdio>
-#include <utility>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  Simple constructor, destructor and basic initializers:
-//
-QuadRefinement::QuadRefinement(Level const & parentArg, Level & childArg, Sdc::Options const & optionsArg) :
-    Refinement(parentArg, childArg, optionsArg) {
-
-    _splitType   = Sdc::SPLIT_TO_QUADS;
-    _regFaceSize = 4;
-}
-
-QuadRefinement::~QuadRefinement() {
-}
-
-
-//
-//  Methods to construct the parent-to-child mapping
-//
-void
-QuadRefinement::allocateParentChildIndices() {
-
-    //
-    //  Initialize the vectors of indices mapping parent components to those child components
-    //  that will originate from each.
-    //
-    int faceChildFaceCount = (int) _parent->_faceVertIndices.size();
-    int faceChildEdgeCount = (int) _parent->_faceEdgeIndices.size();
-    int edgeChildEdgeCount = (int) _parent->_edgeVertIndices.size();
-
-    int faceChildVertCount = _parent->getNumFaces();
-    int edgeChildVertCount = _parent->getNumEdges();
-    int vertChildVertCount = _parent->getNumVertices();
-
-    //
-    //  First reference the parent Level's face-vertex counts/offsets -- they can be used
-    //  here for both the face-child-faces and face-child-edges as they both have one per
-    //  face-vertex.
-    //
-    //  Given we will be ignoring initial values with uniform refinement and assigning all
-    //  directly, initializing here is a waste...
-    //
-    Index initValue = 0;
-
-    _faceChildFaceCountsAndOffsets = _parent->shareFaceVertCountsAndOffsets();
-    _faceChildEdgeCountsAndOffsets = _parent->shareFaceVertCountsAndOffsets();
-
-    _faceChildFaceIndices.resize(faceChildFaceCount, initValue);
-    _faceChildEdgeIndices.resize(faceChildEdgeCount, initValue);
-    _edgeChildEdgeIndices.resize(edgeChildEdgeCount, initValue);
-
-    _faceChildVertIndex.resize(faceChildVertCount, initValue);
-    _edgeChildVertIndex.resize(edgeChildVertCount, initValue);
-    _vertChildVertIndex.resize(vertChildVertCount, initValue);
-}
-
-
-//
-//  Methods to populate the face-vertex relation of the child Level:
-//      - child faces only originate from parent faces
-//
-void
-QuadRefinement::populateFaceVertexRelation() {
-
-    //  Both face-vertex and face-edge share the face-vertex counts/offsets within a
-    //  Level, so be sure not to re-initialize it if already done:
-    //
-    if (_child->_faceVertCountsAndOffsets.size() == 0) {
-        populateFaceVertexCountsAndOffsets();
-    }
-    _child->_faceVertIndices.resize(_child->getNumFaces() * 4);
-
-    populateFaceVerticesFromParentFaces();
-}
-
-void
-QuadRefinement::populateFaceVertexCountsAndOffsets() {
-
-    _child->_faceVertCountsAndOffsets.resize(_child->getNumFaces() * 2);
-
-    for (int i = 0; i < _child->getNumFaces(); ++i) {
-        _child->_faceVertCountsAndOffsets[i*2 + 0] = 4;
-        _child->_faceVertCountsAndOffsets[i*2 + 1] = i << 2;
-    }
-}
-
-void
-QuadRefinement::populateFaceVerticesFromParentFaces() {
-
-    //
-    //  This is pretty straightforward, but is a good example for the case of
-    //  iterating through the parent faces rather than the child faces, as the
-    //  same topology information for the parent faces is required for each of
-    //  the child faces.
-    //
-    //  For each of the child faces of a parent face, identify the child vertices
-    //  for its face-verts from the child vertices of the parent face, its edges
-    //  and its vertices.
-    //
-    for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        ConstIndexArray pFaceVerts = _parent->getFaceVertices(pFace),
-                        pFaceEdges = _parent->getFaceEdges(pFace),
-                        pFaceChildren = getFaceChildFaces(pFace);
-
-        int pFaceSize = pFaceVerts.size();
-        for (int j = 0; j < pFaceSize; ++j) {
-            Index cFace = pFaceChildren[j];
-            if (IndexIsValid(cFace)) {
-                int jPrev = j ? (j - 1) : (pFaceSize - 1);
-
-                Index cVertOfFace  = _faceChildVertIndex[pFace];
-                Index cVertOfEPrev = _edgeChildVertIndex[pFaceEdges[jPrev]];
-                Index cVertOfVert  = _vertChildVertIndex[pFaceVerts[j]];
-                Index cVertOfENext = _edgeChildVertIndex[pFaceEdges[j]];
-
-                IndexArray cFaceVerts = _child->getFaceVertices(cFace);
-
-                //  Note orientation wrt parent face -- quad vs non-quad...
-                if (pFaceSize == 4) {
-                    int jOpp  = jPrev ? (jPrev - 1) : 3;
-                    int jNext = jOpp  ? (jOpp  - 1) : 3;
-
-                    cFaceVerts[j]     = cVertOfVert;
-                    cFaceVerts[jNext] = cVertOfENext;
-                    cFaceVerts[jOpp]  = cVertOfFace;
-                    cFaceVerts[jPrev] = cVertOfEPrev;
-                } else {
-                    cFaceVerts[0] = cVertOfVert;
-                    cFaceVerts[1] = cVertOfENext;
-                    cFaceVerts[2] = cVertOfFace;
-                    cFaceVerts[3] = cVertOfEPrev;
-                }
-            }
-        }
-    }
-}
-
-
-//
-//  Methods to populate the face-vertex relation of the child Level:
-//      - child faces only originate from parent faces
-//
-void
-QuadRefinement::populateFaceEdgeRelation() {
-
-    //  Both face-vertex and face-edge share the face-vertex counts/offsets, so be sure
-    //  not to re-initialize it if already done:
-    //
-    if (_child->_faceVertCountsAndOffsets.size() == 0) {
-        populateFaceVertexCountsAndOffsets();
-    }
-    _child->_faceEdgeIndices.resize(_child->getNumFaces() * 4);
-
-    populateFaceEdgesFromParentFaces();
-}
-
-void
-QuadRefinement::populateFaceEdgesFromParentFaces() {
-
-    //
-    //  This is fairly straightforward, but since we are dealing with edges here, we
-    //  occasionally have to deal with the limitation of them being undirected.  Since
-    //  child faces from the same parent face share much in common, we iterate through
-    //  the parent faces.
-    //
-    //  Each child face of the parent is based on a corner vertex from which we denote
-    //  a "previous" and "next" edge, which are child edges of the parent face's edges.
-    //  The two remaining edges per child faces are perpendicular to these prev/next
-    //  edges and share the child vertex of the parent face.
-    //
-    for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        ConstIndexArray pFaceVerts = _parent->getFaceVertices(pFace),
-                        pFaceEdges = _parent->getFaceEdges(pFace),
-                        pFaceChildFaces = getFaceChildFaces(pFace),
-                        pFaceChildEdges = getFaceChildEdges(pFace);
-
-        int pFaceSize = pFaceVerts.size();
-
-        for (int j = 0; j < pFaceSize; ++j) {
-            Index cFace = pFaceChildFaces[j];
-            if (IndexIsValid(cFace)) {
-                //
-                //  Identify the vertex pairs for the prev/next parent edges -- from
-                //  which we will determine the prev/next child edges:
-                //
-                int jPrev = j ? (j - 1) : (pFaceSize - 1);
-
-                Index           pPrevEdge      = pFaceEdges[jPrev];
-                ConstIndexArray pPrevEdgeVerts = _parent->getEdgeVertices(pPrevEdge);
-
-                Index           pNextEdge      = pFaceEdges[j];
-                ConstIndexArray pNextEdgeVerts = _parent->getEdgeVertices(pNextEdge);
-
-                //
-                //  Now identify the two prev/next child edges (beware of degenerate
-                //  edges here) and the two remaining perpendicular child edges:
-                //
-                Index pCornerVert = pFaceVerts[j];
-
-                int cornerInPrevEdge = (pPrevEdgeVerts[0] != pPrevEdgeVerts[1])
-                                     ? (pPrevEdgeVerts[0] != pCornerVert) : 1;
-
-                int cornerInNextEdge = (pNextEdgeVerts[0] != pNextEdgeVerts[1])
-                                     ? (pNextEdgeVerts[0] != pCornerVert) : 0;
-
-                Index cEdgeOfEdgePrev = getEdgeChildEdges(pPrevEdge)[cornerInPrevEdge];
-                Index cEdgeOfEdgeNext = getEdgeChildEdges(pNextEdge)[cornerInNextEdge];
-
-                Index cEdgePerpEdgePrev = pFaceChildEdges[jPrev];
-                Index cEdgePerpEdgeNext = pFaceChildEdges[j];
-
-                //
-                //  Assign the identified child edges to the child face's face-edges:
-                //
-                IndexArray cFaceEdges = _child->getFaceEdges(cFace);
-
-                //  Note orientation wrt parent face -- quad vs non-quad...
-                if (pFaceSize == 4) {
-                    int jOpp  = jPrev ? (jPrev - 1) : 3;
-                    int jNext = jOpp  ? (jOpp  - 1) : 3;
-
-                    cFaceEdges[j]     = cEdgeOfEdgeNext;
-                    cFaceEdges[jNext] = cEdgePerpEdgeNext;
-                    cFaceEdges[jOpp]  = cEdgePerpEdgePrev;
-                    cFaceEdges[jPrev] = cEdgeOfEdgePrev;
-                } else {
-                    cFaceEdges[0] = cEdgeOfEdgeNext;
-                    cFaceEdges[1] = cEdgePerpEdgeNext;
-                    cFaceEdges[2] = cEdgePerpEdgePrev;
-                    cFaceEdges[3] = cEdgeOfEdgePrev;
-                }
-            }
-        }
-    }
-}
-
-//
-//  Methods to populate the edge-vertex relation of the child Level:
-//      - child edges originate from parent faces and edges
-//
-void
-QuadRefinement::populateEdgeVertexRelation() {
-
-    _child->_edgeVertIndices.resize(_child->getNumEdges() * 2);
-
-    populateEdgeVerticesFromParentFaces();
-    populateEdgeVerticesFromParentEdges();
-}
-
-void
-QuadRefinement::populateEdgeVerticesFromParentFaces() {
-
-    //
-    //  This is straightforward.  All child edges of parent faces are assigned
-    //  their first vertex from the child vertex of the face -- so it is common
-    //  to all.  The second vertex is the child vertex of the parent edge to
-    //  which the new child edge is perpendicular.
-    //
-    for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        ConstIndexArray pFaceEdges      = _parent->getFaceEdges(pFace),
-                        pFaceChildEdges = getFaceChildEdges(pFace);
-
-        for (int j = 0; j < pFaceEdges.size(); ++j) {
-            Index cEdge = pFaceChildEdges[j];
-            if (IndexIsValid(cEdge)) {
-                IndexArray cEdgeVerts = _child->getEdgeVertices(cEdge);
-
-                cEdgeVerts[0] = _faceChildVertIndex[pFace];
-                cEdgeVerts[1] = _edgeChildVertIndex[pFaceEdges[j]];
-            }
-        }
-    }
-}
-
-void
-QuadRefinement::populateEdgeVerticesFromParentEdges() {
-
-    //
-    //  This is straightforward.  All child edges of parent edges are assigned
-    //  their first vertex from the child vertex of the edge -- so it is common
-    //  to both.  The second vertex is the child vertex of the vertex at the
-    //  end of the parent edge.
-    //
-    for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        ConstIndexArray pEdgeVerts = _parent->getEdgeVertices(pEdge),
-                        pEdgeChildren = getEdgeChildEdges(pEdge);
-
-        //  May want to unroll this trivial loop of 2...
-        for (int j = 0; j < 2; ++j) {
-            Index cEdge = pEdgeChildren[j];
-            if (IndexIsValid(cEdge)) {
-                IndexArray cEdgeVerts = _child->getEdgeVertices(cEdge);
-
-                cEdgeVerts[0] = _edgeChildVertIndex[pEdge];
-                cEdgeVerts[1] = _vertChildVertIndex[pEdgeVerts[j]];
-            }
-        }
-    }
-}
-
-//
-//  Methods to populate the edge-face relation of the child Level:
-//      - child edges originate from parent faces and edges
-//      - sparse refinement poses challenges with allocation here
-//          - we need to update the counts/offsets as we populate
-//
-void
-QuadRefinement::populateEdgeFaceRelation() {
-
-    //
-    //  Notes on allocating/initializing the edge-face counts/offsets vector:
-    //
-    //  Be aware of scheme-specific decisions here, e.g.:
-    //      - inspection of sparse child faces for edges from faces
-    //      - no guaranteed "neighborhood" around Bilinear verts from verts
-    //
-    //  If uniform subdivision, face count of a child edge will be:
-    //      - 2 for new interior edges from parent faces
-    //          == 2 * number of parent face verts for both quad- and tri-split
-    //      - same as parent edge for edges from parent edges
-    //  If sparse subdivision, face count of a child edge will be:
-    //      - 1 or 2 for new interior edge depending on child faces in parent face
-    //          - requires inspection if not all child faces present
-    //      ? same as parent edge for edges from parent edges
-    //          - given end vertex must have its full set of child faces
-    //          - not for Bilinear -- only if neighborhood is non-zero
-    //      - could at least make a quick traversal of components and use the above
-    //        two points to get much closer estimate than what is used for uniform
-    //
-    int childEdgeFaceIndexSizeEstimate = (int)_parent->_faceVertIndices.size() * 2 +
-                                         (int)_parent->_edgeFaceIndices.size() * 2;
-
-    _child->_edgeFaceCountsAndOffsets.resize(_child->getNumEdges() * 2);
-    _child->_edgeFaceIndices.resize(     childEdgeFaceIndexSizeEstimate);
-    _child->_edgeFaceLocalIndices.resize(childEdgeFaceIndexSizeEstimate);
-
-    // Update _maxEdgeFaces from the parent level before calling the 
-    // populateEdgeFacesFromParent methods below, as these may further
-    // update _maxEdgeFaces.
-    _child->_maxEdgeFaces = _parent->_maxEdgeFaces;
-
-    populateEdgeFacesFromParentFaces();
-    populateEdgeFacesFromParentEdges();
-
-    //  Revise the over-allocated estimate based on what is used (as indicated in the
-    //  count/offset for the last vertex) and trim the index vector accordingly:
-    childEdgeFaceIndexSizeEstimate = _child->getNumEdgeFaces(_child->getNumEdges()-1) +
-                                     _child->getOffsetOfEdgeFaces(_child->getNumEdges()-1);
-    _child->_edgeFaceIndices.resize(     childEdgeFaceIndexSizeEstimate);
-    _child->_edgeFaceLocalIndices.resize(childEdgeFaceIndexSizeEstimate);
-}
-
-void
-QuadRefinement::populateEdgeFacesFromParentFaces() {
-
-    //
-    //  This is straightforward topologically, but when refinement is sparse the
-    //  contents of the counts/offsets vector is not certain and is populated
-    //  incrementally.  So there will be some resizing/trimming here.
-    //
-    //  Topologically, the child edges from within a parent face will typically
-    //  have two incident child faces (only one or none if sparse).  These child
-    //  edges and faces are interleaved within the parent and easily identified.
-    //  Note that the edge-face "local indices" are also needed here and that
-    //  orientation of child faces within their parent depends on it being a quad
-    //  or not.
-    //
-    for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        ConstIndexArray pFaceChildFaces = getFaceChildFaces(pFace),
-                        pFaceChildEdges = getFaceChildEdges(pFace);
-
-        int pFaceSize = pFaceChildFaces.size();
-
-        for (int j = 0; j < pFaceSize; ++j) {
-            Index cEdge = pFaceChildEdges[j];
-            if (IndexIsValid(cEdge)) {
-                //
-                //  Reserve enough edge-faces, populate and trim as needed:
-                //
-                _child->resizeEdgeFaces(cEdge, 2);
-
-                IndexArray      cEdgeFaces  = _child->getEdgeFaces(cEdge);
-                LocalIndexArray cEdgeInFace = _child->getEdgeFaceLocalIndices(cEdge);
-
-                //  One or two child faces may be assigned:
-                int jNext = ((j + 1) < pFaceSize) ? (j + 1) : 0;
-
-                int cEdgeFaceCount = 0;
-                if (IndexIsValid(pFaceChildFaces[j])) {
-                    //  Note orientation wrt incident parent faces -- quad vs non-quad...
-                    cEdgeFaces[cEdgeFaceCount]  = pFaceChildFaces[j];
-                    cEdgeInFace[cEdgeFaceCount] = (LocalIndex)((pFaceSize == 4) ? jNext : 1);
-                    cEdgeFaceCount++;
-                }
-                if (IndexIsValid(pFaceChildFaces[jNext])) {
-                    //  Note orientation wrt incident parent faces -- quad vs non-quad...
-                    cEdgeFaces[cEdgeFaceCount]  = pFaceChildFaces[jNext];
-                    cEdgeInFace[cEdgeFaceCount] = (LocalIndex)((pFaceSize == 4) ? ((jNext + 2) & 3) : 2);
-                    cEdgeFaceCount++;
-                }
-                _child->trimEdgeFaces(cEdge, cEdgeFaceCount);
-            }
-        }
-    }
-}
-
-void
-QuadRefinement::populateEdgeFacesFromParentEdges() {
-
-    //
-    //  Note -- the edge-face counts/offsets vector is not known
-    //  ahead of time and is populated incrementally, so we cannot
-    //  thread this yet...
-    //
-    for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        ConstIndexArray pEdgeChildEdges = getEdgeChildEdges(pEdge);
-        if (!IndexIsValid(pEdgeChildEdges[0]) && !IndexIsValid(pEdgeChildEdges[1])) continue;
-
-        ConstIndexArray      pEdgeFaces = _parent->getEdgeFaces(pEdge);
-        ConstLocalIndexArray pEdgeInFace = _parent->getEdgeFaceLocalIndices(pEdge);
-        ConstIndexArray      pEdgeVerts = _parent->getEdgeVertices(pEdge);
-
-        for (int j = 0; j < 2; ++j) {
-            Index cEdge = pEdgeChildEdges[j];
-            if (!IndexIsValid(cEdge)) continue;
-
-            //  Reserve enough edge-faces, populate and trim as needed:
-            _child->resizeEdgeFaces(cEdge, pEdgeFaces.size());
-
-            IndexArray      cEdgeFaces  = _child->getEdgeFaces(cEdge);
-            LocalIndexArray cEdgeInFace = _child->getEdgeFaceLocalIndices(cEdge);
-
-            //
-            //  Each parent face may contribute an incident child face:
-            //
-            int cEdgeFaceCount = 0;
-
-            for (int i = 0; i < pEdgeFaces.size(); ++i) {
-                Index pFace      = pEdgeFaces[i];
-                int   edgeInFace = pEdgeInFace[i];
-
-                ConstIndexArray pFaceVerts = _parent->getFaceVertices(pFace),
-                                pFaceChildren = getFaceChildFaces(pFace);
-
-                //
-                //  We need to first identify the potentially incident child-face and see
-                //  if it exists before we can assign it.  Beware a degenerate edge here
-                //  when inspecting the undirected edge.
-                //
-                int childOfEdge = (pEdgeVerts[0] == pEdgeVerts[1]) ? j : (pFaceVerts[edgeInFace] != pEdgeVerts[j]);
-
-                int childInFace = edgeInFace + childOfEdge;
-                if (childInFace == pFaceChildren.size()) childInFace = 0;
-
-                if (IndexIsValid(pFaceChildren[childInFace])) {
-                    //  Note orientation wrt incident parent faces -- quad vs non-quad...
-                    cEdgeFaces[cEdgeFaceCount] = pFaceChildren[childInFace];
-                    cEdgeInFace[cEdgeFaceCount] = (LocalIndex)
-                            ((pFaceVerts.size() == 4) ? edgeInFace : (childOfEdge ? 3 : 0));
-                    cEdgeFaceCount++;
-                }
-            }
-            _child->trimEdgeFaces(cEdge, cEdgeFaceCount);
-        }
-    }
-}
-
-
-//
-//  Methods to populate the vertex-face relation of the child Level:
-//      - child vertices originate from parent faces, edges and vertices
-//      - sparse refinement poses challenges with allocation here:
-//          - we need to update the counts/offsets as we populate
-//          - note this imposes ordering constraints and inhibits concurrency
-//
-void
-QuadRefinement::populateVertexFaceRelation() {
-
-    //
-    //  Notes on allocating/initializing the vertex-face counts/offsets vector:
-    //
-    //  Be aware of scheme-specific decisions here, e.g.:
-    //      - no verts from parent faces for Loop (unless N-gons supported)
-    //      - more interior edges and faces for verts from parent edges for Loop
-    //      - no guaranteed "neighborhood" around Bilinear verts from verts
-    //
-    //  If uniform subdivision, vert-face count will be (catmark or loop):
-    //      - 4 or 0 for verts from parent faces (for catmark)
-    //      - 2x or 3x number in parent edge for verts from parent edges
-    //      - same as parent vert for verts from parent verts
-    //  If sparse subdivision, vert-face count will be:
-    //      - the number of child faces in parent face
-    //      - 1 or 2x number in parent edge for verts from parent edges
-    //          - where the 1 or 2 is number of child edges of parent edge
-    //      - same as parent vert for verts from parent verts (catmark)
-    //
-    int childVertFaceIndexSizeEstimate = (int)_parent->_faceVertIndices.size()
-                                       + (int)_parent->_edgeFaceIndices.size() * 2
-                                       + (int)_parent->_vertFaceIndices.size();
-
-    _child->_vertFaceCountsAndOffsets.resize(_child->getNumVertices() * 2);
-    _child->_vertFaceIndices.resize(         childVertFaceIndexSizeEstimate);
-    _child->_vertFaceLocalIndices.resize(    childVertFaceIndexSizeEstimate);
-
-    if (getFirstChildVertexFromVertices() == 0) {
-        populateVertexFacesFromParentVertices();
-        populateVertexFacesFromParentFaces();
-        populateVertexFacesFromParentEdges();
-    } else {
-        populateVertexFacesFromParentFaces();
-        populateVertexFacesFromParentEdges();
-        populateVertexFacesFromParentVertices();
-    }
-
-    //  Revise the over-allocated estimate based on what is used (as indicated in the
-    //  count/offset for the last vertex) and trim the index vectors accordingly:
-    childVertFaceIndexSizeEstimate = _child->getNumVertexFaces(_child->getNumVertices()-1) +
-                                     _child->getOffsetOfVertexFaces(_child->getNumVertices()-1);
-    _child->_vertFaceIndices.resize(     childVertFaceIndexSizeEstimate);
-    _child->_vertFaceLocalIndices.resize(childVertFaceIndexSizeEstimate);
-}
-
-void
-QuadRefinement::populateVertexFacesFromParentFaces() {
-
-    for (int pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        int cVert = _faceChildVertIndex[pFace];
-        if (!IndexIsValid(cVert)) continue;
-
-        ConstIndexArray pFaceChildren = getFaceChildFaces(pFace);
-        int pFaceSize = pFaceChildren.size();
-
-        //
-        //  Reserve enough vert-faces, populate and trim to the actual size:
-        //
-        _child->resizeVertexFaces(cVert, pFaceSize);
-
-        IndexArray      cVertFaces  = _child->getVertexFaces(cVert);
-        LocalIndexArray cVertInFace = _child->getVertexFaceLocalIndices(cVert);
-
-        //
-        //  Inspect each of the child faces of this parent face and add those that
-        //  exist as incident the child vertex of this face:
-        //
-        int cVertFaceCount = 0;
-        for (int j = 0; j < pFaceSize; ++j) {
-            if (IndexIsValid(pFaceChildren[j])) {
-                //  Note orientation wrt parent face -- quad vs non-quad...
-                cVertFaces[cVertFaceCount]  = pFaceChildren[j];
-                cVertInFace[cVertFaceCount] = (LocalIndex)((pFaceSize == 4) ? ((j+2) & 3) : 2);
-                cVertFaceCount++;
-            }
-        }
-        _child->trimVertexFaces(cVert, cVertFaceCount);
-    }
-}
-
-void
-QuadRefinement::populateVertexFacesFromParentEdges() {
-
-    for (int pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        int cVert = _edgeChildVertIndex[pEdge];
-        if (!IndexIsValid(cVert)) continue;
-
-        ConstIndexArray      pEdgeFaces  = _parent->getEdgeFaces(pEdge);
-        ConstLocalIndexArray pEdgeInFace = _parent->getEdgeFaceLocalIndices(pEdge);
-
-        //
-        //  Reserve enough vert-faces, populate and trim to the actual size:
-        //
-        _child->resizeVertexFaces(cVert, 2 * pEdgeFaces.size());
-
-        IndexArray      cVertFaces  = _child->getVertexFaces(cVert);
-        LocalIndexArray cVertInFace = _child->getVertexFaceLocalIndices(cVert);
-
-        //
-        //  For each face incident the parent edge, identify its corresponding two child faces
-        //  and assign those of the two that exist.  The second face is considered and added
-        //  first to preserve CC-wise ordering of faces wrt the vertex.
-        //
-        int cVertFaceCount = 0;
-        for (int i = 0; i < pEdgeFaces.size(); ++i) {
-            Index pFace      = pEdgeFaces[i];
-            int   edgeInFace = pEdgeInFace[i];
-
-            ConstIndexArray pFaceChildren = getFaceChildFaces(pFace);
-            int pFaceSize = pFaceChildren.size();
-
-            int faceChild0 = edgeInFace;
-            int faceChild1 = edgeInFace + 1;
-            if (faceChild1 == pFaceChildren.size()) faceChild1 = 0;
-
-            if (IndexIsValid(pFaceChildren[faceChild1])) {
-                //  Note orientation wrt incident parent faces -- quad vs non-quad...
-                cVertFaces[cVertFaceCount] = pFaceChildren[faceChild1];
-                cVertInFace[cVertFaceCount] = (LocalIndex)((pFaceSize == 4) ? faceChild0 : 3);
-                cVertFaceCount++;
-            }
-            if (IndexIsValid(pFaceChildren[faceChild0])) {
-                //  Note orientation wrt incident parent faces -- quad vs non-quad...
-                cVertFaces[cVertFaceCount] = pFaceChildren[faceChild0];
-                cVertInFace[cVertFaceCount] = (LocalIndex)((pFaceSize == 4) ? faceChild1 : 1);
-                cVertFaceCount++;
-            }
-        }
-        _child->trimVertexFaces(cVert, cVertFaceCount);
-    }
-}
-
-void
-QuadRefinement::populateVertexFacesFromParentVertices() {
-
-    for (int pVert = 0; pVert < _parent->getNumVertices(); ++pVert) {
-        int cVert = _vertChildVertIndex[pVert];
-        if (!IndexIsValid(cVert)) continue;
-
-        ConstIndexArray      pVertFaces  = _parent->getVertexFaces(pVert);
-        ConstLocalIndexArray pVertInFace = _parent->getVertexFaceLocalIndices(pVert);
-
-        //
-        //  Reserve enough vert-faces, populate and trim to the actual size:
-        //
-        _child->resizeVertexFaces(cVert, pVertFaces.size());
-
-        IndexArray      cVertFaces  = _child->getVertexFaces(cVert);
-        LocalIndexArray cVertInFace = _child->getVertexFaceLocalIndices(cVert);
-
-        //
-        //  Inspect each of the faces incident the parent vertex and add those that
-        //  spawned a child face corresponding to (and so incident) this child vertex:
-        //
-        int cVertFaceCount = 0;
-        for (int i = 0; i < pVertFaces.size(); ++i) {
-            Index      pFace      = pVertFaces[i];
-            LocalIndex vertInFace = pVertInFace[i];
-
-            ConstIndexArray pFaceChildren = getFaceChildFaces(pFace);
-
-            if (IndexIsValid(pFaceChildren[vertInFace])) {
-                int pFaceSize = pFaceChildren.size();
-
-                //  Note orientation wrt incident parent faces -- quad vs non-quad...
-                cVertFaces[cVertFaceCount] = pFaceChildren[vertInFace];
-                cVertInFace[cVertFaceCount] = (LocalIndex)((pFaceSize == 4) ? vertInFace : 0);
-                cVertFaceCount++;
-            }
-        }
-        _child->trimVertexFaces(cVert, cVertFaceCount);
-    }
-}
-
-//
-//  Methods to populate the vertex-edge relation of the child Level:
-//      - child vertices originate from parent faces, edges and vertices
-//      - sparse refinement poses challenges with allocation here:
-//          - we need to update the counts/offsets as we populate
-//          - note this imposes ordering constraints and inhibits concurrency
-//
-void
-QuadRefinement::populateVertexEdgeRelation() {
-
-    //
-    //  Notes on allocating/initializing the vertex-edge counts/offsets vector:
-    //
-    //  Be aware of scheme-specific decisions here, e.g.:
-    //      - no verts from parent faces for Loop
-    //      - more interior edges and faces for verts from parent edges for Loop
-    //      - no guaranteed "neighborhood" around Bilinear verts from verts
-    //
-    //  If uniform subdivision, vert-edge count will be:
-    //      - 4 or 0 for verts from parent faces (for catmark)
-    //      - 2 + N or 2 + 2*N faces incident parent edge for verts from parent edges
-    //      - same as parent vert for verts from parent verts
-    //  If sparse subdivision, vert-edge count will be:
-    //      - non-trivial function of child faces in parent face
-    //          - 1 child face will always result in 2 child edges
-    //          * 2 child faces can mean 3 or 4 child edges
-    //          - 3 child faces will always result in 4 child edges
-    //      - 1 or 2 + N faces incident parent edge for verts from parent edges
-    //          - where the 1 or 2 is number of child edges of parent edge
-    //          - any end vertex will require all N child faces (catmark)
-    //      - same as parent vert for verts from parent verts (catmark)
-    //
-    int childVertEdgeIndexSizeEstimate = (int)_parent->_faceVertIndices.size()
-                                       + (int)_parent->_edgeFaceIndices.size() + _parent->getNumEdges() * 2
-                                       + (int)_parent->_vertEdgeIndices.size();
-
-    _child->_vertEdgeCountsAndOffsets.resize(_child->getNumVertices() * 2);
-    _child->_vertEdgeIndices.resize(         childVertEdgeIndexSizeEstimate);
-    _child->_vertEdgeLocalIndices.resize(    childVertEdgeIndexSizeEstimate);
-
-    if (getFirstChildVertexFromVertices() == 0) {
-        populateVertexEdgesFromParentVertices();
-        populateVertexEdgesFromParentFaces();
-        populateVertexEdgesFromParentEdges();
-    } else {
-        populateVertexEdgesFromParentFaces();
-        populateVertexEdgesFromParentEdges();
-        populateVertexEdgesFromParentVertices();
-    }
-
-    //  Revise the over-allocated estimate based on what is used (as indicated in the
-    //  count/offset for the last vertex) and trim the index vectors accordingly:
-    childVertEdgeIndexSizeEstimate = _child->getNumVertexEdges(_child->getNumVertices()-1) +
-                                     _child->getOffsetOfVertexEdges(_child->getNumVertices()-1);
-    _child->_vertEdgeIndices.resize(     childVertEdgeIndexSizeEstimate);
-    _child->_vertEdgeLocalIndices.resize(childVertEdgeIndexSizeEstimate);
-}
-
-void
-QuadRefinement::populateVertexEdgesFromParentFaces() {
-
-    for (int pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        int cVert = _faceChildVertIndex[pFace];
-        if (!IndexIsValid(cVert)) continue;
-
-        ConstIndexArray pFaceVerts = _parent->getFaceVertices(pFace),
-                        pFaceChildEdges = getFaceChildEdges(pFace);
-
-        //
-        //  Reserve enough vert-edges, populate and trim to the actual size:
-        //
-        _child->resizeVertexEdges(cVert, pFaceVerts.size());
-
-        IndexArray      cVertEdges  = _child->getVertexEdges(cVert);
-        LocalIndexArray cVertInEdge = _child->getVertexEdgeLocalIndices(cVert);
-
-        //
-        //  Need to ensure correct ordering here when complete -- we want the "leading"
-        //  edge of each child face first.  The child vert is in the center of a new
-        //  face so new "boundaries" will only occur when the vertex is incomplete.
-        //
-        int cVertEdgeCount = 0;
-        for (int j = 0; j < pFaceVerts.size(); ++j) {
-            int jLeadingEdge = j ? (j - 1) : (pFaceVerts.size() - 1);
-            if (IndexIsValid(pFaceChildEdges[jLeadingEdge])) {
-                cVertEdges[cVertEdgeCount] = pFaceChildEdges[jLeadingEdge];
-                cVertInEdge[cVertEdgeCount] = 0;
-                cVertEdgeCount++;
-            }
-        }
-        _child->trimVertexEdges(cVert, cVertEdgeCount);
-    }
-}
-void
-QuadRefinement::populateVertexEdgesFromParentEdges() {
-
-    //
-    //  This relation turns out to be awkward to populate given the mixed parentage
-    //  of the incident edges of the child vertex of an edge -- two child edges
-    //  originate from the parent edge while one or more will originate from the
-    //  faces incident the parent edge.  The need to interleave these for proper
-    //  CC-wise orientation is what really complicates this.
-    //
-    //  Unlike other relations, we generate the results and then re-order them as
-    //  needed.  In this case we assign the first two incident edges as the child
-    //  edges of the parent edge, followed then by those originating from a parent
-    //  face.  We then swap the second and third (and possibly the first two) so
-    //  that we have the desired origin sequence beginning [edge, face, edge, ...]
-    //
-    for (int pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        int cVert = _edgeChildVertIndex[pEdge];
-        if (!IndexIsValid(cVert)) continue;
-
-        ConstIndexArray      pEdgeFaces  = _parent->getEdgeFaces(pEdge);
-        ConstLocalIndexArray pEdgeInFace = _parent->getEdgeFaceLocalIndices(pEdge);
-
-        ConstIndexArray pEdgeVerts      = _parent->getEdgeVertices(pEdge),
-                        pEdgeChildEdges = getEdgeChildEdges(pEdge);
-
-        //
-        //  Reserve enough vert-edges, populate and trim to the actual size:
-        //
-        _child->resizeVertexEdges(cVert, pEdgeFaces.size() + 2);
-
-        IndexArray      cVertEdges  = _child->getVertexEdges(cVert);
-        LocalIndexArray cVertInEdge = _child->getVertexEdgeLocalIndices(cVert);
-
-        //
-        //  Identify and assign the first two child edges of the parent edge -- until
-        //  we look more closely at the orientation of the parent edge in the first
-        //  face we don't know what order these two should be in, so just assign them
-        //  for now and swap them later if necessary:
-        //
-        int cVertEdgeCount = 0;
-
-        if (IndexIsValid(pEdgeChildEdges[0])) {
-            cVertEdges[cVertEdgeCount] = pEdgeChildEdges[0];
-            cVertInEdge[cVertEdgeCount] = 0;
-            cVertEdgeCount++;
-        }
-        if (IndexIsValid(pEdgeChildEdges[1])) {
-            cVertEdges[cVertEdgeCount] = pEdgeChildEdges[1];
-            cVertInEdge[cVertEdgeCount] = 0;
-            cVertEdgeCount++;
-        }
-
-        //
-        //  Append the interior edge of each incident parent face -- swapping the
-        //  first face-edge with the second edge-edge just added to get the desired
-        //  sequence of child edges originating from (edge, face0, edge, ...)
-        //
-        for (int i = 0; i < pEdgeFaces.size(); ++i) {
-            Index pFace      = pEdgeFaces[i];
-            int   edgeInFace = pEdgeInFace[i];
-
-            Index cEdgeOfFace = getFaceChildEdges(pFace)[edgeInFace];
-
-            if (IndexIsValid(cEdgeOfFace)) {
-                cVertEdges[cVertEdgeCount] = cEdgeOfFace;
-                cVertInEdge[cVertEdgeCount] = 1;
-                cVertEdgeCount++;
-
-                //  Check if swapping this first face-edge with the last edge-edge
-                //  is necessary:
-                if ((i == 0) && (cVertEdgeCount == 3)) {
-                    //  Remember to order the first of the two child edges according
-                    //  to the parent edge's orientation in this first face:
-                    if ((pEdgeVerts[0] != pEdgeVerts[1]) &&
-                            (_parent->getFaceVertices(pFace)[edgeInFace] == pEdgeVerts[0])) {
-                        std::swap(cVertEdges[0],  cVertEdges[1]);
-                        std::swap(cVertInEdge[0], cVertInEdge[1]);
-                    }
-                    std::swap(cVertEdges[1],  cVertEdges[2]);
-                    std::swap(cVertInEdge[1], cVertInEdge[2]);
-                }
-            }
-        }
-        _child->trimVertexEdges(cVert, cVertEdgeCount);
-    }
-}
-void
-QuadRefinement::populateVertexEdgesFromParentVertices() {
-
-    for (int pVert = 0; pVert < _parent->getNumVertices(); ++pVert) {
-        int cVert = _vertChildVertIndex[pVert];
-        if (!IndexIsValid(cVert)) continue;
-
-        ConstIndexArray      pVertEdges  = _parent->getVertexEdges(pVert);
-        ConstLocalIndexArray pVertInEdge = _parent->getVertexEdgeLocalIndices(pVert);
-
-        //
-        //  Reserve enough vert-edges, populate and trim to the actual size:
-        //
-        _child->resizeVertexEdges(cVert, pVertEdges.size());
-
-        IndexArray      cVertEdges  = _child->getVertexEdges(cVert);
-        LocalIndexArray cVertInEdge = _child->getVertexEdgeLocalIndices(cVert);
-
-        int cVertEdgeCount = 0;
-        for (int i = 0; i < pVertEdges.size(); ++i) {
-            Index      pEdgeIndex  = pVertEdges[i];
-            LocalIndex pEdgeVert = pVertInEdge[i];
-
-            Index pEdgeChildIndex = getEdgeChildEdges(pEdgeIndex)[pEdgeVert];
-            if (IndexIsValid(pEdgeChildIndex)) {
-                cVertEdges[cVertEdgeCount] = pEdgeChildIndex;
-                cVertInEdge[cVertEdgeCount] = 1;
-                cVertEdgeCount++;
-            }
-        }
-        _child->trimVertexEdges(cVert, cVertEdgeCount);
-    }
-}
-
-//
-//  Methods to populate child-component indices for sparse selection:
-//
-//  Need to find a better place for these anon helper methods now that they are required
-//  both in the base class and the two subclasses for quad- and tri-splitting...
-//
-namespace {
-    Index const IndexSparseMaskNeighboring = (1 << 0);
-    Index const IndexSparseMaskSelected    = (1 << 1);
-
-    inline void markSparseIndexNeighbor(Index& index) { index = IndexSparseMaskNeighboring; }
-    inline void markSparseIndexSelected(Index& index) { index = IndexSparseMaskSelected; }
-}
-
-void
-QuadRefinement::markSparseFaceChildren() {
-
-    assert(_parentFaceTag.size() > 0);
-
-    //
-    //  For each parent face:
-    //      All boundary edges will be adequately marked as a result of the pass over the
-    //  edges above and boundary vertices marked by selection.  So all that remains is to
-    //  identify the child faces and interior child edges for a face requiring neighboring
-    //  child faces.
-    //      For each corner vertex selected, we need to mark the corresponding child face,
-    //  the two interior child edges and shared child vertex in the middle.
-    //
-    assert(_splitType == Sdc::SPLIT_TO_QUADS);
-
-    for (Index pFace = 0; pFace < parent().getNumFaces(); ++pFace) {
-        //
-        //  Mark all descending child components of a selected face.  Otherwise inspect
-        //  its incident vertices to see if anything neighboring has been selected --
-        //  requiring partial refinement of this face.
-        //
-        //  Remember that a selected face cannot be transitional, and that only a
-        //  transitional face will be partially refined.
-        //
-        IndexArray fChildFaces = getFaceChildFaces(pFace);
-        IndexArray fChildEdges = getFaceChildEdges(pFace);
-
-        ConstIndexArray fVerts = parent().getFaceVertices(pFace);
-
-        SparseTag& pFaceTag = _parentFaceTag[pFace];
-
-        if (pFaceTag._selected) {
-            for (int i = 0; i < fVerts.size(); ++i) {
-                markSparseIndexSelected(fChildFaces[i]);
-                markSparseIndexSelected(fChildEdges[i]);
-            }
-            markSparseIndexSelected(_faceChildVertIndex[pFace]);
-
-            pFaceTag._transitional = 0;
-        } else {
-            int marked = false;
-
-            for (int i = 0; i < fVerts.size(); ++i) {
-                if (_parentVertexTag[fVerts[i]]._selected) {
-                    int iPrev = i ? (i - 1) : (fVerts.size() - 1);
-
-                    markSparseIndexNeighbor(fChildFaces[i]);
-
-                    markSparseIndexNeighbor(fChildEdges[i]);
-                    markSparseIndexNeighbor(fChildEdges[iPrev]);
-
-                    marked = true;
-                }
-            }
-            if (marked) {
-                markSparseIndexNeighbor(_faceChildVertIndex[pFace]);
-
-                //
-                //  Assign selection and transitional tags to faces when required:
-                //
-                //  Only non-selected faces may be "transitional", and we need to inspect
-                //  all tags on its boundary edges to be sure.  Since we're inspecting each
-                //  now (and may need to later) retain the transitional state of each in a
-                //  4-bit mask that reflects the full transitional topology for later.
-                //
-                ConstIndexArray fEdges = parent().getFaceEdges(pFace);
-                if (fEdges.size() == 4) {
-                    pFaceTag._transitional = (unsigned char)
-                           ((_parentEdgeTag[fEdges[0]]._transitional << 0) |
-                            (_parentEdgeTag[fEdges[1]]._transitional << 1) |
-                            (_parentEdgeTag[fEdges[2]]._transitional << 2) |
-                            (_parentEdgeTag[fEdges[3]]._transitional << 3));
-                } else if (fEdges.size() == 3) {
-                    pFaceTag._transitional = (unsigned char)
-                           ((_parentEdgeTag[fEdges[0]]._transitional << 0) |
-                            (_parentEdgeTag[fEdges[1]]._transitional << 1) |
-                            (_parentEdgeTag[fEdges[2]]._transitional << 2));
-                } else {
-                    pFaceTag._transitional = 0;
-                    for (int i = 0; i < fEdges.size(); ++i) {
-                        pFaceTag._transitional |= _parentEdgeTag[fEdges[i]]._transitional;
-                    }
-                }
-            }
-        }
-    }
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/quadRefinement.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/quadRefinement.h
deleted file mode 100644
index 136407af7..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/quadRefinement.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_QUAD_REFINEMENT_H
-#define OPENSUBDIV3_VTR_QUAD_REFINEMENT_H
-
-#include "../version.h"
-
-#include "../vtr/refinement.h"
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  QuadRefinement:
-//      A QuadRefinement is a subclass of Refinement that splits all faces into quads.
-//  It provides the configuration of parent-to-child components and the population of
-//  all required topological relations in order to complete a valid Refinement.
-//
-class QuadRefinement : public Refinement {
-
-public:
-    QuadRefinement(Level const & parent, Level & child, Sdc::Options const & options);
-    ~QuadRefinement();
-
-protected:
-    //
-    //  Virtual methods to complete the configuration of the parent-to-child mapping:
-    //
-    virtual void allocateParentChildIndices();
-
-    virtual void markSparseFaceChildren();
-
-    //
-    //  Virtual methods to populate the six topological relations:
-    //
-    virtual void populateFaceVertexRelation();
-    virtual void populateFaceEdgeRelation();
-    virtual void populateEdgeVertexRelation();
-    virtual void populateEdgeFaceRelation();
-    virtual void populateVertexFaceRelation();
-    virtual void populateVertexEdgeRelation();
-
-    //
-    //  Internal helper methods for populating the topology:
-    //
-    void populateFaceVertexCountsAndOffsets();
-    void populateFaceVerticesFromParentFaces();
-
-    void populateFaceEdgesFromParentFaces();
-
-    void populateEdgeVerticesFromParentFaces();
-    void populateEdgeVerticesFromParentEdges();
-
-    void populateEdgeFacesFromParentFaces();
-    void populateEdgeFacesFromParentEdges();
-
-    void populateVertexFacesFromParentFaces();
-    void populateVertexFacesFromParentEdges();
-    void populateVertexFacesFromParentVertices();
-
-    void populateVertexEdgesFromParentFaces();
-    void populateVertexEdgesFromParentEdges();
-    void populateVertexEdgesFromParentVertices();
-
-private:
-    //
-    //  Data members -- currently none
-    //
-};
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_REFINEMENT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/refinement.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/refinement.cpp
deleted file mode 100644
index 2d314239c..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/refinement.cpp
+++ /dev/null
@@ -1,1251 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../sdc/crease.h"
-#include "../sdc/catmarkScheme.h"
-#include "../sdc/bilinearScheme.h"
-#include "../vtr/types.h"
-#include "../vtr/level.h"
-#include "../vtr/refinement.h"
-#include "../vtr/fvarLevel.h"
-#include "../vtr/fvarRefinement.h"
-#include "../vtr/stackBuffer.h"
-
-#include <cassert>
-#include <cstdio>
-#include <utility>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  Simple constructor, destructor and basic initializers:
-//
-Refinement::Refinement(Level const & parentArg, Level & childArg, Sdc::Options const& options) :
-    _parent(&parentArg),
-    _child(&childArg),
-    _options(options),
-    _regFaceSize(-1),
-    _uniform(false),
-    _faceVertsFirst(false),
-    _childFaceFromFaceCount(0),
-    _childEdgeFromFaceCount(0),
-    _childEdgeFromEdgeCount(0),
-    _childVertFromFaceCount(0),
-    _childVertFromEdgeCount(0),
-    _childVertFromVertCount(0),
-    _firstChildFaceFromFace(0),
-    _firstChildEdgeFromFace(0),
-    _firstChildEdgeFromEdge(0),
-    _firstChildVertFromFace(0),
-    _firstChildVertFromEdge(0),
-    _firstChildVertFromVert(0) {
-
-    assert((childArg.getDepth() == 0) && (childArg.getNumVertices() == 0));
-    childArg._depth = 1 + parentArg.getDepth();
-}
-
-Refinement::~Refinement() {
-
-    for (int i = 0; i < (int)_fvarChannels.size(); ++i) {
-        delete _fvarChannels[i];
-    }
-}
-
-void
-Refinement::initializeChildComponentCounts() {
-
-    //
-    //  Assign the child's component counts/inventory based on the child components identified:
-    //
-    _child->_faceCount = _childFaceFromFaceCount;
-    _child->_edgeCount = _childEdgeFromFaceCount + _childEdgeFromEdgeCount;
-    _child->_vertCount = _childVertFromFaceCount + _childVertFromEdgeCount + _childVertFromVertCount;
-}
-
-void
-Refinement::initializeSparseSelectionTags() {
-
-    _parentFaceTag.resize(_parent->getNumFaces());
-    _parentEdgeTag.resize(_parent->getNumEdges());
-    _parentVertexTag.resize(_parent->getNumVertices());
-}
-
-
-//
-//  The main refinement method -- provides a high-level overview of refinement:
-//
-//  The refinement process is as follows:
-//      - determine a mapping from parent components to their potential child components
-//          - for sparse refinement this mapping will be partial
-//      - determine the reverse mapping from chosen child components back to their parents
-//          - previously this was optional -- not strictly necessary and comes at added cost
-//          - does simplify iteration of child components when refinement is sparse
-//      - propagate/initialize component Tags from parents to their children
-//          - knowing these Tags for a child component simplifies dealing with it later
-//      - subdivide the topology, i.e. populate all topology relations for the child Level
-//          - any subset of the 6 relations in a Level can be created
-//          - using the minimum required in the last Level is very advantageous
-//      - subdivide the sharpness values in the child Level
-//      - subdivide face-varying channels in the child Level
-//
-void
-Refinement::refine(Options refineOptions) {
-
-    //  This will become redundant when/if assigned on construction:
-    assert(_parent && _child);
-
-    _uniform        = !refineOptions._sparse;
-    _faceVertsFirst =  refineOptions._faceVertsFirst;
-
-    //  We may soon have an option here to suppress refinement of FVar channels...
-    bool refineOptions_ignoreFVarChannels = false;
-
-    bool optionallyRefineFVar = (_parent->getNumFVarChannels() > 0) && !refineOptions_ignoreFVarChannels;
-
-    //
-    //  Initialize the parent-to-child and reverse child-to-parent mappings and propagate
-    //  component tags to the new child components:
-    //
-    populateParentToChildMapping();
-
-    initializeChildComponentCounts();
-
-    populateChildToParentMapping();
-
-    propagateComponentTags();
-
-    //
-    //  Subdivide the topology -- populating only those of the 6 relations specified
-    //  (though we do require the vertex-face relation for refining FVar channels):
-    //
-    Relations relationsToPopulate;
-    if (refineOptions._minimalTopology) {
-        relationsToPopulate.setAll(false);
-        relationsToPopulate._faceVertices = true;
-    } else {
-        relationsToPopulate.setAll(true);
-    }
-    if (optionallyRefineFVar) {
-        relationsToPopulate._vertexFaces = true;
-    }
-
-    subdivideTopology(relationsToPopulate);
-
-    //
-    //  Subdivide the sharpness values and face-varying channels:
-    //    - note there is some dependency of the vertex tag/Rule for semi-sharp vertices
-    //
-    subdivideSharpnessValues();
-
-    if (optionallyRefineFVar) {
-        subdivideFVarChannels();
-    }
-
-    //  Various debugging support:
-    //
-    //printf("Vertex refinement to level %d completed...\n", _child->getDepth());
-    //_child->print();
-    //printf("  validating refinement to level %d...\n", _child->getDepth());
-    //_child->validateTopology();
-    //assert(_child->validateTopology());
-}
-
-
-//
-//  Methods to construct the parent-to-child mapping
-//
-void
-Refinement::populateParentToChildMapping() {
-
-    allocateParentChildIndices();
-
-    //
-    //  If sparse refinement, mark indices of any components in addition to those selected
-    //  so that we have the full neighborhood for selected components:
-    //
-    if (!_uniform) {
-        //  Make sure the selection was non-empty -- currently unsupported...
-        if (_parentVertexTag.size() == 0) {
-            assert("Unsupported empty sparse refinement detected in Refinement" == 0);
-        }
-        markSparseChildComponentIndices();
-    }
-
-    populateParentChildIndices();
-}
-
-namespace {
-    inline bool isSparseIndexMarked(Index index)   { return index != 0; }
-
-    inline int
-    sequenceSparseIndexVector(IndexVector& indexVector, int baseValue = 0) {
-        int validCount = 0;
-        for (int i = 0; i < (int) indexVector.size(); ++i) {
-            indexVector[i] = isSparseIndexMarked(indexVector[i])
-                           ? (baseValue + validCount++) : INDEX_INVALID;
-        }
-        return validCount;
-    }
-
-    inline int
-    sequenceFullIndexVector(IndexVector& indexVector, int baseValue = 0) {
-        int indexCount = (int) indexVector.size();
-        for (int i = 0; i < indexCount; ++i) {
-            indexVector[i] = baseValue++;
-        }
-        return indexCount;
-    }
-}
-
-void
-Refinement::populateParentChildIndices() {
-
-    //
-    //  Two vertex orderings are currently supported -- ordering vertices refined
-    //  from vertices first, or those refined from faces first.  It's possible this
-    //  may be extended to more possibilities.  Once the ordering is defined here,
-    //  other than analogous initialization in FVarRefinement, the treatment of
-    //  vertices in blocks based on origin should make the rest of the code
-    //  invariant to ordering changes.
-    //
-    //  These two blocks now differ only in the utility function that assigns the
-    //  sequential values to the index vectors -- so parameterization/simplification
-    //  is now possible...
-    //
-    if (_uniform) {
-        //  child faces:
-        _firstChildFaceFromFace = 0;
-        _childFaceFromFaceCount = sequenceFullIndexVector(_faceChildFaceIndices, _firstChildFaceFromFace);
-
-        //  child edges:
-        _firstChildEdgeFromFace = 0;
-        _childEdgeFromFaceCount = sequenceFullIndexVector(_faceChildEdgeIndices, _firstChildEdgeFromFace);
-
-        _firstChildEdgeFromEdge = _childEdgeFromFaceCount;
-        _childEdgeFromEdgeCount = sequenceFullIndexVector(_edgeChildEdgeIndices, _firstChildEdgeFromEdge);
-
-        //  child vertices:
-        if (_faceVertsFirst) {
-            _firstChildVertFromFace = 0;
-            _childVertFromFaceCount = sequenceFullIndexVector(_faceChildVertIndex, _firstChildVertFromFace);
-
-            _firstChildVertFromEdge = _firstChildVertFromFace + _childVertFromFaceCount;
-            _childVertFromEdgeCount = sequenceFullIndexVector(_edgeChildVertIndex, _firstChildVertFromEdge);
-
-            _firstChildVertFromVert = _firstChildVertFromEdge + _childVertFromEdgeCount;
-            _childVertFromVertCount = sequenceFullIndexVector(_vertChildVertIndex, _firstChildVertFromVert);
-        } else {
-            _firstChildVertFromVert = 0;
-            _childVertFromVertCount = sequenceFullIndexVector(_vertChildVertIndex, _firstChildVertFromVert);
-
-            _firstChildVertFromFace = _firstChildVertFromVert + _childVertFromVertCount;
-            _childVertFromFaceCount = sequenceFullIndexVector(_faceChildVertIndex, _firstChildVertFromFace);
-
-            _firstChildVertFromEdge = _firstChildVertFromFace + _childVertFromFaceCount;
-            _childVertFromEdgeCount = sequenceFullIndexVector(_edgeChildVertIndex, _firstChildVertFromEdge);
-        }
-    } else {
-        //  child faces:
-        _firstChildFaceFromFace = 0;
-        _childFaceFromFaceCount = sequenceSparseIndexVector(_faceChildFaceIndices, _firstChildFaceFromFace);
-
-        //  child edges:
-        _firstChildEdgeFromFace = 0;
-        _childEdgeFromFaceCount = sequenceSparseIndexVector(_faceChildEdgeIndices, _firstChildEdgeFromFace);
-
-        _firstChildEdgeFromEdge = _childEdgeFromFaceCount;
-        _childEdgeFromEdgeCount = sequenceSparseIndexVector(_edgeChildEdgeIndices, _firstChildEdgeFromEdge);
-
-        //  child vertices:
-        if (_faceVertsFirst) {
-            _firstChildVertFromFace = 0;
-            _childVertFromFaceCount = sequenceSparseIndexVector(_faceChildVertIndex, _firstChildVertFromFace);
-
-            _firstChildVertFromEdge = _firstChildVertFromFace + _childVertFromFaceCount;
-            _childVertFromEdgeCount = sequenceSparseIndexVector(_edgeChildVertIndex, _firstChildVertFromEdge);
-
-            _firstChildVertFromVert = _firstChildVertFromEdge + _childVertFromEdgeCount;
-            _childVertFromVertCount = sequenceSparseIndexVector(_vertChildVertIndex, _firstChildVertFromVert);
-        } else {
-            _firstChildVertFromVert = 0;
-            _childVertFromVertCount = sequenceSparseIndexVector(_vertChildVertIndex, _firstChildVertFromVert);
-
-            _firstChildVertFromFace = _firstChildVertFromVert + _childVertFromVertCount;
-            _childVertFromFaceCount = sequenceSparseIndexVector(_faceChildVertIndex, _firstChildVertFromFace);
-
-            _firstChildVertFromEdge = _firstChildVertFromFace + _childVertFromFaceCount;
-            _childVertFromEdgeCount = sequenceSparseIndexVector(_edgeChildVertIndex, _firstChildVertFromEdge);
-        }
-    }
-}
-
-void
-Refinement::printParentToChildMapping() const {
-
-    printf("Parent-to-child component mapping:\n");
-    for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        printf("  Face %d:\n", pFace);
-        printf("    Child vert:  %d\n", _faceChildVertIndex[pFace]);
-
-        printf("    Child faces: ");
-        ConstIndexArray childFaces = getFaceChildFaces(pFace);
-        for (int i = 0; i < childFaces.size(); ++i) {
-            printf(" %d", childFaces[i]);
-        }
-        printf("\n");
-
-        printf("    Child edges: ");
-        ConstIndexArray childEdges = getFaceChildEdges(pFace);
-        for (int i = 0; i < childEdges.size(); ++i) {
-            printf(" %d", childEdges[i]);
-        }
-        printf("\n");
-    }
-    for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        printf("  Edge %d:\n", pEdge);
-        printf("    Child vert:  %d\n", _edgeChildVertIndex[pEdge]);
-
-        ConstIndexArray childEdges = getEdgeChildEdges(pEdge);
-        printf("    Child edges: %d %d\n", childEdges[0], childEdges[1]);
-    }
-    for (Index pVert = 0; pVert < _parent->getNumVertices(); ++pVert) {
-        printf("  Vert %d:\n", pVert);
-        printf("    Child vert:  %d\n", _vertChildVertIndex[pVert]);
-    }
-}
-
-
-//
-//  Methods to construct the child-to-parent mapping:
-//
-void
-Refinement::populateChildToParentMapping() {
-
-    ChildTag initialChildTags[2][4];
-    for (int i = 0; i < 2; ++i) {
-        for (int j = 0; j < 4; ++j) {
-            ChildTag & tag = initialChildTags[i][j];
-
-            tag._incomplete    = (unsigned char)i;
-            tag._parentType    = 0;
-            tag._indexInParent = (unsigned char)j;
-        }
-    }
-
-    populateFaceParentVectors(initialChildTags);
-    populateEdgeParentVectors(initialChildTags);
-    populateVertexParentVectors(initialChildTags);
-}
-
-void
-Refinement::populateFaceParentVectors(ChildTag const initialChildTags[2][4]) {
-
-    _childFaceTag.resize(_child->getNumFaces());
-    _childFaceParentIndex.resize(_child->getNumFaces());
-
-    populateFaceParentFromParentFaces(initialChildTags);
-}
-void
-Refinement::populateFaceParentFromParentFaces(ChildTag const initialChildTags[2][4]) {
-
-    if (_uniform) {
-        Index cFace = getFirstChildFaceFromFaces();
-        for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-            ConstIndexArray cFaces = getFaceChildFaces(pFace);
-            if (cFaces.size() == 4) {
-                _childFaceTag[cFace + 0] = initialChildTags[0][0];
-                _childFaceTag[cFace + 1] = initialChildTags[0][1];
-                _childFaceTag[cFace + 2] = initialChildTags[0][2];
-                _childFaceTag[cFace + 3] = initialChildTags[0][3];
-
-                _childFaceParentIndex[cFace + 0] = pFace;
-                _childFaceParentIndex[cFace + 1] = pFace;
-                _childFaceParentIndex[cFace + 2] = pFace;
-                _childFaceParentIndex[cFace + 3] = pFace;
-
-                cFace += 4;
-            } else {
-                bool childTooLarge = (cFaces.size() > 4);
-                for (int i = 0; i < cFaces.size(); ++i, ++cFace) {
-                    _childFaceTag[cFace] = initialChildTags[0][childTooLarge ? 0 : i];
-                    _childFaceParentIndex[cFace] = pFace;
-                }
-            }
-        }
-    } else {
-        //  Child faces of faces:
-        for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-            bool incomplete = !_parentFaceTag[pFace]._selected;
-
-            IndexArray cFaces = getFaceChildFaces(pFace);
-            if (!incomplete && (cFaces.size() == 4)) {
-                _childFaceTag[cFaces[0]] = initialChildTags[0][0];
-                _childFaceTag[cFaces[1]] = initialChildTags[0][1];
-                _childFaceTag[cFaces[2]] = initialChildTags[0][2];
-                _childFaceTag[cFaces[3]] = initialChildTags[0][3];
-
-                _childFaceParentIndex[cFaces[0]] = pFace;
-                _childFaceParentIndex[cFaces[1]] = pFace;
-                _childFaceParentIndex[cFaces[2]] = pFace;
-                _childFaceParentIndex[cFaces[3]] = pFace;
-            } else {
-                bool childTooLarge = (cFaces.size() > 4);
-                for (int i = 0; i < cFaces.size(); ++i) {
-                    if (IndexIsValid(cFaces[i])) {
-                        _childFaceTag[cFaces[i]] = initialChildTags[incomplete][childTooLarge ? 0 : i];
-                        _childFaceParentIndex[cFaces[i]] = pFace;
-                    }
-                }
-            }
-        }
-    }
-}
-
-void
-Refinement::populateEdgeParentVectors(ChildTag const initialChildTags[2][4]) {
-
-    _childEdgeTag.resize(_child->getNumEdges());
-    _childEdgeParentIndex.resize(_child->getNumEdges());
-
-    populateEdgeParentFromParentFaces(initialChildTags);
-    populateEdgeParentFromParentEdges(initialChildTags);
-}
-void
-Refinement::populateEdgeParentFromParentFaces(ChildTag const initialChildTags[2][4]) {
-
-    if (_uniform) {
-        Index cEdge = getFirstChildEdgeFromFaces();
-        for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-            ConstIndexArray cEdges = getFaceChildEdges(pFace);
-            if (cEdges.size() == 4) {
-                _childEdgeTag[cEdge + 0] = initialChildTags[0][0];
-                _childEdgeTag[cEdge + 1] = initialChildTags[0][1];
-                _childEdgeTag[cEdge + 2] = initialChildTags[0][2];
-                _childEdgeTag[cEdge + 3] = initialChildTags[0][3];
-
-                _childEdgeParentIndex[cEdge + 0] = pFace;
-                _childEdgeParentIndex[cEdge + 1] = pFace;
-                _childEdgeParentIndex[cEdge + 2] = pFace;
-                _childEdgeParentIndex[cEdge + 3] = pFace;
-
-                cEdge += 4;
-            } else {
-                bool childTooLarge = (cEdges.size() > 4);
-                for (int i = 0; i < cEdges.size(); ++i, ++cEdge) {
-                    _childEdgeTag[cEdge] = initialChildTags[0][childTooLarge ? 0 : i];
-                    _childEdgeParentIndex[cEdge] = pFace;
-                }
-            }
-        }
-    } else {
-        for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-            bool incomplete = !_parentFaceTag[pFace]._selected;
-
-            IndexArray cEdges = getFaceChildEdges(pFace);
-            if (!incomplete && (cEdges.size() == 4)) {
-                _childEdgeTag[cEdges[0]] = initialChildTags[0][0];
-                _childEdgeTag[cEdges[1]] = initialChildTags[0][1];
-                _childEdgeTag[cEdges[2]] = initialChildTags[0][2];
-                _childEdgeTag[cEdges[3]] = initialChildTags[0][3];
-
-                _childEdgeParentIndex[cEdges[0]] = pFace;
-                _childEdgeParentIndex[cEdges[1]] = pFace;
-                _childEdgeParentIndex[cEdges[2]] = pFace;
-                _childEdgeParentIndex[cEdges[3]] = pFace;
-            } else {
-                bool childTooLarge = (cEdges.size() > 4);
-                for (int i = 0; i < cEdges.size(); ++i) {
-                    if (IndexIsValid(cEdges[i])) {
-                        _childEdgeTag[cEdges[i]] = initialChildTags[incomplete][childTooLarge ? 0 : i];
-                        _childEdgeParentIndex[cEdges[i]] = pFace;
-                    }
-                }
-            }
-        }
-    }
-}
-void
-Refinement::populateEdgeParentFromParentEdges(ChildTag const initialChildTags[2][4]) {
-
-    if (_uniform) {
-        Index cEdge = getFirstChildEdgeFromEdges();
-        for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge, cEdge += 2) {
-            _childEdgeTag[cEdge + 0] = initialChildTags[0][0];
-            _childEdgeTag[cEdge + 1] = initialChildTags[0][1];
-
-            _childEdgeParentIndex[cEdge + 0] = pEdge;
-            _childEdgeParentIndex[cEdge + 1] = pEdge;
-        }
-    } else {
-        for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-            bool incomplete = !_parentEdgeTag[pEdge]._selected;
-
-            IndexArray cEdges = getEdgeChildEdges(pEdge);
-            if (!incomplete) {
-                _childEdgeTag[cEdges[0]] = initialChildTags[0][0];
-                _childEdgeTag[cEdges[1]] = initialChildTags[0][1];
-
-                _childEdgeParentIndex[cEdges[0]] = pEdge;
-                _childEdgeParentIndex[cEdges[1]] = pEdge;
-            } else {
-                for (int i = 0; i < 2; ++i) {
-                    if (IndexIsValid(cEdges[i])) {
-                        _childEdgeTag[cEdges[i]] = initialChildTags[incomplete][i];
-                        _childEdgeParentIndex[cEdges[i]] = pEdge;
-                    }
-                }
-            }
-        }
-    }
-}
-
-void
-Refinement::populateVertexParentVectors(ChildTag const initialChildTags[2][4]) {
-
-    if (_uniform) {
-        _childVertexTag.resize(_child->getNumVertices(), initialChildTags[0][0]);
-    } else {
-        _childVertexTag.resize(_child->getNumVertices(), initialChildTags[1][0]);
-    }
-    _childVertexParentIndex.resize(_child->getNumVertices());
-
-    populateVertexParentFromParentFaces(initialChildTags);
-    populateVertexParentFromParentEdges(initialChildTags);
-    populateVertexParentFromParentVertices(initialChildTags);
-}
-void
-Refinement::populateVertexParentFromParentFaces(ChildTag const initialChildTags[2][4]) {
-
-    if (getNumChildVerticesFromFaces() == 0) return;
-
-    if (_uniform) {
-        Index cVert = getFirstChildVertexFromFaces();
-        for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace, ++cVert) {
-            //  Child tag was initialized as the complete and only child when allocated
-
-            _childVertexParentIndex[cVert] = pFace;
-        }
-    } else {
-        ChildTag const & completeChildTag = initialChildTags[0][0];
-
-        for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-            Index cVert = _faceChildVertIndex[pFace];
-            if (IndexIsValid(cVert)) {
-                //  Child tag was initialized as incomplete -- reset if complete:
-                if (_parentFaceTag[pFace]._selected) {
-                    _childVertexTag[cVert] = completeChildTag;
-                }
-                _childVertexParentIndex[cVert] = pFace;
-            }
-        }
-    }
-}
-void
-Refinement::populateVertexParentFromParentEdges(ChildTag const initialChildTags[2][4]) {
-
-    if (_uniform) {
-        Index cVert = getFirstChildVertexFromEdges();
-        for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge, ++cVert) {
-            //  Child tag was initialized as the complete and only child when allocated
-
-            _childVertexParentIndex[cVert] = pEdge;
-        }
-    } else {
-        ChildTag const & completeChildTag = initialChildTags[0][0];
-
-        for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-            Index cVert = _edgeChildVertIndex[pEdge];
-            if (IndexIsValid(cVert)) {
-                //  Child tag was initialized as incomplete -- reset if complete:
-                if (_parentEdgeTag[pEdge]._selected) {
-                    _childVertexTag[cVert] = completeChildTag;
-                }
-                _childVertexParentIndex[cVert] = pEdge;
-            }
-        }
-    }
-}
-void
-Refinement::populateVertexParentFromParentVertices(ChildTag const initialChildTags[2][4]) {
-
-    if (_uniform) {
-        Index cVert = getFirstChildVertexFromVertices();
-        for (Index pVert = 0; pVert < _parent->getNumVertices(); ++pVert, ++cVert) {
-            //  Child tag was initialized as the complete and only child when allocated
-
-            _childVertexParentIndex[cVert] = pVert;
-        }
-    } else {
-        ChildTag const & completeChildTag = initialChildTags[0][0];
-
-        for (Index pVert = 0; pVert < _parent->getNumVertices(); ++pVert) {
-            Index cVert = _vertChildVertIndex[pVert];
-            if (IndexIsValid(cVert)) {
-                //  Child tag was initialized as incomplete but these should be complete:
-                if (_parentVertexTag[pVert]._selected) {
-                    _childVertexTag[cVert] = completeChildTag;
-                }
-                _childVertexParentIndex[cVert] = pVert;
-            }
-        }
-    }
-}
-
-
-//
-//  Methods to propagate/initialize child component tags from their parent component:
-//
-void
-Refinement::propagateComponentTags() {
-
-    populateFaceTagVectors();
-    populateEdgeTagVectors();
-    populateVertexTagVectors();
-}
-
-void
-Refinement::populateFaceTagVectors() {
-
-    _child->_faceTags.resize(_child->getNumFaces());
-
-    populateFaceTagsFromParentFaces();
-}
-void
-Refinement::populateFaceTagsFromParentFaces() {
-
-    //
-    //  Tags for faces originating from faces are inherited from the parent face:
-    //
-    Index cFace    = getFirstChildFaceFromFaces();
-    Index cFaceEnd = cFace + getNumChildFacesFromFaces();
-    for ( ; cFace < cFaceEnd; ++cFace) {
-        _child->_faceTags[cFace] = _parent->_faceTags[_childFaceParentIndex[cFace]];
-    }
-}
-
-void
-Refinement::populateEdgeTagVectors() {
-
-    _child->_edgeTags.resize(_child->getNumEdges());
-
-    populateEdgeTagsFromParentFaces();
-    populateEdgeTagsFromParentEdges();
-}
-void
-Refinement::populateEdgeTagsFromParentFaces() {
-
-    //
-    //  Tags for edges originating from faces are all constant:
-    //
-    Level::ETag eTag;
-    eTag.clear();
-
-    Index cEdge    = getFirstChildEdgeFromFaces();
-    Index cEdgeEnd = cEdge + getNumChildEdgesFromFaces();
-    for ( ; cEdge < cEdgeEnd; ++cEdge) {
-        _child->_edgeTags[cEdge] = eTag;
-    }
-}
-void
-Refinement::populateEdgeTagsFromParentEdges() {
-
-    //
-    //  Tags for edges originating from edges are inherited from the parent edge:
-    //
-    Index cEdge    = getFirstChildEdgeFromEdges();
-    Index cEdgeEnd = cEdge + getNumChildEdgesFromEdges();
-    for ( ; cEdge < cEdgeEnd; ++cEdge) {
-        _child->_edgeTags[cEdge] = _parent->_edgeTags[_childEdgeParentIndex[cEdge]];
-    }
-}
-
-void
-Refinement::populateVertexTagVectors() {
-
-    _child->_vertTags.resize(_child->getNumVertices());
-
-    populateVertexTagsFromParentFaces();
-    populateVertexTagsFromParentEdges();
-    populateVertexTagsFromParentVertices();
-
-    if (!_uniform) {
-        for (Index cVert = 0; cVert < _child->getNumVertices(); ++cVert) {
-            if (_childVertexTag[cVert]._incomplete) {
-                _child->_vertTags[cVert]._incomplete = true;
-            }
-        }
-    }
-}
-void
-Refinement::populateVertexTagsFromParentFaces() {
-
-    //
-    //  Similarly, tags for vertices originating from faces are all constant -- with the
-    //  unfortunate exception of refining level 0, where the faces may be N-sided and so
-    //  introduce new vertices that need to be tagged as extra-ordinary:
-    //
-    if (getNumChildVerticesFromFaces() == 0) return;
-
-    Level::VTag vTag;
-    vTag.clear();
-    vTag._rule = Sdc::Crease::RULE_SMOOTH;
-
-    Index cVert    = getFirstChildVertexFromFaces();
-    Index cVertEnd = cVert + getNumChildVerticesFromFaces();
-
-    if (_parent->_depth > 0) {
-        for ( ; cVert < cVertEnd; ++cVert) {
-            _child->_vertTags[cVert] = vTag;
-        }
-    } else {
-        for ( ; cVert < cVertEnd; ++cVert) {
-            _child->_vertTags[cVert] = vTag;
-
-            if (_parent->getNumFaceVertices(_childVertexParentIndex[cVert]) != _regFaceSize) {
-                _child->_vertTags[cVert]._xordinary = true;
-            }
-        }
-    }
-}
-void
-Refinement::populateVertexTagsFromParentEdges() {
-
-    //
-    //  Tags for vertices originating from edges are initialized according to the tags
-    //  of the parent edge:
-    //
-    Level::VTag vTag;
-    vTag.clear();
-
-    for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        Index cVert = _edgeChildVertIndex[pEdge];
-        if (!IndexIsValid(cVert)) continue;
-
-        //  From the cleared local VTag, we just need to assign properties dependent
-        //  on the parent edge:
-        Level::ETag const& pEdgeTag = _parent->_edgeTags[pEdge];
-
-        vTag._nonManifold    = pEdgeTag._nonManifold;
-        vTag._boundary       = pEdgeTag._boundary;
-        vTag._semiSharpEdges = pEdgeTag._semiSharp;
-        vTag._infSharpEdges  = pEdgeTag._infSharp;
-        vTag._infSharpCrease = pEdgeTag._infSharp;
-        vTag._infIrregular   = pEdgeTag._infSharp && pEdgeTag._nonManifold;
-
-        vTag._rule = (Level::VTag::VTagSize)((pEdgeTag._semiSharp || pEdgeTag._infSharp)
-                       ? Sdc::Crease::RULE_CREASE : Sdc::Crease::RULE_SMOOTH);
-
-        _child->_vertTags[cVert] = vTag;
-    }
-}
-void
-Refinement::populateVertexTagsFromParentVertices() {
-
-    //
-    //  Tags for vertices originating from vertices are inherited from the parent vertex:
-    //
-    Index cVert    = getFirstChildVertexFromVertices();
-    Index cVertEnd = cVert + getNumChildVerticesFromVertices();
-    for ( ; cVert < cVertEnd; ++cVert) {
-        _child->_vertTags[cVert] = _parent->_vertTags[_childVertexParentIndex[cVert]];
-        _child->_vertTags[cVert]._incidIrregFace = 0;
-    }
-}
-
-
-
-//
-//  Methods to subdivide the topology:
-//
-//  The main method to subdivide topology is fairly simple -- given a set of relations
-//  to populate it simply tests and populates each relation separately.  The method for
-//  each relation is responsible for appropriate allocation and initialization of all
-//  data involved, and these are virtual -- provided by a quad- or tri-split subclass.
-//
-void
-Refinement::subdivideTopology(Relations const& applyTo) {
-
-    if (applyTo._faceVertices) {
-        populateFaceVertexRelation();
-    }
-    if (applyTo._faceEdges) {
-        populateFaceEdgeRelation();
-    }
-    if (applyTo._edgeVertices) {
-        populateEdgeVertexRelation();
-    }
-    if (applyTo._edgeFaces) {
-        populateEdgeFaceRelation();
-    }
-    if (applyTo._vertexFaces) {
-        populateVertexFaceRelation();
-    }
-    if (applyTo._vertexEdges) {
-        populateVertexEdgeRelation();
-    }
-
-    //
-    //  Additional members of the child Level not specific to any relation...
-    //      - note in the case of max-valence, the child's max-valence may be less
-    //  than the parent if that maximal parent vertex was not included in the sparse
-    //  refinement (possible when sparse refinement is more general).
-    //      - it may also be more if the base level was fairly trivial, i.e. less
-    //  than the regular valence, or contains non-manifold edges with many faces.
-    //      - NOTE that when/if we support N-gons for tri-splitting, that the valence
-    //  of edge-vertices introduced on the N-gon may be 7 rather than 6, while N may
-    //  be less than both.
-    //
-    //  In general, we need a better way to deal with max-valence.  The fact that 
-    //  each topology relation is independent/optional complicates the issue of 
-    //  where to keep track of it...
-    //
-    if (_splitType == Sdc::SPLIT_TO_QUADS) {
-        _child->_maxValence = std::max(_parent->_maxValence, 4);
-        _child->_maxValence = std::max(_child->_maxValence, 2 + _parent->_maxEdgeFaces);
-    } else {
-        _child->_maxValence = std::max(_parent->_maxValence, 6);
-        _child->_maxValence = std::max(_child->_maxValence, 2 + _parent->_maxEdgeFaces * 2);
-    }
-}
-
-
-//
-//  Methods to subdivide sharpness values:
-//
-void
-Refinement::subdivideSharpnessValues() {
-
-    //
-    //  Subdividing edge and vertex sharpness values are independent, but in order
-    //  to maintain proper classification/tagging of components as semi-sharp, both
-    //  must be computed and the neighborhood inspected to properly update the
-    //  status.
-    //
-    //  It is possible to clear the semi-sharp status when propagating the tags and
-    //  to reset it (potentially multiple times) when updating the sharpness values.
-    //  The vertex subdivision Rule is also affected by this, which complicates the
-    //  process.  So for now we apply a post-process to explicitly handle all
-    //  semi-sharp vertices.
-    //
-
-    //  These methods will update sharpness tags local to the edges and vertices:
-    subdivideEdgeSharpness();
-    subdivideVertexSharpness();
-
-    //  This method uses local sharpness tags (set above) to update vertex tags that
-    //  reflect the neighborhood of the vertex (e.g. its rule):
-    reclassifySemisharpVertices();
-}
-
-void
-Refinement::subdivideEdgeSharpness() {
-
-    Sdc::Crease creasing(_options);
-
-    _child->_edgeSharpness.clear();
-    _child->_edgeSharpness.resize(_child->getNumEdges(), Sdc::Crease::SHARPNESS_SMOOTH);
-
-    //
-    //  Edge sharpness is passed to child-edges using the parent edge and the
-    //  parent vertex for which the child corresponds.  Child-edges are created
-    //  from both parent faces and parent edges, but those child-edges created
-    //  from a parent face should be within the face's interior and so smooth
-    //  (and so previously initialized).
-    //
-    //  The presence/validity of each parent edges child vert indicates one or
-    //  more child edges.
-    //
-    //  NOTE -- It is also useful at this time to classify the child vert of
-    //  this edge based on the creasing information here, particularly when a
-    //  non-trivial creasing method like Chaikin is used.  This is not being
-    //  done now but is worth considering...
-    //
-    internal::StackBuffer<float,16> pVertEdgeSharpness;
-    if (!creasing.IsUniform()) {
-        pVertEdgeSharpness.Reserve(_parent->getMaxValence());
-    }
-
-    Index cEdge    = getFirstChildEdgeFromEdges();
-    Index cEdgeEnd = cEdge + getNumChildEdgesFromEdges();
-    for ( ; cEdge < cEdgeEnd; ++cEdge) {
-        float&       cSharpness = _child->_edgeSharpness[cEdge];
-        Level::ETag& cEdgeTag   = _child->_edgeTags[cEdge];
-
-        if (cEdgeTag._infSharp) {
-            cSharpness = Sdc::Crease::SHARPNESS_INFINITE;
-        } else if (cEdgeTag._semiSharp) {
-            Index pEdge      = _childEdgeParentIndex[cEdge];
-            float pSharpness = _parent->_edgeSharpness[pEdge];
-
-            if (creasing.IsUniform()) {
-                cSharpness = creasing.SubdivideUniformSharpness(pSharpness);
-            } else {
-                ConstIndexArray pEdgeVerts = _parent->getEdgeVertices(pEdge);
-                Index           pVert      = pEdgeVerts[_childEdgeTag[cEdge]._indexInParent];
-                ConstIndexArray pVertEdges = _parent->getVertexEdges(pVert);
-
-                for (int i = 0; i < pVertEdges.size(); ++i) {
-                    pVertEdgeSharpness[i] = _parent->_edgeSharpness[pVertEdges[i]];
-                }
-                cSharpness = creasing.SubdivideEdgeSharpnessAtVertex(pSharpness, pVertEdges.size(),
-                                                                         pVertEdgeSharpness);
-            }
-            if (! Sdc::Crease::IsSharp(cSharpness)) {
-                cEdgeTag._semiSharp = false;
-            }
-        }
-    }
-}
-
-void
-Refinement::subdivideVertexSharpness() {
-
-    Sdc::Crease creasing(_options);
-
-    _child->_vertSharpness.clear();
-    _child->_vertSharpness.resize(_child->getNumVertices(), Sdc::Crease::SHARPNESS_SMOOTH);
-
-    //
-    //  All child-verts originating from faces or edges are initialized as smooth
-    //  above.  Only those originating from vertices require "subdivided" values:
-    //
-    //  Only deal with the subrange of vertices originating from vertices:
-    Index cVertBegin = getFirstChildVertexFromVertices();
-    Index cVertEnd   = cVertBegin + getNumChildVerticesFromVertices();
-
-    for (Index cVert = cVertBegin; cVert < cVertEnd; ++cVert) {
-        float&       cSharpness = _child->_vertSharpness[cVert];
-        Level::VTag& cVertTag   = _child->_vertTags[cVert];
-
-        if (cVertTag._infSharp) {
-            cSharpness = Sdc::Crease::SHARPNESS_INFINITE;
-        } else if (cVertTag._semiSharp) {
-            Index pVert      = _childVertexParentIndex[cVert];
-            float pSharpness = _parent->_vertSharpness[pVert];
-
-            cSharpness = creasing.SubdivideVertexSharpness(pSharpness);
-            if (! Sdc::Crease::IsSharp(cSharpness)) {
-                cVertTag._semiSharp = false;
-            }
-        }
-    }
-}
-
-void
-Refinement::reclassifySemisharpVertices() {
-
-    typedef Level::VTag::VTagSize VTagSize;
-
-    Sdc::Crease creasing(_options);
-
-    //
-    //  Inspect all vertices derived from edges -- for those whose parent edges were semisharp,
-    //  reset the semisharp tag and the associated Rule according to the sharpness pair for the
-    //  subdivided edges (note this may be better handled when the edge sharpness is computed):
-    //
-    Index vertFromEdgeBegin = getFirstChildVertexFromEdges();
-    Index vertFromEdgeEnd   = vertFromEdgeBegin + getNumChildVerticesFromEdges();
-
-    for (Index cVert = vertFromEdgeBegin; cVert < vertFromEdgeEnd; ++cVert) {
-        Level::VTag& cVertTag = _child->_vertTags[cVert];
-        if (!cVertTag._semiSharpEdges) continue;
-
-        Index pEdge = _childVertexParentIndex[cVert];
-
-        ConstIndexArray cEdges = getEdgeChildEdges(pEdge);
-
-        if (_childVertexTag[cVert]._incomplete) {
-            //  One child edge likely missing -- assume Crease if remaining edge semi-sharp:
-            cVertTag._semiSharpEdges = (IndexIsValid(cEdges[0]) && _child->_edgeTags[cEdges[0]]._semiSharp) ||
-                                       (IndexIsValid(cEdges[1]) && _child->_edgeTags[cEdges[1]]._semiSharp);
-            cVertTag._rule = (VTagSize)(cVertTag._semiSharpEdges ? Sdc::Crease::RULE_CREASE : Sdc::Crease::RULE_SMOOTH);
-        } else {
-            int sharpEdgeCount = _child->_edgeTags[cEdges[0]]._semiSharp + _child->_edgeTags[cEdges[1]]._semiSharp;
-
-            cVertTag._semiSharpEdges = (sharpEdgeCount > 0);
-            cVertTag._rule = (VTagSize)(creasing.DetermineVertexVertexRule(0.0, sharpEdgeCount));
-        }
-    }
-
-    //
-    //  Inspect all vertices derived from vertices -- for those whose parent vertices were
-    //  semisharp (inherited in the child vert's tag), inspect and reset the semisharp tag
-    //  and the associated Rule (based on neighboring child edges around the child vertex).
-    //
-    //  We should never find such a vertex "incomplete" in a sparse refinement as a parent
-    //  vertex is either selected or not, but never neighboring.  So the only complication
-    //  here is whether the local topology of child edges exists -- it may have been pruned
-    //  from the last level to reduce memory.  If so, we use the parent to identify the
-    //  child edges.
-    //
-    //  In both cases, we count the number of sharp and semisharp child edges incident the
-    //  child vertex and adjust the "semisharp" and "rule" tags accordingly.
-    //
-    Index vertFromVertBegin = getFirstChildVertexFromVertices();
-    Index vertFromVertEnd   = vertFromVertBegin + getNumChildVerticesFromVertices();
-
-    for (Index cVert = vertFromVertBegin; cVert < vertFromVertEnd; ++cVert) {
-        Index pVert = _childVertexParentIndex[cVert];
-        Level::VTag const& pVertTag = _parent->_vertTags[pVert];
-
-        //  Skip if parent not semi-sharp:
-        if (!pVertTag._semiSharp && !pVertTag._semiSharpEdges) continue;
-
-        //
-        //  We need to inspect the child neighborhood's sharpness when either semi-sharp
-        //  edges were present around the parent vertex, or the parent vertex sharpness
-        //  decayed:
-        //
-        Level::VTag& cVertTag = _child->_vertTags[cVert];
-
-        bool sharpVertexDecayed = pVertTag._semiSharp && !cVertTag._semiSharp;
-
-        if (pVertTag._semiSharpEdges || sharpVertexDecayed) {
-            int infSharpEdgeCount = 0;
-            int semiSharpEdgeCount = 0;
-
-            bool cVertEdgesPresent = (_child->getNumVertexEdgesTotal() > 0);
-            if (cVertEdgesPresent) {
-                ConstIndexArray cEdges = _child->getVertexEdges(cVert);
-
-                for (int i = 0; i < cEdges.size(); ++i) {
-                    Level::ETag cEdgeTag = _child->_edgeTags[cEdges[i]];
-
-                    infSharpEdgeCount  += cEdgeTag._infSharp;
-                    semiSharpEdgeCount += cEdgeTag._semiSharp;
-                }
-            } else {
-                ConstIndexArray      pEdges      = _parent->getVertexEdges(pVert);
-                ConstLocalIndexArray pVertInEdge = _parent->getVertexEdgeLocalIndices(pVert);
-
-                for (int i = 0; i < pEdges.size(); ++i) {
-                    ConstIndexArray cEdgePair = getEdgeChildEdges(pEdges[i]);
-
-                    Index       cEdge    = cEdgePair[pVertInEdge[i]];
-                    Level::ETag cEdgeTag = _child->_edgeTags[cEdge];
-
-                    infSharpEdgeCount  += cEdgeTag._infSharp;
-                    semiSharpEdgeCount += cEdgeTag._semiSharp;
-                }
-            }
-            cVertTag._semiSharpEdges = (semiSharpEdgeCount > 0);
-
-            if (!cVertTag._semiSharp && !cVertTag._infSharp) {
-                cVertTag._rule = (VTagSize)(creasing.DetermineVertexVertexRule(0.0,
-                                        infSharpEdgeCount + semiSharpEdgeCount));
-            }
-        }
-    }
-}
-
-//
-//  Methods to subdivide face-varying channels:
-//
-void
-Refinement::subdivideFVarChannels() {
-
-    assert(_child->_fvarChannels.size() == 0);
-    assert(this->_fvarChannels.size() == 0);
-
-    int channelCount = _parent->getNumFVarChannels();
-
-    for (int channel = 0; channel < channelCount; ++channel) {
-        FVarLevel* parentFVar = _parent->_fvarChannels[channel];
-
-        FVarLevel*      childFVar  = new FVarLevel(*_child);
-        FVarRefinement* refineFVar = new FVarRefinement(*this, *parentFVar, *childFVar);
-
-        refineFVar->applyRefinement();
-
-        _child->_fvarChannels.push_back(childFVar);
-        this->_fvarChannels.push_back(refineFVar);
-    }
-}
-
-//
-//  Marking of sparse child components -- including those selected and those neighboring...
-//
-//      For schemes requiring neighboring support, this is the equivalent of the "guarantee
-//  neighbors" in Hbr -- it ensures that all components required to define the limit of
-//  those "selected" are also generated in the refinement.
-//
-//  The difference with Hbr is that we do this in a single pass for all components once
-//  "selection" of components of interest has been completed.
-//
-//  Considering two approaches:
-//      1) By Vertex neighborhoods:
-//          - for each base vertex
-//              - for each incident face
-//                  - test and mark components for its child face
-//  or
-//      2) By Edge and Face contents:
-//          - for each base edge
-//              - test and mark local components
-//          - for each base face
-//              - test and mark local components
-//
-//  Given a typical quad mesh with N verts, N faces and 2*N edges, determine which is more
-//  efficient...
-//
-//  Going with (2) initially for simplicity -- certain aspects of (1) are awkward, i.e. the
-//  identification of child-edges to be marked (trivial in (2).  We are also guaranteed with
-//  (2) that we only visit each component once, i.e. each edge and each face.
-//
-//  Revising the above assessment... (2) has gotten WAY more complicated once the ability to
-//  select child faces is provided.  Given that feature is important to Manuel for support
-//  of the FarStencilTables we have to assume it will be needed.  So we'll try (1) out as it
-//  will be simpler to get it correct -- we can work on improving performance later.
-//
-//  Complexity added by child component selection:
-//      - the child vertex of the component can now be selected as part of a child face or
-//  edge, and so the parent face or edge is not fully selected.  So we've had to add another
-//  bit to the marking masks to indicate when a parent component is "fully selected".
-//      - selecting a child face creates the situation where child edges of parent edges do
-//  not have any selected vertex at their ends -- both can be neighboring.  This complicated
-//  the marking of neighboring child edges, which was otherwise trivial -- if any end vertex
-//  of a child edge (of a parent edge) was selected, the child edge was at least neighboring.
-//
-//  Final note on the marking technique:
-//      There are currently two values to the marking of child components, which are no
-//  longer that useful.  It is now sufficient, and not likely to be necessary, to distinguish
-//  between what was selected or added to support it.  Ultimately that will be determined by
-//  inspecting the selected flag on the parent component once the child-to-parent map is in
-//  place.
-//
-namespace {
-    Index const IndexSparseMaskNeighboring = (1 << 0);
-    Index const IndexSparseMaskSelected    = (1 << 1);
-
-    inline void markSparseIndexNeighbor(Index& index) { index = IndexSparseMaskNeighboring; }
-    inline void markSparseIndexSelected(Index& index) { index = IndexSparseMaskSelected; }
-}
-
-void
-Refinement::markSparseChildComponentIndices() {
-
-    //
-    //  There is an explicit ordering here as the work done for vertices is a subset
-    //  of what is required for edges, which in turn is a subset of what is required
-    //  for faces.  This ordering and their related implementations tries to avoid
-    //  doing redundant work and accomplishing everything necessary in a single
-    //  iteration through each component type.
-    //
-    markSparseVertexChildren();
-    markSparseEdgeChildren();
-    markSparseFaceChildren();
-}
-
-
-void
-Refinement::markSparseVertexChildren() {
-
-    assert(_parentVertexTag.size() > 0);
-
-    //
-    //  For each parent vertex:
-    //      - mark the descending child vertex for each selected vertex
-    //
-    for (Index pVert = 0; pVert < parent().getNumVertices(); ++pVert) {
-        if (_parentVertexTag[pVert]._selected) {
-            markSparseIndexSelected(_vertChildVertIndex[pVert]);
-        }
-    }
-}
-
-void
-Refinement::markSparseEdgeChildren() {
-
-    assert(_parentEdgeTag.size() > 0);
-
-    //
-    //  For each parent edge:
-    //      - mark the descending child edges and vertex for each selected edge
-    //      - test each end vertex of unselected edges to see if selected:
-    //          - mark both the child edge and the middle child vertex if so
-    //      - set transitional bit for all edges based on selection of incident faces
-    //
-    //  Note that no edges have been marked "fully selected" -- only their vertices have
-    //  been marked and marking of their child edges deferred to visiting each edge only
-    //  once here.
-    //
-    for (Index pEdge = 0; pEdge < parent().getNumEdges(); ++pEdge) {
-        IndexArray      eChildEdges = getEdgeChildEdges(pEdge);
-        ConstIndexArray eVerts      = parent().getEdgeVertices(pEdge);
-
-        SparseTag& pEdgeTag = _parentEdgeTag[pEdge];
-
-        if (pEdgeTag._selected) {
-            markSparseIndexSelected(eChildEdges[0]);
-            markSparseIndexSelected(eChildEdges[1]);
-            markSparseIndexSelected(_edgeChildVertIndex[pEdge]);
-        } else {
-            if (_parentVertexTag[eVerts[0]]._selected) {
-                markSparseIndexNeighbor(eChildEdges[0]);
-                markSparseIndexNeighbor(_edgeChildVertIndex[pEdge]);
-            }
-            if (_parentVertexTag[eVerts[1]]._selected) {
-                markSparseIndexNeighbor(eChildEdges[1]);
-                markSparseIndexNeighbor(_edgeChildVertIndex[pEdge]);
-            }
-        }
-
-        //
-        //  TAG the parent edges as "transitional" here if only one was selected (or in
-        //  the more general non-manifold case, they are not all selected the same way).
-        //  We use the transitional tags on the edges to TAG the parent face below.
-        //
-        //  Note -- this is best done now rather than as a post-process as we have more
-        //  explicit information about the selected components.  Unless we also tag the
-        //  parent faces as selected, we can't easily tell from the child-faces of the
-        //  edge's incident faces which were generated by selection or neighboring...
-        //
-        ConstIndexArray eFaces = parent().getEdgeFaces(pEdge);
-        if (eFaces.size() == 2) {
-            pEdgeTag._transitional = (_parentFaceTag[eFaces[0]]._selected !=
-                                      _parentFaceTag[eFaces[1]]._selected);
-        } else if (eFaces.size() < 2) {
-            pEdgeTag._transitional = false;
-        } else {
-            bool isFace0Selected = _parentFaceTag[eFaces[0]]._selected;
-
-            pEdgeTag._transitional = false;
-            for (int i = 1; i < eFaces.size(); ++i) {
-                if (_parentFaceTag[eFaces[i]]._selected != isFace0Selected) {
-                    pEdgeTag._transitional = true;
-                    break;
-                }
-            }
-        }
-    }
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/refinement.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/refinement.h
deleted file mode 100644
index a55772af5..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/refinement.h
+++ /dev/null
@@ -1,456 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_REFINEMENT_H
-#define OPENSUBDIV3_VTR_REFINEMENT_H
-
-#include "../version.h"
-
-#include "../sdc/types.h"
-#include "../sdc/options.h"
-#include "../vtr/types.h"
-#include "../vtr/level.h"
-
-#include <vector>
-
-//
-//  Declaration for the main refinement class (Refinement) and its pre-requisites:
-//
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-class FVarRefinement;
-
-//
-//  Refinement:
-//      A refinement is a mapping between two levels -- relating the components in the original
-//  (parent) level to the one refined (child).  The refinement may be complete (uniform) or sparse
-//  (adaptive or otherwise selective), so not all components in the parent level will spawn
-//  components in the child level.
-//
-//  Refinement is an abstract class and expects subclasses corresponding to the different types
-//  of topological splits that the supported subdivision schemes collectively require, i.e. those
-//  listed in Sdc::SplitType.  Note the virtual requirements expected of the subclasses in the list
-//  of protected methods -- they differ mainly in the topology that is created in the child Level
-//  and not the propagation of tags through refinement, subdivision of sharpness values or the
-//  treatment of face-varying data.  The primary subclasses are QuadRefinement and TriRefinement.
-//
-//  At a high level, all that is necessary in terms of interface is to construct, initialize
-//  (linking the two levels), optionally select components for sparse refinement (via use of the
-//  SparseSelector) and call the refine() method.  This usage is expected of Far::TopologyRefiner.
-//
-//  Since we really want this class to be restricted from public access eventually, all methods
-//  begin with lower case (as is the convention for protected methods) and the list of friends
-//  will be maintained more strictly.
-//
-class Refinement {
-
-public:
-    Refinement(Level const & parent, Level & child, Sdc::Options const& schemeOptions);
-    virtual ~Refinement();
-
-    Level const& parent() const { return *_parent; }
-    Level const& child() const  { return *_child; }
-    Level&       child()        { return *_child; }
-
-    Sdc::Split getSplitType() const { return _splitType; }
-    int getRegularFaceSize() const { return _regFaceSize; }
-    Sdc::Options getOptions() const { return _options; }
-
-    //  Face-varying:
-    int getNumFVarChannels() const { return (int) _fvarChannels.size(); }
-
-    FVarRefinement const & getFVarRefinement(int c) const { return *_fvarChannels[c]; }
-
-    //
-    //  Options associated with the actual refinement operation, which may end up
-    //  quite involved if we want to allow for the refinement of data that is not
-    //  of interest to be suppressed.  For now we have:
-    //
-    //      "sparse": the alternative to uniform refinement, which requires that
-    //          components be previously selected/marked to be included.
-    //
-    //      "minimal topology": this is one that may get broken down into a finer
-    //          set of options.  It suppresses "full topology" in the child level
-    //          and only generates what is minimally necessary for interpolation --
-    //          which requires at least the face-vertices for faces, but also the
-    //          vertex-faces for any face-varying channels present.  So it will
-    //          generate one or two of the six possible topological relations.
-    //
-    //  These are strictly controlled right now, e.g. for sparse refinement, we
-    //  currently enforce full topology at the finest level to allow for subsequent
-    //  patch construction.
-    //
-    struct Options {
-        Options() : _sparse(false),
-                    _faceVertsFirst(false),
-                    _minimalTopology(false)
-                    { }
-
-        unsigned int _sparse          : 1;
-        unsigned int _faceVertsFirst  : 1;
-        unsigned int _minimalTopology : 1;
-
-        //  Still under consideration:
-        //unsigned int _childToParentMap : 1;
-    };
-
-    void refine(Options options = Options());
-
-    bool hasFaceVerticesFirst() const { return _faceVertsFirst; }
-
-public:
-    //
-    //  Access to members -- some testing classes (involving vertex interpolation)
-    //  currently make use of these:
-    //
-    int getNumChildFacesFromFaces() const       { return _childFaceFromFaceCount; }
-    int getNumChildEdgesFromFaces() const       { return _childEdgeFromFaceCount; }
-    int getNumChildEdgesFromEdges() const       { return _childEdgeFromEdgeCount; }
-    int getNumChildVerticesFromFaces() const    { return _childVertFromFaceCount; }
-    int getNumChildVerticesFromEdges() const    { return _childVertFromEdgeCount; }
-    int getNumChildVerticesFromVertices() const { return _childVertFromVertCount; }
-
-    Index getFirstChildFaceFromFaces() const      { return _firstChildFaceFromFace; }
-    Index getFirstChildEdgeFromFaces() const      { return _firstChildEdgeFromFace; }
-    Index getFirstChildEdgeFromEdges() const      { return _firstChildEdgeFromEdge; }
-    Index getFirstChildVertexFromFaces() const    { return _firstChildVertFromFace; }
-    Index getFirstChildVertexFromEdges() const    { return _firstChildVertFromEdge; }
-    Index getFirstChildVertexFromVertices() const { return _firstChildVertFromVert; }
-
-    Index getFaceChildVertex(Index f) const   { return _faceChildVertIndex[f]; }
-    Index getEdgeChildVertex(Index e) const   { return _edgeChildVertIndex[e]; }
-    Index getVertexChildVertex(Index v) const { return _vertChildVertIndex[v]; }
-
-    ConstIndexArray  getFaceChildFaces(Index parentFace) const;
-    ConstIndexArray  getFaceChildEdges(Index parentFace) const;
-    ConstIndexArray  getEdgeChildEdges(Index parentEdge) const;
-
-    //  Child-to-parent relationships
-    bool isChildVertexComplete(Index v) const       { return ! _childVertexTag[v]._incomplete; }
-
-    Index getChildFaceParentFace(Index f) const     { return _childFaceParentIndex[f]; }
-    int   getChildFaceInParentFace(Index f) const   { return _childFaceTag[f]._indexInParent; }
-
-    Index getChildEdgeParentIndex(Index e) const    { return _childEdgeParentIndex[e]; }
-
-    Index getChildVertexParentIndex(Index v) const  { return _childVertexParentIndex[v]; }
-
-//
-//  Modifiers intended for internal/protected use:
-//
-public:
-
-    IndexArray getFaceChildFaces(Index parentFace);
-    IndexArray getFaceChildEdges(Index parentFace);
-    IndexArray getEdgeChildEdges(Index parentEdge);
-
-public:
-    //
-    //  Tags have now been added per-component in Level, but there is additional need to tag
-    //  components within Refinement -- we can't tag the parent level components for any
-    //  refinement (in order to keep it const) and tags associated with children that are
-    //  specific to the child-to-parent mapping may not be warranted in the child level.
-    //
-    //  Parent tags are only required for sparse refinement.  The main property to tag is
-    //  whether a component was selected, and so a single SparseTag is used for all three
-    //  component types.  Tagging if a component is "transitional" is also useful.  This may
-    //  only be necessary for edges but is currently packed into a mask per-edge for faces,
-    //  which could be deferred, in which case "transitional" could be a single bit.
-    //
-    //  Child tags are part of the child-to-parent mapping, which consists of the parent
-    //  component index for each child component, plus a tag for the child indicating more
-    //  about its relationship to its parent, e.g. is it completely defined, what the parent
-    //  component type is, what is the index of the child within its parent, etc.
-    //
-    struct SparseTag {
-        SparseTag() : _selected(0), _transitional(0) { }
-
-        unsigned char _selected     : 1;  // component specifically selected for refinement
-        unsigned char _transitional : 4;  // adjacent to a refined component (4-bits for face)
-    };
-
-    struct ChildTag {
-        ChildTag() { }
-
-        unsigned char _incomplete    : 1;  // incomplete neighborhood to represent limit of parent
-        unsigned char _parentType    : 2;  // type of parent component:  vertex, edge or face
-        unsigned char _indexInParent : 2;  // index of child wrt parent:  0-3, or iterative if N > 4
-    };
-
-    //  Methods to access and modify tags:
-    SparseTag const & getParentFaceSparseTag(  Index f) const { return _parentFaceTag[f]; }
-    SparseTag const & getParentEdgeSparseTag(  Index e) const { return _parentEdgeTag[e]; }
-    SparseTag const & getParentVertexSparseTag(Index v) const { return _parentVertexTag[v]; }
-
-    SparseTag & getParentFaceSparseTag(  Index f) { return _parentFaceTag[f]; }
-    SparseTag & getParentEdgeSparseTag(  Index e) { return _parentEdgeTag[e]; }
-    SparseTag & getParentVertexSparseTag(Index v) { return _parentVertexTag[v]; }
-
-    ChildTag const & getChildFaceTag(  Index f) const { return _childFaceTag[f]; }
-    ChildTag const & getChildEdgeTag(  Index e) const { return _childEdgeTag[e]; }
-    ChildTag const & getChildVertexTag(Index v) const { return _childVertexTag[v]; }
-
-    ChildTag & getChildFaceTag(  Index f) { return _childFaceTag[f]; }
-    ChildTag & getChildEdgeTag(  Index e) { return _childEdgeTag[e]; }
-    ChildTag & getChildVertexTag(Index v) { return _childVertexTag[v]; }
-
-//  Remaining methods should really be protected -- for use by subclasses...
-public:
-    //
-    //  Methods involved in constructing the parent-to-child mapping -- when the
-    //  refinement is sparse, additional methods are needed to identify the selection:
-    //
-    void populateParentToChildMapping();
-    void populateParentChildIndices();
-    void printParentToChildMapping() const;
-
-    virtual void allocateParentChildIndices() = 0;
-
-    //  Supporting method for sparse refinement:
-    void initializeSparseSelectionTags();
-    void markSparseChildComponentIndices();
-    void markSparseVertexChildren();
-    void markSparseEdgeChildren();
-
-    virtual void markSparseFaceChildren() = 0;
-
-    void initializeChildComponentCounts();
-
-    //
-    //  Methods involved in constructing the child-to-parent mapping:
-    //
-    void populateChildToParentMapping();
-
-    void populateFaceParentVectors(ChildTag const initialChildTags[2][4]);
-    void populateFaceParentFromParentFaces(ChildTag const initialChildTags[2][4]);
-
-    void populateEdgeParentVectors(ChildTag const initialChildTags[2][4]);
-    void populateEdgeParentFromParentFaces(ChildTag const initialChildTags[2][4]);
-    void populateEdgeParentFromParentEdges(ChildTag const initialChildTags[2][4]);
-
-    void populateVertexParentVectors(ChildTag const initialChildTags[2][4]);
-    void populateVertexParentFromParentFaces(ChildTag const initialChildTags[2][4]);
-    void populateVertexParentFromParentEdges(ChildTag const initialChildTags[2][4]);
-    void populateVertexParentFromParentVertices(ChildTag const initialChildTags[2][4]);
-
-    //
-    //  Methods involved in propagating component tags from parent to child:
-    //
-    void propagateComponentTags();
-
-    void populateFaceTagVectors();
-    void populateFaceTagsFromParentFaces();
-
-    void populateEdgeTagVectors();
-    void populateEdgeTagsFromParentFaces();
-    void populateEdgeTagsFromParentEdges();
-
-    void populateVertexTagVectors();
-    void populateVertexTagsFromParentFaces();
-    void populateVertexTagsFromParentEdges();
-    void populateVertexTagsFromParentVertices();
-
-    //
-    //  Methods (and types) involved in subdividing the topology -- though not
-    //  fully exploited, any subset of the 6 relations can be generated:
-    //
-    struct Relations {
-        unsigned int   _faceVertices : 1;
-        unsigned int   _faceEdges    : 1;
-        unsigned int   _edgeVertices : 1;
-        unsigned int   _edgeFaces    : 1;
-        unsigned int   _vertexFaces  : 1;
-        unsigned int   _vertexEdges  : 1;
-
-        void setAll(bool enable) {
-            _faceVertices = enable;
-            _faceEdges    = enable;
-            _edgeVertices = enable;
-            _edgeFaces    = enable;
-            _vertexFaces  = enable;
-            _vertexEdges  = enable;
-        }
-    };
-
-    void subdivideTopology(Relations const& relationsToSubdivide);
-
-    virtual void populateFaceVertexRelation() = 0;
-    virtual void populateFaceEdgeRelation() = 0;
-    virtual void populateEdgeVertexRelation() = 0;
-    virtual void populateEdgeFaceRelation() = 0;
-    virtual void populateVertexFaceRelation() = 0;
-    virtual void populateVertexEdgeRelation() = 0;
-
-    //
-    //  Methods involved in subdividing and inspecting sharpness values:
-    //
-    void subdivideSharpnessValues();
-
-    void subdivideVertexSharpness();
-    void subdivideEdgeSharpness();
-    void reclassifySemisharpVertices();
-
-    //
-    //  Methods involved in subdividing face-varying topology:
-    //
-    void subdivideFVarChannels();
-
-protected:
-    // A debug method of Level prints a Refinement (should really change this)
-    friend void Level::print(const Refinement *) const;
-
-    //
-    //  Data members -- the logical grouping of some of these (and methods that make use
-    //  of them) may lead to grouping them into a few utility classes or structs...
-    //
-
-    //  Defined on construction:
-    Level const * _parent;
-    Level *       _child;
-    Sdc::Options  _options;
-
-    //  Defined by the subclass:
-    Sdc::Split _splitType;
-    int        _regFaceSize;
-
-    //  Determined by the refinement options:
-    bool _uniform;
-    bool _faceVertsFirst;
-
-    //
-    //  Inventory and ordering of the types of child components:
-    //
-    int _childFaceFromFaceCount;  // arguably redundant (all faces originate from faces)
-    int _childEdgeFromFaceCount;
-    int _childEdgeFromEdgeCount;
-    int _childVertFromFaceCount;
-    int _childVertFromEdgeCount;
-    int _childVertFromVertCount;
-
-    int _firstChildFaceFromFace;  // arguably redundant (all faces originate from faces)
-    int _firstChildEdgeFromFace;
-    int _firstChildEdgeFromEdge;
-    int _firstChildVertFromFace;
-    int _firstChildVertFromEdge;
-    int _firstChildVertFromVert;
-
-    //
-    //  The parent-to-child mapping:
-    //      These are vectors sized according to the number of parent components (and
-    //  their topology) that contain references/indices to the child components that
-    //  result from them by refinement.  When refinement is sparse, parent components
-    //  that have not spawned all child components will have their missing children
-    //  marked as invalid.
-    //
-    //  NOTE the "Array" members here.  Often vectors within the Level can be shared
-    //  with the Refinement, and an Array instance is used to do so.  If not shared
-    //  the subclass just initializes the Array members after allocating its own local
-    //  vector members.
-    //
-    IndexArray _faceChildFaceCountsAndOffsets;
-    IndexArray _faceChildEdgeCountsAndOffsets;
-
-    IndexVector _faceChildFaceIndices;  // *cannot* always use face-vert counts/offsets
-    IndexVector _faceChildEdgeIndices;  // can use face-vert counts/offsets
-    IndexVector _faceChildVertIndex;
-
-    IndexVector _edgeChildEdgeIndices;  // trivial/corresponding pair for each
-    IndexVector _edgeChildVertIndex;
-
-    IndexVector _vertChildVertIndex;
-
-    //
-    //  The child-to-parent mapping:
-    //
-    IndexVector _childFaceParentIndex;
-    IndexVector _childEdgeParentIndex;
-    IndexVector _childVertexParentIndex;
-
-    std::vector<ChildTag> _childFaceTag;
-    std::vector<ChildTag> _childEdgeTag;
-    std::vector<ChildTag> _childVertexTag;
-
-    //
-    //  Tags for sparse selection of components:
-    //
-    std::vector<SparseTag> _parentFaceTag;
-    std::vector<SparseTag> _parentEdgeTag;
-    std::vector<SparseTag> _parentVertexTag;
-
-    //
-    //  Refinement data for face-varying channels present in the Levels being refined:
-    //
-    std::vector<FVarRefinement*> _fvarChannels;
-};
-
-inline ConstIndexArray
-Refinement::getFaceChildFaces(Index parentFace) const {
-
-    return ConstIndexArray(&_faceChildFaceIndices[_faceChildFaceCountsAndOffsets[2*parentFace+1]],
-                                             _faceChildFaceCountsAndOffsets[2*parentFace]);
-}
-
-inline IndexArray
-Refinement::getFaceChildFaces(Index parentFace) {
-
-    return IndexArray(&_faceChildFaceIndices[_faceChildFaceCountsAndOffsets[2*parentFace+1]],
-                                             _faceChildFaceCountsAndOffsets[2*parentFace]);
-}
-
-inline ConstIndexArray
-Refinement::getFaceChildEdges(Index parentFace) const {
-
-    return ConstIndexArray(&_faceChildEdgeIndices[_faceChildEdgeCountsAndOffsets[2*parentFace+1]],
-                                             _faceChildEdgeCountsAndOffsets[2*parentFace]);
-}
-inline IndexArray
-Refinement::getFaceChildEdges(Index parentFace) {
-
-    return IndexArray(&_faceChildEdgeIndices[_faceChildEdgeCountsAndOffsets[2*parentFace+1]],
-                                             _faceChildEdgeCountsAndOffsets[2*parentFace]);
-}
-
-inline ConstIndexArray
-Refinement::getEdgeChildEdges(Index parentEdge) const {
-
-    return ConstIndexArray(&_edgeChildEdgeIndices[parentEdge*2], 2);
-}
-
-inline IndexArray
-Refinement::getEdgeChildEdges(Index parentEdge) {
-
-    return IndexArray(&_edgeChildEdgeIndices[parentEdge*2], 2);
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_REFINEMENT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/sparseSelector.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/sparseSelector.cpp
deleted file mode 100644
index d0c153b11..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/sparseSelector.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../vtr/sparseSelector.h"
-#include "../vtr/level.h"
-#include "../vtr/refinement.h"
-
-#include <cassert>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  Component selection methods:
-//      Marking of selection is retained in the SparseTags of the Refinement.  The
-//  selection simply marks the parent components -- not any child components that may
-//  be derived from them.  That is done later when we need to additionally identify
-//  all of the "neighboring" child components that must exist at the next subdivision
-//  level in order to fully define supported further refinement of selected components.
-//
-inline void
-SparseSelector::initializeSelection() {
-
-    if (!_selected) {
-        _refine->initializeSparseSelectionTags();
-        _selected = true;
-    }
-}
-
-void
-SparseSelector::selectVertex(Index parentVertex) {
-
-    initializeSelection();
-
-    //  Don't bother to test-and-set here, just set
-    markVertexSelected(parentVertex);
-}
-
-void
-SparseSelector::selectEdge(Index parentEdge) {
-
-    initializeSelection();
-
-    if (!wasEdgeSelected(parentEdge)) {
-        markEdgeSelected(parentEdge);
-
-        //  Mark the two end vertices:
-        ConstIndexArray eVerts = _refine->parent().getEdgeVertices(parentEdge);
-        markVertexSelected(eVerts[0]);
-        markVertexSelected(eVerts[1]);
-    }
-}
-
-void
-SparseSelector::selectFace(Index parentFace) {
-
-    initializeSelection();
-
-    if (!wasFaceSelected(parentFace)) {
-        markFaceSelected(parentFace);
-
-        //  Mark the face's incident verts and edges as selected:
-        ConstIndexArray fEdges = _refine->parent().getFaceEdges(parentFace),
-                        fVerts = _refine->parent().getFaceVertices(parentFace);
-
-        for (int i = 0; i < fVerts.size(); ++i) {
-            markEdgeSelected(fEdges[i]);
-            markVertexSelected(fVerts[i]);
-        }
-    }
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/sparseSelector.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/sparseSelector.h
deleted file mode 100644
index 6dc4a9075..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/sparseSelector.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_SPARSE_SELECTOR_H
-#define OPENSUBDIV3_VTR_SPARSE_SELECTOR_H
-
-#include "../version.h"
-
-#include "../vtr/types.h"
-#include "../vtr/refinement.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  SparseSelector:
-//      Class supporting "selection" of components in a Level for sparse Refinement.
-//  The term "selection" here implies interest in the limit for that component, i.e.
-//  the limit point for a selected vertex, the limit patch for a face, etc.  So this
-//  class is responsible for ensuring that all neighboring components required to
-//  support the limit of those selected are included in the refinement.
-//
-//  This class is associated with (and constructed given) a Refinement and its role
-//  is to initialize that Refinement instance for eventual sparse refinement.  So it
-//  is a friend of and expected to modify the Refinement as part of the selection.
-//  Given its simplicity and scope it may be worth nesting it in Vtr::Refinement.
-//
-//  While all three component types -- vertices, edges and faces -- can be selected,
-//  only selection of faces is currently used and actively supported as part of the
-//  feature-adaptive refinement.
-//
-class SparseSelector {
-
-public:
-    SparseSelector(Refinement& refine) : _refine(&refine), _selected(false) { }
-    ~SparseSelector() { }
-
-    void        setRefinement(Refinement& refine) { _refine = &refine; }
-    Refinement& getRefinement() const             { return *_refine; }
-
-    bool isSelectionEmpty() const { return !_selected; }
-
-    //
-    //  Methods for selecting (and marking) components for refinement.  All component indices
-    //  refer to components in the parent:
-    //
-    void selectVertex(Index pVertex);
-    void selectEdge(  Index pEdge);
-    void selectFace(  Index pFace);
-
-private:
-    SparseSelector() : _refine(0), _selected(false) { }
-
-    bool wasVertexSelected(Index pVertex) const { return _refine->getParentVertexSparseTag(pVertex)._selected; }
-    bool wasEdgeSelected(  Index pEdge) const   { return _refine->getParentEdgeSparseTag(pEdge)._selected; }
-    bool wasFaceSelected(  Index pFace) const   { return _refine->getParentFaceSparseTag(pFace)._selected; }
-
-    void markVertexSelected(Index pVertex) const { _refine->getParentVertexSparseTag(pVertex)._selected = true; }
-    void markEdgeSelected(  Index pEdge) const   { _refine->getParentEdgeSparseTag(pEdge)._selected = true; }
-    void markFaceSelected(  Index pFace) const   { _refine->getParentFaceSparseTag(pFace)._selected = true; }
-
-    void initializeSelection();
-
-private:
-    Refinement* _refine;
-    bool        _selected;
-};
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_SPARSE_SELECTOR_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/stackBuffer.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/stackBuffer.h
deleted file mode 100644
index 22117d413..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/stackBuffer.h
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-//   Copyright 2015 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_STACK_BUFFER_H
-#define OPENSUBDIV3_VTR_STACK_BUFFER_H
-
-#include "../version.h"
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  The StackBuffer class is intended solely to take the place of VLAs (Variable
-//  Length Arrays) which most compilers support, but are not strictly standard C++.
-//  Portability concerns forces us to make use of either alloca() or some other
-//  mechanism to create small arrays on the stack that are typically based on the
-//  valence of a vertex -- small in general, but occasionally large.
-//
-//  Note also that since the intent of this is to replace VLAs -- not general
-//  std::vectors -- support for std::vector functionality is intentionally limited
-//  and STL-like naming is avoided.  Like a VLA there is no incremental growth.
-//  Support for resizing is available to reuse an instance at the beginning of a
-//  loop with a new size, but resizing in this case reinitializes all elements.
-//
-
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE = false>
-class StackBuffer
-{
-public:
-    typedef unsigned int size_type;
-
-public:
-    //  Constructors and destructor -- declared inline below:
-    StackBuffer();
-    StackBuffer(size_type size);
-    ~StackBuffer();
-
-public:
-    //  Note the reliance on implicit casting so that it can be used similar to
-    //  a VLA.  This removes the need for operator[] as the resulting TYPE* will
-    //  natively support [].  (The presence of both TYPE* and operator[] also
-    //  causes an ambiguous overloading error with 32-bit MSVC builds.)
-
-    operator TYPE const * () const { return _data; }
-    operator TYPE *       ()       { return _data; }
-
-    size_type GetSize() const { return _size; }
-
-    void SetSize(size_type size);
-    void Reserve(size_type capacity);
-
-private:
-    //  Non-copyable:
-    StackBuffer(const StackBuffer<TYPE,SIZE,POD_TYPE> &) { }
-    StackBuffer& operator=(const StackBuffer<TYPE,SIZE,POD_TYPE> &) { return *this; }
-
-    void allocate(size_type capacity);
-    void deallocate();
-    void construct();
-    void destruct();
-
-private:
-    TYPE *     _data;
-    size_type  _size;
-    size_type  _capacity;
-
-    //  Is alignment an issue here?  The staticData arena will at least be double-word
-    //  aligned within this struct, which meets current and most anticipated needs.
-    char   _staticData[SIZE * sizeof(TYPE)];
-    char * _dynamicData;
-};
-
-
-//
-//  Core allocation/deallocation methods:
-//
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE>
-inline void
-StackBuffer<TYPE,SIZE,POD_TYPE>::allocate(size_type capacity) {
-
-    //  Again, is alignment an issue here?  C++ spec says new will return pointer
-    //  "suitably aligned" for conversion to pointers of other types, which implies
-    //  at least an alignment of 16.
-    _dynamicData = static_cast<char*>(::operator new(capacity * sizeof(TYPE)));
-
-    _data = reinterpret_cast<TYPE*>(_dynamicData);
-    _capacity = capacity;
-}
-
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE>
-inline void
-StackBuffer<TYPE,SIZE,POD_TYPE>::deallocate() {
-
-    ::operator delete(_dynamicData);
-
-    _data = reinterpret_cast<TYPE*>(_staticData);
-    _capacity = SIZE;
-}
-
-//
-//  Explicit element-wise construction and destruction within allocated memory.
-//  Compilers do not always optimize out the iteration here even when there is
-//  no construction or destruction, so the POD_TYPE arguement can be used to
-//  force this when/if it becomes an issue (and it has been in some cases).
-//
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE>
-inline void
-StackBuffer<TYPE,SIZE,POD_TYPE>::construct() {
-
-    for (size_type i = 0; i < _size; ++i) {
-        (void) new (&_data[i]) TYPE;
-    }
-}
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE>
-inline void
-StackBuffer<TYPE,SIZE,POD_TYPE>::destruct() {
-
-    for (size_type i = 0; i < _size; ++i) {
-        _data[i].~TYPE();
-    }
-}
-
-//
-//  Inline constructors and destructor:
-//
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE>
-inline
-StackBuffer<TYPE,SIZE,POD_TYPE>::StackBuffer() :
-    _data(reinterpret_cast<TYPE*>(_staticData)),
-    _size(0),
-    _capacity(SIZE),
-    _dynamicData(0) {
-
-}
-
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE>
-inline
-StackBuffer<TYPE,SIZE,POD_TYPE>::StackBuffer(size_type size) :
-    _data(reinterpret_cast<TYPE*>(_staticData)),
-    _size(size),
-    _capacity(SIZE),
-    _dynamicData(0) {
-
-    if (size > SIZE) {
-        allocate(size);
-    }
-    if (!POD_TYPE) {
-        construct();
-    }
-}
-
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE>
-inline
-StackBuffer<TYPE,SIZE,POD_TYPE>::~StackBuffer() {
-
-    if (!POD_TYPE) {
-        destruct();
-    }
-    deallocate();
-}
-
-//
-//  Inline sizing methods:
-//
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE>
-inline void
-StackBuffer<TYPE,SIZE,POD_TYPE>::Reserve(size_type capacity) {
-
-    if (capacity > _capacity) {
-        if (!POD_TYPE) {
-            destruct();
-        }
-        deallocate();
-        allocate(capacity);
-    }
-}
-
-template <typename TYPE, unsigned int SIZE, bool POD_TYPE>
-inline void
-StackBuffer<TYPE,SIZE,POD_TYPE>::SetSize(size_type size)
-{
-    if (!POD_TYPE) {
-        destruct();
-    }
-    if (size == 0) {
-        deallocate();
-    } else if (size > _capacity) {
-        deallocate();
-        allocate(size);
-    }
-    _size = size;
-    if (!POD_TYPE) {
-        construct();
-    }
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_STACK_BUFFER_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/triRefinement.cpp b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/triRefinement.cpp
deleted file mode 100644
index dfcf69e86..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/triRefinement.cpp
+++ /dev/null
@@ -1,930 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#include "../sdc/crease.h"
-#include "../vtr/types.h"
-#include "../vtr/level.h"
-#include "../vtr/triRefinement.h"
-
-#include <cassert>
-#include <cstdio>
-#include <utility>
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  Simple constructor, destructor and basic initializers:
-//
-TriRefinement::TriRefinement(Level const & parentArg, Level & childArg, Sdc::Options const & optionsArg) :
-    Refinement(parentArg, childArg, optionsArg) {
-
-    _splitType   = Sdc::SPLIT_TO_TRIS;
-    _regFaceSize = 3;
-}
-
-TriRefinement::~TriRefinement() {
-}
-
-
-//
-//  Methods to construct the parent-to-child mapping
-//
-void
-TriRefinement::allocateParentChildIndices() {
-
-    //
-    //  Initialize the vectors of indices mapping parent components to those child components
-    //  that will originate from each.
-    //
-    //
-    //  Beware these child-counts when Loop subdivision supports N-sided faces in the cage
-    //      - there will 2*(N-2) additional face-child-faces for each N-sided face
-    //      - there will 2*(N-2)+1 additional face-child-edges for each N-sided face
-    //      - there will 1 face-child-vertex for each N-sided face
-    //  Can consider these reasonable estimates and grow as needed later -- but be clear
-    //  about it if so.
-    //
-    int faceChildFaceCount = _parent->getNumFaces() * 4;
-    int faceChildEdgeCount = (int) _parent->_faceEdgeIndices.size();
-    int edgeChildEdgeCount = (int) _parent->_edgeVertIndices.size();
-
-    int faceChildVertCount = 0;
-    int edgeChildVertCount = _parent->getNumEdges();
-    int vertChildVertCount = _parent->getNumVertices();
-
-    //
-    //  First initialize the count/offset vectors for the child-faces and child-edges of
-    //  parent faces.  For now we can use the parent's face-vert counts for the child-edges
-    //  of faces, but we must use a local vector for the child-faces.
-    //
-    //  This will be more necessary (and need adjustment) when N-sided faces are supported.
-    //
-    _localFaceChildFaceCountsAndOffsets.resize(_parent->getNumFaces() * 2, 4);
-    for (int i = 0; i < _parent->getNumFaces(); ++i) {
-        _localFaceChildFaceCountsAndOffsets[i*2 + 1] = 4 * i;
-    }
-
-    _faceChildFaceCountsAndOffsets = IndexArray(&_localFaceChildFaceCountsAndOffsets[0],
-                                                (int)_localFaceChildFaceCountsAndOffsets.size());
-    _faceChildEdgeCountsAndOffsets = _parent->shareFaceVertCountsAndOffsets();
-
-    //
-    //  Given we will be ignoring initial values with uniform refinement and assigning all
-    //  directly, initializing here is a waste...
-    //
-    Index initValue = 0;
-
-    _faceChildFaceIndices.resize(faceChildFaceCount, initValue);
-    _faceChildEdgeIndices.resize(faceChildEdgeCount, initValue);
-    _edgeChildEdgeIndices.resize(edgeChildEdgeCount, initValue);
-
-    _faceChildVertIndex.resize(faceChildVertCount, initValue);
-    _edgeChildVertIndex.resize(edgeChildVertCount, initValue);
-    _vertChildVertIndex.resize(vertChildVertCount, initValue);
-}
-
-
-//
-//  Methods to populate the face-vertex relation of the child Level:
-//      - child faces only originate from parent faces
-//
-void
-TriRefinement::populateFaceVertexRelation() {
-
-    //  Both face-vertex and face-edge share the face-vertex counts/offsets within a
-    //  Level, so be sure not to re-initialize it if already done:
-    //
-    if (_child->_faceVertCountsAndOffsets.size() == 0) {
-        populateFaceVertexCountsAndOffsets();
-    }
-    _child->_faceVertIndices.resize(_child->getNumFaces() * 3);
-
-    populateFaceVerticesFromParentFaces();
-}
-
-void
-TriRefinement::populateFaceVertexCountsAndOffsets() {
-
-    _child->_faceVertCountsAndOffsets.resize(_child->getNumFaces() * 2, 3);
-
-    for (int i = 0; i < _child->getNumFaces(); ++i) {
-        _child->_faceVertCountsAndOffsets[i*2 + 1] = i * 3;
-    }
-}
-
-void
-TriRefinement::populateFaceVerticesFromParentFaces() {
-
-   for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        ConstIndexArray pFaceVerts = _parent->getFaceVertices(pFace),
-                        pFaceEdges = _parent->getFaceEdges(pFace),
-                        pFaceChildren = getFaceChildFaces(pFace);
-
-        assert(pFaceVerts.size() == 3);
-        assert(pFaceChildren.size() == 4);
-
-        Index cVertsOfPEdges[3];
-        cVertsOfPEdges[0] = _edgeChildVertIndex[pFaceEdges[0]];
-        cVertsOfPEdges[1] = _edgeChildVertIndex[pFaceEdges[1]];
-        cVertsOfPEdges[2] = _edgeChildVertIndex[pFaceEdges[2]];
-
-        //
-        //  For the child face at vertex I (where I is 0..2), the child vertex
-        //  of vertex I becomes the I'th vertex of its child face.  This matches
-        //  the pattern for quads of irregular faces for Catmark.
-        //
-        //  The orientation for the 4th "interior" face is unclear -- it begins
-        //  with the child vertex of the 2nd edge of the triangle.  According
-        //  to the notes with the Hbr implementation "the ordering of vertices
-        //  here is done to preserve parametric space as best we can."
-        //
-        if (IndexIsValid(pFaceChildren[0])) {
-            IndexArray cFaceVerts = _child->getFaceVertices(pFaceChildren[0]);
-
-            cFaceVerts[0] = _vertChildVertIndex[pFaceVerts[0]];
-            cFaceVerts[1] = cVertsOfPEdges[0];
-            cFaceVerts[2] = cVertsOfPEdges[2];
-        }
-        if (IndexIsValid(pFaceChildren[1])) {
-            IndexArray cFaceVerts = _child->getFaceVertices(pFaceChildren[1]);
-
-            cFaceVerts[0] = cVertsOfPEdges[0];
-            cFaceVerts[1] = _vertChildVertIndex[pFaceVerts[1]];
-            cFaceVerts[2] = cVertsOfPEdges[1];
-        }
-        if (IndexIsValid(pFaceChildren[2])) {
-            IndexArray cFaceVerts = _child->getFaceVertices(pFaceChildren[2]);
-
-            cFaceVerts[0] = cVertsOfPEdges[2];
-            cFaceVerts[1] = cVertsOfPEdges[1];
-            cFaceVerts[2] = _vertChildVertIndex[pFaceVerts[2]];
-        }
-        if (IndexIsValid(pFaceChildren[3])) {
-            IndexArray cFaceVerts = _child->getFaceVertices(pFaceChildren[3]);
-
-            cFaceVerts[0] = cVertsOfPEdges[1];
-            cFaceVerts[1] = cVertsOfPEdges[2];
-            cFaceVerts[2] = cVertsOfPEdges[0];
-        }
-    }
-}
-
-
-//
-//  Methods to populate the face-vertex relation of the child Level:
-//      - child faces only originate from parent faces
-//
-void
-TriRefinement::populateFaceEdgeRelation() {
-
-    //  Both face-vertex and face-edge share the face-vertex counts/offsets, so be sure
-    //  not to re-initialize it if already done:
-    //
-    if (_child->_faceVertCountsAndOffsets.size() == 0) {
-        populateFaceVertexCountsAndOffsets();
-    }
-    _child->_faceEdgeIndices.resize(_child->getNumFaces() * 3);
-
-    populateFaceEdgesFromParentFaces();
-}
-
-void
-TriRefinement::populateFaceEdgesFromParentFaces() {
-
-    for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        ConstIndexArray pFaceVerts = _parent->getFaceVertices(pFace),
-                        pFaceEdges = _parent->getFaceEdges(pFace),
-                        pFaceChildFaces = getFaceChildFaces(pFace),
-                        pFaceChildEdges = getFaceChildEdges(pFace);
-
-        assert(pFaceChildFaces.size() == 4);
-        assert(pFaceChildEdges.size() == 3);
-
-        Index pEdgeChildEdges[3][2];
-        for (int i = 0; i < 3; ++i) {
-            Index            pEdge  = pFaceEdges[i];
-            ConstIndexArray cEdges = getEdgeChildEdges(pEdge);
-
-            ConstIndexArray pEdgeVerts = _parent->getEdgeVertices(pEdge);
-
-            //  Be careful to consider degenerate edge when orienting here:
-            bool edgeReversedWrtFace = (pEdgeVerts[0] != pEdgeVerts[1]) &&
-                                       (pFaceVerts[i] != pEdgeVerts[0]);
-
-            pEdgeChildEdges[i][0] = cEdges[edgeReversedWrtFace];
-            pEdgeChildEdges[i][1] = cEdges[!edgeReversedWrtFace];
-        }
-
-        if (IndexIsValid(pFaceChildFaces[0])) {
-            IndexArray cFaceEdges = _child->getFaceEdges(pFaceChildFaces[0]);
-
-            cFaceEdges[0] = pEdgeChildEdges[0][0];
-            cFaceEdges[1] = pFaceChildEdges[0];
-            cFaceEdges[2] = pEdgeChildEdges[2][1];
-        }
-        if (IndexIsValid(pFaceChildFaces[1])) {
-            IndexArray cFaceEdges = _child->getFaceEdges(pFaceChildFaces[1]);
-
-            cFaceEdges[0] = pEdgeChildEdges[0][1];
-            cFaceEdges[1] = pEdgeChildEdges[1][0];
-            cFaceEdges[2] = pFaceChildEdges[1];
-        }
-        if (IndexIsValid(pFaceChildFaces[2])) {
-            IndexArray cFaceEdges = _child->getFaceEdges(pFaceChildFaces[2]);
-
-            cFaceEdges[0] = pFaceChildEdges[2];
-            cFaceEdges[1] = pEdgeChildEdges[1][1];
-            cFaceEdges[2] = pEdgeChildEdges[2][0];
-        }
-        if (IndexIsValid(pFaceChildFaces[3])) {
-            IndexArray cFaceEdges = _child->getFaceEdges(pFaceChildFaces[3]);
-
-            cFaceEdges[0] = pFaceChildEdges[2];
-            cFaceEdges[1] = pFaceChildEdges[0];
-            cFaceEdges[2] = pFaceChildEdges[1];
-        }
-    }
-}
-
-
-//
-//  Methods to populate the edge-vertex relation of the child Level:
-//      - child edges originate from parent faces and edges
-//
-void
-TriRefinement::populateEdgeVertexRelation() {
-
-    _child->_edgeVertIndices.resize(_child->getNumEdges() * 2);
-
-    populateEdgeVerticesFromParentFaces();
-    populateEdgeVerticesFromParentEdges();
-}
-
-void
-TriRefinement::populateEdgeVerticesFromParentFaces() {
-
-    for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        ConstIndexArray pFaceEdges      = _parent->getFaceEdges(pFace),
-                        pFaceChildEdges = getFaceChildEdges(pFace);
-
-        assert(pFaceEdges.size() == 3);
-        assert(pFaceChildEdges.size() == 3);
-
-        Index pEdgeChildVerts[3];
-        pEdgeChildVerts[0] = _edgeChildVertIndex[pFaceEdges[0]];
-        pEdgeChildVerts[1] = _edgeChildVertIndex[pFaceEdges[1]];
-        pEdgeChildVerts[2] = _edgeChildVertIndex[pFaceEdges[2]];
-
-        if (IndexIsValid(pFaceChildEdges[0])) {
-            IndexArray cEdgeVerts = _child->getEdgeVertices(pFaceChildEdges[0]);
-
-            cEdgeVerts[0] = pEdgeChildVerts[0];
-            cEdgeVerts[1] = pEdgeChildVerts[2];
-        }
-        if (IndexIsValid(pFaceChildEdges[1])) {
-            IndexArray cEdgeVerts = _child->getEdgeVertices(pFaceChildEdges[1]);
-
-            cEdgeVerts[0] = pEdgeChildVerts[1];
-            cEdgeVerts[1] = pEdgeChildVerts[0];
-        }
-        if (IndexIsValid(pFaceChildEdges[2])) {
-            IndexArray cEdgeVerts = _child->getEdgeVertices(pFaceChildEdges[2]);
-
-            cEdgeVerts[0] = pEdgeChildVerts[2];
-            cEdgeVerts[1] = pEdgeChildVerts[1];
-        }
-    }
-}
-
-void
-TriRefinement::populateEdgeVerticesFromParentEdges() {
-
-    for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        ConstIndexArray pEdgeVerts      = _parent->getEdgeVertices(pEdge),
-                        pEdgeChildEdges = getEdgeChildEdges(pEdge);
-
-        if (IndexIsValid(pEdgeChildEdges[0])) {
-            IndexArray cEdgeVerts = _child->getEdgeVertices(pEdgeChildEdges[0]);
-
-            cEdgeVerts[0] = _edgeChildVertIndex[pEdge];
-            cEdgeVerts[1] = _vertChildVertIndex[pEdgeVerts[0]];
-        }
-        if (IndexIsValid(pEdgeChildEdges[1])) {
-            IndexArray cEdgeVerts = _child->getEdgeVertices(pEdgeChildEdges[1]);
-
-            cEdgeVerts[0] = _edgeChildVertIndex[pEdge];
-            cEdgeVerts[1] = _vertChildVertIndex[pEdgeVerts[1]];
-        }
-    }
-}
-
-
-//
-//  Methods to populate the edge-face relation of the child Level:
-//      - child edges originate from parent faces and edges
-//      - sparse refinement poses challenges with allocation here
-//          - we need to update the counts/offsets as we populate
-//
-void
-TriRefinement::populateEdgeFaceRelation() {
-
-    //
-    //  This is essentially the same as the quad-split version except for the
-    //  sizing estimates:
-    //      - every child-edge within a face will have 2 incident faces
-    //      - every child-edge from a edge may have N incident faces
-    //          - use the parents edge-face count for this
-    //
-    int childEdgeFaceIndexSizeEstimate = (int)_faceChildEdgeIndices.size() * 2 +
-                                         (int)_parent->_edgeFaceIndices.size() * 2;
-
-    _child->_edgeFaceCountsAndOffsets.resize(_child->getNumEdges() * 2);
-    _child->_edgeFaceIndices.resize(childEdgeFaceIndexSizeEstimate);
-    _child->_edgeFaceLocalIndices.resize(childEdgeFaceIndexSizeEstimate);
-
-    // Update _maxEdgeFaces from the parent level before calling the 
-    // populateEdgeFacesFromParent methods below, as these may further
-    // update _maxEdgeFaces.
-    _child->_maxEdgeFaces = _parent->_maxEdgeFaces;
-
-    populateEdgeFacesFromParentFaces();
-    populateEdgeFacesFromParentEdges();
-
-    //  Revise the over-allocated estimate based on what is used (as indicated in the
-    //  count/offset for the last vertex) and trim the index vector accordingly:
-    childEdgeFaceIndexSizeEstimate = _child->getNumEdgeFaces(_child->getNumEdges()-1) +
-                                     _child->getOffsetOfEdgeFaces(_child->getNumEdges()-1);
-    _child->_edgeFaceIndices.resize(childEdgeFaceIndexSizeEstimate);
-    _child->_edgeFaceLocalIndices.resize(childEdgeFaceIndexSizeEstimate);
-}
-
-void
-TriRefinement::populateEdgeFacesFromParentFaces() {
-
-    for (Index pFace = 0; pFace < _parent->getNumFaces(); ++pFace) {
-        ConstIndexArray pFaceChildFaces = getFaceChildFaces(pFace),
-                        pFaceChildEdges = getFaceChildEdges(pFace);
-
-        assert(pFaceChildFaces.size() == 4);
-        assert(pFaceChildEdges.size() == 3);
-
-        //  Every child-edge of a face potentially shares the middle child face:
-        Index cFaceMiddle       = pFaceChildFaces[3];
-        bool  isFaceMiddleValid = IndexIsValid(cFaceMiddle);
-
-        for (int j = 0; j < pFaceChildEdges.size(); ++j) {
-            Index cEdge = pFaceChildEdges[j];
-            if (IndexIsValid(cEdge)) {
-                //  Reserve enough edge-faces, populate and trim as needed:
-                _child->resizeEdgeFaces(cEdge, 2);
-
-                IndexArray      cEdgeFaces  = _child->getEdgeFaces(cEdge);
-                LocalIndexArray cEdgeInFace = _child->getEdgeFaceLocalIndices(cEdge);
-
-                int cEdgeFaceCount = 0;
-                if (IndexIsValid(pFaceChildFaces[j])) {
-                    cEdgeFaces[cEdgeFaceCount] = pFaceChildFaces[j];
-                    cEdgeInFace[cEdgeFaceCount] = (LocalIndex) ((j + 1) % 3);
-                    cEdgeFaceCount++;
-                }
-                if (isFaceMiddleValid) {
-                    cEdgeFaces[cEdgeFaceCount] = cFaceMiddle;
-                    cEdgeInFace[cEdgeFaceCount] = (LocalIndex) ((j + 1) % 3);
-                    cEdgeFaceCount++;
-                }
-                _child->trimEdgeFaces(cEdge, cEdgeFaceCount);
-            }
-        }
-    }
-}
-
-void
-TriRefinement::populateEdgeFacesFromParentEdges() {
-
-    for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        ConstIndexArray pEdgeChildEdges = getEdgeChildEdges(pEdge);
-        if (!IndexIsValid(pEdgeChildEdges[0]) && !IndexIsValid(pEdgeChildEdges[1])) continue;
-
-        ConstIndexArray      pEdgeFaces  = _parent->getEdgeFaces(pEdge);
-        ConstLocalIndexArray pEdgeInFace = _parent->getEdgeFaceLocalIndices(pEdge);
-        ConstIndexArray      pEdgeVerts = _parent->getEdgeVertices(pEdge);
-
-        for (int j = 0; j < 2; ++j) {
-            Index cEdge = pEdgeChildEdges[j];
-            if (!IndexIsValid(cEdge)) continue;
-
-            //
-            //  Reserve enough edge-faces, populate and trim as needed:
-            //
-            _child->resizeEdgeFaces(cEdge, pEdgeFaces.size());
-
-            IndexArray      cEdgeFaces  = _child->getEdgeFaces(cEdge);
-            LocalIndexArray cEdgeInFace = _child->getEdgeFaceLocalIndices(cEdge);
-
-            //
-            //  Each parent face may contribute an incident child face:
-            //
-            //      For each incident face and local-index, we immediately know
-            //  the two child faces that are associated with the two child edges.
-            //  We just need to identify how to pair them based on edge direction.
-            //
-            //      Note also here, that we could identify the pairs of child faces
-            //  once for the parent before dealing with each child edge (we do the
-            //  "find edge in face search" twice here as a result).  We will
-            //  generally have 2 or 1 incident face to the parent edge so we
-            //  can put the child-pairs on the stack.
-            //
-            //      Here's a more promising alternative -- instead of iterating
-            //  through the child edges to "pull" data from the parent, iterate
-            //  through the parent edges' faces and apply valid child faces to
-            //  the appropriate child edge.  We should be able to use end-verts
-            //  of the parent edge to get the corresponding child face for each,
-            //  but we can't avoid a vert-in-face search and a subsequent parity
-            //  test of the end-vert.
-            //
-            int cEdgeFaceCount = 0;
-
-            for (int i = 0; i < pEdgeFaces.size(); ++i) {
-                Index pFace      = pEdgeFaces[i];
-                int   edgeInFace = pEdgeInFace[i];
-
-                ConstIndexArray pFaceVerts = _parent->getFaceVertices(pFace),
-                                pFaceChildren = getFaceChildFaces(pFace);
-
-                //  Inspect either this child of the face or the next -- be careful
-                //  to consider degenerate edge when orienting here:
-                int childOfEdge = (pEdgeVerts[0] == pEdgeVerts[1]) ? j :
-                                  (pFaceVerts[edgeInFace] != pEdgeVerts[j]);
-
-                int childInFace = edgeInFace + childOfEdge;
-                if (childInFace == pFaceVerts.size()) childInFace = 0;
-
-                if (IndexIsValid(pFaceChildren[childInFace])) {
-                    cEdgeFaces[cEdgeFaceCount]  = pFaceChildren[childInFace];
-                    cEdgeInFace[cEdgeFaceCount] = (LocalIndex) edgeInFace;
-                    cEdgeFaceCount++;
-                }
-            }
-            _child->trimEdgeFaces(cEdge, cEdgeFaceCount);
-        }
-    }
-}
-
-
-//
-//  Methods to populate the vertex-face relation of the child Level:
-//      - child vertices originate from parent faces, edges and vertices
-//      - sparse refinement poses challenges with allocation here:
-//          - we need to update the counts/offsets as we populate
-//          - note this imposes ordering constraints and inhibits concurrency
-//
-void
-TriRefinement::populateVertexFaceRelation() {
-
-    //
-    //  Unlike quad-splitting, we don't have to consider vertices originating from
-    //  faces.  We also have to consider 3 faces for every incident face for vertices
-    //  originating from edges.
-    //
-    int childVertFaceIndexSizeEstimate = (int)_parent->_edgeFaceIndices.size() * 3
-                                       + (int)_parent->_vertFaceIndices.size();
-
-    _child->_vertFaceCountsAndOffsets.resize(_child->getNumVertices() * 2);
-    _child->_vertFaceIndices.resize(         childVertFaceIndexSizeEstimate);
-    _child->_vertFaceLocalIndices.resize(    childVertFaceIndexSizeEstimate);
-
-    //  Remember -- no vertices-from-faces to consider here (until N-gon support)
-    if (getFirstChildVertexFromVertices() == 0) {
-        populateVertexFacesFromParentVertices();
-        populateVertexFacesFromParentEdges();
-    } else {
-        populateVertexFacesFromParentEdges();
-        populateVertexFacesFromParentVertices();
-    }
-
-    //  Revise the over-allocated estimate based on what is used (as indicated in the
-    //  count/offset for the last vertex) and trim the index vectors accordingly:
-    childVertFaceIndexSizeEstimate = _child->getNumVertexFaces(_child->getNumVertices()-1) +
-                                     _child->getOffsetOfVertexFaces(_child->getNumVertices()-1);
-    _child->_vertFaceIndices.resize(     childVertFaceIndexSizeEstimate);
-    _child->_vertFaceLocalIndices.resize(childVertFaceIndexSizeEstimate);
-}
-
-void
-TriRefinement::populateVertexFacesFromParentEdges() {
-
-    for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        Index cVert = _edgeChildVertIndex[pEdge];
-        if (!IndexIsValid(cVert)) continue;
-
-        ConstIndexArray      pEdgeFaces  = _parent->getEdgeFaces(pEdge);
-        ConstLocalIndexArray pEdgeInFace = _parent->getEdgeFaceLocalIndices(pEdge);
-
-        //
-        //  Reserve enough vert-faces, populate and trim to the actual size:
-        //
-        _child->resizeVertexFaces(cVert, 2 * pEdgeFaces.size());
-
-        IndexArray      cVertFaces  = _child->getVertexFaces(cVert);
-        LocalIndexArray cVertInFace = _child->getVertexFaceLocalIndices(cVert);
-
-        int cVertFaceCount = 0;
-        for (int i = 0; i < pEdgeFaces.size(); ++i) {
-            Index pFace      = pEdgeFaces[i];
-            int   edgeInFace = pEdgeInFace[i];
-
-            //
-            //  Identify the corresponding three child faces for this parent face and
-            //  their orientation wrt the child vertex to which they are incident --
-            //  since we have the desired ordering of child faces from the parent face,
-            //  we don't care about the orientation of the parent edge.
-            //
-            LocalIndex leadingFace  = (LocalIndex) ((edgeInFace + 1) % 3);
-            LocalIndex middleFace   = (LocalIndex) 3;
-            LocalIndex trailingFace = (LocalIndex) edgeInFace;
-
-            LocalIndex leadingLocalIndex  = (LocalIndex) edgeInFace;
-            LocalIndex middleLocalIndex   = (LocalIndex) ((edgeInFace + 2) % 3);
-            LocalIndex trailingLocalIndex = (LocalIndex) ((edgeInFace + 1) % 3);
-
-            //
-            //  Now simply assign those of the three child faces that are valid:
-            //
-            ConstIndexArray pFaceChildFaces = getFaceChildFaces(pFace);
-            assert(pFaceChildFaces.size() == 4);
-
-            Index cFace = pFaceChildFaces[leadingFace];
-            if (IndexIsValid(cFace)) {
-                cVertFaces[cVertFaceCount] = cFace;
-                cVertInFace[cVertFaceCount] = leadingLocalIndex;
-                cVertFaceCount++;
-            }
-
-            cFace = pFaceChildFaces[middleFace];
-            if (IndexIsValid(cFace)) {
-                cVertFaces[cVertFaceCount] = cFace;
-                cVertInFace[cVertFaceCount] = middleLocalIndex;
-                cVertFaceCount++;
-            }
-
-            cFace = pFaceChildFaces[trailingFace];
-            if (IndexIsValid(cFace)) {
-                cVertFaces[cVertFaceCount] = cFace;
-                cVertInFace[cVertFaceCount] = trailingLocalIndex;
-                cVertFaceCount++;
-            }
-        }
-        _child->trimVertexFaces(cVert, cVertFaceCount);
-    }
-}
-
-void
-TriRefinement::populateVertexFacesFromParentVertices() {
-
-    for (Index pVert = 0; pVert < _parent->getNumVertices(); ++pVert) {
-        Index cVert = _vertChildVertIndex[pVert];
-        if (!IndexIsValid(cVert)) continue;
-
-        //
-        //  Inspect the parent vert's faces:
-        //
-        ConstIndexArray      pVertFaces  = _parent->getVertexFaces(pVert);
-        ConstLocalIndexArray pVertInFace = _parent->getVertexFaceLocalIndices(pVert);
-
-        //
-        //  Reserve enough vert-faces, populate and trim to the actual size:
-        //
-        _child->resizeVertexFaces(cVert, pVertFaces.size());
-
-        IndexArray      cVertFaces  = _child->getVertexFaces(cVert);
-        LocalIndexArray cVertInFace = _child->getVertexFaceLocalIndices(cVert);
-
-        int cVertFaceCount = 0;
-        for (int i = 0; i < pVertFaces.size(); ++i) {
-            Index      pFace      = pVertFaces[i];
-            LocalIndex pFaceChild = pVertInFace[i];
-
-            Index cFace = getFaceChildFaces(pFace)[pFaceChild];
-            if (IndexIsValid(cFace)) {
-                cVertFaces[cVertFaceCount] = cFace;
-                cVertInFace[cVertFaceCount] = pFaceChild;
-                cVertFaceCount++;
-            }
-        }
-        _child->trimVertexFaces(cVert, cVertFaceCount);
-    }
-}
-
-
-//
-//  Methods to populate the vertex-edge relation of the child Level:
-//      - child vertices originate from parent faces, edges and vertices
-//      - sparse refinement poses challenges with allocation here:
-//          - we need to update the counts/offsets as we populate
-//          - note this imposes ordering constraints and inhibits concurrency
-//
-void
-TriRefinement::populateVertexEdgeRelation() {
-
-    //
-    //  Notes on allocating/initializing the vertex-edge counts/offsets vector:
-    //
-    //  Be aware of scheme-specific decisions here, e.g.:
-    //      - no verts from parent faces for Loop
-    //      - more interior edges and faces for verts from parent edges for Loop
-    //      - no guaranteed "neighborhood" around Bilinear verts from verts
-    //
-    //  If uniform subdivision, vert-edge count will be:
-    //      - 2 + 2*N faces incident parent edge for verts from parent edges
-    //      - same as parent vert for verts from parent verts
-    //  If sparse subdivision, vert-edge count will be:
-    //      - non-trivial function of child faces in parent face
-    //          - 1 child face will always result in 2 child edges
-    //          * 2 child faces can mean 3 or 4 child edges
-    //          - 3 child faces will always result in 4 child edges
-    //      - 1 or 2 + N faces incident parent edge for verts from parent edges
-    //          - where the 1 or 2 is number of child edges of parent edge
-    //          - any end vertex will require all N child faces (catmark)
-    //      - same as parent vert for verts from parent verts (catmark)
-    //
-    int childVertEdgeIndexSizeEstimate = (int)_parent->_edgeFaceIndices.size() * 2 + _parent->getNumEdges() * 2
-                                       + (int)_parent->_vertEdgeIndices.size();
-
-    _child->_vertEdgeCountsAndOffsets.resize(_child->getNumVertices() * 2);
-    _child->_vertEdgeIndices.resize(         childVertEdgeIndexSizeEstimate);
-    _child->_vertEdgeLocalIndices.resize(    childVertEdgeIndexSizeEstimate);
-
-    if (getFirstChildVertexFromVertices() == 0) {
-        populateVertexEdgesFromParentVertices();
-        populateVertexEdgesFromParentEdges();
-    } else {
-        populateVertexEdgesFromParentEdges();
-        populateVertexEdgesFromParentVertices();
-    }
-
-    //  Revise the over-allocated estimate based on what is used (as indicated in the
-    //  count/offset for the last vertex) and trim the index vectors accordingly:
-    childVertEdgeIndexSizeEstimate = _child->getNumVertexEdges(_child->getNumVertices()-1) +
-                                     _child->getOffsetOfVertexEdges(_child->getNumVertices()-1);
-    _child->_vertEdgeIndices.resize(     childVertEdgeIndexSizeEstimate);
-    _child->_vertEdgeLocalIndices.resize(childVertEdgeIndexSizeEstimate);
-}
-
-void
-TriRefinement::populateVertexEdgesFromParentEdges() {
-
-    for (Index pEdge = 0; pEdge < _parent->getNumEdges(); ++pEdge) {
-        Index cVert = _edgeChildVertIndex[pEdge];
-        if (!IndexIsValid(cVert)) continue;
-
-        //
-        //  First inspect the parent edge -- its parent faces then its child edges:
-        //
-        ConstIndexArray      pEdgeFaces  = _parent->getEdgeFaces(pEdge);
-        ConstLocalIndexArray pEdgeInFace = _parent->getEdgeFaceLocalIndices(pEdge);
-
-        ConstIndexArray pEdgeVerts      = _parent->getEdgeVertices(pEdge),
-                        pEdgeChildEdges = getEdgeChildEdges(pEdge);
-
-        //
-        //  Reserve enough vert-edges, populate and trim to the actual size:
-        //
-        _child->resizeVertexEdges(cVert, pEdgeFaces.size() + 2);
-
-        IndexArray      cVertEdges  = _child->getVertexEdges(cVert);
-        LocalIndexArray cVertInEdge = _child->getVertexEdgeLocalIndices(cVert);
-
-        //
-        //  We need to order the incident edges around the vertex appropriately:
-        //      - one child edge of the parent edge ("leading" in face 0)
-        //      - two child edges interior to face 0
-        //      - one other child edge of the parent edge ("trailing" in face 0)
-        //      - child edges of all remaining faces
-        //  Be careful to place the leading/trailing child edges of the parent edge
-        //  correctly -- edges are not directed their orientation may vary.  The
-        //  interior child edges are appropriately oriented wrt their parent face.
-        //
-        //  Also need to consider no faces at all, in which case we just want the
-        //  child edges of the parent edge.
-        //
-        int cVertEdgeCount = 0;
-
-        //  We only care about edge reversal in the first iteration -- in which
-        //  the child edges of the parent edges are assigned.  Other iterations
-        //  only assign the child edges from the incident parent face:
-        bool pEdgeReversed = false;
-        Index cEdgeOfEdge0 = INDEX_INVALID,
-              cEdgeOfEdge1 = INDEX_INVALID;
-
-        for (int i = 0; i < pEdgeFaces.size(); ++i) {
-            Index pFace      = pEdgeFaces[i];
-            int   edgeInFace = pEdgeInFace[i];
-
-            ConstIndexArray pFaceChildEdges = getFaceChildEdges(pFace);
-
-            //  Test the orientation of a non-degenerate edge in the first face:
-            if (i == 0) {
-                if (pEdgeVerts[0] != pEdgeVerts[1]) {
-                    pEdgeReversed = (_parent->getFaceVertices(pFace)[edgeInFace] != pEdgeVerts[0]);
-                }
-                cEdgeOfEdge0 = pEdgeChildEdges[!pEdgeReversed];
-                cEdgeOfEdge1 = pEdgeChildEdges[pEdgeReversed];
-            }
-
-            //
-            //  Identify the two interior and incident child edges within the face --
-            //  bracketed by the child edges of the parent edge when dealing with the
-            //  first face:
-            //
-            Index cEdgeOfFace0 = pFaceChildEdges[(edgeInFace + 1) % 3];
-            Index cEdgeOfFace1 = pFaceChildEdges[edgeInFace];
-
-            if ((i == 0) && IndexIsValid(cEdgeOfEdge0)) {
-                cVertEdges[cVertEdgeCount] = cEdgeOfEdge0;
-                cVertInEdge[cVertEdgeCount] = 0;
-                cVertEdgeCount++;
-            }
-            if (IndexIsValid(cEdgeOfFace0)) {
-                cVertEdges[cVertEdgeCount] = cEdgeOfFace0;
-                cVertInEdge[cVertEdgeCount] = 1;
-                cVertEdgeCount++;
-            }
-            if (IndexIsValid(cEdgeOfFace1)) {
-                cVertEdges[cVertEdgeCount] = cEdgeOfFace1;
-                cVertInEdge[cVertEdgeCount] = 0;
-                cVertEdgeCount++;
-            }
-            if ((i == 0) && IndexIsValid(cEdgeOfEdge1)) {
-                cVertEdges[cVertEdgeCount] = cEdgeOfEdge1;
-                cVertInEdge[cVertEdgeCount] = 0;
-                cVertEdgeCount++;
-            }
-        }
-        _child->trimVertexEdges(cVert, cVertEdgeCount);
-    }
-}
-void
-TriRefinement::populateVertexEdgesFromParentVertices() {
-
-    for (Index pVert = 0; pVert < _parent->getNumVertices(); ++pVert) {
-        Index cVert = _vertChildVertIndex[pVert];
-        if (!IndexIsValid(cVert)) continue;
-
-        //
-        //  Inspect the parent vert's edges first:
-        //
-        ConstIndexArray      pVertEdges  = _parent->getVertexEdges(pVert);
-        ConstLocalIndexArray pVertInEdge = _parent->getVertexEdgeLocalIndices(pVert);
-
-        //
-        //  Reserve enough vert-edges, populate and trim to the actual size:
-        //
-        _child->resizeVertexEdges(cVert, pVertEdges.size());
-
-        IndexArray      cVertEdges  = _child->getVertexEdges(cVert);
-        LocalIndexArray cVertInEdge = _child->getVertexEdgeLocalIndices(cVert);
-
-        int cVertEdgeCount = 0;
-        for (int i = 0; i < pVertEdges.size(); ++i) {
-            Index cEdge = getEdgeChildEdges(pVertEdges[i])[pVertInEdge[i]];
-            if (IndexIsValid(cEdge)) {
-                cVertEdges[cVertEdgeCount] = cEdge;
-                cVertInEdge[cVertEdgeCount] = 1;
-                cVertEdgeCount++;
-            }
-        }
-        _child->trimVertexEdges(cVert, cVertEdgeCount);
-    }
-}
-
-//
-//  Methods to populate child-component indices for sparse selection:
-//
-//  Need to find a better place for these anon helper methods now that they are required
-//  both in the base class and the two subclasses for quad- and tri-splitting...
-//
-namespace {
-    Index const IndexSparseMaskNeighboring = (1 << 0);
-    Index const IndexSparseMaskSelected    = (1 << 1);
-
-    inline void markSparseIndexNeighbor(Index& index) { index = IndexSparseMaskNeighboring; }
-    inline void markSparseIndexSelected(Index& index) { index = IndexSparseMaskSelected; }
-}
-
-void
-TriRefinement::markSparseFaceChildren() {
-
-    assert(_parentFaceTag.size() > 0);
-
-    //
-    //  For each parent face:
-    //      All boundary edges will be adequately marked as a result of the pass over the
-    //  edges above and boundary vertices marked by selection.  So all that remains is to
-    //  identify the child faces and interior child edges for a face requiring neighboring
-    //  child faces.
-    //      For each corner vertex selected, we need to mark the corresponding child face,
-    //  the two interior child edges and shared child vertex in the middle.
-    //
-    for (Index pFace = 0; pFace < parent().getNumFaces(); ++pFace) {
-        //
-        //  Mark all descending child components of a selected face.  Otherwise inspect
-        //  its incident vertices to see if anything neighboring has been selected --
-        //  requiring partial refinement of this face.
-        //
-        //  Remember that a selected face cannot be transitional, and that only a
-        //  transitional face will be partially refined.
-        //
-        IndexArray fChildFaces = getFaceChildFaces(pFace);
-        IndexArray fChildEdges = getFaceChildEdges(pFace);
-
-        assert(fChildFaces.size() == 4);
-        assert(fChildEdges.size() == 3);
-
-        ConstIndexArray fVerts = parent().getFaceVertices(pFace);
-
-        SparseTag& pFaceTag = _parentFaceTag[pFace];
-
-        if (pFaceTag._selected) {
-            markSparseIndexSelected(fChildFaces[0]);
-            markSparseIndexSelected(fChildFaces[1]);
-            markSparseIndexSelected(fChildFaces[2]);
-            markSparseIndexSelected(fChildFaces[3]);
-
-            markSparseIndexSelected(fChildEdges[0]);
-            markSparseIndexSelected(fChildEdges[1]);
-            markSparseIndexSelected(fChildEdges[2]);
-
-            pFaceTag._transitional = 0;
-        } else {
-            int marked = _parentVertexTag[fVerts[0]]._selected 
-                       + _parentVertexTag[fVerts[1]]._selected 
-                       + _parentVertexTag[fVerts[2]]._selected;
-
-            if (marked) {
-                //
-                //  If marked, see if we have any transitional edges, in which case we
-                //  need to include the middle face:
-                //
-                ConstIndexArray fEdges = parent().getFaceEdges(pFace);
-
-                pFaceTag._transitional = (unsigned char)
-                       ((_parentEdgeTag[fEdges[0]]._transitional << 0) |
-                        (_parentEdgeTag[fEdges[1]]._transitional << 1) |
-                        (_parentEdgeTag[fEdges[2]]._transitional << 2));
-
-                //  Now mark the child faces and their associated edges:
-                //
-                if (pFaceTag._transitional) {
-                    markSparseIndexNeighbor(fChildFaces[3]);
-
-                    markSparseIndexNeighbor(fChildEdges[0]);
-                    markSparseIndexNeighbor(fChildEdges[1]);
-                    markSparseIndexNeighbor(fChildEdges[2]);
-                }
-                if (_parentVertexTag[fVerts[0]]._selected) {
-                    markSparseIndexNeighbor(fChildFaces[0]);
-                    markSparseIndexNeighbor(fChildEdges[0]);
-                }
-                if (_parentVertexTag[fVerts[1]]._selected) {
-                    markSparseIndexNeighbor(fChildFaces[1]);
-                    markSparseIndexNeighbor(fChildEdges[1]);
-                }
-                if (_parentVertexTag[fVerts[2]]._selected) {
-                    markSparseIndexNeighbor(fChildFaces[2]);
-                    markSparseIndexNeighbor(fChildEdges[2]);
-                }
-            }
-        }
-    }
-}
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-} // end namespace OpenSubdiv
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/triRefinement.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/triRefinement.h
deleted file mode 100644
index 080c257f3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/triRefinement.h
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_TRI_REFINEMENT_H
-#define OPENSUBDIV3_VTR_TRI_REFINEMENT_H
-
-#include "../version.h"
-
-#include "../vtr/refinement.h"
-
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-namespace internal {
-
-//
-//  TriRefinement:
-//      A TriRefinement is a subclass of Refinement that splits all faces into tris.
-//  It provides the configuration of parent-to-child components and the population of
-//  all required topological relations in order to complete a valid Refinement.
-//
-class TriRefinement : public Refinement {
-
-public:
-    TriRefinement(Level const & parent, Level & child, Sdc::Options const & options);
-    ~TriRefinement();
-
-protected:
-    //
-    //  Virtual methods to complete the configuration of the parent-to-child mapping:
-    //
-    virtual void allocateParentChildIndices();
-
-    virtual void markSparseFaceChildren();
-
-    //
-    //  Virtual methods to populate the six topological relations:
-    //
-    virtual void populateFaceVertexRelation();
-    virtual void populateFaceEdgeRelation();
-    virtual void populateEdgeVertexRelation();
-    virtual void populateEdgeFaceRelation();
-    virtual void populateVertexFaceRelation();
-    virtual void populateVertexEdgeRelation();
-
-    //
-    //  Internal helper methods for populating the topology -- a few of these are
-    //  identical to what is used for quad-splitting, so we may move them to the
-    //  base class...
-    //
-    void populateFaceVertexCountsAndOffsets();
-    void populateFaceVerticesFromParentFaces();
-
-    void populateFaceEdgesFromParentFaces();
-
-    void populateEdgeVerticesFromParentFaces();
-    void populateEdgeVerticesFromParentEdges();
-
-    void populateEdgeFacesFromParentFaces();
-    void populateEdgeFacesFromParentEdges();
-
-    void populateVertexFacesFromParentEdges();
-    void populateVertexFacesFromParentVertices();
-
-    void populateVertexEdgesFromParentEdges();
-    void populateVertexEdgesFromParentVertices();
-
-private:
-    //
-    //  Unlike the quad-split, which can share some vectors with the parent Level since
-    //  child components correspond to face-vertices, the tri-split must define its
-    //  own local vectors to identify the children for each parent component -- to
-    //  be referenced within the base class for more immediate/inline access:
-    //
-    IndexVector _localFaceChildFaceCountsAndOffsets;
-};
-
-} // end namespace internal
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_REFINEMENT_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/types.h b/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/types.h
deleted file mode 100644
index 20491f201..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/osd/opensubdiv/vtr/types.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//   Copyright 2014 DreamWorks Animation LLC.
-//
-//   Licensed under the Apache License, Version 2.0 (the "Apache License")
-//   with the following modification; you may not use this file except in
-//   compliance with the Apache License and the following modification to it:
-//   Section 6. Trademarks. is deleted and replaced with:
-//
-//   6. Trademarks. This License does not grant permission to use the trade
-//      names, trademarks, service marks, or product names of the Licensor
-//      and its affiliates, except as required to comply with Section 4(c) of
-//      the License and to reproduce the content of the NOTICE file.
-//
-//   You may obtain a copy of the Apache License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the Apache License with the above modification is
-//   distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-//   KIND, either express or implied. See the Apache License for the specific
-//   language governing permissions and limitations under the Apache License.
-//
-#ifndef OPENSUBDIV3_VTR_TYPES_H
-#define OPENSUBDIV3_VTR_TYPES_H
-
-#include "../version.h"
-
-#include "../vtr/array.h"
-
-#include <vector>
-
-namespace OpenSubdiv {
-namespace OPENSUBDIV_VERSION {
-
-namespace Vtr {
-
-//
-//  A few types (and constants) for use within Vtr and potentially by its
-//  clients (appropriately exported and retyped)
-//
-
-//
-//  Integer type and constants to index the vectors of components.  Note that we
-//  can't use specific width integer types like uint32_t, etc. as use of stdint
-//  is not portable.
-//
-//  The convention throughout the OpenSubdiv code is to use "int" in most places,
-//  with "unsigned int" being limited to a few cases (why?).  So we continue that
-//  trend here and use "int" for topological indices (with -1 indicating "invalid")
-//  despite the fact that we lose half the range compared to using "uint" (with ~0
-//  as invalid).
-//
-typedef int Index;
-
-static const Index INDEX_INVALID = -1;
-
-inline bool IndexIsValid(Index index) { return (index != INDEX_INVALID); }
-
-//
-//  Integer type and constants used to index one component within another.  Ideally
-//  this is just 2 bits once refinement reduces faces to tris or quads -- and so
-//  could potentially be combined with an Index -- but we need something larger for
-//  the N-sided face.
-//
-typedef unsigned short  LocalIndex;
-
-//  Declared as "int" since it's intended for more general use
-static const int VALENCE_LIMIT = ((1 << 16) - 1);  // std::numeric_limits<LocalIndex>::max()
-
-//
-//  Collections of integer types in variable or fixed sized arrays.  Note that the use
-//  of "vector" in the name indicates a class that wraps an std::vector (typically a
-//  member variable) which is fully resizable and owns its own storage, whereas "array"
-//  wraps a vtr::Array which uses a fixed block of pre-allocated memory.
-//
-typedef std::vector<Index>  IndexVector;
-
-typedef Array<Index>             IndexArray;
-typedef ConstArray<Index>        ConstIndexArray;
-
-typedef Array<LocalIndex>        LocalIndexArray;
-typedef ConstArray<LocalIndex>   ConstLocalIndexArray;
-
-
-} // end namespace Vtr
-
-} // end namespace OPENSUBDIV_VERSION
-using namespace OPENSUBDIV_VERSION;
-} // end namespace OpenSubdiv
-
-#endif /* OPENSUBDIV3_VTR_TYPES_H */
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/performance.cc b/contrib/tinyusdz/tinyusdz_repo/src/performance.cc
deleted file mode 100644
index 4b924c386..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/performance.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: Apache 2.0
-// Copyright 2022 - Present, Light Transport Entertainment, Inc.
-#include "performance.hh"
-
-#include <chrono>
-
-namespace tinyusdz {
-namespace performance {
-
-double now() {
-  auto t = std::chrono::system_clock::now();
-
-  // to milliseconds.
-  auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(t.time_since_epoch()); 
-
-  return double(ms.count());
-}
-
-} // namespace performance
-} // namespace tinyusdz
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/performance.hh b/contrib/tinyusdz/tinyusdz_repo/src/performance.hh
deleted file mode 100644
index 638bf23fc..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/performance.hh
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: Apache 2.0
-// Copyright 2022 - Present, Light Transport Entertainment, Inc.
-// 
-// Simple timing utility
-#pragma once
-
-namespace tinyusdz {
-namespace performance {
-
-// Return current time in [ms]
-double now();
-
-} // performance
-} // namespace tinyusdz
-
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/pxr-compat.cc b/contrib/tinyusdz/tinyusdz_repo/src/pxr-compat.cc
deleted file mode 100644
index 4c70f84b3..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/pxr-compat.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "pxr-compat.hh"
-
-#include "tinyusdz.hh"
-
-namespace pxr {
-
-USD_API UsdStageRefPtr UsdStage::Open(const std::string &filepath, InitialLoadSet loadset) {
-  (void)filepath;
-  (void)loadset;
-
-  // TODO:
-  return std::shared_ptr<UsdStage>(nullptr);
-};
-
-USD_API UsdStageRefPtr UsdStage::CreateNew(const std::string &filepath, InitialLoadSet loadset) {
-  (void)filepath;
-  (void)loadset;
-
-  // TODO:
-  return std::shared_ptr<UsdStage>(nullptr);
-};
-
-USD_API UsdPrim UsdStage::GetPrimAtPath(const SdfPath &path) {
-  (void)path;
-
-  return UsdPrim();
-};
-
-} // namespace pxr
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/pxr-compat.hh b/contrib/tinyusdz/tinyusdz_repo/src/pxr-compat.hh
deleted file mode 100644
index 17cbbe67a..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/pxr-compat.hh
+++ /dev/null
@@ -1,163 +0,0 @@
-// SPDX-License-Identifier: Apache 2.0
-
-//
-// Experimental pxr USD compatible API
-//
-#pragma once
-
-#include <memory>
-#include <string>
-
-#include "prim-types.hh"
-
-#if !defined(PXR_DYNAMIC)
-  #define USD_API
-#else
-  #if defined(USD_EXPORTS)
-    #if defined(_WIN32)
-      #if defined(_MSC_VER)
-        #define USD_API __declspec(dllexport)
-      #else
-        // assume gcc or clang
-        #define USD_API __attribute__((dllexport))
-      #endif
-    #else
-        #define USD_API
-    #endif
-  #else // import
-
-    #if defined(_WIN32)
-      #if defined(_MSC_VER)
-        #define USD_API __declspec(dllimport)
-      #else
-        // assume gcc or clang
-        #define USD_API __attribute__((dllimport))
-      #endif
-    #else
-      #define USD_API
-    #endif
-  #endif
-
-#endif
-
-#define PXR_INTERNAL_NS pxr
-
-namespace pxr {
-
-//namespace Sdf {
-
-using TfToken = tinyusdz::value::token;
-
-struct SdfLayer;
-
-// pxr USD uses special pointer class(shared_ptr + alpha) for Handle, but we simply use shared_ptr.
-using SdfLayerHandle = std::shared_ptr<SdfLayer>;
-
-
-//} // namespae Sdf
-
-//namespace Usd {
-
-struct UsdStage;
-
-using UsdStagePtr = std::weak_ptr<UsdStage>;
-using UsdStageRefPtr = std::shared_ptr<UsdStage>;
-typedef UsdStagePtr UsdStageWeakPtr; 
-
-// prim could be invalid(empty)
-struct UsdPrim
-{
-  UsdPrim() : _prim(nullptr) {}
-  //UsdPrim(tinyusdz::GPrim *prim) : _prim(prim) {}
-
-  bool IsValid() const {
-    if (_prim.type_id() == tinyusdz::value::TypeId::TYPE_ID_INVALID) {
-      return false;
-    }
-
-    // TODO: if (IsConcrete(_type))
-
-    return true;
-  }
-
-  explicit operator bool() {
-    return IsValid();
-  }
-
-  // TODO: Use raw pointer?
-  tinyusdz::value::Value _prim;
-};
-
-struct SdfPath
-{
-  std::string path;
-};
-
-class UsdPrimRange
-{
- public:
-  class iterator;
-
-  iterator begin() const;
-
-  bool empty() const;
-
-};
-
-enum class Usd_PrimFlags {
-    Usd_PrimActiveFlag,
-    Usd_PrimLoadedFlag,
-    Usd_PrimModelFlag,
-    Usd_PrimGroupFlag,
-    Usd_PrimAbstractFlag,
-    Usd_PrimDefinedFlag,
-    Usd_PrimHasDefiningSpecifierFlag,
-    Usd_PrimInstanceFlag,
-
-    Usd_PrimHasPayloadFlag,
-    Usd_PrimClipsFlag,
-    Usd_PrimDeadFlag,
-    Usd_PrimPrototypeFlag,
-    Usd_PrimInstanceProxyFlag,
-    Usd_PrimPseudoRootFlag,
-
-    Usd_PrimAllFlag
-};
-
-
-class Usd_PrimFlagsPredicate;
-
-struct UsdStage
-{
-
-  enum InitialLoadSet
-  {
-    LoadAll,
-    LoadNone
-  };
-
-  USD_API static UsdStageRefPtr CreateNew(const std::string &filepath, InitialLoadSet = LoadAll);
-  USD_API static UsdStageRefPtr CreateInMemory(InitialLoadSet = LoadAll);
-
-  USD_API static UsdStageRefPtr Open(const std::string &filepath, InitialLoadSet = LoadAll);
-
-  USD_API void Save();
-  USD_API void SaveSessionLayers();
-
-  USD_API bool Export(const std::string &filename, bool addSourceFileComments=true) const;
-  USD_API bool ExportToString(std::string *result, bool addSourceFileComments=true) const;
-
-  USD_API UsdPrim DefinePrim(const SdfPath &path, const TfToken &typeName = TfToken());
-  USD_API UsdPrim OverridePrim(const SdfPath &path);
-
-  // returns invalid(empty) prim if corresponding path does not exit in the stage.
-  USD_API UsdPrim GetPrimAtPath(const SdfPath &path);
-
-  USD_API UsdPrimRange Traverse();
-  USD_API UsdPrimRange Traverse(const Usd_PrimFlagsPredicate &predicate);
-  USD_API UsdPrimRange TraverseAll();
-
-};
-
-//} // namespace Usd;
-} // namespace pxr
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/python-bindings.cc b/contrib/tinyusdz/tinyusdz_repo/src/python-bindings.cc
deleted file mode 100644
index e530e2b75..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/python-bindings.cc
+++ /dev/null
@@ -1,512 +0,0 @@
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-#include <pybind11/stl_bind.h>
-#include <pybind11/numpy.h>
-
-#include "tiny-format.hh"
-#include "tinyusdz.hh"
-#include "prim-pprint.hh"
-#include "tydra/render-data.hh"
-//
-#include "value-type-macros.inc"
-
-//
-// NOTE:
-// - pybind11 does not provide binding for `array.array` module(`py::array` is for numpy type)
-//   - so implement dedicated binding for array data through `vector<T>` stl binding.
-//   - Converting `numpy`, `array.array` and other Python array/list types must be converted at Python layer, not here(C++ binding).
-// - Memory management: TinyUSDZ does not use smart pointer, so use `return_value_policy::reference` or `return_value_policy::reference_internal` as much as posssible.
-//   - For methods returning a const pointer(doe not dynamically allocate memory)(e.g. `Stage::GetPrimAtPath`) 
-// - Use return_value_policy::reference_internal for a method which returns const/nonconst lvalue reference
-//   - e.g. `const StageMeta &Stage::metas() const`, `StageMeta &Stage::metas()`
-//   - Use py::def  or def_property with C++ lambdas(since def_readwrite cannot specity C++ method(there may be a solution, but could'nt find example code and hard to understand pybind11 templates))
-// -
-
-namespace py = pybind11;
-
-
-#if 0
-
-#define MAKE_OPAQUE_ARRAY_TYPE(__ty) \
-  PYBIND11_MAKE_OPAQUE(std::vector<__ty>);
-
-using namespace tinyusdz;
-
-APPLY_FUNC_TO_NUMERIC_VALUE_TYPES(MAKE_OPAQUE_ARRAY_TYPE)
-
-#undef MAKE_OPAQUE_ARRAY_TYPE
-
-#endif
-
-//PYBIND11_MAKE_OPAQUE(std::vector<int>);
-PYBIND11_MAKE_OPAQUE(std::vector<tinyusdz::Prim>);
-
-// define custom types
-struct float16 {
-  uint16_t h;
-};
-
-namespace PYBIND11_NAMESPACE { namespace detail {
-    template <> struct type_caster<float16> {
-    public:
-        /**
-         * This macro establishes the name 'inty' in
-         * function signatures and declares a local variable
-         * 'value' of type inty
-         */
-        PYBIND11_TYPE_CASTER(float16, const_name("float16"));
-
-        /**
-         * Conversion part 1 (Python->C++): convert a PyObject into a inty
-         * instance or return false upon failure. The second argument
-         * indicates whether implicit conversions should be applied.
-         */
-        bool load(handle src, bool) {
-            /* Extract PyObject from handle */
-            PyObject *source = src.ptr();
-            /* Try converting into a Python integer value */
-            PyObject *tmp = PyNumber_Long(source);
-            if (!tmp)
-                return false;
-            /* Now try to convert into a C++ half */
-            value.h = uint16_t(PyLong_AsLong(tmp));
-            Py_DECREF(tmp);
-            /* Ensure return code was OK (to avoid out-of-range errors etc) */
-            return true; // !PyErr_Occurred()
-        }
-
-        /**
-         * Conversion part 2 (C++ -> Python): convert an inty instance into
-         * a Python object. The second and third arguments are used to
-         * indicate the return value policy and parent object (for
-         * ``return_value_policy::reference_internal``) and are generally
-         * ignored by implicit casters.
-         */
-        static handle cast(float16 src, return_value_policy /* policy */, handle /* parent */) {
-            return PyLong_FromLong(src.h);
-        }
-    };
-}} // namespace PYBIND11_NAMESPACE::detail
-
-
-//PYBIND11_NUMPY_DTYPE(float16, h);
-
-// using namespace py::literals;  // to bring in the `_a` literal
-
-static double test_api() {
-  return 4.14;
-}
-
-class PyTest {
- public:
-  std::vector<int> intv;
-  const std::vector<int> &intvfun() const {
-    return intv;
-  }
-  std::vector<int> &intvfun() {
-    return intv;
-  }
-};
-
-namespace internal {
-
-tinyusdz::Stage load_usd(const std::string &filename) {
-  tinyusdz::Stage stage;
-
-  if (!tinyusdz::IsUSD(filename)) {
-    std::string s(tinyusdz::fmt::format("{} not found or not a USD file."));
-    PyErr_SetString(PyExc_FileNotFoundError, s.c_str());
-    throw py::error_already_set();
-  }
-
-  std::string warn;
-  std::string err;
-  bool ret = tinyusdz::LoadUSDFromFile(filename, &stage, &warn, &err);
-
-  if (warn.size()) {
-    py::print("[ctinyusdz::load_usd] ", warn);
-  }
-
-  if (!ret) {
-    std::string msg = "Failed to load USD";
-    if (err.size()) {
-      msg += ": " + err;
-    }
-
-    PyErr_SetString(PyExc_FileNotFoundError, filename.c_str());
-    throw py::error_already_set();
-  }
-
-  return stage;
-}
-
-bool is_usd(const std::string &filename) { return tinyusdz::IsUSD(filename); }
-
-std::string detect_usd_format(const std::string &filename) {
-  std::string format;
-
-  if (tinyusdz::IsUSD(filename, &format)) {
-    return format;
-  }
-  return format;  // empty
-}
-
-}  // namespace internal
-
-PYBIND11_MODULE(ctinyusdz, m) {
-  using namespace tinyusdz;
-
-  m.doc() = "Python binding for TinyUSDZ.";
-
-  m.def("test_api", &test_api, "Test API");
-
-  // auto UsdModule = m.def_submodule("Usd");
-
-  py::class_<USDLoadOptions>(m, "USDLoadOptions")
-      .def(py::init<>())
-      .def_readwrite("num_threads", &USDLoadOptions::num_threads)
-      .def_readwrite("load_assets", &USDLoadOptions::load_assets)
-      .def_readwrite("max_memory_limit_in_mb",
-                     &USDLoadOptions::max_memory_limit_in_mb)
-      .def_readwrite("do_composition", &USDLoadOptions::do_composition);
-
-  m.def(
-      "format", &internal::detect_usd_format,
-      "Detect USD format(USDA/USDC/USDZ) of file. Returns `\"usda\"`, "
-      "`\"usdc\"` `\"usdz\"` or empty string(when a file is not a USD file).");
-  m.def("is_usd", &internal::is_usd, "Load USD/USDA/USDC/USDZ from a file.");
-  m.def("load_usd", &internal::load_usd,
-        "Load USD/USDA/USDC/USDZ from a file.");
-
-  py::class_<PyTest>(m, "PyTest")
-      .def(py::init<>())
-      .def_readwrite("intv", &PyTest::intv)
-      .def_property(
-          //"intv", static_cast<const std::vector<int> &(PyTest::*)(void) const>(&PyTest::intvfun)
-          // In C++14, We can use py::overload_cast to simplify type cast
-          "intv", py::overload_cast<>(&PyTest::intvfun, py::const_)
-          , nullptr,
-          py::return_value_policy::reference_internal)
-      ;
-
-    // TODO: Use attr?
-#define SET_VALUE(__ty) \
-    .def("set", [](primvar::PrimVar &p, const __ty &v) { p.set_value(v); })
-
-  py::class_<primvar::PrimVar>(m, "PrimVar")
-    .def(py::init<>())
-    .def_property("dtype", &primvar::PrimVar::type_name, nullptr)
-    SET_VALUE(int32_t)
-    SET_VALUE(int64_t)
-    SET_VALUE(uint32_t)
-    SET_VALUE(uint64_t)
-    SET_VALUE(double)
-    SET_VALUE(float)
-    .def("set_obj", [](primvar::PrimVar &p, const py::object &obj) {
-      py::print("set_obj", obj);
-      //py::buffer_info info = obj.request();
-      py::print("buf info", obj.get_type());
-
-      py::object c_float = py::module::import("ctypes").attr("c_float");
-      py::print("c_float", c_float.get_type());
-      py::print("isnstance(c_float)", py::isinstance(obj, c_float));
-      //py::print("val = ", obj.cast<float>());
-    
-    })
-    .def("set_buf", [](primvar::PrimVar &p, const py::buffer &buf) {
-      py::print("set_buf", buf);
-      py::buffer_info info = buf.request();
-      py::print("buf info", info.format);
-    })
-    .def("set_array", [](primvar::PrimVar &p, const py::array_t<int32_t> v) {
-      py::print("set_arr int[]");
-    })
-    .def("get_array", [](primvar::PrimVar &p) -> py::array_t<float> {
-      std::vector<float> v;
-
-      auto result = py::array_t<float>(16);
-      
-      return result;
-    })
-    ;
-
-  py::class_<Prim>(m, "Prim")
-      // default ctor: Create Prim with Model type.
-      .def(py::init([]() { return Prim(Model()); }))
-      .def(py::init([](const std::string &prim_name) {
-        return Prim(Model());
-       }))
-      .def_property(
-          "prim_id", [](const Prim &p) -> int64_t { return p.prim_id(); },
-          [](Prim &p) -> int64_t & { return p.prim_id(); })
-      //.def_property("children", [](const Prim &p) -> const std::vector<Prim> &
-      //{
-      //  return p.children();
-      //}, [](Prim &p, const Prim &c) {
-      //  p.children().push_back(c);
-      //}, py::return_value_policy::reference)
-      .def(
-          "children",
-          [](Prim &p) -> std::vector<Prim> & { return p.children(); },
-          py::return_value_policy::reference)
-      //.def_property("primChildren", static_cast<const std::vector<Prim> &(Prim::*)(void)>Prim::children,
-      //}, [](Prim &p, const std::vector<Prim> &v) {
-      //  py::print("setter");
-      //  p.children() = v;
-      //})
-      .def("__str__", [](const Prim &p) {
-        return to_string(p);       
-      })
-      ;
-
-  py::class_<StageMetas>(m, "StageMetas")
-    .def(py::init<>())
-    .def_property("metersPerUnit", 
-      [](const StageMetas &m) -> const double {
-        py::print("metersPerUnit get");
-        return m.metersPerUnit.get_value();
-      }, [](StageMetas &m, const double v) {
-        py::print("metersPerUnit set");
-        m.metersPerUnit.set_value(v);
-        py::print("metersPerUnit ", m.metersPerUnit.get_value());
-      }, py::return_value_policy::reference_internal)
-    ;
-
-  py::class_<Stage>(m, "Stage")
-      .def(py::init<>())
-      // Use rvp::reference for lvalue C++ reference.
-      .def("metas", [](Stage &s) -> StageMetas & {
-        py::print("metas method"); return s.metas(); }, py::return_value_policy::reference)
-      .def("commit", &Stage::commit)
-      .def(
-          "root_prims",
-          [](Stage &stage) -> std::vector<Prim> & { return stage.root_prims(); },
-          py::return_value_policy::reference)
-      .def("GetPrimAtPath",
-           [](const Stage &s, const std::string &path_str) -> py::object {
-             Path path(path_str, "");
-
-             if (auto p = s.GetPrimAtPath(path)) {
-               return py::cast(*p);
-             }
-
-             return py::none();
-           })
-      .def("ExportToString", &Stage::ExportToString)
-      .def("dump_prim_tree", &Stage::dump_prim_tree)
-      .def("find_prim_by_prim_id",
-           [](Stage &s, uint64_t prim_id) -> py::object {
-
-             Prim *prim{nullptr};
-             if (auto p = s.find_prim_by_prim_id(prim_id, prim)) {
-               return py::cast(prim);
-             }
-
-             return py::none();
-           }, py::return_value_policy::reference);
-  
-
-  m.def("LoadUSDFromFile", &LoadUSDAFromFile);
-
-  py::class_<std::vector<Prim>>(m, "PrimVector")
-      .def(py::init<>())
-      .def("clear", &std::vector<Prim>::clear)
-      .def(
-          "append",
-          [](std::vector<Prim> &pv, const Prim &prim) { pv.push_back(prim); },
-          py::keep_alive<1, 2>())
-      .def("__len__", [](const std::vector<Prim> &v) { return v.size(); })
-      .def(
-          "__iter__",
-          [](std::vector<Prim> &v) {
-            return py::make_iterator(v.begin(), v.end());
-          },
-          py::keep_alive<0, 1>());
-
-  // py::class_<tinyusdz::GPrim>(UsdModule, "GPrim");
-
-  // py::class_<tinyusdz::GeomSphere>(m, "Sphere")
-  //   .def(py::init<>())
-  //;
-
-  // py::class_<tinyusdz::GeomSphere>(m, "Sphere")
-  //   .def(py::init<>())
-  //   .def
-
-#if 0
-
-#if 1
-
-#if 0
-#define DEFINE_ARRAY_TYPE(__ty, __name) \
-  py::class_<std::vector<__ty>>(m, __name) \
-      .def(py::init<>()) \
-      .def("clear", &std::vector<__ty>::clear) \
-      .def( \
-          "append", \
-          [](std::vector<__ty> &pv, const __ty &v) { pv.push_back(v); }, \
-          py::keep_alive<1, 2>()) \
-      .def("__len__", [](const std::vector<__ty> &v) { return v.size(); }) \
-      .def( \
-          "__iter__", \
-          [](std::vector<__ty> &v) { \
-            return py::make_iterator(v.begin(), v.end()); \
-          }, \
-          py::keep_alive<0, 1>())
-#else
-
-#define DEFINE_ARRAY_TYPE(__ty, __name) \
-  py::class_<std::vector<__ty>>(m, __name) \
-      .def(py::init<>()) \
-      .def("clear", &std::vector<__ty>::clear) 
-
-#endif
-
-  DEFINE_ARRAY_TYPE(float, "FloatVector");
-  DEFINE_ARRAY_TYPE(bool, "BoolVector");
-  DEFINE_ARRAY_TYPE(uint8_t, "ByteVector");
-  DEFINE_ARRAY_TYPE(uint16_t, "UInt16Vector"); // TODO: deprecate?
-  DEFINE_ARRAY_TYPE(int32_t, "IntVector");
-  DEFINE_ARRAY_TYPE(value::int2, "Int2Vector");
-  DEFINE_ARRAY_TYPE(value::int3, "Int3Vector");
-  DEFINE_ARRAY_TYPE(value::int4, "Int4Vector");
-  DEFINE_ARRAY_TYPE(uint32_t, "UIntVector");
-  DEFINE_ARRAY_TYPE(value::uint2, "UInt2Vector");
-  DEFINE_ARRAY_TYPE(value::uint3, "UInt3Vector");
-  DEFINE_ARRAY_TYPE(value::uint4, "UInt4Vector");
-
-  DEFINE_ARRAY_TYPE(int64_t, "Int64Vector");
-  DEFINE_ARRAY_TYPE(uint64_t, "UInt64Vector");
-  DEFINE_ARRAY_TYPE(value::half, "HalfVector");
-  DEFINE_ARRAY_TYPE(value::half2, "Half2Vector");
-  DEFINE_ARRAY_TYPE(value::half3, "Half3Vector");
-  DEFINE_ARRAY_TYPE(value::half4, "Half4Vector");
-  DEFINE_ARRAY_TYPE(float, "FloatVector");
-  DEFINE_ARRAY_TYPE(value::float2, "Float2Vector");
-  DEFINE_ARRAY_TYPE(value::float3, "Float3Vector");
-  DEFINE_ARRAY_TYPE(value::float4, "Float4Vector");
-  DEFINE_ARRAY_TYPE(double, "DoubleVector");
-  DEFINE_ARRAY_TYPE(value::double2, "Double2Vector");
-  DEFINE_ARRAY_TYPE(value::double3, "Double3Vector");
-  DEFINE_ARRAY_TYPE(value::double4, "Double4Vector");
-
-  DEFINE_ARRAY_TYPE(value::quath, "QuathVector");
-  DEFINE_ARRAY_TYPE(value::quatf, "QuatfVector");
-  DEFINE_ARRAY_TYPE(value::quatd, "QuatdVector");
-
-  DEFINE_ARRAY_TYPE(value::normal3h, "Normal3hVector");
-  DEFINE_ARRAY_TYPE(value::normal3f, "Normal3fVector");
-  DEFINE_ARRAY_TYPE(value::normal3d, "Normal3dVector");
-
-  DEFINE_ARRAY_TYPE(value::vector3h, "Vector3hVector");
-  DEFINE_ARRAY_TYPE(value::vector3f, "Vector3fVector");
-  DEFINE_ARRAY_TYPE(value::vector3d, "Vector3dVector");
-
-  DEFINE_ARRAY_TYPE(value::point3h, "Point2hVector");
-  DEFINE_ARRAY_TYPE(value::point3f, "Point3fVector");
-  DEFINE_ARRAY_TYPE(value::point3d, "Point3dVector");
-
-  DEFINE_ARRAY_TYPE(value::color3h, "Color3hVector");
-  DEFINE_ARRAY_TYPE(value::color3f, "Color3fVector");
-  DEFINE_ARRAY_TYPE(value::color3d, "Color3dVector");
-  DEFINE_ARRAY_TYPE(value::color4h, "Color4hVector");
-  DEFINE_ARRAY_TYPE(value::color4f, "Color4fVector");
-  DEFINE_ARRAY_TYPE(value::color4d, "Color4dVector");
-
-  DEFINE_ARRAY_TYPE(value::texcoord2h, "Texcoord2hVector");
-  DEFINE_ARRAY_TYPE(value::texcoord2f, "Texcoord2fVector");
-  DEFINE_ARRAY_TYPE(value::texcoord2d, "Texcoord2dVector");
-  DEFINE_ARRAY_TYPE(value::texcoord3h, "Texcoord3hVector");
-  DEFINE_ARRAY_TYPE(value::texcoord3f, "Texcoord3fVector");
-  DEFINE_ARRAY_TYPE(value::texcoord3d, "Texcoord3dVector");
-
-  DEFINE_ARRAY_TYPE(value::matrix2d, "Matrix2dVector");
-  DEFINE_ARRAY_TYPE(value::matrix3d, "Matrix3dVector");
-  DEFINE_ARRAY_TYPE(value::matrix4d, "Matrix4dVector");
-  DEFINE_ARRAY_TYPE(value::frame4d, "Frame4dVector");
-
-#undef DEFINE_ARRAY_TYPE
-
-
-#else
-
-  // very slow to compile...
-  py::bind_vector<std::vector<bool>>(m, "BoolVector");
-  py::bind_vector<std::vector<uint8_t>>(m, "ByteVector");
-  py::bind_vector<std::vector<uint16_t>>(m, "UInt16Vector"); // TODO: deprecate?
-  py::bind_vector<std::vector<int32_t>>(m, "IntVector");
-  py::bind_vector<std::vector<value::int2>>(m, "Int2Vector");
-  py::bind_vector<std::vector<value::int3>>(m, "Int3Vector");
-  py::bind_vector<std::vector<value::int4>>(m, "Int4Vector");
-  py::bind_vector<std::vector<uint32_t>>(m, "UIntVector");
-  py::bind_vector<std::vector<value::uint2>>(m, "UInt2Vector");
-  py::bind_vector<std::vector<value::uint3>>(m, "UInt3Vector");
-  py::bind_vector<std::vector<value::uint4>>(m, "UInt4Vector");
-
-  py::bind_vector<std::vector<int64_t>>(m, "Int64Vector");
-  py::bind_vector<std::vector<uint64_t>>(m, "UInt64Vector");
-  py::bind_vector<std::vector<value::half>>(m, "HalfVector");
-  py::bind_vector<std::vector<value::half2>>(m, "Half2Vector");
-  py::bind_vector<std::vector<value::half3>>(m, "Half3Vector");
-  py::bind_vector<std::vector<value::half4>>(m, "Half4Vector");
-  py::bind_vector<std::vector<float>>(m, "FloatVector");
-  py::bind_vector<std::vector<value::float2>>(m, "Float2Vector");
-  py::bind_vector<std::vector<value::float3>>(m, "Float3Vector");
-  py::bind_vector<std::vector<value::float4>>(m, "Float4Vector");
-  py::bind_vector<std::vector<double>>(m, "DoubleVector");
-  py::bind_vector<std::vector<value::double2>>(m, "Double2Vector");
-  py::bind_vector<std::vector<value::double3>>(m, "Double3Vector");
-  py::bind_vector<std::vector<value::double4>>(m, "Double4Vector");
-
-  py::bind_vector<std::vector<value::quath>>(m, "QuathVector");
-  py::bind_vector<std::vector<value::quatf>>(m, "QuatfVector");
-  py::bind_vector<std::vector<value::quatd>>(m, "QuatdVector");
-
-  py::bind_vector<std::vector<value::normal3h>>(m, "Normal3hVector");
-  py::bind_vector<std::vector<value::normal3f>>(m, "Normal3fVector");
-  py::bind_vector<std::vector<value::normal3d>>(m, "Normal3dVector");
-
-  py::bind_vector<std::vector<value::vector3h>>(m, "Vector3hVector");
-  py::bind_vector<std::vector<value::vector3f>>(m, "Vector3fVector");
-  py::bind_vector<std::vector<value::vector3d>>(m, "Vector3dVector");
-
-  py::bind_vector<std::vector<value::point3h>>(m, "Point3hVector");
-  py::bind_vector<std::vector<value::point3f>>(m, "Point3fVector");
-  py::bind_vector<std::vector<value::point3d>>(m, "Point3dVector");
-
-  py::bind_vector<std::vector<value::color3h>>(m, "Color3hVector");
-  py::bind_vector<std::vector<value::color3f>>(m, "Color3fVector");
-  py::bind_vector<std::vector<value::color3d>>(m, "Color3dVector");
-  py::bind_vector<std::vector<value::color4h>>(m, "Color4hVector");
-  py::bind_vector<std::vector<value::color4f>>(m, "Color4fVector");
-  py::bind_vector<std::vector<value::color4d>>(m, "Color4dVector");
-
-  py::bind_vector<std::vector<value::texcoord2h>>(m, "Texcoord2hVector");
-  py::bind_vector<std::vector<value::texcoord2f>>(m, "Texcoord2fVector");
-  py::bind_vector<std::vector<value::texcoord2d>>(m, "Texcoord2dVector");
-  py::bind_vector<std::vector<value::texcoord3h>>(m, "Texcoord3hVector");
-  py::bind_vector<std::vector<value::texcoord3f>>(m, "Texcoord3fVector");
-  py::bind_vector<std::vector<value::texcoord3d>>(m, "Texcoord3dVector");
-
-  py::bind_vector<std::vector<value::matrix2d>>(m, "Matrix2dVector");
-  py::bind_vector<std::vector<value::matrix3d>>(m, "Matrix3dVector");
-  py::bind_vector<std::vector<value::matrix4d>>(m, "Matrix4dVector");
-  py::bind_vector<std::vector<value::frame4d>>(m, "Frame4dVector");
-#endif
-
-#endif
-
-  // Tydra
-  {
-    auto m_tydra = m.def_submodule("tydra");
-
-    py::class_<tydra::RenderSceneConverterConfig>(m_tydra, "RenderSceneConverterConfig")
-      .def(py::init<>())
-      .def_readwrite("load_texture_assets", &tydra::RenderSceneConverterConfig::load_texture_assets)
-    ;
-
-    m_tydra.def("to_render_scene", [](const Stage &stage) {
-      py::print("TODO");
-    }, py::arg("config") = tydra::RenderSceneConverterConfig());
-  }
-}
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/usd-to-json.cc b/contrib/tinyusdz/tinyusdz_repo/src/usd-to-json.cc
deleted file mode 100644
index ca7d99a0f..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/usd-to-json.cc
+++ /dev/null
@@ -1,231 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright 2022 - Present, Syoyo Fujita.
-#include "usd-to-json.hh"
-
-#include "tinyusdz.hh"
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-// nlohmann json
-#include "external/jsonhpp/nlohmann/json.hpp"
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#include "common-macros.inc"
-#include "pprinter.hh"
-
-using namespace nlohmann;
-
-namespace tinyusdz {
-
-namespace {
-
-json ToJSON(tinyusdz::Xform& xform) {
-  json j;
-
-  j["name"] = xform.name;
-  j["typeName"] = "Xform";
-
-  if (xform.xformOps.size()) {
-    json jxformOpOrder;
-
-    std::vector<std::string> ops;
-    for (const auto &xformOp : xform.xformOps) {
-      ops.push_back(xformOp.suffix);
-    }
-
-    j["xformOpOrder"] = ops;
-  }
-
-  return j;
-}
-
-json ToJSON(tinyusdz::GeomMesh& mesh) {
-  json j;
-
-#if 0
-
-  if (mesh.points.size()) {
-    j["points"] = mesh.points;
-  }
-
-  if (mesh.faceVertexCounts.size()) {
-    j["faceVertexCounts"] = mesh.faceVertexCounts;
-  }
-
-  if (mesh.faceVertexIndices.size()) {
-    j["faceVertexIndices"] = mesh.faceVertexIndices;
-  }
-
-  {
-    auto normals = mesh.normals.buffer.GetAsVec3fArray();
-    if (normals.size()) {
-      j["normals"] = normals;
-    }
-  }
-  // TODO: Subdivision surface
-  j["doubleSided"] = mesh.doubleSided;
-
-  j["purpose"] = mesh.purpose;
-
-  {
-    std::string v = "inherited";
-    if (mesh.visibility == tinyusdz::VisibilityInvisible) {
-      v = "invisible";
-    }
-    j["visibility"] = v;
-  }
-
-
-  if (mesh.extent.Valid()) {
-    j["extent"] = mesh.extent.to_array();
-  }
-
-  // subd
-  {
-    std::string scheme = "none";
-    if (mesh.subdivisionScheme == tinyusdz::SubdivisionSchemeCatmullClark) {
-      scheme = "catmullClark";
-    } else if (mesh.subdivisionScheme == tinyusdz::SubdivisionSchemeLoop) {
-      scheme = "loop";
-    } else if (mesh.subdivisionScheme == tinyusdz::SubdivisionSchemeBilinear) {
-      scheme = "bilinear";
-    }
-
-    j["subdivisionScheme"] = scheme;
-
-    if (mesh.cornerIndices.size()) {
-      j["cornerIndices"] = mesh.cornerIndices;
-    }
-    if (mesh.cornerSharpnesses.size()) {
-      j["cornerSharpness"] = mesh.cornerSharpnesses;
-    }
-
-    if (mesh.creaseIndices.size()) {
-      j["creaseIndices"] = mesh.creaseIndices;
-    }
-
-    if (mesh.creaseLengths.size()) {
-      j["creaseLengths"] = mesh.creaseLengths;
-    }
-
-    if (mesh.creaseSharpnesses.size()) {
-      j["creaseSharpnesses"] = mesh.creaseSharpnesses;
-    }
-
-    if (mesh.interpolateBoundary.size()) {
-      j["interpolateBoundary"] = mesh.interpolateBoundary;
-    }
-
-  }
-
-#endif
-
-  return j;
-}
-
-json ToJSON(tinyusdz::GeomBasisCurves& curves) {
-  json j;
-
-  return j;
-}
-
-json ToJSON(const tinyusdz::value::Value &v) {
-  if (auto pv = v.get_value<tinyusdz::Xform>()) {
-    return ToJSON(pv.value());
-  }
-
-
-  return json();
-
-
-}
-
-nonstd::expected<json, std::string> ToJSON(const tinyusdz::StageMetas& metas) {
-  json j;
-
-  if (metas.upAxis.authored()) {
-    j["upAxis"] = to_string(metas.upAxis.get_value());
-  }
-
-  if (metas.comment.value.size()) {
-    // TODO: escape and quote
-    j["comment"] = metas.comment.value;
-  }
-
-  return j;
-}
-
-bool PrimToJSONRec(json &root, const tinyusdz::Prim& prim, int depth) {
-  json j = ToJSON(prim.data());
-
-  json jchildren = json::object();
-
-  // TODO: Traverse Prim according to primChildren.
-  for (const auto &child : prim.children()) {
-    json cj;
-    if (!PrimToJSONRec(cj, child, depth+1)) {
-      return false;
-    }
-    std::string cname = child.element_name();
-    jchildren[cname] = cj;
-  }
-
-  if (jchildren.size()) {
-    j["primChildren"] = jchildren;
-  }
-
-  root[prim.element_name()] = j;
-
-  return true;
-}
-
-}  // namespace
-
-
-nonstd::expected<std::string, std::string> ToJSON(
-    const tinyusdz::Stage& stage) {
-  json j;  // root
-
-  auto jstageMetas = ToJSON(stage.metas());
-  if (!jstageMetas) {
-    return nonstd::make_unexpected(jstageMetas.error());
-  }
-  
-  // Stage metadatum is represented as properties.
-  if (!jstageMetas->is_null()) {
-    j["properties"] = *jstageMetas;
-  }
-
-  j["version"] = 1.0;
-
-  json cj;
-  for (const auto& item : stage.root_prims()) {
-    if (!PrimToJSONRec(cj, item, 0)) {
-      return nonstd::make_unexpected("Failed to convert Prim to JSON.");
-    }
-  }
-
-  j["primChildren"] = cj;
-
-  tinyusdz::GeomMesh mesh;
-  json jmesh = ToJSON(mesh);
-
-  (void)jmesh;
-
-  tinyusdz::GeomBasisCurves curves;
-  json jcurves = ToJSON(curves);
-
-  (void)jcurves;
-
-  std::string str = j.dump(/* indent*/ 2);
-
-  return str;
-}
-
-}  // namespace tinyusdz
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/usd-to-json.hh b/contrib/tinyusdz/tinyusdz_repo/src/usd-to-json.hh
deleted file mode 100644
index 4ba663754..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/usd-to-json.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: Apache 2.0
-// Experimental USD to JSON converter
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Weverything"
-#endif
-
-#include "nonstd/expected.hpp"
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-#include "tinyusdz.hh"
-
-namespace tinyusdz {
-
-///
-/// Convert USD Stage to JSON
-///
-/// @returns JSON string or error message(std::string) when failed to convert.
-///
-nonstd::expected<std::string, std::string> ToJSON(const tinyusdz::Stage &stage);
-
-} // namespace tinyusd
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/usdFbx.cc b/contrib/tinyusdz/tinyusdz_repo/src/usdFbx.cc
deleted file mode 100644
index 84a6433ea..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/usdFbx.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// SPDX-License-Identifier: MIT
-//
-#include <string>
-
-#include "tinyusdz.hh"
-#include "io-util.hh"
-#include "usdFbx.hh"
-
-//#include "math-util.inc"
-
-#ifdef TINYUSDZ_USE_USDFBX
-
-#include "external/OpenFBX/src/ofbx.h"
-
-#endif
-
-namespace tinyusdz {
-
-namespace usdFbx {
-
-namespace {
-
-
-
-}
-
-bool ReadFbxFromFile(const std::string &filepath, tinyusdz::GPrim *prim, std::string *err)
-{
-#if !defined(TINYUSDZ_USE_USDFBX)
-  (void)filepath;
-  (void)prim;
-  if (err) {
-    (*err) = "usdFbx is disabled in this build.\n";
-  }
-  return false;
-#else
-
-  std::vector<uint8_t> buf;
-  if (!io::ReadWholeFile(&buf, err, filepath, /* filesize max */ 0,
-                         /* user_ptr */ nullptr)) {
-    return false;
-  }
-
-  std::string str(reinterpret_cast<const char *>(buf.data()), buf.size());
-
-  return ReadFbxFromString(str, prim, err);
-
-#endif
-
-}
-
-
-bool ReadFbxFromString(const std::string &str, tinyusdz::GPrim *prim, std::string *err)
-{
-#if !defined(TINYUSDZ_USE_USDFBX)
-  (void)str;
-  (void)prim;
-  if (err) {
-    (*err) = "usdFbx is disabled in this build.\n";
-  }
-  return false;
-#else
-
-  (void)str;
-  (void)prim;
-  if (err) {
-    (*err) = "TODO: Implement usdFbx importer.\n";
-  }
-
-  return false;
-#endif
-}
-
-} // namespace usdFbx
-
-} // tinyusdz
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/usdFbx.hh b/contrib/tinyusdz/tinyusdz_repo/src/usdFbx.hh
deleted file mode 100644
index 7218aa918..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/usdFbx.hh
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: MIT
-// 
-// Work-in-progress. Nothing here yet.
-// Built-in .fbx import plugIn using OpenFBX.
-// Import only. 
-//
-// example usage 
-//
-// def Xform "fbxroot" (
-//   prepend references = @bunny.fbx@
-// )
-// {
-//    ...
-// }
-
-#pragma once
-
-#include "tinyusdz.hh"
-
-namespace tinyusdz {
-
-namespace usdFbx {
-
-bool ReadFbxFromString(const std::string &str, GPrim *prim, std::string *err = nullptr);
-bool ReadFbxFromFile(const std::string &filepath, GPrim *prim, std::string *err = nullptr);
-
-} // namespace usdFbx
-
-} // namespace tinyusdz
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/usdVox.cc b/contrib/tinyusdz/tinyusdz_repo/src/usdVox.cc
deleted file mode 100644
index e63798675..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/usdVox.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "usdVox.hh"
-
-#define OGT_VOX_IMPLEMENTATION
-#include "external/ogt_vox.h"
-
-namespace tinyusdz {
-namespace usdVox {
-
-
-} // namespace usdVox
-} // namespace tinyusdz
diff --git a/contrib/tinyusdz/tinyusdz_repo/src/usdVox.hh b/contrib/tinyusdz/tinyusdz_repo/src/usdVox.hh
deleted file mode 100644
index 8dbbd6c8b..000000000
--- a/contrib/tinyusdz/tinyusdz_repo/src/usdVox.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: MIT
-// 
-// Built-in MagicaVoxel .vox import plugIn.
-// Import only. Writing voxel data as .vox is not supported(yet).
-//
-// example usage 
-//
-// def VoxAsset "volume" (
-//   prepend references = @bunny.vox@
-// )
-// {
-//    ...
-// }
-
-#pragma once
-
-#include "tinyusdz.hh"
-
-namespace tinyusdz {
-namespace usdVox {
-
-//bool ReadVoxFromString(const std::string &str, GPrim *prim, std::string *err = nullptr);
-bool ReadVoxFromFile(const std::string &filepath, GPrim *prim, std::string *err = nullptr);
-
-} // namespace usdVox
-} // namespace tinyusdz